https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml into swamid-interfederations-2.0

3867 files changed, 2497 insertions, 375941 deletions

diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index 01352369..6c717fe1 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -1,304 +1,32 @@
 <?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/1010SE17FAM-V03.famerp.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/2013.qmplus.qmul.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/2014.qmplus.qmul.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/44new-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/44uoc-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.certh.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.csc.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.helmholtz-muenchen.de-idp-shibboleth.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.insel.ch-idp-shibboleth.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.hsr.ch-idp-shibboleth.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.phsg.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.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.ethz.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.hcmr.gr-idp-shibboleth.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.psi.ch-idp-shibboleth.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.unibas.ch-idp-shibboleth.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.phzg.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.ruhr-uni-bochum.de.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.unil.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-viewer.switch.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/abcidp.askham-bryan.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/abertay.unidesk.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/abstimmung.dfn.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/abw-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/academic.mintel.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/academic.reportlinker.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/accesnoto.deboecksuperieur.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/access-check.edugain.org-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/access.lcb.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/access.research.cchmc.org-fed-idp-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/access.sant.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/access.wigan-leigh.ac.uk-oala-metadata.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/acesso.ufabc.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/acm.jordanpublishing.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/activation.glew.org.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs01.kempel.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs1.oba.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs20.hva.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs2.cito.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs2.fontys.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs2prod.aventus.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs3host.proxy.rocmn.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs3prod.aventus.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.amolf.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.artez.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.driestar-educatief.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.fom.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.glu.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.hsleiden.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.hsmarnix.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.hvhl.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.ipabo.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.kb.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.knmi.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.maastrichtuniversity.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs-mali.icer.niaid.nih.gov-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.morgan.edu-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.myhz.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.nwo.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.philau.edu-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.rijnhuizen.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.stenden.com-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.stw.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.surfmarket.nl-adfs-services-trust.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/adfs-uganda.icer.niaid.nih.gov-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.unco.edu-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfsv2.inholland.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.yz.yamagata-u.ac.jp-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/admin.safetynet.rmplc.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/admin.webfiltering.ja.net-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/adss-dev.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/adss.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/adss-sup.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/afbi-shib.ads.qub.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/afire.asnet.am-idp-shibboleth.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/agenda.ct.infn.it-shibboleth.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/aiwip.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aleph20.knihovna-pardubice.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aleph22.svkpl.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/alnbmth.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/alpha.bobnational.net-entityid.xml"/>
-<xi:include href="swamid-interfederations-2.0/alumidp.princeton.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/alumniconnector.london.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ambre.vetagro-sup.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/api.bridgemanimages.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/aplicacions.usc.es-sir-uscidp.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.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/app.goodpractice.net.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/app.ords.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/appraisal.qmul.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/app.staging.goodpractice.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/apsjournals.apsnet.org-shibboleth.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/arauto.fapesp.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/arts.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ashiok.ufpe.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/astonsu-voting.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/athens.bruford.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/athens.gcc.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/athensla-dev.uwe.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/athenslart.nelson.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/athensla.uwe.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/athens.londonexternal.ac.uk-OpenAthens.xml"/>
-<xi:include href="swamid-interfederations-2.0/athens.petroc.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/athensproxy.ids.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/athens.regents.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/athensri.forthvalley.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.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/atlas.sciencespo-lille.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/atrium.in2p3.fr-sp.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/audit01.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.aspirationtraining.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.buckingham.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.centrale-marseille.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.chaminade.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.creighton.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.cs.serialssolutions.com-auth-Metadata-Shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.cs.serialssolutions.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.dariah.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/authenticate.bvdep.com-ukfederation.xml"/>
-<xi:include href="swamid-interfederations-2.0/authest.bathspa.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.galegroup.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.galegroup.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.greenqloud.com-wayf-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.howcloud.com-saml-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.howcloud.co.uk-saml-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/authidp.shsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.ipublishcentral.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.ncrm.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.search.serialssolutions.com-auth-Metadata-Shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.search.serialssolutions.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.serotine.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.services.bmj.com-auth.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-pau.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.unomaha.edu-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.yale.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/avbmth.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/b2access.eudat.eu-8443-unitygw-saml-sp-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/baran-is0.educampus.ie-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/bathspa.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/bathspa.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bath-test.topdesk.net-tas-public-login-verify.xml"/>
-<xi:include href="swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.xml"/>
-<xi:include href="swamid-interfederations-2.0/bath.topdesk.net-tas-public-login-verify.xml"/>
-<xi:include href="swamid-interfederations-2.0/bath.topdesk.net-tas-secure-login-verify.xml"/>
-<xi:include href="swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bcm.some.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/beaumontcollege.org-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/beige.admin.grnet.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/belser.gbv.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.aip.pub2web.ingenta.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.asm.pub2web.ingenta.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.brill.pub2web.ingenta.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.hp.pub2web.ingenta.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.ingentaconnect.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.jbep.pub2web.ingenta.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.lawtel.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.projecteuclid.org-shibboleth-sp.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/beta.sketchengine.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.telford.icebox.ingenta.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/betawww.itslearning.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bfas.scran.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bham-primo-stg.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.fiol.odense.dk-.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-simpelsaml.natmus.dk-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.campusvejle.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eucvest.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sceu.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk:443-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.vghf.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.vgtgym.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.vibkat.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-ah-module.php-saml-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fhs-module.php-saml-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml"/>
@@ -306,3513 +34,89 @@
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.cphwest.dk-sosuc-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hasseris-gym.dk.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfidp.uniit.dk-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-akf.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dmi.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fob.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-ism.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-kuc.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-kul.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-stm.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-vej.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-vfc.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-lg-saml2-idp-metadata.php-unit-lg.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sg-saml2-idp-metadata.php-unit-sg.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sosur-saml2-idp-metadata.php-unit-sosur.xml"/>
-<xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml"/>
 <xi:include href="swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/bismarck.nyme.hu-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/blblogin.blb-karlsruhe.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bmcidp.brooksbymelton.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bm.stars.manchester.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bmthbs.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/bmtheventskit.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/bmthmcopsequipment.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/bmthmedia.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/bobnational.net-saml-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml"/>
-<xi:include href="swamid-interfederations-2.0/boleth.chi.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bolton.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/booksandjournals.brillonline.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bournemouth.co-tutor.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/box-idp.nordu.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/brad.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/brain.lab.vvc.niif.hu-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/bridge.uninett.no.xml"/>
-<xi:include href="swamid-interfederations-2.0/bristol-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/brunelstudents.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bscw.uamr.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/bsp-idp.shibboleth.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bsp-idp-test.shibboleth.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/bureau.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/burycollege.cirqahosting.com-shibboleth.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/buttecollege.instructure.com-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/bwescitts.uni-tuebingen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.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.cnen.gov.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.cp2.g12.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.furg.br-idp-shibboleth.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.ibict.br-idp-shibboleth.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.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.ifpi.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.ifsp.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.int.gov.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.mcti.gov.br-idp-shibboleth.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.pucgoias.edu.br-idp-shibboleth.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.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.ufal.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufcspa.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufpa.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufpa.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.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/cafe.usf.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/calendar.larpp.internet2.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/calipso.cpd.ufv.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/calstatela.infoready4.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/campus.ie-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/caneid.miami.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.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/cardshibidp.cardonald.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/carmenwiki.osu.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/caroa.univasf.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.cgcent.miami.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.conncoll.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.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.ent-etrs.net-idp-shibboleth.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/cast.itunes.uni-muenchen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml"/>
-<xi:include href="swamid-interfederations-2.0/cavle.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/ccm.copac.jisc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/census.mimas.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cerealchemistry.aaccnet.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cern.ch-login.xml"/>
-<xi:include href="swamid-interfederations-2.0/certify.skidmore.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cgticafe.fiocruz.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/childcare.uas.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/childes.talkbank.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/chronicle.bufvc.ac.uk-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/ck.olmstaging.com-oa-metadata.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/clarino.uib.no-.xml"/>
-<xi:include href="swamid-interfederations-2.0/clarino.uib.no.xml"/>
 <xi:include href="swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/cloudidp1.canarie.ca.xml"/>
-<xi:include href="swamid-interfederations-2.0/cloudstandards.cesnet.cz-sp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/cma-shibboleth.csum.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cmi-nuig.calpendo.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cmu-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/cnb.rediris.es.xml"/>
-<xi:include href="swamid-interfederations-2.0/coastline.instructure.com-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/coco.aai.niif.hu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/colaboratorio.redclara.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml"/>
-<xi:include href="swamid-interfederations-2.0/commons.lbl.gov-sp-shibboleth.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/community.staging.company.ja.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/compute.deic.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/conext.authenticatie.ru.nl-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/confluence.dev.ja.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/connect.ct.infn.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/connectis-sso.qa.federatenow.net-broker-sso-tpd.xml"/>
-<xi:include href="swamid-interfederations-2.0/connectis-sso.staging.federatenow.net-broker-sso-tpd.xml"/>
-<xi:include href="swamid-interfederations-2.0/connect.sunet.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/connect.tut.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/content.espresso.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/content.karger.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/contentstore.cla.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/copaiba.unifesspa.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/copper-beech.oucs.ox.ac.uk-shibboleth.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/coursedev.conted.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/courses.sci-gaia.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/coventry.ac.uk-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/crowd.it.helsinki.fi-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/crowdskills.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/crux.hrz.tu-freiberg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/csbmth.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/csueastbay.infoready4.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ct0.cirqahosting.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cts-dev.ngs.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/cts.ngs.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/cumin.plu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/customapps-uat.theiet.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/cwpub2.imodules.com-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/c.yz.yamagata-u.ac.jp-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dadotsweb1.essex.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/darlfam.darlington.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dash.cdlib.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dash-dev.cdlib.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dash-stg.cdlib.org-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/data.deic.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/db.saur.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/db.ub.uni-stuttgart.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/decbmth.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/demeter.wp.swov.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/demo-dcs.cla.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/demo.eduopen.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dep.s2dv.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dep.software2.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev2.qmplus.qmul.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev2.webauth.soton.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.aiwip.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/devapp.shibstats.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.atomwide.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.british-history.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.clarin.nl-shibboleth.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/devidp.nottingham.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.keynote.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.k-int.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.niif.hu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.overtsoftware.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.pf.adidas.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.qmplus.qmul.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/devsaas.topdeskdev.net-tas-secure-login-verify.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.scotlandonscreen.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/devsso.educause.edu-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev-sso.knewknovel.com-entry-uk_federation-Metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.wiseflow.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/digital-library.theiet.org-shibboleth.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/discourse.sci-gaia.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-jose.edina.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-lockssdev2.ucs.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-monidp.edina.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-qwghlm.ucs.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-schoolsidp.edina.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-shandon.ucs.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dlib-tirnanog.ucs.ed.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dluat-pub2web.theiet.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dmp.cdlib.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/dmp-dev.cdlib.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/dmponline.dcc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dmponline-test.dcc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dmp-stage.cdlib.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/dmz-shib-dg-01.dmz.roehampton.ac.uk-idp-shibboleth.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/docs.nsms.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/docuwiki-magic.cesnet.cz-shibboleth.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/downloads.channel8.msdn.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/drupal-pilot-web-01.it.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/drupal-pilot-web-02.it.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/dspace.jorum.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/duck-dev.bournemouth.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/du-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/dun-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/eaa.uspnet.usp.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/eaplab.supplicants.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.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/ec1.educationcity.com-sso-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/eco2meter.grnet.gr-shibboleth.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/edgehill.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/edi.izum.si-idp-20100722.xml"/>
-<xi:include href="swamid-interfederations-2.0/edinaidp.edina.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/edinburghcollege.cirqahosting.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/edited.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/edocs.bathspa.ac.uk-shibboleth-sp.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/edugain-group.cesnet.cz-idp-shibboleth.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/eduid.jamu.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/edulidp01.hants.gov.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ed.unidesk.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/eduroam.frizerska.si.xml"/>
-<xi:include href="swamid-interfederations-2.0/eduspot.crous-amiens.fr-authsaml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/eduspot-n.oca.eu-authsaml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml"/>
-<xi:include href="swamid-interfederations-2.0/edu.xtremeinformation.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/efoyer.glam.ac.uk-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/ekrksso.keeleressursid.ee-simplesaml-module.php-saml-sp-metadata.php-ekrk-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/elegitimation2.inloggning.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/elektra.bsb-muenchen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/elibrary.exeter.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/elibrary.worldbank.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/elixir.mf.uni-lj.si-20140918.xml"/>
-<xi:include href="swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-201506181025.xml"/>
-<xi:include href="swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-20150622.xml"/>
-<xi:include href="swamid-interfederations-2.0/e-localcourses.unibo.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.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/endicott.law.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/endo-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/engine.eduteams.org-authentication-sp-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/engine.elixir-czech.org-authentication-sp-metadata.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/engine.t.eduteams.org-authentication-sp-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ephraim.tu-berlin.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/equinoxjournals.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/erf.sbb.spk-berlin.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/esds80.mcc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/esdsdev01.ds.man.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/esdswp01.ds.man.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/esgsmagenttest.win.ad.jhu.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/esodev.insrv.cf.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/espresso.ltscotland.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ethics-gradient.oucs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/eu01.alma.exlibrisgroup.com-mng-login.xml"/>
-<xi:include href="swamid-interfederations-2.0/eu.alma.exlibrisgroup.com-mng-login.xml"/>
 <xi:include href="swamid-interfederations-2.0/europe-stage.wiseflow.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/europe.wiseflow.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/events.ucl.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ezproxy.rgu.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ezproxy.wlv.ac.uk-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/falconidp.uwrf.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/falcon-scratch.csx.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/falcon-test.csi.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/falmouthtechbookings.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/fam.carmel.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fam.salford.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/fam-uat.salford.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/fdm.sisoshibboleth.co.uk-entity.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/fedauth.colorado.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fedauth.london.edu-oala-metadata.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-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federacao.uvanet.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/federatedaccess.hrc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/federatie.driestar-educatief.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/federatie.graafschapcollege.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/federatie.lumc.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/federatie.trimbos.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/federatie.umcn.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.ac-strasbourg.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.agrocampus-ouest.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.bsigroup.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.citylit.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.cyclone-project.eu-auth-realms-master.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.cyclone-project.eu-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.napier.ac.uk-idp-pingfederate.xml"/>
-<xi:include href="swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.rijksmuseum.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.springer-sbm.com-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.umontpellier.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed.huit.harvard.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fedidp.bcm.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fedidp.uh.edu-idp-shibboleth.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-interop-wg.ligo.org-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed-lab.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/fedlogin.studienet.ou.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed.nusextra.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed.rijnijssel.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/fides.rivm.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/fid.mnhn.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fieldtrial.safetynet.rmplc.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/filesender.funet.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.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/fim-hn-02-idp.orion.education.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/fim.temple.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/finden.nationallizenzen.de.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/fiuidp.fiu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fod.geant.net-shibboleth.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/franklin-shib01.franklin.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/fsdev.iceruganda.org-adfs-services-trust.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.multrix.com-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/fs.rocmondriaan.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/fsso-qa1.springer.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/fsso-qa2.springer.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/fsso.springer.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml"/>
-<xi:include href="swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/fs.uas.ox.ac.uk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml"/>
-<xi:include href="swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gateway.capella.edu-FIM-sps-capella_saml2_idp-saml20.xml"/>
-<xi:include href="swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gcidp.gloscol.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gcs.simitive.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/gcu.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.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.federations.renam.md.xml"/>
-<xi:include href="swamid-interfederations-2.0/gidp.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/gigamove.rz.rwth-aachen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/gimb-idp-1.gimb.org-idp-20130521.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.in2p3.fr-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gotodev.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/grnetbox.cti.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/groupes-aa.renater.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml"/>
-<xi:include href="swamid-interfederations-2.0/groupes.renater.fr-sympa.xml"/>
-<xi:include href="swamid-interfederations-2.0/g-shib.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/gteavirtual.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/guardian.otl.lstest.co.uk-shibboleth.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.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/harper-adams.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/hbidp.hb.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/hefce-shib.hefce.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/heimdall.comodo.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/heinonline.org-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/helium.jcu.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/hereford.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/hexaa.eduid.hu-hexaa.xml"/>
-<xi:include href="swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml"/>
-<xi:include href="swamid-interfederations-2.0/hmauth.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/homeproj.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/hornet.stars.manchester.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/hotfixpub1.imodules.com-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/hstalks.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/iam.atypon.com-shibboleth.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/iamlearning.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ibook.conel.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/icarus.sdstate.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.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-idp.ilc.cnr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identites.enim.fr-idp-.xml"/>
-<xi:include href="swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.andrew.cmu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.fu-berlin.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.gettysburg.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.mdh.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/identityprovider.anl.gov-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.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.sciencespo-rennes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idf.pucsp.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idm.hrz.uni-kassel.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.nps.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp01.sjsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp0.abertay.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp0.essex.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.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-toulouse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.ens-cachan.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.glos.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.glyndwr.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.hs-augsburg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.ioe.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.proofidcloud.co.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.smuc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.tees.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.themanchestercollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.turkuamk.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.utpa.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.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.dcu.ie-idp-profile-Metadata-SAML.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.gru.edu-8443-nidp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.hs-furtwangen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.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.jacobs-university.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.kau.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.kingston.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.londonlibrary.co.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.port.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.unr.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp3.cereq.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.4cd.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp4.halesowen.ac.uk-idp-shibboleth.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.aai.um.si-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aai.uni-mb.si-idp-20100614.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.abcolstudents.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.abingdon-witney.ac.uk-idp-shibboleth.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.accross.ac.uk-shibboleth.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.acs-schools.com-openathens.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.aegean.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.altoncollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.american.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.amersham.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.anglia.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.apu.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.apus.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ariadne-t.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ashridge.org.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aua.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aub.edu.lb-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aus.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bangor.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.barkingdagenhamcollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.barnetsouthgate.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.barnfield.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.barnsley.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.barton.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bath.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bcot.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bedford.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bham.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bhasvic.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bilborough.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bishopb-college.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bishopg.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.blackburn.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bnl.gov-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bnu.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.boisestate.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.boltoncc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.borderscollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bournemouth.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bournville.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bpc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bridgend.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bridgeport.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bridgewater.edu-simplesaml.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.brighton.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bris.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.broadinstitute.org-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.brock.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.brookehouse.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.brookes.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.brooklands.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.brynmawr.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bsb-muenchen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bsms.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bsz-bw.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bth.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bucks.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.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/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/idp.calderdale.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.calpoly.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.calstatela.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.caltech.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cambria.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.camosun.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.camre.ac.uk-shibboleth.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.candi.ac.uk-idp-shibboleth.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.cardiffmet.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cardinalnewman.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.carnegiecollege.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ccad.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cced.cranfield.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ccn.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cc.uga.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cdd.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.centralsussex.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ceredigion.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.chichester.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cirencester.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cirrusidentity.com-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cit.ie-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.citybathcoll.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cityofbristol.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cityofglasgowcollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.citysun.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.clarion.edu-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cloud.rsmart.com-saml.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cnwl.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-co.calstate.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.colby.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.colchester.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.colchsfc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.coleggwent.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.colegsirgar.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.collyers.ac.uk-idp-shibboleth.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.cornwall.ac.uk-shibboleth-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.coulsdon.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.courtauld.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcove.trafford.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cpp.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.craven-college.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-montpellier.fr-idp-shibboleth.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-nantes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.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-paris.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.croydon.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.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.csp.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cssd.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.csudh.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.csusb.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.csus.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.csusm.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ctksfc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cumbria.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cwc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cwu.edu-idp-shibboleth.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-idp-shibboleth.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.davidsonccc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.delval.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.derby-college.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-dev.bangor.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.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-dev.rcpch.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.devsnc.com-openam.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-dev.sussex.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dfn-cert.de.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.dhbw-loerrach.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dhbw-mannheim.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dhbw-vs.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dijon.iufm.fr-idp-shibboleth.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.dkit.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dkit.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dlr.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.drew.edu-nidp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dudleycol.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dundee.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dunstable.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.eastridingcollege.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ecole-navale.fr-idp-shibboleth.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.edina.ac.uk-shibboleth-devel.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.educause.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ekt.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.elon.edu-idp-shibboleth.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-emedea.irccs.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enac.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ens2m.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.esc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.escelje.si-idp-20140916.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.esher.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.es.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.esrc.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.essingtoncc.co.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.esufa.edu.co-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.etrs.terre.defense.gouv.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.eup.edinboro.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpext.test.ek.sll.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fareham.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.farnborough.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.farn-ct.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fashionretailacademy.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fccn.pt-idp-shibboleth.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.fh-duesseldorf.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fh-joanneum.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fh-offenburg.de.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.fh-trier.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fife.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fnal.gov-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fraunhofer.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gatech.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gateshead.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.george-monoux.ac.uk-shibboleth.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.geo-zs.si-idp-20110325.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gla.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.glazer.si-idp-20131113.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gmit.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.godalming.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.goodwin.edu-idp-saml.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.goucher.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gowercollegeswansea.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.grantham.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gre.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.greatplains.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gsmd.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gsm.org.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gyc.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hackney.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hadlow.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hampshire.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.harrow.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hartlepoolfe.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.havant.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.havering-college.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.havering-sfc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hawaii.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hca.ac.uk-shibboleth.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.hec.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.highbury.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hig.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hiu.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hochschule-bc.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.holborncollege.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.holycross.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hrz.uni-kassel.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hs-emden-leer.de-idp-shibboleth.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.hs-harz.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.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.hs-magdeburg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hs-ruhrwest.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hs-zigr.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.htwg-konstanz.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hughbaird.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.iamtest.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ias.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.iastate.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ibot.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.identity.uoguelph.ca-idp-shibboleth.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.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.ifs.org.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.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.ihe.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ijs.si-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ill.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inalco.fr-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.incommonfederation.org-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.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.inra.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inshea.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.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.ipm.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.it.gu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.it.helsinki.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.itmc.tu-dortmund.de:8443.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.it.su.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.its.utexas.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ittralee.ie-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.jisc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.johnruskin.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.juilliard.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.kb.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.kdg.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.kidderminster.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.kingston.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.kingston-college.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.kmc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.knowsleycollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.kutztown.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lambeth.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lancs.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.lapinamk.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lboro.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lcwc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.le.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lec.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.leeds-art.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.leedscitycollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.leyton.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lhup.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lincoln.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lit.ie-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ljmu.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.llandrillo.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lmc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.london.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.londonmet.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.longleypark.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.longroad.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.longsight.com-idp-shibboleth.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.lse.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth-xfr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lstonline.ac.uk-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.lut.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lutonsfc.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lyit.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.macclesfield.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.maine.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.marshall.edu-idp-shibboleth.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.math.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mbl.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mbro.ac.uk-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.merit.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.merthyr.ac.uk-idp-shibboleth.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.mf.uni-lj.si-idp-20111101.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.midchesh.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.millersville.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mines.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mkcollege.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mmu.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.morleycollege.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.motherwell.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.moulton.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mrc.ac.uk-shibboleth.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.mtholyoke.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.natcen.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nbi.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ndevon.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ndsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nelson.ac.uk-openathens.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.nescol.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nescot.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.newbold.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.newdur.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ne-worcs.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nhc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nhl.nl-.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.niesr.ac.uk-shibboleth.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.niu.edu-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.northampton.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.northern.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.northland.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nottingham.edu.cn-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nottingham.edu.my-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nrc.ac.uk-shibboleth.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.nuim.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nulc.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nwhc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nwkcollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nwrc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.oaklands.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.oamk.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.oar.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.okstate.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.osfc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.os-selnica.si-idp-20131118.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.overtsoftware.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.painless-security.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.parchment.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.pct.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.pennkey.upenn.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ph-freiburg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ph-gmuend.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ph-karlsruhe.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ph-ludwigsburg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.pima.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.pitt.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.port.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.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-preprod.u-strasbg.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.primarylogon.co.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.princeton.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.progressivedigitalmedia.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.protectnetwork.org-protectnetwork-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.psc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.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.pugetsound.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.purdue.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.qatar-weill.cornell.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.qmu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rac.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.racc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.radford.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.raidp.org-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rcpch.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rcplondon.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.reed.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.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-renater.pulsalys.fr-idp-shibboleth.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.reutlingen-university.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rhodes.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rice.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.richardtaunton.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.riversidecollege.ac.uk-shibboleth.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/ID-Prov.fh-ludwigshafen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rrz.uni-koeln.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rsmith.org.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-rt.ph-ludwigsburg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ruskin.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rvc.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rz.uni-hohenheim.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sandwell.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sanger.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sbcc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sccb.ac.uk-idp-shibboleth.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.sciencelib.ge-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.scng.si-idp-20130321.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sdsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sfsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sgscol.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.shef.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sheffcol.ac.uk-idp-shibboleth.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/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.shibboleth.qmul.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.shibboleth.ttu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.shi.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ship.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.shu.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.si.edu-idp-shibboleth.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.slcollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.smu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.solihull.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.solihullsfc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.southampton-city.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.southend.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.southport-college.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.south-thames.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.src.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sruc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sru.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.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/idpstaff-ha.belnet.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.staffordcoll.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpStaging.miamioh.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-staging.shibboleth.ox.ac.uk-shibboleth-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.st-andrews.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.stanmore.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.stbrn.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.stcharles.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.stephensoncoll.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.stmarysblackburn.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.stockton.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.stokesfc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.stourbridge.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.stratford.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.strodes.ac.uk-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.sussex.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sussexcoast.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sussexdowns.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.swc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sworcs.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.symplicity.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.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.ta.belnet.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.tamucc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.task.gda.pl-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.tavistockandportman.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.tcat.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.tcat.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.teiath.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.teicrete.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.teikoz.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.teimes.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.teipir.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptest.arts.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-test.brighton.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptest.brunel.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-test.bsms.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptest.coventry.ac.uk-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptest.dundee.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-test.essex.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptest.gla.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-test.lancs.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-test.londonmet.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptest.northumbria.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.test.semantico.net-shibboleth2.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-test.shibboleth.ox.ac.uk-shibboleth-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-test.shu.ac.uk-idp-shibboleth.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/idp-test.warwick.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-test.wmin.ac.uk-idp-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.totton.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.treloar.org.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.tresham.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ttk.mta.hu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.tuc.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.tu-clausthal.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.tu-clausthal.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.tu-ilmenau.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.tulane.edu-idp-shibboleth.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.ua.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uaex.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uark.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ubalt.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ub.hsu-hh.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.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-montaigne.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ub.uni-heidelberg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ucs.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ucuenca.edu.ec-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.udc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.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.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.ufrb.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uft.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ugn.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uhd.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uibk.ac.at-idp-shibboleth.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.ulapland.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.umassd.edu-idp-shibboleth.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/idp.umoncton.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uni-bremen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.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.unical.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unicon.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uni-duesseldorf.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uni-duisburg-essen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.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.uni-konstanz.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uni-lj.si-idp-20100525.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uni-mannheim.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uni-oldenburg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.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.unipi.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.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.uni-stuttgart.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.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.uni-tuebingen.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uni-tuebingen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uni-ulm.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-psl.fr-idp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uni-wuppertal.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unmc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uolia.london.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uowm.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.upatras.gr-shibboleth-idp-.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.upce.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-psud.fr-idp.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.uran.ua-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.usask.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uta.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.utdallas.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uth.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.utk.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.utmb.edu-idp-shibboleth.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.utrgv.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.utsystem.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uttyler.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.utulsa.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uvm.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uwex.uwc.edu-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uwf.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uwic.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uwl.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uwm.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uxbridge.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vito.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vsb.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.waltham.ac.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.warkscol.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.warrington.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.weber.edu-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.we-learn.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wellcome.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.westherts.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.west-lothian.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.weston.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.weymouth.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wit.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wlb-stuttgart.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wm.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wmich.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wmin.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.woking.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wooster.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.worc.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wortech.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wpi.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wpunj.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wsc.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.wvu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.xaverian.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpx.ua.ac.be-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.yeovil.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.yorkcollege.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.uni.lu-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ieeexplore.ieee.org-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ieeexplore.ieee.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/ifg-srv-cafe.ifg.edu.br-idp-shibboleth.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/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/iif.iucc.ac.il-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/imodarugula.imodules.com-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/imodrhubarb.imodules.com-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/imogen.surfnet.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/incommon.sunycnse.com-idp-shibboleth.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/indiid.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/informahealthcare.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/informationservice-test.idoxgroup.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/infp-shib-01.uthct.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml"/>
-<xi:include href="swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/intarch.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranet.merton.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/involvio.com-saml.xml"/>
-<xi:include href="swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.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/isls-shibsp1.wmin.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.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/its-aai-logon.unibas.ch-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/its-shib.its.csulb.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/janus.cnrs.fr-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jcrold.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/jidp.jlab.org-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/journals.bmj.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/judge.wcu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/junebug.mcc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/kbplus.k-int.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/kclidp.kcl.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/keelesu.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/kent.simitive.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/kentsso.simitive.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/keybucket.app.nordu.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/kiidp.ki.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/kitcatalogue.alpha.jisc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/ku-primo-prod.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/kurse.vhb.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/l4l-sp-02.kent.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/l-aai.sztaki.hu-idp.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/laketahoecc.instructure.com-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/lamlash.edina.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/lanet-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/lc-idp.lincolncollege.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/lcm.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/lcmshibboleth.lcm.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ldp.esc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/libauth.com-saml-module.php-saml-sp-metadata.php-springy-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/library-test.lancs.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/liepu-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/list-manager.larpp.internet2.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/lists.eocoe.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/lists.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/lists.geant.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/lma-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/lmu.idm.oclc.org-shibboleth.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/login2.hs-mittweida.de.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.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.airhead.io-shibboleth.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.avans.nl-nidp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.bc.edu-idp-shibboleth.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.bufvc.ac.uk-saml-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.cedia.org.ec.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.cmu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.du.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.emerson.edu-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.emory.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ewu.edu-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-2.0/login.exammonitor.dk-module.php-saml-sp-metadata.php-login.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.fandm.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.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.figshare.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.figsh.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.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.hfwu.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.hmc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.hs-ulm.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.icermali.org-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.iceruganda.org-idp-shibboleth.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.insa-lyon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.justis.com.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.library.dmu.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ligo.org-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.liu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.mayo.edu-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.montana.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.nd.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.noa.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.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.oregonstate.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.otis.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ou.nl-oam-fed.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.portal.uni-muenchen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.regis.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.rz.rwth-aachen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.slub-dresden.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.stolaf.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.talisaspire.com-entity.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-test.st-andrews.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/logintest.wustl.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.tu.kielce.pl-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.uat.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.uc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.uea.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ufl.edu-idp-shibboleth.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.umcs.pl-9443-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.umt.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.unlv.edu-FIM-sps-MyShib-saml20.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.uoc.gr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.utp.edu.pl-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.w-hs.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.wisc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.wustl.edu-idp-shibboleth.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/los.scran.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/lse.ac.uk-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/lse-shibb.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/lu-idp1.lu.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/lu-idp.lu.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/lumii-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/manage.federations.renam.md.xml"/>
-<xi:include href="swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.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/masaq.oucs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/mccall.henley-cov.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/mckinley.csuci.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/meals.oriel.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/meals.some.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/member.goodpractice.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/member.staging.goodpractice.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/metadata.pingdemo.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/metalib01vapp2.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml"/>
-<xi:include href="swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/mira.fapesp.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.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.fsp.uni-lj.si-sp-201411192359.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/mp.uu.se-Shibboleth.sso.xml"/>
-<xi:include href="swamid-interfederations-2.0/msjc.instructure.com-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/myid.vsc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/mylogin.uni-freiburg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/my.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/napier-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/nd.onecampus.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/ndsandbox.onecampus.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/neo236.neocase-software.net-connexion_neocase.xml"/>
-<xi:include href="swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/netid.uwosh.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.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/neuidmsso.neu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/neuresmail.sclintra.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/newcastle-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/nlw-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/notify.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/nsf236.neocase-software.net-connexion_neocase.xml"/>
-<xi:include href="swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/nyu.reclaimhosting.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/nyusteinhardttickets.universitytickets.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/oa.clinicalskills.net-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oala-dev.leedsbeckett.ac.uk-oala.xml"/>
-<xi:include href="swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml"/>
-<xi:include href="swamid-interfederations-2.0/oala-runtime.eastleigh.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oala.trinitylaban.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oala.uws.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oa.pep-web.org-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/oba.coppin.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml"/>
-<xi:include href="swamid-interfederations-2.0/o-las.net-simplesaml.xml"/>
-<xi:include href="swamid-interfederations-2.0/onepass.thomsonreuters.com-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/onlinepayments.gtc.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/online.sagepub.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/online.sagepub.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/online.statref.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/online.wadham.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathens.adults.ccinform.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathens.aston.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathens.rave.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathensr.guildford.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/openstack.hbit.sztaki.hu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/openwiki.feide.no.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/opn-shibb.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/orcid.org-saml2-sp-1.xml"/>
-<xi:include href="swamid-interfederations-2.0/osms.maps-ict.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ousu.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ow.feide.no.xml"/>
-<xi:include href="swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.xml"/>
-<xi:include href="swamid-interfederations-2.0/oxfordideas.wazoku.com-.xml"/>
-<xi:include href="swamid-interfederations-2.0/oxford.saasiteu.com-.xml"/>
-<xi:include href="swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml"/>
-<xi:include href="swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml"/>
-<xi:include href="swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pa2836.peopleadmin.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/papercut.some.ox.ac.uk-shibboleth.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/passport01.leeds.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/payment.statista.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/penn.reunioniq.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/perfsonarui.geant.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/platformdev-secure.palgrave-journals.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pleiades.lesoco.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/plymouth.idm.oclc.org-shibboleth.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.edu-host.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ppms.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pqshibboleth.proquest.com:9443.xml"/>
-<xi:include href="swamid-interfederations-2.0/prdidp.uncg.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/primo.abdn.ac.uk-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/print.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/projecteuclid.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/proxy.nationallizenzen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/psuhr.neocaseonline.com-connexion_neocase.xml"/>
-<xi:include href="swamid-interfederations-2.0/psuportal.neocaseonline.com-connexion_neocase.xml"/>
-<xi:include href="swamid-interfederations-2.0/publishing.rcseng.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pubs.aeaweb.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pubs.ama-assn.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pubs.ama-assn.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/pubs.amstat.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pubs.rsna.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/pymca-wg-gw01.sso.picturemaxx.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/qa.dawsonera.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/qagateway.capella.edu-FIM-sps-CAPLA_SAML2_IDP-saml20.xml"/>
-<xi:include href="swamid-interfederations-2.0/qa.idp.uhi.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/qa-sso.knewknovel.com-entry-uk_federation-Metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/qml.corefacilities.org-account-saml-qml.xml"/>
-<xi:include href="swamid-interfederations-2.0/qmplus.qmul.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/qmul.co-tutor.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/qmulfed.simitive.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/qmul.simitive.com.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/randevu.lab.vvc.niif.hu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/rcnp-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/rcse-prod.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/rdmc.nottingham.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rdmc-test.nottingham.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/refserver.new.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/register-ci.nii.ac.jp-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/registry-dev.icer.niaid.nih.gov-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/registry.icer.niaid.nih.gov-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/registry.larpp.internet2.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.xml"/>
-<xi:include href="swamid-interfederations-2.0/rellias.imodules.com-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.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/repository.abertay.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/retrieverstories-dev.umbc.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/retrieverstories.umbc.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.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/rir.dariah.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rja-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/rnd.feide.no.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/rns.aai.niif.hu-shibboleth.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/royalsocietypublishing.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/royalsocietypublishing.org.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/rs.eqa.ggtest.com-AthensWeb-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/rt.niif.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/rushib.rockefeller.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/rutcathens.rutc.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/rxauth.reaxys.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/sa1.nimr.mrc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/safe.epcc.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/salford.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sal-shib-prod.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/sal-shib-test.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml-1.sys.kth.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml.adu.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml-delegation.data.kit.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml.dhbw-stuttgart.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml.dpsnc.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml.edusafe.nordu.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/samlidp-its.ocad.ca-8443-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml.nelnet.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml.psui.geant.net.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/saml.uvt.nl-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/samlviewer.cf.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml.xi.dante.org.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/sandbox.aai.niif.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/sandbox-eu.alma.exlibrisgroup.com-mng-login.xml"/>
-<xi:include href="swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sarvik.taat.edu.ee-module.php-saml-sp-metadata.php-TAAT.xml"/>
-<xi:include href="swamid-interfederations-2.0/sa-test.ted.is.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sawfish.conted.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/scauth.scopus.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/scccd.instructure.com-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/scotlandonscreen.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/scsh.scran.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml"/>
-<xi:include href="swamid-interfederations-2.0/sdn-openstack.oit.duke.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.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.edusphere.lu-Shibboleth.sso-Metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/secure.aleks.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/secure.binghamton.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/secure.huygens.knaw.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/securemail.feide.no.xml"/>
-<xi:include href="swamid-interfederations-2.0/secure.nature.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/secure.nature.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/secure.palgrave-journals.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/secure.uva.nl-cas.xml"/>
-<xi:include href="swamid-interfederations-2.0/send.goetec.ac.uk-simplesaml.xml"/>
-<xi:include href="swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml"/>
-<xi:include href="swamid-interfederations-2.0/services.aai.mpg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/services-federation.renater.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/services.oxfordjournals.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/services.oxfordjournals.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/sesame.ifsttar.fr-idp-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/sh2testsp1.iay.org.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/shakespeare.acropolis.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shastacollege.instructure.com-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib1.hw.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib1.napier.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib1snc.suffolk.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib1.univ-nc.nc-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib1.uwplatt.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.blackpool.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2idp-2.rgu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.its.rochester.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.swmed.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib2.utep.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.alexanderstreet.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.aylesbury.ac.uk-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.hull-college.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb-idp.cymoedd.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb-idp.georgetown.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb-idp.hs-weingarten.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.blackpool.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.enc.sorbonne.fr-idp-login.jsp-actionUrl--idp-Authn-UserPassword.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth1.rz.hft-stuttgart.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-2.baylor.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2.liv.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2.rwcmd.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.bpp.semcs.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.brillonline.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.bw.semcs.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.col.semcs.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.now.semcs.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.rps.semcs.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.samstest.oup.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2sp.tf.semcs.net-shibboleth.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/shibboleth3.liv.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth-TST.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.allegheny.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.amdigital.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.amdigital.co.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.aws.dev.progressivedigitalmedia.com-shibboleth.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.bca.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.bolton-sfc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.bradfordcollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.brandeis.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.bsu.edu-sso.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.burnley.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.cancom.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.carshalton.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.chadwyck.co.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.coconino.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.csuchico.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.csustan.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-dev.derby.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-dev-v.musc.edu-shibboleth-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.dhbw-karlsruhe.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.dundeeandangus.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.eb.com-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.editure.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.falmouth.ac.uk-idp-shibboleth.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.fiz-technik.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.fucape.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.fullerton.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.genios.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.globaldata.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.globaldata.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.gmu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.hamilton.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.hartpury.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.hct.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-asmjournals.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-asnjnls.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-cobjnls.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-dupjnls.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-jbjsbrumb.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-lcgsl.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-oupacademic.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-oxfordservices.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-physiology.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-rupjnls.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org-entity-secure-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.highwire.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.hrc.ac.uk-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.huddnewcoll.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.admin.furness.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.collegenet.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.don.ac.uk-shibboleth.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.ics.forth.gr-idp-shibboleth-.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.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-test.webbased.co.uk-idp-shibboleth.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-regensburg.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-wuerzburg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ifes.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.illumina.csa.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.imperial.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.imperial.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.its.msstate.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.iumis.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.iwcollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.kcollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.knovel.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.lib.uh.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.louisville.edu-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.metapress.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ncgrp.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ncl-coll.ac.uk-idp-shibboleth.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.nptc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.nss.udel.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.oldham.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ovid.com-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ovid.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.pace.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.plumpton.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.rcn.org.uk-idp-shibboleth.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.riversidecollege.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.runshaw.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.salisbury.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.selby.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.serc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-sp.pre.proquest.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-sp.prod.proquest.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-sp-test.webbased.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.staffs.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.stamford.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.statista.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.strode-college.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.stvincent.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.submit.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-test.cranfield.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboletht.lsbu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.truro-penwith.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.twu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uams.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uchastings.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uconn.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.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.uic.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ulbra.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.umich.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uni-bonn.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uni-trier.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uni-trier.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.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-savoie.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uoregon.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.usu.edu-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/shibboleth.uta.fi-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uwyo.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.vcu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.webassign.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.webbased.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.westking.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.wmintelligence.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.wolvcoll.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbox.charanga.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbox.lpplus.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbserver.preston.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbsrv1.gsa.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb.srv.hull-college.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb.stockport.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.bu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb.utpb.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb.ws.seemis.gov.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.byu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibby.wmc.ac.uk-shibboleth-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb.zalf.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.calu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ccbcmd.edu-idp-shibboleth.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.csub.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-dev-idp.ucl.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibdev.shef.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.dur.ac.uk-444-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.dur.ac.uk:444-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.exprodo.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.fortlewis.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.gcu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.hope.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.hopwood.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp-1.oru.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp2.uth.tmc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.amherst.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.awi.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.bates.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.bloomu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.cit.cornell.edu-idp-shibboleth.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.colostate.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.dev.ja.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.hs-osnabrueck.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.its.csufresno.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.kgv.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.ku.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.luc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.rpi.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.siu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.syr.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.tameside.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.tufts.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.ucl.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.uclan.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.umsystem.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.uni-hildesheim.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.uwo.ca-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.varndean.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.wcupa.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.whoi.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.wnc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.wqeic.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.wsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ingramdigital.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.lexisnexis.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/shiblogin.hull.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.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.mcnallysmith.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.mdanderson.org-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.med.cornell.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.newbury-college.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.nnc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ou.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.pebblepad.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ph-heidelberg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-pprd.middleware.vt.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibprodapp.loyola.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.rcs.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.reaseheath.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.rio.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.slcs.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.sou.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-sp-01.ntu.ac.uk-shibboleth.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/shibsp.ntu.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-sp.unity.ac-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibtest.copac.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibtest.idp.mimas.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibtest.zetoc.mimas.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.towson.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-uat-idp.ucl.ac.uk-shibboleth.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.ukmsl.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ulster.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.uni.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.uni-mainz.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.univ-reims.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.urz.uni-halle.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.utb.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.uthscsa.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.uvu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.wheatonma.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.wit.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.worldcat.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shidp.glam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/shi-idp2.rz.fh-muenchen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shu-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/shu.unidesk.ac.uk-shibboleth.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/sid.kent.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sidp.wwu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/sid.swarthmore.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/signin.k-state.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/singlesignon.gwu.edu-idp-shibboleth.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/skmms-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/slademedia.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/slateford.edina.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/slcs.pca.dfn.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/smidp.uwstout.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/smile.informatik.uni-freiburg.de-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/snf.esc.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/soasunion.org-shibboleth.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/solo-dev.bodleian.ox.ac.uk-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/solutions.sciquest.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sonny.furman.edu-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sonotc.cirqahosting.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sos.scran.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/soton.co-tutor.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sounds.bl.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/soundstage.bl.uk-shibboleth.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/southdowns.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp1.colegsirgar.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp1.segfl.org.uk-shibboleth.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/sp2.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.asknet.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.careknowledge.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.catalog.clarin.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.cat-portal.epigenesys.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.cds.stfc.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.clarin.si-.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.cliowebhost.co.uk-Patron-Stirling-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.colegsirgar.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.data.alpha.jisc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-fedhub.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-portal.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.demo.researchspace.com-shibboleth.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.eblib.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.eblib.com.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-agcensus.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-cris.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-depot.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digischools.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-shibboleth-m2m.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.elearning.uni-bremen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.igpublish.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.issuesonline.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.kbplus.ac.uk-shibboleth.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.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.lamlash.edina.ac.uk-shibboleth.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.moodledo.co.uk-shibboleth.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.owncloud.gla.ac.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.primaryblogger.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.primarylogon.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/spprod.targetconnect.net-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.refme.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sprov.d2digital.co.uk-.xml"/>
-<xi:include href="swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.sae.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.schoolspeoplenet.nsix.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-accp-development-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-accp-production-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-accp-qa-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-accp-staging-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-aclands-development-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-aclands-production-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-acp-development-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-acp-production-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-ama-development-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-ama-production-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-ama-staging-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-asme-production-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-bates-development-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-bates-production-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-bates-staging-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-spie-development-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-spie-production-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-spie-qa-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-spie-staging-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-wk-development-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-wk-production-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.silverchair.com-wk-staging-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.strubi.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.studentsponge.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.swamid.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp-test.swamid.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.thestudentroom.com-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.tshhosting.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.tshhosting.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/spuat.targetconnect.net-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.uk-plc.net-shibboleth.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/sp.vivomiles.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/srmo.sagepub.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/srv00847.soton.ac.uk-shibboleth.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/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sse-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.artstor.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.augsburg.edu-simplesaml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.brockport.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.brown.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.bsfc.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.canterbury.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.cc.lehigh.edu-sso-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.cedarville.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.connectis.nl-broker-sso-tpd-ukf.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.csumb.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.davidson.edu-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso-demo.proofidcloud.co.uk-idp-pingfederate.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.ecu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso-ed.datamonitor.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.educause.edu-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso-edu.datamonitor.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso-epos.some.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.eur.nl-opensso.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.fau.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.ft.com-sso-sp-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.han.nl-ssp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.h-da.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.hsc.edu-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.it.utsa.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.kenyon.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.kgv.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.legendonlineservices.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.loucoll.ac.uk-shibboleth.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.mathletics.com-ukfederation.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso-meals.some.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.memphis.edu-idp-shibboleth.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.onesource.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.pacificu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.saxion.nl-opensso.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.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.sunderland.ac.uk-auth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.uah.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.ucd.ie-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.umk.pl-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.umuc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.uni-passau.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.unt.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.u-psud.fr-idp.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.vito.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/ssp.kennedy.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/stage.mahara.qmul.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/stage.qmplus.qmul.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging.anatomy.tv-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging.jorum.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging.lifeisaboutlearning.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging.ords.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging.portal.euromonitor.com-athens.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging.researchmonitor.euromonitor.com-web-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging.researchprofessional.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging-secure.nature.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging-secure.palgraveconnect.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging-secure.palgrave-journals.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/staging.weblearn.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/st-andrews.unidesk.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/stg.reachoutcpd.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/stir.unidesk.ac.uk-shibboleth.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/sts.ait.dtu.dk-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/sts.edugroepen.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/sts.learnium.net-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/sts.uidaho.edu-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml"/>
-<xi:include href="swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.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/study.conted.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/submissions.ref.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/subscription.echalk.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/sus-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/swamid.user.uu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/swa-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/swlite.sci-ware-customer.com-shibboleth.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/take-shape-share.fenc.org.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/talli.funet.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/tamana.msh-paris.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/tandfqa.literatumonline.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/tandftest.literatumonline.com-shibboleth.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.xml"/>
-<xi:include href="swamid-interfederations-2.0/tc-web-01.groupgti.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/tc-web-02.groupgti.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/tc-web-03.groupgti.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.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.abertay.unidesk.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-adfs.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-auth.galegroup.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.ed.unidesk.ac.uk-shibboleth.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/testidp1.ntu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-idp.dante.net-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/testing.lifeisaboutlearning.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.j2e.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.repository.abertay.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.rpharms.com-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.shu.unidesk.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-sp.aco.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-sp.ihs.com-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.stir.unidesk.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.ufit.onecampus.com.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/test.ulster.unidesk.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/testx.rewley.ox.ac.uk-shibboleth-sp.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/thelonious.campusguard.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.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/tickets.sheffieldstudentsunion.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/topdesk.test.bath.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/topdesk-training.test.bath.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/topup.chch.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/training.nicurriculum.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/translation.rnd.feide.no.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.digitaltheatreplus.com.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/uat-nsuk.elsevieremea.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat.staffsubs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat.v-scene.ja.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ucl.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/ucreative.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ucs.cirqahosting.com-shibboleth.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/ufit.onecampus.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/uisshibb1.uis.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ukamf.belfastmet.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ukdsdev01.ds.man.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ukdsdev02.ds.man.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ukfederation.ecu.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ukfed.one-test2.contrail.rl.ac.uk-portal-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/ukidp.uky.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/uk.ihs.com-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/ukmyms01-zone02.smg-uk.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/uk.practicallaw.com-cs-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/ulster.unidesk.ac.uk-shibboleth.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/umshibp.olemiss.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/unigepass.unige.it-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/unmpidp.unm.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/uoe-shib.hosted.exlibrisgroup.com-shib.xml"/>
-<xi:include href="swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/upki.yamagata-u.ac.jp-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-fi-fer.hubhn02-1.0.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-ibistic-prod-dk.ibistic.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-dur.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-shibboleth-i.sgul.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-liv.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.galaxy-test.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.lifeportal.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-alaska.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-arizona.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-asu.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-berkeley.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-carleton.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-case.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-clemson.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-columbia.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-csun.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-dartmouth.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-duke.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-humboldt.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-idp.protectnetwork.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-internet2.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-iu.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-jmu.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-johnshopkins.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-lafayette.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-lbl.gov.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-mit.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-mlml.calstate.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-msu.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-muohio.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-nau.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ncsu.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-nih.gov.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-northwestern.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-nyu.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-odu.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ohio.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ohiolink.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-osu.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-psu.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ramapo.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-richmond.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-rock.k12.nc.us.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-rutgers.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-sc.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-stanford.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-starkstate.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-stevens.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-stonybrook.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-tamu.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-uab.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucdavis.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-uchicago.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-uci.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucla.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucmerced.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucop.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucr.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucsb.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucsc.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucsd.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-ucsf.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-udayton.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-uiowa.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-umbc.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-umn.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-unc.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-unoh.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-usc.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-usf.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-utah.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-uww.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-virginia.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-incommon-washington.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml"/>
 <xi:include href="swamid-interfederations-2.0/urn.nbi.ku.dk-saml-sp-wayf.xml"/>
-<xi:include href="swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/usertest.sciquest.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/utwente.nl-.xml"/>
-<xi:include href="swamid-interfederations-2.0/uwgb.edu-idp.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/venturacollege.instructure.com-saml2.xml"/>
-<xi:include href="swamid-interfederations-2.0/verify2.newsbank.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/verify.cranfield.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/verify.dmu.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/verify.sheffield.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/via-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/vince.csueastbay.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/vis-dev.arc-ts.umich.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vision.port.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vm-jorum.ds.man.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vm-jorum-live.mimas.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vm-shibboleth.umb.edu-idp-shibboleth.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/voparis-auth.obspm.fr-.xml"/>
-<xi:include href="swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/voting.wlv.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vpp.midlands3cities.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/v-shibboleth.cant-col.ac.uk-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vsu-pbslive-01v.vsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.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/vwww.itslearning.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wasp.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.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.onderwijsgroeptilburg.nl-adfs-services-trust.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/wccidp.west-cheshire.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webapp.rz.rwth-aachen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/webauth.auburn.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webauth.cmc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webauth.meredith.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webauth.njit.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webauth.scrippscollege.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webauth.shib.lsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webauth.soton.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webauth.umaryland.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webauth.umass.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webauth.uncc.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webauth.wfunet.wfu.edu-saml-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/web.chorus.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/weblearn.ox.ac.uk-shibboleth.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/weblogin.albany.edu-shibboleth-idp2.xml"/>
-<xi:include href="swamid-interfederations-2.0/weblogin.dante.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/webshop.rz.uni-wuerzburg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/webso.iup.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/websso.pomona.edu-.xml"/>
-<xi:include href="swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/webtut.fccn.pt.xml"/>
-<xi:include href="swamid-interfederations-2.0/web.tut.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/western.sclintra.com-shibboleth.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-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/wiki2.redclara.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki-cswarm.crc.nd.edu-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.imz.hs-furtwangen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.larpp.internet2.edu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.osris.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.research.data.ac.uk-shibboleth.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/wikis.ncl.ac.uk-shibboleth-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/wireless.balliol.ox.ac.uk-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/wiseflow.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wpkfl-shibidp.fullsail.com-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wtc.tu-chemnitz.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/wws.redi-bw.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.123library.org-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www2.eduid.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/www2.eduroam.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/www2.foodle.cz-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www2.munzinger.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.2simple.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.abersu.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.abintegro.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.accessible.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.adults.ccinform.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.annualreviews.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ascopubs.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ascopubs.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.astonsu.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.b2i.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.bathspasu.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.bathstudent.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.bfi.org.uk-inview-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.bioone.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.birpublications.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.bjhcm.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.blikbook.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.bridgemaneducation.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.brightonsu.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.bristolsu.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.britishonlinearchives.co.uk-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.bucksstudentsunion.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.cairn.info-.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.callforparticipants.com-institutional-login-entity.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.cans.org.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.cardiffmetsu.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.careers.lon.ac.uk-democareerstagged-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.careers.lon.ac.uk-thecareersgroup-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.careers.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.cartoons.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.childlink.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.classiques-garnier.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.cnn.group.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.communistpartyarchive.org.uk-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.content-select.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.crcnetbase.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.creativeclub.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www-cvdc.eng.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.cypnow.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.dailywhat.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.dawsonera.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.dbod.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.degruyter.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.degruyter.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.demontfortstudents.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.dental-nursing.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.digicert.com-sso.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.digitaltheatreplus.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.dl.begellhouse.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.edgehillsu.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.elearning.tum.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.elsevierclinicalskills.co.uk-oa-metadata.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.emplaw.co.uk-simplesaml-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.era.lib.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.era-test.lib.ed.ac.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.essexstudent.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.euppublishing.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.europeansources.info-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.eusa.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.exacteditions.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.exeterguild.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www-falcon.csx.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www-fr.redi-bw.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.futuremedicine.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.future-science.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.fxu.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.gkunions.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.glew.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.goglasgow.org.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.guilfordjournals.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.hallamstudentsunion.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.hds.uni-leipzig.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.hellou.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.historicum.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.icevirtuallibrary.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.images.group.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.imperialhomesolutions.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.independence.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.infectiousdisease.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ingentaconnect.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.itslearning.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.j2e.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jbe-platform.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jisc-collections.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jiscmail.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jospt.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jove.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jstor.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jstor.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jusp.mimas.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jwatch.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.jwatch.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.karger.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.kclsu.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.kedst.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.kentunion.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.k-int.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.klarro.net-shibboleth.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.languagesciences.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.lawtel.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.learninggrids.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.leedsuniversityunion.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.listening-books.org.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.litencyc.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.loebclassics.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.login.amdigital.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.login.dumgal.ac.uk-oala-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.londonmetsu.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.lrb.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.lsbsu.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.lsesu.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ltscotland.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.luu.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.magonlinelibrary.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.maneyonline.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.mecenat.eu-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.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.mitpressjournals.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.mmunion.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.morganclaypool.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.myinterfase.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.nejm.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.nescolvoting.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.newscientist.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.nrcresearchpress.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.numeriquepremium.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.nurseryworld.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.nusu.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.oecd-ilibrary.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ohsu.edu-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.openconext.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.ordbogen.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.pathcal.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.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.portal.ted.is.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.propylaeum.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.publicinformationonline.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.purplemash.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.qmsu.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.qoam.eu-.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rcpsych.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rcpsych.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.reachoutcpd.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-ehuidp.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-umidp.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-upvidp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-usjidp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.reference-global.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rememberingscotlandatwar.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rguunion.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ripdev.co.uk-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ripfa.org.uk-oa-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ripfa.org.uk-openathens.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rsmjournals.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ruhrcampusonline.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rusu.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sauws.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sbs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.school-portal.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sci-ware-customer.com-prod-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.scl.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sdeo.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.service4mobility.com-europe.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sjcoxford.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www-s.redi-bw.de.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.sss.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.stirlingstudentsunion.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.structuralbiology.eu-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.studisoft.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sussexstudent.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.swansea-union.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.swetswise.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sympa.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.tandfebooks.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.tandfonline.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ted.is.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www-test.cartoons.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www-test.cartoons.ac.uk-_sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www-test.idcore.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www-test.portal.ted.is.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www-test.ted.is.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.theunionmmu.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.thieme-connect.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.tigtagworld.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www-trg.eng.cam.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www-trn.portal.ted.is.ed.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.tu-chemnitz.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.twigonglow.com-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ubu.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.udsu.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.umaber.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.uni-market.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.unochapeco.edu.br-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.upay.co.uk-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.upsu.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.uusuvote.com-shibboleth.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.video2brain.com.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.vifamusik.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.vifarom.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.vist.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.walesdtc.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.warwicksu.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.westlaw.co.uk-metadata.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.wheredoyoustand.org.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.wolvesunion.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.yourstudentsunion.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.yourunion.net-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/x5.bsp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/xploreuat.ieee.org-shibboleth-sp.xml"/>
-<xi:include href="swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/yorksso.simitive.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.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-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml"/>
-<xi:include href="swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-interfederations-2.0/1010SE17FAM-V03.famerp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/1010SE17FAM-V03.famerp.br-idp-shibboleth.xml
deleted file mode 100644
index 0eeef954..00000000
--- a/swamid-interfederations-2.0/1010SE17FAM-V03.famerp.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://1010SE17FAM-V03.famerp.br/idp/shibboleth">
-  <md: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>
-  </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">famerp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FAMERP - Faculdade de Medicina de Rio Preto</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">FAMERP - Faculdade de Medicina de Rio Preto</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FAMERP - Faculdade de Medicina de Rio Preto</mdui:Description>
-        <mdui:Description xml:lang="pt-br">FAMERP - Faculdade de Medicina de Rio Preto</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.famerp.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.famerp.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC3jCCAcYCAQAwDQYJKoZIhvcNAQEFBQAwNTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEYMBYGA1UEAxMPMTAxMFNFMTdGQU0tVjAzMB4XDTE1MTExMTE4MTEx
-OFoXDTE4MTExMDE4MTExOFowNTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEY
-MBYGA1UEAxMPMTAxMFNFMTdGQU0tVjAzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAs35C96cae6HotPptuHb31jj78SqAX2VAW+ghyUZvG8BS3zTBnc0o
-pqB5xkKiSnHUTTBIShlpRRgLnwv/5K99Yqkw0gL4je6c5t+l+nU0NNAlkCp6Sdac
-mI/JdXm72rED2VX2OuTLuZZt4ezoblhaJl4rfxVU0N7gto4vcLsUsHrTp9BskSk4
-0QbCfGhMuDNm7i8d2z0y6L/fy++bjKkzzsBTu71ZDTIy3hmrrZDuPSdPKFoCQz/R
-QHMBq2n4BJFYuDGoadeNHFiPJfpdqOOOF00FQCJtrFaJeRM5+CEeKh5qoFSt6Krd
-J+Ysn+isP3tu2HaPKzcpi83uAXt+EdHkDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCUvPYzLFvAoSdLliRuUKcNNiGFOwUr0DBUELsN+tpKn5sKAJhfONkwihG3Ym40
-6LUtxKuOK1gIDEPINhcv91d81dQowUfjEwd1ovaoSngK5D82zGx98cYHff0S6ahH
-wOJxhkLH4dzLOO+TlRBK0XJHcgDadgkIgPbEOVUy5A3YvFm0Sz2FGu55oQItilK1
-bvlYxi/3H8gw7Q5gl0kpFqzajcsNPmLJHqjYHkCeKG3d9Cn1aQNozqJToXTz9D6c
-18BMRBxE6HjineIuaNcVPROkHt42bS3I4+InmCQCzaH8L4dPBTTxcFnSQIMa+Ko0
-OIFoXRLcQ4+oGzgukcHZg8eG
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://1010SE17FAM-V03.famerp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://1010SE17FAM-V03.famerp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://1010SE17FAM-V03.famerp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://1010SE17FAM-V03.famerp.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://1010SE17FAM-V03.famerp.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://1010SE17FAM-V03.famerp.br/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">famerp.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC3jCCAcYCAQAwDQYJKoZIhvcNAQEFBQAwNTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEYMBYGA1UEAxMPMTAxMFNFMTdGQU0tVjAzMB4XDTE1MTExMTE4MTEx
-OFoXDTE4MTExMDE4MTExOFowNTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEY
-MBYGA1UEAxMPMTAxMFNFMTdGQU0tVjAzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAs35C96cae6HotPptuHb31jj78SqAX2VAW+ghyUZvG8BS3zTBnc0o
-pqB5xkKiSnHUTTBIShlpRRgLnwv/5K99Yqkw0gL4je6c5t+l+nU0NNAlkCp6Sdac
-mI/JdXm72rED2VX2OuTLuZZt4ezoblhaJl4rfxVU0N7gto4vcLsUsHrTp9BskSk4
-0QbCfGhMuDNm7i8d2z0y6L/fy++bjKkzzsBTu71ZDTIy3hmrrZDuPSdPKFoCQz/R
-QHMBq2n4BJFYuDGoadeNHFiPJfpdqOOOF00FQCJtrFaJeRM5+CEeKh5qoFSt6Krd
-J+Ysn+isP3tu2HaPKzcpi83uAXt+EdHkDwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCUvPYzLFvAoSdLliRuUKcNNiGFOwUr0DBUELsN+tpKn5sKAJhfONkwihG3Ym40
-6LUtxKuOK1gIDEPINhcv91d81dQowUfjEwd1ovaoSngK5D82zGx98cYHff0S6ahH
-wOJxhkLH4dzLOO+TlRBK0XJHcgDadgkIgPbEOVUy5A3YvFm0Sz2FGu55oQItilK1
-bvlYxi/3H8gw7Q5gl0kpFqzajcsNPmLJHqjYHkCeKG3d9Cn1aQNozqJToXTz9D6c
-18BMRBxE6HjineIuaNcVPROkHt42bS3I4+InmCQCzaH8L4dPBTTxcFnSQIMa+Ko0
-OIFoXRLcQ4+oGzgukcHZg8eG
-                          
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://1010SE17FAM-V03.famerp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://1010SE17FAM-V03.famerp.br:8443/idp/profile/SAML1/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">FAMERP - Faculdade de Medicina de Rio Preto</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">FAMERP - Faculdade de Medicina de Rio Preto</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">FAMERP - Faculdade de Medicina de Rio Preto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">FAMERP - Faculdade de Medicina de Rio Preto</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.famerp.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.famerp.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Joao Marcelo Rondina</md:SurName>
-    <md:EmailAddress>joaomarcelo@famerp.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-shibboleth.xml
deleted file mode 100644
index 7d0fd965..00000000
--- a/swamid-interfederations-2.0/2012.qmplus.qmul.ac.uk-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://2012.qmplus.qmul.ac.uk/shibboleth">
-  <!--
-		This is a "2012 Archive service QMPlus" Shibboleth SP for Queen Mary and Westfield College, University of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-30T09:22:05Z">
-      <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://2012.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAKfCPp1ZOBsNMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFjIwMTIucW1wbHVzLnFtdWwuYWMudWswHhcNMTQwNjI1MDk1ODE3WhcNMjQw
-						NjIyMDk1ODE3WjAhMR8wHQYDVQQDExYyMDEyLnFtcGx1cy5xbXVsLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtKJY1LEzeMszLBA7vIwDWTvd
-						a07jaXtUFBdFyEqnwBIr91EJxyCdkHd4qGhw3riCUE5XEEaHq7YkIA1sHjzAxkv3
-						bpjnI1iaP4gU4+Dwec0kJ4VkPFt4vE6TSICeA//DBrL+ZMcD8hjZDRhTxAHv9t96
-						bIfsmxrlBizuS6GAAAHm3eWbzYJ6V5tf79Z9GZjMTjZtrloem4B1+UsS0Ze17CU9
-						liUSJUZKT39gQN7JywnQ+DAkGe1rfQmQHdwdt1ekPnPomOBy9h6aymxgOqGHxmIK
-						l2tixtmYVZYoAPlrDEZEtdU6BRUMPiJCYlz/wG+QRN75PvMjbmpNIKAyJUwAZwID
-						AQABo0QwQjAhBgNVHREEGjAYghYyMDEyLnFtcGx1cy5xbXVsLmFjLnVrMB0GA1Ud
-						DgQWBBS9sdhTGd7ns9eUGONqUjAaTo1ADjANBgkqhkiG9w0BAQUFAAOCAQEAKtjj
-						o3HiYvqfjOcaUNv0yq3i3LCTf+PobbmX5YBXDBQhYrvkuaUcfTRr6hIE86RZwMC7
-						9rGV63IqTKQtpjF3odt/rSTNgRz0iEc2p+HtCdN4cBR6aSEwOyHfj8MotC8L5JO9
-						3GTfasl+ZuRDEtsgZeIZv+zIjO1CDL6eE/OyyMo9bFmvOrrvGKXp01LR2VuqEy+M
-						s9GzHa6yGaWQBoQaLVXMhRT3AM3y9hRh1P4GgsIS+Z0oOeW1VGEg6nDC29fXLfrN
-						YWbnO44vlTi3MGoezwxe/U2v+4+rXPEJ28rVZp74FaLYsR+5OpsC5VR7moj78OWF
-						uifWa1iscTfgACwOQg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://2012.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College :2012 Archive service QMPlus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Academic Applications</GivenName>
-    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Moodle Support</GivenName>
-    <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Academic Applications</GivenName>
-    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/2013.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/2013.qmplus.qmul.ac.uk-shibboleth.xml
deleted file mode 100644
index 699d60f4..00000000
--- a/swamid-interfederations-2.0/2013.qmplus.qmul.ac.uk-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://2013.qmplus.qmul.ac.uk/shibboleth">
-  <!--
-		This is a "2013 Archive service QMPlus" Shibboleth SP for Queen Mary and Westfield College, University of London.
-	-->
-  <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-30T09:30:34Z">
-      <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://2013.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAPF6LFlIA32CMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFjIwMTMucW1wbHVzLnFtdWwuYWMudWswHhcNMTQwNjI1MTAzNDEyWhcNMjQw
-						NjIyMTAzNDEyWjAhMR8wHQYDVQQDExYyMDEzLnFtcGx1cy5xbXVsLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw6/lcGM+dX3Di5zb59Vgc9Nk
-						pua1wWdwr4a0f/r7OIpzAy9eAJyTh/OSOZ1OOBfnqUfyyyQDKYNEo/647esD2BsS
-						pcTVNI0gyiL5RDgrYWKUyHYR0ABfWE7dcH8C3dqqvA+p1Gw5919DhqJ5bGjid9aJ
-						FJcAIybDhEhLGPsrrleHYVJTvORhr5Nx9JSUPGOBbPrvnan6e4WDgF+0Ag9F2tqR
-						Ew1k3AAfcEQoJ1zYW30lpPvAcCcPXq0S0KMt7tyTCj8QwBzTL4grtUDrxHlNDGge
-						mh8y4mNRqovf6BaFtiw7qDR6bMb6zSMMQslba1elMPcKDsHpjVFrUyuSLaQrLQID
-						AQABo0QwQjAhBgNVHREEGjAYghYyMDEzLnFtcGx1cy5xbXVsLmFjLnVrMB0GA1Ud
-						DgQWBBT4f7ZeBIp8yxs6bHP+sIwzrWqgCDANBgkqhkiG9w0BAQUFAAOCAQEAo17z
-						s4xG2srq3DBGYf6AIjAnbFmdHwcJ+LlZ1iubB4mA6p/UhgmFo7VRQuguLCOu7ODN
-						l+hl7Dwrqlm5EFXy/wZ1U4PKFwubjcWRpdwTacucVE7gsJ89Fc+biQF9gx+wfbF9
-						ivhUzzOPK7uduFxzmkiVqBUMay2jzHk4PKavzUKYwyMJq67oEkgzAVqMhsrSY06Q
-						NXPEera7rHya4c+6acbmYPyzDIUPNe9AfBEkqiyIT2XoMtE+bJGEIyrhE1Guir4W
-						wW1DKXTMp8Y/c74joFVC0Eu3ZDdzGDLbkZRrYbH4868mcA+zAVLXWXpHVD62XXQX
-						d9OOKeCgcXtItuvjoQ==
-					</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://2013.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://2013.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://2013.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://2013.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://2013.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://2013.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://2013.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College : 2013 Archive service QMPlus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Academic Applications</GivenName>
-    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Moodle Support</GivenName>
-    <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Academic Applications</GivenName>
-    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/2014.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/2014.qmplus.qmul.ac.uk-shibboleth.xml
deleted file mode 100644
index b0509509..00000000
--- a/swamid-interfederations-2.0/2014.qmplus.qmul.ac.uk-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://2014.qmplus.qmul.ac.uk/shibboleth">
-  <!--
-		This is a "2014 Archive service QMPlus" Shibboleth SP for Queen Mary and Westfield College, University of London.
-	-->
-  <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="2015-06-11T12:33:19Z">
-      <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://2014.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAIIweJrqmrIEMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFjIwMTQucW1wbHVzLnFtdWwuYWMudWswHhcNMTUwNjAzMTE1MTU1WhcNMjUw
-						NTMxMTE1MTU1WjAhMR8wHQYDVQQDExYyMDE0LnFtcGx1cy5xbXVsLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6wqhw1O4q0vYMXU94rcHQ44P
-						Rxd9Zx6PTEWaZP7839SzVFstPegyYcLHcUnqVW4EM1kX7+MnDHk48/VrAaXa7Pbj
-						TBaIg10O9V4uGAlMkdHD0GyNEeMWNKhfO4cpDs2WaRSBlHLcTIDXKmjoEZDDqaa8
-						fuxEmEVc1Bm8Ao4qKCv4y5bBDL9aMvo9rw1OTJgXWgX/FyhznUUqpUYaZPWWMS+t
-						HyTejxQCNCLi+UEIgpnGQngS/tj765jkbt2z9DB+SqHmYRPOtHhmtqdjWVfzdBaI
-						5HyeS1TGob3qHVvVX8JgRA2dOzWx+eokpxjMV30+oHZFkClhWg43stCtkH9ZrQID
-						AQABo0QwQjAhBgNVHREEGjAYghYyMDE0LnFtcGx1cy5xbXVsLmFjLnVrMB0GA1Ud
-						DgQWBBQJlVc050moorXGSGplCA/WkCNCijANBgkqhkiG9w0BAQUFAAOCAQEAsXcc
-						62YIy3TqdHgIbgUbS9mEnQtH3gXyOMswYfHLnDILQM1QXQSGRC4ccTbd5Jb1EUt0
-						uE06Hfoo9Q0veZx/hfSQXHTCyhBmTEbcM6+FhN4I57egx2BQbxOut+628IqRSis9
-						DLBzrI9SODauIBuk4zyGkERTFR8vTaG7d1sDGidmwmoHqPY0OJkZ4yMJmvEi75rY
-						3L5yl3KWi9tgzzRPEO3FXS1eyXhsdcpBhRunJFCrS6smzYDpI+J2+New+HxV90ZO
-						ZvbjbDXchMopj9OKggJg7+Kazs+zPkL61kXjirvEJAfiM+34yCwtH3D3ZgDs0ZnS
-						utfRdwVfCY936z7DOA==
-					</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://2014.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://2014.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://2014.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://2014.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://2014.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://2014.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://2014.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College : 2014 Archive service QMPlus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Academic Applications</GivenName>
-    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Moodle Support</GivenName>
-    <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Academic Applications</GivenName>
-    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/44new-primo.hosted.exlibrisgroup.com-shibboleth.xml b/swamid-interfederations-2.0/44new-primo.hosted.exlibrisgroup.com-shibboleth.xml
deleted file mode 100644
index 7962aaa9..00000000
--- a/swamid-interfederations-2.0/44new-primo.hosted.exlibrisgroup.com-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://44new-primo.hosted.exlibrisgroup.com/shibboleth">
-  <!--
-		This is a "Primo Resource Discovery at Newcastle University" Shibboleth SP for Ex Libris (UK) 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="2015-01-07T11:11:38Z">
-      <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://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Newcastle University - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Newcastle University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh6gAwIBAgIJAIdGru6Iz9m0MA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-						BAMTJWRjMDN2ZzAwMjJldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTEw
-						OTAxMTIyMTEzWhcNMjEwODI5MTIyMTEzWjAwMS4wLAYDVQQDEyVkYzAzdmcwMDIy
-						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAuZcRSbYJXYqvCMDcsN1NvvfB37VY156cSBF8FUKYdu1yco+G
-						534wiphhYFRsnkDnUuAP9yQED27E/rGfdWrQ3OhkDViuEkKxWhzqYSzopxe/5y6i
-						4oNFORY6HpbdrqF21IZc8bfspS7uz6oOET6V1hYIhd3V5nOTB5VyO1CdKd7o65wr
-						CTGj2rzKDXb4uj0HKST3aRLK26jlER5x9uR68RW4nUM45/vmHRgyqfKd+pVMPld2
-						TCGDh/jmFvjyHlzZf6jXMgVAgDUAvFXWgCxPo2fuOqlWpVJTalj3CK7uuEx6+SUk
-						I3g+FyUC5sJGMTEOwFgKjhOECeYU8+5a/zqnFwIDAQABo1MwUTAwBgNVHREEKTAn
-						giVkYzAzdmcwMDIyZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
-						BBQPC+IZUQn+WJezFAf2U7VnfAJiKjANBgkqhkiG9w0BAQUFAAOCAQEAbK7NgNnG
-						T3qgmYt+4otVR0DBCGlsj50HFvNb4C4uWOEWREUZ9Bb3Ju7E49zMRzf96HpWZneS
-						cfaUQrhYl1n8grNGdy8O0PXffSkqr0d9FfaT3IkuIQSqy6mi198brqgVeyNR5BjR
-						bi3OGv48vQdkPhzzTR5/H5/mi4U0i54sSI8GFkcRjytrqS1eqdHDRVFkdXbaKsaU
-						o+p64ZHxRlqxaFsieCz+5CdiqP9pJwHX3ghS40QMYAMP+P43YJmSlc9FnseWulik
-						1k3+idQuyryJBp0mPLCliosixjLmjXoRRDUJT8uu6J1kDnzQj3Hiub7Ag5Noo05F
-						IRUjVAaivivDPg==
-					</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://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://44new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at Newcastle University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/44uoc-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/44uoc-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 23ad68b0..00000000
--- a/swamid-interfederations-2.0/44uoc-shib.hosted.exlibrisgroup.com-shib.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://44uoc-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "Primo - University of Cumbria" Shibboleth SP for Ex Libris (UK) 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="2015-11-26T11:18:34Z">
-      <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://44uoc-shib.hosted.exlibrisgroup.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://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAPWl7V7VX/BFMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwNDQwHhcNMTUxMDI1MTQ0NTQ2WhcNMjUxMDIyMTQ0NTQ2WjASMRAw
-						DgYDVQQDEwdhaW8wMDQ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						uIcM5XvuJ5roqwsphtfHdwjxqIVJunIy0pwyck/KeRY0rZy3K/ai42qCmTdSPGMU
-						Wrwfdl/JR8A4e2/b/AntlpDl2/G+jPQ3dhFx4eG/sk04ut/X+LO0RuGNdkKe4VbJ
-						ha63y/A9kE9a1lQ8oKsqed8Cr0nmB5H/nthYQ6UA+8aRZWO1g0qT6UHg5CTX7Zub
-						sIkn3bQgNm5dVUFj5x6CBMeWHz+BWy3XzXn75kI4pN1NZ9HiD8jGmQCFF6lRzizJ
-						TUjtKQhypNhcFrQKoMwMXgs8x4qB4MAI302NaBIz4V1R62kha6rNKn45wJEZXLmf
-						bN9rScqFZvDdTG/SkX6SQQIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDQ0MB0G
-						A1UdDgQWBBQXn/9ZqY5Ort4ff/XLCRX62+IwYTANBgkqhkiG9w0BAQUFAAOCAQEA
-						R8xjk3N+t3FLTObtLn35afpxZfNBOpJzbFLKwFKSRI4iZt10VVE1nSRdljLkaMhR
-						vpiPPtjEYYvKHt5kRNA15NxnGpxYr9qfQGu+3fAtAG1auBFowVQVhOoKQEbzcrQh
-						UwOLwcpN/8P+iPSkC8YxuyK7aXKF9w0xUZrSjAd8iQQ6vbFDQrMWYGy5oqOU/rqP
-						E07zzDN6vGUjOBs1x3cETWhHM+albmFtA2dy8c/OCt5VnVclq8fEwtl/RUnYcXEw
-						6CUcCp/EGnOJy+SfLxLpMR8A6o6Nt0XY41xVVzZBq8HIEa7TPmLcDU/AuSnDcRMV
-						UYiWPI94pu+HFPXSz+yu3w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://44uoc-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Primo - University of Cumbria</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ID-Prov.fh-ludwigshafen.de.xml b/swamid-interfederations-2.0/ID-Prov.fh-ludwigshafen.de.xml
deleted file mode 100644
index d4a61330..00000000
--- a/swamid-interfederations-2.0/ID-Prov.fh-ludwigshafen.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ID-Prov.fh-ludwigshafen.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-ludwigshafen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ID-Prov.fh-ludwigshafen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ID-Prov.fh-ludwigshafen.de,OU=Rechenzentrum,O=Fachhochschule Ludwigshafen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIHErZepkyoSzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTExMDEzMTMwMTEwWhcNMTYx
-MDExMTMwMTEwWjBwMQswCQYDVQQGEwJERTEkMCIGA1UEChMbRmFjaGhvY2hzY2h1
-bGUgTHVkd2lnc2hhZmVuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMwIQYDVQQD
-ExpJRC1Qcm92LmZoLWx1ZHdpZ3NoYWZlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKKu4OkCyCrzFDkpnh4cktypjR0fOMoAn6LpHztDJqtv/07H
-GIsD8ReJJ5GmK6wOSgclOkbC+f/gG9nvbsT+KyaOdxtAE9W4g/Hh6Prn7frWWG3q
-EKxeHSmxIqXVnchxNxt12nSZrKXV/5+afQop9ERCsPo2eJAw9AsPm/qOiDlwzSpW
-lGyV8+ZclVi1+b+H4+NQfYFai4bw2wRaJWPSUQPA7B32ZWNHMRAsbF40p62s1L7P
-h3X1uVMVrYZKpMcSxu1AOEUoqqCi16Jedk5FUxchEOJBB7tURxGDDD7eNqNw11tB
-/ghdsYS50pf/R2aXy96NWhzEdlL1E4cqG3jtWyECAwEAAaOCAZUwggGRMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUY5uUBWAA2xmQVmyLFbSG1EKtSo4wHwYDVR0jBBgwFoAUL90T
-mGNcC8NvuO2G4AMnwW+6tgIwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwOKA2oDSGMmh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY3JsL2dfY2FjcmwuY3Js
-MIGYBggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9yaHJrLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEIGCCsGAQUF
-BzAChjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3JocmstY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAMQwCC1UDZejZ5rdnEZLaOk
-mxEPSZ7MxAgZV1pY5uZbSlaMhu2g4XYVvZ7rlgLOZurI/cDRXeZm/6omDhFR+z0J
-B/Pc5C0bQWopw63U9IE3bVP7ienlqx8Rul/I8loMxJMz6U4D8cAoCdFsbtznCfHe
-bBPddbpJ06W/KOBcv7hVn8MPFbrnwFKNdtZeMGB+0Rx/uLUZxvF5s2ZOPOmAen8X
-9W6k5N/GRfQFZm9DuU2DDAEzl8Pe2yQ/DBguegNkwbBDd7vmV2fLVlnTAaeFacmd
-30+7Ch1H/AQu8KqQdO0SkYor6auC3ZMH3uE8Z3BGfyRWuXB3KSRmY77RiDwHBtE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id-prov.fh-ludwigshafen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id-prov.fh-ludwigshafen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id-prov.fh-ludwigshafen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id-prov.fh-ludwigshafen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://id-prov.fh-ludwigshafen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id-prov.fh-ludwigshafen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-ludwigshafen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ID-Prov.fh-ludwigshafen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ID-Prov.fh-ludwigshafen.de,OU=Rechenzentrum,O=Fachhochschule Ludwigshafen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIHErZepkyoSzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTExMDEzMTMwMTEwWhcNMTYx
-MDExMTMwMTEwWjBwMQswCQYDVQQGEwJERTEkMCIGA1UEChMbRmFjaGhvY2hzY2h1
-bGUgTHVkd2lnc2hhZmVuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMwIQYDVQQD
-ExpJRC1Qcm92LmZoLWx1ZHdpZ3NoYWZlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKKu4OkCyCrzFDkpnh4cktypjR0fOMoAn6LpHztDJqtv/07H
-GIsD8ReJJ5GmK6wOSgclOkbC+f/gG9nvbsT+KyaOdxtAE9W4g/Hh6Prn7frWWG3q
-EKxeHSmxIqXVnchxNxt12nSZrKXV/5+afQop9ERCsPo2eJAw9AsPm/qOiDlwzSpW
-lGyV8+ZclVi1+b+H4+NQfYFai4bw2wRaJWPSUQPA7B32ZWNHMRAsbF40p62s1L7P
-h3X1uVMVrYZKpMcSxu1AOEUoqqCi16Jedk5FUxchEOJBB7tURxGDDD7eNqNw11tB
-/ghdsYS50pf/R2aXy96NWhzEdlL1E4cqG3jtWyECAwEAAaOCAZUwggGRMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUY5uUBWAA2xmQVmyLFbSG1EKtSo4wHwYDVR0jBBgwFoAUL90T
-mGNcC8NvuO2G4AMnwW+6tgIwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwOKA2oDSGMmh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY3JsL2dfY2FjcmwuY3Js
-MIGYBggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9yaHJrLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEIGCCsGAQUF
-BzAChjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3JocmstY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAMQwCC1UDZejZ5rdnEZLaOk
-mxEPSZ7MxAgZV1pY5uZbSlaMhu2g4XYVvZ7rlgLOZurI/cDRXeZm/6omDhFR+z0J
-B/Pc5C0bQWopw63U9IE3bVP7ienlqx8Rul/I8loMxJMz6U4D8cAoCdFsbtznCfHe
-bBPddbpJ06W/KOBcv7hVn8MPFbrnwFKNdtZeMGB+0Rx/uLUZxvF5s2ZOPOmAen8X
-9W6k5N/GRfQFZm9DuU2DDAEzl8Pe2yQ/DBguegNkwbBDd7vmV2fLVlnTAaeFacmd
-30+7Ch1H/AQu8KqQdO0SkYor6auC3ZMH3uE8Z3BGfyRWuXB3KSRmY77RiDwHBtE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id-prov.fh-ludwigshafen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id-prov.fh-ludwigshafen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Fachhochschule Ludwigshafen am Rhein</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">FH Ludwigshafen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fh-ludwigshafen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Andreas</GivenName>
-    <SurName>Müller</SurName>
-    <EmailAddress>Andreas.Mueller@fh-ludwigshafen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml b/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml
deleted file mode 100644
index 2e49404a..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://Shibboleth.uem.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://Shibboleth.uem.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://Shibboleth.uem.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://Shibboleth.uem.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://Shibboleth.uem.br/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">uem.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://Shibboleth.uem.br:8443/idp/profile/SAML1/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">UEM - Universidade Estadual de Maringa</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UEM - Universidade Estadual de Maringa</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UEM - Universidade Estadual de Maringa</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uem.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.uem.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Helcio do Prado</md:SurName>
-    <md:EmailAddress>helcio@uem.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b6dec56d..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>
-    MIIC4jCCAcoCAQMwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
-VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTIwNTAyMTcy
-MTU4WhcNMTUwNTAyMTcyMTU4WjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFTaGliYm9sZXRoLnVlbS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALs/KHnZekrQFrHtk9e+vVMklEe0+7HfSu34nJHP7vOpQTZR
-KwpRnisPoSwBkeY4JcbgUa2/gSskUTSf4EBWvrfaUs5NATXc0l5VOT7T2vXrUye0
-Ua1LsAroWH2/yEB2gvs8THrtp+UZ1uAYJkoIxcc9ydZ7LKUpSuv/LrCAjHaiwD6q
-jNMSFYm+UUpt6tzAWBuHfoJng92JId0qelSGIT7WjjOPlyE/iA+gXZd1/k4FFS8V
-dxAcNYLlP8uqVjVR9RsHRjOphdxvvNg8r9210k2z8XH698EOKmunuVMkcFaBIevO
-pc6rhoGj/ldt9J8F5skvx2l9qwezMOXwgJyf/UsCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAl4Dl7mjYzIGG6HNNxoEyMfbQwKatg5pBHHy2yDZqeke0TtDpxuy+/U30
-0sxxuNVqZn2APtFWY87YpycGaXog4xQDwnEZkcleIFaq/dqRQDS+S9R3tfiSTAfc
-dhx0RnXAHA+mGFDbxWtLCyJLt4eu0OOUU06MnvDBhMiPF1I6AQFTY6m6BSqupSEb
-hq6Yt/CLMLBLkEgHq9+VDZko+y9ggRF8bu3O94Nb06KlF3LHimpc937c16eGbQ/U
-/xeRwvTZLzT46YkDPvTcw5HPPoJuH5VCw15reP08xgMSPZqEeVRpUCCWe4LbKSJK
-S+QyT4Jgbp/lk64grLI49EOJ2iJo4A==
-            </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>
-      
-MIIC4jCCAcoCAQMwDQYJKoZIhvcNAQEFBQAwNzEMMAoGA1UECxMDTlBEMQswCQYD
-VQQGEwJCUjEaMBgGA1UEAxMRU2hpYmJvbGV0aC51ZW0uYnIwHhcNMTIwNTAyMTcy
-MTU4WhcNMTUwNTAyMTcyMTU4WjA3MQwwCgYDVQQLEwNOUEQxCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFTaGliYm9sZXRoLnVlbS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALs/KHnZekrQFrHtk9e+vVMklEe0+7HfSu34nJHP7vOpQTZR
-KwpRnisPoSwBkeY4JcbgUa2/gSskUTSf4EBWvrfaUs5NATXc0l5VOT7T2vXrUye0
-Ua1LsAroWH2/yEB2gvs8THrtp+UZ1uAYJkoIxcc9ydZ7LKUpSuv/LrCAjHaiwD6q
-jNMSFYm+UUpt6tzAWBuHfoJng92JId0qelSGIT7WjjOPlyE/iA+gXZd1/k4FFS8V
-dxAcNYLlP8uqVjVR9RsHRjOphdxvvNg8r9210k2z8XH698EOKmunuVMkcFaBIevO
-pc6rhoGj/ldt9J8F5skvx2l9qwezMOXwgJyf/UsCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAl4Dl7mjYzIGG6HNNxoEyMfbQwKatg5pBHHy2yDZqeke0TtDpxuy+/U30
-0sxxuNVqZn2APtFWY87YpycGaXog4xQDwnEZkcleIFaq/dqRQDS+S9R3tfiSTAfc
-dhx0RnXAHA+mGFDbxWtLCyJLt4eu0OOUU06MnvDBhMiPF1I6AQFTY6m6BSqupSEb
-hq6Yt/CLMLBLkEgHq9+VDZko+y9ggRF8bu3O94Nb06KlF3LHimpc937c16eGbQ/U
-/xeRwvTZLzT46YkDPvTcw5HPPoJuH5VCw15reP08xgMSPZqEeVRpUCCWe4LbKSJK
-S+QyT4Jgbp/lk64grLI49EOJ2iJo4A==
-                    
-            </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 3509c3df..00000000
--- a/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-idp.unibe.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-01-06T11:43:57Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.helpdesk.unibe.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md: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">Universität Bern</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universität Bern</mdui:Description>
-        <mdui:Description xml:lang="en">Universität 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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://aai-idp.unibe.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-idp.unibe.ch/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibe.ch</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-idp.unibe.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-idp.unibe.ch: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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">unibe.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Bern</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Universität Bern</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.unibe.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unibe.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Campus</md:GivenName>
-    <md:SurName>Admins</md:SurName>
-    <md:EmailAddress>mailto:admins@campus.unibe.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Campus</md:GivenName>
-    <md:SurName>Admins</md:SurName>
-    <md:EmailAddress>mailto:admins@campus.unibe.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 33309cde..00000000
--- a/swamid-interfederations-2.0/aai-idp.unibe.ch.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://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="2013-12-06T07:28:12Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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>
-    <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>
-    <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 f4bceb0c..00000000
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch-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://aai-idp.uzh.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-02-10T12:32:42Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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:InformationURL xml:lang="en">http://www.uzh.ch/index_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.uzh.ch/index.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.id.uzh.ch/dl/mobil/AAI/Nutzungsbedingungen.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="de">http://www.id.uzh.ch/dl/mobil/AAI/Nutzungsbedingungen.html</mdui:PrivacyStatementURL>
-      </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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIGyTCCBbGgAwIBAgIUaP2onvcn8JF3V2Rgtd4Y3DPdls0wDQYJKoZIhvcNAQEL
-BQAwSTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAMTFlF1b1ZhZGlzIEVWIFNTTCBJQ0EgRzEwHhcNMTYwMTE5MDk0MDE5WhcN
-MTgwMTE5MDk1MDAwWjCByTETMBEGCysGAQQBgjc8AgEDEwJDSDEYMBYGCysGAQQB
-gjc8AgECDAdadWVyaWNoMRowGAYDVQQPDBFHb3Zlcm5tZW50IEVudGl0eTETMBEG
-A1UEBRMKMTgzMi0wOS0yODELMAkGA1UEBhMCQ0gxEDAOBgNVBAgMB1p1ZXJpY2gx
-EDAOBgNVBAcMB1p1ZXJpY2gxHTAbBgNVBAoMFFVuaXZlcnNpdGFldCBadWVyaWNo
-MRcwFQYDVQQDDA5hYWktaWRwLnV6aC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL1HvFAYnMgYMNKotB3ZroxXp+UjHokAPoqO0RwUwSWU85xWUBh4
-1rvKkaLCTr2eOrPtWS90yabqJsitdmH92dzrgFbxdT7e/FdwyinwyfV2hcWHXHWO
-2OK9O/AurKe1S36ZS+kS78GQaIAKS5tp3dP1q8rYS7sTen/MquNRhy0E7uVcSABw
-BnADCpRJIN3edrv1Ka41I4W4FAsMSgr3dgmwQ4xrg2B/482VeW+tiq+NzmPRR/6u
-p2iQv2bjkyAmNPshTWeHYZpRAF3Zg/ZQjZhDVPRtjqiU+Wq5ntaRTCrkY4Y2COWQ
-rWN+Uh4OFSWrKpFc1aOPOI6vyWcS4Z4iGfUCAwEAAaOCAyYwggMiMHcGCCsGAQUF
-BwEBBGswaTA4BggrBgEFBQcwAoYsaHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xvYmFs
-LmNvbS9xdmV2c3NsMS5jcnQwLQYIKwYBBQUHMAGGIWh0dHA6Ly9ldi5vY3NwLnF1
-b3ZhZGlzZ2xvYmFsLmNvbTAdBgNVHQ4EFgQUJ3XcV+xSN7MDp0eLpo8VIn7IZRsw
-DAYDVR0TAQH/BAIwADAfBgNVHSMEGDAWgBRVWIbOunx2TpkTqQ/TbJ/C9dM84zBR
-BgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8v
-d3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MDsGA1UdHwQ0MDIwMKAu
-oCyGKmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2ZXZzc2wxLmNybDAO
-BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBkG
-A1UdEQQSMBCCDmFhaS1pZHAudXpoLmNoMIIBfQYKKwYBBAHWeQIEAgSCAW0EggFp
-AWcAdgBo9pj4H2SCvjqM7rkoHUz8cVFdZ5PURNEKZ6y7T0/7xAAAAVJZSsXGAAAE
-AwBHMEUCIQC0BJ59f/nVOrCAzSsNPbSnMODLYcao2T4a0js7HZhm9wIgUhJQDGXA
-EJ/MtqIe5j5jtuPYiotktVPMIlWUkOHT5KgAdQCkuQmQtBhYFIe7E6LMZ3AKPDWY
-BPkb37jjd80OyA3cEAAAAVJZSsiyAAAEAwBGMEQCICC/hLFK7J0asHg3xCB/UGWb
-eRVtl2PdOI1EyHK4j0XBAiA8DkiN1e3SK80mlJmeQmuN0CoN5tEMHBMZD2W3bFWN
-sgB2AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDdAAABUllKzGsAAAQD
-AEcwRQIgZyl/dNpQIyBBjT/Wq79EW45S5p+dy3PlwNsEo6vk4sICIQDmidXo2tDF
-jZbVi2g++aryPHRYCyw1/sxjUV3KZxAEoDANBgkqhkiG9w0BAQsFAAOCAQEACIqJ
-nxowoGjhWw5aO154e5uJm/8Bh/xn/8+Vnp5PdSQaYAgs92lPxUNTv1ZHK0fsFW2I
-rv3AJJKBeCIICB44zCSKlkMoLPtBpm05K++EptLjnvc4/lan8DjNy0phMNnhht3c
-9fi1KIEaOg394JTfIhkcukFKBReelrBUJgG+XkMsgfGdpOw7ULnSKUvcmgA2ypRL
-EncpfLGhDOKtalVy9oLF6cC9/dvnhAOPiAcBJMlkVYmXqmUmhProoyFzDq0pbLcg
-xGfdQXcGLCKIAlksfJ5v5r3Dnji7Wj5nAHRfigBxDv87F0ZKesV08pQlef1NcVM+
-M5r00gwrZAVynl2Imw==
-						</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: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://aai-idp.uzh.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-idp.uzh.ch/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">uzh.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Zürich</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Zurich</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uzh.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uzh.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UZH</md:GivenName>
-    <md:SurName>ZI Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:support@id.uzh.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UZH</md:GivenName>
-    <md:SurName>AAI Administrator</md:SurName>
-    <md:EmailAddress>mailto:aaiadm@id.uzh.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 21b19027..00000000
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch.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://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="2013-12-09T07:49:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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,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u78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iPgogICAgICAgICA8eG1wOkNyZWF0ZURhdGU+MjAxMC0wNi0wMVQxMjozNDo1MVo8L3htcDpDcmVhdGVEYXRlPgogICAgICAgICA8eG1wOk1vZGlmeURhdGU+MjAxMi0wNC0yNFQxNjozMDoxNCswMjowMDwveG1wOk1vZGlmeURhdGU+CiAgICAgICAgIDx4bXA6Q3JlYXRvclRvb2w+SWxsdXN0cmF0b3I8L3htcDpDcmVhdG9yVG9vbD4KICAgICAgICAgPHhtcDpNZXRhZGF0YURhdGU+MjAxMi0wNC0yNFQxNjozMDoxNCswMjowMDwveG1wOk1ldGFkYXRhRGF0ZT4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgICAgIDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiCiAgICAgICAgICAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyI+CiAgICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2UvcG5nPC9kYzpmb3JtYXQ+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgICAgICAgICAgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIKICAgICAgICAgICAgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiPgogICAgICAgICA8eG1wTU06SGlzdG9yeT4KICAgICAgICAgICAgPHJkZjpTZXE+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPmNvbnZlcnRlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6cGFyYW1ldGVycz5mcm9tIGFwcGxpY2F0aW9uL3Bvc3RzY3JpcHQgdG8gYXBwbGljYXRpb24vdm5kLmFkb2JlLnBob3Rvc2hvcDwvc3RFdnQ6cGFyYW1ldGVycz4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPnNhdmVkPC9zdEV2dDphY3Rpb24+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDppbnN0YW5jZUlEPnhtcC5paWQ6MDM4MDExNzQwNzIwNjgxMUJCNzFERjkzREQ1MUYwNTc8L3N0RXZ0Omluc3RhbmNlSUQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDp3aGVuPjIwMTItMDQtMjRUMTY6MzA6MTQrMDI6MDA8L3N0RXZ0OndoZW4+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpzb2Z0d2FyZUFnZW50PkFkb2JlIFBob3Rvc2hvcCBFbGVtZW50cyAxMC4wIE1hY2ludG9zaDwvc3RFdnQ6c29mdHdhcmVBZ2VudD4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmNoYW5nZWQ+Lzwvc3RFdnQ6Y2hhbmdlZD4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPmNvbnZlcnRlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6cGFyYW1ldGVycz5mcm9tIGFwcGxpY2F0aW9uL3Bvc3RzY3JpcHQgdG8gaW1hZ2UvcG5nPC9zdEV2dDpwYXJhbWV0ZXJzPgogICAgICAgICAgICAgICA8L3JkZjpsaT4KICAgICAgICAgICAgICAgPHJkZjpsaSByZGY6cGFyc2VUeXBlPSJSZXNvdXJjZSI+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDphY3Rpb24+ZGVyaXZlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6cGFyYW1ldGVycz5jb252ZXJ0ZWQgZnJvbSBhcHBsaWNhdGlvbi92bmQuYWRvYmUucGhvdG9zaG9wIHRvIGltYWdlL3BuZzwvc3RFdnQ6cGFyYW1ldGVycz4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPnNhdmVkPC9zdEV2dDphY3Rpb24+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDppbnN0YW5jZUlEPnhtcC5paWQ6MDQ4MDExNzQwNzIwNjgxMUJCNzFERjkzREQ1MUYwNTc8L3N0RXZ0Omluc3RhbmNlSUQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDp3aGVuPjIwMTItMDQtMjRUMTY6MzA6MTQrMDI6MDA8L3N0RXZ0OndoZW4+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDpzb2Z0d2FyZUFnZW50PkFkb2JlIFBob3Rvc2hvcCBFbGVtZW50cyAxMC4wIE1hY2ludG9zaDwvc3RFdnQ6c29mdHdhcmVBZ2VudD4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmNoYW5nZWQ+Lzwvc3RFdnQ6Y2hhbmdlZD4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgIDwvcmRmOlNlcT4KICAgICAgICAgPC94bXBNTTpIaXN0b3J5PgogICAgICAgICA8eG1wTU06RGVyaXZlZEZyb20gcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICA8c3RSZWY6aW5zdGFuY2VJRD54bXAuaWlkOjAzODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdFJlZjppbnN0YW5jZUlEPgogICAgICAgICAgICA8c3RSZWY6ZG9jdW1lbnRJRD54bXAuZGlkOjAzODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC9zdFJlZjpkb2N1bWVudElEPgogICAgICAgICAgICA8c3RSZWY6b3JpZ2luYWxEb2N1bWVudElEPnhtcC5kaWQ6MDM4MDExNzQwNzIwNjgxMUJCNzFERjkzREQ1MUYwNTc8L3N0UmVmOm9yaWdpbmFsRG9jdW1lbnRJRD4KICAgICAgICAgPC94bXBNTTpEZXJpdmVkRnJvbT4KICAgICAgICAgPHhtcE1NOkRvY3VtZW50SUQ+eG1wLmRpZDowMzgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1NzwveG1wTU06RG9jdW1lbnRJRD4KICAgICAgICAgPHhtcE1NOkluc3RhbmNlSUQ+eG1wLmlpZDowNDgwMTE3NDA3MjA2ODExQkI3MURGOTNERDUxRjA1NzwveG1wTU06SW5zdGFuY2VJRD4KICAgICAgICAgPHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD54bXAuZGlkOjAzODAxMTc0MDcyMDY4MTFCQjcxREY5M0RENTFGMDU3PC94bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iPgogICAgICAgICA8cGhvdG9zaG9wOkNvbG9yTW9kZT4zPC9waG90b3Nob3A6Q29sb3JNb2RlPgogICAgICAgICA8cGhvdG9zaG9wOklDQ1Byb2ZpbGU+c1JHQiBJRUM2MTk2Ni0yLjE8L3Bob3Rvc2hvcDpJQ0NQcm9maWxlPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8dGlmZjpYUmVzb2x1dGlvbj43MjAxLzEwMDwvdGlmZjpYUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6WVJlc29sdXRpb24+NzIwMS8xMDA8L3RpZmY6WVJlc29sdXRpb24+CiAgICAgICAgIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgICAgICAgIDx0aWZmOk5hdGl2ZURpZ2VzdD4yNTYsMjU3LDI1OCwyNTksMjYyLDI3NCwyNzcsMjg0LDUzMCw1MzEsMjgyLDI4MywyOTYsMzAxLDMxOCwzMTksNTI5LDUzMiwzMDYsMjcwLDI3MSwyNzIsMzA1LDMxNSwzMzQzMjs3MTM5OEMyN0FCRjMxQzRDQTFDQzQ0RkVCQTVDMjhENzwvdGlmZjpOYXRpdmVEaWdlc3Q+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpleGlmPSJodHRwOi8vbnMuYWRvYmUuY29tL2V4aWYvMS4wLyI+CiAgICAgICAgIDxleGlmOlBpeGVsWERpbWVuc2lvbj43ODwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOlBpeGVsWURpbWVuc2lvbj4yNzwvZXhpZjpQaXhlbFlEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOkNvbG9yU3BhY2U+MTwvZXhpZjpDb2xvclNwYWNlPgogICAgICAgICA8ZXhpZjpOYXRpdmVEaWdlc3Q+MzY4NjQsNDA5NjAsNDA5NjEsMzcxMjEsMzcxMjIsNDA5NjIsNDA5NjMsMzc1MTAsNDA5NjQsMzY4NjcsMzY4NjgsMzM0MzQsMzM0MzcsMzQ4NTAsMzQ4NTIsMzQ4NTUsMzQ4NTYsMzczNzcsMzczNzgsMzczNzksMzczODAsMzczODEsMzczODIsMzczODMsMzczODQsMzczODUsMzczODYsMzczOTYsNDE0ODMsNDE0ODQsNDE0ODYsNDE0ODcsNDE0ODgsNDE0OTIsNDE0OTMsNDE0OTUsNDE3MjgsNDE3MjksNDE3MzAsNDE5ODUsNDE5ODYsNDE5ODcsNDE5ODgsNDE5ODksNDE5OTAsNDE5OTEsNDE5OTIsNDE5OTMsNDE5OTQsNDE5OTUsNDE5OTYsNDIwMTYsMCwyLDQsNSw2LDcsOCw5LDEwLDExLDEyLDEzLDE0LDE1LDE2LDE3LDE4LDIwLDIyLDIzLDI0LDI1LDI2LDI3LDI4LDMwOzBFRUI5M0Y2NzcwRjM4OEU2MjNCMjc3N0UzRkUyQUQ5PC9leGlmOk5hdGl2ZURpZ2VzdD4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/PsfjBS4AAAAJcEhZcwAACxMAAAsTAQCanBgAAACXdEVYdENvbW1lbnQAY0hSTSBjaHVua2xlbiAzMiBpZ25vcmVkOg1BU0NJSTogLi56JS4uw4TDiS4uy5jLhy4uw4TDiC4udTAuLsONYC4uOsOyLi4ubw1IRVg6IDAwMDA3QTI1MDAwMDgwODMwMDAwRjlGRjAwMDA4MEU5MDAwMDc1MzAwMDAwRUE2MDAwMDAzQTk4MDAwMDE3Nkaj9o17AAAAIXRFWHRTb2Z0d2FyZQBHcmFwaGljQ29udmVydGVyIChJbnRlbCl3h/oZAAAEyklEQVR4nOxa0XGjMBRMCe4gzKgBSqAEl0AJlEAHlOASKIES+L8frgOXwJncLlpkCTu+i98osWY2xuhJWq2enh44b7+nX28vPA5zArnDnEDuMCeQO8wJ5A5zArnDnEDuMCeQO8wJ5A5zArnDnEDuMCeQO8wJ5A5zArnDnEDuMCeQO/7+uVHce1FdcLqgB4YAS11zQXGzs29Ubgp4EeQIgUaItKCGoESH+yrm4YnzMCtJARcBxNNOEOoAIcvAtgGW+lbaHZ82E6MSFRBC0JsaeGEh3tYH9otgE6472PcQu37edJ5frgQMxCshBr1qEXNa6mBbw/4MVGK3iv0/RRQvL29b391no7tF4zjmvyK0iQnIWKaxrYcHthQXtoyFLWwriH6S711s28t4S9s59T1iv/Q5L3aPiJXoc5Y5rfPD94k7jDtPOW4EBDlu2w4CddIZPWqEUB1sebg0sCvQVr1ys+2lz6SAGIO7gN5OD+QBVsiYlbRbvVTCz9oGvGvU1xijxNxG6etIW4xdYK6L6FUoIL2NntPGJssBIHYrg7ZiqwLzJK8/KeCA8QgeZjPslgUaYTvCS8hxwudR7s3gxJBzVq8LxxPvPNNLg77mVUBRn/t9jEy2AjF2RMLMDUPBO3oCF+cBAc/On/4MLRRw9YRAVBXyJNf0NN4vZJzUFqb39sLregs7H+9qEOjegoK6gWIJ0c5FPBZteufDweCCRPsOATcTC8QqA28r5Dvt26BPpmf0rCIlIOomWZRdARn4a3xeBX1ZSZI7i2cMCQFbrDq3fB3UN+iTW30hypRoV0Dcp3ijfJ9gx7gWCsgQNQsvHYft1XOvBHQaAzk5fF5tXzTsWO/8wcFT6moLow0XJBVXmTYxrnyQ/4SA6yTx/eh8zOLCqICV1A0yPsfppL6SvlRAhoE5FJCr0SQErIQ0T7STelusjfOhoSXR71JiAnYUKizi1i0E6Z0/GauEgAVWsbUWcJ7nh7BXUgKmPJAn3+D8CTi4/UOkCGLRtxZwPWVjxhCYW7F0/pRjwttG2pTOJ6KxGMj+Vs/GfT4S9rEFdf70vHphIXGueqaAPIWZlhQRYrXEtCpyHRPwKDaxU3iTvEowv0fAc6LORMBOJtrsEKPX6eeegKPEzKs8UOx4mrbOP3cXwXUtojIkVGjfcPeIgMwaumcIqE8ifcIDSbaVe9FruceJR59ExEYfy1YPCq7prZPzSTS3/gz+KiDz1I/2XyogiJ/cNjEOwTrN9FPXMdQJAflkwAW6JeABdhRwk7tKm1rbP0PAKpxwYsvybc0gHtvJJ8OBvr3ZO5hm975566OiNW4roD6n3hJwswBfLiAGZ5rCbLvEVji6rWDcIpPzb11C8Zju7L0PpFep53PSg/NPAnsC9kEfpgKGr/Mr518enJw/pXW7doL1FHc+qNcpAiK04iALSQ/j6zH1VO4StT85n2KVer2rxIPlnt9EKGQIet8Y3Gde9zN/E2FxkV/lcJ+53yj1TFNev8qFRWIfheQWZc7Yyz21+9m/C4dFPK8XDyP4UuHn/mfCC//4vzEvvAR8CZgrzAnkDnMCucOcQO4wJ5A7zAnkDnMCucOcQO4wJ5A7zAnkDnMCucOcQO4wJ5A7zAnkjj8AAAD//wMA8NdRQLYXmksAAAAASUVORK5CYII=</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>
-MIIFkjCCBHqgAwIBAgIUezeRt262ZuEutfYIVFc7SYstvyEwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMDUwOTA2MTIzNloXDTE0MDUwOTA2MTIzNlow
-geUxEzARBgsrBgEEAYI3PAIBAxMCQ0gxGDAWBgsrBgEEAYI3PAIBAhMHWnVlcmlj
-aDEaMBgGA1UEDxMRR292ZXJubWVudCBFbnRpdHkxEzARBgNVBAUTCjE4MzItMDkt
-MjgxCzAJBgNVBAYTAkNIMRAwDgYDVQQIEwdadWVyaWNoMRAwDgYDVQQHEwdadWVy
-aWNoMR0wGwYDVQQKExRVbml2ZXJzaXRhZXQgWnVlcmljaDEaMBgGA1UECxMRSW5m
-b3JtYXRpa2RpZW5zdGUxFzAVBgNVBAMTDmFhaS1pZHAudXpoLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA368dGz9C+Tv3KiG1wG+u+0dwgjVzZv/K
-zpkzCvA3enR7wpeltW65qnXaijcyYAPIIVB4cHpbwUUuWpILUZwrS/uJta+Ywyfh
-9hf7Anw6ZdWllt6+kMV1DbuylZWsUdjYN4mJitGf76AYXa6WJLEmu3hcuyZwoaix
-ItDgH6oRpjWqtegfzD4xyPhRpD9v2R8UHyFzVyv1L9VEenz/ujUI62AQlB6lbdgO
-tx6SohfxafSAB190xYzPDmO/7WGqyW9Shr7K44SEprhvYelJJOFM5IWrTW5d+x5E
-R1sD7IaRoxuj/bG+TH1ZKC5f0777ugLx271id8C0+01YMiZte//kaQIDAQABo4IB
-sTCCAa0wdAYIKwYBBQUHAQEEaDBmMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5x
-dW92YWRpc2dsb2JhbC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly90cnVzdC5xdW92
-YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+
-WAACZAECMDYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwu
-Y29tL3JlcG9zaXRvcnkwOQYDVR0RBDIwMIIOYWFpLWlkcC51emguY2iCDmlkaWRw
-MDEudXpoLmNogg5pZGlkcDAyLnV6aC5jaDALBgNVHQ8EBAMCBaAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDJNoU/q8K6Ztu6bByyE
-CBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9i
-YWwuY29tL3F2c3NsaWNhLmNybDAdBgNVHQ4EFgQUXErAWk61Tl3wU6Gos0NcPiHk
-8CgwDQYJKoZIhvcNAQEFBQADggEBAGaVxEZN4nYmAtXT2B5u1PNftWXir7fXUNOj
-Chfdeu2odPHfCrJPeyUUURzn5ZnuGLkdRAzrJJuCF5Ezoz6Ukg3Za9u0NG4qaaqK
-8mW0J4JxanPMeiDBHEjZVZuzkbgnJASVDyzi1vSZmk+zXW369XdRukmSU84ZVcPu
-xNNo8pyL2NVxyUeysrhd76do+wAjzZnjjz0SuCA66ehmCMwDAWe4HA1tz+JDHepV
-4+klZ2j3lfwG8I4ugsHj1cl28+kysc/uDhQq+WCtQG5DBMRLUGYi+xIX+Kyekt/4
-GunZGU5KKa/fp43Yo6/iWDu5H/pL4CNiaXblImmUO4nDKCIjwN0=
-						</ds:X509Certificate>
-        </ds: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 54ce2f3e..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-integration.dfn.de/idp/shibboleth">
-  <md: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>
-  </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">dfn.de</shibmd: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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-integration.dfn.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-integration.dfn.de/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-integration.dfn.de/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de/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">dfn.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-integration.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-integration.dfn.de: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">e15</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e15</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.dfn.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.dfn.de/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Wolfgang</md:GivenName>
-    <md:SurName>Pempe</md:SurName>
-    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>DFN-AAI</md:GivenName>
-    <md:SurName>Hotline</md:SurName>
-    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 4ad28ca9..00000000
--- a/swamid-interfederations-2.0/aai-integration.dfn.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://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>MIIGsTCCBZmgAwIBAgIHFxK8A9tM6DANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDAyMDYw
-NzQ5MDhaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD2co6wyLHw
-Uk2Ym/pDjnk9AOQ4C1rPae5EIJz/ebyWvUzoErUsL0RZUquU1dgD6HbCFxruSgu3
-wAZSJ4ebkV0Co0Vg+z3tgd3fRDDjbMJ+6lBIAv919hmV3yqmXNTqhWchfD97zmVt
-IsnKXz/o5NCuzs6lzvepoKrAMDRgW/4uQGVSM3gAywuSf8TV47oKS1g2hfE+8qt5
-fVV2a5eFnmvxdBqFFXxl3qV35e1Wx/3D9/XEsN2yNdtxsvl2c+aWjahU4dl1HGCS
-scrFuQKfIGkPNFJltt+UYvlKVOqD5G4coAXGbTjo85II1IDdJArQNSUNKCod7zXG
-h3hmLGSUWdhDSgW//YmlsyO0GhS7BDunq6p7wgckFPyUb2Lu9VYobyyYwzC+O1tY
-AVyog4UWtxvZTEsiVr7vrx3S+UwveYVHWZG/kjfW7YEMJKmryNY4v6kVXBR8e6w5
-Jy50yIn+zWO7T41PIt5erBQEJb7vWPexT4nvPvXL5qWR+ReSLDZ8fMv5AV0i72L2
-gmKXuZPa9UOlZuwLUZztFVrvz2PdsYOZx4bIEDI7j100RpMnXtW9xLDSpZQ/X9Y4
-rrp0pumYqkcgSlGVkQdj0niqid/AY11bTq6TqxDXHG+/Xzx1HJ68oGiF7HyAodu8
-iUyT5V+l1a1I2fi90Q1oxVVhin71cE81HQIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFEjzzKU976CML+qxGywqIpdPgZdfMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAntr15Px8hE2PwtIlM9LsCVNjrkkd4H7OKT3A
-rAYXpBbf1TzTdGsCe8+ck+GA+amCBFRnhWz3LNtl7JiB0e48gTY7b7yxMH4M+WZJ
-9/mDzZCLNNPg37+CAVyU5vhvXv6T6NTs/Dv9psKt8s+Xrv0u+bc+OnrAtn+kcfYx
-ITSkw4DNxogpMJLNkt4hu2kL6KxO4qL8X1BMK24F42w2PRi49Ue7UJyZNZHBdrFz
-o2z1H7+jwz3fRLB9+PqEHwJxbXV/HOOqBtcZDpLzZFZUlb35CiO42dyQIWmSPgFR
-FmPxkegS/wA/pKYg7KJ8dzGsl25p/awcEsLOjGT5VqWgaa/Agg==
-</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"/>
-  </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>MIIGsTCCBZmgAwIBAgIHFxK8A9tM6DANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xNDAyMDYw
-NzQ5MDhaFw0xODExMzAyMjAwMDBaMIGAMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xEzARBgNVBAoTCkRGTi1WZXJlaW4xGTAX
-BgNVBAsTEEdlc2NoYWVmdHNzdGVsbGUxHzAdBgNVBAMTFmFhaS1pbnRlZ3JhdGlv
-bi5kZm4uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD2co6wyLHw
-Uk2Ym/pDjnk9AOQ4C1rPae5EIJz/ebyWvUzoErUsL0RZUquU1dgD6HbCFxruSgu3
-wAZSJ4ebkV0Co0Vg+z3tgd3fRDDjbMJ+6lBIAv919hmV3yqmXNTqhWchfD97zmVt
-IsnKXz/o5NCuzs6lzvepoKrAMDRgW/4uQGVSM3gAywuSf8TV47oKS1g2hfE+8qt5
-fVV2a5eFnmvxdBqFFXxl3qV35e1Wx/3D9/XEsN2yNdtxsvl2c+aWjahU4dl1HGCS
-scrFuQKfIGkPNFJltt+UYvlKVOqD5G4coAXGbTjo85II1IDdJArQNSUNKCod7zXG
-h3hmLGSUWdhDSgW//YmlsyO0GhS7BDunq6p7wgckFPyUb2Lu9VYobyyYwzC+O1tY
-AVyog4UWtxvZTEsiVr7vrx3S+UwveYVHWZG/kjfW7YEMJKmryNY4v6kVXBR8e6w5
-Jy50yIn+zWO7T41PIt5erBQEJb7vWPexT4nvPvXL5qWR+ReSLDZ8fMv5AV0i72L2
-gmKXuZPa9UOlZuwLUZztFVrvz2PdsYOZx4bIEDI7j100RpMnXtW9xLDSpZQ/X9Y4
-rrp0pumYqkcgSlGVkQdj0niqid/AY11bTq6TqxDXHG+/Xzx1HJ68oGiF7HyAodu8
-iUyT5V+l1a1I2fi90Q1oxVVhin71cE81HQIDAQABo4ICTzCCAkswOQYDVR0gBDIw
-MDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAEC
-AjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFEjzzKU976CML+qxGywqIpdPgZdfMB8GA1UdIwQY
-MBaAFHmiYi/O8QY5Uud2bWLH3ptqdUtJMCEGA1UdEQQaMBiCFmFhaS1pbnRlZ3Jh
-dGlvbi5kZm4uZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQaA/
-oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMIHfBggrBgEFBQcBAQSB0jCBzzAzBggrBgEFBQcwAYYn
-aHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHVi
-L2NhY2VydC9nX2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAntr15Px8hE2PwtIlM9LsCVNjrkkd4H7OKT3A
-rAYXpBbf1TzTdGsCe8+ck+GA+amCBFRnhWz3LNtl7JiB0e48gTY7b7yxMH4M+WZJ
-9/mDzZCLNNPg37+CAVyU5vhvXv6T6NTs/Dv9psKt8s+Xrv0u+bc+OnrAtn+kcfYx
-ITSkw4DNxogpMJLNkt4hu2kL6KxO4qL8X1BMK24F42w2PRi49Ue7UJyZNZHBdrFz
-o2z1H7+jwz3fRLB9+PqEHwJxbXV/HOOqBtcZDpLzZFZUlb35CiO42dyQIWmSPgFR
-FmPxkegS/wA/pKYg7KJ8dzGsl25p/awcEsLOjGT5VqWgaa/Agg==
-</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 658252a1..00000000
--- a/swamid-interfederations-2.0/aai-login.fh-htwchur.ch-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://aai-login.fh-htwchur.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-06-29T09:17:05Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md: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+HGJiYmR3bt3S2tr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</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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIJAKtX8BuSldreMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2FhaS1sb2dpbi5maC1odHdjaHVyLmNoMB4XDTE1MDYwMjA2MjQzOFoXDTE4
-MDYwMTA2MjQzOFowIjEgMB4GA1UEAxMXYWFpLWxvZ2luLmZoLWh0d2NodXIuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDojAIPHZ3tQ1FE+stoW3n6
-gmdsUM/MBwi2jw9M9savDQk9rq36fSPjZW8qUz8bGPO5bw2QAkcUsZchFjZLrObX
-ec38/zFSb0n4gS0S2EC2HwcPyZzswJqSw8OcZ497yGiBjZa5Z0oPI9TKoBcPoxUN
-SySON/qFUFicYvDv6fRiMCQllXjIT76HFsvIgnshgmTeO+66if9bh6596L3anHYM
-tUssLfwKZiv7HiIRoufXomTk80jnSqG015zgrkfgxn78zSQdscqgMaYupzW9k+L5
-2mq3FrmkIOWaXPva9NPvwrigYLn9ekNqSiFH7A57ZPnWqjuYIHOfouQM+Kl4vYtN
-AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2FhaS1sb2dpbi5maC1odHdjaHVyLmNohi5o
-dHRwczovL2FhaS1sb2dpbi5maC1odHdjaHVyLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRpoSJX2tqdoLobBhzcCwEBlU3YcjANBgkqhkiG9w0BAQUFAAOCAQEA
-vFGeP2aiStlFZUpU9IJnpN7KPl96hN8XEYVCNMBYRbMjgjEj6shy6B/oyabx9Yn0
-g8RP//1vqWSxSPSkHAeTwX42tO/GRLlL03eRMKUVKBJhLJkvp98ORGah2x6HE+v4
-19wmQZO1i/Ki2PWlHqGEdGB/bxHc/2Fdq7gL4VuFCLmhZ5aZDZGpNYaH+1G/of4S
-Ztp+npQbDCJYU/DjwrlmhYVHeRltzcxR0WIb5woxQFBVB4gIZFpC/LFWFDNZFZO5
-sAylL3KJpGpKKRqi316YK1J0rHhpPkhDrGl2CkM/gIr3NzEGWxxHeq2FZ8ChfDwC
-czVRKZjqSip4oiVxXHKCGA==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://aai-login.fh-htwchur.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-htwchur.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIJAKtX8BuSldreMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2FhaS1sb2dpbi5maC1odHdjaHVyLmNoMB4XDTE1MDYwMjA2MjQzOFoXDTE4
-MDYwMTA2MjQzOFowIjEgMB4GA1UEAxMXYWFpLWxvZ2luLmZoLWh0d2NodXIuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDojAIPHZ3tQ1FE+stoW3n6
-gmdsUM/MBwi2jw9M9savDQk9rq36fSPjZW8qUz8bGPO5bw2QAkcUsZchFjZLrObX
-ec38/zFSb0n4gS0S2EC2HwcPyZzswJqSw8OcZ497yGiBjZa5Z0oPI9TKoBcPoxUN
-SySON/qFUFicYvDv6fRiMCQllXjIT76HFsvIgnshgmTeO+66if9bh6596L3anHYM
-tUssLfwKZiv7HiIRoufXomTk80jnSqG015zgrkfgxn78zSQdscqgMaYupzW9k+L5
-2mq3FrmkIOWaXPva9NPvwrigYLn9ekNqSiFH7A57ZPnWqjuYIHOfouQM+Kl4vYtN
-AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2FhaS1sb2dpbi5maC1odHdjaHVyLmNohi5o
-dHRwczovL2FhaS1sb2dpbi5maC1odHdjaHVyLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRpoSJX2tqdoLobBhzcCwEBlU3YcjANBgkqhkiG9w0BAQUFAAOCAQEA
-vFGeP2aiStlFZUpU9IJnpN7KPl96hN8XEYVCNMBYRbMjgjEj6shy6B/oyabx9Yn0
-g8RP//1vqWSxSPSkHAeTwX42tO/GRLlL03eRMKUVKBJhLJkvp98ORGah2x6HE+v4
-19wmQZO1i/Ki2PWlHqGEdGB/bxHc/2Fdq7gL4VuFCLmhZ5aZDZGpNYaH+1G/of4S
-Ztp+npQbDCJYU/DjwrlmhYVHeRltzcxR0WIb5woxQFBVB4gIZFpC/LFWFDNZFZO5
-sAylL3KJpGpKKRqi316YK1J0rHhpPkhDrGl2CkM/gIr3NzEGWxxHeq2FZ8ChfDwC
-czVRKZjqSip4oiVxXHKCGA==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.fh-htwchur.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.fh-htwchur.ch/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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">fh-htwchur.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">HTW Chur - Hochschule für Technik und Wirtschaft</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">HTW Chur - University of Applied Sciences HTW Chur</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fh-htwchur.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fh-htwchur.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>HTW</md:SurName>
-    <md:EmailAddress>mailto:aai@htwchur.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SWITCHaai</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-login.hsr.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.hsr.ch-idp-shibboleth.xml
deleted file mode 100644
index a1ccb1cc..00000000
--- a/swamid-interfederations-2.0/aai-login.hsr.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.hsr.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-28T14:02:53Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsr.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">HSR - Hochschule für Technik Rapperswil</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">HSR - Hochschule für Technik Rapperswil</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Hochschule für Technik Rapperswil</mdui:Description>
-        <mdui:Description xml:lang="en">University of Applied Sciences Rapperswil</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+hkAAAgMSURBVHic7JhpcFtXFcfNB4YBPjDDMHyATkuhECjQTkkhNCZxGjoMn5nS0nSaAAXaEmAGhg+0QGmniV1naRMndrxGlh1v8i5vkrxL8iJFlmPLtnYvkm3ZlnfHljdhfk/PyLZYptNxDFXfmTuao/POO+/+3733f855MVsfMon5X0/goEUCHO0iAY52kQBHu0iAo10kwNEuEuBoFwlwtIsE+D3I3wXZ95kckGwDnl9ZS2q0XdYMbA9Vv8I0HHbaDAZXVlZmZma93lGb3WHu7llcXIoIZLH0FSuKUYLBYH5egdPpRN/Y2CgpLn31T69ly7KxYykrLX/3nSspyamWXssBQdwr24BdU4sf+WVuzAs3Y07LhPFc5tEEVdhpdGy8vcOgb+sQh07f7vP5IgKlpabHPnFM1B995FuKIgF8tkz+tUMPJ19PyczIEgHHHj3+3LOnfnP2d1/50lfdbvdBQNwr24Dd/qVPni2I+UUOsAXkP80+eak+7DQ9PQ1OMIsD3emKnOvNLNmRx58wGm+3t3c8+s3HyssqMJ4/F/+Nrz9itdpEH07CibjvZ6RlGgzGQ19+2Gaz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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>152.96.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:620:130::/48</mdui:IPHint>
-        <mdui:DomainHint>hsr.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.22336,8.81745</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>
-MIIDIDCCAgigAwIBAgIJALbnMqADD20yMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dpbi5oc3IuY2gwHhcNMTUwNTE4MDgwMDI4WhcNMTgwNTE3MDgw
-MDI4WjAbMRkwFwYDVQQDExBhYWktbG9naW4uaHNyLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtu/T1cjcxHjIj87PNh0gwDTN4R71W53IFXMqjxoq
-+qr2K9NTez+7w45G5/klw/7k8jXhdQA4zoo+bQbvtLaR/8IJAKmZqXOOfw0DveIQ
-gVzCuKkfljcz+Vukemz4k9uGnY3B1yu1pmPzNws9oB60NA1vz0dk4+H/h4QEnf+o
-Hi3NfX+nXbywFOG1L4ZqiKdil7oThV9SO3/pmmH+kQs9Qf2jNi49x6ApE5HZ+J6F
-SZr+fkfLBnPLFMwvZzZK4z26QdEkjb1B9O/rxrad91YaE7Uhu5FO76nhKEG2/nCZ
-MB+66WlDYBEM5OYA/aYH9bnRCBVPWLQs6SdA+TXnf90HAQIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9naW4uaHNyLmNohidodHRwczovL2FhaS1sb2dpbi5oc3Iu
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFn0kuDp5MlHsnqDUWsvTCTGM6UA
-MA0GCSqGSIb3DQEBBQUAA4IBAQCj8Hen4EbMbS/ykxE4PV+PPOOR0Hc1H+JsLt+Q
-jSXBdZ6RYt1NQ9/WK0KmNap8dsNQ4KhGv1Kb3feR3wgeFeSVJTAEf2IFXhFgNQAe
-l/rDigoS4F7Mv1//1fsUggM5C3VM/8Q3ZhPyU4QbMBXkkLdV1mZwKcvJXwT93SPK
-ny+nOXDdmC68IYvONQ+JSTXNOhKbuxQhYLlc5ETq+K/kb6p734trD6NesCOaaNYl
-geOSWVdj8kw8A9qt+p4/9XxYGGvrcxW49BovsjD5RlaD++RIyap3TDUFIYHkpo48
-VlqG9d3H6ougFWjTlcGEmbCKHbuP6pmxM9POV16FGrrLUPHB
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.hsr.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.hsr.ch: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://aai-login.hsr.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.hsr.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.hsr.ch/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-login.hsr.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsr.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJALbnMqADD20yMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dpbi5oc3IuY2gwHhcNMTUwNTE4MDgwMDI4WhcNMTgwNTE3MDgw
-MDI4WjAbMRkwFwYDVQQDExBhYWktbG9naW4uaHNyLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtu/T1cjcxHjIj87PNh0gwDTN4R71W53IFXMqjxoq
-+qr2K9NTez+7w45G5/klw/7k8jXhdQA4zoo+bQbvtLaR/8IJAKmZqXOOfw0DveIQ
-gVzCuKkfljcz+Vukemz4k9uGnY3B1yu1pmPzNws9oB60NA1vz0dk4+H/h4QEnf+o
-Hi3NfX+nXbywFOG1L4ZqiKdil7oThV9SO3/pmmH+kQs9Qf2jNi49x6ApE5HZ+J6F
-SZr+fkfLBnPLFMwvZzZK4z26QdEkjb1B9O/rxrad91YaE7Uhu5FO76nhKEG2/nCZ
-MB+66WlDYBEM5OYA/aYH9bnRCBVPWLQs6SdA+TXnf90HAQIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9naW4uaHNyLmNohidodHRwczovL2FhaS1sb2dpbi5oc3Iu
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFn0kuDp5MlHsnqDUWsvTCTGM6UA
-MA0GCSqGSIb3DQEBBQUAA4IBAQCj8Hen4EbMbS/ykxE4PV+PPOOR0Hc1H+JsLt+Q
-jSXBdZ6RYt1NQ9/WK0KmNap8dsNQ4KhGv1Kb3feR3wgeFeSVJTAEf2IFXhFgNQAe
-l/rDigoS4F7Mv1//1fsUggM5C3VM/8Q3ZhPyU4QbMBXkkLdV1mZwKcvJXwT93SPK
-ny+nOXDdmC68IYvONQ+JSTXNOhKbuxQhYLlc5ETq+K/kb6p734trD6NesCOaaNYl
-geOSWVdj8kw8A9qt+p4/9XxYGGvrcxW49BovsjD5RlaD++RIyap3TDUFIYHkpo48
-VlqG9d3H6ougFWjTlcGEmbCKHbuP6pmxM9POV16FGrrLUPHB
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.hsr.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.hsr.ch: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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">hsr.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">HSR - Hochschule für Technik Rapperswil</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">HSR - Hochschule für Technik Rapperswil</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.hsr.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hsr.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Servicedesk</md:GivenName>
-    <md:SurName>Support Contact</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@hsr.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Cedric</md:GivenName>
-    <md:SurName>Früchtenicht</md:SurName>
-    <md:EmailAddress>mailto:cedric.fruechtenicht@hsr.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Patrick</md:GivenName>
-    <md:SurName>Oberli</md:SurName>
-    <md:EmailAddress>mailto:poberli@hsr.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 163b9453..00000000
--- a/swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.ph-gr.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-06-29T09:18:04Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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+yD4K3nmBwEkPuMDB5BSi4HoAEcZGyn73WqkfIXc35DE8KcgGVQgMXwlRBigevFVYtumYoH1EYAu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</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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJAIlKvmCLcLOTMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmFhaS1sb2dpbi5waC1nci5jaDAeFw0xNTA2MDIwNjMyMjVaFw0xODA2MDEw
-NjMyMjVaMB0xGzAZBgNVBAMTEmFhaS1sb2dpbi5waC1nci5jaDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANwleY0kWfcH8A3j4ON2P1zQqht4SStCiCMn
-a0FeQoOwT5ARX0ifzOTMH/JmBOAhQzct7MpsPB6O709vThxL3oqIH3yTGVU6ldrP
-yUzYK43Uciqd39DFVA1+07NtZW6Syx8jwOSAEodk95oQ+KQDxsT5TiUu3W1N69g7
-rdcdrNiuz4h+DOfKR/M/H7Qn7Blm+/igeSzCKBvQQXbVzSGZNiYwP3dvscERYe5D
-J1IcRo4HSeZFkxyX6eyUj8HyuOUhqexaGtokxDO6mQiJEnufMxy3b0W5rTAQM8Nu
-ypngfeK5vsg6VMghx/El5jQX+1qTlB75Lkev/NGmhZ4JhbtTSE0CAwEAAaNrMGkw
-SAYDVR0RBEEwP4ISYWFpLWxvZ2luLnBoLWdyLmNohilodHRwczovL2FhaS1sb2dp
-bi5waC1nci5jaC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUZ3euuLeLRbt0/DMn
-RGL5BKiXv6EwDQYJKoZIhvcNAQEFBQADggEBANlxMd/EXLmnzUufEiOgov06HJjY
-Q7WBW4H3AimvFSYexq7zCINsGyH0fwSSYX6T9AlayfLRwQMFR2gzo3MZ6NJFSQGd
-ZROgjQO8kmuw7foA2fdfyK6ZPF8SC40MXysN9YWF0QweewzeMwQxye/62DZvMohb
-JwWpgjx9bOMBEkF4mXPOGSas2X161x17Q4DH92iWRUuot/UKVKBizKJo3/iRnSA2
-c8r7cfIPoPf3m9Uc8jfrKFYY5iqbijZa53zhD0R6+JyLsvWnmFsD5h/pSegoCrad
-WxB95ILeFRsPZ4FBUp7jQI9//jopnO3qyqOLkxR39g73XZtCv0XFFH4HdEY=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://aai-login.ph-gr.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-gr.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJAIlKvmCLcLOTMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmFhaS1sb2dpbi5waC1nci5jaDAeFw0xNTA2MDIwNjMyMjVaFw0xODA2MDEw
-NjMyMjVaMB0xGzAZBgNVBAMTEmFhaS1sb2dpbi5waC1nci5jaDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANwleY0kWfcH8A3j4ON2P1zQqht4SStCiCMn
-a0FeQoOwT5ARX0ifzOTMH/JmBOAhQzct7MpsPB6O709vThxL3oqIH3yTGVU6ldrP
-yUzYK43Uciqd39DFVA1+07NtZW6Syx8jwOSAEodk95oQ+KQDxsT5TiUu3W1N69g7
-rdcdrNiuz4h+DOfKR/M/H7Qn7Blm+/igeSzCKBvQQXbVzSGZNiYwP3dvscERYe5D
-J1IcRo4HSeZFkxyX6eyUj8HyuOUhqexaGtokxDO6mQiJEnufMxy3b0W5rTAQM8Nu
-ypngfeK5vsg6VMghx/El5jQX+1qTlB75Lkev/NGmhZ4JhbtTSE0CAwEAAaNrMGkw
-SAYDVR0RBEEwP4ISYWFpLWxvZ2luLnBoLWdyLmNohilodHRwczovL2FhaS1sb2dp
-bi5waC1nci5jaC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUZ3euuLeLRbt0/DMn
-RGL5BKiXv6EwDQYJKoZIhvcNAQEFBQADggEBANlxMd/EXLmnzUufEiOgov06HJjY
-Q7WBW4H3AimvFSYexq7zCINsGyH0fwSSYX6T9AlayfLRwQMFR2gzo3MZ6NJFSQGd
-ZROgjQO8kmuw7foA2fdfyK6ZPF8SC40MXysN9YWF0QweewzeMwQxye/62DZvMohb
-JwWpgjx9bOMBEkF4mXPOGSas2X161x17Q4DH92iWRUuot/UKVKBizKJo3/iRnSA2
-c8r7cfIPoPf3m9Uc8jfrKFYY5iqbijZa53zhD0R6+JyLsvWnmFsD5h/pSegoCrad
-WxB95ILeFRsPZ4FBUp7jQI9//jopnO3qyqOLkxR39g73XZtCv0XFFH4HdEY=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.ph-gr.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.ph-gr.ch/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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ph-gr.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">PHGR - Pädagogische Hochschule Graubünden</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">PHGR - University of Teacher Education Graubünden</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">PHGR - Alta Scuola Pedagogica dei Grigioni</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.ph-gr.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ph-gr.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ph-gr.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>PHGR</md:SurName>
-    <md:EmailAddress>mailto:aai@ph-gr.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SWITCHaai</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-login.phsg.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.phsg.ch-idp-shibboleth.xml
deleted file mode 100644
index 09a90145..00000000
--- a/swamid-interfederations-2.0/aai-login.phsg.ch-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://aai-login.phsg.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-01-18T17:07:41Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://helpdesk.phsg.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phsg.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">PHSG - Pädagogische Hochschule St.Gallen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">PHSG - Pädagogische Hochschule St.Gallen</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Pädagogische Hochschule St.Gallen</mdui:Description>
-        <mdui:Description xml:lang="en">Pädagogische Hochschule St.Gallen</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAxklEQVQ4EWP4//8/JxBPBuInQEwsAKltAWI2BiAxjVhdWNS1MwIFvzEwMHACMTngNciA/+TohOlhgTGIoTfdWMCw6eZCsFI/9XgGP40EBiYQr7SsAo5hBoHEYADGhmkGicPYYANAAt1dHWAMUwwSIwbg9QK6YSBnw2wGscEAFIglpeVwDOKDAEgMBpDZMDEYDXcByAvkAHgYkKMZpIfidECxC0AGfCfX+UB9L0AGLKDAgGWg3AjKznOA+C0saoigQWpnAjEnAIt5HRA+6LqUAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAANUElEQVR4nOxae1BU1xnf/tNJnfyT1CRNOgmJYjJm0mlnmDbTWmc6aadpk5pEEvEBy7ILXEERJT4wKPEREREF1EQFE0GQXZDdBUEQHyS+0BCXgCYCyyMSEkx8ALuQTUyifv3OuXvvnnv3Ltw1pjs7lZmP+zj3nvPd3/19z7saANDclduXgCsQ7BJwBYJdAq5AsEvAFQh2CbgCwS4BVyDYJeAKBLsEXIFgl4ArEOwScAWCXQKuQLAL/Vc6pEFp/z+TDo3J2UnFOHAhrPhyC7fn6xau5EoLZxpqCzc5u8YbHfZR5xABNDnJZHaPONzHDva4w30sXMtulc555jMKx+55jQ6F6xxK8zHXSO5Vuk9Bf5kI65aNdGuMQxcmF3ZXWzaczoYlh+Mhaf+LML/q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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.phsg.ch</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.phsg.ch</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.176.16.128/25</mdui:IPHint>
-        <mdui:IPHint>195.176.18.0/24</mdui:IPHint>
-        <mdui:DomainHint>phsg.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.430364,9.382454</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.472613,9.494863</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.409875,9.252674</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>
-MIIDMDCCAhigAwIBAgIVALNxp/wH2YQYb204i6svZSMm3LcrMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWFhaS1sb2dpbi5waHNnLmNoMB4XDTE2MDExNTE0MDYz
-M1oXDTE5MDExNTE0MDYzM1owHDEaMBgGA1UEAwwRYWFpLWxvZ2luLnBoc2cuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAmUJrpcGvUqqsq2/peAy6
-wjo2k8hC3biqtBAYlJTE82N5ans+w1fMhB6kREEOE4raWUz8WUjMXQjsxBSriYHm
-zqFG2uw3eniLk/5Glor5fDs7CRlYmmyq3A//ZKJ1vcjTtp2qEGF87fpjYgrMgaiv
-DSZjbPMjcTQODmxI2NWOsw/vqIlP0oMieMloAEK5tCRnEWqtud3yBtQoJlKnu3IE
-v1LQuGBI9tY/namgRS/Loy+zRwAe+ceRZBCfHmCsAKxKfhgZDraDiRAlrSHmA0zW
-N5udheceywg4CdqE280zPDvxyXdqjzMGexMhkKDX/q3mwoDeaGK9TKzQ5TE+wLQz
-AgMBAAGjaTBnMB0GA1UdDgQWBBScAKZ0mGe9eB8bIWY87N2evj5jITBGBgNVHREE
-PzA9ghFhYWktbG9naW4ucGhzZy5jaIYoaHR0cHM6Ly9hYWktbG9naW4ucGhzZy5j
-aC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAJr1m1HBjaunBDUuq
-OOiDkBPZ8xrDIuND+RBJtvKi/aHjnmh+alhsQkj/YbQGWpszE7icHUkf83mXnJHS
-YeoveySJ4VNVFY7y1k5HDo428EmIyM3cmK3oNE+CsvdkjVLdhjEUM32eD+3FqcMk
-F/9Tx9Nl6YkPjAS3eEx4dYvZ6O7cSVJ+wWW+1e3HPnoD2wsjR4nrSvTsepKknAcp
-gvjk1jpuIm1sim4/gx6GX69sAhhQgiocFAZSzV+zTZbHJekYsrIkplNHcmY3+swv
-cqS+TPtZ1IvWnlY+blGm4nFPgRUHTz/8opjx+HiAl5pccUMS06w5f3cL2f1dRoeP
-tKCbvw==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.phsg.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.phsg.ch/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://aai-login.phsg.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.phsg.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.phsg.ch/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-login.phsg.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phsg.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVALNxp/wH2YQYb204i6svZSMm3LcrMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWFhaS1sb2dpbi5waHNnLmNoMB4XDTE2MDExNTE0MDYz
-M1oXDTE5MDExNTE0MDYzM1owHDEaMBgGA1UEAwwRYWFpLWxvZ2luLnBoc2cuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAmUJrpcGvUqqsq2/peAy6
-wjo2k8hC3biqtBAYlJTE82N5ans+w1fMhB6kREEOE4raWUz8WUjMXQjsxBSriYHm
-zqFG2uw3eniLk/5Glor5fDs7CRlYmmyq3A//ZKJ1vcjTtp2qEGF87fpjYgrMgaiv
-DSZjbPMjcTQODmxI2NWOsw/vqIlP0oMieMloAEK5tCRnEWqtud3yBtQoJlKnu3IE
-v1LQuGBI9tY/namgRS/Loy+zRwAe+ceRZBCfHmCsAKxKfhgZDraDiRAlrSHmA0zW
-N5udheceywg4CdqE280zPDvxyXdqjzMGexMhkKDX/q3mwoDeaGK9TKzQ5TE+wLQz
-AgMBAAGjaTBnMB0GA1UdDgQWBBScAKZ0mGe9eB8bIWY87N2evj5jITBGBgNVHREE
-PzA9ghFhYWktbG9naW4ucGhzZy5jaIYoaHR0cHM6Ly9hYWktbG9naW4ucGhzZy5j
-aC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAJr1m1HBjaunBDUuq
-OOiDkBPZ8xrDIuND+RBJtvKi/aHjnmh+alhsQkj/YbQGWpszE7icHUkf83mXnJHS
-YeoveySJ4VNVFY7y1k5HDo428EmIyM3cmK3oNE+CsvdkjVLdhjEUM32eD+3FqcMk
-F/9Tx9Nl6YkPjAS3eEx4dYvZ6O7cSVJ+wWW+1e3HPnoD2wsjR4nrSvTsepKknAcp
-gvjk1jpuIm1sim4/gx6GX69sAhhQgiocFAZSzV+zTZbHJekYsrIkplNHcmY3+swv
-cqS+TPtZ1IvWnlY+blGm4nFPgRUHTz/8opjx+HiAl5pccUMS06w5f3cL2f1dRoeP
-tKCbvw==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.phsg.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.phsg.ch/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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">phsg.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">PHSG - Pädagogische Hochschule St.Gallen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">PHSG - Pädagogische Hochschule St.Gallen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.phsg.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.phsg.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>PHSG</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@phsg.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Stefan</md:GivenName>
-    <md:SurName>Keel</md:SurName>
-    <md:EmailAddress>mailto:stefan.keel@phsg.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.pmodwrc.ch-idp-shibboleth.xml
deleted file mode 100644
index ddf68548..00000000
--- a/swamid-interfederations-2.0/aai-login.pmodwrc.ch-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://aai-login.pmodwrc.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-11-03T16:47:17Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.pmodwrc.ch/helpdesk/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmodwrc.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">PMOD/WRC - Observatorium Davos</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">PMOD/WRC - Observatory Davos</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Physikalisch-Meteorologisches Observatorium Davos / World Radiation Center</mdui:Description>
-        <mdui:Description xml:lang="en">Physikalisch-Meteorologisches Observatorium Davos / World Radiation Center</mdui:Description>
-        <mdui:Keywords xml:lang="de">pmod wrc davos observatory world+radiation+center</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">pmod wrc davos observatory world+radiation+center</mdui:Keywords>
-        <mdui:Logo height="16" width="16">data:image/png;base64,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</mdui:Logo>
-        <mdui:Logo height="23" width="80">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.pmodwrc.ch/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.pmodwrc.ch/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.5.60.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:620:1b0::/48</mdui:IPHint>
-        <mdui:DomainHint>pmodwrc.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.813268333,9.844476667</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>
-MIIDPDCCAiSgAwIBAgIVALG9ecvQJDCXzNRP46ZzLxS4GhtYMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFGFhaS1sb2dpbi5wbW9kd3JjLmNoMB4XDTE1MDkwNDA4
-MzM0OVoXDTE4MDkwNDA4MzM0OVowHzEdMBsGA1UEAwwUYWFpLWxvZ2luLnBtb2R3
-cmMuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJUqXZfgggAPBq
-lto9/Kp35iKRqQnYuEYBnGWU2R+DyTBVulQMICxKj1eusQkPbx1kJHUYluEvqQAB
-Fo7L92XJstToDPrqcPM9K6raiGIQkvMs8XjpimxTc5+BxwXd8j6W8nt7FSJwJMbr
-rJbPJa4d70hE6YLWeUIOlRcCqQIjimYn15bRTT3lyvyqft/aA7PGmcGwXHUUuqSM
-eYcdTznmukf7DHXsELMFo8mh4mhgNtv9hOTljWzDm3E1Seltzn8dWt8BCNRhCrux
-9zbvW6O4pwuEpmEAe8Y6oiRzsPmERpYvNuCXCbiFKAM4+4urIR9HBRIYQ+O0d2Hd
-Mra1f9JlAgMBAAGjbzBtMB0GA1UdDgQWBBQhIfuXzA9F23uk457x7OAaaw1+VjBM
-BgNVHREERTBDghRhYWktbG9naW4ucG1vZHdyYy5jaIYraHR0cHM6Ly9hYWktbG9n
-aW4ucG1vZHdyYy5jaC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-VQQ2H4Jk7jcPpGTCgjUooodcP3HnbXBJAjN3yQPCQFAaHy508uVn94Bsf6YB9lDL
-YI8+A/YK3gVasS920PO82WXX+6GJfN69zymoLzx/1glG8TlQUChsIdaQ3wYEpY1M
-Xe60wppCMMGrAX6Xm6FMJ0eAhCYB198s3rq912Qo45X0IRatt/9/hX8d6papM3ix
-KLnxSFoYmtjuLBu3m3iafGjKLhqrSuUjijQkUpiBhU9L+mHYqsiFhWtN0shDDArV
-/L/p5/Cgit73Y4DxEiduQLsvOY7qMRT/2B8BeOGfsPmFEhgOW4bsqD0PPDSFU/0V
-5ZEAFD7qOs5ewWuoyZkSkw==
-						</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://aai-login.pmodwrc.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.pmodwrc.ch/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmodwrc.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVALG9ecvQJDCXzNRP46ZzLxS4GhtYMA0GCSqGSIb3DQEB
-CwUAMB8xHTAbBgNVBAMMFGFhaS1sb2dpbi5wbW9kd3JjLmNoMB4XDTE1MDkwNDA4
-MzM0OVoXDTE4MDkwNDA4MzM0OVowHzEdMBsGA1UEAwwUYWFpLWxvZ2luLnBtb2R3
-cmMuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJUqXZfgggAPBq
-lto9/Kp35iKRqQnYuEYBnGWU2R+DyTBVulQMICxKj1eusQkPbx1kJHUYluEvqQAB
-Fo7L92XJstToDPrqcPM9K6raiGIQkvMs8XjpimxTc5+BxwXd8j6W8nt7FSJwJMbr
-rJbPJa4d70hE6YLWeUIOlRcCqQIjimYn15bRTT3lyvyqft/aA7PGmcGwXHUUuqSM
-eYcdTznmukf7DHXsELMFo8mh4mhgNtv9hOTljWzDm3E1Seltzn8dWt8BCNRhCrux
-9zbvW6O4pwuEpmEAe8Y6oiRzsPmERpYvNuCXCbiFKAM4+4urIR9HBRIYQ+O0d2Hd
-Mra1f9JlAgMBAAGjbzBtMB0GA1UdDgQWBBQhIfuXzA9F23uk457x7OAaaw1+VjBM
-BgNVHREERTBDghRhYWktbG9naW4ucG1vZHdyYy5jaIYraHR0cHM6Ly9hYWktbG9n
-aW4ucG1vZHdyYy5jaC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-VQQ2H4Jk7jcPpGTCgjUooodcP3HnbXBJAjN3yQPCQFAaHy508uVn94Bsf6YB9lDL
-YI8+A/YK3gVasS920PO82WXX+6GJfN69zymoLzx/1glG8TlQUChsIdaQ3wYEpY1M
-Xe60wppCMMGrAX6Xm6FMJ0eAhCYB198s3rq912Qo45X0IRatt/9/hX8d6papM3ix
-KLnxSFoYmtjuLBu3m3iafGjKLhqrSuUjijQkUpiBhU9L+mHYqsiFhWtN0shDDArV
-/L/p5/Cgit73Y4DxEiduQLsvOY7qMRT/2B8BeOGfsPmFEhgOW4bsqD0PPDSFU/0V
-5ZEAFD7qOs5ewWuoyZkSkw==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.pmodwrc.ch/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="en">pmodwrc.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">PMOD/WRC - Observatorium Davos</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">PMOD/WRC - Observatory Davos</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.pmodwrc.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.pmodwrc.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Senft</md:SurName>
-    <md:EmailAddress>mailto:marco.senft@pmodwrc.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 58 467 51 49</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Senft</md:SurName>
-    <md:EmailAddress>mailto:marco.senft@pmodwrc.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 58 467 51 49</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 741a76b4..00000000
--- a/swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.bfh.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-05-13T09:43:11Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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,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</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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJAPneN1luv6WBMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi5iZmguY2gwHhcNMTUwNTA3MTQwNTAwWhcNMTgwNTA2MTQw
-NTAwWjAbMRkwFwYDVQQDExBhYWktbG9nb24uYmZoLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA7GW/n7pU61p+pjImwqFMpIudeZxliexRwmcN8w6A
-MUpIAVoj0Csr9zhZfQMHVV4JGuDo2AVAwX1vvcFNR2qCoCmbQ8GgxX/B3MSc42dy
-bCHMhtxCNcvigqermkUG4mcFtEA4zbpJ+ILqPZ4rGiZfy/DaWYGEH2f8rFrXjC+H
-S0/oxnS9D7o/V/mCrAYEIErX8aAMQJJcw94YBIVGVs/Bv0AXJOgoL2YjDI8xINyd
-pbED93BdwHb1ksfrNJH/t9/dc2GiRPx2Gv7E4zY30Zkm8KRjSAmkybQeyhfeoetw
-JUDA2cqWB39JCVg1VeSeJ2Voi48WrQqA54uRgUvbya+v8QIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24uYmZoLmNohidodHRwczovL2FhaS1sb2dvbi5iZmgu
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCF9TJLxvi9kSOejHvssZ6v1pMW8
-MA0GCSqGSIb3DQEBBQUAA4IBAQB/A5JSvw+YiWYL2qn9piA5kbNaX9q/uHyukcGa
-f2cWyCD8U1H3YYuDpGQevmNOaSHUzMGpGn9FKXOvjxBLotY7jH50ReFifcNalFs2
-Dv1JnyrrHc3BsqHexZKoOupT2L3hadEhJdfTmZX3hQY4yqi/RNKlYbIC1t1SjEUN
-nnt3eVesg87paE+VMTFIBB6OO8iKD9hSLbFwOvsuasUURF8X1239cT6Kg0qFYXit
-Oa8ckwETZviCoz1wPxbbdE+tYkZFObQkgkoeDvJ/zLLenx0Vrw7EE/cFcZuriBTI
-FHdGUwjqh5AdbYDl7t25yKp91OODdNaifm8UyA/veqsHrygR
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://aai-logon.bfh.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.bfh.ch/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfh.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJAPneN1luv6WBMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi5iZmguY2gwHhcNMTUwNTA3MTQwNTAwWhcNMTgwNTA2MTQw
-NTAwWjAbMRkwFwYDVQQDExBhYWktbG9nb24uYmZoLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA7GW/n7pU61p+pjImwqFMpIudeZxliexRwmcN8w6A
-MUpIAVoj0Csr9zhZfQMHVV4JGuDo2AVAwX1vvcFNR2qCoCmbQ8GgxX/B3MSc42dy
-bCHMhtxCNcvigqermkUG4mcFtEA4zbpJ+ILqPZ4rGiZfy/DaWYGEH2f8rFrXjC+H
-S0/oxnS9D7o/V/mCrAYEIErX8aAMQJJcw94YBIVGVs/Bv0AXJOgoL2YjDI8xINyd
-pbED93BdwHb1ksfrNJH/t9/dc2GiRPx2Gv7E4zY30Zkm8KRjSAmkybQeyhfeoetw
-JUDA2cqWB39JCVg1VeSeJ2Voi48WrQqA54uRgUvbya+v8QIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24uYmZoLmNohidodHRwczovL2FhaS1sb2dvbi5iZmgu
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCF9TJLxvi9kSOejHvssZ6v1pMW8
-MA0GCSqGSIb3DQEBBQUAA4IBAQB/A5JSvw+YiWYL2qn9piA5kbNaX9q/uHyukcGa
-f2cWyCD8U1H3YYuDpGQevmNOaSHUzMGpGn9FKXOvjxBLotY7jH50ReFifcNalFs2
-Dv1JnyrrHc3BsqHexZKoOupT2L3hadEhJdfTmZX3hQY4yqi/RNKlYbIC1t1SjEUN
-nnt3eVesg87paE+VMTFIBB6OO8iKD9hSLbFwOvsuasUURF8X1239cT6Kg0qFYXit
-Oa8ckwETZviCoz1wPxbbdE+tYkZFObQkgkoeDvJ/zLLenx0Vrw7EE/cFcZuriBTI
-FHdGUwjqh5AdbYDl7t25yKp91OODdNaifm8UyA/veqsHrygR
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.bfh.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.bfh.ch: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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">bfh.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">BFH - Berner Fachhochschule</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">BFH - Bern University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">BFH - Haute école spécialisée bernoise</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.bfh.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.bfh.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.bfh.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>BFH-ITS</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:it-support@bfh.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 31 848 48 48</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>Admins</md:SurName>
-    <md:EmailAddress>mailto:aai-admins@bfh.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 31 848 48 19</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 8427576e..00000000
--- a/swamid-interfederations-2.0/aai-logon.bfh.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-logon.bfh.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-11-01T14:28:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAwUlEQVR4nGNkYGBgYGDIrJ3IgAl+vD+4bfW1q1eRxZiwqIMDDkH7gEQtbW1kMRY0NRPd8iGM/F0TGRgYGJhYbV39kC1B14BQCncDrwQBJ010y4fbgwmIsOH3FwI2oIGrp/bj04Bm/K/3jw7s20OCDWyCcl4+/vg0QLyL7Gl5QycZGVlibYAAO2d3fBrwhCl2DWj+JqwBE1w4cxzOZoRQ2FMrAwMDA8PX57cWzZkK58Ji+t9vBiZWdLU/3l8/ewQtHgAvTzp9DJhgSwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="58" width="80">data:image/png;base64,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</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.ethz.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.ethz.ch-idp-shibboleth.xml
deleted file mode 100644
index fa13c34d..00000000
--- a/swamid-interfederations-2.0/aai-logon.ethz.ch-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://aai-logon.ethz.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-01-14T15:01:23Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.id.ethz.ch/servicedesk" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ethz.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">ETHZ - ETH Zürich</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ETHZ - ETH Zurich</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">ETHZ - ETH Zurich</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Eidgenössische Technische Hochschule Zürich</mdui:Description>
-        <mdui:Description xml:lang="en">Swiss Federal Institute of Technology Zurich</mdui:Description>
-        <mdui:Description xml:lang="fr">Ecole Polytechnique Fédérale de Zurich</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAASBQTFRFAD59Aj9+AT9+AD19ADh5ADd4ADp6AD18A0F/HleOJ12SJl2SJVuRIVmPIFiPJFuRIlmQFlCJBEF/H1iOBkOAA0B+ADV3OWub9vr80N7p0+Dq3ujw7vT48/f62+bv////bpG0MF+T9vv8ADl6ADF0apG09/r8YomvU3+oBESBuczcu83dD0yG+v39gaG/iqjE3ObuADt6mbPM5ezypr3SADN11uHreZq7F0yG/f7+wNHg+vz9o7vRAT99ADl50t/pzNrlc5i5N2maD0qFP2+dUn6o9Pn6Aj582ePsgKG/AC9zADx8CEWBl7TLsMbYx9fjTHmlFVCIrcXWEUuFVIGpjqzGBUOAor3RNmmZADZ4AkB+ADZ3ADR2AD99A0B/AT595RKpMgAAAAFiS0dEHwUNEL0AAAAJcEhZcwAADsMAAA7DAcdvqGQAAACjSURBVBjTY2AgCzBCARMDI5jPzMLKysrCwsrCxsDCDuJzcHJx8/Dy8QsICgmLsDOIiolLSEpJy8jKySsoKgkqMwipqKqpa2hqaevo6ukbGDIABYyMTfRNzcwtLK2sbUw5GGzt7B0cnZzlXVzd3D08vYQYvH18/fwDAoOCQ0LDwiMio4DWRJuqsDDHsLOJMcSwxYLcIRoXx8QQF88kyiDKRJbHADKiFN5zQY3pAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTExLTExVDE1OjM4OjQ2KzAxOjAw/4hh9gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0xMS0xMVQxNDo0MTowNyswMTowMKRQO8gAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="64" width="64">data:image/png;base64,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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.176.0.48/28</mdui:IPHint>
-        <mdui:IPHint>195.176.96.0/19</mdui:IPHint>
-        <mdui:IPHint>82.130.64.0/18</mdui:IPHint>
-        <mdui:IPHint>129.132.0.0/16</mdui:IPHint>
-        <mdui:IPHint>129.132.40.0/24</mdui:IPHint>
-        <mdui:IPHint>193.134.200.0/21</mdui:IPHint>
-        <mdui:IPHint>192.33.87.0/24</mdui:IPHint>
-        <mdui:IPHint>192.33.88.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.91.0/24</mdui:IPHint>
-        <mdui:IPHint>192.33.92.0/22</mdui:IPHint>
-        <mdui:IPHint>192.33.88.0/21</mdui:IPHint>
-        <mdui:IPHint>192.33.96.0/21</mdui:IPHint>
-        <mdui:IPHint>192.33.104.0/22</mdui:IPHint>
-        <mdui:IPHint>192.33.108.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.110.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:620:8::/48</mdui:IPHint>
-        <mdui:IPHint>2001:620:1a0::/48</mdui:IPHint>
-        <mdui:DomainHint>ethz.ch</mdui:DomainHint>
-        <mdui:DomainHint>cscs.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.37646,8.54792</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.41039,8.50902</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.566087,7.602298</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.022244,8.916146</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>
-MIIFojCCBIqgAwIBAgIUQV6//MsvpNeQ0A5F/aEZGwpWK9swDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDgxMTE1NTA0
-OVoXDTE3MDgxMTE1NTA0NVowYzELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJp
-Y2gxEDAOBgNVBAcTB1p1ZXJpY2gxFDASBgNVBAoTC0VUSCBadWVyaWNoMRowGAYD
-VQQDExFhYWktbG9nb24uZXRoei5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAM+Es3JJBpK6DNRjHcHcD1mPQOHKDnGfauHSbFuswybBJ5vaG/MNhKkT
-wEMU3I9seUkB6aMmFQ7Jb0h0L9chYzU4WQs87F5KHtDk7LUOPg23vLm0exArR1q9
-edcpju4wNXzT0Xs//5pBYfVtXBtqS1KDnR99hAn171PFOVgHyrAhZBiuthqnzKDx
-LXb8ZOcotrJf6w9KBryzE5N6iqJvsSblSobqNplFOJm19brnzaDvXs4XTdh590Gi
-OpGVnLIyzPnqc29vyFzXzQy+PnJSbA4rcH0WdZjb1QErl9SxRimp9Eu6FURuh2fz
-okqCXzkGYGapqnhbtacMpYU/55TXtZECAwEAAaOCAmIwggJeMHMGCCsGAQUFBwEB
-BGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29t
-MDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2
-c3NsZzIuY3J0MIHoBgNVHREEgeAwgd2CEWFhaS1sb2dvbi5ldGh6LmNogg92Y2lw
-aGVyLmV0aHouY2iCD3ZjYWVzYXIuZXRoei5jaIIPdmN1cnRlci5ldGh6LmNogg92
-Y29wcGVyLmV0aHouY2iCD3ZjZW5zb3IuZXRoei5jaIISbGRhcHMtaW5mby5ldGh6
-LmNogg92YmFnZ2VyLmV0aHouY2iCD2xpbnRlc3QuZXRoei5jaIIPdmtpa3V5dS5l
-dGh6LmNogg92a2FyYXRlLmV0aHouY2iBG3ZsYWRpc2xhdi5uZXNwb3JAaWQuZXRo
-ei5jaDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUFBwIBFiho
-dHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB
-/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgw
-FoAUkRlirVsXpzD78N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDov
-L2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFCu2
-n3cvVuUwhk5Trij3/AjY83eRMA0GCSqGSIb3DQEBCwUAA4IBAQBsieDeYEP421Ju
-vgGSCfFVz3COdaeApYbDVTrNgNXVz6SMJUtei4Am6Usn+LdS4T+JU2+XH9kwbMhs
-tB4HvrZ1B4knmP6HG3d3l5IFLKHOTsjaFi8iP1g5FScP4ZDU22gOmheBiUBxFWeg
-XlYNL0Oo0thjlEABy9xRhPKOOCPobph8yXNms3R26fNcWOr1vqrelgRliCCp+C8r
-XgNUpzJ27dWP55rM0g1xit7Yf70mLRYwhaIHqGoa1dLAzFgAUp09tRAh9e994HcE
-HZjdI2qJ9f74k5S+I+11iWbm0WPiClz0nKbzb2120cJp3DJuUwLFZUO75xFd1624
-Qpo1uN+B
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.ethz.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.ethz.ch/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://aai-logon.ethz.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.ethz.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.ethz.ch/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.ethz.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ethz.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFojCCBIqgAwIBAgIUQV6//MsvpNeQ0A5F/aEZGwpWK9swDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDgxMTE1NTA0
-OVoXDTE3MDgxMTE1NTA0NVowYzELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJp
-Y2gxEDAOBgNVBAcTB1p1ZXJpY2gxFDASBgNVBAoTC0VUSCBadWVyaWNoMRowGAYD
-VQQDExFhYWktbG9nb24uZXRoei5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAM+Es3JJBpK6DNRjHcHcD1mPQOHKDnGfauHSbFuswybBJ5vaG/MNhKkT
-wEMU3I9seUkB6aMmFQ7Jb0h0L9chYzU4WQs87F5KHtDk7LUOPg23vLm0exArR1q9
-edcpju4wNXzT0Xs//5pBYfVtXBtqS1KDnR99hAn171PFOVgHyrAhZBiuthqnzKDx
-LXb8ZOcotrJf6w9KBryzE5N6iqJvsSblSobqNplFOJm19brnzaDvXs4XTdh590Gi
-OpGVnLIyzPnqc29vyFzXzQy+PnJSbA4rcH0WdZjb1QErl9SxRimp9Eu6FURuh2fz
-okqCXzkGYGapqnhbtacMpYU/55TXtZECAwEAAaOCAmIwggJeMHMGCCsGAQUFBwEB
-BGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29t
-MDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2
-c3NsZzIuY3J0MIHoBgNVHREEgeAwgd2CEWFhaS1sb2dvbi5ldGh6LmNogg92Y2lw
-aGVyLmV0aHouY2iCD3ZjYWVzYXIuZXRoei5jaIIPdmN1cnRlci5ldGh6LmNogg92
-Y29wcGVyLmV0aHouY2iCD3ZjZW5zb3IuZXRoei5jaIISbGRhcHMtaW5mby5ldGh6
-LmNogg92YmFnZ2VyLmV0aHouY2iCD2xpbnRlc3QuZXRoei5jaIIPdmtpa3V5dS5l
-dGh6LmNogg92a2FyYXRlLmV0aHouY2iBG3ZsYWRpc2xhdi5uZXNwb3JAaWQuZXRo
-ei5jaDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUFBwIBFiho
-dHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB
-/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgw
-FoAUkRlirVsXpzD78N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDov
-L2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFCu2
-n3cvVuUwhk5Trij3/AjY83eRMA0GCSqGSIb3DQEBCwUAA4IBAQBsieDeYEP421Ju
-vgGSCfFVz3COdaeApYbDVTrNgNXVz6SMJUtei4Am6Usn+LdS4T+JU2+XH9kwbMhs
-tB4HvrZ1B4knmP6HG3d3l5IFLKHOTsjaFi8iP1g5FScP4ZDU22gOmheBiUBxFWeg
-XlYNL0Oo0thjlEABy9xRhPKOOCPobph8yXNms3R26fNcWOr1vqrelgRliCCp+C8r
-XgNUpzJ27dWP55rM0g1xit7Yf70mLRYwhaIHqGoa1dLAzFgAUp09tRAh9e994HcE
-HZjdI2qJ9f74k5S+I+11iWbm0WPiClz0nKbzb2120cJp3DJuUwLFZUO75xFd1624
-Qpo1uN+B
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.ethz.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.ethz.ch/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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ethz.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">ETHZ - ETH Zürich</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ETHZ - ETH Zurich</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">ETHZ - ETH Zurich</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.ethz.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ethz.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.ethz.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Vladislav</md:GivenName>
-    <md:SurName>Nespor</md:SurName>
-    <md:EmailAddress>mailto:vladislav.nespor@id.ethz.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Vladislav</md:GivenName>
-    <md:SurName>Nespor</md:SurName>
-    <md:EmailAddress>mailto:vladislav.nespor@id.ethz.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 eb6c70e8..00000000
--- a/swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.fhnw.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-01-04T15:26:00Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.fhnw.ch/services/business-applications/supportadressen" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md: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+zb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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.fhnw.ch/about-us</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.fhnw.ch/ueber-uns/</mdui:InformationURL>
-      </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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhnw.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <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://aai-logon.fhnw.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.fhnw.ch/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhnw.ch</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhnw.ch/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="en">fhnw.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">FHNW - Fachhochschule Nordwestschweiz</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">FHNW - University of Applied Sciences and Arts Northwestern Switzerland</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fhnw.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fhnw.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk AAI</md:GivenName>
-    <md:SurName>FHNW</md:SurName>
-    <md:EmailAddress>mailto:aaihelp@fhnw.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tom</md:GivenName>
-    <md:SurName>Schneider</md:SurName>
-    <md:EmailAddress>mailto:tom.schneider@fhnw.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Weboffice</md:GivenName>
-    <md:SurName>FHNW</md:SurName>
-    <md:EmailAddress>mailto:web.services@fhnw.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ffb00e20..00000000
--- a/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.fhsg.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-10-13T07:59:38Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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+HDh5qbm01M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</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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://aai-logon.fhsg.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.fhsg.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.fhsg.ch/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhsg.ch</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.fhsg.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.fhsg.ch: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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">fhsg.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">FHS St. Gallen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">FHS St.Gallen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fhsg.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fhsg.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Hotline</md:GivenName>
-    <md:SurName>Support Contact</md:SurName>
-    <md:EmailAddress>mailto:switchaai@fhsg.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SWITCHaai Team</md:GivenName>
-    <md:SurName>Informatik</md:SurName>
-    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.hcmr.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.hcmr.gr-idp-shibboleth.xml
deleted file mode 100644
index dce96f57..00000000
--- a/swamid-interfederations-2.0/aai-logon.hcmr.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,122 +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://aai-logon.hcmr.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">hcmr.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Hellenic Centre for Marine Research</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Ελληνικό Κέντρο Θαλασσίων Ερευνών</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.hcmr.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.hcmr.gr/</mdui:InformationURL>
-        <mdui:Logo height="54" width="125">https://idp.her.hcmr.gr/mdui_hcmr_logo_125x54.png</mdui:Logo>
-        <mdui:Logo height="64" width="65">https://idp.her.hcmr.gr/mdui_hcmr_logo_65x64.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hcmr.gr</mdui:DomainHint>
-        <mdui:DomainHint>ath.hcmr.gr</mdui:DomainHint>
-        <mdui:DomainHint>her.hcmr.gr</mdui:DomainHint>
-        <mdui:IPHint>195.251.36.0/23</mdui:IPHint>
-        <mdui:IPHint>83.212.249.0/24</mdui:IPHint>
-        <mdui:IPHint>83.212.250.0/24</mdui:IPHint>
-        <mdui:IPHint>192.135.166.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:648:2350::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:37.733456,23.904153</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:35.332358,25.282459</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDLzCCAhegAwIBAgIULnKvBVfvx4pFAdGQBdGm6Lb4EQQwDQYJKoZIhvcNAQEF
-                            BQAwHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmhjbXIuZ3IwHhcNMTIxMjA5MTEwNDEw
-                            WhcNMTUxMjA5MTEwNDEwWjAcMRowGAYDVQQDExFhYWktbG9nb24uaGNtci5ncjCC
-                            ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJcDqKAThNSrdiyAQEOQNFXx
-                            aLxbGKj4P4j4Y1XUJyHCKnEg4m+0fRi1rkrRcKwxdryU+nMtNcyJO/XHMP9d615d
-                            PQLIK1GAeVjJHu4S4giWgYxMX95xTTuFMB8+YvskdcErkuRBAQOwCHlfDvlyqLKs
-                            2PrXLRDwQltgT94pCME8X6LZHTXn+OGdvvoZAr3VBpGMn0Qu6ksw3SqH14oC1khC
-                            uIaz1VpXFUHCGPeSCuFvk4eoPT9kMhtz5pEI8uS5ofuh69JcqHUcgtG5QKui1x6n
-                            zPXzG/q4DiWWxqPd8cD6/ebzsHcTg/LWI1Snzrxh9u4ux+7ScWdZAAkjA57WfSUC
-                            AwEAAaNpMGcwRgYDVR0RBD8wPYIRYWFpLWxvZ29uLmhjbXIuZ3KGKGh0dHBzOi8v
-                            YWFpLWxvZ29uLmhjbXIuZ3IvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGCy9HAU
-                            oi0n/AKB1LwEBIxVFVYhMA0GCSqGSIb3DQEBBQUAA4IBAQAH2cLcPk3v+kubT2hM
-                            t26yI9Wy0pi/+dWEm/xg7nQqg/WcnPFo82q3bmmFK+Xsn5d8gDsUNG2xSbKVtDzO
-                            YubM8wmLli0f8lR5Xnt+o+6wDuCSTJU8K19InuEnwh0tfWyzNWN2iQP27vWmbfcw
-                            8zd4Ww9eGzxJseh26ne5ImdNYAzapNnUyBkZNywtFbFThvMwV7HGEriavDuLwEud
-                            mRw31/Vem41dmYeChS8oEoLJnhRyqG1vwkmOK2uUqAnyl/IQERGvNTM4G8ieXH4R
-                            Nvy8wByLa8lCOpKnjqaxzqucQw/iGF1zIc0/z5uaXSFOoITg3EFTrXvePTpm6muF
-                            589s
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.hcmr.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hcmr.gr: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://aai-logon.hcmr.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.hcmr.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.hcmr.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.hcmr.gr/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">hcmr.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDLzCCAhegAwIBAgIULnKvBVfvx4pFAdGQBdGm6Lb4EQQwDQYJKoZIhvcNAQEF
-                            BQAwHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmhjbXIuZ3IwHhcNMTIxMjA5MTEwNDEw
-                            WhcNMTUxMjA5MTEwNDEwWjAcMRowGAYDVQQDExFhYWktbG9nb24uaGNtci5ncjCC
-                            ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJcDqKAThNSrdiyAQEOQNFXx
-                            aLxbGKj4P4j4Y1XUJyHCKnEg4m+0fRi1rkrRcKwxdryU+nMtNcyJO/XHMP9d615d
-                            PQLIK1GAeVjJHu4S4giWgYxMX95xTTuFMB8+YvskdcErkuRBAQOwCHlfDvlyqLKs
-                            2PrXLRDwQltgT94pCME8X6LZHTXn+OGdvvoZAr3VBpGMn0Qu6ksw3SqH14oC1khC
-                            uIaz1VpXFUHCGPeSCuFvk4eoPT9kMhtz5pEI8uS5ofuh69JcqHUcgtG5QKui1x6n
-                            zPXzG/q4DiWWxqPd8cD6/ebzsHcTg/LWI1Snzrxh9u4ux+7ScWdZAAkjA57WfSUC
-                            AwEAAaNpMGcwRgYDVR0RBD8wPYIRYWFpLWxvZ29uLmhjbXIuZ3KGKGh0dHBzOi8v
-                            YWFpLWxvZ29uLmhjbXIuZ3IvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGCy9HAU
-                            oi0n/AKB1LwEBIxVFVYhMA0GCSqGSIb3DQEBBQUAA4IBAQAH2cLcPk3v+kubT2hM
-                            t26yI9Wy0pi/+dWEm/xg7nQqg/WcnPFo82q3bmmFK+Xsn5d8gDsUNG2xSbKVtDzO
-                            YubM8wmLli0f8lR5Xnt+o+6wDuCSTJU8K19InuEnwh0tfWyzNWN2iQP27vWmbfcw
-                            8zd4Ww9eGzxJseh26ne5ImdNYAzapNnUyBkZNywtFbFThvMwV7HGEriavDuLwEud
-                            mRw31/Vem41dmYeChS8oEoLJnhRyqG1vwkmOK2uUqAnyl/IQERGvNTM4G8ieXH4R
-                            Nvy8wByLa8lCOpKnjqaxzqucQw/iGF1zIc0/z5uaXSFOoITg3EFTrXvePTpm6muF
-                            589s
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.hcmr.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hcmr.gr: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">Hellenic Centre for Marine Research</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Ελληνικό Κέντρο Θαλασσίων Ερευνών</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Hellenic Centre for Marine Research</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Ελληνικό Κέντρο Θαλασσίων Ερευνών</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hcmr.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.hcmr.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Panagiotis</md:GivenName>
-    <md:SurName>Vavilis</md:SurName>
-    <md:EmailAddress>pvavilis@hcmr.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Panagiotis</md:GivenName>
-    <md:SurName>Vavilis</md:SurName>
-    <md:EmailAddress>pvavilis@hcmr.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9bc732dd..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.hes-so.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-14T06:31:06Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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/p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</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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://aai-logon.hes-so.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.hes-so.ch/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hes-so.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFIjCCBAqgAwIBAgIUXGCPDj9u7BGw3wvMHrROjZEotwQwDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDMxNjIyMzUy
-NFoXDTE4MDMxNjIyMzUxMVowga0xCzAJBgNVBAYTAkNIMQ0wCwYDVQQIEwRKdXJh
-MREwDwYDVQQHEwhEZWxlbW9udDE/MD0GA1UEChM2SGF1dGUgRWNvbGUgU3BlY2lh
-bGlzZWUgZGUgU3Vpc3NlIG9jY2lkZW50YWxlIChIRVMtU08pMR0wGwYDVQQLExRT
-ZXJ2aWNlIEluZm9ybWF0aXF1ZTEcMBoGA1UEAxMTYWFpLWxvZ29uLmhlcy1zby5j
-aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMND3PsEwdrvXK+DGAbs
-alJikrnHoy6SzdmAV13SR0QA+pEPCgngo3UVsaTEz12PIEbPkw0O9neaAt8CbZLg
-SmAx4sqX0WZAYho20gXDY/RlcXKryuMh/KlPyoC3fsmyVPDPD5uYmLNpCLKjl39I
-/oo3kpXzcmsdBx8ZFyz6YIode7Aplq6SJhh7s9x8HDg0aavSA7RDRGrZBy9ekqzW
-CsyyNTpxQWKnEPv4mfjEiyC3j9Mv43K9/lE+zgGOiZPx/mJ2CcbJ1sfJIT2Ui0I6
-dEgyuawkNEIqXWaKer+hMoyMxAzDCR0moEAWQ6SPcHwt6jwI2D9vNGcC17Ttr31n
-//ECAwEAAaOCAZcwggGTMHMGCCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0
-cDovL29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8v
-dHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsZzIuY3J0MB4GA1UdEQQXMBWC
-E2FhaS1sb2dvbi5oZXMtc28uY2gwUQYDVR0gBEowSDBGBgwrBgEEAb5YAAJkAQEw
-NjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20vcmVw
-b3NpdG9yeTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMB8GA1UdIwQYMBaAFJEZYq1bF6cw+/DeOSWxvYy5uFEnMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsZzIu
-Y3JsMB0GA1UdDgQWBBQF+6r3S9tw6noEppQsbF/ixESNADANBgkqhkiG9w0BAQsF
-AAOCAQEAeF4p6s8s7ZpSHlc3OS3ra8RiLlThLBZA108AMxPN/i8iVCUVEKHFrgaN
-tb7qml0cnvnY9DhN27A3sW0uPVC3Q4/NIpc7xvtlGr8Z5MyUgXREHvPXSQpR7dn6
-K5SUs9mz9+WrHmRpwWFzH+o2iExnZkUeZc+xNI0m1rWsVkUCnk0/v6CR0ZbKanma
-71+9g2gOrJKItHwsJZPbYHla9JORP6NIyLIy0gUKfpqjIEApTW60AJzZPVw0xmvU
-l0Cgg5Q1wV2vGdX1wDnrhS6v8qsMZ2blMT0k4vCEf6aYlnp9sSWkAj2xYOfNMkS1
-XV91LHfOW0ImozGw2G5yyW/6c0B/xw==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.hes-so.ch: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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">hes-so.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HES-SO : UAS Western Switzerland</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">HES-SO - Haute École Spécialisée de Suisse occidentale</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hes-so.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.hes-so.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Equipe</md:GivenName>
-    <md:SurName>AAI HES-SO</md:SurName>
-    <md:EmailAddress>mailto:idm@hes-so.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Equipe</md:GivenName>
-    <md:SurName>AAI HES-SO</md:SurName>
-    <md:EmailAddress>mailto:idm@hes-so.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 c9f5e094..00000000
--- a/swamid-interfederations-2.0/aai-logon.hes-so.ch.xml
+++ /dev/null
@@ -1,146 +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>
-  </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/p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</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.psi.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.psi.ch-idp-shibboleth.xml
deleted file mode 100644
index bd157591..00000000
--- a/swamid-interfederations-2.0/aai-logon.psi.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.psi.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-03-10T15:13:37Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://ait.web.psi.ch/us/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psi.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">PSI - Paul Scherrer Institut</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">PSI - Paul Scherrer Institute</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Paul Scherrer Institut</mdui:Description>
-        <mdui:Description xml:lang="en">Paul Scherrer Institute</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAXpJREFUeJzMk89KAlEUxufNeoXUNOkJpIdo2lWQzijkHzTQFs2I4ejY+D/d5KZS1zqTDrgUQTAyUPuac0OpXFTYogsfF865v2/mnHMvt7fr5jbRRvDfGTjtDs6xbfuViGEGbqeLOzk65kWfj/edelcKiCIveNdjtNNZYohlBsV8AfKlhEq5gptqFeVSCeFgCEo6jWrlPUaKhMIoaHnIkgRimEEuq9a1aw2GbuBpMsFgMACteq2G0WiE4XCIXq+HvqVEPM5yhq6DGGK56fQFkUgUerfL4Ie7e8znczRuGxiPx2i32sgoCq5SKfgFEYvFAt1OhzHErgweDQMdK0G/l5STsGrERTyBrJJBXtOsw89sn81mnw2WJZimiaQkW72QUSwUEYvG0Go2Yfb7LAe8Qs2q6yUsm0hfPbegnKry+x4PR01T0sqqgeVSGaGz4HoTP44xIPr5wwN+i2KiIFhj9H4/xq8XyeXYYbEdm/1nF+l/vIVN9AYAAP//AwDOc/AYx5TiWAAAAABJRU5ErkJggg==</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+hkAAAepSURBVHic7JiJU9NXEMf9X+pM22nrjNaxdazVVgYvDhWvenAIhkNUIICCByoQ0KqcAUREIAmXLQIJIRCFgCJXFMIhyBUiUSDhjJBwJfYraWMS8EeSKs7E7OxkNvvbfb/3eVf2ZcXbL0xWfO4OLLdYgM1dLMDmLhZgcxcLsLmLBdjcxQJs7mIBNnfRB76VdDsvL1+lUo2NjZWX8+AZHx/nzcubN2/E4ldVj59ox6fcTo2MuAZDJpOR3DxbW59LBiVVVU/Kynizs7O9QtHlS6EdHZ2Tk5MRlD/5/KeI5PEqoqNiET83Nxd9M5bJLIKTRsvMysyBR9NycXEJutHe9uLxoypu6UN4+PV8N1d3ONGHoLMX2p63S6XSR5WP8aKbN2Ko8UmIqax8XF/Px4smJ+URlGt3U9OJgJF58cKlE16nRkZGBIImD3cvOF+/7o+KikEXQQLn7eQUTbxCofDz9ZdIpLAZjKzsrJzp6enm5paY6LgIytWpqSn0Jj6OKpfLRSLRSW+fkIuXEZmWluHhfqLsYfnU1HRw0LmhoSE4w8MivTy9+/rE6pZBhZFSKpUPuA8RTAmP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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.176.0.32/28</mdui:IPHint>
-        <mdui:IPHint>2001:620:170::/48</mdui:IPHint>
-        <mdui:IPHint>129.129.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.33.118.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.120.0/21</mdui:IPHint>
-        <mdui:DomainHint>psi.ch</mdui:DomainHint>
-        <mdui:DomainHint>psilab.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.537688,8.222623</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>
-MIIDIDCCAgigAwIBAgIJALQ2EjQw+BiNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi5wc2kuY2gwHhcNMTMxMTI2MDg1MjQ2WhcNMTYxMTI1MDg1
-MjQ2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ucHNpLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA53/6MrJPHxt8oigLyUvYLR83hN2cu3GbPfjBB4VJ
-kpQisdb3jaGRiwJFjVuc1THr3Ov/cNmQ2ONQaIIvJ5d2BEmkvUj1tSnwR2CfDmGy
-0lEPxjD5Da++9P/S/sCdClR+1RwPAVH8ravfWYPEi6Jgzw5iSR5Jx3MD3cK7KHw2
-Pliko6+ibmVf56nfHRTJpPjJ9EGiSH9GBrmpPH8r+a0gUm9Mb1Mdk+Df+nMxUo9H
-IY4YoLRgFpcWXdWLM0TxzXM8bdVDoel96FvMITgNIDktb6Ml5MCm/9rrxLcVUelx
-/xtNa88PYtRmsqsQUY4ZAKwANyKNeUHZBADLHaNLepKhiwIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24ucHNpLmNohidodHRwczovL2FhaS1sb2dvbi5wc2ku
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNazc1/qrmmqgEVueIN62F390Kni
-MA0GCSqGSIb3DQEBBQUAA4IBAQAAZuFgMpEZjoq8pxLjbQDtfw5NTG1Wggmefv4M
-omMi3arqsiYQTUuMKwj6T5B08lPUV0kGIhCNBANLBxw+2UxFo266dWD5g703RFdn
-EeMlJ6Uro2niBUSl/FqDJ2i5t9yOP8CS6lEBvWo3CwJye5uo1YFQFP7W/rnvjhSp
-kQL8Jo3n/ZJbIImhG9pYBDJFK1D4UA0zxfOZ0Vt3rG6hnGiMDZ6S8l34axecTT1o
-aAOK+xJsXSM4wiULQuUiqaqUQkUqowD35dc8NuH1KZa4TgpLacCbKEN4d6XibSQf
-5ESwtfL8jg5PPnAfIXXSYewO0a7Unlt+BbpkQ7KCOkpPLzNB
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.psi.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.psi.ch: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://aai-logon.psi.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.psi.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.psi.ch/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.psi.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psi.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIJALQ2EjQw+BiNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGFhaS1sb2dvbi5wc2kuY2gwHhcNMTMxMTI2MDg1MjQ2WhcNMTYxMTI1MDg1
-MjQ2WjAbMRkwFwYDVQQDExBhYWktbG9nb24ucHNpLmNoMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA53/6MrJPHxt8oigLyUvYLR83hN2cu3GbPfjBB4VJ
-kpQisdb3jaGRiwJFjVuc1THr3Ov/cNmQ2ONQaIIvJ5d2BEmkvUj1tSnwR2CfDmGy
-0lEPxjD5Da++9P/S/sCdClR+1RwPAVH8ravfWYPEi6Jgzw5iSR5Jx3MD3cK7KHw2
-Pliko6+ibmVf56nfHRTJpPjJ9EGiSH9GBrmpPH8r+a0gUm9Mb1Mdk+Df+nMxUo9H
-IY4YoLRgFpcWXdWLM0TxzXM8bdVDoel96FvMITgNIDktb6Ml5MCm/9rrxLcVUelx
-/xtNa88PYtRmsqsQUY4ZAKwANyKNeUHZBADLHaNLepKhiwIDAQABo2cwZTBEBgNV
-HREEPTA7ghBhYWktbG9nb24ucHNpLmNohidodHRwczovL2FhaS1sb2dvbi5wc2ku
-Y2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNazc1/qrmmqgEVueIN62F390Kni
-MA0GCSqGSIb3DQEBBQUAA4IBAQAAZuFgMpEZjoq8pxLjbQDtfw5NTG1Wggmefv4M
-omMi3arqsiYQTUuMKwj6T5B08lPUV0kGIhCNBANLBxw+2UxFo266dWD5g703RFdn
-EeMlJ6Uro2niBUSl/FqDJ2i5t9yOP8CS6lEBvWo3CwJye5uo1YFQFP7W/rnvjhSp
-kQL8Jo3n/ZJbIImhG9pYBDJFK1D4UA0zxfOZ0Vt3rG6hnGiMDZ6S8l34axecTT1o
-aAOK+xJsXSM4wiULQuUiqaqUQkUqowD35dc8NuH1KZa4TgpLacCbKEN4d6XibSQf
-5ESwtfL8jg5PPnAfIXXSYewO0a7Unlt+BbpkQ7KCOkpPLzNB
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.psi.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.psi.ch: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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">psi.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">PSI - Paul Scherrer Institut</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">PSI - Paul Scherrer Institute</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.psi.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.psi.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>PSI</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@psi.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 56 310 8400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:aai-support@psi.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e80aa0cb..00000000
--- a/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.switch.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-10-07T19:42:37Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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/GfaFTqhdwWPAF7Xu0Lv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</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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.switch.ch/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://aai-logon.switch.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.switch.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.switch.ch/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">switch.ch</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.switch.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.switch.ch/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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">switch.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.switch.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.switch.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.switch.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.switch.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SWITCHaai</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 44 268 1505</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SWITCHaai</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 44 268 1505</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 5805b05b..00000000
--- a/swamid-interfederations-2.0/aai-logon.switch.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://aai-logon.switch.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-17T08:45:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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="en">SWITCH</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SWITCH operates the education and research network for the Swiss Higher Education organisations.</mdui:Description>
-        <mdui: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/GfaFTqhdwWPAF7Xu0Lv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</mdui:Logo>
-      </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="en">SWITCH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">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 c05b6d89..00000000
--- a/swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.uni.li/idp/shibboleth">
-  <md: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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://aai-logon.uni.li/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.uni.li/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.uni.li/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.li</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.uni.li:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.uni.li: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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">uni.li</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Liechtenstein</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Liechtenstein</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni.li/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni.li/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@uni.li</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@uni.li</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 1f3ace59..00000000
--- a/swamid-interfederations-2.0/aai-logon.uni.li.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
-  </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.unibas.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml
deleted file mode 100644
index 67f7db88..00000000
--- a/swamid-interfederations-2.0/aai-logon.unibas.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.unibas.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-01-20T14:35:43Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Basel</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Basel</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Université de Bâle</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universität Basel</mdui:Description>
-        <mdui:Description xml:lang="en">University of Basel</mdui:Description>
-        <mdui:Description xml:lang="fr">Université de Bâle</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAgklEQVQ4EbVRQQ6AMAib/o/X8kANi90KG3GJ0wu0tJTMUv74ROSKe2ecaU4IMwHmXFMtBly5tyXAvND1JpiJMv5Y2uoiOlDV6u/M08W0iAcDCJzOlXvTAcPT/gKILdVSOCliDtn/iFlaxvM17YFwPpuYcyYACAxzvzqHrta3BU78Fdzl9FuPpzdbqAAAAABJRU5ErkJggg==</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+hkAAAfHSURBVHic7JvZTxVJFIf9n3zz2QffTFzBLSoxikiURFkcFBUUInpBFgUVVHAB9QIuIJlxA69xQUSGxRVUXABFVBQVQXu+3IqVovt2D/FWDeNynrqq6zb1dZ0653e6mwnWL2YTTP+Bpqam9PT0sYzMycm5cOGC4emYB25sbNywYcNYRm7fvv3s2bOm5/NfAG/cuHEsI38Y4FevXj148MDtrAp89+7dt2/fqmc/fPjQ3t4ujr2BHz9+3NvbG/5sNQA/e/YsMjKyoaEh5FkVuKamZvHixQMDA6L56dOnmJiY8vJy0fQA5qZERER0dHSEP1s9Lt3Z2Tlr1qzr1687T9lc+vjx41FRUf39/e/fv1+xYsW+ffvkKTdgaLl4W1ublqlq28MPHz4MyezcwzAfPnz4xIkT+/fvV/tDAuultfQGrZDMTuChoaHW1tbbt2+zyGq/ExjOmTNnyk2uxTRHaSezDZgotXTp0tOnT1+8eHHRokVv3ryRp2zA0OpdW2H605JgvnbtmmiqwNBGR0cfPHhQNKuqqlRmFVjQ6l1bYUby8KNHjySzBLbRChPMIldJYBxeuydL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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.unibas.ch/de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.unibas.ch/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.unibas.ch</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>192.43.196.0/24</mdui:IPHint>
-        <mdui:IPHint>192.43.192.0/22</mdui:IPHint>
-        <mdui:IPHint>2001:620:200::/48</mdui:IPHint>
-        <mdui:IPHint>192.43.196.0/24</mdui:IPHint>
-        <mdui:IPHint>195.176.29.0/25</mdui:IPHint>
-        <mdui:IPHint>193.8.136.0/23</mdui:IPHint>
-        <mdui:IPHint>131.152.0.0/16</mdui:IPHint>
-        <mdui:IPHint>131.152.188.64/26</mdui:IPHint>
-        <mdui:IPHint>131.152.193.0/24</mdui:IPHint>
-        <mdui:IPHint>131.152.194.0/23</mdui:IPHint>
-        <mdui:IPHint>131.152.227.192/29</mdui:IPHint>
-        <mdui:IPHint>131.152.227.200/30</mdui:IPHint>
-        <mdui:IPHint>131.152.227.204/31</mdui:IPHint>
-        <mdui:IPHint>131.152.227.206/32</mdui:IPHint>
-        <mdui:DomainHint>unibas.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.55898,7.58352</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>
-MIIDLDCCAhSgAwIBAgIJAIGaAPMD0ysvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2FhaS1sb2dvbi51bmliYXMuY2gwHhcNMTMwNjEwMTI0NTAzWhcNMTYwNjA5
-MTI0NTAzWjAeMRwwGgYDVQQDExNhYWktbG9nb24udW5pYmFzLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0sjUfHm8YYP/fqHeV5IOcRO2g3zV6TOe
-fbk1yAgSqqGP3D8JK21UKr+peWz2CAMHyc4BcXB6Cg16VEzHOVHUU63oelsuU8oI
-EyhmuaTlq/S2SBfOReCvBqp0oaWtwbfOxDfDgV0xHPu9moIDT1x5du1BO3pUTxej
-0yRqb1wC8R3UGjmWl7wmN8VYSLv5dKkG9KHCgzKSG7lCci6QqBP+M8ybNiYcLmQA
-SjOnuaynq1dyT47WBQ1YZ62M7HWUX5w90cuhHAtywP/mCARXjad/Htp0CTGg3fTP
-0wPaFCdl+yLQueJx9w7zzgM/o35yhN0RIWi1c187clIxPPX4AcXMzQIDAQABo20w
-azBKBgNVHREEQzBBghNhYWktbG9nb24udW5pYmFzLmNohipodHRwczovL2FhaS1s
-b2dvbi51bmliYXMuY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFD7wTYVRLRII
-Pl6cNexk0jYnA11hMA0GCSqGSIb3DQEBBQUAA4IBAQBK82sJwITJPwhRQvze600Q
-MxUVMDbSzcwTtj+4AZsb50mqX7GMirULzJTIEy8CQLyX5XAgUvxHCaiJq2NosJ7A
-Yxxq9JoKJm8RZYIapWec8tio9ZUlhvyby7zhMz8yqjRmi3DENUoXvf25qfyz4o6m
-FYbOgkAp/4zVAkJ0ZXjCiAyLpnvNRT/1+kS9vvnHikecCEfOpjbG+8Bz2Qbse4ST
-HweUZV4m0fJXvQW/Ug/RVYq0GLtcGukTez8axMtYMnuA/NxzxQEo+uHe83KSXAPQ
-rcVXBQVY2qXZn91QHZJqxRwfLJ/fo82KwH6SJLjL2jW80zNCkfHvl4ycorbM+Wf9
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.unibas.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.unibas.ch: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://aai-logon.unibas.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.unibas.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.unibas.ch/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-logon.unibas.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAIGaAPMD0ysvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2FhaS1sb2dvbi51bmliYXMuY2gwHhcNMTMwNjEwMTI0NTAzWhcNMTYwNjA5
-MTI0NTAzWjAeMRwwGgYDVQQDExNhYWktbG9nb24udW5pYmFzLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0sjUfHm8YYP/fqHeV5IOcRO2g3zV6TOe
-fbk1yAgSqqGP3D8JK21UKr+peWz2CAMHyc4BcXB6Cg16VEzHOVHUU63oelsuU8oI
-EyhmuaTlq/S2SBfOReCvBqp0oaWtwbfOxDfDgV0xHPu9moIDT1x5du1BO3pUTxej
-0yRqb1wC8R3UGjmWl7wmN8VYSLv5dKkG9KHCgzKSG7lCci6QqBP+M8ybNiYcLmQA
-SjOnuaynq1dyT47WBQ1YZ62M7HWUX5w90cuhHAtywP/mCARXjad/Htp0CTGg3fTP
-0wPaFCdl+yLQueJx9w7zzgM/o35yhN0RIWi1c187clIxPPX4AcXMzQIDAQABo20w
-azBKBgNVHREEQzBBghNhYWktbG9nb24udW5pYmFzLmNohipodHRwczovL2FhaS1s
-b2dvbi51bmliYXMuY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFD7wTYVRLRII
-Pl6cNexk0jYnA11hMA0GCSqGSIb3DQEBBQUAA4IBAQBK82sJwITJPwhRQvze600Q
-MxUVMDbSzcwTtj+4AZsb50mqX7GMirULzJTIEy8CQLyX5XAgUvxHCaiJq2NosJ7A
-Yxxq9JoKJm8RZYIapWec8tio9ZUlhvyby7zhMz8yqjRmi3DENUoXvf25qfyz4o6m
-FYbOgkAp/4zVAkJ0ZXjCiAyLpnvNRT/1+kS9vvnHikecCEfOpjbG+8Bz2Qbse4ST
-HweUZV4m0fJXvQW/Ug/RVYq0GLtcGukTez8axMtYMnuA/NxzxQEo+uHe83KSXAPQ
-rcVXBQVY2qXZn91QHZJqxRwfLJ/fo82KwH6SJLjL2jW80zNCkfHvl4ycorbM+Wf9
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.unibas.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.unibas.ch: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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">unibas.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Basel</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Basel</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">Université de Bâle</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.unibas.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unibas.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.unibas.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>URZ</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:support-urz@unibas.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Arsene</md:GivenName>
-    <md:SurName>Gschwind</md:SurName>
-    <md:EmailAddress>mailto:arsene.gschwind@unibas.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 4cb81fb4..00000000
--- a/swamid-interfederations-2.0/aai-logon.wsl.ch-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://aai-logon.wsl.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-09-18T13:54:00Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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/coG5vsVooueoGSosE8EZVEHrHTQBcFDKE0Ef1ILZii9oR9YprHsTe4kTb9lH3lkAVdYtg7itx6GlW2WJCIjm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</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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.ch/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://aai-logon.wsl.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-logon.wsl.ch/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsl.ch</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-logon.wsl.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-logon.wsl.ch/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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">wsl.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">WSL - Eidg. Forschungsanstalt für Wald, Schnee und Landschaft</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">WSL - Swiss Federal Institute for Forest, Snow and Landscape Research</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.wsl.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.wsl.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Support Contact</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@wsl.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>WSL</md:SurName>
-    <md:EmailAddress>mailto:aai@wsl.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 feb0ec5e..00000000
--- a/swamid-interfederations-2.0/aai-logon.wsl.ch.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://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-02-10T12:27:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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/coG5vsVooueoGSosE8EZVEHrHTQBcFDKE0Ef1ILZii9oR9YprHsTe4kTb9lH3lkAVdYtg7itx6GlW2WJCIjm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</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 3ec47dde..00000000
--- a/swamid-interfederations-2.0/aai-viewer.switch.ch.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-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="en">SWITCH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">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.arnes.si-test-edugain.xml b/swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml
deleted file mode 100644
index fad7eb18..00000000
--- a/swamid-interfederations-2.0/aai.arnes.si-test-edugain.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.arnes.si/test/edugain">
-  <md:Extensions>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-05T13:11:06Z">
-      <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <req:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/Login"/>
-      <disco:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ArnesAAI IdP eduGAIN test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">ArnesAAI IdP eduGAIN test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Aplication for testing IdP eduGAIN compatibility</mdui:Description>
-        <mdui:Description xml:lang="sl">Aplikacija za preizkušanje kompatibilnosti IdP-jev vključenih v eduGAIN</mdui:Description>
-        <mdui:Keywords xml:lang="en">arnesaai edugain test service</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">arnesaai edugain test service</mdui:Keywords>
-        <mdui:Logo height="28" width="128">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://aai.arnes.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">https://aai.arnes.si</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ArnesAAI eduGAIN test, ArnesAAI eduGAIN compatibility test</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ArnesAAI eduGAIN test, ArnesAAI eduGAIN compatibility test,L=Ljubljana,C=SI</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFnDCCA4SgAwIBAgIGElFhIMr9MA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExQzBBBgNVBAMMOkFybmVzQUFJIGVkdUdBSU4gdGVzdCwgQXJuZXNBQUkgZWR1R0FJTiBjb21wYXRpYmlsaXR5IHRlc3QwHhcNMTQwNzMxMDkxODAzWhcNMzQwNDE3MDkxODAzWjBmMQswCQYDVQQGEwJTSTESMBAGA1UEBwwJTGp1YmxqYW5hMUMwQQYDVQQDDDpBcm5lc0FBSSBlZHVHQUlOIHRlc3QsIEFybmVzQUFJIGVkdUdBSU4gY29tcGF0aWJpbGl0eSB0ZXN0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA50u+vFRcUPXXBX0jxdsT/9FQt6wFmLiukYOjhqxQxWjHozzNQSuEN3sONdKsn+pulXp6QrzhUfoAyCSoFbrPprbgs7dgvTNgAqf6C1+CYT2J9C3DgvrRBMQt59IC7PLrHeSRvScUDBtl5X9if9R+SgGkv+UcjhvVuIsb3nhRqAmLOxnMNBM7PiWXw5bbV465I3EHObAa8E0uDiRqiF4rdsXoV9X4s14Npa4bDFikh4ejpiKOnPFDS4LjAkRoKTSvFaNIw33T/AOXFgY+pL2SO0293gUGMRVqerPEWt2sy3KBmGFxTZz1o/LBYuKwmSSMRDTqlIWOh2F947p0JI3xuWvIlmVhs9zOqlA84yoVOsuZYYWtkq7unsBT75cEg6CtjbNCdTwPSGxg0TMoMfZm2Nc387wovmgnEflczqiqGjMGZo2HiTNgsGCogU4Cp2reaDr5bWr95XN6ha3gMsyTAxpgSUMXKr8OfXeXTH6imNzjru7cZiiYv90mOSi0NBUBdvhQoVcSHLN+riYvSrI3c6Fz2+ZaY4Capp57kx3JI41P7nDmvH146uy74MMzI3SpiKVffYPBh0gMWLNyS9oAAYe7nMMufd1eRq6SRgT/aARqxcOY9BU6DruklhCnY1SPU1ryKBLT487NEEdg2d3LpEhMwUw47vmCA1QCUjo8IHUCAwEAAaNQME4wHQYDVR0OBBYEFG6JrB/IKKGU9wJF7SCEGx52grk3MB8GA1UdIwQYMBaAFG6JrB/IKKGU9wJF7SCEGx52grk3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBADOJI3lPqCNSacyydDLT/g2o6cHjtXTLhdH8omQ8jKADgrDdoRePkjaeLOopY+sE/1Q76B7AwZVPSWw1s+dvdH6esgcsaSVKDZPFEyujRI1vOYRUTWxGJTyk4V1XC75mm9Mb6ReUTh97eCYB/X5XKbri56qlUuGmOKJoXAc/NnsEioI/dhkdVGQVRkRf38Y9EXWfrUixklt7lt25ZSiJbTHsWOU8StKkaUgeDOgIzF8+sXaY3EMVG9PJN8jiwxyERnwjzyi6dYTFsJCiweVlVZZECcuCBRPO6En4XoGsUxKOdC9GkRGmcFYPnJtbATP06YL7G+xN15fhmYztCNN45XYDc0uu973DwZDDyaiS5k3iS0NdyAbexeFY1MIFAfGTH6BKYMzK07R/jQx4vBeTlsFfkB4Jr0TDwTbB2wf+bFb+RDCNKqTPltPFzPiqd19hxnFsXvmodNZUgqu+tcNWEbP5+EMXY4qTrF8b3s/SK8ZgKl4VlmIx8XJQf0TQsmdFZPFLuBkoBOB+tEvhdp5ssSHVK126kXk26ISUATQ2DjXHjxSDsJgdfvnuDBe+84DG+dqQmL0nw8AzjqFhkME6gGdM4Z2Z+MlwUXcNjdaprZhWLZpzDAyHG1JQ2jukmxwRcsUJcLx7vSxbVPQ71/+U5/0SVQmNafuX8FWNvOWI/aJY</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://aai.arnes.si/test/edugain/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai.arnes.si/test/edugain/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">ArnesAAI IdP eduGAIN test</md:ServiceName>
-      <md:ServiceName xml:lang="sl">ArnesAAI IdP eduGAIN test</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Aplication for testing IdP eduGAIN compatibility</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sl">Aplikacija za preizkušanje kompatibilnosti IdP-jev vključenih v eduGAIN</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md: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="rfc822Mailbox" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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"/>
-      <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="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="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">https://aai.arnes.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">https://aai.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/aai.certh.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.certh.gr-idp-shibboleth.xml
deleted file mode 100644
index 1ff04c3f..00000000
--- a/swamid-interfederations-2.0/aai.certh.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://aai.certh.gr/idp/shibboleth">
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">certh.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDGzCCAgOgAwIBAgIUXRJ5am2tgZe6BJ/pkYB/s5WS76owDQYJKoZIhvcNAQEF
-                            BQAwFzEVMBMGA1UEAxMMYWFpLmNlcnRoLmdyMB4XDTEyMTEwODExNTg0MFoXDTE1
-                            MTEwODExNTg0MFowFzEVMBMGA1UEAxMMYWFpLmNlcnRoLmdyMIIBIjANBgkqhkiG
-                            9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhO60WEmlaRARQb4p28xWcnqVzT+rFc1PhvHz
-                            uDNcmnuNih8B/w/mEKMYUqgUwg1cK4mCH5RjBCxTbn/nWK/3hKQHw16zrz8d/+5u
-                            3U0Bf9Ra43t9isH+3mX/4iz4igN9ttLNlJVWVPc0Cwv14BXSIQVsDJSD1dMWZ5CM
-                            x3C9JVqnLntHw/ET35ngnqpFwZYGXssq2VM4qhBfuNEeXA975sKmJFKVbMn6PIPN
-                            flEkfkq5vfuBvMUs7TjXic9feRLv2lQ6OGIJQdc8H/sY55/WBy8F+o/Tj2sKYg5V
-                            mQGbs5KwhGKga2OtRx0ZZ2GkBGTA/qoc6p/DW7TH6TC18OEsaQIDAQABo18wXTA8
-                            BgNVHREENTAzggxhYWkuY2VydGguZ3KGI2h0dHBzOi8vYWFpLmNlcnRoLmdyL2lk
-                            cC9zaGliYm9sZXRoMB0GA1UdDgQWBBR1Bc6oAfS9ICTlpSU8Sqv42sNGsDANBgkq
-                            hkiG9w0BAQUFAAOCAQEAfVwjxQtxXpg1g8Skw18UQi4iqK/YHrbcNk3e8F3CdWRC
-                            CbPFbqXeuhfngUPiwU34OXT9wAf4IHyJ0bp4vWcTxLgCPoAIlwPG/c2cjq0KAFUt
-                            AYkWo980bWjCZ9C0ybQ2K+CROE1Fng00AL2zhLzMQvfdMOEBhqdXtl0/Mdbfrwdf
-                            CQQcfus5SXgdckFgalUElOpVZAIn4uVNe2Z3TolBuKGw4WuneTUU+U0CZ87XqY7B
-                            becqrgz5rlMexBoJyTyHniSyGlgFdwO/gn0zgkkCV0q1Rs2HeOeZaoF04526w3gO
-                            7wmD5L6wDf+opBvLEMi/Rb9zZFj9c2YdYW0ORkSPNw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.certh.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.certh.gr: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://aai.certh.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.certh.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.certh.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.certh.gr/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">certh.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDGzCCAgOgAwIBAgIUXRJ5am2tgZe6BJ/pkYB/s5WS76owDQYJKoZIhvcNAQEF
-                            BQAwFzEVMBMGA1UEAxMMYWFpLmNlcnRoLmdyMB4XDTEyMTEwODExNTg0MFoXDTE1
-                            MTEwODExNTg0MFowFzEVMBMGA1UEAxMMYWFpLmNlcnRoLmdyMIIBIjANBgkqhkiG
-                            9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhO60WEmlaRARQb4p28xWcnqVzT+rFc1PhvHz
-                            uDNcmnuNih8B/w/mEKMYUqgUwg1cK4mCH5RjBCxTbn/nWK/3hKQHw16zrz8d/+5u
-                            3U0Bf9Ra43t9isH+3mX/4iz4igN9ttLNlJVWVPc0Cwv14BXSIQVsDJSD1dMWZ5CM
-                            x3C9JVqnLntHw/ET35ngnqpFwZYGXssq2VM4qhBfuNEeXA975sKmJFKVbMn6PIPN
-                            flEkfkq5vfuBvMUs7TjXic9feRLv2lQ6OGIJQdc8H/sY55/WBy8F+o/Tj2sKYg5V
-                            mQGbs5KwhGKga2OtRx0ZZ2GkBGTA/qoc6p/DW7TH6TC18OEsaQIDAQABo18wXTA8
-                            BgNVHREENTAzggxhYWkuY2VydGguZ3KGI2h0dHBzOi8vYWFpLmNlcnRoLmdyL2lk
-                            cC9zaGliYm9sZXRoMB0GA1UdDgQWBBR1Bc6oAfS9ICTlpSU8Sqv42sNGsDANBgkq
-                            hkiG9w0BAQUFAAOCAQEAfVwjxQtxXpg1g8Skw18UQi4iqK/YHrbcNk3e8F3CdWRC
-                            CbPFbqXeuhfngUPiwU34OXT9wAf4IHyJ0bp4vWcTxLgCPoAIlwPG/c2cjq0KAFUt
-                            AYkWo980bWjCZ9C0ybQ2K+CROE1Fng00AL2zhLzMQvfdMOEBhqdXtl0/Mdbfrwdf
-                            CQQcfus5SXgdckFgalUElOpVZAIn4uVNe2Z3TolBuKGw4WuneTUU+U0CZ87XqY7B
-                            becqrgz5rlMexBoJyTyHniSyGlgFdwO/gn0zgkkCV0q1Rs2HeOeZaoF04526w3gO
-                            7wmD5L6wDf+opBvLEMi/Rb9zZFj9c2YdYW0ORkSPNw==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.certh.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.certh.gr: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">Centre for Research and Technology Hellas</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Εθνικό Κέντρο Έρευνας και Τεχνολογικής Ανάπτυξης</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Centre for Research and Technology Hellas</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Εθνικό Κέντρο Έρευνας και Τεχνολογικής Ανάπτυξης</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.certh.gr/root.en.aspx</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.certh.gr/root.el.aspx</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ioannis</md:GivenName>
-    <md:SurName>Halinides</md:SurName>
-    <md:EmailAddress>ivchal@certh.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Centre for Research and Technology Hellas</md:Company>
-    <md:EmailAddress>noc@certh.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-2310-498133</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.csc.fi.xml b/swamid-interfederations-2.0/aai.csc.fi.xml
deleted file mode 100644
index ddc9e0ab..00000000
--- a/swamid-interfederations-2.0/aai.csc.fi.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.csc.fi">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aai.csc.fi/Shibboleth.sso/DS" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aai.csc.fi/Shibboleth.sso/DS2" index="2"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aai.csc.fi/Shibboleth.sso/DFN" index="3"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.csc.fi</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.csc.fi,O=CSC - IT Center for Science Ltd.,street=Keilaranta 14,L=Espoo,ST=Uusimaa,postalCode=02101,C=FI</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEMzCCAxugAwIBAgIQZVL9Z7sVloWk90pzKJnHQTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIxNzAwMDAwMFoXDTEzMDIxNjIzNTk1OVowgZcxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUwMjEwMTEQMA4GA1UECBMHVXVzaW1hYTEOMAwGA1UE
-BxMFRXNwb28xFjAUBgNVBAkTDUtlaWxhcmFudGEgMTQxKTAnBgNVBAoTIENTQyAt
-IElUIENlbnRlciBmb3IgU2NpZW5jZSBMdGQuMRMwEQYDVQQDEwphYWkuY3NjLmZp
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgp0eKogkBh5709swM/XCZlpty
-9iANER18jL69a3/SlyyxI9ez2dOpwLu72tm0tXbiVdpj9Gjt8/dVYkN7LHDV7mOu
-bWAtN2ZMMJqdYg9X7y1Zv+Xu3Zaj9eqMKF2V8QhBnLnXMfqRJbiwoRP+l8RQEdRs
-1Ju4ZPlOBOTWNeyQQwIDAQABo4IBXTCCAVkwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFNPMFGfBam2umfu9+wPOi8wn+zxiMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6At
-oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
-CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
-cy50ZXJlbmEub3JnMBUGA1UdEQQOMAyCCmFhaS5jc2MuZmkwDQYJKoZIhvcNAQEF
-BQADggEBACIPxYBjl20Dy7TnVbTnJ8rxiIv5Qxw12ExeNMUjNF6LvMk9TsitVNHx
-ML4AVPE15r3DxUb597vmkoFFSLzIXPlRkiFRrsx3S7S1Pbt0c3tmyN3OLc4yBrFV
-t5xlY2Mn1xlZic/d04dfDfmLg8775/aS0Cl/qpYegOEBwrHTSkCw2IbjL4xxNQgl
-dw4jSaYr/Mli/B+7LeQVMjmruKYwqV9Sb4jHtDeM/2DJK05WjjWJTCu8ogaC+l+G
-Z1Za6rMU2E/Raw3t8qatdoKDjROSD92v84fWQU8HLFDfokHksaub31is3oT0gKyK
-rIzI2ITQoInc4nkGcX0Ysk4DBLUOIUk=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.csc.fi</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.csc.fi,O=CSC - IT Center for Science Ltd.,street=Keilaranta 14,L=Espoo,ST=Uusimaa,postalCode=02101,C=FI</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEMzCCAxugAwIBAgIQZVL9Z7sVloWk90pzKJnHQTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDIxNzAwMDAwMFoXDTEzMDIxNjIzNTk1OVowgZcxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUwMjEwMTEQMA4GA1UECBMHVXVzaW1hYTEOMAwGA1UE
-BxMFRXNwb28xFjAUBgNVBAkTDUtlaWxhcmFudGEgMTQxKTAnBgNVBAoTIENTQyAt
-IElUIENlbnRlciBmb3IgU2NpZW5jZSBMdGQuMRMwEQYDVQQDEwphYWkuY3NjLmZp
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgp0eKogkBh5709swM/XCZlpty
-9iANER18jL69a3/SlyyxI9ez2dOpwLu72tm0tXbiVdpj9Gjt8/dVYkN7LHDV7mOu
-bWAtN2ZMMJqdYg9X7y1Zv+Xu3Zaj9eqMKF2V8QhBnLnXMfqRJbiwoRP+l8RQEdRs
-1Ju4ZPlOBOTWNeyQQwIDAQABo4IBXTCCAVkwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFNPMFGfBam2umfu9+wPOi8wn+zxiMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6At
-oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
-CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
-cy50ZXJlbmEub3JnMBUGA1UdEQQOMAyCCmFhaS5jc2MuZmkwDQYJKoZIhvcNAQEF
-BQADggEBACIPxYBjl20Dy7TnVbTnJ8rxiIv5Qxw12ExeNMUjNF6LvMk9TsitVNHx
-ML4AVPE15r3DxUb597vmkoFFSLzIXPlRkiFRrsx3S7S1Pbt0c3tmyN3OLc4yBrFV
-t5xlY2Mn1xlZic/d04dfDfmLg8775/aS0Cl/qpYegOEBwrHTSkCw2IbjL4xxNQgl
-dw4jSaYr/Mli/B+7LeQVMjmruKYwqV9Sb4jHtDeM/2DJK05WjjWJTCu8ogaC+l+G
-Z1Za6rMU2E/Raw3t8qatdoKDjROSD92v84fWQU8HLFDfokHksaub31is3oT0gKyK
-rIzI2ITQoInc4nkGcX0Ysk4DBLUOIUk=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.csc.fi/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.csc.fi/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.csc.fi/Shibboleth.sso/SLO/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.csc.fi/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.csc.fi/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.csc.fi/Shibboleth.sso/NIM/POST"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.csc.fi/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.csc.fi/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai.csc.fi/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai.csc.fi/Shibboleth.sso/SAML/POST" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">CSC - IT Center for Science Ltd.</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">CSC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://aai.csc.fi/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Pekka</GivenName>
-    <SurName>Järveläinen</SurName>
-    <EmailAddress>pj@csc.fi</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.helmholtz-muenchen.de-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.helmholtz-muenchen.de-idp-shibboleth.xml
deleted file mode 100644
index 14ceaa30..00000000
--- a/swamid-interfederations-2.0/aai.helmholtz-muenchen.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.helmholtz-muenchen.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-07-11T11:39:55Z">
-      <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>
-  </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">helmholtz-muenchen.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scidom.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Helmholtz Zentrum München</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Helmholtz Zentrum Muenchen</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Instanz des internen IdP des Helmholtz Zentrums München</mdui:Description>
-        <mdui:Description xml:lang="en">IdP of Helmholtz Zentrums Muenchen</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.helmholtz-muenchen.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.helmholtz-muenchen.de/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.helmholtz-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.helmholtz-muenchen.de,OU=ASC,O=Helmholtz Zentrum Muenchen,L=Oberschleissheim-Neuherberg,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG2jCCBcKgAwIBAgIHFStsxRFcQDANBgkqhkiG9w0BAQUFADCB2TELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEkMCIGA1UEBxMbT2JlcnNjaGxlaXNzaGVp
-bS1OZXVoZXJiZXJnMSMwIQYDVQQKExpIZWxtaG9sdHogWmVudHJ1bSBNdWVuY2hl
-bjEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEsMCoGA1UEAxMjSGVsbWhvbHR6IFpl
-bnRydW0gTXVlbmNoZW4gQ0EgLSBHMDExKDAmBgkqhkiG9w0BCQEWGXBraUBoZWxt
-aG9sdHotbXVlbmNoZW4uZGUwHhcNMTMwMjAxMTYzNzA5WhcNMTgwMTMxMTYzNzA5
-WjCBmzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjEkMCIGA1UEBxMbT2Jl
-cnNjaGxlaXNzaGVpbS1OZXVoZXJiZXJnMSMwIQYDVQQKExpIZWxtaG9sdHogWmVu
-dHJ1bSBNdWVuY2hlbjEMMAoGA1UECxMDQVNDMSIwIAYDVQQDExlhYWkuaGVsbWhv
-bHR6LW11ZW5jaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-0OJOOATuFGpRDGhdnp8v984qAd7MUuBfVjso6+SyUnoTqLoPVoO5PnNBAYpBdXIu
-eNG9V+IUb1Zp2KKdmVYG+28icRzNb8TxjmdexlKkNcGdo7RRFgFBak263+7OwUhw
-CsrNigBUUNiT14A7K9c2ASLzVH6DBAcpRevAOGWUiry3OBF8QbVbZHGFykZjGXfi
-bwbGMrkv7BDwqFB102cKVoeUFomRn9A2WF7a3CJWm5K5zL/U4Ilq9oOK5MnW1E6S
-ZujcPP8ASWq0bNQN1IyjnoxdUzW5+vheFvb+xDLwzSpCTZcOb0yC8qVAync7p3yu
-7kxyxhApyH5u5MNgXzCKDwIDAQABo4IC4TCCAt0wOQYDVR0gBDIwMDARBg8rBgEE
-AYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFELU8qX/t1jmg74XrQn9cr6nkYvwMB8GA1UdIwQYMBaAFD800/wJ
-vgi0J/bStPP2UmUKnNuxMIGGBgNVHREEfzB9ghlhYWkuaGVsbWhvbHR6LW11ZW5j
-aGVuLmRlgg1hYWkuc2NpZG9tLmRlghthYWkwMS5oZWxtaG9sdHotbXVlbmNoZW4u
-ZGWCD2FhaTAxLnNjaWRvbS5kZYEjbWFyY3VzLmFocmVuc0BoZWxtaG9sdHotbXVl
-bmNoZW4uZGUwgacGA1UdHwSBnzCBnDBMoEqgSIZGaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9oZWxtaG9sdHotemVudHJ1bS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBMoEqgSIZGaHR0cDovL2NkcDIucGNhLmRmbi5kZS9oZWxtaG9sdHotemVu
-dHJ1bS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB9QYIKwYBBQUHAQEE
-gegwgeUwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBWBggrBgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9o
-ZWxtaG9sdHotemVudHJ1bS1tdWVuY2hlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwVgYIKwYBBQUHMAKGSmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGVsbWhvbHR6
-LXplbnRydW0tbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqG
-SIb3DQEBBQUAA4IBAQBScBmGGix0cQHEoqYC4uEqGYFQk8z6G6fCjxpwAUs6AyOU
-eT2NOu2oABKqMQSjzB+tfrjA+EAZziBto967L8JhflTA83gk4Jxf6sucuRzxpHMU
-35LXxj25luwR7Sq4G+UxmhyInJIjB0CStV28XSXSKK0NdH4oLm4YcVCBJrtYhr8m
-nAjaV67AGD2OsvPnlidcT2HoS6yuf958nGyi3ZBBggnLiToxFo8I3n5BNJk7PE+y
-6/VuMMosYSnWm7bPg3YwwYa+6wxF0wQZt9a7Cam3Gj3pACiL5OPRhFuvyV2CyW2e
-MB5OOnMF/hsOUVseiza2g8mKOTsARybpYAwFeDgJ
-</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>aai.helmholtz-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.helmholtz-muenchen.de,OU=ASC,O=Helmholtz Zentrum Muenchen,L=Oberschleissheim-Neuherberg,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG2jCCBcKgAwIBAgIHFStsxRFcQDANBgkqhkiG9w0BAQUFADCB2TELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEkMCIGA1UEBxMbT2JlcnNjaGxlaXNzaGVp
-bS1OZXVoZXJiZXJnMSMwIQYDVQQKExpIZWxtaG9sdHogWmVudHJ1bSBNdWVuY2hl
-bjEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEsMCoGA1UEAxMjSGVsbWhvbHR6IFpl
-bnRydW0gTXVlbmNoZW4gQ0EgLSBHMDExKDAmBgkqhkiG9w0BCQEWGXBraUBoZWxt
-aG9sdHotbXVlbmNoZW4uZGUwHhcNMTMwMjAxMTYzNzA5WhcNMTgwMTMxMTYzNzA5
-WjCBmzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjEkMCIGA1UEBxMbT2Jl
-cnNjaGxlaXNzaGVpbS1OZXVoZXJiZXJnMSMwIQYDVQQKExpIZWxtaG9sdHogWmVu
-dHJ1bSBNdWVuY2hlbjEMMAoGA1UECxMDQVNDMSIwIAYDVQQDExlhYWkuaGVsbWhv
-bHR6LW11ZW5jaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-0OJOOATuFGpRDGhdnp8v984qAd7MUuBfVjso6+SyUnoTqLoPVoO5PnNBAYpBdXIu
-eNG9V+IUb1Zp2KKdmVYG+28icRzNb8TxjmdexlKkNcGdo7RRFgFBak263+7OwUhw
-CsrNigBUUNiT14A7K9c2ASLzVH6DBAcpRevAOGWUiry3OBF8QbVbZHGFykZjGXfi
-bwbGMrkv7BDwqFB102cKVoeUFomRn9A2WF7a3CJWm5K5zL/U4Ilq9oOK5MnW1E6S
-ZujcPP8ASWq0bNQN1IyjnoxdUzW5+vheFvb+xDLwzSpCTZcOb0yC8qVAync7p3yu
-7kxyxhApyH5u5MNgXzCKDwIDAQABo4IC4TCCAt0wOQYDVR0gBDIwMDARBg8rBgEE
-AYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFELU8qX/t1jmg74XrQn9cr6nkYvwMB8GA1UdIwQYMBaAFD800/wJ
-vgi0J/bStPP2UmUKnNuxMIGGBgNVHREEfzB9ghlhYWkuaGVsbWhvbHR6LW11ZW5j
-aGVuLmRlgg1hYWkuc2NpZG9tLmRlghthYWkwMS5oZWxtaG9sdHotbXVlbmNoZW4u
-ZGWCD2FhaTAxLnNjaWRvbS5kZYEjbWFyY3VzLmFocmVuc0BoZWxtaG9sdHotbXVl
-bmNoZW4uZGUwgacGA1UdHwSBnzCBnDBMoEqgSIZGaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9oZWxtaG9sdHotemVudHJ1bS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBMoEqgSIZGaHR0cDovL2NkcDIucGNhLmRmbi5kZS9oZWxtaG9sdHotemVu
-dHJ1bS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB9QYIKwYBBQUHAQEE
-gegwgeUwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBWBggrBgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9o
-ZWxtaG9sdHotemVudHJ1bS1tdWVuY2hlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwVgYIKwYBBQUHMAKGSmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGVsbWhvbHR6
-LXplbnRydW0tbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqG
-SIb3DQEBBQUAA4IBAQBScBmGGix0cQHEoqYC4uEqGYFQk8z6G6fCjxpwAUs6AyOU
-eT2NOu2oABKqMQSjzB+tfrjA+EAZziBto967L8JhflTA83gk4Jxf6sucuRzxpHMU
-35LXxj25luwR7Sq4G+UxmhyInJIjB0CStV28XSXSKK0NdH4oLm4YcVCBJrtYhr8m
-nAjaV67AGD2OsvPnlidcT2HoS6yuf958nGyi3ZBBggnLiToxFo8I3n5BNJk7PE+y
-6/VuMMosYSnWm7bPg3YwwYa+6wxF0wQZt9a7Cam3Gj3pACiL5OPRhFuvyV2CyW2e
-MB5OOnMF/hsOUVseiza2g8mKOTsARybpYAwFeDgJ
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.helmholtz-muenchen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.helmholtz-muenchen.de: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://aai.helmholtz-muenchen.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.helmholtz-muenchen.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.helmholtz-muenchen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.helmholtz-muenchen.de/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">helmholtz-muenchen.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scidom.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.helmholtz-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.helmholtz-muenchen.de,OU=ASC,O=Helmholtz Zentrum Muenchen,L=Oberschleissheim-Neuherberg,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG2jCCBcKgAwIBAgIHFStsxRFcQDANBgkqhkiG9w0BAQUFADCB2TELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEkMCIGA1UEBxMbT2JlcnNjaGxlaXNzaGVp
-bS1OZXVoZXJiZXJnMSMwIQYDVQQKExpIZWxtaG9sdHogWmVudHJ1bSBNdWVuY2hl
-bjEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEsMCoGA1UEAxMjSGVsbWhvbHR6IFpl
-bnRydW0gTXVlbmNoZW4gQ0EgLSBHMDExKDAmBgkqhkiG9w0BCQEWGXBraUBoZWxt
-aG9sdHotbXVlbmNoZW4uZGUwHhcNMTMwMjAxMTYzNzA5WhcNMTgwMTMxMTYzNzA5
-WjCBmzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjEkMCIGA1UEBxMbT2Jl
-cnNjaGxlaXNzaGVpbS1OZXVoZXJiZXJnMSMwIQYDVQQKExpIZWxtaG9sdHogWmVu
-dHJ1bSBNdWVuY2hlbjEMMAoGA1UECxMDQVNDMSIwIAYDVQQDExlhYWkuaGVsbWhv
-bHR6LW11ZW5jaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-0OJOOATuFGpRDGhdnp8v984qAd7MUuBfVjso6+SyUnoTqLoPVoO5PnNBAYpBdXIu
-eNG9V+IUb1Zp2KKdmVYG+28icRzNb8TxjmdexlKkNcGdo7RRFgFBak263+7OwUhw
-CsrNigBUUNiT14A7K9c2ASLzVH6DBAcpRevAOGWUiry3OBF8QbVbZHGFykZjGXfi
-bwbGMrkv7BDwqFB102cKVoeUFomRn9A2WF7a3CJWm5K5zL/U4Ilq9oOK5MnW1E6S
-ZujcPP8ASWq0bNQN1IyjnoxdUzW5+vheFvb+xDLwzSpCTZcOb0yC8qVAync7p3yu
-7kxyxhApyH5u5MNgXzCKDwIDAQABo4IC4TCCAt0wOQYDVR0gBDIwMDARBg8rBgEE
-AYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFELU8qX/t1jmg74XrQn9cr6nkYvwMB8GA1UdIwQYMBaAFD800/wJ
-vgi0J/bStPP2UmUKnNuxMIGGBgNVHREEfzB9ghlhYWkuaGVsbWhvbHR6LW11ZW5j
-aGVuLmRlgg1hYWkuc2NpZG9tLmRlghthYWkwMS5oZWxtaG9sdHotbXVlbmNoZW4u
-ZGWCD2FhaTAxLnNjaWRvbS5kZYEjbWFyY3VzLmFocmVuc0BoZWxtaG9sdHotbXVl
-bmNoZW4uZGUwgacGA1UdHwSBnzCBnDBMoEqgSIZGaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9oZWxtaG9sdHotemVudHJ1bS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBMoEqgSIZGaHR0cDovL2NkcDIucGNhLmRmbi5kZS9oZWxtaG9sdHotemVu
-dHJ1bS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB9QYIKwYBBQUHAQEE
-gegwgeUwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBWBggrBgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9o
-ZWxtaG9sdHotemVudHJ1bS1tdWVuY2hlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwVgYIKwYBBQUHMAKGSmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGVsbWhvbHR6
-LXplbnRydW0tbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqG
-SIb3DQEBBQUAA4IBAQBScBmGGix0cQHEoqYC4uEqGYFQk8z6G6fCjxpwAUs6AyOU
-eT2NOu2oABKqMQSjzB+tfrjA+EAZziBto967L8JhflTA83gk4Jxf6sucuRzxpHMU
-35LXxj25luwR7Sq4G+UxmhyInJIjB0CStV28XSXSKK0NdH4oLm4YcVCBJrtYhr8m
-nAjaV67AGD2OsvPnlidcT2HoS6yuf958nGyi3ZBBggnLiToxFo8I3n5BNJk7PE+y
-6/VuMMosYSnWm7bPg3YwwYa+6wxF0wQZt9a7Cam3Gj3pACiL5OPRhFuvyV2CyW2e
-MB5OOnMF/hsOUVseiza2g8mKOTsARybpYAwFeDgJ
-</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>aai.helmholtz-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.helmholtz-muenchen.de,OU=ASC,O=Helmholtz Zentrum Muenchen,L=Oberschleissheim-Neuherberg,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG2jCCBcKgAwIBAgIHFStsxRFcQDANBgkqhkiG9w0BAQUFADCB2TELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjEkMCIGA1UEBxMbT2JlcnNjaGxlaXNzaGVp
-bS1OZXVoZXJiZXJnMSMwIQYDVQQKExpIZWxtaG9sdHogWmVudHJ1bSBNdWVuY2hl
-bjEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEsMCoGA1UEAxMjSGVsbWhvbHR6IFpl
-bnRydW0gTXVlbmNoZW4gQ0EgLSBHMDExKDAmBgkqhkiG9w0BCQEWGXBraUBoZWxt
-aG9sdHotbXVlbmNoZW4uZGUwHhcNMTMwMjAxMTYzNzA5WhcNMTgwMTMxMTYzNzA5
-WjCBmzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjEkMCIGA1UEBxMbT2Jl
-cnNjaGxlaXNzaGVpbS1OZXVoZXJiZXJnMSMwIQYDVQQKExpIZWxtaG9sdHogWmVu
-dHJ1bSBNdWVuY2hlbjEMMAoGA1UECxMDQVNDMSIwIAYDVQQDExlhYWkuaGVsbWhv
-bHR6LW11ZW5jaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-0OJOOATuFGpRDGhdnp8v984qAd7MUuBfVjso6+SyUnoTqLoPVoO5PnNBAYpBdXIu
-eNG9V+IUb1Zp2KKdmVYG+28icRzNb8TxjmdexlKkNcGdo7RRFgFBak263+7OwUhw
-CsrNigBUUNiT14A7K9c2ASLzVH6DBAcpRevAOGWUiry3OBF8QbVbZHGFykZjGXfi
-bwbGMrkv7BDwqFB102cKVoeUFomRn9A2WF7a3CJWm5K5zL/U4Ilq9oOK5MnW1E6S
-ZujcPP8ASWq0bNQN1IyjnoxdUzW5+vheFvb+xDLwzSpCTZcOb0yC8qVAync7p3yu
-7kxyxhApyH5u5MNgXzCKDwIDAQABo4IC4TCCAt0wOQYDVR0gBDIwMDARBg8rBgEE
-AYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFELU8qX/t1jmg74XrQn9cr6nkYvwMB8GA1UdIwQYMBaAFD800/wJ
-vgi0J/bStPP2UmUKnNuxMIGGBgNVHREEfzB9ghlhYWkuaGVsbWhvbHR6LW11ZW5j
-aGVuLmRlgg1hYWkuc2NpZG9tLmRlghthYWkwMS5oZWxtaG9sdHotbXVlbmNoZW4u
-ZGWCD2FhaTAxLnNjaWRvbS5kZYEjbWFyY3VzLmFocmVuc0BoZWxtaG9sdHotbXVl
-bmNoZW4uZGUwgacGA1UdHwSBnzCBnDBMoEqgSIZGaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9oZWxtaG9sdHotemVudHJ1bS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBMoEqgSIZGaHR0cDovL2NkcDIucGNhLmRmbi5kZS9oZWxtaG9sdHotemVu
-dHJ1bS1tdWVuY2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB9QYIKwYBBQUHAQEE
-gegwgeUwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBWBggrBgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9o
-ZWxtaG9sdHotemVudHJ1bS1tdWVuY2hlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwVgYIKwYBBQUHMAKGSmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGVsbWhvbHR6
-LXplbnRydW0tbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqG
-SIb3DQEBBQUAA4IBAQBScBmGGix0cQHEoqYC4uEqGYFQk8z6G6fCjxpwAUs6AyOU
-eT2NOu2oABKqMQSjzB+tfrjA+EAZziBto967L8JhflTA83gk4Jxf6sucuRzxpHMU
-35LXxj25luwR7Sq4G+UxmhyInJIjB0CStV28XSXSKK0NdH4oLm4YcVCBJrtYhr8m
-nAjaV67AGD2OsvPnlidcT2HoS6yuf958nGyi3ZBBggnLiToxFo8I3n5BNJk7PE+y
-6/VuMMosYSnWm7bPg3YwwYa+6wxF0wQZt9a7Cam3Gj3pACiL5OPRhFuvyV2CyW2e
-MB5OOnMF/hsOUVseiza2g8mKOTsARybpYAwFeDgJ
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.helmholtz-muenchen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.helmholtz-muenchen.de: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">e310</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e310</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Helmholtz Zentrum München Deutsches Forschungzentrum für Gesundheit und Umwelt</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Helmholtz Zentrum München German Research Center for Environmental Health</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.helmholtz-muenchen.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.helmholtz-muenchen.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Walter</md:GivenName>
-    <md:SurName>Huß</md:SurName>
-    <md:EmailAddress>mailto:huss@helmholtz-muenchen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marcus</md:GivenName>
-    <md:SurName>Ahrens</md:SurName>
-    <md:EmailAddress>mailto:marcus.ahrens@helmholtz-muenchen.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.insel.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.insel.ch-idp-shibboleth.xml
deleted file mode 100644
index ed1b693b..00000000
--- a/swamid-interfederations-2.0/aai.insel.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.insel.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-02-05T06:44:46Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insel.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Insel Gruppe</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Insel Gruppe</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Insel Gruppe</mdui:Description>
-        <mdui:Description xml:lang="en">Insel Gruppe</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAABHppVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iCiAgICAgICAgICAgIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIj4KICAgICAgICAgPHhtcE1NOkRlcml2ZWRGcm9tIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgPHN0UmVmOmluc3RhbmNlSUQ+eG1wLmlpZDowNTgwMTE3NDA3MjA2ODExODIyQUI5ODkzRTIwRjMwNzwvc3RSZWY6aW5zdGFuY2VJRD4KICAgICAgICAgICAgPHN0UmVmOmRvY3VtZW50SUQ+eG1wLmRpZDowMzgwMTE3NDA3MjA2ODExODIyQUI5ODkzRTIwRjMwNzwvc3RSZWY6ZG9jdW1lbnRJRD4KICAgICAgICAgPC94bXBNTTpEZXJpdmVkRnJvbT4KICAgICAgICAgPHhtcE1NOkRvY3VtZW50SUQ+eG1wLmRpZDpCMzNDQTUzQkIwNjUxMUU1OTE4QkRDMDg0NDQ5QTgyMTwveG1wTU06RG9jdW1lbnRJRD4KICAgICAgICAgPHhtcE1NOkluc3RhbmNlSUQ+eG1wLmlpZDpCMzNDQTUzQUIwNjUxMUU1OTE4QkRDMDg0NDQ5QTgyMTwveG1wTU06SW5zdGFuY2VJRD4KICAgICAgICAgPHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD54bXAuZGlkOkZCN0YxMTc0MDcyMDY4MTE4MjJBOUJFRjY0NkU1MDBCPC94bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgICAgIDx4bXA6Q3JlYXRvclRvb2w+QWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKTwveG1wOkNyZWF0b3JUb29sPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KbUNK7AAAAhhJREFUOBGlU2trE1EQPftsdrfdzaMa/FDRuDWuwYqKokKwYvFB0fqk/hz/iQgiiH9AEBWhSi2C2FiDprFgNUb8Upo0j93sXufeJtUIEdFh2Z29d+bcM2fmSrfv3mdra+vwfR/cGCLomi7831+dMEQURWJZ0zRYRgzqcnkFRiyGyfwJmJaJh4+e4MNyGaqiQJZlERwxhiAIYA+PYPrCFAxKXCq+x2KhCFWWFei6jnjcQc7LwsuOE8hTzC+8Qr3eIBBJgHnjLmavX0YqlUDlaxWl0grlaVDOT1+6ValWMTe/AL/tY09mNyZyHtZrdXz6XMHGRgMHD3i4eeMKksk45l68xJ17D1Aqf4Rj2yCODLEhHR0/QOFdEa/fFARtN7ML6dGkYLdzbAwJYrhKgItvl1D99h3DlkVxjAPQhwGyIoNFjMQMBAAvS9VUoYOqqmLNJx3CMIJCsT376fEVSeLPQJPEfn9AP8DA1MEb/w/A6/4n48JRruw4NomiIAoZ+qsbDBtRoiTJMEwT8vGjhzGaTKAd+NSUvzASstVuwzQN5PZnoR45NIFarYbVLxU0aGj+2Abi2KFW8tP37XVxZjIP0eBT+ZOijMfPnqPVbIm5+JVLrzR+H/ygg6sXz+Hs1GlYxEIA8P4eo1JcN4Nms7lJgovUrYl1HX5fZq/NiHvj2CPijM0RI3eIJm9HevvWwX16dH/S21Jb+z3nB0DpsRtifxZMAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAA6hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyIKICAgICAgICAgICAgeG1sbnM6ZXhpZj0iaHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8iPgogICAgICAgICA8eG1wOk1vZGlmeURhdGU+MjAxNi0wMS0wNVQxMzowMTo5OTwveG1wOk1vZGlmeURhdGU+CiAgICAgICAgIDx4bXA6Q3JlYXRvclRvb2w+UGl4ZWxtYXRvciAzLjQuMjwveG1wOkNyZWF0b3JUb29sPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8dGlmZjpDb21wcmVzc2lvbj41PC90aWZmOkNvbXByZXNzaW9uPgogICAgICAgICA8dGlmZjpSZXNvbHV0aW9uVW5pdD4yPC90aWZmOlJlc29sdXRpb25Vbml0PgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj43MjwvdGlmZjpZUmVzb2x1dGlvbj4KICAgICAgICAgPHRpZmY6WFJlc29sdXRpb24+NzI8L3RpZmY6WFJlc29sdXRpb24+CiAgICAgICAgIDxleGlmOlBpeGVsWERpbWVuc2lvbj44MDwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOkNvbG9yU3BhY2U+MTwvZXhpZjpDb2xvclNwYWNl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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>161.62.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>insel.ch</mdui:DomainHint>
-        <mdui:DomainHint>inselspital.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.947734,7.424789</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>
-MIIDHDCCAgSgAwIBAgIVAK7E4k9piEwza7yzmzmZydw5nGskMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGFhaS5pbnNlbC5jaDAeFw0xNjAxMDYyMTQ2NDlaFw0x
-OTAxMDYyMTQ2NDlaMBcxFTATBgNVBAMMDGFhaS5pbnNlbC5jaDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIHxxvN+AakNF0Hev2R79IkurOJGw6ibdA+2
-px9enpip7Ik5TIvuzakf7hkKL9ib3fqrWsEQzrBZMEs7KvC9oak1rDJIr1CdUp9i
-mJGnF6ZmvJWgxMxN7gogOTJCSnnEF3A8/prp7rQ5K92ItXV4Xcarjh7ijMlrKvKE
-3oxUnP7VRc2PRedwVrePnf1YSKjJ9GoPwgAqYQKpu+UGaRERf0ZLrF76t4//R1vz
-Xnw2FG4+u+Px3zCOWr110xGB+tjC0UrOm7u4LfFVN0yQGewTWjKPAClncPD8go+g
-JQJ1qRBcmhrRZ0VA271oVZTBCG7j0k9dKc8PSztfJYRuMyTOPZ0CAwEAAaNfMF0w
-HQYDVR0OBBYEFEq6P/+eGBcgRgWcbv8c3j5Sd8QfMDwGA1UdEQQ1MDOCDGFhaS5p
-bnNlbC5jaIYjaHR0cHM6Ly9hYWkuaW5zZWwuY2gvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBADtJgWdGm0LqeXw13NDXYmXefpx7IGHcpoWPmwTlkBtB
-uYeDluPBp+foPmAdshSbHW+cSxgE6T1LbxM6ji8ew5tyRLK/3yu83e9b8gW4/PYf
-N07zyUtx6tbWjmWHhdRwG3JrWGjeZFIxhbLQkQ2gjVexCMUqUkmmWERt6ylv/8Kx
-kdrSMarwqii3vU/R2YFtxLRUM2uoxEC1dATJg7QpBv6SMJ2o2goBd5ssnPFRlFco
-5PcMJzQ7SfRD0fdmvRPONfFMnbHmYtCriZduK8f2dWeQl9W0xU/AodamGIbgJVL7
-BbG3+ZKq/D7ulwKieVayksBhM+cMnwpJypdN/cuMSBg=
-						</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>
-MIIDEDCCAfigAwIBAgIJAPxU3jNZP8mRMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGFhaS5pbnNlbC5jaDAeFw0xMzAyMjcxMzIzMThaFw0xNjAyMjcxMzIzMTha
-MBcxFTATBgNVBAMTDGFhaS5pbnNlbC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKnQvgSmpEUPenv+LnMzZggwC229iDhxkG2F9LaYnVsptZIzvP67
-hhegnJT13V12rR+2fkTCZ6RHxV97QAwg5TlsRdcXdG9Ky+0PlFjamvelzZtY/lgF
-VeQ9r/JSSbejp1O2Vyx5Hq1KRxyfE73PNKou7rzem/gLd8j3sayr2L1ya6xqmKN1
-FLGSOLearDhDIWl4/uFYXpDZl7yat+5gnp9vhjZQmJR+k7j+oxaTQxS6KKVlORtv
-VMpbSroqaZiKmFiHaun02Gs/xOIgWkeeoyZ+P8ImyHfsU7WW2TjHXQ5554TuzChO
-MYr1g422ZVpX2DDi4BUuHxQjH4EKieyTJx8CAwEAAaNfMF0wPAYDVR0RBDUwM4IM
-YWFpLmluc2VsLmNohiNodHRwczovL2FhaS5pbnNlbC5jaC9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUVTNq5VwOjOooVsBOoTIYRUOUAHYwDQYJKoZIhvcNAQEFBQAD
-ggEBABohLesQqb5DBc1mIU7yl64nAy3YIAzKUh4hlGzEsXGOnvU9BBEO7dWVw/O/
-Rid8g51bMmrOs5AjZeKA1GJMP2mJkCOWhVxWMATTnikLAxI6+8jS54xR0MDnh4+B
-KosZcu+Q0YIXyJMRqVhlq40bMV5xTbrMwH/IBMyM9jIPDGbPV3QpLfK5B26Dny5H
-mMqxCum1bfbN9TQarYXGzP2r8JN6PenXv5QmXw9VafgzYIMdIlKYnM8odWMWYekX
-gxbNux2QJUz8QIasTpr0vGDG/qIW6usT9emYL1YSQg5oiYVOGY4duoLVbGBZ0y33
-Kuz4hb80z9ooyCpJMCvSHFVAMWA=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.insel.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.insel.ch/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://aai.insel.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.insel.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.insel.ch/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.insel.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insel.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAK7E4k9piEwza7yzmzmZydw5nGskMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGFhaS5pbnNlbC5jaDAeFw0xNjAxMDYyMTQ2NDlaFw0x
-OTAxMDYyMTQ2NDlaMBcxFTATBgNVBAMMDGFhaS5pbnNlbC5jaDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIHxxvN+AakNF0Hev2R79IkurOJGw6ibdA+2
-px9enpip7Ik5TIvuzakf7hkKL9ib3fqrWsEQzrBZMEs7KvC9oak1rDJIr1CdUp9i
-mJGnF6ZmvJWgxMxN7gogOTJCSnnEF3A8/prp7rQ5K92ItXV4Xcarjh7ijMlrKvKE
-3oxUnP7VRc2PRedwVrePnf1YSKjJ9GoPwgAqYQKpu+UGaRERf0ZLrF76t4//R1vz
-Xnw2FG4+u+Px3zCOWr110xGB+tjC0UrOm7u4LfFVN0yQGewTWjKPAClncPD8go+g
-JQJ1qRBcmhrRZ0VA271oVZTBCG7j0k9dKc8PSztfJYRuMyTOPZ0CAwEAAaNfMF0w
-HQYDVR0OBBYEFEq6P/+eGBcgRgWcbv8c3j5Sd8QfMDwGA1UdEQQ1MDOCDGFhaS5p
-bnNlbC5jaIYjaHR0cHM6Ly9hYWkuaW5zZWwuY2gvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBADtJgWdGm0LqeXw13NDXYmXefpx7IGHcpoWPmwTlkBtB
-uYeDluPBp+foPmAdshSbHW+cSxgE6T1LbxM6ji8ew5tyRLK/3yu83e9b8gW4/PYf
-N07zyUtx6tbWjmWHhdRwG3JrWGjeZFIxhbLQkQ2gjVexCMUqUkmmWERt6ylv/8Kx
-kdrSMarwqii3vU/R2YFtxLRUM2uoxEC1dATJg7QpBv6SMJ2o2goBd5ssnPFRlFco
-5PcMJzQ7SfRD0fdmvRPONfFMnbHmYtCriZduK8f2dWeQl9W0xU/AodamGIbgJVL7
-BbG3+ZKq/D7ulwKieVayksBhM+cMnwpJypdN/cuMSBg=
-						</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>
-MIIDEDCCAfigAwIBAgIJAPxU3jNZP8mRMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGFhaS5pbnNlbC5jaDAeFw0xMzAyMjcxMzIzMThaFw0xNjAyMjcxMzIzMTha
-MBcxFTATBgNVBAMTDGFhaS5pbnNlbC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKnQvgSmpEUPenv+LnMzZggwC229iDhxkG2F9LaYnVsptZIzvP67
-hhegnJT13V12rR+2fkTCZ6RHxV97QAwg5TlsRdcXdG9Ky+0PlFjamvelzZtY/lgF
-VeQ9r/JSSbejp1O2Vyx5Hq1KRxyfE73PNKou7rzem/gLd8j3sayr2L1ya6xqmKN1
-FLGSOLearDhDIWl4/uFYXpDZl7yat+5gnp9vhjZQmJR+k7j+oxaTQxS6KKVlORtv
-VMpbSroqaZiKmFiHaun02Gs/xOIgWkeeoyZ+P8ImyHfsU7WW2TjHXQ5554TuzChO
-MYr1g422ZVpX2DDi4BUuHxQjH4EKieyTJx8CAwEAAaNfMF0wPAYDVR0RBDUwM4IM
-YWFpLmluc2VsLmNohiNodHRwczovL2FhaS5pbnNlbC5jaC9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUVTNq5VwOjOooVsBOoTIYRUOUAHYwDQYJKoZIhvcNAQEFBQAD
-ggEBABohLesQqb5DBc1mIU7yl64nAy3YIAzKUh4hlGzEsXGOnvU9BBEO7dWVw/O/
-Rid8g51bMmrOs5AjZeKA1GJMP2mJkCOWhVxWMATTnikLAxI6+8jS54xR0MDnh4+B
-KosZcu+Q0YIXyJMRqVhlq40bMV5xTbrMwH/IBMyM9jIPDGbPV3QpLfK5B26Dny5H
-mMqxCum1bfbN9TQarYXGzP2r8JN6PenXv5QmXw9VafgzYIMdIlKYnM8odWMWYekX
-gxbNux2QJUz8QIasTpr0vGDG/qIW6usT9emYL1YSQg5oiYVOGY4duoLVbGBZ0y33
-Kuz4hb80z9ooyCpJMCvSHFVAMWA=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.insel.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.insel.ch/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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">insel.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Insel Gruppe</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Insel Gruppe</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.insel.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.insel.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>AAI-Support</md:GivenName>
-    <md:SurName>Inselspital</md:SurName>
-    <md:EmailAddress>mailto:switch-aai@insel.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AAI-Support</md:GivenName>
-    <md:SurName>Inselspital</md:SurName>
-    <md:EmailAddress>mailto:switch-aai@insel.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.phzg.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.phzg.ch-idp-shibboleth.xml
deleted file mode 100644
index fe828e5a..00000000
--- a/swamid-interfederations-2.0/aai.phzg.ch-idp-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://aai.phzg.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-02-03T12:37:23Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://extranet.phzg.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phzg.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">PH Zug - Pädagogische Hochschule Zug</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">PH Zug - Pädagogische Hochschule Zug</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Pädagogische Hochschule Zug</mdui:Description>
-        <mdui:Description xml:lang="en">Pädagogische Hochschule Zug</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3QQLDRgHVFIaOQAAAQZJREFUOMvtkqFKgwEUhb/zT+aC1SCWxQkzi1EcGPQFfAsxWcRFi91gsYpBYUHBblaTwhwLwoxikN/99x7Dhi+gcR8czjnh3nRgxp8RmV0wBraAW8QOpicxTNEUIHiyaQkqi7qg9ORqrm0fXQP7mAUVYKhJYLGsZARsh1ksRJnQF6waLjFLiOJN4lCmAwyBA8zABqCGOLM5KcQF0EfsAcdOmjY9J6xk2lNtRNoR3pz29wyvReVeps8zfBrhdoavqsqdqPwZYZ4zfh+8xiQPpv6R6fsM32XYkb6J8CjDu9XYL1G5VY2tr3S3IcBQCuaBb6AOJKa0AGjIfCFkeHCwjngkZzP8D34AEVXAHRHc3DkAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:Logo height="28" width="80">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.phzg.ch/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.phzg.ch/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>phzg.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.16251,8.51746</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>
-MIIDFzCCAf+gAwIBAgIUOOTmZVjBjC279frTIAaYq+ifz90wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLYWFpLnBoemcuY2gwHhcNMTYwMTI1MTQyNjAwWhcNMTkw
-MTI1MTQyNjAwWjAWMRQwEgYDVQQDDAthYWkucGh6Zy5jaDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJ51IJDg8QXH85nk4kJAlGdhCYmWwpKbDs6EXOPd
-DgJrxFaagDye9pEhn0yPUGmffwoYNThgnwK1ey/BScMkyj6T3tf5keRJb310Kx+c
-7k/njd95etdPr66hMUCuEqjfRDQHahWmfSwRlqrBqGFsqakXEyeb/QKBnNabLTJF
-rro4J/Ksi3nhDULuUZdyMgVmYlLYzDpom8rGkthO2NfdDjJglU3P2MQEnGhK9QBH
-0eWfpfSkJAwnhClRiZCrGwQYttd9TSCeBWzKjw2oc3hJyLjjj9sFoF9tu2Gkq5uz
-I1qLLxEkUZmnxujs/REqspHGV/426tAqWHVWIbgNXk5LbN8CAwEAAaNdMFswHQYD
-VR0OBBYEFPZvaY0aI/wNV/Y1V8VMyzP/kIZ+MDoGA1UdEQQzMDGCC2FhaS5waHpn
-LmNohiJodHRwczovL2FhaS5waHpnLmNoL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQCI+nd4PfpVbJbtooDsc7Dz6PSY7x86rLr+czLzkEUMtUvZi2Q9
-24gRjmvcfpw6wRXqTwG1Z5YF4Q75M+VaF8I1elefa9g+nSVQUmu8gzr4LPDw0W34
-lKn+ro4ZS9QogBv4oDcHvlX93YPiIaYJ8j6VC9XKDD3H/UZNxRnoHdRgA0m+i1Ox
-WCgmFxcsMQTUMRb5TH+4a0RmaRbWJw58L4izT2uoPUu+D5VoP+OfKkaPCvye62U+
-66uW622+YK2IZLvBWZYghMxHAvMgipNAEqNUO8na6B7KuMejSYWLXNNeJFyJhj/R
-MUqrWZjNuXCqJ8mSsSSLsStwBg12rRffNeX/
-						</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://aai.phzg.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.phzg.ch/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phzg.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUOOTmZVjBjC279frTIAaYq+ifz90wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLYWFpLnBoemcuY2gwHhcNMTYwMTI1MTQyNjAwWhcNMTkw
-MTI1MTQyNjAwWjAWMRQwEgYDVQQDDAthYWkucGh6Zy5jaDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJ51IJDg8QXH85nk4kJAlGdhCYmWwpKbDs6EXOPd
-DgJrxFaagDye9pEhn0yPUGmffwoYNThgnwK1ey/BScMkyj6T3tf5keRJb310Kx+c
-7k/njd95etdPr66hMUCuEqjfRDQHahWmfSwRlqrBqGFsqakXEyeb/QKBnNabLTJF
-rro4J/Ksi3nhDULuUZdyMgVmYlLYzDpom8rGkthO2NfdDjJglU3P2MQEnGhK9QBH
-0eWfpfSkJAwnhClRiZCrGwQYttd9TSCeBWzKjw2oc3hJyLjjj9sFoF9tu2Gkq5uz
-I1qLLxEkUZmnxujs/REqspHGV/426tAqWHVWIbgNXk5LbN8CAwEAAaNdMFswHQYD
-VR0OBBYEFPZvaY0aI/wNV/Y1V8VMyzP/kIZ+MDoGA1UdEQQzMDGCC2FhaS5waHpn
-LmNohiJodHRwczovL2FhaS5waHpnLmNoL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQCI+nd4PfpVbJbtooDsc7Dz6PSY7x86rLr+czLzkEUMtUvZi2Q9
-24gRjmvcfpw6wRXqTwG1Z5YF4Q75M+VaF8I1elefa9g+nSVQUmu8gzr4LPDw0W34
-lKn+ro4ZS9QogBv4oDcHvlX93YPiIaYJ8j6VC9XKDD3H/UZNxRnoHdRgA0m+i1Ox
-WCgmFxcsMQTUMRb5TH+4a0RmaRbWJw58L4izT2uoPUu+D5VoP+OfKkaPCvye62U+
-66uW622+YK2IZLvBWZYghMxHAvMgipNAEqNUO8na6B7KuMejSYWLXNNeJFyJhj/R
-MUqrWZjNuXCqJ8mSsSSLsStwBg12rRffNeX/
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.phzg.ch/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="en">phzg.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">PH Zug - Pädagogische Hochschule Zug</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">PH Zug - Pädagogische Hochschule Zug</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.phzg.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.phzg.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>PH Zug</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@phzg.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Abdel</md:GivenName>
-    <md:SurName>Benhauresch</md:SurName>
-    <md:EmailAddress>mailto:support@phzg.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.ruhr-uni-bochum.de.xml b/swamid-interfederations-2.0/aai.ruhr-uni-bochum.de.xml
deleted file mode 100644
index 10083fc4..00000000
--- a/swamid-interfederations-2.0/aai.ruhr-uni-bochum.de.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.ruhr-uni-bochum.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ruhr-uni-bochum.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.ruhr-uni-bochum.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.ruhr-uni-bochum.de,O=Ruhr-Universitaet Bochum,L=Bochum,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVjCCBD6gAwIBAgIEEiEnvjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-REUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDzANBgNVBAcTBkJvY2h1
-bTEhMB8GA1UEChMYUnVoci1Vbml2ZXJzaXRhZXQgQm9jaHVtMSQwIgYDVQQDExtS
-dWhyLVVuaXZlcnNpdGFldCBCb2NodW0gQ0ExJzAlBgkqhkiG9w0BCQEWGHJ1YmNh
-QHJ1aHItdW5pLWJvY2h1bS5kZTAeFw0xMTA2MjIwODM5MTFaFw0xMjA2MjEwODM5
-MTFaMIGAMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxl
-bjEPMA0GA1UEBxMGQm9jaHVtMSEwHwYDVQQKExhSdWhyLVVuaXZlcnNpdGFldCBC
-b2NodW0xHzAdBgNVBAMTFmFhaS5ydWhyLXVuaS1ib2NodW0uZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1TXNvbWZQuhD7KNV+/c8P06qnPrfpUpOr
-9fU2J+cJ0qWK6bsG7fZ2vqH6XOmnAhoYszMW6mPSrfysoGsz4um6IpseDEMG1yil
-nG3FxZbj8s1IlY8LnIi0MyofA6lwxZknpeg1L9QF53pZOaSWCIvyXbawpk9EUA5i
-hHI+IfRV/KI0+xFFqwiy6/P9XPZy9egNSEBlF1kc06Dkb8FoFLn4rI9mtCXK9T6Y
-Bpnl/irNSc8ufSNMucdNFIuRQwdIhuR2Wqf6xEzSkN5ZBUDK5XJ8J539biCH8Emd
-UBW8yEOSCu1xiIv2WsGTsOpxUKStyTuT63x6IXcMwFV1eTQWdvJPAgMBAAGjggGm
-MIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
-AgYIKwYBBQUHAwEwHQYDVR0OBBYEFKQSAnlARvF9KuS1wrFrQO1HBFWRMB8GA1Ud
-IwQYMBaAFLspuDtfBCTji3B7YH82bxdhy66SMIGFBgNVHR8EfjB8MDygOqA4hjZo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1ib2NodW0tY2EvcHViL2NybC9jYWNy
-bC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJvY2h1bS1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUH
-MAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWJvY2h1bS1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvdW5pLWJvY2h1bS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAFhVZaHJUtJ1huuoMSkKTbVK5uvpeR2dmgsB9dE65FgEtgIzLlfq
-W/z7o4lbP8PWXURBBZSRfc/Lz6+d3CULzS2hcZdzDldGupvf753Oi+dVSn9xi+Bf
-IRDNZQXCUoXssSM3Dg9k3jWPfC6v/LK5iAE5R5rAA9F30k6wjOFxKTHAiBl9Ft2D
-/EslaYzBDMbSvIS63iCpj564wDDHhBh3gRecHA9Q4H3c+SyzuERi4J6pmSH+vkmL
-a9srY8QcPwqxi0NPaNPU8PNlt7ZT17Qlb6CWW68e795DgXo9GgNTRgmqVJbAz6es
-3N07N4JoxZQMCy3W6DW0PLaOIbCfvAP5V0o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.ruhr-uni-bochum.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.ruhr-uni-bochum.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai.ruhr-uni-bochum.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.ruhr-uni-bochum.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.ruhr-uni-bochum.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.ruhr-uni-bochum.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ruhr-uni-bochum.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>aai.ruhr-uni-bochum.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=aai.ruhr-uni-bochum.de,O=Ruhr-Universitaet Bochum,L=Bochum,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVjCCBD6gAwIBAgIEEiEnvjANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-REUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDzANBgNVBAcTBkJvY2h1
-bTEhMB8GA1UEChMYUnVoci1Vbml2ZXJzaXRhZXQgQm9jaHVtMSQwIgYDVQQDExtS
-dWhyLVVuaXZlcnNpdGFldCBCb2NodW0gQ0ExJzAlBgkqhkiG9w0BCQEWGHJ1YmNh
-QHJ1aHItdW5pLWJvY2h1bS5kZTAeFw0xMTA2MjIwODM5MTFaFw0xMjA2MjEwODM5
-MTFaMIGAMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxl
-bjEPMA0GA1UEBxMGQm9jaHVtMSEwHwYDVQQKExhSdWhyLVVuaXZlcnNpdGFldCBC
-b2NodW0xHzAdBgNVBAMTFmFhaS5ydWhyLXVuaS1ib2NodW0uZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1TXNvbWZQuhD7KNV+/c8P06qnPrfpUpOr
-9fU2J+cJ0qWK6bsG7fZ2vqH6XOmnAhoYszMW6mPSrfysoGsz4um6IpseDEMG1yil
-nG3FxZbj8s1IlY8LnIi0MyofA6lwxZknpeg1L9QF53pZOaSWCIvyXbawpk9EUA5i
-hHI+IfRV/KI0+xFFqwiy6/P9XPZy9egNSEBlF1kc06Dkb8FoFLn4rI9mtCXK9T6Y
-Bpnl/irNSc8ufSNMucdNFIuRQwdIhuR2Wqf6xEzSkN5ZBUDK5XJ8J539biCH8Emd
-UBW8yEOSCu1xiIv2WsGTsOpxUKStyTuT63x6IXcMwFV1eTQWdvJPAgMBAAGjggGm
-MIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
-AgYIKwYBBQUHAwEwHQYDVR0OBBYEFKQSAnlARvF9KuS1wrFrQO1HBFWRMB8GA1Ud
-IwQYMBaAFLspuDtfBCTji3B7YH82bxdhy66SMIGFBgNVHR8EfjB8MDygOqA4hjZo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1ib2NodW0tY2EvcHViL2NybC9jYWNy
-bC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJvY2h1bS1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUH
-MAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWJvY2h1bS1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvdW5pLWJvY2h1bS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAFhVZaHJUtJ1huuoMSkKTbVK5uvpeR2dmgsB9dE65FgEtgIzLlfq
-W/z7o4lbP8PWXURBBZSRfc/Lz6+d3CULzS2hcZdzDldGupvf753Oi+dVSn9xi+Bf
-IRDNZQXCUoXssSM3Dg9k3jWPfC6v/LK5iAE5R5rAA9F30k6wjOFxKTHAiBl9Ft2D
-/EslaYzBDMbSvIS63iCpj564wDDHhBh3gRecHA9Q4H3c+SyzuERi4J6pmSH+vkmL
-a9srY8QcPwqxi0NPaNPU8PNlt7ZT17Qlb6CWW68e795DgXo9GgNTRgmqVJbAz6es
-3N07N4JoxZQMCy3W6DW0PLaOIbCfvAP5V0o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.ruhr-uni-bochum.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.ruhr-uni-bochum.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Ruhr-Universität Bochum</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Ruhr-Universität Bochum</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ruhr-uni-bochum.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Andreas</GivenName>
-    <SurName>Jobs</SurName>
-    <EmailAddress>Andreas.Jobs@ruhr-uni-bochum.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.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 fe82cc7e..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.rz.uni-leipzig.de/idp/shibboleth">
-  <md: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>
-  </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-leipzig.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dzb.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-leipzig.de</shibmd: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://aai.rz.uni-leipzig.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.rz.uni-leipzig.de/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.rz.uni-leipzig.de/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-leipzig.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dzb.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-leipzig.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.rz.uni-leipzig.de: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">e256</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e256</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Leipzig</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Leipzig</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">https://www.uni-leipzig.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.uni-leipzig.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Uwe</md:GivenName>
-    <md:SurName>Toenjes</md:SurName>
-    <md:EmailAddress>mailto:toenjes@rz.uni-leipzig.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Uwe</md:GivenName>
-    <md:SurName>Toenjes</md:SurName>
-    <md:EmailAddress>mailto:toenjes@rz.uni-leipzig.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b4883c9d..00000000
--- a/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml
+++ /dev/null
@@ -1,142 +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>
-      <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>
-    </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 b3d62182..00000000
--- a/swamid-interfederations-2.0/aai.sztaki.hu-idp.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://aai.sztaki.hu/idp">
-  <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="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:nren</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>sztaki</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>href-idps</saml:AttributeValue>
-        <saml:AttributeValue>hexaa</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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">
-        <mdui:DisplayName xml:lang="hu">MTA SZTAKI</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">MTA SZTAKI</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</mdui:Description>
-        <mdui:Description xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">http://www.sztaki.hu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://www.sztaki.hu</mdui:PrivacyStatementURL>
-        <mdui:Logo height="66" width="125">https://ujwiki.sztaki.hu/sztaki/resources/assets/Sztaki_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sztaki.hu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID7zCCAtegAwIBAgIJAOxuHs1w0Fi2MA0GCSqGSIb3DQEBCwUAMIGNMQswCQYDVQQGEwJIVTERMA8GA1UECAwIQnVkYXBlc3QxETAPBgNVBAcMCEJ1ZGFwZXN0MRMwEQYDVQQKDApNVEEgU1pUQUtJMQ0wCwYDVQQLDARIQklUMRYwFAYDVQQDDA1hYWkuc3p0YWtpLmh1MRwwGgYJKoZIhvcNAQkBFg1hYWlAc3p0YWtpLmh1MB4XDTE1MDYwMzA5NTIyNVoXDTI1MDYwMjA5NTIyNVowgY0xCzAJBgNVBAYTAkhVMREwDwYDVQQIDAhCdWRhcGVzdDERMA8GA1UEBwwIQnVkYXBlc3QxEzARBgNVBAoMCk1UQSBTWlRBS0kxDTALBgNVBAsMBEhCSVQxFjAUBgNVBAMMDWFhaS5zenRha2kuaHUxHDAaBgkqhkiG9w0BCQEWDWFhaUBzenRha2kuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzDBdsoyk0lhIuR1JdLd2MH4JtlJhFeyXfIKmECCDW/y43EOalQ8nfCxR6niH5gifuLab/qGx0+oyuoC4lKaM9VFxexlLueLnD1Gpa+qksXArZ9g/vzMs2pjrUa0eCAIsWie7pVWTYPw3rxVE9GeNTqGfOIOuCQMU5Z+Bisq51ssSWrWT9XQf+iSlO+9HXNjMzGmU6TYF9N0IN9m+Bw/j0EVOY0B2nD1wLE5HbzB8EcUuBswo/+bxP4GgWdHsR5dF74CfGV7jzssFjpM5GDEF+G3E+LzqufOxsmLX5TdbuycsICE9nbxTZE58A3+0GjyWBt84ceB2MAHPWaPHgSpSlAgMBAAGjUDBOMB0GA1UdDgQWBBR34ZfUyDd4Lr2dMJODuFMYfQ9TfzAfBgNVHSMEGDAWgBR34ZfUyDd4Lr2dMJODuFMYfQ9TfzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBS8uYxJKqHN6qA91/zt81T4xxWk93lUi3rlR3OYmkOeRnTJRrs0qy71vmOA7N3yxSEVRO8s/IH042hvk31poZWY9fk6JBuOa7k5mhkV0w8rxcYjvO/M/9K38VJIQJmz9FP1mIhKeKGbsW6G/OckJL7Yd94csOo1cIdKtzh9+ofqbg+Zb2YDY4qjj44P+bCh1dAMmtUTgCqUL1mqHme8Nvn2nenj6G6XAlX9DDndSHRuaCjuyHgGZcp8wLybkvyITowM+Pp8fFakTMZevCRKrJYn4iBK82NahCbsWiyVrt3xnbuyfF3lF+32C67uEKZvypZtv/GhgTvLHZoKpfgpi1B</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>aai.sztaki.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.sztaki.hu/idp/saml2/idp/SingleLogoutServiceiFrame.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://aai.sztaki.hu/idp/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://sztaki.hu/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://sztaki.hu/?en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>AAI Administrator Team</md:SurName>
-    <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>AAI Administrator Team</md:SurName>
-    <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>AAI Administrator Team</md:SurName>
-    <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ddb61403..00000000
--- a/swamid-interfederations-2.0/aai.sztaki.hu.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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">hexxa</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: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 b9c755f6..00000000
--- a/swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.unifr.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-07-08T13:16:52Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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,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</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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIJAJwf/9bsnmsbMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
-BAMTDGFhaS51bmlmci5jaDAeFw0xNTAzMDQxMDU0MDZaFw0xODAzMDMxMDU0MDZa
-MBcxFTATBgNVBAMTDGFhaS51bmlmci5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALi9cO7nFb67iyLo1cJHvtP9caBhzkqpYNjs4zH7XkGH+/4W4Fd4
-UtXOUn3tBpAaARerqeOp6IFNZNpqTewpHDCHPDcyZ7aGq9ZdqzHb+6yQJRVvpzPu
-mIvCMOGgQ9kAVGy08/SdZzb5e6RiGnapFPowPjZvQcsXAGFMc4pjLJ9RCIx5zY7r
-5XGweXL7RWSQ4hH74IIe9XJdHxR5WNSsuSVyYNm20CmlcKInDamTkfLC5L2w4Hw8
-BGCpGNFgBNmZr63ESsoowQ6+YYGILEcbHh1yFOEAqCw4bUCeJCNsfT7EitVf5AiU
-VNMsSWEaVJegJYwX1lp5+9YXUj7a1De1ex0CAwEAAaNfMF0wPAYDVR0RBDUwM4IM
-YWFpLnVuaWZyLmNohiNodHRwczovL2FhaS51bmlmci5jaC9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUGXQ2JJpBYGPPjGeExyVpeYqc2N0wDQYJKoZIhvcNAQELBQAD
-ggEBAB+7vRDbeXosjAy/vRp2NTqAyQtNvSNf0YD6sPAK7GWG6QdIVUplFibdxbf3
-WVRsqjk8QwBSHBEzQV4RGeNp3taWPF4rGV63AYNsD3MDU5hCXwJt+09L2CksY8nf
-yf1aolXvUgj7h/6Q0qUS6Ar9jW9OEqGdYJlReuLEqzPYYS9yLvsQXmYcaTTnsamY
-TDPBT+eAiVIiu1yddN9nogFvpWWYVeEtSo/D8ksrguKEgRgyWbddRvtpytGF+ATi
-3wUQ9ojbIJj3e8Bb9gzzNITNevi8JO7yrP/n6qY0T62Ad5tUZeWxDRkpuTh+tFIY
-bZEODPJXkUWKEr7metQP4autmVY=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unifr.ch: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://aai.unifr.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.unifr.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.unifr.ch/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.unifr.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifr.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIJAJwf/9bsnmsbMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV
-BAMTDGFhaS51bmlmci5jaDAeFw0xNTAzMDQxMDU0MDZaFw0xODAzMDMxMDU0MDZa
-MBcxFTATBgNVBAMTDGFhaS51bmlmci5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALi9cO7nFb67iyLo1cJHvtP9caBhzkqpYNjs4zH7XkGH+/4W4Fd4
-UtXOUn3tBpAaARerqeOp6IFNZNpqTewpHDCHPDcyZ7aGq9ZdqzHb+6yQJRVvpzPu
-mIvCMOGgQ9kAVGy08/SdZzb5e6RiGnapFPowPjZvQcsXAGFMc4pjLJ9RCIx5zY7r
-5XGweXL7RWSQ4hH74IIe9XJdHxR5WNSsuSVyYNm20CmlcKInDamTkfLC5L2w4Hw8
-BGCpGNFgBNmZr63ESsoowQ6+YYGILEcbHh1yFOEAqCw4bUCeJCNsfT7EitVf5AiU
-VNMsSWEaVJegJYwX1lp5+9YXUj7a1De1ex0CAwEAAaNfMF0wPAYDVR0RBDUwM4IM
-YWFpLnVuaWZyLmNohiNodHRwczovL2FhaS51bmlmci5jaC9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUGXQ2JJpBYGPPjGeExyVpeYqc2N0wDQYJKoZIhvcNAQELBQAD
-ggEBAB+7vRDbeXosjAy/vRp2NTqAyQtNvSNf0YD6sPAK7GWG6QdIVUplFibdxbf3
-WVRsqjk8QwBSHBEzQV4RGeNp3taWPF4rGV63AYNsD3MDU5hCXwJt+09L2CksY8nf
-yf1aolXvUgj7h/6Q0qUS6Ar9jW9OEqGdYJlReuLEqzPYYS9yLvsQXmYcaTTnsamY
-TDPBT+eAiVIiu1yddN9nogFvpWWYVeEtSo/D8ksrguKEgRgyWbddRvtpytGF+ATi
-3wUQ9ojbIJj3e8Bb9gzzNITNevi8JO7yrP/n6qY0T62Ad5tUZeWxDRkpuTh+tFIY
-bZEODPJXkUWKEr7metQP4autmVY=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unifr.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unifr.ch: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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">unifr.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Freiburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Fribourg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">Université de Fribourg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.unifr.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unifr.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.unifr.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>Support Uni Fribourg</md:SurName>
-    <md:EmailAddress>mailto:aai@unifr.ch</md:EmailAddress>
-    <md:TelephoneNumber>+4126 300 7207</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>Support Uni Fribourg</md:SurName>
-    <md:EmailAddress>mailto:aai@unifr.ch</md:EmailAddress>
-    <md:TelephoneNumber>+4126 300 7207</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai.unil.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.unil.ch-idp-shibboleth.xml
deleted file mode 100644
index e04cf923..00000000
--- a/swamid-interfederations-2.0/aai.unil.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.unil.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-02-04T11:19: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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.unil.ch/ci/helpdesk" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unil.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Lausanne</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Université de Lausanne</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Université de Lausanne</mdui:Description>
-        <mdui:Description xml:lang="fr">Université de Lausanne</mdui:Description>
-        <mdui:Keywords xml:lang="en">University Université Lausanne Switzerland Suisse Vaud UNIL HEC</mdui:Keywords>
-        <mdui:Keywords xml:lang="fr">University Université Lausanne Switzerland Suisse Vaud UNIL HEC</mdui:Keywords>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAbUlEQVQ4EWNkmHDpPwMFgIkCvWCtw8WA//m68KCAsUF0rJ4kWBxZDCQA44PYeMNgkaMISA1egNcAkE6YK3CZgteAuP1vGAi5Aq8Biy89x2UxXJwFxALZBAsYEBsZ4HIFTD3jaFLGn5CQAxMXGwBfgCBoMtEr2QAAAABJRU5ErkJggg==</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+hkAAAhXSURBVHic7Fh7bFtnFbcE3VZR8Sio3YTQQCxiYxRB/0CFgSZNDIYGEoJp68YmhPYH0mC0nTSQQEgg0S3rEppHnTh16jSxnZfzsONHkjpOnDqOX9eP61dsx3b9fsSv+HX9TjnOTdy0S9PG7sLk+Sfr6t5zz3fO+Z3vfOf7rgk3P2Ug/L8DOGg0CNc7GoTrHQ3C9Y4G4XpHg3C9o0G43tEgXO+4N2HHOvaeyiMPxm9ubBxAQB839iKcLZbopuDjV5WElqX3FC5cmC+VjJEUVijW7juazfvT2drt7At7EQ5huXdF9kf7lJ/pkqKhJC5s03gfbhd3aX01OuY5Il+lIMd7FUgwUaOpfeEeJZ0pFB7rQ55jGkqb9VzcKJ0a0xHalidt4Vq8LnnjR7plL0+bjpIVl/X+WkztF/cgTDUFgR7LvkUPCSYPEWXHKMoQlq/aZTiT+0a/6i2hLZjOHO1VLLjXqzZVBfYiDLP643H9d4fQXLGES94SWgn/Ff+Ks1KLy3dE9qdoarBJ1PqPU5B4rlCLtf1iL8KqtSShUwJ9C390xrEvkRWENkkz4q7anyeZ+TJZPuuM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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.unil.ch</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.unil.ch</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="fr">http://www.unil.ch/ci/home/menuinst/documentation/reglements-et-directives.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>192.33.222.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.224.0/21</mdui:IPHint>
-        <mdui:IPHint>192.33.217.0/24</mdui:IPHint>
-        <mdui:IPHint>192.33.218.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.220.0/24</mdui:IPHint>
-        <mdui:IPHint>195.176.0.144/28</mdui:IPHint>
-        <mdui:IPHint>192.33.214.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.216.0/22</mdui:IPHint>
-        <mdui:IPHint>2001:620:600::/48</mdui:IPHint>
-        <mdui:IPHint>192.80.31.0/24</mdui:IPHint>
-        <mdui:IPHint>192.80.32.0/21</mdui:IPHint>
-        <mdui:IPHint>192.80.40.0/23</mdui:IPHint>
-        <mdui:IPHint>192.80.31.0/24</mdui:IPHint>
-        <mdui:IPHint>192.80.32.0/21</mdui:IPHint>
-        <mdui:IPHint>192.80.40.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.220.0/24</mdui:IPHint>
-        <mdui:IPHint>192.80.42.0/24</mdui:IPHint>
-        <mdui:IPHint>129.194.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.33.222.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.212.0/24</mdui:IPHint>
-        <mdui:IPHint>192.33.212.0/22</mdui:IPHint>
-        <mdui:IPHint>192.33.216.0/24</mdui:IPHint>
-        <mdui:DomainHint>unil.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.521542,6.579157</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>
-MIIDDDCCAfSgAwIBAgIJAMN83YPbe/AVMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2FhaS51bmlsLmNoMB4XDTE0MDQxMDA2NTc0N1oXDTE3MDQwOTA2NTc0N1ow
-FjEUMBIGA1UEAxMLYWFpLnVuaWwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDS4Fn9ab7qC1kgxX8O4r8QcfDZG0T89Bu4qD9O8vD/1aPLo5ZqSjao
-1mrhiVbqGgLmPjbS/IsuCMRrUfDeQyBJGqZ8O5GOL6sL3eH5Qd2wZAdHcFZHWx7b
-oCz1wXb1+a0bhTCaSE3UJpUqvo7bf/1ClBpzcJD1jSdt2sQt/U8bq0rb9vtnzLMc
-OM4wetmS8lS5WsJGuGqGrdsKb8SD4QAemaYjTYgY9yoXZh0ZYvdce0jImGMbOF43
-55LxIF6L89U+VFF7Z5KyrZQRCP5e9MinvMeShCtYiAJyBW9RMF4vEZuQBTgAjmvZ
-8xVVkwqsdpUnwmCsVV5ZeRtG7yqev+4LAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2Fh
-aS51bmlsLmNohiJodHRwczovL2FhaS51bmlsLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTX3RXRntMu7Rn62PNfGuvDMFJ4IzANBgkqhkiG9w0BAQUFAAOCAQEA
-hTRI7Gj5D+fEq59EnmD+vZa1MGGoftEdGWhVGmKA5Stki5hI4OtrogNG0H6TqlLx
-tzg7EXIsjR5sqifAx2nA+W+bWuQiAZPyqVbz4ttqSa63E6XJcfzT1HP7wJVUnkYn
-JyqeHAbvPrAQDsil2l/RHSfnFT4BiDi/g39nye15jUI1QZP1j43AIttSbsCUJf1O
-2XCs2/apHYzF4FF7Dqej35omJPm8sr4+ylZR6nSJKa1QDs7EjM2sCgd6oEeHipHn
-bQ7puHs24ooO2rLro9m3g8eIRPL9vY8eK4Za1FoMzuyeYRUMr29nybh93k74FPh7
-bixqHGtUL73JGpgPqlP05A==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unil.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <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://aai.unil.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.unil.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.unil.ch/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unil.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDDCCAfSgAwIBAgIJAMN83YPbe/AVMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2FhaS51bmlsLmNoMB4XDTE0MDQxMDA2NTc0N1oXDTE3MDQwOTA2NTc0N1ow
-FjEUMBIGA1UEAxMLYWFpLnVuaWwuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDS4Fn9ab7qC1kgxX8O4r8QcfDZG0T89Bu4qD9O8vD/1aPLo5ZqSjao
-1mrhiVbqGgLmPjbS/IsuCMRrUfDeQyBJGqZ8O5GOL6sL3eH5Qd2wZAdHcFZHWx7b
-oCz1wXb1+a0bhTCaSE3UJpUqvo7bf/1ClBpzcJD1jSdt2sQt/U8bq0rb9vtnzLMc
-OM4wetmS8lS5WsJGuGqGrdsKb8SD4QAemaYjTYgY9yoXZh0ZYvdce0jImGMbOF43
-55LxIF6L89U+VFF7Z5KyrZQRCP5e9MinvMeShCtYiAJyBW9RMF4vEZuQBTgAjmvZ
-8xVVkwqsdpUnwmCsVV5ZeRtG7yqev+4LAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2Fh
-aS51bmlsLmNohiJodHRwczovL2FhaS51bmlsLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTX3RXRntMu7Rn62PNfGuvDMFJ4IzANBgkqhkiG9w0BAQUFAAOCAQEA
-hTRI7Gj5D+fEq59EnmD+vZa1MGGoftEdGWhVGmKA5Stki5hI4OtrogNG0H6TqlLx
-tzg7EXIsjR5sqifAx2nA+W+bWuQiAZPyqVbz4ttqSa63E6XJcfzT1HP7wJVUnkYn
-JyqeHAbvPrAQDsil2l/RHSfnFT4BiDi/g39nye15jUI1QZP1j43AIttSbsCUJf1O
-2XCs2/apHYzF4FF7Dqej35omJPm8sr4+ylZR6nSJKa1QDs7EjM2sCgd6oEeHipHn
-bQ7puHs24ooO2rLro9m3g8eIRPL9vY8eK4Za1FoMzuyeYRUMr29nybh93k74FPh7
-bixqHGtUL73JGpgPqlP05A==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unil.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unil.ch: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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">unil.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Lausanne</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">Université de Lausanne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unil.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.unil.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Equipe</md:GivenName>
-    <md:SurName>AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@unil.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>HelpDesk</md:GivenName>
-    <md:SurName>UNIL</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@unil.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41216922211</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alexandre</md:GivenName>
-    <md:SurName>Roy</md:SurName>
-    <md:EmailAddress>mailto:Alexandre.Roy@unil.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41216922233</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Christopher</md:GivenName>
-    <md:SurName>Greiner</md:SurName>
-    <md:EmailAddress>mailto:christopher.greiner@unil.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41216922193</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/abcidp.askham-bryan.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/abcidp.askham-bryan.ac.uk-shibboleth.xml
deleted file mode 100644
index bca50036..00000000
--- a/swamid-interfederations-2.0/abcidp.askham-bryan.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://abcidp.askham-bryan.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP owned by Askham Bryan College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">askham-bryan.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYjCCAkoCCQCbjHqVpdODLjANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
-						QjESMBAGA1UECBMJWW9ya3NoaXJlMQ0wCwYDVQQHEwRZb3JrMR0wGwYDVQQKExRB
-						c2toYW0gQnJ5YW4gQ29sbGVnZTEiMCAGA1UEAxMZYWJjaWRwLmFza2hhbS1icnlh
-						bi5hYy51azAeFw0xMzA0MDIxNjIyMjhaFw0zMzAzMjgxNjIyMjhaMHMxCzAJBgNV
-						BAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNVBAcTBFlvcmsxHTAbBgNV
-						BAoTFEFza2hhbSBCcnlhbiBDb2xsZWdlMSIwIAYDVQQDExlhYmNpZHAuYXNraGFt
-						LWJyeWFuLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA92dw
-						/jLTq0PhWcfIRwHBB1yDYBU3l9eU+rJEjH0WXZJMmOuvHsdLeT2oMBUM60gWlwIz
-						/uAoilRVQiMg48uMaodL7/etHiAGoMpzscC3CwKhHlXH7puM0QDeEb70J1t1h30q
-						dDZBFtVmCs0B5CYBHjyqH+i82YWf0etzTdb73WBo1lOrRijZLcJGD/HCzijY1hPQ
-						EkbTXwhcKaeU2Rk+5UpnZJbSUmBIGWO6u4K3ObrjyXalvWUo/m/6gWDsukHrmNnv
-						qKGuuermOrnA4Noji85wfc8TwezFolrWvofPSdtworR8XKGejVEprQxou45d9tea
-						LfBok30AvU2losYWqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCSqC5N9FinG+AE
-						ZLrIMbFuudnUoVkMCtmZ9L9ItwB7fG6BtmcknMq369Bc6WeDBevEYAE900GUvb6y
-						M+DB9sO4MlBi+FRnFjPI//X7IIhSP7gER7W5l+ZBTxe+KqeJ+p5etShh/q+A/u6f
-						LHlwgzLRh/4NUIFiKRzG8Zebt5mYv1Bv3RIjHRr1kc9IfVpBljjidPgcRb3Kg8Yr
-						5OomYsqDIo+BJBq/4r6tJ3chZTH65s6nlROA6EJmfgM46053tjWiZ9AQ8oh6hXTH
-						/4IxUtQavt3994NTOWbuZyBOVkafzCiO8dVj00/fk/Gx6SNb+oKNHSfkcM7x8RPh
-						Up+S4ts+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://abcidp.askham-bryan.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://abcidp.askham-bryan.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://abcidp.askham-bryan.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abcidp.askham-bryan.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://abcidp.askham-bryan.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://abcidp.askham-bryan.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">askham-bryan.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYjCCAkoCCQCbjHqVpdODLjANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
-						QjESMBAGA1UECBMJWW9ya3NoaXJlMQ0wCwYDVQQHEwRZb3JrMR0wGwYDVQQKExRB
-						c2toYW0gQnJ5YW4gQ29sbGVnZTEiMCAGA1UEAxMZYWJjaWRwLmFza2hhbS1icnlh
-						bi5hYy51azAeFw0xMzA0MDIxNjIyMjhaFw0zMzAzMjgxNjIyMjhaMHMxCzAJBgNV
-						BAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNVBAcTBFlvcmsxHTAbBgNV
-						BAoTFEFza2hhbSBCcnlhbiBDb2xsZWdlMSIwIAYDVQQDExlhYmNpZHAuYXNraGFt
-						LWJyeWFuLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA92dw
-						/jLTq0PhWcfIRwHBB1yDYBU3l9eU+rJEjH0WXZJMmOuvHsdLeT2oMBUM60gWlwIz
-						/uAoilRVQiMg48uMaodL7/etHiAGoMpzscC3CwKhHlXH7puM0QDeEb70J1t1h30q
-						dDZBFtVmCs0B5CYBHjyqH+i82YWf0etzTdb73WBo1lOrRijZLcJGD/HCzijY1hPQ
-						EkbTXwhcKaeU2Rk+5UpnZJbSUmBIGWO6u4K3ObrjyXalvWUo/m/6gWDsukHrmNnv
-						qKGuuermOrnA4Noji85wfc8TwezFolrWvofPSdtworR8XKGejVEprQxou45d9tea
-						LfBok30AvU2losYWqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCSqC5N9FinG+AE
-						ZLrIMbFuudnUoVkMCtmZ9L9ItwB7fG6BtmcknMq369Bc6WeDBevEYAE900GUvb6y
-						M+DB9sO4MlBi+FRnFjPI//X7IIhSP7gER7W5l+ZBTxe+KqeJ+p5etShh/q+A/u6f
-						LHlwgzLRh/4NUIFiKRzG8Zebt5mYv1Bv3RIjHRr1kc9IfVpBljjidPgcRb3Kg8Yr
-						5OomYsqDIo+BJBq/4r6tJ3chZTH65s6nlROA6EJmfgM46053tjWiZ9AQ8oh6hXTH
-						/4IxUtQavt3994NTOWbuZyBOVkafzCiO8dVj00/fk/Gx6SNb+oKNHSfkcM7x8RPh
-						Up+S4ts+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://abcidp.askham-bryan.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://abcidp.askham-bryan.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">Askham Bryan College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Askham Bryan College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.askham-bryan.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Lea</SurName>
-    <EmailAddress>mailto:andy.lea@askham-bryan.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:IT@askham-bryan.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Lea</SurName>
-    <EmailAddress>mailto:andy.lea@askham-bryan.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/abertay.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/abertay.unidesk.ac.uk-shibboleth.xml
deleted file mode 100644
index 23aa5629..00000000
--- a/swamid-interfederations-2.0/abertay.unidesk.ac.uk-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://abertay.unidesk.ac.uk/shibboleth">
-  <!--
-		This is a "Unidesk - University of Abertay" Shibboleth SP owned by the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-29T09:00: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAPHsl6kKrFrnMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEmxpdmUudW5pZGVzay5hYy51azAeFw0xMjA0MTExNDU4MjhaFw0yMjA0MDkx
-						NDU4MjhaMB0xGzAZBgNVBAMTEmxpdmUudW5pZGVzay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAL9qh/Dehm5jJdWdeFPNKqcjMdiqii8Iz9Rc
-						tCAsEwRsYww4EQDG7MxG5hg4NSS+iIPFCp9gR+G7hTnZAMGgNpxs2vk4vs9lmhRY
-						GmB7Y1NFloP9Pcsu+MaufaLzxi6bzIXV4dBVHqVnIcgxchDIsXmPE6xlq4poEq+q
-						XJ3aFE/eWwxfwN9z0s5yeICzsil73xk9T9NLeNAeYq+jfVTcdqDbBHY6eHtMOYh/
-						uPVYYxkKXjkgSH5cwG0b+7qN4z+uzKDNBXxnI1Nz+bLOazXW6ljQIDtAPQZMJSlr
-						3OepVaQS+fMBi0Sku5yvADgINdXxkz6H4Zx4pZg/rTQBQ/8u2esCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISbGl2ZS51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBQ2tPlzxC8e
-						akC2nh9qrG4TWfI3tzANBgkqhkiG9w0BAQUFAAOCAQEAWPY3Nv9ChZ+4XVNANhLq
-						fGF7SbiPmUNj9vWGNjCp8Ma0tdDOZPvqBRzxKkkR+LS+fHpSQQ54RuNeZrulWBiN
-						akZe3LZiSH9AHG2uD0lDuxr0UQt1AHGDiLjFXuRg9+CdqqrdT3Anmy6exDDfRsjH
-						k+ZJflkEtqTNd0dbEVlkYlg8Baqx/ZMOxkccx8PtQt1yptAMsH4Rn92vXLd9d3JM
-						H1mrFuiriqrgsAfVLmzc4WeGmB+dK01cSB+CY7hKnoe7ds1y7kNhOmZ9HP3Iy7ev
-						gF2RCdnqkP9zScihW4b20PlVa/sWMUyCj2uZE1lSO51PJcGVU0H/JFrBEpaM7u6t
-						jg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://abertay.unidesk.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: Unidesk - University of Abertay</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Helpdesk</GivenName>
-    <EmailAddress>mailto:IS.Helpdesk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 49e6455d..00000000
--- a/swamid-interfederations-2.0/ablation.oucs.ox.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ablation.oucs.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Test" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIJAL+QQg4gKHSjMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmFibGF0aW9uLm91Y3Mub3guYWMudWswHhcNMTIwMTIzMTQ0NTIwWhcNMjIw
-						MTIwMTQ0NTIwWjAhMR8wHQYDVQQDExZhYmxhdGlvbi5vdWNzLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnz+8H7tA8WPyMdvx5M8mvPiw
-						8tsXvb9wXpMJ7ytRr4E+Mfw0x4V4Ze3Vlqpbl86GPPZ1UsaRt5BXPJc0+3CYE0iZ
-						Cwji3tB4j4a9mBEgIgDXfepSkhxrFIV55eV5NxiPaoZdn4r3HtcZ+UPViYeha0Sb
-						sQtp8qSYN1N7ro6XvGmPsRaMxciOgTHYuS1l1mATzicO2j1K1vAIPOwJY+64VCmm
-						aVEZIzZvbhbfs/UxjJ0QYL5OIakvh2NwPuJYxomPbPTJ7d8dkjQLKVLqeaBXZVd/
-						vRUUBN4JRiWqjCe/ydJI1PyPJx797uJQGcWY+Xc014uPzP6UKumQPvSUWKmDpwID
-						AQABo3IwcDBPBgNVHREESDBGghZhYmxhdGlvbi5vdWNzLm94LmFjLnVrhixodHRw
-						czovL2FibGF0aW9uLm91Y3Mub3guYWMudWsvc2hpYmJvbGV0aC1zcDAdBgNVHQ4E
-						FgQUWCsKQqfiwjR0/+IitEXa1hrQ9rIwDQYJKoZIhvcNAQEFBQADggEBAAh41Pwr
-						gIEJw5kIsm+8WEPol3+pS/wK2XZ8aDB07uwY39hoQJiBU9pY5YEBrNkbI6JpoHj7
-						SYXK/onH9mugafKVn0NX3uuHnFNIRfBP34CSJHWlfKvYU2sdWUmdZ0g7Es82O/U6
-						Md4CwQK9TN999XdFTGx8b+/cEzLYquAVHPq5+jRGwqlPbqZlBLz1GCzvWGpkmVcs
-						2fu4xbqDRoJCy+NB/fXg8O/0uiyIQexeGG5A76JDCGOLw988AwKkoykd1iIwrvhv
-						VLSRfMpjr+kLRRDFcKnLS0QzDd4ijKMiCnfKYJUzy49x8FUDH+P41uLKDxVB7Ep0
-						TZGHmnZDf5qYsqk=
-					</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://ablation.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ablation.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Test SP 1.3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services IAM Team</GivenName>
-    <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Services IAM Team</GivenName>
-    <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/abstimmung.dfn.de.xml b/swamid-interfederations-2.0/abstimmung.dfn.de.xml
deleted file mode 100644
index 192805ba..00000000
--- a/swamid-interfederations-2.0/abstimmung.dfn.de.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://abstimmung.dfn.de/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-04-25T09:41:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                   https://www.aai.dfn.de/en/join/
-            </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">
-                   https://www.aai.dfn.de/teilnahme/
-            </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DFN Terminplaner (Foodle)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DFN Foodle</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Umfrage- und Abstimmungs-Tool</mdui:Description>
-        <mdui:Description xml:lang="en">Poll and survey tool</mdui:Description>
-        <mdui:Logo height="32" width="32">https://www.aai.dfn.de/fileadmin/templates/main/images/logo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>abstimmung.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=abstimmung.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfjCCBGagAwIBAgIHE7Y6ez910DANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMjA0MjQx
-NDQ3MDdaFw0xNzA0MjMxNDQ3MDdaMFkxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpE
-Rk4tVmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRowGAYDVQQDExFh
-YnN0aW1tdW5nLmRmbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AM6AKfTgX6byqjE3pozzRVCi9dRy0chPRdImbTCN/ecoaeYyIu2sLgW03zCx+4bm
-qZY39ZJ9vLV98dpHsJ+XzVmyJFLazyUd4AT947cOPr9IgPrWFQZYYTUCK1wD7MkZ
-BedBp0pJhWBjFEjn4eKocDj7kuGY7TUKK/AXzLDrldk2Yh5H5wUrgkTp2YrQIVek
-5roZiAs6EqsiWWagVpu6IiThCMhfKLQhGf8XpMlwzvz6rrwzpGxTdMmNupmVCYYn
-zMzbnZ9QziQALjiyh8XwK8epf30NJC9dBoq7uFxdOzSFGIf8RroR2Sarapm/QKRg
-WQjI402bZ+W/zGy6VxtGdDkCAwEAAaOCAkQwggJAMBwGA1UdIAQVMBMwEQYPKwYB
-BAGBrSGCLAEBBAICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUTUY5hcn6723usV9Ds939YVI5
-PmcwHwYDVR0jBBgwFoAUeaJiL87xBjlS53ZtYsfem2p1S0kwMwYDVR0RBCwwKoIR
-YWJzdGltbXVuZy5kZm4uZGWCFXd3dy5hYnN0aW1tdW5nLmRmbi5kZTCBkQYDVR0f
-BIGJMIGGMEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4t
-Z3MtY2EvcHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8G
-CCsGAQUFBwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu
-LmRlL09DU1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWlu
-LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQAPVzwu/cMXJ3wpXWwO/xBSlqZiXKI+QG6Yon3skeOTR0kxvd2w6G03QZ2W81pe
-G0TgD3Jv4c3fkHeDDXb0y9JqioBEQJowAjojHiHgfxrBfYv2GTIjQC4rqgyYwU5S
-xsySIMHlCz4OKddO8DhPCBr1uK4zDFlCEiSY+l/0V2hMdJ0+2e0nP1whxAAy/qVy
-pUDI1asgim0Gmk/OP5pJMZgI91wJZYCwr8x35qH+jgGk1jq7n85G6sgNNBCdWEou
-wmFP5OQlDH+W6pttzCCFkZybL+KUa57jpXRhHREcekNPpoS88fkF63L2hQj7WLBy
-c4paT29IqC4Dh1TfYHNKxtWT
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>abstimmung.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=abstimmung.dfn.de,OU=Geschaeftsstelle,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfjCCBGagAwIBAgIHE7Y6ez910DANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMjA0MjQx
-NDQ3MDdaFw0xNzA0MjMxNDQ3MDdaMFkxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpE
-Rk4tVmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRowGAYDVQQDExFh
-YnN0aW1tdW5nLmRmbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AM6AKfTgX6byqjE3pozzRVCi9dRy0chPRdImbTCN/ecoaeYyIu2sLgW03zCx+4bm
-qZY39ZJ9vLV98dpHsJ+XzVmyJFLazyUd4AT947cOPr9IgPrWFQZYYTUCK1wD7MkZ
-BedBp0pJhWBjFEjn4eKocDj7kuGY7TUKK/AXzLDrldk2Yh5H5wUrgkTp2YrQIVek
-5roZiAs6EqsiWWagVpu6IiThCMhfKLQhGf8XpMlwzvz6rrwzpGxTdMmNupmVCYYn
-zMzbnZ9QziQALjiyh8XwK8epf30NJC9dBoq7uFxdOzSFGIf8RroR2Sarapm/QKRg
-WQjI402bZ+W/zGy6VxtGdDkCAwEAAaOCAkQwggJAMBwGA1UdIAQVMBMwEQYPKwYB
-BAGBrSGCLAEBBAICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUTUY5hcn6723usV9Ds939YVI5
-PmcwHwYDVR0jBBgwFoAUeaJiL87xBjlS53ZtYsfem2p1S0kwMwYDVR0RBCwwKoIR
-YWJzdGltbXVuZy5kZm4uZGWCFXd3dy5hYnN0aW1tdW5nLmRmbi5kZTCBkQYDVR0f
-BIGJMIGGMEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4t
-Z3MtY2EvcHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8G
-CCsGAQUFBwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu
-LmRlL09DU1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWlu
-LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQAPVzwu/cMXJ3wpXWwO/xBSlqZiXKI+QG6Yon3skeOTR0kxvd2w6G03QZ2W81pe
-G0TgD3Jv4c3fkHeDDXb0y9JqioBEQJowAjojHiHgfxrBfYv2GTIjQC4rqgyYwU5S
-xsySIMHlCz4OKddO8DhPCBr1uK4zDFlCEiSY+l/0V2hMdJ0+2e0nP1whxAAy/qVy
-pUDI1asgim0Gmk/OP5pJMZgI91wJZYCwr8x35qH+jgGk1jq7n85G6sgNNBCdWEou
-wmFP5OQlDH+W6pttzCCFkZybL+KUa57jpXRhHREcekNPpoS88fkF63L2hQj7WLBy
-c4paT29IqC4Dh1TfYHNKxtWT
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://abstimmung.dfn.de/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abstimmung.dfn.de/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://abstimmung.dfn.de/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://abstimmung.dfn.de/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://abstimmung.dfn.de/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</OrganizationName>
-    <OrganizationName xml:lang="en">German National Research and Education Network, DFN</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes e. V.</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dfn.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.dfn.de/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Torsten</GivenName>
-    <SurName>Kersting</SurName>
-    <EmailAddress>kersting@dfn.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/abw-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/abw-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 769ace1f..00000000
--- a/swamid-interfederations-2.0/abw-shib.hosted.exlibrisgroup.com-shib.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://abw-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "Aberystwyth University" Shibboleth SP for Ex Libris (UK) 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="2015-04-15T08:08:33Z">
-      <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://abw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Aberystwyth University - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of Aberystwyth University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAN+GTIvLDtQPMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMjcwHhcNMTUwNDAyMTkyMTI4WhcNMjUwMzMwMTkyMTI4WjASMRAw
-						DgYDVQQDEwdhaW8wMDI3MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						oAw2bynFAXz8MZfTw/9qDeZ4JsdOGt/nJOrOQxDvt26UerFFyWeYBH+zxEdZ2ELP
-						iwoJpeYWfO+uxcK6K5sEgewKsWvYExj2ClpfaScF4t9BAlfx7X3D6XpHq3gCAa9O
-						P6vQ8xIjNINxwvdZt6lSJQkJK31Ai6Z0uUdt9OUfM/4iMV1sk44Go61zvUXWgfwx
-						J3hW4wvxNF3/Nijr7pPZfslrdzpst6AYizkuPC1B36RKYZpoy4HMLWq8CrLxeMWk
-						0OQ+Vt4H6zdwlR9VpzQXxcldVNVP2t8sm2CG7diIY1NZ8YmMTLdtNNnmcbfVt5xR
-						i89bifh+jyF9m6Q4UaXdCQIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDI3MB0G
-						A1UdDgQWBBT5a49+KtTAOblyF0/Tw5ceoG2sBDANBgkqhkiG9w0BAQUFAAOCAQEA
-						heb95Se07xGChNZQIXr7HhW6VafGQsN+7PwC7LO15H+0JMjgV/kXxjY+OISJU9oQ
-						BDIMhvYy1oitVfUCOgq5SW2PynVVQzHQ9pUIooOStjRqLAz7zHfptFu/+oZ7zSFh
-						oiXV3tdvfOluNTwhQ/VgUSH7SwwXvCOe+ivhTiPvcjdBcRKh9Oh/UwMP+rlVoSDw
-						cTPz8JNoy/6qlf89nxCc0F61AB+7HyktmB+dMEVe0lwmoA+tqNmsdTs42lNft24F
-						nxVpCFC7TPbpCDfg6WABinKCQ93ZgNLRcGtjMz3muzEWpSvIBX2XP/yJE3tkS8kb
-						Ie4EbS3LJr4jvWiXAHRmiQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://abw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://abw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://abw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://abw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://abw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://abw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://abw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://abw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://abw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Aberystwyth University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/academic.mintel.com-shibboleth.xml b/swamid-interfederations-2.0/academic.mintel.com-shibboleth.xml
deleted file mode 100644
index a372a678..00000000
--- a/swamid-interfederations-2.0/academic.mintel.com-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://academic.mintel.com/shibboleth">
-  <!--
-		This is a "Mintel Oxygen Academic" Shibboleth SP for Mintel International Group 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="2008-07-01T10:09:14Z">
-      <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://shibboleth.mintel.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://shibboleth.mintel.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Mintel Reports Academic</mdui:DisplayName>
-        <mdui:Description xml:lang="en">World class Market Intelligence reports from Mintel.  Data and analysis on consumers, markets, companies and brands.</mdui:Description>
-        <mdui:Logo height="109" width="211">https://academic.mintel.com/static/mintel_header/images/mintelLogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIECDCCAvCgAwIBAgIJAO7HNDxW/p6sMA0GCSqGSIb3DQEBBQUAMIGEMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEPMA0GA1UEBxMGTG9uZG9uMScwJQYD
-						VQQKEx5NaW50ZWwgSW50ZXJuYXRpb25hbCBHcm91cCBMdGQxCzAJBgNVBAsTAklU
-						MRwwGgYDVQQDExNhY2FkZW1pYy5taW50ZWwuY29tMB4XDTExMDMyMTEyMDQyNVoX
-						DTIxMDMxODEyMDQyNVowgYQxCzAJBgNVBAYTAkdCMRAwDgYDVQQIEwdFbmdsYW5k
-						MQ8wDQYDVQQHEwZMb25kb24xJzAlBgNVBAoTHk1pbnRlbCBJbnRlcm5hdGlvbmFs
-						IEdyb3VwIEx0ZDELMAkGA1UECxMCSVQxHDAaBgNVBAMTE2FjYWRlbWljLm1pbnRl
-						bC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBnMZaWUjR2Dn7
-						dACN6ecDbGRAm/Z2rHa9OhQMXQhkt5685OlvTBqy0NkHLo+IDK7CqELM3B41+EAb
-						6Lr3BLce/LFTxcBQsnHnnD5tINW64gJpD2H6QhSHJ2aqVLeY8wPl6fXtlVytluBV
-						k1T6yjiP/YfUBg7tUSOrsG9nLQCKbZa6+Swubuu0RD42y8v+eUBGZNYJe+MqidxJ
-						rx2/oBwLrbS/a6FgRckPXOU/PZIx/Xeb7I7TIiypTG+JclszphYYWyjowELVkdc/
-						2RYIjR0sPeGVE9XOvPd65Vu5iA3q7QX0TXfr/sfvSH6cHe6eMwHAGutUrzO6FtDs
-						d9E61PsXAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSbbZMSZPF3EcrK/8Tf
-						Jqdvf+/RODAfBgNVHSMEGDAWgBSbbZMSZPF3EcrK/8TfJqdvf+/RODANBgkqhkiG
-						9w0BAQUFAAOCAQEAmV3hGvndRDttCzoB+u6FoKevaifS9x4cwcOZAuCQuLWM09E5
-						ryFxZMSkTKxnfRM9b183qq+rGWQyGJx6mv5GOBOOjlVWgxYfV2acxSRU8D0ZXZR+
-						R4wVx7CL3lg8INzzZ8xdGdToI8L8EH5Q2ogfiVhc6ubQ/rRvxDVlQga3AwN8zFhl
-						QHH2W6QQAh9NPHRac3MtTeISpyO9q8vmIYhG2/4iy8Y46zM9KgIoeZkG9tY4Of7L
-						RNNnH2p2d6Z13fL+4GtUD9vLGi+3LYpuexnMyK721t3z4gbMrNHq7PqmJayvMw4T
-						y1i5AwcB1d7VsdGmUDdaaAr5beJzjSS21W7tuw==
-					</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>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://academic.mintel.com/resolve_ukfed" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testacademic.mintel.com/resolve_ukfed" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://academic.mintel.com/resolve_ukfed" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testacademic.mintel.com/resolve_ukfed" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML/POST" index="4" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML2/POST" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.mintel.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-shibboleth.mintel.com/Shibboleth.sso/SAML2/Artifact" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Mintel International Group Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Mintel Oxygen Academic</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://academic.mintel.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Abdul</GivenName>
-    <SurName>Malik</SurName>
-    <EmailAddress>mailto:amalik@mintel.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ameet</GivenName>
-    <SurName>Shah</SurName>
-    <EmailAddress>mailto:ashah@mintel.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/academic.reportlinker.com-shibboleth.xml b/swamid-interfederations-2.0/academic.reportlinker.com-shibboleth.xml
deleted file mode 100644
index 46e75d3d..00000000
--- a/swamid-interfederations-2.0/academic.reportlinker.com-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://academic.reportlinker.com/shibboleth">
-  <!--
-		This is a "Reportlinker for Libraries" Shibboleth SP for UBIQUICK SAS.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-28T14:55:01Z"/>
-  </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://academic.reportlinker.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://academic.reportlinker.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Reportlinker for Libraries</mdui:DisplayName>
-        <mdui:Logo height="96" width="350">https://www.reportlinker.com/public/images/commun/academic/logo_w350.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEADCCAuigAwIBAgIJAI2zAKYVKKSxMA0GCSqGSIb3DQEBBQUAMIGAMQswCQYD
-						VQQGEwJGUjEPMA0GA1UECBMGRnJhbmNlMQ0wCwYDVQQHEwRMeW9uMREwDwYDVQQK
-						EwhVYmlxdWljazEZMBcGA1UEAxMQcmVwb3J0bGlua2VyLmNvbTEjMCEGCSqGSIb3
-						DQEJARYUa2NhQHJlcG9ydGxpbmtlci5jb20wHhcNMTIwNjIwMTYxMTQ5WhcNMzIw
-						NjE1MTYxMTQ5WjCBgDELMAkGA1UEBhMCRlIxDzANBgNVBAgTBkZyYW5jZTENMAsG
-						A1UEBxMETHlvbjERMA8GA1UEChMIVWJpcXVpY2sxGTAXBgNVBAMTEHJlcG9ydGxp
-						bmtlci5jb20xIzAhBgkqhkiG9w0BCQEWFGtjYUByZXBvcnRsaW5rZXIuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoQ/PEL4omNHjglyYy0m9TtYy
-						Ps2EdFQy7nbt/EOav1ogaqNJwcF4d3KneSJuaJWsxFoPw0f0uqCuK1hHBQbTowjA
-						BW/RSPzzyv1MgtUqpKIWk07WgQcYAPEm8pkMoCrpgqb36p/2tFgwpp/9H2zqtLS9
-						qYKKPLG1CTAGT3CfbO22hFAeulyudcdo9u/hg/mIAhBlM84KVXY5SLp+yvTeUfSq
-						Ovk3H+EpdUESagO5sujHvPo6YM4g8ndnMqIbJtdslyXYtZLt71eViTSnEP/sfT+2
-						Ns7DPXSHcwcGV7sB961MeATYC1dGX3h45PYejtttA3JxEnGMzeN8+4Hg9Lu8cQID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU8AkQ/A+PIm42swrGvEzXv4kxziMw
-						HwYDVR0jBBgwFoAU8AkQ/A+PIm42swrGvEzXv4kxziMwDQYJKoZIhvcNAQEFBQAD
-						ggEBAJ4bBp0Jkt+VyBt/MvAq86H79p0r4BoznVAgQgjrS7g5vy1b6TvcDze0F0qt
-						b381xndZhF2d4OVgDOBUjY1fRf+fom+uaBd5xT+oyPGICRBS26SUWm0xg7RPy02E
-						/Okd/Unoycb8mwOKFjI1J5FcWDF/RvQNEdgLPjYY0uD00sp13riYDz1MAwy7lTsz
-						Lk9Oa6pe822E2IFi2oGJ4oUB+dMSUmRuRps4xGxiy+XG9bXGIs1kgNJTc31EYYle
-						+PT1s+jOYaWdH5KVVcbTO2RGZVo6PMMVgIne6wwKzOY9L4P+LCtAO7NXiNKs170e
-						m7vEy4QyxlwygQmmFRKsLgO8M9I=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://academic.reportlinker.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://academic.reportlinker.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://academic.reportlinker.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://academic.reportlinker.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://academic.reportlinker.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://academic.reportlinker.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://academic.reportlinker.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UBIQUICK SAS</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Reportlinker for Libraries</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.reportlinker.com/index/about/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Karim</GivenName>
-    <SurName>Cadi</SurName>
-    <EmailAddress>mailto:kca@reportlinker.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Karim</GivenName>
-    <SurName>Cadi</SurName>
-    <EmailAddress>mailto:kca@reportlinker.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/accesnoto.deboecksuperieur.com.xml b/swamid-interfederations-2.0/accesnoto.deboecksuperieur.com.xml
deleted file mode 100644
index 5ad99045..00000000
--- a/swamid-interfederations-2.0/accesnoto.deboecksuperieur.com.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://accesnoto.deboecksuperieur.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-12-09T14:12:55Z">
-      <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>https://federation.renater.fr/category/elearning</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0: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">De Boeck Supérieur License Desk</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://accesnoto.deboecksuperieur.com</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Environment on which Noto and NotoBib customers can use educational resources of De Boeck Supérieur</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">De Boeck Supérieur License Desk</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Environnement sur lequel les clients de Noto et NotoBib peuvent utiliser les ressources éducatives de De Boeck Supérieur</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>
-					      MIIDRzCCAjOgAwIBAgIQcCffsQu+QppGk8fmt9tu8zAJBgUrDgMCHQUAMDAxLjAs
-BgNVBAMTJWh0dHA6Ly9hY2Nlc25vdG8uZGVib2Vja3N1cGVyaWV1ci5jb20wHhcN
-MTQxMjA5MTIzNTUwWhcNMzkxMjMxMjM1OTU5WjAwMS4wLAYDVQQDEyVodHRwOi8v
-YWNjZXNub3RvLmRlYm9lY2tzdXBlcmlldXIuY29tMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAsM8i9y0yvzOg2yXRsWRNI40R190pMoTeRhVzgTN1fsqJ
-v4J4HjvPfhR3njwpYejcsbBnxgs1G/CqIUjqAcJ3J4QluT3a9jNrXCZcdwR5eiUk
-fHciFJvH0tjA0/JkWRRfWGUI58bn5y+z5lgXsLuk6dDoKQczzlof/EBke4qbZP4j
-WISy+DCL1PurXCbVgr4oUZG/aXF4yYZwIaOPGDDe2wfpEpB/5SSSHr1SATmO33Rm
-w3cLnLjAU42reiuyoA68FlakbNoa7Am57QGmsyw/GL9g4c/1cmmioUHXodgsNwHv
-Ad0WZQ2DPMwZUFTTTL6SDw/L4a5YXfGEQJVFYO1inQIDAQABo2UwYzBhBgNVHQEE
-WjBYgBBcuwvkChnCuDGzSDS1bwoUoTIwMDEuMCwGA1UEAxMlaHR0cDovL2FjY2Vz
-bm90by5kZWJvZWNrc3VwZXJpZXVyLmNvbYIQcCffsQu+QppGk8fmt9tu8zAJBgUr
-DgMCHQUAA4IBAQCRN4UHa2BT1eCNp2DEItK6fo6hy01olz6rdod7n1otcE2ZpBXa
-SdPoUsCLChLct/kc3G7UDjN+RGPU9lbkbBeRXGM6Bh1x2WCI06yMbvTn19amhtLb
-jddJYUKpfyObtw0xzVUtcyMu61Zs//nWPmj84A+JALic8ayN9UfKTP9q1KK/GZwc
-AUgH/i8Unj7LErN6gpwIJhh1fT7Y2o91XHMX6rIWSiz6sPX0uGzbmKTNoWpTEQ1p
-aYokMrO/zaJasorhJxzIsEBAeu5j6fgK0EDZfm6t1LJlRN95kXYOPEL4MDvMjWBn
-kb+1yGp1iVZqYSoJbQciM6hqlGjMEm4kllZC
-
-					    </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>
-					      MIIDRzCCAjOgAwIBAgIQcCffsQu+QppGk8fmt9tu8zAJBgUrDgMCHQUAMDAxLjAs
-BgNVBAMTJWh0dHA6Ly9hY2Nlc25vdG8uZGVib2Vja3N1cGVyaWV1ci5jb20wHhcN
-MTQxMjA5MTIzNTUwWhcNMzkxMjMxMjM1OTU5WjAwMS4wLAYDVQQDEyVodHRwOi8v
-YWNjZXNub3RvLmRlYm9lY2tzdXBlcmlldXIuY29tMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAsM8i9y0yvzOg2yXRsWRNI40R190pMoTeRhVzgTN1fsqJ
-v4J4HjvPfhR3njwpYejcsbBnxgs1G/CqIUjqAcJ3J4QluT3a9jNrXCZcdwR5eiUk
-fHciFJvH0tjA0/JkWRRfWGUI58bn5y+z5lgXsLuk6dDoKQczzlof/EBke4qbZP4j
-WISy+DCL1PurXCbVgr4oUZG/aXF4yYZwIaOPGDDe2wfpEpB/5SSSHr1SATmO33Rm
-w3cLnLjAU42reiuyoA68FlakbNoa7Am57QGmsyw/GL9g4c/1cmmioUHXodgsNwHv
-Ad0WZQ2DPMwZUFTTTL6SDw/L4a5YXfGEQJVFYO1inQIDAQABo2UwYzBhBgNVHQEE
-WjBYgBBcuwvkChnCuDGzSDS1bwoUoTIwMDEuMCwGA1UEAxMlaHR0cDovL2FjY2Vz
-bm90by5kZWJvZWNrc3VwZXJpZXVyLmNvbYIQcCffsQu+QppGk8fmt9tu8zAJBgUr
-DgMCHQUAA4IBAQCRN4UHa2BT1eCNp2DEItK6fo6hy01olz6rdod7n1otcE2ZpBXa
-SdPoUsCLChLct/kc3G7UDjN+RGPU9lbkbBeRXGM6Bh1x2WCI06yMbvTn19amhtLb
-jddJYUKpfyObtw0xzVUtcyMu61Zs//nWPmj84A+JALic8ayN9UfKTP9q1KK/GZwc
-AUgH/i8Unj7LErN6gpwIJhh1fT7Y2o91XHMX6rIWSiz6sPX0uGzbmKTNoWpTEQ1p
-aYokMrO/zaJasorhJxzIsEBAeu5j6fgK0EDZfm6t1LJlRN95kXYOPEL4MDvMjWBn
-kb+1yGp1iVZqYSoJbQciM6hqlGjMEm4kllZC
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://accesnoto.deboecksuperieur.com/Security/Renater/AssertionConsumerService.aspx" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">De Boeck Supérieur License Desk</md:ServiceName>
-      <md:ServiceName xml:lang="en">De Boeck Supérieur License Desk</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Environnement sur lequel les clients de Noto et NotoBib peuvent utiliser les ressources éducatives de De Boeck Supérieur</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Environment on which Noto and NotoBib customers can use educational resources of De Boeck Supérieur</md:ServiceDescription>
-      <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="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="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="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"/>
-      <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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">DE BOECK SUPERIEUR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">DE BOECK SUPERIEUR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://deboeck.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>David Daenekint</md:SurName>
-    <md:EmailAddress>David.Daenekint@deboeck.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Roland Leijten</md:SurName>
-    <md:EmailAddress>role@threeships.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access-check.edugain.org-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/access-check.edugain.org-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 2d71151b..00000000
--- a/swamid-interfederations-2.0/access-check.edugain.org-simplesaml-saml2-idp-metadata.php.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://access-check.edugain.org/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-01-30T15:32:58Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</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">access-check.edugain.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">eduGAIN Access Check</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABbUlEQVQoz52RPW4UQRCFv6ru6fnZNSxCJuVKpFwAicR3IUI+AakvhQhI7JU8M/1T3QQzsg1sAhWV3qtPVaonfPrCX9W+fpTP3y7otzceGJKJxCiujpVUkCv0+m3K967hixUfWgWSHwAPxG6UqtIFbEFHGoCqR721BX+wirO8LVGg+a6amEXXjqxhM5ZxNFPvX1Odocn5ZwB7HCn4hWI42wxD6KWUBVfIZxXd9J2zNhHFmro2Gx3QPKSReGCiV40ESM/A1NcxTDnn7HvLFViXBRZ6MKJnmwaktca/lFzO4fZG7n5e0D9cK4DjFI69yrGbwvhqP7KWp7kR99QrQAn3cW5N5/SQ1rivDgdUCUegFfkDkKF26TG7FijzZoS0sM7kM7D6gncvgG5d7cEdu6wN+v3R/cRwQgaAdnA2vACQvn9Tk6NNqjtwjis1Iyp4JOpafwvu3ZAYa3TV2fBjBnjfe8uLKErOZLk6fU//lcMvhuSrh7MzMwcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MTErMDI6MDCDfj0WAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjExKzAyOjAw8iOFqgAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">eduGAIN Access Check allows administrators of a Service Provider (SP) registered in eduGAIN to create test accounts with different profiles to validate the behaviour and test federated login. The test accounts can only be used to access own services.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">eduGAIN Access Check</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">eduGAIN Access Check allows administrators of a Service Provider (SP) registered in eduGAIN to create test accounts with different profiles to validate the behaviour and test federated login. The test accounts can only be used to access own services.</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>
-					      MIID2zCCAsOgAwIBAgIJAJpdV2MFitUqMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
-VQQGEwJGUjEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5MQ4wDAYDVQQKDAVHRUFOVDEd
-MBsGA1UEAwwUdGVzdC1pZHAuZWR1Z2Fpbi5vcmcxLjAsBgkqhkiG9w0BCQEWH3Rl
-c3RpZHBhY2NvdW50bWFuYWdlckBnZWFudC5uZXQwHhcNMTQxMjE4MTAxODU5WhcN
-MjQxMjE3MTAxODU5WjCBgzELMAkGA1UEBhMCRlIxFTATBgNVBAcMDERlZmF1bHQg
-Q2l0eTEOMAwGA1UECgwFR0VBTlQxHTAbBgNVBAMMFHRlc3QtaWRwLmVkdWdhaW4u
-b3JnMS4wLAYJKoZIhvcNAQkBFh90ZXN0aWRwYWNjb3VudG1hbmFnZXJAZ2VhbnQu
-bmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo48FFP0P/81e3WHb
-U91F/TYDZC/JypEqO2XQNH50baXpk2JrJFVFOWdgdK6qWHsLznuxngRsfOasAaVA
-Ob1Bf3g2xgPUd2htSLxds+o/Y24DOM6ZairxbWJk2rOvLhJFchlrcNWCpMtUCkfJ
-xmqGmeo93XAud5byj3wQ1NuH2o8rjTPAkMgQdr8D2b8EG1NYEH00AqRlXZTFCWGL
-KDEuZwyta6vgMQYT4K6UF/F+HWF2wzbmVgRTHguJ0rzNqz6t+9CtLkhyZO+/57Ro
-4U0ikshVWkUOENPKCnB1t+ebs/AsNozbIGA/HcdtwUwDgIowv/K0hdnLDC1vz6/S
-F3rnGQIDAQABo1AwTjAdBgNVHQ4EFgQUgWN9jmJxOEHYU5m8D0atl895HxowHwYD
-VR0jBBgwFoAUgWN9jmJxOEHYU5m8D0atl895HxowDAYDVR0TBAUwAwEB/zANBgkq
-hkiG9w0BAQUFAAOCAQEAXvlBHMaBK6m0PQNanTqGBRdRAFt8Xkr5texD5mPTmS/7
-nqnxlN0orqYWGCaARmQE+T77EB2a2n9g2s130pUXwJxcbUwIOdPKH6CMKEHT/512
-bndJXQ3DyhkuVSLtRFOdfleIhi8qUkNC9FWxM4jDHDTTQtNEHnCjFxlhxw+ri5QJ
-AVKpH9MkcuIkM6Jx+QhNwTDwCRIJffoDOH420yR5EWx/sQ4tjKQGiFOPv/WHFjXd
-LqHU+X8ErzxeNmUHHST6pHePWRCMtoPTdCPhEroJhou6NMHh8ylQOIVHt6gggc7r
-kUWMUybDUxPp49qMeNkdKqFPby2aW7ouKRoOXuxZhg==
-					    </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://access-check.edugain.org/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">eduGAIN Access Check</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">eduGAIN Access Check</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>edugain-integration@geant.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index ec84bd4c..00000000
--- a/swamid-interfederations-2.0/access.hro.nl-simplesaml-saml2-idp-metadata.php.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://access.hro.nl/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-12-05T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Hogeschool Rotterdam</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Rotterdam University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hogeschool Rotterdam</mdui:Description>
-        <mdui:Description xml:lang="en">Hogeschool Rotterdam</mdui:Description>
-        <mdui:Logo height="75" width="75">https://static.surfconext.nl/logos/sp/hro-logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">hogeschool rotterdam university hro hbo</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">hogeschool rotterdam university hro hbo</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/080d16c1fde039152735783fffd2c0c2"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Hogeschool Rotterdam</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Rotterdam University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Hogeschool Rotterdam</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Rotterdam University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.hro.nl</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hro.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/access.lcb.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/access.lcb.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 7fc3d491..00000000
--- a/swamid-interfederations-2.0/access.lcb.ac.uk-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://access.lcb.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the Leeds College of Building.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">lcb.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEBDCCAuygAwIBAgIJAN9TCY4/UbHrMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
-						VQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRz
-						MSIwIAYDVQQKExlMZWVkcyBDb2xsZWdlIG9mIEJ1aWxkaW5nMQswCQYDVQQLEwJJ
-						VDEZMBcGA1UEAxMQYWNjZXNzLmxjYi5hYy51azAeFw0xNTEwMjYxMjM2NTNaFw0y
-						NTEwMjMxMjM2NTNaMIGCMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jr
-						c2hpcmUxDjAMBgNVBAcTBUxlZWRzMSIwIAYDVQQKExlMZWVkcyBDb2xsZWdlIG9m
-						IEJ1aWxkaW5nMQswCQYDVQQLEwJJVDEZMBcGA1UEAxMQYWNjZXNzLmxjYi5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJhPGIb8Ic803/i5gcez
-						RoBda2SRhO3OTa2/EJT4gV2wWpu8ZRtpHztDjGOIg7UugkPuYaf4gZYAEvxesV+Y
-						q7tMo2PrAsgKpB6ojEMRKF4mTrL9zXmmPaVlFvNtcO9rLZsTrx2YTOnEQhQZDXKf
-						TmFWOA9mcZTtsSVNorzXnzl9bbJ60z/J3WHgOe4CaySoB0XkZAuWz6rlPcNxiva+
-						1mhuH/1L1VpjNikm1jbrPd3mOdtrXyV/pvsRtQSPIIwjJNH9tNxB0VUwnNMTBp0p
-						EaVyD7YuuDtgTdTucXk9UAX2q5r1KcjDqUXzeKaqZaOW2DN1HJGGVSB32iUddUwq
-						lUMCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
-						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFJA+9GMp9gH9Aci+LoESpsYx
-						iK28MB8GA1UdIwQYMBaAFJA+9GMp9gH9Aci+LoESpsYxiK28MA0GCSqGSIb3DQEB
-						CwUAA4IBAQCB+A+aczQV7nH16EGXoHX7mp53MhDaedNxby8/OvA0QPdmbswUzlFk
-						kjTm586LHBVmHRl2T6O/frWa+Gj9a5JHZpPOPbfqX/cXukMxPPTowovaMCZpVt+M
-						z3RGgVZM+bC/tG/6uRW8uqx+G15HmPPuaPGurm270PGMaCrZyeLsQFy7O49KiGPB
-						atsdksWwCGMFwEZTBq1C8evMcXJsX+jXG2aJelmdzTXF3pgwk/xFEva/WRyTFJzw
-						wk9lJCd1E74ji6tYtVoFwsuyjSfAVHFBXW1A4uzzFcZXOHVNtnJC3mb+FbtD4l9S
-						vjXcKCtem5JD2o4TAAjWFrb9l5ZJZvZq
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://access.lcb.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.lcb.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://access.lcb.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.lcb.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://access.lcb.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.lcb.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">lcb.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEBDCCAuygAwIBAgIJAN9TCY4/UbHrMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
-						VQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRz
-						MSIwIAYDVQQKExlMZWVkcyBDb2xsZWdlIG9mIEJ1aWxkaW5nMQswCQYDVQQLEwJJ
-						VDEZMBcGA1UEAxMQYWNjZXNzLmxjYi5hYy51azAeFw0xNTEwMjYxMjM2NTNaFw0y
-						NTEwMjMxMjM2NTNaMIGCMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jr
-						c2hpcmUxDjAMBgNVBAcTBUxlZWRzMSIwIAYDVQQKExlMZWVkcyBDb2xsZWdlIG9m
-						IEJ1aWxkaW5nMQswCQYDVQQLEwJJVDEZMBcGA1UEAxMQYWNjZXNzLmxjYi5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJhPGIb8Ic803/i5gcez
-						RoBda2SRhO3OTa2/EJT4gV2wWpu8ZRtpHztDjGOIg7UugkPuYaf4gZYAEvxesV+Y
-						q7tMo2PrAsgKpB6ojEMRKF4mTrL9zXmmPaVlFvNtcO9rLZsTrx2YTOnEQhQZDXKf
-						TmFWOA9mcZTtsSVNorzXnzl9bbJ60z/J3WHgOe4CaySoB0XkZAuWz6rlPcNxiva+
-						1mhuH/1L1VpjNikm1jbrPd3mOdtrXyV/pvsRtQSPIIwjJNH9tNxB0VUwnNMTBp0p
-						EaVyD7YuuDtgTdTucXk9UAX2q5r1KcjDqUXzeKaqZaOW2DN1HJGGVSB32iUddUwq
-						lUMCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
-						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFJA+9GMp9gH9Aci+LoESpsYx
-						iK28MB8GA1UdIwQYMBaAFJA+9GMp9gH9Aci+LoESpsYxiK28MA0GCSqGSIb3DQEB
-						CwUAA4IBAQCB+A+aczQV7nH16EGXoHX7mp53MhDaedNxby8/OvA0QPdmbswUzlFk
-						kjTm586LHBVmHRl2T6O/frWa+Gj9a5JHZpPOPbfqX/cXukMxPPTowovaMCZpVt+M
-						z3RGgVZM+bC/tG/6uRW8uqx+G15HmPPuaPGurm270PGMaCrZyeLsQFy7O49KiGPB
-						atsdksWwCGMFwEZTBq1C8evMcXJsX+jXG2aJelmdzTXF3pgwk/xFEva/WRyTFJzw
-						wk9lJCd1E74ji6tYtVoFwsuyjSfAVHFBXW1A4uzzFcZXOHVNtnJC3mb+FbtD4l9S
-						vjXcKCtem5JD2o4TAAjWFrb9l5ZJZvZq
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://access.lcb.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.lcb.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">Leeds College of Building</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds College of Building</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lcb.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Anne-Mary</GivenName>
-    <SurName>Inglehearn</SurName>
-    <EmailAddress>mailto:AInglehearn@lcb.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Grimley</SurName>
-    <EmailAddress>mailto:cgrimley@lcb.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index acff96c2..00000000
--- a/swamid-interfederations-2.0/access.procureweb.ac.uk-shibboleth-sp.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://access.procureweb.ac.uk/shibboleth-sp">
-  <!--
-		This is a "JISC Procureweb" Shibboleth 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"/>
-  </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://access.procureweb.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">JISC Services Management Company Ltd: JISC Procureweb</mdui:DisplayName>
-        <mdui:Description xml:lang="en">JISC Procureweb, a procurement support service for the UK Higher and Further Education sectors</mdui:Description>
-        <mdui:Logo height="128" width="233">https://www.procureweb.ac.uk/images/Procureweb_Logo2.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJALUgGF9qVwMgMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXAyazh3ZWIwMi5hZC5jZi5hYy51azAeFw0xMjAxMDgyMjExNTVaFw0yMjAx
-						MDUyMjExNTVaMCAxHjAcBgNVBAMTFXAyazh3ZWIwMi5hZC5jZi5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdar5W/cmwUfVkTxd7A+hTRpt6f
-						Cdfd++/ZeyGdBr49/t1T+zceln6arQYtbylxr/myZ5Lt2QdyFymwiaxmcIt46m9E
-						428hqMeL2DWctMa0ZhxJ374dDasiRFFxUXLb8gq0X7rxo0IKynCoVCgqdefKzxzp
-						I/fK4WlWY0jQ+OqIJ8Teulbu3807t4o09g2H6qS0AhYkRfZjVqBuqkg7t8lYd+yV
-						iwbEBuhKpLVZ6w0tEjrMDma2kOiycvdKt+5rZ0rsgOTRfJLye8lQeBOU66edLJd1
-						Rxbm80loSvgE0T0JzUiVmwnyA4H/JRqKfUtlAQThfOaTGwkgFc1YOGUfPwMCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVcDJrOHdlYjAyLmFkLmNmLmFjLnVrMB0GA1UdDgQW
-						BBRZEluMzvKX1J4CK2+K3V/K/FMvZjANBgkqhkiG9w0BAQUFAAOCAQEAUh2P7oiy
-						aNVsQc1ACkTQWKhfVFjVDSnS6POLwHOhRmEt6DnHbcNUFchQjw0WBAkzQnLed6FI
-						ZPbPzzohHqRiKTViIxfDbdl1E0iVdjDEV/WE0PzM4KbNsXWSSMkAU8hXsqZAvtMF
-						pCFKNbAKLGG1JksIU57qgOe7cRU1FU3rGmXugZHZ//c/iZf+MeuKYx6sUzbI0xts
-						uoudJ6z3NkV+KE9+m/i50kK8cKPdneTYAd6qZTIbwgwNusopNJb4oIp2Xx43r8jW
-						FUk/hEL49V7l1jwcR2T49iaBVn1jfVs/0GJaEvDgWk+NcqV159JezhyejHnTnQv1
-						BWKhfx7wG1mJNg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.procureweb.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://access.procureweb.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Services Management Company Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">JISC Services Management Company Ltd: JISC Procureweb</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.procureweb.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nathan</GivenName>
-    <SurName>Skidmore</SurName>
-    <EmailAddress>mailto:nathan@procureweb.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Joe</GivenName>
-    <SurName>Wells</SurName>
-    <EmailAddress>mailto:joe@procureweb.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access.research.cchmc.org-fed-idp-metadata.xml b/swamid-interfederations-2.0/access.research.cchmc.org-fed-idp-metadata.xml
deleted file mode 100644
index 3d121fca..00000000
--- a/swamid-interfederations-2.0/access.research.cchmc.org-fed-idp-metadata.xml
+++ /dev/null
@@ -1,103 +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://access.research.cchmc.org/fed/idp/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login.research.cchmc.org/pub/apperror.aspx" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cchmc.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cincinnati Children's Hospital Medical Center</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CCHMC Research IdP</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>
-MIIFPTCCBCWgAwIBAgIETBdK3DANBgkqhkiG9w0BAQUFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9ycGEgaXMgaW5jb3Jw
-b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDkgRW50cnVzdCwgSW5jLjE7MDkG
-A1UEAxMyRW50cnVzdCBDb2RlIFNpZ25pbmcgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBMMUQw
-HhcNMTMwNjEwMTk0NDI1WhcNMTQwNjMwMDc0NDM2WjCBnzELMAkGA1UEBhMCVVMxDTALBgNVBAgT
-BE9oaW8xEzARBgNVBAcTCkNpbmNpbm5hdGkxNTAzBgNVBAoTLENpbmNpbm5hdGkgQ2hpbGRyZW5z
-IEhvc3BpdGFsIE1lZGljYWwgQ2VudGVyMTUwMwYDVQQDEyxDaW5jaW5uYXRpIENoaWxkcmVucyBI
-b3NwaXRhbCBNZWRpY2FsIENlbnRlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIRO
-zOV9JMKwCjIsTFSaYEEorabOzaZXQJnzvZp2zgyYus89/vQXumsvr0PAPFmtgu+WbrR0OHFdp1me
-/att8Lkutfw+nin/YXYfSp+H7l39XCleOYXX3XQixPfcby+Bp9jAjEakOoPAr4KQERpXee1GwLLk
-G5qNRVn+H3seajrofshWc7dU6cgP+6+9dpQ9NVFdl2zaOsqE77uEFNqHzKZtuNykPTABqWikGupW
-xmNAlJAuD7kdgQHBz3hffZYOwzu/kh/pY6XpsTqD3tPayjhvL3oGcOxzXeeS6Ch03TdIjhM4pHuT
-8dz7Pyn0YsjjPhVDbzKdYrqojGExORmkcTMCAwEAAaOCAV4wggFaMA4GA1UdDwEB/wQEAwIHgDAf
-BgNVHSUEGDAWBggrBgEFBQcDAwYKKwYBBAGCNz0BATBkBggrBgEFBQcBAQRYMFYwIwYIKwYBBQUH
-MAGGF2h0dHA6Ly9vY3NwLmVudHJ1c3QubmV0MC8GCCsGAQUFBzAChiNodHRwOi8vYWlhLmVudHJ1
-c3QubmV0L2wxZC0yMDQ4LmNlcjAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3JsLmVudHJ1c3Qu
-bmV0L2xldmVsMWQuY3JsMEEGA1UdIAQ6MDgwNgYKYIZIAYb6bAoBAzAoMCYGCCsGAQUFBwIBFhpo
-dHRwOi8vd3d3LmVudHJ1c3QubmV0L3JwYTAfBgNVHSMEGDAWgBSnsarEtgbt3cqfiJSWgtXnQ0HR
-JTAdBgNVHQ4EFgQU2Asl48HJ2O4g7gNaVe8GdHpnVrYwCQYDVR0TBAIwADANBgkqhkiG9w0BAQUF
-AAOCAQEADtUd+I+2XSN7Lxb/0lp8ARaL00kiHvHqpVq+LHY0/f8kzS+7SD96u6PclSiRebKfbDDp
-exYh1IUbjEzZOLisbPTNbs18Pt+kbSaiJ1DK+iqLpCKKhdoL+jjwNw2BvwOrpmL5PA1gGrot8GSh
-g1DuDcr7unOCmg0fsAKPcf+hOIw1cVR1Mi/li8+NRaX1AmXrWysFaHz/C9F6NCXbZpmjjRZlWRfr
-oVfuotaTX1W6FtNXZvxdKJ9ykGe/3fIO6kx82ny3eIvRBQsoMXHJYiLpCCIUtnKryMJGRtlJEisp
-dC3e/ZXZOOacpIz/UiVsFps47ssasggHSCoxYljjm33nFA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.research.cchmc.org/fed/idp/soap" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.research.cchmc.org/fed/idp/samlv20"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.research.cchmc.org/fed/idp/samlv20"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.research.cchmc.org/fed/idp/samlv20"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cchmc.org</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFPTCCBCWgAwIBAgIETBdK3DANBgkqhkiG9w0BAQUFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
-BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9ycGEgaXMgaW5jb3Jw
-b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDkgRW50cnVzdCwgSW5jLjE7MDkG
-A1UEAxMyRW50cnVzdCBDb2RlIFNpZ25pbmcgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBMMUQw
-HhcNMTMwNjEwMTk0NDI1WhcNMTQwNjMwMDc0NDM2WjCBnzELMAkGA1UEBhMCVVMxDTALBgNVBAgT
-BE9oaW8xEzARBgNVBAcTCkNpbmNpbm5hdGkxNTAzBgNVBAoTLENpbmNpbm5hdGkgQ2hpbGRyZW5z
-IEhvc3BpdGFsIE1lZGljYWwgQ2VudGVyMTUwMwYDVQQDEyxDaW5jaW5uYXRpIENoaWxkcmVucyBI
-b3NwaXRhbCBNZWRpY2FsIENlbnRlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIRO
-zOV9JMKwCjIsTFSaYEEorabOzaZXQJnzvZp2zgyYus89/vQXumsvr0PAPFmtgu+WbrR0OHFdp1me
-/att8Lkutfw+nin/YXYfSp+H7l39XCleOYXX3XQixPfcby+Bp9jAjEakOoPAr4KQERpXee1GwLLk
-G5qNRVn+H3seajrofshWc7dU6cgP+6+9dpQ9NVFdl2zaOsqE77uEFNqHzKZtuNykPTABqWikGupW
-xmNAlJAuD7kdgQHBz3hffZYOwzu/kh/pY6XpsTqD3tPayjhvL3oGcOxzXeeS6Ch03TdIjhM4pHuT
-8dz7Pyn0YsjjPhVDbzKdYrqojGExORmkcTMCAwEAAaOCAV4wggFaMA4GA1UdDwEB/wQEAwIHgDAf
-BgNVHSUEGDAWBggrBgEFBQcDAwYKKwYBBAGCNz0BATBkBggrBgEFBQcBAQRYMFYwIwYIKwYBBQUH
-MAGGF2h0dHA6Ly9vY3NwLmVudHJ1c3QubmV0MC8GCCsGAQUFBzAChiNodHRwOi8vYWlhLmVudHJ1
-c3QubmV0L2wxZC0yMDQ4LmNlcjAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3JsLmVudHJ1c3Qu
-bmV0L2xldmVsMWQuY3JsMEEGA1UdIAQ6MDgwNgYKYIZIAYb6bAoBAzAoMCYGCCsGAQUFBwIBFhpo
-dHRwOi8vd3d3LmVudHJ1c3QubmV0L3JwYTAfBgNVHSMEGDAWgBSnsarEtgbt3cqfiJSWgtXnQ0HR
-JTAdBgNVHQ4EFgQU2Asl48HJ2O4g7gNaVe8GdHpnVrYwCQYDVR0TBAIwADANBgkqhkiG9w0BAQUF
-AAOCAQEADtUd+I+2XSN7Lxb/0lp8ARaL00kiHvHqpVq+LHY0/f8kzS+7SD96u6PclSiRebKfbDDp
-exYh1IUbjEzZOLisbPTNbs18Pt+kbSaiJ1DK+iqLpCKKhdoL+jjwNw2BvwOrpmL5PA1gGrot8GSh
-g1DuDcr7unOCmg0fsAKPcf+hOIw1cVR1Mi/li8+NRaX1AmXrWysFaHz/C9F6NCXbZpmjjRZlWRfr
-oVfuotaTX1W6FtNXZvxdKJ9ykGe/3fIO6kx82ny3eIvRBQsoMXHJYiLpCCIUtnKryMJGRtlJEisp
-dC3e/ZXZOOacpIz/UiVsFps47ssasggHSCoxYljjm33nFA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.research.cchmc.org/fed/idp/soap"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cincinnati Children's Hospital Medical Center</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cincinnati Children's Hospital Medical Center</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cincinnatichildrens.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Nicholas Hunt</md:GivenName>
-    <md:EmailAddress>nicholas.hunt@cchmc.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access.sant.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/access.sant.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index fd87d7ee..00000000
--- a/swamid-interfederations-2.0/access.sant.ox.ac.uk-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://access.sant.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for University of Oxford.
-	-->
-  <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-08-16T15:23:12Z"/>
-  </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://access.sant.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIJANvcUw2O9TNGMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGFjY2Vzcy5zYW50Lm94LmFjLnVrMB4XDTEzMDgxNjEwMTE0NloXDTIzMDgx
-						NDEwMTE0NlowHzEdMBsGA1UEAxMUYWNjZXNzLnNhbnQub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8k37VXOb/igIX3TqAUobawXKN4wUo
-						cVcXuIFPkHw1jzOEGGESVIIHuPf+mo2lzGtxm+Kf+81knq/DpW8umDVLfvCBvTWi
-						3n4Qw35+a/cjPBszryWveZHvf5h2qFJk0KzjZpJ/QyA7toE9Gyc2WJ5CeHpSZZ5F
-						oPMjagFRbjnR49o+P9dkK607UYXZrz7XWRN+c2Yoqz1Q5TsClsr3HT1qz1ot4WpK
-						WiA3LNmgTVhgbm06zBaVi8y8szX9fbN0vji+Pr6I/EHrYkh2tJ6TXCiKdGGoO+LE
-						yZJ7zn6aI6F7lu9JCbmDd/VmG/AwDj24cZznDkRqSbxQ+JideHuXVf3FAgMBAAGj
-						azBpMEgGA1UdEQRBMD+CFGFjY2Vzcy5zYW50Lm94LmFjLnVrhidodHRwczovL2Fj
-						Y2Vzcy5zYW50Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFGFeAxbCijMU
-						19VYtZMdljIy+tedMA0GCSqGSIb3DQEBBQUAA4IBAQChVmsTgMZUkNrCV/JUVlPH
-						lZmbHqbc0hWh2YrWT/qCo+Ct/cwaQp/OaLQ9oLQk05JEUBxK+RN2/6orVEpOBxvP
-						75f9G/7dMvshoXIMeJkudKkoaYFJh4yszHMRPCXOqDNp0BiGnQhedXOd0onD0leV
-						j44Q8kW9yOB8sgNBfQW0cIMtcz2SYcUlITeNfQrHibqHpjzLULDAtaQSekU1lYW0
-						wPHLRtw00ncAVwiZN8LcZUglmMucv82zPkMRBnlTn8ctkvBPEe9RXiw9CEXt1XB7
-						0G31ZiVCVRY5N6kENKrC4emYwjwGTJEIAWNZk0+/BH7bO429hQNFenhvhTgonegF
-					</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://access.sant.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://access.sant.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, St Antony's College NAC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sant.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>St Antony's College IT Support</GivenName>
-    <EmailAddress>mailto:it-support@sant.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Christopher</GivenName>
-    <SurName>Hoskin</SurName>
-    <EmailAddress>mailto:christopher.hoskin@sant.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/access.wigan-leigh.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/access.wigan-leigh.ac.uk-oala-metadata.xml
deleted file mode 100644
index b8ca4265..00000000
--- a/swamid-interfederations-2.0/access.wigan-leigh.ac.uk-oala-metadata.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://access.wigan-leigh.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Wigan & Leigh College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-17T18:09:30Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">wigan-leigh.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDrzCCApegAwIBAgIJAP1hnrR7xnq9MA0GCSqGSIb3DQEBBQUAMEMxHjAcBgNV
-						BAoMFVdpZ2FuICYgTGVpZ2ggQ29sbGVnZTEhMB8GA1UEAxMYYWNjZXNzLndpZ2Fu
-						LWxlaWdoLmFjLnVrMB4XDTExMTEyOTE0MTYzOVoXDTIxMTEyNjE0MTYzOVowQzEe
-						MBwGA1UECgwVV2lnYW4gJiBMZWlnaCBDb2xsZWdlMSEwHwYDVQQDExhhY2Nlc3Mu
-						d2lnYW4tbGVpZ2guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC6QW6py7ewUg2xeF0DDyZEoQbF5FGK4aaTpNUIgruhXkT1kkBQx4/3CWNYN7Sy
-						J5zZzL85S42jX+R6ZpLFKLXZWRn0vMZkHfsAoBbE9DBu7EAS7GPHy+QzQ9nLOnT3
-						Tn2W4LB6v4ysmY4XQRqnk1ftLUJgsjiacJ36+cSVpJmsgRWYCVpQ0E/W5WRUnO0Q
-						Q9Hl5kj3uHo2c+oD3syu0YiLmoeDU8dOzcfCwrgB+y5EQ3tYxskRZmxMNEB76g5/
-						A5nz5HY0eMyIgc4HPsFNTNCZKzPx2RvVnxtvJFf1u6tziU5d9xIPptwLHA6Ljt/4
-						we1xqSZWQUwYvFhg6KDcYn+dAgMBAAGjgaUwgaIwHQYDVR0OBBYEFJliefRZwjmv
-						Ud7SvS1grr1Hw0/yMHMGA1UdIwRsMGqAFJliefRZwjmvUd7SvS1grr1Hw0/yoUek
-						RTBDMR4wHAYDVQQKDBVXaWdhbiAmIExlaWdoIENvbGxlZ2UxITAfBgNVBAMTGGFj
-						Y2Vzcy53aWdhbi1sZWlnaC5hYy51a4IJAP1hnrR7xnq9MAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQEFBQADggEBABegtgKN+GXn4YH45KPg0LV3+JWXOvstp/DjvP9E
-						sWyLu8Oky2stpykPFIi75LKilSR9JaVAGVuOUATp7i8YpxOlEI07yyR7TTCvswLc
-						O5/XnV+ASpnnedAjSKwGb0DYRi6uiPD+NvCUyugp8kY9JT4uqairyOqrZcQBOhGu
-						3A2StwhfBUAmLiCs9/QLLe8vDiMz18rBA6k50NQHAo0uudsq4NNC4jmhwFjrPQuK
-						xuuv1aUDSSlQzhhLu0jCC+7TQRXm6Kj3TCdjIaSFyO0XCC/EPjkcBPpIvsq9hWLG
-						ZyqGxjHf9L6xy9iMR9HUdmPg+ajohCQYHHGiubPT1YvWKqk=
-					</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>
-						MIIDrzCCApegAwIBAgIJAP1hnrR7xnq9MA0GCSqGSIb3DQEBBQUAMEMxHjAcBgNV
-						BAoMFVdpZ2FuICYgTGVpZ2ggQ29sbGVnZTEhMB8GA1UEAxMYYWNjZXNzLndpZ2Fu
-						LWxlaWdoLmFjLnVrMB4XDTExMTEyOTE0MTYzOVoXDTIxMTEyNjE0MTYzOVowQzEe
-						MBwGA1UECgwVV2lnYW4gJiBMZWlnaCBDb2xsZWdlMSEwHwYDVQQDExhhY2Nlc3Mu
-						d2lnYW4tbGVpZ2guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC6QW6py7ewUg2xeF0DDyZEoQbF5FGK4aaTpNUIgruhXkT1kkBQx4/3CWNYN7Sy
-						J5zZzL85S42jX+R6ZpLFKLXZWRn0vMZkHfsAoBbE9DBu7EAS7GPHy+QzQ9nLOnT3
-						Tn2W4LB6v4ysmY4XQRqnk1ftLUJgsjiacJ36+cSVpJmsgRWYCVpQ0E/W5WRUnO0Q
-						Q9Hl5kj3uHo2c+oD3syu0YiLmoeDU8dOzcfCwrgB+y5EQ3tYxskRZmxMNEB76g5/
-						A5nz5HY0eMyIgc4HPsFNTNCZKzPx2RvVnxtvJFf1u6tziU5d9xIPptwLHA6Ljt/4
-						we1xqSZWQUwYvFhg6KDcYn+dAgMBAAGjgaUwgaIwHQYDVR0OBBYEFJliefRZwjmv
-						Ud7SvS1grr1Hw0/yMHMGA1UdIwRsMGqAFJliefRZwjmvUd7SvS1grr1Hw0/yoUek
-						RTBDMR4wHAYDVQQKDBVXaWdhbiAmIExlaWdoIENvbGxlZ2UxITAfBgNVBAMTGGFj
-						Y2Vzcy53aWdhbi1sZWlnaC5hYy51a4IJAP1hnrR7xnq9MAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQEFBQADggEBABegtgKN+GXn4YH45KPg0LV3+JWXOvstp/DjvP9E
-						sWyLu8Oky2stpykPFIi75LKilSR9JaVAGVuOUATp7i8YpxOlEI07yyR7TTCvswLc
-						O5/XnV+ASpnnedAjSKwGb0DYRi6uiPD+NvCUyugp8kY9JT4uqairyOqrZcQBOhGu
-						3A2StwhfBUAmLiCs9/QLLe8vDiMz18rBA6k50NQHAo0uudsq4NNC4jmhwFjrPQuK
-						xuuv1aUDSSlQzhhLu0jCC+7TQRXm6Kj3TCdjIaSFyO0XCC/EPjkcBPpIvsq9hWLG
-						ZyqGxjHf9L6xy9iMR9HUdmPg+ajohCQYHHGiubPT1YvWKqk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://access.wigan-leigh.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://access.wigan-leigh.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Wigan &amp; Leigh College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Wigan &amp; Leigh College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wigan-leigh.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Unsworth</SurName>
-    <EmailAddress>mailto:a.unsworth@wigan-leigh.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Parr</SurName>
-    <EmailAddress>mailto:i.parr@wigan-leigh.ac.uk</EmailAddress>
-  </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 3803cb2c..00000000
--- a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://accounts.okeanos-global.grnet.gr/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">~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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDXjCCAkagAwIBAgIJALdDvdhEnhRcMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
-                            BAMTIGFjY291bnRzLm9rZWFub3MtZ2xvYmFsLmdybmV0LmdyMB4XDTE1MDYxOTA3
-                            NTY1M1oXDTIwMDYxNzA3NTY1M1owKzEpMCcGA1UEAxMgYWNjb3VudHMub2tlYW5v
-                            cy1nbG9iYWwuZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-                            AQC0xbBb9rChakAvhPTNAXnXQ0sR7/FuJ0NT4ymArigL97gBhMGZiJyzr9Gxg5CE
-                            eWxYFhwilMwjsM5uAq44TvUTvcU19nbSuCSCFVvhyoAHROiFz0KdbUpgBgo6nLDr
-                            C/ciizlrEQGVkb7Va1VgOSPHLAWZlrqy4FyR/f9D41nkvpkA8CGJiJdhJwqIjg1s
-                            xcNPOIjZ9x2TZKGZCQfj8RgLCTJaBVXDdyLosv5pednzhN3rF/YpP+zcTjWEjJOA
-                            6pXnyRVF9Y+OvARgJGMdrW3gGRr18e157qYThY1TbLZNkzhhnmg0Rl9TK9J08H8s
-                            BkASvnL0dQeTStD3VLQQQVhxAgMBAAGjgYQwgYEwYAYDVR0RBFkwV4IgYWNjb3Vu
-                            dHMub2tlYW5vcy1nbG9iYWwuZ3JuZXQuZ3KGM2h0dHBzOi8vYWNjb3VudHMub2tl
-                            YW5vcy1nbG9iYWwuZ3JuZXQuZ3Ivc2hpYmJvbGV0aDAdBgNVHQ4EFgQUBLoZ0aoZ
-                            hk1NEA53ZwSGPrufegswDQYJKoZIhvcNAQEFBQADggEBAGtAjIJaY0D/9gREZUsb
-                            3U0/aRuFMX8juGx33iVsDGZV8JvWjIRHfjhOsCmHgnJhDaSb07UM3/p6IBfNr7A+
-                            vFxNfExraLuFSHbqFEtjT4Ofz9/Sq/DhsnFysSd9CWSAFnfJXTYXfIquKFH3WdeM
-                            Qk/6lMHGVfPuCl4Hi3IEbqBQLjGZZiMHonxkrwo9YEmRe5mVsL58zLy2KiRryhLF
-                            igXLWUwwdxUpoc9VC2Yl1gIHEFnYibQZSdpEl7u7I4RTNkvYTgWY8QzezRqxmtiy
-                            VUk4QGu0cvTqMR/tkI77j0LFvkvHW5t7k9U64BANFXURzKN/fk6SM4LBO3mlHNnx
-                            cPI=
-                            
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/NIM/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://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accounts.okeanos-global.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="en">~okeanos global</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">~okeanos global GRNET cloud services</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="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"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" 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="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" 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="givenName" Name="urn:mace:dir:attribute-def:givenName" 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="surname" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Greek Research and Technology Network</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-    <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:Company>Greek Research and Technology Network</md:Company>
-    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-    <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>~okeanos support</md:GivenName>
-    <md:EmailAddress>support@okeanos.grnet.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 7120498b..00000000
--- a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.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://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/acesso.ufabc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/acesso.ufabc.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 500a9858..00000000
--- a/swamid-interfederations-2.0/acesso.ufabc.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://acesso.ufabc.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFABC - Universidade Federal do ABC</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFABC - Universidade Federal do ABC</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFABC - Universidade Federal do ABC</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFABC - Universidade Federal do ABC</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufabc.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufabc.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEMDCCAxgCAQAwDQYJKoZIhvcNAQEFBQAwgd0xLDAqBgNVBAoTI1VGQUJDIC0g
-				VW5pdmVyc2lkYWRlIEZlZGVyYWwgZG8gQUJDMTEwLwYDVQQLEyhOVEkgLSBOdWNs
-				ZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMSUwIwYJKoZIhvcNAQkBFhZ3
-				ZWJtYXN0ZXJAdWZhYmMuZWR1LmJyMRQwEgYDVQQHEwtTYW50byBBbmRyZTESMBAG
-				A1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTYWNlc3NvLnVm
-				YWJjLmVkdS5icjAeFw0xNDEwMDYyMDAyMDFaFw0xNzEwMDUyMDAyMDFaMIHdMSww
-				KgYDVQQKEyNVRkFCQyAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFCQzExMC8G
-				A1UECxMoTlRJIC0gTnVjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEl
-				MCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQHVmYWJjLmVkdS5icjEUMBIGA1UEBxML
-				U2FudG8gQW5kcmUxEjAQBgNVBAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxHDAa
-				BgNVBAMTE2FjZXNzby51ZmFiYy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-				DwAwggEKAoIBAQC6mGtdNAUQx0I9sNxQdovn7t0/2USXnGKkw3kE9SOuyxq2b4/w
-				1F70EfFTDLi14Tu1U2GdaWhv1CksPhYF/MrmX5bdv2oykorrS+VTloxiVA/qWIPa
-				VdfHWSyLLa28kpQs39RtRVl1WgZ2acKYO48d0rWzm0NrRJ3gnm8W33d3VcDmQImQ
-				0/8HFYlF4SgAvOg5Pdywr8beFrNlSO2oZitc7turdF8cs2FoqHJ1Zb0hwDHbDTyp
-				D0cZoITbAdo3/JqYXM5eRh43Phvt/VjSuQy/haU3DbEfa5JMOsjad2k3WltaMluy
-				3FpD5sQAWqHzAXprcI3tkywJZkMbD/0BU3RTAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-				ggEBAJzEMvntE4fOAoqO18wZUhi7g1HZmHAzTtWLH+5YrvlcOIGRgEqe7g0j9eqU
-				z0Rm98+7LEwaCF+VshS125JNDmAjk2nbOUsJQ1GwtVo/hPrAsI9TZKkMftOqi+ga
-				zi2xUzSvhtE52kUIPm35PLVzKNDAQKGMgdQfcexhBjzBX7Ozt5h7hPaOutpR71t3
-				eTCiukdeCPU6k4+MzuUR1wAXBZUAqo+BOcrZE8/7YgGsUykaPS1YJyturDhgfq4U
-				V7x6Y5Rikv9YMJX2is1jMz31f8AOiDDliT7qLpmuhFX5Ub1TJiXuT3qfExNTh7Dj
-				9r2+SoV9gdVYdUvQjPmDt3ebeiM=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acesso.ufabc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://acesso.ufabc.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://acesso.ufabc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acesso.ufabc.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://acesso.ufabc.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://acesso.ufabc.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-				MIIEMDCCAxgCAQAwDQYJKoZIhvcNAQEFBQAwgd0xLDAqBgNVBAoTI1VGQUJDIC0g
-				VW5pdmVyc2lkYWRlIEZlZGVyYWwgZG8gQUJDMTEwLwYDVQQLEyhOVEkgLSBOdWNs
-				ZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMSUwIwYJKoZIhvcNAQkBFhZ3
-				ZWJtYXN0ZXJAdWZhYmMuZWR1LmJyMRQwEgYDVQQHEwtTYW50byBBbmRyZTESMBAG
-				A1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTYWNlc3NvLnVm
-				YWJjLmVkdS5icjAeFw0xNDEwMDYyMDAyMDFaFw0xNzEwMDUyMDAyMDFaMIHdMSww
-				KgYDVQQKEyNVRkFCQyAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFCQzExMC8G
-				A1UECxMoTlRJIC0gTnVjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEl
-				MCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQHVmYWJjLmVkdS5icjEUMBIGA1UEBxML
-				U2FudG8gQW5kcmUxEjAQBgNVBAgTCVNhbyBQYXVsbzELMAkGA1UEBhMCQlIxHDAa
-				BgNVBAMTE2FjZXNzby51ZmFiYy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-				DwAwggEKAoIBAQC6mGtdNAUQx0I9sNxQdovn7t0/2USXnGKkw3kE9SOuyxq2b4/w
-				1F70EfFTDLi14Tu1U2GdaWhv1CksPhYF/MrmX5bdv2oykorrS+VTloxiVA/qWIPa
-				VdfHWSyLLa28kpQs39RtRVl1WgZ2acKYO48d0rWzm0NrRJ3gnm8W33d3VcDmQImQ
-				0/8HFYlF4SgAvOg5Pdywr8beFrNlSO2oZitc7turdF8cs2FoqHJ1Zb0hwDHbDTyp
-				D0cZoITbAdo3/JqYXM5eRh43Phvt/VjSuQy/haU3DbEfa5JMOsjad2k3WltaMluy
-				3FpD5sQAWqHzAXprcI3tkywJZkMbD/0BU3RTAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-				ggEBAJzEMvntE4fOAoqO18wZUhi7g1HZmHAzTtWLH+5YrvlcOIGRgEqe7g0j9eqU
-				z0Rm98+7LEwaCF+VshS125JNDmAjk2nbOUsJQ1GwtVo/hPrAsI9TZKkMftOqi+ga
-				zi2xUzSvhtE52kUIPm35PLVzKNDAQKGMgdQfcexhBjzBX7Ozt5h7hPaOutpR71t3
-				eTCiukdeCPU6k4+MzuUR1wAXBZUAqo+BOcrZE8/7YgGsUykaPS1YJyturDhgfq4U
-				V7x6Y5Rikv9YMJX2is1jMz31f8AOiDDliT7qLpmuhFX5Ub1TJiXuT3qfExNTh7Dj
-				9r2+SoV9gdVYdUvQjPmDt3ebeiM=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acesso.ufabc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://acesso.ufabc.edu.br:8443/idp/profile/SAML1/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">UFABC - Universidade Federal do ABC</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFABC - Universidade Federal do ABC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFABC - Universidade Federal do ABC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFABC - Universidade Federal do ABC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufabc.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufabc.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Leonardo Monteiro Bersan de Araujo</md:SurName>
-    <md:EmailAddress>contato.cafe@ufabc.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/acm.jordanpublishing.co.uk-shibboleth.xml b/swamid-interfederations-2.0/acm.jordanpublishing.co.uk-shibboleth.xml
deleted file mode 100644
index 567e01a0..00000000
--- a/swamid-interfederations-2.0/acm.jordanpublishing.co.uk-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://acm.jordanpublishing.co.uk/shibboleth">
-  <!--
-		This is a "Family Law" Shibboleth SP for Jordan Publishing 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="2013-01-24T14:36:38Z">
-      <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://acm.jordanpublishing.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://acm.jordanpublishing.co.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Jordan Publishing / Family Law</mdui:DisplayName>
-        <mdui:Description xml:lang="en">For access to law reports, case law, commentary, precedents and legal and administrative changes.</mdui:Description>
-        <mdui:Logo height="64" width="252">https://acm.jordanpublishing.co.uk/jordanslogo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXDCCAkQCCQDTaBl/liB+TjANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDEYMBYGA1UEChMP
-						Sm9yZGFucyBMaW1pdGVkMSMwIQYDVQQDExphY20uam9yZGFucHVibGlzaGluZy5j
-						by51azAeFw0xNDA0MTExMzI0MDhaFw0zNDA0MDYxMzI0MDhaMHAxCzAJBgNVBAYT
-						AkdCMRAwDgYDVQQIEwdCcmlzdG9sMRAwDgYDVQQHEwdCcmlzdG9sMRgwFgYDVQQK
-						Ew9Kb3JkYW5zIExpbWl0ZWQxIzAhBgNVBAMTGmFjbS5qb3JkYW5wdWJsaXNoaW5n
-						LmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxdNdQ/zoNOHv
-						extaFGXUUXF+9ZtugYQ/crjvLAe5JHtyHf/AVm3U9sKk/4y5GTbkgGAwCsVQJuBL
-						nsTRquAex08OPjmLrz2XVxo6jJ7FPxVTpawIXE8+fsbQeVX2RYteRMDFmXWvESEc
-						D3i3C8O93BoDq5DbtJFTd5UQ2QLxIAmNFo+UWSrQeUIM208NETIEeanzhz3ijeFL
-						B+zrDbU/1JbFLTrHfi1gQ1hU+RuSqm/W/5CJ4DxH7yBvnkHvtPpUKqD2bTMz0hRs
-						xDz1+OIwycpuwDYjoGhahXmYhjy+p4psY4quT/KU3AUiXJXNI2oQxLSvIt5jPUHp
-						FECw7TCzaQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCqh2dvtGPtBBuT+AfL2xhB
-						nhK0hElXSK6GknMKVdABfEO61d0VOxcAg+Hz8aE1bAdyzOej4aWj96Jx6bJWtuGs
-						VrxEIH27lbu5u/MNPfcw8HjsN+lm1gadgsgjOv6+upzyNmaKuGR6B+1hOBlju3W5
-						2J7qMtO7HO8Rksw+kJu2LtJqxtf3HX6/guL21OnlwTTaeBj0mysrt6ZVwRfKhw07
-						2pDkzODd43svRZC2++k6vuhapuiiJaaBEBBnNgP5+nqRDXGbKRNXEIb3LAAfckBP
-						xpTob2Kh4PtL+W5T/4P0CreCM9f6V8GQemPBioiMrU9ihn9qChy/bYvPwRW7D+Rk
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://acm.jordanpublishing.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acm.jordanpublishing.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Jordan Publishing Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Jordan Publishing / Family Law</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jordanpublishing.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Needham</SurName>
-    <EmailAddress>mailto:andrew_needham@jordanpublishing.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Tomlin</SurName>
-    <EmailAddress>mailto:paul_tomlin@jordanpublishing.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jordan Publishing technical support</GivenName>
-    <EmailAddress>mailto:electronic@jordanpublishing.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/activation.glew.org.uk.xml b/swamid-interfederations-2.0/activation.glew.org.uk.xml
deleted file mode 100644
index 187157c9..00000000
--- a/swamid-interfederations-2.0/activation.glew.org.uk.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://activation.glew.org.uk">
-  <!--
-		This is a SimpleSAMLphp CompEdNet SP for Charles Love trading as Perfect Papers.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-19T14:20:32Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEvTCCA6WgAwIBAgIJAMGpTOsBYbUJMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIQWJlcmRlZW4xETAPBgNVBAcTCEFiZXJkZWVuMRIw
-						EAYDVQQKEwlDb21wRWROZXQxEDAOBgNVBAsTB1dlYnNpdGUxFDASBgNVBAMTC2ds
-						ZXcub3JnLnVrMSkwJwYJKoZIhvcNAQkBFhpjaGFybGllLmxvdmVAY29tcGVkbmV0
-						LmNvbTAeFw0xMTEwMjExMzE2NDNaFw0yMTEwMjAxMzE2NDNaMIGaMQswCQYDVQQG
-						EwJHQjERMA8GA1UECBMIQWJlcmRlZW4xETAPBgNVBAcTCEFiZXJkZWVuMRIwEAYD
-						VQQKEwlDb21wRWROZXQxEDAOBgNVBAsTB1dlYnNpdGUxFDASBgNVBAMTC2dsZXcu
-						b3JnLnVrMSkwJwYJKoZIhvcNAQkBFhpjaGFybGllLmxvdmVAY29tcGVkbmV0LmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALptErmPrNvSJWRV+JOx
-						CUrnVOg6q71UsWhkNjFt/pPmiS5VeKL9sVFHFfdBvA0+i4b77W0BqMXPy4woNWjq
-						6r6fXb45VPVOe1RHogrTaEOtWpS/04bLa/cy0k7voIJMMTdxmWx9X6UGVVfi/x7f
-						8SePI9vaYX4uuWGAlUJzVHQgYNaE8vO9OOh5anjwBWx3CvDgtooqF0cI29HHMKKf
-						YFQHVM10ELDJwcsR4DuwytdKaKgnKmJf99GX3Z7BuidS4VHrR3x4D2Lyp1Kc+ESI
-						I3eL3TyhzCO5ltg9uR4qMHh+qsfhDs5wp80LW4T3c24BuJZhE+dLUQgJQejbnWUU
-						FO8CAwEAAaOCAQIwgf8wHQYDVR0OBBYEFJYiRGyVBAqcDW5InhVOhVhwQScjMIHP
-						BgNVHSMEgccwgcSAFJYiRGyVBAqcDW5InhVOhVhwQScjoYGgpIGdMIGaMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIQWJlcmRlZW4xETAPBgNVBAcTCEFiZXJkZWVuMRIw
-						EAYDVQQKEwlDb21wRWROZXQxEDAOBgNVBAsTB1dlYnNpdGUxFDASBgNVBAMTC2ds
-						ZXcub3JnLnVrMSkwJwYJKoZIhvcNAQkBFhpjaGFybGllLmxvdmVAY29tcGVkbmV0
-						LmNvbYIJAMGpTOsBYbUJMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-						ACDSblvAoquf1aBLjHXRQVzy2644F5iY3FXwxRUIXDj6nEsk6lM/sg0tYXrtcCus
-						KWK1pMdFPmcQxaIuF7JpFvlWwXd5aD+r0+XNaX6gN2FK0uZ2AQUqySn5mXaBxcKC
-						t78Kyp9rx5WwXXGZWKcE2ahRqVwL14q9RPGn8biMxM9nzIiVp0/il6DBl1RGN2ks
-						S7JUXHDy/plUXhPnjzExkfqSFp+Qcb7TXapLUvNWgu938jRrxx8CqpeYc7PGq1/P
-						6mye1BrytmYHdasp9JTppqfD+CLNCrRBRbq+i6sSRbk/o7RDdCcut4+/bOUtFUC9
-						jlT99JDZhXhsU8aXchL/rGQ=
-					</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>
-						MIIEvTCCA6WgAwIBAgIJAMGpTOsBYbUJMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIQWJlcmRlZW4xETAPBgNVBAcTCEFiZXJkZWVuMRIw
-						EAYDVQQKEwlDb21wRWROZXQxEDAOBgNVBAsTB1dlYnNpdGUxFDASBgNVBAMTC2ds
-						ZXcub3JnLnVrMSkwJwYJKoZIhvcNAQkBFhpjaGFybGllLmxvdmVAY29tcGVkbmV0
-						LmNvbTAeFw0xMTEwMjExMzE2NDNaFw0yMTEwMjAxMzE2NDNaMIGaMQswCQYDVQQG
-						EwJHQjERMA8GA1UECBMIQWJlcmRlZW4xETAPBgNVBAcTCEFiZXJkZWVuMRIwEAYD
-						VQQKEwlDb21wRWROZXQxEDAOBgNVBAsTB1dlYnNpdGUxFDASBgNVBAMTC2dsZXcu
-						b3JnLnVrMSkwJwYJKoZIhvcNAQkBFhpjaGFybGllLmxvdmVAY29tcGVkbmV0LmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALptErmPrNvSJWRV+JOx
-						CUrnVOg6q71UsWhkNjFt/pPmiS5VeKL9sVFHFfdBvA0+i4b77W0BqMXPy4woNWjq
-						6r6fXb45VPVOe1RHogrTaEOtWpS/04bLa/cy0k7voIJMMTdxmWx9X6UGVVfi/x7f
-						8SePI9vaYX4uuWGAlUJzVHQgYNaE8vO9OOh5anjwBWx3CvDgtooqF0cI29HHMKKf
-						YFQHVM10ELDJwcsR4DuwytdKaKgnKmJf99GX3Z7BuidS4VHrR3x4D2Lyp1Kc+ESI
-						I3eL3TyhzCO5ltg9uR4qMHh+qsfhDs5wp80LW4T3c24BuJZhE+dLUQgJQejbnWUU
-						FO8CAwEAAaOCAQIwgf8wHQYDVR0OBBYEFJYiRGyVBAqcDW5InhVOhVhwQScjMIHP
-						BgNVHSMEgccwgcSAFJYiRGyVBAqcDW5InhVOhVhwQScjoYGgpIGdMIGaMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIQWJlcmRlZW4xETAPBgNVBAcTCEFiZXJkZWVuMRIw
-						EAYDVQQKEwlDb21wRWROZXQxEDAOBgNVBAsTB1dlYnNpdGUxFDASBgNVBAMTC2ds
-						ZXcub3JnLnVrMSkwJwYJKoZIhvcNAQkBFhpjaGFybGllLmxvdmVAY29tcGVkbmV0
-						LmNvbYIJAMGpTOsBYbUJMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-						ACDSblvAoquf1aBLjHXRQVzy2644F5iY3FXwxRUIXDj6nEsk6lM/sg0tYXrtcCus
-						KWK1pMdFPmcQxaIuF7JpFvlWwXd5aD+r0+XNaX6gN2FK0uZ2AQUqySn5mXaBxcKC
-						t78Kyp9rx5WwXXGZWKcE2ahRqVwL14q9RPGn8biMxM9nzIiVp0/il6DBl1RGN2ks
-						S7JUXHDy/plUXhPnjzExkfqSFp+Qcb7TXapLUvNWgu938jRrxx8CqpeYc7PGq1/P
-						6mye1BrytmYHdasp9JTppqfD+CLNCrRBRbq+i6sSRbk/o7RDdCcut4+/bOUtFUC9
-						jlT99JDZhXhsU8aXchL/rGQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://activation.glew.org.uk/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://activation.glew.org.uk/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://activation.glew.org.uk/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://activation.glew.org.uk/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://activation.glew.org.uk/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Charles Love trading as Perfect Papers</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CompEdNet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.compednet.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Charlie</GivenName>
-    <SurName>Love</SurName>
-    <EmailAddress>mailto:charlie.love@compednet.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Charlie</GivenName>
-    <SurName>Love</SurName>
-    <EmailAddress>mailto:charlie.love@compednet.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs-mali.icer.niaid.nih.gov-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs-mali.icer.niaid.nih.gov-adfs-services-trust.xml
deleted file mode 100644
index 7a346880..00000000
--- a/swamid-interfederations-2.0/adfs-mali.icer.niaid.nih.gov-adfs-services-trust.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://adfs-mali.icer.niaid.nih.gov/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">NIAID ICER-Mali Federation Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Requests and obtains identity assertions on behalf of Windows-based web applications at the NIAID ICER in Mali</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://scienceforum.sc/adfs-mali.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://scienceforum.sc/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFeTCCA2GgAwIBAgIJAPzWRexOtTLQMA0GCSqGSIb3DQEBDQUAMFMxJTAjBgNV
-BAMMHGFkZnMtbWFsaS5pY2VyLm5pYWlkLm5paC5nb3YxKjAoBgkqhkiG9w0BCQEW
-G2ljZXItdnJvLWFkbWluQGxpc3QubmloLmdvdjAeFw0xNjAxMDgxODI3NDFaFw0y
-NjAxMDUxODI3NDFaMFMxJTAjBgNVBAMMHGFkZnMtbWFsaS5pY2VyLm5pYWlkLm5p
-aC5nb3YxKjAoBgkqhkiG9w0BCQEWG2ljZXItdnJvLWFkbWluQGxpc3QubmloLmdv
-djCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMxKRAjTHlBoSXZ/QiqE
-Ry04mlmUBNOqiOTeJxe1SqB3N+ZSjqZEW1lDz0WUlMTJRbQ6eU2YBlxnXjuTi2/E
-gRepZygO44yVktX6e08WYpei2xZwm0r0AejVXi5Ef/aQR48ouATBaUhENPlbQn+U
-66Et46SKmPv6tq9ihGWIl26Z8ef2AkREqKrkLV/1jPNt7tj/Nff21VmFYh7Cv0Ey
-OzQ+5mrN6TSn9k94sT8SOT2NkHaOQCprxX+MOXX8AIUMsT0R4FVck4Z6+HwyPfb4
-WhMPqt50/zJgA+3GZtwcNfSUa2l1JBYJulOO5FCCNRfzZZVul7bRBD9mb6SyCOJx
-aNg7jR0qsBzp6W6OuDWaPu3cKitP4T18oyMJOl/Xt7+oGwbcxAXOmLBSIlQJfRME
-41/0nl1sDf+bxyZXFTcK2+VNsI+r7pGBFefWEC3sT9fgynVvenX0Lv/2gjtEVQfi
-zIk1eZ9Yc6UVSYG4d3Zilx049k7KjzHi1EAEA/0MOjnP22I1YRWn9vRM4B5VO9qq
-LTqPmIMyP/wRmMjiuARo9HWkQD9x8UOsboCkt7gaJgVVVs96gRXDiSyOPePmPArT
-RnlIJSUxzLep+CHIIAlOa073tu+fviDfsUODx1sEJv509xF+aFDnJkin+lHu8wqD
-Nc0AzjrNNRNpLPnpGYcZhsTzAgMBAAGjUDBOMB0GA1UdDgQWBBSZiFDKzbdEhAwU
-4wiyQY7kyaKtvjAfBgNVHSMEGDAWgBSZiFDKzbdEhAwU4wiyQY7kyaKtvjAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBDQUAA4ICAQBlSXO918v9KmyE8DeEviQ9gdF/
-pmvgO/277aANz/pKY8ELmArDV7zHvURO+igM8PzuTh1kAOorRU7TppxSkJw30KYO
-Ns4kTe8gfQAbzf/bahoVhlWcFjGbbDipDcj6CmB1VWmCXx+2H9UqLX4EaqSSiu8n
-aOoZijeqS5alFsTdmVrBdz8qsQBzmNJJEogLg+aLCUrg/RFV3r82ZElHstTk20G8
-hGD5qMpN/8OeVRn4YtkyPntQCtlDQHc7LFaCfEgwMFwA+9tscUHEzlMxU0tQcekw
-iVAinzW2WWj5UAZVOa81YvTjCJ9XMt+u/7y20v4V7oKj98eM1CFdGCRCqxFF+t/S
-lSRk4PPd8QxfF/7dmhZGLjurPgeGNnCvfO8tZooBKEGU6pc1UZ3XmDkGK+ugSgp+
-Glpl/YflcSRcq//ELLT9GECjhKaDjOfdy34bgYSuIHY/yzTo9R6Bqt9P55nR0+x2
-4iBJ+PODTqEr2SXe/Ai8uOWPufLL9Nqv04csRy9dRrkN8WUwD1wPYKKsnR+7PiHp
-LkMSWluMA+gLMRDnDHwpuu/QJQEeIsTPi+fDCZ+/PHddIZck2iIt2n67X27mzPAQ
-OpD2hjTr3LyoXZ7UWa16wO7x8G4Y2UJXPgG3n6q81tAAZiK1pxf/tzXghNBZXoTn
-EG/9OZqJXrOF9vasDA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.icermali.org/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.icermali.org/adfs/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.icermali.org/adfs/ls/" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.icermali.org/adfs/ls/" index="2"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">NIAID ICER-Mali Federation Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Requests and obtains identity assertions on behalf of Windows-based web applications at the NIAID ICER in Mali</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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
-    <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs-uganda.icer.niaid.nih.gov-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs-uganda.icer.niaid.nih.gov-adfs-services-trust.xml
deleted file mode 100644
index 1f55fab1..00000000
--- a/swamid-interfederations-2.0/adfs-uganda.icer.niaid.nih.gov-adfs-services-trust.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://adfs-uganda.icer.niaid.nih.gov/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">NIAID ICER-Uganda Federation Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Requests and obtains identity assertions on behalf of Windows-based web applications at the NIAID ICER in Uganda</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://scienceforum.sc/adfs-uganda.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://scienceforum.sc/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFfTCCA2WgAwIBAgIJAPpmK+i1TdnLMA0GCSqGSIb3DQEBDQUAMFUxJzAlBgNV
-BAMMHmFkZnMtdWdhbmRhLmljZXIubmlhaWQubmloLmdvdjEqMCgGCSqGSIb3DQEJ
-ARYbaWNlci12cm8tYWRtaW5AbGlzdC5uaWguZ292MB4XDTE2MDEwODE4Mjc1M1oX
-DTI2MDEwNTE4Mjc1M1owVTEnMCUGA1UEAwweYWRmcy11Z2FuZGEuaWNlci5uaWFp
-ZC5uaWguZ292MSowKAYJKoZIhvcNAQkBFhtpY2VyLXZyby1hZG1pbkBsaXN0Lm5p
-aC5nb3YwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDIdtAm36s1L29F
-W7+cckdsj3+Z+BqMBNoDfJxXagoJfMkDK3BsbaSl5JS5HhWyPKPVK2qV90g8oM+4
-KWiBPVueQbg4068UaZooxBSU86cHR21vdkmxSV5HYYwHV9x1OASs7AV/PH6R8Ju1
-/sJxk2yd3FGTRbEuuynb2JvkNLqYsf6Toe24yON9oAIVyQ++6D3jhHk6ijy1ytWg
-LNV2W3Jw4r8aBBY8eORtv3AwaXr6NJs/Sp/nihCOK6xH1fBfWYVHaDwEdVfhp4jS
-OxSevlvVD/0u8YlK9NBkRVyiWIe6MKt3Ts5KNJEf1d+SwOfvdUOXSTBW5AUPKPCp
-+v959iKUmB4C3vfrhutZlay3aW2E4NeMISLXKMfjZdGQvBJv4F7n8JtWK2ckehST
-06zXj+4Ec0kb71H+URsEkKJAzPJu6+5o90D0Y5O4dkC4zkFgyv+TrQhxXL6+zTgG
-9kRx+8lN3tTPJWTIYdlY+AuZBbf6mrmqla+Cfy5GdtqCdctjg0Vhb20zVpvkU7zn
-SuBokz6yk8vCSfYyJdeL81/5o+Ddi90o9RCiJLzpDX9fhcAW2E66VuwlhmcUA0F/
-EfoWc/Pdda9Zrwa0P0v2XTirufxEYPfiOFhtpDR6EBVeArq2wgqbLYhzuWq3G+8u
-Sj/j0a4R5zN7FVLviHFErHlHg+QrqwIDAQABo1AwTjAdBgNVHQ4EFgQURA51b4RS
-+sS+g1GPyfB2i8sg2zQwHwYDVR0jBBgwFoAURA51b4RS+sS+g1GPyfB2i8sg2zQw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQ0FAAOCAgEAR+oauyNNAeLJ1GC1RFZY
-WrerEwpir9ke5MtH1Wx0OWSDGuz8JOj+/N653QfakGR9Q0G6v0aL9FB68aP4HlDk
-5F8z+FK3QPipDPj/bEQfPomBkw0Ya74lNw4+O9xjS+4NTyA9jZFnAeZY7zNZM5v6
-7XSZ7V5rjT1n4p/1leZ+latCLQDcG2tBrSFZRs3L0rNdPVVYxG6z+lhrxcAwi64P
-oXOFeyi97i043CuRWiNnCeLMw7ZQnPmtZ9bE6zZ8IpnSOQPnGgJSbm5NFf1TS8UZ
-2MoFDKTx3O9YO3zqE6myUpNvkuGsgv2KrBVHxNKD0X/9PiThXlggIyrZ41R9F8xl
-4M63t3kelZiJ0QcE5Nqr89di7csUan8gTyNyXgbSPxHe6kYBJmIXDg1HWFWDRAMh
-Ildzsi7TFAklR3Pm73mpCrYODy4ENKGVaF0XDixneZIQ+hCI518wXcYXFoaewa2R
-naVqumYPvFru9KcHjY8OfpoO2N67g+3w2qeKKKqxcSUe2ycsvhhpChCNktNNopD5
-zOiko220IAQdEpwr2ycokXubZWY6Q7rvvk0KC3AIS+0B3e3cmuA7b6ZNtUsToPkU
-98xCQ1IQXMcd/r1Hifcbhpn8VP55Pxx2oUzJxRqcdknplAvvdZsxqaPcFeT/oFdY
-YARHPjZamP8TsNZl1FjAnz0=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.iceruganda.org/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.iceruganda.org/adfs/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.iceruganda.org/adfs/ls/" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.iceruganda.org/adfs/ls/" index="2"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">NIAID ICER-Uganda Federation Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Requests and obtains identity assertions on behalf of Windows-based web applications at the NIAID ICER in Uganda</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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
-    <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs.amolf.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.amolf.nl-adfs-services-trust.xml
deleted file mode 100644
index b7b31186..00000000
--- a/swamid-interfederations-2.0/adfs.amolf.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.amolf.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-12T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">AMOLF</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">AMOLF</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">AMOLF</mdui:Description>
-        <mdui:Description xml:lang="en">AMOLF</mdui:Description>
-        <mdui:Logo height="48" width="76">https://static.surfconext.nl/logos/idp/amolf.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">AMOLF FOM Institute Foundation for Fundamental Research on Matter</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">AMOLF FOM Institute Foundation for Fundamental Research on Matter Instituut</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/985222f345d0c3b64b738e25c3aca1ba"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">AMOLF</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">AMOLF</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surffederatie.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/adfs.artez.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.artez.nl-adfs-services-trust.xml
deleted file mode 100644
index 267a1835..00000000
--- a/swamid-interfederations-2.0/adfs.artez.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.artez.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">ArtEZ Institute of the Arts Hogeschool voor de Kunsten</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ArtEZ Institute of the Arts Hogeschool voor de Kunsten</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">ArtEZ Hogeschool voor de Kunsten</mdui:Description>
-        <mdui:Description xml:lang="en">ArtEZ Institute of the Arts</mdui:Description>
-        <mdui:Logo height="35" width="96">https://static.surfconext.nl/logos/idp/artez.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">ArtEZ Institute of the Arts Hogeschool voor de Kunsten</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">ArtEZ Institute of the Arts Hogeschool voor de Kunsten</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/c1e805c6dae3737d023a834e859622f8"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ArtEZ Institute of the Arts</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ArtEZ Institute of the Arts</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.artez.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/adfs.driestar-educatief.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.driestar-educatief.nl-adfs-services-trust.xml
deleted file mode 100644
index 7b6a318b..00000000
--- a/swamid-interfederations-2.0/adfs.driestar-educatief.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.driestar-educatief.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-24T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Driestar Educatief</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Driestar Educatief</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Driestar Educatief</mdui:Description>
-        <mdui:Description xml:lang="en">Driestar Educatief</mdui:Description>
-        <mdui:Logo height="30" width="108">https://static.surfconext.nl/logos/idp/driestar.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Driestar Educatief HBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Driestar Educatief HBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/c228c1e233ead8d6893a3f502e2cb773"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Driestar Educatief</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Driestar Educatief</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.driestar-educatief.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/adfs.fom.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.fom.nl-adfs-services-trust.xml
deleted file mode 100644
index 753e80d8..00000000
--- a/swamid-interfederations-2.0/adfs.fom.nl-adfs-services-trust.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="http://adfs.fom.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">FOM-bureau</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">FOM-bureau</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Stichting voor Fundamenteel Onderzoek der Materie - bureau</mdui:Description>
-        <mdui:Description xml:lang="en">Foundation for Fundamental Research on Matter - bureau</mdui:Description>
-        <mdui:Logo height="300" width="500">https://static.surfconext.nl/logos/idp/fom.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">FOM Foundation for Fundamental Research on Matter bureau</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">FOM Stichting voor Fundamenteel Onderzoek der Materie bureau</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/11b0d7eaaf1673ff0728ec7b46331c27"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">FOM-bureau</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">FOM-bureau</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">FOM-bureau</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">FOM-bureau</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.fom.nl</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fom.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/adfs.geant.org-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.xml
deleted file mode 100644
index 1f905400..00000000
--- a/swamid-interfederations-2.0/adfs.geant.org-adfs-services-trust.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="http://adfs.geant.org/adfs/services/trust">
-  <!--
-		This is a "GÉANT Web Presence" ADFS SP for GÉANT Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-08T14:43:52Z">
-      <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 Web Presence</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Suite of websites and web applications for GÉANT Project.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://adfs.geant.org/PrivacyPolicy/GEANTWebPrivacyPolicy.htm</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCjCCAfKgAwIBAgIQs5tPc9z706NO4mzHhrCV8TANBgkqhkiG9w0BAQsFADAZ
-						MRcwFQYDVQQDEw5hZGZzLmdlYW50Lm9yZzAeFw0xNTExMzAyMzAwMDBaFw0yNTEy
-						MzEyMzAwMDBaMBkxFzAVBgNVBAMTDmFkZnMuZ2VhbnQub3JnMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmRspgLghse0p+atImNpxxYICpkNEGZ/KYsCT
-						wkDpje68srDJQYJoRGo2H8RJO0JRhLdtCKtHPSB5UffPVbC2rhHRyRKbAJ+Lcwpz
-						frPe82WsHm6oTIuL+QlmjWDjjdHJ6JmYDgIhNflPsoStZ5pF7vd2NpVzPysneAWX
-						g9X8PZvvD+Vs0jA+eGFzm23t6Fq/Dd74Je+FL5avGWHGVfqDwn7gjpnV/DprC+y1
-						Aq/YE1ISsYlDbCoc9caghtdDFe+UyAZ3ftQICS2KGSw6N3JilTIlY4MB/WLlnPC1
-						KDdSRWtxAphCFg0tVOArYFfy5uiI+8/TKAl8lNCc/sdD9URk+QIDAQABo04wTDBK
-						BgNVHQEEQzBBgBDE00phQQHYraGrC4n0nrkmoRswGTEXMBUGA1UEAxMOYWRmcy5n
-						ZWFudC5vcmeCELObT3Pc+9OjTuJsx4awlfEwDQYJKoZIhvcNAQELBQADggEBAFto
-						4jjSLViYHyICsyFsdCu3Gp3dbOcGkokEcR+EuDjuJX2ckDmXaVleyuEO73VIWFdn
-						AeCckGMgzl5Kp+QQAVJrre75kTtc7DelHeu8q4/v4mJX5jbGIikg3FzaoPPp4aeN
-						bCFADvM30dp6Tx2Jo70oaDBlmmt1IZ7/CSM8BHMYsouOvLbvexfuEhCVyjo4rlXf
-						ULZJqKXuExn8g6ACrSXxkWec0P40QJqeFmQpuW4An6KzFEvwKA8jogtEY4Vo6mJ1
-						NyQCZybAQfgvDyviwbu2fgMwy3UyIaDV0y3jNrLqVIcxn2bdsUP35jI8PFpIv6T4
-						WKQ3AllzMMauGECc7IU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.geant.org/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.geant.org/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://adfs.geant.org/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.geant.org/adfs/ls/" index="1"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">GÉANT Web Presence</ServiceName>
-      <ServiceDescription xml:lang="en">
-				Suite of websites and web applications for GÉANT Project.
-			</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="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="false"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Ltd.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs.glu.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.glu.nl-adfs-services-trust.xml
deleted file mode 100644
index c2833218..00000000
--- a/swamid-interfederations-2.0/adfs.glu.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.glu.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Grafisch Lyceum Utrecht</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Grafisch Lyceum Utrecht</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Grafisch Lyceum Utrecht</mdui:Description>
-        <mdui:Description xml:lang="en">Grafisch Lyceum Utrecht</mdui:Description>
-        <mdui:Logo height="35" width="108">https://static.surfconext.nl/logos/idp/glu.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Grafisch Lyceum Utrecht MBO GLU</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Grafisch Lyceum Utrecht MBO GLU</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/24e321ebbe6056f380b73ca8d20398a9"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Grafisch Lyceum Utrecht</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Grafisch Lyceum Utrecht</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.glu.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/adfs.hsleiden.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.hsleiden.nl-adfs-services-trust.xml
deleted file mode 100644
index 7bdcfb5a..00000000
--- a/swamid-interfederations-2.0/adfs.hsleiden.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.hsleiden.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-07-02T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Hogeschool Leiden</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Applied Sciences Leiden</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hogeschool Leiden</mdui:Description>
-        <mdui:Description xml:lang="en">Hogeschool Leiden</mdui:Description>
-        <mdui:Logo height="48" width="38">https://static.surfconext.nl/logos/idp/hsleiden.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="en">university of applied sciences leiden hogeschool hsleiden hbo</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">university of applied sciences leiden hogeschool hsleiden hbo</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/83296d2fee18c20dc85ce959b3d2e4b5"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Hogeschool Leiden</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Hogeschool Leiden</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hsleiden.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/adfs.hsmarnix.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.hsmarnix.nl-adfs-services-trust.xml
deleted file mode 100644
index 6a606bc1..00000000
--- a/swamid-interfederations-2.0/adfs.hsmarnix.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.hsmarnix.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-15T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Marnix Academie</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Marnix Academie</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Marnix Academie</mdui:Description>
-        <mdui:Description xml:lang="en">Marnix Academie</mdui:Description>
-        <mdui:Logo height="18" width="108">https://static.surfconext.nl/logos/idp/marnix.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">marnix academie hbo</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">marnix academie hbo</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/96cbfec0d8a42ee032111ece52d3185a"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Marnix Academie</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Marnix Academie</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.marnixacademie.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/adfs.hvhl.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.hvhl.nl-adfs-services-trust.xml
deleted file mode 100644
index 6182669e..00000000
--- a/swamid-interfederations-2.0/adfs.hvhl.nl-adfs-services-trust.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="http://adfs.hvhl.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2016-01-15T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Hogeschool Van Hall Larenstein</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Van Hall Larenstein, University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hogeschool Van Hall Larenstein</mdui:Description>
-        <mdui:Description xml:lang="en">Van Hall Larenstein, University of Applied Sciences</mdui:Description>
-        <mdui:Logo height="232" width="500">https://static.surfconext.nl/media/idp/hogeschoolvhl.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">university of applied sciences van hall larenstein vhl hvhl</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">university of applied sciences van hall larenstein vhl hvhl</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/1a3b0a58200dbe2973bb21eaa1adf33e"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Hogeschool Van Hall Larenstein</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Van Hall Larenstein, University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Hogeschool Van Hall Larenstein</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Van Hall Larenstein, University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.vhl.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.vhl.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/adfs.ipabo.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.ipabo.nl-adfs-services-trust.xml
deleted file mode 100644
index 5d95af14..00000000
--- a/swamid-interfederations-2.0/adfs.ipabo.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.ipabo.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-26T11:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Hogeschool IPABO</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hogeschool IPABO</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hogeschool IPABO</mdui:Description>
-        <mdui:Description xml:lang="en">Hogeschool IPABO</mdui:Description>
-        <mdui:Logo height="26" width="108">https://static.surfconext.nl/logos/idp/ipabo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Hogeschool IPABO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Hogeschool IPABO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/dee1f95a2737684ea5a3e6a7c84dcc2a"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Hogeschool IPABO</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Hogeschool IPABO</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ipabo.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/adfs.kb.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.kb.nl-adfs-services-trust.xml
deleted file mode 100644
index d3dca3d4..00000000
--- a/swamid-interfederations-2.0/adfs.kb.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.kb.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-11T20:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Koninklijke Bibliotheek</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Koninklijke Bibliotheek</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Koninklijke Bibliotheek</mdui:Description>
-        <mdui:Description xml:lang="en">Koninklijke Bibliotheek</mdui:Description>
-        <mdui:Logo height="15" width="108">https://static.surfconext.nl/logos/idp/kb.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Koninklijke Bibliotheek kb</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Koninklijke Bibliotheek kb</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/790fe4568cbb83b9006ae366d052557f"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Koninklijke Bibliotheek</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Koninklijke Bibliotheek</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kb.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/adfs.knmi.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.knmi.nl-adfs-services-trust.xml
deleted file mode 100644
index d1211975..00000000
--- a/swamid-interfederations-2.0/adfs.knmi.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.knmi.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-24T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">KNMI</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KNMI</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">KNMI</mdui:Description>
-        <mdui:Description xml:lang="en">KNMI</mdui:Description>
-        <mdui:Logo height="36" width="108">https://static.surfconext.nl/logos/idp/knmi.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">KNMI Koninklijk Nederlands Meteorologisch Instituut</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">KNMI Koninklijk Nederlands Meteorologisch Instituut</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/49e6eb397d84ccc1d02259930aa89567"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KNMI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">KNMI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surffederatie.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/adfs.maastrichtuniversity.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.maastrichtuniversity.nl-adfs-services-trust.xml
deleted file mode 100644
index 5527d075..00000000
--- a/swamid-interfederations-2.0/adfs.maastrichtuniversity.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.maastrichtuniversity.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-20T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">maastrichtuniversity.nl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimaas.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">Universiteit Maastricht</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Maastricht University</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Universiteit Maastricht</mdui:Description>
-        <mdui:Description xml:lang="en">Maastricht University</mdui:Description>
-        <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/unimaas.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Maastricht University  Universiteit unimaas Universiteit mu um</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Maastricht University  Universiteit unimaas Universiteit mu um</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/190147b9406fecca0c20324a099a97b4"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Universiteit Maastricht</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Maastricht University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.maastrichtuniversity.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/adfs.morgan.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.morgan.edu-adfs-services-trust.xml
deleted file mode 100644
index eb64be58..00000000
--- a/swamid-interfederations-2.0/adfs.morgan.edu-adfs-services-trust.xml
+++ /dev/null
@@ -1,57 +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://adfs.morgan.edu/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">morgan.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Morgan State University</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>
-MIIC2jCCAcKgAwIBAgIQZ4Ca0HR644NMZw4H92x4fDANBgkqhkiG9w0BAQsFADAp
-MScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBBREZTLk1vcmdhbi5lZHUwHhcNMTMx
-MjA5MTgxMjU0WhcNMTQxMjA5MTgxMjU0WjApMScwJQYDVQQDEx5BREZTIFNpZ25p
-bmcgLSBBREZTLk1vcmdhbi5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCT6FWhre5VGszboXF2s0i6QNCf5R8ptj0TfXpg104FLV47wIjh6eENGUsE
-ZvSJ5sP8xlxkvVlsyrNZrRJQ+85MtlNpH9K+zdhYUnbdi+2NRcAR4ZzYgpHpued0
-WDKmhu26dLlCkPs4zITfTWpx7nc/5aTCa04mdgrYU4vhIzXWiTYvu0UN9FdxQ2N1
-SsweArHilPoiVUOVofWx9urrrndzgJ6MWuCIjWk4NVy2dKw9KWHNPZI9YYGFXRVP
-VMo68tsH1TYQwBw93WHINXkBCVzsPrJujXXPZ1QzftBnW7Nk3h/eKG6Oax46dzxA
-z16gxndQg5y0EJShUYb804hTMAaPAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAE3h
-Q40sr5Vtny9ya3dm5vhnVn5Dy5Vcfs2Jibd6UYO2yU4wIE0+REh+ms88384s90VA
-3nkCuT3z1EzoBbG128/opJA7p77s493TgQb0GhhjGIIh9hPzdSbkcwnbrolK+arA
-XJTqhQEZ5JkkDORySN+gt4mjB0DvaZTQXGm/H420ecX6GT/t9zNJycnz4cId1K1S
-c2SnJZkGv1OMp3SLipQ+ouGzoyF3O3OzcvQkcc8l2D6MKfQveCAnL8qIBXo6lrYz
-NB2YMc40VslJhFrugMvw+4J04NHbjDFPjCzu6WdLjHtjk16Z5NQOs8a5f1kBW+Lx
-2QvIFX+YUmvc+TvooRY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.morgan.edu/adfs/ls"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Morgan State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Morgan State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.morgan.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tom Raisbeck</md:GivenName>
-    <md:EmailAddress>TRaisbeck@sycomtech.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alexandre Adao</md:GivenName>
-    <md:EmailAddress>Alexandre.Adao@morgan.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs.myhz.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.myhz.nl-adfs-services-trust.xml
deleted file mode 100644
index 433d44ec..00000000
--- a/swamid-interfederations-2.0/adfs.myhz.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.myhz.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-22T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">HZ University of Applied Sciences</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">HZ University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">HZ University of Applied Sciences</mdui:Description>
-        <mdui:Description xml:lang="en">HZ University of Applied Sciences</mdui:Description>
-        <mdui:Logo height="30" width="108">https://static.surfconext.nl/media/idp/hzeeland.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">Hogeschool Zeeland HZ University of Applied Sciences HBO myhz</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Hogeschool Zeeland HZ University of Applied Sciences HBO myhz</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/805bc855e60e47bef36a3d88b684f623"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HZ University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HZ University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://hz.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/adfs.nwo.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.nwo.nl-adfs-services-trust.xml
deleted file mode 100644
index efa65835..00000000
--- a/swamid-interfederations-2.0/adfs.nwo.nl-adfs-services-trust.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="http://adfs.nwo.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-07-08T11:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">NWO</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NWO</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">De Nederlandse Organisatie voor wetenschappelijk Onderzoek (NWO) financiert wetenschappelijk onderzoek en stimuleert kwaliteit en vernieuwing in de wetenschap.</mdui:Description>
-        <mdui:Description xml:lang="en">The Netherlands Organisation for Scientific Research (NWO) is the Dutch national research council and promotes quality and innovation in science.</mdui:Description>
-        <mdui:Logo height="251" width="500">https://static.surfconext.nl/logos/idp/nwo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Netherlands Organisation for Scientific Research NWO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Nederlandse Organisatie voor Wetenschappelijk Onderzoek NWO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/8e1798a9aacb6918015ddf5cbce658bc"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Nederlandse Organisatie voor Wetenschappelijk Onderzoek</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Nederlandse Organisatie voor Wetenschappelijk Onderzoek</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Netherlands Organisation for Scientific Research</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Netherlands Organisation for Scientific Research</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.nwo.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.nwo.nl/en/</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/adfs.philau.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.philau.edu-adfs-services-trust.xml
deleted file mode 100644
index 788fea18..00000000
--- a/swamid-interfederations-2.0/adfs.philau.edu-adfs-services-trust.xml
+++ /dev/null
@@ -1,69 +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://adfs.philau.edu/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">philau.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Philadelphia University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Philadelphia University</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.philau.edu/oir/Policies/incommonfederation.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.philau.edu/oir/Policies/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="126" width="134" xml:lang="en">https://www.philau.edu/inc/img/img_footer_logo.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>
-MIIC2jCCAcKgAwIBAgIQRHBN4pvQap1LpNI5geCgczANBgkqhkiG9w0BAQsFADAp
-MScwJQYDVQQDEx5BREZTIFNpZ25pbmcgLSBhZGZzLnBoaWxhdS5lZHUwHhcNMTUw
-MjAyMDIwMjU1WhcNMjAwMjAxMDIwMjU1WjApMScwJQYDVQQDEx5BREZTIFNpZ25p
-bmcgLSBhZGZzLnBoaWxhdS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCyDfbSvl30ofeRv7AQCChNRyfpvYhODupt5S+3ymHdartBHiDJkM5J1aNL
-vFs+7a5tb0GCbJReByokNWxPtdkqStD+/0NLXv6VnFB67IlT0xctB0J1IxkLkXAF
-T/FSNLvuoSlsD4FXV9p1Q1HjjTE5udOLYsSHtef2RXfsiLv0LPBOO794tkzZ4ozt
-D1kF/bgTeYpeyR/kfNCi0m7Dn+/oJix4wV/UHxFP+K6VoHvHui08qxOHmnea/0/H
-LR96u2Us7kNxt1mfv4jecyXawfXS6ndzui6MFtZIh9OJzc7/82hWTNkV7mWxeK4G
-/p+hBHoDY984EyY8mKn3aPCVDTEPAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKdX
-8Sft+u4OQCSxo1SuM+AIL0/vNzBseLzqmOQPGwGAx6TFz/wQt3/qH5BcOtYLDroC
-VBoq97NnYqoXTCi+R7yG0Is7/i0TQiuApsMwiXzcI2ZBreLuzxdAidZQYR94OQm7
-ofXKfQ/ZlicsXvOg27h1W9KCqfnzPLTP+UsK4/BXMKUrdzJKl3Hrzw6CIF+6QWyl
-YWUwwDqL9m2mXXhKQGblwaU2yUC2pEdOextItEHMexD6qkSi0ALnEN9NLk6yrxT5
-6BZR18jVlYvNQRLTkzfplNmb8GWM/xYoTs4eJKFx2TMRbRBk1PtMV7+0ZGgFCFZ2
-Cvcd3WYYf9glQNGfltI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.philau.edu/adfs/services/trust/artifactresolution" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.philau.edu/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.philau.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.philau.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.philau.edu/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Philadelphia University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Philadelphia University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.philau.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Network and Systems</md:GivenName>
-    <md:EmailAddress>oit-networking-d@philau.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Technology Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@philau.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Network and Systems</md:GivenName>
-    <md:EmailAddress>oit-networking-d@philau.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs.rijnhuizen.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.rijnhuizen.nl-adfs-services-trust.xml
deleted file mode 100644
index fe49c2a2..00000000
--- a/swamid-interfederations-2.0/adfs.rijnhuizen.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.rijnhuizen.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-10T09:10:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">FOM-Instituut DIFFER</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">FOM-Instituut DIFFER</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">FOM-Instituut DIFFER</mdui:Description>
-        <mdui:Description xml:lang="en">FOM-Instituut DIFFER</mdui:Description>
-        <mdui:Logo height="40" width="40">https://static.surfconext.nl/logos/idp/differ.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">fom differ dutch institute for fundamental energy research</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">fom differ dutch institute for fundamental energy research</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/661c4d0e3681c2dc5cddb51f3ff7e852"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">FOM-Instituut DIFFER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">FOM-Instituut DIFFER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.differ.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/adfs.stenden.com-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.stenden.com-adfs-services-trust.xml
deleted file mode 100644
index bed792af..00000000
--- a/swamid-interfederations-2.0/adfs.stenden.com-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.stenden.com/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-01T09:26:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Stenden Hogeschool</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Stenden Hogeschool</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Stenden Hogeschool</mdui:Description>
-        <mdui:Description xml:lang="en">Stenden Hogeschool</mdui:Description>
-        <mdui:Logo height="300" width="427">https://static.surfconext.nl/logos/idp/stenden.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Stenden Hogeschool HBO CHN</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Stenden Hogeschool HBO CHN</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/ef5e1f05a6c81593b3167fc71dfbb001"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stenden Hogeschool</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stenden Hogeschool</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.stenden.com</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/adfs.stw.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.stw.nl-adfs-services-trust.xml
deleted file mode 100644
index 2b06646f..00000000
--- a/swamid-interfederations-2.0/adfs.stw.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.stw.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-07-08T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Technologiestichting STW</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Technologiestichting STW</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Technologiestichting STW realiseert kennisoverdracht tussen technische wetenschappen en gebruikers. Dat doet zij door excellent technisch-wetenschappelijk onderzoek te financieren en bij elk project onderzoekers en gebruikers letterlijk bij elkaar te bren</mdui:Description>
-        <mdui:Description xml:lang="en">Technology Foundation STW realises knowledge transfer between the technical sciences and users. It does that by funding excellent technical sciences research and for each project literally bringing researchers and users together.</mdui:Description>
-        <mdui:Logo height="194" width="259">https://static.surfconext.nl/logos/idp/stw.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">STW NWO research, science, technical science, technical, engineering, Foundation, valorisation, IP</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Technologiestichting STW NWO research, science, technical science, technical, engineering, Foundation, valorisation, IP</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/64b3a9ee71b20e9b46d4a6a5ac5e98ba"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Technologiestichting STW</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technologiestichting STW</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.stw.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/adfs.surfmarket.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.surfmarket.nl-adfs-services-trust.xml
deleted file mode 100644
index 6a9df67f..00000000
--- a/swamid-interfederations-2.0/adfs.surfmarket.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.surfmarket.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-08T16:45:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">SURFmarket</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SURFmarket</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">SURFmarket</mdui:Description>
-        <mdui:Description xml:lang="en">SURFmarket</mdui:Description>
-        <mdui:Logo height="34" width="108">https://static.surfconext.nl/logos/idp/surfmarket.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">SURFmarket SURFdiensten</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">SURFmarket SURFdiensten</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/dd8a661ec02c530266ecb8b41dcbb9cb"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SURFmarket</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SURFmarket</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surfmarket.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/adfs.tue.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml
deleted file mode 100644
index 39bd3e40..00000000
--- a/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://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.surfnet.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/logos/idp/tue.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">eindhoven university of technology technische universiteit eindhoven tue</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">eindhoven university of technology technische universiteit eindhoven tue</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md: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="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 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/adfs.tue.nl.xml b/swamid-interfederations-2.0/adfs.tue.nl.xml
deleted file mode 100644
index 4e9a089d..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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.tue.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo 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>
-        <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>MIIDyzCCArOgAwIBAgIJAMzixtXMUH1NMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
-BAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYD
-VQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHTAbBgNVBAMM
-FGVuZ2luZS5zdXJmY29uZXh0Lm5sMB4XDTExMDEyNDEwMTg1N1oXDTIxMDEyMzEw
-MTg1N1owfDELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcM
-B1V0cmVjaHQxFTATBgNVBAoMDFNVUkZuZXQgQi5WLjETMBEGA1UECwwKU1VSRmNv
-bmV4dDEdMBsGA1UEAwwUZW5naW5lLnN1cmZjb25leHQubmwwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDMJ6v+f3owS3KR5IXSil+3XFwGvCVeYx3jDOFK
-AnwvXlDpTu+t730b8/spHtlopyJVAlb6qBIPN7R4TGTLqiu0zebYsYx/PtqCk5cb
-u9qs3h+p2BBoTXVwXA/ZYi0tqtxp04hcNrRj1TAgLyC0S+KASTF+zzccAcjTBid5
-EMioo+YllgSEobWJ4X33XVRqNrikAPDsNmDrdKUi257JSO2xhVIG5lbtmDaL5ORC
-D56oRmVdp7VQTEQ3Yass8J5Rn+Ub6WmRBYeG+KzFBvtyBput2o0/gvtJn9L+NWeD
-B0LyUPaUYG/X4GF14FcmFQfz7I5jBCNHtPcLJbPYbZKQNhz/AgMBAAGjUDBOMB0G
-A1UdDgQWBBS9QqP8gtMM6nm4oYzNbgqhEDP1aDAfBgNVHSMEGDAWgBS9QqP8gtMM
-6nm4oYzNbgqhEDP1aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBH
-2qyYwLwesIOxUTj+NJ0VXRBDH8VecNLiUUs9Np4x8A0pxLvlNnv5TdJAruEg1LSV
-mAqqPUdAB2m7CKDeUVM9cwOB7vqelV2GNgOfevXi+DZRMffyyE8qyIcnTqvDOgcR
-8qGTPSVT+SIsOkV9bYrjltrbnal7cJermsA8SC5w/pjLaOHI1xIZHquZzymWoN3Z
-fz2CQg2r5o+AURYd74GrHhHqVa9VrdWtcimB+vTQQihoLt8YciehpJjOMpx2D66e
-FfpC8ix31RRdjAVIo1y33h1yU3gEHePDbOthZE+lpXi2WJqO85H85LqJOtgn2WPI
-3P2Tx32Cq1WXCYkxLaPI
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md: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.unco.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.unco.edu-adfs-services-trust.xml
deleted file mode 100644
index b793cf8f..00000000
--- a/swamid-interfederations-2.0/adfs.unco.edu-adfs-services-trust.xml
+++ /dev/null
@@ -1,89 +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://adfs.unco.edu/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">unco.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bears.unco.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Northern Colorado</mdui:DisplayName>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unco.edu/generalcounsel/privacy.htm</mdui:PrivacyStatementURL>
-        <mdui:Logo height="175" width="300" xml:lang="en">https://www.unco.edu/assets/images/unc_logo_combo_stacked.jpg</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>
-MIIH4jCCBsqgAwIBAgIQKeEwbqGkXE6yO5CHDJj1/DANBgkqhkiG9w0BAQsFADCB
-kjELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxODA2BgNV
-BAMTL0NPTU9ETyBSU0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVy
-IENBMB4XDTE1MDEyNjAwMDAwMFoXDTE3MDEyNTIzNTk1OVowggErMRowGAYDVQQF
-ExFHb3Zlcm5tZW50IEVudGl0eTETMBEGCysGAQQBgjc8AgEDEwJVUzEaMBgGA1UE
-DxMRR292ZXJubWVudCBFbnRpdHkxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwU4MDYz
-OTELMAkGA1UECBMCQ08xEDAOBgNVBAcTB0dyZWVsZXkxGDAWBgNVBAkTDzUwMSAy
-MHRoIFN0cmVldDEoMCYGA1UEChMfVW5pdmVyc2l0eSBvZiBOb3J0aGVybiBDb2xv
-cmFkbzEfMB0GA1UECxMWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEjMCEGA1UECxMa
-Q09NT0RPIEVWIE11bHRpLURvbWFpbiBTU0wxFjAUBgNVBAMTDWFkZnMudW5jby5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCz/Pm5UAckqQhwMI3e
-twMRbcmtJ57Fo6RFYf3/CGMi6xNNPaBktd7jvdZfo2oaLd6BJJVjjgl44PCiViGy
-CjG3WXnxvpoDx2AbDsUdGgpmxTfw5cY5piZPgnv1r07wVHfdIIkDMrionjwRFBMl
-bJYFfMjmwt/GS7+qP+fhxDuhfH4ehXrReT+SlI+TEXC6rE2O/CyCtxHG8uT7voKa
-4Xh4lH1Jei+2G/9MT5rTvKe2ViDvTCgk/hUTQlKvwd/zM3tr3qzRLGOs0Dslyb1C
-mpxlaN14HTAE237cs+auasnQu4IXfUkzWH+wvQ4g+z35NN7dXglOcEiycIFgm3q9
-8Or5AgMBAAGjggOWMIIDkjAfBgNVHSMEGDAWgBQ52v/KKBSKqHQTCLnkDqnS+n6d
-aTAdBgNVHQ4EFgQU6I4hVc4GhSJXi1O5PRf/32W2nS4wDgYDVR0PAQH/BAQDAgWg
-MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEYG
-A1UdIAQ/MD0wOwYMKwYBBAGyMQECAQUBMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8v
-c2VjdXJlLmNvbW9kby5jb20vQ1BTMFYGA1UdHwRPME0wS6BJoEeGRWh0dHA6Ly9j
-cmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQUV4dGVuZGVkVmFsaWRhdGlvblNlY3Vy
-ZVNlcnZlckNBLmNybDCBhwYIKwYBBQUHAQEEezB5MFEGCCsGAQUFBzAChkVodHRw
-Oi8vY3J0LmNvbW9kb2NhLmNvbS9DT01PRE9SU0FFeHRlbmRlZFZhbGlkYXRpb25T
-ZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9k
-b2NhLmNvbTBlBgNVHREEXjBcgg1hZGZzLnVuY28uZWR1ggtmcy51bmNvLmVkdYIP
-aXRmczAxLnVuY28uZWR1gg9pdGZzMDIudW5jby5lZHWCDmxvZ2luLnVuY28uZWR1
-ggxzdHMudW5jby5lZHUwggGABgorBgEEAdZ5AgQCBIIBcASCAWwBagB3AGj2mPgf
-ZIK+OozuuSgdTPxxUV1nk9RE0QpnrLtPT/vEAAABSycOt7UAAAQDAEgwRgIhAKEo
-RRYI2zxMltEzCHZQY5kg+CtHodhna5yvmMEGC7GnAiEAkTv2TLNgoKBEd0QanXZh
-Go5ipD0VoPNm4J1JM2icfCwAdgCkuQmQtBhYFIe7E6LMZ3AKPDWYBPkb37jjd80O
-yA3cEAAAAUsnDretAAAEAwBHMEUCIAJV9oiHwwIcBjtzB3OyN7adPpVGiTkasPYS
-fv2q9NBrAiEAkH9HG/7cMs4pXnc1zFRAmcQunwEkGkktmffAlYFgUhoAdwBWFAaa
-L9fC7NP14b1Esj7HRna5vJkRXMDvlJhV1onQ3QAAAUsnDrbsAAAEAwBIMEYCIQCY
-8JCDjDHKIHoc0q5n+G6yMASzE/CM9oyqrKQbozXT8QIhAKM4VarR5UOAu1tu0+Kh
-wFFLGjl6+KZpwjGpmsYPr7vtMA0GCSqGSIb3DQEBCwUAA4IBAQA7S/GfVcQXXjwu
-hnwemg3hMyUiwrdmpoYS2vli6G3SZLtJoG034dTl0ngyQwz/9vEAoh9oMwjNX3wC
-041VVoKKu1OCa2wGTM5GAzw/4G56r5lU+eiwP4qXquq/2SU73uvbwzVPieCVBy4P
-6vMWeBN3mw1dWYo5OhACpC3JRB5mHaH+ZCa0ijjsFinMLMWc6eB1qA6vtQrnbGir
-3bbef7gCKD5bHCKEjvb/RAuxZ1UaRWBZQJSy6LSgmbvcKqYoKGg+aGFfeT0SvEVC
-xpdQMcF6UScqUv7lT0A04YG40YHt39PQZrs9Ka63kfcY7hN0jGtsbUdHl9U1ogms
-Ofj2esCI
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.unco.edu/adfs/services/trust/artifactresolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.unco.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.unco.edu/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Northern Colorado</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Northern Colorado</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unco.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ID Management Group</md:GivenName>
-    <md:EmailAddress>ID.Management@unco.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Technical Support Center</md:GivenName>
-    <md:EmailAddress>TSC.Support@unco.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs.yz.yamagata-u.ac.jp-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs.yz.yamagata-u.ac.jp-adfs-services-trust.xml
deleted file mode 100644
index c1844a6d..00000000
--- a/swamid-interfederations-2.0/adfs.yz.yamagata-u.ac.jp-adfs-services-trust.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs.yz.yamagata-u.ac.jp/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.gakunin.jp" registrationInstant="2012-02-22T04:06:22Z">
-      <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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md: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://adfs.yz.yamagata-u.ac.jp/adfs/adfs/ls/IdpInitiatedSignOn.aspx" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SharePoint Foundation Service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ja">シェアポイントサービス</mdui:DisplayName>
-        <mdui:Description xml:lang="ja">山形大学が提供するWindows系OSで動作するSPへの認証連携サービス．ユーザ向けサービスとしては，Sharepoint Foundationやe-サイエンスプラットフォームの提供する予定です．</mdui:Description>
-        <mdui:InformationURL xml:lang="ja">https://adfs.yz.yamagata-u.ac.jp/</mdui:InformationURL>
-        <mdui:Logo height="43" width="120">https://a.yamagata-u.ac.jp/amenity/img/federationbanner.aspx</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE1zCCA7+gAwIBAgIIQS0FCDHAioYwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UE
-BhMCSlAxETAPBgNVBAcTCEFjYWRlbWUyMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0
-aXR1dGUgb2YgSW5mb3JtYXRpY3MxDTALBgNVBAsTBFVQS0kxIDAeBgNVBAsTF05J
-SSBPcGVuIERvbWFpbiBDQSAtIEcyMB4XDTE0MDIyNjA3NTMwM1oXDTE2MDMyNzA4
-MDMwM1owgYIxCzAJBgNVBAYTAkpQMREwDwYDVQQHEwhBY2FkZW1lMjEcMBoGA1UE
-ChMTWWFtYWdhdGEgVW5pdmVyc2l0eTEfMB0GA1UECxMWRmFjdWx0eSBvZiBFbmdp
-bmVlcmluZzEhMB8GA1UEAxMYYWRmcy55ei55YW1hZ2F0YS11LmFjLmpwMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+Pt+7VATkbKs+83jX7yK4xW+aIV
-71fsrId64IUFGSzeLcg8DbPIdeIdcJFfY4NZR15t8hU0IjMDx0D0Qz2oxLpZz1OD
-dQz1kZuN2hmaAGL9m4b6taRPl1WPcG7PrEVqAqUqQbmfHvt/8vEiVyDY5Mtmatgn
-tw4Av2fFe3uM1XuPbsNArQ7KzH1sNmAE9AIYEQv93fFOIA97t1RTfOVnttMfzQS/
-MyR0hr786ZZzMOIM4Ustg+VP4yWj0+eO039xKiW3VnA0KUNi+KlL0FldKBp2cdI5
-J7eMIFdzYRFRRxrOWSYfyhtRBK2gKMil4838RDaMXNUwO737UYD2h+wwtwIDAQAB
-o4IBUzCCAU8wDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0G
-A1UdDgQWBBTfko5e2B2zNVY0VDLQIwwp9TmZ8zAfBgNVHSMEGDAWgBR7Cgf3GMqM
-DtbavFCAbCxHAtEN+zAjBgNVHREEHDAaghhhZGZzLnl6LnlhbWFnYXRhLXUuYWMu
-anAwZgYDVR0gBF8wXTBNBgoqgwiMnB4BAgIBMD8wPQYIKwYBBQUHAgEWMWh0dHBz
-Oi8vcmVwbzEuc2Vjb210cnVzdC5uZXQvc3BjcHAvY3BzL2luZGV4Lmh0bWwwDAYK
-KoMIjJsbZIcFATBIBgNVHR8EQTA/MD2gO6A5hjdodHRwOi8vcmVwbzEuc2Vjb210
-cnVzdC5uZXQvc3BwY2EvbmlpL29kY2EyL2Z1bGxjcmwuY3JsMBEGCWCGSAGG+EIB
-AQQEAwIGQDANBgkqhkiG9w0BAQUFAAOCAQEANlm58vz9JAzddz3PM/nndM5k948P
-ySIoBYycZ5WzvKok5cq71x9uwZ50ZWAt3ru8p/ARLK/AkirrgWpcu6Zz6CxOR8WK
-GBSjDsiLJ1/u2CW3i+G1pCZHtw6PfLVbBTFJTQUoPHb6Gq06w7XkK054/lb00h7T
-12nVVteu0PKFn4DtRtyTC9VT/EdPwocGQNHcgtzuUR+P/EpyKJnIIqvStueFoMs5
-FqvmriGO8NgObxRz1X8x1w5jx34iIXCberb2U8Kx1Cb4gO7EJAFx0nCyvHOaUJlt
-CpjWNdmP/KMtEP9w4Of6RWQudObp2gGhtUfrlP7devqnJsZjmIZR3R5kvg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adfs.yz.yamagata-u.ac.jp/adfs/ls/" index="5"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="ja">シェアポイントサービス</md:ServiceName>
-      <md:ServiceName xml:lang="en">SharePoint Foundation Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="ja">山形大学が提供するWindows系OSで動作するSPへの認証連携サービス．ユーザ向けサービスとしては，Sharepoint Foundationやe-サイエンスプラットフォームの提供する予定です．</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Yamagata University</md:OrganizationName>
-    <md:OrganizationName xml:lang="ja">山形大学</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SharePoint Foundation Service</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="ja">シェアポイントサービス</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.yamagata-u.ac.jp/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tomohiro</md:GivenName>
-    <md:SurName>Ito</md:SurName>
-    <md:EmailAddress>mailto:tomohiro@yz.yamagata-u.ac.jp</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.xml
deleted file mode 100644
index e04286c8..00000000
--- a/swamid-interfederations-2.0/adfs01.fhs.se-adfs-services-trust.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="http://adfs01.fhs.se/adfs/services/trust">
-  <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:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhs.se</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.fhs.se</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">op.fhs.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Försvarshögskolan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish National Defence College</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Försvarshögskolan</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Swedish National Defence College</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.fhs.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.fhs.se/en/</mdui:InformationURL>
-        <mdui:Logo height="118" width="106" xml:lang="sv">https://www.fhs.se/files/sidhuvud/logotyp-sv.jpg</mdui:Logo>
-        <mdui:Logo height="116" width="103" xml:lang="en">https://www.fhs.se/files/sidhuvud/logotyp-en.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">fhs</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">fhs</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>fhs.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIQO7k5W9bEBJdDpzGopgV4OzANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBhZGZzMDEuZmhzLnNlMB4XDTE1MTIwNDAwMTgxN1oXDTE2MTIwMzAwMTgxN1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALfykzr9WnvSwX4yhG6rLbTwvvAXcvMWyUcbV5usDITt2FpdPyD7eMOJVoefIimvQGQ3JKlnoKwsTBMNZGJIaKXNRX06rYjOr2Isip0f7BLxiHXAJcif80MLqeuXRGELa0Z5en3irAscOGOWtpxYebslAAhZZqjOUbU4BlvutwCPa/FIqPhLhWoWkfXy8/Bs1VYnSCWCAO5UTRFzRi3K8glKy/1NFiP90LapP+/V1U+Zr3/rGg+2usWFjADPEFjFj7bnFC2pmxuEQf0F0XFC6s8mbXOOcsHGqvKrsQdgeqfBJMHofhh0hkTA9Gsl8TP4yRT5NQ80EA8ry6Zko6TmcC8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEANAq63e5sekNfz1PnSG1dLGa9xpMCz3Nk5IyPb5ED7hrPXHXZG2FXRJDXHm2ux0yIOhS0uLkoApAupXiE87pga/6aPod2fSGbBgihRIBNRuAr7g7HjL5w5N0gZPEzby3fYqFR0L4qRxALWbnYfFAjPbY+KfRs86TVgSBFoSY6N5+MYGtcoAL7wl0TRO3aua8uHsTZp8pZ4/CxSmLL1tC1abVuoqD7EcwWJq0tRdrI7UM1vjAWiLMvsp3XS+7LHvZXVXnYnp/rVpSnkA8C7ApthhV7s4ms2ecUYUO1t8AHBgYRQ/kme0Twd7SddHyAwN/PZVGwu3bPIPbUgg374YP69g==</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>MIIC1jCCAb6gAwIBAgIQYSuOi8k52qFDiHIcmLzhUzANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE0MTIyMzIxNDgxMVoXDTE1MTIyMzIxNDgxMVowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeZpLVFfRtz3BFIEKaCOcf0w3041Vna4JAhxKT9hkhMW5TSh2S7hcgBiRm6Q2olmBtc+KMN9ReJT1ZJzQUa27qaGRepO/M+isJk4QqL9zOX/BpYFEWTRYMLlqqukZBhtwdtluIMCJlAClccRSikCx+bGN+fcPwfrv3T2y+C+MMp8GIN/QWJf97GEP5XR9VooItR8+nkUm1FOkvKMr5xFwZfilXQTzDer3Z42yMYRpr8rw7QdMJP11A7v7NIZTYRQIU+Qi0uPsvRI5FI7IG3NWyepslS1vwjU/dpKeBUYLQwwRxvV09YX+ULSKpClm2oZ7LuE/vt7Bok6vnPa3TG+i0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAktHUw5HNOOH/ETVIeAgdi5FXq5e8maX8Qe5vFsWRWPTP9MygRwNajY07XpXQmw2CKbAzY6ZD2RoA7g9swBpCcNYuJmAnA3LtyFiRrog/+XzWeRt7tbqDjiYZiBdVD84JbfVMD3q0Pi4iLn+KPAmYajYAzftf1vKr/fvwFt2D2eR+sXefEmcwNPSFFma0umEgSajxiN4gdTA3ZMTNV1J5tv1cwb9TYx0mDHP+FCwsEE2bHsDk5CDBWpgFVvEiQwfra1amz+BIPWG5Nln9bedfE0BjdGH5OK424DBwBTygzBV8OM9jB7dOcaA+0K0/UduM+ka42XxP7WFrq3VKmGfCbg==</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>MIIC1jCCAb6gAwIBAgIQMXP1/ezaSIZIOp/pjOiCgDANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBhZGZzMDEuZmhzLnNlMB4XDTE1MTIwNDAwMTgyMloXDTE2MTIwMzAwMTgyMlowJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gYWRmczAxLmZocy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALdO7kcKNsClDGcJNKysS7MxE6iNlMAYxIkoJju5qvxjazuHxKmOzScYv1x83pw0VhJRg3psmus52tynauQ0Rvsba8F7Ngk6W9e21MbPjpMdF68k2x0zWnNpg+fMDoEWTds5S6QNUzsKp3eaI2tkMny8Ng33ZD2XvjkG/T7BDkIeH1aZvA1COBqNPx0WS7usc9LYtdNghdn24H7ZlcPCokZJbeDnbuUNS7c/mjQLXKKExUFcoEKduEeUF3zeT2D531TSLNwiJ9iQJ9rRFWK7hrgr2oP+sdojvoeI8cwP/TSGWfvDoU1sRZ9qTlSN+b0W/MnSkdKBzRjTCMpRa/ABvWkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAo9sQIrRQ3uEENG/oyrmV65NUb3Ta9fd28VHq1Rk/M5UUeqzsO6Agyt3YBAdaeRgGw8l6NBG+XFyNjLsGY9gND64gQF+65zSrEwdbwqEFciR0ZNVw1E3Bqq7W4MjeH4EtG5eTplvR3A77vfKy/vFXn13draGgZOX7e2mJ/CNK4drUYNvMorf2+ZcP1FjvypV91bY8g168+0lZYHGYrmy4ajVBvFZ82LJuW2OCZ4KPLIY51qpNiMeikePzUNc6/CKJ0zLq4bRRSy2kCyj0Pq2dwV+N0WAVGFJ8uxDRZx7AFG5+JcajSyDYHVVjUIzzqS8UDVV7/XWAQmWcEU4eNid1Hg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs01.fhs.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs01.fhs.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs01.fhs.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://adfs01.fhs.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs01.fhs.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs01.fhs.se/adfs/ls/"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="E-Mail Address" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Given Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="UPN" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Common Name" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x E-Mail Address" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x UPN" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Role" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Surname" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="PPID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name ID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication time stamp" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication method" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only group SID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Windows account name" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="eduPersonScopedAffiliation" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Försvarshögskolan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Försvarshögskolan</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish National Defence College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.fhs.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Swedish Defence University</md:Company>
-    <md:SurName>FHS IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@fhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 55342545</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Swedish Defence University</md:Company>
-    <md:SurName>FHS IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@fhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 55342545</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Swedish Defence University</md:Company>
-    <md:SurName>FHS IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@fhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 08 55342545</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adfs01.kempel.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs01.kempel.nl-adfs-services-trust.xml
deleted file mode 100644
index 74d5bb9f..00000000
--- a/swamid-interfederations-2.0/adfs01.kempel.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs01.kempel.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-11-16T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Hogeschool de Kempel</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hogeschool de Kempel</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hogeschool de Kempel</mdui:Description>
-        <mdui:Description xml:lang="en">Hogeschool de Kempel</mdui:Description>
-        <mdui:Logo height="79" width="108">https://static.surfconext.nl/logos/idp/kempel.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Hogeschool de Kempel</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Hogeschool de Kempel</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/5ed01520efa3f5c56ae3638e4c6d74aa"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Hogeschool de Kempel</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Hogeschool de Kempel</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kempel.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/adfs1.oba.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs1.oba.nl-adfs-services-trust.xml
deleted file mode 100644
index be42e3d1..00000000
--- a/swamid-interfederations-2.0/adfs1.oba.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs1.oba.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-18T13:37:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Openbare Bibliotheek Amsterdam (OBA)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Openbare Bibliotheek Amsterdam (OBA)</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Openbare Bibliotheek Amsterdam (OBA)</mdui:Description>
-        <mdui:Description xml:lang="en">Openbare Bibliotheek Amsterdam (OBA)</mdui:Description>
-        <mdui:Logo height="48" width="48">https://static.surfconext.nl/logos/idp/oba.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Openbare Bibliotheek Amsterdam OBA</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Openbare Bibliotheek Amsterdam OBA</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/effd01c35b2da13885151fd82ac263a2"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Openbare Bibliotheek Amsterdam (OBA)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Openbare Bibliotheek Amsterdam (OBA)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.oba.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/adfs2.cito.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs2.cito.nl-adfs-services-trust.xml
deleted file mode 100644
index c936304c..00000000
--- a/swamid-interfederations-2.0/adfs2.cito.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs2.cito.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Cito</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Cito</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Cito</mdui:Description>
-        <mdui:Description xml:lang="en">Cito</mdui:Description>
-        <mdui:Logo height="48" width="94">https://static.surfconext.nl/logos/idp/cito.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">cito</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">cito</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/b6dcca08852d4131ee33fa6e84d2ef65"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cito</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cito</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cito.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/adfs2.fontys.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs2.fontys.nl-adfs-services-trust.xml
deleted file mode 100644
index fa7624a6..00000000
--- a/swamid-interfederations-2.0/adfs2.fontys.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs2.fontys.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-12-11T11:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Fontys Hogescholen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Fontys Hogescholen</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Fontys Hogescholen</mdui:Description>
-        <mdui:Description xml:lang="en">Fontys Hogescholen</mdui:Description>
-        <mdui:Logo height="57" width="75">https://static.surfconext.nl/logos/idp/fontys.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Fontys Hogescholen</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Fontys Hogescholen</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/21e7ca4dead72cd88930d6972611baac"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Fontys Hogescholen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Fontys Hogescholen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://fontys.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/adfs20.hva.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs20.hva.nl-adfs-services-trust.xml
deleted file mode 100644
index 9d9b1e08..00000000
--- a/swamid-interfederations-2.0/adfs20.hva.nl-adfs-services-trust.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="http://adfs20.hva.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-25T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Hogeschool van Amsterdam</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hogeschool van Amsterdam</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hogeschool van Amsterdam</mdui:Description>
-        <mdui:Description xml:lang="en">Hogeschool van Amsterdam</mdui:Description>
-        <mdui:Logo height="44" width="266">https://static.surfconext.nl/logos/idp/hva.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Hogeschool van Amsterdam hva HBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Hogeschool van Amsterdam hva HBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/03466f0351c4c98ad0e435706253d05f"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Hogeschool van Amsterdam</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Hogeschool van Amsterdam</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Hogeschool van Amsterdam</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Hogeschool van Amsterdam</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.hva.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hva.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/adfs2prod.aventus.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs2prod.aventus.nl-adfs-services-trust.xml
deleted file mode 100644
index e9f21497..00000000
--- a/swamid-interfederations-2.0/adfs2prod.aventus.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs2prod.aventus.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-24T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">ROC Aventus</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ROC Aventus</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">ROC Aventus</mdui:Description>
-        <mdui:Description xml:lang="en">ROC Aventus</mdui:Description>
-        <mdui:Logo height="33" width="108">https://static.surfconext.nl/media/idp/aventus.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">ROC Aventus MBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">ROC Aventus MBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/6d2b9e04e943f721ccde0f28862cec4c"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ROC Aventus</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ROC Aventus</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surffederatie.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/adfs3host.proxy.rocmn.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs3host.proxy.rocmn.nl-adfs-services-trust.xml
deleted file mode 100644
index bfe1f5b8..00000000
--- a/swamid-interfederations-2.0/adfs3host.proxy.rocmn.nl-adfs-services-trust.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="http://adfs3host.proxy.rocmn.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-17T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">ROC Midden Nederland</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ROC Midden Nederland</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">ROC Midden Nederland is een onderwijsorganisatie voor middelbaar beroepsonderwijs, voortgezet onderwijs voor volwassen (VAVO Lyceum), bedrijfsopleidingen en participatieonderwijs in de provincie Utrecht.</mdui:Description>
-        <mdui:Description xml:lang="en">ROC Midden Nederland is een onderwijsorganisatie voor middelbaar beroepsonderwijs, voortgezet onderwijs voor volwassen (VAVO Lyceum), bedrijfsopleidingen en participatieonderwijs in de provincie Utrecht.</mdui:Description>
-        <mdui:Logo height="70" width="130">https://static.surfconext.nl/logos/idp/ROCMNlogo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">rocmn ROC Midden Nederland</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">rocmn ROC Midden Nederland</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/bbde5129d0d6c08aefc07ed679db3145"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">ROC Midden Nederland</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">ROC Midden Nederland</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">ROC Midden Nederland</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ROC Midden Nederland</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.rocmn.nl</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.rocmn.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/adfs3prod.aventus.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfs3prod.aventus.nl-adfs-services-trust.xml
deleted file mode 100644
index 63be3438..00000000
--- a/swamid-interfederations-2.0/adfs3prod.aventus.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfs3prod.aventus.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-24T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">ROC Aventus</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ROC Aventus</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">ROC Aventus</mdui:Description>
-        <mdui:Description xml:lang="en">ROC Aventus</mdui:Description>
-        <mdui:Logo height="300" width="500">https://static.surfconext.nl/logos/idp/aventus3.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">ROC Aventus MBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">ROC Aventus MBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/7999608342368fe274d574d8ff34a63b"/>
-  </md:IDPSSODescriptor>
-  <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/adfsv2.inholland.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/adfsv2.inholland.nl-adfs-services-trust.xml
deleted file mode 100644
index bd8849b4..00000000
--- a/swamid-interfederations-2.0/adfsv2.inholland.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://adfsv2.inholland.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-30T11:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Hogeschool Inholland</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Inholland University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hogeschool Inholland</mdui:Description>
-        <mdui:Description xml:lang="en">Hogeschool Inholland</mdui:Description>
-        <mdui:Logo height="37" width="108">https://static.surfconext.nl/logos/idp/inholland.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Hogeschool Inholland Inholland University of Applied Sciences HBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Hogeschool Inholland Inholland University of Applied Sciences HBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/dd83a803b7fa1f345d9e8cba6ba7826f"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Inholland University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Inholland University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.inholland.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/admin.safetynet.rmplc.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/admin.safetynet.rmplc.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 0b893295..00000000
--- a/swamid-interfederations-2.0/admin.safetynet.rmplc.co.uk-shibboleth-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://admin.safetynet.rmplc.co.uk/shibboleth-sp">
-  <!--
-		This is a "RM Safetynet" Shibboleth SP for RM Education plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://admin.safetynet.rmplc.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAIDKIKpmE2tBMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2FkbWluLnNhZmV0eW5ldC5ybXBsYy5jby51azAeFw0xMDA0MDgxNjE2MTha
-						Fw0yMDA0MDUxNjE2MThaMCYxJDAiBgNVBAMTG2FkbWluLnNhZmV0eW5ldC5ybXBs
-						Yy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyO69kuQy4+
-						R7W0KgA21wY7EnbY2qr8K1AKfX87jvsfDX5Jg+XwifaI/8f8sIju9jlgg0S2ju+M
-						uWQyCYV6cCMp790MEXXaOR0PiAkrallrkYg/+FbP7+flmOrPhj6UWCAc80ZWJ8wx
-						U6Un+UpDpmhRrQWjOn0sOW6PvkbZlRrEtW6XJ2PfhOCHHfAJIcB/r4frQFvmGBk1
-						6e24W46xEPi2gznxM9MRm/MMBnFHBzHlpgu+QmL+gBI6OQ0Gr1nmZgcTJqEJCahk
-						dp51SjegGKmXXWAdV7pGYkoRrwYH6TryXNaHUXQn0zoS+aa1kZIf0dVp0S508go6
-						aqwe92WWsAcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbYWRtaW4uc2FmZXR5bmV0LnJt
-						cGxjLmNvLnVrMB0GA1UdDgQWBBTiUv6qHBxNTHW11t8mP9SXPRvMmjANBgkqhkiG
-						9w0BAQUFAAOCAQEAhVafLlFnznxyNY5Zls8IiCN2kAqwUN5iBuVx2Q749LcVHlGy
-						NtTZVpLWcrZsklTl2mBJuGI5XjqjuEu/UJtaRx0p6oC32Pg2R8/McMcJjLtbwA9X
-						pIZsuOfARLq0AFS9ncrgZtVrua9YErJSWSCUkzZgJTu/1Aelc1Dlojdmp22GH4Rn
-						Fr1hRdDgtzpAwdBpxPdai7Pdaf47QVRSgfDjCuJ2zJopboYAbnk6UAuiLWDuLtcB
-						o8UiVcMPP/vvRio3IzTVoEKAmb8/EENkXRSR+we7CKNAQhZBvTvC2oWruki4UmMK
-						aFvLcsb+dVUZ5xAnv9teHQR18B9PVW+1Se6k3A==
-					</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>
-						MIIDGDCCAgCgAwIBAgIJAIDKIKpmE2tBMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2FkbWluLnNhZmV0eW5ldC5ybXBsYy5jby51azAeFw0xMDA0MDgxNjE2MTha
-						Fw0yMDA0MDUxNjE2MThaMCYxJDAiBgNVBAMTG2FkbWluLnNhZmV0eW5ldC5ybXBs
-						Yy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyO69kuQy4+
-						R7W0KgA21wY7EnbY2qr8K1AKfX87jvsfDX5Jg+XwifaI/8f8sIju9jlgg0S2ju+M
-						uWQyCYV6cCMp790MEXXaOR0PiAkrallrkYg/+FbP7+flmOrPhj6UWCAc80ZWJ8wx
-						U6Un+UpDpmhRrQWjOn0sOW6PvkbZlRrEtW6XJ2PfhOCHHfAJIcB/r4frQFvmGBk1
-						6e24W46xEPi2gznxM9MRm/MMBnFHBzHlpgu+QmL+gBI6OQ0Gr1nmZgcTJqEJCahk
-						dp51SjegGKmXXWAdV7pGYkoRrwYH6TryXNaHUXQn0zoS+aa1kZIf0dVp0S508go6
-						aqwe92WWsAcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbYWRtaW4uc2FmZXR5bmV0LnJt
-						cGxjLmNvLnVrMB0GA1UdDgQWBBTiUv6qHBxNTHW11t8mP9SXPRvMmjANBgkqhkiG
-						9w0BAQUFAAOCAQEAhVafLlFnznxyNY5Zls8IiCN2kAqwUN5iBuVx2Q749LcVHlGy
-						NtTZVpLWcrZsklTl2mBJuGI5XjqjuEu/UJtaRx0p6oC32Pg2R8/McMcJjLtbwA9X
-						pIZsuOfARLq0AFS9ncrgZtVrua9YErJSWSCUkzZgJTu/1Aelc1Dlojdmp22GH4Rn
-						Fr1hRdDgtzpAwdBpxPdai7Pdaf47QVRSgfDjCuJ2zJopboYAbnk6UAuiLWDuLtcB
-						o8UiVcMPP/vvRio3IzTVoEKAmb8/EENkXRSR+we7CKNAQhZBvTvC2oWruki4UmMK
-						aFvLcsb+dVUZ5xAnv9teHQR18B9PVW+1Se6k3A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://admin.safetynet.rmplc.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RM Education plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RM Education plc: RM Safetynet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rm.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Support Contact</GivenName>
-    <EmailAddress>mailto:shibsupport@ifl.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shibboleth Technical Contact</GivenName>
-    <EmailAddress>mailto:shibtechcontact@ifl.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index c14f7643..00000000
--- a/swamid-interfederations-2.0/admin.vpp.midlands3cities.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.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://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <!--
-		This is a "M3C Administration" simpleSAMLphp SP for the University of Nottingham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-17T10:17:54Z">
-      <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>
-      <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://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">M3C Administration</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Virtual Postgraduate Platform administration console</mdui:Description>
-        <mdui:Logo height="64" width="143">https://vpp.midlands3cities.ac.uk/shibboleth-ds/logo_transparent.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFnzCCBIegAwIBAgIJAJo8nGGZ+AUAMA0GCSqGSIb3DQEBBQUAMIHkMQswCQYD
-						VQQGEwJVSzEYMBYGA1UECBMPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHEwpOb3Rp
-						dG5naGFtMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xHTAbBgNV
-						BAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMSgwJgYDVQQDEx9hZG1pbi52cHAubWlk
-						bGFuZHMzY2l0aWVzLmFjLnVrMTowOAYJKoZIhvcNAQkBFit1aS1hcHBsaWNhdGlv
-						bi1kZXZlbG9wbWVudEBub3R0aW5naGFtLmFjLnVrMB4XDTE1MDgyNzA3MzA1N1oX
-						DTI1MDgyNjA3MzA1N1owgeQxCzAJBgNVBAYTAlVLMRgwFgYDVQQIEw9Ob3R0aW5n
-						aGFtc2hpcmUxEzARBgNVBAcTCk5vdGl0bmdoYW0xITAfBgNVBAoTGFVuaXZlcnNp
-						dHkgb2YgTm90dGluZ2hhbTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMx
-						KDAmBgNVBAMTH2FkbWluLnZwcC5taWRsYW5kczNjaXRpZXMuYWMudWsxOjA4Bgkq
-						hkiG9w0BCQEWK3VpLWFwcGxpY2F0aW9uLWRldmVsb3BtZW50QG5vdHRpbmdoYW0u
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZfHcd5M8ywt10
-						r1IGXI041IBcZkrf92pLr3tNki3WeDFcMc0fYgTM3bQURnQX4vPwHxGg688/KNg/
-						0tTAiqdKH1z59OXbKEeRUga4iV+iS3cMJh4wdTM2j7Ii1nWkOXwucJOsYM/1Ctxk
-						PsWxLbbeROEPHKDcetcItpKcgGA9L3gJmgIGW/XhNViOCw/eXsK32JY3V8rgsZnN
-						LJs31ecTZrE6Xii03FgmY2CwIbclqGOcpJujOYy2IdiAkg+g0IhQQfUjJflk2487
-						g9LMMr6Gs2AB80fCpbNBifxHZjiLvjVDvIOqbBRE4Dwj6QX4ATGz6MV1L8+dXb12
-						Rnr1JzNjAgMBAAGjggFQMIIBTDAdBgNVHQ4EFgQU0KQ+wxVQfSjnHvZStfyP7kEf
-						OqUwggEbBgNVHSMEggESMIIBDoAU0KQ+wxVQfSjnHvZStfyP7kEfOqWhgeqkgecw
-						geQxCzAJBgNVBAYTAlVLMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNV
-						BAcTCk5vdGl0bmdoYW0xITAfBgNVBAoTGFVuaXZlcnNpdHkgb2YgTm90dGluZ2hh
-						bTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxKDAmBgNVBAMTH2FkbWlu
-						LnZwcC5taWRsYW5kczNjaXRpZXMuYWMudWsxOjA4BgkqhkiG9w0BCQEWK3VpLWFw
-						cGxpY2F0aW9uLWRldmVsb3BtZW50QG5vdHRpbmdoYW0uYWMudWuCCQCaPJxhmfgF
-						ADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAbX/FnL9VG4/wFGObq
-						uHUJBbxyauoDL0EsZfC5n77GQ1y6I2S0QONYoHo73jjZChgTh4ehs7T4jEH44jIB
-						9+Mk+PINIuuqAFr/O2bT3W5095QhfsSwUrflJ6EiyzbBLkwzR7lXdI+NX49Ac8t9
-						ix6jdDSFuFkk0mflSWK/CWbh9yg+WJSeZAMVeZouZFG5LwJc9I//Bd2QARkXDniL
-						EQE0sXwP+xYb9jSS6rjHhXYbpOdp8Di6R1/WuqlytpKCZ0BSk2R/jhBdjE0eFrba
-						VhBFdDAYO44lUzzsyNRuoEMSvhHWhUBp2369nuoAl0Y0qST19KxMB6UWU6GhnKa8
-						MhTV
-					</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>
-						MIIFnzCCBIegAwIBAgIJAJo8nGGZ+AUAMA0GCSqGSIb3DQEBBQUAMIHkMQswCQYD
-						VQQGEwJVSzEYMBYGA1UECBMPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHEwpOb3Rp
-						dG5naGFtMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xHTAbBgNV
-						BAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMSgwJgYDVQQDEx9hZG1pbi52cHAubWlk
-						bGFuZHMzY2l0aWVzLmFjLnVrMTowOAYJKoZIhvcNAQkBFit1aS1hcHBsaWNhdGlv
-						bi1kZXZlbG9wbWVudEBub3R0aW5naGFtLmFjLnVrMB4XDTE1MDgyNzA3MzA1N1oX
-						DTI1MDgyNjA3MzA1N1owgeQxCzAJBgNVBAYTAlVLMRgwFgYDVQQIEw9Ob3R0aW5n
-						aGFtc2hpcmUxEzARBgNVBAcTCk5vdGl0bmdoYW0xITAfBgNVBAoTGFVuaXZlcnNp
-						dHkgb2YgTm90dGluZ2hhbTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMx
-						KDAmBgNVBAMTH2FkbWluLnZwcC5taWRsYW5kczNjaXRpZXMuYWMudWsxOjA4Bgkq
-						hkiG9w0BCQEWK3VpLWFwcGxpY2F0aW9uLWRldmVsb3BtZW50QG5vdHRpbmdoYW0u
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZfHcd5M8ywt10
-						r1IGXI041IBcZkrf92pLr3tNki3WeDFcMc0fYgTM3bQURnQX4vPwHxGg688/KNg/
-						0tTAiqdKH1z59OXbKEeRUga4iV+iS3cMJh4wdTM2j7Ii1nWkOXwucJOsYM/1Ctxk
-						PsWxLbbeROEPHKDcetcItpKcgGA9L3gJmgIGW/XhNViOCw/eXsK32JY3V8rgsZnN
-						LJs31ecTZrE6Xii03FgmY2CwIbclqGOcpJujOYy2IdiAkg+g0IhQQfUjJflk2487
-						g9LMMr6Gs2AB80fCpbNBifxHZjiLvjVDvIOqbBRE4Dwj6QX4ATGz6MV1L8+dXb12
-						Rnr1JzNjAgMBAAGjggFQMIIBTDAdBgNVHQ4EFgQU0KQ+wxVQfSjnHvZStfyP7kEf
-						OqUwggEbBgNVHSMEggESMIIBDoAU0KQ+wxVQfSjnHvZStfyP7kEfOqWhgeqkgecw
-						geQxCzAJBgNVBAYTAlVLMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNV
-						BAcTCk5vdGl0bmdoYW0xITAfBgNVBAoTGFVuaXZlcnNpdHkgb2YgTm90dGluZ2hh
-						bTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxKDAmBgNVBAMTH2FkbWlu
-						LnZwcC5taWRsYW5kczNjaXRpZXMuYWMudWsxOjA4BgkqhkiG9w0BCQEWK3VpLWFw
-						cGxpY2F0aW9uLWRldmVsb3BtZW50QG5vdHRpbmdoYW0uYWMudWuCCQCaPJxhmfgF
-						ADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAbX/FnL9VG4/wFGObq
-						uHUJBbxyauoDL0EsZfC5n77GQ1y6I2S0QONYoHo73jjZChgTh4ehs7T4jEH44jIB
-						9+Mk+PINIuuqAFr/O2bT3W5095QhfsSwUrflJ6EiyzbBLkwzR7lXdI+NX49Ac8t9
-						ix6jdDSFuFkk0mflSWK/CWbh9yg+WJSeZAMVeZouZFG5LwJc9I//Bd2QARkXDniL
-						EQE0sXwP+xYb9jSS6rjHhXYbpOdp8Di6R1/WuqlytpKCZ0BSk2R/jhBdjE0eFrba
-						VhBFdDAYO44lUzzsyNRuoEMSvhHWhUBp2369nuoAl0Y0qST19KxMB6UWU6GhnKa8
-						MhTV
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://admin.vpp.midlands3cities.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">M3C Administration</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.midlands3cities.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:itservicedesk@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Betts</SurName>
-    <EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/admin.webfiltering.ja.net-shibboleth-sp.xml b/swamid-interfederations-2.0/admin.webfiltering.ja.net-shibboleth-sp.xml
deleted file mode 100644
index 2dceb0b5..00000000
--- a/swamid-interfederations-2.0/admin.webfiltering.ja.net-shibboleth-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://admin.webfiltering.ja.net/shibboleth-sp">
-  <!--
-		This is a "RM Safetynet JANET" Shibboleth SP for RM Education plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://admin.webfiltering.ja.net/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAIDKIKpmE2tBMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2FkbWluLnNhZmV0eW5ldC5ybXBsYy5jby51azAeFw0xMDA0MDgxNjE2MTha
-						Fw0yMDA0MDUxNjE2MThaMCYxJDAiBgNVBAMTG2FkbWluLnNhZmV0eW5ldC5ybXBs
-						Yy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyO69kuQy4+
-						R7W0KgA21wY7EnbY2qr8K1AKfX87jvsfDX5Jg+XwifaI/8f8sIju9jlgg0S2ju+M
-						uWQyCYV6cCMp790MEXXaOR0PiAkrallrkYg/+FbP7+flmOrPhj6UWCAc80ZWJ8wx
-						U6Un+UpDpmhRrQWjOn0sOW6PvkbZlRrEtW6XJ2PfhOCHHfAJIcB/r4frQFvmGBk1
-						6e24W46xEPi2gznxM9MRm/MMBnFHBzHlpgu+QmL+gBI6OQ0Gr1nmZgcTJqEJCahk
-						dp51SjegGKmXXWAdV7pGYkoRrwYH6TryXNaHUXQn0zoS+aa1kZIf0dVp0S508go6
-						aqwe92WWsAcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbYWRtaW4uc2FmZXR5bmV0LnJt
-						cGxjLmNvLnVrMB0GA1UdDgQWBBTiUv6qHBxNTHW11t8mP9SXPRvMmjANBgkqhkiG
-						9w0BAQUFAAOCAQEAhVafLlFnznxyNY5Zls8IiCN2kAqwUN5iBuVx2Q749LcVHlGy
-						NtTZVpLWcrZsklTl2mBJuGI5XjqjuEu/UJtaRx0p6oC32Pg2R8/McMcJjLtbwA9X
-						pIZsuOfARLq0AFS9ncrgZtVrua9YErJSWSCUkzZgJTu/1Aelc1Dlojdmp22GH4Rn
-						Fr1hRdDgtzpAwdBpxPdai7Pdaf47QVRSgfDjCuJ2zJopboYAbnk6UAuiLWDuLtcB
-						o8UiVcMPP/vvRio3IzTVoEKAmb8/EENkXRSR+we7CKNAQhZBvTvC2oWruki4UmMK
-						aFvLcsb+dVUZ5xAnv9teHQR18B9PVW+1Se6k3A==
-					</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>
-						MIIDGDCCAgCgAwIBAgIJAIDKIKpmE2tBMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2FkbWluLnNhZmV0eW5ldC5ybXBsYy5jby51azAeFw0xMDA0MDgxNjE2MTha
-						Fw0yMDA0MDUxNjE2MThaMCYxJDAiBgNVBAMTG2FkbWluLnNhZmV0eW5ldC5ybXBs
-						Yy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALyO69kuQy4+
-						R7W0KgA21wY7EnbY2qr8K1AKfX87jvsfDX5Jg+XwifaI/8f8sIju9jlgg0S2ju+M
-						uWQyCYV6cCMp790MEXXaOR0PiAkrallrkYg/+FbP7+flmOrPhj6UWCAc80ZWJ8wx
-						U6Un+UpDpmhRrQWjOn0sOW6PvkbZlRrEtW6XJ2PfhOCHHfAJIcB/r4frQFvmGBk1
-						6e24W46xEPi2gznxM9MRm/MMBnFHBzHlpgu+QmL+gBI6OQ0Gr1nmZgcTJqEJCahk
-						dp51SjegGKmXXWAdV7pGYkoRrwYH6TryXNaHUXQn0zoS+aa1kZIf0dVp0S508go6
-						aqwe92WWsAcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbYWRtaW4uc2FmZXR5bmV0LnJt
-						cGxjLmNvLnVrMB0GA1UdDgQWBBTiUv6qHBxNTHW11t8mP9SXPRvMmjANBgkqhkiG
-						9w0BAQUFAAOCAQEAhVafLlFnznxyNY5Zls8IiCN2kAqwUN5iBuVx2Q749LcVHlGy
-						NtTZVpLWcrZsklTl2mBJuGI5XjqjuEu/UJtaRx0p6oC32Pg2R8/McMcJjLtbwA9X
-						pIZsuOfARLq0AFS9ncrgZtVrua9YErJSWSCUkzZgJTu/1Aelc1Dlojdmp22GH4Rn
-						Fr1hRdDgtzpAwdBpxPdai7Pdaf47QVRSgfDjCuJ2zJopboYAbnk6UAuiLWDuLtcB
-						o8UiVcMPP/vvRio3IzTVoEKAmb8/EENkXRSR+we7CKNAQhZBvTvC2oWruki4UmMK
-						aFvLcsb+dVUZ5xAnv9teHQR18B9PVW+1Se6k3A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://admin.webfiltering.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RM Education plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RM Education plc: RM Safetynet JANET</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rm.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Support Contact</GivenName>
-    <EmailAddress>mailto:shibsupport@ifl.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shibboleth Technical Contact</GivenName>
-    <EmailAddress>mailto:shibtechcontact@ifl.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss-dev.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss-dev.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index be299f1c..00000000
--- a/swamid-interfederations-2.0/adss-dev.ox.ac.uk-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://adss-dev.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Development ADSS site" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-09-09T12:02:19Z">
-      <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://adss-dev.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+jCCAeKgAwIBAgIJALRbL0SFoPlaMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWFkc3MtZGV2Lm94LmFjLnVrMB4XDTEzMDkwNjA1MTUzMVoXDTIzMDkwNDA1
-						MTUzMVowHDEaMBgGA1UEAxMRYWRzcy1kZXYub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCuQ0pIlwNnrPL+HVvbWT2UQER/zvq7pmk06hz2
-						0LN1db0xAcMSjM25TMDk7HyCMRF9ccJh6TOPiHJMoWo9cTwkIWS5SMHEvwDXoSlT
-						yTMSNnlDvur/DUrzCUe5MHRwRcVPZK5Y+sZ8CFA6Ce0wMsdmbnibV/ENv/LGLHDj
-						iuoY28nn95SHAcbWFluckH6mx1WN+nba396qXfU4T9cH3kwNAjcltO4vN4OK1jX4
-						GCUVyrMtpcoqIPvUOZkGCq5oNQQMTKv1E7eDhhqk/Fd8wtfaYiZLhZZ4yLfEMOnl
-						xHzdWZHrMSWASKD78O5XBy2yHqsoZezZA1rpRuTCbUPyi3B/AgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEWFkc3MtZGV2Lm94LmFjLnVrMB0GA1UdDgQWBBRRqlphIc05j1bl
-						Jyp9PhFAS9c3KDANBgkqhkiG9w0BAQUFAAOCAQEAl5wymOP4JlgSCsa9JlkMvHRl
-						smc44HBXFPXfc4Tu1wDrkoWVxc0fQN0uF/U02AumJA7uDlENcGJ+/NHKBIA6m0wM
-						kLKaebcdxB/LBpPV2rYqfpbCklGZ9Tq09QTzPqZiiTwxbDennlcajal78OkTizdV
-						o7pu6V9WbjiAoAoyjGl3ab+YsZXw382uG2kH79JVgc+i8Mezx1lFCVvn7aoLGFdf
-						BcA77aH4dkhHyffN7L86jVDiZQ0RcfnsC34+vtvAcbt6+TFDDSCpANO1tOvoLirT
-						Z9iObgHErexwXys19e20DiNVrI9DE/xKHWZfIATT4J2DUMICKHJjqbdpOE7K4w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://adss-dev.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss-dev.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford development ADSS site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Hebron</SurName>
-    <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss-sup.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss-sup.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 46bafe5e..00000000
--- a/swamid-interfederations-2.0/adss-sup.ox.ac.uk-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://adss-sup.ox.ac.uk/shibboleth">
-  <!--
-		This is an "ADSS support site" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-12-03T11:05:28Z">
-      <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://adss-sup.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+jCCAeKgAwIBAgIJAKEmzYEyf7xxMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWFkc3Mtc3VwLm94LmFjLnVrMB4XDTE0MTEyNzEyMjkyMVoXDTI0MTEyNDEy
-						MjkyMVowHDEaMBgGA1UEAxMRYWRzcy1zdXAub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDSHfFTxy8aBmmoP8QKlFuozdECVsvolCQRUFps
-						dWeBq4LERrj68DTYRT8YDzK5IJ8tHQ4L3eEuOS1399MRV0BqkbjkVwipZPb8gTle
-						Ptj4jVsxk2/IshdO2HyRELiIvKV5DPmy059aLA7lx+20V3hQq++nb6GfhmBTQZ/b
-						dk9VFMMBfDnKvMjLM2jFUVO/lFSmbp+kkYybNQL6nt//KrQbrXDA3q/nSBXUHIgY
-						HD4Oziu946yM0y7awaLOGvlP2yzwGU3KpJdz53Fa4E63wiuG3eZAxz+1esNC1U14
-						LSx2RZiglivYkfkBku4X6WrqYiZiHBVsuK/4JVxpUjorBxVRAgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEWFkc3Mtc3VwLm94LmFjLnVrMB0GA1UdDgQWBBSDEebTgaTcHS2G
-						70WlBWHcgTCoizANBgkqhkiG9w0BAQUFAAOCAQEAj8hvwebVXE+tNgCiDt5LoyoY
-						P075Wguikjxn3vEmkTDcrjTT8K3bo0hTClf0hBHEQqATpR+2L8qbNe5bJSuUYUdV
-						/aMv8xwIyjkFF/9yxQTK2gCO8iw4mHWWVLAiu/wq+eidx7WtIO7PvhCO05u6muy3
-						nwlvQwyrn5SdmwRv5N2dBUu3iGDZABy47hDNQ1Rgtf+58TU9Cxe1mtEubuJ4k6hh
-						a5U4QaC4zu1wkpVeYKNzyRAL19XnE+faYuOuRPrQazh9df8EFKU4i55ZmWGUjQNZ
-						cNXil4aUZipFz0PcWQcen8w+6nc1blUDfD+1yYiFQTWaP0ZSICFJZFzMKX6bYQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://adss-sup.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss-sup.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Staff ADSS support site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Hebron</SurName>
-    <EmailAddress>mailto:rob.hebron@it.ox.ac.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss-tmp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d4bd639d..00000000
--- a/swamid-interfederations-2.0/adss-tmp.ox.ac.uk-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://adss-tmp.ox.ac.uk/shibboleth">
-  <!--
-		This is an "ADSS Temporary Environment" Shibboleth SP for University of Oxford.
-	-->
-  <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="2014-08-14T13:53:48Z">
-      <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://adss-tmp.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+jCCAeKgAwIBAgIJALGFNW/JEWeXMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWFkc3MtdG1wLm94LmFjLnVrMB4XDTE0MDgwNjE0MjU0NloXDTI0MDgwMzE0
-						MjU0NlowHDEaMBgGA1UEAxMRYWRzcy10bXAub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCzt7iOu1lzJd5ltK+P6HyoJ9alCZnHvLhwxcFq
-						xrKG7/lSfhFsapOTrv+BO31HFx1TSJ+JhnjjZwS6FnIG6fadfU16TIiGkqxUHO4m
-						/bdqpQDtCa0cgBH6wUzUq1ErZgOswoOnatg3axFSUKQ0KEU6OSmhscH30Yvzd/OL
-						If8cD43EDmB55h34cAIZxIYb6mtWAKhun21+Qcxwh1pqVHT2dTdt1X0gmgUzUQ2d
-						58nezP2XkNJ5wbyl4onuZgVu1bwzqR3JjzHaCzRLS5aWdmit0DToRBgaMVKYPOqm
-						GN6mqJrvOZMhadp82C0UAYBtSZ+AqU/03frpmLUXvBtr52b9AgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEWFkc3MtdG1wLm94LmFjLnVrMB0GA1UdDgQWBBTf3EmuVSQjziD+
-						xl5znVbeA/b0EjANBgkqhkiG9w0BAQUFAAOCAQEAlwc9kHzQGhlBJtoST9UtlIS8
-						K4vZ7Sg/SLJYb59AkDHGu748k6s3IDGpjr6sbm+Td4WcvyDQOPfszraIIgcA1Fa8
-						YaLMwCVYRgD4dakLdQ6jh6RkZ45jEBGZwyx2itwmVzYI8S4jJ6nlIaOqsKeW78wV
-						gA8keRddbVG5zr2LDEzeWKNafqtkr9O1KACtGmMIG279aOVuMgNrmCT9RKwMRFAT
-						DyE4qiQqxUS32OHcB0vGKx0qPbSRMbrqdMNtkfWR3e/lVDGkX0QfgX2+ryu7UaVH
-						DVEWEa+6dxT8M8Bs1Bfw0K1QCqDMt5/r2wZ/xc8nChb6cVuojFF/JzXiUbi9dA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://adss-tmp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss-tmp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford ADSS Temporary Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss-uat.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d1ba8910..00000000
--- a/swamid-interfederations-2.0/adss-uat.ox.ac.uk-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://adss-uat.ox.ac.uk/shibboleth">
-  <!--
-		This is an "ADSS UAT site" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-09-12T10:23:58Z">
-      <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://adss-uat.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+jCCAeKgAwIBAgIJALQdi5XV31KTMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWFkc3MtdWF0Lm94LmFjLnVrMB4XDTEzMDkxMTA3MTQzNloXDTIzMDkwOTA3
-						MTQzNlowHDEaMBgGA1UEAxMRYWRzcy11YXQub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQC6Be+SE7LxJuoJxu2sflorJFlkT4xKn1zo2PMv
-						cIDzeVYNmFGlPNCzF0ZRLMOfAgRuNwN1H3rToOo2P5+tQXxEAAkfe0h3aYd1OSEs
-						m0IrqeEZbXzZZyNRpxxTbszzH930Hs0YBCp7X2PlFR9eNeNWeMDddxzWf0iN3Mzl
-						rAB/bpQi0EpPJcr+wg7kNOe1RUI34lbig6bIABEEEIACmn4M8wXbJdIjtHvaaLGk
-						qVeN43D2tdQnzJHVq+iqZ5JbVjQZwUnwlycCV92v16mcdRCTjievh8cdTexdEsbr
-						CouifcNlSC6sTjCRs9wffik+QVbJ9cZLy+Vswwts3HaBMmU/AgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEWFkc3MtdWF0Lm94LmFjLnVrMB0GA1UdDgQWBBQdCm5MOKCVW4e3
-						lBzfalXj1sFx7DANBgkqhkiG9w0BAQUFAAOCAQEAOCEvxqL0Nn+YCabdtyak0EUK
-						zKYIdL5jkC8cmtpVzXDasIlMjh1Dm5HcKEZ6z4EXykT7Sg5CK3f3eyDO3mRQRbML
-						A0KSM7BG72WDtuyitJfT5huXgmt90B1qLXRdWb0WGnaempYecUPzLPV8Zbbup/cE
-						XLppYAJLYiLwm4VicU/+LbTigqgZtCEnKKUGPuINpo6RWKUd9LaO4bgY2+lJMnlx
-						oQtr3QoYpiepE/o5B7+K817qhjgyxbGdgUZQCyASoxdxpompcxTSe4XZtDfDFwcc
-						dPZXapVZvweV4/6LaDqp8pqL6M/7gLIhqC7gk5GT6h1//0JLGDYtIGlyPlBIZw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://adss-uat.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss-uat.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford ADSS UAT site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Hebron</SurName>
-    <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index eb2f6b77..00000000
--- a/swamid-interfederations-2.0/adss.ox.ac.uk-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://adss.ox.ac.uk/shibboleth">
-  <!--
-		This is an "ADSS site" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-09-12T11:54:03Z">
-      <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://adss.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJAP/qxlEv7bfGMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDWFkc3Mub3guYWMudWswHhcNMTMwOTExMDgxMzQ5WhcNMjMwOTA5MDgxMzQ5
-						WjAYMRYwFAYDVQQDEw1hZHNzLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEArHVqMd2kMeKJpStSFHb7uEys8jMcMP6914I2kWcuDAyKeQVY
-						Wvg+ZJAabdhA7dmKjK+uIxpT5h+urWs2uQHHO0t4/4t5PET+T2qDMEU8sBbvWOn7
-						KRbjrT8/YEyQFp8yQGCMWcaUQLQRE3zaAvc9TUPJPzRIZz3kqyVZBv6TGOxgzsPb
-						WbOshySY++spJMYdfNa2++YruxX9mQjqqzZoecIRUswrGQNidF04QH9BhbLdaFh/
-						ObmQiUYvxbK91ZgQcd7SUfJ0KIRQiCv8dTEzb4mlpCcait5LDXNb21rme6UbS2Zx
-						XyE7QLzwYS+qNZE924zyQqWBf6kmTwaYKQiUOQIDAQABozswOTAYBgNVHREEETAP
-						gg1hZHNzLm94LmFjLnVrMB0GA1UdDgQWBBQB1FqDeiZFHC/T8F9PLbIfLCr13jAN
-						BgkqhkiG9w0BAQUFAAOCAQEAhmFOyd0wZBR+OJdsLQEe5CGK3Ym7FxIzZaUazWB+
-						4cjGFOJjKa1idVVCvIPXtO45eJrNQpRGAqznmS6uyRCTpndaJC/xB/HGcaXKScvx
-						Gc7wOk5UUMgCTmJ5LVVxtvV8MJzUMkYaenisg3OuEi1lma11jSXSDVC6a18ssHro
-						NgpvwcquNJKjqxwW7Y5aoAcmj2RxWpBmrNw8DRZugXSZ1j0XTPa3D5JjtiJuoZxC
-						nZfz8UQMp19+eDLajMn0nNIlBSJSiAuqegfPigwnbbG23PFVcrIrfEbgzmjhPQBX
-						0L5ahXHEBkMNbqkYJ4vYi9x12H0Q83bsljQhG1lAVGQt7Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://adss.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford ADSS site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Hebron</SurName>
-    <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ae547395..00000000
--- a/swamid-interfederations-2.0/adss.uas.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://adss.uas.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2.1 SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://adss.uas.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEbDCCA1SgAwIBAgIJAMHhwKmD2myoMA0GCSqGSIb3DQEBBQUAMIG2MQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxFDASBgNVBAsTC0lUIFNlcnZp
-						Y2VzMRowGAYDVQQDExFhZHNzLnVhcy5veC5hYy51azEvMC0GCSqGSIb3DQEJARYg
-						b3BzLXRlYW1AbWFpbGxpc3QuYWRtaW4ub3guYWMudWswHhcNMTIwODMxMDgyNjUw
-						WhcNMjIwODI5MDgyNjUwWjCBtjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9y
-						ZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2Yg
-						T3hmb3JkMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEaMBgGA1UEAxMRYWRzcy51YXMu
-						b3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWlu
-						Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7Uq21vQR
-						aGkM8BRh+Rm2G6yIDXfg/u3+LFY0yLaN8CFI6Ke4vd5NB8FjKTLDqkCo7vOUIBxr
-						mSYGtmzI3xMj45nk5meFCF2DFPWW9Ahl2Eoiyf14H7dDljG5jvNNUqUBg2uUGd0s
-						+rkExZJOsVHcYOYk30pLR2RdRph2JpHR2hMpG5sMTx0wIPN/sphfYejYy8nDXmeI
-						TUmAh1fPbTw+lqhGiP3u1KEub1H8POW61pXHijTR8+vZhig58iJDCeAGIMt1Ohz+
-						fHY3PGWNyOSberjWmOfbRBPIFbsBZhgZCX5aUg51XJNL3MMmkcdwoueLX5JWniCd
-						rC+a/hUJzAd4JwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P
-						cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU8GLgsgMbSHPL
-						7InagZMCUhfRxhUwHwYDVR0jBBgwFoAU8GLgsgMbSHPL7InagZMCUhfRxhUwDQYJ
-						KoZIhvcNAQEFBQADggEBAEfQGtUoP+adGHM14S7luh/rS8tIXpZIwt5apYwsZRmn
-						e1f12TeRm2U4kJeWa+tbpWZpHT8AyQ1MA83FZzpB+1sisRof5ef6MloOdPpFstBu
-						TZQQMT+BRbIDF5jGqd0CjGxjXk4EkzNINiyNR/luSPBILATUrukjlm0K6AnvXCK5
-						Jqv6VzqE7r9SANzaf6EzToudGI4lenAJK6QlFfkiT3ikcAf/wxjN+/KKk1FIupv1
-						+eaxb/3JNQCm9e3jWJQKuwGYS42TwD6nynJvZMNx4HbDTnHdnoFnRxshT8Lcj4Ux
-						Es1CiT3smbVVyekIg2yBRtwdwCM2CrOjlPKCYgxrMa4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://adss.uas.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: ADSS Live System</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ops</GivenName>
-    <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Livings</SurName>
-    <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/afbi-shib.ads.qub.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/afbi-shib.ads.qub.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index ee28752b..00000000
--- a/swamid-interfederations-2.0/afbi-shib.ads.qub.ac.uk-idp-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://afbi-shib.ads.qub.ac.uk/idp/shibboleth">
-  <!--
-		This is an "Agri-Food Biosciences Institute" 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="2013-04-08T14:20:53Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">afbi.qub.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIVAOO+228Co5G8VjtIFdZLgr8NcmkNMA0GCSqGSIb3DQEB
-						BQUAMCIxIDAeBgNVBAMTF2FmYmktc2hpYi5hZHMucXViLmFjLnVrMB4XDTEzMDMy
-						NTEyMjIwN1oXDTMzMDMyNTEyMjIwN1owIjEgMB4GA1UEAxMXYWZiaS1zaGliLmFk
-						cy5xdWIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC25Mj6
-						JDVixh+B5wf/GQ/FwqAoA5WDat5YscMWNpFNq5ZvXX3IT3kEzsWzK25KwXtUElGJ
-						TPz7+VVL/+HxRCSqgLvDeOMq4yD9AQjlB2uVuYMP9aTlFLrCUoi+JR0hjpE8Q5v6
-						0F2OldmMujRVNaJEmTjcuMWGitFk5pG1jTfGSZDXUFn3CFrr3e+xWRat6USHioD2
-						q7jLg5cmFE8JqViVRunGoYrJMC1W77RQ+R529HNt9K/F7ft7C4M+rkYteoAlx7yz
-						uPVaR0FsAK9xpr5q9y0aq2pKkaPUgEbeAjXTBuJNFIDnloCzAxWjLDXW/IB/LQco
-						6ha1LpRMU8vfGER7AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2FmYmktc2hpYi5hZHMu
-						cXViLmFjLnVrhi5odHRwczovL2FmYmktc2hpYi5hZHMucXViLmFjLnVrL2lkcC9z
-						aGliYm9sZXRoMB0GA1UdDgQWBBR+s3QwBH9KnP1UtNj2hV45cz/8lTANBgkqhkiG
-						9w0BAQUFAAOCAQEAtdu9lrEo9NY77txEQh1y0NzjP/fZVR+PkTEMWx2vbqxZfvhm
-						wlnUukYbcRCcdxVpCxAsQpyaXHEDfdSsSjLFmEJ7R1fzWymOkh/xKUOT6svwm5pI
-						PLE1K5tN+cBVo0RsRr6++HRjtHLsot2okTPMf/zMoUBK6pEkrOEdFpQFbvNLe0hG
-						pgJIhPjBjj1lP3cVVS0lPsqZQvxftz8E6sQpUzR9Sy2iNplzFne8WCjEN+YKoVnj
-						6tgvslECEk1hDFH4JV4HTpuVHJFF/1uXVgKht2p1cUavGWBCNINZQpoxYS/IyUa+
-						DR5nSDGrbwRnkSsU2KYlDMvbuxf5eLC1ZwSeqw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://afbi-shib.ads.qub.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://afbi-shib.ads.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://afbi-shib.ads.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://afbi-shib.ads.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://afbi-shib.ads.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://afbi-shib.ads.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">afbi.qub.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIVAOO+228Co5G8VjtIFdZLgr8NcmkNMA0GCSqGSIb3DQEB
-						BQUAMCIxIDAeBgNVBAMTF2FmYmktc2hpYi5hZHMucXViLmFjLnVrMB4XDTEzMDMy
-						NTEyMjIwN1oXDTMzMDMyNTEyMjIwN1owIjEgMB4GA1UEAxMXYWZiaS1zaGliLmFk
-						cy5xdWIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC25Mj6
-						JDVixh+B5wf/GQ/FwqAoA5WDat5YscMWNpFNq5ZvXX3IT3kEzsWzK25KwXtUElGJ
-						TPz7+VVL/+HxRCSqgLvDeOMq4yD9AQjlB2uVuYMP9aTlFLrCUoi+JR0hjpE8Q5v6
-						0F2OldmMujRVNaJEmTjcuMWGitFk5pG1jTfGSZDXUFn3CFrr3e+xWRat6USHioD2
-						q7jLg5cmFE8JqViVRunGoYrJMC1W77RQ+R529HNt9K/F7ft7C4M+rkYteoAlx7yz
-						uPVaR0FsAK9xpr5q9y0aq2pKkaPUgEbeAjXTBuJNFIDnloCzAxWjLDXW/IB/LQco
-						6ha1LpRMU8vfGER7AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2FmYmktc2hpYi5hZHMu
-						cXViLmFjLnVrhi5odHRwczovL2FmYmktc2hpYi5hZHMucXViLmFjLnVrL2lkcC9z
-						aGliYm9sZXRoMB0GA1UdDgQWBBR+s3QwBH9KnP1UtNj2hV45cz/8lTANBgkqhkiG
-						9w0BAQUFAAOCAQEAtdu9lrEo9NY77txEQh1y0NzjP/fZVR+PkTEMWx2vbqxZfvhm
-						wlnUukYbcRCcdxVpCxAsQpyaXHEDfdSsSjLFmEJ7R1fzWymOkh/xKUOT6svwm5pI
-						PLE1K5tN+cBVo0RsRr6++HRjtHLsot2okTPMf/zMoUBK6pEkrOEdFpQFbvNLe0hG
-						pgJIhPjBjj1lP3cVVS0lPsqZQvxftz8E6sQpUzR9Sy2iNplzFne8WCjEN+YKoVnj
-						6tgvslECEk1hDFH4JV4HTpuVHJFF/1uXVgKht2p1cUavGWBCNINZQpoxYS/IyUa+
-						DR5nSDGrbwRnkSsU2KYlDMvbuxf5eLC1ZwSeqw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://afbi-shib.ads.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://afbi-shib.ads.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">AFBI: Agri-Food Biosciences Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.afbini.gov.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>E-Resouces Team</GivenName>
-    <EmailAddress>mailto:eresources@qub.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Goodall</SurName>
-    <EmailAddress>mailto:m.goodall@qub.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/afire.asnet.am-idp-shibboleth.xml b/swamid-interfederations-2.0/afire.asnet.am-idp-shibboleth.xml
deleted file mode 100644
index 919bcdf3..00000000
--- a/swamid-interfederations-2.0/afire.asnet.am-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://afire.asnet.am/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.asnet.am" registrationInstant="2015-12-06T12:47:02Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnet.am</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Academic Scientific Network of Armenia</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://afire.asnet.am/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://afire.asnet.am/index.php/identity-federation-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>
-MIIFkTCCBHmgAwIBAgIRAJGxdi6BndHGs8GWsagMbaYwDQYJKoZIhvcNAQELBQAw
-gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
-VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-Q0EwHhcNMTUwNjAyMDAwMDAwWhcNMTgwNjAxMjM1OTU5WjCBoTEhMB8GA1UECxMY
-RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUkwRwYDVQQLE0BIb3N0ZWQgYnkgSW5z
-dGl0dXRlIGZvciBJbmZvcm1hdGljcyBhbmQgQXV0b21hdGlvbiBQcm9ibGVtcyBO
-QVMuMRwwGgYDVQQLExNDT01PRE8gU1NMIFdpbGRjYXJkMRMwEQYDVQQDFAoqLmFz
-bmV0LmFtMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtYnlRhHME8WP
-4x/2SiMMV25dK9HnrJmrssJVi/A/3Om0cSMVyybohqMcWTLq4s6A1kBSy4pEK7Kl
-3M7qaTBUVOkXZZPn/vpOJoaHR71tG/CClNivpN5Q/a3RA6jRjT20pvUApNzQglwN
-23wYPu5Uz1iLjVT53Bq3HnbuYlI7FIjWKyfHonHnYw0CARJHRXeq/ykFngbxj1ie
-sdtVdrpI4hUDk1o85y4rDuvK1HYcMudI8kbfZ1a8l/3jiA4EnNeoe5fbKQDkP63V
-cN2f1cM3Noj1GGAGYX5sY9PY3d0UmBH/8Kzg4i58E8V4EJTwLLYpSfAXO04+e3Bb
-VKCUUz5vywIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99D
-tDoo2ucwHQYDVR0OBBYEFKjnkZCHfwFjf2kkMGdeTAcM4Q8SMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjBPBgNVHSAESDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBz
-Oi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmg
-R6BFhkNodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxp
-ZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYB
-BQUHMAKGQ2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZh
-bGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
-Y3NwLmNvbW9kb2NhLmNvbTAfBgNVHREEGDAWggoqLmFzbmV0LmFtgghhc25ldC5h
-bTANBgkqhkiG9w0BAQsFAAOCAQEAAN5hdW1ipGLn9khP5UoSEHFJPuKzR4yzuWrF
-Kc1UamsQLWA2SNvN3Lb+4vj+W7q++aBgmGEjfhw/BWQzFOXfeHHYb8YLBZuweesm
-5neG4kULC4Qpf6tc5LgK0V6geVNHzXnAchLn2KzBhjgMUmvHOJFPSwCJHKSyN2Qc
-lCrQol4CRGiKXH7428yGMgFi2kqdL9xlxxned0/13GfyMVQwUfwmLe2a/HH7nn4k
-iNKDKTPbYWvuDjrIuKskC0uBwkvqEunCqE0beN5/bzfA/XiN7VFQm19o6T/8fwFO
-xAkgTb8s+nKQoqK0D7O7EXRzLd/m825ao8+E21sqAhwodilGeg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://afire.asnet.am:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://afire.asnet.am:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://afire.asnet.am/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://afire.asnet.am/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://afire.asnet.am: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://afire.asnet.am/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://afire.asnet.am/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://afire.asnet.am/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://afire.asnet.am/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asnet.am</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFkTCCBHmgAwIBAgIRAJGxdi6BndHGs8GWsagMbaYwDQYJKoZIhvcNAQELBQAw
-gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
-VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-Q0EwHhcNMTUwNjAyMDAwMDAwWhcNMTgwNjAxMjM1OTU5WjCBoTEhMB8GA1UECxMY
-RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUkwRwYDVQQLE0BIb3N0ZWQgYnkgSW5z
-dGl0dXRlIGZvciBJbmZvcm1hdGljcyBhbmQgQXV0b21hdGlvbiBQcm9ibGVtcyBO
-QVMuMRwwGgYDVQQLExNDT01PRE8gU1NMIFdpbGRjYXJkMRMwEQYDVQQDFAoqLmFz
-bmV0LmFtMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtYnlRhHME8WP
-4x/2SiMMV25dK9HnrJmrssJVi/A/3Om0cSMVyybohqMcWTLq4s6A1kBSy4pEK7Kl
-3M7qaTBUVOkXZZPn/vpOJoaHR71tG/CClNivpN5Q/a3RA6jRjT20pvUApNzQglwN
-23wYPu5Uz1iLjVT53Bq3HnbuYlI7FIjWKyfHonHnYw0CARJHRXeq/ykFngbxj1ie
-sdtVdrpI4hUDk1o85y4rDuvK1HYcMudI8kbfZ1a8l/3jiA4EnNeoe5fbKQDkP63V
-cN2f1cM3Noj1GGAGYX5sY9PY3d0UmBH/8Kzg4i58E8V4EJTwLLYpSfAXO04+e3Bb
-VKCUUz5vywIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99D
-tDoo2ucwHQYDVR0OBBYEFKjnkZCHfwFjf2kkMGdeTAcM4Q8SMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjBPBgNVHSAESDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBz
-Oi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmg
-R6BFhkNodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxp
-ZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYB
-BQUHMAKGQ2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZh
-bGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
-Y3NwLmNvbW9kb2NhLmNvbTAfBgNVHREEGDAWggoqLmFzbmV0LmFtgghhc25ldC5h
-bTANBgkqhkiG9w0BAQsFAAOCAQEAAN5hdW1ipGLn9khP5UoSEHFJPuKzR4yzuWrF
-Kc1UamsQLWA2SNvN3Lb+4vj+W7q++aBgmGEjfhw/BWQzFOXfeHHYb8YLBZuweesm
-5neG4kULC4Qpf6tc5LgK0V6geVNHzXnAchLn2KzBhjgMUmvHOJFPSwCJHKSyN2Qc
-lCrQol4CRGiKXH7428yGMgFi2kqdL9xlxxned0/13GfyMVQwUfwmLe2a/HH7nn4k
-iNKDKTPbYWvuDjrIuKskC0uBwkvqEunCqE0beN5/bzfA/XiN7VFQm19o6T/8fwFO
-xAkgTb8s+nKQoqK0D7O7EXRzLd/m825ao8+E21sqAhwodilGeg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://afire.asnet.am:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://afire.asnet.am: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">Academic Scientific Network of Armenia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ASNET-AM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.asnet.am/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andranik</md:GivenName>
-    <md:SurName>Hayrapetyan</md:SurName>
-    <md:EmailAddress>mailto:andranik@ipia.sci.am</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 16ec810f..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/">
-      <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/agenda.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/agenda.ct.infn.it-shibboleth.xml
deleted file mode 100644
index bc601c59..00000000
--- a/swamid-interfederations-2.0/agenda.ct.infn.it-shibboleth.xml
+++ /dev/null
@@ -1,128 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://agenda.ct.infn.it/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-12T06:20:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-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>
-  </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://agenda.ct.infn.it/Shibboleth.sso/DS"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Agenda provided by INFN Catania</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Agenda erogata da INFN Catania</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The service allows users to create and manage events, from single lectures to small meetings to project workshops to complex multi-session many-day conferences, including the registration of participants, the submission of abstracts/papers and the evaluation of contributions.</mdui:Description>
-        <mdui:Description xml:lang="it">Il servizio permette agli utenti di creare e gestire eventi come seminari, meeting, workshop e conferenze con sessioni multiple distribuite su più giorni. Include moduli per la registrazione dei partecipanti, la sottomissione di abstract/articoli e la valutazione dei contributi</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://agenda.ct.infn.it/service</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://agenda.ct.infn.it/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>
-MIIEbzCCA1egAwIBAgIQcBeCzWBBCds83fLXgAuSAjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTIxNzAwMDAwMFoXDTE2MTIxNjIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFhZ2VuZGEuY3Qu
-aW5mbi5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALMFJxLvoJwG
-OFLjLpxlthfZUaqSC3+qQcwOaPrfFm++/H8of+Tx4NsjgVZjerEFVlhopy82VTRU
-vXRFrvwFh0rMngAVm91v3LhunrxxUel/w6PgTS3BhZ20SZCVCkwKNPz9RhXff0hq
-PQrny6w9wYyxyj3q13yePE9ko+mwl+C11nZB09P2RvvXbPoNcvUl6LvWtKQbRMWC
-B7HXTNxddLztQLQnh1yhp0ZflLmiGEEykFWghqzijIucWSZxKugd/DmHhxJQhHkd
-BF43+CzFcfdUubFLrU2BZ9/pSuvpayo43qHP0EJmIhZkpCqjIYkQJovWrmZ+n3rf
-J2ve3EoK1T0CAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBTZMyBGdI6hJlZf/sNiL/domOmiMDAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRYWdlbmRhLmN0LmluZm4uaXQw
-DQYJKoZIhvcNAQEFBQADggEBAATfPKKhvVoL2B0ce5BouD9hErF4MC2XxlJdrLJP
-XlOeFNWBBwxBM7FIM2fSTLpNTnc7OA0BPLXbadICSmfY5HdikNPvns9/aNrizr+j
-pex1lYCY0uAwwsEauUxpJpPAe5+t9xD4URog0pIw21W95XTmSTyQoTtOhI506oqy
-oJ8AUmOGoqwOg8ivuuVT2h7O8p4DQ6L8wczZW/W/IoCL+5aC/X7Y78j5Sq9/VQln
-zzDg3oMFoud4+0zxptfHSro23+L0uN2miOChuTyMmoNA5kVoh02h2irRHwJccJbK
-kJY22vXsTzKEv4WUZ/LwCqp5QrPy41LCTCsEsP8TVL/ktPc=
-</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>
-MIIEbzCCA1egAwIBAgIQcBeCzWBBCds83fLXgAuSAjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTIxNzAwMDAwMFoXDTE2MTIxNjIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFhZ2VuZGEuY3Qu
-aW5mbi5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALMFJxLvoJwG
-OFLjLpxlthfZUaqSC3+qQcwOaPrfFm++/H8of+Tx4NsjgVZjerEFVlhopy82VTRU
-vXRFrvwFh0rMngAVm91v3LhunrxxUel/w6PgTS3BhZ20SZCVCkwKNPz9RhXff0hq
-PQrny6w9wYyxyj3q13yePE9ko+mwl+C11nZB09P2RvvXbPoNcvUl6LvWtKQbRMWC
-B7HXTNxddLztQLQnh1yhp0ZflLmiGEEykFWghqzijIucWSZxKugd/DmHhxJQhHkd
-BF43+CzFcfdUubFLrU2BZ9/pSuvpayo43qHP0EJmIhZkpCqjIYkQJovWrmZ+n3rf
-J2ve3EoK1T0CAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBTZMyBGdI6hJlZf/sNiL/domOmiMDAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRYWdlbmRhLmN0LmluZm4uaXQw
-DQYJKoZIhvcNAQEFBQADggEBAATfPKKhvVoL2B0ce5BouD9hErF4MC2XxlJdrLJP
-XlOeFNWBBwxBM7FIM2fSTLpNTnc7OA0BPLXbadICSmfY5HdikNPvns9/aNrizr+j
-pex1lYCY0uAwwsEauUxpJpPAe5+t9xD4URog0pIw21W95XTmSTyQoTtOhI506oqy
-oJ8AUmOGoqwOg8ivuuVT2h7O8p4DQ6L8wczZW/W/IoCL+5aC/X7Y78j5Sq9/VQln
-zzDg3oMFoud4+0zxptfHSro23+L0uN2miOChuTyMmoNA5kVoh02h2irRHwJccJbK
-kJY22vXsTzKEv4WUZ/LwCqp5QrPy41LCTCsEsP8TVL/ktPc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://agenda.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://agenda.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://agenda.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agenda.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://agenda.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://agenda.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://agenda.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://agenda.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://agenda.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://agenda.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://agenda.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Agenda provided by INFN Catania</md:ServiceName>
-      <md:ServiceName xml:lang="it">Agenda erogata da INFN Catania</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">The service allows users to create and manage events, from single lectures to small meetings to project workshops to complex multi-session many-day conferences, including the registration of participants, the submission of abstracts/papers and the evaluation of contributions.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Il servizio permette agli utenti di creare e gestire eventi come seminari, meeting, workshop e conferenze con sessioni multiple distribuite su più giorni. Include moduli per la registrazione dei partecipanti, la sottomissione di abstract/articoli e la valutazione dei contributi</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="surname" 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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">INFN Catania</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">INFN Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Agenda erogata da INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Agenda provided by INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</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 1fef6f09..00000000
--- a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml
+++ /dev/null
@@ -1,85 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aginfra-sg.ct.infn.it/shibboleth">
-  <md: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>
-  </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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDkDCCAngCCQDQ1hxFAGNbZTANBgkqhkiG9w0BAQsFADCBiTELMAkGA1UEBhMC
-SVQxDzANBgNVBAgMBlNpY2lseTEQMA4GA1UEBwwHQ2F0YW5pYTENMAsGA1UECgwE
-SU5GTjEeMBwGA1UEAwwVYWdpbmZyYS1zZy5jdC5pbmZuLml0MSgwJgYJKoZIhvcN
-AQkBFhltYXJjby5mYXJnZXR0YUBjdC5pbmZuLml0MB4XDTE2MDIxMDExNTIzN1oX
-DTQ2MDIwMjExNTIzN1owgYkxCzAJBgNVBAYTAklUMQ8wDQYDVQQIDAZTaWNpbHkx
-EDAOBgNVBAcMB0NhdGFuaWExDTALBgNVBAoMBElORk4xHjAcBgNVBAMMFWFnaW5m
-cmEtc2cuY3QuaW5mbi5pdDEoMCYGCSqGSIb3DQEJARYZbWFyY28uZmFyZ2V0dGFA
-Y3QuaW5mbi5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM805UkP
-QcS9EzntmEs6IMRR3Qg16NrcVnvP7SeSRnyTfgHBYB2Gzs2UTnjtjBbvPIrkQEgX
-93hCEAwSfO6lUwErRy+lhoR311zbdOgt38VktHpIXeKlxIWpBCHDeaXZytyH7dM6
-aV63wUCH932UqwAWFMJk6JHdRfDs/kzgYg3arbkDYapv1iv49/pnNS4e8DvoPCFC
-g3c8k/ScFbva+FyV8ovx4D66MqSZBKew2L1FmpC7ihLM9TPjbOONky9tkAxSMWiU
-rB2UX5hESs3yGEZPLbJlOkK4xlh43vc+2jKxux3EPRGHdfs0JHkQ2uV/NwmyTx6l
-UadRNYkk5gXkri8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAjJm/AdvHiLRgnl12
-nBRhfm/Foej8pR28FaO6PfP1CDIftfpGlIQT/ixsmTqKYNibXVnJG3izr3CLP3es
-Zzld8XLQ2k5XHHXAQGl05j4Uv8bTRDD72jpRKkB0Ipd/LlAew+sYzAxnJnNxgmE4
-joVZ5K7uuivHpoUUm1RwNssHnz1RwgjLkbLydQQLupvAFtPxEu6nITS4zW+Zikrx
-zk8ZzlsbadRKd3brpyLlxqZEueAZI0rbNbeaG9NlnNKqWoL99l1bcOi9WVSe6Rx1
-gMpP1VeY/DB1Xuiun8iYUcLWrGju5YUyLhfqWOlMcBEnSdRb7WZFopBVhEvR4iE3
-EZYjPA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">agINFRA Science Gateway</md:ServiceName>
-      <md: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.</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN Catania</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">INFN Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">agINFRA Science Gateway provided by INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">agINFRA Science Gateway erogato da INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/index.php?lang=en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:riccardo.rotondo@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 980c5fd6..00000000
--- a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml
+++ /dev/null
@@ -1,104 +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://aginfra-sg.ct.infn.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-10T09:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-      <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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aginfra-sg.ct.infn.it/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://aginfra-sg.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
-        <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
-        <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
-        <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>klios.ct.infn.it</ds:KeyName>
-        <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
-        <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
-        <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
-          <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">agINFRA Science Gateway</md:ServiceName>
-      <md: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.</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>riccardo.rotondo@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 7bb7ce50..00000000
--- a/swamid-interfederations-2.0/aishib.agropolis.fr-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://aishib.agropolis.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Agropolis International</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACPUlEQVQoz21SPW8TQRR8u7d3ju34Er6UCHACRqK4Bjk0oDSEjiYSBQVS8k9AkWgp+AuUASGEaCASkoPcgARVMF8iTnxJwMFJfL47397u3u6jsGVFwLzmFTN6ozdDEBEAAOD4kiRJsVgkhMA/YMfZzc3NVstnzGq1/KXlJfgf2Ii9XquVZ2YWbi5Io4MsbfPeZK4wRm0AOH6KICIivq2tV6/O5cYLHztbW9FvYTKuZaLk7PjpW+UrJXtspCHGmGazCQBnZ8svtj/0tbAINYhcy1DyThpRhHtztyedwkBDAWBnZ6dSqbzZ+7THu0IraTJplDSZ0JnQ2Y+482jj1cgSRUTHdrhW9fa3SKaxErFKIyUiKaIsjVQaKf5s631HxP1+X2vNwjB0J9zd+OgnD044Ra4lI5ZBw7XqyeRQREciaqe9xoE/K/OFfIENnqBM1uZBqlWBOYxQjYZnqieTThru8zCU3AASIAjIXNellGLePkjCUPICy1mEDAShSg7SqCsTBtQ7WfY3vlarVUYpdUsuAs5PXV7dfpe3HEYtjSbNZJwJoRUi3rl4fSrvfufctm0ySA0RD0V84+WDL1EbCCDCYIDApeKZ+uKK6faDIPA8jw7jIORUbry2eH+5Mu8ARTSAkCPW3QvX6osrE+B8bjQ8zxu2aACDaIwxxuzzsLbbePj88a8k0Mb4vr/2ei3LMoOIiGRU0iGGVuDp6pNz5fNSiKnpac/zgAABMuzSXwIggIjdbrdUKjHGYGQaAAD+AJBJecXxnEvWAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE1KzAyOjAwpWiGMQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNSswMjowMNQ1Po0AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.agropolis.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Agropolis International</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>
-					      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>
-    </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-POST" Location="https://aishib.agropolis.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aishib.agropolis.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aishib.agropolis.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Agropolis International</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Agropolis International</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.agropolis.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean Cerda</md:SurName>
-    <md:EmailAddress>cerda@agropolis.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean-Pierre  Allano</md:SurName>
-    <md:EmailAddress>allano@agropolis.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aiwip.com-shibboleth.xml b/swamid-interfederations-2.0/aiwip.com-shibboleth.xml
deleted file mode 100644
index b0d7f130..00000000
--- a/swamid-interfederations-2.0/aiwip.com-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://aiwip.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Aiwip Ltd.
-	-->
-  <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="2015-11-02T10:40:29Z">
-      <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://aiwip.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Aiwip</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Free printing for University students</mdui:Description>
-        <mdui:Logo height="135" width="90">https://aiwip.com/static/images/logo2-dark.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDijCCAnKgAwIBAgIJALiUPWnEh4GGMA0GCSqGSIb3DQEBCwUAMEYxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xEjAQBgNVBAoMCUFpd2lwIEx0ZDESMBAG
-						A1UEAwwJYWl3aXAuY29tMB4XDTE1MDkxMTE1MTMyNVoXDTI1MDkwODE1MTMyNVow
-						RjELMAkGA1UEBhMCR0IxDzANBgNVBAgMBkxvbmRvbjESMBAGA1UECgwJQWl3aXAg
-						THRkMRIwEAYDVQQDDAlhaXdpcC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDW6jJEpL8vmaLnf8npBWtft8THcVkhJSGWyHkKlRxIKeiXc3PeN+O0
-						uxqaLq4D+ffRm2uXxtDF8bkpCmrqMujAMgUdYxpXh3La9OOHjirY3f4XnA0+lEoe
-						xN0v8n9eHdf8pGXxCRR9q1VR9izbo8yRexxMlAk6WnRRYIKTaDFRAEhqIgeto+qd
-						8rxlzaAIQY6c82wfYoVEUfLcZa09Beo0UxOp8drpCQx4ognawlg1Lt7nXuSagXIq
-						vxXpWb5Gs3M1dDIuVjtVh3SYL2LXlC5g//ZBU/0TadR68MadZxRFlWf7piV/AjBJ
-						8pI5DGn29F0ENYIol7xxDfmK8qxVlsUZAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJ
-						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
-						DgQWBBT4McZ381AJbH3wftoeRd+VmqqA6TAfBgNVHSMEGDAWgBT4McZ381AJbH3w
-						ftoeRd+VmqqA6TANBgkqhkiG9w0BAQsFAAOCAQEARUzxoddJ5qQm2u+pvw6xcaNM
-						2/cXhVLuSnIDtxZr+xlo3oHbwdIyk5uOiK7ekH8JmPAbs0sUpuk6K4WXIFK+wRlF
-						fwsZ2MRujTbtg3ttpI4xMVgvO6s2vSAzoy0ibuRos0Mfokmsd9Z22N//jeJrzdQx
-						PmhaExV64i5NSTAMulG7j7MsF08Rv1lylG3ZbaVOVCMctweQaUysiLwHPvlX6VU1
-						qgXfL+JQhd70ZZyylbpqEbfl0JlZz/bGOYuF5meBhfy3BDj8zYjPZycwEuSZ+slY
-						yb9mD1eP67TQAaShznHlfwmsTquWKUVdCwSUAd+oYzFj1w9lebTT4awLFP7EpQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://aiwip.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aiwip.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aiwip.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aiwip.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aiwip.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aiwip.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aiwip.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aiwip.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aiwip.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aiwip.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aiwip.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Aiwip Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aiwip</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://aiwip.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ruslan</GivenName>
-    <SurName>Khazarchiev</SurName>
-    <EmailAddress>mailto:ruslan@aiwip.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ruslan</GivenName>
-    <SurName>Khazarchiev</SurName>
-    <EmailAddress>mailto:ruslan@aiwip.com</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 c7e48c59..00000000
--- a/swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aleph.svkhk.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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/logo/logo_40.png</mdui:Logo>
-        <mdui:Logo height="90" width="90">https://aleph.svkhk.cz/logo/logo_90.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>
-MIIDJDCCAgygAwIBAgIVAJSFrXye/a/LtnzGg52l6Vv2aZ3AMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDmFsZXBoLnN2a2hrLmN6MB4XDTE1MDgyODE1MDgwMloX
-DTM1MDgyODE1MDgwMlowGTEXMBUGA1UEAwwOYWxlcGguc3ZraGsuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk2YhfJ9dmOhNkAn3Bdr2L+ElDZ9Xl
-RQQIo+v18FD3ML99ZqS9y0NHGihDe3i8YTJjTYqV+Rg1aV8g7DdivWrqWJle23yf
-WRQLm+gl407hJ/XVyo5GfsafwIWdW/2gYq0y0wyFTROZsvzM5fYnBap1dpvf0UD7
-ewq5uCcQdSOtQ6hHajJnzn60uWG11sMAiQeaoeo7GdDuvpOH8oVuEMscvZtOHpv8
-c+USYcBMZ2n5H6Cp8/GqmIwJzHHrWbpSTwtcj0Qk/fdDHF/bKkukCpFJZmfF9/9O
-oqN7xD872Fg65ZTVnNt6VcN336aZkXwPsjndtmZlGWyhLNUu3SsIUJvFAgMBAAGj
-YzBhMB0GA1UdDgQWBBSy9TOWhcL1moqEDeJaemfu/clcyTBABgNVHREEOTA3gg5h
-bGVwaC5zdmtoay5jeoYlaHR0cHM6Ly9hbGVwaC5zdmtoay5jei9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAAWjWUcrdsnu4coYaqXOPM89MOHqhmuel
-Jv955SMGEVDr9nyyy9+ql8xbQbOdHjAJRwu0VgIPlk87mdikX0+H6Xk1c6cp4ud+
-BgQHJMtZObkAh2+fkkCxiqBUkYGPb+5GqvUBkzZbmO3nfQQ8GbxpelYse1tMeiaJ
-gKBxdaXrBBD2s33bOOZ89IMuDQeUszifVCxeofaS9B5N+wplX8J0svGM0ggxCJoM
-x/KI5F8aCCKoDnAD/I8tYu0fTuIwg04I9WwduYCoTxxzAVQ6Ta1QwqDRqRib8QvY
-6/ioV7XeMqtOSAqWrOwCClb0vDVOjUnKJTSU9O8E5/eBCYzfVrVKdA==
-                        </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>
-MIIDIzCCAgugAwIBAgIUEJlCdI6O+jqGU7O1e2RkV53yqJIwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOYWxlcGguc3ZraGsuY3owHhcNMTUwODI4MTUwNzU4WhcN
-MzUwODI4MTUwNzU4WjAZMRcwFQYDVQQDDA5hbGVwaC5zdmtoay5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMBZOjdrxpmQqnkNeOqGdrSbB7YoV2M
-TWEsNm5lquQeV2zefrZVmjkolSeO1K0o3P4M4r12THBSsEFPIEWqbri7l0ti2GGh
-osSHaUMGGy73mznHgbSDXCW+WBc6hXMn5LFXkwQz88fTDRZ2tVfCIDT4bat07+gn
-VjYdokbBgVeoe+GXQEw4Oax1vjsGCvq3+e7kIw1rW7ieVGF8xAkyk9VFV3nEeIGm
-8aR/Bi3625PZO9F4n5JZ86rjVfI84rXaVig55z8nbH9kGYR4J2hHwM/BSO0vhBJC
-gQSvqdgNbO5SMOcKy0bbBKfPVkvANyKVt1FuE5GlCu/yA2Yb4oVgFKsCAwEAAaNj
-MGEwHQYDVR0OBBYEFFQTBSzOxH3LROx/bkBFyhuStmYrMEAGA1UdEQQ5MDeCDmFs
-ZXBoLnN2a2hrLmN6hiVodHRwczovL2FsZXBoLnN2a2hrLmN6L2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAwmzkKKSFElavD4lgIclbIn4TtjU0vkr2U
-okA6bfpYyG4YKJF1oYlIRANW0834HImncJ2p7zjVUDVOz4NG6L6P8+C2wq2b8m6u
-XsmlTHWoQq1uMK01weHzjkgRH7Ux/6MUBb/HWCB5o6TTf7QWGTnohudrsvw6rMvS
-kCOsKNdYHRUqduRImil9zI7oB3DgcMqKo+nc7ElXdpdZ+C14i+DmVOLsHyAdU/r+
-wI+5wsg5a318BqML9SybteAP3EtvV8gaDJNtDTtGxR26dUoxyfMBcr1pu0NWcbPx
-K6FU2egg9HD4BD1u6djYZV47aavLjJ0tSErfcHvrz5JMQrnbv3GZ
-                        </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>
-MIIDIzCCAgugAwIBAgIUHR8h609/l5ZaqJVRDkOVK6KQWccwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOYWxlcGguc3ZraGsuY3owHhcNMTUwODI4MTUwODAyWhcN
-MzUwODI4MTUwODAyWjAZMRcwFQYDVQQDDA5hbGVwaC5zdmtoay5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALNWuZY/XJorTyIeONFA6lhfBhhSOaYE
-2wtO0KNMlfqY0HPTDn2uPd2F06411wACW12RwyGErZRluedwaZeVdJfy05x3bXsu
-oGDm1o/JI0hLiH82BupYWAZsMhv6XBiv9F8DC+nKDIOKETElJ7mc80fTLMNPH9Bm
-ICvlXCNKdghfPZdAstZM4YpobGFk/0ZCjU5vWCew8ZOUTsMYtp52A4sGHpieGLXk
-0gejaQK8hG70K9GeaDaKm0UAE5780qM13NFBiBg+gIFYUXLxkVZsn7+hEA6YDewu
-Yq4pKdiFI2M7Aj+m4UucRzO237txeznDKKmSnrrgRG9UV7c9vHkhfpUCAwEAAaNj
-MGEwHQYDVR0OBBYEFM27r6xs8sW5D9dl0IVjah5S9ZZAMEAGA1UdEQQ5MDeCDmFs
-ZXBoLnN2a2hrLmN6hiVodHRwczovL2FsZXBoLnN2a2hrLmN6L2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAfwgwA9/oEx1jnywTpE+I+7omw9RN1McfA
-EN+vJDuGt0Vz8TcjRHUOGxwXHtbw4/aOkK48Drg/kIKY7dghuNeGJgd31bNsgvBj
-Zdecvn1G8TpRlTZXV71+EliO49zpNX8KSimobPkB+oHSMkt94HTljmka11yogiJi
-ycotZyPq8kGjGrFRh0InfIDfRGd9zD0v698moP8FzNlvckl3jL7tzT95QAA9dO21
-MpM8yEEOmngDz+D/LJeNJVT5cbvIZ3gpfm5yX16PyvFMXr8g9NMf/OhAznAHrL90
-xDF332t8sZ0yvjOOmIVyk2NtktyqGSqA7pRQRUZvzMHw15kyMzEM
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph.svkhk.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aleph.svkhk.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aleph.svkhk.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph.svkhk.cz/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkhk.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJSFrXye/a/LtnzGg52l6Vv2aZ3AMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDmFsZXBoLnN2a2hrLmN6MB4XDTE1MDgyODE1MDgwMloX
-DTM1MDgyODE1MDgwMlowGTEXMBUGA1UEAwwOYWxlcGguc3ZraGsuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk2YhfJ9dmOhNkAn3Bdr2L+ElDZ9Xl
-RQQIo+v18FD3ML99ZqS9y0NHGihDe3i8YTJjTYqV+Rg1aV8g7DdivWrqWJle23yf
-WRQLm+gl407hJ/XVyo5GfsafwIWdW/2gYq0y0wyFTROZsvzM5fYnBap1dpvf0UD7
-ewq5uCcQdSOtQ6hHajJnzn60uWG11sMAiQeaoeo7GdDuvpOH8oVuEMscvZtOHpv8
-c+USYcBMZ2n5H6Cp8/GqmIwJzHHrWbpSTwtcj0Qk/fdDHF/bKkukCpFJZmfF9/9O
-oqN7xD872Fg65ZTVnNt6VcN336aZkXwPsjndtmZlGWyhLNUu3SsIUJvFAgMBAAGj
-YzBhMB0GA1UdDgQWBBSy9TOWhcL1moqEDeJaemfu/clcyTBABgNVHREEOTA3gg5h
-bGVwaC5zdmtoay5jeoYlaHR0cHM6Ly9hbGVwaC5zdmtoay5jei9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAAWjWUcrdsnu4coYaqXOPM89MOHqhmuel
-Jv955SMGEVDr9nyyy9+ql8xbQbOdHjAJRwu0VgIPlk87mdikX0+H6Xk1c6cp4ud+
-BgQHJMtZObkAh2+fkkCxiqBUkYGPb+5GqvUBkzZbmO3nfQQ8GbxpelYse1tMeiaJ
-gKBxdaXrBBD2s33bOOZ89IMuDQeUszifVCxeofaS9B5N+wplX8J0svGM0ggxCJoM
-x/KI5F8aCCKoDnAD/I8tYu0fTuIwg04I9WwduYCoTxxzAVQ6Ta1QwqDRqRib8QvY
-6/ioV7XeMqtOSAqWrOwCClb0vDVOjUnKJTSU9O8E5/eBCYzfVrVKdA==
-                        </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>
-MIIDIzCCAgugAwIBAgIUEJlCdI6O+jqGU7O1e2RkV53yqJIwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOYWxlcGguc3ZraGsuY3owHhcNMTUwODI4MTUwNzU4WhcN
-MzUwODI4MTUwNzU4WjAZMRcwFQYDVQQDDA5hbGVwaC5zdmtoay5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMBZOjdrxpmQqnkNeOqGdrSbB7YoV2M
-TWEsNm5lquQeV2zefrZVmjkolSeO1K0o3P4M4r12THBSsEFPIEWqbri7l0ti2GGh
-osSHaUMGGy73mznHgbSDXCW+WBc6hXMn5LFXkwQz88fTDRZ2tVfCIDT4bat07+gn
-VjYdokbBgVeoe+GXQEw4Oax1vjsGCvq3+e7kIw1rW7ieVGF8xAkyk9VFV3nEeIGm
-8aR/Bi3625PZO9F4n5JZ86rjVfI84rXaVig55z8nbH9kGYR4J2hHwM/BSO0vhBJC
-gQSvqdgNbO5SMOcKy0bbBKfPVkvANyKVt1FuE5GlCu/yA2Yb4oVgFKsCAwEAAaNj
-MGEwHQYDVR0OBBYEFFQTBSzOxH3LROx/bkBFyhuStmYrMEAGA1UdEQQ5MDeCDmFs
-ZXBoLnN2a2hrLmN6hiVodHRwczovL2FsZXBoLnN2a2hrLmN6L2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAwmzkKKSFElavD4lgIclbIn4TtjU0vkr2U
-okA6bfpYyG4YKJF1oYlIRANW0834HImncJ2p7zjVUDVOz4NG6L6P8+C2wq2b8m6u
-XsmlTHWoQq1uMK01weHzjkgRH7Ux/6MUBb/HWCB5o6TTf7QWGTnohudrsvw6rMvS
-kCOsKNdYHRUqduRImil9zI7oB3DgcMqKo+nc7ElXdpdZ+C14i+DmVOLsHyAdU/r+
-wI+5wsg5a318BqML9SybteAP3EtvV8gaDJNtDTtGxR26dUoxyfMBcr1pu0NWcbPx
-K6FU2egg9HD4BD1u6djYZV47aavLjJ0tSErfcHvrz5JMQrnbv3GZ
-                        </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>
-MIIDIzCCAgugAwIBAgIUHR8h609/l5ZaqJVRDkOVK6KQWccwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOYWxlcGguc3ZraGsuY3owHhcNMTUwODI4MTUwODAyWhcN
-MzUwODI4MTUwODAyWjAZMRcwFQYDVQQDDA5hbGVwaC5zdmtoay5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALNWuZY/XJorTyIeONFA6lhfBhhSOaYE
-2wtO0KNMlfqY0HPTDn2uPd2F06411wACW12RwyGErZRluedwaZeVdJfy05x3bXsu
-oGDm1o/JI0hLiH82BupYWAZsMhv6XBiv9F8DC+nKDIOKETElJ7mc80fTLMNPH9Bm
-ICvlXCNKdghfPZdAstZM4YpobGFk/0ZCjU5vWCew8ZOUTsMYtp52A4sGHpieGLXk
-0gejaQK8hG70K9GeaDaKm0UAE5780qM13NFBiBg+gIFYUXLxkVZsn7+hEA6YDewu
-Yq4pKdiFI2M7Aj+m4UucRzO237txeznDKKmSnrrgRG9UV7c9vHkhfpUCAwEAAaNj
-MGEwHQYDVR0OBBYEFM27r6xs8sW5D9dl0IVjah5S9ZZAMEAGA1UdEQQ5MDeCDmFs
-ZXBoLnN2a2hrLmN6hiVodHRwczovL2FsZXBoLnN2a2hrLmN6L2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAfwgwA9/oEx1jnywTpE+I+7omw9RN1McfA
-EN+vJDuGt0Vz8TcjRHUOGxwXHtbw4/aOkK48Drg/kIKY7dghuNeGJgd31bNsgvBj
-Zdecvn1G8TpRlTZXV71+EliO49zpNX8KSimobPkB+oHSMkt94HTljmka11yogiJi
-ycotZyPq8kGjGrFRh0InfIDfRGd9zD0v698moP8FzNlvckl3jL7tzT95QAA9dO21
-MpM8yEEOmngDz+D/LJeNJVT5cbvIZ3gpfm5yX16PyvFMXr8g9NMf/OhAznAHrL90
-xDF332t8sZ0yvjOOmIVyk2NtktyqGSqA7pRQRUZvzMHw15kyMzEM
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph.svkhk.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">Studijní a vědecká knihovna v Hradci Králové</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Research Library in Hradec Králové</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">Studijní a vědecká knihovna v Hradci Králové</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Research Library in Hradec Králové</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.svkhk.cz/Uvodni-stranka.aspx?lang=en-US</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.svkhk.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Sklenář</md:SurName>
-    <md:EmailAddress>petr.sklenar@svkhk.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aleph20.knihovna-pardubice.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/aleph20.knihovna-pardubice.cz-idp-shibboleth.xml
deleted file mode 100644
index 79cebf48..00000000
--- a/swamid-interfederations-2.0/aleph20.knihovna-pardubice.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aleph20.knihovna-pardubice.cz/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-12-28T11:25: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/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knihovna-pardubice.cz</shibmd:Scope>
-      <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">Regional Library in Pardubice</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Krajská knihovna v Pardubicích</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for patrons and staff of the Regional Library in Pardubice</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Krajské knihovny v Pardubicích</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://kkpce.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://kkpce.cz/cs/</mdui:InformationURL>
-        <mdui:Logo height="40" width="41">https://aleph20.knihovna-pardubice.cz/idp/images/logo_40.png</mdui:Logo>
-        <mdui:Logo height="87" width="90">https://aleph20.knihovna-pardubice.cz/idp/images/logo_90.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>
-MIIDYTCCAkmgAwIBAgIVAPFubL8wjTn8HgExnivs6f17K02iMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHWFsZXBoMjAua25paG92bmEtcGFyZHViaWNlLmN6MB4X
-DTE1MTIwNjIxNTYzOFoXDTM1MTIwNjIxNTYzOFowKDEmMCQGA1UEAwwdYWxlcGgy
-MC5rbmlob3ZuYS1wYXJkdWJpY2UuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCP3LzEbLA/IUKwMzWiGSVDBrEkYmB03ZoFLsVBkUwhnUtt4bhsVM9N
-sSlS9KiNtbo5kswwE/XyuUaUfHRKgm2R5/45EtvLkesrXvJCSFztCmwPHuVgKf7c
-h3J2JzkjjQ3wAaEcTvqLuba/dlA8iEm2KJy5CS/9Wd74AhALGh1fOPluxFZyAJ7V
-S/M4HpMUnz6pd/mnaApSLLwJ9ZlAR79VYun4c8ljVYQUYBmtuCRYi6YO9mE9HWZg
-K/w/9Xf8XX5orPl+eVVu21AEV8zHrZrLJz4wWKHAw9sSvUv4gXQt9Gf0yHvcJtjL
-2K0fU7JJt1/LtmQ4nEMz9VNJujFBI9WpAgMBAAGjgYEwfzAdBgNVHQ4EFgQUwB3l
-beKoKeenIxwuyuHkmyM8BlIwXgYDVR0RBFcwVYIdYWxlcGgyMC5rbmlob3ZuYS1w
-YXJkdWJpY2UuY3qGNGh0dHBzOi8vYWxlcGgyMC5rbmlob3ZuYS1wYXJkdWJpY2Uu
-Y3ovaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACUYE1aqVNsYpY0y
-cUioFT7EOtc8P51t5wAoHTQc4qBuTcvvhHIc8PtJMpiP15Z+zv+SiTZOeZhW5DZx
-04UUqUCD01dOQmoWp60n1UIuyhboSz9Yg431Z3JYYL6sDusqxj56ywMNSXqg1aw4
-G4oRD2tsMa1kEMKWw3RfeDCgtqzmkkJTAfWb+LlmmsHPm43lXIP1EWvVzKpB2N2o
-FwEyjv8X8tol3kKFg1VL4On2sOq5N4G7UdouhCiNYNZoMl/c+VnHDqQBrf/wRdOT
-GcJHBJBXdvinnR+rfxD3hUM7zi/qWkMOgSWRv1IV8dg0ItyPjFPNpKabl3R1XqMV
-KRvMLBs=
-                        </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>
-MIIDYDCCAkigAwIBAgIUURP+yFe36mFpN9RgfCXBYv8Op4QwDQYJKoZIhvcNAQEL
-BQAwKDEmMCQGA1UEAwwdYWxlcGgyMC5rbmlob3ZuYS1wYXJkdWJpY2UuY3owHhcN
-MTUxMjA2MjE1NjMyWhcNMzUxMjA2MjE1NjMyWjAoMSYwJAYDVQQDDB1hbGVwaDIw
-LmtuaWhvdm5hLXBhcmR1YmljZS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAPtizkYbUHkTYKA5F2ePE9OaQY+2OP6Kq6rqIceLouNvt01Ojr2OWSbs
-QK7VYQjFrhBsoVOxEz3QHj/JhnU0s+5q62zfft7cKgq15YyhGkQjg9miE8QC9dfs
-YzntSnoCnwuu06T/ZHyp0nRYDtCB39QylNO5LyeB9pgvK3uFy61k0ImctG7/RtSr
-exuTemd5kA7CVWNGseRkmrpjzOhNJBpZ1+dMkQxbYlMb7C9MG1xODER1gnZlUFAV
-NSSNqc59Qzy5nKdbxla8VsC5+Qau+bEZL49PgR6+yFbnOxZiXLg8QURDq3qDWkqK
-xqyqxHYjavOyAnOmDJ1VtjikwIkXfycCAwEAAaOBgTB/MB0GA1UdDgQWBBRDvIQ6
-9wmVi/vE38By6+TmyKJkmjBeBgNVHREEVzBVgh1hbGVwaDIwLmtuaWhvdm5hLXBh
-cmR1YmljZS5jeoY0aHR0cHM6Ly9hbGVwaDIwLmtuaWhvdm5hLXBhcmR1YmljZS5j
-ei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAVw31nViqZGCKvmmp
-eR4HfuYsBrrPPpFBk/DHn+I26VX8u/cHh8HE/p6xQy2DGxUEaazxMskUtxesawH2
-BYPl+Q0yZexW4fYES+8XWX7ZS7qqzb208ND+wBzAF88FPZPgURpNzlv66Eft6LTb
-btvWflGq1OQUjlOO+U1o/k+qWMNY6BnvPZ7I8OL24/NySOBRYF6g60qa5k+sq6b4
-2f9VHwi3EddbXUUeXDEOurE3y59/4vpnbXXE26HIDM2u3BDqWN542+9/0znb8V9j
-crqwW/FJZT95CyCSHjKlHuo7Sp6xH9lZ6LEgurhFZSR9NCm27iPFocc0rWdHUFAh
-xOyYFQ==
-                        </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>
-MIIDYTCCAkmgAwIBAgIVAIuGPC6pY3ijY02QMm6L8DaPg39RMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHWFsZXBoMjAua25paG92bmEtcGFyZHViaWNlLmN6MB4X
-DTE1MTIwNjIxNTYzM1oXDTM1MTIwNjIxNTYzM1owKDEmMCQGA1UEAwwdYWxlcGgy
-MC5rbmlob3ZuYS1wYXJkdWJpY2UuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCOLAnFMXyrFmUWUCKSgf2K0vNA8Fm2eKG/SSkfxR/GxavQul+9lwDf
-RK0zQ2/Fp3Y9uLV+knosd9wix1PaI7WDizhCfwXZXGHeiIFg5KiJ/YgEsjI9D/62
-62qtbUyFOvM++HKnE5uFDJ4XGRlx0ZoSyg+uVzuXnsSF4OXf7hpvA610c9fwa9Gi
-32olR5BkcKctfd71/xPAN10ze1BZKmX7+hmpnIdLj/cugTK7Ttddj5qrithaYpqh
-yPtF1FhB2HNZlpagASMZlY+rfxxjaD8cVInhCN2IhwPhrSLoPiTzmrXDfSsEHUG9
-08LmoBT5f1Kaky99QRzgnnQRlev4oGCzAgMBAAGjgYEwfzAdBgNVHQ4EFgQUf/RC
-jJa8TVE7lmYc/hIM8FVn+c4wXgYDVR0RBFcwVYIdYWxlcGgyMC5rbmlob3ZuYS1w
-YXJkdWJpY2UuY3qGNGh0dHBzOi8vYWxlcGgyMC5rbmlob3ZuYS1wYXJkdWJpY2Uu
-Y3ovaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAC+TkpIKYSWT3qBq
-GqtjA4N8cORNeH2/YMG0gCc3b0grGXg+tIyV7frVJ0NQRnqTytgN+Hw+Ww1G7rEI
-E9BmvQ+lz9LmmatDuT1G8Qv3OSVQRkrTPqEtcFnec57E2ocVDLvsLl2wEhhZ+HNz
-hukgkhCwXFECRQBdNZ3uBr38IndJgQspIxCGMkm3syhQsZEreFU6Rapsol2nQ9mX
-9Ov1Z565A5CJcJ0C4FjifHbHzIVvYE5xY9VXT/sFv2ZOVYg6KiNkT2QVSioTi8Qs
-FYylo3H84FfcXVVpFDYg4GKqEynsIvH2zDvBugunV0xM/iNq4mjqbRiyDa8Zb5Q9
-Vqwqp44=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aleph20.knihovna-pardubice.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph20.knihovna-pardubice.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph20.knihovna-pardubice.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph20.knihovna-pardubice.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aleph20.knihovna-pardubice.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph20.knihovna-pardubice.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aleph20.knihovna-pardubice.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph20.knihovna-pardubice.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aleph20.knihovna-pardubice.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph20.knihovna-pardubice.cz/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">knihovna-pardubice.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAPFubL8wjTn8HgExnivs6f17K02iMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHWFsZXBoMjAua25paG92bmEtcGFyZHViaWNlLmN6MB4X
-DTE1MTIwNjIxNTYzOFoXDTM1MTIwNjIxNTYzOFowKDEmMCQGA1UEAwwdYWxlcGgy
-MC5rbmlob3ZuYS1wYXJkdWJpY2UuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCP3LzEbLA/IUKwMzWiGSVDBrEkYmB03ZoFLsVBkUwhnUtt4bhsVM9N
-sSlS9KiNtbo5kswwE/XyuUaUfHRKgm2R5/45EtvLkesrXvJCSFztCmwPHuVgKf7c
-h3J2JzkjjQ3wAaEcTvqLuba/dlA8iEm2KJy5CS/9Wd74AhALGh1fOPluxFZyAJ7V
-S/M4HpMUnz6pd/mnaApSLLwJ9ZlAR79VYun4c8ljVYQUYBmtuCRYi6YO9mE9HWZg
-K/w/9Xf8XX5orPl+eVVu21AEV8zHrZrLJz4wWKHAw9sSvUv4gXQt9Gf0yHvcJtjL
-2K0fU7JJt1/LtmQ4nEMz9VNJujFBI9WpAgMBAAGjgYEwfzAdBgNVHQ4EFgQUwB3l
-beKoKeenIxwuyuHkmyM8BlIwXgYDVR0RBFcwVYIdYWxlcGgyMC5rbmlob3ZuYS1w
-YXJkdWJpY2UuY3qGNGh0dHBzOi8vYWxlcGgyMC5rbmlob3ZuYS1wYXJkdWJpY2Uu
-Y3ovaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACUYE1aqVNsYpY0y
-cUioFT7EOtc8P51t5wAoHTQc4qBuTcvvhHIc8PtJMpiP15Z+zv+SiTZOeZhW5DZx
-04UUqUCD01dOQmoWp60n1UIuyhboSz9Yg431Z3JYYL6sDusqxj56ywMNSXqg1aw4
-G4oRD2tsMa1kEMKWw3RfeDCgtqzmkkJTAfWb+LlmmsHPm43lXIP1EWvVzKpB2N2o
-FwEyjv8X8tol3kKFg1VL4On2sOq5N4G7UdouhCiNYNZoMl/c+VnHDqQBrf/wRdOT
-GcJHBJBXdvinnR+rfxD3hUM7zi/qWkMOgSWRv1IV8dg0ItyPjFPNpKabl3R1XqMV
-KRvMLBs=
-                        </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>
-MIIDYDCCAkigAwIBAgIUURP+yFe36mFpN9RgfCXBYv8Op4QwDQYJKoZIhvcNAQEL
-BQAwKDEmMCQGA1UEAwwdYWxlcGgyMC5rbmlob3ZuYS1wYXJkdWJpY2UuY3owHhcN
-MTUxMjA2MjE1NjMyWhcNMzUxMjA2MjE1NjMyWjAoMSYwJAYDVQQDDB1hbGVwaDIw
-LmtuaWhvdm5hLXBhcmR1YmljZS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAPtizkYbUHkTYKA5F2ePE9OaQY+2OP6Kq6rqIceLouNvt01Ojr2OWSbs
-QK7VYQjFrhBsoVOxEz3QHj/JhnU0s+5q62zfft7cKgq15YyhGkQjg9miE8QC9dfs
-YzntSnoCnwuu06T/ZHyp0nRYDtCB39QylNO5LyeB9pgvK3uFy61k0ImctG7/RtSr
-exuTemd5kA7CVWNGseRkmrpjzOhNJBpZ1+dMkQxbYlMb7C9MG1xODER1gnZlUFAV
-NSSNqc59Qzy5nKdbxla8VsC5+Qau+bEZL49PgR6+yFbnOxZiXLg8QURDq3qDWkqK
-xqyqxHYjavOyAnOmDJ1VtjikwIkXfycCAwEAAaOBgTB/MB0GA1UdDgQWBBRDvIQ6
-9wmVi/vE38By6+TmyKJkmjBeBgNVHREEVzBVgh1hbGVwaDIwLmtuaWhvdm5hLXBh
-cmR1YmljZS5jeoY0aHR0cHM6Ly9hbGVwaDIwLmtuaWhvdm5hLXBhcmR1YmljZS5j
-ei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAVw31nViqZGCKvmmp
-eR4HfuYsBrrPPpFBk/DHn+I26VX8u/cHh8HE/p6xQy2DGxUEaazxMskUtxesawH2
-BYPl+Q0yZexW4fYES+8XWX7ZS7qqzb208ND+wBzAF88FPZPgURpNzlv66Eft6LTb
-btvWflGq1OQUjlOO+U1o/k+qWMNY6BnvPZ7I8OL24/NySOBRYF6g60qa5k+sq6b4
-2f9VHwi3EddbXUUeXDEOurE3y59/4vpnbXXE26HIDM2u3BDqWN542+9/0znb8V9j
-crqwW/FJZT95CyCSHjKlHuo7Sp6xH9lZ6LEgurhFZSR9NCm27iPFocc0rWdHUFAh
-xOyYFQ==
-                        </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>
-MIIDYTCCAkmgAwIBAgIVAIuGPC6pY3ijY02QMm6L8DaPg39RMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHWFsZXBoMjAua25paG92bmEtcGFyZHViaWNlLmN6MB4X
-DTE1MTIwNjIxNTYzM1oXDTM1MTIwNjIxNTYzM1owKDEmMCQGA1UEAwwdYWxlcGgy
-MC5rbmlob3ZuYS1wYXJkdWJpY2UuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCOLAnFMXyrFmUWUCKSgf2K0vNA8Fm2eKG/SSkfxR/GxavQul+9lwDf
-RK0zQ2/Fp3Y9uLV+knosd9wix1PaI7WDizhCfwXZXGHeiIFg5KiJ/YgEsjI9D/62
-62qtbUyFOvM++HKnE5uFDJ4XGRlx0ZoSyg+uVzuXnsSF4OXf7hpvA610c9fwa9Gi
-32olR5BkcKctfd71/xPAN10ze1BZKmX7+hmpnIdLj/cugTK7Ttddj5qrithaYpqh
-yPtF1FhB2HNZlpagASMZlY+rfxxjaD8cVInhCN2IhwPhrSLoPiTzmrXDfSsEHUG9
-08LmoBT5f1Kaky99QRzgnnQRlev4oGCzAgMBAAGjgYEwfzAdBgNVHQ4EFgQUf/RC
-jJa8TVE7lmYc/hIM8FVn+c4wXgYDVR0RBFcwVYIdYWxlcGgyMC5rbmlob3ZuYS1w
-YXJkdWJpY2UuY3qGNGh0dHBzOi8vYWxlcGgyMC5rbmlob3ZuYS1wYXJkdWJpY2Uu
-Y3ovaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAC+TkpIKYSWT3qBq
-GqtjA4N8cORNeH2/YMG0gCc3b0grGXg+tIyV7frVJ0NQRnqTytgN+Hw+Ww1G7rEI
-E9BmvQ+lz9LmmatDuT1G8Qv3OSVQRkrTPqEtcFnec57E2ocVDLvsLl2wEhhZ+HNz
-hukgkhCwXFECRQBdNZ3uBr38IndJgQspIxCGMkm3syhQsZEreFU6Rapsol2nQ9mX
-9Ov1Z565A5CJcJ0C4FjifHbHzIVvYE5xY9VXT/sFv2ZOVYg6KiNkT2QVSioTi8Qs
-FYylo3H84FfcXVVpFDYg4GKqEynsIvH2zDvBugunV0xM/iNq4mjqbRiyDa8Zb5Q9
-Vqwqp44=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aleph20.knihovna-pardubice.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph20.knihovna-pardubice.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">Krajská knihovna v Pardubicích</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Regional Library in Pardubice</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">Krajská knihovna v Pardubicích</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Regional Library in Pardubice</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://kkpce.cz/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://kkpce.cz/cs/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Radek</md:GivenName>
-    <md:SurName>Goláň</md:SurName>
-    <md:EmailAddress>r.golan@knihovna-pardubice.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aleph22.svkpl.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/aleph22.svkpl.cz-idp-shibboleth.xml
deleted file mode 100644
index 6dbcbeff..00000000
--- a/swamid-interfederations-2.0/aleph22.svkpl.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aleph22.svkpl.cz/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2016-01-05T11:24: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/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkpl.cz</shibmd:Scope>
-      <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">The Education and Research Library of the Pilsener Region</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Studijní a vědecká knihovna Plzeňského kraje</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for patrons and staff of The Education and Research Library of the Pilsener Region</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Studijní a vědecké knihovny Plzeňského kraje</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.svkpl.cz/en/home/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.svkpl.cz/cs/home/</mdui:InformationURL>
-        <mdui:Logo height="40" width="40">https://aleph22.svkpl.cz/idp/images/logo_40.png</mdui:Logo>
-        <mdui:Logo height="90" width="91">https://aleph22.svkpl.cz/idp/images/logo_90.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>
-MIIDKzCCAhOgAwIBAgIUaxUbLafGKBFf7557FkV1MIECXMUwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQYWxlcGgyMi5zdmtwbC5jejAeFw0xNTEyMDUyMTAwMjRa
-Fw0zNTEyMDUyMTAwMjRaMBsxGTAXBgNVBAMMEGFsZXBoMjIuc3ZrcGwuY3owggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrI3bvxXWisartTC7g0rtFNV3n
-qkHijb/cXvf7dNejnjUvLLXKs/G5RubC/Om7syWRnPNtXluuArPOm2TNGZl4J4Yl
-jMx9y0TP8WDrNlYxd+kvl1dyURGXzrQMhU7ju8kQGWUxQN7GNYYBwjaXCz9Cz0hy
-a6yVfaj5eR6xeX4gDvcHu4CWMRf62CsR6gxDZA5nGoohSJZ8Qb3mPr6VUgbmXj5r
-W3PgDzBZptiiPL0ux5kCrTNaXBTmWlMKGTYZIt1J9UlsEEfhEaWeBC4LrXu2sZRM
-rFaWz7uJqDJKJr6gX9UWtjOV1AgRsUpTeS1wxuKrA8mbUbT8/YuRvGpa24exAgMB
-AAGjZzBlMB0GA1UdDgQWBBSvEmk0v2RMf4eyNQbIy4bSpJ7hgjBEBgNVHREEPTA7
-ghBhbGVwaDIyLnN2a3BsLmN6hidodHRwczovL2FsZXBoMjIuc3ZrcGwuY3ovaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAJRWlcYHU7FpY9dlM4JMOZwb
-4tENEVJFsSdzH2P3KsiZosW6QbQZ4bZQ7dbx2g++Sbu3Sndy48cLlxxoOG+I+S7F
-e1aRXBIdWenTAO10T3nOuVeAXuPfwpOoeGeSNukGR+s85ht5nAp8nQND453RpfUF
-lWoPr17KX2jLO17IG0/sejjWQ7OZwdtkd5syQLqSNFSAreNfZ4c25mgYjZmTZZAc
-WJFKYU3TPilFnEw5SyjRSzOg2FELzYGSa9opGi7ouepYiMlfSQZae+c46+Ri7eNS
-Rp4eeOlOWyniVPJRpv/+b5naA4/aUABvMGgn34Crc3VC4+hNSwkYR2snrAs8vMQ=
-                        </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>
-MIIDKzCCAhOgAwIBAgIUDNgU+3aZf2ZH/nQ6JX8eR4MvTkwwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQYWxlcGgyMi5zdmtwbC5jejAeFw0xNTEyMDUyMTAwMjNa
-Fw0zNTEyMDUyMTAwMjNaMBsxGTAXBgNVBAMMEGFsZXBoMjIuc3ZrcGwuY3owggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQeNJ1c6bmOyk11ew7Yi8kfYuP
-BO6saaM2iakWiHEx5lIh6pJmOxgE5IF8LWaOYmSpR3Pe5U73uFnmYPtwdfrcXK8a
-BzYQKnLfsN2bulcmsHaIbm7NvxnnL422wAumj1u462+evwRsZOVlFLHWLjU8G4rJ
-ofApAk2BZpjwvZmyBnCs1Z3dmrLn/AN7Kdv1f5GPOKqkrYdK5CV7DxMf49Ji1URe
-Iscbb8Pe/YmeWdubRUndPLjx6k/kKXiR5yl8sen+yaGhTsQ6Y0a0qRl7eM8b3E3P
-EPYW9C154y/2cxHogdIEMaxcztJMpERRnJ3oNxF0/mNbpLmDweHluZsnhBGRAgMB
-AAGjZzBlMB0GA1UdDgQWBBTdNNcKo3C/yOC4vLCBLLnkFIICXTBEBgNVHREEPTA7
-ghBhbGVwaDIyLnN2a3BsLmN6hidodHRwczovL2FsZXBoMjIuc3ZrcGwuY3ovaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBALpWieqjs3+Iwsk8gPKuFpJi
-p/d1tYqyrG4GoQbRIkYbXlzC+V+HqvlU6xsCSgBzkfFjRNfiEv+3ibOID6GuEwj8
-B4zxgJjqVc5i+Fe4SuBQVFFby0CtPPD/tLKFYdm53O6zBN8HxJ2skCx0vvSf7/8p
-lDwYTTlj4O/kuOe/Od7g3XUBlonIeXy/Y2zqZOU2IXtcIEzxGMtnKaGV16ZfX3Vw
-VwERW3Lq6aH/fzUzCzC8lQVdWb21Hx4KqE8Z1RNnaqOJveD8Osf8YhL8bKIMDwkV
-P2734Bfnhpkd3rYQa1x6te7tVruaDWcc3/J6MnZYmnMb5b0+SN0moG2esdopzN8=
-                        </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>
-MIIDLDCCAhSgAwIBAgIVAM/u/IwITx3wHDDfHjD/JAWJUn1fMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGFsZXBoMjIuc3ZrcGwuY3owHhcNMTUxMjA1MjEwMDIz
-WhcNMzUxMjA1MjEwMDIzWjAbMRkwFwYDVQQDDBBhbGVwaDIyLnN2a3BsLmN6MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo3x06sLUZYv1/Yhy2X4cci2x
-YiPiZxt2Ai18WeKXqtyJHZshjaGLgbzFht6xnTyypYC4fXW3ajlJUi1wxi8hcpC3
-WkSWOrn7vjfSl9NnXqhK3MRwK+w5954vvHLu/jakZD62oglgxfgUEcOWCWgoGXJi
-wKOin4R8MMa84jcM51enCT2zD2WFJgsmCV/dD9qBvpWSYW8PjkASy5q3pzol3AUX
-ynWKaGHvN0GnfHhZrh7LRTC2Ub/TUVhIgk6z1VXa0woK25ZBNnu43LoO2aNRmzGD
-aSoGh4rvUl/o3l/BCR6evCU9Er5kGXlsPul1s4F+8m3htqjlWL5Ujz3G2JelYwID
-AQABo2cwZTAdBgNVHQ4EFgQUjctL75txbBSv7oV0nPmVDPUaENYwRAYDVR0RBD0w
-O4IQYWxlcGgyMi5zdmtwbC5jeoYnaHR0cHM6Ly9hbGVwaDIyLnN2a3BsLmN6L2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB+kB4Cp8vdFyoxPL7nBYjv
-PLKlDS53clsBhOPZ3g2hk0wz9QR8ND6TtYQe/pZkImY1qYTZwTbu248RDyunpOAn
-9fNuYL9ZHruZvr6Zfu8ay9Dx5nKg2DucIIehtgBE3Q/8q+RCD4TY6x7/FsYsBm0L
-ybH/G/9dbko9FnzIyIPrF4TUgvQ9a4YvOfb4X2Tcd78eN526z7nu5YwaENL8RUIG
-HgXl2DXzQcbyBnUz7gPbAEw6UjUg1w7WNv3VT7M//oiMXyuzBam3IaGyP5NPGiNX
-zT8besx5BrRutTnhYKW5ghlneGVBmjTjLhRZIUuSz+SyWopZKlFxAWZW/tb2bASw
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aleph22.svkpl.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph22.svkpl.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph22.svkpl.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph22.svkpl.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aleph22.svkpl.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph22.svkpl.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aleph22.svkpl.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aleph22.svkpl.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aleph22.svkpl.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aleph22.svkpl.cz/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">svkpl.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUaxUbLafGKBFf7557FkV1MIECXMUwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQYWxlcGgyMi5zdmtwbC5jejAeFw0xNTEyMDUyMTAwMjRa
-Fw0zNTEyMDUyMTAwMjRaMBsxGTAXBgNVBAMMEGFsZXBoMjIuc3ZrcGwuY3owggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrI3bvxXWisartTC7g0rtFNV3n
-qkHijb/cXvf7dNejnjUvLLXKs/G5RubC/Om7syWRnPNtXluuArPOm2TNGZl4J4Yl
-jMx9y0TP8WDrNlYxd+kvl1dyURGXzrQMhU7ju8kQGWUxQN7GNYYBwjaXCz9Cz0hy
-a6yVfaj5eR6xeX4gDvcHu4CWMRf62CsR6gxDZA5nGoohSJZ8Qb3mPr6VUgbmXj5r
-W3PgDzBZptiiPL0ux5kCrTNaXBTmWlMKGTYZIt1J9UlsEEfhEaWeBC4LrXu2sZRM
-rFaWz7uJqDJKJr6gX9UWtjOV1AgRsUpTeS1wxuKrA8mbUbT8/YuRvGpa24exAgMB
-AAGjZzBlMB0GA1UdDgQWBBSvEmk0v2RMf4eyNQbIy4bSpJ7hgjBEBgNVHREEPTA7
-ghBhbGVwaDIyLnN2a3BsLmN6hidodHRwczovL2FsZXBoMjIuc3ZrcGwuY3ovaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAJRWlcYHU7FpY9dlM4JMOZwb
-4tENEVJFsSdzH2P3KsiZosW6QbQZ4bZQ7dbx2g++Sbu3Sndy48cLlxxoOG+I+S7F
-e1aRXBIdWenTAO10T3nOuVeAXuPfwpOoeGeSNukGR+s85ht5nAp8nQND453RpfUF
-lWoPr17KX2jLO17IG0/sejjWQ7OZwdtkd5syQLqSNFSAreNfZ4c25mgYjZmTZZAc
-WJFKYU3TPilFnEw5SyjRSzOg2FELzYGSa9opGi7ouepYiMlfSQZae+c46+Ri7eNS
-Rp4eeOlOWyniVPJRpv/+b5naA4/aUABvMGgn34Crc3VC4+hNSwkYR2snrAs8vMQ=
-                        </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>
-MIIDKzCCAhOgAwIBAgIUDNgU+3aZf2ZH/nQ6JX8eR4MvTkwwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQYWxlcGgyMi5zdmtwbC5jejAeFw0xNTEyMDUyMTAwMjNa
-Fw0zNTEyMDUyMTAwMjNaMBsxGTAXBgNVBAMMEGFsZXBoMjIuc3ZrcGwuY3owggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQeNJ1c6bmOyk11ew7Yi8kfYuP
-BO6saaM2iakWiHEx5lIh6pJmOxgE5IF8LWaOYmSpR3Pe5U73uFnmYPtwdfrcXK8a
-BzYQKnLfsN2bulcmsHaIbm7NvxnnL422wAumj1u462+evwRsZOVlFLHWLjU8G4rJ
-ofApAk2BZpjwvZmyBnCs1Z3dmrLn/AN7Kdv1f5GPOKqkrYdK5CV7DxMf49Ji1URe
-Iscbb8Pe/YmeWdubRUndPLjx6k/kKXiR5yl8sen+yaGhTsQ6Y0a0qRl7eM8b3E3P
-EPYW9C154y/2cxHogdIEMaxcztJMpERRnJ3oNxF0/mNbpLmDweHluZsnhBGRAgMB
-AAGjZzBlMB0GA1UdDgQWBBTdNNcKo3C/yOC4vLCBLLnkFIICXTBEBgNVHREEPTA7
-ghBhbGVwaDIyLnN2a3BsLmN6hidodHRwczovL2FsZXBoMjIuc3ZrcGwuY3ovaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBALpWieqjs3+Iwsk8gPKuFpJi
-p/d1tYqyrG4GoQbRIkYbXlzC+V+HqvlU6xsCSgBzkfFjRNfiEv+3ibOID6GuEwj8
-B4zxgJjqVc5i+Fe4SuBQVFFby0CtPPD/tLKFYdm53O6zBN8HxJ2skCx0vvSf7/8p
-lDwYTTlj4O/kuOe/Od7g3XUBlonIeXy/Y2zqZOU2IXtcIEzxGMtnKaGV16ZfX3Vw
-VwERW3Lq6aH/fzUzCzC8lQVdWb21Hx4KqE8Z1RNnaqOJveD8Osf8YhL8bKIMDwkV
-P2734Bfnhpkd3rYQa1x6te7tVruaDWcc3/J6MnZYmnMb5b0+SN0moG2esdopzN8=
-                        </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>
-MIIDLDCCAhSgAwIBAgIVAM/u/IwITx3wHDDfHjD/JAWJUn1fMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGFsZXBoMjIuc3ZrcGwuY3owHhcNMTUxMjA1MjEwMDIz
-WhcNMzUxMjA1MjEwMDIzWjAbMRkwFwYDVQQDDBBhbGVwaDIyLnN2a3BsLmN6MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo3x06sLUZYv1/Yhy2X4cci2x
-YiPiZxt2Ai18WeKXqtyJHZshjaGLgbzFht6xnTyypYC4fXW3ajlJUi1wxi8hcpC3
-WkSWOrn7vjfSl9NnXqhK3MRwK+w5954vvHLu/jakZD62oglgxfgUEcOWCWgoGXJi
-wKOin4R8MMa84jcM51enCT2zD2WFJgsmCV/dD9qBvpWSYW8PjkASy5q3pzol3AUX
-ynWKaGHvN0GnfHhZrh7LRTC2Ub/TUVhIgk6z1VXa0woK25ZBNnu43LoO2aNRmzGD
-aSoGh4rvUl/o3l/BCR6evCU9Er5kGXlsPul1s4F+8m3htqjlWL5Ujz3G2JelYwID
-AQABo2cwZTAdBgNVHQ4EFgQUjctL75txbBSv7oV0nPmVDPUaENYwRAYDVR0RBD0w
-O4IQYWxlcGgyMi5zdmtwbC5jeoYnaHR0cHM6Ly9hbGVwaDIyLnN2a3BsLmN6L2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB+kB4Cp8vdFyoxPL7nBYjv
-PLKlDS53clsBhOPZ3g2hk0wz9QR8ND6TtYQe/pZkImY1qYTZwTbu248RDyunpOAn
-9fNuYL9ZHruZvr6Zfu8ay9Dx5nKg2DucIIehtgBE3Q/8q+RCD4TY6x7/FsYsBm0L
-ybH/G/9dbko9FnzIyIPrF4TUgvQ9a4YvOfb4X2Tcd78eN526z7nu5YwaENL8RUIG
-HgXl2DXzQcbyBnUz7gPbAEw6UjUg1w7WNv3VT7M//oiMXyuzBam3IaGyP5NPGiNX
-zT8besx5BrRutTnhYKW5ghlneGVBmjTjLhRZIUuSz+SyWopZKlFxAWZW/tb2bASw
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aleph22.svkpl.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aleph22.svkpl.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">Studijní a vědecká knihovna Plzeňského kraje</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Education and Research Library of the Pilsener Region</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">Studijní a vědecká knihovna Plzeňského kraje</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Education and Research Library of the Pilsener Region</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.svkpl.cz/en/home/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.svkpl.cz/cs/home/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josef</md:GivenName>
-    <md:SurName>Chlad</md:SurName>
-    <md:EmailAddress>chlad@svkpl.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/alnbmth.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/alnbmth.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index 578511dc..00000000
--- a/swamid-interfederations-2.0/alnbmth.sisoshibboleth.co.uk-entity.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://alnbmth.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Bournemouth University ~ ALNBmth, Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2013-06-05T14:29:18Z"/>
-  </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://alnbmth.siso.co/sso/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://alnbmth.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Bournemouth University ~ ALNBmth, Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ ALNBmth, Online Resource Booking</mdui:Description>
-        <mdui:Logo height="60" width="60">https://shibboleth.siso.co/siso-logo60x60.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://alnbmth.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alnbmth.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://alnbmth.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://alnbmth.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://alnbmth.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://alnbmth.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://alnbmth.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Bournemouth University ~ ALNBmth, Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/alpha.bobnational.net-entityid.xml b/swamid-interfederations-2.0/alpha.bobnational.net-entityid.xml
deleted file mode 100644
index d68706fb..00000000
--- a/swamid-interfederations-2.0/alpha.bobnational.net-entityid.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://alpha.bobnational.net/entityid">
-  <!--
-		This is a "BoB National (Test)" simpleSAMLphp SP for Cambridge Imaging Systems Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-12T09:14:31Z">
-      <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">BoB National (Test)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">BoB National 3.0 (Development version for testing only)</mdui:Description>
-        <mdui:Logo height="57" width="224">https://alpha.bobnational.net/images/site-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>
-						MIID2jCCAsICCQDGys3zsp9DtzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgTDkNhbWJyaWRnZXNoaXJlMRMwEQYDVQQHEwpXaWxsaW5naGFt
-						MSYwJAYDVQQKEx1DYW1icmlkZ2UgSW1hZ2luZyBTeXN0ZW1zIEx0ZDEeMBwGA1UE
-						AxMVYWxwaGEuYm9ibmF0aW9uYWwubmV0MSkwJwYJKoZIhvcNAQkBFhpkbnNAY2Ft
-						YnJpZGdlaW1hZ2luZy5jby51azAeFw0xMzA2MTExNTIxNDFaFw0yMzA2MDkxNTIx
-						NDFaMIGuMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOQ2FtYnJpZGdlc2hpcmUxEzAR
-						BgNVBAcTCldpbGxpbmdoYW0xJjAkBgNVBAoTHUNhbWJyaWRnZSBJbWFnaW5nIFN5
-						c3RlbXMgTHRkMR4wHAYDVQQDExVhbHBoYS5ib2JuYXRpb25hbC5uZXQxKTAnBgkq
-						hkiG9w0BCQEWGmRuc0BjYW1icmlkZ2VpbWFnaW5nLmNvLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvf5+byCAsZiIEv92+YYjEKkY13N6tqWYHL5X
-						urwckcTwuHvarX3pNWV53JM0kpO2boPkvgdLYDEL4LxU5O622p+EK1b/7ue/KNrB
-						iJmIbmmhbsmq6zJatQW2TX0Ex91cJla9IEWWsAZY8iEac9Vo4iZpLGPNdGRWikD7
-						QFrXROd4OVMprGnTc2wZhbokx1jMf0nunDbB9hyRMX7odGnYB6X6pmqLS3fVgFrN
-						2G9yjFLY0hklexfY00+BX7KJXGRXJSDqqEujD3D3gP0aRZsNlFa70WNmwov+0nDi
-						VvdiCsmNXmRrfJ0OKg0DFJzVaO4WlGGePyCpR6U4t0o/1XQt0QIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQAURCybMxWvGAanPx/adIf7k9BJBcsOwS8/hLAwfoGkmKPQ
-						x363AquUnlM8r59HJnEfLIZpqVaNvknx0TDSuD7Ncwa25sTZpL3fuV0ZIeAyF9Gm
-						32e1q8ByVJWdTDYFw5M5htwOmj7dBjTCsvAyR9/47OzQ38EHyOsOke++dFIcxMDB
-						xRiuE4RpUmB7A6s839iyqv5XMZehEF1oNBlxF9HPJjdb3mteym3uxEGPK5qtjaCP
-						WCb3BNYjj6R6kXlddVgYnK8MIiheop0b9s0oXnquC6CN1K6C3LJM+BtcP4IrXnVF
-						kXrl7nZXgIhRp8teewcmJh1MXNeTZrU42X74QJ22
-					</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>
-						MIID2jCCAsICCQDGys3zsp9DtzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgTDkNhbWJyaWRnZXNoaXJlMRMwEQYDVQQHEwpXaWxsaW5naGFt
-						MSYwJAYDVQQKEx1DYW1icmlkZ2UgSW1hZ2luZyBTeXN0ZW1zIEx0ZDEeMBwGA1UE
-						AxMVYWxwaGEuYm9ibmF0aW9uYWwubmV0MSkwJwYJKoZIhvcNAQkBFhpkbnNAY2Ft
-						YnJpZGdlaW1hZ2luZy5jby51azAeFw0xMzA2MTExNTIxNDFaFw0yMzA2MDkxNTIx
-						NDFaMIGuMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOQ2FtYnJpZGdlc2hpcmUxEzAR
-						BgNVBAcTCldpbGxpbmdoYW0xJjAkBgNVBAoTHUNhbWJyaWRnZSBJbWFnaW5nIFN5
-						c3RlbXMgTHRkMR4wHAYDVQQDExVhbHBoYS5ib2JuYXRpb25hbC5uZXQxKTAnBgkq
-						hkiG9w0BCQEWGmRuc0BjYW1icmlkZ2VpbWFnaW5nLmNvLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvf5+byCAsZiIEv92+YYjEKkY13N6tqWYHL5X
-						urwckcTwuHvarX3pNWV53JM0kpO2boPkvgdLYDEL4LxU5O622p+EK1b/7ue/KNrB
-						iJmIbmmhbsmq6zJatQW2TX0Ex91cJla9IEWWsAZY8iEac9Vo4iZpLGPNdGRWikD7
-						QFrXROd4OVMprGnTc2wZhbokx1jMf0nunDbB9hyRMX7odGnYB6X6pmqLS3fVgFrN
-						2G9yjFLY0hklexfY00+BX7KJXGRXJSDqqEujD3D3gP0aRZsNlFa70WNmwov+0nDi
-						VvdiCsmNXmRrfJ0OKg0DFJzVaO4WlGGePyCpR6U4t0o/1XQt0QIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQAURCybMxWvGAanPx/adIf7k9BJBcsOwS8/hLAwfoGkmKPQ
-						x363AquUnlM8r59HJnEfLIZpqVaNvknx0TDSuD7Ncwa25sTZpL3fuV0ZIeAyF9Gm
-						32e1q8ByVJWdTDYFw5M5htwOmj7dBjTCsvAyR9/47OzQ38EHyOsOke++dFIcxMDB
-						xRiuE4RpUmB7A6s839iyqv5XMZehEF1oNBlxF9HPJjdb3mteym3uxEGPK5qtjaCP
-						WCb3BNYjj6R6kXlddVgYnK8MIiheop0b9s0oXnquC6CN1K6C3LJM+BtcP4IrXnVF
-						kXrl7nZXgIhRp8teewcmJh1MXNeTZrU42X74QJ22
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://alpha.bobnational.net/saml/module.php/saml/sp/saml2-logout.php/imagenweb"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alpha.bobnational.net/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://alpha.bobnational.net/saml/module.php/saml/sp/saml1-acs.php/imagenweb" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://alpha.bobnational.net/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://alpha.bobnational.net/saml/module.php/saml/sp/saml1-acs.php/imagenweb/artifact" index="3"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">alpha.bobnational.net</ServiceName>
-      <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="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="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="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="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">Cambridge Imaging Systems Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">BoB National (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cambridgeimaging.co.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Wassall</SurName>
-    <EmailAddress>mailto:support@cambridgeimaging.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Wassall</SurName>
-    <EmailAddress>mailto:richard.wassall@cambridgeimaging.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/alumidp.princeton.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/alumidp.princeton.edu-idp-shibboleth.xml
deleted file mode 100644
index fd36c959..00000000
--- a/swamid-interfederations-2.0/alumidp.princeton.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,96 +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://alumidp.princeton.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">alumni.princeton.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Princeton University Alumni</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Princeton University Alumni Identity Provider</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>
-MIIDQDCCAiigAwIBAgIVAKG9V3PzZjR4ecwHT4AZLBOz/wyrMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFWFsdW1pZHAucHJpbmNldG9uLmVkdTAeFw0xNDAzMDQx
-OTAwMzZaFw0zNDAzMDQxOTAwMzZaMCAxHjAcBgNVBAMTFWFsdW1pZHAucHJpbmNl
-dG9uLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIkdv16hF0en
-8GQO6Z2JOUkKy+pcmGjRp4f4hdDaALfu2XgfZ1NKWGbU3+GAZ5J9gx+sMJ7REphq
-p/g0aUWlzlxH4OBPOBI2yzH8Qk2SNgSzJJPzvKt1h9aC+6a5IzwezT3pwgJL6qwq
-vOqo64BKJt6hcRtMwcix/iiXCAOpYzPK5ELiNW/KFdJs9tBi/bsd4ismoNYP9v9Y
-uTRVUEB6UyGFW36l53TlNba3LqE8QD8W0ZKIk18AFCBkxGc5NdLkBa2Ba/FhflWI
-+PTpX2h8Zu6N2w10j9RylG6Tl18JA5GlJiYXIgLjIr/53axYuMXzv6qOMSFhbcOD
-//Vz5bTeP28CAwEAAaNxMG8wTgYDVR0RBEcwRYIVYWx1bWlkcC5wcmluY2V0b24u
-ZWR1hixodHRwczovL2FsdW1pZHAucHJpbmNldG9uLmVkdS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUvO7+POJaCDIgds8naRSxtlmhgdAwDQYJKoZIhvcNAQEFBQAD
-ggEBAFweyY54iGLK6pMSJy2HEcOk545A7nLi1l0ikqzHccVHX3UlTiUWQJwOGSsu
-EW/sjZJEtShgDgT87fo1wyV7F0ACsqqSIyTuP5EJEvAyK0KA3Q+1TS59QJ2WYGv9
-fvFLbxn8fzrgtx2OxBx0a9IKAZz1/8BlIRpyR9/D9ulCvzWYQDDMAcsVuIhCLsPC
-2zWpo/m3AlVWRT1ETM4qq87Gu3r3evpu24QdN+pbd6/72ebNRssdFY/2JsqsMyrw
-Rbu421cAQ0VJGoLW4cLLElf0nCOJhhjboQziAH5uKGpYyJqMI/9djVZUQcMCAzXL
-Oo1MSQQ0dwJedoRxmRK7sUYg9KY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://alumidp.princeton.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://alumidp.princeton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://alumidp.princeton.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alumidp.princeton.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://alumidp.princeton.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alumni.princeton.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAKG9V3PzZjR4ecwHT4AZLBOz/wyrMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFWFsdW1pZHAucHJpbmNldG9uLmVkdTAeFw0xNDAzMDQx
-OTAwMzZaFw0zNDAzMDQxOTAwMzZaMCAxHjAcBgNVBAMTFWFsdW1pZHAucHJpbmNl
-dG9uLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIkdv16hF0en
-8GQO6Z2JOUkKy+pcmGjRp4f4hdDaALfu2XgfZ1NKWGbU3+GAZ5J9gx+sMJ7REphq
-p/g0aUWlzlxH4OBPOBI2yzH8Qk2SNgSzJJPzvKt1h9aC+6a5IzwezT3pwgJL6qwq
-vOqo64BKJt6hcRtMwcix/iiXCAOpYzPK5ELiNW/KFdJs9tBi/bsd4ismoNYP9v9Y
-uTRVUEB6UyGFW36l53TlNba3LqE8QD8W0ZKIk18AFCBkxGc5NdLkBa2Ba/FhflWI
-+PTpX2h8Zu6N2w10j9RylG6Tl18JA5GlJiYXIgLjIr/53axYuMXzv6qOMSFhbcOD
-//Vz5bTeP28CAwEAAaNxMG8wTgYDVR0RBEcwRYIVYWx1bWlkcC5wcmluY2V0b24u
-ZWR1hixodHRwczovL2FsdW1pZHAucHJpbmNldG9uLmVkdS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUvO7+POJaCDIgds8naRSxtlmhgdAwDQYJKoZIhvcNAQEFBQAD
-ggEBAFweyY54iGLK6pMSJy2HEcOk545A7nLi1l0ikqzHccVHX3UlTiUWQJwOGSsu
-EW/sjZJEtShgDgT87fo1wyV7F0ACsqqSIyTuP5EJEvAyK0KA3Q+1TS59QJ2WYGv9
-fvFLbxn8fzrgtx2OxBx0a9IKAZz1/8BlIRpyR9/D9ulCvzWYQDDMAcsVuIhCLsPC
-2zWpo/m3AlVWRT1ETM4qq87Gu3r3evpu24QdN+pbd6/72ebNRssdFY/2JsqsMyrw
-Rbu421cAQ0VJGoLW4cLLElf0nCOJhhjboQziAH5uKGpYyJqMI/9djVZUQcMCAzXL
-Oo1MSQQ0dwJedoRxmRK7sUYg9KY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://alumidp.princeton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Princeton University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Princeton University Alumni</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.princeton.edu/index.shtml</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Steven Niedzwiecki</md:GivenName>
-    <md:EmailAddress>steven@princeton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Security and Data Protection</md:GivenName>
-    <md:EmailAddress>sdp@princeton.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/alumniconnector.london.edu-shibboleth.xml b/swamid-interfederations-2.0/alumniconnector.london.edu-shibboleth.xml
deleted file mode 100644
index a436b99b..00000000
--- a/swamid-interfederations-2.0/alumniconnector.london.edu-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://alumniconnector.london.edu/shibboleth">
-  <!--
-		This is an "Alumni Connector" Shibboleth SP for the London Business School.
-	-->
-  <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="2014-06-03T15:15:54Z">
-      <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://alumniconnector.london.edu/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://alumniconnector.london.edu/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgTCCA2mgAwIBAgIQb1k6svpWuK5jsDHuxauJGDANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDUxMzAwMDAwMFoXDTE3MDUxMjIzNTk1OVowSDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExphbHVtbmljb25u
-						ZWN0b3IubG9uZG9uLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AMVhwovtjykmWCVhdA/VqLWs4ralOO8jE7qyjMxoUEeasNcxE+7IopDI2HuV8joL
-						jPUNnqjA24fieLUwkd+/asyTQ0GTFbmGKAfE11mqPiOjUpw1sFcZyOAYFSSH2iBO
-						9JPRVr59UFKH7nwtrPfztFvuMzJ5wLL0/zUrDQzxVEMXsRtnRgM2pFjHf2XnimHu
-						jsxNNQT7KnEubHj3IeS6FVGLBKphup2L7Fr5Lz2G6+5epTuHaqMolEfhTPGowudB
-						QbTHCcqXIg+GW6QDe893Q+Pi0lLjvRcuSkKHqrTrohEW0MECBtic50jm5NMdm/CT
-						NF/hDNvQW7Ls9/akIwZ2yMUCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR5VXq22fX+3Cl+t0YGGKsSB2SZQTAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaYWx1bW5pY29u
-						bmVjdG9yLmxvbmRvbi5lZHUwDQYJKoZIhvcNAQEFBQADggEBAFi0t2vhnavwuw3T
-						UXRWyt2QxdLIKJpzJX+DOnkB8EXaU7VrwtUhy4idA5L4e2QDIZEEGELZDLC6LaI4
-						NZb7z2j2h5O1G70NhpyO6MvIlyMH/ZJ6g6YVoLiWgax4PnEPhLqq9R95rrZa5I5a
-						UO3yTnzIbaw6XAaP1Rk7i2qFCL9MIn8/BMUNoHbeU1JU9EJCL2npM0o0Uk7GCiZb
-						O0X28INlrfNnlOem0P6GjK7rqKerNY36IeL5hRicJuSMSEW8JPp5Ql0DRRkqPL9v
-						lQzS4P/mYJscNI0c5W4QvWnQ2AZI79uKl4jHKh4K1BFLEkoZpmwz8BrhvnWiB4gw
-						W7dyKKk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://alumniconnector.london.edu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://alumniconnector.london.edu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://alumniconnector.london.edu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alumniconnector.london.edu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://alumniconnector.london.edu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://alumniconnector.london.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://alumniconnector.london.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://alumniconnector.london.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://alumniconnector.london.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://alumniconnector.london.edu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://alumniconnector.london.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">London Business School</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London Business School Alumni Connector</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.london.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Robert</GivenName>
-    <SurName>Woodhead</SurName>
-    <EmailAddress>mailto:robbie.woodhead@freestyleinteractive.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Woodhead</SurName>
-    <EmailAddress>mailto:robbie.woodhead@freestyleinteractive.co.uk</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 7f46133b..00000000
--- a/swamid-interfederations-2.0/ambre.vetagro-sup.fr-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://ambre.vetagro-sup.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Vetagro Sup</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB/klEQVQ4y2NkQAP///+X+/jxI/PO7dujP3/7kf7v778ffDzciw2MDFaqq6t/Y2RkfIysngndAEZGxkezZ8/25xEQqVDTs5eRVrNU4RQUL7x9+7YtumasBjAwMDBISIgbcvBKct998p7h1fvfDKyc4nz//jF6yjAwSBNlwM+fP3/9/PmT4dbl4wysrCwMf//9Z/r7959UcFISD1EGPH107xgfD9sbTg52hrcvHjDw87Aw/Pz+7tLEefNuEmWAm6ffxvu3Ll4zMjZleHz/KsO7lw+f3bh+czs2tVgNsLS0fPfs4b3VnKy//wrycW84e2L/uobmtg0MpIKurt6N////Z8jPzxcnWTMDAwPD79//tbq7+9bhU8OMTfD//8cMP79L1X/8tjxMQYHXT0Uh88aBgyuvEW3Aly+8ntw8jLU3bx20cnH/xPz2jTyvk9OGpTt3NhIOxP//GRgkJGR8tPVeyElIvWA4dfIqg57Bff0nD+eHExULIb5dqkYmYgYm5r8YPH3vMzx//omBk+edpI4+vxVRBnz5zPqbi4vt7a9fv//9+cvAYG79jIGZmZWBg4NJiCgDdh4sfHD/7u9j714Z/BYWiGBQVkxjePNK8+erV5+uYDOABTMM/nP09y9Z8+OHgNjli9ahf//++8vGwrlAS0tp/v///7kYGRm/IasHAIVTy8DG/VpJAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA5KzAyOjAwfDtz7wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowOSswMjowMA1my1MAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.vetagro-sup.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Vetagro Sup</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>
-					      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>
-    </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-POST" Location="https://ambre.vetagro-sup.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ambre.vetagro-sup.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ambre.vetagro-sup.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Vetagro Sup</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Vetagro Sup</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vetagro-sup.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Nicolas Aulas</md:SurName>
-    <md:EmailAddress>nicolas.aulas@vetagro-sup.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 523f3b2e..00000000
--- a/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-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://antimoine.insa-strasbourg.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">INSA Strasbourg</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAq1BMVEXeAACEhoTWz87nQTn3oqXnIBjvgnvWlpT/5+fnEAjvZWOltrXnNDH3mpT/9/fnCAD/4+fvioz3x8bnVVL3qq3nKCnvkpTnHBjvcXP3sq3vgoT/7+/nFBDnODH3mpz////nDAj3z87vlpTveXv3vr3nAACMmpznRUL3pqXnJCHnFAj/+//nDADvjoz3y87vXVr3rq3nLCnvdXP3srXvhoT/8/fvODH3npz3lpQaie6kAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAe0lEQVQY053OwQqCQBhF4VM22VSMMWrFGP2kkIpUQ1nz/m8Ws20TeFeHb3WRnzEBBjO8xRjZrURi0TFiy+UITjTpjIKaOndZuDSGxF0j9G1+e7CuLN1nE2F7VI28tAoqMMezP1ieFOOp7RPueBXKSqdnMq8Wg66nPP0LX4uIG4jEwJ0sAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjA0KzAyOjAwIHfmJQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowNCswMjowMFEqXpkAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.insa-strasbourg.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">INSA Strasbourg</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>
-					      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>
-    </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-POST" Location="https://antimoine.insa-strasbourg.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://antimoine.insa-strasbourg.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://antimoine.insa-strasbourg.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INSA Strasbourg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INSA Strasbourg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.insa-strasbourg.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Lahsen BOUZID</md:SurName>
-    <md:EmailAddress>lahsen.bouzid@insa-strasbourg.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Simon SCHERRER</md:SurName>
-    <md:EmailAddress>simon.scherrer@insa-strasbourg.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/api.bridgemanimages.com-shibboleth.xml b/swamid-interfederations-2.0/api.bridgemanimages.com-shibboleth.xml
deleted file mode 100644
index a4445d11..00000000
--- a/swamid-interfederations-2.0/api.bridgemanimages.com-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://api.bridgemanimages.com/shibboleth">
-  <!--
-		This is a "Bridgeman Education" Shibboleth SP for The Bridgeman Art Library 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="2015-08-21T12:54:59Z">
-      <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://api.bridgemanimages.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://api.bridgemanimages.com/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://api.bridgemanimages.com/Shibboleth.sso/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://api.bridgemanimages.com/Shibboleth.sso/UKfederation" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDITCCAgmgAwIBAgIJAJ3czdb0R2hQMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-						BAMTHmFwaW5zdGFuY2UuYnJpZGdlbWFuaW1hZ2VzLmNvbTAeFw0xNTA4MTgxMzUw
-						MDlaFw0yNTA4MTUxMzUwMDlaMCkxJzAlBgNVBAMTHmFwaW5zdGFuY2UuYnJpZGdl
-						bWFuaW1hZ2VzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9b
-						IY7MjLpmntgBUMyLd+uXb6XPbhCx5db2LBGlzhmLRr5EowlHmK/94lb15rc8iWd1
-						g4GqY9eM+eV3iENVSsd2VRVzGgb4vQpS4nFYy0RxarhWtVA9WlgNooMXk5bUB645
-						TQbcSAaCkGyhLlqO8M6EUCwWqjflH5incXgId4fpE9h9FGmLBGROmGAeZMF2cJf3
-						sBlVM727CRepJIyRB3oY2TZ4DbH+KVdQrA8DjHzm3qhB9WaMk51PNXJKetTeaT+t
-						c26TDqy7Eq8dZqmOjgejlMPSvN0PgIKxFIte53anUqrESN/wB8v37K7XZlrRIufS
-						5nBd9FqTvJpiDE1FtWkCAwEAAaNMMEowKQYDVR0RBCIwIIIeYXBpbnN0YW5jZS5i
-						cmlkZ2VtYW5pbWFnZXMuY29tMB0GA1UdDgQWBBRKecH57s3sItz2dH60A33pLN3I
-						cTANBgkqhkiG9w0BAQUFAAOCAQEAcobfnWV/lrSG3feeD1XA2xtZfaXkaVwDrv6W
-						xlFJ7c351l2H13pAPiwHwinMJAf43R5dQBylq5HO4a70EEys4Dfa0s6dqiLZ+NaD
-						KHld2UQ6F7BATH8ydZx8JqDu0MSme8zJXytePRlZMwHpNW7sKP+zoxQ5b0ZwcrOm
-						tnSUiRRpBHEll0HprabEauXfgVtOE21ukKy9FklWY34Azhk/xiMw7i4GdQqgeY8o
-						f4a3t5SoUQdhtmJiegvPVyE8t2CvrOP0SCXIZ5XYFNu4cHjUzZVg2zmc5d2zTGRW
-						zN6H7og0AK1oMx+zi6VsV3liq768srmyafMOAuYPqXR48VXcHQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://api.bridgemanimages.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.bridgemanimages.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://api.bridgemanimages.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.bridgemanimages.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://api.bridgemanimages.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://api.bridgemanimages.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://api.bridgemanimages.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Bridgeman Art Library Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bridgeman Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bridgemaneducation.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kerstin</GivenName>
-    <SurName>Anschuetz</SurName>
-    <EmailAddress>mailto:kerstin.anschuetz@bridgemanimages.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sean</GivenName>
-    <SurName>Chambers</SurName>
-    <EmailAddress>mailto:sean.chambers@bridgemanimages.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.xml b/swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.xml
deleted file mode 100644
index eb154fc9..00000000
--- a/swamid-interfederations-2.0/api.credoreference.com-shibboleth-sp.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://api.credoreference.com/shibboleth-sp">
-  <!--
-		This is a "Production RESTful API" Shibboleth SP for Credo Reference 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-07-03T15:30:08Z"/>
-  </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://api.credoreference.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://api.credoreference.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="36" width="200">https://corp.credoreference.com/images/credo_horz_transparent_200w.gif</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">Credo Reference Production RESTful API</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Credo Reference Production RESTful API. Contact support@credoreference.com for details.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIJAOsnADaxwuwdMA0GCSqGSIb3DQEBBQUAMDMxMTAvBgNV
-						BAMTKGF3cy11cy1lYS1wcm9kLWRlbW8tMS5jcmVkb3JlZmVyZW5jZS5jb20wHhcN
-						MTQwNDEwMTYwNjQxWhcNMjQwNDA3MTYwNjQxWjAzMTEwLwYDVQQDEyhhd3MtdXMt
-						ZWEtcHJvZC1kZW1vLTEuY3JlZG9yZWZlcmVuY2UuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAybu7QT+tSyTzBm4XgUzTRH8fU2N7Iqve9z3pHFJK
-						kqxB7x8PG2Tsg5h8PTxkRHbHlvCeK41u72nhUhgD8AGrSwxhGvFJS6ML6m+HgjuC
-						OpoVYrgQFkH7ba7s48nv5iZjWm3PA8EPyhH6+71VdJvCArjPTVhJiBVCTVr4GlRQ
-						aZCFT4DEfgkFSRMm63hGUjvyLNtQeaF3lodVcfseZf5rKshh72T56LADwk2gc3gD
-						RTFELvHLRunml5ocj+hocCc4pahjaI7Wvxxfmq30/9oQSOW/sIAYjBrCCLANPo62
-						ZXwHnpdaq/IK85dIJIWJo97C2Q8OrPDjm60MIGerf/LN7wIDAQABo1YwVDAzBgNV
-						HREELDAqgihhd3MtdXMtZWEtcHJvZC1kZW1vLTEuY3JlZG9yZWZlcmVuY2UuY29t
-						MB0GA1UdDgQWBBSb0bm0aAM/mcTdCLP6Bd7fVhZEIDANBgkqhkiG9w0BAQUFAAOC
-						AQEAWIr7gg8AYViRX60K6x6nCgTfqsc8FEzZevBYgeOpljhxRVu4raHp1e+ycckk
-						JYPzuuJFA/RPHH37xOthxrXUhb6lbOR2bmqOudji/l8m0njEWvlfK1O9APKnzIFK
-						DXo6w1tE/EzL30F2sDKO3z9X2N2bRVfm7i4aBH2G8ksM5gEDiNLXFEBjll/cFgGj
-						sQiZqRpyrEiu1DNYWR7cekhJ76MQ9vRAg+sRi+4+YcJqecm3uSAvfdi06Z50neEI
-						x4if+VFo6Qgx/Kc4nRLASPV0BQMywJZJ8tzI0HmZ8kdgloMtSsEAik7xdZ2qhYUU
-						6PpbbkDoIuMrrMqEbFW6Rk+q/Q==
-					</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://api.credoreference.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://api.credoreference.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://api.credoreference.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.credoreference.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.credoreference.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.credoreference.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://api.credoreference.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.credoreference.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://api.credoreference.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://api.credoreference.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://api.credoreference.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Credo Reference Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Credo Reference Production RESTful API</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://corp.credoreference.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@credoreference.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@credoreference.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.xml b/swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.xml
deleted file mode 100644
index df37afad..00000000
--- a/swamid-interfederations-2.0/api.dev.credoreference.com-shibboleth-sp.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://api.dev.credoreference.com/shibboleth-sp">
-  <!--
-		This is a "Private DEV RESTful API" Shibboleth SP for Credo Reference 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-08-05T13:59:29Z"/>
-  </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://api.dev.credoreference.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://api.dev.credoreference.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Credo Reference Private DEV RESTful API</mdui:DisplayName>
-        <mdui:Logo height="36" width="200">https://corp.credoreference.com/images/credo_horz_transparent_200w.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIJAOsnADaxwuwdMA0GCSqGSIb3DQEBBQUAMDMxMTAvBgNV
-						BAMTKGF3cy11cy1lYS1wcm9kLWRlbW8tMS5jcmVkb3JlZmVyZW5jZS5jb20wHhcN
-						MTQwNDEwMTYwNjQxWhcNMjQwNDA3MTYwNjQxWjAzMTEwLwYDVQQDEyhhd3MtdXMt
-						ZWEtcHJvZC1kZW1vLTEuY3JlZG9yZWZlcmVuY2UuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAybu7QT+tSyTzBm4XgUzTRH8fU2N7Iqve9z3pHFJK
-						kqxB7x8PG2Tsg5h8PTxkRHbHlvCeK41u72nhUhgD8AGrSwxhGvFJS6ML6m+HgjuC
-						OpoVYrgQFkH7ba7s48nv5iZjWm3PA8EPyhH6+71VdJvCArjPTVhJiBVCTVr4GlRQ
-						aZCFT4DEfgkFSRMm63hGUjvyLNtQeaF3lodVcfseZf5rKshh72T56LADwk2gc3gD
-						RTFELvHLRunml5ocj+hocCc4pahjaI7Wvxxfmq30/9oQSOW/sIAYjBrCCLANPo62
-						ZXwHnpdaq/IK85dIJIWJo97C2Q8OrPDjm60MIGerf/LN7wIDAQABo1YwVDAzBgNV
-						HREELDAqgihhd3MtdXMtZWEtcHJvZC1kZW1vLTEuY3JlZG9yZWZlcmVuY2UuY29t
-						MB0GA1UdDgQWBBSb0bm0aAM/mcTdCLP6Bd7fVhZEIDANBgkqhkiG9w0BAQUFAAOC
-						AQEAWIr7gg8AYViRX60K6x6nCgTfqsc8FEzZevBYgeOpljhxRVu4raHp1e+ycckk
-						JYPzuuJFA/RPHH37xOthxrXUhb6lbOR2bmqOudji/l8m0njEWvlfK1O9APKnzIFK
-						DXo6w1tE/EzL30F2sDKO3z9X2N2bRVfm7i4aBH2G8ksM5gEDiNLXFEBjll/cFgGj
-						sQiZqRpyrEiu1DNYWR7cekhJ76MQ9vRAg+sRi+4+YcJqecm3uSAvfdi06Z50neEI
-						x4if+VFo6Qgx/Kc4nRLASPV0BQMywJZJ8tzI0HmZ8kdgloMtSsEAik7xdZ2qhYUU
-						6PpbbkDoIuMrrMqEbFW6Rk+q/Q==
-					</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://api.dev.credoreference.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://api.dev.credoreference.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://api.dev.credoreference.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.dev.credoreference.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.dev.credoreference.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.dev.credoreference.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://api.dev.credoreference.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.dev.credoreference.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://api.dev.credoreference.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://api.dev.credoreference.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://api.dev.credoreference.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Credo Reference Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Credo Reference Private DEV RESTful API</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://corp.credoreference.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@credoreference.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@credoreference.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.xml b/swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.xml
deleted file mode 100644
index bc9c90e4..00000000
--- a/swamid-interfederations-2.0/api.qa.credoreference.com-shibboleth-sp.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://api.qa.credoreference.com/shibboleth-sp">
-  <!--
-		This is a "Private QA RESTful API" Shibboleth SP for Credo Reference 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-08-07T14:52:35Z"/>
-  </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://api.qa.credoreference.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://api.qa.credoreference.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Credo Reference Private QA RESTful API</mdui:DisplayName>
-        <mdui:Logo height="36" width="200">https://corp.credoreference.com/images/credo_horz_transparent_200w.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIJAOsnADaxwuwdMA0GCSqGSIb3DQEBBQUAMDMxMTAvBgNV
-						BAMTKGF3cy11cy1lYS1wcm9kLWRlbW8tMS5jcmVkb3JlZmVyZW5jZS5jb20wHhcN
-						MTQwNDEwMTYwNjQxWhcNMjQwNDA3MTYwNjQxWjAzMTEwLwYDVQQDEyhhd3MtdXMt
-						ZWEtcHJvZC1kZW1vLTEuY3JlZG9yZWZlcmVuY2UuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAybu7QT+tSyTzBm4XgUzTRH8fU2N7Iqve9z3pHFJK
-						kqxB7x8PG2Tsg5h8PTxkRHbHlvCeK41u72nhUhgD8AGrSwxhGvFJS6ML6m+HgjuC
-						OpoVYrgQFkH7ba7s48nv5iZjWm3PA8EPyhH6+71VdJvCArjPTVhJiBVCTVr4GlRQ
-						aZCFT4DEfgkFSRMm63hGUjvyLNtQeaF3lodVcfseZf5rKshh72T56LADwk2gc3gD
-						RTFELvHLRunml5ocj+hocCc4pahjaI7Wvxxfmq30/9oQSOW/sIAYjBrCCLANPo62
-						ZXwHnpdaq/IK85dIJIWJo97C2Q8OrPDjm60MIGerf/LN7wIDAQABo1YwVDAzBgNV
-						HREELDAqgihhd3MtdXMtZWEtcHJvZC1kZW1vLTEuY3JlZG9yZWZlcmVuY2UuY29t
-						MB0GA1UdDgQWBBSb0bm0aAM/mcTdCLP6Bd7fVhZEIDANBgkqhkiG9w0BAQUFAAOC
-						AQEAWIr7gg8AYViRX60K6x6nCgTfqsc8FEzZevBYgeOpljhxRVu4raHp1e+ycckk
-						JYPzuuJFA/RPHH37xOthxrXUhb6lbOR2bmqOudji/l8m0njEWvlfK1O9APKnzIFK
-						DXo6w1tE/EzL30F2sDKO3z9X2N2bRVfm7i4aBH2G8ksM5gEDiNLXFEBjll/cFgGj
-						sQiZqRpyrEiu1DNYWR7cekhJ76MQ9vRAg+sRi+4+YcJqecm3uSAvfdi06Z50neEI
-						x4if+VFo6Qgx/Kc4nRLASPV0BQMywJZJ8tzI0HmZ8kdgloMtSsEAik7xdZ2qhYUU
-						6PpbbkDoIuMrrMqEbFW6Rk+q/Q==
-					</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://api.qa.credoreference.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://api.qa.credoreference.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://api.qa.credoreference.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.qa.credoreference.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.qa.credoreference.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://api.qa.credoreference.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://api.qa.credoreference.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://api.qa.credoreference.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://api.qa.credoreference.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://api.qa.credoreference.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://api.qa.credoreference.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Credo Reference Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Credo Reference Private QA RESTful API</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://corp.credoreference.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@credoreference.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@credoreference.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aplicacions.usc.es-sir-uscidp.xml b/swamid-interfederations-2.0/aplicacions.usc.es-sir-uscidp.xml
deleted file mode 100644
index 61895e7f..00000000
--- a/swamid-interfederations-2.0/aplicacions.usc.es-sir-uscidp.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="http://aplicacions.usc.es/sir/uscidp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2016-01-09T14:58:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md: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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">USC - Universidade de Santiago de Compostela</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">USC -Universidade de Santiago de Compostela</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider of Universidade de Santiago de Compostela</mdui:Description>
-        <mdui:Description xml:lang="es">El proveedor de identidad de la Universidade de Santiago de Compostela</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usc.es</shibmd:Scope>
-    </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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/usc/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/usc/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/usc/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/usc/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/usc/shib13/idp/aa.php"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">USC</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">USC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universidade de Santiago de Compostela</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">Universidade de Santiago de Compostela</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/app.goodpractice.net.xml b/swamid-interfederations-2.0/app.goodpractice.net.xml
deleted file mode 100644
index ff35ae28..00000000
--- a/swamid-interfederations-2.0/app.goodpractice.net.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://app.goodpractice.net">
-  <!--
-		This is a Custom SAML SP for Good Practice Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-11T10:58:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHDCCAgSgAwIBAgIJAPkZY/RifCMCMA0GCSqGSIb3DQEBCwUAMA8xDTALBgNV
-						BAMTBHRlc3QwHhcNMTQxMTEyMTEwMTM1WhcNMjQxMTA5MTEwMTM1WjAPMQ0wCwYD
-						VQQDEwR0ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwbnYcv3B
-						IHH5O1Nu9aOw7IgjsYrzTFGmx/R/Lgbyh03t34FkAQ9SZ4ToKHRI7wJuHN2SveV2
-						LBjZ8PgoM7Nzkryl2fpF6sytuqMhKFzdSEbHEXMn1GqKCQoQGno5jzZAtcyqxXrF
-						iK5WrwSuPbopgGzu9UyPfaxaqmYVN0BW50z3NlKEZoQsc8w5WR9r1GDLNTSG0Jqx
-						sCpzRktkdKAsjskRiqp0X/gFquBEwajyWqF08PGsfwW0iqISc+bCmD1IWGZCQLcy
-						7eanVD3w13oFNPmqmxZSIiNNSXP5Gb7jcBZ+xWORwnIGOTBeThIPEWOlO4Kr7dDC
-						2fm1YW1OiJwRPQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P
-						cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUwN4Ob3oWtiCr
-						FwqrickuFNGD/e8wHwYDVR0jBBgwFoAUwN4Ob3oWtiCrFwqrickuFNGD/e8wDQYJ
-						KoZIhvcNAQELBQADggEBAEOVm9crJjxi8CPsqJZEfV4ZnO4IlDyEFt3zNpKyamsC
-						01KFXkldoUhg1YNjLkpueysSyCpYrVe3BgkWdEccPO1GrGWYCYOgT3lf9LQ9hH5z
-						KTrkC+vftsNFv8YwWQgrncNscMPldbC6ig0khE2IC3mGJMKR8MgHLJWlNV3txgR5
-						Ri4pgGB+Ax6on6oQHks4I4EvDti7vtarY62Vuu8K6lJHltPkM6BjmQo2n0qJE9Hd
-						4Cp1NN51cLFIhjRA/gurU7ZUJMg84oaEpG+CVQn0ckKLb9JiKajXSh8HvjX5+COk
-						GvUxcf3q5ZXwJL6K+o0lrNadM/TN+8gZW441MEjl8Fc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </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>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.goodpractice.net/security/saml2/response" index="0" isDefault="true"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">GoodPractice Ltd</ServiceName>
-      <ServiceDescription xml:lang="en">GoodPractice provides relevant leadership and management programmes that improve performance and deliver measurable business change.</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"/>
-      <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="FirstName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="LastName" Name="urn:oid:2.5.4.4" 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="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">Good Practice Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GoodPractice Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.goodpractice.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Owen</GivenName>
-    <SurName>Ferguson</SurName>
-    <EmailAddress>mailto:oferguson@goodpractice.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonny</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:janderson@goodpractice.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/app.ords.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/app.ords.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index fb7204dc..00000000
--- a/swamid-interfederations-2.0/app.ords.ox.ac.uk-shibboleth.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://app.ords.ox.ac.uk/shibboleth">
-  <!--
-		This is an "ORDS" Shibboleth SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:07:07Z">
-      <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://app.ords.ox.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://app.ords.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIJAKkU7zta8ElbMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWFwcC5vcmRzLm94LmFjLnVrMB4XDTE0MDIyMDE2MTQxOFoXDTI0MDIxODE2
-						MTQxOFowHDEaMBgGA1UEAxMRYXBwLm9yZHMub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDDJ+JzjD6rjHcjcHKlnGrYgYMBQ6XWsexSpLsD
-						QHGM2ytN0W0N/66dpBdiQwkWT7NqQcYgppAujj9xkdthnJpdcIkZTvh+nQE/mo97
-						enuLw23CXn3Rf4Hf+q0Emyoxnx7VSTD30J236PpWHVFSIqO0+DlLf4KlnA7Tsx1B
-						W1c92c2aGKGStcVQbI7JXL4MS8txtBqdX0EBEzSMPBWITXlF7QvU4yIPJS4WVGGQ
-						w1jQpQMBS7WjSemb1CxDo4uMf5W91ZEPp/R4kqSINKaoYgwRoflkRBlPu7FhUee2
-						A7NZ1DylUDQHV05Xw81OWVexAWfcCE1qc2NDGIa//TNyabfzAgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEWFwcC5vcmRzLm94LmFjLnVrhiRodHRwczovL2FwcC5vcmRzLm94
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFFUctzCOP26SDJjvHgRJGCVCXthI
-						MA0GCSqGSIb3DQEBBQUAA4IBAQANWQ8NRS5C2+KUz3Kwb9+43AWUc9RFQdY62c35
-						cEomG8mBQhQdoNkVZ06g0uHXT94v/CUYYmcTY82HbQZ0ikJGiJODhWb9GVVFSTvS
-						HpS/NB9SqC2JwDsr9hGpdeSdK/cA14OtX+WUKZ0MlV3LuSJmH/tiGGZTpUU6YuAm
-						z0L3A3KcMl78xql30Fct61ciwZmyK5m7FpWFGu2qoPf9HkrSLSp03wstNdkBoFHK
-						HCU9m4vQ6uSSzCK0xlcYJ+WFq4mZb0gtRwzDCUtqYNWAFNggwKyYVgGZ4yV4b35Q
-						CTdb2siIqxI2D7KVX71agcKqUXJNnAdCZE5GKTBh1Lpccng7
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://app.ords.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford ORDS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/app.staging.goodpractice.net.xml b/swamid-interfederations-2.0/app.staging.goodpractice.net.xml
deleted file mode 100644
index ddf2fae9..00000000
--- a/swamid-interfederations-2.0/app.staging.goodpractice.net.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://app.staging.goodpractice.net">
-  <!--
-		This is a Custom SAML SP for Good Practice Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-13T11:18:16Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHDCCAgSgAwIBAgIJAPkZY/RifCMCMA0GCSqGSIb3DQEBCwUAMA8xDTALBgNV
-						BAMTBHRlc3QwHhcNMTQxMTEyMTEwMTM1WhcNMjQxMTA5MTEwMTM1WjAPMQ0wCwYD
-						VQQDEwR0ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwbnYcv3B
-						IHH5O1Nu9aOw7IgjsYrzTFGmx/R/Lgbyh03t34FkAQ9SZ4ToKHRI7wJuHN2SveV2
-						LBjZ8PgoM7Nzkryl2fpF6sytuqMhKFzdSEbHEXMn1GqKCQoQGno5jzZAtcyqxXrF
-						iK5WrwSuPbopgGzu9UyPfaxaqmYVN0BW50z3NlKEZoQsc8w5WR9r1GDLNTSG0Jqx
-						sCpzRktkdKAsjskRiqp0X/gFquBEwajyWqF08PGsfwW0iqISc+bCmD1IWGZCQLcy
-						7eanVD3w13oFNPmqmxZSIiNNSXP5Gb7jcBZ+xWORwnIGOTBeThIPEWOlO4Kr7dDC
-						2fm1YW1OiJwRPQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P
-						cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUwN4Ob3oWtiCr
-						FwqrickuFNGD/e8wHwYDVR0jBBgwFoAUwN4Ob3oWtiCrFwqrickuFNGD/e8wDQYJ
-						KoZIhvcNAQELBQADggEBAEOVm9crJjxi8CPsqJZEfV4ZnO4IlDyEFt3zNpKyamsC
-						01KFXkldoUhg1YNjLkpueysSyCpYrVe3BgkWdEccPO1GrGWYCYOgT3lf9LQ9hH5z
-						KTrkC+vftsNFv8YwWQgrncNscMPldbC6ig0khE2IC3mGJMKR8MgHLJWlNV3txgR5
-						Ri4pgGB+Ax6on6oQHks4I4EvDti7vtarY62Vuu8K6lJHltPkM6BjmQo2n0qJE9Hd
-						4Cp1NN51cLFIhjRA/gurU7ZUJMg84oaEpG+CVQn0ckKLb9JiKajXSh8HvjX5+COk
-						GvUxcf3q5ZXwJL6K+o0lrNadM/TN+8gZW441MEjl8Fc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </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>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.staging.goodpractice.net/security/saml2/response" index="0" isDefault="true"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">GoodPractice Ltd</ServiceName>
-      <ServiceDescription xml:lang="en">GoodPractice provides relevant leadership and management programmes that improve performance and deliver measurable business change.</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"/>
-      <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="FirstName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="LastName" Name="urn:oid:2.5.4.4" 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="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">Good Practice Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GoodPractice (Staging)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.goodpractice.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Owen</GivenName>
-    <SurName>Ferguson</SurName>
-    <EmailAddress>mailto:oferguson@goodpractice.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonny</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:janderson@goodpractice.com</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 bc136e3c..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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb-dev.marie.hellasgrid.gr/edugain-connect">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">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 width="120" height="128">https://appdb-dev.marie.hellasgrid.gr/images/appdblogo.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>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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 1546b87d..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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb-dev.marie.hellasgrid.gr/edugain-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">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 width="120" height="128">https://appdb-dev.marie.hellasgrid.gr/images/appdblogo.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>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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 24bcd4e5..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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb.egi.eu/edugain-connect">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">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 width="120" height="128">https://appdb.egi.eu/images/appdblogo.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>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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 ae09861e..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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb.egi.eu/edugain-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">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 width="120" height="128">https://appdb.egi.eu/images/appdblogo.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>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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 91361416..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://applications.eu-decide.eu/shibboleth">
-  <md: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>
-  </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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">DECIDE Science Gateway</md:ServiceName>
-      <md: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.
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6f2d52ba..00000000
--- a/swamid-interfederations-2.0/applications.eu-decide.eu.xml
+++ /dev/null
@@ -1,138 +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://applications.eu-decide.eu/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-21T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-      <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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eu-decide.eu/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://applications.eu-decide.eu/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
-        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
-        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
-        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
-        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
-        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
-        <ds:KeyName>www.chain-project.eu</ds:KeyName>
-        <ds:KeyName>www.special-project.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
-                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
-                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
-                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
-                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
-                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
-                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
-                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
-                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
-                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
-                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
-                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
-                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
-                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
-                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
-                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
-                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
-                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
-                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
-                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
-                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
-                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
-                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
-                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">DECIDE Science Gateway</md:ServiceName>
-      <md: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.
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">DECIDE Science Gateway provided by COMETA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">DECIDE Science Gateway erogato da COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 91f8bf1c..00000000
--- a/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml
+++ /dev/null
@@ -1,121 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://applications.eumedgrid.eu/shibboleth">
-  <md: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>
-  </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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">EUMEDGRID Science Gateway</md:ServiceName>
-      <md: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
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 fe86e058..00000000
--- a/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
+++ /dev/null
@@ -1,136 +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://applications.eumedgrid.eu/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-21T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-      <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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eumedgrid.eu/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://applications.eumedgrid.eu/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
-        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
-        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
-        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
-        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
-        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
-        <ds:KeyName>www.chain-project.eu</ds:KeyName>
-        <ds:KeyName>www.special-project.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
-                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
-                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
-                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
-                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
-                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
-                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
-                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
-                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
-                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
-                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
-                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
-                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
-                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
-                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
-                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
-                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
-                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
-                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
-                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
-                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
-                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
-                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
-                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">EUMEDGRID Science Gateway</md:ServiceName>
-      <md: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
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">EUMEDGRID Science Gateway provided by COMETA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">EUMEDGRID Science Gateway erogato da COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appraisal.qmul.ac.uk.xml b/swamid-interfederations-2.0/appraisal.qmul.ac.uk.xml
deleted file mode 100644
index 5cb8908b..00000000
--- a/swamid-interfederations-2.0/appraisal.qmul.ac.uk.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appraisal.qmul.ac.uk">
-  <!--
-		This is a "QMUL Appraisal" Shibboleth SP for Simitive Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-18T14:36:12Z">
-      <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://appraisal.qmul.ac.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://appraisal.qmul.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTjCCAjagAwIBAgIJALX9bGZHGFQXMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
-						BAMTI2hvc3QtOTUtMTU0LTI1NC0xMjcucnNjbGllbnRkbnMuY29tMB4XDTE0MDcz
-						MTA5NDIzNVoXDTI0MDcyODA5NDIzNVowLjEsMCoGA1UEAxMjaG9zdC05NS0xNTQt
-						MjU0LTEyNy5yc2NsaWVudGRucy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQCt/HdEunDhkbUtvNlMhBKoLN3JTSfu7CsglaNYyTM05F9kRUsq/LOf
-						E4Hh1JRx9bb7TLazS6YvD8ZU+sc2WF3xCVPYDp4oY8ANDJYfB53dhtT4lLpqFB/0
-						aTjMj1PNvGqYJOElZhkp0m4nrHjNATuA7eQB3iff6v/0xdJ7AcTSfmTQTOXYyma+
-						vQadTmxs9990Xml3HosGy1IXCbbO2ht4sg7/MxmbJblrha31wGURTWkE+WmVRwV6
-						nMaituJhyk2d1UYEAjzpiAgwlOBVdUVNrdhTiTW5rWKNnPsIaam/XOhAeQeRj2IF
-						9I10RB3OSTshOZuDEw4zseUrBcEtWejpAgMBAAGjbzBtMEwGA1UdEQRFMEOCI2hv
-						c3QtOTUtMTU0LTI1NC0xMjcucnNjbGllbnRkbnMuY29thhxodHRwczovL2FwcHJh
-						aXNhbC5xbXVsLmFjLnVrMB0GA1UdDgQWBBTH7kFVLALHzYDH4QoBrsLhOiiDGjAN
-						BgkqhkiG9w0BAQUFAAOCAQEAnkihlzTiIbxprbKw818zRBsRexB9pqUFYuRBSmAB
-						jTRFLn+VouYicmETvhyVI4BU69mFz3nLsHG5HtmCeDS45ZoZhY/hBY3HqXJ/jOGB
-						RsYQQdkC5vHCrRJrimsZMKOUY7HR8OZWsDbcmAXXoYSk3yMaBHI4BcZAXZa4KRX7
-						69wlCV41DWzh3yKaHEQ0+eLnbVj2/ECVHaz1JzA0l/eRtH4vlSJpQQy/PymODDCc
-						lrIU37xyczOKjgW1LpMwbl2aSND2BxalCKHxXiOIeLudwu9VPws/eN3UxeD1Nc2q
-						d4bJN7QJIBsfqLD3Dr3yXiTkMO9vJbZvRHKJRmR8eaYZCQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appraisal.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Simitive Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">QMUL Appraisal Simitive</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.simitive.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adrian</GivenName>
-    <SurName>Latham</SurName>
-    <EmailAddress>mailto:adrian.latham@simitive.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adrian</GivenName>
-    <SurName>Latham</SurName>
-    <EmailAddress>mailto:adrian.latham@simitive.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml b/swamid-interfederations-2.0/apps.cricksoft.com-shibboleth.xml
deleted file mode 100644
index 720737c2..00000000
--- a/swamid-interfederations-2.0/apps.cricksoft.com-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://apps.cricksoft.com/shibboleth">
-  <!--
-		This is a Shibboleth 2 SP for Crick Software Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIC9zCCAd+gAwIBAgIJANY32/xM/DNkMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHNwLmNyaWNrc29mdC5jb20wHhcNMTAxMDE0MTE1MDQ2WhcNMjAxMDExMTE1
-						MDQ2WjAbMRkwFwYDVQQDExBzcC5jcmlja3NvZnQuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAy4siLJ0xVcbDfbaFp/RWcva+0Yvrya3xakCBjK6h
-						c6hJ5l0iyoIZPXMNtHARMD1i8fmqJrNilD8AqX7izQcrBGTkLgtkVCOcepf1YdkM
-						3ZQZp+Wb2GIPXBpQWVNy62LPkHLL3LsX3SWiBP7kahZsazgXedgc+6anBnGQDho5
-						+od8Z+eeImTXw8JSQNpBa54T3UPFhnBE1h5hBVHZwdx3a57ejtf8oFymACHIFH+x
-						8soJDMlHyFPVu8GrhnxV4agrY36nxKZI5x0nS1tzXtEwzi4KmrWF78/XTbhBty7k
-						ocico+7Kj69Zazd0Px3L9ryHWevVF85sjX9SN4sQ4ccGnwIDAQABoz4wPDAbBgNV
-						HREEFDASghBzcC5jcmlja3NvZnQuY29tMB0GA1UdDgQWBBQ7Ph7OK0o3dQvZ+Xeg
-						jApzpz8CETANBgkqhkiG9w0BAQUFAAOCAQEAyAWqdVobl3x1fg7DZjOJGvKe8QVS
-						9tQBcYUIXROpPJmG27vAfeeaXMK2gGyD9ZlOuTmtHxeI+WRypyKJ1vovDZ1W90WD
-						Sin6sfJLyPC9WTgd/D2RbW4FiTkN01HaGupbWSVBzSsRZzqpUlB9eoM7pg5V/dMg
-						Zxyd/XYpfrX+tBEpSqioDxQPEZwcVkOKO4a4OsxtTg4UgOTDJT/lU6Pml/h5uxcM
-						NhU4jlCAvQmYRbbnW8dM7HwfZNdiDVCf9xcWAQd83B96KM2LcttZAxRFhxWyefC9
-						+vQzKLPAKu8sxHzuLbbYr0RUXeiQq/hIQIhwpxZRPlJUXB/bpcNvjMGfdg==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJANY32/xM/DNkMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHNwLmNyaWNrc29mdC5jb20wHhcNMTAxMDE0MTE1MDQ2WhcNMjAxMDExMTE1
-						MDQ2WjAbMRkwFwYDVQQDExBzcC5jcmlja3NvZnQuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAy4siLJ0xVcbDfbaFp/RWcva+0Yvrya3xakCBjK6h
-						c6hJ5l0iyoIZPXMNtHARMD1i8fmqJrNilD8AqX7izQcrBGTkLgtkVCOcepf1YdkM
-						3ZQZp+Wb2GIPXBpQWVNy62LPkHLL3LsX3SWiBP7kahZsazgXedgc+6anBnGQDho5
-						+od8Z+eeImTXw8JSQNpBa54T3UPFhnBE1h5hBVHZwdx3a57ejtf8oFymACHIFH+x
-						8soJDMlHyFPVu8GrhnxV4agrY36nxKZI5x0nS1tzXtEwzi4KmrWF78/XTbhBty7k
-						ocico+7Kj69Zazd0Px3L9ryHWevVF85sjX9SN4sQ4ccGnwIDAQABoz4wPDAbBgNV
-						HREEFDASghBzcC5jcmlja3NvZnQuY29tMB0GA1UdDgQWBBQ7Ph7OK0o3dQvZ+Xeg
-						jApzpz8CETANBgkqhkiG9w0BAQUFAAOCAQEAyAWqdVobl3x1fg7DZjOJGvKe8QVS
-						9tQBcYUIXROpPJmG27vAfeeaXMK2gGyD9ZlOuTmtHxeI+WRypyKJ1vovDZ1W90WD
-						Sin6sfJLyPC9WTgd/D2RbW4FiTkN01HaGupbWSVBzSsRZzqpUlB9eoM7pg5V/dMg
-						Zxyd/XYpfrX+tBEpSqioDxQPEZwcVkOKO4a4OsxtTg4UgOTDJT/lU6Pml/h5uxcM
-						NhU4jlCAvQmYRbbnW8dM7HwfZNdiDVCf9xcWAQd83B96KM2LcttZAxRFhxWyefC9
-						+vQzKLPAKu8sxHzuLbbYr0RUXeiQq/hIQIhwpxZRPlJUXB/bpcNvjMGfdg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.cricksoft.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.cricksoft.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apps.cricksoft.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.cricksoft.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.cricksoft.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apps.cricksoft.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apps.cricksoft.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.cricksoft.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.cricksoft.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://apps.cricksoft.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Crick Software Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Crick Software Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cricksoft.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Burt</SurName>
-    <EmailAddress>mailto:andrew.burt@cricksoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Burt</SurName>
-    <EmailAddress>mailto:andrew.burt@cricksoft.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/apsjournals.apsnet.org-shibboleth.xml b/swamid-interfederations-2.0/apsjournals.apsnet.org-shibboleth.xml
deleted file mode 100644
index 01b222e5..00000000
--- a/swamid-interfederations-2.0/apsjournals.apsnet.org-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://apsjournals.apsnet.org/shibboleth">
-  <!--
-		This is an OpenSAML "APS Journals" SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-10T09:43:56Z">
-      <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">APS Journals</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Journals of the American Phytopathological Society: peer-reviewed plant pathology research.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://apsjournals.apsnet.org</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIJAPMxik5IwhTYMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmFwc2pvdXJuYWxzLmFwc25ldC5vcmcwHhcNMTQwMzE0MDUwMzIxWhcNMTcw
-						MzEzMDUwMzIxWjAhMR8wHQYDVQQDExZhcHNqb3VybmFscy5hcHNuZXQub3JnMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv6765xUEkO0vtokjH5YLnD3k
-						e3G+tdRUh/gTBApO22zrGhIYqOTSumET6PwEg1TY+uIIWzIVCkw391DL+crp6ONR
-						TPNvE6Wp8T6JIaDfc0B1rkSNx5xr/sGvmuyK9QvDMKJkGIrOktNVBiLXLf16I4T7
-						tkJYyan/5Fo+tHaUBl+pLKPAOfKbEgOs+45GzSOdn5dUhiTVvTugHmJHoMaQd5BR
-						ZOxq7V3u7ZP7thysUZXZv9X2fUgYGmEq+V3pGGEqR7NoPAkC8LM4WbI/FL1UB0FJ
-						Be6fvVs9rxrr/8zEIXKeVbK+Sqg1RNN+OLAtQXj+ZlbV3wRdnB6XWpuhHiZsGQID
-						AQABo28wbTBMBgNVHREERTBDghZhcHNqb3VybmFscy5hcHNuZXQub3JnhilodHRw
-						czovL2Fwc2pvdXJuYWxzLmFwc25ldC5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						bdG8oktk3FKKJvDkAj1gqb/TCCMwDQYJKoZIhvcNAQEFBQADggEBAGeEHnaumwYv
-						+rnwVRSiRJb0UQ7gPm8dO4coe4EyVbitOi6w6HuC3UL8Wg7gmgoV9KJZW1G8uS7R
-						KJFsTG9pB6HbCbFyUrR4Pa5N3GDb/k11HKglWEdni/wTrAw6a+AvbrLsHht+TSbW
-						L3xjo9UZm9tJPqXaHGEmTXzT0L09e8m5j+1fNW1mPO65vJT/hU6uXLaM7NP7gT4l
-						Nlfwc+V+W88ZLfvz2M7vSSv65/VzG+wwjId9Oy1r9pFmw1RhcPB2vf7GKULQ3at9
-						JCBos80D7Jyvzja5hmeebo0we0fo3lIh3pabRZS9qTl0uoXANtuKmS6sQt9ggQ8o
-						xULX/Gv8Bk4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://apsjournals.apsnet.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apsjournals.apsnet.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://apsjournals.apsnet.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">APS Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.apsnet.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>SSO-Support</GivenName>
-    <SurName>SSO-Support</SurName>
-    <EmailAddress>mailto:SSO-Support@atypon.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SSO-Tech</GivenName>
-    <SurName>SSO-Tech</SurName>
-    <EmailAddress>mailto:SSO-Tech@atypon.com</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 ffcbb791..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://apu.uepb.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://apu.uepb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://apu.uepb.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://apu.uepb.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://apu.uepb.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://apu.uepb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://apu.uepb.edu.br:8443/idp/profile/SAML1/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">UEPB - Universidade Estadual da Paraiba</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UEPB - Universidade Estadual da Paraiba</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UEPB - Universidade Estadual da Paraiba</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uepb.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.uepb.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Gerencia de Redes</md:SurName>
-    <md:EmailAddress>gerencia@uepb.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 234a6f32..00000000
--- a/swamid-interfederations-2.0/apu.uepb.edu.br.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: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>
-    MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxDTALBgNVBAoTBFVFUEIxDDAK
-BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUZ2VyZW5jaWFAdWVwYi5lZHUuYnIx
-FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
-VQQGEwJCUjEYMBYGA1UEAxMPYXB1LnVlcGIuZWR1LmJyMB4XDTEyMDYwNTE4NTky
-MVoXDTE1MDYwNTE4NTkyMVowgZQxDTALBgNVBAoTBFVFUEIxDDAKBgNVBAsTA0NQ
-RDEjMCEGCSqGSIb3DQEJARYUZ2VyZW5jaWFAdWVwYi5lZHUuYnIxFzAVBgNVBAcT
-DkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYDVQQGEwJCUjEY
-MBYGA1UEAxMPYXB1LnVlcGIuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAv4+YORG1oKdLoBnRI2mk3b2lnsTU3G68NjDkkRKFcosWqcGM6rAw
-69LlJhbEo63MOE9Yq5P3oNeO3pJjkD58UoJhBRo0hTFPLK5p397mR1/y0wzkVFfe
-C1oyT0Pn3nG87JPZentvItTVaiUJNZcgGVW5ql3vOdZxW+hRJ+vPErsp3vB8W7hF
-Pfz/M3kUS8/E9s1Fhm1yzfeu2QKXd9Pddq2RM0YRn/CFE1jI3nfjOvhFl7KwlKsC
-KVJ05wz3L7qhgI4WmqfnKAWVBduPzMTNH1IMxwvk5hswyYLxt3sU6l5zRUptas4B
-X//4P1P+dxIG5d+f/PAqTaqd410RLOnz9wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAGxIK7GLgO1i0jPabgFJSQyyT9z0ywkhEcamfL2vWDePsXdOEAIuhofYC2l1aS
-TPQa840onc+reB0o5EOIs6z+H+6cuqdTagTKKxinKCcSi3rqEuzTQ8rw5OCKrnPw
-qjWaT2WZwjpWu+gH91YxxdNy0ARs4mWxtZQkKB93Y+eSiEgSy10q6WJ/gxW3d6+q
-D7dxwKRA2udp+L70g/MnLyVid/wZsEFmoXxs0Ij1bZn8FGh7RvQXA1b2FIOvlsau
-q2XHXcmyCjBv61UKRbhtZ145Vmvh1EVeFTZmfSSvzynmvCwng7NXxDELZ21AZxku
-CvJy0328d1Yogr7WxVkO5sQr
-            </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>
-      
-MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxDTALBgNVBAoTBFVFUEIxDDAK
-BgNVBAsTA0NQRDEjMCEGCSqGSIb3DQEJARYUZ2VyZW5jaWFAdWVwYi5lZHUuYnIx
-FzAVBgNVBAcTDkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYD
-VQQGEwJCUjEYMBYGA1UEAxMPYXB1LnVlcGIuZWR1LmJyMB4XDTEyMDYwNTE4NTky
-MVoXDTE1MDYwNTE4NTkyMVowgZQxDTALBgNVBAoTBFVFUEIxDDAKBgNVBAsTA0NQ
-RDEjMCEGCSqGSIb3DQEJARYUZ2VyZW5jaWFAdWVwYi5lZHUuYnIxFzAVBgNVBAcT
-DkNhbXBpbmEgR3JhbmRlMRAwDgYDVQQIEwdQYXJhaWJhMQswCQYDVQQGEwJCUjEY
-MBYGA1UEAxMPYXB1LnVlcGIuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAv4+YORG1oKdLoBnRI2mk3b2lnsTU3G68NjDkkRKFcosWqcGM6rAw
-69LlJhbEo63MOE9Yq5P3oNeO3pJjkD58UoJhBRo0hTFPLK5p397mR1/y0wzkVFfe
-C1oyT0Pn3nG87JPZentvItTVaiUJNZcgGVW5ql3vOdZxW+hRJ+vPErsp3vB8W7hF
-Pfz/M3kUS8/E9s1Fhm1yzfeu2QKXd9Pddq2RM0YRn/CFE1jI3nfjOvhFl7KwlKsC
-KVJ05wz3L7qhgI4WmqfnKAWVBduPzMTNH1IMxwvk5hswyYLxt3sU6l5zRUptas4B
-X//4P1P+dxIG5d+f/PAqTaqd410RLOnz9wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQAGxIK7GLgO1i0jPabgFJSQyyT9z0ywkhEcamfL2vWDePsXdOEAIuhofYC2l1aS
-TPQa840onc+reB0o5EOIs6z+H+6cuqdTagTKKxinKCcSi3rqEuzTQ8rw5OCKrnPw
-qjWaT2WZwjpWu+gH91YxxdNy0ARs4mWxtZQkKB93Y+eSiEgSy10q6WJ/gxW3d6+q
-D7dxwKRA2udp+L70g/MnLyVid/wZsEFmoXxs0Ij1bZn8FGh7RvQXA1b2FIOvlsau
-q2XHXcmyCjBv61UKRbhtZ145Vmvh1EVeFTZmfSSvzynmvCwng7NXxDELZ21AZxku
-CvJy0328d1Yogr7WxVkO5sQr
-
-                    
-            </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 52878fec..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://araripe.uece.br/idp/shibboleth">
-  <md: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>
-  </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">uece.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UECE - Universidade Estadual do Ceara</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UECE - Universidade Estadual do Ceara</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UECE - Universidade Estadual do Ceara</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UECE - Universidade Estadual 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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://araripe.uece.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://araripe.uece.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://araripe.uece.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://araripe.uece.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://araripe.uece.br/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">uece.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://araripe.uece.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://araripe.uece.br:8443/idp/profile/SAML1/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">UECE - Universidade Estadual do Ceara</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UECE - Universidade Estadual do Ceara</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UECE - Universidade Estadual do Ceara</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UECE - Universidade Estadual do Ceara</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uece.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.uece.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>DI Infra</md:SurName>
-    <md:EmailAddress>di.infra@uece.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e10d7cf3..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://arauto.fapesp.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://arauto.fapesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://arauto.fapesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://arauto.fapesp.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://arauto.fapesp.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://arauto.fapesp.br/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">fapesp.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://arauto.fapesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://arauto.fapesp.br:8443/idp/profile/SAML1/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">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">FAPESP - Fundacao de Amparo a pesquisa do estado de Sao Paulo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fapesp.br.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.fapesp.br.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Leandro Costa</md:SurName>
-    <md:EmailAddress>lcosta@fapesp.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index fcb55bda..00000000
--- a/swamid-interfederations-2.0/arch2moodle.conted.ox.ac.uk-shibboleth-sp.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://arch2moodle.conted.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is an "Archive for award bearing courses site" Shibboleth for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-11-14T17:08: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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEpjCCA46gAwIBAgIJALdGk/GDLkgoMA0GCSqGSIb3DQEBBQUAMIHTMQswCQYD
-						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
-						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
-						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSQwIgYDVQQDDBthcmNoMm1vb2Rs
-						ZS5jb250ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNv
-						bnRlZC5veC5hYy51azAeFw0xNDA1MTkxNTQ1MTFaFw0yNDA1MTYxNTQ1MTFaMIHT
-						MQswCQYDVQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94
-						Zm9yZDEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0Rl
-						cGFydG1lbnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSQwIgYDVQQDDBthcmNo
-						Mm1vb2RsZS5jb250ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5
-						bG9yQGNvbnRlZC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAL0OZbHXRsG9wrB70737KdlY8xdaDGvSedBTPKYXIf00B4xMLSXsYov19yTO
-						rcPLuVda0rNt85mTrC/M/VD9hlHgzALnJIsApqUprsDzoTS/vClWwNyqOKP4mDWF
-						Yqw2nUUekJKrdcHETNptAsmqFcevv/EVCBd6OCNZExNAVYwvZvSDKT92Y0Ou3Nvt
-						c4Lxndyq3LQTbXwuB69ctx0SZbHB6MOUD0dFdmH6g22jzuA59M1Gevc0cXXUvw+a
-						qGsUTtRN85Q5t0lCs9UvW+9N4nvAHkuR8wnn7/ate0VyPuHrbkSOEoCbVtafkx6c
-						/A2SfiYmP5g8aCFSoGHqu3iWhocCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FPXvl+z8qlRh81pc6/+0moo6Uz2NMB8GA1UdIwQYMBaAFPXvl+z8qlRh81pc6/+0
-						moo6Uz2NMA0GCSqGSIb3DQEBBQUAA4IBAQAph+BB117ucSrjA4bg1DjzeQYwMmgS
-						ndz5kQXqgTyafXs/3sSBNS9g9hKKadzntTLQdoSytzgcEDIhskzl9FkJQN6scq96
-						+LmZZjz9CIXyn3dBLOBpP2whuT4V8CetustNdbTMZE2xml0JCmeHL0uy87bQS37S
-						v9uevHXdxb1EoZxRZmue4mWPJYfEuT0xSLSLXxah60bgS/t3rBuRXVmOuicxHylM
-						Wr9ZuBF0R/9h9gbOS1vyTM9TCrZtA39HBCyDFCt6TH4KNiXX9B9a3cX3a8mADfZI
-						eouxo4D9OsCnCEJs7ZFa2Hbzcoxi+t2mOKR1BmE2YsOAIqyw4YnpARHv
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://arch2moodle.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://arch2moodle.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Archive for award bearing courses site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 7e238d15..00000000
--- a/swamid-interfederations-2.0/archive.conted.ox.ac.uk-shibboleth-sp.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://archive.conted.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Continuing Education Course Archive Site" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-09T07:27:49Z">
-      <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://archive.conted.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEnjCCA4agAwIBAgIJAKx7Kep4xsyPMA0GCSqGSIb3DQEBBQUAMIHPMQswCQYD
-						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
-						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
-						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSAwHgYDVQQDDBdhcmNoaXZlLmNv
-						bnRlZC5veC5hYy51azEqMCgGCSqGSIb3DQEJARYbbWlrZS50YXlsb3JAY29udGVk
-						Lm94LmFjLnVrMB4XDTE0MDUyMDA4MjE1OVoXDTI0MDUxNzA4MjE1OVowgc8xCzAJ
-						BgNVBAYTAlVLMRQwEgYDVQQIDAtPeGZvcmRzaGlyZTEPMA0GA1UEBwwGT3hmb3Jk
-						MR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9mIE94Zm9yZDEsMCoGA1UECwwjRGVwYXJ0
-						bWVudCBmb3IgQ29udGludWluZyBFZHVjYXRpb24xIDAeBgNVBAMMF2FyY2hpdmUu
-						Y29udGVkLm94LmFjLnVrMSowKAYJKoZIhvcNAQkBFhttaWtlLnRheWxvckBjb250
-						ZWQub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSF//x
-						5ANAQ3e+hcEjYI5af4H49YP+x9SncP2aIATyUuMaZMOEv3VGn2TSDV9+bdSTgxiR
-						2oeSbE3ARkPbLquxCkqDXmZ91A9MP5pvZLdlLdLgE8EjgCCakfqRer/D7cphHvsa
-						9mCIKV0trO3Iqr6ep6X3qiH5x8JZPDEwmV3pQtkvsJ+Th4ErztvJNNvfzksLf72y
-						pzgtZEb8xN/YFnVFU1cSl5L3Fb/ZIqSHVvrlJzXPHMtUaep4kVO7i/OBXOUf3yVH
-						twAKo5IE+SWB7FJEfdkdbnDDF8qffyULe2+0JIO89ErRYvJx1s1exd25UjD0mK6P
-						ZixKiZjWMHrzTZm/AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
-						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSmF6Yw+AaK
-						jeX+6wLqozFCa7GJqTAfBgNVHSMEGDAWgBSmF6Yw+AaKjeX+6wLqozFCa7GJqTAN
-						BgkqhkiG9w0BAQUFAAOCAQEAuyOKC3Vd4cHf2JniPcmYBnze4y4CAHBEbT5wdnhH
-						zxZ1xu/iyz841JYV3OQYm3mNKMtLK5Xy/dPHUJoIXNvx/eH5recFFJ/a8FfrevHG
-						onZAMv7uhaiCkwIE/2WKq2awNaX3YXpWSowF3OCX5rWSFMeuoc/3Kv2/VHdFn8ZN
-						QCW4Tt5oSPMwq8oHiUy7ohmMdmdUM648K8rZ4PK0Im5iKRU6KZn5tc+Ng/8KhTGE
-						mQX2NuTpy4/FEA/Ynn3BjFNHZ7oj8G0agQbpuKha8bSVDfjqLokvksSg0uep/5nS
-						dLALrhbv5RJI1uKUJ9RryT0WMZtTQzPPENtmUQXOgSDs3Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://archive.conted.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Continuing Education Course Archive Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@conted.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@conted.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml b/swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml
deleted file mode 100644
index e784f56c..00000000
--- a/swamid-interfederations-2.0/archive.guardian.co.uk-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://archive.guardian.co.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 SP for Guardian News & Media Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://archive.guardian.co.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://archive.guardian.co.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://archive.guardian.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDoDCCAogCCQD3vWcl7rNUgDANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEeMBwGA1UEChQV
-						R3VhcmRpYW4gTmV3cyAmIE1lZGlhMR4wHAYDVQQLExVHdWFyZGlhbiBQcm9mZXNz
-						aW9uYWwxHzAdBgNVBAMTFmFyY2hpdmUuZ3VhcmRpYW4uY28udWswHhcNMTEwMjAx
-						MDkyNjE0WhcNMjEwMTI5MDkyNjE0WjCBkTELMAkGA1UEBhMCR0IxEDAOBgNVBAgT
-						B0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEeMBwGA1UEChQVR3VhcmRpYW4gTmV3
-						cyAmIE1lZGlhMR4wHAYDVQQLExVHdWFyZGlhbiBQcm9mZXNzaW9uYWwxHzAdBgNV
-						BAMTFmFyY2hpdmUuZ3VhcmRpYW4uY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQClyvCzzPicg89DDrCTdwlSKxxhWkoDdDM/zvQplF33faQHBEX1
-						kX+NHiWm7bFsR1EgsZEXN5MShCkxSapGJ/KQNaqWCasBxOnlKPNmnSxg8DUf8Il/
-						Er6NDOm7w8mzyr6jKyLLBWSpRM79+aNqlp8mJnrEYEohwcmIjNX9yDhD9MMX4INh
-						npBKP3lHpUSEVcvF4l/CEaMHl37l2ipwqc2p9Yb3adKI3m5Mo1HwhIOX+FVMB3H8
-						s2wP8rBniNJLqzU61PCzgsj3yu8GuVyTHdy5MkzxsANiFZ5rM9x3MyMK81ddC+/h
-						6s/LPahVKDe8M/Dxpohi8T+245pBzAVmR7udAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggEBABK63U1h8B1I3AFeaCir1rQjgvTLqIAwDPSO5O60CoA1Dsa5STjdOQHlWfU6
-						6yk2RMDl79avgQ79dZuKYfOTRgWNFttTe6qXfC7V8iPL1S6ZI5UD/QXNfUFDYnPT
-						2rKjPWOQSvtcFRNIQQEggIJJARCJ+6wmrQdSFdEwTApo1vUMrvewglWoZtOZYZjZ
-						5PqI5ayLcMUj4gYwtt3aTdAa+EeE9upHEvvAVkx4TT9sZzzH6UIFuAOqAdVxoixY
-						TYacJZq5++ryJ0ljizbVDyflHYPrnZq/F7FrsTLG0zWvKK+WwOClHU5na5YZIBA4
-						nhD5qKnl7TBNTd30v5ddf1XcImY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.guardian.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.guardian.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.guardian.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://archive.guardian.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Guardian News &amp; Media Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Guardian and Observer digital archive</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://archive.guardian.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lucy</GivenName>
-    <SurName>Haire</SurName>
-    <EmailAddress>mailto:lucy.haire@guardian.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rupert</GivenName>
-    <SurName>Bates</SurName>
-    <EmailAddress>mailto:rupert.bates@guardian.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 7a6d8c67..00000000
--- a/swamid-interfederations-2.0/ark.biology.ox.ac.uk-shibboleth.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://ark.biology.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Departments of Zoology and of Plant Sciences ARK" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-05-03T11:24: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">
-    <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://ark.biology.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEcjCCA1qgAwIBAgIJALXvZ+na+8FZMA0GCSqGSIb3DQEBBQUAMIG5MQswCQYD
-						VQQGEwJnYjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxHjAcBgNVBAsTFURlcGFydG1l
-						bnQgb2YgWm9vbG9neTEdMBsGA1UEAxMUYXJrLmJpb2xvZ3kub3guYWMudWsxJTAj
-						BgkqhkiG9w0BCQEWFndlYm1hc3RlckB6b28ub3guYWMudWswHhcNMTMwNDMwMTgx
-						MzMxWhcNMjMwNDI4MTgxMzMxWjCBuTELMAkGA1UEBhMCZ2IxFDASBgNVBAgTC094
-						Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkg
-						b2YgT3hmb3JkMR4wHAYDVQQLExVEZXBhcnRtZW50IG9mIFpvb2xvZ3kxHTAbBgNV
-						BAMTFGFyay5iaW9sb2d5Lm94LmFjLnVrMSUwIwYJKoZIhvcNAQkBFhZ3ZWJtYXN0
-						ZXJAem9vLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						7Gcag+bauSUOc+oeeS1vWw5TRYdBHCUejlqzl0kLmG0e4Kz/KQNj5+BthkxQKLw6
-						Jmpf68Ws3nAcWIz7pDRgiHoBfkjkc5vMbyehtnnW+17JwAuZAbqXcKVyv48qNFJe
-						NLKJI2tJ8iJ4wlce96cw7ouBbC1jawNvxlonb9T0D7xn8+XMwRZKJ8Sgbt5cGJFQ
-						p1SmCrM6shou3sEcZhwBAPindHCQyyppaabkQlivY1Vka8WiNkxsWCoj5igtLsEb
-						VyejLlkDsfp5BYPRRaormViEPyybFKmDTopVkm+xDjLgnMSyK+COYeujtkewx95y
-						29SSoiexAONJV8hqaKGrBQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
-						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUModS
-						2TCZbpR0Xo3EGog6bIgUbvMwHwYDVR0jBBgwFoAUModS2TCZbpR0Xo3EGog6bIgU
-						bvMwDQYJKoZIhvcNAQEFBQADggEBAIucTNVYS1EKlXQKiFPO4oscBMSmq+LjwsDI
-						6EKsFCVY8wMnSWx3zU5skfoWjZw69xHFYVfTk+WKMOQ9qmMOFNItuw0wLqghN7w4
-						4gD+NdZAdadAudsPJiVF1cJPsQptU8xyPWSQc1lqJRFmxUo9lKj8Vq9zABM7373M
-						M8WeaMj+H+9A0U2dRGEzyJUyRRP1ogYQqc+jC/Qj9nnahqxKsrxu4rnc1Z3d2RMO
-						qumcP0hPqD+mCOlr9DnJyLsPYcPK8M964rOfemmeqtBExT9kgX1N5shs/P1c5+Lt
-						OHEYDdIFb2iPO4iL4JwvF4kJLIG6C2xz6ABtgHSgR7SANWZMqOU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://ark.biology.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ark.biology.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Departments of Zoology and of Plant Sciences ARK</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.biology.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Department of Zoology IT Office</GivenName>
-    <EmailAddress>mailto:support@zoo.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Department of Zoology IT Office</GivenName>
-    <EmailAddress>mailto:support@zoo.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/arts.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/arts.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index b0e67a05..00000000
--- a/swamid-interfederations-2.0/arts.idm.oclc.org-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://arts.idm.oclc.org/shibboleth">
-  <!--
-		This is a "University of the Arts, London hosted" EZproxy SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-30T17:57: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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID6zCCAtOgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBcMRwwGgYDVQQDFBMqLmFy
-						dHMuaWRtLm9jbGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEgMB4G
-						CSqGSIb3DQEJARYRYWtraW5lbnZAb2NsYy5vcmcwHhcNMTQwNTA4MjA1NjIwWhcN
-						MjQwNTA3MjA1NjIwWjBcMRwwGgYDVQQDFBMqLmFydHMuaWRtLm9jbGMub3JnMQsw
-						CQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEgMB4GCSqGSIb3DQEJARYRYWtraW5l
-						bnZAb2NsYy5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxhYmM
-						PDckQ2CMHBBJrHdBjDAsWnPgCA6g86v7Qizdq5ujo7zQEpmP83jQYVAo93g4dxT0
-						v0KH7uvfZ3eHJtLAjFBY4BCKCfWQ9b2zINAd4V/Aay0e99e3+cGd/XKi4/sf+mh6
-						QrHErw5TFGLKfassMrFWSyhxzH7pWL+DW6fDV1fdjH0LhbyrZF0UNeLTc/4+Y2e+
-						r1hV+BS2NUGSEXZPfWDR3/+1J5VgBLrEV1QyqMJtJIB3M9TIJGLnVyX8oIjN1MTP
-						hl8418xabyz8S+vkwCDhDfPWNQ+czGkPHNs0920wh+MpUKwyoH5VDidDTHCTEcDY
-						cetXuGrggUZ/iJoZAgMBAAGjgbcwgbQwHQYDVR0OBBYEFBuFHyLKMAenvRmdB0Zy
-						mLXvygvgMIGEBgNVHSMEfTB7gBQbhR8iyjAHp70ZnQdGcpi178oL4KFgpF4wXDEc
-						MBoGA1UEAxQTKi5hcnRzLmlkbS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNV
-						BAoTBE9DTEMxIDAeBgkqhkiG9w0BCQEWEWFra2luZW52QG9jbGMub3JnggEDMAwG
-						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAD6KWro7Cu4sxiXwRawL2LGf
-						bArwdzRjO61AlIXg+8XOvYq1BBxjqsP5r1aLlj9y/vAZGSPQQfLpz/omoU3vIu0o
-						59wlCvcH84ZZOnYUCCmZVoQe9LfYGprh9Gl2aESEwdxwilDjrqfuKMPgBD0DBQxc
-						vQQLWqSYZy3vAh6p+2Ul2rh0/Ue2sOjaUqAfrLhE7m+j7lxbBg70x45ckgW4gQBK
-						UVS0Rdy9MIWHbFmfvEjVZnirY746qWAGoSy1xn0H8V141ELqW9oe+Sjvc08HgzQ0
-						1VqrWlvm0Q4K50yGzWMyoFLb/QJfj0sbC0Sb/9w7LlHUj9b//QQ6qeEL4j1Qkdw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.arts.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.arts.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.arts.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.arts.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of the Arts, London hosted EZproxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Vasu</GivenName>
-    <SurName>Akkineni</SurName>
-    <EmailAddress>mailto:ezproxy@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Vasu</GivenName>
-    <SurName>Akkineni</SurName>
-    <EmailAddress>mailto:ezproxy@oclc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/as1.jesus.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 375022e3..00000000
--- a/swamid-interfederations-2.0/as1.jesus.ox.ac.uk-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://as1.jesus.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Jesus College meal booking" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-09-22T13:48:33Z">
-      <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://as1.jesus.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAP1oldxO3zymMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEmFzMS5qZXN1cy5veC5hYy51azAeFw0xNDA5MTExMDEzMTBaFw0yNDA5MDgx
-						MDEzMTBaMB0xGzAZBgNVBAMTEmFzMS5qZXN1cy5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAKZcXku3Zc8SySbCvMeljZQV5jypnNoVsKr+
-						xJ2aftBX3yEBy+EplJeb8c2zZy6wzDbYqmO44GgKtNnApNl3EACPvLIcs5STrd8E
-						/gpSMctx0yhFlt1bNlKXlN7oIlgLIkHxCq+HYOEOtl6jo1iWs+yomqyyDzy6rkBB
-						pmcsQOG6k8e+PV6n51gdrjzC2eMYQYx5cVC6BNTPZRQMyROMu8w6j30K9cRnFrLc
-						3zOl2BN/52qmYnjqhuKwHfGiCGa4bJXZTKOyq7vCiy9hPhjE6RAgZ/ou3oifvLfc
-						p4LPVKG9jfyYNS2Ujz4AFBZB3CogOqeKXHwlaG6FV/vVufhos9cCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISYXMxLmplc3VzLm94LmFjLnVrMB0GA1UdDgQWBBQIR4e76w+e
-						4xVKYSKirFqZw3OcTDANBgkqhkiG9w0BAQUFAAOCAQEAmaYiU1kGOEi6Kx5l9mWe
-						FIsUCQM5QUHu2Yzy5Jo0+Jlom41XOR5vWjrly8bcG/3ztQQ/0gahSFIaXuym2b9o
-						/LPSsHklOjB9oHPudlzBkkn1LSiAXE6kjaLEIZg+sTgTyVoo0ZmVa7NsBSF0LTe6
-						lWlhmg+eMMKF/RyzZRrS8pGv2HeRSsGXcpUKEZi3ltZkJahMrYGKGl2PgAdIk8Nw
-						JP2zMRijGCQPMTx3qNW2kPr6vJyU6FLjsvh4Pe7Iqy3f/I24hLv56yjq2/WnZcRT
-						05XT9RmfWaVoCNvoFqa9gTOmvVqt1dz4HU5QDuxnZ6sxlhc8z15p794mPat3aPmo
-						HQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://as1.jesus.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://as1.jesus.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Jesus College meal booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jesus.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Gerard</GivenName>
-    <SurName>Fegan</SurName>
-    <EmailAddress>mailto:computing.officer@jesus.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Melson</SurName>
-    <EmailAddress>mailto:it.manager@jesus.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ashiok.ufpe.br-idp-shibboleth.xml b/swamid-interfederations-2.0/ashiok.ufpe.br-idp-shibboleth.xml
deleted file mode 100644
index c87a05ea..00000000
--- a/swamid-interfederations-2.0/ashiok.ufpe.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +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://ashiok.ufpe.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEKjCCAxICAQAwDQYJKoZIhvcNAQEFBQAwgdoxMTAvBgNVBAoTKFVGUEUgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBQZXJubWJ1Y28xNTAzBgNVBAsULE5USSAt
-IE7DumNsZW8gZGUgVGVjb25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSIwIAYJKoZI
-hvcNAQkBFhNhbG1pci5waXJlc0B1ZnBlLmJyMQ8wDQYDVQQHEwZSZWNpZmUxEzAR
-BgNVBAgTClBlcm5hbWJ1Y28xCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5hc2hpb2su
-dWZwZS5icjAeFw0xNTA3MDgxNTE3MDBaFw0xODA3MDcxNTE3MDBaMIHaMTEwLwYD
-VQQKEyhVRlBFIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgUGVybm1idWNvMTUw
-MwYDVQQLFCxOVEkgLSBOw7pjbGVvIGRlIFRlY29ub2xvZ2lhIGRhIEluZm9ybWHD
-p8OjbzEiMCAGCSqGSIb3DQEJARYTYWxtaXIucGlyZXNAdWZwZS5icjEPMA0GA1UE
-BxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEXMBUG
-A1UEAxMOYXNoaW9rLnVmcGUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCpJtnXex0EfajEm2mxs7SbI095tfMKoBYKm+oX2Rh0LG9Dqv2tkz8zlrGz
-65MX7J0T83f2XXCtwn8+QeFWIPjZeCrhXqiV+cd/8zT48mat8jjvlPXQUBT9l7CF
-ui7Ck3nKgAuyRmLZS0VRWa5Fe7jQVenb0ukfWjlkqA0HA3aG76d/5/Re/JHCuhoX
-J/B8Hk3r4RnUqAR5v9p+wvVlIfuMgZ2PoMpOEFnLRST/IAYYu6sfNF+/OGYnNOVt
-HaodpJiODntW7N58a7LUvmMDQcuZNk/gEFFa7lpc1lUxZ21/xjzt8hoM5JaKalRp
-WvoGp7ebIAjU5XAAB9D617WrhRaHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAB7u
-ICGu5gqybOHxpZOVMhL7Vc5ZkHKk07gFzlMeDcrm4FEi9NSC+ACSZOw4Y65hzlML
-3Mqvwa27U2Uf9+g8cXKvmjEImZTX+1DpWcgfslS6ZZlXPX751+c+0G5HCMvHQotT
-eouE1EENazDBi7+JHPH0dVX5EQwo/TghbjWwZn0XauScEQQSfcb5ncHWV62IlpjP
-HRjJA1oHM/BcHqi1Gld3QuKZ6Mz0AWAjsXlbwvcOUNjtPdgghHZzL/2PZQwErMw3
-3p9yrXX8gzzfzibmLwq3vu7eqXmz40Q1GyzzFVBcHdOTYRKON7g0Gj7rYzPVzw6m
-gJlqm/h9oLN/JBPHKNI=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ashiok.ufpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ashiok.ufpe.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://ashiok.ufpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ashiok.ufpe.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ashiok.ufpe.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ashiok.ufpe.br/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">ufpe.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEKjCCAxICAQAwDQYJKoZIhvcNAQEFBQAwgdoxMTAvBgNVBAoTKFVGUEUgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBQZXJubWJ1Y28xNTAzBgNVBAsULE5USSAt
-IE7DumNsZW8gZGUgVGVjb25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMSIwIAYJKoZI
-hvcNAQkBFhNhbG1pci5waXJlc0B1ZnBlLmJyMQ8wDQYDVQQHEwZSZWNpZmUxEzAR
-BgNVBAgTClBlcm5hbWJ1Y28xCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5hc2hpb2su
-dWZwZS5icjAeFw0xNTA3MDgxNTE3MDBaFw0xODA3MDcxNTE3MDBaMIHaMTEwLwYD
-VQQKEyhVRlBFIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgUGVybm1idWNvMTUw
-MwYDVQQLFCxOVEkgLSBOw7pjbGVvIGRlIFRlY29ub2xvZ2lhIGRhIEluZm9ybWHD
-p8OjbzEiMCAGCSqGSIb3DQEJARYTYWxtaXIucGlyZXNAdWZwZS5icjEPMA0GA1UE
-BxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQGEwJCUjEXMBUG
-A1UEAxMOYXNoaW9rLnVmcGUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCpJtnXex0EfajEm2mxs7SbI095tfMKoBYKm+oX2Rh0LG9Dqv2tkz8zlrGz
-65MX7J0T83f2XXCtwn8+QeFWIPjZeCrhXqiV+cd/8zT48mat8jjvlPXQUBT9l7CF
-ui7Ck3nKgAuyRmLZS0VRWa5Fe7jQVenb0ukfWjlkqA0HA3aG76d/5/Re/JHCuhoX
-J/B8Hk3r4RnUqAR5v9p+wvVlIfuMgZ2PoMpOEFnLRST/IAYYu6sfNF+/OGYnNOVt
-HaodpJiODntW7N58a7LUvmMDQcuZNk/gEFFa7lpc1lUxZ21/xjzt8hoM5JaKalRp
-WvoGp7ebIAjU5XAAB9D617WrhRaHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAB7u
-ICGu5gqybOHxpZOVMhL7Vc5ZkHKk07gFzlMeDcrm4FEi9NSC+ACSZOw4Y65hzlML
-3Mqvwa27U2Uf9+g8cXKvmjEImZTX+1DpWcgfslS6ZZlXPX751+c+0G5HCMvHQotT
-eouE1EENazDBi7+JHPH0dVX5EQwo/TghbjWwZn0XauScEQQSfcb5ncHWV62IlpjP
-HRjJA1oHM/BcHqi1Gld3QuKZ6Mz0AWAjsXlbwvcOUNjtPdgghHZzL/2PZQwErMw3
-3p9yrXX8gzzfzibmLwq3vu7eqXmz40Q1GyzzFVBcHdOTYRKON7g0Gj7rYzPVzw6m
-gJlqm/h9oLN/JBPHKNI=
-                          
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ashiok.ufpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ashiok.ufpe.br:8443/idp/profile/SAML1/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">UFPE - Universidade Federal de Pernambuco</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFPE - Universidade Federal de Pernambuco</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufpe.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufpe.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Fabio Chicout</md:SurName>
-    <md:EmailAddress>fabio.chicout@ufpe.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/astonsu-voting.org-shibboleth.xml b/swamid-interfederations-2.0/astonsu-voting.org-shibboleth.xml
deleted file mode 100644
index 66e4f9db..00000000
--- a/swamid-interfederations-2.0/astonsu-voting.org-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://astonsu-voting.org/shibboleth">
-  <!--
-		This is an "Aston SU Voting" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-10T10:45:09Z">
-      <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://astonsu-voting.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://astonsu-voting.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://astonsu-voting.org/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://astonsu-voting.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://astonsu-voting.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://astonsu-voting.org/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://astonsu-voting.org/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://astonsu-voting.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://astonsu-voting.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://astonsu-voting.org/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://astonsu-voting.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://astonsu-voting.org/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://astonsu-voting.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://astonsu-voting.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://astonsu-voting.org/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://astonsu-voting.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aston SU Voting</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://astonsu-voting.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.bruford.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.bruford.ac.uk-oala-metadata.xml
deleted file mode 100644
index fa42cf1e..00000000
--- a/swamid-interfederations-2.0/athens.bruford.ac.uk-oala-metadata.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://athens.bruford.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP belonging to Rose Bruford College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">bruford.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rose Bruford College (Athens LA)</mdui:DisplayName>
-        <mdui:Logo height="60" width="60">https://portal.bruford.ac.uk/rbc_60x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://portal.bruford.ac.uk/rbc_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDoDCCAoigAwIBAgIJAIDJCuAZQOZXMA0GCSqGSIb3DQEBBQUAMD4xHTAbBgNV
-						BAoTFFJvc2UgQnJ1Zm9yZCBDb2xsZWdlMR0wGwYDVQQDExRhdGhlbnMuYnJ1Zm9y
-						ZC5hYy51azAeFw0xMTA5MjIxNzA2MTJaFw0yMTA5MTkxNzA2MTJaMD4xHTAbBgNV
-						BAoTFFJvc2UgQnJ1Zm9yZCBDb2xsZWdlMR0wGwYDVQQDExRhdGhlbnMuYnJ1Zm9y
-						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMol/apZOolw
-						gLqjxKayFRsnsSRFqMVmJxLdF9ATD/tm90corctZskNCt+MvfiPN98J/he37mOUt
-						SuHxeGIyJgSDI+jj3/VVkIjJ+UMxnCTwhCMKnpio8ZEMKuBxbxkldCIg1M//ZOUc
-						geG/L1fTVUUAJZcVBTCOyRJ+S4UP6tnSlGp8nO1caceXR66pPlT+ziIKST3M1eRH
-						dEpChP9repElvXsqcUST2FExVNGxaD/QUAnCHHY0QhmQ0abKwex8fU/np+ufIWZ5
-						a8t4jbFoFJDB0VupAQfTPIs/ZPfYmVzk/vH4EBsXNfU39wtcnRTj9Xfkq/jq0QDH
-						u0LgIpxuRdECAwEAAaOBoDCBnTAdBgNVHQ4EFgQUz9x2Vi5uTDixbL7zYpiTVSry
-						9EowbgYDVR0jBGcwZYAUz9x2Vi5uTDixbL7zYpiTVSry9EqhQqRAMD4xHTAbBgNV
-						BAoTFFJvc2UgQnJ1Zm9yZCBDb2xsZWdlMR0wGwYDVQQDExRhdGhlbnMuYnJ1Zm9y
-						ZC5hYy51a4IJAIDJCuAZQOZXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAK5mVgWfbhwy9qJ/qT0bVTemdAjkXQU1uEEmfJc+cLMJtBtMV8nSE0s9cf1Q
-						msT/W7VCMWQp5IOoYO+xDDj/EMVmJNxHEG/DMn0iOUzdatNXgtfXbMjB0sChgTcH
-						zqeg/kXgYSzQND40RRSB199nhy67qdtIF+aPJciCZ98u/xdPSL6kSPP7aPPLb1Wu
-						+C6sZ+kdkNWDGLKgxanWSM2HDVta5MSm0n4Iy9kvlktFUcjiauWxV9MR3G0/bg+K
-						/pqLuisfI0ssY3bi/CuLKBRAw8tabT34gYFnHPHxA7Cr9BBE1fUB/fA6q1utWatY
-						tPNj67Bibl7d1TeU5BxZmOxrQKU=
-					</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>
-						MIIDoDCCAoigAwIBAgIJAIDJCuAZQOZXMA0GCSqGSIb3DQEBBQUAMD4xHTAbBgNV
-						BAoTFFJvc2UgQnJ1Zm9yZCBDb2xsZWdlMR0wGwYDVQQDExRhdGhlbnMuYnJ1Zm9y
-						ZC5hYy51azAeFw0xMTA5MjIxNzA2MTJaFw0yMTA5MTkxNzA2MTJaMD4xHTAbBgNV
-						BAoTFFJvc2UgQnJ1Zm9yZCBDb2xsZWdlMR0wGwYDVQQDExRhdGhlbnMuYnJ1Zm9y
-						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMol/apZOolw
-						gLqjxKayFRsnsSRFqMVmJxLdF9ATD/tm90corctZskNCt+MvfiPN98J/he37mOUt
-						SuHxeGIyJgSDI+jj3/VVkIjJ+UMxnCTwhCMKnpio8ZEMKuBxbxkldCIg1M//ZOUc
-						geG/L1fTVUUAJZcVBTCOyRJ+S4UP6tnSlGp8nO1caceXR66pPlT+ziIKST3M1eRH
-						dEpChP9repElvXsqcUST2FExVNGxaD/QUAnCHHY0QhmQ0abKwex8fU/np+ufIWZ5
-						a8t4jbFoFJDB0VupAQfTPIs/ZPfYmVzk/vH4EBsXNfU39wtcnRTj9Xfkq/jq0QDH
-						u0LgIpxuRdECAwEAAaOBoDCBnTAdBgNVHQ4EFgQUz9x2Vi5uTDixbL7zYpiTVSry
-						9EowbgYDVR0jBGcwZYAUz9x2Vi5uTDixbL7zYpiTVSry9EqhQqRAMD4xHTAbBgNV
-						BAoTFFJvc2UgQnJ1Zm9yZCBDb2xsZWdlMR0wGwYDVQQDExRhdGhlbnMuYnJ1Zm9y
-						ZC5hYy51a4IJAIDJCuAZQOZXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAK5mVgWfbhwy9qJ/qT0bVTemdAjkXQU1uEEmfJc+cLMJtBtMV8nSE0s9cf1Q
-						msT/W7VCMWQp5IOoYO+xDDj/EMVmJNxHEG/DMn0iOUzdatNXgtfXbMjB0sChgTcH
-						zqeg/kXgYSzQND40RRSB199nhy67qdtIF+aPJciCZ98u/xdPSL6kSPP7aPPLb1Wu
-						+C6sZ+kdkNWDGLKgxanWSM2HDVta5MSm0n4Iy9kvlktFUcjiauWxV9MR3G0/bg+K
-						/pqLuisfI0ssY3bi/CuLKBRAw8tabT34gYFnHPHxA7Cr9BBE1fUB/fA6q1utWatY
-						tPNj67Bibl7d1TeU5BxZmOxrQKU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.bruford.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.bruford.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Rose Bruford College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Rose Bruford College (Athens LA)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bruford.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Zoe</GivenName>
-    <SurName>Ellis</SurName>
-    <EmailAddress>mailto:Zoe.Ellis@bruford.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Marc</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:marc.wilson@bruford.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.gcc.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.gcc.ac.uk-oala-metadata.xml
deleted file mode 100644
index 5478709f..00000000
--- a/swamid-interfederations-2.0/athens.gcc.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athens.gcc.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Greenwich Community College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-28T11:32:51Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">gcc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjygAwIBAgIIZDkGkl9vMnswDQYJKoZIhvcNAQEFBQAwQTEkMCIGA1UE
-						CgwbR3JlZW53aWNoIENvbW11bml0eSBDb2xsZWdlMRkwFwYDVQQDDBBhdGhlbnMu
-						Z2NjLmFjLnVrMB4XDTEyMDkyNjA5MTE1OFoXDTIyMDkyNjA5MTE1OFowQTEkMCIG
-						A1UECgwbR3JlZW53aWNoIENvbW11bml0eSBDb2xsZWdlMRkwFwYDVQQDDBBhdGhl
-						bnMuZ2NjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjizt
-						iasQN9XJEROq+jKdGAyMC/ZPA5WlWSiow8EtKCLgfVBteMtBQYfNdC46NimD/9R9
-						Zuz7J2rVyECCS1LJQ0DEBNMuoXjTURe8WcqzuwqtQmDNfxXR1KXl7oK7j9toSEfV
-						sjewKskG95BnUl/444TLhjdmFQITLRlouj95dTtisqlWaEkhEIcyY2A2tUPy6K03
-						2AJd6sAAeJtC3JY3dmrQmsKz0KKLXJPocr9gHffyssJLSCo0AeBWpryfNKBrefft
-						AS8/yEnULpnaoBvsyM/9Zbqhr3Fk0HDJ2/nImrQmd9qPVDy7JhZVaupXi/EGRleG
-						Kr0z1Eg5UHihgiGwMQIDAQABo1AwTjAdBgNVHQ4EFgQU/23/DDRDFN+xOV/RwtEC
-						jlykbJowHwYDVR0jBBgwFoAU/23/DDRDFN+xOV/RwtECjlykbJowDAYDVR0TBAUw
-						AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAiG3o2/x1+ylakkGBN0jlX/qur0bYrGZx
-						1PN45rIOKbtrXmg9DxZ1n4whmxkTbtaXrkTHoufaOy45HRwYC3uo3lb567BHGT28
-						RX6A4eoRSNtOdkhV+FG/N6nrXcRE6e0zrinevb9zaXc2W/BdHhckAoiy/p6O7mkC
-						kdNeb73Roa/dVMKAqhadpN5GOjB5C8zJslHi1xz00mr8R536+yXXGVFrvNrxVz1i
-						UUbYQ08xGTNbEu0lWUKMXvu/o1UGff7xbocTLduVR2b7m3Trx3aQqHs9uQDDieFE
-						oHLQY5r0sjjy+wGMUU1G3PVqM24A0ZUlAtJLg3tpc6KvlMWetkbJmA==
-					</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>
-						MIIDVDCCAjygAwIBAgIIZDkGkl9vMnswDQYJKoZIhvcNAQEFBQAwQTEkMCIGA1UE
-						CgwbR3JlZW53aWNoIENvbW11bml0eSBDb2xsZWdlMRkwFwYDVQQDDBBhdGhlbnMu
-						Z2NjLmFjLnVrMB4XDTEyMDkyNjA5MTE1OFoXDTIyMDkyNjA5MTE1OFowQTEkMCIG
-						A1UECgwbR3JlZW53aWNoIENvbW11bml0eSBDb2xsZWdlMRkwFwYDVQQDDBBhdGhl
-						bnMuZ2NjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjizt
-						iasQN9XJEROq+jKdGAyMC/ZPA5WlWSiow8EtKCLgfVBteMtBQYfNdC46NimD/9R9
-						Zuz7J2rVyECCS1LJQ0DEBNMuoXjTURe8WcqzuwqtQmDNfxXR1KXl7oK7j9toSEfV
-						sjewKskG95BnUl/444TLhjdmFQITLRlouj95dTtisqlWaEkhEIcyY2A2tUPy6K03
-						2AJd6sAAeJtC3JY3dmrQmsKz0KKLXJPocr9gHffyssJLSCo0AeBWpryfNKBrefft
-						AS8/yEnULpnaoBvsyM/9Zbqhr3Fk0HDJ2/nImrQmd9qPVDy7JhZVaupXi/EGRleG
-						Kr0z1Eg5UHihgiGwMQIDAQABo1AwTjAdBgNVHQ4EFgQU/23/DDRDFN+xOV/RwtEC
-						jlykbJowHwYDVR0jBBgwFoAU/23/DDRDFN+xOV/RwtECjlykbJowDAYDVR0TBAUw
-						AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAiG3o2/x1+ylakkGBN0jlX/qur0bYrGZx
-						1PN45rIOKbtrXmg9DxZ1n4whmxkTbtaXrkTHoufaOy45HRwYC3uo3lb567BHGT28
-						RX6A4eoRSNtOdkhV+FG/N6nrXcRE6e0zrinevb9zaXc2W/BdHhckAoiy/p6O7mkC
-						kdNeb73Roa/dVMKAqhadpN5GOjB5C8zJslHi1xz00mr8R536+yXXGVFrvNrxVz1i
-						UUbYQ08xGTNbEu0lWUKMXvu/o1UGff7xbocTLduVR2b7m3Trx3aQqHs9uQDDieFE
-						oHLQY5r0sjjy+wGMUU1G3PVqM24A0ZUlAtJLg3tpc6KvlMWetkbJmA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.gcc.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.gcc.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Greenwich Community College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Greenwich Community College OALA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gcc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Waller</SurName>
-    <EmailAddress>mailto:andyw@gcc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Flash</SurName>
-    <EmailAddress>mailto:andrewf@gcc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.londonexternal.ac.uk-OpenAthens.xml b/swamid-interfederations-2.0/athens.londonexternal.ac.uk-OpenAthens.xml
deleted file mode 100644
index 2201f937..00000000
--- a/swamid-interfederations-2.0/athens.londonexternal.ac.uk-OpenAthens.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://athens.londonexternal.ac.uk/OpenAthens">
-  <!--
-		This is an IdP (owned by Eduserv) for the University of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">londonexternal.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/londonexternal.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/londonexternal.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of London: External System (ATHENS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.londonexternal.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.petroc.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.petroc.ac.uk-oala-metadata.xml
deleted file mode 100644
index 80d23441..00000000
--- a/swamid-interfederations-2.0/athens.petroc.ac.uk-oala-metadata.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://athens.petroc.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Petroc College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">petroc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDczCCAlugAwIBAgIJAP49f9/KNkx3MA0GCSqGSIb3DQEBBQUAMC8xDzANBgNV
-						BAoTBlBFVFJPQzEcMBoGA1UEAxMTYXRoZW5zLnBldHJvYy5hYy51azAeFw0xMTEy
-						MTUwOTM4MzdaFw0yMTEyMTIwOTM4MzdaMC8xDzANBgNVBAoTBlBFVFJPQzEcMBoG
-						A1UEAxMTYXRoZW5zLnBldHJvYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAMhXweFC/U8mUhT+V2vJsH5ELaEs6xDfXD3ihHvvl1AEQtDyRcs0
-						N2Zh9QvTgRPWSl569JtcHVQ1G3FIxcUophl5tzKAbI/gxwfkIS1hGSUwKc65pUhY
-						4R5HyO26gC9TuHUTXFXL80K+e3IxXoPwaJzabncOz2DGfhXiDZ6PU+ahr+d14YYA
-						QZ46a0FsaO2msccY+kr4sdV1O1hXHotooIyyK0131Lt52dcK7mZ7a0LUdEey2TEf
-						/zYSPRUMkcxSDzwRlY4FUYLN5wjF4x+bCDlTU3tZZi7+qKH5rmnvHwu63/UbXxhr
-						+Z4fBSe8Liyca4xRIxPg1mJtYUb/9JexfGsCAwEAAaOBkTCBjjAdBgNVHQ4EFgQU
-						RH/geX2D4EXsTNSy0YbMV9SpA/wwXwYDVR0jBFgwVoAURH/geX2D4EXsTNSy0YbM
-						V9SpA/yhM6QxMC8xDzANBgNVBAoTBlBFVFJPQzEcMBoGA1UEAxMTYXRoZW5zLnBl
-						dHJvYy5hYy51a4IJAP49f9/KNkx3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-						BQADggEBALE84Lanege19wQ+QI/SfH7mz1X86E+HwT+Yq1g8PvE/WG82p8DyHbNm
-						nKibsrJhHI8bIIvx4FFswl5jlrZf4cXIgTyl2ccesWkk3cCFuaydFUxDzODIWop/
-						i7lcvme96nRYyyRXkJ1hh0kp+w7cylnYrP9oilR9XBMj7PQ/9PkHofIq+3U9bM5S
-						V9AuL7fbjfXXHWdszx56GKEEwvAhOy9Hfq2/oyRTPKUHNtveFH7WehyMJ0O0FMiC
-						6fwieIKJwU2kPV2L8cbfOxRa7nuqXWfqUFMCkx/ptt5joISvGLJqwNlIDzz5zIcu
-						QI6O4PXRJe/bHRba/8ghVSi3FUEfb5g=
-					</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>
-						MIIDczCCAlugAwIBAgIJAP49f9/KNkx3MA0GCSqGSIb3DQEBBQUAMC8xDzANBgNV
-						BAoTBlBFVFJPQzEcMBoGA1UEAxMTYXRoZW5zLnBldHJvYy5hYy51azAeFw0xMTEy
-						MTUwOTM4MzdaFw0yMTEyMTIwOTM4MzdaMC8xDzANBgNVBAoTBlBFVFJPQzEcMBoG
-						A1UEAxMTYXRoZW5zLnBldHJvYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAMhXweFC/U8mUhT+V2vJsH5ELaEs6xDfXD3ihHvvl1AEQtDyRcs0
-						N2Zh9QvTgRPWSl569JtcHVQ1G3FIxcUophl5tzKAbI/gxwfkIS1hGSUwKc65pUhY
-						4R5HyO26gC9TuHUTXFXL80K+e3IxXoPwaJzabncOz2DGfhXiDZ6PU+ahr+d14YYA
-						QZ46a0FsaO2msccY+kr4sdV1O1hXHotooIyyK0131Lt52dcK7mZ7a0LUdEey2TEf
-						/zYSPRUMkcxSDzwRlY4FUYLN5wjF4x+bCDlTU3tZZi7+qKH5rmnvHwu63/UbXxhr
-						+Z4fBSe8Liyca4xRIxPg1mJtYUb/9JexfGsCAwEAAaOBkTCBjjAdBgNVHQ4EFgQU
-						RH/geX2D4EXsTNSy0YbMV9SpA/wwXwYDVR0jBFgwVoAURH/geX2D4EXsTNSy0YbM
-						V9SpA/yhM6QxMC8xDzANBgNVBAoTBlBFVFJPQzEcMBoGA1UEAxMTYXRoZW5zLnBl
-						dHJvYy5hYy51a4IJAP49f9/KNkx3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-						BQADggEBALE84Lanege19wQ+QI/SfH7mz1X86E+HwT+Yq1g8PvE/WG82p8DyHbNm
-						nKibsrJhHI8bIIvx4FFswl5jlrZf4cXIgTyl2ccesWkk3cCFuaydFUxDzODIWop/
-						i7lcvme96nRYyyRXkJ1hh0kp+w7cylnYrP9oilR9XBMj7PQ/9PkHofIq+3U9bM5S
-						V9AuL7fbjfXXHWdszx56GKEEwvAhOy9Hfq2/oyRTPKUHNtveFH7WehyMJ0O0FMiC
-						6fwieIKJwU2kPV2L8cbfOxRa7nuqXWfqUFMCkx/ptt5joISvGLJqwNlIDzz5zIcu
-						QI6O4PXRJe/bHRba/8ghVSi3FUEfb5g=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.petroc.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.petroc.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Petroc College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PETROC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.petroc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Phil</GivenName>
-    <SurName>McDonald</SurName>
-    <EmailAddress>mailto:library@petroc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Fox</SurName>
-    <EmailAddress>mailto:simon.fox@petroc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.regents.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.regents.ac.uk-oala-metadata.xml
deleted file mode 100644
index 6fbf269e..00000000
--- a/swamid-interfederations-2.0/athens.regents.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://athens.regents.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Regent's University London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-19T11:30:06Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">regents.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRjCCAi6gAwIBAgIIMniGNVlQlUIwDQYJKoZIhvcNAQEFBQAwOjEZMBcGA1UE
-						CgwQUmVnZW50J3MgQ29sbGVnZTEdMBsGA1UEAwwUYXRoZW5zLnJlZ2VudHMuYWMu
-						dWswHhcNMTMwNDE3MDgxNTUyWhcNMjMwNDE3MDgxNTUyWjA6MRkwFwYDVQQKDBBS
-						ZWdlbnQncyBDb2xsZWdlMR0wGwYDVQQDDBRhdGhlbnMucmVnZW50cy5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIcO/FyCTw0Cja2F6MS05uEU
-						69TSJQPIe/PXEYQSL0qXBZshoIGCNqzwUhjHpBtrNd81kH1wxpE6wNwrUwOYcXm6
-						Pp+sPrtn/nkgKbVCz49tLs3DdUCkG/tzi+/DyaT38Gb3d1PgsNk9cOP7VlI4RSuW
-						m8RspO3ljdin9sgPDY0TKchCV9lnoOf38Vyajp0XVlABCwSfmH1/fOX8X2DNaZM4
-						MVKHZR3c+5GWMaolLkhdGolrT4bfBuJl/mMiGRKJuvTlENxIA3cPAkpDUK9MV9EY
-						giqvDrp96h0HZJXXX+O3JA4UhqLKatHVEBi9Xxk/qW8JMKLtE84BOIK10N30jG8C
-						AwEAAaNQME4wHQYDVR0OBBYEFAqjFwiH6vZXqQ8dWU1ya0hfv0yJMB8GA1UdIwQY
-						MBaAFAqjFwiH6vZXqQ8dWU1ya0hfv0yJMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
-						AQEFBQADggEBADY6kYiT2mc5moWnARG3cVeA3gS+HC7OA9w5rCQeh+4D6bSbbJjk
-						/8H92X30kyuuF0YTUvbNWxDwypvIBUtF7oiu46IKzbraBtQGqmU9GfJGdO5tPZge
-						LtW57E9jqJxlCjrTPyAm6OTjr7uyH2EnalWp8vwLaAWKJx8VcdH1k4RqQghGrqCq
-						Wm1C9N067zarj1pwml9lK/9y03jcda6jJ+z/OJCYEXSndXHqv0ATvZ5p1Cv0pACj
-						FueeLMHXoR5SRN5pRBeb3/EY8CgYQUPdAyE+hqtWhwM8u/tNXh9utG44i07NOV7e
-						SK8Sj6QUzuD0wOEXzl9vRh9tn6Ww9P3ltBc=
-					</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>
-						MIIDRjCCAi6gAwIBAgIIMniGNVlQlUIwDQYJKoZIhvcNAQEFBQAwOjEZMBcGA1UE
-						CgwQUmVnZW50J3MgQ29sbGVnZTEdMBsGA1UEAwwUYXRoZW5zLnJlZ2VudHMuYWMu
-						dWswHhcNMTMwNDE3MDgxNTUyWhcNMjMwNDE3MDgxNTUyWjA6MRkwFwYDVQQKDBBS
-						ZWdlbnQncyBDb2xsZWdlMR0wGwYDVQQDDBRhdGhlbnMucmVnZW50cy5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIcO/FyCTw0Cja2F6MS05uEU
-						69TSJQPIe/PXEYQSL0qXBZshoIGCNqzwUhjHpBtrNd81kH1wxpE6wNwrUwOYcXm6
-						Pp+sPrtn/nkgKbVCz49tLs3DdUCkG/tzi+/DyaT38Gb3d1PgsNk9cOP7VlI4RSuW
-						m8RspO3ljdin9sgPDY0TKchCV9lnoOf38Vyajp0XVlABCwSfmH1/fOX8X2DNaZM4
-						MVKHZR3c+5GWMaolLkhdGolrT4bfBuJl/mMiGRKJuvTlENxIA3cPAkpDUK9MV9EY
-						giqvDrp96h0HZJXXX+O3JA4UhqLKatHVEBi9Xxk/qW8JMKLtE84BOIK10N30jG8C
-						AwEAAaNQME4wHQYDVR0OBBYEFAqjFwiH6vZXqQ8dWU1ya0hfv0yJMB8GA1UdIwQY
-						MBaAFAqjFwiH6vZXqQ8dWU1ya0hfv0yJMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
-						AQEFBQADggEBADY6kYiT2mc5moWnARG3cVeA3gS+HC7OA9w5rCQeh+4D6bSbbJjk
-						/8H92X30kyuuF0YTUvbNWxDwypvIBUtF7oiu46IKzbraBtQGqmU9GfJGdO5tPZge
-						LtW57E9jqJxlCjrTPyAm6OTjr7uyH2EnalWp8vwLaAWKJx8VcdH1k4RqQghGrqCq
-						Wm1C9N067zarj1pwml9lK/9y03jcda6jJ+z/OJCYEXSndXHqv0ATvZ5p1Cv0pACj
-						FueeLMHXoR5SRN5pRBeb3/EY8CgYQUPdAyE+hqtWhwM8u/tNXh9utG44i07NOV7e
-						SK8Sj6QUzuD0wOEXzl9vRh9tn6Ww9P3ltBc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.regents.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.regents.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Regent's University London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Regent's University London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.regents.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jean</GivenName>
-    <SurName>Heckman</SurName>
-    <EmailAddress>mailto:heckmanj@regents.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Diane</GivenName>
-    <SurName>Pineda</SurName>
-    <EmailAddress>mailto:pinedad@regents.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.xml
deleted file mode 100644
index 1f1c4fe4..00000000
--- a/swamid-interfederations-2.0/athens.sfx.ac.uk-oala-metadata.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://athens.sfx.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for St Francis Xavier Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-14T11:14:28Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">sfx.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIIUrw3/3s/GpYwDQYJKoZIhvcNAQEFBQAwPzEiMCAGA1UE
-						CgwZU3QgRnJhbmNpcyBYYXZpZXIgQ29sbGVnZTEZMBcGA1UEAwwQYXRoZW5zLnNm
-						eC5hYy51azAeFw0xMjA4MzAxNTQ5MTdaFw0yMjA4MzAxNTQ5MTdaMD8xIjAgBgNV
-						BAoMGVN0IEZyYW5jaXMgWGF2aWVyIENvbGxlZ2UxGTAXBgNVBAMMEGF0aGVucy5z
-						ZnguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbuIZE3JvJ
-						SLvlL/GTkpG8ZMwN/XEjaOMki9e0AH59+diThTfB7qWlWkeKcP3V3u+Qix0HXIER
-						5KPorCGlc9plEGisiMlB1VM7quRpo8rj5+epqcHEFvMP4uM3uYL6kLmtaU9xiIeA
-						2Rwc4JjSEWpNlA9foUG+5sOF8H9PZYcThe4yxxI38e7SzSBDQDnNFrBGkYp23bEK
-						8MH1Yc/BEu/mk4CZxrE/6WJbnOLLZHCu3A+J8InQyMPOUHbuOBo15yk7vpT0lDAT
-						LFXymhGJx4Cw5G9yAert/+iNrCuInsXrzwmAVcPkJhSlbcUtSESgSvJ52LfTA+lD
-						0ya6eHCUYTNvAgMBAAGjUDBOMB0GA1UdDgQWBBRfKyEp6Ee71d5mr8imf5Y0LNHm
-						xTAfBgNVHSMEGDAWgBRfKyEp6Ee71d5mr8imf5Y0LNHmxTAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBY1cgB4u67JUxDDSCG9BC1B0q+cPUzi5GQYd0c
-						JMsKGuW/xIEOYCRV8KbSUjk5rhH5+Aa5AhVknAyMHQk1Ex3sr5inyUU1kKMth32o
-						xQP58zDF/bDG5IWhid4BDYsxz5eeblU3DDLBYelVCIDMtEGDr/EywCsDn++31clZ
-						6nAR2NVota0VkCGui5SIaNKP2xvXVmTXF6sgwEtrODA48USXZ5qYEtw4KebMRNgB
-						+5+F6kGugAhrGrzk2I/TXaHFaSK9VoZeeWhlP9TrUGs3OoZpcJIOn7YNWkRXjvc4
-						Jm97jXW671SIlxESNhiaaTRp6xcZFFm5iSsPcm5+BIy+VNTL
-					</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>
-						MIIDUDCCAjigAwIBAgIIUrw3/3s/GpYwDQYJKoZIhvcNAQEFBQAwPzEiMCAGA1UE
-						CgwZU3QgRnJhbmNpcyBYYXZpZXIgQ29sbGVnZTEZMBcGA1UEAwwQYXRoZW5zLnNm
-						eC5hYy51azAeFw0xMjA4MzAxNTQ5MTdaFw0yMjA4MzAxNTQ5MTdaMD8xIjAgBgNV
-						BAoMGVN0IEZyYW5jaXMgWGF2aWVyIENvbGxlZ2UxGTAXBgNVBAMMEGF0aGVucy5z
-						ZnguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbuIZE3JvJ
-						SLvlL/GTkpG8ZMwN/XEjaOMki9e0AH59+diThTfB7qWlWkeKcP3V3u+Qix0HXIER
-						5KPorCGlc9plEGisiMlB1VM7quRpo8rj5+epqcHEFvMP4uM3uYL6kLmtaU9xiIeA
-						2Rwc4JjSEWpNlA9foUG+5sOF8H9PZYcThe4yxxI38e7SzSBDQDnNFrBGkYp23bEK
-						8MH1Yc/BEu/mk4CZxrE/6WJbnOLLZHCu3A+J8InQyMPOUHbuOBo15yk7vpT0lDAT
-						LFXymhGJx4Cw5G9yAert/+iNrCuInsXrzwmAVcPkJhSlbcUtSESgSvJ52LfTA+lD
-						0ya6eHCUYTNvAgMBAAGjUDBOMB0GA1UdDgQWBBRfKyEp6Ee71d5mr8imf5Y0LNHm
-						xTAfBgNVHSMEGDAWgBRfKyEp6Ee71d5mr8imf5Y0LNHmxTAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBY1cgB4u67JUxDDSCG9BC1B0q+cPUzi5GQYd0c
-						JMsKGuW/xIEOYCRV8KbSUjk5rhH5+Aa5AhVknAyMHQk1Ex3sr5inyUU1kKMth32o
-						xQP58zDF/bDG5IWhid4BDYsxz5eeblU3DDLBYelVCIDMtEGDr/EywCsDn++31clZ
-						6nAR2NVota0VkCGui5SIaNKP2xvXVmTXF6sgwEtrODA48USXZ5qYEtw4KebMRNgB
-						+5+F6kGugAhrGrzk2I/TXaHFaSK9VoZeeWhlP9TrUGs3OoZpcJIOn7YNWkRXjvc4
-						Jm97jXW671SIlxESNhiaaTRp6xcZFFm5iSsPcm5+BIy+VNTL
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.sfx.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.sfx.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">St Francis Xavier Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St.Francis Xavier 6th Form College SSO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sfx.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Learning Resources Centre</GivenName>
-    <EmailAddress>mailto:library@sfx.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Thufael</GivenName>
-    <SurName>Islam</SurName>
-    <EmailAddress>mailto:t.islam@sfx.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Daniel</GivenName>
-    <SurName>Pereira</SurName>
-    <EmailAddress>mailto:d.pereira@sfx.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.xml
deleted file mode 100644
index ce8a306e..00000000
--- a/swamid-interfederations-2.0/athens.winchester.ac.uk-oala-metadata.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://athens.winchester.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the University of Winchester.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-08T13:59:39Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">winchester.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXDCCAkSgAwIBAgIIQmqDispxGNswDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
-						CgwYVW5pdmVyc2l0eSBvZiBXaW5jaGVzdGVyMSAwHgYDVQQDDBdhdGhlbnMud2lu
-						Y2hlc3Rlci5hYy51azAeFw0xMzA3MDMxMDA5NTlaFw0yMzA3MDMxMDA5NTlaMEUx
-						ITAfBgNVBAoMGFVuaXZlcnNpdHkgb2YgV2luY2hlc3RlcjEgMB4GA1UEAwwXYXRo
-						ZW5zLndpbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQCJ1jkVRgLTXubvfnTjrgldm0Lzg0A7LLkiBtcRhimvbf5ZWO69qaiPOi7U
-						ZqS2nI1OKErrQV8QImOv15sbYZesSqnErkOiitJbOvdGliwIR5x4njSrqA7d4heZ
-						G8dbYpEtJexNz1Lct4pzDxq7FP3uixX+CYuutrTsxCrrsO450zs0aVzM2qUEK9GZ
-						r144+6H4cA8AKQD0rB1uqv9aNDZljkWhkgMUoUCkjc1mXsmuSP+0DappKGBhIdRH
-						KBisDT4+d3QBvt7HaY9xi0bQllu05enGeA5PaPfIaZFOEXVA28bgrHcbDaa2Ccb9
-						xIpVaKsMGh/cK4JExZjTxdnGCvF5AgMBAAGjUDBOMB0GA1UdDgQWBBTZsfd42w9Y
-						1+pqgyYhGZqJp7Y2+jAfBgNVHSMEGDAWgBTZsfd42w9Y1+pqgyYhGZqJp7Y2+jAM
-						BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBjPCDp8APA44IqqaCxdxIe
-						+UqgLVMCRMSP2d4F5x99/OLOfSLLVqCZMVddqkwbgGi+/Q8Zw7NCcJw4QaY4nzO8
-						7UXTsACjlQz5fD+FdxjVGkfIc3aSRH8Ly83W5RveQdaTukhmaFdM1ndK0TqhMc7n
-						owepHnvJwak5PH6KyZ1FYNLhCfjh4xNuuwhmoh60XAweUWZzP9IfS2VxNNzBv3+5
-						fcaD4APnIG4TQqH263QTMpdv31bgHuYCs90L4+7ZjF90CCPxvhmEg0MYbdabCJOz
-						TQq4kHUbCj4NK67GjP305jurZGiOUQRqy3ma0TcwYkElPkKZj6hZEPvNfuRTp2V9
-					</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>
-						MIIDXDCCAkSgAwIBAgIIQmqDispxGNswDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
-						CgwYVW5pdmVyc2l0eSBvZiBXaW5jaGVzdGVyMSAwHgYDVQQDDBdhdGhlbnMud2lu
-						Y2hlc3Rlci5hYy51azAeFw0xMzA3MDMxMDA5NTlaFw0yMzA3MDMxMDA5NTlaMEUx
-						ITAfBgNVBAoMGFVuaXZlcnNpdHkgb2YgV2luY2hlc3RlcjEgMB4GA1UEAwwXYXRo
-						ZW5zLndpbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQCJ1jkVRgLTXubvfnTjrgldm0Lzg0A7LLkiBtcRhimvbf5ZWO69qaiPOi7U
-						ZqS2nI1OKErrQV8QImOv15sbYZesSqnErkOiitJbOvdGliwIR5x4njSrqA7d4heZ
-						G8dbYpEtJexNz1Lct4pzDxq7FP3uixX+CYuutrTsxCrrsO450zs0aVzM2qUEK9GZ
-						r144+6H4cA8AKQD0rB1uqv9aNDZljkWhkgMUoUCkjc1mXsmuSP+0DappKGBhIdRH
-						KBisDT4+d3QBvt7HaY9xi0bQllu05enGeA5PaPfIaZFOEXVA28bgrHcbDaa2Ccb9
-						xIpVaKsMGh/cK4JExZjTxdnGCvF5AgMBAAGjUDBOMB0GA1UdDgQWBBTZsfd42w9Y
-						1+pqgyYhGZqJp7Y2+jAfBgNVHSMEGDAWgBTZsfd42w9Y1+pqgyYhGZqJp7Y2+jAM
-						BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBjPCDp8APA44IqqaCxdxIe
-						+UqgLVMCRMSP2d4F5x99/OLOfSLLVqCZMVddqkwbgGi+/Q8Zw7NCcJw4QaY4nzO8
-						7UXTsACjlQz5fD+FdxjVGkfIc3aSRH8Ly83W5RveQdaTukhmaFdM1ndK0TqhMc7n
-						owepHnvJwak5PH6KyZ1FYNLhCfjh4xNuuwhmoh60XAweUWZzP9IfS2VxNNzBv3+5
-						fcaD4APnIG4TQqH263QTMpdv31bgHuYCs90L4+7ZjF90CCPxvhmEg0MYbdabCJOz
-						TQq4kHUbCj4NK67GjP305jurZGiOUQRqy3ma0TcwYkElPkKZj6hZEPvNfuRTp2V9
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athens.winchester.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athens.winchester.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Winchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Winchester Pilot</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.winchester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:Helpdesk@winchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:Helpdesk@winchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athensla-dev.uwe.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athensla-dev.uwe.ac.uk-oala-metadata.xml
deleted file mode 100644
index 05661e60..00000000
--- a/swamid-interfederations-2.0/athensla-dev.uwe.ac.uk-oala-metadata.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://athensla-dev.uwe.ac.uk/oala/metadata">
-  <!--
-		This is a test OpenAthens LA IdP for the University of the West of England, Bristol.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-27T10:49:58Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">uwe.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDnDCCAoSgAwIBAgIIAj83J4NilnUwDQYJKoZIhvcNAQEFBQAwZTFCMEAGA1UE
-						Cgw5VW5pdmVyc2l0eSBvZiB0aGUgV2VzdCBvZiBFbmdsYW5kIChVV0UpIC0gT3Bl
-						bkF0aGVucyB0ZXN0MR8wHQYDVQQDDBZhdGhlbnNsYS1kZXYudXdlLmFjLnVrMB4X
-						DTEyMDEzMTE0NDQwOVoXDTIyMDEzMTE0NDQwOVowZTFCMEAGA1UECgw5VW5pdmVy
-						c2l0eSBvZiB0aGUgV2VzdCBvZiBFbmdsYW5kIChVV0UpIC0gT3BlbkF0aGVucyB0
-						ZXN0MR8wHQYDVQQDDBZhdGhlbnNsYS1kZXYudXdlLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqxbxAqe72n/rFUKC+8culLa4pBzN/nJtn9GF
-						6n6zV89BXbmtzJ+BHMaRxnK38RCbnD0DteMsOidfFH5cfiWCE2sc9QYEOnH33QKA
-						wE4hWKaTWgQPyGqZeuMYG1fJIUSVuO6Uv6BU8rPcUUA+Y5KMqtNW+7gqqMTZIzN8
-						9DAHQuFuAQ0eo45sQ9R/KlHGhCLxq7QfSc5Ubw0RDAu6LKNIcysE5Z2wHveSrOFl
-						ATfGvlIDqD3NgU5qTAgOmtdV7SMLV2GmUHchywsU5lAfe79F29eLR76I3VS7QvS/
-						pNFWaNEeZ6KzekjuP1AA9DTE6e/G8tGbp9TuN3Voxd17X3df6wIDAQABo1AwTjAd
-						BgNVHQ4EFgQUH09lZ8a/50v7n7KoHu5cPkXL4c0wHwYDVR0jBBgwFoAUH09lZ8a/
-						50v7n7KoHu5cPkXL4c0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
-						OddVOziOhr4dyJAY4qlb1KOoYmluG79TdWJX8j35+ZiyMzm/xgA0uHzwuSIu3XbE
-						dskHJou0p13BqDOMXXeTvCmOWylxPgrLv7bDfY3IiCJO/lLcCESJ+gDglkjDioGq
-						pwrdhq9wOFVThuqmQSQlBFxPauGazIs+9x1g+pb0xtHXQY3VQabwtgOF9j1kRJ34
-						6h/pyQvI3Xqs+z+v/LPb3Kgq9Xfx91U+KJcPgzrcqVYPRYcEXQnDIag3JO9KQvja
-						CBC55WV0qbeYU7fb3oAdceGRkKzS5oP0h0rtRxTaAKq6HIrmu65mF4upHfAR3KB+
-						i+gyuTDSHb2b8u6Rvfl54A==
-					</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>
-						MIIDnDCCAoSgAwIBAgIIAj83J4NilnUwDQYJKoZIhvcNAQEFBQAwZTFCMEAGA1UE
-						Cgw5VW5pdmVyc2l0eSBvZiB0aGUgV2VzdCBvZiBFbmdsYW5kIChVV0UpIC0gT3Bl
-						bkF0aGVucyB0ZXN0MR8wHQYDVQQDDBZhdGhlbnNsYS1kZXYudXdlLmFjLnVrMB4X
-						DTEyMDEzMTE0NDQwOVoXDTIyMDEzMTE0NDQwOVowZTFCMEAGA1UECgw5VW5pdmVy
-						c2l0eSBvZiB0aGUgV2VzdCBvZiBFbmdsYW5kIChVV0UpIC0gT3BlbkF0aGVucyB0
-						ZXN0MR8wHQYDVQQDDBZhdGhlbnNsYS1kZXYudXdlLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqxbxAqe72n/rFUKC+8culLa4pBzN/nJtn9GF
-						6n6zV89BXbmtzJ+BHMaRxnK38RCbnD0DteMsOidfFH5cfiWCE2sc9QYEOnH33QKA
-						wE4hWKaTWgQPyGqZeuMYG1fJIUSVuO6Uv6BU8rPcUUA+Y5KMqtNW+7gqqMTZIzN8
-						9DAHQuFuAQ0eo45sQ9R/KlHGhCLxq7QfSc5Ubw0RDAu6LKNIcysE5Z2wHveSrOFl
-						ATfGvlIDqD3NgU5qTAgOmtdV7SMLV2GmUHchywsU5lAfe79F29eLR76I3VS7QvS/
-						pNFWaNEeZ6KzekjuP1AA9DTE6e/G8tGbp9TuN3Voxd17X3df6wIDAQABo1AwTjAd
-						BgNVHQ4EFgQUH09lZ8a/50v7n7KoHu5cPkXL4c0wHwYDVR0jBBgwFoAUH09lZ8a/
-						50v7n7KoHu5cPkXL4c0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
-						OddVOziOhr4dyJAY4qlb1KOoYmluG79TdWJX8j35+ZiyMzm/xgA0uHzwuSIu3XbE
-						dskHJou0p13BqDOMXXeTvCmOWylxPgrLv7bDfY3IiCJO/lLcCESJ+gDglkjDioGq
-						pwrdhq9wOFVThuqmQSQlBFxPauGazIs+9x1g+pb0xtHXQY3VQabwtgOF9j1kRJ34
-						6h/pyQvI3Xqs+z+v/LPb3Kgq9Xfx91U+KJcPgzrcqVYPRYcEXQnDIag3JO9KQvja
-						CBC55WV0qbeYU7fb3oAdceGRkKzS5oP0h0rtRxTaAKq6HIrmu65mF4upHfAR3KB+
-						i+gyuTDSHb2b8u6Rvfl54A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensla-dev.uwe.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensla-dev.uwe.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of the West of England, Bristol</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of the West of England (UWE) - OpenAthens test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uwe.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library IT Team</GivenName>
-    <EmailAddress>mailto:lib.it@uwe.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Library IT Team</GivenName>
-    <EmailAddress>mailto:lib.it@uwe.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athensla.uwe.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athensla.uwe.ac.uk-oala-metadata.xml
deleted file mode 100644
index d013cba2..00000000
--- a/swamid-interfederations-2.0/athensla.uwe.ac.uk-oala-metadata.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://athensla.uwe.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the University of the West of England, Bristol.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">uwe.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of the West of England (UWE)</mdui:DisplayName>
-        <mdui:Logo height="60" width="155">https://library.uwe.ac.uk/uwe/uwelogoopenathens.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://library.uwe.ac.uk/uwe/favicon.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDcTCCAlmgAwIBAgIJAJ8fe5216tbDMA0GCSqGSIb3DQEBBQUAME8xMDAuBgNV
-						BAoMJ1VuaXZlcnNpdHkgb2YgdGhlIFdlc3Qgb2YgRW5nbGFuZCAoVVdFKTEbMBkG
-						A1UEAwwSYXRoZW5zbGEudXdlLmFjLnVrMB4XDTEzMTIwMjE2MzQ1N1oXDTIzMTEz
-						MDE2MzQ1N1owTzEwMC4GA1UECgwnVW5pdmVyc2l0eSBvZiB0aGUgV2VzdCBvZiBF
-						bmdsYW5kIChVV0UpMRswGQYDVQQDDBJhdGhlbnNsYS51d2UuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc8ii9gKVq+K5jeXMigwfR7XdrauZT
-						EixNOzSZMJVmjvlQP1FYwkYY6+wq6c8OQ7OhxlCbWknz3bZo9CxS75OX8eIEr5Nx
-						Www4Qh8i3XOqXgtbSRN+bLvt1A1L6YRAjyP7weIZOic4VjPoBsOUWGXC+QzZB7lV
-						0x9Lq5FR3GZBQXLGXN+Vl/0WsCZYORGnkZutkUnTaJ0u3CJp7qfYJcTUIoyC1/mf
-						ghMBgaRr+zlXuN5B7gH89CfA8RLvSoQLzrE0y46+o9+0lEIScEzBUdBhvSABrslP
-						+e3Hf9aisLE6p0mRFxHI/Jp/9W68HRfFauzIKggwcKoTNQ9yKvrmLY9DAgMBAAGj
-						UDBOMB0GA1UdDgQWBBRTGhswU9gRevAWF9xO/U8h0e2K9DAfBgNVHSMEGDAWgBRT
-						GhswU9gRevAWF9xO/U8h0e2K9DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-						A4IBAQBXSNwVMyQ6ZkJf28QyTOpTOySPoCJTbWeQh+ZMgvVYMhxcoV552G9fLKE+
-						Lz7uGElnjkYGPiLzRBC+hS4rv2xxzw1NY8JVPKSJQj3+NA5W2fb/rz/dzTG/ws5H
-						UQVopDsQO6nfhP39wWkc+V8j7ZdorE7OuqetlH/clf0rsXAUEvUKsnH/ZSqqCi6j
-						7HdU98sddgEqv6g71J+BPECPq4FBNr9S9Enbi7NxqMicfFMiEnK5DvDaDwI+RC54
-						Wa4FCcK/O6SB8OgD8Dk59xmFXwEGyMUjNvjTZqKMFRmwS8zDyDtCWyi87GKqrAP1
-						uzXnYMVigld+IhPeyJ4tin2r6+bQ
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensla.uwe.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensla.uwe.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of the West of England, Bristol</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of the West of England (UWE)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uwe.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library IT Team</GivenName>
-    <EmailAddress>mailto:lib.it@uwe.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Library IT Team</GivenName>
-    <EmailAddress>mailto:lib.it@uwe.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athenslart.nelson.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athenslart.nelson.ac.uk-oala-metadata.xml
deleted file mode 100644
index 0fe51fc3..00000000
--- a/swamid-interfederations-2.0/athenslart.nelson.ac.uk-oala-metadata.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://athenslart.nelson.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Nelson and Colne College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-24T16:03:12Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">nelson.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXDCCAkSgAwIBAgIIMiDjsqVkEwwwDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
-						CgwYTmVsc29uIGFuZCBDb2xuZSBDb2xsZWdlMSAwHgYDVQQDDBdhdGhlbnNsYXJ0
-						Lm5lbHNvbi5hYy51azAeFw0xNDA2MTExNTI3MDNaFw0yNDA2MTExNTI3MDNaMEUx
-						ITAfBgNVBAoMGE5lbHNvbiBhbmQgQ29sbmUgQ29sbGVnZTEgMB4GA1UEAwwXYXRo
-						ZW5zbGFydC5uZWxzb24uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQCkv+4a7sZDYlsHkDF9Ey19/K24sKNVFTJs6l9cGYQAXNi5JmghZCMAZP/M
-						JytDMgksZZkzWFOwsteq5asZAT3Ui1X0elVbWRONMK8/SkOxfduxnqdKaVtqSAvl
-						2w2W4d3G2NudFHUcM4/uu0s6GKL64tD5TnI5IXQLpiuoy6HCawF1qDmgPGu0JPKl
-						9DA8BT6djWh3rBEpicMYNimdGbQXIjvmwl1p3UAKU7hmTzWIpQD7EPNXCZSLzHaU
-						A224+qsbFYg6yyv7E2xx/WC7KrO9M8D30DjF6cn8K16Y0VruhvYaOU4JVZXCnGc+
-						Fi/+6dTxyd+ugtANwjP2AE1BRbFbAgMBAAGjUDBOMB0GA1UdDgQWBBRJC78oYTfA
-						SeY3dbPP9aUaRl87+TAfBgNVHSMEGDAWgBRJC78oYTfASeY3dbPP9aUaRl87+TAM
-						BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCV3dbQRHN2fpZQU0APj2Er
-						wAEjnXXjf3soh7rdo7SyT3hW7lbg842/ejkhEzEemvH6kITXFJYeJ7M71+Lqhds0
-						Kw3EMKBy8BVKS0bM1pHrUYhT3AW/d7N0XshLYZb1L8233Wl4xP1ItfpRCxshmH3p
-						0Fo/N/jh3gMy93uZisFZ/VDTYIlUyy6aFLboylBiSRDU/pb1x0Ltp3OtFoqvAGNo
-						teXSqopxzYN+5SX393NDdWV6u5ozUVKvtNPqaw20B0g5z/lGmQmMtY29x6i2PDJF
-						OoXTiQu9KjiPG9OBQyebDt3nQA8gUQZJB+e7TcOZy0B+OylJclvjR3D3Ap7eKANw
-					</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>
-						MIIDXDCCAkSgAwIBAgIIMiDjsqVkEwwwDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
-						CgwYTmVsc29uIGFuZCBDb2xuZSBDb2xsZWdlMSAwHgYDVQQDDBdhdGhlbnNsYXJ0
-						Lm5lbHNvbi5hYy51azAeFw0xNDA2MTExNTI3MDNaFw0yNDA2MTExNTI3MDNaMEUx
-						ITAfBgNVBAoMGE5lbHNvbiBhbmQgQ29sbmUgQ29sbGVnZTEgMB4GA1UEAwwXYXRo
-						ZW5zbGFydC5uZWxzb24uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQCkv+4a7sZDYlsHkDF9Ey19/K24sKNVFTJs6l9cGYQAXNi5JmghZCMAZP/M
-						JytDMgksZZkzWFOwsteq5asZAT3Ui1X0elVbWRONMK8/SkOxfduxnqdKaVtqSAvl
-						2w2W4d3G2NudFHUcM4/uu0s6GKL64tD5TnI5IXQLpiuoy6HCawF1qDmgPGu0JPKl
-						9DA8BT6djWh3rBEpicMYNimdGbQXIjvmwl1p3UAKU7hmTzWIpQD7EPNXCZSLzHaU
-						A224+qsbFYg6yyv7E2xx/WC7KrO9M8D30DjF6cn8K16Y0VruhvYaOU4JVZXCnGc+
-						Fi/+6dTxyd+ugtANwjP2AE1BRbFbAgMBAAGjUDBOMB0GA1UdDgQWBBRJC78oYTfA
-						SeY3dbPP9aUaRl87+TAfBgNVHSMEGDAWgBRJC78oYTfASeY3dbPP9aUaRl87+TAM
-						BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCV3dbQRHN2fpZQU0APj2Er
-						wAEjnXXjf3soh7rdo7SyT3hW7lbg842/ejkhEzEemvH6kITXFJYeJ7M71+Lqhds0
-						Kw3EMKBy8BVKS0bM1pHrUYhT3AW/d7N0XshLYZb1L8233Wl4xP1ItfpRCxshmH3p
-						0Fo/N/jh3gMy93uZisFZ/VDTYIlUyy6aFLboylBiSRDU/pb1x0Ltp3OtFoqvAGNo
-						teXSqopxzYN+5SX393NDdWV6u5ozUVKvtNPqaw20B0g5z/lGmQmMtY29x6i2PDJF
-						OoXTiQu9KjiPG9OBQyebDt3nQA8gUQZJB+e7TcOZy0B+OylJclvjR3D3Ap7eKANw
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athenslart.nelson.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athenslart.nelson.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Nelson and Colne College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nelson and Colne College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nelson.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alan</GivenName>
-    <SurName>Rhodes</SurName>
-    <EmailAddress>mailto:a.rhodes@nelson.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Amanda</GivenName>
-    <SurName>Mills</SurName>
-    <EmailAddress>mailto:a.mills@nelson.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athensproxy.ids.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athensproxy.ids.ac.uk-oala-metadata.xml
deleted file mode 100644
index e3b18877..00000000
--- a/swamid-interfederations-2.0/athensproxy.ids.ac.uk-oala-metadata.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://athensproxy.ids.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens IdP for the Institute of Development Studies.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-30T09:41:49Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">ids.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaDCCAlCgAwIBAgIIQR/nRSl1E04wDQYJKoZIhvcNAQEFBQAwSzEpMCcGA1UE
-						CgwgSW5zdGl0dXRlIG9mIERldmVsb3BtZW50IFN0dWRpZXMxHjAcBgNVBAMMFWF0
-						aGVuc3Byb3h5Lmlkcy5hYy51azAeFw0xMzA1MTcwODM1NDJaFw0yMzA1MTcwODM1
-						NDJaMEsxKTAnBgNVBAoMIEluc3RpdHV0ZSBvZiBEZXZlbG9wbWVudCBTdHVkaWVz
-						MR4wHAYDVQQDDBVhdGhlbnNwcm94eS5pZHMuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQC3grq+RMGcLnzS7Pt4Ec16BSPbqCJBlcXMV6JLJvnJ
-						KLwls/mSicpJam1/FtDyJyQyY8odsa5Cw8vykMmUqvwv2eNJE8z0Rntm9Wv+kOQi
-						k9W2Jb7A6Xhitln4E+H7OBkH/P2l6T3KhN1kSE4BMkgxcJJGOviLzVrEOummaGYy
-						/kFnpJtgGQ9Nm61dUr97HeqvuD6FnenRg1B1ytTsAVeBk7b0w4xmwB1tLtq5Qtwl
-						d2Wo9oS3tLWDxfgLK92F3lPIsxDKOdhfTO96IxRBdSQvL7i0ejcj2omKe3gXtA1i
-						WnbJMajaeRZPq1dlqfAgGSbdS3jBHXhQO1hvDyrd2eorAgMBAAGjUDBOMB0GA1Ud
-						DgQWBBR04tUI60ZrejiYTwYKKkK6LLPLBjAfBgNVHSMEGDAWgBR04tUI60ZrejiY
-						TwYKKkK6LLPLBjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAYFUNc
-						56JR4EXmIKJKTO3nSE9w37Fuhdr1XRM1dCaPdSqO5KpBa3Fgyg2mLGMepnIA7dg2
-						rtJmA9tcC2DRWX7argcQWt7F4hywafKck3hY5l5jVmHkx1Ey619S/FZeiNWHwmwf
-						+E9R8KwbKsJ8VWStJfEk/c8MawDOOZDpUEwGQIOpzYpjb0JGkmKCikRhAnVtxEBN
-						4lA7K579Y3dUiXkSt8cehuGjCon3fn8ppgn1ZDGmUI9uYS5ifXlHvMT7iDA3eVkn
-						rtpgg6nuNDeUfHaCe+UJWzC1a5y/CsOTAVRuU6bRU2obl2Yi3GOglFSCYj+tfPjv
-						qfy5h2rLe+ayys5I
-					</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>
-						MIIDaDCCAlCgAwIBAgIIQR/nRSl1E04wDQYJKoZIhvcNAQEFBQAwSzEpMCcGA1UE
-						CgwgSW5zdGl0dXRlIG9mIERldmVsb3BtZW50IFN0dWRpZXMxHjAcBgNVBAMMFWF0
-						aGVuc3Byb3h5Lmlkcy5hYy51azAeFw0xMzA1MTcwODM1NDJaFw0yMzA1MTcwODM1
-						NDJaMEsxKTAnBgNVBAoMIEluc3RpdHV0ZSBvZiBEZXZlbG9wbWVudCBTdHVkaWVz
-						MR4wHAYDVQQDDBVhdGhlbnNwcm94eS5pZHMuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQC3grq+RMGcLnzS7Pt4Ec16BSPbqCJBlcXMV6JLJvnJ
-						KLwls/mSicpJam1/FtDyJyQyY8odsa5Cw8vykMmUqvwv2eNJE8z0Rntm9Wv+kOQi
-						k9W2Jb7A6Xhitln4E+H7OBkH/P2l6T3KhN1kSE4BMkgxcJJGOviLzVrEOummaGYy
-						/kFnpJtgGQ9Nm61dUr97HeqvuD6FnenRg1B1ytTsAVeBk7b0w4xmwB1tLtq5Qtwl
-						d2Wo9oS3tLWDxfgLK92F3lPIsxDKOdhfTO96IxRBdSQvL7i0ejcj2omKe3gXtA1i
-						WnbJMajaeRZPq1dlqfAgGSbdS3jBHXhQO1hvDyrd2eorAgMBAAGjUDBOMB0GA1Ud
-						DgQWBBR04tUI60ZrejiYTwYKKkK6LLPLBjAfBgNVHSMEGDAWgBR04tUI60ZrejiY
-						TwYKKkK6LLPLBjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAYFUNc
-						56JR4EXmIKJKTO3nSE9w37Fuhdr1XRM1dCaPdSqO5KpBa3Fgyg2mLGMepnIA7dg2
-						rtJmA9tcC2DRWX7argcQWt7F4hywafKck3hY5l5jVmHkx1Ey619S/FZeiNWHwmwf
-						+E9R8KwbKsJ8VWStJfEk/c8MawDOOZDpUEwGQIOpzYpjb0JGkmKCikRhAnVtxEBN
-						4lA7K579Y3dUiXkSt8cehuGjCon3fn8ppgn1ZDGmUI9uYS5ifXlHvMT7iDA3eVkn
-						rtpgg6nuNDeUfHaCe+UJWzC1a5y/CsOTAVRuU6bRU2obl2Yi3GOglFSCYj+tfPjv
-						qfy5h2rLe+ayys5I
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensproxy.ids.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensproxy.ids.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Institute of Development Studies</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Development Studies</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ids.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library Helpdesk</GivenName>
-    <EmailAddress>mailto:BLDS@ids.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Beaven</SurName>
-    <EmailAddress>mailto:d.beaven@ids.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/athensri.forthvalley.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/athensri.forthvalley.ac.uk-oala-metadata.xml
deleted file mode 100644
index 690f35e5..00000000
--- a/swamid-interfederations-2.0/athensri.forthvalley.ac.uk-oala-metadata.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://athensri.forthvalley.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Forth Valley College of Further and Higher Education.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-02T12:17:37Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">forthvalley.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDsjCCApqgAwIBAgIJAJk2uGNIbkStMA0GCSqGSIb3DQEBBQUAMEQxHTAbBgNV
-						BAoTFEZvcnRoIFZhbGxleSBDb2xsZWdlMSMwIQYDVQQDExphdGhlbnNyaS5mb3J0
-						aHZhbGxleS5hYy51azAeFw0xMTA5MTIxMTUxMDFaFw0yMTA5MDkxMTUxMDFaMEQx
-						HTAbBgNVBAoTFEZvcnRoIFZhbGxleSBDb2xsZWdlMSMwIQYDVQQDExphdGhlbnNy
-						aS5mb3J0aHZhbGxleS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAK353WqmulmsLtwvvW1+hYO/kRDRRRmrAhAJvwEwopgABtd1T9a/6toJwYDJ
-						pFqzT0+VojwzdvRw/RCgYAZzd+HCK/giChdHIT25NUn4bTTlBM8arIH04lmswYvm
-						uTI4m+QOPTNJM5wWuD5T1plmCT/OdleDMHIsdyt5g8pMfPDT1DHcJ43aptC7mXMJ
-						DK8M4URKWWvuBlIVwL4+a3URxS3VvdxOGwX+WuYZ8q1IlzUG+PEf9lcIwPGfxucl
-						PbLE2Q3M3cU2yEzsZWas63vbYw6YniKjaMf3setK4A77shor7Di8wYGR3DkxJifv
-						UAq8/lHMZ9dLK0wxPYZFfI8VxA0CAwEAAaOBpjCBozAdBgNVHQ4EFgQUOK0xdbaZ
-						dIyNwo58vYn7Sv7Fy0kwdAYDVR0jBG0wa4AUOK0xdbaZdIyNwo58vYn7Sv7Fy0mh
-						SKRGMEQxHTAbBgNVBAoTFEZvcnRoIFZhbGxleSBDb2xsZWdlMSMwIQYDVQQDExph
-						dGhlbnNyaS5mb3J0aHZhbGxleS5hYy51a4IJAJk2uGNIbkStMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBACuUxXKYJpNFw504ykZnJs0NJAOA8OhXu2UM
-						Ub2QDWD/84kXZSxJkFcz6TaeByhNAPXWUxrt/G5RSzy7LIC9tH4roICTkttweujO
-						ble6Y8bLvoKA7f+x2LGZX9Tw75vsD5dr+vdoguW5L0d43q6f0tI4GHHGsgC5KrkX
-						bxzg27PJVX7V6LlRiLknVX6tfPbVu8mzEHU4t+lwcZFb+5JrEHF9c2wGf33pUZBZ
-						tiQ/jyZqHEHbOpi6o/DE5plkwKQBkHkimeFyXITgwiDto8yE2Lg3ld33yB/G529g
-						1e0NTIQeEWw/mB0MavXoJloNskmBulmLX3HlLMJLRgVh4hOHqkM=
-					</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>
-						MIIDsjCCApqgAwIBAgIJAJk2uGNIbkStMA0GCSqGSIb3DQEBBQUAMEQxHTAbBgNV
-						BAoTFEZvcnRoIFZhbGxleSBDb2xsZWdlMSMwIQYDVQQDExphdGhlbnNyaS5mb3J0
-						aHZhbGxleS5hYy51azAeFw0xMTA5MTIxMTUxMDFaFw0yMTA5MDkxMTUxMDFaMEQx
-						HTAbBgNVBAoTFEZvcnRoIFZhbGxleSBDb2xsZWdlMSMwIQYDVQQDExphdGhlbnNy
-						aS5mb3J0aHZhbGxleS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAK353WqmulmsLtwvvW1+hYO/kRDRRRmrAhAJvwEwopgABtd1T9a/6toJwYDJ
-						pFqzT0+VojwzdvRw/RCgYAZzd+HCK/giChdHIT25NUn4bTTlBM8arIH04lmswYvm
-						uTI4m+QOPTNJM5wWuD5T1plmCT/OdleDMHIsdyt5g8pMfPDT1DHcJ43aptC7mXMJ
-						DK8M4URKWWvuBlIVwL4+a3URxS3VvdxOGwX+WuYZ8q1IlzUG+PEf9lcIwPGfxucl
-						PbLE2Q3M3cU2yEzsZWas63vbYw6YniKjaMf3setK4A77shor7Di8wYGR3DkxJifv
-						UAq8/lHMZ9dLK0wxPYZFfI8VxA0CAwEAAaOBpjCBozAdBgNVHQ4EFgQUOK0xdbaZ
-						dIyNwo58vYn7Sv7Fy0kwdAYDVR0jBG0wa4AUOK0xdbaZdIyNwo58vYn7Sv7Fy0mh
-						SKRGMEQxHTAbBgNVBAoTFEZvcnRoIFZhbGxleSBDb2xsZWdlMSMwIQYDVQQDExph
-						dGhlbnNyaS5mb3J0aHZhbGxleS5hYy51a4IJAJk2uGNIbkStMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBACuUxXKYJpNFw504ykZnJs0NJAOA8OhXu2UM
-						Ub2QDWD/84kXZSxJkFcz6TaeByhNAPXWUxrt/G5RSzy7LIC9tH4roICTkttweujO
-						ble6Y8bLvoKA7f+x2LGZX9Tw75vsD5dr+vdoguW5L0d43q6f0tI4GHHGsgC5KrkX
-						bxzg27PJVX7V6LlRiLknVX6tfPbVu8mzEHU4t+lwcZFb+5JrEHF9c2wGf33pUZBZ
-						tiQ/jyZqHEHbOpi6o/DE5plkwKQBkHkimeFyXITgwiDto8yE2Lg3ld33yB/G529g
-						1e0NTIQeEWw/mB0MavXoJloNskmBulmLX3HlLMJLRgVh4hOHqkM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensri.forthvalley.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensri.forthvalley.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Forth Valley College of Further and Higher Education</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Forth Valley College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.forthvalley.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Graeme</GivenName>
-    <SurName>Robertson</SurName>
-    <EmailAddress>mailto:graeme.robertson@forthvalley.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Graeme</GivenName>
-    <SurName>Robertson</SurName>
-    <EmailAddress>mailto:graeme.robertson@forthvalley.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/atlas.sciencespo-lille.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/atlas.sciencespo-lille.eu-idp-shibboleth.xml
deleted file mode 100644
index dbbaf560..00000000
--- a/swamid-interfederations-2.0/atlas.sciencespo-lille.eu-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://atlas.sciencespo-lille.eu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-05-13T13:23:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo-lille.eu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sciences Po Lille</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.sciencespo-lille.eu</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Students Teachers personals</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Sciences Po Lille</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etudiants professeurs personnels</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>
-					      MIIDTzCCAjegAwIBAgIUGuZxVz1Bu+epmwWqUK/URnWK7hIwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAwwZYXRsYXMuc2NpZW5jZXNwby1saWxsZS5ldTAeFw0xNTEx
-MTIxMzE0NDdaFw0zNTExMTIxMzE0NDdaMCQxIjAgBgNVBAMMGWF0bGFzLnNjaWVu
-Y2VzcG8tbGlsbGUuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw
-gDqC8d06qD0uaiYmgTaIPvq7OGMzdvEK23FT2rXNmD46EsL+0fDmz1Ar6A2YMe/c
-CAWcxNWdl1l81Y4Zq9CYFOHESYmJa0VbDiXKUm9uZ7gExCTpgs95aln7FKdhxH70
-cvkjbsP/ysR8pWIZyF2dNiwCOUzoE6X6/ubR5gBPNFRjeXOaW07kaciXUQWQ46rV
-95aU1ub6m6DoY0iE+2f6VczyeH3dvY2vwUnlv4iyzGdbxy2/0sYp/MRhyV2DSU2X
-pH0OAW2b5Pd8GjjGRc2edRHV2nAzyxbgsLVHcs6BzoDWAGzQMh1LBtM3N8rA0yFU
-/rqOufiuPYKcwz+P8CCvAgMBAAGjeTB3MB0GA1UdDgQWBBSrw58/CJGCUJ8MPUxN
-hWlZJI1sbTBWBgNVHREETzBNghlhdGxhcy5zY2llbmNlc3BvLWxpbGxlLmV1hjBo
-dHRwczovL2F0bGFzLnNjaWVuY2VzcG8tbGlsbGUuZXUvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQEFBQADggEBAF3JLrl6A+5QxHkQo+HCpW9NL6aBdTq5YwzL6erj
-19thGmKsnQqNXciF6cNnLmdfFkvRgAzCOGDRiaCp8c5LsL9uJMdh0nUfHMEMnA8W
-lCFPOng5QZSsrSnqDtJCmgQMWjn4Y/lyHZvLEeEmAl+fU06EzsV+Se2stt4VixZO
-U6Du0lDqi/MoimHux0PPUD2efRHRGrs77E1NSq9Q8jdVC4GBBvaIbqr2yCq9k0jR
-YS0hp+6TuMBb4zuEDByqoDE4JwtkYAZOHSoSFa6O259tu7X9ANQDpNAthjl8KpiI
-kh+YDh3r2c1z2DXiAjWLKaHE+yDmAhbUvJsrS5vL9oQL6nQ=
-					    </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-POST" Location="https://atlas.sciencespo-lille.eu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://atlas.sciencespo-lille.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://atlas.sciencespo-lille.eu/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Sciences Po Lille</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sciences Po Lille</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sciencespo-lille.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Laurent Marescaux</md:SurName>
-    <md:EmailAddress>laurent.marescaux@sciencespo-lille.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Olivier Dilly</md:SurName>
-    <md:EmailAddress>olivier.dilly@sciencespo-lille.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 86221af3..00000000
--- a/swamid-interfederations-2.0/atrium.in2p3.fr-sp.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://atrium.in2p3.fr/sp">
-  <md: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>
-    <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>https://federation.renater.fr/category/documentation</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IN2P3 - Atrium - Gestion documentaire</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://atrium.in2p3.fr/</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atrium.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atrium.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">IN2P3 - Atrium - Gestion documentaire</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">IN2P3 - Atrium - Gestion documentaire
-basé sur le logiciel Nuxeo</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CNRS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CNRS</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dsi.cnrs.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean-René Rouet</md:SurName>
-    <md:EmailAddress>rouet@in2p3.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Foudil Brétel</md:SurName>
-    <md:EmailAddress>foudil.bretel@cc.in2p3.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ae93b6cb..00000000
--- a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://attribute-viewer.aai.switch.ch/interfederation-test/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-11-23T07:39:52Z">
-      <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>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>switch.ch</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>others</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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://attribute-viewer.aai.switch.ch/interfederation-test/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://attribute-viewer.aai.switch.ch/interfederation-test/privacy-statement.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md: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>
-    </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://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">AAI Viewer Interfederation Test</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service is used to test the interfederation readiness of SWITCHaai Identity Providers.</md:ServiceDescription>
-      <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="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="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="true"/>
-      <md:RequestedAttribute FriendlyName="commonName" 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="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">switch.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.switch.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.switch.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.switch.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.switch.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 6bfe7640..00000000
--- a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://attribute-viewer.aai.switch.ch/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-11-20T07:40:54Z">
-      <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>switch.ch</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>others</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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="en">https://attribute-viewer.aai.switch.ch/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">https://attribute-viewer.aai.switch.ch/?lang=fr</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">https://attribute-viewer.aai.switch.ch/?lang=de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://attribute-viewer.aai.switch.ch/privacy_statement.php</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=it</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="fr">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=fr</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="de">https://attribute-viewer.aai.switch.ch/privacy_statement.php?lang=de</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md: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>
-    </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://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">AAI Attributes Viewer</md:ServiceName>
-      <md:ServiceName xml:lang="en">AAI Attributes Viewer</md:ServiceName>
-      <md:ServiceName xml:lang="fr">AAI Attributes Viewer</md:ServiceName>
-      <md:ServiceName xml:lang="it">AAI Attributes Viewer</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="fr">Présente tous les attributs d'un utilisateur pour tester et pour obtenir des renseignements.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Ha tutti gli attributi di un utente per testare e per ottenere informazioni.</md:ServiceDescription>
-      <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="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="surname" Name="urn:oid:2.5.4.4" 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="commonName" 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="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="true"/>
-      <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="true"/>
-      <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="true"/>
-      <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="true"/>
-      <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="true"/>
-      <md: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"/>
-      <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="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="true"/>
-      <md: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"/>
-      <md:RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">switch.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.switch.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.switch.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.switch.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.switch.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SWITCHaai</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SWITCHaai</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/audit01.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/audit01.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 6b2a42b4..00000000
--- a/swamid-interfederations-2.0/audit01.ncl.ac.uk-shibboleth-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://audit01.ncl.ac.uk/shibboleth/metadata">
-  <!--
-		This an "Network Audit" Shibboleth SP for the University of Newcastle upon Tyne.
-	-->
-  <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="2015-08-07T14:29: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAK1ZzdLxQXfRMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2F1ZGl0MDEwHhcNMTUwODA3MDkzMDA1WhcNMjUwODA0MDkzMDA1WjASMRAw
-						DgYDVQQDEwdhdWRpdDAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						5IdZL3vNFHuNz+DGyejDu+UgKY/LPIZFkxhp8b2YC4bRf55rRkq5515WDxPDSCYa
-						wY+4STF7xcMZ5swx/KyZcSoKRH36iMcVY48WJPDMwA2/d21bqj+/s3n5q9rXm0ZN
-						jxVIrv5OQdt9pPtxPgrYTMdjf7TveY6LEQZ/mhjmPpHL5ejvWkTqM53198tMI5KC
-						pkohQXDTdEO9w3euRlQOn4rhFwhStzEynb8V46+H9c2JMpxBU/YETzIvHvNejFk9
-						qjcJO3Ly8FtFJI6zw7vpGyQkqV21uNJd0XUQiE6fBqGPp9qRh3OtJc4UDcnwHuJ8
-						VXAz1UJqNnhOYrmE8ng2iQIDAQABozUwMzASBgNVHREECzAJggdhdWRpdDAxMB0G
-						A1UdDgQWBBQQiotJs1YSybSGq0yt+EI0GCxoOzANBgkqhkiG9w0BAQUFAAOCAQEA
-						2SW+OOlAkSo32Xbza8q19qaaTT+ZQa7PT6TO6MqyTHUM1tOGOa3Q5/NfCY3krs7+
-						dzoi2Mnbir3hLh5uH3BDWWCmZvXIxzoKqVBCmD/SBRIyhfrciVFCRcdD/D6dU4B+
-						L9h/Ktz9BG5QbOtXlojqjBa+1WLBrUwryLA/EEoBIkrZp819dGHjr1TcaL7P/xC0
-						uR1CJ5dETNrLPNQWP9ttkJMkIrBc+7WjRnNOedg0Ss/MrtDfrLCPh3JJBJZcziHf
-						PPPpfIEpkCXejb/xcNx7oAUxbhr6KSQlHrTR9qm3q/iZ4sf2rwKg4cSPlL351B6L
-						uObHYjETyvZu3iRO6lS2ug==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://audit01.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://audit01.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newcastle University Network Audit SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Franks</SurName>
-    <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Franks</SurName>
-    <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
-  </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 44d1d861..00000000
--- a/swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.agrosupdijon.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABbElEQVQoz3WSO0hCYRTH/9/1dlUM0cpr0VMtJLQkcBIjicihEIoC56agtTFS2hqipfa2oLWmliQkB6dcgggxc9Bemqj4uI8GzXx8/rfznfM7/M85H5FlGV16zeEkgscMtBwcw1gxwzPVSJFuoFTD1hXei22PrnEEPRhQg+luH0p0VgN4eMPuDQSJBsQyoCqeRTBEA/IV9NLzFw0Y0/YEAks0wD0JibI5+O2w8WABfBSqZ+FUJPHDa9jTDes8z/lmcf0EQv6rfVbsuwCAjSbzmxexVK4CAISItcrljvNwEX0E9wmUBThHsTaDZdPfHSaOwslsudmJ1yrTAXe9d6EKQYJO1WaM8S8YWyIyJIhNJ/1cZzUA5nh9etvBNyJBOvCaAJREfJZogze/xnk4dfuSXR3R7HnNRRF3cZFTwKghdgOjYGhAq6Jp+bso1Y1Z9MSibyMod6jW5OYYOhXpyFIAm4EoWahZzPHMoLoT+AWw03Tb2MPfFwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNSswMjowMKVohjEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTUrMDI6MDDUNT6NAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.agrosupdijon.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPDCCAiSgAwIBAgIVAKq49lG3raSwjkrERVPHfHMVz9+VMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMMFGF1dGguYWdyb3N1cGRpam9uLmZyMB4XDTE1MDUyMjEz
-MDU1NVoXDTM1MDUyMjEzMDU1NVowHzEdMBsGA1UEAwwUYXV0aC5hZ3Jvc3VwZGlq
-b24uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfLoc1hPSyzmBi
-OsF+FD0X0STSsTgkb/O6snYD0XYMCL/fIod0toT+Sm6GRW9V0Th1+Rr1cwhTbA8N
-OBO7GK0VPaVjPTQJQl9ARVbJomZB02JYEZoaM7kljX93ks2YltWPspYj4QUmrZ+F
-ZEVvyLUe1cgXoi+FqAL7W1fwlnIVWS/l1PgGtgywogf3iZ1PKDgXkSrxzPF351f+
-8yoW8GwV8gcvMoC4dF9CetUUNCDtb5Ej3BFhK5enUmVa9iXxIEUzMnoOkfgFYUUP
-51Sp3d2kxklOud8wCUXirc4qZJHHna+Sd66yOJ3tthdPpSw+PiXbmBJHS0tU1c6j
-z6jJCug9AgMBAAGjbzBtMB0GA1UdDgQWBBQf7A01K5koLAubh5dkYCv3xdJ+/DBM
-BgNVHREERTBDghRhdXRoLmFncm9zdXBkaWpvbi5mcoYraHR0cHM6Ly9hdXRoLmFn
-cm9zdXBkaWpvbi5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
-D0/A3QyU+qaPSKvU2ByQpEymBGxRcOSfiEo8e0aPjezXZJQZpvAV84VywhBh3gYk
-3u9gSzE2/y7O1DE9uP2P1jFbiukLi8bFWfkn0lqeCb/hE4c6G2N5FokFlUQARjDT
-yjQqoCaodMfnc+MbeQ+Sjbk+m9nDgXbk5Lz63Ih4Xh05P3+v+5MfA2Cz0Bod+FPj
-VCXWbl+XFGGNH+6HGftyvjOIaQdU8NfC4iAu8aU++hVp0VjBam7J4FBEJcJ1mZcj
-qNK2HQ5EWREscYoY0d5ZEqzMkAjv8qASYwEw7PfuMI5BjLZFN1YUfVfPj/PDdHLo
-N9V2eU0cIqGPFsM8IZF0pw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.agrosupdijon.fr/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.agrosupdijon.fr/idp/profile/SAML2/POST/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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.agrosupdijon.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.agrosupdijon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.agrosupdijon.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Agrosup DIJON INSSAAE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Agrosup DIJON INSSAAE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.agrosupdijon.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>hostmaster@agrosupdijon.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.asiaportal.info.xml b/swamid-interfederations-2.0/auth.asiaportal.info.xml
index 6d3cb360..80264681 100644
--- a/swamid-interfederations-2.0/auth.asiaportal.info.xml
+++ b/swamid-interfederations-2.0/auth.asiaportal.info.xml
@@ -1,50 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.asiaportal.info">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://auth.asiaportal.info">
   <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 xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T14:13:35Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.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>
+    <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">AsiaPortal: Databases and other resources provided by the Nordic Institute of Asian Studies</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Provides access to databases and other resources for Nias Nordic Council Member institutions</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://guide.asiaportal.info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://guide.asiaportal.info/privacypolicy/V1</mdui:PrivacyStatementURL>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at levere fjernadgang til licensbelagte databaser og ressourcer som er indkøbt som konsortiumlicens af NIAS Nordic Council.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to provide remote access to licence-restricted databases and resources purchased as consortium licences by the NIAS Nordic Council.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">AsiaPortal – NIAS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">AsiaPortal – NIAS</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>MIIFLjCCBBagAwIBAgIDD+tuMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTQwMTA0MjAzODE5WhcNMTcwMTA2MTkwMjI3WjCBwzEpMCcGA1UEBRMgRFZVbGd3OEVHZ2JNNXQyL2YxTDJTYmhPZ0IyNk5KU0wxEzARBgNVBAsTCkdUNzM3MjYxMzIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMR0wGwYDVQQDExRhdXRoLmFzaWFwb3J0YWwuaW5mbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZEUYMC613I+5ESmStfxRfbp4hY+PJgZDpA3EUZXiGI2o3/KfvD1xNZ9Y2Krmvhgc7pgDDc/0hp96XX1B3IFAfho4UOnmfoWVA18Kc7yzGr6we0DNvS3JVOP6zqdCp8EwBEoJ3/vJZfzwWbwf9uxVhGX+o83kujmmj1SaXPqho/ZaemP/MMOsYrhxPTdZIaHk0ma4R5M30BZ81oOkrN+9HYW2aUwO2rqcHfwWvSFNC4q7yUTn7JPdgePUUutovzpDFNJShcv3/m475NaPiaKUGkgr5QGHtBToP1YLpP+FMvPsYOrEUOXxyKVoXiZArn1mpuXfGDJP7YyaXrU5srPc8CAwEAAaOCAa8wggGrMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0RBBgwFoIUYXV0aC5hc2lhcG9ydGFsLmluZm8wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3JhcGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNzbC5jcmwwHQYDVR0OBBYEFEuuKoQbNk5gVHHaQe+MfHRBpQUpMAwGA1UdEwEB/wQCMAAweAYIKwYBBQUHAQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wtb2NzcC5nZW90cnVzdC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1c3QuY29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG+EUBBzYwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwczANBgkqhkiG9w0BAQUFAAOCAQEACJsMllEysDu7OSFPBBy0Jnnh4T561u35Lm+OR4J/skLU0L1qX9Kqne75hrIQxWO/t99spKb4gKeu/HIWYfHkSrac9ZsS4dKnjKym5XAszvdwJw4MRcMGcJApUGCCCbZZyoFq9Z5OIewZhkBKEKNRhzvdMqZcg8HWJeXVswWPGs1hgVufbCnn2lXMiNTTRqmZCvEb8l+44/GzeN1pP6mhwxmEOcr2MXhHV95v0xwihZw7a5nZRBH3HVeUDhKxgz4OqywsOttB+6YvFgVl67oFxh8Re4Ti03ckRMBirTHhOXMA1WiA6RRqp498rxth9D5sspjbNttxunfF5E6zn1f7uw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIFLjCCBBagAwIBAgIDD+tuMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTQwMTA0MjAzODE5WhcNMTcwMTA2MTkwMjI3WjCBwzEpMCcGA1UEBRMgRFZVbGd3OEVHZ2JNNXQyL2YxTDJTYmhPZ0IyNk5KU0wxEzARBgNVBAsTCkdUNzM3MjYxMzIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTQxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMR0wGwYDVQQDExRhdXRoLmFzaWFwb3J0YWwuaW5mbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZEUYMC613I+5ESmStfxRfbp4hY+PJgZDpA3EUZXiGI2o3/KfvD1xNZ9Y2Krmvhgc7pgDDc/0hp96XX1B3IFAfho4UOnmfoWVA18Kc7yzGr6we0DNvS3JVOP6zqdCp8EwBEoJ3/vJZfzwWbwf9uxVhGX+o83kujmmj1SaXPqho/ZaemP/MMOsYrhxPTdZIaHk0ma4R5M30BZ81oOkrN+9HYW2aUwO2rqcHfwWvSFNC4q7yUTn7JPdgePUUutovzpDFNJShcv3/m475NaPiaKUGkgr5QGHtBToP1YLpP+FMvPsYOrEUOXxyKVoXiZArn1mpuXfGDJP7YyaXrU5srPc8CAwEAAaOCAa8wggGrMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0RBBgwFoIUYXV0aC5hc2lhcG9ydGFsLmluZm8wQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3JhcGlkc3NsLWNybC5nZW90cnVzdC5jb20vY3Jscy9yYXBpZHNzbC5jcmwwHQYDVR0OBBYEFEuuKoQbNk5gVHHaQe+MfHRBpQUpMAwGA1UdEwEB/wQCMAAweAYIKwYBBQUHAQEEbDBqMC0GCCsGAQUFBzABhiFodHRwOi8vcmFwaWRzc2wtb2NzcC5nZW90cnVzdC5jb20wOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1c3QuY29tL3JhcGlkc3NsLmNydDBMBgNVHSAERTBDMEEGCmCGSAGG+EUBBzYwMzAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL2NwczANBgkqhkiG9w0BAQUFAAOCAQEACJsMllEysDu7OSFPBBy0Jnnh4T561u35Lm+OR4J/skLU0L1qX9Kqne75hrIQxWO/t99spKb4gKeu/HIWYfHkSrac9ZsS4dKnjKym5XAszvdwJw4MRcMGcJApUGCCCbZZyoFq9Z5OIewZhkBKEKNRhzvdMqZcg8HWJeXVswWPGs1hgVufbCnn2lXMiNTTRqmZCvEb8l+44/GzeN1pP6mhwxmEOcr2MXhHV95v0xwihZw7a5nZRBH3HVeUDhKxgz4OqywsOttB+6YvFgVl67oFxh8Re4Ti03ckRMBirTHhOXMA1WiA6RRqp498rxth9D5sspjbNttxunfF5E6zn1f7uw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">AsiaPortal Resources by Nordic Institute of Asian Studies</md:ServiceName>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+    <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://auth.asiaportal.info/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="da">AsiaPortal – NIAS</md:ServiceName>
+      <md:ServiceName xml:lang="en">AsiaPortal – NIAS</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at levere fjernadgang til licensbelagte databaser og ressourcer som er indkøbt som konsortiumlicens af NIAS Nordic Council.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to provide remote access to licence-restricted databases and resources purchased as consortium licences by the NIAS Nordic Council.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="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" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>mailto:bib@nias.ku.dk</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.aspirationtraining.com-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.aspirationtraining.com-idp-shibboleth.xml
deleted file mode 100644
index 96b2ee2a..00000000
--- a/swamid-interfederations-2.0/auth.aspirationtraining.com-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://auth.aspirationtraining.com/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Aspiration Training Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-09T17:13:45Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">aspirationtraining.com</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDejCCAmICCQDX1cojLXODTzANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
-						QjEXMBUGA1UECAwOV29yY2VzdGVyc2hpcmUxEzARBgNVBAcMCkJyb21zZ3JvdmUx
-						HDAaBgNVBAoME0FzcGlyYXRpb24gVHJhaW5pbmcxJDAiBgNVBAMMG2F1dGguYXNw
-						aXJhdGlvbnRyYWluaW5nLmNvbTAeFw0xMjEyMTgxMDA5NTNaFw0zMjEyMTMxMDA5
-						NTNaMH8xCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5Xb3JjZXN0ZXJzaGlyZTETMBEG
-						A1UEBwwKQnJvbXNncm92ZTEcMBoGA1UECgwTQXNwaXJhdGlvbiBUcmFpbmluZzEk
-						MCIGA1UEAwwbYXV0aC5hc3BpcmF0aW9udHJhaW5pbmcuY29tMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2NCaFs4yihlbWsPejTxurOzorKVniu++Hf64
-						2EQmqAEkw9eaHITpI47h+kJKP/Cm1kkdd1BheCcCGm66nJubzpIxTZ+HQxRzdG0/
-						EQ7ndwnvnun77iQ4FLI49i5NOYpqR26S5GBLwpPvuPSMPh1f4S09AkRDFlda1krb
-						qIhSxFLRT2kahKjiKCkTf5SOxmSponEwpnk+I+niPNT5HslNCjItKjTX9ykHZrnN
-						7+Rus9AlHV14jYrlZtLsN7wqvgXw+UC7RvbBTm/Wjsp06VUIBXs33bLTq0BfxCM/
-						uzoAfeFQlY67ariROz+KRCZR3P84V7bVT3KhI9BQjF6NY9t83wIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQAtVoxlBB777Ms2s5CGDSHFU4sSGih8KrLmnDly215yjrqv
-						sdFcnmehXE2tWd8MDZz6T+XGU6NwTPh7MJmPhghZA2smNEzCnrAV2w/G2oMKnepR
-						BdtDUBGPJ+ZCPoBRHBlFXlRcU4DO70eHDiEtSV/asAI4DTF358rjDMon2gmzM+dl
-						I916AQ8YHsISrO6ftTmjReZhBt3Q+TpFcPp98rC86O35HwAdDSXsEwuyO22rHgE2
-						NNvNPi4XVgdCvET15Z8/3sp6na0uWumk2S8Mvhzu4Sr65FbmUdUdXuabN+RO6teg
-						7ofaWoIudaTkckRrLtBv0iW2PfAl/Lene6U/UtCu
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.aspirationtraining.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.aspirationtraining.com: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://auth.aspirationtraining.com/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.aspirationtraining.com/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.aspirationtraining.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.aspirationtraining.com/idp/profile/SAML2/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">aspirationtraining.com</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDejCCAmICCQDX1cojLXODTzANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
-						QjEXMBUGA1UECAwOV29yY2VzdGVyc2hpcmUxEzARBgNVBAcMCkJyb21zZ3JvdmUx
-						HDAaBgNVBAoME0FzcGlyYXRpb24gVHJhaW5pbmcxJDAiBgNVBAMMG2F1dGguYXNw
-						aXJhdGlvbnRyYWluaW5nLmNvbTAeFw0xMjEyMTgxMDA5NTNaFw0zMjEyMTMxMDA5
-						NTNaMH8xCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5Xb3JjZXN0ZXJzaGlyZTETMBEG
-						A1UEBwwKQnJvbXNncm92ZTEcMBoGA1UECgwTQXNwaXJhdGlvbiBUcmFpbmluZzEk
-						MCIGA1UEAwwbYXV0aC5hc3BpcmF0aW9udHJhaW5pbmcuY29tMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2NCaFs4yihlbWsPejTxurOzorKVniu++Hf64
-						2EQmqAEkw9eaHITpI47h+kJKP/Cm1kkdd1BheCcCGm66nJubzpIxTZ+HQxRzdG0/
-						EQ7ndwnvnun77iQ4FLI49i5NOYpqR26S5GBLwpPvuPSMPh1f4S09AkRDFlda1krb
-						qIhSxFLRT2kahKjiKCkTf5SOxmSponEwpnk+I+niPNT5HslNCjItKjTX9ykHZrnN
-						7+Rus9AlHV14jYrlZtLsN7wqvgXw+UC7RvbBTm/Wjsp06VUIBXs33bLTq0BfxCM/
-						uzoAfeFQlY67ariROz+KRCZR3P84V7bVT3KhI9BQjF6NY9t83wIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQAtVoxlBB777Ms2s5CGDSHFU4sSGih8KrLmnDly215yjrqv
-						sdFcnmehXE2tWd8MDZz6T+XGU6NwTPh7MJmPhghZA2smNEzCnrAV2w/G2oMKnepR
-						BdtDUBGPJ+ZCPoBRHBlFXlRcU4DO70eHDiEtSV/asAI4DTF358rjDMon2gmzM+dl
-						I916AQ8YHsISrO6ftTmjReZhBt3Q+TpFcPp98rC86O35HwAdDSXsEwuyO22rHgE2
-						NNvNPi4XVgdCvET15Z8/3sp6na0uWumk2S8Mvhzu4Sr65FbmUdUdXuabN+RO6teg
-						7ofaWoIudaTkckRrLtBv0iW2PfAl/Lene6U/UtCu
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.aspirationtraining.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.aspirationtraining.com:8443/idp/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">Aspiration Training Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aspiration Training</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aspirationtraining.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Overt Software Solutions Support</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Overt Software Solutions Support</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.buckingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/auth.buckingham.ac.uk-shibboleth.xml
deleted file mode 100644
index 6f9fc015..00000000
--- a/swamid-interfederations-2.0/auth.buckingham.ac.uk-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://auth.buckingham.ac.uk/shibboleth">
-  <!--
-		This is an OpenAthens LA IdP for The University of Buckingham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-25T08:59:24Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">buckingham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIITuplxzadgNMwDQYJKoZIhvcNAQEFBQAwPzEdMBsGA1UE
-						CgwURWR1c2VydiBUZXN0IFNlcnZpY2UxHjAcBgNVBAMMFWF1dGguYnVja2luZ2hh
-						bS5hYy51azAeFw0xMjA4MjQxMDI1MzdaFw0yMjA4MjQxMDI1MzdaMD8xHTAbBgNV
-						BAoMFEVkdXNlcnYgVGVzdCBTZXJ2aWNlMR4wHAYDVQQDDBVhdXRoLmJ1Y2tpbmdo
-						YW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJnxt6TX6A
-						PmuM/I+rOnZ+Cx0P1DO1h+rlFmdtx9Sng8dd7OhmpYSlnk30NrZzKtWPXAVMYPHf
-						dgx70/z25svlFO/B02/eP+W3bJvxmLnDXTJ6vyam0I/6/vuXg8gcFyB8JlwjmQ/e
-						DQPRaEK/MXivjsmo+9Y0VL5dntmKUYgq1zzm/dfdGnJ+khczg2xeI+SUZGgRAwcy
-						T9KZfXmbF45RTCNDWIGQER7F8HzixesDHPemCavA6bbL/z9hpZqcoWeuXZi88Q3C
-						JoH66HvJnGJyYayl3eMdATWhbnUsYlcZTFQPYliy6hwhT+qfkxA+GLBkvpMVDqrG
-						nrirwFQjctWzAgMBAAGjUDBOMB0GA1UdDgQWBBSYtaC4R49myVJwK8kzCZGHAB74
-						DTAfBgNVHSMEGDAWgBSYtaC4R49myVJwK8kzCZGHAB74DTAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBQUAA4IBAQB6N8ifKsxb1zLu2QuOdIJwwuw2ycjvGUerLUqy
-						5LtnC4eCB302S9YUgprHSG7nlPuDYPv2dF45dudZahI7yo3/GyqeNgg12e0qpH/M
-						7S4aCOYfPEhU2MNjzfcRZBaBQaKhmPT66gCEZcDLFYUL9zB3EdlvhcLSJNvGG9ys
-						8WyvXEgs2IEnLh/SlEgXm2NRMSq1uONiUPRTE01r0n2wW4FHOnJTGtaWvfqCuNA5
-						0PAvY7F+1+HTZgtNnq5w1ms74QgsSj7Z7vgFohyDN4YjefZs/Zi+s22bmzN6yikc
-						dQIRgLcLkbamsq2LWs0Li52jrDapAHtHTxn2PsHVhIA+yIUG
-					</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>
-						MIIDUDCCAjigAwIBAgIITuplxzadgNMwDQYJKoZIhvcNAQEFBQAwPzEdMBsGA1UE
-						CgwURWR1c2VydiBUZXN0IFNlcnZpY2UxHjAcBgNVBAMMFWF1dGguYnVja2luZ2hh
-						bS5hYy51azAeFw0xMjA4MjQxMDI1MzdaFw0yMjA4MjQxMDI1MzdaMD8xHTAbBgNV
-						BAoMFEVkdXNlcnYgVGVzdCBTZXJ2aWNlMR4wHAYDVQQDDBVhdXRoLmJ1Y2tpbmdo
-						YW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJnxt6TX6A
-						PmuM/I+rOnZ+Cx0P1DO1h+rlFmdtx9Sng8dd7OhmpYSlnk30NrZzKtWPXAVMYPHf
-						dgx70/z25svlFO/B02/eP+W3bJvxmLnDXTJ6vyam0I/6/vuXg8gcFyB8JlwjmQ/e
-						DQPRaEK/MXivjsmo+9Y0VL5dntmKUYgq1zzm/dfdGnJ+khczg2xeI+SUZGgRAwcy
-						T9KZfXmbF45RTCNDWIGQER7F8HzixesDHPemCavA6bbL/z9hpZqcoWeuXZi88Q3C
-						JoH66HvJnGJyYayl3eMdATWhbnUsYlcZTFQPYliy6hwhT+qfkxA+GLBkvpMVDqrG
-						nrirwFQjctWzAgMBAAGjUDBOMB0GA1UdDgQWBBSYtaC4R49myVJwK8kzCZGHAB74
-						DTAfBgNVHSMEGDAWgBSYtaC4R49myVJwK8kzCZGHAB74DTAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBQUAA4IBAQB6N8ifKsxb1zLu2QuOdIJwwuw2ycjvGUerLUqy
-						5LtnC4eCB302S9YUgprHSG7nlPuDYPv2dF45dudZahI7yo3/GyqeNgg12e0qpH/M
-						7S4aCOYfPEhU2MNjzfcRZBaBQaKhmPT66gCEZcDLFYUL9zB3EdlvhcLSJNvGG9ys
-						8WyvXEgs2IEnLh/SlEgXm2NRMSq1uONiUPRTE01r0n2wW4FHOnJTGtaWvfqCuNA5
-						0PAvY7F+1+HTZgtNnq5w1ms74QgsSj7Z7vgFohyDN4YjefZs/Zi+s22bmzN6yikc
-						dQIRgLcLkbamsq2LWs0Li52jrDapAHtHTxn2PsHVhIA+yIUG
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.buckingham.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.buckingham.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Buckingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Buckingham</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.buckingham.ac.uk/about/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@buckingham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@buckingham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.centrale-marseille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.centrale-marseille.fr-idp-shibboleth.xml
deleted file mode 100644
index 001c198b..00000000
--- a/swamid-interfederations-2.0/auth.centrale-marseille.fr-idp-shibboleth.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://auth.centrale-marseille.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-03-18T19:08:09Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">centrale-marseille.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ecole Centrale de Marseille</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAOklEQVQoz2OM2vmMgRTARJLqAdSw1E1yqZvkADmJBc0lWLnRu55TyQa4SRCzkQ0eKE9jum0gnESyBgDIag8jNxmXrAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo1MyswMjowMELyvfEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NTMrMDI6MDAzrwVNAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">https://www.centrale-marseille.fr/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">centrale marseille's accounts</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Ecole Centrale de Marseille</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">comptes centrale marseille</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>
-					      MIIDVDCCAjygAwIBAgIVAIXPHZ3UF1uopseaVJtC6GfpVUo7MA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMMGmF1dGguY2VudHJhbGUtbWFyc2VpbGxlLmZyMB4XDTE1
-MDMxNjIwNTQyOFoXDTM1MDMxNjIwNTQyOFowJTEjMCEGA1UEAwwaYXV0aC5jZW50
-cmFsZS1tYXJzZWlsbGUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCIi4zEBXUYAS9Ti7HQojxfj7lHM1bCRoT8lgLALEWSwNTCVCkzQl+DS0FPDZ0v
-8a9FaT1HjfocwZ1XdwoDxDCrqQFwxRA30iM6/uuh9/0HVZCFhQK2/Ikn1Pj6MLIF
-F/pLQWYSdUJurfRjf3St97Rbaq9ONiMXyNR2l2WZEG49cg1DfGA5+lP+uU5F5zSs
-rUzrJpPuf4T2AQSnki++OeyGM1/tY4/NjswbSZlTzmPicFulrRXj4tNi7bOX6yzi
-JGb/ziQHVqDU4vQQcE1R6KOWZuGhvlZSzGZeh1J2WlaqgyH9IeeknriOFqw3LcOR
-tZV9FqbuYNOFw9/EIxBS79NtAgMBAAGjezB5MB0GA1UdDgQWBBSeGwSZ7BVXmyys
-YKVg8WZHfkxurDBYBgNVHREEUTBPghphdXRoLmNlbnRyYWxlLW1hcnNlaWxsZS5m
-coYxaHR0cHM6Ly9hdXRoLmNlbnRyYWxlLW1hcnNlaWxsZS5mci9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAMs7S8ihpctE3q4ALf/iKvFNEfDxEggwu
-Q7N4uEG5HWiBBlalVagxWnXf3pJDd4ol/S5evquXaqede0q4Fdc3dg29v/sI319R
-n2z8hBEohWeBs/o4LuIsfkyyvRJTT6JzJJIcoxYthk6vt5KOAKQD9Q1YWihw6mfr
-iLV1efef406mrFp+fI/wlk4gj+h35b0Y0lBIah8z09mo8rwiXwOQc9k6rOc5PQOQ
-x1SkY7gFvgEwa1vQqKLuP+nIdkl93oZKD7mqLSIbR6bB4DM4bzD0W1Qw1yPvTGgs
-c9UsyilhfC2LFkhv/O9OaTuk0Wy9R+P5q6J0ma7UyWfq8Rc1fxZZIA==
-					    </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-POST" Location="https://auth.centrale-marseille.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.centrale-marseille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.centrale-marseille.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Centrale de Marseille</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Centrale de Marseille</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.centrale-marseille.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>idp@centrale-marseille.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.chaminade.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.chaminade.edu-idp-shibboleth.xml
deleted file mode 100644
index 662102ba..00000000
--- a/swamid-interfederations-2.0/auth.chaminade.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,92 +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://auth.chaminade.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">chaminade.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Chaminade University of Honolulu</mdui:DisplayName>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.chaminade.edu/incommon/operational_practices.pdf</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>
-MIIDMzCCAhugAwIBAgIUF8kq+m9AYp9/mSs2qicSZwERtD4wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSYXV0aC5jaGFtaW5hZGUuZWR1MB4XDTEzMDQwNTIyNTgy
-MloXDTMzMDQwNTIyNTgyMlowHTEbMBkGA1UEAxMSYXV0aC5jaGFtaW5hZGUuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwEL73ATvDk+FNMOdqXPo
-TN96loqWp6Ju9CE5P4sn6rHQnehH/RWSkTQfPcVRhLbwDoUNEgUWyZs4OqEhJKKz
-U22UlSgdVw+2C0QHFgjTwk8z+8LTS2fkNd4lD8AWJgyQTrAgvUhjTr1zNLxKQLJ5
-yVPhAvLBQq4Sd7HSFUG1MlVYhTM3pIM1PGCPTkFCUxaPTYozo5GAcbMQoAx2wXkb
-VwYBcGBvjBnYK4CMfe/FQWnfk8KB25YURThqcyTF0JaM0w4uFDnz7ukt7Oyrkntb
-vSEOFEYFS9rfRoSs9ggVEHL5eUMwHgwGhxm3qn1iWM2yCU0MnXjdYNjeSXMerXgb
-SQIDAQABo2swaTBIBgNVHREEQTA/ghJhdXRoLmNoYW1pbmFkZS5lZHWGKWh0dHBz
-Oi8vYXV0aC5jaGFtaW5hZGUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQa
-ZqIx6w+PzJEFlWinc/8q5DQXzDANBgkqhkiG9w0BAQUFAAOCAQEAPz8G+GKqlLCY
-vB/3471AE0WtK8lybyHBQNUHbf2ZzBPa532jLvNScewLKgd8+F/Omi4y18VluYaW
-gJVjFQFle/8VJQKauWxBiWXzG4HoDmE+6wbHuq1zvLE0LLLu5svWFOrLbK1Fb++n
-9QM7xLQoy1slc9g8z5THorBJlgMFAFmL3TDIog3rSab69Gw+jwzrW5jglj+w8Iy9
-SUoYkOJ2T85hgO8Brj4OTk2+qpkK7TWDFTyUC2T4aBkMqtYG1Y2ir/kFdwAIjhSU
-reLbWrhl3hZhckCnXW5wiAxlY66PkbGk9rWHvZgbKyeLWgGl4apoL9QhBDefCRdx
-nnxOtnKJww==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.chaminade.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.chaminade.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.chaminade.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.chaminade.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.chaminade.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chaminade.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUF8kq+m9AYp9/mSs2qicSZwERtD4wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSYXV0aC5jaGFtaW5hZGUuZWR1MB4XDTEzMDQwNTIyNTgy
-MloXDTMzMDQwNTIyNTgyMlowHTEbMBkGA1UEAxMSYXV0aC5jaGFtaW5hZGUuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwEL73ATvDk+FNMOdqXPo
-TN96loqWp6Ju9CE5P4sn6rHQnehH/RWSkTQfPcVRhLbwDoUNEgUWyZs4OqEhJKKz
-U22UlSgdVw+2C0QHFgjTwk8z+8LTS2fkNd4lD8AWJgyQTrAgvUhjTr1zNLxKQLJ5
-yVPhAvLBQq4Sd7HSFUG1MlVYhTM3pIM1PGCPTkFCUxaPTYozo5GAcbMQoAx2wXkb
-VwYBcGBvjBnYK4CMfe/FQWnfk8KB25YURThqcyTF0JaM0w4uFDnz7ukt7Oyrkntb
-vSEOFEYFS9rfRoSs9ggVEHL5eUMwHgwGhxm3qn1iWM2yCU0MnXjdYNjeSXMerXgb
-SQIDAQABo2swaTBIBgNVHREEQTA/ghJhdXRoLmNoYW1pbmFkZS5lZHWGKWh0dHBz
-Oi8vYXV0aC5jaGFtaW5hZGUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQa
-ZqIx6w+PzJEFlWinc/8q5DQXzDANBgkqhkiG9w0BAQUFAAOCAQEAPz8G+GKqlLCY
-vB/3471AE0WtK8lybyHBQNUHbf2ZzBPa532jLvNScewLKgd8+F/Omi4y18VluYaW
-gJVjFQFle/8VJQKauWxBiWXzG4HoDmE+6wbHuq1zvLE0LLLu5svWFOrLbK1Fb++n
-9QM7xLQoy1slc9g8z5THorBJlgMFAFmL3TDIog3rSab69Gw+jwzrW5jglj+w8Iy9
-SUoYkOJ2T85hgO8Brj4OTk2+qpkK7TWDFTyUC2T4aBkMqtYG1Y2ir/kFdwAIjhSU
-reLbWrhl3hZhckCnXW5wiAxlY66PkbGk9rWHvZgbKyeLWgGl4apoL9QhBDefCRdx
-nnxOtnKJww==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.chaminade.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Chaminade University of Honolulu</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Chaminade University of Honolulu</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.chaminade.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kyle Johnson</md:GivenName>
-    <md:EmailAddress>kyle.johnson@chaminade.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml b/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml
deleted file mode 100644
index e34d7bb0..00000000
--- a/swamid-interfederations-2.0/auth.chimie-paristech.fr-idp-saml2-metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.chimie-paristech.fr/idp/saml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-05T11:03:17Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chimie-paristech.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 Paris</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.chimie-paristech.fr/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Fédération d'identité Chime-ParisTech</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure de Chimie Paris</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Fédération d'identité Chime-ParisTech</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>
-					      MIIC+TCCAeGgAwIBAgIJAJmcv9A/+nY6MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-BAMMCHdob2NhcmVzMB4XDTE1MDcyNzA5MjYzNFoXDTI1MDcyNDA5MjYzNFowEzER
-MA8GA1UEAwwId2hvY2FyZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDb9zK81GuZJ/4TX0AalLD46F8+lcmfXc3Y5ccE2ZctCXVmeRUcnHXIr4jFJRQ3
-8AJ/g8A8zcsTYuDbhAg7Yd2vqmSSGGf9EETNn45NluBhfdtVTOKTXYyv+aY2RZKV
-iqpWzz5i134rXXy61xLOcC0ci74K8PbwkfviMwYlnNNzFMBRIFOLTTFKgdDtjcE5
-Ie5oZPS4j5Tx0dYC3T2yhCWA7k0kc1VF/7Q9tF2+9msXHkGBMDOWoaKy6QKi6CHK
-viEFYBd5U2PpSWQhqmcIBzIelQ2J3XIcoeyg/85tnN/s0+ZsADjJmzsOFVtAMYqI
-Ry+75rqt+CLhs2RLXEFMkkTzAgMBAAGjUDBOMB0GA1UdDgQWBBRAoB5K4Z/Gm1zk
-WtY9P638mmAeGjAfBgNVHSMEGDAWgBRAoB5K4Z/Gm1zkWtY9P638mmAeGjAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAVYVLSftwjAw0CyOcH8QXxjQmm
-I/bQpPnAb6UDktX8zIqDfl3gZNa2oqMARcAgN/hBReqFpWQIUdsaJlePCxnWyxjP
-aF3rWvXt47VoAABO9C3CdB5IoP65+GPbTNUQG0xFvrKFg4/Dw0/LyGf1I92cLl17
-GwtPeH74WWUS3211Vj/I5sgWqxWn7fDCA6uaEUEvFXlM9IVEOFfNhH1X+uJInXvG
-ydZRy1PJDov/EFcatxt2v0DTIuqmtqTKi+luC1Zf5HdqV7d3EH76JeXcrvUGc8sa
-qyA+HoSIue07UW2+enWOYUPVdkGqJ2+aSWgdYiwY825Q+GWXN7qSuOwGIXeg
-					    </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>
-					      MIIC+TCCAeGgAwIBAgIJAMZ6vEXbndNaMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-BAMMCHdob2NhcmVzMB4XDTE1MDMyNDEzMTQzMFoXDTI1MDMyMTEzMTQzMFowEzER
-MA8GA1UEAwwId2hvY2FyZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDWk7SHWFBV5+TjxZtU1rIe9xGGVhLqaT7UWB+S0YnTgPBPNWSEUctMgUpBZh+X
-LFSmYR/wt/qIsZEfmfjdxNQBjyiieP6fh7eBdYHZ1y7EYJAwGThL5kGEUG5okgJl
-iMWUSvOs2I52cWwGl/u8tTv6JbFun+XE3hosxiPHtUcdZYCJdss4bbmJFR8F2nzz
-Gy6YTS6U5+DSreONEKXjLvcHCEkDzXwHdhEu/3Fn4Pv821HDRn3Qf1D+t/VUsp4k
-xeSKx1fbAlNutGwedvE+zzibI1h/9OQe+YjXlLh+rxRJqNbVXmTJ0M/wK0MnGvde
-I76K6F2jht/Oe86GKOUYUM/zAgMBAAGjUDBOMB0GA1UdDgQWBBR+GgMt/hMq5lnR
-ODKvRP4WL13oXzAfBgNVHSMEGDAWgBR+GgMt/hMq5lnRODKvRP4WL13oXzAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCTKC2uCURy2zt2YIOx3GrbYAnO
-xCtEiEC8QSsd3ImVUjVWFr2MlDD0DlRioWTJdE6YpGUM0r/614QDXV74CTz0RNpf
-01YkIhL5VgXxx4RmUz/3IdxDFvthw/lwJ/kUsvwuaj5LKtMpXGDSu0t4KHoM30os
-Fr5vPb+9jZ9eCB4dle9Dy1Ig89CMmv5y0II4m5kxY6pBvErWKi1kAfWoVbUVW2o0
-ZjlGleUJuyQavgQkOIyFg51+ltYLQ748tyZEJA6AFMTUNo3PEW5owRJkz1kUyPiv
-gfR+hAVdryNm7EwlyO/nkqxhil2SSwTWyZi7YLmScmmyefERLhWt3uEtxBep
-					    </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-POST" Location="https://auth.chimie-paristech.fr/idp/saml2/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.chimie-paristech.fr/idp/saml2/sso"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.chimie-paristech.fr/idp/saml2/sso"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Nationale Supérieure de Chimie Paris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure de Chimie Paris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.chimie-paristech.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>reseau@chimie-paristech.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.creighton.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.creighton.edu-idp-shibboleth.xml
deleted file mode 100644
index 8f44541c..00000000
--- a/swamid-interfederations-2.0/auth.creighton.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +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://auth.creighton.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">creighton.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Creighton University</mdui:DisplayName>
-        <mdui:Logo height="75" width="160" xml:lang="en">https://auth.creighton.edu/creighton-logo.gif</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>
-MIIDNDCCAhygAwIBAgIVALYutb/xiaSJQYhFEZztGzttPQiYMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmF1dGguY3JlaWdodG9uLmVkdTAeFw0xMDA4MDYxNjAx
-NTBaFw0zMDA4MDYxNjAxNTBaMB0xGzAZBgNVBAMTEmF1dGguY3JlaWdodG9uLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANhJqHK+SEJjfVTz2lmV
-g03xgDRh4jL0JLwACofJtdz0W9mr5fhRw8a2zXansvQoFP12E+UO2GahhPZCElcG
-L6zRZUfSlb0KcnP6JtBp45AtTeDiOZ0DJIsNwhYKL8JUsj+3UTO5Aol/CQi4CMAh
-vz5+LyurEWOQXOSRwZZ26Ou/HoLTevBS+wOdJ/ygRczZzy1GbXarHCfJRaomkqqC
-ZazBGwRaJ25phGqQczdGwS7KJNSwqrPbJ9F+3hlSMvf+rVk3ebgmiFO0SqePMDJX
-FYMsHc1vXFJ02/NP0G3zErPuy560oZL3Nt0Nd98uLT3tS1tlGWTy0UXRDqmBq9TV
-GxMCAwEAAaNrMGkwSAYDVR0RBEEwP4ISYXV0aC5jcmVpZ2h0b24uZWR1hilodHRw
-czovL2F1dGguY3JlaWdodG9uLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-W4FcvnGbLi/+v4v7EJbU6cQOhc4wDQYJKoZIhvcNAQEFBQADggEBAKu6nJ9/lEm6
-9/aGgFt4UVXLMf+ROxl5jX613BAZNDsCNdv5J7K5dtHZIifxtTuiw1cnWpPCM9ZP
-qaJmn+am9f60N6cDQOWIpWne7ItRlzcslfSG4u7vLWeIMmxasYJVSXceES8+HjXz
-zV0uTMTSncUUYeCA22RjoJarD+wMM5hkJ4pgXC85bLiDrCWNzSsWtDCmmBk+J+Zl
-YkxSHxmSoP7i5MikR+xIK5cL0GoN/5JeEvrUEpP/NPz8xWMjseoN5xqqQqyPwY0M
-B2t+c1HUlXTChLy6ntg0E/kSQxOSXpG9ymyxSfl6YDlPLY4uH1BxhvfmjIMo4VvA
-2x9R41E75LU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.creighton.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.creighton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.creighton.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.creighton.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.creighton.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.creighton.edu/idp/profile/SAML2/POST-SimpleSign/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">creighton.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVALYutb/xiaSJQYhFEZztGzttPQiYMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmF1dGguY3JlaWdodG9uLmVkdTAeFw0xMDA4MDYxNjAx
-NTBaFw0zMDA4MDYxNjAxNTBaMB0xGzAZBgNVBAMTEmF1dGguY3JlaWdodG9uLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANhJqHK+SEJjfVTz2lmV
-g03xgDRh4jL0JLwACofJtdz0W9mr5fhRw8a2zXansvQoFP12E+UO2GahhPZCElcG
-L6zRZUfSlb0KcnP6JtBp45AtTeDiOZ0DJIsNwhYKL8JUsj+3UTO5Aol/CQi4CMAh
-vz5+LyurEWOQXOSRwZZ26Ou/HoLTevBS+wOdJ/ygRczZzy1GbXarHCfJRaomkqqC
-ZazBGwRaJ25phGqQczdGwS7KJNSwqrPbJ9F+3hlSMvf+rVk3ebgmiFO0SqePMDJX
-FYMsHc1vXFJ02/NP0G3zErPuy560oZL3Nt0Nd98uLT3tS1tlGWTy0UXRDqmBq9TV
-GxMCAwEAAaNrMGkwSAYDVR0RBEEwP4ISYXV0aC5jcmVpZ2h0b24uZWR1hilodHRw
-czovL2F1dGguY3JlaWdodG9uLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-W4FcvnGbLi/+v4v7EJbU6cQOhc4wDQYJKoZIhvcNAQEFBQADggEBAKu6nJ9/lEm6
-9/aGgFt4UVXLMf+ROxl5jX613BAZNDsCNdv5J7K5dtHZIifxtTuiw1cnWpPCM9ZP
-qaJmn+am9f60N6cDQOWIpWne7ItRlzcslfSG4u7vLWeIMmxasYJVSXceES8+HjXz
-zV0uTMTSncUUYeCA22RjoJarD+wMM5hkJ4pgXC85bLiDrCWNzSsWtDCmmBk+J+Zl
-YkxSHxmSoP7i5MikR+xIK5cL0GoN/5JeEvrUEpP/NPz8xWMjseoN5xqqQqyPwY0M
-B2t+c1HUlXTChLy6ntg0E/kSQxOSXpG9ymyxSfl6YDlPLY4uH1BxhvfmjIMo4VvA
-2x9R41E75LU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.creighton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.creighton.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Creighton University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Creighton University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.creighton.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Bryan McLaughlin</md:GivenName>
-    <md:EmailAddress>bmclaughlin@creighton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Bryan McLaughlin</md:GivenName>
-    <md:EmailAddress>security_team@creighton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bryan McLaughlin</md:GivenName>
-    <md:EmailAddress>security_team@creighton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rajendra Adhikari</md:GivenName>
-    <md:EmailAddress>sysadmins@creighton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Rajendra Adhikari</md:GivenName>
-    <md:EmailAddress>sysadmins@creighton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Rajendra Adhikari</md:GivenName>
-    <md:EmailAddress>sysadmins@creighton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Bryan McLaughlin</md:GivenName>
-    <md:EmailAddress>security_team@creighton.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 fb31c35a..00000000
--- a/swamid-interfederations-2.0/auth.crous-versailles.fr-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://auth.crous-versailles.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Versailles - Personnels</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-versailles.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Versailles - Personnels</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>
-					      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>
-    </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-POST" Location="https://auth.crous-versailles.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.crous-versailles.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.crous-versailles.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Versailles - Personnels</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Versailles - Personnels</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-versailles.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>service.informatique@crous-versailles.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.cs.serialssolutions.com-auth-Metadata-Shib.xml b/swamid-interfederations-2.0/auth.cs.serialssolutions.com-auth-Metadata-Shib.xml
deleted file mode 100644
index aaef3013..00000000
--- a/swamid-interfederations-2.0/auth.cs.serialssolutions.com-auth-Metadata-Shib.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://auth.cs.serialssolutions.com/auth/Metadata/Shib">
-  <!--
-		This is a "Proquest: Serials Solutions" OpenAthens SP for Proquest Information and Learning Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-13T09:52: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>
-						MIIE6jCCA9KgAwIBAgIBYTANBgkqhkiG9w0BAQUFADCBmTEZMBcGA1UEAxMQY2Eu
-						c2Vyc29sLmlsLnBxZTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24x
-						EDAOBgNVBAcTB1NlYXR0bGUxGjAYBgNVBAoTEVNlcmlhbHMgU29sdXRpb25zMSww
-						KgYJKoZIhvcNAQkBFh1zeXNhZG1pbkBzZXJpYWxzc29sdXRpb25zLmNvbTAeFw0x
-						NTEyMTQxOTQ4MDRaFw0yNTEyMTExOTQ4MDRaMH0xCzAJBgNVBAYTAlVTMRMwEQYD
-						VQQIEwpXYXNoaW5ndG9uMRowGAYDVQQKExFTZXJpYWxzIFNvbHV0aW9uczEaMBgG
-						A1UECxMRU2VyaWFscyBTb2x1dGlvbnMxITAfBgNVBAMTGHd3dy5zZXJpYWxzc29s
-						dXRpb25zLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXI3irw
-						5x2XNZX0qFAq6lZ8up2BaMYZutz143sMwd0JumhUKxIQdh9fBftX41sBzf2lBkCr
-						r7FF1VY1HvZC+BUkvfOZ3WTRGI1fF1sb+jHLk9WnOxzHCPH5WDe+k7cfVWR9Qyus
-						AUxdS24FBnoQ50oFN20ZIDQio4PB4cEtwjpw35Eq+rMPh5F9MoT/jztYdkinjqgG
-						Mtlp7Xq6127Y0+zIfMsCkV+krebsM8NyfeqLCpF+RrS6mqPdepIjGUO9prisxPs6
-						oGPvOJ0QFgtJlSSwvUsycF50e0QW8LsWLahu01yqUqdjuvrhcWq6fGU5eb24c0ZR
-						VqoNuszweCWaWJUCAwEAAaOCAVYwggFSMAkGA1UdEwQCMAAwHQYDVR0OBBYEFD9j
-						bqBlLE60q9q0Ny+MyL3ocM1MMIHOBgNVHSMEgcYwgcOAFM6a5dP+xoQk5WQrLmhX
-						OTtK3m/2oYGfpIGcMIGZMRkwFwYDVQQDExBjYS5zZXJzb2wuaWwucHFlMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHU2VhdHRsZTEa
-						MBgGA1UEChMRU2VyaWFscyBTb2x1dGlvbnMxLDAqBgkqhkiG9w0BCQEWHXN5c2Fk
-						bWluQHNlcmlhbHNzb2x1dGlvbnMuY29tggkAqUN/3ndOaXYwLwYJYIZIAYb4QgEE
-						BCIWIGh0dHBzOi8vY2Euc2Vyc29sLmxpYi9jYS1jcmwucGVtMCQGCWCGSAGG+EIB
-						AgQXFhVodHRwczovL2NhLnNlcnNvbC5saWIwDQYJKoZIhvcNAQEFBQADggEBAL7y
-						zTLEdGWib+7jzqJMWSsGpY3CE0J01Jup1ocmM2CWuM/4F0rLLmIJLBX/+xrg6/S1
-						d7drjCLn6GRBSMoEr0x1YiZ4s/tf04tJDoi5rXmsT/mDVBH3J134EHip60gyVcP9
-						Y2JcGXgN416b85TD3EMQXjuk1coL+ZLWrLEOSQuJEUStIfsgNhMmqKIr19IAKV7F
-						LHDgBkRjrbdJl31EwY22TPz/X4+ml68XJ0MaKwo0MyY/axP18l5V9DkAOm3eKwD5
-						DCYU4BH7Nom0gvAZX/Dswf8YMlWiLcDudPKONE/7aw6xXoFH6xFFw88tR3SI/GRu
-						sAoG/rolb644xG2ty14=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.serialssolutions.com/sso/auth/CS/rcv/saml1" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.serialssolutions.com/sso/auth/CS/rcv/saml1" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.cs.serialssolutions.com/auth/rcv" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.cs.serialssolutions.com/auth/rcv" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Proquest Information and Learning Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Proquest: Serials Solutions</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.serialssolutions.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Customer Care</GivenName>
-    <EmailAddress>mailto:clients@serialssolutions.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kip</GivenName>
-    <SurName>Keeney</SurName>
-    <EmailAddress>mailto:Kip.Keeney@proquest.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.cs.serialssolutions.com.xml b/swamid-interfederations-2.0/auth.cs.serialssolutions.com.xml
deleted file mode 100644
index da3044c2..00000000
--- a/swamid-interfederations-2.0/auth.cs.serialssolutions.com.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.cs.serialssolutions.com/auth/Metadata/Shib">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.serialssolutions.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.serialssolutions.com,OU=Serials Solutions,O=Serials Solutions,L=Seattle,ST=WA,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDjDCCAnSgAwIBAgIETQA4czANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMRowGAYDVQQKExFTZXJp
-YWxzIFNvbHV0aW9uczEaMBgGA1UECxMRU2VyaWFscyBTb2x1dGlvbnMxITAfBgNV
-BAMTGHd3dy5zZXJpYWxzc29sdXRpb25zLmNvbTAeFw0xMDEyMDkwMjAxMjNaFw0x
-NjAxMDcwMjAxMjNaMIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNV
-BAcTB1NlYXR0bGUxGjAYBgNVBAoTEVNlcmlhbHMgU29sdXRpb25zMRowGAYDVQQL
-ExFTZXJpYWxzIFNvbHV0aW9uczEhMB8GA1UEAxMYd3d3LnNlcmlhbHNzb2x1dGlv
-bnMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2cevLb70/ZI
-7URgp+Rgz9KOHtJRg4W9ucFm91fvfoaww9tBBQ8GXEgq3wO3pmPYE4+bdA04xIW3
-sQgmB9UQe1sPVOhffUhHm/+MBzddIZ1WYg1lLOl3CQ/2J5Uak+/3hV8Z+ppbV0tx
-HBtqSrd+aaSrVftWKqoF5+gSmMi2ckuUGTrq9B8etqALhZoU4K2CFYhjrVK2vwaS
-sjT3+AXlO2m7PmE4xC+2jXjp33uxMbhwfjY7XgpK06h8tQQXCH7GPRbYLjSPWFw3
-IHQFm46bk4uyzDsJemjLcaGaazmbWwdMZhoWydGHphbO9Jw2so1Ht2ABOcfj3TpU
-GIKW9dmQ6QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB699XlVrbgegSecfHkxdwK
-J+7N2N5vqvAcOhoBEU1UAqIuuQF3lCpDot8QNfhxRHc3sxUh4OfqUDWcdD1rxavP
-7LzrCu9hJFli2pzNWOMle/AyAfbVRT3tDSmjqOlyrJs/G50PQV9QJyJxLvXJHg0P
-RQiV5GjOtMlE9fsVY5FIpoXTOJwP2yDvE5HF2QO4gEhKrNZvmXJ6X60NryxIApD2
-nQQ5159Bha3+D9szK4wwaGQ04ry+UW0j9C7xbhDCc/Kkd5JCqzvLqFp73F6Ma6nK
-32buuHZ/UERHs77NrmCGrS7i3oJppxFoakb9bfWEFMrbD7ZUV9DtoTDZFtFkR9jb
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.serialssolutions.com/sso/auth/CS/rcv/saml1" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.serialssolutions.com/sso/auth/CS/rcv/saml1" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Proquest Information and Learning Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ProQuest: Serials Solutions</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.serialssolutions.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Fujita-Yuhas</SurName>
-    <EmailAddress>Tim.Fujita-Yuhas@SerialsSolutions.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/auth.dariah.eu-shibboleth.xml
deleted file mode 100644
index 089c4b4e..00000000
--- a/swamid-interfederations-2.0/auth.dariah.eu-shibboleth.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.dariah.eu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-07-31T06:57:48Z">
-      <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:AttributeValue>http://refeds.org/category/research-and-scholarship</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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://auth.dariah.eu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DARIAH Self Service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DARIAH Self Service</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Verwaltung von DARIAH-Benutzerdaten Registrierung für DARIAH Services</mdui:Description>
-        <mdui:Description xml:lang="en">DARIAH user data management and registration 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="de">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>auth.dariah.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=auth.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGDjCCBPagAwIBAgIHGFSphGu/5zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDEwMDgxMjIwMDVaFw0xOTA3MDky
-MzU5MDBaMIGCMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRcwFQYDVQQDEw5hdXRoLmRhcmlhaC5ldTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANk/Hdv+RUK1bWw3xexSis10w4yC
-TkVez0Jq40TbiF4RSNZ+dE4P0+/Kvlm6kN/iJyxDJ/c1ZNPDBn7iDFwRCWPVx3IF
-QNJE/EkOucCbIqBAOBdZoyChn1OtK78c1oIVuVUxpSgkrdvTeFfWTJTADkaLCA/q
-t+k1v0W2W1nvLGnTlaHpyUmUDXss4ubeTTMg1AvoBorxJkrvGKO9BHH2mLV1jpOt
-68tojuVUOZ91+1TwqkM3gp2nT3v6Fh3lKgd3QrP+ODhqsuPViW7RGyKujtjbBvNd
-RShvTFi6oSl2hKvn7hevy7vCYsYoQ6Jdzp5P0ZwSi4mLNfJ1a2BOv1uh0ZcCAwEA
-AaOCAlkwggJVME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQB
-ga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAdBgNVHQ4EFgQUo4dEl7xc0QyDNe70xOIt3munlrIwHwYDVR0jBBgwFoAUHb1z
-zG3ubhx0cNmjGzq6qCfevOswGQYDVR0RBBIwEIIOYXV0aC5kYXJpYWguZXUwgY8G
-A1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29l
-dHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB
-3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5k
-Zm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0
-aW5nZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IB
-AQBxZ/OEFKc5+7YkF8fPzhyWAaeWeG614E4wm3MmT9go4tsxff0adtr5cnb3fC8L
-BI7pBxqMlIIr0M4xkDkT3JlXyY1Kftz+wzNSSRr7+k3U+6/rJjN4x6DpP1ZRXZGf
-MWcgq74X8KrDkSFG+zrMZGQIxE8PhuE3maLgBTeQ/aFJgKdGnRDLpiQgZ9BRhUT9
-69oGlkmJS2PLDwi2mMHLOegp1lklQxwLTj9XXRsb+bWTboeZpT3PQupBuSgBEbRb
-fT9iDrD0x+GZweFkC8bKJtP4BGIbs11tE+cdbxmH0yoEnHevs0z/AbPxPYR/4kj9
-keb+gnNfYWJuJWwjSHeUJ3vL
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.dariah.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
-    <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://auth.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.dariah.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">DARIAH Self Service</md:ServiceName>
-      <md:ServiceName xml:lang="en">DARIAH Self Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Verwaltung von DARIAH-Benutzerdaten Registrierung für DARIAH Services</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">DARIAH user data management and registration for DARIAH Services</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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md: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="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="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Haase</md:SurName>
-    <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Dariah</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml
deleted file mode 100644
index a0e5dc4f..00000000
--- a/swamid-interfederations-2.0/auth.digitaltheatreplus.com.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.digitaltheatreplus.com">
-  <!--
-		This is a "Digital Theatre Plus" Shibboleth SP for Digital Theatre.com 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-07-08T10:45:02Z"/>
-  </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://auth.digitaltheatreplus.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://auth.digitaltheatreplus.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="60" width="104">https://www.digitaltheatreplus.com/sites/all/themes/digitaltheatreplus/images/logo.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">Digital Theatre Plus</mdui:DisplayName>
-        <mdui:Description xml:lang="en">At the heart of Digital Theatre Plus is the ethos to
-					share the best of British theatre with teachers and students all over the
-					world.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIJAIF+/2SALpqQMA0GCSqGSIb3DQEBBQUAMDcxNTAzBgNV
-						BAMTLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFs
-						MB4XDTE1MDMwNTE2NTAzM1oXDTI1MDMwMjE2NTAzM1owNzE1MDMGA1UEAxMsaXAt
-						MTAtMjEwLTEzMC0xODUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWwwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUhOG8fAf1z+P4MxfipVuLI7gGaTbn
-						XRjaqUcvn3q2RfG7uFflGdgTNPESECxFlRhQB9t8r6kP73HpmlDWAb1cK0iTfbVX
-						YzKQRZJZuYyk6dTR8Q+ipKA9VwzWCQC4HtFUxrGJJPqUesLUSxmPjwsjQzOdQPVQ
-						jB17OYwNSi5lCehWi6kyRpBNmPbB9Vjvx0PtaEe9OFoFOz93hBT6E7rnK6WJ1OSx
-						ATS6uWOtIwJIBfc1gCtX3L0OLFIEjBXTfoUDhfOJg/VTdudTVDbdy9sI/y9oa1CM
-						oV5dmFGEmNiCJ+WyVnt0ItkoQ9j1ZT+bw/FVJXFTRSDhDL9NlNsdFz03AgMBAAGj
-						WjBYMDcGA1UdEQQwMC6CLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21w
-						dXRlLmludGVybmFsMB0GA1UdDgQWBBSfagScxn6u6P0+nvmQwcSLk2XrdDANBgkq
-						hkiG9w0BAQUFAAOCAQEAlfdHL72URS71sqrZUfUiUWKHcJU1cfkO2Ekl/zhgRPrS
-						7FgP1HUYc9mRbceXJYqq38SSKDPANt3dIj+qeauUh7CNDSTm8pPmjrTaGYZCmOvV
-						STobyosM7a+CJgZvE9Ys7tVlsbainrET0agTjUWOUE3LOvBgUqPUkbbE8QIgmRa2
-						62dtMf95WBmt6OJkXmLcBwUVK+1NsOfGN4cg6ekrKqNU4+FobK6Vet2jY6cfLWET
-						fYj5FNoRpffRMQ9+MNEm/aK+SFpy1nXtc1XtD1sEqtnLGiIQMUhgEtvnas82T1f1
-						rxodZ8fzQWvmeZ7qOiheeiTxu5Fwylj1xVBJ7suMMQ==
-					</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://auth.digitaltheatreplus.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.digitaltheatreplus.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Digital Theatre.com Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Theatre Plus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.digitaltheatreplus.com/about-us</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Ware</SurName>
-    <EmailAddress>mailto:support@digitaltheatre.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Carly</GivenName>
-    <SurName>Britton</SurName>
-    <EmailAddress>mailto:support@vualto.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.galegroup.com-shibboleth.xml b/swamid-interfederations-2.0/auth.galegroup.com-shibboleth.xml
deleted file mode 100644
index 3dcb80cd..00000000
--- a/swamid-interfederations-2.0/auth.galegroup.com-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.galegroup.com/shibboleth">
-  <!--
-		This is a "Gale Databases from Cengage Learning" Shibboleth SP for Cengage Learning Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="1" 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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIJAJeid8J1f6CuMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHNoaWJib2xldGguZ2FsZWdyb3VwLmNvbTAeFw0xMjAzMTIxNzMwMjNaFw0z
-						MjAzMDcxNzMwMjNaMCMxITAfBgNVBAMTGHNoaWJib2xldGguZ2FsZWdyb3VwLmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2Qn+1FW/n+4ZZGA0lv
-						z9F+I5FdDnX35oD5M7JuN6cbprWA4F8EHir6bYAuvU5lK0knO4w56aiH0uhbWXu1
-						SlUlxSbAIaJombApnC5AtCJ6WFOs+NaTi/gFlAyIh7w169ZhwfsLjQE/hkdplpWT
-						xjFUNpt12ZyU8LL1yEJmfkeBUN3oK2fa7Qe+oqnyY0eOHHTKVO9IIr9/SvzdhoA0
-						c8a2kXy4qM2T+qKGi7SGz3/Qhwpial3ZDGqeZ3m25n57h3I7BhxVSJGzzbSeOcib
-						jbWRk5VjYalmG0V+XGjEJtN4oUdAgnkvJMj+yOQ8IXzDws4OR+KWGYl5lEAijXce
-						qNcCAwEAAaOBhTCBgjAdBgNVHQ4EFgQUC3bQ/Jx1yAhQgWVLRtPePx/ipxYwUwYD
-						VR0jBEwwSoAUC3bQ/Jx1yAhQgWVLRtPePx/ipxahJ6QlMCMxITAfBgNVBAMTGHNo
-						aWJib2xldGguZ2FsZWdyb3VwLmNvbYIJAJeid8J1f6CuMAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQEFBQADggEBABAvL5eepD3fliAIefJ/4pDBxKBcCynRXLlmUWir
-						1majii1tK0WEbDdF1a24njlftvCVDNDrrfdhu1rvXZ3UhyyiOS7fBpBvRPjCmzlf
-						DdvGiMuar/T+uNzbiNqcLsVeKvwZJfzMt9Y1T7MXDABez8BD3CkdFt05j+hPK0t5
-						3PLIZfOir72LoRAtXmilZs4ZAvvTL/BTTxYn4t165Vp5yBRPCLrdSAMIdTIENBZ7
-						/tapXMzigHNS/YoxpEmtKkUrnkBm3nrWeF0Z6sqYEz49xS6NdnKLTSVQHyJ413LZ
-						WQSvXs7RDm/214HIimD/TkaDp1Yv0Yk2iQAeO7fucXAIAv4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gada.oh.gale.com:8445/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.dev.ggtest.com/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.qa.gghybrid.com/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.galeext.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.galegroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.qa.gghybrid.com/Shibboleth.sso/SAML2/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.galegroup.com/Shibboleth.sso/SAML2/POST" index="7"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cengage Learning Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Gale Databases from Cengage Learning</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cengage.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Joe</GivenName>
-    <SurName>Mathews</SurName>
-    <EmailAddress>mailto:Joe.Mathews@cengage.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Selva</GivenName>
-    <SurName>Rengarajan</SurName>
-    <EmailAddress>mailto:Selva.Kumar@cengage.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.galegroup.com.xml b/swamid-interfederations-2.0/auth.galegroup.com.xml
deleted file mode 100644
index ef555243..00000000
--- a/swamid-interfederations-2.0/auth.galegroup.com.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.galegroup.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.galegroup.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.galegroup.com,O=Cengage Learning\, Inc.,OU=Gale,L=Farmington Hills,ST=Michigan,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEcjCCA1qgAwIBAgILAQAAAAABIhnUw+swDQYJKoZIhvcNAQEFBQAwajEjMCEG
-A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
-bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
-b24gQ0EwHhcNMDkwNjI1MjMwNzQ3WhcNMTIwNjI1MjMwNzQzWjCBjjELMAkGA1UE
-BhMCVVMxETAPBgNVBAgTCE1pY2hpZ2FuMRkwFwYDVQQHExBGYXJtaW5ndG9uIEhp
-bGxzMQ0wCwYDVQQLEwRHYWxlMR8wHQYDVQQKExZDZW5nYWdlIExlYXJuaW5nLCBJ
-bmMuMSEwHwYDVQQDExhzaGliYm9sZXRoLmdhbGVncm91cC5jb20wgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBAJurlIZ5y5TusQdA5zOkmjK9/CgQU2uAnbw74Htp
-7upEsG6QqgZZntYeXvjJtzzIYSxqTwH+U5eCKByVF9QD44V18RnUWzYM97pqtJSR
-9epFzmIud/1bUu5IXfZr6j6m6I/nZAIXNjw1Rk0nFzC5D4/Sn31Sbwf148YQY4Pg
-qSfjAgMBAAGjggF2MIIBcjAfBgNVHSMEGDAWgBR9bSrsZqunUTarAmnxcI/EWQua
-HzBJBggrBgEFBQcBAQQ9MDswOQYIKwYBBQUHMAKGLWh0dHA6Ly9zZWN1cmUuZ2xv
-YmFsc2lnbi5uZXQvY2FjZXJ0L29yZ3YxLmNydDA/BgNVHR8EODA2MDSgMqAwhi5o
-dHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L09yZ2FuaXphdGlvblZhbDEuY3JsMB0G
-A1UdDgQWBBQuxxlvAJHyCXjksxkjTIluCR81HjAJBgNVHRMEAjAAMA4GA1UdDwEB
-/wQEAwIFoDApBgNVHSUEIjAgBggrBgEFBQcDAQYIKwYBBQUHAwIGCisGAQQBgjcK
-AwMwSwYDVR0gBEQwQjBABgkrBgEEAaAyARQwMzAxBggrBgEFBQcCARYlaHR0cDov
-L3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5LzARBglghkgBhvhCAQEEBAMC
-BsAwDQYJKoZIhvcNAQEFBQADggEBAJKFBkqybwXaw/R8xW2ylMVzRvst9i9PBTyr
-wUlQ3au4DDm8NzVEBump3DGJi11x+wGsBBmoMd4dYeT7Gyh+9IuNSXqn9rH9RqoN
-rB0CXHDHuroKnLBLL83v1izwFtJxXcUP6hH6O9FijasA/OG58qQqGtPx+pGTbOld
-sMf7wLcaxGHkX2ewCItl1sFC2k0P5SxhT3PFfW72U9qebLXqrqUSfpqiVfr8q8mw
-BLGO4ir7pnEil8/qGg37fTz5CJbshEKtOyY7iPEB1vdX3PwT+df6EAReyUagWbss
-s1OLZFlIbf64xtG5rGBx5ZMl4cuHcBBbahQFg+YQeERgUNL2aQg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.galegroup.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.galegroup.com,O=Cengage Learning\, Inc.,OU=Gale,L=Farmington Hills,ST=Michigan,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEcjCCA1qgAwIBAgILAQAAAAABIhnUw+swDQYJKoZIhvcNAQEFBQAwajEjMCEG
-A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
-bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
-b24gQ0EwHhcNMDkwNjI1MjMwNzQ3WhcNMTIwNjI1MjMwNzQzWjCBjjELMAkGA1UE
-BhMCVVMxETAPBgNVBAgTCE1pY2hpZ2FuMRkwFwYDVQQHExBGYXJtaW5ndG9uIEhp
-bGxzMQ0wCwYDVQQLEwRHYWxlMR8wHQYDVQQKExZDZW5nYWdlIExlYXJuaW5nLCBJ
-bmMuMSEwHwYDVQQDExhzaGliYm9sZXRoLmdhbGVncm91cC5jb20wgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBAJurlIZ5y5TusQdA5zOkmjK9/CgQU2uAnbw74Htp
-7upEsG6QqgZZntYeXvjJtzzIYSxqTwH+U5eCKByVF9QD44V18RnUWzYM97pqtJSR
-9epFzmIud/1bUu5IXfZr6j6m6I/nZAIXNjw1Rk0nFzC5D4/Sn31Sbwf148YQY4Pg
-qSfjAgMBAAGjggF2MIIBcjAfBgNVHSMEGDAWgBR9bSrsZqunUTarAmnxcI/EWQua
-HzBJBggrBgEFBQcBAQQ9MDswOQYIKwYBBQUHMAKGLWh0dHA6Ly9zZWN1cmUuZ2xv
-YmFsc2lnbi5uZXQvY2FjZXJ0L29yZ3YxLmNydDA/BgNVHR8EODA2MDSgMqAwhi5o
-dHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L09yZ2FuaXphdGlvblZhbDEuY3JsMB0G
-A1UdDgQWBBQuxxlvAJHyCXjksxkjTIluCR81HjAJBgNVHRMEAjAAMA4GA1UdDwEB
-/wQEAwIFoDApBgNVHSUEIjAgBggrBgEFBQcDAQYIKwYBBQUHAwIGCisGAQQBgjcK
-AwMwSwYDVR0gBEQwQjBABgkrBgEEAaAyARQwMzAxBggrBgEFBQcCARYlaHR0cDov
-L3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5LzARBglghkgBhvhCAQEEBAMC
-BsAwDQYJKoZIhvcNAQEFBQADggEBAJKFBkqybwXaw/R8xW2ylMVzRvst9i9PBTyr
-wUlQ3au4DDm8NzVEBump3DGJi11x+wGsBBmoMd4dYeT7Gyh+9IuNSXqn9rH9RqoN
-rB0CXHDHuroKnLBLL83v1izwFtJxXcUP6hH6O9FijasA/OG58qQqGtPx+pGTbOld
-sMf7wLcaxGHkX2ewCItl1sFC2k0P5SxhT3PFfW72U9qebLXqrqUSfpqiVfr8q8mw
-BLGO4ir7pnEil8/qGg37fTz5CJbshEKtOyY7iPEB1vdX3PwT+df6EAReyUagWbss
-s1OLZFlIbf64xtG5rGBx5ZMl4cuHcBBbahQFg+YQeERgUNL2aQg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.qa.ggtest.com/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.galedemo.com/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.galegroup.com/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gada.oh.gale.com:8445/Shibboleth.sso/SAML/POST" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Cengage Learning Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gale Databases from Cengage Learning</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.cengage.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jayashree</GivenName>
-    <SurName>Ravi</SurName>
-    <EmailAddress>jayashree.ravi@cengage.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gary</GivenName>
-    <SurName>Pollack</SurName>
-    <EmailAddress>gary.pollack@cengage.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Marx</SurName>
-    <EmailAddress>john.marx@cengage.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.greenqloud.com-wayf-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/auth.greenqloud.com-wayf-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 6aef7f7c..00000000
--- a/swamid-interfederations-2.0/auth.greenqloud.com-wayf-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.greenqloud.com/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.surfconext.nl/" registrationInstant="2014-03-06T18:36:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.greenqloud.com/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://auth.greenqloud.com/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://auth.greenqloud.com/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://auth.greenqloud.com/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://auth.greenqloud.com/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://auth.greenqloud.com/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>greenqloud</md:GivenName>
-    <md:SurName>backoffice</md:SurName>
-    <md:EmailAddress>backoffice@greenqloud.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.howcloud.co.uk-saml-metadata.php.xml b/swamid-interfederations-2.0/auth.howcloud.co.uk-saml-metadata.php.xml
deleted file mode 100644
index 0be5a3af..00000000
--- a/swamid-interfederations-2.0/auth.howcloud.co.uk-saml-metadata.php.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.howcloud.co.uk/saml/metadata.php">
-  <!--
-		This is a custom php-saml SP for HowCloud Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-12T16:48:46Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" 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">HowCloud</mdui:DisplayName>
-        <mdui:Logo height="54" width="78">https://www.howcloud.net/img/logo-shaded-2x.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID7zCCAtegAwIBAgIJANEl9lXQvmZ+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
-						VQQGEwJVSzEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMREwDwYD
-						VQQKDAhIb3dDbG91ZDERMA8GA1UECwwISG93Q2xvdWQxETAPBgNVBAMMCEhvd0Ns
-						b3VkMSIwIAYJKoZIhvcNAQkBFhNhdXRoQGhvd2Nsb3VkLmNvLnVrMB4XDTE0MDky
-						NDEzMzIxNFoXDTE1MDkyNDEzMzIxNFowgY0xCzAJBgNVBAYTAlVLMRAwDgYDVQQI
-						DAdFbmdsYW5kMQ8wDQYDVQQHDAZMb25kb24xETAPBgNVBAoMCEhvd0Nsb3VkMREw
-						DwYDVQQLDAhIb3dDbG91ZDERMA8GA1UEAwwISG93Q2xvdWQxIjAgBgkqhkiG9w0B
-						CQEWE2F1dGhAaG93Y2xvdWQuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDp9Be3I4VxIUpZWTDhZn5oLaN0592SXJ/hEWOC8BsxtwObJNiSxrR2
-						k7pOLZlCYCwMJmvE5gI0lWZ+fPNsxHyxTrdnsiTVUZEgp2T8iA/HayZwGuTAZagF
-						WKcNL7AUH2kH8biiGxLK+8r9i58P5JEvLfl2RymNIdANIWSsuArCNIsVjgDXhyPF
-						7e3tYlyWxeIsm889P9XwG7SmFTg3Z06mO9AriW25hyUqiBmkohJcU/pVo3GJQwJ9
-						gIly786ROmEH7Z8bvu0WYreLK5qIbS8MHEeLvmTcqxjKbwl4HlCxw00fH/4vhJVd
-						XzHfVmyS9MdN0WCjdI0iymtOwM0htBo9AgMBAAGjUDBOMB0GA1UdDgQWBBT9nTDT
-						JHcrp9AURl4d0/HhVKwobTAfBgNVHSMEGDAWgBT9nTDTJHcrp9AURl4d0/HhVKwo
-						bTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCFEGU0hc5EiO4l7S0D
-						LY1QOaWTu1NO8yoWWjUKmMMq0jcHXbtQ05odL+3kVesi7/U/3D+58Y+DKBPetdkv
-						LvYmxf+b8MSsXR4BiQLUfeK7S5PcGUQePDHZ4DZc5inS0zJWccqyIMg3xP50bpG/
-						BACg/fD2qPZnZIJSI7VsrISV0qOqtBpGGZoJ7QunspZrPBB/of+9TN9eE6LkDnBf
-						Q8hP3jEVonM1IyECSQmuRxiqwEcv8Gxy39jlyMwoOOuR3jF0TLRLtYvtLk9Dl+i+
-						TFt0BBs42f813qt54IPnbPBED3gLilzcATo6VKILvL4Kn0dYeDXm3hf/3ZfMyVKv
-						0g3I
-					</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>
-						MIID7zCCAtegAwIBAgIJANEl9lXQvmZ+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
-						VQQGEwJVSzEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMREwDwYD
-						VQQKDAhIb3dDbG91ZDERMA8GA1UECwwISG93Q2xvdWQxETAPBgNVBAMMCEhvd0Ns
-						b3VkMSIwIAYJKoZIhvcNAQkBFhNhdXRoQGhvd2Nsb3VkLmNvLnVrMB4XDTE0MDky
-						NDEzMzIxNFoXDTE1MDkyNDEzMzIxNFowgY0xCzAJBgNVBAYTAlVLMRAwDgYDVQQI
-						DAdFbmdsYW5kMQ8wDQYDVQQHDAZMb25kb24xETAPBgNVBAoMCEhvd0Nsb3VkMREw
-						DwYDVQQLDAhIb3dDbG91ZDERMA8GA1UEAwwISG93Q2xvdWQxIjAgBgkqhkiG9w0B
-						CQEWE2F1dGhAaG93Y2xvdWQuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDp9Be3I4VxIUpZWTDhZn5oLaN0592SXJ/hEWOC8BsxtwObJNiSxrR2
-						k7pOLZlCYCwMJmvE5gI0lWZ+fPNsxHyxTrdnsiTVUZEgp2T8iA/HayZwGuTAZagF
-						WKcNL7AUH2kH8biiGxLK+8r9i58P5JEvLfl2RymNIdANIWSsuArCNIsVjgDXhyPF
-						7e3tYlyWxeIsm889P9XwG7SmFTg3Z06mO9AriW25hyUqiBmkohJcU/pVo3GJQwJ9
-						gIly786ROmEH7Z8bvu0WYreLK5qIbS8MHEeLvmTcqxjKbwl4HlCxw00fH/4vhJVd
-						XzHfVmyS9MdN0WCjdI0iymtOwM0htBo9AgMBAAGjUDBOMB0GA1UdDgQWBBT9nTDT
-						JHcrp9AURl4d0/HhVKwobTAfBgNVHSMEGDAWgBT9nTDTJHcrp9AURl4d0/HhVKwo
-						bTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCFEGU0hc5EiO4l7S0D
-						LY1QOaWTu1NO8yoWWjUKmMMq0jcHXbtQ05odL+3kVesi7/U/3D+58Y+DKBPetdkv
-						LvYmxf+b8MSsXR4BiQLUfeK7S5PcGUQePDHZ4DZc5inS0zJWccqyIMg3xP50bpG/
-						BACg/fD2qPZnZIJSI7VsrISV0qOqtBpGGZoJ7QunspZrPBB/of+9TN9eE6LkDnBf
-						Q8hP3jEVonM1IyECSQmuRxiqwEcv8Gxy39jlyMwoOOuR3jF0TLRLtYvtLk9Dl+i+
-						TFt0BBs42f813qt54IPnbPBED3gLilzcATo6VKILvL4Kn0dYeDXm3hf/3ZfMyVKv
-						0g3I
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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://auth.howcloud.co.uk/saml/acs.php" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en-US">HowCloud Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en-US">HowCloud</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en-US">http://www.howcloud.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Joseph</GivenName>
-    <SurName>Ros</SurName>
-    <EmailAddress>mailto:j.ros@howcloud.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Joseph</GivenName>
-    <SurName>Ros</SurName>
-    <EmailAddress>mailto:j.ros@howcloud.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.howcloud.com-saml-metadata.php.xml b/swamid-interfederations-2.0/auth.howcloud.com-saml-metadata.php.xml
deleted file mode 100644
index aba10da0..00000000
--- a/swamid-interfederations-2.0/auth.howcloud.com-saml-metadata.php.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://auth.howcloud.com/saml/metadata.php">
-  <!--
-		This is a php-saml custom implementation SP for HowCloud Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-16T09:22:38Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" 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">HowCloud</mdui:DisplayName>
-        <mdui:Description xml:lang="en">HowCloud provides interactive learning tools to connect students and teachers online</mdui:Description>
-        <mdui:Logo height="64" width="64">https://cdn.howcloud.com/img/64x64-howcloud-isolated-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>
-						MIID4zCCAsugAwIBAgIJAL5LjB+U8BdvMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
-						VQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTEPMA0GA1UEBwwGTG9uZG9uMRUw
-						EwYDVQQKDAxIb3dDbG91ZCBMdGQxGjAYBgNVBAMMEWF1dGguaG93Y2xvdWQuY29t
-						MR8wHQYJKoZIhvcNAQkBFhBqb2VAaG93Y2xvdWQuY29tMB4XDTE1MDkwNjE3MjQz
-						NFoXDTI1MDkwNTE3MjQzNFowgYcxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApTb21l
-						LVN0YXRlMQ8wDQYDVQQHDAZMb25kb24xFTATBgNVBAoMDEhvd0Nsb3VkIEx0ZDEa
-						MBgGA1UEAwwRYXV0aC5ob3djbG91ZC5jb20xHzAdBgkqhkiG9w0BCQEWEGpvZUBo
-						b3djbG91ZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7HjNQ
-						kgDtiBqTl/yZ+unwbUJTbsPpI7L+28ghM5ZZ4LOxAjy/C8tgTt3O21tVmqaudWXq
-						/GDJ6werc0zYOW9eEjSiOwilKgC1XUMYfPEN49GFNBMxQWWc2h6MW+zyAcbOHMlq
-						z519F9KBn8Dh4OCFPwAneybULMmkYjKooZypM9Pl/HSZr4gE0Gmm+GnZZGd1/iEg
-						xs2s4hEdyN8H+pgGRUw4XuVZyS8Gj++eBtkRBZ1pYNn7wbf9Dy/xFP7r+m2DheSc
-						SEQH8THXhVNV0dHHQgwa2gwjobyd45yf31QUsXKe78T40QT6M/k4F90A32SA11qz
-						+8Nx8YvwbyPiPCANAgMBAAGjUDBOMB0GA1UdDgQWBBQL6gyPDrMk6hfdZBkqk0rV
-						G4QT9jAfBgNVHSMEGDAWgBQL6gyPDrMk6hfdZBkqk0rVG4QT9jAMBgNVHRMEBTAD
-						AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAYeHWEi80HwwnA1kh5roISU3FkShrZyZCx
-						Vb1QEL1TsHHAtls+72KF/oeT80E0EWNIMNpql23ptzedcu7OwNpjVRiSFTlRanV1
-						ymXQ3O8THPkCo9IwQwUj0DLrD9iwDTpHrcbEyvty5iGASiCy4omocZ7G4OOwtllF
-						0t/uyWdbY/aRmQu/ehGI0JmFcIU6Vp64YB2oFOvkzOMczvu1GcgdBpOKJgTiIu5F
-						TnLGxaIK4WtzxBon6zyXf+vba2LznRQm2QNbco1sTJVLJOGZbnaksqCYDDd7KE/L
-						J8HHgfKiXC66T2JydG0xlUk7zdxDo9SfxVg9qgyyJBlKYPNEnO9P
-					</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>
-						MIID4zCCAsugAwIBAgIJAL5LjB+U8BdvMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
-						VQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTEPMA0GA1UEBwwGTG9uZG9uMRUw
-						EwYDVQQKDAxIb3dDbG91ZCBMdGQxGjAYBgNVBAMMEWF1dGguaG93Y2xvdWQuY29t
-						MR8wHQYJKoZIhvcNAQkBFhBqb2VAaG93Y2xvdWQuY29tMB4XDTE1MDkwNjE3MjQz
-						NFoXDTI1MDkwNTE3MjQzNFowgYcxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApTb21l
-						LVN0YXRlMQ8wDQYDVQQHDAZMb25kb24xFTATBgNVBAoMDEhvd0Nsb3VkIEx0ZDEa
-						MBgGA1UEAwwRYXV0aC5ob3djbG91ZC5jb20xHzAdBgkqhkiG9w0BCQEWEGpvZUBo
-						b3djbG91ZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7HjNQ
-						kgDtiBqTl/yZ+unwbUJTbsPpI7L+28ghM5ZZ4LOxAjy/C8tgTt3O21tVmqaudWXq
-						/GDJ6werc0zYOW9eEjSiOwilKgC1XUMYfPEN49GFNBMxQWWc2h6MW+zyAcbOHMlq
-						z519F9KBn8Dh4OCFPwAneybULMmkYjKooZypM9Pl/HSZr4gE0Gmm+GnZZGd1/iEg
-						xs2s4hEdyN8H+pgGRUw4XuVZyS8Gj++eBtkRBZ1pYNn7wbf9Dy/xFP7r+m2DheSc
-						SEQH8THXhVNV0dHHQgwa2gwjobyd45yf31QUsXKe78T40QT6M/k4F90A32SA11qz
-						+8Nx8YvwbyPiPCANAgMBAAGjUDBOMB0GA1UdDgQWBBQL6gyPDrMk6hfdZBkqk0rV
-						G4QT9jAfBgNVHSMEGDAWgBQL6gyPDrMk6hfdZBkqk0rVG4QT9jAMBgNVHRMEBTAD
-						AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAYeHWEi80HwwnA1kh5roISU3FkShrZyZCx
-						Vb1QEL1TsHHAtls+72KF/oeT80E0EWNIMNpql23ptzedcu7OwNpjVRiSFTlRanV1
-						ymXQ3O8THPkCo9IwQwUj0DLrD9iwDTpHrcbEyvty5iGASiCy4omocZ7G4OOwtllF
-						0t/uyWdbY/aRmQu/ehGI0JmFcIU6Vp64YB2oFOvkzOMczvu1GcgdBpOKJgTiIu5F
-						TnLGxaIK4WtzxBon6zyXf+vba2LznRQm2QNbco1sTJVLJOGZbnaksqCYDDd7KE/L
-						J8HHgfKiXC66T2JydG0xlUk7zdxDo9SfxVg9qgyyJBlKYPNEnO9P
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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://auth.howcloud.com/saml/acs.php" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en-US">HowCloud Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en-US">HowCloud</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en-US">http://www.howcloud.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Joseph</GivenName>
-    <SurName>Ros</SurName>
-    <EmailAddress>mailto:joe@howcloud.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Joseph</GivenName>
-    <SurName>Ros</SurName>
-    <EmailAddress>mailto:joe@howcloud.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.ipublishcentral.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/auth.ipublishcentral.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 6fd7de91..00000000
--- a/swamid-interfederations-2.0/auth.ipublishcentral.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.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://auth.ipublishcentral.com/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <!--
-		This is a simpleSAMLphp "iPublishCentral eBooks" SP for Impelsys Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-06T10:38: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:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEkjCCA3qgAwIBAgIJAI0+BerrsfziMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-						VQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRUw
-						EwYDVQQKEwxJbXBlbHN5cyBJbmMxETAPBgNVBAsTCEltcGVsc3lzMQwwCgYDVQQD
-						EwNJUEMxHzAdBgkqhkiG9w0BCQEWEG5vY0BpbXBlbHN5cy5jb20wHhcNMTIwMjIz
-						MTEzNTM2WhcNMzIwMjE4MTEzNTM2WjCBjDELMAkGA1UEBhMCVVMxETAPBgNVBAgT
-						CE5ldyBZb3JrMREwDwYDVQQHEwhOZXcgWW9yazEVMBMGA1UEChMMSW1wZWxzeXMg
-						SW5jMREwDwYDVQQLEwhJbXBlbHN5czEMMAoGA1UEAxMDSVBDMR8wHQYJKoZIhvcN
-						AQkBFhBub2NAaW1wZWxzeXMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAuSjlGGZwmf6bpK/LSXlCsFZyxJhFRHUnhOQunH4ru+gDE46fme62Q8rO
-						e12ao1JWzgvScGKOS/qrWBFV7fdPYld3bNJ9ExvdNN4zXSKpzDt4O1IcjNnke/3G
-						RQHqH+/LGVYmDMYMxtmL1hBuYhBcLbtL1GaqClr55vpR2I4H60cmvNoYGQ6rOv6r
-						21HKTO4gEODhpaSnH4U/dInfpTeg+p0zs83rDlp2tpYJn40dhFYsDa6SXidPjCjZ
-						2HDAL1CJb/jAq2re3eoD33nhynOS+mQ5qEQXmSVyYJZx4o1Q4Le0UmrN0dTYbfhQ
-						fWDvG/gOkV4PlrChsFD0f3nufcllXwIDAQABo4H0MIHxMB0GA1UdDgQWBBRah5+n
-						q/E81bWQdxBmDk/SATsc8TCBwQYDVR0jBIG5MIG2gBRah5+nq/E81bWQdxBmDk/S
-						ATsc8aGBkqSBjzCBjDELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMREw
-						DwYDVQQHEwhOZXcgWW9yazEVMBMGA1UEChMMSW1wZWxzeXMgSW5jMREwDwYDVQQL
-						EwhJbXBlbHN5czEMMAoGA1UEAxMDSVBDMR8wHQYJKoZIhvcNAQkBFhBub2NAaW1w
-						ZWxzeXMuY29tggkAjT4F6uux/OIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAY9ETSH26xWhQ2yRLQJ6Ixg7+Fq5WHhT9Z9B9OFIwFSPVM2KmdaY7stcc
-						YM8Sf5cbbauUL0gIDpRItaws9SaoV9+7EIiqoaFoKX+rUkGMQKknnYL/jAGmmnpE
-						6X4NcLxd2JZl1P7AIznc5e1ykw6rPhi6yA8m6pD45WR+g+5GLg1O3XG4wXeQf07j
-						BBpC2GmeOJC/YfvsTGKrZHiBzeQ9X2B9Br9QSgHVO3mOrjk+CQ95cXDF/yMthiUU
-						iWBh+8Jny7v1xCM9Wz6p7OqpaB1DxcA8/ztAB+PXSlOyEtaT68guwEm5cfO1eEa7
-						0Zmxm2/8crh8AS6oEKA/3zBlDXUGBA==
-					</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>
-						MIIEkjCCA3qgAwIBAgIJAI0+BerrsfziMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-						VQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRUw
-						EwYDVQQKEwxJbXBlbHN5cyBJbmMxETAPBgNVBAsTCEltcGVsc3lzMQwwCgYDVQQD
-						EwNJUEMxHzAdBgkqhkiG9w0BCQEWEG5vY0BpbXBlbHN5cy5jb20wHhcNMTIwMjIz
-						MTEzNTM2WhcNMzIwMjE4MTEzNTM2WjCBjDELMAkGA1UEBhMCVVMxETAPBgNVBAgT
-						CE5ldyBZb3JrMREwDwYDVQQHEwhOZXcgWW9yazEVMBMGA1UEChMMSW1wZWxzeXMg
-						SW5jMREwDwYDVQQLEwhJbXBlbHN5czEMMAoGA1UEAxMDSVBDMR8wHQYJKoZIhvcN
-						AQkBFhBub2NAaW1wZWxzeXMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAuSjlGGZwmf6bpK/LSXlCsFZyxJhFRHUnhOQunH4ru+gDE46fme62Q8rO
-						e12ao1JWzgvScGKOS/qrWBFV7fdPYld3bNJ9ExvdNN4zXSKpzDt4O1IcjNnke/3G
-						RQHqH+/LGVYmDMYMxtmL1hBuYhBcLbtL1GaqClr55vpR2I4H60cmvNoYGQ6rOv6r
-						21HKTO4gEODhpaSnH4U/dInfpTeg+p0zs83rDlp2tpYJn40dhFYsDa6SXidPjCjZ
-						2HDAL1CJb/jAq2re3eoD33nhynOS+mQ5qEQXmSVyYJZx4o1Q4Le0UmrN0dTYbfhQ
-						fWDvG/gOkV4PlrChsFD0f3nufcllXwIDAQABo4H0MIHxMB0GA1UdDgQWBBRah5+n
-						q/E81bWQdxBmDk/SATsc8TCBwQYDVR0jBIG5MIG2gBRah5+nq/E81bWQdxBmDk/S
-						ATsc8aGBkqSBjzCBjDELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMREw
-						DwYDVQQHEwhOZXcgWW9yazEVMBMGA1UEChMMSW1wZWxzeXMgSW5jMREwDwYDVQQL
-						EwhJbXBlbHN5czEMMAoGA1UEAxMDSVBDMR8wHQYJKoZIhvcNAQkBFhBub2NAaW1w
-						ZWxzeXMuY29tggkAjT4F6uux/OIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAY9ETSH26xWhQ2yRLQJ6Ixg7+Fq5WHhT9Z9B9OFIwFSPVM2KmdaY7stcc
-						YM8Sf5cbbauUL0gIDpRItaws9SaoV9+7EIiqoaFoKX+rUkGMQKknnYL/jAGmmnpE
-						6X4NcLxd2JZl1P7AIznc5e1ykw6rPhi6yA8m6pD45WR+g+5GLg1O3XG4wXeQf07j
-						BBpC2GmeOJC/YfvsTGKrZHiBzeQ9X2B9Br9QSgHVO3mOrjk+CQ95cXDF/yMthiUU
-						iWBh+8Jny7v1xCM9Wz6p7OqpaB1DxcA8/ztAB+PXSlOyEtaT68guwEm5cfO1eEa7
-						0Zmxm2/8crh8AS6oEKA/3zBlDXUGBA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.ipublishcentral.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.ipublishcentral.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.ipublishcentral.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.ipublishcentral.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.ipublishcentral.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Impelsys Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">iPublishCentral eBooks</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ipublishcentral.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Krishnaraj</GivenName>
-    <SurName>Ramakrishnan</SurName>
-    <EmailAddress>mailto:krishnaraj.vr@impelsys.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Krishnaraj</GivenName>
-    <SurName>Ramakrishnan</SurName>
-    <EmailAddress>mailto:krishnaraj.vr@impelsys.com</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 581659b9..00000000
--- a/swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.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://auth.mines-paristech.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">MINES ParisTech</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB60lEQVQ4y6XTS4gNcBQG8N//musxeYzSDGO4iaYYMTVKMiayliSJUspVUmJjYSEb2VkgM5l784hIsrKQ8ggLrwypIZNSjPdgzIIxHseG64qN5tRZfKe+0+n7vpMiwmAqMyg2Kv41TEVDMQuNCFyOvEeQDmgyxBzdDqrTkPkHeRFOYzZuodHjG9dSwabU2n9R/7t9vrmnzhFMS+UapKI1WIwNGIX9uI8OT+62mtx4Upjkye1muaaVmFdakIqm6nt9wujqlp+nN+MwVksaZLR7+6zgw8vxck1nvHiw2ITpR8sX7MJDnEeo8k6vJb7rlJHFRrRhhq4r7epbVkTeWREhImj7fEEhppfwnqiMCAoxRiFml+aFmGB7R/cv/FvE3ufV+FTClUanorGR90GVzjKd36sYOvCHjamoxsDHSrSkoh5sxl1VLqRDlvnmeip6g1rUqm3oKAUpFc3Xfe+m2hmdep9t8arrtozrknH67NXvEuZiKZ5iPU6VJ3GrulnLMaDvVY3x9Xv0PN2NmTgu6xDeR95pLMOwyDtZsl4hpvj+tV2m4pxkoq6r60xbsFPS7MunUbIjViGLLT852yPvY7kGC2Uqlhpira965BbkJCPxQnZEDtvwEsci785fuY8IdkTWqRj+y5r/6TTYd/4BA9XqAXY2f9kAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MTQrMDI6MDDs3ea7AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjE0KzAyOjAwnYBeBwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.mines-paristech.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">MINES ParisTech</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>
-					      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>
-    </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-POST" Location="https://auth.mines-paristech.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.mines-paristech.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.mines-paristech.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">MINES ParisTech</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">MINES ParisTech</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mines-paristech.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>federation@mines-paristech.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.ncrm.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/auth.ncrm.ac.uk-shibboleth.xml
deleted file mode 100644
index 688ad920..00000000
--- a/swamid-interfederations-2.0/auth.ncrm.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.ncrm.ac.uk/shibboleth">
-  <!--
-		This is a "National Center for Research Methods" Shibboleth SP for the University of Southampton.
-	-->
-  <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="2015-04-14T08:12: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://auth.ncrm.ac.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://auth.ncrm.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3zCCAcegAwIBAgIJAOYQ8STpMV7WMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHNydjAxMjE4MB4XDTE1MDMwMzE0MTIzMVoXDTI1MDIyODE0MTIzMVowEzER
-						MA8GA1UEAxMIc3J2MDEyMTgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDNYJrzmb5hamunPwEaZ4FezQwG+anG6ugluXtQGyHTeXqz/BKYVhgctLFIU5gI
-						Ec4fHH8JtP5yEXXgCSES0K9AoK5mv2mz+sz/+1zxFXiZpU0qmYkWegGeJpwBSQbs
-						r/nN0rhUpy9c965OPkpC0xTWvduIKQvpn4JzwBf4L64D32r1H8E4XBMAvuKmnJnI
-						zYtucFPjPuT338MLWDQ1A0QwyPhtApXsRwxjUvMjSv0qLLM7qlOMH0b2jOwK/hwe
-						EMd2eCEiJi+uFcuOiY/aDh7Jx0uFzhbVyQng0GqmZY5kyC8yCYkJ2+/FPf+/SgES
-						JCyt92KigkrkDrw2iJmiOTE1AgMBAAGjNjA0MBMGA1UdEQQMMAqCCHNydjAxMjE4
-						MB0GA1UdDgQWBBTH1Z4V/CI7bS6osZJeIhihVaDCCjANBgkqhkiG9w0BAQUFAAOC
-						AQEAQQ+0hncb9g/mVjS2Yg6IKbfEodhgwvXx7hdIsEulUp8/6UeXaIEH4Ptcujqh
-						W69W7RFo9mL2PkQmmQB65KurBNoamLa5tUexD4fx+bhYCKSFBeNQLOcXTfWaQYqN
-						Qi2Ewdu9YFL769Zpx+gLZPE838HJjrT+k4KQaT0iLQHSuRcmpxGIlFEpMIU/Qkt0
-						YV4GO1sWN75ije5n91lJdWvs8WeqIzcg1+CxHvYEbWTQ9m4ZkQ/r6Dbyyf4eocyQ
-						13zlOpN5KeAlvEsSB4URyk96P5u9KwSYe1cQVW8WV8LFlOBckBE+4Q1UVGQsxj43
-						2lic9hwyPF2jaiIJPCu5UA4iRg==
-					</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://auth.ncrm.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.ncrm.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.ncrm.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.ncrm.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.ncrm.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.ncrm.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.ncrm.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.ncrm.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.ncrm.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.ncrm.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.ncrm.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Southampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Center for Research Methods</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ncrm.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Serviceline</GivenName>
-    <EmailAddress>mailto:Serviceline@soton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Clayton</GivenName>
-    <SurName>Peters</SurName>
-    <EmailAddress>mailto:C.L.Peters@soton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.search.serialssolutions.com-auth-Metadata-Shib.xml b/swamid-interfederations-2.0/auth.search.serialssolutions.com-auth-Metadata-Shib.xml
deleted file mode 100644
index 41f9f13a..00000000
--- a/swamid-interfederations-2.0/auth.search.serialssolutions.com-auth-Metadata-Shib.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://auth.search.serialssolutions.com/auth/Metadata/Shib">
-  <!--
-		This is a "ProQuest: Serials Solutions 360 Link/Core" OpenAthens SP for Proquest Information and Learning Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-24T12:33: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>
-						MIIE6jCCA9KgAwIBAgIBYTANBgkqhkiG9w0BAQUFADCBmTEZMBcGA1UEAxMQY2Eu
-						c2Vyc29sLmlsLnBxZTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24x
-						EDAOBgNVBAcTB1NlYXR0bGUxGjAYBgNVBAoTEVNlcmlhbHMgU29sdXRpb25zMSww
-						KgYJKoZIhvcNAQkBFh1zeXNhZG1pbkBzZXJpYWxzc29sdXRpb25zLmNvbTAeFw0x
-						NTEyMTQxOTQ4MDRaFw0yNTEyMTExOTQ4MDRaMH0xCzAJBgNVBAYTAlVTMRMwEQYD
-						VQQIEwpXYXNoaW5ndG9uMRowGAYDVQQKExFTZXJpYWxzIFNvbHV0aW9uczEaMBgG
-						A1UECxMRU2VyaWFscyBTb2x1dGlvbnMxITAfBgNVBAMTGHd3dy5zZXJpYWxzc29s
-						dXRpb25zLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXI3irw
-						5x2XNZX0qFAq6lZ8up2BaMYZutz143sMwd0JumhUKxIQdh9fBftX41sBzf2lBkCr
-						r7FF1VY1HvZC+BUkvfOZ3WTRGI1fF1sb+jHLk9WnOxzHCPH5WDe+k7cfVWR9Qyus
-						AUxdS24FBnoQ50oFN20ZIDQio4PB4cEtwjpw35Eq+rMPh5F9MoT/jztYdkinjqgG
-						Mtlp7Xq6127Y0+zIfMsCkV+krebsM8NyfeqLCpF+RrS6mqPdepIjGUO9prisxPs6
-						oGPvOJ0QFgtJlSSwvUsycF50e0QW8LsWLahu01yqUqdjuvrhcWq6fGU5eb24c0ZR
-						VqoNuszweCWaWJUCAwEAAaOCAVYwggFSMAkGA1UdEwQCMAAwHQYDVR0OBBYEFD9j
-						bqBlLE60q9q0Ny+MyL3ocM1MMIHOBgNVHSMEgcYwgcOAFM6a5dP+xoQk5WQrLmhX
-						OTtK3m/2oYGfpIGcMIGZMRkwFwYDVQQDExBjYS5zZXJzb2wuaWwucHFlMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHU2VhdHRsZTEa
-						MBgGA1UEChMRU2VyaWFscyBTb2x1dGlvbnMxLDAqBgkqhkiG9w0BCQEWHXN5c2Fk
-						bWluQHNlcmlhbHNzb2x1dGlvbnMuY29tggkAqUN/3ndOaXYwLwYJYIZIAYb4QgEE
-						BCIWIGh0dHBzOi8vY2Euc2Vyc29sLmxpYi9jYS1jcmwucGVtMCQGCWCGSAGG+EIB
-						AgQXFhVodHRwczovL2NhLnNlcnNvbC5saWIwDQYJKoZIhvcNAQEFBQADggEBAL7y
-						zTLEdGWib+7jzqJMWSsGpY3CE0J01Jup1ocmM2CWuM/4F0rLLmIJLBX/+xrg6/S1
-						d7drjCLn6GRBSMoEr0x1YiZ4s/tf04tJDoi5rXmsT/mDVBH3J134EHip60gyVcP9
-						Y2JcGXgN416b85TD3EMQXjuk1coL+ZLWrLEOSQuJEUStIfsgNhMmqKIr19IAKV7F
-						LHDgBkRjrbdJl31EwY22TPz/X4+ml68XJ0MaKwo0MyY/axP18l5V9DkAOm3eKwD5
-						DCYU4BH7Nom0gvAZX/Dswf8YMlWiLcDudPKONE/7aw6xXoFH6xFFw88tR3SI/GRu
-						sAoG/rolb644xG2ty14=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.serialssolutions.com/sso/auth/LINK/rcv/saml1" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.serialssolutions.com/sso/auth/LINK/rcv/saml1" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.search.serialssolutions.com/auth/rcv" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.search.serialssolutions.com/auth/rcv" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Proquest Information and Learning Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ProQuest: Serials Solutions 360 Link/Core</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.serialssolutions.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Customer Care</GivenName>
-    <EmailAddress>mailto:clients@serialssolutions.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kip</GivenName>
-    <SurName>Keeney</SurName>
-    <EmailAddress>mailto:Kip.Keeney@proquest.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.search.serialssolutions.com.xml b/swamid-interfederations-2.0/auth.search.serialssolutions.com.xml
deleted file mode 100644
index fa665558..00000000
--- a/swamid-interfederations-2.0/auth.search.serialssolutions.com.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.search.serialssolutions.com/auth/Metadata/Shib">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.serialssolutions.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.serialssolutions.com,OU=Serials Solutions,O=Serials Solutions,L=Seattle,ST=WA,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDjDCCAnSgAwIBAgIETQA4czANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAldBMRAwDgYDVQQHEwdTZWF0dGxlMRowGAYDVQQKExFTZXJp
-YWxzIFNvbHV0aW9uczEaMBgGA1UECxMRU2VyaWFscyBTb2x1dGlvbnMxITAfBgNV
-BAMTGHd3dy5zZXJpYWxzc29sdXRpb25zLmNvbTAeFw0xMDEyMDkwMjAxMjNaFw0x
-NjAxMDcwMjAxMjNaMIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0ExEDAOBgNV
-BAcTB1NlYXR0bGUxGjAYBgNVBAoTEVNlcmlhbHMgU29sdXRpb25zMRowGAYDVQQL
-ExFTZXJpYWxzIFNvbHV0aW9uczEhMB8GA1UEAxMYd3d3LnNlcmlhbHNzb2x1dGlv
-bnMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq2cevLb70/ZI
-7URgp+Rgz9KOHtJRg4W9ucFm91fvfoaww9tBBQ8GXEgq3wO3pmPYE4+bdA04xIW3
-sQgmB9UQe1sPVOhffUhHm/+MBzddIZ1WYg1lLOl3CQ/2J5Uak+/3hV8Z+ppbV0tx
-HBtqSrd+aaSrVftWKqoF5+gSmMi2ckuUGTrq9B8etqALhZoU4K2CFYhjrVK2vwaS
-sjT3+AXlO2m7PmE4xC+2jXjp33uxMbhwfjY7XgpK06h8tQQXCH7GPRbYLjSPWFw3
-IHQFm46bk4uyzDsJemjLcaGaazmbWwdMZhoWydGHphbO9Jw2so1Ht2ABOcfj3TpU
-GIKW9dmQ6QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB699XlVrbgegSecfHkxdwK
-J+7N2N5vqvAcOhoBEU1UAqIuuQF3lCpDot8QNfhxRHc3sxUh4OfqUDWcdD1rxavP
-7LzrCu9hJFli2pzNWOMle/AyAfbVRT3tDSmjqOlyrJs/G50PQV9QJyJxLvXJHg0P
-RQiV5GjOtMlE9fsVY5FIpoXTOJwP2yDvE5HF2QO4gEhKrNZvmXJ6X60NryxIApD2
-nQQ5159Bha3+D9szK4wwaGQ04ry+UW0j9C7xbhDCc/Kkd5JCqzvLqFp73F6Ma6nK
-32buuHZ/UERHs77NrmCGrS7i3oJppxFoakb9bfWEFMrbD7ZUV9DtoTDZFtFkR9jb
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.serialssolutions.com/sso/auth/LINK/rcv/saml1" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.serialssolutions.com/sso/auth/LINK/rcv/saml1" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Proquest Information and Learning Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ProQuest: Serials Solutions 360 Link/Core</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.serialssolutions.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Fujita-Yuhas</SurName>
-    <EmailAddress>Tim.Fujita-Yuhas@SerialsSolutions.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.serotine.org-shibboleth.xml b/swamid-interfederations-2.0/auth.serotine.org-shibboleth.xml
deleted file mode 100644
index 861d94ef..00000000
--- a/swamid-interfederations-2.0/auth.serotine.org-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://auth.serotine.org/shibboleth">
-  <!--
-		This is a "Federated content virtual hosting service" Shibboleth SP for Serotine 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="2016-01-08T13:36:20Z">
-      <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://auth.serotine.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://auth.serotine.org/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIJALWrCRkkgBs2MA0GCSqGSIb3DQEBBQUAMDYxNDAyBgNV
-						BAMTK2lwLTE3Mi0zMS0xOS0xNTEuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWww
-						HhcNMTUxMTE5MDQzNjQyWhcNMjUxMTE2MDQzNjQyWjA2MTQwMgYDVQQDEytpcC0x
-						NzItMzEtMTktMTUxLmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFsMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9WwbCwJktvoSjAuQHpbaaAq14NE96/M8
-						0qAG686/dZUlcmKqcGZGnKJXoAXAdYXeiyEV/Ng03EIx1Xr24CosbDHriIee2YvQ
-						XqpZwJVear74BN26j9q3N8nkw5MNZXnNsZ3vpSGHVyqlWKQ2+1jSYW6ZJ4DPMbnQ
-						lmr1hMx4uOySk8yG76kmj/YYBCRM6MkDcLLM0eak0unrWKVf4dDnpDl0Zo/rjdMn
-						pk6fDzk3Wfh446NvHkfKfiKw1EojiQqxMumBZNJnxrh6nzjnH/RZKtKLeNEiUE79
-						bTiqBnAjGunz4/CTs0dag33gt3kRFzmRTVEYijIlPGdbQYn6EOcz8wIDAQABo1kw
-						VzA2BgNVHREELzAtgitpcC0xNzItMzEtMTktMTUxLmV1LXdlc3QtMS5jb21wdXRl
-						LmludGVybmFsMB0GA1UdDgQWBBTM7Z40yDq1Qh44DApc9ilNj39faDANBgkqhkiG
-						9w0BAQUFAAOCAQEAAYm21AmPO9X1FuwomUb2fW81nGqINp8zIrzTe93fBOmcws3e
-						8f8mUYcT9IgJOlZZ3voroarLGpcGSozUeBSnULmAzlbwFXcFaY3UrE7YZJQ3s6oi
-						fEY572JhJmQcU8twxVB7y5J3MKZ2ezQg4mkTgpz0s2LvUtZzcvQNiIdUJL8kgolJ
-						++NFamnj4aZiDZ8kG3daeIb1QYj1Xyp754lQb595mzYOEfEWTmzWPOLdgOrb3QaV
-						s0EdwjcW0zHFCBR47DJUCNNLTiIz8FsA638ub5n4PUMZd2OpsS2wbRIoa73VbgXi
-						DaOnTrvCzGayaTjsooxZCu98LhreewIY8+CWQA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://auth.serotine.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.serotine.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.serotine.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.serotine.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.serotine.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.serotine.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.serotine.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.serotine.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.serotine.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.serotine.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.serotine.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Serotine Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Federated content virtual hosting service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.serotine.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sam</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>mailto:sam@serotine.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>mailto:sam@serotine.org</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 231b5509..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>Alex</GivenName>
-    <SurName>Hooper</SurName>
-    <EmailAddress>mailto:ahooper@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 68dee5d9..00000000
--- a/swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.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://auth.u-pec.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Paris Est Créteil - UPEC</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABO0lEQVQoz9WSPUtCcRjFz3NfUINAKhMtJZsbWl0CRZLa+gC2Rd+gLWhr6iM0RJnkZENLs4JfIUgpSS4Y1uBVr917/6dBUogIHBo6wzOd5+X8eIQkZpE2k/svG/hVtV8cSk3zeXb/pVzxnQH4kxRJ0ift91737r5ROHjGYgtwB0NjPECRIgBEATrg2/23Wn10WVLFigktkIxr6zG32aXAGG8XEQCu49nVau+qjItbE66+uqSvJaTT8VoNP79jnh7rgaAo8mPk9Gr1wfWNnJdNzPmJBVPoWa+u6zObDh3uhzNbZiRCACRIPqS3LcBKbrRTm5YefYTZzO11iiWnbalJKqWoFEmDwHww5CGitZ68TCZwchTLZUPx6ASUrgGQ8c0ADAUMUyvhwlloNx+MLssUOwUCTb7hlv/7SxN9AhbisJPnbylNAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.u-pec.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Paris Est Créteil - UPEC</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>
-					      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>
-    </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-POST" Location="https://auth.u-pec.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.u-pec.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.u-pec.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Paris Est Créteil - UPEC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Paris Est Créteil - UPEC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.u-pec.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Bastien SORET</md:SurName>
-    <md:EmailAddress>bastien.soret@u-pec.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Baptiste Le Negaret</md:SurName>
-    <md:EmailAddress>baptiste.le-negaret@u-pec.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 5b85e088..00000000
--- a/swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.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://auth.univ-paris-diderot.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Paris 7 - Denis Diderot</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABT0lEQVQoz3WSP0/CUBTFzytQ62CcMNWQ0ImBgUiIoYNCGDrL3s+Au4kJX4BPwIoD0alssDEBMpIYXbROTCYmNP6hvl6HZ8oL9J313N99J+9cFkURdsQY63a7AGzbLpVKRLTxoiQR0WKxICIi2rLSUMj3/clkks0eNZuX8guaHEMG6vU6ETUaja1FWjzd6XRkZjwe67ru+6/JAADLsmSjUCiEYWgYhhJYLpeyMRwOq1V7NBopAdM8FtlEMMdxZrOp4zhKQNczAGq1i1brCgDnPJVKcc63gM235nI5ANfttpXPA4iANWi31H+AiCqVCoDztw/+8j4NgrP9w5Mf44DpykiinZunh7vMp31afvz9ut/7fqa1MpJQuVjUNE1sSkekAcoX4gb7/T6AMAxN0ySi+XwuF8rka2WMDbzBKli5ritvSb4lod5tz/M8MRRLHvgDEyeuyNjtHsUAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDAd7BIvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwbLGqkwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-paris-diderot.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Paris 7 - Denis Diderot</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>
-					      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>
-    </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-POST" Location="https://auth.univ-paris-diderot.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.univ-paris-diderot.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.univ-paris-diderot.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Paris 7 - Denis Diderot</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Paris 7 - Denis Diderot</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-paris-diderot.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>noc@univ-paris-diderot.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d1705434..00000000
--- a/swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.univ-pau.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Pau et des Pays de l'Adour</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB90lEQVQ4y8WTvWtTYRTGf+/N21sbSSo2ldwKDtJioiJF61RMQ0AlSQdx8aOLQnESVHQQBEVw7aSj/0ERvxrrkKSlDg7SUodaP2iHQo2S1tL0Nrk3N/e+DoYErE4VPPAs5zzn+xyhlGI7om3L+18EkEsmV+fX2FW2eTDY/QaBDZAB0k1aDR+nUUpsDfBhDSM5TcftGKSJUQW+FegKG02SB+zEpuroaL/VLH2CO/igf/dHNJgU4H6ap9cweDWZJxlPcEsjPlL8rjP7Pje6sLhw4Ovy8uFgMFi4fuNmTAMI6zD0PDKRY+aChHQ8QRZw6kmqGifRd5C0bLt1ePjKkbv37p8rlUpdYy9fPGwU1C4JrrCvAFjlMn6g0bBAYJr0RqPHv1gWAD8ATNMMSCDjeBh9ezg65IVyFZB+P/3AeHMGeTr2Wo8Ell8wgGWmNAAhhJJAukWDz6vkz8yo7Pm+Ve8sofEaVBsrIAtkL3nQraGuuW5q6x3UFHoogJRUpOvRBrytmwYBikUuC3gmMNDqfq5bkxLI2C7h1H6OPe4RuU2XFuUjBhBPgKc45ThMdXYy4sFEGxfxWlmJRKJTJ2ID73i9pGBMwVM1/UTNYSvY+AtKClzlUrEVtvMLsqcdRqPgE6yvzx0MWIdmN/ws/vHKFQ4aGrps6sR//8afTdzJi3O2+J0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDAd7BIvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwbLGqkwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-pau.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Pau et des Pays de l'Adour</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>
-					      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>
-    </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-POST" Location="https://auth.univ-pau.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.univ-pau.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.univ-pau.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Pau et des Pays de l'Adour</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Pau et des Pays de l'Adour</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-pau.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@univ-pau.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.unomaha.edu-idp.xml b/swamid-interfederations-2.0/auth.unomaha.edu-idp.xml
deleted file mode 100644
index e6ab8078..00000000
--- a/swamid-interfederations-2.0/auth.unomaha.edu-idp.xml
+++ /dev/null
@@ -1,61 +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://auth.unomaha.edu/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">unomaha.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Nebraska at Omaha</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IDP for the University of Nebraska Omaha.</mdui:Description>
-        <mdui:Logo height="75" width="101" xml:lang="en">https://auth.unomaha.edu/html/icon_uno-clr-lrg.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>
-MIIDLDCCAhSgAwIBAgIVAIsrTZg+xPjnDMlVwxM9j6NGfV7NMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGF1dGgudW5vbWFoYS5lZHUwHhcNMTMwMTMwMjAzNDE2
-WhcNMzMwMTMwMjAzNDE2WjAbMRkwFwYDVQQDExBhdXRoLnVub21haGEuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuCNfABIJwCrk0t6KjSvEwPEk
-dBtOt0YNBboi9ugoHr8xOxnDeYqy0Wo/N9/ugrkZy/ddw9TVG2QxtNUKLCrF9N9k
-2ZPWU0ME2eO1xJKIejo8EgtXby9lX6UjGX1i+UKpBqTI0z726WNVkOMZKsCMGEVR
-T0FD2KfGzw0MSJymv0Tk7pSw4rw68OlHxpI7w8ZsqWGyFg9bDDjzpgHjg+yQJGfr
-oGaBG/S8ej+OLApNf0h5yvOwPwgs1HB1Ga4fu/dnNBmqwnRJ74z3yqsme1hzleyH
-k9NolQV/q2UkGIt55JqQRatftmvyeyUEh3wKXr3qY5BsIuupD6lpRnBrsKf3ywID
-AQABo2cwZTBEBgNVHREEPTA7ghBhdXRoLnVub21haGEuZWR1hidodHRwczovL2F1
-dGgudW5vbWFoYS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEBBD69+gK37
-KhGD1aceEkFoIMb+MA0GCSqGSIb3DQEBBQUAA4IBAQCwdlAxULDWyaIUv79253oD
-+mkWSFLF4wxW4iK9TTa2miQ0TSYVyzhaXp97aPxRfx5HRXUHYTnP1s8BEkt38I3m
-a9igf9Xl9BTXFl2mjfW3IkHz3i1muQfeaO776QhdoSIMopN0hDsI0dYjXzzay4nY
-KsalIUYcr+E9BfbFa1Y6+wpJXCJPwUK/LMLCI6W9VpVXEJimNtXKg5fRv7/VDKsn
-4W0gTtvxHuZ8B0zQkh9lkqxHI/ZC3GxP6S5hKbAXrHDyHgoRPi4vYhV7G0ijoB7X
-ib4AhuWoU4qWPEElH/diNgvMNv0LNXH3A9NBC1womRbTB+OS9nfKsMEfR8Qy3V2p
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.unomaha.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.unomaha.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.unomaha.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.unomaha.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.unomaha.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.unomaha.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Nebraska at Omaha</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Nebraska at Omaha</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unomaha.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Help Desk</md:GivenName>
-    <md:EmailAddress>unohelpdesk@unomaha.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml
deleted file mode 100644
index 5f03de24..00000000
--- a/swamid-interfederations-2.0/auth.ut.ee-idp-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://auth.ut.ee/idp/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ut.ee</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID8TCCAtmgAwIBAgIJAP1X3BCDhbbMMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJFRTERMA8GA1UECAwIVGFydHVtYWExDjAMBgNVBAcMBVRhcnR1MRwwGgYDVQQKDBNVbml2ZXJzaXR5IG9mIFRhcnR1MQwwCgYDVQQLDANJVE8xEzARBgNVBAMMCmF1dGgudXQuZWUxGzAZBgkqhkiG9w0BCQEWDG9yYWNsZUB1dC5lZTAeFw0xMjA3MjMwODQ0NTJaFw0yMjA3MjMwODQ0NTJaMIGOMQswCQYDVQQGEwJFRTERMA8GA1UECAwIVGFydHVtYWExDjAMBgNVBAcMBVRhcnR1MRwwGgYDVQQKDBNVbml2ZXJzaXR5IG9mIFRhcnR1MQwwCgYDVQQLDANJVE8xEzARBgNVBAMMCmF1dGgudXQuZWUxGzAZBgkqhkiG9w0BCQEWDG9yYWNsZUB1dC5lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV0zsQmByi15Xzv2E+0u/4TNX0QeLJ70UR9iE/5UXkf0EDOILckbGuqlmSLPu35T23K1RSLfRwisxmN9i588yJ0MLfsWXXg4Z9w7dI7mWLKIblniulKUliRqRVP4ejz02mvqtffFyXWltNvog5BVTWM+by15q0CjM6YLRcSyg7f7MaZ3+ev2TiJXzFKmj6Ft8coYabjlRmPyGOu09YNQ7PTShR9wBtF34mFbsowkQagFGChPGnGp2wW6R/7aF6s7bFxmDAqsHSOg0Du1ueRMdSgX19EmSnxGzv4JUvM6L4ulPTKJpZwwjO4xk2emhH71RvVRIdKBuvnZDSphZTEsnUCAwEAAaNQME4wHQYDVR0OBBYEFJyiwO9YOOL2PfeMu+xxoURr1K0WMB8GA1UdIwQYMBaAFJyiwO9YOOL2PfeMu+xxoURr1K0WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEYRgnUl6VrftEH/HCp1G2tSdyz1D2jDLuyWcirFAX+ifPiMSTISJbC7tyvS4GdZqpU3zJpEIqWDt7/193wo6H0FGjzsBdFJhZrm6yFKncuhyKuysmMFtWwwURBWCrqjh5rdg3rcPQIIM8me3WVUpIIbHk1fWyypVH2ZgdyiM8Q7AkBtNidlbLzChrLgqnXRiTegxXUBERGdgKl90CBfI0BpY72CgKenHa8knPNkDJgIrU/jQrpxOdXtv5pxzHSWa0YJXCNHhzBxYARrgXiXdz0uaiNkXhTGoWlklKVakbMXfqBuE+xJfGZ05k9trc+74V30c4ZSpAcKjHd6A9eEFhw=</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>MIID8TCCAtmgAwIBAgIJAP1X3BCDhbbMMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJFRTERMA8GA1UECAwIVGFydHVtYWExDjAMBgNVBAcMBVRhcnR1MRwwGgYDVQQKDBNVbml2ZXJzaXR5IG9mIFRhcnR1MQwwCgYDVQQLDANJVE8xEzARBgNVBAMMCmF1dGgudXQuZWUxGzAZBgkqhkiG9w0BCQEWDG9yYWNsZUB1dC5lZTAeFw0xMjA3MjMwODQ0NTJaFw0yMjA3MjMwODQ0NTJaMIGOMQswCQYDVQQGEwJFRTERMA8GA1UECAwIVGFydHVtYWExDjAMBgNVBAcMBVRhcnR1MRwwGgYDVQQKDBNVbml2ZXJzaXR5IG9mIFRhcnR1MQwwCgYDVQQLDANJVE8xEzARBgNVBAMMCmF1dGgudXQuZWUxGzAZBgkqhkiG9w0BCQEWDG9yYWNsZUB1dC5lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMV0zsQmByi15Xzv2E+0u/4TNX0QeLJ70UR9iE/5UXkf0EDOILckbGuqlmSLPu35T23K1RSLfRwisxmN9i588yJ0MLfsWXXg4Z9w7dI7mWLKIblniulKUliRqRVP4ejz02mvqtffFyXWltNvog5BVTWM+by15q0CjM6YLRcSyg7f7MaZ3+ev2TiJXzFKmj6Ft8coYabjlRmPyGOu09YNQ7PTShR9wBtF34mFbsowkQagFGChPGnGp2wW6R/7aF6s7bFxmDAqsHSOg0Du1ueRMdSgX19EmSnxGzv4JUvM6L4ulPTKJpZwwjO4xk2emhH71RvVRIdKBuvnZDSphZTEsnUCAwEAAaNQME4wHQYDVR0OBBYEFJyiwO9YOOL2PfeMu+xxoURr1K0WMB8GA1UdIwQYMBaAFJyiwO9YOOL2PfeMu+xxoURr1K0WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEYRgnUl6VrftEH/HCp1G2tSdyz1D2jDLuyWcirFAX+ifPiMSTISJbC7tyvS4GdZqpU3zJpEIqWDt7/193wo6H0FGjzsBdFJhZrm6yFKncuhyKuysmMFtWwwURBWCrqjh5rdg3rcPQIIM8me3WVUpIIbHk1fWyypVH2ZgdyiM8Q7AkBtNidlbLzChrLgqnXRiTegxXUBERGdgKl90CBfI0BpY72CgKenHa8knPNkDJgIrU/jQrpxOdXtv5pxzHSWa0YJXCNHhzBxYARrgXiXdz0uaiNkXhTGoWlklKVakbMXfqBuE+xJfGZ05k9trc+74V30c4ZSpAcKjHd6A9eEFhw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.ut.ee/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://auth.ut.ee/idp/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="et">Tartu Ülikool</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Tartu</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="ru">Тартуский университет</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fi">Tarton yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="et">Tartu Ülikool</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Tartu</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="et">http://www.ut.ee/et/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ut.ee/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>TAAT</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/auth.yale.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/auth.yale.edu-idp-shibboleth.xml
deleted file mode 100644
index afe91c6b..00000000
--- a/swamid-interfederations-2.0/auth.yale.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://auth.yale.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">yale.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Yale University</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>
-MIIDIDCCAgigAwIBAgIVANUBkCs/+UH9FvRGL/Vp/l9kdXzEMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWF1dGgueWFsZS5lZHUwHhcNMDkwOTEwMTc0NzEwWhcN
-MjkwOTEwMTc0NzEwWjAYMRYwFAYDVQQDEw1hdXRoLnlhbGUuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmfbA8fNVeW6RJm2n9Jdos9o4eINYdMqj
-qLU0fWBs9+CHwIVb3WIyp7jhWyr+ILC6mMGvb/9TNm3vlqGPSwR3yKe5KBPlTW81
-dSUuqW6emxX1KIhQOy3ynGETcDiDzTosOYgBMynzoqkZSVDgvKn8GUnuj9V1sSwJ
-8tuiQLRu42Md+3pN0ED6bX/5wkpal5ZV5uZ2XUb0oS395BS39rAsNw7FyL72s1bT
-wMml1U1lrHOTVL1zEeuSjKjT8kBFp01Rkq7EdGtUIMswb6flZW4Ss5Kg3ufRxcnt
-2j7/OoGA6ZpD2w74R9Jk4phPoAM0nJ5mX/zKz8rU06FjHZAOHbLqEwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1hdXRoLnlhbGUuZWR1hiRodHRwczovL2F1dGgueWFsZS5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL/j9kq62w7o4+hY1Vnfvv2f8kL4
-MA0GCSqGSIb3DQEBBQUAA4IBAQASP6sIJlKHtn+bPJ/TaO2ch/pNNzeBr7ufcJzg
-tcF0hHbSegu5KlghOsdUVSke3pIThyp7Fs1kUTR7JwGJkQuplo5nbsYOXd6KhoDZ
-47omRMk0Ktm2UKvAVx1TEsQKRimFCoZvyM09M08rJBQfFqIXhdAmc4nTSnuuP4Bb
-sLIiw/Px7ck5SKU34P42sC84ZOHEipMaIvOius1kwNfXkT1WruObk76Cqhnb64QR
-GdIAn0a0g8Z+gKxllm7FIkCT7auN9E83TfvxjTXLfy6nxSAL/CtiPR4d29PvlDHn
-ha4CMf2Z60YzbQ1cB5zpjHwlAyDURJtmQG3y2rHqF7/sm/aC
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.yale.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.yale.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.yale.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.yale.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.yale.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.yale.edu/idp/profile/SAML2/POST-SimpleSign/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">yale.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVANUBkCs/+UH9FvRGL/Vp/l9kdXzEMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWF1dGgueWFsZS5lZHUwHhcNMDkwOTEwMTc0NzEwWhcN
-MjkwOTEwMTc0NzEwWjAYMRYwFAYDVQQDEw1hdXRoLnlhbGUuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmfbA8fNVeW6RJm2n9Jdos9o4eINYdMqj
-qLU0fWBs9+CHwIVb3WIyp7jhWyr+ILC6mMGvb/9TNm3vlqGPSwR3yKe5KBPlTW81
-dSUuqW6emxX1KIhQOy3ynGETcDiDzTosOYgBMynzoqkZSVDgvKn8GUnuj9V1sSwJ
-8tuiQLRu42Md+3pN0ED6bX/5wkpal5ZV5uZ2XUb0oS395BS39rAsNw7FyL72s1bT
-wMml1U1lrHOTVL1zEeuSjKjT8kBFp01Rkq7EdGtUIMswb6flZW4Ss5Kg3ufRxcnt
-2j7/OoGA6ZpD2w74R9Jk4phPoAM0nJ5mX/zKz8rU06FjHZAOHbLqEwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1hdXRoLnlhbGUuZWR1hiRodHRwczovL2F1dGgueWFsZS5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL/j9kq62w7o4+hY1Vnfvv2f8kL4
-MA0GCSqGSIb3DQEBBQUAA4IBAQASP6sIJlKHtn+bPJ/TaO2ch/pNNzeBr7ufcJzg
-tcF0hHbSegu5KlghOsdUVSke3pIThyp7Fs1kUTR7JwGJkQuplo5nbsYOXd6KhoDZ
-47omRMk0Ktm2UKvAVx1TEsQKRimFCoZvyM09M08rJBQfFqIXhdAmc4nTSnuuP4Bb
-sLIiw/Px7ck5SKU34P42sC84ZOHEipMaIvOius1kwNfXkT1WruObk76Cqhnb64QR
-GdIAn0a0g8Z+gKxllm7FIkCT7auN9E83TfvxjTXLfy6nxSAL/CtiPR4d29PvlDHn
-ha4CMf2Z60YzbQ1cB5zpjHwlAyDURJtmQG3y2rHqF7/sm/aC
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.yale.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.yale.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Yale University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Yale University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.yale.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Identity Management Team</md:GivenName>
-    <md:EmailAddress>idm.techsupport@panlists.yale.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Identity Management Team</md:GivenName>
-    <md:EmailAddress>idm.techsupport@panlists.yale.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Identity Management Team</md:GivenName>
-    <md:EmailAddress>idm.techsupport@panlists.yale.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/authenticate.bvdep.com-ukfederation.xml b/swamid-interfederations-2.0/authenticate.bvdep.com-ukfederation.xml
deleted file mode 100644
index cca25a31..00000000
--- a/swamid-interfederations-2.0/authenticate.bvdep.com-ukfederation.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://authenticate.bvdep.com/ukfederation">
-  <!--
-		This is a Shibboleth SP for Bureau Van Dijk.
-	-->
-  <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="2008-07-22T10: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: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://authenticate.bvdep.com/ukfederation/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://authenticate.bvdep.com/ukfederation/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://authenticate.bvdep.com/ukfederation/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Bureau van Dijk</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Global, regional and domestic company information - including financials, corporate structures and other business intelligence.</mdui:Description>
-        <mdui:Logo height="76" width="198">https://authenticate.bvdep.com/bvdlogo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEBjCCAu6gAwIBAgIJAMGyauP3kg2oMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
-						VQQGEwJCRTERMA8GA1UECBMIQnJ1c3NlbHMxETAPBgNVBAcTCEJydXNzZWxzMRgw
-						FgYDVQQKEw9CdXJlYXUgdmFuIERpamsxEzARBgNVBAsTClNoaWJib2xldGgxHzAd
-						BgNVBAMTFmF1dGhlbnRpY2F0ZS5idmRlcC5jb20wHhcNMTEwODAyMTUwODM2WhcN
-						MzEwNzI4MTUwODM2WjCBgzELMAkGA1UEBhMCQkUxETAPBgNVBAgTCEJydXNzZWxz
-						MREwDwYDVQQHEwhCcnVzc2VsczEYMBYGA1UEChMPQnVyZWF1IHZhbiBEaWprMRMw
-						EQYDVQQLEwpTaGliYm9sZXRoMR8wHQYDVQQDExZhdXRoZW50aWNhdGUuYnZkZXAu
-						Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1UtrmJ9RcT+Of4xe
-						+xWozbNe5JVuMOfZJ0kpeve2Hh30RHAzxJQjDkYBogjq+2aYPEqrlc8Zg7DO4wy4
-						CRDkr4nEIUsicM2qAZv9vAuV3wf204QWPg944iPvEIwoCEwHCwEoUtdtEYZpeMAE
-						EhP7RKc3UwbUbzaEnGBaqhAUlF+Fokq7INve7kca7AldsMTNPxelTISMO7eJLris
-						t/ZMyEUkVrri2vHJR5wW0vNBHVCcDAGjGt4ckTKVB0Xmqi77sHPOyS05KndzElMs
-						ULcRVbOVNv7GSzYTHRQlaq6VWyoBVTWH+rht00/97vf265Yn1pC9mm82YqZNlvEI
-						dRMsdwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJHFh2uJtwpARwv+xpu5j
-						dRw5j4kwHwYDVR0jBBgwFoAUJHFh2uJtwpARwv+xpu5jdRw5j4kwDQYJKoZIhvcN
-						AQEFBQADggEBALRsYutdOD2SKEi3MGju3pQeqhgGQJk5y4aQ06CJmXjz8TQmWCFJ
-						hbIwR6347FUyyLiGqDSbJsZuzaFKq5oGVL3QgERisKBsvabFLvaICb/cKbz98UVR
-						oe4ZfgFKWKxDJTTk7R2RXCL5rFJFQvLGii3booGdkrWqY8FVjq8BHawgydcyIlMp
-						j/oj8ggh2OrS3vR6+8xasdDj5YqzG5rJgKP2fmnSOTVMfmPjAqEp/Yj37Wtl0NRR
-						fN9RkMQvRV7pufGoIJC0iPtOy6Fb7Hwh+61ELiTt5NCTewiFrOUilqhnpiJBqfI5
-						F3JhOKtgLsQEWD4nm3wzptv2ImHrjeaaNMA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://authenticate.bvdep.com/ukfederation/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authenticate.bvdep.com/ukfederation/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Bureau Van Dijk - Electronic Publishing</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bureau van Dijk: authentication service for the UK federation</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bvdep.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Peter</GivenName>
-    <SurName>Buelens</SurName>
-    <EmailAddress>mailto:Peter.Buelens@bvdinfo.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Buelens</SurName>
-    <EmailAddress>mailto:Peter.Buelens@bvdinfo.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/authest.bathspa.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/authest.bathspa.ac.uk-oala-metadata.xml
deleted file mode 100644
index d16c7bf8..00000000
--- a/swamid-interfederations-2.0/authest.bathspa.ac.uk-oala-metadata.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://authest.bathspa.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens IdP for Bath Spa University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-14T11:36:22Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">bathspa.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					MIIDUDCCAjigAwIBAgIIRqiLzGQHQaswDQYJKoZIhvcNAQEFBQAwPzEcMBoGA1UE
-					CgwTQmF0aCBTcGEgVW5pdmVyc2l0eTEfMB0GA1UEAwwWYXV0aHRlc3QuYmF0aHNw
-					YS5hYy51azAeFw0xMzA2MTIxMjAwMzNaFw0yMzA2MTIxMjAwMzNaMD8xHDAaBgNV
-					BAoME0JhdGggU3BhIFVuaXZlcnNpdHkxHzAdBgNVBAMMFmF1dGh0ZXN0LmJhdGhz
-					cGEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCW6aSWgT8R
-					ZcWJ4CPCq+q+Q7HkmVwkLmrzq6EGKw2iWsv5julaNTOl6WAx2+xQecNWag+3rfGp
-					uanS2frS+R7hO0x04VW4uBqfBKycUEvjJ9IeSaKifuVqui42YrUvypUAiMD0dyC1
-					2GxkuAPsnpUyIiiFf/+jB29HaOhHl55ZJL7PLU79X63qoLGOcEfx3JpXzWZknp1o
-					0+b3B6xWFTBElAuh/V7ZVwMnlQb6FDXdwURpP4Lfn2eNvEA5lj8nRgxqlFon0kGH
-					2FPhlJ61nAcS15eSaaTCnsfz8pVgjPdd1nZq3SajTeJaZq4Fb4LB6NkdSN4eDNrN
-					uQb4KDq96epdAgMBAAGjUDBOMB0GA1UdDgQWBBQem211nEnqC/c1sA/RIhSaKiOP
-					gzAfBgNVHSMEGDAWgBQem211nEnqC/c1sA/RIhSaKiOPgzAMBgNVHRMEBTADAQH/
-					MA0GCSqGSIb3DQEBBQUAA4IBAQAvZz0attopvGO1nP/afw1/j/5AaWTZVgE6aQqA
-					Pq5krYkN0eDdEh0pYuSOGE9yj2ol7GfDJJdVqg5XK6xmwRnXgLKYjo7wiHq6U+mf
-					tX2QESmKS5qiKc8GXZ7TB/Rzc4Q3pKcDC6ugMLPx3s4fKctttM2KU8FZ7YwA+esy
-					SV6EThbdpCA4FFpTyMOK8ITuoeUyq6YK6sEIxMkq2gE/R+cB4VL1z/rpVC/FgN/G
-					/MEIfzzKv+htixan0Vo0Gx5I6BPRvVi3Jk8mRjvw052p+1muveeBjeCvnBiXkkiT
-					2z1owf0akLc7gonqQhWx3mwrj9WXKUxSwI/KU9QyJ7+g24GQ
-				</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>
-					MIIDUDCCAjigAwIBAgIIRqiLzGQHQaswDQYJKoZIhvcNAQEFBQAwPzEcMBoGA1UE
-					CgwTQmF0aCBTcGEgVW5pdmVyc2l0eTEfMB0GA1UEAwwWYXV0aHRlc3QuYmF0aHNw
-					YS5hYy51azAeFw0xMzA2MTIxMjAwMzNaFw0yMzA2MTIxMjAwMzNaMD8xHDAaBgNV
-					BAoME0JhdGggU3BhIFVuaXZlcnNpdHkxHzAdBgNVBAMMFmF1dGh0ZXN0LmJhdGhz
-					cGEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCW6aSWgT8R
-					ZcWJ4CPCq+q+Q7HkmVwkLmrzq6EGKw2iWsv5julaNTOl6WAx2+xQecNWag+3rfGp
-					uanS2frS+R7hO0x04VW4uBqfBKycUEvjJ9IeSaKifuVqui42YrUvypUAiMD0dyC1
-					2GxkuAPsnpUyIiiFf/+jB29HaOhHl55ZJL7PLU79X63qoLGOcEfx3JpXzWZknp1o
-					0+b3B6xWFTBElAuh/V7ZVwMnlQb6FDXdwURpP4Lfn2eNvEA5lj8nRgxqlFon0kGH
-					2FPhlJ61nAcS15eSaaTCnsfz8pVgjPdd1nZq3SajTeJaZq4Fb4LB6NkdSN4eDNrN
-					uQb4KDq96epdAgMBAAGjUDBOMB0GA1UdDgQWBBQem211nEnqC/c1sA/RIhSaKiOP
-					gzAfBgNVHSMEGDAWgBQem211nEnqC/c1sA/RIhSaKiOPgzAMBgNVHRMEBTADAQH/
-					MA0GCSqGSIb3DQEBBQUAA4IBAQAvZz0attopvGO1nP/afw1/j/5AaWTZVgE6aQqA
-					Pq5krYkN0eDdEh0pYuSOGE9yj2ol7GfDJJdVqg5XK6xmwRnXgLKYjo7wiHq6U+mf
-					tX2QESmKS5qiKc8GXZ7TB/Rzc4Q3pKcDC6ugMLPx3s4fKctttM2KU8FZ7YwA+esy
-					SV6EThbdpCA4FFpTyMOK8ITuoeUyq6YK6sEIxMkq2gE/R+cB4VL1z/rpVC/FgN/G
-					/MEIfzzKv+htixan0Vo0Gx5I6BPRvVi3Jk8mRjvw052p+1muveeBjeCvnBiXkkiT
-					2z1owf0akLc7gonqQhWx3mwrj9WXKUxSwI/KU9QyJ7+g24GQ
-				</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://authtest.bathspa.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authtest.bathspa.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Bath Spa University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bath Spa University Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bathspa.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Server Team</GivenName>
-    <EmailAddress>mailto:serverteam@bathspa.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Server Team</GivenName>
-    <EmailAddress>mailto:serverteam@bathspa.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/authidp.shsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/authidp.shsu.edu-idp-shibboleth.xml
deleted file mode 100644
index ac062c23..00000000
--- a/swamid-interfederations-2.0/authidp.shsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://authidp.shsu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">shsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sam Houston State University</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>
-MIIDKzCCAhOgAwIBAgIUQeKtlGH32e7m8o5FMe04tVqQhDAwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQYXV0aGlkcC5zaHN1LmVkdTAeFw0xMjEyMDQyMTAxMzha
-Fw0zMjEyMDQyMTAxMzhaMBsxGTAXBgNVBAMTEGF1dGhpZHAuc2hzdS5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvePaZxen5e6BcZ7ytQboYpAjx
-s0CUHF3yN2ENOG/3ocsS6fLtpXBOsOwUSKVZwFhAAjyZmiYJVzqIQpNWIBe8DYle
-5fbJ9jwRNDxSQcnjV3MTeoVDXteMWBvcX58Xl8T9IaPeQzsPTwA7ahKtzUG/vAQ5
-VZG1ub4MD1+gN3j/EdeAMu009i0DEo0N1o0ZclAsE3OPPtBlGE/wHk/PRNcZSyZV
-v73L174lSeZdnPt/EA8OS5hexSlckS5Y69s47fZ6WIlVhimBe+iyeBjAzwUcAgQX
-53HTQeQljr9KVu/paNwmU9DVp5pVDBA8IYQWbUBenpd+Gr4pUKcWy6Z9YVA1AgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGF1dGhpZHAuc2hzdS5lZHWGJ2h0dHBzOi8vYXV0
-aGlkcC5zaHN1LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUD1xVn6mS3yHr
-U6O5SlpFiDDGLRMwDQYJKoZIhvcNAQEFBQADggEBAGjSSPDeXaIF675j+qbuBT1o
-2WkhK+W64+KdkkD0qtsgz18UeAPLe+ibg8DZyU2yJVy6OWKRGm5hm2zDCcRIV2Gl
-lIMkqZhjwdzu0AyfLFg9T/mUbYr6uHaF0MDj3WwsOK7pICnDncUHCK7BGXtNU0SQ
-lLp74eYZf80bWo5Uef4AKcWoPAc5nBCeYSrnkOFDbAr4Rgcga+jk7wCj0HBnI35e
-MOwxmjefW/KOb9f1PR+U8K+hc6FLhMEFl6CC0N7RhYLgi4f+omr1gb8t0Wcgp/JG
-dS/BQXYEQm4UNPWh570Wpz2AKs9ztJhWtBHbikIeTqVjh4sKquRZHMrdH6wv33k=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://authidp.shsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authidp.shsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://authidp.shsu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authidp.shsu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authidp.shsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authidp.shsu.edu/idp/profile/SAML2/POST/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">shsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUQeKtlGH32e7m8o5FMe04tVqQhDAwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQYXV0aGlkcC5zaHN1LmVkdTAeFw0xMjEyMDQyMTAxMzha
-Fw0zMjEyMDQyMTAxMzhaMBsxGTAXBgNVBAMTEGF1dGhpZHAuc2hzdS5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvePaZxen5e6BcZ7ytQboYpAjx
-s0CUHF3yN2ENOG/3ocsS6fLtpXBOsOwUSKVZwFhAAjyZmiYJVzqIQpNWIBe8DYle
-5fbJ9jwRNDxSQcnjV3MTeoVDXteMWBvcX58Xl8T9IaPeQzsPTwA7ahKtzUG/vAQ5
-VZG1ub4MD1+gN3j/EdeAMu009i0DEo0N1o0ZclAsE3OPPtBlGE/wHk/PRNcZSyZV
-v73L174lSeZdnPt/EA8OS5hexSlckS5Y69s47fZ6WIlVhimBe+iyeBjAzwUcAgQX
-53HTQeQljr9KVu/paNwmU9DVp5pVDBA8IYQWbUBenpd+Gr4pUKcWy6Z9YVA1AgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGF1dGhpZHAuc2hzdS5lZHWGJ2h0dHBzOi8vYXV0
-aGlkcC5zaHN1LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUD1xVn6mS3yHr
-U6O5SlpFiDDGLRMwDQYJKoZIhvcNAQEFBQADggEBAGjSSPDeXaIF675j+qbuBT1o
-2WkhK+W64+KdkkD0qtsgz18UeAPLe+ibg8DZyU2yJVy6OWKRGm5hm2zDCcRIV2Gl
-lIMkqZhjwdzu0AyfLFg9T/mUbYr6uHaF0MDj3WwsOK7pICnDncUHCK7BGXtNU0SQ
-lLp74eYZf80bWo5Uef4AKcWoPAc5nBCeYSrnkOFDbAr4Rgcga+jk7wCj0HBnI35e
-MOwxmjefW/KOb9f1PR+U8K+hc6FLhMEFl6CC0N7RhYLgi4f+omr1gb8t0Wcgp/JG
-dS/BQXYEQm4UNPWh570Wpz2AKs9ztJhWtBHbikIeTqVjh4sKquRZHMrdH6wv33k=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://authidp.shsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authidp.shsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Sam Houston State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sam Houston State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.shsu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jacob Chandler</md:GivenName>
-    <md:EmailAddress>chandler@shsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Tim McGuffin</md:GivenName>
-    <md:EmailAddress>ucs_tim@shsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marc Barber</md:GivenName>
-    <md:EmailAddress>marc.barber@shsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/avbmth.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/avbmth.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index db71a672..00000000
--- a/swamid-interfederations-2.0/avbmth.sisoshibboleth.co.uk-entity.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://avbmth.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Bournemouth University ~ AVBmth, Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2013-06-05T15:30:36Z"/>
-  </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://avbmth.siso.co/sso/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://avbmth.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Bournemouth University ~ AVBmth, Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ AVBmth, Online Resource Booking</mdui:Description>
-        <mdui:Logo height="60" width="60">https://shibboleth.siso.co/siso-logo60x60.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://avbmth.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://avbmth.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://avbmth.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://avbmth.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://avbmth.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://avbmth.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://avbmth.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Bournemouth University ~ AVBmth, Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml b/swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml
deleted file mode 100644
index cf50473f..00000000
--- a/swamid-interfederations-2.0/averell.unimes.fr-authsaml2-metadata.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://averell.unimes.fr/authsaml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-07-08T14:00: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>https://federation.renater.fr/category/wifi</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0: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">Eduspot - Nimes University</mdui:DisplayName>
-        <mdui:Logo height="151" width="147">https://www.unimes.fr/skins/Univ-Nimes/resources/img/logo-unimes.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">https://averell.unimes.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Eduspot - Nimes University</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Portail Captif Univnautes - Université de Nîmes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Portail captif Univnautes - Université de Nîmes</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>
-					      MIIEUTCCAzmgAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJGUjEN
-MAsGA1UECBMER2FyZDEOMAwGA1UEBxMFTmltZXMxDzANBgNVBAoTBlVuaW1lczEo
-MCYGCSqGSIb3DQEJARYZb2xpdmllci5mYWx6b25lQHVuaW1lcy5mcjEUMBIGA1UE
-AxMLaW50ZXJuYWwtY2EwHhcNMTMwNzA4MTExMTU0WhcNMjMwNzA2MTExMTU0WjB9
-MQswCQYDVQQGEwJGUjENMAsGA1UECBMER2FyZDEOMAwGA1UEBxMFTmltZXMxDzAN
-BgNVBAoTBlVuaW1lczEoMCYGCSqGSIb3DQEJARYZb2xpdmllci5mYWx6b25lQHVu
-aW1lcy5mcjEUMBIGA1UEAxMLaW50ZXJuYWwtY2EwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDE+lfDp2RWVlMLP3x8TW02kx6ctJvtLoaz+qJzz7m5/a/a
-2OLO9/qGF5mFNlkGuo9Jc1nU+dyldBZhc2AFVZBZ8gXKay4gIvXfuKFLgPBIDO4r
-g6UhPYrKnVLsu2ubZNOpuGV6U5C9Fn+0ujtjmCqDyO7WVOmk3cnd1v0OYBMM+FQu
-acqKQU2hM+7Z3pAZ5vmarofS7ruI1lL4cPthXhUWC94cGCewlixYIX8AVEOXhrx8
-ugGr4Yc/+scusm2opSfYOO44SONJpd2UAWHEKuLAkMhdT6j1kIzo2fvw7oT4c6j/
-VRGL6bVZNyYO8RohuCdfrs7fW/CItv1VDQwIyN/1AgMBAAGjgdswgdgwHQYDVR0O
-BBYEFEGc2vp8DvLW7KwnfwLGZQ7VmuNXMIGoBgNVHSMEgaAwgZ2AFEGc2vp8DvLW
-7KwnfwLGZQ7VmuNXoYGBpH8wfTELMAkGA1UEBhMCRlIxDTALBgNVBAgTBEdhcmQx
-DjAMBgNVBAcTBU5pbWVzMQ8wDQYDVQQKEwZVbmltZXMxKDAmBgkqhkiG9w0BCQEW
-GW9saXZpZXIuZmFsem9uZUB1bmltZXMuZnIxFDASBgNVBAMTC2ludGVybmFsLWNh
-ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAC1stNrPLwVX5HKT
-A8zdX1CIqPxdaLPIgCqDqteResAAP2OjqBV7Scb9CAXsltwEanIPLOP2ynstERCw
-CnRWWwltWn2jIf1JWBVMGJKwN7YOQGZogABAsbuTlWQo/bIeFEkkLSaqlICQhEvM
-HJ6AKj0GUxyDr3VLSgCa9g4pj1gBINst/mKj0mPSGL+fHvzbFlEjGSnthIdcPqQG
-CqjOMoX6iPj3vvAXSo++WFj+VYDOq/DSdZq2z1mwUZ78qpiQJ+KT7FOkurZjaOsy
-eVfJ8kjDRKJ3wAixUi1+wFuVdpGnUbFLYhMQZdnXblhMzFE3uzni83QirSmLOemI
-KLb8WUE=
-					    </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>
-					      MIIEUTCCAzmgAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJGUjEN
-MAsGA1UECBMER2FyZDEOMAwGA1UEBxMFTmltZXMxDzANBgNVBAoTBlVuaW1lczEo
-MCYGCSqGSIb3DQEJARYZb2xpdmllci5mYWx6b25lQHVuaW1lcy5mcjEUMBIGA1UE
-AxMLaW50ZXJuYWwtY2EwHhcNMTMwNzA4MTExMTU0WhcNMjMwNzA2MTExMTU0WjB9
-MQswCQYDVQQGEwJGUjENMAsGA1UECBMER2FyZDEOMAwGA1UEBxMFTmltZXMxDzAN
-BgNVBAoTBlVuaW1lczEoMCYGCSqGSIb3DQEJARYZb2xpdmllci5mYWx6b25lQHVu
-aW1lcy5mcjEUMBIGA1UEAxMLaW50ZXJuYWwtY2EwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDE+lfDp2RWVlMLP3x8TW02kx6ctJvtLoaz+qJzz7m5/a/a
-2OLO9/qGF5mFNlkGuo9Jc1nU+dyldBZhc2AFVZBZ8gXKay4gIvXfuKFLgPBIDO4r
-g6UhPYrKnVLsu2ubZNOpuGV6U5C9Fn+0ujtjmCqDyO7WVOmk3cnd1v0OYBMM+FQu
-acqKQU2hM+7Z3pAZ5vmarofS7ruI1lL4cPthXhUWC94cGCewlixYIX8AVEOXhrx8
-ugGr4Yc/+scusm2opSfYOO44SONJpd2UAWHEKuLAkMhdT6j1kIzo2fvw7oT4c6j/
-VRGL6bVZNyYO8RohuCdfrs7fW/CItv1VDQwIyN/1AgMBAAGjgdswgdgwHQYDVR0O
-BBYEFEGc2vp8DvLW7KwnfwLGZQ7VmuNXMIGoBgNVHSMEgaAwgZ2AFEGc2vp8DvLW
-7KwnfwLGZQ7VmuNXoYGBpH8wfTELMAkGA1UEBhMCRlIxDTALBgNVBAgTBEdhcmQx
-DjAMBgNVBAcTBU5pbWVzMQ8wDQYDVQQKEwZVbmltZXMxKDAmBgkqhkiG9w0BCQEW
-GW9saXZpZXIuZmFsem9uZUB1bmltZXMuZnIxFDASBgNVBAMTC2ludGVybmFsLWNh
-ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAC1stNrPLwVX5HKT
-A8zdX1CIqPxdaLPIgCqDqteResAAP2OjqBV7Scb9CAXsltwEanIPLOP2ynstERCw
-CnRWWwltWn2jIf1JWBVMGJKwN7YOQGZogABAsbuTlWQo/bIeFEkkLSaqlICQhEvM
-HJ6AKj0GUxyDr3VLSgCa9g4pj1gBINst/mKj0mPSGL+fHvzbFlEjGSnthIdcPqQG
-CqjOMoX6iPj3vvAXSo++WFj+VYDOq/DSdZq2z1mwUZ78qpiQJ+KT7FOkurZjaOsy
-eVfJ8kjDRKJ3wAixUi1+wFuVdpGnUbFLYhMQZdnXblhMzFE3uzni83QirSmLOemI
-KLb8WUE=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://averell.unimes.fr/authsaml2/singleSignOnPost" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Portail Captif Univnautes - Université de Nîmes</md:ServiceName>
-      <md:ServiceName xml:lang="en">Eduspot - Nimes University</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Portail captif Univnautes - Université de Nîmes</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Eduspot - Nimes University</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="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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Nimes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Nimes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unimes.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Olivier FALZONE</md:SurName>
-    <md:EmailAddress>olivier.falzone@unimes.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Florence VERSE</md:SurName>
-    <md:EmailAddress>florence.verse@unimes.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/b2access.eudat.eu-8443-unitygw-saml-sp-metadata.xml b/swamid-interfederations-2.0/b2access.eudat.eu-8443-unitygw-saml-sp-metadata.xml
deleted file mode 100644
index 3410d0b8..00000000
--- a/swamid-interfederations-2.0/b2access.eudat.eu-8443-unitygw-saml-sp-metadata.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://b2access.eudat.eu:8443/unitygw/saml-sp-metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-22T13:13: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://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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">EUDAT B2ACCESS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">EUDAT B2ACCESS</mdui:DisplayName>
-        <mdui:Description xml:lang="de">AAI für EUDAT B2-Services</mdui:Description>
-        <mdui:Description xml:lang="en">AAI for EUDAT B2-Services</mdui:Description>
-        <mdui:Logo height="16" width="16">https://b2access.eudat.eu/files/logo-small.png</mdui:Logo>
-        <mdui:Logo height="146" width="146">https://b2access.eudat.eu/files/logo-huge.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://b2access.eudat.eu/files/about-b2access.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://b2access.eudat.eu/files/data-privacy-statement.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>b2access.eudat.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=b2access.eudat.eu,O=CSC - Tieteen tietotekniikan keskus Oy,L=Espoo,ST=Uusimaa,C=FI</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGLDCCBRSgAwIBAgIQAeV/HfOyLr/KjB6ZHxlt7zANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTA3MjgwMDAwMDBaFw0xODA4MDExMjAwMDBaMHwxCzAJBgNVBAYT
-AkZJMRAwDgYDVQQIEwdVdXNpbWFhMQ4wDAYDVQQHEwVFc3BvbzEvMC0GA1UEChMm
-Q1NDIC0gVGlldGVlbiB0aWV0b3Rla25paWthbiBrZXNrdXMgT3kxGjAYBgNVBAMT
-EWIyYWNjZXNzLmV1ZGF0LmV1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEAx2MMPwzn2ZcCXkBhqcP+/1//FKvonZ3F6NZ2gmas2SIgpTDC1IGQZLnJHteX
-lEJlDGD94t5tT12U12ckYNstQxdYZM+MC09t0dd841AU7jP1m/ZAmRfUA8JuwFxb
-tZJ1scqRatuJYF5qkpMJgfDmv5mfRIHldvbN9l7iGSdNFOHUTvC5o9nMe8yK5ygI
-bUsoXWRlvMIMaVMGECBmCtONfBJcJZyWXt1SLnA8k+CQHFq5Csf9go2e4MEB7lmd
-zQ3UcBlZ11yo/IY1z8g3TGc2KiYm5FL6Upq9XJWEEZIW2yaskx4FIavPkrvOshIW
-Q41kRuZVtXxZHhCbyEDdcDvDbDLEXIAXHevgMLohrA4WmGvmMY+hOpJSuPg7wFli
-wRWAxhzY3+wocCJUxkbY5BP5T7HxH85by+9Q6dRl5ZyapkSz4BSvK6WqYOk4ISE3
-3nxZqzoA+dimm72CkIXPeTckkGG9p4ebA8kZ2XWZyRs2xzst5B+b3duOGFJri3RS
-j1GBrptRubBGehHud9ZUykQGpMgFsvzXqT+vtxtU925jGx2aMcORWxUmexFG+3s1
-WGPB8oVIbwGIiGIlM7NZeaPkKGiliTqmk8Rr13GceVPODDoamC+jWwC/wHPm64Ca
-FUvVRzTAapTxh4LEe1ezwc0mXqXtH8MeHKvF/dehnW1jdscCAwEAAaOCAcAwggG8
-MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBRO9sfn
-4u/PACd1SCppYjInd8sGqjAcBgNVHREEFTATghFiMmFjY2Vzcy5ldWRhdC5ldTAO
-BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsG
-A1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFT
-U0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5B
-U1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIB
-FhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAk
-BggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAC
-hixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAM
-BgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQDFJgsh1k075HMtP2Vd5SBS
-ijrUCSxqqQ7p3xMeZ+gwdUK1INbmWOP6Xnr4bJowpsaCxowe/eNEI9NJgjxyUQaJ
-45cLfv645xQdChwUCoF0hGpKsPbYVjGAw3/krllIMUArTNu+XUcJ2XCYpKYoWkdd
-5GDykXfzenBxSpelvZ7eIwrN0TdZMhvI7zZ2Bxteyy+dB56Gk9JKpDfxMzx2zk9W
-iIKIWMqetWvib7JrgE4JjPZ0DXSnRnF2AsxqxIpMqf4GRf88YJTb2iePHcdNeqTo
-P2a4gOzCz0LX9+FJKl/jUVG4WXDtsmzA3hsFLqb2xFB8HePayCrABngz1gmEZvNV
-</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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://b2access.eudat.eu:8443/unitygw/spSAMLResponseConsumer" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">EUDAT B2ACCESS</md:ServiceName>
-      <md:ServiceName xml:lang="en">EUDAT B2ACCESS</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">AAI für EUDAT B2-Services</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">AAI for EUDAT B2-Services</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" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e234</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e234</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fz-juelich.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fz-juelich.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>B2ACCESS</md:GivenName>
-    <md:SurName>Technical</md:SurName>
-    <md:EmailAddress>mailto:b2access@fz-juelich.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>B2ACCESS</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:b2access@fz-juelich.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 4f919526..00000000
--- a/swamid-interfederations-2.0/ballbcauth.balliol.ox.ac.uk-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://ballbcauth.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a Balliol College: Main Site Network Registrations Shibboleth SP for Oxford University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-16T15:56:31Z"/>
-  </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://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAJF9q6+yquHvMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2JhbGxiY2F1dGguYmFsbGlvbC5veC5hYy51azAeFw0xMjA3MTIwOTE2MjJa
-						Fw0yMjA3MTAwOTE2MjJaMCYxJDAiBgNVBAMTG2JhbGxiY2F1dGguYmFsbGlvbC5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKat3hIahwBr
-						e/9cy/6ZMwoPDxNGissjmiBD7cEI8YkW26EyrSFlcEgTVDUrWWMyFoh8nCLJIPfK
-						4Lhm2WSJCiWj5z1NEEO/LE5HtA6W4T6D9VheAe1wbmL3pfq6lOfQ2reyi3wiruzL
-						NsVxBq7NcVcoB1Rz+N6RezpU6eO4tI6OP+R8EgMvlAPw3/LgDix5rLsxnYuOrCsR
-						QfuwyY0QisuQWrGV3Ko6InoB4/VgJzRX7nuiKOk0PPpM/wYYZdcWnWK2992Tk2ss
-						/mHjW2D2yrfqjBc2KqCvMqk9w4SQRF58y1DNZhatoXSOreSGaL7gCYX3+M5zSLZ2
-						oUNVMpe3Yg8CAwEAAaNJMEcwJgYDVR0RBB8wHYIbYmFsbGJjYXV0aC5iYWxsaW9s
-						Lm94LmFjLnVrMB0GA1UdDgQWBBQghUPDCQ70pB3A1tKNvIxtuDoGszANBgkqhkiG
-						9w0BAQUFAAOCAQEAPshnzBIb3O4qrk/i9y9EhhF7x6Y8RNQ3JeWEieAKeouJwCE9
-						i7riRyhv0663cK2umvCMpTEvhprvzZLaoo3XtAgkAp4lInUBKbxu2Xz99r7tun8N
-						Yk0hPLYpF08aSroUlWuNz2Hu+/8rcx3faWIdnVoxZqL27MvN07BDa75lw4vWi6d4
-						rF06fgDgv85RmWNbT2Zf/IETkm7NKuIPxIq3B9n9EFTt6v6x2cys0y3e/Z6w/h0r
-						fIJa1nSZqkrUSmx+s7wjbMxAp1OQrlwKaLvnnaXMbzacxQV6vuFUZXYSaB5jO3Lk
-						haYMvhH56lpRhiY3alj0zO78dMy3bBTike/+tw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ballbcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Balliol College - Main Site Network Registrations</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8f53f3ad..00000000
--- a/swamid-interfederations-2.0/ballhmauth.balliol.ox.ac.uk-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://ballhmauth.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a Balliol College: HM and JWT Network Registrations Shibboleth SP for Oxford University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-16T15:58:25Z"/>
-  </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://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAOGLhfhvZmWrMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2JhbGxobWF1dGguYmFsbGlvbC5veC5hYy51azAeFw0xMjA3MTIwOTIzMTVa
-						Fw0yMjA3MTAwOTIzMTVaMCYxJDAiBgNVBAMTG2JhbGxobWF1dGguYmFsbGlvbC5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJVc+Rvpuetz
-						KGBDcLb5IE7kVWS9ocVnky49w1dPWfAzoCD6M8uUZXo5p3Uhz9qkjewinGfJzGGR
-						DuOFQY7vHqdkStjTD6KiJpGqc7KMEVS3ALqVKcDooWXxoXPFVLw/KSerK+vJ2f0S
-						dmQSzHZbybHrQiu/uSiEgiAS9LFNpTf1NqYzJKpgQHOk43Fy1qxcFmY9etlzyQNF
-						CIrmrrGKqPGhE4I5wdXa+iSuodHBok7f66EcgX425Icyy9jpAG+I4vK/ZW2QaFd+
-						ls2WoeyHqeHd+6bDzx9PM0IZg/yoBB+yNazI0UXXvmphPSpPUCxza+BBY4M2JOOc
-						9ckQg6JE+tcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbYmFsbGhtYXV0aC5iYWxsaW9s
-						Lm94LmFjLnVrMB0GA1UdDgQWBBRdqcX7hnNNa8HySZBpyM0WVZQPAzANBgkqhkiG
-						9w0BAQUFAAOCAQEAGs2pK0uRW742oR1oqbMsSclc+iFboWXUQgWGFv8MiuZllbwa
-						THJNCCpmBw2OYjfXaztvbJ8csEGsbYmaNO/hLqeIrEdhS4WyBqK4LpNKFiasX+a1
-						ChokEfss17afSc22gsbV+DL3NgCIpI+LwTjGHSHciZ6mfinYoMyyRDYGUJ+Ty75e
-						dU3NwYxplRumD3fneIrLsQ4NqV979yvJSWlShKdb0O+4t1qRSMVPZb74plelI/f0
-						c28WqAH/V6JwRtXQEm30eRjZhRD4SXJtDLyPkLuKXQ/FTXRdI1HSqVMMi2ll4VqN
-						+VBl8jTl7qVzQIzFCFIdwLOaSSCvNrDsB7b9Cg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ballhmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Balliol College - HM and JWT Network Registrations</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index d047b058..00000000
--- a/swamid-interfederations-2.0/bamboo-server1.oerc.ox.ac.uk-shibboleth-sp.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://bamboo-server1.oerc.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Surfnet testing server" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-17T12:30: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://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE9DCCA9ygAwIBAgIJAJjPinj3h+6JMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-						VQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNV
-						BAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQLEwRPZVJDMSUwIwYDVQQD
-						ExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4
-						aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTIxNTQ0MzFaFw0yMTA1MDkx
-						NTQ0MzFaMIGsMQswCQYDVQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQH
-						EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQL
-						EwRPZVJDMSUwIwYDVQQDExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYw
-						JAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAM6EbueETfZqk/3WdvBBlhiyoKsd+nFOp6Xq
-						XrzetyhGYiPvRM12mh0yNnwQVDfUo3hDPziCmos8E+94Du1adJz8ekiFb8Nz7oNh
-						MKhzPi3DPU7vUTFd6bF/TiFR8FSq8PQJH6gL8Kn6zfECo2h+taVEjns6XNhOXXWI
-						zB+GMUSxRPdeFsmFUyvBExevNhPuO3C7N5WtbW4tG9j2sqdBJYYdeoy9nS3DVgSM
-						ctT15kPkIx46o37R1fNYAQskeOEey8+qMcRIbb4HA3L5RiuKxJ0Y1LbtGgezGwz2
-						9hRFqtdnwHPDBiNuJmWVWnuVxF07IowkZwzEVPf2QvXJy2UfIrUCAwEAAaOCARUw
-						ggERMB0GA1UdDgQWBBSMBsi1+lhDNEtrwQerDmHatWTUOTCB4QYDVR0jBIHZMIHW
-						gBSMBsi1+lhDNEtrwQerDmHatWTUOaGBsqSBrzCBrDELMAkGA1UEBhMCVUsxDzAN
-						BgNVBAgTBk94Zm9yZDEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJz
-						aXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzElMCMGA1UEAxMcYmFtYm9vLXNl
-						cnZlcjEub2VyYy5veC5hYy51azEmMCQGCSqGSIb3DQEJARYXeGluLnhpb25nQG9l
-						cmMub3guYWMudWuCCQCYz4p494fuiTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
-						BQUAA4IBAQAWU22GX9LpL7ZtQiiTTKdJg7zI3pUVNNcmZA5MARUdfZ6i+QmOWyDw
-						ReZmpq0sWkCMBYwOsYIYVzuCE45WBZ16wqrPZWvWfm/BSycMpuyr3aqNc2TwH38j
-						g09eFGbbX0haiMaUbicmEf72vL/n5K5lKZs/uFea5NIYUDvuKnLwXyYM6pN3mNLT
-						HMsIPDthR1ywJitmoVZaXYzQDjhHSe8oV4LEBULMU4erB/+Au/Q2nC+3OWYvUhhA
-						E7a86SCurSbeZylvzbNVrqMcR9Vs1Op1n374Ycb9kfXkweWc60RVvBBx6h474jLv
-						MbCgGVmfiQqekWeztRCKWq/Jqedw3vWF
-					</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>
-						MIIE9DCCA9ygAwIBAgIJAJjPinj3h+6JMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-						VQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNV
-						BAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQLEwRPZVJDMSUwIwYDVQQD
-						ExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4
-						aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTIxNTQ0MzFaFw0yMTA1MDkx
-						NTQ0MzFaMIGsMQswCQYDVQQGEwJVSzEPMA0GA1UECBMGT3hmb3JkMQ8wDQYDVQQH
-						EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMQ0wCwYDVQQL
-						EwRPZVJDMSUwIwYDVQQDExxiYW1ib28tc2VydmVyMS5vZXJjLm94LmFjLnVrMSYw
-						JAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAM6EbueETfZqk/3WdvBBlhiyoKsd+nFOp6Xq
-						XrzetyhGYiPvRM12mh0yNnwQVDfUo3hDPziCmos8E+94Du1adJz8ekiFb8Nz7oNh
-						MKhzPi3DPU7vUTFd6bF/TiFR8FSq8PQJH6gL8Kn6zfECo2h+taVEjns6XNhOXXWI
-						zB+GMUSxRPdeFsmFUyvBExevNhPuO3C7N5WtbW4tG9j2sqdBJYYdeoy9nS3DVgSM
-						ctT15kPkIx46o37R1fNYAQskeOEey8+qMcRIbb4HA3L5RiuKxJ0Y1LbtGgezGwz2
-						9hRFqtdnwHPDBiNuJmWVWnuVxF07IowkZwzEVPf2QvXJy2UfIrUCAwEAAaOCARUw
-						ggERMB0GA1UdDgQWBBSMBsi1+lhDNEtrwQerDmHatWTUOTCB4QYDVR0jBIHZMIHW
-						gBSMBsi1+lhDNEtrwQerDmHatWTUOaGBsqSBrzCBrDELMAkGA1UEBhMCVUsxDzAN
-						BgNVBAgTBk94Zm9yZDEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJz
-						aXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzElMCMGA1UEAxMcYmFtYm9vLXNl
-						cnZlcjEub2VyYy5veC5hYy51azEmMCQGCSqGSIb3DQEJARYXeGluLnhpb25nQG9l
-						cmMub3guYWMudWuCCQCYz4p494fuiTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
-						BQUAA4IBAQAWU22GX9LpL7ZtQiiTTKdJg7zI3pUVNNcmZA5MARUdfZ6i+QmOWyDw
-						ReZmpq0sWkCMBYwOsYIYVzuCE45WBZ16wqrPZWvWfm/BSycMpuyr3aqNc2TwH38j
-						g09eFGbbX0haiMaUbicmEf72vL/n5K5lKZs/uFea5NIYUDvuKnLwXyYM6pN3mNLT
-						HMsIPDthR1ywJitmoVZaXYzQDjhHSe8oV4LEBULMU4erB/+Au/Q2nC+3OWYvUhhA
-						E7a86SCurSbeZylvzbNVrqMcR9Vs1Op1n374Ycb9kfXkweWc60RVvBBx6h474jLv
-						MbCgGVmfiQqekWeztRCKWq/Jqedw3vWF
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bamboo-server1.oerc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Surfnet testing server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oerc.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:support@oerc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:support@oerc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/baran-is0.educampus.ie-adfs-services-trust.xml b/swamid-interfederations-2.0/baran-is0.educampus.ie-adfs-services-trust.xml
deleted file mode 100644
index 8e02ec1d..00000000
--- a/swamid-interfederations-2.0/baran-is0.educampus.ie-adfs-services-trust.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://baran-is0.educampus.ie/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2016-01-27T13:23:57Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">educampus.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Educampus Services Ltd</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Staff of Edcampus Services Ltd.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.educampus.ie</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.educampus.ie/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="223" width="968">data:image/png;base64,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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>educampus.ie</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC6DCCAdCgAwIBAgIQfLkrExunx71JJG9k7UWICDANBgkqhkiG9w0BAQsFADAw
-MS4wLAYDVQQDEyVBREZTIFNpZ25pbmcgLSBiYXJhbi1pczAuZWR1Y2FtcHVzLmll
-MB4XDTE2MDEyNTExMTczOVoXDTE3MDEyNDExMTczOVowMDEuMCwGA1UEAxMlQURG
-UyBTaWduaW5nIC0gYmFyYW4taXMwLmVkdWNhbXB1cy5pZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJqSMshN9B+p//tO+khi7fUF+Pp43f8oTL5jr1eG
-9LNY1b1NLKbLmPF8os0wzs2x0KuELokSdPRAY6UWbsW45LsX1u1V7KwprzNSaiEL
-4O/7cYOsN5p2rSLWhFZMygClPJcYaCFCuD4xb/4I1prCB0aXgfg2sMv5TWot1iRY
-bJvQXjbLjnUZEusxQcHd6Iw2CzjC1zessRNPXRTMs9oFRdkFVQApTmOgxclPabE3
-z5B7YuR+COq5kGyzxCQpzdc8JKBK+SMB7nSqz8rlHsNSOm+Kp5rzOxKvBbFFDDBu
-gLH/hdw8AKf7fJupGXq9ZdxEKlFKsm7oXtLzRIQoLs0o2PUCAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAUs8jgnbOjl20OBxE7bWb2uJLe6bPR8nUJmiwgu4u6ufHi0oP
-vajjIol/JekifoY3cQsUP9yee6ZIohxCmgPQAb/qRPna6QKVKVqtQCqw+zH8UiCF
-StH5mQU2/XrPXX7nNMx4W9ARVOA7SyLlF+QltbQTgx3QnpjUlL1o9f9YEyoXKFI9
-mMfiP9hRIKA7jSNg8FuO8RO9jcJ/aR3g0DVXh0xTX1HsIz+h8LXzuVqWWirpEMZQ
-HqKbiihLuzkSlaouL8VaSfU3tbWdFQJ++sFRXjm/zH7QUj8IejoqPshbmDi6uy8Q
-2zfsdnP8zq18XmlTterKy+KbHl2/8AEH0wtdRg==
-</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>
-MIIC7jCCAdagAwIBAgIQGaxn4WoVJ4RGY7ynHoDt+jANBgkqhkiG9w0BAQsFADAz
-MTEwLwYDVQQDEyhBREZTIEVuY3J5cHRpb24gLSBiYXJhbi1pczAuZWR1Y2FtcHVz
-LmllMB4XDTE2MDEyNTExMTc0MFoXDTE3MDEyNDExMTc0MFowMzExMC8GA1UEAxMo
-QURGUyBFbmNyeXB0aW9uIC0gYmFyYW4taXMwLmVkdWNhbXB1cy5pZTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKozsCxS4zD0GpzN4B8HzEQV6kkrt8IN
-w+vdMmjJ8wSm01R2LIOkEbRcGSWEpOrl3Lwr7WTY3FiSEYhAjobfck6sdf4GN+N3
-2hS/G7q1ZoebGP9ybLCl9/CL8dQbh605gDSmed/7NQc0RhzcI/72kC48Eb2oiena
-WjGOj2GkHsEd3h70aX/bP6fSHZkZtOncgJWZGdhXriYIXy+GzerSq9AUEGdq6CGG
-Kp4lXhwn4BVk2ara2KPG8YO5Vw2pKBW/AyrVYgNDY0VFSwE0vu67SyLUjNX2cyxc
-BCCwxHHrNC91BA5kvpi/RyxypzmotERxWcLQ5+WeVjfehs6Hrz4cIE0CAwEAATAN
-BgkqhkiG9w0BAQsFAAOCAQEAKHpPDd4WdpYgD4EMYi/qE0ey27pj0cJFZD0EFBi1
-fIYzXZUc84BZort4yrBsqDnjd/HxeWcDNAm3CLStyFUK1ZM4on88zlW6UrXNnw4d
-PDledccnW0loFec1YuzSxreinl/+zQG5uUPTaU7V3do+hGoZmxQHq3Z5xN6qbdsc
-3/ktlL/Qobxn8uGtXNXwACMplQHXzMx9/IKBAG4MGhtcfe/+aARm7NnP2TO6Pv+9
-aw8ObgdtzJVmfGsk3+PEztPlQTMix1Ov2j8LPJK2det9Yv0QAwMNQD5MymNIz85U
-fFBvKQ+xuUed4ReV1CgCnv0jbQZkaDHO2ctZSojPnN08fA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://baran-is0.educampus.ie/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://baran-is0.educampus.ie/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://baran-is0.educampus.ie/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Educampus Services Limited</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Educampus Services</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.educampus.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>HEAnet</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc-middleware@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bath-test.topdesk.net-tas-public-login-verify.xml b/swamid-interfederations-2.0/bath-test.topdesk.net-tas-public-login-verify.xml
deleted file mode 100644
index 45db8ae2..00000000
--- a/swamid-interfederations-2.0/bath-test.topdesk.net-tas-public-login-verify.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://bath-test.topdesk.net/tas/public/login/verify">
-  <!--
-		This is a "TOPdesk (test)" TOPdesk SP for the University of Bath.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-18T13:16:40Z">
-      <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">University of Bath: TOPdesk (test)</mdui:DisplayName>
-        <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDfzCCAmegAwIBAgIJAMZFjLdaD8wQMA0GCSqGSIb3DQEBCwUAMDMxETAPBgNV
-						BAMTCGJhdGh0ZXN0MREwDwYDVQQKEwhiYXRodGVzdDELMAkGA1UEBhMCVUswHhcN
-						MTUxMTEzMTQ0OTI5WhcNMjUxMTEwMTQ0OTI5WjAzMREwDwYDVQQDEwhiYXRodGVz
-						dDERMA8GA1UEChMIYmF0aHRlc3QxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA2eOkEdenoY3OwPOZZU1DtIMo16b64qnpkdoXXnLe
-						OKS50XKF+6LJWm28XxDBGGbQzXTby5X368RJ+B4q6Ji11Zw4EJ+fM0y9ovspEJR8
-						LpMkmzPIQS70B+7gCnAVmxm5St+oxfYuBsJMB3a5HlPn/4g/wJwjQvZhQ3BZHvHN
-						zhJPv7ksxTsZX4jGbD68LzpdSgY+8S0c/v3oUig2PdGsvXZquLFwpMC+iQPJoK34
-						HeUkG+2/qsZUpgT3mEGDZsEE68weU93LZWfvn6pepRnaIUjZ2wrMl135SgabQEfc
-						7sm3aB33DjMu+IhrNwZrMyvhW+fYKYGDONgKlr/W5E+RtQIDAQABo4GVMIGSMB0G
-						A1UdDgQWBBT1y7zA1qIDRDT+FdYJRTFWvgHWDzBjBgNVHSMEXDBagBT1y7zA1qID
-						RDT+FdYJRTFWvgHWD6E3pDUwMzERMA8GA1UEAxMIYmF0aHRlc3QxETAPBgNVBAoT
-						CGJhdGh0ZXN0MQswCQYDVQQGEwJVS4IJAMZFjLdaD8wQMAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQELBQADggEBABqS87n8Qycc2qXzFbMHkFoYxNT8+Y9MI63giai5
-						r33rbnfAY3P9+TN3KGTvZnjE8pgiy4HEZ0C1R95izlGcgFR4k/ksymgFRH4+/rDX
-						Mxq9xCcijwj+V1RQYbA9U4poKeXbv6dBosnk/GGgFDPDeK97HK7xwZ3Mq9d2bQ2v
-						7hXQ+vgQFZp6OX+Iteh1/xMG8BgTNUOmlLb1xVlfecfULpptEvmnW/aQpqTqJQPj
-						nMK3+jbybpCqVJ+zUbHvaENv7FV629EFZrXBHdVG7DVQyMZlKtAzmal8ifenH/sb
-						oSq/hb5S3hmWKzG5Z1crLVsWOwpD1aVjD0sjz25jJU8NKUs=
-					</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>
-						MIIDfzCCAmegAwIBAgIJAMZFjLdaD8wQMA0GCSqGSIb3DQEBCwUAMDMxETAPBgNV
-						BAMTCGJhdGh0ZXN0MREwDwYDVQQKEwhiYXRodGVzdDELMAkGA1UEBhMCVUswHhcN
-						MTUxMTEzMTQ0OTI5WhcNMjUxMTEwMTQ0OTI5WjAzMREwDwYDVQQDEwhiYXRodGVz
-						dDERMA8GA1UEChMIYmF0aHRlc3QxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA2eOkEdenoY3OwPOZZU1DtIMo16b64qnpkdoXXnLe
-						OKS50XKF+6LJWm28XxDBGGbQzXTby5X368RJ+B4q6Ji11Zw4EJ+fM0y9ovspEJR8
-						LpMkmzPIQS70B+7gCnAVmxm5St+oxfYuBsJMB3a5HlPn/4g/wJwjQvZhQ3BZHvHN
-						zhJPv7ksxTsZX4jGbD68LzpdSgY+8S0c/v3oUig2PdGsvXZquLFwpMC+iQPJoK34
-						HeUkG+2/qsZUpgT3mEGDZsEE68weU93LZWfvn6pepRnaIUjZ2wrMl135SgabQEfc
-						7sm3aB33DjMu+IhrNwZrMyvhW+fYKYGDONgKlr/W5E+RtQIDAQABo4GVMIGSMB0G
-						A1UdDgQWBBT1y7zA1qIDRDT+FdYJRTFWvgHWDzBjBgNVHSMEXDBagBT1y7zA1qID
-						RDT+FdYJRTFWvgHWD6E3pDUwMzERMA8GA1UEAxMIYmF0aHRlc3QxETAPBgNVBAoT
-						CGJhdGh0ZXN0MQswCQYDVQQGEwJVS4IJAMZFjLdaD8wQMAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQELBQADggEBABqS87n8Qycc2qXzFbMHkFoYxNT8+Y9MI63giai5
-						r33rbnfAY3P9+TN3KGTvZnjE8pgiy4HEZ0C1R95izlGcgFR4k/ksymgFRH4+/rDX
-						Mxq9xCcijwj+V1RQYbA9U4poKeXbv6dBosnk/GGgFDPDeK97HK7xwZ3Mq9d2bQ2v
-						7hXQ+vgQFZp6OX+Iteh1/xMG8BgTNUOmlLb1xVlfecfULpptEvmnW/aQpqTqJQPj
-						nMK3+jbybpCqVJ+zUbHvaENv7FV629EFZrXBHdVG7DVQyMZlKtAzmal8ifenH/sb
-						oSq/hb5S3hmWKzG5Z1crLVsWOwpD1aVjD0sjz25jJU8NKUs=
-					</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://bath-test.topdesk.net/tas/public/login/verify" index="0"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Bath</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bath: TOPdesk (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://bath.topdesk.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Webmaster</GivenName>
-    <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Phillips</SurName>
-    <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.xml b/swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.xml
deleted file mode 100644
index e7aac76d..00000000
--- a/swamid-interfederations-2.0/bath-test.topdesk.net-tas-secure-login-verify.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://bath-test.topdesk.net/tas/secure/login/verify">
-  <!--
-		This is a "TOPdesk (test)" TOPdesk SP for the University of Bath.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-18T13:18:10Z">
-      <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">University of Bath: TOPdesk (test)</mdui:DisplayName>
-        <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDfzCCAmegAwIBAgIJAOFdmodszT1AMA0GCSqGSIb3DQEBCwUAMDMxETAPBgNV
-						BAMTCGJhdGh0ZXN0MREwDwYDVQQKEwhiYXRodGVzdDELMAkGA1UEBhMCVUswHhcN
-						MTUxMTEzMTQ0OTMwWhcNMjUxMTEwMTQ0OTMwWjAzMREwDwYDVQQDEwhiYXRodGVz
-						dDERMA8GA1UEChMIYmF0aHRlc3QxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA2EyNZlxxLwQ8q4v1K58xvsz9XMJU/eBXEEBIxi/K
-						nQH5i4UIirWsDfUq4ZZuQS6y1AG260n/1Q0zEABQ1F1XjKOxlaNlZSfWRXSVjIy6
-						CD1faxqaWtmFKLhqOwbSampxM9ykoucDetj9TjBOxPodd2ddRlT6mDUs/ILZmlVu
-						YU8DZ858mI9SQGIvtdux8WB9T6RAjBQhi5GjIstUOK74+70AQ0FnBm5YEd9t4Tl+
-						k0Zu/FKvgjxxDCUy7vFDUy4bCXcYBEya9ue0NK6UbmK0GgiYn4O6e0jJfVCdkK/c
-						2QflHWuUxa583Q1aUFvkUPuT8Wpegus4Jh5wmkIkdM6V/wIDAQABo4GVMIGSMB0G
-						A1UdDgQWBBQE2/JgQm/vp+Ni21Voe5PbfvKPlTBjBgNVHSMEXDBagBQE2/JgQm/v
-						p+Ni21Voe5PbfvKPlaE3pDUwMzERMA8GA1UEAxMIYmF0aHRlc3QxETAPBgNVBAoT
-						CGJhdGh0ZXN0MQswCQYDVQQGEwJVS4IJAOFdmodszT1AMAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQELBQADggEBAK/KFlbDqcbXDGYcU9VkhEWJtJ1ozW+l0FlAbbVG
-						ACa4wn0l4CNcuJCt6B1UR6548nQLZh9KttcyCJLo+CPUGylCC44ubB8SY8ViRDfu
-						A7+uIPCXcPglRXvFsWbh7//SkvBUbG9MPiZOYO64jWO24KOZg2/ETcrqbhKIUzmw
-						N9tzXCG29q9pToWS1YqWNl4GrflNC0XpIwXeLgCmZpp55QUPLzXxQZ/MeJa9fepH
-						OJzl5HphWOr/DgZdxRLl9MZcByEuK/lEO8p2HOn7C8PvrWu6SpWwWObfzn10malB
-						BYSdBJ8B23JgWfhPEwjSYSDHfr8fD+058j6U00yvfdqsvg4=
-					</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>
-						MIIDfzCCAmegAwIBAgIJAOFdmodszT1AMA0GCSqGSIb3DQEBCwUAMDMxETAPBgNV
-						BAMTCGJhdGh0ZXN0MREwDwYDVQQKEwhiYXRodGVzdDELMAkGA1UEBhMCVUswHhcN
-						MTUxMTEzMTQ0OTMwWhcNMjUxMTEwMTQ0OTMwWjAzMREwDwYDVQQDEwhiYXRodGVz
-						dDERMA8GA1UEChMIYmF0aHRlc3QxCzAJBgNVBAYTAlVLMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA2EyNZlxxLwQ8q4v1K58xvsz9XMJU/eBXEEBIxi/K
-						nQH5i4UIirWsDfUq4ZZuQS6y1AG260n/1Q0zEABQ1F1XjKOxlaNlZSfWRXSVjIy6
-						CD1faxqaWtmFKLhqOwbSampxM9ykoucDetj9TjBOxPodd2ddRlT6mDUs/ILZmlVu
-						YU8DZ858mI9SQGIvtdux8WB9T6RAjBQhi5GjIstUOK74+70AQ0FnBm5YEd9t4Tl+
-						k0Zu/FKvgjxxDCUy7vFDUy4bCXcYBEya9ue0NK6UbmK0GgiYn4O6e0jJfVCdkK/c
-						2QflHWuUxa583Q1aUFvkUPuT8Wpegus4Jh5wmkIkdM6V/wIDAQABo4GVMIGSMB0G
-						A1UdDgQWBBQE2/JgQm/vp+Ni21Voe5PbfvKPlTBjBgNVHSMEXDBagBQE2/JgQm/v
-						p+Ni21Voe5PbfvKPlaE3pDUwMzERMA8GA1UEAxMIYmF0aHRlc3QxETAPBgNVBAoT
-						CGJhdGh0ZXN0MQswCQYDVQQGEwJVS4IJAOFdmodszT1AMAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQELBQADggEBAK/KFlbDqcbXDGYcU9VkhEWJtJ1ozW+l0FlAbbVG
-						ACa4wn0l4CNcuJCt6B1UR6548nQLZh9KttcyCJLo+CPUGylCC44ubB8SY8ViRDfu
-						A7+uIPCXcPglRXvFsWbh7//SkvBUbG9MPiZOYO64jWO24KOZg2/ETcrqbhKIUzmw
-						N9tzXCG29q9pToWS1YqWNl4GrflNC0XpIwXeLgCmZpp55QUPLzXxQZ/MeJa9fepH
-						OJzl5HphWOr/DgZdxRLl9MZcByEuK/lEO8p2HOn7C8PvrWu6SpWwWObfzn10malB
-						BYSdBJ8B23JgWfhPEwjSYSDHfr8fD+058j6U00yvfdqsvg4=
-					</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://bath-test.topdesk.net/tas/secure/login/verify" index="0"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Bath</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bath: TOPdesk (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://bath.topdesk.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Webmaster</GivenName>
-    <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Phillips</SurName>
-    <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bath.topdesk.net-tas-public-login-verify.xml b/swamid-interfederations-2.0/bath.topdesk.net-tas-public-login-verify.xml
deleted file mode 100644
index eddecb85..00000000
--- a/swamid-interfederations-2.0/bath.topdesk.net-tas-public-login-verify.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bath.topdesk.net/tas/public/login/verify">
-  <!--
-		This is a TOPdesk SP for the University of Bath.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-05T10:44:56Z">
-      <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">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZzCCAk+gAwIBAgIJANCIcdjqpry3MA0GCSqGSIb3DQEBCwUAMCsxDTALBgNV
-						BAMTBGJhdGgxDTALBgNVBAoTBGJhdGgxCzAJBgNVBAYTAlVLMB4XDTE2MDEwNDA5
-						NTEzNVoXDTI2MDEwMTA5NTEzNVowKzENMAsGA1UEAxMEYmF0aDENMAsGA1UEChME
-						YmF0aDELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCwvaahZ5kXMwXof8Ae1E2YyVAs39/DIVxtNwot2aldaBNTnUeKeEzpyjuuMgNV
-						mXQxp0XDMpWjSUnWvTrAS7MqafWhC0rLFWFKyuCtw6ZQW8YYOnf+Lv4bF2gyOXnP
-						/XSUH9RPqJler6xU/4C6k96x47hRPTZYzDpuSsrtw80HUBnblWHZ0ID6YTCGb2Df
-						zPAFq/0wCiYuFyZFyWgJ2PBpNQRnUeMyjiUsiOf9xe5Fo2P7vo9SJ3HDYpLGeKON
-						Z00iXf7+k8DFr89jKKW7DF1viy1+kG/rqYIrn4wU7wWA77l5SyNLekhdkgwD8JIg
-						gtp9j3YDap/y9+wclBkMrDW1AgMBAAGjgY0wgYowHQYDVR0OBBYEFNT03jM3IxyK
-						bi2RIfCBnKYoGmXzMFsGA1UdIwRUMFKAFNT03jM3IxyKbi2RIfCBnKYoGmXzoS+k
-						LTArMQ0wCwYDVQQDEwRiYXRoMQ0wCwYDVQQKEwRiYXRoMQswCQYDVQQGEwJVS4IJ
-						ANCIcdjqpry3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAItqA/JO
-						MLI6+oEcFXLv6UmQAZgyQH4BrbrsqIZjUQqT8moPeAYx+c6FBJJCfpP/020kn9ZY
-						riRJg0HEidZSYlXIOrLbsuKLdD4QvZ2ujvXxraBW4afz6pwG4Dpai/I+RmHb4U5d
-						mXkSbkJnc6IafiwWHm93+iLFp1Rlhhd0DKuLibjZ2SnaoMoP9++PabaNkpaUfvSd
-						26s45S31+sW4gvLymvClectetGTtQbIsceuvCDSlpDE1kaxRtZe8knC4QVXoZyqS
-						Qq88+taDfX0Txl0htpg3+wO+iygQIP8ERr8QhoCXUckoaWGusd8ZgLGveeXwq4Cb
-						8Oi2R3LTJ9/2fRQ=
-					</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>
-						MIIDZzCCAk+gAwIBAgIJANCIcdjqpry3MA0GCSqGSIb3DQEBCwUAMCsxDTALBgNV
-						BAMTBGJhdGgxDTALBgNVBAoTBGJhdGgxCzAJBgNVBAYTAlVLMB4XDTE2MDEwNDA5
-						NTEzNVoXDTI2MDEwMTA5NTEzNVowKzENMAsGA1UEAxMEYmF0aDENMAsGA1UEChME
-						YmF0aDELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCwvaahZ5kXMwXof8Ae1E2YyVAs39/DIVxtNwot2aldaBNTnUeKeEzpyjuuMgNV
-						mXQxp0XDMpWjSUnWvTrAS7MqafWhC0rLFWFKyuCtw6ZQW8YYOnf+Lv4bF2gyOXnP
-						/XSUH9RPqJler6xU/4C6k96x47hRPTZYzDpuSsrtw80HUBnblWHZ0ID6YTCGb2Df
-						zPAFq/0wCiYuFyZFyWgJ2PBpNQRnUeMyjiUsiOf9xe5Fo2P7vo9SJ3HDYpLGeKON
-						Z00iXf7+k8DFr89jKKW7DF1viy1+kG/rqYIrn4wU7wWA77l5SyNLekhdkgwD8JIg
-						gtp9j3YDap/y9+wclBkMrDW1AgMBAAGjgY0wgYowHQYDVR0OBBYEFNT03jM3IxyK
-						bi2RIfCBnKYoGmXzMFsGA1UdIwRUMFKAFNT03jM3IxyKbi2RIfCBnKYoGmXzoS+k
-						LTArMQ0wCwYDVQQDEwRiYXRoMQ0wCwYDVQQKEwRiYXRoMQswCQYDVQQGEwJVS4IJ
-						ANCIcdjqpry3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAItqA/JO
-						MLI6+oEcFXLv6UmQAZgyQH4BrbrsqIZjUQqT8moPeAYx+c6FBJJCfpP/020kn9ZY
-						riRJg0HEidZSYlXIOrLbsuKLdD4QvZ2ujvXxraBW4afz6pwG4Dpai/I+RmHb4U5d
-						mXkSbkJnc6IafiwWHm93+iLFp1Rlhhd0DKuLibjZ2SnaoMoP9++PabaNkpaUfvSd
-						26s45S31+sW4gvLymvClectetGTtQbIsceuvCDSlpDE1kaxRtZe8knC4QVXoZyqS
-						Qq88+taDfX0Txl0htpg3+wO+iygQIP8ERr8QhoCXUckoaWGusd8ZgLGveeXwq4Cb
-						8Oi2R3LTJ9/2fRQ=
-					</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://bath.topdesk.net/tas/public/login/verify" index="0"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Bath</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bath: TOPdesk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://bath.topdesk.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Webmaster</GivenName>
-    <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Phillips</SurName>
-    <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bath.topdesk.net-tas-secure-login-verify.xml b/swamid-interfederations-2.0/bath.topdesk.net-tas-secure-login-verify.xml
deleted file mode 100644
index 58c101f0..00000000
--- a/swamid-interfederations-2.0/bath.topdesk.net-tas-secure-login-verify.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bath.topdesk.net/tas/secure/login/verify">
-  <!--
-		This is a TOPdesk SP for the University of Bath.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-05T10:45:31Z">
-      <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">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZzCCAk+gAwIBAgIJANWWq1QV/xKBMA0GCSqGSIb3DQEBCwUAMCsxDTALBgNV
-						BAMTBGJhdGgxDTALBgNVBAoTBGJhdGgxCzAJBgNVBAYTAlVLMB4XDTE2MDEwNDA5
-						NTEzNVoXDTI2MDEwMTA5NTEzNVowKzENMAsGA1UEAxMEYmF0aDENMAsGA1UEChME
-						YmF0aDELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCpzYSz8kSXfb/nupnsKs4/PHqHmvUwX5wCjmeNmxn/JW54cJ1uX/TyZkjuqFYh
-						9rU30nUeHtgSmvvsm1GP5+BCZx4n7hj6t3BH48o6GWVrrMIQxhU7p0PNbkF9XWJg
-						NCe9Ful4EmeY6NcH5NDVlPD2deEOZRXmRFSPIS2DM/mrkB+jaZF4fMuzVJxfQZ+y
-						eOzNtTgUz39hoZNwl/Z2sEQvU9G46yDgY5H4GNq9ZkFDZBRpNDTWGLaW2EfUU3lY
-						m/uVbFl8cxPUb6H03yKcF7k6mUAR1RDRVakOB7O1W3JD0biaKZvvF6YlgjrYUXYB
-						tVBs0RwjzLJF44qemoEu85a/AgMBAAGjgY0wgYowHQYDVR0OBBYEFDtwsBxvk/YY
-						DKUGR+SuduMslh8/MFsGA1UdIwRUMFKAFDtwsBxvk/YYDKUGR+SuduMslh8/oS+k
-						LTArMQ0wCwYDVQQDEwRiYXRoMQ0wCwYDVQQKEwRiYXRoMQswCQYDVQQGEwJVS4IJ
-						ANWWq1QV/xKBMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJ1s6Agj
-						e84yW6UZHvgSHIcLaKz8v4GbSfKVq3ZZe1jnzyp1QLtNKN0YAjP+LGDcJ+bPrCDR
-						Xp3/uaEfYLAMJoEyMOykat9ExragejLKtRaIzp9PiOIGTLjMjecGlRMtuWrkm2vb
-						rTBjexjv91sMIabJqwxJPaXUJS8WfgNeRLR7EPCn5KUsV5aI4Zkx+FwVebh0Khqd
-						oNoOaIYxOFBqS9CTkRuwE9TmOqGpu9xD5TIbFF+MgQd6/Y9LP/od8Cjvu72GU9kJ
-						sp5En2U7NONIqsFmbU9O4k1Lki5JHWmBGX5DsGkoHVj8XyuAbgNaNqQDvWw0TOw6
-						PxgmfYEjY2kiDdg=
-					</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>
-						MIIDZzCCAk+gAwIBAgIJANWWq1QV/xKBMA0GCSqGSIb3DQEBCwUAMCsxDTALBgNV
-						BAMTBGJhdGgxDTALBgNVBAoTBGJhdGgxCzAJBgNVBAYTAlVLMB4XDTE2MDEwNDA5
-						NTEzNVoXDTI2MDEwMTA5NTEzNVowKzENMAsGA1UEAxMEYmF0aDENMAsGA1UEChME
-						YmF0aDELMAkGA1UEBhMCVUswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCpzYSz8kSXfb/nupnsKs4/PHqHmvUwX5wCjmeNmxn/JW54cJ1uX/TyZkjuqFYh
-						9rU30nUeHtgSmvvsm1GP5+BCZx4n7hj6t3BH48o6GWVrrMIQxhU7p0PNbkF9XWJg
-						NCe9Ful4EmeY6NcH5NDVlPD2deEOZRXmRFSPIS2DM/mrkB+jaZF4fMuzVJxfQZ+y
-						eOzNtTgUz39hoZNwl/Z2sEQvU9G46yDgY5H4GNq9ZkFDZBRpNDTWGLaW2EfUU3lY
-						m/uVbFl8cxPUb6H03yKcF7k6mUAR1RDRVakOB7O1W3JD0biaKZvvF6YlgjrYUXYB
-						tVBs0RwjzLJF44qemoEu85a/AgMBAAGjgY0wgYowHQYDVR0OBBYEFDtwsBxvk/YY
-						DKUGR+SuduMslh8/MFsGA1UdIwRUMFKAFDtwsBxvk/YYDKUGR+SuduMslh8/oS+k
-						LTArMQ0wCwYDVQQDEwRiYXRoMQ0wCwYDVQQKEwRiYXRoMQswCQYDVQQGEwJVS4IJ
-						ANWWq1QV/xKBMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJ1s6Agj
-						e84yW6UZHvgSHIcLaKz8v4GbSfKVq3ZZe1jnzyp1QLtNKN0YAjP+LGDcJ+bPrCDR
-						Xp3/uaEfYLAMJoEyMOykat9ExragejLKtRaIzp9PiOIGTLjMjecGlRMtuWrkm2vb
-						rTBjexjv91sMIabJqwxJPaXUJS8WfgNeRLR7EPCn5KUsV5aI4Zkx+FwVebh0Khqd
-						oNoOaIYxOFBqS9CTkRuwE9TmOqGpu9xD5TIbFF+MgQd6/Y9LP/od8Cjvu72GU9kJ
-						sp5En2U7NONIqsFmbU9O4k1Lki5JHWmBGX5DsGkoHVj8XyuAbgNaNqQDvWw0TOw6
-						PxgmfYEjY2kiDdg=
-					</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://bath.topdesk.net/tas/secure/login/verify" index="0"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Bath</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bath: TOPdesk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://bath.topdesk.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Webmaster</GivenName>
-    <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Phillips</SurName>
-    <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bathspa.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/bathspa.ac.uk-oala-metadata.xml
deleted file mode 100644
index f3fbf2de..00000000
--- a/swamid-interfederations-2.0/bathspa.ac.uk-oala-metadata.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://bathspa.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Bath Spa University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-11T18:26:50Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">bathspa.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjACCQDcLoBcXhuQpDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
-						QjENMAsGA1UECAwEQmF0aDENMAsGA1UEBwwEQmF0aDEcMBoGA1UECgwTQmF0aCBT
-						cGEgVW5pdmVyc2l0eTEbMBkGA1UEAwwSYXV0aC5iYXRoc3BhLmFjLnVrMB4XDTE0
-						MDkxMTEyNDY0MFoXDTI0MDkwODEyNDY0MFowZjELMAkGA1UEBhMCR0IxDTALBgNV
-						BAgMBEJhdGgxDTALBgNVBAcMBEJhdGgxHDAaBgNVBAoME0JhdGggU3BhIFVuaXZl
-						cnNpdHkxGzAZBgNVBAMMEmF1dGguYmF0aHNwYS5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBANDnvw+jI/NjbEuPbKzjfQa5FqOZGYy2cGaX8opS
-						WODxFwY/Ua8a9JJQlX2a8b2Wu7niQyJo1z75+cTVTljXXi4z5sghIhheFu0nv6zs
-						jA73qefWlNkpUK7ytjPVrS1LE0OttEt5uvRVb4M0j3oIF3ueAMNeASJMGw7hHqM8
-						7s9diYWljFnIiAnN0SXtMNskRBOvXQCxY1tY/qB8g1t4vx9TXyC3s54JBhT+o3wU
-						dy0dCWpiY9iQNQLx3+l/74XqlwIIaFYHylheQMxkp1pEP1kO8LHor1n/0mtCzvK0
-						wGOUge2oW6AaDhqEZSOkcEIhDw4M6dKyNvOM7UiXFO853fUCAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEARqEYYD8T5djkWXdTunxb9OCUNTVX6MOmBgFoE9wREI3zOWHR
-						sR0nLbQylmfpqQBvgncqlhc0Ozd+Va8MXYcAFxoCBLOVc28I+Buengp+lhbddHBX
-						1WaXAovAO8gzXCTO2KlUagzLDMGdUetz9UE+raA5D+RNPtchdNsXM+ma/rFzuZNI
-						WC36eJwChM8Lz+Pge/lQAb9tsllTwvy8fh/xGwBxR5N+f5tupZjbj3uuWevR8oa3
-						/egG7ermySwN33hXy3aWdP22CDWc8kxV44J5p8Cq3UTU08aXtlDMtaiTwBZ633Hx
-						/6/Zs/TcjIKAfbi6nBCf9z6u2SrAtIiRcU51nw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.bathspa.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.bathspa.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Bath Spa University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bath Spa University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bathspa.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>E-Resources</GivenName>
-    <EmailAddress>mailto:e-resources@bathspa.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Pete</GivenName>
-    <SurName>Fry</SurName>
-    <EmailAddress>mailto:p.fry@bathspa.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bathspa.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/bathspa.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index f793aa36..00000000
--- a/swamid-interfederations-2.0/bathspa.idm.oclc.org-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://bathspa.idm.oclc.org/shibboleth">
-  <!--
-		This is a "Bath Spa University" EZproxy SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-15T08:34:21Z">
-      <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 ">
-    <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://login.bathspa.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEDjCCAvagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBnMR8wHQYDVQQDFBYqLmJh
-						dGhzcGEuaWRtLm9jbGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEo
-						MCYGCSqGSIb3DQEJARYZamFtZXMuaHV0Y2hpbnNvbkBvY2xjLm9yZzAeFw0xNTA1
-						MTIxNTAwMTBaFw0yNTA1MTExNTAwMTBaMGcxHzAdBgNVBAMUFiouYmF0aHNwYS5p
-						ZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSgwJgYJKoZI
-						hvcNAQkBFhlqYW1lcy5odXRjaGluc29uQG9jbGMub3JnMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAxMKFqwcpn26B1ScIzs6NFdszkiwlVIGDc3PAJogO
-						vWVTCIiJPtuJmKHAT1648jb2/+wdku0FbSbwxuMWTXV/+dZse1pR1pRuUQW9ru7Y
-						hwscfhqBTyq45SN7zNTdZymJn6ToPSQSfP9WpodqJhgJGL2k3JFJGZWXl0Jp+zd+
-						ySfCxU2PVD6x8mh9Y1vkV7ZCtc/0+aSsCj72iln29wK2gtkXWjwRvuV/OjKmDtz1
-						R0MUKJAdQFvpEvnM8riYl8ivNUOXLBHCUNsHf7ehuNry9Fze33hwE+b7MSzCwzn6
-						LTSqrn9lj5UrOKMRAr3yPY3FKgnQxijexF2tIDjlstqpiQIDAQABo4HEMIHBMB0G
-						A1UdDgQWBBSeXp6qeRYFjUiu/xEa3nrdd0d0XDCBkQYDVR0jBIGJMIGGgBSeXp6q
-						eRYFjUiu/xEa3nrdd0d0XKFrpGkwZzEfMB0GA1UEAxQWKi5iYXRoc3BhLmlkbS5v
-						Y2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxKDAmBgkqhkiG9w0B
-						CQEWGWphbWVzLmh1dGNoaW5zb25Ab2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zAN
-						BgkqhkiG9w0BAQUFAAOCAQEAenYu+66MmJtk4Of778ctSVrt/AlXZ+D51DdbL8Xs
-						PeizzPHZtzTWQzf80x69cCadksZu7RsAXVbopW7VN7HZ4yad7kvgNqkKUhKTB7Lz
-						tcQxd/BOToJs7hCglOTYJQ92Jce9RmTfM7f7JXaV+kELdqd2GrF8+2zym7sJB5Af
-						vfyv9B0XeuxE7IBoXmV8lVJGUYXYXKanFbNPv2FOGdkzdMKirlbrUr7aVUF8ZYcm
-						4H3x2qGf3tdIrMH4E8ONOafEZt8A685ktADWXFXJ/SY/QQH+fJ15fFiOyGq2YaI9
-						/L80KBx3p+HV0AJkENO5x2LPdJNaQ20ez6Mkkp/FAWLabQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bathspa.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.bathspa.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.bathspa.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.bathspa.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bath Spa University Hosted EZproxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ca696337..00000000
--- a/swamid-interfederations-2.0/bcauth.balliol.ox.ac.uk-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://bcauth.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a 'Balliol Broad Street Network' Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-11-06T14:59:05Z">
-      <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://bcauth.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAKNJoARfVmrDMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2JjYXV0aC5iYWxsaW9sLm94LmFjLnVrMB4XDTEzMTEwNTExMjEyNFoXDTIz
-						MTEwMzExMjEyNFowIjEgMB4GA1UEAxMXYmNhdXRoLmJhbGxpb2wub3guYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB1ycoTYISS4JQCewMhcX1
-						3OyFUiM7QkDUIzYcBPXDYB0HnPOKfxogtqqqpVaSDpV8PMctzmC0HFegyQUpiaay
-						MGpruiTHZt32SFpoElAzNgRiYhq07BpbreEtyqUOd4IN7hkoO0VGnwCbDQbpcOHS
-						lOJvpE3LJ4XLnYk3ehch48DIcVz6E1S7vcnuRhTZll6xFBZYvUC4/efdVGa+IwMu
-						/9PFZNLJjNyqNpsn25oqU6nGcjVl4RVuaqxKEkRP3UUBz7Mniw0VRiGkoooq7l+x
-						UAH5LethxKvE2cOnxlC7EPMgDFHzUQQUkvyLCbF+cojMy15tMpI1+6QXYNcL02In
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2JjYXV0aC5iYWxsaW9sLm94LmFjLnVrMB0G
-						A1UdDgQWBBQgpNW7Sez6+a15zS454YNgTixXQjANBgkqhkiG9w0BAQUFAAOCAQEA
-						U90aMn62TVY92FTIPhj5NaGr8ZsjfAZqalAgV6HZiPfQAEAFjsQc0ny6fpEpFR/8
-						1P8EbBzL28CdV4bwvH2o8J1rf7HMf1M2YWeQ279Kr0DYaz+JixBz7IgQOIlgx5p7
-						X3ZAP4qTqqCM9fNosD4JWIB/dsWotq9NBcXbqpF9u9pc9Uj04bccVHk9v9j7BVVT
-						qcw5/TzuUkZwnOiUFkbqwowwilrlWcvZZnOCqziVy2ywypo2r+HGmzIpy1HOYyDl
-						QrTN0bUfZD6pqaeYxXXOXA2f4+Ppgad6Lu1NOIJv5Q47NoFgP8ZUe2FOKbdoFTeY
-						o5iClvqE01UYKNRhpp+GsA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://bcauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Balliol Broad Street Network</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcm.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcm.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 39bb21e1..00000000
--- a/swamid-interfederations-2.0/bcm.some.ox.ac.uk-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://bcm.some.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Somerville College BCM" Shibboleth SP for the University of Oxford.
-	-->
-  <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-04-02T09:46:16Z">
-      <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://bcm.some.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+jCCAeKgAwIBAgIJAIYejqWu46+zMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWJjbS5zb21lLm94LmFjLnVrMB4XDTE0MDMzMTA5NDczM1oXDTI0MDMyODA5
-						NDczM1owHDEaMBgGA1UEAxMRYmNtLnNvbWUub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQC3/pTZtwd+x63mfU8PYXNRNJK1qokqjUuaeeDL
-						VwX4A1PdXsbhzDusrbzxSR8P+/TDwrfJfWUflOXDYpjLG4zk8uuif/oLMQ4kEX4T
-						MbN0Jllyi74ph4hwB2Lq224zVhW2zgKAb2tksbDzggOnNoDjJUvG2+4IMKm1XtYA
-						CcofaYHW2fE/8IaS4qRz2utZuCbc+mkm7kDuHIYJ7+C8WHOQaKZcdVJRHvISDwEJ
-						JU2q+YqC0RyxpvIrdcGzSE1HkD4jfr7vflbvlQM0Jse1tt8xWBMrC89t7UrB/9cm
-						LdeyO63cxuoXDyKRN3WnnpxCMjwZbAmZkWtn9vQhIvSHAok/AgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEWJjbS5zb21lLm94LmFjLnVrMB0GA1UdDgQWBBQDdl2hRFoRRk9l
-						YNksqL0D1EqWfTANBgkqhkiG9w0BAQUFAAOCAQEAgZjYNkh3/Q+Qu7u5V0/8KFkB
-						+vKjcxg8BlfVX13l8baFBsTrY75SzZdGguoZGlKQwPD/nlvg0/6LUTfh1J7hRsRo
-						UYkiGki7Tm/bXUKADV20G3audlttxplZVdhjhnQMW8QTuqN30y+C6M/bebLZn2oO
-						Ofbpm65EVD46GAf3NjpUKABOS/52TH5xAlZE2CgVaLLgZuJ37SH1ajviemD8LEk9
-						oe0tlcwQnrqLD99fcQe9JxAfdx3KySdQVvbRajP1UQLC833vpkSPraxsG8MVRwQZ
-						I9ZcKjWaioIzqjMaGYuv6vKtRLeSBWBxbbruArMnqoGSY1k/gShcefyDAf12+g==
-					</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://bcm.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcm.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Somerville College BCM</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 18248e0e..00000000
--- a/swamid-interfederations-2.0/bcm.sthughs.ox.ac.uk-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://bcm.sthughs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "St Hugh's College NAC" Shibboleth SP for the University of Oxford.
-	-->
-  <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-09-27T10:58:41Z">
-      <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://bcm.sthughs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAOxYXh87TIZfMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGJjbS5zdGh1Z2hzLm94LmFjLnVrMB4XDTEzMDkyMzExMDUyOVoXDTIzMDky
-						MTExMDUyOVowHzEdMBsGA1UEAxMUYmNtLnN0aHVnaHMub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD8L9og/HG4pFGOXIRVIV0vXGXfIEa1
-						r+f0+F9psIaNtSjnoaFoxU3h+shtdxnEKL7+owmsYK6TE4gNTbshr1DZ3R2eX61Q
-						IuKPAPTgPxR0iBxLjYdhHGS0POzsZq4RWMgRs8HugQnHs/VmQjHH0tPPdHC/vTNm
-						ZkVHWJvljVwjPDKwZ8s04G5SX6URa3JYsQq4p3Ak8p1Jdu87IeZ43xOXReTcrc7B
-						5dxgVWs4z9CJXIkwgAExb6MwzBiEFh6z5OJPT9UTC9crCr/ubOH37ag3VBW+qDRy
-						82Wkhzqy23pejRo/XjD5HoNwciaS3V5XtbrGk3aeqwIlpKMfXO8fBUBlAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFGJjbS5zdGh1Z2hzLm94LmFjLnVrMB0GA1UdDgQWBBQF
-						24GC7un9VlxSwrqH68P+G2RDoDANBgkqhkiG9w0BAQUFAAOCAQEAEWPSCBEugRn4
-						6d1kDa+tmDuBNMTIaHBjOI5lMUJcUKzdkQGqpm5TqyXvSnyRBnWFrUCgkxEqiqhI
-						CqDYpxEL4ZqPJE6gDj0fySXZ3BWY9WYVXZwCtFfPtAKwLSDhm5AxVQwN86QZzMtC
-						P7XBcaY6RnWCSBSlKvCkwMmCfaBaocmaI6FtXLRnffeiL7otKn+0CRU7H8eNFM3f
-						d0+9B6OXPhOYZLCZdi+lohyJJAgC69eGxmgkvOS9f2wHtvlmzCsT9+GDJdhdwhco
-						sTFffODhZHy7jZWOfOG0p1fkP7HBWhYhkwk+H1mwbkAeaFrzg0x3usgftcWPkGxT
-						Juej92IuLA==
-					</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://bcm.sthughs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcm.sthughs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, St Hugh's College NAC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.st-hughs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ben</GivenName>
-    <SurName>Bridle</SurName>
-    <EmailAddress>mailto:it-services@st-hughs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Bridle</SurName>
-    <EmailAddress>mailto:it-services@st-hughs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8e4be2b5..00000000
--- a/swamid-interfederations-2.0/bcmtest.new.ox.ac.uk-shibboleth.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://bcmtest.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a "New College test BCM system" Shibboleth SP for the University of Oxford.
-	-->
-  <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-06-10T10:15:43Z"/>
-  </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://bcmtest.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIJALCv+bulPWu6MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGJjbXRlc3QubmV3Lm94LmFjLnVrMB4XDTEzMDYwNzA4MzcwNloXDTIzMDYw
-						NTA4MzcwNlowHzEdMBsGA1UEAxMUYmNtdGVzdC5uZXcub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0cLeXLGI3vQXsQFBvnbD/YUF2vRSn
-						ox1F2qiLd2VSNL+j657o5wq0hZjLoro0Ee+gxA6ahVI0RlBN6uyc1S02FCd7PSa9
-						0n93KfKpL40Uj/0H+M6gwmMqv0CKQcM5uPQfMZPGZnFBI7G/i+XOWkRULP8fQ1lT
-						ZceJiIELd0d7OptgwVH3mAGgp5LEFDiuApLkLWENhcLb3qTDA74qX1uiYj0kD19I
-						U5Cbb97bTAcVyCj8LVgnp9b2hIoNOg0upDw3YqRp3m5CqTKNfqOm1CViqyBa4pYq
-						L+x6SxtoHP/D2cqG39irKX64oMcV7LdkfKbCeTC7EUyE1ctsRgRqojcrAgMBAAGj
-						azBpMEgGA1UdEQRBMD+CFGJjbXRlc3QubmV3Lm94LmFjLnVrhidodHRwczovL2Jj
-						bXRlc3QubmV3Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFBFln19MZG+e
-						J17IgU8o9c4pZlC1MA0GCSqGSIb3DQEBBQUAA4IBAQAiamHirEjlyEkzpYdtC47P
-						GGSaM8qLbmjzRUvb3Tgp0Bio21a9h/nQI0yu2u35/mUyWXipAQzA/qdMBq34KUgy
-						XxeWByT6dyncB9uS3ZTAIcR2IjHJUj+fiW3317QJpL2Oq9OSO5mZ9DH1cgKnWhK6
-						JQBogeOnB9c2hM7IzOwvNe2H0EtqxgFDYnzGsWlhvddNcTDpOAWvyBUfA7uFHEmU
-						f1O6QnyW1PJA9bamGntVs0curAhoEnYewZRHS7NxGl52wM9E+ESuMYb4VLb73GL0
-						iCE6OCCjV5non0T45y0UOL0t69mf/TRp//I21O+9bhDniCkuWLMVKfRTpyxUroPQ
-					</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://bcmtest.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcmtest.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, New College test BCM system</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml b/swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-shibboleth.xml
deleted file mode 100644
index fc691d6d..00000000
--- a/swamid-interfederations-2.0/bcp-serviceadmin.company.ja.net-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://bcp-serviceadmin.company.ja.net/shibboleth">
-  <!--
-		This is a "Service Admin (BCP)" 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#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="2014-04-11T14:30:16Z">
-      <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://bcp-serviceadmin.company.ja.net/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJAKvL1FR4I0BGMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCWJjcDAwNDI3OTAeFw0xMTEyMDcxMjE3MzBaFw0yMTEyMDQxMjE3MzBaMBQx
-						EjAQBgNVBAMTCWJjcDAwNDI3OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAON8mrdgSPpMs4dHJC6hBIE10lGEzsoS35vckVgFUoyhMfHZEJu2t9SVTC0T
-						GUGYIyArxQt0KSK1qHHGw+2l99xPLEH2rMAiR4JCyeer9EvQrN/mn+aERKMNX8Dd
-						mXIoM/8rqIvqA3ftE/c3H/+C3hKvTRbN7wpG9Vam/olfkujCljqd9Ve4y+uokGry
-						6rqi+5IKcb/FM8ARfZ1uFWOzUj1+THWEJgC2w8dkquMUUlYNylOvdBrY6PTeTGmh
-						EItXPsq/P1fx2hn23vahUDelahUDgE7vQY0h4DlF2iRJSV6+zfVw51cgxUZ67xko
-						jDYNPpKD1QA4x9NsIwZ7sTpVPqUCAwEAAaM3MDUwFAYDVR0RBA0wC4IJYmNwMDA0
-						Mjc5MB0GA1UdDgQWBBRasuhXna2QNf3yqFpBP2RC5kpfTDANBgkqhkiG9w0BAQUF
-						AAOCAQEA4Lepl7qoBfXJZ7t4zmd5ihlIuGEiFIlXBKiAtQYiPmK0ADxYHn87f1qq
-						5i1/Hmx9jLXSmtts1uCzotkRtvYrrJRMWfUKiyPbfhRjy7rvx57VVe568QYpRKia
-						xk86+ZRKnckWG/jo5EFFhGrjBEh+Puw+9a/RqHf7C371HF0QmQA7isNGE0n9o28p
-						Pvz4RA25T97WH7AHcdNy5uokObzKg8lI3FqM8YFDWk6RPyq5lZzhftcNfU148nyH
-						gvNqP58O7WCznLitHB+FV1vK1NNKTN5uCD1Uohm/vE3kGTb009KkzLMSnmArOiM8
-						61C72Um8LiBt1IJwhXSvB7eOST78dw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://bcp-serviceadmin.company.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcp-serviceadmin.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Service Admin (BCP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Janet Corporate Service Desk</GivenName>
-    <EmailAddress>mailto:corporate.servicedesk@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Janet Corporate Service Desk</GivenName>
-    <EmailAddress>mailto:corporate.servicedesk@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beaumontcollege.org-oala-metadata.xml b/swamid-interfederations-2.0/beaumontcollege.org-oala-metadata.xml
deleted file mode 100644
index 2a89e2c6..00000000
--- a/swamid-interfederations-2.0/beaumontcollege.org-oala-metadata.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://beaumontcollege.org/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Beaumont College - A Scope College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">beaumontcollege.org</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqTCCApGgAwIBAgIJAIIf+NILbP9ZMA0GCSqGSIb3DQEBBQUAMEExGTAXBgNV
-						BAoTEEJlYXVtb250IENvbGxlZ2UxJDAiBgNVBAMTG3J1bnRpbWUuYmVhdW1vbnRj
-						b2xsZWdlLm5ldDAeFw0xMTA0MTkwOTM4NThaFw0yMTA0MTYwOTM4NThaMEExGTAX
-						BgNVBAoTEEJlYXVtb250IENvbGxlZ2UxJDAiBgNVBAMTG3J1bnRpbWUuYmVhdW1v
-						bnRjb2xsZWdlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANl6
-						6JunNXqxiJRO9GiIkbXTEujWniTLPlfEWcmT+RCaHdZRQ7F3r7X71csvqkGoqsia
-						tZ44njSv3Yy/Gpt5zpr2dPtuFIVLaXXhOmTMSx7uMMfMoVgSlextlg8sMe7xW54l
-						fZtMV+K/+i3AfthnA0PtBuMf3CPR40oyxNS/mZLjLyksFMfNN805ab9f07a+8UXQ
-						+poU1mJ38NUW+k9pNobehAAVty93wdYd9AqIcEoIx04gmHXBAeHb7yPph4h4jqal
-						dmT8CN8sYd8m+gFQ4Kb75qxbXdUuD/h8FHPbWZjJ077Tt9qanI3WO/AxTCxRJIN+
-						cwRiODuEA//RjF1LbuUCAwEAAaOBozCBoDAdBgNVHQ4EFgQUbHShUZqbjLWyOUDj
-						eMhjgP+pqsUwcQYDVR0jBGowaIAUbHShUZqbjLWyOUDjeMhjgP+pqsWhRaRDMEEx
-						GTAXBgNVBAoTEEJlYXVtb250IENvbGxlZ2UxJDAiBgNVBAMTG3J1bnRpbWUuYmVh
-						dW1vbnRjb2xsZWdlLm5ldIIJAIIf+NILbP9ZMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEFBQADggEBAImljg1eaEGn3TKc1xh5go74zGJv2pNhRKoxoMZ/HOmbFe7h
-						YlAyi2aSanJlLG9HmZ5uCTAve9TDyzNkYoFvD7sGy0Wf3BJ+z+EDnZVV8iqBradX
-						kovQ19tQkwdel0FYwkxiNUQ0L4GzJWUaYKxFX2pWtoWPKE+7DnP/kUef7enRLnqQ
-						GVbHpJZK/QDTcJ8tqdz+tDs/Z9r86RESEFm5Bod6q2TIDiZFSHu8nT1BDb/9Gk/j
-						b//hRbeDkCGfHk9Rv/CPBzuPQGEM1xROe5YL7SJTnH8TAuhBOFx5flFhfmiTNSBy
-						0oeR3asSGQqUrtsmH2BIYoeJXBtrWYJYWOGXG/8=
-					</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>
-						MIIDqTCCApGgAwIBAgIJAIIf+NILbP9ZMA0GCSqGSIb3DQEBBQUAMEExGTAXBgNV
-						BAoTEEJlYXVtb250IENvbGxlZ2UxJDAiBgNVBAMTG3J1bnRpbWUuYmVhdW1vbnRj
-						b2xsZWdlLm5ldDAeFw0xMTA0MTkwOTM4NThaFw0yMTA0MTYwOTM4NThaMEExGTAX
-						BgNVBAoTEEJlYXVtb250IENvbGxlZ2UxJDAiBgNVBAMTG3J1bnRpbWUuYmVhdW1v
-						bnRjb2xsZWdlLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANl6
-						6JunNXqxiJRO9GiIkbXTEujWniTLPlfEWcmT+RCaHdZRQ7F3r7X71csvqkGoqsia
-						tZ44njSv3Yy/Gpt5zpr2dPtuFIVLaXXhOmTMSx7uMMfMoVgSlextlg8sMe7xW54l
-						fZtMV+K/+i3AfthnA0PtBuMf3CPR40oyxNS/mZLjLyksFMfNN805ab9f07a+8UXQ
-						+poU1mJ38NUW+k9pNobehAAVty93wdYd9AqIcEoIx04gmHXBAeHb7yPph4h4jqal
-						dmT8CN8sYd8m+gFQ4Kb75qxbXdUuD/h8FHPbWZjJ077Tt9qanI3WO/AxTCxRJIN+
-						cwRiODuEA//RjF1LbuUCAwEAAaOBozCBoDAdBgNVHQ4EFgQUbHShUZqbjLWyOUDj
-						eMhjgP+pqsUwcQYDVR0jBGowaIAUbHShUZqbjLWyOUDjeMhjgP+pqsWhRaRDMEEx
-						GTAXBgNVBAoTEEJlYXVtb250IENvbGxlZ2UxJDAiBgNVBAMTG3J1bnRpbWUuYmVh
-						dW1vbnRjb2xsZWdlLm5ldIIJAIIf+NILbP9ZMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEFBQADggEBAImljg1eaEGn3TKc1xh5go74zGJv2pNhRKoxoMZ/HOmbFe7h
-						YlAyi2aSanJlLG9HmZ5uCTAve9TDyzNkYoFvD7sGy0Wf3BJ+z+EDnZVV8iqBradX
-						kovQ19tQkwdel0FYwkxiNUQ0L4GzJWUaYKxFX2pWtoWPKE+7DnP/kUef7enRLnqQ
-						GVbHpJZK/QDTcJ8tqdz+tDs/Z9r86RESEFm5Bod6q2TIDiZFSHu8nT1BDb/9Gk/j
-						b//hRbeDkCGfHk9Rv/CPBzuPQGEM1xROe5YL7SJTnH8TAuhBOFx5flFhfmiTNSBy
-						0oeR3asSGQqUrtsmH2BIYoeJXBtrWYJYWOGXG/8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://runtime.beaumontcollege.net/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://runtime.beaumontcollege.net/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Beaumont College - A Scope College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Beaumont College - A Scope College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.beaumontcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Couzins</SurName>
-    <EmailAddress>mailto:couzinsj@beaumontcollege.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Couzins</SurName>
-    <EmailAddress>mailto:couzinsj@beaumontcollege.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beige.admin.grnet.gr.xml b/swamid-interfederations-2.0/beige.admin.grnet.gr.xml
deleted file mode 100644
index e2bdf715..00000000
--- a/swamid-interfederations-2.0/beige.admin.grnet.gr.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beige.admin.grnet.gr/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">(grnet-hq\.)?admin\.grnet\.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Greek Research and Technology Network</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.grnet.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.grnet.gr/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>admin.grnet.gr</mdui:DomainHint>
-        <mdui:DomainHint>noc.grnet.gr</mdui:DomainHint>
-        <mdui:IPHint>195.251.28.0/23</mdui:IPHint>
-        <mdui:IPHint>2001:648:2320::/48</mdui:IPHint>
-        <mdui:IPHint>83.212.9.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:648:2340::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIE4zCCA8ugAwIBAgIRAOgl5wnIyOOGusiqnulMXlIwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMDA4MTkwMDAwMDBaFw0xMzA4MTgyMzU5NTlaMH4xCzAJBgNV
-                            BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
-                            ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEdMBsGA1UE
-                            AxMUYmVpZ2UuYWRtaW4uZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-                            ggEKAoIBAQCy90ye8ReEjGgko1wquImmKkWEboYj81QjFkBqTZPop2W2sNwZrFt6
-                            N+Mx87La+CqUAkfVJvJDF6iBqW0ubR0y0zCaquMwlKEVmiKqA3ByhaIxmck0LVNi
-                            eVx07S4AancwdmAymzlNhk5z9gJIb+dbGTb8a8V5Fqa7i3p3FF1gv+6w72fuSryQ
-                            SKfgO5TgHEzfzU8OsD4yJxPnipIQKC69L2ULhFnI1zisyaMcktEqTTVrVnCHRAH4
-                            WKHgZt0pBIPu9UqLQhOaQPERfYbBJ1DFQZUrWaKV5+SSgC6GZMFAfuDf77WwZ1CL
-                            /hlnTkY0RsVLauC8m0ytCACK7mfHss7pAgMBAAGjggGiMIIBnjAfBgNVHSMEGDAW
-                            gBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUp8RAOy4O9yRXq5B9T8BW
-                            wV9x8UwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYI
-                            KwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYD
-                            VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-                            U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-                            LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-                            cDovL29jc3AudGNzLnRlcmVuYS5vcmcwWgYDVR0RBFMwUYIUYmVpZ2UuYWRtaW4u
-                            Z3JuZXQuZ3KCEWZzLmFkbWluLmdybmV0LmdyghJpZHAuYWRtaW4uZ3JuZXQuZ3KC
-                            EnZwbi5hZG1pbi5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEApUzLJmu4URSd
-                            o6183ERid5Vv6ue9LZfGln+h4ka6j+TVCcjn/gfmptabUHdt+H//AGWIv81dyFV3
-                            kQVI5+kvJrQkRAPI2Bznkc7izTa3fFKcn4wjBknITIVFQI4ChN+0qxM+8vtzgord
-                            lNqGfF9GX+VElc0I/JCzu0cCNST6dzipYwvkYOXwn5cfMiUqqLJ9Dk5rEgEKwj3c
-                            hQI1MDgJGApdh6clFkUMxDbHnG6nlj1yehV/Sy5rbh8juKIf+fMkxEbaJJIJm+gr
-                            nCkx2IgQIaXHgnnbubScqQ5iTYvWf6hlhaFm5l9q+PuGx5A9wcQhJ1oJ+IV3DaBt
-                            o/IZYWrn/Q==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beige.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beige.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.admin.grnet.gr/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="true">(grnet-hq\.)?admin\.grnet\.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Greek Research and Technology Network</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.grnet.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.grnet.gr/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>admin.grnet.gr</mdui:DomainHint>
-        <mdui:DomainHint>noc.grnet.gr</mdui:DomainHint>
-        <mdui:IPHint>195.251.28.0/23</mdui:IPHint>
-        <mdui:IPHint>2001:648:2320::/48</mdui:IPHint>
-        <mdui:IPHint>83.212.9.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:648:2340::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIE4zCCA8ugAwIBAgIRAOgl5wnIyOOGusiqnulMXlIwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMDA4MTkwMDAwMDBaFw0xMzA4MTgyMzU5NTlaMH4xCzAJBgNV
-                            BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
-                            ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEdMBsGA1UE
-                            AxMUYmVpZ2UuYWRtaW4uZ3JuZXQuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-                            ggEKAoIBAQCy90ye8ReEjGgko1wquImmKkWEboYj81QjFkBqTZPop2W2sNwZrFt6
-                            N+Mx87La+CqUAkfVJvJDF6iBqW0ubR0y0zCaquMwlKEVmiKqA3ByhaIxmck0LVNi
-                            eVx07S4AancwdmAymzlNhk5z9gJIb+dbGTb8a8V5Fqa7i3p3FF1gv+6w72fuSryQ
-                            SKfgO5TgHEzfzU8OsD4yJxPnipIQKC69L2ULhFnI1zisyaMcktEqTTVrVnCHRAH4
-                            WKHgZt0pBIPu9UqLQhOaQPERfYbBJ1DFQZUrWaKV5+SSgC6GZMFAfuDf77WwZ1CL
-                            /hlnTkY0RsVLauC8m0ytCACK7mfHss7pAgMBAAGjggGiMIIBnjAfBgNVHSMEGDAW
-                            gBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUp8RAOy4O9yRXq5B9T8BW
-                            wV9x8UwwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYI
-                            KwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYD
-                            VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-                            U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-                            LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-                            cDovL29jc3AudGNzLnRlcmVuYS5vcmcwWgYDVR0RBFMwUYIUYmVpZ2UuYWRtaW4u
-                            Z3JuZXQuZ3KCEWZzLmFkbWluLmdybmV0LmdyghJpZHAuYWRtaW4uZ3JuZXQuZ3KC
-                            EnZwbi5hZG1pbi5ncm5ldC5ncjANBgkqhkiG9w0BAQUFAAOCAQEApUzLJmu4URSd
-                            o6183ERid5Vv6ue9LZfGln+h4ka6j+TVCcjn/gfmptabUHdt+H//AGWIv81dyFV3
-                            kQVI5+kvJrQkRAPI2Bznkc7izTa3fFKcn4wjBknITIVFQI4ChN+0qxM+8vtzgord
-                            lNqGfF9GX+VElc0I/JCzu0cCNST6dzipYwvkYOXwn5cfMiUqqLJ9Dk5rEgEKwj3c
-                            hQI1MDgJGApdh6clFkUMxDbHnG6nlj1yehV/Sy5rbh8juKIf+fMkxEbaJJIJm+gr
-                            nCkx2IgQIaXHgnnbubScqQ5iTYvWf6hlhaFm5l9q+PuGx5A9wcQhJ1oJ+IV3DaBt
-                            o/IZYWrn/Q==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://beige.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beige.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Greek Research and Technology Network</OrganizationName>
-    <OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.grnet.gr/</OrganizationURL>
-    <OrganizationURL xml:lang="el">http://www.grnet.gr/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Greek Research and Technology Network</Company>
-    <EmailAddress>helpdesk@grnet.gr</EmailAddress>
-    <TelephoneNumber>800-11-47638</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <Company>Greek Research and Technology Network</Company>
-    <EmailAddress>helpdesk@grnet.gr</EmailAddress>
-    <TelephoneNumber>800-11-47638</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/belser.gbv.de.xml b/swamid-interfederations-2.0/belser.gbv.de.xml
deleted file mode 100644
index 525e26f5..00000000
--- a/swamid-interfederations-2.0/belser.gbv.de.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://belser.gbv.de/sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.gbv.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>belser.gbv.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=belser.gbv.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGgjCCBWqgAwIBAgIED4i/dTANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwMjAzMDkyOTEx
-WhcNMTUwMjAyMDkyOTExWjCBnzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
-QmlibGlvdGhlazEWMBQGA1UEAxMNYmVsc2VyLmdidi5kZTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAL9DhQnvqMbJXo8I2SmG1mDQLEzywQahD+aSNMgl
-W5LedRyJc2TZE1les6CwEC8tqljGHMJ9UwMIpvvmpqFOeg3r7REtTjvyb0G28BKv
-2z90ypWz2lHh6BZ2AcZamnF2AK8WNMa5xq6R9/b9IrDEdLenJRON267kUSb8jpEr
-6QNICloRo/avIUoqELFiHTQDROKRIViF6VdBhn0+Wfcpnnu11JSU3n0+4umoNz+C
-wHEw9smR5jn99GmPnpZO4q7FaK8rws1OQh9UgYXWLRrvwJzHv+/OhFZVfE1n+Snu
-3PFdlZowape4Lc4uHDLcQTej7ZeUbBb7oIpr6vFJ4iQg5EZb1k6WeenX9kelMcXB
-eao3buJ9ETD5cDDpELhIKxb6l0FN6UNCNQNWlLTwlCT/fCKmJ+8f1dogl3gUZLmY
-vQReuEcnmrwwG0m/pPA6wJtA4sKlXzCoPAnW3g8nMT/1rf9y0c5aBEsWUVAAfnVh
-gJvjaxh2T8HsvoJwnnfAvqiCqn4O6lw4OFYAwUepnCCVD5FBgew0mhyALGy/LAG6
-Jqa4T+xMXfm4D1eOJZzYGz+BGeW14CpLaXcb0JWW9RDkGfF4zxNxd0sFjP/IVdQj
-w3VqKCAJFzQNLhPNEBzpjMFLiDDziAusdKXqF9baAETpeJCxoIs/hrh95fI2pl3E
-EieBAgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM3hPwKxXMSUfFKhwW3h
-cm4/QDq3MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQ
-MA6BDGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYI
-KwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwDQYJKoZIhvcNAQEFBQADggEBAGtMJD6q+ieWV2XzsQe2Ym4+mN9d13lYwcBc
-ukH4O5wbdJVDs4TbbNjS52owS3aRDEvk6Q9jxqncUzik7oKoZN2ffGHKHBNl8l2R
-VZu0bJXhPlniIAdi8Y6oxDotX6oS2YJ4q9z0EOhypyGQm6O0/+ZwOKFrSn0ggAlo
-YdMB+fZedi7UTRGvnVlEFELJTQuAK9epTXZrmcPGRweSxZ2JG6kSE9Mvy4nfgIhD
-yOIPgKqvUSwlSl2fgmAY6Qvxs6R1nXkdbfhdGsSAuI59RDr19PTyyd8EvlEhri2M
-DKu3zW/LjvUq5jTn3w9Q32pe1nYZAn2UcvJ+sl7invtI0oNQFjE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>belser.gbv.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=belser.gbv.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGgjCCBWqgAwIBAgIED4i/dTANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwMjAzMDkyOTEx
-WhcNMTUwMjAyMDkyOTExWjCBnzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
-QmlibGlvdGhlazEWMBQGA1UEAxMNYmVsc2VyLmdidi5kZTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAL9DhQnvqMbJXo8I2SmG1mDQLEzywQahD+aSNMgl
-W5LedRyJc2TZE1les6CwEC8tqljGHMJ9UwMIpvvmpqFOeg3r7REtTjvyb0G28BKv
-2z90ypWz2lHh6BZ2AcZamnF2AK8WNMa5xq6R9/b9IrDEdLenJRON267kUSb8jpEr
-6QNICloRo/avIUoqELFiHTQDROKRIViF6VdBhn0+Wfcpnnu11JSU3n0+4umoNz+C
-wHEw9smR5jn99GmPnpZO4q7FaK8rws1OQh9UgYXWLRrvwJzHv+/OhFZVfE1n+Snu
-3PFdlZowape4Lc4uHDLcQTej7ZeUbBb7oIpr6vFJ4iQg5EZb1k6WeenX9kelMcXB
-eao3buJ9ETD5cDDpELhIKxb6l0FN6UNCNQNWlLTwlCT/fCKmJ+8f1dogl3gUZLmY
-vQReuEcnmrwwG0m/pPA6wJtA4sKlXzCoPAnW3g8nMT/1rf9y0c5aBEsWUVAAfnVh
-gJvjaxh2T8HsvoJwnnfAvqiCqn4O6lw4OFYAwUepnCCVD5FBgew0mhyALGy/LAG6
-Jqa4T+xMXfm4D1eOJZzYGz+BGeW14CpLaXcb0JWW9RDkGfF4zxNxd0sFjP/IVdQj
-w3VqKCAJFzQNLhPNEBzpjMFLiDDziAusdKXqF9baAETpeJCxoIs/hrh95fI2pl3E
-EieBAgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM3hPwKxXMSUfFKhwW3h
-cm4/QDq3MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQ
-MA6BDGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYI
-KwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwDQYJKoZIhvcNAQEFBQADggEBAGtMJD6q+ieWV2XzsQe2Ym4+mN9d13lYwcBc
-ukH4O5wbdJVDs4TbbNjS52owS3aRDEvk6Q9jxqncUzik7oKoZN2ffGHKHBNl8l2R
-VZu0bJXhPlniIAdi8Y6oxDotX6oS2YJ4q9z0EOhypyGQm6O0/+ZwOKFrSn0ggAlo
-YdMB+fZedi7UTRGvnVlEFELJTQuAK9epTXZrmcPGRweSxZ2JG6kSE9Mvy4nfgIhD
-yOIPgKqvUSwlSl2fgmAY6Qvxs6R1nXkdbfhdGsSAuI59RDr19PTyyd8EvlEhri2M
-DKu3zW/LjvUq5jTn3w9Q32pe1nYZAn2UcvJ+sl7invtI0oNQFjE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gbv.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gbv.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gbv.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gbv.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gbv.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gbv.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gbv.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gbv.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gbv.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.gbv.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gbv.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.gbv.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.gbv.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.gbv.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Belser-Produkte mit Nationallizenz</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Belser-Produkte mit Nationallizenz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://belser.gbv.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Franck</GivenName>
-    <SurName>Borel</SurName>
-    <EmailAddress>borel@gbv.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.aip.pub2web.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/beta.aip.pub2web.ingenta.com-shibboleth.xml
deleted file mode 100644
index 0e1bdad6..00000000
--- a/swamid-interfederations-2.0/beta.aip.pub2web.ingenta.com-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://beta.aip.pub2web.ingenta.com/shibboleth">
-  <!--
-		This is an "AIP beta" SP for Publishing Technology PLC. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-24T09:47:04Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDnDCCAoSgAwIBAgIEUPfWLDANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDExNzEw
-						NDUwMFoXDTIzMDExNTEwNDUwMFowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAKFQ00fvQS6nyq0xBOu7sOMA2E5CqZj14gpmxLudWNog6GFhdHXCEqNM
-						IF9RdIz9Vaf7Icnvf6B7c9C5SCAOSXcu9pAV04z4RVd/YmGmy9AeEAKbGz+C2kka
-						4du0tBTFLUSv150RZYdrd2lykNQkWPDs+TM6XoE1+qQBTOVyOe6O6u3MuCzDbkc8
-						ibvjJ0Om/miG3EbJ+bdAeoAtnD8b67BpkUymKG4zTL0nXI+kXpg8DupGLpP4ZtFd
-						+tg5/cZMO4AkRjB6vSSP/Gx6M3SyIidSgsrvVAFdNEygKxiQvAucz/6WKg17Thsl
-						t2yq1r6F8BWmzZcfJppUjDpdDoZTaV8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						HFy+6Iv+7HwyL/lzfOyv8DFmVbzZpFhhanWmEdxrCxbAhs2Fnj5dkdJBvKaW7GJZ
-						J0MoJB9apg/prOm9Cj2ZJHOzKCqVZUu4D1j/qJHEzPy/I3UyjgbzdWT1yuxyJMuV
-						K2KfVPLyzFKhYJZCwq7GKFFSGken1Sshfyw/RLFqRtwQPH4BFv+0NTcznD2WLifA
-						9CM0pNy/7Jn87ZH5udxUqI5UbwxBxLZvbL6ovROXymBOTVZogRb3H7M8YkH/VJTh
-						APFn3wPwDtfg6l17iC98oDdmqZGdM330Ps1ywc714ne0WcUKGZ51Dxqkh3U9mEQA
-						+7gHltEQPx/ItlMLX48ZbA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.aip.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.aip.pub2web.ingenta.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Publishing Technology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.publishingtechnology.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tony</GivenName>
-    <SurName>Upton</SurName>
-    <EmailAddress>mailto:tony.upton@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:openathens@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.asm.pub2web.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/beta.asm.pub2web.ingenta.com-shibboleth.xml
deleted file mode 100644
index cc68b940..00000000
--- a/swamid-interfederations-2.0/beta.asm.pub2web.ingenta.com-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.asm.pub2web.ingenta.com/shibboleth">
-  <!--
-		This is an "ASM Science Beta" OpenAthens SP for Publishing Technology plc. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-31T15:28:31Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDnDCCAoSgAwIBAgIEUe5jgTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDcyMzEx
-						MDUzN1oXDTE2MDcyMjExMDUzN1owgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAKz4tWwjcP2+Ld9vIqdI9ssmUF7yJVnDUoJqAPhejPOFSvrEZrjvofnY
-						6VIcPcL3tyUADrD/vTRCb3T1FuQKsRnXgYzYI9o84hK6IZyTVzzD1G3Kil5ivsNq
-						ndv5hcMNfbH5kjGLfKvgHixrkR5HkLfITBghQydtCur4Yze0+u3mFu4OTabmqILH
-						hcnWlLPohznyRtx5F3fTtFFC/cUHAonymmH8OG3xQOhLFR1dSK5i2oGoRdqme6mR
-						FiFHS8832tGjqsb072rFdpxKSmPLxz0vBxoa/YVw0RP6OYgt5Gze6mPOv1rFE5jq
-						nMegHU7gLilsR6AS9GQoE+KUNiBeYhsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						OlI/iGvczpy+BZErTXPBvizoKvFJzoi5Ri+zRRu+49qR67uMrnpKAQ51Weae6kj8
-						tz0+iQIcKbyOO/9A+7Iu55PWruI4w0Qe4c8cCmFg5crORj2Orel3IMrT5s4XXOZ2
-						MHweTl9+ZGFpshUYbSdPvj2vN8RhpC1c644lHVK0xceVxd3pFZA6VdtKfrnjyfXH
-						t2m6Pzr00zEvxcvZch5rXdtH/tdSp8fRQzAoAWB1MBXTLBL1xztRSTacPMJYdiNP
-						etGuGMwdTlZcDiknmfJT4zwcf6U1kXLon29n9b+6/Yq9wo+XYXd+HjGNmaJAhZm3
-						mWuKjo4lfM11tPcrL+QV0g==
-					</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>
-						MIIDnDCCAoSgAwIBAgIEUe5jgTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDcyMzEx
-						MDUzN1oXDTE2MDcyMjExMDUzN1owgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAKz4tWwjcP2+Ld9vIqdI9ssmUF7yJVnDUoJqAPhejPOFSvrEZrjvofnY
-						6VIcPcL3tyUADrD/vTRCb3T1FuQKsRnXgYzYI9o84hK6IZyTVzzD1G3Kil5ivsNq
-						ndv5hcMNfbH5kjGLfKvgHixrkR5HkLfITBghQydtCur4Yze0+u3mFu4OTabmqILH
-						hcnWlLPohznyRtx5F3fTtFFC/cUHAonymmH8OG3xQOhLFR1dSK5i2oGoRdqme6mR
-						FiFHS8832tGjqsb072rFdpxKSmPLxz0vBxoa/YVw0RP6OYgt5Gze6mPOv1rFE5jq
-						nMegHU7gLilsR6AS9GQoE+KUNiBeYhsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						OlI/iGvczpy+BZErTXPBvizoKvFJzoi5Ri+zRRu+49qR67uMrnpKAQ51Weae6kj8
-						tz0+iQIcKbyOO/9A+7Iu55PWruI4w0Qe4c8cCmFg5crORj2Orel3IMrT5s4XXOZ2
-						MHweTl9+ZGFpshUYbSdPvj2vN8RhpC1c644lHVK0xceVxd3pFZA6VdtKfrnjyfXH
-						t2m6Pzr00zEvxcvZch5rXdtH/tdSp8fRQzAoAWB1MBXTLBL1xztRSTacPMJYdiNP
-						etGuGMwdTlZcDiknmfJT4zwcf6U1kXLon29n9b+6/Yq9wo+XYXd+HjGNmaJAhZm3
-						mWuKjo4lfM11tPcrL+QV0g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.asm.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.asm.pub2web.ingenta.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ASM Science Beta</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.asmscience.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service</GivenName>
-    <EmailAddress>mailto:service@asmusa.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Arbuthnott</SurName>
-    <EmailAddress>mailto:openathens@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.brill.pub2web.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/beta.brill.pub2web.ingenta.com-shibboleth.xml
deleted file mode 100644
index f08b35db..00000000
--- a/swamid-interfederations-2.0/beta.brill.pub2web.ingenta.com-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://beta.brill.pub2web.ingenta.com/shibboleth">
-  <!--
-		This is a Brill Online Books and Journals BETA OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdjCCAl6gAwIBAgIETk5pVDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHVW5rbm93bjEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQ
-						dWJsaXNoaW5nIFRlY2hub2xvZ3kxDzANBgNVBAsTBk9ubGluZTEaMBgGA1UEAxMR
-						VGFsdmluZGVyIE1hdGhhcnUwHhcNMTEwODE5MTM0NzAwWhcNMjEwODE2MTM0NzAw
-						WjB9MQswCQYDVQQGEwJHQjEQMA4GA1UECBMHVW5rbm93bjEPMA0GA1UEBxMGT3hm
-						b3JkMR4wHAYDVQQKExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kxDzANBgNVBAsTBk9u
-						bGluZTEaMBgGA1UEAxMRVGFsdmluZGVyIE1hdGhhcnUwggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCBgsfPtWqw8h45x+RHc7GT+irvTYg0WVTlaMCooZv5
-						QNZX2DHRHSBfcmPikAhIN804cHGasoCHYmkGOotgTJyHL2VAYjPhUlgBDeORVzEo
-						Zj87C5juJgnC8y87nszfYoVQSmdLTD0J99foF3Ek6X9AfGPtLoUt9RwiW8laUeSy
-						1sqCUN2PKdC+wLOLVbDM17g+l9b/lCK9bumzGYx9Od/ToZAjwMWLQHeg+M1FP8h/
-						lSgGRc9G2H04JR2B752YJEe2AyJSpKXXJkm+K782AmJD+7bHxEWCILUbmQ1XD1IJ
-						o+G0IlPV5dIKbBj2kCbePM1505KuitB9TtGJ7RCQk/VjAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBAAUUkj9uefUKRXVBuuRLnEs6Ifh5044S376FDGHnvscHkj+PYPqi
-						dO16DsxhwfwUk1GgUGtQ1FuLu4SfNQtymiH1C/FTE49G3sRVQcFoYdG0VrZ5rWlg
-						nrbaqcfeexdDE+uLffgjjNHVAfMHLCNiBdgd8saIu1rwzL+2iV5q1bAZSApFgNG3
-						kVMW8BOxOIkezDlxFAJEc0Yd6JcfD4L/58teQWBg/SRq6GvJOMUtb7KI5bqkT+/+
-						aoJ/fguy6nyFOjyWP2SdCB1hNJy0C07j6/S0qyyRusDxKpq4WNLOsShn2UPGwrPe
-						WU3SgDnwOuu2trwvO6e5rm1xqPwB+RdK6Mc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.brill.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.brill.pub2web.ingenta.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Publishing Technology plc: Brill Online Books and Journals BETA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://booksandjournals.brillonline.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Brill Support</GivenName>
-    <EmailAddress>mailto:support@brill.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:talvinder.matharu@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dave</GivenName>
-    <SurName>Lord</SurName>
-    <EmailAddress>mailto:Dave.Lord@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hatim</GivenName>
-    <SurName>Ghadiyali</SurName>
-    <EmailAddress>mailto:Hatim.Ghadiyali@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/beta.digitaltheatreplus.com.xml
deleted file mode 100644
index 03161068..00000000
--- a/swamid-interfederations-2.0/beta.digitaltheatreplus.com.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://beta.digitaltheatreplus.com">
-  <!--
-		This is a "Digital Theatre Plus (setup site)" Shibboleth SP for Digital Theatre.com Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-04T16:07:08Z">
-      <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://live.digitaltheatreplus.vualto.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Digital Theatre Plus (setup site)</mdui:DisplayName>
-        <mdui:Logo height="60" width="104">https://live.digitaltheatreplus.vualto.com/sites/all/themes/digitaltheatreplus/images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIJAN3dSNg4hiPsMA0GCSqGSIb3DQEBBQUAMDcxNTAzBgNV
-						BAMTLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFs
-						MB4XDTE0MTIwMjEwMjEyOVoXDTI0MTEyOTEwMjEyOVowNzE1MDMGA1UEAxMsaXAt
-						MTAtMjEwLTEzMC0xODUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWwwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWIBkrkj+I6eUqYNMmNdjkDF4phGN+
-						sNIjyo8kCcYc7Wb/WFYADECTYtZbKkSWBARejxCAGiqp2XGhpwN91cisYeeVY79B
-						EnI7O45meAasDOFGRVc8ciP5PaujLqz3zwWt8YAnsQizmq7bpvHerZQIkQt9c1Km
-						NeREIMJDB6FH0ZTsUbVLxDtQnAEHJ7jj0seNkDmNXP4ooiipKbZYbCVyksp6i6fV
-						xGp7bIZodBg7U70TK9zQuBPx3TWZsevxOcVwyaH5f3q5KijjBFOfPKGLkAhJ9xxF
-						sy1XhBPSaXCZ5wcfM86ZkmqjXauR90JwxDAciPorYV19BvHdFBVw0/7VAgMBAAGj
-						WjBYMDcGA1UdEQQwMC6CLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21w
-						dXRlLmludGVybmFsMB0GA1UdDgQWBBTcWEhiwHcbivBKw8bU1P5X912UljANBgkq
-						hkiG9w0BAQUFAAOCAQEAu9c6LYR9f4jCqfjUG+8aQohiqU4MYv9BWsTCchaEsjTX
-						TkbJP9r9G9ftc1eLUh9Ct8A4kKpk2qmb5dGYYn15YicvgTy1oS6foqck5IEmUllQ
-						pfw4r2O4rnTNaEKugxHrh9MTjy5aNOBAzJiLzz8Yy7kbVahaZJSloZySUeyLCbKh
-						OYvUnue1d7biTwQccRE7zMqTLO2B07KUzLVV75zhNIEeZlStQ0ubRBM7qmq52Jgh
-						LzDYGo/doin3Q2xtR/QRMHtxbxh1EFsRbPKbGjp89sNBrGI+RxE6SLb22dD7sy/m
-						5S4VgGuIjXcu5pGhndoGHXSmeg3DLMKSrmrkJUcNQg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://live.digitaltheatreplus.vualto.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Digital Theatre.com Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Theatre Plus (setup site)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.live.digitaltheatreplus.vualto.com/about-us</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Ware</SurName>
-    <EmailAddress>mailto:support@digitaltheatre.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Carly</GivenName>
-    <SurName>Britton</SurName>
-    <EmailAddress>mailto:support@vualto.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.hp.pub2web.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/beta.hp.pub2web.ingenta.com-shibboleth.xml
deleted file mode 100644
index 92492c93..00000000
--- a/swamid-interfederations-2.0/beta.hp.pub2web.ingenta.com-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.hp.pub2web.ingenta.com/shibboleth">
-  <!--
-		This is a "NUMÉRIQUE PREMIUM" OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-18T12:18:54Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDiDCCAnCgAwIBAgIEUxEfCDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEPMA0GA1UECxMGT25saW5lMR4wHAYD
-						VQQDExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kwHhcNMTQwMjI4MjM0MzA0WhcNMTcw
-						MjI3MjM0MzA0WjCBhTELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJl
-						MQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNVBAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9n
-						eTEPMA0GA1UECxMGT25saW5lMR4wHAYDVQQDExVQdWJsaXNoaW5nIFRlY2hub2xv
-						Z3kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtKdKPdmVZXkJajIXP
-						oD1MM4HDgaXr6DWwK3MCvhwAG4X7jXeP4TZ3UPM9VqAk1BywDFJ4ZKVvkVMJaavp
-						6CUcidSkba9FXEoxbcRmLinw9CIDyqrczOtTrh8Y0VlVUJWus2QCDZDjSghN6ZyF
-						R6tu9skOgnNTmlM7wZ6OH8wvOgSMgoLHsswqpWb7ZgujYxMXejrZgSGbezYyqD8b
-						4VEgbrwB4pGpZHmH9BQ3ozNIcDm/g5XTGm86useupVepZ8NOqfV9NkmAYI0r81L8
-						HsNvWFAtM2gifJLt64rBFgdGZYhKAb3Kr9DlmbarSwwG5gF+R5hdCzXX2z/y7tIC
-						2nYjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGClcTLi5SJ1ia2FLgQcUy4vFeKx
-						/VmKPKWHFctm46dEccIAvHOOC3zCXOOHfCRZrR/pMVCfE9UnzvPIl1fRtm79SuxX
-						FjEs7GhibW9ALm1Yh2YVnGGaq7U1aO4kU3MJ9SBwZT4uXhbGRNdnUyyjPxQ7jrfO
-						R0GLxZfF8MvKnosafmF3d4ivcP/xzgmVtBG9WRZHASHfIfB8qAZXBLOLuDvDFVC6
-						29SPjnnodhSdRI0xaxAKOR0t1I0ljwDWroMrmDgVbAzdO4YaebiEj32qXoc8qF93
-						Bx+vY4qK5b2wm4W9P5WUTb2rM/ujSu26EkUZlP6uamM5xHaEBGAm2bixC9Q=
-					</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>
-						MIIDiDCCAnCgAwIBAgIEUxEfCDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEPMA0GA1UECxMGT25saW5lMR4wHAYD
-						VQQDExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kwHhcNMTQwMjI4MjM0MzA0WhcNMTcw
-						MjI3MjM0MzA0WjCBhTELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJl
-						MQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNVBAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9n
-						eTEPMA0GA1UECxMGT25saW5lMR4wHAYDVQQDExVQdWJsaXNoaW5nIFRlY2hub2xv
-						Z3kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtKdKPdmVZXkJajIXP
-						oD1MM4HDgaXr6DWwK3MCvhwAG4X7jXeP4TZ3UPM9VqAk1BywDFJ4ZKVvkVMJaavp
-						6CUcidSkba9FXEoxbcRmLinw9CIDyqrczOtTrh8Y0VlVUJWus2QCDZDjSghN6ZyF
-						R6tu9skOgnNTmlM7wZ6OH8wvOgSMgoLHsswqpWb7ZgujYxMXejrZgSGbezYyqD8b
-						4VEgbrwB4pGpZHmH9BQ3ozNIcDm/g5XTGm86useupVepZ8NOqfV9NkmAYI0r81L8
-						HsNvWFAtM2gifJLt64rBFgdGZYhKAb3Kr9DlmbarSwwG5gF+R5hdCzXX2z/y7tIC
-						2nYjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGClcTLi5SJ1ia2FLgQcUy4vFeKx
-						/VmKPKWHFctm46dEccIAvHOOC3zCXOOHfCRZrR/pMVCfE9UnzvPIl1fRtm79SuxX
-						FjEs7GhibW9ALm1Yh2YVnGGaq7U1aO4kU3MJ9SBwZT4uXhbGRNdnUyyjPxQ7jrfO
-						R0GLxZfF8MvKnosafmF3d4ivcP/xzgmVtBG9WRZHASHfIfB8qAZXBLOLuDvDFVC6
-						29SPjnnodhSdRI0xaxAKOR0t1I0ljwDWroMrmDgVbAzdO4YaebiEj32qXoc8qF93
-						Bx+vY4qK5b2wm4W9P5WUTb2rM/ujSu26EkUZlP6uamM5xHaEBGAm2bixC9Q=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.hp.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.hp.pub2web.ingenta.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NUMÉRIQUE PREMIUM</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://beta.hp.pub2web.ingenta.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:info@numeriquepremium.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hatim</GivenName>
-    <SurName>Ghadiyali</SurName>
-    <EmailAddress>mailto:openathens@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.ingentaconnect.com-shibboleth.xml b/swamid-interfederations-2.0/beta.ingentaconnect.com-shibboleth.xml
deleted file mode 100644
index 1f6fce31..00000000
--- a/swamid-interfederations-2.0/beta.ingentaconnect.com-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://beta.ingentaconnect.com/shibboleth">
-  <!--
-		This is a OpenAthens Beta IngentaConnect SP owned by Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-04T07:58:03Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDgjCCAmqgAwIBAgIET/MHUjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIjAgBgNV
-						BAoTGVB1Ymxpc2hpbmcgVGVjaG5vbG9neSBwbGMxFDASBgNVBAsTC0VuZ2luZWVy
-						aW5nMRIwEAYDVQQDEwlEYXZlIExvcmQwHhcNMTIwNzAzMTQ1MzA2WhcNMjIwNzAx
-						MTQ1MzA2WjCBgjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8w
-						DQYDVQQHEwZPeGZvcmQxIjAgBgNVBAoTGVB1Ymxpc2hpbmcgVGVjaG5vbG9neSBw
-						bGMxFDASBgNVBAsTC0VuZ2luZWVyaW5nMRIwEAYDVQQDEwlEYXZlIExvcmQwggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3TelmPlKuuvssdQAwiYe7uOLU
-						pUBVXEcrlGWoPvOSysS4U6WJtc0EOChAF6VJu7SAy5D8IaiQOZZAfEAaQ+aqz1Of
-						Rj41U4U+q1yZPaccZCkq8q/SYhk22RKKbJpX5UJOK+4oD50GAO7ZzpbVrC8UNkkE
-						PtW15cg/Lx6n8NRfmJ2HB1CJMzGbTwUXMddkEfrCP/M/WItKuSUeUEjqzIK2VtY8
-						h1o+5Ha+mHpKyzBbxXhCzMa18xNtaDb1Rta39rdptQO5CilZMGaCyqJ9kVZE7XOP
-						XncH5VAWCTl6DVo3cTXAvir/ZwoZ86wp4+Q02qwxCt4LW9sj7dQpCcug5b9/AgMB
-						AAEwDQYJKoZIhvcNAQEFBQADggEBAFvaylkmAH2wnYXRl38TNq6NwIeQn1+p/6Lk
-						u98Z2E1gHJ2A5Y33Cgnq1a0RC1UrZrtYhKOHkvl1Et+RJOZRglAw/k4YodkMHlXC
-						LH2xxhcqGLLxxkgPihgBI7Cgl3JugRdXHUmClvGFwwGt0D/LqlNmlcr72NzwbeVK
-						epNHefzYvre2zPvJSm3YziYiCFLa8Ow2Puhrv0y+4dQzvjhN5+gvQmVB9QZuF8dO
-						txCKDafJqBvfACf2ZBKu5oNMcqGjYM6+I3TAtKXfygCFjFckXO9AAQBPwFdjn8zg
-						/wG1wsbpEf5/5YzR/qYCmWkTdHpry0ZqW3h9GTfxKan7eDF3A34=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.ingentaconnect.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.ingentaconnect.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IngentaConnect</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ingentaconnect.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:help@ingentaconnect.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dave</GivenName>
-    <SurName>Lord</SurName>
-    <EmailAddress>mailto:Dave.Lord@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.jbep.pub2web.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/beta.jbep.pub2web.ingenta.com-shibboleth.xml
deleted file mode 100644
index e93cfe5a..00000000
--- a/swamid-interfederations-2.0/beta.jbep.pub2web.ingenta.com-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://beta.jbep.pub2web.ingenta.com/shibboleth">
-  <!--
-		This is a "John Benjamins Publishing Company beta" OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-13T11:58:04Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDnDCCAoSgAwIBAgIET9muujANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEyMDYxNDA5
-						MjgyNloXDTIyMDYxMjA5MjgyNlowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBALdlro4BqkngGPKxtdYlzdp8E/fzI7nO4GVKVT4U3l+Ca8BelmRE1Bzj
-						aLBFqgdHCyVWTMGUZ/pUgmjgiV4Wqsy4GgZoXWkbcrc3S6nIYqZRXXD4nYPoeDvG
-						0wx0OfW6Ok9kcRQOgD7WwsXULBzqCP4FDS/HAUEMfh2n3zGJmR13zilNwI+mvDmi
-						3U90Kf6Goy3zjsuYjs/TXUICkDMWhRjAy3bRkERmnMJkYzbiqJg+vY5syM3daoAp
-						2Wf117nSkc7AbnZenavvqBDzvG4sz28VsGYpNIK5pN0KGfdbsRp7IN5Cn4Io7qgl
-						ynHOMQy0r5Pnwmy2mfyMZyAapYwN6fkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						q1DLlahfHpI88T0dVIZZUwvl3gPUPWwf44f6KgvuZgEr37Uxlft8gi4U4ihiWVlC
-						FlAXbQ6VxkIesG3ZJ4vhgC7NxPK+7pETtWrKgjkkyinCQ0pJnZbt9nL4vGjMO65q
-						yp1HReMDYYX/W2V0VPetNM7ewcqgi20kr8QE8nxRMmDxpMSPvJPfL7JN9rv4sqZr
-						oB1kB6VUHwDq+YF+yiSJb76lZsluQZPubqgCIAiUvByFLscndx0akdWbYnsS1iqD
-						1MxfWdyMseGkwVcSkhrBod7rzUZbecaQtHRPyZGijv/RPcwSCod39wX1p1/2dkBT
-						cpGuu5JrXAFJ/o31SeELng==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.jbep.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.jbep.pub2web.ingenta.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">John Benjamins Publishing Company beta</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.benjamins.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Anke</GivenName>
-    <SurName>de Looper</SurName>
-    <EmailAddress>mailto:anke.delooper@benjamins.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:openathens@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.lawtel.com-oa-metadata.xml b/swamid-interfederations-2.0/beta.lawtel.com-oa-metadata.xml
deleted file mode 100644
index 76600939..00000000
--- a/swamid-interfederations-2.0/beta.lawtel.com-oa-metadata.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://beta.lawtel.com/oa/metadata">
-  <!--
-		This is a "Lawtel" OpenAthens SP for Thomson Reuters (Professional) UK Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-13T15:40:44Z"/>
-  </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>
-						MIIDZzCCAk+gAwIBAgIJAI1Uwq7I6bpMMA0GCSqGSIb3DQEBBQUAMCsxDzANBgNV
-						BAoTBkxhd3RlbDEYMBYGA1UEAxMPYmV0YS5sYXd0ZWwuY29tMB4XDTEyMDMwMjA4
-						NTEzOVoXDTIyMDIyODA4NTEzOVowKzEPMA0GA1UEChMGTGF3dGVsMRgwFgYDVQQD
-						Ew9iZXRhLmxhd3RlbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCxEgaufApwXsEAPskvBtI41FSV/q4gDprwIlB6BZYABV2ZSVa3slVq0x/kvnH7
-						WkV8rgpkSMVW6cDUQruNRvI0aoMl+1UaIrVEEN+CIxdWvnPlCiOrzapwGJ52cKMe
-						0xcUVnZiPaBoaR+JQO9M07Q7decSF910M4w0AaWaj/ELyU5qIPjdRJIpMlpG0DVq
-						jKljU+mfaxyZ9DG3r5nk8G8ajaFhg4pQAJMp/pis7s2CreP1T4+dxIpOVpjysCmL
-						glb3WYt0tsslJkVya3q2SMR1qi8F2RtKu973mgS+EEXF5afl5xA4SW6N8u2/EnQT
-						r8U/r5QaJDVixBYSMFWrnWB1AgMBAAGjgY0wgYowHQYDVR0OBBYEFLsFufpV+fZJ
-						k/h+DX4S+LxiDHCkMFsGA1UdIwRUMFKAFLsFufpV+fZJk/h+DX4S+LxiDHCkoS+k
-						LTArMQ8wDQYDVQQKEwZMYXd0ZWwxGDAWBgNVBAMTD2JldGEubGF3dGVsLmNvbYIJ
-						AI1Uwq7I6bpMMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGXQukuo
-						d33p2sDND2tkiWr4un7NXMe6oB5vS3AQEKvc6TEq5qRheZfpKzjbshcRqCDy1lHh
-						AKz779DDPPmh/0nhQMdi1NvbIGYshKgeus7JskhIZWLhuohKncsmuOq77Ojb4/T6
-						JqOWqSOzKdhguviaJiibb6GgBmTBLH5AHpbD5GEtyFdaH42HCK5DM3x1H15JM+5M
-						GPzgwXMbtYQ8AFsxGZvbVfK/YwHx36Z3Tn/cPZM93U2bQY/mjiAjhgoqiuyJJ1bB
-						wJZC0VQskEP1pPdAWJpI4EbOwUxSEHENXdKb1dXvMcYY+dK1O9vHLfXJXkbBGE2E
-						l2hv92HcUJJF5Ug=
-					</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>
-						MIIDZzCCAk+gAwIBAgIJAI1Uwq7I6bpMMA0GCSqGSIb3DQEBBQUAMCsxDzANBgNV
-						BAoTBkxhd3RlbDEYMBYGA1UEAxMPYmV0YS5sYXd0ZWwuY29tMB4XDTEyMDMwMjA4
-						NTEzOVoXDTIyMDIyODA4NTEzOVowKzEPMA0GA1UEChMGTGF3dGVsMRgwFgYDVQQD
-						Ew9iZXRhLmxhd3RlbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCxEgaufApwXsEAPskvBtI41FSV/q4gDprwIlB6BZYABV2ZSVa3slVq0x/kvnH7
-						WkV8rgpkSMVW6cDUQruNRvI0aoMl+1UaIrVEEN+CIxdWvnPlCiOrzapwGJ52cKMe
-						0xcUVnZiPaBoaR+JQO9M07Q7decSF910M4w0AaWaj/ELyU5qIPjdRJIpMlpG0DVq
-						jKljU+mfaxyZ9DG3r5nk8G8ajaFhg4pQAJMp/pis7s2CreP1T4+dxIpOVpjysCmL
-						glb3WYt0tsslJkVya3q2SMR1qi8F2RtKu973mgS+EEXF5afl5xA4SW6N8u2/EnQT
-						r8U/r5QaJDVixBYSMFWrnWB1AgMBAAGjgY0wgYowHQYDVR0OBBYEFLsFufpV+fZJ
-						k/h+DX4S+LxiDHCkMFsGA1UdIwRUMFKAFLsFufpV+fZJk/h+DX4S+LxiDHCkoS+k
-						LTArMQ8wDQYDVQQKEwZMYXd0ZWwxGDAWBgNVBAMTD2JldGEubGF3dGVsLmNvbYIJ
-						AI1Uwq7I6bpMMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGXQukuo
-						d33p2sDND2tkiWr4un7NXMe6oB5vS3AQEKvc6TEq5qRheZfpKzjbshcRqCDy1lHh
-						AKz779DDPPmh/0nhQMdi1NvbIGYshKgeus7JskhIZWLhuohKncsmuOq77Ojb4/T6
-						JqOWqSOzKdhguviaJiibb6GgBmTBLH5AHpbD5GEtyFdaH42HCK5DM3x1H15JM+5M
-						GPzgwXMbtYQ8AFsxGZvbVfK/YwHx36Z3Tn/cPZM93U2bQY/mjiAjhgoqiuyJJ1bB
-						wJZC0VQskEP1pPdAWJpI4EbOwUxSEHENXdKb1dXvMcYY+dK1O9vHLfXJXkbBGE2E
-						l2hv92HcUJJF5Ug=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.beta.lawtel.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.beta.lawtel.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.beta.lawtel.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.beta.lawtel.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lawtel</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lawtel.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Prashanthi</GivenName>
-    <SurName>Bukka</SurName>
-    <EmailAddress>mailto:prashanthi.bukka@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Jag</GivenName>
-    <SurName>Patara</SurName>
-    <EmailAddress>mailto:jagvir.patara@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Prashanthi</GivenName>
-    <SurName>Bukka</SurName>
-    <EmailAddress>mailto:prashanthi.bukka@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jag</GivenName>
-    <SurName>Patara</SurName>
-    <EmailAddress>mailto:jagvir.patara@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.projecteuclid.org-shibboleth-sp.xml b/swamid-interfederations-2.0/beta.projecteuclid.org-shibboleth-sp.xml
deleted file mode 100644
index ceae9ea7..00000000
--- a/swamid-interfederations-2.0/beta.projecteuclid.org-shibboleth-sp.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://beta.projecteuclid.org/shibboleth-sp">
-  <!--
-		This is a "Project Euclid" test Shibboleth SP for Cornell University.
-	-->
-  <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-09-17T14:15:37Z">
-      <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://beta.projecteuclid.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://beta.projecteuclid.org/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://beta.projecteuclid.org/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://beta.projecteuclid.org/Shibboleth.sso/DS" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh6gAwIBAgIJANq1a2ZDBykIMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-						BAMTJXNmLWxpYi1hcHAtMDA4LnNlcnZlcmZhcm0uY29ybmVsbC5lZHUwHhcNMTMw
-						NTMxMTUwNjIyWhcNMjMwNTI5MTUwNjIyWjAwMS4wLAYDVQQDEyVzZi1saWItYXBw
-						LTAwOC5zZXJ2ZXJmYXJtLmNvcm5lbGwuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAs3Hxfw7oGscg+A30MSnTHdbuukajMhIlCtrm+bfsayPDApUE
-						QLxW643U876lLNxMA5wmU0NV07gjj87yqv7ECGPLq95tIoTcTzI0MXLr8s3GTzwT
-						M9N0LEWdp37CRH2kgvYA3Cf5Oba8FxpEDHgc6rzAc2LccucdpWvi8Zon9OLZuEsH
-						qAjQlfIeuSB7YIe6z2/7VbZM9CcAb80cwYButlqMdIOcS7jBqofGq9YvovXJr7F0
-						vEXJtiL7fW28Lmv2SHdS2mL/34ud2fj5CEDaXAzKWCiDR0L7a1qYNW7upxD+w6no
-						rDAYfWrO8E6mcXv1d8P1JKLzsaZKopsuHE3BtQIDAQABo1MwUTAwBgNVHREEKTAn
-						giVzZi1saWItYXBwLTAwOC5zZXJ2ZXJmYXJtLmNvcm5lbGwuZWR1MB0GA1UdDgQW
-						BBSu8boXmoNWqSqD0y4uSmiE8p1EHzANBgkqhkiG9w0BAQUFAAOCAQEAQXOGXl4Y
-						fTXnrJQuD1xaOmLgUkLpN4eq89OisGTsdefpvAJ1SD6QSaIj1UFchfQ6Qb4vK2Fp
-						E1Ss6sZNU0rCE/C1EpQplAkQve8+IhQdIOQM7B/Yp4lHWd+3snJLF+fmIczVu9DB
-						odqQ2YbmpxPDBzZMRAIppajebSXLz2r65Uj8+cB28v4WhCt7v/T3M8w4h591pePO
-						xW2fpyIqGsGpuVRd2EOkYGmm7nqrAH9WGyUsRT1YHFY25mjgExVPYpah7eTsNYql
-						fQHR5b61zSESkl8vo6eFRgzRnETr/fNIj08nhs3UCEfuYVy1yVKv2lHLzIvDTot/
-						TyOzJ1GTj16SNA==
-					</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://beta.projecteuclid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.projecteuclid.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.projecteuclid.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.projecteuclid.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.projecteuclid.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.projecteuclid.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://beta.projecteuclid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.projecteuclid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://beta.projecteuclid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.projecteuclid.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.projecteuclid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Project Euclid -- TEST</ServiceName>
-      <ServiceDescription xml:lang="en">
-				Project Euclid, an online publishing service for theoretical and applied mathematics and statistics.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cornell University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Project Euclid -- TEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://projecteuclid.org/about</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Ruddy</SurName>
-    <EmailAddress>mailto:EUCLID-TECH-L@cornell.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shinwoo</GivenName>
-    <SurName>Kim</SurName>
-    <EmailAddress>mailto:EUCLID-TECH-L@cornell.edu</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 b50a35c4..00000000
--- a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk-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://beta.shib.manchester.ac.uk/shibboleth">
-  <!--
-	This is a "beta" Shibboleth IdP for The University of Manchester.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <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>
-						MIIEgjCCA2qgAwIBAgIRAO3e2IFUJk3Dd0HJQF3ZKBUwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xNDA0MjQwMDAwMDBaFw0xNzA0MjMyMzU5NTlaMEgxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEjMCEGA1UEAxMaYmV0YS5zaGli
-						Lm1hbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC7j0ZmPbM3J6dknUGo1FQF1QZP10Bitu67DJPczwy8WYSqXBhTQ3F7HIVNLAVH
-						geMs/ZfGi7ct3d5HBPyg84rcPRHXjfgWOFnokwUxcI7ZEIooUc7wtNk1LZ/89mzR
-						A4icZm+w7XCatdkYTSFQR6SN6n9mWDGMY//H7KDBwLxbqA0UfFIrmGwhW1kjnoaL
-						J3PTl2I8dXYNKXnvsZxtJM1n9XwGSlU7YipLhyjlyQ35JAXs1qeAtXYRNFTjV2Gx
-						EXjhejs9XrXNb0w8Gvv3iKwxzK8WWVFXh0udsKoeb/r84o98jDiDoSap9Lo5qDsJ
-						kIJd5dYCaP40h3qQHpFJiL7FAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
-						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUZIEkV81JvNOr4jmDXZhTgfg+MFQw
-						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCUGA1UdEQQeMByCGmJldGEuc2hp
-						Yi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQC7+XD/MdO9ubLu
-						VRzKDAiKfSGwMwAxOEyijhv2UzOxD3ISxji1UsCHPWXs30woYDgdKBC5WIVD8qYV
-						DszYqyLcRu2mwUtL/He30t8XqFZj4Y9R9faP+0321G1vn61SiUXe+c81reveIy5y
-						p8sry9f/ENJJpXNEEllrmi15TW32kSNAjoyV7OFiI1QAdfypeX2oAkyeL504UvZe
-						CYUUMyN2JAp7PTGI7WkP72AZFSMxzUZCj9UteUkKYMEXfOiKvqp6MEPSTNLVrXHn
-						HETktGDZoR6CEfyI6TGfxD6muKXhDZvFEm1t3z/Lc3mtZT0MSRwzcmQf/I27UnlD
-						rjZU5UPE
-					</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>
-						MIIEgjCCA2qgAwIBAgIRAO3e2IFUJk3Dd0HJQF3ZKBUwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xNDA0MjQwMDAwMDBaFw0xNzA0MjMyMzU5NTlaMEgxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEjMCEGA1UEAxMaYmV0YS5zaGli
-						Lm1hbmNoZXN0ZXIuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC7j0ZmPbM3J6dknUGo1FQF1QZP10Bitu67DJPczwy8WYSqXBhTQ3F7HIVNLAVH
-						geMs/ZfGi7ct3d5HBPyg84rcPRHXjfgWOFnokwUxcI7ZEIooUc7wtNk1LZ/89mzR
-						A4icZm+w7XCatdkYTSFQR6SN6n9mWDGMY//H7KDBwLxbqA0UfFIrmGwhW1kjnoaL
-						J3PTl2I8dXYNKXnvsZxtJM1n9XwGSlU7YipLhyjlyQ35JAXs1qeAtXYRNFTjV2Gx
-						EXjhejs9XrXNb0w8Gvv3iKwxzK8WWVFXh0udsKoeb/r84o98jDiDoSap9Lo5qDsJ
-						kIJd5dYCaP40h3qQHpFJiL7FAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
-						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUZIEkV81JvNOr4jmDXZhTgfg+MFQw
-						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCUGA1UdEQQeMByCGmJldGEuc2hp
-						Yi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQC7+XD/MdO9ubLu
-						VRzKDAiKfSGwMwAxOEyijhv2UzOxD3ISxji1UsCHPWXs30woYDgdKBC5WIVD8qYV
-						DszYqyLcRu2mwUtL/He30t8XqFZj4Y9R9faP+0321G1vn61SiUXe+c81reveIy5y
-						p8sry9f/ENJJpXNEEllrmi15TW32kSNAjoyV7OFiI1QAdfypeX2oAkyeL504UvZe
-						CYUUMyN2JAp7PTGI7WkP72AZFSMxzUZCj9UteUkKYMEXfOiKvqp6MEPSTNLVrXHn
-						HETktGDZoR6CEfyI6TGfxD6muKXhDZvFEm1t3z/Lc3mtZT0MSRwzcmQf/I27UnlD
-						rjZU5UPE
-					</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/beta.sketchengine.co.uk-entity.xml b/swamid-interfederations-2.0/beta.sketchengine.co.uk-entity.xml
deleted file mode 100644
index 9e591ebb..00000000
--- a/swamid-interfederations-2.0/beta.sketchengine.co.uk-entity.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://beta.sketchengine.co.uk/entity">
-  <!--
-		This is a "Sketch Engine Beta" Shibboleth SP for Lexical Computing 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="2014-12-04T10:50:48Z">
-      <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://beta.sketchengine.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://beta.sketchengine.co.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sketch Engine Beta</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Sketch Engine is a Corpus Query System allowing you to research how words behave.</mdui:Description>
-        <mdui:Logo height="60" width="180">https://beta.sketchengine.co.uk/media/img/sketch_engine_beta_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJALdQBYI2gURnMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHRvYWQxLnNrZXRjaGVuZ2luZS5jby51azAeFw0xMjAyMTYxMDA2NTRaFw0y
-						MjAyMTMxMDA2NTRaMCMxITAfBgNVBAMTGHRvYWQxLnNrZXRjaGVuZ2luZS5jby51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJj9g9mNJt+syu5Hypi1
-						O7ozROE636f82MkvcGq3O49jW+lXaXa0TrdI6ZyWQWQQffObnp+UTI8Dy8dJPeJK
-						q0yolm/V4RGnVz9sOYOT89vk1dYNmYTCkCEPvr28O9tnNrGVm+Y1GbMN/Ng1Hy1z
-						0+Jw83Igqu9kZAxBxT9buBJL+1yag+f8fqL0Xh4siHHRIS20jnNWzI0sZoH4JLXA
-						L/t9xQazOawCXDqgMwaybWCp2pi/GLkgktcXJFSOjivMnivwM6XUOr1RJ/7v5NXZ
-						TbQiIDxOw+ur3lJaPi/04eWBTzrmLZLB/CZ+8xgG+umkMZhTF/jQTFqA3i64IDBq
-						czsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYdG9hZDEuc2tldGNoZW5naW5lLmNvLnVr
-						MB0GA1UdDgQWBBTNszRhd97yo6rn4dsxJ4CO8ooO3zANBgkqhkiG9w0BAQUFAAOC
-						AQEAZJVCs/BF3pLJxr/EgySFE0T8n2yjWRvgsrxms8dovhm7IClLWjVubK87iOao
-						EyrLhKF8nlh8xX9SJQ7UVCkeK7m1X3mjx5lByKtbr/3mG+SJqCkBrG2neolJ0GRi
-						cGEDCLN9HPVhKPPwlKh2TJ/jx/orZsBw2H6rZnwh9t5kspTzzvoQ4dfjg/B1EL6B
-						PPwBUVBmaVzBxX1ZWIS78lHNNgynmPpcGpuhoxUzFYnc/hLuN14QALUbuad+iXWN
-						R5xEvTb1qWIm+zCyONzG6xmjd18ox6m/YD6wTh2+7u0AhB+XA15AmvkfPdJyjdmg
-						bpeg/CjdpV3/Q6Imu6H2cEHjkw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://beta.sketchengine.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.sketchengine.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Lexical Computing Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sketch Engine Beta</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.sketchengine.co.uk/documentation/wiki/Website/LexicalComputing/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@sketchengine.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@sketchengine.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/beta.telford.icebox.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/beta.telford.icebox.ingenta.com-shibboleth.xml
deleted file mode 100644
index a52a0884..00000000
--- a/swamid-interfederations-2.0/beta.telford.icebox.ingenta.com-shibboleth.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://beta.telford.icebox.ingenta.com/shibboleth">
-  <!--
-		This is an OpenAthensSP 'ICE Virtual Library' SP owned by Publishing Technology plc. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDkjCCAnqgAwIBAgIETFGlfzANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMCR0IxFDASBgNV
-						BAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNVBAoTFVB1Ymxpc2hpbmcgVGVj
-						aG5vbG9neTEUMBIGA1UECxMLRW5naW5lZXJpbmcxHjAcBgNVBAMTFVB1Ymxpc2hpbmcgVGVjaG5v
-						bG9neTAeFw0xMDA3MjkxNTU5NTlaFw0yMDA3MjYxNTU5NTlaMIGKMQswCQYDVQQGEwJHQjEUMBIG
-						A1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEeMBwGA1UEChMVUHVibGlzaGluZyBU
-						ZWNobm9sb2d5MRQwEgYDVQQLEwtFbmdpbmVlcmluZzEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNo
-						bm9sb2d5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiAlpQC2xBxHxvd+1ZuwZJOYC
-						6qzPu4OwEyEfaF2wvvW7ZV+g3n6k5vy5rioxpo3PAm+6k1wHIFRXYw2Y9a1d/l9yCuKfINFEL7OK
-						+w0i88Yn3hlk1SJX35UYIZeR0PXCyMiP26zJsIGCMayXhq4I117GpfIsKLtkMWmfYuys9+d4O3pY
-						Tgkmh1LA2nvkN5g2cfLaVZe3/k5Jyyt+PMnL44mWq+kYovfcb2oiq5EqhOu8VqHbii20w6aHTzE8
-						wySe1XUTKkY3+cpO3K+raFPJ1sx6lAASkz0lZGNnViMPGoW6yCULSO7lccXvwyVdLfK5MpD2YMrF
-						Av4K40FJl546IQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB3ZTLOK/A2AuF+rHi1HRHeav8FPYsJ
-						jNmyrmydsXuB21ddn73s1nJN3YyiJzz2cvQdDm0BdnsZYoeWUCZsHn4EkP886dzh9OYocnzEVJng
-						wfiSIWbeWSnYywBr0usYCmzlYVkztYLy72Vrl6tT4DG4zmspJMyAbXQXejKapYBISBG/hNpIrEfB
-						jYAoXmaKvE4FLfPIVoicJ4Tk6SVlg4ug2hE3s2iTOf7IfljN+n3W18aqHGzEnps8gcTEhjZLsLsb
-						YXxkXUmLqybv+VPGhrtigrFlpZ1vN5/dpocApTcBSIa6glQaIFYTDj7DCQwiaMd3mnJPeNXY0oAw
-						+orBTWvf
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.telford.icebox.ingenta.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://beta.telford.icebox.ingenta.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Publishing Technology: ICE Virtual Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.icevirtuallibrary.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Librarians</GivenName>
-    <EmailAddress>mailto:librarians@icevl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hatim</GivenName>
-    <SurName>Ghadiyali</SurName>
-    <EmailAddress>mailto:Hatim.Ghadiyali@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/betawww.itslearning.com-shibboleth.xml b/swamid-interfederations-2.0/betawww.itslearning.com-shibboleth.xml
deleted file mode 100644
index e9ff6c89..00000000
--- a/swamid-interfederations-2.0/betawww.itslearning.com-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://betawww.itslearning.com/shibboleth">
-  <!--
-		This is a beta eLogin SP for it's learning UK Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIJAIpqSMSevorFMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-						BAMTHmJldGF3d3cuZWxvZ2luLml0c2xlYXJuaW5nLmNvbTAeFw0xMTAyMTgxMzA4
-						NDJaFw0yMTAyMTUxMzA4NDJaMCkxJzAlBgNVBAMTHmJldGF3d3cuZWxvZ2luLml0
-						c2xlYXJuaW5nLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPTk
-						Ku1qar6Ni1aG1x1JwjJUvGbSJOP7N0b7yw9ybzzOiq3vEnZXtIgAsb01YlC3nzqW
-						6qJ5iE/lKKg289oySLPrwGAIecPWMyD3n8ADy5fc/hn18rD7rmcsY/zBHaj1xSbl
-						Lg8YtD7hKCQ8KtyicEFR35CwGPEMosDm5eoih9uxkjlDGqvpIPsaCxLEu3QaGDut
-						7otZLtgmfDrYx7L0bUFfk4vXI3ylvN3FZCy2f3RvPizDGPKTYiDCtq7KWTrmy3r8
-						Qupk3loopZ77VQ9zwyawvrJaRn/k0OwENWRQpH02qrC/uAwwmCK0sPp0Lsw5CAbV
-						bTWb777CvWdZaLQE1LcCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
-						HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFHUyplId
-						19IQi+iRVHhSm3VWjucpMB8GA1UdIwQYMBaAFHUyplId19IQi+iRVHhSm3VWjucp
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCUTWhvAerxQ33duwkc6iRNTgTrD/ftSKF6IL9F
-						+gGK7SQT8K/cuq5qgGd21zld3qb6KDBB3YAxIXqaOTMWYQF42IbpXufXUwiquUlZ
-						wEgTIBQkNTmnw7MxxG/5RZ85Os1PafXeXj1G4CFCxS8uSxO7q3VR8H4gA4RU/g/6
-						ICTS8fAaNnZguQiZKyJyiNLPUiMdWuPvQLwodRa1HqzdJHYGhvtjTnoS3MCmTxAb
-						/YTTrd+fRL4ZchK28dRbofcdGPgDbrN0ZeUh0ywt2/EUW3s3J29rBakXU53pPn+F
-						Cksvz2qqJnZqqE98f/5ecjEUxWxkZ7Kgs1t+yGDOkmvRK3+p
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://betawww.itslearning.com/elogin/logout.aspx"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://betawww.itslearning.com/elogin/default.aspx" index="0" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">it's learning UK Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">it's learning UK Limited: beta</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.itslearning.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Waseem</GivenName>
-    <SurName>Akhtar</SurName>
-    <EmailAddress>mailto:Waseem.Akhtar@itslearning.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Waseem</GivenName>
-    <SurName>Akhtar</SurName>
-    <EmailAddress>mailto:Waseem.Akhtar@itslearning.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bfas.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bfas.scran.ac.uk-shibboleth.xml
deleted file mode 100644
index e7001a64..00000000
--- a/swamid-interfederations-2.0/bfas.scran.ac.uk-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://bfas.scran.ac.uk/shibboleth">
-  <!--
-		This is a "Books For All Scotland" 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:42:43Z"/>
-  </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">Books for All Scotland</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Books for All Scotland provides accessible books to support pupils who have difficulty with ordinary printed text.</mdui:Description>
-        <mdui:Logo height="64" width="180">https://shib.scran.ac.uk/images/logo-bfas.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-bfas.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/bfas/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/bfas/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://www.scran.ac.uk/bfas/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/bfas/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/bfas/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/bfas/Shibboleth.sso/DS/UKFederation" 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://shib.scran.ac.uk/bfas/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/bfas/Shibboleth.sso/glow"/>
-    </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/bfas/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/bfas/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/bfas/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Scran Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Books For All Scotland</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.booksforallscotland.org.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/bham-primo-stg.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/bham-primo-stg.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 57cbe0e6..00000000
--- a/swamid-interfederations-2.0/bham-primo-stg.hosted.exlibrisgroup.com-shib.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://bham-primo-stg.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "University of Birmingham - Primo Staging" Shibboleth SP for Ex Libris (UK) 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-03-10T15:35:18Z">
-      <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://bham-primo-stg.hosted.exlibrisgroup.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://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Birmingham - Primo Staging</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Birmingham</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh6gAwIBAgIJALHUut8j1vljMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-						BAMTJWRjMDN2ZzAxMzZldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTQw
-						MzA0MTUxNTU1WhcNMjQwMzAxMTUxNTU1WjAwMS4wLAYDVQQDEyVkYzAzdmcwMTM2
-						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA3U1lgEiqNcgQJoV/0YBd0UMvGClU74tsjirUuQe9sSC5Sy5i
-						hRK55O19zxgswnJpjlsc8W7xd0viWQC8TJlJVK0uynKDaEVnnAfN+9st3GRlXIwo
-						w3px9K5dFvrrozI++5iWct7XJP6UXtOyeOKmlrWf0cIo8OZ4+UxoQlJdh80HdQch
-						2CBDII14LyF92xAmndjpHTbN3uCxLwZh3CL+M37NfOJ3KEJy5KEqFD/bGauGkyzL
-						SEyydSGkRgrn1mrKWYVLQX5QOLV3RDUr9GEtDq9H2R1u4fEVa6aGHlXVM/KstYe4
-						gru2K9988PysiuUIvbei6iqj/8roknoS5hajdwIDAQABo1MwUTAwBgNVHREEKTAn
-						giVkYzAzdmcwMTM2ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
-						BBSSMtN87MyD3qLQOMnL8J13o/zLqjANBgkqhkiG9w0BAQUFAAOCAQEAz/NHpExC
-						yRJZLZmY9iWr8XgYGgypyrdzuCK1E24QMmE/vbc3x+E5ZBH1Bw0e5tFSV+rb009z
-						AEEiM3LzzJMIz/ljPLubL+hVginfUHo73vMrDgGLpXfzywadN7fivhr917k+A7Dy
-						g9Wg6fwYKq7UktfwKRapt98ZO+LdWc5H5Y/ndu61+5Mhf/sgGrmOw5R5Un0rCNNb
-						nQD5lMBoaQtTeaGNg4gOBsx2pX7fhowUnxhpbI/4jKCqXU9+nMkOJBBZHyopaMFa
-						ZVGTEnum7GNeXpbotWItmn5mHGq/oo7+Q+b+5LwJUN4zvdkTKL3mYqkO+HoYWoLA
-						tnqjDjsk80/doQ==
-					</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://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bham-primo-stg.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Birmingham - Primo Staging</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml
deleted file mode 100644
index 36947b9a..00000000
--- a/swamid-interfederations-2.0/biblio.bo.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,113 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://biblio.bo.cnr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">biblio.bo.cnr.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ira.inaf.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iasfbo.inaf.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bo.imm.cnr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CNR Bologna Research Area</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">CNR Area della Ricerca di Bologna</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for CNR Bologna Research Area users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti del CNR Area della Ricerca di Bologna</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://biblio.bo.cnr.it/info.php?inc=idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://biblio.bo.cnr.it</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://biblio.bo.cnr.it/informativa.php</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAJbpaoeYyF5GVt7G11oqdFKzTieoMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGJpYmxpby5iby5jbnIuaXQwHhcNMTEwNDI5MTU0ODM4
-WhcNMzEwNDI5MTU0ODM4WjAbMRkwFwYDVQQDExBiaWJsaW8uYm8uY25yLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJfFnp7SNaBBZ16ycfHpfG1A
-ZSmbJA1WQnMOkE/3LyHAcwuH4L3pzwZ+c8uHPEgb2XcWHT/ASPvVQ3WadwIhzHKM
-3xaS5Dp30fqlS/lB5jFdEOJaYGqsN0ZLsTH1krYcysm/ToDZ+PVhSCoOgdk6jG/G
-m/nrmnpyNai3uBAhOxugHadmcMGf87+fUz7W1mrqQrB+wHeF+LtogEsi77KcAwid
-snYqc/jQ5jvq2+x7ywlfFmf85aKMeyzfVO/6nXDYIEZaII/CkepegxP1CyqQsnmD
-2Wucrr+ZUo7JhgGFsF8js2vwXSQ/UAMsT+FvTni7QjhXK4jQXuiYrPhgrXKomwID
-AQABo2cwZTBEBgNVHREEPTA7ghBiaWJsaW8uYm8uY25yLml0hidodHRwczovL2Jp
-Ymxpby5iby5jbnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCT+SlxcKK+e
-etAAkTlQJ12HlnKLMA0GCSqGSIb3DQEBBQUAA4IBAQAbJeCTx4ki/AxCDbdFY9ae
-OUe1vwAPSpIKwkh4HgfxTQIYJ6qlgSDJp6tQBxU0kUMEQjVnNSm3wO1ybyAAyY09
-7ozayprctspLrZNnJ6mMac3xkJTKdndUmSaFt5P4iJCsoXAeFfnsbSgJdBmDvmYy
-wrmTmHCBy+x+Bffdkoct4jrEJLzzsegoW3Xef99vdLLUF3eABRkdqNGiSHrWxt4q
-U54oXUKAY4FIYbrat+RdEKwrq3NlApysLNVT2glyptc217T7w0JuMUgwTb3DXyG+
-1nkiY/BGUOL2/+jJkShC/nhoUFPUBy7VmLpTmaYnpLHyvSzFw/eJhmYdtWgOrHnU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://biblio.bo.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://biblio.bo.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://biblio.bo.cnr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://biblio.bo.cnr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://biblio.bo.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://biblio.bo.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">biblio.bo.cnr.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ira.inaf.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iasfbo.inaf.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bo.imm.cnr.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAJbpaoeYyF5GVt7G11oqdFKzTieoMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGJpYmxpby5iby5jbnIuaXQwHhcNMTEwNDI5MTU0ODM4
-WhcNMzEwNDI5MTU0ODM4WjAbMRkwFwYDVQQDExBiaWJsaW8uYm8uY25yLml0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgJfFnp7SNaBBZ16ycfHpfG1A
-ZSmbJA1WQnMOkE/3LyHAcwuH4L3pzwZ+c8uHPEgb2XcWHT/ASPvVQ3WadwIhzHKM
-3xaS5Dp30fqlS/lB5jFdEOJaYGqsN0ZLsTH1krYcysm/ToDZ+PVhSCoOgdk6jG/G
-m/nrmnpyNai3uBAhOxugHadmcMGf87+fUz7W1mrqQrB+wHeF+LtogEsi77KcAwid
-snYqc/jQ5jvq2+x7ywlfFmf85aKMeyzfVO/6nXDYIEZaII/CkepegxP1CyqQsnmD
-2Wucrr+ZUo7JhgGFsF8js2vwXSQ/UAMsT+FvTni7QjhXK4jQXuiYrPhgrXKomwID
-AQABo2cwZTBEBgNVHREEPTA7ghBiaWJsaW8uYm8uY25yLml0hidodHRwczovL2Jp
-Ymxpby5iby5jbnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCT+SlxcKK+e
-etAAkTlQJ12HlnKLMA0GCSqGSIb3DQEBBQUAA4IBAQAbJeCTx4ki/AxCDbdFY9ae
-OUe1vwAPSpIKwkh4HgfxTQIYJ6qlgSDJp6tQBxU0kUMEQjVnNSm3wO1ybyAAyY09
-7ozayprctspLrZNnJ6mMac3xkJTKdndUmSaFt5P4iJCsoXAeFfnsbSgJdBmDvmYy
-wrmTmHCBy+x+Bffdkoct4jrEJLzzsegoW3Xef99vdLLUF3eABRkdqNGiSHrWxt4q
-U54oXUKAY4FIYbrat+RdEKwrq3NlApysLNVT2glyptc217T7w0JuMUgwTb3DXyG+
-1nkiY/BGUOL2/+jJkShC/nhoUFPUBy7VmLpTmaYnpLHyvSzFw/eJhmYdtWgOrHnU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://biblio.bo.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://biblio.bo.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">CNR Area della Ricerca di Bologna</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CNR Bologna Research Area</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">https://biblio.bo.cnr.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://biblio.bo.cnr.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alessandro</md:GivenName>
-    <md:SurName>Tugnoli</md:SurName>
-    <md:EmailAddress>mailto:biblio-idem@area.bo.cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Silvana</md:GivenName>
-    <md:SurName>Mangiaracina</md:SurName>
-    <md:EmailAddress>mailto:biblio-idem@area.bo.cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index ffe3e920..00000000
--- a/swamid-interfederations-2.0/biggus.nesc.gla.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.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://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <!--
-		This is a "NeSC" simpleSAMLphp Test SP for the University of Glasgow.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-12T11:54:55Z">
-      <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">NeSC SimpleSAML Test SP Organisation</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A test SP running simpleSAMLPHP for federated access to NeSC PHP web applications</mdui:Description>
-        <mdui:Logo height="168" width="190">https://idp.nesc.gla.ac.uk:8444/nescgla.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEGDCCAwCgAwIBAgIJAL6/1HPmy0WjMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxHjAc
-						BgNVBAoTFVVuaXZlcnNpdHkgb2YgR2xhc2dvdzEYMBYGA1UECxMPVHJ1c3RGYWJy
-						aWNDZXJ0MR4wHAYDVQQDExViaWdndXMubmVzYy5nbGEuYWMudWswHhcNMTMxMTA0
-						MTI1NDM2WhcNMjMxMTAyMTI1NDM2WjCBjDELMAkGA1UEBhMCR0IxETAPBgNVBAgT
-						CFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MR4wHAYDVQQKExVVbml2ZXJzaXR5
-						IG9mIEdsYXNnb3cxGDAWBgNVBAsTD1RydXN0RmFicmljQ2VydDEeMBwGA1UEAxMV
-						YmlnZ3VzLm5lc2MuZ2xhLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAqUmwvEs1PilqD3m3tY2ewYnYnLs8M02nXdP0J5SsKsUhvzLnXlpwd3lu
-						tUpuwlmw9rPSt25hQYwuZvrmSAgYjevC1theXq+E2zT/VDtXQCPcMRkrfSuj0vj0
-						wk8M+eWFT5+DLvna24t4BhPYPc9bT00I7LtOg0FNulDxigvtlOfktepG41rQ2czA
-						6qtkjtSGuE4BgbH485hQyJCT4JSLuBPT8K0B3rYRe6nqknsm+H+ohCWlzKXKaI6w
-						6BuZS91oPne5WczzOk7lkPgPcmzgAhTYujvOkLl7HvX/lX00CvOtRZn6TzY5i5eH
-						yvJdqvgmOrcn1aWoYeC5AyHdItOZkQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQUA8gR9hvw83GQ8eYi0y7ulT0D05MwHwYDVR0jBBgwFoAUA8gR9hvw83GQ8eYi
-						0y7ulT0D05MwDQYJKoZIhvcNAQEFBQADggEBAACtN3u83nptnsMlUsA3VwF4huER
-						Ebn1szPGSdAmVYh9xikyfk6KIav+lUywT3AcyX3Zz2EZu8Sg4cyNut01wbXSLu8E
-						69YVmwrjMQC9AxLS73P0vKExPUpNuiDc8RbC4bHz6cGHptSknfSeByXJ59wAday3
-						MNA0XQ2qk4zkCDMCU44CT99RBS3rC2HzTXGH2ChZD1LrMontBD2w3wXKxQ1rwAZq
-						uj2C2OONhg723em0w0L8zSf9NAg4e+IcWHyJxWeGTldm+20qUTEltukkf72BR6MT
-						F8ADSfyH6PnaKgq+jDPKxnTqU8h9Cfw3e/ICV8V+ErNlzXPsA9gkTnGtoPQ=
-					</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>
-						MIIEGDCCAwCgAwIBAgIJAL6/1HPmy0WjMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxHjAc
-						BgNVBAoTFVVuaXZlcnNpdHkgb2YgR2xhc2dvdzEYMBYGA1UECxMPVHJ1c3RGYWJy
-						aWNDZXJ0MR4wHAYDVQQDExViaWdndXMubmVzYy5nbGEuYWMudWswHhcNMTMxMTA0
-						MTI1NDM2WhcNMjMxMTAyMTI1NDM2WjCBjDELMAkGA1UEBhMCR0IxETAPBgNVBAgT
-						CFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MR4wHAYDVQQKExVVbml2ZXJzaXR5
-						IG9mIEdsYXNnb3cxGDAWBgNVBAsTD1RydXN0RmFicmljQ2VydDEeMBwGA1UEAxMV
-						YmlnZ3VzLm5lc2MuZ2xhLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAqUmwvEs1PilqD3m3tY2ewYnYnLs8M02nXdP0J5SsKsUhvzLnXlpwd3lu
-						tUpuwlmw9rPSt25hQYwuZvrmSAgYjevC1theXq+E2zT/VDtXQCPcMRkrfSuj0vj0
-						wk8M+eWFT5+DLvna24t4BhPYPc9bT00I7LtOg0FNulDxigvtlOfktepG41rQ2czA
-						6qtkjtSGuE4BgbH485hQyJCT4JSLuBPT8K0B3rYRe6nqknsm+H+ohCWlzKXKaI6w
-						6BuZS91oPne5WczzOk7lkPgPcmzgAhTYujvOkLl7HvX/lX00CvOtRZn6TzY5i5eH
-						yvJdqvgmOrcn1aWoYeC5AyHdItOZkQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQUA8gR9hvw83GQ8eYi0y7ulT0D05MwHwYDVR0jBBgwFoAUA8gR9hvw83GQ8eYi
-						0y7ulT0D05MwDQYJKoZIhvcNAQEFBQADggEBAACtN3u83nptnsMlUsA3VwF4huER
-						Ebn1szPGSdAmVYh9xikyfk6KIav+lUywT3AcyX3Zz2EZu8Sg4cyNut01wbXSLu8E
-						69YVmwrjMQC9AxLS73P0vKExPUpNuiDc8RbC4bHz6cGHptSknfSeByXJ59wAday3
-						MNA0XQ2qk4zkCDMCU44CT99RBS3rC2HzTXGH2ChZD1LrMontBD2w3wXKxQ1rwAZq
-						uj2C2OONhg723em0w0L8zSf9NAg4e+IcWHyJxWeGTldm+20qUTEltukkf72BR6MT
-						F8ADSfyH6PnaKgq+jDPKxnTqU8h9Cfw3e/ICV8V+ErNlzXPsA9gkTnGtoPQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://biggus.nesc.gla.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Glasgow</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NeSC SimpleSAML Test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gla.ac.uk/escience/</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/bir-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 54aaf35b..00000000
--- a/swamid-interfederations-2.0/bir-shib.hosted.exlibrisgroup.com-shib.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://bir-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "Primo Resource Discovery at University of Birmingham" Shibboleth SP for Ex Libris (UK) 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="2015-06-29T09:37:01Z">
-      <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://bir-shib.hosted.exlibrisgroup.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://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Birmingham - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Birmingham</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOZSwyuu1CqhMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMzcwHhcNMTUwNjMwMTA1NTM0WhcNMjUwNjI3MTA1NTM0WjASMRAw
-						DgYDVQQDEwdhaW8wMDM3MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						usry3ZvAanlgA68B6Yvxcy8l5E8HmFEQD5S2oCA494AOQySUJpkCzzs93g23O1Cm
-						j1yLQyy3yqvtIn5ONZmJ5R29GbwfTZv0vzGu+V0D28KFMb6wR6kH5iKrrE3D37A7
-						abCseX4rmf8Lw3eOn79/Kjct8qb4EZadYXrsSTd12/9RhHKwLfOTDBV9yj3EUUqt
-						0+rsSulfJoztB0t9SDImLtO4PM+p418PjeR3JWW73LRfHZ7SzU9buz2flNNn8e2C
-						G0ITXFgVNWdDa5PlnTEyZAf/ccIcvA2DawdMbtjNig+6Bg7yj8QooNjf/g6Kq8G1
-						cB8BiFrqz26J+7E8iaZLZQIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDM3MB0G
-						A1UdDgQWBBQPCuFc7OkX0mQek4Bejrfa37rqjzANBgkqhkiG9w0BAQUFAAOCAQEA
-						TgoIXbhWwAbDb76D5iZCUHVFjvQjnERpp3jlfrKY3C9LjzPYc3twFvPG4w7MGRbD
-						czej5XbWS1N+Vmt5J+IYAuixsjN0R3gX1qH/IWQqNHOHXvFgYFiKQo7H1jFUvkjb
-						bqL9G+f0JpLatyfPh8u0S3fGRR0jBlu675wsfg8qYJxUrbrM8/DW7Wz3dUzjLabX
-						MGaxx53SXzMEMV7RVALiL/WqFnBNMMhVMGN27yzdxwgqce4hhpcvLPYNo4PArJQa
-						gDW+va8wE5WWvSEvJWFKXohCGuDoye6fuPZTDSL9xiiSdRaXomq36ryBKJUr9Fj/
-						EQZPbfR3TWxmQ1uuBBFT6A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bir-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at University of Birmingham</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
index 2ae28507..451c1171 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-adfs.smk.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/adfs.smk.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/adfs.smk.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-07-15T16:08:06Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-07-15T16:08:06Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smk.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">smk.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Statens Museum for Kunst – SMK</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Statens Museum for Kunst – SMK</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>smk.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC2DCCAcACAQcwDQYJKoZIhvcNAQELBQAwMjEwMC4GA1UEAwwnaHR0cHM6Ly9h
 ZGZzLnNtay5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAwMFoX
@@ -51,9 +53,9 @@ iaCTH9LM7/F3Hd+I
     <md:OrganizationURL xml:lang="da">http://www.smk.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.smk.dk/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 contactType="support">
+    <md:GivenName>Axel</md:GivenName>
+    <md:SurName>Kellermann</md:SurName>
+    <md:EmailAddress>axel.kellermann@smk.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 02d5ba03..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.dsl.dk-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/auth.dsl.dk/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-09-21T14:47:42Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsl.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="da">DSL</mdui:Description>
-        <mdui:Description xml:lang="en">DSL</mdui:Description>
-        <mdui:DisplayName xml:lang="da">Det Danske Sprog- og Litteraturselskab</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Danish Society for Language and Literature</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>dsl.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC9DCCAdwCAQcwDQYJKoZIhvcNAQELBQAwQDE+MDwGA1UEAww1aHR0cHM6Ly9h
-dXRoLmRzbC5kay9zaW1wbGVzYW1sL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwHhcN
-MTUwMTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjBAMT4wPAYDVQQDDDVodHRwczov
-L2F1dGguZHNsLmRrL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeIDApqEFO4jhn4gnWuA54S
-IILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAq
-j5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9lX2OzOealJWOnsdn9ag9YHKRYEk7QA5W
-bMHnOVqqRLfonvr7DF6vB2m4TFWdhI13vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJp
-KotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJ
-QAinnsZdCsvrcq2uMhxd12r4JnJnm3fsR1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkC
-AwEAATANBgkqhkiG9w0BAQsFAAOCAQEAYxKtUGv8KP9ekGMKVhx3A6xMs1iQ6PtP
-WNdSn/CJVcqLxt+cO0LTPQg862C8Kk66COiJZ1zqQVtH1qOUn01uNwURWnIAtlx3
-yjmnu6bAkr8N1zZchBPns3jvRLen9FgUASZxZyCMq12CbOExiByyn0uX/Xalb3E2
-/sp1y7ePhUaQwLl7qTehi8Qns/PFJ/HuPe01umYZL2eaRIepIceDbZrjaBGYV5rM
-Yddwdo55oZyYRtYPfvbI7ThZ1slkiND3U2W3u3G/XgbN0Jd8Mp6UBnLttIqus3iK
-7IxZv6lGXMla6y4BCHRYWu2yw4Ba2o004aA46xXhMwDBFs1ySLZA0Q==
-</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://birk.wayf.dk/birk.php/auth.dsl.dk/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Det Danske Sprog- og Litteraturselskab</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Danish Society for Language and Literature</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Det Danske Sprog- og Litteraturselskab</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Danish Society for Language and Literature</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.dsl.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.dsl.dk</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/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
index 7b0467ed..ff5f6594 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-auth.msk.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/auth.msk.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/auth.msk.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-26T11:11:53Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-06-26T11:11:53Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msk.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">msk.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Maskinmesterskolen København</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Copenhagen School of Marine Engineering and Technology Management</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>msk.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC1jCCAb4CAQcwDQYJKoZIhvcNAQELBQAwMTEvMC0GA1UEAwwmaHR0cDovL2F1
 dGgubXNrLmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUwMTAxMDAwMDAwWhcN
@@ -50,9 +52,4 @@ Y0vFLNNUbts2J7AXDQK28bn0u2mnK6aC2eFqEgcTU6xg+qQbj81PxKigfSJRsh+R
     <md:OrganizationURL xml:lang="da">http://www.msk.dk/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.msk.dk/om-skolen/english</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/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
index dcb69937..5d6fa598 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-cas.cbs.dk-saml-saml2-idp-metadata.php.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/cas.cbs.dk/saml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/cas.cbs.dk/saml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2013-08-09T09:53:44Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2013-08-09T09:53:44Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cbs.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">cbs.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Copenhagen Business School</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Copenhagen Business School</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>cbs.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC5jCCAc4CAQcwDQYJKoZIhvcNAQELBQAwOTE3MDUGA1UEAwwuaHR0cHM6Ly9j
 YXMuY2JzLmRrL3NhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0xNTAxMDEw
@@ -51,8 +53,8 @@ Zd682vK8XDpmc0mzv5AP2Bncmy2W1upHBNE=
     <md:OrganizationURL xml:lang="en">http://www.cbs.dk/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:GivenName>Bo</md:GivenName>
+    <md:SurName>Kolbol</md:SurName>
+    <md:EmailAddress>bk.it@cbs.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 25e30b97..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-det.kristne-gym.dk-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/det.kristne-gym.dk/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-10-25T12:46:26Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristne-gym.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Det Kristne Gymnasium</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Christian Gymnasium</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kristne-gym.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDAjCCAeoCAQcwDQYJKoZIhvcNAQELBQAwRzFFMEMGA1UEAww8aHR0cHM6Ly9k
-ZXQua3Jpc3RuZS1neW0uZGsvc2ltcGxlc2FtbC9zYW1sMi9pZHAvbWV0YWRhdGEu
-cGhwMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowRzFFMEMGA1UEAww8
-aHR0cHM6Ly9kZXQua3Jpc3RuZS1neW0uZGsvc2ltcGxlc2FtbC9zYW1sMi9pZHAv
-bWV0YWRhdGEucGhwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gM
-CmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz
-17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6e
-x2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVw
-DvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmV
-Wr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu
-9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCoUBE3jK8ztvya
-KQuU9cbWt39ew+Thn05TXGTLY+uoTqE/CIgnG9b1UUJGFsuh/21Iy8U1GaskTg9J
-5ePAf5X8r0gunshVgzsYIUkjyFh29g59FOr/VJezhzudoBYXKa9hygheEWYvPB15
-JskdU00YEbp0ql+FHgCAYxgORQY3o6HgUqLUdwNK5ySALZLXb8gx83J/tUBQWjXa
-7PlnX2NZ0LViHI7dgX1TTJWG4smT88Jl5Xelo99XaarlIsCNkeyl6fl+c7xNR3Sg
-a49V4RspOhcJ7AR2/E11J0DcbrLtX1CQtQGC1ACyzP3ZaXrnS3K22LNdJNLar9nk
-bNSPxoYF
-</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://birk.wayf.dk/birk.php/det.kristne-gym.dk/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Det Kristne Gymnasium</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Christian Gymnasium</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Det Kristne Gymnasium</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Christian Gymnasium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.kristne-gym.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.kristne-gym.dk</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/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
index 0ad530f8..0670f822 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-drcmr.dk-667-simplesaml-saml2-idp-metadata.php.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/drcmr.dk:667/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/drcmr.dk:667/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-07-02T11:54:25Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-07-02T11:54:25Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drcmr.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">drcmr.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">MR-Forskningssektionen (DRCMR)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Danish Research Centre for Magnetic Resonance</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>drcmr.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC9jCCAd4CAQcwDQYJKoZIhvcNAQELBQAwQTE/MD0GA1UEAww2aHR0cHM6Ly9k
 cmNtci5kazo2Njcvc2ltcGxlc2FtbC9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4X
@@ -51,8 +53,8 @@ NNHD2yvkSucskE/3RZ6PzZLyXCqpyLE79J6EDbrO1gKPs6Kjqg5W0ljY
     <md:OrganizationURL xml:lang="en">http://drcmr.dk/</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:GivenName>Torkil</md:GivenName>
+    <md:SurName>Svensgaard</md:SurName>
+    <md:EmailAddress>torkil@drcmr.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
index ffe12fd6..a779e8aa 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-federation.ku.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/federation.ku.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/federation.ku.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-05-06T13:32:41Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2014-05-06T13:32:41Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ku.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">ku.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Københavns Universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Copenhagen</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ku.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC4DCCAcgCAQcwDQYJKoZIhvcNAQELBQAwNjE0MDIGA1UEAwwraHR0cDovL2Zl
 ZGVyYXRpb24ua3UuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAw
@@ -50,9 +52,10 @@ oDZnFjBuo5Hw31Z+O4L9t4eVzBM=
     <md:OrganizationURL xml:lang="da">http://ku.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.ku.dk/english</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 contactType="support">
+    <md:GivenName>Koncern-IT</md:GivenName>
+    <md:SurName>Servicedesk</md:SurName>
+    <md:EmailAddress>it-service@adm.ku.dk</md:EmailAddress>
+    <md:TelephoneNumber>+45 35 32 27 00</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
index d4755bc3..4047630b 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fg.ucsyd.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/fg.ucsyd.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/fg.ucsyd.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-08-24T10:04:27Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-08-24T10:04:27Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsyd.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">UC SYD</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University College South Denmark</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ucsyd.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC1jCCAb4CAQcwDQYJKoZIhvcNAQELBQAwMTEvMC0GA1UEAwwmaHR0cDovL2Zn
 LnVjc3lkLmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUwMTAxMDAwMDAwWhcN
@@ -50,9 +52,4 @@ UFdljlsuM44ZHRRTQB7UThOzNtQaqFViwo1G86pznm4OQ5WhZqzFO8eoPb8bBtrk
     <md:OrganizationURL xml:lang="da">http://www.ucsyd.dk/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.ucsyd.dk/international/welcome-to-university-college-south-denmark/</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/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
index f81b7e00..1650f1a5 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.dskd.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/fs.dskd.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/fs.dskd.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-05-27T15:12:32Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-05-27T15:12:32Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dskd.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Designskolen Kolding</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Design School Kolding</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>dskd.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC1DCCAbwCAQcwDQYJKoZIhvcNAQELBQAwMDEuMCwGA1UEAwwlaHR0cDovL2Zz
 LmRza2QuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBaFw0y
@@ -51,8 +53,6 @@ dPcr9FHbXBQ=
     <md:OrganizationURL xml:lang="en">https://www.designskolenkolding.dk/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:EmailAddress>hng@dskd.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
deleted file mode 100644
index 1edd2b24..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-fs.edu.simac.dk-adfs-services-trust.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/fs.edu.simac.dk/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-08-05T14:39:40Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">simac.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">SIMAC</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SIMAC</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>simac.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cDovL2Zz
-LmVkdS5zaW1hYy5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAw
-MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cDovL2ZzLmVkdS5zaW1h
-Yy5kay9hZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
-lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
-x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
-jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
-tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
-d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQCMnEPPjnsBWSGeheSYbDsSi0Xu7lRxxqEKZYwRCoTMmYIJRCXnJbPxA/BiP2nK
-K/ZnqJB9yHrNaLzE5rQw8QOkgCw1hGH3KspHtW29g9LkUpUnlPrmcqHYJFFuAIhF
-gsqSQ6jdv9q0q4vOSnhyKNVOA613djnxmNfbpPhwTMS6Udv/1euPi9xo6x/+ExL7
-beahYAykMS99l1bn1/tAhD+HoHbF1E5bKhsAQ5VqhEm+c1zY3sZNDrSi8ca7wv/x
-3vZ3PhzIxt23JHiArE7JPSQ7/8sbDf5qKUPRltdh8NxLRwVFzeyTrBwEwMF/mpRg
-fwnoK0wK5Qy+Hac98sg1DygI
-</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://birk.wayf.dk/birk.php/fs.edu.simac.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">SIMAC</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SIMAC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">SIMAC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SIMAC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.simac.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.simac.dk</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/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
index 68873fe7..1958e584 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.fms.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/idp.fms.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/idp.fms.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-05-26T14:37:57Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-05-26T14:37:57Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fms.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">fms.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Fredericia Maskinmesterskole</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Fredericia Maskinmesterskole</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>fms.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC1DCCAbwCAQcwDQYJKoZIhvcNAQELBQAwMDEuMCwGA1UEAwwlaHR0cDovL2lk
 cC5mbXMuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBaFw0y
@@ -50,9 +52,10 @@ Kz+Iv2SAMUA=
     <md:OrganizationURL xml:lang="da">http://www.fms.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.fms.dk</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 contactType="administrative">
+    <md:GivenName>Kaj</md:GivenName>
+    <md:SurName>Hammer</md:SurName>
+    <md:EmailAddress>kg@fms.dk</md:EmailAddress>
+    <md:TelephoneNumber>28962201</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
index e3b1d592..b4bb839c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-idp.umit.dk.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/idp.umit.dk">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/idp.umit.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-01-02T14:49:44Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2014-01-02T14:49:44Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umit.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">umit.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Uddannelsesministeriets It</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">IT Department of the Ministry of Higher Education</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>umit.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICsDCCAZgCAQcwDQYJKoZIhvcNAQELBQAwHjEcMBoGA1UEAwwTaHR0cHM6Ly9p
 ZHAudW1pdC5kazAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMB4xHDAa
@@ -50,8 +52,6 @@ Wma0d+CKLHPagLmm29t8EF37hZE=
     <md:OrganizationURL xml:lang="en">http://fivu.dk/en/the-minister-and-the-ministry/organisation/it-department-of-the-ministry-of-science-innovation-and-higher-education</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:EmailAddress>servicedesk@fivu.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
index fe1601b3..3d66a850 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-kadk-idp.wayf.kb.dk.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/kadk-idp.wayf.kb.dk">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/kadk-idp.wayf.kb.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-01-12T09:31:21Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-01-12T09:31:21Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kadk.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">kadk.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Kunstakademiets Arkitekt, Design og Konservatorskoler</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Schools of Architecture, Design and Conservation</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kadk.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly9r
 YWRrLWlkcC53YXlmLmtiLmRrMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
@@ -50,8 +52,7 @@ rBue0WdqjxUhj4Yyw2JK3w2jM3vzSNu7HWJ8AIBKco5rG/vo
     <md:OrganizationURL xml:lang="en">http://www.kadk.dk/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:SurName>Administrator</md:SurName>
+    <md:EmailAddress>dgj@kb.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
index e86709c6..16f3997d 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-orphanage.wayf.dk.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/orphanage.wayf.dk">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/orphanage.wayf.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:41:26Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:41:26Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">orphanage.wayf.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">orphanage.wayf.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">WAYF Orphanage</mdui:Description>
         <mdui:Description xml:lang="en">WAYF Orphanage</mdui:Description>
         <mdui:DisplayName xml:lang="da">WAYF Orphanage</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">WAYF Orphanage</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>orphanage.wayf.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICvDCCAaQCAQcwDQYJKoZIhvcNAQELBQAwJDEiMCAGA1UEAwwZaHR0cHM6Ly9v
 cnBoYW5hZ2Uud2F5Zi5kazAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTla
@@ -52,8 +54,6 @@ I81cWocYw/rsAD2kW5C5T1nMZBlgoYk/+yXoXXGHuEI=
     <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/birk.wayf.dk-birk.php-saml.fiol.odense.dk-.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.fiol.odense.dk-.xml
deleted file mode 100644
index b3db6286..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.fiol.odense.dk-.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/saml.fiol.odense.dk/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-05-01T08:08:42Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odense.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Odense Kommune</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Odense Municipality</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>odense.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwjCCAaoCAQcwDQYJKoZIhvcNAQELBQAwJzElMCMGA1UEAwwcaHR0cHM6Ly9z
-YW1sLmZpb2wub2RlbnNlLmRrLzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5
-NTlaMCcxJTAjBgNVBAMMHGh0dHBzOi8vc2FtbC5maW9sLm9kZW5zZS5kay8wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCC
-y3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+b
-k+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB
-5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqL
-SHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAI
-p57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMB
-AAEwDQYJKoZIhvcNAQELBQADggEBACNrMNuYjTHXzOvP4Q81kIxRPTlxNwRf0V3Y
-CorAwwDmkSUNJDpWr/HdxL+WxwfI+1tnHgfswg462ndFbwtW3gKrdAHVjNkN6cxh
-lGptk17MixyPXdVjOpsVIUax+WXbe/Vh9JIX/MuVR2vKy21hqcSDMqcc1HOSzg7x
-+9iQLQr/SFLpcznzPvfhpDr92dUF1mRqoyBfhhxsTOOsXvnjxMBimILOO0UmjDde
-B9shT8Rd3k1UD+YcfQPmM56rLvEiHaiuj/YZJtqjHBGNrqNwjgXUvC8ZGdW73Lir
-dLiCrwaJm7SRPIJLBmK5+7lktCg2EmDMXoIQsmgSZomAptnCdRY=
-</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://birk.wayf.dk/birk.php/nemlogin.odense.dk/runtime/saml2/issue.idp"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Odense Kommune</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Odense Municipality</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Odense Kommune</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Odense Municipality</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.odense.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.odense.dk/english.aspx</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/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
index 6ac0f8d7..b9a090d5 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.pharmakon.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/saml.pharmakon.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/saml.pharmakon.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-12-22T11:57:11Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2011-12-22T11:57:11Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apoteket.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">apoteket.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Pharmakon</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Pharmakon</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>apoteket.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC5DCCAcwCAQcwDQYJKoZIhvcNAQELBQAwODE2MDQGA1UEAwwtaHR0cHM6Ly9z
 YW1sLnBoYXJtYWtvbi5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAw
@@ -51,9 +53,10 @@ HM6p9FnQoiWszraaknJsQ8E+fjjqZ1dY
     <md:OrganizationURL xml:lang="da">http://pharmakon.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://pharmakon.dk/pages/International.aspx</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 contactType="support">
+    <md:GivenName>Carsten</md:GivenName>
+    <md:SurName>Sjoerup</md:SurName>
+    <md:EmailAddress>cs@cloud.as</md:EmailAddress>
+    <md:TelephoneNumber>23881199</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
index 3693752d..473be87d 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso.eucnord.net-.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/saml.sso.eucnord.net/">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/saml.sso.eucnord.net/">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-14T14:53:56Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-06-14T14:53:56Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eucnord.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">eucnord.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">EUC Nord</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">EUC Nord</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>eucnord.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICwjCCAaoCAQcwDQYJKoZIhvcNAQELBQAwJzElMCMGA1UEAwwcaHR0cDovL3Nh
 bWwuc3NvLmV1Y25vcmQubmV0LzAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5
@@ -50,9 +52,4 @@ t3FWDnyLxXBh+nay2r+6OQNF/HI0V54HHHXpFhvg3pAfZSmrhjI=
     <md:OrganizationURL xml:lang="da">http://www.eucnord.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.eucnord.dk/OmEucNord/About/Sider/default.aspx</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/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
index f8a9da46..6370d023 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml.sso3.phmetropol.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/saml.sso3.phmetropol.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/saml.sso3.phmetropol.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-01-24T10:23:07Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2014-01-24T10:23:07Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phmetropol.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">phmetropol.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Professionshøjskolen Metropol</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Metropolitan University College</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>phmetropol.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC8DCCAdgCAQcwDQYJKoZIhvcNAQELBQAwPjE8MDoGA1UEAwwzaHR0cHM6Ly9z
 YW1sLnNzbzMucGhtZXRyb3BvbC5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1
@@ -50,9 +52,9 @@ d3A0FABe5reA+KtzVrTieVTjWHGQtF2W1mNkWx2Gi1lGu25F
     <md:OrganizationURL xml:lang="da">http://www.phmetropol.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://en.phmetropol.dk</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 contactType="support">
+    <md:GivenName>Nicolai</md:GivenName>
+    <md:SurName>Høglund</md:SurName>
+    <md:EmailAddress>niho@phmetropol.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index f82a35d2..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-saml1.dmjx.dk-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/saml1.dmjx.dk/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-10T12:02:31Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmjx.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Danmarks Medie- og Journalisthøjskole</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Danish School of Media and Jornalism</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>dmjx.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC+DCCAeACAQcwDQYJKoZIhvcNAQELBQAwQjFAMD4GA1UEAww3aHR0cHM6Ly9z
-YW1sMS5kbWp4LmRrL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAe
-Fw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMEIxQDA+BgNVBAMMN2h0dHBz
-Oi8vc2FtbDEuZG1qeC5kay9zaW1wbGVzYW1sL3NhbWwyL2lkcC9tZXRhZGF0YS5w
-aHAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1
-rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCG
-PIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJ
-O0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJ
-nUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXi
-OcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvO
-w1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKgep9fsq2B5OJ0QhkjFQL+0viBI
-P5nJbujaQx+L5jfIHmh2HWm43HSocZMW3vc9abfxn1pwzL326umWsNm60mUcn3MT
-WAC2id/c605Fy7f6Ct2SUjBo94ST5yS9YJ8RaeDomaHhpmwBoGIy9Y/2VSQLhSGC
-HkRCyyj/SZLakf+Te96RcAjAO+ZNqwIJmEGMEi5MF0UGbFJpLOFF5gWNdJoIztK4
-nJ0pRpWW1BIELAsmxh8Cauz4zrerZmUZZE3vv4hKqJolgUjnBQ8783k+Ty5rJ5A9
-sIsugcTH6K28MleLFhFT1ZJ8bJ4C5QRPixp3NRKK/pTRUi24c/NtsxiW2I8=
-</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://birk.wayf.dk/birk.php/saml1.dmjx.dk/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Danmarks Medie- og Journalisthøjskole</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Danish School of Media and Journalism</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Danmarks Medie- og Journalisthøjskole</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Danish School of Media and Journalism</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.dmjx.dk/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.dmjx.dk/</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/birk.wayf.dk-birk.php-simpelsaml.natmus.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-simpelsaml.natmus.dk-saml2-idp-metadata.php.xml
deleted file mode 100644
index a7891c5b..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-simpelsaml.natmus.dk-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/simpelsaml.natmus.dk/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T14:04:47Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">natmus.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Nationalmuseet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">National Museum</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>natmus.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC8DCCAdgCAQcwDQYJKoZIhvcNAQELBQAwPjE8MDoGA1UEAwwzaHR0cHM6Ly9z
-aW1wZWxzYW1sLm5hdG11cy5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1
-MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowPjE8MDoGA1UEAwwzaHR0cHM6Ly9z
-aW1wZWxzYW1sLm5hdG11cy5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQAt4e9MzHotMGVnO77n9R9ueDjmbKGN75UmAAWF
-yYLMte6Ps4tcIYt89DTpFOwFqGIL41+ZuIWuKYz1QBcFu8J4Q+bDOsAjLtCUHU3S
-p8ytqt+AkcZUqjbnH5L0JbsmBRor3ig4AgkBk/Xm3Y00yHdLQraCdKkMLywFd2uu
-Kjqp1jf3dnu7x7d1Zii0Dt+xh6Vn6D1NryJAhY+i1iB7dF5FZ02R2HD+0R5NI8fU
-V+g4sSO0d/3IX94sehclEhZailvO+2XGQZB40QoB8XBzVlnXwo1MdTkk4sraRESH
-b/t1XfdTsZpmhwsOLUL05aydKS8fdVhedHDrVq6Ccz5y1UzM
-</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://birk.wayf.dk/birk.php/simpelsaml.natmus.dk/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Nationalmuseet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Museum</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Nationalmuseet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">National Museum</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.nationalmuseet.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.nationalmuseet.dk/sw20374.asp</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/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
index e082af18..7445b713 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.basyd.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.basyd.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/sso.basyd.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-14T14:50:42Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-06-14T14:50:42Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">basyd.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">basyd.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Erhvervsakademi Kolding</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">International Business Academy</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>basyd.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC2DCCAcACAQcwDQYJKoZIhvcNAQELBQAwMjEwMC4GA1UEAwwnaHR0cDovL3Nz
 by5iYXN5ZC5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAwMFoX
@@ -50,9 +52,4 @@ h8V01qfDTMmw4ASc
     <md:OrganizationURL xml:lang="da">http://www.iba.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.iba.dk/internationalstudies</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/birk.wayf.dk-birk.php-sso.campusvejle.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.campusvejle.dk-adfs-services-trust.xml
deleted file mode 100644
index 2b23bcf1..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.campusvejle.dk-adfs-services-trust.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.campusvejle.dk/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-10T11:55:13Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campusvejle.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">CAMPUS VEJLE</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CAMPUS VEJLE</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>campusvejle.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC5DCCAcwCAQcwDQYJKoZIhvcNAQELBQAwODE2MDQGA1UEAwwtaHR0cDovL3Nz
-by5jYW1wdXN2ZWpsZS5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAw
-MDAwMFoXDTI1MTIzMTIzNTk1OVowODE2MDQGA1UEAwwtaHR0cDovL3Nzby5jYW1w
-dXN2ZWpsZS5kay9hZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlO
-a0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEg
-V9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8H
-abhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQk
-uv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3X
-avgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQBQACMtdGSq6kmGplQZeN1Sq7ZDAIOdsy8idU2yVg2jTg5TjAH1g/K7
-QRLqjeuJ/xopH5DZyy16UCXtNNItXPbaSb/OnDnDAvS8kMJ/rjUG4SFlWVpqR0TI
-6bUH1M3KfjpRZ3W2Ymw2fMg3flo5I+5SNp2JsjJ5vqXXjqc62nfEWYg4rln8tCQF
-jzS0B1VUYsKAB2FkTnWIqZM5JZXGp7iB1DIyw89DFEItcvc3Oi6MZVh0HIp8Abtf
-/iXLm9sh1tWjF6uqLuP0SuzUGFxMEhWTLfIzDv0sDTLYs9z+Ce+0A7mI7K/tQXH5
-LEagTfcwTTnB53/+kN4fM/lAGt72ZPhr
-</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://birk.wayf.dk/birk.php/sso.campusvejle.dk/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://birk.wayf.dk/birk.php/sso.campusvejle.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">CAMPUS VEJLE</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CAMPUS VEJLE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">CAMPUS VEJLE</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CAMPUS VEJLE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.campusvejle.dk/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.campusvejle.dk/</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/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
index c9134eb5..10d2faea 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.drlund-gym.dk.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/sso.drlund-gym.dk">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/sso.drlund-gym.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:30:42Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:30:42Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drlund-gym.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">drlund-gym.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">Dronninglund Gymnasium</mdui:Description>
         <mdui:Description xml:lang="en">Dronninglund Gymnasium</mdui:Description>
         <mdui:DisplayName xml:lang="da">Dronninglund Gymnasium</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Dronninglund Gymnasium</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>drlund-gym.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICvDCCAaQCAQcwDQYJKoZIhvcNAQELBQAwJDEiMCAGA1UEAwwZaHR0cHM6Ly9z
 c28uZHJsdW5kLWd5bS5kazAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTla
@@ -51,9 +53,4 @@ dQDb0gK1ALtFHsR6o+DkLOvLyImsQq8zCLwhzROY4ig=
     <md:OrganizationURL xml:lang="da">http://www.dronninglundgymnasium.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.dronninglundgymnasium.dk/International_Contacts.asp</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/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
index 135eeff8..443b1b22 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eal.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.eal.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/sso.eal.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-14T14:53:02Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-06-14T14:53:02Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eal.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">eal.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Erhvervsakademiet Lillebælt</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Lillebaelt Academy of Professional Higher Education</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>eal.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC1DCCAbwCAQcwDQYJKoZIhvcNAQELBQAwMDEuMCwGA1UEAwwlaHR0cDovL3Nz
 by5lYWwuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBaFw0y
@@ -51,9 +53,4 @@ uVff9vzTPfw=
     <md:OrganizationURL xml:lang="da">http://www.eal.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.eal.dk/eal/site.aspx?p=58</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/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml
deleted file mode 100644
index 1048552d..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eamv.dk-adfs-services-trust.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.eamv.dk/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-14T14:51:55Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eamv.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Erhvervsakademi MidtVest</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Erhvervsakademi MidtVest</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>eamv.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb4CAQcwDQYJKoZIhvcNAQELBQAwMTEvMC0GA1UEAwwmaHR0cDovL3Nz
-by5lYW12LmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUwMTAxMDAwMDAwWhcN
-MjUxMjMxMjM1OTU5WjAxMS8wLQYDVQQDDCZodHRwOi8vc3NvLmVhbXYuZGsvYWRm
-cy9zZXJ2aWNlcy90cnVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5zU8N+nQl
-0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9lX2OzOea
-lJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13vdL4DJP8
-Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3mPyCEpQP
-gEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fsR1Q4jPja
-OgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAVJMwXUSY
-xDcWQrwEHt6FEjDYOtmquq/n711CnmPRBBJwLOpUAEs2iMU0tnYqjAbsMej+UwgC
-5JrFuILzOIUw+cEkOmI+LRvz5rmR4eNfqJAB4jeWJ2l9h8kZmR9p2vhz4lJRyOIH
-JpojtOgOdcX6XoIRHx8LFOKqpdiOnrY7R8g+3n71fPMgmFbcq1cLhJi9q0UfYrOH
-2Zgryg2mK2EaqXR9gA6IQEqh/CQOCqKJLty+8qlJa+tNvf/14I2ks7xLDK2cJt3S
-Ln/ONijLVQn5Rye1eqh1FviwAs2lc0HV5MQpKMd6u/Jfvvg3cGBMhmXoO95IsUd1
-mZA0QGYfa1EL1Q==
-</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://birk.wayf.dk/birk.php/sso.eamv.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Erhvervsakademi MidtVest</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Erhvervsakademi MidtVest</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Erhvervsakademi MidtVest</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Erhvervsakademi MidtVest</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://eamv.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://eamv.dk</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/birk.wayf.dk-birk.php-sso.eucvest.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eucvest.dk-adfs-services-trust.xml
deleted file mode 100644
index 5a3a9d8c..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.eucvest.dk-adfs-services-trust.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.eucvest.dk/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-14T14:54:44Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eucvest.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">EUC Vest</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">EUC Vest</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>eucvest.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC3DCCAcQCAQcwDQYJKoZIhvcNAQELBQAwNDEyMDAGA1UEAwwpaHR0cDovL3Nz
-by5ldWN2ZXN0LmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUwMTAxMDAwMDAw
-WhcNMjUxMjMxMjM1OTU5WjA0MTIwMAYDVQQDDClodHRwOi8vc3NvLmV1Y3Zlc3Qu
-ZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5
-zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9
-lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13
-vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3
-mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fs
-R1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-bng0x5EJGLHZOoQ+fWq7u79j8A5i23hjAduLO+vGvZaSbvuWfmcHIAjRVFABhyAe
-xCLYm1MrICTvs6KbGDublox9nV+2p71gyk4p6/1oCaXsmPLD6hwbqHvF2YncaQSn
-udWVk+ANotrGY5ycaRhFG7K1Stz/euoDQta9XXPCt+HjWNarJRhbXCMmg1ZxUBzK
-WNvfDdFhlSYwLWR3ZDCcN/G8QUueko42OADxeFnk/pIxLnFZiSyBfxal6jhxEzfm
-zUJjWMUt/SSxsBVKOSPhIpbnbcQiAIqTyskI4Zb4jbI+amQCt8BzmT58kLFcXNPG
-rItZWCooDQl98Ynw+qk7Ww==
-</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>MIIC3DCCAcQCAQcwDQYJKoZIhvcNAQELBQAwNDEyMDAGA1UEAwwpaHR0cDovL3Nz
-by5ldWN2ZXN0LmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUwMTAxMDAwMDAw
-WhcNMjUxMjMxMjM1OTU5WjA0MTIwMAYDVQQDDClodHRwOi8vc3NvLmV1Y3Zlc3Qu
-ZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5
-zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9
-lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13
-vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3
-mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fs
-R1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-bng0x5EJGLHZOoQ+fWq7u79j8A5i23hjAduLO+vGvZaSbvuWfmcHIAjRVFABhyAe
-xCLYm1MrICTvs6KbGDublox9nV+2p71gyk4p6/1oCaXsmPLD6hwbqHvF2YncaQSn
-udWVk+ANotrGY5ycaRhFG7K1Stz/euoDQta9XXPCt+HjWNarJRhbXCMmg1ZxUBzK
-WNvfDdFhlSYwLWR3ZDCcN/G8QUueko42OADxeFnk/pIxLnFZiSyBfxal6jhxEzfm
-zUJjWMUt/SSxsBVKOSPhIpbnbcQiAIqTyskI4Zb4jbI+amQCt8BzmT58kLFcXNPG
-rItZWCooDQl98Ynw+qk7Ww==
-</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://birk.wayf.dk/birk.php/sso.eucvest.dk/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://birk.wayf.dk/birk.php/sso.eucvest.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">EUC Vest</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">EUC Vest</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">EUC Vest</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">EUC Vest</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.eucvest.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.eucvest.dk</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/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
index ddaf2118..3c226922 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.hrs.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.hrs.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/sso.hrs.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-05-16T22:43:37Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-05-16T22:43:37Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrs.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">hrs.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Hotel- og Restaurantskolen</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Copenhagen Hospitality College</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hrs.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC1DCCAbwCAQcwDQYJKoZIhvcNAQELBQAwMDEuMCwGA1UEAwwlaHR0cDovL3Nz
 by5ocnMuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBaFw0y
@@ -51,9 +53,4 @@ H8vDIZSNJeoj/SitEpgjanw5oNXtqn16gZcB2v/fPs2qDbs636amU6ELoV0gpQjv
     <md:OrganizationURL xml:lang="da">http://www.hrs.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://hrs.dk/english.aspx</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/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml
deleted file mode 100644
index 8d93b2e4..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.rosborg-gym.dk-adfs-services-trust.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.rosborg-gym.dk/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-04-04T11:23:45Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rosborg-gym.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Rosborg Gymnasium &amp; HF</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Rosborg Gymnasium &amp; HF</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>rosborg-gym.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC5DCCAcwCAQcwDQYJKoZIhvcNAQELBQAwODE2MDQGA1UEAwwtaHR0cDovL3Nz
-by5yb3Nib3JnLWd5bS5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAw
-MDAwMFoXDTI1MTIzMTIzNTk1OVowODE2MDQGA1UEAwwtaHR0cDovL3Nzby5yb3Ni
-b3JnLWd5bS5kay9hZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlO
-a0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEg
-V9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8H
-abhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQk
-uv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3X
-avgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQCCp9mpHD4ESWNfN3FuXZQ4unlZK8gs4aANj8oGyjA2WPA8vOpXP1r9
-FCRplwG+1hTLz9ZNFmPXdOFkEiQwxN6k2P3NDCeNS0G0NaD+2PLH/i0tkoXsuPdz
-iWf7SRMHdnNDUTISf9vS24p7Z7ymyFAz834ZvRaCK6JGlMuGwIMEWdIyLUrY1t8Z
-x4AgwnVrU+eMDCuri1vZwgdN3VKF9lkg1Wtm0wY9/IT21SMMXDIr5FzT5Rn943Hj
-xKYnOE/lrLQ9B8MWSnyoyJEdmWHJUeJ5GSDwRI3Wrn/n2mUlbALLcdI9D56vmEVX
-GG6TK2xCAz6z3j5/OuMvrJGZ8BTGt2QC
-</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://birk.wayf.dk/birk.php/sso.rosborg-gym.dk/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://birk.wayf.dk/birk.php/sso.rosborg-gym.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Rosborg Gymnasium &amp; HF</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Rosborg Gymnasium &amp; HF</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Rosborg Gymnasium &amp; HF</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Rosborg Gymnasium &amp; HF</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.rosborg-gym.dk/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.rosborg-gym.dk/</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/birk.wayf.dk-birk.php-sso.sceu.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sceu.dk-adfs-services-trust.xml
deleted file mode 100644
index 99002110..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sceu.dk-adfs-services-trust.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.sceu.dk/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-05-14T15:01:23Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sceu.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Selandia CEU</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Selandia CEU</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>sceu.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb4CAQcwDQYJKoZIhvcNAQELBQAwMTEvMC0GA1UEAwwmaHR0cDovL3Nz
-by5zY2V1LmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUwMTAxMDAwMDAwWhcN
-MjUxMjMxMjM1OTU5WjAxMS8wLQYDVQQDDCZodHRwOi8vc3NvLnNjZXUuZGsvYWRm
-cy9zZXJ2aWNlcy90cnVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5zU8N+nQl
-0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9lX2OzOea
-lJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13vdL4DJP8
-Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3mPyCEpQP
-gEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fsR1Q4jPja
-OgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAL5cLfGEr
-GgppJfdu+5vfCygxqkWZoDi8QYlfCUD3HOJ4I957jYe/gWZl+Zx1jeYTybVQWRgH
-TjgDDPl8sHilpmf6UkwBcusrPLZAZrH+L0W5yDx8Tk6kkKCWZrpZ0o2DwhMIImDc
-4HOIGaRl4QtAuqrHL5WlqXFQOnsWWrVA68bggQrMIENjbLT/JEN4RZg4MCoetpBr
-WgjWUSv977XExKNUVQVOuIVfevhUrsTuMgzv8ocfjtQQpXAkfxxbTy1AnNEzn89c
-ug6n+42ebmjMDc/MxYwRHuqJGiWAec+xdEDPbkifbJbnuL9k7NN6TNoeVeAwUOFn
-/JA3VgklblnVKw==
-</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://birk.wayf.dk/birk.php/sso.sceu.dk/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://birk.wayf.dk/birk.php/sso.sceu.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Selandia CEU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Selandia CEU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Selandia CEU</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Selandia CEU</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.selandia-ceu.dk/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.selandia-ceu.dk/selandia/international.aspx</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/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml
deleted file mode 100644
index d7f34452..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sde.dk-adfs-services-trust.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.sde.dk/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-03-27T09:31:23Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sde.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Syddansk Erhvervsskole</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Syddansk Erhvervsskole</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>sde.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1DCCAbwCAQcwDQYJKoZIhvcNAQELBQAwMDEuMCwGA1UEAwwlaHR0cDovL3Nz
-by5zZGUuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBaFw0y
-NTEyMzEyMzU5NTlaMDAxLjAsBgNVBAMMJWh0dHA6Ly9zc28uc2RlLmRrL2FkZnMv
-c2VydmljZXMvdHJ1c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH
-iAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZ
-hrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSV
-jp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+
-tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BH
-OZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joF
-cy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAUUGBdTEYTW
-yn2lYso/GTInRXM7tUhXWaDCyQqg9AQHv1OFoP0wkZMIzvmVCa9LvAq9+J8YOP47
-CFPiqXvD9zV8b/bl8WtTNU5+rynqzNBVabHdvTtR5N3hcg/sx2/Y7AC+w7e96l/K
-XfpJHSEYH5/JP24l69jocqSpqIHGkjzOBJXIvN8eeOoOGAKCa9YiDNhvN8e8hdWx
-lYF+EtyYD1rM5GLpGl3hNFfW9RmDQjEIJyOuP4qOgP2j4E9zTW/Cykh/5TDQvAqv
-Fi3qg6yPGPAdmhi0EkfRzN8MThxT0uNKWGILLPGSNYeGZLuuT+Txb+5E9k9w9wh1
-HkNhvouMOcU=
-</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://birk.wayf.dk/birk.php/sso.sde.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Syddansk Erhvervsskole</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Syddansk Erhvervsskole</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Syddansk Erhvervsskole</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Syddansk Erhvervsskole</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.sde.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.sde.dk</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/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
index 92545964..41412069 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.sdu.dk-wayf.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/sso.sdu.dk/wayf">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/sso.sdu.dk/wayf">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:36:49Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:36:49Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdu.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">sdu.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">Syddansk Universitet</mdui:Description>
         <mdui:Description xml:lang="en">University of Southern Denmark</mdui:Description>
         <mdui:DisplayName xml:lang="da">Syddansk Universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Southern Denmark</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>sdu.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICuDCCAaACAQcwDQYJKoZIhvcNAQELBQAwIjEgMB4GA1UEAwwXaHR0cHM6Ly9z
 c28uc2R1LmRrL3dheWYwHhcNMTUwMTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjAi
@@ -51,9 +53,4 @@ jZehS9P/tKKffrsqCxpzGtwrXTEfxfMsmYVKeQ==
     <md:OrganizationURL xml:lang="da">http://www.sdu.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.sdu.dk/?sc_lang=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/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
index 69cda8cb..0d17052a 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucl.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/sso.ucl.dk/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/sso.ucl.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:38:14Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:38:14Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">ucl.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">University College Lillebælt</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University College Lillebaelt</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ucl.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC8jCCAdoCAQcwDQYJKoZIhvcNAQELBQAwPzE9MDsGA1UEAww0aHR0cHM6Ly9z
 c28udWNsLmRrL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0x
@@ -50,9 +52,4 @@ uZJ5q8OhIN1jFsxF2xY8T+xaHvObuZJ9246bmlRQrtx7fAkCtyfCN9zPu0STf68+
     <md:OrganizationURL xml:lang="da">http://www.ucl.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.ucl.dk/content/us</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/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
index 30e1a288..57bace1a 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk-443-idp.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/sso.ucsj.dk:443/idp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/sso.ucsj.dk:443/idp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-20T13:41:22Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-20T13:41:22Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsj.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">ucsj.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">University College Sjælland</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University College Zealand</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ucsj.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly9z
 c28udWNzai5kazo0NDMvaWRwMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
@@ -49,9 +51,4 @@ TrFmg+sXdlIbAI8kQgy2xotEFE/2sXYFDC+fCZ838tg7R7cF
     <md:OrganizationURL xml:lang="da">http://ucsj.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://ucsj.dk/english/frontpage</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/birk.wayf.dk-birk.php-sso.ucsj.dk:443-idp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk:443-idp.xml
deleted file mode 100644
index 9a4d9d84..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsj.dk:443-idp.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/sso.ucsj.dk:443/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-06-15T15:37:00Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsj.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">University College Sjælland</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University College Zealand</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ucsj.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly9z
-c28udWNzai5kazo0NDMvaWRwMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly9zc28udWNzai5kazo0NDMvaWRwMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQAUi0p8JyqivUpFfLdlC7DAs632iyAuaDDhB6EH
-Nk4x0NuC3momEkYPGt8cWq/+GvarQgkTKJLyDKEvnrRLi825W7QqgNHhvIcm3Kr9
-5p9wEUnQguVHD0Q+xrNNECB6cPZQ/I9tv2wnZkOvrLBrwbGvHLo+Gb5X7ThT2UFU
-S3/Subgs17TezQcYm9VW7e0nZrFaz7iXFgVkpMmGh3/evEC0t/bcCVg67jvYNQPB
-6pnMkUCIbsEJEu71NA31H6qLyP+C5TLNACH3tszaQiQAgNoVJN7nbaqokdSyPOS+
-TrFmg+sXdlIbAI8kQgy2xotEFE/2sXYFDC+fCZ838tg7R7cF
-</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>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly9z
-c28udWNzai5kazo0NDMvaWRwMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly9zc28udWNzai5kazo0NDMvaWRwMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQAUi0p8JyqivUpFfLdlC7DAs632iyAuaDDhB6EH
-Nk4x0NuC3momEkYPGt8cWq/+GvarQgkTKJLyDKEvnrRLi825W7QqgNHhvIcm3Kr9
-5p9wEUnQguVHD0Q+xrNNECB6cPZQ/I9tv2wnZkOvrLBrwbGvHLo+Gb5X7ThT2UFU
-S3/Subgs17TezQcYm9VW7e0nZrFaz7iXFgVkpMmGh3/evEC0t/bcCVg67jvYNQPB
-6pnMkUCIbsEJEu71NA31H6qLyP+C5TLNACH3tszaQiQAgNoVJN7nbaqokdSyPOS+
-TrFmg+sXdlIbAI8kQgy2xotEFE/2sXYFDC+fCZ838tg7R7cF
-</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://birk.wayf.dk/birk.php/sso.ucsj.dk:443/idp/SSORedirect/metaAlias/idp"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">University College Sjælland</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University College Zealand</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">University College Sjælland</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University College Zealand</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://ucsj.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://ucsj.dk/english/frontpage</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/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml
deleted file mode 100644
index 57746f28..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.ucsyd.dk-adfs-services-trust.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.ucsyd.dk/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-11-25T15:49:37Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsyd.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">University College Syddanmark</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University College South Denmark</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ucsyd.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC2DCCAcACAQcwDQYJKoZIhvcNAQELBQAwMjEwMC4GA1UEAwwnaHR0cDovL3Nz
-by51Y3N5ZC5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAwMFoX
-DTI1MTIzMTIzNTk1OVowMjEwMC4GA1UEAwwnaHR0cDovL3Nzby51Y3N5ZC5kay9h
-ZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
-dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
-55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
-k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
-lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
-+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBWVi0x
-IHZpymWUjzYXWRS+LhvqJMeZGhijH46NzR34Zp1MAR1Ieqgu4zopUhpJQ1hE767e
-oYSpOFsT4SpSTZnAfTPwtlWCb+7cr8dhzbh+WDtTuN7aImkBSkKI4QY/1OHcz/P8
-VFLG9DE9GVEdTChlbbU1AIYp9dTRIT+dYcE9b28GRJ16S7mm+27675hnMDHbza1l
-dkrf+vI9Sb9X6NBIUwkWJlhpmYcDKHTgnqroNv819B0tQjRI+UzAHr/Rx9z/KHlW
-gOu+TSTQEzrp7TDaLDgGv8urLwsmBGNxY2A6AycN4HdQSaMHGOTPVm76AJz7uVI6
-khTTgjpn99S7L2hP
-</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>MIIC2DCCAcACAQcwDQYJKoZIhvcNAQELBQAwMjEwMC4GA1UEAwwnaHR0cDovL3Nz
-by51Y3N5ZC5kay9hZGZzL3NlcnZpY2VzL3RydXN0MB4XDTE1MDEwMTAwMDAwMFoX
-DTI1MTIzMTIzNTk1OVowMjEwMC4GA1UEAwwnaHR0cDovL3Nzby51Y3N5ZC5kay9h
-ZGZzL3NlcnZpY2VzL3RydXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
-dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
-55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
-k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
-lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
-+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBWVi0x
-IHZpymWUjzYXWRS+LhvqJMeZGhijH46NzR34Zp1MAR1Ieqgu4zopUhpJQ1hE767e
-oYSpOFsT4SpSTZnAfTPwtlWCb+7cr8dhzbh+WDtTuN7aImkBSkKI4QY/1OHcz/P8
-VFLG9DE9GVEdTChlbbU1AIYp9dTRIT+dYcE9b28GRJ16S7mm+27675hnMDHbza1l
-dkrf+vI9Sb9X6NBIUwkWJlhpmYcDKHTgnqroNv819B0tQjRI+UzAHr/Rx9z/KHlW
-gOu+TSTQEzrp7TDaLDgGv8urLwsmBGNxY2A6AycN4HdQSaMHGOTPVm76AJz7uVI6
-khTTgjpn99S7L2hP
-</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://birk.wayf.dk/birk.php/sso.ucsyd.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">University College Syddanmark</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University College South Denmark</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">University College Syddanmark</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University College South Denmark</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://ucsyd.dk/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.ucsyd.dk/international/welcome-to-university-college-south-denmark/</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/birk.wayf.dk-birk.php-sso.vghf.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.vghf.dk-adfs-services-trust.xml
deleted file mode 100644
index 4f26ec59..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.vghf.dk-adfs-services-trust.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.vghf.dk/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-12-07T12:05:15Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vghf.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Viborg Gymnasium og HF</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Viborg Gymnasium and Higher Prep Exam</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>vghf.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb4CAQcwDQYJKoZIhvcNAQELBQAwMTEvMC0GA1UEAwwmaHR0cDovL3Nz
-by52Z2hmLmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUwMTAxMDAwMDAwWhcN
-MjUxMjMxMjM1OTU5WjAxMS8wLQYDVQQDDCZodHRwOi8vc3NvLnZnaGYuZGsvYWRm
-cy9zZXJ2aWNlcy90cnVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5zU8N+nQl
-0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9lX2OzOea
-lJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13vdL4DJP8
-Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3mPyCEpQP
-gEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fsR1Q4jPja
-OgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAZcvYIHp1
-StymQWCslXno9lyvJ0lQOqjR180mxfmxHGDHM1Ush9OS9VWmZXJbjXkWP4Z5hQT8
-tqfl2YKKfjt9oTN1oVCGj7zQWvzoyK+wQBrjqGorn/Tpk2tuPgkrftpsxZ8C2omc
-TSvNNqzb4cDRTGT2HjQnlPaB+xuTSojdpHy7ub0d0/u/1qaxjgNjrSpr+uhWGzS/
-BlL3MbJxa4NTVlqtHRP2fkxTpSIBhgRUK6qzUXc385u2tmbk179i8PjgDIX2clJP
-PWGI29Fy67twTfAFCME07ZUqNzuENgdLnhagF66jbvKioqAJXeZ3b5iXP0fSp8DK
-RQN6gRJM0Zo4Mg==
-</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://birk.wayf.dk/birk.php/sso.vghf.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Viborg Gymnasium og HF</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Viborg Gymnasium and Higher Prep Exam</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Viborg Gymnasium og HF</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Viborg Gymnasium and Higher Prep Exam</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.vghf.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.vghf.dk</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/birk.wayf.dk-birk.php-sso.vgtgym.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.vgtgym.dk-adfs-services-trust.xml
deleted file mode 100644
index 95c2d065..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.vgtgym.dk-adfs-services-trust.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.vgtgym.dk/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-05-15T12:51:31Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vgtgym.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Vestjysk Gymnasium Tarm</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Vestjysk Gymnasium Tarm</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>vgtgym.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC2jCCAcICAQcwDQYJKoZIhvcNAQELBQAwMzExMC8GA1UEAwwoaHR0cDovL3Nz
-by52Z3RneW0uZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBa
-Fw0yNTEyMzEyMzU5NTlaMDMxMTAvBgNVBAMMKGh0dHA6Ly9zc28udmd0Z3ltLmRr
-L2FkZnMvc2VydmljZXMvdHJ1c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1P
-Dfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9
-jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S
-+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8
-ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdU
-OIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFyI
-MReH1PhMKn45K/Mgc3uQlqPqG8j425jKskP9yrtTifQAEpKFx9/byULJnjBhOKlG
-dlqZhcyZ4QSM20KVYTf+vDY/wIahg9fhdaX4axf9ijsMBzlYSyX2D6wsTX3u5fbu
-ah0F1x37n8sKRkElkwTdkYaWOIVSv1fw65nJqG+CnIkWpkB5P7UklIkIqIcmeQhi
-SVMyF34y0Jq7REAI9oSHH1GEycr+ekOVCI84GA9a7X0KJzKgFuW4ukuusItHIYEX
-niR6jqR2xkWdKQ2QkMBSW8s/zXQ3cFVznVgRFCIcDMO4+qxsoAPi+Oy0mIByNOHd
-kHJ4BTK70Lsb+5M4ZbQ=
-</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://birk.wayf.dk/birk.php/sso.vgtgym.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Vestjysk Gymnasium Tarm</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Vestjysk Gymnasium Tarm</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Vestjysk Gymnasium Tarm</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Vestjysk Gymnasium Tarm</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.vgt.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.vgt.dk</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/birk.wayf.dk-birk.php-sso.vibkat.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.vibkat.dk-adfs-services-trust.xml
deleted file mode 100644
index b12a6ffc..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sso.vibkat.dk-adfs-services-trust.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sso.vibkat.dk/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-11-20T14:53:38Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vibkat.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Viborg Katedralskole</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Viborg Katedralskole</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>vibkat.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC2jCCAcICAQcwDQYJKoZIhvcNAQELBQAwMzExMC8GA1UEAwwoaHR0cDovL3Nz
-by52aWJrYXQuZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBa
-Fw0yNTEyMzEyMzU5NTlaMDMxMTAvBgNVBAMMKGh0dHA6Ly9zc28udmlia2F0LmRr
-L2FkZnMvc2VydmljZXMvdHJ1c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1P
-Dfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9
-jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S
-+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8
-ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdU
-OIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEAH
-H1dvg4wemgUHLjKWWRbvHq8o3PSqZ8MfXDkl4Pg2aWRN0vcudy++5UPQcNuf7jAP
-qIa8NE7orllDjo9krXPKLgasiZNaplF8N6h+7BIVrOgJteHyHUcXHlFPEJPYmt9N
-imW7fLHm9eZ0UJAmZ+4Wq4vvf5PNNWXMRNqO2HKuHFUBPtSww8e42Zmg+wMfPQLt
-jUsILxjFMnspwIU7LzFR+XuD/dPga4rmNHMrsB+HUwdykjENGAqcfaMKJPKFdppP
-/I2E1rqL7HFikLVVWSnLhUurLmrGd2CkWYaBKEUQz5QIDYG3dchmgYiG4wfUgmb9
-eqIJu1OMwgavm8yMj0o=
-</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://birk.wayf.dk/birk.php/sso.vibkat.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Viborg Katedralskole</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Viborg Katedralskole</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Viborg Katedralskole</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Viborg Katedralskole</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.viborgkatedralskole.dk/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.viborgkatedralskole.dk/</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/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
index 00cbcf9f..3f2186e3 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-sts.statsbiblioteket.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/sts.statsbiblioteket.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/sts.statsbiblioteket.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-03T11:53:23Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-06-03T11:53:23Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">statsbiblioteket.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">statsbiblioteket.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Statsbiblioteket</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">State and University Library</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>statsbiblioteket.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC7jCCAdYCAQcwDQYJKoZIhvcNAQELBQAwPTE7MDkGA1UEAwwyaHR0cDovL3N0
 cy5zdGF0c2JpYmxpb3Rla2V0LmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUw
@@ -52,8 +54,7 @@ b45SXMc+awoz7kMadUeuovVtd6ETEsnnNquJ7navnN/e7w==
     <md:OrganizationURL xml:lang="en">http://en.statsbiblioteket.dk</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:GivenName>Aministrator</md:GivenName>
+    <md:EmailAddress>appdrift-logs@statsbiblioteket.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
deleted file mode 100644
index 0e569235..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-ucnsso.ucn.dk-adfs-services-trust.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/ucnsso.ucn.dk/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-09T09:51:19Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucn.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">University College Nordjylland</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University College of Northern Denmark</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ucn.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC2jCCAcICAQcwDQYJKoZIhvcNAQELBQAwMzExMC8GA1UEAwwoaHR0cDovL3Vj
-bnNzby51Y24uZGsvYWRmcy9zZXJ2aWNlcy90cnVzdDAeFw0xNTAxMDEwMDAwMDBa
-Fw0yNTEyMzEyMzU5NTlaMDMxMTAvBgNVBAMMKGh0dHA6Ly91Y25zc28udWNuLmRr
-L2FkZnMvc2VydmljZXMvdHJ1c3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkWANqVuc1P
-Dfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+h1DHvZV9
-jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExVnYSNd73S
-+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8
-ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZyZ5t37EdU
-OIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQADggEBALgQ
-mWqIboqnWbk9WMHObnwVUp/7CLaA0nVF1Q3T3jMqYdjj6aI6Fdv+dTFOvpPJHRJy
-hMqV+8S2bYLvajGyyS/N4fZAhGGGEkl5lfDeXjvfVptIY0lwFcFZOq27d/m/6Oyv
-wGLhzikcsR97FTVbsgQ3Isyjq7G8jFilZUKa3VrT78z0zx4vS/DMstMEG1V0YIqA
-iw1GOsAmeKodFt0tcitbo1dIqjTaXeK+D9/OOf6aOxoejtnwqr5wkXgfYarDiMtg
-RscebjExrf9kQhSEyquUD4dGbwDvWNwkL6gOtbKzw96PfzYKxUXs/SnBb3/rR1Mq
-I7eDefwR237lfmpOKMk=
-</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://birk.wayf.dk/birk.php/ucnsso.ucn.dk/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">University College Nordjylland</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University College of Northern Denmark</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">University College Nordjylland</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University College of Northern Denmark</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.ucn.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ucn.dk</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/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
index c3d12852..2d0f4147 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aams.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.aams.dk/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.aams.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-10T11:47:30Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-06-10T11:47:30Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aams.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">aams.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Aarhus Maskinmesterskole</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Aarhus School of Marine and Technical Engineering</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>aams.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC9jCCAd4CAQcwDQYJKoZIhvcNAQELBQAwQTE/MD0GA1UEAww2aHR0cHM6Ly93
 YXlmLmFhbXMuZGsvc2ltcGxlc2FtbC9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4X
@@ -51,8 +53,7 @@ y6n+48evSVkVMMX88HffZUVp9ZyNULPR3CbMua8+D0Omtx6NhUN9QPoE
     <md:OrganizationURL xml:lang="en">http://www.aams.dk/en-GB/Home.aspx</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:SurName>Administrator</md:SurName>
+    <md:EmailAddress>mine@headnet.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
index e3ca340d..5810384d 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.aau.dk.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.aau.dk">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.aau.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-12-06T14:25:53Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-12-06T14:25:53Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aau.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">aau.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">Aalborg Universitet</mdui:Description>
         <mdui:Description xml:lang="en">Aalborg University</mdui:Description>
         <mdui:DisplayName xml:lang="da">Aalborg Universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Aalborg University</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>aau.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICsDCCAZgCAQcwDQYJKoZIhvcNAQELBQAwHjEcMBoGA1UEAwwTaHR0cHM6Ly93
 YXlmLmFhdS5kazAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMB4xHDAa
@@ -51,9 +53,4 @@ YNCobCjLM8GtgKPZGSBhP+avu6w=
     <md:OrganizationURL xml:lang="da">http://www.aau.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.en.aau.dk</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/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
index 209b9e9d..3c456bf0 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ait.dtu.dk-saml2-idp-metadata.php.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.ait.dtu.dk/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.ait.dtu.dk/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-02-03T13:34:44Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-02-03T13:34:44Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dtu.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">dtu.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Danmarks Tekniske Universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Technical University of Denmark</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>dtu.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC5jCCAc4CAQcwDQYJKoZIhvcNAQELBQAwOTE3MDUGA1UEAwwuaHR0cHM6Ly93
 YXlmLmFpdC5kdHUuZGsvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0xNTAxMDEw
@@ -51,8 +53,6 @@ yPzz3RRNmKq5lLVVYikx8FVc4IVMw9++ixM=
     <md:OrganizationURL xml:lang="en">http://www.dtu.dk/English.aspx</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:EmailAddress>afos@adm.dtu.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
index f6d5f4c2..481d49d5 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.akademiaarhus.dk-simplesaml-eaa-saml2-idp-metadata.php.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.akademiaarhus.dk/simplesaml-eaa/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.akademiaarhus.dk/simplesaml-eaa/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-14T14:44:25Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-06-14T14:44:25Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Erhvervsakademi Aarhus</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Business Academy Aarhus</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>erhvervsakademiaarhus.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDEDCCAfgCAQcwDQYJKoZIhvcNAQELBQAwTjFMMEoGA1UEAwxDaHR0cHM6Ly93
 YXlmLmFrYWRlbWlhYXJodXMuZGsvc2ltcGxlc2FtbC1lYWEvc2FtbDIvaWRwL21l
@@ -51,9 +53,4 @@ DdbjKB6UO7mTuqPKUxkGG2oviO3YApEyi1jggBDOeblg450UyjsTJcivVg2prmgB
     <md:OrganizationURL xml:lang="da">http://www.eaaa.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.eaaa.dk/subsites/international</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/birk.wayf.dk-birk.php-wayf.au.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
index 3f48ae33..8b08f095 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.au.dk.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.au.dk">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.au.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-07-26T08:47:03Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-07-26T08:47:03Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">au.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">au.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Aarhus Universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Aarhus University</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>au.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICrjCCAZYCAQcwDQYJKoZIhvcNAQELBQAwHTEbMBkGA1UEAwwSaHR0cHM6Ly93
 YXlmLmF1LmRrMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowHTEbMBkG
@@ -50,8 +52,9 @@ waSgkcygO9PTBU5lKpmYMlUx
     <md:OrganizationURL xml:lang="en">http://www.au.dk/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:GivenName>K.</md:GivenName>
+    <md:SurName>D. Kærgaard</md:SurName>
+    <md:EmailAddress>kærgaard@adm.au.dk</md:EmailAddress>
+    <md:TelephoneNumber>51220509</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.cphwest.dk-sosuc-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.cphwest.dk-sosuc-saml2-idp-metadata.php.xml
deleted file mode 100644
index 20af0399..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.cphwest.dk-sosuc-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.cphwest.dk/sosuc/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-26T16:07:38Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosuc.cphwest.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">SOSU C</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SOSU C</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>sosuc.cphwest.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC8jCCAdoCAQcwDQYJKoZIhvcNAQELBQAwPzE9MDsGA1UEAww0aHR0cHM6Ly93
-YXlmLmNwaHdlc3QuZGsvc29zdWMvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0x
-NTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaMD8xPTA7BgNVBAMMNGh0dHBzOi8v
-d2F5Zi5jcGh3ZXN0LmRrL3Nvc3VjL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCC
-y3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+b
-k+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB
-5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqL
-SHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAI
-p57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMB
-AAEwDQYJKoZIhvcNAQELBQADggEBALzMSD7Ab5gE+EpOL3wqqOR9+QBmyC55HICY
-zOCoQgLe+bIrZe2WipW1Itcdf1nvfhL4bYpbxXmePmEtw0j3GsG0iUgvRYi6b8w4
-3Do96zQ2y0jfEckA3s9XOkbqTxY11z0FROGDF71cBIuEAvkcbbeHvOOVlAaQmYPV
-tOkDTovSg2jDybdR5Jcor/eMipKtwoPbPM6pbcHWvnHru5rs7O+c6Ot7qHUpewK5
-dCk50D7n7APcRmq1eWT765uYoGOzjJzgQV8yaDlQjfV1hzzMWbnUOrIuAgnWaYM3
-BggdYUVmSKhaokGcO3Ruv1/1js4bpyUhoDlPPBH/rKBOq5QT/8Y=
-</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://birk.wayf.dk/birk.php/wayf.cphwest.dk/sosuc/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">SOSU C</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SOSU C</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">SOSU C</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SOSU C</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.sosuc.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.sosuc.dk/om-sosu-c/english</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/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
index dd0c04c3..8cf05bea 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.frhavn-gym.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.frhavn-gym.dk/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.frhavn-gym.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-11-15T14:53:18Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-11-15T14:53:18Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frhavn-gym.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">frhavn-gym.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Frederikshavn Gymnasium &amp; HF-kursus</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Frederikshavn upper secondary school and HF-Course</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>frhavn-gym.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDAjCCAeoCAQcwDQYJKoZIhvcNAQELBQAwRzFFMEMGA1UEAww8aHR0cHM6Ly93
 YXlmLmZyaGF2bi1neW0uZGsvc2ltcGxlc2FtbC9zYW1sMi9pZHAvbWV0YWRhdGEu
@@ -51,9 +53,4 @@ DoLyd1u8
     <md:OrganizationURL xml:lang="da">http://frhavn-gym.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.frhavn-gym.dk/english/</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/birk.wayf.dk-birk.php-wayf.hasseris-gym.dk.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hasseris-gym.dk.xml
deleted file mode 100644
index 7af57d46..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hasseris-gym.dk.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.hasseris-gym.dk">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-10-11T11:37:24Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hasseris-gym.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="da">Hasseris Gymnasium</mdui:Description>
-        <mdui:Description xml:lang="en">Hasseris Gymnasium</mdui:Description>
-        <mdui:DisplayName xml:lang="da">Hasseris Gymnasium</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hasseris Gymnasium</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hasseris-gym.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwjCCAaoCAQcwDQYJKoZIhvcNAQELBQAwJzElMCMGA1UEAwwcaHR0cHM6Ly93
-YXlmLmhhc3NlcmlzLWd5bS5kazAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5
-NTlaMCcxJTAjBgNVBAMMHGh0dHBzOi8vd2F5Zi5oYXNzZXJpcy1neW0uZGswggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCC
-y3bR9QIe3BpCsejFCU5rSzkWANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+b
-k+af3+EUFS/I/+35sSBX2vf+h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB
-5zlaqkS36J76+wxerwdpuExVnYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqL
-SHFy01D2qBNmYRwBpCS6/dUZyxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAI
-p57GXQrL63KtrjIcXddq+CZyZ5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMB
-AAEwDQYJKoZIhvcNAQELBQADggEBADg6GufCXu41W1z1yIXdrwI2nQhnGBhYN/79
-0335qeZIEtWnJquK2QXDPa8p5s2B5bdWcJufOupZbCiUJlXydg45dhcP4GPnWDYT
-DfOxN8FGWvimXDMMmdoBNb41aCA+3eYVKV5bdaox+GiqXmCWCDAeSMIaLUZNxKoR
-Ueb1fPL4XoaOQmrhoomFH8Jbfl3TAbPBkRfzcYDBD51JG4bWVBzRNNebR0HMt0I/
-WJiE5w6s1HoeSkXcdabI3oiItyLWeSVXLkQEtofQzRtPW/t2EvyxKw5vj62EHysX
-Ij3Rb4P+yFNpj6mXSl+RoBavnalo3A9ovt4iUu2/G1WKUgncfDQ=
-</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://birk.wayf.dk/birk.php/wayf.hasseris-gym.dk/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Hasseris Gymnasium</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Hasseris Gymnasium</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Hasseris Gymnasium</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Hasseris Gymnasium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.hasseris-gym.dk/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hasseris-gym.dk/ib_world_school</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/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
index 29a30936..c95e2678 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.hi.is-simplesaml-saml2-idp-metadata.php.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.hi.is/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.hi.is/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:31:35Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:31:35Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hi.is</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">hi.is</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Háskóli Íslands</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Iceland</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hi.is</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC8jCCAdoCAQcwDQYJKoZIhvcNAQELBQAwPzE9MDsGA1UEAww0aHR0cHM6Ly93
 YXlmLmhpLmlzL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAeFw0x
@@ -50,9 +52,4 @@ dGs7tUiZlHqo6haH9iSvsbsBOq6pPaZR8cX1As206778PAS6Q6U=
     <md:OrganizationURL xml:lang="da">http://www.hi.is</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.english.hi.is</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/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 97bc1987..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ibc.dk-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.ibc.dk/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T14:05:34Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibc.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="da">International Business College</mdui:Description>
-        <mdui:Description xml:lang="en">International Business College</mdui:Description>
-        <mdui:DisplayName xml:lang="da">International Business College</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">International Business College</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ibc.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC9DCCAdwCAQcwDQYJKoZIhvcNAQELBQAwQDE+MDwGA1UEAww1aHR0cHM6Ly93
-YXlmLmliYy5kay9zaW1wbGVzYW1sL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwHhcN
-MTUwMTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjBAMT4wPAYDVQQDDDVodHRwczov
-L3dheWYuaWJjLmRrL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeIDApqEFO4jhn4gnWuA54S
-IILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAq
-j5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9lX2OzOealJWOnsdn9ag9YHKRYEk7QA5W
-bMHnOVqqRLfonvr7DF6vB2m4TFWdhI13vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJp
-KotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJ
-QAinnsZdCsvrcq2uMhxd12r4JnJnm3fsR1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkC
-AwEAATANBgkqhkiG9w0BAQsFAAOCAQEATFSZECgZgCcWTz3iL11Ii+xE8j72mwGG
-tKbHJoCcHhHSnDdOqKrZWGvoMQGKX4qJVXqGjiKQbxLwy0Sdyii9/YELr4SnhDDz
-dU28ZjvdBcUMCXoCqir30c5MT6YbxAe0aCvaIrnMz3b4VNkrQzrWZM4K3ohm1rKU
-cs8J9fcPKijsZNcpQpxNhe9phVc1kUNn9xNTG1eW0f6WdoXsoKz8Jz0QfFrKkDQW
-fxDMnDXCEVeGDaSfpKS59rujNM6pWzUKYjZQiokpUDvikcroFe8BbdhqDwndle76
-57ym2ClZO01259oFVr22gvnX43lKZW7tfsM8i+0ol/wrBPb4BPMfzA==
-</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://birk.wayf.dk/birk.php/wayf.ibc.dk/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">International Business College</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">International Business College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">International Business College</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">International Business College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.ibc.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ibc.dk</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/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
index 9744cecf..6652ebdc 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.itu.dk-saml2-idp-metadata.php.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.itu.dk/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.itu.dk/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:40:44Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:40:44Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itu.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">itu.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">IT-Universitetet i København</mdui:Description>
         <mdui:Description xml:lang="en">IT University of Copenhagen</mdui:Description>
         <mdui:DisplayName xml:lang="da">IT-Universitetet i København</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">IT University of Copenhagen</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>itu.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cHM6Ly93
 YXlmLml0dS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1MDEwMTAwMDAw
@@ -53,8 +55,8 @@ AQAN4xTeTap6sBe0PnPwfOfw8dqIaPHDqMmY0HsPSjxWsUHvBhtLFOi1dddIXjw8
     <md:OrganizationURL xml:lang="en">http://itu.dk/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:GivenName>Marc Roy</md:GivenName>
+    <md:SurName>Olsen</md:SurName>
+    <md:EmailAddress>mro@itu.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
index 4ef91847..f5ff923c 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kea.dk-saml2-idp-metadata.php.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.kea.dk/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.kea.dk/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2013-07-24T15:44:02Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2013-07-24T15:44:02Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kea.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">kea.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">KEA – Københavns Erhvervsakademi</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">KEA – Copenhagen School of Design and Technology </mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kea.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cHM6Ly93
 YXlmLmtlYS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1MDEwMTAwMDAw
@@ -44,15 +46,15 @@ p+TiM/eBbXCraZ32+zNbKfPC
   </md:IDPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="da">KEA – Københavns Erhvervsakademi</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">KEA – Copenhagen School of Design and Technology </md:OrganizationName>
+    <md:OrganizationName xml:lang="en">KEA – Copenhagen School of Design and Technology</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="da">KEA – Københavns Erhvervsakademi</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KEA – Copenhagen School of Design and Technology </md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">KEA – Copenhagen School of Design and Technology</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="da">http://www.kea.dk/da</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.kea.dk/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:GivenName>Andreh</md:GivenName>
+    <md:SurName>Hyor</md:SurName>
+    <md:EmailAddress>ah@itavis.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml
deleted file mode 100644
index 6b21f5b1..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.kum.dk-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.kum.dk/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-10-27T13:39:42Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsn.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Dansk Sprognævn</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Danish Language Council</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>dsn.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cHM6Ly93
-YXlmLmt1bS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1MDEwMTAwMDAw
-MFoXDTI1MTIzMTIzNTk1OVowNTEzMDEGA1UEAwwqaHR0cHM6Ly93YXlmLmt1bS5k
-ay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDa
-lbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQ
-x72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2E
-jXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsY
-tLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmeb
-d+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQCrWx3Zrlrbj1kGSlbADTE1MQ40Q0dN+A9HdEUrt68BvTgvr0Qz5pinXL3gFFMv
-YgSprMT/PAGuXJeRiaxWFi6vsUbM8ie4KnP1tUsDvlKTGt8yZRzbiHBPJ+cl7iM/
-iNeJWFcLFamx4uXc0Lrn0mYdQCiknB6OOF11zl837WxOZILuFa7eZanR286emuIo
-JY3Dihrlt0esADrBci2CwRwSljlSJ/Y4FW+7bD8KY2ObxbQSxhzoeiDD8lSbOrVO
-cKGhtXil7cspCMSTbNpbSpIcgel6CauLSRw5R2qJBAd7KHm6eQGBOXzVDIOQR3tc
-j2IrcoJ3QM317FlrycurdCEq
-</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://birk.wayf.dk/birk.php/wayf.kum.dk/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Dansk Sprognævn</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Danish Language Council</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Dansk Sprognævn</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Danish Language Council</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.dsn.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.dsn.dk</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/birk.wayf.dk-birk.php-wayf.minibib.dk-akf.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-akf.xml
deleted file mode 100644
index 587a39ba..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-akf.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/akf">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-09-16T11:05:48Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">akf.minibib.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">KORA's Bibliotek</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KORA Library</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>akf.minibib.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvYWtmMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvYWtmMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQAEVHsjmyZgxVUSJpCGUlJG1zpwK45rHkPbzCS+
-I1nULOTSfC06lQue+NQoYUB1wkbXBIFbLRFhpKRKPaQoYzrq6w3XssS7tXsA1ceB
-xBQdtzL0ItXWSM7A63sTXtiPL1I1BcpLdjT09+qbKqLn8hJ/CkH7LYZ8gvFp4ngu
-gR4xtvERw++jKftZH/IaDlViJjyBO6NXzQVi6LYhY+p9Jc8X/W+yuKq8VrPQIgOg
-P15n4prXNfKtbWBNIKvN3ChTWyl0zoNi6oVDAfl9tITzAqmR7bZ8ST2OpdChBypj
-i0MgRGSPVEYrEzIFfimfB+D1Ap0eP3BoCw7Sd/DPn5nToXnc
-</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>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvYWtmMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvYWtmMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQAEVHsjmyZgxVUSJpCGUlJG1zpwK45rHkPbzCS+
-I1nULOTSfC06lQue+NQoYUB1wkbXBIFbLRFhpKRKPaQoYzrq6w3XssS7tXsA1ceB
-xBQdtzL0ItXWSM7A63sTXtiPL1I1BcpLdjT09+qbKqLn8hJ/CkH7LYZ8gvFp4ngu
-gR4xtvERw++jKftZH/IaDlViJjyBO6NXzQVi6LYhY+p9Jc8X/W+yuKq8VrPQIgOg
-P15n4prXNfKtbWBNIKvN3ChTWyl0zoNi6oVDAfl9tITzAqmR7bZ8ST2OpdChBypj
-i0MgRGSPVEYrEzIFfimfB+D1Ap0eP3BoCw7Sd/DPn5nToXnc
-</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://birk.wayf.dk/birk.php/wayf.minibib.dk/akf/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">KORA's Bibliotek</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">KORA Library</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">KORA's Bibliotek</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KORA Library</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.minibib.dk/F?func=file&amp;file_name=find-b&amp;local_base=akf01</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.minibib.dk/F?func=file&amp;file_name=find-b&amp;local_base=akf01</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/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
index 9154f45b..b5b226a6 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dab.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/dab">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/dab">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-10-28T09:45:22Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-10-28T09:45:22Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dab.minibib.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">dab.minibib.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Det Administrative Bibliotek</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">The Administrative Library</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>dab.minibib.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
 YXlmLm1pbmliaWIuZGsvZGFiMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
@@ -49,9 +51,4 @@ v93+XEHzeHHw5pwvSa0YWMs2hXkVYFnHrTicG9bEV6qKoNYG
     <md:OrganizationURL xml:lang="da">http://www.dab.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://dab.dk/introduction-in-english/introduction-in-english</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/birk.wayf.dk-birk.php-wayf.minibib.dk-dmi.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dmi.xml
deleted file mode 100644
index 067afabe..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-dmi.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/dmi">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-09-16T11:17:06Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmi.minibib.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Danmarks Meteorologiske Institut. Biblioteket</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Library of the Danish Meteorological Institute</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>dmi.minibib.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvZG1pMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvZG1pMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQCEwxxyR5kiiaHYkcdVnwN3cRQmfrEL6q/c5n+Y
-znyTxrMYn9MpYboqnGz1qlIOsQkSikAqSGEOmwuuNNRoptrFq5PIuEx+UC0cz2YF
-HYpw0hM1I6sfyGTwm8j+zxUOroNi3SyYKIb62Ra1m2/f67m6S/k3KzgHayN9jQQx
-t1m9HHm3EvpP2gz+J/CCGpep6XdzVKeyZPfiPucgLvh+jrNH3zB1KB9fyoBJxJKN
-sZyztmWpbeRPE/FP0RS2zthdzs1cL3KocyWpS2Ufvv7t4U2lo7VSQY6MhWdAH/lO
-HhGq5P3jgvrU+gv6TLN6IGXFsZYk8sLEzDy7+ud63jWISALe
-</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>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvZG1pMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvZG1pMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQCEwxxyR5kiiaHYkcdVnwN3cRQmfrEL6q/c5n+Y
-znyTxrMYn9MpYboqnGz1qlIOsQkSikAqSGEOmwuuNNRoptrFq5PIuEx+UC0cz2YF
-HYpw0hM1I6sfyGTwm8j+zxUOroNi3SyYKIb62Ra1m2/f67m6S/k3KzgHayN9jQQx
-t1m9HHm3EvpP2gz+J/CCGpep6XdzVKeyZPfiPucgLvh+jrNH3zB1KB9fyoBJxJKN
-sZyztmWpbeRPE/FP0RS2zthdzs1cL3KocyWpS2Ufvv7t4U2lo7VSQY6MhWdAH/lO
-HhGq5P3jgvrU+gv6TLN6IGXFsZYk8sLEzDy7+ud63jWISALe
-</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://birk.wayf.dk/birk.php/wayf.minibib.dk/dmi/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Danmarks Meteorologiske Institut. Biblioteket</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Library of the Danish Meteorological Institute</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Danmarks Meteorologiske Institut. Biblioteket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Library of the Danish Meteorological Institute</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.dmi.dk/dmi/index/om_dmi/forsknings_og_udviklingsafdelingen/dmis_bibliotek.htm</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.dmi.dk/dmi/index/om_dmi/forsknings_og_udviklingsafdelingen/dmis_bibliotek.htm</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/birk.wayf.dk-birk.php-wayf.minibib.dk-fob.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fob.xml
deleted file mode 100644
index 48bba696..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fob.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/fob">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-12T13:50:45Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fob.minibib.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Folketingets Ombudsmand. Biblioteket</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Library of the Danish Parliamentary Ombudsman</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>fob.minibib.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvZm9iMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvZm9iMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQAze+SA7oU8EpDa4MUubLWvN5WRQyQfy3Kv7Few
-5Xn9VKJUh8dXkv031NaLIaV82J9fNG2LA7U+gnaXL/gkxqzWWQnPbAPF2+Pg8aEB
-2tDk41uVZRo72gLv/GTW0b9oWUWEUrLz4wBkAt1UC9lLpI3dsjv94NxxYcwPhE4a
-dTF5K+xGGASC8ynN3dxgtfOH1JMss0SpBFvxMgsR83iX2H9UC5N/9xyqqWo5+Aeg
-rU0vqrlxGqcfFIdcvPsFCIgLi+LgTyBn4BqcvfPCFIiBjesKiNUQydB/CBgzR1Vp
-DJCIsgurQPbiPy4OZVRBlbqofh1Xo0aluLUfIozsPMLTxCsT
-</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>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvZm9iMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvZm9iMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQAze+SA7oU8EpDa4MUubLWvN5WRQyQfy3Kv7Few
-5Xn9VKJUh8dXkv031NaLIaV82J9fNG2LA7U+gnaXL/gkxqzWWQnPbAPF2+Pg8aEB
-2tDk41uVZRo72gLv/GTW0b9oWUWEUrLz4wBkAt1UC9lLpI3dsjv94NxxYcwPhE4a
-dTF5K+xGGASC8ynN3dxgtfOH1JMss0SpBFvxMgsR83iX2H9UC5N/9xyqqWo5+Aeg
-rU0vqrlxGqcfFIdcvPsFCIgLi+LgTyBn4BqcvfPCFIiBjesKiNUQydB/CBgzR1Vp
-DJCIsgurQPbiPy4OZVRBlbqofh1Xo0aluLUfIozsPMLTxCsT
-</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://birk.wayf.dk/birk.php/wayf.minibib.dk/fob/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Folketingets Ombudsmand. Biblioteket</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Library of the Danish Parliamentary Ombudsman</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Folketingets Ombudsmand. Biblioteket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Library of the Danish Parliamentary Ombudsman</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.ombudsmanden.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://en.ombudsmanden.dk</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/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
index ca5e4297..fa20fef2 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-fsv.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/fsv">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/fsv">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-10-28T09:51:27Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-10-28T09:51:27Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsv.minibib.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">fsv.minibib.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Forsvarets Bibliotek</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Danish Defence Library</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>fsv.minibib.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
 YXlmLm1pbmliaWIuZGsvZnN2MB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
@@ -49,9 +51,4 @@ G9baPBH3swAjkG8Aa/+wabJPIBCF5mR8nO9gQQk4wgs17mS6
     <md:OrganizationURL xml:lang="da">http://forsvaret.dk/FAK/bibliotek/Pages/default.aspx</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://forsvaret.dk/FAK/eng/departments/library/Pages/default.aspx</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/birk.wayf.dk-birk.php-wayf.minibib.dk-ism.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-ism.xml
deleted file mode 100644
index 9a3ebc59..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-ism.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/ism">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-10-28T09:48:55Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ism.minibib.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">DCISM Biblioteket</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DCISM Library</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ism.minibib.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvaXNtMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvaXNtMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQBL9HZuzf19fw+vxINuKdOxiQ+rtD9UuVzroxLU
-3RHgNEI2vh8edOw6mRxno2p2BIdSrx0zBJt0vrd7NXfq0+TTQAdf2IElfizzpfAM
-mRRWpz96reMGZk0vn6YXUQQxWLPPc3FtsP6CUT3aU/IDyO32SA0lzbUqHW+DdkWz
-NInp/4gTPxR/bnQJSCGt3GlXoxt0hDv7pir4rk5JMWHpo1+d6roF7pPnL+xOQIxp
-RiR9MRy7VwcWx7F8De2iSe077jRnVGP4/PNhkE4h8JsRBw86stYlglvdRPEOugFX
-iMiGVLpiAcXlvQNWh9N9VJ592Cl1qkWXhd7eUNs6Q0PxiW1C
-</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://birk.wayf.dk/birk.php/wayf.minibib.dk/ism/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">DCISM Biblioteket</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">DCISM Library</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">DCISM Biblioteket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">DCISM Library</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.diis.dk/sw740.asp</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.diis.dk/sw31428.asp</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/birk.wayf.dk-birk.php-wayf.minibib.dk-kuc.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-kuc.xml
deleted file mode 100644
index 1e1d8019..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-kuc.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/kuc">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-12T14:01:25Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kuc.minibib.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Kriminalforsorgens Bibliotek</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Library of the Danish Prison and Probation Service</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kuc.minibib.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsva3VjMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsva3VjMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQBVZ33y1Q12dx7V9Ctnl+h/gYtyqE5IPs9ZNz3m
-18RjQqgZluwu/S+wpJkgp9PI6sIPvA9QyINjz0ll6XUFwMmXRzktWLosrg+pzjwB
-xQG6jwAcsrXCppVuAMhINyraZYo5XVJIguCpMZUSxgNBbw1GTCS/ItDIVHF76PR5
-PdyCOaBHyXkBG6ZkytjLeNRI/PZe3GVQeYZk8T81esqHLF0sFmaNBYW7NeATshWl
-ekUlu0xXoVHCoAEpoQofczXG0pWbeSud76QE7eMnpqZuIRETqYzypKG8DXZ9iLAP
-wx3ILKsRxX3HT3RZZ2w2ZNeCWgOy8lFmuFDuPi7SqmPeiZQg
-</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>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsva3VjMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsva3VjMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQBVZ33y1Q12dx7V9Ctnl+h/gYtyqE5IPs9ZNz3m
-18RjQqgZluwu/S+wpJkgp9PI6sIPvA9QyINjz0ll6XUFwMmXRzktWLosrg+pzjwB
-xQG6jwAcsrXCppVuAMhINyraZYo5XVJIguCpMZUSxgNBbw1GTCS/ItDIVHF76PR5
-PdyCOaBHyXkBG6ZkytjLeNRI/PZe3GVQeYZk8T81esqHLF0sFmaNBYW7NeATshWl
-ekUlu0xXoVHCoAEpoQofczXG0pWbeSud76QE7eMnpqZuIRETqYzypKG8DXZ9iLAP
-wx3ILKsRxX3HT3RZZ2w2ZNeCWgOy8lFmuFDuPi7SqmPeiZQg
-</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://birk.wayf.dk/birk.php/wayf.minibib.dk/kuc/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Kriminalforsorgens Bibliotek</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Library of the Danish Prison and Probation Service</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Kriminalforsorgens Bibliotek</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Library of the Danish Prison and Probation Service</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.kriminalforsorgen.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.kriminalforsorgen.dk/Default.aspx?ID=29</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/birk.wayf.dk-birk.php-wayf.minibib.dk-kul.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-kul.xml
deleted file mode 100644
index e876c55f..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-kul.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/kul">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-12T14:02:40Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kul.minibib.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Kulturstyrelsen. Biblioteket</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Library of the Danish Agency for Culture</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kul.minibib.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsva3VsMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsva3VsMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQAmT9xTVhUfmZW0irrRTmOCXd/ZfQNA5rRh2EUH
-NUDz/dVWJFVBbIiJJdcJ227FCUiBFpHpkZqugc9z/KCME79eIeCsvw+MUOuWvIcx
-njqWqDPqpawVNDGQAvSrFOuc/PIhJ0daoNZ2twbNHgECf9KcKYjmklfQ+0hq8+Jn
-8M+jgUVQoD80slfJ2W9GoAvSsr/R7dhxhNLb9h16u0n7h2Z+HsTC5nAa+4PBnJ1b
-OlI3UhyhPk2x2C/jfkY/NpMFlUdtXzZsolIcvMUhc66cncnQMBwervNkuRW5PFLK
-FUPBQzMww9IzEGgx1VLyFX/vrBodLFT6VMfFsaABZzcLPclk
-</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>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsva3VsMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsva3VsMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQAmT9xTVhUfmZW0irrRTmOCXd/ZfQNA5rRh2EUH
-NUDz/dVWJFVBbIiJJdcJ227FCUiBFpHpkZqugc9z/KCME79eIeCsvw+MUOuWvIcx
-njqWqDPqpawVNDGQAvSrFOuc/PIhJ0daoNZ2twbNHgECf9KcKYjmklfQ+0hq8+Jn
-8M+jgUVQoD80slfJ2W9GoAvSsr/R7dhxhNLb9h16u0n7h2Z+HsTC5nAa+4PBnJ1b
-OlI3UhyhPk2x2C/jfkY/NpMFlUdtXzZsolIcvMUhc66cncnQMBwervNkuRW5PFLK
-FUPBQzMww9IzEGgx1VLyFX/vrBodLFT6VMfFsaABZzcLPclk
-</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://birk.wayf.dk/birk.php/wayf.minibib.dk/kul/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Kulturstyrelsen. Biblioteket</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Library of the Danish Agency for Culture</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Kulturstyrelsen. Biblioteket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Library of the Danish Agency for Culture</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.kulturstyrelsen.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.kulturstyrelsen.dk/english</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/birk.wayf.dk-birk.php-wayf.minibib.dk-stm.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-stm.xml
deleted file mode 100644
index 7f183fe6..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-stm.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/stm">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-12T14:16:43Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stm.minibib.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Statsministeriets Bibliotek</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Library of the Prime Minister's Office</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>stm.minibib.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvc3RtMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvc3RtMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQALZZBi43JwZCt0Vh89YrEExI0hJluqx1H81WUK
-kbToo+Dk54izkEzcF4cmRdwUov2bQLyOKGjqfDM17QZyvef2hpVavjmAMmjiI90T
-nq7rADYwmlaXoBh+c+uAeclPoPV+mgFNJy9hJz4AKNEHlLpsTZ6O/FLKOreWtc7+
-8USHWoF7L/myhqW7tPwxYjcqYIEA0QWq2wNITxz1TtEQZdMsewjJZ6Ly317Akm7s
-RYXqSatTRmS+50JS5sOOGrDn1LZTtmNb/ARJW2UecS1hAVj1Kzmv7UoE4aMtEFJ+
-vwoHXocxBXIMwtAIJbGJw5LvJlrf6ZuMSBzM++OeBl/G0omH
-</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>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvc3RtMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvc3RtMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQALZZBi43JwZCt0Vh89YrEExI0hJluqx1H81WUK
-kbToo+Dk54izkEzcF4cmRdwUov2bQLyOKGjqfDM17QZyvef2hpVavjmAMmjiI90T
-nq7rADYwmlaXoBh+c+uAeclPoPV+mgFNJy9hJz4AKNEHlLpsTZ6O/FLKOreWtc7+
-8USHWoF7L/myhqW7tPwxYjcqYIEA0QWq2wNITxz1TtEQZdMsewjJZ6Ly317Akm7s
-RYXqSatTRmS+50JS5sOOGrDn1LZTtmNb/ARJW2UecS1hAVj1Kzmv7UoE4aMtEFJ+
-vwoHXocxBXIMwtAIJbGJw5LvJlrf6ZuMSBzM++OeBl/G0omH
-</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://birk.wayf.dk/birk.php/wayf.minibib.dk/stm/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Statsministeriets Bibliotek</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Library of the Prime Minister's Office</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Statsministeriets Bibliotek</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Library of the Prime Minister's Office</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.stm.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.stm.dk/_a_1644.html</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/birk.wayf.dk-birk.php-wayf.minibib.dk-vej.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-vej.xml
deleted file mode 100644
index 2a9e9b93..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-vej.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/vej">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-12T14:18:32Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vej.minibib.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Vejsektorens Fagbibliotek</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Library of the Danish Road Directorate</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>vej.minibib.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvdmVqMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvdmVqMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQCy7UIjtVe+m+SlFfA5Z6gKCbG53G9mgWg8qJu3
-u3GCP+RsqUQcTNSDTpKi6XVoGNTVyP0hkgIDrZrkEg7MAgrckuypDNB1vxfpoLcE
-krXesAnfI+ZjhwXWciXD6rbv4k7Md2n1G13fuWX3fCoEKvRXbHv03Iy+X/EdK2R8
-XIafxELnoUzfs/L58Fv5tACazZ2Rdhezm2Kn/N0mhy65XPs0AoDvawddzJ4fnAut
-Qrv2PFKrbnx82aJc/Vs6FN+CWieniunB38qijlLkPZS/aZ5G27MY/shUTDEgqCiW
-FKquxnI/YSS3DklR9MtcwmFKYX8V+uQ7Jlsu/1r8rHVncASj
-</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>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvdmVqMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvdmVqMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQCy7UIjtVe+m+SlFfA5Z6gKCbG53G9mgWg8qJu3
-u3GCP+RsqUQcTNSDTpKi6XVoGNTVyP0hkgIDrZrkEg7MAgrckuypDNB1vxfpoLcE
-krXesAnfI+ZjhwXWciXD6rbv4k7Md2n1G13fuWX3fCoEKvRXbHv03Iy+X/EdK2R8
-XIafxELnoUzfs/L58Fv5tACazZ2Rdhezm2Kn/N0mhy65XPs0AoDvawddzJ4fnAut
-Qrv2PFKrbnx82aJc/Vs6FN+CWieniunB38qijlLkPZS/aZ5G27MY/shUTDEgqCiW
-FKquxnI/YSS3DklR9MtcwmFKYX8V+uQ7Jlsu/1r8rHVncASj
-</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://birk.wayf.dk/birk.php/wayf.minibib.dk/vej/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Vejsektorens Fagbibliotek</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Library of the Danish Road Directorate</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Vejsektorens Fagbibliotek</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Library of the Danish Road Directorate</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.vejdirektoratet.dk/publikationer.asp?page=document&amp;objno=63466</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.vejdirektoratet.dk/roaddirectorate.asp?page=dept&amp;objno=1024</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/birk.wayf.dk-birk.php-wayf.minibib.dk-vfc.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-vfc.xml
deleted file mode 100644
index 6e5d14bc..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.minibib.dk-vfc.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.minibib.dk/vfc">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-10-28T13:11:12Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfc.minibib.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Socialstyrelsen. Biblioteket</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Library of the National Board of Social Services</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>vfc.minibib.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwDCCAagCAQcwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaHR0cHM6Ly93
-YXlmLm1pbmliaWIuZGsvdmZjMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1
-OVowJjEkMCIGA1UEAwwbaHR0cHM6Ly93YXlmLm1pbmliaWIuZGsvdmZjMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst2
-0fUCHtwaQrHoxQlOa0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pm
-n9/hFBUvyP/t+bEgV9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5
-WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hx
-ctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKee
-xl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQC7H5o10leFZhmg4RREwIpWCS+9r3ccoINqWLq+
-vMJ0WAj/kf8JJlPZjpi8S3qepXtS40I11zSXld4EixfZu/aOOxValsp31TFR1E02
-jztnX4IyNe9MPfcaFCZ94AlFIXrmOm6tSYhycITKY2jJ9ixif6nQZBepJpb1efdH
-QqxK/QeNcG4eDc3sYFOG9HJjFKXuU5IcKXFumnAnQY6jNjZ/5ToUdr6x3FPPRnZD
-HEuKtUT1Rx6s9QsZ4IGT6tdgU/2JIBc02iNHBwxVsuE2UiHGUWlsVXOEmkko/5sz
-QVkDxoUORb/zUsB1AUOl9BYooCSz2rQJ7YcaRYx/DuJm4bv0
-</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://birk.wayf.dk/birk.php/wayf.minibib.dk/vfc/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Socialstyrelsen. Biblioteket</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Library of the National Board of Social Services</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Socialstyrelsen. Biblioteket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Library of the National Board of Social Services</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.servicestyrelsen.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.servicestyrelsen.dk/om-os/about-us</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/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
index f1a09006..57970139 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.regionsjaelland.dk-adfs-services-trust.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://birk.wayf.dk/birk.php/wayf.regionsjaelland.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://birk.wayf.dk/birk.php/wayf.regionsjaelland.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-04-28T14:44:42Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-04-28T14:44:42Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">regionsjaelland.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">regionsjaelland.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Region Sjælland</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Region Zealand</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>regionsjaelland.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC7jCCAdYCAQcwDQYJKoZIhvcNAQELBQAwPTE7MDkGA1UEAwwyaHR0cDovL3dh
 eWYucmVnaW9uc2phZWxsYW5kLmRrL2FkZnMvc2VydmljZXMvdHJ1c3QwHhcNMTUw
@@ -50,9 +52,4 @@ FCi7nKlzaklaH/SOTHq/dQBIWfezdWZwzJez/ZlcHeFV8g==
     <md:OrganizationURL xml:lang="da">http://www.regionsjaelland.dk/Sider/default.aspx</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.regionsjaelland.dk/sider/english.aspx</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/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
index 5f2fb9bf..0c961068 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ruc.dk-idp.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.ruc.dk/idp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.ruc.dk/idp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:34:58Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:34:58Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ruc.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">ruc.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Roskilde Universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Roskilde University</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ruc.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIICuDCCAaACAQcwDQYJKoZIhvcNAQELBQAwIjEgMB4GA1UEAwwXaHR0cHM6Ly93
 YXlmLnJ1Yy5kay9pZHAwHhcNMTUwMTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjAi
@@ -49,9 +51,4 @@ LvJ2p7KuCR1XMFXRBimf3zUsLH5CKx4AOaUJ+A==
     <md:OrganizationURL xml:lang="da">http://www.ruc.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.ruc.dk/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/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
index 6c23adea..297303c1 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.rungsted-gym.dk-saml2-idp-metadata.php.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.rungsted-gym.dk/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.rungsted-gym.dk/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T14:07:25Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T14:07:25Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rungsted-gym.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">rungsted-gym.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Rungsted Gymnasium</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Rungsted High School</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>rungsted-gym.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC8DCCAdgCAQcwDQYJKoZIhvcNAQELBQAwPjE8MDoGA1UEAwwzaHR0cHM6Ly93
 YXlmLnJ1bmdzdGVkLWd5bS5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1
@@ -50,9 +52,4 @@ r/xz9uFt2RzjLOXXnNTxdxNYM+57s7iSEGi7ysNfGUZJ8IY8sv2qGwGpYRcE+M6f
     <md:OrganizationURL xml:lang="da">http://www.rungsted-gym.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.rungsted-gym.dk/rungsted-highschool</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/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml
deleted file mode 100644
index 47da105b..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-aip-saml2-idp-metadata.php-unit-aip.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/aip/saml2/idp/metadata.php?unit=aip">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:52:57Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aip.itsf.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="da">Paderup Gymnasium</mdui:Description>
-        <mdui:Description xml:lang="en">Paderup Gymnasium</mdui:Description>
-        <mdui:DisplayName xml:lang="da">Paderup Gymnasium</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Paderup Gymnasium</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>aip.itsf.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDDDCCAfQCAQcwDQYJKoZIhvcNAQELBQAwTDFKMEgGA1UEAwxBaHR0cHM6Ly93
-YXlmLnN1cHBvcnRjZW50ZXIuZGsvYWlwL3NhbWwyL2lkcC9tZXRhZGF0YS5waHA/
-dW5pdD1haXAwHhcNMTUwMTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjBMMUowSAYD
-VQQDDEFodHRwczovL3dheWYuc3VwcG9ydGNlbnRlci5kay9haXAvc2FtbDIvaWRw
-L21ldGFkYXRhLnBocD91bml0PWFpcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5
-zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9
-lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13
-vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3
-mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fs
-R1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-ENMWqISdcyWIaMg3lcXf8kl3wIHaocFfiullJuRB6djyKnByl4EVlCotP+HnG6eF
-xZtBzFNuNRg/hz/LBELt5iOTt0gd9h5tGFDLPSnMrzxF76D/ADadWa4Gktt12uby
-3v9xYWLW7uqj6IGl4SIZhZ63qAAbbpTE64NK8mg/kSEU+NMu9ZYAg5YcvzK3mxs3
-9fK0dQimQEjUqy7rOxBT6o+o9i6/xJT8rpaiTazuWr8SCj68C6a6SL/H60a9YJ47
-d3ZispCdiYlQdT1JwH/6d63lu90u8okGG1m6phSmW+68cIFZTnWMBApMW8ei9rqh
-LV8Nl3w74u1j520EDfu3HQ==
-</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://birk.wayf.dk/birk.php/wayf.supportcenter.dk/aip/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Paderup Gymnasium</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Paderup Gymnasium</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Paderup Gymnasium</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Paderup Gymnasium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.paderup-gym.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.paderup-gym.dk</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/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
index 4de1a3fe..83ea4f0b 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-gg-saml2-idp-metadata.php-unit-gg.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/gg/saml2/idp/metadata.php?unit=gg">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/gg/saml2/idp/metadata.php?unit=gg">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:55:36Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:55:36Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gg.itsf.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">gg.itsf.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">Grenaa Gymnasium</mdui:Description>
         <mdui:Description xml:lang="en">Grenaa Gymnasium</mdui:Description>
         <mdui:DisplayName xml:lang="da">Grenaa Gymnasium</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Grenaa Gymnasium</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>gg.itsf.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDCDCCAfACAQcwDQYJKoZIhvcNAQELBQAwSjFIMEYGA1UEAww/aHR0cHM6Ly93
 YXlmLnN1cHBvcnRjZW50ZXIuZGsvZ2cvc2FtbDIvaWRwL21ldGFkYXRhLnBocD91
@@ -53,9 +55,4 @@ Z8bY2QouT70h3w+L
     <md:OrganizationURL xml:lang="da">http://www.grenaa-gym.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.grenaa-gym.dk/home.aspx</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/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml
deleted file mode 100644
index 9a415086..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-its-saml2-idp-metadata.php-unit-its.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/its/saml2/idp/metadata.php?unit=its">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T14:02:17Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">its.itsf.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">ITS (IT-Supportcentret)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ITS (IT Support Centre)</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>its.itsf.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDDDCCAfQCAQcwDQYJKoZIhvcNAQELBQAwTDFKMEgGA1UEAwxBaHR0cHM6Ly93
-YXlmLnN1cHBvcnRjZW50ZXIuZGsvaXRzL3NhbWwyL2lkcC9tZXRhZGF0YS5waHA/
-dW5pdD1pdHMwHhcNMTUwMTAxMDAwMDAwWhcNMjUxMjMxMjM1OTU5WjBMMUowSAYD
-VQQDDEFodHRwczovL3dheWYuc3VwcG9ydGNlbnRlci5kay9pdHMvc2FtbDIvaWRw
-L21ldGFkYXRhLnBocD91bml0PWl0czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtLORYA2pW5
-zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa9/6HUMe9
-lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4TFWdhI13
-vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr91RnLGLS3
-mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4JnJnm3fs
-R1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-heUfrZESXEiz40IWaeF5vnTzvrFcd6zSOsiaRWdN6qMa+0JDI4xp76P3YQ5g0XVO
-L61m7aUWclZ8ILo0QtvR9euykgrFZ4H1wkgUhs6JRP8rNWPVP3imrHmU+xaSiZcs
-qR6wNw5pQX8rykuptisWFQVopq3Du9HCbb3ClLmN2dU3IUQPZfwC0r5/BadYfXOb
-MKVUZ2RE+jkQ8jtb6iOdmhrhnDA0b169kCEfiZ5fw8iQ+dKin3YR0AH8f1IYZFsp
-ae3/3F5L11KytokdEk+bBLWN3GkRKr0QAvu3V3YImPSI30fNBWLNp0PwDX+q77cy
-YWDGqSgnwi1H313Tol8U/A==
-</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://birk.wayf.dk/birk.php/wayf.supportcenter.dk/its/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">ITS (IT-Supportcentret)</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">ITS (IT Support Centre)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">ITS (IT-Supportcentret)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ITS (IT Support Centre)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.it-supportcentret.dk/Sider/ITS.aspx</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.it-supportcentret.dk/Sider/ITS.aspx</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/birk.wayf.dk-birk.php-wayf.supportcenter.dk-lg-saml2-idp-metadata.php-unit-lg.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-lg-saml2-idp-metadata.php-unit-lg.xml
deleted file mode 100644
index 855bdf31..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-lg-saml2-idp-metadata.php-unit-lg.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/lg/saml2/idp/metadata.php?unit=lg">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:55:55Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lg.itsf.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="da">Langkær Gymnasium og HF</mdui:Description>
-        <mdui:Description xml:lang="en">Langkær Gymnasium and Higher Prep Exam</mdui:Description>
-        <mdui:DisplayName xml:lang="da">Langkær Gymnasium og HF</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Langkær Gymnasium and Higher Prep Exam</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>lg.itsf.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDCDCCAfACAQcwDQYJKoZIhvcNAQELBQAwSjFIMEYGA1UEAww/aHR0cHM6Ly93
-YXlmLnN1cHBvcnRjZW50ZXIuZGsvbGcvc2FtbDIvaWRwL21ldGFkYXRhLnBocD91
-bml0PWxnMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowSjFIMEYGA1UE
-Aww/aHR0cHM6Ly93YXlmLnN1cHBvcnRjZW50ZXIuZGsvbGcvc2FtbDIvaWRwL21l
-dGFkYXRhLnBocD91bml0PWxnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
-dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
-55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
-k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
-lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
-+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCQgrdi
-MuF4a8PYnhGvJLUh5wFA7kE3ZM5w2PXF/xP3Hj4Co97GzIpaUn3GXLQCYSMAod+e
-ntvU9o/aGaOUDfgx98mMz0Y1Bs2xYDN15vDpslvEZovDnRC/uiG7DNyTfsLXv7WF
-SYcYief9H99UVX8SU/yg94+7car0od8n3F4D9E7qG/8aV8Jqknpqf/XqQO5AaYEz
-JDG7def9y3PADgtSKSPFLt3lWiA7J5lz4CD6V8IUHoaPKkF7CATsg+jGsXjvYAVk
-h/GubE2eBw1Z4u2o/OPHxABwi1+uRQAp6Yn7Si+h6Or8PwaLyKiIKhUI1o274Bo6
-K8W4L1OpUExnZWlW
-</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://birk.wayf.dk/birk.php/wayf.supportcenter.dk/lg/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Langkær Gymnasium og HF</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Langkær Gymnasium and Higher Prep Exam</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Langkær Gymnasium og HF</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Langkær Gymnasium and Higher Prep Exam</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www2.langkaer.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www2.langkaer.dk/omskolen/internationaltsamarbejde/englishwebsite</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/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml
deleted file mode 100644
index 1fe1ea03..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-mg-saml2-idp-metadata.php-unit-mg.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/mg/saml2/idp/metadata.php?unit=mg">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:56:14Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mg.itsf.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="da">Marselisborg Gymnasium</mdui:Description>
-        <mdui:Description xml:lang="en">Marselisborg Gymnasium</mdui:Description>
-        <mdui:DisplayName xml:lang="da">Marselisborg Gymnasium</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Marselisborg Gymnasium</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>mg.itsf.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDCDCCAfACAQcwDQYJKoZIhvcNAQELBQAwSjFIMEYGA1UEAww/aHR0cHM6Ly93
-YXlmLnN1cHBvcnRjZW50ZXIuZGsvbWcvc2FtbDIvaWRwL21ldGFkYXRhLnBocD91
-bml0PW1nMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowSjFIMEYGA1UE
-Aww/aHR0cHM6Ly93YXlmLnN1cHBvcnRjZW50ZXIuZGsvbWcvc2FtbDIvaWRwL21l
-dGFkYXRhLnBocD91bml0PW1nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
-dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
-55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
-k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
-lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
-+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQANBX1K
-0nCKZFi+ffDN4WvL1ni3UJsSIKBNiUog/S68DO+tpoSL214oLGv+mXmZNIyhCKzh
-xezmXJnamKq1+WDVmUhF0gYzZqFw+iAOkCEYUkNvkBT8EZ7FKwNBoMPCYQaqK4cK
-E8WaWXFqrMeOg1CZygVsl4S8WmnfAPtv6jaxvjDevKBcLn9moXby6yRlEjjI5stI
-7FexaJxFGjLT8SFYEI79wDAogEmyJHLim0fzaXdIvpIwTPADo9fO/4gl5bNUDVtO
-5t71b6/cYsHlSLBNd8XNiYShhAKZ6oIHeJHHm2OdLdvse446F+UaFct8R9MvVg61
-gldjnwhQkoXCB2mN
-</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://birk.wayf.dk/birk.php/wayf.supportcenter.dk/mg/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Marselisborg Gymnasium</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Marselisborg Gymnasium</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Marselisborg Gymnasium</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Marselisborg Gymnasium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.marselisborg-gym.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.marselisborg-gym.dk</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/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sg-saml2-idp-metadata.php-unit-sg.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sg-saml2-idp-metadata.php-unit-sg.xml
deleted file mode 100644
index 34804abd..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sg-saml2-idp-metadata.php-unit-sg.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sg/saml2/idp/metadata.php?unit=sg">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-04-20T15:26:43Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sg.itsf.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="da">Skanderborg Gymnasium</mdui:Description>
-        <mdui:Description xml:lang="en">Skanderborg Gymnasium</mdui:Description>
-        <mdui:DisplayName xml:lang="da">Skanderborg Gymnasium</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Skanderborg Gymnasium</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>sg.itsf.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDCDCCAfACAQcwDQYJKoZIhvcNAQELBQAwSjFIMEYGA1UEAww/aHR0cHM6Ly93
-YXlmLnN1cHBvcnRjZW50ZXIuZGsvc2cvc2FtbDIvaWRwL21ldGFkYXRhLnBocD91
-bml0PXNnMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowSjFIMEYGA1UE
-Aww/aHR0cHM6Ly93YXlmLnN1cHBvcnRjZW50ZXIuZGsvc2cvc2FtbDIvaWRwL21l
-dGFkYXRhLnBocD91bml0PXNnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
-dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
-55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
-k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
-lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
-+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBYtW2l
-iYMl6wnN6xr5ohLxSJKuhiPoURzKfW77tFO24Mjf6f6WYhbNAxCD8cTXcDONb4lS
-VTx1abxwKra+L3SsnmSShzDZpIzarfI+kAWug4ucwc8I9dlF8HqImE0inPiRE8UQ
-H80pPuAcCspIwWkZ//Gmhkb3NoEeuvvncskcSd2cEKJQ442+Vnxhh+9vSpHHF3/e
-PyPmsu7gFLZVjvr2IyOWS7ff70SUcY9eeB6qTOkB8oVyRHh6s4yLOaddamu2F9AH
-YtCKmmWpzIjRGtZ6vnPw3iBhzsucboJubxrL6gAuDECh10VGBkfB8HAK4OlNUEVB
-YrENDJLWYDq2kxUH
-</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>MIIDCDCCAfACAQcwDQYJKoZIhvcNAQELBQAwSjFIMEYGA1UEAww/aHR0cHM6Ly93
-YXlmLnN1cHBvcnRjZW50ZXIuZGsvc2cvc2FtbDIvaWRwL21ldGFkYXRhLnBocD91
-bml0PXNnMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowSjFIMEYGA1UE
-Aww/aHR0cHM6Ly93YXlmLnN1cHBvcnRjZW50ZXIuZGsvc2cvc2FtbDIvaWRwL21l
-dGFkYXRhLnBocD91bml0PXNnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlOa0s5FgDalbnNTw36
-dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEgV9r3/odQx72VfY7M
-55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8HabhMVZ2EjXe90vgM
-k/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQkuv3VGcsYtLeY/IIS
-lA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3Xavgmcmebd+xHVDiM
-+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBYtW2l
-iYMl6wnN6xr5ohLxSJKuhiPoURzKfW77tFO24Mjf6f6WYhbNAxCD8cTXcDONb4lS
-VTx1abxwKra+L3SsnmSShzDZpIzarfI+kAWug4ucwc8I9dlF8HqImE0inPiRE8UQ
-H80pPuAcCspIwWkZ//Gmhkb3NoEeuvvncskcSd2cEKJQ442+Vnxhh+9vSpHHF3/e
-PyPmsu7gFLZVjvr2IyOWS7ff70SUcY9eeB6qTOkB8oVyRHh6s4yLOaddamu2F9AH
-YtCKmmWpzIjRGtZ6vnPw3iBhzsucboJubxrL6gAuDECh10VGBkfB8HAK4OlNUEVB
-YrENDJLWYDq2kxUH
-</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://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sg/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Skanderborg Gymnasium</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Skanderborg Gymnasium</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Skanderborg Gymnasium</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Skanderborg Gymnasium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.skanderborg-gym.dk/da</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.skanderborg-gym.dk/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/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sosur-saml2-idp-metadata.php-unit-sosur.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sosur-saml2-idp-metadata.php-unit-sosur.xml
deleted file mode 100644
index 5ee58e8d..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sosur-saml2-idp-metadata.php-unit-sosur.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sosur/saml2/idp/metadata.php?unit=sosur">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:58:46Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sosur.itsf.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="da">Randers Social- og Sundhedsskole</mdui:Description>
-        <mdui:Description xml:lang="en">Randers Basic Health Care College</mdui:Description>
-        <mdui:DisplayName xml:lang="da">Randers Social- og Sundhedsskole</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Randers Basic Health Care College</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>sosur.itsf.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfwCAQcwDQYJKoZIhvcNAQELBQAwUDFOMEwGA1UEAwxFaHR0cHM6Ly93
-YXlmLnN1cHBvcnRjZW50ZXIuZGsvc29zdXIvc2FtbDIvaWRwL21ldGFkYXRhLnBo
-cD91bml0PXNvc3VyMB4XDTE1MDEwMTAwMDAwMFoXDTI1MTIzMTIzNTk1OVowUDFO
-MEwGA1UEAwxFaHR0cHM6Ly93YXlmLnN1cHBvcnRjZW50ZXIuZGsvc29zdXIvc2Ft
-bDIvaWRwL21ldGFkYXRhLnBocD91bml0PXNvc3VyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx4gMCmoQU7iOGfiCda4DnhIggst20fUCHtwaQrHoxQlO
-a0s5FgDalbnNTw36dCXSGYaz17JgyUDJonTwhjyA0CqPm5Pmn9/hFBUvyP/t+bEg
-V9r3/odQx72VfY7M55qUlY6ex2f1qD1gcpFgSTtADlZswec5WqpEt+ie+vsMXq8H
-abhMVZ2EjXe90vgMk/xGfrVwDvupUPBS/2DJSZ1JEmkqi0hxctNQ9qgTZmEcAaQk
-uv3VGcsYtLeY/IISlA+ARzmVWr5+uSetnCXV4jnDEclACKeexl0Ky+tyra4yHF3X
-avgmcmebd+xHVDiM+No6BXMu9zBTp7cp5ShLzsNQSQIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQCL+wf2pf/34+lR9W4aXbfIJW4I+OFEfcQyd8d+j4qe2obnPLcQpA/7
-TGvzhLrHAsFFOynxvNpGCaQPo7+jnJNVPFQIf4tntlEVbH/F9hjVsZn63/Z5onHg
-Rhdzqv/hJ7pOiHzAAVXAiG8tdCfAonKIKp/Q9HJruy6bDiHsuCvpeYM0I9uvPXwl
-HJXtPKEgH3rvNfflst1MUzllDm3eamJG3T/DHZebVtJIaVKnA19XlAlLwNq2V3cl
-xf+4XWnsHLhTxcJFFoUeD43zaw45z4iywiad0V2eefxmH1Vfq+HzDSFCNbkuHu77
-N1ji3QahHGxQDkcHzirRzIMFGyiHJvBP
-</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://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sosur/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Randers Social- og Sundhedsskole</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Randers Basic Health Care College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Randers Social- og Sundhedsskole</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Randers Basic Health Care College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.sosuranders.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.sosuranders.dk</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/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml
deleted file mode 100644
index 0031edae..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sska-saml2-idp-metadata.php-unit-sska.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sska/saml2/idp/metadata.php?unit=sska">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:59:09Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sska.itsf.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="da">Århus Social- og Sundhedsskole</mdui:Description>
-        <mdui:Description xml:lang="en">Aarhus Basic Health Care College</mdui:Description>
-        <mdui:DisplayName xml:lang="da">Århus Social- og Sundhedsskole</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Aarhus Basic Health Care College</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>sska.itsf.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDEDCCAfgCAQcwDQYJKoZIhvcNAQELBQAwTjFMMEoGA1UEAwxDaHR0cHM6Ly93
-YXlmLnN1cHBvcnRjZW50ZXIuZGsvc3NrYS9zYW1sMi9pZHAvbWV0YWRhdGEucGhw
-P3VuaXQ9c3NrYTAeFw0xNTAxMDEwMDAwMDBaFw0yNTEyMzEyMzU5NTlaME4xTDBK
-BgNVBAMMQ2h0dHBzOi8vd2F5Zi5zdXBwb3J0Y2VudGVyLmRrL3Nza2Evc2FtbDIv
-aWRwL21ldGFkYXRhLnBocD91bml0PXNza2EwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkW
-ANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+
-h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExV
-nYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZ
-yxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZy
-Z5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggEBAAyD1cpJoUahK2bvD9zlY8VfNYMQcEeO5IHwNH4iJMfv9z9vg2xDhF31t3IS
-UeV70zxxdfv2M788QEfPVyDdgYWhA5JPW1GvFqAEUXsg4xmX4XW+y18J7hrLXOkd
-6A1yuoMfctlzAIau4okc00sKCz8MBz+JAD0nnvgsVBbGK5LW2iZduY3epSiboF94
-uG3KAf4qdZjszTkVIuXDT5X4pWens6utwaMchUGiUZJ+Fed8WfNcd6bCwLc75qbI
-jgAbEmy59eNPzKOLA/dSKhLyL0/46d9DI4BhkxSb6sahKfFRQxVYxPALYc9Vwm3X
-q1H8RSir+nACRQ/fLPgySCU97iU=
-</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://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sska/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Århus Social- og Sundhedsskole</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Aarhus Basic Health Care College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Århus Social- og Sundhedsskole</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Aarhus Basic Health Care College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.sosuaarhus.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.sosuaarhus.dk</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/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
index 7c5c7d4f..ab4c2758 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.supportcenter.dk-sss-saml2-idp-metadata.php-unit-sss.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sss/saml2/idp/metadata.php?unit=sss">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.supportcenter.dk/sss/saml2/idp/metadata.php?unit=sss">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:59:19Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:59:19Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sss.itsf.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">sss.itsf.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">Social- og Sundhedsskolen i Silkeborg</mdui:Description>
         <mdui:Description xml:lang="en">Basic Health Care College Silkeborg</mdui:Description>
         <mdui:DisplayName xml:lang="da">Social- og Sundhedsskolen i Silkeborg</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Basic Health Care College Silkeborg</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>sss.itsf.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDDDCCAfQCAQcwDQYJKoZIhvcNAQELBQAwTDFKMEgGA1UEAwxBaHR0cHM6Ly93
 YXlmLnN1cHBvcnRjZW50ZXIuZGsvc3NzL3NhbWwyL2lkcC9tZXRhZGF0YS5waHA/
@@ -53,9 +55,4 @@ Z0FIk7cDlCfAO6WS9Da4VQ==
     <md:OrganizationURL xml:lang="da">http://www.sosusilkeborg.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.sosusilkeborg.dk/?224</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/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
index 9ee33d27..d79755cf 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.ucc.dk-saml2-idp-metadata.php.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.ucc.dk/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.ucc.dk/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:33:31Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:33:31Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucc.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">ucc.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">Professionshøjskolen UCC</mdui:Description>
         <mdui:Description xml:lang="en">University College Capital</mdui:Description>
         <mdui:DisplayName xml:lang="da">Professionshøjskolen UCC</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University College Capital</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ucc.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC3jCCAcYCAQcwDQYJKoZIhvcNAQELBQAwNTEzMDEGA1UEAwwqaHR0cHM6Ly93
 YXlmLnVjYy5kay9zYW1sMi9pZHAvbWV0YWRhdGEucGhwMB4XDTE1MDEwMTAwMDAw
@@ -52,9 +54,4 @@ XUPP28ILRNV6EqIHjKw4XqDP
     <md:OrganizationURL xml:lang="da">http://www.ucc.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.ucc.dk/omucc/english</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/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
index 022d8ed6..f056b647 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayf.viauc.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayf.viauc.dk/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayf.viauc.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2010-08-17T13:39:34Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2010-08-17T13:39:34Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">viauc.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">viauc.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">VIA University College</mdui:Description>
         <mdui:Description xml:lang="en">VIA University College</mdui:Description>
         <mdui:DisplayName xml:lang="da">VIA University College</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">VIA University College</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>viauc.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC+DCCAeACAQcwDQYJKoZIhvcNAQELBQAwQjFAMD4GA1UEAww3aHR0cHM6Ly93
 YXlmLnZpYXVjLmRrL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRhLnBocDAe
@@ -52,9 +54,4 @@ p2YMU09Pb33T82fJfzyq0fwa2AhboACWsblekPEHoMxrzNQUuKzcoGbK+WI=
     <md:OrganizationURL xml:lang="da">http://www.viauc.dk</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.viauc.com</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/birk.wayf.dk-birk.php-wayfa.efif.dk-ah-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-ah-module.php-saml-sp.xml
deleted file mode 100644
index 433f9dd7..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-ah-module.php-saml-sp.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/ah/module.php/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-10T11:42:30Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ah.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Aalborg Handelsskole</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Aalborg Business College</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ah.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC4DCCAcgCAQcwDQYJKoZIhvcNAQELBQAwNjE0MDIGA1UEAwwraHR0cHM6Ly93
-YXlmYS5lZmlmLmRrL2FoL21vZHVsZS5waHAvc2FtbC9zcDAeFw0xNTAxMDEwMDAw
-MDBaFw0yNTEyMzEyMzU5NTlaMDYxNDAyBgNVBAMMK2h0dHBzOi8vd2F5ZmEuZWZp
-Zi5kay9haC9tb2R1bGUucGhwL3NhbWwvc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkW
-ANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+
-h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExV
-nYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZ
-yxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZy
-Z5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggEBAIAvw9GbhRmkLRqmcbDOgIzjUSflIBzxBtvCHKotJrqVjxUEmBgr9ovh8yRp
-RWA0vwVUlRgGSJOSTqqcFPht2uBNbem29jI3znco/OOhhZLkUClIyJc6rXmIk5fR
-4PUpFZkO/LurAeTxUkQ1JOtOJ1i8iWvriL+kYX3+ZPJtcid+aVYLsx0mXq1ti4cr
-hhpEs4MfhjRneN97ojgPB30jbzacwSRUXseQ/XyUeUJaD4hAs2DiFNuezLw4RH5Y
-mOizQaUt566v/qqA1taHX9IFcF0dI/pzCKbQZ84NrMhZ3OMWodsLZOFJpIOOllSE
-5WDccT128cz3JYUVlr12R8hM9Gw=
-</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://birk.wayf.dk/birk.php/wayfa.efif.dk/ah/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Aalborg Handelsskole</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Aalborg Business College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Aalborg Handelsskole</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Aalborg Business College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.ah.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ah.dk/aalborg-business-college.html</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/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
index a057c503..17d0d760 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-cph-module.php-saml-sp.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/cph/module.php/saml/sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/cph/module.php/saml/sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-10T11:56:43Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-06-10T11:56:43Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cphbusiness.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">cphbusiness.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Cphbusiness</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Cphbusiness</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>cphbusiness.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC4jCCAcoCAQcwDQYJKoZIhvcNAQELBQAwNzE1MDMGA1UEAwwsaHR0cHM6Ly93
 YXlmYS5lZmlmLmRrL2NwaC9tb2R1bGUucGhwL3NhbWwvc3AwHhcNMTUwMTAxMDAw
@@ -51,8 +53,8 @@ tPD3c+RitftZZdVVSFgdbMdcTZ3log==
     <md:OrganizationURL xml:lang="en">http://cphbusiness.dk/english/</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:GivenName>Arild</md:GivenName>
+    <md:SurName>Ehrensoeld</md:SurName>
+    <md:EmailAddress>ague@efif.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml
deleted file mode 100644
index f216a466..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fg-module.php-saml-sp.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/fg/module.php/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-02-02T13:02:24Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frsgym.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="da">Frederikssund Gymnasium</mdui:Description>
-        <mdui:Description xml:lang="en">Frederikssund Gymnasium</mdui:Description>
-        <mdui:DisplayName xml:lang="da">Frederikssund Gymnasium</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Frederikssund Gymnasium</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>frsgym.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC4DCCAcgCAQcwDQYJKoZIhvcNAQELBQAwNjE0MDIGA1UEAwwraHR0cHM6Ly93
-YXlmYS5lZmlmLmRrL2ZnL21vZHVsZS5waHAvc2FtbC9zcDAeFw0xNTAxMDEwMDAw
-MDBaFw0yNTEyMzEyMzU5NTlaMDYxNDAyBgNVBAMMK2h0dHBzOi8vd2F5ZmEuZWZp
-Zi5kay9mZy9tb2R1bGUucGhwL3NhbWwvc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDHiAwKahBTuI4Z+IJ1rgOeEiCCy3bR9QIe3BpCsejFCU5rSzkW
-ANqVuc1PDfp0JdIZhrPXsmDJQMmidPCGPIDQKo+bk+af3+EUFS/I/+35sSBX2vf+
-h1DHvZV9jsznmpSVjp7HZ/WoPWBykWBJO0AOVmzB5zlaqkS36J76+wxerwdpuExV
-nYSNd73S+AyT/EZ+tXAO+6lQ8FL/YMlJnUkSaSqLSHFy01D2qBNmYRwBpCS6/dUZ
-yxi0t5j8ghKUD4BHOZVavn65J62cJdXiOcMRyUAIp57GXQrL63KtrjIcXddq+CZy
-Z5t37EdUOIz42joFcy73MFOntynlKEvOw1BJAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggEBAHAHUMAarPKICDUsUip01HiutylcGhvPKlOtBXJKeksrZ5iAJp9W9i2ITSJP
-6CfI8XYTNAc+kGVLyFPujVscCA4QUwlkVlg0bxNbr3tMKJqQCmuzZZak1aIjgvdd
-+l3W5qRCWaQkU8dJ4S//ctURTHyYY8K6jVgTkLadbdi4YN+RkqFSIN9e6D+q9NWO
-k+79zUEOfp+n+tLG7SjVo+i+4WbIjxVHjXGgIwOUUJ97CmfQO6DV7yIuptVdeQMU
-TfZ2fqqqJuGx1GBc5SXHKFypaavBGP+UfY/xo/Z4VIoSS48u3cCdGAdToeKpUKYZ
-Wl7WIRfFhXMrMTMiDDMGbZpFe+s=
-</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://birk.wayf.dk/birk.php/wayfa.efif.dk/fg/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Frederikssund Gymnasium</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Frederikssund Gymnasium</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Frederikssund Gymnasium</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Frederikssund Gymnasium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.frsgym.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.frsgym.dk</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/birk.wayf.dk-birk.php-wayfa.efif.dk-fhs-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fhs-module.php-saml-sp.xml
deleted file mode 100644
index 5f3ae599..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-fhs-module.php-saml-sp.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/fhs/module.php/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-05-13T13:34:15Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhavnhs.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Frederikshavn Handelsskole</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Frederikshavn Handelsskole</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>fhavnhs.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC4jCCAcoCAQcwDQYJKoZIhvcNAQELBQAwNzE1MDMGA1UEAwwsaHR0cHM6Ly93
-YXlmYS5lZmlmLmRrL2Zocy9tb2R1bGUucGhwL3NhbWwvc3AwHhcNMTUwMTAxMDAw
-MDAwWhcNMjUxMjMxMjM1OTU5WjA3MTUwMwYDVQQDDCxodHRwczovL3dheWZhLmVm
-aWYuZGsvZmhzL21vZHVsZS5waHAvc2FtbC9zcDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx6MUJTmtL
-ORYA2pW5zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/7fmxIFfa
-9/6HUMe9lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7DF6vB2m4
-TFWdhI13vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2ZhHAGkJLr9
-1RnLGLS3mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2uMhxd12r4
-JnJnm3fsR1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEABDle/WjJsh2XEODipPXrNkBCdt8++ok06dZ8pLFNK+wSzc+Unq7Sx0Ya
-8eOhzbm9uJgr6dlX+rVnIALnxtEySnF2mee7qgANG4GslZZLa8IFzzV/QEI6/vkO
-DuZ9V1qJ0k0/zVKFoDNu95G1RuE384RdEdBmF0/po36wxTfe8OI8e28BfniEu46h
-0xjfB8sgT9W8PvB4wUhjRkHeD+9vKzUr6F1D/7SUdLkXOMo3hVbOWdTt988EjxHu
-dKBWll8KgEF1vePR5kJHQpVapEYpFR5AMOeOvYr/w4pIBJrLB66NrDLeSs+ux5Iy
-3Zf+/QycQYBu9tj8Q8p5s5I3Yt6jwA==
-</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://birk.wayf.dk/birk.php/wayfa.efif.dk/fhs/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Frederikshavn Handelsskole</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Frederikshavn Handelsskole</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Frederikshavn Handelsskole</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Frederikshavn Handelsskole</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.fhavnhs.dk/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fhavnhs.dk/</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/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
index 8ed99928..ef35ab22 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-hss-module.php-saml-sp.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/hss/module.php/saml/sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/hss/module.php/saml/sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2013-04-30T14:07:37Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2013-04-30T14:07:37Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">handelsskolen.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">handelsskolen.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Silkeborg Business College</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Silkeborg Business College</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>handelsskolen.com</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC4jCCAcoCAQcwDQYJKoZIhvcNAQELBQAwNzE1MDMGA1UEAwwsaHR0cHM6Ly93
 YXlmYS5lZmlmLmRrL2hzcy9tb2R1bGUucGhwL3NhbWwvc3AwHhcNMTUwMTAxMDAw
@@ -51,8 +53,8 @@ adTtql0la2qKXumMxXSsTKT5/gU1yg==
     <md:OrganizationURL xml:lang="en">http://www.handelsskolen.com/</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:GivenName>Arild</md:GivenName>
+    <md:SurName>Ehrensoeld</md:SurName>
+    <md:EmailAddress>ague@efif.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
index 12ef2347..b45ce072 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-kn-module.php-saml-sp.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/kn/module.php/saml/sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/kn/module.php/saml/sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-08-23T14:24:59Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-08-23T14:24:59Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knord.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">knord.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">København Nord</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Koebenhavn Nord</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>knord.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC4DCCAcgCAQcwDQYJKoZIhvcNAQELBQAwNjE0MDIGA1UEAwwraHR0cHM6Ly93
 YXlmYS5lZmlmLmRrL2tuL21vZHVsZS5waHAvc2FtbC9zcDAeFw0xNTAxMDEwMDAw
@@ -51,8 +53,8 @@ oTQy5sOe4dSs2/n4/PlkBFwsHcE=
     <md:OrganizationURL xml:lang="en">http://www.knord.dk/in-english.html</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:GivenName>Arild</md:GivenName>
+    <md:SurName>Ehrensoeld</md:SurName>
+    <md:EmailAddress>ague@efif.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
index 9bc5f3f8..5189ee77 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfa.efif.dk-vor-module.php-saml-sp.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/vor/module.php/saml/sp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayfa.efif.dk/vor/module.php/saml/sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2011-08-31T12:35:39Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2011-08-31T12:35:39Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vordingborg-gym.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">vordingborg-gym.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">Vordingborg Gymnasium &amp; HF</mdui:Description>
         <mdui:Description xml:lang="en">Vordingborg Gymnasium and Higher Prep Exam</mdui:Description>
         <mdui:DisplayName xml:lang="da">Vordingborg Gymnasium &amp; HF</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Vordingborg Gymnasium and Higher Prep Exam</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>vordingborg-gym.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIC4jCCAcoCAQcwDQYJKoZIhvcNAQELBQAwNzE1MDMGA1UEAwwsaHR0cHM6Ly93
 YXlmYS5lZmlmLmRrL3Zvci9tb2R1bGUucGhwL3NhbWwvc3AwHhcNMTUwMTAxMDAw
@@ -53,8 +55,8 @@ AKktIsPch1tYllp+fb1/Be5pd2o+Aw==
     <md:OrganizationURL xml:lang="en">http://www.vordingborg-gym.dk/in-english</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:GivenName>Arild</md:GivenName>
+    <md:SurName>Ehrensoeld</md:SurName>
+    <md:EmailAddress>ague@efif.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
index feb36a41..cc293860 100644
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfeadania.itcn.dk-simplesaml-saml2-idp-metadata.php.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfeadania.itcn.dk/simplesaml/saml2/idp/metadata.php">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://birk.wayf.dk/birk.php/wayfeadania.itcn.dk/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-08-21T11:09:38Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2014-08-21T11:09:38Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eadania.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">eadania.dk</shibmd:Scope>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:DisplayName xml:lang="da">Erhvervsakademi Dania</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Dania – Danish Academy of Business and Technology</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>eadania.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDBDCCAewCAQcwDQYJKoZIhvcNAQELBQAwSDFGMEQGA1UEAww9aHR0cHM6Ly93
 YXlmZWFkYW5pYS5pdGNuLmRrL3NpbXBsZXNhbWwvc2FtbDIvaWRwL21ldGFkYXRh
@@ -52,8 +54,8 @@ lsZ14BWXRzkq1VI5Y+Zp/Zq3t8JSNW+T0O/TJXvjt5mdYhu9YKFTMVMujjE4v7qv
     <md:OrganizationURL xml:lang="en">http://eadania.dk/quicklinks/english</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:GivenName>Mads</md:GivenName>
+    <md:SurName>Neve</md:SurName>
+    <md:EmailAddress>neve@itcn.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfidp.uniit.dk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfidp.uniit.dk-saml2-idp-metadata.php.xml
deleted file mode 100644
index e4b7ddc4..00000000
--- a/swamid-interfederations-2.0/birk.wayf.dk-birk.php-wayfidp.uniit.dk-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://birk.wayf.dk/birk.php/wayfidp.uniit.dk/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2012-01-30T11:46:51Z" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniit.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="da">Uni-IT</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uni-IT</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>uniit.dk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC6DCCAdACAQcwDQYJKoZIhvcNAQELBQAwOjE4MDYGA1UEAwwvaHR0cHM6Ly93
-YXlmaWRwLnVuaWl0LmRrL3NhbWwyL2lkcC9tZXRhZGF0YS5waHAwHhcNMTUwMTAx
-MDAwMDAwWhcNMjUxMjMxMjM1OTU5WjA6MTgwNgYDVQQDDC9odHRwczovL3dheWZp
-ZHAudW5paXQuZGsvc2FtbDIvaWRwL21ldGFkYXRhLnBocDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMeIDApqEFO4jhn4gnWuA54SIILLdtH1Ah7cGkKx
-6MUJTmtLORYA2pW5zU8N+nQl0hmGs9eyYMlAyaJ08IY8gNAqj5uT5p/f4RQVL8j/
-7fmxIFfa9/6HUMe9lX2OzOealJWOnsdn9ag9YHKRYEk7QA5WbMHnOVqqRLfonvr7
-DF6vB2m4TFWdhI13vdL4DJP8Rn61cA77qVDwUv9gyUmdSRJpKotIcXLTUPaoE2Zh
-HAGkJLr91RnLGLS3mPyCEpQPgEc5lVq+frknrZwl1eI5wxHJQAinnsZdCsvrcq2u
-Mhxd12r4JnJnm3fsR1Q4jPjaOgVzLvcwU6e3KeUoS87DUEkCAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAok2yJwvfcgrgbviE2GR5U8hVPFsMX5BLyBX1q10qCDAckWJ0
-ydPr9Vjt/pm3x9ONT348mAnBSklQbiwYADnbfEw1dbwtjubU7GyvYSTJEPl3/z5n
-CGdXAI3P3jUtK74V6DOo5S1O55QrW8SLYDncRFTO2KfquaOXRMCGcmYTA3rGfoIN
-0iy3GikgfmJtWq8Vypb5EHqMEUrz1uMbum1fO0QIubzfJsSaTjWeGv9BDavb/K97
-2U+6hYEIRsOhRyZt9Q4HjIvssxqcDSUgKsoDChE0/CRNWt1sas+VnAm/dkXTNFu0
-XzL3IgJnM7r7wSr28rrU9TJEoitS7cAjd4mYRQ==
-</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://birk.wayf.dk/birk.php/wayfidp.uniit.dk/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Uni-IT</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uni-IT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Uni-IT</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uni-IT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://www.uniit.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uniit.dk</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/bismarck.nyme.hu-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/bismarck.nyme.hu-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 75ae3a03..00000000
--- a/swamid-interfederations-2.0/bismarck.nyme.hu-simplesaml-saml2-idp-metadata.php.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://bismarck.nyme.hu/simplesaml/saml2/idp/metadata.php">
-  <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="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>nyme</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">Nyugat-magyarországi Egyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The University of West Hungary (Sopron), Hungary</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Nyugat-magyarországi Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">The University of West Hungary (Sopron), Hungary</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">http://www.nyme.hu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://www.nyme.hu/fileadmin/dokumentumok/rektori/szmszm/adatvedelmi_adatkezelesi_szab_20150128.pdf</mdui:PrivacyStatementURL>
-        <mdui:Logo height="145" width="143">https://bismarck.nyme.hu/simplesaml/black_on_white.png</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nyme.hu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eik.nyme.hu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFcTCCBFmgAwIBAgIJAKBNphZ7hjc7MA0GCSqGSIb3DQEBCwUAMIHVMQswCQYDVQQGEwJIVTEaMBgGA1UECBMRR3lvci1Nb3Nvbi1Tb3Byb24xDzANBgNVBAcTBlNvcHJvbjEnMCUGA1UEChMeVGhlIFVuaXZlcnNpdHkgb2YgV2VzdCBIdW5nYXJ5MTcwNQYDVQQLEy5EZXBhcnRtZW50IG9mIEluZm9ybWF0aW9uIFN5c3RlbXMgYW5kIFNlcnZpY2VzMRkwFwYDVQQDExBiaXNtYXJjay5ueW1lLmh1MRwwGgYJKoZIhvcNAQkBFg1hZG1pbkBueW1lLmh1MB4XDTE0MDUyOTExNTQyMloXDTI0MDUyODExNTQyMlowgdUxCzAJBgNVBAYTAkhVMRowGAYDVQQIExFHeW9yLU1vc29uLVNvcHJvbjEPMA0GA1UEBxMGU29wcm9uMScwJQYDVQQKEx5UaGUgVW5pdmVyc2l0eSBvZiBXZXN0IEh1bmdhcnkxNzA1BgNVBAsTLkRlcGFydG1lbnQgb2YgSW5mb3JtYXRpb24gU3lzdGVtcyBhbmQgU2VydmljZXMxGTAXBgNVBAMTEGJpc21hcmNrLm55bWUuaHUxHDAaBgkqhkiG9w0BCQEWDWFkbWluQG55bWUuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC15ZMAePJn6n30uTqOILsewup8QM52/8oNiphDFjWHiZT2/06rAeFK+nAMz06Jn3Q+Thu9fjr5o/ZCY6v2v+ivjLvAd66jH0EGQwNUsHuGP/vWt2BGP2p5tAn7lX3O7oxdZYBEWgB0j+e7hqaDZ7C6ckDCsH7221IgvClo4G78Y9SnrDqlLGhmju+wZINAwQAvtwchF1ffxZFUwVZ/Zm9+nHw4ilxrK0vcKc/PfoNFrSqxOs2GFz5kDz99NBKpc9Np+xBqMNl6QV49VULN1ooZHzO/G52KcAYTEIBUQwGkKFyAmN2jDpOr56cmTJaRI+P9aT60YUBMfhxczKa9KJM1AgMBAAGjggFAMIIBPDAdBgNVHQ4EFgQUJNKwaCbN3djK5kT8wEq72IhGxgAwggELBgNVHSMEggECMIH/gBQk0rBoJs3d2MrmRPzASrvYiEbGAKGB26SB2DCB1TELMAkGA1UEBhMCSFUxGjAYBgNVBAgTEUd5b3ItTW9zb24tU29wcm9uMQ8wDQYDVQQHEwZTb3Byb24xJzAlBgNVBAoTHlRoZSBVbml2ZXJzaXR5IG9mIFdlc3QgSHVuZ2FyeTE3MDUGA1UECxMuRGVwYXJ0bWVudCBvZiBJbmZvcm1hdGlvbiBTeXN0ZW1zIGFuZCBTZXJ2aWNlczEZMBcGA1UEAxMQYmlzbWFyY2subnltZS5odTEcMBoGCSqGSIb3DQEJARYNYWRtaW5AbnltZS5odYIJAKBNphZ7hjc7MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHvCr7f69ZP77xevakfeh2Kg/Q4OjT4mAYTVahI6ayGGgLvKDzXBxAKNX1gUyH6RNbT4NUQVPXa4jQzrrQC0WDr6lb8zejIyetkat91gkYAisUvFZSWHaTB/wOk9WSnw6spJb/4kCNEqnEMB/RwG2vATDzcfDdqRNkcjy/2qlD8Cj3KkH4joUgmJH925dC8B2c+LtggGNvqHds9JXLhbmj5cw6wRQk0B+1W1IVjEmhCZmHjtltop5pka2cgJ2qqkEnQnjwh4aBIUlk7G6P4x6xElT+jOQEzMyfVGsJ18a3FhXcL2zjoLu2g6buTMGQo/JIcWEEUWvb3QvmGEDjkewto=</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>bismarck.nyme.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bismarck.nyme.hu/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://bismarck.nyme.hu/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">Nyugat-magyarországi Egyetem</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The University of West Hungary (Sopron), Hungary</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">Nyugat-magyarországi Egyetem</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The University of West Hungary (Sopron), Hungary</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.nyme.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uniwest.hu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Nemeth Tamas</md:SurName>
-    <md:EmailAddress>mailto:tamas.nemeth.net@eik.nyme.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Nemeth Tamas</md:SurName>
-    <md:EmailAddress>mailto:tamas.nemeth.net@eik.nyme.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Nemeth Tamas</md:SurName>
-    <md:EmailAddress>mailto:tamas.nemeth.net@eik.nyme.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 46245429..00000000
--- a/swamid-interfederations-2.0/bits-dev.uas.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bits-dev.uas.ox.ac.uk/shibboleth">
-  <!--
-		This is a 'Business Intelligence Development Environment' Tableau Server SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-23T10:19:31Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHTCCAgWgAwIBAgIJAPX9ZMiSNYDiMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azAeFw0xMjA1MTUxNTIwMTJaFw0yMjA1
-						MTMxNTIwMTJaMCAxHjAcBgNVBAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7/B49gX3LryCKiTawlklJBKTNl
-						LrCIrohEDTEFEYRvGn/YETCR1I0z0LmNz6mrqR3ZVtX7pdQZxF7o5vBsFgKp19Dx
-						9iTl9MqaVfAmgD7wj+IOe5vCHMKiBT1HD1B8eJiCL9kWdG87AfH5LLZlflcUTBGY
-						hcL2iBfMIHdsU3qM4/h6wmBdQt15Rcc9rspuM9yahL3CgHt6ivTV5akZ0zWCCRXP
-						AP9lnice3cs4xxanhMeV3ldMbGPC4R8RP4uxloA19a18VvYC8JBYzVRfmdHq8A7E
-						aziSye+k6/pMDRuW2Q5pQmmwsHlLJwslapRkvnwh5bYjpZsU/wDXImMQ2bMCAwEA
-						AaNaMFgwNwYDVR0RBDAwLoIVYml0cy1kZXYudWFzLm94LmFjLnVrhhViaXRzLWRl
-						di51YXMub3guYWMudWswHQYDVR0OBBYEFA7Qoo+j5LHk9+MUiqKZqsIX8VL3MA0G
-						CSqGSIb3DQEBBQUAA4IBAQAfBJ6Yy4bPFD7IM62gmcjX5WPZXlQn7w0LeLRnzvPp
-						d+EKAkp2zRYHpimxkvkol/89QpJR6E6Ta3ZE0Kc6hm8DDPRcKZUQ6GevmIBJFKV2
-						uGltW8WOCjINAfVcLsVOnhxWo8z6PjL8V+wUJWIZ7gY3wTAhUHh9SpCIv/W6rTBM
-						09Fx9GjuCeASiKivQSpWDYjuZGCt50y7xN/Q8Nq4crOZ30b51QawNAusNqmNOuI9
-						ZjXp/kn1jcYC5+48iEzuS4xk2PApy43g+PQq/ZcBjHsdDcuiRZPDOmwKjpZEE3u2
-						2tGYyfRBDPB/0Mjc7RunWPkOvZUQLA7ndT/Hl+K828MZ
-					</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>
-						MIIDHTCCAgWgAwIBAgIJAPX9ZMiSNYDiMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azAeFw0xMjA1MTUxNTIwMTJaFw0yMjA1
-						MTMxNTIwMTJaMCAxHjAcBgNVBAMTFWJpdHMtZGV2LnVhcy5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7/B49gX3LryCKiTawlklJBKTNl
-						LrCIrohEDTEFEYRvGn/YETCR1I0z0LmNz6mrqR3ZVtX7pdQZxF7o5vBsFgKp19Dx
-						9iTl9MqaVfAmgD7wj+IOe5vCHMKiBT1HD1B8eJiCL9kWdG87AfH5LLZlflcUTBGY
-						hcL2iBfMIHdsU3qM4/h6wmBdQt15Rcc9rspuM9yahL3CgHt6ivTV5akZ0zWCCRXP
-						AP9lnice3cs4xxanhMeV3ldMbGPC4R8RP4uxloA19a18VvYC8JBYzVRfmdHq8A7E
-						aziSye+k6/pMDRuW2Q5pQmmwsHlLJwslapRkvnwh5bYjpZsU/wDXImMQ2bMCAwEA
-						AaNaMFgwNwYDVR0RBDAwLoIVYml0cy1kZXYudWFzLm94LmFjLnVrhhViaXRzLWRl
-						di51YXMub3guYWMudWswHQYDVR0OBBYEFA7Qoo+j5LHk9+MUiqKZqsIX8VL3MA0G
-						CSqGSIb3DQEBBQUAA4IBAQAfBJ6Yy4bPFD7IM62gmcjX5WPZXlQn7w0LeLRnzvPp
-						d+EKAkp2zRYHpimxkvkol/89QpJR6E6Ta3ZE0Kc6hm8DDPRcKZUQ6GevmIBJFKV2
-						uGltW8WOCjINAfVcLsVOnhxWo8z6PjL8V+wUJWIZ7gY3wTAhUHh9SpCIv/W6rTBM
-						09Fx9GjuCeASiKivQSpWDYjuZGCt50y7xN/Q8Nq4crOZ30b51QawNAusNqmNOuI9
-						ZjXp/kn1jcYC5+48iEzuS4xk2PApy43g+PQq/ZcBjHsdDcuiRZPDOmwKjpZEE3u2
-						2tGYyfRBDPB/0Mjc7RunWPkOvZUQLA7ndT/Hl+K828MZ
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits-dev.uas.ox.ac.uk/wg/saml/SSO/index.html" index="0" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Business Intelligence Development Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Letellier</SurName>
-    <EmailAddress>mailto:nick.letellier@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 621fbd83..00000000
--- a/swamid-interfederations-2.0/bits-qa.uas.ox.ac.uk-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://bits-qa.uas.ox.ac.uk/shibboleth">
-  <!--
-		This is a "BI/Tableau QA" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-04-16T15:53:33Z"/>
-  </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://bits-qa.uas.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFjCCAf6gAwIBAgIJAPu2m10yz119MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGJpdHMtcWEudWFzLm94LmFjLnVrMB4XDTEzMDQxMjEwMzQyNFoXDTIzMDQx
-						MDEwMzQyNFowHzEdMBsGA1UEAxMUYml0cy1xYS51YXMub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlCzyiE5Wj4Nnr3cNPtsUAf4OLK6ta
-						CWgT7Ph4neO0SjNX97p3A5EC+vtrRcoTrThCroeRKU7WHRIAV7yan/yJbfSWSXPl
-						3qhRIDlGPuzOK69mNEKJwzaGpgPSanevbKwbwghZ0dkHHD5EyKiKsQPzj2xI+tOc
-						fiNkCMRN21m8VmSpSXnSXzsvhUMDGmd7NnS0wsnqPNg2KTIUKWQMwDsPlTcP+8Ab
-						yU2GvBGYZDpbkyad1KPRq/WF25VBsSn0XB///1Eg717x0fkiVWhXu0/n7qWhNQ2D
-						X0UB87Kae7t5tMwt+tCzQoOp4bu0RjaEbCyM9aONep6ebrS0fTWmv3nHAgMBAAGj
-						VTBTMDIGA1UdEQQrMCmCFGJpdHMtcWEudWFzLm94LmFjLnVrhhFiaXRzLXVhcy5v
-						eC5hYy51azAdBgNVHQ4EFgQU2c8+vZ/VozJj9PLzIxuLAEUMkA0wDQYJKoZIhvcN
-						AQEFBQADggEBAA6d/Xb4sRTdNWIDaaOZR6bmamsRZUSXHXoct3AVK6OeQB++EPl6
-						Lqo0PzkshDSqU/eStc1hJ8H9jJRFM/MshrhVK6rPrO4DwVDF/fSfZlLT91J/IHj6
-						p8gOTesZZiycafwydtQeXNs5mmQuEy49mc70iH5yGYTlZg7L2okhk4asqSp2SpNJ
-						htEQ6a1J/AiQljH7j+xMzW02eHLgXgDsGZ2A7N4ocPo69ZJU/9FMvSzh3um25mXm
-						aX+mEeH1eblRgiKHwzymWw+S7GbyAIcwDs3mP3R9X/GUtSPI6xFk1C8vYWHxbRPr
-						TQgeoPeqJAMzETO1ZYr5fAK5+enpkTOgXNY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://bits-qa.uas.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bits-qa.uas.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - BI/Tableau QA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Malin</SurName>
-    <EmailAddress>mailto:ben.malin@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bits.uas.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c0a08b8d..00000000
--- a/swamid-interfederations-2.0/bits.uas.ox.ac.uk-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://bits.uas.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for University of Oxford
-	-->
-  <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="2013-06-25T11:54:02Z"/>
-  </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://bits.uas.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDTCCAfWgAwIBAgIJAN6n87m9JqBAMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWJpdHMudWFzLm94LmFjLnVrMB4XDTEzMDYyMTEwNDU1MloXDTIzMDYxOTEw
-						NDU1MlowHDEaMBgGA1UEAxMRYml0cy51YXMub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCd+fqX2VRSIL9K4DMFfZtObbZkbXEvSyHWtFI5
-						oAIIbfvmmE0pziAC2Rbxa9nLLRw2G7d9AEfW2ktOIS9AE1LVZLoK7v0gvatV7ZaH
-						13C6domsuQzWELqG+vHR9cyIX1tiL8oo+kJLrniHpMuifdm5I+XKTfjNmu493Het
-						sjxu0DpsezqE9F1tlA9mBlSjqKFfp8uYhS+1HjVhT9E+k/TSwz3K/k2EkcXFLKFG
-						4KCFr+bZeW5wiUmy3r87V1N0Zph8uObix00+aQKi0dwCLgIxSRM/LPfakN9gk0L/
-						j2EydLJw0APmPXh8D9IKZAtRGOcN44P2UMc3k9N+a8VR4OJBAgMBAAGjUjBQMC8G
-						A1UdEQQoMCaCEWJpdHMudWFzLm94LmFjLnVrhhFiaXRzLnVhcy5veC5hYy51azAd
-						BgNVHQ4EFgQUsUURuBA+9z5VuLCzxXXODxH4G5UwDQYJKoZIhvcNAQEFBQADggEB
-						AHY96+ozosd3+kYqe9+xKAobDbTX7ZczK51PfzwmLYBRlt6p/yauGoJqSEoNhrPy
-						x4BZ8fPKHgKA2iqAFm5RzBv6t883VR9Npt0P2hQ8+fArcczgwDeCBKTZ16VLlQSy
-						VPZm7/QRGNU8EKx+CEYa5xUAk03Q7XmtmKI3Au7lOkRG0rpHAPTCiEvNcTuniMKl
-						DUSludjtx5UzkiYMRp+5048aTmQBmiHWsvrIUWsaX5vMBt+9QQSOXJEmJ8bRkpkB
-						o8JhwcADWs/8/XCO8IgVJptowHEkJKlHdyyCTr106+Vp62wLwMHzZSlRKTK3VKO2
-						j+LYa2YPte02DhcTeM41wXo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://bits.uas.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bits.uas.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Business Intelligence Production Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ops Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Rumble</SurName>
-    <EmailAddress>mailto:nick.rumble@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/blblogin.blb-karlsruhe.de.xml b/swamid-interfederations-2.0/blblogin.blb-karlsruhe.de.xml
deleted file mode 100644
index 9d886df0..00000000
--- a/swamid-interfederations-2.0/blblogin.blb-karlsruhe.de.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://blblogin.blb-karlsruhe.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">blblogin.blb-karlsruhe.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>blblogin.blb-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=blblogin.blb-karlsruhe.de,O=Badische Landesbibliothek,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFpDCCBIygAwIBAgIEDaIezzANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSIwIAYDVQQKExlCYWRpc2NoZSBMYW5kZXNiaWJsaW90aGVrMRUwEwYDVQQL
-EwxJVC1BYnRlaWx1bmcxGTAXBgNVBAMTEEJMQiBLYXJsc3J1aGUgQ0ExIjAgBgkq
-hkiG9w0BCQEWE2NhQGJsYi1rYXJsc3J1aGUuZGUwHhcNMDkwMTMwMDY0MjA4WhcN
-MTQwMTI5MDY0MjA4WjCBhjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1
-ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNydWhlMSIwIAYDVQQKExlCYWRpc2No
-ZSBMYW5kZXNiaWJsaW90aGVrMSIwIAYDVQQDExlibGJsb2dpbi5ibGIta2FybHNy
-dWhlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK5CwhRlyfdY
-d7yUxHWp7OOLBsbb3iJZgABVoTPwwIxo09s6aoWJEPkcQonDYwruQicUmLNpiUs8
-jZcL7D0CRJrVGt1KRnoKQHFVoKlOLE21vxwyFDapQN9BZIOOE9tbE9+zcvkefrRZ
-IWz5Xifz6MRzQWEeXl34c5XPCYA7NQmIwwSDhMRDHY7AU3ODNeBmZQPNhNFQ65v/
-Nmuuc5KDpSTVZ60Tw+qsYL2uwvFVltTnTMPxtEaKn6MF7ha3DctAUCD9LS3vcQX9
-1z8RA6Pf7F5mKqfxOxQdyfaTUM8+AC6msg6SleoAH3dv/z1V0WUufOyQxE+KZOkw
-Hiq3R/F8bwIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBS+tVT4orbmPPBd
-BE0bI612jtuvjzAfBgNVHSMEGDAWgBTYEu7/qoIRCVQnKWmkaRu3leqNWjCBpQYD
-VR0fBIGdMIGaMEugSaBHhkVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2JhZGlzY2hl
-LWxhbmRlc2JpYmxpb3RoZWstY2EvcHViL2NybC9jYWNybC5jcmwwS6BJoEeGRWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBvgYIKwYBBQUHAQEEgbEwga4wVQYIKwYBBQUH
-MAKGSWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlv
-dGhlay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVQYIKwYBBQUHMAKGSWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAEtEg8O8PON8
-4oNM1as89QeDwAAsqyH2yfo4GRKLTCmAryPi8QC635YlgG7xvqz+CgS3znz3wAJC
-kNoQhdh3+ARk6oF4wQ/OxPhMq7i/Pmx0uUInPqfPTIz306sEeuksIvsBz2QAZXkS
-firdXwi9tidcOvxTZYL5J+KscKVDWhS4zEEeF8/oT3bvBFQQv1MdR8Dymn+axGPS
-Qm1Z19FEwxKD1Da80qM+vlFKdFm6kf9ANjGEoxU3+nS+SEDolRSvKbD45xtEXDm2
-OecY2Vyft4fthAti2y+7mMkBYZdKXvS8yhL0QJVTYmY/Zh28JInYcQ9dnvrMynTd
-Q1O4HKVwCF4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>blblogin.blb-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=blblogin.blb-karlsruhe.de,O=Badische Landesbibliothek,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFpDCCBIygAwIBAgIEDaIezzANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSIwIAYDVQQKExlCYWRpc2NoZSBMYW5kZXNiaWJsaW90aGVrMRUwEwYDVQQL
-EwxJVC1BYnRlaWx1bmcxGTAXBgNVBAMTEEJMQiBLYXJsc3J1aGUgQ0ExIjAgBgkq
-hkiG9w0BCQEWE2NhQGJsYi1rYXJsc3J1aGUuZGUwHhcNMDkwMTMwMDY0MjA4WhcN
-MTQwMTI5MDY0MjA4WjCBhjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1
-ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNydWhlMSIwIAYDVQQKExlCYWRpc2No
-ZSBMYW5kZXNiaWJsaW90aGVrMSIwIAYDVQQDExlibGJsb2dpbi5ibGIta2FybHNy
-dWhlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK5CwhRlyfdY
-d7yUxHWp7OOLBsbb3iJZgABVoTPwwIxo09s6aoWJEPkcQonDYwruQicUmLNpiUs8
-jZcL7D0CRJrVGt1KRnoKQHFVoKlOLE21vxwyFDapQN9BZIOOE9tbE9+zcvkefrRZ
-IWz5Xifz6MRzQWEeXl34c5XPCYA7NQmIwwSDhMRDHY7AU3ODNeBmZQPNhNFQ65v/
-Nmuuc5KDpSTVZ60Tw+qsYL2uwvFVltTnTMPxtEaKn6MF7ha3DctAUCD9LS3vcQX9
-1z8RA6Pf7F5mKqfxOxQdyfaTUM8+AC6msg6SleoAH3dv/z1V0WUufOyQxE+KZOkw
-Hiq3R/F8bwIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBS+tVT4orbmPPBd
-BE0bI612jtuvjzAfBgNVHSMEGDAWgBTYEu7/qoIRCVQnKWmkaRu3leqNWjCBpQYD
-VR0fBIGdMIGaMEugSaBHhkVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2JhZGlzY2hl
-LWxhbmRlc2JpYmxpb3RoZWstY2EvcHViL2NybC9jYWNybC5jcmwwS6BJoEeGRWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBvgYIKwYBBQUHAQEEgbEwga4wVQYIKwYBBQUH
-MAKGSWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlv
-dGhlay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVQYIKwYBBQUHMAKGSWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAEtEg8O8PON8
-4oNM1as89QeDwAAsqyH2yfo4GRKLTCmAryPi8QC635YlgG7xvqz+CgS3znz3wAJC
-kNoQhdh3+ARk6oF4wQ/OxPhMq7i/Pmx0uUInPqfPTIz306sEeuksIvsBz2QAZXkS
-firdXwi9tidcOvxTZYL5J+KscKVDWhS4zEEeF8/oT3bvBFQQv1MdR8Dymn+axGPS
-Qm1Z19FEwxKD1Da80qM+vlFKdFm6kf9ANjGEoxU3+nS+SEDolRSvKbD45xtEXDm2
-OecY2Vyft4fthAti2y+7mMkBYZdKXvS8yhL0QJVTYmY/Zh28JInYcQ9dnvrMynTd
-Q1O4HKVwCF4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://blblogin.blb-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blblogin.blb-karlsruhe.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://blblogin.blb-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blblogin.blb-karlsruhe.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">blblogin.blb-karlsruhe.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>blblogin.blb-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=blblogin.blb-karlsruhe.de,O=Badische Landesbibliothek,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFpDCCBIygAwIBAgIEDaIezzANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSIwIAYDVQQKExlCYWRpc2NoZSBMYW5kZXNiaWJsaW90aGVrMRUwEwYDVQQL
-EwxJVC1BYnRlaWx1bmcxGTAXBgNVBAMTEEJMQiBLYXJsc3J1aGUgQ0ExIjAgBgkq
-hkiG9w0BCQEWE2NhQGJsYi1rYXJsc3J1aGUuZGUwHhcNMDkwMTMwMDY0MjA4WhcN
-MTQwMTI5MDY0MjA4WjCBhjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1
-ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNydWhlMSIwIAYDVQQKExlCYWRpc2No
-ZSBMYW5kZXNiaWJsaW90aGVrMSIwIAYDVQQDExlibGJsb2dpbi5ibGIta2FybHNy
-dWhlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK5CwhRlyfdY
-d7yUxHWp7OOLBsbb3iJZgABVoTPwwIxo09s6aoWJEPkcQonDYwruQicUmLNpiUs8
-jZcL7D0CRJrVGt1KRnoKQHFVoKlOLE21vxwyFDapQN9BZIOOE9tbE9+zcvkefrRZ
-IWz5Xifz6MRzQWEeXl34c5XPCYA7NQmIwwSDhMRDHY7AU3ODNeBmZQPNhNFQ65v/
-Nmuuc5KDpSTVZ60Tw+qsYL2uwvFVltTnTMPxtEaKn6MF7ha3DctAUCD9LS3vcQX9
-1z8RA6Pf7F5mKqfxOxQdyfaTUM8+AC6msg6SleoAH3dv/z1V0WUufOyQxE+KZOkw
-Hiq3R/F8bwIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBS+tVT4orbmPPBd
-BE0bI612jtuvjzAfBgNVHSMEGDAWgBTYEu7/qoIRCVQnKWmkaRu3leqNWjCBpQYD
-VR0fBIGdMIGaMEugSaBHhkVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2JhZGlzY2hl
-LWxhbmRlc2JpYmxpb3RoZWstY2EvcHViL2NybC9jYWNybC5jcmwwS6BJoEeGRWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBvgYIKwYBBQUHAQEEgbEwga4wVQYIKwYBBQUH
-MAKGSWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlv
-dGhlay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVQYIKwYBBQUHMAKGSWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAEtEg8O8PON8
-4oNM1as89QeDwAAsqyH2yfo4GRKLTCmAryPi8QC635YlgG7xvqz+CgS3znz3wAJC
-kNoQhdh3+ARk6oF4wQ/OxPhMq7i/Pmx0uUInPqfPTIz306sEeuksIvsBz2QAZXkS
-firdXwi9tidcOvxTZYL5J+KscKVDWhS4zEEeF8/oT3bvBFQQv1MdR8Dymn+axGPS
-Qm1Z19FEwxKD1Da80qM+vlFKdFm6kf9ANjGEoxU3+nS+SEDolRSvKbD45xtEXDm2
-OecY2Vyft4fthAti2y+7mMkBYZdKXvS8yhL0QJVTYmY/Zh28JInYcQ9dnvrMynTd
-Q1O4HKVwCF4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>blblogin.blb-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=blblogin.blb-karlsruhe.de,O=Badische Landesbibliothek,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFpDCCBIygAwIBAgIEDaIezzANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSIwIAYDVQQKExlCYWRpc2NoZSBMYW5kZXNiaWJsaW90aGVrMRUwEwYDVQQL
-EwxJVC1BYnRlaWx1bmcxGTAXBgNVBAMTEEJMQiBLYXJsc3J1aGUgQ0ExIjAgBgkq
-hkiG9w0BCQEWE2NhQGJsYi1rYXJsc3J1aGUuZGUwHhcNMDkwMTMwMDY0MjA4WhcN
-MTQwMTI5MDY0MjA4WjCBhjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1
-ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNydWhlMSIwIAYDVQQKExlCYWRpc2No
-ZSBMYW5kZXNiaWJsaW90aGVrMSIwIAYDVQQDExlibGJsb2dpbi5ibGIta2FybHNy
-dWhlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwK5CwhRlyfdY
-d7yUxHWp7OOLBsbb3iJZgABVoTPwwIxo09s6aoWJEPkcQonDYwruQicUmLNpiUs8
-jZcL7D0CRJrVGt1KRnoKQHFVoKlOLE21vxwyFDapQN9BZIOOE9tbE9+zcvkefrRZ
-IWz5Xifz6MRzQWEeXl34c5XPCYA7NQmIwwSDhMRDHY7AU3ODNeBmZQPNhNFQ65v/
-Nmuuc5KDpSTVZ60Tw+qsYL2uwvFVltTnTMPxtEaKn6MF7ha3DctAUCD9LS3vcQX9
-1z8RA6Pf7F5mKqfxOxQdyfaTUM8+AC6msg6SleoAH3dv/z1V0WUufOyQxE+KZOkw
-Hiq3R/F8bwIDAQABo4IB5DCCAeAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBS+tVT4orbmPPBd
-BE0bI612jtuvjzAfBgNVHSMEGDAWgBTYEu7/qoIRCVQnKWmkaRu3leqNWjCBpQYD
-VR0fBIGdMIGaMEugSaBHhkVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2JhZGlzY2hl
-LWxhbmRlc2JpYmxpb3RoZWstY2EvcHViL2NybC9jYWNybC5jcmwwS6BJoEeGRWh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBvgYIKwYBBQUHAQEEgbEwga4wVQYIKwYBBQUH
-MAKGSWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlv
-dGhlay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVQYIKwYBBQUHMAKGSWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYmFkaXNjaGUtbGFuZGVzYmlibGlvdGhlay1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAEtEg8O8PON8
-4oNM1as89QeDwAAsqyH2yfo4GRKLTCmAryPi8QC635YlgG7xvqz+CgS3znz3wAJC
-kNoQhdh3+ARk6oF4wQ/OxPhMq7i/Pmx0uUInPqfPTIz306sEeuksIvsBz2QAZXkS
-firdXwi9tidcOvxTZYL5J+KscKVDWhS4zEEeF8/oT3bvBFQQv1MdR8Dymn+axGPS
-Qm1Z19FEwxKD1Da80qM+vlFKdFm6kf9ANjGEoxU3+nS+SEDolRSvKbD45xtEXDm2
-OecY2Vyft4fthAti2y+7mMkBYZdKXvS8yhL0QJVTYmY/Zh28JInYcQ9dnvrMynTd
-Q1O4HKVwCF4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://blblogin.blb-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blblogin.blb-karlsruhe.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Badische Landesbibliothek Karlsruhe</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Badische Landesbibliothek</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.blb-karlsruhe.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Uli</GivenName>
-    <SurName>Fietz</SurName>
-    <EmailAddress>fietz@blb-karlsruhe.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Uli</GivenName>
-    <SurName>Fietz</SurName>
-    <EmailAddress>fietz@blb-karlsruhe.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 300b229b..00000000
--- a/swamid-interfederations-2.0/blogs-staging.it.ox.ac.uk-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://blogs-staging.it.ox.ac.uk/shibboleth">
-  <!--
-		This is an "IT services blog - Staging" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-16T15:20:41Z">
-      <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>
-						MIIDQDCCAiigAwIBAgIJAJyLQwUsXJSZMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWJsb2dzLXN0YWdpbmcuaXQub3guYWMudWswHhcNMTMwNDE1MTY0ODUxWhcN
-						MjMwNDEzMTY0ODUxWjAkMSIwIAYDVQQDExlibG9ncy1zdGFnaW5nLml0Lm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1/YPIiOAoCXfALT8
-						WZfTK9PbQ6jJtwkJa8ETe89mFngzt27IQRq6HfbDGaae7xLi5NwHJGZy4VqujDDz
-						7s5wyJq5os1jTtWijGhTmOl++DG+ikxBJlcHY2/dfzQygm7Z9d2jmJIFtblU7xd/
-						sy/40p4zNBbn/doLgUrITgetvQRU6W34u4EjHDabbRP05xDHdjyxKI52XTYui9l3
-						tK5SSl88tjELz6SKGmVFcvralHrXV20N+z17Zpi27W/SPMLkRVlKyujB7dLefh1y
-						zVHz3gTx7d3YmavOqtLwYl6/myaDRVQlUcLZ2YXXfKdTb64tyq0apyj8SZVmoq+k
-						JO2ZGwIDAQABo3UwczBSBgNVHREESzBJghlibG9ncy1zdGFnaW5nLml0Lm94LmFj
-						LnVrhixodHRwczovL2Jsb2dzLXN0YWdpbmcuaXQub3guYWMudWsvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUFHP6ZM/XvChLzDtS5krGBp0Q6J4wDQYJKoZIhvcNAQEFBQAD
-						ggEBACzXiMpJ9mCcm4gG3Rs9k0rAOclS8yajKB5Y4VJfxWBu4gxOa9TFqmRbg903
-						xliozbxmynVpXLgeG5p62rHEr65d/iV625zQkzDBx3iFQ8mMjYzsogKsptU+1RwX
-						yJdKnSfoYBOupZFbyvAFoyBcL5RU5+1OnqBF2in/Wk7viR2BCGJ8ifooakfsOOXy
-						On1okBIY4STVJlE18KlMZUODxioKbjqb3Ng1jIPlrvmmPc4CzcawLPABIMC0YdKA
-						EJUJGg/45Qsye1PuZ/NbTkACvRPsggxh3uxzGcIZs2zQzShZRn7WLM/UfOS37HPs
-						b+AsEcMnbx8LooBYklkaNosfumI=
-					</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>
-						MIIDQDCCAiigAwIBAgIJAJyLQwUsXJSZMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWJsb2dzLXN0YWdpbmcuaXQub3guYWMudWswHhcNMTMwNDE1MTY0ODUxWhcN
-						MjMwNDEzMTY0ODUxWjAkMSIwIAYDVQQDExlibG9ncy1zdGFnaW5nLml0Lm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1/YPIiOAoCXfALT8
-						WZfTK9PbQ6jJtwkJa8ETe89mFngzt27IQRq6HfbDGaae7xLi5NwHJGZy4VqujDDz
-						7s5wyJq5os1jTtWijGhTmOl++DG+ikxBJlcHY2/dfzQygm7Z9d2jmJIFtblU7xd/
-						sy/40p4zNBbn/doLgUrITgetvQRU6W34u4EjHDabbRP05xDHdjyxKI52XTYui9l3
-						tK5SSl88tjELz6SKGmVFcvralHrXV20N+z17Zpi27W/SPMLkRVlKyujB7dLefh1y
-						zVHz3gTx7d3YmavOqtLwYl6/myaDRVQlUcLZ2YXXfKdTb64tyq0apyj8SZVmoq+k
-						JO2ZGwIDAQABo3UwczBSBgNVHREESzBJghlibG9ncy1zdGFnaW5nLml0Lm94LmFj
-						LnVrhixodHRwczovL2Jsb2dzLXN0YWdpbmcuaXQub3guYWMudWsvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUFHP6ZM/XvChLzDtS5krGBp0Q6J4wDQYJKoZIhvcNAQEFBQAD
-						ggEBACzXiMpJ9mCcm4gG3Rs9k0rAOclS8yajKB5Y4VJfxWBu4gxOa9TFqmRbg903
-						xliozbxmynVpXLgeG5p62rHEr65d/iV625zQkzDBx3iFQ8mMjYzsogKsptU+1RwX
-						yJdKnSfoYBOupZFbyvAFoyBcL5RU5+1OnqBF2in/Wk7viR2BCGJ8ifooakfsOOXy
-						On1okBIY4STVJlE18KlMZUODxioKbjqb3Ng1jIPlrvmmPc4CzcawLPABIMC0YdKA
-						EJUJGg/45Qsye1PuZ/NbTkACvRPsggxh3uxzGcIZs2zQzShZRn7WLM/UfOS37HPs
-						b+AsEcMnbx8LooBYklkaNosfumI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blogs-staging.it.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oxford University IT services blog - Staging</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services IAM Team</GivenName>
-    <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Services IAM Team</GivenName>
-    <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/blogs.it.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c74f0d53..00000000
--- a/swamid-interfederations-2.0/blogs.it.ox.ac.uk-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://blogs.it.ox.ac.uk/shibboleth">
-  <!--
-		This is a "IT Services Blogs" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-19T07:45:28Z"/>
-  </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>
-						MIIDIDCCAgigAwIBAgIJAO5WjU+14S9UMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWJsb2dzLml0Lm94LmFjLnVrMB4XDTEzMDQxNzE3MDUyNFoXDTIzMDQxNTE3
-						MDUyNFowHDEaMBgGA1UEAxMRYmxvZ3MuaXQub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQC/NAROlo2gIDwjaBYvpeZjeCAqkgbdtBeOP0/3
-						cib9XK7twO3pSxBOMIzi9ugl7pZZLs07F5xnsZiVm1ARfdkzuxibp752MhSJHtup
-						BUM7ltGqjcyzd6L6EDaN/tmbgahnz7J9aR9Udzq5sQ7GZi4ZHQdtRcbhOKBl49no
-						/+ERleWGKnlusYKPsHzXlzmtApCjkBFpQ9IfX70QSF7CzhMdSmBbjzifsYPqET+8
-						DYhEqXRG7/wKguZAh5SjxA5QqZPxDYAf9ZdAN9hAmLfA9FDjBYhErEXmarGjhSt8
-						I2wU1DJcyCnGSRi1QZNnArFjXtf0dSJXMqbpC0DkGz057DtxAgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEWJsb2dzLml0Lm94LmFjLnVrhiRodHRwczovL2Jsb2dzLml0Lm94
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFPmPa+TukWsGIl2/RDHAdOc0PqQ9
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAgHD8SRXrO5EDHve1G4gz8j0BCtasDMI+cKpJF
-						Upa3vVWm1BW7FVvmqTRWXWINwb0phOKV1AhV3G2waCRRMnlCE+v/rlzIE79MUf6K
-						8dzME8hVrTz6Xug/IpjJUEc//YrIYHwGfRaT/eORlUNsIoyYfexp6pIh0mY2NGyw
-						yM827XYmiOC22BSY39au2iYWGSlIwxNNLewWZ6q5hoOXT5rz2c832cNW/gqslLde
-						8ml/l/rTR/v08q1mhPSN/EQppYXSBWnoAHW2lFmqC3XSrUqBd9xjU9fWX9ZjHWjQ
-						9bvV+ZPT6CP9dWRJJ0I9Yh50lBOGliCXKs50AqNCD5Qv6DVl
-					</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>
-						MIIDIDCCAgigAwIBAgIJAO5WjU+14S9UMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWJsb2dzLml0Lm94LmFjLnVrMB4XDTEzMDQxNzE3MDUyNFoXDTIzMDQxNTE3
-						MDUyNFowHDEaMBgGA1UEAxMRYmxvZ3MuaXQub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQC/NAROlo2gIDwjaBYvpeZjeCAqkgbdtBeOP0/3
-						cib9XK7twO3pSxBOMIzi9ugl7pZZLs07F5xnsZiVm1ARfdkzuxibp752MhSJHtup
-						BUM7ltGqjcyzd6L6EDaN/tmbgahnz7J9aR9Udzq5sQ7GZi4ZHQdtRcbhOKBl49no
-						/+ERleWGKnlusYKPsHzXlzmtApCjkBFpQ9IfX70QSF7CzhMdSmBbjzifsYPqET+8
-						DYhEqXRG7/wKguZAh5SjxA5QqZPxDYAf9ZdAN9hAmLfA9FDjBYhErEXmarGjhSt8
-						I2wU1DJcyCnGSRi1QZNnArFjXtf0dSJXMqbpC0DkGz057DtxAgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEWJsb2dzLml0Lm94LmFjLnVrhiRodHRwczovL2Jsb2dzLml0Lm94
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFPmPa+TukWsGIl2/RDHAdOc0PqQ9
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAgHD8SRXrO5EDHve1G4gz8j0BCtasDMI+cKpJF
-						Upa3vVWm1BW7FVvmqTRWXWINwb0phOKV1AhV3G2waCRRMnlCE+v/rlzIE79MUf6K
-						8dzME8hVrTz6Xug/IpjJUEc//YrIYHwGfRaT/eORlUNsIoyYfexp6pIh0mY2NGyw
-						yM827XYmiOC22BSY39au2iYWGSlIwxNNLewWZ6q5hoOXT5rz2c832cNW/gqslLde
-						8ml/l/rTR/v08q1mhPSN/EQppYXSBWnoAHW2lFmqC3XSrUqBd9xjU9fWX9ZjHWjQ
-						9bvV+ZPT6CP9dWRJJ0I9Yh50lBOGliCXKs50AqNCD5Qv6DVl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://blogs.it.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: IT Services Blogs</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://blogs.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services Help Centre</GivenName>
-    <EmailAddress>mailto:help@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bm.stars.manchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bm.stars.manchester.ac.uk-shibboleth.xml
deleted file mode 100644
index ea15e6f2..00000000
--- a/swamid-interfederations-2.0/bm.stars.manchester.ac.uk-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://bm.stars.manchester.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for The University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://bm.stars.manchester.ac.uk/Shibboleth.sso/STARSDS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3zCCAcegAwIBAgIJAJuqRlY/1A1jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHZpbGxhbnVzMB4XDTA5MDUyMjA5MjYyN1oXDTE5MDUyMDA5MjYyN1owEzER
-						MA8GA1UEAxMIdmlsbGFudXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDMytraxBwzCmyK3cnajuHo5sb2Hhs0aTIAEaUTpcP2qo/yQlT/S5Wjsm5tPtue
-						pA8z0h56Y4on/k9gGGXnjej+23pfX/dPFCLEyE3MODunTkml1ObptRdMJT6CWRwg
-						m9tdWr8r355vAbS/nEn0s0z3dwHBSuf7/q4GZoBkdbUG5TkOJidlWwe5y2OXSspU
-						lehsON69DPXTxujsn9QNYzmdGxui+nrhHsj8hjPEQc9QcFDq7kXuDkM3Lry84h2p
-						kWGXRebVqEGvs6b7CUxvS5xiOChpx6fTi0/LZQQRCzrtVOuYeb9o6wVejmzW6qun
-						KH7dJCc14fgN2Icd7XYqIXYNAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHZpbGxhbnVz
-						MB0GA1UdDgQWBBTwGMy2sDPsfBZdE/1WuaxJDqVNuzANBgkqhkiG9w0BAQUFAAOC
-						AQEAlvJzqsg5+ZiZ0XChtGL3j1n8PbGeah5AfEfXRvS6RrHu7/3w4WOy+XBpGteu
-						8rqE/HkgqcpnXGS61TEU2HmdnNxqMTpGZoI7zbOkkcsNpvvG+dU5OdlEoTgJHuRI
-						12EgBWjTXMweohxDkLANWaqfB9yVDT1MspMkxKmYalZK95N9M/d6gJfXWwU4GSd0
-						4jfwMr9FzpOLAbxAHIohMA2djNfA2gNuve8PqIfBz6iaUAN0SGhGWMWWEL2B+uYZ
-						2vtfZ+CtpWQteMiXFGEfEL/3U5OtjBxt7JaQxaJJ6iRTk5jdl+EI4NxHzmITf3+O
-						EId1IbbmDWSHoeSw5za0bFOJcg==
-					</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>
-						MIIC3zCCAcegAwIBAgIJAJuqRlY/1A1jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHZpbGxhbnVzMB4XDTA5MDUyMjA5MjYyN1oXDTE5MDUyMDA5MjYyN1owEzER
-						MA8GA1UEAxMIdmlsbGFudXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDMytraxBwzCmyK3cnajuHo5sb2Hhs0aTIAEaUTpcP2qo/yQlT/S5Wjsm5tPtue
-						pA8z0h56Y4on/k9gGGXnjej+23pfX/dPFCLEyE3MODunTkml1ObptRdMJT6CWRwg
-						m9tdWr8r355vAbS/nEn0s0z3dwHBSuf7/q4GZoBkdbUG5TkOJidlWwe5y2OXSspU
-						lehsON69DPXTxujsn9QNYzmdGxui+nrhHsj8hjPEQc9QcFDq7kXuDkM3Lry84h2p
-						kWGXRebVqEGvs6b7CUxvS5xiOChpx6fTi0/LZQQRCzrtVOuYeb9o6wVejmzW6qun
-						KH7dJCc14fgN2Icd7XYqIXYNAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHZpbGxhbnVz
-						MB0GA1UdDgQWBBTwGMy2sDPsfBZdE/1WuaxJDqVNuzANBgkqhkiG9w0BAQUFAAOC
-						AQEAlvJzqsg5+ZiZ0XChtGL3j1n8PbGeah5AfEfXRvS6RrHu7/3w4WOy+XBpGteu
-						8rqE/HkgqcpnXGS61TEU2HmdnNxqMTpGZoI7zbOkkcsNpvvG+dU5OdlEoTgJHuRI
-						12EgBWjTXMweohxDkLANWaqfB9yVDT1MspMkxKmYalZK95N9M/d6gJfXWwU4GSd0
-						4jfwMr9FzpOLAbxAHIohMA2djNfA2gNuve8PqIfBz6iaUAN0SGhGWMWWEL2B+uYZ
-						2vtfZ+CtpWQteMiXFGEfEL/3U5OtjBxt7JaQxaJJ6iRTk5jdl+EI4NxHzmITf3+O
-						EId1IbbmDWSHoeSw5za0bFOJcg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bm.stars.manchester.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Manchester: Building Maintenance Organization</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stars Authentication Support</GivenName>
-    <EmailAddress>mailto:pssauth.support@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stars Authentication Support</GivenName>
-    <EmailAddress>mailto:pssauth.support@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bmcidp.brooksbymelton.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/bmcidp.brooksbymelton.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index cff72e81..00000000
--- a/swamid-interfederations-2.0/bmcidp.brooksbymelton.ac.uk-idp-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://bmcidp.brooksbymelton.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Brooksby Melton College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">brooksbymelton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWDCCAkCgAwIBAgIVAM0zHQkz79mS9Xson1u81Xo9Aql3MA0GCSqGSIb3DQEB
-						BQUAMCYxJDAiBgNVBAMTG2JtY2lkcC5icm9va3NieW1lbHRvbi5hYy51azAeFw0x
-						MTA4MDExNTA1MzNaFw0zMTA4MDExNTA1MzNaMCYxJDAiBgNVBAMTG2JtY2lkcC5i
-						cm9va3NieW1lbHRvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMo6p6KIO6Ib50pl1GzmgAgpAWiK/g1KPdMcKHlsnVo/h1789Ka9iqu4wGaN
-						DmRyBJ5EBgOjzNgEP9lgcnytxQBvJULUdqja3tYASeL2065N6kINtV+RFY0W9dbB
-						/1NFs+5Ira3hhQzqNrwU8fCpjwGjD0x0bgmlAfm7v6/i8W2fsNhewDAC4VoJNY/l
-						DJHnmH9fBO2O9E6CiOzP9z3KumIToKns+EI3GbYdrt+fWWqtIuBz/Sjnw9KsE6KM
-						J+0ddM0jDXeHIDlGVlaJWmuBL0j1dBrL+E7oaC5T6mZbC2IeGkupog/GtpesNs16
-						+qgYU4Jw3bEBtux8NSEVzvDFctMCAwEAAaN9MHswWgYDVR0RBFMwUYIbYm1jaWRw
-						LmJyb29rc2J5bWVsdG9uLmFjLnVrhjJodHRwczovL2JtY2lkcC5icm9va3NieW1l
-						bHRvbi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxsgOb5l8DCKO46rw
-						s3mAo/nBc68wDQYJKoZIhvcNAQEFBQADggEBALG6xylWTVMrf8g4BSwi5juiVTEe
-						CzXeQEjivNHOYtAR0H+UL7RgLz3MGeTrRIDFfKOWQRpCo1TDSNWrwRESuROEK9Rs
-						Q95eQ93qJ/oHVOl3MvrmDy56N7pyDs3wM2biDwnGdJf2ZLR0+INiiuVg1qZs9/w5
-						WB4xV16ZE2oncKFAsHJHK2iVL6GbwtbxAYwTC5hDqOp8b+pXBn8ApsXDo/Ux1lV8
-						ZVxpgzxi7zNgtSP/mSbk5AB1niYm4AGo569Anr5zvX/Dl9Sn3qIv2uDaBhoHg2TT
-						veg66IFDer14n9QxiJiEhK0ywkzQddJ9YJDr+KiDVFpzN/t49uGiZc0+Wcc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bmcidp.brooksbymelton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bmcidp.brooksbymelton.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://bmcidp.brooksbymelton.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bmcidp.brooksbymelton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bmcidp.brooksbymelton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bmcidp.brooksbymelton.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">brooksbymelton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWDCCAkCgAwIBAgIVAM0zHQkz79mS9Xson1u81Xo9Aql3MA0GCSqGSIb3DQEB
-						BQUAMCYxJDAiBgNVBAMTG2JtY2lkcC5icm9va3NieW1lbHRvbi5hYy51azAeFw0x
-						MTA4MDExNTA1MzNaFw0zMTA4MDExNTA1MzNaMCYxJDAiBgNVBAMTG2JtY2lkcC5i
-						cm9va3NieW1lbHRvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMo6p6KIO6Ib50pl1GzmgAgpAWiK/g1KPdMcKHlsnVo/h1789Ka9iqu4wGaN
-						DmRyBJ5EBgOjzNgEP9lgcnytxQBvJULUdqja3tYASeL2065N6kINtV+RFY0W9dbB
-						/1NFs+5Ira3hhQzqNrwU8fCpjwGjD0x0bgmlAfm7v6/i8W2fsNhewDAC4VoJNY/l
-						DJHnmH9fBO2O9E6CiOzP9z3KumIToKns+EI3GbYdrt+fWWqtIuBz/Sjnw9KsE6KM
-						J+0ddM0jDXeHIDlGVlaJWmuBL0j1dBrL+E7oaC5T6mZbC2IeGkupog/GtpesNs16
-						+qgYU4Jw3bEBtux8NSEVzvDFctMCAwEAAaN9MHswWgYDVR0RBFMwUYIbYm1jaWRw
-						LmJyb29rc2J5bWVsdG9uLmFjLnVrhjJodHRwczovL2JtY2lkcC5icm9va3NieW1l
-						bHRvbi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUxsgOb5l8DCKO46rw
-						s3mAo/nBc68wDQYJKoZIhvcNAQEFBQADggEBALG6xylWTVMrf8g4BSwi5juiVTEe
-						CzXeQEjivNHOYtAR0H+UL7RgLz3MGeTrRIDFfKOWQRpCo1TDSNWrwRESuROEK9Rs
-						Q95eQ93qJ/oHVOl3MvrmDy56N7pyDs3wM2biDwnGdJf2ZLR0+INiiuVg1qZs9/w5
-						WB4xV16ZE2oncKFAsHJHK2iVL6GbwtbxAYwTC5hDqOp8b+pXBn8ApsXDo/Ux1lV8
-						ZVxpgzxi7zNgtSP/mSbk5AB1niYm4AGo569Anr5zvX/Dl9Sn3qIv2uDaBhoHg2TT
-						veg66IFDer14n9QxiJiEhK0ywkzQddJ9YJDr+KiDVFpzN/t49uGiZc0+Wcc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bmcidp.brooksbymelton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bmcidp.brooksbymelton.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">Brooksby Melton College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brooksby Melton College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brooksbymelton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:itsupport@BrooksbyMelton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:itsupport@BrooksbyMelton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bmthbs.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/bmthbs.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index c6f04c16..00000000
--- a/swamid-interfederations-2.0/bmthbs.sisoshibboleth.co.uk-entity.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://bmthbs.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Bournemouth University ~ Business School, Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2014-12-01T17:24:32Z">
-      <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://bmth.siso.co/bs/sso/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://bmth.siso.co/bs/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Bournemouth University ~ Business School, Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ Business School, Online Resource Booking</mdui:Description>
-        <mdui:Logo height="60" width="60">https://shibboleth.siso.co/siso-logo60x60.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bmth.siso.co/bs/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Bournemouth University ~ Business School, Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bmtheventskit.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/bmtheventskit.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index dbb76786..00000000
--- a/swamid-interfederations-2.0/bmtheventskit.sisoshibboleth.co.uk-entity.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://bmtheventskit.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Bournemouth University ~ Events, Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2014-12-09T14:52:37Z">
-      <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://bmth.siso.co/eventskit/sso/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://bmth.siso.co/eventskit/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Bournemouth University ~ Events, Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ Events, Online Resource Booking</mdui:Description>
-        <mdui:Logo height="60" width="60">https://shibboleth.siso.co/siso-logo60x60.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bmth.siso.co/eventskit/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Bournemouth University ~ Events, Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bmthmcopsequipment.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/bmthmcopsequipment.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index 36f3793c..00000000
--- a/swamid-interfederations-2.0/bmthmcopsequipment.sisoshibboleth.co.uk-entity.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://bmthmcopsequipment.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Bournemouth University ~ M&C Operations Team, Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2015-04-09T13:03:49Z">
-      <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://bmth.siso.co/mcopsequipment/sso/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://bmth.siso.co/mcopsequipment/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Bournemouth University ~ M&amp;C Operations Team, Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ M&amp;C Operations Team, Online Resource Booking</mdui:Description>
-        <mdui:Logo height="64" width="64">https://shibboleth.siso.co/siso-logo64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bmth.siso.co/mcopsequipment/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bmth.siso.co/mcopsequipment/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bmth.siso.co/mcopsequipment/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bmth.siso.co/mcopsequipment/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bmth.siso.co/mcopsequipment/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bmth.siso.co/mcopsequipment/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bmth.siso.co/mcopsequipment/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Bournemouth University ~ M&amp;C Operations Team, Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bmthmedia.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/bmthmedia.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index 7fa69f5a..00000000
--- a/swamid-interfederations-2.0/bmthmedia.sisoshibboleth.co.uk-entity.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://bmthmedia.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Bournemouth University ~ BmthMedia, Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2013-06-06T10:17:26Z"/>
-  </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://bmth.siso.co/bmthmedia/sso/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://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Bournemouth University ~ BmthMedia, Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ BmthMedia, Online Resource Booking</mdui:Description>
-        <mdui:Logo height="60" width="60">https://shibboleth.siso.co/siso-logo60x60.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bmth.siso.co/bmthmedia/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Bournemouth University ~ BmthMedia, Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bobnational.net-saml-metadata.xml b/swamid-interfederations-2.0/bobnational.net-saml-metadata.xml
deleted file mode 100644
index 1b69e235..00000000
--- a/swamid-interfederations-2.0/bobnational.net-saml-metadata.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://bobnational.net/saml/metadata">
-  <!--
-		This is a simpleSAMLphp SP for the British Universities Film & Video Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-27T18:06:00Z"/>
-  </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>
-						MIIDlDCCAnygAwIBAgIJANdrdMaQXWYoMA0GCSqGSIb3DQEBBQUAMDoxHjAcBgNV
-						BAoTFUJvQiBOYXRpb25hbCBXZWIgU2l0ZTEYMBYGA1UEAxMPYm9ibmF0aW9uYWwu
-						bmV0MB4XDTEyMDgxNjEyMTgzNFoXDTIyMDgxNDEyMTgzNFowOjEeMBwGA1UEChMV
-						Qm9CIE5hdGlvbmFsIFdlYiBTaXRlMRgwFgYDVQQDEw9ib2JuYXRpb25hbC5uZXQw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChVywMjnHBsEhfSHdWDwQy
-						4DJsfa3XdcYXf5TdNDAgDjuNnvNIsupLaatPNUsoLCywjEjR0a5xQkDx8SocntS4
-						ueA5aLQM2J/WvFu8w/I26VMqu3oOTi9D7FH4rhSLWpmEt42lCwyxgBrcoUlMSYcf
-						2dD66YqmI6qWiLhjukU49Qhu5L7q4eN3MZUWQ1RlHhq8a8i2E3+e5hUxaMmR0R+t
-						mnJUw2UhX7YaTVhTx/nKbevyGMQkyv7XgLa2JNe3+n+dyUsECNE+VLF7uwRPWHEp
-						/Gis0qTNn5yT1uu7Hx15UiqqitnWvHGlmLasEiC8UMlvjg06LdhyeBdAH84e7SGD
-						AgMBAAGjgZwwgZkwHQYDVR0OBBYEFLGc2FzkYAkjc5LCl9IhxPOXdAi/MGoGA1Ud
-						IwRjMGGAFLGc2FzkYAkjc5LCl9IhxPOXdAi/oT6kPDA6MR4wHAYDVQQKExVCb0Ig
-						TmF0aW9uYWwgV2ViIFNpdGUxGDAWBgNVBAMTD2JvYm5hdGlvbmFsLm5ldIIJANdr
-						dMaQXWYoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEzPhy3e0E05
-						ZwvsLtV0yUQv2NH8Y62CKhfWRoBMvVyVgEhIpl65RdMMpD0YniivY+d9cl+ObVEP
-						kFxJsBr86NUPHAA12qHf/QR9cGZAsQhQ8XFrCE3sWgCNlBxTOoE5pqwKTMxymDZD
-						rVMhRugvRv/VMVEv4py+98nu5KQedUVqkuYz7eG+GZlFJXHuqeMq3eXGVhW5UEcC
-						QWZjg8Usw8plmmXjPv6yiSxhwIQcFWVIe+/gU1b2F9H05k07ttptx49ahYji+mNj
-						fg+nv0Kg3/TODGxPdpgp4EISAkK+5Mxrat9/qpYjW59wZIrpoWu/IQodmLzxFi31
-						D51oPHcAyxM=
-					</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>
-						MIIDlDCCAnygAwIBAgIJANdrdMaQXWYoMA0GCSqGSIb3DQEBBQUAMDoxHjAcBgNV
-						BAoTFUJvQiBOYXRpb25hbCBXZWIgU2l0ZTEYMBYGA1UEAxMPYm9ibmF0aW9uYWwu
-						bmV0MB4XDTEyMDgxNjEyMTgzNFoXDTIyMDgxNDEyMTgzNFowOjEeMBwGA1UEChMV
-						Qm9CIE5hdGlvbmFsIFdlYiBTaXRlMRgwFgYDVQQDEw9ib2JuYXRpb25hbC5uZXQw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChVywMjnHBsEhfSHdWDwQy
-						4DJsfa3XdcYXf5TdNDAgDjuNnvNIsupLaatPNUsoLCywjEjR0a5xQkDx8SocntS4
-						ueA5aLQM2J/WvFu8w/I26VMqu3oOTi9D7FH4rhSLWpmEt42lCwyxgBrcoUlMSYcf
-						2dD66YqmI6qWiLhjukU49Qhu5L7q4eN3MZUWQ1RlHhq8a8i2E3+e5hUxaMmR0R+t
-						mnJUw2UhX7YaTVhTx/nKbevyGMQkyv7XgLa2JNe3+n+dyUsECNE+VLF7uwRPWHEp
-						/Gis0qTNn5yT1uu7Hx15UiqqitnWvHGlmLasEiC8UMlvjg06LdhyeBdAH84e7SGD
-						AgMBAAGjgZwwgZkwHQYDVR0OBBYEFLGc2FzkYAkjc5LCl9IhxPOXdAi/MGoGA1Ud
-						IwRjMGGAFLGc2FzkYAkjc5LCl9IhxPOXdAi/oT6kPDA6MR4wHAYDVQQKExVCb0Ig
-						TmF0aW9uYWwgV2ViIFNpdGUxGDAWBgNVBAMTD2JvYm5hdGlvbmFsLm5ldIIJANdr
-						dMaQXWYoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEzPhy3e0E05
-						ZwvsLtV0yUQv2NH8Y62CKhfWRoBMvVyVgEhIpl65RdMMpD0YniivY+d9cl+ObVEP
-						kFxJsBr86NUPHAA12qHf/QR9cGZAsQhQ8XFrCE3sWgCNlBxTOoE5pqwKTMxymDZD
-						rVMhRugvRv/VMVEv4py+98nu5KQedUVqkuYz7eG+GZlFJXHuqeMq3eXGVhW5UEcC
-						QWZjg8Usw8plmmXjPv6yiSxhwIQcFWVIe+/gU1b2F9H05k07ttptx49ahYji+mNj
-						fg+nv0Kg3/TODGxPdpgp4EISAkK+5Mxrat9/qpYjW59wZIrpoWu/IQodmLzxFi31
-						D51oPHcAyxM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bobnational.net/saml/module.php/saml/sp/saml2-logout.php/imagenweb"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bobnational.net/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bobnational.net/saml/module.php/saml/sp/saml1-acs.php/imagenweb" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bobnational.net/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bobnational.net/saml/module.php/saml/sp/saml1-acs.php/imagenweb/artifact" index="3"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">BoB National</ServiceName>
-      <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="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="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="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="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">British Universities Film &amp; Video Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">British Universities Film &amp; Video Council: BoB National</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://bufvc.ac.uk/tvandradio/bob</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>CIS Helpdesk</GivenName>
-    <EmailAddress>mailto:support@cambridgeimaging.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>CIS Helpdesk</GivenName>
-    <EmailAddress>mailto:support@cambridgeimaging.com</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 658c5c44..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 GÉANT 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">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/boleth.chi.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/boleth.chi.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 2f6eb320..00000000
--- a/swamid-interfederations-2.0/boleth.chi.ac.uk-idp-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://boleth.chi.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for University of Chichester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-04-22T18:01: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">chi.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIULwL7oid36ZPtdvr3LZJNHVTCZGEwDQYJKoZIhvcNAQEF
-						BQAwGzEZMBcGA1UEAwwQYm9sZXRoLmNoaS5hYy51azAeFw0xNTAyMTYwODMwMjha
-						Fw0zNTAyMTYwODMwMjhaMBsxGTAXBgNVBAMMEGJvbGV0aC5jaGkuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+fzYeakSO5FUusjI9Vhtog+BZ
-						M+0NjVqfiODCI3ncYZQSzh4ay3GUWSl/lvimyO1zzjJ+R9BkGfw2xdPXDmSRxf7C
-						FCGvKCR3n8Q1W8A1M85Mc3VnGE6Aj+d7tr4r1x945TdT2mP0ZH/3bCCgWite5Ui3
-						iKM/Ge8t3PghkryisBXRqsKaoQ0bwlT0tPhqCtJRaNcPvrNt9UKbcnvms+/5/KAW
-						ylG2Lg/9Ky2WP+wHUC5sTxu3s8AaA7+mZ+jU4Z7mvPnCaziwS0Agq+xVbPbHzMQp
-						fwVfiNbefl5+gu44gAjJTS2tC1MVu9PmHYxO1NzDq6sF4TJ5tuBczrmYjCd1AgMB
-						AAGjZzBlMB0GA1UdDgQWBBRlDfq/VVhb+hyVo6q++EpXUCh8zDBEBgNVHREEPTA7
-						ghBib2xldGguY2hpLmFjLnVrhidodHRwczovL2JvbGV0aC5jaGkuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAJ4fiImysQWUrTSzODaOh6l9
-						n1WQz1ZIof3BUJ7uloUSeT2hteVPTtzqTST5+1/CQu3AkE1Hr+lU9N0mw1d6tHYU
-						Pe3XZQmevFn1ulJ1vhB6uqrZU+7VxyC7bijyeLPGUFt42nndQrEGY6bBB8rakL7j
-						oOqkh3Mkziu6hJtedV43jr5chVPgvsKlt74EFJMtiTaxVhB9sTbrVEGJ0zqwalvM
-						yInsBUhcKzyT5IXsl88X1TSgWo34X/Q3C+Cub4AUEq7YJet89bnIVx8YZKfTfMWC
-						GtAN/WcamuAumN0ZlAzcbLNeMxTqEyZxGTF0vjvATxj2iceErIxGkBNOTSd9Kjs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://boleth.chi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://boleth.chi.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://shib.chi.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.chi.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.chi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.chi.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">chi.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIULwL7oid36ZPtdvr3LZJNHVTCZGEwDQYJKoZIhvcNAQEF
-						BQAwGzEZMBcGA1UEAwwQYm9sZXRoLmNoaS5hYy51azAeFw0xNTAyMTYwODMwMjha
-						Fw0zNTAyMTYwODMwMjhaMBsxGTAXBgNVBAMMEGJvbGV0aC5jaGkuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+fzYeakSO5FUusjI9Vhtog+BZ
-						M+0NjVqfiODCI3ncYZQSzh4ay3GUWSl/lvimyO1zzjJ+R9BkGfw2xdPXDmSRxf7C
-						FCGvKCR3n8Q1W8A1M85Mc3VnGE6Aj+d7tr4r1x945TdT2mP0ZH/3bCCgWite5Ui3
-						iKM/Ge8t3PghkryisBXRqsKaoQ0bwlT0tPhqCtJRaNcPvrNt9UKbcnvms+/5/KAW
-						ylG2Lg/9Ky2WP+wHUC5sTxu3s8AaA7+mZ+jU4Z7mvPnCaziwS0Agq+xVbPbHzMQp
-						fwVfiNbefl5+gu44gAjJTS2tC1MVu9PmHYxO1NzDq6sF4TJ5tuBczrmYjCd1AgMB
-						AAGjZzBlMB0GA1UdDgQWBBRlDfq/VVhb+hyVo6q++EpXUCh8zDBEBgNVHREEPTA7
-						ghBib2xldGguY2hpLmFjLnVrhidodHRwczovL2JvbGV0aC5jaGkuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAJ4fiImysQWUrTSzODaOh6l9
-						n1WQz1ZIof3BUJ7uloUSeT2hteVPTtzqTST5+1/CQu3AkE1Hr+lU9N0mw1d6tHYU
-						Pe3XZQmevFn1ulJ1vhB6uqrZU+7VxyC7bijyeLPGUFt42nndQrEGY6bBB8rakL7j
-						oOqkh3Mkziu6hJtedV43jr5chVPgvsKlt74EFJMtiTaxVhB9sTbrVEGJ0zqwalvM
-						yInsBUhcKzyT5IXsl88X1TSgWo34X/Q3C+Cub4AUEq7YJet89bnIVx8YZKfTfMWC
-						GtAN/WcamuAumN0ZlAzcbLNeMxTqEyZxGTF0vjvATxj2iceErIxGkBNOTSd9Kjs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://boleth.chi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://boleth.chi.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 Chichester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Chichester</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.chi.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@chi.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Mason</SurName>
-    <EmailAddress>mailto:j.mason@chi.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bolton.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/bolton.ac.uk-oala-metadata.xml
deleted file mode 100644
index cd7531be..00000000
--- a/swamid-interfederations-2.0/bolton.ac.uk-oala-metadata.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://bolton.ac.uk/oala/metadata">
-  <!--
-	This is an OpenAthens LA IdP for the University of Bolton.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 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">bolton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID9jCCAt6gAwIBAgIJAMeNs3EXVaFlMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
-						BAYTAkdCMQ4wDAYDVQQIEwVMYW5jczEPMA0GA1UEBxMGQm9sdG9uMSEwHwYDVQQK
-						ExhUaGUgVW5pdmVyc2l0eSBvZiBCb2x0b24xDDAKBgNVBAsTA0lTVDEbMBkGA1UE
-						AxMSbG9naW4uYm9sdG9uLmFjLnVrMB4XDTEzMDExNjE0MzAwOVoXDTIzMDExNDE0
-						MzAwOVowfDELMAkGA1UEBhMCR0IxDjAMBgNVBAgTBUxhbmNzMQ8wDQYDVQQHEwZC
-						b2x0b24xITAfBgNVBAoTGFRoZSBVbml2ZXJzaXR5IG9mIEJvbHRvbjEMMAoGA1UE
-						CxMDSVNUMRswGQYDVQQDExJsb2dpbi5ib2x0b24uYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDOjOVfVGLNGxU5idZ0TXO650ieACNjmzKRmsij
-						eGIOWRR1JdDt1f/Qzn3J4i44AwgTSQOTUb7LLEBXxGZ2IOdyg0Eo2sbdhfrakXSj
-						qupgMXzaRlJqS3Aj1dOPwD7sAoWieZaU9YUaci93pUdReWWRFJNS8+caRb2J86il
-						NUh3KGjFeChv/W5YjYKJJzYTz4I1bIiwxdmkaLKz1xItsrxlVJLb6FbpPQspf+4m
-						aR8odp3zp2C0p2VxCKB7bGrVjz8GtG+C9FLuqr14UAOUkP8gCM5bh5juAqFhiRxq
-						vjqKkt8E1U0GGSA/wrOmfee7jre3a9ZEQ2XDBnhL/vyl/o23AgMBAAGjezB5MAkG
-						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
-						ZmljYXRlMB0GA1UdDgQWBBQRjeujYHnHVAgjBV2q/kOIkS9oKzAfBgNVHSMEGDAW
-						gBQRjeujYHnHVAgjBV2q/kOIkS9oKzANBgkqhkiG9w0BAQUFAAOCAQEAHNtOuZaJ
-						D0zq7F+m2S/aRNcRldTcYg/SQJprEKG2v+N66K1xtVJRUqy0XaeRl5rXlDwVqgFc
-						IcWzxCQhc2p65iQMTp6ZAnyKFiIY0jGEfCQPYeSTV5rklZo/u1lfO5vruqEZCFsS
-						aoSTBFMoZZg1ERrwWk1KH1LXF+WjDNfRIDAgBr2OUDatFF+n1PMDtNxxXjeb/32d
-						TXO45yY5/ddNJywFOCm5293empnNnBsu/OSkkUX7RhYUr1IFwZXmUiNzvUDMtJym
-						3WiZ+NTdc2zIc4zfAgssu/HL6GwUTKSAGRVPcmJn8UqPawT00r2lqtzDb+54kv27
-						KCsozEp6AzhAYA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.bolton.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bolton.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Bolton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bolton</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bolton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Charlson</SurName>
-    <EmailAddress>mailto:I.Charlson@bolton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Antony</GivenName>
-    <SurName>Nikrooz</SurName>
-    <EmailAddress>mailto:A.Nikrooz@bolton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/booking.ictf.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 73062a5c..00000000
--- a/swamid-interfederations-2.0/booking.ictf.ox.ac.uk-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://booking.ictf.ox.ac.uk/shibboleth">
-  <!--
-		This is an "ICTF Conference Booking Website" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T15:52:20Z"/>
-  </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://booking.ictf.ox.ac.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://booking.ictf.ox.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAK/ba/SUiWe2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWJvb2tpbmcuaWN0Zi5veC5hYy51azAeFw0xMzAzMjEwOTU3NDdaFw0yMzAz
-						MTkwOTU3NDdaMCAxHjAcBgNVBAMTFWJvb2tpbmcuaWN0Zi5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/qxQYodiz2wlFTRKTunx1uXub3
-						aMGFCoCz+m7l9lGQdfA+C24PRxWi4StUGqQmMJa97t/WtYcCbr05Ba4Kwg5v4c7g
-						23YBXFVFrFBtZnohMQSg1IaZNkWK8MwQGJTxFD+2b/KHRkrcHGbjEgHgGM+MYtdb
-						kfWswHFR6HHKDV6zkAL+bK338bj/eCywT4hmhLx2iaI4BkkpQNtLZ3BkTVzC/Wxb
-						xZ+Dy6wAfIkv8RMWbHih0+juYDM4FVTzwcn5Q7+O3Lmf//RyQRdZW3Tm+yJoOT4V
-						0qWkqDidl8WUKwmc/oEbsWcMk0PsmZS8o93f59Rsxrjyn/uCcL6p8t2c72kCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVYm9va2luZy5pY3RmLm94LmFjLnVrMB0GA1UdDgQW
-						BBS5EwhqH1HRiDM3x+20r1OE1uZBDjANBgkqhkiG9w0BAQUFAAOCAQEATmwjfTI3
-						9y/e3p4hR77va41wvVS9TOlLCP8eZb9Kz4VwYW1yivqo2XfuLMgjniQWLJrZDDIL
-						I0Z4D8CbN2Bu2fYK9NE7njsUhfbZUrhBd2Ec2XlL2ef8tI5XP8X+okXMRdcUmAG8
-						7J/DKbjByjYOAgZSR2h2YUrV4UmIb1+40ToFUd8DWVlUdNhtNxRecIZvlSd6HDP6
-						PKn+cVXHEvUHhshA/8+FFbOlbBf+lKNiDKMlCdpEngK16aizDRPSbO7rrDyaz7fB
-						t22YY+B+nypOCwam1z5qvpa4YUyp/zhwyjCVuubNP+IZnM2QCvP1PJaI6bffxSng
-						cP2sORZYpAmpdg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://booking.ictf.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford ICTF Conference Booking Website</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ictf.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jim</GivenName>
-    <SurName>Leek</SurName>
-    <EmailAddress>mailto:jim.leek@eng.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jim</GivenName>
-    <SurName>Leek</SurName>
-    <EmailAddress>mailto:jim.leek@eng.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 05f6f5dc..00000000
--- a/swamid-interfederations-2.0/bookings.balliol.ox.ac.uk-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://bookings.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth Balliol Bookings SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-20T10:51:44Z"/>
-  </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://bookings.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAMbZ2C/vjx5FMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWJvb2tpbmdzLmJhbGxpb2wub3guYWMudWswHhcNMTIwNDE3MjA1MzU5WhcN
-						MjIwNDE1MjA1MzU5WjAkMSIwIAYDVQQDExlib29raW5ncy5iYWxsaW9sLm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxeX2Jcy7zo8Ul7no
-						hC4u+uyyxZ7iMhtkQl/XFen+x/CrJJ9tZAtN2jtL/k25RcjVHuk4Z6541aDqqR5G
-						1sWi86sPZWQMfeWMLWLgK8waONU50bwAOzuCyYBq1MjX0lJ+QVYJvgF6lkKu4+0H
-						bqKptvOpFcn9OeKU5DGUEz/H4DYvMSUMntmtN5Eluvtxy94r+wdDWdVrY7PZ2M48
-						FtvV8P9luRiBAoMuiGE0Pm/zpoM7Xxt7k4oYZfoG5HOtMKE9dV65pmCKPv+h2bhu
-						Z4FfHWt4U0/4XgvmeM5sY/JPFXGFBK8gXCoRfYMbrfQenzaVHdyN1HN0LCKOjSP3
-						+poaLQIDAQABo0cwRTAkBgNVHREEHTAbghlib29raW5ncy5iYWxsaW9sLm94LmFj
-						LnVrMB0GA1UdDgQWBBQBuS1FvgRlEaZWLgT0c14ZqONLXTANBgkqhkiG9w0BAQUF
-						AAOCAQEAcxupRmcfDqaidBsS+6Cutd16AGoI9wSwP4xfJRPYhtzxO8dzLRiF2iEu
-						QvA86Lpg2nWKDmcyT2o+Ekh9Obi+729Tsbn636ViuIx1oNEm77b6RO3WU1OL9KZp
-						fZfWsEyT20yddL1OW1iagc9xS+1EpRin5kDzxerGouEEr14WM5HD0Bgpn93+fTMx
-						UxXgdaE6PUQc5WC4iYZJGNZkpem9ib2AhZd/pw6stmRcRmS+KybbNTi8FmTWwzYV
-						2vs9eHkIBuxD5LoY31QnqxLDHZ45Zdyr/6mcslWCNti+vmiqzxK276aACCNxZ/4i
-						ceBywtbgjdTLOe0SORf6He5VlljeUg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bookings.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Bookings</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index bf15f9e0..00000000
--- a/swamid-interfederations-2.0/bookingsdev.balliol.ox.ac.uk-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://bookingsdev.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Balliol Bookings Dev" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-04-15T12:00:08Z">
-      <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://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGzCCAgOgAwIBAgIJAK5gDlJ0M0NBMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-						BAMTHGJvb2tpbmdzZGV2LmJhbGxpb2wub3guYWMudWswHhcNMTQwMjI3MTMzMTI5
-						WhcNMjQwMjI1MTMzMTI5WjAnMSUwIwYDVQQDExxib29raW5nc2Rldi5iYWxsaW9s
-						Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArdqcsCxH
-						turqSl/2MS79hrrCfoamaWtQvPG27Hkdl1iQLmTVSdkdWOVfdFEg7PGhoCxYKvZi
-						0KQZnMO1WcKLHyIUpaqJa+fITw7fmW4CVk1KvWuua3FYQ9WXceF4aoEFRjdtqmT5
-						pDfjiSRPcx4MTGBDzaAhodKKJKAG3QRkWGQWPY+jw6GuZ3uYRIPURPlJQCmkbYQy
-						l4xuT1rEUL/knv9oVbmoo4R+xHapRWj16fq0T4QPsBhYcrXwnUEWhADurE7POvDX
-						zTI2tNTH80Xgj9IpVjC56TO9GjqEbZ/2MUssHhrXF8CrztJ6n7gsvHuEd7oAC6eN
-						2w99RBgIBLkiewIDAQABo0owSDAnBgNVHREEIDAeghxib29raW5nc2Rldi5iYWxs
-						aW9sLm94LmFjLnVrMB0GA1UdDgQWBBQofjvUEVMYX6jGvsUFnh1OoumrCzANBgkq
-						hkiG9w0BAQUFAAOCAQEARJdCoSGbtzzHlyBvhj3eQINrJ6tw2w5VPjzsVSERmHlj
-						0Nh/RPcUQ1CQacA9HzpeiuHFr5kZ0wJNHcPinoIpQBmoHbKHpT8A+bFeTPHAb8Iu
-						J+5EFJqi/nloVooVsdNGNxeVlFhaycCfTg76VWwbjUzUKmJpKTiDTWDEg1xNO0pH
-						2ezUffGaOYagOM4/jLRjb78nKdG9rQJZJ5zM/HumnVO0xvFAHEZgWwxKF4CpM/FP
-						YPjKarM1GeukK0E8FLYdkJ24WELMhDVDXEZRNDdM+7gLzQgv+wQwYRpnMMrMRAX3
-						ZDKjBX8+kEWIGSHzBuV2+PXDsaik4/fsoIVK7liylQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bookingsdev.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Balliol Bookings Dev</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Balliol Computing</GivenName>
-    <EmailAddress>mailto:computing@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Balliol Computing</GivenName>
-    <EmailAddress>mailto:computing@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/booksandjournals.brillonline.com-shibboleth.xml b/swamid-interfederations-2.0/booksandjournals.brillonline.com-shibboleth.xml
deleted file mode 100644
index 7bcd5b2b..00000000
--- a/swamid-interfederations-2.0/booksandjournals.brillonline.com-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://booksandjournals.brillonline.com/shibboleth">
-  <!--
-		This is a Brill Online Books and Journals OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDwDCCAqigAwIBAgIEToGSDTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIzAhBgNV
-						BAoTGlB1Ymxpc2hpbmcgVGVjaG5vbG9neSBQbGMuMRkwFwYDVQQLExBTY2hvbGFy
-						bHkgT25saW5lMSswKQYDVQQDDCJQdWJsaXNoaW5nIFRlY2hub2xvZ3kgW0JyaWxs
-						IExpdmVdMB4XDTExMDkyNzA5MDYyMVoXDTIxMDkyNDA5MDYyMVowgaExCzAJBgNV
-						BAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMSMw
-						IQYDVQQKExpQdWJsaXNoaW5nIFRlY2hub2xvZ3kgUGxjLjEZMBcGA1UECxMQU2No
-						b2xhcmx5IE9ubGluZTErMCkGA1UEAwwiUHVibGlzaGluZyBUZWNobm9sb2d5IFtC
-						cmlsbCBMaXZlXTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALlOyYcy
-						TfkadSzf7/kJAXnd8KY8nNhv1dJXzI9ozZMbLhHGzyr9VSPhjoQq+VUa3BhM6qj2
-						hh1cZezWz+LknFnyw5YttV47ePZ3/Vdddk44+GwF6JvmKBi8HguI5spGscOJrdO6
-						fdTxouDuOWn9iuBl7BbHCAnMxsTwHzFQ6D7ESnyaiXP+PVNc1OJNRjRTlSPm5iTJ
-						wcghLvX6uIYpL9/B8J7YGmdm6UTpKGApeRY8Jp30mc2TMAtC9Drrhl20KGSLTpjh
-						41Q+6w4MpfmRh/Wwz+c5XdIcEaN9qGtXwKSE0LhvXhr/WPTjK8s8zuQN4oR+MbB9
-						grHq7H5XI+slnFsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAUG0xLZOrP7Lzl+NZ
-						j6olGz00Zz9j+Sk9Z/K5x3CuOqTdPhJsYH4gFN/SpJygIeyh33b56HiOVsj2XzZM
-						nWjNX7PPMitpY5jdFkuOz5JM6ULQWP7OwTomVDeGeZAkn7hd0df/jvn/r++bi9II
-						2jvAFztPf8WC8dcNJkNEgt3ibRyVkUHUJVHR6cMaPD0MUCcJQ8HhXrmxYfgAUvm3
-						q3VHKXA1ED3ETRT86tXEjJmWsPdHJ6vzN+56c29WPM6CmbUa6IZOCBcqCixe1sG2
-						D7Xmd/6sfzNiEB5XmkkKgDxts+VWz7dnVvX8nSRX/fxI5KiDCSGRVljvsq6QQnb2
-						YJtBYQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://booksandjournals.brillonline.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://booksandjournals.brillonline.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Publishing Technology plc: Brill Online Books and Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://booksandjournals.brillonline.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Brill Support</GivenName>
-    <EmailAddress>mailto:support@brill.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:openathens@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bournemouth.co-tutor.co.uk-shibboleth.xml b/swamid-interfederations-2.0/bournemouth.co-tutor.co.uk-shibboleth.xml
deleted file mode 100644
index b611abd8..00000000
--- a/swamid-interfederations-2.0/bournemouth.co-tutor.co.uk-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://bournemouth.co-tutor.co.uk/shibboleth">
-  <!--
-		This is a "Co-Tutor at Bournemouth" Shibboleth SP for Loughborough University.
-	-->
-  <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="2016-02-12T10:34:14Z">
-      <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://bournemouth.co-tutor.co.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAOiYjTsFNgAsMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD2lwLTE3Mi0zMS00Ny04NzAeFw0xNjAyMDQxODI2NTZaFw0yNjAyMDExODI2
-						NTZaMBoxGDAWBgNVBAMTD2lwLTE3Mi0zMS00Ny04NzCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAJ0Kt7P6RpsSFzbjdq9cuXPBpVaAxbDQyLxX8xxZQk7W
-						z+HYmRCW2FfmAWRGtLe6TxXY2eSDPnaCRSXnM6L5VJ79htgf224Minz44V7pkH4b
-						fB3V2+SZo6GdFsLPvArVQD3ykyzNZ6snrk6h+wzN1AD2mgmB47emRS5nrb/nCFQi
-						AcwTKc4ko1TUx7sg3njifh9ApsLK72MQgNtG/R0CxUwV82F+nHph0Ghz0Fb1YoCL
-						vYVgTbK0pmvovpkzHmwNvBwHr4ZCTObGI4rrwo7YWqbJsoHzDb1CtkFEaOsXIcH9
-						3ed+qWGW4Ujpio/e1YLYZHkQV72Wc99Mb/f+lXKinykCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPaXAtMTcyLTMxLTQ3LTg3MB0GA1UdDgQWBBSCl5autvAPKmaDFvcx2H84
-						VZJmhDANBgkqhkiG9w0BAQUFAAOCAQEAAm9hrwpV+DbmkZ+Q0pp8IxAQ3kzNP9NJ
-						D09nyP4UeyRNIJLrN2TWnq+eTMhu45DGs4Ft/Exm7HWbJBlKqHt7tpEIgI+YMG8J
-						4Cnz/S5K9MBFLQCi6zBA0ysept1RX39Gvk5pqtHh+GaOIYxaluQnvi62kblw93g2
-						hWJFRyUJ1KE/YhmBLOwRV49hxwMIDsy2nxRR6RG4s2Xkw8S5veBYk2j4wcboQOw1
-						C/ljsLpP7qjsvG7N7hcxcxL6p1cEHxZNOp+e1jwB8RztxoMrX0NDDAdal0gJ5tD9
-						Ye+vQFT2JsBRulniJ54ZuPutnGhHrOtsewshVpHRdPa+qdVhxqrsgw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://bournemouth.co-tutor.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bournemouth.co-tutor.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bournemouth.co-tutor.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bournemouth.co-tutor.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bournemouth.co-tutor.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bournemouth.co-tutor.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bournemouth.co-tutor.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bournemouth.co-tutor.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bournemouth.co-tutor.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bournemouth.co-tutor.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bournemouth.co-tutor.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Loughborough University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Co-Tutor at Bournemouth</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.co-tutor.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ray</GivenName>
-    <SurName>Chung</SurName>
-    <EmailAddress>mailto:ray.chung@lboro.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Newman</SurName>
-    <EmailAddress>mailto:p.m.newman@lboro.ac.uk</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 cacc0312..00000000
--- a/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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">
-      <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.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</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>
-      <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>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>.</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </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>mailto: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/brad.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/brad.ac.uk-oala-metadata.xml
deleted file mode 100644
index 1caa6628..00000000
--- a/swamid-interfederations-2.0/brad.ac.uk-oala-metadata.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://brad.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the University of Bradford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">brad.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDlDCCAnygAwIBAgIJANXFuAkInLUOMA0GCSqGSIb3DQEBBQUAMDoxHzAdBgNV
-						BAoTFlVuaXZlcnNpdHkgb2YgQnJhZGZvcmQxFzAVBgNVBAMTDmlkcC5icmFkLmFj
-						LnVrMB4XDTExMTIxNTA3MzU0NloXDTIxMTIxMjA3MzU0NlowOjEfMB0GA1UEChMW
-						VW5pdmVyc2l0eSBvZiBCcmFkZm9yZDEXMBUGA1UEAxMOaWRwLmJyYWQuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0g3A4ViQaWo3ooKJCJzMT
-						suHZpnYar65+6QiDmZvx1QDGMT+YlYS1jmkuz4YGwJOdj4h9Up9dSCx4M3XweUuD
-						bLclot8c05tOBBzm+8UHkaYnIYx/8GKE8+NKtscerr1UvHlOxTBPPFxogb4X0fQm
-						iW+PEz9wDPpegj4WlY0ktaxgzjhjvZQwFVqGIBxBvdT6phfkWeK5xj2er956tBgl
-						IgCq0fuBp6FVhH1fn+bzxyLN7ORWOnPYZeWbxwECCqRaYD6tsUH2+UL2G6SwnAct
-						7H1K8pvsfvCjHzzDF67B95lTtql/9ifhb4L5Pb58ntwKDoU/G9oYQaN069lwNRIZ
-						AgMBAAGjgZwwgZkwHQYDVR0OBBYEFDeVQv1JG+EQO/AiOsHDqnOjliqEMGoGA1Ud
-						IwRjMGGAFDeVQv1JG+EQO/AiOsHDqnOjliqEoT6kPDA6MR8wHQYDVQQKExZVbml2
-						ZXJzaXR5IG9mIEJyYWRmb3JkMRcwFQYDVQQDEw5pZHAuYnJhZC5hYy51a4IJANXF
-						uAkInLUOMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIby+5WHVMoP
-						2p0mzAeMxtM4hBVP3GKl1lkRTSO1AEXCrVbYuaAw45AfZnuadDiQAKFAC0OezT0S
-						DQcVSpxrLN2LP8nMoFzhlWkk6gIjvRDPkzxOse7EIhtRWerm52D5uQ9b+31OKVcU
-						TXce5suAR/hCXcr41iXDcNDJSQkV1WBfd6UR075umgTEi8ssmbYjM3tjWq+XIFSE
-						6hvalVaP6I5fpC+lcQZTvgHtIkwm0PPGtqyVThivuW9469EITTfXx1fAGKiTzuPC
-						u/73ycpe1n4szaouE0SYZplEht4mi/ZmDI7KrpwMISxEfdCAtz3E6mAfibmPoPie
-						/PZXD7xJX28= </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>
-						MIIDlDCCAnygAwIBAgIJANXFuAkInLUOMA0GCSqGSIb3DQEBBQUAMDoxHzAdBgNV
-						BAoTFlVuaXZlcnNpdHkgb2YgQnJhZGZvcmQxFzAVBgNVBAMTDmlkcC5icmFkLmFj
-						LnVrMB4XDTExMTIxNTA3MzU0NloXDTIxMTIxMjA3MzU0NlowOjEfMB0GA1UEChMW
-						VW5pdmVyc2l0eSBvZiBCcmFkZm9yZDEXMBUGA1UEAxMOaWRwLmJyYWQuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0g3A4ViQaWo3ooKJCJzMT
-						suHZpnYar65+6QiDmZvx1QDGMT+YlYS1jmkuz4YGwJOdj4h9Up9dSCx4M3XweUuD
-						bLclot8c05tOBBzm+8UHkaYnIYx/8GKE8+NKtscerr1UvHlOxTBPPFxogb4X0fQm
-						iW+PEz9wDPpegj4WlY0ktaxgzjhjvZQwFVqGIBxBvdT6phfkWeK5xj2er956tBgl
-						IgCq0fuBp6FVhH1fn+bzxyLN7ORWOnPYZeWbxwECCqRaYD6tsUH2+UL2G6SwnAct
-						7H1K8pvsfvCjHzzDF67B95lTtql/9ifhb4L5Pb58ntwKDoU/G9oYQaN069lwNRIZ
-						AgMBAAGjgZwwgZkwHQYDVR0OBBYEFDeVQv1JG+EQO/AiOsHDqnOjliqEMGoGA1Ud
-						IwRjMGGAFDeVQv1JG+EQO/AiOsHDqnOjliqEoT6kPDA6MR8wHQYDVQQKExZVbml2
-						ZXJzaXR5IG9mIEJyYWRmb3JkMRcwFQYDVQQDEw5pZHAuYnJhZC5hYy51a4IJANXF
-						uAkInLUOMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIby+5WHVMoP
-						2p0mzAeMxtM4hBVP3GKl1lkRTSO1AEXCrVbYuaAw45AfZnuadDiQAKFAC0OezT0S
-						DQcVSpxrLN2LP8nMoFzhlWkk6gIjvRDPkzxOse7EIhtRWerm52D5uQ9b+31OKVcU
-						TXce5suAR/hCXcr41iXDcNDJSQkV1WBfd6UR075umgTEi8ssmbYjM3tjWq+XIFSE
-						6hvalVaP6I5fpC+lcQZTvgHtIkwm0PPGtqyVThivuW9469EITTfXx1fAGKiTzuPC
-						u/73ycpe1n4szaouE0SYZplEht4mi/ZmDI7KrpwMISxEfdCAtz3E6mAfibmPoPie
-						/PZXD7xJX28= </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brad.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brad.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Bradford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bradford</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brad.ac.uk/library/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Satu</GivenName>
-    <SurName>Nieminen</SurName>
-    <EmailAddress>mailto:s.nieminen@bradford.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Geoff</GivenName>
-    <SurName>Bell</SurName>
-    <EmailAddress>mailto:g.bell@bradford.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/brain.lab.vvc.niif.hu-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/brain.lab.vvc.niif.hu-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 1b807e53..00000000
--- a/swamid-interfederations-2.0/brain.lab.vvc.niif.hu-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.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://brain.lab.vvc.niif.hu/simplesamlphp/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="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>niifi</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">SA8T2 STUN/TURN pilot service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SA8T2 STUN/TURN pilot service</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">NIIF &amp; GÉANT4 SA8T2 STUN/TURN pilot service</mdui:Description>
-        <mdui:Description xml:lang="en">NIIF &amp; GÉANT4 SA8T2 STUN/TURN pilot service</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">https://brain.lab.vvc.niif.hu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">https://brain.lab.vvc.niif.hu/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID8zCCAtugAwIBAgIJAOEmrKCwwgFGMA0GCSqGSIb3DQEBCwUAMIGPMQswCQYDVQQGEwJIVTEQMA4GA1UECAwHSHVuZ2FyeTERMA8GA1UEBwwIQnVkYXBlc3QxFzAVBgNVBAoMDk5JSUYgSW5zdGl0dXRlMR4wHAYDVQQDDBVicmFpbi5sYWIudnZjLm5paWYuaHUxIjAgBgkqhkiG9w0BCQEWE3ZpZGVvLWFkbWluQG5paWYuaHUwHhcNMTUxMTE4MTAwMDE5WhcNMjUxMTE3MTAwMDE5WjCBjzELMAkGA1UEBhMCSFUxEDAOBgNVBAgMB0h1bmdhcnkxETAPBgNVBAcMCEJ1ZGFwZXN0MRcwFQYDVQQKDA5OSUlGIEluc3RpdHV0ZTEeMBwGA1UEAwwVYnJhaW4ubGFiLnZ2Yy5uaWlmLmh1MSIwIAYJKoZIhvcNAQkBFhN2aWRlby1hZG1pbkBuaWlmLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2EmyGJJKf81jOZT+vURk31LCQKV3W6FaeSS0gwTKEAnGB4t+YmQtpBPO0CSD0pbYBDAo1O4uMy55bXqwRjJnShqC1NKBHvf8dwQsSf5ri32wiuCMqDJ2HXijVHLqcWP3eHcHJ+KViIk1HdMS26E8jWl9jL1SJMiKLr7x90hiyvt/7qxajNnc7uiISKX757wMrhMf/MI4fTz1+ZnI8BZOa9pTE4l5m7B37se2M5E366vcIdOPRGTgHYiuJaqPt1IkJ14xvcuOI+YiCk424pOuOTh/WgDUGvNV2SZmmeHQGsfkL5ZLlni1amXHbqNn0/mQ6sTsrR+AnJREmgNXlCCZhwIDAQABo1AwTjAdBgNVHQ4EFgQUrti4QDbl9FCPz4JnSHF43rsVRM4wHwYDVR0jBBgwFoAUrti4QDbl9FCPz4JnSHF43rsVRM4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAdFXN/U/sPXfhWvPMmDaI9cMfi7PdT7Mp8qH7D5lI90Y98/nnjYun6Df4tHbyChnLw6k7GQ1XfTd8ClQOU409IMtJFDln3LdGhaNuVt9zLaV0KX5wNnUNoHE+hEh9kg2cz56ixyIJj/cEkg6b3FaUAnu9DDD8+gWKMtIGvqQAUlfy4Hk/lacvaXstUu/Vb8xuolfIM2Sc1z4U649dSvcu7QIA//pgFlOEPQ0kYIn675petzKRiJPdbEvfgHPGMmYgkssK6bJCyedk8SxBboiDkromhRH69EwXBP8Tei06EgMgsC6x/jZ+FhZ6dU/kzBwsf3s4cNt+grDGvV+VSOdUGA==</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>brain.lab.vvc.niif.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://brain.lab.vvc.niif.hu/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://brain.lab.vvc.niif.hu/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://brain.lab.vvc.niif.hu/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="hu">SA8T2 STUN/TURN pilot service</md:ServiceName>
-      <md:ServiceName xml:lang="en">SA8T2 STUN/TURN pilot service</md:ServiceName>
-      <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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Meszaros</md:SurName>
-    <md:EmailAddress>mailto:misi@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Meszaros</md:SurName>
-    <md:EmailAddress>mailto:misi@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Meszaros</md:SurName>
-    <md:EmailAddress>mailto:misi@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bridge.uninett.no.xml b/swamid-interfederations-2.0/bridge.uninett.no.xml
deleted file mode 100644
index bb6ff7af..00000000
--- a/swamid-interfederations-2.0/bridge.uninett.no.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://bridge.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEjDCCA3SgAwIBAgIJAOOq/5xhGwUvMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYDVQQGEwJOTzEQMA4GA1UECBMHQW5kcmVhczEQMA4GA1UEBxMHQW5kcmVhczEQMA4GA1UEChMHQW5kcmVhczEQMA4GA1UECxMHQW5kcmVhczEQMA4GA1UEAxMHQW5kcmVhczEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMB4XDTExMDkyMjExNDYyMloXDTIxMDkyMTExNDYyMlowgYoxCzAJBgNVBAYTAk5PMRAwDgYDVQQIEwdBbmRyZWFzMRAwDgYDVQQHEwdBbmRyZWFzMRAwDgYDVQQKEwdBbmRyZWFzMRAwDgYDVQQLEwdBbmRyZWFzMRAwDgYDVQQDEwdBbmRyZWFzMSEwHwYJKoZIhvcNAQkBFhJhbmRyZWFzQHVuaW5ldHQubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8/MduXpE0ZBIUqG0SMu/4ZXalD04cj4eeaecldelkXwWj3GXid2h7DjcElrsj+76K7XJa72r/o6FNqj7qUEWYE93DL3uWQ3jXh72bWPeo/Jju88Ea2xn43yWa2i82CshCzIJzjCSKN7L3aejpowgyQuwFOhlBbGBaHF0ihFVe6wEVSPvPL6OvX4/kZZqcMe4HveIpw4w2hWuX297juSZEN3XlwXpKf2zvhGaqTUinF1mgzcpUocfeYsRSIjEjJwwDsk6/WDAAumTfqLN0XDYFU2VfucZ08ovrAsh+8R7JVGuKKyz7Qn2ali84XQQHXA/Jf8ZqDW7A6rlSsjm2y9ZhAgMBAAGjgfIwge8wHQYDVR0OBBYEFH7mar1GlsEE4CQOpnty4XbiFVqxMIG/BgNVHSMEgbcwgbSAFH7mar1GlsEE4CQOpnty4XbiFVqxoYGQpIGNMIGKMQswCQYDVQQGEwJOTzEQMA4GA1UECBMHQW5kcmVhczEQMA4GA1UEBxMHQW5kcmVhczEQMA4GA1UEChMHQW5kcmVhczEQMA4GA1UECxMHQW5kcmVhczEQMA4GA1UEAxMHQW5kcmVhczEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vggkA46r/nGEbBS8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAEaiUcmuUiq0bhaMD8njpqJP0b6JcpjRoS0+a8Ynr9hjyOXNLEDgHZAJEjqTsGr8a++mwdk2cQwMDR2AsLpHqFHUTtd+QDPLTkR10JzGOIsSCNBpm73kO6S1oneKXDMELsZg3J0ZXIB79iWYQWpITvjdCxaToL9dw1BR86fLle9YJVdyuhhAqCtFtJ35OM3S0Gw7JEKld+LHZaLDvyJSEFSfOQBTVkb0NBKFu2TSsOqOzOIRyxH0c8Bs/IyOenB8eCgg7KYvjkPETAPig4JvazM9LilKdxLhvRcaVofQkIaw7K+Y4EdIVRTIGLOmj4Lm07pQyClYSDDtQPQiktkpZUA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEjDCCA3SgAwIBAgIJAOOq/5xhGwUvMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYDVQQGEwJOTzEQMA4GA1UECBMHQW5kcmVhczEQMA4GA1UEBxMHQW5kcmVhczEQMA4GA1UEChMHQW5kcmVhczEQMA4GA1UECxMHQW5kcmVhczEQMA4GA1UEAxMHQW5kcmVhczEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vMB4XDTExMDkyMjExNDYyMloXDTIxMDkyMTExNDYyMlowgYoxCzAJBgNVBAYTAk5PMRAwDgYDVQQIEwdBbmRyZWFzMRAwDgYDVQQHEwdBbmRyZWFzMRAwDgYDVQQKEwdBbmRyZWFzMRAwDgYDVQQLEwdBbmRyZWFzMRAwDgYDVQQDEwdBbmRyZWFzMSEwHwYJKoZIhvcNAQkBFhJhbmRyZWFzQHVuaW5ldHQubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8/MduXpE0ZBIUqG0SMu/4ZXalD04cj4eeaecldelkXwWj3GXid2h7DjcElrsj+76K7XJa72r/o6FNqj7qUEWYE93DL3uWQ3jXh72bWPeo/Jju88Ea2xn43yWa2i82CshCzIJzjCSKN7L3aejpowgyQuwFOhlBbGBaHF0ihFVe6wEVSPvPL6OvX4/kZZqcMe4HveIpw4w2hWuX297juSZEN3XlwXpKf2zvhGaqTUinF1mgzcpUocfeYsRSIjEjJwwDsk6/WDAAumTfqLN0XDYFU2VfucZ08ovrAsh+8R7JVGuKKyz7Qn2ali84XQQHXA/Jf8ZqDW7A6rlSsjm2y9ZhAgMBAAGjgfIwge8wHQYDVR0OBBYEFH7mar1GlsEE4CQOpnty4XbiFVqxMIG/BgNVHSMEgbcwgbSAFH7mar1GlsEE4CQOpnty4XbiFVqxoYGQpIGNMIGKMQswCQYDVQQGEwJOTzEQMA4GA1UECBMHQW5kcmVhczEQMA4GA1UEBxMHQW5kcmVhczEQMA4GA1UEChMHQW5kcmVhczEQMA4GA1UECxMHQW5kcmVhczEQMA4GA1UEAxMHQW5kcmVhczEhMB8GCSqGSIb3DQEJARYSYW5kcmVhc0B1bmluZXR0Lm5vggkA46r/nGEbBS8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAEaiUcmuUiq0bhaMD8njpqJP0b6JcpjRoS0+a8Ynr9hjyOXNLEDgHZAJEjqTsGr8a++mwdk2cQwMDR2AsLpHqFHUTtd+QDPLTkR10JzGOIsSCNBpm73kO6S1oneKXDMELsZg3J0ZXIB79iWYQWpITvjdCxaToL9dw1BR86fLle9YJVdyuhhAqCtFtJ35OM3S0Gw7JEKld+LHZaLDvyJSEFSfOQBTVkb0NBKFu2TSsOqOzOIRyxH0c8Bs/IyOenB8eCgg7KYvjkPETAPig4JvazM9LilKdxLhvRcaVofQkIaw7K+Y4EdIVRTIGLOmj4Lm07pQyClYSDDtQPQiktkpZUA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://bridge.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://bridge.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Feide DiscoJuice Kalmar Showcase Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">A service that allows users to verify that Kalmar login works to norwegian services connected to Feide. This service also showcases the DiscoJuice IdP Discovery Service.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bristol-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/bristol-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 84d067ba..00000000
--- a/swamid-interfederations-2.0/bristol-shib.hosted.exlibrisgroup.com-shib.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://bristol-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "University of Bristol - Primo" Shibboleth SP for Ex Libris (UK) 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-11T14:16:51Z">
-      <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://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Bristol - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">his is an Ex Libris Primo Hosted SP on behalf of the University of Bristol</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh6gAwIBAgIJAIkWelwTQdkGMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-						BAMTJWRjMDNrZzAzNzlldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTQw
-						NTI2MDUyNjI4WhcNMjQwNTIzMDUyNjI4WjAwMS4wLAYDVQQDEyVkYzAza2cwMzc5
-						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAmLLqAX90cJhcxejFx99BYTZazaK9Zy892I1i5cOIPdyRtEZm
-						W4/Lj7aUT+U7m2W7+Go9Q4EavP9OUBFxhPI0ffNDQHzkNecVpeJugMpExkOpziet
-						UQ7Hu9wpI0fS3k0CElMCcNkpWi/q6whlDyOMJ1W8a1uXuAkYLe6f9ySRdN8OV/6W
-						qFUtFmS6yziyYFKifhwqeJMIB88Xwm+ibH/p2NsWmCQ+sH15EJ6tNS9oxAXMbywn
-						TQw5Mlg560bGkeBRBD0yS+aEZs5hTg7SMXhJoV0GLPi2jb5IgsjL5/7nWtMMdSnG
-						m6/ZbPVmt/e4jwh8H4TJWCknLQRurM+XYMGizwIDAQABo1MwUTAwBgNVHREEKTAn
-						giVkYzAza2cwMzc5ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
-						BBQWr7RBWVGCpD0Xcucrg00yG2FZqjANBgkqhkiG9w0BAQUFAAOCAQEACbsq0lFP
-						3EdK7+SkT3LmUiRUCLZPopsAcIEmLeB7f35vKltAROGpxteWO1konftz5p8fSpec
-						bXaYtUGvwOcHmxik5SRBEJpuCWFSlUkBIhBJM8HKtSlx9OMqmBL449TVyShDZGqX
-						xr/8TbzueVRtB6IY4SfLsdmXKp9MTswSC94yyLkqMvAGIeAIDlIMYV6rP5w95Y9h
-						1T41keC9ILBwLYIqz7uKmynr91siE6F2ITwZ6Sp1hpa0o1sbcFq0j+KCD64eFaOh
-						AbzbMLCKIHRvB24eIqpA5vLt1u/7cbtuHOUrMxVqlDO9UqOlqhnxRdeN1lncqUnx
-						mAb78NKYEfHMBQ==
-					</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://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bristol-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bristol - Primo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/brunelstudents.com-shibboleth.xml b/swamid-interfederations-2.0/brunelstudents.com-shibboleth.xml
deleted file mode 100644
index 25940944..00000000
--- a/swamid-interfederations-2.0/brunelstudents.com-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://brunelstudents.com/shibboleth">
-  <!--
-		This is a "Union of Brunel Students" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T16:10:32Z"/>
-  </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://brunelstudents.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://brunelstudents.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://brunelstudents.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://brunelstudents.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://brunelstudents.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://brunelstudents.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://brunelstudents.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://brunelstudents.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://brunelstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://brunelstudents.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://brunelstudents.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://brunelstudents.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://brunelstudents.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Union of Brunel Students</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://brunelstudents.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bscw.uamr.de.xml b/swamid-interfederations-2.0/bscw.uamr.de.xml
deleted file mode 100644
index 0d2d1b73..00000000
--- a/swamid-interfederations-2.0/bscw.uamr.de.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bscw.uamr.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bscw.uamr.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>bscw.uamr.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=bscw.uamr.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrDCCBJSgAwIBAgIED8LaTTANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0x
-MDAzMTkxMTE1MTBaFw0xNTAzMTgxMTE1MTBaMHgxCzAJBgNVBAYTAkRFMRwwGgYD
-VQQIExNOb3JkcmhlaW4tV2VzdGZhbGVuMQ4wDAYDVQQHEwVFc3NlbjEkMCIGA1UE
-ChMbVW5pdmVyc2l0YWV0IER1aXNidXJnLUVzc2VuMRUwEwYDVQQDEwxic2N3LnVh
-bXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc7hrbPLlsk8xF
-A1fLbM7YpO0yLR6KGyO7tNdSEu3KoKsV2f8xCKlRYPycyx7QEB15q4kCAxxogacx
-ZFWXV/6ulO+eFVAhG4PkJykEv48mzo92WSKPsG9XkuLbWTxMtTuUvJ04/yzi+9dt
-tljHAHgDDMkwh7RGCVv9r/AQDKiBKnMeDdqJPPkp29UnOLTNHNu959qUiExKtcpc
-UXueClrC3id35VLcATDQt1gfGxqS+FIlZdssPadtQWwM6bOXL0eNcxbb02N+2HaQ
-HJ0Tm4u9qGSFgwY/pIQG86CbZaacKsgm6qsH1F0RWAzxF7fILxnMvpBtw8Pnu10s
-t+2GR96/AgMBAAGjggHtMIIB6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFCijkeXAsScFRx0+
-L3gahU7zuEERMB8GA1UdIwQYMBaAFGZmvJabSE3o3bwip6Zb1ahBn5XuMCMGA1Ud
-EQQcMBqBGGJ1cmtoYXJkLndhbGRAdW5pLWR1ZS5kZTCBlwYDVR0fBIGPMIGMMESg
-QqBAhj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDBEoEKgQIY+aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgbAGCCsG
-AQUFBwEBBIGjMIGgME4GCCsGAQUFBzAChkJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTgYI
-KwYBBQUHMAKGQmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVz
-c2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-mlY8KKbsR6qQDtHfogHplnXDv733tuxUWW3ynyXyxxsDfA3smTwQZ//k/2IEPCws
-5hDche5CEVw5zfLoSm9PqlHsJe49dNyZka29U5KR2Gk2+etsYvXQN6ymK/TXgpMH
-yN/IxkCw/U33C3NQ4/iGOXuzdRia+0bY9WSulznMkWnaltgMZFdrh7odTwS1oSvL
-Cwc8qmKh6zem/Gbj9b56j6XaglrIfQ2fb3YppDCDOQsqlc+zzBmHRM1iIDxXUeow
-MohRxJR1XxYWIX8KSO8oRc434PDw5xi8S0xf49Cok3YTfKtlWdcJ20jktwlPzRPR
-fiJZCVlIJyI/zGzKQRTD9w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>bscw.uamr.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=bscw.uamr.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrDCCBJSgAwIBAgIED8LaTTANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0x
-MDAzMTkxMTE1MTBaFw0xNTAzMTgxMTE1MTBaMHgxCzAJBgNVBAYTAkRFMRwwGgYD
-VQQIExNOb3JkcmhlaW4tV2VzdGZhbGVuMQ4wDAYDVQQHEwVFc3NlbjEkMCIGA1UE
-ChMbVW5pdmVyc2l0YWV0IER1aXNidXJnLUVzc2VuMRUwEwYDVQQDEwxic2N3LnVh
-bXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc7hrbPLlsk8xF
-A1fLbM7YpO0yLR6KGyO7tNdSEu3KoKsV2f8xCKlRYPycyx7QEB15q4kCAxxogacx
-ZFWXV/6ulO+eFVAhG4PkJykEv48mzo92WSKPsG9XkuLbWTxMtTuUvJ04/yzi+9dt
-tljHAHgDDMkwh7RGCVv9r/AQDKiBKnMeDdqJPPkp29UnOLTNHNu959qUiExKtcpc
-UXueClrC3id35VLcATDQt1gfGxqS+FIlZdssPadtQWwM6bOXL0eNcxbb02N+2HaQ
-HJ0Tm4u9qGSFgwY/pIQG86CbZaacKsgm6qsH1F0RWAzxF7fILxnMvpBtw8Pnu10s
-t+2GR96/AgMBAAGjggHtMIIB6TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFCijkeXAsScFRx0+
-L3gahU7zuEERMB8GA1UdIwQYMBaAFGZmvJabSE3o3bwip6Zb1ahBn5XuMCMGA1Ud
-EQQcMBqBGGJ1cmtoYXJkLndhbGRAdW5pLWR1ZS5kZTCBlwYDVR0fBIGPMIGMMESg
-QqBAhj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDBEoEKgQIY+aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgbAGCCsG
-AQUFBwEBBIGjMIGgME4GCCsGAQUFBzAChkJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTgYI
-KwYBBQUHMAKGQmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVz
-c2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-mlY8KKbsR6qQDtHfogHplnXDv733tuxUWW3ynyXyxxsDfA3smTwQZ//k/2IEPCws
-5hDche5CEVw5zfLoSm9PqlHsJe49dNyZka29U5KR2Gk2+etsYvXQN6ymK/TXgpMH
-yN/IxkCw/U33C3NQ4/iGOXuzdRia+0bY9WSulznMkWnaltgMZFdrh7odTwS1oSvL
-Cwc8qmKh6zem/Gbj9b56j6XaglrIfQ2fb3YppDCDOQsqlc+zzBmHRM1iIDxXUeow
-MohRxJR1XxYWIX8KSO8oRc434PDw5xi8S0xf49Cok3YTfKtlWdcJ20jktwlPzRPR
-fiJZCVlIJyI/zGzKQRTD9w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bscw.uamr.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bscw.uamr.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bscw.uamr.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bscw.uamr.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bscw.uamr.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bscw.uamr.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bscw.uamr.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bscw.uamr.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bscw.uamr.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bscw.uamr.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bscw.uamr.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bscw.uamr.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bscw.uamr.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bscw.uamr.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Uni Duisburg Essen (UAMR)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Uni Duisburg Essen (UAMR)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Malte</GivenName>
-    <SurName>Küppers</SurName>
-    <EmailAddress>malte.kueppers@stud.uni-due.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Malte</GivenName>
-    <SurName>Küppers</SurName>
-    <EmailAddress>malte.kueppers@stud.uni-due.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bsp-idp-test.shibboleth.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bsp-idp-test.shibboleth.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8a7e8bf3..00000000
--- a/swamid-interfederations-2.0/bsp-idp-test.shibboleth.ox.ac.uk-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://bsp-idp-test.shibboleth.ox.ac.uk/shibboleth">
-  <!--
-		This is a "BSP-test" Shibboleth IdP for the University of Oxford. 
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-07-19T16:38: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">ox.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZzCCAk+gAwIBAgIJAM3e/P6wMOMuMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
-						BAMTIGJzcC1pZHAtdGVzdC5zaGliYm9sZXRoLm94LmFjLnVrMB4XDTE0MDcwMjA3
-						MTI1NloXDTM0MDcwMjA3MTI1NlowKzEpMCcGA1UEAxMgYnNwLWlkcC10ZXN0LnNo
-						aWJib2xldGgub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCt/2e1JENtpBwhw42LY4rGCDtc90BV3+LCKws4GUTs+OWqUcgpzk0/uDSbIOtl
-						AuWR0Sl/EPSbrHdATYOxYXIvBuYWfrBu/h91EcJEaM+ZO72ElDQgahXnTarZMWX6
-						JJKPlYgLRVg5e5L98O9BU4u2w5xcvMAlKZ0UgHpTeEBPtgdXIVTltaPFI1601S+b
-						B/fDAofXpzYa3HkmaLNJ41QA0rFXAVsek5WFKgsY79ncYkMa5eb69ysj3BLIbAPy
-						7DSKFJKMX26+TSRs/j/v2lr1TgGnAvuAkZ9BXwhkRh6jaO59W0oGWtJ2kmxAL4fy
-						MuiWxYAuVe9Q+lgMs4Au9/a3AgMBAAGjgY0wgYowHQYDVR0OBBYEFGBKWbztDye4
-						IfOgk3iFZXCIcw8HMFsGA1UdIwRUMFKAFGBKWbztDye4IfOgk3iFZXCIcw8HoS+k
-						LTArMSkwJwYDVQQDEyBic3AtaWRwLXRlc3Quc2hpYmJvbGV0aC5veC5hYy51a4IJ
-						AM3e/P6wMOMuMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADTLWycf
-						BRfbYZl3N+08fIzb+d3lA82OKXTopCv4Jxn5dE8rnql8qunq19PKymn2JvMImTQ5
-						gEd+kCxCvWnQdQSmSUhfDbNB3LgBkIw4yIbOdzIlVmzAPL7WaIqjgRyx1JmMPheH
-						iGQYoLfVIcDSrLt7mu4ssIrgzxzH/xNgLru+ZW6yuY4UdntS3OyWTssGFW3pqftv
-						6aPCyW8KB6ycsPwZGHyGFIbBmJMRFztYVlfKi4MzI7uhsv6TXVfsIxzNopTLL8CS
-						w/O6T47a6BBXJjj5BtU9t7h15TTjG/X5Sie1mIPYUjprTZhcuNyzN/LX90F1yM0G
-						TIMOueSzlXJLKyY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bsp-idp-test.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bsp-idp-test.shibboleth.ox.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://bsp-idp-test.shibboleth.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bsp-idp-test.shibboleth.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bsp-idp-test.shibboleth.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bsp-idp-test.shibboleth.ox.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">ox.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZzCCAk+gAwIBAgIJAM3e/P6wMOMuMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
-						BAMTIGJzcC1pZHAtdGVzdC5zaGliYm9sZXRoLm94LmFjLnVrMB4XDTE0MDcwMjA3
-						MTI1NloXDTM0MDcwMjA3MTI1NlowKzEpMCcGA1UEAxMgYnNwLWlkcC10ZXN0LnNo
-						aWJib2xldGgub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCt/2e1JENtpBwhw42LY4rGCDtc90BV3+LCKws4GUTs+OWqUcgpzk0/uDSbIOtl
-						AuWR0Sl/EPSbrHdATYOxYXIvBuYWfrBu/h91EcJEaM+ZO72ElDQgahXnTarZMWX6
-						JJKPlYgLRVg5e5L98O9BU4u2w5xcvMAlKZ0UgHpTeEBPtgdXIVTltaPFI1601S+b
-						B/fDAofXpzYa3HkmaLNJ41QA0rFXAVsek5WFKgsY79ncYkMa5eb69ysj3BLIbAPy
-						7DSKFJKMX26+TSRs/j/v2lr1TgGnAvuAkZ9BXwhkRh6jaO59W0oGWtJ2kmxAL4fy
-						MuiWxYAuVe9Q+lgMs4Au9/a3AgMBAAGjgY0wgYowHQYDVR0OBBYEFGBKWbztDye4
-						IfOgk3iFZXCIcw8HMFsGA1UdIwRUMFKAFGBKWbztDye4IfOgk3iFZXCIcw8HoS+k
-						LTArMSkwJwYDVQQDEyBic3AtaWRwLXRlc3Quc2hpYmJvbGV0aC5veC5hYy51a4IJ
-						AM3e/P6wMOMuMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADTLWycf
-						BRfbYZl3N+08fIzb+d3lA82OKXTopCv4Jxn5dE8rnql8qunq19PKymn2JvMImTQ5
-						gEd+kCxCvWnQdQSmSUhfDbNB3LgBkIw4yIbOdzIlVmzAPL7WaIqjgRyx1JmMPheH
-						iGQYoLfVIcDSrLt7mu4ssIrgzxzH/xNgLru+ZW6yuY4UdntS3OyWTssGFW3pqftv
-						6aPCyW8KB6ycsPwZGHyGFIbBmJMRFztYVlfKi4MzI7uhsv6TXVfsIxzNopTLL8CS
-						w/O6T47a6BBXJjj5BtU9t7h15TTjG/X5Sie1mIPYUjprTZhcuNyzN/LX90F1yM0G
-						TIMOueSzlXJLKyY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bsp-idp-test.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bsp-idp-test.shibboleth.ox.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 Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: (BSP-test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services IAM Team</GivenName>
-    <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Services IAM Team</GivenName>
-    <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bsp-idp.shibboleth.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/bsp-idp.shibboleth.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 09b7702c..00000000
--- a/swamid-interfederations-2.0/bsp-idp.shibboleth.ox.ac.uk-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://bsp-idp.shibboleth.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP ('BSP') for the University of Oxford.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">ox.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEkDCCA3igAwIBAgIJAK74tuCrn4gMMA0GCSqGSIb3DQEBBQUAMIHIMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsTEkNvbXB1dGlu
-						ZyBTZXJ2aWNlczEkMCIGA1UEAxMbYnNwLWlkcC5zaGliYm9sZXRoLm94LmFjLnVr
-						MTAwLgYJKoZIhvcNAQkBFiFlbWFpbEFkZHJlc3M9c3lzZGV2QG91Y3Mub3guYWMu
-						dWswHhcNMTIwNTE4MDg1MjMwWhcNMjIwNTE2MDg1MjMwWjCByDELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNV
-						BAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLExJDb21wdXRpbmcgU2Vy
-						dmljZXMxJDAiBgNVBAMTG2JzcC1pZHAuc2hpYmJvbGV0aC5veC5hYy51azEwMC4G
-						CSqGSIb3DQEJARYhZW1haWxBZGRyZXNzPXN5c2RldkBvdWNzLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvnBxr4sjCqHqNQuqRKlscoqV
-						n+KjKIL4oDVQY8lZpp9jbce7cLopWhAMhWXA5YwWBJTluYPkiEnzLQsWPdf4EKAG
-						PtXz9OVAjZzKq3KB/Rdi29LUjuI5Ugd39OJn1NIH2FsVG7z/te3IrHf/n7/mTmYl
-						OpPJ7XaAJgrRiNil5M2n/tmSg1rhbghR3TQAh0qtsO0h5N/b6cnRyFxVWk5Wn4U6
-						KPfYd+jVCUkOawC22bW+6Poxh6fDDm9RgCstP14MpdST7VWBidv7kc1HiuSS/DH0
-						dj3l9eqtpObDhUVHdDHTffpS32IuEdqPq5xJ80QRCmQxeRIQW3qzlAG3c4+WpwID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUhm2QdhrbYvY9WzUEmTv/iAkRq5Uw
-						HwYDVR0jBBgwFoAUhm2QdhrbYvY9WzUEmTv/iAkRq5UwDQYJKoZIhvcNAQEFBQAD
-						ggEBAIO+pz3LCPf88PSx7Mm3KbJ+EPxPbwY+nlk2IuIkxIDR4IVpdCV6uY70uR8+
-						bN7mb9mpjGsJGcyDpSncQmM3qwC45Lv6F0giJQXCH84iTPoFoLSjToxE9kYaN9tg
-						UOQiZODEuQWLGp80qHHWKYpG1/wxok3chwUW0dy8zGSm9esWwbEsInkm0cKq4MiG
-						wZ0maBagoaennxoKP9DKJp7bSePoAh/nZTCzQaQGK1JcQZsgzkHnomf7UaUFuslH
-						pDq4lDx2f/mAtxY40toa3H7Bgm5Dd/lkqpgeYI5kkOJmlFCYroKrmhG0jtOX3RMT
-						8aC6ef6hAwmREKbmNT8faiMPsss=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bsp-idp.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bsp-idp.shibboleth.ox.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://bsp-idp.shibboleth.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bsp-idp.shibboleth.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bsp-idp.shibboleth.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bsp-idp.shibboleth.ox.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">ox.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEkDCCA3igAwIBAgIJAK74tuCrn4gMMA0GCSqGSIb3DQEBBQUAMIHIMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsTEkNvbXB1dGlu
-						ZyBTZXJ2aWNlczEkMCIGA1UEAxMbYnNwLWlkcC5zaGliYm9sZXRoLm94LmFjLnVr
-						MTAwLgYJKoZIhvcNAQkBFiFlbWFpbEFkZHJlc3M9c3lzZGV2QG91Y3Mub3guYWMu
-						dWswHhcNMTIwNTE4MDg1MjMwWhcNMjIwNTE2MDg1MjMwWjCByDELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNV
-						BAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLExJDb21wdXRpbmcgU2Vy
-						dmljZXMxJDAiBgNVBAMTG2JzcC1pZHAuc2hpYmJvbGV0aC5veC5hYy51azEwMC4G
-						CSqGSIb3DQEJARYhZW1haWxBZGRyZXNzPXN5c2RldkBvdWNzLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvnBxr4sjCqHqNQuqRKlscoqV
-						n+KjKIL4oDVQY8lZpp9jbce7cLopWhAMhWXA5YwWBJTluYPkiEnzLQsWPdf4EKAG
-						PtXz9OVAjZzKq3KB/Rdi29LUjuI5Ugd39OJn1NIH2FsVG7z/te3IrHf/n7/mTmYl
-						OpPJ7XaAJgrRiNil5M2n/tmSg1rhbghR3TQAh0qtsO0h5N/b6cnRyFxVWk5Wn4U6
-						KPfYd+jVCUkOawC22bW+6Poxh6fDDm9RgCstP14MpdST7VWBidv7kc1HiuSS/DH0
-						dj3l9eqtpObDhUVHdDHTffpS32IuEdqPq5xJ80QRCmQxeRIQW3qzlAG3c4+WpwID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUhm2QdhrbYvY9WzUEmTv/iAkRq5Uw
-						HwYDVR0jBBgwFoAUhm2QdhrbYvY9WzUEmTv/iAkRq5UwDQYJKoZIhvcNAQEFBQAD
-						ggEBAIO+pz3LCPf88PSx7Mm3KbJ+EPxPbwY+nlk2IuIkxIDR4IVpdCV6uY70uR8+
-						bN7mb9mpjGsJGcyDpSncQmM3qwC45Lv6F0giJQXCH84iTPoFoLSjToxE9kYaN9tg
-						UOQiZODEuQWLGp80qHHWKYpG1/wxok3chwUW0dy8zGSm9esWwbEsInkm0cKq4MiG
-						wZ0maBagoaennxoKP9DKJp7bSePoAh/nZTCzQaQGK1JcQZsgzkHnomf7UaUFuslH
-						pDq4lDx2f/mAtxY40toa3H7Bgm5Dd/lkqpgeYI5kkOJmlFCYroKrmhG0jtOX3RMT
-						8aC6ef6hAwmREKbmNT8faiMPsss=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bsp-idp.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bsp-idp.shibboleth.ox.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 Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford (BSP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sysdev</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Help</GivenName>
-    <EmailAddress>mailto:help@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bureau.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/bureau.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 5a1714de..00000000
--- a/swamid-interfederations-2.0/bureau.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bureau.idp.knaw.nl/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-12T13:20:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">knaw.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">Bureau (KNAW)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Bureau (KNAW)</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Bureau (KNAW)</mdui:Description>
-        <mdui:Description xml:lang="en">Bureau (KNAW)</mdui:Description>
-        <mdui:Logo height="48" width="48">https://static.surfconext.nl/logos/idp/knaw.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Bureau (KNAW)</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Bureau (KNAW)</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/67a684e304b6bfffde2a662f795689cd"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Koninklijke Nederlandse Akademie van Wetenschappen (KNAW)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Koninklijke Nederlandse Akademie van Wetenschappen (KNAW)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.knaw.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/burycollege.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/burycollege.cirqahosting.com-shibboleth.xml
deleted file mode 100644
index 930ec8e2..00000000
--- a/swamid-interfederations-2.0/burycollege.cirqahosting.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://burycollege.cirqahosting.com/shibboleth">
-  <!--
-		This is a "Bury College" Shibboleth SP for IS Oxford Ltd.
-	-->
-  <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="2015-08-25T11:06:48Z">
-      <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://burycollege.cirqahosting.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHjCCAgagAwIBAgIJALPrj9FjS0A1MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHWJ1cmNvbC5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDYwMzEwNTI0
-						NloXDTI1MDUzMTEwNTI0NlowKDEmMCQGA1UEAxMdYnVyY29sLmlzb3hmb3JkLWhv
-						c3RpbmcubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9j0xz
-						rJxyP30GGHpeWsUnXzhnLOzKdLImYbFDNx+kZqn3mofBlFdkFw0LW5Cx+Xo6tOa5
-						mw+QhakUJMl+y0rAfEZKZzJFXwqVmKnV4f9GB1u98K3qdLtnhzajePJzYG5zl5DC
-						CK+VXhaTF5t7ykM0ZvnS4UgYNHJZXVShpLHQSfrAweuQMT13ViW8LubmDkxO+vJ/
-						oNVvQ3GjF8eygrI1RTODKMb4wXcviPAlLdF1iZw3E0hO/IrUzE9HwzO6777/As4g
-						Z4r9hn34VEkua+CNKQKMgz6ktYtgM3iypnroa0GNns+unNURqC2387pEDHdA0e+g
-						RUcjSzxTEOPs4mvzAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWJ1cmNvbC5pc294Zm9y
-						ZC1ob3N0aW5nLmxvY2FsMB0GA1UdDgQWBBSv1AU5y8Q0xncF9/B9EAp5pR3x4DAN
-						BgkqhkiG9w0BAQUFAAOCAQEAcbX8+2VJJc+Y+K95BGKga9J9FTPILKc1xlGCZvIs
-						KtRZS59HeZnZgCWpq8tUaFHa9MIU0fNXKgmIi9RHdxEkTSbeRoUWT/Wq0d8ilkxR
-						JIaZqB29idGd+V1BCCxNu1PoQPS+r6Ov88wI+hzuDPq0sW9XPDUWbF8IpACNorJY
-						88o0CM3FMr6IbUMjshSjGR175Rn6CmvjOPOebvZX0tmDxaCaXYaLXuoQJP+fHWBM
-						bT1MD/HkHlWP7ThL3nR0L4AR+oGjfYPkzDc+qgecERdDcfpuwFIfFJJsADjUJ0Z8
-						aBGO5t+jpqDlIbxUQ52T+eejVX6XahJcznL/Y8kCAtS1hg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://burycollege.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://burycollege.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://burycollege.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://burycollege.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://burycollege.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://burycollege.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://burycollege.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://burycollege.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://burycollege.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://burycollege.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://burycollege.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IS Oxford Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bury College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.isoxford.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lee</GivenName>
-    <SurName>Orchard</SurName>
-    <EmailAddress>mailto:lee@isoxford.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Salvesen</SurName>
-    <EmailAddress>mailto:david@isoxford.com</EmailAddress>
-  </ContactPerson>
-</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 468945ad..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://butare.ifrn.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://butare.ifrn.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://butare.ifrn.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://butare.ifrn.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://butare.ifrn.edu.br/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">ifrn.local</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://butare.ifrn.edu.br:8443/idp/profile/SAML1/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">IFRN - Instituto Federal do Rio Grande do Norte</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFRN - Instituto Federal do Rio Grande do Norte</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFRN - Instituto Federal do Rio Grande do Norte</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifrn.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifrn.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Carlos Eduardo Egito</md:SurName>
-    <md:EmailAddress>eduardo.egito@ifrn.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9da8aa00..00000000
--- a/swamid-interfederations-2.0/butare.ifrn.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://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>
-    MIIEDjCCAvYCAQAwDQYJKoZIhvcNAQEFBQAwgcwxODA2BgNVBAoTL0lGUk4gLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIE5vcnRlMQ4wDAYDVQQL
-EwVESUdUSTEoMCYGCSqGSIb3DQEJARYZZWR1YXJkby5lZ2l0b0BpZnJuLmVkdS5i
-cjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUx
-CzAJBgNVBAYTAkJSMRswGQYDVQQDExJidXRhcmUuaWZybi5lZHUuYnIwHhcNMTMx
-MTA3MTcyNzE1WhcNMTYxMTA2MTcyNzE1WjCBzDE4MDYGA1UEChMvSUZSTiAtIElu
-c3RpdHV0byBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gTm9ydGUxDjAMBgNVBAsT
-BURJR1RJMSgwJgYJKoZIhvcNAQkBFhllZHVhcmRvLmVnaXRvQGlmcm4uZWR1LmJy
-MQ4wDAYDVQQHEwVOYXRhbDEcMBoGA1UECBMTUmlvIEdyYW5kZSBkbyBOb3J0ZTEL
-MAkGA1UEBhMCQlIxGzAZBgNVBAMTEmJ1dGFyZS5pZnJuLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGkw9Q7QoZ/pbtE5BKDjrXkwJ9t
-ZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN9mzTByAOyMJ1HZLoaWRKw5ir
-jAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2PA4unF/vgPY0GCLtkVS7TKm5
-9szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yHVTedJJUOzlGRh44xyZMcmyXO
-0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0YykhImtdHzr+NJnNJUrx0FP+t
-sfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7zIgWdGliX+T+zoECAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAFPvo5i3yKfYJ/vK6tOmHZgNqfewxVmGUBwal+CP/
-7Lsk1OwLsZu6LKG9XK6LuE3hLec+kMXowBazpIIAK8hzle9gvp9q1Idnyzjmrq9V
-mqFCt3UFL9izjbcw7wpesxp/eXIVqTJBxOmLOPS16Zix7ilMWcY+SsFgt7hDL1Fs
-qPvfCMvAqAgPcbfJZohmvg78U4poNrSwEE3XrRx9bCj8EdL5+i/n0Pya5qJ+doE0
-nx7iWCTDFfYJV3DJ04Ic4+4CJdQ4RxoZkVcrxmWUNqyGTBB414bGNjnjBf98Piyh
-uWdg0VD6GwutMoTl1vGpOaQzKk+6Aqxfoajw38UQ3f3bcg==
-            </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>
-      
-MIIEDjCCAvYCAQAwDQYJKoZIhvcNAQEFBQAwgcwxODA2BgNVBAoTL0lGUk4gLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIE5vcnRlMQ4wDAYDVQQL
-EwVESUdUSTEoMCYGCSqGSIb3DQEJARYZZWR1YXJkby5lZ2l0b0BpZnJuLmVkdS5i
-cjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUx
-CzAJBgNVBAYTAkJSMRswGQYDVQQDExJidXRhcmUuaWZybi5lZHUuYnIwHhcNMTMx
-MTA3MTcyNzE1WhcNMTYxMTA2MTcyNzE1WjCBzDE4MDYGA1UEChMvSUZSTiAtIElu
-c3RpdHV0byBGZWRlcmFsIGRvIFJpbyBHcmFuZGUgZG8gTm9ydGUxDjAMBgNVBAsT
-BURJR1RJMSgwJgYJKoZIhvcNAQkBFhllZHVhcmRvLmVnaXRvQGlmcm4uZWR1LmJy
-MQ4wDAYDVQQHEwVOYXRhbDEcMBoGA1UECBMTUmlvIEdyYW5kZSBkbyBOb3J0ZTEL
-MAkGA1UEBhMCQlIxGzAZBgNVBAMTEmJ1dGFyZS5pZnJuLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM36HWGkw9Q7QoZ/pbtE5BKDjrXkwJ9t
-ZVggplOmcnG4XzvKsafA5oTyjkentzuk089/V8JN9mzTByAOyMJ1HZLoaWRKw5ir
-jAh81RrPPZyLPjC3VCU6S7VGBwpwu/scnrLkIuz2PA4unF/vgPY0GCLtkVS7TKm5
-9szt87xZQfhvKTibtji+DXqeJktm0L1DfZBWC1yHVTedJJUOzlGRh44xyZMcmyXO
-0J2sIu2BTHg0pbZkMmWubG0Gg5ieyn540znoTQ0YykhImtdHzr+NJnNJUrx0FP+t
-sfPlY+9+Jtd2hM8PwWoxyrMZ/Hrj6R3kblT4Ycu7zIgWdGliX+T+zoECAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAFPvo5i3yKfYJ/vK6tOmHZgNqfewxVmGUBwal+CP/
-7Lsk1OwLsZu6LKG9XK6LuE3hLec+kMXowBazpIIAK8hzle9gvp9q1Idnyzjmrq9V
-mqFCt3UFL9izjbcw7wpesxp/eXIVqTJBxOmLOPS16Zix7ilMWcY+SsFgt7hDL1Fs
-qPvfCMvAqAgPcbfJZohmvg78U4poNrSwEE3XrRx9bCj8EdL5+i/n0Pya5qJ+doE0
-nx7iWCTDFfYJV3DJ04Ic4+4CJdQ4RxoZkVcrxmWUNqyGTBB414bGNjnjBf98Piyh
-uWdg0VD6GwutMoTl1vGpOaQzKk+6Aqxfoajw38UQ3f3bcg==
-		    
-            </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/buttecollege.instructure.com-saml2.xml b/swamid-interfederations-2.0/buttecollege.instructure.com-saml2.xml
deleted file mode 100644
index aec70479..00000000
--- a/swamid-interfederations-2.0/buttecollege.instructure.com-saml2.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="http://buttecollege.instructure.com/saml2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">OEI - Butte College - Canvas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">`</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.canvaslms.com/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.canvaslms.com/policies/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="220" width="220" xml:lang="en">https://canvas.instructure.com/images/canvas/header_canvas_logo@2x.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE8TCCA9mgAwIBAgIJAOBms/PYWcPLMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-VQQGEwJVUzENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkx
-GTAXBgNVBAoTEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsTCk9wZXJhdGlvbnMx
-IDAeBgNVBAMTF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
-FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE1MDQxNTAxMDAwMFoXDTE3MDQyMjAx
-MDAwMFowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRVdGFoMRcwFQYDVQQHEw5T
-YWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
-CxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
-IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDckDPQGWedlVGC2Z9fn1wNFmN+0IPNi6OSE1nM
-voTWx2oZlQepaAu4zI5QqOfnV0rW2V1volpoJbu0WelH0DkGzdOEQdWJjAs3nRBf
-y0evxtpg0tK5kIvGsnN6YcD41YmkfWzvwbMf0cEq1Y0wCmymF6XzOUUE4zsi0nhP
-m2Z7WiuongDQdR01UsDN13YcpD/i1JXr3YtkNnJ/a1Kc9OXNycI8M5NVo5QQgdx/
-Q7zAmTk8p9E0ZRthdOQ/PBicWx39mNmBij5KpqCWlHu3NWdgcG8KXSv5atXU8Crd
-TRJ3aGIEN9vBYIHe8MHGCzs1QlRfJmXFMkeUSOTnJJx78rMDAgMBAAGjggEUMIIB
-EDAdBgNVHQ4EFgQUo0WWVlJ1SxZOs11L85ZAuZGyuzEwgeAGA1UdIwSB2DCB1YAU
-o0WWVlJ1SxZOs11L85ZAuZGyuzGhgbGkga4wgasxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIEwRVdGFoMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5z
-dHJ1Y3R1cmUsIEluYzETMBEGA1UECxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2Fu
-dmFzIFNBTUwgQ2VydGlmaWNhdGUxIjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVj
-dHVyZS5jb22CCQDgZrPz2FnDyzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
-A4IBAQBV3EmmnzYqYQ5fXNZymG2WaspEW0NeFMhDXa3p3AMIQJbnnU14lR7bqIvf
-/bLW1YE0fw1kSzsw8VrkQp7k1U+kaYA3i5/FQBy2WtqUCVq2GXZA2gs5YD4nvJB/
-F57E//0kEhbATZH9+wJqDkqyIgsrSIlJjiXDth1BppGK8weboPtr9sWV24Ui0+ls
-w16XTsGlnRRO19g+gXKOZp5ApXkDrB+HwZQvZxiCuSgvJlcBzMdxVvWSL+vPtg8Y
-shIKzobIhaQ2MzXHLcxrDhW10YFPwDXh8Tfn5iU9ONsaJivuvVhtDYZD1ZzSoPpm
-q4vYqxxY/6rFJhrCtnlLepSaxlXM
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://butte.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://butte.test.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://butte.beta.instructure.com/login/saml/logout"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://butte.instructure.com/saml_consume" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://butte.instructure.com/login/saml" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://buttecollege.instructure.com/saml_consume" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://buttecollege.instructure.com/login/saml" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://buttecollege.beta.instructure.com/saml_consume" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://buttecollege.beta.instructure.com/login/saml" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://buttecollege.test.instructure.com/saml_consume" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://buttecollege.test.instructure.com/login/saml" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://butte.beta.instructure.com/saml_consume" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://butte.beta.instructure.com/login/saml" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://butte.test.instructure.com/saml_consume" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://butte.test.instructure.com/login/saml" index="12"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">OEI - Butte College - Canvas</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">`</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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Instructure, Inc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Instructure, Inc</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.instructure.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bwescitts.uni-tuebingen.de.xml b/swamid-interfederations-2.0/bwescitts.uni-tuebingen.de.xml
deleted file mode 100644
index 13f811a3..00000000
--- a/swamid-interfederations-2.0/bwescitts.uni-tuebingen.de.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bwescitts.uni-tuebingen.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://bwescitts.uni-tuebingen.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>bwescitts.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=hpcmaster@uni-tuebingen.de,CN=bwescitts.uni-tuebingen.de,OU=SSL,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlDCCBHygAwIBAgIED8FjUzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMTAwMzE4MDgzNTE1WhcNMTUwMzE3MDgzNTE1WjCBtTEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
-BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEMMAoGA1UECxMD
-U1NMMSMwIQYDVQQDExpid2VzY2l0dHMudW5pLXR1ZWJpbmdlbi5kZTEpMCcGCSqG
-SIb3DQEJARYaaHBjbWFzdGVyQHVuaS10dWViaW5nZW4uZGUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCtkZGQr4zWn6yZLwXADXQuhXOIFiKdIBMaIZS8
-jhWYfQ5YJ4u3TrSIVCqgtSI+Se8O5Vcktm7tzKvUVuxtsU90IikFJjGAbOstwhgq
-5LUBsP32zX6oTOV1+5g+ir1goNpMyLfZlp5i96kDhbDG/fTXsi9UG5r4doShbC7w
-ggj/3vwpp6agYo2GDf4txnYX/Ay9cW/QYRTvrIkYkUnGRKMxuGdBnPa41aKslKcl
-lg6DJda12VEb19hTsYMR3+o44SubP+ZFS6lBXLkCM2BqN2eWnk6cMvkDYoLjmR4a
-1z182QFwj2kaSMakIawP95CsZP1y4Ea2e9UGNXIbH5fBSRYTAgMBAAGjggHnMIIB
-4zAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFMkk0UyyjuC6UU74BRcHFCDD3iCaMB8GA1UdIwQY
-MBaAFLDBu2g1f+LWQZwaca/g/EE0zcOoMCUGA1UdEQQeMByBGmhwY21hc3RlckB1
-bmktdHVlYmluZ2VuLmRlMIGTBgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNy
-bDBCoECgPoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1j
-YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEF
-BQcwAoZAaHR0cDovL2NkcDEucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9w
-dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAppJJUoG17Dm4H1F5Z0f7Y28aE+NB/HRH
-TI4qAcHVZMOFTCSYLqUeYnvVEp/MtYv72XQzN2mx1kDOWweK+zbg5VkxXKXosQAQ
-X91FYgKI4oRWkbxY3YuGFszK0lHgW37Tjoe+PurI1pw/bwkDqeEqn7+23v+etGkw
-3kUxI6tP/tWI3M4bsqHNrwFbHX7R6vuiSPNbCx5rpV55hYTccifqhQsAZ30cQHJ6
-sXXqEoBe3Rpbg6xe7UbfV6dl64Hj84Fey6JuRBNFjNHukBcgXEpPAOz1ecGc52uf
-VZf15xEXQ/2afQt1WBD7zKs7Lj0+QD+M4zxIWRXLUoaqnvmiDtYsNg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>bwescitts.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=hpcmaster@uni-tuebingen.de,CN=bwescitts.uni-tuebingen.de,OU=SSL,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlDCCBHygAwIBAgIED8FjUzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMTAwMzE4MDgzNTE1WhcNMTUwMzE3MDgzNTE1WjCBtTEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
-BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEMMAoGA1UECxMD
-U1NMMSMwIQYDVQQDExpid2VzY2l0dHMudW5pLXR1ZWJpbmdlbi5kZTEpMCcGCSqG
-SIb3DQEJARYaaHBjbWFzdGVyQHVuaS10dWViaW5nZW4uZGUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCtkZGQr4zWn6yZLwXADXQuhXOIFiKdIBMaIZS8
-jhWYfQ5YJ4u3TrSIVCqgtSI+Se8O5Vcktm7tzKvUVuxtsU90IikFJjGAbOstwhgq
-5LUBsP32zX6oTOV1+5g+ir1goNpMyLfZlp5i96kDhbDG/fTXsi9UG5r4doShbC7w
-ggj/3vwpp6agYo2GDf4txnYX/Ay9cW/QYRTvrIkYkUnGRKMxuGdBnPa41aKslKcl
-lg6DJda12VEb19hTsYMR3+o44SubP+ZFS6lBXLkCM2BqN2eWnk6cMvkDYoLjmR4a
-1z182QFwj2kaSMakIawP95CsZP1y4Ea2e9UGNXIbH5fBSRYTAgMBAAGjggHnMIIB
-4zAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFMkk0UyyjuC6UU74BRcHFCDD3iCaMB8GA1UdIwQY
-MBaAFLDBu2g1f+LWQZwaca/g/EE0zcOoMCUGA1UdEQQeMByBGmhwY21hc3RlckB1
-bmktdHVlYmluZ2VuLmRlMIGTBgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNy
-bDBCoECgPoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1j
-YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEF
-BQcwAoZAaHR0cDovL2NkcDEucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9w
-dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAppJJUoG17Dm4H1F5Z0f7Y28aE+NB/HRH
-TI4qAcHVZMOFTCSYLqUeYnvVEp/MtYv72XQzN2mx1kDOWweK+zbg5VkxXKXosQAQ
-X91FYgKI4oRWkbxY3YuGFszK0lHgW37Tjoe+PurI1pw/bwkDqeEqn7+23v+etGkw
-3kUxI6tP/tWI3M4bsqHNrwFbHX7R6vuiSPNbCx5rpV55hYTccifqhQsAZ30cQHJ6
-sXXqEoBe3Rpbg6xe7UbfV6dl64Hj84Fey6JuRBNFjNHukBcgXEpPAOz1ecGc52uf
-VZf15xEXQ/2afQt1WBD7zKs7Lj0+QD+M4zxIWRXLUoaqnvmiDtYsNg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bwescitts.uni-tuebingen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bwescitts.uni-tuebingen.de/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">bwescitts</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">BW-eSci(T)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.bwescit.uni-tuebingen.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ulrich</GivenName>
-    <SurName>Hahn</SurName>
-    <EmailAddress>ulrich.hahn@uni-tuebingen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 8cf69a60..00000000
--- a/swamid-interfederations-2.0/bwidpsrv01.bridgwater.ac.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://bwidpsrv01.bridgwater.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Bridgwater College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-10T08:33:11Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">bridgwater.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEhDCCA2ygAwIBAgIRAMLq8DxqQ9VM4MxH2N6y4W0wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MDkwMDAwMDBaFw0xNjA0MDgyMzU5NTlaMEkxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbYndpZHBzMTIw
-						MS5icmlkZ3dhdGVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEA0vlQR95+UaFwqN9If+FF/DU6lCK2B3IMNchzTjKYy+JjlA1HvOHRk3YvbqZZ
-						HYER7PGKedRiSLXp84T3+j1LJt0NsCsusT2HqJUOMtmA4TIJykbUCszM1+AhdlrM
-						EvZa64Sex4YHU/5pbhJM56Wvv407Zu8MadScmFI/wTUSbXFivXQ3Bo8oBS3noMGM
-						Vm5zWZo25rhdz9TKqIiqH8zIIrNoSDT/euxWFQHC+SaL63hvClgGKTskQPHtawsZ
-						eVwKvvK/3VA2kvp32cSyrakYQMSMUaDj/WJUL+hyhRAtVvHeF3cqiKj1260vbW26
-						1WGm1lm4Y2m4QTGnzvi/1TkO3wIDAQABo4IBeDCCAXQwHwYDVR0jBBgwFoAUDL2T
-						aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB33fJXVzgHhXKe+YK6Bry+6aYIV
-						MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-						BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
-						ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-						UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-						Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-						hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtid2lkcHMx
-						MjAxLmJyaWRnd2F0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAL7LFjSMYEy9
-						ZE++GoD34F7WvVSqKoHBKtAqemCe4xFzTCzskZhLkOY6SXnJJtbq5/DHpd2qL22g
-						wnhNCJtzTTzZSuzNrFzOeWhp1m+bJH/8Xcjl/5Cf/Eo4BIfeSrQuJOPSdxMMWG6A
-						tLzewEIs6Ibb+b8sUy7j8BA9ky+skXRQL2SlM3ioMDYIiK8Jckk1OKd1U35KQ++i
-						VKdye05mxWSD5Mknta9K1c8biDUf2BqPgy8+QsE2AvfY8+Nov3+bJq6ksSuwAXb6
-						nGnCuRnmVxN86RptKz5oaKroizlEAlQY7CaJ0vzcP9nqMA9B3A5JuUeIgKYEjEjA
-						+4L3YUYYg5I=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bwidps1201.bridgwater.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://bwidps1201.bridgwater.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bwidps1201.bridgwater.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bwidps1201.bridgwater.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bwidps1201.bridgwater.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">bridgwater.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEhDCCA2ygAwIBAgIRAMLq8DxqQ9VM4MxH2N6y4W0wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MDkwMDAwMDBaFw0xNjA0MDgyMzU5NTlaMEkxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbYndpZHBzMTIw
-						MS5icmlkZ3dhdGVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEA0vlQR95+UaFwqN9If+FF/DU6lCK2B3IMNchzTjKYy+JjlA1HvOHRk3YvbqZZ
-						HYER7PGKedRiSLXp84T3+j1LJt0NsCsusT2HqJUOMtmA4TIJykbUCszM1+AhdlrM
-						EvZa64Sex4YHU/5pbhJM56Wvv407Zu8MadScmFI/wTUSbXFivXQ3Bo8oBS3noMGM
-						Vm5zWZo25rhdz9TKqIiqH8zIIrNoSDT/euxWFQHC+SaL63hvClgGKTskQPHtawsZ
-						eVwKvvK/3VA2kvp32cSyrakYQMSMUaDj/WJUL+hyhRAtVvHeF3cqiKj1260vbW26
-						1WGm1lm4Y2m4QTGnzvi/1TkO3wIDAQABo4IBeDCCAXQwHwYDVR0jBBgwFoAUDL2T
-						aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB33fJXVzgHhXKe+YK6Bry+6aYIV
-						MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-						BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
-						ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-						UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-						Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-						hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtid2lkcHMx
-						MjAxLmJyaWRnd2F0ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAL7LFjSMYEy9
-						ZE++GoD34F7WvVSqKoHBKtAqemCe4xFzTCzskZhLkOY6SXnJJtbq5/DHpd2qL22g
-						wnhNCJtzTTzZSuzNrFzOeWhp1m+bJH/8Xcjl/5Cf/Eo4BIfeSrQuJOPSdxMMWG6A
-						tLzewEIs6Ibb+b8sUy7j8BA9ky+skXRQL2SlM3ioMDYIiK8Jckk1OKd1U35KQ++i
-						VKdye05mxWSD5Mknta9K1c8biDUf2BqPgy8+QsE2AvfY8+Nov3+bJq6ksSuwAXb6
-						nGnCuRnmVxN86RptKz5oaKroizlEAlQY7CaJ0vzcP9nqMA9B3A5JuUeIgKYEjEjA
-						+4L3YUYYg5I=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://bwidps1201.bridgwater.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bwidps1201.bridgwater.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">Bridgwater College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bridgwater College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bridgwater.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Foster</SurName>
-    <EmailAddress>mailto:fosterd@bridgwater.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Foster</SurName>
-    <EmailAddress>mailto:fosterd@bridgwater.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/c.yz.yamagata-u.ac.jp-shibboleth-sp.xml b/swamid-interfederations-2.0/c.yz.yamagata-u.ac.jp-shibboleth-sp.xml
deleted file mode 100644
index 63749714..00000000
--- a/swamid-interfederations-2.0/c.yz.yamagata-u.ac.jp-shibboleth-sp.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://c.yz.yamagata-u.ac.jp/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.gakunin.jp" registrationInstant="2010-06-21T00: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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md: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://c.yz.yamagata-u.ac.jp/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Database Amenity Laboratory of Virtual Research Institute, Yamagata University</mdui:DisplayName>
-        <mdui:Description xml:lang="ja">科学技術の学術情報共有のための双方向コミュニケーションサービス</mdui:Description>
-        <mdui:Logo height="31" width="88">https://a.yamagata-u.ac.jp/amenity/jpg/youzan_banner8831.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="ja">https://a.yamagata-u.ac.jp/amenity/menu/shibbolethmenu.aspx</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE/zCCA+egAwIBAgIIMLbuBJa4k+gwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
-BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
-dHV0ZSBvZiBJbmZvcm1hdGljczEgMB4GA1UEAxMXTklJIE9wZW4gRG9tYWluIENB
-IC0gRzQwHhcNMTUwNjI2MTE1MjA1WhcNMTcwNzI2MTE1MjA1WjCBkjELMAkGA1UE
-BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxHDAaBgNVBAoTE1lhbWFnYXRhIFVuaXZl
-cnNpdHkxMzAxBgNVBAsTKkdyYWR1YXRlIFNjaG9vbCBvZiBTY2llbmNlIGFuZCBF
-bmdpbmVlcmluZzEeMBwGA1UEAxMVYy55ei55YW1hZ2F0YS11LmFjLmpwMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAYAAne6u5CO2buLsDjIY23w0sd+
-CmnjApy+W6ZckaHQan0VNRCNGstQQEqeHJpIG67DI7q7vPnlESqLIzcflwNsIht8
-5YQlzBKojEVo9zMcz/vmJKlZT/fonJhj7ONiGUtPDdHNOSbI26/+qWJbERTVCYMH
-TfFOQDeHTeMbqA0MkK/kIMkp2HyiuXHmfODV9KI6SuNmvfOXha1/77aF3HPpgr3x
-FxD4kvb/Woqns3eLy66+q9kgLs5Cc+RdeRFJjIVpQRt1WElVTe2+NnX7DMCzHDDy
-8JyWoKUo45XPnW7EWdUTTBbhX4Qnfb52JU50uMc9M0XBJqbJINSAG/OPVQIDAQAB
-o4IBezCCAXcwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQY
-MBaAFBkLbzkfMQM0X+TSQB835o3nYjl8MEoGA1UdHwRDMEEwP6A9oDuGOWh0dHA6
-Ly9yZXBvMS5zZWNvbXRydXN0Lm5ldC9zcHBjYS9uaWkvb2RjYTMvZnVsbGNybGc0
-LmNybDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0OBBYEFE8jKb6jbyN9P8NhmBxP7OJD
-CqmVMFoGA1UdIARTMFEwTwYMKwYBBAGB/AgDAgEBMD8wPQYIKwYBBQUHAgEWMWh0
-dHBzOi8vcmVwbzEuc2Vjb210cnVzdC5uZXQvc3BjcHAvY3BzL2luZGV4Lmh0bWww
-PAYIKwYBBQUHAQEEMDAuMCwGCCsGAQUFBzABhiBodHRwOi8vbmlpZzQub2NzcC5z
-ZWNvbXRydXN0Lm5ldDAgBgNVHREEGTAXghVjLnl6LnlhbWFnYXRhLXUuYWMuanAw
-DQYJKoZIhvcNAQELBQADggEBAHUFyHUnBJzkH50yZ9EmZ4ZWCmtyAO0TYM+Tods4
-j5lYP3wjusX55AwatVubnmLgXzvG64PTLMJNhm89tyh1zVhvzb6IguEIjjKlHepg
-yRIpS0TnNzdmdz1WB3ZcNVa+I3QBslApb2Ar5mtqXBumKV7Dr/YBSRgtclfHCK1O
-OgltILmP8cKGwNC36e7NWcqvCdeCL5tSE5A3/j5JltqUMqHxd70XwnQoOcs50p+Q
-sSZfNqJriE0uwFipMv3u1OytFGr+guLQxz7yk1F2hdad8idH/lKbQMKX7IXWcSaY
-rdoKB+QdOSwBBEq7tKdGK4syHTCTtwxDQ23w2l+3yJx4Osc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE4jCCA8qgAwIBAgIIfCMzoF9ue+4wDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UE
-BhMCSlAxETAPBgNVBAcTCEFjYWRlbWUyMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0
-aXR1dGUgb2YgSW5mb3JtYXRpY3MxDTALBgNVBAsTBFVQS0kxIDAeBgNVBAsTF05J
-SSBPcGVuIERvbWFpbiBDQSAtIEcyMB4XDTEzMTAwMzA4NTMwOVoXDTE1MTEwMjA5
-MDMwOVowgZAxCzAJBgNVBAYTAkpQMREwDwYDVQQHEwhBY2FkZW1lMjEcMBoGA1UE
-ChMTWWFtYWdhdGEgVW5pdmVyc2l0eTEwMC4GA1UECxMnTmV0d29ya2luZyBhbmQg
-Q29tcHV0aW5nIFNlcnZpY2UgQ2VudGVyMR4wHAYDVQQDExVjLnl6LnlhbWFnYXRh
-LXUuYWMuanAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC53hi5ZLsf
-w7TtCOZ/VmjjF+QlbbJw9/m79AKafPq5pgp/1+rdpouGVG9eqwsBk8TMY+0mN7e8
-9jrgeoOI2Lq1G2S9Q+WOyrr3QVrnFLEeMr/nhYKFzTGh18SsvvL1Rn4GxELPHFpm
-xyK5L3VFgDMQxXN+eNyAt9k/jsn/ugyJrMWAIwPZ3gN45KP1FzcAV5wCNNUK1vAw
-f91V+WzzuotlMUexXiVh+BPI6trkr7d1qAGHhQ3pOCE5akkWQ7qea4cfDHZDAXCK
-5+lajN2IsZK6p1mHxKUBw41To9RVJFIfptpBa+NMiK/wRNHVdQNur5EWojW1RgPo
-uv+3iWeOf8fNAgMBAAGjggFQMIIBTDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwHQYDVR0OBBYEFDoI009Wwrb56X0V/UCYX4Li65gMMB8GA1Ud
-IwQYMBaAFHsKB/cYyowO1tq8UIBsLEcC0Q37MCAGA1UdEQQZMBeCFWMueXoueWFt
-YWdhdGEtdS5hYy5qcDBmBgNVHSAEXzBdME0GCiqDCIycHgECAgEwPzA9BggrBgEF
-BQcCARYxaHR0cHM6Ly9yZXBvMS5zZWNvbXRydXN0Lm5ldC9zcGNwcC9jcHMvaW5k
-ZXguaHRtbDAMBgoqgwiMmxtkhwUBMEgGA1UdHwRBMD8wPaA7oDmGN2h0dHA6Ly9y
-ZXBvMS5zZWNvbXRydXN0Lm5ldC9zcHBjYS9uaWkvb2RjYTIvZnVsbGNybC5jcmww
-EQYJYIZIAYb4QgEBBAQDAgZAMA0GCSqGSIb3DQEBBQUAA4IBAQBcEuFzX4c1vnJw
-B0Y+uN7gr0EO/yFG2cnzEh6EhwAWTrDdF2uDY58HDKbRR0GGqojATgZvtXkE8jn+
-5REAlF0cu+qa5lXTbxYb2ArMjQHY/qTOBnO6/b/lo43+M3x3OXoc/2mV1zHBrh8c
-/NPWl6girCzKqTUd1JJUvjM/VPic8abmzOxIhWLa444jWgFWkA+EqQkJpe9p8r9M
-0h+lJYRn/zZsWA2AbYF0ppkixzk3hHbUwZuuTEZzkAebZh2ZPXZnS0CFfr3VrZbr
-s33kSvCLr3uJ6cetUI0He33NAju0L76lTrfm8lbstwvfvMaruo7tntGmBGL2WRrM
-ZH4U1IHm</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://c.yz.yamagata-u.ac.jp/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://c.yz.yamagata-u.ac.jp/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://c.yz.yamagata-u.ac.jp/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://c.yz.yamagata-u.ac.jp/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://c.yz.yamagata-u.ac.jp/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="en">Database Amenity Laboratory of Virtual Research Institute, Yamagata University</md:ServiceName>
-      <md:ServiceDescription xml:lang="ja">科学技術の学術情報共有のための双方向コミュニケーションサービス</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="organizationName" Name="urn:oid:2.5.4.10" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Yamagata University</md:OrganizationName>
-    <md:OrganizationName xml:lang="ja">山形大学</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Database Amenity Laboratory of Virtual Research Institute, Yamagata University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://a.yamagata-u.ac.jp/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tomohiro</md:GivenName>
-    <md:SurName>Ito</md:SurName>
-    <md:EmailAddress>mailto:virtual-amenity@yahoogroups.jp</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 5a4736cb..00000000
--- a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://cafe-gateway.ifce.edu.br/idp/shibboleth">
-  <md: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>
-  </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">ifce.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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxIzAhBgNVBAoTGklOU1RJVFVU
-TyBGRURFUkFMIERPIENFQVJBMQ0wCwYDVQQLEwRJRkNFMSIwIAYJKoZIhvcNAQkB
-FhNzdXBvcnRlQGlmY2UuZWR1LmJyMRIwEAYDVQQHEwlGb3J0YWxlemExDjAMBgNV
-BAgTBUNlYXJhMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYY2FmZS1nYXRld2F5Lmlm
-Y2UuZWR1LmJyMB4XDTE1MDcyNzE4MDA1N1oXDTE4MDcyNjE4MDA1N1owgawxIzAh
-BgNVBAoTGklOU1RJVFVUTyBGRURFUkFMIERPIENFQVJBMQ0wCwYDVQQLEwRJRkNF
-MSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlQGlmY2UuZWR1LmJyMRIwEAYDVQQHEwlG
-b3J0YWxlemExDjAMBgNVBAgTBUNlYXJhMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMY
-Y2FmZS1nYXRld2F5LmlmY2UuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAwbQCV74T4dzotdQhgUDJ7HKk4ax7RkCIe/wDWbZKiJWk/8C7FmMd
-5ny2BgHaD3ARXuwFW1HNxY+l8OcwSfBXTJxkurW53zlqdFRYcJeCqOAE4k8LlI1+
-6v1v5z7Prxyyi03ruX/gqFOFWVfVsNIqyBv2wHOUd3GWaM+o+3ic9Abd/d6D4D7N
-VWhNtyINH4wzRpqjDDSgWymwHGxI7ObBM7zLlJaHRm0M3nT8oh5mp2YtH9s2DRUg
-eJ7IqCC7R1/vnzemh/CGr+SHDzmRrJFY5lGUrYM+oziWRZgVr2HCLtKNWIa17iIU
-GblDJT1E7G2vUGtGu5WHWC9GJDbUkSpiHQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCr74KCtDeIeMqWHLlky2SJOsFWp5GYsv2MTN985m+6C9drVN0MKh7vmJE0WXOE
-ofIVJhiKOnA6cJ2nnMRtkYllHnfD5HdMpe3ImZ6kL7Phw9I6jcVjY/dIiL2txG7S
-NwbZWVpqu/bTQIkxiFB3qAujuPfeT6NaXQ6mNv0PmnC/76raZkr9MxpPi24z1i7Q
-GDbGrk0297/Kq6u+JoYV+Sy8OYi9P23ibg/jV+ACkfy7K4xDQZ76gg0bWvTK4sFj
-s9aiqLOUHREjOXpsvEa/B6CxUvNCSZcQO5p+tkwnSHPvcmxEDjZV1rmaKCJsC/aA
-vcq7vVYrtEXcJLkmBCQuQvhm
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe-gateway.ifce.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe-gateway.ifce.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe-gateway.ifce.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe-gateway.ifce.edu.br/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">ifce.edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDzjCCArYCAQAwDQYJKoZIhvcNAQEFBQAwgawxIzAhBgNVBAoTGklOU1RJVFVU
-TyBGRURFUkFMIERPIENFQVJBMQ0wCwYDVQQLEwRJRkNFMSIwIAYJKoZIhvcNAQkB
-FhNzdXBvcnRlQGlmY2UuZWR1LmJyMRIwEAYDVQQHEwlGb3J0YWxlemExDjAMBgNV
-BAgTBUNlYXJhMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMYY2FmZS1nYXRld2F5Lmlm
-Y2UuZWR1LmJyMB4XDTE1MDcyNzE4MDA1N1oXDTE4MDcyNjE4MDA1N1owgawxIzAh
-BgNVBAoTGklOU1RJVFVUTyBGRURFUkFMIERPIENFQVJBMQ0wCwYDVQQLEwRJRkNF
-MSIwIAYJKoZIhvcNAQkBFhNzdXBvcnRlQGlmY2UuZWR1LmJyMRIwEAYDVQQHEwlG
-b3J0YWxlemExDjAMBgNVBAgTBUNlYXJhMQswCQYDVQQGEwJCUjEhMB8GA1UEAxMY
-Y2FmZS1nYXRld2F5LmlmY2UuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAwbQCV74T4dzotdQhgUDJ7HKk4ax7RkCIe/wDWbZKiJWk/8C7FmMd
-5ny2BgHaD3ARXuwFW1HNxY+l8OcwSfBXTJxkurW53zlqdFRYcJeCqOAE4k8LlI1+
-6v1v5z7Prxyyi03ruX/gqFOFWVfVsNIqyBv2wHOUd3GWaM+o+3ic9Abd/d6D4D7N
-VWhNtyINH4wzRpqjDDSgWymwHGxI7ObBM7zLlJaHRm0M3nT8oh5mp2YtH9s2DRUg
-eJ7IqCC7R1/vnzemh/CGr+SHDzmRrJFY5lGUrYM+oziWRZgVr2HCLtKNWIa17iIU
-GblDJT1E7G2vUGtGu5WHWC9GJDbUkSpiHQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCr74KCtDeIeMqWHLlky2SJOsFWp5GYsv2MTN985m+6C9drVN0MKh7vmJE0WXOE
-ofIVJhiKOnA6cJ2nnMRtkYllHnfD5HdMpe3ImZ6kL7Phw9I6jcVjY/dIiL2txG7S
-NwbZWVpqu/bTQIkxiFB3qAujuPfeT6NaXQ6mNv0PmnC/76raZkr9MxpPi24z1i7Q
-GDbGrk0297/Kq6u+JoYV+Sy8OYi9P23ibg/jV+ACkfy7K4xDQZ76gg0bWvTK4sFj
-s9aiqLOUHREjOXpsvEa/B6CxUvNCSZcQO5p+tkwnSHPvcmxEDjZV1rmaKCJsC/aA
-vcq7vVYrtEXcJLkmBCQuQvhm
-                
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-gateway.ifce.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md: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"/>
-    <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">IFCE - Instituto Federal de Educacao do Ceara</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFCE - Instituto Federal de Educacao do Ceara</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFCE - Instituto Federal de Educacao do Ceara</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifce.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifce.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jessyca</md:SurName>
-    <md:EmailAddress>ijessyca@ifce.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6b1153f2..00000000
--- a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.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://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">www.ifce.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ifce.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNjA0BgNVBAoTLUlGQ0UgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkZSBFZHVjYWNhbyBkbyBDZWFyYTENMAsGA1UECxME
-REdUSTEiMCAGCSqGSIb3DQEJARYTamVzc3ljYUBpZmNlLmVkdS5icjESMBAGA1UE
-BxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxITAfBgNV
-BAMTGGNhZmUtZ2F0ZXdheS5pZmNlLmVkdS5icjAeFw0xNDAxMjMyMDA0MzlaFw0x
-NzAxMjIyMDA0MzlaMIG/MTYwNAYDVQQKEy1JRkNFIC0gSW5zdGl0dXRvIEZlZGVy
-YWwgZGUgRWR1Y2FjYW8gZG8gQ2VhcmExDTALBgNVBAsTBERHVEkxIjAgBgkqhkiG
-9w0BCQEWE2plc3N5Y2FAaWZjZS5lZHUuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEO
-MAwGA1UECBMFQ2VhcmExCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhjYWZlLWdhdGV3
-YXkuaWZjZS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB
-tAJXvhPh3Oi11CGBQMnscqThrHtGQIh7/ANZtkqIlaT/wLsWYx3mfLYGAdoPcBFe
-7AVbUc3Fj6Xw5zBJ8FdMnGS6tbnfOWp0VFhwl4Ko4ATiTwuUjX7q/W/nPs+vHLKL
-Teu5f+CoU4VZV9Ww0irIG/bAc5R3cZZoz6j7eJz0Bt393oPgPs1VaE23Ig0fjDNG
-mqMMNKBbKbAcbEjs5sEzvMuUlodGbQzedPyiHmanZi0f2zYNFSB4nsioILtHX++f
-N6aH8Iav5IcPOZGskVjmUZStgz6jOJZFmBWvYcIu0o1YhrXuIhQZuUMlPUTsba9Q
-a0a7lYdYL0YkNtSRKmIdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACgYiNijWiwQ
-ERL8KFRdSX3E2TqOKiXTU+qI7USP3YFcaXVmZzdthcryjjWzN/htXvStd4PYkheD
-697m50ZD47zLfi5ijs0JvQ3Ex6eMGQceD5DKwLGnPDKGlbBE2JPcTpWPvCoxWdJD
-gsSFYg3NBK+pLB41G6+cRqNlzOCyQ0oojUUMxhHqotUzhNOxEtmOsh77Ww0k7hP6
-3g2gY7kKFi48aMxrr4ia10SCt9l9gzh77QkQFbkwylBZgMuWYZcgigjkAhgJ1fp2
-r0dRVLezC3qbn9ACKAlN0GWXlOUWx7L7V4ybu2wj61pYQ7s8AcjKl2NR80tpuBxY
-YyQuuTeZTwk=
-            </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>
-      
-MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNjA0BgNVBAoTLUlGQ0UgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkZSBFZHVjYWNhbyBkbyBDZWFyYTENMAsGA1UECxME
-REdUSTEiMCAGCSqGSIb3DQEJARYTamVzc3ljYUBpZmNlLmVkdS5icjESMBAGA1UE
-BxMJRm9ydGFsZXphMQ4wDAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxITAfBgNV
-BAMTGGNhZmUtZ2F0ZXdheS5pZmNlLmVkdS5icjAeFw0xNDAxMjMyMDA0MzlaFw0x
-NzAxMjIyMDA0MzlaMIG/MTYwNAYDVQQKEy1JRkNFIC0gSW5zdGl0dXRvIEZlZGVy
-YWwgZGUgRWR1Y2FjYW8gZG8gQ2VhcmExDTALBgNVBAsTBERHVEkxIjAgBgkqhkiG
-9w0BCQEWE2plc3N5Y2FAaWZjZS5lZHUuYnIxEjAQBgNVBAcTCUZvcnRhbGV6YTEO
-MAwGA1UECBMFQ2VhcmExCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhjYWZlLWdhdGV3
-YXkuaWZjZS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB
-tAJXvhPh3Oi11CGBQMnscqThrHtGQIh7/ANZtkqIlaT/wLsWYx3mfLYGAdoPcBFe
-7AVbUc3Fj6Xw5zBJ8FdMnGS6tbnfOWp0VFhwl4Ko4ATiTwuUjX7q/W/nPs+vHLKL
-Teu5f+CoU4VZV9Ww0irIG/bAc5R3cZZoz6j7eJz0Bt393oPgPs1VaE23Ig0fjDNG
-mqMMNKBbKbAcbEjs5sEzvMuUlodGbQzedPyiHmanZi0f2zYNFSB4nsioILtHX++f
-N6aH8Iav5IcPOZGskVjmUZStgz6jOJZFmBWvYcIu0o1YhrXuIhQZuUMlPUTsba9Q
-a0a7lYdYL0YkNtSRKmIdAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACgYiNijWiwQ
-ERL8KFRdSX3E2TqOKiXTU+qI7USP3YFcaXVmZzdthcryjjWzN/htXvStd4PYkheD
-697m50ZD47zLfi5ijs0JvQ3Ex6eMGQceD5DKwLGnPDKGlbBE2JPcTpWPvCoxWdJD
-gsSFYg3NBK+pLB41G6+cRqNlzOCyQ0oojUUMxhHqotUzhNOxEtmOsh77Ww0k7hP6
-3g2gY7kKFi48aMxrr4ia10SCt9l9gzh77QkQFbkwylBZgMuWYZcgigjkAhgJ1fp2
-r0dRVLezC3qbn9ACKAlN0GWXlOUWx7L7V4ybu2wj61pYQ7s8AcjKl2NR80tpuBxY
-YyQuuTeZTwk=
-
-                    
-            </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">www.ifce.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">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 a25c44ff..00000000
--- a/swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,128 +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://cafe-idp.ufc.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIFVjCCBD6gAwIBAgISESGwx2jv72u5M30bUGytllkYMA0GCSqGSIb3DQEBCwUA
-MIGpMQswCQYDVQQGEwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xFzAVBgNV
-BAcTDlJpbyBkZSBKYW5laXJvMSQwIgYDVQQLExtHZXJlbmNpYSBkZSBTZXJ2aWNv
-cyAoR1NlcikxMTAvBgNVBAoTKFJlZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVz
-cXVpc2EgLSBSTlAxDzANBgNVBAMTBklDUEVkdTAeFw0xNTAxMjkxODU2MDNaFw0x
-ODAxMjkxODU2MDNaMHAxCzAJBgNVBAYTAkJSMQswCQYDVQQIEwJDRTESMBAGA1UE
-BxMJRm9ydGFsZXphMSYwJAYDVQQKEx1VTklWRVJTSURBREUgRkVERVJBTCBETyBD
-RUFSQTEYMBYGA1UEAxMPY2FmZS1pZHAudWZjLmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA5mmwq3ScV2FZL+AbZxcuOALuAp0dnETymHyJeXQ4OStE
-mRrdINtjjDRiSPMYVWAY10rllQw73sjmZ64Hlf/ER4RhqZIhBFIu4XKEvglKO5dP
-MI0uCVvz1RIx6zz4Zny9GmxCzVQF5gCI81vksduFdVrqsZ0sIqd0MUyx9D/57O3c
-YhvJh/KMctF+53NH+OkXwUH7CvhluRUFI9IjtKISSsMPlnZIpVhIolHmqW834Bfe
-L4m80VOT1oUwg5JjNL/BWRyM9enzwSP0wT+rZnlmgqo3udBoO2g7LcLQ2GabxPID
-dLANiQv60Vw58RD7dVyzT/73M2JHIsOuzmpCOnVdiwIDAQABo4IBrjCCAaowDgYD
-VR0PAQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQICMDQwMgYIKwYBBQUHAgEW
-Jmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMBoGA1UdEQQT
-MBGCD2NhZmUtaWRwLnVmYy5icjAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjA+BgNVHR8ENzA1MDOgMaAvhi1odHRwOi8vY3JsLmdsb2Jh
-bHNpZ24uY29tL2dzL2ljcGVkdXNoYTJnMi5jcmwwgYYGCCsGAQUFBwEBBHoweDBA
-BggrBgEFBQcwAoY0aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQv
-aWNwZWR1c2hhMmcyLmNydDA0BggrBgEFBQcwAYYoaHR0cDovL29jc3AyLmdsb2Jh
-bHNpZ24uY29tL2ljcGVkdXNoYTJnMjAdBgNVHQ4EFgQUEcKIonX/zpNFnXfdkUYP
-MRdG7mEwHwYDVR0jBBgwFoAUlfCkhBqnXCA2psUI12VCAuV3aOMwDQYJKoZIhvcN
-AQELBQADggEBAEyWJQd7Q20jRhjUM3Ue+ySclvHDETUhgnEYcnnJAUeBtNlF/e2l
-TmV/jfzWDX1tkHkyJbDUZyCOvsmPyGgre5n8ZR42Jf9iJkeEqm3LDnvHrEO2LIDV
-dHyNFUeaVBvn3hvA/tvwdRvaSEzxUtVUQ2X+J/4z/38VUXYtufumZekm8D+L6Koe
-5bIDnlUKqHjO/25ph8xm7K5S3BjkL0fQwrEZImgTIEBhWPLnwVUaOPahMwUGeWf8
-aGkhxUVPyqMyuAr0p2iujFM0X8kGWL9nJCAARH4f9rnJs2gOhphoSHpbAKZdtq4Z
-//f+GmXi7h7Buz4+dG0ibmbq8NCOoHJDdys=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe-idp.ufc.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe-idp.ufc.br/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">ufc.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIFVjCCBD6gAwIBAgISESGwx2jv72u5M30bUGytllkYMA0GCSqGSIb3DQEBCwUA
-MIGpMQswCQYDVQQGEwJCUjEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xFzAVBgNV
-BAcTDlJpbyBkZSBKYW5laXJvMSQwIgYDVQQLExtHZXJlbmNpYSBkZSBTZXJ2aWNv
-cyAoR1NlcikxMTAvBgNVBAoTKFJlZGUgTmFjaW9uYWwgZGUgRW5zaW5vIGUgUGVz
-cXVpc2EgLSBSTlAxDzANBgNVBAMTBklDUEVkdTAeFw0xNTAxMjkxODU2MDNaFw0x
-ODAxMjkxODU2MDNaMHAxCzAJBgNVBAYTAkJSMQswCQYDVQQIEwJDRTESMBAGA1UE
-BxMJRm9ydGFsZXphMSYwJAYDVQQKEx1VTklWRVJTSURBREUgRkVERVJBTCBETyBD
-RUFSQTEYMBYGA1UEAxMPY2FmZS1pZHAudWZjLmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA5mmwq3ScV2FZL+AbZxcuOALuAp0dnETymHyJeXQ4OStE
-mRrdINtjjDRiSPMYVWAY10rllQw73sjmZ64Hlf/ER4RhqZIhBFIu4XKEvglKO5dP
-MI0uCVvz1RIx6zz4Zny9GmxCzVQF5gCI81vksduFdVrqsZ0sIqd0MUyx9D/57O3c
-YhvJh/KMctF+53NH+OkXwUH7CvhluRUFI9IjtKISSsMPlnZIpVhIolHmqW834Bfe
-L4m80VOT1oUwg5JjNL/BWRyM9enzwSP0wT+rZnlmgqo3udBoO2g7LcLQ2GabxPID
-dLANiQv60Vw58RD7dVyzT/73M2JHIsOuzmpCOnVdiwIDAQABo4IBrjCCAaowDgYD
-VR0PAQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQICMDQwMgYIKwYBBQUHAgEW
-Jmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMBoGA1UdEQQT
-MBGCD2NhZmUtaWRwLnVmYy5icjAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjA+BgNVHR8ENzA1MDOgMaAvhi1odHRwOi8vY3JsLmdsb2Jh
-bHNpZ24uY29tL2dzL2ljcGVkdXNoYTJnMi5jcmwwgYYGCCsGAQUFBwEBBHoweDBA
-BggrBgEFBQcwAoY0aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQv
-aWNwZWR1c2hhMmcyLmNydDA0BggrBgEFBQcwAYYoaHR0cDovL29jc3AyLmdsb2Jh
-bHNpZ24uY29tL2ljcGVkdXNoYTJnMjAdBgNVHQ4EFgQUEcKIonX/zpNFnXfdkUYP
-MRdG7mEwHwYDVR0jBBgwFoAUlfCkhBqnXCA2psUI12VCAuV3aOMwDQYJKoZIhvcN
-AQELBQADggEBAEyWJQd7Q20jRhjUM3Ue+ySclvHDETUhgnEYcnnJAUeBtNlF/e2l
-TmV/jfzWDX1tkHkyJbDUZyCOvsmPyGgre5n8ZR42Jf9iJkeEqm3LDnvHrEO2LIDV
-dHyNFUeaVBvn3hvA/tvwdRvaSEzxUtVUQ2X+J/4z/38VUXYtufumZekm8D+L6Koe
-5bIDnlUKqHjO/25ph8xm7K5S3BjkL0fQwrEZImgTIEBhWPLnwVUaOPahMwUGeWf8
-aGkhxUVPyqMyuAr0p2iujFM0X8kGWL9nJCAARH4f9rnJs2gOhphoSHpbAKZdtq4Z
-//f+GmXi7h7Buz4+dG0ibmbq8NCOoHJDdys=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe-idp.ufc.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe-idp.ufc.br/idp/profile/SAML1/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">UFC - Universidade Federal do Ceara</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFC - Universidade Federal do Ceara</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFC - Universidade Federal do Ceara</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFC - Universidade Federal do Ceara</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufc.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufc.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Federacao CAFe</md:SurName>
-    <md:EmailAddress>federacao_cafe@sti.ufc.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 016ec01f..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.accamargo.org.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.accamargo.org.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.accamargo.org.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.accamargo.org.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.accamargo.org.br/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">org.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.accamargo.org.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.accamargo.org.br:8443/idp/profile/SAML1/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">ACC - A.C.Camargo Cancer Center</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ACC - A.C.Camargo Cancer Center</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">ACC - A.C.Camargo Cancer Center</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.accamargo.org.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.accamargo.org.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Bruno Alencar</md:SurName>
-    <md:EmailAddress>infra@accamargo.org.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.cnen.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.cnen.gov.br-idp-shibboleth.xml
deleted file mode 100644
index 1d4fc354..00000000
--- a/swamid-interfederations-2.0/cafe.cnen.gov.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://cafe.cnen.gov.br/idp/shibboleth">
-  <md: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>
-  </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">gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CNEN - Comissao Nacional de Energia Nuclear</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">CNEN - Comissao Nacional de Energia Nuclear</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CNEN - Comissao Nacional de Energia Nuclear</mdui:Description>
-        <mdui:Description xml:lang="pt-br">CNEN - Comissao Nacional de Energia Nuclear</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cnen.gov.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.cnen.gov.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEFjCCAv4CAQAwDQYJKoZIhvcNAQEFBQAwgdAxNTAzBgNVBAoULENORU4gLSBD
-b21pc3PDo28gTmFjaW9uYWwgZGUgRW5lcmdpYSBOdWNsZWFyMQ0wCwYDVQQLEwRD
-R1RJMSIwIAYJKoZIhvcNAQkBFhNlbWVyc29uQGNuZW4uZ292LmJyMRcwFQYDVQQH
-Ew5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJBgNV
-BAYTAkJSMSUwIwYDVQQDExxjYWZlLmNuZW4uZ292LmJyLmNuZW4uZ292LmJyMB4X
-DTE1MTAyMDE2MzYyNFoXDTE4MTAxOTE2MzYyNFowgdAxNTAzBgNVBAoULENORU4g
-LSBDb21pc3PDo28gTmFjaW9uYWwgZGUgRW5lcmdpYSBOdWNsZWFyMQ0wCwYDVQQL
-EwRDR1RJMSIwIAYJKoZIhvcNAQkBFhNlbWVyc29uQGNuZW4uZ292LmJyMRcwFQYD
-VQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJ
-BgNVBAYTAkJSMSUwIwYDVQQDExxjYWZlLmNuZW4uZ292LmJyLmNuZW4uZ292LmJy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7jpAzHc6YPI8OlzUZ0K
-QupnUGDgg6XDAHhyO34gr0RVw23wA23comT1INiM0aBbnbs30pZlVm1EVyqI4Mrs
-qS5pkBd6GuZRFpwvFvC0kNY2nSDFgrB4CjZANiz6x1l/WdgyoJOQXEzCY+r2gb5E
-czsubWdjJtmIgQte81lPJ8eGRCEfCqBWWZZRnso3LSfdiBft8Zd2islKgsd6Kodm
-B+2pVyOsWPstUYctSn8DIufRHyqserTR6nHU1Y/uZJt09GMjStcCVJsbiMkCwaP3
-F7hYUU1MpK/V0DwyCTbnq1q3cYD28czgRZ52yL9CNbCjhW9IIIUGgu/ZjMF1MzRi
-fQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBmsSusVoImAwRu8SWZQ2XD5YUxEqkj
-w3eLnxE94kp8buhgS478XKJELNFwDXAQfW6AzNkMgZF9KETYIGb2IEqb0MdFarjY
-rhT4PqEv2xZa/k2QUrYjEaJ+4uwIQStU0fx+2L//iVjApjeMhSf1RImzrkKyLLjc
-O3sWxrQWMNaoZnpLTfWuLPz+GKCSySo0dMYlmrUfXKhKx1LBpFl4LVv/BEfHRJoF
-ek7juaxmfEIX/q2uIto6gIJLYwW/s6zkfJlD3sIVeP5EqcwheuZhmKNiFoaCtw6R
-LDx/9w6rhEYQbiIsW6NDa4Si/8p6x6UuG6zPFJ8uOIjD2yvEd0ap3S9+
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.cnen.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.cnen.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://cafe.cnen.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.cnen.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.cnen.gov.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.cnen.gov.br/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">gov.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEFjCCAv4CAQAwDQYJKoZIhvcNAQEFBQAwgdAxNTAzBgNVBAoULENORU4gLSBD
-b21pc3PDo28gTmFjaW9uYWwgZGUgRW5lcmdpYSBOdWNsZWFyMQ0wCwYDVQQLEwRD
-R1RJMSIwIAYJKoZIhvcNAQkBFhNlbWVyc29uQGNuZW4uZ292LmJyMRcwFQYDVQQH
-Ew5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJBgNV
-BAYTAkJSMSUwIwYDVQQDExxjYWZlLmNuZW4uZ292LmJyLmNuZW4uZ292LmJyMB4X
-DTE1MTAyMDE2MzYyNFoXDTE4MTAxOTE2MzYyNFowgdAxNTAzBgNVBAoULENORU4g
-LSBDb21pc3PDo28gTmFjaW9uYWwgZGUgRW5lcmdpYSBOdWNsZWFyMQ0wCwYDVQQL
-EwRDR1RJMSIwIAYJKoZIhvcNAQkBFhNlbWVyc29uQGNuZW4uZ292LmJyMRcwFQYD
-VQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJ
-BgNVBAYTAkJSMSUwIwYDVQQDExxjYWZlLmNuZW4uZ292LmJyLmNuZW4uZ292LmJy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7jpAzHc6YPI8OlzUZ0K
-QupnUGDgg6XDAHhyO34gr0RVw23wA23comT1INiM0aBbnbs30pZlVm1EVyqI4Mrs
-qS5pkBd6GuZRFpwvFvC0kNY2nSDFgrB4CjZANiz6x1l/WdgyoJOQXEzCY+r2gb5E
-czsubWdjJtmIgQte81lPJ8eGRCEfCqBWWZZRnso3LSfdiBft8Zd2islKgsd6Kodm
-B+2pVyOsWPstUYctSn8DIufRHyqserTR6nHU1Y/uZJt09GMjStcCVJsbiMkCwaP3
-F7hYUU1MpK/V0DwyCTbnq1q3cYD28czgRZ52yL9CNbCjhW9IIIUGgu/ZjMF1MzRi
-fQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBmsSusVoImAwRu8SWZQ2XD5YUxEqkj
-w3eLnxE94kp8buhgS478XKJELNFwDXAQfW6AzNkMgZF9KETYIGb2IEqb0MdFarjY
-rhT4PqEv2xZa/k2QUrYjEaJ+4uwIQStU0fx+2L//iVjApjeMhSf1RImzrkKyLLjc
-O3sWxrQWMNaoZnpLTfWuLPz+GKCSySo0dMYlmrUfXKhKx1LBpFl4LVv/BEfHRJoF
-ek7juaxmfEIX/q2uIto6gIJLYwW/s6zkfJlD3sIVeP5EqcwheuZhmKNiFoaCtw6R
-LDx/9w6rhEYQbiIsW6NDa4Si/8p6x6UuG6zPFJ8uOIjD2yvEd0ap3S9+
-                          
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.cnen.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.cnen.gov.br:8443/idp/profile/SAML1/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">CNEN - Comissao Nacional de Energia Nuclear</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">CNEN - Comissao Nacional de Energia Nuclear</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CNEN - Comissao Nacional de Energia Nuclear</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">CNEN - Comissao Nacional de Energia Nuclear</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cnen.gov.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.cnen.gov.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Emerson Antunes Coimbra</md:SurName>
-    <md:EmailAddress>emerson@cnen.gov.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.cp2.g12.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.cp2.g12.br-idp-shibboleth.xml
deleted file mode 100644
index cdcd6643..00000000
--- a/swamid-interfederations-2.0/cafe.cp2.g12.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://cafe.cp2.g12.br/idp/shibboleth">
-  <md: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>
-  </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">g12.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CPII - Colegio Pedro II</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">CPII - Colegio Pedro II</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CPII - Colegio Pedro II</mdui:Description>
-        <mdui:Description xml:lang="pt-br">CPII - Colegio Pedro II</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cp2.g12.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.cp2.g12.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxGTAXBgNVBAoTEENvbGVnaW8g
-UGVkcm8gSUkxDTALBgNVBAsTBENHVEkxIzAhBgkqhkiG9w0BCQEWFHRtYW5kcmFk
-ZUBjcDIuZzEyLmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMO
-UmlvIGRlIEphbmVpcm8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmNwMi5n
-MTIuYnIwHhcNMTUxMDEzMTUxNjEzWhcNMTgxMDEyMTUxNjEzWjCBqDEZMBcGA1UE
-ChMQQ29sZWdpbyBQZWRybyBJSTENMAsGA1UECxMEQ0dUSTEjMCEGCSqGSIb3DQEJ
-ARYUdG1hbmRyYWRlQGNwMi5nMTIuYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJv
-MRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxGDAWBgNVBAMT
-D2NhZmUuY3AyLmcxMi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALnKYArbfo0YXJcA6c5Dh9JzpT1GQA4Qzpr2iMu1UCdyZcpaVhDxRst0kHwh/J71
-tC47rG6LaS9PHY/3Fxseg5VRipynBEqOwFUUkwfafF+SykHV4GEIdZFX+QmQuybk
-6rRrvm23Xub9rSlrLC6ej+1gVPlhKGlAj+ac/WRiOZNt5ePbobpQlRTxP+jdnKy9
-a0zVNl7+wuCDnc2dOq9u3waV/LtFng1fBcwMeMBrJp7E6bACkU1mZSFjtofsumvO
-CQKoN2KMmtNOuXyVYbVFqH/tWX/0EYlIjdV9owBZpZJQaD1x/JsXA7sSFpWS7KLG
-wVe3saPRZEtnMKYv/ODdvxcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAM12r7Z21
-ZFfp7cJJsyFvsmo7I/Ng8ZOK3jK2fNbi/sbfxwrRA+DBar/eoLnaOZ9GNNHzP7xY
-ad+NbbMQbsiILmWQ/E03ZFKVXvkPAzD21B/wP0yNp0MeDwNtFkyntTUMOHtg/Ajl
-zOTY1QnpSocfP4cAv8e/DhqAkQNtF15/pnL/Vzubq6cainqsNhxhPNaUjtq/GwTq
-9KHAXiNyQSp3YXLGxLPRQEDj0PGhbWZA+sA18EEhJ197VLPhmP41e0a178saGWHF
-5toYGF6QnUUB/ejEaYt37HDl8hHAus4UfQLymdWQG/qtzlz9JBlHP92cBbh85eR1
-dmdFrk2HS2kCqA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.cp2.g12.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.cp2.g12.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://cafe.cp2.g12.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.cp2.g12.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.cp2.g12.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.cp2.g12.br/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">g12.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxGTAXBgNVBAoTEENvbGVnaW8g
-UGVkcm8gSUkxDTALBgNVBAsTBENHVEkxIzAhBgkqhkiG9w0BCQEWFHRtYW5kcmFk
-ZUBjcDIuZzEyLmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMO
-UmlvIGRlIEphbmVpcm8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmNwMi5n
-MTIuYnIwHhcNMTUxMDEzMTUxNjEzWhcNMTgxMDEyMTUxNjEzWjCBqDEZMBcGA1UE
-ChMQQ29sZWdpbyBQZWRybyBJSTENMAsGA1UECxMEQ0dUSTEjMCEGCSqGSIb3DQEJ
-ARYUdG1hbmRyYWRlQGNwMi5nMTIuYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJv
-MRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxGDAWBgNVBAMT
-D2NhZmUuY3AyLmcxMi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALnKYArbfo0YXJcA6c5Dh9JzpT1GQA4Qzpr2iMu1UCdyZcpaVhDxRst0kHwh/J71
-tC47rG6LaS9PHY/3Fxseg5VRipynBEqOwFUUkwfafF+SykHV4GEIdZFX+QmQuybk
-6rRrvm23Xub9rSlrLC6ej+1gVPlhKGlAj+ac/WRiOZNt5ePbobpQlRTxP+jdnKy9
-a0zVNl7+wuCDnc2dOq9u3waV/LtFng1fBcwMeMBrJp7E6bACkU1mZSFjtofsumvO
-CQKoN2KMmtNOuXyVYbVFqH/tWX/0EYlIjdV9owBZpZJQaD1x/JsXA7sSFpWS7KLG
-wVe3saPRZEtnMKYv/ODdvxcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAM12r7Z21
-ZFfp7cJJsyFvsmo7I/Ng8ZOK3jK2fNbi/sbfxwrRA+DBar/eoLnaOZ9GNNHzP7xY
-ad+NbbMQbsiILmWQ/E03ZFKVXvkPAzD21B/wP0yNp0MeDwNtFkyntTUMOHtg/Ajl
-zOTY1QnpSocfP4cAv8e/DhqAkQNtF15/pnL/Vzubq6cainqsNhxhPNaUjtq/GwTq
-9KHAXiNyQSp3YXLGxLPRQEDj0PGhbWZA+sA18EEhJ197VLPhmP41e0a178saGWHF
-5toYGF6QnUUB/ejEaYt37HDl8hHAus4UfQLymdWQG/qtzlz9JBlHP92cBbh85eR1
-dmdFrk2HS2kCqA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.cp2.g12.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.cp2.g12.br:8443/idp/profile/SAML1/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">CPII - Colegio Pedro II</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">CPII - Colegio Pedro II</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CPII - Colegio Pedro II</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">CPII - Colegio Pedro II</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cp2.g12.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.cp2.g12.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Thiago Martorelli</md:SurName>
-    <md:EmailAddress>tmandrade@cp2.g12.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f512d420..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.fucape.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.fucape.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.fucape.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.fucape.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.fucape.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.fucape.br/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">fucape.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.fucape.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.fucape.br:8443/idp/profile/SAML1/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">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa em Contabilidade, Economia e Financas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fucape.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.fucape.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Alan Ruan</md:SurName>
-    <md:EmailAddress>alan@fucape.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.furg.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.furg.br-idp-shibboleth.xml
deleted file mode 100644
index 036a83b2..00000000
--- a/swamid-interfederations-2.0/cafe.furg.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://cafe.furg.br/idp/shibboleth">
-  <md: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>
-  </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">furg.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FURG - Universidade Federal do Rio Grande</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">FURG - Universidade Federal do Rio Grande</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FURG - Universidade Federal do Rio Grande</mdui:Description>
-        <mdui:Description xml:lang="pt-br">FURG - Universidade Federal do Rio Grande</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.furg.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.furg.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID8jCCAtoCAQAwDQYJKoZIhvcNAQEFBQAwgb4xOTA3BgNVBAoTMEZVUkcgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSaW8gR3JhbmRlIC0gRlVSRzEMMAoGA1UE
-CxMDTlRJMR4wHAYJKoZIhvcNAQkBFg9tZ2FyY2lhQGZ1cmcuYnIxEzARBgNVBAcT
-ClJpbyBHcmFuZGUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQG
-EwJCUjEVMBMGA1UEAxMMY2FmZS5mdXJnLmJyMB4XDTE1MDMyNTIxMTcyNFoXDTE4
-MDMyNDIxMTcyNFowgb4xOTA3BgNVBAoTMEZVUkcgLSBVbml2ZXJzaWRhZGUgRmVk
-ZXJhbCBkbyBSaW8gR3JhbmRlIC0gRlVSRzEMMAoGA1UECxMDTlRJMR4wHAYJKoZI
-hvcNAQkBFg9tZ2FyY2lhQGZ1cmcuYnIxEzARBgNVBAcTClJpbyBHcmFuZGUxGjAY
-BgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMM
-Y2FmZS5mdXJnLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm881
-TaLSe0l3nbNdL0Sg1LRpGZ1ewAOB7MiHpf1fuPU5iaj6HbwJJ8iFj3N3hAxh90cZ
-TRr/nOYC7sfmB3L2schS5GskhgImdN5NVW0N/d0tljlGWayilUvTMFTview5rzI7
-ghwv/hIZRFOJD0lqSYY9fTmmpx4X5FCoSwN8Lx3wxNw4XrynmBzUIWhUY7zJkIgp
-BHEAuarchovicJWD7HqhWRZtY9LaVZEmjtBvfCUsz7cde5gVdnTw7XmQFCx6Bf/2
-4Jyz6hHriHRJ6ZoXVVF2crCBJFJFTXtcZTt9jCjfiDUaCMgcSWPSj05QrGk5G/8O
-hTLY23B/1F2PM3XMoQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBEe+1p8rS5V6Ki
-lE50rUkfKPDAZglQhsTYqj8C10sHEMjSwRWN1Dp8Il/gsoK3X2Ax4rGYm/P+tzIB
-hjAoMMfH3RiW+lXX7uC6QATgXLyW2FBg3VjlrLP9hT+4ptTBoa3VbwTTzL9n0Vkq
-HAr+TXsNFnsiCTSZRr/r/qGb+983NQjMOVhWDgYrLNpR6vEheKnDrckSulC5F5NM
-xKNdJgxClu09SPagGpy3NRZbghL9wNCCapRDl1b/a9dvqRzI947Fr4F0/or1zbwD
-u5/fhB2zI8i8SIbysllnJ+ogL+Pm5cFAgS598PjS5izCTWvXM+ffd7xV23Reh5Az
-XmMhY4ck
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.furg.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.furg.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://cafe.furg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.furg.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.furg.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.furg.br/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">furg.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID8jCCAtoCAQAwDQYJKoZIhvcNAQEFBQAwgb4xOTA3BgNVBAoTMEZVUkcgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSaW8gR3JhbmRlIC0gRlVSRzEMMAoGA1UE
-CxMDTlRJMR4wHAYJKoZIhvcNAQkBFg9tZ2FyY2lhQGZ1cmcuYnIxEzARBgNVBAcT
-ClJpbyBHcmFuZGUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQG
-EwJCUjEVMBMGA1UEAxMMY2FmZS5mdXJnLmJyMB4XDTE1MDMyNTIxMTcyNFoXDTE4
-MDMyNDIxMTcyNFowgb4xOTA3BgNVBAoTMEZVUkcgLSBVbml2ZXJzaWRhZGUgRmVk
-ZXJhbCBkbyBSaW8gR3JhbmRlIC0gRlVSRzEMMAoGA1UECxMDTlRJMR4wHAYJKoZI
-hvcNAQkBFg9tZ2FyY2lhQGZ1cmcuYnIxEzARBgNVBAcTClJpbyBHcmFuZGUxGjAY
-BgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMM
-Y2FmZS5mdXJnLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm881
-TaLSe0l3nbNdL0Sg1LRpGZ1ewAOB7MiHpf1fuPU5iaj6HbwJJ8iFj3N3hAxh90cZ
-TRr/nOYC7sfmB3L2schS5GskhgImdN5NVW0N/d0tljlGWayilUvTMFTview5rzI7
-ghwv/hIZRFOJD0lqSYY9fTmmpx4X5FCoSwN8Lx3wxNw4XrynmBzUIWhUY7zJkIgp
-BHEAuarchovicJWD7HqhWRZtY9LaVZEmjtBvfCUsz7cde5gVdnTw7XmQFCx6Bf/2
-4Jyz6hHriHRJ6ZoXVVF2crCBJFJFTXtcZTt9jCjfiDUaCMgcSWPSj05QrGk5G/8O
-hTLY23B/1F2PM3XMoQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBEe+1p8rS5V6Ki
-lE50rUkfKPDAZglQhsTYqj8C10sHEMjSwRWN1Dp8Il/gsoK3X2Ax4rGYm/P+tzIB
-hjAoMMfH3RiW+lXX7uC6QATgXLyW2FBg3VjlrLP9hT+4ptTBoa3VbwTTzL9n0Vkq
-HAr+TXsNFnsiCTSZRr/r/qGb+983NQjMOVhWDgYrLNpR6vEheKnDrckSulC5F5NM
-xKNdJgxClu09SPagGpy3NRZbghL9wNCCapRDl1b/a9dvqRzI947Fr4F0/or1zbwD
-u5/fhB2zI8i8SIbysllnJ+ogL+Pm5cFAgS598PjS5izCTWvXM+ffd7xV23Reh5Az
-XmMhY4ck
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.furg.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.furg.br:8443/idp/profile/SAML1/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">FURG - Universidade Federal do Rio Grande</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">FURG - Universidade Federal do Rio Grande</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">FURG - Universidade Federal do Rio Grande</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">FURG - Universidade Federal do Rio Grande</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.furg.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.furg.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Marcelo Garcia</md:SurName>
-    <md:EmailAddress>mgarcia@furg.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ibict.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ibict.br-idp-shibboleth.xml
deleted file mode 100644
index e8e9501c..00000000
--- a/swamid-interfederations-2.0/cafe.ibict.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://cafe.ibict.br/idp/shibboleth">
-  <md: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>
-  </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">ibict.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ibict.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ibict.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIECDCCAvACAQAwDQYJKoZIhvcNAQEFBQAwgckxQzBBBgNVBAoUOkluc3RpdHV0
-byBCcmFzaWxlaXJvIGRlIEluZm9ybWHn428gZW0gQ2nqbmNpYSBlIFRlY25vbG9n
-aWExDjAMBgNVBAsTBUlCSUNUMR8wHQYJKoZIhvcNAQkBFhBiZW5pY2lvQGliaWN0
-LmJyMREwDwYDVQQHEwhCcmFzaWxpYTEZMBcGA1UECBMQRGlzdHJpdG8gRmVkZXJh
-bDELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUuaWJpY3QuYnIwHhcNMTUwNDMw
-MTMyOTQ3WhcNMTgwNDI5MTMyOTQ3WjCByTFDMEEGA1UEChQ6SW5zdGl0dXRvIEJy
-YXNpbGVpcm8gZGUgSW5mb3JtYefjbyBlbSBDaepuY2lhIGUgVGVjbm9sb2dpYTEO
-MAwGA1UECxMFSUJJQ1QxHzAdBgkqhkiG9w0BCQEWEGJlbmljaW9AaWJpY3QuYnIx
-ETAPBgNVBAcTCEJyYXNpbGlhMRkwFwYDVQQIExBEaXN0cml0byBGZWRlcmFsMQsw
-CQYDVQQGEwJCUjEWMBQGA1UEAxMNY2FmZS5pYmljdC5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMvLiN/XFBLhWCbglIa/z8fiSgxxLl6cCq6RSPp2
-1a6YP7FOa6Yr27oI+qsMy4ppGM6brlI1jqbFjeHjidlM8vesPRX4ZTMdM/t5eT11
-45OY7vGTibAL/gcvtg/5NX3xVWEzaStCoeXIQo+ExvbdiIqbp/BgQ+WPSC7MSHJO
-OWhIDGYZlI6icmpO2+VDfIqbUuhCHhj1AUxFNyMofKl8gsicofnzqkSCiaf6gPp+
-/LqKTStwdyWV91W3MBZVUxnFRyUoiOElj7XakskECxXlvYkGvIXW2M293YAfWE1z
-9gKJeUYvhSu4Jr0icKhSAX/fsMGkUOuu13Tpdnol1dETpI8CAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEATeHDBnb6qsxkiTAt1j56dvsM+YSlxSJ3hkJjAilnIZovT+3V
-w2zDeTa0zBkXHTeD0BUYD4ycCUq3P7hEEJgjWddIdVEPeEptDwXHdtWl37W5KSHR
-2gTsYUcn+R7g5K388uJtP/9m5YZQAs2EmDHkX6U5DUI9MJq2NYGTuAA34UgFvUnF
-hmM7+xoVBLARfBd5RW32TC6zPQHE085tkEpwdrt0gpJomuDSH4xN9Cg/mpYjGu3b
-MCjWyXkvx5MWwLEhWX2wfb1OW1njrrXJED5/lfU/VXBBbIBuPYrXssrean5rsqGD
-sFFBp3cAD9Mu3T9VuMY1GztDz1PPfkSsDlsEdg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ibict.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ibict.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://cafe.ibict.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ibict.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ibict.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ibict.br/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">ibict.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIECDCCAvACAQAwDQYJKoZIhvcNAQEFBQAwgckxQzBBBgNVBAoUOkluc3RpdHV0
-byBCcmFzaWxlaXJvIGRlIEluZm9ybWHn428gZW0gQ2nqbmNpYSBlIFRlY25vbG9n
-aWExDjAMBgNVBAsTBUlCSUNUMR8wHQYJKoZIhvcNAQkBFhBiZW5pY2lvQGliaWN0
-LmJyMREwDwYDVQQHEwhCcmFzaWxpYTEZMBcGA1UECBMQRGlzdHJpdG8gRmVkZXJh
-bDELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUuaWJpY3QuYnIwHhcNMTUwNDMw
-MTMyOTQ3WhcNMTgwNDI5MTMyOTQ3WjCByTFDMEEGA1UEChQ6SW5zdGl0dXRvIEJy
-YXNpbGVpcm8gZGUgSW5mb3JtYefjbyBlbSBDaepuY2lhIGUgVGVjbm9sb2dpYTEO
-MAwGA1UECxMFSUJJQ1QxHzAdBgkqhkiG9w0BCQEWEGJlbmljaW9AaWJpY3QuYnIx
-ETAPBgNVBAcTCEJyYXNpbGlhMRkwFwYDVQQIExBEaXN0cml0byBGZWRlcmFsMQsw
-CQYDVQQGEwJCUjEWMBQGA1UEAxMNY2FmZS5pYmljdC5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMvLiN/XFBLhWCbglIa/z8fiSgxxLl6cCq6RSPp2
-1a6YP7FOa6Yr27oI+qsMy4ppGM6brlI1jqbFjeHjidlM8vesPRX4ZTMdM/t5eT11
-45OY7vGTibAL/gcvtg/5NX3xVWEzaStCoeXIQo+ExvbdiIqbp/BgQ+WPSC7MSHJO
-OWhIDGYZlI6icmpO2+VDfIqbUuhCHhj1AUxFNyMofKl8gsicofnzqkSCiaf6gPp+
-/LqKTStwdyWV91W3MBZVUxnFRyUoiOElj7XakskECxXlvYkGvIXW2M293YAfWE1z
-9gKJeUYvhSu4Jr0icKhSAX/fsMGkUOuu13Tpdnol1dETpI8CAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEATeHDBnb6qsxkiTAt1j56dvsM+YSlxSJ3hkJjAilnIZovT+3V
-w2zDeTa0zBkXHTeD0BUYD4ycCUq3P7hEEJgjWddIdVEPeEptDwXHdtWl37W5KSHR
-2gTsYUcn+R7g5K388uJtP/9m5YZQAs2EmDHkX6U5DUI9MJq2NYGTuAA34UgFvUnF
-hmM7+xoVBLARfBd5RW32TC6zPQHE085tkEpwdrt0gpJomuDSH4xN9Cg/mpYjGu3b
-MCjWyXkvx5MWwLEhWX2wfb1OW1njrrXJED5/lfU/VXBBbIBuPYrXssrean5rsqGD
-sFFBp3cAD9Mu3T9VuMY1GztDz1PPfkSsDlsEdg==
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ibict.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ibict.br:8443/idp/profile/SAML1/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">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IBICT - Instituto Brasileiro de Informacao em Ciencia e Tecnologia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ibict.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ibict.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Benicio Mendes</md:SurName>
-    <md:EmailAddress>benicio@ibict.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 62b973a6..00000000
--- a/swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://cafe.iec.pa.gov.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxITAfBgNVBAoTGEluc3RpdHV0
-byBFdmFuZHJvIENoYWdhczEUMBIGA1UECxMLSW5mb3JtYXRpY2ExITAfBgkqhkiG
-9w0BCQEWEnJlZGVAaWVjLnBhLmdvdi5icjEOMAwGA1UEBxMFQmVsZW0xDTALBgNV
-BAgTBFBhcmExCzAJBgNVBAYTAkJSMRswGQYDVQQDExJjYWZlLmllYy5wYS5nb3Yu
-YnIwHhcNMTUwMjI0MTIxNjMxWhcNMjAwMjIzMTIxNjMxWjCBpTEhMB8GA1UEChMY
-SW5zdGl0dXRvIEV2YW5kcm8gQ2hhZ2FzMRQwEgYDVQQLEwtJbmZvcm1hdGljYTEh
-MB8GCSqGSIb3DQEJARYScmVkZUBpZWMucGEuZ292LmJyMQ4wDAYDVQQHEwVCZWxl
-bTENMAsGA1UECBMEUGFyYTELMAkGA1UEBhMCQlIxGzAZBgNVBAMTEmNhZmUuaWVj
-LnBhLmdvdi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALh7iEs2
-Ni8j/GJ3Zw2jN9XApjZ+UL50nJDAL4XeLuP7e7yaXlW4BTU/5kpVyEKMBG6tdGRk
-hAhAySdMnYGevlMsh7ntx3rITe9IS6L7H9mHBbE8m3IJaoe3D16Y6tn5f1SZOD5M
-pZoxpQGfIB1vScKfg/uiFZ+uWKeFoU+Tv7849/muDsM+RS6oY+06jKui0oVLQGsg
-TVzLFY985RICZDPva3m44wO7MsiSaAv0IdtLG51N8GzEDJaHBNpMz148gdo7I0ec
-TF74zqwWvBvcuK0xE3+/3j/gDPrTcIzqd4vD8bcwwedrY62OClPCGD37hLBGfZKO
-z8DXr0u4hX+qc7kCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAaTtMhdCZIJqL/pMA
-pf91UXgHPVlvoJZYwEKJuTUF6pwlQAlSlL7J/fpEqXLbjWbVMPFTANx7c/MfwE54
-jh3NMxgaxfeH6A+Xk3bOPMiSWRtTuF+Fbma9qfuA7mSsFbX8y0oRP3jZWgKmrAYg
-EkuVIN8rWqCemhAdb7oIa4TV0HSgVWc5yFRu6bX+JFJhIAw8vCL+Ml6HqK+Hku08
-nsZVerrPzQbWGxKGwAvRVxaV0ahOrMSRgE8A0eCEpU5Gso2vDZ9lnMzs8hHGzA2n
-JU0I6DpaM7+LMDUe10IlIxclhBktiIfWjTSGIpXc6dvJZS+YKC7q1Xn4Hgfv2Pi0
-EFJUUg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.iec.pa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.iec.pa.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.iec.pa.gov.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.iec.pa.gov.br/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">iec.pa.gov.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDwDCCAqgCAQAwDQYJKoZIhvcNAQEFBQAwgaUxITAfBgNVBAoTGEluc3RpdHV0
-byBFdmFuZHJvIENoYWdhczEUMBIGA1UECxMLSW5mb3JtYXRpY2ExITAfBgkqhkiG
-9w0BCQEWEnJlZGVAaWVjLnBhLmdvdi5icjEOMAwGA1UEBxMFQmVsZW0xDTALBgNV
-BAgTBFBhcmExCzAJBgNVBAYTAkJSMRswGQYDVQQDExJjYWZlLmllYy5wYS5nb3Yu
-YnIwHhcNMTUwMjI0MTIxNjMxWhcNMjAwMjIzMTIxNjMxWjCBpTEhMB8GA1UEChMY
-SW5zdGl0dXRvIEV2YW5kcm8gQ2hhZ2FzMRQwEgYDVQQLEwtJbmZvcm1hdGljYTEh
-MB8GCSqGSIb3DQEJARYScmVkZUBpZWMucGEuZ292LmJyMQ4wDAYDVQQHEwVCZWxl
-bTENMAsGA1UECBMEUGFyYTELMAkGA1UEBhMCQlIxGzAZBgNVBAMTEmNhZmUuaWVj
-LnBhLmdvdi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALh7iEs2
-Ni8j/GJ3Zw2jN9XApjZ+UL50nJDAL4XeLuP7e7yaXlW4BTU/5kpVyEKMBG6tdGRk
-hAhAySdMnYGevlMsh7ntx3rITe9IS6L7H9mHBbE8m3IJaoe3D16Y6tn5f1SZOD5M
-pZoxpQGfIB1vScKfg/uiFZ+uWKeFoU+Tv7849/muDsM+RS6oY+06jKui0oVLQGsg
-TVzLFY985RICZDPva3m44wO7MsiSaAv0IdtLG51N8GzEDJaHBNpMz148gdo7I0ec
-TF74zqwWvBvcuK0xE3+/3j/gDPrTcIzqd4vD8bcwwedrY62OClPCGD37hLBGfZKO
-z8DXr0u4hX+qc7kCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAaTtMhdCZIJqL/pMA
-pf91UXgHPVlvoJZYwEKJuTUF6pwlQAlSlL7J/fpEqXLbjWbVMPFTANx7c/MfwE54
-jh3NMxgaxfeH6A+Xk3bOPMiSWRtTuF+Fbma9qfuA7mSsFbX8y0oRP3jZWgKmrAYg
-EkuVIN8rWqCemhAdb7oIa4TV0HSgVWc5yFRu6bX+JFJhIAw8vCL+Ml6HqK+Hku08
-nsZVerrPzQbWGxKGwAvRVxaV0ahOrMSRgE8A0eCEpU5Gso2vDZ9lnMzs8hHGzA2n
-JU0I6DpaM7+LMDUe10IlIxclhBktiIfWjTSGIpXc6dvJZS+YKC7q1Xn4Hgfv2Pi0
-EFJUUg==
-		
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.iec.pa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md: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"/>
-    <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">IEC - Instituto Evandro Chagas </md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IEC - Instituto Evandro Chagas </md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IEC - Instituto Evandro Chagas</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IEC - Instituto Evandro Chagas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iec.pa.gov.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.iec.pa.gov.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Equipe de Operacao da Rede IEC</md:SurName>
-    <md:EmailAddress>rede@iec.pa.gov.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 4417d1c1..00000000
--- a/swamid-interfederations-2.0/cafe.iec.pa.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://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>
-    MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzELMAkGA1UEBhMCQlIxDTALBgNV
-BAMTBGNhZmUxDTALBgNVBAsTBGNhZmUwHhcNMTIwMzA4MTY1MjAzWhcNMTUwMzA4
-MTY1MjAzWjArMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2FmZTENMAsGA1UECxME
-Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4pUGfRA+sxWTil
-f1WfGYKDjIvJLw5i+S/YwOZ8mpce3407Ro2O2qlEZLrsjX1CwYLWKIxkfXxr7N0n
-sm12RFK/g3MTMU/xeSp+w9v+a60KTCdzFlIZApxBP22zPCdXHD9peY/wOSvOEb2d
-0EeDNw07KRb8pKSMgPQZQoMPgBTLQgLJWU74Y53a5X4idsOXsAQoAzmrVr5Viadk
-sskzCxiEoniWoqvUJxUEyjHl1T/Ng12Zu7MNXAqm0RluJ66HfUpCpYlh4YbND4C8
-dREsb/wJhTpa6Id5+J4fP6+Gr6TQZ3wcBOaR+Oznapd55cIS+z6QrZkH4KI1H3jY
-ZEl/vP8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAXGRjJHCdRJz3PMaShZnwKuXQ
-dgEzyzT+vZp6HHdyVgL1asXXluhEZ0+/yN3Fl3B4tueH/9NUVOfMwoV0c45SMJgh
-Hbrz7tmgftv7ugLaaB3LGmzOQ/jDNbiFUCS589fxtVLOLlEugyjmDAHzuhvgZzkd
-Wsa2ThZEnqa+PRXiUOE2jxvR8ML43ANZbihxluiTvBrN5Xaukzt6TTLFkGEyK0YC
-lO3JMUfJceyaVzWDqHTUgHtF3CLkeYzSzHsSibBMiYYdUwmW5mw0+5uJSjUwDDbQ
-fvC8Dmf5Rrp1ZpKosvalmGBoMmsZKBsVA+hQwj7o2eDLYSffB26raRIXiEJJEQ==
-            </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>
-      
-                MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzELMAkGA1UEBhMCQlIxDTALBgNV
-BAMTBGNhZmUxDTALBgNVBAsTBGNhZmUwHhcNMTIwMzA4MTY1MjAzWhcNMTUwMzA4
-MTY1MjAzWjArMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2FmZTENMAsGA1UECxME
-Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4pUGfRA+sxWTil
-f1WfGYKDjIvJLw5i+S/YwOZ8mpce3407Ro2O2qlEZLrsjX1CwYLWKIxkfXxr7N0n
-sm12RFK/g3MTMU/xeSp+w9v+a60KTCdzFlIZApxBP22zPCdXHD9peY/wOSvOEb2d
-0EeDNw07KRb8pKSMgPQZQoMPgBTLQgLJWU74Y53a5X4idsOXsAQoAzmrVr5Viadk
-sskzCxiEoniWoqvUJxUEyjHl1T/Ng12Zu7MNXAqm0RluJ66HfUpCpYlh4YbND4C8
-dREsb/wJhTpa6Id5+J4fP6+Gr6TQZ3wcBOaR+Oznapd55cIS+z6QrZkH4KI1H3jY
-ZEl/vP8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAXGRjJHCdRJz3PMaShZnwKuXQ
-dgEzyzT+vZp6HHdyVgL1asXXluhEZ0+/yN3Fl3B4tueH/9NUVOfMwoV0c45SMJgh
-Hbrz7tmgftv7ugLaaB3LGmzOQ/jDNbiFUCS589fxtVLOLlEugyjmDAHzuhvgZzkd
-Wsa2ThZEnqa+PRXiUOE2jxvR8ML43ANZbihxluiTvBrN5Xaukzt6TTLFkGEyK0YC
-lO3JMUfJceyaVzWDqHTUgHtF3CLkeYzSzHsSibBMiYYdUwmW5mw0+5uJSjUwDDbQ
-fvC8Dmf5Rrp1ZpKosvalmGBoMmsZKBsVA+hQwj7o2eDLYSffB26raRIXiEJJEQ==    
-                
-            </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 188a3409..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ifb.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.ifb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifb.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifb.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifb.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifb.edu.br:8443/idp/profile/SAML1/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">IFB -Instituto Federal de Brasilia </md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFB -Instituto Federal de Brasilia </md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFB -Instituto Federal de Brasilia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFB -Instituto Federal de Brasilia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifb.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifb.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Hugo Faria</md:SurName>
-    <md:EmailAddress>hugo.faria@ifb.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 280185d2..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ifes.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.ifes.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifes.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifes.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifes.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifes.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifes.edu.br:8443/idp/profile/SAML1/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">IFES - Instituto Federal do Espirito Santo</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifes.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifes.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Ramon Ramos</md:SurName>
-    <md:EmailAddress>ramon.ramos@ifes.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 1bf9704a..00000000
--- a/swamid-interfederations-2.0/cafe.ifes.edu.br.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: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>
-    MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElmZXMxDDAK
-BgNVBAsTA0RUSTEmMCQGCSqGSIb3DQEJARYXcmFtb24ucmFtb3NAaWZlcy5lZHUu
-YnIxEDAOBgNVBAcTB1ZpdG9yaWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQsw
-CQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjAeFw0xMjA3MTIx
-MjM3NDJaFw0xNTA3MTIxMjM3NDJaMIGYMQ0wCwYDVQQKEwRJZmVzMQwwCgYDVQQL
-EwNEVEkxJjAkBgkqhkiG9w0BCQEWF3JhbW9uLnJhbW9zQGlmZXMuZWR1LmJyMRAw
-DgYDVQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UE
-BhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZlcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDh66pW+Rhc4JAQoixFgSRxnLOqyMd6Ej+7lw5XR+8e
-Y1wuO7+U8swm2vsGYjhxtq1K51Yv8aM5az3NFuRZO2oz08WA3nnzaazCbLBVJdeA
-8G2SJd067snpsfKvQkQ1U6hZbInmBfByrIQdWeiiFE5r1jV5x0J8aOaO2UPwS2Ck
-7sTeuqJqp01OiLKIxomsD/YQmM3nQx2XkiecbGZdFGJLccY7JwL+imvsgbfqF616
-9EDYkdjQW8qLGk5Ssbfa4qvDMy+yd/N/3iRi0r8RnTbAV68n+U438eBqwj/ZGtmP
-728HFJkdk9SV6YQ9wKHkLbClZ7nKf5rLcSmHvrUpqyFxAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBACksOdIyK2sS3dbpx1GIpA9gJ5TawP+hIbid7NmNUgiDj8TRDuzF
-mdFIPwMh11z26oLYLZBpz5ySLyn7LuVBdweXCIUSmLHmT5a3T881voizs23DHWRV
-FHf54cE3L72Yx2SEmDRI0i/hjZqQjdeG3zCeFYu9kbxey96Ai3Pm8ckEyD00Fevf
-ywqZ4hV7nPm05FFqzIxQbGca7NchVlJ3crxQS+Uk78ZfxE7LQ0U6Z9B4hHz1THRt
-hKZra+yquSApXct+eXqZUxgygP1xxecEydKpd5iuwWDDIXkvL/zkCfemLKHbpx/o
-q5gFXIQAVBN5SCcA239mPErPUkVjJ0BPs5o=
-            </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>
-      
-MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElmZXMxDDAK
-BgNVBAsTA0RUSTEmMCQGCSqGSIb3DQEJARYXcmFtb24ucmFtb3NAaWZlcy5lZHUu
-YnIxEDAOBgNVBAcTB1ZpdG9yaWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQsw
-CQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZmVzLmVkdS5icjAeFw0xMjA3MTIx
-MjM3NDJaFw0xNTA3MTIxMjM3NDJaMIGYMQ0wCwYDVQQKEwRJZmVzMQwwCgYDVQQL
-EwNEVEkxJjAkBgkqhkiG9w0BCQEWF3JhbW9uLnJhbW9zQGlmZXMuZWR1LmJyMRAw
-DgYDVQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UE
-BhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZlcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDh66pW+Rhc4JAQoixFgSRxnLOqyMd6Ej+7lw5XR+8e
-Y1wuO7+U8swm2vsGYjhxtq1K51Yv8aM5az3NFuRZO2oz08WA3nnzaazCbLBVJdeA
-8G2SJd067snpsfKvQkQ1U6hZbInmBfByrIQdWeiiFE5r1jV5x0J8aOaO2UPwS2Ck
-7sTeuqJqp01OiLKIxomsD/YQmM3nQx2XkiecbGZdFGJLccY7JwL+imvsgbfqF616
-9EDYkdjQW8qLGk5Ssbfa4qvDMy+yd/N/3iRi0r8RnTbAV68n+U438eBqwj/ZGtmP
-728HFJkdk9SV6YQ9wKHkLbClZ7nKf5rLcSmHvrUpqyFxAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBACksOdIyK2sS3dbpx1GIpA9gJ5TawP+hIbid7NmNUgiDj8TRDuzF
-mdFIPwMh11z26oLYLZBpz5ySLyn7LuVBdweXCIUSmLHmT5a3T881voizs23DHWRV
-FHf54cE3L72Yx2SEmDRI0i/hjZqQjdeG3zCeFYu9kbxey96Ai3Pm8ckEyD00Fevf
-ywqZ4hV7nPm05FFqzIxQbGca7NchVlJ3crxQS+Uk78ZfxE7LQ0U6Z9B4hHz1THRt
-hKZra+yquSApXct+eXqZUxgygP1xxecEydKpd5iuwWDDIXkvL/zkCfemLKHbpx/o
-q5gFXIQAVBN5SCcA239mPErPUkVjJ0BPs5o=
-
-                    
-            </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 f741c6ed..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ifg.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.ifg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifg.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifg.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifg.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifg.edu.br:8443/idp/profile/SAML1/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">IFG - Instituto Federal de Goias</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFG - Instituto Federal de Goias</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFG - Instituto Federal de Goias</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifg.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifg.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Diretoria de Tecnologia da Informacao</md:SurName>
-    <md:EmailAddress>dti@ifg.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 81d776ec..00000000
--- a/swamid-interfederations-2.0/cafe.ifg.edu.br.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: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
-byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNEVEkxHTAbBgkqhkiG9w0BCQEW
-DmR0aUBpZmcuZWR1LmJyMQ4wDAYDVQQHEwVnb2lhczEQMA4GA1UECBMHZ29pYW5p
-YTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZnLmVkdS5icjAeFw0xMjA3
-MjYwMjU2NTJaFw0xNTA3MjYwMjU2NTJaMIGbMSMwIQYDVQQKExpJbnN0aXR1dG8g
-RmVkZXJhbCBkZSBHb2lhczEMMAoGA1UECxMDRFRJMR0wGwYJKoZIhvcNAQkBFg5k
-dGlAaWZnLmVkdS5icjEOMAwGA1UEBxMFZ29pYXMxEDAOBgNVBAgTB2dvaWFuaWEx
-CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmlmZy5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRTiGyg+AdoDTPTJWvRBL6Sx3OCpG0jjT5
-HUyXwsYB/VkDFC/IXLVwSQGCJ8+kzGaIAknzdL0QG1ZfY00neU6HmngzYE9t0NWC
-/UAySjQFlMZPyHmkZyCEIpiOKs1XR7WJgmxz/ga3LiLeNUY16J8ywVG61Gpl31TJ
-3kW3T/qupvrvg55tdc28PwKeAV3AgYY7a3xI2lgpr7ZsthXcsG2MO7xZ7tv/AcKd
-VUukgU90h3NfQz2cX96dqL5RfrdhCDH9Q8vF+ULVMKwoYUbIyY2oCDtNqM3UZyA0
-QjBAyHeKc/AAZKDnwHZb/UNAmURaRHC7Hm9bHjmwxRywNvrF3pZFAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAHiOw84rkwHA7OjQuVDPnEvyVWxPvvHZu2hqvFiybf4s
-PlDNG330L9k+MZDZSXy2JA1dTWBqLUbDFcX9V2m32D6CP2TUttWIS+fN7H1+gc1U
-LpoPByCxDlc3yXxluN2h1I3m9aOK++ZiZVZIZP9CPXc20qyq3bdiVWXUwIVRyzQu
-FPFgsUiwvQUyE1f6fkd9aN2xClUDTY8bNdXsTZILIfUs3gMD0tM9aTrcve+SyC4m
-akqd4eyks0/vB1ulX0Mi5fGl8Hs0FpNJUK1V+gnFGPeNEiIvPVH3JXnIRu0o8ZmN
-1JHbvSUEzlJl51qNZeEEY2lxfCSVaOY8cvpe9vwFVUo=
-            </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
-byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNEVEkxHTAbBgkqhkiG9w0BCQEW
-DmR0aUBpZmcuZWR1LmJyMQ4wDAYDVQQHEwVnb2lhczEQMA4GA1UECBMHZ29pYW5p
-YTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUuaWZnLmVkdS5icjAeFw0xMjA3
-MjYwMjU2NTJaFw0xNTA3MjYwMjU2NTJaMIGbMSMwIQYDVQQKExpJbnN0aXR1dG8g
-RmVkZXJhbCBkZSBHb2lhczEMMAoGA1UECxMDRFRJMR0wGwYJKoZIhvcNAQkBFg5k
-dGlAaWZnLmVkdS5icjEOMAwGA1UEBxMFZ29pYXMxEDAOBgNVBAgTB2dvaWFuaWEx
-CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLmlmZy5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRTiGyg+AdoDTPTJWvRBL6Sx3OCpG0jjT5
-HUyXwsYB/VkDFC/IXLVwSQGCJ8+kzGaIAknzdL0QG1ZfY00neU6HmngzYE9t0NWC
-/UAySjQFlMZPyHmkZyCEIpiOKs1XR7WJgmxz/ga3LiLeNUY16J8ywVG61Gpl31TJ
-3kW3T/qupvrvg55tdc28PwKeAV3AgYY7a3xI2lgpr7ZsthXcsG2MO7xZ7tv/AcKd
-VUukgU90h3NfQz2cX96dqL5RfrdhCDH9Q8vF+ULVMKwoYUbIyY2oCDtNqM3UZyA0
-QjBAyHeKc/AAZKDnwHZb/UNAmURaRHC7Hm9bHjmwxRywNvrF3pZFAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAHiOw84rkwHA7OjQuVDPnEvyVWxPvvHZu2hqvFiybf4s
-PlDNG330L9k+MZDZSXy2JA1dTWBqLUbDFcX9V2m32D6CP2TUttWIS+fN7H1+gc1U
-LpoPByCxDlc3yXxluN2h1I3m9aOK++ZiZVZIZP9CPXc20qyq3bdiVWXUwIVRyzQu
-FPFgsUiwvQUyE1f6fkd9aN2xClUDTY8bNdXsTZILIfUs3gMD0tM9aTrcve+SyC4m
-akqd4eyks0/vB1ulX0Mi5fGl8Hs0FpNJUK1V+gnFGPeNEiIvPVH3JXnIRu0o8ZmN
-1JHbvSUEzlJl51qNZeEEY2lxfCSVaOY8cvpe9vwFVUo=
-
-                    
-            </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 d3353760..00000000
--- a/swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://cafe.ifnmg.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNDAyBgNVBAoTK0lGTk1HIC0g
-SW5zdGl0dWRvIEZlZGVyYWwgZG8gTm9ydGUgZGUgTWluYXMxDTALBgNVBAsTBERH
-VEkxIDAeBgkqhkiG9w0BCQEWEWNndGlAaWZubWcuZWR1LmJyMRYwFAYDVQQHEw1N
-b250ZXMgQ2xhcm9zMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFjYWZlLmlmbm1nLmVkdS5icjAeFw0xNjAxMjkxNDM3NDZaFw0x
-OTAxMjgxNDM3NDZaMIG/MTQwMgYDVQQKEytJRk5NRyAtIEluc3RpdHVkbyBGZWRl
-cmFsIGRvIE5vcnRlIGRlIE1pbmFzMQ0wCwYDVQQLEwRER1RJMSAwHgYJKoZIhvcN
-AQkBFhFjZ3RpQGlmbm1nLmVkdS5icjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEV
-MBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2Fm
-ZS5pZm5tZy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJ
-/Rihj/Xa7N9if4Hg7W+hUk3RzcevTdkb7PjYvtZuBc+C0vT+UF6jjPssebdBC8eg
-pVYGV39o9Z3XKlSXa93Q8Jmi0XXeku0iWQj19hQy1cd3JdXvOEVZspLhBTKlHBiq
-9ckhiFBD03uxQhKNCtsAXsuyp+u8T+gHS6EIE9fccaE4TbaLsB3OwOSmxi2mVDg1
-K//ijxUISU1cHJyY/hHspd+FeavfIyFGXxdz32s5zydI8jBO8T0GJ+3iXhFyI3XM
-2A1yBQs6lo2AaDiuIv+Fid2WVGefF3DkQInC0/vkypcUgyTnsF9v6noeBhvUJoOX
-2TXh02Uy0yWzgMYPx9oPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBALJttKKA5w5u
-paXvoKIgczdMAgpXYajvrFtz7K58GL3tGn4Cxkji6ZiR3HV6VbivsNtoFqNqRVGB
-eJWnfaRemUx4JZyjsO8ZYS+z+U+xV0kEnNsFYCmW23Tq18xT6rtF6hb+9meVImhe
-1TYH5KbNKbJThFfvmdlv++XdVlF/p75syVn+VIdsv4hJvE/mZ07kQz5XKZ2jWFew
-UtzJHrKw+r+jXRfclzTKouMHeeAR+wqJ382uaBJQu1o96kJHQnSzJzLH3HCr01N7
-3l0Bz5/iRUBbOU+TJvsLyGXMMbbUqiQd1fml9nne35OBMfJqBdWNzEmeor19SUmg
-dXlUgHJU9wo=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.ifnmg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifnmg.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifnmg.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifnmg.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xNDAyBgNVBAoTK0lGTk1HIC0g
-SW5zdGl0dWRvIEZlZGVyYWwgZG8gTm9ydGUgZGUgTWluYXMxDTALBgNVBAsTBERH
-VEkxIDAeBgkqhkiG9w0BCQEWEWNndGlAaWZubWcuZWR1LmJyMRYwFAYDVQQHEw1N
-b250ZXMgQ2xhcm9zMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFjYWZlLmlmbm1nLmVkdS5icjAeFw0xNjAxMjkxNDM3NDZaFw0x
-OTAxMjgxNDM3NDZaMIG/MTQwMgYDVQQKEytJRk5NRyAtIEluc3RpdHVkbyBGZWRl
-cmFsIGRvIE5vcnRlIGRlIE1pbmFzMQ0wCwYDVQQLEwRER1RJMSAwHgYJKoZIhvcN
-AQkBFhFjZ3RpQGlmbm1nLmVkdS5icjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEV
-MBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2Fm
-ZS5pZm5tZy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJ
-/Rihj/Xa7N9if4Hg7W+hUk3RzcevTdkb7PjYvtZuBc+C0vT+UF6jjPssebdBC8eg
-pVYGV39o9Z3XKlSXa93Q8Jmi0XXeku0iWQj19hQy1cd3JdXvOEVZspLhBTKlHBiq
-9ckhiFBD03uxQhKNCtsAXsuyp+u8T+gHS6EIE9fccaE4TbaLsB3OwOSmxi2mVDg1
-K//ijxUISU1cHJyY/hHspd+FeavfIyFGXxdz32s5zydI8jBO8T0GJ+3iXhFyI3XM
-2A1yBQs6lo2AaDiuIv+Fid2WVGefF3DkQInC0/vkypcUgyTnsF9v6noeBhvUJoOX
-2TXh02Uy0yWzgMYPx9oPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBALJttKKA5w5u
-paXvoKIgczdMAgpXYajvrFtz7K58GL3tGn4Cxkji6ZiR3HV6VbivsNtoFqNqRVGB
-eJWnfaRemUx4JZyjsO8ZYS+z+U+xV0kEnNsFYCmW23Tq18xT6rtF6hb+9meVImhe
-1TYH5KbNKbJThFfvmdlv++XdVlF/p75syVn+VIdsv4hJvE/mZ07kQz5XKZ2jWFew
-UtzJHrKw+r+jXRfclzTKouMHeeAR+wqJ382uaBJQu1o96kJHQnSzJzLH3HCr01N7
-3l0Bz5/iRUBbOU+TJvsLyGXMMbbUqiQd1fml9nne35OBMfJqBdWNzEmeor19SUmg
-dXlUgHJU9wo=
-                          
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifnmg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifnmg.edu.br:8443/idp/profile/SAML1/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">IFNMG - Instituto Federal Do Norte De Minas Gerais</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFNMG - Instituto Federal Do Norte De Minas Gerais</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFNMG - Instituto Federal Do Norte De Minas Gerais</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifnmg.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifnmg.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Rogerio Luiz</md:SurName>
-    <md:EmailAddress>rogerio.luiz@ifnmg.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e7af68a7..00000000
--- a/swamid-interfederations-2.0/cafe.ifnmg.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://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>
-    MIIEbjCCA1YCAQAwDQYJKoZIhvcNAQEFBQAwgfwxOzA5BgNVBAoTMklGTk1HIC0g
-SW5zdGl0dXRvIEZlZGVyYWwgRG8gTm9ydGUgRGUgTWluYXMgR2VyYWlzMUIwQAYD
-VQQLFDlER1RJIC0gRGlyZXRvcmlhIERlIEdlc3TDo28gRGUgVGVjbm9sb2dpYSBE
-YSBJbmZvcm1hw6fDo28xITAfBgkqhkiG9w0BCQEWEmFkbWluQGlmbm1nLmVkdS5i
-cjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEVMBMGA1UECBMMTWluYXMgR2VyYWlz
-MQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2FmZS5pZm5tZy5lZHUuYnIwHhcNMTMx
-MTA1MjE1MzEwWhcNMTYxMTA0MjE1MzEwWjCB/DE7MDkGA1UEChMySUZOTUcgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBEbyBOb3J0ZSBEZSBNaW5hcyBHZXJhaXMxQjBABgNV
-BAsUOURHVEkgLSBEaXJldG9yaWEgRGUgR2VzdMOjbyBEZSBUZWNub2xvZ2lhIERh
-IEluZm9ybWHDp8OjbzEhMB8GCSqGSIb3DQEJARYSYWRtaW5AaWZubWcuZWR1LmJy
-MRYwFAYDVQQHEw1Nb250ZXMgQ2xhcm9zMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMx
-CzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZlLmlmbm1nLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9uROMCbnEj8V6di0FPFPgvZEkK/maZ
-kaMPAeWFWBIsWdvvVcUYLPm/TKSgkEL3LA9gqD6LupuNHtuqVbihU2FRJ63ld57t
-/TI4K2hm1VwN9le1ajyf/GXgEcrSMkjpxbHI3rFF2PMoFR4yXmt3FVdyEXrMnIg3
-5viPKdWZyNSjdZjctPTDHoU5LZEVbdCJSm547nQdthFBUXnMxcHzsZwfx/duHrvl
-QaFDPTCKZpvy9RGTwEJ0B2iYnPz5eR8SbspvKefhQJUYRgCnljf8x5qGRmzWQoT8
-Fy+4/mvZmg+nrpvA7fOJt1nz3fMTujY3nFM78hybPM5Rc9KsPmRmLsECAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAntnSiyrTaKTSoQcf8yqORTIO306rR+XEcZ2PdPeS
-PhbKGs6aBgHJZEU/L5YIdpuqZ5LQUNfeZEN5OwkBlGN/EljwzbhG/BJUxPYlbCiE
-eZJPZ42KSEFmN0vMVE6w/9qk+b12ZxN6Jxacf5YoRwZxsMuyWzyi32zhtdWsZXpl
-XJ+KSCrwJ4xqzhWijIbVRAyVH9LV7LJauYJMMtCLvcdA4LoZwsMdfJBhXyzrStfF
-Mu85g0yi6D/P4xUr9Sfh5PrlYz0DOq4K8uOcMUuQdgHI4XrY2GR5Bsb/bhEj1G3y
-cxwm5m7irBCpuw6n0qXBnOBlv+ZnUvSL2IuRPXpUw2vJ0A==
-            </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>
-      
-MIIEbjCCA1YCAQAwDQYJKoZIhvcNAQEFBQAwgfwxOzA5BgNVBAoTMklGTk1HIC0g
-SW5zdGl0dXRvIEZlZGVyYWwgRG8gTm9ydGUgRGUgTWluYXMgR2VyYWlzMUIwQAYD
-VQQLFDlER1RJIC0gRGlyZXRvcmlhIERlIEdlc3TDo28gRGUgVGVjbm9sb2dpYSBE
-YSBJbmZvcm1hw6fDo28xITAfBgkqhkiG9w0BCQEWEmFkbWluQGlmbm1nLmVkdS5i
-cjEWMBQGA1UEBxMNTW9udGVzIENsYXJvczEVMBMGA1UECBMMTWluYXMgR2VyYWlz
-MQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRY2FmZS5pZm5tZy5lZHUuYnIwHhcNMTMx
-MTA1MjE1MzEwWhcNMTYxMTA0MjE1MzEwWjCB/DE7MDkGA1UEChMySUZOTUcgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBEbyBOb3J0ZSBEZSBNaW5hcyBHZXJhaXMxQjBABgNV
-BAsUOURHVEkgLSBEaXJldG9yaWEgRGUgR2VzdMOjbyBEZSBUZWNub2xvZ2lhIERh
-IEluZm9ybWHDp8OjbzEhMB8GCSqGSIb3DQEJARYSYWRtaW5AaWZubWcuZWR1LmJy
-MRYwFAYDVQQHEw1Nb250ZXMgQ2xhcm9zMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMx
-CzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZlLmlmbm1nLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9uROMCbnEj8V6di0FPFPgvZEkK/maZ
-kaMPAeWFWBIsWdvvVcUYLPm/TKSgkEL3LA9gqD6LupuNHtuqVbihU2FRJ63ld57t
-/TI4K2hm1VwN9le1ajyf/GXgEcrSMkjpxbHI3rFF2PMoFR4yXmt3FVdyEXrMnIg3
-5viPKdWZyNSjdZjctPTDHoU5LZEVbdCJSm547nQdthFBUXnMxcHzsZwfx/duHrvl
-QaFDPTCKZpvy9RGTwEJ0B2iYnPz5eR8SbspvKefhQJUYRgCnljf8x5qGRmzWQoT8
-Fy+4/mvZmg+nrpvA7fOJt1nz3fMTujY3nFM78hybPM5Rc9KsPmRmLsECAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAntnSiyrTaKTSoQcf8yqORTIO306rR+XEcZ2PdPeS
-PhbKGs6aBgHJZEU/L5YIdpuqZ5LQUNfeZEN5OwkBlGN/EljwzbhG/BJUxPYlbCiE
-eZJPZ42KSEFmN0vMVE6w/9qk+b12ZxN6Jxacf5YoRwZxsMuyWzyi32zhtdWsZXpl
-XJ+KSCrwJ4xqzhWijIbVRAyVH9LV7LJauYJMMtCLvcdA4LoZwsMdfJBhXyzrStfF
-Mu85g0yi6D/P4xUr9Sfh5PrlYz0DOq4K8uOcMUuQdgHI4XrY2GR5Bsb/bhEj1G3y
-cxwm5m7irBCpuw6n0qXBnOBlv+ZnUvSL2IuRPXpUw2vJ0A==
-                    
-            </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 238f3857..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ifpa.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.ifpa.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifpa.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifpa.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifpa.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpa.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifpa.edu.br:8443/idp/profile/SAML1/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">IFPA - Instituto Federal do Para</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFPA - Instituto Federal do Para</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFPA - Instituto Federal do Para</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFPA - Instituto Federal do Para</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifpa.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifpa.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Anderson Almeida</md:SurName>
-    <md:EmailAddress>anderson.almeida@ifpa.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifpi.edu.br.xml b/swamid-interfederations-2.0/cafe.ifpi.edu.br.xml
deleted file mode 100644
index dbf4a1a5..00000000
--- a/swamid-interfederations-2.0/cafe.ifpi.edu.br.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.ifpi.edu.br/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ifpi.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFPI - Instituto Federal do Piaui</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFPI - Instituto Federal do Piaui</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFPI - Instituto Federal do Piaui</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifpi.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifpi.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xKjAoBgNVBAoTIUlGUEkgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBQaWF1aTE1MDMGA1UECxMsRFRJIC0gRGlyZXRv
-cmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYXRpY2ExETAPBgNVBAcTCFRlcmVz
-aW5hMQ4wDAYDVQQIEwVQaWF1aTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
-aWZwaS5lZHUuYnIwHhcNMTIwMzA4MTYyNTQyWhcNMTUwMzA4MTYyNTQyWjCBrjEq
-MCgGA1UEChMhSUZQSSAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBpYXVpMTUwMwYD
-VQQLEyxEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hdGlj
-YTERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgTBVBpYXVpMQswCQYDVQQGEwJC
-UjEZMBcGA1UEAxMQY2FmZS5pZnBpLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMQd7Bb3N4li2CCgKYw+KTPSXGW+YPzKJCu3hPc6ObQzb0CN
-tqnNEX3vA/tBZt7hS7XfCdOuwPvHA8ZdVFTlDx2mQu26KHXN20O2WittOtMiD7pe
-lPsa72/HVPLKUVxhkafhVL5MpJhv4oZf5uLPYVRhx4ZpoAjkXvIVu6eKXunJZ/hL
-qUymk3/Srt6kFLnX2UAEQQcxoLlXNKlUVwNPVjZf5UBRKMckpWCdvW3chSnSmUHg
-MI/ASJzp1Ob2Ef+xsAU5bzIFgaVnGUkaOrPzz3INjerXrtee/g0XZ1qSPEpX+31J
-to0UWMBUjTpF5L519WTOrPZB9NgFFrrE5epG/70CAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAHCfbOer/V7b9fUJ61tNCSRb/868nudvWDxy66/iBCUwvhXw9bDWszY0K
-OSP/8qI03Lvyt7/JqR2jqV15VBNrSCv5avGNE/sd/4cv3LGeqyoFTNudQPcrHVf+
-xuv71hJ0LHNzh1PDiklIYzcOzi/bJm3dd4DwxRA7uAqVLZzhi3XywQswgvDFZ1G1
-VnM8IFE6OfIb5b5EkQWQKMJ2i75/YL0Qqi7XUlLb8OYfoxi003HyM5QuJqynea8L
-DOPsk2WAnhI0wZtPxcZv6JKawH3m7/41wUm6EdGO0BPjAamRYFOmNyJthdlJxEDm
-2dFaz6UnNXlYSIMJ6HtpNFz/DQw1zA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpi.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifpi.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.ifpi.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifpi.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifpi.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifpi.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xKjAoBgNVBAoTIUlGUEkgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBQaWF1aTE1MDMGA1UECxMsRFRJIC0gRGlyZXRv
-cmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYXRpY2ExETAPBgNVBAcTCFRlcmVz
-aW5hMQ4wDAYDVQQIEwVQaWF1aTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUu
-aWZwaS5lZHUuYnIwHhcNMTIwMzA4MTYyNTQyWhcNMTUwMzA4MTYyNTQyWjCBrjEq
-MCgGA1UEChMhSUZQSSAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBpYXVpMTUwMwYD
-VQQLEyxEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hdGlj
-YTERMA8GA1UEBxMIVGVyZXNpbmExDjAMBgNVBAgTBVBpYXVpMQswCQYDVQQGEwJC
-UjEZMBcGA1UEAxMQY2FmZS5pZnBpLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMQd7Bb3N4li2CCgKYw+KTPSXGW+YPzKJCu3hPc6ObQzb0CN
-tqnNEX3vA/tBZt7hS7XfCdOuwPvHA8ZdVFTlDx2mQu26KHXN20O2WittOtMiD7pe
-lPsa72/HVPLKUVxhkafhVL5MpJhv4oZf5uLPYVRhx4ZpoAjkXvIVu6eKXunJZ/hL
-qUymk3/Srt6kFLnX2UAEQQcxoLlXNKlUVwNPVjZf5UBRKMckpWCdvW3chSnSmUHg
-MI/ASJzp1Ob2Ef+xsAU5bzIFgaVnGUkaOrPzz3INjerXrtee/g0XZ1qSPEpX+31J
-to0UWMBUjTpF5L519WTOrPZB9NgFFrrE5epG/70CAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAHCfbOer/V7b9fUJ61tNCSRb/868nudvWDxy66/iBCUwvhXw9bDWszY0K
-OSP/8qI03Lvyt7/JqR2jqV15VBNrSCv5avGNE/sd/4cv3LGeqyoFTNudQPcrHVf+
-xuv71hJ0LHNzh1PDiklIYzcOzi/bJm3dd4DwxRA7uAqVLZzhi3XywQswgvDFZ1G1
-VnM8IFE6OfIb5b5EkQWQKMJ2i75/YL0Qqi7XUlLb8OYfoxi003HyM5QuJqynea8L
-DOPsk2WAnhI0wZtPxcZv6JKawH3m7/41wUm6EdGO0BPjAamRYFOmNyJthdlJxEDm
-2dFaz6UnNXlYSIMJ6HtpNFz/DQw1zA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifpi.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifpi.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IFPI - Instituto Federal do Piaui</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFPI - Instituto Federal do Piaui</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifpi.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifpi.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Manuel Goncalves da Silva Neto</SurName>
-    <EmailAddress>manuel@ifpi.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 5f75c49a..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ifro.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFRO - Instituto Federal de Rondonia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRO - Instituto Federal de Rondonia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRO - Instituto Federal de Rondonia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRO - Instituto Federal de Rondonia</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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.ifro.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifro.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifro.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifro.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifro.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifro.edu.br:8443/idp/profile/SAML1/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">IFRO - Instituto Federal de Rondonia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFRO - Instituto Federal de Rondonia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFRO - Instituto Federal de Rondonia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFRO - Instituto Federal de Rondonia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifro.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifro.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Joilson Dantas</md:SurName>
-    <md:EmailAddress>suporte.reitoria@ifro.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 90770be7..00000000
--- a/swamid-interfederations-2.0/cafe.ifro.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.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 - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</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>
-    MIIDrjCCApYCAQAwDQYJKoZIhvcNAQEFBQAwgZwxDTALBgNVBAoTBElGUk8xDTAL
-BgNVBAsTBERHVEkxKzApBgkqhkiG9w0BCQEWHHN1cG9ydGUucmVpdG9yaWFAaWZy
-by5lZHUuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMREwDwYDVQQIEwhSb25kb25p
-YTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZyby5lZHUuYnIwHhcNMTMx
-MTA4MTM0MzA4WhcNMTYxMTA3MTM0MzA4WjCBnDENMAsGA1UEChMESUZSTzENMAsG
-A1UECxMEREdUSTErMCkGCSqGSIb3DQEJARYcc3Vwb3J0ZS5yZWl0b3JpYUBpZnJv
-LmVkdS5icjEUMBIGA1UEBxMLUG9ydG8gVmVsaG8xETAPBgNVBAgTCFJvbmRvbmlh
-MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZnJvLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6ZCm5rnhEwPjrrhJeWHqx+5Uj4/0xB
-uiU+7EIDJfkCWGAjmo3wyn7fnl9NkAsBzf+CKrWSOPEcgOS5p2EPsP4XL+/AH24s
-86tdFN/5GNY9gYVv9HdgxHXX5CsS+35X1J3vtVMbyc40+UNpYgLlocluN+xyYYFg
-i4hjXo64YGgWfAEOVkpQaQftVJTd5B06PlfI3zRV+s4yD+1r1hcz9coOSmsE/fZX
-7QRJQ1imxm6w6xBj5xP95hw3knOZ4G7m7YzApEg8P0nak2fsEYYYOnMSKnKB2Ss9
-Y57hffnvvXsBScSP+u28mJB6eFz92WMyH7hrhyttR9mVn8pjv/pqK00CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAhG3JeWoW43jEDnu3BjF5nZxuZ/t90CmfVhtctPJV
-8XB2qO9AoR3yRo30AN5StpewSRa5KpTwA3Q2Dw9hxNE2NDLbdGAE46ANAuAHO+33
-fZQHO7BPBthN/qQUUDUIVE1mKkzMsz1TRtv1Hdfs/q4F+pvZ/SHsDrmJfC8rPP8p
-vShxlQ9xWkHgmK1NNs/UL5BpD762lZt2R1o9vWSTKg9Wf2qh/r8H1F0KVhCtntcf
-yVWf3vRqeVFcJSl/2xCvqsUzyi4YPPe0H6bMLiqssrH4IjIIHR+9Kw6SAyxivfgD
-ncPF1Y4GUuWaZiPI9hNVkl/z6qfyYIs0yqq4ZE6Dc2TeeA==
-            </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>
-      
-MIIDrjCCApYCAQAwDQYJKoZIhvcNAQEFBQAwgZwxDTALBgNVBAoTBElGUk8xDTAL
-BgNVBAsTBERHVEkxKzApBgkqhkiG9w0BCQEWHHN1cG9ydGUucmVpdG9yaWFAaWZy
-by5lZHUuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMREwDwYDVQQIEwhSb25kb25p
-YTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGNhZmUuaWZyby5lZHUuYnIwHhcNMTMx
-MTA4MTM0MzA4WhcNMTYxMTA3MTM0MzA4WjCBnDENMAsGA1UEChMESUZSTzENMAsG
-A1UECxMEREdUSTErMCkGCSqGSIb3DQEJARYcc3Vwb3J0ZS5yZWl0b3JpYUBpZnJv
-LmVkdS5icjEUMBIGA1UEBxMLUG9ydG8gVmVsaG8xETAPBgNVBAgTCFJvbmRvbmlh
-MQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZnJvLmVkdS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN6ZCm5rnhEwPjrrhJeWHqx+5Uj4/0xB
-uiU+7EIDJfkCWGAjmo3wyn7fnl9NkAsBzf+CKrWSOPEcgOS5p2EPsP4XL+/AH24s
-86tdFN/5GNY9gYVv9HdgxHXX5CsS+35X1J3vtVMbyc40+UNpYgLlocluN+xyYYFg
-i4hjXo64YGgWfAEOVkpQaQftVJTd5B06PlfI3zRV+s4yD+1r1hcz9coOSmsE/fZX
-7QRJQ1imxm6w6xBj5xP95hw3knOZ4G7m7YzApEg8P0nak2fsEYYYOnMSKnKB2Ss9
-Y57hffnvvXsBScSP+u28mJB6eFz92WMyH7hrhyttR9mVn8pjv/pqK00CAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAhG3JeWoW43jEDnu3BjF5nZxuZ/t90CmfVhtctPJV
-8XB2qO9AoR3yRo30AN5StpewSRa5KpTwA3Q2Dw9hxNE2NDLbdGAE46ANAuAHO+33
-fZQHO7BPBthN/qQUUDUIVE1mKkzMsz1TRtv1Hdfs/q4F+pvZ/SHsDrmJfC8rPP8p
-vShxlQ9xWkHgmK1NNs/UL5BpD762lZt2R1o9vWSTKg9Wf2qh/r8H1F0KVhCtntcf
-yVWf3vRqeVFcJSl/2xCvqsUzyi4YPPe0H6bMLiqssrH4IjIIHR+9Kw6SAyxivfgD
-ncPF1Y4GUuWaZiPI9hNVkl/z6qfyYIs0yqq4ZE6Dc2TeeA==
-                    
-            </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 - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFRO - Instituto Federal de Educacao, Ciencia e Tecnologia de Rondonia</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 409f3929..00000000
--- a/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://cafe.ifrs.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFRS - Instituto Federal do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFRS - Instituto Federal do Rio Grande do Sul</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFRS - Instituto Federal do Rio Grande do Sul</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFRS - Instituto Federal 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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEADCCAugCAQAwDQYJKoZIhvcNAQEFBQAwgcUxNjA0BgNVBAoTLUlGUlMgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMD
-Q1BEMR8wHQYJKoZIhvcNAQkBFhBjYWZlQGlmcnMuZWR1LmJyMRgwFgYDVQQHEw9C
-ZW50byBHb25jYWx2ZXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYD
-VQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZnJzLmVkdS5icjAeFw0xNTA3MDcxODIx
-MTFaFw0xODA3MDYxODIxMTFaMIHFMTYwNAYDVQQKEy1JRlJTIC0gSW5zdGl0dXRv
-IEZlZGVyYWwgZG8gUmlvIEdyYW5kZSBkbyBTdWwxDDAKBgNVBAsTA0NQRDEfMB0G
-CSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEYMBYGA1UEBxMPQmVudG8gR29u
-Y2FsdmVzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIx
-GTAXBgNVBAMTEGNhZmUuaWZycy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDW0sT6IptdPSgeFZD82tHmfg5a2W3bmAqblRCtvZglNdLgpL5W
-NJMcgolvbumWM709Hv8cX5y1vwCFByV4hrDReU5YEgsKWvA5Eovh5LntWK5euKd/
-yALTEOH3k4b+ktF7TPIwCfsIpY3wcaBdGIGtNaqAJq9Vbmms9KgNmLmNNGtk8LF6
-QLT1IuLj9uGJrvTTtrD9aBhj0qbWtLtBbE7zHCUiPCK4sqHZon1xzHbBNy2BpTCn
-gclxri3xKElFqEpEiNfzSBfx8uicN1CYofKMMuMY2dHmGQeYl/oas3VVCo/CebR6
-E6a7MYZfQklnLYWh1UGwr3oUyuB+xF5SwL1rAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAJszIng6ixxwRUsyMzHkpBuM6t9JsdfqHP3OtXQu3l2rru6Q1aatTA40H0sq
-+ODSTIkvmbXrH1Sa0eobjwRCgIohzPxiK6xbxEnT/EnIBPoYNgJEXdfdM26Hi158
-d4ON/+NcLw2+WXtQJ3p1nyqpVP5ZDh+seCjYNGYCwm0Hv/X8MMoZ1X12ONwbDKzF
-nJMHAVlQBn6KfZ5hnLHCM7AMGzbmvNguvBKSHgASBCCHSm2y0dOMy47ynr1P/Srh
-iC7HCSCn/egq36udHpw14Zh1AW12yr0P5TWT0YY3Fony8MVpT6VO0W+lNwJ084DB
-4PBfkm2ud0+t4T9K/ym4hghmfHQ=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.ifrs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifrs.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifrs.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifrs.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEADCCAugCAQAwDQYJKoZIhvcNAQEFBQAwgcUxNjA0BgNVBAoTLUlGUlMgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gR3JhbmRlIGRvIFN1bDEMMAoGA1UECxMD
-Q1BEMR8wHQYJKoZIhvcNAQkBFhBjYWZlQGlmcnMuZWR1LmJyMRgwFgYDVQQHEw9C
-ZW50byBHb25jYWx2ZXMxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYD
-VQQGEwJCUjEZMBcGA1UEAxMQY2FmZS5pZnJzLmVkdS5icjAeFw0xNTA3MDcxODIx
-MTFaFw0xODA3MDYxODIxMTFaMIHFMTYwNAYDVQQKEy1JRlJTIC0gSW5zdGl0dXRv
-IEZlZGVyYWwgZG8gUmlvIEdyYW5kZSBkbyBTdWwxDDAKBgNVBAsTA0NQRDEfMB0G
-CSqGSIb3DQEJARYQY2FmZUBpZnJzLmVkdS5icjEYMBYGA1UEBxMPQmVudG8gR29u
-Y2FsdmVzMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIx
-GTAXBgNVBAMTEGNhZmUuaWZycy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDW0sT6IptdPSgeFZD82tHmfg5a2W3bmAqblRCtvZglNdLgpL5W
-NJMcgolvbumWM709Hv8cX5y1vwCFByV4hrDReU5YEgsKWvA5Eovh5LntWK5euKd/
-yALTEOH3k4b+ktF7TPIwCfsIpY3wcaBdGIGtNaqAJq9Vbmms9KgNmLmNNGtk8LF6
-QLT1IuLj9uGJrvTTtrD9aBhj0qbWtLtBbE7zHCUiPCK4sqHZon1xzHbBNy2BpTCn
-gclxri3xKElFqEpEiNfzSBfx8uicN1CYofKMMuMY2dHmGQeYl/oas3VVCo/CebR6
-E6a7MYZfQklnLYWh1UGwr3oUyuB+xF5SwL1rAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAJszIng6ixxwRUsyMzHkpBuM6t9JsdfqHP3OtXQu3l2rru6Q1aatTA40H0sq
-+ODSTIkvmbXrH1Sa0eobjwRCgIohzPxiK6xbxEnT/EnIBPoYNgJEXdfdM26Hi158
-d4ON/+NcLw2+WXtQJ3p1nyqpVP5ZDh+seCjYNGYCwm0Hv/X8MMoZ1X12ONwbDKzF
-nJMHAVlQBn6KfZ5hnLHCM7AMGzbmvNguvBKSHgASBCCHSm2y0dOMy47ynr1P/Srh
-iC7HCSCn/egq36udHpw14Zh1AW12yr0P5TWT0YY3Fony8MVpT6VO0W+lNwJ084DB
-4PBfkm2ud0+t4T9K/ym4hghmfHQ=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifrs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifrs.edu.br:8443/idp/profile/SAML1/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">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFRS - Instituto Federal de Educacao, Ciencia e Tecnologia do Rio Grande do Sul</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFRS - Instituto Federal do Rio Grande do Sul</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFRS - Instituto Federal do Rio Grande do Sul</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifrs.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifrs.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Suporte CAFe IFRS</md:SurName>
-    <md:EmailAddress>cafe@ifrs.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 3d63ca44..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ifsp.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.ifsp.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ifsp.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ifsp.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ifsp.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ifsp.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ifsp.edu.br:8443/idp/profile/SAML1/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">IFSP - Instituto Federal de Sao Paulo</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFSP - Instituto Federal de Sao Paulo</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFSP - Instituto Federal de Sao Paulo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifsp.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifsp.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Paulo Orlando Ricarte Kawachi</md:SurName>
-    <md:EmailAddress>infra@ifsp.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.int.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.int.gov.br-idp-shibboleth.xml
deleted file mode 100644
index 214070d5..00000000
--- a/swamid-interfederations-2.0/cafe.int.gov.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://cafe.int.gov.br/idp/shibboleth">
-  <md: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>
-  </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">gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">INT - Instituto Nacional de Tecnologia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">INT - Instituto Nacional de Tecnologia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">INT - Instituto Nacional de Tecnologia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">INT - Instituto Nacional de Tecnologia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.int.gov.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.int.gov.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLzAtBgNVBAoTJklOVCAtIElu
-c3RpdHV0byBOYWNpb25hbCBkZSBUZWNub2xvZ2lhMTYwNAYDVQQLFC1ESVRJIC0g
-RGl2aXPDo28gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xFzAVBgNVBAcT
-DlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UE
-BhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTUxMDE0MTgwMTA4WhcNMTgxMDEzMTgw
-MTA4WjCBtzEvMC0GA1UEChMmSU5UIC0gSW5zdGl0dXRvIE5hY2lvbmFsIGRlIFRl
-Y25vbG9naWExNjA0BgNVBAsULURJVEkgLSBEaXZpc8OjbyBkZSBUZWNub2xvZ2lh
-IGRhIEluZm9ybWHDp8OjbzEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8xFzAVBgNV
-BAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2FmZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbrN61tI2RxMGEdoG7iFhjJ
-DBBdNhVUJl2p3SSuczWTa+HvbKWx7cF38QVnjBcxMaHZFbRNTwq/UCxHssMAzMVq
-zdOep2qwQ+u4cpkNijUG/u/hEWGUaTtMt2ClO+ONqcWN/sqE7ekCyAfBhEz60VXg
-YrDdEUe1+cpGEjdDlfMy0kOpP7mXya34hKkqyJH106YmjVyOlP8UEzH04K3rXPNp
-NZjwbzztaq9xYmYgta199vSCdmh04gAbJzWS+wABoNeDHYxoCao4gTJ8CmKPab1P
-/0tJ+WsSQ1/+g2O8FXkYCbCIt0E2aWE8V0eUf3SPGJEl/5+0WR4/3EtUqtPi/jMC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAo92UA4/rxqefToQnm3ZlVJNgCYsjltwE
-HZAwm16mUAXjFljaqvDsysc2cvlsYKEvSUPwqcpa3k05L3hdW3dBE1l/AMoKuiTc
-km2xRZq6zhG2D4YHPEpcH4/PVLMNYfTTN+Pie9wsugM3IgqagUXUdtS4eI8t3x0X
-+l8GAGHKRRDHjHBb+93iQJGITFNg0CJFaCvAa8kBBn2P5gbKohLhIHGfShG8719b
-0oRJ5a6b2L3wcMipz8W+tMc7Wi4o5QcW0WQvPyJl9B9KqzGthQOJIYigPx4iV2Va
-yhRwKkLgaS4ooMcUPBLDYoD7F3Yx2zKh9DiSWJBqj39lAR/+Bl00cA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.int.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.int.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://cafe.int.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.int.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.int.gov.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.int.gov.br/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">gov.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLzAtBgNVBAoTJklOVCAtIElu
-c3RpdHV0byBOYWNpb25hbCBkZSBUZWNub2xvZ2lhMTYwNAYDVQQLFC1ESVRJIC0g
-RGl2aXPDo28gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xFzAVBgNVBAcT
-DlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UE
-BhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTUxMDE0MTgwMTA4WhcNMTgxMDEzMTgw
-MTA4WjCBtzEvMC0GA1UEChMmSU5UIC0gSW5zdGl0dXRvIE5hY2lvbmFsIGRlIFRl
-Y25vbG9naWExNjA0BgNVBAsULURJVEkgLSBEaXZpc8OjbyBkZSBUZWNub2xvZ2lh
-IGRhIEluZm9ybWHDp8OjbzEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8xFzAVBgNV
-BAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2FmZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbrN61tI2RxMGEdoG7iFhjJ
-DBBdNhVUJl2p3SSuczWTa+HvbKWx7cF38QVnjBcxMaHZFbRNTwq/UCxHssMAzMVq
-zdOep2qwQ+u4cpkNijUG/u/hEWGUaTtMt2ClO+ONqcWN/sqE7ekCyAfBhEz60VXg
-YrDdEUe1+cpGEjdDlfMy0kOpP7mXya34hKkqyJH106YmjVyOlP8UEzH04K3rXPNp
-NZjwbzztaq9xYmYgta199vSCdmh04gAbJzWS+wABoNeDHYxoCao4gTJ8CmKPab1P
-/0tJ+WsSQ1/+g2O8FXkYCbCIt0E2aWE8V0eUf3SPGJEl/5+0WR4/3EtUqtPi/jMC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAo92UA4/rxqefToQnm3ZlVJNgCYsjltwE
-HZAwm16mUAXjFljaqvDsysc2cvlsYKEvSUPwqcpa3k05L3hdW3dBE1l/AMoKuiTc
-km2xRZq6zhG2D4YHPEpcH4/PVLMNYfTTN+Pie9wsugM3IgqagUXUdtS4eI8t3x0X
-+l8GAGHKRRDHjHBb+93iQJGITFNg0CJFaCvAa8kBBn2P5gbKohLhIHGfShG8719b
-0oRJ5a6b2L3wcMipz8W+tMc7Wi4o5QcW0WQvPyJl9B9KqzGthQOJIYigPx4iV2Va
-yhRwKkLgaS4ooMcUPBLDYoD7F3Yx2zKh9DiSWJBqj39lAR/+Bl00cA==
-                          
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.int.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.int.gov.br:8443/idp/profile/SAML1/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">INT - Instituto Nacional de Tecnologia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">INT - Instituto Nacional de Tecnologia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INT - Instituto Nacional de Tecnologia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">INT - Instituto Nacional de Tecnologia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.int.gov.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.int.gov.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Luiz Dias</md:SurName>
-    <md:EmailAddress>luiz.dias@int.gov.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.mcti.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.mcti.gov.br-idp-shibboleth.xml
deleted file mode 100644
index dade1d86..00000000
--- a/swamid-interfederations-2.0/cafe.mcti.gov.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://cafe.mcti.gov.br/idp/shibboleth">
-  <md: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>
-  </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">mcti.gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</mdui:DisplayName>
-        <mdui:Description xml:lang="en">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</mdui:Description>
-        <mdui:Description xml:lang="pt-br">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.mcti.gov.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.mcti.gov.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID4DCCAsgCAQAwDQYJKoZIhvcNAQEFBQAwgbUxNTAzBgNVBAoULE1JTklTVMlS
-SU8gREEgQ0nKTkNJQSwgVEVDTk9MT0dJQSBFIElOT1ZBx8NPMQ0wCwYDVQQLEwRD
-R1RJMR8wHQYJKoZIhvcNAQkBFhBjZ3RpQG1jdGkuZ292LmJyMREwDwYDVQQHFAhC
-cmFz7WxpYTELMAkGA1UECBMCREYxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZzaGli
-Ym9sZXRoLm1jdC5nb3YuYnIgMB4XDTE1MTAwMjE5MDM1MloXDTE4MTAwMTE5MDM1
-MlowgbUxNTAzBgNVBAoULE1JTklTVMlSSU8gREEgQ0nKTkNJQSwgVEVDTk9MT0dJ
-QSBFIElOT1ZBx8NPMQ0wCwYDVQQLEwRDR1RJMR8wHQYJKoZIhvcNAQkBFhBjZ3Rp
-QG1jdGkuZ292LmJyMREwDwYDVQQHFAhCcmFz7WxpYTELMAkGA1UECBMCREYxCzAJ
-BgNVBAYTAkJSMR8wHQYDVQQDExZzaGliYm9sZXRoLm1jdC5nb3YuYnIgMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxNWc4sXlHfFx8K5z3tFp1qxqrjb3
-wcUnkt+WUAWDU329b0PzpRnojFW6V/NGvifpgb0omA1iKbM9HBJnLgAhQeVaB1Fa
-1qxN0tfaaQQQu3uC4Ge6jxJWnrZtbmC9Qfw/+yEoP+iN4PQKw7bhTQJDBD+i3Hlh
-67UBZ/uMOs8rEZJDbzocsGISikZfuwDmtflTlpf/DXfqnrQhzMhpEfegC8afzcA8
-O3ZDBrXBov4MdTKfPjtrtbIpdpU6OV/G8vIC+eEImvTbkHmKA3I3qOChTK4pj4Ck
-B7RGzE6Clalm+R1FVnPFgvO16lcS/KlL12jB1/vXAomGHThOj7M1LRI34wIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQA58CiJc5O6Hq8ITWADFxM+BV97OzaQSkXsOF7e
-NnHva3kG6XJsc8CS2oYxWcGI6NRGDjLBK9phqjWQXm33yMZZTwNbzp8FdOfIYZYN
-Zi5M0a/qtF5hF1ku7iD8q9ZGdZvaxHe5OKKooqJiqdX2GyGpSLKLi4oEzw/BQwZY
-0rshZowIsAKJFEVyVloAjTgNEBN8DqGIqFrwgjOYu/7JL/+lWQF2wxXRTJcEq+q4
-aWfQR54+AvG5WzOajAhQSGTGXkMumQrnFAgJSi4r7S7T5zF6ynGalfRuqDG5xGih
-H4iAdWwzMf9pmj/5YnWSqe28vEbeEyPeX/4e53os0oM9raJN
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.mcti.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.mcti.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://cafe.mcti.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.mcti.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.mcti.gov.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.mcti.gov.br/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">mcti.gov.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID4DCCAsgCAQAwDQYJKoZIhvcNAQEFBQAwgbUxNTAzBgNVBAoULE1JTklTVMlS
-SU8gREEgQ0nKTkNJQSwgVEVDTk9MT0dJQSBFIElOT1ZBx8NPMQ0wCwYDVQQLEwRD
-R1RJMR8wHQYJKoZIhvcNAQkBFhBjZ3RpQG1jdGkuZ292LmJyMREwDwYDVQQHFAhC
-cmFz7WxpYTELMAkGA1UECBMCREYxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZzaGli
-Ym9sZXRoLm1jdC5nb3YuYnIgMB4XDTE1MTAwMjE5MDM1MloXDTE4MTAwMTE5MDM1
-MlowgbUxNTAzBgNVBAoULE1JTklTVMlSSU8gREEgQ0nKTkNJQSwgVEVDTk9MT0dJ
-QSBFIElOT1ZBx8NPMQ0wCwYDVQQLEwRDR1RJMR8wHQYJKoZIhvcNAQkBFhBjZ3Rp
-QG1jdGkuZ292LmJyMREwDwYDVQQHFAhCcmFz7WxpYTELMAkGA1UECBMCREYxCzAJ
-BgNVBAYTAkJSMR8wHQYDVQQDExZzaGliYm9sZXRoLm1jdC5nb3YuYnIgMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxNWc4sXlHfFx8K5z3tFp1qxqrjb3
-wcUnkt+WUAWDU329b0PzpRnojFW6V/NGvifpgb0omA1iKbM9HBJnLgAhQeVaB1Fa
-1qxN0tfaaQQQu3uC4Ge6jxJWnrZtbmC9Qfw/+yEoP+iN4PQKw7bhTQJDBD+i3Hlh
-67UBZ/uMOs8rEZJDbzocsGISikZfuwDmtflTlpf/DXfqnrQhzMhpEfegC8afzcA8
-O3ZDBrXBov4MdTKfPjtrtbIpdpU6OV/G8vIC+eEImvTbkHmKA3I3qOChTK4pj4Ck
-B7RGzE6Clalm+R1FVnPFgvO16lcS/KlL12jB1/vXAomGHThOj7M1LRI34wIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQA58CiJc5O6Hq8ITWADFxM+BV97OzaQSkXsOF7e
-NnHva3kG6XJsc8CS2oYxWcGI6NRGDjLBK9phqjWQXm33yMZZTwNbzp8FdOfIYZYN
-Zi5M0a/qtF5hF1ku7iD8q9ZGdZvaxHe5OKKooqJiqdX2GyGpSLKLi4oEzw/BQwZY
-0rshZowIsAKJFEVyVloAjTgNEBN8DqGIqFrwgjOYu/7JL/+lWQF2wxXRTJcEq+q4
-aWfQR54+AvG5WzOajAhQSGTGXkMumQrnFAgJSi4r7S7T5zF6ynGalfRuqDG5xGih
-H4iAdWwzMf9pmj/5YnWSqe28vEbeEyPeX/4e53os0oM9raJN
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.mcti.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.mcti.gov.br:8443/idp/profile/SAML1/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">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">MCTI - Ministerio da Ciencia, Tecnologia e Inovacao</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mcti.gov.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.mcti.gov.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Daniel Souza</md:SurName>
-    <md:EmailAddress>cgti@mcti.gov.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8f03861b..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.on.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.on.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.on.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.on.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.on.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.on.br/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">on.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.on.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.on.br:8443/idp/profile/SAML1/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">ON - Observatorio Nacional</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">ON - Observatorio Nacional</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ON - Observatorio Nacional</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">ON - Observatorio Nacional</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.on.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.on.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>luisriera</md:SurName>
-    <md:EmailAddress>luisriera@on.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 be8fd3c1..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>
-    MIID7DCCAtQCAQAwDQYJKoZIhvcNAQEFBQAwgbsxHjAcBgNVBAoTFU9ic2VydmF0
-b3JpbyBOYWNpb25hbDEeMBwGA1UECxMVT2JzZXJ2YXRvcmlvIE5hY2lvbmFsMR4w
-HAYJKoZIhvcNAQkBFg9sdWlzcmllcmFAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBK
-YW5laXJvMR4wHAYDVQQIExVPYnNlcnZhdG9yaW8gTmFjaW9uYWwxCzAJBgNVBAYT
-AlJKMRMwEQYDVQQDEwpjYWZlLm9uLmJyMB4XDTEyMDQwNDE0NTgxMloXDTE1MDQw
-NDE0NTgxMlowgbsxHjAcBgNVBAoTFU9ic2VydmF0b3JpbyBOYWNpb25hbDEeMBwG
-A1UECxMVT2JzZXJ2YXRvcmlvIE5hY2lvbmFsMR4wHAYJKoZIhvcNAQkBFg9sdWlz
-cmllcmFAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMR4wHAYDVQQIExVP
-YnNlcnZhdG9yaW8gTmFjaW9uYWwxCzAJBgNVBAYTAlJKMRMwEQYDVQQDEwpjYWZl
-Lm9uLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwf+EBoN18wPX
-u0YIb8MXg9Ra6i7Amo8PH73yVhHPAobRlI4KT3OddCC26lKHQkBFu4/tkohiGVvJ
-3UUeVeq5zv79z5FuPPy2xPzzNXSeoim3pen7V5iAIWn12TmWbEo6GuDv5JYFqrUh
-pX+CgWdR/I0olp+KQ9dS+atbCSknH6yotk72cePQEyvkQQMsEd8VBr50UqbkM9SX
-+AGk6+q4Ssh4A9gfCYaB0syQY8UDApK8TwN8SiHilxje41EPsFomHww4MvqEEIzB
-+gfiNG5ZV+hJjzfpNX5Q43Iwu7Alv4nGxl287roafRCi9/GmGwBRzQVVhRterhEp
-tMssMn36swIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA3vZpO/+aiU9ShgjyZgWqY
-wcM3fLgslPfKUZe1Eq2wPjHFXs2VKtpwMi9Xd/ZrLhM4ttYmfnjKDaMxTFuXIXVx
-cCUEo2AJMGa+MzB61Q89V6U0+pvcqRoOyxIXsJoofk78xV1PW97t1Mub4tsaeT5y
-bG0i2MZEMGpw7LGBxDJei0J6/uv1iwMEcKicKWsiEHIb8/9QvkKubQRBdbhDcPD2
-k4KqxZCcraWfq/ppLVN7zESQiA84fSi5EhD9d5otvvEV2QOTVCUEVxkiLa/APs0B
-d3ISnBX1thKejlmBkep6rr5KAQV474rv/zYmbQVTlvFkQJxId7mDKd+IJy+TRRiA
-            </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>
-      
-MIID7DCCAtQCAQAwDQYJKoZIhvcNAQEFBQAwgbsxHjAcBgNVBAoTFU9ic2VydmF0
-b3JpbyBOYWNpb25hbDEeMBwGA1UECxMVT2JzZXJ2YXRvcmlvIE5hY2lvbmFsMR4w
-HAYJKoZIhvcNAQkBFg9sdWlzcmllcmFAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBK
-YW5laXJvMR4wHAYDVQQIExVPYnNlcnZhdG9yaW8gTmFjaW9uYWwxCzAJBgNVBAYT
-AlJKMRMwEQYDVQQDEwpjYWZlLm9uLmJyMB4XDTEyMDQwNDE0NTgxMloXDTE1MDQw
-NDE0NTgxMlowgbsxHjAcBgNVBAoTFU9ic2VydmF0b3JpbyBOYWNpb25hbDEeMBwG
-A1UECxMVT2JzZXJ2YXRvcmlvIE5hY2lvbmFsMR4wHAYJKoZIhvcNAQkBFg9sdWlz
-cmllcmFAb24uYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMR4wHAYDVQQIExVP
-YnNlcnZhdG9yaW8gTmFjaW9uYWwxCzAJBgNVBAYTAlJKMRMwEQYDVQQDEwpjYWZl
-Lm9uLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwf+EBoN18wPX
-u0YIb8MXg9Ra6i7Amo8PH73yVhHPAobRlI4KT3OddCC26lKHQkBFu4/tkohiGVvJ
-3UUeVeq5zv79z5FuPPy2xPzzNXSeoim3pen7V5iAIWn12TmWbEo6GuDv5JYFqrUh
-pX+CgWdR/I0olp+KQ9dS+atbCSknH6yotk72cePQEyvkQQMsEd8VBr50UqbkM9SX
-+AGk6+q4Ssh4A9gfCYaB0syQY8UDApK8TwN8SiHilxje41EPsFomHww4MvqEEIzB
-+gfiNG5ZV+hJjzfpNX5Q43Iwu7Alv4nGxl287roafRCi9/GmGwBRzQVVhRterhEp
-tMssMn36swIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA3vZpO/+aiU9ShgjyZgWqY
-wcM3fLgslPfKUZe1Eq2wPjHFXs2VKtpwMi9Xd/ZrLhM4ttYmfnjKDaMxTFuXIXVx
-cCUEo2AJMGa+MzB61Q89V6U0+pvcqRoOyxIXsJoofk78xV1PW97t1Mub4tsaeT5y
-bG0i2MZEMGpw7LGBxDJei0J6/uv1iwMEcKicKWsiEHIb8/9QvkKubQRBdbhDcPD2
-k4KqxZCcraWfq/ppLVN7zESQiA84fSi5EhD9d5otvvEV2QOTVCUEVxkiLa/APs0B
-d3ISnBX1thKejlmBkep6rr5KAQV474rv/zYmbQVTlvFkQJxId7mDKd+IJy+TRRiA
-                    
-            </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.pucgoias.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.pucgoias.edu.br-idp-shibboleth.xml
deleted file mode 100644
index e8f17882..00000000
--- a/swamid-interfederations-2.0/cafe.pucgoias.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://cafe.pucgoias.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PUCGOIAS - Pontificia Universidade Catolica de Goias</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">PUCGOIAS - Pontificia Universidade Catolica de Goias</mdui:DisplayName>
-        <mdui:Description xml:lang="en">PUCGOIAS - Pontificia Universidade Catolica de Goias</mdui:Description>
-        <mdui:Description xml:lang="pt-br">PUCGOIAS - Pontificia Universidade Catolica de Goias</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://sites.pucgoias.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://sites.pucgoias.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxPTA7BgNVBAoTNFBVQ0dPSUFT
-IC0gUG9udGlmaWNpYSBVbml2ZXJzaWRhZGUgQ2F0b2xpY2EgZGUgR29pYXMxDDAK
-BgNVBAsTA0NQRDEmMCQGCSqGSIb3DQEJARYXYWRyaWFub0BwdWNnb2lhcy5lZHUu
-YnIxEDAOBgNVBAcTB0dvaWFuaWExDjAMBgNVBAgTBUdvaWFzMQswCQYDVQQGEwJC
-UjEiMCAGA1UEAxMZY2FmZWNhcGVzLnB1Y2dvaWFzLmVkdS5icjAeFw0xNTEwMDcx
-NDQ1NDNaFw0xODEwMDYxNDQ1NDNaMIHIMT0wOwYDVQQKEzRQVUNHT0lBUyAtIFBv
-bnRpZmljaWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRlIEdvaWFzMQwwCgYDVQQL
-EwNDUEQxJjAkBgkqhkiG9w0BCQEWF2Fkcmlhbm9AcHVjZ29pYXMuZWR1LmJyMRAw
-DgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lhczELMAkGA1UEBhMCQlIxIjAg
-BgNVBAMTGWNhZmVjYXBlcy5wdWNnb2lhcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDwPfgR6s32/B0GorTYORl59Lm6wl/OxPr77AZ7unP6
-jJGEhAUlbAeKRUnhNG2cItt8qVgp0AGGAQUFUVjQ75qxIsPlqrQTP/MJ9/bQKKIf
-5rA1jZeYOq2cG0ZTA+pwYQ5m9VrQH7VAWmtHWkI8SJf/JBKgvEABmzRLOD7GCBMx
-cVtI0yeMWfUV4i4v33lGSAVze5SYadcmdXLCZOsyWMFvEcxnyc+q7q/NKn8pP84a
-U0aRoARh6hb720js3bnjUiwLZzHVnQTa3bWyU1gYXQCqJGbZwkBbj1uxHsoZqw4f
-Xnhz/7C3aZhOwS/wjmKQs/mLV2kfg78gLFDp7BTWl9YXAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAFxoHHOQt/1KuE72rnfT5C2q7gmrB65vrMfiD7aanlDtwohUQBfW
-tCm1QTQalo8yj52lCrlti/8NIV1oz2Wm71feNmD3e/VTDFHGykx0ZrbJ0t3yJKCQ
-qr1y7aAa0UdJNgbzib0qd/jjYq5yJcTbro/mFoBj2LI/eeXn5iCXam9VUha4/JWk
-5Y/F3vlKFRyZII1SFjajppwpC+WG+XDvkwB0tzTleOE71wbYsgvPctTakZEJ7A8Z
-n6YTQExANeVgyXDmnXMOWKuqyWevEIWs4SSK6fNnRspHNEXdC1sLgDn4uVQa4W4L
-I1nX7QAxuJ9VL5U4ARrpmnxy7s4+VR2f/n0=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucgoias.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucgoias.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://cafe.pucgoias.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.pucgoias.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.pucgoias.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.pucgoias.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEBjCCAu4CAQAwDQYJKoZIhvcNAQEFBQAwgcgxPTA7BgNVBAoTNFBVQ0dPSUFT
-IC0gUG9udGlmaWNpYSBVbml2ZXJzaWRhZGUgQ2F0b2xpY2EgZGUgR29pYXMxDDAK
-BgNVBAsTA0NQRDEmMCQGCSqGSIb3DQEJARYXYWRyaWFub0BwdWNnb2lhcy5lZHUu
-YnIxEDAOBgNVBAcTB0dvaWFuaWExDjAMBgNVBAgTBUdvaWFzMQswCQYDVQQGEwJC
-UjEiMCAGA1UEAxMZY2FmZWNhcGVzLnB1Y2dvaWFzLmVkdS5icjAeFw0xNTEwMDcx
-NDQ1NDNaFw0xODEwMDYxNDQ1NDNaMIHIMT0wOwYDVQQKEzRQVUNHT0lBUyAtIFBv
-bnRpZmljaWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRlIEdvaWFzMQwwCgYDVQQL
-EwNDUEQxJjAkBgkqhkiG9w0BCQEWF2Fkcmlhbm9AcHVjZ29pYXMuZWR1LmJyMRAw
-DgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lhczELMAkGA1UEBhMCQlIxIjAg
-BgNVBAMTGWNhZmVjYXBlcy5wdWNnb2lhcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDwPfgR6s32/B0GorTYORl59Lm6wl/OxPr77AZ7unP6
-jJGEhAUlbAeKRUnhNG2cItt8qVgp0AGGAQUFUVjQ75qxIsPlqrQTP/MJ9/bQKKIf
-5rA1jZeYOq2cG0ZTA+pwYQ5m9VrQH7VAWmtHWkI8SJf/JBKgvEABmzRLOD7GCBMx
-cVtI0yeMWfUV4i4v33lGSAVze5SYadcmdXLCZOsyWMFvEcxnyc+q7q/NKn8pP84a
-U0aRoARh6hb720js3bnjUiwLZzHVnQTa3bWyU1gYXQCqJGbZwkBbj1uxHsoZqw4f
-Xnhz/7C3aZhOwS/wjmKQs/mLV2kfg78gLFDp7BTWl9YXAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAFxoHHOQt/1KuE72rnfT5C2q7gmrB65vrMfiD7aanlDtwohUQBfW
-tCm1QTQalo8yj52lCrlti/8NIV1oz2Wm71feNmD3e/VTDFHGykx0ZrbJ0t3yJKCQ
-qr1y7aAa0UdJNgbzib0qd/jjYq5yJcTbro/mFoBj2LI/eeXn5iCXam9VUha4/JWk
-5Y/F3vlKFRyZII1SFjajppwpC+WG+XDvkwB0tzTleOE71wbYsgvPctTakZEJ7A8Z
-n6YTQExANeVgyXDmnXMOWKuqyWevEIWs4SSK6fNnRspHNEXdC1sLgDn4uVQa4W4L
-I1nX7QAxuJ9VL5U4ARrpmnxy7s4+VR2f/n0=
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucgoias.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucgoias.edu.br:8443/idp/profile/SAML1/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">PUCGOIAS - Pontificia Universidade Catolica de Goias</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">PUCGOIAS - Pontificia Universidade Catolica de Goias</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">PUCGOIAS - Pontificia Universidade Catolica de Goias</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">PUCGOIAS - Pontificia Universidade Catolica de Goias</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://sites.pucgoias.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://sites.pucgoias.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Adriano Fernandes</md:SurName>
-    <md:EmailAddress>adriano@pucgoias.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 391e1ac8..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.pucminas.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucminas.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.pucminas.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.pucminas.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.pucminas.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.pucminas.br/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">pucminas.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.pucminas.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.pucminas.br:8443/idp/profile/SAML1/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">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">PUCMINAS - Pontificia Universidade Catolica de Minas Gerais</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pucminas.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.pucminas.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jose Teixeira Horta Junior</md:SurName>
-    <md:EmailAddress>noc@pucminas.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 61e3cd17..00000000
--- a/swamid-interfederations-2.0/cafe.pucminas.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.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>
-    MIID+DCCAuACAQAwDQYJKoZIhvcNAQEFBQAwgcExOTA3BgNVBAoTMFBvbnRpZmlj
-aWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRlIG1pbmFzIEdlcmFpczEMMAoGA1UE
-CxMDQ1BEMR4wHAYJKoZIhvcNAQkBFg9ub2NAcHVjbWluYXMuYnIxFzAVBgNVBAcT
-DkJlbG8gSG9yaXpvbnRlMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYT
-AkJSMRkwFwYDVQQDExBjYWZlLnB1Y21pbmFzLmJyMB4XDTEyMDIxMDE5MTMzM1oX
-DTE1MDIwOTE5MTMzM1owgcExOTA3BgNVBAoTMFBvbnRpZmljaWEgVW5pdmVyc2lk
-YWRlIENhdG9saWNhIGRlIG1pbmFzIEdlcmFpczEMMAoGA1UECxMDQ1BEMR4wHAYJ
-KoZIhvcNAQkBFg9ub2NAcHVjbWluYXMuYnIxFzAVBgNVBAcTDkJlbG8gSG9yaXpv
-bnRlMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRkwFwYDVQQD
-ExBjYWZlLnB1Y21pbmFzLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAu8xto797YLkjEJQO97dSTCbcXYuV4ojfqizN+OHnEXZ3RPeuCXRXQWWvEvnz
-OAiN7sWwzvg1/doaFU3kkdV1iECLKGS+9PkaTkk+q0of8F613bvZR5wugJCU6NeF
-7PK2Bri7u0Jg8HXCTrY8ZaVRy5IYr9vbDdK3JVoDVjYGtKCUcfqiydqyo0Zdl4++
-tbc48bYX9HpZACRzBdu7puG8mC7BtgSo34NJVb9fAEJPHZ6m8ytD1y2+gNcT3HdK
-Ux8t3DGVF6rJ/YenaeodlHUEF/Hxe9SlyrFi5aqX+rp7qUQ1F2EYV64jueu7rCCj
-vpIulLXvyUILLQlPGFYSkuYCzwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAcpMOJ
-9UvfI1qAadm8Dy4HvKLLBOLnVITVZw3gL8zhBJqeJkCH4C6Hp1qJp8SkX7Sx7J8L
-FM92GIwZFrjHxHij8XlyYBl/yLI+Zphu70i6C1IfY4RemAV0uHApderKN0SLva0B
-3vvA13+5eix9tXI5KNn/9GJQNB4ia/J+GwnUPi8QvlhCKAxmqOLqJwyZjaUF+6gh
-OpSYuwO0tnawCMhsqxWvp/MXPBlqpUmdW5OwRhKrH8B7PlFNppIGLDywLT4VBP9o
-9T1FO66JPad97BZyZTuhrTb847mIRSH//iqcCYU98z1r/WXaGOsIZ13w8WCGf2sI
-+s1WyKG/b3PVUZBm
-            </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>
-      
-MIID+DCCAuACAQAwDQYJKoZIhvcNAQEFBQAwgcExOTA3BgNVBAoTMFBvbnRpZmlj
-aWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRlIG1pbmFzIEdlcmFpczEMMAoGA1UE
-CxMDQ1BEMR4wHAYJKoZIhvcNAQkBFg9ub2NAcHVjbWluYXMuYnIxFzAVBgNVBAcT
-DkJlbG8gSG9yaXpvbnRlMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYT
-AkJSMRkwFwYDVQQDExBjYWZlLnB1Y21pbmFzLmJyMB4XDTEyMDIxMDE5MTMzM1oX
-DTE1MDIwOTE5MTMzM1owgcExOTA3BgNVBAoTMFBvbnRpZmljaWEgVW5pdmVyc2lk
-YWRlIENhdG9saWNhIGRlIG1pbmFzIEdlcmFpczEMMAoGA1UECxMDQ1BEMR4wHAYJ
-KoZIhvcNAQkBFg9ub2NAcHVjbWluYXMuYnIxFzAVBgNVBAcTDkJlbG8gSG9yaXpv
-bnRlMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMRkwFwYDVQQD
-ExBjYWZlLnB1Y21pbmFzLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAu8xto797YLkjEJQO97dSTCbcXYuV4ojfqizN+OHnEXZ3RPeuCXRXQWWvEvnz
-OAiN7sWwzvg1/doaFU3kkdV1iECLKGS+9PkaTkk+q0of8F613bvZR5wugJCU6NeF
-7PK2Bri7u0Jg8HXCTrY8ZaVRy5IYr9vbDdK3JVoDVjYGtKCUcfqiydqyo0Zdl4++
-tbc48bYX9HpZACRzBdu7puG8mC7BtgSo34NJVb9fAEJPHZ6m8ytD1y2+gNcT3HdK
-Ux8t3DGVF6rJ/YenaeodlHUEF/Hxe9SlyrFi5aqX+rp7qUQ1F2EYV64jueu7rCCj
-vpIulLXvyUILLQlPGFYSkuYCzwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAcpMOJ
-9UvfI1qAadm8Dy4HvKLLBOLnVITVZw3gL8zhBJqeJkCH4C6Hp1qJp8SkX7Sx7J8L
-FM92GIwZFrjHxHij8XlyYBl/yLI+Zphu70i6C1IfY4RemAV0uHApderKN0SLva0B
-3vvA13+5eix9tXI5KNn/9GJQNB4ia/J+GwnUPi8QvlhCKAxmqOLqJwyZjaUF+6gh
-OpSYuwO0tnawCMhsqxWvp/MXPBlqpUmdW5OwRhKrH8B7PlFNppIGLDywLT4VBP9o
-9T1FO66JPad97BZyZTuhrTb847mIRSH//iqcCYU98z1r/WXaGOsIZ13w8WCGf2sI
-+s1WyKG/b3PVUZBm
-
-            </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 c8d73b19..00000000
--- a/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://cafe.sti.uff.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC3jCCAcYCAQAwDQYJKoZIhvcNAQEFBQAwNTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEYMBYGA1UEAxMPY2FmZS5zdGkudWZmLmJyMB4XDTE1MDMwNjEzMjYz
-MloXDTIwMDMwNDEzMjYzMlowNTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEY
-MBYGA1UEAxMPY2FmZS5zdGkudWZmLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA174aH+85vMtUCFZixKVVagtPNB8dDsOZy1yfoBtt5doQbTJ940sE
-fZaqV7ZseZUywzki5ywXb1exPWVIRcfcm4MXq0W9Aa4+ObS4+MnB24rHzAOTB9gq
-D2vtr500abR7kKmoj/DelinGZ3yQmsvTOLFn0O9TH+dsVuJeF7HGkGhqmX77PGSB
-kii2+lO1ZVBap6NTacu8H7GEK9ci5Qjl4xXYaDCq8SXs0Ms0psSzG++wpyyyPV9W
-q2qNmLGVxxXd+hWwQwCieLYc3PuE9jeDkWJe8a25AvjwTmoIohyYciOw2P+3muN4
-Pozn6TM3oFVw8cm41jTiuQJsUyxjFDAyTwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQBkp0lu/zIeWo4OHVVhqTbPxcoMQ7UnBUJuku12ZmIfDb6FDiHlQitwTuBrep87
-A3oEmVN9BTLr/r8iw58Bfze/kYGQW9P7QOObOWaBDVuWPN2DLvBO2uvMSuOEZoI0
-3NCuLr5mi+Ahkwg+3Skgxa/LoT9ata18j2g11Jpa1z609buu7LJ2BBZ0etaxG6M9
-5zCCsP9j3MJ90/gsPT+dv/c2F3zOBq1hH7zzU2D16+wPX75vEd6ZQWzRacaUhaCu
-XBWbFnTZT9kXDNGoyyO5IgDXwprECJG1PeeqgD/j7iNWqeynNxuOQY7bKFMx8sjj
-noYKknCKZFy1OZxKXL8q2O1w
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.sti.uff.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.sti.uff.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.sti.uff.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.sti.uff.br/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">uff.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC3jCCAcYCAQAwDQYJKoZIhvcNAQEFBQAwNTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEYMBYGA1UEAxMPY2FmZS5zdGkudWZmLmJyMB4XDTE1MDMwNjEzMjYz
-MloXDTIwMDMwNDEzMjYzMlowNTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEY
-MBYGA1UEAxMPY2FmZS5zdGkudWZmLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA174aH+85vMtUCFZixKVVagtPNB8dDsOZy1yfoBtt5doQbTJ940sE
-fZaqV7ZseZUywzki5ywXb1exPWVIRcfcm4MXq0W9Aa4+ObS4+MnB24rHzAOTB9gq
-D2vtr500abR7kKmoj/DelinGZ3yQmsvTOLFn0O9TH+dsVuJeF7HGkGhqmX77PGSB
-kii2+lO1ZVBap6NTacu8H7GEK9ci5Qjl4xXYaDCq8SXs0Ms0psSzG++wpyyyPV9W
-q2qNmLGVxxXd+hWwQwCieLYc3PuE9jeDkWJe8a25AvjwTmoIohyYciOw2P+3muN4
-Pozn6TM3oFVw8cm41jTiuQJsUyxjFDAyTwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQBkp0lu/zIeWo4OHVVhqTbPxcoMQ7UnBUJuku12ZmIfDb6FDiHlQitwTuBrep87
-A3oEmVN9BTLr/r8iw58Bfze/kYGQW9P7QOObOWaBDVuWPN2DLvBO2uvMSuOEZoI0
-3NCuLr5mi+Ahkwg+3Skgxa/LoT9ata18j2g11Jpa1z609buu7LJ2BBZ0etaxG6M9
-5zCCsP9j3MJ90/gsPT+dv/c2F3zOBq1hH7zzU2D16+wPX75vEd6ZQWzRacaUhaCu
-XBWbFnTZT9kXDNGoyyO5IgDXwprECJG1PeeqgD/j7iNWqeynNxuOQY7bKFMx8sjj
-noYKknCKZFy1OZxKXL8q2O1w
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.sti.uff.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.sti.uff.br:8443/idp/profile/SAML1/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">UFF - Universidade Federal Fluminense</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFF - Universidade Federal Fluminense</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFF - Universidade Federal Fluminense</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFF - Universidade Federal Fluminense</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uff.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.uff.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Uenes Vilaca</md:SurName>
-    <md:EmailAddress>uenesvilaca@id.uff.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f80e5d70..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.udesc.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.udesc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.udesc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.udesc.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.udesc.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.udesc.br/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">udesc.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.udesc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.udesc.br:8443/idp/profile/SAML1/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">UDESC - Universidade do Estado de Santa Catarina</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UDESC - Universidade do Estado de Santa Catarina</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UDESC - Universidade do Estado de Santa Catarina</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.udesc.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.udesc.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Setor de Infraestrutura - SETIC</md:SurName>
-    <md:EmailAddress>seinfra.setic@udesc.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 798d9390..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.uesb.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesb.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.uesb.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uesb.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uesb.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uesb.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesb.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesb.br:8443/idp/profile/SAML1/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">UESB - Universidade Estadual do Sudoeste da Bahia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UESB - Universidade Estadual do Sudoeste da Bahia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UESB - Universidade Estadual do Sudoeste da Bahia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uesb.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.uesb.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Leonardo</md:SurName>
-    <md:EmailAddress>leonardo@uesb.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6929fe4c..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.uesc.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.uesc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uesc.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uesc.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uesc.br/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">uesc.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uesc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uesc.br:8443/idp/profile/SAML1/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">UESC - Universidade Estadual de Santa Cruz</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UESC - Universidade Estadual de Santa Cruz</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UESC - Universidade Estadual de Santa Cruz</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uesc.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.uesc.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>UDO/COI</md:SurName>
-    <md:EmailAddress>coi@uesc.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e535a7c0..00000000
--- a/swamid-interfederations-2.0/cafe.uesc.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://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>
-    MIIC/jCCAeYCAQAwDQYJKoZIhvcNAQEFBQAwRTEfMB0GA1UECxMWRGVwYXJ0YW1l
-bnRvOiBOVEkvVUVTQzELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
-cjAeFw0xMzA5MjAxOTEwMjlaFw0xNjA5MTkxOTEwMjlaMEUxHzAdBgNVBAsTFkRl
-cGFydGFtZW50bzogTlRJL1VFU0MxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
-LnVlc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC72oVZgtPa
-vTAXBK6xUApNT4lZl9nN7GnX9MELpR6d9Nd9Hdh2HiK82IFucx1Ma6o48gp2IMoM
-CeMvP9gE+nNh8dTsV949z/EkesXTLqfSx8ZyZkAbULVeBkfjvZ8B4Tc8kFG0FVka
-3niIPQZNV+ojIWUkpCvFE8F5f1Fg/AuGPT7ClVTd/wmJnaCzVeBOv1igIcPIcyUB
-FcJ8pLOhFCP+YOrhen+XEO0B7kMVAfkwFzic7odExmiknQ311Sdt/QaPMF2EWZ7r
-QcBRayAbIx13GYbKiVNZDHv2jSbfrqjbrACLxP17IHtKTjAHTq9zUbtTiaGcwwL8
-F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADxbQRK6vSslFHfXl2hB
-570269W5Y6SzRDM13EUHyINWHWJ7ka3hpWCEA2RpgnmdNPFcbFp7ioyujOJR6moV
-tklji0Sdw9LqVSkACERmCKSa/2gpqIHoSgV+Ddk5VPkt0ATKwvZzyDxk0otvjERQ
-rwO6bZq50HzeV3wx4/P3MGbuaXuxSgP6yNVt9cZskilkG/+QDivmKjK753GbhdfW
-nyAmvI387XNCfg75p89Av9ZvmlAILKkg6XzImyCi27mWB5ANncpv9BH3Ko+Mbs4B
-rcmV/VA5EH2YQ5DgoadWHBSHIZ+ZJJiRFSkFfFyqsCMY5AbVw2kQmS7Og4WC3aYK
-RHc=
-            </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>
-      
-MIIC/jCCAeYCAQAwDQYJKoZIhvcNAQEFBQAwRTEfMB0GA1UECxMWRGVwYXJ0YW1l
-bnRvOiBOVEkvVUVTQzELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNhZmUudWVzYy5i
-cjAeFw0xMzA5MjAxOTEwMjlaFw0xNjA5MTkxOTEwMjlaMEUxHzAdBgNVBAsTFkRl
-cGFydGFtZW50bzogTlRJL1VFU0MxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZl
-LnVlc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC72oVZgtPa
-vTAXBK6xUApNT4lZl9nN7GnX9MELpR6d9Nd9Hdh2HiK82IFucx1Ma6o48gp2IMoM
-CeMvP9gE+nNh8dTsV949z/EkesXTLqfSx8ZyZkAbULVeBkfjvZ8B4Tc8kFG0FVka
-3niIPQZNV+ojIWUkpCvFE8F5f1Fg/AuGPT7ClVTd/wmJnaCzVeBOv1igIcPIcyUB
-FcJ8pLOhFCP+YOrhen+XEO0B7kMVAfkwFzic7odExmiknQ311Sdt/QaPMF2EWZ7r
-QcBRayAbIx13GYbKiVNZDHv2jSbfrqjbrACLxP17IHtKTjAHTq9zUbtTiaGcwwL8
-F6hxMk3iZrsfAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADxbQRK6vSslFHfXl2hB
-570269W5Y6SzRDM13EUHyINWHWJ7ka3hpWCEA2RpgnmdNPFcbFp7ioyujOJR6moV
-tklji0Sdw9LqVSkACERmCKSa/2gpqIHoSgV+Ddk5VPkt0ATKwvZzyDxk0otvjERQ
-rwO6bZq50HzeV3wx4/P3MGbuaXuxSgP6yNVt9cZskilkG/+QDivmKjK753GbhdfW
-nyAmvI387XNCfg75p89Av9ZvmlAILKkg6XzImyCi27mWB5ANncpv9BH3Ko+Mbs4B
-rcmV/VA5EH2YQ5DgoadWHBSHIZ+ZJJiRFSkFfFyqsCMY5AbVw2kQmS7Og4WC3aYK
-RHc=                
-		
-            </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.ufal.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufal.br-idp-shibboleth.xml
deleted file mode 100644
index 5cdc6237..00000000
--- a/swamid-interfederations-2.0/cafe.ufal.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://cafe.ufal.br/idp/shibboleth">
-  <md: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>
-  </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">ufal.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFAL - Universidade Federal de Alagoas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFAL - Universidade Federal de Alagoas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFAL - Universidade Federal de Alagoas</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFAL - Universidade Federal de Alagoas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.ufal.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">https://www.ufal.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDyDCCArACAQAwDQYJKoZIhvcNAQEFBQAwgakxLzAtBgNVBAoTJlVGQUwgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBBbGFnb2FzMQwwCgYDVQQLEwNOVEkxIDAe
-BgkqhkiG9w0BCQEWEWRpb2dvQG50aS51ZmFsLmJyMRAwDgYDVQQHFAdNYWNlacOz
-MRAwDgYDVQQIEwdBbGFnb2FzMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMY2FmZS51
-ZmFsLmJyMB4XDTE0MTAwNjIwNTEzOVoXDTE3MTAwNTIwNTEzOVowgakxLzAtBgNV
-BAoTJlVGQUwgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBBbGFnb2FzMQwwCgYD
-VQQLEwNOVEkxIDAeBgkqhkiG9w0BCQEWEWRpb2dvQG50aS51ZmFsLmJyMRAwDgYD
-VQQHFAdNYWNlacOzMRAwDgYDVQQIEwdBbGFnb2FzMQswCQYDVQQGEwJCUjEVMBMG
-A1UEAxMMY2FmZS51ZmFsLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAvwzH1otQwbdbx7uHECItOI3sAiO9DWNc9mzRRyNrY0t7Xx7xoiblHagjDM/9
-I+pxiJ33ETOdGyr0PGgbZCPccUdUz6Zif5j6g9ioTIg2GUBaH8xU0rJdZF2A3eLn
-Z3s8CzCtYK7gHJhiFfhKWUAyWVCV6wZS46+Iu1Y2g4j3/WnSJA4/65UEtQ40UDFT
-YJclb8X4RHcBXlE39T6RcSUDQWFdEsxunpc3twR5M7adK2oZ4ekQr3zIA64bEahy
-T2XuKNTOuEKtkFG1oRFG1dkhfO5IcYDOCAjd6IPaq0l4r3pqBDSxilriVsb2hLUW
-dKtsnDDdpvhWasb7oqMQTW8/NQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB0poIt
-L7OtIong6o5UdfsFQ/+Pw3LnIPsRXL39191AsSs8PMuVyDd32ngRLjij5fbeWNl6
-WxFh/OfVJJEzLlWylm8NhTQvxQZVLHKni1szVOYOMM7yFVzOoWrTB3eMD8ujJFs1
-1gG6NFum+liNs8R5b2HVgD4eUzK3Z1E1GPTztbA3MzApmmgZ4egDP+BGVZVcmGZv
-BWhIsbMNn/8HHvCtuhefamMfhoqm128bRzWvOcFvXVvv12Bd8hQqvKvI8ukvbfyq
-FqecVU8Rc3XGPdRjnSmC57zvq4iLH4ZJJFJNW2I06mnu2PdBzGe0GcrhsgjijQOI
-PvRE/EdtraBT9cvB
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufal.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufal.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://cafe.ufal.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufal.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufal.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufal.br/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">ufal.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDyDCCArACAQAwDQYJKoZIhvcNAQEFBQAwgakxLzAtBgNVBAoTJlVGQUwgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBBbGFnb2FzMQwwCgYDVQQLEwNOVEkxIDAe
-BgkqhkiG9w0BCQEWEWRpb2dvQG50aS51ZmFsLmJyMRAwDgYDVQQHFAdNYWNlacOz
-MRAwDgYDVQQIEwdBbGFnb2FzMQswCQYDVQQGEwJCUjEVMBMGA1UEAxMMY2FmZS51
-ZmFsLmJyMB4XDTE0MTAwNjIwNTEzOVoXDTE3MTAwNTIwNTEzOVowgakxLzAtBgNV
-BAoTJlVGQUwgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBBbGFnb2FzMQwwCgYD
-VQQLEwNOVEkxIDAeBgkqhkiG9w0BCQEWEWRpb2dvQG50aS51ZmFsLmJyMRAwDgYD
-VQQHFAdNYWNlacOzMRAwDgYDVQQIEwdBbGFnb2FzMQswCQYDVQQGEwJCUjEVMBMG
-A1UEAxMMY2FmZS51ZmFsLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAvwzH1otQwbdbx7uHECItOI3sAiO9DWNc9mzRRyNrY0t7Xx7xoiblHagjDM/9
-I+pxiJ33ETOdGyr0PGgbZCPccUdUz6Zif5j6g9ioTIg2GUBaH8xU0rJdZF2A3eLn
-Z3s8CzCtYK7gHJhiFfhKWUAyWVCV6wZS46+Iu1Y2g4j3/WnSJA4/65UEtQ40UDFT
-YJclb8X4RHcBXlE39T6RcSUDQWFdEsxunpc3twR5M7adK2oZ4ekQr3zIA64bEahy
-T2XuKNTOuEKtkFG1oRFG1dkhfO5IcYDOCAjd6IPaq0l4r3pqBDSxilriVsb2hLUW
-dKtsnDDdpvhWasb7oqMQTW8/NQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB0poIt
-L7OtIong6o5UdfsFQ/+Pw3LnIPsRXL39191AsSs8PMuVyDd32ngRLjij5fbeWNl6
-WxFh/OfVJJEzLlWylm8NhTQvxQZVLHKni1szVOYOMM7yFVzOoWrTB3eMD8ujJFs1
-1gG6NFum+liNs8R5b2HVgD4eUzK3Z1E1GPTztbA3MzApmmgZ4egDP+BGVZVcmGZv
-BWhIsbMNn/8HHvCtuhefamMfhoqm128bRzWvOcFvXVvv12Bd8hQqvKvI8ukvbfyq
-FqecVU8Rc3XGPdRjnSmC57zvq4iLH4ZJJFJNW2I06mnu2PdBzGe0GcrhsgjijQOI
-PvRE/EdtraBT9cvB
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufal.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufal.br:8443/idp/profile/SAML1/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">UFAL - Universidade Federal de Alagoas</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFAL - Universidade Federal de Alagoas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFAL - Universidade Federal de Alagoas</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFAL - Universidade Federal de Alagoas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.ufal.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">https://www.ufal.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Diogo Cabral de Almeida</md:SurName>
-    <md:EmailAddress>diogo@nti.ufal.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0c7defd4..00000000
--- a/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://cafe.ufba.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID1TCCAr2gAwIBAgIJAIiwOzCHMwd+MA0GCSqGSIb3DQEBCwUAMIGAMQswCQYD
-VQQGEwJCUjEOMAwGA1UECAwFQmFoaWExETAPBgNVBAcMCFNhbHZhZG9yMQ0wCwYD
-VQQKDARVRkJBMQwwCgYDVQQLDANTVEkxFTATBgNVBAMMDGNhZmUudWZiYS5icjEa
-MBgGCSqGSIb3DQEJARYLc3RpQHVmYmEuYnIwHhcNMTUxMDE5MTYyNTUyWhcNMjAx
-MDE3MTYyNTUyWjCBgDELMAkGA1UEBhMCQlIxDjAMBgNVBAgMBUJhaGlhMREwDwYD
-VQQHDAhTYWx2YWRvcjENMAsGA1UECgwEVUZCQTEMMAoGA1UECwwDU1RJMRUwEwYD
-VQQDDAxjYWZlLnVmYmEuYnIxGjAYBgkqhkiG9w0BCQEWC3N0aUB1ZmJhLmJyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA58V0mSKG7+AAJyz2mFDWWgDM
-26rLv667Z2wprnsvPgmLXnp2p2tRtoA/3cmILA8gCO9YXlXD9tPxDRsq2tmZhMgl
-K3dyxYA7FtsJdLURYThMJ5HdHS2cKZpeSfyTELoABH0TDo3/WeAPUyra9Hs8y7Il
-rDDjBewMq8xSQmiRNf8sVlke0iWGjOK1Wm6XZm4F6Ww8N9gFRkD0OzdZINiEF4EJ
-1M5yMkRKsK4mfAemEgW5ipT8OGXvEuiNiGZdy7tTLBpUMkfry3TqJeSGOHS0Wt8Y
-ikxaC3zz/sv+B8BcpUKuDSD5ykuWI5qPF6dHP2gSxJ3/52p2nvkissocnhprywID
-AQABo1AwTjAdBgNVHQ4EFgQUKhtZnHP563+jSKkAz8ZNEhY0WyowHwYDVR0jBBgw
-FoAUKhtZnHP563+jSKkAz8ZNEhY0WyowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAQEAJdV75YTcywT4Z08RUcXUQ1COUdFWPijB39AVeOz9rpG956SNlSh3
-8SLWbTfOseQ8FzDG5mt9toHKnoSo/7CtqvzlQG7YYBVapGxMy7F1R5IFFCHdnb/k
-ECqhyWTU4vn3wB3CNOsI68hBfjZ8EjVvHI9QOzAzerFJ9vpCcXORZ2CjvFiNAmTu
-LpdH6JDSu9UTt4htAVse2eXjeS4pAaNnHsiQq9wmv5hVU693IlDxT8wjiLckKPrp
-iPZuKlqQQ20kKcY9bdviJpryceHvW5OmwxP5X0huSAFqzrFLLxGbxwucwtEgWv2v
-If0w9eTfY0ltoPGddjbkgTmrReY9T8zNdQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufba.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.ufba.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufba.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufba.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufba.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID1TCCAr2gAwIBAgIJAIiwOzCHMwd+MA0GCSqGSIb3DQEBCwUAMIGAMQswCQYD
-VQQGEwJCUjEOMAwGA1UECAwFQmFoaWExETAPBgNVBAcMCFNhbHZhZG9yMQ0wCwYD
-VQQKDARVRkJBMQwwCgYDVQQLDANTVEkxFTATBgNVBAMMDGNhZmUudWZiYS5icjEa
-MBgGCSqGSIb3DQEJARYLc3RpQHVmYmEuYnIwHhcNMTUxMDE5MTYyNTUyWhcNMjAx
-MDE3MTYyNTUyWjCBgDELMAkGA1UEBhMCQlIxDjAMBgNVBAgMBUJhaGlhMREwDwYD
-VQQHDAhTYWx2YWRvcjENMAsGA1UECgwEVUZCQTEMMAoGA1UECwwDU1RJMRUwEwYD
-VQQDDAxjYWZlLnVmYmEuYnIxGjAYBgkqhkiG9w0BCQEWC3N0aUB1ZmJhLmJyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA58V0mSKG7+AAJyz2mFDWWgDM
-26rLv667Z2wprnsvPgmLXnp2p2tRtoA/3cmILA8gCO9YXlXD9tPxDRsq2tmZhMgl
-K3dyxYA7FtsJdLURYThMJ5HdHS2cKZpeSfyTELoABH0TDo3/WeAPUyra9Hs8y7Il
-rDDjBewMq8xSQmiRNf8sVlke0iWGjOK1Wm6XZm4F6Ww8N9gFRkD0OzdZINiEF4EJ
-1M5yMkRKsK4mfAemEgW5ipT8OGXvEuiNiGZdy7tTLBpUMkfry3TqJeSGOHS0Wt8Y
-ikxaC3zz/sv+B8BcpUKuDSD5ykuWI5qPF6dHP2gSxJ3/52p2nvkissocnhprywID
-AQABo1AwTjAdBgNVHQ4EFgQUKhtZnHP563+jSKkAz8ZNEhY0WyowHwYDVR0jBBgw
-FoAUKhtZnHP563+jSKkAz8ZNEhY0WyowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAQEAJdV75YTcywT4Z08RUcXUQ1COUdFWPijB39AVeOz9rpG956SNlSh3
-8SLWbTfOseQ8FzDG5mt9toHKnoSo/7CtqvzlQG7YYBVapGxMy7F1R5IFFCHdnb/k
-ECqhyWTU4vn3wB3CNOsI68hBfjZ8EjVvHI9QOzAzerFJ9vpCcXORZ2CjvFiNAmTu
-LpdH6JDSu9UTt4htAVse2eXjeS4pAaNnHsiQq9wmv5hVU693IlDxT8wjiLckKPrp
-iPZuKlqQQ20kKcY9bdviJpryceHvW5OmwxP5X0huSAFqzrFLLxGbxwucwtEgWv2v
-If0w9eTfY0ltoPGddjbkgTmrReY9T8zNdQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufba.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufba.br:8443/idp/profile/SAML1/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">UFBA - Universidade Federal da Bahia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFBA - Universidade Federal da Bahia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFBA - Universidade Federal da Bahia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufba.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufba.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Luiz Claudio Mendonca</md:SurName>
-    <md:EmailAddress>mendonca@ufba.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufcspa.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufcspa.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 75640840..00000000
--- a/swamid-interfederations-2.0/cafe.ufcspa.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +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://cafe.ufcspa.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFCSPA - Universidade Federal de Ciencias da Saude de Porto Alegre</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFCSPA - Universidade Federal de Ciencias da Saude de Porto Alegre</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFCSPA - Universidade Federal de Ciencias da Saude de Porto Alegre</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFCSPA - Universidade Federal de Ciencias da Saude de Porto Alegre</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufcspa.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufcspa.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxRDBCBgNVBAoUO1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIENpw6puY2lhcyBkYSBTYcO6ZGUgZGUgUG9ydG8gQWxl
-Z3JlMTAwLgYDVQQLFCdOVEkgLSBTZWd1cmFuw6dhIGUgSW5mcmFlc3RydXR1cmEg
-ZGUgVEkxIzAhBgkqhkiG9w0BCQEWFGl0YW1hckB1ZmNzcGEuZWR1LmJyMRUwEwYD
-VQQHEwxQb3J0byBBbGVncmUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQsw
-CQYDVQQGEwJCUjEbMBkGA1UEAxMSY2FmZS51ZmNzcGEuZWR1LmJyMB4XDTE1MDQw
-MjE0NDEwM1oXDTE4MDQwMTE0NDEwM1owgfoxRDBCBgNVBAoUO1VuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRlIENpw6puY2lhcyBkYSBTYcO6ZGUgZGUgUG9ydG8gQWxlZ3Jl
-MTAwLgYDVQQLFCdOVEkgLSBTZWd1cmFuw6dhIGUgSW5mcmFlc3RydXR1cmEgZGUg
-VEkxIzAhBgkqhkiG9w0BCQEWFGl0YW1hckB1ZmNzcGEuZWR1LmJyMRUwEwYDVQQH
-EwxQb3J0byBBbGVncmUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYD
-VQQGEwJCUjEbMBkGA1UEAxMSY2FmZS51ZmNzcGEuZWR1LmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+BM/ItMnOOn6bhr6FpGMQ0pRnNRZ0mZ2BTpd
-OlSCZI98ntMTVlo69W+C/1TL1g/HqbgjRLpjGXOYS2WHNKA3LMsrtQ/b0HRzVQNA
-iKVMg6N0IYesACe9ZjCDrpNKuuBbZJxNOc1vlx9rjSWeCaE5UDaYbEKX74vOARfq
-l2IX+BvAedwveFUQIyy4JtiONibaRAp24204PBq7QLy9VrR1FxMbr9xoIf7Ecrva
-E/edUSF5j9vvkVZscgGWr1XeKieL/Mx5SplLVtPxghnMpOhf3evM+9z9U1I+ZgGC
-ae+jLwgc/mx90oZDSWGtXHMWwucqnBflu+bnVvEnV7WM4TRV5QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQCacP6wgBgHrY/8ip4sa33EN6zBDJzYqSfxmfDgKCTIFveu
-sXqIE2v5kuBsn/zw+fd9Y4riCW/ScafRDH6jTEXKGgG+en7JTKndEi1ZMrMu+Siy
-PCV3Zh9bOGNxa6qMujHSbhfl18PciiXlPyL0i+BAzzc2124RpZSe7Bs1ZUgmR3ST
-ODFSUPfi2/g3KElLRiLso20Yt7k0nt5/Q8WepvXMuMyxj7LgRovCyaUpCFy6hR3M
-+CRgG9xlDUdTu+5ipPN/o2xwSkbz9Fl+K63QFBZJ2eT2etcV3jqjdbWsXm8+egdb
-gTEteRmV6VcEjXwkFMhyeqOlgLUlaa3h8D3Leu/W
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufcspa.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufcspa.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://cafe.ufcspa.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufcspa.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufcspa.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufcspa.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEajCCA1ICAQAwDQYJKoZIhvcNAQEFBQAwgfoxRDBCBgNVBAoUO1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIENpw6puY2lhcyBkYSBTYcO6ZGUgZGUgUG9ydG8gQWxl
-Z3JlMTAwLgYDVQQLFCdOVEkgLSBTZWd1cmFuw6dhIGUgSW5mcmFlc3RydXR1cmEg
-ZGUgVEkxIzAhBgkqhkiG9w0BCQEWFGl0YW1hckB1ZmNzcGEuZWR1LmJyMRUwEwYD
-VQQHEwxQb3J0byBBbGVncmUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQsw
-CQYDVQQGEwJCUjEbMBkGA1UEAxMSY2FmZS51ZmNzcGEuZWR1LmJyMB4XDTE1MDQw
-MjE0NDEwM1oXDTE4MDQwMTE0NDEwM1owgfoxRDBCBgNVBAoUO1VuaXZlcnNpZGFk
-ZSBGZWRlcmFsIGRlIENpw6puY2lhcyBkYSBTYcO6ZGUgZGUgUG9ydG8gQWxlZ3Jl
-MTAwLgYDVQQLFCdOVEkgLSBTZWd1cmFuw6dhIGUgSW5mcmFlc3RydXR1cmEgZGUg
-VEkxIzAhBgkqhkiG9w0BCQEWFGl0YW1hckB1ZmNzcGEuZWR1LmJyMRUwEwYDVQQH
-EwxQb3J0byBBbGVncmUxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYD
-VQQGEwJCUjEbMBkGA1UEAxMSY2FmZS51ZmNzcGEuZWR1LmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+BM/ItMnOOn6bhr6FpGMQ0pRnNRZ0mZ2BTpd
-OlSCZI98ntMTVlo69W+C/1TL1g/HqbgjRLpjGXOYS2WHNKA3LMsrtQ/b0HRzVQNA
-iKVMg6N0IYesACe9ZjCDrpNKuuBbZJxNOc1vlx9rjSWeCaE5UDaYbEKX74vOARfq
-l2IX+BvAedwveFUQIyy4JtiONibaRAp24204PBq7QLy9VrR1FxMbr9xoIf7Ecrva
-E/edUSF5j9vvkVZscgGWr1XeKieL/Mx5SplLVtPxghnMpOhf3evM+9z9U1I+ZgGC
-ae+jLwgc/mx90oZDSWGtXHMWwucqnBflu+bnVvEnV7WM4TRV5QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQCacP6wgBgHrY/8ip4sa33EN6zBDJzYqSfxmfDgKCTIFveu
-sXqIE2v5kuBsn/zw+fd9Y4riCW/ScafRDH6jTEXKGgG+en7JTKndEi1ZMrMu+Siy
-PCV3Zh9bOGNxa6qMujHSbhfl18PciiXlPyL0i+BAzzc2124RpZSe7Bs1ZUgmR3ST
-ODFSUPfi2/g3KElLRiLso20Yt7k0nt5/Q8WepvXMuMyxj7LgRovCyaUpCFy6hR3M
-+CRgG9xlDUdTu+5ipPN/o2xwSkbz9Fl+K63QFBZJ2eT2etcV3jqjdbWsXm8+egdb
-gTEteRmV6VcEjXwkFMhyeqOlgLUlaa3h8D3Leu/W
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufcspa.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufcspa.edu.br:8443/idp/profile/SAML1/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">UFCSPA - Universidade Federal de Ciencias da Saude de Porto Alegre</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFCSPA - Universidade Federal de Ciencias da Saude de Porto Alegre</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFCSPA - Universidade Federal de Ciencias da Saude de Porto Alegre</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFCSPA - Universidade Federal de Ciencias da Saude de Porto Alegre</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufcspa.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufcspa.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Itamar M. da Silva</md:SurName>
-    <md:EmailAddress>itamar@ufcspa.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d29d7a17..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ufop.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxKzApBgNVBAoTIlVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIE91cm8gUHJldG8xDDAKBgNVBAsTA05USTEpMCcGCSqG
-SIb3DQEJARYaZGFuaWVsLmJpY2FsaG9AbnRpLnVmb3AuYnIxEzARBgNVBAcTCk91
-cm8gUHJldG8xFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxFTAT
-BgNVBAMTDGNhZmUudWZvcC5icjAeFw0xNTEyMDcxNjM1NDRaFw0xODEyMDYxNjM1
-NDRaMIG2MSswKQYDVQQKEyJVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBPdXJvIFBy
-ZXRvMQwwCgYDVQQLEwNOVEkxKTAnBgkqhkiG9w0BCQEWGmRhbmllbC5iaWNhbGhv
-QG50aS51Zm9wLmJyMRMwEQYDVQQHEwpPdXJvIFByZXRvMRUwEwYDVQQIEwxNaW5h
-cyBHZXJhaXMxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZlLnVmb3AuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA0fRsDeNvadrIp0Z/l1ez5QPz
-I/ssUFSqEEd0LRHUtpjlcIjv8+ue8mdB0DTLDgwyHNK5/2JCjvHtAFLvm2aitTxF
-OI3FcEs0yE6D4vUETqG+FBWeQMryWihZw6fZMZYxsKU0Krzsv3uOS76QMPlNJIfK
-b4WuwYyHg8fY1n22s5HbVgFU3I+uVFba1yRCxbkOlJiHmyJT8jn31nSXG89q+Aw4
-C24kwspEcMlQI9o3gmWV3BOB9LUA097u83RRHIYj7Let3HFmWnRhobl//+NxOdsG
-JnProi+xH8e1cP7muJGwekvdoFbWmunRehlFw4vA2LYUb+WNLESCRl65WCQ9AgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAHY5ix9yFTNC8JuwgmOZ4zGLAQCWMjQ9SbDN
-vrEH6lpvOo9efFH2zAzxvu8SkmcrYL0yexsvoG/snfnVzNNOTM4GNFWyIwIRWnJB
-YeNnDQcYMEKbLHSjEBDrX2AyvF7IequyK5mbsy4ic1Nrt25iOVfkPCPjMAtOISVb
-IqQ+iNiydXlAGvol6Umg+gThSodbJy6wPe2TVSAiPax9qDdTVfoRBlreH56SYkBS
-kqzE4C2rmTrRyFSx4aPeDFFfxTLb+6pzzGViG4LKjmUnuwBMDf0xUeEzSXtKJt8b
-d1Z09RkELvyaUolyxwbKw1xAZusdas/XqeYVNmpV9JKLyafDkrA=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufop.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.ufop.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufop.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufop.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufop.br/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">ufop.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID4jCCAsoCAQAwDQYJKoZIhvcNAQEFBQAwgbYxKzApBgNVBAoTIlVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIE91cm8gUHJldG8xDDAKBgNVBAsTA05USTEpMCcGCSqG
-SIb3DQEJARYaZGFuaWVsLmJpY2FsaG9AbnRpLnVmb3AuYnIxEzARBgNVBAcTCk91
-cm8gUHJldG8xFTATBgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxFTAT
-BgNVBAMTDGNhZmUudWZvcC5icjAeFw0xNTEyMDcxNjM1NDRaFw0xODEyMDYxNjM1
-NDRaMIG2MSswKQYDVQQKEyJVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBPdXJvIFBy
-ZXRvMQwwCgYDVQQLEwNOVEkxKTAnBgkqhkiG9w0BCQEWGmRhbmllbC5iaWNhbGhv
-QG50aS51Zm9wLmJyMRMwEQYDVQQHEwpPdXJvIFByZXRvMRUwEwYDVQQIEwxNaW5h
-cyBHZXJhaXMxCzAJBgNVBAYTAkJSMRUwEwYDVQQDEwxjYWZlLnVmb3AuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA0fRsDeNvadrIp0Z/l1ez5QPz
-I/ssUFSqEEd0LRHUtpjlcIjv8+ue8mdB0DTLDgwyHNK5/2JCjvHtAFLvm2aitTxF
-OI3FcEs0yE6D4vUETqG+FBWeQMryWihZw6fZMZYxsKU0Krzsv3uOS76QMPlNJIfK
-b4WuwYyHg8fY1n22s5HbVgFU3I+uVFba1yRCxbkOlJiHmyJT8jn31nSXG89q+Aw4
-C24kwspEcMlQI9o3gmWV3BOB9LUA097u83RRHIYj7Let3HFmWnRhobl//+NxOdsG
-JnProi+xH8e1cP7muJGwekvdoFbWmunRehlFw4vA2LYUb+WNLESCRl65WCQ9AgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAHY5ix9yFTNC8JuwgmOZ4zGLAQCWMjQ9SbDN
-vrEH6lpvOo9efFH2zAzxvu8SkmcrYL0yexsvoG/snfnVzNNOTM4GNFWyIwIRWnJB
-YeNnDQcYMEKbLHSjEBDrX2AyvF7IequyK5mbsy4ic1Nrt25iOVfkPCPjMAtOISVb
-IqQ+iNiydXlAGvol6Umg+gThSodbJy6wPe2TVSAiPax9qDdTVfoRBlreH56SYkBS
-kqzE4C2rmTrRyFSx4aPeDFFfxTLb+6pzzGViG4LKjmUnuwBMDf0xUeEzSXtKJt8b
-d1Z09RkELvyaUolyxwbKw1xAZusdas/XqeYVNmpV9JKLyafDkrA=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufop.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufop.br:8443/idp/profile/SAML1/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">UFOP - Universidade Federal de Ouro Preto</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFOP - Universidade Federal de Ouro Preto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFOP - Universidade Federal de Ouro Preto</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufop.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufop.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Daniel Magalhaes Bicalho</md:SurName>
-    <md:EmailAddress>daniel.bicalho@nti.ufop.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufpa.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufpa.br-idp-shibboleth.xml
deleted file mode 100644
index 81e51473..00000000
--- a/swamid-interfederations-2.0/cafe.ufpa.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://cafe.ufpa.br/idp/shibboleth">
-  <md: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>
-  </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">ufpa.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFPA - Universidade Federal do Para</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFPA - Universidade Federal do Para</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFPA - Universidade Federal do Para</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFPA - Universidade Federal do Para</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufpa.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufpa.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDcDCCAlgCAQAwDQYJKoZIhvcNAQEFBQAwfjENMAsGA1UEChMEVUZQQTENMAsG
-A1UECxMEQ1RJQzEbMBkGCSqGSIb3DQEJARYMY3RpY0B1ZnBhLmJyMQ4wDAYDVQQH
-EwVCRUxFTTENMAsGA1UECBMEUEFSQTELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNh
-ZmUudWZwYS5icjAeFw0xNDExMDYxNDEzMzZaFw0xOTExMDUxNDEzMzZaMH4xDTAL
-BgNVBAoTBFVGUEExDTALBgNVBAsTBENUSUMxGzAZBgkqhkiG9w0BCQEWDGN0aWNA
-dWZwYS5icjEOMAwGA1UEBxMFQkVMRU0xDTALBgNVBAgTBFBBUkExCzAJBgNVBAYT
-AkJSMRUwEwYDVQQDEwxjYWZlLnVmcGEuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC9YBhCGCvghJfWlbqNqPAes/VvzKs2G7FQMPeeI0rvzgn6Dzyd
-wsexq07Cj1adg4lR80t/0lcQl2gfahCJMOlTcYMNvmeNhsxsq2VwsOI73mRmedlk
-jIPHPu8fpE69FV4nldafKWRSLfcVkWzMSB48BeM7NQQjC0MYwbaAfRSi49fq/cPo
-25kOXGI8a78fpTkCINthiC6fbicq9ztjNq8ni6WnNvde+zM+VKxgefk3OD+i8du9
-dAR2GzwPz7Qy547kUjen/6TrN1dYJt/sQ6+3MnEabD9YsMrlrg5zUoGuhYzaZRp9
-Ptjmo3OSUGCd6EIIAL89MJV9N2y1EFls2it5AgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBADjRSj+Wn2mBFAy4zYySVRu4C/hoSsO0954xKdrC6MUpWpz1E2R5CVps3dla
-CLZfsN8lAQuXsesz6tIWg3s/S/gxPcfDmyqpk/3QfQyRwFoBI0+vaolLJKuNRfUg
-TxuvnSG9eNxT+gVi4jVGq/VFMCqhNPXJPtIwLi+fFD3hDpf5kbGd0RxE55qgAvVk
-DyX8GBnEN1DrO9/fx9eVMtL4XZqhmi8+N7xzrR/ENvinmOcoBP+/MJBJbKXVogrk
-q+cyRSqYY5v1CHb8m6yXbvjEK/8d7eBqOk3DsqQDQqbAVvUwucunh1X4KE6c7/HR
-JgmG8SX7B3mxxMyusl3faqQlYgk=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpa.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufpa.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://cafe.ufpa.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufpa.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufpa.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufpa.br/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">ufpa.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDcDCCAlgCAQAwDQYJKoZIhvcNAQEFBQAwfjENMAsGA1UEChMEVUZQQTENMAsG
-A1UECxMEQ1RJQzEbMBkGCSqGSIb3DQEJARYMY3RpY0B1ZnBhLmJyMQ4wDAYDVQQH
-EwVCRUxFTTENMAsGA1UECBMEUEFSQTELMAkGA1UEBhMCQlIxFTATBgNVBAMTDGNh
-ZmUudWZwYS5icjAeFw0xNDExMDYxNDEzMzZaFw0xOTExMDUxNDEzMzZaMH4xDTAL
-BgNVBAoTBFVGUEExDTALBgNVBAsTBENUSUMxGzAZBgkqhkiG9w0BCQEWDGN0aWNA
-dWZwYS5icjEOMAwGA1UEBxMFQkVMRU0xDTALBgNVBAgTBFBBUkExCzAJBgNVBAYT
-AkJSMRUwEwYDVQQDEwxjYWZlLnVmcGEuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC9YBhCGCvghJfWlbqNqPAes/VvzKs2G7FQMPeeI0rvzgn6Dzyd
-wsexq07Cj1adg4lR80t/0lcQl2gfahCJMOlTcYMNvmeNhsxsq2VwsOI73mRmedlk
-jIPHPu8fpE69FV4nldafKWRSLfcVkWzMSB48BeM7NQQjC0MYwbaAfRSi49fq/cPo
-25kOXGI8a78fpTkCINthiC6fbicq9ztjNq8ni6WnNvde+zM+VKxgefk3OD+i8du9
-dAR2GzwPz7Qy547kUjen/6TrN1dYJt/sQ6+3MnEabD9YsMrlrg5zUoGuhYzaZRp9
-Ptjmo3OSUGCd6EIIAL89MJV9N2y1EFls2it5AgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBADjRSj+Wn2mBFAy4zYySVRu4C/hoSsO0954xKdrC6MUpWpz1E2R5CVps3dla
-CLZfsN8lAQuXsesz6tIWg3s/S/gxPcfDmyqpk/3QfQyRwFoBI0+vaolLJKuNRfUg
-TxuvnSG9eNxT+gVi4jVGq/VFMCqhNPXJPtIwLi+fFD3hDpf5kbGd0RxE55qgAvVk
-DyX8GBnEN1DrO9/fx9eVMtL4XZqhmi8+N7xzrR/ENvinmOcoBP+/MJBJbKXVogrk
-q+cyRSqYY5v1CHb8m6yXbvjEK/8d7eBqOk3DsqQDQqbAVvUwucunh1X4KE6c7/HR
-JgmG8SX7B3mxxMyusl3faqQlYgk=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpa.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufpa.br:8443/idp/profile/SAML1/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">UFPA - Universidade Federal do Para</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFPA - Universidade Federal do Para</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFPA - Universidade Federal do Para</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFPA - Universidade Federal do Para</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufpa.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufpa.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Hugo Pereira Kuribayashi</md:SurName>
-    <md:EmailAddress>hugok@ufpa.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufpa.br.xml b/swamid-interfederations-2.0/cafe.ufpa.br.xml
deleted file mode 100644
index fe131fa5..00000000
--- a/swamid-interfederations-2.0/cafe.ufpa.br.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cafe.ufpa.br/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ufpa.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFPA - Universidade Federal do Para</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFPA - Universidade Federal do Para</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFPA - Universidade Federal do Para</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFPA - Universidade Federal do Para</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufpa.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufpa.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDuzCCAqOgAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJCUjEN
-MAsGA1UECBMEUGFyYTEOMAwGA1UEBxMFQmVsZW0xDTALBgNVBAoTBFVGUEExDTAL
-BgNVBAsTBENUSUMxGjAYBgkqhkiG9w0BCQEWC2NzaUB1ZnBhLmJyMRUwEwYDVQQD
-EwxjYWZlLnVmcGEuYnIwHhcNMTAwNTI1MjAwOTA4WhcNMTMwNTI0MjAwOTA4WjB9
-MQswCQYDVQQGEwJCUjENMAsGA1UECBMEUGFyYTEOMAwGA1UEBxMFQmVsZW0xDTAL
-BgNVBAoTBFVGUEExDTALBgNVBAsTBENUSUMxGjAYBgkqhkiG9w0BCQEWC2NzaUB1
-ZnBhLmJyMRUwEwYDVQQDEwxjYWZlLnVmcGEuYnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC9YBhCGCvghJfWlbqNqPAes/VvzKs2G7FQMPeeI0rvzgn6
-Dzydwsexq07Cj1adg4lR80t/0lcQl2gfahCJMOlTcYMNvmeNhsxsq2VwsOI73mRm
-edlkjIPHPu8fpE69FV4nldafKWRSLfcVkWzMSB48BeM7NQQjC0MYwbaAfRSi49fq
-/cPo25kOXGI8a78fpTkCINthiC6fbicq9ztjNq8ni6WnNvde+zM+VKxgefk3OD+i
-8du9dAR2GzwPz7Qy547kUjen/6TrN1dYJt/sQ6+3MnEabD9YsMrlrg5zUoGuhYza
-ZRp9Ptjmo3OSUGCd6EIIAL89MJV9N2y1EFls2it5AgMBAAGjRjBEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgWgMCoGA1UdJQQjMCEGCCsGAQUFBwMBBglghkgBhvhCBAEG
-CisGAQQBgjcKAwMwDQYJKoZIhvcNAQEFBQADggEBAKJiAYvrJHcBn0l4em/prU+H
-74Cq3j2bFUbDYzlDSFIJitxuysLDW2IMDkQm4lzv6XXM+wXfQ7BEgxRHJM4MrsKd
-BUPwRd6zlyOIrmBp3/zQZagepSdGijmypRksrlrzki0YaYOsFNPNmX4KLgpoLcoC
-h9qZiPsf7/HuY0rfH4qhQmX8p9hkG6Xfy5peHHH1isqW9sBRrnESYbOTnV0qqelc
-6Xt/cYiGF/IqlCoDef8Ckk4osN05i1GWtZBE7J5tzo/zlnmzoZw12AZeYT9fiX8M
-pvK4HkMxNpibdkH17SkgfEtHwfbcefaj3KDJHD+ZDP7tsupVBpfYQ4U5L5dzinI=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpa.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufpa.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cafe.ufpa.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufpa.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufpa.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufpa.br/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ufpa.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDuzCCAqOgAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJCUjEN
-MAsGA1UECBMEUGFyYTEOMAwGA1UEBxMFQmVsZW0xDTALBgNVBAoTBFVGUEExDTAL
-BgNVBAsTBENUSUMxGjAYBgkqhkiG9w0BCQEWC2NzaUB1ZnBhLmJyMRUwEwYDVQQD
-EwxjYWZlLnVmcGEuYnIwHhcNMTAwNTI1MjAwOTA4WhcNMTMwNTI0MjAwOTA4WjB9
-MQswCQYDVQQGEwJCUjENMAsGA1UECBMEUGFyYTEOMAwGA1UEBxMFQmVsZW0xDTAL
-BgNVBAoTBFVGUEExDTALBgNVBAsTBENUSUMxGjAYBgkqhkiG9w0BCQEWC2NzaUB1
-ZnBhLmJyMRUwEwYDVQQDEwxjYWZlLnVmcGEuYnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC9YBhCGCvghJfWlbqNqPAes/VvzKs2G7FQMPeeI0rvzgn6
-Dzydwsexq07Cj1adg4lR80t/0lcQl2gfahCJMOlTcYMNvmeNhsxsq2VwsOI73mRm
-edlkjIPHPu8fpE69FV4nldafKWRSLfcVkWzMSB48BeM7NQQjC0MYwbaAfRSi49fq
-/cPo25kOXGI8a78fpTkCINthiC6fbicq9ztjNq8ni6WnNvde+zM+VKxgefk3OD+i
-8du9dAR2GzwPz7Qy547kUjen/6TrN1dYJt/sQ6+3MnEabD9YsMrlrg5zUoGuhYza
-ZRp9Ptjmo3OSUGCd6EIIAL89MJV9N2y1EFls2it5AgMBAAGjRjBEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgWgMCoGA1UdJQQjMCEGCCsGAQUFBwMBBglghkgBhvhCBAEG
-CisGAQQBgjcKAwMwDQYJKoZIhvcNAQEFBQADggEBAKJiAYvrJHcBn0l4em/prU+H
-74Cq3j2bFUbDYzlDSFIJitxuysLDW2IMDkQm4lzv6XXM+wXfQ7BEgxRHJM4MrsKd
-BUPwRd6zlyOIrmBp3/zQZagepSdGijmypRksrlrzki0YaYOsFNPNmX4KLgpoLcoC
-h9qZiPsf7/HuY0rfH4qhQmX8p9hkG6Xfy5peHHH1isqW9sBRrnESYbOTnV0qqelc
-6Xt/cYiGF/IqlCoDef8Ckk4osN05i1GWtZBE7J5tzo/zlnmzoZw12AZeYT9fiX8M
-pvK4HkMxNpibdkH17SkgfEtHwfbcefaj3KDJHD+ZDP7tsupVBpfYQ4U5L5dzinI=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufpa.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufpa.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UFPA - Universidade Federal do Para</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFPA - Universidade Federal do Para</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFPA - Universidade Federal do Para</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFPA - Universidade Federal do Para</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufpa.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufpa.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Hugo Pereira Kuribayashi</SurName>
-    <EmailAddress>hugok@ufpa.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml
deleted file mode 100644
index e181eeb1..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.ufra.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.ufra.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.ufra.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.ufra.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.ufra.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.ufra.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.ufra.edu.br:8443/idp/profile/SAML1/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">UFRA - Universidade  Federal Rural da Amazonia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFRA - Universidade  Federal Rural da Amazonia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFRA - Universidade  Federal Rural da Amazonia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufra.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufra.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Joaquim de Jesus Soares</md:SurName>
-    <md:EmailAddress>admin@ufra.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f4268e05..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.unicentro.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unicentro.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.unicentro.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unicentro.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unicentro.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unicentro.br/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">unicentro.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unicentro.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unicentro.br:8443/idp/profile/SAML1/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">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNICENTRO - Universidade Estadual do Centro-Oeste do Parana</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unicentro.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unicentro.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Mauricio Adriano Teixeira</md:SurName>
-    <md:EmailAddress>madriano@unicentro.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0e3bcb80..00000000
--- a/swamid-interfederations-2.0/cafe.unicentro.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://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>
-    MIIEWjCCA0ICAQAwDQYJKoZIhvcNAQEFBQAwgfIxRDBCBgNVBAoTO1VOSUNFTlRS
-TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUgZG8gUGFy
-YW5hMTowOAYDVQQLFDFDT09SVEkgLSBDb29yZGVuYWRvcmlhIGRlIFRlY25vbG9n
-aWEgZSBJbmZvcm1h52FvMR8wHQYJKoZIhvcNAQkBFhB3ZWJAdW5pY2VudHJvLmJy
-MRMwEQYDVQQHEwpHdWFyYXB1YXZhMQ8wDQYDVQQIEwZQYXJhbmExCzAJBgNVBAYT
-AkJSMRowGAYDVQQDExFjYWZlLnVuaWNlbnRyby5icjAeFw0xMzEwMjQxNjI5NTla
-Fw0xNjEwMjMxNjI5NTlaMIHyMUQwQgYDVQQKEztVTklDRU5UUk8gLSBVbml2ZXJz
-aWRhZGUgRXN0YWR1YWwgZG8gQ2VudHJvLU9lc3RlIGRvIFBhcmFuYTE6MDgGA1UE
-CxQxQ09PUlRJIC0gQ29vcmRlbmFkb3JpYSBkZSBUZWNub2xvZ2lhIGUgSW5mb3Jt
-YedhbzEfMB0GCSqGSIb3DQEJARYQd2ViQHVuaWNlbnRyby5icjETMBEGA1UEBxMK
-R3VhcmFwdWF2YTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJCUjEaMBgGA1UE
-AxMRY2FmZS51bmljZW50cm8uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC607Qfkx4TEKYhLrko/Wedr9CcRZhxTEwI1gSiQnR1jTtH4tciXzJYWhLa
-RMayXwdv7790MNiDf+dQqwwyIVXUQTyTxvt/ZBXHuDzdFJ55UaqzxcL64Ppxhs/Q
-UoFt+/IO2eOWgOmAcj4R4oiebL62UJXSiMUVQ6tsmZFjiVnCR3bbf/vaJfn0Av50
-Tht6lf0BQOdaKug/lhVpoubXl+F19gH+6wne+GdMxqb4GTuLNliJiXPkMDPKzAF6
-DMwHruOiz6zLzvTYAlVIsOlHcRpHJD9Pm7wm9xQtbDpNZbRantZc03ca2vrzTpPt
-MhRZWyij1cjww58GxRXyrLL180JHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEqe
-7k9//oLDi60deCaFZNsOMBlNpkQxW4wHYtgUJ16ZJKpVDq6HO8c/rBYXrTPRbPjf
-vE6cmv/20uVkMCpRwGCZ4ndzkQLZsveT6Ro3gkGzBsQmJs4Ujd1e2vhVr6RRbgTF
-9dbIMcngDRakeFx76lnLx6w2LbVuaTCw4iwwmMUSF+xDNorZeN2za/7B1hFKP4im
-H1niJe6ks5HnzSGtY84qpuCMkWvw3vQPgekrU7NJZ7JvYNR23GJ18EzQYH/Bi88D
-rKEQ5KnwgbMVxET6a4vsKXDzNYbLeMHGt6mIunciYbQzuXcCg++QthuBqng8Wre+
-uIoHx7ZhxQYffJyfRtc=
-            </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>
-      
-MIIEWjCCA0ICAQAwDQYJKoZIhvcNAQEFBQAwgfIxRDBCBgNVBAoTO1VOSUNFTlRS
-TyAtIFVuaXZlcnNpZGFkZSBFc3RhZHVhbCBkbyBDZW50cm8tT2VzdGUgZG8gUGFy
-YW5hMTowOAYDVQQLFDFDT09SVEkgLSBDb29yZGVuYWRvcmlhIGRlIFRlY25vbG9n
-aWEgZSBJbmZvcm1h52FvMR8wHQYJKoZIhvcNAQkBFhB3ZWJAdW5pY2VudHJvLmJy
-MRMwEQYDVQQHEwpHdWFyYXB1YXZhMQ8wDQYDVQQIEwZQYXJhbmExCzAJBgNVBAYT
-AkJSMRowGAYDVQQDExFjYWZlLnVuaWNlbnRyby5icjAeFw0xMzEwMjQxNjI5NTla
-Fw0xNjEwMjMxNjI5NTlaMIHyMUQwQgYDVQQKEztVTklDRU5UUk8gLSBVbml2ZXJz
-aWRhZGUgRXN0YWR1YWwgZG8gQ2VudHJvLU9lc3RlIGRvIFBhcmFuYTE6MDgGA1UE
-CxQxQ09PUlRJIC0gQ29vcmRlbmFkb3JpYSBkZSBUZWNub2xvZ2lhIGUgSW5mb3Jt
-YedhbzEfMB0GCSqGSIb3DQEJARYQd2ViQHVuaWNlbnRyby5icjETMBEGA1UEBxMK
-R3VhcmFwdWF2YTEPMA0GA1UECBMGUGFyYW5hMQswCQYDVQQGEwJCUjEaMBgGA1UE
-AxMRY2FmZS51bmljZW50cm8uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC607Qfkx4TEKYhLrko/Wedr9CcRZhxTEwI1gSiQnR1jTtH4tciXzJYWhLa
-RMayXwdv7790MNiDf+dQqwwyIVXUQTyTxvt/ZBXHuDzdFJ55UaqzxcL64Ppxhs/Q
-UoFt+/IO2eOWgOmAcj4R4oiebL62UJXSiMUVQ6tsmZFjiVnCR3bbf/vaJfn0Av50
-Tht6lf0BQOdaKug/lhVpoubXl+F19gH+6wne+GdMxqb4GTuLNliJiXPkMDPKzAF6
-DMwHruOiz6zLzvTYAlVIsOlHcRpHJD9Pm7wm9xQtbDpNZbRantZc03ca2vrzTpPt
-MhRZWyij1cjww58GxRXyrLL180JHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEqe
-7k9//oLDi60deCaFZNsOMBlNpkQxW4wHYtgUJ16ZJKpVDq6HO8c/rBYXrTPRbPjf
-vE6cmv/20uVkMCpRwGCZ4ndzkQLZsveT6Ro3gkGzBsQmJs4Ujd1e2vhVr6RRbgTF
-9dbIMcngDRakeFx76lnLx6w2LbVuaTCw4iwwmMUSF+xDNorZeN2za/7B1hFKP4im
-H1niJe6ks5HnzSGtY84qpuCMkWvw3vQPgekrU7NJZ7JvYNR23GJ18EzQYH/Bi88D
-rKEQ5KnwgbMVxET6a4vsKXDzNYbLeMHGt6mIunciYbQzuXcCg++QthuBqng8Wre+
-uIoHx7ZhxQYffJyfRtc=
-                    
-            </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 98f11a74..00000000
--- a/swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +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://cafe.unifap.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDvDCCAqQCAQAwDQYJKoZIhvcNAQEFBQAwgaMxLzAtBgNVBAoTJlVOSUZBUCAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFtYXBhMQwwCgYDVQQLEwNOVEkxHjAc
-BgkqhkiG9w0BCQEWD3NhbWlyQHVuaWZhcC5icjEPMA0GA1UEBxMGTWFjYXBhMQsw
-CQYDVQQIEwJBUDELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNhZmUudW5pZmFwLmJy
-MB4XDTE1MDUwNDE3MTgwN1oXDTIwMDUwMjE3MTgwN1owgaMxLzAtBgNVBAoTJlVO
-SUZBUCAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFtYXBhMQwwCgYDVQQLEwNO
-VEkxHjAcBgkqhkiG9w0BCQEWD3NhbWlyQHVuaWZhcC5icjEPMA0GA1UEBxMGTWFj
-YXBhMQswCQYDVQQIEwJBUDELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNhZmUudW5p
-ZmFwLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAucOkVrIgxjos
-ZI3yuv38anNRJ+bMVxVG3UoXo2ow4gvgcU851otZxY6wo1pRAFskGI48PhMNz/WK
-FTpfndRu1fswIsmiLNHu+Ts1CqWHHB+6gIR2LtVqrZJGNOBfmgtX45s7GNOrJInJ
-l4X/3KPjDT8zMTWKBP1D/k34T10NsHNrfaYbc1yNLI8sfb/I2er7GBE6dP2mUYoT
-TJZ6Sxy7TG+XgdWHqELRBmbMd8cOxCc4+zb4ehYr40Mr5DXd0/JOdFDZ1SnJdR2X
-c2OQWSeQa0mQSE2Ty17iAd+R0tn8QxJhC3esCbgK/vcLHwhI5dJy5oFTCx9z1G+y
-13in/sAXUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCe8znxlId/tpZn7q3EFr1t
-3s6gzOSZUlptq6MJZ6T5ibUYKv4whoQyoH/a1yPghHv4/ib5VoptSUMi50OoeaWp
-MAXkNP/L+/nLqSSMQCLPAioBmChEo+1+YuWtiHnBI668wUCozM8/k05Av0hfDgJn
-D8EK/3Lh1QJZWEXPei1+1RbK7GNo/Ip9zYMMS2fpR6rk48GuzIMEYjsEkhuUHfNE
-f2DQku+sFfLt5dI95sKDGx3uDKc+E0jHonDK0R3lqwXXp+OcSZgbjhIlC4eez0zi
-R4cuF01gV99fli7Pjp5flwVN7ArlDg5a52acuOmSVVqF+8BZzNBDkMtz/8QvgGhx
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifap.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.unifap.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unifap.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unifap.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unifap.br/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">unifap.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDvDCCAqQCAQAwDQYJKoZIhvcNAQEFBQAwgaMxLzAtBgNVBAoTJlVOSUZBUCAt
-IFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFtYXBhMQwwCgYDVQQLEwNOVEkxHjAc
-BgkqhkiG9w0BCQEWD3NhbWlyQHVuaWZhcC5icjEPMA0GA1UEBxMGTWFjYXBhMQsw
-CQYDVQQIEwJBUDELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNhZmUudW5pZmFwLmJy
-MB4XDTE1MDUwNDE3MTgwN1oXDTIwMDUwMjE3MTgwN1owgaMxLzAtBgNVBAoTJlVO
-SUZBUCAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIEFtYXBhMQwwCgYDVQQLEwNO
-VEkxHjAcBgkqhkiG9w0BCQEWD3NhbWlyQHVuaWZhcC5icjEPMA0GA1UEBxMGTWFj
-YXBhMQswCQYDVQQIEwJBUDELMAkGA1UEBhMCQlIxFzAVBgNVBAMTDmNhZmUudW5p
-ZmFwLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAucOkVrIgxjos
-ZI3yuv38anNRJ+bMVxVG3UoXo2ow4gvgcU851otZxY6wo1pRAFskGI48PhMNz/WK
-FTpfndRu1fswIsmiLNHu+Ts1CqWHHB+6gIR2LtVqrZJGNOBfmgtX45s7GNOrJInJ
-l4X/3KPjDT8zMTWKBP1D/k34T10NsHNrfaYbc1yNLI8sfb/I2er7GBE6dP2mUYoT
-TJZ6Sxy7TG+XgdWHqELRBmbMd8cOxCc4+zb4ehYr40Mr5DXd0/JOdFDZ1SnJdR2X
-c2OQWSeQa0mQSE2Ty17iAd+R0tn8QxJhC3esCbgK/vcLHwhI5dJy5oFTCx9z1G+y
-13in/sAXUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCe8znxlId/tpZn7q3EFr1t
-3s6gzOSZUlptq6MJZ6T5ibUYKv4whoQyoH/a1yPghHv4/ib5VoptSUMi50OoeaWp
-MAXkNP/L+/nLqSSMQCLPAioBmChEo+1+YuWtiHnBI668wUCozM8/k05Av0hfDgJn
-D8EK/3Lh1QJZWEXPei1+1RbK7GNo/Ip9zYMMS2fpR6rk48GuzIMEYjsEkhuUHfNE
-f2DQku+sFfLt5dI95sKDGx3uDKc+E0jHonDK0R3lqwXXp+OcSZgbjhIlC4eez0zi
-R4cuF01gV99fli7Pjp5flwVN7ArlDg5a52acuOmSVVqF+8BZzNBDkMtz/8QvgGhx
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifap.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifap.br:8443/idp/profile/SAML1/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">UNIFAP - Universidade Federal do Amapa</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNIFAP - Universidade Federal do Amapa</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNIFAP -  Universidade Federal do Amapa</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNIFAP -  Universidade Federal do Amapa</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unifap.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unifap.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Samir Patrice</md:SurName>
-    <md:EmailAddress>samir@unifap.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8fb9e60a..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.unifran.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIECDCCAvACAQAwDQYJKoZIhvcNAQEFBQAwgckxKTAnBgNVBAoTIFVOSUZSQU4g
-LSBVbml2ZXJzaWRhZGUgZGUgRnJhbmNhMSEwHwYDVQQLExhUZWNub2xvZ2lhIGRh
-IEluZm9ybWFjYW8xLTArBgkqhkiG9w0BCQEWHmd1c3Rhdm8uY2Fycmlqb0B1bmlm
-cmFuLmVkdS5icjEPMA0GA1UEBxMGRnJhbmNhMRIwEAYDVQQIEwlTYW8gUGF1bG8x
-CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTUwODA1
-MjEyMzM5WhcNMTgwODA0MjEyMzM5WjCByTEpMCcGA1UEChMgVU5JRlJBTiAtIFVu
-aXZlcnNpZGFkZSBkZSBGcmFuY2ExITAfBgNVBAsTGFRlY25vbG9naWEgZGEgSW5m
-b3JtYWNhbzEtMCsGCSqGSIb3DQEJARYeZ3VzdGF2by5jYXJyaWpvQHVuaWZyYW4u
-ZWR1LmJyMQ8wDQYDVQQHEwZGcmFuY2ExEjAQBgNVBAgTCVNhbyBQYXVsbzELMAkG
-A1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUudW5pZnJhbi5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKv46oStnlmR1Fa6hbCcOlgYZVOUCmF9pjXQDR3S
-yNBRtukPkfw/BxrhwnG0jwEVmoHfV0qgTk7gMjNtrJRoFctRQWLzglbxf1yBMTgw
-Pqwv5pJRslIOXJLytk5oOlNgDAzyW9olb4ZH3ykq96ssGxiBN/OqgeLB7jLcQfE6
-t5fPWA8s7fC3OmLvrf9DR/5JV489FjqrJUA2OqOa3ZYGPsOb7Iu+/ZgS3KzbjK/R
-pKOrV2GJBoRBylSW4QyNSjFHjnKWk5nG8AbArPzxc4Rf196xjgrcG6EUn9MgkN+H
-qK33rLEjPYinVgJhVutl4RPf3crIQnH40RlrfLseDxCnN8kCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAMb1OtL57m0uv+XnYIKq7PCPy+mgyfaEzMSLI6rVLiIcHkA6I
-wc46b67j9mG0xkipDaOci/fnSqA+VaVw8dM2NLOVRUgKLwyZ51jm0OojoIxxoXW3
-yQyvEPC3TxFT3C2aVA6u6HaxutoTc3X1iFN0Chp3RhQO1wUIuEpGoDYA4AzBHgsL
-J0KJhJ8we4MfG8Ykhosw2NGe+3KELjm87cy/BWjcfXBGGQ8O14DyEp+xAApMpBlj
-Tq9Q9YkdEX4XhRNU+qD6RUFPA+9a9H8dpeGECQEr6WWP2rhUecqnKFxIkodEJ90z
-mZfMvotH7YIPwtaPNUU2cOEWqWtBS/9iv/WBjQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifran.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.unifran.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unifran.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unifran.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unifran.br/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">unifran.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIECDCCAvACAQAwDQYJKoZIhvcNAQEFBQAwgckxKTAnBgNVBAoTIFVOSUZSQU4g
-LSBVbml2ZXJzaWRhZGUgZGUgRnJhbmNhMSEwHwYDVQQLExhUZWNub2xvZ2lhIGRh
-IEluZm9ybWFjYW8xLTArBgkqhkiG9w0BCQEWHmd1c3Rhdm8uY2Fycmlqb0B1bmlm
-cmFuLmVkdS5icjEPMA0GA1UEBxMGRnJhbmNhMRIwEAYDVQQIEwlTYW8gUGF1bG8x
-CzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTUwODA1
-MjEyMzM5WhcNMTgwODA0MjEyMzM5WjCByTEpMCcGA1UEChMgVU5JRlJBTiAtIFVu
-aXZlcnNpZGFkZSBkZSBGcmFuY2ExITAfBgNVBAsTGFRlY25vbG9naWEgZGEgSW5m
-b3JtYWNhbzEtMCsGCSqGSIb3DQEJARYeZ3VzdGF2by5jYXJyaWpvQHVuaWZyYW4u
-ZWR1LmJyMQ8wDQYDVQQHEwZGcmFuY2ExEjAQBgNVBAgTCVNhbyBQYXVsbzELMAkG
-A1UEBhMCQlIxGDAWBgNVBAMTD2NhZmUudW5pZnJhbi5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKv46oStnlmR1Fa6hbCcOlgYZVOUCmF9pjXQDR3S
-yNBRtukPkfw/BxrhwnG0jwEVmoHfV0qgTk7gMjNtrJRoFctRQWLzglbxf1yBMTgw
-Pqwv5pJRslIOXJLytk5oOlNgDAzyW9olb4ZH3ykq96ssGxiBN/OqgeLB7jLcQfE6
-t5fPWA8s7fC3OmLvrf9DR/5JV489FjqrJUA2OqOa3ZYGPsOb7Iu+/ZgS3KzbjK/R
-pKOrV2GJBoRBylSW4QyNSjFHjnKWk5nG8AbArPzxc4Rf196xjgrcG6EUn9MgkN+H
-qK33rLEjPYinVgJhVutl4RPf3crIQnH40RlrfLseDxCnN8kCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAMb1OtL57m0uv+XnYIKq7PCPy+mgyfaEzMSLI6rVLiIcHkA6I
-wc46b67j9mG0xkipDaOci/fnSqA+VaVw8dM2NLOVRUgKLwyZ51jm0OojoIxxoXW3
-yQyvEPC3TxFT3C2aVA6u6HaxutoTc3X1iFN0Chp3RhQO1wUIuEpGoDYA4AzBHgsL
-J0KJhJ8we4MfG8Ykhosw2NGe+3KELjm87cy/BWjcfXBGGQ8O14DyEp+xAApMpBlj
-Tq9Q9YkdEX4XhRNU+qD6RUFPA+9a9H8dpeGECQEr6WWP2rhUecqnKFxIkodEJ90z
-mZfMvotH7YIPwtaPNUU2cOEWqWtBS/9iv/WBjQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unifran.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unifran.br:8443/idp/profile/SAML1/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">UNIFRAN - Universidade de Franca</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNIFRAN - Universidade de Franca</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNIFRAN - Universidade de Franca</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNIFRAN - Universidade de Franca</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unifran.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unifran.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Gustavo Carrijo</md:SurName>
-    <md:EmailAddress>gustavo@unifran.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0fa667ae..00000000
--- a/swamid-interfederations-2.0/cafe.unifran.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.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>
-    MIIC3DCCAcQCAQAwDQYJKoZIhvcNAQEFBQAwNDELMAkGA1UECxMCVEkxCzAJBgNV
-BAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTIxMDI2MjEwNTU1
-WhcNMTUxMDI2MjEwNTU1WjA0MQswCQYDVQQLEwJUSTELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD2NhZmUudW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKkqnGsjsJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2f
-rWlQKwF5CgOWw7gK9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LA
-YUanFkUjoQW5l/d8e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1
-Bir8ugkuLLCh9SbAi8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTV
-l2HzK8qvKT8vrtLWoLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4T
-IuAYTCKFGnpIabUdeSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-buiwuplrQbmGyfDmc5XfyAo65AH7wkidJlY2jaRkUUujsxy2ZzuIY8HqyyIdrHoo
-QGLhY2nLCWda4nt2UzJHR0VMGWpN/CQEkiFEGc5i7cQNZi52saB/cnTmZdtE049r
-J6vQ+dAtk31SwyDTAjuAosFBPjHJ97v4jsKvuXOux/a2LyCSGIVmCSJ0hx/+I/jl
-wyxhVE8A8h94BZXZ5MthPcudk2OuKfJCvSWpeZyqS1jHfsl18TbYoCIHCM9vlBj0
-yyfpRpUuccnQn3i9Km0c8mqszw7LxVWXQIyCFsNlkZ5k9EzxoNw2PWkusq5ALWBn
-knPC7Pz8oNYCCTafRaBMIA==
-            </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>
-      
-MIIC3DCCAcQCAQAwDQYJKoZIhvcNAQEFBQAwNDELMAkGA1UECxMCVEkxCzAJBgNV
-BAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVuaWZyYW4uYnIwHhcNMTIxMDI2MjEwNTU1
-WhcNMTUxMDI2MjEwNTU1WjA0MQswCQYDVQQLEwJUSTELMAkGA1UEBhMCQlIxGDAW
-BgNVBAMTD2NhZmUudW5pZnJhbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKkqnGsjsJuGEO2HQO+byfGIGEvSQFGpWFn8aVT0C/hp9lbkA+KwJQ2f
-rWlQKwF5CgOWw7gK9gY4Nm4UBMAQUkQPpzq9uARYEJ3PQr74h/EU8Tpq9+Req3LA
-YUanFkUjoQW5l/d8e0jLd4rZutqcGMJQzy1SeES8LPRYQbLWO4jWhZuoJaR/Wcm1
-Bir8ugkuLLCh9SbAi8tq6ZmWA/POw47YB+oFsd/WxY9HEiHdqb/BQyHa/mgAQtTV
-l2HzK8qvKT8vrtLWoLG+EBSzjxBik+gv94mLQ6dr3TY3wgdWu4V4dcJSdaq3WW4T
-IuAYTCKFGnpIabUdeSBTOpFYX01+UO8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-buiwuplrQbmGyfDmc5XfyAo65AH7wkidJlY2jaRkUUujsxy2ZzuIY8HqyyIdrHoo
-QGLhY2nLCWda4nt2UzJHR0VMGWpN/CQEkiFEGc5i7cQNZi52saB/cnTmZdtE049r
-J6vQ+dAtk31SwyDTAjuAosFBPjHJ97v4jsKvuXOux/a2LyCSGIVmCSJ0hx/+I/jl
-wyxhVE8A8h94BZXZ5MthPcudk2OuKfJCvSWpeZyqS1jHfsl18TbYoCIHCM9vlBj0
-yyfpRpUuccnQn3i9Km0c8mqszw7LxVWXQIyCFsNlkZ5k9EzxoNw2PWkusq5ALWBn
-knPC7Pz8oNYCCTafRaBMIA==
-                
-            </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 456d00ed..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.unisc.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unisc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.unisc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.unisc.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.unisc.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.unisc.br/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">unisc.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.unisc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.unisc.br:8443/idp/profile/SAML1/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">UNISC - Universidade de Santa Cruz do Sul</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNISC - Universidade de Santa Cruz do Sul</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNISC - Universidade de Santa Cruz do Sul</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unisc.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unisc.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Cristiano Maynart</md:SurName>
-    <md:EmailAddress>rede@unisc.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 628584ed..00000000
--- a/swamid-interfederations-2.0/cafe.unisc.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.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>
-    MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzENMAsGA1UECxMEU2luZjELMAkG
-A1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTMwMjA2MTc1MzQ1WhcNMTYwMjA2
-MTc1MzQ1WjArMQ0wCwYDVQQLEwRTaW5mMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
-Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxA4rJA1Us3xte9
-CXYcYfkxH/kmOsE1j9N9BqccuWV8wSVuMkQ8V8JDSAm+MyvXTsu6cwhoGeWZtu/D
-wFzvSwX8vaXXsSFFKx+WB6QtmOqWX2rEcn6Z6nGNE41vbKYH8xm71ge47NbTLklJ
-Ml6JnR8qXajr4ewKR4mcsZ0mxa3xii7aLz5MeeE0TQT4N9YX8okE8FADNTCh3bnC
-7eEcjYhgbP71VDZRJFuHHiImn+vBE2dfsLF8sRWbM8hhUkUfZEu3z5rDctjH6TXf
-dkWD2DU1kRSpd6ZxbqoJsBrYTGRlLN83CkNs/pMyP3yQ2CQ5/8HhH5Mh7qgRuPA2
-HnWye90CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAsuqKAz0R93jVSFBhXOkD5EJJ
-knViFHZlqc1ih8WAG1vj7IJMN8TonsmdyMdYxvfDz6bOQdBBZydwu01J4hDh7NU9
-ElT1CBEIojATIRaGry2y+TWr761yDo0ksla1TlOSuse31u9FCEJy7UmdEoslspVp
-ufJBdeOZESeHVkXitYAWCbDB1iKDgyllOob9w+B/2f3MSrz4wkEPKWuLRpFD+5IX
-XBF1RC8/I2AWC2zNjVNRHbINq3dIkkXQV9hjj7i6TdjF43eviD5Rphoq1D29UQGn
-8KlYPGgRz7bqidsVO94mihOF4AtONQ9oOydh3lfdZHKFiRkSSInkr5IH46Alcw==
-            </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>
-      
-MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzENMAsGA1UECxMEU2luZjELMAkG
-A1UEBhMCQlIxDTALBgNVBAMTBGNhZmUwHhcNMTMwMjA2MTc1MzQ1WhcNMTYwMjA2
-MTc1MzQ1WjArMQ0wCwYDVQQLEwRTaW5mMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
-Y2FmZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxA4rJA1Us3xte9
-CXYcYfkxH/kmOsE1j9N9BqccuWV8wSVuMkQ8V8JDSAm+MyvXTsu6cwhoGeWZtu/D
-wFzvSwX8vaXXsSFFKx+WB6QtmOqWX2rEcn6Z6nGNE41vbKYH8xm71ge47NbTLklJ
-Ml6JnR8qXajr4ewKR4mcsZ0mxa3xii7aLz5MeeE0TQT4N9YX8okE8FADNTCh3bnC
-7eEcjYhgbP71VDZRJFuHHiImn+vBE2dfsLF8sRWbM8hhUkUfZEu3z5rDctjH6TXf
-dkWD2DU1kRSpd6ZxbqoJsBrYTGRlLN83CkNs/pMyP3yQ2CQ5/8HhH5Mh7qgRuPA2
-HnWye90CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAsuqKAz0R93jVSFBhXOkD5EJJ
-knViFHZlqc1ih8WAG1vj7IJMN8TonsmdyMdYxvfDz6bOQdBBZydwu01J4hDh7NU9
-ElT1CBEIojATIRaGry2y+TWr761yDo0ksla1TlOSuse31u9FCEJy7UmdEoslspVp
-ufJBdeOZESeHVkXitYAWCbDB1iKDgyllOob9w+B/2f3MSrz4wkEPKWuLRpFD+5IX
-XBF1RC8/I2AWC2zNjVNRHbINq3dIkkXQV9hjj7i6TdjF43eviD5Rphoq1D29UQGn
-8KlYPGgRz7bqidsVO94mihOF4AtONQ9oOydh3lfdZHKFiRkSSInkr5IH46Alcw==
-                    
-            </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 5e533d3f..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.upf.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.upf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.upf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.upf.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.upf.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.upf.br/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">upf.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.upf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.upf.br:8443/idp/profile/SAML1/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">UPF - Universidade de Passo Fundo</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UPF - Universidade de Passo Fundo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UPF - Universidade de Passo Fundo</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UPF - Universidade de Passo Fundo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.upf.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.upf.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>GTI/RNP</md:SurName>
-    <md:EmailAddress>servnac@rnp.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d90930b2..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe.uscs.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe.uscs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.uscs.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.uscs.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.uscs.edu.br/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">uscs.edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.uscs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.uscs.edu.br:8443/idp/profile/SAML1/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">USCS - Universidade Municipal de Sao Caetano do Sul</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">USCS - Universidade Municipal de Sao Caetano do Sul</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">USCS - Universidade Municipal de Sao Caetano do Sul</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uscs.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.uscs.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Eduardo dos Santos</md:SurName>
-    <md:EmailAddress>eduardo@uscs.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9235d654..00000000
--- a/swamid-interfederations-2.0/cafe.uscs.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.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>
-    MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxPTA7BgNVBAoUNFVTQ1MgLSBV
-						bml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2FldGFubyBkbyBTdWwxHDAa
-						BgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxJjAkBgkqhkiG9w0BCQEWF2luZm9y
-						bWF0aWNhQHVzY3MuZWR1LmJyMRwwGgYDVQQHFBNTw6NvIENhZXRhbm8gZG8gU3Vs
-						MRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2Fm
-						ZTAeFw0xMTEwMTAxMzA5NTFaFw0xNDEwMDkxMzA5NTFaMIHUMT0wOwYDVQQKFDRV
-						U0NTIC0gVW5pdmVyc2lkYWRlIE11bmljaXBhbCBkZSBTw6NvIENhZXRhbm8gZG8g
-						U3VsMRwwGgYDVQQLExNEZXBhcnRhbWVudG8gZGUgVElDMSYwJAYJKoZIhvcNAQkB
-						FhdpbmZvcm1hdGljYUB1c2NzLmVkdS5icjEcMBoGA1UEBxQTU8OjbyBDYWV0YW5v
-						IGRvIFN1bDETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMCQlIxDTALBgNV
-						BAMTBGNhZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcyCg45LWr
-						jr2yO56SQbqE6MijQ3QkvD5EWPbQtqw1Ft3GkY2aVS4Q7v+1c0xazvwFO041UX1u
-						7JNkw4pQHb5PDmqJlDnDbLoHiq4VLXMO/6NvfrVlGHD9gevXsNmph689l+giwzKv
-						w95fEa+lm9chHFFaLEVhcrpxLPGNlpsr8dqVoKFayiRptYm+a2TdFRo0UNSDubl9
-						3KyAKYy7W1dMhSpwKKAcq+MgCL1W9ShOqzWwIVP3Xow9w5Ft9z4Wls1hsz7Bbycg
-						lzBdMj3gaFaJHWMng/wl81G6xsXqhoI5l7pYchrKxE2e5TB53XSRisGMh6HT6Afp
-						au8aLT1UJu8XAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABfwqCo0eryKBVy9v5am
-						4cfR+CWi7DUp7G2oHSarHSFVyLoC25SxkEv0V+V6itH9qc01AQQs66MeWjaTeUFM
-						mfmwjjAlswn2/BrV6Tujq9hWzc/mxiBLmGxIwnI26TZYPuN8iNfjRS4BY5MYO9kS
-						tTkHyAwQv6h54K0nvS9ds/Dcnao+wDNG45RNL1F4zuCQ83z5ylISQCRShsY4TSrB
-						Wxnh8bWMDO/Z0sX5H6irYr6nInxP9LwmUPhJBNXQS05pYdumgWI6duPM9bSrJrWr
-						gHPmXGan8FW+6s/8YVMACGZiK7Dl/PQ+cvTDsO+3k9F2lj8uK+fhqp+FMRHlIJgy
-						1FM=
-            </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>
-      
-						MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxPTA7BgNVBAoUNFVTQ1MgLSBV
-						bml2ZXJzaWRhZGUgTXVuaWNpcGFsIGRlIFPDo28gQ2FldGFubyBkbyBTdWwxHDAa
-						BgNVBAsTE0RlcGFydGFtZW50byBkZSBUSUMxJjAkBgkqhkiG9w0BCQEWF2luZm9y
-						bWF0aWNhQHVzY3MuZWR1LmJyMRwwGgYDVQQHFBNTw6NvIENhZXRhbm8gZG8gU3Vs
-						MRMwEQYDVQQIFApTw6NvIFBhdWxvMQswCQYDVQQGEwJCUjENMAsGA1UEAxMEY2Fm
-						ZTAeFw0xMTEwMTAxMzA5NTFaFw0xNDEwMDkxMzA5NTFaMIHUMT0wOwYDVQQKFDRV
-						U0NTIC0gVW5pdmVyc2lkYWRlIE11bmljaXBhbCBkZSBTw6NvIENhZXRhbm8gZG8g
-						U3VsMRwwGgYDVQQLExNEZXBhcnRhbWVudG8gZGUgVElDMSYwJAYJKoZIhvcNAQkB
-						FhdpbmZvcm1hdGljYUB1c2NzLmVkdS5icjEcMBoGA1UEBxQTU8OjbyBDYWV0YW5v
-						IGRvIFN1bDETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMCQlIxDTALBgNV
-						BAMTBGNhZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcyCg45LWr
-						jr2yO56SQbqE6MijQ3QkvD5EWPbQtqw1Ft3GkY2aVS4Q7v+1c0xazvwFO041UX1u
-						7JNkw4pQHb5PDmqJlDnDbLoHiq4VLXMO/6NvfrVlGHD9gevXsNmph689l+giwzKv
-						w95fEa+lm9chHFFaLEVhcrpxLPGNlpsr8dqVoKFayiRptYm+a2TdFRo0UNSDubl9
-						3KyAKYy7W1dMhSpwKKAcq+MgCL1W9ShOqzWwIVP3Xow9w5Ft9z4Wls1hsz7Bbycg
-						lzBdMj3gaFaJHWMng/wl81G6xsXqhoI5l7pYchrKxE2e5TB53XSRisGMh6HT6Afp
-						au8aLT1UJu8XAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABfwqCo0eryKBVy9v5am
-						4cfR+CWi7DUp7G2oHSarHSFVyLoC25SxkEv0V+V6itH9qc01AQQs66MeWjaTeUFM
-						mfmwjjAlswn2/BrV6Tujq9hWzc/mxiBLmGxIwnI26TZYPuN8iNfjRS4BY5MYO9kS
-						tTkHyAwQv6h54K0nvS9ds/Dcnao+wDNG45RNL1F4zuCQ83z5ylISQCRShsY4TSrB
-						Wxnh8bWMDO/Z0sX5H6irYr6nInxP9LwmUPhJBNXQS05pYdumgWI6duPM9bSrJrWr
-						gHPmXGan8FW+6s/8YVMACGZiK7Dl/PQ+cvTDsO+3k9F2lj8uK+fhqp+FMRHlIJgy
-						1FM=
-					
-            </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.usf.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cafe.usf.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 237f4029..00000000
--- a/swamid-interfederations-2.0/cafe.usf.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://cafe.usf.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">USF - Universidade Sao Francisco</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">USF - Universidade Sao Francisco</mdui:DisplayName>
-        <mdui:Description xml:lang="en">USF - Universidade Sao Francisco</mdui:Description>
-        <mdui:Description xml:lang="pt-br">USF - Universidade Sao Francisco</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.usf.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.usf.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxKjAoBgNVBAoUIVVTRiAtIFVu
-aXZlcnNpZGFkZSBTw6NvIEZyYW5jaXNjbzELMAkGA1UECxMCVEkxKDAmBgkqhkiG
-9w0BCQEWGWpvc2UuZ29uY2FsdmVzQHVzZi5lZHUuYnIxGzAZBgNVBAcUEkJyYWdh
-bsOnYSBQYXVsaXN0YTETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMCQlIx
-GDAWBgNVBAMTD2NhZmUudXNmLmVkdS5icjAeFw0xNTA5MzAxNzIyMjRaFw0xODA5
-MjkxNzIyMjRaMIG8MSowKAYDVQQKFCFVU0YgLSBVbml2ZXJzaWRhZGUgU8OjbyBG
-cmFuY2lzY28xCzAJBgNVBAsTAlRJMSgwJgYJKoZIhvcNAQkBFhlqb3NlLmdvbmNh
-bHZlc0B1c2YuZWR1LmJyMRswGQYDVQQHFBJCcmFnYW7Dp2EgUGF1bGlzdGExEzAR
-BgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVz
-Zi5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD2ylg01o7h
-2ql3tCcMIym2xD373BCc9k1ndxmwJ3IE3cuEIQR8tOO5zrVt42yslb0Cm6DpXNHK
-cYxms2OI9DYS1SkGeJyXDMe7tPy4IE4b3RYprbRwTOaQLlePt5MgIhiAek8oPzuh
-C3LxgPqdtzd7aBxq8fu++fYdrTESBa8bCmcqdnU9jmob5jDnxDcDkQ1ertxhlOtn
-sD7iEeoZGWGaIqYlH11+b+UlyYKSqNtKVnqcDWMaRuxYwbe4xUmx2E8LJt+jHQn5
-XyFDkDcwfxetj0FIlhe9umg9vk1L+hCiynyFSXFBgXqUvz0rIIui6yYmAOWrboCY
-YM97hwpC4v2TAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGnkYSv7gZYAbJ2cUUFM
-0Nbd6h77Riukwdw3tL8goc30ats4zwnh8EbDXtAWAQ8dFy8fcGdmLOi7Vq1CmNP2
-zWYqpxIQbPTxJ4PznnzrlxOyfwHROAe52Go0ceFtMd51GUueFV2jioLjn5TaJgey
-AgVlrHPQaJCNPEYFf8tNjgurj6NRtabPpMW8ogr/pX5AJv3xE9OuwCPJ34HO+o7O
-n4OS2VjKptCeJrfZN/7Km5tHaS/xjH5WJkKsZlubo2PrxlgSy1gt11wAhucqWB7v
-Hd/uhgyrVLEXYsMoXfEW2SZCuF4wHOX5RQds9Kmh/F8N9iVjElM3co5gHufh5cxx
-8IY=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.usf.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.usf.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://cafe.usf.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe.usf.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe.usf.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe.usf.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxKjAoBgNVBAoUIVVTRiAtIFVu
-aXZlcnNpZGFkZSBTw6NvIEZyYW5jaXNjbzELMAkGA1UECxMCVEkxKDAmBgkqhkiG
-9w0BCQEWGWpvc2UuZ29uY2FsdmVzQHVzZi5lZHUuYnIxGzAZBgNVBAcUEkJyYWdh
-bsOnYSBQYXVsaXN0YTETMBEGA1UECBQKU8OjbyBQYXVsbzELMAkGA1UEBhMCQlIx
-GDAWBgNVBAMTD2NhZmUudXNmLmVkdS5icjAeFw0xNTA5MzAxNzIyMjRaFw0xODA5
-MjkxNzIyMjRaMIG8MSowKAYDVQQKFCFVU0YgLSBVbml2ZXJzaWRhZGUgU8OjbyBG
-cmFuY2lzY28xCzAJBgNVBAsTAlRJMSgwJgYJKoZIhvcNAQkBFhlqb3NlLmdvbmNh
-bHZlc0B1c2YuZWR1LmJyMRswGQYDVQQHFBJCcmFnYW7Dp2EgUGF1bGlzdGExEzAR
-BgNVBAgUClPDo28gUGF1bG8xCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9jYWZlLnVz
-Zi5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD2ylg01o7h
-2ql3tCcMIym2xD373BCc9k1ndxmwJ3IE3cuEIQR8tOO5zrVt42yslb0Cm6DpXNHK
-cYxms2OI9DYS1SkGeJyXDMe7tPy4IE4b3RYprbRwTOaQLlePt5MgIhiAek8oPzuh
-C3LxgPqdtzd7aBxq8fu++fYdrTESBa8bCmcqdnU9jmob5jDnxDcDkQ1ertxhlOtn
-sD7iEeoZGWGaIqYlH11+b+UlyYKSqNtKVnqcDWMaRuxYwbe4xUmx2E8LJt+jHQn5
-XyFDkDcwfxetj0FIlhe9umg9vk1L+hCiynyFSXFBgXqUvz0rIIui6yYmAOWrboCY
-YM97hwpC4v2TAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGnkYSv7gZYAbJ2cUUFM
-0Nbd6h77Riukwdw3tL8goc30ats4zwnh8EbDXtAWAQ8dFy8fcGdmLOi7Vq1CmNP2
-zWYqpxIQbPTxJ4PznnzrlxOyfwHROAe52Go0ceFtMd51GUueFV2jioLjn5TaJgey
-AgVlrHPQaJCNPEYFf8tNjgurj6NRtabPpMW8ogr/pX5AJv3xE9OuwCPJ34HO+o7O
-n4OS2VjKptCeJrfZN/7Km5tHaS/xjH5WJkKsZlubo2PrxlgSy1gt11wAhucqWB7v
-Hd/uhgyrVLEXYsMoXfEW2SZCuF4wHOX5RQds9Kmh/F8N9iVjElM3co5gHufh5cxx
-8IY=
-                          
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe.usf.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe.usf.edu.br:8443/idp/profile/SAML1/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">USF - Universidade Sao Francisco</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">USF - Universidade Sao Francisco</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">USF - Universidade Sao Francisco</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">USF - Universidade Sao Francisco</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.usf.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.usf.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Eduardo Souza</md:SurName>
-    <md:EmailAddress>jose.goncalves@usf.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d1b9ee1f..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe01.unicamp.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe01.unicamp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe01.unicamp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe01.unicamp.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe01.unicamp.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe01.unicamp.br/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">unicamp.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe01.unicamp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe01.unicamp.br:8443/idp/profile/SAML1/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">UNICAMP - Universidade Estadual de Campinas</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNICAMP - Universidade Estadual de Campinas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNICAMP - Universidade Estadual de Campinas</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNICAMP - Universidade Estadual de Campinas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unicamp.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unicamp.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sandra Regina de Souza</md:SurName>
-    <md:EmailAddress>sandra@ccuec.unicamp.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 762999c8..00000000
--- a/swamid-interfederations-2.0/cafe01.unicamp.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://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>
-    MIIDLzCCAhegAwIBAgIUD0IzyHxq78QCPxPZ4hjKKmByQswwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRY2FmZTAxLnVuaWNhbXAuYnIwHhcNMTMwMTMwMTYyNDIy
-WhcNMzMwMTMwMTYyNDIyWjAcMRowGAYDVQQDExFjYWZlMDEudW5pY2FtcC5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIyIXcS1QMWfmOCDN3RsXb6q
-sEvMJ3nVlAQDx2t6uxtugoXWc7qeGVfVy17GqfkBZeE6Nj1Trr/ZtDT4HR7r2kb0
-pvRll4Vd0xWo6vLbHL1YCLFmEbVdvkm2S8DcYeG4xnLCqMtnboiVUjNOtEVBkC76
-iTq/q2QzTgkf/pBZFzOawZJ+aOQWVguhD/N7m0DPWUfiK52ZVgujFeexjh1NBim1
-LdPfwnc+C//m6M6C6v9Y8f7ARBV6Xq5b3H/M77K/LgTMf52xLUHgGUXYjmNAu6F4
-vxbHHxXYYKF70qPNyBAlXW20sK8KFeYkLjZDu+HnHZLBuXb+1lWEqFCNyGJZm0kC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRY2FmZTAxLnVuaWNhbXAuYnKGKGh0dHBzOi8v
-Y2FmZTAxLnVuaWNhbXAuYnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFT23HRw
-Vv7kTcqFqTEp9uX8RFDNMA0GCSqGSIb3DQEBBQUAA4IBAQAQK2+kRdI8fvJnr/ar
-IWDN2qvEZzZ1stlw7RTOvh3LIjlFE15bzfIinm28RRECJ39qy5AtPijAIWrCUvv6
-Sc60kg6Tx8nziroz6ZBNcCWg6X0yc+QcsO6hUKOQU6Pz1MhVvlHXbQZR4gpJLwxT
-TwjnzdstviPxK/TW90K2szoA2FksmDnBzj+EUK9V/rAsFL/LGAZ9hMUmnGb+Dqf3
-0PLIHUFS51O6VHBHgnx4ladVSLPW+n7Gh33oAXlGdprJEhR17tL0KkLjJBgcHxsU
-7AfWicW3kJ54Qfpa/8agitOLzzV90xf/yrjd2s4HMlQufBOma3pl30Cy7HNThMO4
-PMu5
-            </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>
-      
-MIIDLzCCAhegAwIBAgIUD0IzyHxq78QCPxPZ4hjKKmByQswwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRY2FmZTAxLnVuaWNhbXAuYnIwHhcNMTMwMTMwMTYyNDIy
-WhcNMzMwMTMwMTYyNDIyWjAcMRowGAYDVQQDExFjYWZlMDEudW5pY2FtcC5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIyIXcS1QMWfmOCDN3RsXb6q
-sEvMJ3nVlAQDx2t6uxtugoXWc7qeGVfVy17GqfkBZeE6Nj1Trr/ZtDT4HR7r2kb0
-pvRll4Vd0xWo6vLbHL1YCLFmEbVdvkm2S8DcYeG4xnLCqMtnboiVUjNOtEVBkC76
-iTq/q2QzTgkf/pBZFzOawZJ+aOQWVguhD/N7m0DPWUfiK52ZVgujFeexjh1NBim1
-LdPfwnc+C//m6M6C6v9Y8f7ARBV6Xq5b3H/M77K/LgTMf52xLUHgGUXYjmNAu6F4
-vxbHHxXYYKF70qPNyBAlXW20sK8KFeYkLjZDu+HnHZLBuXb+1lWEqFCNyGJZm0kC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRY2FmZTAxLnVuaWNhbXAuYnKGKGh0dHBzOi8v
-Y2FmZTAxLnVuaWNhbXAuYnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFT23HRw
-Vv7kTcqFqTEp9uX8RFDNMA0GCSqGSIb3DQEBBQUAA4IBAQAQK2+kRdI8fvJnr/ar
-IWDN2qvEZzZ1stlw7RTOvh3LIjlFE15bzfIinm28RRECJ39qy5AtPijAIWrCUvv6
-Sc60kg6Tx8nziroz6ZBNcCWg6X0yc+QcsO6hUKOQU6Pz1MhVvlHXbQZR4gpJLwxT
-TwjnzdstviPxK/TW90K2szoA2FksmDnBzj+EUK9V/rAsFL/LGAZ9hMUmnGb+Dqf3
-0PLIHUFS51O6VHBHgnx4ladVSLPW+n7Gh33oAXlGdprJEhR17tL0KkLjJBgcHxsU
-7AfWicW3kJ54Qfpa/8agitOLzzV90xf/yrjd2s4HMlQufBOma3pl30Cy7HNThMO4
-PMu5
-
-                    
-            </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 bef192aa..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafe1.ufes.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDoDCCAogCAQAwDQYJKoZIhvcNAQEFBQAwgZUxDTALBgNVBAoTBFVGRVMxDDAK
-BgNVBAsTA05USTEmMCQGCSqGSIb3DQEJARYXYW50b25pby5tLnJvY2hhQHVmZXMu
-YnIxEDAOBgNVBAcTB1ZpdG9yaWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQsw
-CQYDVQQGEwJCUjEWMBQGA1UEAxMNY2FmZTEudWZlcy5icjAeFw0xNTAxMDcxNzU0
-NTJaFw0xODAxMDYxNzU0NTJaMIGVMQ0wCwYDVQQKEwRVRkVTMQwwCgYDVQQLEwNO
-VEkxJjAkBgkqhkiG9w0BCQEWF2FudG9uaW8ubS5yb2NoYUB1ZmVzLmJyMRAwDgYD
-VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
-QlIxFjAUBgNVBAMTDWNhZmUxLnVmZXMuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDLb0G4Z/B9GlxpGjL/b6HMukcpJZY4V5hInFe2jRELMHaOjC/H
-a8rkkGE+BF328i+j3TbadC2PztQLcIliu4RnchXFbHnf4rPcEslivY61ScD7Gr5A
-YyVZjy7IFTyujMt0xTxpCCa2ALafqz0wP+0h8vnDIuirI2sbZvMRVTZlEkGxLqiN
-P8E9eXrHeBF0Mqn5Y3ALtmxK/3EhJZGPFb3mpAKA8VVWBbCxcwEMTlBbD2khbxEQ
-4JuBr+c53Mw/Vw+nKwc3TnGC5JIpubdARd/zvBx2ITEw40snOBjVS9eQ2oJb7fQ2
-QUmZSeBOiyT7upWtr5iIRs+pgGx6aRiM7J8jAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAFaMTOaqN0tOvO4r9vNAE5jS9U06yyidIRvCS68Tvx7nbk2H6ij3fX8YxkcM
-pU7Tf5xRjM/4KKCiKn/paBWgiEykCHL49F4ncspsQPqkzV5HM6j/TdbSQXKSnzhT
-hC+UUBcEqAO7VKNIB61EmoYWEYLhb/nRwG3e6SwyqcyxuyslzLdlXTTWJTCFIL4e
-/lcdxU4qaDe9OVFviLm7VUSc5cKdsZ6D/L8y4rs++JDAHcY+AOALUg1f5OtFFn3S
-k0J2vt+xpANqnDVC4sBQlal4XvU3os8bHCVjktGc9TXnJ4ncKQYCX/f00JpRCM0/
-3zZYkTltfRJxIQam1OGU4pKCZlc=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe1.ufes.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafe1.ufes.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafe1.ufes.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafe1.ufes.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafe1.ufes.br/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">ufes.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDoDCCAogCAQAwDQYJKoZIhvcNAQEFBQAwgZUxDTALBgNVBAoTBFVGRVMxDDAK
-BgNVBAsTA05USTEmMCQGCSqGSIb3DQEJARYXYW50b25pby5tLnJvY2hhQHVmZXMu
-YnIxEDAOBgNVBAcTB1ZpdG9yaWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQsw
-CQYDVQQGEwJCUjEWMBQGA1UEAxMNY2FmZTEudWZlcy5icjAeFw0xNTAxMDcxNzU0
-NTJaFw0xODAxMDYxNzU0NTJaMIGVMQ0wCwYDVQQKEwRVRkVTMQwwCgYDVQQLEwNO
-VEkxJjAkBgkqhkiG9w0BCQEWF2FudG9uaW8ubS5yb2NoYUB1ZmVzLmJyMRAwDgYD
-VQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50bzELMAkGA1UEBhMC
-QlIxFjAUBgNVBAMTDWNhZmUxLnVmZXMuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDLb0G4Z/B9GlxpGjL/b6HMukcpJZY4V5hInFe2jRELMHaOjC/H
-a8rkkGE+BF328i+j3TbadC2PztQLcIliu4RnchXFbHnf4rPcEslivY61ScD7Gr5A
-YyVZjy7IFTyujMt0xTxpCCa2ALafqz0wP+0h8vnDIuirI2sbZvMRVTZlEkGxLqiN
-P8E9eXrHeBF0Mqn5Y3ALtmxK/3EhJZGPFb3mpAKA8VVWBbCxcwEMTlBbD2khbxEQ
-4JuBr+c53Mw/Vw+nKwc3TnGC5JIpubdARd/zvBx2ITEw40snOBjVS9eQ2oJb7fQ2
-QUmZSeBOiyT7upWtr5iIRs+pgGx6aRiM7J8jAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAFaMTOaqN0tOvO4r9vNAE5jS9U06yyidIRvCS68Tvx7nbk2H6ij3fX8YxkcM
-pU7Tf5xRjM/4KKCiKn/paBWgiEykCHL49F4ncspsQPqkzV5HM6j/TdbSQXKSnzhT
-hC+UUBcEqAO7VKNIB61EmoYWEYLhb/nRwG3e6SwyqcyxuyslzLdlXTTWJTCFIL4e
-/lcdxU4qaDe9OVFviLm7VUSc5cKdsZ6D/L8y4rs++JDAHcY+AOALUg1f5OtFFn3S
-k0J2vt+xpANqnDVC4sBQlal4XvU3os8bHCVjktGc9TXnJ4ncKQYCX/f00JpRCM0/
-3zZYkTltfRJxIQam1OGU4pKCZlc=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafe1.ufes.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafe1.ufes.br:8443/idp/profile/SAML1/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">UFES - Universidade Federal do Espirito Santo</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFES - Universidade Federal do Espirito Santo</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFES - Universidade Federal do Espirito Santo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufes.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufes.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Renan Manola</md:SurName>
-    <md:EmailAddress>renan.manola@ufes.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 39fcf0b3..00000000
--- a/swamid-interfederations-2.0/cafe1.ufes.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://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>
-    MIIEPDCCAyQCARUwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLVVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIEVzcGlyaXRvIFNhbnRvIC0gVUZFUzEvMC0GA1UECxMm
-TnVjbGVvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3MgLSBOUEQxKDAmBgkqhkiG
-9w0BCQEWGWRpcmV0b3IuZ2VyYWxAbnBkLnVmZXMuYnIxEDAOBgNVBAcTB1ZpdG9y
-aWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQswCQYDVQQGEwJCUjEWMBQGA1UE
-AxMNY2FmZTEudWZlcy5icjAeFw0xMTA4MDMxMzA4MDVaFw0xNDA4MDIxMzA4MDVa
-MIHjMTYwNAYDVQQKEy1Vbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBFc3Bpcml0byBT
-YW50byAtIFVGRVMxLzAtBgNVBAsTJk51Y2xlbyBkZSBQcm9jZXNzYW1lbnRvIGRl
-IERhZG9zIC0gTlBEMSgwJgYJKoZIhvcNAQkBFhlkaXJldG9yLmdlcmFsQG5wZC51
-ZmVzLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50
-bzELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUxLnVmZXMuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcv1BsThQWzeWTogJgUgbU3tU4UUOuHjXT
-B8AFXxIVARB1RVyksT4wFC5Q2tKXvqin/E4m6LmkdqKwJLj1CRetcEc41Rz0Re5J
-8/EjOE+3BUQXV961qDJIQ86Dpl6jKxjapIWCXd4fLoCF0WLIJG1tf9McAkK39SgH
-y9ImQZTgN8clsY3GOm+FU2HXUcV9W5iDh75b5byN+YCmSxernLHrpyeVIz03ZReJ
-fsNXhASJpoFAzoWNTMoi7WrUwRHrvB6RNjq3dQJrb5XUC88IwfQ512y9W6kUeTm6
-yZVJ0MeiUogHkTgpaaClal9VxPIyvZTV38XafljGrzss2DA2xqUvAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAMVNejcbIY2nJUMXayK7055pjINhCUOH9R1oDIAbL6i3
-Kdfahk1XlHN5kM3yOQ3T6hVf2GNy8s9SaAI6VZ5nvzReS0V81tdrzwn8Zrv2BLvc
-cP1WuYtXbOHzFgzornsflt2PKEQpT9mNnUzTagqdqxfW/8Dwp/+ZesFbmDwtN58d
-65/jAMm5oG1zaK/2V2PNELSHmswG0lk8EGaRY3LSKRDIbcMAxkA3gycMP5zEflqF
-B4YZRuxdXGqMUClpbdMxjfKICVL1rOV4wU8r6p40gSyNagGSZW8e78efc5GPL0g4
-bcL1avijCNm7WtrEOBPVFjablxgw0Hrk7CU99BXZwI4=
-            </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>
-      
-MIIEPDCCAyQCARUwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLVVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIEVzcGlyaXRvIFNhbnRvIC0gVUZFUzEvMC0GA1UECxMm
-TnVjbGVvIGRlIFByb2Nlc3NhbWVudG8gZGUgRGFkb3MgLSBOUEQxKDAmBgkqhkiG
-9w0BCQEWGWRpcmV0b3IuZ2VyYWxAbnBkLnVmZXMuYnIxEDAOBgNVBAcTB1ZpdG9y
-aWExFzAVBgNVBAgTDkVzcGlyaXRvIFNhbnRvMQswCQYDVQQGEwJCUjEWMBQGA1UE
-AxMNY2FmZTEudWZlcy5icjAeFw0xMTA4MDMxMzA4MDVaFw0xNDA4MDIxMzA4MDVa
-MIHjMTYwNAYDVQQKEy1Vbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBFc3Bpcml0byBT
-YW50byAtIFVGRVMxLzAtBgNVBAsTJk51Y2xlbyBkZSBQcm9jZXNzYW1lbnRvIGRl
-IERhZG9zIC0gTlBEMSgwJgYJKoZIhvcNAQkBFhlkaXJldG9yLmdlcmFsQG5wZC51
-ZmVzLmJyMRAwDgYDVQQHEwdWaXRvcmlhMRcwFQYDVQQIEw5Fc3Bpcml0byBTYW50
-bzELMAkGA1UEBhMCQlIxFjAUBgNVBAMTDWNhZmUxLnVmZXMuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcv1BsThQWzeWTogJgUgbU3tU4UUOuHjXT
-B8AFXxIVARB1RVyksT4wFC5Q2tKXvqin/E4m6LmkdqKwJLj1CRetcEc41Rz0Re5J
-8/EjOE+3BUQXV961qDJIQ86Dpl6jKxjapIWCXd4fLoCF0WLIJG1tf9McAkK39SgH
-y9ImQZTgN8clsY3GOm+FU2HXUcV9W5iDh75b5byN+YCmSxernLHrpyeVIz03ZReJ
-fsNXhASJpoFAzoWNTMoi7WrUwRHrvB6RNjq3dQJrb5XUC88IwfQ512y9W6kUeTm6
-yZVJ0MeiUogHkTgpaaClal9VxPIyvZTV38XafljGrzss2DA2xqUvAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAMVNejcbIY2nJUMXayK7055pjINhCUOH9R1oDIAbL6i3
-Kdfahk1XlHN5kM3yOQ3T6hVf2GNy8s9SaAI6VZ5nvzReS0V81tdrzwn8Zrv2BLvc
-cP1WuYtXbOHzFgzornsflt2PKEQpT9mNnUzTagqdqxfW/8Dwp/+ZesFbmDwtN58d
-65/jAMm5oG1zaK/2V2PNELSHmswG0lk8EGaRY3LSKRDIbcMAxkA3gycMP5zEflqF
-B4YZRuxdXGqMUClpbdMxjfKICVL1rOV4wU8r6p40gSyNagGSZW8e78efc5GPL0g4
-bcL1avijCNm7WtrEOBPVFjablxgw0Hrk7CU99BXZwI4=
-                    
-            </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 6f7a543f..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cafernp.insa.gov.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafernp.insa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafernp.insa.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafernp.insa.gov.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafernp.insa.gov.br/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">insa.gov.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafernp.insa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafernp.insa.gov.br:8443/idp/profile/SAML1/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">INSA - Instituto Nacional do Semiarido</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INSA - Instituto Nacional do Semiarido</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">INSA - Instituto Nacional do Semiarido</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.insa.gov.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.insa.gov.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Pedro Pacheco</md:SurName>
-    <md:EmailAddress>ppacheco@insa.gov.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 fa0189d3..00000000
--- a/swamid-interfederations-2.0/cafetools.ufpi.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +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://cafetools.ufpi.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEMDCCAxgCAQAwDQYJKoZIhvcNAQEFBQAwgd0xLjAsBgNVBAoUJVVGUEkgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQaWF1w60xNDAyBgNVBAsUK05USSAtIE7D
-umNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xKDAmBgkqhkiG9w0B
-CQEWGWRpcmV0b3JpYS5udGlAdWZwaS5lZHUuYnIxETAPBgNVBAcTCFRlcmVzaW5h
-MQ8wDQYDVQQIFAZQaWF1w60xCzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZldG9v
-bHMudWZwaS5icjAeFw0xNDExMTQxMzAzMTdaFw0xOTExMTMxMzAzMTdaMIHdMS4w
-LAYDVQQKFCVVRlBJIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZG8gUGlhdcOtMTQw
-MgYDVQQLFCtOVEkgLSBOw7pjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOn
-w6NvMSgwJgYJKoZIhvcNAQkBFhlkaXJldG9yaWEubnRpQHVmcGkuZWR1LmJyMREw
-DwYDVQQHEwhUZXJlc2luYTEPMA0GA1UECBQGUGlhdcOtMQswCQYDVQQGEwJCUjEa
-MBgGA1UEAxMRY2FmZXRvb2xzLnVmcGkuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCqSNE0nKTN/6lhDB8H4elZGeRVyD6Usj/CNCMI19yM15IWxdFV
-o8KtbNUnoOUydgzWzGSn1v5Z7kHn+3g/3Zcz5l4Uu8UR3mRuLnQmUCoUtVDFUGMs
-l0n0C9TEyfnltACH2bDgA0xvRTSJhwHbk84nq9aPEK5BHrzFXi2eqBg6Tz93b32l
-fF5l3xUw99qx9rPOi/V9rZqql2tvx2pf7r9EwmbvV3ecEew8m47LmLFGsTccdhLw
-rnYRqHn0ZjQ0EXcSl5qsOMIj9bYpWYwkTqQ20wOSrxyM4YtkKxvuwRv+4ulafRLF
-3s09zpWRHM3mbV4V7h1AHevPV3L2eARr4ZCPAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAAmsgsRWIlUth927g9UcnA1rT4LHc78ZV6AnJniQOLo+rsDqvOQ+lTN00/q0
-oKfhaScSzslE2YPG6VTyXsQEWOT/q0A+3110mWm3JphWsvCeik3nnzdQpXJdsT/Q
-1MxWTsxG3Xtueak/T1Nq3XVkaTSD5IdyDIKXUrHQ2OWlWurGw8/YBYTF2fq00OnI
-72aHstdeUOvFROEhdo4tEoP6uvXwNyzs69Uy6oTavBJCAKRQ17LuQixqeSWikIgu
-NXq23/pXhWb/nnrVc7SE/WNAWq7Wah2W1ZRuQ09HyRJ3M8JW1GrOjn+hZYSCne+x
-HBWX1bzoumpjN3JxtpmDWihKENM=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://cafetools.ufpi.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cafetools.ufpi.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cafetools.ufpi.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cafetools.ufpi.br/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">ufpi.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEMDCCAxgCAQAwDQYJKoZIhvcNAQEFBQAwgd0xLjAsBgNVBAoUJVVGUEkgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBQaWF1w60xNDAyBgNVBAsUK05USSAtIE7D
-umNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xKDAmBgkqhkiG9w0B
-CQEWGWRpcmV0b3JpYS5udGlAdWZwaS5lZHUuYnIxETAPBgNVBAcTCFRlcmVzaW5h
-MQ8wDQYDVQQIFAZQaWF1w60xCzAJBgNVBAYTAkJSMRowGAYDVQQDExFjYWZldG9v
-bHMudWZwaS5icjAeFw0xNDExMTQxMzAzMTdaFw0xOTExMTMxMzAzMTdaMIHdMS4w
-LAYDVQQKFCVVRlBJIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZG8gUGlhdcOtMTQw
-MgYDVQQLFCtOVEkgLSBOw7pjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOn
-w6NvMSgwJgYJKoZIhvcNAQkBFhlkaXJldG9yaWEubnRpQHVmcGkuZWR1LmJyMREw
-DwYDVQQHEwhUZXJlc2luYTEPMA0GA1UECBQGUGlhdcOtMQswCQYDVQQGEwJCUjEa
-MBgGA1UEAxMRY2FmZXRvb2xzLnVmcGkuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCqSNE0nKTN/6lhDB8H4elZGeRVyD6Usj/CNCMI19yM15IWxdFV
-o8KtbNUnoOUydgzWzGSn1v5Z7kHn+3g/3Zcz5l4Uu8UR3mRuLnQmUCoUtVDFUGMs
-l0n0C9TEyfnltACH2bDgA0xvRTSJhwHbk84nq9aPEK5BHrzFXi2eqBg6Tz93b32l
-fF5l3xUw99qx9rPOi/V9rZqql2tvx2pf7r9EwmbvV3ecEew8m47LmLFGsTccdhLw
-rnYRqHn0ZjQ0EXcSl5qsOMIj9bYpWYwkTqQ20wOSrxyM4YtkKxvuwRv+4ulafRLF
-3s09zpWRHM3mbV4V7h1AHevPV3L2eARr4ZCPAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAAmsgsRWIlUth927g9UcnA1rT4LHc78ZV6AnJniQOLo+rsDqvOQ+lTN00/q0
-oKfhaScSzslE2YPG6VTyXsQEWOT/q0A+3110mWm3JphWsvCeik3nnzdQpXJdsT/Q
-1MxWTsxG3Xtueak/T1Nq3XVkaTSD5IdyDIKXUrHQ2OWlWurGw8/YBYTF2fq00OnI
-72aHstdeUOvFROEhdo4tEoP6uvXwNyzs69Uy6oTavBJCAKRQ17LuQixqeSWikIgu
-NXq23/pXhWb/nnrVc7SE/WNAWq7Wah2W1ZRuQ09HyRJ3M8JW1GrOjn+hZYSCne+x
-HBWX1bzoumpjN3JxtpmDWihKENM=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cafetools.ufpi.br:8443/idp/profile/SAML1/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">UFPI - Univerisdade Federal do Piaui</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFPI - Univerisdade Federal do Piaui</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFPI - Universidade Federal do Piaui</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFPI - Universidade Federal do Piaui</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufpi.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufpi.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Arinaldo Silva</md:SurName>
-    <md:EmailAddress>arinaldo@ufpi.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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/calendar.larpp.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/calendar.larpp.internet2.edu-shibboleth.xml
deleted file mode 100644
index 340a8106..00000000
--- a/swamid-interfederations-2.0/calendar.larpp.internet2.edu-shibboleth.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://calendar.larpp.internet2.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://calendar.larpp.internet2.edu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Calendar Server</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP serves the project's calendar server.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://calendar.larpp.internet2.edu/sp/spinfo.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/policies/privacy/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="275" xml:lang="en">https://calendar.larpp.internet2.edu/img/larpp_logo_transparent_275wX150h.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSjCCAjKgAwIBAgIJAKzG7eUfQ851MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGnNhdHVybi5jb2hvcnRpdW0uc2Nndm0ubmV0MB4XDTE0MDYwOTE3NDQwMFoX
-DTI0MDYwNjE3NDQwMFowJTEjMCEGA1UEAxMac2F0dXJuLmNvaG9ydGl1bS5zY2d2
-bS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhg3I9E5x5g2s+
-Cuhg6cOplhuvog2nETx+nvqN3At59AbXkF4O9FDJVOQalY4nIqHw4l0Na/ftqWg/
-yYEWO9ee9hVCtnfzJzDC07iyXa0McvlKLwPW3oz3DZAzbb/RqEFSrFG4EX42OBPP
-6LPd9yHQY8eIMB1slqDQsQfk28TC3lbuO2xiI4aVjez3iviK2+ZHieyFd4ONkzDF
-QR1EOH+zrLhD01rP7QVipZKkR8/vF8YkJCrVqOu2IUg5+wP6Tg9OFg7LGt/zuQyl
-SJTCRaPpEWoeWEBQCsI3g/7A07vk9L0LcJtJlaPCV73Lb5gXXx2Ysdbz5gPZRmeu
-UDAcvFItAgMBAAGjfTB7MFoGA1UdEQRTMFGCGnNhdHVybi5jb2hvcnRpdW0uc2Nn
-dm0ubmV0hjNodHRwczovL2NhbGVuZGFyLmNvaG9ydGl1bS5pbnRlcm5ldDIuZWR1
-L3NoaWJib2xldGgwHQYDVR0OBBYEFB5x7U6p2EtFnrTJYwRdXeqwWufJMA0GCSqG
-SIb3DQEBBQUAA4IBAQDahajEsd4KqmtxD83wYD8aI0ZC9MzMq01uek2zeM3JBeJ3
-PR0n69qD1cFodTDCE1lift2hB8VBL47qwATRKMidk5ZpPmnc7/NMnOGrMYebS4fC
-Fx99Q+Rfwl9suOllWyeCiI1dOOg+yjb4Yf59g/t6Y3c7sLEZeToHRXhGyVzyMLJV
-qLPZ+wdyO6gJKwvFuaOb+DuqzBSI0Bgi8pPJO8i0X97At1kA3h1abU+A0ctRzro7
-SnMV/VRb62UKiQfm7DK8RKXHeS3iRh6izZNd+zipqHkHNBWiJAua8hNM3xmpOfzr
-Grb0F7Enr3GuQgslI8zLtaVdjtjs0/jTRXF9Zr/7
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://calendar.larpp.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://calendar.larpp.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://calendar.larpp.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://calendar.larpp.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Calendar Server</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP serves the project's calendar server.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Emily Eisbruch</md:GivenName>
-    <md:EmailAddress>emily@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>LARPP Technical Support</md:GivenName>
-    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LARPP Support</md:GivenName>
-    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LARPP Incident Response</md:GivenName>
-    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/calipso.cpd.ufv.br.xml b/swamid-interfederations-2.0/calipso.cpd.ufv.br.xml
deleted file mode 100644
index ef456a01..00000000
--- a/swamid-interfederations-2.0/calipso.cpd.ufv.br.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://calipso.cpd.ufv.br/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ufv.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFV - Universidade Federal de Vicosa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFV - Universidade Federal de Vicosa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFV - Universidade Federal de Vicosa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFV - Universidade Federal de Vicosa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufv.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufv.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEfTCCA2WgAwIBAgIBADANBgkqhkiG9w0BAQUFADCB3TELMAkGA1UEBhMCQlIx
-FTATBgNVBAgTDE1pbmFzIEdlcmFpczEPMA0GA1UEBxMGVmljb3NhMS0wKwYDVQQK
-EyRVRlYgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBWaWNvc2ExNDAyBgNVBAsT
-K0RUSSAtIERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8xJDAi
-BgkqhkiG9w0BCQEWFXBvbGx5YW5uYS5tb3RhQHVmdi5icjEbMBkGA1UEAxMSY2Fs
-aXBzby5jcGQudWZ2LmJyMB4XDTEwMDQwODEyMjk0MFoXDTEzMDQwNzEyMjk0MFow
-gd0xCzAJBgNVBAYTAkJSMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxDzANBgNVBAcT
-BlZpY29zYTEtMCsGA1UEChMkVUZWIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUg
-Vmljb3NhMTQwMgYDVQQLEytEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBk
-YSBJbmZvcm1hY2FvMSQwIgYJKoZIhvcNAQkBFhVwb2xseWFubmEubW90YUB1ZnYu
-YnIxGzAZBgNVBAMTEmNhbGlwc28uY3BkLnVmdi5icjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMozVW2X3OMKcEQcp4RnGTFR2s6iSFoHvkVPjYkpWszZ
-+QfEV3GroXsLWv/RjJ+QtXhXfttFB0fNdiCWhxh2wbkeF2t1v21B+sCirnf+1qm6
-e0oetbRxK6k5O39pioOdEdUrMoN5s2WLoqMmK8ryqgb25GwLVolne9S4Wwyaocgp
-bDYjG11lZia7bEO03TsKPv7i5s4d2htD/wU+qkDT52H6aGI09L25bpwT+/aeUeIH
-Fvy750y5voXDaXx6MH9DrGslG7Dr9S/207uq0AxIrHaIgUbl6307tZhFbN32kBLT
-d/413Qb6H4RKsxwv+DLmy3UEa/c4UGeN7Vn7RDm5+/0CAwEAAaNGMEQwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBaAwKgYDVR0lBCMwIQYIKwYBBQUHAwEGCWCGSAGG+EIE
-AQYKKwYBBAGCNwoDAzANBgkqhkiG9w0BAQUFAAOCAQEAAzFQSYz2mWPl2z0fhnc8
-KfVtknNUnZFOzozeTD4UrmtTjRZo2O2BY6+9imoLcPtW3GH1fV7maZBk2QdHm1NN
-63yt1rqfMVplsCBbRpgSEBdIEHwUDmT3xGrFphhW84QGIh7dJuhdvaQ522C/YVyK
-zqppjlaUSZgqp4/jL8okZfDRgP+Sw3dBt0zJ+YpR60EQ7niv9mUKsJH4JXGcVtV+
-eTUY0S2J5SynJg4s5y9P2tMykzU/tA1pa+B1joFMAe37uKlKTiTWPJgSz/Q0/1bY
-ZEvbFOP1xLmtYXK8ipoyp3dauE5ls2QwIhanMz5A6SpPJYWO+9nLq7MQiSwfuvvJ
-1Q==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://calipso.cpd.ufv.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://calipso.cpd.ufv.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://calipso.cpd.ufv.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://calipso.cpd.ufv.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://calipso.cpd.ufv.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://calipso.cpd.ufv.br/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ufv.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEfTCCA2WgAwIBAgIBADANBgkqhkiG9w0BAQUFADCB3TELMAkGA1UEBhMCQlIx
-FTATBgNVBAgTDE1pbmFzIEdlcmFpczEPMA0GA1UEBxMGVmljb3NhMS0wKwYDVQQK
-EyRVRlYgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBWaWNvc2ExNDAyBgNVBAsT
-K0RUSSAtIERpcmV0b3JpYSBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8xJDAi
-BgkqhkiG9w0BCQEWFXBvbGx5YW5uYS5tb3RhQHVmdi5icjEbMBkGA1UEAxMSY2Fs
-aXBzby5jcGQudWZ2LmJyMB4XDTEwMDQwODEyMjk0MFoXDTEzMDQwNzEyMjk0MFow
-gd0xCzAJBgNVBAYTAkJSMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxDzANBgNVBAcT
-BlZpY29zYTEtMCsGA1UEChMkVUZWIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUg
-Vmljb3NhMTQwMgYDVQQLEytEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBk
-YSBJbmZvcm1hY2FvMSQwIgYJKoZIhvcNAQkBFhVwb2xseWFubmEubW90YUB1ZnYu
-YnIxGzAZBgNVBAMTEmNhbGlwc28uY3BkLnVmdi5icjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMozVW2X3OMKcEQcp4RnGTFR2s6iSFoHvkVPjYkpWszZ
-+QfEV3GroXsLWv/RjJ+QtXhXfttFB0fNdiCWhxh2wbkeF2t1v21B+sCirnf+1qm6
-e0oetbRxK6k5O39pioOdEdUrMoN5s2WLoqMmK8ryqgb25GwLVolne9S4Wwyaocgp
-bDYjG11lZia7bEO03TsKPv7i5s4d2htD/wU+qkDT52H6aGI09L25bpwT+/aeUeIH
-Fvy750y5voXDaXx6MH9DrGslG7Dr9S/207uq0AxIrHaIgUbl6307tZhFbN32kBLT
-d/413Qb6H4RKsxwv+DLmy3UEa/c4UGeN7Vn7RDm5+/0CAwEAAaNGMEQwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBaAwKgYDVR0lBCMwIQYIKwYBBQUHAwEGCWCGSAGG+EIE
-AQYKKwYBBAGCNwoDAzANBgkqhkiG9w0BAQUFAAOCAQEAAzFQSYz2mWPl2z0fhnc8
-KfVtknNUnZFOzozeTD4UrmtTjRZo2O2BY6+9imoLcPtW3GH1fV7maZBk2QdHm1NN
-63yt1rqfMVplsCBbRpgSEBdIEHwUDmT3xGrFphhW84QGIh7dJuhdvaQ522C/YVyK
-zqppjlaUSZgqp4/jL8okZfDRgP+Sw3dBt0zJ+YpR60EQ7niv9mUKsJH4JXGcVtV+
-eTUY0S2J5SynJg4s5y9P2tMykzU/tA1pa+B1joFMAe37uKlKTiTWPJgSz/Q0/1bY
-ZEvbFOP1xLmtYXK8ipoyp3dauE5ls2QwIhanMz5A6SpPJYWO+9nLq7MQiSwfuvvJ
-1Q==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://calipso.cpd.ufv.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://calipso.cpd.ufv.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UFV - Universidade Federal de Vicosa</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFV - Universidade Federal de Vicosa</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFV - Universidade Federal de Vicosa</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFV - Universidade Federal de Vicosa</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufv.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufv.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Pollyanna Lopes Mota</SurName>
-    <EmailAddress>pollyanna.mota@ufv.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/calstatela.infoready4.com-shibboleth.xml b/swamid-interfederations-2.0/calstatela.infoready4.com-shibboleth.xml
deleted file mode 100644
index e2db2f98..00000000
--- a/swamid-interfederations-2.0/calstatela.infoready4.com-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://calstatela.infoready4.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://calstatela.infoready4.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">InfoReady Review - Cal State LA</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC6zCCAdOgAwIBAgIJAOO9wmxE2PCSMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGluZm9yZHl3aW4wMjAeFw0xMzEwMjkwNjE0NDlaFw0yMzEwMjcwNjE0NDla
-MBcxFTATBgNVBAMTDGluZm9yZHl3aW4wMjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMpdE35LzF2eEaAhLfxtotv6XhMXfkOMbugHq8xk5rhyx7RKS+Ku
-t9wW8Mv2rG7NAJw+8167dP6N2RQKpRBn17FIOhm/cuSNtiTBJtA9QiTEkyN5D1ma
-ykJjlD95ymo0XdRDWwz/6IP5v+d95BlfbnlkswWOGOMLxCtaWCSZQ00RJFDKudL5
-IrK+2A1KwF4O+DxqivhdLsd/yA+IjX1efYnT7MPsd7Yyh5wKXKkGbKEg9yAW65Dt
-x2xbBCjDT2PCBhJ4ZuRfUv8whBCT2qgH6+pQ5JBN9ZDz1iGDFp8XfQ27UtzlFdBc
-cjvWmtOh/V35fBXl5LIbJdU/ypJMBwehxbcCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-aW5mb3JkeXdpbjAyMB0GA1UdDgQWBBQTyklRhSLuL0VcI0Nv4tQhZYqHITANBgkq
-hkiG9w0BAQUFAAOCAQEAJyNYKdKAFdp7xvqnjszw+AF3dYl3HQKe5bC0M+gu7G+2
-hJL2D70cFCXXi2bNcdyLsFVPiecMo69QinOP3kqCPNL7S5pSjm48T9bTiRr4WNy1
-hkxJ7nCV++z696YqbE7WYec9LEpcNDnDnmDfQOxvxzdtpIyM3Egw+koKEZu13ebw
-zAs2xgBj3V5YWmzS7nk1wPPJBKpr+9W5xixEGfaKfrrQXayP/LVyN+u/3BjZCZfE
-bfqmalH+rjpJ7ZCck4CQFxCvnLhwl+L5DEuEFXmgTzk7EDb65no+rXaZQd3/IEre
-sazovBHNw8FPYGiOCi2757flvBsb6gW+FbN0SPmtSQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://calstatela.infoready4.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://calstatela.infoready4.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://calstatela.infoready4.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://calstatela.infoready4.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://calstatela.infoready4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://calstatela.infoready4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://calstatela.infoready4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">InfoReady Review - Cal State LA</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">InfoReady Corp</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">InfoReady Corp</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.infoready4.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Testa</md:GivenName>
-    <md:EmailAddress>jtesta@inforeadycorp.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/campus.ie-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/campus.ie-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index feb4e839..00000000
--- a/swamid-interfederations-2.0/campus.ie-simplesaml-module.php-saml-sp-metadata.php-default-sp.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" entityID="https://campus.ie/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.heanet.ie" registrationInstant="2010-10-11T00:00:00Z"/>
-  </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">Campus.ie</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The campus.ie online shop relies upon Edugate to validate staff/student status for the purposes of providdiscounts on o2's mobile broadband, Apple hardware and software as well as Educational software from Academia Software Ltd</mdui:Description>
-        <mdui:Logo height="64" width="238">https://edugate.heanet.ie/rr3/logos/campus.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIElTCCA32gAwIBAgIJAOag6ndNUFHcMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
-VQQGEwJJRTEPMA0GA1UECBMGRHVibGluMQ8wDQYDVQQHEwZEdWJsaW4xEjAQBgNV
-BAoTCUNhbXB1cy5pZTEQMA4GA1UECxMHc2VjdGlvbjEWMBQGA1UEAxMNd3d3LmNh
-bXB1cy5pZTEeMBwGCSqGSIb3DQEJARYPa2V2aW5AY2FtcHVzLmllMB4XDTE0MDQx
-MTEyMDUyMFoXDTI0MDQxMDEyMDUyMFowgY0xCzAJBgNVBAYTAklFMQ8wDQYDVQQI
-EwZEdWJsaW4xDzANBgNVBAcTBkR1YmxpbjESMBAGA1UEChMJQ2FtcHVzLmllMRAw
-DgYDVQQLEwdzZWN0aW9uMRYwFAYDVQQDEw13d3cuY2FtcHVzLmllMR4wHAYJKoZI
-hvcNAQkBFg9rZXZpbkBjYW1wdXMuaWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCWcyWr8gUSH8/0D+znVnM/5XoAemG2aTAQ9BGZnoQyxRr037nPV0qk
-F/fbpRCP+RTcfdKh+kZ/lHUoDt6ZUR1clDxmZ5M019f9SCjn5Xh2W652hs6INl+B
-i2tsWUQ/bWTih3nJz5tMMfxflwfh7tuKwP8e5xM566yallLrXqEKl3BpC7UsXn7z
-+e8vcI7dRtU7qTXc2nm9Pre6ib93/a9Q3bos7TnGBYJLZ6sTnqvAvdEYJDJ/pGTD
-zTokBAMVIbhGm4MRKwga+zqHDtDls9JrVcvtk4VOS+4R9NmvqkRUEFd6exgDTmAS
-f9+dtFvmnGb9pYRoMCQ5jOeGL7nc6Hr3AgMBAAGjgfUwgfIwHQYDVR0OBBYEFAzE
-r57D/Y0UkcaOB1IRG+6N+RJAMIHCBgNVHSMEgbowgbeAFAzEr57D/Y0UkcaOB1IR
-G+6N+RJAoYGTpIGQMIGNMQswCQYDVQQGEwJJRTEPMA0GA1UECBMGRHVibGluMQ8w
-DQYDVQQHEwZEdWJsaW4xEjAQBgNVBAoTCUNhbXB1cy5pZTEQMA4GA1UECxMHc2Vj
-dGlvbjEWMBQGA1UEAxMNd3d3LmNhbXB1cy5pZTEeMBwGCSqGSIb3DQEJARYPa2V2
-aW5AY2FtcHVzLmllggkA5qDqd01QUdwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAK7xaQJ6dEZ22CQey1lU0S89v2XC7c0YchgToiIfQ8X8TCUZXMMqO
-earNAgfvZQgNF6GF7/99SqzumdBceV6rk2boFkAZvymHPmFh2quJ8IqLnQGJhR33
-833IKstjggbYQtBPT7QAkjQuUXGSTOfiol9xHaXQGQgS1ffoWpC38wA5Mw/kx7Nm
-ftZ2aGOX4aW4e7rEn8HXYBrGIoW/zqSOEcwfIPiIBZJMIQWAfZt5OD4e7ma6EnvB
-gj/hjNeqjL/Z5hTrYb5u2xZM8kznySlMPyzA/v0ckzua/puuCmQNOxoL1ef5YKdo
-kxStKzIY/Qk6Prr1ZXFu6nYfeQJnA2NE/g==
-</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://campus.ie/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="5" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://campus.ie/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Campus.ie</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">The campus.ie online shop relies upon Edugate to validate staff/student status for the purposes of providdiscounts on o2's mobile broadband, Apple hardware and software as well as Educational software from Academia Software Ltd</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Student Media Group Ltd</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Campus.ie</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://campus.ie/store</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Bob Coggins</md:SurName>
-    <md:EmailAddress>mailto:bob@campus.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Brendan Madden</md:SurName>
-    <md:EmailAddress>mailto:brendan@campus.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Kevin Nolan</md:SurName>
-    <md:EmailAddress>mailto:kevin@owlinteractive.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Eamonn</md:GivenName>
-    <md:SurName>Mannix</md:SurName>
-    <md:EmailAddress>mailto:eamonn.mannix@campus.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/caneid.miami.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/caneid.miami.edu-idp-shibboleth.xml
deleted file mode 100644
index ee9c81a5..00000000
--- a/swamid-interfederations-2.0/caneid.miami.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +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://caneid.miami.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">miami.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Miami</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>
-MIIDLDCCAhSgAwIBAgIVAPQh6d6BZ9YFBFUWqakLfYnEdM4xMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGNhbmVpZC5taWFtaS5lZHUwHhcNMTEwNzA1MTc0NDM2
-WhcNMzEwNzA1MTc0NDM2WjAbMRkwFwYDVQQDExBjYW5laWQubWlhbWkuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1rzg7ZatkXxqJ/zgNGeewolU
-dHPcTL/K5qF+pR3oFCPy9OFFLSdilEQlvM1Tlbk/mtChIhL2EtkA0EXyFqQdDAmf
-jw94nYJEHn35T98K1fZxdbATFnZCXWmofTW7h45gV5rROFZApd9PyzC0saTYOco9
-1/yqftPdT2gbLStY4ygQmjJfbTcuSNxW764WSx10ZfuQYi3opJdHWt2erv6hX/jK
-AXQxVXFWxknMaAQsX4Ux9T2XenRYCzN89+hiOrHXf/HCNLYQRy4iDDQL+JlhYYeV
-8lJZy+8YIZycMtxzfDusivTDNtZVxzs4a5887JBgTZ9e04i6ShKF+6RaQ7YQnwID
-AQABo2cwZTBEBgNVHREEPTA7ghBjYW5laWQubWlhbWkuZWR1hidodHRwczovL2Nh
-bmVpZC5taWFtaS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJyoHhDM6V21
-xYU2zaZW8N1Z07u0MA0GCSqGSIb3DQEBBQUAA4IBAQC2YOObmOvCRPLeixpeGhoM
-Nnw3Kn9U4F1jBtZlRWTOXJmbi1BmBibgMJKBdelh1zsPZnUWaolMhjimmEMHkNmX
-ELyvC+9VpS5QX/27ct1thtHIwKn8lb2ZlBf8gfYOS9piL3Fq57JpUQIzvYSYfJNh
-/mnixpoGtqPtt3FYqBR40+HJxhF8xFg3cbsqOZZelXdeyh2vkUcQYSEaecI762qE
-ik202ny3EMaI0Inw9Wc8Toppy2R91Bz/bh0SCYqsCrcJygRoZ4ROwvUZ/DBoyixB
-1JB2M6xRO0un23rAAyIUk2T0YZtXuDvbwqN6wUOWj5oHvbtXGF4eg8KmyIozGx5n
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://caneid.miami.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://caneid.miami.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://caneid.miami.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://caneid.miami.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://caneid.miami.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miami.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAPQh6d6BZ9YFBFUWqakLfYnEdM4xMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGNhbmVpZC5taWFtaS5lZHUwHhcNMTEwNzA1MTc0NDM2
-WhcNMzEwNzA1MTc0NDM2WjAbMRkwFwYDVQQDExBjYW5laWQubWlhbWkuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1rzg7ZatkXxqJ/zgNGeewolU
-dHPcTL/K5qF+pR3oFCPy9OFFLSdilEQlvM1Tlbk/mtChIhL2EtkA0EXyFqQdDAmf
-jw94nYJEHn35T98K1fZxdbATFnZCXWmofTW7h45gV5rROFZApd9PyzC0saTYOco9
-1/yqftPdT2gbLStY4ygQmjJfbTcuSNxW764WSx10ZfuQYi3opJdHWt2erv6hX/jK
-AXQxVXFWxknMaAQsX4Ux9T2XenRYCzN89+hiOrHXf/HCNLYQRy4iDDQL+JlhYYeV
-8lJZy+8YIZycMtxzfDusivTDNtZVxzs4a5887JBgTZ9e04i6ShKF+6RaQ7YQnwID
-AQABo2cwZTBEBgNVHREEPTA7ghBjYW5laWQubWlhbWkuZWR1hidodHRwczovL2Nh
-bmVpZC5taWFtaS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJyoHhDM6V21
-xYU2zaZW8N1Z07u0MA0GCSqGSIb3DQEBBQUAA4IBAQC2YOObmOvCRPLeixpeGhoM
-Nnw3Kn9U4F1jBtZlRWTOXJmbi1BmBibgMJKBdelh1zsPZnUWaolMhjimmEMHkNmX
-ELyvC+9VpS5QX/27ct1thtHIwKn8lb2ZlBf8gfYOS9piL3Fq57JpUQIzvYSYfJNh
-/mnixpoGtqPtt3FYqBR40+HJxhF8xFg3cbsqOZZelXdeyh2vkUcQYSEaecI762qE
-ik202ny3EMaI0Inw9Wc8Toppy2R91Bz/bh0SCYqsCrcJygRoZ4ROwvUZ/DBoyixB
-1JB2M6xRO0un23rAAyIUk2T0YZtXuDvbwqN6wUOWj5oHvbtXGF4eg8KmyIozGx5n
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://caneid.miami.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Miami</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Miami</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.miami.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Anil Kadiyala</md:GivenName>
-    <md:EmailAddress>akadiyala@miami.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Anil Kadiyala</md:GivenName>
-    <md:EmailAddress>akadiyala@miami.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 97c6ee49..00000000
--- a/swamid-interfederations-2.0/cans.dev4.clientproof.co.uk-shibboleth-sp.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://cans.dev4.clientproof.co.uk/shibboleth-sp">
-  <!--
-		This is a "CANS Legal Information" Shibboleth SP for Citizens Advice Notes Service Trust.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://cans.dev4.clientproof.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://cans.dev4.clientproof.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAPv9EOsZc3NxMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2NhbnMuZGV2NC5jbGllbnRwcm9vZi5jby51azAeFw0xMTA1MjMwOTA0Mjla
-						Fw0yMTA1MjAwOTA0MjlaMCYxJDAiBgNVBAMTG2NhbnMuZGV2NC5jbGllbnRwcm9v
-						Zi5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKSTqgatsKob
-						/N/yLNTpzDXPpdroAu7JESKu8EtYFCoE/xsQ3IfGxmdNu7lGmSLUwEWnBKJADfZ/
-						m7PgbJTmveOR60iU4Xj4jIFJuJsJ2DdAmktb38PyPm3UdqdQ+xXioZFNPurr73KT
-						7KFAZT190TlHtIA3QKf5EZP4sKWHWJaSoN4B59UDNc88glWmhgi2GKfoSnTB7pjT
-						Tc+yhjjJOR4fm7k4KF0sYq+IdL+rNnh+95eVl8hjYn1pmQJq9++7V6VtRZnSMmiY
-						6QVnDHl+uCr2uaBqu42t99ERAILWoQLvkkMYoM8rO/0cKd/pyhkZX4v9r+L9Pi9D
-						Hf3I5W3q5pcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbY2Fucy5kZXY0LmNsaWVudHBy
-						b29mLmNvLnVrMB0GA1UdDgQWBBSRKxbvQylc1QvWonlrXSaOFsTEAjANBgkqhkiG
-						9w0BAQUFAAOCAQEARyhRzBUAOCbEGSiSpMDw3w+d8NKmGZnVZ9t91TczDMqy7fBk
-						W9Ez8rkdotdDV2zwLg4zFp2wxQ+q8Llz92gGXQz1RuZpmoyHLsjVG+s9JXvnbHmk
-						LIsaCrjY1yrukdFOiY1X0RYlsZ4KZ8oAJfrbI7UaaQ1KDZxox/Ttmc1oCOWHFiUu
-						TEgD1oSP9UH1TBUPURnilOhZWEkfmRXgRzm+l7MMilWUnHkh5AP7K6wn9Gb+6b/L
-						EuINlP2aR+pgdphLjTLnyHw5ni6O+B+hw2IRX2fyWeK4BsFUmJGZ3WPl/l3R+uzE
-						fJd0URqxirZ4982sPAaiW118lw3XxgmkDmtHOw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cans.dev4.clientproof.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Citizens Advice Notes Service Trust</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Citizens Advice Notes Service Trust: CANS Legal Information</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cans.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Emil</GivenName>
-    <SurName>Muthu</SurName>
-    <EmailAddress>mailto:emil@webstarsltd.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Emil</GivenName>
-    <SurName>Muthu</SurName>
-    <EmailAddress>mailto:emil@webstarsltd.com</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 6c8ac18a..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://capuccino.iff.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://capuccino.iff.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://capuccino.iff.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://capuccino.iff.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://capuccino.iff.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.iff.edu.br:8443/idp/profile/SAML1/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">IFF - Instituto Federal Fluminense</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFF - Instituto Federal Fluminense</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFF - Instituto Federal Fluminense</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFF - Instituto Federal Fluminense</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iff.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.iff.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Andre de Azevedo Cunha</md:SurName>
-    <md:EmailAddress>acunha@iff.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 182a3440..00000000
--- a/swamid-interfederations-2.0/capuccino.iff.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://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>
-    MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xJTAjBgNVBAoTHEluc3RpdHV0
-byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsTBERHVEkxHjAcBgkqhkiG9w0B
-CQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMVQ2FtcG9zIGRvcyBHb3l0YWNh
-emVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFGNhcHVjY2lu
-by5pZmYuZWR1LmJyMB4XDTEzMDkxNjE1MTYwOVoXDTE2MDkxNTE1MTYwOVowga8x
-JTAjBgNVBAoTHEluc3RpdHV0byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsT
-BERHVEkxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMV
-Q2FtcG9zIGRvcyBHb3l0YWNhemVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIx
-HTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA431WPAuMFmglDx3WLpMiABB+eHn4ZUPsWUhrJf7MGwqw
-aqYprX9m+k99Nr9hGxoZjTUoMg1nb7W9PzfGYaGbOO1CtpJS/bWTgarmPkgcIJGJ
-BOJettHZKofoYUAGXPlR4cUplSNHQTlzBT/3kY6tsi02rSm/uXVM1I5LShK2kyTR
-thQlymdN9nVSZ9F0HGVscJUGdCip59rYSFIvy0je/5b/PFpolo1MuhG8ZOMsVPXR
-M5eIV0hDbTKDseywnNSg0P3vomDv0GPeux2wIWu7Gi6l0j/4ZZhBh8FKli6GDJ3Q
-FxceHeOaPbGvwlqkRXBYfShnSFJ9D/mKWC1iXh6FIQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQAQssTx+Cr7FqJnSamgY54FSF72p7zXgWQKiiCvvYQnvEaP2DdjPO65
-HLZqtlC7c1a6+pnVC8TdYTMM4+tATfg3mEY7bxii5/32GD83gbTGRkR95Nm7qmgw
-WkWJEtiXSLSVvOfRGVq8HlzxJOw+W1BhHCqL14iRvZByTHR28RfurqQMsu0/IwTA
-qjrKzntjUYCnLXTB5McIDBPeXE1wMM0zP2iAZsRFMNTF6cpIcG5Mh996fcupuD4Y
-DSFiby5bFAiwBelbWYbhvm8MIz+5a8sr4guW+0pxZ34KOpW+ClKLr3zICgzXvyLy
-sn8e6pyt/AvyYnHJixd8dGbvtIV1LOs5
-            </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>
-      
-MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xJTAjBgNVBAoTHEluc3RpdHV0
-byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsTBERHVEkxHjAcBgkqhkiG9w0B
-CQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMVQ2FtcG9zIGRvcyBHb3l0YWNh
-emVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIxHTAbBgNVBAMTFGNhcHVjY2lu
-by5pZmYuZWR1LmJyMB4XDTEzMDkxNjE1MTYwOVoXDTE2MDkxNTE1MTYwOVowga8x
-JTAjBgNVBAoTHEluc3RpdHV0byBGZWRlcmFsIEZsdW1pbmVuc2UxDTALBgNVBAsT
-BERHVEkxHjAcBgkqhkiG9w0BCQEWD2RndGlAaWZmLmVkdS5icjEeMBwGA1UEBxMV
-Q2FtcG9zIGRvcyBHb3l0YWNhemVzMQswCQYDVQQIEwJSSjELMAkGA1UEBhMCQlIx
-HTAbBgNVBAMTFGNhcHVjY2luby5pZmYuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA431WPAuMFmglDx3WLpMiABB+eHn4ZUPsWUhrJf7MGwqw
-aqYprX9m+k99Nr9hGxoZjTUoMg1nb7W9PzfGYaGbOO1CtpJS/bWTgarmPkgcIJGJ
-BOJettHZKofoYUAGXPlR4cUplSNHQTlzBT/3kY6tsi02rSm/uXVM1I5LShK2kyTR
-thQlymdN9nVSZ9F0HGVscJUGdCip59rYSFIvy0je/5b/PFpolo1MuhG8ZOMsVPXR
-M5eIV0hDbTKDseywnNSg0P3vomDv0GPeux2wIWu7Gi6l0j/4ZZhBh8FKli6GDJ3Q
-FxceHeOaPbGvwlqkRXBYfShnSFJ9D/mKWC1iXh6FIQIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQAQssTx+Cr7FqJnSamgY54FSF72p7zXgWQKiiCvvYQnvEaP2DdjPO65
-HLZqtlC7c1a6+pnVC8TdYTMM4+tATfg3mEY7bxii5/32GD83gbTGRkR95Nm7qmgw
-WkWJEtiXSLSVvOfRGVq8HlzxJOw+W1BhHCqL14iRvZByTHR28RfurqQMsu0/IwTA
-qjrKzntjUYCnLXTB5McIDBPeXE1wMM0zP2iAZsRFMNTF6cpIcG5Mh996fcupuD4Y
-DSFiby5bFAiwBelbWYbhvm8MIz+5a8sr4guW+0pxZ34KOpW+ClKLr3zICgzXvyLy
-sn8e6pyt/AvyYnHJixd8dGbvtIV1LOs5
-                    
-            </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 49745a77..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://capuccino.info.ufrn.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://capuccino.info.ufrn.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://capuccino.info.ufrn.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://capuccino.info.ufrn.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://capuccino.info.ufrn.br/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">ufrn.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://capuccino.info.ufrn.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://capuccino.info.ufrn.br:8443/idp/profile/SAML1/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">UFRN - Universidade Federal do Rio Grande do Norte</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFRN - Universidade Federal do Rio Grande do Norte</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFRN - Universidade Federal do Rio Grande do Norte</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufrn.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufrn.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>SINFO</md:SurName>
-    <md:EmailAddress>redes@info.ufrn.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e88d87cc..00000000
--- a/swamid-interfederations-2.0/capuccino.info.ufrn.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://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>
-    MIIEUjCCAzoCAQAwDQYJKoZIhvcNAQEFBQAwge4xOzA5BgNVBAoTMlVGUk4gLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSaW8gZ3JhbmRlIGRvIE5vcnRlMTAwLgYD
-VQQLEydTaW5mbyAtIFN1cGVyaW50ZW5kZW5jaWEgZGUgaW5mb3JtYXRpY2ExITAf
-BgkqhkiG9w0BCQEWEnJlZGVzQGluZm8udWZybi5icjEOMAwGA1UEBxMFTmF0YWwx
-HDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUxCzAJBgNVBAYTAkJSMR8wHQYD
-VQQDExZjYXB1Y2Npbm8uaW5mby51ZnJuLmJyMB4XDTEyMDYxODE3NTA0M1oXDTE1
-MDYxODE3NTA0M1owge4xOzA5BgNVBAoTMlVGUk4gLSBVbml2ZXJzaWRhZGUgRmVk
-ZXJhbCBkbyBSaW8gZ3JhbmRlIGRvIE5vcnRlMTAwLgYDVQQLEydTaW5mbyAtIFN1
-cGVyaW50ZW5kZW5jaWEgZGUgaW5mb3JtYXRpY2ExITAfBgkqhkiG9w0BCQEWEnJl
-ZGVzQGluZm8udWZybi5icjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBH
-cmFuZGUgZG8gTm9ydGUxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZjYXB1Y2Npbm8u
-aW5mby51ZnJuLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
-+5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
-Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
-rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
-g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
-rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
-U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBm3htwaGiZLjwh
-aJBskxikHeSo95d8uf9Jnh/Ce8KiarRS98hTnn+MBzCcQdQMl6+rVf7Nd9ecRAUC
-UROzPMhbd3+4CF1seVnHbQItxJJdHpvp4KgmkysIqGHXbdy2ah5ajnP+29ow9Uyf
-MUewqb/okcT6h9InBfNzL2bDTOpvy2HsKWcxfX+QArNJnW4mLUqCOa4pfUfv8D5B
-o26FhWVhKC93SsUtin1nMtt0/Mw/kRhP30DSsdUzkZBCgL0KnFvdyuy9agT2t0FX
-VoyPFzWCEFj7zzgaFo4Lyc+HeehnKK8p9cZEZu0Jl0r0qFuI65LpMXttzrGxEmlE
-waiW5wfG
-            </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>
-      
-MIIEUjCCAzoCAQAwDQYJKoZIhvcNAQEFBQAwge4xOzA5BgNVBAoTMlVGUk4gLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSaW8gZ3JhbmRlIGRvIE5vcnRlMTAwLgYD
-VQQLEydTaW5mbyAtIFN1cGVyaW50ZW5kZW5jaWEgZGUgaW5mb3JtYXRpY2ExITAf
-BgkqhkiG9w0BCQEWEnJlZGVzQGluZm8udWZybi5icjEOMAwGA1UEBxMFTmF0YWwx
-HDAaBgNVBAgTE1JpbyBHcmFuZGUgZG8gTm9ydGUxCzAJBgNVBAYTAkJSMR8wHQYD
-VQQDExZjYXB1Y2Npbm8uaW5mby51ZnJuLmJyMB4XDTEyMDYxODE3NTA0M1oXDTE1
-MDYxODE3NTA0M1owge4xOzA5BgNVBAoTMlVGUk4gLSBVbml2ZXJzaWRhZGUgRmVk
-ZXJhbCBkbyBSaW8gZ3JhbmRlIGRvIE5vcnRlMTAwLgYDVQQLEydTaW5mbyAtIFN1
-cGVyaW50ZW5kZW5jaWEgZGUgaW5mb3JtYXRpY2ExITAfBgkqhkiG9w0BCQEWEnJl
-ZGVzQGluZm8udWZybi5icjEOMAwGA1UEBxMFTmF0YWwxHDAaBgNVBAgTE1JpbyBH
-cmFuZGUgZG8gTm9ydGUxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZjYXB1Y2Npbm8u
-aW5mby51ZnJuLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLx
-+5Q99cvQ6T4dFLqtoXnaeVtePhdogMKFxJsNwxWL901s+NPJT3f4dkEJ9rMry6g2
-Wg9U+f96mY5iViRSP09RF6IPyHwU0xUh6gZE2ggvLKKbddkU9I380M3n0SJWRSXe
-rMZwL1qiVEA+Ysgvh1CS+NWKmTzn1GC3MCUjB4mA8fdZ+Xh+SlCbSEtbTo0nQxqt
-g2xx+t+jO2YZIawYp+pYEza5gMWTI58csYXijWzWV/SqaUXDN7nEd08UpLVyzKEf
-rtFsA/U5/v3cqdQ3f9czTABbp6RQuN8sXJ1z/rpID+og2W3o0QmIaJ/GtocyEWtK
-U8KkFewao0aPe2OITQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBm3htwaGiZLjwh
-aJBskxikHeSo95d8uf9Jnh/Ce8KiarRS98hTnn+MBzCcQdQMl6+rVf7Nd9ecRAUC
-UROzPMhbd3+4CF1seVnHbQItxJJdHpvp4KgmkysIqGHXbdy2ah5ajnP+29ow9Uyf
-MUewqb/okcT6h9InBfNzL2bDTOpvy2HsKWcxfX+QArNJnW4mLUqCOa4pfUfv8D5B
-o26FhWVhKC93SsUtin1nMtt0/Mw/kRhP30DSsdUzkZBCgL0KnFvdyuy9agT2t0FX
-VoyPFzWCEFj7zzgaFo4Lyc+HeehnKK8p9cZEZu0Jl0r0qFuI65LpMXttzrGxEmlE
-waiW5wfG
-            
-	
-		
-            </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/cardshibidp.cardonald.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/cardshibidp.cardonald.ac.uk-shibboleth.xml
deleted file mode 100644
index 2997569a..00000000
--- a/swamid-interfederations-2.0/cardshibidp.cardonald.ac.uk-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://cardshibidp.cardonald.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Glasgow Clyde College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">cardonald.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlICCQDmyaTj/dnWQTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHR2xhc2dvdzEQMA4GA1UEBxMHR2xhc2dvdzEeMBwGA1UEChMV
-						R2xhc2dvdyBDbHlkZSBDb2xsZWdlMSQwIgYDVQQDExtjYXJkc2hpYmlkcC5jYXJk
-						b25hbGQuYWMudWswHhcNMTQwNDA5MDkxNzA3WhcNMzQwNDA0MDkxNzA3WjB3MQsw
-						CQYDVQQGEwJHQjEQMA4GA1UECBMHR2xhc2dvdzEQMA4GA1UEBxMHR2xhc2dvdzEe
-						MBwGA1UEChMVR2xhc2dvdyBDbHlkZSBDb2xsZWdlMSQwIgYDVQQDExtjYXJkc2hp
-						YmlkcC5jYXJkb25hbGQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQDUBR0+1loJ3T9kkKMKAs/KLAO8pXDtAeNpjNTFGwFRGQOI//gLgeNi3eGn
-						t6nBLcaqAZqVIjsnCkPsIZH5I8L9WXcg3Xrg1+X1PRdBWWicGyizbqqOqeufH2Jz
-						wuhXwEK6DQk2seKkduZtNkxwDELyQGs8U0muyb3/OnJ3KhvBfDIHtm7M0yVFtG2G
-						rE9D4AR6WY4bS2vQwK0dhiGKmPdhL1PpMhbK5spFiCHC9RLpbkKuhAC8ZmUHeCFT
-						5M3Y0SqckKXu1n1nzhIOIlcRFP+P1FBWDFZ5hPm+3el/I12jm129H8VVeWjTOhr6
-						OabPJQiJcOZ7s1iDg+BezNU5v/KzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBALQN
-						t30jSUt1DO6lkHtPVJUX3lnMUurAOX2ko9P2zwk3kKIiu4hgyjNiKJFRm4vmHNWB
-						qpv/zK0dGUFToqHcEU79sCQ3YUKNC3b+s8jE8NQe+lUmxsF4KqYo1SUamwLO9SbF
-						HiLXKmL+8/laltXrjKszX97RBFQakC5IuzrO6k2nzrU7i2E+NkwxqdFkQrwilmq3
-						K2Ieb7y2Bke7GLZHE6F64clptrsVkgXXjcX3mmzkG03i8aSVUqEUJgy1z8NcpH/m
-						54/ncBcKbY9hfoeAr4T4jkFePzJA1+UcnXTBR+SyYGLsjh1u/VG76kwAnwKR+Zyd
-						0qFR8jsJAPaduHvbjU8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cardshibidp.cardonald.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cardshibidp.cardonald.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://cardshibidp.cardonald.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cardshibidp.cardonald.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cardshibidp.cardonald.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cardshibidp.cardonald.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">cardonald.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlICCQDmyaTj/dnWQTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHR2xhc2dvdzEQMA4GA1UEBxMHR2xhc2dvdzEeMBwGA1UEChMV
-						R2xhc2dvdyBDbHlkZSBDb2xsZWdlMSQwIgYDVQQDExtjYXJkc2hpYmlkcC5jYXJk
-						b25hbGQuYWMudWswHhcNMTQwNDA5MDkxNzA3WhcNMzQwNDA0MDkxNzA3WjB3MQsw
-						CQYDVQQGEwJHQjEQMA4GA1UECBMHR2xhc2dvdzEQMA4GA1UEBxMHR2xhc2dvdzEe
-						MBwGA1UEChMVR2xhc2dvdyBDbHlkZSBDb2xsZWdlMSQwIgYDVQQDExtjYXJkc2hp
-						YmlkcC5jYXJkb25hbGQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQDUBR0+1loJ3T9kkKMKAs/KLAO8pXDtAeNpjNTFGwFRGQOI//gLgeNi3eGn
-						t6nBLcaqAZqVIjsnCkPsIZH5I8L9WXcg3Xrg1+X1PRdBWWicGyizbqqOqeufH2Jz
-						wuhXwEK6DQk2seKkduZtNkxwDELyQGs8U0muyb3/OnJ3KhvBfDIHtm7M0yVFtG2G
-						rE9D4AR6WY4bS2vQwK0dhiGKmPdhL1PpMhbK5spFiCHC9RLpbkKuhAC8ZmUHeCFT
-						5M3Y0SqckKXu1n1nzhIOIlcRFP+P1FBWDFZ5hPm+3el/I12jm129H8VVeWjTOhr6
-						OabPJQiJcOZ7s1iDg+BezNU5v/KzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBALQN
-						t30jSUt1DO6lkHtPVJUX3lnMUurAOX2ko9P2zwk3kKIiu4hgyjNiKJFRm4vmHNWB
-						qpv/zK0dGUFToqHcEU79sCQ3YUKNC3b+s8jE8NQe+lUmxsF4KqYo1SUamwLO9SbF
-						HiLXKmL+8/laltXrjKszX97RBFQakC5IuzrO6k2nzrU7i2E+NkwxqdFkQrwilmq3
-						K2Ieb7y2Bke7GLZHE6F64clptrsVkgXXjcX3mmzkG03i8aSVUqEUJgy1z8NcpH/m
-						54/ncBcKbY9hfoeAr4T4jkFePzJA1+UcnXTBR+SyYGLsjh1u/VG76kwAnwKR+Zyd
-						0qFR8jsJAPaduHvbjU8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cardshibidp.cardonald.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cardshibidp.cardonald.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">Glasgow Clyde College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Glasgow Clyde College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cardonald.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Graeme</GivenName>
-    <SurName>MacCormick</SurName>
-    <EmailAddress>mailto:gmaccormick@glasgowclyde.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Cardonald College Service Desk</GivenName>
-    <EmailAddress>mailto:servicedesk@glasgowclyde.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/carmenwiki.osu.edu-shibboleth.xml b/swamid-interfederations-2.0/carmenwiki.osu.edu-shibboleth.xml
deleted file mode 100644
index 04de8a0d..00000000
--- a/swamid-interfederations-2.0/carmenwiki.osu.edu-shibboleth.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://carmenwiki.osu.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://carmenwiki.osu.edu/Shibboleth.sso/Login" 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://carmenwiki.it.ohio-state.edu/Shibboleth.sso/Login" 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://carmenwiki.osu.edu/Shibboleth.sso/Clear" 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://carmenwiki.it.ohio-state.edu/Shibboleth.sso/Clear" index="4"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CarmenWiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Enterprise Wiki Service at the Ohio State University.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://ocio.osu.edu/services/view/carmenwiki-wiki-services</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://carmenwiki.osu.edu/x/jyLeAQ</mdui:PrivacyStatementURL>
-        <mdui:Logo height="85" width="141" xml:lang="en">https://carmenwiki.osu.edu/download/attachments/9666561/global.logo</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIJANI+yGM0M1N2MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHGx0Y2F3aWtpMDEuaXQub2hpby1zdGF0ZS5lZHUwHhcNMTAwNzA3MjI0MzA1
-WhcNMjAwNzA0MjI0MzA1WjAnMSUwIwYDVQQDExxsdGNhd2lraTAxLml0Lm9oaW8t
-c3RhdGUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5fsEv25M
-r9wfa48qfjn8m40yB/lwimJ8dSnYw2erd/tfB+sPESw42Is5Lv2B3pI3mj9a0PT0
-Gf1VgUoQW0RCT6L4VOW50WsPFv/RKPfT/AIRl00dTCqb440PgotGbrK9ivZqlvkz
-lSGUKuFcg2gLj+CJlbMcwEneSwn0FE1xKEGpMDUk91lZH1XxmnIDDOQn1G5qul4q
-AbXITMpLi2MlsHAEXxnLrthFFas6zDrviTwHcqGXq9zJJkPHDcbu1qg6AUT7bRJr
-qszxxktSV6mFclkgLPpcVkigMR8RNVMQkWaaWSnfBkFy2iAe3xw3DNp7obtzgItY
-i9N8U6K5qorSkQIDAQABo0owSDAnBgNVHREEIDAeghxsdGNhd2lraTAxLml0Lm9o
-aW8tc3RhdGUuZWR1MB0GA1UdDgQWBBR32XnCliG78DdyTtZhyIQSHChtyjANBgkq
-hkiG9w0BAQUFAAOCAQEAVEweCxPElHGmam4Iv2QeJsGE7m4de7axp3epAJb7uVbN
-Z2P1S/s4GZQhmGsUoGoxwqca3wyQ+C1ZkpQJdyFl5s1tFc26D+Z0KTDo174GzO9i
-I9SeQ4YSp3FNhZqxn4xH3DULzzHwoVSwFr5irLPAVtrqK8H/rzBREhqOse2VSJ/1
-PkI+p7lUiElIzMiObLGjumF2fDOPkXOSMNyC4c5oCCJtcrip/BaLo6bqdqn3DKP8
-onMw/lHZQolyVsupuhGsSX13WVJ0uyGvuA7hiHnGEkpDmskUd3TsriyQAt47RZzY
-tTupO/NdWvz8SvXU1qIOk9CTQ0D2b2OOftfUW+FuAQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://carmenwiki.osu.edu/Shibboleth.sso/SAML/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://carmenwiki.osu.edu/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://carmenwiki.it.ohio-state.edu/Shibboleth.sso/SAML/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://carmenwiki.it.ohio-state.edu/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://carmenwiki.osu.edu/Shibboleth.sso/SAML2/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://carmenwiki.osu.edu/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://carmenwiki.it.ohio-state.edu/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://carmenwiki.it.ohio-state.edu/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://carmenwiki.osu.edu/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://carmenwiki.it.ohio-state.edu/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">CarmenWiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Enterprise Wiki Service at the Ohio State University.</md:ServiceDescription>
-      <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="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="mail" 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">The Ohio State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ohio State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.osu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Travis Ritter</md:GivenName>
-    <md:EmailAddress>ritter.18@osu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Service Desk</md:GivenName>
-    <md:EmailAddress>8help@osu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Web Authentication Support</md:GivenName>
-    <md:EmailAddress>webauth-admin@lists.service.ohio-state.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/caroa.univasf.edu.br.xml b/swamid-interfederations-2.0/caroa.univasf.edu.br.xml
deleted file mode 100644
index c3155e57..00000000
--- a/swamid-interfederations-2.0/caroa.univasf.edu.br.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://caroa.univasf.edu.br/shib-idp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">univasf.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIVASF - Universidade Federal do Vale do Sao Francisco</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIVASF - Universidade Federal do Vale do Sao Francisco</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIVASF - Universidade Federal do Vale do Sao Francisco</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIVASF - Universidade Federal do Vale do Sao Francisco</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.univasf.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.univasf.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID+zCCAuOgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMCQlIx
-EzARBgNVBAgTClBlcm5hbWJ1Y28xEjAQBgNVBAcTCVBldHJvbGluYTEQMA4GA1UE
-ChMHVU5JVkFTRjEMMAoGA1UECxMDU1RJMSUwIwYJKoZIhvcNAQkBFhZzdXBvcnRl
-QHVuaXZhc2YuZWR1LmJyMR0wGwYDVQQDExRjYXJvYS51bml2YXNmLmVkdS5icjAe
-Fw0wOTEyMDcxOTE3NTdaFw0xMjEyMDYxOTE3NTdaMIGcMQswCQYDVQQGEwJCUjET
-MBEGA1UECBMKUGVybmFtYnVjbzESMBAGA1UEBxMJUGV0cm9saW5hMRAwDgYDVQQK
-EwdVTklWQVNGMQwwCgYDVQQLEwNTVEkxJTAjBgkqhkiG9w0BCQEWFnN1cG9ydGVA
-dW5pdmFzZi5lZHUuYnIxHTAbBgNVBAMTFGNhcm9hLnVuaXZhc2YuZWR1LmJyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyy0H78oLVsBhxHlOjMaTmhQJ
-J20jz1NVJVHNkNJtshASqIHf7nrC7iFIOQOCZgedMjKbiHWyQhkgmR2AuAnuq94g
-FHJoDqdliVFegU+OZotWHYjYVLW2Dx3TF71cvqhy5PtdmOLWi2LcK08eD719fNUr
-tAFbNaCqPrfApR3IriWZ9f7U23I1WQ6wqEFimGgHKUOzZX1DbDyfF0NFhoE8ZT3E
-LWxS8OQfLOahad/I4Ji+an1g8CzKoHoGp8urWAH1VO9nGFjXMbY3GDEg6LANHhqm
-2/B8ynWkDnr2YkSGsxI7OYBZbJzHxNUSPIvKmeDvn2lTGsd0EpoSSFgQ1QlqkwID
-AQABo0YwRDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAhBggrBgEF
-BQcDAQYJYIZIAYb4QgQBBgorBgEEAYI3CgMDMA0GCSqGSIb3DQEBBQUAA4IBAQAp
-PbOkc0TkHCPHyeBj0r9GqOM8P2jphq42z2OL3cAvJ5ra5rvm2zDuvcfDz8BU44q6
-fHM6xzLawmj7PraoROgfSuYB9ominhB9uCC9ivyoDWzJA48zXRzwJSs6m1hxHYu/
-hI6jqYydmbfjl9nGa0SzRu807eCObVnhaTT39oLOBTn5e2j2cLzO65Rm3L5P+X7B
-1ZHQFg7EdDGYdpL73EmXCln354Qn/KYExoxpBJ7jSx+zSUD82MJGN4pC6/W0pqsd
-sJ50WLdnA+GPrvR2ExHYz/AG7jEyiyp3xRYm6yYQ/zXXKykKJOMnoPEwDOLEfgJ5
-C4ItBKZG311DVPXkz7r2
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://caroa.univasf.edu.br:8443/shibboleth-idp/AA" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://caroa.univasf.edu.br/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">univasf.edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID+zCCAuOgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMCQlIx
-EzARBgNVBAgTClBlcm5hbWJ1Y28xEjAQBgNVBAcTCVBldHJvbGluYTEQMA4GA1UE
-ChMHVU5JVkFTRjEMMAoGA1UECxMDU1RJMSUwIwYJKoZIhvcNAQkBFhZzdXBvcnRl
-QHVuaXZhc2YuZWR1LmJyMR0wGwYDVQQDExRjYXJvYS51bml2YXNmLmVkdS5icjAe
-Fw0wOTEyMDcxOTE3NTdaFw0xMjEyMDYxOTE3NTdaMIGcMQswCQYDVQQGEwJCUjET
-MBEGA1UECBMKUGVybmFtYnVjbzESMBAGA1UEBxMJUGV0cm9saW5hMRAwDgYDVQQK
-EwdVTklWQVNGMQwwCgYDVQQLEwNTVEkxJTAjBgkqhkiG9w0BCQEWFnN1cG9ydGVA
-dW5pdmFzZi5lZHUuYnIxHTAbBgNVBAMTFGNhcm9hLnVuaXZhc2YuZWR1LmJyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyy0H78oLVsBhxHlOjMaTmhQJ
-J20jz1NVJVHNkNJtshASqIHf7nrC7iFIOQOCZgedMjKbiHWyQhkgmR2AuAnuq94g
-FHJoDqdliVFegU+OZotWHYjYVLW2Dx3TF71cvqhy5PtdmOLWi2LcK08eD719fNUr
-tAFbNaCqPrfApR3IriWZ9f7U23I1WQ6wqEFimGgHKUOzZX1DbDyfF0NFhoE8ZT3E
-LWxS8OQfLOahad/I4Ji+an1g8CzKoHoGp8urWAH1VO9nGFjXMbY3GDEg6LANHhqm
-2/B8ynWkDnr2YkSGsxI7OYBZbJzHxNUSPIvKmeDvn2lTGsd0EpoSSFgQ1QlqkwID
-AQABo0YwRDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAhBggrBgEF
-BQcDAQYJYIZIAYb4QgQBBgorBgEEAYI3CgMDMA0GCSqGSIb3DQEBBQUAA4IBAQAp
-PbOkc0TkHCPHyeBj0r9GqOM8P2jphq42z2OL3cAvJ5ra5rvm2zDuvcfDz8BU44q6
-fHM6xzLawmj7PraoROgfSuYB9ominhB9uCC9ivyoDWzJA48zXRzwJSs6m1hxHYu/
-hI6jqYydmbfjl9nGa0SzRu807eCObVnhaTT39oLOBTn5e2j2cLzO65Rm3L5P+X7B
-1ZHQFg7EdDGYdpL73EmXCln354Qn/KYExoxpBJ7jSx+zSUD82MJGN4pC6/W0pqsd
-sJ50WLdnA+GPrvR2ExHYz/AG7jEyiyp3xRYm6yYQ/zXXKykKJOMnoPEwDOLEfgJ5
-C4ItBKZG311DVPXkz7r2
-      
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://caroa.univasf.edu.br:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UFVASF - Universidade Federal do Vale do Sao Francisco</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFVASF - Universidade Federal do Vale do Sao Francisco</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIVASF - Universidade Federal do Vale do Sao Francisco</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIVASF - Universidade Federal do Vale do Sao Francisco</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.univasf.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.univasf.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Augusto Silva</SurName>
-    <EmailAddress>augusto.silva@univasf.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml
deleted file mode 100644
index 00269d53..00000000
--- a/swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.ac-martinique.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Rectorat de la Martinique</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAZElEQVQ4y2NgGAWDGPz/////83f//s/e9Ob//////+NSx4JLYt3BjwyPXr5nEOJhZlh7mBGnRUy4JNhZGRiev/rBIMDDxMDMiNMe3C5QUeRnePfpN8PrL/8ZbA34BjI0RwFBAABCjB880DwkwgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozNSswMjowMAiP6nIAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzUrMDI6MDB50lLOAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ac-martinique.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Rectorat de la Martinique</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>
-					      MIIDMDCCAhigAwIBAgIJAO+vrJKYUPAdMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGNhcy5hYy1tYXJ0aW5pcXVlLmZyMB4XDTE2MDExNDE0NTQzOVoXDTE5MDEx
-MzE0NTQzOVowHzEdMBsGA1UEAxMUY2FzLmFjLW1hcnRpbmlxdWUuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyHJKHkFxgsHPL8jBjAvCQVsXw4fTt
-nm5M+uQQJP9mKc3DxlNwbrag/NlvAK+Vq5ViRcX9+irz48JsL93FIVuph/BSG1J9
-MZTJZTeLyJjlg5CH+maQ0dc+DFzBlt+VzO+nep5kqqwpHR+3UNeOo8Gmhlk/a0CD
-nnbj0iNCq7EcCEa8rNH3DE0z11MRYydZ5UieiNRK0AgAq8tQTLAbCLUMADBC292c
-TGuyf+1GylRmEoqkXSUyOJta1OkqM3NxDlx7OMbMaMgenH/TP3rs0XoGVvn2dmiP
-vojcETM9DV41D8Pj4vHsZZddOFyA2XA9XblyOKzR/OiOaJVvLhv673D1AgMBAAGj
-bzBtMEwGA1UdEQRFMEOCFGNhcy5hYy1tYXJ0aW5pcXVlLmZyhitodHRwczovL2Nh
-cy5hYy1tYXJ0aW5pcXVlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRg3/Gu
-u6FNW6EyzljbAqg4mFcO7TANBgkqhkiG9w0BAQUFAAOCAQEAqgWqJuN8mYnr+Kpj
-IQ8huOTY/nXCiFzwzHZqlynYX1iWR56VXrfUCcg6CbUGm8F2OKag0SeqhLu1zfEf
-B/Y4jtpJuc57/z05cQ5zi3tHntKeM4QnIikDTqjrm8xLbyIsq7wWcwLAjGacLkRf
-xuQBpGaTGTPZNj4vXclA8oWRUb53kCnQgRsZp5SeFuZu0PHDf5SoaZKvCUZRAOv6
-Tfc+LsUM5bC2uLytT0efHn22gkwNTDJnOZCsWyw7zaZK55anjFwviS2740VXhPZH
-4IOlte+m10JRIgU3ewdr324xl1iABycJ+6I//hRWHswzs1V+juvTfBxAmKlgkHoS
-uH6Wrg==
-					    </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>
-					      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>
-    </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-POST" Location="https://cas.ac-martinique.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.ac-martinique.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.ac-martinique.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-martinique.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMDCCAhigAwIBAgIJAO+vrJKYUPAdMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGNhcy5hYy1tYXJ0aW5pcXVlLmZyMB4XDTE2MDExNDE0NTQzOVoXDTE5MDEx
-MzE0NTQzOVowHzEdMBsGA1UEAxMUY2FzLmFjLW1hcnRpbmlxdWUuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyHJKHkFxgsHPL8jBjAvCQVsXw4fTt
-nm5M+uQQJP9mKc3DxlNwbrag/NlvAK+Vq5ViRcX9+irz48JsL93FIVuph/BSG1J9
-MZTJZTeLyJjlg5CH+maQ0dc+DFzBlt+VzO+nep5kqqwpHR+3UNeOo8Gmhlk/a0CD
-nnbj0iNCq7EcCEa8rNH3DE0z11MRYydZ5UieiNRK0AgAq8tQTLAbCLUMADBC292c
-TGuyf+1GylRmEoqkXSUyOJta1OkqM3NxDlx7OMbMaMgenH/TP3rs0XoGVvn2dmiP
-vojcETM9DV41D8Pj4vHsZZddOFyA2XA9XblyOKzR/OiOaJVvLhv673D1AgMBAAGj
-bzBtMEwGA1UdEQRFMEOCFGNhcy5hYy1tYXJ0aW5pcXVlLmZyhitodHRwczovL2Nh
-cy5hYy1tYXJ0aW5pcXVlLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRg3/Gu
-u6FNW6EyzljbAqg4mFcO7TANBgkqhkiG9w0BAQUFAAOCAQEAqgWqJuN8mYnr+Kpj
-IQ8huOTY/nXCiFzwzHZqlynYX1iWR56VXrfUCcg6CbUGm8F2OKag0SeqhLu1zfEf
-B/Y4jtpJuc57/z05cQ5zi3tHntKeM4QnIikDTqjrm8xLbyIsq7wWcwLAjGacLkRf
-xuQBpGaTGTPZNj4vXclA8oWRUb53kCnQgRsZp5SeFuZu0PHDf5SoaZKvCUZRAOv6
-Tfc+LsUM5bC2uLytT0efHn22gkwNTDJnOZCsWyw7zaZK55anjFwviS2740VXhPZH
-4IOlte+m10JRIgU3ewdr324xl1iABycJ+6I//hRWHswzs1V+juvTfBxAmKlgkHoS
-uH6Wrg==
-					    </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>
-					      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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.ac-martinique.fr/idp/profile/SAML1/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">Rectorat de la Martinique</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rectorat de la Martinique</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ac-martinique.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi@ac-martinique.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.cgcent.miami.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.cgcent.miami.edu-idp-shibboleth.xml
deleted file mode 100644
index 64595f0d..00000000
--- a/swamid-interfederations-2.0/cas.cgcent.miami.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,92 +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://cas.cgcent.miami.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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/hide-from-discovery</saml:AttributeValue>
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</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">miami.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">zTest_University of Miami</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>
-MIIDOzCCAiOgAwIBAgIUENN7pIAppEM5kpFqfJ0yapfX/lgwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUY2FzLmNnY2VudC5taWFtaS5lZHUwHhcNMTEwNjE1MTMy
-NjExWhcNMzEwNjE1MTMyNjExWjAfMR0wGwYDVQQDExRjYXMuY2djZW50Lm1pYW1p
-LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ+Y4nj/hU3gkyyy
-DrXqooTIuSZfnlNORDNhhiBHlDZ6hZuMfxeQ2Rlq00lkSS7bNHGZBlf9Wj2dtkDZ
-7xqyqtLFT1Pfnn+wQ3ordhAagOx1sh8Re/clsbPDfH6lhnf669uNxR3uoCM2/kLV
-9WKWXjhYgq6bP7521sGNYJrz7dDB+Kk1zRiYnT8NtbcBoWyWpHffbnPY3nqhiyvL
-cd9dyQdcfymMf6HLnQZmcOdZJSdpgQRJ7vUKTLqKn6lEVgweqTJscURo89Ef73Bs
-NOLXZ3gaKp40wxUmYv2u5EG9vazigo5A8E7L3ahmEIULkQS2wBxiYDIyGUYQXnB2
-SW45bJMCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUY2FzLmNnY2VudC5taWFtaS5lZHWG
-K2h0dHBzOi8vY2FzLmNnY2VudC5taWFtaS5lZHUvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFCX0KLFqcbwPHS4lBV5ynBkOjkJdMA0GCSqGSIb3DQEBBQUAA4IBAQAE
-+INXRGUhPoYzJuRcmhmAMXqpMVPcZGJm4jx/Kd4JE7bYgpWgLULLm4nVAptIOS6y
-Z6kaQpf0wQApCLb5mqofcqfzIVsqhcQ9jpzcP1cMFgRkl2D8WbgSnT4PoObCjsU/
-7vEkNaAQ5EZz1+N/5fzvUs8kLJagjyTMTNcMxvGlAVE7OY/SF8aN6InvKH8L440z
-C0CCRFh4Nv4ABEh4J9zCETIuv5x5X+73JBTm/Lqv77wlHDIo5u3gQMKRC8zHn7xv
-IsLKXZxJPuY1fEpWPmB2KT8oMw7oTbO92Jskpie62r7N3dnb2J1OMHevgm7DOP+D
-RPbHcgoMCemXOUYD6n4c
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.cgcent.miami.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.cgcent.miami.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.cgcent.miami.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.cgcent.miami.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.cgcent.miami.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miami.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUENN7pIAppEM5kpFqfJ0yapfX/lgwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUY2FzLmNnY2VudC5taWFtaS5lZHUwHhcNMTEwNjE1MTMy
-NjExWhcNMzEwNjE1MTMyNjExWjAfMR0wGwYDVQQDExRjYXMuY2djZW50Lm1pYW1p
-LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ+Y4nj/hU3gkyyy
-DrXqooTIuSZfnlNORDNhhiBHlDZ6hZuMfxeQ2Rlq00lkSS7bNHGZBlf9Wj2dtkDZ
-7xqyqtLFT1Pfnn+wQ3ordhAagOx1sh8Re/clsbPDfH6lhnf669uNxR3uoCM2/kLV
-9WKWXjhYgq6bP7521sGNYJrz7dDB+Kk1zRiYnT8NtbcBoWyWpHffbnPY3nqhiyvL
-cd9dyQdcfymMf6HLnQZmcOdZJSdpgQRJ7vUKTLqKn6lEVgweqTJscURo89Ef73Bs
-NOLXZ3gaKp40wxUmYv2u5EG9vazigo5A8E7L3ahmEIULkQS2wBxiYDIyGUYQXnB2
-SW45bJMCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUY2FzLmNnY2VudC5taWFtaS5lZHWG
-K2h0dHBzOi8vY2FzLmNnY2VudC5taWFtaS5lZHUvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFCX0KLFqcbwPHS4lBV5ynBkOjkJdMA0GCSqGSIb3DQEBBQUAA4IBAQAE
-+INXRGUhPoYzJuRcmhmAMXqpMVPcZGJm4jx/Kd4JE7bYgpWgLULLm4nVAptIOS6y
-Z6kaQpf0wQApCLb5mqofcqfzIVsqhcQ9jpzcP1cMFgRkl2D8WbgSnT4PoObCjsU/
-7vEkNaAQ5EZz1+N/5fzvUs8kLJagjyTMTNcMxvGlAVE7OY/SF8aN6InvKH8L440z
-C0CCRFh4Nv4ABEh4J9zCETIuv5x5X+73JBTm/Lqv77wlHDIo5u3gQMKRC8zHn7xv
-IsLKXZxJPuY1fEpWPmB2KT8oMw7oTbO92Jskpie62r7N3dnb2J1OMHevgm7DOP+D
-RPbHcgoMCemXOUYD6n4c
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.cgcent.miami.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Miami</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">zTest_University of Miami</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.miami.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Anil Kadiyala</md:GivenName>
-    <md:EmailAddress>akadiyala@miami.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cas.conncoll.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/cas.conncoll.edu-idp-shibboleth.xml
deleted file mode 100644
index afe44e26..00000000
--- a/swamid-interfederations-2.0/cas.conncoll.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://cas.conncoll.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">conncoll.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Connecticut College</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>
-MIIDODCCAiCgAwIBAgIVAPUEeM0abFXGCIdEOlAW+9wmzXf4MA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2Nhc3RzdC5jb25uY29sbC5lZHUwHhcNMTMxMDI4MTYw
-NzU1WhcNMzMxMDI4MTYwNzU1WjAeMRwwGgYDVQQDExNjYXN0c3QuY29ubmNvbGwu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIFDuBMCiM4YbPZC
-m3ezj4xircODZvGjqjy06237XEsGT8oKZBbciJKyuNzASg6FropxbyX3i+4/6+E3
-lgxgs1hqqzHGiS6B5R0ilQBkIZHdCNhNXFp65380XwTQswn+9FrmZsrOVGcxWfnu
-QbS28Tp69D3mq8CFjQ+L3LUt3CgzX3SlvdeH8WCX7fsJisN6VkAg/LuNPO/wIUhW
-maInVIPBfMLgmT2pWSAXVanmGhbpmriOa/PMvw57VQX1jPAktbfNQvwcVmwkOS+e
-qLP4zmKDx09AQui5X+tAShB/Fu0GhcsrSBiK5MbtjuQcOSH1R8uZV/9/Ku2le3oK
-Ui7jfQIDAQABo20wazBKBgNVHREEQzBBghNjYXN0c3QuY29ubmNvbGwuZWR1hipo
-dHRwczovL2Nhc3RzdC5jb25uY29sbC5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFM0pR2d0wY/alMsBiZDCxRt34lzpMA0GCSqGSIb3DQEBBQUAA4IBAQBVfUXC
-cNA6+xYP28WbWxZmrIvWZvDRyHWU/GiM4fOj+pSV1SfuQ/CBUI/3BDTOe+kxjMM5
-A5gbTLSemQz0hg435PNUfqfbjjfWyBeNmEnyIWgbH+onJJfxfclDRPsmkfNpzZfq
-+NGIlWBQqg4TiqP6eWteaLpR6JTrZvNHByQayM+5gc3BbFCEAbp5mxy5ZTARYRed
-x6203y+SNmiQJbanlMD+Zc7Dy5XmEMoGZjxNqa+9hj1O7oD2wyU4aGciOIkX6txH
-4e/vvoM57//T3rGxWRAUJwD5uYM0Dmkj2UhVU9xPPTsHIEoN38w2FWQi1UhTM2mN
-Zw7lDmCUxzGbtrzP
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.conncoll.edu:443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.conncoll.edu:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.conncoll.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.conncoll.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.conncoll.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">conncoll.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAPUEeM0abFXGCIdEOlAW+9wmzXf4MA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2Nhc3RzdC5jb25uY29sbC5lZHUwHhcNMTMxMDI4MTYw
-NzU1WhcNMzMxMDI4MTYwNzU1WjAeMRwwGgYDVQQDExNjYXN0c3QuY29ubmNvbGwu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIFDuBMCiM4YbPZC
-m3ezj4xircODZvGjqjy06237XEsGT8oKZBbciJKyuNzASg6FropxbyX3i+4/6+E3
-lgxgs1hqqzHGiS6B5R0ilQBkIZHdCNhNXFp65380XwTQswn+9FrmZsrOVGcxWfnu
-QbS28Tp69D3mq8CFjQ+L3LUt3CgzX3SlvdeH8WCX7fsJisN6VkAg/LuNPO/wIUhW
-maInVIPBfMLgmT2pWSAXVanmGhbpmriOa/PMvw57VQX1jPAktbfNQvwcVmwkOS+e
-qLP4zmKDx09AQui5X+tAShB/Fu0GhcsrSBiK5MbtjuQcOSH1R8uZV/9/Ku2le3oK
-Ui7jfQIDAQABo20wazBKBgNVHREEQzBBghNjYXN0c3QuY29ubmNvbGwuZWR1hipo
-dHRwczovL2Nhc3RzdC5jb25uY29sbC5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFM0pR2d0wY/alMsBiZDCxRt34lzpMA0GCSqGSIb3DQEBBQUAA4IBAQBVfUXC
-cNA6+xYP28WbWxZmrIvWZvDRyHWU/GiM4fOj+pSV1SfuQ/CBUI/3BDTOe+kxjMM5
-A5gbTLSemQz0hg435PNUfqfbjjfWyBeNmEnyIWgbH+onJJfxfclDRPsmkfNpzZfq
-+NGIlWBQqg4TiqP6eWteaLpR6JTrZvNHByQayM+5gc3BbFCEAbp5mxy5ZTARYRed
-x6203y+SNmiQJbanlMD+Zc7Dy5XmEMoGZjxNqa+9hj1O7oD2wyU4aGciOIkX6txH
-4e/vvoM57//T3rGxWRAUJwD5uYM0Dmkj2UhVU9xPPTsHIEoN38w2FWQi1UhTM2mN
-Zw7lDmCUxzGbtrzP
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.conncoll.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Connecticut College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Connecticut College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.conncoll.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andrew Tillinghast</md:GivenName>
-    <md:EmailAddress>atilling@conncoll.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jean Dailey</md:GivenName>
-    <md:EmailAddress>jdailey@conncoll.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Laurie Schaeffer</md:GivenName>
-    <md:EmailAddress>lbsch@conncoll.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>John Schaeffer</md:GivenName>
-    <md:EmailAddress>jsch@conncoll.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0e9858df..00000000
--- a/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.crous-lyon.fr/idp/shibboleth">
-  <md: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>
-  </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 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 Lyon-Personnels</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAACMuAAAjLgAAAAAAAAAAAAAAAAAAAAAAABMG4wATBuMHEwbjShMG46oTBuPmEwbj/BMG4/0TBuPmEwbjqxMG40sTBuMHEwbjAAAAAAAAAAAAEwbjABMG4wATBuMZEwbjlBMG4+8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuPwEwbjlRMG4xkTBuMAEwbjABMG4wATBuMZEwbjshMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuOzEwbjGhMG4wATBuMGEwbjkxMG4/8TBuP/Ewbj/xMG4/8TBuP/EgXj/xEE4/8SBeP/EgXj/xMG4/8TBuP/Ewbj/xMG45QTBuMGEwbjShMG4+4TBuP/Ewbj/xMG4/8TBuP/Ewbj/xwP5P81Kuf/KB3m/x4S5P8TBuP/Ewbj/xMG4/8TBuPuEwbjTBMG46gTBuP/Ewbj/xMG4/8TBuP/Ewbj/xIF4/8xJuf/WlLs/1xU7P9DOen/EQTj/xIF4/8QA+P/EQTj/xAD46oTBuPkEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/OC7n/zsw6P8rIOb/Ihbl/z406P8lGeX/PTPo/ywg5v9COOnlEwbj+xMG4/8TBuP/Ewbj/xMG4/8RBOP/LiLm/3Rt7/9RSOr/bmfu/2Rc7f+OifL/fHXv/4uG8f55cu//nJfz+xMG4/sTBuP/Ewbj/xMG4/8TBuP/EgTj/ywg5v91bu//VUzr/0k/6f9PRur/ZFvt/0pA6v9GPOn+TEPq/2tk7vwTBuPkEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/MSXn/zUq5/8TBuP/EgXj/xIF4/8RBOP/EgXj/xEE4/8SBePlEwbjqBMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xEE4/8RBOP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/EwbjqRMG40oTBuPtEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj7hMG40sTBuMGEwbjkhMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG45QTBuMGEwbjABMG4xgTBuOxEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj/xMG47ITBuMZEwbjABMG4wATBuMAEwbjGBMG45ITBuPvEwbj/xMG4/8TBuP/Ewbj/xMG4/8TBuP/Ewbj7xMG45MTBuMZEwbjABMG4wAAAAAAAAAAABMG4wATBuMHEwbjSRMG46gTBuPkEwbj/BMG4/wTBuPlEwbjqRMG40oTBuMHEwbjAAAAAAAAAAAA4AcAAMADAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAADAAwAA4AcAAA==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-lyon.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">personnel</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Lyon-Personnels</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">personnel</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>
-					      MIIDjDCCAnQCCQCGEZBF73r8IDANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-RlIxFDASBgNVBAgMC1JIT05FLUFMUEVTMQ0wCwYDVQQHDARMWU9OMRMwEQYDVQQK
-DApDUk9VUyBMWU9OMRowGAYDVQQDDBFjYXMuY3JvdXMtbHlvbi5mcjEiMCAGCSqG
-SIb3DQEJARYTc2luZm9AY3JvdXMtbHlvbi5mcjAeFw0xNTEwMjgxNTQ1MzZaFw0y
-NTEwMjUxNTQ1MzZaMIGHMQswCQYDVQQGEwJGUjEUMBIGA1UECAwLUkhPTkUtQUxQ
-RVMxDTALBgNVBAcMBExZT04xEzARBgNVBAoMCkNST1VTIExZT04xGjAYBgNVBAMM
-EWNhcy5jcm91cy1seW9uLmZyMSIwIAYJKoZIhvcNAQkBFhNzaW5mb0Bjcm91cy1s
-eW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqvcFcCtV1M60
-Y7y/q2KPw/SxJ88NV76E0uQTJ68wwTLqgu09yqM1+LTUI6DoY8MfZQTLE/LS+amX
-AbrDNNAb2wsvFs5LnsJToy0oFOHqkxRDWuOn0bCAWW/Ug48LNriODP+bwzGZGjhG
-TWUXFPnIcFcaVXvaLfWbwnTodRoC2agtRBKBJVpk4k7yQxtCWVtgU0MLW6nTtIoW
-KagyVFcaSqgGK3rz7oWfENM574x8RFyGS5klrPoc7S6mph84XSzcRnnB2wHm0v7W
-var85+Erha9wL9V+ThcH+bskJzDQHBVK86lPeDKM+cmVMK6DcqgWnqCByO6H4DP8
-uRDugNJMAQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCmriKSevyXfwn101JFqbTj
-xxBjqstWPpNs0h9sX3Gu9E1TC8I7lEscvP3EOxwGTrS28kM0gSjYUUYiB5tN91Yh
-A9kaXAiftgZ2V0M37LWutNm0Ail/BP0qfJrHBv5Q4RixVG5f7+48RbK3wexlw0/b
-rmaYO6QZ8rEHempWBfGnwY8dBT6FlGAAXxfx5U98ol/sP/wSgKUi0+o88Syhe+4o
-aXHTe0kbLH8HKskUOpzXXuEDr9U/J1UUqX7BuHaJFrJvPxl9+Ln8f+snfqfD1lan
-uRFWPZDMY1xgKw50XyW/PKjnsWjCitM05Mem2pjkZj0nurjPOrIwlJetip5QFwfg
-					    </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-POST" Location="https://cas.crous-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.crous-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.crous-lyon.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-lyon.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDjDCCAnQCCQCGEZBF73r8IDANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-RlIxFDASBgNVBAgMC1JIT05FLUFMUEVTMQ0wCwYDVQQHDARMWU9OMRMwEQYDVQQK
-DApDUk9VUyBMWU9OMRowGAYDVQQDDBFjYXMuY3JvdXMtbHlvbi5mcjEiMCAGCSqG
-SIb3DQEJARYTc2luZm9AY3JvdXMtbHlvbi5mcjAeFw0xNTEwMjgxNTQ1MzZaFw0y
-NTEwMjUxNTQ1MzZaMIGHMQswCQYDVQQGEwJGUjEUMBIGA1UECAwLUkhPTkUtQUxQ
-RVMxDTALBgNVBAcMBExZT04xEzARBgNVBAoMCkNST1VTIExZT04xGjAYBgNVBAMM
-EWNhcy5jcm91cy1seW9uLmZyMSIwIAYJKoZIhvcNAQkBFhNzaW5mb0Bjcm91cy1s
-eW9uLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqvcFcCtV1M60
-Y7y/q2KPw/SxJ88NV76E0uQTJ68wwTLqgu09yqM1+LTUI6DoY8MfZQTLE/LS+amX
-AbrDNNAb2wsvFs5LnsJToy0oFOHqkxRDWuOn0bCAWW/Ug48LNriODP+bwzGZGjhG
-TWUXFPnIcFcaVXvaLfWbwnTodRoC2agtRBKBJVpk4k7yQxtCWVtgU0MLW6nTtIoW
-KagyVFcaSqgGK3rz7oWfENM574x8RFyGS5klrPoc7S6mph84XSzcRnnB2wHm0v7W
-var85+Erha9wL9V+ThcH+bskJzDQHBVK86lPeDKM+cmVMK6DcqgWnqCByO6H4DP8
-uRDugNJMAQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCmriKSevyXfwn101JFqbTj
-xxBjqstWPpNs0h9sX3Gu9E1TC8I7lEscvP3EOxwGTrS28kM0gSjYUUYiB5tN91Yh
-A9kaXAiftgZ2V0M37LWutNm0Ail/BP0qfJrHBv5Q4RixVG5f7+48RbK3wexlw0/b
-rmaYO6QZ8rEHempWBfGnwY8dBT6FlGAAXxfx5U98ol/sP/wSgKUi0+o88Syhe+4o
-aXHTe0kbLH8HKskUOpzXXuEDr9U/J1UUqX7BuHaJFrJvPxl9+Ln8f+snfqfD1lan
-uRFWPZDMY1xgKw50XyW/PKjnsWjCitM05Mem2pjkZj0nurjPOrIwlJetip5QFwfg
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.crous-lyon.fr/idp/profile/SAML1/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">CROUS Lyon-Personnels</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Lyon-Personnels</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-lyon.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>sinfo@crous-lyon.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 842dbc6d..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.cuni.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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">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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMTCCAhmgAwIBAgIJANqPbg8m3ZcAMA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNV
-BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMRQw
-EgYDVQQDEwtjYXMuY3VuaS5jejAeFw0xNTAxMjAwOTUwNDRaFw0yMDAxMTkwOTUw
-NDRaMEoxCzAJBgNVBAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkg
-aW4gUHJhZ3VlMRQwEgYDVQQDEwtjYXMuY3VuaS5jejCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAN0feuG6+FLnbIh05Zmy487kOMkpOxMC2herMuXuVR+l
-e/SlicUomEeJGImbTC/THTGvn0+Y9ROKkZHu16tQ8uyMDxNZX5g/JMZNIp+yOlnG
-cTwtUPtpgABNAVTVwdG34E24hQVzO3B+bTJXtGtzDOmu/c7R8uVwlK6d2BNQBlu9
-SA6W4xvNOwSjBCpdZgG++uj+GwGKuPEaFh534MX2LoCOExGC6khoj2thMhUMBQPt
-81Uio99xdbT3/e5bs89iRxmrsqGwOWUPdx1zBJG5NqI4b/m8wbJ1htH/6yLm8TCo
-V/mZlCLUBzn45secmhN3OhAoq4IiHH2XqAwc8xWKyRMCAwEAAaMaMBgwFgYDVR0R
-BA8wDYILY2FzLmN1bmkuY3owDQYJKoZIhvcNAQELBQADggEBALsTJzFgI0Nf+0l5
-FccXlhEbCxzHtHPmiETIus2hEKY0zuWsqm9mGOr/+30ng862mJ/kok4YZPGrJZue
-AgJo/dveZGCWetZv65XFDBl+gE2G/+TJplM41XEHSWJ15EhpCECxXhlBw0vRon+h
-6HBmGrLZzzy0F2+5dGqf6cZW8T6NToJRVWBxPTKs26bgER/Clj1EfkNubmU+u91F
-oErcj4bh09j1zv6Dt6c6N4Zdzsq6bg9sYRVRB4d80zhfw61qz0+Ln2Rp/k95aaOe
-czKNjg972Y385kSS8YEHXlVJbnuZHeqAnsq6v1L6b6FFQEkgFfoNPMLxpPzKFtRg
-qzjW2e0=
-                   </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.cuni.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://cas.cuni.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas.cuni.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cas.cuni.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.cuni.cz/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">cuni.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMTCCAhmgAwIBAgIJANqPbg8m3ZcAMA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNV
-BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMRQw
-EgYDVQQDEwtjYXMuY3VuaS5jejAeFw0xNTAxMjAwOTUwNDRaFw0yMDAxMTkwOTUw
-NDRaMEoxCzAJBgNVBAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkg
-aW4gUHJhZ3VlMRQwEgYDVQQDEwtjYXMuY3VuaS5jejCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAN0feuG6+FLnbIh05Zmy487kOMkpOxMC2herMuXuVR+l
-e/SlicUomEeJGImbTC/THTGvn0+Y9ROKkZHu16tQ8uyMDxNZX5g/JMZNIp+yOlnG
-cTwtUPtpgABNAVTVwdG34E24hQVzO3B+bTJXtGtzDOmu/c7R8uVwlK6d2BNQBlu9
-SA6W4xvNOwSjBCpdZgG++uj+GwGKuPEaFh534MX2LoCOExGC6khoj2thMhUMBQPt
-81Uio99xdbT3/e5bs89iRxmrsqGwOWUPdx1zBJG5NqI4b/m8wbJ1htH/6yLm8TCo
-V/mZlCLUBzn45secmhN3OhAoq4IiHH2XqAwc8xWKyRMCAwEAAaMaMBgwFgYDVR0R
-BA8wDYILY2FzLmN1bmkuY3owDQYJKoZIhvcNAQELBQADggEBALsTJzFgI0Nf+0l5
-FccXlhEbCxzHtHPmiETIus2hEKY0zuWsqm9mGOr/+30ng862mJ/kok4YZPGrJZue
-AgJo/dveZGCWetZv65XFDBl+gE2G/+TJplM41XEHSWJ15EhpCECxXhlBw0vRon+h
-6HBmGrLZzzy0F2+5dGqf6cZW8T6NToJRVWBxPTKs26bgER/Clj1EfkNubmU+u91F
-oErcj4bh09j1zv6Dt6c6N4Zdzsq6bg9sYRVRB4d80zhfw61qz0+Ln2Rp/k95aaOe
-czKNjg972Y385kSS8YEHXlVJbnuZHeqAnsq6v1L6b6FFQEkgFfoNPMLxpPzKFtRg
-qzjW2e0=
-                   </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas.cuni.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas.cuni.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">Univerzita Karlova v Praze</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Charles University in Prague</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">Univerzita Karlova v Praze</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Charles University in Prague</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cuni.cz/UKENG-1.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.cuni.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michal</md:GivenName>
-    <md:SurName>Vocu</md:SurName>
-    <md:EmailAddress>michal@cuni.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 3fdfdd61..00000000
--- a/swamid-interfederations-2.0/cas.cuni.cz.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:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cas.cuni.cz/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">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 f66627a6..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.educagri.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Educagri</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC40lEQVQoz1WSW0iTYRjHn2/f9+3bN3dwbvOYiq2lNcXDcoaKGXYhXUR0gKACEUolLyKwko6aIhjUUAMtLyrKQ1DRRSCkVFSY5LRWuulSt5aHZtvcoZ3fvV1YRr+r5+L584fn+REYY/iLyxt++cH2ZGRx0riGECY4oNos2leeXFmcKJMw6zvERmB6zn2h64thwV1WIE9NZCUi7ponvGjzj+rtEhHdeiqnOE8KAIAxxhhPGJxFx4ZPNo+/19vx/+hn1xo79KoDQ28nVzHGBMbY7Q2faNZlK0WN1dsiKNrV//XV+GoghBiaVG+XnDm+NVZI3xr8OjBkHWzfSUSjuPfp/NhnR88l9aozWHtNZzR7ACCGpX75IwCQKOXdubJDmSZouKlPT+Jz/EHkcIVqDm0mOUTLbYPR7BEL6LNVmfdbNE11qgQpb8UeaOqeiiB8+qjS5ghyeAyn7rCiUBVnWfK91q0CgFhIV5YkqhSiPUUJyXIeAEzPuycMzpR4Ni8zlhoYsg69W6k9pOByOQhhAPi27DvcMMpnKH8I/XQGAcAXQLMWjyY7TpMdR7X2GhDCYiF9sGITRRGhMGZ55JZUQQxLEQSwDElyCB5DlubLACAYRtT+3Smjn+xlBXK5hFlv2KWWaxvyNr7p8UWEfGp9fq93kMPPuhSpgpI8mSyWefTC6g+gYCiaoxQnyXgIYW2fqaPPZFhwl++IN5o9I2M2iktzIhHccEPfeT7/bFXWOa3e+sNX06LLTBe6vOFZiwcApGIuAGgfzBbnygiMsS+A6tsmJCLu1TrV6Cd7Z7/JvOQLR6IAkJ7M31uaVL0/4/rdmQ9TjodtRX9cmvvurW+bZBmy/siWbRkimyNgd4X4PDJZzi7/DPQ8njNZvN0X1SqF6J98liVf+z3jyJgtRynOVohpmkBRPLPgGZ92FqriLtdsV6YJ/rMVAELh6MeZtedvlnUGp9MVEsRQ+VmSCk18ca40hv1zqN9S3mkbXYQm/gAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo1OSswMjowMOaC4r8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NTkrMDI6MDCX31oDAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.educagri.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Agricultural education, they are training for all levels, a great place for student life and individualized support for learners excellent employability. It is provided within public and private institutions.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Educagri - Enseignement Agricole</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">L’enseignement agricole, ce sont des formations pour tout niveau, une grande place à la vie étudiante et un accompagnement individualisé des apprenants pour une excellente insertion professionnelle. Il est dispensé au sein d’établissements publics et privés.</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>
-					      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>
-    </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-POST" Location="https://cas.educagri.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas.educagri.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.educagri.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Educagri - Enseignement Agricole</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Educagri - Enseignement Agricole</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.educagri.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>khalid.farrahe@educagri.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 75ccd4dd..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cas.ent-etrs.net/idp/shibboleth">
-  <md: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>
-  </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 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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://cas.ent-etrs.net/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.ent-etrs.net/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole des Transmissions - Cesson Sévigné</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole des Transmissions - Cesson Sévigné</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Patrick JAOUEN</md:SurName>
-    <md:EmailAddress>patrick.jaouen@ent-etrs.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Dominique MULLER</md:SurName>
-    <md:EmailAddress>dominique.muller@ent-etrs.net</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 62041fa1..00000000
--- a/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-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://cas.st-cyr.terre.defense.gouv.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Ecoles de Saint- Cyr Coëtquidan</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.st-cyr.terre-net.defense.gouv.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Ecoles de Saint- Cyr Coëtquidan</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>
-					      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>
-    </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-POST" Location="https://cas.st-cyr.terre.defense.gouv.fr/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas.st-cyr.terre.defense.gouv.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecoles de Saint- Cyr Coëtquidan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecoles de Saint- Cyr Coëtquidan</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.st-cyr.terre-net.defense.gouv.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Patrick Jaouen</md:SurName>
-    <md:EmailAddress>patrick.jaouen@st-cyr.terre-net.defense.gouv.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Franck Le Calloch</md:SurName>
-    <md:EmailAddress>franck.lecalloch@st-cyr.terre-net.defense.gouv.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cast.itunes.uni-muenchen.de.xml b/swamid-interfederations-2.0/cast.itunes.uni-muenchen.de.xml
deleted file mode 100644
index fb604cd5..00000000
--- a/swamid-interfederations-2.0/cast.itunes.uni-muenchen.de.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://cast.itunes.uni-muenchen.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>cast.itunes.uni-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cast.itunes.uni-muenchen.de,OU=Referat VIII.3,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFhDCCBGygAwIBAgIHEm356fe7iTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNV
-BAoTKEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzAN
-BgNVBAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMTA4
-MTkxNTA4MTBaFw0xMzA4MTkwMDAwMDBaMIGjMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1h
-eGltaWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEXMBUGA1UECxMOUmVmZXJh
-dCBWSUlJLjMxJDAiBgNVBAMTG2Nhc3QuaXR1bmVzLnVuaS1tdWVuY2hlbi5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANkKKI+QjsVnkBkAC+Khql9V
-Xdf5iLhYVCTLT8ICuRLrWOg9eUkXKbp/7SIzkzNEfxB5dkjq8wtXNPKBfqfc7eWP
-5utGfvAbdvJlw8Hru9DV5nyDxSmCeq1yksie3tkDNgAdvgs/YftQT0i4cySpzahF
-8yO5tgdC6qVYhtzfIMD7w4Z6SQH8QxOZuVyeM2eohN7+6rOOhViMOgPWqnQ81Wuc
-OsJcoSyDxBYMZQG7ixglZ2kc//D/X8gtXQv7AlviSeCA4B4gBlVO6/Ta+XB97JVw
-8iYykLnrUWEdHXkGk15hU9v7BmFdtTzFVZ9m4IcL3Y/y0kc7t7ex1LowfTYF9/8C
-AwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUaolcaSN6Mu5zvVM+zofMH3fi
-f9YwHwYDVR0jBBgwFoAUeYd4ai/6m7wjT5Smo3cdHg6UgA8wGgYDVR0RBBMwEYEP
-YS5ydWJuZXJAbG11LmRlMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD6g
-PKA6hjhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCBpAYIKwYBBQUHAQEEgZcwgZQwSAYIKwYBBQUHMAKGPGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB19U7nhkGWOsZ4wiw21O9zVyuSaF9BUqynXtshhiXlGju8qx4EESSJ
-ayMWVLd/+T4+vUe8VbZ50y1rQ/zttR9FDFsXVgCuvgpx2CS2XCVvkOmvGl1M/PJ3
-vbMO/rdncLMBLpDANofUBPq9TpSC72xHKyuB1ii+dkjExIC/mzlclVLf2LggbHYj
-qgGaXbtqtNrtxwlqzdeYDeyTJawayF+1Bjvx1tnYjG92Tq7E25v84v49XE4vmHsn
-DUbb5s+ffOJfHDzKm875lEOVubzCW4Pi0dOstdK8EL//RGPjEJOzaJMZJ3JQEMQU
-Pvw71CodYST2ZIkQ7RBGrfzLIg1m3C1h
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>cast.itunes.uni-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cast.itunes.uni-muenchen.de,OU=Referat VIII.3,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFhDCCBGygAwIBAgIHEm356fe7iTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNV
-BAoTKEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzAN
-BgNVBAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMTA4
-MTkxNTA4MTBaFw0xMzA4MTkwMDAwMDBaMIGjMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1h
-eGltaWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEXMBUGA1UECxMOUmVmZXJh
-dCBWSUlJLjMxJDAiBgNVBAMTG2Nhc3QuaXR1bmVzLnVuaS1tdWVuY2hlbi5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANkKKI+QjsVnkBkAC+Khql9V
-Xdf5iLhYVCTLT8ICuRLrWOg9eUkXKbp/7SIzkzNEfxB5dkjq8wtXNPKBfqfc7eWP
-5utGfvAbdvJlw8Hru9DV5nyDxSmCeq1yksie3tkDNgAdvgs/YftQT0i4cySpzahF
-8yO5tgdC6qVYhtzfIMD7w4Z6SQH8QxOZuVyeM2eohN7+6rOOhViMOgPWqnQ81Wuc
-OsJcoSyDxBYMZQG7ixglZ2kc//D/X8gtXQv7AlviSeCA4B4gBlVO6/Ta+XB97JVw
-8iYykLnrUWEdHXkGk15hU9v7BmFdtTzFVZ9m4IcL3Y/y0kc7t7ex1LowfTYF9/8C
-AwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUaolcaSN6Mu5zvVM+zofMH3fi
-f9YwHwYDVR0jBBgwFoAUeYd4ai/6m7wjT5Smo3cdHg6UgA8wGgYDVR0RBBMwEYEP
-YS5ydWJuZXJAbG11LmRlMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD6g
-PKA6hjhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hlbi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCBpAYIKwYBBQUHAQEEgZcwgZQwSAYIKwYBBQUHMAKGPGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB19U7nhkGWOsZ4wiw21O9zVyuSaF9BUqynXtshhiXlGju8qx4EESSJ
-ayMWVLd/+T4+vUe8VbZ50y1rQ/zttR9FDFsXVgCuvgpx2CS2XCVvkOmvGl1M/PJ3
-vbMO/rdncLMBLpDANofUBPq9TpSC72xHKyuB1ii+dkjExIC/mzlclVLf2LggbHYj
-qgGaXbtqtNrtxwlqzdeYDeyTJawayF+1Bjvx1tnYjG92Tq7E25v84v49XE4vmHsn
-DUbb5s+ffOJfHDzKm875lEOVubzCW4Pi0dOstdK8EL//RGPjEJOzaJMZJ3JQEMQU
-Pvw71CodYST2ZIkQ7RBGrfzLIg1m3C1h
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cast.itunes.uni-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cast.itunes.lmu.de/Shibboleth.sso/SAML2/POST" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">LMUcast für iTunesU</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">LMUcast für iTunesU</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://cast.itunes.uni-muenchen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Armin</GivenName>
-    <SurName>Rubner</SurName>
-    <EmailAddress>a.rubner@lmu.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Fabio</GivenName>
-    <SurName>Vena</SurName>
-    <EmailAddress>fabio.vena@vilea.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml b/swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.xml
deleted file mode 100644
index b506d3e7..00000000
--- a/swamid-interfederations-2.0/catalogue.clouds.geant.net-saml2-entityid.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://catalogue.clouds.geant.net/saml2/entityid">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">GEANT Cloud Catalogue</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GEANT Cloud Catalogue</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://catalogue.clouds.geant.net</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://catalogue.clouds.geant.net/#/privacy-statement</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>MIIC0DCCAbgCCQDB0aTWTlFZxzANBgkqhkiG9w0BAQUFADAqMSgwJgYDVQQDEx9zaWduLmNhdGFsb2d1ZS5jbG91ZHMuZ2VhbnQubmV0MB4XDTE0MTEwMzE0MjAzMVoXDTI0MTAzMTE0MjAzMVowKjEoMCYGA1UEAxMfc2lnbi5jYXRhbG9ndWUuY2xvdWRzLmdlYW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKT7WaFyHvVFWTOPINs787dJlC2BzgyX+v2xlrj0aRX3lxGPLlTvnfDR3ZNmDMSBgbLpDjfStMDQnFzWN3NcIDllcLFM4CMKTy2vK0BNjd/8ljEfwaB4UpZT2ezD8AWSasWk8GA3YrN6IlYq/9IILq3b2TVLh21tALtR5oVhoL8a5T+GTaO9TXHXl8Xs6FDzESUPfuaWwQp9rPfsJ8zuZ8wSOe1c+OaTsaeYq9m4PHyXjECMhK64x7LRHZJg70QLnpn+LcyTPuAxO1dkd1Ky4FQYPz+naT5dFFSCpMlLSYg2n0ruwkr37aACm39IIf+wUcPAUTkX8n34TIt7u8gUPD0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlI74JrABdU6Xn8Ygha92ppx7rGhPVrwJbVBWB+8b2lUcp5UWmKJPox+3AeZwDUabZsMmWye9o2jr1T/ejjiBXwJ3jRaxQFF5RE+6F2A/rE3oZaExHmY3uTJzJttBJTdK0TQ0AvH6TKtbHjYFMa0FuxauvCKg6GfsENjGWWp6YctA+1qNb830y+Ns/nn18K7GEEQp6pKo3rKyiCJPBOVPxBZpgf/wmoAIT2h1+Lzec/XpSRpqAmAu+xzE+aCJn7EW5cP1tGNfCx1GPUAFJtcP+9/zeYdIWbb0A5w/4M4gv+iWAuYSb80Ebu36TMSi+ub7dn3VyaQhH/xqtcIX0AQQaQ==</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>MIIC1jCCAb4CCQDggajQVqh3jjANBgkqhkiG9w0BAQUFADAtMSswKQYDVQQDEyJlbmNyeXB0LmNhdGFsb2d1ZS5jbG91ZHMuZ2VhbnQubmV0MB4XDTE0MTEwMzE0MTkxN1oXDTI0MTAzMTE0MTkxN1owLTErMCkGA1UEAxMiZW5jcnlwdC5jYXRhbG9ndWUuY2xvdWRzLmdlYW50Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO2Og7LfuT7iiqbEEBFIafyyEXt4unuB8qyRWvHmGyxEf2FWGkmpRX7Uy3As/M4sOiAju5B8iJzP+OAgS1BSLlu1Lft9MLRIL6W3llYFkqQaz6Y8JtkGKRmbn1CcMH1mpZf20vJbskEBLUAlzg11dYZuAkBFzPLUDZcSe6aopEWBB7RhuSUoWv8heEU8w8sHSQpwgGDIpLGJPAHMSdtEqKkXQxobOa965srjA21l1yAkEXrLXgvjWaCCbf0dUIV6axv0z54MakgUCKGnRokAXiDdhWnkaD8bdmmUIkMLLtTYHQtmU2TrmFodp5naroznUSiQmCDl3tA8cbwiU6w44yMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAot9VEUqJErGgoCza+4hngU7KwrY3sNMaEgNuCQJ0nxv5ukuWYW6Ksoor9n6ck1pZWMFV/orl/oiJFFsl7ADUMGZO7Q+r+u9RrCLqnJwYULDb2IVKpcuxpdo2F6kM7Udk+1LcTQg9WMJSawCM8+tsxe2sEfZWDf+bBvP2EwmyHNGAsfZ5aLYlIQS++r0o2y4EB/UzRT4xxK/LSskfPd2VfI+3JDf3ZNpsvh+B90fkIXAw1d+ivs7yeG36ZQqkWL1/oEdEjVI77tNg7cSobT9IgqoLy4Hqtkm2PA5I3HtKrAZcMzagAChNBJqK2uTy7RV6bGV1MOsvsmztaqkkDDTlZA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>
-                urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-            </md:NameIDFormat>
-    <md:AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalogue.clouds.geant.net/api/login/saml/callback"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="en">GEANT Cloud Catalogue</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">GEANT Cloud Catalogue</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="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="false"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="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="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GÉANT Association</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GÉANT Association</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.geant.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>geant-cloud-catalogue@grnet.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>geant-cloud-catalogue@grnet.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cavle.org-shibboleth.xml b/swamid-interfederations-2.0/cavle.org-shibboleth.xml
deleted file mode 100644
index da1f580e..00000000
--- a/swamid-interfederations-2.0/cavle.org-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://cavle.org/shibboleth">
-  <!--
-		This is a "CAVLE" .NET IdP for UniServity Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-08T08:32:16Z">
-      <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">cavle.org</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFjCCAf6gAwIBAgIQGVM0uhTD3rVCMPoy0rMlwzANBgkqhkiG9w0BAQsFADAd
-						MRswGQYDVQQDExJpZHAudW5pc2Vydml0eS5jb20wHhcNMTQxMDA3MTMyNTQ3WhcN
-						MzUxMjMwMjMwMDAwWjAdMRswGQYDVQQDExJpZHAudW5pc2Vydml0eS5jb20wggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRCBuPl18hR/OOGblHjWWTo9LR
-						c3BZ9sTsDw2oLTV7QZiPuzFkmaelEFjnkWUsbjKQcjaidaA/UxP0YGaTypRUJDyM
-						A83zRfCrqGOFE8qvjesl0VNJrhw+8pxxKnxnOsnzqLT2rMid4cGuTLtNK0BnCXaU
-						9tQ6ggrZEEZUtZsQ4GUhapc/FiX9SV2OGeVlUfeDPCCeegVxWnTjoW6NirXRHw7e
-						B8CZmculcAm549Di1chMRmy1W1TPPUS16hZI65fU8ra5anxtEjPrPm/42VI3b7EC
-						n9HKTZL90O38/iUu1CGZBvSd8BHsFpta9IuEcAPzwb5oggRe0jOqYfVVM0svAgMB
-						AAGjUjBQME4GA1UdAQRHMEWAEARX+D7bRC1NV+4PE+pA07ehHzAdMRswGQYDVQQD
-						ExJpZHAudW5pc2Vydml0eS5jb22CEBlTNLoUw961QjD6MtKzJcMwDQYJKoZIhvcN
-						AQELBQADggEBACLhDJtzDh6aqM/ZBf8nGEyVYEbav54Hnw+tHMdpRfgQXRT4UEed
-						zkG9b8TCFnbWuGkkdfT5GesY3P+KjJQ05AkvtVcgq6CTencq5a9mcocXeFhmO45a
-						/6w8VV+iNrMov2gxsOdTx6cbU0pP5UUxYRNCzMc20CoOb1YENt6LMxXn0zlM2uR+
-						5/xuR9hxY8TbZgoQzIU6ZSmfRND2VufgaL3ndxQgyd86qmIkkPfL1yOgPglINkrI
-						WArFmTaBqIHzgsuZgaqJNsEiLP8KgnKvtQoq7YyLXKGEjQGSlvEB3CY67XMAMleR
-						W/SZFaCEqoPVCkUSY5QwNt5efTT4YWfcwis=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniservity.com:8443/shib/profile/saml1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniservity.com:8443/shib/profile/saml2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniservity.com/shib/profile/saml2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniservity.com/shib/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:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniservity.com/shib/profile/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniservity.com/shib/profile/saml2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniservity.com/shib/profile/saml2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniservity.com/shib/profile/saml2/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">cavle.org</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFjCCAf6gAwIBAgIQGVM0uhTD3rVCMPoy0rMlwzANBgkqhkiG9w0BAQsFADAd
-						MRswGQYDVQQDExJpZHAudW5pc2Vydml0eS5jb20wHhcNMTQxMDA3MTMyNTQ3WhcN
-						MzUxMjMwMjMwMDAwWjAdMRswGQYDVQQDExJpZHAudW5pc2Vydml0eS5jb20wggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRCBuPl18hR/OOGblHjWWTo9LR
-						c3BZ9sTsDw2oLTV7QZiPuzFkmaelEFjnkWUsbjKQcjaidaA/UxP0YGaTypRUJDyM
-						A83zRfCrqGOFE8qvjesl0VNJrhw+8pxxKnxnOsnzqLT2rMid4cGuTLtNK0BnCXaU
-						9tQ6ggrZEEZUtZsQ4GUhapc/FiX9SV2OGeVlUfeDPCCeegVxWnTjoW6NirXRHw7e
-						B8CZmculcAm549Di1chMRmy1W1TPPUS16hZI65fU8ra5anxtEjPrPm/42VI3b7EC
-						n9HKTZL90O38/iUu1CGZBvSd8BHsFpta9IuEcAPzwb5oggRe0jOqYfVVM0svAgMB
-						AAGjUjBQME4GA1UdAQRHMEWAEARX+D7bRC1NV+4PE+pA07ehHzAdMRswGQYDVQQD
-						ExJpZHAudW5pc2Vydml0eS5jb22CEBlTNLoUw961QjD6MtKzJcMwDQYJKoZIhvcN
-						AQELBQADggEBACLhDJtzDh6aqM/ZBf8nGEyVYEbav54Hnw+tHMdpRfgQXRT4UEed
-						zkG9b8TCFnbWuGkkdfT5GesY3P+KjJQ05AkvtVcgq6CTencq5a9mcocXeFhmO45a
-						/6w8VV+iNrMov2gxsOdTx6cbU0pP5UUxYRNCzMc20CoOb1YENt6LMxXn0zlM2uR+
-						5/xuR9hxY8TbZgoQzIU6ZSmfRND2VufgaL3ndxQgyd86qmIkkPfL1yOgPglINkrI
-						WArFmTaBqIHzgsuZgaqJNsEiLP8KgnKvtQoq7YyLXKGEjQGSlvEB3CY67XMAMleR
-						W/SZFaCEqoPVCkUSY5QwNt5efTT4YWfcwis=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniservity.com:8443/shib/profile/saml1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniservity.com:8443/shib/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">UniServity Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UniServity: CAVLE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://uniservity.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:support@uniservity.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rezar</GivenName>
-    <SurName>Zefaj</SurName>
-    <EmailAddress>mailto:rezar.zefaj@UniServity.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Brian</GivenName>
-    <SurName>Fraser</SurName>
-    <EmailAddress>mailto:brian.fraser@uniservity.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml
deleted file mode 100644
index 93c87541..00000000
--- a/swamid-interfederations-2.0/ccidfederation.clusius.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://ccidfederation.clusius.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-23T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Clusius College</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Clusius College</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Clusius College</mdui:Description>
-        <mdui:Description xml:lang="en">Clusius College</mdui:Description>
-        <mdui:Logo height="160" width="200">https://static.surfconext.nl/logos/idp/clusius_college.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Clusius College MBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Clusius College MBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/df9b663261436f0d31a332a5e17161b1"/>
-  </md:IDPSSODescriptor>
-  <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/ccm.copac.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ccm.copac.jisc.ac.uk-shibboleth.xml
deleted file mode 100644
index ad778417..00000000
--- a/swamid-interfederations-2.0/ccm.copac.jisc.ac.uk-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://ccm.copac.jisc.ac.uk/shibboleth">
-  <!--
-		This is a "Copac Collection Management" Shibboleth SP for Jisc.
-	-->
-  <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="2015-11-30T15:08: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ccm.copac.jisc.ac.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://ccm.copac.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID/zCCAuegAwIBAgIJAIacduR/myAPMA0GCSqGSIb3DQEBBQUAMHUxCzAJBgNV
-						BAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVy
-						MQ0wCwYDVQQKEwRKaXNjMQ4wDAYDVQQLEwVNaW1hczEdMBsGA1UEAxMUY2NtLmNv
-						cGFjLmppc2MuYWMudWswHhcNMTUxMDA2MDkyODE3WhcNMjUxMDAzMDkyODE3WjB1
-						MQswCQYDVQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFu
-						Y2hlc3RlcjENMAsGA1UEChMESmlzYzEOMAwGA1UECxMFTWltYXMxHTAbBgNVBAMT
-						FGNjbS5jb3BhYy5qaXNjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEApIKiUbQ1UcbvNo+b6XCsSe9s3WiZ9heGvdvFrQHn0U/YsR1k1oMd+2tX
-						N9vEse6KYOs6M9ecw/U6e98xkWaFQnhLogxlwmsQNllnN1h3SM9Tk7KBQzUdeqQ2
-						iGSeX1gjd11HSaevSLzt9NstipOvWh9Ur/bPbLtjQJVLbwhCgCSqjBHY9oPgfich
-						bvfOp9Ahp0ckszpQC8osM5Q+gdsyxtlGmYsqm9eHiKXCWo3/2BnDmqxfWrVBLcyf
-						8EEC4qN+FSQJl/qo1EHYGsvpxbXdvo7w7AZNV0AacmRT3Hs5Oosgpdj3SDSxBi7Q
-						9vXc8u5pMUuCoFaFq+pV5aJrkZ515wIDAQABo4GRMIGOMAkGA1UdEwQCMAAwCwYD
-						VR0PBAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHREE
-						GDAWghRjY20uY29wYWMuamlzYy5hYy51azA0BgNVHRIELTArgSltaW1hcy1zaGli
-						LXRlY2hAbGlzdHNlcnYubWFuY2hlc3Rlci5hYy51azANBgkqhkiG9w0BAQUFAAOC
-						AQEAdiuss1LqfQjW3b+p1udno7kpGrNMy7njdR6+kzAZhLMZosnXzC40myLD8QIO
-						toESjy3njFKjn39koYfWKPOcUPlHhOMDXZ/l1uyeyjYpNjGNyYSE/noHEh+Dq8La
-						Ev1APgkhr2szIY0n0j9TdaFZAOIsaOsZvWsnK3n3zr7LbduLPUR46Kq6kC3c7nQX
-						n1Ig511IcUV8B/hysTz2xC1SQOYIz+jexv3/2jy/MaPdgenuoB86eFZzquKe5kJx
-						ofe54k1GZFVi8fyZYgs7M4qoMOhaUtjnTQoSnonVnL7rRNERcIB40oCdaoSEENoF
-						6hbD0ku+eQC/qqz1h3WEtOymjg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://ccm.copac.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ccm.copac.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Jisc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Copac Collection Management</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://jisc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Copac Helpdesk</GivenName>
-    <EmailAddress>mailto:help.copac@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/census.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/census.mimas.ac.uk-shibboleth.xml
deleted file mode 100644
index 892363c2..00000000
--- a/swamid-interfederations-2.0/census.mimas.ac.uk-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://census.mimas.ac.uk/shibboleth">
-  <!--
-		This is a "MIMAS: Census Datasets including SARs and CIDER" Shibboleth SP for The University of Manchester.
-	-->
-  <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="2008-07-01T11:00: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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Census Dissemination Unit</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Online access to aggregate data from the 1971, 1981, 1991 and 2001 UK Census of Population.</mdui:Description>
-        <mdui:Logo height="75" width="200">https://census.mimas.ac.uk/cdu_new.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEKzCCAxOgAwIBAgIJAMTX7HKZbFDFMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
-						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
-						CxMFTWltYXMxGzAZBgNVBAMTEmNlbnN1cy5taW1hcy5hYy51azAeFw0xMzA1MzAx
-						NTI3MzBaFw0yMzA1MjgxNTI3MzBaMIGLMQswCQYDVQQGEwJHQjETMBEGA1UECBMK
-						TWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3RlcjElMCMGA1UEChMcVGhlIFVu
-						aXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UECxMFTWltYXMxGzAZBgNVBAMT
-						EmNlbnN1cy5taW1hcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBALfJujuG3l2vwtdzi3/ZIcAKfFwC5RKAHLHLBUejvFA/nkt7OnOonu0x689R
-						IEBd877zeYd0ZH3GAMBVX7zJiQ11jdLYHUEVi8d/8Hx3dZ2nXXFdPzJL2OIJzHc2
-						aQQgdWmRrTge6r10NcVOAAJ5mIIHK7PPifDwVMMN1GuF4OBA3aojaMP0Dj+DO1gr
-						FCZtGi3VE17cxKTZdmuiRsFYGifIBvkSdmopv3+ibW6fukO564pRxHAywRqhZd2E
-						pMGx3G7pbXNIZYB6Xje5DGp/qOB0SOdC6kSJjdeaWsyYfSQOAdyVZm91ZFD8qmES
-						Z5aL66VIprPYDGjYx6tZ+eHsGfsCAwEAAaOBjzCBjDAJBgNVHRMEAjAAMAsGA1Ud
-						DwQEAwIEsDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0RBBYw
-						FIISY2Vuc3VzLm1pbWFzLmFjLnVrMDQGA1UdEgQtMCuBKW1pbWFzLXNoaWItdGVj
-						aEBsaXN0c2Vydi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQAl
-						pfv7zAn13s6WPzfCqNEBqsr9h8Vg79uNxsLfql484q/7CSkTcpe7pTVa1TlOqXbK
-						0emzlq6YDyESAw+jtlfFz0Rd1CUU9YrpS3dMXlx+7gbicJKi3H5dOpvMz1mxqni7
-						qERoTHr+xMHTNsnuIe/h7osNo7sJJhMrLhgmywVeSNbEg4Y5pudwDMBegts7Vwa1
-						CMLitQ8xllB/hq7QUaZNDgv4SVuWLaJENE4jmE6/Q3UVz82ocs0IlQT2+8eKcA8N
-						O+QI2PQgwQ5bUHCPKsZz/04ZwAGER/CGgN+2gRPSigWmcU/uFgp63mZ8Q1a3qA6m
-						2j+Cllx9NsHLxRQvuS3t
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://census.mimas.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://census.mimas.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://census.mimas.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://census.mimas.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://census.mimas.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://census.mimas.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://census.mimas.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://census.mimas.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://census.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://census.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://census.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://census.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://census.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://census.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MIMAS: Census Datasets including SARs and CIDER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://cdu.mimas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>CDU Census Helpdesk</GivenName>
-    <EmailAddress>mailto:census@mimas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</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 eab3055b..00000000
--- a/swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.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://cerbere2.mines-douai.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Mines Douai</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABw0lEQVQoz41Sy27TQBS9Mx7P4HgS27FdUAsS6mOJWFSqKipV8AEs+A8+DLFlyQ+wQYAEqhBShJqqoKTu2GMn9vg1LBxMQiTE2c4599y55yCtNWyi1RoANAACAACEUP+EAMg2G68xtoHWHbqpn2Vyo8rrIj8d+6IsCUYhY60GivEOY38EHfvVdGpi1Gp48+N62TRzpZ6GoU/psec98QMEgPtNEMB7IWaqOA9Cj5ov9vbOg+CQ829Z9izcOfODjrn6QwuAAS5Seex5IWNnfpDWdbjL3kXRhZSPHKdqWxPjlUD/NvqaZpZhfIzjFrRr0oDSuVIepQDQX4J0q8u6fn11NVlkb2c/HzvuEef7NldN8ymJXx4crguQ1jquqg+xkFV9U5VfksRlbLJcPL97rwQ4cd2Dgd1nshLkTUMQ0gjF2YJibDbNNE2tIWeFohhbQ24x1p+eAIBlGF1eKpHTeXQrpUXIHUbTvPD9sVeoB/d3tdZd5KscOtNlnguRNG079py6bpQqCTFM0xwN+YZDVxKt9cCyJt8vo0gIMRoO+a2IHWd0tP+wHw99cD24bdv2QJXVbB7FiSSG8a8u/Q/+buu2Hm2W9xcr2NmJucLYrQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OToyOSswMjowMAOFgJgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MjkrMDI6MDBy2DgkAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.mines-douai.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Mines Douai</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>
-					      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>
-    </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-POST" Location="https://cerbere2.mines-douai.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cerbere2.mines-douai.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cerbere2.mines-douai.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Mines Douai</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Mines Douai</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mines-douai.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>net.supervision@mines-douai.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cerealchemistry.aaccnet.org-shibboleth.xml b/swamid-interfederations-2.0/cerealchemistry.aaccnet.org-shibboleth.xml
deleted file mode 100644
index f13f48bc..00000000
--- a/swamid-interfederations-2.0/cerealchemistry.aaccnet.org-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://cerealchemistry.aaccnet.org/shibboleth">
-  <!--
-		This is an OpenSAML "AACCI Grain Science Online Library" SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-10T10:52:28Z">
-      <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">AACCI Grain Science Online Library</mdui:DisplayName>
-        <mdui:Description xml:lang="en">AACCI Grain Science Online Library is a large, customizable collection of grain science resources.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://cerealchemistry.aaccnet.org/page/about_library</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIJAOPdBcTdt8SCMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2NlcmVhbGNoZW1pc3RyeS5hYWNjbmV0Lm9yZzAeFw0xNDAzMTQwNTAzMTNa
-						Fw0xNzAzMTMwNTAzMTNaMCYxJDAiBgNVBAMTG2NlcmVhbGNoZW1pc3RyeS5hYWNj
-						bmV0Lm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOfS4gn3WScE
-						YsIzNB26nqXjCcCg+lq+vMJE6zrJLiyxKDsHDJ7eE1QNDHzGj45NVSiEG/h3qWC+
-						anvXuMrkRq53OWy3QCdtYPYDeN4kuMZktGkJKllvYF14rKn82xvg9yUB5XoiIOoj
-						+JtFqr1FD/udHow2uXwNHVkU2rCjYkAcDdlIp504ZjqDBZgzTcFP3PyJae2WQWzf
-						0sHRRbBQJxL2I/gzhBwvyuVhjk3akNkWna83rhDJnP8HdZW+7YBrBbjoGQ3QvNWL
-						PbFHHtFF4ACLpCLg5/b9nDyehDIYuVic2LGbAGvwD0reX7dkJG+DDagvEnKm5jC2
-						rmrgoEvhy2UCAwEAAaN5MHcwVgYDVR0RBE8wTYIbY2VyZWFsY2hlbWlzdHJ5LmFh
-						Y2NuZXQub3Jnhi5odHRwczovL2NlcmVhbGNoZW1pc3RyeS5hYWNjbmV0Lm9yZy9z
-						aGliYm9sZXRoMB0GA1UdDgQWBBTxd3A8HN1LUDntyh4JNI44mwmQ8jANBgkqhkiG
-						9w0BAQUFAAOCAQEAuKmFpPiWz6WAjz2cvsvRsDV6ulDfEU4owYYoqZEa8bAgz5Am
-						MAXMM/Mocoi7c2ZirXtGNPQ5lpW1nr/q7ON1eqsMcoCL/W+jjvm/DXs43K4syLY8
-						nnnEYommJabZZtEZGCJOEGNElGm+z27pzBv9bfz0hO12mK/2okBzrrwlkirOyT1A
-						E2oojb5Ybl/9JA1GpIHzAJMHJKwlQEYiCP8QxdlrKN+mcRUjnDXDtmP4Xnr7jxLf
-						CTx3mMByMIAvKJ9GKCQSPaFgL+kKGge8dj/vCzfEF38LNrUNZ72jDc/ttsuIKUXy
-						V17me3Pv3lJyZ4+Xbfrb4DVIDEueohFg6yhk5w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cerealchemistry.aaccnet.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cerealchemistry.aaccnet.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cerealchemistry.aaccnet.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">AACCI Grain Science Online Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aaccnet.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>SSO-Support</GivenName>
-    <SurName>SSO-Support</SurName>
-    <EmailAddress>mailto:SSO-Support@atypon.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SSO-Tech</GivenName>
-    <SurName>SSO-Tech</SurName>
-    <EmailAddress>mailto:SSO-Tech@atypon.com</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 a12416cf..00000000
--- a/swamid-interfederations-2.0/cern.ch-login.xml
+++ /dev/null
@@ -1,195 +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://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">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-    <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>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>cern.ch</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>others</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor errorURL="http://cern.ch/serviceportal" 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">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,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.cern.ch</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cern.ch/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cern.ch/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://login.cern.ch/adfs/ls/" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.cern.ch/adfs/ls/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">CERN Service Provider Proxy</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">CERN Service Provider Proxy</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="swissEduPersonHomeOrganization" Name="urn:oid:2.16.756.1.2.5.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md: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"/>
-      <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="swissEduPersonUniqueID" Name="urn:oid:2.16.756.1.2.5.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn: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="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="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cern.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.cern.ch</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cern.ch/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cern.ch/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cern.ch/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cern.ch/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">cern.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CERN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cern.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>CERN</md:GivenName>
-    <md:SurName>Service Desk</md:SurName>
-    <md:EmailAddress>mailto:service-desk@cern.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>CERN</md:GivenName>
-    <md:SurName>Service Desk</md:SurName>
-    <md:EmailAddress>mailto:service-desk@cern.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/certify.skidmore.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/certify.skidmore.edu-idp-shibboleth.xml
deleted file mode 100644
index 90ba7317..00000000
--- a/swamid-interfederations-2.0/certify.skidmore.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://certify.skidmore.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">skidmore.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Skidmore College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Creative Thought Matters</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>
-MIIDPDCCAiSgAwIBAgIVAPIx9cT4q8AyR4ueZ8uIqpunypyjMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGNlcnRpZnkuc2tpZG1vcmUuZWR1MB4XDTEyMDQyNTE4
-MDc1M1oXDTMyMDQyNTE4MDc1M1owHzEdMBsGA1UEAxMUY2VydGlmeS5za2lkbW9y
-ZS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgQIzapjdutN/r
-2SVjlA0XDyQQ4Py3VUdFTxCm0s+aieDUnyY5H55z7q6a6SbGeC6r0voThzAp8fGv
-64XVxQaWFN/gv+7GnSHfORcSlpenXfVsPPW/BA/x2IKg2c/BfeRjmU8W7AZMgUcI
-nVj8sFzyF8OtglcQe/+V9TjvSdmOEIWG5mt0Up9oeOmHbe9eYvq+LPORGamQUHj0
-iJIlJfiAMEm+bCuET4SbO1IUuv65oR77YuZcSWlVaP4NRbrqopO8ULiYkOMIEaZ2
-Pbx+dhKgQJijFfbDFFzlFizV9AY7wt0nGMcGheFVUch7D/l12h4fHBTAGAcPYj3H
-T+AsiQq1AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGNlcnRpZnkuc2tpZG1vcmUuZWR1
-hitodHRwczovL2NlcnRpZnkuc2tpZG1vcmUuZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQNIBXsa4ErtKvaykTt91WpA/q8xzANBgkqhkiG9w0BAQUFAAOCAQEA
-kwApou7fsK8oUx7AJC2t1JzqkbJaOpaUG/UdUPvOzBplnqqugy17Ug7HSy2/trKE
-mL7bPPuRi6p42sBGJwPCm3hC2gFfXmFWmMYTtO53zJNktXmfaTBtVZKHlpUVsXtG
-0uzPK5BoH9lpGwscn7JDMtC2qsF6HIZtRIPrPOnux/JznM8WyBaaE9HoSqzluRkk
-HOEet5gtgNt//cgfVwFISX0I3Uh/Wk9nHadr/pu9L2rz2Gkb+2LxBC5iKOtL5oW/
-q7QweOtDE18IwI4JCw4nsvU2YFZw9ooyK9f3w+tj6rV56cN22EpefXNOM4pZRP7D
-bGUHwACZ7MErl4ABbfZpVQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://certify.skidmore.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://certify.skidmore.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://certify.skidmore.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://certify.skidmore.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://certify.skidmore.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skidmore.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAPIx9cT4q8AyR4ueZ8uIqpunypyjMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGNlcnRpZnkuc2tpZG1vcmUuZWR1MB4XDTEyMDQyNTE4
-MDc1M1oXDTMyMDQyNTE4MDc1M1owHzEdMBsGA1UEAxMUY2VydGlmeS5za2lkbW9y
-ZS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgQIzapjdutN/r
-2SVjlA0XDyQQ4Py3VUdFTxCm0s+aieDUnyY5H55z7q6a6SbGeC6r0voThzAp8fGv
-64XVxQaWFN/gv+7GnSHfORcSlpenXfVsPPW/BA/x2IKg2c/BfeRjmU8W7AZMgUcI
-nVj8sFzyF8OtglcQe/+V9TjvSdmOEIWG5mt0Up9oeOmHbe9eYvq+LPORGamQUHj0
-iJIlJfiAMEm+bCuET4SbO1IUuv65oR77YuZcSWlVaP4NRbrqopO8ULiYkOMIEaZ2
-Pbx+dhKgQJijFfbDFFzlFizV9AY7wt0nGMcGheFVUch7D/l12h4fHBTAGAcPYj3H
-T+AsiQq1AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGNlcnRpZnkuc2tpZG1vcmUuZWR1
-hitodHRwczovL2NlcnRpZnkuc2tpZG1vcmUuZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQNIBXsa4ErtKvaykTt91WpA/q8xzANBgkqhkiG9w0BAQUFAAOCAQEA
-kwApou7fsK8oUx7AJC2t1JzqkbJaOpaUG/UdUPvOzBplnqqugy17Ug7HSy2/trKE
-mL7bPPuRi6p42sBGJwPCm3hC2gFfXmFWmMYTtO53zJNktXmfaTBtVZKHlpUVsXtG
-0uzPK5BoH9lpGwscn7JDMtC2qsF6HIZtRIPrPOnux/JznM8WyBaaE9HoSqzluRkk
-HOEet5gtgNt//cgfVwFISX0I3Uh/Wk9nHadr/pu9L2rz2Gkb+2LxBC5iKOtL5oW/
-q7QweOtDE18IwI4JCw4nsvU2YFZw9ooyK9f3w+tj6rV56cN22EpefXNOM4pZRP7D
-bGUHwACZ7MErl4ABbfZpVQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://certify.skidmore.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Skidmore College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Skidmore College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.skidmore.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Adam Michael Jones</md:GivenName>
-    <md:EmailAddress>amjones@skidmore.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Cliff Williams</md:GivenName>
-    <md:EmailAddress>cwilliam@skidmore.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jeffrey A. Clark</md:GivenName>
-    <md:EmailAddress>jclark@skidmore.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cgticafe.fiocruz.br-idp-shibboleth.xml b/swamid-interfederations-2.0/cgticafe.fiocruz.br-idp-shibboleth.xml
deleted file mode 100644
index 12c54ead..00000000
--- a/swamid-interfederations-2.0/cgticafe.fiocruz.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,113 +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://cgticafe.fiocruz.br/idp/shibboleth">
-  <md: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>
-  </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">fiocruz.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FIOCRUZ - FUNDACAO OSWALDO CRUZ</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">FIOCRUZ - FUNDACAO OSWALDO CRUZ</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FIOCRUZ - FUNDACAO OSWALDO CRUZ</mdui:Description>
-        <mdui:Description xml:lang="pt-br">FIOCRUZ - FUNDACAO OSWALDO CRUZ</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://portal.fiocruz.br/pt-br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://portal.fiocruz.br/pt-br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID7DCCAtQCAQAwDQYJKoZIhvcNAQEFBQAwgbsxKDAmBgNVBAoTH0ZJT0NSVVog
-LSBGVU5EQUNBTyBPU1dBTERPIENSVVoxDTALBgNVBAsTBENHVEkxIzAhBgkqhkiG
-9w0BCQEWFGluZnJhY2d0aUBmaW9jcnV6LmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFu
-ZWlybzEXMBUGA1UECBMOUmlvIGRlIGphbmVpcm8xCzAJBgNVBAYTAkJSMRwwGgYD
-VQQDExNjZ3RpY2FmZS5maW9jcnV6LmJyMB4XDTE1MDkyMTE2NTYwNloXDTE4MDky
-MDE2NTYwNlowgbsxKDAmBgNVBAoTH0ZJT0NSVVogLSBGVU5EQUNBTyBPU1dBTERP
-IENSVVoxDTALBgNVBAsTBENHVEkxIzAhBgkqhkiG9w0BCQEWFGluZnJhY2d0aUBm
-aW9jcnV6LmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlv
-IGRlIGphbmVpcm8xCzAJBgNVBAYTAkJSMRwwGgYDVQQDExNjZ3RpY2FmZS5maW9j
-cnV6LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyWG4cgj+Osnf
-kt3wuPV8OPuOK3ImAzHCL9yXvspZxASSmIZ+F6TOQ7r7YfDEHhEx9YgLGoSc5pQ8
-85hDKOSdwcej/1B9NDyBIl++bT0yD6p6JOVtC8z/D8/JqdH+uWgbyRpofRMhPsBM
-7AfBRZ6ar9M5qxJUx5NQU7j0qkKmBiI442qxhuIXscnU6zdokCLkbioUny7d0J/m
-9YmWvv0DGgLIUltMveJyqIuJtYIw6FFRbxwjqp0biDe0FxvCgq7h2PsZ7+r6N43A
-eoNPJnByFGv45iu727WS3oKLTsCvTamyBKuX+1b2vH9nDqqRbM1SmKwoEi6vUaFt
-NpuWv33tPQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAQ0jXA8TKDFUzsDX63gqbB
-T+noOyQ5rdk1ao95pWBdquaTfmq0kybYW155UA1CGzxXNf6hWu3PBQZKiy/2rkty
-e5ml0b0s1/V57JtvtB/E6NuqoitAXq8O1okiy7RS93Fo3dz8sDSoAOK2/slGJwBO
-PrqsMoYTjfhSVUa2wiXre89eMsIy0UV1ifEtEOLU5dPI3cgabJsQC+PAZS7J60mb
-GjIjFTwcQ4eHU3fB2d3tswTCZpcOxdEvrXCvXmca//R5ilUoHq45Ne3yShxE8ivm
-m6PLcFE3BHA2WBnbwZt8ylTcHvJxL0Fafywu71AusQcAJz1p7NScH6wuCxqdiuN+
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cgticafe.fiocruz.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cgticafe.fiocruz.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://cgticafe.fiocruz.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cgticafe.fiocruz.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cgticafe.fiocruz.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cgticafe.fiocruz.br/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">fiocruz.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID7DCCAtQCAQAwDQYJKoZIhvcNAQEFBQAwgbsxKDAmBgNVBAoTH0ZJT0NSVVog
-LSBGVU5EQUNBTyBPU1dBTERPIENSVVoxDTALBgNVBAsTBENHVEkxIzAhBgkqhkiG
-9w0BCQEWFGluZnJhY2d0aUBmaW9jcnV6LmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFu
-ZWlybzEXMBUGA1UECBMOUmlvIGRlIGphbmVpcm8xCzAJBgNVBAYTAkJSMRwwGgYD
-VQQDExNjZ3RpY2FmZS5maW9jcnV6LmJyMB4XDTE1MDkyMTE2NTYwNloXDTE4MDky
-MDE2NTYwNlowgbsxKDAmBgNVBAoTH0ZJT0NSVVogLSBGVU5EQUNBTyBPU1dBTERP
-IENSVVoxDTALBgNVBAsTBENHVEkxIzAhBgkqhkiG9w0BCQEWFGluZnJhY2d0aUBm
-aW9jcnV6LmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlv
-IGRlIGphbmVpcm8xCzAJBgNVBAYTAkJSMRwwGgYDVQQDExNjZ3RpY2FmZS5maW9j
-cnV6LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyWG4cgj+Osnf
-kt3wuPV8OPuOK3ImAzHCL9yXvspZxASSmIZ+F6TOQ7r7YfDEHhEx9YgLGoSc5pQ8
-85hDKOSdwcej/1B9NDyBIl++bT0yD6p6JOVtC8z/D8/JqdH+uWgbyRpofRMhPsBM
-7AfBRZ6ar9M5qxJUx5NQU7j0qkKmBiI442qxhuIXscnU6zdokCLkbioUny7d0J/m
-9YmWvv0DGgLIUltMveJyqIuJtYIw6FFRbxwjqp0biDe0FxvCgq7h2PsZ7+r6N43A
-eoNPJnByFGv45iu727WS3oKLTsCvTamyBKuX+1b2vH9nDqqRbM1SmKwoEi6vUaFt
-NpuWv33tPQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAQ0jXA8TKDFUzsDX63gqbB
-T+noOyQ5rdk1ao95pWBdquaTfmq0kybYW155UA1CGzxXNf6hWu3PBQZKiy/2rkty
-e5ml0b0s1/V57JtvtB/E6NuqoitAXq8O1okiy7RS93Fo3dz8sDSoAOK2/slGJwBO
-PrqsMoYTjfhSVUa2wiXre89eMsIy0UV1ifEtEOLU5dPI3cgabJsQC+PAZS7J60mb
-GjIjFTwcQ4eHU3fB2d3tswTCZpcOxdEvrXCvXmca//R5ilUoHq45Ne3yShxE8ivm
-m6PLcFE3BHA2WBnbwZt8ylTcHvJxL0Fafywu71AusQcAJz1p7NScH6wuCxqdiuN+
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cgticafe.fiocruz.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cgticafe.fiocruz.br:8443/idp/profile/SAML1/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">FIOCRUZ - FUNDACAO OSWALDO CRUZ</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">FIOCRUZ - FUNDACAO OSWALDO CRUZ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">FIOCRUZ - FUNDACAO OSWALDO CRUZ</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">FIOCRUZ - FUNDACAO OSWALDO CRUZ</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://portal.fiocruz.br/pt-br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://portal.fiocruz.br/pt-br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>infracgti</md:SurName>
-    <md:EmailAddress>infracgti@fiocruz.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/childcare.uas.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/childcare.uas.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 19dd1fb3..00000000
--- a/swamid-interfederations-2.0/childcare.uas.ox.ac.uk-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://childcare.uas.ox.ac.uk/shibboleth">
-  <!--
-		This is a "ChildCare Portal" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2015-11-04T12:12: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://childcare.uas.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJANnFKhkCv1e7MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmNoaWxkY2FyZS51YXMub3guYWMudWswHhcNMTUxMTAyMTUzODE3WhcNMjUx
-						MDMwMTUzODE3WjAhMR8wHQYDVQQDExZjaGlsZGNhcmUudWFzLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzDCaP3Q0V2IdOBQURxihDJ3r
-						fgOaOOgaZSehFMDzKUEbZOhCGASNjwaiTKFkYSpV+/3CttYMQbGy12xCxabEv5Qn
-						sffscveJ1zWQeThPkp+Djs743JlWFPnkzxt4i0Q37fzVeMkPPmkYqA4AtqfMFtzi
-						WAIyMoY2eGOIG8tahjGOt7hyQYAC9GWa/Wouc87onKCnY3ZnnkHvB3MUM7lzc8xW
-						nkt1GicChIyCS13YDh1y3AhpTRsMvSyGzfyHVloHwnR1OX3jbFtCLbQHlCDuQFYS
-						ETk4Clgr7REcIAEaXD0PY5KJhgJwyormYV+go0/c0DIYkwD+svX0pTwTPUvP7QID
-						AQABo0QwQjAhBgNVHREEGjAYghZjaGlsZGNhcmUudWFzLm94LmFjLnVrMB0GA1Ud
-						DgQWBBSv7+ruCM5zakyYLDbFv7YQfhgOrDANBgkqhkiG9w0BAQUFAAOCAQEAWum0
-						tyPa1Kk9Y3pQE3CBmq8mpWC0T8TJPqXlP8vgZuKxzmPdGn/Eki6aM6x85njtve9b
-						faDye6QuTPUMcZs/zh0QUTwnFWnM9tkA+eS+VPgtcymh0s6gA8Ib0zUSVsDtPKsY
-						7IPdC9jZSxiqcYruoTTwnKTfvQTdksWa+jy1B1eM6NvWAYHxdpWVAzb9qK70g/jA
-						NawWWKSieR9RPAikHU+btS7ikxSx1xsRm+l0eTm3Wlsrppbjwt7jHPSzecoww9IN
-						DW+O1RyeuBy4TiG51lRS1mm/nbsd4NN5++Q2ta1iNebgxxzu/pFawTJjVphn3NHZ
-						TqAaVAnA6pWtBzspjg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://childcare.uas.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://childcare.uas.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford ChildCare Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Letellier</SurName>
-    <EmailAddress>mailto:nick.letellier@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/childes.talkbank.org-shibboleth.xml b/swamid-interfederations-2.0/childes.talkbank.org-shibboleth.xml
deleted file mode 100644
index e5a98133..00000000
--- a/swamid-interfederations-2.0/childes.talkbank.org-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://childes.talkbank.org/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-05-15T10:06:15Z">
-      <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/clarin-member</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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://childes.talkbank.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CHILDES - Child Language Data Exchange System</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CHILDES - Child Language Data Exchange System</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Transcript Korpora Gesprächs-Wechselwirkungen mit kleinen Kindern.</mdui:Description>
-        <mdui:Description xml:lang="en">Transcript corpora of conversational interactions involving young children.</mdui:Description>
-        <mdui:Logo height="16" width="25">https://talkbank.talkbank.org/images/clarin16.png</mdui:Logo>
-        <mdui:Logo height="60" width="92">https://talkbank.talkbank.org/images/clarin80.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://childes.talkbank.org/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>childes.talkbank.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=childes.talkbank.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDAzCCAeugAwIBAgIJAJkTfjQYZ714MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGNoaWxkZXMudGFsa2Jhbmsub3JnMB4XDTE0MDMxODE4NTMyMloXDTI0MDMx
-NTE4NTMyMlowHzEdMBsGA1UEAxMUY2hpbGRlcy50YWxrYmFuay5vcmcwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5hiLowJHLHWpzZsZdAdwD9K/qwltK
-vnsNpsdBzFuL2hs3aeL4AQF6jka10Gb1Dgo3b5Vam5NyBau8tOb5A7GwkO6pTgnp
-uFaVGPJSZtmJ0pim7dB+3VtCotf+SzArzm3Uxl7LUdC8ekqMh6Tnr5g5ZsCPxl+D
-D24tS7B0WQTBuGAQF+9ogBxqwakSFDQPcjtt5FMf1FMyPrC9m4oezpijERxQU1qZ
-2L+ZZEBO/b8h7/LYiIOdhXHmH2WvabLewtJ01rFXj8V5V65a9szEC7wh/s/mlBQ3
-xchPYrScQBZdeBSBmf6FxYgvDqisxtDVO8knj5uJdhJ9qiBJYY5n3+ZzAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFGNoaWxkZXMudGFsa2Jhbmsub3JnMB0GA1UdDgQWBBQY
-9eWGSTeFuDuIznq2Ww2d/o4KsjANBgkqhkiG9w0BAQUFAAOCAQEAHhmtwHUyGdPj
-eYRd5SMjgyifWAG7bQJvqiHdC1LNoTcPjTUTfzK6k01v2KDwsOSSj5tRNne3CrkV
-DFSQFhuUvLmUEbFTIHj0Hxkv+soOcbIlRibTW6AnEGRFE9iRFHZTAc77xij25EwB
-Bb7gOjZTFZMSAAmOMOkOxTW7IUI9XTjb5bseDXGr/VlkDUg3US10bhPhGFYfg9gz
-k7EVZj45i0IaYzsxCu6sspV3RqkZnrf7xQLFlXi2vrHDC1/tfce8iNZ39iMEi15W
-6vq+/FwHiapEaha1/wqd1aPv8FLYBGdfidv6vDVZZCpvsBTjTOEs4dh70Qm/9l5C
-IOIhmH9kkA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://childes.talkbank.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://childes.talkbank.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://childes.talkbank.org/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://childes.talkbank.org/Shibboleth.sso/SLO/Artifact"/>
-    <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://childes.talkbank.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://childes.talkbank.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://childes.talkbank.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://childes.talkbank.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://childes.talkbank.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://childes.talkbank.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CHILDES - Child Language Data Exchange System</md:ServiceName>
-      <md:ServiceName xml:lang="en">CHILDES - Child Language Data Exchange System</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Transcript Korpora Gesprächs-Wechselwirkungen mit kleinen Kindern.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Transcript corpora of conversational interactions involving young children.</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Franklin</md:GivenName>
-    <md:SurName>Chen</md:SurName>
-    <md:EmailAddress>mailto:FranklinChen@cmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Brian</md:GivenName>
-    <md:SurName>MacWhinney</md:SurName>
-    <md:EmailAddress>mailto:macw@cmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/chronicle.bufvc.ac.uk-oa-metadata.xml b/swamid-interfederations-2.0/chronicle.bufvc.ac.uk-oa-metadata.xml
deleted file mode 100644
index 14bbc315..00000000
--- a/swamid-interfederations-2.0/chronicle.bufvc.ac.uk-oa-metadata.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://chronicle.bufvc.ac.uk/oa/metadata">
-  <!--
-		This is an OpenAthens SP for the British Universities Film & Video Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-11-25T15:46: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>
-						MIID4zCCAsugAwIBAgIJAM107+XEFIGEMA0GCSqGSIb3DQEBBQUAMFQxMjAwBgNV
-						BAoUKUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0gJiBWaWRlbyBDb3VuY2lsMR4w
-						HAYDVQQDExVjaHJvbmljbGUuYnVmdmMuYWMudWswHhcNMTExMTE4MTYxMzQzWhcN
-						MjExMTE1MTYxMzQzWjBUMTIwMAYDVQQKFClCcml0aXNoIFVuaXZlcnNpdGllcyBG
-						aWxtICYgVmlkZW8gQ291bmNpbDEeMBwGA1UEAxMVY2hyb25pY2xlLmJ1ZnZjLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2+i+j9/++dpFcBX7
-						BaQ/M4OWQaJgutSft+Dodcrd5hFSg9nT5BznoIB0Ip/CEXAs6k/RbMlfFRNwgMQe
-						6X0fp8hjukr75WI4LiQBCp54axkuLW9ScUYl54xVoQ0QUzX+hZcYOKaY47BomBEN
-						8yzi/VjuunSxLrxSiHcRrp0i6RCaCo1uqLFK3jAFFgwJfme9jrzYcUTFCUkgpj9I
-						l67x4ufNkXjorsZ13f9JGTTVSCAYAaRRmqBleIULL2Wu2eDPTkqtIwoWJEHXw3BZ
-						4WX57ezURxYihU1M1ng4+HuQxQ20wvRUV/LlYVueWzABD1njy/PVYBHT9Iwi+qcK
-						4MCNAQIDAQABo4G3MIG0MB0GA1UdDgQWBBTVz59823vubr6Y9SOcECInWbD9tTCB
-						hAYDVR0jBH0we4AU1c+ffNt77m6+mPUjnBAiJ1mw/bWhWKRWMFQxMjAwBgNVBAoU
-						KUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0gJiBWaWRlbyBDb3VuY2lsMR4wHAYD
-						VQQDExVjaHJvbmljbGUuYnVmdmMuYWMudWuCCQDNdO/lxBSBhDAMBgNVHRMEBTAD
-						AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDI0BREsN8bUqLFwYW8BPT4/E2WxOLIBuAt
-						wCdrGl2ehvsDGvyZS6eR4cXwA5joqCuHeDTBbCRlRwQ82P39i40Dy25l9SX1oGis
-						KheHJLIs45pJNwgRhJgsmL664bTMjGiachvElN7hSuyT3Lv0hIKk4T4hR6AHJ5X1
-						92/K0eWh1AqFPSajm/gEgASXulVnHVor5UH7O6bnTtedOwd+ymmlhyix6v83vx9J
-						DrM3GM749leO2w6NozsLMmcdbKaPwCvxlO+QGFrd3dFSa9e+cuhEvxUidsIK50FB
-						nexvkcwJaLImd7L56nkUt3AyXT+47jRHShQVLOJlYIFOehasKWwl
-					</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>
-						MIID4zCCAsugAwIBAgIJAM107+XEFIGEMA0GCSqGSIb3DQEBBQUAMFQxMjAwBgNV
-						BAoUKUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0gJiBWaWRlbyBDb3VuY2lsMR4w
-						HAYDVQQDExVjaHJvbmljbGUuYnVmdmMuYWMudWswHhcNMTExMTE4MTYxMzQzWhcN
-						MjExMTE1MTYxMzQzWjBUMTIwMAYDVQQKFClCcml0aXNoIFVuaXZlcnNpdGllcyBG
-						aWxtICYgVmlkZW8gQ291bmNpbDEeMBwGA1UEAxMVY2hyb25pY2xlLmJ1ZnZjLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2+i+j9/++dpFcBX7
-						BaQ/M4OWQaJgutSft+Dodcrd5hFSg9nT5BznoIB0Ip/CEXAs6k/RbMlfFRNwgMQe
-						6X0fp8hjukr75WI4LiQBCp54axkuLW9ScUYl54xVoQ0QUzX+hZcYOKaY47BomBEN
-						8yzi/VjuunSxLrxSiHcRrp0i6RCaCo1uqLFK3jAFFgwJfme9jrzYcUTFCUkgpj9I
-						l67x4ufNkXjorsZ13f9JGTTVSCAYAaRRmqBleIULL2Wu2eDPTkqtIwoWJEHXw3BZ
-						4WX57ezURxYihU1M1ng4+HuQxQ20wvRUV/LlYVueWzABD1njy/PVYBHT9Iwi+qcK
-						4MCNAQIDAQABo4G3MIG0MB0GA1UdDgQWBBTVz59823vubr6Y9SOcECInWbD9tTCB
-						hAYDVR0jBH0we4AU1c+ffNt77m6+mPUjnBAiJ1mw/bWhWKRWMFQxMjAwBgNVBAoU
-						KUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0gJiBWaWRlbyBDb3VuY2lsMR4wHAYD
-						VQQDExVjaHJvbmljbGUuYnVmdmMuYWMudWuCCQDNdO/lxBSBhDAMBgNVHRMEBTAD
-						AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDI0BREsN8bUqLFwYW8BPT4/E2WxOLIBuAt
-						wCdrGl2ehvsDGvyZS6eR4cXwA5joqCuHeDTBbCRlRwQ82P39i40Dy25l9SX1oGis
-						KheHJLIs45pJNwgRhJgsmL664bTMjGiachvElN7hSuyT3Lv0hIKk4T4hR6AHJ5X1
-						92/K0eWh1AqFPSajm/gEgASXulVnHVor5UH7O6bnTtedOwd+ymmlhyix6v83vx9J
-						DrM3GM749leO2w6NozsLMmcdbKaPwCvxlO+QGFrd3dFSa9e+cuhEvxUidsIK50FB
-						nexvkcwJaLImd7L56nkUt3AyXT+47jRHShQVLOJlYIFOehasKWwl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://chronicle.bufvc.ac.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://chronicle.bufvc.ac.uk/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://chronicle.bufvc.ac.uk/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://chronicle.bufvc.ac.uk/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">British Universities Film &amp; Video Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">British Universities Film &amp; Video Council: Chronicle - BBC NI's TV News from the 60s and 70s</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://bufvc.ac.uk/aboutus/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>CIS Helpdesk</GivenName>
-    <EmailAddress>mailto:support@cambridgeimaging.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>CIS Helpdesk</GivenName>
-    <EmailAddress>mailto:support@cambridgeimaging.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ck.olmstaging.com-oa-metadata.xml b/swamid-interfederations-2.0/ck.olmstaging.com-oa-metadata.xml
deleted file mode 100644
index 49465e2f..00000000
--- a/swamid-interfederations-2.0/ck.olmstaging.com-oa-metadata.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://ck.olmstaging.com/oa/metadata">
-  <!--
-		This is a "CareKnowledge Staging Environment" OpenAthens SP for OLM Pavilion Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-14T13:15:39Z">
-      <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: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">CareKnowledge Staging Environment</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The staging website for CareKnowledge</mdui:Description>
-        <mdui:Logo height="110" width="275">https://ck.olmstaging.com/App_Themes/ck/img/logo-full-colour.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-			MIIDdjCCAl6gAwIBAgIJALNePh/3on5UMA0GCSqGSIb3DQEBBQUAMDAxEjAQBgNV
-			BAoTCU9MTSBHcm91cDEaMBgGA1UEAxMRY2sub2xtc3RhZ2luZy5jb20wHhcNMTUw
-			NjAyMTI0OTIxWhcNMjUwNTMwMTI0OTIxWjAwMRIwEAYDVQQKEwlPTE0gR3JvdXAx
-			GjAYBgNVBAMTEWNrLm9sbXN0YWdpbmcuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-			AQ8AMIIBCgKCAQEAwmLnKk7fe5gs6kVPp477T1IzSbIl+y6DPy0Ds0XWRTQh1/1I
-			xa9B1DQhvtwc2OPO96uNPl3HU8/rcAhYURVqWHlAm38SFvi2Or5FM3hhh3fdUa/p
-			u1PbEoRf2+nDzW5BCtFRniqXzM34XQOm2mNjDOaucsTetXUQRmCxzRHNEzjgEcrG
-			ESm2lEzR6cdhnXE+/8mETLp+WSgf8+O6Dnyk9zN1CRtYz50UjjNXPMw8UkA5v+/b
-			/DRZjvNDWUcqZVHG0+p9XdhUQ7ebs/n1QYfoTwjv8ONGdyu/3kfXYywv79QVx0+y
-			TPCD0KWCX27G80mKNinmBrXf0pCr+XG7hSpYIQIDAQABo4GSMIGPMB0GA1UdDgQW
-			BBSqrJuw1LWg1iY+WoKutOruPT3UtDBgBgNVHSMEWTBXgBSqrJuw1LWg1iY+WoKu
-			tOruPT3UtKE0pDIwMDESMBAGA1UEChMJT0xNIEdyb3VwMRowGAYDVQQDExFjay5v
-			bG1zdGFnaW5nLmNvbYIJALNePh/3on5UMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
-			AQEFBQADggEBAD08S1DnwxS6Jqq/1VZIRw95rtx0JdfliMpUyFxirezrt7XcD4Jr
-			6fdBonhZmsv71d7kVF0wTC9pRfW77N6of8VIHhiQnmRd8kwgqruKtZdaJTvMa4OY
-			Hh7SMHyrM0roCkiqAdJCc9KDyk9pR0sgvZ5OuVi2qHuGiWBASCEutsemgfYGWoMm
-			XeFiHXI26wrBIpENvidELyX4KSqLQQGVExi5PGaj6bRkgGZDehMlHUYc3BbmEV2c
-			tKmjS4MQl35ipYwwPIZzpDfqiD1ZfNgD5b7ucFtN8y9SWoyYziYeLLwmtjQvb9O3
-			hYtzTdNb6ow8U/5Qy7n3G2+T9I/AuYIhlGA=
-		</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>
-			MIIDdjCCAl6gAwIBAgIJALNePh/3on5UMA0GCSqGSIb3DQEBBQUAMDAxEjAQBgNV
-			BAoTCU9MTSBHcm91cDEaMBgGA1UEAxMRY2sub2xtc3RhZ2luZy5jb20wHhcNMTUw
-			NjAyMTI0OTIxWhcNMjUwNTMwMTI0OTIxWjAwMRIwEAYDVQQKEwlPTE0gR3JvdXAx
-			GjAYBgNVBAMTEWNrLm9sbXN0YWdpbmcuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-			AQ8AMIIBCgKCAQEAwmLnKk7fe5gs6kVPp477T1IzSbIl+y6DPy0Ds0XWRTQh1/1I
-			xa9B1DQhvtwc2OPO96uNPl3HU8/rcAhYURVqWHlAm38SFvi2Or5FM3hhh3fdUa/p
-			u1PbEoRf2+nDzW5BCtFRniqXzM34XQOm2mNjDOaucsTetXUQRmCxzRHNEzjgEcrG
-			ESm2lEzR6cdhnXE+/8mETLp+WSgf8+O6Dnyk9zN1CRtYz50UjjNXPMw8UkA5v+/b
-			/DRZjvNDWUcqZVHG0+p9XdhUQ7ebs/n1QYfoTwjv8ONGdyu/3kfXYywv79QVx0+y
-			TPCD0KWCX27G80mKNinmBrXf0pCr+XG7hSpYIQIDAQABo4GSMIGPMB0GA1UdDgQW
-			BBSqrJuw1LWg1iY+WoKutOruPT3UtDBgBgNVHSMEWTBXgBSqrJuw1LWg1iY+WoKu
-			tOruPT3UtKE0pDIwMDESMBAGA1UEChMJT0xNIEdyb3VwMRowGAYDVQQDExFjay5v
-			bG1zdGFnaW5nLmNvbYIJALNePh/3on5UMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
-			AQEFBQADggEBAD08S1DnwxS6Jqq/1VZIRw95rtx0JdfliMpUyFxirezrt7XcD4Jr
-			6fdBonhZmsv71d7kVF0wTC9pRfW77N6of8VIHhiQnmRd8kwgqruKtZdaJTvMa4OY
-			Hh7SMHyrM0roCkiqAdJCc9KDyk9pR0sgvZ5OuVi2qHuGiWBASCEutsemgfYGWoMm
-			XeFiHXI26wrBIpENvidELyX4KSqLQQGVExi5PGaj6bRkgGZDehMlHUYc3BbmEV2c
-			tKmjS4MQl35ipYwwPIZzpDfqiD1ZfNgD5b7ucFtN8y9SWoyYziYeLLwmtjQvb9O3
-			hYtzTdNb6ow8U/5Qy7n3G2+T9I/AuYIhlGA=
-		</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ck.olmstaging.com/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ck.olmstaging.com/ukfed/oa/auth/rcv/saml2/post" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OLM Pavilion Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CareKnowledge Staging Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.pavpub.com/about-us/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tim</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:Tim.Smith@olmgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:Tim.Smith@olmgroup.com</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
index c8c85005..ce1d630c 100644
--- a/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
@@ -1,36 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.ids-mannheim.de/shibboleth">
-  <md: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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<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://clarin.ids-mannheim.de/shibboleth">
+  <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://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">CLARIN Dienste</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">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:Logo height="16" width="16">https://clarin.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
-        <mdui:Logo height="63" width="318">https://clarin.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.ids-mannheim.de</mdui:InformationURL>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Institute for the German Language (IDS) - CLARIN services</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for the German Language (IDS) - CLARIN services</mdui:DisplayName>
+        <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="en">http://www.ids-mannheim.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://clarin.ids-mannheim.de/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>clarin.ids-mannheim.de</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=clarin.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGHGxHhl3eDANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFu
 bmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZTEV
@@ -63,49 +51,44 @@ ABUoJ1obWyY9SigpZd9CB/VoXuLVlNumJhdE8pblkmiuQoPMjANXqSJxXTc3VoaM
 Hgk+0Pprizij1Ay8rR6gS02YjZqh0AFcxfRtgf0WDJpU73m0WLdinZ2/9WEF4HeX
 4kZ8oRe3FrE90Nk79pA+/ghhQWJey5ryo2+RZY/ST5PIhyNVonJxN24nHttUmC+x
 nEIJAu56xR9tXHpXpZbsdp6tGG7Q1lkVH3o/8UNzCtWDcSN1p9zjFU11jO79bgJo
-VElur4XCJuT+L7n7C+jsguSkQEbspfoJ7w0a5ADsE/Hqi20yLQtPgB6VuWfo
-</ds:X509Certificate>
+VElur4XCJuT+L7n7C+jsguSkQEbspfoJ7w0a5ADsE/Hqi20yLQtPgB6VuWfo</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CLARIN Dienste</md:ServiceName>
-      <md:ServiceName xml:lang="en">CLARIN services</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Verschiedene Dienste des Institut für Deutsche Sprache (IDS) im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative.</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="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: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://clarin.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Institute for the German Language (IDS) - CLARIN services</md:ServiceName>
+      <md:ServiceName xml:lang="en">Institute for the German Language (IDS) - CLARIN services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Various services provided by the Institut für Deutsche Sprache (IDS) in the context of the CLARIN initiative</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="de">e217</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e217</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.ids-mannheim.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ids-mannheim.de</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>Oliver</md:GivenName>
-    <md:SurName>Schonefeld</md:SurName>
-    <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
     <md:GivenName>Andreas</md:GivenName>
     <md:SurName>Witt</md:SurName>
     <md:EmailAddress>mailto:witt@ids-mannheim.de</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Oliver</md:GivenName>
+    <md:SurName>Schonefeld</md:SurName>
+    <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>AAI</md:GivenName>
     <md:SurName>Team</md:SurName>
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
index b70b0e09..a17cb200 100644
--- a/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
+++ b/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
@@ -1,49 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.oeaw.ac.at/shibboleth">
-  <md:Extensions>
-    <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>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+<md: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://clarin.oeaw.ac.at/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://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="en">ACDH-AW Services for Digital Humanities</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">ACDH-AW Dienste für Digitale Geisteswissenschaften</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Various services provided by the Austrian Centre for Digital Humanities of the Austrian Academy of Sciences (ACDH-AW) (primarily in the context of the CLARIN initiative).</mdui:Description>
-        <mdui:Description xml:lang="de">Verschiedene Dienste des österreichischen Zentrums für Digitale Geisteswissenschaften der Österreichischen Akademie der Wissenschaften (ACDH-AW) (primär im Rahmen der CLARIN-Initiative).</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://acdh.oeaw.ac.at</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://acdh.oeaw.ac.at</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://clarin.oeaw.ac.at/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo width="55" height="70">https://clarin.oeaw.ac.at/sites/clarin.oeaw.ac.at/files/ccv_logo_v1b.png</mdui:Logo>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">CLARIN Centre Vienna / Language Resources Portal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">CLARIN Centre Wien / Language Resources Portal</mdui:DisplayName>
+        <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:Description xml:lang="fi">Humanististen tieteiden digitaalinen hakemisto kielentutkimuksen resurssien tallennukseen ja jakeluun</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://clarin.oeaw.ac.at/ccv</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://clarin.oeaw.ac.at/ccv/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://clarin.oeaw.ac.at/ccv/privacy</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAI3rKBVKUcUJMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
 BAMTFWNsYXJpbi5hcnoub2Vhdy5hYy5hdDAeFw0xNDAxMjAxNDU3MThaFw0yNDAx
@@ -61,84 +36,46 @@ NUldSGR70wi0iQlx7t868V5pmkqxnaDu4+lo1QU59s5c7MRJXZ6OcbKB57O/d5l+
 +kX3/YW9WAQkmwcyVWDbcmk4DZK5kqqTk+u3fS48cLqai5YVcj8pDDoUx6/ZkwDv
 Yqvva2v4+vhzX9SW3QyiChOgFo9sP/UD1U8JAZG0sds5ugwjwiXPPB41hwHdbdEj
 QZRW2NR0HHMFp0FZeSziXOeaap21wc/W1Nk7wpRI7jYdzLRJHmzhvWz95p0WSnt+
-rI8v6OTvibpLrg==
-</ds:X509Certificate>
+rI8v6OTvibpLrg==</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://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: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://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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://acdh.oeaw.ac.at/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://acdh.oeaw.ac.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://acdh.oeaw.ac.at/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://acdh.oeaw.ac.at/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acdh.oeaw.ac.at/Shibboleth.sso/SAML/POST" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acdh.oeaw.ac.at/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">ACDH-AW Services for Digital Humanities</md:ServiceName>
-      <md:ServiceName xml:lang="de">ACDH-AW Dienste für Digitale Geisteswissenschaften</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Various services provided by the Austrian Centre for Digital Humanities of the Austrian Academy of Sciences (ACDH-AW) (primarily in the context of the CLARIN initiative).</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="de">Verschiedene Dienste des österreichischen Zentrums für Digitale Geisteswissenschaften der Österreichischen Akademie der Wissenschaften (ACDH-AW) (primär im Rahmen der CLARIN-Initiative).</md:ServiceDescription>
-      <md:RequestedAttribute isRequired="true" 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 isRequired="false" 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 isRequired="false" 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 isRequired="false" 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 isRequired="false" FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute isRequired="false" FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute isRequired="false" FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    <md: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://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">CLARIN Centre Wien / Language Resources Portal</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARIN Centre Vienna / Language Resources Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Humanististen tieteiden digitaalinen hakemisto kielentutkimuksen resurssien tallennukseen ja jakeluun</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 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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">Österreichische Akademie der Wissenschaften</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Austrian Academy of Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Österreichisches Zentrum für Digitale Geisteswissenschaften der Österreichischen Akademie der Wissenschaften (ACDH-AW)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Austrian Centre for Digital Humanities of the Austrian Academy of Sciences (ACDH-AW)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://acdh.oeaw.ac.at/</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>Mateusz</md:GivenName>
-    <md:SurName>Żółtak</md:SurName>
-    <md:EmailAddress>mailto:mateusz.zoltak@oeaw.ac.at</md:EmailAddress>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Karlheinz</md:GivenName>
+    <md:SurName>Morth</md:SurName>
+    <md:EmailAddress>mailto:karlheinz.moerth@oeaw.ac.at</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Matej</md:GivenName>
     <md:SurName>Durco</md:SurName>
     <md:EmailAddress>mailto: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>mailto:karlheinz.moerth@oeaw.ac.at</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>ACDH</md:GivenName>
+    <md:GivenName>ICLTT-tech</md:GivenName>
     <md:SurName>Office</md:SurName>
-    <md:EmailAddress>mailto:acdh-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>mailto:helpdesk@oeaw.ac.at</md:EmailAddress>
+    <md:EmailAddress>mailto:icltt-tech@oeaw.ac.at</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml b/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml
index fef33502..4c89e026 100644
--- a/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml
+++ b/swamid-interfederations-2.0/clarin.phonetik.uni-muenchen.de.xml
@@ -1,36 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.phonetik.uni-muenchen.de">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-22T09:02:29Z">
-      <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:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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://clarin.phonetik.uni-muenchen.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://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Bayerisches Archiv für Sprachsignale</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Bavarian Archive for Speech Signals</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Ein Repository von phonetischen Daten (Signale und Annotation/Segmentierungen) und verschiedene Webservices die diese Daten verarbeiten, bereitgestellt vom Bayerischen Archiv für Sprachsignale (BAS)</mdui:Description>
-        <mdui:Description xml:lang="en">A repository for data of phonetic data (signals and annotations/segmentations) and several services processing this data provided by the Bavarian Archive of Speech Signals (BAS)</mdui:Description>
-        <mdui:Logo height="156" width="396">https://www.phonetik.uni-muenchen.de/forschung/bay_arch_sprsig/bas_logo_german.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://clarin.phonetik.uni-muenchen.de/BASRepository/index.php</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.phonetik.uni-muenchen.de/forschung/Bas/BasPolicyAAIPrivacy_eng.pdf</mdui:PrivacyStatementURL>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Baijerin Arkisto puhesignaaleille Palveluntarjoaja</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Bavarian Archive for Speech Signals Service Provider</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Akateemisen käytön pääsynhallinta Baijerin puhesignaalien arkiston rajoitetuille resursseille</mdui:Description>
+        <mdui:Description xml:lang="en">Bavarian Archive for Speech Signals Service Provider (for accessing to academic use restricted resources)</mdui:Description>
+        <mdui:Logo height="150" width="356">https://www.en.phonetik.uni-muenchen.de/research/bav_arch_spsig/bas_logo_englisch.jpg</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Bavarian Archive for Speech Signals Service Provider</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.phonetik.uni-muenchen.de/forschung/Bas/BasPolicyAAIPrivacy_eng.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.en.phonetik.uni-muenchen.de/funktionen/privacy/index.html</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>clarin.phonetik.uni-muenchen.de</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=clarin.phonetik.uni-muenchen.de,OU=Institut fuer Phonetik und Sprachverarbeitung,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIGPTCCBSWgAwIBAgIHGN7gvIyUTjANBgkqhkiG9w0BAQsFADCBkDELMAkGA1UE
 BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNV
 BAoTKEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzAN
@@ -64,53 +54,44 @@ QLoWazb9Tb+Xqo47GQrqzdc9pUX0HDDIi/U8gMn+LVrnWVx/Nuhq5G0+zWsEnnS7
 kxTfM5w8IfUOK8tOo6JF7lDe1Y8d9LtMhAadjvfh3XKg3xYMnXoj8HGux6Fpfd2H
 7bXhWeSUsZwoyvkrpBSk29DD8YZHb9gEDBYT+0F7fWuAmKOMfKWbr/1KYC4Ml0af
 XaIzi4rLf+cstPUOYYP5DzKfCf6eZ2DEimz2Y62KXIXftNEGeQ8ELZSARlqvHc/m
-cdriseFaC9wD+9FMZhAznUg=
-</ds:X509Certificate>
+cdriseFaC9wD+9FMZhAznUg=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
-    <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://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Bayerisches Archiv für Sprachsignale</md:ServiceName>
-      <md:ServiceName xml:lang="en">Bavarian Archive for Speech Signals</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Ein Repository von phonetischen Daten (Signale und Annotation/Segmentierungen) und verschiedene Webservices die diese Daten verarbeiten, bereitgestellt vom Bayerischen Archiv für Sprachsignale (BAS)</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">A repository for data of phonetic data (signals and annotations/segmentations) and several services processing this data provided by the Bavarian Archive of Speech Signals (BAS)</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="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:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.phonetik.uni-muenchen.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Baijerin Arkisto puhesignaaleille</md:ServiceName>
+      <md:ServiceName xml:lang="en">Bavarian Archive for Speech Signals Service Provider</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Akateemisen kayton paasynhallinta Baijerin puhesignaalien arkiston rajoitetuille resursseille</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Bavarian Archive for Speech Signals Service Provider (for accessing to academic use restricted resources)</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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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="support">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Kisler</md:SurName>
-    <md:EmailAddress>mailto:kisler@phonetik.uni-muenchen.de</md:EmailAddress>
+  <md:ContactPerson contactType="administrative">
+    <md:SurName>Administration</md:SurName>
+    <md:EmailAddress>mailto:admin@phonetik.uni-muenchen.de</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Klaus</md:GivenName>
-    <md:SurName>Jänsch</md:SurName>
+    <md:SurName>Technical Support</md:SurName>
     <md:EmailAddress>mailto:admin@phonetik.uni-muenchen.de</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Klaus</md:GivenName>
-    <md:SurName>Jänsch</md:SurName>
-    <md:EmailAddress>mailto:admin@phonetik.uni-muenchen.de</md:EmailAddress>
+  <md:ContactPerson contactType="support">
+    <md:SurName>User Support</md:SurName>
+    <md:EmailAddress>mailto:kisler@phonetik.uni-muenchen.de</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
index 41c8df75..2cb23e91 100644
--- a/swamid-interfederations-2.0/clarino.uib.no-.xml
+++ b/swamid-interfederations-2.0/clarino.uib.no-.xml
@@ -1,81 +1,90 @@
 <?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>
-    <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <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: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://clarino.uib.no/">
   <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://clarino.uib.no/feide/single-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://clarino.uib.no/feide/single-login" index="1"/>
-      <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:DisplayName xml:lang="de">Clarino, UiB</mdui:DisplayName>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarino.uib.no/feide/single-login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Clarino, UiB</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Clarino, UiB</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</mdui:Description>
-        <mdui:Description xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til CLARIN-initiativet.</mdui:Description>
-        <mdui:Description xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Clarino, UiB</mdui:DisplayName>
         <mdui:Description xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvät CLARIN aloitetta.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://clarino.uib.no/iness/page?page-id=privacy_policy</mdui:PrivacyStatementURL>
-        <mdui:Logo width="180" height="64">https://clarino.uib.no/images/clarino_duo-180.png</mdui:Logo>
-        <mdui:Logo width="296" height="106">https://clarino.uib.no/images/clarino_duo-296.png</mdui:Logo>
-        <mdui:Logo width="460" height="165">https://clarino.uib.no/images/clarino_duo-460.png</mdui:Logo>
-        <mdui:Logo width="740" height="231">https://clarino.uib.no/images/clarino_duo-740.png</mdui:Logo>
+        <mdui:Description xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</mdui:Description>
+        <mdui:Logo height="165" width="460">https://clarino.uib.no/images/clarino_duo-460.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://clarino.uib.no/iness/page?page-id=privacy_policy</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <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:X509Certificate>MIIEdzCCA1+gAwIBAgIQCA4E94tJ3rEzJC1noMhpNzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDUwODAwMDAwMFoXDTE2MDUwNzIzNTk1OVowPDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5jbGFyaW5vLnVp
+Yi5ubzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALIQNT7Lca7R0tFZ
+mm4Fes8xdGlJrbxiuA/A1e/dMXaHm/C65zZ2ZFbUXnIe+bq+9AlJPO1gr7vyMaiX
+DsEYGlBBL/oNeroJfv+DAInweaOkatmOGMCBDAmCY76M89Vshk0qDNTEbZwc15fr
+hNGCJTUiHSToCFtvwDI4/0dbsUwNfCML0jRvi2QFnrgXh0QxTTNfcFdh72uL2WCh
+sbteCE2P4/T1H5yL1P3YJvpDX0iAMszaG+ZntYmATVMm91ivcE6mRCDI+qcHJdDW
+dy2E8NOBNCr8aQle2P6txXC9w5hzoE49Bw0oAF49EHx3MroBEA47ECGbOJ0Hpb8R
+piXnX6ECAwEAAaOCAXkwggF1MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+47ntMB0GA1UdDgQWBBR5vbqCMC3rno6VxasCvrYHZy/fkDAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
+bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
+bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
+dGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAwHoIOY2xhcmluby51aWIubm+CDGluZXNz
+LnVpYi5ubzANBgkqhkiG9w0BAQUFAAOCAQEAOjOxk+g90GHRP56AovDdtglU77Xx
+9Cd7Xx5hvbGMQRVFshLn4YXpbi4UFnGru0A+k0Cy+7tfQ4i82ITL3f0epz9N5JB8
+20waQRPTT55gk0iSAOSO5MhKeE6e+gf8RlDwF/p2y3RmalvxY/D+G6NKcwwbTe60
+Qd0b3DGOyN710RHzBLwtbIF3JmFw1M6m6w4Z433+XY/KiGMwpEGIw1J7I6XV1QeB
+7L7gZLFe+cry47IAqstheKHR0iUyR3+YgTVgS6pszAlhl46YYthpqSUiN0vpKB7E
+zRhPjli9gmQycjHS4iXBKe2aeFPsV5Cd7njw2oa9cmxMysqK+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:ServiceName xml:lang="de">Clarino, UiB</md:ServiceName>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarino.uib.no/feide/assertion-consumer" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="fi">Clarino, UiB</md:ServiceName>
+      <md:ServiceName xml:lang="en">Clarino, UiB</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Clarino, UiB</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvat CLARIN aloitetta.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Norwegian research infrastructure for language data and services, linked to the CLARIN initiative.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">Norsk forskningsinfrastruktur for språkdata og -tjenester, knyttet til CLARIN-initiativet.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="fi">Norja tutkimusinfrastruktuurin kielen tietojen ja palvelujen, jotka liittyvät CLARIN aloitetta.</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" FriendlyName="eduPersonTargetedID" 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" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" 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" FriendlyName="mail" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o" 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" FriendlyName="eduPersonAffiliation" isRequired="true"/>
+      <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.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.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: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="no">Universitetet i Bergen</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Bergen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="no">Universitetet i Bergen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Bergen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="no">http://www.uib.no</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uib.no</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="administrative">
+    <md:GivenName>Koenraad</md:GivenName>
+    <md:SurName>De Smedt</md:SurName>
+    <md:EmailAddress>mailto:clarino@uib.no</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Paul</md:GivenName>
     <md:SurName>Meurer</md:SurName>
     <md:EmailAddress>mailto:clarino-tech@uib.no</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Koenraad</md:GivenName>
-    <md:SurName>de Smedt</md:SurName>
-    <md:EmailAddress>mailto:clarino@uib.no</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Paul</md:GivenName>
     <md:SurName>Meurer</md:SurName>
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/classes.myplace.strath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/classes.myplace.strath.ac.uk-shibboleth.xml
deleted file mode 100644
index 32b9c2bf..00000000
--- a/swamid-interfederations-2.0/classes.myplace.strath.ac.uk-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://classes.myplace.strath.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for the University of Strathclyde.
-	-->
-  <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-12-02T18:00:31Z">
-      <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://classes.myplace.strath.ac.uk/auth/shibexternal/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://classes.myplace.strath.ac.uk/auth/shibexternal/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://classes.myplace.strath.ac.uk/auth/shibexternal/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://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/DS" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC8TCCAdmgAwIBAgIJAI/TDhOS3dc1MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDm1vby1jbGFzc2VzLWxiMB4XDTE1MTExMjEwMTQwNloXDTI1MTEwOTEwMTQw
-						NlowGTEXMBUGA1UEAxMObW9vLWNsYXNzZXMtbGIwggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQCiQjSMU7aYPhkwbkjJ0t8AfNkfeAzgyVe0ZbSpkw4fLqmS
-						ROAXMtdrU6JqQndlMK+RBlSNuKyfHPn2viDddXfqNA1JQWyDeuM62vCulqBsN74C
-						C8uIPFYmnKBQONMVu9GSquZDb5Cdqc/Pud/wAuhAG8oNzwSj3jlekU23jVay8M3C
-						i49Nx+QCq9DuLh7+lkHv5p0EOKJU6tRqP+JAs7kKjx9zDDW1InjeLFfHmNOW3XLp
-						YOLmD5a1yxv8qwFu9DnRO12Erhij9ijDh201sLqqtV/SIBdkmL+kfz2S3b3+knXh
-						17rqiDr/9b2FwOxL9DYLHiUDOCAiMOWd6C0TD1xLAgMBAAGjPDA6MBkGA1UdEQQS
-						MBCCDm1vby1jbGFzc2VzLWxiMB0GA1UdDgQWBBQ+bhjHHFhU8uMBmalBud5HmLbe
-						TzANBgkqhkiG9w0BAQUFAAOCAQEAStly/iwK52fpJVCSfR0u92+4A/51dVxiEv6P
-						enqNiwujaSxtTQnlH+Y5qwuDjh55b7NgSEFVgsHyLBeM8p7VbsrGqU3v7Yz4x1KR
-						HEvYldz2QVH87unSWfcGyq9Wl4vVDfoJ9vKXyS3aoK7UFTlMtbwExmpPMPo0lU57
-						6XmMNdAdj29oXQtYoC9VaD12NNM+u+ex/mkgJwzTwlRwrYjAfulEwsSQvVtuttW8
-						8Qw4P3vEY3d8wyVoFtNST/8PnwpjwEIP5qN6rKdZzLIcd19N2IoJnm6u5yCq1PKQ
-						QXE46akAojltN9BLFBqsWd+YtEdHZF5xbAw5O4zJ5m6SLr0VIg==
-					</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://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://classes.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Strathclyde</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Strathclyde Myplace</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.strath.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Iain</GivenName>
-    <SurName>Todd</SurName>
-    <EmailAddress>mailto:iain.todd@strath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Iain</GivenName>
-    <SurName>Todd</SurName>
-    <EmailAddress>mailto:iain.todd@strath.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml b/swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml
deleted file mode 100644
index ccd95b98..00000000
--- a/swamid-interfederations-2.0/clc2.uniservity.com-shibboleth-sp.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clc2.uniservity.com/shibboleth-sp">
-  <!--
-		This is a "cLc Service" Shibboleth SP for UniServity Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-05T13:26: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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJALqRFj7sKRi6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2NsYzIudW5pc2Vydml0eS5jb20wHhcNMTAwODExMDcxNjQ0WhcNMjAwODA4
-						MDcxNjQ0WjAeMRwwGgYDVQQDExNjbGMyLnVuaXNlcnZpdHkuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7YzFYLLYggaCAIQfIurkw4BAY5iZsnqy
-						jFh/WXx28e3aYEGAm4bGoCIlZGYCz/g+fe2rFtRQWexeotbYyuQbujOF5Qbo5kbj
-						p+z1CuS39z0Y7kNBfwTjZ1k3KdA/EWed2fn2YcbyCrFppSfRDpMknC5Y61RwELYQ
-						02Bgdcoseyu1djWmN1eWIT0gnhcWK8GCd8+LrCq/27aTIeWX72NLPgavcufZQFhw
-						/lWAg+DP2tZFawBRwFY312l8xV2sWfRaRqDcknQNpkjgjKszWF91vEGGyg9lgjzq
-						+mVdMQ/07Iq/IXCiRZbg77kFlatiQRvyqUnh82ZBDg5B06qS2vwaQwIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNjbGMyLnVuaXNlcnZpdHkuY29tMB0GA1UdDgQWBBS/dypG
-						zWKUa4YM5CYBqsxyNjGskDANBgkqhkiG9w0BAQUFAAOCAQEAU+nzkSWexr3vIEUA
-						zKOIxm9DbJMN6UhHDJbTmAK+JK/tUGQFneXWbdKN8PZJavvAktKWIayCLylk7NW8
-						M+XjI59aDQtZS6ny1p0sDp2vVqxcxDERg8Gz4iC0SaPSf7rkPM7US38pHIVv+G4V
-						x+A2ZrLj+M59HmN2VPY1l5FioWX6PNyOONqYwf1VJNu7HuORDjZ6aO/+vKqc0T0T
-						QQY6mVVXxS+/ggHz77z1CB6sxT5pNg7znlbuACPih4XKDiqrLcBnqccCKwDaAzA8
-						DV5vMzE7zGxO7lsrTdurjVHR3HyV957q8MidZo3u3xUOUihAMoNdterpWI/0aqoi
-						hyDqDQ==
-					</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>
-						MIIDADCCAeigAwIBAgIJALqRFj7sKRi6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2NsYzIudW5pc2Vydml0eS5jb20wHhcNMTAwODExMDcxNjQ0WhcNMjAwODA4
-						MDcxNjQ0WjAeMRwwGgYDVQQDExNjbGMyLnVuaXNlcnZpdHkuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7YzFYLLYggaCAIQfIurkw4BAY5iZsnqy
-						jFh/WXx28e3aYEGAm4bGoCIlZGYCz/g+fe2rFtRQWexeotbYyuQbujOF5Qbo5kbj
-						p+z1CuS39z0Y7kNBfwTjZ1k3KdA/EWed2fn2YcbyCrFppSfRDpMknC5Y61RwELYQ
-						02Bgdcoseyu1djWmN1eWIT0gnhcWK8GCd8+LrCq/27aTIeWX72NLPgavcufZQFhw
-						/lWAg+DP2tZFawBRwFY312l8xV2sWfRaRqDcknQNpkjgjKszWF91vEGGyg9lgjzq
-						+mVdMQ/07Iq/IXCiRZbg77kFlatiQRvyqUnh82ZBDg5B06qS2vwaQwIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNjbGMyLnVuaXNlcnZpdHkuY29tMB0GA1UdDgQWBBS/dypG
-						zWKUa4YM5CYBqsxyNjGskDANBgkqhkiG9w0BAQUFAAOCAQEAU+nzkSWexr3vIEUA
-						zKOIxm9DbJMN6UhHDJbTmAK+JK/tUGQFneXWbdKN8PZJavvAktKWIayCLylk7NW8
-						M+XjI59aDQtZS6ny1p0sDp2vVqxcxDERg8Gz4iC0SaPSf7rkPM7US38pHIVv+G4V
-						x+A2ZrLj+M59HmN2VPY1l5FioWX6PNyOONqYwf1VJNu7HuORDjZ6aO/+vKqc0T0T
-						QQY6mVVXxS+/ggHz77z1CB6sxT5pNg7znlbuACPih4XKDiqrLcBnqccCKwDaAzA8
-						DV5vMzE7zGxO7lsrTdurjVHR3HyV957q8MidZo3u3xUOUihAMoNdterpWI/0aqoi
-						hyDqDQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clc2.uniservity.com/Shibboleth.sso/SLO/Redirect"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clc2.uniservity.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clc2.uniservity.com/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UniServity Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UniServity Limited: cLc Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniservity.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UniServity Support</GivenName>
-    <EmailAddress>mailto:support@uniservity.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rezar</GivenName>
-    <SurName>Zefaj</SurName>
-    <EmailAddress>mailto:rezar.zafaj@uniservity.com</EmailAddress>
-  </ContactPerson>
-</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/cloudstandards.cesnet.cz-sp-shibboleth.xml b/swamid-interfederations-2.0/cloudstandards.cesnet.cz-sp-shibboleth.xml
deleted file mode 100644
index 5110e92e..00000000
--- a/swamid-interfederations-2.0/cloudstandards.cesnet.cz-sp-shibboleth.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://cloudstandards.cesnet.cz/sp/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#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"/>
-    <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="2015-01-29T11:27: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/sp-group/aa.cesnet.cz</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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cloudstandards.cesnet.cz/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://cloudstandards.cesnet.cz/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://cloudstandards.cesnet.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://cloudstandards.cesnet.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://cloudstandards.cesnet.cz/Shibboleth.sso/DSEG"/>
-      <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://cloudstandards.cesnet.cz/Shibboleth.sso/DSEG" index="2"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>staff-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=staff-sp</ds:X509SubjectName>
-          <ds:X509Certificate>MIICojCCAYoCCQDl+ffNPW8XLTANBgkqhkiG9w0BAQUFADATMREwDwYDVQQDEwhz
-dGFmZi1zcDAeFw0xMTA1MzExNTEyMDFaFw0yMTA2MDExNTEyMDFaMBMxETAPBgNV
-BAMTCHN0YWZmLXNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArw2P
-fWdRZqiAvzuhmPl/ZNOTsN3Pvp/bsAWtEMfZDNcd7KAbeBuVsiprbX16tdiJYTgD
-0VqxCnzfYqt3FVHi4zKN4nUJEYG2q78Nz+iMdsbF8w4KzljL7VMv1hR3K9C2dPBj
-feZ0mupBlxpk6VcVoHmcVWVP5pN7bTK1uGak0Qx15aJoT6WvhmKwIUB/aAlTn+bQ
-j901evtXa02r/dUHEADEA8ZmhWyxmr8yN8Nol/orwqODKcP269mO8XfTegIZeVYQ
-qj/4S+AhDkXxapJcZXFdlh9elIsQYICRxvEA51Dy8guFoVNNAqpoLj89Fer1R/P3
-xz38pBg6pUW11iVWvwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAGfoWQpL9YnlGk
-yeKreOtzpaPNL6UeHPaw/fpTP5RJFlJtxvHmVwDMsRtx+jWpEXaxtCdIrYil8FJL
-68M26xrXtHWSiTovlqMkLZZw4Xwjd2jAeuYVrS84z3c3PCDylafQNddkLJoP3k+y
-v7MEHao5A1SEqRi7CJoeEjTQYV95fsjccLgrjQZWlyC9JauC0+TTbLt3VeASOqaW
-EG3oNAFsAT2ZTYrBpcc1SilLhSV9AtkoYk+g5Ek72S4mCdAb5PColu5krxYZ7gz6
-N02qjxZaJg7RvbagR5qJHKKMuXhYoh87YBC5eheBYdTc4LVIsz74sF6xrcgytZRL
-JcBgGx9A
-</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://cloudstandards.cesnet.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cloudstandards.cesnet.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </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.ces.net/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Vladimir</md:GivenName>
-    <md:SurName>Trestik</md:SurName>
-    <md:EmailAddress>Vladimir.Trestik@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
deleted file mode 100644
index f625e373..00000000
--- a/swamid-interfederations-2.0/clueless.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clueless.restena.lu/simplesamlphp/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-06-25T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.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">RESTENA Staff</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">RESTENA Employees</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">RESTENA Mitarbeiter</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="lb">RESTENA Matärbeschter</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for members of staff of RESTENA Foundation</mdui:Description>
-        <mdui:Description xml:lang="fr">Fournisseur d'Identité pour employés de la Fondation RESTENA</mdui:Description>
-        <mdui:Description xml:lang="de">Identitätsprovider für Mitarbeiter der Stiftung RESTENA</mdui:Description>
-        <mdui:Keywords xml:lang="en">RESTENA staff login</mdui:Keywords>
-        <mdui:Logo width="78" height="100" xml:lang="en">http://clueless.restena.lu/restena.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:a18::0/32</mdui:IPHint>
-        <mdui:DomainHint>restena.lu</mdui:DomainHint>
-        <mdui:DomainHint>lu</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:49.50,6.00</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>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</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>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clueless.restena.lu/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://clueless.restena.lu/simplesamlphp/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">RESTENA Foundation</md:OrganizationName>
-    <md:OrganizationName xml:lang="fr">Fondation RESTENA</md:OrganizationName>
-    <md:OrganizationName xml:lang="de">Stiftung RESTENA</md:OrganizationName>
-    <md:OrganizationName xml:lang="lb">Steftung RESTENA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RESTENA Staff</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.restena.lu/restena/en/EN-Presentation.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.restena.lu/restena/fr/FR-Presentation.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>RESTENA</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@restena.lu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cma-shibboleth.csum.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/cma-shibboleth.csum.edu-idp-shibboleth.xml
deleted file mode 100644
index 48c1228f..00000000
--- a/swamid-interfederations-2.0/cma-shibboleth.csum.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,92 +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://cma-shibboleth.csum.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">csum.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California Maritime Academy</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>
-MIIDTDCCAjSgAwIBAgIJANGfo3/EFOaFMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2NtYS1zaGliYm9sZXRoLmNzdW0uZWR1MB4XDTEwMDUwNzIyMTMzOVoXDTEz
-MDUwNjIyMTMzOVowIjEgMB4GA1UEAxMXY21hLXNoaWJib2xldGguY3N1bS5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDgkG1bWSQW5CqTAcVhu4qi
-ukj7tA5Fy71+hPMjlcPut/HVGzFbC50yykZlrBETKZHs/uQvhFTNf/pyMbpgLNNg
-9HLDFh9XRDrff5cod3hLbP9YMUJWRwTEotHPGSIzpEnJEQ49FR5GljJZk42HVqry
-/N17pgseO6Ye54aGrGUgmmulhb1w15yQ+IF6NH1mMmN1UfqL9HDQRe0ict+rT0cs
-Q3T/vWtFnEMYivWDKbUMkmFDbADdxRAHyk1XmY2s6evaq9zq43ZN6Nrx4Z+w8ogF
-ZuOxAA3uqUFwzb0RYnkQJagn14taxYsqdG3s938v8moUoEJQH30WAqhjRnwqGRAt
-AgMBAAGjgYQwgYEwHQYDVR0OBBYEFM7EOttJXwWxNIfeiwsYeQR0YQrCMFIGA1Ud
-IwRLMEmAFM7EOttJXwWxNIfeiwsYeQR0YQrCoSakJDAiMSAwHgYDVQQDExdjbWEt
-c2hpYmJvbGV0aC5jc3VtLmVkdYIJANGfo3/EFOaFMAwGA1UdEwQFMAMBAf8wDQYJ
-KoZIhvcNAQEFBQADggEBAETxTbMfKsLKSuqv3vWZYB38XgGQOBZqOCgk5KHnWe9V
-2PggyG73lnr1s4yQHPxot6uK2sP6eYLjaIx/dPTJTivoXJAkECjnTWTWxnJVzh+k
-cZn4KdKgZlqTzIgBzPRpTl5kgBJf/wI38ecaAoWpDBTwrlrETJmE9v0mYnrhdX0u
-fDftIxBbFSfRQ2Qk+jYIHEPSYTGef56YLZkHrA5ohZ5G6rHpFMhIfbea843NZ3ZN
-3hevks7qbycgvP92CH/zLffB39C1ajsstCrmdjbU1m6/MXBYzz4lY9CtI0PIPvgd
-eKdMuCgiKOUaEFR8gBOgGbpc3cDVXi0J1zwnq4+eKy4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cma-shibboleth.csum.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cma-shibboleth.csum.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cma-shibboleth.csum.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cma-shibboleth.csum.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cma-shibboleth.csum.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csum.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIJANGfo3/EFOaFMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2NtYS1zaGliYm9sZXRoLmNzdW0uZWR1MB4XDTEwMDUwNzIyMTMzOVoXDTEz
-MDUwNjIyMTMzOVowIjEgMB4GA1UEAxMXY21hLXNoaWJib2xldGguY3N1bS5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDgkG1bWSQW5CqTAcVhu4qi
-ukj7tA5Fy71+hPMjlcPut/HVGzFbC50yykZlrBETKZHs/uQvhFTNf/pyMbpgLNNg
-9HLDFh9XRDrff5cod3hLbP9YMUJWRwTEotHPGSIzpEnJEQ49FR5GljJZk42HVqry
-/N17pgseO6Ye54aGrGUgmmulhb1w15yQ+IF6NH1mMmN1UfqL9HDQRe0ict+rT0cs
-Q3T/vWtFnEMYivWDKbUMkmFDbADdxRAHyk1XmY2s6evaq9zq43ZN6Nrx4Z+w8ogF
-ZuOxAA3uqUFwzb0RYnkQJagn14taxYsqdG3s938v8moUoEJQH30WAqhjRnwqGRAt
-AgMBAAGjgYQwgYEwHQYDVR0OBBYEFM7EOttJXwWxNIfeiwsYeQR0YQrCMFIGA1Ud
-IwRLMEmAFM7EOttJXwWxNIfeiwsYeQR0YQrCoSakJDAiMSAwHgYDVQQDExdjbWEt
-c2hpYmJvbGV0aC5jc3VtLmVkdYIJANGfo3/EFOaFMAwGA1UdEwQFMAMBAf8wDQYJ
-KoZIhvcNAQEFBQADggEBAETxTbMfKsLKSuqv3vWZYB38XgGQOBZqOCgk5KHnWe9V
-2PggyG73lnr1s4yQHPxot6uK2sP6eYLjaIx/dPTJTivoXJAkECjnTWTWxnJVzh+k
-cZn4KdKgZlqTzIgBzPRpTl5kgBJf/wI38ecaAoWpDBTwrlrETJmE9v0mYnrhdX0u
-fDftIxBbFSfRQ2Qk+jYIHEPSYTGef56YLZkHrA5ohZ5G6rHpFMhIfbea843NZ3ZN
-3hevks7qbycgvP92CH/zLffB39C1ajsstCrmdjbU1m6/MXBYzz4lY9CtI0PIPvgd
-eKdMuCgiKOUaEFR8gBOgGbpc3cDVXi0J1zwnq4+eKy4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cma-shibboleth.csum.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cma-shibboleth.csum.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California Maritime Academy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California Maritime Academy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.csum.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Walter Abarca</md:GivenName>
-    <md:EmailAddress>ITchange@csum.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cmi-nuig.calpendo.com-shibboleth.xml b/swamid-interfederations-2.0/cmi-nuig.calpendo.com-shibboleth.xml
deleted file mode 100644
index 253bfc26..00000000
--- a/swamid-interfederations-2.0/cmi-nuig.calpendo.com-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://cmi-nuig.calpendo.com/shibboleth">
-  <!--
-		This is a "Calpendo for National University of Ireland Galway" Shibboleth SP for Exprodo Software 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="2015-09-14T14:31:19Z">
-      <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://cmi-nuig.calpendo.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://cmi-nuig.calpendo.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://cmi-nuig.calpendo.com/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Calpendo for National University of Ireland Galway</mdui:DisplayName>
-        <mdui:Logo height="100" width="271">https://downloads.exprodo.com/images/exprodo-software_271x100.png</mdui:Logo>
-        <mdui:Description xml:lang="en">Core facility management, booking system and web-based database for research/clinical facilities.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHDCCAgSgAwIBAgIJALCR79ZDW2xvMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHNoaWIuZXhwcm9kby5jb20wHhcNMTUwNjIyMTUyMTAxWhcNMjUwNjE5MTUy
-						MTAxWjAbMRkwFwYDVQQDExBzaGliLmV4cHJvZG8uY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAlihJNaZPZ3oGM5NQlpgwJUJxlWZ8rbWrx9Kk5rPB
-						4Fb0C6CH+YIOKHb9sxVXPL5Vi9JypYE0Y7JRFEKf7qzbFNTEDAKhq0hjJ+XMWiVq
-						PJjbKYW4LJtM05DoPpTe/gKZJRaktGUDGu8m5ifLtd7klhFQmV0duDriDEPiW4ik
-						LeYZGiReIkvWSx4kFnQbERYuyrjXPOnhKw8pnv4HuzR/Js4tmUQbMy9VPbjbWSET
-						o2x9TfCubitIiOguXNGU8hcOv+ys/sWKTddPQ8208qpsfQLo+YSm9NmYDn3bJ3tg
-						SdA/9OTLJSjTZrz7RUZUeCYF/yv0vhRpicDDg1Ym8kdtCQIDAQABo2MwYTBABgNV
-						HREEOTA3ghBzaGliLmV4cHJvZG8uY29thiNodHRwczovL3NoaWIuZXhwcm9kby5j
-						b20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU7xBaV9vU2BCTDlQLhTkL5L6/1ckwDQYJ
-						KoZIhvcNAQEFBQADggEBAChUHGR1vS+giyhBJLy6gvfWFpfmo6dJlVn9zTIiztus
-						SNX3AR7Xe3KLO+YV/8r1vUz5WO+xnUwFQd7Et20M5oeeZqbDqyPJqynepUZ3NeE5
-						GfzERa8Rdvr6t6HoY0H19u0IMiMemtxQpFDt2uLtkawJLw7L3A2hUdbVta8MyUAQ
-						7WV7raxbNae56DlNuivOY2kkEl9T39xiLNpQ4cHtB2Z1uGLxPcE49j1AzfAM5ugk
-						29ai5m2neGiTzsvlEvw88pW7CMGcfZEPNsDA4zbQNTAu0FYIhrP60+OifLLZoMen
-						lT/unHR4GJe4dtKbypAo6cvgW2Uu7aCV0wO0ni7MiCE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://cmi-nuig.calpendo.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cmi-nuig.calpendo.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">Calpendo for National University of Ireland Galway</ServiceName>
-      <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">Exprodo Software Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Calpendo for National University of Ireland Galway</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.exprodo.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Robinson</SurName>
-    <EmailAddress>mailto:paul@exprodo.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Robinson</SurName>
-    <EmailAddress>mailto:paul@exprodo.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cmu-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/cmu-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 782cd21e..00000000
--- a/swamid-interfederations-2.0/cmu-shib.hosted.exlibrisgroup.com-shib.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://cmu-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "Cardiff Metropolitan University - Primo" Shibboleth SP for Ex Libris (UK) 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="2015-09-21T10:10:11Z">
-      <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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cardiff Metropolitan University - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of Cardiff Metropolitan University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAKKaSFTxV8dnMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwNDEwHhcNMTUwOTA5MTQ1NzE3WhcNMjUwOTA2MTQ1NzE3WjASMRAw
-						DgYDVQQDEwdhaW8wMDQxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						7HenNoKW0sOzOSke2fmV1ttG/lSbImzvmxlxS5EW6o2Nh01usJSdf3ImvVCPEut1
-						0Yn2uN/tXs+aU+nL3fyF5jFZCv6E134FkmJ/cWQj+cNWjlrlt0BB2m42Zzy/pdtv
-						FAtQ36NfwmAVmhY+ceSktAKu783KGXQ5e9h/BZLHCojYT7vWHVINI0GIQymKJHm7
-						HrGXw50/HlCkTVAzKOcnvgmbnQQaPEd4/8OWyn9DfQoICt0PdXLOC5nyBRXfJeaq
-						4JjZGPRq4Au4Dxgd0eWnjSnBHM4bscmwea4Pu37yfHdR2ayUmAU4bytT/+j0WdkU
-						QQDNkO3GT0742gl3x4iQ4wIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDQxMB0G
-						A1UdDgQWBBS3KSf/jmUF/5mPQMRe2U33IJwb/zANBgkqhkiG9w0BAQUFAAOCAQEA
-						0B9MYZK5HPyBkupXmCZ4bcWl/MN7m8CiVNeNqSJIsDvYYJz1jTr2FMIwY+xupjtK
-						dDpowahzmGwZaZtgb0PUynPOjZvcYvauSKni5NNii1R3MaGiw4sT7qusccl8aTcb
-						V5MRLYCeOvv2R5JA14kmLUko3QVlAi3Vetz/Q60BREl2g1rc5KLsN8vkD8iHlmqt
-						6Zh+TeL2kcw9MHTCHhPD7h1u4dEAuq827QzHqcTeJRPIrJOyDbuwTbBT6Xe9roY9
-						fIcDUibGOVOFVQkAUqV2gNUJfQgqkfbQGQJjeD3b7zNwTbpMaXwt/LCVNIJaWrwL
-						bzjnfQcDrmHF1208OcY8Hw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cmu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff Metropolitan University - Primo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cnb.rediris.es.xml b/swamid-interfederations-2.0/cnb.rediris.es.xml
deleted file mode 100644
index bd0f805f..00000000
--- a/swamid-interfederations-2.0/cnb.rediris.es.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://cnb.rediris.es/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CNB RedIRIS Test IDP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">CNB RedIRIS Test IDP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Another test IdP run by RedIRIS</mdui:Description>
-        <mdui:Description xml:lang="es">Otro IdP de pruebas operado por RedIRIS</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEpzCCA4+gAwIBAgIJAKu9NNxZYzTvMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1p
-ZGRsZXdhcmUxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzMB4XDTExMDYwODA5MTAwMVoXDTIxMDYwNzA5MTAwMVowgZMxCzAJBgNVBAYTAkVTMQ8wDQYDVQQIEwZNYWRyaWQxDzANBgNVBA
-cTBk1hZHJpZDEQMA4GA1UEChMHUmVkSVJJUzETMBEGA1UECxMKTWlkZGxld2FyZTEbMBkGA1UEAxMSZWR1Z2Fpbi5yZWRpcmlzLmVzMR4wHAYJKoZIhvcNAQkBFg9zaXJpQHJlZGlyaXMuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI
-aZm1UV2iTIb326tmnsaekltjP+5M9MoIUiLxIWOfLk6xK5+UeGnRlpSbVyIUS1afgRWprqAJ33iDimXBYnzWYKeM+DHktiAvTl9l6kh987g/rUCo6rZ0MrCdOu8GKqGmZNGo4/SNjRAFiMHj8CdM4N/e/5GCHDvS6YdsptoSHoanL5oYYx6nJUKXph8HLO
-3Sr/i/K9qIXek81X/zIsDNAkLj5wZeDt+TosoIOHzwUIpRrHVnvO/7Piu30ozu3fGOqRfHJIHDzJaNZCDBkzkkYCWD+39oVsbIwH4xSGhSsm5JuzCCL5QTzwbaJiUA/EfgV1Zzvv4bQjJmbBooHh8JAgMBAAGjgfswgfgwHQYDVR0OBBYEFKcD1MJGTvTW
-HgotuF7InFEAxve4MIHIBgNVHSMEgcAwgb2AFKcD1MJGTvTWHgotuF7InFEAxve4oYGZpIGWMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1pZGRsZXdhcm
-UxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzggkAq7003FljNO8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYBRPKs5uhS4H6U8CHfYnZvz30s/64YoJlx688mZEfDKiYD2f
-cIeMaQ3b5ps9DAJlvc4Wx+2xrTrNfGqW7FVVJrL9ezRLUJox98fBlxB06de1K3J6fgqLKjKbcR5i1NjkFZYTBSs8Vn32SQoW36r9Yus5bO1XORUeEJAK3E4CWiEvqjE745PERA79V84JSWMqojqY5d66hJoGz0PvgP0TD7J+f+AH+Ot/vrJ21w8od/wob+
-MUM7mQMtsSb2Dbo1+XGLEIixU5ypiSl3vw/HNvUrIWzVD/eKvQyNbzWJu5/BIlwpqHoQXPkZFzap6KZFnYz747AG0EmZYL9xQR59Mk0w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEpzCCA4+gAwIBAgIJAKu9NNxZYzTvMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1p
-ZGRsZXdhcmUxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzMB4XDTExMDYwODA5MTAwMVoXDTIxMDYwNzA5MTAwMVowgZMxCzAJBgNVBAYTAkVTMQ8wDQYDVQQIEwZNYWRyaWQxDzANBgNVBA
-cTBk1hZHJpZDEQMA4GA1UEChMHUmVkSVJJUzETMBEGA1UECxMKTWlkZGxld2FyZTEbMBkGA1UEAxMSZWR1Z2Fpbi5yZWRpcmlzLmVzMR4wHAYJKoZIhvcNAQkBFg9zaXJpQHJlZGlyaXMuZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI
-aZm1UV2iTIb326tmnsaekltjP+5M9MoIUiLxIWOfLk6xK5+UeGnRlpSbVyIUS1afgRWprqAJ33iDimXBYnzWYKeM+DHktiAvTl9l6kh987g/rUCo6rZ0MrCdOu8GKqGmZNGo4/SNjRAFiMHj8CdM4N/e/5GCHDvS6YdsptoSHoanL5oYYx6nJUKXph8HLO
-3Sr/i/K9qIXek81X/zIsDNAkLj5wZeDt+TosoIOHzwUIpRrHVnvO/7Piu30ozu3fGOqRfHJIHDzJaNZCDBkzkkYCWD+39oVsbIwH4xSGhSsm5JuzCCL5QTzwbaJiUA/EfgV1Zzvv4bQjJmbBooHh8JAgMBAAGjgfswgfgwHQYDVR0OBBYEFKcD1MJGTvTW
-HgotuF7InFEAxve4MIHIBgNVHSMEgcAwgb2AFKcD1MJGTvTWHgotuF7InFEAxve4oYGZpIGWMIGTMQswCQYDVQQGEwJFUzEPMA0GA1UECBMGTWFkcmlkMQ8wDQYDVQQHEwZNYWRyaWQxEDAOBgNVBAoTB1JlZElSSVMxEzARBgNVBAsTCk1pZGRsZXdhcm
-UxGzAZBgNVBAMTEmVkdWdhaW4ucmVkaXJpcy5lczEeMBwGCSqGSIb3DQEJARYPc2lyaUByZWRpcmlzLmVzggkAq7003FljNO8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYBRPKs5uhS4H6U8CHfYnZvz30s/64YoJlx688mZEfDKiYD2f
-cIeMaQ3b5ps9DAJlvc4Wx+2xrTrNfGqW7FVVJrL9ezRLUJox98fBlxB06de1K3J6fgqLKjKbcR5i1NjkFZYTBSs8Vn32SQoW36r9Yus5bO1XORUeEJAK3E4CWiEvqjE745PERA79V84JSWMqojqY5d66hJoGz0PvgP0TD7J+f+AH+Ot/vrJ21w8od/wob+
-MUM7mQMtsSb2Dbo1+XGLEIixU5ypiSl3vw/HNvUrIWzVD/eKvQyNbzWJu5/BIlwpqHoQXPkZFzap6KZFnYz747AG0EmZYL9xQR59Mk0w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://cnb.rediris.es/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://cnb.rediris.es/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">RedIRIS</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">RedIRIS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RedIRIS</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">RedIRIS</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SIR helpdesk</md:GivenName>
-    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/coastline.instructure.com-saml2.xml b/swamid-interfederations-2.0/coastline.instructure.com-saml2.xml
deleted file mode 100644
index 7874dc33..00000000
--- a/swamid-interfederations-2.0/coastline.instructure.com-saml2.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="http://coastline.instructure.com/saml2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">OEI - Coastline Community College - Canvas</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.canvaslms.com/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.canvaslms.com/policies/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="220" width="220" xml:lang="en">https://canvas.instructure.com/images/canvas/header_canvas_logo@2x.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE8TCCA9mgAwIBAgIJAOBms/PYWcPLMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-VQQGEwJVUzENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkx
-GTAXBgNVBAoTEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsTCk9wZXJhdGlvbnMx
-IDAeBgNVBAMTF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
-FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE1MDQxNTAxMDAwMFoXDTE3MDQyMjAx
-MDAwMFowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRVdGFoMRcwFQYDVQQHEw5T
-YWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
-CxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
-IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDckDPQGWedlVGC2Z9fn1wNFmN+0IPNi6OSE1nM
-voTWx2oZlQepaAu4zI5QqOfnV0rW2V1volpoJbu0WelH0DkGzdOEQdWJjAs3nRBf
-y0evxtpg0tK5kIvGsnN6YcD41YmkfWzvwbMf0cEq1Y0wCmymF6XzOUUE4zsi0nhP
-m2Z7WiuongDQdR01UsDN13YcpD/i1JXr3YtkNnJ/a1Kc9OXNycI8M5NVo5QQgdx/
-Q7zAmTk8p9E0ZRthdOQ/PBicWx39mNmBij5KpqCWlHu3NWdgcG8KXSv5atXU8Crd
-TRJ3aGIEN9vBYIHe8MHGCzs1QlRfJmXFMkeUSOTnJJx78rMDAgMBAAGjggEUMIIB
-EDAdBgNVHQ4EFgQUo0WWVlJ1SxZOs11L85ZAuZGyuzEwgeAGA1UdIwSB2DCB1YAU
-o0WWVlJ1SxZOs11L85ZAuZGyuzGhgbGkga4wgasxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIEwRVdGFoMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5z
-dHJ1Y3R1cmUsIEluYzETMBEGA1UECxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2Fu
-dmFzIFNBTUwgQ2VydGlmaWNhdGUxIjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVj
-dHVyZS5jb22CCQDgZrPz2FnDyzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
-A4IBAQBV3EmmnzYqYQ5fXNZymG2WaspEW0NeFMhDXa3p3AMIQJbnnU14lR7bqIvf
-/bLW1YE0fw1kSzsw8VrkQp7k1U+kaYA3i5/FQBy2WtqUCVq2GXZA2gs5YD4nvJB/
-F57E//0kEhbATZH9+wJqDkqyIgsrSIlJjiXDth1BppGK8weboPtr9sWV24Ui0+ls
-w16XTsGlnRRO19g+gXKOZp5ApXkDrB+HwZQvZxiCuSgvJlcBzMdxVvWSL+vPtg8Y
-shIKzobIhaQ2MzXHLcxrDhW10YFPwDXh8Tfn5iU9ONsaJivuvVhtDYZD1ZzSoPpm
-q4vYqxxY/6rFJhrCtnlLepSaxlXM
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coastline.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coastline.test.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coastline.beta.instructure.com/login/saml/logout"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coastline.instructure.com/saml_consume" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coastline.instructure.com/login/saml" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coastline.beta.instructure.com/saml_consume" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coastline.beta.instructure.com/login/saml" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coastline.test.instructure.com/saml_consume" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coastline.test.instructure.com/login/saml" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">OEI - Coastline Community College - Canvas</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Instructure, Inc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Instructure, Inc</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.instructure.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/coco.aai.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/coco.aai.niif.hu-shibboleth.xml
deleted file mode 100644
index e543b972..00000000
--- a/swamid-interfederations-2.0/coco.aai.niif.hu-shibboleth.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://coco.aai.niif.hu/shibboleth">
-  <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>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>href-test</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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="hu">SP for eduGAIN attribute release checker - CoCo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">SP for eduGAIN attribute release checker - CoCo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SP for eduGAIN attribute release checker - CoCo</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">SP for eduGAIN attribute release checker - CoCo</mdui:Description>
-        <mdui:Description xml:lang="en">SP for eduGAIN attribute release checker - CoCo</mdui:Description>
-        <mdui:Description xml:lang="el">SP for eduGAIN attribute release checker - CoCo</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">https://earc.eduid.hu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://earc.eduid.hu/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwjCCAiugAwIBAgIJANMM+XZzl/bmMA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGTAXBgNVBAMTEGNvY28uYWFpLm5paWYuaHUwHhcNMTUxMTAzMTkwODIwWhcNMjUxMDMxMTkwODIwWjBLMQswCQYDVQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxDjAMBgNVBAoTBU5JSUZJMRkwFwYDVQQDExBjb2NvLmFhaS5uaWlmLmh1MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDDV7RkLxXksjYxez3dO9M1UL9/0gURNqoRVvNvq9V1suhVrGXY9chcpA9C2dlTQNt9iRL6yR1hRSuPpYDDn1hVh42JAEwThVLcqa0j5KP2LDllJWT3xOzNgt/aECwHPEfcBNsEzoBdJqBehIpR8xvhLNn+oMc8aPh4xodpr9jXvQIDAQABo4GtMIGqMB0GA1UdDgQWBBR2MWXwHsg2Dv9ECmxdP82LFKH59DB7BgNVHSMEdDBygBR2MWXwHsg2Dv9ECmxdP82LFKH59KFPpE0wSzELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MQ4wDAYDVQQKEwVOSUlGSTEZMBcGA1UEAxMQY29jby5hYWkubmlpZi5odYIJANMM+XZzl/bmMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAwQmrknKXTn6jIeUf+5pk8MN689p1FfWL8VS9QjKPHsJ9C8DA/x6KfbD/AS2N7LRNDEGiAE/xeaidm3WplcImXgzkNXz6AhxloqPOKte/f0kF1F4YcCQ6eGS5h76CFpLMmUki3lneb+dAIPSQ1EXI63ClZ1DBRxkgU5530rxSYjQ=</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>coco.aai.niif.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coco.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coco.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coco.aai.niif.hu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coco.aai.niif.hu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coco.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://coco.aai.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coco.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://coco.aai.niif.hu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="hu">SP for eduGAIN attribute release checker - CoCo</md:ServiceName>
-      <md:ServiceName xml:lang="en">SP for eduGAIN attribute release checker - CoCo</md:ServiceName>
-      <md:ServiceName xml:lang="el">SP for eduGAIN attribute release checker - CoCo</md:ServiceName>
-      <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="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="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/colaboratorio.redclara.net-shibboleth.xml b/swamid-interfederations-2.0/colaboratorio.redclara.net-shibboleth.xml
deleted file mode 100644
index 58717584..00000000
--- a/swamid-interfederations-2.0/colaboratorio.redclara.net-shibboleth.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://colaboratorio.redclara.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cofre.reuna.cl" registrationInstant="2015-06-25T00: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://colaboratorio.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://colaboratorio.redclara.net/Shibboleth.sso/DS" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Colaboratorio - RedCLARA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">Colaboratorio - RedCLARA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">RedCLARA's Colaboratorio Service</mdui:Description>
-        <mdui:Description xml:lang="es">Servicio de Colaboratorio 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>redclara.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
-MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
-bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
-cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
-RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
-l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
-/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
-UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
-amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
-AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
-G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
-ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
-dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
-cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
-KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
-BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
-bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
-ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
-DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
-8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
-MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
-I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
-yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
-s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
-</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>redclara.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
-MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
-bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
-cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
-RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
-l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
-/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
-UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
-amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
-AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
-G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
-ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
-dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
-cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
-KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
-BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
-bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
-ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
-DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
-8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
-MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
-I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
-yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
-s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://colaboratorio.redclara.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://colaboratorio.redclara.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://colaboratorio.redclara.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colaboratorio.redclara.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://colaboratorio.redclara.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://colaboratorio.redclara.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://colaboratorio.redclara.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colaboratorio.redclara.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://colaboratorio.redclara.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://colaboratorio.redclara.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://colaboratorio.redclara.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://colaboratorio.redclara.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://colaboratorio.redclara.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://colaboratorio.redclara.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://colaboratorio.redclara.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Colaboratorio - RedCLARA</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Colaboratorio - RedCLARA</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="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:AttributeConsumingService>
-  </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/collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 16878f2a..00000000
--- a/swamid-interfederations-2.0/collectionsmanager.is.ed.ac.uk-shibboleth-sp.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://collectionsmanager.is.ed.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Collections Manager" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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-08-15T13:43:53Z">
-      <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://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Edinburgh Collections Manager Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">DSpace installation for managing the University
-				of Edinburgh collection level descriptions and collection items.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJALy03M7u1gVPMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2xhYy1yZXBvLWxpdmUxMS5pcy5lZC5hYy51azAeFw0xNDA4MTExNjE2MDVa
-						Fw0yNDA4MDgxNjE2MDVaMCYxJDAiBgNVBAMTG2xhYy1yZXBvLWxpdmUxMS5pcy5l
-						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxmqAyAZJll
-						NsHWH/yK4hSEiqk/Ln1dF9FktB5rzP7FaUWIYL/Q9Igqr8UDqRBi+KTTFePHhi8k
-						H3E8Yh473ej0a1d2s2DtMIzVNjXMMaQxEksZGADtPp00L6SrvYZAtb5gIT71nATb
-						SIaoZWH2hyO9Ods6zhwU6uv4xogyHiL1Kmxz9jecJ/xIwXmn2twFgrLpRtjrHhzl
-						XYrDlSRX49rVsB4Ey8dBPGTgkfbJbk4ZkxFnKMOw9Lw0GBoVWtY7Vn9RPWbISPD/
-						+4y3CTwJbnljeJpZey0KTrOkHXQ8GqRBswEYJCHWBVrH6cmgdnGnciDnN1TttSOF
-						JM9XR+AgFfMCAwEAAaNJMEcwJgYDVR0RBB8wHYIbbGFjLXJlcG8tbGl2ZTExLmlz
-						LmVkLmFjLnVrMB0GA1UdDgQWBBQ1Ofx7Y4foN2eFktuJ0I1n+WcNJzANBgkqhkiG
-						9w0BAQUFAAOCAQEAjuI/UTy4EX8iQHPxVWxioob3+ORavEe+FX3sAEsfPeTNaFt2
-						bf1iFA90DwZBDLPAhUgGiMegR/qb6Uh+m7y4GznSK3esxyjssxuDSPpO2yipw2Pb
-						5M0dhW7gGi6CK0jWi/91WMNytDCW4RbTGDEXLBGO344Mhmbu163V0a656/Gub1hz
-						XlShSl3z0t8E32ipwG2X9d8JTAaqHtcdW001sfyAibFQh2y8a7ozLCQHmSXUcFde
-						NOR1PCznRoAlRPp4Wd8nBVPDNbHIzHT7QkYmx3iKPYKZXRMR7icUh6vyzUxskdjr
-						p1m+/fC5uLdMuu57gH/cV696hZae6vVbcI2R2g==
-					</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://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh Collections Manager</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Information Systems</GivenName>
-    <EmailAddress>mailto:information.systems@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Library Digital Development Team</GivenName>
-    <EmailAddress>mailto:lddt@mlist.is.ed.ac.uk</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 abb69679..00000000
--- a/swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://colreg.de.dariah.eu/colreg">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-12T10:39: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>
-    <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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://colreg.de.dariah.eu:443/colreg/saml/login/alias/colreg.de.dariah.eu" 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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-Artifact" Location="https://colreg.de.dariah.eu:443/colreg/saml/SSO/alias/colreg.de.dariah.eu" index="0"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Collection Registry</md:ServiceName>
-      <md:ServiceName xml:lang="en">Collection Registry</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Collection Registry</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Collection Registry</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tobias</md:GivenName>
-    <md:SurName>Gradl</md:SurName>
-    <md:EmailAddress>mailto:tobias.gradl@uni-bamberg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Dariah</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/commons.lbl.gov-sp-shibboleth.xml b/swamid-interfederations-2.0/commons.lbl.gov-sp-shibboleth.xml
deleted file mode 100644
index 75caf7b6..00000000
--- a/swamid-interfederations-2.0/commons.lbl.gov-sp-shibboleth.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://commons.lbl.gov/sp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://commons.lbl.gov/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Berkeley Lab Commons</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Berkeley Lab Commons is the Lawrence Berkeley National Laboratory's enterprise wiki (Confluence)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://commons.lbl.gov/display/itdivision/Commons</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.lbl.gov/Disclaimers.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC9zCCAd+gAwIBAgIJAMFvgJRFOa3hMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGNvbW1vbnMyLmxibC5nb3YwHhcNMTAxMTA0MDAyMjQ5WhcNMjAxMTAxMDAy
-MjQ5WjAbMRkwFwYDVQQDExBjb21tb25zMi5sYmwuZ292MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAwRm530qhkb6e09J3QHgu7OuhnOeJ3VHN6DGXfmNc
-2b2/5ql79th6kpugJF5/Bxm1OYjK3bdEPGaG8yJ1utWZ14cPqFeHIh951cRkWU7L
-FJQ+yJPFKvMwmXmcGEqy1NFfFmCRQRC3WRkH7/Hp7WGRPkXWiLh4rUBPNKNzAXr4
-GhvQrQ2AN9bhChNa1zY08PvYucM2y78yQ7+FdMVXET2cDIPW6FzSBpHVBLwJ6Irh
-d2cdRUDSBVak+ZhnzpvLlf9LfsdUftHNyak6wCjnK8RjaTwFYrBGUZCE8BcD/yV1
-DGlpBhVNEq9e2EoKf2LBfwyDaMIZ72Eeu0mBdFZQjpWKWQIDAQABoz4wPDAbBgNV
-HREEFDASghBjb21tb25zMi5sYmwuZ292MB0GA1UdDgQWBBQd8cXLi8vWArhLTP46
-W9mLkn2wtTANBgkqhkiG9w0BAQUFAAOCAQEAVKXVe1GfD2rFtVhgA4rveGs6uwqs
-8O0JGBGvmd9FYVjaRQDaOTvqjiszasu+UWi2vFV5EGZxaqTYqjJ4Lhp2wUj2QO5i
-q7EJsdUsN4tLJITWjslojXyRJSWEpZLtV8zwfK+jQSL3x83Hw0odz4rFm0dOSpeP
-YJpo1KfvO/6SkHOHgNILhH7hgl+a0GxaeLslNfdKBrhShuO2biVvr7Z4gJvG+V0A
-8zm3+1KQvoPGwJQpRH1w9JWsereq+l6RO8mL07n3KOf+R18aD1z27hgrB2xnXRvJ
-y5ro/o5ZL+nrpKyCIDL0mIb1ZgA7Zu+R0m1wrHPSQrQjjw1R7aA/7XL8jg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://commons.lbl.gov/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://commons.lbl.gov/Shibboleth.sso/SAML2/ECP" index="2"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Berkeley Lab Commons</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Berkeley Lab Commons is the Lawrence Berkeley National Laboratory's enterprise wiki (Confluence)</md:ServiceDescription>
-      <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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lbl.gov/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Julie Petersen</md:GivenName>
-    <md:EmailAddress>jmpetersen@lbl.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Greg Haverkamp</md:GivenName>
-    <md:EmailAddress>gahaverkamp@lbl.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 291ba677..00000000
--- a/swamid-interfederations-2.0/community.ja.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://community.ja.net/shibboleth">
-  <!--
-		This is "The Janet Community" 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#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="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"/>
-      <init: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.jisc.ac.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://community.ja.net/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://community.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
-      <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>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://community.ja.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <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"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://community.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community.jisc.ac.uk/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"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://community.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://community.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://community.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://community.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
-  </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/community.staging.company.ja.net-shibboleth.xml b/swamid-interfederations-2.0/community.staging.company.ja.net-shibboleth.xml
deleted file mode 100644
index 37de6781..00000000
--- a/swamid-interfederations-2.0/community.staging.company.ja.net-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://community.staging.company.ja.net/shibboleth">
-  <!--
-		This is "The Janet Community (Staging)" Shibboleth 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="2013-01-25T19:22:17Z">
-      <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-stg.jisc.ac.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://community-stg.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The Janet Community (Staging)</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="95" width="191">https://community.staging.company.ja.net/sites/all/themes/janetcommunity/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXjCCAkagAwIBAgIJAOCcPdISR/MjMA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
-						BAMTIGNvbW11bml0eS5zdGFnaW5nLmNvbXBhbnkuamEubmV0MB4XDTEzMDEyNTEy
-						NTE0NFoXDTE2MDEyNTEyNTE0NFowKzEpMCcGA1UEAxMgY29tbXVuaXR5LnN0YWdp
-						bmcuY29tcGFueS5qYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDPWOgoD8BXAEbRvLeICCdeiSCtGd5TnC1m8hSMOa26LsKP0zjhV7HrQREdfmLD
-						htdce5T+2xBjw1zXNOiD1AjkL+2cjpHdvroHjBIKd+XK8IvuXbTFwHKlD+YT7YHg
-						vlUsgndFVGLTWgIWB4cqjP4nHjNSv4oICe9qD5IhfCy7P45mjHYRZLS59mvQsNNU
-						fmJ5Gtxh93Ga57AWBGhj/rAWbH+lLZCUHDJw91BJf2NYtptTmiMBAmCwVFWrS5kL
-						77cRQRVjxmONjSVrnoUQObyQoCcMfDFa4i1MfT3pVUeNKufvozw3Bo6l0dNL0LBO
-						g/qNDWjewq5XvYPAFJN4zbt5AgMBAAGjgYQwgYEwYAYDVR0RBFkwV4IgY29tbXVu
-						aXR5LnN0YWdpbmcuY29tcGFueS5qYS5uZXSGM2h0dHBzOi8vY29tbXVuaXR5LnN0
-						YWdpbmcuY29tcGFueS5qYS5uZXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdtp8pIFT
-						ajJQn9wN8qKR9MRwlsIwDQYJKoZIhvcNAQEFBQADggEBAKgsVmXIr5EqZIsJTflv
-						/NK04PSwJC3Y4+A4A1mgcrMQBelas1HQxfFwK/ohUb2UOv8yqF3AXspbenHJqFqc
-						v1ndoEkICjewUoTpILMXz08vcwOU/qOlvIEuwBq49dnjTXYKQkb15hSSk3Q2bZ6T
-						SYSe6/NIbtrfcWdmvXCd71QyhYiLaB/9woO1Yb4jDQ9Fq9PWQd5bzEI0XsBfjbYj
-						a004CGcStT94SAmze/FE7w+YZtTANfHC41dhgEH/fwW0SJn/7Lb1d5uOhRiNM1p/
-						hrDiSI6b0gOx0wzz8NReyhFMG4Rk23HGJSUUwsZ05AFPGJbwAShqnvbVLajVIRnB
-						igk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community-stg.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://community-stg.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://community-stg.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community-stg.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community-stg.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://community-stg.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://community-stg.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://community-stg.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://community-stg.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://community-stg.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://community-stg.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.staging.company.ja.net/Shibboleth.sso/SAML2/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.staging.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.staging.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.staging.company.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.staging.company.ja.net/Shibboleth.sso/SAML/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.staging.company.ja.net/Shibboleth.sso/SAML/Artifact" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Janet Community (Staging)</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/conext.authenticatie.ru.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/conext.authenticatie.ru.nl-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index f2da9224..00000000
--- a/swamid-interfederations-2.0/conext.authenticatie.ru.nl-simplesaml-saml2-idp-metadata.php.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://conext.authenticatie.ru.nl/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Radboud Universiteit</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Radboud University</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">An IdP operated by Radboud University Nijmegen</mdui:Description>
-        <mdui:Description xml:lang="en">An IdP operated by Radboud University Nijmegen</mdui:Description>
-        <mdui:Logo height="26" width="120">https://static.surfconext.nl/logos/idp/radboudlogo120.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">university nijmegen ru</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">universiteit nijmegen ru</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/0d04b328623873aa5fb671116f91cb73"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Radboud Universiteit</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Radboud University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Radboud Universiteit</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Radboud University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.ru.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ru.nl/english/</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/confluence.dev.ja.net-shibboleth.xml b/swamid-interfederations-2.0/confluence.dev.ja.net-shibboleth.xml
deleted file mode 100644
index afef9fdd..00000000
--- a/swamid-interfederations-2.0/confluence.dev.ja.net-shibboleth.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://confluence.dev.ja.net/shibboleth">
-  <!--
-		This is a "Confluence test service" 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="2013-12-13T11:47:29Z">
-      <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://confluence.dev.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://confluence.dev.ja.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAINQcR2x7+fRMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWNvbmZsdWVuY2UuZGV2LmphLm5ldDAeFw0xMzEyMDMxNTQzNTRaFw0yMzEy
-						MDExNTQzNTRaMCAxHjAcBgNVBAMTFWNvbmZsdWVuY2UuZGV2LmphLm5ldDCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALuE9eH0J8KmfHm5kpnCkYXI25zf
-						plGq11UYrM2UhqOAQzWpjFjZEQSM+xY34aYjBVnILWFIGCzZYfYrQv1Do+FT7OeW
-						zi1C+cA15ZmqjknRU3A+EXBxqgKTtP9qFy3Wmn2bVkAm1bUnYZt9hg9JmEYmKYvR
-						+hoi9C4GiglaQbEtqhbTsYqENIUXZqu+6hLBECQfhfl6dQ7C59xDlad3XUr2D50R
-						HhrDVTu7b4SjGvYweefPSwQ9biXcbzpd8WQrdw06T9HlW2sSRsdzLcYwPCz3qhXC
-						t1HtCH9HEkHwGPihYEzT9tqXLlG3nVNPxt82BA5qz1akeM1a34OO4GFToOcCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVY29uZmx1ZW5jZS5kZXYuamEubmV0MB0GA1UdDgQW
-						BBSced8sVIHOO5PAAdVpmW3zTiQKuTANBgkqhkiG9w0BAQUFAAOCAQEAhK9miAEJ
-						SFqALhzBvd9bDDE0e+SRQ3ULnf50XcNi0kY0Aqd0E0LMApIAZc9JbPWj43LDfe6w
-						SGY2Szd5pA5BTQKrE2kbEJe/7JyzsSV8zEQoFvt6jB40/bdN9TqEytgo7vcZqVLS
-						8SZHDlmiFqLglKqnX5WMpq8+DAhoCJVT3P5ppBlHb5dmay42fZTENCzSZbQUXjOh
-						YOgItmfF6JHKzHGB3UozP/AKrt9qNmuV0TT80Qottl6+IunUqJpzp9NIG0JkERAy
-						iWQsQero8JtO2JsNUB0HjPqASOEw2kbQE6Ya6yrkcxq12t3QQYNN8O9uRKOGuDek
-						DmVGRHSIMGcD+A==
-					</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://confluence.dev.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://confluence.dev.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://confluence.dev.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.dev.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.dev.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://confluence.dev.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://confluence.dev.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.dev.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence.dev.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://confluence.dev.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://confluence.dev.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Confluence test service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://confluence.dev.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/connect-beta.sunet.se-shibboleth.xml b/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml
deleted file mode 100644
index 8d6a8ba4..00000000
--- a/swamid-interfederations-2.0/connect-beta.sunet.se-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://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">
-      <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.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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>
-      <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>connect-beta.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=connect-beta.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAPlfAgYiS2HzMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFWNvbm5lY3QtYmV0YS5zdW5ldC5zZTAeFw0xNDExMjkxMTE4NTVaFw0yNDEx
-MjYxMTE4NTVaMCAxHjAcBgNVBAMTFWNvbm5lY3QtYmV0YS5zdW5ldC5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANMhbRolAnPwqhMMJvS76dzc0tLp
-eEjwS5GTMFIZSic54pnHHEnBGgQAZkPmputFdioAV6eZw2qHAGvROcQTRk4jeIXo
-aULWXN9fNq+EZa/1SdzdtC3z5WqoyV+DYNWgOh0jI+iCh9mQpCEs8TtImWWZbVFY
-Uev5+Cf3wJCi5RMYSU6oBD0/zpHq/+7fDjXCs7Coe7q9o1mQqw08mDCH8/Gb+mgg
-UPjQWL6U7oGWBJ0s4Bclc9WPUQQQVE8C6wt+CvQw6Eg1maV2f28si3ez1ybZv27w
-XgH/pTnib1FmLWBTSETkFOZs4ZRxoKgU838lRUktc58CEGKQhwisaKqfd+ECAwEA
-AaNDMEEwIAYDVR0RBBkwF4IVY29ubmVjdC1iZXRhLnN1bmV0LnNlMB0GA1UdDgQW
-BBS4cKd+yNhVRbYHclbmpNeBJySm6TANBgkqhkiG9w0BAQUFAAOCAQEAHnWZUpzK
-FU+MdGvtwH249x7sQtj7mXSISsX1rnfy6M1Zz7SWtkSeFgijQvpNEDsIfRXtMApS
-zegZMJEAbnVQ9OVXcVD1zgoHdob0qjJ3KXlc/lByeosty1Q6TLI1NtGZzS23COmP
-H/AVOR5U++JOt28OOfoi7mtxOFPxkge3AooWLNFOEOGMSF78BG8NCrT0l59OnAtN
-3sN7PXo740wv8cQLou3/kv+NHOMwdhdiCTvY9JttcRsT55rHbWRpgDbqYTvyEhkD
-3Zul4UGjlp2ilyjkZqr+qOUEAdjC63hNBmNMEtJGi2vhEyi2BN+F1PfoB5mot7A0
-15RMslPZtWnEtQ==</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>connect-beta.sunet.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=connect-beta.sunet.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAPlfAgYiS2HzMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFWNvbm5lY3QtYmV0YS5zdW5ldC5zZTAeFw0xNDExMjkxMTE4NTVaFw0yNDEx
-MjYxMTE4NTVaMCAxHjAcBgNVBAMTFWNvbm5lY3QtYmV0YS5zdW5ldC5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANMhbRolAnPwqhMMJvS76dzc0tLp
-eEjwS5GTMFIZSic54pnHHEnBGgQAZkPmputFdioAV6eZw2qHAGvROcQTRk4jeIXo
-aULWXN9fNq+EZa/1SdzdtC3z5WqoyV+DYNWgOh0jI+iCh9mQpCEs8TtImWWZbVFY
-Uev5+Cf3wJCi5RMYSU6oBD0/zpHq/+7fDjXCs7Coe7q9o1mQqw08mDCH8/Gb+mgg
-UPjQWL6U7oGWBJ0s4Bclc9WPUQQQVE8C6wt+CvQw6Eg1maV2f28si3ez1ybZv27w
-XgH/pTnib1FmLWBTSETkFOZs4ZRxoKgU838lRUktc58CEGKQhwisaKqfd+ECAwEA
-AaNDMEEwIAYDVR0RBBkwF4IVY29ubmVjdC1iZXRhLnN1bmV0LnNlMB0GA1UdDgQW
-BBS4cKd+yNhVRbYHclbmpNeBJySm6TANBgkqhkiG9w0BAQUFAAOCAQEAHnWZUpzK
-FU+MdGvtwH249x7sQtj7mXSISsX1rnfy6M1Zz7SWtkSeFgijQvpNEDsIfRXtMApS
-zegZMJEAbnVQ9OVXcVD1zgoHdob0qjJ3KXlc/lByeosty1Q6TLI1NtGZzS23COmP
-H/AVOR5U++JOt28OOfoi7mtxOFPxkge3AooWLNFOEOGMSF78BG8NCrT0l59OnAtN
-3sN7PXo740wv8cQLou3/kv+NHOMwdhdiCTvY9JttcRsT55rHbWRpgDbqYTvyEhkD
-3Zul4UGjlp2ilyjkZqr+qOUEAdjC63hNBmNMEtJGi2vhEyi2BN+F1PfoB5mot7A0
-15RMslPZtWnEtQ==</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>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/connect.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/connect.ct.infn.it-shibboleth.xml
deleted file mode 100644
index 2c51279f..00000000
--- a/swamid-interfederations-2.0/connect.ct.infn.it-shibboleth.xml
+++ /dev/null
@@ -1,108 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://connect.ct.infn.it/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-12T06:20:52Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-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>
-  </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://connect.ct.infn.it/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://connect.ct.infn.it/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Adobe Connect provided by INFN Catania</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Adobe Connect erogato da INFN Catania</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is a web conferencing service that offers immersive online meeting experiences, from small group collaboration to large scale webinars, and includes an e-learning management system</mdui:Description>
-        <mdui:Description xml:lang="it">Si tratta di un servizio di web conferencing che permette di realizzare meeting on-line con una esperienze immersive completa, sia per piccoli gruppi che per webinar su larga scala, e include un sistema di gestione di e-learning</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://connect.ct.infn.it/fedDocs/service.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://connect.ct.infn.it/fedDocs/privacy-policy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEnjCCA4agAwIBAgIQR8HgFoEMcUI/Kf1rkIpd1DANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDExMjUwMDAwMDBaFw0xNzExMjQyMzU5NTlaMEAxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSY29ubmVjdC5jdC5p
-bmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp+bwrXD1pEdX
-5+2zu5Rx7ty41z1iYC9Ezddz44UfLblteqI2JJyXeykVtXS5c+EHg6Bjgs7EE5Y8
-1p5ET56va0Q08nkcYz6strIxPb4fkoaRbIe+1r0RlFxYkd/DqX8LT98xH6AsrYwi
-RhZ4i9ODH93z+NFzw0LrSNhBy1g+Ul1JZ8UiWnU03JGDHhExoYWBYlnaQrYNBIMQ
-iYt71elmORtnIJ4fKYoldwn4Wpu1umVd3Ywl9gXY/5MbF2G3u111gcj6dmrTozRb
-9ZcBBKvKumIlV6VcJYIt/C7Ia/aMIMzYTNbbgzq1hDMCT8utidE8MJxaAHEdOdiY
-kEE3l/VQZQIDAQABo4IBbjCCAWowHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GG
-KLD9tr0wHQYDVR0OBBYEFLvgAqEwKqOEH2MEM3NJCIM+ATL/MA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNy
-bDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRy
-dXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2Nz
-cC51c2VydHJ1c3QuY29tMB0GA1UdEQQWMBSCEmNvbm5lY3QuY3QuaW5mbi5pdDAN
-BgkqhkiG9w0BAQsFAAOCAQEAS51Poo7JRQ11Mh4Byz9VoWDFi/KW4qSkmzLlwV1h
-qIuxrhzfM2Creo045ACB/Kt9kLSQy4eZORY2tFxigO6QUo34/WXHaKSivwfiLD7L
-Q8U8vVLPF7oURSiEi562vIHSAujkrlXjV5b+In8KRGaeNz7YWtb/D2d9E3Dhwcug
-Tesm0DeA0lm/aXcgFBZkHlsv5cPjekHgNeucbNTWKvOw7SwF9rOwTtWgzVIbStpr
-UGAX0hfjfN0nh1VTB3uTzyA2bzdRgxZV+p7BRQIUc8wEaQOh5Xo9sc0eH8yNC06P
-TxwDvoKovgJyNC9DFgoVlWUxQNcW/HBYsGSDjT1xgWkyXw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <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#rsa-oaep-mgf1p"/>
-      <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/2009/xmlenc11#rsa-oaep"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://connect.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://connect.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://connect.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://connect.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://connect.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://connect.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Adobe Connect provided by INFN Catania</md:ServiceName>
-      <md:ServiceName xml:lang="it">Adobe Connect erogato da INFN Catania</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This is a web conferencing service that offers immersive online meeting experiences, from small group collaboration to large scale webinars, and includes an e-learning management system</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Si tratta di un servizio di web conferencing che permette di realizzare meeting on-line con una esperienze immersive completa, sia per piccoli gruppi che per webinar su larga scala, e include un sistema di gestione di e-learning</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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">INFN Catania</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">INFN Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Adobe Connect erogato da INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Adobe Connect provided by INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:connect-support@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:connect-support@ct.infn.it</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 1ea24c40..00000000
--- a/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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">
-      <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.swamid.se/category/nren-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</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>
-      <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>mailto: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 5f4f2534..00000000
--- a/swamid-interfederations-2.0/connect.sunet.se.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://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: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.tut.fi.xml b/swamid-interfederations-2.0/connect.tut.fi.xml
deleted file mode 100644
index e3db269a..00000000
--- a/swamid-interfederations-2.0/connect.tut.fi.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://connect.tut.fi/">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ao4.ee.tut.fi/Shibboleth.sso/DS" index="1"/>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE5zCCA8+gAwIBAgIQTC0sMFTDx+8bItkWKEE8EjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMDYwODAwMDAwMFoXDTEzMDYwNzIzNTk1OVowgcQxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUzMzcyMDESMBAGA1UECBMJUGlya2FubWFhMRAwDgYD
-VQQHEwdUYW1wZXJlMRwwGgYDVQQJExNLb3JrZWFrb3VsdW5rYXR1IDEwMSkwJwYD
-VQQKEyBUYW1wZXJlIFVuaXZlcnNpdHkgb2YgVGVjaG5vbG9neTEeMBwGA1UECxMV
-SHlwZXJtZWRpYSBMYWJvcmF0b3J5MRYwFAYDVQQDEw1hbzQuZWUudHV0LmZpMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw+q6HSeOwJOL+dhw2C6rmt+X
-XOC17rS4cqw/GK/MdcEB6OUGGnP7CVnMTt5i7kYRTE2xZZ4puXgunZc4djROOl5U
-9GpKJr1+PrBJ4bhZvJuuP+NGmk36dhPDelgGrl2g2t5Fdqm5gxLU7JBhDQcttbiQ
-Im4KCUD4RaYkVnt5LRb2XZ5rrfyNjphSr06HopVy77k3H0sd7uPlPg3fj1u6h3GB
-Uwd+/Gdle78H5VF75+uhPZvmI9IjRT8i0I0hIDTXrnKKM+hmYg/OZteb/eSxTdfD
-cAsm0hfk4C4+i7FeR2ODlY0kegMZEfFLFAxRH950TP2IfRhl7aFHbggQ9zB6XwID
-AQABo4IBYDCCAVwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYD
-VR0OBBYEFD7dPRIPwNod9MvHsOo3Ryx8sENGMA4GA1UdDwEB/wQEAwIFoDAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAE
-ETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1
-BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgG
-A1UdEQQRMA+CDWFvNC5lZS50dXQuZmkwDQYJKoZIhvcNAQEFBQADggEBAC58dIBC
-vOyd04SLE1l+7yZ3ARTE+enLAEDGJzvvjlKG8MdsC/TfDimtTMOXQnNXbnfEzKwj
-Zagmu/FRdhkVTQP48354C/hnAl1/Wyfjab8O9LeC6+pfAyY2mWzrb4kfRBm1KE26
-B2nURaYtDmZ+MJmjCyLQGaNMZz1q+eSyluTMMUven1FPVVPGlOGqUnPwOQUOvuVS
-vUyXrqyYfbSpfBsog9tVyW2KwzKvVCFeQ9pbUaxfsWD8qIeeKI17FzHVJEBtg23r
-z+mEW/8SvYpmYBk5YhfB1rTXQahEGyw8XP+kmmsb5h5d5yHgUXtEpEsBI4ORxMu1
-YUyAsGo8rZZF7VE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ao4.ee.tut.fi/acp/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ao4.ee.tut.fi/acp/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Acrobat Connect Pro -verkkokokouspalvelu</md:ServiceName>
-      <md:ServiceName xml:lang="en">TUT Acrobat Connect Pro</md:ServiceName>
-      <md:ServiceName xml:lang="sv">TUT Acrobat Connect Pro</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">TTY:n verkkokokouspalvelu.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">TUT web conference service.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">TUT-tjansten for e-moten.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Pasi</md:GivenName>
-    <md:SurName>Hakkinen</md:SurName>
-    <md:EmailAddress>pasi.hakkinen@tut.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/connectis-sso.qa.federatenow.net-broker-sso-tpd.xml b/swamid-interfederations-2.0/connectis-sso.qa.federatenow.net-broker-sso-tpd.xml
deleted file mode 100644
index 693bf5e7..00000000
--- a/swamid-interfederations-2.0/connectis-sso.qa.federatenow.net-broker-sso-tpd.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://connectis-sso.qa.federatenow.net/broker/sso/tpd">
-  <!--
-		This is a "Connectis" FederateNow SP for Connected Information Systems B.V.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T12:36:02Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID6zCCAtOgAwIBAgIJALX4Kq2P8A1MMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
-						VQQGEwJOTDEVMBMGA1UECAwMWnVpZCBIb2xsYW5kMRIwEAYDVQQHDAlSb3R0ZXJk
-						YW0xEjAQBgNVBAoMCUNvbm5lY3RpczEfMB0GA1UECwwWRk9SIFRFU1QgUFVSUE9T
-						RVMgT05MWTEcMBoGA1UEAwwTZWguYWNjLmNvbm5lY3Rpcy5ubDAeFw0xMzAxMDIx
-						MDIzMTBaFw0xODAxMDIxMDIzMTBaMIGLMQswCQYDVQQGEwJOTDEVMBMGA1UECAwM
-						WnVpZCBIb2xsYW5kMRIwEAYDVQQHDAlSb3R0ZXJkYW0xEjAQBgNVBAoMCUNvbm5l
-						Y3RpczEfMB0GA1UECwwWRk9SIFRFU1QgUFVSUE9TRVMgT05MWTEcMBoGA1UEAwwT
-						ZWguYWNjLmNvbm5lY3Rpcy5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMtjSnczA34cMYc8j5k8Rp0/Y1YizrPMtPjw1ClccygiLF/KoXy4A5vv6Ljz
-						XARpdF6yWSGekgzcrfQZ/RxKtv5wJq7KnayHU73ajCW0GZEN38yn0X54+e4daO79
-						VONFyGdpT5SPuRaXGxP/4YYH9Vn/+K9TfUffmICK/Gx0Ops3hywzpVvpcMEZtc9y
-						CvVOu3L0P2QoYeHLBGFVoiwCMfA5/AvIfG6yL1wX8yHLYotlvpZFEXk4EMJ9dCqK
-						dswcDz6p4GnSisC/89S35DDaCWDnGMB8wecWuEjZu+H/JWEhgjbJTjmctlSjoajE
-						H8WFLsUxvZ3xjjkXfvaaYhEdaF8CAwEAAaNQME4wHQYDVR0OBBYEFI2ApVPf1bEv
-						0ixBULEAK+SrT1XaMB8GA1UdIwQYMBaAFI2ApVPf1bEv0ixBULEAK+SrT1XaMAwG
-						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACKYFOtONqcBiSJB6dewD7xH
-						Cvcvfbr26QDQKNJlrXG+HBz7wB4nyxsGOfgpvyWKa582pRPI2/rFq5X0jgdYw7mb
-						HcVCYGZFf8/ijSI1fjkRr1LKMfSOWqQ5+REtLbCFBqKHyPyq1wsC535D+ktF04eL
-						mmesG6/QBCfwfqhmuyaW35TBYNBb3HHELlYLGOOKuo83/5cUgoFJiBKblPRg69E+
-						FgOARgihxdDzcTJIqD2bJExSkW8XFqn27Y1KhfCGIOpKZImfRIqxDmyWFtSecEzm
-						xMs+nAMoI6dUJf3swTToJIk4fFu1Ukk+jlyXtUnsN5VsjZHzGX0ueKCOSu0Cm/g=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connectis-sso.qa.federatenow.net/broker/acs/tpd" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connectis-sso.qa.federatenow.net/broker/acs/tpd" index="2" isDefault="false"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Connected Information Systems B.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Connectis</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.connectis.nl/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:technicalsupport@connectis.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:technicalsupport@connectis.nl</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/connectis-sso.staging.federatenow.net-broker-sso-tpd.xml b/swamid-interfederations-2.0/connectis-sso.staging.federatenow.net-broker-sso-tpd.xml
deleted file mode 100644
index c31a8358..00000000
--- a/swamid-interfederations-2.0/connectis-sso.staging.federatenow.net-broker-sso-tpd.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://connectis-sso.staging.federatenow.net/broker/sso/tpd">
-  <!--
-		This is a "Connectis" FederateNow SP for Connected Information Systems B.V.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-04T10:34:37Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEETCCAvmgAwIBAgIEXjilzjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UEBhMC
-						TkwxEzARBgNVBAgTClNvbWUtU3RhdGUxEjAQBgNVBAcTCVJvdHRlcmRhbTErMCkG
-						A1UEChMiQ29ubmVjdGVkIEluZm9ybWF0aW9uIFN5c3RlbXMgQi5WLjErMCkGA1UE
-						CxMiQ29ubmVjdGVkIEluZm9ybWF0aW9uIFN5c3RlbXMgQi5WLjEmMCQGA1UEAxMd
-						Y29ubmVjdGlzLXNzbyBzdGFnaW5nIHNpZ25pbmcwHhcNMTQwNjA0MDkyMTUwWhcN
-						MjQwNDEyMDkyMTUwWjCBuDELMAkGA1UEBhMCTkwxEzARBgNVBAgTClNvbWUtU3Rh
-						dGUxEjAQBgNVBAcTCVJvdHRlcmRhbTErMCkGA1UEChMiQ29ubmVjdGVkIEluZm9y
-						bWF0aW9uIFN5c3RlbXMgQi5WLjErMCkGA1UECxMiQ29ubmVjdGVkIEluZm9ybWF0
-						aW9uIFN5c3RlbXMgQi5WLjEmMCQGA1UEAxMdY29ubmVjdGlzLXNzbyBzdGFnaW5n
-						IHNpZ25pbmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFL8GudeE6
-						+ZrNf9A29gp0GWT1ZzlMho1D7CkxqlWa6dLHlHHq/9yVimTJ+gBW98lM5Xtox9pB
-						Sl4NEhJYxnbzqxQQZHrYe2ePndaOA+I3Qt18s9Flii3CfKgivO8Gk7PIsJiUtmpa
-						VQs7VW3exfe9hct+u9+WNuyHvHaEnuf5m2NU3Ik5xyG19etoBhGqhhTeCWr/jXX+
-						r3dJSoCiRKCrw1vtd4H0AYkOu3vsvlGyzv468wj8ya7pSWKhUhYTWIaBI5lf6LYP
-						I3Ic7CixQJMYnjk3HjHUzBkWF4Br/7/REk94FRsCLbBy97DV/reOcGqSSazVMxnu
-						D4oW5vrbvcdfAgMBAAGjITAfMB0GA1UdDgQWBBS6TwUKWGxZJD3DZcMnO5rfH6UB
-						/DANBgkqhkiG9w0BAQsFAAOCAQEAbS/JqZ8HtJ1gVgsTLIGHqIarEov1U3sbijbY
-						5cmCMAT0KwBP0/0FrF3eSDoxBiAUhPyeYRLmgLDY2OMUoXctpsRQEKdSz2uygZgT
-						HUCbwj9m7Wbg7iPGXcoEJhQgJxBh+afOICDNfcOO/mT4LPhy9JY/fg6fqeCfNyeL
-						XbBPIFCJ6tnkwseBBdFN+bOpRLSQjhicQNd91+7E9D99NFw1AkZpj+pNq8cwFpOK
-						0LLFELmeT1gDlRAv5yjz4PyIUONaHGA35eIvyDcE3TV003+x3PNwqGrMwzsXvR6q
-						do7Z7JztljIHExhgDP6V7Ze4Y2nyrEqVhFWOdAwOH/PTaxIsgQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connectis-sso.staging.federatenow.net/broker/acs/tpd" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connectis-sso.staging.federatenow.net/broker/acs/tpd" index="2" isDefault="false"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Connected Information Systems B.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Connectis Staging</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.connectis.nl/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:technicalsupport@connectis.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:technicalsupport@connectis.nl</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/content.espresso.co.uk-shibboleth.xml b/swamid-interfederations-2.0/content.espresso.co.uk-shibboleth.xml
deleted file mode 100644
index b844d518..00000000
--- a/swamid-interfederations-2.0/content.espresso.co.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://content.espresso.co.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for Discovery Education Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://content.espresso.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIJAPhU5DVHo3TdMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmNvbnRlbnQuZXNwcmVzc28uY28udWswHhcNMDkxMTE5MDEzMTAzWhcNMTkx
-						MTE3MDEzMTAzWjAhMR8wHQYDVQQDExZjb250ZW50LmVzcHJlc3NvLmNvLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqsGFLIO2eS/U55TGvH6Em3/M
-						eHPzNoVB0BfUYJC7FHeU/fjU+BsR98zVGBrr31LGpmWiM7a3zte4nZ9om7Drd+/0
-						w8TP9+8gJ/GJE6VnUuy/PBB47l2F/rPGOx4aKnJIw0I461ufHxoqGHx/8LoIeJ1C
-						TvSu7ft4A/GW9lqWsk5jFBZpaH8r9g9GIQiFlfaWRrt795pyeya9YMaVUuiEtK/N
-						r3xelrI5F/wPEJR0Pr7JCYYv7q5X2rUhNsFth7647NvWY1MaJXcaHIXHxr1EI+wr
-						WH845jGpLJqIeIgy8CLMakqubboxfndAd6o8vVQoDU+5++w/GvIvnScylrExZwID
-						AQABo28wbTBMBgNVHREERTBDghZjb250ZW50LmVzcHJlc3NvLmNvLnVrhilodHRw
-						czovL2NvbnRlbnQuZXNwcmVzc28uY28udWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						WE1SXmUfBV+0nDCDzdYxWMKz0oEwDQYJKoZIhvcNAQEFBQADggEBAHsTwtMAXmfk
-						NqHSCZ2dllLFKu5ildGMxkwUBkYHskmHna5gJo8xLMiS4nXJvZTCvLaLg3Sxa1h0
-						W7DDxV7FMioj6Uzxzny8e4fqqcKeE4tj7OcjM1sZQM7sRBq3eQfykGqO2/1SoKl2
-						E5aAfgermY6QFkIe3XOTT4J+sj1vwcfS0C0GW3gTA1bsDfHwyGtNSpt2qeEljwbD
-						yM5Bvz7W8Zjqe0s6EvwkvbQdIMUMlSe2o1LHQcm59VTFHrEMhp8+Xi/BO8nC5Cns
-						9UYhqZeX8Ac4aOdOQmO2wcW9yfuWaQSO0miGJIQ3uIoDgOfdNGiVuHDYI4KIPm6E
-						9HHhFgsV7K8=
-					</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>
-						MIIDNDCCAhygAwIBAgIJAPhU5DVHo3TdMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmNvbnRlbnQuZXNwcmVzc28uY28udWswHhcNMDkxMTE5MDEzMTAzWhcNMTkx
-						MTE3MDEzMTAzWjAhMR8wHQYDVQQDExZjb250ZW50LmVzcHJlc3NvLmNvLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqsGFLIO2eS/U55TGvH6Em3/M
-						eHPzNoVB0BfUYJC7FHeU/fjU+BsR98zVGBrr31LGpmWiM7a3zte4nZ9om7Drd+/0
-						w8TP9+8gJ/GJE6VnUuy/PBB47l2F/rPGOx4aKnJIw0I461ufHxoqGHx/8LoIeJ1C
-						TvSu7ft4A/GW9lqWsk5jFBZpaH8r9g9GIQiFlfaWRrt795pyeya9YMaVUuiEtK/N
-						r3xelrI5F/wPEJR0Pr7JCYYv7q5X2rUhNsFth7647NvWY1MaJXcaHIXHxr1EI+wr
-						WH845jGpLJqIeIgy8CLMakqubboxfndAd6o8vVQoDU+5++w/GvIvnScylrExZwID
-						AQABo28wbTBMBgNVHREERTBDghZjb250ZW50LmVzcHJlc3NvLmNvLnVrhilodHRw
-						czovL2NvbnRlbnQuZXNwcmVzc28uY28udWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						WE1SXmUfBV+0nDCDzdYxWMKz0oEwDQYJKoZIhvcNAQEFBQADggEBAHsTwtMAXmfk
-						NqHSCZ2dllLFKu5ildGMxkwUBkYHskmHna5gJo8xLMiS4nXJvZTCvLaLg3Sxa1h0
-						W7DDxV7FMioj6Uzxzny8e4fqqcKeE4tj7OcjM1sZQM7sRBq3eQfykGqO2/1SoKl2
-						E5aAfgermY6QFkIe3XOTT4J+sj1vwcfS0C0GW3gTA1bsDfHwyGtNSpt2qeEljwbD
-						yM5Bvz7W8Zjqe0s6EvwkvbQdIMUMlSe2o1LHQcm59VTFHrEMhp8+Xi/BO8nC5Cns
-						9UYhqZeX8Ac4aOdOQmO2wcW9yfuWaQSO0miGJIQ3uIoDgOfdNGiVuHDYI4KIPm6E
-						9HHhFgsV7K8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.espresso.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://content.espresso.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.espresso.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.espresso.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.espresso.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://content.espresso.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.espresso.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.espresso.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.espresso.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://content.espresso.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.espresso.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://content.espresso.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://content.espresso.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://content.espresso.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Discovery Education Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Espresso Education Limited: Espresso</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.espresso.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>School Support</GivenName>
-    <EmailAddress>mailto:schoolsupport@discovery.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Badar</GivenName>
-    <SurName>Hussein</SurName>
-    <EmailAddress>mailto:Badar_Hussein@discovery.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/content.karger.com.xml b/swamid-interfederations-2.0/content.karger.com.xml
deleted file mode 100644
index 2e9f9e0b..00000000
--- a/swamid-interfederations-2.0/content.karger.com.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://content.karger.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://content.karger.com/Shibboleth.sso/dfn-aai" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>content.karger.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=content.karger.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJqIrhKoAuA2MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmNvbnRlbnQua2FyZ2VyLmNvbTAeFw0xMTEyMTMxNTIzMjhaFw0xNDEyMTIx
-NTIzMjhaMB0xGzAZBgNVBAMTEmNvbnRlbnQua2FyZ2VyLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMWoqbxw2EVKI6zdsWvRrt6lFc4H6Xn7qPVl
-PTJBHRFsewTcMDocAMr78ljeLveG5QgWV3lF2i+sLU7bL7XySIrsdrOKzIxTj9Cx
-9pMJKr1xW4ejaPSEWk7wR3FERed12gud5LZRkfbGhvzuwWVUbei6kcU0f4oridKn
-12eoOs5BEP2ykLHlHaAw16px435bPIbn79lYbpihoQZ8CRB8i8DEJC1ujJPV7szG
-yyPW6JfrT/jfKDoIfCAnfJt+THnqOejeoDVn9GOdUIJ3x2VCvq1isGoMVaawZMPd
-xuIIjGygV4aY/RRUZ/DOcTznqxnsJGObeJzFQ0PWN3enG8PXNa0CAwEAAaNnMGUw
-RAYDVR0RBD0wO4ISY29udGVudC5rYXJnZXIuY29thiVodHRwczovL2NvbnRlbnQu
-a2FyZ2VyLmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBQRmb2gz9MBXN6Fo1btt08+
-BLsTVzANBgkqhkiG9w0BAQUFAAOCAQEAvY725FGb+4wXvpaiY3w9SKAXH3dJ3fZX
-IsONdJIDT4siX5lnSUOOnYPF9dvCNsL60lNThYSsX3lXHjCa37vejRj2Na5mLhak
-oaIHKbtb95uebjarm8A6YL532uxa8leGgn1fb7NlNdgKvxRliZ5nXcsElJNLKtuA
-NGIJXAAIodGbw3gN+le+8SW5UGBtretdER/JptLWGHqdtIJWeWPr0GcF+nV5Nh4p
-CRiJhhqRHdZdveYuALat3eUxEc8y9vryKwTOB6E330mkgWTowuBk8nc2P1tDqIM5
-3YRlMh3fvJvSVLyg8vpd0Ma5RKdOoJt9poNAsOYMl7OpwyI3yOWdYg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>content.karger.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=content.karger.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIJAJqIrhKoAuA2MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmNvbnRlbnQua2FyZ2VyLmNvbTAeFw0xMTEyMTMxNTIzMjhaFw0xNDEyMTIx
-NTIzMjhaMB0xGzAZBgNVBAMTEmNvbnRlbnQua2FyZ2VyLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMWoqbxw2EVKI6zdsWvRrt6lFc4H6Xn7qPVl
-PTJBHRFsewTcMDocAMr78ljeLveG5QgWV3lF2i+sLU7bL7XySIrsdrOKzIxTj9Cx
-9pMJKr1xW4ejaPSEWk7wR3FERed12gud5LZRkfbGhvzuwWVUbei6kcU0f4oridKn
-12eoOs5BEP2ykLHlHaAw16px435bPIbn79lYbpihoQZ8CRB8i8DEJC1ujJPV7szG
-yyPW6JfrT/jfKDoIfCAnfJt+THnqOejeoDVn9GOdUIJ3x2VCvq1isGoMVaawZMPd
-xuIIjGygV4aY/RRUZ/DOcTznqxnsJGObeJzFQ0PWN3enG8PXNa0CAwEAAaNnMGUw
-RAYDVR0RBD0wO4ISY29udGVudC5rYXJnZXIuY29thiVodHRwczovL2NvbnRlbnQu
-a2FyZ2VyLmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBQRmb2gz9MBXN6Fo1btt08+
-BLsTVzANBgkqhkiG9w0BAQUFAAOCAQEAvY725FGb+4wXvpaiY3w9SKAXH3dJ3fZX
-IsONdJIDT4siX5lnSUOOnYPF9dvCNsL60lNThYSsX3lXHjCa37vejRj2Na5mLhak
-oaIHKbtb95uebjarm8A6YL532uxa8leGgn1fb7NlNdgKvxRliZ5nXcsElJNLKtuA
-NGIJXAAIodGbw3gN+le+8SW5UGBtretdER/JptLWGHqdtIJWeWPr0GcF+nV5Nh4p
-CRiJhhqRHdZdveYuALat3eUxEc8y9vryKwTOB6E330mkgWTowuBk8nc2P1tDqIM5
-3YRlMh3fvJvSVLyg8vpd0Ma5RKdOoJt9poNAsOYMl7OpwyI3yOWdYg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.karger.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://content.karger.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.karger.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.karger.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.karger.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://content.karger.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.karger.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.karger.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.karger.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://content.karger.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.karger.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://content.karger.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://content.karger.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://content.karger.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">S.Karger</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Karger Publishers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://content.karger.com/PrudukteDB</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Mike</GivenName>
-    <SurName>Dürst</SurName>
-    <EmailAddress>m.duerst@karger.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Dürst</SurName>
-    <EmailAddress>m.duerst@karger.ch</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/contentstore.cla.co.uk-shibboleth.xml b/swamid-interfederations-2.0/contentstore.cla.co.uk-shibboleth.xml
deleted file mode 100644
index 46aed17d..00000000
--- a/swamid-interfederations-2.0/contentstore.cla.co.uk-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://contentstore.cla.co.uk/shibboleth">
-  <!--
-		This is a "Digital Content Store" Shibboleth SP for The Copyright Licensing Agency Ltd.
-	-->
-  <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="2015-08-21T10:58:30Z">
-      <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://contentstore.cla.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://contentstore.cla.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3zCCAcegAwIBAgIJANN7j8TZENUbMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCG5zMzczMTUzMB4XDTE1MDQyNzEzNDMzOVoXDTI1MDQyNDEzNDMzOVowEzER
-						MA8GA1UEAxMIbnMzNzMxNTMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDe0s9fwQ9v4NajnGwDJkesWo7Py4ufH/5qJsYUPcForz10FATKQtlGZZvb1Gzq
-						1TaenINx4QqSjUjdyVUN3N25LWCVXW7IKmL+cxJPXx0R8Nng86ZCtYmA1epphESy
-						PTXHLDOst7B4LdtxdlfqMaSr7xRo+1tBvY4G3Lqpt2l085R13XSvVfpbevQZSD4p
-						nqi9vAiFUM4NDvycm0Yil/dPk4fGWlpMNT01JR50rpFnntJJVfab7I9Qf5cxboBw
-						5mOPwqA8w4BI4o1gFqeH/vBXwrbA8zX9Ehgkfn1Rl8Aa0ZSMgoNjhzzwwLvjAuxT
-						bWxPlVUwr7soX+RK9JRRgEMbAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG5zMzczMTUz
-						MB0GA1UdDgQWBBSp4HYFPmzOFP8q8RG2pBi0PerD3TANBgkqhkiG9w0BAQUFAAOC
-						AQEAU9s2EhAdQudGpXpw6Ozw4tmEvg1IKDbUxUNEKkfUMOnlqPIeYvYhk5LN5ttD
-						YTBcGaA8tIh5UIlQpNUh2Eb89FgZ2UqNgyx9OGMaiP7nl5ZV8HHckiTcrFKOnG6X
-						+nuyOTeIYjgvpldbLZxRMlCt5fSQzqwwYX6SyK6PWsqQTZhvzpwdpbGrUj4mKEcV
-						vs9mlOgKFkqvzXLr+I4D8XVYbIxBCeh7X82ooPv4r6d7kzJJo9pRf+qi0RNKJmWZ
-						vI2el1erTkBgTf/qHvtskD/N1KTxz9oZV/bTpkype7gRaya8jguEmXqz0fyt9ohB
-						kep+2TUr/H4eYqGM0KNkWWD8FA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://contentstore.cla.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://contentstore.cla.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://contentstore.cla.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://contentstore.cla.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://contentstore.cla.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://contentstore.cla.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://contentstore.cla.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://contentstore.cla.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://contentstore.cla.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://contentstore.cla.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://contentstore.cla.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Copyright Licensing Agency Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Content Store</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://cla.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dev Team</GivenName>
-    <EmailAddress>mailto:dev@cloudspringtech.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dev Team</GivenName>
-    <EmailAddress>mailto:dev@cloudspringtech.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/copac.ac.uk-shibboleth.xml
deleted file mode 100644
index 00e8814a..00000000
--- a/swamid-interfederations-2.0/copac.ac.uk-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://copac.ac.uk/shibboleth">
-  <!--
-		This is a "MIMAS Copac" Shibboleth SP for The University of Manchester.
-	-->
-  <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="2009-02-03T17:10: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://copac.jisc.ac.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://copac.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Copac: National, Academic &amp; Specialist Library Catalogue</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Search increasing numbers of UK and Irish academic, national &amp; specialist library catalogues</mdui:Description>
-        <mdui:Logo height="117" width="300">https://copac.ac.uk/img/copac-shibboleth.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEFjCCAv6gAwIBAgIJAO6xAo1XfaxPMA0GCSqGSIb3DQEBBQUAMIGEMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
-						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
-						CxMFTWltYXMxFDASBgNVBAMTC2NvcGFjLmFjLnVrMB4XDTEzMDUzMDE1MzAxNFoX
-						DTIzMDUyODE1MzAxNFowgYQxCzAJBgNVBAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVz
-						dGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVyMSUwIwYDVQQKExxUaGUgVW5pdmVyc2l0
-						eSBvZiBNYW5jaGVzdGVyMQ4wDAYDVQQLEwVNaW1hczEUMBIGA1UEAxMLY29wYWMu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkHGpQmx3P3Af0
-						fkVm9D8iNZVqBDVFjXZXfktCzU5Zq368JQsItRz03ON4xCmU7Qe/gugcmxNxukQ6
-						2B+tNcuFyVaJ+u6Fe2hvwjk1oP4Ss6fMFkE+UmOlqbwcrPdEeSVFIBWW8Wexhs1e
-						e71CR/LtzX369K8TSQrzAsVGIbhXCVnKDyhclgilF+20AaWTVj2iNrUd15POvmZQ
-						HP646gd9o8JxPlzILXdabJtd8liIIPsCqD8KH0K4M1rlhWDz0MLct8VM9GVuv23p
-						nOOEz3hkhhxfJUlDqt3C3HHtPwJ157tVMUJSAzRdOLnqt3B3hhftFzLzf/jT6/FZ
-						mazrYbP/AgMBAAGjgYgwgYUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0l
-						BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBYGA1UdEQQPMA2CC2NvcGFjLmFjLnVr
-						MDQGA1UdEgQtMCuBKW1pbWFzLXNoaWItdGVjaEBsaXN0c2Vydi5tYW5jaGVzdGVy
-						LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB5QfB/NqgTytj+KdQ2TrV8gySfKbGe
-						dOeM1cGSpX8FyXXiEavVAHlDsuhsd9RcMROqkj90oQQFUm3CJnh0m40++WXdI9+v
-						7bMQ0xYVzGnsX7qBxxHlSslGRNF7/4Ya6UTrDOTpmIVSvNDmMWqBnwBwVQ6zKxLP
-						xYs0qSlnDNKjXgpcWOJPz6cuCuOOOXDoMuIdpNSWHfHz9E1PfUo4QOClG+HVOus2
-						5SFQ7I6cUaJz3K8IQzOIyhqKJiWyr+U+c49UObr8HrurvvQ1GIibCEG5/5nV5y9R
-						UETawIuGZeVFL2GfLp1JS4Fe6QvAenQwPFVqKKhwRalihh53YYkNvchV
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://copac.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://copac.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MIMAS Copac</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://copac.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Copac Helpdesk</GivenName>
-    <EmailAddress>mailto:copac@mimas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/copaiba.unifesspa.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/copaiba.unifesspa.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 266254ec..00000000
--- a/swamid-interfederations-2.0/copaiba.unifesspa.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://copaiba.unifesspa.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIFESSPA - Universidade Federal do Sul e Sudeste do Para</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIFESSPA - Universidade Federal do Sul e Sudeste do Para</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIFESSPA - Universidade Federal do Sul e Sudeste do Para</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIFESSPA - Universidade Federal do Sul e Sudeste do Para</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unifesspa.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unifesspa.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExQjBABgNVBAoTOVVOSUZFU1NQ
-QSAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIFN1bCBlIFN1ZGVzdGUgZG8gUGFy
-YTENMAsGA1UECxMEQ1RJQzEsMCoGCSqGSIb3DQEJARYdZmFiaW8udG9ycmVzQHVu
-aWZlc3NwYS5lZHUuYnIxDzANBgNVBAcTBk1hcmFiYTENMAsGA1UECBMEUGFyYTEL
-MAkGA1UEBhMCQlIxITAfBgNVBAMTGGNvcGFpYmEudW5pZmVzc3BhLmVkdS5icjAe
-Fw0xNTAzMTgxODMzMzFaFw0xODAzMTcxODMzMzFaMIHRMUIwQAYDVQQKEzlVTklG
-RVNTUEEgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBTdWwgZSBTdWRlc3RlIGRv
-IFBhcmExDTALBgNVBAsTBENUSUMxLDAqBgkqhkiG9w0BCQEWHWZhYmlvLnRvcnJl
-c0B1bmlmZXNzcGEuZWR1LmJyMQ8wDQYDVQQHEwZNYXJhYmExDTALBgNVBAgTBFBh
-cmExCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhjb3BhaWJhLnVuaWZlc3NwYS5lZHUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA9/SxMUM1/t4LVNmE
-K0uX5DRpSIajluqIyLtervchmWYWIIipzvzhogyi+Qc3xtkhbuNwISHoDyZK5z7e
-uJXFlhkCuqpR46iqHkgGDvxmes5wqv+oIJEYEEEjy4KZzAZTFty+dwoKXcPSGjbl
-ThzuiM14eN052d1fZaKH0l+XezrW9+PUG1HNOviaLoCqy7lX6iFnXMN49XBQjrIB
-qqTejolR3sTyX9YY1JWlyavin+8eefgsqs2u6d/TTczXq/RmpzEXmFiMqV9bSjeM
-c3r2EmqNQRADHlmYgMD4Xze2pPnHgvVZkK/gCcHZvzmLcN54CucOanS/qNtmjbUH
-rjJpAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAAWUE/9T3spNcV2LRioyFcb/uOIs
-2pMFvdYAkkrAnKjnlJhnHbZAUOc7HbEvebz/4SGzk5K1pisN+q7g9EKJbrXhEzlc
-eWjoWRqilX22VGozHP4rhVItvhLcxVQQk202lbR9APNkgg8gaM0psryDoHY7uxmV
-HIOIe/EC7oe2Z4esIxgEOGLJRyNflsWq5xfl1eVQjxiCbDKDn+e6P6q7vjltCH/+
-CywiNq03LuVqlu2qV6NkvtfBrIdSVRGJwt+LAyG92Mt5t/bQezKP795nBYD0LOjL
-dMOk+azuCRS1+NS4IGHJi+FSTujOGpOGTg/Hjw2Uo58c7dkfIjX0H8kAuBY=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copaiba.unifesspa.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://copaiba.unifesspa.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://copaiba.unifesspa.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copaiba.unifesspa.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://copaiba.unifesspa.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://copaiba.unifesspa.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExQjBABgNVBAoTOVVOSUZFU1NQ
-QSAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIFN1bCBlIFN1ZGVzdGUgZG8gUGFy
-YTENMAsGA1UECxMEQ1RJQzEsMCoGCSqGSIb3DQEJARYdZmFiaW8udG9ycmVzQHVu
-aWZlc3NwYS5lZHUuYnIxDzANBgNVBAcTBk1hcmFiYTENMAsGA1UECBMEUGFyYTEL
-MAkGA1UEBhMCQlIxITAfBgNVBAMTGGNvcGFpYmEudW5pZmVzc3BhLmVkdS5icjAe
-Fw0xNTAzMTgxODMzMzFaFw0xODAzMTcxODMzMzFaMIHRMUIwQAYDVQQKEzlVTklG
-RVNTUEEgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBTdWwgZSBTdWRlc3RlIGRv
-IFBhcmExDTALBgNVBAsTBENUSUMxLDAqBgkqhkiG9w0BCQEWHWZhYmlvLnRvcnJl
-c0B1bmlmZXNzcGEuZWR1LmJyMQ8wDQYDVQQHEwZNYXJhYmExDTALBgNVBAgTBFBh
-cmExCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhjb3BhaWJhLnVuaWZlc3NwYS5lZHUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA9/SxMUM1/t4LVNmE
-K0uX5DRpSIajluqIyLtervchmWYWIIipzvzhogyi+Qc3xtkhbuNwISHoDyZK5z7e
-uJXFlhkCuqpR46iqHkgGDvxmes5wqv+oIJEYEEEjy4KZzAZTFty+dwoKXcPSGjbl
-ThzuiM14eN052d1fZaKH0l+XezrW9+PUG1HNOviaLoCqy7lX6iFnXMN49XBQjrIB
-qqTejolR3sTyX9YY1JWlyavin+8eefgsqs2u6d/TTczXq/RmpzEXmFiMqV9bSjeM
-c3r2EmqNQRADHlmYgMD4Xze2pPnHgvVZkK/gCcHZvzmLcN54CucOanS/qNtmjbUH
-rjJpAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAAWUE/9T3spNcV2LRioyFcb/uOIs
-2pMFvdYAkkrAnKjnlJhnHbZAUOc7HbEvebz/4SGzk5K1pisN+q7g9EKJbrXhEzlc
-eWjoWRqilX22VGozHP4rhVItvhLcxVQQk202lbR9APNkgg8gaM0psryDoHY7uxmV
-HIOIe/EC7oe2Z4esIxgEOGLJRyNflsWq5xfl1eVQjxiCbDKDn+e6P6q7vjltCH/+
-CywiNq03LuVqlu2qV6NkvtfBrIdSVRGJwt+LAyG92Mt5t/bQezKP795nBYD0LOjL
-dMOk+azuCRS1+NS4IGHJi+FSTujOGpOGTg/Hjw2Uo58c7dkfIjX0H8kAuBY=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copaiba.unifesspa.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://copaiba.unifesspa.edu.br:8443/idp/profile/SAML1/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">UNIFESSPA - Universidade Federal do Sul e Sudeste do Para</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNIFESSPA - Universidade Federal do Sul e Sudeste do Para</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNIFESSPA - Universidade Federal do Sul e Sudeste do Para</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNIFESSPA - Universidade Federal do Sul e Sudeste do Para</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unifesspa.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unifesspa.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Fabio Torres</md:SurName>
-    <md:EmailAddress>fabio.torres@unifesspa.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/copper-beech.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/copper-beech.oucs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 40346962..00000000
--- a/swamid-interfederations-2.0/copper-beech.oucs.ox.ac.uk-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://copper-beech.oucs.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-10T10:35: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: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://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAO1i0mrAIB8GMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGmNvcHBlci1iZWVjaC5vdWNzLm94LmFjLnVrMB4XDTEzMDMxMjEyMjE0MVoX
-						DTIzMDMxMDEyMjE0MVowJTEjMCEGA1UEAxMaY29wcGVyLWJlZWNoLm91Y3Mub3gu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC19odZWKUryeOs
-						Qm5Jped89f7vdvCnl1+Es27CxXYioSRtqBWWWSCmv5ihxDmoTL+aGNdyjf/5m7Ad
-						YPzpp/eVvjPtcMN1tHo7L9B6vs/wArIp8mcFK57vfdA+LM8TzMz74OGLrGBuKe6w
-						8BRbfG6amdvJczbZ7PqMJWI4f/3YXGM6aCqHY2L0ZNZf/ZRedTIuDiurk1PH30AN
-						PAGilDLIYDakAT/HnRMzoFYDg/Qyom4YQGCF1yIyG4WJAgjhnSnibbVF6C6uNU2u
-						BcGbeF+ZLpTZe8T3NoGjZbnamqd8PmoUE/8Iv3ciPWnxpIfEL7hdQBjnYqyuM8s/
-						FyOA42uzAgMBAAGjSDBGMCUGA1UdEQQeMByCGmNvcHBlci1iZWVjaC5vdWNzLm94
-						LmFjLnVrMB0GA1UdDgQWBBQu40vUe6XSE9/jGWlX6HR6uNg2rjANBgkqhkiG9w0B
-						AQUFAAOCAQEAUrxhUkIk/kX4ALnAPV6GtwkMBoq7KMauyCaTyPDEf/VFziwhW8Ha
-						5g2gEVqD2XcTVjb1+IhJHcXcvS6PNbU4XeFDDA4b9Ozu3KZSXFkKzU+tUYcJ7HFk
-						WIzImdVpATRsc/rb871QSCsf3NsP9k0sQWCRaMZP96vic88ZiZLM4RnD62BsARMv
-						MTiOHIJJN6qRECJAXcw7BPa2Fbb+CJYMy1vG8+a2XKe/B52gmWbBwkCI8xAy9k9y
-						MFD+d0ccJvCT04vBA238bfgsEDGo9spUMatdRlvt0fAjS2mkiQM589o1EAwywWjN
-						oG3ArnRN398e8bBWJnR3ndIw5Z14f3I/KA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://copper-beech.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Test Shibboleth SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 fab02064..84f7ed8f 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,13 +1,17 @@
 <?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:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://core.uwap.org/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="2013-10-17T11:25:00Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2013-10-17T11:34:51Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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: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>
@@ -15,14 +19,14 @@
       </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>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/coursedev.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/coursedev.conted.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 9f1bef52..00000000
--- a/swamid-interfederations-2.0/coursedev.conted.ox.ac.uk-shibboleth-sp.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://coursedev.conted.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is a 'Department of Continuing Education Moodle V2 development site' Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-06T13:36:08Z">
-      <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://coursedev.conted.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEojCCA4qgAwIBAgIJAIo8n/wla25jMA0GCSqGSIb3DQEBBQUAMIHRMQswCQYD
-						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
-						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
-						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMSIwIAYDVQQDDBljb3Vyc2VkZXYu
-						Y29udGVkLm94LmFjLnVrMSowKAYJKoZIhvcNAQkBFhttaWtlLnRheWxvckBjb250
-						ZWQub3guYWMudWswHhcNMTQwNTIwMTAzMTU0WhcNMjQwNTE3MTAzMTU0WjCB0TEL
-						MAkGA1UEBhMCVUsxFDASBgNVBAgMC094Zm9yZHNoaXJlMQ8wDQYDVQQHDAZPeGZv
-						cmQxHTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgT3hmb3JkMSwwKgYDVQQLDCNEZXBh
-						cnRtZW50IGZvciBDb250aW51aW5nIEVkdWNhdGlvbjEiMCAGA1UEAwwZY291cnNl
-						ZGV2LmNvbnRlZC5veC5hYy51azEqMCgGCSqGSIb3DQEJARYbbWlrZS50YXlsb3JA
-						Y29udGVkLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						oVwa9Vpu7YzAf0IQczc4zZBHCW1xsdqfuCVk71ahSnEQMl0QQXcM9ZvyqqDIy12Z
-						rA+5y/mGwfYv09M/DqrKqbT7Mk5CaksDjEwnZqobrGX+nKMKh/lKsSeJ/OkWvZbw
-						bGR5sIAO88Waz3QQAdouIahycyMxeZxxD6mHqGncLl87tWNng5R1bRTQ3ITMXwMY
-						pNtLkbS884EIChs9U+NJyqbiHhX6HCwG6Nn1n6VbKoavM47Cd5mf/2Gl1POYP6tT
-						YeTJ1ivUUEQ/KREWkZuGXy1pF5ZcoxkFnJwjaAUo+vxF0WUXSdRUpvlyOgDsnBqY
-						A3+nZkUXgZpz/ll88UeBzwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
-						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUCsi1
-						iGkuhHJjuS5YZsmf/6hsBUYwHwYDVR0jBBgwFoAUCsi1iGkuhHJjuS5YZsmf/6hs
-						BUYwDQYJKoZIhvcNAQEFBQADggEBAJc4oY4qFkj0cJWBLn+9ch6DCLvJvbSmdcz9
-						prVUBdKavVISxGlbY4ro3KxAUNdEcmYESW6JKJcu4ek4/L47aVGSI7dX2CQ73DYM
-						WAcf6XzFpfEUGw6aOKi7UOYKzVAugbafAb2j1LMQrSt7FEFEtYlGoAN3JnH4+FIC
-						29gwvXQrXRFvqCfoVMfMUGlTdD1Xy9XbakTOWta0cTHtE+p6GRgoy0MpjYmVruUc
-						qre2Yz3OMGHP3FghGeUXQrDEzmnAbKW/RjHWrUapTgipkKdokN1JC2C67OCkQOsk
-						JD62ZhusHIcnhdoAfDzMtOVYFGLFs4JyeOlfG8MbmY4p1UJJuMA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://coursedev.conted.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Department for Continuing Education Moodle V2 development site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/courses.scholar.hw.ac.uk-shibboleth.xml
deleted file mode 100644
index dde81bce..00000000
--- a/swamid-interfederations-2.0/courses.scholar.hw.ac.uk-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://courses.scholar.hw.ac.uk/shibboleth">
-  <!--
-		This is a "SCHOLAR Programme" Shibboleth SP for Heriot-Watt University.
-	-->
-  <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="2008-08-07T10:57:32Z">
-      <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://courses.scholar.hw.ac.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://courses.scholar.hw.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIJAM7EPA/nD/eEMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGNvdXJzZXMuc2Nob2xhci5ody5hYy51azAeFw0xNTA5MDcxMTE2MjdaFw0z
-						NTA5MDIxMTE2MjdaMCMxITAfBgNVBAMTGGNvdXJzZXMuc2Nob2xhci5ody5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMzKoqbL/fZaIQy3HsYJ
-						uDgCLtU1PgyGzrCHEzuV7sH7nAW4I/dou7gkj+u/caP7tUhEalCb3fTBRY8/3DXU
-						5I9WhKnp7+LxFMHDw4cO9HyOvwJdRujslQ+7GrL4uIepK3k9Fmx9CmfB6yFKHIfW
-						uT609R56h5Mkx33g00zl0d8S924vSekJffZZDHjhArL0Zl9Qom2XNvAzq8+OHdk2
-						joeCO4Bmhm2EJBnTdKm9BM20dlUNaChkGSPkpjQo0GubaZIzGjHUsjmb5piM7kgW
-						ukVXY8qeXLbnvtWMWUU0aXziuuMhjevvG0P/9dH6SW1SiLpd3K7RX/EbmoXFKnqb
-						dNcCAwEAAaNzMHEwUAYDVR0RBEkwR4IYY291cnNlcy5zY2hvbGFyLmh3LmFjLnVr
-						hitodHRwczovL2NvdXJzZXMuc2Nob2xhci5ody5hYy51ay9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBQqdJBNFjutcZ9JhQuzIMXajOpKTTANBgkqhkiG9w0BAQUFAAOCAQEA
-						offYX9o1jOUAjLqipA3H33r+eC5fGRmXpxQTHT9TCidb86Gx6A3JslV9dzVAyDdq
-						C8VHtyW++a8+Pc+F/oGAK6EW1XQjGw29VDkYR+ZYxCtiPwxxnhcxftQVqu2vyFyP
-						36UIi/e9U7OWUBQGF/cCtfNLd0PtsTXUo1cXNqED3vN0AdV8DZALXOewkZSZHdrx
-						Cmm47hMBm8VoE8NuQXd/fnWAdb99DFtuNygxdQ4tpK+vdqg5WnPiW894lKQtjQUg
-						/ywRrMA3eJPKtYdxaIdIcW8TisYCILOXF5mgkQpssytSAN4H34jtO7nlfepcJI4d
-						7H4HdRHL1gb7AIARX4zWKA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://courses.scholar.hw.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://courses.scholar.hw.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Heriot-Watt University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Heriot-Watt University: The SCHOLAR Programme</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://scholar.hw.ac.uk/sco.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:ithelp@hw.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>George</GivenName>
-    <SurName>Livie</SurName>
-    <EmailAddress>mailto:G.Livie@hw.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/courses.sci-gaia.eu-shibboleth.xml b/swamid-interfederations-2.0/courses.sci-gaia.eu-shibboleth.xml
deleted file mode 100644
index b6d90dd2..00000000
--- a/swamid-interfederations-2.0/courses.sci-gaia.eu-shibboleth.xml
+++ /dev/null
@@ -1,101 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://courses.sci-gaia.eu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-09-11T09:47:08Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-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://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://courses.sci-gaia.eu/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://courses.sci-gaia.eu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sci-GaIA Online Courses</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Corsi online del progetto Europeo Sci-GaIA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Sci-GaIA Online Courses is an e-learning environment where partners' users can find courses that explain the technologies used in the project</mdui:Description>
-        <mdui:Description xml:lang="it">I corsi online del progetto Sci-GaIA sono dei servizi di e-learning dove gli utenti degli enti partner possono apprendere le tecnologie usate nel progetto</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://courses.sci-gaia.eu/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://courses.sci-gaia.eu/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEoDCCA4igAwIBAgIQGwF3QYiICE7zq1+Nt9wGqDANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTA2MTcwMDAwMDBaFw0xODA2MTYyMzU5NTlaMEExITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTY291cnNlcy5zY2kt
-Z2FpYS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4lCXNr6Wa2
-7qGn46QSJV6939bVVX/wWLncPuEoJddioKqZpF8E01LS+izmWv85Z0KpeyD3RDx3
-+Mrlfs5lGdVHpsKQA1zGR6qRHi/P13XUspk3q5BC0FEhF2pYvQyc54/BqWdjIvZJ
-IalpLdwn/xZ3ERZlE0oKu44dxs1AHEvDRLtB6WSliR6H8CiSE3gDnKT1reQV3enk
-IhJe+bSI3UxuJ+475OmEdWW4FjPTcQe0+14RTAHiFo+SKKPD1LAJbYRgOjSXQYpS
-0Ffs39xDmlZjDaW++TaDZ0RZbrK2R2WUIdB2Y7ZO3+aXmBysDTvqa6eXMxvQ0zZd
-GZISmkPwGDkCAwEAAaOCAW8wggFrMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvh
-hiiw/ba9MB0GA1UdDgQWBBRmh4KfdTq82DONTL864+9HD8KmljAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5j
-cmwwbAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0
-cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29j
-c3AudXNlcnRydXN0LmNvbTAeBgNVHREEFzAVghNjb3Vyc2VzLnNjaS1nYWlhLmV1
-MA0GCSqGSIb3DQEBCwUAA4IBAQBk718ij3B7Tp2/wjtwus0QvG6/tjzaCejSkFm0
-APEOAkbduLYkBldzdeWnZiF497mcviriDGMHS6G7nQSurvO/Z/uzZLEX4BVWAhKM
-rILvvdJe+NLrWUc/RblncN83MTwbMsiHRwhaZftX3mdPTZzxNFINijC2wkv4qP7i
-G5QeNpfgG7xfnsOgfYsTwsuLsTqBuQLWMDyXBUIrL4AOD+IRezFBCaVCtii/sWdb
-o9dq23HNLskw/04BBIzTcUrrRx5+0jImH6nY9d6ZLGNglpZaogQfPtbt2T6/5lrg
-ZmVmVnUteKWWW6Oo6YhuL9+2hwAf62ASzOOl1K9BXieFU0T5
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://courses.sci-gaia.eu/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://courses.sci-gaia.eu/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Sci-GaIA Online Courses</md:ServiceName>
-      <md:ServiceName xml:lang="it">Corsi online del progetto Europeo Sci-GaIA</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Sci-GaIA Online Courses is an e-learning environment where partners' users can find courses that explain the technologies used in the project</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">I corsi online del progetto Sci-GaIA sono dei servizi di e-learning dove gli utenti degli enti partner possono apprendere le tecnologie usate nel progetto</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="surname" 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="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi Catania</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Corsi online del progetto Sci-GaIA erogato dall'Università degli Studi di Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sci-GaIA Online Courses provided by the University of Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unict.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unict.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:discourse-support@sci-gaia.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:discourse-support@sci-gaia.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/coventry.ac.uk-idp.xml b/swamid-interfederations-2.0/coventry.ac.uk-idp.xml
deleted file mode 100644
index cbf49558..00000000
--- a/swamid-interfederations-2.0/coventry.ac.uk-idp.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://coventry.ac.uk/idp">
-  <!--
-		This is a Shibboleth IdP for Coventry University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">coventry.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAL0mMgDu5top1RP1uWsDIPodHtSIMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE2lkcDIuY292ZW50cnkuYWMudWswHhcNMTMwNzEyMDkz
-						NjIyWhcNMzMwNzEyMDkzNjIyWjAeMRwwGgYDVQQDExNpZHAyLmNvdmVudHJ5LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn6tyDBeIOr1TNvvs
-						tzM3LABsvXKstxllmo4TKiRIdLHML9GeDmQeK5J+Ayly6uD+W++45pUrma0Yv9pM
-						6AGXJZsSRd+JNhBrv3IV2CWGWKAZIsd/nDLO6yPDAFNsyBrCLicibY8mH/o/uXYj
-						YUHkC/VB4Sjb5uzM1u+q4Vx93hYCwrZu6L6Wtr5jHdMepZ813c95wP+8+pVydY5x
-						tqWjB3iTXsl+AC7Y3bqVK0FgqidVhifjBO+p8aZfxm/Ycen1LJuS7JYCCDSn/UL5
-						SXo5qvEzXuKLwicugewrqXJwpzMkZif+ppl54yDwtG5pVHQT2+KwmDyXQiZAv1ji
-						DikFcwIDAQABo20wazBKBgNVHREEQzBBghNpZHAyLmNvdmVudHJ5LmFjLnVrhipo
-						dHRwczovL2lkcDIuY292ZW50cnkuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFBv/ZE7Ke43/cMfhyAuTRI5/hE2kMA0GCSqGSIb3DQEBBQUAA4IBAQCIZQeM
-						D88/cHeyRWLIUoxBb8Pdb9HwEG51qmg7b+/dwkjomtO5uanQYdO78ar7zmnMAnNJ
-						QFV9WSrp4armb7XqUSrol4OR85F+TCCGJrkRHMHbl1GKECD1iyS1Pgd0DXbP+eqz
-						KaY8aNKN0PCKurzn4tTUAVXZ5vsup8GEps+/uhCHZbAAnH9ilcATposzClVpGvgl
-						LFYNPVs92nXyrx4PC7rfxNEr+AEIeGdjXpbVexdcgy1q9pvRX+dp/Q9jPtg1Gq1r
-						JDUzK95tyg7HYNkAgvc9sjxOxjHjJfhVob237ouSKvJHmKjF/DfNotgfYNCwqdYH
-						PpU40zSkez1KZrd9
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.coventry.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.coventry.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://idp2.coventry.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.coventry.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.coventry.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.coventry.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">coventry.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAL0mMgDu5top1RP1uWsDIPodHtSIMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE2lkcDIuY292ZW50cnkuYWMudWswHhcNMTMwNzEyMDkz
-						NjIyWhcNMzMwNzEyMDkzNjIyWjAeMRwwGgYDVQQDExNpZHAyLmNvdmVudHJ5LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn6tyDBeIOr1TNvvs
-						tzM3LABsvXKstxllmo4TKiRIdLHML9GeDmQeK5J+Ayly6uD+W++45pUrma0Yv9pM
-						6AGXJZsSRd+JNhBrv3IV2CWGWKAZIsd/nDLO6yPDAFNsyBrCLicibY8mH/o/uXYj
-						YUHkC/VB4Sjb5uzM1u+q4Vx93hYCwrZu6L6Wtr5jHdMepZ813c95wP+8+pVydY5x
-						tqWjB3iTXsl+AC7Y3bqVK0FgqidVhifjBO+p8aZfxm/Ycen1LJuS7JYCCDSn/UL5
-						SXo5qvEzXuKLwicugewrqXJwpzMkZif+ppl54yDwtG5pVHQT2+KwmDyXQiZAv1ji
-						DikFcwIDAQABo20wazBKBgNVHREEQzBBghNpZHAyLmNvdmVudHJ5LmFjLnVrhipo
-						dHRwczovL2lkcDIuY292ZW50cnkuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFBv/ZE7Ke43/cMfhyAuTRI5/hE2kMA0GCSqGSIb3DQEBBQUAA4IBAQCIZQeM
-						D88/cHeyRWLIUoxBb8Pdb9HwEG51qmg7b+/dwkjomtO5uanQYdO78ar7zmnMAnNJ
-						QFV9WSrp4armb7XqUSrol4OR85F+TCCGJrkRHMHbl1GKECD1iyS1Pgd0DXbP+eqz
-						KaY8aNKN0PCKurzn4tTUAVXZ5vsup8GEps+/uhCHZbAAnH9ilcATposzClVpGvgl
-						LFYNPVs92nXyrx4PC7rfxNEr+AEIeGdjXpbVexdcgy1q9pvRX+dp/Q9jPtg1Gq1r
-						JDUzK95tyg7HYNkAgvc9sjxOxjHjJfhVob237ouSKvJHmKjF/DfNotgfYNCwqdYH
-						PpU40zSkez1KZrd9
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.coventry.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.coventry.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">Coventry University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Coventry University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.coventry.ac.uk/cu/its/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Gary</GivenName>
-    <SurName>Walton</SurName>
-    <EmailAddress>mailto:g.walton@coventry.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gary</GivenName>
-    <SurName>Walton</SurName>
-    <EmailAddress>mailto:g.walton@coventry.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.xml b/swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
deleted file mode 100644
index a0c487ae..00000000
--- a/swamid-interfederations-2.0/cpauth.icos-cp.eu-saml-cpauth.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://cpauth.icos-cp.eu/saml/cpauth">
-  <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>
-    <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"/>
-    <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.swamid.se/category/hei-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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://cpauth.icos-cp.eu/saml/login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Carbon Portal authentication service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Kolportalens autentiseringstjänst</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Single Sign On for services of ICOS Carbon Portal. Maintained by the Carbon Portal team at Physical Geography department (nateko.lu.se).</mdui:Description>
-        <mdui:Description xml:lang="sv">Single Sign On tjänst för ICOS Kolportalen. Hanteras av Carbon Portal teamet på INES (nateko.lu.se).</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>cpauth.icos-cp.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=cpauth.icos-cp.eu</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEJzCCAw+gAwIBAgIJANC3VWNs7fbTMA0GCSqGSIb3DQEBCwUAMIGpMQswCQYD
-VQQGEwJTRTERMA8GA1UECAwIU2vDg8KlbmUxDTALBgNVBAcMBEx1bmQxGzAZBgNV
-BAoMEklDT1MgQ2FyYm9uIFBvcnRhbDEfMB0GA1UECwwWQXV0aGVudGljYXRpb24g
-U2VydmljZTEaMBgGA1UEAwwRY3BhdXRoLmljb3MtY3AuZXUxHjAcBgkqhkiG9w0B
-CQEWD2luZm9AaWNvcy1jcC5ldTAeFw0xNTAyMDUxMjI0MzZaFw0yNTAyMDIxMjI0
-MzZaMIGpMQswCQYDVQQGEwJTRTERMA8GA1UECAwIU2vDg8KlbmUxDTALBgNVBAcM
-BEx1bmQxGzAZBgNVBAoMEklDT1MgQ2FyYm9uIFBvcnRhbDEfMB0GA1UECwwWQXV0
-aGVudGljYXRpb24gU2VydmljZTEaMBgGA1UEAwwRY3BhdXRoLmljb3MtY3AuZXUx
-HjAcBgkqhkiG9w0BCQEWD2luZm9AaWNvcy1jcC5ldTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAM2QN1jaZJeuPAH+4sVMZKk7vg4JIbUuTMKk0+KIAg5M
-XiVsRiEUjY+LtIncrvA/kf2CIySI0WkbwZMjcDd03hNj4kLWhuyxfOCwDO6DsUbG
-MbyI6HIYWXJp5ljfEEFgtMqT3dDtD5vwq8h4Zy20ukxOoIokKczrAvn4JjkMsj6Z
-0CEAFBC29o4E8PWQbUBgvt6Z+2ao+RHMLD7nZVBx98Occ9KfnYnDDd9Oi1XFe009
-zaSbcqY2RpN8I9hcW/KQf3KnGW5xZ5dr4rhGklCkYr+h0W3xKu+hin8bk91t1Dkr
-gaKl/N7M3Oof3k+7ZBlwaV97es5InWCeNgDxCGkBRNsCAwEAAaNQME4wHQYDVR0O
-BBYEFDcD7MVudooGaNRYqXBYqQi3VzGxMB8GA1UdIwQYMBaAFDcD7MVudooGaNRY
-qXBYqQi3VzGxMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBABS02eZS
-weXGMJ2fEIy2JH0VhCbjuX/rz+8Hfh9LjzNb3QwKHuwP83yvPqRulV9FYmvOoK8T
-fMou5aW0mZ+QgJNKOrxY5vFxUq6pn3OiYbBu3m1C9ajbU/nx2evzt4+qUwTfHFb+
-ZgXpOtmxRekFzVvGZ18BSPJKwAAqqZ11X7skT/NwEAhbgplVPv9WkDmDzqNvHqQJ
-nyRgD2ZqUPU9nEOjGy0gI07dciVcYZQ+CiZeSECIWgQwjDEBDuwMCVAZA6gfdz6C
-KJuN+RUSKPEcxPxle1MiB4MU0ei5X4xUbvLWKn9Ok7TOXg2BpnMAv6eON1wVo0Aa
-D265cqy6Le/toVg=
-	  </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cpauth.icos-cp.eu/saml/SAML2/POST" index="1" isDefault="true"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ICOS Carbon Portal</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Carbon Portal</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://icos-cp.eu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Oleg</md:GivenName>
-    <md:SurName>Mirzov</md:SurName>
-    <md:EmailAddress>mailto:oleg.mirzov@nateko.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/crowd.it.helsinki.fi-shibboleth.xml b/swamid-interfederations-2.0/crowd.it.helsinki.fi-shibboleth.xml
deleted file mode 100644
index 40566713..00000000
--- a/swamid-interfederations-2.0/crowd.it.helsinki.fi-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crowd.it.helsinki.fi/shibboleth">
-  <md: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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md: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://crowd.it.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fi">Helsingin yliopiston Crowd</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Helsingfors universitets Crowd</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Helsinki Crowd</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Helsingin yliopiston Crowd-kirjautumispalvelu</mdui:Description>
-        <mdui:Description xml:lang="sv">Helsingfors universitets Crowd authentication service</mdui:Description>
-        <mdui:Description xml:lang="en">University of Helsinki Crowd authentication service</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://crowd.it.helsinki.fi/tietosuojaseloste.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://crowd.it.helsinki.fi/tietosuojaseloste.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEozCCA4ugAwIBAgIRAKhneRs8CMQxhTAehEkaF4MwDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTUwMTEzMDAwMDAwWhcNMTgwMTEyMjM1OTU5WjBCMSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHTAbBgNVBAMTFGNyb3dkLml0Lmhl
-bHNpbmtpLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtp7HsMe+
-lqyUoaD1+QQRCONqGPSwNkYrEkDN06dJtpy+9xDLJQiKSBmF0vB57MTnkjQ+fOJo
-bWd/lx2bdJIvna0y5l9X7AGUqesgfQO5joOpqUvK8Q8xwXDnFxhz3kohpV8epdpB
-wo2gB0Nb8/k8shP3JQe87w4S4tDR4hMDk6tePuts60NhiU6f7ciJL5bPaw8YXreu
-MARuTai58KR58+8ud2WGaI3itjNWPWe7XRA5Jei66UWibY2tIvxWmw0tbod53bPR
-zPoA4WMVPOb4m31/ahOB64Dcq5x/A15UEP9K1tued8z4bEZHBSgAZ5QGrP+AxFQO
-RLClBDsC9LAMswIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
-G+GGKLD9tr0wHQYDVR0OBBYEFJAQIP+LACil6S/u1HMtsCM/66+7MA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
-LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
-cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
-b2NzcC51c2VydHJ1c3QuY29tMB8GA1UdEQQYMBaCFGNyb3dkLml0LmhlbHNpbmtp
-LmZpMA0GCSqGSIb3DQEBCwUAA4IBAQCWvzoK8rdJEHu+001banb0d8RdoJtbkGMe
-/tkr52yuCwovVkzgUv5eeHC9FYQ9xOcyg5ba+lx/AOQYODMHAuKH8GsN99cg6kZq
-gTc7OH07yNuRweMuMtBvOfjZpzLSlqRHWKMpwVDbPe07iMdeiA2WYD5OPO+AA4Qz
-0e+ZNIPZfgD/K75NcQOVkuNP82Wo6EC6agThXtfP3CkCV/YPRcFRzFvysSzGUl15
-aaMR5bVucUkVAQdHrcs46UL4s8gccFZvaWnW8kW9HKU6+IptlIPVg0NK4uoRdf3/
-F4VVG/swiKEnK9hhdQZiawFzSCyfU5r719MkFZF1fbwBWTMsnRFf</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://crowd.it.helsinki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Helsingin yliopiston Crowd</md:ServiceName>
-      <md:ServiceName xml:lang="en">University of Helsinki Crowd</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Helsingfors universitets Crowd</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Helsingin yliopiston Crowd-kirjautumispalvelu</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">University of Helsinki Crowd authentication service</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">Helsingfors universitets Crowd authentication service</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="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="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>Juha</md:GivenName>
-    <md:SurName>Niemi</md:SurName>
-    <md:EmailAddress>mailto:atk-autentikointi@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Juha</md:GivenName>
-    <md:SurName>Niemi</md:SurName>
-    <md:EmailAddress>mailto:atk-autentikointi@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/crowd.nordu.net-shibboleth.xml b/swamid-interfederations-2.0/crowd.nordu.net-shibboleth.xml
deleted file mode 100644
index e4aba27d..00000000
--- a/swamid-interfederations-2.0/crowd.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crowd.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">
-      <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.swamid.se/category/nren-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</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>
-      <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://crowd.nordu.net/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://crowd.nordu.net/Shibboleth.sso/DS/nordu.net" 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://crowd.nordu.net/Shibboleth.sso/DS/kalmar2" index="3"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">NORDUnet Tools</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NORDUnet Tools</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">NORDUnet Project and Issue tracking tools (JIRA and Confluence).</mdui:Description>
-        <mdui:Description xml:lang="en">NORDUnet Project and Issue tracking tools (JIRA and Confluence).</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://portal.nordu.net</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://portal.nordu.net</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>crowd.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crowd.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJANmt8Ciw6kb/MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2Nyb3dkLm5vcmR1Lm5ldDAeFw0xMDA1MzExMTI4MzVaFw0yMDA1MjgxMTI4
-MzVaMBoxGDAWBgNVBAMTD2Nyb3dkLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAPX2dT9VdcfFwxu7VA00KB7MmJj43/ReptLZNF1qEIEY
-LurgE63gRpalC1RLNx40V0a692ae9vlUJwr5SSuPE///KcIGe7MqKYqxMNR0EVUM
-gkLl/Iws6X6IKPXZFg/WeE/C/cmU6OzaTwdPBmg360Ys9veUOnt/3/ddRhSGRlr/
-QhrFJwZpeRQG/G7f8wIrvVT6HvsY1QOjW6YV43fon8eMBFz1WV7dAAx4L5d1JXX3
-EH+vY6a1nRj98qZPXZ7MY4HBMS8uU/B2/zTN+N9DFBpbwHYWvZQynIviGrUlgGi6
-bDMJH2k+sTGgy9EGZcaAqb2AECMidmXJk3/nOsX5cFECAwEAAaM9MDswGgYDVR0R
-BBMwEYIPY3Jvd2Qubm9yZHUubmV0MB0GA1UdDgQWBBTvR6U7d9zdmqbIl+g3SLa9
-8CChvzANBgkqhkiG9w0BAQUFAAOCAQEAWvDhU3Tk+cCZoThs2I2HLChX7cEjsjz9
-3ZHdWbsgJzPS0xVAdoR1FraNf6PYUvZxbDhsoO2UEZS5IUyOxdWWuP2jaqUpVxY/
-1fSTQQbvOujO+fZzNhJ8nIy/4FgFDWWqABHbVTfGVzImcxC1AJoQ8jkU9Dio5dIl
-uKQCDz8fu1hbkQZ/NP53cNDkTV0t/bvRtEHGrOJYc1rEFRuTLSkPvItsGffWHhIC
-mCrhgP7LeIv2iiNK7qgbhaFRHXAs/JMXAc/Y4YD1renUQCA4cLPF679N4oixMvxD
-Neib9lWMnEYRIynoqQE3UXYnb3GDinEg/soKH73QAq0dyjcfuk30FA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>crowd.nordu.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crowd.nordu.net</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJANmt8Ciw6kb/MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2Nyb3dkLm5vcmR1Lm5ldDAeFw0xMDA1MzExMTI4MzVaFw0yMDA1MjgxMTI4
-MzVaMBoxGDAWBgNVBAMTD2Nyb3dkLm5vcmR1Lm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAPX2dT9VdcfFwxu7VA00KB7MmJj43/ReptLZNF1qEIEY
-LurgE63gRpalC1RLNx40V0a692ae9vlUJwr5SSuPE///KcIGe7MqKYqxMNR0EVUM
-gkLl/Iws6X6IKPXZFg/WeE/C/cmU6OzaTwdPBmg360Ys9veUOnt/3/ddRhSGRlr/
-QhrFJwZpeRQG/G7f8wIrvVT6HvsY1QOjW6YV43fon8eMBFz1WV7dAAx4L5d1JXX3
-EH+vY6a1nRj98qZPXZ7MY4HBMS8uU/B2/zTN+N9DFBpbwHYWvZQynIviGrUlgGi6
-bDMJH2k+sTGgy9EGZcaAqb2AECMidmXJk3/nOsX5cFECAwEAAaM9MDswGgYDVR0R
-BBMwEYIPY3Jvd2Qubm9yZHUubmV0MB0GA1UdDgQWBBTvR6U7d9zdmqbIl+g3SLa9
-8CChvzANBgkqhkiG9w0BAQUFAAOCAQEAWvDhU3Tk+cCZoThs2I2HLChX7cEjsjz9
-3ZHdWbsgJzPS0xVAdoR1FraNf6PYUvZxbDhsoO2UEZS5IUyOxdWWuP2jaqUpVxY/
-1fSTQQbvOujO+fZzNhJ8nIy/4FgFDWWqABHbVTfGVzImcxC1AJoQ8jkU9Dio5dIl
-uKQCDz8fu1hbkQZ/NP53cNDkTV0t/bvRtEHGrOJYc1rEFRuTLSkPvItsGffWHhIC
-mCrhgP7LeIv2iiNK7qgbhaFRHXAs/JMXAc/Y4YD1renUQCA4cLPF679N4oixMvxD
-Neib9lWMnEYRIynoqQE3UXYnb3GDinEg/soKH73QAq0dyjcfuk30FA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd.nordu.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd.nordu.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd.nordu.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.nordu.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.nordu.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowd.nordu.net/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowd.nordu.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.nordu.net/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.nordu.net/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.nordu.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crowd.nordu.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd.nordu.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd.nordu.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowd.nordu.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowd.nordu.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">NORDUnet Tools</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">NORDUnet Tools (confluence, jira)</md:ServiceDescription>
-      <md:RequestedAttribute Name="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">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:EmailAddress>operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/crowdskills.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/crowdskills.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 6d83aa80..00000000
--- a/swamid-interfederations-2.0/crowdskills.ncl.ac.uk-shibboleth-metadata.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://crowdskills.ncl.ac.uk/shibboleth/metadata">
-  <!--
-		This is a "Crowd Skills" Shibboleth SP for the University of Newcastle upon Tyne.
-	-->
-  <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="2015-08-07T14:44:05Z">
-      <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://crowdskills.ncl.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6DCCAdCgAwIBAgIJAOU4R08iVl1iMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC2Nyb3dkc2tpbGxzMB4XDTE1MDgwNjExMDQ1MloXDTI1MDgwMzExMDQ1Mlow
-						FjEUMBIGA1UEAxMLY3Jvd2Rza2lsbHMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDRen50bMBraKjUTLL/OfCaiv8RcrlkDPSOfPGYWkzp3FPQPA1EURF7
-						cKQYIl+0zmaYM5n14cHIS9IvRAcHEEpdnQBqO94kNRE1DFVaCQw/2dSSafgbunEx
-						Tx0v3dHJv/0X6zacstIYSRj+lyEjuAmoe1PgwDVitlLoN0Qk1jbr8viNlXHgYStG
-						bMjDSxpZg14OqtbYh8GaRpMYoUqVzQrwp08hmDKpIbELTIa+F9idRSRK6CJTN78D
-						OtNpEJuv6i8He5LPSXKcqPJu1n+3sIZi25qistgxc26BF2OgKe5B63PWNCXCWMxr
-						lsgfTzCCXcXl+yP0ysUk7pV0CLH/1FCHAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2Ny
-						b3dkc2tpbGxzMB0GA1UdDgQWBBQXuGLwu08yHj34HFP2woB/Wnaa0TANBgkqhkiG
-						9w0BAQUFAAOCAQEAFLTlZ6Ltm1R3NUmxX2pp+xle22B7STeOq3H/gUW7pkJPi2Pi
-						FJEjS1HnOtoR8dSh/eXWUf6YZsoH1wpSCx+XObNv5iwtcY/JU9CKqMoT6+EXnoWv
-						YLRJF16S500AFuaYRY6VQ1DtpoUhcI62NhzkXc7m8tKgEd/ZOLXQqpyAwho9PKUt
-						C953PAo4fjcv64SRbOFZF4+cW+oRFlbdiLQatPjlYaiHi1W4mVxfVdHpE0XkLm3h
-						5+qM3/iIDrMFGj8+DITylrq5GN0+Gr9ucyHd8eaaDrQtNoGFqJH2YIiH7nvqLpMo
-						ggaP5VjpxxW0mUDliBDYf/hIcOV9P2sOtxqxrg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://crowdskills.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://crowdskills.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newcastle University Crowd Skills SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Franks</SurName>
-    <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Franks</SurName>
-    <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/crux.hrz.tu-freiberg.de.xml b/swamid-interfederations-2.0/crux.hrz.tu-freiberg.de.xml
deleted file mode 100644
index be6882ac..00000000
--- a/swamid-interfederations-2.0/crux.hrz.tu-freiberg.de.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://crux.hrz.tu-freiberg.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-freiberg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>crux.hrz.tu-freiberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crux.hrz.tu-freiberg.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Bergakademie Freiberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtjCCBJ6gAwIBAgIEC23bKjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-REUxNjA0BgNVBAoTLVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEJlcmdha2FkZW1p
-ZSBGcmVpYmVyZzEjMCEGA1UECxMaVW5pdmVyc2l0YWV0c3JlY2hlbnplbnRydW0x
-LzAtBgNVBAMTJlRVIEJlcmdha2FkZW1pZSBGcmVpYmVyZyBDQSAoVFVCQUYtQ0Ep
-MSYwJAYJKoZIhvcNAQkBFhd0dWJhZi1jYUB0dS1mcmVpYmVyZy5kZTAeFw0wNzEx
-MjkwNjM1MDdaFw0xMjExMjcwNjM1MDdaMIGMMQswCQYDVQQGEwJERTE2MDQGA1UE
-ChMtVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVyZ2FrYWRlbWllIEZyZWliZXJn
-MSMwIQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-Y3J1eC5ocnoudHUtZnJlaWJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC9aglDLKz9K2Qvov5FWUVk/IiGuUbJE26XxqQEsBDnfc/x8xAkICYt
-Ca82Z0u7RycCuw+INsm1i4N7+Wgq9OJ0nSNxJsDEU9gFzz0EYq8T7zx8OjOehtGA
-N1dk13SfXowHrKEDV8h9366eFPEm5WA+FnwyYoKLR5Bt4UsVliwvxThRCenwtzC2
-XQWLFQ/0NfDz+hu+3/6Ztlztqv2jX3oiZ0+i6IUh8VVTUJ6bIU3gvRJxv/OKlfLj
-1M3AxJlER1Gg51iWoikK4EzywVfOf/f2i7aWKxUbwf+RYGbXI5QlrCr939bM6wuP
-q92jaRlnY3bkPJTxsqlqN0KCRZq1g/8HAgMBAAGjggHlMIIB4TAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFKN9+stq7mPv+OHG5iss3iLw9xouMB8GA1UdIwQYMBaAFJ9RkPeYCvQ/
-FQ8Otgqpf7c1HR0tMCsGA1UdEQQkMCKBIEFuZHJlYXMuS2x1Z2VAaHJ6LnR1LWZy
-ZWliZXJnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+oDyG
-Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJhLWZyZWliZXJnLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
-dS1iYS1mcmVpYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAD1se/MDGCLCBxWGVDcTWMGS4xKSdHxDaX1ekP0odZGs+RbM3/RS
-zuJPLR4GXWcRJPRWCi39F8zSYwaawafatlPV0MqndSvLlqsVU6yDSb9uFplkMfR0
-LCbKqGQUG6FZ7Tx3wUhUVQ8ItfVWLiDtqINEi4cBZUtsI/gnQMWgjMo/vu1ja0/G
-HtifOPG0hVN/kEIBMRfhiF2TqPv4SYr0b8VORIOXsYHCvILWrmHCtVu6QloMtNT+
-7Afn7H7lOoDxbEHWQlfKJcO0Y5J2BYtW0ifqXsGeDxX1o58ohMgtG8OJI8WLhHTG
-2+D4NuRPaFIgBLbza19e3Dq4YQtEccXfhS8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>crux.hrz.tu-freiberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crux.hrz.tu-freiberg.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Bergakademie Freiberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtjCCBJ6gAwIBAgIEC23bKjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-REUxNjA0BgNVBAoTLVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEJlcmdha2FkZW1p
-ZSBGcmVpYmVyZzEjMCEGA1UECxMaVW5pdmVyc2l0YWV0c3JlY2hlbnplbnRydW0x
-LzAtBgNVBAMTJlRVIEJlcmdha2FkZW1pZSBGcmVpYmVyZyBDQSAoVFVCQUYtQ0Ep
-MSYwJAYJKoZIhvcNAQkBFhd0dWJhZi1jYUB0dS1mcmVpYmVyZy5kZTAeFw0wNzEx
-MjkwNjM1MDdaFw0xMjExMjcwNjM1MDdaMIGMMQswCQYDVQQGEwJERTE2MDQGA1UE
-ChMtVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVyZ2FrYWRlbWllIEZyZWliZXJn
-MSMwIQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-Y3J1eC5ocnoudHUtZnJlaWJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC9aglDLKz9K2Qvov5FWUVk/IiGuUbJE26XxqQEsBDnfc/x8xAkICYt
-Ca82Z0u7RycCuw+INsm1i4N7+Wgq9OJ0nSNxJsDEU9gFzz0EYq8T7zx8OjOehtGA
-N1dk13SfXowHrKEDV8h9366eFPEm5WA+FnwyYoKLR5Bt4UsVliwvxThRCenwtzC2
-XQWLFQ/0NfDz+hu+3/6Ztlztqv2jX3oiZ0+i6IUh8VVTUJ6bIU3gvRJxv/OKlfLj
-1M3AxJlER1Gg51iWoikK4EzywVfOf/f2i7aWKxUbwf+RYGbXI5QlrCr939bM6wuP
-q92jaRlnY3bkPJTxsqlqN0KCRZq1g/8HAgMBAAGjggHlMIIB4TAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFKN9+stq7mPv+OHG5iss3iLw9xouMB8GA1UdIwQYMBaAFJ9RkPeYCvQ/
-FQ8Otgqpf7c1HR0tMCsGA1UdEQQkMCKBIEFuZHJlYXMuS2x1Z2VAaHJ6LnR1LWZy
-ZWliZXJnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+oDyG
-Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJhLWZyZWliZXJnLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
-dS1iYS1mcmVpYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAD1se/MDGCLCBxWGVDcTWMGS4xKSdHxDaX1ekP0odZGs+RbM3/RS
-zuJPLR4GXWcRJPRWCi39F8zSYwaawafatlPV0MqndSvLlqsVU6yDSb9uFplkMfR0
-LCbKqGQUG6FZ7Tx3wUhUVQ8ItfVWLiDtqINEi4cBZUtsI/gnQMWgjMo/vu1ja0/G
-HtifOPG0hVN/kEIBMRfhiF2TqPv4SYr0b8VORIOXsYHCvILWrmHCtVu6QloMtNT+
-7Afn7H7lOoDxbEHWQlfKJcO0Y5J2BYtW0ifqXsGeDxX1o58ohMgtG8OJI8WLhHTG
-2+D4NuRPaFIgBLbza19e3Dq4YQtEccXfhS8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://crux.hrz.tu-freiberg.de:8443/shibboleth-idp/Artifact" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://crux.hrz.tu-freiberg.de/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-freiberg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>crux.hrz.tu-freiberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crux.hrz.tu-freiberg.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Bergakademie Freiberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtjCCBJ6gAwIBAgIEC23bKjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-REUxNjA0BgNVBAoTLVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEJlcmdha2FkZW1p
-ZSBGcmVpYmVyZzEjMCEGA1UECxMaVW5pdmVyc2l0YWV0c3JlY2hlbnplbnRydW0x
-LzAtBgNVBAMTJlRVIEJlcmdha2FkZW1pZSBGcmVpYmVyZyBDQSAoVFVCQUYtQ0Ep
-MSYwJAYJKoZIhvcNAQkBFhd0dWJhZi1jYUB0dS1mcmVpYmVyZy5kZTAeFw0wNzEx
-MjkwNjM1MDdaFw0xMjExMjcwNjM1MDdaMIGMMQswCQYDVQQGEwJERTE2MDQGA1UE
-ChMtVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVyZ2FrYWRlbWllIEZyZWliZXJn
-MSMwIQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-Y3J1eC5ocnoudHUtZnJlaWJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC9aglDLKz9K2Qvov5FWUVk/IiGuUbJE26XxqQEsBDnfc/x8xAkICYt
-Ca82Z0u7RycCuw+INsm1i4N7+Wgq9OJ0nSNxJsDEU9gFzz0EYq8T7zx8OjOehtGA
-N1dk13SfXowHrKEDV8h9366eFPEm5WA+FnwyYoKLR5Bt4UsVliwvxThRCenwtzC2
-XQWLFQ/0NfDz+hu+3/6Ztlztqv2jX3oiZ0+i6IUh8VVTUJ6bIU3gvRJxv/OKlfLj
-1M3AxJlER1Gg51iWoikK4EzywVfOf/f2i7aWKxUbwf+RYGbXI5QlrCr939bM6wuP
-q92jaRlnY3bkPJTxsqlqN0KCRZq1g/8HAgMBAAGjggHlMIIB4TAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFKN9+stq7mPv+OHG5iss3iLw9xouMB8GA1UdIwQYMBaAFJ9RkPeYCvQ/
-FQ8Otgqpf7c1HR0tMCsGA1UdEQQkMCKBIEFuZHJlYXMuS2x1Z2VAaHJ6LnR1LWZy
-ZWliZXJnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+oDyG
-Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJhLWZyZWliZXJnLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
-dS1iYS1mcmVpYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAD1se/MDGCLCBxWGVDcTWMGS4xKSdHxDaX1ekP0odZGs+RbM3/RS
-zuJPLR4GXWcRJPRWCi39F8zSYwaawafatlPV0MqndSvLlqsVU6yDSb9uFplkMfR0
-LCbKqGQUG6FZ7Tx3wUhUVQ8ItfVWLiDtqINEi4cBZUtsI/gnQMWgjMo/vu1ja0/G
-HtifOPG0hVN/kEIBMRfhiF2TqPv4SYr0b8VORIOXsYHCvILWrmHCtVu6QloMtNT+
-7Afn7H7lOoDxbEHWQlfKJcO0Y5J2BYtW0ifqXsGeDxX1o58ohMgtG8OJI8WLhHTG
-2+D4NuRPaFIgBLbza19e3Dq4YQtEccXfhS8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>crux.hrz.tu-freiberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=crux.hrz.tu-freiberg.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Bergakademie Freiberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtjCCBJ6gAwIBAgIEC23bKjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-REUxNjA0BgNVBAoTLVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IEJlcmdha2FkZW1p
-ZSBGcmVpYmVyZzEjMCEGA1UECxMaVW5pdmVyc2l0YWV0c3JlY2hlbnplbnRydW0x
-LzAtBgNVBAMTJlRVIEJlcmdha2FkZW1pZSBGcmVpYmVyZyBDQSAoVFVCQUYtQ0Ep
-MSYwJAYJKoZIhvcNAQkBFhd0dWJhZi1jYUB0dS1mcmVpYmVyZy5kZTAeFw0wNzEx
-MjkwNjM1MDdaFw0xMjExMjcwNjM1MDdaMIGMMQswCQYDVQQGEwJERTE2MDQGA1UE
-ChMtVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVyZ2FrYWRlbWllIEZyZWliZXJn
-MSMwIQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-Y3J1eC5ocnoudHUtZnJlaWJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC9aglDLKz9K2Qvov5FWUVk/IiGuUbJE26XxqQEsBDnfc/x8xAkICYt
-Ca82Z0u7RycCuw+INsm1i4N7+Wgq9OJ0nSNxJsDEU9gFzz0EYq8T7zx8OjOehtGA
-N1dk13SfXowHrKEDV8h9366eFPEm5WA+FnwyYoKLR5Bt4UsVliwvxThRCenwtzC2
-XQWLFQ/0NfDz+hu+3/6Ztlztqv2jX3oiZ0+i6IUh8VVTUJ6bIU3gvRJxv/OKlfLj
-1M3AxJlER1Gg51iWoikK4EzywVfOf/f2i7aWKxUbwf+RYGbXI5QlrCr939bM6wuP
-q92jaRlnY3bkPJTxsqlqN0KCRZq1g/8HAgMBAAGjggHlMIIB4TAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFKN9+stq7mPv+OHG5iss3iLw9xouMB8GA1UdIwQYMBaAFJ9RkPeYCvQ/
-FQ8Otgqpf7c1HR0tMCsGA1UdEQQkMCKBIEFuZHJlYXMuS2x1Z2VAaHJ6LnR1LWZy
-ZWliZXJnLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwQKA+oDyG
-Omh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmEtZnJlaWJlcmctY2EvcHViL2Ny
-bC9jYWNybC5jcmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJhLWZyZWliZXJnLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
-dS1iYS1mcmVpYmVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAD1se/MDGCLCBxWGVDcTWMGS4xKSdHxDaX1ekP0odZGs+RbM3/RS
-zuJPLR4GXWcRJPRWCi39F8zSYwaawafatlPV0MqndSvLlqsVU6yDSb9uFplkMfR0
-LCbKqGQUG6FZ7Tx3wUhUVQ8ItfVWLiDtqINEi4cBZUtsI/gnQMWgjMo/vu1ja0/G
-HtifOPG0hVN/kEIBMRfhiF2TqPv4SYr0b8VORIOXsYHCvILWrmHCtVu6QloMtNT+
-7Afn7H7lOoDxbEHWQlfKJcO0Y5J2BYtW0ifqXsGeDxX1o58ohMgtG8OJI8WLhHTG
-2+D4NuRPaFIgBLbza19e3Dq4YQtEccXfhS8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://crux.hrz.tu-freiberg.de:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Freiberg (Technische Universität Bergakademie)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">TU Bergakademie Freiberg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-freiberg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Martin</GivenName>
-    <SurName>Morgenstern</SurName>
-    <EmailAddress>martin.morgenstern@hrz.tu-freiberg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Morgenstern</SurName>
-    <EmailAddress>martin.morgenstern@hrz.tu-freiberg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/csbmth.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/csbmth.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index eca9f6a1..00000000
--- a/swamid-interfederations-2.0/csbmth.sisoshibboleth.co.uk-entity.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://csbmth.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Bournemouth University ~ CSBmth, Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2013-06-06T10:39:05Z"/>
-  </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://csbmth.siso.co/sso/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://csbmth.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Bournemouth University ~ CSBmth, Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ CSBmth, Online Resource Booking</mdui:Description>
-        <mdui:Logo height="60" width="60">https://shibboleth.siso.co/siso-logo60x60.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://csbmth.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://csbmth.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://csbmth.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://csbmth.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://csbmth.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://csbmth.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://csbmth.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Bournemouth University ~ CSBmth, Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/csueastbay.infoready4.com-shibboleth.xml b/swamid-interfederations-2.0/csueastbay.infoready4.com-shibboleth.xml
deleted file mode 100644
index 6d54677c..00000000
--- a/swamid-interfederations-2.0/csueastbay.infoready4.com-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://csueastbay.infoready4.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://csueastbay.infoready4.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">InfoReady Review - CSU East Bay</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC6zCCAdOgAwIBAgIJAOO9wmxE2PCSMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGluZm9yZHl3aW4wMjAeFw0xMzEwMjkwNjE0NDlaFw0yMzEwMjcwNjE0NDla
-MBcxFTATBgNVBAMTDGluZm9yZHl3aW4wMjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMpdE35LzF2eEaAhLfxtotv6XhMXfkOMbugHq8xk5rhyx7RKS+Ku
-t9wW8Mv2rG7NAJw+8167dP6N2RQKpRBn17FIOhm/cuSNtiTBJtA9QiTEkyN5D1ma
-ykJjlD95ymo0XdRDWwz/6IP5v+d95BlfbnlkswWOGOMLxCtaWCSZQ00RJFDKudL5
-IrK+2A1KwF4O+DxqivhdLsd/yA+IjX1efYnT7MPsd7Yyh5wKXKkGbKEg9yAW65Dt
-x2xbBCjDT2PCBhJ4ZuRfUv8whBCT2qgH6+pQ5JBN9ZDz1iGDFp8XfQ27UtzlFdBc
-cjvWmtOh/V35fBXl5LIbJdU/ypJMBwehxbcCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-aW5mb3JkeXdpbjAyMB0GA1UdDgQWBBQTyklRhSLuL0VcI0Nv4tQhZYqHITANBgkq
-hkiG9w0BAQUFAAOCAQEAJyNYKdKAFdp7xvqnjszw+AF3dYl3HQKe5bC0M+gu7G+2
-hJL2D70cFCXXi2bNcdyLsFVPiecMo69QinOP3kqCPNL7S5pSjm48T9bTiRr4WNy1
-hkxJ7nCV++z696YqbE7WYec9LEpcNDnDnmDfQOxvxzdtpIyM3Egw+koKEZu13ebw
-zAs2xgBj3V5YWmzS7nk1wPPJBKpr+9W5xixEGfaKfrrQXayP/LVyN+u/3BjZCZfE
-bfqmalH+rjpJ7ZCck4CQFxCvnLhwl+L5DEuEFXmgTzk7EDb65no+rXaZQd3/IEre
-sazovBHNw8FPYGiOCi2757flvBsb6gW+FbN0SPmtSQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://csueastbay.infoready4.com/Shibboleth.sso/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://csueastbay.infoready4.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://csueastbay.infoready4.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://csueastbay.infoready4.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://csueastbay.infoready4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://csueastbay.infoready4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://csueastbay.infoready4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">InfoReady Review - CSU East Bay</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">InfoReady Corp</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">InfoReady Corp</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.infoready4.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Testa</md:GivenName>
-    <md:EmailAddress>jtesta@inforeadycorp.om</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ct0.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/ct0.cirqahosting.com-shibboleth.xml
deleted file mode 100644
index cbbbf8c5..00000000
--- a/swamid-interfederations-2.0/ct0.cirqahosting.com-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://ct0.cirqahosting.com/shibboleth">
-  <!--
-		This is an "IS Oxford Heritage Cirqa Test Server 0" Shibboleth SP for IS Oxford Ltd.
-	-->
-  <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="2015-01-23T14:28:05Z">
-      <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">IS Oxford Heritage Cirqa Test Server 0</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IS Oxford's test server zero for Heritage Cirqa and Heritage Online.</mdui:Description>
-      </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://ct0.cirqahosting.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://ct0.cirqahosting.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAJXCrMqE2P9KMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGmN0MC5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDEyMjE2MDMzOFoX
-						DTI1MDExOTE2MDMzOFowJTEjMCEGA1UEAxMaY3QwLmlzb3hmb3JkLWhvc3Rpbmcu
-						bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDF0P3NYvYeSAcJ
-						pb6PAVJ3BJlwqOYn/gI32UQyMkDx1tuma1YMguN+qFhPXjPelPGLQjTu5uiVUKxq
-						923GT3K+zOjeHA2PYLEPb87c/4gEKNcISQ4+7HRbcQ4CNpka/gMYZwoj2n03AWR2
-						+3cLDIjFkxgGLUvCqf+woMCe4ibfDnNdNfHIRGHqf9Ig5/kA0rLLwdWiG3Ni3lS6
-						XnfbZiFlrl+pGphxn7DTz/kIOO30eyLqsMYTbN4a7stsTognmIvMn81SsHZFDlmc
-						bjG6Li4pup93azLJ/oL71lpCjq8X1UpkWjPPSnCVUcyGyhlbgt2MXAKDyzYyxW0i
-						FfWy+L6/AgMBAAGjSDBGMCUGA1UdEQQeMByCGmN0MC5pc294Zm9yZC1ob3N0aW5n
-						LmxvY2FsMB0GA1UdDgQWBBT8AZVMa93QvqUSr3jzjjqrnQbrUTANBgkqhkiG9w0B
-						AQUFAAOCAQEAYjPmH6RGRlaX8F7nFlBvBw3emJiDWM37n5AsaOFpFvT4cM9+821E
-						tkRHXx6RUgQsY0wtEDgGnfwUiOSMWZgDwHQ1tJIU3ZiUJX5jGvmVVXXQc1DP2aqS
-						7+W3hpSjMDqSg4UEdbdIRK6tp33FDU+N3ODPpMQiA9BO/9+I5HlVF9qTf3bboMRn
-						vzlz8MaQdTjd0WCNIWwgwHDV9oarqFVlR2ua47I4S0+uFZuVvANjT3aWHrs+HQEC
-						2d+z3aSYxXX1niPf2VzWZAt+EsudeCodby4bcK/ZAyJzWi4PaJ9RAlk7JFfVclmd
-						klAUpve3xeJcOQJGYv1NItVmF0PCkrmu0Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://ct0.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ct0.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IS Oxford Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IS Oxford Heritage Cirqa Test Server 0</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.isoxford.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lee</GivenName>
-    <SurName>Orchard</SurName>
-    <EmailAddress>mailto:lee@isoxford.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Salvesen</SurName>
-    <EmailAddress>mailto:david@isoxford.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cts-dev.ngs.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/cts-dev.ngs.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index b191331d..00000000
--- a/swamid-interfederations-2.0/cts-dev.ngs.ac.uk-shibboleth-sp.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://cts-dev.ngs.ac.uk/shibboleth-sp">
-  <!--
-		This is a "CTS development" Shibboleth SP for the Science and Technology Facilities Council.
-	-->
-  <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-08-13T15:41:55Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor WantAssertionsSigned="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://cts-dev.ngs.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CTS development</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Development SP for NES SARoNGS server.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+jCCAeKgAwIBAgIJALEcGlMiED8+MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWN0cy1kZXYubmdzLmFjLnVrMB4XDTEyMDgxNTE0MjM1MVoXDTIyMDgxMzE0
-						MjM1MVowHDEaMBgGA1UEAxMRY3RzLWRldi5uZ3MuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDUdK6J5wg+5C3XYk84xtApr1yJtuCx4n6mcX0O
-						6VHocCab3ROfBhzZZIzzG88n5cE80bhLO+bPPGTv6RQGRz/zyH++S7halU+MUj6Y
-						S3S1E5z6EYPM2FuoY4O4PiKZbLsPAvBSRcPy9R32ZKDLi9/Wxu0AudB0Pueft0o2
-						4GmEwGQoEU1zcBnm5UTQkK8BFciPHGsnsRBnLjUbMDPYqOzvcMEfeyZ4TbVnyrFV
-						zjNSIIQAhoGOXcumy/TzWE3ItQOMKwpgFpJAu0ESH6+L4u7tzZh/YI55LSEIeWdT
-						5LWv73sD7qsmMrsaLywriBYqscQ+w0sXjRAwRHIwpFFz/I21AgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEWN0cy1kZXYubmdzLmFjLnVrMB0GA1UdDgQWBBRnwG5eWrKe/lPu
-						HZ4m4O7meVYuHjANBgkqhkiG9w0BAQUFAAOCAQEAQbFdqMTEPK1BXxPinmL7a+PY
-						MVNBX7GEFJtA5+pLDlFW1LONdaiWT+6DwjGhy5W8zNNAJA/HXnpVetU9JfAZq0Mj
-						8aHTadN84/xwzvYxparP7jA/lThYpFzEVm7IPZ09xHDR/FiH2oA9R4h3zD6gvBJD
-						mpR0lnz7iXjMB5vq1Hz1tHddkaX+ffp6cltDwRrOYzvYeuCXk6jkZHx5C/tBfB9r
-						YmAXwx0UJskbUvEL2EtPQBNcJUt0Xrs+P0HXxwA4uDQOBX5K/NhAhhz5A9n02l8r
-						DeRgH/OFbPn1DgrOvHjHOdgKHNxXPzW4BRhl9jaPwofj6qysJ183Wr7GLmTOlA==
-					</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://cts-dev.ngs.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cts-dev.ngs.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Science and Technology Facilities Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CTS development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stfc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@grid-support.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Suleman</GivenName>
-    <SurName>Tariq</SurName>
-    <EmailAddress>mailto:suleman.tariq@stfc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cts.ngs.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/cts.ngs.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 0a45d274..00000000
--- a/swamid-interfederations-2.0/cts.ngs.ac.uk-shibboleth-sp.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://cts.ngs.ac.uk/shibboleth-sp">
-  <!--
-		This is a "NGS SARoNGS CTS SP" Shibboleth SP for the Science and Technology Facilities Council.
-	-->
-  <Extensions>
-    <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/2000/09/xmldsig#rsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-12T17:11:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor WantAssertionsSigned="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://cts.ngs.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID0DCCArigAwIBAgIJAPy+FncP9T6hMA0GCSqGSIb3DQEBCwUAMGkxCzAJBgNV
-						BAYTAkdCMRQwEgYDVQQIDAtPeGZvcmRzaGlyZTEPMA0GA1UEBwwGRGlkY290MQ0w
-						CwYDVQQKDARTVEZDMQwwCgYDVQQLDANSSUcxFjAUBgNVBAMMDWN0cy5uZ3MuYWMu
-						dWswHhcNMTUwMzI3MTU0OTIxWhcNMjUwMzI0MTU0OTIxWjBpMQswCQYDVQQGEwJH
-						QjEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBkRpZGNvdDENMAsGA1UE
-						CgwEU1RGQzEMMAoGA1UECwwDUklHMRYwFAYDVQQDDA1jdHMubmdzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlVbweBri79g1aA4zIGdMeS1Q
-						i711ySMFH//UOi3akBIE3Ua693n9sqfmKR+KCUUTXbObTUCvFSLw61eXF2VHwUqd
-						Ymslj+nMaSc/Vy6heMsTC0avlLsSHxv7SW4RySJFfmomfsZRz31Omm0DQrcRXiBA
-						pOsxnrUdCuFwoC0TulTXRoWrlHlX8tWZeik9aYKHTyw22gvAxqXmyNS6iOcK+lL8
-						3NIpSebjwQXmFwLdBYVMcgFQ9BW0k0QXi6rLP8liV/0reCs1PWU3euJojZKvNUoA
-						+qMfqlgmfBGGQzbFlMY9F9x6StUu2uwxPFtOLbE0yB6TuMc/Msk6nRGvEYyvVwID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUet9wzayEO/r7G/mtkH93hIviBHgw
-						HwYDVR0jBBgwFoAUet9wzayEO/r7G/mtkH93hIviBHgwDQYJKoZIhvcNAQELBQAD
-						ggEBAFr4DfmxuAo3ez8q4ARLu0mhWl3ugP3iPH0HW/9xWwjKyTKeyJGiCnYP8Wby
-						Si9KFOCifhw97QJpUovw26bYV4aa5KRbUsECZoWRUvxivk+LlOcPlseXudaSUhMH
-						Ss8MEO8KlCf27gI9EAqaz1BChiG85umJWxZh/Elr4KYlp8J86AT6dQwHjprxNh8F
-						RPf+nkgKjovy0xiMw6jYsX5FB/3PMsKryu/Cjz2L4OqbkHHQr9mI1QSKRYcQEN3r
-						zKxuIMJL5kJvBfpV1noJWS9O1movDQKsTlFXsj6606UA1gDGBNVl5qavzfVQPDm0
-						kOmJF5iza0i/14ZgVxOhXcsG5SU=
-					</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://cts.ngs.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cts.ngs.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Science and Technology Facilities Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">STFC: NGS SARoNGS CTS SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ngs.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NGS HelpDesk</GivenName>
-    <EmailAddress>mailto:support@grid-support.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Suleman</GivenName>
-    <SurName>Tariq</SurName>
-    <EmailAddress>mailto:suleman.tariq@stfc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cumin.plu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/cumin.plu.edu-idp-shibboleth.xml
deleted file mode 100644
index bd119a0d..00000000
--- a/swamid-interfederations-2.0/cumin.plu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +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://cumin.plu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">plu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Pacific Lutheran University</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>
-MIIDHzCCAgegAwIBAgIUQV6I4TUOJYCHS1GanpwtrD/NzW8wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNY3VtaW4ucGx1LmVkdTAeFw0xMjA4MjgyMzQ0NDlaFw0z
-MjA4MjgyMzQ0NDlaMBgxFjAUBgNVBAMTDWN1bWluLnBsdS5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdLlX/eQP2Dg65mgqti8+QH6v6zCMfK7de
-xqh7I9fDgw9M7jmgdJ0qdx5MzkqUUprbAoK8XljzZF5hN49SKRU76fOYLEFxFSnl
-i/beXHwtnugEfJEQL0VRbKHRWN7QlattW6pDxtoSM/Aqj9Nij/IQ447NRR5pFglL
-JefJO+CxgoJz5xadyN7XUtyBukXCkLHUYqU6rzVN0nfmcICDuM33nUM3qVFzh/VS
-dLt+9x0EbbrfQz5wwgVhWCIDhA2hSETcQAzwZlJ2QseOY8MBvxTZt5C3/ktDF4ya
-LGHS9HQmuK2kOsevNpB6pelxJvRmNWj7Hfdgm3hfBHJiXjjUypDTAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWN1bWluLnBsdS5lZHWGJGh0dHBzOi8vY3VtaW4ucGx1LmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU6YTXYFPVSpVeeX/Ee8gOfVIA1SMw
-DQYJKoZIhvcNAQEFBQADggEBAHF/PtRrhuDck0CmLXiYWQlPspTRkzc5V01Dxgds
-E95IGCN0HH0D2MiuSX/NwPSqeXUbwB+s9IJay342XqrZLh8VjYVZUF9ZxY4cPgbr
-VhH7lO3QL9soPc0EGOnYo7GLG6+2qkPWFHZKuODxaI3nXoauYJjbytH7aTzK2PBU
-oKZnlLjUj7JW3HUpSfaNt67Y15fAkVxYUcf3TtqL9niX+JW4o/ubKCt4WIcTHO10
-aVp363RufOoKNsYPteL7W0o/wNbqdYFgNOAJhinOmUEi7v1zLMsTM8enRtrJm271
-4+Y1zE/SdCs5aEZM/lXdDSKCoqQUgE2BpSC915BcSdpVFkc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cumin.plu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cumin.plu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cumin.plu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cumin.plu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cumin.plu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUQV6I4TUOJYCHS1GanpwtrD/NzW8wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNY3VtaW4ucGx1LmVkdTAeFw0xMjA4MjgyMzQ0NDlaFw0z
-MjA4MjgyMzQ0NDlaMBgxFjAUBgNVBAMTDWN1bWluLnBsdS5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdLlX/eQP2Dg65mgqti8+QH6v6zCMfK7de
-xqh7I9fDgw9M7jmgdJ0qdx5MzkqUUprbAoK8XljzZF5hN49SKRU76fOYLEFxFSnl
-i/beXHwtnugEfJEQL0VRbKHRWN7QlattW6pDxtoSM/Aqj9Nij/IQ447NRR5pFglL
-JefJO+CxgoJz5xadyN7XUtyBukXCkLHUYqU6rzVN0nfmcICDuM33nUM3qVFzh/VS
-dLt+9x0EbbrfQz5wwgVhWCIDhA2hSETcQAzwZlJ2QseOY8MBvxTZt5C3/ktDF4ya
-LGHS9HQmuK2kOsevNpB6pelxJvRmNWj7Hfdgm3hfBHJiXjjUypDTAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWN1bWluLnBsdS5lZHWGJGh0dHBzOi8vY3VtaW4ucGx1LmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU6YTXYFPVSpVeeX/Ee8gOfVIA1SMw
-DQYJKoZIhvcNAQEFBQADggEBAHF/PtRrhuDck0CmLXiYWQlPspTRkzc5V01Dxgds
-E95IGCN0HH0D2MiuSX/NwPSqeXUbwB+s9IJay342XqrZLh8VjYVZUF9ZxY4cPgbr
-VhH7lO3QL9soPc0EGOnYo7GLG6+2qkPWFHZKuODxaI3nXoauYJjbytH7aTzK2PBU
-oKZnlLjUj7JW3HUpSfaNt67Y15fAkVxYUcf3TtqL9niX+JW4o/ubKCt4WIcTHO10
-aVp363RufOoKNsYPteL7W0o/wNbqdYFgNOAJhinOmUEi7v1zLMsTM8enRtrJm271
-4+Y1zE/SdCs5aEZM/lXdDSKCoqQUgE2BpSC915BcSdpVFkc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cumin.plu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Pacific Lutheran University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Pacific Lutheran University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.plu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>netadmin</md:GivenName>
-    <md:EmailAddress>netadmin@plu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David Allen</md:GivenName>
-    <md:EmailAddress>allendp@plu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>HelpDesk</md:GivenName>
-    <md:EmailAddress>helpdesk@plu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>netadmin</md:GivenName>
-    <md:EmailAddress>netadmin@plu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/customapps-uat.theiet.org-shibboleth.xml b/swamid-interfederations-2.0/customapps-uat.theiet.org-shibboleth.xml
deleted file mode 100644
index ca03c778..00000000
--- a/swamid-interfederations-2.0/customapps-uat.theiet.org-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://customapps-uat.theiet.org/shibboleth">
-  <!--
-		This is a "IET.tv registration test" Shibboleth SP for The Institution of Engineering and Technology.
-	-->
-  <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="2015-05-06T12:45:16Z">
-      <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://customapps-uat.theiet.org/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6DCCAdCgAwIBAgIJAK6IRxld3MbGMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC21mLXV0LXdzZWkxMB4XDTE1MDQyOTE5MTQyOVoXDTI1MDQyNjE5MTQyOVow
-						FjEUMBIGA1UEAxMLbWYtdXQtd3NlaTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDXR2jLGLpjGNdGTuKi/5fT7VyGvkPgkliAQwixI0UtKPDMwnkRcIZY
-						dY35LqTZ7Iu1WCXG4EP/QJpixTaKdYnln7VMg+EgSUi8vSZy3XDPIc7/t6AGd+wg
-						vj44DX5Ryy7ocjPwrAYrePCDyQJnafz7lKy3s+mc2ZaDw+KfFq8/Y0bxPFgxzmE+
-						mW9pKSk1oMyjhLly8eUsHAQCC9/V4XrvXdcObRusvRJQtylNF1l2H209RnKl4jGi
-						oAoGQk2r8LxrJSlGgDZphIwUSJ7m1BU5MPk5iUsSDOtsNeDI1kJgc3ZxfHdX4Mzr
-						Y/vo7qKOYsXBLYCWz9bg2bEpEmQ3U7UXAgMBAAGjOTA3MBYGA1UdEQQPMA2CC21m
-						LXV0LXdzZWkxMB0GA1UdDgQWBBSPaJxmcG+NgljYEDgiJxz3G5FctzANBgkqhkiG
-						9w0BAQUFAAOCAQEAEC2mbxtaXviCnrOBOaO+VtqpbcC5t+HXUgxwfbplRmVqxOC6
-						IIvvV3p7C0wRZTNWWLvdLRlk6zrs4QlarSXqLbR0EqZ+bypsvyG4gSCGBZzViEi9
-						TbYqbqD+wOEGgullXFK4lj4Je3xpQoTymR6JE89i7hdE8rv/H8V0M19/HMCD3fHd
-						FmM56IO3AUIq5wj9EZ3gwKyO5+DpNcjJjOXZvz5MC0PW0BWRxSBiNklZGonuajto
-						+WTJBV+Lvp6O8ZmAQSob1s3khrwxaLfbneO1JrayY42RCLO++U0aV2WvTMpTKFQ1
-						xf7yMcLeqKxuARxlDWsjmXF0ShnFIjqcL6/MAg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://customapps-uat.theiet.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://customapps-uat.theiet.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://customapps-uat.theiet.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://customapps-uat.theiet.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://customapps-uat.theiet.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://customapps-uat.theiet.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://customapps-uat.theiet.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://customapps-uat.theiet.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://customapps-uat.theiet.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://customapps-uat.theiet.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://customapps-uat.theiet.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Institution of Engineering and Technology</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IET.tv registration test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://tv.theiet.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Burbidge</SurName>
-    <EmailAddress>mailto:aburbidge@theiet.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Burbidge</SurName>
-    <EmailAddress>mailto:aburbidge@theiet.org</EmailAddress>
-  </ContactPerson>
-</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 9372561c..00000000
--- a/swamid-interfederations-2.0/customers.myunidays.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://customers.myunidays.com/shibboleth">
-  <!--
-		This is a "UNiDAYS - Perks of Student Life - Customers" Shibboleth SP for MYUNiDAYS 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="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"/>
-      <init: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="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/DSEdugate"/>
-      <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/DSEdugate" 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://customers.myunidays.com/Shibboleth.sso/AAF"/>
-      <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/AAF" 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://customers.myunidays.com/Shibboleth.sso/WAYFProd"/>
-      <init: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/Tuakiri"/>
-      <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/Tuakiri" 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://customers.myunidays.com/Shibboleth.sso/InCommonDS"/>
-      <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/InCommonDS" 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://customers.myunidays.com/Shibboleth.sso/DFN-AAI-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://customers.myunidays.com/Shibboleth.sso/DFN-AAI-test" index="7"/>
-      <init: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/DFN-AAI"/>
-      <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/DFN-AAI" index="8"/>
-      <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>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://customers.myunidays.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <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="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://customers.myunidays.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://customers.myunidays.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </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>
-  <ContactPerson contactType="technical">
-    <GivenName>Stephen</GivenName>
-    <SurName>Saidani</SurName>
-    <EmailAddress>mailto:stephen@myunidays.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/cwpub2.imodules.com-sp.xml b/swamid-interfederations-2.0/cwpub2.imodules.com-sp.xml
deleted file mode 100644
index a0c3f415..00000000
--- a/swamid-interfederations-2.0/cwpub2.imodules.com-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="http://cwpub2.imodules.com/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">Current Work Test</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDBDCCAeygAwIBAgIQzEDukSw9R5BHpxVmr1UwFjANBgkqhkiG9w0BAQQFADAX
-MRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wHhcNMTQwNjEwMjExODU3WhcNMzQwNjEw
-MjExODU2WjAXMRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDC5hlDfEQ7RoqQgtcZjOxN2FdUOMu4MI8hIeydiFDy
-1fT1t1jJHmFF5V4JDGpITIapK2caenljBcGl7CGC+Z6EXID8i0lxc7lLWOOrYkJb
-8PeuVOpbxTZfOxfkC3jf4IfLZPtBfDvWjYtVUPwDCpwLLE/GQzz6HySoMIcWAkQ9
-bPoAIITTRnDpo1f4J6nO81DKx0XjBVIbz6aTsF60pcXQzLJ69KGI5Jkh3DjmNbeq
-EXH6ENtq823q4JGXRrKvCPrTlt+79EI1p+ECSaRUx006raAYHktUTT2KY1oUlsuk
-qVA+LMmhX/+jF1fgOehHEurOiKQp2aGmeV4PnJ8pXKM9AgMBAAGjTDBKMEgGA1Ud
-AQRBMD+AEG94Y5yfOU4e+OzhpzVt1UyhGTAXMRUwEwYDVQQDEwxpbW9kdWxlcy5j
-b22CEMxA7pEsPUeQR6cVZq9VMBYwDQYJKoZIhvcNAQEEBQADggEBAFDDvIjK8eJO
-YjDqnY9DfzUEN6Vp80w3ZLhT/K49/McNbbGkt0bgg45MeJ78IxLdclTIhOEeHACN
-F71+XLb9PjRfISiB37V157w0nKF5MsMYU1dathFrVOzCIxvhERgoD4lMNtwZiKKH
-J/xYeczpnHz5iFpoiCvsvPTP5sZqAKvf5ovpermVcLyqEPJJHvLHe+TbwdwTuGMS
-pF2w1WQGpSgdbcxWWwmwpbeiF5ADI6UTS5txOfG0p8L2RTxgRJ6Nb7lNrelIEcup
-6nWHUla/60ENe+AN9qsqYh1vnknLi7kSMHwvtyzFQDHnXhwhLa9mkpsZVkeLEGsR
-MJlfQnuceWY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cwpubsecure.imodules.com/controls/login/AssertionConsumerService.aspx?sid=13410&amp;gid=2" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josh Wicoff</md:GivenName>
-    <md:EmailAddress>jwicoff@imodules.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-shibboleth.xml
deleted file mode 100644
index d8158bd4..00000000
--- a/swamid-interfederations-2.0/dadotsdev02.essex.ac.uk-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://dadotsdev02.essex.ac.uk/shibboleth">
-  <!--
-		This is a "UK Data Service Dotstat Development Server 02" Shibboleth SP for the University of Essex.
-	-->
-  <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="2015-03-06T10:05:46Z">
-      <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://dadotsdev02.essex.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAILDhwjr7ZN4MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2RhZG90c2RldjAyLmVzc2V4LmFjLnVrMB4XDTE1MDIyNTE2MTUwM1oXDTI1
-						MDIyMjE2MTUwM1owIjEgMB4GA1UEAxMXZGFkb3RzZGV2MDIuZXNzZXguYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlsK18Tb2IK838pdwwylTu
-						HiF86/nYePu9WhXOBNHq+2LGaA73+j+RVMQnZIvLOWEFDmUtPUZQCALEAy9cVWEy
-						v+clmkXG+yrRB2u2rxMRydNZvPWRyAyceYJtnHUtd6WGqh5P5YzK/h7z8aedHsOe
-						/pINhgmqQowunjXpKPRcVGvd3H5WVzILM9mqROfIJ6sV8I7a0eBBJN2lDLgeUzMO
-						bIYITWKnnVYnzouQU1UDRDCrO3hhuhX21fLE6Lt4BrQJrNMrkSCxDAYuYaHZP2n7
-						c7K4q1A5haGXN9H32eIqCqUcYp/mtf2mQ0Mqm88eDc2IItbs36kUQG9gfUHJp5p9
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2RhZG90c2RldjAyLmVzc2V4LmFjLnVrMB0G
-						A1UdDgQWBBS7fh8aeRB64R+kY5/JJpy41IP9WjANBgkqhkiG9w0BAQUFAAOCAQEA
-						FmsAVt9WPTgZ1bHRZcs9q4CqtIGGRJiRsWbSXIi9rOvt3ZeRYoP/rIF023z9vpEe
-						qEIJZNmXuGwYc9VDL+6qwPdLSNKqb3Zz5M9x7qYAB7VjqLf8lhkzv9HJJ1Cmpwlm
-						q5rJlWCPvdViJ44hMFwB6QEsvDHH34CDQgPegG2EY7Xkm7ugwnniTBqZYcyFU2SH
-						GO+cggiW6+7by2FTk33qTZaSTVMwKK5ZbesGjIriSgQVdHt4FWbE5pKhnNPTaPXH
-						QcjOIA/E0+h92TKhws2T4jj2gyoLE2+f3ah6zfItTKwJgB1yuTSpkVo2Hpnq8lak
-						c3GH0A8MBMfaHeUkrOsmgA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://dadotsdev02.essex.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dadotsdev02.essex.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Essex</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UK Data Service Dotstat Development Server 02</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ukdataservice.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Susan</GivenName>
-    <SurName>Noble</SurName>
-    <EmailAddress>mailto:Susan.Noble@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Syrotiuk</SurName>
-    <EmailAddress>mailto:nicholas.syrotiuk@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dadotsweb1.essex.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dadotsweb1.essex.ac.uk-shibboleth.xml
deleted file mode 100644
index 386f13c2..00000000
--- a/swamid-interfederations-2.0/dadotsweb1.essex.ac.uk-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://dadotsweb1.essex.ac.uk/shibboleth">
-  <!--
-		This is a "UK Data Service Dotstat Production server (Version 7)" Shibboleth SP for the University of Essex.
-	-->
-  <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="2015-05-05T08:03: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: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://dadotsweb1.essex.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAKjnriY74DziMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmRhZG90c3dlYjEuZXNzZXguYWMudWswHhcNMTUwNDIyMTIyMDE0WhcNMjUw
-						NDE5MTIyMDE0WjAhMR8wHQYDVQQDExZkYWRvdHN3ZWIxLmVzc2V4LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArT2aS9/q46teLSQZLyEMYOGM
-						wY3VyQmkBJ/xePd5WxEGX1IzWAw1d7glV6XBuSE4rprc84Hz2dVEDlCb2NZheIIt
-						GAfoWurKIyyi+v6m7LLSp9VGAUi7hXqi6eoceop1ei2foO+kmhYOlXGt8nKXgdML
-						jM3X90ab03q91/Xb3usia/WFrC61Ta9Z4/L0lJCtl3EyuWm0CLRBQH291nyLkqNE
-						q3pKrt3fVmbzgz+K+FXppyt38vdIG0bm+wMqSXdBNUMtTfiIG6p90UM8CIOqJtZY
-						fkhX5kLWkEJGZjt1swPXuEfQivTKpIbIUdqG1frEJQ8Ws2fAmo8D7PGiecRjuQID
-						AQABo0QwQjAhBgNVHREEGjAYghZkYWRvdHN3ZWIxLmVzc2V4LmFjLnVrMB0GA1Ud
-						DgQWBBTtm1Vzg3dzOyODStZMXAilmgJ6VjANBgkqhkiG9w0BAQUFAAOCAQEAW1uC
-						7aDFUnDcYYcZXj1+LUg57401KOCb3adqJy43uR4nlIuOmDqkCW0qrVUg//ZHjIdc
-						si8mv/5enPXxGGxU3ti5YL9+iMVgrZcqplzGyVdZsjRo1Y4ERJDIxXzSlvve8wER
-						Qh5E61YNmSJEGIIR1sguf3vlou0MvNuKLsiY1EPU7UAVWW+Yc8TIdWwvkNb12eTJ
-						m3V1TGhOB6QOgpJsxc5vQ7xt/eq6p6LOimQMWVBNyZdoX/BQbwVu9gz97UMG3OvS
-						Fv4lbhZmxO3Xc/7QkrH/8raZc7dddIhbTU3YMdOzTZnGFJaGmGWLRLvHzn8XICx9
-						dX8Y3VJ0YyQXEt/44A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://dadotsweb1.essex.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dadotsweb1.essex.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dadotsweb1.essex.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dadotsweb1.essex.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dadotsweb1.essex.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dadotsweb1.essex.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dadotsweb1.essex.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dadotsweb1.essex.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dadotsweb1.essex.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dadotsweb1.essex.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dadotsweb1.essex.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Essex</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UK Data Service Dotstat Production server (Version 7)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Susan</GivenName>
-    <SurName>Noble</SurName>
-    <EmailAddress>mailto:Susan.Noble@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Syrotiuk</SurName>
-    <EmailAddress>mailto:nicholas.syrotiuk@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dames.nesc.gla.ac.uk-shibboleth.xml
deleted file mode 100644
index 0410b235..00000000
--- a/swamid-interfederations-2.0/dames.nesc.gla.ac.uk-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://dames.nesc.gla.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2.2.3 SP 'DAMES Portal' for NeSC (Glasgow).
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://dames.nesc.gla.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAPQi2lDJZSZcMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDgwNTE2MTMxOVoXDTE5MDgw
-						MzE2MTMxOVowHzEdMBsGA1UEAxMUZGFtZXMubmVzYy5nbGEuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFiNFI3HRhi1pkWtlq5qrZi4EkX4Q1
-						ZphI0wyd3oYMRemFXDP7Qfz+aSOEOnPA5w755P2EGDe9u1O97ETEpcVI0L6ArAPf
-						tKJPQkX95DVgZUD0wnJJc3kuKT2rIWlx5au2cLkHLZCaOIW3k/pCL8DiEcpGCTdm
-						Fnc23dfCoHWZymteu+ddYqmXTYyp5cNEh/rJqx5iuY3hSYmfi0MHcKe7447qvuoS
-						fxl2Lb3cAZUZK/xIR866QWEXDhOABd2weZ+8QwVjAo0aSYFHsKM91YVSq6DHBQC8
-						PKayl04ua0sx5jO40OIFtWnnTaz5JVYeGXLSp/XhhA3xSl95aLGflmS5AgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBSS
-						LnX9HSDn4RLNE/BaliWemJU0YDANBgkqhkiG9w0BAQUFAAOCAQEAZaRyJs7v5746
-						UKnFKwHbhcV9BEdrqAlaSlVpzTW/MrZ9UPHVmwUvUkDbxGNJHGFWUP7RmWcKy3S1
-						fOdSHJaNUqxGN1rKXkXiu2Ti6XXk3SQVHh9A2SU/ihOuPuFc+8LIlNiznlpBnJWH
-						OwfkVyGYl/iixt8Q6QWvWniqkKbl7e6vAqrGMEkAFqVnXm/jZYUyp9sBnNmLLsQf
-						PCXbU+ts+rDkA9pH8rxv+NYkf7qa7+d4tJTJ7Akq5hwAKEGVOJHBksQNpDSkbBGZ
-						10RBzS9+he84NPSi0FdiJiKZf+rHfry5PWnH0KkdkfY/xW7Bf6ka3ZScxMIS++Jn
-						LVUfkyIKAQ==
-					</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>
-						MIIDAzCCAeugAwIBAgIJAPQi2lDJZSZcMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDgwNTE2MTMxOVoXDTE5MDgw
-						MzE2MTMxOVowHzEdMBsGA1UEAxMUZGFtZXMubmVzYy5nbGEuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFiNFI3HRhi1pkWtlq5qrZi4EkX4Q1
-						ZphI0wyd3oYMRemFXDP7Qfz+aSOEOnPA5w755P2EGDe9u1O97ETEpcVI0L6ArAPf
-						tKJPQkX95DVgZUD0wnJJc3kuKT2rIWlx5au2cLkHLZCaOIW3k/pCL8DiEcpGCTdm
-						Fnc23dfCoHWZymteu+ddYqmXTYyp5cNEh/rJqx5iuY3hSYmfi0MHcKe7447qvuoS
-						fxl2Lb3cAZUZK/xIR866QWEXDhOABd2weZ+8QwVjAo0aSYFHsKM91YVSq6DHBQC8
-						PKayl04ua0sx5jO40OIFtWnnTaz5JVYeGXLSp/XhhA3xSl95aLGflmS5AgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFGRhbWVzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBSS
-						LnX9HSDn4RLNE/BaliWemJU0YDANBgkqhkiG9w0BAQUFAAOCAQEAZaRyJs7v5746
-						UKnFKwHbhcV9BEdrqAlaSlVpzTW/MrZ9UPHVmwUvUkDbxGNJHGFWUP7RmWcKy3S1
-						fOdSHJaNUqxGN1rKXkXiu2Ti6XXk3SQVHh9A2SU/ihOuPuFc+8LIlNiznlpBnJWH
-						OwfkVyGYl/iixt8Q6QWvWniqkKbl7e6vAqrGMEkAFqVnXm/jZYUyp9sBnNmLLsQf
-						PCXbU+ts+rDkA9pH8rxv+NYkf7qa7+d4tJTJ7Akq5hwAKEGVOJHBksQNpDSkbBGZ
-						10RBzS9+he84NPSi0FdiJiKZf+rHfry5PWnH0KkdkfY/xW7Bf6ka3ZScxMIS++Jn
-						LVUfkyIKAQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dames.nesc.gla.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Glasgow</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NeSC (Glasgow): DAMES Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dames.org.uk/</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/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 58848650..00000000
--- a/swamid-interfederations-2.0/dans.idp.knaw.nl-simplesaml-saml2-idp-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://dans.idp.knaw.nl/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-09-10T20:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">dans.knaw.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">Data Archiving and Networked Services (KNAW)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Data Archiving and Networked Services (KNAW)</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Data Archiving and Networked Services (KNAW)</mdui:Description>
-        <mdui:Description xml:lang="en">Data Archiving and Networked Services (KNAW)</mdui:Description>
-        <mdui:Logo height="38" width="108">https://static.surfconext.nl/logos/idp/knaw-dans.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Data Archiving and Networked Services KNAW dans</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Data Archiving and Networked Services KNAW dans</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/37250172e5ee0e20a9477cdb1c0f9c19"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Data Archiving and Networked Services (KNAW)</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Data Archiving and Networked Services (KNAW)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Data Archiving and Networked Services (KNAW)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Data Archiving and Networked Services (KNAW)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.dans.knaw.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.dans.knaw.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/darlfam.darlington.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/darlfam.darlington.ac.uk-shibboleth.xml
deleted file mode 100644
index d0e45f70..00000000
--- a/swamid-interfederations-2.0/darlfam.darlington.ac.uk-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://darlfam.darlington.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Darlington College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">darlington.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDfjCCAmYCCQCfd04ndbp77DANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkRVUkhBTTETMBEGA1UEBxMKREFSTElOR1RPTjEbMBkGA1UE
-						ChMSREFSTElOR1RPTiBDT0xMRUdFMQswCQYDVQQLEwJJVDEhMB8GA1UEAxMYZGFy
-						bGZhbS5kYXJsaW5ndG9uLmFjLnVrMB4XDTEzMDIyNzEzMDAwOFoXDTIzMDIyNTEz
-						MDAwOFowgYAxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZEVVJIQU0xEzARBgNVBAcT
-						CkRBUkxJTkdUT04xGzAZBgNVBAoTEkRBUkxJTkdUT04gQ09MTEVHRTELMAkGA1UE
-						CxMCSVQxITAfBgNVBAMTGGRhcmxmYW0uZGFybGluZ3Rvbi5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALf2S6/2r5IbxIWlR7SVi1/ba7sgWKa5
-						/GKP8XSwAc38MLyj4/kgLZ0dTN59VM5icjOPvpJaUdkDVecR5B6WpPABCsQ7L/vx
-						K0sQaf1arynMl2ZbAJLNeab7wzVIlmY6mF2EgV/Od/DujnC9tK9bUX7xdrR0IAE6
-						geCst6x/iAPCHWRs0rlabxzR3uuY8dva3VRy5Q1E3wZPLsd61Y70kDUiVsU/Wj8B
-						SKqM9xGp3ciNzJozqPwNKbO9+0y+W6dOv2qZP2w8kLeCRJ9/Gwq2+S2Yrjb0GoBK
-						VV/2oXnX4Q0lFeAzySTV8DzugCEmGzAbNnzwLGv2RiodnKIc9c2iQWMCAwEAATAN
-						BgkqhkiG9w0BAQUFAAOCAQEAsTzNvSkDG0Ldj0orl7Y4GgKi+GvxLJ9ZNWSrYl3+
-						Xjjjx7uKgvaz2mM80d8gUdrFOklykZyDQ80PQW/4KYUC7i+Mgrrdj8RkE3UdGErV
-						lFGZ8+TU7jDrdmmK9JtKDkrCXs7N22lFSTZs7e72pQcez2aq+B17+CV2fuJZeWDb
-						aJGf9FUS7ggB3GD+EtCwkhxQU1vGoDs9HxUbBMsD3T9ce2DryPYOqsSsdACvFil+
-						OBPR70odKIk4LhmIfx8Nc3MzXilS/XVMw9JG68sXalkYQDjBT3/YR9DrywbE5zVe
-						khhFuq8lOaH+cpW82kov+HN3rQQLklwtd3AEAlaM+w4jiQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://darlfam.darlington.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://darlfam.darlington.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://darlfam.darlington.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://darlfam.darlington.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://darlfam.darlington.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://darlfam.darlington.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">darlington.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDfjCCAmYCCQCfd04ndbp77DANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkRVUkhBTTETMBEGA1UEBxMKREFSTElOR1RPTjEbMBkGA1UE
-						ChMSREFSTElOR1RPTiBDT0xMRUdFMQswCQYDVQQLEwJJVDEhMB8GA1UEAxMYZGFy
-						bGZhbS5kYXJsaW5ndG9uLmFjLnVrMB4XDTEzMDIyNzEzMDAwOFoXDTIzMDIyNTEz
-						MDAwOFowgYAxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZEVVJIQU0xEzARBgNVBAcT
-						CkRBUkxJTkdUT04xGzAZBgNVBAoTEkRBUkxJTkdUT04gQ09MTEVHRTELMAkGA1UE
-						CxMCSVQxITAfBgNVBAMTGGRhcmxmYW0uZGFybGluZ3Rvbi5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALf2S6/2r5IbxIWlR7SVi1/ba7sgWKa5
-						/GKP8XSwAc38MLyj4/kgLZ0dTN59VM5icjOPvpJaUdkDVecR5B6WpPABCsQ7L/vx
-						K0sQaf1arynMl2ZbAJLNeab7wzVIlmY6mF2EgV/Od/DujnC9tK9bUX7xdrR0IAE6
-						geCst6x/iAPCHWRs0rlabxzR3uuY8dva3VRy5Q1E3wZPLsd61Y70kDUiVsU/Wj8B
-						SKqM9xGp3ciNzJozqPwNKbO9+0y+W6dOv2qZP2w8kLeCRJ9/Gwq2+S2Yrjb0GoBK
-						VV/2oXnX4Q0lFeAzySTV8DzugCEmGzAbNnzwLGv2RiodnKIc9c2iQWMCAwEAATAN
-						BgkqhkiG9w0BAQUFAAOCAQEAsTzNvSkDG0Ldj0orl7Y4GgKi+GvxLJ9ZNWSrYl3+
-						Xjjjx7uKgvaz2mM80d8gUdrFOklykZyDQ80PQW/4KYUC7i+Mgrrdj8RkE3UdGErV
-						lFGZ8+TU7jDrdmmK9JtKDkrCXs7N22lFSTZs7e72pQcez2aq+B17+CV2fuJZeWDb
-						aJGf9FUS7ggB3GD+EtCwkhxQU1vGoDs9HxUbBMsD3T9ce2DryPYOqsSsdACvFil+
-						OBPR70odKIk4LhmIfx8Nc3MzXilS/XVMw9JG68sXalkYQDjBT3/YR9DrywbE5zVe
-						khhFuq8lOaH+cpW82kov+HN3rQQLklwtd3AEAlaM+w4jiQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://darlfam.darlington.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://darlfam.darlington.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">Darlington College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Darlington College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.darlington.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dean</GivenName>
-    <SurName>Stockdale</SurName>
-    <EmailAddress>mailto:dstockdale@darlington.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jeremy</GivenName>
-    <SurName>Mussell</SurName>
-    <EmailAddress>mailto:jmussell@darlington.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dash-dev.cdlib.org-shibboleth.xml b/swamid-interfederations-2.0/dash-dev.cdlib.org-shibboleth.xml
deleted file mode 100644
index 487fff8b..00000000
--- a/swamid-interfederations-2.0/dash-dev.cdlib.org-shibboleth.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dash-dev.cdlib.org/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://uc3-datashare-dev.cdlib.org/Shibboleth.sso/Login" 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://dash-dev.cdlib.org/Shibboleth.sso/Login" 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://dash-dev.berkeley.edu/Shibboleth.sso/Login" 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://dash-dev.ucop.edu/Shibboleth.sso/Login" 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://dev.dash.ucla.edu/Shibboleth.sso/Login" index="5"/>
-      <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://dash-dev2.cdlib.org/Shibboleth.sso/Login" index="6"/>
-      <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://dash-dev2.ucop.edu/Shibboleth.sso/Login" index="7"/>
-      <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://dash-dev.lib.uci.edu/Shibboleth.sso/Login" index="8"/>
-      <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://dash-dev.ucmerced.edu/Shibboleth.sso/Login" index="9"/>
-      <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://oneshare-dev.cdlib.org/Shibboleth.sso/Login" index="10"/>
-      <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://oneshare2-dev.cdlib.org/Shibboleth.sso/Login" index="11"/>
-      <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://dash-ucla-dev.cdlib.org/Shibboleth.sso/Login" index="12"/>
-      <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://datasets-dev.lbl.gov/Shibboleth.sso/Login" index="13"/>
-      <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://dash-dev.library.ucsc.edu/Shibboleth.sso/Login" index="14"/>
-      <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://uc3-dash2-dev.cdlib.org/Shibboleth.sso/Login" index="15"/>
-      <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://datashare-dev.ucsf.edu/Shibboleth.sso/Login" index="16"/>
-      <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://dash2-dev.cdlib.org/Shibboleth.sso/Login" index="17"/>
-      <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://dash2-dev.ucop.edu/Shibboleth.sso/Login" index="18"/>
-      <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://oneshare-aws-dev.cdlib.org/Shibboleth.sso/Login" index="19"/>
-      <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://dash-dev.ucr.edu/Shibboleth.sso/Login" index="20"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dash Development Instance</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Store and share research datasets</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://dash-dev.ucop.edu/xtf/search?smode=aboutPage</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://dash.ucop.edu/xtf/search?smode=policiesPage</mdui:PrivacyStatementURL>
-        <mdui:Logo height="87" width="400" xml:lang="en">https://dash-dev.cdlib.org/img/dash_cdl_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>
-MIIC+jCCAeKgAwIBAgIJAPV8HQr2HfY6MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXVjMy1kYXRhc2hhcmUtZGV2MB4XDTE0MDMxMjE4MTkxM1oXDTI0MDMwOTE4
-MTkxM1owHDEaMBgGA1UEAxMRdWMzLWRhdGFzaGFyZS1kZXYwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDDNTiEn2yq8IWj13fSOOlfMUgPkgUUmDTLTIQD
-RO/VQsQF/cGlCHA6SJ7Ud9iS/2MbKgkxyJ2G56871nQSJkD3QOHAKqPL/WjrdfrP
-374P5rh+Ht715wdkxpsBxp1btkCe/nTzze4k5rwZ3FcWS1vu8cI/sd1CAELaMeNd
-XrkZM90kev7pbBSs3PDz4GdpjNYbF5+RyK1YjmSw2+orR1VkNOKgbeMK2dBXQOSf
-Kd6gTgCFmTdrzlzmMrViiliUptSiAzDRBMH3EZGW3/1At19x6vS1P+/GPDc1ydWV
-bOuyFBwREHGMfRDH2il2xqoxSe6Q1j+6rIUYOhzTE7ZP2lBHAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXVjMy1kYXRhc2hhcmUtZGV2MB0GA1UdDgQWBBTItmGWGmuJQsXi
-eYn5pDtRoSQX2jANBgkqhkiG9w0BAQUFAAOCAQEAELeV/PelIhPuwM3M2VJzfB2S
-uJnmkTP8FWjWByLimRSLfhOTPJI7d3YF9an5tVSmCKbUO+NbAujvytgJ+f8Q0nd3
-Rv0ICl+/oSqTh9e7GT0/1NxiHXaHEPdm1BEnMyx1XwkONd/BDbFK5BSXWifD9koZ
-xtOsmxf5kEOsnosjdYoTWiV1+txEoXlAU7Chhfm2KwUtCCm3bfVceJZtF4s+RzfM
-Ows6BsG3eIjoyCpn/5jAm9M7Pcyu1FDcSiFdEDyyfwkyF+q0/EOOJGupqbi8pfwb
-hlRSekLVA3xw94vbaOyvdLskrx7V/M3zdllSdgEDM4Ie+zl3HXTp8GSEyiNqKw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uc3-datashare-dev.cdlib.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uc3-datashare-dev.cdlib.org/Shibboleth.sso/SAML2/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uc3-datashare-dev.cdlib.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uc3-datashare-dev.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uc3-datashare-dev.cdlib.org/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uc3-datashare-dev.cdlib.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uc3-datashare-dev.cdlib.org/Shibboleth.sso/SAML2/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-dev.cdlib.org/Shibboleth.sso/SAML2/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-dev.berkeley.edu/Shibboleth.sso/SAML2/POST" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-dev.berkeley.edu/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-dev.berkeley.edu/Shibboleth.sso/SAML/POST" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-dev.berkeley.edu/Shibboleth.sso/SAML/Artifact" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-dev.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="12"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-dev.cdlib.org/Shibboleth.sso/SAML/POST" index="13"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-dev.cdlib.org/Shibboleth.sso/SAML/Artifact" index="14"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-dev.ucop.edu/Shibboleth.sso/SAML2/POST" index="15"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-dev.ucop.edu/Shibboleth.sso/SAML2/Artifact" index="16"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-dev.ucop.edu/Shibboleth.sso/SAML/POST" index="17"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.dash.ucla.edu/Shibboleth.sso/SAML2/POST" index="18"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.dash.ucla.edu/Shibboleth.sso/SAML2/Artifact" index="19"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.dash.ucla.edu/Shibboleth.sso/SAML/POST" index="20"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.dash.ucla.edu/Shibboleth.sso/SAML/Artifact" index="21"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-dev2.ucop.edu/Shibboleth.sso/SAML2/POST" index="22"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-dev2.ucop.edu/Shibboleth.sso/SAML2/Artifact" index="23"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-dev2.ucop.edu/Shibboleth.sso/SAML/POST" index="24"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-dev2.ucop.edu/Shibboleth.sso/SAML/Artifact" index="25"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-dev2.cdlib.org/Shibboleth.sso/SAML2/POST" index="26"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-dev2.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="27"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-dev2.cdlib.org/Shibboleth.sso/SAML/POST" index="28"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-dev2.cdlib.org/Shibboleth.sso/SAML/Artifact" index="29"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-dev.lib.uci.edu/Shibboleth.sso/SAML2/POST" index="30"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-dev.lib.uci.edu/Shibboleth.sso/SAML2/Artifact" index="31"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-dev.lib.uci.edu/Shibboleth.sso/SAML/POST" index="32"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-dev.lib.uci.edu/Shibboleth.sso/SAML/Artifact" index="33"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-dev.ucmerced.edu/Shibboleth.sso/SAML2/POST" index="34"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-dev.ucmerced.edu/Shibboleth.sso/SAML2/Artifact" index="35"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-dev.ucmerced.edu/Shibboleth.sso/SAML/POST" index="36"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-dev.ucmerced.edu/Shibboleth.sso/SAML/Artifact" index="37"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oneshare-dev.cdlib.org/Shibboleth.sso/SAML2/POST" index="38"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oneshare-dev.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="39"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oneshare-dev.cdlib.org/Shibboleth.sso/SAML/POST" index="40"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oneshare-dev.cdlib.org/Shibboleth.sso/SAML/Artifact" index="41"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oneshare2-dev.cdlib.org/Shibboleth.sso/SAML2/POST" index="42"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oneshare2-dev.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="43"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oneshare2-dev.cdlib.org/Shibboleth.sso/SAML/POST" index="44"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oneshare2-dev.cdlib.org/Shibboleth.sso/SAML/Artifact" index="45"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-ucla-dev.cdlib.org/Shibboleth.sso/SAML2/POST" index="46"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-ucla-dev.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="47"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-ucla-dev.cdlib.org/Shibboleth.sso/SAML/POST" index="48"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-ucla-dev.cdlib.org/Shibboleth.sso/SAML/Artifact" index="49"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://datasets-dev.lbl.gov/Shibboleth.sso/SAML2/POST" index="50"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://datasets-dev.lbl.gov/Shibboleth.sso/SAML2/Artifact" index="51"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://datasets-dev.lbl.gov/Shibboleth.sso/SAML/POST" index="52"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://datasets-dev.lbl.gov/Shibboleth.sso/SAML/Artifact" index="53"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-dev.library.ucsc.edu/Shibboleth.sso/SAML2/POST" index="54"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-dev.library.ucsc.edu/Shibboleth.sso/SAML2/Artifact" index="55"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-dev.library.ucsc.edu/Shibboleth.sso/SAML/POST" index="56"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-dev.library.ucsc.edu/Shibboleth.sso/SAML/Artifact" index="57"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uc3-dash2-dev.cdlib.org/Shibboleth.sso/SAML2/POST" index="58"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uc3-dash2-dev.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="59"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uc3-dash2-dev.cdlib.org/Shibboleth.sso/SAML/POST" index="60"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uc3-dash2-dev.cdlib.org/Shibboleth.sso/SAML/Artifact" index="61"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://datashare-dev.ucsf.edu/Shibboleth.sso/SAML2/POST" index="62"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://datashare-dev.ucsf.edu/Shibboleth.sso/SAML2/Artifact" index="63"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://datashare-dev.ucsf.edu/Shibboleth.sso/SAML/POST" index="64"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://datashare-dev.ucsf.edu/Shibboleth.sso/SAML/Artifact" index="65"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash2-dev.ucop.edu/Shibboleth.sso/SAML2/POST" index="66"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash2-dev.ucop.edu/Shibboleth.sso/SAML2/Artifact" index="67"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash2-dev.ucop.edu/Shibboleth.sso/SAML/POST" index="68"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash2-dev.ucop.edu/Shibboleth.sso/SAML/Artifact" index="69"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash2-dev.cdlib.org/Shibboleth.sso/SAML2/POST" index="70"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash2-dev.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="71"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash2-dev.cdlib.org/Shibboleth.sso/SAML/POST" index="72"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash2-dev.cdlib.org/Shibboleth.sso/SAML/Artifact" index="73"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oneshare-aws-dev.cdlib.org/Shibboleth.sso/SAML2/POST" index="74"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oneshare-aws-dev.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="75"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oneshare-aws-dev.cdlib.org/Shibboleth.sso/SAML/POST" index="76"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oneshare-aws-dev.cdlib.org/Shibboleth.sso/SAML/Artifact" index="77"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-dev.ucr.edu/Shibboleth.sso/SAML2/POST" index="78"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-dev.ucr.edu/Shibboleth.sso/SAML2/Artifact" index="79"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-dev.ucr.edu/Shibboleth.sso/SAML/POST" index="80"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-dev.ucr.edu/Shibboleth.sso/SAML/Artifact" index="81"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Dash Development Instance</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Store and share research datasets</md:ServiceDescription>
-      <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="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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California - Office of the President</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California - Office of the President</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucop.edu/welcome.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ken weiss</md:GivenName>
-    <md:EmailAddress>ken.weiss@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marisa Strong</md:GivenName>
-    <md:EmailAddress>uc3@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Perry Willett</md:GivenName>
-    <md:EmailAddress>uc3@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dash-stg.cdlib.org-shibboleth.xml b/swamid-interfederations-2.0/dash-stg.cdlib.org-shibboleth.xml
deleted file mode 100644
index ecd97493..00000000
--- a/swamid-interfederations-2.0/dash-stg.cdlib.org-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://dash-stg.cdlib.org/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://dash-stg.ucop.org/Shibboleth.sso/Login" 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://dash-stg.berkeley.edu/Shibboleth.sso/Login" 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://dash-stg.cdlib.org/Shibboleth.sso/Login" 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://uc3-datashare-stg.cdlib.org/Shibboleth.sso/Login" 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://stg.dash.ucla.edu/Shibboleth.sso/Login" index="5"/>
-      <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://dash-stg.ucmerced.edu/Shibboleth.sso/Login" index="6"/>
-      <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://dash-stg.lib.uci.edu/Shibboleth.sso/Login" index="7"/>
-      <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://oneshare-stg.cdlib.org/Shibboleth.sso/Login" index="8"/>
-      <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://dash-ucla-stg.cdlib.org/Shibboleth.sso/Login" index="9"/>
-      <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://datasets-stg.lbl.gov/Shibboleth.sso/Login" index="10"/>
-      <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://dash-stg.library.ucsc.edu/Shibboleth.sso/Login" index="11"/>
-      <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://datashare-stg.ucsf.edu/Shibboleth.sso/Login" index="12"/>
-      <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://uc3-dash2-stg.cdlib.org/Shibboleth.sso/Login" index="13"/>
-      <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://dash-stg.ucr.edu/Shibboleth.sso/Login" index="14"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dash Staging Instance</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Dash is used by University of California researchers to store and share research datasets in digital form.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://dash-stg.ucop.edu/xtf/search?smode=aboutPage</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://dash.ucop.edu/xtf/search?smode=policiesPage</mdui:PrivacyStatementURL>
-        <mdui:Logo height="87" width="400" xml:lang="en">https://dash-stg.cdlib.org/img/dash_cdl_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>
-MIIC+jCCAeKgAwIBAgIJAPn9Aa+BDpX3MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXVjMy1kYXRhc2hhcmUtc3RnMB4XDTE0MDQxNzE4MTIxNFoXDTI0MDQxNDE4
-MTIxNFowHDEaMBgGA1UEAxMRdWMzLWRhdGFzaGFyZS1zdGcwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDCYBbATXnkRXWaC0MnIel3jgiG7lg42QEFsrPR
-MJm8ZPNrM1EUYll3F4vuLw9k1KdqYiRT8iHiHxp6TwVOCWOx/LMIR3TuP9rGnn0E
-opsfbEjGfJf5osP5fK+JCeiG/+Sg1tsc4PUqkmNN3K+qcHHVZ4XllFuwk1v/ddMA
-pAH0fqvRxcN0fHz/WKF5m3ILeo29N1ONWPOPl7DhI+oCqjeCdgwD1n5hkdkobTEE
-wye78Aq9QEGMkXsCHMBijg11SJ0ndzuSJ/x+WLPJ+zbSC/Xfc+vijKfAtlEk9pL5
-kChlghet+OKCC6rIH+dU/NGibKPYaMpCw5cGHFaURwqGBk3ZAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXVjMy1kYXRhc2hhcmUtc3RnMB0GA1UdDgQWBBSJHq6pUvx46/Sm
-HiKiLUqfwxjiVDANBgkqhkiG9w0BAQUFAAOCAQEAqanDaw6Sk5ktj+19ARzM+vlZ
-2o5PEQ0U90vSB3QjDv0TR7yXZfaC2xnuN3Gk9gnVcmpoMlbvGdLGuRefJtL2Ho/2
-nzUdL664C6a0o9d8NkmyytvevQJfyMAUeYiLjJtfUMKjJx3fSNX0nkavddq6LpBp
-5UCa/83jA0JmAWQTpoLqEndFzyz6IKGV3uvwjhoy/aZPFTQR3m67Zd7sEjzOFhK/
-2Q2MMfpih2zC+94alth7wt0l9IYwiY8ls1L+5MUoIITA7M3jHMZ+q/Lxe7DgkTVA
-9b+jSC4h/NWvxBiptDbutLfTH3jU8vM9eoUcaeftZBtC25asVAL1f7aCrNhk3Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-stg.ucop.edu/Shibboleth.sso/SAML/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-stg.ucop.edu/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-stg.ucop.edu/Shibboleth.sso/SAML/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-stg.ucop.edu/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-stg.berkeley.edu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-stg.berkeley.edu/Shibboleth.sso/SAML2/POST" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-stg.berkeley.edu/Shibboleth.sso/SAML/Artifact" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-stg.berkeley.edu/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-stg.cdlib.org/Shibboleth.sso/SAML/POST" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-stg.cdlib.org/Shibboleth.sso/SAML2/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-stg.cdlib.org/Shibboleth.sso/SAML/Artifact" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-stg.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="12"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stg.dash.ucla.edu/Shibboleth.sso/SAML2/POST" index="13"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stg.dash.ucla.edu/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stg.dash.ucla.edu/Shibboleth.sso/SAML/POST" index="15"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stg.dash.ucla.edu/Shibboleth.sso/SAML/Artifact" index="16"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-stg.lib.uci.edu/Shibboleth.sso/SAML2/POST" index="17"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-stg.lib.uci.edu/Shibboleth.sso/SAML2/Artifact" index="18"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-stg.lib.uci.edu/Shibboleth.sso/SAML/POST" index="19"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-stg.lib.uci.edu/Shibboleth.sso/SAML/Artifact" index="20"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-stg.ucmerced.edu/Shibboleth.sso/SAML2/POST" index="21"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-stg.ucmerced.edu/Shibboleth.sso/SAML2/Artifact" index="22"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-stg.ucmerced.edu/Shibboleth.sso/SAML/POST" index="23"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-stg.ucmerced.edu/Shibboleth.sso/SAML/Artifact" index="24"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oneshare-stg.cdlib.org/Shibboleth.sso/SAML2/POST" index="25"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oneshare-stg.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="26"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oneshare-stg.cdlib.org/Shibboleth.sso/SAML/POST" index="27"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oneshare-stg.cdlib.org/Shibboleth.sso/SAML/Artifact" index="28"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-ucla-stg.cdlib.org/Shibboleth.sso/SAML2/POST" index="29"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-ucla-stg.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="30"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-ucla-stg.cdlib.org/Shibboleth.sso/SAML/POST" index="31"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-ucla-stg.cdlib.org/Shibboleth.sso/SAML/Artifact" index="32"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://datasets-stg.lbl.gov/Shibboleth.sso/SAML2/POST" index="33"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://datasets-stg.lbl.gov/Shibboleth.sso/SAML2/Artifact" index="34"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://datasets-stg.lbl.gov/Shibboleth.sso/SAML/POST" index="35"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://datasets-stg.lbl.gov/Shibboleth.sso/SAML/Artifact" index="36"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-stg.library.ucsc.edu/Shibboleth.sso/SAML2/POST" index="37"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-stg.library.ucsc.edu/Shibboleth.sso/SAML2/Artifact" index="38"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-stg.library.ucsc.edu/Shibboleth.sso/SAML/POST" index="39"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-stg.library.ucsc.edu/Shibboleth.sso/SAML/Artifact" index="40"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://datashare-stg.ucsf.edu/Shibboleth.sso/SAML2/POST" index="41"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://datashare-stg.ucsf.edu/Shibboleth.sso/SAML2/Artifact" index="42"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://datashare-stg.ucsf.edu/Shibboleth.sso/SAML/POST" index="43"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://datashare-stg.ucsf.edu/Shibboleth.sso/SAML/Artifact" index="44"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uc3-dash2-stg.cdlib.org/Shibboleth.sso/SAML2/POST" index="45"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uc3-dash2-stg.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="46"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-stg.ucr.edu/Shibboleth.sso/SAML2/POST" index="47"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-stg.ucr.edu/Shibboleth.sso/SAML2/Artifact" index="48"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-stg.ucr.edu/Shibboleth.sso/SAML/POST" index="49"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-stg.ucr.edu/Shibboleth.sso/SAML/Artifact" index="50"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Dash Staging Instance</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Dash is used by University of California researchers to store and share research datasets in digital form.</md:ServiceDescription>
-      <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="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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California - Office of the President</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California - Office of the President</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucop.edu/welcome.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ken Weiss</md:GivenName>
-    <md:EmailAddress>uc3@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Perry Willett</md:GivenName>
-    <md:EmailAddress>uc3@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marisa Strong</md:GivenName>
-    <md:EmailAddress>uc3@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dash.cdlib.org-shibboleth.xml b/swamid-interfederations-2.0/dash.cdlib.org-shibboleth.xml
deleted file mode 100644
index 42b01f43..00000000
--- a/swamid-interfederations-2.0/dash.cdlib.org-shibboleth.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dash.cdlib.org/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://cdl-datashare-p01.ucop.edu/Shibboleth.sso/Login" 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://dash.cdlib.org/Shibboleth.sso/Login" 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://dash.ucop.edu/Shibboleth.sso/Login" 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://dash.berkeley.edu/Shibboleth.sso/Login" 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://dash.ucla.edu/Shibboleth.sso/Login" index="5"/>
-      <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://dash.lib.uci.edu/Shibboleth.sso/Login" index="6"/>
-      <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://dash.ucmerced.edu/Shibboleth.sso/Login" index="7"/>
-      <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://oneshare.cdlib.org/Shibboleth.sso/Login" index="8"/>
-      <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://dash-ucla.cdlib.org/Shibboleth.sso/Login" index="9"/>
-      <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://datasets.lbl.gov/Shibboleth.sso/Login" index="10"/>
-      <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://dash.library.ucsc.edu/Shibboleth.sso/Login" index="11"/>
-      <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://datashare.ucsf.edu/Shibboleth.sso/Login" index="12"/>
-      <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://uc3-dash2-prd.cdlib.org/Shibboleth.sso/Login" index="13"/>
-      <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://dash.ucr.edu/Shibboleth.sso/Login" index="14"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dash</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This application allows UC faculty and researchers to publish and share digital datasets</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://dash.ucop.edu/xtf/search?smode=aboutPage</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://dash.ucop.edu/xtf/search?smode=policiesPage</mdui:PrivacyStatementURL>
-        <mdui:Logo height="87" width="400" xml:lang="en">https://dash.cdlib.org/img/dash_cdl_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>
-MIIC+jCCAeKgAwIBAgIJANuskh/271uNMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWNkbC1kYXRhc2hhcmUtcDAxMB4XDTE0MDQxODIxNTkxOFoXDTI0MDQxNTIx
-NTkxOFowHDEaMBgGA1UEAxMRY2RsLWRhdGFzaGFyZS1wMDEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCxVqo0F5p0Qay3VsMQXGqqjGtkhuCad4KqWEpk
-db6QHThFViTMvnqu6wiyTyO3X7aA1ulmhEeuHfhg90x9ZnoJW7+f44i+0llQQ8mg
-dgD4wM9p1kEphtz1GDbditcE0zmtiZijtpJjqFPcXl00H3f9AIus7/h1BmoWTiez
-F0B6X09EftzYkkiy/JLko4k+tXmj5lIuA2aUaHGPfNKZjLw/T6VgRdsqBTG2d+DC
-FqBxnYQ3ZU4gE8FCLAEhaQLTWQmxCZBVqqOVdmXrS9bjr2ZTZI9V1Pg401qQliOH
-39lZ7uPaY4nlBkz6D4poVS9IoTH1YhFIKtWh+LNEhvmUH2bjAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEWNkbC1kYXRhc2hhcmUtcDAxMB0GA1UdDgQWBBTxLjtpIsbvFJKb
-vB3mD8Un+3Ao1jANBgkqhkiG9w0BAQUFAAOCAQEAex7D/0obm2Piuk2ZalNX3Wvz
-+AuQ3Sb9azm5Vj3+G9fwQJdHEUrChorAmqib/gI1w792aSytbaM343/2nGSCJW9W
-uvkemOr+jbm0JCWhUKc4sPmMO7GotidoQfGr1aAzEim/fOMCzYLnFHlXtvmVrZdG
-cKOTG5vtDYWdMsyKzK8RNsqrmGkisEeOI3u2rSs4tTlZaBDXBWSLz4lFfaN4uegs
-bupGBQl1QGU2y9Z9S+LYW0uSgrhIJ7PPmi9AIbFiwXbEVnfxgmD9GP/JNQkaBZ4Y
-Y524rv83ThrN0whXjjslG9Ctitm1E4PNqEWkVzfxwP0I1Sbte0bRiIreDlInYA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cdl-datashare-p01.ucop.edu/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdl-datashare-p01.ucop.edu/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdl-datashare-p01.ucop.edu/Shibboleth.sso/SAML2/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdl-datashare-p01.ucop.edu/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash.cdlib.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash.cdlib.org/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash.cdlib.org/Shibboleth.sso/SAML/POST" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash.berkeley.edu/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash.berkeley.edu/Shibboleth.sso/SAML/Artifact" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash.berkeley.edu/Shibboleth.sso/SAML2/POST" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash.berkeley.edu/Shibboleth.sso/SAML/POST" index="12"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash.ucop.edu/Shibboleth.sso/SAML2/Artifact" index="13"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash.ucop.edu/Shibboleth.sso/SAML/Artifact" index="14"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash.ucop.edu/Shibboleth.sso/SAML2/POST" index="15"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash.ucop.edu/Shibboleth.sso/SAML/POST" index="16"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash.ucla.edu/Shibboleth.sso/SAML2/POST" index="17"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash.ucla.edu/Shibboleth.sso/SAML2/Artifact" index="18"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash.ucla.edu/Shibboleth.sso/SAML/POST" index="19"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash.ucla.edu/Shibboleth.sso/SAML/Artifact" index="20"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash.lib.uci.edu/Shibboleth.sso/SAML2/POST" index="21"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash.lib.uci.edu/Shibboleth.sso/SAML2/Artifact" index="22"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash.lib.uci.edu/Shibboleth.sso/SAML/POST" index="23"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash.lib.uci.edu/Shibboleth.sso/SAML/Artifact" index="24"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash.ucmerced.edu/Shibboleth.sso/SAML2/POST" index="25"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash.ucmerced.edu/Shibboleth.sso/SAML2/Artifact" index="26"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash.ucmerced.edu/Shibboleth.sso/SAML/POST" index="27"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash.ucmerced.edu/Shibboleth.sso/SAML/Artifact" index="28"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oneshare.cdlib.org/Shibboleth.sso/SAML2/POST" index="29"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oneshare.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="30"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oneshare.cdlib.org/Shibboleth.sso/SAML/POST" index="31"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oneshare.cdlib.org/Shibboleth.sso/SAML/Artifact" index="32"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash-ucla.cdlib.org/Shibboleth.sso/SAML2/POST" index="33"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash-ucla.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="34"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash-ucla.cdlib.org/Shibboleth.sso/SAML/POST" index="35"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash-ucla.cdlib.org/Shibboleth.sso/SAML/Artifact" index="36"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://datasets.lbl.gov/Shibboleth.sso/SAML2/POST" index="37"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://datasets.lbl.gov/Shibboleth.sso/SAML2/Artifact" index="38"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://datasets.lbl.gov/Shibboleth.sso/SAML/POST" index="39"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://datasets.lbl.gov/Shibboleth.sso/SAML/Artifact" index="40"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash.library.ucsc.edu/Shibboleth.sso/SAML2/POST" index="41"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash.library.ucsc.edu/Shibboleth.sso/SAML2/Artifact" index="42"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash.library.ucsc.edu/Shibboleth.sso/SAML/POST" index="43"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash.library.ucsc.edu/Shibboleth.sso/SAML/Artifact" index="44"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://datashare.ucsf.edu/Shibboleth.sso/SAML2/POST" index="45"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://datashare.ucsf.edu/Shibboleth.sso/SAML2/Artifact" index="46"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://datashare.ucsf.edu/Shibboleth.sso/SAML/POST" index="47"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://datashare.ucsf.edu/Shibboleth.sso/SAML/Artifact" index="48"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uc3-dash2-prd.cdlib.org/Shibboleth.sso/SAML2/POST" index="49"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uc3-dash2-prd.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="50"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uc3-dash2-prd.cdlib.org/Shibboleth.sso/SAML/POST" index="51"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uc3-dash2-prd.cdlib.org/Shibboleth.sso/SAML/Artifact" index="52"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dash.ucr.edu/Shibboleth.sso/SAML2/POST" index="53"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dash.ucr.edu/Shibboleth.sso/SAML2/Artifact" index="54"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dash.ucr.edu/Shibboleth.sso/SAML/POST" index="55"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dash.ucr.edu/Shibboleth.sso/SAML/Artifact" index="56"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Dash</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This application allows UC faculty and researchers to publish and share digital datasets</md:ServiceDescription>
-      <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="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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California - Office of the President</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California - Office of the President</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucop.edu/welcome.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ken Weiss</md:GivenName>
-    <md:EmailAddress>uc3@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Perry Willett</md:GivenName>
-    <md:EmailAddress>uc3@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marisa Strong</md:GivenName>
-    <md:EmailAddress>uc3@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/db.saur.de.xml b/swamid-interfederations-2.0/db.saur.de.xml
deleted file mode 100644
index 66ca6257..00000000
--- a/swamid-interfederations-2.0/db.saur.de.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://db.saur.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>db.saur.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=db.saur.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBzCCA++gAwIBAgIEDQl1fDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wODEwMDYxMTM1MDlaFw0xMzEw
-MDUxMTM1MDlaMEkxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRMwEQYDVQQDEwpkYi5zYXVyLmRlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz/zjBXS8HerZKLm9TLGucOB5e3nBWmKtWvDX
-06WkrE7xvj+iDV/VcrK1vpP1wabRVy5e2rGAr66CyPhaOc7sFiZmlNGaS01f8j/9
-O50FM1DJVZqPCMzuMfjK+m22oZMegAoIiMFKPaCwXcRr8NJDnuHaK4WbAYkoQtDh
-jZmhZcSZT0W6k5NimszZg4azEOENiqlIGJ1LwQtGt0BMNUNT+p+PJkHRVuIftWLX
-bciCl7tavmpuOq0BVFz/uUD8yS+dAsqrvBmmcGaAHkvNpTqy0v1o56uk9o2i5zUb
-o+l4XGSulrwqsF0ytQWEDWZFYDtrkD8WDhhOn5ojTMbxTYb3VwIDAQABo4IB6TCC
-AeUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBRj3P6kfMQ1adyDpCzs3AP+TCfHADAfBgNVHSME
-GDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zArBgNVHREEJDAigSBiZW5lZGljdC5y
-aXBwZXJnZXJAZGVncnV5dGVyLmNvbTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vy
-dmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsG
-CCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNl
-cy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAN+q0DlBL1Z9sKD3QHlik5C3/fSRe
-/xi/aaFWmLy20IL/jMEoCB6+Zvg42kkVIDfP5MgWbkFjMVKhz8AHrE4Cvnm2uwHS
-QiM2ZeOXcIYEM6HrX2NsE0e2ihpKy5KUYzsJGJPM+PVYB5hyTYzgvRHyKmlqI/Qm
-Lxl8jh0G7W6FFHF5obqvZTosXz5rZnZUN6XJ3pYYoXXiWxbuZ8VR3O1NsZhh/h2F
-x/ub9npoaBEsvMcrOhH6AJRCS2pib3QN/bmTcwGMOD16v065+DAGQHFkJtzLw7oY
-yE+NdWi71a8lLxP5IkGUZgE7PuPCbPZQoP3BDXch+x3V6V74J8fpJ0VgiA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>db.saur.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=db.saur.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBzCCA++gAwIBAgIEDQl1fDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wODEwMDYxMTM1MDlaFw0xMzEw
-MDUxMTM1MDlaMEkxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRMwEQYDVQQDEwpkYi5zYXVyLmRlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz/zjBXS8HerZKLm9TLGucOB5e3nBWmKtWvDX
-06WkrE7xvj+iDV/VcrK1vpP1wabRVy5e2rGAr66CyPhaOc7sFiZmlNGaS01f8j/9
-O50FM1DJVZqPCMzuMfjK+m22oZMegAoIiMFKPaCwXcRr8NJDnuHaK4WbAYkoQtDh
-jZmhZcSZT0W6k5NimszZg4azEOENiqlIGJ1LwQtGt0BMNUNT+p+PJkHRVuIftWLX
-bciCl7tavmpuOq0BVFz/uUD8yS+dAsqrvBmmcGaAHkvNpTqy0v1o56uk9o2i5zUb
-o+l4XGSulrwqsF0ytQWEDWZFYDtrkD8WDhhOn5ojTMbxTYb3VwIDAQABo4IB6TCC
-AeUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBRj3P6kfMQ1adyDpCzs3AP+TCfHADAfBgNVHSME
-GDAWgBQdqfGGJnZNz139UKNu6/G8InVt6zArBgNVHREEJDAigSBiZW5lZGljdC5y
-aXBwZXJnZXJAZGVncnV5dGVyLmNvbTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vy
-dmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsG
-CCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNl
-cy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAN+q0DlBL1Z9sKD3QHlik5C3/fSRe
-/xi/aaFWmLy20IL/jMEoCB6+Zvg42kkVIDfP5MgWbkFjMVKhz8AHrE4Cvnm2uwHS
-QiM2ZeOXcIYEM6HrX2NsE0e2ihpKy5KUYzsJGJPM+PVYB5hyTYzgvRHyKmlqI/Qm
-Lxl8jh0G7W6FFHF5obqvZTosXz5rZnZUN6XJ3pYYoXXiWxbuZ8VR3O1NsZhh/h2F
-x/ub9npoaBEsvMcrOhH6AJRCS2pib3QN/bmTcwGMOD16v065+DAGQHFkJtzLw7oY
-yE+NdWi71a8lLxP5IkGUZgE7PuPCbPZQoP3BDXch+x3V6V74J8fpJ0VgiA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://db.saur.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://db.saur.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://db.saur.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://db.saur.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://db.saur.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://db.saur.de/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">K. G. Saur Verlag</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">K. G. Saur Verlag, ein Imprint der Walter de Gruyter GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.saur.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ulrike</GivenName>
-    <SurName>Engel</SurName>
-    <EmailAddress>ulrike.engel@degruyter.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Cristian</GivenName>
-    <SurName>Vat</SurName>
-    <EmailAddress>cristian.vat@level7.ro</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/db.ub.uni-stuttgart.de.xml b/swamid-interfederations-2.0/db.ub.uni-stuttgart.de.xml
deleted file mode 100644
index 30c9183b..00000000
--- a/swamid-interfederations-2.0/db.ub.uni-stuttgart.de.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://db.ub.uni-stuttgart.de">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>db.ub.uni-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=db.ub.uni-stuttgart.de,OU=Universitaetsbibliothek,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFbDCCBFSgAwIBAgIEDB2VKDANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
-dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
-MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDgw
-NDEwMTMzNTIxWhcNMTMwNDA5MTMzNTIxWjCBojELMAkGA1UEBhMCREUxGzAZBgNV
-BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
-VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MSAwHgYDVQQLExdVbml2ZXJzaXRh
-ZXRzYmlibGlvdGhlazEfMB0GA1UEAxMWZGIudWIudW5pLXN0dXR0Z2FydC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwE50dOQQkZznyAAfZEINPH
-haepUOZgEqAAHDjKEbxVg3WLZKg9CPQ8k1+nWxV8ZomJzXbw+kx1v7NPKdNPXBNw
-qmt6aQAiJHcUtzMGlfGI1YDrC/p0zFmjtno+a++sRSVgfBrSQME7JQ8CPVreSa20
-0MDsWR/OOdzVZo47PhzDYyOiABa/CEiU1k51zciw3XpbEnMqKwZ2tNxX++zgvhyg
-n5MhITT88Lukmz92XF0JyEeNJWE0Q0AKcS6V6A+jKQznEXpQ88c2Zit44z3bJM/9
-a9RBlMQ+CuPSuf7aznUY3AOysD5jWlvpJfDC2mMg3KTC1RNTuaoYmtBjJW0Nnj0C
-AwEAAaOCAbQwggGwMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUtB7lnAegYLLmVzFpTp8/Lymc
-R0UwHwYDVR0jBBgwFoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCB
-gjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1zdHV0dGdhcnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEB
-BIGZMIGWMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1z
-dHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1o
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCjpYUB2mqfLUpU7uke8uvu
-3b6W/lDX8N54gmmdPfvjYF5ASmXdIdH64P6bspBPfqBajj0RfWflgGO85givR98w
-eVT2uqYrXKDIVknHs6/2SqolgcEkSSIUZwiGn4aNuV7BVcTB0bon6O+QJNUz/Ju8
-KG81dktd/OYbDq/yABvrWa2yvbroHwJZj9fydBBFvaT2l1KHv6NVauLXAqYyhDF8
-TkkerRdtxkOOv2vskPFo2HwZ0MZ/S9c5BJwKs0hGklHvT8/cnzAm1tO9TD8jG+9+
-c1GXBwlpyqeX1oyjmAwFsCP0IXVzw11n7BtSjylDJKYARAlw+qtCibuS9S+6oYQ2
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>db.ub.uni-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=db.ub.uni-stuttgart.de,OU=Universitaetsbibliothek,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFbDCCBFSgAwIBAgIEDB2VKDANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
-dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
-MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDgw
-NDEwMTMzNTIxWhcNMTMwNDA5MTMzNTIxWjCBojELMAkGA1UEBhMCREUxGzAZBgNV
-BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
-VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MSAwHgYDVQQLExdVbml2ZXJzaXRh
-ZXRzYmlibGlvdGhlazEfMB0GA1UEAxMWZGIudWIudW5pLXN0dXR0Z2FydC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwE50dOQQkZznyAAfZEINPH
-haepUOZgEqAAHDjKEbxVg3WLZKg9CPQ8k1+nWxV8ZomJzXbw+kx1v7NPKdNPXBNw
-qmt6aQAiJHcUtzMGlfGI1YDrC/p0zFmjtno+a++sRSVgfBrSQME7JQ8CPVreSa20
-0MDsWR/OOdzVZo47PhzDYyOiABa/CEiU1k51zciw3XpbEnMqKwZ2tNxX++zgvhyg
-n5MhITT88Lukmz92XF0JyEeNJWE0Q0AKcS6V6A+jKQznEXpQ88c2Zit44z3bJM/9
-a9RBlMQ+CuPSuf7aznUY3AOysD5jWlvpJfDC2mMg3KTC1RNTuaoYmtBjJW0Nnj0C
-AwEAAaOCAbQwggGwMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUtB7lnAegYLLmVzFpTp8/Lymc
-R0UwHwYDVR0jBBgwFoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCB
-gjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1zdHV0dGdhcnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEB
-BIGZMIGWMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1z
-dHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1o
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCjpYUB2mqfLUpU7uke8uvu
-3b6W/lDX8N54gmmdPfvjYF5ASmXdIdH64P6bspBPfqBajj0RfWflgGO85givR98w
-eVT2uqYrXKDIVknHs6/2SqolgcEkSSIUZwiGn4aNuV7BVcTB0bon6O+QJNUz/Ju8
-KG81dktd/OYbDq/yABvrWa2yvbroHwJZj9fydBBFvaT2l1KHv6NVauLXAqYyhDF8
-TkkerRdtxkOOv2vskPFo2HwZ0MZ/S9c5BJwKs0hGklHvT8/cnzAm1tO9TD8jG+9+
-c1GXBwlpyqeX1oyjmAwFsCP0IXVzw11n7BtSjylDJKYARAlw+qtCibuS9S+6oYQ2
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://db.ub.uni-stuttgart.de/Shibboleth.shire" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://db.ub.uni-stuttgart.de/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://db.ub.uni-stuttgart.de/Shibboleth.sso/SAML2/POST" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Stuttgart</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universitätsbibliothek Stuttgart</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-stuttgart.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ralf</GivenName>
-    <SurName>Engelmann</SurName>
-    <EmailAddress>ralf.engelmann@ub.uni-stuttgart.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Engelmann</SurName>
-    <EmailAddress>ralf.engelmann@ub.uni-stuttgart.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml b/swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml
deleted file mode 100644
index 789871b7..00000000
--- a/swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://de.dariah.eu/shibboleth">
-  <md: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:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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://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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <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>MIIGCjCCBPKgAwIBAgIHGFSpht2+vDANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDEwMDgxMjIwMDZaFw0xOTA3MDky
-MzU5MDBaMIGAMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRUwEwYDVQQDEwxkZS5kYXJpYWguZXUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaq4oYlpXuEAav8Pr6GEPMdMSR7/JH
-iNgoJ9R93KsNJ6cH9pjhop1itW/5Y26rY/UFV7K3QelXdE8yvwXDWMy8PGw2M7sh
-Q25zp/d2UV7+HOouYpmLUu3+iXsu+jBmqEEOUmESZB768ewv4uVB8WvylP6GMUmE
-xm35ahun03uFJDa3KQmvCbEv4OYlF36WwjKes/ZEjw7ALAsLohkqSagcCszAtu23
-SkB1laznIw1L4tqMh6CFoY3Jrri9Tz32PgwFSWy79pHL2DA4y5t7mAD3p8BgnPIH
-ndZ8DESt8xRDtkAl/hvs+c3wlKrQrMs5JWfaI236kb3smwXu9p7H56H7AgMBAAGj
-ggJXMIICUzBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGt
-IYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIE8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-HQYDVR0OBBYEFA3qcUy5Zfj+uCAMrBVbjqFcDf5+MB8GA1UdIwQYMBaAFB29c8xt
-7m4cdHDZoxs6uqgn3rzrMBcGA1UdEQQQMA6CDGRlLmRhcmlhaC5ldTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1nb2V0dGlu
-Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHdBggr
-BgEFBQcBAQSB0DCBzTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
-ZS9PQ1NQLVNlcnZlci9PQ1NQMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdl
-bi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBADP8
-AH01pswoL2H5SJqw+9ZgPe2j+URVtJKJ3dqs8Z52NGQstN/t1h76SfIouJLYo5j2
-Wcsj3coRdAsTB3RQmknPKYgGwth4pIRAnXPiipThQDi8feZljxDxr+5ZS1uwm1cH
-wMu8CLcgS+Z+QYj/843D6UMt9qTHXcTgqdFwk1YwYF9ZTDYCrZIKSL9nGP+BArg/
-B+1RorHr1JYUaYiK9lMVIzpbC3MppW1kHrbW4FTqby9PBjQTVj/rlItVxua/R9e4
-uk72xQHMgpm+cXAdmaBPnJMype8HHzli+gtuO13aezGt2NYxT8Q9z5C3nUNxc4Up
-bbk9N8FTzwSN4uy7DG4=
-</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>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>MIIGCjCCBPKgAwIBAgIHGFSpht2+vDANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDEwMDgxMjIwMDZaFw0xOTA3MDky
-MzU5MDBaMIGAMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRUwEwYDVQQDEwxkZS5kYXJpYWguZXUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaq4oYlpXuEAav8Pr6GEPMdMSR7/JH
-iNgoJ9R93KsNJ6cH9pjhop1itW/5Y26rY/UFV7K3QelXdE8yvwXDWMy8PGw2M7sh
-Q25zp/d2UV7+HOouYpmLUu3+iXsu+jBmqEEOUmESZB768ewv4uVB8WvylP6GMUmE
-xm35ahun03uFJDa3KQmvCbEv4OYlF36WwjKes/ZEjw7ALAsLohkqSagcCszAtu23
-SkB1laznIw1L4tqMh6CFoY3Jrri9Tz32PgwFSWy79pHL2DA4y5t7mAD3p8BgnPIH
-ndZ8DESt8xRDtkAl/hvs+c3wlKrQrMs5JWfaI236kb3smwXu9p7H56H7AgMBAAGj
-ggJXMIICUzBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGt
-IYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIE8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-HQYDVR0OBBYEFA3qcUy5Zfj+uCAMrBVbjqFcDf5+MB8GA1UdIwQYMBaAFB29c8xt
-7m4cdHDZoxs6uqgn3rzrMBcGA1UdEQQQMA6CDGRlLmRhcmlhaC5ldTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1nb2V0dGlu
-Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHdBggr
-BgEFBQcBAQSB0DCBzTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
-ZS9PQ1NQLVNlcnZlci9PQ1NQMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdl
-bi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBADP8
-AH01pswoL2H5SJqw+9ZgPe2j+URVtJKJ3dqs8Z52NGQstN/t1h76SfIouJLYo5j2
-Wcsj3coRdAsTB3RQmknPKYgGwth4pIRAnXPiipThQDi8feZljxDxr+5ZS1uwm1cH
-wMu8CLcgS+Z+QYj/843D6UMt9qTHXcTgqdFwk1YwYF9ZTDYCrZIKSL9nGP+BArg/
-B+1RorHr1JYUaYiK9lMVIzpbC3MppW1kHrbW4FTqby9PBjQTVj/rlItVxua/R9e4
-uk72xQHMgpm+cXAdmaBPnJMype8HHzli+gtuO13aezGt2NYxT8Q9z5C3nUNxc4Up
-bbk9N8FTzwSN4uy7DG4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://de.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://de.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://de.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://de.dariah.eu/Shibboleth.sso/SAML2/POST" index="5"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">DARIAH DE Portal</md:ServiceName>
-      <md:ServiceName xml:lang="en">DARIAH DE Portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">DARIAH DE Portal</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">DARIAH DE Portal</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" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bernd</md:GivenName>
-    <md:SurName>Schloer</md:SurName>
-    <md:EmailAddress>mailto:bernd.schloer@sub.uni-goettingen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Dariah</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/decbmth.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/decbmth.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index 3c4415b2..00000000
--- a/swamid-interfederations-2.0/decbmth.sisoshibboleth.co.uk-entity.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://decbmth.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Bournemouth University ~ DECBmth, Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2013-06-06T10:58:10Z"/>
-  </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://decbmth.siso.co/sso/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://decbmth.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Bournemouth University ~ DECBmth, Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Bournemouth University ~ DECBmth, Online Resource Booking</mdui:Description>
-        <mdui:Logo height="60" width="60">https://shibboleth.siso.co/siso-logo60x60.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://decbmth.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://decbmth.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://decbmth.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://decbmth.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://decbmth.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://decbmth.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://decbmth.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Bournemouth University ~ DECBmth, Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/demeter.wp.swov.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/demeter.wp.swov.nl-adfs-services-trust.xml
deleted file mode 100644
index 814e3605..00000000
--- a/swamid-interfederations-2.0/demeter.wp.swov.nl-adfs-services-trust.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="http://demeter.wp.swov.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-03T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">swov.nl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wp.swov.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">Stichting Wetenschappelijk Onderzoek Verkeersveiligheid SWOV</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SWOV Institute for Road Safety Research</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Stichting Wetenschappelijk Onderzoek Verkeersveiligheid SWOV</mdui:Description>
-        <mdui:Description xml:lang="en">SWOV Institute for Road Safety Research</mdui:Description>
-        <mdui:Logo height="118" width="425">https://static.surfconext.nl/logos/idp/swov.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">SWOV Institute for Road Safety Research</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Stichting Wetenschappelijk Onderzoek Verkeersveiligheid SWOV</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/e2a066fa3b3772e968e201eea790f925"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Stichting Wetenschappelijk Onderzoek Verkeersveiligheid SWOV</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SWOV Institute for Road Safety Research</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Stichting Wetenschappelijk Onderzoek Verkeersveiligheid SWOV</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SWOV Institute for Road Safety Research</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.swov.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.swov.nl/index_uk.htm</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/demo-dcs.cla.co.uk-shibboleth.xml b/swamid-interfederations-2.0/demo-dcs.cla.co.uk-shibboleth.xml
deleted file mode 100644
index 891eb92f..00000000
--- a/swamid-interfederations-2.0/demo-dcs.cla.co.uk-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://demo-dcs.cla.co.uk/shibboleth">
-  <!--
-		This is a "Digital Content Store" Shibboleth SP for The Copyright Licensing Agency Ltd.
-	-->
-  <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="2016-02-05T12:53:23Z">
-      <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://demo-dcs.cla.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://demo-dcs.cla.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJAMsjSSqSCRq6MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCW5zMzAxNDUxMjAeFw0xNjAxMjEyMjEwMTNaFw0yNjAxMTgyMjEwMTNaMBQx
-						EjAQBgNVBAMTCW5zMzAxNDUxMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMmG1vU5BX1uxch1xZf/P5s8G49env+6avH9784KyKVAAhBjqM/TSH1DR/c0
-						SdNpw7Ta1PwGMSAEycHceywlnBMMNoPK+v5/8hfakoFnFGZVTwzYoly2Up9YGUJw
-						21+4F1HIvcr7B9Zfl0zW5BYtksx3nr8iuvHVre+JD63UxW/WD+5/8JfJw99kOFPr
-						s5+D9vVsHC0icNLNxtgShl4JqdY55v08iHrjdz9zazeW9ciHAb/jMvuRKkl/KMlV
-						+SAPo8aM5qWBrFuWRfknQZafmf6ukbjtyOgCr8lcWCJZvDEH7B+Z9Xhh1SA/DhIv
-						MC2zpJjllUc781tEwJ+crubFepsCAwEAAaM3MDUwFAYDVR0RBA0wC4IJbnMzMDE0
-						NTEyMB0GA1UdDgQWBBTAbK1njgH4XYH28bAgMfIqCoCX6jANBgkqhkiG9w0BAQUF
-						AAOCAQEAhG4BLbxHYJaBcSgk8yRMit0IJ1IcmVuQ53ZvJKrsHwyD7HZvwMvn3WTS
-						MTwSjXK71tadkIALbZ89ogsJge4a+MXjtEGy5EduFRgGVSHI330nkcx9neurcC9Y
-						hV0mQdkdz5porhi/eSmQ5dxzT/MeGj1wBNU0FtepAHU8r4uC9ZSGMo7aoJgwI5Pz
-						AxavOz6AfkEO1CS+bXE7r94zDzJRLUjhlNyyi8UcfrulolBks3gUXPOddeNMkFnX
-						sj/2Xk8vYViVDsPMLxyhMDZEk2STJ9VZT+j9yGpDgNGtJhFUolc/P+dKKLvG4eAW
-						c+e7OVGo/UFT2BROt4Cdhp0hdWOm1A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://demo-dcs.cla.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo-dcs.cla.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo-dcs.cla.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo-dcs.cla.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo-dcs.cla.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo-dcs.cla.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo-dcs.cla.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo-dcs.cla.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo-dcs.cla.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo-dcs.cla.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo-dcs.cla.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Copyright Licensing Agency Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Content Store</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://cla.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dev Team</GivenName>
-    <EmailAddress>mailto:dev@cloudspringtech.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dev Team</GivenName>
-    <EmailAddress>mailto:dev@cloudspringtech.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/demo.eduopen.org-shibboleth.xml b/swamid-interfederations-2.0/demo.eduopen.org-shibboleth.xml
deleted file mode 100644
index 08767375..00000000
--- a/swamid-interfederations-2.0/demo.eduopen.org-shibboleth.xml
+++ /dev/null
@@ -1,90 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://demo.eduopen.org/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-10-09T12:03:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-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>
-  </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://demo.eduopen.org/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.eduopen.org/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://demo.eduopen.org/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Eduopen Network provided by Unimore</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Eduopen Network fornito da Unimore</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test portal for providing demonstration courses for EDUOPEN Network in a federated environment</mdui:Description>
-        <mdui:Description xml:lang="it">Portale di test per l'erogazione dei corsi dimostrativi per la rete EDUOPEN in un ambiente federato</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://demo.eduopen.org/eduopen/information-en.php</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://demo.eduopen.org/eduopen/information-it.php</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://demo.eduopen.org/eduopen/privacy-en.php</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://demo.eduopen.org/eduopen/privacy-it.php</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHTCCAgWgAwIBAgIJAKTsiYGHB4eEMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2Rldi5lZHVvcGVuLm9yZzAeFw0xNTEwMDgxOTEyMTJaFw0zNTEwMDMxOTEy
-MTJaMBoxGDAWBgNVBAMTD2Rldi5lZHVvcGVuLm9yZzCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAOLTNa351EGsrWjOLExh1KsdepEkjmLu6Np410xnUW2t
-MRcVOTkAr1bm1rdvGp/7DbdxxQay0jEwYI0AhFW/uPhzaUjKatlZzcy/ApMb8+RQ
-vtyoja86vCMIzQmTCoVZIJY+WKOpqSmx6U+ycZXN17uYLH6v+kAj9C4dFOsiQKP3
-FTsqviTYmYAfXEtmzlQf5ag0UipMlCD3O4M5kY0GJOShDAUcgy4E34xdt0YMvOks
-iLvm8cLqQ7//b3ir2yZ7ldWY9w15CEqXOT/VQmQ18ez7TptlKzviM3oKGLNoiOyT
-Z+t5ZfIvD18NAeS4lPo35VCHr5z/cEVpHL/Cp8VY3QkCAwEAAaNmMGQwQwYDVR0R
-BDwwOoIPZGV2LmVkdW9wZW4ub3JnhidodHRwczovL2Rldi5lZHVvcGVuLm9yZy9h
-dXRoL3NoaWJib2xldGgwHQYDVR0OBBYEFNVJx+JWzWU5V4JnYk/b/tvNpWz7MA0G
-CSqGSIb3DQEBBQUAA4IBAQAZir5mWwsi3FOoi3Tp+OI6umALyvAAihBdrg9hZ6Gn
-Oa3rrgFoOiISpqj5zTjXOGC40ZLOl269VdQzxrMMX5NvO9C9qPOuQ+dEllkQ4bP0
-vHr5XHeCVYW3kpmVXrO+wCX+zMUrTwsOhUP0J7Pxo38+mMT3JLeGXwel5fs8wHEU
-YMaYMWKMN7R5nJxW7LIfJCNFZfgm5pfo2dJs5SGCgmZxw9hrS/26xaKArfPMumls
-zczrSGA9TWebd4JiqYgR++we4HpNTJDoMV4azydOG1GkhGfU3o+V1sZBWrlaJwiy
-umrvPDF3/bdUFQW96kAoCVF7Gj2x+yIy2SK2RTpyELZY
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.eduopen.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.eduopen.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.eduopen.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.eduopen.org/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.eduopen.org/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.eduopen.org/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.eduopen.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.eduopen.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.eduopen.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo.eduopen.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo.eduopen.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Eduopen Network provided by Unimore</md:ServiceName>
-      <md:ServiceName xml:lang="it">Eduopen Network fornito da Unimore</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Test portal for providing demonstration courses for EDUOPEN Network in a federated environment</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Portale di test per l'erogazione dei corsi dimostrativi per la rete EDUOPEN in un ambiente federato</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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università di Modena e Reggio Emilia</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Modena e Reggio Emilia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Eduopen Network fornito da Unimore</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Eduopen Network provided by Unimore</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.eduopen.org</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.eduopen.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tommaso</md:GivenName>
-    <md:SurName>Minerva</md:SurName>
-    <md:EmailAddress>mailto:cea@unimore.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dep.s2dv.co.uk-shibboleth.xml b/swamid-interfederations-2.0/dep.s2dv.co.uk-shibboleth.xml
deleted file mode 100644
index bcd0818d..00000000
--- a/swamid-interfederations-2.0/dep.s2dv.co.uk-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://dep.s2dv.co.uk/shibboleth">
-  <!--
-		This is a "Development" Shibboleth SP for Software2 Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-28T09:04:45Z"/>
-  </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://dep.s2dv.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://dep.s2dv.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIICrjCCAZYCCQDgMPi3gaCJaTANBgkqhkiG9w0BAQUFADAZMRcwFQYDVQQDEw5k
-						ZXAuczJkdi5jby51azAeFw0xMjAzMjAxMDM0NDhaFw0yMTEwMTkxMDM0NDhaMBkx
-						FzAVBgNVBAMTDmRlcC5zMmR2LmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEA260OtuavH9SsL1u8r3jFFu3h19Xo9rt7x9bu8eIM1WigGbMqm9ag
-						v3aVwamCnRyyjG8kJGChD6KrOrYjBSI4OE0smQSVW7SNy2cwY2ImrseKhyhap9Rr
-						NI6c3ddAawG7cvFNetkPddAoEI1Vs3TfFZnA02qUcScMT7ZTlLbL75j7RkIQepdy
-						l3/xD6Qrp3m3N1+tuLi4pxMYXmBlKLLmQcu0TLfYDmDKRowakyZKN4tqKx0tGw/v
-						kE4l5waECFbKBVWIk0A+GcCH1Uch11KbTE/6SOQMq4A5y+Ee7oqgldvUYyjcW1ic
-						q4wR8sOXVAtsElzk0eXycE5KuAYW3aAP4wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-						AQBvVkGHCryLmiekLnyjsSM6VQClJsQBmv8PYnPd27aFweEm1APcTRMETqSU+BHf
-						9WOERh4BYLgABtUG93L9mSSTEHCUjp9KdubGCEpzJP84lYW+dP3PnIolCP4D5P3N
-						WrLAdh9WvLpFR7I7yx1CQ2EUhY8ydszebZUc5FqbqoV/SV69mxsSTmyY2Jr44Zko
-						dOReO4xW0knkopP4t/0U8A8HlPCsV+1J/GNkUBhx7OQlZNnxejj8PZZET7zEeU4a
-						eBnOFtTWrMYru4OCuEepLXTjIRRit4mKuGqOz59j5woy2lfFP/tG35t0EYFiXHv6
-						PbImR0UCz6WD9A9knry75FGl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dep.s2dv.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dep.s2dv.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Software2 Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Software2 Shibboleth development server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.software2.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ryan</GivenName>
-    <SurName>Heath</SurName>
-    <EmailAddress>mailto:ryan.heath@software2.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Heath</SurName>
-    <EmailAddress>mailto:ryan.heath@software2.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dep.software2.co.uk-shibboleth.xml b/swamid-interfederations-2.0/dep.software2.co.uk-shibboleth.xml
deleted file mode 100644
index 34ab0632..00000000
--- a/swamid-interfederations-2.0/dep.software2.co.uk-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://dep.software2.co.uk/shibboleth">
-  <!--
-		This is a "Software eDistribution Service" Shibboleth SP for Software2 Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-12T14:12:13Z"/>
-  </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://dep.software2.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://dep.software2.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIJALhZQuIuYjGPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2RlcC5zb2Z0d2FyZTIuY28udWswHhcNMTIwNjExMTIyNTQ2WhcNMjIwNjA5
-						MTIyNTQ2WjAeMRwwGgYDVQQDExNkZXAuc29mdHdhcmUyLmNvLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz6rllkkIBrtqI9VLg4L1DFyORCK+5vPW
-						C62r7KVT6u7MrrJfmKLrIOsyuA3gS7dhqjYWS8/JUcc+oRn5jkEPZAlg6veNIAwr
-						cO1xTfNhO+6P1hl/sj3SJWW/UXtqCmJlCEd7MbwmUl12PBqXpzXIuAdctfOXv6gN
-						1nDZOKbCcComoWqP7Q5VjhDa/iSUnIA89UC4L4zdEiHwm2avGWcYYQRovGcb2Q3n
-						vVGMJCiKGZrpZdjK84VALygF2xon8gIuoNoSC2Moxshpz0tX2G3RUOmQeY9A1/g2
-						/S5SImzk1K2GTnEUHqP3SfNBKLkWrHssefeugawuQSy9M6rFyucpCwIDAQABo2kw
-						ZzBGBgNVHREEPzA9ghNkZXAuc29mdHdhcmUyLmNvLnVrhiZodHRwczovL2RlcC5z
-						b2Z0d2FyZTIuY28udWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUyNMP5j8ncGpyHluN
-						5S/3YEzjLREwDQYJKoZIhvcNAQEFBQADggEBAB5cn4wiopEayjYJ+8gO94iZ79PN
-						c3wOX55rdkxUpjzSQ5AmYOvL/oAhnc0RxHl1b0IKk6HaQE6P5Y0j6cMZgPf5EcLq
-						qctUZu48RP/XZtbGUGhSZiIb0GZA5n+rgReDJVo4edti8m5igXfVAyIjXKN4dk+B
-						Ks+tGJWmSvgusX/uVyyAtmEuleiGZQ0vetsLKJ8oZuKwCIpOYFM6tUYsNd1S+GOs
-						+65oVPVsOglAT+uLTXZ4e9HBQMjYNdbtYNqDQ4+zhU6J8hfZxSM4KuO/GpRdCRkE
-						ozWdui8KYHLFyd5pK5kGN7XKv9GwxzWcV/4hfiAY0UAqZqqdZWFNuKYTaWM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dep.software2.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dep.software2.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dep.software2.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dep.software2.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dep.software2.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dep.software2.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dep.software2.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dep.software2.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dep.software2.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dep.software2.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dep.software2.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Software2 Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Software2 Software eDistribution Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.software2.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ryan</GivenName>
-    <SurName>Heath</SurName>
-    <EmailAddress>mailto:ryan.heath@software2.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Heath</SurName>
-    <EmailAddress>mailto:ryan.heath@software2.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev-sso.knewknovel.com-entry-uk_federation-Metadata.xml b/swamid-interfederations-2.0/dev-sso.knewknovel.com-entry-uk_federation-Metadata.xml
deleted file mode 100644
index 7e22b321..00000000
--- a/swamid-interfederations-2.0/dev-sso.knewknovel.com-entry-uk_federation-Metadata.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev-sso.knewknovel.com/entry/uk_federation/Metadata">
-  <!--
-		This is a "Phoenix Dev-SSO Test" simpleSAMLphp SP for Knovel Corporation.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-21T13:15: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: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://dev-sso.knewknovel.com/saml/module.php/saml/sp/discoresp.php" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="en">The Knovel website integrates technical reference information with analytical and search tools for engineers.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Knovel Corporation: Phoenix Dev-SSO Test</mdui:DisplayName>
-        <mdui:Logo height="115" width="350">https://dev-content.knewknovel.com/web/integration/ukfed/images/logo_350_115.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					MIIEKDCCAxCgAwIBAgIJAKxWU5hufa29MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
-					VQQGEwJVUzELMAkGA1UECAwCTlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25v
-					dmVsIENvcnAxCzAJBgNVBAsMAklUMScwJQYDVQQDDB5odHRwczovL2Rldi1zc28u
-					a25ld2tub3ZlbC5jb20xHjAcBgkqhkiG9w0BCQEWD2tvcHNAa25vdmVsLmNvbTAe
-					Fw0xNTA4MTkyMDUzMDdaFw0yNTA4MTYyMDUzMDdaMIGUMQswCQYDVQQGEwJVUzEL
-					MAkGA1UECAwCTlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25vdmVsIENvcnAx
-					CzAJBgNVBAsMAklUMScwJQYDVQQDDB5odHRwczovL2Rldi1zc28ua25ld2tub3Zl
-					bC5jb20xHjAcBgkqhkiG9w0BCQEWD2tvcHNAa25vdmVsLmNvbTCCASIwDQYJKoZI
-					hvcNAQEBBQADggEPADCCAQoCggEBANmMaTuO4pe4qBkuTtqCeD24Nll4NZK6WDsa
-					KLsbuoyubRHwH+UAWiqxDAtwYcwkF/GA31mpXgSAHF5o2K94OSHlfV8NlBsFvcTa
-					m5ibH3gWxPnSPZ6RZmDORZGou+fcjPmEaNHp3N4fr477CpU3DRByF7NbCjxu45pM
-					evQXrmNPL5xrZ4150KqfYLLW0J3vcVAX1isjATD9rZ9NexrJGyrfKmBedRRjGY8c
-					OOGi8P+EZ7AZp2Rl1n6KaDqZxi4GyL9Idu2F+YDhs8n9l4WDru9xkS5Yj/aZ/BOO
-					xPnZoBGdG6PwjMOOvv2HDtCg+SBoexd43J0FVXdE8TDBVsin8BECAwEAAaN7MHkw
-					CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
-					dGlmaWNhdGUwHQYDVR0OBBYEFIiT/cFvKveYIGRbT62j05zG00X1MB8GA1UdIwQY
-					MBaAFIiT/cFvKveYIGRbT62j05zG00X1MA0GCSqGSIb3DQEBCwUAA4IBAQBbR8dI
-					geLZtbSE81w42AX4rj+G/2l5aq2Uqk+9YFP1q6L2CwX1Fd1mYPeZ8vhuZo1wTxBp
-					SrIUpP5xS/5zB+0PdKCc469Ygb2O0QIwmgpVyLfqp8CRH6ZfWNpHkTbm85wvR6L2
-					pOih0rQf5M63+/Vz/jJ8Q8pB9miW5xJeHk9tga4SRqqX9gDCTVpOURQwlY9rH3HW
-					AOfBMik79ajJTtdFzNTHcXRsMECGcUPpwhYO6hoCnKZuKno/Mv3m65V0D8QFSpo9
-					H3cR++PC2D/SXJ/gScby4KoZ/btjYgtQVFx0Zw0gy6O04HsTLaS8dvYaDh9KtG5Y
-					vGswy+4N6R+gM1ov
-				</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>
-					MIIEKDCCAxCgAwIBAgIJAKxWU5hufa29MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
-					VQQGEwJVUzELMAkGA1UECAwCTlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25v
-					dmVsIENvcnAxCzAJBgNVBAsMAklUMScwJQYDVQQDDB5odHRwczovL2Rldi1zc28u
-					a25ld2tub3ZlbC5jb20xHjAcBgkqhkiG9w0BCQEWD2tvcHNAa25vdmVsLmNvbTAe
-					Fw0xNTA4MTkyMDUzMDdaFw0yNTA4MTYyMDUzMDdaMIGUMQswCQYDVQQGEwJVUzEL
-					MAkGA1UECAwCTlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25vdmVsIENvcnAx
-					CzAJBgNVBAsMAklUMScwJQYDVQQDDB5odHRwczovL2Rldi1zc28ua25ld2tub3Zl
-					bC5jb20xHjAcBgkqhkiG9w0BCQEWD2tvcHNAa25vdmVsLmNvbTCCASIwDQYJKoZI
-					hvcNAQEBBQADggEPADCCAQoCggEBANmMaTuO4pe4qBkuTtqCeD24Nll4NZK6WDsa
-					KLsbuoyubRHwH+UAWiqxDAtwYcwkF/GA31mpXgSAHF5o2K94OSHlfV8NlBsFvcTa
-					m5ibH3gWxPnSPZ6RZmDORZGou+fcjPmEaNHp3N4fr477CpU3DRByF7NbCjxu45pM
-					evQXrmNPL5xrZ4150KqfYLLW0J3vcVAX1isjATD9rZ9NexrJGyrfKmBedRRjGY8c
-					OOGi8P+EZ7AZp2Rl1n6KaDqZxi4GyL9Idu2F+YDhs8n9l4WDru9xkS5Yj/aZ/BOO
-					xPnZoBGdG6PwjMOOvv2HDtCg+SBoexd43J0FVXdE8TDBVsin8BECAwEAAaN7MHkw
-					CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
-					dGlmaWNhdGUwHQYDVR0OBBYEFIiT/cFvKveYIGRbT62j05zG00X1MB8GA1UdIwQY
-					MBaAFIiT/cFvKveYIGRbT62j05zG00X1MA0GCSqGSIb3DQEBCwUAA4IBAQBbR8dI
-					geLZtbSE81w42AX4rj+G/2l5aq2Uqk+9YFP1q6L2CwX1Fd1mYPeZ8vhuZo1wTxBp
-					SrIUpP5xS/5zB+0PdKCc469Ygb2O0QIwmgpVyLfqp8CRH6ZfWNpHkTbm85wvR6L2
-					pOih0rQf5M63+/Vz/jJ8Q8pB9miW5xJeHk9tga4SRqqX9gDCTVpOURQwlY9rH3HW
-					AOfBMik79ajJTtdFzNTHcXRsMECGcUPpwhYO6hoCnKZuKno/Mv3m65V0D8QFSpo9
-					H3cR++PC2D/SXJ/gScby4KoZ/btjYgtQVFx0Zw0gy6O04HsTLaS8dvYaDh9KtG5Y
-					vGswy+4N6R+gM1ov
-				</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>
-					MIIDyjCCArKgAwIBAgIJALW6A/BUfZ3FMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNV
-					BAYTAlVTMQswCQYDVQQIEwJOWTEMMAoGA1UEBxMDTllDMRswGQYDVQQKExJLbm92
-					ZWwgQ29ycG9yYXRpb24xHzAdBgNVBAMTFmRldi1zc28ua25ld2tub3ZlbC5jb20w
-					HhcNMTQwNDE0MTMxMjU1WhcNMzQwNDA5MTMxMjU1WjBmMQswCQYDVQQGEwJVUzEL
-					MAkGA1UECBMCTlkxDDAKBgNVBAcTA05ZQzEbMBkGA1UEChMSS25vdmVsIENvcnBv
-					cmF0aW9uMR8wHQYDVQQDExZkZXYtc3NvLmtuZXdrbm92ZWwuY29tMIIBIjANBgkq
-					hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnX01rHw3vO6lIPsCouVCUF7ypKNSk9Gu
-					IXCKZ1P+bt4dtd0QE+8HyLkyk6e55Yx+sxsHuD0laHbzvuv35GdhT5Prgct2UMYN
-					UpChSHticrmfOV854FzKDJEfmbeLpS23GhMeHo1x0KFsFOM1tPYGjmxkRDMN5Cvv
-					z9mXmknF/0WEipOWBR4I9aUcmziiZZpqentVdEpYiodVJaOu0hSqOlXs1mDtB4tF
-					KOSzlvDS8qjlA2fynvwe1qAqUd8khp5w5jvVkh4NTPFSl2fIwrQc4irI6NM6Kw7o
-					izflkVuLV2aW2qb1IldI81g2qqOpeP1YYSGrFxDJ3XdEevoza4ozDwIDAQABo3sw
-					eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
-					ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUjcBQ9UtvvI+ytSMztbS5Z1hnz/cwHwYDVR0j
-					BBgwFoAUjcBQ9UtvvI+ytSMztbS5Z1hnz/cwDQYJKoZIhvcNAQEFBQADggEBAF00
-					MyzrFcM0daBiKqxG3dm7rw3noJF/wQkXNqtRWJvxnB3WpuWNJYn8g1s3m9HhNVNQ
-					8lFfIVzxMHhtZbj2AJSxB+3CtLlxEI+Ek+V4fbIcoAsTfe61OMuNVAJbyvdjjxSC
-					Ewv9B71RSXuU9nZw/Zl0Z3bO0vLvbgtlEKlO/M2U749PxqLjvIPTGL0k+nScpC4y
-					fuVAi8o5ufW2OccVaeMd5WupA7PhJHGGdAN4qszavFkTsE2JIheNdk4Zewob61iu
-					XWQKqMUCvhHMPkCVBWqbAJzSOIE0gqqbsWDxoOhWv6FDj15iOpPxmzc2g1v5g9N5
-					PCaBwus+SIk+uZ5o3uU=
-				</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev-sso.knewknovel.com/saml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-sso.knewknovel.com/saml/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://dev-sso.knewknovel.com/saml/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://dev-sso.knewknovel.com/saml/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://dev-sso.knewknovel.com/saml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Knovel Corporation</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Knovel Corporation: Phoenix Dev-SSO Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://why.knovel.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Crisler</SurName>
-    <EmailAddress>mailto:m.crisler@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Johnny</GivenName>
-    <SurName>Cheung</SurName>
-    <EmailAddress>mailto:kops@knovel.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.aiwip.com-shibboleth.xml b/swamid-interfederations-2.0/dev.aiwip.com-shibboleth.xml
deleted file mode 100644
index ecc8ddd6..00000000
--- a/swamid-interfederations-2.0/dev.aiwip.com-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://dev.aiwip.com/shibboleth">
-  <!--
-		This is a "Aiwip (Beta)" Shibboleth SP for Aiwip Ltd.
-	-->
-  <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="2015-09-29T11:08:20Z">
-      <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://dev.aiwip.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Aiwip (Beta)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Free printing for University students</mdui:Description>
-        <mdui:Logo height="135" width="90">https://dev.aiwip.com/static/images/logo2-dark.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDkjCCAnqgAwIBAgIJAMhB5Bq2iyR4MA0GCSqGSIb3DQEBCwUAMEoxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xEjAQBgNVBAoMCUFpd2lwIEx0ZDEWMBQG
-						A1UEAwwNZGV2LmFpd2lwLmNvbTAeFw0xNTA5MTExNTE0MDJaFw0yNTA5MDgxNTE0
-						MDJaMEoxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xEjAQBgNVBAoMCUFp
-						d2lwIEx0ZDEWMBQGA1UEAwwNZGV2LmFpd2lwLmNvbTCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAKeYBNoVDBp6PLICKD/TpMavGRrNFBkgOg2DTwGtEx81
-						KGEzTiaZVHZGZSL1kYJCoNIVeZ9vWgn4HPbiLH7A5sWJ56vKUFV4w/Nik7Ldourm
-						r1NRR2/5v3ZqpypZBlA9zCtnqXQ+b9g/JkmnAvcTv08LCIh/0fMt28KVDPydG06K
-						bFMDHYLDmIvL7m3mkJNM9oVBLeDUmxZD/edcxOz8mOea7fxE9wcHRrBIP2JROoIZ
-						sId6gR8Wd9SPP5L8QtmrDdYhdg60CShag7VmCdiWYUsiK+8WGPTsNgg/HWnm16Qu
-						7VmftSOXYtzzOqjwbneHOZY61S6MTa5v3+LgGJ3KIikCAwEAAaN7MHkwCQYDVR0T
-						BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh
-						dGUwHQYDVR0OBBYEFPRW8eJscxxfYpnPjyKNcS8EpzbZMB8GA1UdIwQYMBaAFPRW
-						8eJscxxfYpnPjyKNcS8EpzbZMA0GCSqGSIb3DQEBCwUAA4IBAQAyGtVy8SQjIDzn
-						zMcfUb7lVNQPrllcqZe/3Rw3LNE6ZK4/pa7h0pf3Nxshe9l7/1V3ltwmW7tNfIxI
-						OBay2iKDqNvXiIzSESOuvtuUhx+QOk54VnDZNyZTIxG/oNGodsEb+DlCawzWEVou
-						NIiLvKtWqOCmH3lSVbwoNafgEtR0kLXiIF8kc39SmoZkQbuXv/vn1HuaZGx/qyzq
-						evUZK4V2B1H8xkcj+PuVjnq7yo59Z2hxBCrzdmtS4Ctuxr49OP5mjRobc+XAvtZG
-						DfqRJcZIQ0IF5Fm5VTiWawxRo9AKLCLgeGnE9qoFUzkrdGRvWvPSbN09FPw64gAk
-						ZGK4Vav2
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://dev.aiwip.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.aiwip.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.aiwip.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.aiwip.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.aiwip.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.aiwip.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.aiwip.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.aiwip.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.aiwip.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.aiwip.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.aiwip.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Aiwip Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aiwip (Beta)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://dev.aiwip.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ruslan</GivenName>
-    <SurName>Khazarchiev</SurName>
-    <EmailAddress>mailto:ruslan@aiwip.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ruslan</GivenName>
-    <SurName>Khazarchiev</SurName>
-    <EmailAddress>mailto:ruslan@aiwip.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.atomwide.com-shibboleth.xml b/swamid-interfederations-2.0/dev.atomwide.com-shibboleth.xml
deleted file mode 100644
index 704715f4..00000000
--- a/swamid-interfederations-2.0/dev.atomwide.com-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://dev.atomwide.com/shibboleth">
-  <!--
-		This is a Shibboleth "Atomwide Network Weather Stations" SP for Atomwide 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="2013-10-21T14:57: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://weather.atomwide.com/Shibboleth.sso/USO/LGfL"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://weather.atomwide.com/Shibboleth.sso/USO/UKAMF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://weather.atomwide.com/Shibboleth.sso/UKAMF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://weather.atomwide.com/Shibboleth.sso/EY"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Atomwide Network Weather Stations</mdui:DisplayName>
-        <mdui:Description xml:lang="en">An online weather station network which gathers data every minute of every day.</mdui:Description>
-        <mdui:Logo height="100" width="175">https://weather.atomwide.com/icons/sp_logo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAONeeRUO0yHOMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2F3ZXh0aWlzMDUuYXRvbXdpZGUuY29tMB4XDTEzMTAxNzE1NTQyNVoXDTIz
-						MTAxNTE1NTQyNVowIjEgMB4GA1UEAxMXYXdleHRpaXMwNS5hdG9td2lkZS5jb20w
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFvpx2Ua9cvLumNpJvuWxj
-						uucuLgRXISlIcb/QGPF/+DBPBJVrhOTOsbDwm458yFxUuwT8CVH9S3ZmjcDuQlA/
-						fcyyNI2K5UZG8D8snPxrmUR6KrhhMTW/OHfnAGx6NjZ+yLmgzv/zCVYLpD0RDSNJ
-						/xE1yz2FBeCivGsLU/8fj41YNmBxHiwNn3t83QYh9ZQcsxn2YBGtvYEiYmp096RW
-						dkZoOI+Ak7nhznD8aNwNqHt2Y41zGAcWj1aoxBpHCnsyW7GDLtYaU+T72udTbEu6
-						qUy+MZ65rtNbIWDt9I9gkdu4vNlYOsdFcvbGJJQF9cm9cPA7MDxoktlNPdAf8G4J
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2F3ZXh0aWlzMDUuYXRvbXdpZGUuY29tMB0G
-						A1UdDgQWBBQBD5JKO1GLhc8wheQNQwhgc6jpqjANBgkqhkiG9w0BAQUFAAOCAQEA
-						qI6nu0h16izCKlRwvR8rVbYQzq5yQ+viqa+1UDmJNbMAz1VxrhrKjfDhEkJsAw9k
-						sPgn5H7GUqUmW9igIZ1idnnXNjgevlq4sX51uYjyFEjAYJIYIPDmdGGXaiRmOCED
-						ch63qSLjdmtt//0a4WX04KVBnXC+R1sGkN9sVJixcukI7FJ3zsDAlvmMrg+HkC6G
-						m28GNw7qHxX1MLdsArfCKCwqz7aUbAfnZKu02a+knvRC9kYKx48Mom9fEMDGF8Ev
-						RY26QS88MwyUyIJL1mcYosG0PjqkcpQV03bkbiSzJZLlnQMKi7Wlnyj7+Z8fIwpt
-						357QZECho6a7JiQXFGp1WA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://weather.atomwide.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weather.atomwide.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weather.atomwide.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weather.atomwide.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weather.atomwide.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weather.atomwide.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weather.atomwide.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weather.atomwide.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weather.atomwide.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weather.atomwide.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weather.atomwide.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weather.atomwide.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://weather.atomwide.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weather.atomwide.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://weather.atomwide.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atomwide Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atomwide Network Weather Stations</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.atomwide.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Phil</GivenName>
-    <SurName>Chapman</SurName>
-    <EmailAddress>mailto:shibboleth@lgfl.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Phil</GivenName>
-    <SurName>Chapman</SurName>
-    <EmailAddress>mailto:shibboleth@lgfl.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.british-history.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.british-history.ac.uk-shibboleth.xml
deleted file mode 100644
index 70d7c3ba..00000000
--- a/swamid-interfederations-2.0/dev.british-history.ac.uk-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://dev.british-history.ac.uk/shibboleth">
-  <!--
-		This is a "British History Online (Development)" Shibboleth SP for the University of London.
-	-->
-  <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-08-12T15:43: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>
-      <init: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.british-history.ac.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://dev.british-history.ac.uk/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="33" width="487">https://dev.british-history.ac.uk/images/logo.gif</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">British History Online (Development)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Additional premium content including The Parliament Rolls of Medieval
-					England (Edward I to Henry VII), all the volumes of the Calendar of
-					State Papers, Domestic 1537-1714, the Calendars of State Papers for
-					Scotland and Ireland, plus the Calendar of Close Rolls</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAI7HlHmpqucIMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWRldi5icml0aXNoLWhpc3RvcnkuYWMudWswHhcNMTQwODExMTIxNTEzWhcN
-						MjQwODA4MTIxNTEzWjAkMSIwIAYDVQQDExlkZXYuYnJpdGlzaC1oaXN0b3J5LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA92Lp3IYHaMCh16cu
-						LkWLxaWF0HHc/zTxY/ietppTfnB7RiWymuQftZgpdT/i5XMDoN6i/vsGaozhKB3R
-						uCTM1pWpf727BlQ+kRj05ubZQpU/7zhy5zUdVgB+beOFyeCxNB+vuYMjzLXIXjgg
-						Rja8WaDxw5z2DKRIkU33zctMVzs0xmsZoU9Kdb0EhHywBD2qKo/CtUHAUBRCN/f0
-						Jou6gLBCWhXvqtU+aXYZ45WgMjuIOFkAFEospma7BLMwnkL6naXaa2ZFLre2/W1j
-						eLF8dFYMmpILr4ADqefdI/mRiWMcVPG+c5HkOEC8p6J0bueEsg0qzVkgeKd6zRSK
-						SVXMlQIDAQABo0cwRTAkBgNVHREEHTAbghlkZXYuYnJpdGlzaC1oaXN0b3J5LmFj
-						LnVrMB0GA1UdDgQWBBTQUJ/POKKfY+yYnayMo0F/VtWHGDANBgkqhkiG9w0BAQUF
-						AAOCAQEAyWPC2vo0tNlrItLquM6u+AE9azWtnkpETqcfrpf91fPzIPOICXKcYf9l
-						GByWb5z1vnMaR37BwnOY3pe5228BvJMEeKv47y5z/WdhummD5K7dRjnyc1h0S1rv
-						f3sGhKevqjtc+V4FC0sXSdaYJ+GEk9Ba9rk5YNi4AZLcRU7reSeQDeKbYSBHRyEy
-						BNyc5/DxTFj3jlFPsitPNfLGmeUnShq/mblHv4EvE1UvDk0d7v3wEgTN6pfWn4RV
-						QqvzFvmhNR5slxAD/SNN2eqVsfL6i8K2WzrAqT0cFNNbkxJQf3kAYeCRke0dL1cW
-						w7gyOd8N9gcNQMsWbRCyuxHJB7d5kw==
-					</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://dev.british-history.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.british-history.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.british-history.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.british-history.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.british-history.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.british-history.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">British History Online (Development)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://dev.british-history.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Blaney</SurName>
-    <EmailAddress>mailto:Jonathan.Blaney@sas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Steer</SurName>
-    <EmailAddress>mailto:Martin.Steer@sas.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.clarin.nl-shibboleth.xml b/swamid-interfederations-2.0/dev.clarin.nl-shibboleth.xml
deleted file mode 100644
index 377b8b60..00000000
--- a/swamid-interfederations-2.0/dev.clarin.nl-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://dev.clarin.nl/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-04-16T14:23: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>
-    <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://aai.dfn.de/category/clarin-member</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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CLARIN NL Portal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CLARIN NL Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Das Web Portal der niederländischen CLARIN Projekt</mdui:Description>
-        <mdui:Description xml:lang="en">The Web Portal of the Dutch CLARIN Project</mdui:Description>
-        <mdui:Logo height="102" width="169">https://dev.clarin.nl/sites/default/files/clarin-nl_logo_169x102.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://dev.clarin.nl/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://dev.clarin.nl/privacy%20policy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>dev.clarin.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=dev.clarin.nl</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC7jCCAdagAwIBAgIJAIS5kN0UFuPyMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDWRldi5jbGFyaW4ubmwwHhcNMTQwMTIwMjAwMzAyWhcNMjQwMTE4MjAwMzAy
-WjAYMRYwFAYDVQQDEw1kZXYuY2xhcmluLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtwI+RsC5q8PEiWAEI66kc8I4sHF7Yg/zyKf/X7Z+Qjm19mcx
-Ix+7L8d854vjXFx4Azq4oZh2xgOnIK1BWl0FRaMkGg//iwtcS9lYRzIoPeubWTAQ
-UPkDnMHTGqOKpUzelwKPW7vMSLGwlIObDtdNQYMi+TnTqaZeFP+8ttUsieHjgaEJ
-fblADuBQ/Q0AxY6zzn2d0Zb/+5NY2XJJ7jqR8k+eJfwixqVrKReY1avzp2zT+P+Z
-UXAJ4J8dDtttLe3kcOChqgNaqYPnzz7l9bHG9hkLzO2quDiHJGqTVVRIVt1KVGCb
-3TI5ng5A7nxmr+fuac0i+S2mvCUQ/DevWFG6pQIDAQABozswOTAYBgNVHREEETAP
-gg1kZXYuY2xhcmluLm5sMB0GA1UdDgQWBBQe0sCHuSNk8a96farCbVZgfWgyjjAN
-BgkqhkiG9w0BAQUFAAOCAQEANeCYW2LEXGFvQoYWk40ZHrYGvSSXlouSZHbMqS6U
-WdbGHBaXrWLlTGD3nT6MdHIBRhb3By834MG5lnIGu22lHXv28nd5Ztv+ZkER9p6Y
-l1xyupEIzha7W6TxCyI1OvBj7CrqDX6LBPJXV4Gw2nzJxL+1WBgqqcaPpdU0LpBs
-XODzb4uGQLrBr1CgvW+aUHC+sYPUmL/llu+JCcyB+1QqnP/csDaAh70ZjM3RV2sG
-rK0uZktZErJjDbAeWRjUNGsmXvaXAdDMEZHZ8p+nbbM7zS/Cy0yORzAcYvQQVo1I
-fRWZ2B3NwYzRMZxKIoyAG2Ow0PRSCxhclqwyw8KIVZJI5A==
-</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>dev.clarin.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=dev.clarin.nl</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC7jCCAdagAwIBAgIJAIS5kN0UFuPyMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDWRldi5jbGFyaW4ubmwwHhcNMTQwMTIwMjAwMzAyWhcNMjQwMTE4MjAwMzAy
-WjAYMRYwFAYDVQQDEw1kZXYuY2xhcmluLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtwI+RsC5q8PEiWAEI66kc8I4sHF7Yg/zyKf/X7Z+Qjm19mcx
-Ix+7L8d854vjXFx4Azq4oZh2xgOnIK1BWl0FRaMkGg//iwtcS9lYRzIoPeubWTAQ
-UPkDnMHTGqOKpUzelwKPW7vMSLGwlIObDtdNQYMi+TnTqaZeFP+8ttUsieHjgaEJ
-fblADuBQ/Q0AxY6zzn2d0Zb/+5NY2XJJ7jqR8k+eJfwixqVrKReY1avzp2zT+P+Z
-UXAJ4J8dDtttLe3kcOChqgNaqYPnzz7l9bHG9hkLzO2quDiHJGqTVVRIVt1KVGCb
-3TI5ng5A7nxmr+fuac0i+S2mvCUQ/DevWFG6pQIDAQABozswOTAYBgNVHREEETAP
-gg1kZXYuY2xhcmluLm5sMB0GA1UdDgQWBBQe0sCHuSNk8a96farCbVZgfWgyjjAN
-BgkqhkiG9w0BAQUFAAOCAQEANeCYW2LEXGFvQoYWk40ZHrYGvSSXlouSZHbMqS6U
-WdbGHBaXrWLlTGD3nT6MdHIBRhb3By834MG5lnIGu22lHXv28nd5Ztv+ZkER9p6Y
-l1xyupEIzha7W6TxCyI1OvBj7CrqDX6LBPJXV4Gw2nzJxL+1WBgqqcaPpdU0LpBs
-XODzb4uGQLrBr1CgvW+aUHC+sYPUmL/llu+JCcyB+1QqnP/csDaAh70ZjM3RV2sG
-rK0uZktZErJjDbAeWRjUNGsmXvaXAdDMEZHZ8p+nbbM7zS/Cy0yORzAcYvQQVo1I
-fRWZ2B3NwYzRMZxKIoyAG2Ow0PRSCxhclqwyw8KIVZJI5A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.clarin.nl/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.clarin.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.clarin.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.clarin.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.clarin.nl/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.clarin.nl/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.clarin.nl/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.clarin.nl/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.clarin.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.clarin.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.clarin.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.clarin.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.clarin.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.clarin.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CLARIN NL Portal</md:ServiceName>
-      <md:ServiceName xml:lang="en">CLARIN NL Portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Das Web Portal der niederländischen CLARIN Projekt</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">The Web Portal of the Dutch CLARIN Project</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="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="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>CLARIN</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@clarin.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>CLARIN</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@clarin.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md: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/dev.k-int.com-shibboleth.xml b/swamid-interfederations-2.0/dev.k-int.com-shibboleth.xml
deleted file mode 100644
index 6b4274c5..00000000
--- a/swamid-interfederations-2.0/dev.k-int.com-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://dev.k-int.com/shibboleth">
-  <!--
-		This is a "Development Server for Knowledge Integration" Shibboleth SP for Knowledge Integration Ltd.
-	-->
-  <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="2014-09-09T14:33:59Z">
-      <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://dev.k-int.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://dev.k-int.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEDCCAfigAwIBAgIJANET7G0zB2ebMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDWRldi5rLWludC5jb20wHhcNMTQwOTA4MTUxNTQxWhcNMjQwOTA1MTUxNTQx
-						WjAYMRYwFAYDVQQDEw1kZXYuay1pbnQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA4FRK1M3lvxHPR22JlwT04/9qBnHfwh/Qb3HdfCxslyPnMZ0B
-						EK67BoSmJTwaOxgFc05qiPiFvtC5TAA7J2T9OEKXswsu45VWcDQ6ol/slKsUg8pC
-						1YzR/o935v7tlgLv/2q2MnQq+Be+aRfPDj3x/EEBbtyLl3SGECiz/RZvE0b5fmm6
-						b1vRlIkhaJcedMk0hKeI0HB0S/sVEYqFJ8UGyBA5R6x1Ix3uWqH29yB2nmPAXuTP
-						WEo4ErvyUmkOnzqm6Id4QNyN3ngaLojKRfOOQVbjZ5WSPz8krDydSe2T4VzAjozX
-						f+fizC/O3Vp7SQhoR5qmmE+lO4Crk2+4ZnIIPQIDAQABo10wWzA6BgNVHREEMzAx
-						gg1kZXYuay1pbnQuY29thiBodHRwczovL2Rldi5rLWludC5jb20vc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUYelLBe5LEJDiZ43Ly+/dldqjfOswDQYJKoZIhvcNAQEFBQAD
-						ggEBAGYaZug6eU/zrg+hL8qDgdrRqQMQuDF40s/aUyy5UU3p0Re+Z7KB7bf9tCle
-						Tf+f8zu9ZxxIkQQQuiAwE+x+DNLzldvf4fzYTtdE2VOw9SBV4uSI8fYxspPTnsZT
-						zhAG1Ftcp8OexmaBAK+N05f8Jh069tLoLlDLv4kigccyMWdGTOeHgBhXekm2W5w6
-						CmGRDp+nhCqLP48loKcq8oYJCP/DDpbfvkF8RQnV+x58NaXYZeg+fGRuz5YzDAMK
-						Jmuy/Q2tX05sTkOwM+nMe1p8LGRyZRuOYnEAarUWU/wJhTzVfP3FTonNwdGkCHVJ
-						NZQGTuoZ4yj8q5imTpVcX0ApBkk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://dev.k-int.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.k-int.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.k-int.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.k-int.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.k-int.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.k-int.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.k-int.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.k-int.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.k-int.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.k-int.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.k-int.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Knowledge Integration Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Development Server for Knowledge Integration</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.k-int.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chas</GivenName>
-    <SurName>Woodfield</SurName>
-    <EmailAddress>mailto:chas.woodfield@k-int.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chas</GivenName>
-    <SurName>Woodfield</SurName>
-    <EmailAddress>mailto:chas.woodfield@k-int.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.keynote.co.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.keynote.co.uk-shibboleth.xml
deleted file mode 100644
index 9a876dfd..00000000
--- a/swamid-interfederations-2.0/dev.keynote.co.uk-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" entityID="https://dev.keynote.co.uk/shibboleth">
-  <!--
-		This is a "Development" OpenAthens SP for Key Note Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-28T15:54: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 urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIGDzCCBPegAwIBAgIQJh9i1AJonsnAFcGwgs/cvzANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwNDE2
-						MDAwMDAwWhcNMTgwNDE3MjM1OTU5WjCB+TELMAkGA1UEBhMCR0IxEjAQBgNVBAgT
-						CU1pZGRsZXNleDEQMA4GA1UEBxQHSGFtcHRvbjERMA8GA1UEChQIS2V5IE5vdGUx
-						ETAPBgNVBAsUCEtleSBOb3RlMTUwMwYDVQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3
-						LnZlcmlzaWduLmNvLnVrL3JwYSAoYykwNTEiMCAGA1UECxMZQXV0aGVudGljYXRl
-						ZCBieSBWZXJpU2lnbjEnMCUGA1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBO
-						ZXR3b3JrMRowGAYDVQQDFBF3d3cua2V5bm90ZS5jby51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBANjKlKP40hmfmHrQdPo2rI+zJUl9eMvL5qNzLgAN
-						QnOgojsZFwpQ3UJxIcm8Od2eIWd1xJne5ijHaeTniBxeJOj2PfDVzFxuvPWXcMYs
-						wusvAOgEcSDjhe2Qk4hBY0dd1T0IvU+8zRK6I+lGfZGkP7kNc+jq6ATyxXB3ayb1
-						1/3yCljsnj27CH5hrym8IA7MCOZhYFXux66LGhT0c4WpKICIGapM6NLDDRI+zqQO
-						C7JUh/7bteC332DJlpp/hEedtcytwdznAsfuFYAqLW0m2C1+F0m42hRYRsdK/8BE
-						wZVvmVEtQ5nD0PhWJle+p5qY2vOsnCoux4w2d8vMnCVQWSECAwEAAaOCAdMwggHP
-						MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6
-						Ly9TVlJTZWN1cmUtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmww
-						RgYDVR0gBD8wPTA7BgtghkgBhvhFAQcXAzAsMCoGCCsGAQUFBwIBFh5odHRwczov
-						L3d3dy52ZXJpc2lnbi5jby51ay9ycGEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPYvnmlMHYGCCsGAQUF
-						BwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29tMEAG
-						CCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52ZXJpc2lnbi5jb20v
-						U1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFeoFwwWjBYMFYWCWltYWdl
-						L2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweLIQUYMCYWJGh0dHA6
-						Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjANBgkqhkiG9w0BAQUFAAOC
-						AQEAVwvsWtkpYSAGQkJ2TV0wfnFg+tMRCSu3nB4KEYCremLxItsnnGuyDLb8/EYT
-						Mfwdr26NKunr+50Ry85EwmAPeYbx6NY9kLb2s/XyujeGHQaDOQTXMRtXvEYoJ5vw
-						lNqMPy5O1Ih3W4TJi+CeX2TVaX4PNS2PKv6GKfIKZC0aWP6ZSurvyBUoI5jaMcoj
-						0/2IqQ9HIxlRdTEIXGuvPfCMzQmQ48RmLHw3ImTb91JkQM31/FwsiIidjWkkgq5M
-						5z9CF7Rt++PysgVB2M6swP3qVegOAFnkHGvuQExRS3dSQK4wUYXwKUoeXKBfTE60
-						iIcX2da2+HnwyJ4195yPUocmnA==
-					</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>
-						MIIGDzCCBPegAwIBAgIQJh9i1AJonsnAFcGwgs/cvzANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwNDE2
-						MDAwMDAwWhcNMTgwNDE3MjM1OTU5WjCB+TELMAkGA1UEBhMCR0IxEjAQBgNVBAgT
-						CU1pZGRsZXNleDEQMA4GA1UEBxQHSGFtcHRvbjERMA8GA1UEChQIS2V5IE5vdGUx
-						ETAPBgNVBAsUCEtleSBOb3RlMTUwMwYDVQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3
-						LnZlcmlzaWduLmNvLnVrL3JwYSAoYykwNTEiMCAGA1UECxMZQXV0aGVudGljYXRl
-						ZCBieSBWZXJpU2lnbjEnMCUGA1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBO
-						ZXR3b3JrMRowGAYDVQQDFBF3d3cua2V5bm90ZS5jby51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBANjKlKP40hmfmHrQdPo2rI+zJUl9eMvL5qNzLgAN
-						QnOgojsZFwpQ3UJxIcm8Od2eIWd1xJne5ijHaeTniBxeJOj2PfDVzFxuvPWXcMYs
-						wusvAOgEcSDjhe2Qk4hBY0dd1T0IvU+8zRK6I+lGfZGkP7kNc+jq6ATyxXB3ayb1
-						1/3yCljsnj27CH5hrym8IA7MCOZhYFXux66LGhT0c4WpKICIGapM6NLDDRI+zqQO
-						C7JUh/7bteC332DJlpp/hEedtcytwdznAsfuFYAqLW0m2C1+F0m42hRYRsdK/8BE
-						wZVvmVEtQ5nD0PhWJle+p5qY2vOsnCoux4w2d8vMnCVQWSECAwEAAaOCAdMwggHP
-						MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6
-						Ly9TVlJTZWN1cmUtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmww
-						RgYDVR0gBD8wPTA7BgtghkgBhvhFAQcXAzAsMCoGCCsGAQUFBwIBFh5odHRwczov
-						L3d3dy52ZXJpc2lnbi5jby51ay9ycGEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPYvnmlMHYGCCsGAQUF
-						BwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29tMEAG
-						CCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52ZXJpc2lnbi5jb20v
-						U1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFeoFwwWjBYMFYWCWltYWdl
-						L2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweLIQUYMCYWJGh0dHA6
-						Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjANBgkqhkiG9w0BAQUFAAOC
-						AQEAVwvsWtkpYSAGQkJ2TV0wfnFg+tMRCSu3nB4KEYCremLxItsnnGuyDLb8/EYT
-						Mfwdr26NKunr+50Ry85EwmAPeYbx6NY9kLb2s/XyujeGHQaDOQTXMRtXvEYoJ5vw
-						lNqMPy5O1Ih3W4TJi+CeX2TVaX4PNS2PKv6GKfIKZC0aWP6ZSurvyBUoI5jaMcoj
-						0/2IqQ9HIxlRdTEIXGuvPfCMzQmQ48RmLHw3ImTb91JkQM31/FwsiIidjWkkgq5M
-						5z9CF7Rt++PysgVB2M6swP3qVegOAFnkHGvuQExRS3dSQK4wUYXwKUoeXKBfTE60
-						iIcX2da2+HnwyJ4195yPUocmnA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.keynote.co.uk/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.keynote.co.uk/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.keynote.co.uk/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.keynote.co.uk/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Key Note Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Keynote Development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.keynote.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Vipul</GivenName>
-    <SurName>Agarwal</SurName>
-    <EmailAddress>mailto:vipul@byng-systems.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Vipul</GivenName>
-    <SurName>Agarwal</SurName>
-    <EmailAddress>mailto:vipul@byng-systems.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ollie</GivenName>
-    <SurName>Maitland</SurName>
-    <EmailAddress>mailto:ollie@byng-systems.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@byng-systems.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/dev.niif.hu-shibboleth.xml
deleted file mode 100644
index 288e7f46..00000000
--- a/swamid-interfederations-2.0/dev.niif.hu-shibboleth.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://dev.niif.hu/shibboleth">
-  <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">dev.niif.hu - NIIF Gitlab</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">dev.niif.hu - NIIF Gitlab</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Közös fejlesztést támogató környezet</mdui:Description>
-        <mdui:Description xml:lang="en">Development support platform</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">https://dev.niif.hu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://www.eduid.hu/dev-niif-hu-adatkezelesi-szabalyzat/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDyzCCArOgAwIBAgIJAMz5rXxV5LhzMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNVBAYTAkhVMQowCAYDVQQIDAEgMREwDwYDVQQHDAhCdWRhcGVzdDEOMAwGA1UECgwFTklJRkkxDDAKBgNVBAsMA0FBSTEUMBIGA1UEAwwLZGV2Lm5paWYuaHUxGjAYBgkqhkiG9w0BCQEWC2FhaUBuaWlmLmh1MB4XDTEzMDkxOTE0Mzg0OVoXDTMyMTExODE0Mzg0OVowfDELMAkGA1UEBhMCSFUxCjAIBgNVBAgMASAxETAPBgNVBAcMCEJ1ZGFwZXN0MQ4wDAYDVQQKDAVOSUlGSTEMMAoGA1UECwwDQUFJMRQwEgYDVQQDDAtkZXYubmlpZi5odTEaMBgGCSqGSIb3DQEJARYLYWFpQG5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA5lcu5S0Deqp1Fdg4W5adlKozHOdiZG1CIz/860gilZzTfZ3ASn6uGhgedVnstsSPoy3tPYTSt9Ojm093RW5AB2lPHMjcwALcalNj088x6thyw02g3X0ikh6O40asFgqMMJSbTT5zIGxtSCssD8nsTbk93pfWpOeQ2nCWFy15Jox6JxRtMTONp6jaNQbJX5XCanuqszC2b0V/EnrQm8Wmh1FPig5fT5/Mtit2r8pD7xqqM8VT9k3A2jp4o2p3RCyQGPs4+VbhQnlFFoxuO5O+e9bwgRPry5ZhmdtgeWQ0JjTAY/dIMxBKWl7P4AwDIsWUTmPYJwpnmm+4ezC0MnxdAgMBAAGjUDBOMB0GA1UdDgQWBBQDEfDpSNqtjMt5HWjQYIEl135g1DAfBgNVHSMEGDAWgBQDEfDpSNqtjMt5HWjQYIEl135g1DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCBgWzMbo0jQP7NDKhGQS6p0ekaTRE6V/laes6rc6dH2TBO/kRjSn25qu4r5Ym7A2hnHTOd/nTgeHuPhK7l+tQnMpU1hq8K3ykAlUSl2iKqt0zXXX80YvCeJEww4lXPyl03S4WkJR//BfMYiencaxB2oqIzt8WkBTe2BvsK1Jeql7AVy3OEQKk3SVYgOWa2+vjLduaxjKjX1HySfNiKTwQjtdfmtsMYRRyjz87m3AjY8F8niBs4Q/POA/JWCQ35XG3k1InCQIkV0ReYelgmelRerHPe1Qs7y1fw989/mSf/WTGM90AL/CRb4S9qIpSx4eYXLPGeTiEf1sOixRwwwIbb</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>dev.niif.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.niif.hu/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.niif.hu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.niif.hu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="hu">dev.niif.hu - NIIF Gitlab</md:ServiceName>
-      <md:ServiceName xml:lang="en">dev.niif.hu - NIIF Gitlab</md:ServiceName>
-      <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="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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 3c07ae59..00000000
--- a/swamid-interfederations-2.0/dev.ords.ox.ac.uk-shibboleth.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://dev.ords.ox.ac.uk/shibboleth">
-  <!--
-		This is an "ORDS dev" Shibboleth SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:08:41Z">
-      <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://dev.ords.ox.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://dev.ords.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIJAMTekyIxruAZMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWRldi5vcmRzLm94LmFjLnVrMB4XDTE0MDMyNjE1MjIwNVoXDTI0MDMyMzE1
-						MjIwNVowHDEaMBgGA1UEAxMRZGV2Lm9yZHMub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCyUaAfy6/+4NEKbLUL7bkZIaaeAZRmerKMSR4L
-						mwgueQ4VAO1mVogr3abLNJz3xtXqHeA4+iYKVyvGVBXoqQGl9SeLuoDRPEOQCxXc
-						sXxt7fEMpuQfqP7Q3XPvPwSpBuvtaac2kZgXIuHcSZZFJTa4d1aSJFgclzwzGh77
-						f7w87Olj85QK1422M2RZq8LDdIcyi/nsqSLHe08Dg9ZiW/yOr22m6mN6oVUz1Prw
-						BEnH6WU5KbwiOweVBt7CzHlLQS47fg6a+O3sQlYQsPnjjYYtODYG015gPk+1CNlm
-						XM4ji6yHbtY7cEmfIcxUHLajFrXNPkrejk/QbZr3ldcE1kzBAgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEWRldi5vcmRzLm94LmFjLnVrhiRodHRwczovL2Rldi5vcmRzLm94
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFLKTjIENem7hq6zmT3gfDgSqITHf
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCUSxq9Ltpxs0hCKwm+L7pv681mUDEeIlGFyVzy
-						A9GsMVTXJLh4iK+5hnsB1yxuOr5gyXpumDtThvrUNxs2ilhRFpl6FmSdj4B5e2by
-						bRbg/h91jdUuTRh48g9Y1PDD+ni6D672s9acjKqXv62mIAPxGob+2hDOVBHQtLj/
-						Yyug3pfNmTJyPkqZY7vEwuvsOvG+LR6z3hQzL/7kGd+OVtbaKYyeN0QDYozdYyHG
-						IChAFKDUiO1a4J05jUxLuGcto5ozOFurWGieiptFnhlr68t5vGXunQ55r41+5Ixw
-						USr1xa2CyDRm+G7gp/teublqbSKOfBTZ778RRMCK2KQiV+qh
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ords.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford ORDS dev</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.overtsoftware.com-shibboleth.xml b/swamid-interfederations-2.0/dev.overtsoftware.com-shibboleth.xml
deleted file mode 100644
index 525ede69..00000000
--- a/swamid-interfederations-2.0/dev.overtsoftware.com-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://dev.overtsoftware.com/shibboleth">
-  <!--
-		This is a test Shibboleth SP for Overt Software Solutions Ltd.
-	-->
-  <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-10-26T10:51:43Z"/>
-  </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://dev.overtsoftware.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://dev.overtsoftware.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="169" width="350">https://dev.overtsoftware.com/overt-logo-ukfed.png</mdui:Logo>
-        <mdui:Description xml:lang="en">Overt Software Solutions Ltd test SP</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Overt Software Solutions Ltd test SP</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDiDCCAnACCQDQGWbiDKuX9zANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHDA1LaWRkZXJtaW5z
-						dGVyMSUwIwYDVQQKDBxPdmVydCBTb2Z0d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYD
-						VQQDDBVkZXYub3ZlcnRzb2Z0d2FyZS5jb20wHhcNMTIxMDI2MDk0MzQ4WhcNMzIx
-						MDIxMDk0MzQ4WjCBhTELMAkGA1UEBhMCR0IxFzAVBgNVBAgMDldvcmNlc3RlcnNo
-						aXJlMRYwFAYDVQQHDA1LaWRkZXJtaW5zdGVyMSUwIwYDVQQKDBxPdmVydCBTb2Z0
-						d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYDVQQDDBVkZXYub3ZlcnRzb2Z0d2FyZS5j
-						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpnaTvvvdx98eq58Uw
-						/SZceVTD2oqKhemP63ftjDJbFSwzvldYtELChPyol5N2FTJicgTcNDUG8TaojI5O
-						hD4DEJ8hOeJMyVpvqcLJ08fACvdTeELNRrLm0S5/EbECpwkzCuylFfcW/g3bUyWQ
-						Ygqwh4QdvsHZGt8gpNekL8HHanSHZM6nuqEKmxf3lTyX8HvMUHNpJ+MipJkMwL2C
-						E1t/PmptAma7eK7Fskf55YM+TEf+HDnFbUYEpyEJB5KJbDVPwz+MiClcFp3r96mr
-						4utUYVvNI63d88P6YO2iPF9cuZ/aAFjYDpA5VeDPNC+OebtctnTijuBPIAOO9KJQ
-						xk/1AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAB98gs+wZT9FXroh/WHhAa0DlSlB
-						g+RnjvE0i+sph+SL5yDHurgVS3t7kwCfgsZnlaGNmE5mLXarIC0H4XhZyRyaelyi
-						yZvjfQSjOOfG+cmWxFtyT85EzzIr1yXE9Ze03tkp03ryJKKyeNEyaUA185PhJ0Pd
-						BmzOOThwLq2F59TOtMVq7Zfv7uxtgf9jHPquke/OYQLfv6SpYek4JqUQAZ8vSRe/
-						7NwdnlukTdaDm+xbfscZdIjnSJ1vb6M2lFQXiSkSrlLhYLKejIioRAoelUMRQn1T
-						N9PikIwIaLGqefV92Nl+5+iv2esjVQiGk+O4YPBeuyJJwag601rn0FaL5Qs=
-					</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://dev.overtsoftware.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.overtsoftware.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.overtsoftware.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.overtsoftware.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.overtsoftware.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.overtsoftware.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.overtsoftware.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.overtsoftware.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.overtsoftware.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.overtsoftware.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.overtsoftware.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Overt Software Solutions Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Overt Software Solutions Ltd test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.overtsoftware.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ed</GivenName>
-    <SurName>Beddows</SurName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ed</GivenName>
-    <SurName>Beddows</SurName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.pf.adidas.com.xml b/swamid-interfederations-2.0/dev.pf.adidas.com.xml
deleted file mode 100644
index 70e64f79..00000000
--- a/swamid-interfederations-2.0/dev.pf.adidas.com.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://dev.pf.adidas.com">
-  <!--
-		This is a PingFederate SP for Adidas International Trading B.V.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-25T13:35:45Z">
-      <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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdjCCAl6gAwIBAgIGAUAaKOiMMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNVBAYT
-						AkRFMQ8wDQYDVQQIEwZCYXllcm4xFzAVBgNVBAcTDkhlcnpvZ2VuYXVyYWNoMQ8w
-						DQYDVQQKEwZhZGlkYXMxHzAdBgNVBAsTFkNDIE1hcmtldGluZyBHbG9iYWwgSVQx
-						ETAPBgNVBAMMCHBpbmdfZGV2MB4XDTEzMDcyNjA4NDcwM1oXDTIzMDcyNDA4NDcw
-						M1owfDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjEXMBUGA1UEBxMOSGVy
-						em9nZW5hdXJhY2gxDzANBgNVBAoTBmFkaWRhczEfMB0GA1UECxMWQ0MgTWFya2V0
-						aW5nIEdsb2JhbCBJVDERMA8GA1UEAwwIcGluZ19kZXYwggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCCDhQHa7AiG64TEr9I+GCjnBq3dUybpS7R8JI3JkHO
-						xaWXCDxOvuPcoi9xA9PW4TooQgD5QXz+eIyQ2Arb5tyOBmKekWPq4f5KkqYa6qyt
-						pJJTqUuoVbqjQjNP1NVHZmwFsL3Kadnes+87LsgbVtQnpiqYHz3s2WT7YfmlSqXR
-						mMrQt5iVSTX0Tdm5m7wA6Xyzq21faqb6CDYCFZXUe0f/G9WrbJTITN5yc4p8T7NW
-						yeRFVj2v0PFXdv+aAiqkv1W5781M8F5OfBNripwXfT12RONbYvgY8sUFDY6BDlNh
-						vDDKKBQRvTILTKL1QIsRPWvUti5vW9ySDXjFgLvS5DsvAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBAGMrOehUiULVhakwr/l9gIiKaw1txHUYlsVZ740an0vt6y+A2O8L
-						bzPaI2my/y0aV6ddk78ERK2bRkSKVgkLevu/SKTdrE+ClTccCsZquUPK8C/Rbqvd
-						G3trHaSjO91LKgbcA/IQZc3rojZShIsLp0CQ05HBOtB5EzSeLK67gEFiOOTXj49i
-						UOWl9vrHP5khiXkqjhYK2PwoM+wOGDm2PepftBEKb6fCv0IJH6+057xDOhE+rWHN
-						Sn9dCpFe0yTtmyASrOPeHHUbS8wqDEQQjWiA8UO+PKkFESfXduO7eqT/wve5Toj5
-						dkrEwvqRvyw71CgkUBhrKtFp+tc8WVA3MXw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.pf.adidas.com/sp/ARS.ssaml2" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.pf.adidas.com/sp/SLO.saml2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.pf.adidas.com/sp/SLO.saml2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.pf.adidas.com/sp/SLO.saml2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.pf.adidas.com/sp/SLO.ssaml2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.pf.adidas.com/sp/acs.saml1" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.pf.adidas.com/sp/acs.saml1" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.pf.adidas.com/sp/ACS.saml2" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.pf.adidas.com/sp/ACS.saml2" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.pf.adidas.com/sp/ACS.saml2" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Adidas International Trading B.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">adidas UK</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.adidas.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>CRM-Support</GivenName>
-    <EmailAddress>mailto:CRM-Support@adidas-group.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>CRM-Support</GivenName>
-    <EmailAddress>mailto:CRM-Support@adidas-group.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Deborah</GivenName>
-    <SurName>Olivo</SurName>
-    <EmailAddress>mailto:Deborah.Olivo@externals.adidas-group.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.qmplus.qmul.ac.uk-shibboleth.xml
deleted file mode 100644
index 802d4ecc..00000000
--- a/swamid-interfederations-2.0/dev.qmplus.qmul.ac.uk-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://dev.qmplus.qmul.ac.uk/shibboleth">
-  <!--
-		This is a "Development QMPlus service" Shibboleth SP for Queen Mary and Westfield College, University of London.
-	-->
-  <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-07-07T11:56:50Z">
-      <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://dev.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAIPqU3kVAWyhMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWRldi5xbXBsdXMucW11bC5hYy51azAeFw0xMjA2MDcxNDQ5MzRaFw0yMjA2
-						MDUxNDQ5MzRaMCAxHjAcBgNVBAMTFWRldi5xbXBsdXMucW11bC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJQ/1Fmpe7Y4Fczs9FF+B6/sS/N9
-						1SRvn3IYtio8Nt0JUB+thfKvl68yUnHwn5QXTZdBCZeQtAD26PY3CkdYtB/xoqLu
-						0/WB5oVFnYDPfHIFgbLGU4D3yTEpkJDjFEj2lfXs29JFvGs1veZnMup+QDTSeA2Q
-						Fl6efsN/zWkwqH0vEvLAm2ar7ovCRqekVVCU18z6XAlmBRAr3RPWCNJ1ANFyhHz0
-						iQKBDK4VWWRcK+851jcRqGQxtCq/e36pISLD90tay5T8zqBWsDJ5V5w57/vhVyN0
-						O/lPS2ACONnA/p2KJEJoPjfx4/8S5QIyWZr+B2sRUmxrn+2g4u5yclL6OTcCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVZGV2LnFtcGx1cy5xbXVsLmFjLnVrMB0GA1UdDgQW
-						BBS74EpjVaBI09AbjkKq11ifr73KtjANBgkqhkiG9w0BAQUFAAOCAQEALoXD6Y4c
-						BKSKOyINLvgG7cbakQBDQvrRKNI4upoY54PG/mt2PT7LD/GNqK59L6J8hGsC9dMI
-						Gtfg7x4lmxneJ/REhyrVH+WaUEH6jfjzHo8Dx7cnyDsRHEeOLLMMOmj5TuzFHwNq
-						VpRjDA9HUHxcewIEjI+kpgtKu29pt1PcKpGvQyQZHABdPOTJSkys8EL6b8gbYofG
-						5h+rt2LoqtmR6mtO/YvW9SDldfl5SLYEqBlrK4t6AYGzlUguqnTd24nVL9ow38OB
-						mFqHxq0Fz6XbSqKOAVhGMqqLplS1gusquKWYDLo5GdHCeFlw5qT42q9RZzBaGJrU
-						Fh/8cnvaYjotUw==
-					</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://dev.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College: Development QMPlus service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Academic Applications</GivenName>
-    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Moodle Support</GivenName>
-    <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Academic Applications</GivenName>
-    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.scotlandonscreen.org.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.scotlandonscreen.org.uk-shibboleth.xml
deleted file mode 100644
index 4c72d68c..00000000
--- a/swamid-interfederations-2.0/dev.scotlandonscreen.org.uk-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://dev.scotlandonscreen.org.uk/shibboleth">
-  <!--
-		This is a "Scotland on Screen" Shibboleth SP for Scottish Film Ltd.
-	-->
-  <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="2015-12-01T10:38:26Z">
-      <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://dev.scotlandonscreen.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://dev.scotlandonscreen.org.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJAK3ywPPep8cMMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCWxvY2FsaG9zdDAeFw0xNjAxMDcxMTM0NTVaFw0yNjAxMDQxMTM0NTVaMBQx
-						EjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBALUriVptjd9/HN1JP+P57Bu8f2ANYby9cUAjPl8uUiu8WIKIZfcQUc70PMWK
-						tUlG5+Vd6+RarcqqiUVUFKbNguF4dKSk71J78qcgC8EL996Tk+rE1DnJsRaFqjap
-						4RZVSX8cp73tBv/6xWp+G5FpYRQJn/yd+Yig5BZ9BtRAQgVtVtEKxdmF4vH0JcXr
-						+I28KA4f5opAas30fim1rkHSaMcwAVp8bdraDAZg0IH8VjmMAQoRWfCHWDlS6IRd
-						EaAWMrUlN5B9SLXRwPz+rLv18Op3peF4bcwSFojtcKqmKcHAq19MU+HpD16psy2E
-						qOZ1vSpvi6LxbD0FK8xhHa4G8yUCAwEAAaM3MDUwFAYDVR0RBA0wC4IJbG9jYWxo
-						b3N0MB0GA1UdDgQWBBQO1xVyM0zjuT+LVgJKJmfdQAsexTANBgkqhkiG9w0BAQUF
-						AAOCAQEAZoL4CjppQJpS8tpO4S8CaLaJLpRdXJwALEljSCljQm+EMxANZPdUQ+ot
-						S4rX09EBGQ4X9xpUpXPj+OzwLDMAHnBX9CkdexMZLTQM8KRR0cr88ddrt1Us/+Zl
-						1cV8iRk2oWdt0zpU90Goafly/6H06g4pNKn/qMAWqh8TnCA3y7Lu7gMHFm0Vuw48
-						LAth776zwZF7vSx8+J3nxdkpUfCGwodDbQcnOCdHhgz485vjqws5ikEdaSvjZesJ
-						ijPaX1haBIHzQANOaKa9mX0tqacdGtF9+Fc1bT6LKr5YSX6ayZ3O+mLUgT4Gytrx
-						Ifs+m0woTJzTY/PfGCSMejyrT/oFoQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://dev.scotlandonscreen.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.scotlandonscreen.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Scottish Film Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Scotland on Screen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://dev.scotlandonscreen.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paolo</GivenName>
-    <SurName>Ciarrocca</SurName>
-    <EmailAddress>mailto:web@scottishfilm.scot</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paolo</GivenName>
-    <SurName>Ciarrocca</SurName>
-    <EmailAddress>mailto:web@scottishfilm.scot</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index a9905fb9..00000000
--- a/swamid-interfederations-2.0/dev.staffsubs.ox.ac.uk-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://dev.staffsubs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Development Staff Subscriptions Site" for the University of Oxford.
-	-->
-  <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="2014-09-29T13:49:06Z">
-      <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://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAMPTupjyLfCfMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmRldi5zdGFmZnN1YnMub3guYWMudWswHhcNMTQwOTI2MTMwODA5WhcNMjQw
-						OTIzMTMwODA5WjAhMR8wHQYDVQQDExZkZXYuc3RhZmZzdWJzLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsIra3HDvpQGik+04o7Hi353+
-						0xtA8JgwRy78IYhWNWr4v0a5B5Ahpsc/i7slwZLHmgZirCdMZdgrDktVuEQTbi8m
-						TO7NLo9vra8odrHzHoHmWgvWIOp9Foj6POlPzTNU8snjUMUVNM7ShZ/4jV3H4CGZ
-						vd4zpHmfvkfOYPRkWt4VMUdzjs6fpt9hAeSiEZf7XuS/cbkE/0ZGfo7yHDrq8Ul0
-						1iEp+95odJCuyL3qIf8jSgyqJCJP918d5F6SE3t+u4Q1syQazgNSzHePrwCHSSGR
-						ztZSJeeNZUexdLOYASL/ysNXWVhP77WGjMVqwU4Zv7f0kpl1S9gH12CEaD/NAwID
-						AQABo0QwQjAhBgNVHREEGjAYghZkZXYuc3RhZmZzdWJzLm94LmFjLnVrMB0GA1Ud
-						DgQWBBRVSkzRfVG/AW8Ec4VyYVUEwJ1fZjANBgkqhkiG9w0BAQUFAAOCAQEAl4cc
-						V+K4waP0sgXUQAaNpl+N0r/2DLg0njCJN0QUiWzqvfan6jJ+5FlUYOqeUtLfuOMQ
-						Ikwx9PvFqhoyK+QuP0/9Y5REar4Oinc8xn2nWgpTaKgOcBihdrGeN0k72NbjS+UO
-						g81H9RzGsPzWp1rKC+4AmdJFIaWNiqlcg59FKzF4KiVfXfF123mKIiKr/Pj9ir2k
-						P1B0Wxj420naHJHUIHG2yt64DwKbWRsMgJCdyT4U3zTr7Q4ycO+cMExw7f2z9LIM
-						hvYWVctcejaX+2FYRleI+SzKFzZAT7jAUy1PrYQ7v0MRkBc68iAyycFfStNlZYNF
-						tkBUW7bI089WV6OA0Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.staffsubs.ox.ac.uk:8999/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Development Staff Subscriptions Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Hebron</SurName>
-    <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev.wiseflow.dk.xml b/swamid-interfederations-2.0/dev.wiseflow.dk.xml
deleted file mode 100644
index e52a0d04..00000000
--- a/swamid-interfederations-2.0/dev.wiseflow.dk.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://dev.wiseflow.dk">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2012-12-19T20:51:32Z" registrationAuthority="https://www.wayf.dk">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
-        <mdui:Description xml:lang="da">Formålet er at facilitere digital hŒåndtering af skriftlige eksaminer.</mdui:Description>
-        <mdui:Description xml:lang="en">The purpose is to facilitate digital management of written exams.</mdui:Description>
-        <mdui:DisplayName xml:lang="da">WISEflow dev</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">WISEflow dev</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE9TCCA92gAwIBAgISESH+ztqYjBHgq/wYQiZ/sorSMA0GCSqGSIb3DQEBCwUA MGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYD VQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0g RzIwHhcNMTQxMjIyMDc0MDU2WhcNMTgwMTMwMTI1MDEwWjA7MSEwHwYDVQQLExhE b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFjAUBgNVBAMMDSoud2lzZWZsb3cuZGsw ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6s0JtLsYVlJyk0wecpxSI 61QY+YJA9CWGHN4+ffPPHdxJHWLuM4CC63vQgw5TFGiOVW38R+FZXyUELOJsruEu P0hvgcsIEVRqJWp9vlAE1vMsHTC2mfGQGwcC2AbwcpPl2+CLBj6uKOcPWzR/N6S9 bUsokleeSnfltP5s7VQkFcjcPdbJQWnlRzTwKZTaOxLRfuTnJPGc8D92XWgpCK4u 4/pFQEIz00Uzw93ULbRK7tmKF+wyFEKf6FtX7YEO04lqqGpmsJ1daXNzS/izlTM/ 3Esf0m/SP7N/qNP3BFNv9Nx6i6D7ha/lkT044zBvZcf1+sqF62eRxY/h1247eGi5 AgMBAAGjggHMMIIByDAOBgNVHQ8BAf8EBAMCBaAwSQYDVR0gBEIwQDA+BgZngQwB AgEwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVw b3NpdG9yeS8wJQYDVR0RBB4wHIINKi53aXNlZmxvdy5ka4ILd2lzZWZsb3cuZGsw CQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYDVR0f BDwwOjA4oDagNIYyaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFp bnZhbHNoYTJnMi5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEcGCCsGAQUFBzAChjto dHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbHNo YTJnMnIxLmNydDA5BggrBgEFBQcwAYYtaHR0cDovL29jc3AyLmdsb2JhbHNpZ24u Y29tL2dzZG9tYWludmFsc2hhMmcyMB0GA1UdDgQWBBQ1pHl1wFij/zbTH64lg9ff 53I8wDAfBgNVHSMEGDAWgBTqTnzUgC3lFYGGJoyCbcCYpM+XDzANBgkqhkiG9w0B AQsFAAOCAQEAPnLDCKrxHIjJsqIuGHexn9GOWpNV/N1A6iUZwEMO7T8u4DOWxWsL pPbnJb54YswMH6ylsrmgwok90iTRCLU4Ljz/ujDYU3v0HnKzyeZbQVsYJVoMbWpG b/3h9IVYawghnbM8F50XR+OQcbkqmv4xsBAQRNUZNLduhrzsrpdlOCU/5Zl++1dK P8Ktnx5hrXhnF3fEFKAYHRJ3ZcfqGwOLwkTQqaqtt57Cl7g3qiY7EyAVFrTB7siV 4q8FX/fOfFpZ5KuwFxieq09zhQyAkwDPBf36k9h6mn0Lfr8DNtcv2xsdG6SHvMbk 20HckFA3dxB/XORwDkHgEVHeiJqbJGZM4w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.wiseflow.dk/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://dev.wiseflow.dk/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://dev.wiseflow.dk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="da">WISEflow dev</md:ServiceName>
-      <md:ServiceName xml:lang="en">WISEflow dev</md:ServiceName>
-      <md:ServiceDescription xml:lang="da">Formålet er at facilitere digital hŒåndtering af skriftlige eksaminer.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">The purpose is to facilitate digital management of written exams.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="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" FriendlyName="eduPersonPrincipalName" 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" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" 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" FriendlyName="mail" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonLIN" isRequired="true"/>
-      <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" 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" FriendlyName="schacHomeOrganization" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
-      <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" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 662087d8..00000000
--- a/swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>*.redclara.net</ds:KeyName>
-        <ds:KeyName>redclara.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
-MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
-bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
-cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
-RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
-l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
-/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
-UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
-amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
-AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
-G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
-ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
-dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
-cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
-KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
-BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
-bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
-ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
-DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
-8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
-MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
-I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
-yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
-s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
-</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>redclara.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
-MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
-bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
-cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
-RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
-l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
-/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
-UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
-amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
-AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
-G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
-ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
-dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
-cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
-KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
-BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
-bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
-ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
-DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
-8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
-MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
-I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
-yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
-s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
-</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:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Communities - RedCLARA</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">
-Communities - RedCLARA
-</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="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:AttributeConsumingService>
-  </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 e97944b6..00000000
--- a/swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dev2.dariah.eu/shibboleth">
-  <md: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:AttributeValue>http://refeds.org/category/research-and-scholarship</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>
-      <idpdisc:DiscoveryResponse 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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <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>MIIGJDCCBQygAwIBAgIHGFSsIT9ZfjANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDEwMDgxMjMxMTNaFw0xOTA3MDky
-MzU5MDBaMIGFMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRowGAYDVQQDExF3aWtpLmRlLmRhcmlhaC5ldTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7plMwM1uiwpWPlwhywCjqw
-QApxw4NElJdTw/kn1/DQxA9kANTD3vPdVM5JPbPKlYSQHi9Lf/vg6qAZvHI4e+Lc
-oFbB3hlRV1z3PZHqGicuymwIHV/Ux6Z4mEdKbW/oVJjcAU58BXmk0R5c/Ykx0O01
-4n63mQEj0RsWGW7lrnPBYK03hXmyyWKLzAZy98/p8MDDLT+QvVGDP7NJldstEr9m
-BPugJ4eIlvsQ/ro/CsMKkhrkmvdDGUQ7sSBR4fofC0ylEzq0S3feNR5bQJHbd33l
-thmlsatEwsWKd8bqkjOkwFEQO0ifj1mw/1JAtsP5hiSvXyvE4TwGRdI2DDNkhy8C
-AwEAAaOCAmwwggJoME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysG
-AQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAdBgNVHQ4EFgQUzwXcDvx5TaygWupbKfP+T5KR+oAwHwYDVR0jBBgwFoAU
-Hb1zzG3ubhx0cNmjGzq6qCfevOswLAYDVR0RBCUwI4IOZGV2Mi5kYXJpYWguZXWC
-EXdpa2kuZGUuZGFyaWFoLmV1MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9jYWNybC5j
-cmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4t
-Y2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUF
-BzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYI
-KwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4t
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQsFAAOCAQEACk2Po8O/URgrS/GCJNhdzHR6TnbJ2Ti6
-MkByuoEQZorEX3O/IoolRh78c6iWvq2nvh7cPVb3kNKqa2+bTnCl9Iu9KDYquQ48
-l9fkxNI/GP3GsVy+nToFJlte7pHE89epJ9+QU5RXAtiUzI+9I63nhWefBzgOJ1VZ
-ANFobZDSlgtAo4rKP+rol0WXx2dEsKLxfB675OlHQHMMRskWydCb23zEUBfQePA+
-P9C66kqEQgjAgolRfpDyq+nm0c4DpW7Ri70vU1hX5RUo3gzlj/IF+n6/s4HxQ+eq
-cQL+qVl7t4VhX8zr2JqD+T8b2OQCrG9GoF+4kwJhvS9K0d4wrLB33Q==
-</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>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>MIIGJDCCBQygAwIBAgIHGFSsIT9ZfjANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDEwMDgxMjMxMTNaFw0xOTA3MDky
-MzU5MDBaMIGFMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMRowGAYDVQQDExF3aWtpLmRlLmRhcmlhaC5ldTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK7plMwM1uiwpWPlwhywCjqw
-QApxw4NElJdTw/kn1/DQxA9kANTD3vPdVM5JPbPKlYSQHi9Lf/vg6qAZvHI4e+Lc
-oFbB3hlRV1z3PZHqGicuymwIHV/Ux6Z4mEdKbW/oVJjcAU58BXmk0R5c/Ykx0O01
-4n63mQEj0RsWGW7lrnPBYK03hXmyyWKLzAZy98/p8MDDLT+QvVGDP7NJldstEr9m
-BPugJ4eIlvsQ/ro/CsMKkhrkmvdDGUQ7sSBR4fofC0ylEzq0S3feNR5bQJHbd33l
-thmlsatEwsWKd8bqkjOkwFEQO0ifj1mw/1JAtsP5hiSvXyvE4TwGRdI2DDNkhy8C
-AwEAAaOCAmwwggJoME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysG
-AQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAdBgNVHQ4EFgQUzwXcDvx5TaygWupbKfP+T5KR+oAwHwYDVR0jBBgwFoAU
-Hb1zzG3ubhx0cNmjGzq6qCfevOswLAYDVR0RBCUwI4IOZGV2Mi5kYXJpYWguZXWC
-EXdpa2kuZGUuZGFyaWFoLmV1MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHViL2NybC9jYWNybC5j
-cmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4t
-Y2EvcHViL2NybC9jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMGCCsGAQUF
-BzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwSgYI
-KwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4t
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQsFAAOCAQEACk2Po8O/URgrS/GCJNhdzHR6TnbJ2Ti6
-MkByuoEQZorEX3O/IoolRh78c6iWvq2nvh7cPVb3kNKqa2+bTnCl9Iu9KDYquQ48
-l9fkxNI/GP3GsVy+nToFJlte7pHE89epJ9+QU5RXAtiUzI+9I63nhWefBzgOJ1VZ
-ANFobZDSlgtAo4rKP+rol0WXx2dEsKLxfB675OlHQHMMRskWydCb23zEUBfQePA+
-P9C66kqEQgjAgolRfpDyq+nm0c4DpW7Ri70vU1hX5RUo3gzlj/IF+n6/s4HxQ+eq
-cQL+qVl7t4VhX8zr2JqD+T8b2OQCrG9GoF+4kwJhvS9K0d4wrLB33Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev2.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.dariah.eu/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.de.dariah.eu/Shibboleth.sso/SAML2/POST" index="8"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Dariah Wiki</md:ServiceName>
-      <md:ServiceName xml:lang="en">Dariah Wiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">DARIAH-DE Wiki</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">DARIAH-DE Wiki</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" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bernd</md:GivenName>
-    <md:SurName>Schlör</md:SurName>
-    <md:EmailAddress>mailto:bernd.schloer@sub.uni-goettingen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Dariah</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev2.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev2.qmplus.qmul.ac.uk-shibboleth.xml
deleted file mode 100644
index a6da97a6..00000000
--- a/swamid-interfederations-2.0/dev2.qmplus.qmul.ac.uk-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://dev2.qmplus.qmul.ac.uk/shibboleth">
-  <!--
-		This is a "Development2 QMPlus service" Shibboleth SP for Queen Mary and Westfield College, University of London.
-	-->
-  <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-07-07T11:58:09Z">
-      <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://dev2.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAKIXgZKgUS02MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmRldjIucW1wbHVzLnFtdWwuYWMudWswHhcNMTQwMTEzMTE1MDE0WhcNMjQw
-						MTExMTE1MDE0WjAhMR8wHQYDVQQDExZkZXYyLnFtcGx1cy5xbXVsLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArfTNUnzPGeKks0JEURWVUhz+
-						fNsXrghIj4a0LpAEl5ez2kyU0q7mAc+uoeBJqNGs2CeOkar9YZseXi/pNXGjpRPS
-						RwGYYdG89vLgnAervT5U8ixW2egPGijU40Yc2pSldnhArOlYnwsILKCF9dDo5opG
-						KDTdEqcl6lCh2UsbAZTpRj1CSPcrPlbw42fWVsRWaxsPtwd2cMn5ioA/ijh3t4eN
-						3ZjpL3/lNhTdkp/CADiKfk1i+QTA0Y00Rc8GWrgh4beg83FEU2cpVbEb/c6tpHCe
-						+OXc1ORX3k928DMLcPMogv1Y8Cbb4LUNWpePrbdmK4EwXng/A0Vphgopx97heQID
-						AQABo0QwQjAhBgNVHREEGjAYghZkZXYyLnFtcGx1cy5xbXVsLmFjLnVrMB0GA1Ud
-						DgQWBBQqyXbyEctK4flSrdXeud1vaiYVqjANBgkqhkiG9w0BAQUFAAOCAQEAo1Xd
-						XXodRs7vG6pZVj1zphCQ18aCxKhyJwxhJXigZ4hSVCKhdt363N/DqrasXC80z1pj
-						L5FNmbl5hYqOO4dboLSNxSccW0gDl6SA16EfSACt6YQukiMsi4O1GiKYNFpC2uhp
-						spxt8IkaPUx5l5uwYr5iZGyMf5vLnJxMURcDTxT/YQT0PBLBktlkHOZuiCAvvnb3
-						BVmXbM2lPBT022q/vcrBjnh1jYlX29wh7fJfewNj7GDhIABwTtGjFJBAyY/Dh6jv
-						VvZoqdpyca2qXnwU8ndOaWizxzCA9JkcAxz5kl/Kd80KOplSaaXtvhazKHnCGPVx
-						6723v/DV2JeGagBADw==
-					</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://dev2.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev2.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev2.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev2.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev2.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev2.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College: Development2 QMPlus service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Academic Applications</GivenName>
-    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Moodle Support</GivenName>
-    <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Academic Applications</GivenName>
-    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dev2.webauth.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dev2.webauth.soton.ac.uk-shibboleth.xml
deleted file mode 100644
index bb63c020..00000000
--- a/swamid-interfederations-2.0/dev2.webauth.soton.ac.uk-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://dev2.webauth.soton.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Southampton.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">soton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIUPOcPr59teRI4vOHciwPs5r9o5TkwDQYJKoZIhvcNAQEF
-						BQAwIzEhMB8GA1UEAxMYZGV2Mi53ZWJhdXRoLnNvdG9uLmFjLnVrMB4XDTEwMDYx
-						NTEwNDIxNVoXDTMwMDYxNTEwNDIxNVowIzEhMB8GA1UEAxMYZGV2Mi53ZWJhdXRo
-						LnNvdG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkbKW
-						FxrO0yijODGXGnZsTss0l1AFNxzbyKg1IgddAyCY6TGHdRoC6ZNfKJbWAw+QWf3B
-						KJwyuu//krjW5E87wZM7Dh8c2FTC36+MJJd3DLGqefQqxrYhVdJ0/StZjHZlpOj/
-						E6MMaJXhoCxQtQmP1aRQC8LSuXFv6bpDag9hjrZhaZhlWgaG0WgyPx8fF6AgZKjy
-						1MSZj54orWP3esFMmD2ezDScE9soIrGm4eSSsdqPhgTilmog6Uz2hUtcsnmlbbgA
-						lF83pRCXJ7OxkQO6mBJDQU9djmJdA0PoJP8FTla/ijZs6IiB9QiRdk7G2QbhPaP0
-						suUfeMqVnE1KqkRY1QIDAQABo3cwdTBUBgNVHREETTBLghhkZXYyLndlYmF1dGgu
-						c290b24uYWMudWuGL2h0dHBzOi8vZGV2Mi53ZWJhdXRoLnNvdG9uLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSgTna3WVRPamY0vInfC+IQ8ePCGDANBgkq
-						hkiG9w0BAQUFAAOCAQEAVWZaM6RBcVL8il/nWq30MvZXQ4JkisIQ9gpiMWMERU0j
-						UyYdJX9tlXZkNpuVuILS356iO73JOPt1LblSpQ6ZiBSaiyJjQqdscj3T/Ek7hSlY
-						oSPy6ZjbNqDClIPmVnHgSXriIJ3Aa07S40HgIBQxkZvIspPnazhMz/+v1E/6f88c
-						Oc+0MNLXz4767rs4wcCFppi3ZPVw3ncs3Bk22T5rBEa5mRBd5QWSqrkWQ6cRCqfD
-						mEn396/yBTAFpAWjc4TXmKy9hS8S9V5dZEWRexGH5GFvXCAkinm0FBH82xGjIPHK
-						d+ZyDCU4c8uPzoTu3FJLWrcOLWzaWH3OE/URxPKVfQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dev2.webauth.soton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev2.webauth.soton.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://dev2.webauth.soton.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev2.webauth.soton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev2.webauth.soton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev2.webauth.soton.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">soton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIUPOcPr59teRI4vOHciwPs5r9o5TkwDQYJKoZIhvcNAQEF
-						BQAwIzEhMB8GA1UEAxMYZGV2Mi53ZWJhdXRoLnNvdG9uLmFjLnVrMB4XDTEwMDYx
-						NTEwNDIxNVoXDTMwMDYxNTEwNDIxNVowIzEhMB8GA1UEAxMYZGV2Mi53ZWJhdXRo
-						LnNvdG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkbKW
-						FxrO0yijODGXGnZsTss0l1AFNxzbyKg1IgddAyCY6TGHdRoC6ZNfKJbWAw+QWf3B
-						KJwyuu//krjW5E87wZM7Dh8c2FTC36+MJJd3DLGqefQqxrYhVdJ0/StZjHZlpOj/
-						E6MMaJXhoCxQtQmP1aRQC8LSuXFv6bpDag9hjrZhaZhlWgaG0WgyPx8fF6AgZKjy
-						1MSZj54orWP3esFMmD2ezDScE9soIrGm4eSSsdqPhgTilmog6Uz2hUtcsnmlbbgA
-						lF83pRCXJ7OxkQO6mBJDQU9djmJdA0PoJP8FTla/ijZs6IiB9QiRdk7G2QbhPaP0
-						suUfeMqVnE1KqkRY1QIDAQABo3cwdTBUBgNVHREETTBLghhkZXYyLndlYmF1dGgu
-						c290b24uYWMudWuGL2h0dHBzOi8vZGV2Mi53ZWJhdXRoLnNvdG9uLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSgTna3WVRPamY0vInfC+IQ8ePCGDANBgkq
-						hkiG9w0BAQUFAAOCAQEAVWZaM6RBcVL8il/nWq30MvZXQ4JkisIQ9gpiMWMERU0j
-						UyYdJX9tlXZkNpuVuILS356iO73JOPt1LblSpQ6ZiBSaiyJjQqdscj3T/Ek7hSlY
-						oSPy6ZjbNqDClIPmVnHgSXriIJ3Aa07S40HgIBQxkZvIspPnazhMz/+v1E/6f88c
-						Oc+0MNLXz4767rs4wcCFppi3ZPVw3ncs3Bk22T5rBEa5mRBd5QWSqrkWQ6cRCqfD
-						mEn396/yBTAFpAWjc4TXmKy9hS8S9V5dZEWRexGH5GFvXCAkinm0FBH82xGjIPHK
-						d+ZyDCU4c8uPzoTu3FJLWrcOLWzaWH3OE/URxPKVfQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dev2.webauth.soton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev2.webauth.soton.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 Southampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Southampton (Dev 2.x)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.soton.ac.uk/isolutions/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Serviceline</GivenName>
-    <EmailAddress>mailto:Serviceline@soton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Clayton</GivenName>
-    <SurName>Peters</SurName>
-    <EmailAddress>mailto:C.L.Peters@soton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/devapp.shibstats.com-shibboleth.xml b/swamid-interfederations-2.0/devapp.shibstats.com-shibboleth.xml
deleted file mode 100644
index 6f0066d5..00000000
--- a/swamid-interfederations-2.0/devapp.shibstats.com-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://devapp.shibstats.com/shibboleth">
-  <!--
-		This is a "statistics web service" Shibboleth SP for Overt Software Solutions Ltd.
-	-->
-  <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-04-16T14:34:23Z">
-      <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://devapp.shibstats.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://devapp.shibstats.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Overt Software Solutions Ltd</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is the development server of Overt Software's Shibboleth statistics tool. This tool provides useful statistics from your IdP.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAPXDaBba8NJ3MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGRldmFwcC5zaGlic3RhdHMuY29tMB4XDTE0MDMwNzE1MDAzMFoXDTI0MDMw
-						NDE1MDAzMFowHzEdMBsGA1UEAxMUZGV2YXBwLnNoaWJzdGF0cy5jb20wggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkpnNYg2/0yWRlgPMw6GNlAkvKetoS
-						HagRXUgAs8h2c9FcNxwhluHpqFurMIBbXwIJahPJ+R+tqHWqm4A1L+5u90tdOIDl
-						VrZa+uBBowowtTwkXb3qWwI4ova7SOi/f9nyjg2iaUJHn1Cx1n0GRN+f8mP/jfMP
-						qPwJ/FHJ+POgIyxaDq9+H4CGRNLaw5jI0anxAs71voB01HzTL4Jcv/p1u0Gy4oI4
-						BLIU7XwqiiwAnATWcIZNv3GZCpsLgGBayR+sDHT6c+Tec06War2RqIuAWQrNfOun
-						dfonmB/ZbpeCqxwW6JsaV7XsHQjJNDYlhQHUuua577VdCgZJ37o+IbUTAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFGRldmFwcC5zaGlic3RhdHMuY29tMB0GA1UdDgQWBBRR
-						k1ZGqhczGoKPo2Bx2eN9bWPnVzANBgkqhkiG9w0BAQUFAAOCAQEACmFwrgaWwsRB
-						LhXw4y5NNRhMGd4pumhaMUPvV2otLwM5/BWwbROzOfg1WgtEXOn2sStbefiQMgYE
-						J3iwfj8KD5QcKOeGV8jrBrM0aep8fEjZusAfqNqLF5SgywQBX2IBmtDt+uhM1bZQ
-						9D2qhsmFUHR4TLL9IOCZUTCUNMDY8fpE/DlscHI4KiXE3XRJxJs9grY32RRxkeVK
-						O+NIIOekToPVC6RKgiyN3uQbgs9qyjMJaFfskMZ1Iaz2dAlUulnwXW33a21wSOVs
-						luuCsEMDj0DApXM0/FkXU+FLjqyWHhC4csGN/ybD9YEv7j+J+vcK6oFo3InOc/oY
-						wgPKhs5/IQ==
-					</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://devapp.shibstats.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devapp.shibstats.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://devapp.shibstats.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devapp.shibstats.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://devapp.shibstats.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devapp.shibstats.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://devapp.shibstats.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://devapp.shibstats.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://devapp.shibstats.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://devapp.shibstats.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://devapp.shibstats.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Overt Software Solutions Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Shibboleth statistics web service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.overtsoftware.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Andre</SurName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Andre</SurName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 25301888..00000000
--- a/swamid-interfederations-2.0/devidp.nottingham.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://devidp.nottingham.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Nottingham.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-26T11:29:38Z">
-      <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 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">nottingham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIUPod7Sbr/56mHA3U++HPjhmWY37wwDQYJKoZIhvcNAQEL
-						BQAwIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRpbmdoYW0uYWMudWswHhcNMTUxMTA0
-						MTMxNDAzWhcNMzUxMTA0MTMxNDAzWjAiMSAwHgYDVQQDDBdkZXZpZHAubm90dGlu
-						Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIUmA1Je
-						uraCsBviSJhTzCsEiO9rLF1wFC79ZdKMM8+cRsBV8Wg2J3NTEsXdP3RDwaV7DU1i
-						DvqH0kkHd1TeTVWTBLy5tE5oSBI+XrUMWlW1+oKVRRgxuWwJinG9OzJGkLk3kPiC
-						wvmnh2oP/CvvBQFR7jXwzLETMX+ReJo8Qrm/i3uIatYnC+QjqXtiq32q+HrWm3/m
-						kbmbomaLhI/4eWAhyeCgbfkzJUm/J6/omhonCF2cTT9mAYTj/zEPkaIfOEsz/YoX
-						GZ1C3oJxMboECHwlXKrov4UBxcWybejM/w2tZ9hy+Dz98HBa9ktj8D+YGj17j44v
-						blKdnIvLNLeB2AECAwEAAaN1MHMwHQYDVR0OBBYEFOVrC+SsmuraLXapXXAJ1KiG
-						p0KlMFIGA1UdEQRLMEmCF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrhi5odHRwczov
-						L2RldmlkcC5ub3R0aW5naGFtLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-						DQEBCwUAA4IBAQCE/hCKcHULJtiEIvbaWVj/cJ/5djjVOq5yWp3SKqXr7QuNXhH3
-						vcyDRlSRAgM5sYztCetRizr8wvir6uQg8yThQ7a2haSKDpSSvrDlsbiN25QNcSPy
-						tHxbV/cmcPuBJqVuoSLGhl56Ak8cWcu+Gsv49f57ZwWdPry6nNxojf9T6QZ5Yjue
-						CRXV9/nKPeMyud0L9DOs6Fwv5PvVfGRqck+3GzLqFLqqd9bMEBizSqxOtitRkI6E
-						XX4b72sjaXxZmhZKx9OJDc+qb5JKIfPAhy/WMU5j8nvV1lMXA7ADQHEc6z0wcQAB
-						W6z4doMJR/vjhdSNsL+BscENO7S8TLwNerEG
-					</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>
-						MIIDSDCCAjCgAwIBAgIVAJByt+Pqvd0AQkDuileWY3HzdFCuMA0GCSqGSIb3DQEB
-						CwUAMCIxIDAeBgNVBAMMF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrMB4XDTE1MTEw
-						NDEzMTQwMFoXDTM1MTEwNDEzMTQwMFowIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRp
-						bmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFjocT
-						hMLkbIhipB+LoOS6gnhQ926P+lwkbjm4L1k1z7L9Br1+FWy6y9A87C27vjl3NVmn
-						Mb3bOJoSWzO4zhCTXKIXwsGE4p/xU27tkJrhmWSiaGIgI0yIpgJ9VqffiylMYsbB
-						TMdJZKnRCkcsT3u9hNCrZTFciX6dCuTx1eG/O/gnP1Tsv1VgZNDGkIpQ2FGyGvqf
-						CnDsoYauqQboetyMbi35kNtzyHEeQlFGdf0TzcRu4+M9Iu8m8gdysHwVI6ooNgCh
-						rPkqsiRqN8QxLehGbb2iUkCBUm1ozIJ6gI/ISju9NU2rPvnGvEDIhdahN8he+SBB
-						nWIyYSigzFIiKRB1AgMBAAGjdTBzMB0GA1UdDgQWBBSecvscFzbVdcNqNo6BYvId
-						PbEB5DBSBgNVHREESzBJghdkZXZpZHAubm90dGluZ2hhbS5hYy51a4YuaHR0cHM6
-						Ly9kZXZpZHAubm90dGluZ2hhbS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEANDNxfMHsXfT3qTlrHhHtqA+POFxFXmbVIl8eVyaRWDYt6CSh
-						ASNdkJ5JeAqyH+hi99ck/uEBHDOwkPbDz9mS5sXYQWlM/flJgPvfQhdH39x5I+89
-						E65VMCpVXIxSOimcv2e2T/6wN8LfeVxrdX/xqxTlwgMFITWiH0CBV32BYwnSTyWv
-						uA//1B+e5rrZieEDFpPIKp88kllHPI65gOM5BtM/7e7dSrP6DDFGQ9Cka2PKJN42
-						MSspvYO5t2896ElI8y5uo+WqEJJYQK5tUMEWHrEv4iKJBMh6o1RF0IKPsqfdbDXh
-						/pucELdoD3QB/+Y00gYUkW0ahafVQHPPmbXEhg==
-					</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>
-						MIIDSDCCAjCgAwIBAgIVALhfnz8SVgCdbIxwq62snEekShFkMA0GCSqGSIb3DQEB
-						CwUAMCIxIDAeBgNVBAMMF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrMB4XDTE1MTEw
-						NDEzMTQwMloXDTM1MTEwNDEzMTQwMlowIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRp
-						bmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvP2BQ
-						wMB007chmstkFdsSMgy+3t2LrsKrUWGCp12ERHXsOygz3FtIXtJ9m2qQBAoyeEUE
-						ku93NCN8EdwMA8RItP6aN2rjqDkYNsI4Lf9R/cRLxdIKWHxV0uZa8bW7NCluhcY3
-						/rNPC3ulk+mAkB2Yk6e3sVMuvHNVRzbXKjEaHQ4k42FR+m+t4eMUp9lFsaWtTNBG
-						At7z2kwRPTVgCoeSP6QKParhLw2OQLDkswPsnmxjx/eUfzMZk+1p2QaqlNzb3Byw
-						mXbFdw89vJixXTMsEE9LBGt3xAig+wBL4KdXIVVUxeH4SvzsRJ5eesM3BzEsYR8O
-						qA2z6+g2/OERpldfAgMBAAGjdTBzMB0GA1UdDgQWBBRkhkF1SOCADGY5xIRUHCoJ
-						bLvqtTBSBgNVHREESzBJghdkZXZpZHAubm90dGluZ2hhbS5hYy51a4YuaHR0cHM6
-						Ly9kZXZpZHAubm90dGluZ2hhbS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEAmiN8jb5MMsq9+lawIyf/OXd1wdAQ22Difv6/Q9zd1H1xzk84
-						okxYfdw3zH/F4ciK6MgEs4t/CUR4X9vMmA70uTKpcQjm5t9BScVvXftRGb2grGHs
-						PDeuuzCs4g9U4AdyxqrdxHZlz9rcT9XboWw61MFZIeklZRUjHU6lz6mVdxqKAoRY
-						M97HPqVv54uHdf5JrxSoN788L0nro+0Pk/ntS2YP6vNMkQ9JERnK1x3cONyJ8W6X
-						yv5xY3TkUJD4Q0hiiZ0L5uw1uDqXL6s2rHH6eQBPcr1Ju78t6hK0AfxGTalhlCiH
-						LBzKoSgVjHzieZ11lJXFwnCZmBIpMeK5rouxOg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://devidp.nottingham.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://devidp.nottingham.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://devidp.nottingham.ac.uk/idp/profile/SAML2/Redirect/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">nottingham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIUPod7Sbr/56mHA3U++HPjhmWY37wwDQYJKoZIhvcNAQEL
-						BQAwIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRpbmdoYW0uYWMudWswHhcNMTUxMTA0
-						MTMxNDAzWhcNMzUxMTA0MTMxNDAzWjAiMSAwHgYDVQQDDBdkZXZpZHAubm90dGlu
-						Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIUmA1Je
-						uraCsBviSJhTzCsEiO9rLF1wFC79ZdKMM8+cRsBV8Wg2J3NTEsXdP3RDwaV7DU1i
-						DvqH0kkHd1TeTVWTBLy5tE5oSBI+XrUMWlW1+oKVRRgxuWwJinG9OzJGkLk3kPiC
-						wvmnh2oP/CvvBQFR7jXwzLETMX+ReJo8Qrm/i3uIatYnC+QjqXtiq32q+HrWm3/m
-						kbmbomaLhI/4eWAhyeCgbfkzJUm/J6/omhonCF2cTT9mAYTj/zEPkaIfOEsz/YoX
-						GZ1C3oJxMboECHwlXKrov4UBxcWybejM/w2tZ9hy+Dz98HBa9ktj8D+YGj17j44v
-						blKdnIvLNLeB2AECAwEAAaN1MHMwHQYDVR0OBBYEFOVrC+SsmuraLXapXXAJ1KiG
-						p0KlMFIGA1UdEQRLMEmCF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrhi5odHRwczov
-						L2RldmlkcC5ub3R0aW5naGFtLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-						DQEBCwUAA4IBAQCE/hCKcHULJtiEIvbaWVj/cJ/5djjVOq5yWp3SKqXr7QuNXhH3
-						vcyDRlSRAgM5sYztCetRizr8wvir6uQg8yThQ7a2haSKDpSSvrDlsbiN25QNcSPy
-						tHxbV/cmcPuBJqVuoSLGhl56Ak8cWcu+Gsv49f57ZwWdPry6nNxojf9T6QZ5Yjue
-						CRXV9/nKPeMyud0L9DOs6Fwv5PvVfGRqck+3GzLqFLqqd9bMEBizSqxOtitRkI6E
-						XX4b72sjaXxZmhZKx9OJDc+qb5JKIfPAhy/WMU5j8nvV1lMXA7ADQHEc6z0wcQAB
-						W6z4doMJR/vjhdSNsL+BscENO7S8TLwNerEG
-					</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>
-						MIIDSDCCAjCgAwIBAgIVAJByt+Pqvd0AQkDuileWY3HzdFCuMA0GCSqGSIb3DQEB
-						CwUAMCIxIDAeBgNVBAMMF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrMB4XDTE1MTEw
-						NDEzMTQwMFoXDTM1MTEwNDEzMTQwMFowIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRp
-						bmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFjocT
-						hMLkbIhipB+LoOS6gnhQ926P+lwkbjm4L1k1z7L9Br1+FWy6y9A87C27vjl3NVmn
-						Mb3bOJoSWzO4zhCTXKIXwsGE4p/xU27tkJrhmWSiaGIgI0yIpgJ9VqffiylMYsbB
-						TMdJZKnRCkcsT3u9hNCrZTFciX6dCuTx1eG/O/gnP1Tsv1VgZNDGkIpQ2FGyGvqf
-						CnDsoYauqQboetyMbi35kNtzyHEeQlFGdf0TzcRu4+M9Iu8m8gdysHwVI6ooNgCh
-						rPkqsiRqN8QxLehGbb2iUkCBUm1ozIJ6gI/ISju9NU2rPvnGvEDIhdahN8he+SBB
-						nWIyYSigzFIiKRB1AgMBAAGjdTBzMB0GA1UdDgQWBBSecvscFzbVdcNqNo6BYvId
-						PbEB5DBSBgNVHREESzBJghdkZXZpZHAubm90dGluZ2hhbS5hYy51a4YuaHR0cHM6
-						Ly9kZXZpZHAubm90dGluZ2hhbS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEANDNxfMHsXfT3qTlrHhHtqA+POFxFXmbVIl8eVyaRWDYt6CSh
-						ASNdkJ5JeAqyH+hi99ck/uEBHDOwkPbDz9mS5sXYQWlM/flJgPvfQhdH39x5I+89
-						E65VMCpVXIxSOimcv2e2T/6wN8LfeVxrdX/xqxTlwgMFITWiH0CBV32BYwnSTyWv
-						uA//1B+e5rrZieEDFpPIKp88kllHPI65gOM5BtM/7e7dSrP6DDFGQ9Cka2PKJN42
-						MSspvYO5t2896ElI8y5uo+WqEJJYQK5tUMEWHrEv4iKJBMh6o1RF0IKPsqfdbDXh
-						/pucELdoD3QB/+Y00gYUkW0ahafVQHPPmbXEhg==
-					</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>
-						MIIDSDCCAjCgAwIBAgIVALhfnz8SVgCdbIxwq62snEekShFkMA0GCSqGSIb3DQEB
-						CwUAMCIxIDAeBgNVBAMMF2RldmlkcC5ub3R0aW5naGFtLmFjLnVrMB4XDTE1MTEw
-						NDEzMTQwMloXDTM1MTEwNDEzMTQwMlowIjEgMB4GA1UEAwwXZGV2aWRwLm5vdHRp
-						bmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvP2BQ
-						wMB007chmstkFdsSMgy+3t2LrsKrUWGCp12ERHXsOygz3FtIXtJ9m2qQBAoyeEUE
-						ku93NCN8EdwMA8RItP6aN2rjqDkYNsI4Lf9R/cRLxdIKWHxV0uZa8bW7NCluhcY3
-						/rNPC3ulk+mAkB2Yk6e3sVMuvHNVRzbXKjEaHQ4k42FR+m+t4eMUp9lFsaWtTNBG
-						At7z2kwRPTVgCoeSP6QKParhLw2OQLDkswPsnmxjx/eUfzMZk+1p2QaqlNzb3Byw
-						mXbFdw89vJixXTMsEE9LBGt3xAig+wBL4KdXIVVUxeH4SvzsRJ5eesM3BzEsYR8O
-						qA2z6+g2/OERpldfAgMBAAGjdTBzMB0GA1UdDgQWBBRkhkF1SOCADGY5xIRUHCoJ
-						bLvqtTBSBgNVHREESzBJghdkZXZpZHAubm90dGluZ2hhbS5hYy51a4YuaHR0cHM6
-						Ly9kZXZpZHAubm90dGluZ2hhbS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEAmiN8jb5MMsq9+lawIyf/OXd1wdAQ22Difv6/Q9zd1H1xzk84
-						okxYfdw3zH/F4ciK6MgEs4t/CUR4X9vMmA70uTKpcQjm5t9BScVvXftRGb2grGHs
-						PDeuuzCs4g9U4AdyxqrdxHZlz9rcT9XboWw61MFZIeklZRUjHU6lz6mVdxqKAoRY
-						M97HPqVv54uHdf5JrxSoN788L0nro+0Pk/ntS2YP6vNMkQ9JERnK1x3cONyJ8W6X
-						yv5xY3TkUJD4Q0hiiZ0L5uw1uDqXL6s2rHH6eQBPcr1Ju78t6hK0AfxGTalhlCiH
-						LBzKoSgVjHzieZ11lJXFwnCZmBIpMeK5rouxOg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://devidp.nottingham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Nottingham : Development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/is/about/index.aspx/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Craig</GivenName>
-    <SurName>Betts</SurName>
-    <EmailAddress>mailto:craig.betts@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Betts</SurName>
-    <EmailAddress>mailto:craig.betts@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/devsaas.topdeskdev.net-tas-secure-login-verify.xml b/swamid-interfederations-2.0/devsaas.topdeskdev.net-tas-secure-login-verify.xml
deleted file mode 100644
index ba31a5d6..00000000
--- a/swamid-interfederations-2.0/devsaas.topdeskdev.net-tas-secure-login-verify.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://devsaas.topdeskdev.net/tas/secure/login/verify">
-  <!--
-		This is a "topdeskdev" TOPdesk SP for TOPdesk Nederland BV.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-09T08:35:51Z">
-      <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">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID/zCCAuegAwIBAgIJAJm7S+R3eAhJMA0GCSqGSIb3DQEBBQUAMIGVMQswCQYD
-						VQQGEwJOTDEVMBMGA1UECAwMWnVpZC1Ib2xsYW5kMQ4wDAYDVQQHDAVEZWxmdDEQ
-						MA4GA1UECgwHVE9QZGVzazEPMA0GA1UECwwGWnl0aG9zMRMwEQYDVQQDDAp0b3Bk
-						ZXNrZGV2MScwJQYJKoZIhvcNAQkBFhhsLnZhbi5iZXJrZWxAdG9wZGVzay5jb20w
-						HhcNMTUwNjA4MTQ1OTAzWhcNMTgwNjA3MTQ1OTAzWjCBlTELMAkGA1UEBhMCTkwx
-						FTATBgNVBAgMDFp1aWQtSG9sbGFuZDEOMAwGA1UEBwwFRGVsZnQxEDAOBgNVBAoM
-						B1RPUGRlc2sxDzANBgNVBAsMBlp5dGhvczETMBEGA1UEAwwKdG9wZGVza2RldjEn
-						MCUGCSqGSIb3DQEJARYYbC52YW4uYmVya2VsQHRvcGRlc2suY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw7vPXtzLc6MyiXiGxLEtqRfFD11Elugn
-						eg7Nr0zqm6QtJ6GBUzv6GSf5F/CX7Zo8saoA5IZzeSEtESH5i0xotzMGaovZKMMO
-						c5gHsGYjv4o/G7BY3rzG+Hr+aoFQMTDZy/151zGAO4Y/fQyL5zUnEQYjDzKC4X6V
-						AH9B/cRbWn+NfCaEA3wYmVqheYKklffdYSG1fORoujZ3LsntjkWvwCRgvyQutjVP
-						iMxW2Iz2PU6lxPRVRAK0URz4EKQ/ULfwBiwjpX91Pqb+bm/KF6dkpN6Q5+UjGCmd
-						EE93HhV/dhf08lLaQL4GBvzJRgvsWJ2q3q8F53PXO83LHOgv9sTHlQIDAQABo1Aw
-						TjAdBgNVHQ4EFgQUWXOZkJVPkyAMxCJ48JV5RTxB6SYwHwYDVR0jBBgwFoAUWXOZ
-						kJVPkyAMxCJ48JV5RTxB6SYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOC
-						AQEAQ8RlfKbYqNFP/CpA2SnalEH+JiwhUCZtmwMjorlJro/a3PmgRDfl/FuS+dhF
-						wVgK1wJTr6bbW3Ac1ZLPjUVrCnpK0iDNSzdObGfaZCdk7lBEyxilo8D8WkrrBiVW
-						TyxQx3OD2FCe9Rrlva50gUAOpmv/W9WBztmf4kVxjT00+TneswfxSvTz/ErfVoKV
-						7IKNTrNasLYdsE74A8TZgjEOvKEssP1eU/cYAmgSJl9agw+L0eZBV4QPLkPdUYqL
-						MowydgIbulCvZoR6GUe+pTUNSeg4xmKbojB0XzZAFuR3psx8+D6FFspCszdSc40q
-						m9MCRRGj6m2ZrvVhZeFtqBRb1w==
-					</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>
-						MIID/zCCAuegAwIBAgIJAJm7S+R3eAhJMA0GCSqGSIb3DQEBBQUAMIGVMQswCQYD
-						VQQGEwJOTDEVMBMGA1UECAwMWnVpZC1Ib2xsYW5kMQ4wDAYDVQQHDAVEZWxmdDEQ
-						MA4GA1UECgwHVE9QZGVzazEPMA0GA1UECwwGWnl0aG9zMRMwEQYDVQQDDAp0b3Bk
-						ZXNrZGV2MScwJQYJKoZIhvcNAQkBFhhsLnZhbi5iZXJrZWxAdG9wZGVzay5jb20w
-						HhcNMTUwNjA4MTQ1OTAzWhcNMTgwNjA3MTQ1OTAzWjCBlTELMAkGA1UEBhMCTkwx
-						FTATBgNVBAgMDFp1aWQtSG9sbGFuZDEOMAwGA1UEBwwFRGVsZnQxEDAOBgNVBAoM
-						B1RPUGRlc2sxDzANBgNVBAsMBlp5dGhvczETMBEGA1UEAwwKdG9wZGVza2RldjEn
-						MCUGCSqGSIb3DQEJARYYbC52YW4uYmVya2VsQHRvcGRlc2suY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw7vPXtzLc6MyiXiGxLEtqRfFD11Elugn
-						eg7Nr0zqm6QtJ6GBUzv6GSf5F/CX7Zo8saoA5IZzeSEtESH5i0xotzMGaovZKMMO
-						c5gHsGYjv4o/G7BY3rzG+Hr+aoFQMTDZy/151zGAO4Y/fQyL5zUnEQYjDzKC4X6V
-						AH9B/cRbWn+NfCaEA3wYmVqheYKklffdYSG1fORoujZ3LsntjkWvwCRgvyQutjVP
-						iMxW2Iz2PU6lxPRVRAK0URz4EKQ/ULfwBiwjpX91Pqb+bm/KF6dkpN6Q5+UjGCmd
-						EE93HhV/dhf08lLaQL4GBvzJRgvsWJ2q3q8F53PXO83LHOgv9sTHlQIDAQABo1Aw
-						TjAdBgNVHQ4EFgQUWXOZkJVPkyAMxCJ48JV5RTxB6SYwHwYDVR0jBBgwFoAUWXOZ
-						kJVPkyAMxCJ48JV5RTxB6SYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOC
-						AQEAQ8RlfKbYqNFP/CpA2SnalEH+JiwhUCZtmwMjorlJro/a3PmgRDfl/FuS+dhF
-						wVgK1wJTr6bbW3Ac1ZLPjUVrCnpK0iDNSzdObGfaZCdk7lBEyxilo8D8WkrrBiVW
-						TyxQx3OD2FCe9Rrlva50gUAOpmv/W9WBztmf4kVxjT00+TneswfxSvTz/ErfVoKV
-						7IKNTrNasLYdsE74A8TZgjEOvKEssP1eU/cYAmgSJl9agw+L0eZBV4QPLkPdUYqL
-						MowydgIbulCvZoR6GUe+pTUNSeg4xmKbojB0XzZAFuR3psx8+D6FFspCszdSc40q
-						m9MCRRGj6m2ZrvVhZeFtqBRb1w==
-					</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://devsaas.topdeskdev.net/tas/secure/login/verify" index="0"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TOPdesk Nederland BV</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">topdeskdev</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.topdesk.nl/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Laurent</GivenName>
-    <SurName>van Berkel</SurName>
-    <EmailAddress>mailto:l.van.berkel@topdesk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Laurent</GivenName>
-    <SurName>van Berkel</SurName>
-    <EmailAddress>mailto:l.van.berkel@topdesk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/devsso.educause.edu-sp.xml b/swamid-interfederations-2.0/devsso.educause.edu-sp.xml
deleted file mode 100644
index eb4cc24d..00000000
--- a/swamid-interfederations-2.0/devsso.educause.edu-sp.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://devsso.educause.edu/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">EDUCAUSE SSO Development Environemtn</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EDUCAUSE development environment for Single Sign On supporting InCommon</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.educause.edu/about/incommon</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.educause.edu/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="42" width="188" xml:lang="en">https://devsso.educause.edu/assets/images/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>
-MIIDUDCCAjigAwIBAgIGAVBinWnsMA0GCSqGSIb3DQEBCwUAMGkxCzAJBgNVBAYT
-AlVTMREwDwYDVQQIEwhDb2xvcmFkbzETMBEGA1UEBxMKTG91aXN2aWxsZTERMA8G
-A1UEChMIRURVQ0FVU0UxHzAdBgNVBAMTFmRldnNzby1kcy5lZHVjYXVzZS5lZHUw
-HhcNMTUxMDEzMTkxMTM0WhcNMTgxMDEzMTkxMTM0WjBpMQswCQYDVQQGEwJVUzER
-MA8GA1UECBMIQ29sb3JhZG8xEzARBgNVBAcTCkxvdWlzdmlsbGUxETAPBgNVBAoT
-CEVEVUNBVVNFMR8wHQYDVQQDExZkZXZzc28tZHMuZWR1Y2F1c2UuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzTqzP4IYmvz0yz3AmCsFlz4XDPFw
-6lfJzFde5RhazAhWcAd1SAkCFGwMONlgL743F9mM4DntfhnLlsl8XClRlCkmrqQo
-ZbssndjRaDj4kP+445gvbRD2ZnLDTvqgBMpW0CrRSVM4LMdEKZE75Qm8vPaxHAay
-ONfDKYGHAVLb73EAExFbjkYXSRs7Wmyvudo28aobk0fHdjHTrLCkWSGHKEiY/AEV
-ZTQ1ibmmkrfxoFW1S/p/Of+2XTFKsDo+IXEYVtXV5wpQaZaIpveaqw7Q3/tPIKTy
-7fP7bhqqjCBw3kSOkJRufeCNiCpbCXPErMYpvoHnGinLwNcv0H2/MnORqwIDAQAB
-MA0GCSqGSIb3DQEBCwUAA4IBAQCYA1oGGCAtArSS2wHUsp0MpSBjUrJ+7jPubOwp
-soxez86GCbLvKn6hSaZtvISBQhQylLSp5fowulVAUR/7Uzw/2E6VM9xpuRClhuQf
-/+5JIJckEbAZIepgLvMNpTiKVAgJFSfna2RWP+43GxwE22BFF89ngiLT2FPfXroC
-EDxUb2fw/SWO5102FR3RX52xc0xAY69xq71rn7DKJojLGgO5hPK7kdC3YaRTLsYu
-wdr6yRv4n1yEhY92joL8q7y5DuhmPHby/S2dJuEDDqE5KRev6U2Vkkt35Jh55N7H
-sTbXauw0N7hvEb1hglZyoTevlyow0t+5KWyGnn84qQQZiKob
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devsso.educause.edu/sp/ACS.saml2" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">EDUCAUSE SSO Development Environemtn</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">EDUCAUSE development environment for Single Sign On supporting InCommon</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"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">EDUCAUSE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">EDUCAUSE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.educause.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Support</md:GivenName>
-    <md:EmailAddress>ITHelpdesk@educause.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alex Chaux</md:GivenName>
-    <md:EmailAddress>achaux@educause.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IT Administrative Support</md:GivenName>
-    <md:EmailAddress>ITinfo@educause.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dialect.liv-coll.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index bc30cc14..00000000
--- a/swamid-interfederations-2.0/dialect.liv-coll.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://dialect.liv-coll.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The City of Liverpool College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">liv-coll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUe2/KXRs2WbpKulqXL6OOhVDFMWQwDQYJKoZIhvcNAQEF
-						BQAwIDEeMBwGA1UEAwwVZGlhbGVjdC5saXYtc3R1LmNvLnVrMB4XDTE1MTEwNTE1
-						MzMyMVoXDTM1MTEwNTE1MzMyMVowIDEeMBwGA1UEAwwVZGlhbGVjdC5saXYtc3R1
-						LmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhlsncxjioWzh
-						osMLSvqjM8GS7uPtTyX82vYQXeMRZmWYW1APaWHUom5fwJ21YORaVn4XYWQSS7uM
-						vfW+MV3bIUGqCUSvXMztGacSbY/NR+i0XQ583C8AL523KO7SLX+WyPMwmXcmffJt
-						n7d9g5Skosuuiy/grOQEmHQKE/XlpH4RiRh/kLQb38kG5ZhL9SR39wMfaWZzWBhc
-						YRpRFKjLFiVAHnKYRQ1fu9F02A89zFUEv+pTv+i3Vz9hL0q/TF61Oi7Tk5A57vMQ
-						CYTZ4DSx0cjCsjzxOLtQ6fwN10RTUjHrxGouFg/vKFpCZyi9PBkfxp6z6/6snZQP
-						AItRT6wBMQIDAQABo3EwbzAdBgNVHQ4EFgQU7OR2K7Vgwe2rTHCcPZ2+DEhTJsMw
-						TgYDVR0RBEcwRYIVZGlhbGVjdC5saXYtc3R1LmNvLnVrhixodHRwczovL2RpYWxl
-						Y3QubGl2LXN0dS5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOC
-						AQEAbiIW2ppSfDwBdrZJE1itt93UZooBxRh5NR3yoB+vUjoBOFMSSvUZkPlXBtsQ
-						FE5jXQZAwxRU0PBa679V9L4wMpgzp3S76m2lggO5fjD/VlbQddaRsYNfRGQ1ekzR
-						oFW18gZVO5i9PmqI8U3uNuMLgw3ZpBFn4t1x2M+7lFGLeA5xxr+GUQ3sZ2udm3AW
-						NbPwGN6xXZAVDtJ/y98Z+HLPvWyQH7C8NEyrI1zW/6GhhnzCwcgN3/nBeG+YLyab
-						XGqVeeQnBT4gvDRcb7yP1rxmt4yKXkKshf4xz/pDZBjK1LWlkkZz64LFByHicBJw
-						VrLt5484eyAnlQnkdiEKJiL+BA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dialect.liv-stu.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dialect.liv-stu.co.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://dialect.liv-stu.co.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dialect.liv-stu.co.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dialect.liv-stu.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dialect.liv-stu.co.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">liv-coll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUe2/KXRs2WbpKulqXL6OOhVDFMWQwDQYJKoZIhvcNAQEF
-						BQAwIDEeMBwGA1UEAwwVZGlhbGVjdC5saXYtc3R1LmNvLnVrMB4XDTE1MTEwNTE1
-						MzMyMVoXDTM1MTEwNTE1MzMyMVowIDEeMBwGA1UEAwwVZGlhbGVjdC5saXYtc3R1
-						LmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhlsncxjioWzh
-						osMLSvqjM8GS7uPtTyX82vYQXeMRZmWYW1APaWHUom5fwJ21YORaVn4XYWQSS7uM
-						vfW+MV3bIUGqCUSvXMztGacSbY/NR+i0XQ583C8AL523KO7SLX+WyPMwmXcmffJt
-						n7d9g5Skosuuiy/grOQEmHQKE/XlpH4RiRh/kLQb38kG5ZhL9SR39wMfaWZzWBhc
-						YRpRFKjLFiVAHnKYRQ1fu9F02A89zFUEv+pTv+i3Vz9hL0q/TF61Oi7Tk5A57vMQ
-						CYTZ4DSx0cjCsjzxOLtQ6fwN10RTUjHrxGouFg/vKFpCZyi9PBkfxp6z6/6snZQP
-						AItRT6wBMQIDAQABo3EwbzAdBgNVHQ4EFgQU7OR2K7Vgwe2rTHCcPZ2+DEhTJsMw
-						TgYDVR0RBEcwRYIVZGlhbGVjdC5saXYtc3R1LmNvLnVrhixodHRwczovL2RpYWxl
-						Y3QubGl2LXN0dS5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOC
-						AQEAbiIW2ppSfDwBdrZJE1itt93UZooBxRh5NR3yoB+vUjoBOFMSSvUZkPlXBtsQ
-						FE5jXQZAwxRU0PBa679V9L4wMpgzp3S76m2lggO5fjD/VlbQddaRsYNfRGQ1ekzR
-						oFW18gZVO5i9PmqI8U3uNuMLgw3ZpBFn4t1x2M+7lFGLeA5xxr+GUQ3sZ2udm3AW
-						NbPwGN6xXZAVDtJ/y98Z+HLPvWyQH7C8NEyrI1zW/6GhhnzCwcgN3/nBeG+YLyab
-						XGqVeeQnBT4gvDRcb7yP1rxmt4yKXkKshf4xz/pDZBjK1LWlkkZz64LFByHicBJw
-						VrLt5484eyAnlQnkdiEKJiL+BA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dialect.liv-stu.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dialect.liv-stu.co.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 City of Liverpool College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The City of Liverpool College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.liv-coll.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dale</GivenName>
-    <SurName>Davies</SurName>
-    <EmailAddress>mailto:dale.davies@shared-ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dale</GivenName>
-    <SurName>Davies</SurName>
-    <EmailAddress>mailto:dale.davies@shared-ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/digital-library.theiet.org-shibboleth.xml b/swamid-interfederations-2.0/digital-library.theiet.org-shibboleth.xml
deleted file mode 100644
index 01250e92..00000000
--- a/swamid-interfederations-2.0/digital-library.theiet.org-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://digital-library.theiet.org/shibboleth">
-  <!--
-		This is a "The Institution of Engineering and Technology" OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-10T13: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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDnDCCAoSgAwIBAgIEUO2gFjANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDEwOTE2
-						NTEzNFoXDTIzMDEwNzE2NTEzNFowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAJ6gmhbskGSc6JIIrgYkhU2HkGk56rsq3s5zClxG33mRdBBvDjIYseVy
-						VjodxZTobEhaz9tCgSCwmyh+3+vI1Gm+2QVFpWA1Bbe3NVX0qnMjbD2JC29gO82q
-						wdH0pS6ASSTrdsMdP0mOjlukzquGckWTSbD047/UlFQpHqP0fJXe2n720GAfcXzI
-						GaCHsjX+fpWR3dpjrDc8sJ4ughNajitSAk6Hj7QGDsXSp0EofrwBQ/URbtAuUlnn
-						VruiNrvvskPp0ws/6aRR0IKJpfYQ1FjB9+8h+f/h64PLNEI4/Ro2EOYaRYpoCvRK
-						jHHwV/3lIKs0tX0Qg+Nu9mjIe5+y7EECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						iM/OK0loLP5l5YoyY8gnODXO/+8z6D/QRx5rDqy2SlawXUFS9An/TZc0izm/8Jch
-						N2C5tkVX7mPb95PjNl8B2Oya5CV6nvZROxzVNGyVUY2BzCyR3Np1sYlS0gLgFEtn
-						ZiNR8ktmyaJnQGulYit+OeAx20Cls3AeW3ML/4z93Z8tHgO0hNzMK4cQQfjjCxin
-						vj58/p0mg0+Vl8Z3OpW+VGp/GEkxxfN4pzXGIpg+usyhwClJ8pg7gCDHiOao8tWj
-						zWC78aCP4PfduWFFeOMqoFriwS7V22Gk6CJRRMnHtoz4VLPL69JLX4hitD/w7xb3
-						1a6Bb/viRXYexhT/jLC2ew==
-					</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>
-						MIIDnDCCAoSgAwIBAgIEUO2gFjANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDEwOTE2
-						NTEzNFoXDTIzMDEwNzE2NTEzNFowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAJ6gmhbskGSc6JIIrgYkhU2HkGk56rsq3s5zClxG33mRdBBvDjIYseVy
-						VjodxZTobEhaz9tCgSCwmyh+3+vI1Gm+2QVFpWA1Bbe3NVX0qnMjbD2JC29gO82q
-						wdH0pS6ASSTrdsMdP0mOjlukzquGckWTSbD047/UlFQpHqP0fJXe2n720GAfcXzI
-						GaCHsjX+fpWR3dpjrDc8sJ4ughNajitSAk6Hj7QGDsXSp0EofrwBQ/URbtAuUlnn
-						VruiNrvvskPp0ws/6aRR0IKJpfYQ1FjB9+8h+f/h64PLNEI4/Ro2EOYaRYpoCvRK
-						jHHwV/3lIKs0tX0Qg+Nu9mjIe5+y7EECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						iM/OK0loLP5l5YoyY8gnODXO/+8z6D/QRx5rDqy2SlawXUFS9An/TZc0izm/8Jch
-						N2C5tkVX7mPb95PjNl8B2Oya5CV6nvZROxzVNGyVUY2BzCyR3Np1sYlS0gLgFEtn
-						ZiNR8ktmyaJnQGulYit+OeAx20Cls3AeW3ML/4z93Z8tHgO0hNzMK4cQQfjjCxin
-						vj58/p0mg0+Vl8Z3OpW+VGp/GEkxxfN4pzXGIpg+usyhwClJ8pg7gCDHiOao8tWj
-						zWC78aCP4PfduWFFeOMqoFriwS7V22Gk6CJRRMnHtoz4VLPL69JLX4hitD/w7xb3
-						1a6Bb/viRXYexhT/jLC2ew==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://digital-library.theiet.org/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://digital-library.theiet.org/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Institution of Engineering and Technology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.theiet.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Neil</GivenName>
-    <SurName>Dennis</SurName>
-    <EmailAddress>mailto:ndennis@theiet.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:openathens@publishingtechnology.com</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 3147883b..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dimorus.intranet.ifrj.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dimorus.intranet.ifrj.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dimorus.intranet.ifrj.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dimorus.intranet.ifrj.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md: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"/>
-    <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">IFRJ - Instituto Federal do Rio de Janeiro</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFRJ - Instituto Federal do Rio de Janeiro</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFRJ - Instituto Federal do Rio de Janeiro</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifrj.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifrj.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Marcos Velten</md:SurName>
-    <md:EmailAddress>suporte@ifrj.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 240a7c7b..00000000
--- a/swamid-interfederations-2.0/dimorus.intranet.ifrj.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://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">www.ifrj.ed.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ifrj.ed.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xMzAxBgNVBAoTKklGUkogLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gZGUgSmFuZWlybzENMAsGA1UECxMEREdU
-STEiMCAGCSqGSIb3DQEJARYTc3Vwb3J0ZUBpZnJqLmVkdS5icjEXMBUGA1UEBxMO
-UmlvIGRlIEphbmVpcm8xFzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQG
-EwJCUjElMCMGA1UEAxMcZGltb3J1cy5pbnRyYW5ldC5pZnJqLmVkdS5icjAeFw0x
-NDAxMjgxNTIyMjBaFw0xNzAxMjcxNTIyMjBaMIHOMTMwMQYDVQQKEypJRlJKIC0g
-SW5zdGl0dXRvIEZlZGVyYWwgZG8gUmlvIGRlIEphbmVpcm8xDTALBgNVBAsTBERH
-VEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGVAaWZyai5lZHUuYnIxFzAVBgNVBAcT
-DlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UE
-BhMCQlIxJTAjBgNVBAMTHGRpbW9ydXMuaW50cmFuZXQuaWZyai5lZHUuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfs7+xa4iW1Mlz203o9z/uw7iG
-Dgv2IVU4ReesRypp7R9ZvEKH+XoXRHtzgMT84fT3pXg176snLwgxmSuQUSZD4W/J
-AtDeqCcvQzLkixYKz1SQJnZGtbbiKAAwimdwqtm4zJkyRxJeW3ORi5hnNydgWGBy
-DiInVQ12zW+dmqju9Sj9maKIU8NrR79CrHi6gKrODdbZ+lPdMecz6wcR+EP8Mlfc
-omgI32PmRLeMhu/ZVNG8BKTEFBeEYHqt4seOM92GGv7GNE5cP/1NwGyKW31ChY+H
-k2VXqPySc0n/skSM+zjP7HhOSBjnF8vlZxDPBjKvf7AscW8hURADiZRbkrg1AgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAEYgPuzE/AMUOKMAHTPD0maFAXU4rsaw/Ohf
-2akVqp4AZ+JmhgQT5349YPI6es6YdC34ngC9SNWn5jdY+0BnZMuZYPKH2rtT57PM
-3I5XXeGsNovdGihk2NzIuHI5n9OzC4VN2/AGye4ZJ9lyZ0QZiWRuHADbqCUuxlGs
-/1lc5eSrbjRKcK/j42B7wbwKIo7uz86yj775CmcZY0qxiz3WovzHQhWYqBhQzREZ
-gP1hO+vifEHHWagCFzO6hNzm9QyyDLaXkFG4csPDBN6W9xei3eYLo2TcFZzPFuka
-/gSBfVQITfZn0bHKu9W9/7OwBPFoR+jZ+KxLvtnLuZb0R+0aGWE=
-            </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>
-      
-MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xMzAxBgNVBAoTKklGUkogLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBSaW8gZGUgSmFuZWlybzENMAsGA1UECxMEREdU
-STEiMCAGCSqGSIb3DQEJARYTc3Vwb3J0ZUBpZnJqLmVkdS5icjEXMBUGA1UEBxMO
-UmlvIGRlIEphbmVpcm8xFzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQG
-EwJCUjElMCMGA1UEAxMcZGltb3J1cy5pbnRyYW5ldC5pZnJqLmVkdS5icjAeFw0x
-NDAxMjgxNTIyMjBaFw0xNzAxMjcxNTIyMjBaMIHOMTMwMQYDVQQKEypJRlJKIC0g
-SW5zdGl0dXRvIEZlZGVyYWwgZG8gUmlvIGRlIEphbmVpcm8xDTALBgNVBAsTBERH
-VEkxIjAgBgkqhkiG9w0BCQEWE3N1cG9ydGVAaWZyai5lZHUuYnIxFzAVBgNVBAcT
-DlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UE
-BhMCQlIxJTAjBgNVBAMTHGRpbW9ydXMuaW50cmFuZXQuaWZyai5lZHUuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfs7+xa4iW1Mlz203o9z/uw7iG
-Dgv2IVU4ReesRypp7R9ZvEKH+XoXRHtzgMT84fT3pXg176snLwgxmSuQUSZD4W/J
-AtDeqCcvQzLkixYKz1SQJnZGtbbiKAAwimdwqtm4zJkyRxJeW3ORi5hnNydgWGBy
-DiInVQ12zW+dmqju9Sj9maKIU8NrR79CrHi6gKrODdbZ+lPdMecz6wcR+EP8Mlfc
-omgI32PmRLeMhu/ZVNG8BKTEFBeEYHqt4seOM92GGv7GNE5cP/1NwGyKW31ChY+H
-k2VXqPySc0n/skSM+zjP7HhOSBjnF8vlZxDPBjKvf7AscW8hURADiZRbkrg1AgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAEYgPuzE/AMUOKMAHTPD0maFAXU4rsaw/Ohf
-2akVqp4AZ+JmhgQT5349YPI6es6YdC34ngC9SNWn5jdY+0BnZMuZYPKH2rtT57PM
-3I5XXeGsNovdGihk2NzIuHI5n9OzC4VN2/AGye4ZJ9lyZ0QZiWRuHADbqCUuxlGs
-/1lc5eSrbjRKcK/j42B7wbwKIo7uz86yj775CmcZY0qxiz3WovzHQhWYqBhQzREZ
-gP1hO+vifEHHWagCFzO6hNzm9QyyDLaXkFG4csPDBN6W9xei3eYLo2TcFZzPFuka
-/gSBfVQITfZn0bHKu9W9/7OwBPFoR+jZ+KxLvtnLuZb0R+0aGWE=
-                    
-            </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">www.ifrj.ed.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">www.ifrj.ed.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/discourse.sci-gaia.eu-shibboleth.xml b/swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml
deleted file mode 100644
index f95705be..00000000
--- a/swamid-interfederations-2.0/discourse.sci-gaia.eu-shibboleth.xml
+++ /dev/null
@@ -1,109 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://discourse.sci-gaia.eu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-26T14:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-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://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://discourse.sci-gaia.eu/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://discourse.sci-gaia.eu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sci-GaIA project forum</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Forum per il progetto Europeo Sci-GaIA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Sci-GaIA forum is a discussion point for the African e-Infrastructures and their connection with European e-Infrastructures</mdui:Description>
-        <mdui:Description xml:lang="it">Il forum per il progetto Sci-GaIA è un punto di discussione sul web sulle problematiche relative alle e-Infrastructures in Africa e le loro connessioni con le Europa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://discourse.sci-gaia.eu/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://discourse.sci-gaia.eu/t/privacy-policy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEpDCCA4ygAwIBAgIQLy/V+/O095vqXxV+d9BmXTANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTA2MTcwMDAwMDBaFw0xODA2MTYyMzU5NTlaMEMxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVZGlzY291cnNlLnNj
-aS1nYWlhLmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAza017p/P
-edYeBTWrdFDsAEobr9PbQHFaPgaeGwLwQXaKCAlyQqvRFKX87993SWKpO68/EUY7
-WIiyqF67N/FhCqqylkYdE1pn+G+DfBa5kV2Mr8qJGEpzdRcdeUtfdkFQymOSCisH
-jE50tDFH1FlkHL1rSsRZktcVb7D3AXsdYLYZqED1V7Pz2ptcp13w8suy+5h1gzax
-mLi7CpZfogydCFMiUbutTPnXy42WwlLpFi2llaEQ/v9dBmWhjDLw6R59r0/+UqsL
-3pYfFmjfoxiMHxCaTzQzQdqCVyzKtG3uard+4gKmr308fCXBJy5F7LHGGIg37cnh
-Nkh9xVIWxh8G7wIDAQABo4IBcTCCAW0wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
-G+GGKLD9tr0wHQYDVR0OBBYEFLLct02pF4e5NhsvGr0PwN/Ww/QZMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
-LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
-cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
-b2NzcC51c2VydHJ1c3QuY29tMCAGA1UdEQQZMBeCFWRpc2NvdXJzZS5zY2ktZ2Fp
-YS5ldTANBgkqhkiG9w0BAQsFAAOCAQEAbiqAqaqmHiiQ48z1O916WDxIRbyMIEAn
-D6TluRQ/uNBnapFJ+lUsHFFAVGVRNIvQd8qyMStt37/61OEwCF4LghZ2p0swLlew
-qbtaz/1juLRnrojyEAm//fMyPuRB39d8tMjNw593x5xKmRGOHdrv6+kstgI8S0dr
-qSaDQ5Yw9tlIoHg5AqXAfwNMuOScBLz5ch9r13Ivttq7RmbGRwZni3av+LvodnaH
-3fjPFbvw+PeEZ1nlzG2+J+uFtvxtyz+Yq7IBujnxxjedzrBpfjWisx765zzAmmyt
-YLH8NjivAezGNmg7K/JD3HyW58nVxrac6rFRE5H8gqDrR03GwDsRdA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <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#rsa-oaep-mgf1p"/>
-      <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/2009/xmlenc11#rsa-oaep"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://discourse.sci-gaia.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://discourse.sci-gaia.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://discourse.sci-gaia.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://discourse.sci-gaia.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://discourse.sci-gaia.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://discourse.sci-gaia.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://discourse.sci-gaia.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://discourse.sci-gaia.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://discourse.sci-gaia.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://discourse.sci-gaia.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://discourse.sci-gaia.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Sci-GaIA project forum</md:ServiceName>
-      <md:ServiceName xml:lang="it">Forum per il progetto Europeo Sci-GaIA</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Sci-GaIA forum is a discussion point for the African e-Infrastructures and their connection with European e-Infrastructures</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Il forum per il progetto Sci-GaIA è un punto di discussione sul web sulle problematiche relative alle e-Infrastructures in Africa e le loro connessioni con le Europa</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="surname" 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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi Catania</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Sci-GaIA project forum erogato dall'Università degli Studi di Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sci-GaIA project provided by Catania University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unict.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unict.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:discourse-support@sci-gaia.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:discourse-support@sci-gaia.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml b/swamid-interfederations-2.0/dl.acm.org-oa-metadata.xml
deleted file mode 100644
index da7fa6e1..00000000
--- a/swamid-interfederations-2.0/dl.acm.org-oa-metadata.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://dl.acm.org/oa/metadata">
-  <!--
-		This is an OpenAthens 2 SP for Association for Computing Machinery, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDWDCCAkCgAwIBAgIJANUcbffHlTOXMA0GCSqGSIb3DQEBBQUAMCYxDzANBgNV
-						BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZzAeFw0xMTA1MjUxNTUzMDVa
-						Fw0yMTA1MjIxNTUzMDVaMCYxDzANBgNVBAoTBkFDTSBETDETMBEGA1UEAxMKZGwu
-						YWNtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALQ8v2TtExw3
-						8oEYHxxUGRz1IrTTL7S3oHxZjeBVo4ZayLZQH8bA1qiPIJOodP0i66TA1k3GzdFz
-						jtXudOb6AitHb8Mk3G4JWlOsb+ADPUjFOJ3ju04F10TQfYbLojfWlyoZKwLQ3ah+
-						ua0epuBbTj9dr/AgvCskfzqGthLCxc+MaQAX9bbiLrpaVLANVTg5NxXjJ3AQoWRD
-						GSfnLFfeaj6P5X8w4ZVW7+a89I5BYyD9p4Dv41Y7JUJQYMrYO5ue56anlAnYfJOU
-						2iHiHRE1M55Bw/y8D73KzRJjHxEsbyOSeupyJnwrYPQdHNfTyZI+FG4qe6kOc3u0
-						8HSIqNoNrUcCAwEAAaOBiDCBhTAdBgNVHQ4EFgQUPEvl50vhfaxj5glDDqOnOXXA
-						QTAwVgYDVR0jBE8wTYAUPEvl50vhfaxj5glDDqOnOXXAQTChKqQoMCYxDzANBgNV
-						BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZ4IJANUcbffHlTOXMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALDE3j+ryj/f1A0f2425vnckVzZd
-						fu5I6YyyY6p4jYbc9iF72M2JqoQpZAsuzIM2Ma0mJqTCHRpwgfbKsDcIAXJPaIxL
-						ssIElCPzTNvIKHRszZtf+bNoE9rVYa5l+PBkJGxtDy1kyzc65AU4uJTtmlgpgzmd
-						3UVCw4IF1iqhuU925ywULLDl+Ly7bFuif24A4ipqwPEzp9jOTfqkYSUPbCV8mJcE
-						6v6LJ5QxHWswmrQmKtsWxM/W+zqZHiUxfvJyP/iLtdFbnK8v60wK56zj5aTmP9Dy
-						KJoG3T5FEG114OLU9sciO8Tq0Ck/Yhax6jFuAabY2lKXa/Q/gxw+e/+/JlA=
-					</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>
-						MIIDWDCCAkCgAwIBAgIJANUcbffHlTOXMA0GCSqGSIb3DQEBBQUAMCYxDzANBgNV
-						BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZzAeFw0xMTA1MjUxNTUzMDVa
-						Fw0yMTA1MjIxNTUzMDVaMCYxDzANBgNVBAoTBkFDTSBETDETMBEGA1UEAxMKZGwu
-						YWNtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALQ8v2TtExw3
-						8oEYHxxUGRz1IrTTL7S3oHxZjeBVo4ZayLZQH8bA1qiPIJOodP0i66TA1k3GzdFz
-						jtXudOb6AitHb8Mk3G4JWlOsb+ADPUjFOJ3ju04F10TQfYbLojfWlyoZKwLQ3ah+
-						ua0epuBbTj9dr/AgvCskfzqGthLCxc+MaQAX9bbiLrpaVLANVTg5NxXjJ3AQoWRD
-						GSfnLFfeaj6P5X8w4ZVW7+a89I5BYyD9p4Dv41Y7JUJQYMrYO5ue56anlAnYfJOU
-						2iHiHRE1M55Bw/y8D73KzRJjHxEsbyOSeupyJnwrYPQdHNfTyZI+FG4qe6kOc3u0
-						8HSIqNoNrUcCAwEAAaOBiDCBhTAdBgNVHQ4EFgQUPEvl50vhfaxj5glDDqOnOXXA
-						QTAwVgYDVR0jBE8wTYAUPEvl50vhfaxj5glDDqOnOXXAQTChKqQoMCYxDzANBgNV
-						BAoTBkFDTSBETDETMBEGA1UEAxMKZGwuYWNtLm9yZ4IJANUcbffHlTOXMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALDE3j+ryj/f1A0f2425vnckVzZd
-						fu5I6YyyY6p4jYbc9iF72M2JqoQpZAsuzIM2Ma0mJqTCHRpwgfbKsDcIAXJPaIxL
-						ssIElCPzTNvIKHRszZtf+bNoE9rVYa5l+PBkJGxtDy1kyzc65AU4uJTtmlgpgzmd
-						3UVCw4IF1iqhuU925ywULLDl+Ly7bFuif24A4ipqwPEzp9jOTfqkYSUPbCV8mJcE
-						6v6LJ5QxHWswmrQmKtsWxM/W+zqZHiUxfvJyP/iLtdFbnK8v60wK56zj5aTmP9Dy
-						KJoG3T5FEG114OLU9sciO8Tq0Ck/Yhax6jFuAabY2lKXa/Q/gxw+e/+/JlA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dl.acm.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dl.acm.org/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dl.acm.org/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dl.acm.org/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Association for Computing Machinery, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Association For Computing Machinery: ACM Digital Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.acm.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Asad</GivenName>
-    <SurName>Ali</SurName>
-    <EmailAddress>mailto:ali@acm.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Greenberg</SurName>
-    <EmailAddress>mailto:greenberg@acm.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index 3a28b497..00000000
--- a/swamid-interfederations-2.0/dlib-adidp.ucs.ed.ac.uk-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://dlib-adidp.ucs.ed.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 'Music Studio' test SP owned by the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">The EDINA Development 'Music Studio' test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en"> This is a test SP. It is pretending to be a Music
-					studio and if it were a real one you would see lots of exciting verbiage here.</mdui:Description>
-        <mdui:Logo height="296" width="314">https://dlib-adidp.ucs.ed.ac.uk:442/studio/images/slogan-small.jpg</mdui:Logo>
-        <mdui:Logo height="58" width="110">https://dlib-adidp.ucs.ed.ac.uk:442/Images/edina-logo110x58.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://dlib-adidp.ucs.ed.ac.uk:442/images/edina-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <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://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAOp8SWyvKcU8MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWRsaWItYWRpZHAuZWRpbmEuYWMuZWQudWswHhcNMTAwMTA4MTUwMzIyWhcN
-						MjAwMTA2MTUwMzIyWjAkMSIwIAYDVQQDExlkbGliLWFkaWRwLmVkaW5hLmFjLmVk
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4MJyza/0LLunZfz
-						Qloxx+Lhuc17o+r6J3/lJQYKyDbDxA5I325cDTjO/uHWKZOMCvwJ2Ei+Vyo6amDU
-						MTGh3fkpnxuo49ZFtl3+m7/F8TqnxtLg9dC7MDgcbV0w7LOhMKAuW7YT/fHRgC1l
-						czXaiUCknsh2ZThg7nVxdyPpr06hzjW7GCnOeEyq9Ye7U7JiVIOF9v0PHtLDrEm9
-						0xR+cWM58mmk/DWublCdqlRDQMU9K6MJmNDwa54sIEl7uj8C991n18In/xPZVln3
-						+KpPbdiAOoZ4VquNg9UMgyoKmpjRsThNTzcw4z3clD5vQsFG4966kbf38AZ0/KMb
-						rgeN1wIDAQABo0cwRTAkBgNVHREEHTAbghlkbGliLWFkaWRwLmVkaW5hLmFjLmVk
-						LnVrMB0GA1UdDgQWBBRIF+Yh+lFwNDPMK7mU3bmoKmUsSjANBgkqhkiG9w0BAQUF
-						AAOCAQEAQPhbKEcjLNJkWri6phLQ3rf/gegyBfrObo6xdp051/r0ae38XHH8LnSo
-						3ittwFkFVFZ0OLJ4qj5V4UP0jxfRseAP+FYa3TxKHVFhSXKfEk01DWH1mBwus4K7
-						/jSVtxkdA4dmTeT9MDqyeshNOXxihOvWUrLaGew01DIFyIrtovTerU0wviLw+rcU
-						Ev39GsLAtk0xVUFmbP2jWJK6oY8TF99bMPDz/BIjmYFtQUiwBSxvgFgrrlhu2eoo
-						uQa45TasJ39hrEkVZcksB1AlaKnQBbE3AJFxFcnjal6K62WGCWhXRlK+Z6X+Hs9F
-						p1K0c9zlYflwJQRiinQLgUJ/UCNDJw==
-					</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>
-						MIIDEjCCAfqgAwIBAgIJAOp8SWyvKcU8MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWRsaWItYWRpZHAuZWRpbmEuYWMuZWQudWswHhcNMTAwMTA4MTUwMzIyWhcN
-						MjAwMTA2MTUwMzIyWjAkMSIwIAYDVQQDExlkbGliLWFkaWRwLmVkaW5hLmFjLmVk
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4MJyza/0LLunZfz
-						Qloxx+Lhuc17o+r6J3/lJQYKyDbDxA5I325cDTjO/uHWKZOMCvwJ2Ei+Vyo6amDU
-						MTGh3fkpnxuo49ZFtl3+m7/F8TqnxtLg9dC7MDgcbV0w7LOhMKAuW7YT/fHRgC1l
-						czXaiUCknsh2ZThg7nVxdyPpr06hzjW7GCnOeEyq9Ye7U7JiVIOF9v0PHtLDrEm9
-						0xR+cWM58mmk/DWublCdqlRDQMU9K6MJmNDwa54sIEl7uj8C991n18In/xPZVln3
-						+KpPbdiAOoZ4VquNg9UMgyoKmpjRsThNTzcw4z3clD5vQsFG4966kbf38AZ0/KMb
-						rgeN1wIDAQABo0cwRTAkBgNVHREEHTAbghlkbGliLWFkaWRwLmVkaW5hLmFjLmVk
-						LnVrMB0GA1UdDgQWBBRIF+Yh+lFwNDPMK7mU3bmoKmUsSjANBgkqhkiG9w0BAQUF
-						AAOCAQEAQPhbKEcjLNJkWri6phLQ3rf/gegyBfrObo6xdp051/r0ae38XHH8LnSo
-						3ittwFkFVFZ0OLJ4qj5V4UP0jxfRseAP+FYa3TxKHVFhSXKfEk01DWH1mBwus4K7
-						/jSVtxkdA4dmTeT9MDqyeshNOXxihOvWUrLaGew01DIFyIrtovTerU0wviLw+rcU
-						Ev39GsLAtk0xVUFmbP2jWJK6oY8TF99bMPDz/BIjmYFtQUiwBSxvgFgrrlhu2eoo
-						uQa45TasJ39hrEkVZcksB1AlaKnQBbE3AJFxFcnjal6K62WGCWhXRlK+Z6X+Hs9F
-						p1K0c9zlYflwJQRiinQLgUJ/UCNDJw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-adidp.ucs.ed.ac.uk:442/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA - Music Studio</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/about/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rod</GivenName>
-    <SurName>Widdowson</SurName>
-    <EmailAddress>mailto:idp-admin@steadingsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rod</GivenName>
-    <SurName>Widdowson</SurName>
-    <EmailAddress>mailto:idp-admin@steadingsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index f3a8ec44..00000000
--- a/swamid-interfederations-2.0/dlib-brewdog.ucs.ed.ac.uk-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" entityID="https://dlib-brewdog.ucs.ed.ac.uk/idp/shibboleth">
-  <!--
-		This is a "dlib-brewdog test IdP" Shibboleth IdP for the University of Edinburgh.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-31T14:00:45Z">
-      <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">brewdog.edina.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="28" width="28">https://dlib-brewdog.ucs.ed.ac.uk/idp/images/brewdog.28x28.png</mdui:Logo>
-        <mdui:Logo height="128" width="128">https://dlib-brewdog.ucs.ed.ac.uk/idp/images/brewdog.128x128.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">dlib-brewdog test IdP</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUZZAevsduZb+ksg12hWJz0it6obcwDQYJKoZIhvcNAQEF
-						BQAwJDEiMCAGA1UEAxMZZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51azAeFw0xNTEx
-						MjUxMzUyNTdaFw0zNTExMjUxMzUyNTdaMCQxIjAgBgNVBAMTGWRsaWItYnJld2Rv
-						Zy51Y3MuZWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT
-						lxvyZDrQk4NmB/8eCqgu+4rOJp6JW7bPXMkmmnibVbGDuGzyeD66GKuN/p4ev/nS
-						Xz9uUgX/5Z/30hNEANLIMFRW2Ds3zytISLnZ9plSOWJ456CEb1ne84H7B9N/VAHB
-						/eM+7zbNnzL4BhkYC64Zu2KzJvZzdsCe6mEUr6is6imn82YLyy3jzKWyuEsTxesN
-						3XZqdPfehjy39jcgkG8DQJGgwqCxP4hyLhMCjo6lgZ7GO08wdTMHEkjP9Wf/WXPw
-						TP/VN3DBZmgHQ9XgCa45WYxab93+HnL258UscDOwYBeOuXLWnlNT2wfWqFU0lUD3
-						+2WH/tE3wjkCejiAXeaPAgMBAAGjeTB3MFYGA1UdEQRPME2CGWRsaWItYnJld2Rv
-						Zy51Y3MuZWQuYWMudWuGMGh0dHBzOi8vZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUHlvSVqIZuSLPEnkuljdJiy7YlzEw
-						DQYJKoZIhvcNAQEFBQADggEBAGV7em8jposBaytzgw3CYyCSLmAOkqaVMrUFVyQ1
-						KPA84EAS+K7/7d4hg1VMO3KQVB6oTUfzoMmz1AagDU8qeZbaD3zN/dPS1aNnEfPg
-						jizWl9pQeeiIYiLyVOY2+T2FYX+Kzf4w2tlIpM+1C2znVVJQcPTIIIwc3gQFgV3F
-						5MLKXUMlpo3O4npIUXzR61O8EfjScnIaE/D3+rjbNStxfMebuyUi9G5THXZOOrbd
-						APu5rR/r9x/dJ3F3YTXGx2Mw3NfYYX7XP3UxvKKSCwCb5aQ/kEIJjE9hUIEIEdma
-						oobJ79OhVG+IPVW5qutgYavQ5qKeSCCa5Pe6/7Yww8L9Lks=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-brewdog.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://dlib-brewdog.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://dlib-brewdog.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-brewdog.ucs.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-brewdog.ucs.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-brewdog.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">brewdog.edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUZZAevsduZb+ksg12hWJz0it6obcwDQYJKoZIhvcNAQEF
-						BQAwJDEiMCAGA1UEAxMZZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51azAeFw0xNTEx
-						MjUxMzUyNTdaFw0zNTExMjUxMzUyNTdaMCQxIjAgBgNVBAMTGWRsaWItYnJld2Rv
-						Zy51Y3MuZWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT
-						lxvyZDrQk4NmB/8eCqgu+4rOJp6JW7bPXMkmmnibVbGDuGzyeD66GKuN/p4ev/nS
-						Xz9uUgX/5Z/30hNEANLIMFRW2Ds3zytISLnZ9plSOWJ456CEb1ne84H7B9N/VAHB
-						/eM+7zbNnzL4BhkYC64Zu2KzJvZzdsCe6mEUr6is6imn82YLyy3jzKWyuEsTxesN
-						3XZqdPfehjy39jcgkG8DQJGgwqCxP4hyLhMCjo6lgZ7GO08wdTMHEkjP9Wf/WXPw
-						TP/VN3DBZmgHQ9XgCa45WYxab93+HnL258UscDOwYBeOuXLWnlNT2wfWqFU0lUD3
-						+2WH/tE3wjkCejiAXeaPAgMBAAGjeTB3MFYGA1UdEQRPME2CGWRsaWItYnJld2Rv
-						Zy51Y3MuZWQuYWMudWuGMGh0dHBzOi8vZGxpYi1icmV3ZG9nLnVjcy5lZC5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUHlvSVqIZuSLPEnkuljdJiy7YlzEw
-						DQYJKoZIhvcNAQEFBQADggEBAGV7em8jposBaytzgw3CYyCSLmAOkqaVMrUFVyQ1
-						KPA84EAS+K7/7d4hg1VMO3KQVB6oTUfzoMmz1AagDU8qeZbaD3zN/dPS1aNnEfPg
-						jizWl9pQeeiIYiLyVOY2+T2FYX+Kzf4w2tlIpM+1C2znVVJQcPTIIIwc3gQFgV3F
-						5MLKXUMlpo3O4npIUXzR61O8EfjScnIaE/D3+rjbNStxfMebuyUi9G5THXZOOrbd
-						APu5rR/r9x/dJ3F3YTXGx2Mw3NfYYX7XP3UxvKKSCwCb5aQ/kEIJjE9hUIEIEdma
-						oobJ79OhVG+IPVW5qutgYavQ5qKeSCCa5Pe6/7Yww8L9Lks=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-brewdog.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-brewdog.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">dlib-brewdog test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alex</GivenName>
-    <SurName>Stuart</SurName>
-    <EmailAddress>mailto:alex.stuart@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alex</GivenName>
-    <SurName>Stuart</SurName>
-    <EmailAddress>mailto:alex.stuart@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-jiscidp.edina.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 63fca893..00000000
--- a/swamid-interfederations-2.0/dlib-jiscidp.edina.ac.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://dlib-jiscidp.edina.ac.uk/idp/shibboleth">
-  <!--
-		This is the  "JISC Executive - new" Shibboleth 2 IdP operated by the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">jisc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collections.jisc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jiscadvance.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">JISC Executive New</mdui:DisplayName>
-        <mdui:Description xml:lang="en">JISC IdP (maintained by EDINA)</mdui:Description>
-        <mdui:Logo height="39" width="52">https://dlib-jiscidp.edina.ac.uk/img/jisc.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://dlib-jiscidp.edina.ac.uk/img/jiscicon.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIUZooYXtDuohUPtXHr8p6BHj6IAsEwDQYJKoZIhvcNAQEF
-						BQAwIzEhMB8GA1UEAxMYZGxpYi1qaXNjaWRwLmVkaW5hLmFjLnVrMB4XDTEwMDIy
-						NjEwMDM1OVoXDTMwMDIyNjEwMDM1OVowIzEhMB8GA1UEAxMYZGxpYi1qaXNjaWRw
-						LmVkaW5hLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA479P
-						sZNAGnDd+wlw7o+isg+M++16qHhHNzFPKQBhdA+ojQ0nUjQZZT5SgAVt6WeVE4P3
-						uwG/fWt3cdQ0xYz4pLneqyzve9uuLd0q4J/oqSGKsb9rfIw+Uw7I6K40WySukfpJ
-						7IPREX6z+ymubn7FQOsK9zQ8y6P3Gl67bnnS4CIkot2BKdsX882OoEsDcZGnmXaN
-						12L70pN5vQN3PJzNvc8/sz6u9DgDL8OlXY2fn6ASJ2y2etuHCLkAUSsB14pntgyA
-						WOL0fr7SETJq5y2bCz8SLyoEXqBNe32be2S1prWB5Ioq3gxA9vF1e2WRq/j6AL0U
-						q0s8dAFizK4WjN6nVQIDAQABo3cwdTBUBgNVHREETTBLghhkbGliLWppc2NpZHAu
-						ZWRpbmEuYWMudWuGL2h0dHBzOi8vZGxpYi1qaXNjaWRwLmVkaW5hLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRFE/N5nUQ7MQ/bdOJ1S5cFrY39wTANBgkq
-						hkiG9w0BAQUFAAOCAQEAIzqOynQb9fyfwh4A+r94vl+OvVxg1FPtcZtTYx+6S3L1
-						lLZV6V3urshRREuwOwVvF7a6vEk/G8cw8UCLUIuvbSa/kSFZokRhfkSaoBeeO8s3
-						75RIq10OY7S/GFtLI9yMb9Okm7O/CxVi4+0HWWk/59FDkKbnSgdqJ7vDZTMcErWo
-						YQuoeO3mFnbXMgpryJF95isXdiKSJMor9MhrnPkRaJ1KY8iX1PpYNCuvJKM/TrRM
-						lES1uOmAEuYzRJ7ih5DMjY9bdIiPHr/P6ACfsfx5GmjO1NMeLgtIHWG0lKwg9KkP
-						/qwJiPguX3f69bdizxAelZA/3dsl2Tmp9LLuliVkeg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-jiscidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-jiscidp.edina.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://dlib-jiscidp.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-jiscidp.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-jiscidp.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-jiscidp.edina.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">jisc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">collections.jisc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jiscadvance.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIUZooYXtDuohUPtXHr8p6BHj6IAsEwDQYJKoZIhvcNAQEF
-						BQAwIzEhMB8GA1UEAxMYZGxpYi1qaXNjaWRwLmVkaW5hLmFjLnVrMB4XDTEwMDIy
-						NjEwMDM1OVoXDTMwMDIyNjEwMDM1OVowIzEhMB8GA1UEAxMYZGxpYi1qaXNjaWRw
-						LmVkaW5hLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA479P
-						sZNAGnDd+wlw7o+isg+M++16qHhHNzFPKQBhdA+ojQ0nUjQZZT5SgAVt6WeVE4P3
-						uwG/fWt3cdQ0xYz4pLneqyzve9uuLd0q4J/oqSGKsb9rfIw+Uw7I6K40WySukfpJ
-						7IPREX6z+ymubn7FQOsK9zQ8y6P3Gl67bnnS4CIkot2BKdsX882OoEsDcZGnmXaN
-						12L70pN5vQN3PJzNvc8/sz6u9DgDL8OlXY2fn6ASJ2y2etuHCLkAUSsB14pntgyA
-						WOL0fr7SETJq5y2bCz8SLyoEXqBNe32be2S1prWB5Ioq3gxA9vF1e2WRq/j6AL0U
-						q0s8dAFizK4WjN6nVQIDAQABo3cwdTBUBgNVHREETTBLghhkbGliLWppc2NpZHAu
-						ZWRpbmEuYWMudWuGL2h0dHBzOi8vZGxpYi1qaXNjaWRwLmVkaW5hLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRFE/N5nUQ7MQ/bdOJ1S5cFrY39wTANBgkq
-						hkiG9w0BAQUFAAOCAQEAIzqOynQb9fyfwh4A+r94vl+OvVxg1FPtcZtTYx+6S3L1
-						lLZV6V3urshRREuwOwVvF7a6vEk/G8cw8UCLUIuvbSa/kSFZokRhfkSaoBeeO8s3
-						75RIq10OY7S/GFtLI9yMb9Okm7O/CxVi4+0HWWk/59FDkKbnSgdqJ7vDZTMcErWo
-						YQuoeO3mFnbXMgpryJF95isXdiKSJMor9MhrnPkRaJ1KY8iX1PpYNCuvJKM/TrRM
-						lES1uOmAEuYzRJ7ih5DMjY9bdIiPHr/P6ACfsfx5GmjO1NMeLgtIHWG0lKwg9KkP
-						/qwJiPguX3f69bdizxAelZA/3dsl2Tmp9LLuliVkeg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-jiscidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-jiscidp.edina.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">JISC Executive New</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>EDINA Helpdesk</GivenName>
-    <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>EDINA Infrastructure</GivenName>
-    <EmailAddress>mailto:edina.infrastructure@ed.ac.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/dlib-jose.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-jose.edina.ac.uk-shibboleth.xml
deleted file mode 100644
index 8e882b64..00000000
--- a/swamid-interfederations-2.0/dlib-jose.edina.ac.uk-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://dlib-jose.edina.ac.uk/shibboleth">
-  <!--
-		This is a "dlib-jose UK federation Test" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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="2013-08-06T14:49:53Z">
-      <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://dlib-jose.edina.ac.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://dlib-jose.edina.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJALYAE6CsWAKPMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWRsaWItam9zZS5lZGluYS5hYy51azAeFw0xMzA2MjQxNDA5MDBaFw0yMzA2
-						MjIxNDA5MDBaMCAxHjAcBgNVBAMTFWRsaWItam9zZS5lZGluYS5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDMzbnN/ZQhuMO0p2GwUdvLKRmN
-						WRu4J6Yo5yG0lPU2rEdZwkqUyF1o2tDmvNMb3N/FEm4boh2dMnq70K7TihooxB9R
-						MBi2kDeY1y6Or9bzIGK7agEIjjOe+ZZu1jbisU5FOglWd38ek+xHdmVneoYt9hcP
-						ZBu3jsJXQIe3v6j7WoTSxCl0O/ZZpyWtStxZMsJn78czDfFiebS62PxtIBXOwddz
-						yDHn+9Jow05dlnn+pR/VBXScR5JML1Hs/Nwqf698LFU4G9RWe82KYINzfmqMTXYr
-						jZ/epj8Yh+wehFuF2cO5nzwFghl9esayZ8bHAirnu8OirUOF5yHiY4tbfD0CAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVZGxpYi1qb3NlLmVkaW5hLmFjLnVrMB0GA1UdDgQW
-						BBQVT27xYzls4PLIbWszwdXcFqoKDTANBgkqhkiG9w0BAQUFAAOCAQEAaJjZort4
-						F2qnOygolSXuwnFP10kVlYap+h8lgRNjRZnIP+vYQRLB5WcswQ/fmnoL0dI84QQf
-						1yhJ7ZQ8jM/aq2N/jt11LvxC4V+U/mu/pTk8WnnOKuJK0eKrEV84MHfTiNkNLz7Z
-						X6aF8fF73cLbuObYXA7///pfks7c4UHLm71EvHwzdzjUyZqxrYMKS8ipLGNQCqLn
-						Azq8TeL662wh5s/quVocAQoPPc3/wLZziVjyQm7uvs41X9rXaUcRDAcrpu+rMQ6A
-						SnmpP7/S2O5DR7fVHvZNzrU79Y9Y/fdhdJBdDMQkRxup7G+7lhdJTNDRI2ZLfZnM
-						af39Dy7gd0Nh+Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://dlib-jose.edina.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-jose.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">dlib-jose Test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ukfederation.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Monica</GivenName>
-    <SurName>Warnock</SurName>
-    <EmailAddress>mailto:monica.warnock@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Monica</GivenName>
-    <SurName>Warnock</SurName>
-    <EmailAddress>mailto:monica.warnock@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-lockssdev2.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-lockssdev2.ucs.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index 3c6cd31a..00000000
--- a/swamid-interfederations-2.0/dlib-lockssdev2.ucs.ed.ac.uk-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://dlib-lockssdev2.ucs.ed.ac.uk/shibboleth">
-  <!--
-		This is a "EDINA Demonstrator LOCKSS service" Shibboleth SP for University of Edinburgh.
-	-->
-  <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-06-03T14:44:26Z"/>
-  </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://dlib-lockssdev2.ucs.ed.ac.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://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGzCCAgOgAwIBAgIJAIQtmbCJW/PuMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-						BAMTHGRsaWItbG9ja3NzZGV2Mi51Y3MuZWQuYWMudWswHhcNMTMwNTA3MDkyMTUy
-						WhcNMjMwNTA1MDkyMTUyWjAnMSUwIwYDVQQDExxkbGliLWxvY2tzc2RldjIudWNz
-						LmVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA34JSXcKK
-						YdYQSYRfOoS6GfkSrQAVlHAXn4sFmHOt7ToOWqEZNcnNqE9rVUxh5XWXpZ5tFec3
-						qrNdyUlIvZth+DR68wwZZYUwCjkwfs2GKQln6SVnVUne6k8QX93pXVgTSkzqc+RN
-						bl1mt4JcT41rD2/GgAKj7xGMtQziBzrpkNXpNvoKozyJphXyGgKvZi+z1h+KufND
-						kc0ZUSoRFJ5Gk3GZldgIHRhTQdh3tYrd+VCFb8Xold7asRvMzpIKMDuAWZ9Sps8o
-						QzIRZoqUcwA7vqLGY/C5SRIkDeIs+0s0TYSJZXihnnvXt72rOhavZw2bHDz2bZYw
-						8X+FdDwlNytgPQIDAQABo0owSDAnBgNVHREEIDAeghxkbGliLWxvY2tzc2RldjIu
-						dWNzLmVkLmFjLnVrMB0GA1UdDgQWBBTVk7N8XLDIxSb9lfiOMNXJY1M1cDANBgkq
-						hkiG9w0BAQUFAAOCAQEAuDDx9SeeUT1fSoQ5pgQ1arfpOolwRsn+mp/QlmMDL3yn
-						YLzoTBNdn6nVkx62vgSReb0zpI6MIeRmz0efJd4ulaRzSZmL228TCdajqc13wSxG
-						TZrMn9IlrpAl+1KCZCVY6sqwKmeKWreXwBGno2R4scmEgTYlqJ8AgWMandVSV0I1
-						ps2I/PUbZ3kc3/2zIdOM2qMkpFReB0KUoEzy27eSRFbLf5rPiaWOroW+wti0PlDi
-						V9+uuPyJCrE9JCuwsXge4oRLDXrG4ZozxXgGw6T7Ztv2sO7/Q777HZ5Cx198b30D
-						PH5PkyAFdq5eTMTwRJI6WIXZ4pL3aDDMKjySSPfbaA==
-					</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://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-lockssdev2.ucs.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA Demonstrator LOCKSS service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>EDINA Helpdesk</GivenName>
-    <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Rusbridge</SurName>
-    <EmailAddress>mailto:a.rusbridge@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-monidp.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-monidp.edina.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 2cafed80..00000000
--- a/swamid-interfederations-2.0/dlib-monidp.edina.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://dlib-monidp.edina.ac.uk/idp/shibboleth">
-  <!--
-		This is a "dlib-monidp" Shibboleth IdP for University of Edinburgh.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-28T11:41:45Z">
-      <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">dlib-monidp.edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIVALtTlT25wpRy7nrWLCeXhU1F1FojMA0GCSqGSIb3DQEB
-						BQUAMCIxIDAeBgNVBAMMF2RsaWItbW9uaWRwLmVkaW5hLmFjLnVrMB4XDTE0MTAy
-						ODA4MzgzNFoXDTM0MTAyODA3MzgzNFowIjEgMB4GA1UEAwwXZGxpYi1tb25pZHAu
-						ZWRpbmEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgkMJs
-						gx6xM9/s+mE0BLxlFcJ7qS0nlhGYMxkLQYegSN4F8SqRQv8GwYE5T3tLJxamPkDU
-						tv3TaAKSnmU2yjTi9hv8MfYP1LM6T0gEZcNdmnIwkOFmkPeMGo/CaQACePoSELAU
-						do8T12Tq73odRgTMI78EqQKa7wW91MFkxiqEYujYrtFkm2cWs4ANkmk5uoHzr9Oq
-						cTurPXdjh+Tf15nKZZP3iJ+kigLDdBZTIoYfXkoBsew58fsvWf2nVWjtG1xmvQ5D
-						KuffejrcK26IlCG3CfwATbTwX3KfKNXYkTBJZPkqeNa96HgHLCtx52PFK8x3oH0T
-						RRa4IhilfRcOOxcjAgMBAAGjdTBzMB0GA1UdDgQWBBQ9BCnSd0nXjDSPzn1ghWZM
-						caiH1jBSBgNVHREESzBJghdkbGliLW1vbmlkcC5lZGluYS5hYy51a4YuaHR0cHM6
-						Ly9kbGliLW1vbmlkcC5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQUFAAOCAQEAKryMMyXr7iG/i72xyZsoTlfboMOYu481YSXJNWTkklObJQR5
-						dTKNgq4q3Rcdbf7EepKxn4n7nxOQ+z33b2XTSwO5r/94DCFQpoVcsibThOENpyxU
-						MguLDO6sfGWbpOvosux02phII9bCjusLY7P+lHRJzrkWxQH2Jg4Bo+t+yHrIYBG8
-						/99eMLUcncyrDFukEt8oIKGIkOPQ91LbEBMgmOh8Y2gVkXSSq3zbX4ZmSf4xS0gR
-						2zsJaKirvRyWbqCZMYXFNg7nliBvSb1XU7kJzZN72F1c29QPjpujdeTZGVoX+iz8
-						L/2W74aQA5rw9dMEeVPyAMg3aPln5C1Eh6cRqw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-monidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-monidp.edina.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-monidp.edina.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-monidp.edina.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-monidp.edina.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://dlib-monidp.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-monidp.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-monidp.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-monidp.edina.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">dlib-monidp.edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIVALtTlT25wpRy7nrWLCeXhU1F1FojMA0GCSqGSIb3DQEB
-						BQUAMCIxIDAeBgNVBAMMF2RsaWItbW9uaWRwLmVkaW5hLmFjLnVrMB4XDTE0MTAy
-						ODA4MzgzNFoXDTM0MTAyODA3MzgzNFowIjEgMB4GA1UEAwwXZGxpYi1tb25pZHAu
-						ZWRpbmEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgkMJs
-						gx6xM9/s+mE0BLxlFcJ7qS0nlhGYMxkLQYegSN4F8SqRQv8GwYE5T3tLJxamPkDU
-						tv3TaAKSnmU2yjTi9hv8MfYP1LM6T0gEZcNdmnIwkOFmkPeMGo/CaQACePoSELAU
-						do8T12Tq73odRgTMI78EqQKa7wW91MFkxiqEYujYrtFkm2cWs4ANkmk5uoHzr9Oq
-						cTurPXdjh+Tf15nKZZP3iJ+kigLDdBZTIoYfXkoBsew58fsvWf2nVWjtG1xmvQ5D
-						KuffejrcK26IlCG3CfwATbTwX3KfKNXYkTBJZPkqeNa96HgHLCtx52PFK8x3oH0T
-						RRa4IhilfRcOOxcjAgMBAAGjdTBzMB0GA1UdDgQWBBQ9BCnSd0nXjDSPzn1ghWZM
-						caiH1jBSBgNVHREESzBJghdkbGliLW1vbmlkcC5lZGluYS5hYy51a4YuaHR0cHM6
-						Ly9kbGliLW1vbmlkcC5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQUFAAOCAQEAKryMMyXr7iG/i72xyZsoTlfboMOYu481YSXJNWTkklObJQR5
-						dTKNgq4q3Rcdbf7EepKxn4n7nxOQ+z33b2XTSwO5r/94DCFQpoVcsibThOENpyxU
-						MguLDO6sfGWbpOvosux02phII9bCjusLY7P+lHRJzrkWxQH2Jg4Bo+t+yHrIYBG8
-						/99eMLUcncyrDFukEt8oIKGIkOPQ91LbEBMgmOh8Y2gVkXSSq3zbX4ZmSf4xS0gR
-						2zsJaKirvRyWbqCZMYXFNg7nliBvSb1XU7kJzZN72F1c29QPjpujdeTZGVoX+iz8
-						L/2W74aQA5rw9dMEeVPyAMg3aPln5C1Eh6cRqw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-monidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-monidp.edina.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">dlib-monidp Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ukfederation.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Monica</GivenName>
-    <SurName>Warnock</SurName>
-    <EmailAddress>mailto:monica.warnock@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Monica</GivenName>
-    <SurName>Warnock</SurName>
-    <EmailAddress>mailto:monica.warnock@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-qwghlm.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-qwghlm.ucs.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index 3c96dc7f..00000000
--- a/swamid-interfederations-2.0/dlib-qwghlm.ucs.ed.ac.uk-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://dlib-qwghlm.ucs.ed.ac.uk/shibboleth">
-  <!--
-		This is a Qwghlm UK federation test Shibboleth SP for the University of Edinburgh.
-	-->
-  <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-07-03T20:24:07Z"/>
-  </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://dlib-qwghlm.ucs.ed.ac.uk/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://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://dlib-qwghlm.ucs.ed.ac.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://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAPiWVB4ghVD+MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGRsaWItcXdnaGxtLnVjcy5lZC5hYy51azAeFw0xMTEyMDgxMzI2NTNaFw0y
-						MTEyMDUxMzI2NTNaMCMxITAfBgNVBAMTGGRsaWItcXdnaGxtLnVjcy5lZC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDDdsNDEYlcSwpD+3Qc
-						9YREfCpy+qm6bLrSRfzfDZS2Dbxq3Hy1opl9HXM+ka+GQsGcLeKp8tSm/PUnjCh2
-						/bQ2GZ0ICjQvDdQtRDjdwZ6mtEMrriCy3fX4/89iEbl7qf7m4YL5YZZ3sPjyfJ1n
-						2dTIioIipvbxGbXqDb4gj+VcI2eYGiaZI/odZW4cTvICYB/iyiynJOMUAU/M0SB8
-						Rhrl9qJrpSKuSNarozLskbhb099GFDtHsH6znHRCa0ZpEJ5frNqovcj2GDXybB9P
-						RVioL6x8jJoM6IPI4DcOzMjU5xGcXwWSXiltGYhQXuJTtDRicOX8iKKJNMCyZzNO
-						lJsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZGxpYi1xd2dobG0udWNzLmVkLmFjLnVr
-						MB0GA1UdDgQWBBTxK6XE5xyMz3j2z1AMA7uDBjGQ4DANBgkqhkiG9w0BAQUFAAOC
-						AQEAHDLiFzDtoaKo49V2yWeLRNFTdxqs97iCSezJ9YWCbgWyMU/3M0nG4apsGgSI
-						Q14yLjFNbgOws9JViEL6UMVL9TSpuqck2GQnwqWGsiF0oI7xRCVprkIBm3kNiWlb
-						EL9dRcGybE8Awwa5K0yOyRI8w062x11gtH9Au4hhjwHsNsU52qOnNezlcpH1JXwI
-						8QRfP8nk+TAYT+/w3oSeJ9pPGqRXO2IlfIz7Jtdoi2xhOtyCtY6DW9dTnf+FWSgi
-						0JcZ85FvVPG9GICRkoKNHSNjysWh6qMMhgNQlQzxSXvkNqqJLKknmmvsQ9AhN7Z8
-						tDpV2fo/EP8RfABm/v+Xb8gZ5Q==
-					</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://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-qwghlm.ucs.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA: SDSS test Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://dlib-qwghlm.ucs.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Glover</SurName>
-    <EmailAddress>mailto:steve.glover@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Glover</SurName>
-    <EmailAddress>mailto:steve.glover@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-schoolsidp.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-schoolsidp.edina.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index aaaa95f6..00000000
--- a/swamid-interfederations-2.0/dlib-schoolsidp.edina.ac.uk-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" entityID="https://dlib-schoolsidp.edina.ac.uk/idp/shibboleth">
-  <!--
-		This is an "EDINA services for schools" Shibboleth IdP for the the University of Edinburgh.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">schools.edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVzCCAj+gAwIBAgIUO/h0MjhhFFYR9sFrpG5zi9vVo64wDQYJKoZIhvcNAQEF
-						BQAwJjEkMCIGA1UEAxMbZGxpYi1zY2hvb2xzaWRwLmVkaW5hLmFjLnVrMB4XDTA5
-						MDgwNjEyMjAwOFoXDTI5MDgwNjEyMjAwOFowJjEkMCIGA1UEAxMbZGxpYi1zY2hv
-						b2xzaWRwLmVkaW5hLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAvqi4P3wG3B/dkzSoOMs0ssqK4xB7bMh3nF+JGo2KqGjxDYyRJtWY5FwRsAI6
-						Y9rXPs16cGQSRb9l+RZhzO9Lg9wiC9z29pKCINyBbb7Ii97n+YS/6NBq3TiKCznp
-						DJWbNIuvCLt1r6pDo833XZvnQhaQkIAOPLaC3bpNBeIbo1NJHN07RLz6fHxBAkK8
-						KpjmUv2Ak1G99GdMWmCmtbpoW0t1gWCJBxGp5ZppWuOqvUDDxjs3D3hvnxw9Xpb7
-						VaBMkZKjwsitadeBKHBUyy7OxfSe9bInSwk3iT0VxX2Sx6ohB0K9yejJo7Mbe1hp
-						lm2mrAyaunzmICuPrrupZfPsoQIDAQABo30wezBaBgNVHREEUzBRghtkbGliLXNj
-						aG9vbHNpZHAuZWRpbmEuYWMudWuGMmh0dHBzOi8vZGxpYi1zY2hvb2xzaWRwLmVk
-						aW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTtud1yQh+7MhTkM1bI
-						5x7oBcMJwTANBgkqhkiG9w0BAQUFAAOCAQEAp1x7CEh3Tbv+sS/Y0dxd74FvQYRk
-						e1r9+iAbXjs4vGGQHM+qpM3Ts7KoY3AXvUeCjTuLJ5/95EgFkX8isKBu2k+hWBzD
-						WiOeL9JhTjv7gULtUUaMf607R6r3h1EtwUMlSE5/6sGs+leVx7B23fcAMm0yxTzw
-						x06n46KjdnXotpL7tt+chfIeNPba166WSj8iG7kBljgXRYnvXhI3GUhGqITsfA9T
-						q1kGDVnHXsoaaZqHiNuZ0SYGo705GUzDmz5xrmINfGkNDwNpuvuVFfhPwmqUjXwe
-						hdMmtC9GkxRq1Rd/PEN3POsJHTeFZbO59d1n9Fp2MzloG5f5K2+GcRwKZA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-schoolsidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-schoolsidp.edina.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://dlib-schoolsidp.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-schoolsidp.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-schoolsidp.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-schoolsidp.edina.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">schools.edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVzCCAj+gAwIBAgIUO/h0MjhhFFYR9sFrpG5zi9vVo64wDQYJKoZIhvcNAQEF
-						BQAwJjEkMCIGA1UEAxMbZGxpYi1zY2hvb2xzaWRwLmVkaW5hLmFjLnVrMB4XDTA5
-						MDgwNjEyMjAwOFoXDTI5MDgwNjEyMjAwOFowJjEkMCIGA1UEAxMbZGxpYi1zY2hv
-						b2xzaWRwLmVkaW5hLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAvqi4P3wG3B/dkzSoOMs0ssqK4xB7bMh3nF+JGo2KqGjxDYyRJtWY5FwRsAI6
-						Y9rXPs16cGQSRb9l+RZhzO9Lg9wiC9z29pKCINyBbb7Ii97n+YS/6NBq3TiKCznp
-						DJWbNIuvCLt1r6pDo833XZvnQhaQkIAOPLaC3bpNBeIbo1NJHN07RLz6fHxBAkK8
-						KpjmUv2Ak1G99GdMWmCmtbpoW0t1gWCJBxGp5ZppWuOqvUDDxjs3D3hvnxw9Xpb7
-						VaBMkZKjwsitadeBKHBUyy7OxfSe9bInSwk3iT0VxX2Sx6ohB0K9yejJo7Mbe1hp
-						lm2mrAyaunzmICuPrrupZfPsoQIDAQABo30wezBaBgNVHREEUzBRghtkbGliLXNj
-						aG9vbHNpZHAuZWRpbmEuYWMudWuGMmh0dHBzOi8vZGxpYi1zY2hvb2xzaWRwLmVk
-						aW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTtud1yQh+7MhTkM1bI
-						5x7oBcMJwTANBgkqhkiG9w0BAQUFAAOCAQEAp1x7CEh3Tbv+sS/Y0dxd74FvQYRk
-						e1r9+iAbXjs4vGGQHM+qpM3Ts7KoY3AXvUeCjTuLJ5/95EgFkX8isKBu2k+hWBzD
-						WiOeL9JhTjv7gULtUUaMf607R6r3h1EtwUMlSE5/6sGs+leVx7B23fcAMm0yxTzw
-						x06n46KjdnXotpL7tt+chfIeNPba166WSj8iG7kBljgXRYnvXhI3GUhGqITsfA9T
-						q1kGDVnHXsoaaZqHiNuZ0SYGo705GUzDmz5xrmINfGkNDwNpuvuVFfhPwmqUjXwe
-						hdMmtC9GkxRq1Rd/PEN3POsJHTeFZbO59d1n9Fp2MzloG5f5K2+GcRwKZA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-schoolsidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-schoolsidp.edina.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">EDINA services for schools</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/index.shtml</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>EDINA Helpdesk</GivenName>
-    <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>EDINA Infrastructure</GivenName>
-    <EmailAddress>mailto:edina.infrastructure@ed.ac.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/dlib-shandon.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-shandon.ucs.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index bffc9193..00000000
--- a/swamid-interfederations-2.0/dlib-shandon.ucs.ed.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://dlib-shandon.ucs.ed.ac.uk/shibboleth">
-  <!--
-		This is a "EDINA Shandon" test Shibboleth SP for the University of Edinburgh.
-	-->
-  <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-02-08T16:02: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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EDINA test SP Shandon</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EDINA test SP Shandon</mdui:Description>
-        <mdui:Logo height="128" width="128">https://dlib-shandon.ucs.ed.ac.uk/alex.stuart.128x128.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://dlib-shandon.ucs.ed.ac.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://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEiDCCA3CgAwIBAgIJAPqKfjAaPVnJMA0GCSqGSIb3DQEBBQUAMIHEMQswCQYD
-						VQQGEwJHQjERMA8GA1UECAwIU2NvdGxhbmQxEjAQBgNVBAcMCUVkaW5idXJnaDEg
-						MB4GA1UECgwXVW5pdmVyc2l0eSBvZiBFZGluYnVyZ2gxIzAhBgNVBAsMGkVESU5B
-						IGFuZCBUaGUgRGF0YSBMaWJyYXJ5MSIwIAYDVQQDDBlkbGliLXNoYW5kb24udWNz
-						LmVkLmFjLnVrMSMwIQYJKoZIhvcNAQkBFhRhbGV4LnN0dWFydEBlZC5hYy51azAe
-						Fw0xNDA1MDcxNTU4MjJaFw0yNDA1MDQxNTU4MjJaMIHEMQswCQYDVQQGEwJHQjER
-						MA8GA1UECAwIU2NvdGxhbmQxEjAQBgNVBAcMCUVkaW5idXJnaDEgMB4GA1UECgwX
-						VW5pdmVyc2l0eSBvZiBFZGluYnVyZ2gxIzAhBgNVBAsMGkVESU5BIGFuZCBUaGUg
-						RGF0YSBMaWJyYXJ5MSIwIAYDVQQDDBlkbGliLXNoYW5kb24udWNzLmVkLmFjLnVr
-						MSMwIQYJKoZIhvcNAQkBFhRhbGV4LnN0dWFydEBlZC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAL0j7OIzaKbgJNrZe3ZLqU+uFjS7fz+JxRoM
-						TOeRH7NogfeG1PsaKQ4XS1yjcwYfdo+uXY26RGj9MCGzhzA4DLG1ATFjS+JTovkZ
-						VZKvqokVANinHj036TL/VblLNssHzwvylQB6/SS9R0TvLMShl/3QGIzy8OgHAFao
-						p7Bq34l40Y3Qyiz70bWhBGXvgdWdidfW5K7qm29MPiikZDrAhB96Ip1F4VPIiTDx
-						4WgITpb975DpWv73Doxu49DFXva79ap1any8fFITU8VzC2W2LStJF9bghIBOH2QX
-						QPY8nxd17eaUhcSZ0pVYsbp6nVeXCVDm0IPdiZbb+79V73XkN4sCAwEAAaN7MHkw
-						CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
-						dGlmaWNhdGUwHQYDVR0OBBYEFOC+S9U3B8a38AldV3o2P82UrA2UMB8GA1UdIwQY
-						MBaAFOC+S9U3B8a38AldV3o2P82UrA2UMA0GCSqGSIb3DQEBBQUAA4IBAQA+/SO8
-						WtEc1/L5m35DCHMXRko5cHlKvmi74Wl8pJuQvnUSiQ1wlwapAD2uQOfXtSOC/0Kp
-						MtuVbmDtF3YKlxJwRovhMS8D7P9EYkoFm8f2nALAoWkQ1Ol5MiYfunz+0eDaWwON
-						wlvP5m3o8h7UjFdcekE0A8aMBgc6eHbqwjJKRyk9kuoMVbi4zOW310AB+hyYDxuU
-						NM83E+8je9IYeR0ErHXsfcNeCABHeE35HgOOGAaQ0iMRnWfjNcLfHaPlhYHLx1PD
-						8HNLKwjHo3p8Ps2yLftHKlTlvs3Co3i4S06bIGwpTCqrsQrd9DX2TKU1yL2FerGf
-						aR2/8JsykowRxXZw
-					</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://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-shandon.ucs.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA test SP Shandon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://dlib-shandon.ucs.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alex</GivenName>
-    <SurName>Stuart</SurName>
-    <EmailAddress>mailto:alex.stuart@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alex</GivenName>
-    <SurName>Stuart</SurName>
-    <EmailAddress>mailto:alex.stuart@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 6d94dae4..00000000
--- a/swamid-interfederations-2.0/dlib-skaill.ucs.ed.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://dlib-skaill.ucs.ed.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Skaill Test IdP" for the University of Edinburgh.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-03-08T11:18:42Z">
-      <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">dlib-skaill.ucs.ed.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Skaill Test IdP</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIUSmTdfn763UNpnElLInB08fIfiOgwDQYJKoZIhvcNAQEF
-						BQAwIjEgMB4GA1UEAxMXZGxpYi1za2FpbGwuZWRpbmEuYWMudWswHhcNMTQwNjE4
-						MTIwMzIxWhcNMzQwNjE4MTIwMzIxWjAiMSAwHgYDVQQDExdkbGliLXNrYWlsbC5l
-						ZGluYS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJOx63EY
-						J4uh9FlNoNhB1KEi41z1uxuyWp3IOwX+EfUYXIshjnt1J4s0m36TFL7Ng6NfkHHs
-						vWZ2GVX4p0qbK9sPQ/m9jNvA4PI55un/hRBn/KYu3/35Mf4ioiKkFRP/iEl/+YM1
-						gURWxWd8bUyu0LbQRWbMRz9tU3dRruutxm47TNlZEfrEPaSAWb1otytGmw04vcjm
-						y5nWIzPhBrpL1Zu+JekBcwvD3vrIgeA2h3r+8EuG0WghcLcWJtwUlOb5jSXmA/b6
-						8l2F7Bbvy81x88NGBghZBhUnlLFwuUZ1zEDy5hqOVcGgoKlb216LzqRSPTxiiPQ9
-						1PGvxffMLGTYCAMCAwEAAaN1MHMwUgYDVR0RBEswSYIXZGxpYi1za2FpbGwuZWRp
-						bmEuYWMudWuGLmh0dHBzOi8vZGxpYi1za2FpbGwuZWRpbmEuYWMudWsvaWRwL3No
-						aWJib2xldGgwHQYDVR0OBBYEFOfvuXoBOS3z6kiFQNzznSPg5R1rMA0GCSqGSIb3
-						DQEBBQUAA4IBAQCQmnq2HC8MK+yGVLmKCr/wlDZKPwlUSvyNQXhgQYAtwUD9mb53
-						Wz+n7UXTYJQ/koVuJD+nDuQngkqAiEuW4NlMUQgtB5HQfIATQwkv7an029+4UL0m
-						sWryJGjvGbbfZZ6+kt00Rrz3BEaU6fRV63/vrY0PYItvb36tjn0xfrI74MFIdQoj
-						a3fa8kPIc1QYsCtNsV06GEpHpl0asgwNlCukFFyFUCuU/E/8Dadbwlw6o+ObNj3K
-						b6ettwdPpzsvba7W2w/oERE2IJLP1fwJ5I3KE2nOGnlUYaXQFon/w7vDDYfpqCzO
-						R313g/RR8Oq6ulpwKhbAPdoxFpyxxy3OS8K/
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-skaill.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://dlib-skaill.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://dlib-skaill.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-skaill.ucs.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-skaill.ucs.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-skaill.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">dlib-skaill.ucs.ed.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIUSmTdfn763UNpnElLInB08fIfiOgwDQYJKoZIhvcNAQEF
-						BQAwIjEgMB4GA1UEAxMXZGxpYi1za2FpbGwuZWRpbmEuYWMudWswHhcNMTQwNjE4
-						MTIwMzIxWhcNMzQwNjE4MTIwMzIxWjAiMSAwHgYDVQQDExdkbGliLXNrYWlsbC5l
-						ZGluYS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJOx63EY
-						J4uh9FlNoNhB1KEi41z1uxuyWp3IOwX+EfUYXIshjnt1J4s0m36TFL7Ng6NfkHHs
-						vWZ2GVX4p0qbK9sPQ/m9jNvA4PI55un/hRBn/KYu3/35Mf4ioiKkFRP/iEl/+YM1
-						gURWxWd8bUyu0LbQRWbMRz9tU3dRruutxm47TNlZEfrEPaSAWb1otytGmw04vcjm
-						y5nWIzPhBrpL1Zu+JekBcwvD3vrIgeA2h3r+8EuG0WghcLcWJtwUlOb5jSXmA/b6
-						8l2F7Bbvy81x88NGBghZBhUnlLFwuUZ1zEDy5hqOVcGgoKlb216LzqRSPTxiiPQ9
-						1PGvxffMLGTYCAMCAwEAAaN1MHMwUgYDVR0RBEswSYIXZGxpYi1za2FpbGwuZWRp
-						bmEuYWMudWuGLmh0dHBzOi8vZGxpYi1za2FpbGwuZWRpbmEuYWMudWsvaWRwL3No
-						aWJib2xldGgwHQYDVR0OBBYEFOfvuXoBOS3z6kiFQNzznSPg5R1rMA0GCSqGSIb3
-						DQEBBQUAA4IBAQCQmnq2HC8MK+yGVLmKCr/wlDZKPwlUSvyNQXhgQYAtwUD9mb53
-						Wz+n7UXTYJQ/koVuJD+nDuQngkqAiEuW4NlMUQgtB5HQfIATQwkv7an029+4UL0m
-						sWryJGjvGbbfZZ6+kt00Rrz3BEaU6fRV63/vrY0PYItvb36tjn0xfrI74MFIdQoj
-						a3fa8kPIc1QYsCtNsV06GEpHpl0asgwNlCukFFyFUCuU/E/8Dadbwlw6o+ObNj3K
-						b6ettwdPpzsvba7W2w/oERE2IJLP1fwJ5I3KE2nOGnlUYaXQFon/w7vDDYfpqCzO
-						R313g/RR8Oq6ulpwKhbAPdoxFpyxxy3OS8K/
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-skaill.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-skaill.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">Skaill Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index 5a92f0b4..00000000
--- a/swamid-interfederations-2.0/dlib-skaill.ucs.ed.ac.uk-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://dlib-skaill.ucs.ed.ac.uk/shibboleth">
-  <!--
-		This is an "SDSS Test SP (skaill)" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://dlib-skaill.ucs.ed.ac.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://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIJAO+Ojk6L2U0+MA0GCSqGSIb3DQEBBQUAMC8xLTArBgNV
-						BAMTJGRsaWItc2thaWxsLmRsaWItc2thaWxsLnVjcy5lZC5hYy51azAeFw0xMDA4
-						MTMxNjQ4MjZaFw0yMDA4MTAxNjQ4MjZaMC8xLTArBgNVBAMTJGRsaWItc2thaWxs
-						LmRsaWItc2thaWxsLnVjcy5lZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAOMZKa9TKhbnao7zUzJOu+0+cjO1HmQrsSVAZhnKQD2q7GSWGejS
-						3vGFxDxFM0PB2QW0hyOd4RUJdROOSRKdIZDuv+olP3Mk8u9Grv/sCs5Zbvk9/szf
-						vj8GlmtPQyTiyKv0cv6wHLhN97e3/8Ym7WnL9JBIk2Ewa9xwRwJDCztMAE37MYQj
-						D2op00+1yFUJXPS7d8TrG9qa4J/IC62oagSUQjUGyTgz0Ha3o2o19TysaSOZaInb
-						6WPW09E1fKS3b3DTKF05zeKusGdNKaw7Vu3+m5Yy0Z2d++ZD4OmltOiYinOtzGst
-						WlvtPt4+pJ+HPfs7onJrt93kJWJtysQAv3kCAwEAAaNSMFAwLwYDVR0RBCgwJoIk
-						ZGxpYi1za2FpbGwuZGxpYi1za2FpbGwudWNzLmVkLmFjLnVrMB0GA1UdDgQWBBRA
-						rA3D8Loi6/EquAcMTzOo2I070zANBgkqhkiG9w0BAQUFAAOCAQEA20QAK3hFCooX
-						rgMEsMqlNMek5P6t4I67RxHtXSUD5d7YvGNuWWJdoujSPrQcBvgg5xw+51kqKF3H
-						RqfjilqH0x95gidhbp0W9hxGc8y4sHnJv9RIoVTloaDPp58FOa0sQFMv+Y6Ww6MI
-						jwkUgdGZLby1uPays7JuG8Fknwkt9fGAqWtLLkuGZrFLeQb0/uCjC6fju76YuxpM
-						ZNkVBZ3rIai3bInXJybjkSJzm27lPMpQ+fAfwQmXrzHuhN9S3zI9/w0uDdXkvf8c
-						0xZnbN4TYWgCB7krj2wrGg6YV3x8f9fGRFbH0EqIU63jGYuFP7rrlxv37ol+Zrrg
-						mfQhxVldkQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-skaill.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: SDSS Test SP (skaill)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ukfederation.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dlib-tirnanog.ucs.ed.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dlib-tirnanog.ucs.ed.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b330a032..00000000
--- a/swamid-interfederations-2.0/dlib-tirnanog.ucs.ed.ac.uk-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://dlib-tirnanog.ucs.ed.ac.uk/idp/shibboleth">
-  <!--
-		This is a Tirnanog test Shibboleth IdP for the University of Edinburgh.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-03T10:53:42Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">dlib-tirnanog.ucs.ed.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUEwRtoz5We3lWVCaSgWi+vl+dHUgwDQYJKoZIhvcNAQEF
-						BQAwJTEjMCEGA1UEAwwaZGxpYi10aXJuYW5vZy51Y3MuZWQuYWMudWswHhcNMTYw
-						MjA1MTEyNDQyWhcNMzYwMjA1MTEyNDQyWjAlMSMwIQYDVQQDDBpkbGliLXRpcm5h
-						bm9nLnVjcy5lZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ANT/WcMILmfTZzolbzjVoXPW4S3G8FQFImvobnOCN7vXTKZc07r2y3E39axZ7uZ8
-						hlNzy+Imjs6EfrupBjK8X2arj0wW5PZrrjzJze7NL1nWH9BednuwClK9s4p9lF3I
-						B7RnWEaqBikAvul/RDoXU0sfrhguiGHNwp2+A7+Rg/nhMGuc8OL4nAxw7/N9A/hl
-						Z9aA8O38iyy0gFUR73SMTUXUebthyfT6RWywRyxrlO1U4gEHsQK0xHkqpuTuwjMt
-						0iicwRDasX72hPUlytekoF5PuNbW5V/hlyxAvteQ+X5Kj26jsG1m3hgDrz893P07
-						0KI3QlsnMz1dupNYlgMc0UsCAwEAAaN7MHkwHQYDVR0OBBYEFE6ZvUPf8neVhnSw
-						hov1G/uMPcJyMFgGA1UdEQRRME+CGmRsaWItdGlybmFub2cudWNzLmVkLmFjLnVr
-						hjFodHRwczovL2RsaWItdGlybmFub2cudWNzLmVkLmFjLnVrL2lkcC9zaGliYm9s
-						ZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQCPYn0tDyyopNzfXPV1s/twrpyjiW0Nt1IU
-						uG+c9Jksm4knD/MFbDR+s1BL4yZqrAagJFEG+wrdEDzGHYVCe2bhQB+DElO29qVI
-						0D1SvHcfeUT0EN4blqUOhrxDN1oTb8T7QUKxcHqkQYMnL1+ZW2ToPvKaTdpyeqDK
-						nAwgPJa9u3PRk7hPMHc25taUc4ArgdidbUXyHBpfM8PMsCm8Ebu96StZ2dY95+zT
-						E5ZcGzTGnxhQgyoT1P7+ggRHr8y1+dDz5IbLaQQ/bC2ibFyEyy06ympu8Cx08iMp
-						zf5skApOOgqvimQll5qRtx9IknLdw79d96BVWZAXlhKh0MPbwFyM
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-tirnanog.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://dlib-tirnanog.ucs.ed.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-tirnanog.ucs.ed.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-tirnanog.ucs.ed.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-tirnanog.ucs.ed.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://dlib-tirnanog.ucs.ed.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-tirnanog.ucs.ed.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-tirnanog.ucs.ed.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-tirnanog.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">dlib-tirnanog.ucs.ed.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUEwRtoz5We3lWVCaSgWi+vl+dHUgwDQYJKoZIhvcNAQEF
-						BQAwJTEjMCEGA1UEAwwaZGxpYi10aXJuYW5vZy51Y3MuZWQuYWMudWswHhcNMTYw
-						MjA1MTEyNDQyWhcNMzYwMjA1MTEyNDQyWjAlMSMwIQYDVQQDDBpkbGliLXRpcm5h
-						bm9nLnVjcy5lZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ANT/WcMILmfTZzolbzjVoXPW4S3G8FQFImvobnOCN7vXTKZc07r2y3E39axZ7uZ8
-						hlNzy+Imjs6EfrupBjK8X2arj0wW5PZrrjzJze7NL1nWH9BednuwClK9s4p9lF3I
-						B7RnWEaqBikAvul/RDoXU0sfrhguiGHNwp2+A7+Rg/nhMGuc8OL4nAxw7/N9A/hl
-						Z9aA8O38iyy0gFUR73SMTUXUebthyfT6RWywRyxrlO1U4gEHsQK0xHkqpuTuwjMt
-						0iicwRDasX72hPUlytekoF5PuNbW5V/hlyxAvteQ+X5Kj26jsG1m3hgDrz893P07
-						0KI3QlsnMz1dupNYlgMc0UsCAwEAAaN7MHkwHQYDVR0OBBYEFE6ZvUPf8neVhnSw
-						hov1G/uMPcJyMFgGA1UdEQRRME+CGmRsaWItdGlybmFub2cudWNzLmVkLmFjLnVr
-						hjFodHRwczovL2RsaWItdGlybmFub2cudWNzLmVkLmFjLnVrL2lkcC9zaGliYm9s
-						ZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQCPYn0tDyyopNzfXPV1s/twrpyjiW0Nt1IU
-						uG+c9Jksm4knD/MFbDR+s1BL4yZqrAagJFEG+wrdEDzGHYVCe2bhQB+DElO29qVI
-						0D1SvHcfeUT0EN4blqUOhrxDN1oTb8T7QUKxcHqkQYMnL1+ZW2ToPvKaTdpyeqDK
-						nAwgPJa9u3PRk7hPMHc25taUc4ArgdidbUXyHBpfM8PMsCm8Ebu96StZ2dY95+zT
-						E5ZcGzTGnxhQgyoT1P7+ggRHr8y1+dDz5IbLaQQ/bC2ibFyEyy06ympu8Cx08iMp
-						zf5skApOOgqvimQll5qRtx9IknLdw79d96BVWZAXlhKh0MPbwFyM
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-tirnanog.ucs.ed.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-tirnanog.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">Tirnanog Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ukfederation.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Glover</SurName>
-    <EmailAddress>mailto:steve.glover@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Glover</SurName>
-    <EmailAddress>mailto:steve.glover@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dluat-pub2web.theiet.org-shibboleth.xml b/swamid-interfederations-2.0/dluat-pub2web.theiet.org-shibboleth.xml
deleted file mode 100644
index 822fa15f..00000000
--- a/swamid-interfederations-2.0/dluat-pub2web.theiet.org-shibboleth.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://dluat-pub2web.theiet.org/shibboleth">
-  <!--
-		This is an "IET DIGITAL LIBRARY" OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-18T12:51:28Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDnDCCAoSgAwIBAgIEUO2c9zANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDEwOTE2
-						MzgxNVoXDTIzMDEwNzE2MzgxNVowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAL3ivjdsXAoP6HVxKmZg3aDgjOaw0vc3VHcTQbdCxuzd/1ydLHKkcy8f
-						EdBBRK8AlY1sbEue7yvnwVUiZP/THzHKj8jtJB/D2YECLB12zR7UV/v25CiIFjVW
-						vdHtnZ4pZDepKtHmRCPJWyfEsrX2l0qnoOtpKYVi+dP/Ie6gYOkVlaCUfdZx5mEY
-						lk3HJ8TVeS0VmEXlJXj8zXLFoVpmbjn9jru/qjj/HB+VZpVSbpVzI4BNlbWEoN/0
-						VOl7/d1C7+IWM59UZeIJpXSyO+Gh+3ydv4dJtpZing1hgCBss+5L8luA5wQQDSse
-						WN/zhK2Jn3DyhBx3H04IEkQkDYGQ5ZMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						F7amvU4Vs5KyKnubimDf/s7qAPlSN4Tz66tBN/WpWCLNuOQxtkTbC6pEXYkWfaQp
-						R1CiCFhzCW6h+Di7EQenU+ooO5DCXFYfwg/t8ygLeNhvTUor/ecGXTkeBT5zqYiM
-						PY/6QYCzwOh2IvItT+nTa9Rk8VL78VKg5cNjzCmibHWjoG6oFPxI77hkPRgc1u3w
-						lNEk/UBVoLnyYrnvgaibNFwXv6gXqRylWZykRsixdxAF029Lmj12LepRSie/cB4e
-						Ej/KMG3WOjuyeqeV1iBDU8NPzYL3buJDSrPR8DZaQt56CvXRZ0y8Nb7w+hsOIrwk
-						awOxBJ/9dlBVZxdn0CMTXQ==
-					</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>
-						MIIDnDCCAoSgAwIBAgIEUO2c9zANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDEwOTE2
-						MzgxNVoXDTIzMDEwNzE2MzgxNVowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAL3ivjdsXAoP6HVxKmZg3aDgjOaw0vc3VHcTQbdCxuzd/1ydLHKkcy8f
-						EdBBRK8AlY1sbEue7yvnwVUiZP/THzHKj8jtJB/D2YECLB12zR7UV/v25CiIFjVW
-						vdHtnZ4pZDepKtHmRCPJWyfEsrX2l0qnoOtpKYVi+dP/Ie6gYOkVlaCUfdZx5mEY
-						lk3HJ8TVeS0VmEXlJXj8zXLFoVpmbjn9jru/qjj/HB+VZpVSbpVzI4BNlbWEoN/0
-						VOl7/d1C7+IWM59UZeIJpXSyO+Gh+3ydv4dJtpZing1hgCBss+5L8luA5wQQDSse
-						WN/zhK2Jn3DyhBx3H04IEkQkDYGQ5ZMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						F7amvU4Vs5KyKnubimDf/s7qAPlSN4Tz66tBN/WpWCLNuOQxtkTbC6pEXYkWfaQp
-						R1CiCFhzCW6h+Di7EQenU+ooO5DCXFYfwg/t8ygLeNhvTUor/ecGXTkeBT5zqYiM
-						PY/6QYCzwOh2IvItT+nTa9Rk8VL78VKg5cNjzCmibHWjoG6oFPxI77hkPRgc1u3w
-						lNEk/UBVoLnyYrnvgaibNFwXv6gXqRylWZykRsixdxAF029Lmj12LepRSie/cB4e
-						Ej/KMG3WOjuyeqeV1iBDU8NPzYL3buJDSrPR8DZaQt56CvXRZ0y8Nb7w+hsOIrwk
-						awOxBJ/9dlBVZxdn0CMTXQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dluat-pub2web.theiet.org/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dluat-pub2web.theiet.org/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IET DIGITAL LIBRARY</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://dluat-pub2web.theiet.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:ietdl@theiet.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hatim</GivenName>
-    <SurName>Ghadiyali</SurName>
-    <EmailAddress>mailto:openathens@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dmp-dev.cdlib.org.xml b/swamid-interfederations-2.0/dmp-dev.cdlib.org.xml
deleted file mode 100644
index 0a490c1a..00000000
--- a/swamid-interfederations-2.0/dmp-dev.cdlib.org.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dmp-dev.cdlib.org">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://dmp-dev.cdlib.org/Shibboleth.sso/Login" 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://dmp2-dev.cdlib.org/Shibboleth.sso/Login" 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://dmp2-development.cdlib.org/Shibboleth.sso/Login" 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://dev.dmptool.org/Shibboleth.sso/Login" 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://uc3-dmp2-dev.cdlib.org/Shibboleth.sso/Login" index="5"/>
-      <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://dmp-aws-dev.cdlib.org/Shibboleth.sso/Login" index="6"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">DMP Tool Development Instance</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Create, share, review, and publish Data Management Plans conforming to Institution and Funder requirements</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://dmptool.org/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://dmptool.org/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="90" width="643" xml:lang="en">https://dmp.cdlib.org/img/dmptool_logo.svg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAP8nYUVoOwwuMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDWRtcC5jZGxpYi5vcmcwHhcNMTEwODI2MTU0NDM2WhcNMjEwODIzMTU0NDM2
-WjAYMRYwFAYDVQQDEw1kbXAuY2RsaWIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAv+SS70RQmx9eI6GAAPKhb7G79Oz6VM9zoCc2RMihR0PsXH+4
-H8jr0OrrTYXw6Bvoy4q+nYoE/O94L427ayngaxsZGG99LOkqOnNJqx8YyhcHU+2V
-zE1H1puwHGtHjC8HaG5RAE2u+GBdfRFo7YwDiWZcovnxw1ADXpAebIIM6R6jFaam
-dRVAJld1USuxwe+v4BxhaQ983VNlDWD7tB/ppBYFIxaxc5eRYQ5Xhdc/tFbO7/R+
-7mNv1zEyx4j1d397abzLiWyUAfLYT9AnYY+G6JiXxiQ1Keq3Twkg3XGp6zI70RZR
-+CERZwZdV7T87DlVTRH+SLhlyL98NM8ftn+fqQIDAQABo3kwdzAdBgNVHQ4EFgQU
-NLEE8UmJURVhhxGQ9wjQTaLqwDUwSAYDVR0jBEEwP4AUNLEE8UmJURVhhxGQ9wjQ
-TaLqwDWhHKQaMBgxFjAUBgNVBAMTDWRtcC5jZGxpYi5vcmeCCQD/J2FFaDsMLjAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBVMgL73mP25ZYAyPUZlI/Z
-cO90zkhwQcoTYtIpdS2KE+XvLpC9yYFk7Xz+IaCbU7KYey/ZpW7MUTvddoSzRPDS
-ulbxSugdfV7QVrt9bzaHSe8w20yMaVtRWAN8E9mFJNwJ8VSptxacc0ZdScHfmc76
-HejyMr9it7EuvpsxFQqDbgHqeXhqwdXrLiwTjn75bhx9+uT251W1wYG4gQ3R6Zly
-GSxO/I6if4vmR2y2vdDtugBNlmkIMwcE1pHTWxN0gHIQnItco+nQVrTzYmIgHMwv
-IdAUy0C4K5PdSbV8IUX1OZkeZyiQCdMs74p3IvKE57weopAz5Kxhiq9FlMh/LTx3
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmp-dev.cdlib.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmp-dev.cdlib.org/Shibboleth.sso/SAML/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dmp-dev.cdlib.org/Shibboleth.sso/SAML/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmp2-dev.cdlib.org/Shibboleth.sso/SAML2/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmp2-dev.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmp2-dev.cdlib.org/Shibboleth.sso/SAML/POST" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dmp2-dev.cdlib.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dmp2-dev.cdlib.org/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmp2-development.cdlib.org/Shibboleth.sso/SAML2/POST" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmp2-development.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmp2-development.cdlib.org/Shibboleth.sso/SAML/POST" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dmp2-development.cdlib.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dmp2-development.cdlib.org/Shibboleth.sso/SAML2/ECP" index="13"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.dmptool.org/Shibboleth.sso/SAML2/POST" index="14"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.dmptool.org/Shibboleth.sso/SAML2/Artifact" index="15"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.dmptool.org/Shibboleth.sso/SAML/POST" index="16"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.dmptool.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.dmptool.org/Shibboleth.sso/SAML2/ECP" index="18"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uc3-dmp2-dev.cdlib.org/Shibboleth.sso/SAML2/POST" index="19"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uc3-dmp2-dev.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="20"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uc3-dmp2-dev.cdlib.org/Shibboleth.sso/SAML/POST" index="21"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmp-aws-dev.cdlib.org/Shibboleth.sso/SAML2/POST" index="22"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmp-aws-dev.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="23"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmp-aws-dev.cdlib.org/Shibboleth.sso/SAML/POST" index="24"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">DMP Tool Development Instance</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Create, share, review, and publish Data Management Plans conforming to Institution and Funder requirements</md:ServiceDescription>
-      <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="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="mail" 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">University of California - Office of the President</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California - Office of the President</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucop.edu/welcome.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Perry Willett</md:GivenName>
-    <md:EmailAddress>perry.willett@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ken Weiss</md:GivenName>
-    <md:EmailAddress>ken.weiss@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marisa Strong</md:GivenName>
-    <md:EmailAddress>marisa.strong@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dmp-stage.cdlib.org.xml b/swamid-interfederations-2.0/dmp-stage.cdlib.org.xml
deleted file mode 100644
index 237aee6c..00000000
--- a/swamid-interfederations-2.0/dmp-stage.cdlib.org.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dmp-stage.cdlib.org">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://dmp-stage.cdlib.org/Shibboleth.sso/Login" 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://dmp2-stg.cdlib.org/Shibboleth.sso/Login" 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://dmp2-staging.cdlib.org/Shibboleth.sso/Login" 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://stg.dmptool.org/Shibboleth.sso/Login" 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://uc3-dmp2-stg.cdlib.org/Shibboleth.sso/Login" index="5"/>
-      <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://dmp-aws-stg.cdlib.org/Shibboleth.sso/Login" index="6"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">DMP Tool Stage Instance</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Create, share, review, and publish Data Management Plans conforming to Institution and Funder requirements</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://dmptool.org/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://dmptool.org/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="90" width="643" xml:lang="en">https://dmp.cdlib.org/img/dmptool_logo.svg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAP8nYUVoOwwuMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDWRtcC5jZGxpYi5vcmcwHhcNMTEwODI2MTU0NDM2WhcNMjEwODIzMTU0NDM2
-WjAYMRYwFAYDVQQDEw1kbXAuY2RsaWIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAv+SS70RQmx9eI6GAAPKhb7G79Oz6VM9zoCc2RMihR0PsXH+4
-H8jr0OrrTYXw6Bvoy4q+nYoE/O94L427ayngaxsZGG99LOkqOnNJqx8YyhcHU+2V
-zE1H1puwHGtHjC8HaG5RAE2u+GBdfRFo7YwDiWZcovnxw1ADXpAebIIM6R6jFaam
-dRVAJld1USuxwe+v4BxhaQ983VNlDWD7tB/ppBYFIxaxc5eRYQ5Xhdc/tFbO7/R+
-7mNv1zEyx4j1d397abzLiWyUAfLYT9AnYY+G6JiXxiQ1Keq3Twkg3XGp6zI70RZR
-+CERZwZdV7T87DlVTRH+SLhlyL98NM8ftn+fqQIDAQABo3kwdzAdBgNVHQ4EFgQU
-NLEE8UmJURVhhxGQ9wjQTaLqwDUwSAYDVR0jBEEwP4AUNLEE8UmJURVhhxGQ9wjQ
-TaLqwDWhHKQaMBgxFjAUBgNVBAMTDWRtcC5jZGxpYi5vcmeCCQD/J2FFaDsMLjAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBVMgL73mP25ZYAyPUZlI/Z
-cO90zkhwQcoTYtIpdS2KE+XvLpC9yYFk7Xz+IaCbU7KYey/ZpW7MUTvddoSzRPDS
-ulbxSugdfV7QVrt9bzaHSe8w20yMaVtRWAN8E9mFJNwJ8VSptxacc0ZdScHfmc76
-HejyMr9it7EuvpsxFQqDbgHqeXhqwdXrLiwTjn75bhx9+uT251W1wYG4gQ3R6Zly
-GSxO/I6if4vmR2y2vdDtugBNlmkIMwcE1pHTWxN0gHIQnItco+nQVrTzYmIgHMwv
-IdAUy0C4K5PdSbV8IUX1OZkeZyiQCdMs74p3IvKE57weopAz5Kxhiq9FlMh/LTx3
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmp-stage.cdlib.org/Shibboleth.sso/SAML/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmp-stage.cdlib.org/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dmp-stage.cdlib.org/Shibboleth.sso/SAML/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmp2-stg.cdlib.org/Shibboleth.sso/SAML2/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmp2-stg.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmp2-stg.cdlib.org/Shibboleth.sso/SAML/POST" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dmp2-stg.cdlib.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dmp2-stg.cdlib.org/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmp2-staging.cdlib.org/Shibboleth.sso/SAML2/POST" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmp2-staging.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dmp2-staging.cdlib.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dmp2-staging.cdlib.org/Shibboleth.sso/SAML2/ECP" index="12"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmp2-staging.cdlib.org/Shibboleth.sso/SAML/POST" index="13"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stg.dmptool.org/Shibboleth.sso/SAML2/POST" index="14"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stg.dmptool.org/Shibboleth.sso/SAML2/Artifact" index="15"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stg.dmptool.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stg.dmptool.org/Shibboleth.sso/SAML2/ECP" index="17"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stg.dmptool.org/Shibboleth.sso/SAML/POST" index="18"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uc3-dmp2-stg.cdlib.org/Shibboleth.sso/SAML2/POST" index="19"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uc3-dmp2-stg.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="20"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uc3-dmp2-stg.cdlib.org/Shibboleth.sso/SAML/POST" index="21"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmp-aws-stg.cdlib.org/Shibboleth.sso/SAML2/POST" index="22"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmp-aws-stg.cdlib.org/Shibboleth.sso/SAML2/Artifact" index="23"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmp-aws-stg.cdlib.org/Shibboleth.sso/SAML/POST" index="24"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">DMP Tool Stage Instance</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Create, share, review, and publish Data Management Plans conforming to Institution and Funder requirements</md:ServiceDescription>
-      <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="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="mail" 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">University of California - Office of the President</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California - Office of the President</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucop.edu/welcome.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ken Weiss</md:GivenName>
-    <md:EmailAddress>ken.weiss@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marisa Strong</md:GivenName>
-    <md:EmailAddress>marisa.strong@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Perry Willett</md:GivenName>
-    <md:EmailAddress>perry.willett@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dmp.cdlib.org.xml b/swamid-interfederations-2.0/dmp.cdlib.org.xml
deleted file mode 100644
index ecde4e17..00000000
--- a/swamid-interfederations-2.0/dmp.cdlib.org.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dmp.cdlib.org">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://dmp.cdlib.org/Shibboleth.sso/Login" 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://dmptool.org/Shibboleth.sso/Login" 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://www.dmptool.org/Shibboleth.sso/Login" 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://v1.dmptool.org/Shibboleth.sso/Login" 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://v2.dmptool.org/Shibboleth.sso/Login" index="5"/>
-      <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://dmp2.cdlib.org/Shibboleth.sso/Login" index="6"/>
-      <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://uc3-dmp2-prd.cdlib.org/Shibboleth.sso/Login" index="7"/>
-      <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://dmp-aws-prd.cdlib.org/Shibboleth.sso/Login" index="8"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">DMP Tool</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Create, share, review, and publish Data Management Plans conforming to Institution and Funder requirements</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://dmptool.org/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://dmptool.org/privacy/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="53" width="153" xml:lang="en">https://dmp.cdlib.org/img/dmptool_logo.svg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAP8nYUVoOwwuMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDWRtcC5jZGxpYi5vcmcwHhcNMTEwODI2MTU0NDM2WhcNMjEwODIzMTU0NDM2
-WjAYMRYwFAYDVQQDEw1kbXAuY2RsaWIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAv+SS70RQmx9eI6GAAPKhb7G79Oz6VM9zoCc2RMihR0PsXH+4
-H8jr0OrrTYXw6Bvoy4q+nYoE/O94L427ayngaxsZGG99LOkqOnNJqx8YyhcHU+2V
-zE1H1puwHGtHjC8HaG5RAE2u+GBdfRFo7YwDiWZcovnxw1ADXpAebIIM6R6jFaam
-dRVAJld1USuxwe+v4BxhaQ983VNlDWD7tB/ppBYFIxaxc5eRYQ5Xhdc/tFbO7/R+
-7mNv1zEyx4j1d397abzLiWyUAfLYT9AnYY+G6JiXxiQ1Keq3Twkg3XGp6zI70RZR
-+CERZwZdV7T87DlVTRH+SLhlyL98NM8ftn+fqQIDAQABo3kwdzAdBgNVHQ4EFgQU
-NLEE8UmJURVhhxGQ9wjQTaLqwDUwSAYDVR0jBEEwP4AUNLEE8UmJURVhhxGQ9wjQ
-TaLqwDWhHKQaMBgxFjAUBgNVBAMTDWRtcC5jZGxpYi5vcmeCCQD/J2FFaDsMLjAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBVMgL73mP25ZYAyPUZlI/Z
-cO90zkhwQcoTYtIpdS2KE+XvLpC9yYFk7Xz+IaCbU7KYey/ZpW7MUTvddoSzRPDS
-ulbxSugdfV7QVrt9bzaHSe8w20yMaVtRWAN8E9mFJNwJ8VSptxacc0ZdScHfmc76
-HejyMr9it7EuvpsxFQqDbgHqeXhqwdXrLiwTjn75bhx9+uT251W1wYG4gQ3R6Zly
-GSxO/I6if4vmR2y2vdDtugBNlmkIMwcE1pHTWxN0gHIQnItco+nQVrTzYmIgHMwv
-IdAUy0C4K5PdSbV8IUX1OZkeZyiQCdMs74p3IvKE57weopAz5Kxhiq9FlMh/LTx3
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmp.cdlib.org/Shibboleth.sso/SAML/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmp.cdlib.org/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dmp.cdlib.org/Shibboleth.sso/SAML/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmptool.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmptool.org/Shibboleth.sso/SAML2/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dmptool.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dmptool.org/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dmptool.org/Shibboleth.sso/SAML2/POST" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dmptool.org/Shibboleth.sso/SAML/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://v1.dmptool.org/Shibboleth.sso/SAML/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v1.dmptool.org/Shibboleth.sso/SAML2/POST" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v1.dmptool.org/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://v2.dmptool.org/Shibboleth.sso/SAML/POST" index="13"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v2.dmptool.org/Shibboleth.sso/SAML2/POST" index="14"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://v2.dmptool.org/Shibboleth.sso/SAML/Artifact" index="15"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmp2.cdlib.org/Shibboleth.sso/SAML/POST" index="16"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmp2.cdlib.org/Shibboleth.sso/SAML2/POST" index="17"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dmp2.cdlib.org/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uc3-dmp2-prd.cdlib.org/Shibboleth.sso/SAML2/POST" index="19"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uc3-dmp2-prd.cdlib.org/Shibboleth.sso/SAML/POST" index="20"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmp-aws-prd.cdlib.org/Shibboleth.sso/SAML2/POST" index="21"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmp-aws-prd.cdlib.org/Shibboleth.sso/SAML/POST" index="22"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">DMP Tool</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Create, share, review, and publish Data Management Plans conforming to Institution and Funder requirements</md:ServiceDescription>
-      <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="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="mail" 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">University of California - Office of the President</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California - Office of the President</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucop.edu/welcome.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>UC Curation Center</md:GivenName>
-    <md:EmailAddress>uc3@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UC Curation Center</md:GivenName>
-    <md:EmailAddress>uc3@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ken Weiss</md:GivenName>
-    <md:EmailAddress>ken.weiss@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dmponline-test.dcc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dmponline-test.dcc.ac.uk-shibboleth.xml
deleted file mode 100644
index a9b848d5..00000000
--- a/swamid-interfederations-2.0/dmponline-test.dcc.ac.uk-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://dmponline-test.dcc.ac.uk/shibboleth">
-  <!--
-		This is a "Digital Curation Centre Test DMP Online service" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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-08-16T10:40:48Z"/>
-  </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://dmponline-test.dcc.ac.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://dmponline-test.dcc.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Test DMP Online</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is a test service for the Digital Curation Centre's data management planning tool, DMP Online.</mdui:Description>
-        <mdui:Logo height="310" width="92">https://dmponline-test.dcc.ac.uk/shib_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAL3x+zI6nXF/MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGRtcG9ubGluZS10ZXN0LmRjYy5hYy51azAeFw0xMjA4MTMxMzAwMDZaFw0y
-						MjA4MTExMzAwMDZaMCMxITAfBgNVBAMTGGRtcG9ubGluZS10ZXN0LmRjYy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM5qkbtQGUwmojZSgJTc
-						1AyehL03gJsqWg7Bn/mIXFu+d6Qnyp5zulFgos5QWdGbH93GubsZhLTvKgUt7kmh
-						jYtn8B9e6MOYxeZFUk+MFmVDq4PXL7/YQ2XjBdDPYbImZL7i0zwBrxk0ZOksWYIw
-						OPZX6AQgkUwI6sN1p+o/7yEfefXcHcyNtNpuYjezeBdqbGdHBtja5cZNZYPBC6uc
-						4g3m60pd5W5PNSfA0E5ahH00wCLTt6+w5Qwfe6dZuWzcUATlBczcXv9ACleFcdrQ
-						T95/KzZrsvUeh9zrMZ8qHI7Dp3I32OwRpX+s/b6uM5wJqt0jBxi3Vc767OnDUWpG
-						hs8CAwEAAaNGMEQwIwYDVR0RBBwwGoIYZG1wb25saW5lLXRlc3QuZGNjLmFjLnVr
-						MB0GA1UdDgQWBBQighrVWJp/O+WQH1y4c/ESIrAjKDANBgkqhkiG9w0BAQUFAAOC
-						AQEAv/btN4bGohrEtiVoKW/MRRoCIaekw/1/bGFECwvIyjI+ifANO3wfp+S60mbK
-						ktZA4VtOBHKkuPdRJA5y6TyPBYtQMb8ARfJpZ++uD9uqOShBlrXxzu32jg7EzUxs
-						oo8Sl3c0LwUGKhCFOsKNEN62D4mJAIV35DF5E+LesWpJg5tDbi5CK3ifmp9tdfeL
-						dCDHH9Q2qm6zXTqxV2N5G3qPEAM3XReSqRcDmduAv293zolKih7pcJlm2oO7B1Oj
-						BiYUokzZvNzxaxg9xx50gCtzeblPk1VIU5bpDaLWxvPoIPlLdlfXMxkXEM2449yD
-						idoVrX4I/N/HxX/8Q1GFYpoGpA==
-					</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://dmponline-test.dcc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dmponline-test.dcc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Curation Centre Test DMP Online service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dcc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>DCC Helpdesk</GivenName>
-    <EmailAddress>mailto:support@dcc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DCC Helpdesk</GivenName>
-    <EmailAddress>mailto:support@dcc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dmponline.dcc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dmponline.dcc.ac.uk-shibboleth.xml
deleted file mode 100644
index 0b8a02b1..00000000
--- a/swamid-interfederations-2.0/dmponline.dcc.ac.uk-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://dmponline.dcc.ac.uk/shibboleth">
-  <!--
-		This is a "Digital Curation Centre DMP Online" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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-11T08:16:33Z"/>
-  </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://dmponline.dcc.ac.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://dmponline.dcc.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">DMP Online</mdui:DisplayName>
-        <mdui:Description xml:lang="en">DMP Online is a data management planning tool provided by the Digital Curation Centre.</mdui:Description>
-        <mdui:Logo height="92" width="310">https://dmponline.dcc.ac.uk/shib_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJAOtCUnAkVkzgMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2RtcG9ubGluZS5kY2MuYWMudWswHhcNMTIwODMxMTM0OTUxWhcNMjIwODI5
-						MTM0OTUxWjAeMRwwGgYDVQQDExNkbXBvbmxpbmUuZGNjLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Y7lhKA+QuVcLVmN8ZaJ+5+bq1Tuv5Qt
-						kZVVoNBiO+Hg3F4p/wGIHyAS6XD1VB+7P2IokGt13JtCxJYoq2m51M4yhwp4kKtu
-						vTW5bvxY/Qwl5aCIq9l9ZCIgD2wQ0F7dumt6F9/MQjhnDd81UMNm8Szcwmi58HxC
-						MHYW/Gwto0FoMlursS/3/Cx/nl0jTF3U5Yl9/xEb9/Nooe6d2QZagN5JWl+jbEve
-						bURMzOFC0+7hmmvrmj2MinKfZEsX4RLoH3KKdPSWBhFM4xpsezBZjlfFNngzkLWH
-						47nsQnxHJyE4p33AXMb3SA8OxY06sudQUPgWIG4kBC9L68qIAegvBQIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNkbXBvbmxpbmUuZGNjLmFjLnVrMB0GA1UdDgQWBBSg6Qwr
-						6uNEhUn4wQ5RJc3pKZbJHzANBgkqhkiG9w0BAQUFAAOCAQEASK4EQU4/iRNWN3T8
-						8uSl5RVdUyHEhqAvRLMpQn2UlZ4N1zfAHhTQx3V2Qb/WGz9DWXgTHHmPvUkwsMGk
-						Fy1OGGX4NcTb3xRa3c8i97TXOIWqWBNL73PnF2tvCEMR4ESckAzkKoIprbMYHsTA
-						kv6ZJIEbhewDT3v5zPUIZZl4eipFyV+5WIP3P9NIV89sheP3L5WeuSlkr7ne0ceO
-						FhpQ3ECRS+/8WHrJvRGtTO5xeecXvmQE1Opg21XyziVpANLFSjOGLywUOcg9e2zl
-						PrL11PMKc2fluPWs4Q1TVZzXOVVYw4P4LbvfWswPtvVlt2b7XNM/+uKApHYRd/Zu
-						isijLg==
-					</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://dmponline.dcc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dmponline.dcc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dmponline3.dcc.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Curation Centre</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dcc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>DCC Helpdesk</GivenName>
-    <EmailAddress>mailto:support@dcc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DCC Helpdesk</GivenName>
-    <EmailAddress>mailto:support@dcc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dmz-shib-dg-01.dmz.roehampton.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/dmz-shib-dg-01.dmz.roehampton.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 62029c7a..00000000
--- a/swamid-interfederations-2.0/dmz-shib-dg-01.dmz.roehampton.ac.uk-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" entityID="https://dmz-shib-dg-01.dmz.roehampton.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Roehampton University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">roehampton.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Roehampton</mdui:DisplayName>
-        <mdui:Logo height="60" width="166">https://www2.roehampton.ac.uk/roehampton/resources/images/url-logo-166x60.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www2.roehampton.ac.uk/roehampton/resources/images/url-quad.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDejCCAmKgAwIBAgIVAJw0niI78J9LVDelS/WX6kLw2ONrMA0GCSqGSIb3DQEB
-						BQUAMC4xLDAqBgNVBAMTI2Rtei1zaGliLWRnLTAxLmRtei5yb2VoYW1wdG9uLmFj
-						LnVrMB4XDTA5MDQwNjEzNTgxOVoXDTI5MDQwNjEzNTgxOVowLjEsMCoGA1UEAxMj
-						ZG16LXNoaWItZGctMDEuZG16LnJvZWhhbXB0b24uYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCLewrO3PRLdkLPc0WQ8pyV3lUyqjQotbAoCwAD
-						J82zAjGEjM2f7ItT0znjoOeL+0mk82lGNLpnUgdlCN1/CCWsVtpDHiX/cONcetfB
-						LApwbhlC/VkyVw64Q31BpDpmwRR8xl0G7wIDyGLgm65F4YGwLAIJ29ekX0iPW23G
-						3cnRB+Qxuss+ltLppKbKOg0RRHw8rGMqvpcl5RNaG5RoDd75ke4sulXzmnsiT1kX
-						zJ3N6gbYuKuYGDFbTNPxmUn8tDOY9XiMYmSXYAPC76Tm67yrsACybYfhamAKGLDJ
-						LzRPcdb+4ztpSwg3JAmoV9Wh71x/QY5xqRFYc6BFR+qr49sTAgMBAAGjgY4wgYsw
-						agYDVR0RBGMwYYIjZG16LXNoaWItZGctMDEuZG16LnJvZWhhbXB0b24uYWMudWuG
-						Omh0dHBzOi8vZG16LXNoaWItZGctMDEuZG16LnJvZWhhbXB0b24uYWMudWsvaWRw
-						L3NoaWJib2xldGgwHQYDVR0OBBYEFMBb1DPf728KsP2L5BR2RK8T3MDIMA0GCSqG
-						SIb3DQEBBQUAA4IBAQBQsK2G0NUmIAzUjnxKvM29W2BCPmXAntHFOku6g3eLuh8b
-						mvIgoQ+vRpPTdw9rN0hmz7Rohq5CiL7avvIbhYrbvC4UX86eAiss224K7OVHZxUc
-						jQOd40XcNctmhu558CeKQGqfurB1k9l78q9rNgrIyx+TfcyXI7Imy+koBVDk+m0P
-						Pzdno7nVF6ijBmrRcO1f6Tjn84RIn6Vv6beCZzwe99TUaV3hQt2f+k/yeZmebKK4
-						CvUiVr5csHXAtF2UoDIIvaXipHbaN7g3XU8D3xPCIgism64TuiZZSnTQa4nNv1ZZ
-						tsCE45WFHTtwjDr3fhwnrvOO0mnQQ1sRXig53IR1
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dmz-shib-dg-01.dmz.roehampton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dmz-shib-dg-01.dmz.roehampton.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://dmz-shib-dg-01.dmz.roehampton.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dmz-shib-dg-01.dmz.roehampton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dmz-shib-dg-01.dmz.roehampton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dmz-shib-dg-01.dmz.roehampton.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">roehampton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDejCCAmKgAwIBAgIVAJw0niI78J9LVDelS/WX6kLw2ONrMA0GCSqGSIb3DQEB
-						BQUAMC4xLDAqBgNVBAMTI2Rtei1zaGliLWRnLTAxLmRtei5yb2VoYW1wdG9uLmFj
-						LnVrMB4XDTA5MDQwNjEzNTgxOVoXDTI5MDQwNjEzNTgxOVowLjEsMCoGA1UEAxMj
-						ZG16LXNoaWItZGctMDEuZG16LnJvZWhhbXB0b24uYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCLewrO3PRLdkLPc0WQ8pyV3lUyqjQotbAoCwAD
-						J82zAjGEjM2f7ItT0znjoOeL+0mk82lGNLpnUgdlCN1/CCWsVtpDHiX/cONcetfB
-						LApwbhlC/VkyVw64Q31BpDpmwRR8xl0G7wIDyGLgm65F4YGwLAIJ29ekX0iPW23G
-						3cnRB+Qxuss+ltLppKbKOg0RRHw8rGMqvpcl5RNaG5RoDd75ke4sulXzmnsiT1kX
-						zJ3N6gbYuKuYGDFbTNPxmUn8tDOY9XiMYmSXYAPC76Tm67yrsACybYfhamAKGLDJ
-						LzRPcdb+4ztpSwg3JAmoV9Wh71x/QY5xqRFYc6BFR+qr49sTAgMBAAGjgY4wgYsw
-						agYDVR0RBGMwYYIjZG16LXNoaWItZGctMDEuZG16LnJvZWhhbXB0b24uYWMudWuG
-						Omh0dHBzOi8vZG16LXNoaWItZGctMDEuZG16LnJvZWhhbXB0b24uYWMudWsvaWRw
-						L3NoaWJib2xldGgwHQYDVR0OBBYEFMBb1DPf728KsP2L5BR2RK8T3MDIMA0GCSqG
-						SIb3DQEBBQUAA4IBAQBQsK2G0NUmIAzUjnxKvM29W2BCPmXAntHFOku6g3eLuh8b
-						mvIgoQ+vRpPTdw9rN0hmz7Rohq5CiL7avvIbhYrbvC4UX86eAiss224K7OVHZxUc
-						jQOd40XcNctmhu558CeKQGqfurB1k9l78q9rNgrIyx+TfcyXI7Imy+koBVDk+m0P
-						Pzdno7nVF6ijBmrRcO1f6Tjn84RIn6Vv6beCZzwe99TUaV3hQt2f+k/yeZmebKK4
-						CvUiVr5csHXAtF2UoDIIvaXipHbaN7g3XU8D3xPCIgism64TuiZZSnTQa4nNv1ZZ
-						tsCE45WFHTtwjDr3fhwnrvOO0mnQQ1sRXig53IR1
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dmz-shib-dg-01.dmz.roehampton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dmz-shib-dg-01.dmz.roehampton.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">Roehampton University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Roehampton</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.roehampton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Amos</GivenName>
-    <SurName>Eka</SurName>
-    <EmailAddress>mailto:A.Eka@roehampton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Amos</GivenName>
-    <SurName>Eka</SurName>
-    <EmailAddress>mailto:A.Eka@roehampton.ac.uk</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 06b4a799..00000000
--- a/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://doccom.iml.unibe.ch/shibboleth">
-  <md: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>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>unibe.ch</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>university</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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="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>
-    </md:Extensions>
-    <md: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>
-    </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://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doccom.iml.unibe.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">DOCCOM  Deutsch Universität Bern</md:ServiceName>
-      <md:ServiceName xml:lang="en">DOCCOM  German University Bern</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">DOCCOM Deutsch, Institut für medezinische Lehre, Universität Bern</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">DOCCOM German, Institute for medical Education, University Bern</md:ServiceDescription>
-      <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="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="surname" Name="urn:oid:2.5.4.4" 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="commonName" 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="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="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">unibe.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Bern</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Universität Bern</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.unibe.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unibe.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Michel</md:GivenName>
-    <md:SurName>Adrian</md:SurName>
-    <md:EmailAddress>mailto:adrian.michel@iml.unibe.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Hahn</md:GivenName>
-    <md:SurName>Axel</md:SurName>
-    <md:EmailAddress>mailto:sysadmin@iml.unibe.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 031 631 58 53</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 dacd6bde..00000000
--- a/swamid-interfederations-2.0/doccom.iml.unibe.ch.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://doccom.iml.unibe.ch/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-12-20T14:44:42Z">
-      <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="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:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJAIEe/2e1vVgFMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2RvY2NvbS5pbWwudW5pYmUuY2gwHhcNMTMxMjEwMTYyMjMzWhcNMTYxMjA5
-MTYyMjMzWjAeMRwwGgYDVQQDExNkb2Njb20uaW1sLnVuaWJlLmNoMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzqjnux2UV9CdTXwMyRmhp4ofwxr/cdtm
-mjDZJWFLOEjZXICRIaMcQcIEToWZ0su8iIFvPAZ5sDUVgpKZ3mtRK0qENVk5zlMc
-U0S3cjFlV2+RHF8cFI0BcFgBYavTruG0YWSKQdyTE2KYcYSuLTGNNJIK+Mq9/htv
-PJ7g1ZgEhn6sIqL43pMm/mKAxTNuxjooVRkohvzGCZmoIKGk6FgkjnBwi7nDwJ7U
-aTxsdBAvqD3REOSKqT3YwGLVBnZBeMqXpkMIoyseIZk5f/c8ypQp4wzNP1eaV3NT
-Yck+cBytwhOlJxw7crgp+ah0AL0Q+Tlca38Mv0ZLDrIT97X+3G4vAQIDAQABo2kw
-ZzBGBgNVHREEPzA9ghNkb2Njb20uaW1sLnVuaWJlLmNohiZodHRwczovL2RvY2Nv
-bS5pbWwudW5pYmUuY2gvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOhYMrsybcgVoGyCv
-e0LbV/g0KY4wDQYJKoZIhvcNAQEFBQADggEBALBQa19gPMqwHXd99gQGCc1GlahH
-CCuamxAQ0xXo0OpI0LM4kEmKsTA7w5HHtmRuWpX/OgnMLKG24U3dpJ+CDx9qKSQM
-KnNa9RKpoMuUYKeLegI4nf9vorPWHmvKaUX++h+MI9kdhiiwmR0nt1AW+UvhfHvF
-8kwaGHEJMO1KQGWR6D5uVrKiUUhILpkugMyR6bNrgaRSu6in8f44dx29sZ6O7foR
-/93yAZH2B9ihx76bpjpi3YkbGBqkzCtN2S0D/3u+dTAsZMC784BI93/F0/QBHYt6
-WSRhE3ZYk59M1ycVQ4T8q0X2F2EPLQxH50VTZVflSmFRPsI+/DMIeTgNbr4=
-						</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="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:axel.hahn@iml.unibe.ch</EmailAddress>
-    <TelephoneNumber>+41 31 632 2512</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Salzmann</GivenName>
-    <SurName>Matthias</SurName>
-    <EmailAddress>mailto:matthias.salzmann@iml.unibe</EmailAddress>
-    <TelephoneNumber>+41 31 632 2512</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/docs.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/docs.nsms.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index bd9c6818..00000000
--- a/swamid-interfederations-2.0/docs.nsms.ox.ac.uk-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://docs.nsms.ox.ac.uk/shibboleth">
-  <!--
-		This is a "docs.nsms.ox.ac.uk" Shibboleth SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-22T11:38:17Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJANItM4swegV3MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEmRvY3MubnNtcy5veC5hYy51azAeFw0xNDA1MjAxNDI5MjVaFw0yNDA1MTcx
-						NDI5MjVaMB0xGzAZBgNVBAMTEmRvY3MubnNtcy5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAL7Qbx7ncFti/2duYSv5uq14whnJpO+qUUP2
-						3rbm2//RoT7CfGdrAwTQm/kBtHqCSP6e1HeKPDshMDq1Gu0ZgVyOcnDhML6go3YS
-						beQZEK9LEktW9wYxKk5S7GTsUZyeosN1ZJZQ93NVj7vAdGblBxiOV5p1WExicnDK
-						KzJ1fcHhfemiWbQ28tF40Jv2IVCW9qecAXrt4CNHFrFXLWrmmMiWxjq+odgnjddN
-						C7B9c6eJTzEj2uPvlBW20/Ucfdxats/OSrVuajpn8BdglxJkzy1aqIp2uy38x4oD
-						EqHPpE67+eORgTtMH804zPKVazBxEwqoyeyaqDzCgs3AZ/AK5v8CAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISZG9jcy5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBQ/WjpW4JfV
-						7EorqP5jmbOILrvUqzANBgkqhkiG9w0BAQUFAAOCAQEAFCIv7u9pL1C2ti8k9KOn
-						Kg3CkOjZaeEtLHwIceZHDJvWQGbetLei6ptF4nAxvVzW/g7niVD+U0omv16bsONL
-						quEqQhmcwzQJnjkVO0BRAX/bB1/etiLFEQ6eJ+kALjKD44NlwpKytTctq7m7OqRt
-						bu6Tr5qTzkzvMJGQj2ct97ODWxUfSH52TPEqrJpEMdnTToYt6zC8ScZ11bNkyIoC
-						gPHcIH6KX4EXVZT3lXcKNL821unbxEM/V70BEpj+IXyoo8Jfls9ZRkplTaEYrKg0
-						hebx/WWoxPNmAaI8XGblLDzmXIN1nhZF0imrHYBzMRbMJUyOTnvB2fUQIDiSQB6c
-						+g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://docs.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://docs.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://docs.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://docs.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://docs.orchard.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://docs.orchard.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://docs.orchard.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://docs.orchard.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - docs.nsms.ox.ac.uk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://docs.nsms.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/docuwiki-magic.cesnet.cz-shibboleth.xml b/swamid-interfederations-2.0/docuwiki-magic.cesnet.cz-shibboleth.xml
deleted file mode 100644
index a238f5ed..00000000
--- a/swamid-interfederations-2.0/docuwiki-magic.cesnet.cz-shibboleth.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" entityID="https://docuwiki-magic.cesnet.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/" registrationInstant="2016-02-03T19:28: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>
-    <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/sp-group/aa.cesnet.cz</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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://docuwiki-magic.cesnet.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://docuwiki-magic.cesnet.cz/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="cs">Dokuwiki pro pilot projektu MAGIC</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Dokuwiki for MAGIC project pilot</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Dokuwiki instance for MAGIC attribute aggregation pilot</mdui:Description>
-        <mdui:Description xml:lang="cs">Instance Dokuwiki pro pilot MAGICke atributuove agregace</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://docuwiki-magic.cesnet.cz/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>docuwiki-magic.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=docuwiki-magic.cesnet.cz,O=CESNET, z\xC3\xA1jmov\xC3\xA9 sdru\xC5\xBEen\xC3\xAD pr\xC3\xA1vnick\xC3\xBDch osob,L=Praha 6,ST=Hlavn\xC3\xAD m\xC4\x9Bsto Praha,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFXTCCBEWgAwIBAgIQDysT+01XZjlPVKOpa3gTtjANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNjAxMjcwMDAwMDBaFw0xOTAxMzExMjAwMDBaMIGbMQswCQYDVQQG
-EwJDWjEdMBsGA1UECAwUSGxhdm7DrSBtxJtzdG8gUHJhaGExEDAOBgNVBAcTB1By
-YWhhIDYxODA2BgNVBAoML0NFU05FVCwgesOham1vdsOpIHNkcnXFvmVuw60gcHLD
-oXZuaWNrw71jaCBvc29iMSEwHwYDVQQDExhkb2N1d2lraS1tYWdpYy5jZXNuZXQu
-Y3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFBSpLUudZ2y+IlVGC
-i92hyUDJxmzlbG9JX4aj12jGBdecuS5djc+nlmNmlRHmxq+MrJqpud552TCLtZ1/
-461rX/+e2aTQx2hLHtgwl9rbLlaUNdn2jsVEeAK8BTttPQtxEO74+Ugz1BcN0brI
-iWPCHqjx13XcH6P0JLwgyC6SBCww8fFVy6OE5Q4EpzisBQP3f6BPSGZSvCCsXdTg
-STccH0EG29DNcg1p9Fqu58pa3k3cTibmghg7aPFyIjgvNLjS+dr7mavGbJW/Z6cS
-fGRSilyFdVRBIg5k//LtxCtL6qdkZEiD1BZLzJbzPX7eh9HjNnzOqhaN8oVlBFO1
-xHexAgMBAAGjggHRMIIBzTAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQ
-YjAdBgNVHQ4EFgQUNiQHbvI3oHdzWmLxW4w/fCpId3swIwYDVR0RBBwwGoIYZG9j
-dXdpa2ktbWFnaWMuY2VzbmV0LmN6MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwawYDVR0fBGQwYjAvoC2gK4YpaHR0cDovL2Ny
-bDMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9j
-cmw0LmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJ
-YIZIAYb9bAEBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNv
-bS9DUFMwCAYGZ4EMAQICMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0
-cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0
-cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0G
-CSqGSIb3DQEBCwUAA4IBAQBhHMYGEdhvbI/1qfhVeYm/SwwtyyxQiSv80XTnC9Gk
-h2YRTdGOM8h8zmFPRXxNVh5+HT4oMEYjyI1nB8460SHPVsy9XE0657q8rdiPZ/e2
-ciR6kid8N60CRETBIomlvAUVPLePQYh4Ofcqa+mhqdlHUSLcCjdIWYz8ik9vA943
-4gM0wuhmRop8Cbcs3Rn2iT7etMa0UsLKbk9w7K1BxJaciDtr82VfHC+RSl45mKpT
-pCiIRcBJVxaYQzySij8leaW6bv6TRa5WaDFYutM4EzGesF8HypMt+gejv3VtIggP
-WaTpvT6YRO1tysfkruFzBedsRBXhzMS4O1YKRiDiNsBr
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://docuwiki-magic.cesnet.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://docuwiki-magic.cesnet.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://docuwiki-magic.cesnet.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://docuwiki-magic.cesnet.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://docuwiki-magic.cesnet.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://docuwiki-magic.cesnet.cz/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://docuwiki-magic.cesnet.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://docuwiki-magic.cesnet.cz/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://docuwiki-magic.cesnet.cz/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://docuwiki-magic.cesnet.cz/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://docuwiki-magic.cesnet.cz/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET, a. l. e.</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">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.ces.net/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michal</md:GivenName>
-    <md:SurName>Prochazka</md:SurName>
-    <md:EmailAddress>michalp@ics.muni.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 cd8381a9..00000000
--- a/swamid-interfederations-2.0/doit.swisdom.org-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://doit.swisdom.org/shibboleth">
-  <md: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>
-    <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>uzh.ch</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>university</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">
-    <md: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>
-    </md:Extensions>
-    <md: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>
-    </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://aai.cyberderm.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cyberderm.net/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cyberderm.net/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cyberderm.net/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doit.mironet.ch/Shibboleth.sso/SAML2/ECP" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://doit.swisdom.org/Shibboleth.sso/SAML2/ECP" index="12"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML/POST" index="13"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cyberderm.net/Shibboleth.sso/SAML/POST" index="14"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doit.mironet.ch/Shibboleth.sso/SAML/POST" index="15"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://doit.swisdom.org/Shibboleth.sso/SAML/POST" index="16"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aai.cyberderm.net/Shibboleth.sso/SAML/Artifact" index="17"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cyberderm.net/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doit.mironet.ch/Shibboleth.sso/SAML/Artifact" index="19"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://doit.swisdom.org/Shibboleth.sso/SAML/Artifact" index="20"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">DOIT - Dermatology eLearning</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Dermatology Online with Interactive Technology</md:ServiceDescription>
-      <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="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="surname" Name="urn:oid:2.5.4.4" 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="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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="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="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="en">uzh.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Zürich</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Zurich</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uzh.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uzh.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Vahid</md:GivenName>
-    <md:SurName>Djamei</md:SurName>
-    <md:EmailAddress>mailto:vahid.djamei@uzh.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>DOIT</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:vahid.djamei@uzh.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6563a007..00000000
--- a/swamid-interfederations-2.0/doit.swisdom.org.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://doit.swisdom.org/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2012-12-30T19:03:54Z">
-      <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>
-MIIFGjCCBAKgAwIBAgIUH6a66qr+t+IWYDox5Q4z6Z/jwRIwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTExMDgyMjA5Mjc0MVoXDTE0MDgyMjA5Mjc0MVow
-azELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJpY2gxEDAOBgNVBAcTB1p1ZXJp
-Y2gxHTAbBgNVBAoTFFVuaXZlcnNpdGFldCBadWVyaWNoMRkwFwYDVQQDExBkb2l0
-LnN3aXNkb20ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1l3V
-hk4B1KbWNgNTpZ+cpM46T60jD2djhERx1mjhUIPVCSoSWBFnDcuaWVHw3hiiHRQ3
-Ak1SuXPGqT+oE4ATggPvgQmeD1BVv69dIwRf8k8ykJNlHYmaNFOjTAPmfPCUUZMB
-+U0WY5+L//HVrgEzESDJgNzLV/qipXtpj9ysXTLJqJ3kwiZ+bT7KyxVXP4YEocgl
-NDVib5r6IdsvUw9Bm5ot08ZbGjKsO+uD592LV3pNib71Q6sSYcoX/a2seCnvSLBk
-v/pQple2/uSY+U+eWfRcvyOSdaByYsTNGW54XEbG2CPph7WJyyhjKJkIelnXM/NR
-bjj3oIV93uF27WXgtwIDAQABo4IBtDCCAbAwdAYIKwYBBQUHAQEEaDBmMCoGCCsG
-AQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wOAYIKwYBBQUH
-MAKGLGh0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3J0
-MDkGA1UdEQQyMDCCEGRvaXQuc3dpc2RvbS5vcmeBHHZhaGlkLmRqYW1laUBhY2Nl
-c3MudW5pemguY2gwUQYDVR0gBEowSDBGBgwrBgEEAb5YAAJkAQEwNjA0BggrBgEF
-BQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20vcmVwb3NpdG9yeTAO
-BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8G
-A1UdIwQYMBaAFDJNoU/q8K6Ztu6bByyECBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyG
-Kmh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNybDAdBgNV
-HQ4EFgQUUFbI+ZNiU0fJ5tEkSatBhp6bJMAwDQYJKoZIhvcNAQEFBQADggEBAFgw
-pn5FmKkSXJS6UG3iYc5P6kDot0Ge5KB3o+Te4BaxG8IpLn/NRR1AU0WPgm/hqPA0
-RhRvxLEVLEU4zhShGURP2oTiaBkT3ArudACCw1yHFrY9+lQyMqlZeS0sgtS3RMRB
-PZFK09Z58q6U3oYHwjdjbDZgwz7e9vOYtN7uq7Yq1i1KMXiyUcGxH0xMXNXTpkl5
-7OfkKu3EolCAS7PA9pfU7rqeUC220Yaep7wZzml1kRa7Lcd61K3RHzXzY1ZynJSV
-oVuVfr2B07T4UxQr8qSyAc7CQ6OQII8R2ICM3efjlrDBI3kcvUAoxP2s2ynIERbc
-MwW3NDMLS+8yP8MK9rI=
-						</ds:X509Certificate>
-        </ds: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:doit@derm.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 6bb9f74a..00000000
--- a/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://dourado.ufs.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDIjCCAgoCAQAwDQYJKoZIhvcNAQEFBQAwVzEoMCYGA1UEChMfVW5pdmVyc2lk
-YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEMMAoGA1UECxMDTlRJMQswCQYDVQQGEwJC
-UjEQMA4GA1UEAxMHZG91cmFkbzAeFw0xNTA1MTUxNDI4MDJaFw0xODA1MTQxNDI4
-MDJaMFcxKDAmBgNVBAoTH1VuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFNlcmdpcGUx
-DDAKBgNVBAsTA05USTELMAkGA1UEBhMCQlIxEDAOBgNVBAMTB2RvdXJhZG8wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFff+p/RDQabbgSlBQLdM0vDaf
-qHQcuFVjejHxOuYTYP76mjAovqQfdumR6zWD9cw6X/KsrD+Au/oRnSzSqE0R3dB5
-hPFIj/sIslDJ0YO5kHTGYVzsqdGp5sbIJ3N06+1g3tkk+hW/1pftIU5X4PgCN1WL
-5Ib+kqs7BjPjOPwhnR1VSwGp31WU8KfRihSvBDnQugH51dPIUHm3UeVbPo4cS5/S
-pGDO5zbpG5FB6Mj571G71szB3sxU2fGFbcp6xM0ZMLXHmWYHXwPKM05IOgNRan3b
-Xtbj0Ca4aMV5xMpx59CeoLBirYwH2/psTkeQbZL7qTAi92oDb5v9Wh5lFNWdAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAKPnwQGVt9Fe3x5FyIp6PXbqmZxvO2vELwNw
-L0w5lrI6p3l1hSTwIfhynEOUBoLnuQOgKa4lNEfe0I5/LRdUVvvvDpWri1DuGEtl
-28xH4m8Buwbs6NOed7zc/6sAi13t1CG1oJ8TgjGHVMH0K3bE+AHE086qLsndxVvf
-6ccAOSBncTRv9xqESUX8tveu5JS5VR4SlRzTUvE+6zDQknLuT7gjuiCOEDX9IOso
-h2KToeZCA4/5zJzRpYL6Yh7m1SVptKtpi9zn+QVPdpZi3cUhWeNE96uifumvXt6M
-4nVAfP2nR1ImFjXDZPD1cf+m1ylSz40jEbkpowOXXiWowojAjbw=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dourado.ufs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://dourado.ufs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dourado.ufs.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dourado.ufs.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dourado.ufs.br/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">ufs.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDIjCCAgoCAQAwDQYJKoZIhvcNAQEFBQAwVzEoMCYGA1UEChMfVW5pdmVyc2lk
-YWRlIEZlZGVyYWwgZGUgU2VyZ2lwZTEMMAoGA1UECxMDTlRJMQswCQYDVQQGEwJC
-UjEQMA4GA1UEAxMHZG91cmFkbzAeFw0xNTA1MTUxNDI4MDJaFw0xODA1MTQxNDI4
-MDJaMFcxKDAmBgNVBAoTH1VuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFNlcmdpcGUx
-DDAKBgNVBAsTA05USTELMAkGA1UEBhMCQlIxEDAOBgNVBAMTB2RvdXJhZG8wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFff+p/RDQabbgSlBQLdM0vDaf
-qHQcuFVjejHxOuYTYP76mjAovqQfdumR6zWD9cw6X/KsrD+Au/oRnSzSqE0R3dB5
-hPFIj/sIslDJ0YO5kHTGYVzsqdGp5sbIJ3N06+1g3tkk+hW/1pftIU5X4PgCN1WL
-5Ib+kqs7BjPjOPwhnR1VSwGp31WU8KfRihSvBDnQugH51dPIUHm3UeVbPo4cS5/S
-pGDO5zbpG5FB6Mj571G71szB3sxU2fGFbcp6xM0ZMLXHmWYHXwPKM05IOgNRan3b
-Xtbj0Ca4aMV5xMpx59CeoLBirYwH2/psTkeQbZL7qTAi92oDb5v9Wh5lFNWdAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAKPnwQGVt9Fe3x5FyIp6PXbqmZxvO2vELwNw
-L0w5lrI6p3l1hSTwIfhynEOUBoLnuQOgKa4lNEfe0I5/LRdUVvvvDpWri1DuGEtl
-28xH4m8Buwbs6NOed7zc/6sAi13t1CG1oJ8TgjGHVMH0K3bE+AHE086qLsndxVvf
-6ccAOSBncTRv9xqESUX8tveu5JS5VR4SlRzTUvE+6zDQknLuT7gjuiCOEDX9IOso
-h2KToeZCA4/5zJzRpYL6Yh7m1SVptKtpi9zn+QVPdpZi3cUhWeNE96uifumvXt6M
-4nVAfP2nR1ImFjXDZPD1cf+m1ylSz40jEbkpowOXXiWowojAjbw=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dourado.ufs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dourado.ufs.br:8443/idp/profile/SAML1/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">UFS - Universidade Federal de Sergipe</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFS - Universidade Federal de Sergipe</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFS - Universidade Federal de Sergipe</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufs.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufs.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Rodrigus Oliveira Feitosa</md:SurName>
-    <md:EmailAddress>rodrigus@ufs.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0e42efef..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>
-    MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xLjAsBgNVBAoTJVVGUyAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFNlcmdpcGUxLzAtBgNVBAsTJkNQRCAtIENl
-bnRybyBkZSBQcm9jZXNzYW1lbnRvIGRlIERhZG9zMRswGQYJKoZIhvcNAQkBFgxy
-ZWRlc0B1ZnMuYnIxFjAUBgNVBAcTDVNhbyBDcmlzdG92YW8xEDAOBgNVBAgTB1Nl
-cmdpcGUxCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0x
-MjEwMzAxNzI1NDFaFw0xNTEwMzAxNzI1NDFaMIHOMS4wLAYDVQQKEyVVRlMgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMS8wLQYDVQQLEyZDUEQgLSBD
-ZW50cm8gZGUgUHJvY2Vzc2FtZW50byBkZSBEYWRvczEbMBkGCSqGSIb3DQEJARYM
-cmVkZXNAdWZzLmJyMRYwFAYDVQQHEw1TYW8gQ3Jpc3RvdmFvMRAwDgYDVQQIEwdT
-ZXJnaXBlMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYX
-XauTI4yRaEuEoeyvKultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8
-zCgEmnbjZVuG01q2eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7Xkhb
-D5dA6PGtwyCu+43hVKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh
-3Gf/V01JdGgIhLlsMf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOT
-SK/QZzbOr6TVOuC08Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAGm86P1eqdEODlBQrjKLcCm+jJOpSd2k+Yvg
-NgI6oDhoJnCA34RuO7dDKIE8OoWu51NYP3I2dZn8FGo4sGOagOtkfXBzGwTaGBbM
-nqjcHZbj7cqbBbdaWA10256dNN8lB6IX8IJTGB1vu2uSx6dbC3WdOO/POlkQGiYl
-EjldMN9pv9SRV4aj25Do4wPFnb+N/qTTNlXqUzvUXtkalwG1IuGfZIZSI4RHAQyB
-DU//RrjVffnvYgV75NfL3dX7wYbS9lP5NJ3CiBQmxUH+lGDx8F/CW1cObMYXfZSa
-oAQqY3yZoERxESGkhFsV+v49S2aZ3baNM6Bt3YRPrCEUHY/lc8o=
-            </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>
-      
-MIIEEjCCAvoCAQAwDQYJKoZIhvcNAQEFBQAwgc4xLjAsBgNVBAoTJVVGUyAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRlIFNlcmdpcGUxLzAtBgNVBAsTJkNQRCAtIENl
-bnRybyBkZSBQcm9jZXNzYW1lbnRvIGRlIERhZG9zMRswGQYJKoZIhvcNAQkBFgxy
-ZWRlc0B1ZnMuYnIxFjAUBgNVBAcTDVNhbyBDcmlzdG92YW8xEDAOBgNVBAgTB1Nl
-cmdpcGUxCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5kb3VyYWRvLnVmcy5icjAeFw0x
-MjEwMzAxNzI1NDFaFw0xNTEwMzAxNzI1NDFaMIHOMS4wLAYDVQQKEyVVRlMgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBTZXJnaXBlMS8wLQYDVQQLEyZDUEQgLSBD
-ZW50cm8gZGUgUHJvY2Vzc2FtZW50byBkZSBEYWRvczEbMBkGCSqGSIb3DQEJARYM
-cmVkZXNAdWZzLmJyMRYwFAYDVQQHEw1TYW8gQ3Jpc3RvdmFvMRAwDgYDVQQIEwdT
-ZXJnaXBlMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOZG91cmFkby51ZnMuYnIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuuogQEudWqFoQPdA7n9TrUUYX
-XauTI4yRaEuEoeyvKultDI/HnZDCQ1so3QIjjlWgY5bLTOuYZR/+bw1ufVCtQNH8
-zCgEmnbjZVuG01q2eoOzCyLjL7I/HwhFHTXOKoXNLyC6K2JgF4QYDISAcVG7Xkhb
-D5dA6PGtwyCu+43hVKg42zu8R7KUJjj3Iu5FUTB9txGt4gM5j3twqDde6iNUXILh
-3Gf/V01JdGgIhLlsMf3d0ac1sH4Ks0KkaQsnhkc4Rt7fHDFlS3NkOTNt95oYyiOT
-SK/QZzbOr6TVOuC08Y+ya8BE2spu37VBaUCuers4FbfFp2WIu/XO8hfG9MJTAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAGm86P1eqdEODlBQrjKLcCm+jJOpSd2k+Yvg
-NgI6oDhoJnCA34RuO7dDKIE8OoWu51NYP3I2dZn8FGo4sGOagOtkfXBzGwTaGBbM
-nqjcHZbj7cqbBbdaWA10256dNN8lB6IX8IJTGB1vu2uSx6dbC3WdOO/POlkQGiYl
-EjldMN9pv9SRV4aj25Do4wPFnb+N/qTTNlXqUzvUXtkalwG1IuGfZIZSI4RHAQyB
-DU//RrjVffnvYgV75NfL3dX7wYbS9lP5NJ3CiBQmxUH+lGDx8F/CW1cObMYXfZSa
-oAQqY3yZoERxESGkhFsV+v49S2aZ3baNM6Bt3YRPrCEUHY/lc8o=
-                    
-            </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/downloads.channel8.msdn.com.xml b/swamid-interfederations-2.0/downloads.channel8.msdn.com.xml
deleted file mode 100644
index 3ef8b274..00000000
--- a/swamid-interfederations-2.0/downloads.channel8.msdn.com.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://downloads.channel8.msdn.com/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.dreamspark.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.dreamspark.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.dreamspark.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIJAOAnCSnCRCHEMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnd3dy5kcmVhbXNwYXJrLmNvbTAeFw0xMDEwMDQxMDAyMTBaFw0xMzEwMDMx
-MDAyMTBaMB0xGzAZBgNVBAMTEnd3dy5kcmVhbXNwYXJrLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKSB9dRKIpfDAdGbla2Z4lNxRHURAsUb8LvT
-ALm0+v9RP/Hq7dAHSGHmQgv15s/0fi6i8p3EEtiBcnPVKJxvff82kLvV9AjrLp2l
-Szq+nz1oD1zElm44Caw9NMHc4n0NfvRSlAH1VKZUEXo5gm+jMHcpx/wDoMqNGEOq
-XXglXNoeftFWmlhU/loHuLIfREtadWB4mzOzqCCW5Ak7ESF6hVW5mD73QgJPgLVt
-Y4K1HouT4hC9oDhG4RHx1C/pex3JqTVirhTiWCKZCuVk7u8lVTOojr9mKczhO2HX
-85x4i8o+NzeBNchzs/WUXtdvqPzw8/Y7kSGhcG0FE2Db7uAPmXkCAwEAAaN+MHww
-HQYDVR0OBBYEFFml+PG8Rd7m471DG1DTwNsiM8njME0GA1UdIwRGMESAFFml+PG8
-Rd7m471DG1DTwNsiM8njoSGkHzAdMRswGQYDVQQDExJ3d3cuZHJlYW1zcGFyay5j
-b22CCQDgJwkpwkQhxDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB4
-mZ5q44Xzp0ffUgr+XBC1iD+GhXQbC+fiMR4Cd1RFu9+p2p2iKwrZVQ0m+6fegO3F
-Cd2S+14+jgg7O4EfQcf+A4IcfVIs/g3EhqRleXoZqYusZJOwAUOhIm+vSjDxv11D
-gBvhFnVqgL04VKmGopK35kSspkhXm3BJgd/dqvXTYiNeKw6yk77sdSDiZxk6nRlD
-HS/mVvdjQUf0yyJNHZp6eEBgWgxmIGBRoKhb6hi5scIylBTUewqBqUnaW+t0kF8f
-qhw5X47o07/+9CJh8DsO1KpfM2CNZbIMUEY2q1wBfhE5HlI4wVXJYQqeUsqHXr1G
-ssIJnnOiYS0/QF/t7Wkd
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dreamspark.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dreamspark.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dreamspark.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://downloads.channel8.msdn.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://downloads.channel8.msdn.com/Shibboleth.sso/SAML/Artifact" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Microsoft Deutschland GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Microsoft DreamSpark</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.dreamspark.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Scott</GivenName>
-    <SurName>Blackwell</SurName>
-    <EmailAddress>scott.blackwell@microsoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DS Team</GivenName>
-    <SurName>Microsoft</SurName>
-    <EmailAddress>ds-team@microsoft.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 4bb66215..00000000
--- a/swamid-interfederations-2.0/draper.library.qmul.ac.uk-shibboleth-sp.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://draper.library.qmul.ac.uk/shibboleth-sp">
-  <!--
-		This is a "QMUL Metalib Service" Shibboleth SP for Queen Mary and Westfield College, University of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIFMDCCBBigAwIBAgIQCR4X+YYxugtmUqrjt8DPOjANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDcxNzAwMDAwMFoXDTE2MDcxNjIzNTk1OVowgdsxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQREwZFMSA0TlMxFzAVBgNVBAgTDkNlbnRyYWwgTG9uZG9u
-						MQ8wDQYDVQQHEwZMT05ET04xGjAYBgNVBAkTETMyNyBNaWxlIEVuZCBSb2FkMT8w
-						PQYDVQQKEzZRdWVlbiBNYXJ5IGFuZCBXZXN0ZmllbGQgQ29sbGVnZSwgVW5pdmVy
-						c2l0eSBvZiBMb25kb24xEDAOBgNVBAsTB0xpYnJhcnkxIjAgBgNVBAMTGWRyYXBl
-						ci5saWJyYXJ5LnFtdWwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQDFgBdbGL/GSo5oQqq88P2aZQsDZKGXcROQf+x9ooJAy7nZhbYjyohCyMPJ
-						Nfc541+v5+UqZgSU/GoN1s9RCPdvNkObiyEIzhBCTrTRE11H1MGJoUF0acx2jpWZ
-						0g8px6vi4mX2P/9hwVt6y9L++U6KdAoqDpG8vy1CNmyWV+b+39nn2hmGn8T/GDdJ
-						5Tg2bnA35B+H0n4M+0Ezcm/+fvexplwI31A90R7fWQryYyORlYC/mZRvDLgd7pDs
-						J8RXFNW3RAum7FHQxVsmMEYiKfobt1jLd+L7jsG+94W43dfv3s2x0Woin3douEBZ
-						tciHGAHATDTHzZcpkibQxNtROQLbAgMBAAGjggGSMIIBjjAfBgNVHSMEGDAWgBQM
-						vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU517jMU/gexoHTBO9dLm4x2eW
-						SmAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-						BQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EM
-						AQICMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-						VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-						cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-						MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMEAGA1UdEQQ5MDeCGWRyYXBl
-						ci5saWJyYXJ5LnFtdWwuYWMudWuCGm1ldGFsaWIubGlicmFyeS5xbXVsLmFjLnVr
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCK31/RCDY1vk7ZlYo2TsEMApl7BtMDHSSjBC8X
-						ynY3HufFVHn5MfOOWgd4lP8J2xkhWTrlNdN6HGWLHnyi1X83SWxeiFc8v24tIWDY
-						/l0lyk0vbTCl3WJqAlczmNCLHIIGLM6epn1zWgprydw6zh9tjKyTNTQGvpdxZm54
-						EyakhTXxRyQ8ZvhI7o0O5gdLR7G1O7TAi01VhlqYN2qZl2a1MKKMIh/in7W26lGw
-						qD1u5MIJDZI2AWzuWcbWVnG1eCS7OjS6L3VLGe42HdA/PcDTlP1Sa3fhtW0dicnN
-						lkd9ORqKnAn0Eu92u/K4wIU0zyHK7lXeeOVZsm/ErYmcGtTS
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://draper.library.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College: QMUL Metalib Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library Systems Team </GivenName>
-    <EmailAddress>mailto:lib-systems-team@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jeremy</GivenName>
-    <SurName>Acland</SurName>
-    <EmailAddress>mailto:j.acland@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jez</GivenName>
-    <SurName>Clark</SurName>
-    <EmailAddress>mailto:j.p.clark@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml b/swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml
deleted file mode 100644
index b3d5467b..00000000
--- a/swamid-interfederations-2.0/drive.asnet.am-shibboleth.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://drive.asnet.am/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.asnet.am" registrationInstant="2015-08-22T12:46:47Z"/>
-  </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://drive.asnet.am/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://drive.asnet.am/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ASNET-AM Drive</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ASNET-AM Drive is an Internet service to store data in Armenian's cloud storage and retreive or work with these data at any time. It provides a simple web interface and a syncing and sharing capabilities for files, as well as native syncing clients for Mac OS X, iPhone, iPad and Windows. All this will be performed in a secure and rebust environment and free of charge.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://drive.asnet.am/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>*.asnet.am</ds:KeyName>
-        <ds:KeyName>asnet.am</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFkTCCBHmgAwIBAgIRAJGxdi6BndHGs8GWsagMbaYwDQYJKoZIhvcNAQELBQAw
-gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
-VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-Q0EwHhcNMTUwNjAyMDAwMDAwWhcNMTgwNjAxMjM1OTU5WjCBoTEhMB8GA1UECxMY
-RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUkwRwYDVQQLE0BIb3N0ZWQgYnkgSW5z
-dGl0dXRlIGZvciBJbmZvcm1hdGljcyBhbmQgQXV0b21hdGlvbiBQcm9ibGVtcyBO
-QVMuMRwwGgYDVQQLExNDT01PRE8gU1NMIFdpbGRjYXJkMRMwEQYDVQQDFAoqLmFz
-bmV0LmFtMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtYnlRhHME8WP
-4x/2SiMMV25dK9HnrJmrssJVi/A/3Om0cSMVyybohqMcWTLq4s6A1kBSy4pEK7Kl
-3M7qaTBUVOkXZZPn/vpOJoaHR71tG/CClNivpN5Q/a3RA6jRjT20pvUApNzQglwN
-23wYPu5Uz1iLjVT53Bq3HnbuYlI7FIjWKyfHonHnYw0CARJHRXeq/ykFngbxj1ie
-sdtVdrpI4hUDk1o85y4rDuvK1HYcMudI8kbfZ1a8l/3jiA4EnNeoe5fbKQDkP63V
-cN2f1cM3Noj1GGAGYX5sY9PY3d0UmBH/8Kzg4i58E8V4EJTwLLYpSfAXO04+e3Bb
-VKCUUz5vywIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99D
-tDoo2ucwHQYDVR0OBBYEFKjnkZCHfwFjf2kkMGdeTAcM4Q8SMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjBPBgNVHSAESDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBz
-Oi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmg
-R6BFhkNodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxp
-ZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYB
-BQUHMAKGQ2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZh
-bGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
-Y3NwLmNvbW9kb2NhLmNvbTAfBgNVHREEGDAWggoqLmFzbmV0LmFtgghhc25ldC5h
-bTANBgkqhkiG9w0BAQsFAAOCAQEAAN5hdW1ipGLn9khP5UoSEHFJPuKzR4yzuWrF
-Kc1UamsQLWA2SNvN3Lb+4vj+W7q++aBgmGEjfhw/BWQzFOXfeHHYb8YLBZuweesm
-5neG4kULC4Qpf6tc5LgK0V6geVNHzXnAchLn2KzBhjgMUmvHOJFPSwCJHKSyN2Qc
-lCrQol4CRGiKXH7428yGMgFi2kqdL9xlxxned0/13GfyMVQwUfwmLe2a/HH7nn4k
-iNKDKTPbYWvuDjrIuKskC0uBwkvqEunCqE0beN5/bzfA/XiN7VFQm19o6T/8fwFO
-xAkgTb8s+nKQoqK0D7O7EXRzLd/m825ao8+E21sqAhwodilGeg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <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#rsa-oaep-mgf1p"/>
-      <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/2009/xmlenc11#rsa-oaep"/>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFkTCCBHmgAwIBAgIRAJGxdi6BndHGs8GWsagMbaYwDQYJKoZIhvcNAQELBQAw
-gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
-VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-Q0EwHhcNMTUwNjAyMDAwMDAwWhcNMTgwNjAxMjM1OTU5WjCBoTEhMB8GA1UECxMY
-RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUkwRwYDVQQLE0BIb3N0ZWQgYnkgSW5z
-dGl0dXRlIGZvciBJbmZvcm1hdGljcyBhbmQgQXV0b21hdGlvbiBQcm9ibGVtcyBO
-QVMuMRwwGgYDVQQLExNDT01PRE8gU1NMIFdpbGRjYXJkMRMwEQYDVQQDFAoqLmFz
-bmV0LmFtMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtYnlRhHME8WP
-4x/2SiMMV25dK9HnrJmrssJVi/A/3Om0cSMVyybohqMcWTLq4s6A1kBSy4pEK7Kl
-3M7qaTBUVOkXZZPn/vpOJoaHR71tG/CClNivpN5Q/a3RA6jRjT20pvUApNzQglwN
-23wYPu5Uz1iLjVT53Bq3HnbuYlI7FIjWKyfHonHnYw0CARJHRXeq/ykFngbxj1ie
-sdtVdrpI4hUDk1o85y4rDuvK1HYcMudI8kbfZ1a8l/3jiA4EnNeoe5fbKQDkP63V
-cN2f1cM3Noj1GGAGYX5sY9PY3d0UmBH/8Kzg4i58E8V4EJTwLLYpSfAXO04+e3Bb
-VKCUUz5vywIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99D
-tDoo2ucwHQYDVR0OBBYEFKjnkZCHfwFjf2kkMGdeTAcM4Q8SMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjBPBgNVHSAESDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBz
-Oi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmg
-R6BFhkNodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxp
-ZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYB
-BQUHMAKGQ2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZh
-bGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
-Y3NwLmNvbW9kb2NhLmNvbTAfBgNVHREEGDAWggoqLmFzbmV0LmFtgghhc25ldC5h
-bTANBgkqhkiG9w0BAQsFAAOCAQEAAN5hdW1ipGLn9khP5UoSEHFJPuKzR4yzuWrF
-Kc1UamsQLWA2SNvN3Lb+4vj+W7q++aBgmGEjfhw/BWQzFOXfeHHYb8YLBZuweesm
-5neG4kULC4Qpf6tc5LgK0V6geVNHzXnAchLn2KzBhjgMUmvHOJFPSwCJHKSyN2Qc
-lCrQol4CRGiKXH7428yGMgFi2kqdL9xlxxned0/13GfyMVQwUfwmLe2a/HH7nn4k
-iNKDKTPbYWvuDjrIuKskC0uBwkvqEunCqE0beN5/bzfA/XiN7VFQm19o6T/8fwFO
-xAkgTb8s+nKQoqK0D7O7EXRzLd/m825ao8+E21sqAhwodilGeg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drive.asnet.am/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drive.asnet.am/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drive.asnet.am/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drive.asnet.am/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drive.asnet.am/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drive.asnet.am/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drive.asnet.am/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drive.asnet.am/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drive.asnet.am/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drive.asnet.am/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://drive.asnet.am/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">ASNET-AM Drive</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">ASNET-AM Drive is an Internet service to store data in Armenian's cloud storage and retreive or work with these data at any time. It provides a simple web interface and a syncing and sharing capabilities for files, as well as native syncing clients for Mac OS X, iPhone, iPad and Windows. All this will be performed in a secure and rebust environment and free of charge.</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="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Academic Scientific Network of Armenia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ASNET-AM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.asnet.am/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andranik</md:GivenName>
-    <md:SurName>Hayrapetyan</md:SurName>
-    <md:EmailAddress>mailto:andranik@ipia.sci.am</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/drupal-pilot-web-01.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/drupal-pilot-web-01.it.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 30f7bc8e..00000000
--- a/swamid-interfederations-2.0/drupal-pilot-web-01.it.ox.ac.uk-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" entityID="https://drupal-pilot-web-01.it.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Drupal Pilot production" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2015-10-12T09:43:31Z">
-      <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">
-    <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://drupal-pilot-council.it.ox.ac.uk/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://www.council.ox.ac.uk/Shibboleth.sso/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWTCCAkGgAwIBAgIJAM+Hk42onQyyMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-						BAMTH2RydXBhbC1waWxvdC13ZWItMDEuaXQub3guYWMudWswHhcNMTUxMDA4MTQ0
-						NjU1WhcNMjUxMDA1MTQ0NjU1WjAqMSgwJgYDVQQDEx9kcnVwYWwtcGlsb3Qtd2Vi
-						LTAxLml0Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						2oUqXTJ+Hn6gKfh4C19sh17bF0nFqnn70E2Le3C9BQbq3kPLCXSJUJqAPINiyCd0
-						ji2O8bNDLh3IrgaTVE0zU3Y8NQfSvsFTiQA9wE9M9CYdRWE+5m0rdiTYxC1aiMs1
-						7+KDM/4tbY/xWEbGrUKeq92EAId4fw+r+C3D0O6zuaXUTIq3fA7NDR0UUZRaQ2p1
-						34cXjCkq+D4hTsfrpTPKnQfDI3MfSOUyaFG0tlq1O5BF6w7OtfUlgkBAa6qenlCR
-						36RyvKzrt9EnREwlqpAz4GJbFqY1ShGtwl9/CP6QWOJu5cD1GH2rL9H+ldQXPdzX
-						FwTYfOGXxoCeoD/g/0Zc2wIDAQABo4GBMH8wXgYDVR0RBFcwVYIfZHJ1cGFsLXBp
-						bG90LXdlYi0wMS5pdC5veC5hYy51a4YyaHR0cHM6Ly9kcnVwYWwtcGlsb3Qtd2Vi
-						LTAxLml0Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFIRg3FGPg1ywm7aE
-						hsPpUfArjxVlMA0GCSqGSIb3DQEBBQUAA4IBAQABdV7iO2QaUUzKzlmMOhzzWE4b
-						Cgcghaowaa8g1qc6zIvSNoqU9imHJTItzv/dfEDM1KX9ppV0hmIu1wE8d6n3lVvZ
-						Gg4JNhsRG+7a4TS6NXZQIrrd3uG2FglMWobTaH5sQsu/GHxHQOTJOHUovB1IweZB
-						sIlMsDAJo38zuab3GSrKkcgDIEAutul42Jv5dquXRxOgjAh+e7ttmgPH3nrzb5/J
-						sRDgx2FFHN5WjgMiQhB8tUcq2OrdtmNQBz5eXT96YoTja1ANxq3AlgqM47yymlNj
-						FjesGc4el4t9A6gSXpuQDFWQisQVxg+lA51tHP2hhIx/3fySzhUu6Pke2iiQ
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.council.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.council.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.council.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.council.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://drupal-pilot-council.it.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.council.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Drupal Pilot production</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@oucs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@oucs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/drupal-pilot-web-02.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/drupal-pilot-web-02.it.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index be7b3e74..00000000
--- a/swamid-interfederations-2.0/drupal-pilot-web-02.it.ox.ac.uk-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" entityID="https://drupal-pilot-web-02.it.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Drupal Pilot development" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2015-10-12T09:43:31Z">
-      <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">
-    <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://drupal-pilot-web-02.it.ox.ac.uk/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://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWTCCAkGgAwIBAgIJAPOKjeXKIpPPMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-						BAMTH2RydXBhbC1waWxvdC13ZWItMDIuaXQub3guYWMudWswHhcNMTUxMDAxMTM1
-						MzIzWhcNMjUwOTI4MTM1MzIzWjAqMSgwJgYDVQQDEx9kcnVwYWwtcGlsb3Qtd2Vi
-						LTAyLml0Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						sQMf3qRXSHmQ0ye8gI0aveqbk6rIRXpcaxYFJ/ebcaec04TkFMq0LjBzE3Yj8UyS
-						gk+tWTOIUrUlzREiMdfU4Qro2xERenlvttJAZnRGngjDfPXgHoQsg5lTjm/tRaHY
-						LWnflxzA3XdPhd/t1D7J2DpBLL7p6ok+Y4PgwDOkZrc3eEpx7PcdLBn54f1RcbYC
-						Uz/jPHWJ0D6g+lg9HBjC9SjfnJv3lkUmXFV5DE05chK2uNHEjz8ZSbWYCrVPMcUx
-						fBlpIGSTvstMjoz92DjbtTUP5H1+rR3yb2cBc0IiU0V+NfL8fMb79G5CXP6HAUL6
-						XWo4vEh2x791KMLXC6wS8QIDAQABo4GBMH8wXgYDVR0RBFcwVYIfZHJ1cGFsLXBp
-						bG90LXdlYi0wMi5pdC5veC5hYy51a4YyaHR0cHM6Ly9kcnVwYWwtcGlsb3Qtd2Vi
-						LTAyLml0Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFLvwkmrVvmir9YsG
-						rI2ee4f0f4ILMA0GCSqGSIb3DQEBBQUAA4IBAQBAUPYBXkLeNnmjnVhbtG5T0zqe
-						/8Vx9C+Y+9vPygR6pEtHNh2x5dJMB5gWny7Ks071rgs0/s2MdWoe72nC1NB4kieE
-						mNvNGPSmSJxIYXA6ZVczIvajAl2qB9j4Q/lIJt2PmGBQmeOu7m9YzqCvSDfKMpgk
-						KQ6y0BigQ6Tpa7tSFRzMwwK56dN2VoKAHPxclfExoIWsK2d8wPO/PiiVv99NxrDl
-						wICWl+HpC/pPJHVP2NMJPI7FLsO+Pzc8a2yTKl3QQWpV5HqK2P+/jhMzRcq7Bm80
-						5DMxXDen4Zx9PRnX+LSqVDBXL2Sy3nsIbayFHVpLKYCdwFGpUco+zke0ik1i
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://drupal-pilot-web-02.it.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://drupal-pilot-council-dev.it.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Drupal Pilot development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@oucs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@oucs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e594d1b4..00000000
--- a/swamid-interfederations-2.0/drupal-test1.admin.ox.ac.uk-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://drupal-test1.admin.ox.ac.uk/shibboleth">
-  <!--
-		This is a "IT Services drupal-test1" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-13T11:32:32Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAJLwYa1nUjhIMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2RydXBhbC10ZXN0MS5hZG1pbi5veC5hYy51azAeFw0xNDA2MTEwNzM4NTZa
-						Fw0yNDA2MDgwNzM4NTZaMCYxJDAiBgNVBAMTG2RydXBhbC10ZXN0MS5hZG1pbi5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCrjkmZs9yt
-						nETaaTxuF459aLEF5H12+vcuwsR662oNVitQqHO1XUUd5KVJ2502H3tpWZbT0rWA
-						wnv0nwHB14gm4evKInO/Da9yojWFUtOFExHqePyDfOQZyKb3mAlpRrQAtCpELTjq
-						Zr0HTht/ODhsmCKdRUzsNDOld6X7HYU834DoQoZCGpHuzDK/Nj6C9gweL1Uxn1RB
-						kVd2t+5/nU0aXSfyMmL++H4kxPDEYEcyZpz2xCwZDfqbSiMn2mltwxUM6Pl5YnwM
-						TMvEN9BiWdhTSckqWoqz9pxbJePM2k4kH2tm+v2oHRlC2/hKEtOggKTyeqdQxryK
-						qqj85s6HZa0CAwEAAaNJMEcwJgYDVR0RBB8wHYIbZHJ1cGFsLXRlc3QxLmFkbWlu
-						Lm94LmFjLnVrMB0GA1UdDgQWBBT8QD5mvc4hICi5sUNX2UZ/9hDmKjANBgkqhkiG
-						9w0BAQUFAAOCAQEAgQLx3imjfSX3QxSJqZPHuzLFoygwXm2EWm5m1LR8aUl1WWIo
-						2CwZR7wMZ0pVYiBJgYqwjkNpozJ1f6Fr9F48o/sSDG673zxjFbOAxLm7nTHBvc39
-						qIMNxvOmhl8f/A7gT+OnR+dmVfPI42BrHhUEAOSTmkTRRT1jV6WHKNwXjqngYqD+
-						EOASg50rUobY9bF+6k6vGhWxTBAS+UcBUsTGiGU9cDS1cuFpONYixQB7cYA++1SR
-						hxhDEKXAC6V3xfJiCLPEcKBaKRyFh+ImaDfcqWjollm0Y2xd/uF1/Tg8AMxLslGw
-						PI60xEImflkCgUGXgjTfpKljm+bcaUKAnUQMpg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-test1.admin.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-test2.admin.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://drupal-test3.admin.ox.ac.uk/Shibboleth.sso/SAML/POST" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford IT Services drupal-test1</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dspace.jorum.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/dspace.jorum.ac.uk-shibboleth.xml
deleted file mode 100644
index 32f8840e..00000000
--- a/swamid-interfederations-2.0/dspace.jorum.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://dspace.jorum.ac.uk/shibboleth">
-  <!--
-		This is a "Jorum" Shibboleth SP for the University of Manchester.
-	-->
-  <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="2013-07-16T17:01:08Z">
-      <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://vm-jorum-live.mimas.ac.uk/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://content.resourceshare.ac.uk/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://dashboard.jorum.ac.uk/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://window.jorum.ac.uk/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://dspace.jorum.ac.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://vm-jorum-live.mimas.ac.uk/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://content.resourceshare.ac.uk/Shibboleth.sso/Login" index="2"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/Login" index="3"/>
-      <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://window.jorum.ac.uk/Shibboleth.sso/Login" index="4"/>
-      <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://dspace.jorum.ac.uk/Shibboleth.sso/Login" index="5"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Jorum</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Through Jorum, you can find and share open learning and teaching resources.</mdui:Description>
-        <mdui:Logo height="236" width="236">https://census.mimas.ac.uk/jorum_logo_blue20mm.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAJbPuHXi0UDYMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXZtLWpvcnVtLWxpdmUwHhcNMTQwNDE2MTIyNDI0WhcNMjQwNDEzMTIyNDI0
-						WjAYMRYwFAYDVQQDEw12bS1qb3J1bS1saXZlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAvlVUs6QM5xdt/Ri2V+fwBQvsXpOyZhZWC4wd5KeFxg4atgW4
-						jN64Lp4YU8KM+tABhiJ5GNhscmXFG9T7AhQN+f0Egg++dhx2n5L82v1D8wif1FGw
-						fHMS+JaDFhCfQWaxKzi0C+DMUaB/lqOObX5mV+oBZAadpHroDXuGu13tZixE4Hod
-						yORv3NSPHBFkn5Lmx9Hv8PntBqR2PEVpicEaokJtH8S4mXNcY1QEY8D7FlN1BHvR
-						irMl/JCDZTV5gw2axLFuGeholiqsZwKZvXRTXy9WYoqfxEio5r4pSctSM9ounb0H
-						4ILOUI9xMIiGf/jHD1OrHhWNwd63LzuBYC3RsQIDAQABo2IwYDA/BgNVHREEODA2
-						gg12bS1qb3J1bS1saXZlhiVodHRwczovL2RzcGFjZS5qb3J1bS5hYy51ay9zaGli
-						Ym9sZXRoMB0GA1UdDgQWBBTgE6iCbBgMAYLkrgLLpsJoDsFYGzANBgkqhkiG9w0B
-						AQUFAAOCAQEAg9kbdbOQ3PAeGUhokP5PUJeB3wp0IPGWK6d9TijrW2/ArFiGlJtT
-						1bri8JBAesX7ufonRR5MOXukpz9DHqhJxqcoE1RfJ+xvoZbvCuP+WdxPg/ya7/tZ
-						oiWM+mj+Y8lA35dptThCE3yW4c4n3YXwwZEgaYgmTsNODOD/6JrbNNj9/LS6xKyE
-						0oFQi38QenBFAmRz7GQjCfMg7upZZE1Rbq7+l0GNLltBwo+xCjvBZ7C3zBkb+SrI
-						2tydmwzbAnZl+iHmbcvRjZdCZfYk/9lYuc6xSA2OJMkad9w/h/jUZdtYTXN/blQR
-						Rv/EwHdvI+8G8Vuf/3+KmHHcv17aOEeuhA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://window.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://window.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://window.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://window.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://window.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://window.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://window.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dspace.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="29"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The University of Manchester: Jorum</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://mimas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jorum Helpdesk</GivenName>
-    <EmailAddress>mailto:support@jorum.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</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 9ab84dad..00000000
--- a/swamid-interfederations-2.0/du-idp.lanet.lv.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://du-idp.lanet.lv">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Daugavpils University</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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - DU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Daugavpils University - DU IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/duck-dev.bournemouth.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/duck-dev.bournemouth.ac.uk-oala-metadata.xml
deleted file mode 100644
index 6be84f5c..00000000
--- a/swamid-interfederations-2.0/duck-dev.bournemouth.ac.uk-oala-metadata.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://duck-dev.bournemouth.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Bournemouth University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">bournemouth.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXzCCAkegAwIBAgIJAO6CYqChSs/9MA0GCSqGSIb3DQEBBQUAMEYxHzAdBgNV
-						BAoMFkJvdXJuZW1vdXRoIFVuaXZlcnNpdHkxIzAhBgNVBAMMGmR1Y2stZGV2LmJv
-						dXJuZW1vdXRoLmFjLnVrMB4XDTE0MDEyNzEzMzczOFoXDTI0MDEyNTEzMzczOFow
-						RjEfMB0GA1UECgwWQm91cm5lbW91dGggVW5pdmVyc2l0eTEjMCEGA1UEAwwaZHVj
-						ay1kZXYuYm91cm5lbW91dGguYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQC8D4pXasrHRGOOesMTZ+4+sX9RMHMZ/OU9NXTxXFPIdNEB8HImGayd
-						VNXCUmhGIRySMBNhvHdMEui5OFq0hHd/Rxe6FO8itPxsxLvbW0K6pb5r7yI8s/mc
-						Rws8qC17OvhX0vgbWXAdp2/zPTCAYSoIA960f41KOc1jVO3gKXELkGV0rc8Fte2h
-						TuTHSVo1u0kg8IXoSTsyDVIBbkWmL8XJp39VZ8Im++N6l+vajxF8TH2oqz70xi60
-						khQy8JTBg2F5PPcCRIWauo9TXJiHFUHWaMZcl8RucOXNOcDts1yTZaFLD4kzTCE9
-						WqgFEOqpjD/IM4pPFAum0Z2oB08WaLDpAgMBAAGjUDBOMB0GA1UdDgQWBBSSJsuN
-						R63OgPcAndwv6yQOhWNjwDAfBgNVHSMEGDAWgBSSJsuNR63OgPcAndwv6yQOhWNj
-						wDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCfNUSVwmAjZdsH3md3
-						v9cfud8n5gNFKjnB54zZXZsa8inlIQ0pSfqqkxrffCeVlhWiZf9EIL30FDP1M5mX
-						88oj4mNj0hkVtujIFmd4cpf/Kij+96dOVhfXyezsvHFy/exyD94NUdTdrs53uZN/
-						LoeWfZyusHKVAQsa8Rm127ydCiCv+AQkAnYGPHD/DlGKJQ3V6QbZsNe0aEWDTiLE
-						3ZDX+jV9I0pM2AZemD6qlS2x7vxds8V9QI9yA7sFO1Ee/atoLO4R0e2Tqa3zzlqj
-						jzoKTt9nOBpUxTZMlQBNjpQZl6XHSk/dM3ECz+trlYpRcp8wMy9l6bku6zxxS4b1
-						uq1+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://duck-dev.bournemouth.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://duck-dev.bournemouth.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Bournemouth University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bournemouth University_DEV</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bournemouth.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Foy</SurName>
-    <EmailAddress>mailto:mfoy@bournemouth.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Claire</GivenName>
-    <SurName>Wilkinson</SurName>
-    <EmailAddress>mailto:wilkinsonc@bournemouth.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/dun-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/dun-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index d44dec02..00000000
--- a/swamid-interfederations-2.0/dun-shib.hosted.exlibrisgroup.com-shib.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://dun-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "University of Dundee - Primo" Shibboleth SP for Ex Libris (UK) 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-07-24T15:45:02Z">
-      <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://dun-shib.hosted.exlibrisgroup.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://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Dundee - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Dundee</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAJQ23rWbODdWMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMDQwHhcNMTQwNzE4MDkyNTEyWhcNMjQwNzE1MDkyNTEyWjASMRAw
-						DgYDVQQDEwdhaW8wMDA0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						5glgMq+fQ29qwkY7AJ+/uzOPwA1tLN5SptMA6+f0IolQ0HFpxZO8EeRGFCcSzJuA
-						5Hpqu7Nlw3w7Xr168dryTwlbGmk2bEe+kVIyExCSumaJnTDBKkfk2snt88BMyKjZ
-						20v8hgLWCQZRdDFkeNj8WJaaoh2NW2Mj5o/PLStyV5PRvDdd3NY6rwXaeEzU+DBG
-						oDBuyaW+55KCARSRk7G7jkVFpKFhpEfV3ZBoBHv2aK+8goph+1P2C6VvmuR20o91
-						mkw/4/wK/U/2XrQP+Ofjbko/R2/avHDXnURioval7bMqw79Cnoyv0jAlwA4MqRB2
-						x/OeHn0J9A1ThP7xJ6g11wIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDA0MB0G
-						A1UdDgQWBBTAa8dYEU0eoa5tnDvh5Vw1bCHlbTANBgkqhkiG9w0BAQUFAAOCAQEA
-						LLadg5+o6PZfG4zc/sp21OQJqVEg2bWRzvDxH1uWmRomROwoi9rLLU2aTc1JyGxi
-						zeBFZ9eU1zzpehoZU0bXoO6jriAEk+y2iGVNnDbNxFT+ZRnwhqLKXiMcCYsBSUr7
-						m+PE4dX9adMSg6Cbj3qBMeHhf7ldHlpbhl1mWF8gP8B89k0naEkPj++iXVdB8Mfc
-						Ti1c523T/2nNmxXcbV1bTFOTr0HqwqHfVPhaW9FJYhVcJUJbzxSE81NMw+mj1/Wg
-						q4siWF12Yd75zPaunEP9b6LSH9+jslVmnSHpbdS7wLa4wQuKifo6N8PteKoR1Aps
-						rWT//SBgFvxK3ozSue4Nlg==
-					</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://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dun-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Dundee - Primo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Frank</GivenName>
-    <SurName>Bieber</SurName>
-    <EmailAddress>mailto:frank.bieber@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Frank</GivenName>
-    <SurName>Bieber</SurName>
-    <EmailAddress>mailto:frank.bieber@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</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 52a93844..00000000
--- a/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
+++ /dev/null
@@ -1,71 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e-localcourses.unibo.it">
-  <md: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>
-  </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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e-localcourses.unibo.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e-localcourses.unibo.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">&gt;E-LOCAL courses of languages and cultures.</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Language and culture courses of Dutch, Finnish, Hungarian, Italian, Polish and Portuguese.</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="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Bologna</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università di Bologna</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">E-LOCAL courses of languages and cultures provided by University of Bologna</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Corsi E-LOCAL di lingue e culture erogato da Università di Bologna</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unibo.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unibo.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:cesia-sso-support@unibo.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 47b4b667..00000000
--- a/swamid-interfederations-2.0/e5.onthehub.com.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://e5.onthehub.com">
-  <!--
-		This is an "OnTheHub" Shibboleth SP for e-academy Incorporated.
-	-->
-  <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-11-23T17:14:29Z"/>
-  </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://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/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://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <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>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <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>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <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>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/UKFederation/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">e-academy Incorporated</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">e-academy Incorporated: OnTheHub</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.e-academy.com/aboutus.cfm</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Islam</GivenName>
-    <SurName>Gomaa</SurName>
-    <EmailAddress>mailto:ukfederation@e-academy.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Islam</GivenName>
-    <SurName>Gomaa</SurName>
-    <EmailAddress>mailto:ukfederation@e-academy.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eaa.uspnet.usp.br.xml b/swamid-interfederations-2.0/eaa.uspnet.usp.br.xml
deleted file mode 100644
index 7b614703..00000000
--- a/swamid-interfederations-2.0/eaa.uspnet.usp.br.xml
+++ /dev/null
@@ -1,128 +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://eaa.uspnet.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>
-    MIIFUDCCBDigAwIBAgIBADANBgkqhkiG9w0BAQUFADCB0DELMAkGA1UEBhMCQlIx
-EjAQBgNVBAgTCVNBTyBQQVVMTzESMBAGA1UEBxMJU0FPIFBBVUxPMSgwJgYDVQQK
-Ex9VU1AgLSBVTklWRVJTSURBREUgREUgU0FPIFBBVUxPMTcwNQYDVQQLEy5EVEkg
-LSBERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRowGAYD
-VQQDExFlYWEudXNwbmV0LnVzcC5icjEaMBgGCSqGSIb3DQEJARYLc2NudkB1c3Au
-YnIwHhcNMTQwMTA4MjA1MTM2WhcNMTkwMTA3MjA1MTM2WjCB0DELMAkGA1UEBhMC
-QlIxEjAQBgNVBAgTCVNBTyBQQVVMTzESMBAGA1UEBxMJU0FPIFBBVUxPMSgwJgYD
-VQQKEx9VU1AgLSBVTklWRVJTSURBREUgREUgU0FPIFBBVUxPMTcwNQYDVQQLEy5E
-VEkgLSBERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRow
-GAYDVQQDExFlYWEudXNwbmV0LnVzcC5icjEaMBgGCSqGSIb3DQEJARYLc2NudkB1
-c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWXCUZnfhwEAB
-l9fTIXpfs3G50WugLYItPu7Y+cyBrD1h7Pc0vx67bW9ItGrH8BgUlN2yhsBwusCy
-g5Am3TI/LZxH/XAOVzM5OfR1/fjL05X1en1Zy4mKsq2wenR0znP3Q9oedkCAU20A
-tAQKdMJTwSUsx8X23X7NNJqnGFVG4lx93KdLfaPu8pc3UUHx3+58+zqlMWf2H/Li
-6Ze1CnRmpxtprU2k+oMtn5vhtxvql+YECX/WxWNMFX9UyzJ+v5NwzrTdVaveB6sE
-e3FveQGpepjE3RCrnIuuJm1+p/0/X/gp1HgcDMhhmSKfAEd0D8m8Qc243hDiOqNy
-Eu5KR4FlAgMBAAGjggExMIIBLTAdBgNVHQ4EFgQUUmKcxhJ4qlcGtT4Y/ukIZJFM
-rg0wgf0GA1UdIwSB9TCB8oAUUmKcxhJ4qlcGtT4Y/ukIZJFMrg2hgdakgdMwgdAx
-CzAJBgNVBAYTAkJSMRIwEAYDVQQIEwlTQU8gUEFVTE8xEjAQBgNVBAcTCVNBTyBQ
-QVVMTzEoMCYGA1UEChMfVVNQIC0gVU5JVkVSU0lEQURFIERFIFNBTyBQQVVMTzE3
-MDUGA1UECxMuRFRJIC0gREVQQVJUQU1FTlRPIERFIFRFQ05PTE9HSUEgREEgSU5G
-T1JNQUNBTzEaMBgGA1UEAxMRZWFhLnVzcG5ldC51c3AuYnIxGjAYBgkqhkiG9w0B
-CQEWC3NjbnZAdXNwLmJyggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBABk4OvDS2hRXu+70scuElr76/UIa2wtrlhxQ9aQb3kkzUMIS9kP2v1H7zoCN
-0ly3YVqSlsVw952WHAj/zUCF4MOLzfWuxDrnmHv+pMo/SwNOz65UubW7hrKuuIoH
-p15ciTU1G1DbnDESnfINeaQavRPiMdpM/xaJPMN1Ayb86sZDfp6KztPnnV1kgdyB
-n2b98LO6B6/eCLbLp7Iup8bNFy0blqcHEk/fTqpLgqZ8FT4wf2/jwAzDjzUpnxG6
-JT/8mRnRU7dTGydBR17LIjCaLb8K8rtzELHlpDjd9tvRs62dNHc/sK3ySL8pbS12
-IB3h1QTrpxPIrWqLDwiQU9YAbHo=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eaa.uspnet.usp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://eaa.uspnet.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://eaa.uspnet.usp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eaa.uspnet.usp.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://eaa.uspnet.usp.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eaa.uspnet.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>
-      
-MIIFUDCCBDigAwIBAgIBADANBgkqhkiG9w0BAQUFADCB0DELMAkGA1UEBhMCQlIx
-EjAQBgNVBAgTCVNBTyBQQVVMTzESMBAGA1UEBxMJU0FPIFBBVUxPMSgwJgYDVQQK
-Ex9VU1AgLSBVTklWRVJTSURBREUgREUgU0FPIFBBVUxPMTcwNQYDVQQLEy5EVEkg
-LSBERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRowGAYD
-VQQDExFlYWEudXNwbmV0LnVzcC5icjEaMBgGCSqGSIb3DQEJARYLc2NudkB1c3Au
-YnIwHhcNMTQwMTA4MjA1MTM2WhcNMTkwMTA3MjA1MTM2WjCB0DELMAkGA1UEBhMC
-QlIxEjAQBgNVBAgTCVNBTyBQQVVMTzESMBAGA1UEBxMJU0FPIFBBVUxPMSgwJgYD
-VQQKEx9VU1AgLSBVTklWRVJTSURBREUgREUgU0FPIFBBVUxPMTcwNQYDVQQLEy5E
-VEkgLSBERVBBUlRBTUVOVE8gREUgVEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRow
-GAYDVQQDExFlYWEudXNwbmV0LnVzcC5icjEaMBgGCSqGSIb3DQEJARYLc2NudkB1
-c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvWXCUZnfhwEAB
-l9fTIXpfs3G50WugLYItPu7Y+cyBrD1h7Pc0vx67bW9ItGrH8BgUlN2yhsBwusCy
-g5Am3TI/LZxH/XAOVzM5OfR1/fjL05X1en1Zy4mKsq2wenR0znP3Q9oedkCAU20A
-tAQKdMJTwSUsx8X23X7NNJqnGFVG4lx93KdLfaPu8pc3UUHx3+58+zqlMWf2H/Li
-6Ze1CnRmpxtprU2k+oMtn5vhtxvql+YECX/WxWNMFX9UyzJ+v5NwzrTdVaveB6sE
-e3FveQGpepjE3RCrnIuuJm1+p/0/X/gp1HgcDMhhmSKfAEd0D8m8Qc243hDiOqNy
-Eu5KR4FlAgMBAAGjggExMIIBLTAdBgNVHQ4EFgQUUmKcxhJ4qlcGtT4Y/ukIZJFM
-rg0wgf0GA1UdIwSB9TCB8oAUUmKcxhJ4qlcGtT4Y/ukIZJFMrg2hgdakgdMwgdAx
-CzAJBgNVBAYTAkJSMRIwEAYDVQQIEwlTQU8gUEFVTE8xEjAQBgNVBAcTCVNBTyBQ
-QVVMTzEoMCYGA1UEChMfVVNQIC0gVU5JVkVSU0lEQURFIERFIFNBTyBQQVVMTzE3
-MDUGA1UECxMuRFRJIC0gREVQQVJUQU1FTlRPIERFIFRFQ05PTE9HSUEgREEgSU5G
-T1JNQUNBTzEaMBgGA1UEAxMRZWFhLnVzcG5ldC51c3AuYnIxGjAYBgkqhkiG9w0B
-CQEWC3NjbnZAdXNwLmJyggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBABk4OvDS2hRXu+70scuElr76/UIa2wtrlhxQ9aQb3kkzUMIS9kP2v1H7zoCN
-0ly3YVqSlsVw952WHAj/zUCF4MOLzfWuxDrnmHv+pMo/SwNOz65UubW7hrKuuIoH
-p15ciTU1G1DbnDESnfINeaQavRPiMdpM/xaJPMN1Ayb86sZDfp6KztPnnV1kgdyB
-n2b98LO6B6/eCLbLp7Iup8bNFy0blqcHEk/fTqpLgqZ8FT4wf2/jwAzDjzUpnxG6
-JT/8mRnRU7dTGydBR17LIjCaLb8K8rtzELHlpDjd9tvRs62dNHc/sK3ySL8pbS12
-IB3h1QTrpxPIrWqLDwiQU9YAbHo=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eaa.uspnet.usp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://eaa.uspnet.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>Nelson</SurName>
-    <EmailAddress>yunakaof@usp.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eaplab.supplicants.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/eaplab.supplicants.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 641c7b71..00000000
--- a/swamid-interfederations-2.0/eaplab.supplicants.net-simplesaml-module.php-saml-sp-metadata.php-default-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://eaplab.supplicants.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-03-27T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GÉANT EAPlab</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-    Virtual laboratory for testing EAP supplicants in a variaty of configuration scenarios
-    </mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://eaplab.supplicants.net/index.php?page=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>MIIDtTCCAp2gAwIBAgIJANSbV5jQjkoBMA0GCSqGSIb3DQEBCwUAMHExCzAJBgNVBAYTAlBMMRAwDgYDVQQIDAdrdWotcG9tMQ4wDAYDVQQHDAVUb3J1bjEOMAwGA1UECgwFU0VOU0UxDzANBgNVBAsMBkVBUExhYjEfMB0GA1UEAwwWZWFwbGFiLnN1cHBsaWNhbnRzLm5ldDAeFw0xNTAzMDkxMTQ4NDFaFw0yMDAzMDcxMTQ4NDFaMHExCzAJBgNVBAYTAlBMMRAwDgYDVQQIDAdrdWotcG9tMQ4wDAYDVQQHDAVUb3J1bjEOMAwGA1UECgwFU0VOU0UxDzANBgNVBAsMBkVBUExhYjEfMB0GA1UEAwwWZWFwbGFiLnN1cHBsaWNhbnRzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSziCe4UVBi1L/DBqo7x83PAC/eCAboa+my2Fv1Z3ulrleXysGPEP82OVIpUay0dF1xZuEALBNiNM2EMRGNtCx2Yv0JklOm6AsUkhiI+2UfS5TgKZAeatrpDB47MRu3doXwVhTxsyB+NgmFdHY/I+S4vgwZj4DizxSY1X04kYeiVYVBj3AdMdavzbIXpAfmcZpAY7SvjIbRKD/1AiK/IwpdPWfgs+FD+39rpOuJB0bVLMqf3pAAA7n++rSJ5/LdT1u7NqbrsQXS8NuTpKYSKC0QyKA0h0zTb1Dj58wVZY8wzbjtMlTZ1/azUq7zC4q9NCy/QpyrRmkcQggFfEhGIIECAwEAAaNQME4wHQYDVR0OBBYEFJj7WY7HXMIkhRgib0Jui4g/q/UUMB8GA1UdIwQYMBaAFJj7WY7HXMIkhRgib0Jui4g/q/UUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADs9vkmPnSQM1J/CNbRhpgYfMwX8G+UdACFTFjDzbLl6s0XgVG+lOImHwZBldeOi8JjywFhz9LgfeMnKC4oPiO1hM5ZlzCm5Ce1n40knqL7iISCqa7T0MA/ymLHSbuDBjSmQa1uHCtCvOq/d+aERSLEC14Ih2XUj7WDDLcsO9pCyPn/OLEzhBRgOposeLwXZv+e4nFAGq0LhWSUtIUjZ+UtvzxLuedzbsOJvx4Ats2Y3UtSK8qTEEoB1GeNk6r7zRRidQdAuwDJpRgiC7uIIeaUw0crGYpGyMkrk4D9tUkylcHNoi+kan4Sg4pMEBuRHDBRPvvugEO5S7hxGWVAqm8A=</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>MIIDtTCCAp2gAwIBAgIJANSbV5jQjkoBMA0GCSqGSIb3DQEBCwUAMHExCzAJBgNVBAYTAlBMMRAwDgYDVQQIDAdrdWotcG9tMQ4wDAYDVQQHDAVUb3J1bjEOMAwGA1UECgwFU0VOU0UxDzANBgNVBAsMBkVBUExhYjEfMB0GA1UEAwwWZWFwbGFiLnN1cHBsaWNhbnRzLm5ldDAeFw0xNTAzMDkxMTQ4NDFaFw0yMDAzMDcxMTQ4NDFaMHExCzAJBgNVBAYTAlBMMRAwDgYDVQQIDAdrdWotcG9tMQ4wDAYDVQQHDAVUb3J1bjEOMAwGA1UECgwFU0VOU0UxDzANBgNVBAsMBkVBUExhYjEfMB0GA1UEAwwWZWFwbGFiLnN1cHBsaWNhbnRzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSziCe4UVBi1L/DBqo7x83PAC/eCAboa+my2Fv1Z3ulrleXysGPEP82OVIpUay0dF1xZuEALBNiNM2EMRGNtCx2Yv0JklOm6AsUkhiI+2UfS5TgKZAeatrpDB47MRu3doXwVhTxsyB+NgmFdHY/I+S4vgwZj4DizxSY1X04kYeiVYVBj3AdMdavzbIXpAfmcZpAY7SvjIbRKD/1AiK/IwpdPWfgs+FD+39rpOuJB0bVLMqf3pAAA7n++rSJ5/LdT1u7NqbrsQXS8NuTpKYSKC0QyKA0h0zTb1Dj58wVZY8wzbjtMlTZ1/azUq7zC4q9NCy/QpyrRmkcQggFfEhGIIECAwEAAaNQME4wHQYDVR0OBBYEFJj7WY7HXMIkhRgib0Jui4g/q/UUMB8GA1UdIwQYMBaAFJj7WY7HXMIkhRgib0Jui4g/q/UUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADs9vkmPnSQM1J/CNbRhpgYfMwX8G+UdACFTFjDzbLl6s0XgVG+lOImHwZBldeOi8JjywFhz9LgfeMnKC4oPiO1hM5ZlzCm5Ce1n40knqL7iISCqa7T0MA/ymLHSbuDBjSmQa1uHCtCvOq/d+aERSLEC14Ih2XUj7WDDLcsO9pCyPn/OLEzhBRgOposeLwXZv+e4nFAGq0LhWSUtIUjZ+UtvzxLuedzbsOJvx4Ats2Y3UtSK8qTEEoB1GeNk6r7zRRidQdAuwDJpRgiC7uIIeaUw0crGYpGyMkrk4D9tUkylcHNoi+kan4Sg4pMEBuRHDBRPvvugEO5S7hxGWVAqm8A=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eaplab.supplicants.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://eaplab.supplicants.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://eaplab.supplicants.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://eaplab.supplicants.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://eaplab.supplicants.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">GÉANT EAPlab</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">
-    Virtual laboratory for testing EAP supplicants in a variaty of configuration scenarios
-      </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GÉANT Association</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GÉANT Association</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.geant.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tomasz</md:GivenName>
-    <md:SurName>Wolniwicz</md:SurName>
-    <md:EmailAddress>mailto:twoln@umk.pl</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 9356cecf..00000000
--- a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml
+++ /dev/null
@@ -1,88 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://earthserver-sg.consorzio-cometa.it/shibboleth">
-  <md: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>
-  </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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDwjCCAqoCCQDOuURFUMCewDANBgkqhkiG9w0BAQsFADCBojELMAkGA1UEBhMC
-SVQxDzANBgNVBAgMBlNpY2lseTEQMA4GA1UEBwwHQ2F0YW5pYTEZMBcGA1UECgwQ
-Q29uc29yemlvIENPTUVUQTErMCkGA1UEAwwiZWFydGhzZXJ2ZXItc2cuY29uc29y
-emlvLWNvbWV0YS5pdDEoMCYGCSqGSIb3DQEJARYZbWFyY28uZmFyZ2V0dGFAY3Qu
-aW5mbi5pdDAeFw0xNjAyMTAxMTU3MThaFw00NjAyMDIxMTU3MThaMIGiMQswCQYD
-VQQGEwJJVDEPMA0GA1UECAwGU2ljaWx5MRAwDgYDVQQHDAdDYXRhbmlhMRkwFwYD
-VQQKDBBDb25zb3J6aW8gQ09NRVRBMSswKQYDVQQDDCJlYXJ0aHNlcnZlci1zZy5j
-b25zb3J6aW8tY29tZXRhLml0MSgwJgYJKoZIhvcNAQkBFhltYXJjby5mYXJnZXR0
-YUBjdC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr5Vu
-M43lwYixVhJN8HXJwit3CmZT3FBkChFfu0tMQLlnTorEmpUpoFcPqh/hOmCji/Jb
-FQHlANY2SW24uZadJZbvOt0qpTmieBjKq45t61TGMn55qaTEkUDSJsEJOcuTH1MG
-kKPCanD2805lv6Sr/krhO1uJDMClH23wbF1s496UXn83ibnR9P3/ID+dqEJeZCYO
-vTc0i0v+Yv6VtHc9LfUYFkGFnnv9pIE8Y8MgDGuFUiHYss5Lh5zVqV/5V6Bh8MPg
-rg3+ii8k/tJI7nM/+IYdLfI8NqYIM5tfCdYc4ldCz299AHSOKM2taD8EeaKKSxWS
-4RCF4cEy4P6e4P9WawIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAlj/UvpjlrAu55
-PDFriEg5GTwcR9BQZ1RH7v6ea2VoGVyFVPB4UBpASGCp0t49LcfWMVNZBVm5aiFY
-WOrR3aVjaqgO3PusTcyG7Rc4wG+S0vm+vSOiBOt+f8Q4dDOBHiyQijNnTr/gfJak
-ZbOhLYOF/zsQz3BA1YR8gUP1JTAFCWWsUEOeiTQZV72fmnYCH0dD2pOH4UYmDEpf
-Jf5qMf2rWBWH12tA4OWB9K4mCxMreJXVLkVRZeBoUhsHPUw5dFjygxjltAjxwJzr
-+IKYqNdLx4qoYjhmMQA9tl71wtO30StilfIjD+Oun0FONKJs2SRSAGJbeardLJZ8
-6JqVlaVd
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">EarthServer Science Gateway</md:ServiceName>
-      <md: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.</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consorzio COMETA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Earth Server Science Gateway provided by Consorzio COMETA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Earth Server Science Gateway erogato da Consorzio COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/en/home</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Bruno</md:SurName>
-    <md:EmailAddress>mailto:riccardo.bruno@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 74b03511..00000000
--- a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml
+++ /dev/null
@@ -1,118 +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://earthserver-sg.consorzio-cometa.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-10T09:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-      <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: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://earthserver-sg.consorzio-cometa.it/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://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
-        <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
-        <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
-        <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>klios.ct.infn.it</ds:KeyName>
-        <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
-        <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
-        <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
-          <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">EarthServer Science Gateway</md:ServiceName>
-      <md: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.
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Bruno</md:SurName>
-    <md:EmailAddress>mailto:riccardo.bruno@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 4fedbd37..00000000
--- a/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://easydb.geschkult.fu-berlin.de/shibboleth">
-  <md: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>
-  </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="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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <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>MIIGJTCCBQ2gAwIBAgIHGPlbfiq0XjANBgkqhkiG9w0BAQsFADCBtTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
-ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
-A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTUwMjEwMTAzMTEwWhcN
-MTkwNzA5MjM1OTAwWjCBtjELMAkGA1UEBhMCREUxDzANBgNVBAgMBkJlcmxpbjEP
-MA0GA1UEBwwGQmVybGluMSIwIAYDVQQKDBlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLDDBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xJjAkBgNVBAMMHWVhc3lkYi5nZXNjaGt1bHQuZnUtYmVy
-bGluLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApP7F9ySZ1qMs
-Pm1YPt3amWqd9NpjBxQdGSvWW8s5YO5yc/zM7K6s6jp71J9BEq6gQbCOb1J1Rkwu
-ANyZIbKF9YPzKixntzebSUt228zxCZmBL2zSvIVBOKxX0SXoRc3te93w4yhd1wK0
-zIkN/r4r7sCEbM7GUScLVnwn6vgVT0amPJ973sd1NEpkFiDqgvnOp9MbVRmejlVy
-OIcgeWBO7k+kR6wk8pZKhHv1EeUSI0MdN5NcuhcHLJqlTCS9mtao5wjHbKqOrsZq
-3+2BhAK+YsmU8kBAEWTJuGL295e0JUHg+n13/9TApNFckOgezXF3LTrQuht0aV8c
-AqYhXz7W6wIDAQABo4ICNTCCAjEwTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEE
-AwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
-rSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTDwIXCByjCQwen9jTvzxD9U2HzlTAfBgNV
-HSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDAoBgNVHREEITAfgh1lYXN5ZGIu
-Z2VzY2hrdWx0LmZ1LWJlcmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5o
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHF
-BggrBgEFBQcBAQSBuDCBtTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRm
-bi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD4GCCsGAQUFBzAChjJodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2Z1LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA+BggrBgEFBQcw
-AoYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQELBQADggEBADkcodl3suRysfy0lAGAsrejt9OLVH6A
-NRVH8n4eYS4q9TfhvkV1OCsaFMnsoBZzWwZK+kJ35IkNnBPhXGmsrm4CWaqZmEXe
-xPYcmvHkqSm+NHd45AFbGvVSXTCHJyMJwfcP9Y++0fiMZTFMS94Zm5Tnuopzul1d
-VL+IhzvGNQ+/UP7+b1LermUxrpj06jsbOdEK6invAoAnqMqXkXDmG1owA1cRPCY9
-tOE4g/hlvLMgOQ3413fJ/GR/R7RwYKuP/EFayaeZrt0cGZuRfCp7SJVLmMb48GBP
-VlBXGupf8n951icED+IDh47RglDOnvS8DpOvHDtysd/ctiSwZ8vJCOQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Artifact"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</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://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">EasyDB (Digitale Diathek) an der FU Berlin</md:ServiceName>
-      <md:ServiceName xml:lang="en">EasyDB (Digitale Diathek) an der FU Berlin</md:ServiceName>
-      <md: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.</md:ServiceDescription>
-      <md: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.</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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e5</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e5</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Freie Universität Berlin</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Freie Universität Berlin</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">https://identity.fu-berlin.de/idp-fub/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://identity.fu-berlin.de/idp-fub/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Funktionsadresse</md:GivenName>
-    <md:SurName>IT des Fachbereichs Geschichts- und Kulturwissenschaften</md:SurName>
-    <md:EmailAddress>mailto:servermaster@geschkult.fu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Funktionsadresse</md:GivenName>
-    <md:SurName>IT-Support des Fachbereichs Geschichts- und Kulturwissenschaften</md:SurName>
-    <md:EmailAddress>mailto:support@geschkult.fu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ec1.educationcity.com-sso-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/ec1.educationcity.com-sso-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 8e29c3cb..00000000
--- a/swamid-interfederations-2.0/ec1.educationcity.com-sso-module.php-saml-sp-metadata.php-default-sp.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://ec1.educationcity.com/sso/module.php/saml/sp/metadata.php/default-sp">
-  <!--
-		This is a simpleSAMLphp SP for EducationCity Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-20T14:23:02Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEPTCCAyWgAwIBAgIJAIjiPhX9pD21MA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
-						VQQGEwJHQjEQMA4GA1UECAwHUnV0bGFuZDEPMA0GA1UEBwwGT2FraGFtMRswGQYD
-						VQQKDBJFZHVjYXRpb24gQ2l0eSBMdGQxEDAOBgNVBAsMB0lUIERlcHQxHjAcBgNV
-						BAMMFWVjMS5lZHVjYXRpb25jaXR5LmNvbTEzMDEGCSqGSIb3DQEJARYkRUMuVUsu
-						SVQuTGludXhUZWFtQEVkdWNhdGlvbkNpdHkuY29tMB4XDTE0MDgxOTA5NDA0M1oX
-						DTI0MDgxODA5NDA0M1owgbQxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdSdXRsYW5k
-						MQ8wDQYDVQQHDAZPYWtoYW0xGzAZBgNVBAoMEkVkdWNhdGlvbiBDaXR5IEx0ZDEQ
-						MA4GA1UECwwHSVQgRGVwdDEeMBwGA1UEAwwVZWMxLmVkdWNhdGlvbmNpdHkuY29t
-						MTMwMQYJKoZIhvcNAQkBFiRFQy5VSy5JVC5MaW51eFRlYW1ARWR1Y2F0aW9uQ2l0
-						eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5QxN9XYDVZTK0
-						usU9h6obEuliBKYsE/qLoqFMsw0dco3OrsVJ3f9Pqi2a+CU3Y79QhvTlXZ+vnDbA
-						tJJpuJeMWv2H+WIA7xg8n0fB06WptCyNTrJGLVbJV067y+ZVWccSHe79j61MSnT2
-						5LGIVDOnk+tPn7GY6oi2ZTtYxblyzwkyILZwibzr7qL8eBSTq280MfKIh7HVBHXu
-						w1B37r/xEx+WbCUh0jmMDOhbiqX55RFMJ3/QUyZ5MVbboBGeYPcFoYuUg7gpYdJ5
-						pLmZ4Nh+7r6w1if5vEkBpxFKoK2xBHjbkb8bm+GBVqsoGJSvUi0++YwtvzamoItT
-						NiKowoApAgMBAAGjUDBOMB0GA1UdDgQWBBT9bgLO7VbORM8dToe750exXs6tkzAf
-						BgNVHSMEGDAWgBT9bgLO7VbORM8dToe750exXs6tkzAMBgNVHRMEBTADAQH/MA0G
-						CSqGSIb3DQEBBQUAA4IBAQBTkg85PXmm+DmjVDQdiF8zqqOn8L4sdM+4Xsc07e9/
-						PyKEgwB3sHIJXG7epi8TreT8tMx0Z00tQ/GyAlk9lWBlhq1ZGkbDxda9M8qavDWY
-						OomRV6hd2tV4Gkz008oGhfY50f0Kc1zH0IBiirUV0UUk0tMgWCZS4xMUeIClFD0L
-						RFZyAKocyTEPKFZQ4Por2e2Bjt/2YP62oJWzCTtFQU2PPtaLvSiMjq7V5WQxuIkc
-						VWHrGzZgfMi1jKdxwyJ8oYZr7rpKviXgjOzQlEkUt2ncrEY75PMHk+bWjbNqNPds
-						jpTxJAAZ5N53YVB4oS8yLRl13dJv1rY522iqlxTkvBz0
-					</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>
-						MIIEPTCCAyWgAwIBAgIJAIjiPhX9pD21MA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
-						VQQGEwJHQjEQMA4GA1UECAwHUnV0bGFuZDEPMA0GA1UEBwwGT2FraGFtMRswGQYD
-						VQQKDBJFZHVjYXRpb24gQ2l0eSBMdGQxEDAOBgNVBAsMB0lUIERlcHQxHjAcBgNV
-						BAMMFWVjMS5lZHVjYXRpb25jaXR5LmNvbTEzMDEGCSqGSIb3DQEJARYkRUMuVUsu
-						SVQuTGludXhUZWFtQEVkdWNhdGlvbkNpdHkuY29tMB4XDTE0MDgxOTA5NDA0M1oX
-						DTI0MDgxODA5NDA0M1owgbQxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdSdXRsYW5k
-						MQ8wDQYDVQQHDAZPYWtoYW0xGzAZBgNVBAoMEkVkdWNhdGlvbiBDaXR5IEx0ZDEQ
-						MA4GA1UECwwHSVQgRGVwdDEeMBwGA1UEAwwVZWMxLmVkdWNhdGlvbmNpdHkuY29t
-						MTMwMQYJKoZIhvcNAQkBFiRFQy5VSy5JVC5MaW51eFRlYW1ARWR1Y2F0aW9uQ2l0
-						eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5QxN9XYDVZTK0
-						usU9h6obEuliBKYsE/qLoqFMsw0dco3OrsVJ3f9Pqi2a+CU3Y79QhvTlXZ+vnDbA
-						tJJpuJeMWv2H+WIA7xg8n0fB06WptCyNTrJGLVbJV067y+ZVWccSHe79j61MSnT2
-						5LGIVDOnk+tPn7GY6oi2ZTtYxblyzwkyILZwibzr7qL8eBSTq280MfKIh7HVBHXu
-						w1B37r/xEx+WbCUh0jmMDOhbiqX55RFMJ3/QUyZ5MVbboBGeYPcFoYuUg7gpYdJ5
-						pLmZ4Nh+7r6w1if5vEkBpxFKoK2xBHjbkb8bm+GBVqsoGJSvUi0++YwtvzamoItT
-						NiKowoApAgMBAAGjUDBOMB0GA1UdDgQWBBT9bgLO7VbORM8dToe750exXs6tkzAf
-						BgNVHSMEGDAWgBT9bgLO7VbORM8dToe750exXs6tkzAMBgNVHRMEBTADAQH/MA0G
-						CSqGSIb3DQEBBQUAA4IBAQBTkg85PXmm+DmjVDQdiF8zqqOn8L4sdM+4Xsc07e9/
-						PyKEgwB3sHIJXG7epi8TreT8tMx0Z00tQ/GyAlk9lWBlhq1ZGkbDxda9M8qavDWY
-						OomRV6hd2tV4Gkz008oGhfY50f0Kc1zH0IBiirUV0UUk0tMgWCZS4xMUeIClFD0L
-						RFZyAKocyTEPKFZQ4Por2e2Bjt/2YP62oJWzCTtFQU2PPtaLvSiMjq7V5WQxuIkc
-						VWHrGzZgfMi1jKdxwyJ8oYZr7rpKviXgjOzQlEkUt2ncrEY75PMHk+bWjbNqNPds
-						jpTxJAAZ5N53YVB4oS8yLRl13dJv1rY522iqlxTkvBz0
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ec1.educationcity.com/sso/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ec1.educationcity.com/sso/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://ec1.educationcity.com/sso/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://ec1.educationcity.com/sso/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://ec1.educationcity.com/sso/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">EducationCity Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EducationCity</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.educationcity.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Customer Support</GivenName>
-    <EmailAddress>mailto:support@educationcity.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>EdCity Systems Team</GivenName>
-    <EmailAddress>mailto:InternalSystems@educationcity.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eco2meter.grnet.gr-shibboleth.xml b/swamid-interfederations-2.0/eco2meter.grnet.gr-shibboleth.xml
deleted file mode 100644
index 2bad258d..00000000
--- a/swamid-interfederations-2.0/eco2meter.grnet.gr-shibboleth.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eco2meter.grnet.gr/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">GHG report tool</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GHG online reporting tool</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://eco2meter.grnet.gr/about/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://eco2meter.grnet.gr/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="64" width="250" xml:lang="en">https://eco2meter.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://eco2meter.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://eco2meter.grnet.gr/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eco2meter.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://eco2meter.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="en">GHG report tool</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">GHG online reporting tool</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="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"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md: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"/>
-      <md:RequestedAttribute FriendlyName="shacHomeOrganization" Name="urn:mace:terena.org:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Greek Research and Technology Network</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-    <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>Vasiliki Giannikopoulou</md:GivenName>
-    <md:EmailAddress>vasilg@admin.grnet.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Vasiliki Giannikopoulou</md:GivenName>
-    <md:EmailAddress>vasilg@admin.grnet.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 3ae482de..00000000
--- a/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml
+++ /dev/null
@@ -1,92 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ecsg.dch-rp.eu/shibboleth">
-  <md: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>
-  </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">
-                        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://ecsg.dch-rp.eu/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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDmjCCAoICCQDgPftvWW8OQDANBgkqhkiG9w0BAQsFADCBjjELMAkGA1UEBhMC
-SVQxDzANBgNVBAgMBlNpY2lseTEQMA4GA1UEBwwHQ2F0YW5pYTEZMBcGA1UECgwQ
-Q29uc29yemlvIENPTUVUQTEXMBUGA1UEAwwOZWNzZy5kY2gtcnAuZXUxKDAmBgkq
-hkiG9w0BCQEWGW1hcmNvLmZhcmdldHRhQGN0LmluZm4uaXQwHhcNMTYwMjEwMTE1
-OTIzWhcNNDYwMjAyMTE1OTIzWjCBjjELMAkGA1UEBhMCSVQxDzANBgNVBAgMBlNp
-Y2lseTEQMA4GA1UEBwwHQ2F0YW5pYTEZMBcGA1UECgwQQ29uc29yemlvIENPTUVU
-QTEXMBUGA1UEAwwOZWNzZy5kY2gtcnAuZXUxKDAmBgkqhkiG9w0BCQEWGW1hcmNv
-LmZhcmdldHRhQGN0LmluZm4uaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDIGc2CbPsWWTRO10ocj80kmGgG6LyB1hRwtw9qnw1aAD9S47WlwsYK4mZk
-25YGuUCZB05eRpc0xqhGcpzW7BKp6UDZtautsb9CrQENtPn9EUA1boferS5xO3KV
-fVZB9/dgV1NpQfn4rGrpQKTRzhHTSBimD+IiFxPYd2G2tNjUXuPVsAQ1r69cDfat
-Hq9gA1/Nfyy4I+ONRUfagncsobp3tR1sKWuExAy66ifeIDMb5SP4Z2Jxd6/NIMUb
-YptcHI3xopV13zJluiFJA41xLWgyH6f0WeZDmcI1paoLzrgXa3KOdPrICPnOxnZ+
-IJBV5K+RAIOgxRm5PT6Ip610kJH5AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFTI
-CSfKBVmhn3jFM2oI/i31AoBqIQ3Sj0x8aiW69Bd4gLKliS70ldN/mAxKJiamAa8/
-x4FrNcqM6IkFepZFOhc9xwGdwPLvpuY7JsJFAiMgqz21XLkoQPS3MOU+biIUiv1t
-zD4nUF3bC79ZoJUyoUXXs5/KlJoiahILzEpH2Czyk9Teo6seWiJ5ylneG6TGW4OE
-mek7II2Phij/cAQ2qJp3IvEbz4PDhDulL8p9AIs/MbyqZpqTtkni/k/stPvx+Rgx
-ZYCBmD9Uk/DCb6YiLrHtA/5RaWibviwBVWYiw6qEClbb6fTo65nNyaXuPy4Urys/
-9gDYtmUJyWOvX6N76rU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">e-Culture Science Gateway</md:ServiceName>
-      <md: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.
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 5a9d82db..00000000
--- a/swamid-interfederations-2.0/ecsg.dch-rp.eu.xml
+++ /dev/null
@@ -1,114 +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://ecsg.dch-rp.eu/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-06-10T11:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-      <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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/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://ecsg.dch-rp.eu/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
-        <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
-        <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
-        <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>klios.ct.infn.it</ds:KeyName>
-        <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
-        <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
-        <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
-          <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">e-Culture Science Gateway</md:ServiceName>
-      <md: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.
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ed.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ed.unidesk.ac.uk-shibboleth.xml
deleted file mode 100644
index 952dc820..00000000
--- a/swamid-interfederations-2.0/ed.unidesk.ac.uk-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://ed.unidesk.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "Unidesk" 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-05-29T17:06:06Z">
-      <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://ed.unidesk.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAPHsl6kKrFrnMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEmxpdmUudW5pZGVzay5hYy51azAeFw0xMjA0MTExNDU4MjhaFw0yMjA0MDkx
-						NDU4MjhaMB0xGzAZBgNVBAMTEmxpdmUudW5pZGVzay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAL9qh/Dehm5jJdWdeFPNKqcjMdiqii8Iz9Rc
-						tCAsEwRsYww4EQDG7MxG5hg4NSS+iIPFCp9gR+G7hTnZAMGgNpxs2vk4vs9lmhRY
-						GmB7Y1NFloP9Pcsu+MaufaLzxi6bzIXV4dBVHqVnIcgxchDIsXmPE6xlq4poEq+q
-						XJ3aFE/eWwxfwN9z0s5yeICzsil73xk9T9NLeNAeYq+jfVTcdqDbBHY6eHtMOYh/
-						uPVYYxkKXjkgSH5cwG0b+7qN4z+uzKDNBXxnI1Nz+bLOazXW6ljQIDtAPQZMJSlr
-						3OepVaQS+fMBi0Sku5yvADgINdXxkz6H4Zx4pZg/rTQBQ/8u2esCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISbGl2ZS51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBQ2tPlzxC8e
-						akC2nh9qrG4TWfI3tzANBgkqhkiG9w0BAQUFAAOCAQEAWPY3Nv9ChZ+4XVNANhLq
-						fGF7SbiPmUNj9vWGNjCp8Ma0tdDOZPvqBRzxKkkR+LS+fHpSQQ54RuNeZrulWBiN
-						akZe3LZiSH9AHG2uD0lDuxr0UQt1AHGDiLjFXuRg9+CdqqrdT3Anmy6exDDfRsjH
-						k+ZJflkEtqTNd0dbEVlkYlg8Baqx/ZMOxkccx8PtQt1yptAMsH4Rn92vXLd9d3JM
-						H1mrFuiriqrgsAfVLmzc4WeGmB+dK01cSB+CY7hKnoe7ds1y7kNhOmZ9HP3Iy7ev
-						gF2RCdnqkP9zScihW4b20PlVa/sWMUyCj2uZE1lSO51PJcGVU0H/JFrBEpaM7u6t
-						jg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ed.unidesk.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: Unidesk - University of Edinburgh</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Helpdesk</GivenName>
-    <EmailAddress>mailto:IS.Helpdesk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</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 ca2a7156..00000000
--- a/swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml
+++ /dev/null
@@ -1,124 +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>
-    <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/sp-group/aa.cesnet.cz</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>
-      <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET, a. l. e.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET, z. s. p. o.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ivan</md:GivenName>
-    <md:SurName>Novakov</md:SurName>
-    <md:EmailAddress>novakoi@fel.cvut.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edev.cesnet.cz.xml b/swamid-interfederations-2.0/edev.cesnet.cz.xml
deleted file mode 100644
index 8f479004..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">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://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/edgehill.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/edgehill.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index c34930b6..00000000
--- a/swamid-interfederations-2.0/edgehill.idm.oclc.org-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://edgehill.idm.oclc.org/shibboleth">
-  <!--
-		This is a "Edge Hill University" EZProxy SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-30T12:39:06Z">
-      <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 ">
-    <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://login.edgehill.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIECDCCAvCgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBlMSAwHgYDVQQDFBcqLmVk
-						Z2VoaWxsLmlkbS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMx
-						JTAjBgkqhkiG9w0BCQEWFmNhcmwucHJlbnRpY2VAb2NsYy5vcmcwHhcNMTUwMzI3
-						MTA0MzEyWhcNMjUwMzI2MTA0MzEyWjBlMSAwHgYDVQQDFBcqLmVkZ2VoaWxsLmlk
-						bS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxJTAjBgkqhkiG
-						9w0BCQEWFmNhcmwucHJlbnRpY2VAb2NsYy5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQC9XWwlM5l+FA3Szp7cK4n+ITQL+WzqcL3/c0G7RqQ4Tyiz
-						Moe/MLZBw/szuz+ZjeydXwfwnzRZSPtEirT2JnsgBWvB4KgzU6CRImOp8D7x3R3f
-						zjpH8rkbtAFRVAhUm1Pc3OWqBGem1NZ2nTLjnNKpboe+w4JZK9/8nD7Mlc4MVpsw
-						P85Vk25HHlESlHGvLrv4VM8k3TAPuBfRmnnEP5BEnVq1DRaPMjnhfHkdemKXlRhD
-						Fy5HrcklKT5hF0WZgh9kvBAqzQKm+K4hZEk4b5SvkPB/rxWQn9Ph6+IxyKBhExB8
-						m+Mo3NVP6B6JdMVMhQHH85jabI2dCffzuArWr0GjAgMBAAGjgcIwgb8wHQYDVR0O
-						BBYEFIDfx+TCvcdb9L8eeMTtMOGzyXTzMIGPBgNVHSMEgYcwgYSAFIDfx+TCvcdb
-						9L8eeMTtMOGzyXTzoWmkZzBlMSAwHgYDVQQDFBcqLmVkZ2VoaWxsLmlkbS5vY2xj
-						Lm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxJTAjBgkqhkiG9w0BCQEW
-						FmNhcmwucHJlbnRpY2VAb2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG
-						9w0BAQUFAAOCAQEALeqmiNGUZMU3dXyZfwbf6cAsHlFLaaGt/0SOR8HRHj6mWrBZ
-						f6wUeeDCqjHca+hzmeYzdfs74sDtN93QJnT7uKTW6d2wILwEALQHFmQg8IttKiE6
-						VlYllB4h/Ji80qu9yoNjsKlyKNsf1gvaB0m21DlMCiLH2ko6GjZnXAvTxmaZ3TDy
-						cXULLz3O8+6sQGeNDNPqveWCH7LaWcu0Ir86vgbB7kLxq4R6WeOUnrX0Z4O2yjzu
-						wuNMTpknM93KKLmgUBIgLViCcmLnYd1s/jXGB+67/MRfHZDCTKHXPQ6IeKoMLgtU
-						P3oaxQuVKH67V9gN9dXAVYslrL5acjgqie9w/w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.edgehill.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.edgehill.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.edgehill.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.edgehill.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Edge Hill University Hosted EZProxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edi.izum.si-idp-20100722.xml b/swamid-interfederations-2.0/edi.izum.si-idp-20100722.xml
deleted file mode 100644
index db5c23bd..00000000
--- a/swamid-interfederations-2.0/edi.izum.si-idp-20100722.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://edi.izum.si/idp/20100722">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-01-12T12:01:09Z">
-      <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 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">izum.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sik.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IZUM</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">IZUM</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization IZUM</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije IZUM</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization IZUM</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije IZUM</mdui:Keywords>
-        <mdui:Logo height="200" width="200">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.izum.si/default-EN.htm</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.izum.si</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.izum.si/default-EN.htm</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sl">http://www.izum.si</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>MIID4TCCAsmgAwIBAgIJANg99sGGg9KKMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYDVQQGEwJTSTESMBAGA1UECAwJU2xvdmVuaWphMRAwDgYDVQQHDAdNYXJpYm9yMQ0wCwYDVQQKDARJWlVNMQwwCgYDVQQLDANzcG8xFDASBgNVBAMMC2VkaS5penVtLnNpMR4wHAYJKoZIhvcNAQkBFg9wb2Rwb3JhQGl6dW0uc2kwHhcNMTYwMTA4MTE0MjMxWhcNMjYwMTA3MTE0MjMxWjCBhjELMAkGA1UEBhMCU0kxEjAQBgNVBAgMCVNsb3ZlbmlqYTEQMA4GA1UEBwwHTWFyaWJvcjENMAsGA1UECgwESVpVTTEMMAoGA1UECwwDc3BvMRQwEgYDVQQDDAtlZGkuaXp1bS5zaTEeMBwGCSqGSIb3DQEJARYPcG9kcG9yYUBpenVtLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvRufo2z38T1xmM6klDrohG0PPwSR9OvAnz2VKtQYf4cdY/NcAKY0m4nbzmG5kPI2Pw9kxWKh0QXSxjhTFJRxhJm7pGT85Mtkxw+cyhj/ddryA1zw4dS0iZr3rlf4NvoTQBwhlrSkCI4L5vSyIGd9URXh4CIzMB5oAmlY1Rv/BYKr93bA+Tj3EhHkDVD2KI4aJHjSbBAdPvSa1o1qcp9fsI1yya76nhYhJFR+TTWfwgeNTgocduGbAZm4cSv6plJWjfzh1fenf5ObIlM7EDXnovqsqDBjrCdgZpbXwemZRKtW5YwSXXZ7Wrzy8Dei8qX6Sf8qAct8S3LMlNz5z5xR1wIDAQABo1AwTjAdBgNVHQ4EFgQUzpk5DVIfxT76tAIrlNbSoAAjdvMwHwYDVR0jBBgwFoAUzpk5DVIfxT76tAIrlNbSoAAjdvMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAmq+3WprNpSFXUADLia1CdX3XzXC5IphBx7enkuXRUP21KTH/yIIICoN4Okeo5m12QJQ7cg1SE8XCqK06qoNNzTztaCacP2DLCPUPVKBQE1edpWUwHtio3earCvL2F2sgf3IJVZkusLkYgfh0sD372u6bTQjNMn9cm4Gpt0y8F3KEB/Zfmgz0+G9N1O4hfE+jONEmY1yYdMcrWsTcir2zO/BzYHu7v34hKU31vmbQjU2pX6YqnBdaWFyGaM4uQ43zCPzBO1PA6f5K6MItmbn5+zFGKTx19F9GmzgHjH4yoMfiHoycUb7/sZ+MBroWyP+JhlYBncdcSsLlCH9qlrdj0A==</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>MIID4TCCAsmgAwIBAgIJANg99sGGg9KKMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYDVQQGEwJTSTESMBAGA1UECAwJU2xvdmVuaWphMRAwDgYDVQQHDAdNYXJpYm9yMQ0wCwYDVQQKDARJWlVNMQwwCgYDVQQLDANzcG8xFDASBgNVBAMMC2VkaS5penVtLnNpMR4wHAYJKoZIhvcNAQkBFg9wb2Rwb3JhQGl6dW0uc2kwHhcNMTYwMTA4MTE0MjMxWhcNMjYwMTA3MTE0MjMxWjCBhjELMAkGA1UEBhMCU0kxEjAQBgNVBAgMCVNsb3ZlbmlqYTEQMA4GA1UEBwwHTWFyaWJvcjENMAsGA1UECgwESVpVTTEMMAoGA1UECwwDc3BvMRQwEgYDVQQDDAtlZGkuaXp1bS5zaTEeMBwGCSqGSIb3DQEJARYPcG9kcG9yYUBpenVtLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvRufo2z38T1xmM6klDrohG0PPwSR9OvAnz2VKtQYf4cdY/NcAKY0m4nbzmG5kPI2Pw9kxWKh0QXSxjhTFJRxhJm7pGT85Mtkxw+cyhj/ddryA1zw4dS0iZr3rlf4NvoTQBwhlrSkCI4L5vSyIGd9URXh4CIzMB5oAmlY1Rv/BYKr93bA+Tj3EhHkDVD2KI4aJHjSbBAdPvSa1o1qcp9fsI1yya76nhYhJFR+TTWfwgeNTgocduGbAZm4cSv6plJWjfzh1fenf5ObIlM7EDXnovqsqDBjrCdgZpbXwemZRKtW5YwSXXZ7Wrzy8Dei8qX6Sf8qAct8S3LMlNz5z5xR1wIDAQABo1AwTjAdBgNVHQ4EFgQUzpk5DVIfxT76tAIrlNbSoAAjdvMwHwYDVR0jBBgwFoAUzpk5DVIfxT76tAIrlNbSoAAjdvMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAmq+3WprNpSFXUADLia1CdX3XzXC5IphBx7enkuXRUP21KTH/yIIICoN4Okeo5m12QJQ7cg1SE8XCqK06qoNNzTztaCacP2DLCPUPVKBQE1edpWUwHtio3earCvL2F2sgf3IJVZkusLkYgfh0sD372u6bTQjNMn9cm4Gpt0y8F3KEB/Zfmgz0+G9N1O4hfE+jONEmY1yYdMcrWsTcir2zO/BzYHu7v34hKU31vmbQjU2pX6YqnBdaWFyGaM4uQ43zCPzBO1PA6f5K6MItmbn5+zFGKTx19F9GmzgHjH4yoMfiHoycUb7/sZ+MBroWyP+JhlYBncdcSsLlCH9qlrdj0A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edi.izum.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://edi.izum.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Inštitut informacijskih znanosti - IZUM</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Inštitut informacijskih znanosti - IZUM</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Inštitut informacijskih znanosti - IZUM</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Inštitut informacijskih znanosti - IZUM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.izum.si/default-EN.htm</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.izum.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Batič</md:GivenName>
-    <md:SurName>Boštjan</md:SurName>
-    <md:EmailAddress>mailto:bostjan.batic@izum.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:bostjan.batic@izum.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Batič</md:GivenName>
-    <md:SurName>Boštjan</md:SurName>
-    <md:EmailAddress>mailto:bostjan.batic@izum.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edinaidp.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/edinaidp.edina.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 9b2709c3..00000000
--- a/swamid-interfederations-2.0/edinaidp.edina.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edinaidp.edina.ac.uk/idp/shibboleth">
-  <!--
-		This is an "EDINA development IdP (staff and trials)" Shibboleth IdP for the University of Edinburgh.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-02T09:12:56Z">
-      <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 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">edina.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EDINA development IdP (staff and trials)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EDINA internal development IdP (for staff and trial accounts)</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUOCnnTosHKIwnb6fAc7r9zDz0n10wDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUZWRpbmFpZHAuZWRpbmEuYWMudWswHhcNMTUwNjExMTky
-						NDU3WhcNMzUwNjExMTkyNDU3WjAfMR0wGwYDVQQDDBRlZGluYWlkcC5lZGluYS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJQ6bfF4ADFYpsAz
-						D3j9S/w63oN2wOfve04TXbpCjt5noznRygP1z9mfKxpjEs3U76SRUPGzYnwlbV+C
-						UWV+CsnQ6yfJdtiqAzfO/uLC4gPJFRigLrwrR2uIV+1KKHvkbrI1ObHZsXrW1wFh
-						9AxCBw6KeCjmGMqhIe2vNAAZBv9VcyZfEYY8jAbzQVU3WfcJNuhdhfjU1jJYHo38
-						tR9aGV19WEo6J5CR1vJWBn8ws3oLg6BrAzl6dtP7Jz7GApq3tjBBuBUO90WriSXj
-						jsA6FzYAeVLpL6/3zqvm5WaJzJn6Q7YiQMiSpoxS2Gt8B67TuqfZagDUqLAmkLwe
-						GTmf08UCAwEAAaNvMG0wHQYDVR0OBBYEFPbAotnDEz74l4eFUiXdPcStKZpbMEwG
-						A1UdEQRFMEOCFGVkaW5haWRwLmVkaW5hLmFjLnVrhitodHRwczovL2VkaW5haWRw
-						LmVkaW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAe
-						O9pfHxqolQONwNd/sMf96ZIU/ZN2vCPigQyEWJvrWhfh56bErAfUQOVSPr+JZgs7
-						gnGf+YPZxyOcP/yrO4gGKAD+KOTNdBcm/sNIbjy1iq+xxaxZtj+/Lg2+vqFTy0aj
-						mw2+xAYZk/NtbcDDxm7Q/yXpnTrVEz6nUfnXHEXF4VcM9pXLRhio2b7YLxrXQbU3
-						Ppn8JzwcDWIiix0uCgVFjlPgl1myRCJierEg1ETBG8y3bJpTZANZ1a+QdlA6iFsJ
-						r2DRTFMsVPSyx+yZRQu7tbQtrIldkof4Mc9aT4+MGwCFk1cxA4/+emenpyz02RPG
-						p7MPD4BuBwOr3oSJYK5K
-					</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>
-						MIIDOzCCAiOgAwIBAgIUO1QCCQVOjX9XxUyghUxYMs0zUX0wDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUZWRpbmFpZHAuZWRpbmEuYWMudWswHhcNMTUwNjExMTky
-						NDU2WhcNMzUwNjExMTkyNDU2WjAfMR0wGwYDVQQDDBRlZGluYWlkcC5lZGluYS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALGdwrlLT1YQKVHL
-						I4q+wsVrDJGa6kbhasgMkY7yLM4mlcYd5QquF2t2gyMAy5DGtap1bHKCt6XeDibj
-						q71pMTKN40+EaQ6l7yGvxs4EcNKUCM7Q7+wrYUTSdfQ6itm8mDoqRVJDON24QoPl
-						hORRRIqt+dxdCucDymKqwCXfDM3UbOSTFV5WP15vNK4yDQzvI01pVoHm5jS/ApB1
-						nuaJFk5rkFS24DKLYgEsRKgwzzdH7PpaJfYjgPh8M/NKUr+2C6VLIhQMUWHcslAl
-						S5cxUrD3VrUMqgXewSeW+gV52rPeY9srp0fqHx20dU/oDjv8lCAr5DMw5s0d6u64
-						a9Hcc80CAwEAAaNvMG0wHQYDVR0OBBYEFNpl8MRqylwYHcXwg43FXaRA3ZYVMEwG
-						A1UdEQRFMEOCFGVkaW5haWRwLmVkaW5hLmFjLnVrhitodHRwczovL2VkaW5haWRw
-						LmVkaW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBy
-						Q0ElYVx5Qh/zaT6GGX47CmRqiWsbElVqkTNE4bS7yiNZ0OdufMM5jhlAB6GvGFof
-						BawPjhPZ2RK/Pbthi7ym3xvxZn7wvr1v9sTgX7fE4G+zDsfg3V2OJGnsoYuInUVT
-						QAGqoOqFDuh0ll9HgfvSrbnOb1b1n7Rb7+1JseX0p68FjQs7zQkIcyV8w8W9oSED
-						EqDFy4oXld1il87eDhk8qYMBeQwQ15cOkpyuPQXcGpKsm++DNje2wTYJu9WjayLS
-						qIdcMhH06T/kc920dO2eIoHiflIBI0HD2gyf+F83dQJApq8uAA7CawC97dZuJTCp
-						5pVZ1GyXlmMKkT3WqkVz
-					</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>
-						MIIDPDCCAiSgAwIBAgIVAMyN+hqfV+I254sZk4I2BOp5lMoiMA0GCSqGSIb3DQEB
-						CwUAMB8xHTAbBgNVBAMMFGVkaW5haWRwLmVkaW5hLmFjLnVrMB4XDTE1MDYxMTE5
-						MjQ1N1oXDTM1MDYxMTE5MjQ1N1owHzEdMBsGA1UEAwwUZWRpbmFpZHAuZWRpbmEu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfFWJQnEeoVhGc
-						Fi/+tbNiwaVdlNWZ5fZN0g/6LkTF13DLowdR/9kHXMr1kjVX3C2exBeKUnRKEHZS
-						3s9lAvpATyYVNhWCI8iT9PsSxJHWQ+hJdMVAf4rPH+npYZ2G5oJOw9RJN9RDPbmc
-						R6L1zx5CH03LdtpEZd0BSm2XtcIV7FVFccAev46jtzSEOAuVd/eFntHK0f6LOvW2
-						fJpDgEz+2xEAUHZuPtnBCE1dHgt5O/LuCYY9EpCgZdAlcgTXlau6yn7Q+QO/02sB
-						GSkWQcuI+pO+cFr9a+QyREAJ/UXL4p8qkXaYEm4KcjMyl3mMtr83t05hrLcCV/5U
-						dN085tvLAgMBAAGjbzBtMB0GA1UdDgQWBBSwwnW4gvLdufPYNYJweNn8EYtKPjBM
-						BgNVHREERTBDghRlZGluYWlkcC5lZGluYS5hYy51a4YraHR0cHM6Ly9lZGluYWlk
-						cC5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-						HstLlhJEuHuHUN0X/WVtI/q4Ot1oCP42H9UeiZ2Mr9uJn8FJNa68po72yv/tLU7d
-						jPrGRdRUJMI86zDg080FqpMVC+I0pWKLurljBjtyz4H6XgoDna8TwNsEDp46Xwd1
-						ShUsIK7NRMV4B8Hrga1n8ti5mQfeK5yD3j2kqc8YmAoPUu3i4X02+H8MylXMhqoJ
-						yALSC8GaFk4ZMuOhEmCVj3UeF2Z9+/AYFIhRdViLAqwZQ+XsKlY2RaBZXRQ83Czp
-						15zH13aMlcCEi7uHlWmR8bl0++V1NOqQTafudk24aTWoxKPM/yiOUUvZMBPYlWnm
-						+y3wPL0vShxpesWKV/96Kg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edinaidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edinaidp.edina.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://edinaidp.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edinaidp.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edinaidp.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edinaidp.edina.ac.uk/idp/profile/SAML2/Redirect/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">edina.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUOCnnTosHKIwnb6fAc7r9zDz0n10wDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUZWRpbmFpZHAuZWRpbmEuYWMudWswHhcNMTUwNjExMTky
-						NDU3WhcNMzUwNjExMTkyNDU3WjAfMR0wGwYDVQQDDBRlZGluYWlkcC5lZGluYS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJQ6bfF4ADFYpsAz
-						D3j9S/w63oN2wOfve04TXbpCjt5noznRygP1z9mfKxpjEs3U76SRUPGzYnwlbV+C
-						UWV+CsnQ6yfJdtiqAzfO/uLC4gPJFRigLrwrR2uIV+1KKHvkbrI1ObHZsXrW1wFh
-						9AxCBw6KeCjmGMqhIe2vNAAZBv9VcyZfEYY8jAbzQVU3WfcJNuhdhfjU1jJYHo38
-						tR9aGV19WEo6J5CR1vJWBn8ws3oLg6BrAzl6dtP7Jz7GApq3tjBBuBUO90WriSXj
-						jsA6FzYAeVLpL6/3zqvm5WaJzJn6Q7YiQMiSpoxS2Gt8B67TuqfZagDUqLAmkLwe
-						GTmf08UCAwEAAaNvMG0wHQYDVR0OBBYEFPbAotnDEz74l4eFUiXdPcStKZpbMEwG
-						A1UdEQRFMEOCFGVkaW5haWRwLmVkaW5hLmFjLnVrhitodHRwczovL2VkaW5haWRw
-						LmVkaW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAe
-						O9pfHxqolQONwNd/sMf96ZIU/ZN2vCPigQyEWJvrWhfh56bErAfUQOVSPr+JZgs7
-						gnGf+YPZxyOcP/yrO4gGKAD+KOTNdBcm/sNIbjy1iq+xxaxZtj+/Lg2+vqFTy0aj
-						mw2+xAYZk/NtbcDDxm7Q/yXpnTrVEz6nUfnXHEXF4VcM9pXLRhio2b7YLxrXQbU3
-						Ppn8JzwcDWIiix0uCgVFjlPgl1myRCJierEg1ETBG8y3bJpTZANZ1a+QdlA6iFsJ
-						r2DRTFMsVPSyx+yZRQu7tbQtrIldkof4Mc9aT4+MGwCFk1cxA4/+emenpyz02RPG
-						p7MPD4BuBwOr3oSJYK5K
-					</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>
-						MIIDOzCCAiOgAwIBAgIUO1QCCQVOjX9XxUyghUxYMs0zUX0wDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUZWRpbmFpZHAuZWRpbmEuYWMudWswHhcNMTUwNjExMTky
-						NDU2WhcNMzUwNjExMTkyNDU2WjAfMR0wGwYDVQQDDBRlZGluYWlkcC5lZGluYS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALGdwrlLT1YQKVHL
-						I4q+wsVrDJGa6kbhasgMkY7yLM4mlcYd5QquF2t2gyMAy5DGtap1bHKCt6XeDibj
-						q71pMTKN40+EaQ6l7yGvxs4EcNKUCM7Q7+wrYUTSdfQ6itm8mDoqRVJDON24QoPl
-						hORRRIqt+dxdCucDymKqwCXfDM3UbOSTFV5WP15vNK4yDQzvI01pVoHm5jS/ApB1
-						nuaJFk5rkFS24DKLYgEsRKgwzzdH7PpaJfYjgPh8M/NKUr+2C6VLIhQMUWHcslAl
-						S5cxUrD3VrUMqgXewSeW+gV52rPeY9srp0fqHx20dU/oDjv8lCAr5DMw5s0d6u64
-						a9Hcc80CAwEAAaNvMG0wHQYDVR0OBBYEFNpl8MRqylwYHcXwg43FXaRA3ZYVMEwG
-						A1UdEQRFMEOCFGVkaW5haWRwLmVkaW5hLmFjLnVrhitodHRwczovL2VkaW5haWRw
-						LmVkaW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBy
-						Q0ElYVx5Qh/zaT6GGX47CmRqiWsbElVqkTNE4bS7yiNZ0OdufMM5jhlAB6GvGFof
-						BawPjhPZ2RK/Pbthi7ym3xvxZn7wvr1v9sTgX7fE4G+zDsfg3V2OJGnsoYuInUVT
-						QAGqoOqFDuh0ll9HgfvSrbnOb1b1n7Rb7+1JseX0p68FjQs7zQkIcyV8w8W9oSED
-						EqDFy4oXld1il87eDhk8qYMBeQwQ15cOkpyuPQXcGpKsm++DNje2wTYJu9WjayLS
-						qIdcMhH06T/kc920dO2eIoHiflIBI0HD2gyf+F83dQJApq8uAA7CawC97dZuJTCp
-						5pVZ1GyXlmMKkT3WqkVz
-					</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>
-						MIIDPDCCAiSgAwIBAgIVAMyN+hqfV+I254sZk4I2BOp5lMoiMA0GCSqGSIb3DQEB
-						CwUAMB8xHTAbBgNVBAMMFGVkaW5haWRwLmVkaW5hLmFjLnVrMB4XDTE1MDYxMTE5
-						MjQ1N1oXDTM1MDYxMTE5MjQ1N1owHzEdMBsGA1UEAwwUZWRpbmFpZHAuZWRpbmEu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfFWJQnEeoVhGc
-						Fi/+tbNiwaVdlNWZ5fZN0g/6LkTF13DLowdR/9kHXMr1kjVX3C2exBeKUnRKEHZS
-						3s9lAvpATyYVNhWCI8iT9PsSxJHWQ+hJdMVAf4rPH+npYZ2G5oJOw9RJN9RDPbmc
-						R6L1zx5CH03LdtpEZd0BSm2XtcIV7FVFccAev46jtzSEOAuVd/eFntHK0f6LOvW2
-						fJpDgEz+2xEAUHZuPtnBCE1dHgt5O/LuCYY9EpCgZdAlcgTXlau6yn7Q+QO/02sB
-						GSkWQcuI+pO+cFr9a+QyREAJ/UXL4p8qkXaYEm4KcjMyl3mMtr83t05hrLcCV/5U
-						dN085tvLAgMBAAGjbzBtMB0GA1UdDgQWBBSwwnW4gvLdufPYNYJweNn8EYtKPjBM
-						BgNVHREERTBDghRlZGluYWlkcC5lZGluYS5hYy51a4YraHR0cHM6Ly9lZGluYWlk
-						cC5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-						HstLlhJEuHuHUN0X/WVtI/q4Ot1oCP42H9UeiZ2Mr9uJn8FJNa68po72yv/tLU7d
-						jPrGRdRUJMI86zDg080FqpMVC+I0pWKLurljBjtyz4H6XgoDna8TwNsEDp46Xwd1
-						ShUsIK7NRMV4B8Hrga1n8ti5mQfeK5yD3j2kqc8YmAoPUu3i4X02+H8MylXMhqoJ
-						yALSC8GaFk4ZMuOhEmCVj3UeF2Z9+/AYFIhRdViLAqwZQ+XsKlY2RaBZXRQ83Czp
-						15zH13aMlcCEi7uHlWmR8bl0++V1NOqQTafudk24aTWoxKPM/yiOUUvZMBPYlWnm
-						+y3wPL0vShxpesWKV/96Kg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edinaidp.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA development IdP (staff and trials)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/about/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edinburghcollege.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/edinburghcollege.cirqahosting.com-shibboleth.xml
deleted file mode 100644
index 81229384..00000000
--- a/swamid-interfederations-2.0/edinburghcollege.cirqahosting.com-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://edinburghcollege.cirqahosting.com/shibboleth">
-  <!--
-		This is an "Edinburgh College Heritage Online" Shibboleth SP for IS Oxford Ltd.
-	-->
-  <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="2015-01-29T12:19: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHjCCAgagAwIBAgIJAMLy719Eg3tSMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHWVkaW5idS5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDEyNTE2NTU0
-						OVoXDTI1MDEyMjE2NTU0OVowKDEmMCQGA1UEAxMdZWRpbmJ1Lmlzb3hmb3JkLWhv
-						c3RpbmcubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+kePo
-						yKtQCwhXQqYw7fzZHw9vIQ9mXEI2crCoOPkPvwIjiV687/EqNcNft1UjzSXdkBVB
-						WbyaXU22MS6lHFnnnHCiAG1WteOOlk1YR/xSbPX9yTjWzlF44xbc6rCUFslssBbD
-						x4SIdp3+eVFZHlRoOeo/qXepzHW5B5VAFdCgWc2bNq71gZ+U0rYKY68iMwNq5hwQ
-						w+TJcIN0UOOaL8o9cgfMXP5y4ttBce1WnmcSddu8/tvtwYVOMV88PvlrEI7h6QeG
-						vg1WtRN5leQ738HXN0PVRy3FecUP8IYUGOfALNi9mk5OFton+o+4q26ag2aUvkYX
-						caG6Ve7hjHnDlr+hAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWVkaW5idS5pc294Zm9y
-						ZC1ob3N0aW5nLmxvY2FsMB0GA1UdDgQWBBSj7q47xzeFnVpWBzLzn1GDD0VaoDAN
-						BgkqhkiG9w0BAQUFAAOCAQEAYI4dif6kiOaPyAXYUh+TwmNl1FldNTkcNWQvpvHh
-						67tYn4RpEdUYAbm/FN/hKbNebmq6Uzjlaf+fA0HVnvBFuoyDN+AyKhL8o+s/nNTs
-						29Ec3d9bJFMBi8HkGh6fsHAp/y+uzF6iqHV2OeeeCuAacotJPhQrQqlDNR3i7ti/
-						a7M9kzk8vPFwBSsLZl99rc7KltgJVWmiumNY0bjw09ikw8lFCPuNm+FW0Dd7xEs7
-						J59IBvcAbDBTiSucBWkyJZgS/krRf2+aHfg1IQ7OopLhGWyDKSBIZoRyXaZUaxx7
-						hNWZYJ7F1b5HIi//FSgUwMllV6SzbEYyKMsrimhNpmPP4g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://edinburghcollege.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edinburghcollege.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IS Oxford Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Edinburgh College Heritage Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.isoxford.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lee</GivenName>
-    <SurName>Orchard</SurName>
-    <EmailAddress>mailto:lee@isoxford.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>IS Oxford Support</GivenName>
-    <EmailAddress>mailto:support@isoxford.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Salvesen</SurName>
-    <EmailAddress>mailto:david@isoxford.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IS Oxford Support</GivenName>
-    <EmailAddress>mailto:support@isoxford.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edited.com.xml b/swamid-interfederations-2.0/edited.com.xml
deleted file mode 100644
index a3f9f1bb..00000000
--- a/swamid-interfederations-2.0/edited.com.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://edited.com">
-  <!--
-		This is an "EDITED retail analytics" OneLogin SP for Stylescape Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-15T13:46:52Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIERTCCAy2gAwIBAgIJAJH/R36ghqhmMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEPMA0GA1UE
-						ChMGRURJVEVEMRMwEQYDVQQDEwplZGl0ZWQuY29tMR0wGwYJKoZIhvcNAQkBFg5k
-						ZXZAZWRpdGVkLmNvbTAeFw0xNTExMjYxMTM1MjZaFw0zNTExMjYxMTM1MjZaMHQx
-						CzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEP
-						MA0GA1UEChMGRURJVEVEMRMwEQYDVQQDEwplZGl0ZWQuY29tMR0wGwYJKoZIhvcN
-						AQkBFg5kZXZAZWRpdGVkLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMoT+vwV6q3V55EAJ8Gf3CUduwSigipWLHTJpLua8QebwlbDuMTVWOTcI2FH
-						scxrfxIdAj7h+uLmkqpvi1/9YJQW5sqkSuD3fK07GSXbUfJjevMUT7e88yvTRUOI
-						YRH6fnrcz3WeMxM+gux4xDNJrLrMXvbC4PsainJDmIL1+PznoFRbLrFWKhx47oad
-						jth4HM0PQ5sF+n8rx2rE44GRss7VAIlv6rTEhMYKraMSK60ZmNdWavjPIBhFEb6+
-						2Wfp8LRJ7/nHt/fxQ03feP05v5lMePtOxaninefnWKtvSxj+Lx3T/tbczperJzFR
-						RTb/0p9a/rRvto/j+qwp4XxoaB8CAwEAAaOB2TCB1jAdBgNVHQ4EFgQUBynvwBIg
-						075+rJ6dOOHFcFKU43UwgaYGA1UdIwSBnjCBm4AUBynvwBIg075+rJ6dOOHFcFKU
-						43WheKR2MHQxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcT
-						BkxvbmRvbjEPMA0GA1UEChMGRURJVEVEMRMwEQYDVQQDEwplZGl0ZWQuY29tMR0w
-						GwYJKoZIhvcNAQkBFg5kZXZAZWRpdGVkLmNvbYIJAJH/R36ghqhmMAwGA1UdEwQF
-						MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEde1nzDoM2cj51bY2wMdbi5N2XVEB6l
-						82SWENnv76a8tQai5oUdhAUwRbShpIvhuCyK93r6ffHFXw9z6nR6A3mLusGSCMLK
-						DYXmvgf9IGAm2ptgvZOhnaW3qLny9AmMZH1XG+G4wEvdFuyRnv2hb7AlF3BRsPi2
-						sh1c2xpqYd4/9zRx0o9C7oS3e7NRIzWCVPQRObb56b8jgsE9H6ljbhivHuoeUEIn
-						9APDG8vwHH/Y3XWsA3TyrcbSpFiXUiXmxDNFlKoRqlypUJUKb4KEAKXtI7c3n/T7
-						XniDAl12MNbPqskNhYA2BbmN+wgEp467ONVD1a1qHy3zcfqM99UmTJg=
-					</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>
-						MIIERTCCAy2gAwIBAgIJAJH/R36ghqhmMA0GCSqGSIb3DQEBBQUAMHQxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEPMA0GA1UE
-						ChMGRURJVEVEMRMwEQYDVQQDEwplZGl0ZWQuY29tMR0wGwYJKoZIhvcNAQkBFg5k
-						ZXZAZWRpdGVkLmNvbTAeFw0xNTExMjYxMTM1MjZaFw0zNTExMjYxMTM1MjZaMHQx
-						CzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEP
-						MA0GA1UEChMGRURJVEVEMRMwEQYDVQQDEwplZGl0ZWQuY29tMR0wGwYJKoZIhvcN
-						AQkBFg5kZXZAZWRpdGVkLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMoT+vwV6q3V55EAJ8Gf3CUduwSigipWLHTJpLua8QebwlbDuMTVWOTcI2FH
-						scxrfxIdAj7h+uLmkqpvi1/9YJQW5sqkSuD3fK07GSXbUfJjevMUT7e88yvTRUOI
-						YRH6fnrcz3WeMxM+gux4xDNJrLrMXvbC4PsainJDmIL1+PznoFRbLrFWKhx47oad
-						jth4HM0PQ5sF+n8rx2rE44GRss7VAIlv6rTEhMYKraMSK60ZmNdWavjPIBhFEb6+
-						2Wfp8LRJ7/nHt/fxQ03feP05v5lMePtOxaninefnWKtvSxj+Lx3T/tbczperJzFR
-						RTb/0p9a/rRvto/j+qwp4XxoaB8CAwEAAaOB2TCB1jAdBgNVHQ4EFgQUBynvwBIg
-						075+rJ6dOOHFcFKU43UwgaYGA1UdIwSBnjCBm4AUBynvwBIg075+rJ6dOOHFcFKU
-						43WheKR2MHQxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcT
-						BkxvbmRvbjEPMA0GA1UEChMGRURJVEVEMRMwEQYDVQQDEwplZGl0ZWQuY29tMR0w
-						GwYJKoZIhvcNAQkBFg5kZXZAZWRpdGVkLmNvbYIJAJH/R36ghqhmMAwGA1UdEwQF
-						MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEde1nzDoM2cj51bY2wMdbi5N2XVEB6l
-						82SWENnv76a8tQai5oUdhAUwRbShpIvhuCyK93r6ffHFXw9z6nR6A3mLusGSCMLK
-						DYXmvgf9IGAm2ptgvZOhnaW3qLny9AmMZH1XG+G4wEvdFuyRnv2hb7AlF3BRsPi2
-						sh1c2xpqYd4/9zRx0o9C7oS3e7NRIzWCVPQRObb56b8jgsE9H6ljbhivHuoeUEIn
-						9APDG8vwHH/Y3XWsA3TyrcbSpFiXUiXmxDNFlKoRqlypUJUKb4KEAKXtI7c3n/T7
-						XniDAl12MNbPqskNhYA2BbmN+wgEp467ONVD1a1qHy3zcfqM99UmTJg=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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://accounts.edited.com/login/saml/" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.edited.com/login/saml/193/" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.edited.com/login/saml/335/" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.edited.com/login/saml/356/" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accounts.edited.com/login/saml/367/" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">EDITED retail analytics</ServiceName>
-      <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">Stylescape Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDITED retail analytics</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://edited.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rachel</GivenName>
-    <SurName>Neath</SurName>
-    <EmailAddress>mailto:rachel@edited.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Barrett</SurName>
-    <EmailAddress>mailto:nick@edited.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edocs.bathspa.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/edocs.bathspa.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 80fbafe8..00000000
--- a/swamid-interfederations-2.0/edocs.bathspa.ac.uk-shibboleth-sp.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://edocs.bathspa.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Digitary DARE Service" Shibboleth SP for Digitary.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-22T16:13:47Z"/>
-  </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://edocs.bathspa.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAKvu+ZotXOBYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51azAeFw0xMjA0MTIxNTA4MDhaFw0y
-						MjA0MTAxNTA4MDhaMCMxITAfBgNVBAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAONwiFdIwZkaerJXg8Wm
-						47ddT4dPw4AYVWgk2Uy64qQvAgbaSQi1mknnR27bhWyg5iCA3z9IrfLtLmF6O4do
-						Q5nMjXcnCVivz0hubTlFLgqtbo1XXddm+WYrpsoBhATbgLcz8XG/TdQWzqPjf6xR
-						jslpbjf8YTDCigoLpxnrBfJeY8ns81RaxtDOS/eg5JgjpohSbnJK5kum4twpEVPK
-						/Z6EmoIKsCQ2YTzcn1PmlxT3czYxBS5Hr54tt1W7JUtZPlrWyMJnQVof7MZSTeLr
-						piH74BxtfbN1n7AwWvGSdj7D8saRahKv9YzexaGKNggAlXE7lwDSRAagh/MKIX4V
-						oasCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZGlnaXRhcnkuZGFyZS51bGNjLmFjLnVr
-						MB0GA1UdDgQWBBQJeESLMMOvuBxCw/egquAAUDHR2zANBgkqhkiG9w0BAQUFAAOC
-						AQEAPF1yxkncDbJ0WwRpnleXV2P7GGDKenIbcIH69ad+0IARiyCvKJxX1vpfkD2C
-						Fmis9+MURBeMMpRUpRsIGh9O2SMMQT/aTMHqoSWOMGiJW9fM6PCS18Z5Zx4aTgyq
-						O1ez0wHjbR1vW/TfSM/b6A2ovLqR+6bbbaymu0wu5UbNofG1uSRgkKT9kgeiGLWq
-						VqagedqlmGej4hnCq2/+hMGTdeRiCrgFwUwVL8ZLfs8YptRka8WPuEsXieI7m7rf
-						TzJxScFtn4xmZUOrC5VFdXH5j4S8/6M6kYiw2iQAbpSBBn1Azow1sWj2JzY4yUMZ
-						JXxZbc0L9R3Upa90FjFH8QnxXg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edocs.bathspa.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Digitary</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digitary DARE Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.digitary.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Xiang</GivenName>
-    <SurName>Chen</SurName>
-    <EmailAddress>mailto:xiang.chen@digitary.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Troy</SurName>
-    <EmailAddress>mailto:kevin.troy@digitary.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edu.xtremeinformation.com-shibboleth.xml b/swamid-interfederations-2.0/edu.xtremeinformation.com-shibboleth.xml
deleted file mode 100644
index b7d5bd5b..00000000
--- a/swamid-interfederations-2.0/edu.xtremeinformation.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://edu.xtremeinformation.com/shibboleth">
-  <!--
-		This is a "Portfolio ADS" Shibboleth SP for Ebiquity plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-19T12:34: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://edu.xtremeinformation.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAKUdMtp0wHmJMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHdlYi0wMDEueHRyZW1lLmNvLnVrMB4XDTA5MTExODEyMTQxMFoXDTE5MTEx
-						NjEyMTQxMFowHzEdMBsGA1UEAxMUd2ViLTAwMS54dHJlbWUuY28udWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDP2ZbA5SAqPMAhAeX994ZNooqO5VUG
-						EtTHvZfmKSVpFLNI+LuT4dloL1eKLrFhMtVCRsR94oX15ZnMGJ8go3GXbGUqhT5I
-						soGDNIMHnvA0zeQr/VmHwrRImddyiiB9MR1C1dghV83zw1/04kcZMKd3fdXlsXaR
-						lWCTuYDKstG4wivDN/rTJIlgFtLJnplVpAYnTIgxxY/cU+3j140OUX3yFQu04/BM
-						uEtlz5ypWek2bHNZWH1aDYmWcpB32ao/oWEsyCoraZR5knluYNwt2uJgChfTh8zC
-						yFo713ketgUndktx5sWhJnNjQeWYweMSuu1w0HzE2uKgDld1c8m1o0qLAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFHdlYi0wMDEueHRyZW1lLmNvLnVrMB0GA1UdDgQWBBR0
-						5U9o3XTImfdd6YXxvMwlBN2vujANBgkqhkiG9w0BAQUFAAOCAQEAErdNoI5vHTQ4
-						apBJD/KDf4+MeJRVFtsgkX0OgRAGApMILddenUgqj55eCKFu25BB2+JNpD72pLcD
-						KvcRgJX9FeqyaHpUJ3u9Hq6FwyY2t0xFHEUk7VXaJm1Y7VhVuPEovGz97bj4ffYZ
-						riMV/JRg/7SDxjL4z4BjknQdLTYxr0vfAfkv7K679mdTRCIcho9x7b8n0V95UwhK
-						Gb8PQktjjg5GUaFHk7bZjPdBffYgABNwrdEoLrWBDRtUYVfRv52m7HEOa/wIuzdm
-						/K9EI6W5q9FIrAy11+Z44GB/xe6WI/18xax/sGbafbwj+g0Aov5EwVcgbjmjCrjT
-						pjmPlQZwNg==
-					</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>
-						MIIDAzCCAeugAwIBAgIJAKUdMtp0wHmJMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHdlYi0wMDEueHRyZW1lLmNvLnVrMB4XDTA5MTExODEyMTQxMFoXDTE5MTEx
-						NjEyMTQxMFowHzEdMBsGA1UEAxMUd2ViLTAwMS54dHJlbWUuY28udWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDP2ZbA5SAqPMAhAeX994ZNooqO5VUG
-						EtTHvZfmKSVpFLNI+LuT4dloL1eKLrFhMtVCRsR94oX15ZnMGJ8go3GXbGUqhT5I
-						soGDNIMHnvA0zeQr/VmHwrRImddyiiB9MR1C1dghV83zw1/04kcZMKd3fdXlsXaR
-						lWCTuYDKstG4wivDN/rTJIlgFtLJnplVpAYnTIgxxY/cU+3j140OUX3yFQu04/BM
-						uEtlz5ypWek2bHNZWH1aDYmWcpB32ao/oWEsyCoraZR5knluYNwt2uJgChfTh8zC
-						yFo713ketgUndktx5sWhJnNjQeWYweMSuu1w0HzE2uKgDld1c8m1o0qLAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFHdlYi0wMDEueHRyZW1lLmNvLnVrMB0GA1UdDgQWBBR0
-						5U9o3XTImfdd6YXxvMwlBN2vujANBgkqhkiG9w0BAQUFAAOCAQEAErdNoI5vHTQ4
-						apBJD/KDf4+MeJRVFtsgkX0OgRAGApMILddenUgqj55eCKFu25BB2+JNpD72pLcD
-						KvcRgJX9FeqyaHpUJ3u9Hq6FwyY2t0xFHEUk7VXaJm1Y7VhVuPEovGz97bj4ffYZ
-						riMV/JRg/7SDxjL4z4BjknQdLTYxr0vfAfkv7K679mdTRCIcho9x7b8n0V95UwhK
-						Gb8PQktjjg5GUaFHk7bZjPdBffYgABNwrdEoLrWBDRtUYVfRv52m7HEOa/wIuzdm
-						/K9EI6W5q9FIrAy11+Z44GB/xe6WI/18xax/sGbafbwj+g0Aov5EwVcgbjmjCrjT
-						pjmPlQZwNg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edu.xtremeinformation.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edu.xtremeinformation.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edu.xtremeinformation.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edu.xtremeinformation.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edu.xtremeinformation.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ebiquity plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ebiquity plc: Portfolio ADS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.xtremeinformation.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ADS Client Services</GivenName>
-    <EmailAddress>mailto:ad.clientservice@ebiquity.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Ryan</SurName>
-    <EmailAddress>mailto:rob.ryan@ebiquity.com</EmailAddress>
-  </ContactPerson>
-</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 5cc4b82f..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 GÉANT 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">GÉANT 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 0f2dd88e..00000000
--- a/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugain-group.cesnet.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-    <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/sp-group/aa.cesnet.cz</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edugain-group.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edugain-group.cesnet.cz: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">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 z.s.p.o.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/?lang=en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michal</md:GivenName>
-    <md:SurName>Prochazka</md:SurName>
-    <md:EmailAddress>michalp@ics.muni.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Slávek</md:GivenName>
-    <md:SurName>Licehammer</md:SurName>
-    <md:EmailAddress>slavek@ics.muni.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6a452d54..00000000
--- a/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" 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">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.edugate.ie/welcome-edugate-federation/membership</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:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>https://edugate.heanet.ie/rr3/p/page/HEAnetInternalEC</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://edugate.heanet.ie/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse 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 use="signing">
-      <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:KeyDescriptor use="encryption">
-      <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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edugate.heanet.ie/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edugate.heanet.ie/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://edugate.heanet.ie/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <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="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: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>mailto:glenn.wearen@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NOC</md:GivenName>
-    <md:SurName>HEAnet</md:SurName>
-    <md:EmailAddress>mailto:noc@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NOC</md:GivenName>
-    <md:SurName>HEAnet</md:SurName>
-    <md:EmailAddress>mailto: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 ccdb0d62..00000000
--- a/swamid-interfederations-2.0/edugate.heanet.ie.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor 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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugate.heanet.ie/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo 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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://edugate.heanet.ie/Shibboleth.sso/DS" index="0"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://edugate.heanet.ie/Shibboleth.sso/DS"/>
-      <mdui:UIInfo>
-        <mdui:Logo height="108" width="306">https://edugate.heanet.ie/rr3/logos/edugate.png</mdui:Logo>
-        <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:DisplayName xml:lang="en">Edugate Resource Registry</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://edugate.heanet.ie/rr3/help</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://edugate.heanet.ie/rr3/p/page/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <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:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <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" isDefault="true"/>
-    <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">Edugate Resource Registry</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Edugate Resource Registry</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Edugate Resource Registry</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://edugate.heanet.ie/rr3/help</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 67a34ccb..00000000
--- a/swamid-interfederations-2.0/edugate.itb.ie-idp-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://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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://edugate.itb.ie/idp/profile/Shibboleth/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>mailto: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>mailto:Eamonn.OBrien@itb.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml
deleted file mode 100644
index beaa26a8..00000000
--- a/swamid-interfederations-2.0/eduid.jamu.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eduid.jamu.cz/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-11-08T10:04: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/idp-group/university</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">jamu.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Janacek Academy of Music and Performing Arts in Brno</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Janáčkova akademie múzických umění v Brně</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students of the Janacek Academy of Music and Performing Arts in Brno</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Janáčkovy akademie múzických umění v Brně</mdui:Description>
-        <mdui:Logo height="113" width="111">https://www.jamu.cz/graphics/janacek.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>
-MIIFqDCCBJCgAwIBAgIQCBZxmLU34g304oOobnlcojANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTAzMTMwMDAwMDBaFw0xODAzMTIyMzU5NTlaMDsxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNZWR1aWQuamFtdS5j
-ejCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5hgfGmKJOxvo77wH72
-QCm33kBmqxoaP3vR+8mmfMKy2an5OfGLdurbiaECmgwBxCgyknaodqRU7uXVBwki
-aIMNsKvv26KcAIekFKe/GWwIgYVnFsncLZDbGTy+vI0SKthLdapJtiL7xzxJgrx4
-ymiMHeubEuOC6Cgfpi4mpUzPPMff2O21F8B5PCZeRT0N2PzucQJhndW1lqUZoDM5
-JBKWjnTm+uQv+ogbB1Pyv+eFPohhvJLa6nNYVVPeMCMzDFZMtlfGwddfV6/SQqss
-ye+fivGL4mNZw1orP0c5YCZIYFeL5heg5kvfNO27RpKYoR1jysvtx4kj61zjKdwx
-pTHcFVa0IrUgk1B+NVUoEqcmFYfqb+v2k88WZmwbRpgS5oqHB8ghULejGDVdPeE2
-EKbO8NlUf79+e/XdkV0iC+BXKCtslWV6KT1j/rkPFDg3gln+kuOx0VWVZNsDbp7u
-o7YyxAo6nnZr/BsG91KzLmq0x7b+2PhQKU+y1zXDZRXFw3NirwSho55VCT2ojhMM
-bVU2yPFKBwankWvurAUwdYRnMNivUxlFtIZPwd6puZC/h/UdFnOKhrcC0SFp63Cj
-kVYc4aDeyk5eK3DczVGsHLLcNmQxA8m7pkBguBvJ++SLEiW5oEVRaXKr3PAy7b36
-Z86HO5jX6vcOslx3q+oiBwNTAgMBAAGjggF9MIIBeTAfBgNVHSMEGDAWgBRb0Ioc
-mjJb4LXdllQb4YYosP22vTAdBgNVHQ4EFgQUUlDt3t01Naw+DK2fBg+WZHWpYpIw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJF
-TkFTU0xDQTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGG
-GWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wLAYDVR0RBCUwI4INZWR1aWQuamFt
-dS5jeoISc2hpYmJvbGV0aC5qYW11LmN6MA0GCSqGSIb3DQEBCwUAA4IBAQA3OyhB
-6PSVkoWQp37t1AcSR4irdkjT5+9gpHRortS6m1ydhcdFxcB/BW+85/yvWgpHxBnb
-t9g5b5fa0jyl6sp0M2VeSTdCb3uelqOnapBiIagdR7wyagxfBCbpdVqD1UZX5vFQ
-g4C0mjiaSQd9Ksvo6L9NMCtcameYBuxtUKi/Of88dRZPX/WQRTHYYsq4gTmRekgL
-FoJ7e0uBbvvNNVEwiriba9C1hreED5k8Tdlun0dk3QNCZP4uEOM3kng/Hy/ZDKIf
-DdDexXrGQ9wBME/kfcV3Rb4KluRSh3UhTVSXGgOjQ0f6WlEBO+NMdsYH+kDe1YDw
-yASlKAcsuc4JfDB8
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://eduid.jamu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduid.jamu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eduid.jamu.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.jamu.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduid.jamu.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://eduid.jamu.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.jamu.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eduid.jamu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eduid.jamu.cz/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">jamu.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFqDCCBJCgAwIBAgIQCBZxmLU34g304oOobnlcojANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTAzMTMwMDAwMDBaFw0xODAzMTIyMzU5NTlaMDsxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNZWR1aWQuamFtdS5j
-ejCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL5hgfGmKJOxvo77wH72
-QCm33kBmqxoaP3vR+8mmfMKy2an5OfGLdurbiaECmgwBxCgyknaodqRU7uXVBwki
-aIMNsKvv26KcAIekFKe/GWwIgYVnFsncLZDbGTy+vI0SKthLdapJtiL7xzxJgrx4
-ymiMHeubEuOC6Cgfpi4mpUzPPMff2O21F8B5PCZeRT0N2PzucQJhndW1lqUZoDM5
-JBKWjnTm+uQv+ogbB1Pyv+eFPohhvJLa6nNYVVPeMCMzDFZMtlfGwddfV6/SQqss
-ye+fivGL4mNZw1orP0c5YCZIYFeL5heg5kvfNO27RpKYoR1jysvtx4kj61zjKdwx
-pTHcFVa0IrUgk1B+NVUoEqcmFYfqb+v2k88WZmwbRpgS5oqHB8ghULejGDVdPeE2
-EKbO8NlUf79+e/XdkV0iC+BXKCtslWV6KT1j/rkPFDg3gln+kuOx0VWVZNsDbp7u
-o7YyxAo6nnZr/BsG91KzLmq0x7b+2PhQKU+y1zXDZRXFw3NirwSho55VCT2ojhMM
-bVU2yPFKBwankWvurAUwdYRnMNivUxlFtIZPwd6puZC/h/UdFnOKhrcC0SFp63Cj
-kVYc4aDeyk5eK3DczVGsHLLcNmQxA8m7pkBguBvJ++SLEiW5oEVRaXKr3PAy7b36
-Z86HO5jX6vcOslx3q+oiBwNTAgMBAAGjggF9MIIBeTAfBgNVHSMEGDAWgBRb0Ioc
-mjJb4LXdllQb4YYosP22vTAdBgNVHQ4EFgQUUlDt3t01Naw+DK2fBg+WZHWpYpIw
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJF
-TkFTU0xDQTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDov
-L2NydC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGG
-GWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wLAYDVR0RBCUwI4INZWR1aWQuamFt
-dS5jeoISc2hpYmJvbGV0aC5qYW11LmN6MA0GCSqGSIb3DQEBCwUAA4IBAQA3OyhB
-6PSVkoWQp37t1AcSR4irdkjT5+9gpHRortS6m1ydhcdFxcB/BW+85/yvWgpHxBnb
-t9g5b5fa0jyl6sp0M2VeSTdCb3uelqOnapBiIagdR7wyagxfBCbpdVqD1UZX5vFQ
-g4C0mjiaSQd9Ksvo6L9NMCtcameYBuxtUKi/Of88dRZPX/WQRTHYYsq4gTmRekgL
-FoJ7e0uBbvvNNVEwiriba9C1hreED5k8Tdlun0dk3QNCZP4uEOM3kng/Hy/ZDKIf
-DdDexXrGQ9wBME/kfcV3Rb4KluRSh3UhTVSXGgOjQ0f6WlEBO+NMdsYH+kDe1YDw
-yASlKAcsuc4JfDB8
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://eduid.jamu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eduid.jamu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Janacek Academy of Music and Performing Arts in Brno</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Janacek Academy of Music and Performing Arts in Brno</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Janáčkova akademie múzických umění v Brně</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://english.jamu.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.jamu.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jaroslav</md:GivenName>
-    <md:SurName>Meixner</md:SurName>
-    <md:EmailAddress>meixner@jamu.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edulidp01.hants.gov.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/edulidp01.hants.gov.uk-idp-shibboleth.xml
deleted file mode 100644
index ccf13582..00000000
--- a/swamid-interfederations-2.0/edulidp01.hants.gov.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://edulidp01.hants.gov.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Hampshire County Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">hants.gov.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIVAItvDndSZma37nVve6iWg0pw8KVmMA0GCSqGSIb3DQEB
-						BQUAMCExHzAdBgNVBAMTFmVkdWxpZHAwMS5oYW50cy5nb3YudWswHhcNMTEwNjAz
-						MDgwNzIzWhcNMzEwNjAzMDgwNzIzWjAhMR8wHQYDVQQDExZlZHVsaWRwMDEuaGFu
-						dHMuZ292LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArR3KsSDW
-						b06i0KYMDPvX86rGjYAdZ8Fk7KEb+Chx71umaIEZMZ+C0nXWNq5xO0+6XVDe0f2I
-						z5WVzoQjIlEnx84C+zxGFLHyB/1JXKslo3EZQjAcl37AROndH0ONdKgvmRS5ZM4u
-						EVo0NlWG1p2P7pz+kMfFb+mT+Bi+bcyO5UtyMZbvXD6iVax1kb1m1+r1BgHLvDP0
-						rFJCK2mzyuSJuiMxwu9WTc3jMqltnmGwWe1AyLQCaSvch1Xg3PerBFO0rPWEDWdz
-						j9We9SXGXoVlVMdx5ttrUOYQIo/p0sbqNSKslB4MaWaFZ7SwR+DdKagtAxW2catQ
-						LelvYpERLNeXNQIDAQABo3MwcTBQBgNVHREESTBHghZlZHVsaWRwMDEuaGFudHMu
-						Z292LnVrhi1odHRwczovL2VkdWxpZHAwMS5oYW50cy5nb3YudWsvaWRwL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFFHhnpqMIOC7wc8J37OSqa7W/LJZMA0GCSqGSIb3DQEB
-						BQUAA4IBAQBnwvEGRoWUVFjl3zntI4LUY7/PVNe0JSklGtE44sBSl5AwWSROkt3U
-						Q5gv2d/Cjp7Y1adDF9fF1KjrjCsv188xGXqv96C+qcED9nV9/mE25GfMAWBAn+94
-						yTsvBdA7JsVHRPBWhXzkLZkA0/9nGmn2dQx7dwTnVaDW58SgOml+WO0j5bn4hk9b
-						uxD/Qa526RvMoHEBk1cmy15UVfCvZXRewVPeKDSHy5x13rnIK7rejXRzEaWNyQDi
-						iTIi5utX40Mu6owRgH2ITRxgHg+TkWgZ09jsvvP+mPH0OwySBmEP1KShjREYY8xc
-						KVCAwfy+2kJgcyZ1eZjwKeZlIzZRW6C+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edulidp01.hants.gov.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edulidp01.hants.gov.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://edulidp01.hants.gov.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edulidp01.hants.gov.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://edulidp01.hants.gov.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edulidp01.hants.gov.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">hants.gov.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIVAItvDndSZma37nVve6iWg0pw8KVmMA0GCSqGSIb3DQEB
-						BQUAMCExHzAdBgNVBAMTFmVkdWxpZHAwMS5oYW50cy5nb3YudWswHhcNMTEwNjAz
-						MDgwNzIzWhcNMzEwNjAzMDgwNzIzWjAhMR8wHQYDVQQDExZlZHVsaWRwMDEuaGFu
-						dHMuZ292LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArR3KsSDW
-						b06i0KYMDPvX86rGjYAdZ8Fk7KEb+Chx71umaIEZMZ+C0nXWNq5xO0+6XVDe0f2I
-						z5WVzoQjIlEnx84C+zxGFLHyB/1JXKslo3EZQjAcl37AROndH0ONdKgvmRS5ZM4u
-						EVo0NlWG1p2P7pz+kMfFb+mT+Bi+bcyO5UtyMZbvXD6iVax1kb1m1+r1BgHLvDP0
-						rFJCK2mzyuSJuiMxwu9WTc3jMqltnmGwWe1AyLQCaSvch1Xg3PerBFO0rPWEDWdz
-						j9We9SXGXoVlVMdx5ttrUOYQIo/p0sbqNSKslB4MaWaFZ7SwR+DdKagtAxW2catQ
-						LelvYpERLNeXNQIDAQABo3MwcTBQBgNVHREESTBHghZlZHVsaWRwMDEuaGFudHMu
-						Z292LnVrhi1odHRwczovL2VkdWxpZHAwMS5oYW50cy5nb3YudWsvaWRwL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFFHhnpqMIOC7wc8J37OSqa7W/LJZMA0GCSqGSIb3DQEB
-						BQUAA4IBAQBnwvEGRoWUVFjl3zntI4LUY7/PVNe0JSklGtE44sBSl5AwWSROkt3U
-						Q5gv2d/Cjp7Y1adDF9fF1KjrjCsv188xGXqv96C+qcED9nV9/mE25GfMAWBAn+94
-						yTsvBdA7JsVHRPBWhXzkLZkA0/9nGmn2dQx7dwTnVaDW58SgOml+WO0j5bn4hk9b
-						uxD/Qa526RvMoHEBk1cmy15UVfCvZXRewVPeKDSHy5x13rnIK7rejXRzEaWNyQDi
-						iTIi5utX40Mu6owRgH2ITRxgHg+TkWgZ09jsvvP+mPH0OwySBmEP1KShjREYY8xc
-						KVCAwfy+2kJgcyZ1eZjwKeZlIzZRW6C+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edulidp01.hants.gov.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edulidp01.hants.gov.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">Hampshire County Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hampshire County Council</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hants.gov.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Reynolds</SurName>
-    <EmailAddress>mailto:Andy.Reynolds@hants.gov.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Wigley</SurName>
-    <EmailAddress>mailto:David.Wigley@hants.gov.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eduroam.frizerska.si.xml b/swamid-interfederations-2.0/eduroam.frizerska.si.xml
deleted file mode 100644
index 8d32e251..00000000
--- a/swamid-interfederations-2.0/eduroam.frizerska.si.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://eduroam.frizerska.si">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-16T12:12:09Z">
-      <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 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">frizerska.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Secondary  Vocational School for Hairdressers</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Srednja frizerska šola LJubljana</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Secondary  Vocational School</mdui:Description>
-        <mdui:Description xml:lang="sl">Srednja poklicna šola</mdui:Description>
-        <mdui:Keywords xml:lang="en">Hairdressing, School, Ljubljana</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Frizerska, Srednja, Šola, Ljubljana</mdui:Keywords>
-        <mdui:Logo height="107" width="249">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.frizerska.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.frizerska.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>MIIFpjCCA46gAwIBAgIGElF3aebNMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExSDBGBgNVBAMMP1NyZWRuamEgZnJpemVyc2thIHNvbGEgTGp1YmxqYW5hLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDExMDUwNzI5MzFaFw0zNDA3MjMwNzI5MzFaMGsxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExSDBGBgNVBAMMP1NyZWRuamEgZnJpemVyc2thIHNvbGEgTGp1YmxqYW5hLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAM1avH8mv3VpxTVB06cxcbtZPiPcFaiXlZ8R2jLx8c23WeI4lH2OaJW5ZZKDPh8IVaEmiLO1zKDpdfAEFAzhH/aEcIzrG5Uo6AMGNBYJYBdg3TH9kfesWSO5N/f7EUKxAhBfIf/MNtttL3y/dc2exD0UG9WJHvhlHTtMnudmxvyJVaM3PCRdhaj9UnF8Xk2kp1yKPh1Um6IgHbcTUkgKplkY+8b6YvthnyC0uhDHqlxYo5cQbGrLEAUNHW6o17TQIRY9li2jBA324A5o+PNcb7N7Q0rAkIN6dpnS7zEAJdEVFqrhF6t+67pPkdgggPgjO27hQTz5zbpYOFykEfzIoF9J+SS13iHWcwVxE1GzDmtwaw20siuKyGdZiBJV9ZalbZCriuznJ6R9QY+xVDOfHPzj9bpKpAitTEEjWab00iSanTx8di2YuP10DvmLksyUDAdTeLB6/KkXLrm0opp3gEPw3LqoQWhCkMXemtzU47Jgv90zpdwOUsuLi0YNDyAypVmapA8LTIspmELQovY+BShgxsHnYNxZ0+/Cm16vIQ5kcbCavaVtwLkBhPueDbR40rrSuLzgZGJyedZobcZk8ySCX0ZJ44DmFOPDCa4HO79BpagWtTF/Fi6DsSWFQn3esD38Fxj5/6Zmgaa7cOx9YjWw/TP/xJZJAqsETQTQsJGfAgMBAAGjUDBOMB0GA1UdDgQWBBReG6wKpXSlK4V7DhrEuJjmagf07jAfBgNVHSMEGDAWgBReG6wKpXSlK4V7DhrEuJjmagf07jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQB6cP0RCwQO3yVng3U95do8S0+ms8R9qklsUWm+9NEjA4CASTK++ottXYt44jW/2M7nWOnHuRiV66+0plMxI7KUw0giDQtARrp5jCUsMQOWYy+jNyZtohT8qvV6otEIc1G0Bn50rvf2AFpc3Ttxh3BOlk+S3lZ84SO7NvvEsJfjv8UN5DhqACfYlLWYn4OqWqzAdBKwRBsZ4Lx2DFvdeXIY+AEwV0RmHSvYUPE7WzZlGK4azW8xp36tW0AkHjjbmFJKE7lAywAEtGvLLoB+vo3z0/0ULgLsiceZbwpgYSDAEMB2JhuFRy7uh6kOblXHcZdgG8rSRTEAMWuY47lcTHbJ7dtgeeEVjHTYlO/yIJq1Uh8RUzHwDjqdN7Q7OCT+rNtN1N3TlmP9lQ40UBGebQzXtUCWePNCzHZplVTAGAInHYFhrvNZnQEEYrTrA3KrAyz4QUaohECp4BmlAwIp2e9yRf5J2wU6Z4fElXUMiF4hTq0Pk7Gl9weneybvzPmUER49FRDbBFsKdvoi9653PLgsuchmO+scK394Xho5UDZCpR8Pqx2q+HxzHOp203NkKCOxYUpX5rOBkWCf6Dy3x8gwmxS87hucojPLbNEVjI5Sfs0fRrSCNgUAcNRyv5wz5ZVaxu9fTAuk8+2VhU3u7BtDeeDzNayOPSZPSpOcopH4uw==</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>MIIFpjCCA46gAwIBAgIGElF3aebNMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExSDBGBgNVBAMMP1NyZWRuamEgZnJpemVyc2thIHNvbGEgTGp1YmxqYW5hLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDExMDUwNzI5MzFaFw0zNDA3MjMwNzI5MzFaMGsxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExSDBGBgNVBAMMP1NyZWRuamEgZnJpemVyc2thIHNvbGEgTGp1YmxqYW5hLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAM1avH8mv3VpxTVB06cxcbtZPiPcFaiXlZ8R2jLx8c23WeI4lH2OaJW5ZZKDPh8IVaEmiLO1zKDpdfAEFAzhH/aEcIzrG5Uo6AMGNBYJYBdg3TH9kfesWSO5N/f7EUKxAhBfIf/MNtttL3y/dc2exD0UG9WJHvhlHTtMnudmxvyJVaM3PCRdhaj9UnF8Xk2kp1yKPh1Um6IgHbcTUkgKplkY+8b6YvthnyC0uhDHqlxYo5cQbGrLEAUNHW6o17TQIRY9li2jBA324A5o+PNcb7N7Q0rAkIN6dpnS7zEAJdEVFqrhF6t+67pPkdgggPgjO27hQTz5zbpYOFykEfzIoF9J+SS13iHWcwVxE1GzDmtwaw20siuKyGdZiBJV9ZalbZCriuznJ6R9QY+xVDOfHPzj9bpKpAitTEEjWab00iSanTx8di2YuP10DvmLksyUDAdTeLB6/KkXLrm0opp3gEPw3LqoQWhCkMXemtzU47Jgv90zpdwOUsuLi0YNDyAypVmapA8LTIspmELQovY+BShgxsHnYNxZ0+/Cm16vIQ5kcbCavaVtwLkBhPueDbR40rrSuLzgZGJyedZobcZk8ySCX0ZJ44DmFOPDCa4HO79BpagWtTF/Fi6DsSWFQn3esD38Fxj5/6Zmgaa7cOx9YjWw/TP/xJZJAqsETQTQsJGfAgMBAAGjUDBOMB0GA1UdDgQWBBReG6wKpXSlK4V7DhrEuJjmagf07jAfBgNVHSMEGDAWgBReG6wKpXSlK4V7DhrEuJjmagf07jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQB6cP0RCwQO3yVng3U95do8S0+ms8R9qklsUWm+9NEjA4CASTK++ottXYt44jW/2M7nWOnHuRiV66+0plMxI7KUw0giDQtARrp5jCUsMQOWYy+jNyZtohT8qvV6otEIc1G0Bn50rvf2AFpc3Ttxh3BOlk+S3lZ84SO7NvvEsJfjv8UN5DhqACfYlLWYn4OqWqzAdBKwRBsZ4Lx2DFvdeXIY+AEwV0RmHSvYUPE7WzZlGK4azW8xp36tW0AkHjjbmFJKE7lAywAEtGvLLoB+vo3z0/0ULgLsiceZbwpgYSDAEMB2JhuFRy7uh6kOblXHcZdgG8rSRTEAMWuY47lcTHbJ7dtgeeEVjHTYlO/yIJq1Uh8RUzHwDjqdN7Q7OCT+rNtN1N3TlmP9lQ40UBGebQzXtUCWePNCzHZplVTAGAInHYFhrvNZnQEEYrTrA3KrAyz4QUaohECp4BmlAwIp2e9yRf5J2wU6Z4fElXUMiF4hTq0Pk7Gl9weneybvzPmUER49FRDbBFsKdvoi9653PLgsuchmO+scK394Xho5UDZCpR8Pqx2q+HxzHOp203NkKCOxYUpX5rOBkWCf6Dy3x8gwmxS87hucojPLbNEVjI5Sfs0fRrSCNgUAcNRyv5wz5ZVaxu9fTAuk8+2VhU3u7BtDeeDzNayOPSZPSpOcopH4uw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eduroam.frizerska.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://eduroam.frizerska.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SREDNJA FRIZERSKA ŠOLA LJUBLJANA</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">SREDNJA FRIZERSKA ŠOLA LJUBLJANA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SREDNJA FRIZERSKA ŠOLA LJUBLJANA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">SREDNJA FRIZERSKA ŠOLA LJUBLJANA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.frizerska.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.frizerska.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Žiga</md:GivenName>
-    <md:SurName>Erhatič</md:SurName>
-    <md:EmailAddress>mailto:srednja-frizerska-sola@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:aai@frizerska.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Žiga</md:GivenName>
-    <md:SurName>Erhatič</md:SurName>
-    <md:EmailAddress>mailto:ziga.erhatic@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Primož</md:GivenName>
-    <md:SurName>Hvala Kamenšček</md:SurName>
-    <md:EmailAddress>mailto:srednja-frizerska-sola@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eduspot-n.oca.eu-authsaml2-metadata.xml b/swamid-interfederations-2.0/eduspot-n.oca.eu-authsaml2-metadata.xml
deleted file mode 100644
index 3cb83ee4..00000000
--- a/swamid-interfederations-2.0/eduspot-n.oca.eu-authsaml2-metadata.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://eduspot-n.oca.eu/authsaml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-01-19T14:51:19Z">
-      <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>https://federation.renater.fr/category/wifi</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0: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">Univnautes captive portal - Observatoire de la Côte d'Azur</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://eduspot-n.oca.eu</mdui:InformationURL>
-        <mdui:Description xml:lang="en">eduspot captive portal</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Portail captif Univnautes - Observatoire de la Côte d'Azur</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Portail captif eduspot</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>
-					      MIID5TCCAs2gAwIBAgIJAIreaYViIoPOMA0GCSqGSIb3DQEBDQUAMIGIMQswCQYD
-VQQGEwJGUjEYMBYGA1UECAwPQWxwZXMtTWFyaXRpbWVzMQ0wCwYDVQQHDAROaWNl
-MQwwCgYDVQQKDANPQ0ExDDAKBgNVBAsMA0RTSTEZMBcGA1UEAwwQZWR1c3BvdC1u
-Lm9jYS5ldTEZMBcGCSqGSIb3DQEJARYKZHNpQG9jYS5ldTAeFw0xNTEwMDEyMTEz
-MTVaFw0yNTA5MjgyMTEzMTVaMIGIMQswCQYDVQQGEwJGUjEYMBYGA1UECAwPQWxw
-ZXMtTWFyaXRpbWVzMQ0wCwYDVQQHDAROaWNlMQwwCgYDVQQKDANPQ0ExDDAKBgNV
-BAsMA0RTSTEZMBcGA1UEAwwQZWR1c3BvdC1uLm9jYS5ldTEZMBcGCSqGSIb3DQEJ
-ARYKZHNpQG9jYS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2y
-JozqjhIFFGhTna0svsVYXduF1T7wJzM+yoL+rKAdzJd8OEi892/Bs49Db0DUtiez
-nUglXeoh0YH8mHvbTQCAbt3R+FyR7RPMBEbfJw42i2zFZRiFx+JKEm0UOq8iexe4
-iyxvopTAqv4v9aIo+fLSg0MRmh8SAv9ThpiC/wQwLtTVk5AjFT7j6AF+FQvRZW0R
-DV8xkDn5yt6sSzPfGvh2ww7dtdju75zh8wfcDYF/NKT/qFpx+a5bWw05lcQNDLBe
-UO9rmP5WA2in0maxTIAZN+v1Mch3Ncmcnj8Dq4eSjGLkeBShCgVdUS51I/3Sf7El
-8Cftj8ew3FE9DoM8SscCAwEAAaNQME4wHQYDVR0OBBYEFFTmugvtpu2im1RJ9t5m
-YjqgYymiMB8GA1UdIwQYMBaAFFTmugvtpu2im1RJ9t5mYjqgYymiMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQENBQADggEBADWirrLrtUzgCo17DfkcKIURobKRX60x
-L682veI5tSU4YQkUt8R4wl/9rwN74Qikvt2qJDxTgJYS46w+jjf6vkH2QA9XN29Y
-6VD5kO0NjU7BzIAO/e5UXGr1+lVyQneGHtktDium9wRoMPUxuymifdaxdPBwGd3P
-iXD74feSq1Ux5IePvPCouWu3wJp/TYYfSfvwZgEiEt0u/fzzr003xZUVluzhJClJ
-IdaLpnq1vAA8CjyWhhRb2+3O6Z5DC3vDL7adk2BhpN2dMJ7p9fTAamjZB4LEyt8Q
-lbnxijvgzNnV1qqHT476M01F5zF76FoP1SfJqygrhMrAifq3ooFHCa4=
-					    </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>
-					      MIID5TCCAs2gAwIBAgIJAIreaYViIoPOMA0GCSqGSIb3DQEBDQUAMIGIMQswCQYD
-VQQGEwJGUjEYMBYGA1UECAwPQWxwZXMtTWFyaXRpbWVzMQ0wCwYDVQQHDAROaWNl
-MQwwCgYDVQQKDANPQ0ExDDAKBgNVBAsMA0RTSTEZMBcGA1UEAwwQZWR1c3BvdC1u
-Lm9jYS5ldTEZMBcGCSqGSIb3DQEJARYKZHNpQG9jYS5ldTAeFw0xNTEwMDEyMTEz
-MTVaFw0yNTA5MjgyMTEzMTVaMIGIMQswCQYDVQQGEwJGUjEYMBYGA1UECAwPQWxw
-ZXMtTWFyaXRpbWVzMQ0wCwYDVQQHDAROaWNlMQwwCgYDVQQKDANPQ0ExDDAKBgNV
-BAsMA0RTSTEZMBcGA1UEAwwQZWR1c3BvdC1uLm9jYS5ldTEZMBcGCSqGSIb3DQEJ
-ARYKZHNpQG9jYS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2y
-JozqjhIFFGhTna0svsVYXduF1T7wJzM+yoL+rKAdzJd8OEi892/Bs49Db0DUtiez
-nUglXeoh0YH8mHvbTQCAbt3R+FyR7RPMBEbfJw42i2zFZRiFx+JKEm0UOq8iexe4
-iyxvopTAqv4v9aIo+fLSg0MRmh8SAv9ThpiC/wQwLtTVk5AjFT7j6AF+FQvRZW0R
-DV8xkDn5yt6sSzPfGvh2ww7dtdju75zh8wfcDYF/NKT/qFpx+a5bWw05lcQNDLBe
-UO9rmP5WA2in0maxTIAZN+v1Mch3Ncmcnj8Dq4eSjGLkeBShCgVdUS51I/3Sf7El
-8Cftj8ew3FE9DoM8SscCAwEAAaNQME4wHQYDVR0OBBYEFFTmugvtpu2im1RJ9t5m
-YjqgYymiMB8GA1UdIwQYMBaAFFTmugvtpu2im1RJ9t5mYjqgYymiMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQENBQADggEBADWirrLrtUzgCo17DfkcKIURobKRX60x
-L682veI5tSU4YQkUt8R4wl/9rwN74Qikvt2qJDxTgJYS46w+jjf6vkH2QA9XN29Y
-6VD5kO0NjU7BzIAO/e5UXGr1+lVyQneGHtktDium9wRoMPUxuymifdaxdPBwGd3P
-iXD74feSq1Ux5IePvPCouWu3wJp/TYYfSfvwZgEiEt0u/fzzr003xZUVluzhJClJ
-IdaLpnq1vAA8CjyWhhRb2+3O6Z5DC3vDL7adk2BhpN2dMJ7p9fTAamjZB4LEyt8Q
-lbnxijvgzNnV1qqHT476M01F5zF76FoP1SfJqygrhMrAifq3ooFHCa4=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduspot-n.oca.eu/authsaml2/singleSignOnPost" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Portail captif Univnautes - Observatoire de la Côte d'Azur</md:ServiceName>
-      <md:ServiceName xml:lang="en">Univnautes captive portal - Observatoire de la Côte d'Azur</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Portail captif eduspot</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">eduspot captive portal</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="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">Observatoire de la Côte d'Azur</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Observatoire de la Côte d'Azur</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.oca.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi@oca.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eduspot.crous-amiens.fr-authsaml2-metadata.xml b/swamid-interfederations-2.0/eduspot.crous-amiens.fr-authsaml2-metadata.xml
deleted file mode 100644
index 3ed47307..00000000
--- a/swamid-interfederations-2.0/eduspot.crous-amiens.fr-authsaml2-metadata.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eduspot.crous-amiens.fr/authsaml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-01-26T13:53:04Z">
-      <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>https://federation.renater.fr/category/wifi</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0: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">Crous Amiens-Picardie Eduspot</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://eduspot.crous-amiens.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Service to provide internet to students in universitary restaurants</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Crous Amiens-Picardie Eduspot</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Création d'un portail pour la connexion des étudiants au wi-fi dans les restaurants universitaires.</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>
-					      MIIESTCCAzGgAwIBAgIJANm5Tx+6LRFxMA0GCSqGSIb3DQEBBQUAMIG6MQswCQYD
-VQQGEwJGUjERMA8GA1UECAwIUGljYXJkaWUxDzANBgNVBAcMBkFtaWVuczEmMCQG
-A1UECgwdQ0VOVFJFIE9FVVZSRVMgVU5JViBTQ09MQUlSRVMxEDAOBgNVBAsMB0Vk
-dXNwb3QxIDAeBgNVBAMMF2VkdXNwb3QuY3JvdXMtYW1pZW5zLmZyMSswKQYJKoZI
-hvcNAQkBFhxpbmZvcm1hdGlxdWVAY3JvdXMtYW1pZW5zLmZyMB4XDTE2MDEyNjEy
-NDk0N1oXDTI2MDEyMzEyNDk0N1owgboxCzAJBgNVBAYTAkZSMREwDwYDVQQIDAhQ
-aWNhcmRpZTEPMA0GA1UEBwwGQW1pZW5zMSYwJAYDVQQKDB1DRU5UUkUgT0VVVlJF
-UyBVTklWIFNDT0xBSVJFUzEQMA4GA1UECwwHRWR1c3BvdDEgMB4GA1UEAwwXZWR1
-c3BvdC5jcm91cy1hbWllbnMuZnIxKzApBgkqhkiG9w0BCQEWHGluZm9ybWF0aXF1
-ZUBjcm91cy1hbWllbnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDAxHkkeX4b04wy0VYY46HehmnVSyqTvkAnHxgN+u8F2wqBq52aitCGB6NivmEg
-a7uY4NR08tziqCqqkFhsaqqBFKBvQiyQBadr6Dm+SRHASyuLAHxnHlUQBI2qT9cp
-jAiSjFseTK9shK8rymqZEeDQ6VhMC9jwfo137hTnoeO6NengaPC5/K02iXSxYqcQ
-Cp73EtweLjSrkKS4Ipx167KEq+pcbigCzlUBRkBMC4U7b+SoT1U6D7ZTAMmCuhsj
-jQQ3F82ke756JN8I1VCTbqp1bzZXjscpxVuKny/JzIr9rTrRiWDLSFUzIMgr+YJY
-vRaiIuAPcluGIa//GRa3v+/PAgMBAAGjUDBOMB0GA1UdDgQWBBRtMsgMn+UI6lyU
-Ak2FuuM/LGrjfDAfBgNVHSMEGDAWgBRtMsgMn+UI6lyUAk2FuuM/LGrjfDAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCk6dWRJsKOkeUa3LFsSpB1Snj0
-Ao9hsJj2mUU6wVD9x03gPXr3ffMSnvbRf1Xr9qvQBl8pdq5jpks9xY5k9dCOlODV
-NUiLx86HgvtX46eJJvU2tJaNUJllyoBb/0uuLq5T0BHsXBAf1ACq0rLeaogymQ3H
-xCtQ2WrBLunADcAomLScxcNu+zlHjFV6BIZp2DtdNPSaHxBU2opuegYfTG91jcn5
-kuEvQkrO4nGlv4eT2G9mfjVG7Qk9hcpAjr7jMSqcytnFWLCTr5c6Z6N/qsKpS9nw
-KBssS1tRsY8ksGJGBQ2VX/BTE9DpUMUzOcAcBZJ3c3q2s9yVcpUmNyIFrdR6
-					    </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>
-					      MIIESTCCAzGgAwIBAgIJANm5Tx+6LRFxMA0GCSqGSIb3DQEBBQUAMIG6MQswCQYD
-VQQGEwJGUjERMA8GA1UECAwIUGljYXJkaWUxDzANBgNVBAcMBkFtaWVuczEmMCQG
-A1UECgwdQ0VOVFJFIE9FVVZSRVMgVU5JViBTQ09MQUlSRVMxEDAOBgNVBAsMB0Vk
-dXNwb3QxIDAeBgNVBAMMF2VkdXNwb3QuY3JvdXMtYW1pZW5zLmZyMSswKQYJKoZI
-hvcNAQkBFhxpbmZvcm1hdGlxdWVAY3JvdXMtYW1pZW5zLmZyMB4XDTE2MDEyNjEy
-NDk0N1oXDTI2MDEyMzEyNDk0N1owgboxCzAJBgNVBAYTAkZSMREwDwYDVQQIDAhQ
-aWNhcmRpZTEPMA0GA1UEBwwGQW1pZW5zMSYwJAYDVQQKDB1DRU5UUkUgT0VVVlJF
-UyBVTklWIFNDT0xBSVJFUzEQMA4GA1UECwwHRWR1c3BvdDEgMB4GA1UEAwwXZWR1
-c3BvdC5jcm91cy1hbWllbnMuZnIxKzApBgkqhkiG9w0BCQEWHGluZm9ybWF0aXF1
-ZUBjcm91cy1hbWllbnMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDAxHkkeX4b04wy0VYY46HehmnVSyqTvkAnHxgN+u8F2wqBq52aitCGB6NivmEg
-a7uY4NR08tziqCqqkFhsaqqBFKBvQiyQBadr6Dm+SRHASyuLAHxnHlUQBI2qT9cp
-jAiSjFseTK9shK8rymqZEeDQ6VhMC9jwfo137hTnoeO6NengaPC5/K02iXSxYqcQ
-Cp73EtweLjSrkKS4Ipx167KEq+pcbigCzlUBRkBMC4U7b+SoT1U6D7ZTAMmCuhsj
-jQQ3F82ke756JN8I1VCTbqp1bzZXjscpxVuKny/JzIr9rTrRiWDLSFUzIMgr+YJY
-vRaiIuAPcluGIa//GRa3v+/PAgMBAAGjUDBOMB0GA1UdDgQWBBRtMsgMn+UI6lyU
-Ak2FuuM/LGrjfDAfBgNVHSMEGDAWgBRtMsgMn+UI6lyUAk2FuuM/LGrjfDAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCk6dWRJsKOkeUa3LFsSpB1Snj0
-Ao9hsJj2mUU6wVD9x03gPXr3ffMSnvbRf1Xr9qvQBl8pdq5jpks9xY5k9dCOlODV
-NUiLx86HgvtX46eJJvU2tJaNUJllyoBb/0uuLq5T0BHsXBAf1ACq0rLeaogymQ3H
-xCtQ2WrBLunADcAomLScxcNu+zlHjFV6BIZp2DtdNPSaHxBU2opuegYfTG91jcn5
-kuEvQkrO4nGlv4eT2G9mfjVG7Qk9hcpAjr7jMSqcytnFWLCTr5c6Z6N/qsKpS9nw
-KBssS1tRsY8ksGJGBQ2VX/BTE9DpUMUzOcAcBZJ3c3q2s9yVcpUmNyIFrdR6
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduspot.crous-amiens.fr/authsaml2/singleSignOnPost" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS d'Amiens</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS d'Amiens</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-amiens.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>informatique@crous-amiens.fr</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 b8c2ce4b..00000000
--- a/swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eduspot.ens-cachan.fr/authsaml2/metadata">
-  <md: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>
-    <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>https://federation.renater.fr/category/wifi</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0: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">ENS de Cachan - Portail Eduspot</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://eduspot.ens-cachan.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduspot.ens-cachan.fr/authsaml2/singleSignOnPost" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">ENS de Cachan - Portail Eduspot</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Accès aux Wifi pour les participants au projet Eduspot via le portail captif Univnautes.</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="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">Ecole Normale Supérieure de Cachan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Normale Supérieure de Cachan</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ens-cachan.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>eduspot@ens-cachan.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml b/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.xml
deleted file mode 100644
index 28c343b8..00000000
--- a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oa-metadata.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://edustore.adeptscience.co.uk/oa/metadata">
-  <!--
-		This is a "UK Education Store" OpenAthens SP for Adept Scientific plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-04T10:38:08Z">
-      <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Adept Scientific UK Education Store</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Fast track access to low software prices for students and educators with no post purchase verification.  If you are a student at an organisation that has a site licence, you may also be eligible for special reduced prices for personal licences.</mdui:Description>
-        <mdui:Logo height="164" width="207">https://edustore.adeptscience.co.uk/images/Adept-LH-logo-store-WEB.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFyDCCBLCgAwIBAgIQNYZVhZ6xUYZZKhRI4Ou2IDANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTExMTA5
-						MDAwMDAwWhcNMTQxMjA4MjM1OTU5WjCBtDELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
-						DUhlcnRmb3Jkc2hpcmUxEzARBgNVBAcUCkxldGNod29ydGgxHTAbBgNVBAoUFEFk
-						ZXB0IFNjaWVudGlmaWMgUExDMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
-						LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxJDAiBgNVBAMUG2VkdXN0b3JlLmFkZXB0
-						c2NpZW5jZS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjq
-						bNLrDFYokbHKskeF5Oxhf/zBZSeTdgD3c30Wwv8WD6w3k7jqCsIEN6tdZkIZMSLp
-						sQv27VpSau6oC8tDvNaxMkxrpJEGGuOI4BeIkcpDFaMQ+R43zTHwSUDRu17Dyjmh
-						6mbZ7Kizja8LMcPehjvryk2+AxfGyWhtG/j40gD9uaaZ69sRUnr4mItNKRPDMSE+
-						cDNQXy7iovQ/0d9FVsz1YjdB4Dm01IC5TSY7fRGrkioGObGk1W2P19r52yU0Yg8z
-						CVCB+sZTeSpw0qQD8FtBdP0ADZMQ5hIiL+iJRljaTl9KI1ES4FLRra1D6ycDtLM9
-						DvinO4p1kJg8Dn1GR6kCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-						AgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzMtY3JsLnZl
-						cmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhF
-						AQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
-						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQNRFwW
-						U0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0
-						dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNl
-						Y3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBuBggrBgEF
-						BQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7ko
-						lgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNs
-						b2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJcXRTU7G991oWCsCISna6fW9Gc9
-						2mAZyqoVdbZ++1b1g6WJHgbx9mv8ev01t3DRqShJtcihDbXPHwYXSJPSXHrF0o2b
-						plH5SecvOQZLYLhdYELuENgFuGnpNbwFNuLShwxSqJ8sP1KAVZCzVXaUGBh/uTga
-						YEJazv1XAChyIsHdasSR5LXssAKyqCpdQK4Anf+HPdP4dhG8TP70JW1JXdi9dFpn
-						jcNgfAG9iGMA98plT7ZpiTVpA8jd5tEkEF+LuoCCYxal1eEc4cgwMHtukW6XA7RM
-						CbkzvDlBR1tog67/sYGILCskqGHcCLSs0a2b5mhe7UGJLSoZJ1fGugCn/aI=
-					</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>
-						MIIFyDCCBLCgAwIBAgIQNYZVhZ6xUYZZKhRI4Ou2IDANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTExMTA5
-						MDAwMDAwWhcNMTQxMjA4MjM1OTU5WjCBtDELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
-						DUhlcnRmb3Jkc2hpcmUxEzARBgNVBAcUCkxldGNod29ydGgxHTAbBgNVBAoUFEFk
-						ZXB0IFNjaWVudGlmaWMgUExDMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
-						LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxJDAiBgNVBAMUG2VkdXN0b3JlLmFkZXB0
-						c2NpZW5jZS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjq
-						bNLrDFYokbHKskeF5Oxhf/zBZSeTdgD3c30Wwv8WD6w3k7jqCsIEN6tdZkIZMSLp
-						sQv27VpSau6oC8tDvNaxMkxrpJEGGuOI4BeIkcpDFaMQ+R43zTHwSUDRu17Dyjmh
-						6mbZ7Kizja8LMcPehjvryk2+AxfGyWhtG/j40gD9uaaZ69sRUnr4mItNKRPDMSE+
-						cDNQXy7iovQ/0d9FVsz1YjdB4Dm01IC5TSY7fRGrkioGObGk1W2P19r52yU0Yg8z
-						CVCB+sZTeSpw0qQD8FtBdP0ADZMQ5hIiL+iJRljaTl9KI1ES4FLRra1D6ycDtLM9
-						DvinO4p1kJg8Dn1GR6kCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-						AgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzMtY3JsLnZl
-						cmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhF
-						AQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
-						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQNRFwW
-						U0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0
-						dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNl
-						Y3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBuBggrBgEF
-						BQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7ko
-						lgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNs
-						b2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJcXRTU7G991oWCsCISna6fW9Gc9
-						2mAZyqoVdbZ++1b1g6WJHgbx9mv8ev01t3DRqShJtcihDbXPHwYXSJPSXHrF0o2b
-						plH5SecvOQZLYLhdYELuENgFuGnpNbwFNuLShwxSqJ8sP1KAVZCzVXaUGBh/uTga
-						YEJazv1XAChyIsHdasSR5LXssAKyqCpdQK4Anf+HPdP4dhG8TP70JW1JXdi9dFpn
-						jcNgfAG9iGMA98plT7ZpiTVpA8jd5tEkEF+LuoCCYxal1eEc4cgwMHtukW6XA7RM
-						CbkzvDlBR1tog67/sYGILCskqGHcCLSs0a2b5mhe7UGJLSoZJ1fGugCn/aI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edustore.adeptscience.co.uk/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Adept Scientific plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Adept Scientific UK Education Store</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.adeptscience.co.uk/about/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Ridley</SurName>
-    <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Ridley</SurName>
-    <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml b/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.xml
deleted file mode 100644
index 69cdb940..00000000
--- a/swamid-interfederations-2.0/edustore.adeptscience.co.uk-oasp.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://edustore.adeptscience.co.uk/oasp">
-  <!--
-		This is an OpenAthens SP for Adept Scientific plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFyDCCBLCgAwIBAgIQNYZVhZ6xUYZZKhRI4Ou2IDANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTExMTA5
-						MDAwMDAwWhcNMTQxMjA4MjM1OTU5WjCBtDELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
-						DUhlcnRmb3Jkc2hpcmUxEzARBgNVBAcUCkxldGNod29ydGgxHTAbBgNVBAoUFEFk
-						ZXB0IFNjaWVudGlmaWMgUExDMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
-						LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxJDAiBgNVBAMUG2VkdXN0b3JlLmFkZXB0
-						c2NpZW5jZS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjq
-						bNLrDFYokbHKskeF5Oxhf/zBZSeTdgD3c30Wwv8WD6w3k7jqCsIEN6tdZkIZMSLp
-						sQv27VpSau6oC8tDvNaxMkxrpJEGGuOI4BeIkcpDFaMQ+R43zTHwSUDRu17Dyjmh
-						6mbZ7Kizja8LMcPehjvryk2+AxfGyWhtG/j40gD9uaaZ69sRUnr4mItNKRPDMSE+
-						cDNQXy7iovQ/0d9FVsz1YjdB4Dm01IC5TSY7fRGrkioGObGk1W2P19r52yU0Yg8z
-						CVCB+sZTeSpw0qQD8FtBdP0ADZMQ5hIiL+iJRljaTl9KI1ES4FLRra1D6ycDtLM9
-						DvinO4p1kJg8Dn1GR6kCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-						AgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzMtY3JsLnZl
-						cmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhF
-						AQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
-						MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBQNRFwW
-						U0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0
-						dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNl
-						Y3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBuBggrBgEF
-						BQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7ko
-						lgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNs
-						b2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJcXRTU7G991oWCsCISna6fW9Gc9
-						2mAZyqoVdbZ++1b1g6WJHgbx9mv8ev01t3DRqShJtcihDbXPHwYXSJPSXHrF0o2b
-						plH5SecvOQZLYLhdYELuENgFuGnpNbwFNuLShwxSqJ8sP1KAVZCzVXaUGBh/uTga
-						YEJazv1XAChyIsHdasSR5LXssAKyqCpdQK4Anf+HPdP4dhG8TP70JW1JXdi9dFpn
-						jcNgfAG9iGMA98plT7ZpiTVpA8jd5tEkEF+LuoCCYxal1eEc4cgwMHtukW6XA7RM
-						CbkzvDlBR1tog67/sYGILCskqGHcCLSs0a2b5mhe7UGJLSoZJ1fGugCn/aI=
-					</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://edustore.adeptscience.co.uk/a4e/auth/rcv" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore.adeptscience.co.uk/a4e/auth/rcv" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edustore5.adeptscience.co.uk/a4e/auth/rcv" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Adept Scientific plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Adept Scientific plc: Adept4Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.adeptscience.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Ridley</SurName>
-    <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Ridley</SurName>
-    <EmailAddress>mailto:mark.ridley@adeptscientific.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 3c6ac57f..00000000
--- a/swamid-interfederations-2.0/eeyore.sjc.ox.ac.uk-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://eeyore.sjc.ox.ac.uk/shibboleth">
-  <!--
-		This is a "St John's College NAC" Shibboleth SP for the University of Oxford.
-	-->
-  <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-08-13T16:03:21Z"/>
-  </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://eeyore.sjc.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJAOXHkHR5abqcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2VleW9yZS5zamMub3guYWMudWswHhcNMTMwODEyMTAzMjIzWhcNMjMwODEw
-						MTAzMjIzWjAeMRwwGgYDVQQDExNlZXlvcmUuc2pjLm94LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuBOxdHKNQUD0B0kpIWMJEcpWgLxC1/S6
-						ZwH3owCAJnqwS8qtJpZWr4peEIDYX4E8uGNEubxui5ioMWxy/UAuUmWfcFoqZ6hV
-						KKT82iVjspi55puGb7SgBDWqMcQt/S03bVAl5XEJqmLg0L3kZSj1pCdUFijRTUPL
-						477LhTyaoZqCoTbnIpKkVUh8UjeIjco6pIhDv/bVTqSkO920lUVx8cnamZPy1jXG
-						tjAEzZxcpAH8zSXwkuffxNFWT1u2yhssIt1fjIGoO0DuJme74Ls3O8vP10Rl/gkh
-						0eGSvGlERCfQcM+KGu0xmHzLfd2vi0GtMYQYe03xFDOMGoUZW6P0iwIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNlZXlvcmUuc2pjLm94LmFjLnVrMB0GA1UdDgQWBBR3TJq8
-						XWc8yOsnJiEBJAzZm09K9jANBgkqhkiG9w0BAQUFAAOCAQEAHnBwN4rEVqh3b2Jl
-						HntNXIGqths1B+mdHXFEyWs8WcE0NZHp4Pvom4DYyWmwy2td4MaXwY4iEQLQFNCN
-						TZvcXjREowzMEu5Sx7odpGTffsJPMDhVzZpRYR5P3NBh4RxirdIS6NYec/bIf56I
-						4SqpthhygQU+TIz8CKekAe+9HI10m7iMxAnvSddcIR9dk9Zc56waQoynoE0lBo82
-						aT93LqeJd5zMxGEaSoZrxCsoOPW4zYUrHFNqQkmgKU5PMK1y7RIkERB4HTEl4QAg
-						b0Tcl7t7OcEG7lKUdAjOqW8E4DgrdSqzvhQCRI2rm2bKqpHq9CIMXFLlGITTKKOS
-						1FZTdQ==
-					</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://eeyore.sjc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://eeyore.sjc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St John's College NAC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sjc.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matt</GivenName>
-    <SurName>Jennings</SurName>
-    <EmailAddress>mailto:it-support@sjc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matt</GivenName>
-    <SurName>Jennings</SurName>
-    <EmailAddress>mailto:it-support@sjc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/efoyer.glam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/efoyer.glam.ac.uk-shibboleth.xml
deleted file mode 100644
index 17a31d5f..00000000
--- a/swamid-interfederations-2.0/efoyer.glam.ac.uk-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://efoyer.glam.ac.uk/shibboleth">
-  <!--
-		This is an "Efoyer Organisation" Shibboleth SP for the University of South Wales.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol         urn:oasis:names:tc:SAML:1.0: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://efoyer.glam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEFjCCAv6gAwIBAgIJANpMyk1kQRAJMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
-						VQQGEwJHQjEbMBkGA1UECBMSUmhvbmRkYSBDeW5vbiBUYWZmMRIwEAYDVQQHEwlU
-						cmVmb3Jlc3QxIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgR2xhbW9yZ2FuMQ0wCwYD
-						VQQLEwRMQ1NTMRowGAYDVQQDExFlZm95ZXIuZ2xhbS5hYy51azAeFw0xMjA1MDgw
-						OTA2MzNaFw0zMjA1MDMwOTA2MzNaMIGLMQswCQYDVQQGEwJHQjEbMBkGA1UECBMS
-						UmhvbmRkYSBDeW5vbiBUYWZmMRIwEAYDVQQHEwlUcmVmb3Jlc3QxIDAeBgNVBAoT
-						F1VuaXZlcnNpdHkgb2YgR2xhbW9yZ2FuMQ0wCwYDVQQLEwRMQ1NTMRowGAYDVQQD
-						ExFlZm95ZXIuZ2xhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAN4kgz4TvCUcw44kQHtV73yTm23GSLQ2iMySRCUthIbTCdg3nj7icN433D3o
-						RsT0iUCjOWKlroCQOx1Rt5HubJzQ6CptodtqujNFaGGBpzlXpFeqyt60vu6AX5xa
-						lcEdBBfPctYbfn6ioW/pJhNaBiYLAyt4u5ds3iCpj3VTkKWF2rLlIZ16QGtMq0bP
-						XgjUBRqufWWzcRLy496G6Wv9namhV9wBrJpzWf4jYVDdm5U8zc3NtXih3vdyn9gj
-						L5jnDnGsTIyrkxyL+GLwuQoEPtkomAnpJBTB+71cNuoottmqdaIv+DwR1HVS2gwv
-						e0RDi02Umo3UfeLpYONNsjnM4acCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FO7rrCmESBalKYdXW1ALKFihdCsjMB8GA1UdIwQYMBaAFO7rrCmESBalKYdXW1AL
-						KFihdCsjMA0GCSqGSIb3DQEBBQUAA4IBAQC6j+4T1O1FXXDC8kZ+JCGwilaKKfxh
-						Ivwnas/R+j6xv7TszUzIjaaSXycZdjH8z7DYXgedtotm9v4oO5ItrcsS/jsV0G8V
-						bwn7jJ518Dq9OIdvuvs3lFIdwoajxJdwQiQddOznFh4cWzG5/XgqVNSEUtjiPuK6
-						lee/vFySOO/silc+hYPLZO3Uf0fC/pE7LOf940D5rEmAH6KoEMNAE8MdXFJ/H+km
-						/Icjg2pu0TrSKd4w2J+oNs4zx2V9mDthQ9El/gOUlP66C49AHryg3Q2Frton8rcy
-						LhM4j8K3Z85HZOMAm5o9KbdApcJ5tX1yBg3JtB/LC5Keg5X7PxRoK8ck
-					</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>
-						MIIEFjCCAv6gAwIBAgIJANpMyk1kQRAJMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
-						VQQGEwJHQjEbMBkGA1UECBMSUmhvbmRkYSBDeW5vbiBUYWZmMRIwEAYDVQQHEwlU
-						cmVmb3Jlc3QxIDAeBgNVBAoTF1VuaXZlcnNpdHkgb2YgR2xhbW9yZ2FuMQ0wCwYD
-						VQQLEwRMQ1NTMRowGAYDVQQDExFlZm95ZXIuZ2xhbS5hYy51azAeFw0xMjA1MDgw
-						OTA2MzNaFw0zMjA1MDMwOTA2MzNaMIGLMQswCQYDVQQGEwJHQjEbMBkGA1UECBMS
-						UmhvbmRkYSBDeW5vbiBUYWZmMRIwEAYDVQQHEwlUcmVmb3Jlc3QxIDAeBgNVBAoT
-						F1VuaXZlcnNpdHkgb2YgR2xhbW9yZ2FuMQ0wCwYDVQQLEwRMQ1NTMRowGAYDVQQD
-						ExFlZm95ZXIuZ2xhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAN4kgz4TvCUcw44kQHtV73yTm23GSLQ2iMySRCUthIbTCdg3nj7icN433D3o
-						RsT0iUCjOWKlroCQOx1Rt5HubJzQ6CptodtqujNFaGGBpzlXpFeqyt60vu6AX5xa
-						lcEdBBfPctYbfn6ioW/pJhNaBiYLAyt4u5ds3iCpj3VTkKWF2rLlIZ16QGtMq0bP
-						XgjUBRqufWWzcRLy496G6Wv9namhV9wBrJpzWf4jYVDdm5U8zc3NtXih3vdyn9gj
-						L5jnDnGsTIyrkxyL+GLwuQoEPtkomAnpJBTB+71cNuoottmqdaIv+DwR1HVS2gwv
-						e0RDi02Umo3UfeLpYONNsjnM4acCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FO7rrCmESBalKYdXW1ALKFihdCsjMB8GA1UdIwQYMBaAFO7rrCmESBalKYdXW1AL
-						KFihdCsjMA0GCSqGSIb3DQEBBQUAA4IBAQC6j+4T1O1FXXDC8kZ+JCGwilaKKfxh
-						Ivwnas/R+j6xv7TszUzIjaaSXycZdjH8z7DYXgedtotm9v4oO5ItrcsS/jsV0G8V
-						bwn7jJ518Dq9OIdvuvs3lFIdwoajxJdwQiQddOznFh4cWzG5/XgqVNSEUtjiPuK6
-						lee/vFySOO/silc+hYPLZO3Uf0fC/pE7LOf940D5rEmAH6KoEMNAE8MdXFJ/H+km
-						/Icjg2pu0TrSKd4w2J+oNs4zx2V9mDthQ9El/gOUlP66C49AHryg3Q2Frton8rcy
-						LhM4j8K3Z85HZOMAm5o9KbdApcJ5tX1yBg3JtB/LC5Keg5X7PxRoK8ck
-					</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>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://efoyer.glam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of South Wales</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of South Wales: Efoyer</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.glam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services Support</GivenName>
-    <EmailAddress>mailto:itsupport@southwales.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Sewell</SurName>
-    <EmailAddress>mailto:kevin.sewell@southwales.ac.uk</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 193fcf44..00000000
--- a/swamid-interfederations-2.0/eka-idp.lanet.lv.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://eka-idp.lanet.lv">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The University College of Economics and Culture</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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - EKA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The University College of Economics and Culture- EKA IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lv">http://eka.edu.lv/</md:OrganizationURL>
-  </md: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/ekrksso.keeleressursid.ee-simplesaml-module.php-saml-sp-metadata.php-ekrk-sp.xml b/swamid-interfederations-2.0/ekrksso.keeleressursid.ee-simplesaml-module.php-saml-sp-metadata.php-ekrk-sp.xml
deleted file mode 100644
index 6e2b173d..00000000
--- a/swamid-interfederations-2.0/ekrksso.keeleressursid.ee-simplesaml-module.php-saml-sp-metadata.php-ekrk-sp.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/metadata.php/ekrk-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-05-15T09:54: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:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CELR Dienste</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CELR services</mdui:DisplayName>
-        <mdui:Description xml:lang="de">CELR Dienste</mdui:Description>
-        <mdui:Description xml:lang="en">CELR services</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://keeleressursid.ee/en/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://193.40.5.27/display/keeleressursid/Privacy+Policy+of+Center+of+Estonian+Language+Resources</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ekrksso.keeleressursid.ee</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ekrksso.keeleressursid.ee,OU=Domain Control Validated</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEfzCCA2egAwIBAgIQEHEZOlxMPA1OJ+5lCLnyNTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTIwNjAwMDAwMFoXDTE2MTIwNTIzNTk1OVowRzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSIwIAYDVQQDExlla3Jrc3NvLmtl
-ZWxlcmVzc3Vyc2lkLmVlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wDXZTjKFPgzC8w22Bfp7cvTj3cRFBACW4i5yhCG+oK+sT69WDhlMq1chr2tOUhgX
-u9ASJvS2ZZ2qKp+vX28GqQFQbyLARF4Lr93tA0if8NYPm5oi9ZLB9iPUvRHrdiEA
-A3jjMZ2TNqHEIsxJdJUWg4mtuaorwqjZn8qZ3mT8ia3qgIRJsAXzcO2MimvGmbWI
-l0l1u8bDD316+r3YZH6UkgASjAsv6iOsUE1VNU8Qd4cOG60BseupUFAAwK20zj8i
-upV4gXr8F+n+CFiLFui8pFXPrVND5SHPltWjlTprOaUv7aNaSUMMtetFsjvHQXQZ
-ln43JTlb12uZes+Oe9524wIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUDL2TaAzz
-3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFJqexvFu3FAXf3v9yEN07/a3hEbdMA4G
-A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
-BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAkBgNVHREEHTAbghlla3Jrc3NvLmtl
-ZWxlcmVzc3Vyc2lkLmVlMA0GCSqGSIb3DQEBBQUAA4IBAQCuuAWKbmr7yefGwYa1
-MvN/4O8L40d8SD5AF9GcRjjh7Azgf76xwG4wDtU41NFnBd+glWBUEYwM/YLzODwQ
-Wx46wW1FTRRwvmhId84J4AY+lFN/8Nv+iqQtS3PrdJu80wO9Lv8E7vWoi8yvL3bP
-mqBGjE3i4Pu03DisLwOZkGsrc8ngz5y/MWTLyZTkkBfalnaeusTzOeD36BV9xdtb
-nbjONxJYVASTlEUjqsj+Q2duXJw/ORjMlQ4bSi7fFNp0aM6RLXRNIMUNevkzz/Sv
-93XHII/BZkp4Tc6bqqZc8oQzV737EHHj49GvG6xVjQ2gY0E6K++MhI+3H31o24ib
-+w26
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml2-logout.php/ekrk-sp"/>
-    <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://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml2-acs.php/ekrk-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml1-acs.php/ekrk-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml2-acs.php/ekrk-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ekrksso.keeleressursid.ee/simplesaml/module.php/saml/sp/saml1-acs.php/ekrk-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CELR Dienste</md:ServiceName>
-      <md:ServiceName xml:lang="en">CELR services</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">CELR Dienste</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">CELR services</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="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="o" Name="urn:oid:2.5.4.10" 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="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="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Lauri</md:GivenName>
-    <md:SurName>Jesmin</md:SurName>
-    <md:EmailAddress>mailto:lauri.jesmin@ut.ee</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index aadf8bbf..00000000
--- a/swamid-interfederations-2.0/el-shib.redbridge-college.ac.uk-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" entityID="https://el-shib.redbridge-college.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Redbridge College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">redbridge-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE9TCCA92gAwIBAgIUagM7HIObwsBc6vG5npewc1u5v4cwDQYJKoZIhvcNAQEL
-						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDkwODE0NDk0
-						NVoXDTE4MDkwODE0NDk0MlowdTELMAkGA1UEBhMCR0IxDjAMBgNVBAgTBUVzc2V4
-						MRAwDgYDVQQHEwdST01GT1JEMRowGAYDVQQKExFSZWRicmlkZ2UgQ29sbGVnZTEo
-						MCYGA1UEAxMfZWwtc2hpYi5yZWRicmlkZ2UtY29sbGVnZS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMdTpjzblIBIPOjdndi8VlztmlSqEuuZ
-						z8SpTUUTsvdQY38lMSo4csothgJ3f2kZy1WAWLl+8JMwafwb/TIA3qr3flU7lY7P
-						EOX4mVJfw37baxrPsXbMVmT8KKoDjA4a8p1cF7vEMXZoNLOf3JSdBKirdUqr2GXI
-						OMT//ZGLvMi5HHVJVr06OPoq0nhjfdnKrXxGhubyXNvS7JvAEpG5hPhSyYJIcwNN
-						Yt/KYlDVKYg+rq1+xMKWe2Tum7gbR4zmI9SY/lM3a/0wEdCChUDydPdNDwKXzLi0
-						RQCqQXUW/bRkvdG3SP1zyxrp1FCIIpzTN8wHYpMb59yNAZZgABRPgY8CAwEAAaOC
-						AaMwggGfMHMGCCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3Au
-						cXVvdmFkaXNnbG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVv
-						dmFkaXNnbG9iYWwuY29tL3F2c3NsZzIuY3J0MCoGA1UdEQQjMCGCH2VsLXNoaWIu
-						cmVkYnJpZGdlLWNvbGxlZ2UuYWMudWswUQYDVR0gBEowSDBGBgwrBgEEAb5YAAJk
-						AQEwNjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20v
-						cmVwb3NpdG9yeTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-						CCsGAQUFBwMCMB8GA1UdIwQYMBaAFJEZYq1bF6cw+/DeOSWxvYy5uFEnMDoGA1Ud
-						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2c3Ns
-						ZzIuY3JsMB0GA1UdDgQWBBReigpWOKm7kmbecl3kbYHHmDYV2jANBgkqhkiG9w0B
-						AQsFAAOCAQEAyeqcraJy5YqVouvgEtoMq5XAZFubSHBJIVphFk5FxRDmQlV9JVtK
-						YHMjBsS3EtjmamuOiEzzlQU8MTGgPguM8ZbBk1RcaNu6NtOCltvsBmKJiu+5AGGt
-						xFwQUzuf2tFSYJeFopw4Xm1Min3RoOYUJoJSur929Is+yCzETPl37CYUaFGvyi41
-						DYGhDdUM7bgnCdwz5i8W13grJUGFAZ7DB/OslRZoI2V561ouAZniHqXmB/JYjCYu
-						igMV2oGL+OhHTWGj9vmEepjs+fV31OgQsYSsDiWjUPiVFR0qhdzVuMeoZ4j1EEkO
-						qNW7y+yIK2juWVtby4S8n7fOcXfOL1m8WA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://el-shib.redbridge-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://el-shib.redbridge-college.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://el-shib.redbridge-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://el-shib.redbridge-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://el-shib.redbridge-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://el-shib.redbridge-college.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">redbridge-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE9TCCA92gAwIBAgIUagM7HIObwsBc6vG5npewc1u5v4cwDQYJKoZIhvcNAQEL
-						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDkwODE0NDk0
-						NVoXDTE4MDkwODE0NDk0MlowdTELMAkGA1UEBhMCR0IxDjAMBgNVBAgTBUVzc2V4
-						MRAwDgYDVQQHEwdST01GT1JEMRowGAYDVQQKExFSZWRicmlkZ2UgQ29sbGVnZTEo
-						MCYGA1UEAxMfZWwtc2hpYi5yZWRicmlkZ2UtY29sbGVnZS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMdTpjzblIBIPOjdndi8VlztmlSqEuuZ
-						z8SpTUUTsvdQY38lMSo4csothgJ3f2kZy1WAWLl+8JMwafwb/TIA3qr3flU7lY7P
-						EOX4mVJfw37baxrPsXbMVmT8KKoDjA4a8p1cF7vEMXZoNLOf3JSdBKirdUqr2GXI
-						OMT//ZGLvMi5HHVJVr06OPoq0nhjfdnKrXxGhubyXNvS7JvAEpG5hPhSyYJIcwNN
-						Yt/KYlDVKYg+rq1+xMKWe2Tum7gbR4zmI9SY/lM3a/0wEdCChUDydPdNDwKXzLi0
-						RQCqQXUW/bRkvdG3SP1zyxrp1FCIIpzTN8wHYpMb59yNAZZgABRPgY8CAwEAAaOC
-						AaMwggGfMHMGCCsGAQUFBwEBBGcwZTAqBggrBgEFBQcwAYYeaHR0cDovL29jc3Au
-						cXVvdmFkaXNnbG9iYWwuY29tMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVv
-						dmFkaXNnbG9iYWwuY29tL3F2c3NsZzIuY3J0MCoGA1UdEQQjMCGCH2VsLXNoaWIu
-						cmVkYnJpZGdlLWNvbGxlZ2UuYWMudWswUQYDVR0gBEowSDBGBgwrBgEEAb5YAAJk
-						AQEwNjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20v
-						cmVwb3NpdG9yeTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-						CCsGAQUFBwMCMB8GA1UdIwQYMBaAFJEZYq1bF6cw+/DeOSWxvYy5uFEnMDoGA1Ud
-						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2c3Ns
-						ZzIuY3JsMB0GA1UdDgQWBBReigpWOKm7kmbecl3kbYHHmDYV2jANBgkqhkiG9w0B
-						AQsFAAOCAQEAyeqcraJy5YqVouvgEtoMq5XAZFubSHBJIVphFk5FxRDmQlV9JVtK
-						YHMjBsS3EtjmamuOiEzzlQU8MTGgPguM8ZbBk1RcaNu6NtOCltvsBmKJiu+5AGGt
-						xFwQUzuf2tFSYJeFopw4Xm1Min3RoOYUJoJSur929Is+yCzETPl37CYUaFGvyi41
-						DYGhDdUM7bgnCdwz5i8W13grJUGFAZ7DB/OslRZoI2V561ouAZniHqXmB/JYjCYu
-						igMV2oGL+OhHTWGj9vmEepjs+fV31OgQsYSsDiWjUPiVFR0qhdzVuMeoZ4j1EEkO
-						qNW7y+yIK2juWVtby4S8n7fOcXfOL1m8WA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://el-shib.redbridge-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://el-shib.redbridge-college.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">Redbridge College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Redbridge College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.redbridge-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Costas</GivenName>
-    <SurName>Calcanis</SurName>
-    <EmailAddress>mailto:ccalcanis@redbridge-college.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Costas</GivenName>
-    <SurName>Calcanis</SurName>
-    <EmailAddress>mailto:ccalcanis@redbridge-college.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Rix</SurName>
-    <EmailAddress>mailto:SRix@redbridge-college.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml b/swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml
deleted file mode 100644
index 6d89e60c..00000000
--- a/swamid-interfederations-2.0/elearning.asnet.am-shibboleth.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elearning.asnet.am/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.asnet.am" registrationInstant="2015-08-22T12:52:43Z"/>
-  </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://elearning.asnet.am/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://elearning.asnet.am/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ASNET-AM E-Learning Platform</mdui:DisplayName>
-        <mdui:Description xml:lang="hy">ASNET-AM E-Learning  service provides online courses for the students of the National Academy of Sciences of the Republic of Armenia and beyond in Moodle. Moodle is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://elearning.asnet.am/moodle/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>elearning.asnet.am</ds:KeyName>
-        <ds:KeyName>www.elearning.asnet.am</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFpjCCBI6gAwIBAgIRALYbJfMx2YKNrR/xrgIpYdYwDQYJKoZIhvcNAQELBQAw
-gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
-VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-Q0EwHhcNMTUwNTE4MDAwMDAwWhcNMTgwNTE3MjM1OTU5WjCBoDEhMB8GA1UECxMY
-RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUkwRwYDVQQLE0BIb3N0ZWQgYnkgSW5z
-dGl0dXRlIGZvciBJbmZvcm1hdGljcyBhbmQgQXV0b21hdGlvbiBQcm9ibGVtcyBO
-QVMuMRMwEQYDVQQLEwpDT01PRE8gU1NMMRswGQYDVQQDExJlbGVhcm5pbmcuYXNu
-ZXQuYW0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEXMgh+DkGHpsu
-YD8CDbvKzAK9IGgmxviLfBCtGZi4E0EAwyoJfgLEGNH8wxWQkAPhhiaBiJqPjZAX
-J4RqON8Y3RDFY0zAt2fqF7WRjmHfrVWoc3m6nusGdRLV/MZC/iuE7lVaHQ+tSqS6
-zLib4lO6WtXsBz+CazYCOAi7qE88zFwTsanaa/ule6RxuTBjpIKrS9igN5yhDgFx
-sZIJNIKrksfpzhsiIk2uIA+pql3GE+z3CEsRAJemCoUyv3qm8VvXh/+H15PZqK/i
-6Iwb6R1GubkBilA5cVocxKA1pc4NHhh3Y+Q02EmP6FE0mVVnDqf0RAlBpnkj3DCD
-J13UyO1rAgMBAAGjggHnMIIB4zAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0
-Oija5zAdBgNVHQ4EFgQU3NLawTnsQzZy5tclxTYAwXdl868wDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-ME8GA1UdIARIMEYwOgYLKwYBBAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6
-Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBH
-oEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlk
-YXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEF
-BQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFs
-aWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29j
-c3AuY29tb2RvY2EuY29tMDUGA1UdEQQuMCyCEmVsZWFybmluZy5hc25ldC5hbYIW
-d3d3LmVsZWFybmluZy5hc25ldC5hbTANBgkqhkiG9w0BAQsFAAOCAQEAQxf5uG7Q
-8WZOmAvDH46Zsn8AmgBe45xtpVpqipYyaVwYvkIAYsPBCA7m8sjeJjGyafLxBn4t
-j+p+aLdLQG1TAcsZZkMya4ELgvYpx4q0b1hhxel3dnV/gr1dhmTehSaNM2R4FOL9
-dGguvuqP9EnVqEexXN0AG2XRDQhn7LpwjGj1EjDlQ8+8lYBFvXh1RPsdWi7/U4Yp
-9zM1sUMRewMmlDlpizbjRL9y3YdQU0eG7z7b02n+Ym+atm6A6giXA9YfuCf/4xP7
-z1vrYPooAcnln7HnvUGEQ1mw32N/nRkJA8dDxVaU8d0WFH4QVUuJXt0pdNpVJ3Uh
-4ilH5zaIpJbAkg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <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#rsa-oaep-mgf1p"/>
-      <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/2009/xmlenc11#rsa-oaep"/>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFpjCCBI6gAwIBAgIRALYbJfMx2YKNrR/xrgIpYdYwDQYJKoZIhvcNAQELBQAw
-gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
-VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-Q0EwHhcNMTUwNTE4MDAwMDAwWhcNMTgwNTE3MjM1OTU5WjCBoDEhMB8GA1UECxMY
-RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUkwRwYDVQQLE0BIb3N0ZWQgYnkgSW5z
-dGl0dXRlIGZvciBJbmZvcm1hdGljcyBhbmQgQXV0b21hdGlvbiBQcm9ibGVtcyBO
-QVMuMRMwEQYDVQQLEwpDT01PRE8gU1NMMRswGQYDVQQDExJlbGVhcm5pbmcuYXNu
-ZXQuYW0wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEXMgh+DkGHpsu
-YD8CDbvKzAK9IGgmxviLfBCtGZi4E0EAwyoJfgLEGNH8wxWQkAPhhiaBiJqPjZAX
-J4RqON8Y3RDFY0zAt2fqF7WRjmHfrVWoc3m6nusGdRLV/MZC/iuE7lVaHQ+tSqS6
-zLib4lO6WtXsBz+CazYCOAi7qE88zFwTsanaa/ule6RxuTBjpIKrS9igN5yhDgFx
-sZIJNIKrksfpzhsiIk2uIA+pql3GE+z3CEsRAJemCoUyv3qm8VvXh/+H15PZqK/i
-6Iwb6R1GubkBilA5cVocxKA1pc4NHhh3Y+Q02EmP6FE0mVVnDqf0RAlBpnkj3DCD
-J13UyO1rAgMBAAGjggHnMIIB4zAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0
-Oija5zAdBgNVHQ4EFgQU3NLawTnsQzZy5tclxTYAwXdl868wDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-ME8GA1UdIARIMEYwOgYLKwYBBAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6
-Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBH
-oEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlk
-YXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEF
-BQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFs
-aWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29j
-c3AuY29tb2RvY2EuY29tMDUGA1UdEQQuMCyCEmVsZWFybmluZy5hc25ldC5hbYIW
-d3d3LmVsZWFybmluZy5hc25ldC5hbTANBgkqhkiG9w0BAQsFAAOCAQEAQxf5uG7Q
-8WZOmAvDH46Zsn8AmgBe45xtpVpqipYyaVwYvkIAYsPBCA7m8sjeJjGyafLxBn4t
-j+p+aLdLQG1TAcsZZkMya4ELgvYpx4q0b1hhxel3dnV/gr1dhmTehSaNM2R4FOL9
-dGguvuqP9EnVqEexXN0AG2XRDQhn7LpwjGj1EjDlQ8+8lYBFvXh1RPsdWi7/U4Yp
-9zM1sUMRewMmlDlpizbjRL9y3YdQU0eG7z7b02n+Ym+atm6A6giXA9YfuCf/4xP7
-z1vrYPooAcnln7HnvUGEQ1mw32N/nRkJA8dDxVaU8d0WFH4QVUuJXt0pdNpVJ3Uh
-4ilH5zaIpJbAkg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elearning.asnet.am/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elearning.asnet.am/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elearning.asnet.am/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elearning.asnet.am/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elearning.asnet.am/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elearning.asnet.am/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://elearning.asnet.am/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elearning.asnet.am/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://elearning.asnet.am/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elearning.asnet.am/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elearning.asnet.am/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">ASNET-AM E-Learning Platform</md:ServiceName>
-      <md:ServiceDescription xml:lang="hy">ASNET-AM E-Learning  service provides online courses for the students of the National Academy of Sciences of the Republic of Armenia and beyond in Moodle. Moodle is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised learning environments.</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="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="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Academic Scientific Network of Armenia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ASNET-AM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.asnet.am/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andranik</md:GivenName>
-    <md:SurName>Hayrapetyan</md:SurName>
-    <md:EmailAddress>mailto:andranik@ipia.sci.am</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml b/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml
deleted file mode 100644
index a4f7657e..00000000
--- a/swamid-interfederations-2.0/elegitimation2.inloggning.se.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/metadata.php/virtual_sp_for_swamid_uu">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/discoresp.php"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEsDCCBBmgAwIBAgIBADANBgkqhkiG9w0BAQQFADCB8DELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxSDBGBgNVBAsUP1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVV9TdmVJRDElMCMGA1UEAxMcU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBlLWlkZW50aXRldC5zZTAgFw0xMjEyMTEyMjE4MjhaGA8yMDU1MDEwNTIyMTgyOFowgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJgNj1MBi3HtyKLiiZQq4Ks0yMhk+XX5D1lXcL7r7G94s3w6cPteJZFR2/1DsARbR19SLtoG+zn7iLu5bagpIr906023MVKOc9l6zPuoMtQ71VUVsXmWdgFXTR2qln9eqE4cayuYkv2OxwrRLVa2fe3dyVksCb59Mpw3hiTpP8Q5AgMBAAGjggFUMIIBUDAdBgNVHQ4EFgQUkZFvxByU7cCnZCBjw1B6VypLOn0wggEfBgNVHSMEggEWMIIBEoAUkZFvxByU7cCnZCBjw1B6VypLOn2hgfakgfMwgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQA+7VYhtODAKIhU4s8kZh1aZuS8oLjYcUksLEFBXyTICHW7Z9UEpiWiMyIOvjS5CVpNoJxglmoNOia+Aq8b9Rrp3PBx8AZ7FNfOeBiznbMi76m2rF2GVFO2WqWORA2N/Ip+YChecbMEB31KoG1HTatvpjI8T+c147pH8FmBRA0PBA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEsDCCBBmgAwIBAgIBADANBgkqhkiG9w0BAQQFADCB8DELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcGxhbmQxEDAOBgNVBAcTB1VwcHNhbGExJTAjBgNVBAoTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxSDBGBgNVBAsUP1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVV9TdmVJRDElMCMGA1UEAxMcU3ZlbnNrIGUtaWRlbnRpdGV0IEFCIHZpYSBVVTElMCMGCSqGSIb3DQEJARYWc3VwcG9ydEBlLWlkZW50aXRldC5zZTAgFw0xMjEyMTEyMjE4MjhaGA8yMDU1MDEwNTIyMTgyOFowgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2UwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJgNj1MBi3HtyKLiiZQq4Ks0yMhk+XX5D1lXcL7r7G94s3w6cPteJZFR2/1DsARbR19SLtoG+zn7iLu5bagpIr906023MVKOc9l6zPuoMtQ71VUVsXmWdgFXTR2qln9eqE4cayuYkv2OxwrRLVa2fe3dyVksCb59Mpw3hiTpP8Q5AgMBAAGjggFUMIIBUDAdBgNVHQ4EFgQUkZFvxByU7cCnZCBjw1B6VypLOn0wggEfBgNVHSMEggEWMIIBEoAUkZFvxByU7cCnZCBjw1B6VypLOn2hgfakgfMwgfAxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBsYW5kMRAwDgYDVQQHEwdVcHBzYWxhMSUwIwYDVQQKExxTdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVMUgwRgYDVQQLFD9TdmVuc2sgZS1pZGVudGl0ZXQgQUIgdmlhIFVVX1N2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVVfU3ZlSUQxJTAjBgNVBAMTHFN2ZW5zayBlLWlkZW50aXRldCBBQiB2aWEgVVUxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZS1pZGVudGl0ZXQuc2WCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQA+7VYhtODAKIhU4s8kZh1aZuS8oLjYcUksLEFBXyTICHW7Z9UEpiWiMyIOvjS5CVpNoJxglmoNOia+Aq8b9Rrp3PBx8AZ7FNfOeBiznbMi76m2rF2GVFO2WqWORA2N/Ip+YChecbMEB31KoG1HTatvpjI8T+c147pH8FmBRA0PBA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-logout.php/virtual_sp_for_swamid_uu"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-acs.php/virtual_sp_for_swamid_uu" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml1-acs.php/virtual_sp_for_swamid_uu" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-acs.php/virtual_sp_for_swamid_uu" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml1-acs.php/virtual_sp_for_swamid_uu/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Svensk e-identitet AB via UU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Svensk e-identitet AB via UU</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.e-identitet.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mikael</md:GivenName>
-    <md:SurName>Westoo</md:SurName>
-    <md:EmailAddress>mikael.westoo@e-identitet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elektra.bsb-muenchen.de.xml b/swamid-interfederations-2.0/elektra.bsb-muenchen.de.xml
deleted file mode 100644
index ce16a7fe..00000000
--- a/swamid-interfederations-2.0/elektra.bsb-muenchen.de.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elektra.bsb-muenchen.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>elektra.bsb-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=elektra.bsb-muenchen.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzzCCBLegAwIBAgIEDqN6FjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNVBAoT
-G0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJpc2No
-ZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG9w0B
-CQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMDkwODEzMTE0NDA2WhcNMTQwODEy
-MTE0NDA2WjCBnzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UE
-BxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhl
-azEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMSAwHgYDVQQD
-ExdlbGVrdHJhLmJzYi1tdWVuY2hlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAN7Ez06ZGFW2qRt6TT1XX2pDeQ77ZID+punNbvRhg6JSvSOrQqmf
-9BVvWSh6OgWU1qUdC3M8VQ0S/15RcdgJI6G5NFQZO9RGyi+XW2z8DAgZ5mENbacG
-xfponlazmx8s4Z4H0ql4+24bei0hgAd0XReaMsMKOPDL3giaKXCtPQOCKri033V8
-magAFFnjQ62MRNI3Ani1WZ8gzfQrbdmEwt5xaYGe+cIveUmEEHhLNpE3WgpWPHZm
-40WST0FZBeW7XFKrCWqI2CBJvHbkLE6tCJweoCS6XTLhjvD0CPvBdKSfTW2T2GG0
-7puLVNAPyve/k5aNldQMWsMQm/qAAVi4Q/UCAwEAAaOCAfwwggH4MAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
-BgNVHQ4EFgQU1VAUVL1KQEJcllaGZ3cK7zmTQ3UwHwYDVR0jBBgwFoAUemeMWxoT
-RIKzIVobKorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Jh
-eWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5j
-cmwwgcoGCCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAp1+BjRR9kfoUqN2Sw
-cSFdlI/x9YYNRL+/Felm1TF+KtBMdPtx/oWVnNhvxGXxwwlWJ/1RpHA4Prd01+IR
-W/6qISA19D58AJaim/bRe6gtfWM65XtOAzgvoLBRDj1zO0FS3yj7mdcvodhmtP2q
-55k6F4c/lC1y/bbytpSurlUsIF5QU6HeKSWwpbKCg/JK6at+75E4Uk/DFagfqDg4
-J0TTCKM98DtgZ7+9K5wYyx20HhlDKGm4V/pj5hDeiirCsp8UXO5fcQmvvwvAe4uw
-iI4aaIJAqMcdKoi0xt6antv5F/bxsqzJskIbJiyIT2qeCoT+rVZ9SmIZh3u/Zwqj
-56P0
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/NIM/SOAP"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elektra.bsb-muenchen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://elektra.bsb-muenchen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Wunderle</GivenName>
-    <SurName>Heinrich</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elibrary.exeter.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/elibrary.exeter.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 6ac839f4..00000000
--- a/swamid-interfederations-2.0/elibrary.exeter.ac.uk-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://elibrary.exeter.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Exeter.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-28T11:40:20Z">
-      <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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVAOP6GrMkKxO9yMqoKbYdziUW5Us3MA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFWVsaWJyYXJ5LmV4ZXRlci5hYy51azAeFw0xNDA0MDMx
-						MjMwMjZaFw0zNDA0MDMxMjMwMjZaMCAxHjAcBgNVBAMTFWVsaWJyYXJ5LmV4ZXRl
-						ci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKojNDBQ8LbZ
-						Uf61goxjh4qDc6zHNorfqopmt9DY4x4glyXSNWNoR6X0wWdYuw1z5GtkJ3OusPnt
-						27LxXzfuVvlvTUoSGHN4vyfYZJXBV17UY2cQ6fUOFr2sJHVbrdZq/ZmAcioElWsD
-						ju1IVuJhKb9L+1022JVjN14vExmTWTIojSqqVyTBFnaI5XCtscw43Anr0iC0nutD
-						enlLoYcb8nA/e4aILaHDEyeI7IOnXrQHONeGyjl57ZADPbTC2qzR4NaJXzcGXqI5
-						Yy9efygA64gj4AtGZ67N91tW5HvV4p2R+qlqcHibwTw8Enm3gaxW0lVXIyjH1faz
-						q4WWzOT7BosCAwEAAaNxMG8wTgYDVR0RBEcwRYIVZWxpYnJhcnkuZXhldGVyLmFj
-						LnVrhixodHRwczovL2VsaWJyYXJ5LmV4ZXRlci5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUN7GPtVF+uf94nJBrKy9ijZCZCJkwDQYJKoZIhvcNAQEFBQAD
-						ggEBAJfyEYB5cvTYpykqYa21KPVIk1VWE0yN4SF1Z5+fjMMqtUaIRmn7ibD35DOZ
-						G+5tomhmvABCOmJxp9aE5Xwad8KKjOIEA3xbbCrGGt7f6y1BXx6uMlG6AtR0FRt5
-						iuU7ZQa80d4m/MvjkgSqE1m4rb4jpQXRu1HJC15vr18CTCYbp8RNlK2k/vdeVLNO
-						2hFZ2UpcmkXByppuzNmBRcBEWiv5LY/Hkqfo/uZxRU3L3usXS7NkitiutCkw+ONX
-						QK8acXLPGLA7lZvEvn9Evdtmww7nVxXgDn4szwnBDMrK5Oa3iIOfERc8vGwOhml9
-						k/ghAamkGmPY9rRXgtQYfnZ2NwE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://elibrary.exeter.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elibrary.exeter.ac.uk: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://elibrary.exeter.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elibrary.exeter.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://elibrary.exeter.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elibrary.exeter.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">exeter.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVAOP6GrMkKxO9yMqoKbYdziUW5Us3MA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFWVsaWJyYXJ5LmV4ZXRlci5hYy51azAeFw0xNDA0MDMx
-						MjMwMjZaFw0zNDA0MDMxMjMwMjZaMCAxHjAcBgNVBAMTFWVsaWJyYXJ5LmV4ZXRl
-						ci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKojNDBQ8LbZ
-						Uf61goxjh4qDc6zHNorfqopmt9DY4x4glyXSNWNoR6X0wWdYuw1z5GtkJ3OusPnt
-						27LxXzfuVvlvTUoSGHN4vyfYZJXBV17UY2cQ6fUOFr2sJHVbrdZq/ZmAcioElWsD
-						ju1IVuJhKb9L+1022JVjN14vExmTWTIojSqqVyTBFnaI5XCtscw43Anr0iC0nutD
-						enlLoYcb8nA/e4aILaHDEyeI7IOnXrQHONeGyjl57ZADPbTC2qzR4NaJXzcGXqI5
-						Yy9efygA64gj4AtGZ67N91tW5HvV4p2R+qlqcHibwTw8Enm3gaxW0lVXIyjH1faz
-						q4WWzOT7BosCAwEAAaNxMG8wTgYDVR0RBEcwRYIVZWxpYnJhcnkuZXhldGVyLmFj
-						LnVrhixodHRwczovL2VsaWJyYXJ5LmV4ZXRlci5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUN7GPtVF+uf94nJBrKy9ijZCZCJkwDQYJKoZIhvcNAQEFBQAD
-						ggEBAJfyEYB5cvTYpykqYa21KPVIk1VWE0yN4SF1Z5+fjMMqtUaIRmn7ibD35DOZ
-						G+5tomhmvABCOmJxp9aE5Xwad8KKjOIEA3xbbCrGGt7f6y1BXx6uMlG6AtR0FRt5
-						iuU7ZQa80d4m/MvjkgSqE1m4rb4jpQXRu1HJC15vr18CTCYbp8RNlK2k/vdeVLNO
-						2hFZ2UpcmkXByppuzNmBRcBEWiv5LY/Hkqfo/uZxRU3L3usXS7NkitiutCkw+ONX
-						QK8acXLPGLA7lZvEvn9Evdtmww7nVxXgDn4szwnBDMrK5Oa3iIOfERc8vGwOhml9
-						k/ghAamkGmPY9rRXgtQYfnZ2NwE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://elibrary.exeter.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elibrary.exeter.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">University of Exeter</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Exeter</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.as.exeter.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Exeter IT Helpdesk</GivenName>
-    <EmailAddress>mailto:Helpdesk@exeter.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:L.W.Taylor@exeter.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Pete</GivenName>
-    <SurName>Leggett</SurName>
-    <EmailAddress>mailto:P.F.Leggett@exeter.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elibrary.worldbank.org-shibboleth.xml b/swamid-interfederations-2.0/elibrary.worldbank.org-shibboleth.xml
deleted file mode 100644
index bdd6b284..00000000
--- a/swamid-interfederations-2.0/elibrary.worldbank.org-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://elibrary.worldbank.org/shibboleth">
-  <!--
-		This is a "The World Bank eLibrary" OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-25T15:34:28Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIJAI5LIjhAEpIhMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmVsaWJyYXJ5LndvcmxkYmFuay5vcmcwHhcNMTMwOTE3MDA1MDQwWhcNMjMw
-						OTE1MDA1MDQwWjAhMR8wHQYDVQQDExZlbGlicmFyeS53b3JsZGJhbmsub3JnMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3S7w37V6m/GqIL1LGWuPeQKw
-						1FL3uCT8+q6+0OervJkZgHCJJ++CYHdSNF9Jb4UjVGWv2sSxTgg5P3eNxUVh5R0g
-						hySv7X/aK9t0LVqQiSsLyLD253BZG85FYZMsNDiuv1Xfl7TL/QQy+B6hTxz8Wgxx
-						lQXIyE8FEZGqdw40gPgwfPQIBMoN9lg4n9vzxSm76eaz6+tWvdmNDarieQWzVJfS
-						VY5ag5yJaP+eed6cg/el7JYR5GKKRYg7NdfK+bxboweqp2Dt/wBZJRGuU6eP9hEb
-						0nw/C0s+DctACkwaFedLMKqtFL1oDvQ5yH2tdo0HlHb0lMDtgBUUSwwG+nnqHwID
-						AQABo28wbTBMBgNVHREERTBDghZlbGlicmFyeS53b3JsZGJhbmsub3JnhilodHRw
-						czovL2VsaWJyYXJ5LndvcmxkYmFuay5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						E/UPyX8ixQSfN/glJWMYTjzp0qwwDQYJKoZIhvcNAQEFBQADggEBANUr3Z6lfY5F
-						hFtckOlFEmhIqflcg1l97HvZjNOuN6oyDELHUQPuwNLePhvw3g/9nlLiGHUKsOSx
-						sJUg2pnhKTYSv9uRZKLnOBlCGYcUCq8ujZbeumMeQkpvNPS9uOXPhk5uVXb7Fpbz
-						idO7RtqcE3SBE2HvAoabnSQEjcfqGgzkAAWHZJleNUcTVLmJXQ0TiCKjbnHAVhw+
-						iuGKiF0alO/SBU25m6KejfGVie/MMQ8jXzXME7dsrLbHkbzmhgDvt0F/MCBYo3Uu
-						4bnQnWMrou+VPRJp4eaUHXVBGBahrzgLvCm4VwljY9141+R58jaaV44VwntYJnIe
-						nkzg8bDWiJo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elibrary.worldbank.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elibrary.worldbank.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elibrary.worldbank.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The World Bank eLibrary</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://elibrary.worldbank.org/</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/eliot.isae.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.xml
deleted file mode 100644
index dcab8a08..00000000
--- a/swamid-interfederations-2.0/eliot.isae.fr-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://eliot.isae.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB10lEQVQoz42SPWiTURSG3/MlaZQYW6zFEK0giKtWFysKjoIiOAni1lFwcHdzcRO14iA4KjhZEUEUBPGnxUCzmKhJLfTHRJrmr8n3ffnuPa/DTeogWg9nuud57+U8XFEa/KVIsxGstMP43pFxQt2h9wcmAk8QA8ST5Lvyfc9LbM6UkMELnkAAoNvtVard0tf0yROyfagbrbV8ZIezhApQ3FAojVKjUvnnxamlQ5MFYG7iaKv4maTSkEqq0pBmOYguzNZdwNJEb4AZIH9nmqSjHUda0ras2fX8x9RsbRAgZ46dqpdLJNd7fYi09Si6WWi9Xung6SoeL+XqoSgtaKGBxNJusdsLwWq7d3xsSCCvquHdcgfNEOnEufHUs8kRUeujU0T6MKAABDLfwcSLCqh9EXFBpbMzk1o4mxmN0WNzDukjAzrWaAe3rj644S+e2bcDIiBATJ/e83a/X5pfVAK29lL7Qvgp//38pXuNVoekb02+GYa0lz/WruQaTkQQBtD1D27pwpfla9efkCTtwI8hTa4eroURaZw3qGnTX+kZ42gdDDbbxfR3gJbUh4/e+0Hg7v53ewABjI2mtiWTBLFVCWkL36oHD+xOxL2tcfdbs5nhRDz2PzSAX0MzmO2supXMAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjA1KzAyOjAwhgDtkQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowNSswMjowMPddVS0AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.isae.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://eliot.isae.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eliot.isae.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://eliot.isae.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ISAE Institut Supérieur de l'Aéronautique et de l'Espace</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ISAE Institut Supérieur de l'Aéronautique et de l'Espace</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.isae.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Mouchoir</md:SurName>
-    <md:EmailAddress>david.mouchoir@isae.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Villemur</md:SurName>
-    <md:EmailAddress>jacques.villemur@isae.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elixir.mf.uni-lj.si-20140918.xml b/swamid-interfederations-2.0/elixir.mf.uni-lj.si-20140918.xml
deleted file mode 100644
index 432dfe28..00000000
--- a/swamid-interfederations-2.0/elixir.mf.uni-lj.si-20140918.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elixir.mf.uni-lj.si/20140918">
-  <md:Extensions>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-26T10:11:10Z">
-      <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <req:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/Login"/>
-      <disco:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ELIXIR eLearning platform</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">ELIXIR eLearning platform</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ELIXIR eLearning platform</mdui:Description>
-        <mdui:Description xml:lang="sl">ELIXIR eLearning platform</mdui:Description>
-        <mdui:Keywords xml:lang="en">ELIXIR eLearning platform medical faculty life sciences uni-lj slovenia</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Spletna učilnica elixir medicinska fakulteta uni-lj slovenia</mdui:Keywords>
-        <mdui:Logo height="93" width="150">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://elixir.mf-uni-lj.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">https://elixir.mf-uni-lj.si</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>elixir.mf.uni-lj.si</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=elixir.mf.uni-lj.si</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFADCCAuigAwIBAgIJAO8ad9fwiJL9MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE2VsaXhpci5tZi51bmktbGouc2kwHhcNMTQwOTE4MTI0OTM5WhcNMjQwOTE1MTI0OTM5WjAeMRwwGgYDVQQDExNlbGl4aXIubWYudW5pLWxqLnNpMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqA/GmkgC+iCCCZh7RWFGz3Q1cnjE24zx0q4L15ia7G2heB0N2ERQT+tg8zyRIZV1Kdzk1OhIqQhvHnNHhgt2BHva9nh+z/mPbVObfjR+DDVnoyZBYnHLKzVDRGNMHMQM9kS/p5dMRb8OBwjW+iRN9aw6zdwsqwC1NprOhcgPQuvDOQ/jX/6NXX39DwxQ03uYcTKbgl+u/slIvuGJDg0tS+8iMedKyHTXFebszbR5nRKr3yakYTIUrLI5WuHssi84JHxydXg37BK3uDqjMGAXT4V8e17cwyxTB7E7qBi5g0FNREnhQ3lzXX5aFmNhNPf46Yr0FQM9fwaRTteumMD9TDfGuEDlB2P/zuDjt43eBi0SPY88sGMOfvfn9i4H5hj4KDxFJhrFbAoI5YGUtJ183tAj12P7HryWMpk9TQhtPdZ1H2QxzwlCy22waeOm0zVBuNEAlTlHZcswBxWfQzwSI4pklkVgFrQ5D3lPi34BSVf5UgBj/FFnnI/fLM1Agy069vrDlFp+I7Tp2eRLxU2UBL/gRHimBGBOf7VLUR3PzzSYxHVDnvRBF2DE46w+C3T1kFNgEhLjcY2pYy9ExqVii5W05EsQXKRbpjoxdJstOpW9dPRzOup5+ttQ1+dwfRzvHwnQBDOuUMF8L5BORrVomHU9vPIT46A3UE4dwtFFU6kCAwEAAaNBMD8wHgYDVR0RBBcwFYITZWxpeGlyLm1mLnVuaS1sai5zaTAdBgNVHQ4EFgQUeQnbD0nYm0aw9HPyYkS45iQNWWcwDQYJKoZIhvcNAQEFBQADggIBAAZxUWehEX3qA0ZfWXSLhMYx95M+HrR9SIg+ekcxEMKPFl8+eStzVQu9jpF4shRBmHrKhZh+4g+gB2/4KxNoaHkLLaguxMcHEUkdkP3e14m1xHEHA3RA+2PSuz/216uQsOqd42Stmogz6Sqx1OJrxgpi0w2b7oqm5uZvVDqRf239Ruq44Iomm33VaJX8msDQb9LNQqQWv1exN5iYLudCD6+F0Uk8Z9JkZA+s+8B3wwIGoG7hDF09rUiNE4/z0z7ndZAprohWiXHhWCIPHSmjuagLN3ubnZ8837jDU4oSh54FBO1/1e0YQoIhKDGcc5G7iYsHdfSEShL79RgsM/WWkRsfU4wcq6Ju0ZLKkU4eUPM7Wwmr4Iy0+U93qTCNeT5Lm//BJKOuq5NxlwPTCxxkERGwNM4bsvHSsCmlxK/K/oDIWF7K7isSNSx06BGitXgE2qhvoFMCoW+/B5XXjPNzzpotXA3EmaJDmxrlb+kaB82H5MPWPuC69wOlXEWrwexfqVzPMpEW73chik2l480XhzreiXRY7EgV78wqQ88prvIj1+hv9OPnwSWoeryZTTPa2tCwn3n98pxvG7RTP82EQPvYoN/Dpen4M0oLWYT56zHDtVm7eIww+FPy/RTG0NN2CV3mM9br80uepO2kvnaNfQL+IX41mXh1GgwXy+MnCQ50</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://elixir.mf.uni-lj.si/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">ELIXIR eLearning platform</md:ServiceName>
-      <md:ServiceName xml:lang="sl">ELIXIR eLearning platform</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">ELIXIR eLearning platform</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sl">ELIXIR eLearning platform</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"/>
-      <md:RequestedAttribute FriendlyName="rfc822Mailbox" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format: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="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">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://elixir.mf-uni-lj.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">https://elixir.mf-uni-lj.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Dušan</md:GivenName>
-    <md:SurName>Šuput</md:SurName>
-    <md:EmailAddress>mailto:dusan.suput@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:elixir@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Damijan</md:GivenName>
-    <md:SurName>Senčar</md:SurName>
-    <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Emil</md:GivenName>
-    <md:SurName>Hudomalj</md:SurName>
-    <md:EmailAddress>mailto:emil.hudomalj@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Branimir</md:GivenName>
-    <md:SurName>Leskošek</md:SurName>
-    <md:EmailAddress>mailto:brane.leskosek@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jure</md:GivenName>
-    <md:SurName>Pesko</md:SurName>
-    <md:EmailAddress>mailto:jure.pesko@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-201506181025.xml b/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-201506181025.xml
deleted file mode 100644
index fe2c0e77..00000000
--- a/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-201506181025.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elixir.mf.uni-lj.si/sp/201506181025">
-  <md:Extensions>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-06-22T11:06:27Z">
-      <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: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>
-      <req:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/Login"/>
-      <disco:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ELIXIR eLearning platform</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">ELIXIR eLearning platform</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ELIXIR eLearning platform</mdui:Description>
-        <mdui:Description xml:lang="sl">ELIXIR eLearning platform</mdui:Description>
-        <mdui:Keywords xml:lang="en">ELIXIR eLearning platform medical faculty life sciences uni-lj slovenia</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Spletna učilnica elixir medicinska fakulteta uni-lj slovenia</mdui:Keywords>
-        <mdui:Logo height="93" width="150">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://elixir.mf-uni-lj.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">https://elixir.mf-uni-lj.si</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>elixir.mf.uni-lj.si</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=elixir.mf.uni-lj.si,L=Ljubljana,C=SI</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCAzWgAwIBAgIFLuq0T6EwDQYJKoZIhvcNAQEFBQAwPzELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTEcMBoGA1UEAwwTZWxpeGlyLm1mLnVuaS1sai5zaTAeFw0xNTA2MTgwODI1MDJaFw0xNzA2MDcwODI1MDJaMD8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExHDAaBgNVBAMME2VsaXhpci5tZi51bmktbGouc2kwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDf9mP3uAEm3O0rP22KnLwE8X0tjaVBYFhMsCp/H6Ss3pjP9wTqbTpjFaNyPzYReqA5x5OI+ajSALwdEC7TsnRV4Sx0wbL94e85Gu4xQKB3BbIOE5S7CG5pcEYMlgljycXlYCeVe5KnQy6+cO2cdHBSRi17W1RmBSmPMBvOu5ek89rKZKW2NYDRZVS6+p2kTQ9XF8e1QHGRj65ehqo4hH5QoqiBR0mCDb9WMgo/usnTEKHgn2JB+ZB6EyWbqqnXmPvXbp43tu/IUqVHkW0tZs6NFty3BJuzrCLd1pL+lsFFzHKEr232b1xQ8W7z9Voe35e2R/P87VuPdIx2m4qbmIXsU6wscQJEuB3XhSKnT1fBjXi8OhNfy6yFBpqf3LzbRccSeVRNP+l8UdW2uK73T2Wb7OBZOHbBeE14G0Zm8bQycfo1kw+vhKg8eJKFHXSqUfnaBLudcpHwCcJzvBM/sbviYzQVVwgWSV/sX7UOcxtClgbCjJDobRmekOM83JfTMSg5IjGhcExwmav3266rYU2Ltd5WCki2eLJd35xBN8Cz4pTmh47+CAf9Wio/u7cnjK8s3OyHAwx/bRM3jtGVZxZeIDcmFz3JK12b0Bo3ZVngPLSV+7ZRP9yZv7P9xAaaUdhFGspkMu8srHTSQqqrU1PqZkvsjs20+SHgAqQhlQvVYQIDAQABo1AwTjAdBgNVHQ4EFgQULx6v73BEnRZ+0YjW9hMPjAouCeAwHwYDVR0jBBgwFoAULx6v73BEnRZ+0YjW9hMPjAouCeAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAgEAK51DXG+jdSbg171O7SyFmDn25JhXmoc8ovU0aNv9UcJ16yRxIpS9f9UJVnL4IyuT97AeDprHMy/go17mdLXvkI+MT+nC9AW2CDoPDXGwhygrgcFIL89siKPuNzyEmH9bJKPW2H4iWI5GJUJnQu012iKUgTJtZ8S8L92QEDR6boflArNpPtpPOHLirSbQW+Qy3pK23ShKBkYldVoOWQP0OfReEXlwYORT+BogL7G2A3QDjNtgPgm5yi4rA4f31abk5txujH3nOiNmfzLH7XSYWJiqcsBS33qbOU+svZjMuVDbuoIQWFh7s48ZxTR5dIUkSwb1YRVgvcoQylhFEP0EgKPe8+xTReIhgDgzgXEfDYzdkKMlyUku7tEf07SStXLCV2YZxKzyzPJ6jQtn4nATQypRpzquQlIVehFPRRg5+vd0z9tCZgeQ4qH8wffSUIuzqVqYPidd84821BtLY0epnsCdB4v4WcPo92uimmhozodV5433cSLg1hiEYzxdu0p6Yk92NSSTpsPXXgxsZyAND5ucDUvx5jtwp+lOLr+7afnkSXmvIw/wpXdYGIWEhD2CO5iLFLpJsRlSd5OmRVTd6AWNWoySjdoLEcCejQHHpc+tk8/5rRBtF30XpKT40gHtTW//DFb2HtN+ZnKa3fTC7lVfH84bm02xjgC55Xs+Faw=</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://elixir.mf.uni-lj.si/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">ELIXIR eLearning platform</md:ServiceName>
-      <md:ServiceName xml:lang="sl">ELIXIR eLearning platform</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">ELIXIR eLearning platform</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sl">ELIXIR eLearning platform</md:ServiceDescription>
-      <md:RequestedAttribute Name="sn"/>
-      <md:RequestedAttribute Name="givenName"/>
-      <md:RequestedAttribute Name="mail"/>
-      <md:RequestedAttribute Name="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://elixir.mf-uni-lj.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">https://elixir.mf-uni-lj.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Dušan</md:GivenName>
-    <md:SurName>Šuput</md:SurName>
-    <md:EmailAddress>mailto:dusan.suput@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:elixir@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Damijan</md:GivenName>
-    <md:SurName>Senčar</md:SurName>
-    <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Emil</md:GivenName>
-    <md:SurName>Hudomalj</md:SurName>
-    <md:EmailAddress>mailto:emil.hudomalj@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Branimir</md:GivenName>
-    <md:SurName>Leskošek</md:SurName>
-    <md:EmailAddress>mailto:brane.leskosek@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jure</md:GivenName>
-    <md:SurName>Pesko</md:SurName>
-    <md:EmailAddress>mailto:jure.pesko@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Damijan</md:GivenName>
-    <md:SurName>Senčar</md:SurName>
-    <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-20150622.xml b/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-20150622.xml
deleted file mode 100644
index 83c27f7b..00000000
--- a/swamid-interfederations-2.0/elixir.mf.uni-lj.si-sp-20150622.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:disco="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://elixir.mf.uni-lj.si/sp/20150622">
-  <md:Extensions>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-06-24T09:06:08Z">
-      <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: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>
-      <req:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/Login"/>
-      <disco:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ELIXIR eLearning platform</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">ELIXIR eLearning platform</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ELIXIR eLearning platform</mdui:Description>
-        <mdui:Description xml:lang="sl">ELIXIR eLearning platform</mdui:Description>
-        <mdui:Keywords xml:lang="en">ELIXIR eLearning platform medical faculty life sciences uni-lj slovenia</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Spletna učilnica elixir medicinska fakulteta uni-lj slovenia</mdui:Keywords>
-        <mdui:Logo height="93" width="150">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://elixir.mf-uni-lj.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">https://elixir.mf-uni-lj.si</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>elixir.mf.uni-lj.si</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=elixir.mf.uni-lj.si,L=Ljubljana,C=SI</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCAzWgAwIBAgIFLuq0T6EwDQYJKoZIhvcNAQEFBQAwPzELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTEcMBoGA1UEAwwTZWxpeGlyLm1mLnVuaS1sai5zaTAeFw0xNTA2MTgwODI1MDJaFw0xNzA2MDcwODI1MDJaMD8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExHDAaBgNVBAMME2VsaXhpci5tZi51bmktbGouc2kwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDf9mP3uAEm3O0rP22KnLwE8X0tjaVBYFhMsCp/H6Ss3pjP9wTqbTpjFaNyPzYReqA5x5OI+ajSALwdEC7TsnRV4Sx0wbL94e85Gu4xQKB3BbIOE5S7CG5pcEYMlgljycXlYCeVe5KnQy6+cO2cdHBSRi17W1RmBSmPMBvOu5ek89rKZKW2NYDRZVS6+p2kTQ9XF8e1QHGRj65ehqo4hH5QoqiBR0mCDb9WMgo/usnTEKHgn2JB+ZB6EyWbqqnXmPvXbp43tu/IUqVHkW0tZs6NFty3BJuzrCLd1pL+lsFFzHKEr232b1xQ8W7z9Voe35e2R/P87VuPdIx2m4qbmIXsU6wscQJEuB3XhSKnT1fBjXi8OhNfy6yFBpqf3LzbRccSeVRNP+l8UdW2uK73T2Wb7OBZOHbBeE14G0Zm8bQycfo1kw+vhKg8eJKFHXSqUfnaBLudcpHwCcJzvBM/sbviYzQVVwgWSV/sX7UOcxtClgbCjJDobRmekOM83JfTMSg5IjGhcExwmav3266rYU2Ltd5WCki2eLJd35xBN8Cz4pTmh47+CAf9Wio/u7cnjK8s3OyHAwx/bRM3jtGVZxZeIDcmFz3JK12b0Bo3ZVngPLSV+7ZRP9yZv7P9xAaaUdhFGspkMu8srHTSQqqrU1PqZkvsjs20+SHgAqQhlQvVYQIDAQABo1AwTjAdBgNVHQ4EFgQULx6v73BEnRZ+0YjW9hMPjAouCeAwHwYDVR0jBBgwFoAULx6v73BEnRZ+0YjW9hMPjAouCeAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAgEAK51DXG+jdSbg171O7SyFmDn25JhXmoc8ovU0aNv9UcJ16yRxIpS9f9UJVnL4IyuT97AeDprHMy/go17mdLXvkI+MT+nC9AW2CDoPDXGwhygrgcFIL89siKPuNzyEmH9bJKPW2H4iWI5GJUJnQu012iKUgTJtZ8S8L92QEDR6boflArNpPtpPOHLirSbQW+Qy3pK23ShKBkYldVoOWQP0OfReEXlwYORT+BogL7G2A3QDjNtgPgm5yi4rA4f31abk5txujH3nOiNmfzLH7XSYWJiqcsBS33qbOU+svZjMuVDbuoIQWFh7s48ZxTR5dIUkSwb1YRVgvcoQylhFEP0EgKPe8+xTReIhgDgzgXEfDYzdkKMlyUku7tEf07SStXLCV2YZxKzyzPJ6jQtn4nATQypRpzquQlIVehFPRRg5+vd0z9tCZgeQ4qH8wffSUIuzqVqYPidd84821BtLY0epnsCdB4v4WcPo92uimmhozodV5433cSLg1hiEYzxdu0p6Yk92NSSTpsPXXgxsZyAND5ucDUvx5jtwp+lOLr+7afnkSXmvIw/wpXdYGIWEhD2CO5iLFLpJsRlSd5OmRVTd6AWNWoySjdoLEcCejQHHpc+tk8/5rRBtF30XpKT40gHtTW//DFb2HtN+ZnKa3fTC7lVfH84bm02xjgC55Xs+Faw=</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://elixir.mf.uni-lj.si/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elixir.mf.uni-lj.si/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">ELIXIR eLearning platform</md:ServiceName>
-      <md:ServiceName xml:lang="sl">ELIXIR eLearning platform</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">ELIXIR eLearning platform</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sl">ELIXIR eLearning platform</md:ServiceDescription>
-      <md:RequestedAttribute Name="sn"/>
-      <md:RequestedAttribute Name="givenName"/>
-      <md:RequestedAttribute Name="mail"/>
-      <md:RequestedAttribute Name="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://elixir.mf-uni-lj.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">https://elixir.mf-uni-lj.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Dušan</md:GivenName>
-    <md:SurName>Šuput</md:SurName>
-    <md:EmailAddress>mailto:dusan.suput@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:elixir@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Damijan</md:GivenName>
-    <md:SurName>Senčar</md:SurName>
-    <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Emil</md:GivenName>
-    <md:SurName>Hudomalj</md:SurName>
-    <md:EmailAddress>mailto:emil.hudomalj@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Branimir</md:GivenName>
-    <md:SurName>Leskošek</md:SurName>
-    <md:EmailAddress>mailto:brane.leskosek@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jure</md:GivenName>
-    <md:SurName>Pesko</md:SurName>
-    <md:EmailAddress>mailto:jure.pesko@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Damijan</md:GivenName>
-    <md:SurName>Senčar</md:SurName>
-    <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8ad1c450..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://encecafe.ibge.gov.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://encecafe.ibge.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://encecafe.ibge.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://encecafe.ibge.gov.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://encecafe.ibge.gov.br/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">gov.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://encecafe.ibge.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://encecafe.ibge.gov.br:8443/idp/profile/SAML1/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">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas)</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">ENCE(IBGE) - Escola Nacional de Ciencias Estatisticas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ence.ibge.gov.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ence.ibge.gov.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Mendonca</md:SurName>
-    <md:EmailAddress>mauro.mendonca@ibge.gov.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 4fffd0f5..00000000
--- a/swamid-interfederations-2.0/encecafe.ibge.gov.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://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 - Escola Nacional de Ciencias Estatisticas (IBGE)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</mdui:Description>
-        <mdui:Description xml:lang="pt-br">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</mdui:Description>
-        <mdui: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>
-    MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxPzA9BgNVBAoUNkVOQ0UgLSBF
-c2NvbGEgTmFjaW9uYWwgZGUgQ2nqbmNpYXMgRXN0YXTtc3RpY2FzIChJQkdFKTEP
-MA0GA1UECxMGR0VSSU5GMSIwIAYJKoZIhvcNAQkBFhNlbmNlZGxpQGliZ2UuZ292
-LmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEph
-bmVpcm8xCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRlbmNlY2FmZS5pYmdlLmdvdi5i
-cjAeFw0xMjA0MjQxMTI1MThaFw0xNTA0MjQxMTI1MThaMIHUMT8wPQYDVQQKFDZF
-TkNFIC0gRXNjb2xhIE5hY2lvbmFsIGRlIENp6m5jaWFzIEVzdGF07XN0aWNhcyAo
-SUJHRSkxDzANBgNVBAsTBkdFUklORjEiMCAGCSqGSIb3DQEJARYTZW5jZWRsaUBp
-YmdlLmdvdi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8xFzAVBgNVBAgTDlJp
-byBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMUZW5jZWNhZmUuaWJn
-ZS5nb3YuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnCgcDoU+h
-q+hYEOLks5bjZqTJTP765iNKamK/ECPFdZWEJ6+HswHaFDV5WicdgjAg1DxYuO7i
-EYZV8hofDmYuFsABKa6yE6LotmtDL+sviYA/0UePqZuiYIIyJSY4oyw41OVWMaDN
-07FUOFZOkWMfNaT4VIJ3JGdyFeAOaTbS88XbBMJD6Z6AjRZbChAFVJDH0wEKJEI4
-tGlsHIgMAKfnZdOOaDWNcUYieLQmZO1RPw5u1qHXUsQHHmCbW1Mbx/qBNcQ9GTlt
-7bO7IxOLNVuBGotX3pgUa79fXVk17TxtkVsOiOm2GC0HrQL7NZEUqiqyR4h21Qc2
-fSJ6Qhf70vLXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAG0lhKCnEhPTlJjzBosO
-zcN39DIU6TNkx7MkdI5qFgXxyEZQ5JlgOk/kZVB1rhHdujY4zpEvNX6NHGG8CYRM
-BjKhD2ePlgd040TTQDNxu143eOpUbkRuAET0ffoBA7gRsbZDpHOALZyzyDDW/duj
-MiaAf1i8aTNjk7Q1DgCmxKy3CZOP7MSoBi9b5cDq9ogi9DYdem+NUIcedH32wxGb
-hB4ZMakVi/VJ9DPq/klGUkuziY7s4QaGlVUOZlPwsZrx2vPvrshmmvZcrzX7zef/
-Gu0Wv0Dz3mK1dlQkhZpVq3KdvSbuANsFeRtAiyZ28ciKIDK3yFMl86lQ2qjZInt2
-YBk=
-            </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>
-      
-MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxPzA9BgNVBAoUNkVOQ0UgLSBF
-c2NvbGEgTmFjaW9uYWwgZGUgQ2nqbmNpYXMgRXN0YXTtc3RpY2FzIChJQkdFKTEP
-MA0GA1UECxMGR0VSSU5GMSIwIAYJKoZIhvcNAQkBFhNlbmNlZGxpQGliZ2UuZ292
-LmJyMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEph
-bmVpcm8xCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRlbmNlY2FmZS5pYmdlLmdvdi5i
-cjAeFw0xMjA0MjQxMTI1MThaFw0xNTA0MjQxMTI1MThaMIHUMT8wPQYDVQQKFDZF
-TkNFIC0gRXNjb2xhIE5hY2lvbmFsIGRlIENp6m5jaWFzIEVzdGF07XN0aWNhcyAo
-SUJHRSkxDzANBgNVBAsTBkdFUklORjEiMCAGCSqGSIb3DQEJARYTZW5jZWRsaUBp
-YmdlLmdvdi5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8xFzAVBgNVBAgTDlJp
-byBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMUZW5jZWNhZmUuaWJn
-ZS5nb3YuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnCgcDoU+h
-q+hYEOLks5bjZqTJTP765iNKamK/ECPFdZWEJ6+HswHaFDV5WicdgjAg1DxYuO7i
-EYZV8hofDmYuFsABKa6yE6LotmtDL+sviYA/0UePqZuiYIIyJSY4oyw41OVWMaDN
-07FUOFZOkWMfNaT4VIJ3JGdyFeAOaTbS88XbBMJD6Z6AjRZbChAFVJDH0wEKJEI4
-tGlsHIgMAKfnZdOOaDWNcUYieLQmZO1RPw5u1qHXUsQHHmCbW1Mbx/qBNcQ9GTlt
-7bO7IxOLNVuBGotX3pgUa79fXVk17TxtkVsOiOm2GC0HrQL7NZEUqiqyR4h21Qc2
-fSJ6Qhf70vLXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAG0lhKCnEhPTlJjzBosO
-zcN39DIU6TNkx7MkdI5qFgXxyEZQ5JlgOk/kZVB1rhHdujY4zpEvNX6NHGG8CYRM
-BjKhD2ePlgd040TTQDNxu143eOpUbkRuAET0ffoBA7gRsbZDpHOALZyzyDDW/duj
-MiaAf1i8aTNjk7Q1DgCmxKy3CZOP7MSoBi9b5cDq9ogi9DYdem+NUIcedH32wxGb
-hB4ZMakVi/VJ9DPq/klGUkuziY7s4QaGlVUOZlPwsZrx2vPvrshmmvZcrzX7zef/
-Gu0Wv0Dz3mK1dlQkhZpVq3KdvSbuANsFeRtAiyZ28ciKIDK3yFMl86lQ2qjZInt2
-YBk=
-                    
-            </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 - Escola Nacional de Ciencias Estatisticas (IBGE)</OrganizationName>
-    <OrganizationName xml:lang="pt-br">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">ENCE - Escola Nacional de Ciencias Estatisticas (IBGE)</OrganizationDisplayName>
-    <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/endicott.law.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/endicott.law.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index ad188689..00000000
--- a/swamid-interfederations-2.0/endicott.law.ox.ac.uk-shibboleth-sp.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://endicott.law.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Faculty of Law" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2015-07-31T08:55: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>
-      <init: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.law.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIICvDCCAaQCCQDPOP0c1E12qDANBgkqhkiG9w0BAQsFADAgMR4wHAYDVQQDDBVl
-						bmRpY290dC5sYXcub3guYWMudWswHhcNMTUwNzEwMTQwNTIxWhcNMjUwNzA3MTQw
-						NTIxWjAgMR4wHAYDVQQDDBVlbmRpY290dC5sYXcub3guYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjDXpqo4zWDraeOC5J2LRYoRHpbAEyhi/X
-						Q7qxFJabs4zpBnwN/MotZfJvMfeckjXfSXB32ZsA7xTJsz0ATiyRkPzlHTUhg4Cb
-						1hCzN8+9qjkDEv8+rASx3mklqs+xQYqndiF+4jYySsW/I5F9fM4gcP7wqvjNvQhh
-						Ymdsi4xmvfeioTUnL5Qj7nuqE5ZJ23VpdFwK1J6TY8HlcMM4eLsOaPvbbK2HJYdx
-						IPw95cHsBn3tJAmHsfZIgLCOLpGDH6/4cGOJmhPb7RqFdPScsbCj2y6Vek7z0pOt
-						XtWZCONTeFnIV3NwxFtjmSagisAQnKBndBS3PM9odcI7xxHggVuHAgMBAAEwDQYJ
-						KoZIhvcNAQELBQADggEBACcZtLO5WJdIsF6jnRl0Oc3bRcS6uf+ALt3sfn+sfiFA
-						vcVboFHyRdZBcwuIKxquFEXsNdJUnTVWO0isW+0tfhREylrMgaPOEEDF5nyJ/Q21
-						TyU7w2njEwaaJnpT+rTk0kXlCXo2yWcXtez5g2lLpKukJFJzHQ6QTsLn0dX4GJbH
-						L0PkH5ImeAK4UWWNSu4GZAaK8xIOqk84r/ufUlNcPaaPCxqOX17llVE75RthGHOE
-						0sWXfyg3Rw/DLkJzth62iBa6pyCaNy3KPCtj7X/ua5fKfdup56222qtRquJk9xNt
-						oEFtIts/B0ftL3b8GsrzfT519awo5S4xmaSLDjehnNc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.law.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-staging.law.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.law.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.law.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-staging.law.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-staging.law.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-staging.law.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-staging.law.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-staging.law.ox.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-staging.law.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.law.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.law.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.law.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.law.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.law.ox.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.law.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Faculty of Law</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.law.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Allen</SurName>
-    <EmailAddress>mailto:steve.allen@law.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Allen</SurName>
-    <EmailAddress>mailto:steve.allen@law.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/endo-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml b/swamid-interfederations-2.0/endo-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
deleted file mode 100644
index c1e7f280..00000000
--- a/swamid-interfederations-2.0/endo-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.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://endo-test.literatumonline.com/action/samlACS/shibboleth/testshib/sp">
-  <!--
-		This is an "Endocrine Society Test SP" 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-11-19T12:45:11Z">
-      <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">Endocrine Society Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Endocrine Society Test SP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://endo-test.literatumonline.com/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIJANVJSQxqshdJMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3ByZXNzLmVuZG9jcmluZS5vcmcwHhcNMTQwMzE0MDUwMzM2WhcNMTcwMzEz
-						MDUwMzM2WjAeMRwwGgYDVQQDExNwcmVzcy5lbmRvY3JpbmUub3JnMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3UGyo6ttd7bwlzSgZsk1I4RA30LoNfTM
-						8gZB/+K39VOI2QD8Pfhrk1WIuQF4GAmVkYE7NklLw5M++OJtX28BXZNYx5B5R4gj
-						1pyuhZy5sYFQsV6G2k1juhLXJXD0+AGCuBulYYSgzAAY9Z1nwZ1XQWLscXbaH3PC
-						nq8cc14V/bQp6myQPahxIjkzwwGEGvWCWCuRe/gSFFMIMYEX4tnzX1CTf5kHDA6M
-						JkTYI6LlyVnT1wNgzjZRZmszyMY5CUK2585Fs5EiOuOyhjpk2yX4wpcyaSMNmg4Z
-						w07YKVDZAqs3TPlevvM5v8YsTI8gtmax5xJzmcWLl4ePiWQQIFlmywIDAQABo2kw
-						ZzBGBgNVHREEPzA9ghNwcmVzcy5lbmRvY3JpbmUub3JnhiZodHRwczovL3ByZXNz
-						LmVuZG9jcmluZS5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUGmOP9EhvjdoesbPh
-						vynbx5uw5vMwDQYJKoZIhvcNAQEFBQADggEBABmbaNUQvxhPvcdkn5bvZuAV5kSf
-						FI+va5RzRQ4RJbAhoLMc5rQObPJuJ+5sxhccmihmcxRJRzyfrw+uoNClm6DL3r9F
-						FQ0T0/ycfBo9mK04Th6J2UR6k6afdiaucbW4R+LCapQR98FrNGBsTh6YFhhgIRyx
-						5OXJvPJAQL+uVkrqQSuxtwNSaz52WyZXjb6mOSMg2+JK4WftBrPYY1XEG0QP4nMt
-						qHZa5OSpp+euqH6Gyw0LT/E1wdjIx6VeYk05G7rLd8+pxEPIojYUKfEIzggIDC8J
-						PS8Hhs0OkV2+QCImniSi1ZMVhcHp6Db1t2lE9LRnJz2mSTdqqocXb1O5m/s=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIJAIDfY9h2oTCVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3ByZXNzLmVuZG9jcmluZS5vcmcwHhcNMTMxMjExMDUzOTQ2WhcNMjMxMjA5
-						MDUzOTQ2WjAeMRwwGgYDVQQDExNwcmVzcy5lbmRvY3JpbmUub3JnMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw2Hn+r9tAA0W/oAXm9ShLD2wvy+YKkeV
-						yrmUJbzdU8DeJ0mQ0SS6/Y3yKZEAT6vsh4j4xso51qtly0HHh459F8y8n3vd829B
-						vhxRwdE5PMZixPbWyltRPbx3XogpswBust9PXIWW4Unmo37NZhxrZQrt7GHvVvIX
-						kuUAEoTkLkSurvgkLuUrPs/wm179D50kbx4E50Uz7nvJYVyEWqHdf3TGaD8gMM1E
-						6DR2w0j4pKHBAjkLDy9mHGV6c91qFVNnWrhACmX35JjBiCvc1+JTVRpapM1/JgzP
-						HNTCJogvQNn5SDU3cZsZV0T1Bu23Pb8MlXoZPmWJy2djNPzw1JtO6QIDAQABo2kw
-						ZzBGBgNVHREEPzA9ghNwcmVzcy5lbmRvY3JpbmUub3JnhiZodHRwczovL3ByZXNz
-						LmVuZG9jcmluZS5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUG3/mbZR4LTuD9+bU
-						dU0k7Li0WNkwDQYJKoZIhvcNAQEFBQADggEBAC4Sz/Os31gGbtIPklQ8SJHBs0ji
-						MgbcKx15S3OkM06S75oDVI2qIrWXnAuWidexconSD35izsAscXlGI4EJgOflRJIB
-						1kD9LOsHiz9kqUS2q7MNxWVloiQzxYCX14HGwPMtmKVTeTg5Vjo2BAuCRAhdxdFH
-						seE5nYMbC4i31u1taTsM1Ydifr3UzmWTI5AZ884SYR9TfPh07rcW5m26Pmr3LLOa
-						wDROxGmfeBQHWTnOJkbhLdE2Rv1MqCWP4XzA1a8PsuBxyboLCQUYxsn4J8hOP3ZN
-						b3NsdouxzxBdj+PJxciM9yTP1Ju8l1QfVXC68KZ2WeEowX3e84BW8jaZ0OM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://endo-test.literatumonline.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://endo-test.literatumonline.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://endo-test.literatumonline.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Endocrine Society Test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://endo-test.literatumonline.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/engine.eduteams.org-authentication-sp-metadata.xml b/swamid-interfederations-2.0/engine.eduteams.org-authentication-sp-metadata.xml
deleted file mode 100644
index 9fb3128f..00000000
--- a/swamid-interfederations-2.0/engine.eduteams.org-authentication-sp-metadata.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://engine.eduteams.org/authentication/sp/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-20T09:40:32Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">eduTEAMs</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">eduTEAMs</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">eduTEAMs is een dienst voor het aanmaken en beheren van groepen. De dienst is vrij beschikbaar voor alle gebruikers van Identity Providers in de eduGAIN community</mdui:Description>
-        <mdui:Description xml:lang="en">eduTEAMs is a service for creating and managing groups that can be used for Autherization. This service is open to all end users of eduGAIN Identity Providers</mdui:Description>
-        <mdui:Logo height="250" width="250">https://static.eduteams.org/media/eduteams_logo_250x250.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://www.eduteams.org/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.eduteams.org/privacypolicy</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>MIIDXzCCAkegAwIBAgIJAP8vTYic5kT4MA0GCSqGSIb3DQEBBQUAMEYxDzANBgNVBAMMBkVuZ2luZTERMA8GA1UECwwIU2VydmljZXMxEzARBgNVBAoMCk9wZW5Db25leHQxCzAJBgNVBAYTAk5MMB4XDTE0MTIxMjEwMjMzNloXDTI0MTIxMTEwMjMzNlowRjEPMA0GA1UEAwwGRW5naW5lMREwDwYDVQQLDAhTZXJ2aWNlczETMBEGA1UECgwKT3BlbkNvbmV4dDELMAkGA1UEBhMCTkwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTWKtTOD8ouzvYsobSQQfg77hRe7eV93aVyCy7I9fmRVoFna+5iUNfqKotjFgjfM/miVKTegSlbIST/4B4O8NSXiMlKaE5uMuRpP680EihdqN+TwvbGOgfEL7YMsu8kGC4EYwGQINVEMbss4tXIJpKnGIAFq3aKpqonWFQStQQE1veY+MK7gwh0z0Iz2nuHyiH0yy8zmhfcbEl0mwNVbKDkvVFTqs4P/Mw60WuWTH1OmVHIywBsOVVO5E9Y84uY3rvTFh5zJ054jAmFtMsZA9VtVjXE+6LfNRlWeKVoz+je3Zb5VV6cHY8cYvwFcMt5K7IfxxaP+ORY6Bz12iAbA95AgMBAAGjUDBOMB0GA1UdDgQWBBTt2NkctlF/cjT8zdoMa2FGXTobHDAfBgNVHSMEGDAWgBTt2NkctlF/cjT8zdoMa2FGXTobHDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCwB6TvH4kFt0eNEct/hW2CyxN8epR5wHFpbFJLycIHkM/R2BfM3GHpJQOtrPqdumUbavXlAby0Z+0ClBvWMcvYNdRHIam0ZPV+u4YGiJN+i44BNiZW7SKy4U1KfT4THeoZNR4zFI9AIECPsBNTGC110iK1loYvN4wUIezt/9bMFgzzaKFJydpqA75GZrjkLZTzQ8tZbsNUL1npJRn6Hbc9RFIh2OhRvkDvHF0QK61LwcRsqJd6P1YWBBhJ3od8Dyr83MBNWG+8mQV8/zGiCOR26+4f4KWiQo+imW9mjUDtekJF6+T2yLthm11AxwXFDhh0sL25nxgUnJdWT6Vqp1ve</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>MIIDXzCCAkegAwIBAgIJAP8vTYic5kT4MA0GCSqGSIb3DQEBBQUAMEYxDzANBgNVBAMMBkVuZ2luZTERMA8GA1UECwwIU2VydmljZXMxEzARBgNVBAoMCk9wZW5Db25leHQxCzAJBgNVBAYTAk5MMB4XDTE0MTIxMjEwMjMzNloXDTI0MTIxMTEwMjMzNlowRjEPMA0GA1UEAwwGRW5naW5lMREwDwYDVQQLDAhTZXJ2aWNlczETMBEGA1UECgwKT3BlbkNvbmV4dDELMAkGA1UEBhMCTkwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTWKtTOD8ouzvYsobSQQfg77hRe7eV93aVyCy7I9fmRVoFna+5iUNfqKotjFgjfM/miVKTegSlbIST/4B4O8NSXiMlKaE5uMuRpP680EihdqN+TwvbGOgfEL7YMsu8kGC4EYwGQINVEMbss4tXIJpKnGIAFq3aKpqonWFQStQQE1veY+MK7gwh0z0Iz2nuHyiH0yy8zmhfcbEl0mwNVbKDkvVFTqs4P/Mw60WuWTH1OmVHIywBsOVVO5E9Y84uY3rvTFh5zJ054jAmFtMsZA9VtVjXE+6LfNRlWeKVoz+je3Zb5VV6cHY8cYvwFcMt5K7IfxxaP+ORY6Bz12iAbA95AgMBAAGjUDBOMB0GA1UdDgQWBBTt2NkctlF/cjT8zdoMa2FGXTobHDAfBgNVHSMEGDAWgBTt2NkctlF/cjT8zdoMa2FGXTobHDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCwB6TvH4kFt0eNEct/hW2CyxN8epR5wHFpbFJLycIHkM/R2BfM3GHpJQOtrPqdumUbavXlAby0Z+0ClBvWMcvYNdRHIam0ZPV+u4YGiJN+i44BNiZW7SKy4U1KfT4THeoZNR4zFI9AIECPsBNTGC110iK1loYvN4wUIezt/9bMFgzzaKFJydpqA75GZrjkLZTzQ8tZbsNUL1npJRn6Hbc9RFIh2OhRvkDvHF0QK61LwcRsqJd6P1YWBBhJ3od8Dyr83MBNWG+8mQV8/zGiCOR26+4f4KWiQo+imW9mjUDtekJF6+T2yLthm11AxwXFDhh0sL25nxgUnJdWT6Vqp1ve</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.eduteams.org/authentication/sp/consume-assertion" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="nl">eduTEAMs</md:ServiceName>
-      <md:ServiceName xml:lang="en">eduTEAMs</md:ServiceName>
-      <md:ServiceDescription xml:lang="nl">eduTEAMs is een dienst voor het aanmaken en beheren van groepen. De dienst is vrij beschikbaar voor alle eind gebruikers in de eduGAIN community</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">eduTEAMs is a service for creating and managing groups that can be used for Autherization. This service is open to all end users of eduGAIN Identity Providers</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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>eduTEAMs</md:GivenName>
-    <md:SurName>Technical Contact</md:SurName>
-    <md:EmailAddress>tech@eduteams.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>eduTEAMs</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>support@eduteams.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>eduTEAMs</md:GivenName>
-    <md:SurName>Administrative Contact</md:SurName>
-    <md:EmailAddress>admin@eduteams.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engine.elixir-czech.org-authentication-sp-metadata.xml b/swamid-interfederations-2.0/engine.elixir-czech.org-authentication-sp-metadata.xml
deleted file mode 100644
index 6b93cc49..00000000
--- a/swamid-interfederations-2.0/engine.elixir-czech.org-authentication-sp-metadata.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://engine.elixir-czech.org/authentication/sp/metadata">
-  <md:Extensions>
-    <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-12-08T11:25: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 WantAssertionsSigned="true" 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">ELIXIR research infrastructure AAI</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">ELIXIR research infrastructure AAI</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service is the common gateway to the services ELIXIR
-research infrastructure provides for biological data.</mdui:Description>
-        <mdui:Description xml:lang="cs">This service is the common gateway to the services ELIXIR
-research infrastructure provides for biological data.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://login.elixir-czech.org/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://login.elixir-czech.org/</mdui:InformationURL>
-        <mdui:Logo height="96" width="96">https://login.elixir-czech.org/media/elixir-ds.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="en">ELIXIR proxy biology life sciences</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFMTCCBBmgAwIBAgIIIespBL5TmnswDQYJKoZIhvcNAQELBQAwgbQxCzAJBgNV
-BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRow
-GAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjEtMCsGA1UECxMkaHR0cDovL2NlcnRz
-LmdvZGFkZHkuY29tL3JlcG9zaXRvcnkvMTMwMQYDVQQDEypHbyBEYWRkeSBTZWN1
-cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzIwHhcNMTUxMDA2MTMyNzM5WhcN
-MTgxMDA2MTMyNzM5WjBAMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0
-ZWQxGzAZBgNVBAMMEiouZWxpeGlyLWN6ZWNoLm9yZzCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANduYwpgat3apqc/pV/hoFGtOjZ1HJ9OI01krvmrOobM
-e5w5jCzL8Sf0R6ltreV3MSpAuLdJLu8Tz0++4vGDdIqze20AHkh64/zu3I75VdZI
-WWD8iBBUNvIwjW3G0scLiwjK5/HMjO/HZuyCH4ppQvL0u86U0gAsVoFn2b4WqIIz
-yH1n85Fi71CufekD9LrbSukGUZV0QAvqFGrAPxm1LupBdwgXSVeVJlx8ZA0CBtCK
-yYnTWhRVa1Xod5/E0zd5zpuGU4VSf9r1JcSxgTnsODFb8piRJv+BErVAGj4DTHQI
-4bUf1ESvyDYz6BDy/PLOi/IV6iVATHiktphmv4P4eUkCAwEAAaOCAbgwggG0MAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA4GA1Ud
-DwEB/wQEAwIFoDA3BgNVHR8EMDAuMCygKqAohiZodHRwOi8vY3JsLmdvZGFkZHku
-Y29tL2dkaWcyczEtMTM0LmNybDBTBgNVHSAETDBKMEgGC2CGSAGG/W0BBxcBMDkw
-NwYIKwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVw
-b3NpdG9yeS8wdgYIKwYBBQUHAQEEajBoMCQGCCsGAQUFBzABhhhodHRwOi8vb2Nz
-cC5nb2RhZGR5LmNvbS8wQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZXJ0aWZpY2F0ZXMu
-Z29kYWRkeS5jb20vcmVwb3NpdG9yeS9nZGlnMi5jcnQwHwYDVR0jBBgwFoAUQMK9
-J47MNIMwojPX+2yz8LQsgM4wLwYDVR0RBCgwJoISKi5lbGl4aXItY3plY2gub3Jn
-ghBlbGl4aXItY3plY2gub3JnMB0GA1UdDgQWBBQmJim6lGWIf9VusC8ms7npEYgl
-2zANBgkqhkiG9w0BAQsFAAOCAQEAFumHQHq1geOegg6EzHxwnvrQLfWcEWfcoRWT
-hj0MnINUoSEdJscQEihRPiQgxe1CYHVAsWyLcnZLpKHerM/f//i6bmoqLbh0fLyp
-2kjAC3Uph4VBPdmz5a3LUS6G8nomoRwXtO+CXB3xPXvamXyppMYb0xdV1YONrmuN
-rs0ldKjUtU8ieb88vJ0fcYXDjJBngTGjVEeFLllzlpHdZ0gMAJ7XuDHHupg9ISSe
-X+oaZlcJVzARIhZzLynBGKygtPjCtSeIhIpLitsBiKA354ZntN+CWV8PP6OQhRv/
-GtsSzA726/B+flEAviTfdsgY0QytNtOd3Uz26GUR21PH2OS+xg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.elixir-czech.org/authentication/sp/consume-assertion" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">ELIXIR Services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Services of ELIXIR, the European research infrastructure for biological information, supporting life science research and its translation to medicine, agriculture, bioindustries and society</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="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="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="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="eduPersonTargetedID" Name="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">ELIXIR CZ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ELIXIR CZ</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">ELIXIR CZ</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.elixir-czech.cz</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.elixir-czech.cz</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ELIXIR Directory</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>aai-contact@elixir-europe.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ELIXIR Directory</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>aai-contact@elixir-europe.or</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>ELIXIR Directory</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>aai-contact@elixir-europe.or</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 aeb97195..00000000
--- a/swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.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://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.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/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 Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:mace:terena.org:attribute-def:schacHomeOrganization" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:mace:terena.org:attribute-def:schacHomeOrganizationType" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:uid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:preferredLanguage" 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>support@surfconext.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFconext</md:GivenName>
-    <md:SurName>Administrative Contact</md:SurName>
-    <md:EmailAddress>support@surfconext.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 6c6bce90..00000000
--- a/swamid-interfederations-2.0/engine.surfconext.nl.xml
+++ /dev/null
@@ -1,91 +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/">
-      <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</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SURFconext</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="100" width="186">http://www.surfnet.nl/SURFnet%20imagebank/Logos/logo_surfconext_themasite.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDyzCCArOgAwIBAgIJAMzixtXMUH1NMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
-                        BAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYD
-                        VQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHTAbBgNVBAMM
-                        FGVuZ2luZS5zdXJmY29uZXh0Lm5sMB4XDTExMDEyNDEwMTg1N1oXDTIxMDEyMzEw
-                        MTg1N1owfDELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcM
-                        B1V0cmVjaHQxFTATBgNVBAoMDFNVUkZuZXQgQi5WLjETMBEGA1UECwwKU1VSRmNv
-                        bmV4dDEdMBsGA1UEAwwUZW5naW5lLnN1cmZjb25leHQubmwwggEiMA0GCSqGSIb3
-                        DQEBAQUAA4IBDwAwggEKAoIBAQDMJ6v+f3owS3KR5IXSil+3XFwGvCVeYx3jDOFK
-                        AnwvXlDpTu+t730b8/spHtlopyJVAlb6qBIPN7R4TGTLqiu0zebYsYx/PtqCk5cb
-                        u9qs3h+p2BBoTXVwXA/ZYi0tqtxp04hcNrRj1TAgLyC0S+KASTF+zzccAcjTBid5
-                        EMioo+YllgSEobWJ4X33XVRqNrikAPDsNmDrdKUi257JSO2xhVIG5lbtmDaL5ORC
-                        D56oRmVdp7VQTEQ3Yass8J5Rn+Ub6WmRBYeG+KzFBvtyBput2o0/gvtJn9L+NWeD
-                        B0LyUPaUYG/X4GF14FcmFQfz7I5jBCNHtPcLJbPYbZKQNhz/AgMBAAGjUDBOMB0G
-                        A1UdDgQWBBS9QqP8gtMM6nm4oYzNbgqhEDP1aDAfBgNVHSMEGDAWgBS9QqP8gtMM
-                        6nm4oYzNbgqhEDP1aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBH
-                        2qyYwLwesIOxUTj+NJ0VXRBDH8VecNLiUUs9Np4x8A0pxLvlNnv5TdJAruEg1LSV
-                        mAqqPUdAB2m7CKDeUVM9cwOB7vqelV2GNgOfevXi+DZRMffyyE8qyIcnTqvDOgcR
-                        8qGTPSVT+SIsOkV9bYrjltrbnal7cJermsA8SC5w/pjLaOHI1xIZHquZzymWoN3Z
-                        fz2CQg2r5o+AURYd74GrHhHqVa9VrdWtcimB+vTQQihoLt8YciehpJjOMpx2D66e
-                        FfpC8ix31RRdjAVIo1y33h1yU3gEHePDbOthZE+lpXi2WJqO85H85LqJOtgn2WPI
-                        3P2Tx32Cq1WXCYkxLaPI </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="1">
-      <md:ServiceName xml:lang="nl">SURFconext | SURFnet</md:ServiceName>
-      <md:ServiceName xml:lang="en">SURFconext | 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: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: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: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: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: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: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: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="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="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.t.eduteams.org-authentication-sp-metadata.xml b/swamid-interfederations-2.0/engine.t.eduteams.org-authentication-sp-metadata.xml
deleted file mode 100644
index cdd88b81..00000000
--- a/swamid-interfederations-2.0/engine.t.eduteams.org-authentication-sp-metadata.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://engine.t.eduteams.org/authentication/sp/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-20T09:40:32Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">eduTEAMs (Test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">eduTEAMs (Test)</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">eduTEAMs is een dienst voor het aanmaken en beheren van groepen. De dienst is vrij beschikbaar voor alle gebruikers van Identity Providers in de eduGAIN community</mdui:Description>
-        <mdui:Description xml:lang="en">eduTEAMs is a service for creating and managing groups that can be used for Autherization. This TEST instance is only available to specific Identity Providers.</mdui:Description>
-        <mdui:Logo height="250" width="250">https://static.t.eduteams.org/media/eduteams_logo_250x250.jpg</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.eduteams.org/privacypolicy</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>MIIDXzCCAkegAwIBAgIJAKLfYvUCzDiIMA0GCSqGSIb3DQEBBQUAMEYxDzANBgNVBAMMBkVuZ2luZTERMA8GA1UECwwIU2VydmljZXMxEzARBgNVBAoMCk9wZW5Db25leHQxCzAJBgNVBAYTAk5MMB4XDTE0MTEyMDEyNDIzNFoXDTI0MTExOTEyNDIzNFowRjEPMA0GA1UEAwwGRW5naW5lMREwDwYDVQQLDAhTZXJ2aWNlczETMBEGA1UECgwKT3BlbkNvbmV4dDELMAkGA1UEBhMCTkwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDckyal1SMYA5QrT60DUPh+TgH9YTMkRtEEJoZekZiKbBN2DhrRu8w7t/0WODA6do52hCRBteTqxGfScYHXBQhPg0rmXDpJV80lULHcjwpPpic+Yn/yqfTUafuRTbEyQQYcI/F1dQwSS5cdq+BUizfebc2Uu3wEfRroIdc9VG8cQGbbfPCXpXDnf0C1/SpOP6+tsXNL++l7c8byCtGlHIAeUgUaWu+TdwKrge2sKdUOsg3sG19EPxY5++7L9mJ60z8TbalwQ01sDghyQSYLKvmeu2nQz54pJy+5XIjNyxO/MZTOslXpb7EFkGdFkTWN4yEe2szXE+1rz+55vRelB0lVAgMBAAGjUDBOMB0GA1UdDgQWBBT7toWKnUR3TMxlbdkx4VqeCsZV6DAfBgNVHSMEGDAWgBT7toWKnUR3TMxlbdkx4VqeCsZV6DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAR6HfkiUPW9tDl2GkPnpDsnMlfJHmWL+NZQfi98YMln59RiAy/5x+c5XE0Y0xcRJ26wNtJT365L4yhqgwIr3UNk8MCJa9fv2agWfXnTjFSZxg8fq1eRyAXOetfgxAjW9wk+c/Icx6RhiNAOGRdaKWBUYrN/lPn/SbPcFwjeezL4RtrsWzWyH7j9BXCQ38swORop2sYaM3tKsQrAosqTwqQLvN6hdETmf4V3bA5SRwMrmR4e5WKW2YWZdgDXKCdFNvWrHp5mTnt7vTl+yt+8EqRl0mqGAdRy28AgU0AyERc7nibML228z7XlLuogeXq1Zp3G4I7NXlpIDDfo/n8VoVj</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>MIIDXzCCAkegAwIBAgIJAKLfYvUCzDiIMA0GCSqGSIb3DQEBBQUAMEYxDzANBgNVBAMMBkVuZ2luZTERMA8GA1UECwwIU2VydmljZXMxEzARBgNVBAoMCk9wZW5Db25leHQxCzAJBgNVBAYTAk5MMB4XDTE0MTEyMDEyNDIzNFoXDTI0MTExOTEyNDIzNFowRjEPMA0GA1UEAwwGRW5naW5lMREwDwYDVQQLDAhTZXJ2aWNlczETMBEGA1UECgwKT3BlbkNvbmV4dDELMAkGA1UEBhMCTkwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDckyal1SMYA5QrT60DUPh+TgH9YTMkRtEEJoZekZiKbBN2DhrRu8w7t/0WODA6do52hCRBteTqxGfScYHXBQhPg0rmXDpJV80lULHcjwpPpic+Yn/yqfTUafuRTbEyQQYcI/F1dQwSS5cdq+BUizfebc2Uu3wEfRroIdc9VG8cQGbbfPCXpXDnf0C1/SpOP6+tsXNL++l7c8byCtGlHIAeUgUaWu+TdwKrge2sKdUOsg3sG19EPxY5++7L9mJ60z8TbalwQ01sDghyQSYLKvmeu2nQz54pJy+5XIjNyxO/MZTOslXpb7EFkGdFkTWN4yEe2szXE+1rz+55vRelB0lVAgMBAAGjUDBOMB0GA1UdDgQWBBT7toWKnUR3TMxlbdkx4VqeCsZV6DAfBgNVHSMEGDAWgBT7toWKnUR3TMxlbdkx4VqeCsZV6DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAR6HfkiUPW9tDl2GkPnpDsnMlfJHmWL+NZQfi98YMln59RiAy/5x+c5XE0Y0xcRJ26wNtJT365L4yhqgwIr3UNk8MCJa9fv2agWfXnTjFSZxg8fq1eRyAXOetfgxAjW9wk+c/Icx6RhiNAOGRdaKWBUYrN/lPn/SbPcFwjeezL4RtrsWzWyH7j9BXCQ38swORop2sYaM3tKsQrAosqTwqQLvN6hdETmf4V3bA5SRwMrmR4e5WKW2YWZdgDXKCdFNvWrHp5mTnt7vTl+yt+8EqRl0mqGAdRy28AgU0AyERc7nibML228z7XlLuogeXq1Zp3G4I7NXlpIDDfo/n8VoVj</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.t.eduteams.org/authentication/sp/consume-assertion" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="nl">eduTEAMs (Test)</md:ServiceName>
-      <md:ServiceName xml:lang="en">eduTEAMs (Test)</md:ServiceName>
-      <md:ServiceDescription xml:lang="nl">eduTEAMs is een dienst voor het aanmaken en beheren van groepen. De dienst is vrij beschikbaar voor alle gebruikers van Identity Providers in de eduGAIN community. Dit is een TEST instance en is alleen beschikbaar voor specifieke Identity providers.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">eduTEAMs is a service for creating and managing groups that can be used for Autherization. This TEST instance is only available to specific Identity Providers.</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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>eduTEAMs Tech</md:GivenName>
-    <md:SurName>Tech Support</md:SurName>
-    <md:EmailAddress>tech@eduteams.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Enduser Support</md:GivenName>
-    <md:SurName>eduTEAMs</md:SurName>
-    <md:EmailAddress>support@eduteams.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Admin Support</md:GivenName>
-    <md:SurName>eduTEAMs </md:SurName>
-    <md:EmailAddress>admin@eduteams.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 66cb3726..00000000
--- a/swamid-interfederations-2.0/engs-web01.eng.ox.ac.uk-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://engs-web01.eng.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "Engineering Science Synch Portal Main Server" SP for the University of Oxford.
-	-->
-  <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="2012-10-05T09:22:44Z"/>
-  </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://engs-web01.eng.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJANQNL49idvBrMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2VuZ3Mtd2ViMDEuZW5nLm94LmFjLnVrMB4XDTEyMDcxOTEzNDA1OFoXDTIy
-						MDcxNzEzNDA1OFowIjEgMB4GA1UEAxMXZW5ncy13ZWIwMS5lbmcub3guYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9jbGCzmHl3ERccTim8QY0
-						NZmYT7sUvcN950gp13qRDPNO7ceYoeHiU313RyrSlk5VPNYAsT6MqS8UlK+ay8g4
-						Jloi4kUBFkUk+U1Pj2nC9qw0tll/ogmB8tXrPUXcOYhXI+uUVSDj892IUyMElNUk
-						3nldP+J0qA0//+SNFSrCHd44ytJ/bcAfBgL+HzDJn0bgCfGu1xPm7g1AfGUOpbyE
-						eta2BFLbqRhFTzNTdnCQkJixHoM917tvtxie4t9QsegXMJOcYpQRzZ1RE6QrSJsR
-						BB26tXX+3tC8aseRhUITN13m+wTrj1SR5pZk1jrctUHKwYZ2GcV+dZ+1dacOAdfp
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2VuZ3Mtd2ViMDEuZW5nLm94LmFjLnVrMB0G
-						A1UdDgQWBBR5snO7Txci4muSWxMZnmooKdVrmzANBgkqhkiG9w0BAQUFAAOCAQEA
-						NJrUBIaD/R5t2jC58UrsQFwA0aI0Ph/oQqWDDdoXPZ/tgctqO31Wi9raeYp/H/Ge
-						ZGDP6Rjudy1wWSEcRqu0VF5ZNI4uJ/7irMbWrlSlQhpdodJuOamUPqUm+yAEI//V
-						YgTB2F+FGrbNqTZjnY3GozCD3ZpLoHM7Y5Nl00g7vhCa3NSqXijAup2aaNfJJRKu
-						cWFdxBdzzqeABGZYH9herzoSZkFB6fCdhQb/blccGiOev+5g5c5ZnNAEb7wQPCca
-						fZRIPt9mAORaBZ8QrLddGgfdw3rq5NvXppbAXxo79OaMlwnkMD9n0hQ5FehL5y5e
-						6dl8d+0ivNjPUDcvd0ZLzA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://engs-web01.eng.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://engs-web01.eng.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Engineering Science Synch Portal Main Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eng.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Engineering Science IT Support</GivenName>
-    <EmailAddress>mailto:support@eng.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Engineering Science IT Support</GivenName>
-    <EmailAddress>mailto:support@eng.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e45d8de5..00000000
--- a/swamid-interfederations-2.0/engs-web02.eng.ox.ac.uk-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://engs-web02.eng.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "Engineering Science Synch Portal" SP for the University of Oxford.
-	-->
-  <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="2012-10-05T09:28:16Z"/>
-  </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://engs-web02.eng.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAPZQTWtL1gpBMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2VuZ3Mtd2ViMDIuZW5nLm94LmFjLnVrMB4XDTEyMTAwMTA5MzA0N1oXDTIy
-						MDkyOTA5MzA0N1owIjEgMB4GA1UEAxMXZW5ncy13ZWIwMi5lbmcub3guYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDuJ5sgm8gUZwskOGv95l5A
-						u0jq8BVNM/myMYBWPWLXpSCsAMZikQ1tkmg9pj9Skr9WVinpLNs7mtSwyp+z8ngi
-						XmgMb42iym1EaS/PbHxbdrRkM0BwjHNkMA+hXfZ5mS2lZd86pLXAbBStH8r6Zfz7
-						f0ebULyv3lA1K+Iy/04FssusWFprGgAiG8hPF5PSk5pWlQLX3CTPK9j8HDJ0nZ/1
-						pnt4W7OTDgs00e0uLodx0uoT5VZWNWhJ3oVdPdB2MyyT01QY3V0B7FKMm7PaSOz1
-						WpxIn111cPf2NRh/OkdxU1CEpgPtECuRETWJiH8EnIglOmnzBt+YNOFZke3o0EVN
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2VuZ3Mtd2ViMDIuZW5nLm94LmFjLnVrMB0G
-						A1UdDgQWBBTAlDRr8FU/W1V5loiAcviNc90aGjANBgkqhkiG9w0BAQUFAAOCAQEA
-						YcZHhS4wvOHeSa2jrvYQdt3/ojRNilzu9UOIqlTEkQKNG4NFu6+bchqE3FVoRN+X
-						O9esYL+kpD2PtTgzND6ag+MZrFmOedXOX9E1w9gMyFyH9EjhXNrr1BZVWD6KOuh7
-						LCX4nIPzTqwf5naBgPeM4EWcPHt2DFH9tQXttVZURn65gCzYjdjpTJU4nuu23wUW
-						RdGvfx8n9D93wK/BQ8VXI6dXmldl3+3dgfSRBtewCp4/jmTheXang6OrS3eMHruz
-						6e0flNky3LOCnUCbMSmT1NzyrYqXVw55MtJMwxUDIT8CT1T/6IdFI+ux6IBc2ZGI
-						EYQ4Ag/ODAxvW2NDIgXr5Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://engs-web02.eng.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://engs-web02.eng.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Engineering Science Synch Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eng.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Engineering Science IT Support</GivenName>
-    <EmailAddress>mailto:support@eng.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Engineering Science IT Support</GivenName>
-    <EmailAddress>mailto:support@eng.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.xml
deleted file mode 100644
index e60415f6..00000000
--- a/swamid-interfederations-2.0/enroller.nesc.gla.ac.uk-shibboleth.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://enroller.nesc.gla.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2.2 SP 'ENROLLER Portal' for NeSC (Glasgow).
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://enroller.nesc.gla.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAOo3G2vF7X0FMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2Vucm9sbGVyLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDkxNzE0MTgwNFoXDTE5
-						MDkxNTE0MTgwNFowIjEgMB4GA1UEAxMXZW5yb2xsZXIubmVzYy5nbGEuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1sYYn11DWBxLmEvcWLkDA
-						ZiDpFxuCO1TGxzuTw/1q86VR0Gaupv77C2eCQuD3sjAwxk4Nl7bV1t8vfK8XAGeC
-						34xoAQjHJhOp8+H6g2i4FTGugI4tH4z0+TdXyzHWbFxL/cr2f17opzlldQSzCqRB
-						Bdi+H4qY7a4t/UZqXwLm2TxN8lFBODlaONLE/FyYtWQRSNBdvz3/XKl3eSQyOITv
-						FpD3X57AjR7q8KB6J4qtFIa5bwCIemfRjL0kPi+Imreh8vBYoPRCw5Pjte1XTlAc
-						VF1f4FDpOcWC6yfgACTMDjAb1+9QBVuSLlcrC81l3ynKrDz2/IW+8FVz4ZFvB4aB
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2Vucm9sbGVyLm5lc2MuZ2xhLmFjLnVrMB0G
-						A1UdDgQWBBQIgPGsNFh+L38QqY45owJxEVFz5DANBgkqhkiG9w0BAQUFAAOCAQEA
-						Scp2FbOCuWz7i8wXXfhZO2A6L7oZnpHs19fhc1QsBixoMo8nK1rzWdHH7L9uX6NQ
-						LHX2gPTRhxeWu+tna8T4k0QanV8YyciQ+QuCdk4V/9pfaQgiqbCQ/NaX9czUusfY
-						PNC7Fmgw7A9F0OX4chyMylBWPKVwrVqi8xWxKuxKzUOV66HgesgZaw67tj2eOYLv
-						lXzRdcVw7afVvGGj5KbuxJKJFK95wToSMn6V4gdwEt8Q2PhKhKTf5+8OXmOJUXsz
-						nG8OLGCO2cYCCXYsaYyEAgSeC8R/xoE7fxVqav1OcaWepi8c+Wtj5EHL1EI6rEjO
-						jgViuQCUreNnTkGNNV//Wg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://enroller.nesc.gla.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Glasgow</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NeSC (Glasgow): ENROLLER Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.enroller.org.uk/</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/ephraim.tu-berlin.de.xml b/swamid-interfederations-2.0/ephraim.tu-berlin.de.xml
deleted file mode 100644
index 290ed16f..00000000
--- a/swamid-interfederations-2.0/ephraim.tu-berlin.de.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ephraim.tu-berlin.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-berlin.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.tubit.tu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.tubit.tu-berlin.de,OU=tubIT,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMzCCBBugAwIBAgIEDied9zANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJE
-RTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8wDQYD
-VQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAeFw0w
-OTA1MTExMjU2MDhaFw0xNDA1MTAxMjU2MDhaMIGQMQswCQYDVQQGEwJERTEPMA0G
-A1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xJzAlBgNVBAoTHlRlY2huaXNj
-aGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEOMAwGA1UECxMFdHViSVQxJjAkBgNVBAMT
-HXNoaWJib2xldGgudHViaXQudHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA3qUvqkY4p+iLKlQ33hRjbJWVMsJh7Qk7+dbJcbS+X269
-fnOt0pJKGybCHzpGN6bSPixm+pteRQ/ZfdSo7+3Th0YDBstBapNGkw61rnQpOOxm
-ds3hH4yooAOYbf3pGaE1Rm8aCwq9cDODLwtujd/qgCChVL1k+pFHtHhov0M98AZ2
-QF1IM9+sYWSttbcTJ8TnE4oQH6MUftHiE6TNtEfKWOkgx8BK1XP3OGEd0qBYAuGl
-pwMC6ublvAMSTg46rLxP04x73MbsXY9gGpaszUBRjJKKIC4Cdo+JndIgx+CTN9r5
-VVXnjOV5ryhSTD7rT7koyzaBkgLWtURysx3p/j4xLwIDAQABo4IBuzCCAbcwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKurFzJOpMsyIAwwO3BAbZxryLf6MB8GA1UdIwQYMBaAFCMyQp7+YkJO+07Q
-F5t45+2KjD54MCEGA1UdEQQaMBiBFmlkbUB0dWJpdC50dS1iZXJsaW4uZGUwgYMG
-A1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVybGlu
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYBBQUHAQEE
-gZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVy
-bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAwzxECaQ3fX5bZPlaszbbLGAodZW2VkUS8
-cyOASU1zQW0wArj4MolDZ+LZnEBCEVQwTD4bFlcQDIVeqeSbuDNXcnYtC9DKhdjQ
-yor//cu1WZ6zcUa+2NYjNMcCAj0qM1fraYaM3hPTCGREL/BjjKeENgduAmWKQeRM
-3X7Hw1sTK0Y0IfQVNsORi8H7bZDbtTKOR1eYIWRndHbNtKuRgEIG4Ud2FMjl+iX6
-tSNMelecSxtYYjrOFp4SiZDG5LCjEVoRSPwhBAOV+iMOAjqlGA4L+cqDyrWRKYb4
-sXWbU7+qrckzBNerB/L9cym1gAeK1LvL7WG3LhHY9AywW34Ewwe7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.tubit.tu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.tubit.tu-berlin.de,OU=tubIT,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMzCCBBugAwIBAgIEDied9zANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJE
-RTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8wDQYD
-VQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAeFw0w
-OTA1MTExMjU2MDhaFw0xNDA1MTAxMjU2MDhaMIGQMQswCQYDVQQGEwJERTEPMA0G
-A1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xJzAlBgNVBAoTHlRlY2huaXNj
-aGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEOMAwGA1UECxMFdHViSVQxJjAkBgNVBAMT
-HXNoaWJib2xldGgudHViaXQudHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA3qUvqkY4p+iLKlQ33hRjbJWVMsJh7Qk7+dbJcbS+X269
-fnOt0pJKGybCHzpGN6bSPixm+pteRQ/ZfdSo7+3Th0YDBstBapNGkw61rnQpOOxm
-ds3hH4yooAOYbf3pGaE1Rm8aCwq9cDODLwtujd/qgCChVL1k+pFHtHhov0M98AZ2
-QF1IM9+sYWSttbcTJ8TnE4oQH6MUftHiE6TNtEfKWOkgx8BK1XP3OGEd0qBYAuGl
-pwMC6ublvAMSTg46rLxP04x73MbsXY9gGpaszUBRjJKKIC4Cdo+JndIgx+CTN9r5
-VVXnjOV5ryhSTD7rT7koyzaBkgLWtURysx3p/j4xLwIDAQABo4IBuzCCAbcwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKurFzJOpMsyIAwwO3BAbZxryLf6MB8GA1UdIwQYMBaAFCMyQp7+YkJO+07Q
-F5t45+2KjD54MCEGA1UdEQQaMBiBFmlkbUB0dWJpdC50dS1iZXJsaW4uZGUwgYMG
-A1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVybGlu
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYBBQUHAQEE
-gZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVy
-bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAwzxECaQ3fX5bZPlaszbbLGAodZW2VkUS8
-cyOASU1zQW0wArj4MolDZ+LZnEBCEVQwTD4bFlcQDIVeqeSbuDNXcnYtC9DKhdjQ
-yor//cu1WZ6zcUa+2NYjNMcCAj0qM1fraYaM3hPTCGREL/BjjKeENgduAmWKQeRM
-3X7Hw1sTK0Y0IfQVNsORi8H7bZDbtTKOR1eYIWRndHbNtKuRgEIG4Ud2FMjl+iX6
-tSNMelecSxtYYjrOFp4SiZDG5LCjEVoRSPwhBAOV+iMOAjqlGA4L+cqDyrWRKYb4
-sXWbU7+qrckzBNerB/L9cym1gAeK1LvL7WG3LhHY9AywW34Ewwe7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.tubit.tu-berlin.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.tubit.tu-berlin.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.tubit.tu-berlin.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.tubit.tu-berlin.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.tubit.tu-berlin.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.tubit.tu-berlin.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-berlin.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.tubit.tu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.tubit.tu-berlin.de,OU=tubIT,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMzCCBBugAwIBAgIEDied9zANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJE
-RTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8wDQYD
-VQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAeFw0w
-OTA1MTExMjU2MDhaFw0xNDA1MTAxMjU2MDhaMIGQMQswCQYDVQQGEwJERTEPMA0G
-A1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xJzAlBgNVBAoTHlRlY2huaXNj
-aGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEOMAwGA1UECxMFdHViSVQxJjAkBgNVBAMT
-HXNoaWJib2xldGgudHViaXQudHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA3qUvqkY4p+iLKlQ33hRjbJWVMsJh7Qk7+dbJcbS+X269
-fnOt0pJKGybCHzpGN6bSPixm+pteRQ/ZfdSo7+3Th0YDBstBapNGkw61rnQpOOxm
-ds3hH4yooAOYbf3pGaE1Rm8aCwq9cDODLwtujd/qgCChVL1k+pFHtHhov0M98AZ2
-QF1IM9+sYWSttbcTJ8TnE4oQH6MUftHiE6TNtEfKWOkgx8BK1XP3OGEd0qBYAuGl
-pwMC6ublvAMSTg46rLxP04x73MbsXY9gGpaszUBRjJKKIC4Cdo+JndIgx+CTN9r5
-VVXnjOV5ryhSTD7rT7koyzaBkgLWtURysx3p/j4xLwIDAQABo4IBuzCCAbcwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKurFzJOpMsyIAwwO3BAbZxryLf6MB8GA1UdIwQYMBaAFCMyQp7+YkJO+07Q
-F5t45+2KjD54MCEGA1UdEQQaMBiBFmlkbUB0dWJpdC50dS1iZXJsaW4uZGUwgYMG
-A1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVybGlu
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYBBQUHAQEE
-gZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVy
-bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAwzxECaQ3fX5bZPlaszbbLGAodZW2VkUS8
-cyOASU1zQW0wArj4MolDZ+LZnEBCEVQwTD4bFlcQDIVeqeSbuDNXcnYtC9DKhdjQ
-yor//cu1WZ6zcUa+2NYjNMcCAj0qM1fraYaM3hPTCGREL/BjjKeENgduAmWKQeRM
-3X7Hw1sTK0Y0IfQVNsORi8H7bZDbtTKOR1eYIWRndHbNtKuRgEIG4Ud2FMjl+iX6
-tSNMelecSxtYYjrOFp4SiZDG5LCjEVoRSPwhBAOV+iMOAjqlGA4L+cqDyrWRKYb4
-sXWbU7+qrckzBNerB/L9cym1gAeK1LvL7WG3LhHY9AywW34Ewwe7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.tubit.tu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.tubit.tu-berlin.de,OU=tubIT,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMzCCBBugAwIBAgIEDied9zANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJE
-RTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8wDQYD
-VQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAeFw0w
-OTA1MTExMjU2MDhaFw0xNDA1MTAxMjU2MDhaMIGQMQswCQYDVQQGEwJERTEPMA0G
-A1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xJzAlBgNVBAoTHlRlY2huaXNj
-aGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEOMAwGA1UECxMFdHViSVQxJjAkBgNVBAMT
-HXNoaWJib2xldGgudHViaXQudHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA3qUvqkY4p+iLKlQ33hRjbJWVMsJh7Qk7+dbJcbS+X269
-fnOt0pJKGybCHzpGN6bSPixm+pteRQ/ZfdSo7+3Th0YDBstBapNGkw61rnQpOOxm
-ds3hH4yooAOYbf3pGaE1Rm8aCwq9cDODLwtujd/qgCChVL1k+pFHtHhov0M98AZ2
-QF1IM9+sYWSttbcTJ8TnE4oQH6MUftHiE6TNtEfKWOkgx8BK1XP3OGEd0qBYAuGl
-pwMC6ublvAMSTg46rLxP04x73MbsXY9gGpaszUBRjJKKIC4Cdo+JndIgx+CTN9r5
-VVXnjOV5ryhSTD7rT7koyzaBkgLWtURysx3p/j4xLwIDAQABo4IBuzCCAbcwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKurFzJOpMsyIAwwO3BAbZxryLf6MB8GA1UdIwQYMBaAFCMyQp7+YkJO+07Q
-F5t45+2KjD54MCEGA1UdEQQaMBiBFmlkbUB0dWJpdC50dS1iZXJsaW4uZGUwgYMG
-A1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVybGlu
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYBBQUHAQEE
-gZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtYmVy
-bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAwzxECaQ3fX5bZPlaszbbLGAodZW2VkUS8
-cyOASU1zQW0wArj4MolDZ+LZnEBCEVQwTD4bFlcQDIVeqeSbuDNXcnYtC9DKhdjQ
-yor//cu1WZ6zcUa+2NYjNMcCAj0qM1fraYaM3hPTCGREL/BjjKeENgduAmWKQeRM
-3X7Hw1sTK0Y0IfQVNsORi8H7bZDbtTKOR1eYIWRndHbNtKuRgEIG4Ud2FMjl+iX6
-tSNMelecSxtYYjrOFp4SiZDG5LCjEVoRSPwhBAOV+iMOAjqlGA4L+cqDyrWRKYb4
-sXWbU7+qrckzBNerB/L9cym1gAeK1LvL7WG3LhHY9AywW34Ewwe7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.tubit.tu-berlin.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.tubit.tu-berlin.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Berlin (Technische Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Technische Universität Berlin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-berlin.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gerd</GivenName>
-    <SurName>Schering</SurName>
-    <EmailAddress>schering@tubit.tu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gerd</GivenName>
-    <SurName>Schering</SurName>
-    <EmailAddress>schering@tubit.tu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Thomas</GivenName>
-    <SurName>Gebhardt</SurName>
-    <EmailAddress>gepard@tubit.tu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Gebhardt</SurName>
-    <EmailAddress>gepard@tubit.tu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>tubit-</GivenName>
-    <SurName>shibbolethsupport</SurName>
-    <EmailAddress>tubit-shibbolethsupport@lists.tu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>tubit-</GivenName>
-    <SurName>shibbolethsupport</SurName>
-    <EmailAddress>tubit-shibbolethsupport@lists.tu-berlin.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 6d268d5e..00000000
--- a/swamid-interfederations-2.0/epns.nottingham.ac.uk-simplesaml-module.php-saml-sp-metadata.php-default-sp.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://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <!--
-		This is a "Survey of English Place-Names" simpleSAMLphp SP for the University of Nottingham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-04T10:33:01Z">
-      <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">Survey of English Place-Names</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A county-by-county guide to the linguistic origins of England’s place-names</mdui:Description>
-        <mdui:Logo height="121" width="115">https://epns.nottingham.ac.uk/img/logos/epns_logo_hd2.png</mdui:Logo>
-      </mdui:UIInfo>
-      <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://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/discoresp.php" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEPTCCAyWgAwIBAgIJAPuVtfrq5tThMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
-						VQQGEwJVSzEYMBYGA1UECAwPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHDApOb3R0
-						aW5naGFtMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xDTALBgNV
-						BAsMBEVQTlMxFzAVBgNVBAMMDmRlZXAuZGV2LmxvY2FsMSswKQYJKoZIhvcNAQkB
-						FhxhZGFtLmNvb3BlckBub3R0aW5naGFtLmFjLnVrMB4XDTE0MDExNjEzMjczM1oX
-						DTI0MDExNjEzMjczM1owgbQxCzAJBgNVBAYTAlVLMRgwFgYDVQQIDA9Ob3R0aW5n
-						aGFtc2hpcmUxEzARBgNVBAcMCk5vdHRpbmdoYW0xITAfBgNVBAoMGFVuaXZlcnNp
-						dHkgb2YgTm90dGluZ2hhbTENMAsGA1UECwwERVBOUzEXMBUGA1UEAwwOZGVlcC5k
-						ZXYubG9jYWwxKzApBgkqhkiG9w0BCQEWHGFkYW0uY29vcGVyQG5vdHRpbmdoYW0u
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3VcWl3+bs7lxp
-						YQo1rjJnwTjzYpLBSkH2laB8+hUr4a+mz4dGZ+2iDLnbAh2jDVuUBs3usMuxC+ns
-						Zcb2cHATDCAyOSIIpErrhA5Js552fRyv1TLgJ5C0qRdfaynvgDoo5vvPAoZyO1Si
-						n3Tt4TPfY+4u+eox1tcc3wArDvxqSGvuR9fDLjB0ExmZHhAaN6WFcKjbgGh3Lb3Q
-						ccd9OZyvPF5JJSaH+eowd0n+l6ijdiAgIwGrEs3hC90n9QTAuySzll2W99qob9TE
-						i+47EZzkf+PK+CKHNDp+cb8lMyl7oKtb6rtN42KPiXgvEwbzPYQTdA7yXbvyPbqI
-						ah9S8ddZAgMBAAGjUDBOMB0GA1UdDgQWBBTSTtm0pOB5ug51Fl7uX34xMkBGWjAf
-						BgNVHSMEGDAWgBTSTtm0pOB5ug51Fl7uX34xMkBGWjAMBgNVHRMEBTADAQH/MA0G
-						CSqGSIb3DQEBBQUAA4IBAQBxwxVEx1tD7stI/Nbs4WE9tFktQKHcGw+OZfnU4WDV
-						Mc5d7/4dBVbPdkmlhlV1ApxnBXE8upLZQI6k6PjdTUmeJ9WKkHas2oftlIzqmoU2
-						BeY2jhW3dhvyfUzuS7yBznoKxAJzF31O8mEH+kZ3r4bHKHA6nuYerypAb2alL8in
-						YqX91F3Iw92nODat3eMemd/GuEj5EJj1NUd16ivXxwYkd7JRp24LtrkwEJn1wtcJ
-						/ni4HvTNy6R1Sa6oKvG9NBytMo39AcaSZXlPg9lqmj2doAlANBF0V3RztB/j4l22
-						tT+XZBO11iX4MVqiZfonPFgJ2YKD9/QznhrzqMPwV2TI
-					</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>
-						MIIEPTCCAyWgAwIBAgIJAPuVtfrq5tThMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
-						VQQGEwJVSzEYMBYGA1UECAwPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHDApOb3R0
-						aW5naGFtMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIE5vdHRpbmdoYW0xDTALBgNV
-						BAsMBEVQTlMxFzAVBgNVBAMMDmRlZXAuZGV2LmxvY2FsMSswKQYJKoZIhvcNAQkB
-						FhxhZGFtLmNvb3BlckBub3R0aW5naGFtLmFjLnVrMB4XDTE0MDExNjEzMjczM1oX
-						DTI0MDExNjEzMjczM1owgbQxCzAJBgNVBAYTAlVLMRgwFgYDVQQIDA9Ob3R0aW5n
-						aGFtc2hpcmUxEzARBgNVBAcMCk5vdHRpbmdoYW0xITAfBgNVBAoMGFVuaXZlcnNp
-						dHkgb2YgTm90dGluZ2hhbTENMAsGA1UECwwERVBOUzEXMBUGA1UEAwwOZGVlcC5k
-						ZXYubG9jYWwxKzApBgkqhkiG9w0BCQEWHGFkYW0uY29vcGVyQG5vdHRpbmdoYW0u
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3VcWl3+bs7lxp
-						YQo1rjJnwTjzYpLBSkH2laB8+hUr4a+mz4dGZ+2iDLnbAh2jDVuUBs3usMuxC+ns
-						Zcb2cHATDCAyOSIIpErrhA5Js552fRyv1TLgJ5C0qRdfaynvgDoo5vvPAoZyO1Si
-						n3Tt4TPfY+4u+eox1tcc3wArDvxqSGvuR9fDLjB0ExmZHhAaN6WFcKjbgGh3Lb3Q
-						ccd9OZyvPF5JJSaH+eowd0n+l6ijdiAgIwGrEs3hC90n9QTAuySzll2W99qob9TE
-						i+47EZzkf+PK+CKHNDp+cb8lMyl7oKtb6rtN42KPiXgvEwbzPYQTdA7yXbvyPbqI
-						ah9S8ddZAgMBAAGjUDBOMB0GA1UdDgQWBBTSTtm0pOB5ug51Fl7uX34xMkBGWjAf
-						BgNVHSMEGDAWgBTSTtm0pOB5ug51Fl7uX34xMkBGWjAMBgNVHRMEBTADAQH/MA0G
-						CSqGSIb3DQEBBQUAA4IBAQBxwxVEx1tD7stI/Nbs4WE9tFktQKHcGw+OZfnU4WDV
-						Mc5d7/4dBVbPdkmlhlV1ApxnBXE8upLZQI6k6PjdTUmeJ9WKkHas2oftlIzqmoU2
-						BeY2jhW3dhvyfUzuS7yBznoKxAJzF31O8mEH+kZ3r4bHKHA6nuYerypAb2alL8in
-						YqX91F3Iw92nODat3eMemd/GuEj5EJj1NUd16ivXxwYkd7JRp24LtrkwEJn1wtcJ
-						/ni4HvTNy6R1Sa6oKvG9NBytMo39AcaSZXlPg9lqmj2doAlANBF0V3RztB/j4l22
-						tT+XZBO11iX4MVqiZfonPFgJ2YKD9/QznhrzqMPwV2TI
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://epns.nottingham.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Survey of English Place-Names</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/ins/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpline</GivenName>
-    <EmailAddress>mailto:itservicedesk@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Team</GivenName>
-    <EmailAddress>mailto:digitalepns@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 1ac796e9..00000000
--- a/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://epoq.compilatio.net/shibboleth">
-  <md: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>
-    <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>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Compilatio - Prévention du plagiat</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://epoq.compilatio.net/shibboleth</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPjCCAiYCCQDLkvKzyxmCozANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJG
-UjEUMBIGA1UEBwwLU2FpbnQgRmVsaXgxEzARBgNVBAoMCkNvbXBpbGF0aW8xCzAJ
-BgNVBAsMAklUMRkwFwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MCAXDTE1MTAwMTE0
-NTIyNloYDzIxMTUwOTA3MTQ1MjI2WjBgMQswCQYDVQQGEwJGUjEUMBIGA1UEBwwL
-U2FpbnQgRmVsaXgxEzARBgNVBAoMCkNvbXBpbGF0aW8xCzAJBgNVBAsMAklUMRkw
-FwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxU1Kzma74qazOCj/66wzcyZHB7XtSgIFEw1LtLq/9OA5efe/5yL6
-nK6H0pZoEpWGDLSzQkQJFP1OlozStQAAf/U0N5mWY5JUqwJce+Y58bA7jg2JIDp8
-zPDvKMJ3izkeJUxBdYiV6aZW3aRjt22tTlxlXgU3wovicu+acSY9YAZLMWkvNoVH
-fNTmXZA8rzMif2qPSHnv2HIu+vUiTmD39BPxHfbunvCjmmFZWM2fO/QEyG2n4/Yu
-ttEzNd9yhU7t++KFiK+D1vlCbRRnjffyhQfEhcj6zauCDtfOzadtO+LzMSdS+g/B
-3mx2ic9ixgC0ml2Mw7De29XHzcbhcYuD/wIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQASeEiw1b+IblGOSrqTaJhCHmkOTKpaVl5+ARTc4J1f1zWZm6gmf2mGSJZthlsn
-i+MjdeE6mHsX0B4ZRQdyEXaj2d90lnJXQ3Hy4YUht1T3Q+rm4+DPIKpCLZxIYMXW
-CGD9S73G7vS1npUIP0g5TAk808UzaYDPtbTKsTk7YNnvlr7o1aJLBq4EGURHzwKs
-ur5AvNBhBVh3NqjhsDb5JzYkgncMR0jhlF79yeUQ0hJN3dsArkRW8hfFKkmMg/vV
-b3MlBBOGsobwQbkN5sUxaZF1vPtLD0THGTJDUYY4F3bySOFBaxIhORL8fiHKQr9J
-4oI8R2FqqBAcrToXFmQESE/i
-
-					    </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>
-					      MIIDPjCCAiYCCQDLkvKzyxmCozANBgkqhkiG9w0BAQsFADBgMQswCQYDVQQGEwJG
-UjEUMBIGA1UEBwwLU2FpbnQgRmVsaXgxEzARBgNVBAoMCkNvbXBpbGF0aW8xCzAJ
-BgNVBAsMAklUMRkwFwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MCAXDTE1MTAwMTE0
-NTIyNloYDzIxMTUwOTA3MTQ1MjI2WjBgMQswCQYDVQQGEwJGUjEUMBIGA1UEBwwL
-U2FpbnQgRmVsaXgxEzARBgNVBAoMCkNvbXBpbGF0aW8xCzAJBgNVBAsMAklUMRkw
-FwYDVQQDDBAqLmNvbXBpbGF0aW8ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxU1Kzma74qazOCj/66wzcyZHB7XtSgIFEw1LtLq/9OA5efe/5yL6
-nK6H0pZoEpWGDLSzQkQJFP1OlozStQAAf/U0N5mWY5JUqwJce+Y58bA7jg2JIDp8
-zPDvKMJ3izkeJUxBdYiV6aZW3aRjt22tTlxlXgU3wovicu+acSY9YAZLMWkvNoVH
-fNTmXZA8rzMif2qPSHnv2HIu+vUiTmD39BPxHfbunvCjmmFZWM2fO/QEyG2n4/Yu
-ttEzNd9yhU7t++KFiK+D1vlCbRRnjffyhQfEhcj6zauCDtfOzadtO+LzMSdS+g/B
-3mx2ic9ixgC0ml2Mw7De29XHzcbhcYuD/wIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQASeEiw1b+IblGOSrqTaJhCHmkOTKpaVl5+ARTc4J1f1zWZm6gmf2mGSJZthlsn
-i+MjdeE6mHsX0B4ZRQdyEXaj2d90lnJXQ3Hy4YUht1T3Q+rm4+DPIKpCLZxIYMXW
-CGD9S73G7vS1npUIP0g5TAk808UzaYDPtbTKsTk7YNnvlr7o1aJLBq4EGURHzwKs
-ur5AvNBhBVh3NqjhsDb5JzYkgncMR0jhlF79yeUQ0hJN3dsArkRW8hfFKkmMg/vV
-b3MlBBOGsobwQbkN5sUxaZF1vPtLD0THGTJDUYY4F3bySOFBaxIhORL8fiHKQr9J
-4oI8R2FqqBAcrToXFmQESE/i
-
-					    </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>
-					      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>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epoq.compilatio.net/shibboleth/Shibboleth.sso/SAML/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epoq.compilatio.net/shibboleth/Shibboleth.sso/SAML2/POST" index="4"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Compilatio - Prévention du plagiat</md:ServiceName>
-      <md: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 ...</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="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"/>
-      <md: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"/>
-      <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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="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"/>
-      <md: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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">COMPILATIO</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">COMPILATIO</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.compilatio.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>ent@compilatio.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/epos.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5dd4022a..00000000
--- a/swamid-interfederations-2.0/epos.some.ox.ac.uk-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://epos.some.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Somerville College EPOS" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-04-02T09:53: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://epos.some.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAIeX2OzTvmynMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEmVwb3Muc29tZS5veC5hYy51azAeFw0xNDA1MDcxMjE5NTZaFw0yNDA1MDQx
-						MjE5NTZaMB0xGzAZBgNVBAMTEmVwb3Muc29tZS5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBANoYLxr0nZQXjMkLpIu8EdDajPHthrne+eWK
-						oF12T0H5RYUw0YE3pMKwK3VWoXHdRzH4ePvND1PW7lTOHTiNtausoL8QlhrPFFQz
-						8AC3EXaBHyq+jVRxNMxqhCtVj72luACc4zA/cRsogZeYZPF4KlmpBA8KCqr1mCmM
-						6fxup0StnVye/crUmEqg7dYWEIqR7mIMZWi4QLV/VMEV5UOX0KU4Qm7Pu7oTNtL3
-						bLUIE5bXsGhlvzF86jCxO9Y8NKSlFKUaddBUjVfYqUsEu4oXQSTlMmSVD3djy8Yc
-						ncy2uY3JELglba34miJSBoQvnw6uoKWU2LmMyNaPs6RV8xXULlMCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISZXBvcy5zb21lLm94LmFjLnVrMB0GA1UdDgQWBBS4MB3W4HW8
-						tZYm+obee7zmUo9IEjANBgkqhkiG9w0BAQUFAAOCAQEAPr/z/iLjWcFujxOYgHR+
-						bg0I7OYGQzDVhED0ECK8sQuNMS3oQBqQPp601lgIdaQVBbQRB7hwdp8wm53Zhmqb
-						SgqmfLmzaW3WU9YXNLE6082liVKhchZbhSSq0SjglXNlxlTcAGtkBESjfHH5K6Se
-						OL7WxfOEJkc4jY8haTScAZ+wFcUFbuWtxpfz0nd2OfYn7qkR2jo3J6e7FCfXzR1C
-						6ZCffO7hx2tmAfC7gPRWLKV5AHTJ/tkgLAtH80nepDjZw586qjywlEBM7qYI/GlK
-						XxF0pyDgcq3CujFb3JC3x5aIEq9zFiy/6R7bZhkuCSCgGA/Ey5RPXslWSgQTyF9i
-						CA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://epos.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://epos.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Somerville College EPOS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/equinoxjournals.com-shibboleth-sp.xml b/swamid-interfederations-2.0/equinoxjournals.com-shibboleth-sp.xml
deleted file mode 100644
index 3cc38525..00000000
--- a/swamid-interfederations-2.0/equinoxjournals.com-shibboleth-sp.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://equinoxjournals.com/shibboleth-sp">
-  <!--
-		This is a Shibboleth SP for Equinox Publishing Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-03T09:28:24Z"/>
-  </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">Equinox Publishing</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Publishing academic journals, textbooks, anthologies, monographs and reference books in the areas of archaeology, linguistics, cultural history, religious studies, theology, biblical studies, cookery and popular music.</mdui:Description>
-        <mdui:Logo height="79" width="363">https://www.equinoxpub.com/equinox/images/home_logo.gif</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.equinoxpub.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.equinoxpub.com/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://www.equinoxpub.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://www.equinoxpub.com/Shibboleth.sso/DS" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEXDCCA0SgAwIBAgIJAI+ovrSiKZbIMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECBMPU291dGggWW9ya3NoaXJlMRIwEAYDVQQHEwlTaGVm
-						ZmllbGQxHzAdBgNVBAoTFkVxdWlub3ggUHVibGlzaGluZyBMdGQxCzAJBgNVBAsT
-						AklUMRwwGgYDVQQDExNlcXVpbm94am91cm5hbHMuY29tMSUwIwYJKoZIhvcNAQkB
-						FhZzdXBwb3J0QGVxdWlub3hwdWIuY29tMB4XDTEyMDQwMzIyMjkzOFoXDTIyMDQw
-						MTIyMjkzOFowga4xCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Tb3V0aCBZb3Jrc2hp
-						cmUxEjAQBgNVBAcTCVNoZWZmaWVsZDEfMB0GA1UEChMWRXF1aW5veCBQdWJsaXNo
-						aW5nIEx0ZDELMAkGA1UECxMCSVQxHDAaBgNVBAMTE2VxdWlub3hqb3VybmFscy5j
-						b20xJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAZXF1aW5veHB1Yi5jb20wggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGZpYDMaxM9v0cDM+JkoNQSMRPwOUo
-						iwl45P9jJh1zwJRi++9/uu9e/kQIEJmiZYowkyea2wPDYZVAukOgfkk4m+0VVoV6
-						Ro/mNO1jBCsVXXQ6DeT8Aq/UCI1N4LlBD9DHPp+neQZvhoQp1V1zouXqMUBTRtW+
-						77h2IIidOGlaU6OS7qJLqGLQQCWZD1mxb6Sms+5Sa1xdf9WOUq3inB6gB6GReJdC
-						tWInflUNrFS8mvM0lHUQs18SmulMokgb+s8xSJljpcbCMpSWKshHZjWuOmzc15a4
-						a3rSgZxZDJMqioQzpGMOyd7FZEIgnBY6KFurNkha7ddISbaSmrWtnytBAgMBAAGj
-						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
-						IENlcnRpZmljYXRlMB0GA1UdDgQWBBRoLYcAzpJhhw9sBy/6ACALL0qpczAfBgNV
-						HSMEGDAWgBRoLYcAzpJhhw9sBy/6ACALL0qpczANBgkqhkiG9w0BAQUFAAOCAQEA
-						SqIXjnqGhkkRA5cSJherE2uyt7eDmA7VXbJjGV+KgM4dWf+R+Y81NzYuddknTeGZ
-						eQTcGy67dYnzDan8ZN+AfS98NgHx4qaTI+rwq5/0Vo+MaG57NiGUt6pkR1LKTbtw
-						Zf8QgAhLAWH66w4tK+/507XY5GS+Cfkjznnm2hT6pftCg13mMO4YFGzH7LUwPYSR
-						UdH7G5kkGwV0FhZaDP0e5SKWfHGjihDcw5RbOLiD5hv7m1Ls7PDKPR+izh+40wf/
-						d0RO7oiZKGZjtKMvJPh++lYFflUPLH/lmg3nzKYmwTdJFmC4m9NL+9QRn0Ned2D8
-						pztQ4C1nPvNFJOO9MeGj6g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.equinoxpub.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.equinoxpub.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.equinoxpub.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.equinoxpub.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.equinoxpub.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.equinoxpub.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.equinoxpub.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.equinoxpub.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.equinoxpub.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.equinoxpub.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.equinoxpub.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Equinox Publishing Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Equinox Publishing</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.equinoxpub.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Willis</SurName>
-    <EmailAddress>mailto:mwillis@equinoxpub.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Willis</SurName>
-    <EmailAddress>mailto:mwillis@equinoxpub.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.xml
deleted file mode 100644
index 4c41b71e..00000000
--- a/swamid-interfederations-2.0/eresources.city.ac.uk-oala-metadata.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://eresources.city.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA 2.0 IdP for City University London
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">city.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqTCCApGgAwIBAgIJANEnL7ss8XzBMA0GCSqGSIb3DQEBBQUAMEExHzAdBgNV
-						BAoTFkNpdHkgVW5pdmVyc2l0eSBMb25kb24xHjAcBgNVBAMTFWVyZXNvdXJjZXMu
-						Y2l0eS5hYy51azAeFw0xMTA1MTgxMzA0MDhaFw0yMTA1MTUxMzA0MDhaMEExHzAd
-						BgNVBAoTFkNpdHkgVW5pdmVyc2l0eSBMb25kb24xHjAcBgNVBAMTFWVyZXNvdXJj
-						ZXMuY2l0eS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4B
-						2cssI9cYHB6pShfCTfHPbLxpvtS6UDCSiyk59QjBkEe+xNOooWADPm/hOpJ8YSaJ
-						+P0YtBcGASJH7TZDoRDrQv4ilKnf4q3j634N3W7M/a/9QYhFb5+hoLCCFKW8k/Ci
-						2HGccZoXf71l1fm8WbaARlxr+jbfXm27xNTRYI0DQuLljCYEX4CbVULdJwJEDbly
-						zjE/m35pFfBSGkIfLW2Pb1kfqhQibPK9OFgaIS+CqnLjeeSu+vKCLZTReLO066k+
-						kD7w4sA5iQO8wgI/tplI3Qfk5nVYZ+U/lvwTErkUv8SHMRrSM5IpLCZJlt5c/kSs
-						dO3LGvR9DRDu5ZKeiKMCAwEAAaOBozCBoDAdBgNVHQ4EFgQU+ZtIxxwofqtAgktA
-						4ikJYEOr5Y8wcQYDVR0jBGowaIAU+ZtIxxwofqtAgktA4ikJYEOr5Y+hRaRDMEEx
-						HzAdBgNVBAoTFkNpdHkgVW5pdmVyc2l0eSBMb25kb24xHjAcBgNVBAMTFWVyZXNv
-						dXJjZXMuY2l0eS5hYy51a4IJANEnL7ss8XzBMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEFBQADggEBAAc1kylLE8KGgvXnA/WBu/ZQ/A/oHL0upJqpWr3cJeP3PMCG
-						T7XSvNK9gmFPakF0A5w14wtn+Q3cQTkPlfcEVbyUSOENFazXGRUxCzAZsVH7gnL+
-						FyZK+NT73wdvqR2OiwAMUWITHISyem029BRpbe59MR2V1uYk2l4xEHrqTt520XCQ
-						fRIGR+/ORhOm5ANGNp+uIL3YRPth2g0z+j3EB130sVfEt1LQdC6nsf6Nn1v7JXuV
-						HIkvnhXmEYmfriKBwfQlQmXn8e/r6MalkbDoyAwpj89nad1Qnt64y7Xlwuhv73Yh
-						IzI6BtUZKeH0qlf6/tMjgAJWUSgRl/w2i1F6Kf0=
-					</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>
-						MIIDqTCCApGgAwIBAgIJANEnL7ss8XzBMA0GCSqGSIb3DQEBBQUAMEExHzAdBgNV
-						BAoTFkNpdHkgVW5pdmVyc2l0eSBMb25kb24xHjAcBgNVBAMTFWVyZXNvdXJjZXMu
-						Y2l0eS5hYy51azAeFw0xMTA1MTgxMzA0MDhaFw0yMTA1MTUxMzA0MDhaMEExHzAd
-						BgNVBAoTFkNpdHkgVW5pdmVyc2l0eSBMb25kb24xHjAcBgNVBAMTFWVyZXNvdXJj
-						ZXMuY2l0eS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4B
-						2cssI9cYHB6pShfCTfHPbLxpvtS6UDCSiyk59QjBkEe+xNOooWADPm/hOpJ8YSaJ
-						+P0YtBcGASJH7TZDoRDrQv4ilKnf4q3j634N3W7M/a/9QYhFb5+hoLCCFKW8k/Ci
-						2HGccZoXf71l1fm8WbaARlxr+jbfXm27xNTRYI0DQuLljCYEX4CbVULdJwJEDbly
-						zjE/m35pFfBSGkIfLW2Pb1kfqhQibPK9OFgaIS+CqnLjeeSu+vKCLZTReLO066k+
-						kD7w4sA5iQO8wgI/tplI3Qfk5nVYZ+U/lvwTErkUv8SHMRrSM5IpLCZJlt5c/kSs
-						dO3LGvR9DRDu5ZKeiKMCAwEAAaOBozCBoDAdBgNVHQ4EFgQU+ZtIxxwofqtAgktA
-						4ikJYEOr5Y8wcQYDVR0jBGowaIAU+ZtIxxwofqtAgktA4ikJYEOr5Y+hRaRDMEEx
-						HzAdBgNVBAoTFkNpdHkgVW5pdmVyc2l0eSBMb25kb24xHjAcBgNVBAMTFWVyZXNv
-						dXJjZXMuY2l0eS5hYy51a4IJANEnL7ss8XzBMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEFBQADggEBAAc1kylLE8KGgvXnA/WBu/ZQ/A/oHL0upJqpWr3cJeP3PMCG
-						T7XSvNK9gmFPakF0A5w14wtn+Q3cQTkPlfcEVbyUSOENFazXGRUxCzAZsVH7gnL+
-						FyZK+NT73wdvqR2OiwAMUWITHISyem029BRpbe59MR2V1uYk2l4xEHrqTt520XCQ
-						fRIGR+/ORhOm5ANGNp+uIL3YRPth2g0z+j3EB130sVfEt1LQdC6nsf6Nn1v7JXuV
-						HIkvnhXmEYmfriKBwfQlQmXn8e/r6MalkbDoyAwpj89nad1Qnt64y7Xlwuhv73Yh
-						IzI6BtUZKeH0qlf6/tMjgAJWUSgRl/w2i1F6Kf0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://eresources.city.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eresources.city.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">City University London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">City University London (IT log-in)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.city.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>E-Resources Helpdesk</GivenName>
-    <EmailAddress>mailto:e-access@city.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Zakrocki</SurName>
-    <EmailAddress>mailto:Robert.zakrocki.1@city.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/erf.sbb.spk-berlin.de.xml b/swamid-interfederations-2.0/erf.sbb.spk-berlin.de.xml
deleted file mode 100644
index b2756e1c..00000000
--- a/swamid-interfederations-2.0/erf.sbb.spk-berlin.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://erf.sbb.spk-berlin.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>erf.sbb.spk-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=erf.sbb.spk-berlin.de,OU=Staatsbibliothek zu Berlin PK,O=STIFTUNG PREUSSISCHER KULTURBESITZ,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGCDCCBPCgAwIBAgIEDQQY/DANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSswKQYDVQQKEyJT
-VElGVFVORyBQUkVVU1NJU0NIRVIgS1VMVFVSQkVTSVRaMTAwLgYDVQQDEydTVElG
-VFVORyBQUkVVU1NJU0NIRVIgS1VMVFVSQkVTSVRaIC0gQ0ExIjAgBgkqhkiG9w0B
-CQEWE2NhQGh2LnNway1iZXJsaW4uZGUwHhcNMDgxMDAyMDk1OTA5WhcNMTMxMDAx
-MDk1OTA5WjCBpDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UE
-BxMGQmVybGluMSswKQYDVQQKEyJTVElGVFVORyBQUkVVU1NJU0NIRVIgS1VMVFVS
-QkVTSVRaMSYwJAYDVQQLEx1TdGFhdHNiaWJsaW90aGVrIHp1IEJlcmxpbiBQSzEe
-MBwGA1UEAxMVZXJmLnNiYi5zcGstYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAsIo/QRLwUvAHXZ9FkD80W+O3HY9peAQExGGc2Ojzq7h8
-6Clq0sKVAFkXV4jJArtC8O4V+LVfL+/EHGLawi9Nps7UflkSjSNlK3Bu33I8ZZVJ
-wBxZG4/YrtuzZpz5KZ0sY3x4/HQCYxehVPdsdlgDx82O4yy3A2NSEryLZk0syX3m
-ORB9V3soO/4QVs/avsc/N+pvcbmXCf8MT/XG5j0qdMYYqYenT8aG3YCmGF7d0e04
-ME1kQ4QN+2tprrJuDslnIV6X/tMJGvRmayKyDCe+ORdWqFnZE9MxPhDj2gkR+Uf8
-RO5Ip552z/ZqbrAFHBwqokOLolu5MZ0fGbu/KeE1QwIDAQABo4ICMDCCAiwwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBT3xLOhGMK2vHK2JywZAkPJ2nJruTAfBgNVHSMEGDAWgBTn
-p8hlJwW/CmNIRBlH2cq44OVQKTAmBgNVHREEHzAdgRtlcmYtYWRtaW5Ac2JiLnNw
-ay1iZXJsaW4uZGUwgbcGA1UdHwSBrzCBrDBUoFKgUIZOaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9zdGlmdHVuZy1wcmV1c3Npc2NoZXIta3VsdHVyYmVzaXR6LWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMFSgUqBQhk5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3N0
-aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHotY2EvcHViL2NybC9jYWNy
-bC5jcmwwgdAGCCsGAQUFBwEBBIHDMIHAMF4GCCsGAQUFBzAChlJodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3N0aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHot
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MF4GCCsGAQUFBzAChlJodHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL3N0aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHot
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBDr6KA
-0mxhN6uvQwoQPTJxvSCzibyOIj2LpChEtewwWZxmrG6jmddag1iUPG8VsdB+Ocrn
-AuKmrZJhAJtmkH5YcdTA9l4kbNNgBBx4fkOsxsXgo5yMeX2V8OCCjdL+ZvMiv1ih
-f+PsEmREhK3MhoLa0R2jK69AYOM80uhc4Tw+T4tICXNLojudpnK4fiRnnaJ0JV2W
-vAuQQAnkXf7C5K9cPxzPE8zfL4OGMk1HkFRdZ6Cdw/NT2nquE9uoe6IiJbyHqVye
-7TQp8bbt4gXHGiMg4iKniIYBGa1hpT36g6UudpvjoKEmDWiy59bIYHSuH6E0O24L
-i+qpO2NCiiTGlah8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>erf.sbb.spk-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=erf.sbb.spk-berlin.de,OU=Staatsbibliothek zu Berlin PK,O=STIFTUNG PREUSSISCHER KULTURBESITZ,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGCDCCBPCgAwIBAgIEDQQY/DANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSswKQYDVQQKEyJT
-VElGVFVORyBQUkVVU1NJU0NIRVIgS1VMVFVSQkVTSVRaMTAwLgYDVQQDEydTVElG
-VFVORyBQUkVVU1NJU0NIRVIgS1VMVFVSQkVTSVRaIC0gQ0ExIjAgBgkqhkiG9w0B
-CQEWE2NhQGh2LnNway1iZXJsaW4uZGUwHhcNMDgxMDAyMDk1OTA5WhcNMTMxMDAx
-MDk1OTA5WjCBpDELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UE
-BxMGQmVybGluMSswKQYDVQQKEyJTVElGVFVORyBQUkVVU1NJU0NIRVIgS1VMVFVS
-QkVTSVRaMSYwJAYDVQQLEx1TdGFhdHNiaWJsaW90aGVrIHp1IEJlcmxpbiBQSzEe
-MBwGA1UEAxMVZXJmLnNiYi5zcGstYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAsIo/QRLwUvAHXZ9FkD80W+O3HY9peAQExGGc2Ojzq7h8
-6Clq0sKVAFkXV4jJArtC8O4V+LVfL+/EHGLawi9Nps7UflkSjSNlK3Bu33I8ZZVJ
-wBxZG4/YrtuzZpz5KZ0sY3x4/HQCYxehVPdsdlgDx82O4yy3A2NSEryLZk0syX3m
-ORB9V3soO/4QVs/avsc/N+pvcbmXCf8MT/XG5j0qdMYYqYenT8aG3YCmGF7d0e04
-ME1kQ4QN+2tprrJuDslnIV6X/tMJGvRmayKyDCe+ORdWqFnZE9MxPhDj2gkR+Uf8
-RO5Ip552z/ZqbrAFHBwqokOLolu5MZ0fGbu/KeE1QwIDAQABo4ICMDCCAiwwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBT3xLOhGMK2vHK2JywZAkPJ2nJruTAfBgNVHSMEGDAWgBTn
-p8hlJwW/CmNIRBlH2cq44OVQKTAmBgNVHREEHzAdgRtlcmYtYWRtaW5Ac2JiLnNw
-ay1iZXJsaW4uZGUwgbcGA1UdHwSBrzCBrDBUoFKgUIZOaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9zdGlmdHVuZy1wcmV1c3Npc2NoZXIta3VsdHVyYmVzaXR6LWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMFSgUqBQhk5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3N0
-aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHotY2EvcHViL2NybC9jYWNy
-bC5jcmwwgdAGCCsGAQUFBwEBBIHDMIHAMF4GCCsGAQUFBzAChlJodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3N0aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHot
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MF4GCCsGAQUFBzAChlJodHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL3N0aWZ0dW5nLXByZXVzc2lzY2hlci1rdWx0dXJiZXNpdHot
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBDr6KA
-0mxhN6uvQwoQPTJxvSCzibyOIj2LpChEtewwWZxmrG6jmddag1iUPG8VsdB+Ocrn
-AuKmrZJhAJtmkH5YcdTA9l4kbNNgBBx4fkOsxsXgo5yMeX2V8OCCjdL+ZvMiv1ih
-f+PsEmREhK3MhoLa0R2jK69AYOM80uhc4Tw+T4tICXNLojudpnK4fiRnnaJ0JV2W
-vAuQQAnkXf7C5K9cPxzPE8zfL4OGMk1HkFRdZ6Cdw/NT2nquE9uoe6IiJbyHqVye
-7TQp8bbt4gXHGiMg4iKniIYBGa1hpT36g6UudpvjoKEmDWiy59bIYHSuH6E0O24L
-i+qpO2NCiiTGlah8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://erf.sbb.spk-berlin.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://erf.sbb.spk-berlin.de/Shibboleth.sso/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Staatsbibliothek zu Berlin</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Staatsbibliothek zu Berlin Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://staatsbibliothek-berlin.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Jann-Gerd</GivenName>
-    <SurName>Hans</SurName>
-    <EmailAddress>jgh@sbb.spk-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gerrit</GivenName>
-    <SurName>Gragert</SurName>
-    <EmailAddress>gerrit.gragert@sbb.spk-berlin.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/esds80.mcc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/esds80.mcc.ac.uk-shibboleth.xml
deleted file mode 100644
index 0309e7dc..00000000
--- a/swamid-interfederations-2.0/esds80.mcc.ac.uk-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://esds80.mcc.ac.uk/shibboleth">
-  <!--
-		This is a "MIMAS New ESDS Server" Shibboleth SP for the University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDBjCCAe6gAwIBAgIJAPsrc/dHrh27MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWVzZHN3cDAyLmRzLm1hbi5hYy51azAeFw0xMTA0MTQwODMwNTRaFw0yMTA0
-						MTEwODMwNTRaMCAxHjAcBgNVBAMTFWVzZHN3cDAyLmRzLm1hbi5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIW9zW3cx5qTffqwVyTfkIZq9rB
-						2hwtpbPPD3pMOVzayJTjjjhFIbqOZ5cClg9KG4Z+fqrE8stkZnkvyyqYskQ1D17A
-						VPqzz7pZHXgw3siViaK5+h4Pt6M0KTybcmEYpE25UB6liRoVaS74tUsLnQrbt3Kr
-						yJuNjux6u0AJ6iLji2uEzI1VKp6vWNKLLN2kLYcm3b4oHIIetSOkSOnDTFtiWyGT
-						MwEg5ocJZVOIW3BDAtylsYVHDKzO+uiTWgQ4pL5oljifBsM8tQloL8jGbFZ1vq/5
-						3ZeXKG1NJ/X7/DjZKri7VDdVv7tRzuJdcookpTR61gjWXBkjQOB/znYKesUCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVZXNkc3dwMDIuZHMubWFuLmFjLnVrMB0GA1UdDgQW
-						BBSZAvZof+nlO9BXlVnwD3uiwxovDTANBgkqhkiG9w0BAQUFAAOCAQEAUr7hL/Z9
-						xBMNAbVWZ1116SclReYyutdoqjMvS9mQjhbAzvERGDC2lnq7773bJvsqQKNB2WDY
-						m3bsGaMXLY2XsQcV5SRzYADvvsxarruzzf41u2EIWrORuHZ44r4qSib7fU1rUIKt
-						CQQkpXFl5bF861syiHahW874Ps24A2yOTqGLdFpLXXOHYeNd1DppxJ24NQT8Zbv4
-						QRsxHJeqy5eD5bAq5w7k2OTTcK+wk9hOh/ZI9M3/Addini0dUUVGZIL4mX0szJ+C
-						rfxNIEq53mqQ2E3bBjXuEJxt54BJ7aaa2dPvhOq1RTZtKk8fzlkB7kYvLBJne4UB
-						gjkwmpPei6RNFQ==
-					</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>
-						MIIDBjCCAe6gAwIBAgIJAPsrc/dHrh27MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWVzZHN3cDAyLmRzLm1hbi5hYy51azAeFw0xMTA0MTQwODMwNTRaFw0yMTA0
-						MTEwODMwNTRaMCAxHjAcBgNVBAMTFWVzZHN3cDAyLmRzLm1hbi5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIW9zW3cx5qTffqwVyTfkIZq9rB
-						2hwtpbPPD3pMOVzayJTjjjhFIbqOZ5cClg9KG4Z+fqrE8stkZnkvyyqYskQ1D17A
-						VPqzz7pZHXgw3siViaK5+h4Pt6M0KTybcmEYpE25UB6liRoVaS74tUsLnQrbt3Kr
-						yJuNjux6u0AJ6iLji2uEzI1VKp6vWNKLLN2kLYcm3b4oHIIetSOkSOnDTFtiWyGT
-						MwEg5ocJZVOIW3BDAtylsYVHDKzO+uiTWgQ4pL5oljifBsM8tQloL8jGbFZ1vq/5
-						3ZeXKG1NJ/X7/DjZKri7VDdVv7tRzuJdcookpTR61gjWXBkjQOB/znYKesUCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVZXNkc3dwMDIuZHMubWFuLmFjLnVrMB0GA1UdDgQW
-						BBSZAvZof+nlO9BXlVnwD3uiwxovDTANBgkqhkiG9w0BAQUFAAOCAQEAUr7hL/Z9
-						xBMNAbVWZ1116SclReYyutdoqjMvS9mQjhbAzvERGDC2lnq7773bJvsqQKNB2WDY
-						m3bsGaMXLY2XsQcV5SRzYADvvsxarruzzf41u2EIWrORuHZ44r4qSib7fU1rUIKt
-						CQQkpXFl5bF861syiHahW874Ps24A2yOTqGLdFpLXXOHYeNd1DppxJ24NQT8Zbv4
-						QRsxHJeqy5eD5bAq5w7k2OTTcK+wk9hOh/ZI9M3/Addini0dUUVGZIL4mX0szJ+C
-						rfxNIEq53mqQ2E3bBjXuEJxt54BJ7aaa2dPvhOq1RTZtKk8fzlkB7kYvLBJne4UB
-						gjkwmpPei6RNFQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://esds80.mcc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MIMAS New ESDS Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.esds.ac.uk/international/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ESDS International Helpdesk</GivenName>
-    <EmailAddress>mailto:international@esds.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/esdsdev01.ds.man.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/esdsdev01.ds.man.ac.uk-shibboleth.xml
deleted file mode 100644
index 37eda6a0..00000000
--- a/swamid-interfederations-2.0/esdsdev01.ds.man.ac.uk-shibboleth.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://esdsdev01.ds.man.ac.uk/shibboleth">
-  <!--
-		This is a "MIMAS ESDS Development Server" Shibboleth SP for the University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">ESDS International (Development)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Online access to socio-economic time series datasets aggregated to the country or regional level.</mdui:Description>
-        <mdui:Logo height="350" width="161">https://esdsdev01.ds.man.ac.uk/esdsint-med.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAOegVyCLESWpMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmVzZHNkZXYwMS5kcy5tYW4uYWMudWswHhcNMTEwNDE2MTQzNDUwWhcNMjEw
-						NDEzMTQzNDUwWjAhMR8wHQYDVQQDExZlc2RzZGV2MDEuZHMubWFuLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArSSkzgeZ0lVbjh4jmzl6EwL+
-						UmBfmiXE25AQdHm69bZ18Xi5Mq6ekkw/WuNIztu4p14Nj3bOCXvmrILQE3sV0TNr
-						ge7XAAvfhwhwW8P/0KSF3PPO2mN1yZToSWJKb04idjSLttNTrOchEAapCfwYu4JE
-						r8uXNcccYNpuePE6wncoxWknWPJW4L+sarfQbAKmcksEiIwwlz/8gY0D4OhR+mhM
-						q/OsLzY4Os4+1QwGbO99uQbbH3ni8wnXZZWPRp/VbdAYjavb2CihJE0gxbCwl2Sb
-						wXCy6cYXSz5APMoNbdmnHHMaBH8Wfr9Iqj0H/8Mf22qnGT9QZQHotKY9Jxs99wID
-						AQABo0QwQjAhBgNVHREEGjAYghZlc2RzZGV2MDEuZHMubWFuLmFjLnVrMB0GA1Ud
-						DgQWBBTBQrWo24UVCTROZnBZNmP+c+/ksjANBgkqhkiG9w0BAQUFAAOCAQEABr5E
-						AteCYpWEIOSa2pd6O/J8RYs0eTev/erX86SOr9CzWVSbQWOOrGWIGGfzl6pr/InJ
-						HMODUl83ef2aqCLSPQNvWzLZUhZRWjIlrM7HEy+mreLg8SvS+/rXbD5GY7SoIPK1
-						wkg/sCG2ySIT2ar5mhIGBlMa5VCOqTSp0jf5bgnYHiBRK31gHA0U61ELt2CwymGb
-						AIcitktbUS8oKIi3s3VRVHS3gNmWDJheXPW3n1pOs59qvtKbgLaMKVik5TGCCDUL
-						bQGCEE/TE6oiedAX5+v00cmtKcjecUniOHdq1YbFBKFbFreehIOQVpM0ElONGtVN
-						N7ls4b7fnGvaF5RY9Q==
-					</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>
-						MIIDCTCCAfGgAwIBAgIJAOegVyCLESWpMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmVzZHNkZXYwMS5kcy5tYW4uYWMudWswHhcNMTEwNDE2MTQzNDUwWhcNMjEw
-						NDEzMTQzNDUwWjAhMR8wHQYDVQQDExZlc2RzZGV2MDEuZHMubWFuLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArSSkzgeZ0lVbjh4jmzl6EwL+
-						UmBfmiXE25AQdHm69bZ18Xi5Mq6ekkw/WuNIztu4p14Nj3bOCXvmrILQE3sV0TNr
-						ge7XAAvfhwhwW8P/0KSF3PPO2mN1yZToSWJKb04idjSLttNTrOchEAapCfwYu4JE
-						r8uXNcccYNpuePE6wncoxWknWPJW4L+sarfQbAKmcksEiIwwlz/8gY0D4OhR+mhM
-						q/OsLzY4Os4+1QwGbO99uQbbH3ni8wnXZZWPRp/VbdAYjavb2CihJE0gxbCwl2Sb
-						wXCy6cYXSz5APMoNbdmnHHMaBH8Wfr9Iqj0H/8Mf22qnGT9QZQHotKY9Jxs99wID
-						AQABo0QwQjAhBgNVHREEGjAYghZlc2RzZGV2MDEuZHMubWFuLmFjLnVrMB0GA1Ud
-						DgQWBBTBQrWo24UVCTROZnBZNmP+c+/ksjANBgkqhkiG9w0BAQUFAAOCAQEABr5E
-						AteCYpWEIOSa2pd6O/J8RYs0eTev/erX86SOr9CzWVSbQWOOrGWIGGfzl6pr/InJ
-						HMODUl83ef2aqCLSPQNvWzLZUhZRWjIlrM7HEy+mreLg8SvS+/rXbD5GY7SoIPK1
-						wkg/sCG2ySIT2ar5mhIGBlMa5VCOqTSp0jf5bgnYHiBRK31gHA0U61ELt2CwymGb
-						AIcitktbUS8oKIi3s3VRVHS3gNmWDJheXPW3n1pOs59qvtKbgLaMKVik5TGCCDUL
-						bQGCEE/TE6oiedAX5+v00cmtKcjecUniOHdq1YbFBKFbFreehIOQVpM0ElONGtVN
-						N7ls4b7fnGvaF5RY9Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://esdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MIMAS ESDS Development Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.esds.ac.uk/international/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ESDS International Helpdesk</GivenName>
-    <EmailAddress>mailto:international@esds.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/esdswp01.ds.man.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/esdswp01.ds.man.ac.uk-shibboleth.xml
deleted file mode 100644
index 50445914..00000000
--- a/swamid-interfederations-2.0/esdswp01.ds.man.ac.uk-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://esdswp01.ds.man.ac.uk/shibboleth">
-  <!--
-		This is an "ESDS International Web Server One" Shibboleth SP for the University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://esdswp01.ds.man.ac.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://esdswp01.ds.man.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAKCst/LT2atiMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWVzZHN3cDAxLmRzLm1hbi5hYy51azAeFw0xMTA4MjUxNDU3MzBaFw0yMTA4
-						MjIxNDU3MzBaMCAxHjAcBgNVBAMTFWVzZHN3cDAxLmRzLm1hbi5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2VrVToTVgEsS1K8MyHK+nvCOeV
-						T5gtFk9LTY6C5vAVD/lIWp76KmwpvOCnc1ZwEOzpzTJKvsLmN6OpI0oB56DgAU30
-						eb7VE72IlrZzq41Jwt6pt5Eda08npE0YY4mzeSmjuZwzV/TsjtFbDjB4k22LDZrE
-						1UHMNy9OP4FvBYm1eCKkYMpW7XGr2HZWMzVmavdCe8wtQzoIZCjvH+7gF/hokArN
-						8RRKvw2HxBsQBMWPmoEaoosT//9RS+W/daVjqyU/47WFxOAJBMf3s7WqcNumPcbI
-						IV4ApR+eaR5+xMsHx3sXxBGZrPkRm461XCSnrq/Rzb5Vc9ecJL+4h6m+eIECAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVZXNkc3dwMDEuZHMubWFuLmFjLnVrMB0GA1UdDgQW
-						BBQFfo7/j+0kUsgcDL9JM2MZB8uFgDANBgkqhkiG9w0BAQUFAAOCAQEAELePcQjX
-						STeh/K/A6eK5AzOXb76gtbtzdXAAOyPkQMI7nl1SmntgVtFb3SqbGmPyf24fwyjE
-						ghRwKp+cqkDTMRt4mAnky4gSVqFb978gN2+0qeLd1wOW+sSxCHy7QGnNv/+NMPTr
-						qmSwMnuP3icuaClHB4wndhDLjuGHJI8hzVB/gvNMRY607Jj01vof3um3J6hZVELa
-						QqvJf1p4AzkEqc/UVs5mNkeieg9eSkxCYMG7gWhu8P7peMnuEmRjenws3gh4gzWP
-						ZYoFe5iqgYhhtBTcwBEgRI825ISfRwE78qCfBOv8OS7rzGzjDO/lI8QuF12VNU5w
-						1K0XFxLVLmEFpw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://esdswp01.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MIMAS: ESDS International Web Server One</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://esds.mcc.ac.uk//</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ESDS International Helpdesk</GivenName>
-    <EmailAddress>mailto:international@esds.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/esgsmagenttest.win.ad.jhu.edu-shibboleth.xml b/swamid-interfederations-2.0/esgsmagenttest.win.ad.jhu.edu-shibboleth.xml
deleted file mode 100644
index b31686bf..00000000
--- a/swamid-interfederations-2.0/esgsmagenttest.win.ad.jhu.edu-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://esgsmagenttest.win.ad.jhu.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Hopkins Incommon eduGain Service Provider Test</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHjCCAgagAwIBAgIJAK4VpScoBu/LMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHWVzZ3NtYWdlbnR0ZXN0Lndpbi5hZC5qaHUuZWR1MB4XDTE1MTAyNjE4MTU0
-MloXDTI1MTAyMzE4MTU0MlowKDEmMCQGA1UEAxMdZXNnc21hZ2VudHRlc3Qud2lu
-LmFkLmpodS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1JYof
-U+kzZe0Jc3nSFJGnnrbdbtr+NEFlTJ/HypUqcaFK/bxwTa9WxAMe9SAnWk017l9z
-h/eH6chOmUDmj4l/hGaU0RyORZk83+Y4SL5s8SQCzqRtbaUhoBJvMQCQGFds6mLv
-6ahEArGK0fqkJwctkGSGJfns8brGBNkm+qLghJz6XrLsISq7M+ayPQXunuAKMhvH
-9tiaABoqTL3mjleMlEDntQAewns9UCtsWtWxI61xc3+bJh2WfDqPnG3b2cPa1cP1
-3e+xnc57AyvKLtS3nsyzb82YeBUm0Bl49kcSQROPnr2WrZmD0iNrB12IH5VaO75e
-O9/rkJPtPMRTaD9tAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWVzZ3NtYWdlbnR0ZXN0
-Lndpbi5hZC5qaHUuZWR1MB0GA1UdDgQWBBTEpdnERxL+/V5PQjrcgLFsR+BSPDAN
-BgkqhkiG9w0BAQUFAAOCAQEAgcHRty9ObW0wQlS/I7Jz73vBhYK1UR50SO3Syux6
-9MlFAbnfRxQCbPSSWb4+wXOVDBM8/qgDnA24Szr2JmtsbLW6f4+NruTmnrF9T/3X
-mrEZQZkVB1X50m3PgzNeGnNSEeEDrT3EY9kFgKX14QcOJaV7jL9bT0V7rIs0q6bv
-3JSgttl/d87FM2peZ2UBRCLse4ksluxKZucdkXkidzVULH5ouzxx5LvgVDRewq+R
-+zMetBZR/rHiUKpZSVIi4QdW5kgxxROK7s86M15xvJOMeJ6embxuMvqQpeQN8xoy
-Z7c0F8Plvvl7DbnXU572JB00ee7xzPRtPz2NZbcMDz+tGA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esgsmagenttest.win.ad.jhu.edu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esgsmagenttest.win.ad.jhu.edu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esgsmagenttest.win.ad.jhu.edu/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://esgsmagenttest.win.ad.jhu.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="http://esgsmagenttest.win.ad.jhu.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://esgsmagenttest.win.ad.jhu.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://esgsmagenttest.win.ad.jhu.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://esgsmagenttest.win.ad.jhu.edu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://esgsmagenttwin.ad.jhu.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Hopkins Incommon eduGain Service Provider Test</md:ServiceName>
-      <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="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="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="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">Johns Hopkins University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Johns Hopkins</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.jhu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ple4</md:GivenName>
-    <md:EmailAddress>ple@jhmi.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/esodev.insrv.cf.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/esodev.insrv.cf.ac.uk-shibboleth.xml
deleted file mode 100644
index 06033794..00000000
--- a/swamid-interfederations-2.0/esodev.insrv.cf.ac.uk-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://esodev.insrv.cf.ac.uk/shibboleth">
-  <!--
-		This is a 'European Sources Online DEvelopment Server' Shibboleth SP for Cardiff University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-23T13:43:00Z"/>
-  </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://esodev.insrv.cf.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAOTb7E3AJLSnMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWVzb2Rldi5pbnNydi5jZi5hYy51azAeFw0xMjAzMDcxMDU5MzJaFw0yMjAz
-						MDUxMDU5MzJaMCAxHjAcBgNVBAMTFWVzb2Rldi5pbnNydi5jZi5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO6F55cSihSA/x76lMyqjJrD5Jg5
-						MsTC+z8XzlBFDozBygx855+CwIVJbZPIUG1OeU4NKolb3ajhunSLRvXMieV8ggKZ
-						kKmUrlze9Es5+4VjgIP7TN6DqPBoyvgAn/wdhwXYRebARb9gmQaXQngDMErJ9RzE
-						y0Q8jvsxH4V/Dg7XhvoqZmiC1fTX4/Pu0a35gSG91hQGlq7YEevXR6fM0mndANiM
-						W1m/bVQLFYdnqpWluda+4NQL1vQLY9s4/vNjZWuyOGG2wapxoYYZ1FVBicM85AWG
-						eHsSM3GflEKXKP+wMAyXLWeY42a9XhVKhLUO83UorFR77gL/lp38zlBE+8ECAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVZXNvZGV2Lmluc3J2LmNmLmFjLnVrMB0GA1UdDgQW
-						BBStsckECWrhJTx3JjU4j6MfCiUceTANBgkqhkiG9w0BAQUFAAOCAQEAf6oKwWJH
-						its+N8IRS3V3853Q9JSfsACBaWo+InbckPmW2+D1PYhngdHRga/GGxJvF2drepBi
-						p5L3rTqhS6+1dDQeXB5239MGQQyZZIuaUWqzgwkHhlbtwDZlcUDlsGyW7s3Wkbvf
-						GC5FNlx3+gj5WpFo6l/iMpWwBK/kxEN+SRW8TJjAOqg8dLxcMUBnZw1Kydgc4tWm
-						GeIoKDPY2grHcp4hT9Me12tj2DYcDjyw5rGiv0BL6YghzapXGFTcFI6BZoMnRji3
-						ldYUb4/0ivef8X0aOal+/U5alUlfmBCL8pMXh1ckpzJa55KMb+CkkMhGoQY95VuL
-						Pukhmwd1O96IqQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://esodev.insrv.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff University: European Sources Online Development Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.europeansources.info/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ESO Webmaster</GivenName>
-    <EmailAddress>mailto:esowebmaster@cardiff.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Philip </GivenName>
-    <SurName>Smart</SurName>
-    <EmailAddress>mailto:smartp@cardiff.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/espresso.ltscotland.org.uk-shibboleth.xml b/swamid-interfederations-2.0/espresso.ltscotland.org.uk-shibboleth.xml
deleted file mode 100644
index 5ed619f6..00000000
--- a/swamid-interfederations-2.0/espresso.ltscotland.org.uk-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://espresso.ltscotland.org.uk/shibboleth">
-  <!--
-		This is an "LTS Espresso" Shibboleth 2 SP for Education Scotland.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDRDCCAiygAwIBAgIJAIeqTze25mL+MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGmVzcHJlc3NvLmx0c2NvdGxhbmQub3JnLnVrMB4XDTEwMDcyMDE2MTk1M1oX
-						DTIwMDcxNzE2MTk1M1owJTEjMCEGA1UEAxMaZXNwcmVzc28ubHRzY290bGFuZC5v
-						cmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuCr8tj+kHF4ZP
-						1x+WJSl4h9zsrALKUwz90Nx8ZGBBfcO8LL1T5/8r3xO3uJgJNDVaLCQ10j7VgwQf
-						i19HjPBElKtCPcGDyvJsTR6sCijXWjDZUfXlKgL5wTrGdGCqGrfhD0ZLW8y20LDx
-						s2XW7r60/sgrF75YnqpBSPy3kFc7lrZTDfseFyafA7KshjHfll7NVsKCLfXPKLuY
-						R+MCwl2BYi94Bq9xGPSsTQdvIxphcq5yZYWXFLnqa9Knus/7+2bWVxaNao9xRahp
-						N/+NhXv1ECz1xvTxVc7f1746aIqSEDW02QEHy3s7pmDfPUDsdIcDOO7vd4t2g9Rp
-						ngyRSm+JAgMBAAGjdzB1MFQGA1UdEQRNMEuCGmVzcHJlc3NvLmx0c2NvdGxhbmQu
-						b3JnLnVrhi1odHRwczovL2VzcHJlc3NvLmx0c2NvdGxhbmQub3JnLnVrL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFJki6pKJFO2mJGvIV+QAKyDPpmzbMA0GCSqGSIb3DQEB
-						BQUAA4IBAQAdecqQ0xQkgDOtpHwjWDldS9PbQFVTcWX7tTwhRb+TtzcUQOa+mFAA
-						TPkSFIWO8jp1L6llQxyKWdqDFJm3bTmpDj9WcRkG/5wjl0gTmeZer0bMCwIaC7EZ
-						hbAQy2Ugv/ie1DFU8Utm0jVIKLOMNa+KbuqNkAfuOwl2PdEbyn0sJAiiIgKlbHqa
-						yr7UZjtwW2H3Mwlp8GZILKFmvQLxKMtcnp3iPSrqZNtsRvPtQ8Qg3NL2CmczwdBm
-						nbxqu2CEkRcRfZf1pHACgSR44DkxX52pa9MfHd00Z/PnmctS1+m4FDR/FglcgWhq
-						kjnnl+e0Q+6WhaKDvcT5wPGT4x0SH1CK
-					</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>
-						MIIDRDCCAiygAwIBAgIJAIeqTze25mL+MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGmVzcHJlc3NvLmx0c2NvdGxhbmQub3JnLnVrMB4XDTEwMDcyMDE2MTk1M1oX
-						DTIwMDcxNzE2MTk1M1owJTEjMCEGA1UEAxMaZXNwcmVzc28ubHRzY290bGFuZC5v
-						cmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuCr8tj+kHF4ZP
-						1x+WJSl4h9zsrALKUwz90Nx8ZGBBfcO8LL1T5/8r3xO3uJgJNDVaLCQ10j7VgwQf
-						i19HjPBElKtCPcGDyvJsTR6sCijXWjDZUfXlKgL5wTrGdGCqGrfhD0ZLW8y20LDx
-						s2XW7r60/sgrF75YnqpBSPy3kFc7lrZTDfseFyafA7KshjHfll7NVsKCLfXPKLuY
-						R+MCwl2BYi94Bq9xGPSsTQdvIxphcq5yZYWXFLnqa9Knus/7+2bWVxaNao9xRahp
-						N/+NhXv1ECz1xvTxVc7f1746aIqSEDW02QEHy3s7pmDfPUDsdIcDOO7vd4t2g9Rp
-						ngyRSm+JAgMBAAGjdzB1MFQGA1UdEQRNMEuCGmVzcHJlc3NvLmx0c2NvdGxhbmQu
-						b3JnLnVrhi1odHRwczovL2VzcHJlc3NvLmx0c2NvdGxhbmQub3JnLnVrL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFJki6pKJFO2mJGvIV+QAKyDPpmzbMA0GCSqGSIb3DQEB
-						BQUAA4IBAQAdecqQ0xQkgDOtpHwjWDldS9PbQFVTcWX7tTwhRb+TtzcUQOa+mFAA
-						TPkSFIWO8jp1L6llQxyKWdqDFJm3bTmpDj9WcRkG/5wjl0gTmeZer0bMCwIaC7EZ
-						hbAQy2Ugv/ie1DFU8Utm0jVIKLOMNa+KbuqNkAfuOwl2PdEbyn0sJAiiIgKlbHqa
-						yr7UZjtwW2H3Mwlp8GZILKFmvQLxKMtcnp3iPSrqZNtsRvPtQ8Qg3NL2CmczwdBm
-						nbxqu2CEkRcRfZf1pHACgSR44DkxX52pa9MfHd00Z/PnmctS1+m4FDR/FglcgWhq
-						kjnnl+e0Q+6WhaKDvcT5wPGT4x0SH1CK
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://espresso.ltscotland.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Education Scotland</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Education Scotland: LTS Espresso</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ltscotland.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Graham</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Graham</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ethics-gradient.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ethics-gradient.oucs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8a4019a1..00000000
--- a/swamid-interfederations-2.0/ethics-gradient.oucs.ox.ac.uk-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://ethics-gradient.oucs.ox.ac.uk/shibboleth">
-  <!--
-		This is a Vidaas Project Shibboleth 2 test SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://ethics-gradient.oucs.ox.ac.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://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIERjCCAy6gAwIBAgIJALgZeahxwEy4MA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
-						VQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEL
-						MAkGA1UEChMCT1UxDTALBgNVBAsTBE9VQ1MxJjAkBgNVBAMTHWV0aGljcy1ncmFk
-						aWVudC5vdWNzLm94LmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpkYXZpZC5wYWluZUBv
-						dWNzLm94LmFjLnVrIDAeFw0xMTEwMjUxMDAyMzdaFw0yMTEwMjIxMDAyMzdaMIGj
-						MQswCQYDVQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94
-						Zm9yZDELMAkGA1UEChMCT1UxDTALBgNVBAsTBE9VQ1MxJjAkBgNVBAMTHWV0aGlj
-						cy1ncmFkaWVudC5vdWNzLm94LmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpkYXZpZC5w
-						YWluZUBvdWNzLm94LmFjLnVrIDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBANpgnm1ZdH5VrhKZt66jAFXdsWxVUVhJJUT9HmViJJkAeGIwKML3tld0/j1v
-						KRXs+QjQys61FzpfETql2eFT7CZb3iUVUMTbV1VBwu0Lf25H8dEtgRY0Tt+ZV0gI
-						fzNnMFpfb7EtNZZHdbU6rxKmY7xeZCvOBRWdy5kF78J7gvGnYaHV2ArgmaMRCIm9
-						QA3bqRlLeRxT8owEhQgPaxHE3jZVQX9o6hTJqM3/L/uRCpdf3EJepL4ZC9AMDStK
-						bfdSOcHq8WrbTx4juTedJc2QjI0CLeRzD18pzMZj8Y3mc/bUeMoh1mXnPLe6e2Kc
-						zW4NN5vGCYjihHZga9v+51oOgSUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FCGPm3EqAWvjN9zModxeKu784rsTMB8GA1UdIwQYMBaAFCGPm3EqAWvjN9zModxe
-						Ku784rsTMA0GCSqGSIb3DQEBBQUAA4IBAQAnR9s594S+zzVQzrOtYwxpr2Z103xZ
-						7rCQUmolApSAvd4dZ0srrUl5f7DQqACGKbvaYMuLwUObqxXGnJeK5/II4ZoByE0c
-						D/Po9V/MCTpL/Nas2z5Suc4vFsCbKmbngOS2FmXHFQMCraKhIJCp4eCfqWY3Tj3i
-						1sttvjMWb/KMokwV6cH6gkSqDRgbLuvKsy4B/0LeAM0FkswOtQDbxuKlIsgkdsjp
-						S3EDoLO9KauhnpwuvCqRYuV/NQi2FMCKl/5tiOmKW8l/BaQy2FY/VImjGYZFOpvm
-						QLNfViPTeObrR0sZF2spXInDR2IWwMyZ+MCl4p07RuKQWQwqKp4mCfzG
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ethics-gradient.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Test SP for Vidaas Project</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://vidaas.oucs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dave</GivenName>
-    <SurName>Paine</SurName>
-    <EmailAddress>mailto:david.paine@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dave</GivenName>
-    <SurName>Paine</SurName>
-    <EmailAddress>mailto:david.paine@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eu.alma.exlibrisgroup.com-mng-login.xml b/swamid-interfederations-2.0/eu.alma.exlibrisgroup.com-mng-login.xml
deleted file mode 100644
index 6178385f..00000000
--- a/swamid-interfederations-2.0/eu.alma.exlibrisgroup.com-mng-login.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://eu.alma.exlibrisgroup.com/mng/login">
-  <!--
-		This is an "Ex Libris Alma - The Next-Generation Library Services Framework" Own Implentation SP for Ex Libris (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-01T14:41:16Z">
-      <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://eu.alma.exlibrisgroup.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://eu.alma.exlibrisgroup.com/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://eu.alma.exlibrisgroup.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://eu.alma.exlibrisgroup.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEUDCCArigAwIBAgIEUWQ+bzANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJJ
-						TDESMBAGA1UECBMJSmVydXNhbGVtMRIwEAYDVQQHEwlKZXJ1c2FsZW0xETAPBgNV
-						BAoTCEV4bGlicmlzMQ0wCwYDVQQLEwRBbG1hMREwDwYDVQQDEwhTQU1MIEpLUzAe
-						Fw0xMzA0MDkxNjE0MzlaFw0yMzA0MDcxNjE0MzlaMGoxCzAJBgNVBAYTAklMMRIw
-						EAYDVQQIEwlKZXJ1c2FsZW0xEjAQBgNVBAcTCUplcnVzYWxlbTERMA8GA1UEChMI
-						RXhsaWJyaXMxDTALBgNVBAsTBEFsbWExETAPBgNVBAMTCFNBTUwgSktTMIIBojAN
-						BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAkZEP11/7z1BnlfvByEfwmvkEeWdS
-						4h0500whQeaSyLAeIQLnBvv0AL+yrnHUCQhdXtuKcB2KP1hHkORujT/AoyX5KaV6
-						iO+afUWdMfePg6nHRXhg/Efpkg4pzq1suDRNlY36nloFU39LHMTDOm6fc6cli5/h
-						v0mSgEI3rwTQRYKxe3gt7Yx2HCnyehxdEMYxxLgTUst+fnDvlJ8XSeLcIgwMe8S6
-						5tDQJDxCSumDG9gLv4mHIeIWKbAaX3boeDKXM0cj7k1MA0ppDjXZiYeTeM11c3A9
-						YNHnosQPN03vKl2Z38Qtg5wBJfGKxbI9mmO517iLpZWw0ppnW0VuxOuzUoIRRgM8
-						H9Ic4MdrHrOBpdkjTdiC5P6Dy9CvPsKAf53L2olwlWtv0fAljQ1Zd7tABvUjzOHD
-						I+oGLmP5JKt42Pr1xQtA3HEm6Gdi7CMclBAFqOb//xt9fmCh6o8Elxr4p70qU48S
-						hZAXj5G1oykPWWL0Z9/Jf106wQ4fK5ePxhapAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggGBAIfkCOJbJuchcJJOQVa1Ryw6T5MDdOS81uZW8MyFRlBI9bB0CfcM0BcddzFs
-						WAGslqQra8XWpTQXUrkyY+Uqt5pM1fIupPciVoeCJcK899u+5RM5D6gP5HpC/yc3
-						IKyHg91SiGq3nUynaMsRUgGPHZ5rjsXoFg+wYbfT6fDcO+ca4y8OI/mrGczTRjWb
-						WWDkVX4RzUZgk8DqwTMytfOdUzhml7qKfdoJyP7+ScfhEkwri1ZinIJ+Drn7lQdw
-						xCofIkXeJ/2llGWekavHYf+wCINX2m7zrsl7u0pBdbvOrqB54xJ9Jd03tKlyFs7k
-						87lAj02qwCOxkOQ1PmbzjBji8NOq05yfUEHzKG/l3mPfj25HTLqLQ8M8Qs87S/H/
-						2lA7QhxVaWc0V7kPWo1yIE0KYVnXbHy4Hw2on+dcwH7wPLItCneryp8rM1WRSE+X
-						s7Q3F7NVAvvfPrcXUfxw67jc3NQEGPGESn2ZCdcD8SQNPBymdG0572nebb4AhmBR
-						2PN4Eg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eu.alma.exlibrisgroup.com/mng/pdsHandleLogin"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eu.alma.exlibrisgroup.com/mng/pdsHandleLogin" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://eu.alma.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ex Libris Alma - The Next-Generation Library Services Framework</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/eu01.alma.exlibrisgroup.com-mng-login.xml b/swamid-interfederations-2.0/eu01.alma.exlibrisgroup.com-mng-login.xml
deleted file mode 100644
index 522189a3..00000000
--- a/swamid-interfederations-2.0/eu01.alma.exlibrisgroup.com-mng-login.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://eu01.alma.exlibrisgroup.com/mng/login">
-  <!--
-		This is an "Ex Libris Alma EU01 - The Next-Generation Library Services Framework" Own Implementation SP for Ex Libris (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-18T14:42:51Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEUDCCArigAwIBAgIEUWQ+bzANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJJ
-						TDESMBAGA1UECBMJSmVydXNhbGVtMRIwEAYDVQQHEwlKZXJ1c2FsZW0xETAPBgNV
-						BAoTCEV4bGlicmlzMQ0wCwYDVQQLEwRBbG1hMREwDwYDVQQDEwhTQU1MIEpLUzAe
-						Fw0xMzA0MDkxNjE0MzlaFw0yMzA0MDcxNjE0MzlaMGoxCzAJBgNVBAYTAklMMRIw
-						EAYDVQQIEwlKZXJ1c2FsZW0xEjAQBgNVBAcTCUplcnVzYWxlbTERMA8GA1UEChMI
-						RXhsaWJyaXMxDTALBgNVBAsTBEFsbWExETAPBgNVBAMTCFNBTUwgSktTMIIBojAN
-						BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAkZEP11/7z1BnlfvByEfwmvkEeWdS
-						4h0500whQeaSyLAeIQLnBvv0AL+yrnHUCQhdXtuKcB2KP1hHkORujT/AoyX5KaV6
-						iO+afUWdMfePg6nHRXhg/Efpkg4pzq1suDRNlY36nloFU39LHMTDOm6fc6cli5/h
-						v0mSgEI3rwTQRYKxe3gt7Yx2HCnyehxdEMYxxLgTUst+fnDvlJ8XSeLcIgwMe8S6
-						5tDQJDxCSumDG9gLv4mHIeIWKbAaX3boeDKXM0cj7k1MA0ppDjXZiYeTeM11c3A9
-						YNHnosQPN03vKl2Z38Qtg5wBJfGKxbI9mmO517iLpZWw0ppnW0VuxOuzUoIRRgM8
-						H9Ic4MdrHrOBpdkjTdiC5P6Dy9CvPsKAf53L2olwlWtv0fAljQ1Zd7tABvUjzOHD
-						I+oGLmP5JKt42Pr1xQtA3HEm6Gdi7CMclBAFqOb//xt9fmCh6o8Elxr4p70qU48S
-						hZAXj5G1oykPWWL0Z9/Jf106wQ4fK5ePxhapAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggGBAIfkCOJbJuchcJJOQVa1Ryw6T5MDdOS81uZW8MyFRlBI9bB0CfcM0BcddzFs
-						WAGslqQra8XWpTQXUrkyY+Uqt5pM1fIupPciVoeCJcK899u+5RM5D6gP5HpC/yc3
-						IKyHg91SiGq3nUynaMsRUgGPHZ5rjsXoFg+wYbfT6fDcO+ca4y8OI/mrGczTRjWb
-						WWDkVX4RzUZgk8DqwTMytfOdUzhml7qKfdoJyP7+ScfhEkwri1ZinIJ+Drn7lQdw
-						xCofIkXeJ/2llGWekavHYf+wCINX2m7zrsl7u0pBdbvOrqB54xJ9Jd03tKlyFs7k
-						87lAj02qwCOxkOQ1PmbzjBji8NOq05yfUEHzKG/l3mPfj25HTLqLQ8M8Qs87S/H/
-						2lA7QhxVaWc0V7kPWo1yIE0KYVnXbHy4Hw2on+dcwH7wPLItCneryp8rM1WRSE+X
-						s7Q3F7NVAvvfPrcXUfxw67jc3NQEGPGESn2ZCdcD8SQNPBymdG0572nebb4AhmBR
-						2PN4Eg==
-					</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://eu01.alma.exlibrisgroup.com/mng/pdsHandleLogin" index="0" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ex Libris Alma EU01 - The Next-Generation Library Services Framework</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml b/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
index ec0f08c1..0cf1c61d 100644
--- a/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
+++ b/swamid-interfederations-2.0/europe-stage.wiseflow.net.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://europe-stage.wiseflow.net">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://europe-stage.wiseflow.net">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-07-15T15:12:01Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-07-15T15:12:01Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</mdui:Description>
         <mdui:Description xml:lang="en">The purpose is to facilitate digital management of written exams.</mdui:Description>
         <mdui:DisplayName xml:lang="da">WISEflow europe-stage</mdui:DisplayName>
@@ -15,7 +20,7 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIE+DCCA+CgAwIBAgISESHw40eVZ2+g94YP6RlXCEbaMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzIwHhcNMTUwMzEwMTgxNzMyWhcNMTgwMzEwMTgxNzMyWjA8MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFzAVBgNVBAMMDioud2lzZWZsb3cubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzMjfRmXG9H6hqK6WUP02BfBmcbBGvseeV8oEmiwmyDl8ZrCah2Jgxap4tJYj2jQUEvWkYFCIUKkFcsu/lIXD0waEYZU6+pXwEgJVwdMW6un+hLuDiCALoN8E3iXAGGH2z+xlrOASuABFRo7eQ13VNRHA6o2O4B1fLaNLQvCdIfx96ae94mZ52G33am1awGSleXNmnpURoyQZThD2KfSeXhAsiFyLyRhM9d+Z+VzFKtltFKyHC7oBHiTpWCgzgo9ica9HgDAFHhPd5pFS5iSLwRy32XlWBA3mjXuZMy/ampOBkolrBaRCEWIRynhGW4v+CNAN13/nhGq6Eo32kIK0hQIDAQABo4IBzjCCAcowDgYDVR0PAQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQIBMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCcGA1UdEQQgMB6CDioud2lzZWZsb3cubmV0ggx3aXNlZmxvdy5uZXQwCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFpbnZhbHNoYTJnMi5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEcGCCsGAQUFBzAChjtodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbHNoYTJnMnIxLmNydDA5BggrBgEFBQcwAYYtaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzZG9tYWludmFsc2hhMmcyMB0GA1UdDgQWBBQg7R8eDlQVzIfAkbXNo4Uq7ESiYTAfBgNVHSMEGDAWgBTqTnzUgC3lFYGGJoyCbcCYpM+XDzANBgkqhkiG9w0BAQsFAAOCAQEAOi0l9VrsGoEam5K3TdLjmTNkog3fFYDDjw+tla/2gQ/NoGuTt09Sq1scwmq6I5gygKOQccHSfTgECR/7/XNj4Exy73PZo9kGFYCZBdmhsAZsO9IjeStKe2VIrC8iMhHFBtKxBXRbMVyYFNA6wwR0yuehaNHVhTbJhBjoatmDcwiXy+C2FjKNRkpfWZSkn7hKXYQxf6j/www/rjq3F6oYbOS2iWXbCxmNGv8RSqHrI5QiKgmHlnmJJnZvN6PhINVD9DLndixqfIQAydHxAlb+WpDu5mMzXqqeGqxEbgs99aNxCrAXa5JO07mk075C4hIZn6RW6jWZ7QCealwmMlH+xw==</ds:X509Certificate>
         </ds:X509Data>
@@ -23,23 +28,23 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml2-logout.php/europe-stage_wayf"/>
     <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" index="0" Location="https://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe-stage_wayf"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://europe-stage.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe-stage_wayf" index="0"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">WISEflow europe-stage</md:ServiceName>
       <md:ServiceName xml:lang="en">WISEflow europe-stage</md:ServiceName>
       <md:ServiceDescription xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">The purpose is to facilitate digital management of written exams.</md:ServiceDescription>
-      <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="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="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="true"/>
-      <md:RequestedAttribute FriendlyName="gn" 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="norEduPersonLIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="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" FriendlyName="eduPersonPrincipalName" 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" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" 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" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonLIN" isRequired="true"/>
+      <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" 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" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <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" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
@@ -48,8 +53,7 @@
     <md:OrganizationURL xml:lang="en">http://uniwise.dk</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:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/europe.wiseflow.net.xml b/swamid-interfederations-2.0/europe.wiseflow.net.xml
index f52e0002..97bd90d9 100644
--- a/swamid-interfederations-2.0/europe.wiseflow.net.xml
+++ b/swamid-interfederations-2.0/europe.wiseflow.net.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://europe.wiseflow.net">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://europe.wiseflow.net">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-05-29T12:55:43Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2015-05-29T12:55:43Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</mdui:Description>
         <mdui:Description xml:lang="en">The purpose is to facilitate digital management of written exams.</mdui:Description>
         <mdui:DisplayName xml:lang="da">WISEflow</mdui:DisplayName>
@@ -15,7 +20,7 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIE+DCCA+CgAwIBAgISESHw40eVZ2+g94YP6RlXCEbaMA0GCSqGSIb3DQEBCwUAMGAxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTYwNAYDVQQDEy1HbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gU0hBMjU2IC0gRzIwHhcNMTUwMzEwMTgxNzMyWhcNMTgwMzEwMTgxNzMyWjA8MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFzAVBgNVBAMMDioud2lzZWZsb3cubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzMjfRmXG9H6hqK6WUP02BfBmcbBGvseeV8oEmiwmyDl8ZrCah2Jgxap4tJYj2jQUEvWkYFCIUKkFcsu/lIXD0waEYZU6+pXwEgJVwdMW6un+hLuDiCALoN8E3iXAGGH2z+xlrOASuABFRo7eQ13VNRHA6o2O4B1fLaNLQvCdIfx96ae94mZ52G33am1awGSleXNmnpURoyQZThD2KfSeXhAsiFyLyRhM9d+Z+VzFKtltFKyHC7oBHiTpWCgzgo9ica9HgDAFHhPd5pFS5iSLwRy32XlWBA3mjXuZMy/ampOBkolrBaRCEWIRynhGW4v+CNAN13/nhGq6Eo32kIK0hQIDAQABo4IBzjCCAcowDgYDVR0PAQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQIBMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMCcGA1UdEQQgMB6CDioud2lzZWZsb3cubmV0ggx3aXNlZmxvdy5uZXQwCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9ncy9nc2RvbWFpbnZhbHNoYTJnMi5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEcGCCsGAQUFBzAChjtodHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24uY29tL2NhY2VydC9nc2RvbWFpbnZhbHNoYTJnMnIxLmNydDA5BggrBgEFBQcwAYYtaHR0cDovL29jc3AyLmdsb2JhbHNpZ24uY29tL2dzZG9tYWludmFsc2hhMmcyMB0GA1UdDgQWBBQg7R8eDlQVzIfAkbXNo4Uq7ESiYTAfBgNVHSMEGDAWgBTqTnzUgC3lFYGGJoyCbcCYpM+XDzANBgkqhkiG9w0BAQsFAAOCAQEAOi0l9VrsGoEam5K3TdLjmTNkog3fFYDDjw+tla/2gQ/NoGuTt09Sq1scwmq6I5gygKOQccHSfTgECR/7/XNj4Exy73PZo9kGFYCZBdmhsAZsO9IjeStKe2VIrC8iMhHFBtKxBXRbMVyYFNA6wwR0yuehaNHVhTbJhBjoatmDcwiXy+C2FjKNRkpfWZSkn7hKXYQxf6j/www/rjq3F6oYbOS2iWXbCxmNGv8RSqHrI5QiKgmHlnmJJnZvN6PhINVD9DLndixqfIQAydHxAlb+WpDu5mMzXqqeGqxEbgs99aNxCrAXa5JO07mk075C4hIZn6RW6jWZ7QCealwmMlH+xw==</ds:X509Certificate>
         </ds:X509Data>
@@ -23,23 +28,23 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml2-logout.php/europe_wayf"/>
     <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" index="0" Location="https://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe_wayf"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://europe.wiseflow.net/simplesaml/module.php/saml/sp/saml2-acs.php/europe_wayf" index="0"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">WISEflow</md:ServiceName>
       <md:ServiceName xml:lang="en">WISEflow</md:ServiceName>
       <md:ServiceDescription xml:lang="da">Formålet er at facilitere digital håndtering af skriftlige eksaminer.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">The purpose is to facilitate digital management of written exams.</md:ServiceDescription>
-      <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="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="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="true"/>
-      <md:RequestedAttribute FriendlyName="gn" 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="norEduPersonLIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation" isRequired="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" FriendlyName="eduPersonPrincipalName" 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" FriendlyName="eduPersonScopedAffiliation" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" 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" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.2428.90.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonLIN" isRequired="true"/>
+      <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" 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" FriendlyName="schacHomeOrganization" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="true"/>
+      <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" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
@@ -48,8 +53,7 @@
     <md:OrganizationURL xml:lang="en">http://uniwise.dk</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:GivenName>Administrator</md:GivenName>
+    <md:EmailAddress>tim@uniwise.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/events.ucl.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/events.ucl.ac.uk-shibboleth.xml
deleted file mode 100644
index 99fe6777..00000000
--- a/swamid-interfederations-2.0/events.ucl.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://events.ucl.ac.uk/shibboleth">
-  <!--
-		This is an "Events Calendar" Shibboleth SP for University College London.
-	-->
-  <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-12T18:45: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://events.ucl.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHDCCAgSgAwIBAgIJAMhx5buX5u6lMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGV2ZW50cy51Y2wuYWMudWswHhcNMTMwODE1MjAwMjMzWhcNMjgwODExMjAw
-						MjMzWjAbMRkwFwYDVQQDExBldmVudHMudWNsLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAvMZJYxOssGkpBVd67l0fLZwUUZYrI96V+LYxRETF
-						COiwY4F9qZakjGLeSu6grE0/IfXqVQmRJrBnD7ZylFgZNwUymZutBAKf+MUvZ4tg
-						tbjmCRNjp1YXMMNuacZKafM8pXOGf6JVnao02m8KojOqHXWH8/iZ6Q8ZICp7HyUf
-						6FSfbSjIcfEWJETqMOjll7//X/xevT6tLqOYM6mGvkL8+v59yiylL6dmubuc0eku
-						oI+qx4oEcOZQG7Kh8Ma338Ir+K4r3GRyBmeDAf6bf73DgCsm9LYzbZJAfBj2k17e
-						vEHZklAMEC61C0kZ+uw97JsnbuKwg5Lr1x2O23uRe+Uu+wIDAQABo2MwYTBABgNV
-						HREEOTA3ghBldmVudHMudWNsLmFjLnVrhiNodHRwczovL2V2ZW50cy51Y2wuYWMu
-						dWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUtVIfzTtfXXYgsLzHKV+nlYpC0YkwDQYJ
-						KoZIhvcNAQEFBQADggEBAAuzenNPDyESW0NGiFOujy4iN1sUci5R971Q52J5vRI6
-						VAOkcorPF1pQZQG+0ysy8IO7z8pMrcjnPnihMoEieWhevuQ3rH0GQTIsZp2R44QT
-						8Ef85tFNRNtBl4N+wzR8YsimKuO6yF5LzYv4qmny7VTb2Vgy5D7cRbrdkPDunseV
-						gcWtiFfrJ88ZfwGpzLxu3+NciV2dCWpydaJOm9UbnhPCQBJpOeISLFnWyVsd+aHt
-						S4692p+l8NLdLIr36qthKjOIlrARIpG/vcpJKBlrq+YecfaICiUCCHH0DvMHb4Ev
-						fKI+L2d7dTFS5x6olfRCjRqlj5p4sXouizdqc0Ak10M=
-					</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://events.ucl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://events.ucl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://events.ucl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://events.ucl.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://events.ucl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://events.ucl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://events.ucl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://events.ucl.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://events.ucl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://events.ucl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://events.ucl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://events.ucl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://events.ucl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://events.ucl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://events.ucl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University College London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University College London: Events Calendar</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adrian</GivenName>
-    <SurName>Barker</SurName>
-    <EmailAddress>mailto:systems@ucl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Jomaron</SurName>
-    <EmailAddress>mailto:cmj@candjsoftware.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adrian</GivenName>
-    <SurName>Barker</SurName>
-    <EmailAddress>mailto:systems@ucl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Jomaron</SurName>
-    <EmailAddress>mailto:cmj@candjsoftware.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/exam.mvm.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index e5302cab..00000000
--- a/swamid-interfederations-2.0/exam.mvm.ed.ac.uk-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://exam.mvm.ed.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 Medical student online assessment SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://exam.mvm.ed.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIJALQh8bzNfyAWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWV4YW0ubXZtLmVkLmFjLnVrMB4XDTExMDQwODE0MTUxM1oXDTIxMDQwNTE0
-						MTUxM1owHDEaMBgGA1UEAxMRZXhhbS5tdm0uZWQuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCeaSQzsMoZUnTOhwMymQk9Vm+FPF7jOZ10NIv/
-						P0ac9f5qjTGhlmzsnswGObNPGwE/5cXtySLww3+3C4E7RzYgfeNfdu4Gf24ZNj0A
-						lP3Pws/N+efi84aqe8Xw63HdpEE4btvVRPa85pRKV8D6yVGI+9DWs3I0UGwEoLpP
-						VfaL5eIJZXnwO1/+EI18wufQn3vtvtAF1oEwPzhsCRfmnt4hqqldHEs0XBe+5IMo
-						DMYp/+ZG7bYAAdWJ4aK1FNPdjAe4MnlyItELveVHNeVwUMcRPUXzN1pLQKFWI/X6
-						E3EJTwmRZl1IQIQBx9xpE8YX8BZZTBQuIiVmiseMdbK0p5i9AgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEWV4YW0ubXZtLmVkLmFjLnVrhiRodHRwczovL2V4YW0ubXZtLmVk
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFNUzFri1AubM0m6NAuN1gi3zcwHG
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAEZXS+2a8+9rgQvK45/M56c4UkF115bfuoMHvz
-						ZvoJdWP7QUNGNQVjfQ/aonEpDpT66estmT1+Ay9M11+d0FHCWSrnVPOo7ynddrx8
-						DxWA651hLbYQCWOBPd4iZc2ccZE0P51Y0THN6DXqX45QyQWm3jqrlSbgkmVRoOeD
-						jj++u/9h5VDw6A0xnSlKdIxNR/zQ3+57KyTbctw0WRyhopVE6SLhthMVj8uz7y59
-						DK6n55hivO1qFExt6GbDOy+OpuElPY8hHkTgMXwVDXTGlc3/aTVRI/t4ckHRvMZE
-						SS5ZRxtb97uIxWPMjgimihx0qvqmmzOD1MjGAvGXoQKh5EAA
-					</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>
-						MIIDIDCCAgigAwIBAgIJALQh8bzNfyAWMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWV4YW0ubXZtLmVkLmFjLnVrMB4XDTExMDQwODE0MTUxM1oXDTIxMDQwNTE0
-						MTUxM1owHDEaMBgGA1UEAxMRZXhhbS5tdm0uZWQuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCeaSQzsMoZUnTOhwMymQk9Vm+FPF7jOZ10NIv/
-						P0ac9f5qjTGhlmzsnswGObNPGwE/5cXtySLww3+3C4E7RzYgfeNfdu4Gf24ZNj0A
-						lP3Pws/N+efi84aqe8Xw63HdpEE4btvVRPa85pRKV8D6yVGI+9DWs3I0UGwEoLpP
-						VfaL5eIJZXnwO1/+EI18wufQn3vtvtAF1oEwPzhsCRfmnt4hqqldHEs0XBe+5IMo
-						DMYp/+ZG7bYAAdWJ4aK1FNPdjAe4MnlyItELveVHNeVwUMcRPUXzN1pLQKFWI/X6
-						E3EJTwmRZl1IQIQBx9xpE8YX8BZZTBQuIiVmiseMdbK0p5i9AgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEWV4YW0ubXZtLmVkLmFjLnVrhiRodHRwczovL2V4YW0ubXZtLmVk
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFNUzFri1AubM0m6NAuN1gi3zcwHG
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAEZXS+2a8+9rgQvK45/M56c4UkF115bfuoMHvz
-						ZvoJdWP7QUNGNQVjfQ/aonEpDpT66estmT1+Ay9M11+d0FHCWSrnVPOo7ynddrx8
-						DxWA651hLbYQCWOBPd4iZc2ccZE0P51Y0THN6DXqX45QyQWm3jqrlSbgkmVRoOeD
-						jj++u/9h5VDw6A0xnSlKdIxNR/zQ3+57KyTbctw0WRyhopVE6SLhthMVj8uz7y59
-						DK6n55hivO1qFExt6GbDOy+OpuElPY8hHkTgMXwVDXTGlc3/aTVRI/t4ckHRvMZE
-						SS5ZRxtb97uIxWPMjgimihx0qvqmmzOD1MjGAvGXoQKh5EAA
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://exam.mvm.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: Medical student online assessment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lts.mvm.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MVM Learning Technology Section</GivenName>
-    <EmailAddress>mailto:mvmlts-elearning-support@lists.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Arek</GivenName>
-    <SurName>Juszczyk</SurName>
-    <EmailAddress>mailto:arek.juszczyk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.xml b/swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.xml
deleted file mode 100644
index ea9f2ca5..00000000
--- a/swamid-interfederations-2.0/ezproxy-dev.bodleian.ox.ac.uk-sp.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://ezproxy-dev.bodleian.ox.ac.uk/sp">
-  <!--
-		This is a "Test EZProxy server at the Bodleian Libraries" EZproxy SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-19T11:27:41Z">
-      <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>
-      <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://ezproxy-dev.bodleian.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEwjCCA6qgAwIBAgIBBTANBgkqhkiG9w0BAQUFADCBoTEmMCQGA1UEAxMdZXpw
-						cm94eS1kZXYuYm9kbGVpYW4ub3guYWMudWsxCzAJBgNVBAYTAkdCMR0wGwYDVQQK
-						ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEbMBkGA1UECxMSQm9kbGVpYW4gTGlicmFy
-						aWVzMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xlaXNoQGJvZGxlaWFuLm94LmFj
-						LnVrMB4XDTE0MDMxMjA5NDYyMloXDTI0MDMxMTA5NDYyMlowgaExJjAkBgNVBAMT
-						HWV6cHJveHktZGV2LmJvZGxlaWFuLm94LmFjLnVrMQswCQYDVQQGEwJHQjEdMBsG
-						A1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsTEkJvZGxlaWFuIExp
-						YnJhcmllczEuMCwGCSqGSIb3DQEJARYfc2ltb24ubWNsZWlzaEBib2RsZWlhbi5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGSmVu41X8W
-						Gv+lhkrjZEjSRDjISyDpxkvs+L9KScpbWjyUe83d+E7pxl/KXqCJPTUPM/iqy5G3
-						MO9EdHJoVtRSadXgw+fqbPhSmefBFeLWQY+1xp+DZSBfncUOXJJIUWDFjCIGYKRu
-						n6YzzB0NnTx4GrGYXRdCUhrhCLn48eIrl1BuRFU2UR8JdEgD2cR+F21x5ZTlWeJB
-						zdMPTq6+YRC8lnuVmqKZ8uMuwlAAd2srkwWcoh8b3+r2tQx6/4RfT435ooV9Cd0w
-						DdoGflxHT1KCe74voJ56Z87TK8IhTLCB4k4WZmk4ltZhbLCvCav1SaDasgxuXlBM
-						fmiKJEwqzWUCAwEAAaOCAQEwgf4wHQYDVR0OBBYEFFZbT+1hVIbJuJz/2vy/1fpn
-						Rf8pMIHOBgNVHSMEgcYwgcOAFFZbT+1hVIbJuJz/2vy/1fpnRf8poYGnpIGkMIGh
-						MSYwJAYDVQQDEx1lenByb3h5LWRldi5ib2RsZWlhbi5veC5hYy51azELMAkGA1UE
-						BhMCR0IxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLExJC
-						b2RsZWlhbiBMaWJyYXJpZXMxLjAsBgkqhkiG9w0BCQEWH3NpbW9uLm1jbGVpc2hA
-						Ym9kbGVpYW4ub3guYWMudWuCAQUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAUtn7eo+/UFIkxAP++WQut9InVxR+s2kGghtOYDPNMqVJfk+ODXnU2oKJ
-						Vkh4/eSVTCi7UkTTZ7kTWpA6g0aseG14mY47w6Subl+8Cg5V0k6p7ZYI2NSRq+GU
-						GSKjrfIB3Vca6QATPnDjOaWjT2JvAXyt0lZr5a339hvorzqRqOGTfUbbRiRkZ4rB
-						sfaHlME0KgtNGJKWyOT3oY9xvNNQUs7TXj1407LPpxe+ip+WMjrx61KeYg4rqqMP
-						gxddMQbBW4a1taVv4xKTIMdlAaKhqKDYlUUN0Wx+UaKdc3RRUdxVpQS1Ilq1SQf1
-						e++9G2F76AB+7FNf2Xs4G3K3mhIm+A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ezproxy-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ezproxy-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Test EZProxy server at the Bodleian Libraries</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>McLeish</SurName>
-    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>McLeish</SurName>
-    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml b/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.xml
deleted file mode 100644
index a02cf438..00000000
--- a/swamid-interfederations-2.0/ezproxy.bodleian.ox.ac.uk-sp.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://ezproxy.bodleian.ox.ac.uk/sp">
-  <!--
-		This is an EZproxy SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-01T13:52: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">
-    <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://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEwjCCA6qgAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBoTEmMCQGA1UEAxMdZXpw
-						cm94eS1wcmQuYm9kbGVpYW4ub3guYWMudWsxCzAJBgNVBAYTAkdCMR0wGwYDVQQK
-						ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEbMBkGA1UECxMSQm9kbGVpYW4gTGlicmFy
-						aWVzMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xlaXNoQGJvZGxlaWFuLm94LmFj
-						LnVrMB4XDTE0MDYyMzE0NDkyMFoXDTI0MDYyMjE0NDkyMFowgaExJjAkBgNVBAMT
-						HWV6cHJveHktcHJkLmJvZGxlaWFuLm94LmFjLnVrMQswCQYDVQQGEwJHQjEdMBsG
-						A1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsTEkJvZGxlaWFuIExp
-						YnJhcmllczEuMCwGCSqGSIb3DQEJARYfc2ltb24ubWNsZWlzaEBib2RsZWlhbi5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMy7FpGCv0m1
-						vFDU51um8KLgUHdvb86ItBRdFWZAG0L0DN771m4KKP0zvhvsTOM9r7Ed3gj+eOp0
-						BpE/MmZ52ZB6qBYaC2Ele7WXIQuRR0Uzp4uENyHMrduTc/MjNQPsw9Ncfp8u6M11
-						aQ1lTkVVudandM0EEUY01PiyBfIg0bMECn/alNpSONbOH95RCogN3ekJfWHQiDlK
-						pYqTVi+ru87WQHeDsJeP7RHxZRJCS1Sb0qA+61RpheQ4XEDWU9Z0uqxOqO7qduDT
-						yU3y5fNcTPaGPj8dW26/Jo9T7lugq88564Y26Qa3ZtNW/GZlhZ5icWxPZNzIpp6C
-						HosCP69zjJkCAwEAAaOCAQEwgf4wHQYDVR0OBBYEFLB6ps4ijHla7Ge8uzD+d9JG
-						hymdMIHOBgNVHSMEgcYwgcOAFLB6ps4ijHla7Ge8uzD+d9JGhymdoYGnpIGkMIGh
-						MSYwJAYDVQQDEx1lenByb3h5LXByZC5ib2RsZWlhbi5veC5hYy51azELMAkGA1UE
-						BhMCR0IxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLExJC
-						b2RsZWlhbiBMaWJyYXJpZXMxLjAsBgkqhkiG9w0BCQEWH3NpbW9uLm1jbGVpc2hA
-						Ym9kbGVpYW4ub3guYWMudWuCAQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAZOF4suQjW4BS/mEX5wBI1onO3jm//y6AqG+afYPYzbKdTI/v6vgSEmgt
-						Z2n7Oon+IGaSThSQ6/AVXE3WtqF7ForHBXeiFbLMPVDnMb9toJ0fj18QGwXDUTEM
-						V2jxmheFqbFz7lzBocD3gdSe2RiPyK6r7eVbKKhWTxSi6/26kuzkxj1ZRYLDzQ2z
-						+6g14ZhRzndwXfP02gR0vJI+W4qbhFAwXLUpHYDHseOHmi0YMZqGYSI2MPW6p0mQ
-						s+JAy11ZO8tyNj2GE4xM5kuvlct2QeU7ylJS/g/ZRsIShr+vQYUhb0/vWdHKCrRj
-						UAF75n0odH/cwINMGEcK6L4NNU1orA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ezproxy-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford EZproxy service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://bodleian.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>McLeish</SurName>
-    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>McLeish</SurName>
-    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ezproxy.rgu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ezproxy.rgu.ac.uk-shibboleth.xml
deleted file mode 100644
index 57a7ce17..00000000
--- a/swamid-interfederations-2.0/ezproxy.rgu.ac.uk-shibboleth.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://ezproxy.rgu.ac.uk/shibboleth">
-  <!--
-		This is an EZproxy SP for The Robert Gordon University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-01T10:29: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">
-    <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://ezproxy.rgu.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEpDCCA4ygAwIBAgIJAJgUTeTAeKehMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYD
-						VQQGEwJHQjEWMBQGA1UECBMNQWJlcmRlZW5zaGlyZTERMA8GA1UEBxMIQWJlcmRl
-						ZW4xITAfBgNVBAoTGFJvYmVydCBHb3Jkb24gVW5pdmVyc2l0eTEZMBcGA1UECxMQ
-						TGlicmFyeSBTZXJ2aWNlczEaMBgGA1UEAxMRZXpwcm94eS5yZ3UuYWMudWswHhcN
-						MTQwNTA2MTQ1NTA1WhcNMjQwNTAzMTQ1NTA1WjCBkjELMAkGA1UEBhMCR0IxFjAU
-						BgNVBAgTDUFiZXJkZWVuc2hpcmUxETAPBgNVBAcTCEFiZXJkZWVuMSEwHwYDVQQK
-						ExhSb2JlcnQgR29yZG9uIFVuaXZlcnNpdHkxGTAXBgNVBAsTEExpYnJhcnkgU2Vy
-						dmljZXMxGjAYBgNVBAMTEWV6cHJveHkucmd1LmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA2Tzm0+NmopoXeqyx5SHaQ9UMNC5vb4EXAQ9JSSY/
-						DuLy/LjQDjJBSFB3oDpOIb5Sm9OG9GOPB5Z5U37tQvV5iZQuNq7YXr3b1CPN/thw
-						jESnCHBHvdUXCPGRldDA/g0lrAyiniLwkYGyyzDWUZFwhNOy+WYPlYSr+gQy6Wjz
-						cEySDW5Pad8KvMKraaXugNLpwM/+ZjoBuDY9XESZzga4OQ2SdAZAeeAU4nt/k9Gx
-						Tmwb73+Z3lSMQHRgyOmMadk+zCftSAOFWyvLQrawv87qaeCwG4vBhpCTQ/NxS9C3
-						mryv/uf3HMYqhjFF8OogmG8rcCwlu3AFbEF9OPF4gS17twIDAQABo4H6MIH3MB0G
-						A1UdDgQWBBREOo8/1pVkYbj7YXLrtyZGOv2gRDCBxwYDVR0jBIG/MIG8gBREOo8/
-						1pVkYbj7YXLrtyZGOv2gRKGBmKSBlTCBkjELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
-						DUFiZXJkZWVuc2hpcmUxETAPBgNVBAcTCEFiZXJkZWVuMSEwHwYDVQQKExhSb2Jl
-						cnQgR29yZG9uIFVuaXZlcnNpdHkxGTAXBgNVBAsTEExpYnJhcnkgU2VydmljZXMx
-						GjAYBgNVBAMTEWV6cHJveHkucmd1LmFjLnVrggkAmBRN5MB4p6EwDAYDVR0TBAUw
-						AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAXgyDbrL+z46zzEuYEPIQSq6zVjQb8SDM
-						g7UrEgIEJbM+3H7HXde8A7ZAxlKy76/qDDPm7/ICd763e8wWA8NSlZRwQ+ZTD8ea
-						d/b0Mt0DWAPz7TilJLLV2fgqlzn+jKJaOrl766XomUI1j/MnTdRGQKoDEg3Q+iox
-						TZ1cyu6zsXR4vtq0M7r/9SIqblFYq12Ma9mnR4DgECY+UUP6DeBYjv16SQ2R4NMN
-						EK298jRhTkhZLszADzTcL/ARxSV//GCmgUnKd4RCybWtA7uRP71/3qflHFpkVjoU
-						gA28CO1KdN7ReDk2vPP0F+SahxgArJHT62ZbKptfiRR7I+m3nsR/+A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ezproxy.rgu.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ezproxy.rgu.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ezproxy.rgu.ac.uk/Shibboleth.sso/SAML2/POST" index="3" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ezproxy.rgu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Robert Gordon University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Robert Gordon University: EZproxy Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rgu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Cunningham</SurName>
-    <EmailAddress>mailto:m.cunningham@rgu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Milne</SurName>
-    <EmailAddress>mailto:r.milne@rgu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ezproxy.wlv.ac.uk-sp.xml b/swamid-interfederations-2.0/ezproxy.wlv.ac.uk-sp.xml
deleted file mode 100644
index fbd83cdc..00000000
--- a/swamid-interfederations-2.0/ezproxy.wlv.ac.uk-sp.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://ezproxy.wlv.ac.uk/sp">
-  <!--
-		This is an EZproxy SP for the University of Wolverhampton.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-16T07:56:29Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE4TCCA8mgAwIBAgIBBTANBgkqhkiG9w0BAQUFADCBqzEgMB4GA1UEAxMXbG9n
-						aW4uZXpwcm94eS53bHYuYWMudWsxCzAJBgNVBAYTAkdCMRYwFAYDVQQIEw1XZXN0
-						IE1pZGxhbmRzMRYwFAYDVQQHEw1Xb2x2ZXJoYW1wdG9uMSQwIgYDVQQKExtVbml2
-						ZXJzaXR5IG9mIFdvbHZlcmhhbXB0b24xJDAiBgkqhkiG9w0BCQEWFWQuaGVuZGVy
-						c29uQHdsdi5hYy51azAeFw0xMjA3MTMwODU4MTBaFw0yMjA3MTMwODU4MTBaMIGr
-						MSAwHgYDVQQDExdsb2dpbi5lenByb3h5Lndsdi5hYy51azELMAkGA1UEBhMCR0Ix
-						FjAUBgNVBAgTDVdlc3QgTWlkbGFuZHMxFjAUBgNVBAcTDVdvbHZlcmhhbXB0b24x
-						JDAiBgNVBAoTG1VuaXZlcnNpdHkgb2YgV29sdmVyaGFtcHRvbjEkMCIGCSqGSIb3
-						DQEJARYVZC5oZW5kZXJzb25Ad2x2LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAznoylhFt3MASgSBsG7czD9Wsvxz/02asNA4T5CajtAefmrsm
-						ZTMHSxf9pmbCziWmWqq/9zQ2iEO0hH7MJg81pP1qtPCdDCNRrKVfVgmbgsxvWd0b
-						oiBXYHad0wBqBbv2lz8JcJKo4hTIrDA3OL/xt5C3b0qhNdpItiyzYndt9VtIgUAj
-						nGHGotc/0KgcCz3K0jLuQDH23glQyd8yveAsoZ2DKBfE2N6rTDQxWfG7qGJxNTml
-						fS6leTgSAN7dl0n1jEimJXmox9uyk/IF2FzcQSVx+Mpy/horRv43NkWmt8fNVZIF
-						xLwznTWWSL4p5WY8oVvXqK8hQg7n/4iTqXe4PQIDAQABo4IBDDCCAQgwHQYDVR0O
-						BBYEFN2wrxBJwZZbhFqvvF3UbC2NO6m1MIHYBgNVHSMEgdAwgc2AFN2wrxBJwZZb
-						hFqvvF3UbC2NO6m1oYGxpIGuMIGrMSAwHgYDVQQDExdsb2dpbi5lenByb3h5Lnds
-						di5hYy51azELMAkGA1UEBhMCR0IxFjAUBgNVBAgTDVdlc3QgTWlkbGFuZHMxFjAU
-						BgNVBAcTDVdvbHZlcmhhbXB0b24xJDAiBgNVBAoTG1VuaXZlcnNpdHkgb2YgV29s
-						dmVyaGFtcHRvbjEkMCIGCSqGSIb3DQEJARYVZC5oZW5kZXJzb25Ad2x2LmFjLnVr
-						ggEFMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAClhsJ2RbVyic9sQ
-						CWJSLBHYvR1i37eXYUlaqT5AImq3KF3RZLHUJ+3qyN6lfkJulGQoAUBy7RJR+OD6
-						MmVxXDos+kr+MqRiIjUfxopOpTtLOa8cUB8pnk4OLMO2ZixQ9nn5dj8mhMnhT6Ie
-						lnxJWM/V5XtP6votpZ/wR64/evLcuyjIQx/AYegCD942K+4btlbRqmng5tr3IXKs
-						s8OxJ1Gk4nTci0wXRBkFQ6PWuMUDmchlM7D68F/sPR6LEB12As9mF3w/zPhP6kfS
-						3WgYxlcio+mumRLvxAYu2WW2g9FagvIgLiKT+OEw32ejFiraBUJ5ln1f8AF0x+wK
-						KKbOZKk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ezproxy.wlv.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.ezproxy.wlv.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.ezproxy.wlv.ac.uk/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.ezproxy.wlv.ac.uk/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Wolverhampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Wolverhampton EZproxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wlv.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Henderson</SurName>
-    <EmailAddress>mailto:d.henderson@wlv.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Henderson</SurName>
-    <EmailAddress>mailto:d.henderson@wlv.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/falcon-scratch.csx.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/falcon-scratch.csx.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index cc7ac793..00000000
--- a/swamid-interfederations-2.0/falcon-scratch.csx.cam.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://falcon-scratch.csx.cam.ac.uk/shibboleth">
-  <!--
-		This is a "Falcon Service demonstration site" Shibboleth SP for the University of Cambridge.
-	-->
-  <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="2011-06-07T14:51: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://falcon-scratch.csx.cam.ac.uk/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://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://falcon-scratch.csx.cam.ac.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://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-							MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-							BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
-							MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
-							azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
-							tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
-							HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
-							gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
-							GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
-							YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
-							+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
-							MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
-							AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
-							yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
-							TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
-							+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
-							O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
-							RsenNm/aXp0wIU+jHVmi/GAPCQ==
-						</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://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://falcon-scratch.csx.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Cambridge: Falcon Service demonstration site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cam.ac.uk/cs/falcon/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/falcon-test.csi.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/falcon-test.csi.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index 2616caa0..00000000
--- a/swamid-interfederations-2.0/falcon-test.csi.cam.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://falcon-test.csi.cam.ac.uk/shibboleth">
-  <!--
-		This is a "Falcon CMS Test Site" Shibboleth SP owned by the University of Cambridge.
-	-->
-  <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-04-26T10:17:33Z">
-      <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://falcon-test.csi.cam.ac.uk/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://falcon-test.csi.cam.ac.uk/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://falcon-test.csi.cam.ac.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://falcon-test.csi.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
-						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
-						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
-						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
-						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
-						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
-						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
-						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
-						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
-						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
-						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
-						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
-						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
-						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
-						RsenNm/aXp0wIU+jHVmi/GAPCQ==
-					</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://falcon-test.csi.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://falcon-test.csi.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Cambridge: Falcon CMS Test Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cam.ac.uk/cs/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/falconidp.uwrf.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/falconidp.uwrf.edu-idp-shibboleth.xml
deleted file mode 100644
index 6742be59..00000000
--- a/swamid-interfederations-2.0/falconidp.uwrf.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +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://falconidp.uwrf.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://falconidp.uwrf.edu/idp/error.jsp" 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">uwrf.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Wisconsin-River Falls</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is the identity provider for Falcon accounts hosted at the University of Wisconsin-River Falls</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uwrf.edu/DoTS/</mdui:InformationURL>
-        <mdui:Logo height="75" width="213" xml:lang="en">https://falconidp.uwrf.edu/idp/images/UWRFWordmark.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>
-MIIDNDCCAhygAwIBAgIVAN/U2QOyvHgKyQfthCk3DrLhvoMRMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmZhbGNvbmlkcC51d3JmLmVkdTAeFw0xMzA3MDkxODQw
-NTdaFw0zMzA3MDkxODQwNTdaMB0xGzAZBgNVBAMTEmZhbGNvbmlkcC51d3JmLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeTbfup9d9iGUkT8ZXG
-3ab5ITZHLhPFUMz5K5Gf+RtP67qY6IfW5XerKd+DqWYnYOqIsEno6iUJi6FRhwd6
-K93ikNM/ttaOeObwSl2NmgJBJjQv+o6ps4NVH+eiYesCKf9FDzq6epJWD1OoBYFz
-1rmXUGvkg0vfElQYWb4dcbkD6pL9Eh6xRlSSqqUSTzEHq+dtAGkv9qR9VPvx0QQK
-T71CoRSgD74k3aeksTrAnO7qUnuvFtQ2B4SxpHUEWYr/ke1W6WEyJZ8G0MOZz3hS
-vi4FLuW7vaW8k9qjtRtnJGr1ZC/beZjDS4bijgDCX2deTpP2sBpp/yJOdcBNpxYI
-+BcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISZmFsY29uaWRwLnV3cmYuZWR1hilodHRw
-czovL2ZhbGNvbmlkcC51d3JmLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-5c6lokB0p4KGA/8AM1m/zHjlANswDQYJKoZIhvcNAQEFBQADggEBAHw+PG5JCERF
-b+n8FO6q3Bk31nVxjhz+mrhGMb2rRpVYHWsGNuN8idHLQeFlyVSkI22lkuzZVHii
-FM6PiSsO7aHWNzLBUI5GQu6fpE+Tsv95fMOWxUGGyzxwku6DHiMJF2LIif/e0pHe
-Csl6HQ1d+LYePGNt1MFuhEGMA3A2hp5vOgVYDgUPPcnclrLZBo4kcQXnckbyC5OM
-hdhoAotvi5J7+ke4HlphH3QPxhnn70l2h2B0IIxefoGWccXQ4bYnELjT+vNjXPQI
-a0R32mN78I6LMoHGNX8WHv33oD3cBCwKQ0ZiSGPg56Q7QkPEugLOZkjVwgGe9YcR
-ACtYScHQvMw=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://falconidp.uwrf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://falconidp.uwrf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://falconidp.uwrf.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falconidp.uwrf.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://falconidp.uwrf.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwrf.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAN/U2QOyvHgKyQfthCk3DrLhvoMRMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmZhbGNvbmlkcC51d3JmLmVkdTAeFw0xMzA3MDkxODQw
-NTdaFw0zMzA3MDkxODQwNTdaMB0xGzAZBgNVBAMTEmZhbGNvbmlkcC51d3JmLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeTbfup9d9iGUkT8ZXG
-3ab5ITZHLhPFUMz5K5Gf+RtP67qY6IfW5XerKd+DqWYnYOqIsEno6iUJi6FRhwd6
-K93ikNM/ttaOeObwSl2NmgJBJjQv+o6ps4NVH+eiYesCKf9FDzq6epJWD1OoBYFz
-1rmXUGvkg0vfElQYWb4dcbkD6pL9Eh6xRlSSqqUSTzEHq+dtAGkv9qR9VPvx0QQK
-T71CoRSgD74k3aeksTrAnO7qUnuvFtQ2B4SxpHUEWYr/ke1W6WEyJZ8G0MOZz3hS
-vi4FLuW7vaW8k9qjtRtnJGr1ZC/beZjDS4bijgDCX2deTpP2sBpp/yJOdcBNpxYI
-+BcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISZmFsY29uaWRwLnV3cmYuZWR1hilodHRw
-czovL2ZhbGNvbmlkcC51d3JmLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-5c6lokB0p4KGA/8AM1m/zHjlANswDQYJKoZIhvcNAQEFBQADggEBAHw+PG5JCERF
-b+n8FO6q3Bk31nVxjhz+mrhGMb2rRpVYHWsGNuN8idHLQeFlyVSkI22lkuzZVHii
-FM6PiSsO7aHWNzLBUI5GQu6fpE+Tsv95fMOWxUGGyzxwku6DHiMJF2LIif/e0pHe
-Csl6HQ1d+LYePGNt1MFuhEGMA3A2hp5vOgVYDgUPPcnclrLZBo4kcQXnckbyC5OM
-hdhoAotvi5J7+ke4HlphH3QPxhnn70l2h2B0IIxefoGWccXQ4bYnELjT+vNjXPQI
-a0R32mN78I6LMoHGNX8WHv33oD3cBCwKQ0ZiSGPg56Q7QkPEugLOZkjVwgGe9YcR
-ACtYScHQvMw=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://falconidp.uwrf.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wisconsin-River Falls</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-River Falls</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwrf.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Robert Rust</md:GivenName>
-    <md:EmailAddress>dots@uwrf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jason Winget</md:GivenName>
-    <md:EmailAddress>dots@uwrf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Division of Technology Services</md:GivenName>
-    <md:EmailAddress>dots@uwrf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Jason Winget</md:GivenName>
-    <md:EmailAddress>abuse@uwrf.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/falmouthtechbookings.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/falmouthtechbookings.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index 5f3476fc..00000000
--- a/swamid-interfederations-2.0/falmouthtechbookings.sisoshibboleth.co.uk-entity.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://falmouthtechbookings.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Falmouth University Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2014-10-07T08:51:26Z">
-      <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://falmouthtechbookings.siso.co/sso/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://falmouthtechbookings.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Falmouth University Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Falmouth University Online Resource Booking</mdui:Description>
-        <mdui:Logo height="60" width="60">https://falmouthtechbookings.siso.co/images/layout/siso-logo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://falmouthtechbookings.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://falmouthtechbookings.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://falmouthtechbookings.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://falmouthtechbookings.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://falmouthtechbookings.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://falmouthtechbookings.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://falmouthtechbookings.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Falmouth University Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fam-uat.salford.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/fam-uat.salford.ac.uk-oala-metadata.xml
deleted file mode 100644
index 2333d427..00000000
--- a/swamid-interfederations-2.0/fam-uat.salford.ac.uk-oala-metadata.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://fam-uat.salford.ac.uk/oala/metadata">
-  <!--
-		This is a UAT OpenAthens LA IdP for the University of Salford.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-27T14:26:50Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">salford.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkigAwIBAgIIdA1q8PHLx00wDQYJKoZIhvcNAQEFBQAwRzElMCMGA1UE
-						CgwcVW5pdmVyc2l0eSBvZiBTYWxmb3JkIChUZXN0KTEeMBwGA1UEAwwVZmFtLXVh
-						dC5zYWxmb3JkLmFjLnVrMB4XDTEyMDYxMTEyMzAwMVoXDTIyMDYxMTEyMzAwMVow
-						RzElMCMGA1UECgwcVW5pdmVyc2l0eSBvZiBTYWxmb3JkIChUZXN0KTEeMBwGA1UE
-						AwwVZmFtLXVhdC5zYWxmb3JkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEAmakhp2Sop9uuZ4/g+ogTc7O6J59oC5jNWSpTSFcKIe8NSIuyfwxh
-						IlKW/aQqPKJnFXF14Gxpx1BNppdqQqQRxEL7as4Zxz8/dCp7bYAhfbUqazI9O6eT
-						AEXHFdWuF03G6stpD9tgXb/M3C33xIEMbMLrxwecEGptBMXQAGrfP9HjzVSq5sOL
-						DRG3XavujhmCwL2mJY8Er0EV89AhGcCMa/gF8LcMsq8lIfAkOOtCIyEyYFxwKhfB
-						fPhap5pez1Brb9UclHQS7YPPpbd6sVJbE12ynbp40zFyXI7Gk1VPcGbAOtlmqXN1
-						ncnRjRD4FFIaze3Hg4psQ45SINODenw0YwIDAQABo1AwTjAdBgNVHQ4EFgQUKP/c
-						Xhj02302SMPB4YIF+gJPYlgwHwYDVR0jBBgwFoAUKP/cXhj02302SMPB4YIF+gJP
-						YlgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAIQuZ3AkhllWpfZ7w
-						NOLbdL9xbbJZBc4fA7INZvVJWDB1PIJUn9Iva943Qym/JEIuVj59S5be0Ctn3XZi
-						4I/aRTyi/rPt0px34c3r3yJTtF6OXe1OERoGishcttXgQBQdzuBzr8B0wDYfYL0O
-						jrBSqzn19Dhq8+zgINPeKjtwbsPwgAUY/BKZznxpeaqkTvCuPKQVvB/Rhuer4gbg
-						9s+2GFpJOEBFGBKGQDrqaN04B5aMGfnVmVuFyFXoKEjwmT2xTyI9ZAqd1IcARhUz
-						Do7ZcjE94HyRadvZwOrZEtsZrRDrCGSP3f8oeOO+5+Vrw9R9pG0hgmgRyPi5ms/e
-						kjf/HA==
-					</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>
-						MIIDYDCCAkigAwIBAgIIdA1q8PHLx00wDQYJKoZIhvcNAQEFBQAwRzElMCMGA1UE
-						CgwcVW5pdmVyc2l0eSBvZiBTYWxmb3JkIChUZXN0KTEeMBwGA1UEAwwVZmFtLXVh
-						dC5zYWxmb3JkLmFjLnVrMB4XDTEyMDYxMTEyMzAwMVoXDTIyMDYxMTEyMzAwMVow
-						RzElMCMGA1UECgwcVW5pdmVyc2l0eSBvZiBTYWxmb3JkIChUZXN0KTEeMBwGA1UE
-						AwwVZmFtLXVhdC5zYWxmb3JkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEAmakhp2Sop9uuZ4/g+ogTc7O6J59oC5jNWSpTSFcKIe8NSIuyfwxh
-						IlKW/aQqPKJnFXF14Gxpx1BNppdqQqQRxEL7as4Zxz8/dCp7bYAhfbUqazI9O6eT
-						AEXHFdWuF03G6stpD9tgXb/M3C33xIEMbMLrxwecEGptBMXQAGrfP9HjzVSq5sOL
-						DRG3XavujhmCwL2mJY8Er0EV89AhGcCMa/gF8LcMsq8lIfAkOOtCIyEyYFxwKhfB
-						fPhap5pez1Brb9UclHQS7YPPpbd6sVJbE12ynbp40zFyXI7Gk1VPcGbAOtlmqXN1
-						ncnRjRD4FFIaze3Hg4psQ45SINODenw0YwIDAQABo1AwTjAdBgNVHQ4EFgQUKP/c
-						Xhj02302SMPB4YIF+gJPYlgwHwYDVR0jBBgwFoAUKP/cXhj02302SMPB4YIF+gJP
-						YlgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAIQuZ3AkhllWpfZ7w
-						NOLbdL9xbbJZBc4fA7INZvVJWDB1PIJUn9Iva943Qym/JEIuVj59S5be0Ctn3XZi
-						4I/aRTyi/rPt0px34c3r3yJTtF6OXe1OERoGishcttXgQBQdzuBzr8B0wDYfYL0O
-						jrBSqzn19Dhq8+zgINPeKjtwbsPwgAUY/BKZznxpeaqkTvCuPKQVvB/Rhuer4gbg
-						9s+2GFpJOEBFGBKGQDrqaN04B5aMGfnVmVuFyFXoKEjwmT2xTyI9ZAqd1IcARhUz
-						Do7ZcjE94HyRadvZwOrZEtsZrRDrCGSP3f8oeOO+5+Vrw9R9pG0hgmgRyPi5ms/e
-						kjf/HA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fam-uat.salford.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fam-uat.salford.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Salford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Salford TEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.salford.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library Systems Support</GivenName>
-    <EmailAddress>mailto:library-systems@salford.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Library Systems Support</GivenName>
-    <EmailAddress>mailto:library-systems@salford.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fam.carmel.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/fam.carmel.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 58a317a8..00000000
--- a/swamid-interfederations-2.0/fam.carmel.ac.uk-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://fam.carmel.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Carmel College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-01T14:46:18Z">
-      <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">carmel.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAIqLMP1+YZiVFuSl3+ML0bJOAduCMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFHNoaWJpZHAuY2FybWVsLmFjLnVrMB4XDTE0MDQzMDE1
-						MTE1NloXDTM0MDQzMDE1MTE1NlowHzEdMBsGA1UEAxMUc2hpYmlkcC5jYXJtZWwu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCOeIdZOIToq8RS
-						2E76IiVkssLXCGshL1IRzhwql+hB1tcDbyyQ86cKz8EbJcuoob+PO/z8G/oK3bmj
-						CxqzK0tzlV9QxOykUVYJJMGiIl/hyvjURIrq6FN8TW22zmMOJcKbq3jSvNOy4z8p
-						W2efstF5aI7hKh5hQ6t/HwIQrc5jvqbVSQIucfoC5LECE3MC00o0rOeCU9SphxRd
-						6YgzqamXaxtwj0ON5RUL+CMF0s5rmFmNluaEypSwb7jtvIlS60EP5owBiimkWYp4
-						U0hBey4VxGItqNQ/qQAQsLHzfS4IOyI1JpspcmfU8krltECZEV1DiSblrN2+Uwjy
-						1njykW/nAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJpZHAuY2FybWVsLmFjLnVr
-						hitodHRwczovL3NoaWJpZHAuY2FybWVsLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBQcbtOJdw/shpXLO82zmaTiYMOw0jANBgkqhkiG9w0BAQUFAAOCAQEA
-						HO9dtyYWJuaFG/1EzSYcICuWD+1FvPvkWpc74PxXeii9GXlJm8T3YGlylsh9Hm+Q
-						CtCgNo5nEX6cEFdBF0W4MLiAC60dUG9tFhxYfq0Eki2wGdYW6il4p6rqMriVVLHa
-						YYVAPLqBmY+AFtmnkrv3AYLb7QxhGCuoTp6NGD1bghV33LL1JbmNzTSNhb+29AMf
-						5vt3p/Xvx26NA4w+9mi1ALSUYiX5mYJ6BI7ZSmcRms46coPLhpSpKCATfXeMwgOO
-						H6FIFa78iAxfsERmipMjp31yExWQ2jMfbQFMrMwocThoymgkjwX39KpLUGE6VkTN
-						W23+BuUVpxDOnTQb4XrNbg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.carmel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.carmel.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://shibidp.carmel.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.carmel.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.carmel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.carmel.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">carmel.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAIqLMP1+YZiVFuSl3+ML0bJOAduCMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFHNoaWJpZHAuY2FybWVsLmFjLnVrMB4XDTE0MDQzMDE1
-						MTE1NloXDTM0MDQzMDE1MTE1NlowHzEdMBsGA1UEAxMUc2hpYmlkcC5jYXJtZWwu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCOeIdZOIToq8RS
-						2E76IiVkssLXCGshL1IRzhwql+hB1tcDbyyQ86cKz8EbJcuoob+PO/z8G/oK3bmj
-						CxqzK0tzlV9QxOykUVYJJMGiIl/hyvjURIrq6FN8TW22zmMOJcKbq3jSvNOy4z8p
-						W2efstF5aI7hKh5hQ6t/HwIQrc5jvqbVSQIucfoC5LECE3MC00o0rOeCU9SphxRd
-						6YgzqamXaxtwj0ON5RUL+CMF0s5rmFmNluaEypSwb7jtvIlS60EP5owBiimkWYp4
-						U0hBey4VxGItqNQ/qQAQsLHzfS4IOyI1JpspcmfU8krltECZEV1DiSblrN2+Uwjy
-						1njykW/nAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJpZHAuY2FybWVsLmFjLnVr
-						hitodHRwczovL3NoaWJpZHAuY2FybWVsLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBQcbtOJdw/shpXLO82zmaTiYMOw0jANBgkqhkiG9w0BAQUFAAOCAQEA
-						HO9dtyYWJuaFG/1EzSYcICuWD+1FvPvkWpc74PxXeii9GXlJm8T3YGlylsh9Hm+Q
-						CtCgNo5nEX6cEFdBF0W4MLiAC60dUG9tFhxYfq0Eki2wGdYW6il4p6rqMriVVLHa
-						YYVAPLqBmY+AFtmnkrv3AYLb7QxhGCuoTp6NGD1bghV33LL1JbmNzTSNhb+29AMf
-						5vt3p/Xvx26NA4w+9mi1ALSUYiX5mYJ6BI7ZSmcRms46coPLhpSpKCATfXeMwgOO
-						H6FIFa78iAxfsERmipMjp31yExWQ2jMfbQFMrMwocThoymgkjwX39KpLUGE6VkTN
-						W23+BuUVpxDOnTQb4XrNbg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.carmel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.carmel.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">Carmel College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Carmel College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.carmel.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kevin</GivenName>
-    <SurName>Burke</SurName>
-    <EmailAddress>mailto:kev@carmel.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Burke</SurName>
-    <EmailAddress>mailto:kev@carmel.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fam.salford.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/fam.salford.ac.uk-oala-metadata.xml
deleted file mode 100644
index 81c4e31e..00000000
--- a/swamid-interfederations-2.0/fam.salford.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fam.salford.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens IdP for the University of Salford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-09T14:40:38Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">salford.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSjCCAjKgAwIBAgIISWizH5lKvIkwDQYJKoZIhvcNAQEFBQAwPDEeMBwGA1UE
-						CgwVVW5pdmVyc2l0eSBvZiBTYWxmb3JkMRowGAYDVQQDDBFmYW0uc2FsZm9yZC5h
-						Yy51azAeFw0xMjA4MDYxMTM0NDZaFw0yMjA4MDYxMTM0NDZaMDwxHjAcBgNVBAoM
-						FVVuaXZlcnNpdHkgb2YgU2FsZm9yZDEaMBgGA1UEAwwRZmFtLnNhbGZvcmQuYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2N5bbB0d6OUykoom7
-						zjJ2RpnQ85NNbKrKR9KLxwH7Vvcc7y69PcPmfFf+8yvRGkQn4sBWoyrq+uuVETOW
-						oUn0r/kOaOSIUHb8/U4IX1gN+TWatWN5jTe6LV8lV84gNJdRV92hYW4twH+1c0SS
-						zarbdX6WiDBO8XjfTKj0+DYmoobkYx2L5LZHo5bfaZd1YnEsW1kCTW9wdz+SBgSm
-						91LUrDzQe2aStk5xlGkCTAsiECV9b2sAjQbP6Omm5JfFCdAyB5oP8oDcHBHCJA7U
-						nKN8dVe9opLmC5r7An0cRmtrmIQn2/J6L2lZCgAwbvoU3zmq2+5kpPJ26M5w1s6S
-						e0lzAgMBAAGjUDBOMB0GA1UdDgQWBBTMdjshjBe7s8oWmzyc9Mx96TbOzzAfBgNV
-						HSMEGDAWgBTMdjshjBe7s8oWmzyc9Mx96TbOzzAMBgNVHRMEBTADAQH/MA0GCSqG
-						SIb3DQEBBQUAA4IBAQBqPiuHHi9oZMbWecwj0h0j8aYd80h7B2CVm7raPdGHqZtM
-						4geXmYIxadUe26WCtZLPyMxW4sgeU2J/0Lp2z2l0CS4lifBwP5MHE88KbAYKzpPm
-						ZOW2DolpYIUfo4CcgZnH0XEWE03mBXWj5JU4TYTQjZMc+tpyOB3CZeUj5oGrdPML
-						qzpdvLCnVr0yZER30UvOFHPmpLBdso0phzBNMp2YG0cy10ycNJ5NmCXUanO515VQ
-						Q9m+Wj7WR34H/sROTQPcpsuayyU6N6AE9TGg75VwrbqHq7/Z5RYTTIlKCzzrsHNm
-						/gELPAAk66PahcDoQFc4NTQz/gCIt8l4YbWxC2AS
-					</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>
-						MIIDSjCCAjKgAwIBAgIISWizH5lKvIkwDQYJKoZIhvcNAQEFBQAwPDEeMBwGA1UE
-						CgwVVW5pdmVyc2l0eSBvZiBTYWxmb3JkMRowGAYDVQQDDBFmYW0uc2FsZm9yZC5h
-						Yy51azAeFw0xMjA4MDYxMTM0NDZaFw0yMjA4MDYxMTM0NDZaMDwxHjAcBgNVBAoM
-						FVVuaXZlcnNpdHkgb2YgU2FsZm9yZDEaMBgGA1UEAwwRZmFtLnNhbGZvcmQuYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2N5bbB0d6OUykoom7
-						zjJ2RpnQ85NNbKrKR9KLxwH7Vvcc7y69PcPmfFf+8yvRGkQn4sBWoyrq+uuVETOW
-						oUn0r/kOaOSIUHb8/U4IX1gN+TWatWN5jTe6LV8lV84gNJdRV92hYW4twH+1c0SS
-						zarbdX6WiDBO8XjfTKj0+DYmoobkYx2L5LZHo5bfaZd1YnEsW1kCTW9wdz+SBgSm
-						91LUrDzQe2aStk5xlGkCTAsiECV9b2sAjQbP6Omm5JfFCdAyB5oP8oDcHBHCJA7U
-						nKN8dVe9opLmC5r7An0cRmtrmIQn2/J6L2lZCgAwbvoU3zmq2+5kpPJ26M5w1s6S
-						e0lzAgMBAAGjUDBOMB0GA1UdDgQWBBTMdjshjBe7s8oWmzyc9Mx96TbOzzAfBgNV
-						HSMEGDAWgBTMdjshjBe7s8oWmzyc9Mx96TbOzzAMBgNVHRMEBTADAQH/MA0GCSqG
-						SIb3DQEBBQUAA4IBAQBqPiuHHi9oZMbWecwj0h0j8aYd80h7B2CVm7raPdGHqZtM
-						4geXmYIxadUe26WCtZLPyMxW4sgeU2J/0Lp2z2l0CS4lifBwP5MHE88KbAYKzpPm
-						ZOW2DolpYIUfo4CcgZnH0XEWE03mBXWj5JU4TYTQjZMc+tpyOB3CZeUj5oGrdPML
-						qzpdvLCnVr0yZER30UvOFHPmpLBdso0phzBNMp2YG0cy10ycNJ5NmCXUanO515VQ
-						Q9m+Wj7WR34H/sROTQPcpsuayyU6N6AE9TGg75VwrbqHq7/Z5RYTTIlKCzzrsHNm
-						/gELPAAk66PahcDoQFc4NTQz/gCIt8l4YbWxC2AS
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fam.salford.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fam.salford.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Salford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Salford (Network Username)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.salford.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library Systems Support</GivenName>
-    <EmailAddress>mailto:library-systems@salford.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Library Systems Team</GivenName>
-    <EmailAddress>mailto:library-systems@salford.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fdm.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/fdm.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index 3f710441..00000000
--- a/swamid-interfederations-2.0/fdm.sisoshibboleth.co.uk-entity.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://fdm.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Roehampton Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2016-01-25T10:29:17Z">
-      <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://fdm.siso.co/sso/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://fdm.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Roehampton Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Roehampton Online Resource Booking</mdui:Description>
-        <mdui:Logo height="64" width="64">https://shibboleth.siso.co/siso-logo64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fdm.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fdm.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fdm.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fdm.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fdm.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fdm.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fdm.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Roehampton Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</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 1670b284..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://febe.ufpe.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://febe.ufpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://febe.ufpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://febe.ufpe.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://febe.ufpe.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://febe.ufpe.br/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">ufpe.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://febe.ufpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://febe.ufpe.br:8443/idp/profile/SAML1/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">UFPE - Universidade Federal de Pernambuco</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFPE - Universidade Federal de Pernambuco</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFPE - Universidade Federal de Pernambuco</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufpe.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufpe.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Anderson Queiroz</md:SurName>
-    <md:EmailAddress>aalqufpe@gmail.com</md:EmailAddress>
-  </md:ContactPerson>
-</md: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-interop-wg.ligo.org-shibboleth-sp.xml b/swamid-interfederations-2.0/fed-interop-wg.ligo.org-shibboleth-sp.xml
deleted file mode 100644
index f3521abe..00000000
--- a/swamid-interfederations-2.0/fed-interop-wg.ligo.org-shibboleth-sp.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://fed-interop-wg.ligo.org/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://fed-interop-wg.ligo.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GitLab for I2 Fed Op WG hosted by LIGO</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GitLab service for the Internet2 Federation Interoperability Working Group hosted by LIGO</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://fed-interop-wg.ligo.org/spinfo.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://fed-interop-wg.ligo.org/spprivacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://fed-interop-wg.ligo.org/img/ligologo80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIJAO4GMlBzog5QMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2ZlZC1pbnRlcm9wLXdnLmxpZ28ub3JnMB4XDTE1MDgyOTE4NTYzOFoXDTE4
-MDgyODE4NTYzOFowIjEgMB4GA1UEAxMXZmVkLWludGVyb3Atd2cubGlnby5vcmcw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAnD0Eot/XtlRZv1dgabn5
-1suiIcnCJyli3NF6Lnm8pm+QxuRfJxGQTyJcmaSuUixU3K9OorRVGVo0+La0liSK
-3yncmHZQ0SC7PKsuavwupM7QoEHuJXq2dj+cfz2+r7KtfUprE1GsdoYQe1lG0Q78
-mIFfZEoz+PPyIWJQbMk3P3W45mnYvYNWcxOFfoEGG3sEFJMnV8rI2cpLLbDRmY2l
-ywwF9pvgP5ndDGaDwC+mEVW2+LLGc+g1MZfzuTUM/1jdduGgBrbH2VkunFDpaE7q
-JmKmeNEipvu46jQRqB+k5OAC++rJ0U3GtdGh6kF+6wleNwmKB98RBZZnrkwTTbbr
-AgMBAAGjcTBvME4GA1UdEQRHMEWCF2ZlZC1pbnRlcm9wLXdnLmxpZ28ub3Jnhipo
-dHRwczovL2ZlZC1pbnRlcm9wLXdnLmxpZ28ub3JnL3NoaWJib2xldGgwHQYDVR0O
-BBYEFBQ8hmlK6r1tTukMs96IGob5xMl+MA0GCSqGSIb3DQEBBQUAA4IBAQBCfGPD
-1SEjl3E/XtQ/9tv1NrCCOHib29BoFDIIjTejcyehwX0/lDW9Ryra6t+qlkofAuV9
-PUVL3dBQQFka0adUPonvs5Q9chisVj1hT4mhUz1C72m9wIDsIP9QQkuOqgK/3SFg
-J0wsttMzP2uirZRnkg9DHKfym64D8sCpI8qWtHJbf40qxH9Zk90BKQWNR6e3qnLC
-ncePo7O6V1anNgFJD78E+bNjd9KlY/YJkzOyL/M52HhM6IjDvBRgfhwUxf9HkdEb
-APc4VR5gYD4DBiUTINX+Ex3yinxQ4AHx09FlvKXu2MKGmiCH3AozhjvR4vNFivqi
-dD7nKurLpav8RpR+
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed-interop-wg.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fed-interop-wg.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fed-interop-wg.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fed-interop-wg.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">GitLab for I2 Fed Op WG hosted by LIGO</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">GitLab service for the Internet2 Federation Interoperability Working Group hosted by LIGO</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" 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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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="mail" Name="urn:mace:dir:attribute-def:mail" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Scott Koranda</md:GivenName>
-    <md:EmailAddress>scott.koranda@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Warren Anderson</md:GivenName>
-    <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Scott Koranda</md:GivenName>
-    <md:EmailAddress>scott.koranda@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LIGO Security Committee</md:GivenName>
-    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed-lab.org.xml b/swamid-interfederations-2.0/fed-lab.org.xml
deleted file mode 100644
index ab44769a..00000000
--- a/swamid-interfederations-2.0/fed-lab.org.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fed-lab.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-03-08T11:10:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                   https://www.aai.dfn.de/en/join/
-               </mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">
-                   https://www.aai.dfn.de/teilnahme/
-               </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">ID Federation Lab</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ID Federation Lab</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Federation Lab</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Federation Lab</mdui:Description>
-        <mdui:Logo height="32" width="32">https://fed-lab.org/wp-content/themes/carrington-blog/img/lab.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>fed-lab.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=fed-lab.org,OU=Geschaeftsstelle,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTjCCBDagAwIBAgIHE3f/Vc7d6jANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMjAzMDgw
-OTU0MTNaFw0xNzAzMDcwOTU0MTNaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpE
-Rk4tVmVyZWluMRkwFwYDVQQLExBHZXNjaGFlZnRzc3RlbGxlMRQwEgYDVQQDEwtm
-ZWQtbGFiLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKM5G9l7
-Q3NMbPZlwx+xqH1ELTyhC9yYTP2LDaDGyS1XDQ29QMAvLB0SzmG+aBNSiO7aFVXO
-nKUDBSlOUCUA7S88hMDNquVSqbujAZ5/CuguW5rjoJN1IS3i7ZaD7/Q1mRBhIV9i
-qmv2w24oKhhqw/ijLkK4XFnSCyom33MBPlFz/TkH1W7AaTAoMZTNQEFP4Ms9IUf6
-ePU14Mw7C2RBjC+eUyM2/xU0EZt9RppXDpQ1PK172HoEaWYHhyAD0SLyamJBtqVn
-W7uhgFuh7jHgDaN4xi+zow91wNIHJFYp4k26sSWARb9zxnnXmsPdOZcL//vBis1U
-Sf3YWsWy3IsosckCAwEAAaOCAhowggIWMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXg
-MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUhL6wfirs
-VHh3Ridf8Ct0ZpdXLfEwHwYDVR0jBBgwFoAUeaJiL87xBjlS53ZtYsfem2p1S0kw
-JwYDVR0RBCAwHoILZmVkLWxhYi5vcmeCD3d3dy5mZWQtbGFiLm9yZzCBkQYDVR0f
-BIGJMIGGMEGgP6A9hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4t
-Z3MtY2EvcHViL2NybC9nX2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9kZm4tdmVyZWluLWdzLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd8G
-CCsGAQUFBwEBBIHSMIHPMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu
-LmRlL09DU1AtU2VydmVyL09DU1AwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kZm4tdmVyZWlu
-LWdzLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQCAKgHUcNID3v4Q2tqoQ4rX0eExJWPAJpDiixNi72GMoBeVWEXXeTK0i6pXNiAi
-Zk/GeeRPpOFdWEv7fxUv3igtzUdsWcxdID0+d4Jr2r4qThzlr0qroAKW/k5EA5Xr
-XHzLAh7lzGbipKbPLFFhMOgo8qbaPCjIKSKZGJzbXKPfxy5Efrbjpp3RJvvcCtS8
-AjsYaiukBZxdxU13wW4jLz20DJYECREQg14xJ7yYfHkY089k5LyCHEdLfSIQGG25
-zCWG/MOfIF4ytgyS74d3xzMRlVZ9Xa55k/MngKBWbBFvaTUiQppSC+xKNFm+bFAX
-rQ9xVr27yKkLqzzoz8LiTMmk
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed-lab.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed-lab.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fed-lab.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fed-lab.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fed-lab.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">ID Federation Lab</OrganizationName>
-    <OrganizationName xml:lang="en">ID Federation Lab</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ID Federation Lab</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">ID Federation Lab</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://fed-lab.org/</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://fed-lab.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Andreas</GivenName>
-    <SurName>Åkre Solberg</SurName>
-    <EmailAddress>andreas.solberg@uninett.no</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Torsten</GivenName>
-    <SurName>Kersting</SurName>
-    <EmailAddress>kersting@dfn.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.huit.harvard.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/fed.huit.harvard.edu-idp-shibboleth.xml
deleted file mode 100644
index d60d8d1d..00000000
--- a/swamid-interfederations-2.0/fed.huit.harvard.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,68 +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://fed.huit.harvard.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">harvard.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Harvard University</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>
-MIIDPDCCAiSgAwIBAgIVAMHQ2+0FLgQvpn9LL0UhXMMNPuAgMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGZlZC5odWl0LmhhcnZhcmQuZWR1MB4XDTEzMDgxNDE2
-MzcwMFoXDTE2MDgxNDE2MzcwMFowHzEdMBsGA1UEAxMUZmVkLmh1aXQuaGFydmFy
-ZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx7RtyRasKHsaM
-y5JjRalxmd0wQ5f/2vRZ3/7mf2tsz7F/Omm7iehUvqdUQ1VHcqz0YtYI6LCpRsv0
-cAadIN+A52Z+mRxVS0ipqmo7dWEzq/l/a+FIFL/WH7GGhzT2CkS63egZqVwmjfGi
-nD48x8eb5iNJiFl+86nKnBd9OPa4Lu8SMZAIrIHmbMJiaZg5AMpTBqx7Aswvjw+K
-YdzwShYnIz9BJJyKmx2KM0hAFn3Rx344xeBKZ8x74Tfi2Nf/9mg+EXUNHokOmmOw
-qTDsISKfBb8B4Wi2HgFziiK0YsUPnPphaELyYz65jt7/myQq479PuBwkXDatZbkf
-dG49sFY3AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGZlZC5odWl0LmhhcnZhcmQuZWR1
-hitodHRwczovL2ZlZC5odWl0LmhhcnZhcmQuZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQPaXv5xewHpvA6acA9EguQxtTnIDANBgkqhkiG9w0BAQUFAAOCAQEA
-EFbJC6L/TSNQ+2GhnbWDQkWDsR+GafRumjv5K4uSIPSJbn9LTwJKVDA8AwOGYyM3
-z1kLIOKdJU+rh+ZzFRBNHNa9Hwdn0rb6mv/4H6FzlSDHVh+5H+r0ohZW7mlKXi39
-4iJ2Vg1B/edJsF6jpgCZ/hNMqdvIWFIaUYSUkLLyf2gqod6vGRj69+KnPHDSYblY
-khJAS6iLBV6oXpiLnFLsMOx3PPbDlcFKjI/GlNVR9zKfvtdLZw+pKKGa8q2tARdV
-fvoMZweNsx+LViC1oJSfNXRQGFcipJmzV0lotUCf2YiU3fAkkCQjv/QB/WD1cBn1
-fSvxgeeh4nx2Wy1uwFlYcA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fed.huit.harvard.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.huit.harvard.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.huit.harvard.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Harvard College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Harvard University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.harvard.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IdP Support Team</md:GivenName>
-    <md:EmailAddress>idp_support@harvard.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IdP Support Team</md:GivenName>
-    <md:EmailAddress>idp_support@harvard.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IdP Support Team</md:GivenName>
-    <md:EmailAddress>idp_support@harvard.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 23b26f2b..00000000
--- a/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.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://fed.id.univ-bordeaux.fr/idp_ubx/shibboleth">
-  <md: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>
-  </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 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="en">CUEA - Communauté d'universités et d'établissements d'Aquitaine</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACNUlEQVQoz2VSS2sTYRQ99/tmJpOZpM1EQSou2tRmCroQdFXxgbhSdKfu/AGCP8Bf4KK+SE0jInQjuNKdEmybRBEUN7Uraxdqi0LTlkb6TKbz3esiSVW8m7u459xz7oPwogEADIiACABEoAl7QQRhEoibylWKFgAIDnoqbWE1EkdRysLiNrcYbTKxAZF4mdxUIV8rKQJAMCKX++zVi73lEX+/owCADdzUwIenpx5d1Sbur5aGpwuxm1ICKEJ9k599jwCeX4/f/4xiAQEg5W6spFa+Dk0+CKvFyA8gUG3P0MSaANUCweqMAoCIFk5cyf6YFVICAkS1nUKrja2tx/duvy6/QsJlZlEWRTv1wZG5C7dEWwAIAuwpKN1sNieelN69rSGRABt4mXz5Tnpt0bhptdtEd23qz/aUCoKs73tgw15mYHosrBUNKQh3u/9LgIgxxgiQtAenCmHlYeRlQF3A/wqAkDCED1UmwurDyMtAQBx3i51sddjCQrqVzDibjSOfRiM/C0CbVuQF4FiZ3c4TdBQEEOGE/+Xczdlrd5cPn7S3fyU2V+tDZ5aOXQoWZtz1JbYciLQVhCDipgfKo/u+fVw+en7m+nj28xsIN4ZP69ZWfvI+SfvP2pd5viZeb26qkK+Ng2j9QDh/9sZa/3EBBYszYXW8pz4XOz4Jd4d/GeUqxbAyFnkBiHS0ozhueQEAZ7shShs7uYcGoHN92XytFCd7SEDCrG22HB23lNk1dlK0/TcawG/PIwVYE5CYvQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMiswMjowMCLqv8IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzIrMDI6MDBTtwd+AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.cue-aquitaine.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CUEA - Communauté d'universités et d'établissements d'Aquitaine</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>
-					      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>
-    </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-POST" Location="https://fed.id.univ-bordeaux.fr/idp_ubx/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fed.id.univ-bordeaux.fr/idp_ubx/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CUEA - Communauté d'universités et d'établissements d'Aquitaine</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CUEA - Communauté d'universités et d'établissements d'Aquitaine</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cue-aquitaine.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>ssr@univ-bordeaux.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml
deleted file mode 100644
index 18c52997..00000000
--- a/swamid-interfederations-2.0/fed.nebraska.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,65 +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://fed.nebraska.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">nebraska.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVANWxMfp7iqhLfgIoE4ybKObKMdNvMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGZlZC5uZWJyYXNrYS5lZHUwHhcNMTUxMTIzMjAyMDIy
-WhcNMzUxMTIzMjAyMDIyWjAbMRkwFwYDVQQDDBBmZWQubmVicmFza2EuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgaxH5xLCYFKK9hrcIqMRG6nF
-F0ejQeH+x6QoBUhJzuyj3dCBt8rzj119jNjlxXSC3h4eH6HtdkeyeNXa9goT30C6
-b86ITXCLeC+goMlMuWQhNBj/vlfTRes6P5g+/DDcfiwB2tMyJSwVaeVlq/zFaG2b
-Hn7G8DMqgzIbdQ58vqNljyL7q0I3tXwn/CjnS5c+9pZkPTz9wgpp8zBh/LWehuRk
-gWK5zI09ewoDoHKFqYEAvhSZl2JKXLs2652wGFlll5U5LWgnZZuXd126c2RIwAEF
-iRZ8T0A0pSxKRu4f2wU8v9IhnZmDs2ZkJ9l/3TUZ4yQHT13sYG47oo3DCNVRiQID
-AQABo2cwZTAdBgNVHQ4EFgQUGYCGTzzBmBu5yJKnzbHb5ms+TmQwRAYDVR0RBD0w
-O4IQZmVkLm5lYnJhc2thLmVkdYYnaHR0cHM6Ly9mZWQubmVicmFza2EuZWR1L2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBLe5yYldy82qoYoaroy4gp
-wQYBfQjgFRtp9bFtcwBfvKa7NHTq6kq3mmsr3fR/P70skLsB5EIe/S8rzOHdUoZX
-OXqqRE44bp2Bt62D0EUhl6eWAcOIgC7mh7xWnv15qzfBeIS58MiLf60gx0qh9O70
-TH9NsEeaYMSXcQUgTjIDHot67m1bXeM7ChxeR+lbgO2gaHj6oYWOmyqJQ0LweftD
-GqGigFGF6ju7NEECJFYw8kEkTQfT7vJQG6rrf4jPzkMcR/ffBN+8Drfpaf1KqA+l
-733uBmoqANbCQ9377rwdpNB4ps/noJ2ELOxQ5RAG9JRX3O6rBv7yaJ67UkSASCM7
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fed.nebraska.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.nebraska.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.nebraska.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Nebraska</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Nebraska</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nebraska.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>CSN IDM</md:GivenName>
-    <md:EmailAddress>csnidm@nebraska.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>CSN IDM</md:GivenName>
-    <md:EmailAddress>csnidm@nebraska.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>CSN IDM</md:GivenName>
-    <md:EmailAddress>csnidm@nebraska.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>CSN IDM</md:GivenName>
-    <md:EmailAddress>csnidm@nebraska.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml
deleted file mode 100644
index d9b4d642..00000000
--- a/swamid-interfederations-2.0/fed.nhtv.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fed.nhtv.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-08-09T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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:Description xml:lang="nl">NHTV internationaal hoger onderwijs Breda</mdui:Description>
-        <mdui:Description xml:lang="en">NHTV Breda University of Applied Sciences</mdui:Description>
-        <mdui:Logo height="48" width="78">https://static.surfconext.nl/logos/idp/nhtv.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">NHTV Breda University of Applied Sciences</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">NHTV Breda University of Applied Sciences Nationale Hogeschool voor Toerisme en Verkeer</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/d5f955107c70b084e9df9a1e8261e973"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">NHTV internationaal hoger onderwijs Breda</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NHTV Breda University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">NHTV internationaal hoger onderwijs Breda</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NHTV Breda University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.nhtv.nl</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.nhtv.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/fed.nusextra.co.uk-shibboleth.xml b/swamid-interfederations-2.0/fed.nusextra.co.uk-shibboleth.xml
deleted file mode 100644
index fa1c784b..00000000
--- a/swamid-interfederations-2.0/fed.nusextra.co.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://fed.nusextra.co.uk/shibboleth">
-  <!--
-		This is a "NUS extra Student Discount card" Shibboleth SP for NUS Services 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="2015-05-14T10:18:20Z">
-      <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://fed.nusextra.co.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">NUS extra Student Discount card</mdui:DisplayName>
-        <mdui:Description xml:lang="en">To be eligible for the NUS extra student discount card, you need to be over 16 years of age, and in full or part time education</mdui:Description>
-        <mdui:Logo height="61" width="143">https://cards.nusextra.co.uk/media/images/nhs-rb-extra-logo-blue.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6zCCAdOgAwIBAgIJAJgeZ2sQotvlMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-						BAMTDG51c2V4dHJhd2ViMzAeFw0xNDA3MjIxMTI1MTJaFw0yNDA3MTkxMTI1MTJa
-						MBcxFTATBgNVBAMTDG51c2V4dHJhd2ViMzCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAKsOIQgV+O4ecSpfdT4Xo4wosGJAPFe5Rq7NMw+qdvsNShKwaZAb
-						kPIGk1GsQMsg732uHiWvWGjGV254NV4gSBWMZ/qe4itSegoFCZCYEyJ8BNy8Itoa
-						bRLoiqj5K1H98I//nSC9Og7xFENAqSES0aeh6Ye23W64ljo02iJiwnbDqerpv6Ju
-						B61vGT7U7ftQoJr31b+uz2Ia43mG+py/GJAE9T7QEtMhwB4z+D/LuM4hVDR0dYrf
-						TCfwi3TholspuWPXy67deJebRUMoAX0aUEqjFQzTDBicND7xVMkFXiQBdzApfmwA
-						6E8aV798URhz6BNUSnBpx93zbLmsI/jQsy0CAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-						bnVzZXh0cmF3ZWIzMB0GA1UdDgQWBBRpBgrh5ihM16MMSNdIVA9LKq3gUDANBgkq
-						hkiG9w0BAQUFAAOCAQEAjVHxwsL4OW9jcgmCu7z7AecgF4pbCiA5wwGIXTvbqM2Q
-						cIFzgeqUjlxK+1XKEcH8vKItpqC5qFYXy4/Xe8Btl0RrTWI50sY5ZktGmqeuzHB1
-						xRgKkAgGmo49wm7z+ZpJdZBPnx3Ho9mw1OAuN60oZoy6yCD6qFAOblABIMKBVi1f
-						rjdUIVWJX8EboD0TrdwH22QWSnmdWe6WLcs0do27ul5AfkVPaf7qpoWa8viGtCCL
-						PyALH2n1WIsOiM+UnXC5JKaR6QMpRTFJkkV4aONwk9eQN0GcSHo89jQmUaU7w/wZ
-						xud/pMpwowhvQB7YgVq2uJQzBeJDKgnv9Kr6HfE0qw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://fed.nusextra.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fed.nusextra.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.nusextra.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.nusextra.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fed.nusextra.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.nusextra.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fed.nusextra.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fed.nusextra.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fed.nusextra.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fed.nusextra.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fed.nusextra.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">NUS Services Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NUS extra Student Discount card</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nus.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Enquiries</GivenName>
-    <EmailAddress>mailto:enquiries@nusextra.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Enquiries</GivenName>
-    <EmailAddress>mailto:enquiries@nusextra.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml
deleted file mode 100644
index f40f8606..00000000
--- a/swamid-interfederations-2.0/fed.p.lodz.pl-idp-shibboleth.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fed.p.lodz.pl/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-08-03T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">p.lodz.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lodz University of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pl">Politechnika Łódzka</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Lodz University of Technology</mdui:Description>
-        <mdui:Description xml:lang="pl">Politechnika Łódzka</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>
-MIIDHzCCAgegAwIBAgIUf92tx4MSZkG0nD2gvKf1684tQsYwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNZmVkLnAubG9kei5wbDAeFw0xNTAzMTkxMjIzNTJaFw0z
-NTAzMTkxMjIzNTJaMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQClJEvUpbTZ2twCfK6BPayJ+NOosjc+5yQQ
-82+oQPkK9AUBj3L5nG1d8S0ytNrP023FBEPHqlKrrP1IYFr6//tZMG77pz4iJkAI
-bP3ALXmd0DkDbEk5f0lZRbgicRsNUqG/XZ+YU2vptTM+qjeRN6oC4kTfy2hyT6ZT
-l0QFQudrh8DXXnC//2PcIp2LJOVpi/s0bkx17CsFe1wXKGiE+IRjxREwMPsjhZcL
-0kRyOWvNFgZJdYA7QwbwpX2r4JO9QtPJlj0r5a+AlmqFvXRrYHoZRY/xjiFsE5da
-LhA3/T/qpJTSuOLq/OAKdg7btY3NXyUVEA96YjLM7sB+3pH5f0LvAgMBAAGjYTBf
-MB0GA1UdDgQWBBSMCHpJHpAfliH4Oas5962Zaj4F9jA+BgNVHREENzA1gg1mZWQu
-cC5sb2R6LnBshiRodHRwczovL2ZlZC5wLmxvZHoucGwvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAFMj2tTRqW2cjCBtUrYQvkrbS9ThyMeskXqBlv8Z
-yuK5649zIrA3A9u/DYHum9bVf+gfvcIPfMTmBdcthMVTJIz4jD0B+Q6UdYO+YLnb
-GIHo5I6+5YcaiHG3vDJ8bwQQ0c3y2BV+xXazoPUHMQAQhw657P3zVVmXQrBL81S8
-jrKFuLnw92jEyfvJvanV5hGLq6/sFIlFYMIXjVp60rkn/jYiVRy46GPZXzyuTQfN
-wnHFEgO9IZFWIfExNj8Vs2cWxZd4P6r6D7IXbeEtPz53yfi3t28vATtQKi12JHEC
-16rusRPe4GqH6oWfMN55z6Hl6dBDSFxv0xuqLKZZQOA5sa4=
-                        </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>
-MIIDIDCCAgigAwIBAgIVALBJ54FSifljTYxqdKs9piNvZRmGMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwHhcNMTUwMzE5MTIyMzQ5WhcN
-MzUwMzE5MTIyMzQ5WjAYMRYwFAYDVQQDDA1mZWQucC5sb2R6LnBsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAht1Z4j3LNunoGUj0Xg1mVFm1pC9G2h/W
-KJx9e6hpsQNeOV164mLeDocnSPZz0sN8yMOdtPKgRp11pqjxY80Y62fbmL4Z5VzR
-S5LSPb4RwK8bDt+Y5VrpEQfahyhKn4FTv0ONx3ayQHhBkeVtwv6m5OcKbohTP4KL
-Ga//7AA1yUuSHOMsNs5Jl0+Qw+pnrqq0NdxuJNUVvpzmsy/LECw4yT1TYPtmKIT0
-BRoKFnptuAvUeuzI8X4Sk7nHPmnwkEVTCXm5KlCdRrrRAXOv75rCMnoHwlljGArW
-N8pr5Bi95j2/JTspzdD+Sd4ZJ2KL0RbLB7WJzxwdxdU2brJmzvyAHQIDAQABo2Ew
-XzAdBgNVHQ4EFgQU5pnJ2LRleP5CXaU7Q3p13pllUXQwPgYDVR0RBDcwNYINZmVk
-LnAubG9kei5wbIYkaHR0cHM6Ly9mZWQucC5sb2R6LnBsL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAqca7YchwV5OSyMoKyVAka7UJfaUiL45t4lhjx
-GQK715ftzkPITSuOnt+xrx5JHLWyw47xNIj+W+HckkhnWpeQ4QQrEAO8T63pZrUv
-H+gOYWqKOaYum0D1+CaBen29Unts9Ie9hiqFg5yUy40LG10JYZeGcYMLw4f5b+Sz
-K9z2eS9vbYBf7F2snpz/PG2XWXhh3qgQAvQfgNhlT81IjRyYZQhjFKdw+Oiklp+Z
-J25Z/5z3Qt2aL7DuQC5/9xfyPmI0K6fHnMIkpE+t9XGXLCvQgVmCzzudXLdaVIwf
-NzpyfHJJG9+8ns6iv60kTPTWKis5/IMSjcdeGmyUvDzEqs8I
-                        </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>
-MIIDHzCCAgegAwIBAgIUNXScWBo43xj5lpqlUdGPP9YZL3QwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNZmVkLnAubG9kei5wbDAeFw0xNTAzMTkxMjIzNTBaFw0z
-NTAzMTkxMjIzNTBaMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQChdv4HP1QY4J29sh1jYKp5J0NAVAOyc1wv
-MBAtrEQYoVT3QETu5380X/ZBVwpOrxUa5andF6XcNxhK3TlTj6XqbOeEboL9yGqc
-Hhu5GRFjHfTUmPKsEsuIPT7g8yVuR/kqVq7CvNkbi1hse2ZPDf0WXDmDJeG+DdXc
-txyuRtG+mn/b5/faxneH7lNgK/Vv/ciM66ezNBtjqB94QtZNmCosuHJmzuEYbwMF
-NEFLBfNeaxdu5GPnHXZJdGRcoKzYIL3f5tEKMXV0OFnE5PekRiWl1rkPgDyLgY41
-wwz5l9J1lere/jSxRTJJxXdg9KVc9CtRyCSKh41Z7jlaAP7Oy3mdAgMBAAGjYTBf
-MB0GA1UdDgQWBBTuGHz++Xnn/VzfXKWxhyTT+h9CXTA+BgNVHREENzA1gg1mZWQu
-cC5sb2R6LnBshiRodHRwczovL2ZlZC5wLmxvZHoucGwvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAFi7u1NDWSQzg9qV3Jfc6kXX/JoBYw4fD0E4dUSg
-e4Dt2jDy42Psv1lBedpDN9Z/SWCl5C9X5qFRh6aGOTC1Az/j0XNuU4l9lx4DBXyO
-8Go9+znYd2l5bLkekCh2FF/EhCCHikhG0BAzc/m3n/FI+SC+pR3noUkTFChsj/YO
-v+rTqPYf+nXDtjzxOTy7iXJewLd0AaC4cK9BeOED5RyZADtK76zhv9pkUJwK1mWr
-nneqUZTQqcy82KLNUIk6u943LlhuqCXzy/idqKydkbAMxo4ZtL6mLFIBuAgU8Tm7
-4J3XCqnActMT97Zf5r6j4RjYBhiuFU30SvNV857zAr+/noQ=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fed.p.lodz.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fed.p.lodz.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.p.lodz.pl/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.p.lodz.pl/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fed.p.lodz.pl/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fed.p.lodz.pl: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://fed.p.lodz.pl/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.p.lodz.pl/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fed.p.lodz.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.p.lodz.pl/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">p.lodz.pl</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUf92tx4MSZkG0nD2gvKf1684tQsYwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNZmVkLnAubG9kei5wbDAeFw0xNTAzMTkxMjIzNTJaFw0z
-NTAzMTkxMjIzNTJaMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQClJEvUpbTZ2twCfK6BPayJ+NOosjc+5yQQ
-82+oQPkK9AUBj3L5nG1d8S0ytNrP023FBEPHqlKrrP1IYFr6//tZMG77pz4iJkAI
-bP3ALXmd0DkDbEk5f0lZRbgicRsNUqG/XZ+YU2vptTM+qjeRN6oC4kTfy2hyT6ZT
-l0QFQudrh8DXXnC//2PcIp2LJOVpi/s0bkx17CsFe1wXKGiE+IRjxREwMPsjhZcL
-0kRyOWvNFgZJdYA7QwbwpX2r4JO9QtPJlj0r5a+AlmqFvXRrYHoZRY/xjiFsE5da
-LhA3/T/qpJTSuOLq/OAKdg7btY3NXyUVEA96YjLM7sB+3pH5f0LvAgMBAAGjYTBf
-MB0GA1UdDgQWBBSMCHpJHpAfliH4Oas5962Zaj4F9jA+BgNVHREENzA1gg1mZWQu
-cC5sb2R6LnBshiRodHRwczovL2ZlZC5wLmxvZHoucGwvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAFMj2tTRqW2cjCBtUrYQvkrbS9ThyMeskXqBlv8Z
-yuK5649zIrA3A9u/DYHum9bVf+gfvcIPfMTmBdcthMVTJIz4jD0B+Q6UdYO+YLnb
-GIHo5I6+5YcaiHG3vDJ8bwQQ0c3y2BV+xXazoPUHMQAQhw657P3zVVmXQrBL81S8
-jrKFuLnw92jEyfvJvanV5hGLq6/sFIlFYMIXjVp60rkn/jYiVRy46GPZXzyuTQfN
-wnHFEgO9IZFWIfExNj8Vs2cWxZd4P6r6D7IXbeEtPz53yfi3t28vATtQKi12JHEC
-16rusRPe4GqH6oWfMN55z6Hl6dBDSFxv0xuqLKZZQOA5sa4=
-                        </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>
-MIIDIDCCAgigAwIBAgIVALBJ54FSifljTYxqdKs9piNvZRmGMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwHhcNMTUwMzE5MTIyMzQ5WhcN
-MzUwMzE5MTIyMzQ5WjAYMRYwFAYDVQQDDA1mZWQucC5sb2R6LnBsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAht1Z4j3LNunoGUj0Xg1mVFm1pC9G2h/W
-KJx9e6hpsQNeOV164mLeDocnSPZz0sN8yMOdtPKgRp11pqjxY80Y62fbmL4Z5VzR
-S5LSPb4RwK8bDt+Y5VrpEQfahyhKn4FTv0ONx3ayQHhBkeVtwv6m5OcKbohTP4KL
-Ga//7AA1yUuSHOMsNs5Jl0+Qw+pnrqq0NdxuJNUVvpzmsy/LECw4yT1TYPtmKIT0
-BRoKFnptuAvUeuzI8X4Sk7nHPmnwkEVTCXm5KlCdRrrRAXOv75rCMnoHwlljGArW
-N8pr5Bi95j2/JTspzdD+Sd4ZJ2KL0RbLB7WJzxwdxdU2brJmzvyAHQIDAQABo2Ew
-XzAdBgNVHQ4EFgQU5pnJ2LRleP5CXaU7Q3p13pllUXQwPgYDVR0RBDcwNYINZmVk
-LnAubG9kei5wbIYkaHR0cHM6Ly9mZWQucC5sb2R6LnBsL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAqca7YchwV5OSyMoKyVAka7UJfaUiL45t4lhjx
-GQK715ftzkPITSuOnt+xrx5JHLWyw47xNIj+W+HckkhnWpeQ4QQrEAO8T63pZrUv
-H+gOYWqKOaYum0D1+CaBen29Unts9Ie9hiqFg5yUy40LG10JYZeGcYMLw4f5b+Sz
-K9z2eS9vbYBf7F2snpz/PG2XWXhh3qgQAvQfgNhlT81IjRyYZQhjFKdw+Oiklp+Z
-J25Z/5z3Qt2aL7DuQC5/9xfyPmI0K6fHnMIkpE+t9XGXLCvQgVmCzzudXLdaVIwf
-NzpyfHJJG9+8ns6iv60kTPTWKis5/IMSjcdeGmyUvDzEqs8I
-                        </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>
-MIIDHzCCAgegAwIBAgIUNXScWBo43xj5lpqlUdGPP9YZL3QwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNZmVkLnAubG9kei5wbDAeFw0xNTAzMTkxMjIzNTBaFw0z
-NTAzMTkxMjIzNTBaMBgxFjAUBgNVBAMMDWZlZC5wLmxvZHoucGwwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQChdv4HP1QY4J29sh1jYKp5J0NAVAOyc1wv
-MBAtrEQYoVT3QETu5380X/ZBVwpOrxUa5andF6XcNxhK3TlTj6XqbOeEboL9yGqc
-Hhu5GRFjHfTUmPKsEsuIPT7g8yVuR/kqVq7CvNkbi1hse2ZPDf0WXDmDJeG+DdXc
-txyuRtG+mn/b5/faxneH7lNgK/Vv/ciM66ezNBtjqB94QtZNmCosuHJmzuEYbwMF
-NEFLBfNeaxdu5GPnHXZJdGRcoKzYIL3f5tEKMXV0OFnE5PekRiWl1rkPgDyLgY41
-wwz5l9J1lere/jSxRTJJxXdg9KVc9CtRyCSKh41Z7jlaAP7Oy3mdAgMBAAGjYTBf
-MB0GA1UdDgQWBBTuGHz++Xnn/VzfXKWxhyTT+h9CXTA+BgNVHREENzA1gg1mZWQu
-cC5sb2R6LnBshiRodHRwczovL2ZlZC5wLmxvZHoucGwvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAFi7u1NDWSQzg9qV3Jfc6kXX/JoBYw4fD0E4dUSg
-e4Dt2jDy42Psv1lBedpDN9Z/SWCl5C9X5qFRh6aGOTC1Az/j0XNuU4l9lx4DBXyO
-8Go9+znYd2l5bLkekCh2FF/EhCCHikhG0BAzc/m3n/FI+SC+pR3noUkTFChsj/YO
-v+rTqPYf+nXDtjzxOTy7iXJewLd0AaC4cK9BeOED5RyZADtK76zhv9pkUJwK1mWr
-nneqUZTQqcy82KLNUIk6u943LlhuqCXzy/idqKydkbAMxo4ZtL6mLFIBuAgU8Tm7
-4J3XCqnActMT97Zf5r6j4RjYBhiuFU30SvNV857zAr+/noQ=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fed.p.lodz.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lodz University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="pl">Politechnika Łódzka</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Lodz University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">Politechnika Łódzka</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.p.lodz.pl</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Biura Obsługi Klientów Centrum Komputerowego</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:bok@p.lodz.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fed.rijnijssel.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fed.rijnijssel.nl-adfs-services-trust.xml
deleted file mode 100644
index a1f9ffe6..00000000
--- a/swamid-interfederations-2.0/fed.rijnijssel.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fed.rijnijssel.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-11T20:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Rijn IJssel</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Rijn IJssel</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Rijn IJssel</mdui:Description>
-        <mdui:Description xml:lang="en">Rijn IJssel</mdui:Description>
-        <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/rijnijssel.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Rijn IJssel ROC MBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Rijn IJssel ROC MBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/cf5f5b0f5deb378bf7901265160ff62f"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Rijn IJssel</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rijn IJssel</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surffederatie.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/fedauth.colorado.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/fedauth.colorado.edu-idp-shibboleth.xml
deleted file mode 100644
index e98a7744..00000000
--- a/swamid-interfederations-2.0/fedauth.colorado.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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://fedauth.colorado.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">colorado.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Colorado at Boulder</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of Colorado at Boulder's Identity Provider</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.colorado.edu/oit/webaccess</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.colorado.edu/oit/webaccess</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>
-MIIDOzCCAiOgAwIBAgIUISKLp/LUBR62UD3eacuMlgyq1mEwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUZmVkYXV0aC5jb2xvcmFkby5lZHUwHhcNMTEwNDA3MjEx
-OTI3WhcNMzEwNDA3MjExOTI3WjAfMR0wGwYDVQQDExRmZWRhdXRoLmNvbG9yYWRv
-LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKKfxWBCz6RGXDaM
-+Td/GX14ozBjZgctgcOOduUWf1Y6awzXJgRlC7k4LGCJZscZLsuZgfzdO6qTxDwk
-Bbk6UiwUn+dHng6DNBNpuCkUdoCEv6F5gUzZG+aR1NBWk+n565c/u/OAZKt/TgQz
-ni+zSKGR78DVu/FMrgEtFL37mGjy3qcHe9c/y4fVh+TuFpZOvK5TTMsy/OI0Jx2q
-tLL/At7Od5oWEm32UH7NtZl5qBg36SYHcDYeVkaCyCoQrFw03W3i+2Q5PUo5FwG6
-GpeAoZEn1pU1iQ4rowdgafHH8xAg7boLdsax6J02pMem732e7VXUk9pkaDewUfSl
-OwU391kCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUZmVkYXV0aC5jb2xvcmFkby5lZHWG
-K2h0dHBzOi8vZmVkYXV0aC5jb2xvcmFkby5lZHUvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFLtp54NAL/CFuBokXwZxmltg52+6MA0GCSqGSIb3DQEBBQUAA4IBAQBJ
-KfBAodCf7pfUUBo/y2htFEUEc1EVyyzLardzvxncQBY76KLQKzynkXdzynmtWWdX
-ERDsBWyM5idtMwanSXZhLBxKZ0BLx0whe0QrP26bFjD3hDc54jxWucfK7gbVkaG+
-0U07hjYazpz6YuAXQ/n4+McCnqw5vI7aEreIWH6ky5kU3+KkNuEBsuOfsPCpfhHG
-d/zUrol9WKi0oBE/3A3WluEsKobPTI+Df3UOQbWnujwquIWpR7PYqotR2BYrAuPI
-2ijwqoxQck0dHwpdffo+4STtjJN1LMGDAOgVBZEBX5HQkgt5Z9fxKHw1ok0ygPyD
-aE45z9S0D3Rt1IJs3AeI
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fedauth.colorado.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fedauth.colorado.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fedauth.colorado.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fedauth.colorado.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fedauth.colorado.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">colorado.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUISKLp/LUBR62UD3eacuMlgyq1mEwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUZmVkYXV0aC5jb2xvcmFkby5lZHUwHhcNMTEwNDA3MjEx
-OTI3WhcNMzEwNDA3MjExOTI3WjAfMR0wGwYDVQQDExRmZWRhdXRoLmNvbG9yYWRv
-LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKKfxWBCz6RGXDaM
-+Td/GX14ozBjZgctgcOOduUWf1Y6awzXJgRlC7k4LGCJZscZLsuZgfzdO6qTxDwk
-Bbk6UiwUn+dHng6DNBNpuCkUdoCEv6F5gUzZG+aR1NBWk+n565c/u/OAZKt/TgQz
-ni+zSKGR78DVu/FMrgEtFL37mGjy3qcHe9c/y4fVh+TuFpZOvK5TTMsy/OI0Jx2q
-tLL/At7Od5oWEm32UH7NtZl5qBg36SYHcDYeVkaCyCoQrFw03W3i+2Q5PUo5FwG6
-GpeAoZEn1pU1iQ4rowdgafHH8xAg7boLdsax6J02pMem732e7VXUk9pkaDewUfSl
-OwU391kCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUZmVkYXV0aC5jb2xvcmFkby5lZHWG
-K2h0dHBzOi8vZmVkYXV0aC5jb2xvcmFkby5lZHUvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFLtp54NAL/CFuBokXwZxmltg52+6MA0GCSqGSIb3DQEBBQUAA4IBAQBJ
-KfBAodCf7pfUUBo/y2htFEUEc1EVyyzLardzvxncQBY76KLQKzynkXdzynmtWWdX
-ERDsBWyM5idtMwanSXZhLBxKZ0BLx0whe0QrP26bFjD3hDc54jxWucfK7gbVkaG+
-0U07hjYazpz6YuAXQ/n4+McCnqw5vI7aEreIWH6ky5kU3+KkNuEBsuOfsPCpfhHG
-d/zUrol9WKi0oBE/3A3WluEsKobPTI+Df3UOQbWnujwquIWpR7PYqotR2BYrAuPI
-2ijwqoxQck0dHwpdffo+4STtjJN1LMGDAOgVBZEBX5HQkgt5Z9fxKHw1ok0ygPyD
-aE45z9S0D3Rt1IJs3AeI
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fedauth.colorado.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Colorado at Boulder</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Colorado at Boulder</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.colorado.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marwan Shaher</md:GivenName>
-    <md:EmailAddress>shibboleth@colorado.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kerry Havens</md:GivenName>
-    <md:EmailAddress>shibboleth@colorado.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Pregash Devasagayam</md:GivenName>
-    <md:EmailAddress>shibboleth@colorado.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fedauth.london.edu-oala-metadata.xml b/swamid-interfederations-2.0/fedauth.london.edu-oala-metadata.xml
deleted file mode 100644
index 09ab75b7..00000000
--- a/swamid-interfederations-2.0/fedauth.london.edu-oala-metadata.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://fedauth.london.edu/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for London Business School.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-27T13:03:24Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">london.edu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTjCCAjagAwIBAgIIFcy1w+ieQigwDQYJKoZIhvcNAQEFBQAwPjEfMB0GA1UE
-						CgwWTG9uZG9uIEJ1c2luZXNzIFNjaG9vbDEbMBkGA1UEAwwSZmVkYXV0aC5sb25k
-						b24uZWR1MB4XDTEzMDIyNjEzMDk0MFoXDTIzMDIyNjEzMDk0MFowPjEfMB0GA1UE
-						CgwWTG9uZG9uIEJ1c2luZXNzIFNjaG9vbDEbMBkGA1UEAwwSZmVkYXV0aC5sb25k
-						b24uZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmuoPnUfdF5F/
-						mWAfYMh6b3QPssEJRxpSepwoygicWu/BnpK2ZEJ/VhmcODjHYObT4et0XyQLSelg
-						hKZhkUbxpxpI7AeVZHthIKymXC06ihIHVtzA10jjskWmy97R0HB5NZ92taNa23kK
-						I9UEhy0+fYsf2zgbjB1X6sEMEWWGQ5mR3fiEKxL6ttyZ8+Sue1oPxnrX8rGr0wiT
-						a6HJFZwmYA7qkXpAHlQq7nPIqvYPoG3KIBubl+6iKJ0VHfiV1JQ8Zfmb13pHpjEr
-						noiTZlUm/88+EQj4TVaFaQUH/gbHrk3TOS+5s/11fhqd4QEWe2Rxl/xGcGpaGxr4
-						m114hKQKSQIDAQABo1AwTjAdBgNVHQ4EFgQU0Pk2SB/JtZVI4qSyB/cgh1R3A+Mw
-						HwYDVR0jBBgwFoAU0Pk2SB/JtZVI4qSyB/cgh1R3A+MwDAYDVR0TBAUwAwEB/zAN
-						BgkqhkiG9w0BAQUFAAOCAQEASVcMlTZG8x4IF2uXi2BIHuJLgyqHBKGi0OIZkIvX
-						sZWkXqoUDoodThj+U5HzXoDAJ3dNRmJ1fx4FKOi2elJtkWuQqk4qLUuugvND1no1
-						gPqqWJh2fP3/WoP16gK3J8k5Loq8BjpTHc8qsRuQi7keFgVTst2HolaeWBGoIJi1
-						B17UjY+cQDtzk+fdzACii21YhFEEEV0/jYQNmPlzW4LKLDOrjlvBZXfGUoh4cB6G
-						1+hOSOP088MsXmqmwytyAn9lF/V0DuHgYuUNEUiX0oUWSpqLyaWxfForagSk3yYA
-						WQo5UCat9zUgUtjVh8qsUJDnrzFRrQcRzyeWnvIRG0cd/w==
-					</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>
-						MIIDTjCCAjagAwIBAgIIFcy1w+ieQigwDQYJKoZIhvcNAQEFBQAwPjEfMB0GA1UE
-						CgwWTG9uZG9uIEJ1c2luZXNzIFNjaG9vbDEbMBkGA1UEAwwSZmVkYXV0aC5sb25k
-						b24uZWR1MB4XDTEzMDIyNjEzMDk0MFoXDTIzMDIyNjEzMDk0MFowPjEfMB0GA1UE
-						CgwWTG9uZG9uIEJ1c2luZXNzIFNjaG9vbDEbMBkGA1UEAwwSZmVkYXV0aC5sb25k
-						b24uZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmuoPnUfdF5F/
-						mWAfYMh6b3QPssEJRxpSepwoygicWu/BnpK2ZEJ/VhmcODjHYObT4et0XyQLSelg
-						hKZhkUbxpxpI7AeVZHthIKymXC06ihIHVtzA10jjskWmy97R0HB5NZ92taNa23kK
-						I9UEhy0+fYsf2zgbjB1X6sEMEWWGQ5mR3fiEKxL6ttyZ8+Sue1oPxnrX8rGr0wiT
-						a6HJFZwmYA7qkXpAHlQq7nPIqvYPoG3KIBubl+6iKJ0VHfiV1JQ8Zfmb13pHpjEr
-						noiTZlUm/88+EQj4TVaFaQUH/gbHrk3TOS+5s/11fhqd4QEWe2Rxl/xGcGpaGxr4
-						m114hKQKSQIDAQABo1AwTjAdBgNVHQ4EFgQU0Pk2SB/JtZVI4qSyB/cgh1R3A+Mw
-						HwYDVR0jBBgwFoAU0Pk2SB/JtZVI4qSyB/cgh1R3A+MwDAYDVR0TBAUwAwEB/zAN
-						BgkqhkiG9w0BAQUFAAOCAQEASVcMlTZG8x4IF2uXi2BIHuJLgyqHBKGi0OIZkIvX
-						sZWkXqoUDoodThj+U5HzXoDAJ3dNRmJ1fx4FKOi2elJtkWuQqk4qLUuugvND1no1
-						gPqqWJh2fP3/WoP16gK3J8k5Loq8BjpTHc8qsRuQi7keFgVTst2HolaeWBGoIJi1
-						B17UjY+cQDtzk+fdzACii21YhFEEEV0/jYQNmPlzW4LKLDOrjlvBZXfGUoh4cB6G
-						1+hOSOP088MsXmqmwytyAn9lF/V0DuHgYuUNEUiX0oUWSpqLyaWxfForagSk3yYA
-						WQo5UCat9zUgUtjVh8qsUJDnrzFRrQcRzyeWnvIRG0cd/w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fedauth.london.edu/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fedauth.london.edu/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">London Business School</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London Business School</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.london.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT-Library Help</GivenName>
-    <EmailAddress>mailto:help@london.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Eaton</SurName>
-    <EmailAddress>mailto:jeaton@london.edu</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 8b67a293..00000000
--- a/swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fede.supelec.fr/idp/shibboleth">
-  <md: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>
-  </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 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">CentraleSupelec</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACvklEQVQozy3M7WuVZRwH8O/1cO575z6znT2c+cQqrGkx0XBFBoKzorCiF2UWjhyJUq0i6kW+KSTqpVCDogezXmSEUKsUigSLmEKJjXDHyWakeyjruLPpjrr73Nf1u769qD/g81EUQnsPIwuqPpcVCjlTCGKDRk4AABBaowAQAIKGDhQ7NTb93tvvP/dif/lsGdYo2ADYQOtotQqEiCggEFaA8vDpDwc+BkL7klJSLBDQVBIE2sACCtoLYKSeSRzZ+oJ8e/hIEifd3Wsf2PJg0pwXgTXBiAniQpTLfJqYBghMLiKgz49NTE1dWNTS+ETflvEz46++8sbQj8fJej1CiIyBT6z1yqVWnArWw16ZqwXni22tNBj8ZvCvqWr55Mime26PZ+aHDx6qnfpd6PNdK+7qexTFJm9hm1oTRX3p4mVh6Nm86ddfzmzf9uTs2ORQ72uTw6cU6l7lXN6eG/xh61t7/LpO5bJ04M1PJsbPr9vYdd/jm9ub2/4pXzgwsNd8dnTRiqU9Tz92RbLRj77OTk+Y7q7enz5VgRwfndj37v7a7NWli5fFDcnM5Wrt6vyaZdc99XK/y9J6pVpsKX7Zt3v+2Mi9+/doAKtuveHZ53d1remsVKdn5qYDFzb2rN/1+m7/x98H1m49tGFHyqzz4Z6Kced+/s0CHkrfdEvHCy89U6lUnHNJY9JSagY4OnSidmkuaih4o+J8Q5OD9sEGQANk0LFe3NEu3pucBryHvW3nI/nlLYUbl7S2lY59d1xytrT6ZgQykCSdcyRJIcVJeo2BlIzZ5Bfff7Whdy9W7eu8n9VZkPQ+hP8Qmabp/4WXlPR/Xvyg8c53sPLzlQ+NHDxMOkvSGEXSiVhjozh2WRZF0TWjYwbGtuPu9fnV19/Rv80uLzlAkQKApFJKGIzSgCapqBCQWSiIJjWUgqHCv7+Yh4VmWcYlAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMyKzAyOjAwIuq/wgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMiswMjowMFO3B34AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">www.supelec.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Teachers, Researchers, Staff, Students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CentraleSupelec</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Enseignants, Chercheurs, Personnels, Etudiants</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://fede.supelec.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fede.supelec.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fede.supelec.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">supelec.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fede.supelec.fr/idp/profile/SAML1/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">CentraleSupelec</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CentraleSupelec</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">www.supelec.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Laura NEGRE</md:SurName>
-    <md:EmailAddress>laura.negre@supelec.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Thibault LE MEUR</md:SurName>
-    <md:EmailAddress>thibault.lemeur@supelec.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 978e56d8..00000000
--- a/swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://federacao.ifpi.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDfjCCAmYCAQAwDQYJKoZIhvcNAQEFBQAwgYQxKjAoBgNVBAoTIUlGUEkgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBQaWF1aTE1MDMGA1UECxMsRFNJIC0gRGVwYXJ0
-YW1lbnRvIGRlIFNpc3RlbWFzIGRlIEluZm9ybWFjYW8xCzAJBgNVBAYTAkJSMRIw
-EAYDVQQDEwlmZWRlcmFjYW8wHhcNMTUwNjI5MTMzOTEwWhcNMjAwNjI3MTMzOTEw
-WjCBhDEqMCgGA1UEChMhSUZQSSAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBpYXVp
-MTUwMwYDVQQLEyxEU0kgLSBEZXBhcnRhbWVudG8gZGUgU2lzdGVtYXMgZGUgSW5m
-b3JtYWNhbzELMAkGA1UEBhMCQlIxEjAQBgNVBAMTCWZlZGVyYWNhbzCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM+X6ZVCrx5gqcXZXUuiC5ermIFV+dcD
-d/6BEQN4ufvSfALSdZCOhFuCB2OBn1PZkGKYLMiP9uhsaYFQrNPdX7sNwJahZRni
-mwbbd9YZuyAp5JN/DFcVxYIDtDy9Xo52pLBteqnNJuW8gWZaGUwivk8sG4IfXKuy
-Rf6HauEKvwF8S63cxGG+cWEpr3OXYyhQQGpPq0AgrT/zwXEXBKUGCgWECjgV0xII
-09RGfkm+HedznbHuJc5U0J+rUneiUiTaDH9cUjG+nVuBsMRy+4aeZEolO5MN/Vr7
-iRP+y5omLysxRCvOs77sR/mNlnC8vJr+Y74YFz4I3edxsQ2coBJksasCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAwQeE45+X5mob5JMepmQIhYnvvGDzvXm9PzibwjOl
-kj2495dOJEBUWr8x4l1v2HQFskYHbJJ+IX3iwGJe24BsNRhMtPLnjzerxTf4b3Fh
-NrmblePXRc1J/afM6izKW+6prA+CH/PjFQWoBhaovAw0geIxy3ifMC0bfY+EzP2J
-6h8ACaArC/ijbcZDNMzV9nagmcKU4VV7jg+ukOlRi5mtdH1lsGaGxpgir8XEQnqo
-KjkOt2sgGsztHeEh0Rqrl63hfbhEbjVlS/6Kk8zswqajv9JP5CQJvOS++0cCLDth
-r2EfWf4VYisA5F7ZTqR7zLeM5UJsVRGzFd829PmkESFgrQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://federacao.ifpi.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federacao.ifpi.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federacao.ifpi.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federacao.ifpi.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDfjCCAmYCAQAwDQYJKoZIhvcNAQEFBQAwgYQxKjAoBgNVBAoTIUlGUEkgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBQaWF1aTE1MDMGA1UECxMsRFNJIC0gRGVwYXJ0
-YW1lbnRvIGRlIFNpc3RlbWFzIGRlIEluZm9ybWFjYW8xCzAJBgNVBAYTAkJSMRIw
-EAYDVQQDEwlmZWRlcmFjYW8wHhcNMTUwNjI5MTMzOTEwWhcNMjAwNjI3MTMzOTEw
-WjCBhDEqMCgGA1UEChMhSUZQSSAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFBpYXVp
-MTUwMwYDVQQLEyxEU0kgLSBEZXBhcnRhbWVudG8gZGUgU2lzdGVtYXMgZGUgSW5m
-b3JtYWNhbzELMAkGA1UEBhMCQlIxEjAQBgNVBAMTCWZlZGVyYWNhbzCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM+X6ZVCrx5gqcXZXUuiC5ermIFV+dcD
-d/6BEQN4ufvSfALSdZCOhFuCB2OBn1PZkGKYLMiP9uhsaYFQrNPdX7sNwJahZRni
-mwbbd9YZuyAp5JN/DFcVxYIDtDy9Xo52pLBteqnNJuW8gWZaGUwivk8sG4IfXKuy
-Rf6HauEKvwF8S63cxGG+cWEpr3OXYyhQQGpPq0AgrT/zwXEXBKUGCgWECjgV0xII
-09RGfkm+HedznbHuJc5U0J+rUneiUiTaDH9cUjG+nVuBsMRy+4aeZEolO5MN/Vr7
-iRP+y5omLysxRCvOs77sR/mNlnC8vJr+Y74YFz4I3edxsQ2coBJksasCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAwQeE45+X5mob5JMepmQIhYnvvGDzvXm9PzibwjOl
-kj2495dOJEBUWr8x4l1v2HQFskYHbJJ+IX3iwGJe24BsNRhMtPLnjzerxTf4b3Fh
-NrmblePXRc1J/afM6izKW+6prA+CH/PjFQWoBhaovAw0geIxy3ifMC0bfY+EzP2J
-6h8ACaArC/ijbcZDNMzV9nagmcKU4VV7jg+ukOlRi5mtdH1lsGaGxpgir8XEQnqo
-KjkOt2sgGsztHeEh0Rqrl63hfbhEbjVlS/6Kk8zswqajv9JP5CQJvOS++0cCLDth
-r2EfWf4VYisA5F7ZTqR7zLeM5UJsVRGzFd829PmkESFgrQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.ifpi.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.ifpi.edu.br:8443/idp/profile/SAML1/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">IFPI - Instituto Federal do Piaui</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFPI - Instituto Federal do Piaui</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFPI - Instituto Federal do Piaui</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifpi.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifpi.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Tercio de Andrade Oliveira</md:SurName>
-    <md:EmailAddress>tercio@ifpi.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b334a380..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
-VQQDEwlmZWRlcmFjYW8wHhcNMTMwOTE5MTkwMjQ3WhcNMTYwOTE4MTkwMjQ3WjBS
-MQwwCgYDVQQLEwNEVEkxETAPBgNVBAcTCFRlcmVzaW5hMQ4wDAYDVQQIEwVQaWF1
-aTELMAkGA1UEBhMCQlIxEjAQBgNVBAMTCWZlZGVyYWNhbzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL6WD4nwp9wfYcla0witeybjoo6iz3U18b3KrL2I
-N/3TbV4OxfOsaKQmDbZVytYvkyJ91+VDtsvKG4D47+K/aohhTfFv/zdaxEkmNl1S
-SsFm/LKJ6pedhxSJBy17Nsux32Wwd/qPA/PHNd5w38oAS7N5/Jz8L1GncoQkYkmY
-WQJSb7oKX3iz01bEdE1+loIufz1Rhl2mcOGEsQMv6vebCXHfB3PePfz9wsPHYUgB
-+pP2MHK55Ickhq8TSunwwSMCn4nmfmKxTGnB6DHN2ldpHn/AKCqejt7Ujrlcln+m
-+l+26S6uJX127osxd5Z4OLmdDKnkTm2rjMYuM401U7vlmg8CAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAWJvSItiXe351xSBHDmgbqLT8TbfTS7ya6oyB0iYX+7HFuFId
-raR9TmrREGWAVWQnZxWfuSfWiMeQoXkbr11fBfwPoG9qGfnvSIJhMTjaZ3V9Gu1+
-0zYd+zTRCO2G6g0vwZVaZVxHAk35Exi/QhzkZGz48AxtF3ITyfg7LeSTCi4/TnGz
-dB6kCv6zmt/ZtHI98svAT09Z6RWb3gtjqNF/zAh62j88gSbpPAk4YDw1PDAXqZ2a
-UcLDw6GJMd9wJqJvZyIcnkvNhtAkNIQYGZ5OEJXU+DVi93xJREV4dSWseO4HdiZL
-EOj5nh15vIZwJttVa12rhNR/X/waxq6KDECUfA==
-            </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
-VQQDEwlmZWRlcmFjYW8wHhcNMTMwOTE5MTkwMjQ3WhcNMTYwOTE4MTkwMjQ3WjBS
-MQwwCgYDVQQLEwNEVEkxETAPBgNVBAcTCFRlcmVzaW5hMQ4wDAYDVQQIEwVQaWF1
-aTELMAkGA1UEBhMCQlIxEjAQBgNVBAMTCWZlZGVyYWNhbzCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL6WD4nwp9wfYcla0witeybjoo6iz3U18b3KrL2I
-N/3TbV4OxfOsaKQmDbZVytYvkyJ91+VDtsvKG4D47+K/aohhTfFv/zdaxEkmNl1S
-SsFm/LKJ6pedhxSJBy17Nsux32Wwd/qPA/PHNd5w38oAS7N5/Jz8L1GncoQkYkmY
-WQJSb7oKX3iz01bEdE1+loIufz1Rhl2mcOGEsQMv6vebCXHfB3PePfz9wsPHYUgB
-+pP2MHK55Ickhq8TSunwwSMCn4nmfmKxTGnB6DHN2ldpHn/AKCqejt7Ujrlcln+m
-+l+26S6uJX127osxd5Z4OLmdDKnkTm2rjMYuM401U7vlmg8CAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAWJvSItiXe351xSBHDmgbqLT8TbfTS7ya6oyB0iYX+7HFuFId
-raR9TmrREGWAVWQnZxWfuSfWiMeQoXkbr11fBfwPoG9qGfnvSIJhMTjaZ3V9Gu1+
-0zYd+zTRCO2G6g0vwZVaZVxHAk35Exi/QhzkZGz48AxtF3ITyfg7LeSTCi4/TnGz
-dB6kCv6zmt/ZtHI98svAT09Z6RWb3gtjqNF/zAh62j88gSbpPAk4YDw1PDAXqZ2a
-UcLDw6GJMd9wJqJvZyIcnkvNhtAkNIQYGZ5OEJXU+DVi93xJREV4dSWseO4HdiZL
-EOj5nh15vIZwJttVa12rhNR/X/waxq6KDECUfA==
-                    
-            </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-idp-shibboleth.xml b/swamid-interfederations-2.0/federacao.uvanet.br-idp-shibboleth.xml
deleted file mode 100644
index 57e21e3e..00000000
--- a/swamid-interfederations-2.0/federacao.uvanet.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://federacao.uvanet.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxMzAxBgNVBAoTKlVWQSAtIFVu
-aXZlcnNpZGFkZSBFc3RhZHVhbCBWYWxlIGRvIEFjYXJhdTExMC8GA1UECxMoTlRJ
-IC0gTnVjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEcMBoGCSqGSIb3
-DQEJARYNbmV0QHV2YW5ldC5icjEPMA0GA1UEBxMGU29icmFsMQ4wDAYDVQQIEwVD
-ZWFyYTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2ZlZGVyYWNhby51dmFuZXQuYnIw
-HhcNMTUwMzEyMTMwNDEwWhcNMjAwMzEwMTMwNDEwWjCB0jEzMDEGA1UEChMqVVZB
-IC0gVW5pdmVyc2lkYWRlIEVzdGFkdWFsIFZhbGUgZG8gQWNhcmF1MTEwLwYDVQQL
-EyhOVEkgLSBOdWNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMRwwGgYJ
-KoZIhvcNAQkBFg1uZXRAdXZhbmV0LmJyMQ8wDQYDVQQHEwZTb2JyYWwxDjAMBgNV
-BAgTBUNlYXJhMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTZmVkZXJhY2FvLnV2YW5l
-dC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANf14teRlGxARJy4
-xAUTpiaD1fwn9br3YvfOdqBZ+fPtFYj8CmgBlfauRVl9irPrFgbUfIsZckl+EY8f
-XgipRAkQAEAqZn7pNXQBuEXA4QaUVl6mqrqPM/gjNE3QZ5iObqXgdpF9ppKgeNnb
-ZhOJNsM6IJNYly/DiVXsRTCo/O2gssnD2Wz09jsTSCKucniL8WhbcuSSzJKfS7sV
-RRyIsOY8sRWL2JSHPIVb/BgZhKKQQfcjWjLH7CNzr0/tXWX7cEr/pUGKLUdXhAps
-hNAA5eUKj2b+n6Kck07oT+SDyq2amK3ofV6vymoOk3uJeVLw2+dfrdIcEarqbDro
-9qNTX8UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEADuOfAc0Gkul/Xb0J2P1LVxmu
-nmdnhkqrwOmMmv7RGGqhg/9bH5KegefafBJHsiQ7riaQS4k60TdVTnibp7RS+oJ6
-Qq1HONm6AVDjsAfBGqW5Gq+eEkFY7p53AY0/J9Wkr02z5F/S/84LRVzyurNKYPg3
-vwErvtUmZbGU6bODq04rhx0uQc6kncNv0Tmpe+XNXGyoBVnpxBK7Gek+iMG5wDSF
-qBKXGALpFR7EnmewvoPr4Cj/GSpeZ/+L7XKgkrry2AT8FyXH5M3CZo0gpd/w7Jp5
-oScsaEokLv5uon1tBZ/ckGAFyXCOnnYQx8jCzTcUBI9cDbrBaiVRQs2ct7fiGg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.uvanet.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://federacao.uvanet.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federacao.uvanet.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federacao.uvanet.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federacao.uvanet.br/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">uvanet.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxMzAxBgNVBAoTKlVWQSAtIFVu
-aXZlcnNpZGFkZSBFc3RhZHVhbCBWYWxlIGRvIEFjYXJhdTExMC8GA1UECxMoTlRJ
-IC0gTnVjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEcMBoGCSqGSIb3
-DQEJARYNbmV0QHV2YW5ldC5icjEPMA0GA1UEBxMGU29icmFsMQ4wDAYDVQQIEwVD
-ZWFyYTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2ZlZGVyYWNhby51dmFuZXQuYnIw
-HhcNMTUwMzEyMTMwNDEwWhcNMjAwMzEwMTMwNDEwWjCB0jEzMDEGA1UEChMqVVZB
-IC0gVW5pdmVyc2lkYWRlIEVzdGFkdWFsIFZhbGUgZG8gQWNhcmF1MTEwLwYDVQQL
-EyhOVEkgLSBOdWNsZW8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMRwwGgYJ
-KoZIhvcNAQkBFg1uZXRAdXZhbmV0LmJyMQ8wDQYDVQQHEwZTb2JyYWwxDjAMBgNV
-BAgTBUNlYXJhMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTZmVkZXJhY2FvLnV2YW5l
-dC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANf14teRlGxARJy4
-xAUTpiaD1fwn9br3YvfOdqBZ+fPtFYj8CmgBlfauRVl9irPrFgbUfIsZckl+EY8f
-XgipRAkQAEAqZn7pNXQBuEXA4QaUVl6mqrqPM/gjNE3QZ5iObqXgdpF9ppKgeNnb
-ZhOJNsM6IJNYly/DiVXsRTCo/O2gssnD2Wz09jsTSCKucniL8WhbcuSSzJKfS7sV
-RRyIsOY8sRWL2JSHPIVb/BgZhKKQQfcjWjLH7CNzr0/tXWX7cEr/pUGKLUdXhAps
-hNAA5eUKj2b+n6Kck07oT+SDyq2amK3ofV6vymoOk3uJeVLw2+dfrdIcEarqbDro
-9qNTX8UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEADuOfAc0Gkul/Xb0J2P1LVxmu
-nmdnhkqrwOmMmv7RGGqhg/9bH5KegefafBJHsiQ7riaQS4k60TdVTnibp7RS+oJ6
-Qq1HONm6AVDjsAfBGqW5Gq+eEkFY7p53AY0/J9Wkr02z5F/S/84LRVzyurNKYPg3
-vwErvtUmZbGU6bODq04rhx0uQc6kncNv0Tmpe+XNXGyoBVnpxBK7Gek+iMG5wDSF
-qBKXGALpFR7EnmewvoPr4Cj/GSpeZ/+L7XKgkrry2AT8FyXH5M3CZo0gpd/w7Jp5
-oScsaEokLv5uon1tBZ/ckGAFyXCOnnYQx8jCzTcUBI9cDbrBaiVRQs2ct7fiGg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.uvanet.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.uvanet.br:8443/idp/profile/SAML1/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">UVA - Universidade Estadual Vale do Acarau</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UVA - Universidade Estadual Vale do Acarau</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uvanet.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.uvanet.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Pedro Roger Magalhaes Vasconcelos</md:SurName>
-    <md:EmailAddress>roger@uvanet.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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/federatedaccess.hrc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/federatedaccess.hrc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 1751e98b..00000000
--- a/swamid-interfederations-2.0/federatedaccess.hrc.ac.uk-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://federatedaccess.hrc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth Test IdP for Hertford Regional College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-11T17:18:34Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">hrc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVAOg3Fb090dB9p32MB4EgjYEXyiOxMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMudWswHhcNMTMw
-						NzA2MDcyMjMxWhcNMzMwNzA2MDcyMjMxWjAkMSIwIAYDVQQDExlmZWRlcmF0ZWRh
-						Y2Nlc3MuaHJjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						koOul030k6LhcQ2zW3YErb4osJQwvj7gskGciL2HdKH/BKI1EFOqfayB3QKS7cJ6
-						ekdeHdkhhwamDnXGW2IZO3xaeGXiebT9vy/m3bi3VScUZsydhCC5vZ6vKJHqA2aN
-						qWPH6uNqS9D9X+BXQ1Yaa0zaB671M1gbZ9TwCP473+jtBjRh3b5LaNh41MbOJ4xk
-						7UyQvG1Q2tiO1+0OfBnjen3cKnL2u8HrKXq0aZFV1FXmL/S/C7RSlXp3+FX3+VZa
-						Pn/jlBBQHn7j8hEoQ3KkrnO7PFIiD4szmm40ubKk9m1iR3JKu8wsP/wkFll1MCxq
-						3QDeoo8c6I/RHgIa7zzHgQIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0ZWRh
-						Y2Nlc3MuaHJjLmFjLnVrhjBodHRwczovL2ZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB7hyBviehtzOyJTo/85hiqrmtaS
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCPwEmDe/HVq9orxzy9lS7qYg4tte2dqJHpsLD+
-						AxcI5Uamg1/7IbuG5P6r9gPgdVzB1qo5DWaXbJSo8wY+003v2kvdXYK2x0/85DZ4
-						dtkftolCrgwGJqeEePUV4TWCoihdSjaqr7/0Qe27nZi83hNjy3OipfMm/lDZQDgB
-						3mIg0IbbBXVh4BjnnaJZqGj7qqhCJduCaU0hUK1cvb31Po/Ub+8fqmobstCFxcw4
-						6YExHZsPvcbWhVk8bZEn1bBKjXlozIL46pATE/ApTj955UAocZs/0HeTbPTszOjM
-						2+lio+vkIsRiGCzd1QgB/JmMbZ3I0016UR31P7+M5AaOiJ0s
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federatedaccess.hrc.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://federatedaccess.hrc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federatedaccess.hrc.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">hrc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVAOg3Fb090dB9p32MB4EgjYEXyiOxMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMudWswHhcNMTMw
-						NzA2MDcyMjMxWhcNMzMwNzA2MDcyMjMxWjAkMSIwIAYDVQQDExlmZWRlcmF0ZWRh
-						Y2Nlc3MuaHJjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						koOul030k6LhcQ2zW3YErb4osJQwvj7gskGciL2HdKH/BKI1EFOqfayB3QKS7cJ6
-						ekdeHdkhhwamDnXGW2IZO3xaeGXiebT9vy/m3bi3VScUZsydhCC5vZ6vKJHqA2aN
-						qWPH6uNqS9D9X+BXQ1Yaa0zaB671M1gbZ9TwCP473+jtBjRh3b5LaNh41MbOJ4xk
-						7UyQvG1Q2tiO1+0OfBnjen3cKnL2u8HrKXq0aZFV1FXmL/S/C7RSlXp3+FX3+VZa
-						Pn/jlBBQHn7j8hEoQ3KkrnO7PFIiD4szmm40ubKk9m1iR3JKu8wsP/wkFll1MCxq
-						3QDeoo8c6I/RHgIa7zzHgQIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0ZWRh
-						Y2Nlc3MuaHJjLmFjLnVrhjBodHRwczovL2ZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB7hyBviehtzOyJTo/85hiqrmtaS
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCPwEmDe/HVq9orxzy9lS7qYg4tte2dqJHpsLD+
-						AxcI5Uamg1/7IbuG5P6r9gPgdVzB1qo5DWaXbJSo8wY+003v2kvdXYK2x0/85DZ4
-						dtkftolCrgwGJqeEePUV4TWCoihdSjaqr7/0Qe27nZi83hNjy3OipfMm/lDZQDgB
-						3mIg0IbbBXVh4BjnnaJZqGj7qqhCJduCaU0hUK1cvb31Po/Ub+8fqmobstCFxcw4
-						6YExHZsPvcbWhVk8bZEn1bBKjXlozIL46pATE/ApTj955UAocZs/0HeTbPTszOjM
-						2+lio+vkIsRiGCzd1QgB/JmMbZ3I0016UR31P7+M5AaOiJ0s
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federatedaccess.hrc.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">Hertford Regional College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hertford Regional College - Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hrc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Denis</GivenName>
-    <SurName>Featherstone</SurName>
-    <EmailAddress>mailto:dfeatherstone@hrc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Denis</GivenName>
-    <SurName>Featherstone</SurName>
-    <EmailAddress>mailto:dfeatherstone@hrc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml
deleted file mode 100644
index 1dbaa255..00000000
--- a/swamid-interfederations-2.0/federatie.clusius.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federatie.clusius.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-23T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Clusius College (old)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Clusius College (old)</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Clusius College</mdui:Description>
-        <mdui:Description xml:lang="en">Clusius College</mdui:Description>
-        <mdui:Logo height="37" width="108">https://static.surfconext.nl/logos/idp/clusius.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Clusius College MBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Clusius College MBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/47d9881f7198a3e15644c76503f0402d"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Clusius College (old)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Clusius College (old)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surffederatie.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/federatie.driestar-educatief.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.driestar-educatief.nl-adfs-services-trust.xml
deleted file mode 100644
index 981a2434..00000000
--- a/swamid-interfederations-2.0/federatie.driestar-educatief.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federatie.driestar-educatief.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-24T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Driestar Educatief</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Driestar Educatief</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Driestar Educatief</mdui:Description>
-        <mdui:Description xml:lang="en">Driestar Educatief</mdui:Description>
-        <mdui:Logo height="108" width="120">https://static.surfconext.nl/media/idp/driestar.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">Driestar Educatief HBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Driestar Educatief HBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/ebc22074669e3e895bbb22bdf6d5c6da"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Driestar Educatief</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Driestar Educatief</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.driestar-educatief.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/federatie.graafschapcollege.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.graafschapcollege.nl-adfs-services-trust.xml
deleted file mode 100644
index 11f07ad2..00000000
--- a/swamid-interfederations-2.0/federatie.graafschapcollege.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federatie.graafschapcollege.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-08T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Graafschap College</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Graafschap College</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Graafschap College</mdui:Description>
-        <mdui:Description xml:lang="en">Graafschap College</mdui:Description>
-        <mdui:Logo height="24" width="108">https://static.surfconext.nl/logos/idp/graafschapcollege.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">graafschap college mbo</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">graafschap college mbo</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/c1d4b6678ee39120711a03bb88ac3d7f"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Graafschap College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Graafschap College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.graafschapcollege.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/federatie.lumc.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.lumc.nl-adfs-services-trust.xml
deleted file mode 100644
index ce18d2f6..00000000
--- a/swamid-interfederations-2.0/federatie.lumc.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federatie.lumc.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-06T13:42:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Leids Universitair Medisch Centrum</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Leids Universitair Medisch Centrum</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Leids Universitair Medisch Centrum</mdui:Description>
-        <mdui:Description xml:lang="en">Leids Universitair Medisch Centrum</mdui:Description>
-        <mdui:Logo height="70" width="280">https://static.surfconext.nl/logos/idp/lumc-logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">UMC lumc Leids Universitair Medisch Centrum Ziekenhuis</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">UMC lumc Leids Universitair Medisch Centrum Ziekenhuis</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/65b0296020f1f17d969eb6dbe232c4b1"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Leids Universitair Medisch Centrum</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Leids Universitair Medisch Centrum</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lumc.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/federatie.trimbos.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.trimbos.nl-adfs-services-trust.xml
deleted file mode 100644
index 02702959..00000000
--- a/swamid-interfederations-2.0/federatie.trimbos.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federatie.trimbos.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-15T20:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Trimbos Instituut</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Trimbos Instituut</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Trimbos Instituut</mdui:Description>
-        <mdui:Description xml:lang="en">Trimbos Instituut</mdui:Description>
-        <mdui:Logo height="34" width="108">https://static.surfconext.nl/logos/idp/trimbos.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Trimbos Instituut</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Trimbos Instituut</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/54fc1218e61c75e7734f563802e8c467"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Trimbos Instituut</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Trimbos Instituut</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.trimbos.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/federatie.umcn.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federatie.umcn.nl-adfs-services-trust.xml
deleted file mode 100644
index d92f06c4..00000000
--- a/swamid-interfederations-2.0/federatie.umcn.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federatie.umcn.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-12-11T14:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Radboudumc</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Radboudumc</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Radboudumc</mdui:Description>
-        <mdui:Description xml:lang="en">Radboudumc</mdui:Description>
-        <mdui:Logo height="300" width="500">https://static.surfconext.nl/logos/idp/Radboudumc.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="en">UMC St Radboud UMCN Radboudumc</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">UMC St Radboud UMCN Radboudumc</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/6e54255933dcf152086180366e8bf0d4"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Radboudumc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Radboudumc</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umcn.nl/Pages/default.aspx</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/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 54f46f12..00000000
--- a/swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation-identite.univ-paris13.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAXElEQVQY02P4DwTnf/+HAwYQseI/mkA7ukASuoD1FzQB+bNoAqq9aAIhVmgCcxkuoQq84E5CFfhfyXAOVeCdoiuqwP/THJ2oAv93C61CFfh/yX0NqsD/T3N2gigAi3XtGsHbROAAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDgrMDI6MDBjnYKrAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQ4KzAyOjAwEsA6FwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-paris13.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://federation-identite.univ-paris13.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation-identite.univ-paris13.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation-identite.univ-paris13.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université Paris 13</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Paris 13</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-paris13.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-contact@univ-paris13.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.ac-strasbourg.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.ac-strasbourg.fr-idp-shibboleth.xml
deleted file mode 100644
index fcd62c48..00000000
--- a/swamid-interfederations-2.0/federation.ac-strasbourg.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.ac-strasbourg.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-05-19T17:24:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-strasbourg.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rectorat de Strasbourg</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACRElEQVQoz12SS0hUARSGvztzc0rT0RIZ0KDXxkUtRNCwCMpUEh/JaERNJQoJmVGiYCgOJgmFLRRsF8FEFhRaYVGU0ULC3uIYRZYmg+ZzKh/N6L33tBjN0cPZnf/nP//5j2KIxspSUOYXjKTUi6qqOPJ3lZWkC/ry2BBtVYvI7XtdkLcns05EZOVUWaWgYAZedvWNT0zYc/aCCEYwQA2CmkB50tnT/qDbM/on1LJmZHT2cN7umOiI4JUWFRTMQ57JlIxLnr4BYmPt+7dNeec6H7rB19hceL40a5ljiCZijE54oZCoEvdnjyyVZkh1/R3IuVB3S0QCHgIESUp1QpF/Qa+pbwUHnIDjkO2b1y833YfcNx/6AxyTgrn7/UD3s97WuydDVJMCYC4uTa5ypp0uz/L5/BVnsgmJaWp57F/QFBQTcKXpEVjSUxMC3gFr+NrNcRt3xMdZw9cBTuc+V6u71/0DFBXoH5oENcoaCiCwQW1seAE+4FRRBmCLsTIzOz3zl4BCSuIW8HuGvYsKU762jrM/x65/G2wxRAc+fRlmU1R0dCQIIvrIyG+wNzS2iUhVrQsccBQKIH3SOzPnmwdHVe3NwOVUQWy2iIqa3Kpy18G0BHtucqwt0mJRFZPJ0HSrNSzfcRX858qyQSSQg27ohkh8UiXkNTa3e3/NBXJ41/N9e2IlHOp4+lZENH0pB03XRHRDpKLaBflQAMVwBOxhW8s+ugf/p7bi+RQUMI2NT1+78fzV669RkeuPFaRkHtgpQNAv/QPZiFp8RlnKfQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozNCswMjowMK744cYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzQrMDI6MDDfpVl6AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ac-strasbourg.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Rectorat de Strasbourg - federation.ac-strasbourg.fr</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Rectorat de Strasbourg</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Rectorat de Strasbourg - federation.ac-strasbourg.fr</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>
-					      MIIDVzCCAj+gAwIBAgIULlCyoAcZI1HxSV9f9eQvrbmdBYswDQYJKoZIhvcNAQEF
-BQAwJjEkMCIGA1UEAwwbZmVkZXJhdGlvbi5hYy1zdHJhc2JvdXJnLmZyMB4XDTE1
-MDUyMDA5MjA1MloXDTM1MDUyMDA5MjA1MlowJjEkMCIGA1UEAwwbZmVkZXJhdGlv
-bi5hYy1zdHJhc2JvdXJnLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAhcao293f12SLrge+tM0jp4KWGfpR8PpGFcqgtyIO+o14cmrvCzXaCnMxIZrW
-XELpU6cg0NVYSkW3ECab3TQwCOLjRe/rQjFy/DrOXSMTZv1gv+H5f6bItEfsQXLF
-60gG/P+xvQVZeUMONq96DZdiUO5q81vQQE9li7Vc/DB11aTUFFcc8IVWe4MAmtBw
-boVb24xv/J9T9N5rsXHLfvUwqIKB87ULl4LEja6eNnKBCi1VR/kD1asZCip7r6SJ
-RFYDUni3NNJB6Lt+eGjxQxmXTR8CiEW80UyrvfkNI+mkuza1RzGugDD6yuRE9Sxc
-N6WkBC72JO2o6L0FK2p4Xmg97wIDAQABo30wezAdBgNVHQ4EFgQUrFJ5ZGA8dmDW
-BM9QyEUPnSFehaowWgYDVR0RBFMwUYIbZmVkZXJhdGlvbi5hYy1zdHJhc2JvdXJn
-LmZyhjJodHRwczovL2ZlZGVyYXRpb24uYWMtc3RyYXNib3VyZy5mci9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEANKeYwcZkLwQdMoI+N1HGbjaveP3e
-c125LM3ld8vBUvLOjFEz2g+MbF+jMWAWY5DXoppOc0at6/TZYgfGvee3bPh2yp9j
-cNeHOhnl5DbC7R2cmnKmNkjWHQQzTMWPNWk6aTkHvAnkNK1CzznG8E2mYxcvFIMC
-DWZztDybb/yrC7h+ZnOueklkpS++ukQ4aRmZn+4ubt0JsykFC4HEwJIXCunR1+Dn
-t+li2DFtfZBGRZT0sHiadFDVzKX6Cau/wbgJpqg1nVj0pzaYjm2aeagbgTOq7Huf
-IPwBlW0WM1jfpoYm5KZjJgGBEzQL19k+CM8uBkdlCzgbjvMx+aNDdnMmvA==
-					    </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-POST" Location="https://federation.ac-strasbourg.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.ac-strasbourg.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.ac-strasbourg.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Rectorat de Strasbourg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rectorat de Strasbourg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ac-strasbourg.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Equipe Infrastructures</md:SurName>
-    <md:EmailAddress>idp@ac-strasbourg.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 bea57c02..00000000
--- a/swamid-interfederations-2.0/federation.agrocampus-ouest.fr-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://federation.agrocampus-ouest.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">AGROCAMPUS OUEST</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACMklEQVQ4y8WTTUiUURSGn3PvN9+Mo06Naf4WaS0q7W9RmekQtQgigla1aN/CSZoIatc+MA2DXBYt3NamfdkyCMKNRgtNs8kmGcVSv+/e00IY+rFd0FkeDu+B931e+N8jmy37+u/dFSOnQTrFmBSAeo+ikwpPX40Ubm8qkLs29MzY4AKAqkdVQbVyKkYQE+Di9eL4SKGpItCXH7xijH0ixuJdXBGMnccaYT32WCt4r1gjIBYj+np8pHBUugsPW1O4We/in77BWhSzf2cjHz4v0tXRwqdSma211ZRXvpGtqebtzAImcseCRPT9FkECVFFVRARVJZNOcb73EG+mZkgnEzTWbSEMA4qlJcLA4OIYY7Q/AIkAnPdsy6RZWlljXRWvyp1Hz2nIpGlryPJubgEDZKpT1FYlsQJqZK9tO37mvQ2SA6jSvW8Xswtl8hdPUVosc+7EAarCgO7OdtLJBOlkwM7tdexuaWBiep6EkUgAcvnhMW/M5a4d9cx/XSJyHmsNxcVl6mqqWFxZJbSGg+3NTM19oTlbw+THEtbIdCXGXH7ohdogh4tQwFpDUzaD8x5hw9+1OMaIAEoqDIm9m/idg1GbSF71cYSqJ/YeYcPUqmSCPa31BEHA8soqU3MlBDf2B4knB+73Wu8f2zDZ4V2MegeAAt77StKpdBoXrR7ZFGWAnvzgJSsyYMT0GJvYoBIFEUQEF0WDL0eu3/yrwC/dyA+fFXWHvZiUoMXxBzdG/1kbfwBX5ehxifHxLgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNCswMjowMAMfjYUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTQrMDI6MDByQjU5AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.agrocampus-ouest.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">AGROCAMPUS OUEST</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>
-					      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>
-    </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-POST" Location="https://federation.agrocampus-ouest.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.agrocampus-ouest.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.agrocampus-ouest.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">AGROCAMPUS OUEST</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">AGROCAMPUS OUEST</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.agrocampus-ouest.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Lionel DURANDET</md:SurName>
-    <md:EmailAddress>lionel.durandet@agrocampus-ouest.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Emmanuel DOLLÉ</md:SurName>
-    <md:EmailAddress>emmanuel.dolle@agrocampus-ouest.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 c004ee9f..00000000
--- a/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.bretagne.iufm.fr/idp/shibboleth">
-  <md: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>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bretagne.iufm.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">espe-bretagne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ESPE de Bretagne</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.espe-bretagne.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ESPE de Bretagne</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels et étudiant de l'ESPE de Bretagne</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>
-					      MIIEhDCCA2ygAwIBAgIRAPSODBFpc8g+0TGgl6Q8SN8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAyMTEwMDAwMDBaFw0xNjA0MDUyMzU5NTlaMEkxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbZmVkZXJhdGlv
-bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA0W8trO2zbN+5N30+4N+JpWEmcmUbp2wYAJB0v4rinl6MzMs007wHfKj14rKC
-5eIvkbtgzbhs/biZVvA+/Xky7TyIL/Z/34Ha1JeoYsezfmdf0qT8J2jOcuG8DVU3
-/J6Mtg9Zfz4GwNq4NFO4qx0vXZhX3LT3+8sQmPH96a9XmrPQB514Flc1mWZmZ/he
-XdTkhmu/o9/3fx2guNwjddQ9ruWalmSpTD7FSt5LMsavWfp4niATTcGXR+yQsWuG
-ULjIMfWUjmaY+0s+658WSZzD+o9sFknoQpNKjufCkEFUMQuUfFfZGJlGxZOYRhDq
-eHNFgFBHzZHXixrjge2HVA1fxQIDAQABo4IBeDCCAXQwHwYDVR0jBBgwFoAUDL2T
-aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFC4C3PlQ1bY/T8VIR4gpUtQKnfm8
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
-ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnIwDQYJKoZIhvcNAQEFBQADggEBABBedNTktIew
-Jsv/6U2BjnnBtL7+nRX5nHE5M+oqIO39NJg0iDuWNAXJK9p36C31ucuNTAYrFvQq
-vBrMiwjDwpaNCAs6/3c1J9iH8GH9r2FONFFXHGswvKhlwqE7MaQh2l/+qHs4wfRe
-nsP2N+nWD1nvxIlQvfcF5W2mZWxE5ZT73etDiilcorRvI423P5BeeRYciBa8im8A
-GrGTlcvHZkTfuZ01NQiTnXnWmghzyqug72nwj42FLThQgDdeDOrzTEKREtehNcpp
-PULGkDErBea0SdXtVN3swhySNl9Ba69OYezLZ8hdDCrcN3wPw8VGi6xDMa4ENkKL
-hjz3pTN+SFo=
-					    </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>
-					      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>
-    </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-POST" Location="https://federation.bretagne.iufm.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.bretagne.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.bretagne.iufm.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bretagne.iufm.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">espe-bretagne.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEhDCCA2ygAwIBAgIRAPSODBFpc8g+0TGgl6Q8SN8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAyMTEwMDAwMDBaFw0xNjA0MDUyMzU5NTlaMEkxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbZmVkZXJhdGlv
-bi5icmV0YWduZS5pdWZtLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA0W8trO2zbN+5N30+4N+JpWEmcmUbp2wYAJB0v4rinl6MzMs007wHfKj14rKC
-5eIvkbtgzbhs/biZVvA+/Xky7TyIL/Z/34Ha1JeoYsezfmdf0qT8J2jOcuG8DVU3
-/J6Mtg9Zfz4GwNq4NFO4qx0vXZhX3LT3+8sQmPH96a9XmrPQB514Flc1mWZmZ/he
-XdTkhmu/o9/3fx2guNwjddQ9ruWalmSpTD7FSt5LMsavWfp4niATTcGXR+yQsWuG
-ULjIMfWUjmaY+0s+658WSZzD+o9sFknoQpNKjufCkEFUMQuUfFfZGJlGxZOYRhDq
-eHNFgFBHzZHXixrjge2HVA1fxQIDAQABo4IBeDCCAXQwHwYDVR0jBBgwFoAUDL2T
-aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFC4C3PlQ1bY/T8VIR4gpUtQKnfm8
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
-ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
-UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAmBgNVHREEHzAdghtmZWRlcmF0
-aW9uLmJyZXRhZ25lLml1Zm0uZnIwDQYJKoZIhvcNAQEFBQADggEBABBedNTktIew
-Jsv/6U2BjnnBtL7+nRX5nHE5M+oqIO39NJg0iDuWNAXJK9p36C31ucuNTAYrFvQq
-vBrMiwjDwpaNCAs6/3c1J9iH8GH9r2FONFFXHGswvKhlwqE7MaQh2l/+qHs4wfRe
-nsP2N+nWD1nvxIlQvfcF5W2mZWxE5ZT73etDiilcorRvI423P5BeeRYciBa8im8A
-GrGTlcvHZkTfuZ01NQiTnXnWmghzyqug72nwj42FLThQgDdeDOrzTEKREtehNcpp
-PULGkDErBea0SdXtVN3swhySNl9Ba69OYezLZ8hdDCrcN3wPw8VGi6xDMa4ENkKL
-hjz3pTN+SFo=
-					    </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>
-					      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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.bretagne.iufm.fr/idp/profile/SAML1/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">ESPE de Bretagne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ESPE de Bretagne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.espe-bretagne.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>federation@espe-bretagne.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.bsigroup.com-oa-metadata.xml b/swamid-interfederations-2.0/federation.bsigroup.com-oa-metadata.xml
deleted file mode 100644
index ea35d5b6..00000000
--- a/swamid-interfederations-2.0/federation.bsigroup.com-oa-metadata.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://federation.bsigroup.com/oa/metadata">
-  <!--
-		This is a "Subscription Services" OpenAthens SP for British Standards Institution.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-02T13:31:55Z">
-      <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">British Standards Institution subscription services</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Access to the British Standards Institution's online standards subscription services</mdui:Description>
-        <mdui:Logo height="73" width="116">https://federationsupportdata.bsigroup.com/logo_116x73.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFITCCBAmgAwIBAgIJAOUhlNL9S5KmMA0GCSqGSIb3DQEBBQUAMIG7MQswCQYD
-						VQQGEwJVSzERMA8GA1UECBMIQ2hpc3dpY2sxDzANBgNVBAcTBkxvbmRvbjEmMCQG
-						A1UEChMdQnJpdGlzaCBTdGFuZGFyZHMgSW5zdGl0dXRpb24xETAPBgNVBAsTCEdy
-						b3VwIElUMSAwHgYDVQQDExdmZWRlcmF0aW9uLmJzaWdyb3VwLmNvbTErMCkGCSqG
-						SIb3DQEJARYcbWFyay5vJ3N1bGxpdmFuQGJzaWdyb3VwLmNvbTAeFw0xNDEwMTUx
-						MzQ2MTVaFw0yNDEwMTIxMzQ2MTVaMIG7MQswCQYDVQQGEwJVSzERMA8GA1UECBMI
-						Q2hpc3dpY2sxDzANBgNVBAcTBkxvbmRvbjEmMCQGA1UEChMdQnJpdGlzaCBTdGFu
-						ZGFyZHMgSW5zdGl0dXRpb24xETAPBgNVBAsTCEdyb3VwIElUMSAwHgYDVQQDExdm
-						ZWRlcmF0aW9uLmJzaWdyb3VwLmNvbTErMCkGCSqGSIb3DQEJARYcbWFyay5vJ3N1
-						bGxpdmFuQGJzaWdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMEYRpNo2uI1Rt7yykpMc66SqN16ona2qZihqSkhIVKOEWgiQ7UaF9W1lOeX
-						pByClRBzQkgSdOc6bJ+A+YCR4kzbkXeV96fawhhiZKeYwHgXoEq9Tg7TCkLFxs97
-						ZZXUE8IJsundnXfOJe/E4WuFFXNqxI7dLsjClIKbpweGH8/P0dpq2B54BHGlsjeQ
-						Wg2uPlt01VO9r/9VTxk/NzkomwdtbuKtKROkLIa30mEOhR+ZnsTb50hqOpBWWtia
-						QIPJlCtQ2KsnLzUCEN+Ud/CuMkNpw7mv/J0L3KYb3tktfj/ehzusXPtuEOExlRdS
-						C+nq4myT7nWaTt1wyi9vxYcmIiUCAwEAAaOCASQwggEgMB0GA1UdDgQWBBRALFY3
-						lIzStlyzGgxzFb/uCruPIDCB8AYDVR0jBIHoMIHlgBRALFY3lIzStlyzGgxzFb/u
-						CruPIKGBwaSBvjCBuzELMAkGA1UEBhMCVUsxETAPBgNVBAgTCENoaXN3aWNrMQ8w
-						DQYDVQQHEwZMb25kb24xJjAkBgNVBAoTHUJyaXRpc2ggU3RhbmRhcmRzIEluc3Rp
-						dHV0aW9uMREwDwYDVQQLEwhHcm91cCBJVDEgMB4GA1UEAxMXZmVkZXJhdGlvbi5i
-						c2lncm91cC5jb20xKzApBgkqhkiG9w0BCQEWHG1hcmsubydzdWxsaXZhbkBic2ln
-						cm91cC5jb22CCQDlIZTS/UuSpjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-						A4IBAQAaFsGT0hV9hZTchsFy4jMxCGd3XA0efbnkn95k1epRtJz4/Tk604MZ7NTa
-						XuAZEuqvyi3gxW2xSPFYg9kIjq6E00QpxqPxkytJmut28Nr7pi6TIDXcyBn/eWg1
-						9gXpvcypeEQTS8LIioyB2ipfK5Zbz7hW8NMzXdRV7sqRmH7d8v9BB46+X5SHkTab
-						84iL5r/Iivv75c/AiB2a6SsaRNNYUrlNTVrQPAlMNaYhXL9YJZ7cdzNfSYh6X/Ob
-						fLfVi10Ulv83wbOU5XAYHtsEhnOQQooohsrKEKcRDC0pkUuiOpvgloC4HxRmVrsZ
-						nQzraqnKpsGJ8Pc9j4fEJesIGB0J
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://federation.bsigroup.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://federation.bsigroup.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.bsigroup.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://federation.bsigroup.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">British Standards Institution</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">British Standards Institution subscription services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bsigroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Yaqub</GivenName>
-    <SurName>Rab</SurName>
-    <EmailAddress>mailto:Yaqub.Rab@bsigroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Yaqub</GivenName>
-    <SurName>Rab</SurName>
-    <EmailAddress>mailto:Yaqub.Rab@bsigroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.citylit.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/federation.citylit.ac.uk-shibboleth.xml
deleted file mode 100644
index 6071b9e8..00000000
--- a/swamid-interfederations-2.0/federation.citylit.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://federation.citylit.ac.uk/shibboleth">
-  <!--
-		This is an IdP for City Lit.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">citylit.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID3zCCAsegAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMRQwEgYDVQQKDAtJbnRl
-						cm5ldDJRSTEdMBsGA1UECwwUSW50ZXJuZXRRdWlja0luc3RhbGwxITAfBgNVBAMM
-						GGZlZGVyYXRpb24uY2l0eWxpdC5hYy51azAeFw0wODEwMDExNTI3MDFaFw0xODEw
-						MDExNTI3MDFaMFgxFDASBgNVBAoMC0ludGVybmV0MlFJMR0wGwYDVQQLDBRJbnRl
-						cm5ldFF1aWNrSW5zdGFsbDEhMB8GA1UEAwwYZmVkZXJhdGlvbi5jaXR5bGl0LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm8uZyZuCsmNPxwh5
-						wYzBQxH5Lm4k88NjijrPczsmMv6ytTktOryvUT53onCvV56Q/K9fNFp6n2oED1qT
-						GBFULXBjn2V05mXOcbxP10gbmVP3ik8K+uSfZWrG6Zhko2mCx+N1Ic9lvnjELAMZ
-						n4iX9/XJpnYyzHJTCJ+nhsG3q1wYftXblAm3UQn3kBpzjAKTWmAKEFnfLYt2hXQi
-						SJpTEMAMc7LF4x2Wn65D8Yy7ZUDv9D0gXvHCfLKaY9KP3nb5v9jxxOy2MY9myApV
-						1FBauyD5N4zh5CoiXa5Kc4ulsPpgl7rsJzVK40nDsSTBh5z4zhKFoLY2ed9D4u5m
-						N7gC2wIDAQABo4GzMIGwMB0GA1UdDgQWBBQt1uPa7g7op1dL4DqzM9jEUGbEjDCB
-						gAYDVR0jBHkwd4AULdbj2u4O6KdXS+A6szPYxFBmxIyhXKRaMFgxFDASBgNVBAoM
-						C0ludGVybmV0MlFJMR0wGwYDVQQLDBRJbnRlcm5ldFF1aWNrSW5zdGFsbDEhMB8G
-						A1UEAwwYZmVkZXJhdGlvbi5jaXR5bGl0LmFjLnVrggEBMAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQEFBQADggEBAHUFXipOGkG4InAusODqfe1aUG+skCY9zzXTaIOP
-						kpXQ0Q5FifQiShE/b2vIp15lQG+qDE0kppyk5cBkdZkGAVb5K0aQIxcl9MiL67QX
-						h6iqlSpAgMU6u6L2/VWBeVjNmqcc9X88nXWDv4VAOJy4YIZVMn16bkeD40doSuQJ
-						S9ipahSI+KhN8a84nx+inBjh2W47rle5BYVjblu3eCKf3i4/W03r2jurW2+yEwlA
-						auQ7PwLXsxQpFa/sfc+gSM6AvKc88UT/q3sQHt8vzrr6i2yN6U7s5jbeJ8UhXYeA
-						EzP9054/ECA5LnVNOe+dKhGm84MWiC1ovYbuPx0vFQTzRJE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.citylit.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federation.citylit.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://federation.citylit.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.citylit.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://federation.citylit.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.citylit.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">citylit.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID3zCCAsegAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMRQwEgYDVQQKDAtJbnRl
-						cm5ldDJRSTEdMBsGA1UECwwUSW50ZXJuZXRRdWlja0luc3RhbGwxITAfBgNVBAMM
-						GGZlZGVyYXRpb24uY2l0eWxpdC5hYy51azAeFw0wODEwMDExNTI3MDFaFw0xODEw
-						MDExNTI3MDFaMFgxFDASBgNVBAoMC0ludGVybmV0MlFJMR0wGwYDVQQLDBRJbnRl
-						cm5ldFF1aWNrSW5zdGFsbDEhMB8GA1UEAwwYZmVkZXJhdGlvbi5jaXR5bGl0LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm8uZyZuCsmNPxwh5
-						wYzBQxH5Lm4k88NjijrPczsmMv6ytTktOryvUT53onCvV56Q/K9fNFp6n2oED1qT
-						GBFULXBjn2V05mXOcbxP10gbmVP3ik8K+uSfZWrG6Zhko2mCx+N1Ic9lvnjELAMZ
-						n4iX9/XJpnYyzHJTCJ+nhsG3q1wYftXblAm3UQn3kBpzjAKTWmAKEFnfLYt2hXQi
-						SJpTEMAMc7LF4x2Wn65D8Yy7ZUDv9D0gXvHCfLKaY9KP3nb5v9jxxOy2MY9myApV
-						1FBauyD5N4zh5CoiXa5Kc4ulsPpgl7rsJzVK40nDsSTBh5z4zhKFoLY2ed9D4u5m
-						N7gC2wIDAQABo4GzMIGwMB0GA1UdDgQWBBQt1uPa7g7op1dL4DqzM9jEUGbEjDCB
-						gAYDVR0jBHkwd4AULdbj2u4O6KdXS+A6szPYxFBmxIyhXKRaMFgxFDASBgNVBAoM
-						C0ludGVybmV0MlFJMR0wGwYDVQQLDBRJbnRlcm5ldFF1aWNrSW5zdGFsbDEhMB8G
-						A1UEAwwYZmVkZXJhdGlvbi5jaXR5bGl0LmFjLnVrggEBMAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQEFBQADggEBAHUFXipOGkG4InAusODqfe1aUG+skCY9zzXTaIOP
-						kpXQ0Q5FifQiShE/b2vIp15lQG+qDE0kppyk5cBkdZkGAVb5K0aQIxcl9MiL67QX
-						h6iqlSpAgMU6u6L2/VWBeVjNmqcc9X88nXWDv4VAOJy4YIZVMn16bkeD40doSuQJ
-						S9ipahSI+KhN8a84nx+inBjh2W47rle5BYVjblu3eCKf3i4/W03r2jurW2+yEwlA
-						auQ7PwLXsxQpFa/sfc+gSM6AvKc88UT/q3sQHt8vzrr6i2yN6U7s5jbeJ8UhXYeA
-						EzP9054/ECA5LnVNOe+dKhGm84MWiC1ovYbuPx0vFQTzRJE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.citylit.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federation.citylit.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">City Lit</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">City Lit</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.citylit.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ratcliffe</GivenName>
-    <SurName>Cassell</SurName>
-    <EmailAddress>mailto:cliff.Cassell@citylit.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ratcliffe</GivenName>
-    <SurName>Cassell</SurName>
-    <EmailAddress>mailto:cliff.Cassell@citylit.ac.uk</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 ce943f8b..00000000
--- a/swamid-interfederations-2.0/federation.crous-lille.fr-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://federation.crous-lille.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABtElEQVQ4y42STUhUURiGnzPnTnfKv7lazN3ELG7ItLBNLRwCSfCHcRVREm3axIR7d0JQZLidiUSRNiOKm9wIghutNiW5SCJBsRmFEVJCcsCf+bn3uDCkYe7c8d1957zfc76P94i+oS+KKvJpOk4pf17PD0dFhQcPjXOPgF94WdwBUkgmtF6MSzneqh7Pd1xvguxRlJcpoP87cS4GsFH4EIzIJ4S0XQ4LOs9Z8lxB+78IaJJRumnWc+znGxm0Z3BU4eIAyVkg+/lGnh7MkP46hVM6ob45jHmzyxUg3GI8/rVAy/obXnTZTK76SSwpbKVjl3K1Y9zN/KAjP8H04wI3WsAyg1hWmFevh2pPoJwSm5/HeRSY5rcTQrTF6X8Yo7ejvepnKJvAsYsc/tkhE4zxbHiW98mXwqu5AuCTGlcMk+XVDIZR79owlninqgKEz09dqJVsNkt8IM7Kt+UyczKRVN/X1mqnsL0yx/rHBHduRbgbbccvJemdPba20qRSKSKRyPlaGi4K3+5DN66y/XORjQ+fUA6EWjuJ3X9Q1lwVgJCYVhTTinJy9BfbLlLXcI2m68EK6ylyAI96c5BEZgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOSswMjowMGLI7EUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTkrMDI6MDATlVT5AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-lille.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://federation.crous-lille.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.crous-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.crous-lille.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Lille</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Lille</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-lille.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>informatique@crous-lille.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.cyclone-project.eu-auth-realms-master.xml b/swamid-interfederations-2.0/federation.cyclone-project.eu-auth-realms-master.xml
deleted file mode 100644
index fa4664fb..00000000
--- a/swamid-interfederations-2.0/federation.cyclone-project.eu-auth-realms-master.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.cyclone-project.eu/auth/realms/master">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-09-30T08:59:16Z">
-      <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>
-  </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="de">CYCLONE Test Federation Provider</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CYCLONE Test Federation Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Der CYCLONE Test Federation Provider dient zum Testen und zur Demonstration der im CYCLONE – Projekt entwickelten Technologien</mdui:Description>
-        <mdui:Description xml:lang="en">The CYCLONE Test Federation Provider is used for testing and demonstrating the technologies developed within the CYCLONE project</mdui:Description>
-        <mdui:Logo height="50" width="197">https://secure.cyclone-project.eu/assets/images/CYCLONE-LOGO-mini.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://secure.cyclone-project.eu/sp_privacy_policy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>federation.cyclone-project.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=federation.cyclone-project.eu,OU=Service-centric Networking,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF4jCCBMqgAwIBAgIHGc8MRIp62zANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
-EwJERTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8w
-DQYDVQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAe
-Fw0xNTA3MjIxMjM4MTNaFw0xODEwMTgxMjM4MTNaMIGlMQswCQYDVQQGEwJERTEP
-MA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xJzAlBgNVBAoMHlRlY2hu
-aXNjaGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEjMCEGA1UECwwaU2VydmljZS1jZW50
-cmljIE5ldHdvcmtpbmcxJjAkBgNVBAMMHWZlZGVyYXRpb24uY3ljbG9uZS1wcm9q
-ZWN0LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoGJTW+QZ156G
-51hhDG3nOpAdq+U9cb5kl0nEgFnvzSIu7tVZIr4dLBQjTFXfHl5tQ6JwbqxAvYFf
-Lco+1llQe25I5ax/ULQv+Y0uZC2992pnsSezRB2sVc4UNb/XnQMCRP6nKAeLLmwg
-ophcUmI5ItxkwftpW2iW8bAp3Rq3vpXHFVKgxvKXt8IQ37j0SwKVuSaDRbIdIPtC
-XjpRb9wXdKYgS+hCmF0IKblH5mowOr6qVy4ss+m/n3z23MoE3teTJrWK/urSRBuk
-7zzh5x4mVO5jH3/p8enh7ePX/sMgf68VDnIFrXPFdgDQxbv9eOGyMTyWX6Mt6AWE
-mVXA2SR1jQIDAQABo4ICUjCCAk4wTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEE
-AwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
-rSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSGIY/ZZD7VJ2s/fIl5bKlKV71I0DAfBgNV
-HSMEGDAWgBQjMkKe/mJCTvtO0BebeOftiow+eDAoBgNVHREEITAfgh1mZWRlcmF0
-aW9uLmN5Y2xvbmUtcHJvamVjdC5ldTCBgwYDVR0fBHwwejA7oDmgN4Y1aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmww
-O6A5oDeGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmVybGluLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIHTBggrBgEFBQcBAQSBxjCBwzAzBggrBgEFBQcwAYYnaHR0
-cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEUGCCsGAQUFBzAC
-hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJlcmxpbi1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dHUtYmVybGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsF
-AAOCAQEAcD7me5NvAkGAAMQSxlDVtmHi6foUPNt9adzUh1HujfkpKj7SDffpvFzl
-qjQuzcyXT03k0mC5BzRVZcvhoTHO8iAN84zD98C26kWUW4rrnX0J0LNlJ6WuTwG8
-gvNWLsYAZQQQWfSgRUGQXMzCFgXa/pFe8En63eh49MHhMNMFCZ+CBzLCxJmtGqRR
-/GTZHsUfmLgMcM/i77wPSSTz/WJ1XqpSdTX3ZcqxHTj91Mkle4feDbs0esiRrgm+
-pEG48bIOW7zC1nhkztvEfA5XgHVh9HvCV/QoeHOpuzCv8brHbPQtj1sZi6EsFb89
-awjhhm+d45PRPp1X8A1+/JdMtBQbiQ==
-</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>federation.cyclone-project.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=federation.cyclone-project.eu,OU=Service-centric Networking,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF4jCCBMqgAwIBAgIHGc8MRIp62zANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
-EwJERTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8w
-DQYDVQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAe
-Fw0xNTA3MjIxMjM4MTNaFw0xODEwMTgxMjM4MTNaMIGlMQswCQYDVQQGEwJERTEP
-MA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xJzAlBgNVBAoMHlRlY2hu
-aXNjaGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEjMCEGA1UECwwaU2VydmljZS1jZW50
-cmljIE5ldHdvcmtpbmcxJjAkBgNVBAMMHWZlZGVyYXRpb24uY3ljbG9uZS1wcm9q
-ZWN0LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoGJTW+QZ156G
-51hhDG3nOpAdq+U9cb5kl0nEgFnvzSIu7tVZIr4dLBQjTFXfHl5tQ6JwbqxAvYFf
-Lco+1llQe25I5ax/ULQv+Y0uZC2992pnsSezRB2sVc4UNb/XnQMCRP6nKAeLLmwg
-ophcUmI5ItxkwftpW2iW8bAp3Rq3vpXHFVKgxvKXt8IQ37j0SwKVuSaDRbIdIPtC
-XjpRb9wXdKYgS+hCmF0IKblH5mowOr6qVy4ss+m/n3z23MoE3teTJrWK/urSRBuk
-7zzh5x4mVO5jH3/p8enh7ePX/sMgf68VDnIFrXPFdgDQxbv9eOGyMTyWX6Mt6AWE
-mVXA2SR1jQIDAQABo4ICUjCCAk4wTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEE
-AwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
-rSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSGIY/ZZD7VJ2s/fIl5bKlKV71I0DAfBgNV
-HSMEGDAWgBQjMkKe/mJCTvtO0BebeOftiow+eDAoBgNVHREEITAfgh1mZWRlcmF0
-aW9uLmN5Y2xvbmUtcHJvamVjdC5ldTCBgwYDVR0fBHwwejA7oDmgN4Y1aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmww
-O6A5oDeGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmVybGluLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIHTBggrBgEFBQcBAQSBxjCBwzAzBggrBgEFBQcwAYYnaHR0
-cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEUGCCsGAQUFBzAC
-hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJlcmxpbi1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dHUtYmVybGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsF
-AAOCAQEAcD7me5NvAkGAAMQSxlDVtmHi6foUPNt9adzUh1HujfkpKj7SDffpvFzl
-qjQuzcyXT03k0mC5BzRVZcvhoTHO8iAN84zD98C26kWUW4rrnX0J0LNlJ6WuTwG8
-gvNWLsYAZQQQWfSgRUGQXMzCFgXa/pFe8En63eh49MHhMNMFCZ+CBzLCxJmtGqRR
-/GTZHsUfmLgMcM/i77wPSSTz/WJ1XqpSdTX3ZcqxHTj91Mkle4feDbs0esiRrgm+
-pEG48bIOW7zC1nhkztvEfA5XgHVh9HvCV/QoeHOpuzCv8brHbPQtj1sZi6EsFb89
-awjhhm+d45PRPp1X8A1+/JdMtBQbiQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/TU-Berlin/endpoint"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/dfnaai/endpoint"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/UVA/endpoint"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/CNRS/endpoint"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/TU-Berlin/endpoint" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/UVA/endpoint" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/CNRS/endpoint" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/auth/realms/master/broker/dfnaai/endpoint" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e160</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e160</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Technische Universität Berlin</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Technische Universität Berlin</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.tu-berlin.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tu-berlin.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mathias</md:GivenName>
-    <md:SurName>Slawik</md:SurName>
-    <md:EmailAddress>mailto:mathias.slawik@tu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mathias</md:GivenName>
-    <md:SurName>Slawik</md:SurName>
-    <md:EmailAddress>mailto:mathias.slawik@tu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Mathias</md:GivenName>
-    <md:SurName>Slawik</md:SurName>
-    <md:EmailAddress>mailto:mathias.slawik@tu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.cyclone-project.eu-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge.xml b/swamid-interfederations-2.0/federation.cyclone-project.eu-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge.xml
deleted file mode 100644
index a390c2a4..00000000
--- a/swamid-interfederations-2.0/federation.cyclone-project.eu-samlbridge-module.php-saml-sp-metadata.php-cyclone-saml-bridge.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.cyclone-project.eu/samlbridge/module.php/saml/sp/metadata.php/cyclone-saml-bridge">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-12-08T10:25: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>
-    <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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CYCLONE Federation Provider</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CYCLONE Federation Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Der CYCLONE Test Federation Provider dient zum Testen und zur Demonstration der im CYCLONE – Projekt entwickelten Technologien</mdui:Description>
-        <mdui:Description xml:lang="en">The CYCLONE Test Federation Provider is used for testing and demonstrating the technologies developed within the CYCLONE project</mdui:Description>
-        <mdui:Logo height="50" width="197">https://secure.cyclone-project.eu/assets/images/CYCLONE-LOGO-mini.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://secure.cyclone-project.eu/sp_privacy_policy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>federation.cyclone-project.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=federation.cyclone-project.eu,OU=Service-centric Networking,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF4jCCBMqgAwIBAgIHGc8MRIp62zANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
-EwJERTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8w
-DQYDVQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAe
-Fw0xNTA3MjIxMjM4MTNaFw0xODEwMTgxMjM4MTNaMIGlMQswCQYDVQQGEwJERTEP
-MA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xJzAlBgNVBAoMHlRlY2hu
-aXNjaGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEjMCEGA1UECwwaU2VydmljZS1jZW50
-cmljIE5ldHdvcmtpbmcxJjAkBgNVBAMMHWZlZGVyYXRpb24uY3ljbG9uZS1wcm9q
-ZWN0LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoGJTW+QZ156G
-51hhDG3nOpAdq+U9cb5kl0nEgFnvzSIu7tVZIr4dLBQjTFXfHl5tQ6JwbqxAvYFf
-Lco+1llQe25I5ax/ULQv+Y0uZC2992pnsSezRB2sVc4UNb/XnQMCRP6nKAeLLmwg
-ophcUmI5ItxkwftpW2iW8bAp3Rq3vpXHFVKgxvKXt8IQ37j0SwKVuSaDRbIdIPtC
-XjpRb9wXdKYgS+hCmF0IKblH5mowOr6qVy4ss+m/n3z23MoE3teTJrWK/urSRBuk
-7zzh5x4mVO5jH3/p8enh7ePX/sMgf68VDnIFrXPFdgDQxbv9eOGyMTyWX6Mt6AWE
-mVXA2SR1jQIDAQABo4ICUjCCAk4wTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEE
-AwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
-rSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSGIY/ZZD7VJ2s/fIl5bKlKV71I0DAfBgNV
-HSMEGDAWgBQjMkKe/mJCTvtO0BebeOftiow+eDAoBgNVHREEITAfgh1mZWRlcmF0
-aW9uLmN5Y2xvbmUtcHJvamVjdC5ldTCBgwYDVR0fBHwwejA7oDmgN4Y1aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmww
-O6A5oDeGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmVybGluLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIHTBggrBgEFBQcBAQSBxjCBwzAzBggrBgEFBQcwAYYnaHR0
-cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEUGCCsGAQUFBzAC
-hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJlcmxpbi1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dHUtYmVybGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsF
-AAOCAQEAcD7me5NvAkGAAMQSxlDVtmHi6foUPNt9adzUh1HujfkpKj7SDffpvFzl
-qjQuzcyXT03k0mC5BzRVZcvhoTHO8iAN84zD98C26kWUW4rrnX0J0LNlJ6WuTwG8
-gvNWLsYAZQQQWfSgRUGQXMzCFgXa/pFe8En63eh49MHhMNMFCZ+CBzLCxJmtGqRR
-/GTZHsUfmLgMcM/i77wPSSTz/WJ1XqpSdTX3ZcqxHTj91Mkle4feDbs0esiRrgm+
-pEG48bIOW7zC1nhkztvEfA5XgHVh9HvCV/QoeHOpuzCv8brHbPQtj1sZi6EsFb89
-awjhhm+d45PRPp1X8A1+/JdMtBQbiQ==
-</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>federation.cyclone-project.eu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=federation.cyclone-project.eu,OU=Service-centric Networking,O=Technische Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF4jCCBMqgAwIBAgIHGc8MRIp62zANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQG
-EwJERTEnMCUGA1UEChMeVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgQmVybGluMQ8w
-DQYDVQQDEwZUVUItQ0ExHjAcBgkqhkiG9w0BCQEWD2NhQFRVLUJlcmxpbi5ERTAe
-Fw0xNTA3MjIxMjM4MTNaFw0xODEwMTgxMjM4MTNaMIGlMQswCQYDVQQGEwJERTEP
-MA0GA1UECAwGQmVybGluMQ8wDQYDVQQHDAZCZXJsaW4xJzAlBgNVBAoMHlRlY2hu
-aXNjaGUgVW5pdmVyc2l0YWV0IEJlcmxpbjEjMCEGA1UECwwaU2VydmljZS1jZW50
-cmljIE5ldHdvcmtpbmcxJjAkBgNVBAMMHWZlZGVyYXRpb24uY3ljbG9uZS1wcm9q
-ZWN0LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoGJTW+QZ156G
-51hhDG3nOpAdq+U9cb5kl0nEgFnvzSIu7tVZIr4dLBQjTFXfHl5tQ6JwbqxAvYFf
-Lco+1llQe25I5ax/ULQv+Y0uZC2992pnsSezRB2sVc4UNb/XnQMCRP6nKAeLLmwg
-ophcUmI5ItxkwftpW2iW8bAp3Rq3vpXHFVKgxvKXt8IQ37j0SwKVuSaDRbIdIPtC
-XjpRb9wXdKYgS+hCmF0IKblH5mowOr6qVy4ss+m/n3z23MoE3teTJrWK/urSRBuk
-7zzh5x4mVO5jH3/p8enh7ePX/sMgf68VDnIFrXPFdgDQxbv9eOGyMTyWX6Mt6AWE
-mVXA2SR1jQIDAQABo4ICUjCCAk4wTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEE
-AwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
-rSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSGIY/ZZD7VJ2s/fIl5bKlKV71I0DAfBgNV
-HSMEGDAWgBQjMkKe/mJCTvtO0BebeOftiow+eDAoBgNVHREEITAfgh1mZWRlcmF0
-aW9uLmN5Y2xvbmUtcHJvamVjdC5ldTCBgwYDVR0fBHwwejA7oDmgN4Y1aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS90dS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmww
-O6A5oDeGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtYmVybGluLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIHTBggrBgEFBQcBAQSBxjCBwzAzBggrBgEFBQcwAYYnaHR0
-cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEUGCCsGAQUFBzAC
-hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWJlcmxpbi1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dHUtYmVybGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsF
-AAOCAQEAcD7me5NvAkGAAMQSxlDVtmHi6foUPNt9adzUh1HujfkpKj7SDffpvFzl
-qjQuzcyXT03k0mC5BzRVZcvhoTHO8iAN84zD98C26kWUW4rrnX0J0LNlJ6WuTwG8
-gvNWLsYAZQQQWfSgRUGQXMzCFgXa/pFe8En63eh49MHhMNMFCZ+CBzLCxJmtGqRR
-/GTZHsUfmLgMcM/i77wPSSTz/WJ1XqpSdTX3ZcqxHTj91Mkle4feDbs0esiRrgm+
-pEG48bIOW7zC1nhkztvEfA5XgHVh9HvCV/QoeHOpuzCv8brHbPQtj1sZi6EsFb89
-awjhhm+d45PRPp1X8A1+/JdMtBQbiQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.cyclone-project.eu/samlbridge/module.php/saml/sp/saml2-logout.php/cyclone-saml-bridge"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.cyclone-project.eu/samlbridge/module.php/saml/sp/saml2-acs.php/cyclone-saml-bridge" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://federation.cyclone-project.eu/samlbridge/module.php/saml/sp/saml1-acs.php/cyclone-saml-bridge" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://federation.cyclone-project.eu/samlbridge/module.php/saml/sp/saml2-acs.php/cyclone-saml-bridge" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://federation.cyclone-project.eu/samlbridge/module.php/saml/sp/saml1-acs.php/cyclone-saml-bridge/artifact" index="3"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CYCLONE Federation Provider</md:ServiceName>
-      <md:ServiceName xml:lang="en">CYCLONE Federation Provider</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Der CYCLONE Test Federation Provider dient zum Testen und zur Demonstration der im CYCLONE – Projekt entwickelten Technologien</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">The CYCLONE Test Federation Provider is used for testing and demonstrating the technologies developed within the CYCLONE project</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="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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e160</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e160</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Technische Universität Berlin</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Technische Universität Berlin</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.tu-berlin.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tu-berlin.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mathias</md:GivenName>
-    <md:SurName>Slawik</md:SurName>
-    <md:EmailAddress>mailto:mathias.slawik@tu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mathias</md:GivenName>
-    <md:SurName>Slawik</md:SurName>
-    <md:EmailAddress>mailto:mathias.slawik@tu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Mathias</md:GivenName>
-    <md:SurName>Slawik</md:SurName>
-    <md:EmailAddress>mailto:mathias.slawik@tu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 39a86660..00000000
--- a/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.esiee.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ESIEE Paris</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABS0lEQVQ4y62TPUhCURTHf/fp08o0GqItiMCgpb2puRRa+iBotak5guwD3dqqpZagJXO2KSKKhhaXxiiqoQKpQSFU3vPeBvM99b3wEZ3p3P+553fOPYcraFhaQf5oh4fzBNKIIDRcbWAsx+VWvHEUViC+v8TT9TFKgi9YZHIjRukl0pIsDY3o1AeKW5L1VL8VfLyIoel1Xw8V6I/esDtKJ7P7FJpp+2hsi47JrYA/2i8AIV3lTeWQ/K4Xq6VBpvcOMCvdACip0Tf8Cqx6A0gjwvNVokV7y8P4rEeAphcZmjjFrHRZmpIB7k7mgGxnQDBS4Gxl2aGnFGQXvQxRuetJ52r/dY3NeOUV0DQDUbNcsxwmpeoYtx6V/Ry7aloFySxUUD8cveedQKiAapuHqoWYORxhvf0zGVSZzwjuc2t8fYaRpg8lnfWNcm/z8Ru34GJlf61mMQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MSswMjowMBnHrEYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDBomhT6AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.esiee.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ESIEE Paris</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>
-					      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>
-    </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-POST" Location="https://federation.esiee.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.esiee.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.esiee.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.esiee.fr/idp/profile/SAML1/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">ESIEE Paris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ESIEE Paris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.esiee.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>system@esiee.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.xml
deleted file mode 100644
index 41bd866b..00000000
--- a/swamid-interfederations-2.0/federation.hanze.nl-adfs-services-trust.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="http://federation.hanze.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-12T10:50:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Hanzehogeschool Groningen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hanze University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hanzehogeschool Groningen</mdui:Description>
-        <mdui:Description xml:lang="en">Hanze University of Applied Sciences</mdui:Description>
-        <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/hanze.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">hanze university groningen hanzehogeschool groningen hbo applied sciences</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">hanze university groningen hanzehogeschool groningen hbo</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/193a3229f49c46a0b0a0f063f44b7696"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Hanzehogeschool Groningen</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Hanze University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Hanzehogeschool Groningen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Hanze University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">https://www.hanze.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.hanze.nl/eng</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/federation.hdh.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.xml
deleted file mode 100644
index 6f9a2806..00000000
--- a/swamid-interfederations-2.0/federation.hdh.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federation.hdh.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-13T13:44:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Hotelschool den Haag</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hotelschool den Haag</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hotelschool den Haag</mdui:Description>
-        <mdui:Description xml:lang="en">Hotelschool den Haag</mdui:Description>
-        <mdui:Logo height="35" width="108">https://static.surfconext.nl/logos/idp/hdh.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Hotelschool den Haag HDH</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Hotelschool den Haag HDH</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/8040fadd4eb10cff25d3bd0f04466c12"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Hotelschool den Haag</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Hotelschool den Haag</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hotelschool.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/federation.ined.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml
deleted file mode 100644
index bc9f970a..00000000
--- a/swamid-interfederations-2.0/federation.ined.fr-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://federation.ined.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">INED - Institut National d'Etudes Démographiques</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACCklEQVQoz5WSb0gTcRjHn/vdtZtm1tbqEoO5ZFDBTMWyF5aZuHoxgqiIXkTgm0RGRK+EIOhFBJEwgogiC4qCIIrehJvbGqPSIK0VlZQw3B/dP9fdeXe7ebt7ehFEjYj2efnwfPnwPHwB/xvx2dO0u49ATaBRS4CiAKEmAwWITPVQ1+VopPz+nbmzq753X9U+wJ8GKTCe3MKVQkG2rZ1t2/FXC9F5Xp7wA4A04eeHB5smY2tOnlJfRvPeocL5kUohrwtC/qwXVZUiBADg+80bCx43IiZdTjkakQL+pMupTL6qLBWK13zp/T2ImGjZWJqZXh5/nu7fS9RQoGHwdPnLZ1gp1+/p5UfOWa/fNiS59Gaq4fARIxEHALrZbojCzzOIkcvS662VbIay2gDAKOZWORzSo4crs7OoKIAGABgiT5nrQNeBEIa2O7T5eXPXTsxnAcA04OF9oxtGfaRxbfHKZaa7BwCgrNIcp8XjZJ2FmPv61UiY3baddnUsXbzA3brDOFozhw6mttor6RQ3dk8O+IE1m1oc2txXptUJv6qiy/LiiaMLngNSKKhlFnVR1NIp4cH9xKY6Zeo1Iqa628UnjylE/P3N6sy0Eg5qH2OGIBKLxbRrd+Ox47TNJtwdW756qfntJ/h3Q8tz36QX4eyZ4aRzc+lDDBGrDVXkvEM018R2dK4ecFMsCwA/ANxqQDGecoDOAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAyKzAyOjAwQ6fTHwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMiswMjowMDL6a6MAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ined.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">INED - Institut National d'Etudes Démographiques</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>
-					      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>
-    </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-POST" Location="https://federation.ined.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.ined.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.ined.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INED - Institut National d'Etudes Démographiques</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INED - Institut National d'Etudes Démographiques</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ined.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Marc Lamouche</md:SurName>
-    <md:EmailAddress>marc.lamouche@ined.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Rainer Kugel</md:SurName>
-    <md:EmailAddress>rainer.kugel@ined.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.napier.ac.uk-idp-pingfederate.xml b/swamid-interfederations-2.0/federation.napier.ac.uk-idp-pingfederate.xml
deleted file mode 100644
index 89ea0a62..00000000
--- a/swamid-interfederations-2.0/federation.napier.ac.uk-idp-pingfederate.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://federation.napier.ac.uk/idp/pingfederate">
-  <!--
-		This is a PingFederate IdP for Edinburgh Napier University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-11T13:43:48Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">napier.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDeDCCAmCgAwIBAgIGAU+sUxvAMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNVBAYT
-						AkdCMRIwEAYDVQQIEwlFZGluYnVyZ2gxEjAQBgNVBAcTCUVkaW5idXJnaDEkMCIG
-						A1UEChMbRWRpbmJ1cmdoIE5hcGllciBVbml2ZXJzaXR5MSAwHgYDVQQDExdmZWRl
-						cmF0aW9uLm5hcGllci5hYy51azAeFw0xNTA5MDgwOTM5MzFaFw0zNTA5MDQwOTM5
-						MzFaMH0xCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlFZGluYnVyZ2gxEjAQBgNVBAcT
-						CUVkaW5idXJnaDEkMCIGA1UEChMbRWRpbmJ1cmdoIE5hcGllciBVbml2ZXJzaXR5
-						MSAwHgYDVQQDExdmZWRlcmF0aW9uLm5hcGllci5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAMLtdCNUtcf8tt0/nq07hzjF8TIJMkPXwPCRxo0o
-						rBYOH3NB6GYbDODXu4W7AmhF8p+BsgKL0wkl+Zl53+AJdThMfU1rN+Ih3co3qpjZ
-						xDHmnj4HzKGAdRWTQsnSA5/gY9WWWsIT/7aannP7yAQXeOO1Qch8+D8ZqGpkoLYK
-						hNMeILHIBnuaTit2DsTuFaCaibJ9ky2TxUZQXh8h+InChCGYY6bnKQKRaFszD/B6
-						N5JfYWyNqwHcnx1qTWmQWWLbt1ZlGE7/OwkMVzdNOalOf5SunDjA17U0lX0gpO/0
-						NpOLHGCx9RgDlQzJ1fXGLGQ+iLWNCcUlbxCyPWPZxb1ATmUCAwEAATANBgkqhkiG
-						9w0BAQsFAAOCAQEAhUHBGidQ7SPwgSDIOFKuYfoKBqeziRp675SACxVMS+wqrAlx
-						hNqAyJVmc4+pslEggwaVL3MKvXQHKizd2dS1U4Gd7Ew43/FzDoRpeQ33aASS1FR1
-						ZkPAfhNsVtcW+fGrx/vg9bmf2BUcYkHKAJ69wkuHhfhEyqU0Jplerlr1q0+XcE4K
-						TH0FxhmDjCJyKEgW7SBU1CU7Vb3EKDw43NSkEoex89I5Ck0GPGLkCK7roP+jTQ6K
-						tg0UI45sJhsTp/JvciP1XK6JHgiIWp6L/TcRQeCsX04Binb8WerPgDWdP9A4oroB
-						0UsLuEW0FBsLhnMyCVSJt+xbR0ctVu12LuYcIA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.napier.ac.uk:8443/idp/soap.ssaml1" index="0"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.napier.ac.uk/idp/SSO.saml2"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.napier.ac.uk/idp/SSO.saml2"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.napier.ac.uk/idp/isx.saml1"/>
-  </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">napier.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDeDCCAmCgAwIBAgIGAU+sUxvAMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNVBAYT
-						AkdCMRIwEAYDVQQIEwlFZGluYnVyZ2gxEjAQBgNVBAcTCUVkaW5idXJnaDEkMCIG
-						A1UEChMbRWRpbmJ1cmdoIE5hcGllciBVbml2ZXJzaXR5MSAwHgYDVQQDExdmZWRl
-						cmF0aW9uLm5hcGllci5hYy51azAeFw0xNTA5MDgwOTM5MzFaFw0zNTA5MDQwOTM5
-						MzFaMH0xCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlFZGluYnVyZ2gxEjAQBgNVBAcT
-						CUVkaW5idXJnaDEkMCIGA1UEChMbRWRpbmJ1cmdoIE5hcGllciBVbml2ZXJzaXR5
-						MSAwHgYDVQQDExdmZWRlcmF0aW9uLm5hcGllci5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAMLtdCNUtcf8tt0/nq07hzjF8TIJMkPXwPCRxo0o
-						rBYOH3NB6GYbDODXu4W7AmhF8p+BsgKL0wkl+Zl53+AJdThMfU1rN+Ih3co3qpjZ
-						xDHmnj4HzKGAdRWTQsnSA5/gY9WWWsIT/7aannP7yAQXeOO1Qch8+D8ZqGpkoLYK
-						hNMeILHIBnuaTit2DsTuFaCaibJ9ky2TxUZQXh8h+InChCGYY6bnKQKRaFszD/B6
-						N5JfYWyNqwHcnx1qTWmQWWLbt1ZlGE7/OwkMVzdNOalOf5SunDjA17U0lX0gpO/0
-						NpOLHGCx9RgDlQzJ1fXGLGQ+iLWNCcUlbxCyPWPZxb1ATmUCAwEAATANBgkqhkiG
-						9w0BAQsFAAOCAQEAhUHBGidQ7SPwgSDIOFKuYfoKBqeziRp675SACxVMS+wqrAlx
-						hNqAyJVmc4+pslEggwaVL3MKvXQHKizd2dS1U4Gd7Ew43/FzDoRpeQ33aASS1FR1
-						ZkPAfhNsVtcW+fGrx/vg9bmf2BUcYkHKAJ69wkuHhfhEyqU0Jplerlr1q0+XcE4K
-						TH0FxhmDjCJyKEgW7SBU1CU7Vb3EKDw43NSkEoex89I5Ck0GPGLkCK7roP+jTQ6K
-						tg0UI45sJhsTp/JvciP1XK6JHgiIWp6L/TcRQeCsX04Binb8WerPgDWdP9A4oroB
-						0UsLuEW0FBsLhnMyCVSJt+xbR0ctVu12LuYcIA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federation.napier.ac.uk:8443/idp/attrsvc.ssaml2"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.napier.ac.uk:8443/idp/soap.ssaml1"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Edinburgh Napier University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Edinburgh Napier University (PingFederate)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.napier.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:citsupport@napier.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Todd</SurName>
-    <EmailAddress>mailto:j.todd@napier.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.rijksmuseum.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.rijksmuseum.nl-adfs-services-trust.xml
deleted file mode 100644
index 54ad5efb..00000000
--- a/swamid-interfederations-2.0/federation.rijksmuseum.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federation.rijksmuseum.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-29T18:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">rijksmuseum.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="nl">Rijksmuseum Amsterdam</mdui:Description>
-        <mdui:Description xml:lang="en">Rijksmuseum Amsterdam</mdui:Description>
-        <mdui:Logo height="300" width="500">https://static.surfconext.nl/logos/idp/rijksmuseum_logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Rijksmuseum Amsterdam</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Rijksmuseum Amsterdam</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/e04abc1f9c8858b3f9941f8fce892039"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Rijksmuseum Amsterdam</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Rijksmuseum Amsterdam</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Rijksmuseum Amsterdam</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Rijksmuseum Amsterdam</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.rijksmuseum.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.rijksmuseum.nl/en</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/federation.sciences-po.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml
deleted file mode 100644
index 9c060581..00000000
--- a/swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.sciences-po.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Sciences Po Paris</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAByElEQVQ4y6WTzW0TURSFvzMzElE2mdjZmE1QdpEdMR3gDuIOYiqIS5h04A4CHQwV4A4yEkTskNnYEgpmWKAEyX6HxdjGDg4b3u6+++7fud+D/zzadTlttC8sDZYvKgBMCiq1mOet6tOXndlmhycHk2bnZtI8u56mp8e7Ek+anZtpo33xZPBO5z/erUeYNM+ucSgVQkEUdZ/5vmh8//xjq4OjzisHZ3u+f/MQ7Y+0WPQEME1Pjx3HBShfzl1gV6D+828f3gFMGu1LomgIkMxDtojIrKirtROQ6Bp1kVKF0CfSi80ObHpIGXYpMbAZJgCKlAIjIAX1AOotKNuILtHKVgnuIqpoS6Hg8Ya1VX1ZuVqZrbuPVwDRnwJKW7Pbt3iVRIVwjl1iD7GHwBhADqMVG8kyuAR6s8OT0QM1OCKkrbvbK+AK4GvafjlPosF6I+npsVcd1Eo7+xXvD2odPDLaHIdE92PsCntoKXec5LJrEZct57aHEv147mqRKH0MkUSP+WLsOAbcbc1uX/+N6lHn/S6M18A12peTZudmdnhysEXiBpHn4LxeFYVUK+/gDKkPKvfCz8GKUj1ZqXl2LnnNgYMrhVA8/om/AZ4N2R+s222tAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjM2KzAyOjAwOWfw7wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTozNiswMjowMEg6SFMAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.sciences-po.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Sciences Po Paris</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://federation.sciences-po.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.sciences-po.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.sciences-po.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.sciences-po.fr/idp/profile/SAML1/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">Sciences Po Paris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sciences Po Paris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sciences-po.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>prs@sciences-po.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.springer-sbm.com-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.springer-sbm.com-adfs-services-trust.xml
deleted file mode 100644
index baa31f4a..00000000
--- a/swamid-interfederations-2.0/federation.springer-sbm.com-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://federation.springer-sbm.com/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-14T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Springer Science+Business Media</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Springer Science+Business Media</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Springer Science+Business Media</mdui:Description>
-        <mdui:Description xml:lang="en">Springer Science+Business Media</mdui:Description>
-        <mdui:Logo height="32" width="108">https://static.surfconext.nl/logos/idp/springer.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Springer Science Business Media</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Springer Science Business Media</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/33fdc9ab97279100b96667b3722194be"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Springer Science+Business Media</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Springer Science+Business Media</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.springer.com</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/federation.u-pem.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml
deleted file mode 100644
index fd373689..00000000
--- a/swamid-interfederations-2.0/federation.u-pem.fr-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://federation.u-pem.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACOUlEQVQ4y32TO2uUYRCFnzP77cZNCN4tIiiKGlARCxW8gFrbCFp4AVN4+QNil84yCmIlKBiLBMRCREEEK0m00kLFC6IGxQtrQgy462az33ssEk2MklNNMTycmTOjyuHyASJ6sG8u66+dBqgcaT1vtF+QA0YYI0QIqoZbJVcvLOhnNBSaD1oFdDCtDkmrp+oWUCdQxozZrMOcmVDrQYBgDknusemdrHUbfELiCVIZaxdANicAVRWugbC9D7TJZhM4N371F8BSi3eTsYc0/EZF/8trB5YZ3oc04IavTgJMBfk7Zkelo61bbzwObDeuWh7DrJgC3ChIF1NqTCwpNj6qjzpAFqo9SG67DJxCdINsMR721VKj9qhRat3syXmGF/f9eDHbVrZoDT+q7zhXT2nA1kaLZgG/KmU/B9tHqY7M9z2Fh0I8NYguWgCoMaEb5Nnw23k7McftaEpkMkrm68/Utnx8oU8itctcW9RXfVY5PG8XE4UuAEp5L9QHMxxrjbqQ64ZRQyj4FvKIkw6BlpjUMnKUxzmFY6AT4DrEADA4HaP9KNBZRDg1P4SKK/PpQLfb5b3AVjRrBzNS35LgEhBE8XpKfoj+dC+14gymE5z+DxCj2E8wITNkkwgE/gIko53gMeAlsP4/Dvgc6E4OESIR7DW0AS+A78By8GOjMZkNv0eZCdiWxBUBUx4LoCJO40L3be8xuhuwceaVZsr9lHDPn5edISuFxOtiNO838kK5KN1rkoYgPsk8B/gF70QJKkYG+1EAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDkrMDI6MDDF6okfAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQ5KzAyOjAwtLcxowAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-mlv.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://federation.u-pem.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.u-pem.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.u-pem.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université Paris-Est Marne-la-Vallée</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Paris-Est Marne-la-Vallée</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-mlv.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>adm-federation@u-pem.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.xml
deleted file mode 100644
index f923db56..00000000
--- a/swamid-interfederations-2.0/federation.umcg.nl-adfs-services-trust.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="http://federation.umcg.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-12-05T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">umcg.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">UMC Groningen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">UMC Groningen</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">UMCG</mdui:Description>
-        <mdui:Description xml:lang="en">UMCG</mdui:Description>
-        <mdui:Logo height="264" width="500">https://static.surfconext.nl/logos/sp/UMCGkort_fc.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">umcg UMC Groningen</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">UMC Groningen umcg</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/32171f5a7a012631cb41c6824947cf99"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">UMC Groningen</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">UMC Groningen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">UMC Groningen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">UMC Groningen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.umcg.nl</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.umcg.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/federation.umontpellier.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.umontpellier.fr-idp-shibboleth.xml
deleted file mode 100644
index 8591a50d..00000000
--- a/swamid-interfederations-2.0/federation.umontpellier.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.umontpellier.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-11-26T15:40:57Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umontpellier.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Montpellier University</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABk0lEQVQ4y6WTu06CQRCFv1nUQhsT/VvBzkujEqzQ/DbGhMJLJCYkBB4BSiv1CYA3wBBtJEYLErURL5WGhMZLp9ZY0GhjcC2W8F9QY+I0szkz5+yeyazwTej1ZAYIgp4ygDyjuZDDUtHfK11EzRbCIN8q00TYkXIp3yWg15M5IMPfIi/lUhZAAei1ZNpDHg1CbMlpjy3BQL9bINPm0KPjiSk+yXn04ysQCcP9AwSDkE6ANQTFPbf5nI4n6godSHk8W5YhA8QWYSFqzvacf3qD6EBKgbY9hQVX48Q4TIzB27uxYM/7p2ortIQ8mB01hOI+9Ld9HxyZPDvt40tIeYDZMFjDUL2C6qW5tfEKlRO4fzTWLMut0FSIfnYEZky+uIbJcXO+qZl8ft1tUWgqtNQ9A3x7N0+PrxqscmZy9dLU7KjbQl2hWoUOcPdonr29CaERqJxCo+EQqlfOXABUqyDQ2f1cZ4kiYbitwdMLv0RWyqX8v1e5+zPh28ofbnbm6Au9vBGit28FdMpbkV0+VFGOd5tu9AudaICSH77WlwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-montp1.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Montpellier University idp</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Montpellier</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">IDP de l'universite de montpellier</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>
-					      MIIDVDCCAjygAwIBAgIVANLpEjQnKlSmtfHEGcM1f/W7i4lpMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMMGmZlZGVyYXRpb24udW1vbnRwZWxsaWVyLmZyMB4XDTE0
-MTEyNjE0MDA1OVoXDTM0MTEyNjE0MDA1OVowJTEjMCEGA1UEAwwaZmVkZXJhdGlv
-bi51bW9udHBlbGxpZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCmmImK4S7w7kBZ7+B6u08+SVar2WziXT2HeFII+NcAWeSwMIcu8ZqJeIB6wO9M
-bupXiAmXtRC0iICDKbL1AlDdyL3NrGvwWPNyha5xvDHCxT3lDCWeJpTb8RH/9sFj
-kPHOCE9VMU43GO+5r01Kequm7Nq6uocH7vCxUedZt+wUb7pEJLRR7U8IvC2kQoNX
-kdILYF9njDlEiTl2ypmzh650gtp7lrmUuE/7aOmvwfJ+yThUkOVjcyOB0O1pvmub
-hujVpYLm8QhLY+YQvziw7K5FyAGcsodDoVFbYQX2w9A0k4qvMbhqMCpAW5vIXyH9
-I7DboeEAd1Hx+UddYu5ZsXj/AgMBAAGjezB5MB0GA1UdDgQWBBSmZeTS5ODCHv+N
-lkOHEz7PvbycwDBYBgNVHREEUTBPghpmZWRlcmF0aW9uLnVtb250cGVsbGllci5m
-coYxaHR0cHM6Ly9mZWRlcmF0aW9uLnVtb250cGVsbGllci5mci9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAnBA+peFmxiPlU2s9zj3md7Yq2zNbWYBz
-Gz5Ur5EvuVarCOx5aigdHrjHtORDVCHOuB6BgHqfDAK15V3qLSZEx4jjMJ4w5xi4
-sLcm4kn+j/wYaIZkTOxyUp57ECNrhwGJT2SbnYKmmlD9mxNnjNGGuLFSxfxcqNCm
-f6yIOQbKNi+Q/JSTc5ma6qtjO4u3darPGaP83/MYulHEjx+Zy4yiAntw0oPk3ZxY
-oz6GW83/GNoyFh4u65Ay8Cox65Hk17SVMxHhc/LPv7rII1uLSoLmTTA/aJN9zyEf
-9EnaolCTqrzcOMIMPXkxzbx4oep11GrkLknLljw3wLfQkaBe0fBs2Q==
-					    </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-POST" Location="https://federation.umontpellier.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.umontpellier.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.umontpellier.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umontpellier.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDVDCCAjygAwIBAgIVANLpEjQnKlSmtfHEGcM1f/W7i4lpMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMMGmZlZGVyYXRpb24udW1vbnRwZWxsaWVyLmZyMB4XDTE0
-MTEyNjE0MDA1OVoXDTM0MTEyNjE0MDA1OVowJTEjMCEGA1UEAwwaZmVkZXJhdGlv
-bi51bW9udHBlbGxpZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCmmImK4S7w7kBZ7+B6u08+SVar2WziXT2HeFII+NcAWeSwMIcu8ZqJeIB6wO9M
-bupXiAmXtRC0iICDKbL1AlDdyL3NrGvwWPNyha5xvDHCxT3lDCWeJpTb8RH/9sFj
-kPHOCE9VMU43GO+5r01Kequm7Nq6uocH7vCxUedZt+wUb7pEJLRR7U8IvC2kQoNX
-kdILYF9njDlEiTl2ypmzh650gtp7lrmUuE/7aOmvwfJ+yThUkOVjcyOB0O1pvmub
-hujVpYLm8QhLY+YQvziw7K5FyAGcsodDoVFbYQX2w9A0k4qvMbhqMCpAW5vIXyH9
-I7DboeEAd1Hx+UddYu5ZsXj/AgMBAAGjezB5MB0GA1UdDgQWBBSmZeTS5ODCHv+N
-lkOHEz7PvbycwDBYBgNVHREEUTBPghpmZWRlcmF0aW9uLnVtb250cGVsbGllci5m
-coYxaHR0cHM6Ly9mZWRlcmF0aW9uLnVtb250cGVsbGllci5mci9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAnBA+peFmxiPlU2s9zj3md7Yq2zNbWYBz
-Gz5Ur5EvuVarCOx5aigdHrjHtORDVCHOuB6BgHqfDAK15V3qLSZEx4jjMJ4w5xi4
-sLcm4kn+j/wYaIZkTOxyUp57ECNrhwGJT2SbnYKmmlD9mxNnjNGGuLFSxfxcqNCm
-f6yIOQbKNi+Q/JSTc5ma6qtjO4u3darPGaP83/MYulHEjx+Zy4yiAntw0oPk3ZxY
-oz6GW83/GNoyFh4u65Ay8Cox65Hk17SVMxHhc/LPv7rII1uLSoLmTTA/aJN9zyEf
-9EnaolCTqrzcOMIMPXkxzbx4oep11GrkLknLljw3wLfQkaBe0fBs2Q==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.umontpellier.fr/idp/profile/SAML1/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">Université de Montpellier</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Montpellier</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-montp1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Boz Franck</md:SurName>
-    <md:EmailAddress>franck.boz@univ-montp1.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Aurelien MORAT</md:SurName>
-    <md:EmailAddress>aurelien.morat@univ-montp1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 741a1aab..00000000
--- a/swamid-interfederations-2.0/federation.unimes.fr-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://federation.unimes.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABLUlEQVQoz5WSv0rDUBjFT0socUgIXku9dhKHqMTNJR06iIMP0EFw8wlacCmuLoJvUMjS2b2DS2ddJIWQoZOYprQXQoKYW8U43BhaS9Cc6Qzf7/tf+kw+UERlAFav32l3Adze3Fm9fhDGnXbXcce5wC9pqixMEMYAyrOnXKBaq2VxGflVPV5mVoDZdLpeQTBZjJS5ZHieRKqMIbcugau3QWtDGfGldO+tSFPltML2FvljO5q+0pI/ZwXWWvgO/1LgFgR+ZpAAmM2G2WzAvz7deSQVBuBidyDMuiQAB/oegMTHkTICYEeGMLkzZG/zMD/xOCUV5nEKTbcjw44Mj9N77wzAZPKaVqC07rjjfeBQcQCwBQHAXtKUbEFM8gyolNYBlMR7B2G8yXPbEBIP8g2W5Ws8XJqA0gAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMB3sEi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDBssaqTAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.unimes.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQDCCAiigAwIBAgIVAJ1SM6iHte5TPCVs7XoW5WjkjB0PMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0xNTExMDMw
-OTQ4MTlaFw0zNTExMDMwOTQ4MTlaMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2Nh
-bGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4elIBs4zZa
-rIbDSXZLr/9cwkuZjqHqLRKHAQlGcqVFMOkwNPjq/c0nimGoWs2/bydBZzgsPWI8
-zNPIf9KIoBbuJ+TuTuBKEW59vO5R3Sag2DdPg/0LpSDHBrRjy/1tbrWZDGLAfwYa
-QYOkpp4MeS/CcYg58U5sodSNDgYisJoUiXBay6fBjOyj4J/7WsayikX6c4SJ8HOs
-o4eKPd9OVesOZnvcQQ31IfBqOxg4rCWVoT/dcR7qFNX4Zi/69eRkNgqyXeY1AKU4
-Pyi4q4Jrw/IvQPXVs5uKtcO+/my5Ejbgafsm2hyghugY8DM5IqfF+VJo8McIb+lM
-DSReDxilbJUCAwEAAaNxMG8wHQYDVR0OBBYEFFXQq0AoRGEAMklb1VTM+nZp7Tci
-ME4GA1UdEQRHMEWCFWxvY2FsaG9zdC5sb2NhbGRvbWFpboYsaHR0cHM6Ly9sb2Nh
-bGhvc3QubG9jYWxkb21haW4vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAIyOqoxmwdEdrK28tOI5aqrI2Piogd8wRFpiUIy6DBX8RxeSy8hBCay1CTKH
-mFjXeju4Nc0FOEO6qcXooz44t3PvJy0zT+9pG1O9l/dmNSj3DtrH19MS7stiXbIg
-ilTHN2gT0S7R7qwMIZWRZ5BmBd+kREuPmFY3V07y0O+4fi47OSHzLyosuKqAea9w
-zB1W/0CzVdLXupOO6VlFWzFO/hn34Tuyi/Y9qkBaHg9L7K1V46G/euePPMX/6UsZ
-W+3uQb7N9ip8Jtxrw+VKwZNm+8L4LFLv76RETfy72pKnf14BC9lSR4nDhgce7lHv
-5OaHjZWql53PgGifU8qG3+uLgCM=
-					    </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>
-					      MIIDQDCCAiigAwIBAgIVANTxM7lRFuk6ldqI2pXvvz/5CUHLMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0xNTExMDMw
-OTQ4MjBaFw0zNTExMDMwOTQ4MjBaMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2Nh
-bGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMHIFt13E44F
-+oa0nEIrepkyKokHuZYTtJvp54pCm6xIhxInknHC+MexzkiXxpnyVmkVSr2Lt2hU
-aLIle5Vyq2LpZi4NwBzAJ+bn16Nv4ykloG5lJnA4PI76p8VqhzOzKmGlDah+QbS0
-oLDihqJqwvWq7xmV25zsR+IUcp9e78ZtOk92zpSqYUfz2I28RfaS0UK5EBnwv4DK
-SObKPXVlVCgvYb43tx8lbAXDejlRqggGupxmQtleXVZEkwbKqtJKGuicNnnlOehv
-kmBqMI6Rfu20Ycvxp+B5NBt/MP71/LPFLgpizJjGCCOdFvPg65s6FOH1OEXwIqDS
-4shOp9vVdsECAwEAAaNxMG8wHQYDVR0OBBYEFH+PsJqcBET5E8pScs+hWpboo5oX
-ME4GA1UdEQRHMEWCFWxvY2FsaG9zdC5sb2NhbGRvbWFpboYsaHR0cHM6Ly9sb2Nh
-bGhvc3QubG9jYWxkb21haW4vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAFTEWw5vSdsD2kW6Mlf2SKSBsqNVxkjV0uba/f/t6Ab5++8EyM9uJXLOydhJ
-uOhuO4Mo1TuApbC95q9X883uS51At0DPz7Xgd/TcfkZ3iZe07IejWOszmE43SUky
-pidGfDeN17atHaIlsHJDc14YT/rt166VoJ6klrPd6OYA87yl+ctr3B35hgSdYBqu
-RPQoWOyEI4pXGNZx5D34635wHe1gSZwpEh+tcX7VL4otjLibizfNQuyRinEK9RYP
-gxArLNOySmnishD6YcQISMe3HUhOx+yUSxI+ed+UqZt1dk0zfV58/SqopQxoqmj2
-sNiDGGHIBx2cQAFLigJlndYt5rI=
-					    </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-POST" Location="https://federation.unimes.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.unimes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.unimes.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimes.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQDCCAiigAwIBAgIVAJ1SM6iHte5TPCVs7XoW5WjkjB0PMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0xNTExMDMw
-OTQ4MTlaFw0zNTExMDMwOTQ4MTlaMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2Nh
-bGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4elIBs4zZa
-rIbDSXZLr/9cwkuZjqHqLRKHAQlGcqVFMOkwNPjq/c0nimGoWs2/bydBZzgsPWI8
-zNPIf9KIoBbuJ+TuTuBKEW59vO5R3Sag2DdPg/0LpSDHBrRjy/1tbrWZDGLAfwYa
-QYOkpp4MeS/CcYg58U5sodSNDgYisJoUiXBay6fBjOyj4J/7WsayikX6c4SJ8HOs
-o4eKPd9OVesOZnvcQQ31IfBqOxg4rCWVoT/dcR7qFNX4Zi/69eRkNgqyXeY1AKU4
-Pyi4q4Jrw/IvQPXVs5uKtcO+/my5Ejbgafsm2hyghugY8DM5IqfF+VJo8McIb+lM
-DSReDxilbJUCAwEAAaNxMG8wHQYDVR0OBBYEFFXQq0AoRGEAMklb1VTM+nZp7Tci
-ME4GA1UdEQRHMEWCFWxvY2FsaG9zdC5sb2NhbGRvbWFpboYsaHR0cHM6Ly9sb2Nh
-bGhvc3QubG9jYWxkb21haW4vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAIyOqoxmwdEdrK28tOI5aqrI2Piogd8wRFpiUIy6DBX8RxeSy8hBCay1CTKH
-mFjXeju4Nc0FOEO6qcXooz44t3PvJy0zT+9pG1O9l/dmNSj3DtrH19MS7stiXbIg
-ilTHN2gT0S7R7qwMIZWRZ5BmBd+kREuPmFY3V07y0O+4fi47OSHzLyosuKqAea9w
-zB1W/0CzVdLXupOO6VlFWzFO/hn34Tuyi/Y9qkBaHg9L7K1V46G/euePPMX/6UsZ
-W+3uQb7N9ip8Jtxrw+VKwZNm+8L4LFLv76RETfy72pKnf14BC9lSR4nDhgce7lHv
-5OaHjZWql53PgGifU8qG3+uLgCM=
-					    </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>
-					      MIIDQDCCAiigAwIBAgIVANTxM7lRFuk6ldqI2pXvvz/5CUHLMA0GCSqGSIb3DQEB
-CwUAMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0xNTExMDMw
-OTQ4MjBaFw0zNTExMDMwOTQ4MjBaMCAxHjAcBgNVBAMMFWxvY2FsaG9zdC5sb2Nh
-bGRvbWFpbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMHIFt13E44F
-+oa0nEIrepkyKokHuZYTtJvp54pCm6xIhxInknHC+MexzkiXxpnyVmkVSr2Lt2hU
-aLIle5Vyq2LpZi4NwBzAJ+bn16Nv4ykloG5lJnA4PI76p8VqhzOzKmGlDah+QbS0
-oLDihqJqwvWq7xmV25zsR+IUcp9e78ZtOk92zpSqYUfz2I28RfaS0UK5EBnwv4DK
-SObKPXVlVCgvYb43tx8lbAXDejlRqggGupxmQtleXVZEkwbKqtJKGuicNnnlOehv
-kmBqMI6Rfu20Ycvxp+B5NBt/MP71/LPFLgpizJjGCCOdFvPg65s6FOH1OEXwIqDS
-4shOp9vVdsECAwEAAaNxMG8wHQYDVR0OBBYEFH+PsJqcBET5E8pScs+hWpboo5oX
-ME4GA1UdEQRHMEWCFWxvY2FsaG9zdC5sb2NhbGRvbWFpboYsaHR0cHM6Ly9sb2Nh
-bGhvc3QubG9jYWxkb21haW4vaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAFTEWw5vSdsD2kW6Mlf2SKSBsqNVxkjV0uba/f/t6Ab5++8EyM9uJXLOydhJ
-uOhuO4Mo1TuApbC95q9X883uS51At0DPz7Xgd/TcfkZ3iZe07IejWOszmE43SUky
-pidGfDeN17atHaIlsHJDc14YT/rt166VoJ6klrPd6OYA87yl+ctr3B35hgSdYBqu
-RPQoWOyEI4pXGNZx5D34635wHe1gSZwpEh+tcX7VL4otjLibizfNQuyRinEK9RYP
-gxArLNOySmnishD6YcQISMe3HUhOx+yUSxI+ed+UqZt1dk0zfV58/SqopQxoqmj2
-sNiDGGHIBx2cQAFLigJlndYt5rI=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.unimes.fr/idp/AA"/>
-    <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">Université de Nimes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Nimes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unimes.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>reseaux@unimes.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 502160ae..00000000
--- a/swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.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://federation.upf.pf/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACj0lEQVQ4y32ROWhUURSGv3vfe8mbyUycJGqhIIiCksLCFSyChagYOxuLFDYi2AmWFjYWYqMgYiVYiBEsRERDIm4gKBGNO65xmzczbzJZZiYzb7v3WsQ4UdG/+Ytzznd+zhH8IfNyUCCdvdjuAFF1HfUS1EuvaE5ewnIui91n1MJ+8cdwF7mVgxp2mEYRM1tAVz101UPN+HQk9VHs9F4xcP3bXwDz+opLz+r7WqtNBCVMUICmh254mHoBVfVR01NkjPUR3I3i4ONpAPlrfbrnqBFiE0kF9ASCMsIqYaw80i0g0x5WdpK6qK3C1I/Nj0kA8+qiQ3v2EFEFkUwgjI8RHkfP3kG4X9HueypxHis7jZVtop1ovznf67QS2GKtVrNdxGUwPsgiNx+84O7oFHbnW/YfF5DWyEyITM/StMJFdHSvbQFU0yEsY5Iy6CJCejx/V2T8G5y66HDnYRs1JZEpEO0Bsj0G104D2ACUbhNVn2AvtrA6DWRqNMMmQjg8fekghODCtTTHD8wgbAWWAqlpAXSCDsqYRgVcAwrCKAc4v25cq//2cX47IgrC2MUoiYmBGJJo/r8/XYNJgMQCZYGWCxLYizEqi0lCdNRABEAyV0LNudE2OupAJylUnAHZswDQdzKayVdwly1jZHiYZDKm0TYEXMWkdwEjqK59hFtOE8cxY2PP2LZ1A2DPAfw4RbmpOHH4CFgOYRCQ615C365+Vvb2sqd7KZlcjkdvxhFS8t6bYHnNaiXIB1CILDo278T3fSr5r3z2p1AmRfljgbZUBj92+X7jHuu39+PFKTprtABDkzBWdXmQWUPkroYVW/mXbn2YIv4yzaeJBYBzHomf10W8IqiE/0orqCYEs8QAPwDg+DjjvXHUEgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMLubGZsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDUrMDI6MDDKxqEnAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.upf.pf</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://federation.upf.pf/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.upf.pf/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.upf.pf/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Polynésie française</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Polynésie française</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.upf.pf</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi@upf.pf</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 66047bcd..00000000
--- a/swamid-interfederations-2.0/federation.utbm.fr-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://federation.utbm.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Technologie de Belfort-Montbéliard</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACtUlEQVQ4y42SSU9TYRSGn+8Onawy1YJVnKDggKJCgpioLIzTQjdsMBhduXL8By40ceHWnSuMG2OMrNQoQYmIhkSJCmpaHAhg6+0FOnHpLb2fC4pjTHy2b86bPOccARAxpAdoMRPGrudPextNIx5Kp5LBXG6uREpHoYjb7U2uX7P69emTJ86pPjEBoEUM2Xn92tVzscnxZv5AIJEIVApoToFcdroit6lpsKOfnHpDthSOixfa40f32haH/T5PXDiOEEJITXfN6m5PpqK8YmJZuOXjSMX2kaFphm7M4MmO0YX1rQao19r2HbrzavDZwXw2GTSPXLk0OIXl1chbBTKzNi5FxT89Q2DWZCdzmbPEhuuoaelGD/YAaEDf5q07eof6H3Z+Ts63jUa+HKBgqUgpcPI6TkEFB6Sz4FVV9w44A/gAtPBykUkk5YOh/oed4ex78dxRFOy097dlaO45VjW8RXPdBu4AR4CjwH4N4FqUpz6XNp1NmUtZsfs90gbdYwBxYBwYA2ygnozZjfGphqq6D4sKXH5H4lSoIVqVinrdy/YmcgWPHxBANXPpbZhj1VjpUpACgNrWjmL5QoGtUGdWbjFDY88qSSfKiY1u+uH8K0sDcSrDl4D7QDvQqxWjkjeBZrsmNmCV6eRjiAVv3W1RtnISX+kbYAAYAarJJAZwHAW4rhU/RonYepm6pDS9PBD4GtMCURQMIA0ogB84zMTwRaxUGbWtN4HJHwoI8rn4+LpUaGtfyVRkJbH5nTg5hbztQRbU3zRqW/uB80DoZwFAxqwcXhtWg8kRh3mvj3nr56Dbn6J6y0ugG3gCXMC2DgE7FgvirG68NetiuGljYxCXbxwFCUSBD8BrwAD2AMeAMC7vo7+WfLhHevJp2d5wV7r/CrukoEvqdBVP+S8SSbnhkyF9/CffAewrIVnFa4oDAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA3KzAyOjAwLAQIsgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNyswMjowMF1ZsA4AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.utbm.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Technologie de Belfort-Montbéliard</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>
-					      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>
-    </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-POST" Location="https://federation.utbm.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.utbm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.utbm.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Technologie de Belfort-Montbéliard</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Technologie de Belfort-Montbéliard</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utbm.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Arnaud Sinteff</md:SurName>
-    <md:EmailAddress>arnaud.sinteff@utbm.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Dominique Dal Ponte</md:SurName>
-    <md:EmailAddress>dominique.dalponte@utbm.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 dfe79b2a..00000000
--- a/swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation2.univ-brest.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Bretagne Occidentale</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB5ElEQVQ4y62TT09TURDFf3NpX622BdKKJQGlmmpaqSYmCiYa+RwudWOCJuzd+QWIYWM3Ll34BWTvnxBjaom22hBpBaWIdkFbaqHvdVygL9SSFxee1c095545M5MLHtCft19p69YzL40Pb1wF9J8M6ppaBIYi8mH6L43tJnqegLAUGZC8ZD7d7DGo1ewraxV7uK7pdxEpZgAQAfC7j49KVbe7cRk0/r4E0WhgrLVDLZ9rT9Y1/SIixWs43YfADgBhKel2Ny4hs0lDk30GEXnfqmsqFgqbNeA7gBx7POc2MiBfZdAcoaGn5HqZ/wZZ1aWlwtvSZWOMo4JJXTg7e0amsoeJP37T+7ZtPzDGOLZt+/yWtej78rl6cm/PNoAxRgA97lEw1ul0jGrXAPgta0zK+pouDoIQpM2ozHhGzv1Qgs7+ghwbpIctKect8sDLQkJmD1IavvsEOE1ja1p46t6bP4d0RUlLp7q7UrwI3ADQ7PKcZpfv/JbMrGtzivDIqobuuQbuGkUp71ZW4tZEclOFSYA3lcK8IAo8QuXciAS31rWZGJdQDrjUkwBoBpLpDSz/aHFivzOn6wBqA0hzoRFQ3/C4hBpAoy9BISGZw4amqm4RaS60gchB3vM3nohEN2KhoZqX5hcuR7SlQSlGqgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMSswMjowME/UPYgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDErMDI6MDA+iYU0AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-brest.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Bretagne Occidentale</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://federation2.univ-brest.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation2.univ-brest.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation2.univ-brest.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-brest.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation2.univ-brest.fr//idp/profile/SAML1/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">Université de Bretagne Occidentale</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Bretagne Occidentale</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-brest.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>federation@univ-brest.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 955e649a..00000000
--- a/swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.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://federation2.univ-perp.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Perpignan Via Domitia</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAGElEQVQoz2N8X8tAEmAiTfmohlENQ0kDAI0jAYyYtyhFAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-perp.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Perpignan Via Domitia</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>
-					      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>
-    </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-POST" Location="https://federation2.univ-perp.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation2.univ-perp.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation2.univ-perp.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Perpignan Via Domitia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Perpignan Via Domitia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-perp.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>federation@univ-perp.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d688d411..00000000
--- a/swamid-interfederations-2.0/federationrenater.univ-montp2.fr-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://federationrenater.univ-montp2.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Montpellier 2</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABk0lEQVQ4y6WTu06CQRCFv1nUQhsT/VvBzkujEqzQ/DbGhMJLJCYkBB4BSiv1CYA3wBBtJEYLErURL5WGhMZLp9ZY0GhjcC2W8F9QY+I0szkz5+yeyazwTej1ZAYIgp4ygDyjuZDDUtHfK11EzRbCIN8q00TYkXIp3yWg15M5IMPfIi/lUhZAAei1ZNpDHg1CbMlpjy3BQL9bINPm0KPjiSk+yXn04ysQCcP9AwSDkE6ANQTFPbf5nI4n6godSHk8W5YhA8QWYSFqzvacf3qD6EBKgbY9hQVX48Q4TIzB27uxYM/7p2ortIQ8mB01hOI+9Ld9HxyZPDvt40tIeYDZMFjDUL2C6qW5tfEKlRO4fzTWLMut0FSIfnYEZky+uIbJcXO+qZl8ft1tUWgqtNQ9A3x7N0+PrxqscmZy9dLU7KjbQl2hWoUOcPdonr29CaERqJxCo+EQqlfOXABUqyDQ2f1cZ4kiYbitwdMLv0RWyqX8v1e5+zPh28ofbnbm6Au9vBGit28FdMpbkV0+VFGOd5tu9AudaICSH77WlwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-montp2.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Montpellier 2</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>
-					      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>
-    </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-POST" Location="https://federationrenater.univ-montp2.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federationrenater.univ-montp2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federationrenater.univ-montp2.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Montpellier 2</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Montpellier 2</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-montp2.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Loïc Bonavent</md:SurName>
-    <md:EmailAddress>loic.bonavent@univ-montp2.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Nicolas Arles</md:SurName>
-    <md:EmailAddress>nicolas.arles@univ-montp2.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fedidp.bcm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/fedidp.bcm.edu-idp-shibboleth.xml
deleted file mode 100644
index 56837f52..00000000
--- a/swamid-interfederations-2.0/fedidp.bcm.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +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://fedidp.bcm.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://fedidp.bcm.edu/idp/shibboleth/error.jsp" 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">bcm.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Baylor College of Medicine</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>
-MIIDTDCCAjSgAwIBAgIVAOG5n3plVD0k2za22rJhNB0cfOj6MA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGGh2bC1pZHAtZDAwMS5iZGMuYmNtLmVkdTAeFw0xMDAz
-MTIxNjU4MjNaFw0zMDAzMTIxNTU4MjNaMCMxITAfBgNVBAMTGGh2bC1pZHAtZDAw
-MS5iZGMuYmNtLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJIQ
-GwkzSpjlCCl+CAMGacoDktpB/1Twp3UShBMfv1bEo8hJzhZNK+QxH+cMAJuzRaF2
-fslr7wyPtRnH9soq5Usxli3V6PV93oHMNLcD9hNwiaifhisWdUOTHYyXx5+Fw1xT
-fhLFg2tRioMibtfjV8l4z2VN28LoXn2LoAlnA0J6rTHJGUfuPXcfSn8fMSQokblt
-pAC+WLjbhIxQO6Reg4eC5Tz/WbZjVijEZEN8Opjh3KX9JL/jWAZCemsIZ0fvK83t
-Vm+45N18PEYfzq0hXwfrgQYI1FK3tZs7fimtrAuF09ho2L+E/5WNLlYJcHorAeEu
-LdT2ZvldDtbi3/rwydcCAwEAAaN3MHUwVAYDVR0RBE0wS4IYaHZsLWlkcC1kMDAx
-LmJkYy5iY20uZWR1hi9odHRwczovL2h2bC1pZHAtZDAwMS5iZGMuYmNtLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU71kAUsprVqB8YdTiowM3yaMIzbwwDQYJ
-KoZIhvcNAQEFBQADggEBAGdGZ58nE5xF66dFQjINXF+eFfCyWkFXvIWypLxQYVr+
-XdIfxVN/VYgO+b8Qea4N21YOlxt3m9v/TdQsjF0Ai73SV1j6iPoq+tDGbotpzp1A
-nbq75QodfpBWsWIwqKRqeU/y2gUq5CEB38rdve5hzgyOcTeEosx77s0X22RGHJiO
-AObkVTRvapKDM9P1Z0cSzL+r4ofnrH9wk8pI4Sqky16ay+zvbLvW5GuGeQJz8yaB
-Em4kk7BwhJEPnrqnDKD1d9cdeE1ww3rTAxyZsd0C8zWwg/SRQXp7XcvoNANsIiv+
-kT/uinAHeX+T8m3KqLxJRfjBx4uQkIJOqjGIQSJyM5U=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fedidp.bcm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fedidp.bcm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fedidp.bcm.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fedidp.bcm.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fedidp.bcm.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fedidp.bcm.edu/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">bcm.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIVAOG5n3plVD0k2za22rJhNB0cfOj6MA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGGh2bC1pZHAtZDAwMS5iZGMuYmNtLmVkdTAeFw0xMDAz
-MTIxNjU4MjNaFw0zMDAzMTIxNTU4MjNaMCMxITAfBgNVBAMTGGh2bC1pZHAtZDAw
-MS5iZGMuYmNtLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJIQ
-GwkzSpjlCCl+CAMGacoDktpB/1Twp3UShBMfv1bEo8hJzhZNK+QxH+cMAJuzRaF2
-fslr7wyPtRnH9soq5Usxli3V6PV93oHMNLcD9hNwiaifhisWdUOTHYyXx5+Fw1xT
-fhLFg2tRioMibtfjV8l4z2VN28LoXn2LoAlnA0J6rTHJGUfuPXcfSn8fMSQokblt
-pAC+WLjbhIxQO6Reg4eC5Tz/WbZjVijEZEN8Opjh3KX9JL/jWAZCemsIZ0fvK83t
-Vm+45N18PEYfzq0hXwfrgQYI1FK3tZs7fimtrAuF09ho2L+E/5WNLlYJcHorAeEu
-LdT2ZvldDtbi3/rwydcCAwEAAaN3MHUwVAYDVR0RBE0wS4IYaHZsLWlkcC1kMDAx
-LmJkYy5iY20uZWR1hi9odHRwczovL2h2bC1pZHAtZDAwMS5iZGMuYmNtLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU71kAUsprVqB8YdTiowM3yaMIzbwwDQYJ
-KoZIhvcNAQEFBQADggEBAGdGZ58nE5xF66dFQjINXF+eFfCyWkFXvIWypLxQYVr+
-XdIfxVN/VYgO+b8Qea4N21YOlxt3m9v/TdQsjF0Ai73SV1j6iPoq+tDGbotpzp1A
-nbq75QodfpBWsWIwqKRqeU/y2gUq5CEB38rdve5hzgyOcTeEosx77s0X22RGHJiO
-AObkVTRvapKDM9P1Z0cSzL+r4ofnrH9wk8pI4Sqky16ay+zvbLvW5GuGeQJz8yaB
-Em4kk7BwhJEPnrqnDKD1d9cdeE1ww3rTAxyZsd0C8zWwg/SRQXp7XcvoNANsIiv+
-kT/uinAHeX+T8m3KqLxJRfjBx4uQkIJOqjGIQSJyM5U=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fedidp.bcm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fedidp.bcm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Baylor College of Medicine</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Baylor College of Medicine</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bcm.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Abigail Burton</md:GivenName>
-    <md:EmailAddress>afburton@bcm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Abigail Burton</md:GivenName>
-    <md:EmailAddress>afburton@bcm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>BCM IT Security and Compliance</md:GivenName>
-    <md:EmailAddress>it-security@bcm.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fedidp.uh.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/fedidp.uh.edu-idp-shibboleth.xml
deleted file mode 100644
index fafe4a52..00000000
--- a/swamid-interfederations-2.0/fedidp.uh.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,71 +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://fedidp.uh.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://ssl.uh.edu/password" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uh.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Houston</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Metropolitan campus with the feel of a large traditional campus, located in Houston, TX, the 4th largest city in the U.S.—and growing</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uh.edu/infotech/policies/Incommon%20Federation%20POP.pdf</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.uh.edu/policies/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="461" xml:lang="en">https://ssl.uh.edu/ecomm/images/uh_primary.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>
-MIIDIDCCAgigAwIBAgIVALfBIWfg5HK1/7UKfPr/TAgkWLYUMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXNoaWIuZS51aC5lZHUwHhcNMTQwMjI0MjE0MjAwWhcN
-MzQwMjI0MjE0MjAwWjAYMRYwFAYDVQQDEw1zaGliLmUudWguZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuEPXRUJ1TZCdDA41O4deaxJ79jTbyxsM
-sl8VbII9FJhuRVMatGgqJR0jnS0SS/96xrllMDQfF35w4YuwQDshBYPiJUJv9+Gf
-5dXsdfMg9ZHmIwTKOuP12cF2yCMrEq6MUy5ypW+RDBfz5JrcauO/kmq18wkDIVcX
-t/5WNkJT1eQCx/TMtqXYCSyg6542kZNpz84ju86SZpXTXbdsdGLv7RnCm8RWa7zY
-0YVjaT3lQDgGdwucrqMFVcxpiXWH/7OLkQtjYyGocLXJXvUPcJiULms2emYi7SPN
-HAbcxnu5jUE376+/otwcHnVIaIFgizRuHHjScHNZiLTrct0J5ekuAwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1zaGliLmUudWguZWR1hiRodHRwczovL3NoaWIuZS51aC5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNKpoXlY9yOdiCeVEcb4ZtGUhJpd
-MA0GCSqGSIb3DQEBBQUAA4IBAQBcBF0kx6ef8u1vsI0KwkMUvKL9ukHT+hjHXkCF
-Ura6sjEQBHE1ts9B0AyO91KbY4NCG+DQ77sPnrWbw9vyQnW7dlcIHFv255WiPz8h
-2C3tz0idz4zOjWLjwdVJGAuf3HhcH6q7LzbAw/UBwV0GHl7C/LOJaWg21REiBhob
-vfPFIo2xM4wGm+zlBv9lNRKwgMKOn4JNJ0GuyC2cD0QuGhsjqhVpo9L8Xm1f83xM
-eaFxzRHv3G0p9zvkUirifFVbXiv4zCMkFczLoJ+nKrb3OmVAUMD/HeLL71pvSx0u
-R3kPsBq/2En2dZQ8fv7e7kpzqmawQ5unCFX/ZfRnf5XeMKov
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uh.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uh.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Houston</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Houston</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uh.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Keith Martin</md:GivenName>
-    <md:EmailAddress>KMartin@central.uh.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sonny Nguyen</md:GivenName>
-    <md:EmailAddress>snguye2@central.uh.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sonny Nguyen</md:GivenName>
-    <md:EmailAddress>snguye2@central.uh.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Brian Walker</md:GivenName>
-    <md:EmailAddress>bwalker@central.uh.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fedlogin.studienet.ou.nl.xml b/swamid-interfederations-2.0/fedlogin.studienet.ou.nl.xml
deleted file mode 100644
index 7aeb5d12..00000000
--- a/swamid-interfederations-2.0/fedlogin.studienet.ou.nl.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fedlogin.studienet.ou.nl">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-22T15:41:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Open Universiteit</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Open Universiteit in the Netherlands</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Open Universiteit</mdui:Description>
-        <mdui:Description xml:lang="en">Open Universiteit in the Netherlands</mdui:Description>
-        <mdui:Logo height="48" width="24">https://static.surfconext.nl/media/idp/ou.png</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">Open Universiteit in the Netherlands OU Heerlen</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">Open Universiteit in the Netherlands OU Heerlen</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/83f4a7d287f0e91e7d93e2f3867dbec5"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Open Universiteit</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Open Universiteit</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ou.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/fid.mnhn.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/fid.mnhn.fr-idp-shibboleth.xml
deleted file mode 100644
index cc57563c..00000000
--- a/swamid-interfederations-2.0/fid.mnhn.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fid.mnhn.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-12-31T13:57:42Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 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="en">Muséum National d'Histoire Naturelle (MNHN)</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACOklEQVQ4y4WTz0tUYRSGnzPNr6timpXekWbmGgrRBEagFkKKLaJNi6hF69ZtIvxDCgkUXBRIiyChRatGSGwG0WyhtxSa0RpvWk7j1FwdZ+58LWaiizX0wbv63vPynMM5opSizgvXVASWAftfJvk7QF0GLoBkQGkge6AM4AfIU+Cb2+05VH0b6AP5mE6nLgJOMjk3DBxApQPUPeBMnQB1CWitIit/NGrMmOZKn2maLUABPDbIGqgbNd/hFtRdoLEWaoPMVguVH2irkuEFysAnkCdugrPAiaWlt5214nkgAByvSvaAuGVttgI+kKPAEVeA6i4W9/29vefXVlc/GKB2QZWr4ifQBOLR9dAKUAHlA067AsQbCAS/gGg9Pd27QAnEAcmBNAM7NXxZXFzoBEkBupugAsjs7GsDPHmQDWAeWAGVAjRwhsfGHl6dnn5uVNvAcRNUgNXBwcH3QH5q6vE4qPumufwAxAeqC9iPxc5l19fXW0EBZNxDfAdyEmiYmBgfaW8P2aXSQVs8Hg+BcwVQ4KnYtu0NhyPfa/gpd0AKVDNgl0olj2FEbZ/Pv9DS0lxMpze6QPJAMRgMlLe3t5uArd974HVt9UtQN5PJxClNC5YnJyfvOE5FCoU9XzgcuQ6QzX4NjI6OLoC8qHMLasCyNm/peqiYSLw5FolECroeygHemZlXen//QFbTGh/9xj9EACAJXe/cAq7lcrmOTOZzg2VZ0VgstjM0NDIHPAPy/7nGP3+1YSnAqmf6BWsc3vs2F1rzAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjMwKzAyOjAwWrfF1QAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTozMCswMjowMCvqfWkAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.mnhn.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Research and students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Muséum National d'Histoire Naturelle (MNHN)</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Les chercheurs et étudiants</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>
-					      MIIDFzCCAf+gAwIBAgIUDlRdBDkJESYW6n2HShweS3jdr8swDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAwwLZmlkLm1uaG4uZnIwHhcNMTQxMjAxMTQxMzEzWhcNMzQx
-MjAxMTQxMzEzWjAWMRQwEgYDVQQDDAtmaWQubW5obi5mcjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALaoJeXjuTBCZdOtdlxs0/5ZHzxjTJP9zOtAYQOe
-6enHOV4diw5kEQRW0P8vB18yO3GkdzfUBMizbF6Q7wzh2QIYY9AZq4eWn858qyy2
-Wgzi06c3vox3pcnJMoMTTxe87kSXUwEjDdGFqpkzyEXKHLBJHvUllq7UOhT8EJeb
-q1lFoQk+P5XXoiaqFT3djyqVYgBqNf6M1KPTgK8YpaziAeXqGPLIya9wQNSXw7SX
-k933EOXd61SxxBDMIgpnU4eZH0OqtcsWEz2+iMT2DTRBGkFg4Sw9YfjZwKrQceao
-EtebvucPR1l65WtHkbBEgn1j1Kn/A0VuWnpLkfEWtjgwoD8CAwEAAaNdMFswHQYD
-VR0OBBYEFC3y0NSAMWWxMPbIbU6jPAUNjsvBMDoGA1UdEQQzMDGCC2ZpZC5tbmhu
-LmZyhiJodHRwczovL2ZpZC5tbmhuLmZyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBBQUAA4IBAQArN80LjEyavMOC3fqbILBkByDBaMyfx0G0Tar+v38pa+Yw3PUO
-H9KJlucttn9gauL4T6KK0lpY54D+mldhmQMuGjWuP9/L3kbysU1/rQ+iTK6K3Va5
-dmnqSXiMZpMroaV9yoAiM4v1KfYj92MWg5T6JghWcqQfS/nePGYETcsSiHOgSH4O
-y3+b1691vR2PbgGl29/bdRGHWShN5UxvmWg4H96JzVkhAMkbRNZZBo/hWpLf7Wzo
-5QHuZrX7Nn5+lJG0MtXdClgXYtGbg72ThCCXvovoQtYVY9TEBqJBGNe3VAs2/kDG
-/7NmLRYW0sbMhZeKGTdr7qth0ZOX+aj3+nnZ
-					    </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>
-					      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>
-    </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-POST" Location="https://fid.mnhn.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fid.mnhn.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fid.mnhn.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Muséum National d'Histoire Naturelle (MNHN)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Muséum National d'Histoire Naturelle (MNHN)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mnhn.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>zyxad@mnhn.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fides.rivm.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fides.rivm.nl-adfs-services-trust.xml
deleted file mode 100644
index df43aa31..00000000
--- a/swamid-interfederations-2.0/fides.rivm.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fides.rivm.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-01T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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:Description xml:lang="nl">Rijksinstituut voor Volksgezondheid en Milieu</mdui:Description>
-        <mdui:Description xml:lang="en">National Institute for Public Health and the Environment</mdui:Description>
-        <mdui:Logo height="101" width="500">https://static.surfconext.nl/logos/idp/RIVM_Logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">rivm health environment rijk</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">rivm volk gezondheid milieu rijk</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/e880c6bc54e8854478e8739122e342b6"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Rijksinstituut voor Volksgezondheid en Milieu</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Institute for Public Health and the Environment</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Rijksinstituut voor Volksgezondheid en Milieu</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">National Institute for Public Health and the Environment</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://rivm.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://rivm.nl/English</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/fieldtrial.safetynet.rmplc.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/fieldtrial.safetynet.rmplc.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 5a7f0708..00000000
--- a/swamid-interfederations-2.0/fieldtrial.safetynet.rmplc.co.uk-shibboleth-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://fieldtrial.safetynet.rmplc.co.uk/shibboleth-sp">
-  <!--
-		This is a Shibboleth 2.3.1 'Safetynet Field Trial' SP owned by RM Education plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJALB0hSzEevYIMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnNuZnR3ZWIwMS5pZGV2LmlmbC5uZXQwHhcNMTAwMjE5MTMyODQ2WhcNMjAw
-						MjE3MTMyODQ2WjAhMR8wHQYDVQQDExZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Cu9o/6D/wmBP45C/0SSxgPv
-						MuYMz8MwX/HJFP2+W4ADHmQhb4DL9x0kxF5ESuy26jCdtB4aUSl1BIi0qNhQ363t
-						sPMrD19R3xgZ1plxt+A9Y6VkkB+lO8A2WFpuwmI+pl7mP8jLvBKgG0g1oxLIqFZS
-						0S9Q7c4Fn9zQTcCNBiirlfTMXggVvASHfpqFIVe+NF5BWrGZqJ7RiPIB4ZnkR1AZ
-						ZNVpu5BsoZdpX601qTf6kT2xDuObdjmWvZWG+Z7VfiRts3lWStSHJe1RoN7nQBQt
-						byBkOzLT/41IrlpJYzzRgfBc0zV+WvMlxqz7rvmNQAPwfEm2bIUrCRRXrDPTHQID
-						AQABo0QwQjAhBgNVHREEGjAYghZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MB0GA1Ud
-						DgQWBBTpdGvCZNgsXYU87SWVZdDvBacV3jANBgkqhkiG9w0BAQUFAAOCAQEANeg4
-						Io4/wYni0tlCN7ObChWNEEb7yuWOA8hKqrxHw0KowzlwY6aXa+cAoibNs8nU2Vfg
-						aeJCm1z87cz/HtvzRtMRW/ddjS/cTbZPzWu8p9EADOGEOGTkofXnJZqFSdCCeFOy
-						78yqS1GCf3hm7Qvj3hhJ8Wbz+jFX0BEjR3kjxMgFCDXz/a0iohCbfFY5ZiByIIHZ
-						rNaIlPACPcHWrUIOzukV7ZeN+wlxbNhm5aXHiEWC6xSLSRHTDYMNhoac/1wEjU9Z
-						zz1XVHG0KovZIi9psy0ehbjZyjupNcsIGjY/flxs6qLNoD1gNxDkJ+2qt+NMZMGJ
-						pEJ7l2rYmZM+/vn4aw==
-					</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>
-						MIIDCTCCAfGgAwIBAgIJALB0hSzEevYIMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnNuZnR3ZWIwMS5pZGV2LmlmbC5uZXQwHhcNMTAwMjE5MTMyODQ2WhcNMjAw
-						MjE3MTMyODQ2WjAhMR8wHQYDVQQDExZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8Cu9o/6D/wmBP45C/0SSxgPv
-						MuYMz8MwX/HJFP2+W4ADHmQhb4DL9x0kxF5ESuy26jCdtB4aUSl1BIi0qNhQ363t
-						sPMrD19R3xgZ1plxt+A9Y6VkkB+lO8A2WFpuwmI+pl7mP8jLvBKgG0g1oxLIqFZS
-						0S9Q7c4Fn9zQTcCNBiirlfTMXggVvASHfpqFIVe+NF5BWrGZqJ7RiPIB4ZnkR1AZ
-						ZNVpu5BsoZdpX601qTf6kT2xDuObdjmWvZWG+Z7VfiRts3lWStSHJe1RoN7nQBQt
-						byBkOzLT/41IrlpJYzzRgfBc0zV+WvMlxqz7rvmNQAPwfEm2bIUrCRRXrDPTHQID
-						AQABo0QwQjAhBgNVHREEGjAYghZzbmZ0d2ViMDEuaWRldi5pZmwubmV0MB0GA1Ud
-						DgQWBBTpdGvCZNgsXYU87SWVZdDvBacV3jANBgkqhkiG9w0BAQUFAAOCAQEANeg4
-						Io4/wYni0tlCN7ObChWNEEb7yuWOA8hKqrxHw0KowzlwY6aXa+cAoibNs8nU2Vfg
-						aeJCm1z87cz/HtvzRtMRW/ddjS/cTbZPzWu8p9EADOGEOGTkofXnJZqFSdCCeFOy
-						78yqS1GCf3hm7Qvj3hhJ8Wbz+jFX0BEjR3kjxMgFCDXz/a0iohCbfFY5ZiByIIHZ
-						rNaIlPACPcHWrUIOzukV7ZeN+wlxbNhm5aXHiEWC6xSLSRHTDYMNhoac/1wEjU9Z
-						zz1XVHG0KovZIi9psy0ehbjZyjupNcsIGjY/flxs6qLNoD1gNxDkJ+2qt+NMZMGJ
-						pEJ7l2rYmZM+/vn4aw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fieldtrial.safetynet.rmplc.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RM Education plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RM Education plc: Safetynet Field Trial</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rm.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Technical Contact</GivenName>
-    <EmailAddress>mailto:shibtechcontact@ifl.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shibboleth Technical Contact</GivenName>
-    <EmailAddress>mailto:shibtechcontact@ifl.net</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 800ab28d..00000000
--- a/swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.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://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>
-    <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/sp-group/aa.cesnet.cz</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 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>MIIC9jCCAd4CCQDdhtc4WQjM2jANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MR0wGwYDVQQDExRmaWxlc2VuZGVyLmNlc25ldC5jejAeFw0xNTA0MDMwNTU1MjdaFw0zNTA0MDIwNTU1MjdaMD0xCzAJBgNVBAYTAkNaMQ8wDQYDVQQKEwZDZXNuZXQxHTAbBgNVBAMTFGZpbGVzZW5kZXIuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv1WBCUZpXFxBpJ0AxFKGuJtdm3MY0PlKNELuzUvVTfiOMqHt19dmuixMzlbk8oPliCI69E6TndBMYnTucueFOgaPi/W7eWEN1p74liVgQQXTypBt8JiIhiHUf4b5AShmNPaWh+IrGtzQ9oFPBdVgU542pT5oLje84ZbfiXMQAwkJ/1lgW0UDVFQTyRrge+aPN89V9Sq5MaHxjzzLvCX0i3BTtUInYUqXOb3E15zTnHiiNtZZOcc9p3QNcEiBpUMyrD/SfGgfAME6wZga4v029vxLDyYCvlArkSCocEgWRISwr4uXK1GiDJ7VKsbO6rSnc//yLz2vt6RYSGrNBimHXQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQChn/lKZGjGsWUav7wlYjAcXND6D8knafWr7LkB/YP819UQJyj+V+Spi+crr/UGQp3anPvh7ZE5Z+/YwuwuuL7r8a9OnKPEZ9jt1XMK7QLNegQcypv0ZhGEprWFPR+B0myu4HaTvqEDZN1Dp4JVbhv5AH+wJUDBJmjnQQYY+ipthydPcXJkiT7S6zlNrSnPEtd1ZigIA5aOpJqQY9OzKZJtH8L30ydGNHCpqu97MxTSyNsP55yQRl+cR8BxOPHvqZQy1lxOhvdciI73pSvhOGz4QWOQ4UJr6BYn4pSRSSeHeySL3iBD1xYFvai+yTeAgEOOYO4SSq9h6Dq8D4THqU4Y</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>MIIC9jCCAd4CCQDdhtc4WQjM2jANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MR0wGwYDVQQDExRmaWxlc2VuZGVyLmNlc25ldC5jejAeFw0xNTA0MDMwNTU1MjdaFw0zNTA0MDIwNTU1MjdaMD0xCzAJBgNVBAYTAkNaMQ8wDQYDVQQKEwZDZXNuZXQxHTAbBgNVBAMTFGZpbGVzZW5kZXIuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv1WBCUZpXFxBpJ0AxFKGuJtdm3MY0PlKNELuzUvVTfiOMqHt19dmuixMzlbk8oPliCI69E6TndBMYnTucueFOgaPi/W7eWEN1p74liVgQQXTypBt8JiIhiHUf4b5AShmNPaWh+IrGtzQ9oFPBdVgU542pT5oLje84ZbfiXMQAwkJ/1lgW0UDVFQTyRrge+aPN89V9Sq5MaHxjzzLvCX0i3BTtUInYUqXOb3E15zTnHiiNtZZOcc9p3QNcEiBpUMyrD/SfGgfAME6wZga4v029vxLDyYCvlArkSCocEgWRISwr4uXK1GiDJ7VKsbO6rSnc//yLz2vt6RYSGrNBimHXQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQChn/lKZGjGsWUav7wlYjAcXND6D8knafWr7LkB/YP819UQJyj+V+Spi+crr/UGQp3anPvh7ZE5Z+/YwuwuuL7r8a9OnKPEZ9jt1XMK7QLNegQcypv0ZhGEprWFPR+B0myu4HaTvqEDZN1Dp4JVbhv5AH+wJUDBJmjnQQYY+ipthydPcXJkiT7S6zlNrSnPEtd1ZigIA5aOpJqQY9OzKZJtH8L30ydGNHCpqu97MxTSyNsP55yQRl+cR8BxOPHvqZQy1lxOhvdciI73pSvhOGz4QWOQ4UJr6BYn4pSRSSeHeySL3iBD1xYFvai+yTeAgEOOYO4SSq9h6Dq8D4THqU4Y</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:bindings:HTTP-POST" 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:1.0:profiles:browser-post" Location="https://filesender.du1.cesnet.cz/simplesaml/module.php/saml/sp/saml1-acs.php/filesender.cesnet.cz" index="5"/>
-    <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="6"/>
-    <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="7"/>
-    <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="8"/>
-    <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="9"/>
-    <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="10"/>
-    <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="11"/>
-    <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="12"/>
-    <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="13"/>
-    <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="14"/>
-    <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="15"/>
-  </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-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.funet.fi.xml b/swamid-interfederations-2.0/filesender.funet.fi.xml
index 2a1d6b01..0dd8c0b9 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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.funet.fi">
-  <md: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>
-  </md:Extensions>
+<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 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">
+      <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="en">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Funet FileSender</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Funet FileSender</mdui:DisplayName>
@@ -24,9 +14,13 @@
         <mdui:PrivacyStatementURL xml:lang="sv">https://filesender.funet.fi/privacypolicy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">https://filesender.funet.fi/privacypolicy.html</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIID5TCCAs2gAwIBAgIJAKpsAW5KzCdBMA0GCSqGSIb3DQEBBQUAMIGIMQswCQYD
 VQQGEwJGSTEQMA4GA1UECAwHVXVzaW1hYTEOMAwGA1UEBwwFRXNwb28xKTAnBgNV
@@ -62,10 +56,10 @@ hI5vFXUxbje7kUBg6nf2Abe2pC7QMDPDerovowNUSO3jaMk+wXna0P0=</ds:X509Certificate>
       <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 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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute 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>
diff --git a/swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.xml
deleted file mode 100644
index 47190844..00000000
--- a/swamid-interfederations-2.0/filesender.internet2.edu-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.internet2.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://filesender.internet2.edu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FileSender</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service allows any researcher at an institution who is a research and education member of InCommon, is willing to release EPPN and e-mail attributes, and operates an IdP to temporarily store a file of up to 1TB in size and notify recipients of its availability and how to retrieve it.  It is designed to provide a solution to the e-mail large file attachement restriction in most mail systems. </mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.internet2.edu/filesender/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/filesender/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEAzCCAuugAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxDELMAkGA1UEBhMCVVMx
-ETAPBgNVBAgTCE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxQTA/BgNVBAoT
-OFVuaXZlcnNpdHkgQ29ycG9yYXRpb24gZm9yIEFkdmFuY2VkIEludGVybmV0IERl
-dmVsb3BtZW50MSEwHwYDVQQDExhmaWxlc2VuZGVyLmludGVybmV0Mi5lZHUxKDAm
-BgkqhkiG9w0BCQEWGXRlY2hzdXBwb3J0QGludGVybmV0Mi5lZHUwHhcNMTIwNTMw
-MTEyOTI5WhcNMjIwNTI4MTEyOTI5WjCBxDELMAkGA1UEBhMCVVMxETAPBgNVBAgT
-CE1pY2hpZ2FuMRIwEAYDVQQHEwlBbm4gQXJib3IxQTA/BgNVBAoTOFVuaXZlcnNp
-dHkgQ29ycG9yYXRpb24gZm9yIEFkdmFuY2VkIEludGVybmV0IERldmVsb3BtZW50
-MSEwHwYDVQQDExhmaWxlc2VuZGVyLmludGVybmV0Mi5lZHUxKDAmBgkqhkiG9w0B
-CQEWGXRlY2hzdXBwb3J0QGludGVybmV0Mi5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDJB0GAiWyeyrR5PgW3rnNspNceX1w3M1HL8jY4ZABYUTQz
-hfHhzhrXxxHwM8Ei8yUczK9hSnHtnURP7GulLfj/4cJZT7lwE/rJopJLPCpS2rXh
-JsAhhpjJVV80FF+wVofDMGZwu/gWR2DKcee6Spok7f2pJJLBbmX5DtenMoR6n7Tp
-aVpEtD+wgxrauh/7zzyUJtUbahflUoGxX0Il7LLetOYGgT4u65Du4f/t0fkBxmrl
-vZaNQDDwiJC9g2vZZ5poukx61okmvvkJHs2IsFGbIPrO6lE0v9kDZ93MawTuXuz1
-vldyvULlZ08p7rNIFWI6qqcdtlROgU0iKCcIOUXXAgMBAAEwDQYJKoZIhvcNAQEF
-BQADggEBAKfZknSamtnmWlj0WogmIDn68RoEu8VdU8ny8G0+tErvGGUI9l/y68+h
-X6XyGHPmKUzNMs++wO6e2NjnT+cNNiYgNoSNom+t3I4IxfIE6AGvzqFlhwZrgqAg
-TFow06r0ratzBhfcRlNldAJ30SIFSn/5TyjyR/fAQ8S228saq7hMA8NyzrUY0rqT
-TTiYKzVJRFUVeY1tyDhvMC6PfF5sZLe8hG/rOWVG+h8U5a7FcKkGElxxDDCNsehy
-IGjK2QnyLyqzPNnHwosEzEZDf2yLb6Ee2PIApSqKtO9Syl5QMCiG1dJpb2my00IF
-LXYiHXLNNHaUlb4KEmLyRIb/SCUFu/g=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://filesender.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://filesender.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://filesender.internet2.edu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://filesender.internet2.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">FileSender</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service allows any researcher at an institution who is a research and education member of InCommon, is willing to release EPPN and e-mail attributes, and operates an IdP to temporarily store a file of up to 1TB in size and notify recipients of its availability and how to retrieve it.  It is designed to provide a solution to the e-mail large file attachement restriction in most mail systems. </md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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="mail" Name="urn:mace:dir:attribute-def:mail" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>TSG</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>TSG</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>TSG</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</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 4e7fe04d..00000000
--- a/swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.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://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>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5EaWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcNMTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRlbzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRlcyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJUvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEUamd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCCAdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFjG3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8UefMgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkGI6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEvyL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJGs5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</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>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5EaWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcNMTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRlbzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRlcyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJUvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEUamd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCCAdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFjG3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8UefMgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkGI6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEvyL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJGs5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</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:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Filesender - RedCLARA</md:ServiceName>
-      <md:ServiceName xml:lang="es">Filesender - RedCLARA</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">RedCLARA Nrenadmin Service</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="es">RedCLARA Nrenadmin Service</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.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.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.37" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </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 fffe3e9c..00000000
--- a/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.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://fim-hn-02-idp.orion.education.fr">
-  <md: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>
-  </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 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-bordeaux.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-toulouse.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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-guyane.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-lyon.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-amiens.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-caen.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-creteil.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-dijon.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-lille.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">recherche.gouv.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Education Nationale</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACfklEQVQ4y32SW0jTARTGf/952WyueamWCmapQcsUCzNBsx4qiiRnPURBYZcHUyJYiEEQEVgRSFYEWZaXBzGyK1EmajfMLqI9uFkGlqLFSFELN+e204O6vGTf4znfdzjfOZ8iItnABsDFDLgRvla94em1GlTWEXK6ryJqBWUqSUTK5T+4tDpPzhj2yqCl9599RKR0TrVbpKfJKiN9g3NSfPkHhjp/0HK7ga5mC2NjLuYvCsa4aQ0JWekoWr9pXNVM8YvCas6uyOFdRT0hkQZiU+Nw253UHCuhcOUhel9apwumWnhaUCoFgVnSdPHebDf9dinfeVpO+Jmkr6nDW1dEpBQ48L35ExdT8tl9M5fE/Zu5EJ6Nb0QALqcbj9NFdIqRXWVmyjJPYbP2km+5AT5TLDRevsuStGgSszfj/uXAs8AHVbCG+Mx1GHesJSwuCgDThSMMdPXzufY9AL6CoKDQ9drKllN7ptlTq3yJN6UxanegN4QCoI81EJmyjM7GVpZvS0LlAXAIdpudoLBQr1hRFH677BQnH6c41cyHyjpvLzhyIb9sg+MbqADUCppQDcMTxYnjovcP5GhPJU7HKP46jbc33DdAWPzSKW9UIDI5lpaqBi/J4xaGRn9TcfAclYfPU3uyDICR7gG+vf1CzPqE8QGTyU7PM9FZZ6G9+hU+Og3hURGELV6MJjAArV5HgF4LwMOT19GG6jBuTZ6dgwe5V6RAnyVtlfWzM+vwyJ1DRZKv3iFdz9pm52By9SfmEp4XPcawOoJVGeuYF6LD1tHDx/vNiNPDvltmojOS/h575gCAn+3dWB410936GZdzDG2QjpiNicRtT8EvZN60V/8B3OKmKDpnnJwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDArMDI6MDDUOMI2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAwKzAyOjAwpWV6igAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ac-orleans-tours.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Employees of french department of education</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Education Nationale</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnel enseignant, non enseignant et scolaire de l'éducation nationale</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>
-					      MIIDIDCCAgigAwIBAgIEVVNL8jANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJGUjEcMBoGA1UE
-ChMTRWR1Y2F0aW9uIE5hdGlvbmFsZTEMMAoGA1UECxMDUEhNMRcwFQYDVQQDEw5maS1odWJobjAy
-LTEuMDAeFw0xNTA1MTMxMzA0NTBaFw0yNTA1MTAxMzA0NTBaMFIxCzAJBgNVBAYTAkZSMRwwGgYD
-VQQKExNFZHVjYXRpb24gTmF0aW9uYWxlMQwwCgYDVQQLEwNQSE0xFzAVBgNVBAMTDmZpLWh1Ymhu
-MDItMS4wMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmh0GKDoLVI0UyfshsTbzls3Q
-t//JyP2f9EBaxM4M+KzFef3USusMWLn2m0D3Y6ecQbCONRFsH2kfG72Asy+zFsy4KPNZwyItp/nW
-wpcBdE2yGw4YqdEX5CRPggdPFL8iXlNG0cVXJ1tpQ9nI+c/U+EZvTzS5HQcTP1cp6/RwFOB1Oj4z
-5mC0mf9GkSfbx6Y2i+7q5wTim21SiSJOmAM8A8HBlgEM0rWsmCdc6wsTlatOTJIPyCt5zrNhO/69
-IUBqEFv62Q6zozgU/p6XqAVuJQ2ZC0byVaqJ1mZ0Rz1VQvTqX+VSazLmaTmRNIlIKbcsCoYtIn33
-DAC2IJLYGVlfqwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAhYIz28IZ/UFOpLBukQ7jnNu64oNs7
-1lSR6apVcRAURXupXqP+9KXwd7u6pjXyVSbYE8T+2kIf2nDSF7f0MCbMalq8vrtopkmtmdVVbgNL
-4TU5K3ihWjDF8MHSymRSQu3YMPfkl1RcK5fd/0KdVaoaEtlFSWhPXonhTTPvEOp6Flfh3VhN6B8r
-hiwr16YitDuKwQORm7l8MtSbkmUqEHMs+j2KEeCrYu5ZP6SEMVjuEa8GZ5UuZJI29Tdkq5AxE18E
-nNm4mE3ZEwRRIOlYB0qsky0se2kWVQhuSGrd8J30kTMggyS5nEEa5vqehDF/h9SOwfryDgMNDlQQ
-kP/+B8/c
-					    </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-POST" Location="https://fim-hn-02-idp.orion.education.fr/sso/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fim-hn-02-idp.orion.education.fr/sso/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fim-hn-02-idp.orion.education.fr/sso/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Education Nationale</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Education Nationale</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ac-orleans-tours.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>pole-hebergement@ac-orleans-tours.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fim.temple.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/fim.temple.edu-idp-shibboleth.xml
deleted file mode 100644
index 5b9e4293..00000000
--- a/swamid-interfederations-2.0/fim.temple.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,111 +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://fim.temple.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">temple.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Temple University</mdui:DisplayName>
-        <mdui:PrivacyStatementURL xml:lang="en">http://policies.temple.edu/getdoc.asp?policy_no=04.72.11</mdui:PrivacyStatementURL>
-        <mdui:Logo height="67" width="310" xml:lang="en">https://temple.edu/sites/all/themes/edu/logo.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>
-MIIDBTCCAe2gAwIBAgIJAKA0GrgI0cTnMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMMDmZpbS50ZW1wbGUuZWR1MB4XDTEzMDIyMjE4MDM1MloXDTIzMDIyMDE4MDM1
-MlowGTEXMBUGA1UEAwwOZmltLnRlbXBsZS5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCwu4yPCdVKlMgpniAuLurWytpKVHYh+CrmvEab3kuRjCLT
-kajunn+3pqGGI1Njczs709PRrbDqj44zVb34/5jJtxQXIe+vTqDiSW3/xrqQcRB9
-FR2sOGa4iz+kTrxgN/6YNfcYO4b2F83bc7lzeN9BIRh2IxgVkhuHab7ohSKES6RV
-znIcSViHimbsCHTV6zXXfWNswgGZ2UoJ843jKinTJO6Sq5dHZ53P7vkHRK9IFfHD
-PFJ5VH+zlW1VfF+Ro8bNMA8voyv+I5zFC+n13xn3KxEQvnN1rK3cqkNi3DKR0FFX
-gdIVhDRTZr/w5z9cjfrjKq90Cy9tiy5HaxVaUTQbAgMBAAGjUDBOMB0GA1UdDgQW
-BBQQBUkle4SeFWBhr9y+eS82YpvJiTAfBgNVHSMEGDAWgBQQBUkle4SeFWBhr9y+
-eS82YpvJiTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCZLqYHrJqR
-0PkQW2MjwUMXbpDlRYXqMDu93kbnumLo3Ss7uzbeCZQTtgH99Rt1kWlw/DCp8BGf
-ZNLwqaT6lqUsAZAj0tDAeqO+ydbuwqzCysUQy03q6asRLTRl2XezMOybbQTQu0BF
-nLqUXjv1oHD1SrDDMCNzOrjznvw89pg8fUvsgT30phx+IA5njtz2LbEwcXxnhsKV
-q+x6F/F9cOCo68SUYj73TTCdFncYkd1EeOTbwOMoEO96C1V+E+edJ7EREC1sCzDE
-/M1V7IZioBwr7hRVDResfOVZCtrjQKsOi6JoDv9GHpkOdfx6f3Pew+THZIbiTZW+
-9mp5houYXEyJ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fim.temple.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fim.temple.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fim.temple.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fim.temple.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fim.temple.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">temple.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDBTCCAe2gAwIBAgIJAKA0GrgI0cTnMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMMDmZpbS50ZW1wbGUuZWR1MB4XDTEzMDIyMjE4MDM1MloXDTIzMDIyMDE4MDM1
-MlowGTEXMBUGA1UEAwwOZmltLnRlbXBsZS5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCwu4yPCdVKlMgpniAuLurWytpKVHYh+CrmvEab3kuRjCLT
-kajunn+3pqGGI1Njczs709PRrbDqj44zVb34/5jJtxQXIe+vTqDiSW3/xrqQcRB9
-FR2sOGa4iz+kTrxgN/6YNfcYO4b2F83bc7lzeN9BIRh2IxgVkhuHab7ohSKES6RV
-znIcSViHimbsCHTV6zXXfWNswgGZ2UoJ843jKinTJO6Sq5dHZ53P7vkHRK9IFfHD
-PFJ5VH+zlW1VfF+Ro8bNMA8voyv+I5zFC+n13xn3KxEQvnN1rK3cqkNi3DKR0FFX
-gdIVhDRTZr/w5z9cjfrjKq90Cy9tiy5HaxVaUTQbAgMBAAGjUDBOMB0GA1UdDgQW
-BBQQBUkle4SeFWBhr9y+eS82YpvJiTAfBgNVHSMEGDAWgBQQBUkle4SeFWBhr9y+
-eS82YpvJiTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCZLqYHrJqR
-0PkQW2MjwUMXbpDlRYXqMDu93kbnumLo3Ss7uzbeCZQTtgH99Rt1kWlw/DCp8BGf
-ZNLwqaT6lqUsAZAj0tDAeqO+ydbuwqzCysUQy03q6asRLTRl2XezMOybbQTQu0BF
-nLqUXjv1oHD1SrDDMCNzOrjznvw89pg8fUvsgT30phx+IA5njtz2LbEwcXxnhsKV
-q+x6F/F9cOCo68SUYj73TTCdFncYkd1EeOTbwOMoEO96C1V+E+edJ7EREC1sCzDE
-/M1V7IZioBwr7hRVDResfOVZCtrjQKsOi6JoDv9GHpkOdfx6f3Pew+THZIbiTZW+
-9mp5houYXEyJ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fim.temple.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Temple University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Temple University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.temple.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Computer Services HelpDesk</md:GivenName>
-    <md:EmailAddress>help@temple.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Office of Identity and Access Management</md:GivenName>
-    <md:EmailAddress>oiam@temple.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Office of Identity and Access Management</md:GivenName>
-    <md:EmailAddress>oiam@temple.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jorj Bauer</md:GivenName>
-    <md:EmailAddress>jorj@temple.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Jorj Bauer</md:GivenName>
-    <md:EmailAddress>jorj@temple.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Office of Identity and Access Management</md:GivenName>
-    <md:EmailAddress>oiam@temple.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/finden.nationallizenzen.de.xml b/swamid-interfederations-2.0/finden.nationallizenzen.de.xml
deleted file mode 100644
index 937083df..00000000
--- a/swamid-interfederations-2.0/finden.nationallizenzen.de.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://finden.nationallizenzen.de/sp/suchkiste">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://finden.nationallizenzen.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>finden.nationallizenzen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=finden.nationallizenzen.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkjCCBHqgAwIBAgIED35qxjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwMTI2MTMyNTEx
-WhcNMTUwMTI1MTMyNTExWjCBrDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
-QmlibGlvdGhlazEjMCEGA1UEAxMaZmluZGVuLm5hdGlvbmFsbGl6ZW56ZW4uZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOBLJTZ7ieik04SmpupAIf
-++pZCiBpMcgBIJO8VXq449T9/zFA8qYG9H6Y65QJOobBIha049uvNT+QnHO7I9fc
-WfVhI61hhF3pMlhO64Gj5LwjYp7PUSTM8OIbZcKsuq8t3Zfr7T0v6Es3diCxWMDn
-SHCJ+EiSmp65ZB0Cy0f7bSFJYtUgqruVutBDW1yVvEfGxnaDQqr0+X8R3sifMCh7
-3kTTO9qJ2iMlo5yUsMsswa9PKRJGPouflkjmgOia6YfAGscUe5PX94uGTWpKEsRd
-QHC2JENB/cNVeevN8s7psMi8d9I+55J1uszEx2w7g+5objFnHOuyLSkV+9EDUeiz
-AgMBAAGjggGpMIIBpTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFE4Qs3QA7KlY99nd061NOOod
-qdUVMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBoGA1UdEQQTMBGB
-D2tpbnN0bGVyQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYI
-KwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwDQYJKoZIhvcNAQEFBQADggEBACitzuQ265c448yHkBx/QR7rF8NgzABht68b
-E52cg+YTHy0qYxKO+vnwRM3/qck9BY6PcVdUn+muHDZD6WGrmPC0RDwtbxVDdUjG
-iLtXCtK3mXU2nnbexqSihT3Qf4X9l8P5d6kzaonjReRoDPsnhs0/HWo/eiLFmbU3
-9ie2238HqHJHWS3m/cbNUwsY70U/UFjo+9Uh2SIESJkkS0WOJAtZsIgi9jNCyBGH
-oDbPnIHiEe7icPfgaEirwMA0e/yqQsVLpvb4ONfOJSYjfqWhwFZY8q2AbqEJn2tl
-A3Q0ZVArSnUxthanQHzzhjuc64pQuFHcijaeqQYJUPYiRqYVEuY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>finden.nationallizenzen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=finden.nationallizenzen.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkjCCBHqgAwIBAgIED35qxjANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwMTI2MTMyNTEx
-WhcNMTUwMTI1MTMyNTExWjCBrDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
-QmlibGlvdGhlazEjMCEGA1UEAxMaZmluZGVuLm5hdGlvbmFsbGl6ZW56ZW4uZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOBLJTZ7ieik04SmpupAIf
-++pZCiBpMcgBIJO8VXq449T9/zFA8qYG9H6Y65QJOobBIha049uvNT+QnHO7I9fc
-WfVhI61hhF3pMlhO64Gj5LwjYp7PUSTM8OIbZcKsuq8t3Zfr7T0v6Es3diCxWMDn
-SHCJ+EiSmp65ZB0Cy0f7bSFJYtUgqruVutBDW1yVvEfGxnaDQqr0+X8R3sifMCh7
-3kTTO9qJ2iMlo5yUsMsswa9PKRJGPouflkjmgOia6YfAGscUe5PX94uGTWpKEsRd
-QHC2JENB/cNVeevN8s7psMi8d9I+55J1uszEx2w7g+5objFnHOuyLSkV+9EDUeiz
-AgMBAAGjggGpMIIBpTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFE4Qs3QA7KlY99nd061NOOod
-qdUVMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBoGA1UdEQQTMBGB
-D2tpbnN0bGVyQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYI
-KwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwDQYJKoZIhvcNAQEFBQADggEBACitzuQ265c448yHkBx/QR7rF8NgzABht68b
-E52cg+YTHy0qYxKO+vnwRM3/qck9BY6PcVdUn+muHDZD6WGrmPC0RDwtbxVDdUjG
-iLtXCtK3mXU2nnbexqSihT3Qf4X9l8P5d6kzaonjReRoDPsnhs0/HWo/eiLFmbU3
-9ie2238HqHJHWS3m/cbNUwsY70U/UFjo+9Uh2SIESJkkS0WOJAtZsIgi9jNCyBGH
-oDbPnIHiEe7icPfgaEirwMA0e/yqQsVLpvb4ONfOJSYjfqWhwFZY8q2AbqEJn2tl
-A3Q0ZVArSnUxthanQHzzhjuc64pQuFHcijaeqQYJUPYiRqYVEuY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://finden.nationallizenzen.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://finden.nationallizenzen.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://finden.nationallizenzen.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://finden.nationallizenzen.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://finden.nationallizenzen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Suchkiste</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Suchkiste der Nationallizenzen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://finden.nationallizenzen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Franck</GivenName>
-    <SurName>Borel</SurName>
-    <EmailAddress>borel@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Till</GivenName>
-    <SurName>Kinstler</SurName>
-    <EmailAddress>kinstler@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gerald</GivenName>
-    <SurName>Steilen</SurName>
-    <EmailAddress>steilen@gbv.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml b/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml
deleted file mode 100644
index 579522d7..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fire.rettorato.unito.it/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md: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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/SOAP"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">YouBlog</md:ServiceName>
-      <md: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.</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="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="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:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Università degli Studi di Torino</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Torino</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">YouBlog provided by Università degli Studi di Torino</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">YouBlog erogato da Università degli Studi di Torino</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unito.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unito.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:sewi-id@unito.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:sewi-id@unito.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 a7010fe3..00000000
--- a/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
+++ /dev/null
@@ -1,94 +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://fire.rettorato.unito.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-01-27T18:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
-    </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>
-      <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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.serviziweb.unito.it/youblog/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://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>serviziweb.unito.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=serviziweb.unito.it,O=Universit\C3\A0 degli Studi di Torino,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEgDCCA2igAwIBAgIRAI23y9ITrv6V83fVgnk6IS0wDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMDA5MjAwMDAwMDBaFw0xMzA5MTkyMzU5NTlaMFcxCzAJBgNV
-                            BAYTAklUMSowKAYDVQQKDCFVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBUb3Jp
-                            bm8xHDAaBgNVBAMTE3NlcnZpeml3ZWIudW5pdG8uaXQwggEiMA0GCSqGSIb3DQEB
-                            AQUAA4IBDwAwggEKAoIBAQDYkhN1NRqrtcwJFbOnfXDkQ2jt2W6RKLlu92y32YOa
-                            6tpdTt/79tKgwu/LBKsxfkDqpgSUCvDF6nMZtRXT+slDvLSTDNDlmR5qZNfvX2NJ
-                            EKyoUmkx/dwUiBdQStRI6xyRqFYOYUBMzazcNwmDBsHP95ehvPNm7Elizy+1q+NB
-                            c81vhwn0d3pDjTss3XwTKupzMvIvFD+IumMPLNXwGM6xoIpQDcs5xgZixepu5c0w
-                            CxcDraqezCn8Wf+ZcIGnEPAW95lRvZzRmEAKzvbay/5kLdq0ZhCqFMNaKtU0nNjF
-                            2RnoYeRA2Xpl4hj8vKzfN8cCjZP7ZA8so0y0nzZjtL8hAgMBAAGjggFmMIIBYjAf
-                            BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU8PHbME7x
-                            lHVkY1LYPThdV2ejntAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-                            VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-                            MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-                            Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-                            dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-                            BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITc2Vy
-                            dml6aXdlYi51bml0by5pdDANBgkqhkiG9w0BAQUFAAOCAQEAhWmFJToQzrYj/Uwl
-                            qs/clWgOURj7pNLtlJiL21XLjwBSAoO6Ox4V5T6xwTpOnueYctmNFdK7I8j1u/1y
-                            DQwWk81sztxj9F8NKpY1OdVq8hRQ0H4LFfJ7hhc4xVkWobFZfIfyyJtfrk9DTaV4
-                            Xq/lyNvgH9Ged1GPDmLaqzvEZW30ZPqL9mULnEDDIoLmnD5WfsumO2UlN6Q+lMWC
-                            lHN+wFATPaPZvPYt12ps5OumiSpZ42FgdQMPEOeFkYNt0/87ez/c9wyI+pD1NFQw
-                            +cdP6e+25hKx4NUoRUr+Q8SaOLJ2xYDrs4nWjZFn5TLknCwU8ljoVGjzbyg+KaLh
-                            HU+UDg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/SOAP"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">YouBlog</md:ServiceName>
-      <md: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.</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="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="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:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Università degli Studi di Torino</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Torino</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">YouBlog provided by Università degli Studi di Torino</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">YouBlog erogato da Università degli Studi di Torino</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unito.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unito.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>sewi-id@unito.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>sewi-id@unito.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fiuidp.fiu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/fiuidp.fiu.edu-idp-shibboleth.xml
deleted file mode 100644
index d6e65cdc..00000000
--- a/swamid-interfederations-2.0/fiuidp.fiu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://fiuidp.fiu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://it.fiu.edu/helpdesk/index.shtml" 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">fiu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Florida International University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://it.fiu.edu/index.shtlm</mdui:InformationURL>
-        <mdui:Logo height="85" width="64" xml:lang="en">https://fiuidp.fiu.edu/idp/images/fiulogo.jpg</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>
-MIIDJDCCAgygAwIBAgIVAM7rDFYiAD7ejQynyojPagGeGUuGMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmZpdWlkcC5maXUuZWR1MB4XDTEyMDMxMzEzNTEzNVoX
-DTMyMDMxMzE0NTEzNVowGTEXMBUGA1UEAxMOZml1aWRwLmZpdS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnubM4QbTQQYvUMNGlVB1uO4xwDlcy
-9tyXYqE4sjAFu/Fqjv+C4IkDD1BZy+pI+glAWgftq9Vox/dvC1oMcfuhSxAWB7st
-+aBlKusubh7UAQs+2lym/x0i4E30OMrG2MAcO9pZoGJT+xiOTgba+Vd977KzZdOv
-o2wAvABy9dJmH+TboHR7w8AOgzQ/QDqOlTq75uMG5fuZhtRAULUKUsMG7niWQCXe
-Yf3zGE4hStEXos17DnFWzP7S+BZtaPShkPupLR7A23ZiEg8UMRNtdAzXl5ljbrus
-A6UgnbYslO3NTinTUlRzeB79P7iv3tGujsKEZBZM7jnbEaCnYOthhrwlAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmZpdWlkcC5maXUuZWR1hiVodHRwczovL2ZpdWlkcC5m
-aXUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ/EzTBahbswoM9gJhVbmdK
-LzJsBjANBgkqhkiG9w0BAQUFAAOCAQEAE/oT8PSELMiKXo9QKG3YiHY5+2QxQBs2
-hqUI3HpTrRCegfQMc8ymCp3nWU6MMa/R2JxPyekKHTCJyrBvYv8FT/sBPnRXXLHV
-bfZk10puNnuILfkT8vsdd3fBJ1/dBWd2Aop5axWdPCse2zB8ChJ1ImrhCu8fhI1T
-H4Rqr8AkOIuUXRvDvlOj6PUP6J1luFFcQZl5v+uREv5Pih8W5NhKY+ENPrFX2g59
-iWZ7NojDxss/TtqsvGDbMHlt3PNg/FC6rHlcW9gH0qudXf1wLh8u+quX/7mGGvIv
-FfPU6B1stKoyNoo42HbUm+KOc8S3L3yaxGZfWtL8kNhY0hSXrYI13w==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fiuidp.fiu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fiuidp.fiu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fiuidp.fiu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fiuidp.fiu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fiuidp.fiu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fiuidp.fiu.edu/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">fiu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAM7rDFYiAD7ejQynyojPagGeGUuGMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmZpdWlkcC5maXUuZWR1MB4XDTEyMDMxMzEzNTEzNVoX
-DTMyMDMxMzE0NTEzNVowGTEXMBUGA1UEAxMOZml1aWRwLmZpdS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnubM4QbTQQYvUMNGlVB1uO4xwDlcy
-9tyXYqE4sjAFu/Fqjv+C4IkDD1BZy+pI+glAWgftq9Vox/dvC1oMcfuhSxAWB7st
-+aBlKusubh7UAQs+2lym/x0i4E30OMrG2MAcO9pZoGJT+xiOTgba+Vd977KzZdOv
-o2wAvABy9dJmH+TboHR7w8AOgzQ/QDqOlTq75uMG5fuZhtRAULUKUsMG7niWQCXe
-Yf3zGE4hStEXos17DnFWzP7S+BZtaPShkPupLR7A23ZiEg8UMRNtdAzXl5ljbrus
-A6UgnbYslO3NTinTUlRzeB79P7iv3tGujsKEZBZM7jnbEaCnYOthhrwlAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmZpdWlkcC5maXUuZWR1hiVodHRwczovL2ZpdWlkcC5m
-aXUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ/EzTBahbswoM9gJhVbmdK
-LzJsBjANBgkqhkiG9w0BAQUFAAOCAQEAE/oT8PSELMiKXo9QKG3YiHY5+2QxQBs2
-hqUI3HpTrRCegfQMc8ymCp3nWU6MMa/R2JxPyekKHTCJyrBvYv8FT/sBPnRXXLHV
-bfZk10puNnuILfkT8vsdd3fBJ1/dBWd2Aop5axWdPCse2zB8ChJ1ImrhCu8fhI1T
-H4Rqr8AkOIuUXRvDvlOj6PUP6J1luFFcQZl5v+uREv5Pih8W5NhKY+ENPrFX2g59
-iWZ7NojDxss/TtqsvGDbMHlt3PNg/FC6rHlcW9gH0qudXf1wLh8u+quX/7mGGvIv
-FfPU6B1stKoyNoo42HbUm+KOc8S3L3yaxGZfWtL8kNhY0hSXrYI13w==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fiuidp.fiu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fiuidp.fiu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Florida International University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Florida International University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fiu.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth Admin</md:GivenName>
-    <md:EmailAddress>idpadmins@fiu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>anu chirinos</md:GivenName>
-    <md:EmailAddress>anu@fiu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Shibboleth Support</md:GivenName>
-    <md:EmailAddress>idpadmins@fiu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2131d427..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">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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://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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Greek Research and Technology Network</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-    <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>Leonidas</md:GivenName>
-    <md:SurName>Poulopoulos</md:SurName>
-    <md:EmailAddress>leopoul@noc.grnet.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Leonidas</md:GivenName>
-    <md:SurName>Poulopoulos</md:SurName>
-    <md:EmailAddress>leopoul@noc.grnet.gr</md:EmailAddress>
-  </md: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 538a6eab..b7216562 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,37 +1,24 @@
 <?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:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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://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:AttributeValue>http://refeds.org/category/research-and-scholarship</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:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2010-10-01T06:07:41Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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: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>
@@ -44,26 +31,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 Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" 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" 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: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.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: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 1cf3fb1c..00000000
--- a/swamid-interfederations-2.0/foodl.org.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://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:Logo height="58" width="187">https://foodl.org/res/foodle_logo.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>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 8787f105..00000000
--- a/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://forge.switch.ch/shibboleth">
-  <md: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>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>switch.ch</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>others</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">
-    <md: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>
-    </md:Extensions>
-    <md: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>
-    </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://forge-dev.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/POST" index="3"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://forge.switch.ch/Shibboleth.sso/SAML2/ECP" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeya.switch.ch/Shibboleth.sso/SAML2/ECP" index="12"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML/POST" index="13"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://forge.switch.ch/Shibboleth.sso/SAML/POST" index="14"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/POST" index="15"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forge-dev.switch.ch/Shibboleth.sso/SAML/Artifact" index="16"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://forge.switch.ch/Shibboleth.sso/SAML/Artifact" index="17"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeya.switch.ch/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Forge: Project Hosting Platform</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">switch.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">SWITCH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.switch.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.switch.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.switch.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.switch.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SWITCHaai</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@switch.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Lukas</md:GivenName>
-    <md:SurName>Hämmerle</md:SurName>
-    <md:EmailAddress>mailto:lukas.haemmerle@switch.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 44 268 15 05</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 e0635ba7..00000000
--- a/swamid-interfederations-2.0/forge.switch.ch.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://forge.switch.ch/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-06-14T15:40:06Z">
-      <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">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: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="en">SWITCH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">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/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml b/swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml
deleted file mode 100644
index ad461be3..00000000
--- a/swamid-interfederations-2.0/fr-rennes1-shibboleth.moveon4.com-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fr-rennes1-shibboleth.moveon4.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-10T13:01:10Z">
-      <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>https://federation.renater.fr/category/logiciel</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/commercial</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">MoveON - software for international activity management</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://moveon4.com/513</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Moveon enables institutions of higher education to succeed in the highly internationalised world of higher education. International offices can easily control and manage all internationalisation activities, reduce their daily administrative workload and save time and money.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">MoveON - Logiciel de gestion des activités Internationales</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Dans le monde fortement internationalisé de l'enseignement supérieur, MoveON appuie les établissements d'enseignement supérieur dans leur réussite quotidienne. Les services des Relations Internationales peuvent ainsi facilement contrôler et gérer toutes les activités d'internationalisation, réduire leur charge de travail administrative quotidienne et gagner en temps et en argent.</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>
-					      MIIFgTCCA2mgAwIBAgIJAMwjeTq6427PMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
-BAYTAkRFMRwwGgYDVQQKDBNRUyB1bmlzb2x1dGlvbiBHbWJIMSowKAYDVQQDDCFm
-ci1yZW5uZXMxLXNoaWJib2xldGgubW92ZW9uNC5jb20wHhcNMTMxMDE4MTIzMjAx
-WhcNMzMxMDEzMTIzMjAxWjBXMQswCQYDVQQGEwJERTEcMBoGA1UECgwTUVMgdW5p
-c29sdXRpb24gR21iSDEqMCgGA1UEAwwhZnItcmVubmVzMS1zaGliYm9sZXRoLm1v
-dmVvbjQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAo5gJXFe1
-2g8Quhi/cNXAjEfKIWAknNVglyr2j+bQW0LJC4qbbYBgi76Xi0jiYXs0BFW1Fn5U
-u6SYjneFdhvBuchwO1yRYhA/DGk71dro07qbWBlnyZE173/5MEA2GcdcFI7nwlzO
-hIMZ3Stair2e/kkl/Jasv3x1qDGWYLnRruVwiWoYsTJ9rPTjYwvSBRlF8xkBn138
-v3+pp2OgbZ7OwXNKGkg7CWsDEIo9rsJ5pfTI9iIHD4CtBylZltXGZM3Ur5DysJKa
-cjnax3wqcNdi2oepq2p/uzb99oP6qty01h26q+RvHyXZ35Rr8WAA01eGgcceKwIy
-ZIt92WD8CCtNCLb9ZollbYfuQrS8zLvPgYcy6cMgngDiqm+QN6H3fHq5zyxJ7+/X
-7Xn8yNi3fwNX5UAM4UVnnRKMDugqdY7Tn3TQr1ciIhyslEaW2PtwyOfL8eOLAdtx
-8psVs2g2jkvhxMYreR8IKEyevoXu6tEzjbEArfmg3PVk6rjVb1ecpH+u9s6LfoRb
-+VL7QcfMQP/pzyI7wnGBq+eur2779yCJ7eDoAlsYoSYFXiQzjVOFSAaiibU+9URL
-PCYApGw5n/9AE8722lAbq8lfo3Roe/nKv9FaPHr96CzTLUemF7tXRnTT6ttvWtOj
-g94reZ34ZscGngAZUIvc+ASXWrh5iPIKH4ECAwEAAaNQME4wHQYDVR0OBBYEFCZU
-Hgz/G7GV+x27JvXYq0sRSmmpMB8GA1UdIwQYMBaAFCZUHgz/G7GV+x27JvXYq0sR
-SmmpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAAOq5QsqOL/SBiq4
-7tIXdOw8VNM/FtleNM0hMpIoS9ivRk075F4jcZymbMNq0gwbj3lIKAji9RO7dIPY
-ll5EL4jdjqVzxtg1iEb6xJS9G8m5QZC0IaNPoEGeWRwIYIdRldDEum4LRnWqYXAq
-SlVCRayRQCCs4DlO7RIH84lxPuaVlVDahDVjX2eR9lf/uul+d0zoP/C8Mz5Cvatn
-51NZoFLZpFZ1PxiqxylggSzVmygXLWpfWhqX8Prx/eXjXRKjUHnzFPWgmNmnGpcb
-UCpF7K5PPMz4FiUYid0v0Ac84zg+rPEV+9dPEL1usKOl9BvuH3lTyZtuBmp0Kx1e
-OqTC8Mf+b414tRV0KhZzCTaITouTcPi6kN9Jtr200Ig5R4WJ0hQwrwz76+Zc5T/P
-Q4fYDZE+qVryDsGh3IRMtsiYJ+/pPKk3HgSwEicXP7HApZbGvCco/rHXrW+KiHgT
-l/BRl/FYOs2w8wRLADgOiQGT92xtLIjuDUcGVzxRK1dyTaCR4aMX1YIAb+h3im0f
-rrPJSF3aEIjK187ZpbTIY0gOLJUF0ELDLJy4Ql2EW1Z5hSJEo9VJy3z/3auv9IyH
-fYz9g//4YOQZaSQ5c3wgr+got1KVUh3fFQ82d2DC1YFp/wufjKeLfA6zhQYZU1g3
-5l0v1ZR1poQgqV6AJfPMlW+DyGU+
-
-					    </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>
-					      MIIFgTCCA2mgAwIBAgIJAMwjeTq6427PMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
-BAYTAkRFMRwwGgYDVQQKDBNRUyB1bmlzb2x1dGlvbiBHbWJIMSowKAYDVQQDDCFm
-ci1yZW5uZXMxLXNoaWJib2xldGgubW92ZW9uNC5jb20wHhcNMTMxMDE4MTIzMjAx
-WhcNMzMxMDEzMTIzMjAxWjBXMQswCQYDVQQGEwJERTEcMBoGA1UECgwTUVMgdW5p
-c29sdXRpb24gR21iSDEqMCgGA1UEAwwhZnItcmVubmVzMS1zaGliYm9sZXRoLm1v
-dmVvbjQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAo5gJXFe1
-2g8Quhi/cNXAjEfKIWAknNVglyr2j+bQW0LJC4qbbYBgi76Xi0jiYXs0BFW1Fn5U
-u6SYjneFdhvBuchwO1yRYhA/DGk71dro07qbWBlnyZE173/5MEA2GcdcFI7nwlzO
-hIMZ3Stair2e/kkl/Jasv3x1qDGWYLnRruVwiWoYsTJ9rPTjYwvSBRlF8xkBn138
-v3+pp2OgbZ7OwXNKGkg7CWsDEIo9rsJ5pfTI9iIHD4CtBylZltXGZM3Ur5DysJKa
-cjnax3wqcNdi2oepq2p/uzb99oP6qty01h26q+RvHyXZ35Rr8WAA01eGgcceKwIy
-ZIt92WD8CCtNCLb9ZollbYfuQrS8zLvPgYcy6cMgngDiqm+QN6H3fHq5zyxJ7+/X
-7Xn8yNi3fwNX5UAM4UVnnRKMDugqdY7Tn3TQr1ciIhyslEaW2PtwyOfL8eOLAdtx
-8psVs2g2jkvhxMYreR8IKEyevoXu6tEzjbEArfmg3PVk6rjVb1ecpH+u9s6LfoRb
-+VL7QcfMQP/pzyI7wnGBq+eur2779yCJ7eDoAlsYoSYFXiQzjVOFSAaiibU+9URL
-PCYApGw5n/9AE8722lAbq8lfo3Roe/nKv9FaPHr96CzTLUemF7tXRnTT6ttvWtOj
-g94reZ34ZscGngAZUIvc+ASXWrh5iPIKH4ECAwEAAaNQME4wHQYDVR0OBBYEFCZU
-Hgz/G7GV+x27JvXYq0sRSmmpMB8GA1UdIwQYMBaAFCZUHgz/G7GV+x27JvXYq0sR
-SmmpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAAOq5QsqOL/SBiq4
-7tIXdOw8VNM/FtleNM0hMpIoS9ivRk075F4jcZymbMNq0gwbj3lIKAji9RO7dIPY
-ll5EL4jdjqVzxtg1iEb6xJS9G8m5QZC0IaNPoEGeWRwIYIdRldDEum4LRnWqYXAq
-SlVCRayRQCCs4DlO7RIH84lxPuaVlVDahDVjX2eR9lf/uul+d0zoP/C8Mz5Cvatn
-51NZoFLZpFZ1PxiqxylggSzVmygXLWpfWhqX8Prx/eXjXRKjUHnzFPWgmNmnGpcb
-UCpF7K5PPMz4FiUYid0v0Ac84zg+rPEV+9dPEL1usKOl9BvuH3lTyZtuBmp0Kx1e
-OqTC8Mf+b414tRV0KhZzCTaITouTcPi6kN9Jtr200Ig5R4WJ0hQwrwz76+Zc5T/P
-Q4fYDZE+qVryDsGh3IRMtsiYJ+/pPKk3HgSwEicXP7HApZbGvCco/rHXrW+KiHgT
-l/BRl/FYOs2w8wRLADgOiQGT92xtLIjuDUcGVzxRK1dyTaCR4aMX1YIAb+h3im0f
-rrPJSF3aEIjK187ZpbTIY0gOLJUF0ELDLJy4Ql2EW1Z5hSJEo9VJy3z/3auv9IyH
-fYz9g//4YOQZaSQ5c3wgr+got1KVUh3fFQ82d2DC1YFp/wufjKeLfA6zhQYZU1g3
-5l0v1ZR1poQgqV6AJfPMlW+DyGU+
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fr-rennes1-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fr-rennes1-shibboleth.moveon4.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">MoveON - Logiciel de gestion des activités Internationales</md:ServiceName>
-      <md:ServiceName xml:lang="en">MoveON - software for international activity management</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Dans le monde fortement internationalisé de l'enseignement supérieur, MoveON appuie les établissements d'enseignement supérieur dans leur réussite quotidienne. Les services des Relations Internationales peuvent ainsi facilement contrôler et gérer toutes les activités d'internationalisation, réduire leur charge de travail administrative quotidienne et gagner en temps et en argent.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Moveon enables institutions of higher education to succeed in the highly internationalised world of higher education. International offices can easily control and manage all internationalisation activities, reduce their daily administrative workload and save time and money.</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">QS UNISOLUTION</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">QS UNISOLUTION</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Kamran Tabassum</md:SurName>
-    <md:EmailAddress>kamran@zeptosystems.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/franklin-shib01.franklin.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/franklin-shib01.franklin.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 32c855b2..00000000
--- a/swamid-interfederations-2.0/franklin-shib01.franklin.ac.uk-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://franklin-shib01.franklin.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Franklin Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">franklin.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZTCCAk2gAwIBAgIUcOe08w8KtBXNXbH+PNNNyO51KrswDQYJKoZIhvcNAQEF
-						BQAwKTEnMCUGA1UEAxMeZnJhbmtsaW4tc2hpYjAxLmZyYW5rbGluLmFjLnVrMB4X
-						DTEwMDMwMjEzNDYxN1oXDTMwMDMwMjEzNDYxN1owKTEnMCUGA1UEAxMeZnJhbmts
-						aW4tc2hpYjAxLmZyYW5rbGluLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEA0ffs3wu73Gh7k0HUFbl9H0cdSF9Elc11El7uJGXEthMHau0HYCdt
-						BE645S7EpW0poknu1HaLVqv9aSmEcTRI77bZ4xjGbODR8PiVlxVCfPT+FDDAulY8
-						Os7ORD099SbgMJtkU/JLheEzZpgFqFf8TgLNDazfdRryi3MVgWeEoKwYOO2H9BV0
-						KSETpu9Wn7miyt0salbeX9bjpSEURqNRX0WymJT/dxDTKSh1bVx02+BcqbUDyQQ4
-						jo6xBJARO+c5idPv85E/NFd2WVrA4vWYiXdGQns99n2YQbG2gECw5vxQr/MyWzt1
-						2xhzjsR0pno6QdveIWMmAMw/og69QjRIiQIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
-						HmZyYW5rbGluLXNoaWIwMS5mcmFua2xpbi5hYy51a4Y1aHR0cHM6Ly9mcmFua2xp
-						bi1zaGliMDEuZnJhbmtsaW4uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
-						FPD7x48+M7C+18p79NOvITXP81FxMA0GCSqGSIb3DQEBBQUAA4IBAQAYPiPM9HJm
-						900vq4X29iZz4r8gFEly/D3YN/8KqIAbKTY3CUZBcBse0NEOXwkw5JJrMbFSYcPN
-						MUyp7GCuYXGxfJ79SLwuI/fzZE/DDpXy9DsG9oNFsr2svJl03hOx3myXngbmZGQZ
-						qxMGVl3tJHV4GARfeo9p9hknnPt59sjPX+r9+ppG/V80jcD0CMHynW1/sxpcUOSN
-						yXPJFkmpdhrtXRsebF4g2O93bc+8pJETG16teg4zGHeF7iKsjnQSISvFV4xj5vIu
-						vtssyMJTau2MHvDz6ms4FaiMY5L+vzXXMMQ2pkfqSuOAjEkhd0WEOPY54L/fpBFE
-						1tR0bsDdT1Yt
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://franklin-shib01.franklin.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://franklin-shib01.franklin.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://franklin-shib01.franklin.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://franklin-shib01.franklin.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://franklin-shib01.franklin.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://franklin-shib01.franklin.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">franklin.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZTCCAk2gAwIBAgIUcOe08w8KtBXNXbH+PNNNyO51KrswDQYJKoZIhvcNAQEF
-						BQAwKTEnMCUGA1UEAxMeZnJhbmtsaW4tc2hpYjAxLmZyYW5rbGluLmFjLnVrMB4X
-						DTEwMDMwMjEzNDYxN1oXDTMwMDMwMjEzNDYxN1owKTEnMCUGA1UEAxMeZnJhbmts
-						aW4tc2hpYjAxLmZyYW5rbGluLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEA0ffs3wu73Gh7k0HUFbl9H0cdSF9Elc11El7uJGXEthMHau0HYCdt
-						BE645S7EpW0poknu1HaLVqv9aSmEcTRI77bZ4xjGbODR8PiVlxVCfPT+FDDAulY8
-						Os7ORD099SbgMJtkU/JLheEzZpgFqFf8TgLNDazfdRryi3MVgWeEoKwYOO2H9BV0
-						KSETpu9Wn7miyt0salbeX9bjpSEURqNRX0WymJT/dxDTKSh1bVx02+BcqbUDyQQ4
-						jo6xBJARO+c5idPv85E/NFd2WVrA4vWYiXdGQns99n2YQbG2gECw5vxQr/MyWzt1
-						2xhzjsR0pno6QdveIWMmAMw/og69QjRIiQIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
-						HmZyYW5rbGluLXNoaWIwMS5mcmFua2xpbi5hYy51a4Y1aHR0cHM6Ly9mcmFua2xp
-						bi1zaGliMDEuZnJhbmtsaW4uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
-						FPD7x48+M7C+18p79NOvITXP81FxMA0GCSqGSIb3DQEBBQUAA4IBAQAYPiPM9HJm
-						900vq4X29iZz4r8gFEly/D3YN/8KqIAbKTY3CUZBcBse0NEOXwkw5JJrMbFSYcPN
-						MUyp7GCuYXGxfJ79SLwuI/fzZE/DDpXy9DsG9oNFsr2svJl03hOx3myXngbmZGQZ
-						qxMGVl3tJHV4GARfeo9p9hknnPt59sjPX+r9+ppG/V80jcD0CMHynW1/sxpcUOSN
-						yXPJFkmpdhrtXRsebF4g2O93bc+8pJETG16teg4zGHeF7iKsjnQSISvFV4xj5vIu
-						vtssyMJTau2MHvDz6ms4FaiMY5L+vzXXMMQ2pkfqSuOAjEkhd0WEOPY54L/fpBFE
-						1tR0bsDdT1Yt
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://franklin-shib01.franklin.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://franklin-shib01.franklin.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">Franklin Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Franklin College, Grimsby</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.franklin.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Baker</SurName>
-    <EmailAddress>mailto:john.e.baker@franklin.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Bottomley</SurName>
-    <EmailAddress>mailto:steve.bottomley@franklin.ac.uk</EmailAddress>
-  </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 2eb2ccbc..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fs-elcira-srv01.dir.garr.it/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.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 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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="it">Filesender erogato da GARR per il progetto ELCIRA</md:ServiceName>
-      <md:ServiceName xml:lang="en">Filesender provided by GARR for the ELCIRA project</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" 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="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">La rete italiana dell'universitàe della ricerca</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Italian Academic and Research Network</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:SurName>GARR</md:SurName>
-    <md:EmailAddress>mailto:grid-tech@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml b/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
deleted file mode 100644
index a970a4cf..00000000
--- a/swamid-interfederations-2.0/fs-test.restena.lu-simplesaml-module.php-saml-sp-metadata.php-discover.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/metadata.php/discover">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:20:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.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">RESTENA FileSender Service (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">(TEST) RESTENA FileSender is a secure way to share large files with anyone! Logon to upload your files or to invite people to send you a file.</mdui:Description>
-        <mdui:Description xml:lang="fr">(TEST) RESTENA FileSender propose un moyen sécurisé pour partager des gros fichiers avec vos collègues! Connectez-vous pour envoyer vos fichiers ou pour inviter vos interlocuteurs à vous en envoyer.</mdui:Description>
-        <mdui:Description xml:lang="de">(TEST) RESTENA FileSender ist eine sichere Methode grosse Dateien mit jedermann zu teilen! Verbinden Sie sich um Dateien zu verschicken oder um jemanden aufzufordern Ihnen eine Datei zu schicken.</mdui:Description>
-        <mdui:Description xml:lang="lb">(TEST) De RESTENA FileSender ass e séchere Wee, fir grouss Fichieren ze verschécken! Loggt Iech an, fir Fichieren eropzelueden oder aner Leit ze invitéieren, Iech Fichieren ze schécken.</mdui:Description>
-        <mdui:Keywords xml:lang="en">RESTENA FileSender large XXL file transfer</mdui:Keywords>
-        <mdui:Logo width="100" height="100" xml:lang="en">http://fs-test.restena.lu/filesender.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>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</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>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-logout.php/discover"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://fs-test.restena.lu/simplesaml/module.php/saml/sp/saml2-acs.php/discover" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" index="2"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">RESTENA FileSender Service (TEST)</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">(TEST) RESTENA FileSender is a secure way to share large files with anyone! Logon to upload your files or to invite people to send you a file.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="fr">(TEST) RESTENA FileSender propose un moyen sécurisé pour partager des gros fichiers avec vos collègues! Connectez-vous pour envoyer vos fichiers ou pour inviter vos interlocuteurs à vous en envoyer.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="de">(TEST) RESTENA FileSender ist eine sichere Methode grosse Dateien mit jedermann zu teilen! Verbinden Sie sich um Dateien zu verschicken oder um jemanden aufzufordern Ihnen eine Datei zu schicken.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="lb">(TEST) De RESTENA FileSender ass e séchere Wee, fir grouss Fichieren ze verschécken! Loggt Iech an, fir Fichieren eropzelueden oder aner Leit ze invitéieren, Iech Fichieren ze schécken.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.23735.100.0" 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:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">RESTENA Foundation asbl</md:OrganizationName>
-    <md:OrganizationName xml:lang="fr">Fondation RESTENA asbl</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RESTENA Foundation</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">Fondation RESTENA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.restena.lu/restena/en/EN-Presentation.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.restena.lu/restena/fr/FR-Presentation.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>RESTENA</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@restena.lu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml b/swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.xml
deleted file mode 100644
index f635baae..00000000
--- a/swamid-interfederations-2.0/fs-tst.uas.ox.ac.uk-adfs-services-trust.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="http://fs-tst.uas.ox.ac.uk/adfs/services/trust">
-  <!--
-		This is a "UAS Test Federation Server" ADFS SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-17T15:58:44Z"/>
-  </Extensions>
-  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdTCCA12gAwIBAgIQAYeNkmekB/SM25iBZ344pTANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDUxNTAwMDAwMFoXDTE2MDUxNDIzNTk1OVowQjEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRmc2QtdHN0LnVh
-						cy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALYVAWpu
-						sOdCft81RDGMmpFYRtzwQKWpMdCygldUxjphjl8x7h4YOh3EnTHFV969JZO0OM2N
-						Pd0OkOJpRIxQ+1NMlkEjDciIcV3hDqK6q7tUcOGN7Wxdshj1kprpABz7uwZY9voJ
-						QARQJDJsAcV4smSLcD5My+7ZuOZ/jE6CEOaE5e3RUYIevfTk4PUsT4vrQ1N32Hjs
-						lKlTzeaKhY2jLVQMO+mHNgufEGv/hUQFVGPYGDdXmLaJLw+K0sMbEY+IPRknlEBf
-						nTgW+ZY8HbQPrUlSeb7gWOL8wJG3g3CbXKGy7wl+XoSjwVrvJN/Pc0fBX6pChgAP
-						vcKXSX8rMG2bJv8CAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-						KzdXR+qQ47ntMB0GA1UdDgQWBBRVo3xu6xD4PEcrqyYc/nZ7PnykbzAOBgNVHQ8B
-						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-						BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-						QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-						cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-						L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZnNkLXRzdC51YXMub3gu
-						YWMudWswDQYJKoZIhvcNAQEFBQADggEBABlAGHmGLEBxaxnsE0cK3KLd2gbB8b3U
-						6eUylt0uD9i40aSgxhZaG5lP1CPco+jomeyZCtdnQJMz07NSWTet0Bzms6ZPMYOX
-						L/A7PAWjGP+nsdVHkKWO/LCwa1RwpQY7Y5gD89toQUNrVTc8UuNRpWdjpkFWrzQc
-						5ReHSCcpG3XnZgJiYeD8Fbm62qLq8DFStGxNl0LadOWtm0SYHk9AcXt0D3e63cde
-						KRxLQLd/2BKKh0D9ea3I2EIMU5uwzx11M6xDVTXyzwSf34Msj6YyYWx4QASETezM
-						Mz48c4qnZn8LgQbdVM0km+HhYvRWTRmWYSJMfP5oUKjKwY6omSi/R+0=
-					</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>
-						MIIEdTCCA12gAwIBAgIQUBxe1RI1OSeeGJz+HrEzhjANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDUxNTAwMDAwMFoXDTE2MDUxNDIzNTk1OVowQjEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRmc3MtdHN0LnVh
-						cy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdJ3HyV
-						4zb2QhQ7+oZ4pSt1mdc4zhkKxz2Uh3re0pTG72YxfiZTuyjcbE4MQysotAAQHvrt
-						ezyyC5RXOEAF5Rnvsmda4Qm4NF0FHFVSjULopBm6w363doFz79pL8Uj7OcG5w8Tw
-						ESotHf8a0UQcliwpTRY+seFSuLcexOGKNHG/F0bCMXTiNcJFYLAhJ5aF5WqDttPN
-						g3WwBozla6QRDZpvOPVZAVsR79wJ9ntVxy8U0zs1ErBm5AF1bpHLcQBHTOXvcreO
-						LeB8r0micOvJYndfD7ZpNnhCF80L3Msy/FmxyrAd1n4B/NfluCd8dB/wutSIlQfh
-						nhfN+1JcgUtIDRMCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-						KzdXR+qQ47ntMB0GA1UdDgQWBBRf/qdLfo/Qs/aJMHLCOf/7p35aDDAOBgNVHQ8B
-						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-						BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-						QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-						cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-						L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZnNzLXRzdC51YXMub3gu
-						YWMudWswDQYJKoZIhvcNAQEFBQADggEBAKn8mZS6VfJxeShly/I/YixiHwSnAsG8
-						rtH8N0rE7wmrnYUlZ048ihBc4Pv4f4i4YAL8ilujcqSNWt5XNBCM3+FyNDVOZOlm
-						94WZ9clNsDicnG4jC/jop0lETzrN/rYoqmIIqaKPd0HnUQU89Q/9K853+VOYY/Md
-						VmeNJ1CSgMW4bjC/oS4JutCCrrRisnlleRhWH5vQYIVSKOGOCaNqlHEkLSdX1irz
-						WeWFbCJV+mzUy6Glo2J5TT24L8LyZuPTpBqNura5SWBcT76qY7FYfnMrx54YhlEc
-						uZg2deYNiyxcEP4vZgQi764am9mYbcP3sYt1cTy8W+sTQYGKp/q0MoA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-tst.uas.ox.ac.uk/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-tst.uas.ox.ac.uk/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://fs-tst.uas.ox.ac.uk/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs-tst.uas.ox.ac.uk/adfs/ls/" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UAS Test Federation Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support </GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support </GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
deleted file mode 100644
index 34693d6d..00000000
--- a/swamid-interfederations-2.0/fs.liu.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,522 +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://fs.liu.se/adfs/services/trust">
-  <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:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType">
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAnyNaDk3tSxKoRwzDMG6yjANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
-EwJTRTEXMBUGA1UECAwOw5ZzdGVyZ8O2dGxhbmQxEzARBgNVBAcMCkxpbmvDtnBp
-bmcxIDAeBgNVBAoMF0xpbmvDtnBpbmdzIHVuaXZlcnNpdGV0MQ8wDQYDVQQLEwZM
-aVUtSVQxGTAXBgNVBAMTEGZzZGVjcnlwdC5saXUuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQChPGysC8lsTi7EJHyrabNiyAW1pKBt8hDR7PiEOHWz
-/kDoxdoBftjelfewOvT+DM1t6WwQ3K2hbNDGuHmapaIuG/K491tXAZCiopcwZ4ud
-w7npBYJM3Err3sth2Yk3JtB69iN61t77hezMYyWd9yGmt5zd+DlXzzeJxNacWgkw
-W5ONAMRFCPV0VNBSk3QpxKe0V/VkhkGrwp2Jc+qVgykkUDPamyxc7cCnot1AFslS
-0WWl6LN1XllNxaqg8aYgNmRu/2w93SKPNfNEj94dlD5s4y4HuTIQhDtBLt4PEwPj
-5YUZRAu5LisOjhdljwkd3FrbTS/T5f/+pb8iYN8eY7YJAgMBAAGjggG/MIIBuzAf
-BgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQURqiugOjE
-pXEKObsutOUXMD8ucwkwGwYDVR0RBBQwEoIQZnNkZWNyeXB0LmxpdS5zZTAOBgNV
-HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1Ud
-HwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xD
-QTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NM
-Q0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxo
-dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggr
-BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixo
-dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNV
-HRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB/beJOqNGjOrssjwprX+jSVvno
-IAv+XZgMIei0sLe4x0Ag6wp0sRG8/gchprI4cbZPPG70wDQcHIu8q/Rz4xV50FX9
-wvZPVPjdC5v9ClN48/3jL2dybydaDHR9ZyB0EcNyuNb7zoFUTbI0UcoeFaDFDRf7
-CTysvjpvVhZwfef2ACrIVhof89+ZRz24odlm1AA/bteruiEKbKP3oTr50zKlj0YZ
-0qhwXGgRPhpnpQsZ6EZjdbYYVFs0Y0z+JLt2nv8pVqKvQjBS90urSMvppeHfPNO1
-G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <fed:ClaimTypesRequested>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress">
-        <auth:DisplayName>E-Mail Address</auth:DisplayName>
-        <auth:Description>The e-mail address of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
-        <auth:DisplayName>Given Name</auth:DisplayName>
-        <auth:Description>The given name of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
-        <auth:DisplayName>Name</auth:DisplayName>
-        <auth:Description>The unique name of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn">
-        <auth:DisplayName>UPN</auth:DisplayName>
-        <auth:Description>The user principal name (UPN) of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/CommonName">
-        <auth:DisplayName>Common Name</auth:DisplayName>
-        <auth:Description>The common name of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/EmailAddress">
-        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/Group">
-        <auth:DisplayName>Group</auth:DisplayName>
-        <auth:Description>A group that the user is a member of</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/UPN">
-        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role">
-        <auth:DisplayName>Role</auth:DisplayName>
-        <auth:Description>A role that the user has</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
-        <auth:DisplayName>Surname</auth:DisplayName>
-        <auth:Description>The surname of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier">
-        <auth:DisplayName>PPID</auth:DisplayName>
-        <auth:Description>The private identifier of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier">
-        <auth:DisplayName>Name ID</auth:DisplayName>
-        <auth:Description>The SAML name identifier of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant">
-        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
-        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod">
-        <auth:DisplayName>Authentication method</auth:DisplayName>
-        <auth:Description>The method used to authenticate the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid">
-        <auth:DisplayName>Deny only group SID</auth:DisplayName>
-        <auth:Description>The deny-only group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid">
-        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-        <auth:Description>The deny-only primary SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid">
-        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-        <auth:Description>The deny-only primary group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid">
-        <auth:DisplayName>Group SID</auth:DisplayName>
-        <auth:Description>The group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid">
-        <auth:DisplayName>Primary group SID</auth:DisplayName>
-        <auth:Description>The primary group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid">
-        <auth:DisplayName>Primary SID</auth:DisplayName>
-        <auth:Description>The primary SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname">
-        <auth:DisplayName>Windows account name</auth:DisplayName>
-        <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
-      </auth:ClaimType>
-    </fed:ClaimTypesRequested>
-    <fed:TargetScopes>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://fs.liu.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://fs.liu.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://fs.liu.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://fs.liu.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://fs.liu.se/adfs/ls/</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>http://fs.liu.se/adfs/services/trust</Address>
-      </EndpointReference>
-    </fed:TargetScopes>
-    <fed:ApplicationServiceEndpoint>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://fs.liu.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-      </EndpointReference>
-    </fed:ApplicationServiceEndpoint>
-    <fed:PassiveRequestorEndpoint>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://fs.liu.se/adfs/ls/</Address>
-      </EndpointReference>
-    </fed:PassiveRequestorEndpoint>
-  </md:RoleDescriptor>
-  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="fs.liu.se" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAdlHVjMUXk6RFVjqYeenpjANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
-EwJTRTEXMBUGA1UECAwOw5ZzdGVyZ8O2dGxhbmQxEzARBgNVBAcMCkxpbmvDtnBp
-bmcxIDAeBgNVBAoMF0xpbmvDtnBpbmdzIHVuaXZlcnNpdGV0MQ8wDQYDVQQLEwZM
-aVUtSVQxGTAXBgNVBAMTEGZzc2lnbmluZy5saXUuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCS5bpEkEcbJAsNdgyK1QYAbuq5PKl8bAcujqKIRZAr
-4uixWudDxRVhwOxDyZMTZGN0vNVdf+ZtUZQ9NWYaLcgEvzxhNbsA0fmTSwRlMvxj
-0R/JbDs5Slmew11wZ6rxgX7wRv8rjB3PSdf/SVc5LKgcDuCCGCLv+OE7d4K13OfK
-BxUv/vrD7upz6lgT79OWX6udFhU8sXmP8u8P/mID83o5N32hwxymRuEmjnLiVIrU
-R4cF5EwgblrpoqQKeGKdkroZApU0EJxvtopesVgUEGXW4tkogTJ8qtSPQK8iPEet
-eR6YpFCIxIbE0gpwDgo0bubt8T+FkQE71SLvbhv9RcZBAgMBAAGjggG/MIIBuzAf
-BgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQU8vPdaPx+
-JhyN970NWqrTcbU/c0MwGwYDVR0RBBQwEoIQZnNzaWduaW5nLmxpdS5zZTAOBgNV
-HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1Ud
-HwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xD
-QTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NM
-Q0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxo
-dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggr
-BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixo
-dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNV
-HRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCgqdZfizsQZYpLif+sV+mgkkln
-6WVGv1KVw2xvRDO9jF192qjkL9zmB081qOydPtt8aLbXQHp13M/URoFK2Vvdikq5
-WQMkGxJu3zLtQD4lJsJXAaGdm7nSwWS4NHHIf5yg0rWC5kQBJnWhAHhPedFzfgGR
-9lUohhvnLJJ/PFuvN0sCsYYpRraQT880RdTq1imsFB3wAUHjN9tQCS3Ss9Cf6MOv
-wHb3flDe4OLwxxMZfI3oGwoUJHltib7xFuT7w5hOYts3Js+BBtsSskGSp/dz8PiH
-6NDQZG/9USNN1biuUCDxrhTBgSHIAeB3h7k6wue5C30EE8SCLfZ6Xxsmk1rn</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <fed:TokenTypesOffered>
-      <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
-      <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
-    </fed:TokenTypesOffered>
-    <fed:ClaimTypesOffered>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress">
-        <auth:DisplayName>E-Mail Address</auth:DisplayName>
-        <auth:Description>The e-mail address of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
-        <auth:DisplayName>Given Name</auth:DisplayName>
-        <auth:Description>The given name of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
-        <auth:DisplayName>Name</auth:DisplayName>
-        <auth:Description>The unique name of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn">
-        <auth:DisplayName>UPN</auth:DisplayName>
-        <auth:Description>The user principal name (UPN) of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/CommonName">
-        <auth:DisplayName>Common Name</auth:DisplayName>
-        <auth:Description>The common name of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/EmailAddress">
-        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/Group">
-        <auth:DisplayName>Group</auth:DisplayName>
-        <auth:Description>A group that the user is a member of</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/UPN">
-        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role">
-        <auth:DisplayName>Role</auth:DisplayName>
-        <auth:Description>A role that the user has</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
-        <auth:DisplayName>Surname</auth:DisplayName>
-        <auth:Description>The surname of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier">
-        <auth:DisplayName>PPID</auth:DisplayName>
-        <auth:Description>The private identifier of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier">
-        <auth:DisplayName>Name ID</auth:DisplayName>
-        <auth:Description>The SAML name identifier of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant">
-        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
-        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod">
-        <auth:DisplayName>Authentication method</auth:DisplayName>
-        <auth:Description>The method used to authenticate the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid">
-        <auth:DisplayName>Deny only group SID</auth:DisplayName>
-        <auth:Description>The deny-only group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid">
-        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-        <auth:Description>The deny-only primary SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid">
-        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-        <auth:Description>The deny-only primary group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid">
-        <auth:DisplayName>Group SID</auth:DisplayName>
-        <auth:Description>The group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid">
-        <auth:DisplayName>Primary group SID</auth:DisplayName>
-        <auth:Description>The primary group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid">
-        <auth:DisplayName>Primary SID</auth:DisplayName>
-        <auth:Description>The primary SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname">
-        <auth:DisplayName>Windows account name</auth:DisplayName>
-        <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
-      </auth:ClaimType>
-    </fed:ClaimTypesOffered>
-    <fed:SecurityTokenServiceEndpoint>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://fs.liu.se/adfs/services/trust/2005/certificatemixed</Address>
-        <Metadata>
-          <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
-              <wsx:MetadataReference>
-                <Address xmlns="http://www.w3.org/2005/08/addressing">https://fs.liu.se/adfs/services/trust/mex</Address>
-              </wsx:MetadataReference>
-            </wsx:MetadataSection>
-          </Metadata>
-        </Metadata>
-      </EndpointReference>
-    </fed:SecurityTokenServiceEndpoint>
-    <fed:PassiveRequestorEndpoint>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://fs.liu.se/adfs/ls/</Address>
-      </EndpointReference>
-    </fed:PassiveRequestorEndpoint>
-  </md:RoleDescriptor>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAdlHVjMUXk6RFVjqYeenpjANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
-EwJTRTEXMBUGA1UECAwOw5ZzdGVyZ8O2dGxhbmQxEzARBgNVBAcMCkxpbmvDtnBp
-bmcxIDAeBgNVBAoMF0xpbmvDtnBpbmdzIHVuaXZlcnNpdGV0MQ8wDQYDVQQLEwZM
-aVUtSVQxGTAXBgNVBAMTEGZzc2lnbmluZy5saXUuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCS5bpEkEcbJAsNdgyK1QYAbuq5PKl8bAcujqKIRZAr
-4uixWudDxRVhwOxDyZMTZGN0vNVdf+ZtUZQ9NWYaLcgEvzxhNbsA0fmTSwRlMvxj
-0R/JbDs5Slmew11wZ6rxgX7wRv8rjB3PSdf/SVc5LKgcDuCCGCLv+OE7d4K13OfK
-BxUv/vrD7upz6lgT79OWX6udFhU8sXmP8u8P/mID83o5N32hwxymRuEmjnLiVIrU
-R4cF5EwgblrpoqQKeGKdkroZApU0EJxvtopesVgUEGXW4tkogTJ8qtSPQK8iPEet
-eR6YpFCIxIbE0gpwDgo0bubt8T+FkQE71SLvbhv9RcZBAgMBAAGjggG/MIIBuzAf
-BgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQU8vPdaPx+
-JhyN970NWqrTcbU/c0MwGwYDVR0RBBQwEoIQZnNzaWduaW5nLmxpdS5zZTAOBgNV
-HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1Ud
-HwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xD
-QTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NM
-Q0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxo
-dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggr
-BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixo
-dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNV
-HRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCgqdZfizsQZYpLif+sV+mgkkln
-6WVGv1KVw2xvRDO9jF192qjkL9zmB081qOydPtt8aLbXQHp13M/URoFK2Vvdikq5
-WQMkGxJu3zLtQD4lJsJXAaGdm7nSwWS4NHHIf5yg0rWC5kQBJnWhAHhPedFzfgGR
-9lUohhvnLJJ/PFuvN0sCsYYpRraQT880RdTq1imsFB3wAUHjN9tQCS3Ss9Cf6MOv
-wHb3flDe4OLwxxMZfI3oGwoUJHltib7xFuT7w5hOYts3Js+BBtsSskGSp/dz8PiH
-6NDQZG/9USNN1biuUCDxrhTBgSHIAeB3h7k6wue5C30EE8SCLfZ6Xxsmk1rn</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>MIIFOTCCBCGgAwIBAgIQAnyNaDk3tSxKoRwzDMG6yjANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
-EwJTRTEXMBUGA1UECAwOw5ZzdGVyZ8O2dGxhbmQxEzARBgNVBAcMCkxpbmvDtnBp
-bmcxIDAeBgNVBAoMF0xpbmvDtnBpbmdzIHVuaXZlcnNpdGV0MQ8wDQYDVQQLEwZM
-aVUtSVQxGTAXBgNVBAMTEGZzZGVjcnlwdC5saXUuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQChPGysC8lsTi7EJHyrabNiyAW1pKBt8hDR7PiEOHWz
-/kDoxdoBftjelfewOvT+DM1t6WwQ3K2hbNDGuHmapaIuG/K491tXAZCiopcwZ4ud
-w7npBYJM3Err3sth2Yk3JtB69iN61t77hezMYyWd9yGmt5zd+DlXzzeJxNacWgkw
-W5ONAMRFCPV0VNBSk3QpxKe0V/VkhkGrwp2Jc+qVgykkUDPamyxc7cCnot1AFslS
-0WWl6LN1XllNxaqg8aYgNmRu/2w93SKPNfNEj94dlD5s4y4HuTIQhDtBLt4PEwPj
-5YUZRAu5LisOjhdljwkd3FrbTS/T5f/+pb8iYN8eY7YJAgMBAAGjggG/MIIBuzAf
-BgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQURqiugOjE
-pXEKObsutOUXMD8ucwkwGwYDVR0RBBQwEoIQZnNkZWNyeXB0LmxpdS5zZTAOBgNV
-HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1Ud
-HwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xD
-QTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NM
-Q0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxo
-dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggr
-BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixo
-dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNV
-HRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB/beJOqNGjOrssjwprX+jSVvno
-IAv+XZgMIei0sLe4x0Ag6wp0sRG8/gchprI4cbZPPG70wDQcHIu8q/Rz4xV50FX9
-wvZPVPjdC5v9ClN48/3jL2dybydaDHR9ZyB0EcNyuNb7zoFUTbI0UcoeFaDFDRf7
-CTysvjpvVhZwfef2ACrIVhof89+ZRz24odlm1AA/bteruiEKbKP3oTr50zKlj0YZ
-0qhwXGgRPhpnpQsZ6EZjdbYYVFs0Y0z+JLt2nv8pVqKvQjBS90urSMvppeHfPNO1
-G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.liu.se/adfs/ls/" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/" index="2"/>
-  </md:SPSSODescriptor>
-  <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">liu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Linköpings universitet (ADFS)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University (ADFS)</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">https://login.liu.se/idp/images/logo-350x68-en.png</mdui:Logo>
-        <mdui:Logo height="68" width="350" xml:lang="sv">https://login.liu.se/idp/images/logo-350x68-sv.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:Keywords xml:lang="sv">liu linköpings+universitet linkopings+universitet linkoping+university linköpings+university linköping linkoping</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">liu linköpings+universitet linkopings+universitet linkoping+university linköpings+university linköping linkoping</mdui:Keywords>
-      </mdui: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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIQAdlHVjMUXk6RFVjqYeenpjANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
-EwJTRTEXMBUGA1UECAwOw5ZzdGVyZ8O2dGxhbmQxEzARBgNVBAcMCkxpbmvDtnBp
-bmcxIDAeBgNVBAoMF0xpbmvDtnBpbmdzIHVuaXZlcnNpdGV0MQ8wDQYDVQQLEwZM
-aVUtSVQxGTAXBgNVBAMTEGZzc2lnbmluZy5saXUuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCS5bpEkEcbJAsNdgyK1QYAbuq5PKl8bAcujqKIRZAr
-4uixWudDxRVhwOxDyZMTZGN0vNVdf+ZtUZQ9NWYaLcgEvzxhNbsA0fmTSwRlMvxj
-0R/JbDs5Slmew11wZ6rxgX7wRv8rjB3PSdf/SVc5LKgcDuCCGCLv+OE7d4K13OfK
-BxUv/vrD7upz6lgT79OWX6udFhU8sXmP8u8P/mID83o5N32hwxymRuEmjnLiVIrU
-R4cF5EwgblrpoqQKeGKdkroZApU0EJxvtopesVgUEGXW4tkogTJ8qtSPQK8iPEet
-eR6YpFCIxIbE0gpwDgo0bubt8T+FkQE71SLvbhv9RcZBAgMBAAGjggG/MIIBuzAf
-BgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQU8vPdaPx+
-JhyN970NWqrTcbU/c0MwGwYDVR0RBBQwEoIQZnNzaWduaW5nLmxpdS5zZTAOBgNV
-HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1Ud
-HwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xD
-QTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NM
-Q0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxo
-dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggr
-BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixo
-dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNV
-HRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCgqdZfizsQZYpLif+sV+mgkkln
-6WVGv1KVw2xvRDO9jF192qjkL9zmB081qOydPtt8aLbXQHp13M/URoFK2Vvdikq5
-WQMkGxJu3zLtQD4lJsJXAaGdm7nSwWS4NHHIf5yg0rWC5kQBJnWhAHhPedFzfgGR
-9lUohhvnLJJ/PFuvN0sCsYYpRraQT880RdTq1imsFB3wAUHjN9tQCS3Ss9Cf6MOv
-wHb3flDe4OLwxxMZfI3oGwoUJHltib7xFuT7w5hOYts3Js+BBtsSskGSp/dz8PiH
-6NDQZG/9USNN1biuUCDxrhTBgSHIAeB3h7k6wue5C30EE8SCLfZ6Xxsmk1rn</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>MIIFOTCCBCGgAwIBAgIQAnyNaDk3tSxKoRwzDMG6yjANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTAxMDcwMDAwMDBaFw0xODAxMTExMjAwMDBaMIGJMQswCQYDVQQG
-EwJTRTEXMBUGA1UECAwOw5ZzdGVyZ8O2dGxhbmQxEzARBgNVBAcMCkxpbmvDtnBp
-bmcxIDAeBgNVBAoMF0xpbmvDtnBpbmdzIHVuaXZlcnNpdGV0MQ8wDQYDVQQLEwZM
-aVUtSVQxGTAXBgNVBAMTEGZzZGVjcnlwdC5saXUuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQChPGysC8lsTi7EJHyrabNiyAW1pKBt8hDR7PiEOHWz
-/kDoxdoBftjelfewOvT+DM1t6WwQ3K2hbNDGuHmapaIuG/K491tXAZCiopcwZ4ud
-w7npBYJM3Err3sth2Yk3JtB69iN61t77hezMYyWd9yGmt5zd+DlXzzeJxNacWgkw
-W5ONAMRFCPV0VNBSk3QpxKe0V/VkhkGrwp2Jc+qVgykkUDPamyxc7cCnot1AFslS
-0WWl6LN1XllNxaqg8aYgNmRu/2w93SKPNfNEj94dlD5s4y4HuTIQhDtBLt4PEwPj
-5YUZRAu5LisOjhdljwkd3FrbTS/T5f/+pb8iYN8eY7YJAgMBAAGjggG/MIIBuzAf
-BgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQURqiugOjE
-pXEKObsutOUXMD8ucwkwGwYDVR0RBBQwEoIQZnNkZWNyeXB0LmxpdS5zZTAOBgNV
-HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1Ud
-HwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xD
-QTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NM
-Q0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxo
-dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggr
-BgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixo
-dHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNV
-HRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB/beJOqNGjOrssjwprX+jSVvno
-IAv+XZgMIei0sLe4x0Ag6wp0sRG8/gchprI4cbZPPG70wDQcHIu8q/Rz4xV50FX9
-wvZPVPjdC5v9ClN48/3jL2dybydaDHR9ZyB0EcNyuNb7zoFUTbI0UcoeFaDFDRf7
-CTysvjpvVhZwfef2ACrIVhof89+ZRz24odlm1AA/bteruiEKbKP3oTr50zKlj0YZ
-0qhwXGgRPhpnpQsZ6EZjdbYYVFs0Y0z+JLt2nv8pVqKvQjBS90urSMvppeHfPNO1
-G7u2lFQuAIzdjRsBLntKNPKgiHqkOOk8w9dPs56MXnfzAjGIIu5IasvXmhTF</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fs.liu.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.liu.se/adfs/ls/"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="E-Mail Address" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Given Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="UPN" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Common Name" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x E-Mail Address" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x UPN" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Role" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Surname" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="PPID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name ID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication time stamp" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication method" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only group SID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Windows account name" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Linköping University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Linköpings universitet (ADFS)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Linköping University (ADFS)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.liu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Linköping University (ADFS)</md:Company>
-    <md:SurName>Johan Peterson</md:SurName>
-    <md:EmailAddress>mailto:johan.peterson@liu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 13 28 5730</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Linköping University (ADFS)</md:Company>
-    <md:SurName>LiU-IT:s Kundcenter</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@student.liu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 13 28 5898</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml
deleted file mode 100644
index 1a9c58ac..00000000
--- a/swamid-interfederations-2.0/fs.multrix.com-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fs.multrix.com/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-08T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">SURF</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SURF</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">SURF</mdui:Description>
-        <mdui:Description xml:lang="en">SURF</mdui:Description>
-        <mdui:Logo height="86" width="44">https://static.surfconext.nl/logos/idp/surf.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">SURF</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">SURF</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/4498858efe20b0039f00a087d6923628"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SURF</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SURF</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surf.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/fs.myhz.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml
deleted file mode 100644
index b085b97f..00000000
--- a/swamid-interfederations-2.0/fs.myhz.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fs.myhz.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-22T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">HZ University of Applied Sciences</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">HZ University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">HZ University of Applied Sciences</mdui:Description>
-        <mdui:Description xml:lang="en">HZ University of Applied Sciences</mdui:Description>
-        <mdui:Logo height="30" width="108">https://static.surfconext.nl/logos/idp/hzeeland.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Hogeschool Zeeland HZ University of Applied Sciences HBO myhz</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Hogeschool Zeeland HZ University of Applied Sciences HBO myhz</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/26d7865258bce57e0558f6ec0c6b6c65"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HZ University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HZ University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hz.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/fs.rocmondriaan.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.rocmondriaan.nl-adfs-services-trust.xml
deleted file mode 100644
index c2b1d773..00000000
--- a/swamid-interfederations-2.0/fs.rocmondriaan.nl-adfs-services-trust.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="http://fs.rocmondriaan.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-01T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">ROC Mondriaan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ROC Mondriaan</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">ROC Mondriaan</mdui:Description>
-        <mdui:Description xml:lang="en">ROC Mondriaan</mdui:Description>
-        <mdui:Logo height="78" width="214">https://static.surfconext.nl/media/idp/ROC-Mondriaan_Logo.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="nl">ROC Mondriaan International Business Hotel Management</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">ROC Mondriaan MBO Den Haag Zuid Holland </mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/af78efe3838a68a67457881d2ffb446e"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">ROC Mondriaan</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">ROC Mondriaan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">ROC Mondriaan</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ROC Mondriaan</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.rocmondriaan.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.rocmondriaan.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/fs.uas.ox.ac.uk-adfs-services-trust.xml b/swamid-interfederations-2.0/fs.uas.ox.ac.uk-adfs-services-trust.xml
deleted file mode 100644
index 8c61171a..00000000
--- a/swamid-interfederations-2.0/fs.uas.ox.ac.uk-adfs-services-trust.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="http://fs.uas.ox.ac.uk/adfs/services/trust">
-  <!--
-		This is an ADFS SP the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-05T11:05:53Z"/>
-  </Extensions>
-  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEbTCCA1WgAwIBAgIQMQY/7MXlAw+1Tl71n40arTANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDczMTAwMDAwMFoXDTE2MDczMDIzNTk1OVowPjEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBmc2QudWFzLm94
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2PsgyM8FIz8Q
-						lHrIVQvVwOS48zVrG0x2cssguV85eR4uDsFN32+QySrDW1lkJtoSim0BeRg2e60x
-						PawlF5IYUjTzAdUICwpXQWXvIqKbDggQlsMgKtVB9PXsQy40fOhrnwgsV6Af7Pi7
-						5knD5gLoKpTcp9odZdqRV33e4JrUkdm3YCPcGD6L4RYOn9ebUCO6dyG/xchkiOqE
-						BSUJCy3JZy25Zz7QvOPML7LPmqlu8Qv0RF2+sF4TF/U+tEVm7mx+gTLaaW9YFvaL
-						f7oRzu+W6NZ5h+DtsArIngTYjW2/1ZLUC12HPGI9+NSicKJQmYFTOJWCJEiq2akL
-						QlKPmlGVXwIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-						6pDjue0wHQYDVR0OBBYEFH7b9Q1+6IMLbrwmwa8iUX644vSeMA4GA1UdDwEB/wQE
-						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-						cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBmc2QudWFzLm94LmFjLnVrMA0G
-						CSqGSIb3DQEBBQUAA4IBAQBGzlxDHF1+8ihZg3lgn+z2zzkCQLaLoklE8+tyWwSe
-						j43QQmk0RZlOdC6znIUt+3R4ojqZyt+UWXQEXAmLFCRjZrlAoCsFUPRe4J++0PzK
-						5wSwmACShNC33p2Akt56UGpsCoyCxRJFYBv3x3ypOpI3EvEuFiNtE3Pgx7AH3aNE
-						az44a9ZQ04GILbDV5wOfnkTuyIex3nlpwEliY7tAXeo+5cs+pHmwqQQHSaLE/ozZ
-						JyqA/DlMNJJjJzNCo9raeuuw3j0A+bWjeY7smiWhBFNUYyGeWwcDCAMo5uqGTOGf
-						AuFy/3fEpMBaIz8MHJYjeAZJiymMUv+hOo/OtUKtuQj3
-					</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>
-						MIIEbjCCA1agAwIBAgIRALxjGrZNPULfZMV/GGfax6cwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA3MzEwMDAwMDBaFw0xNjA3MzAyMzU5NTlaMD4xITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQZnNzLnVhcy5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEJ/jsJh4AO
-						qqIqYTWvTsob4PPzlhAWTzLtEDZxwS7foQfH2Q5adr4CEX781ZWGUafyOLADrEj7
-						1FUFZ2CLDxu/2/865ZjN/eRVlWWJkjqyxCXrVs63fCJpxj5ZLQ1m27Kx2i10/n/O
-						ZoEr5Zd5732f8a9hMYU6einwUvaku3NLlkzBv4ALiXoqAB+xLBeF+tenxg0abugZ
-						jnsvkjlWQoq723NVAc1nTZB6ngqAOLKl80DqU1jwVdmpdir1utWeadGRYrVcAZMW
-						OJ/moFSWDtG8TAwEdCJoOx8Ka/dgwYjXkH5eumT7jBuCRplz13a3+61oK45pKqeT
-						NHHUw4xOvh0CAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-						R+qQ47ntMB0GA1UdDgQWBBReU+BBsSo9x5OVvVRIYNXb4jB0yzAOBgNVHQ8BAf8E
-						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-						c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQZnNzLnVhcy5veC5hYy51azAN
-						BgkqhkiG9w0BAQUFAAOCAQEAmAPn0j0WX1XekgeMqTvqQkDx9+95SjmOVW4UHmi8
-						jM712t1G+tvaRztm8q9e+YK3TWj6Tjd7cdZK68TO+VggUuTKu0tfiaU0+Z0FUomy
-						7+z5Kt1+yivEqyKBtvi0ihuhLIBwZDd6FN3/0gkGoENnVntOZEy+b4vj+wI+88e9
-						3PNTPU55j1nD8JnMt0iMH04Z2R/kGG0GCkFFFT4J1zf2ViHoX3YPxTqFvvIkcUDU
-						e6h1UYCvavHLlQEC+czI6vJRez2hUUjy/oAWhVJplQJgWNCo+Kbwn4gwgxJflKMy
-						ixBBoodIxlw3Tiy8SOzpfplaySdFtJStux1l1daGfEQhfQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.uas.ox.ac.uk/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.uas.ox.ac.uk/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://fs.uas.ox.ac.uk/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.uas.ox.ac.uk/adfs/ls/" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, UAS Federation Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.xml
deleted file mode 100644
index c208d065..00000000
--- a/swamid-interfederations-2.0/fsa.rocmondriaan.nl-adfs-services-trust.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="http://fsa.rocmondriaan.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-01T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">ROC Mondriaan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ROC Mondriaan</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">ROC Mondriaan</mdui:Description>
-        <mdui:Description xml:lang="en">ROC Mondriaan</mdui:Description>
-        <mdui:Logo height="78" width="214">https://static.surfconext.nl/logos/idp/ROC-Mondriaan_Logo.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="en">ROC Mondriaan MBO Den Haag Zuid Holland</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">ROC Mondriaan International Business Hotel Management</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/5c809081b2d195aeef7614ef5986f937"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">ROC Mondriaan</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">ROC Mondriaan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">ROC Mondriaan</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ROC Mondriaan</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.rocmondriaan.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.rocmondriaan.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/fsdev.iceruganda.org-adfs-services-trust.xml b/swamid-interfederations-2.0/fsdev.iceruganda.org-adfs-services-trust.xml
deleted file mode 100644
index 8acfa495..00000000
--- a/swamid-interfederations-2.0/fsdev.iceruganda.org-adfs-services-trust.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fsdev.iceruganda.org/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">NIAID ICER SharePoint 2013 Authentication Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">NIAID ICER Microsoft Active Directory Federation Services (ADFS) deployment serving as the federated authentication gateway for a SharePoint 2013 deployment </mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://spdev.iceruganda.org/spinfo</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://spdev.iceruganda.org/spinfo/SitePages/PrivacyPolicy.aspx</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFaTCCA1GgAwIBAgIJAPlger1zZr9+MA0GCSqGSIb3DQEBDQUAMEsxHTAbBgNV
-BAMMFGZzZGV2LmljZXJ1Z2FuZGEub3JnMSowKAYJKoZIhvcNAQkBFhtpY2VyLXZy
-by1hZG1pbkBsaXN0Lm5paC5nb3YwHhcNMTYwMTExMTUzNjQxWhcNMjYwMTA4MTUz
-NjQxWjBLMR0wGwYDVQQDDBRmc2Rldi5pY2VydWdhbmRhLm9yZzEqMCgGCSqGSIb3
-DQEJARYbaWNlci12cm8tYWRtaW5AbGlzdC5uaWguZ292MIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAup+KDPz0JbptGhqhXoo9A+/gHiGmYP3j5Fh/gz3i
-d+WrlZ+FJZj2XACUDUDBj3w3W91dODlbpjxXG2XJNS9IjxxnsczwN9agbLH7LcE/
-xD4ESDqGPXh7SijO3Y0jdE1p1zFk8GiesU+MqsnMnIwhxiqEf3xSRSFsSDLca1Ux
-DMqbBKxsaqlG4Vi2+wTsr1fm4MmzhydH5puLiNShEjCIQhQ4vJmZCnCzbZcg9MDF
-KlgmGWRGMz91r2P0eLO+nFtoNaptTJYihlZ0BXYF38UD9krcvYa8rxg1zSjpPuAy
-vZl3YGW3znCRTf0jWgZHAYwELI8hsCnUohsk2UHbMt3vK5Z7oo55DJ6Cp6QlMgo7
-2J8fttSJjlxnJjpn1TLWZBtWUYlkq8UhH4ilpNqItlDlG1+dN5v38QGL+NCWaonV
-wBDluF+bA7omvby2w2zNotAC7sJQ59PL8UjZ1PWnb0J6VUQ4DsToEYbRDXx+kqfj
-6QOXpMVC+iJBt4atV39rfg3w2SstJnkicfzPRylbh62LwyCbFKoouzyjdu7m9XNr
-kX1unAJer5vBb7uMvg4AnHYjCBde8ux6zNbPzYf4eV1S60ry+B+mac+/rwqU+oba
-YZUGt0x62eL/2GnSvtfcNeMhJDRCfxFd5W89ONskKmxz1qy2Iwy0f0wH4jGHyO37
-Zf8CAwEAAaNQME4wHQYDVR0OBBYEFA2q+ih60u8+ypdjmuESOca5udUdMB8GA1Ud
-IwQYMBaAFA2q+ih60u8+ypdjmuESOca5udUdMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQENBQADggIBAFWWZEbZ2EKUg6GlE2/4Blgub6hFpPIroQYV5/BOEfwoOMIs
-yB/sdEjPWikJj37sYTXU3aQvXSJDl03mcostT4e9S2c1b2WUefo+yT+gRo+jcS7T
-uHJnod8vntkOsYBAJI84K2wLPzXmvKwhCnyfj/tbxIDN4CgLeWJjooKVgg/R5Ez5
-6BHUpaS4rbDuIrVVLIMrKvpjd/eofwOMRCJO9YWWHwyRFzHc55AznUkkuoqQi0S7
-m6l7VioRkWRBSrB4BauK1zqsiZS+GBHfIBvqFzoOEszaeYfLklnoMWXAc81yrIIf
-eUZyOHcxhihAkz2MdvqvKrlVkxz6qKcJcfyUM6byemFiSyu9+pugnKZSlHyMpHyw
-f7Os3Fy/8umEMNCSe+kAwiu7pUx3Rx0Fc+Q9spsix8FFzVZOZRlK2uU+TzmmL/GU
-QSVWXMcuaYoA2HfSOeF5ImmWqODnUjP/l6qTttNqUyacU/p+F5oYJO1iDA2BxvDo
-QI82s3X0kXo/yc+0S4a2SR1bS9MI4Zfr/TmnJqgqiiO4FzlSt154T90439OaaH0R
-PfMuuqb4C6Oph/TbgYvSXjOeFKlxwCpxtJT1dRL2zVpzCtrX/AntAoQNJz5yb8M9
-9TXNd/TjvHllKjl27Wo9VDjaPsIkErxtiCU9eKE2xkhkFgNdvQqlPVOqEiyO
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsdev.iceruganda.org/adfs/ls/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">NIAID ICER SharePoint 2013 Authentication Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">NIAID ICER Microsoft Active Directory Federation Services (ADFS) deployment serving as the federated authentication gateway for a SharePoint 2013 deployment </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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
index 14bd4883..59340ad2 100644
--- a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://fse.eduuni.fi/adfs/services/trust">
-  <md: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>
-  </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="http://fse.eduuni.fi/adfs/services/trust">
   <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:UIInfo>
         <mdui:DisplayName xml:lang="en">Eduuni</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Eduuni</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Eduuni</mdui:DisplayName>
@@ -21,9 +11,13 @@
         <mdui:PrivacyStatementURL xml:lang="en">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">http://id.eduuni.fi/Eduuni-PrivacyPolicy.html</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIHATCCBOmgAwIBAgIEC/N6MDANBgkqhkiG9w0BAQsFADB4MQswCQYDVQQGEwJG
 STEhMB8GA1UEChMYVmFlc3RvcmVraXN0ZXJpa2Vza3VzIENBMRowGAYDVQQLExFQ
@@ -76,7 +70,7 @@ xfA0vCqs9R2/KT1nyuxdYWxcutJx</ds:X509Certificate>
       <md:ServiceName xml:lang="sv">Eduuni</md:ServiceName>
       <md:ServiceDescription xml:lang="fi">Eduuni on sahkoisen tyoskentelyn ja verkostoitumisen palveluymparisto</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Eduuni is an environment for e-work and collaboration services</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 Name="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>
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 dcf476aa..00000000
--- a/swamid-interfederations-2.0/fse.eduuni.fi.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://fse.eduuni.fi/adfs/services/trust">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <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/fsso-qa1.springer.com.xml b/swamid-interfederations-2.0/fsso-qa1.springer.com.xml
deleted file mode 100644
index c4f470a3..00000000
--- a/swamid-interfederations-2.0/fsso-qa1.springer.com.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fsso-qa1.springer.com">
-  <!--
-		This is a 'QA1' OpenAM SP for Springer-Verlag London Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T12:58:12Z"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDpjCCAo4CCQDEC3NoQurXpjANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRgwFgYDVQQKEw9T
-						cHJpbmdlciBOYXR1cmUxHjAcBgNVBAMTFWZzc28tcWExLnNwcmluZ2VyLmNvbTEp
-						MCcGCSqGSIb3DQEJARYaY2FzcGVyc3VwcG9ydEBzcHJpbmdlci5jb20wHhcNMTUw
-						ODExMTMwNDA5WhcNMzAwODA3MTMwNDA5WjCBlDELMAkGA1UEBhMCR0IxDzANBgNV
-						BAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRgwFgYDVQQKEw9TcHJpbmdlciBO
-						YXR1cmUxHjAcBgNVBAMTFWZzc28tcWExLnNwcmluZ2VyLmNvbTEpMCcGCSqGSIb3
-						DQEJARYaY2FzcGVyc3VwcG9ydEBzcHJpbmdlci5jb20wggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDSBZBY3JNf6ymg6Sa7MwlfFZ0sKuhFSZEaR2Nuhzme
-						1Rgh7Jerthr9i97fXq2MBLvS5hI14rqFubJhET0QuAaolPlC1NEt4xM4wsjNLzni
-						fY/LjY2Jm8WCc4IIjdWPDLoUPiT7Y96XQd3K9hTjRbRXjdluGrIB+NiJcpBq3YSi
-						j6FEZC1rhyUcNVNGYUQe612PLVQ/goamlfyCXpSCKL6S1HxHTDgt8EMxKIHrgrUi
-						qW6riSYUBW7TqqeOvnYhCBSZA/S/D+7U8xmIBn1i/v+BGudcIAiqlg3opyNFVY37
-						VSqcSHq8GMijpjgJeKcOwxBL09/D2xSuTm6MJC4JbM4jAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBALLDEftdIFmRKY2g9r7vAz2kWu59dePgY549TzvIkjdABjF+HufZ
-						2eyPddoN2jM6LGycZ9SS//0/BHC/ClPon0A69+1kygYAWhWI0y7+7DhR34Uu0N3G
-						AMeq+VC1zizApD9WWxLw2MVaz2R67AAOIO9C1niOV056FePDV8qA6aut6xhN9fCg
-						Ep3iXISmuAkyLUVMyTURYGQfm6YtUFeV+OwIN7KZoSqVKR8Ip7R9YL8DVLnoj0wj
-						pFbrFKC2mGsR1jg+BCJKDAK/7snX+2UMkI3CjlAiNO13XQF3FsyoVP2+CIKdNV/h
-						Gf4Gupnkh8oSSqO3d3brgXvHIeU5mlKOGVw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
-      </EncryptionMethod>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso-qa1.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa1.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso-qa1.springer.com/federation/SPSloSoap/metaAlias/SpringerServiceProvider"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso-qa1.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa1.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso-qa1.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa1.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider"/>
-    <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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fsso-qa1.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa1.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fsso-qa1.springer.com/federation/Consumer/ECP/metaAlias/SpringerServiceProvider" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Springer-Verlag London Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SpringerLink and Springer for R&amp;D (qa1)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://link.springer.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Springer Support</GivenName>
-    <EmailAddress>mailto:onlineservice@springer.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Casper Support</GivenName>
-    <EmailAddress>mailto:caspersupport@springer.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fsso-qa2.springer.com.xml b/swamid-interfederations-2.0/fsso-qa2.springer.com.xml
deleted file mode 100644
index 770dd9c0..00000000
--- a/swamid-interfederations-2.0/fsso-qa2.springer.com.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fsso-qa2.springer.com">
-  <!--
-		This is a 'QA2' OpenAM SP for Springer-Verlag London Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T13:00:18Z"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDpjCCAo4CCQDodcatn4m28TANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRgwFgYDVQQKEw9T
-						cHJpbmdlciBOYXR1cmUxHjAcBgNVBAMTFWZzc28tcWEyLnNwcmluZ2VyLmNvbTEp
-						MCcGCSqGSIb3DQEJARYaY2FzcGVyc3VwcG9ydEBzcHJpbmdlci5jb20wHhcNMTUw
-						ODExMTMyODQ2WhcNMzAwODA3MTMyODQ2WjCBlDELMAkGA1UEBhMCR0IxDzANBgNV
-						BAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRgwFgYDVQQKEw9TcHJpbmdlciBO
-						YXR1cmUxHjAcBgNVBAMTFWZzc28tcWEyLnNwcmluZ2VyLmNvbTEpMCcGCSqGSIb3
-						DQEJARYaY2FzcGVyc3VwcG9ydEBzcHJpbmdlci5jb20wggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCsI/20KXmZ71d97jNJPU35PLy54zg/1MWqgmHhBlyh
-						4XY5xwy4gb8j2+1ay+8FYan7x7hJaUCDANf2wSQojmfAYkrtWQUOe4jRgrXs72js
-						c61tDC4C6ONUIlRRa2Dc4N4ufOWp2gDASxa7rUpYdOaxgm6HM8atIDK0hjocLca2
-						ELw4bCrdmHOvuS88wJ/dQPAeUfzb81UbG68H/KvDstFnAfviGMC8osFFiWxcaZqQ
-						3KnnczdbHk7thfHJeeZLLumSVrbZ5HJzibsx3DSnJdPsYNmsmvEUHCh2KkFQdG86
-						PQwl0QA7HiRHaD8Yedqlh2ZCH21vVShbNP7dQPXjlR4HAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBAGk+6QQtiwal6QjSg5plQGJ88JOaMkqqylg8hlFf1Jn5Vmiqia9p
-						z9v4dLn8ZjpSEMMcs77XjRN4mHRQKwqQvGpAoJWcpk45b/fMnZtquLSiskuzCnAH
-						I+bVr6RW1hCX0O2eW1cvmys8JaO1P33U3aFnrUif66PvariFCfF6H4R5rziICiAb
-						gjD0gG1zlOj0AWuOW2g2JhBSYODNgYXW8M0EFKaHr0orAN8YuEJW5k80h8iMhV7v
-						awjtanXCJnZIRx9CjOJmHxcuDz8rndOJO241rcgEDbCW49DW3Y4A83NneEFY7TgM
-						bKn7aYeRME5SWDRw1DfPOy6qq8HgffKYLkg=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
-      </EncryptionMethod>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso-qa2.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa2.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso-qa2.springer.com/federation/SPSloSoap/metaAlias/SpringerServiceProvider"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso-qa2.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa2.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso-qa2.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso-qa2.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider"/>
-    <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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fsso-qa2.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso-qa2.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fsso-qa2.springer.com/federation/Consumer/ECP/metaAlias/SpringerServiceProvider" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Springer-Verlag London Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SpringerLink and Springer for R&amp;D (qa2)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://link.springer.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Springer Support</GivenName>
-    <EmailAddress>mailto:onlineservice@springer.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Casper Support</GivenName>
-    <EmailAddress>mailto:caspersupport@springer.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fsso.springer.com.xml b/swamid-interfederations-2.0/fsso.springer.com.xml
deleted file mode 100644
index 493f67cc..00000000
--- a/swamid-interfederations-2.0/fsso.springer.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://fsso.springer.com">
-  <!--
-		This is an OpenAM SP for Springer-Verlag London Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T13:02:11Z"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" 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">SpringerLink and Springer for R&amp;D</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SpringerLink and Springer for R&amp;D offer researchers access to millions of scientific documents.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFCjCCA/KgAwIBAgIQLjTwCOU9tS/TtpogR6vgozANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTQwODE5
-						MDAwMDAwWhcNMTcwODE0MjM1OTU5WjBeMQswCQYDVQQGEwJHQjEPMA0GA1UECBMG
-						TG9uZG9uMQ8wDQYDVQQHFAZMb25kb24xETAPBgNVBAoUCFNwcmluZ2VyMRowGAYD
-						VQQDFBFmc3NvLnNwcmluZ2VyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAK2hLMYUogo2xzXswFPraYX07zwDLpetg/Fev9O8EmYjdBMoX18P857n
-						FTsyOEi9L3KaUlXQ7IaX6LWHWC19m0BTbXjdCBy8tqzuS6ZX7sFZ6WMEHtkYCeCV
-						0ThN1BG1KG3fZ4W045Ys+/f25zXXyO123wkxa7Qx/xSJM/zNP3mKLReww68RL98q
-						HbNjkDoQ2YP9R6YzAuPCZukw8UkbhK0STJqzRn3VcBXvCVKCdYAKD4U7uRWsssUu
-						YDJU329KJv4LasZBwZ4TCIdKQh317wRXFw0BKFVL1AVb/0Hs9YEyuHfB5qVXC8+7
-						fAjC3nmSxK7f9Jk/nnHdV14704zAH9UCAwEAAaOCAWowggFmMBwGA1UdEQQVMBOC
-						EWZzc28uc3ByaW5nZXIuY29tMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsG
-						A1UdHwQkMCIwIKAeoByGGmh0dHA6Ly9zZC5zeW1jYi5jb20vc2QuY3JsMGUGA1Ud
-						IAReMFwwWgYKYIZIAYb4RQEHNjBMMCMGCCsGAQUFBwIBFhdodHRwczovL2Quc3lt
-						Y2IuY29tL2NwczAlBggrBgEFBQcCAjAZFhdodHRwczovL2Quc3ltY2IuY29tL3Jw
-						YTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUDURc
-						FlNEwYJ+HSCrJfQBY9i+eaUwVwYIKwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNo
-						dHRwOi8vc2Quc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8vc2Quc3ltY2Iu
-						Y29tL3NkLmNydDANBgkqhkiG9w0BAQUFAAOCAQEAN0E+lQkTOxlaKMAyBWN3EwBt
-						/YeVGMW3L7BEqXnczaUdFWDrx6do0QacO0JAzzl1GR4qBa1OxZ/ciQSK+tLeyxN1
-						pPy054DP0jPzUsD/GV4LzxuUR5kai8lN0TLaUCAotaSIS5mqWfBnqv6mCfCOrTj+
-						ajZ6OJCB/FyTrpLkSx0+ERwxQcVY2bNToqSKkj2rI82FAzWXLO1Gy7AI8MVk9f2A
-						h984zlHxUYlsiOJEnD+dv7prP1fvSFnbjvk5aOLfPb3vm6xyuf10Ed91+bSkQC3A
-						xAg9HHHsfCPTG31sKeOQb6/m0I+Bl2Hupnqbv01S40s+byHF5EGeZhNKrQleWg==
-					</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>
-						MIIFCjCCA/KgAwIBAgIQLjTwCOU9tS/TtpogR6vgozANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTQwODE5
-						MDAwMDAwWhcNMTcwODE0MjM1OTU5WjBeMQswCQYDVQQGEwJHQjEPMA0GA1UECBMG
-						TG9uZG9uMQ8wDQYDVQQHFAZMb25kb24xETAPBgNVBAoUCFNwcmluZ2VyMRowGAYD
-						VQQDFBFmc3NvLnNwcmluZ2VyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAK2hLMYUogo2xzXswFPraYX07zwDLpetg/Fev9O8EmYjdBMoX18P857n
-						FTsyOEi9L3KaUlXQ7IaX6LWHWC19m0BTbXjdCBy8tqzuS6ZX7sFZ6WMEHtkYCeCV
-						0ThN1BG1KG3fZ4W045Ys+/f25zXXyO123wkxa7Qx/xSJM/zNP3mKLReww68RL98q
-						HbNjkDoQ2YP9R6YzAuPCZukw8UkbhK0STJqzRn3VcBXvCVKCdYAKD4U7uRWsssUu
-						YDJU329KJv4LasZBwZ4TCIdKQh317wRXFw0BKFVL1AVb/0Hs9YEyuHfB5qVXC8+7
-						fAjC3nmSxK7f9Jk/nnHdV14704zAH9UCAwEAAaOCAWowggFmMBwGA1UdEQQVMBOC
-						EWZzc28uc3ByaW5nZXIuY29tMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsG
-						A1UdHwQkMCIwIKAeoByGGmh0dHA6Ly9zZC5zeW1jYi5jb20vc2QuY3JsMGUGA1Ud
-						IAReMFwwWgYKYIZIAYb4RQEHNjBMMCMGCCsGAQUFBwIBFhdodHRwczovL2Quc3lt
-						Y2IuY29tL2NwczAlBggrBgEFBQcCAjAZFhdodHRwczovL2Quc3ltY2IuY29tL3Jw
-						YTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUDURc
-						FlNEwYJ+HSCrJfQBY9i+eaUwVwYIKwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNo
-						dHRwOi8vc2Quc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8vc2Quc3ltY2Iu
-						Y29tL3NkLmNydDANBgkqhkiG9w0BAQUFAAOCAQEAN0E+lQkTOxlaKMAyBWN3EwBt
-						/YeVGMW3L7BEqXnczaUdFWDrx6do0QacO0JAzzl1GR4qBa1OxZ/ciQSK+tLeyxN1
-						pPy054DP0jPzUsD/GV4LzxuUR5kai8lN0TLaUCAotaSIS5mqWfBnqv6mCfCOrTj+
-						ajZ6OJCB/FyTrpLkSx0+ERwxQcVY2bNToqSKkj2rI82FAzWXLO1Gy7AI8MVk9f2A
-						h984zlHxUYlsiOJEnD+dv7prP1fvSFnbjvk5aOLfPb3vm6xyuf10Ed91+bSkQC3A
-						xAg9HHHsfCPTG31sKeOQb6/m0I+Bl2Hupnqbv01S40s+byHF5EGeZhNKrQleWg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize>
-      </EncryptionMethod>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPSloRedirect/metaAlias/SpringerServiceProvider"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPSloPOST/metaAlias/SpringerServiceProvider"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso.springer.com/federation/SPSloSoap/metaAlias/SpringerServiceProvider"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fsso.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniRedirect/metaAlias/SpringerServiceProvider"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniPOST/metaAlias/SpringerServiceProvider"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fsso.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider" ResponseLocation="https://fsso.springer.com/federation/SPMniSoap/metaAlias/SpringerServiceProvider"/>
-    <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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fsso.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fsso.springer.com/federation/Consumer/metaAlias/SpringerServiceProvider" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fsso.springer.com/federation/Consumer/ECP/metaAlias/SpringerServiceProvider" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Springer-Verlag London Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SpringerLink and Springer for R&amp;D (live)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://link.springer.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Springer Support</GivenName>
-    <EmailAddress>mailto:onlineservice@springer.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Casper Support</GivenName>
-    <EmailAddress>mailto:caspersupport@springer.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/g-shib.org-shibboleth.xml b/swamid-interfederations-2.0/g-shib.org-shibboleth.xml
deleted file mode 100644
index 90f19376..00000000
--- a/swamid-interfederations-2.0/g-shib.org-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://g-shib.org/shibboleth">
-  <!--
-		This is a "Web Portal" Shibboleth SP for Getech 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="2015-05-14T13:07:29Z">
-      <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://g-shib.org/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://g-shib.org/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://g-shib.org/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://g-shib.org/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Getech Web Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Online access to the Getech web portal for your institution</mdui:Description>
-        <mdui:Logo height="116" width="350">https://g-shib.org/getech-logo-350x116.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJALy05c5DqQOEMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGVsZWN0cmEuZ2V0ZWNoLmNvLnVrMB4XDTE1MDIxMDE2NTA0N1oXDTI1MDIw
-						NzE2NTA0N1owHzEdMBsGA1UEAxMUZWxlY3RyYS5nZXRlY2guY28udWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDECYfU4npJYfA6SQ9+d7i7LaPfExSD
-						9v77LVDlH2gC0qntSpR/bqGfk20V0GnIyfrPowdp73tDkPp3cZAVkL6yZc1AMfwm
-						/vnaIdJvuxmZrsYkuvDVzfbjcVveaLKiPAxVnNGotqkYfrC55dbC4IbzWIWVmVEN
-						oWb3x0lGcK+/gihriel1l7x9XH8mMjxKRPDLpt5byLHTiFAiPfW8ueYT6fyd4jJa
-						X/Y4GcaXWSC/phVpKpDddo7Ed9PP05kzCB7nfapB2dB9ha9xiT9tR/o3hMpIUIfi
-						cWMao2HvJU2A629/fO4nCIkvzSbG39ORX5MZ1OZTkD9sk8uLHohKCugjAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFGVsZWN0cmEuZ2V0ZWNoLmNvLnVrMB0GA1UdDgQWBBT/
-						WshLSzBgHfNYs8ysWr+Rr5eamTANBgkqhkiG9w0BAQUFAAOCAQEAr/uHuMELywZ5
-						YNrGxjp+ETD/qXgWBsZiYkL4OCbS7YureuktsayK1jYaj7elcz3jsIfaLo4egyXP
-						/GQC6ZcdgCAZ3tNDrwGxOFj6R87Vpb8CBSYqnVQ9eNldKC6+peJFJ2Px75m/9V4H
-						GJWDv8Of8cTuGa1brZK/diQPIEYGrwh/sEsjlgHNR4ZcSn9buMLr+MXV6BoxQ7M2
-						7o0e7Mz8IYWu8+Dte8pIxGqaE3V9YrWKhmlANU22E69hzeOlrq7tGFC5+g+FDLax
-						loqofKby5z252dPlaTkYkOawOOXdiTvslDqSwwnC5ht6btuMShzG8jyiMhrRs44y
-						Prf3a/9vGg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://g-shib.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://g-shib.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://g-shib.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://g-shib.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://g-shib.org/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://g-shib.org/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://g-shib.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://g-shib.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://g-shib.org/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://g-shib.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://g-shib.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://g-shib.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://g-shib.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://g-shib.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://g-shib.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucl.g-shib.org/Shibboleth.sso/SAML/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Getech Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Getech Web Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.getech.co.uk/education.aspx/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adi</GivenName>
-    <SurName>Jacinto</SurName>
-    <EmailAddress>mailto:ajacinto@getech.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Baker</SurName>
-    <EmailAddress>mailto:rbaker@getech.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml
deleted file mode 100644
index eaa3e287..00000000
--- a/swamid-interfederations-2.0/garr-idp-prod.irccs.garr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://garr-idp-prod.irccs.garr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IDP in the Cloud Project (GARR)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Progetto IDP in the Cloud (GARR)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test IDP dedicated to GARR's "IDP in the Cloud" Project</mdui:Description>
-        <mdui:Description xml:lang="it">IDP di Test per il progetto "IDP in the Cloud" del GARR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="32" width="32" xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="en">https://garr-idp-prod.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="32" width="32" xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="it">https://garr-idp-prod.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDWDCCAkCgAwIBAgIVAPZKMgdGcoQkXqZIfy0VDEQIQwOIMA0GCSqGSIb3DQEB
-BQUAMCYxJDAiBgNVBAMTG2dhcnItaWRwLXByb2QuaXJjY3MuZ2Fyci5pdDAeFw0x
-MzA3MjYxMjI1MTRaFw0zMzA3MjYxMjI1MTRaMCYxJDAiBgNVBAMTG2dhcnItaWRw
-LXByb2QuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAJHeyOXSuq5y8ZW7+87i+ytu5woxrwcXfXLyGEO5ELCwqfv2KR3BEhmxg5xR
-3DSOdStOAt2gzKn+MbJbUgsbSrUr3jyYoy2lggZuLtKl8QSs/tIvV2FSsi4JdI9k
-vDRcNtIPoiKzhMQmduvEFwBHt7mZ2p3Sq4PmQ2ZFCb1S5Na9isbtJxuyxB2wnMXM
-LvkR6zfbVvVZcgAlJ8ZP299aI0U3gWfO75qhhoLs4ZZpEzg/a9M6yHKjxj+Vg1Vl
-Pp9WASd3fV2yHVAsDvsCsBin4DDsFUt0WDpt4mNsutTIdgNxofCDaPcdlN0504DJ
-V9ZjIpkBMBs/DPo24jRPurHiUy0CAwEAAaN9MHswWgYDVR0RBFMwUYIbZ2Fyci1p
-ZHAtcHJvZC5pcmNjcy5nYXJyLml0hjJodHRwczovL2dhcnItaWRwLXByb2QuaXJj
-Y3MuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUtvMwiFgS2v2SqYoH
-spgVmkVreXowDQYJKoZIhvcNAQEFBQADggEBAEqUfDgfRPY88jYVuF8+kHAtyUep
-VoXt6jqZqrjAw0bt22Je+StgCVx1d9ymK7YW2LGRtaTmn2P/u+5a7imm5eiOzXQu
-Wom9Jpo9eO0Sgt6JGWxn84JEesHX84lOtq1Zk4vt6ikCiO+b4PZXvFX57VzfINKZ
-aS6FPyIB0+6O6G+9e2T9N5w7GegZ6efHE4L5FqV/pmo1B6PIggQjwLdg2U5IQdbh
-yhRCuth3zwD/h8ugGBcivPvvI2MCU7rg/ylb5LyKPBg7m2sGeMVurm2iHnHGWGcY
-5PpfNjgfzle0x8qz7zUxVJN9yxVTPLkeCzCR68erStGXb3E1UalZJUC/6sQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://garr-idp-prod.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://garr-idp-prod.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://garr-idp-prod.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://garr-idp-prod.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://garr-idp-prod.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://garr-idp-prod.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDWDCCAkCgAwIBAgIVAPZKMgdGcoQkXqZIfy0VDEQIQwOIMA0GCSqGSIb3DQEB
-BQUAMCYxJDAiBgNVBAMTG2dhcnItaWRwLXByb2QuaXJjY3MuZ2Fyci5pdDAeFw0x
-MzA3MjYxMjI1MTRaFw0zMzA3MjYxMjI1MTRaMCYxJDAiBgNVBAMTG2dhcnItaWRw
-LXByb2QuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAJHeyOXSuq5y8ZW7+87i+ytu5woxrwcXfXLyGEO5ELCwqfv2KR3BEhmxg5xR
-3DSOdStOAt2gzKn+MbJbUgsbSrUr3jyYoy2lggZuLtKl8QSs/tIvV2FSsi4JdI9k
-vDRcNtIPoiKzhMQmduvEFwBHt7mZ2p3Sq4PmQ2ZFCb1S5Na9isbtJxuyxB2wnMXM
-LvkR6zfbVvVZcgAlJ8ZP299aI0U3gWfO75qhhoLs4ZZpEzg/a9M6yHKjxj+Vg1Vl
-Pp9WASd3fV2yHVAsDvsCsBin4DDsFUt0WDpt4mNsutTIdgNxofCDaPcdlN0504DJ
-V9ZjIpkBMBs/DPo24jRPurHiUy0CAwEAAaN9MHswWgYDVR0RBFMwUYIbZ2Fyci1p
-ZHAtcHJvZC5pcmNjcy5nYXJyLml0hjJodHRwczovL2dhcnItaWRwLXByb2QuaXJj
-Y3MuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUtvMwiFgS2v2SqYoH
-spgVmkVreXowDQYJKoZIhvcNAQEFBQADggEBAEqUfDgfRPY88jYVuF8+kHAtyUep
-VoXt6jqZqrjAw0bt22Je+StgCVx1d9ymK7YW2LGRtaTmn2P/u+5a7imm5eiOzXQu
-Wom9Jpo9eO0Sgt6JGWxn84JEesHX84lOtq1Zk4vt6ikCiO+b4PZXvFX57VzfINKZ
-aS6FPyIB0+6O6G+9e2T9N5w7GegZ6efHE4L5FqV/pmo1B6PIggQjwLdg2U5IQdbh
-yhRCuth3zwD/h8ugGBcivPvvI2MCU7rg/ylb5LyKPBg7m2sGeMVurm2iHnHGWGcY
-5PpfNjgfzle0x8qz7zUxVJN9yxVTPLkeCzCR68erStGXb3E1UalZJUC/6sQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://garr-idp-prod.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://garr-idp-prod.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IDP in the Cloud Project (GARR)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Progetto IDP in the Cloud (GARR)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>System Support</md:GivenName>
-    <md:EmailAddress>mailto:system.support@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 6dc6cdec..00000000
--- a/swamid-interfederations-2.0/gatekeeper.new.ox.ac.uk-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://gatekeeper.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a "New College Wifi authentication server" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-11-28T10:27:24Z">
-      <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://gatekeeper.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAOQwjabMZUfkMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2dhdGVrZWVwZXIubmV3Lm94LmFjLnVrMB4XDTEzMTEyNzE0MDMwNVoXDTIz
-						MTEyNTE0MDMwNVowIjEgMB4GA1UEAxMXZ2F0ZWtlZXBlci5uZXcub3guYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIZzpzGZMdO8WNqgTiaHTh
-						4h7xBDoIBX2FgZMc5cvIvltA1Zbg1RCgskKcid/EGCWT+Xe9zPM7H/LablZ5KGU8
-						p6tg40jzZc6ZQzPrgsPCxFDarVdn4itgm2YLhWJKMAcfhtpFc2hcD+5Cxv7QOFzg
-						n/XXmQWqXedsVFftpZ2ZIbMs6LmSY8x+Eq92Him1dgiGTrxBNBKS+nqGXXt6orH8
-						qkP11tQ88b9FSCuQ05vBoc0yj9wezx8BT+PYmw/2BK/fCyrLdMIYDh2RmMQnlJGI
-						iLu3jrPVAi4buEVMLCPsGE20mNkDsdrCN3BCMzJ6Zi2bAX7dL6bfQT3SK+YfZk/1
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2dhdGVrZWVwZXIubmV3Lm94LmFjLnVrMB0G
-						A1UdDgQWBBQVbXUza42WR0tfgqKagp9z1hPDPzANBgkqhkiG9w0BAQUFAAOCAQEA
-						p9qmPeKyV8MSth4Qf82n5DH6n74JnnSQ85Mtq7rp5WK4KwJ42U3Yw768AgexjJKR
-						l8WqgG2lHP3k0ZREUTFip0fEmY08RnzpMmOAdzcedeWrO1ABqNW1724hcStLQPrf
-						uRLIycISwMcnPrgqK5uMxqwbp5itzomWeNRDYG6MdToJ81rOs/E5kKlGmjE7d1YS
-						fvLGueVy3BbIsyJEjCz7dj5dm8+eguh3VMjRQUT4r79H+sjginc+QTBByxnSZ641
-						9ISVAGvfUB2sQMp+B3QPlrubAwMpAVKlgnmiJEYS6R8LOKZEbAOA+nBoFE9+lxmR
-						xug/F2NSE54Sg/nepxJpqw==
-					</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://gatekeeper.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gatekeeper.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, New College Wifi authentication server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Office</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Dore</SurName>
-    <EmailAddress>mailto:james.dore@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml b/swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml
deleted file mode 100644
index 081ece8a..00000000
--- a/swamid-interfederations-2.0/gatekeeper2.tudelft.nl-openaselect-profiles-saml2-.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gatekeeper2.tudelft.nl/openaselect/profiles/saml2/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-31T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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 Delft (OpenASelect)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Delft University of Technology (OpenASelect)</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Technische Universiteit Delft</mdui:Description>
-        <mdui:Description xml:lang="en">Technische Universiteit Delft</mdui:Description>
-        <mdui:Logo height="60" width="120">https://static.surfconext.nl/logos/idp/tudelft.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">technische universiteit delft delft university of technology tud tudelft</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">technische universiteit delft  delft university of technology tud tudelft</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/86d78b7ddf7216410b6724876ce1f75f"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Technische Universiteit Delft</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technische Universiteit Delft</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://tudelft.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/gateway.capella.edu-FIM-sps-capella_saml2_idp-saml20.xml b/swamid-interfederations-2.0/gateway.capella.edu-FIM-sps-capella_saml2_idp-saml20.xml
deleted file mode 100644
index 228df5a1..00000000
--- a/swamid-interfederations-2.0/gateway.capella.edu-FIM-sps-capella_saml2_idp-saml20.xml
+++ /dev/null
@@ -1,54 +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://gateway.capella.edu/FIM/sps/capella_saml2_idp/saml20">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">capella.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Capella University</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>
-MIIDajCCAlKgAwIBAgIET7QbxjANBgkqhkiG9w0BAQQFADB3MQswCQYDVQQGEwJVUzESMBAGA1UE
-CBMJTWlubmVzb3RhMRQwEgYDVQQHEwtNaW5uZWFwb2xpczEbMBkGA1UEChMSQ2FwZWxsYSBVbml2
-ZXJzaXR5MQswCQYDVQQLEwJJVDEUMBIGA1UEAxMLY2FwZWxsYS1pZHAwHhcNMTIwNTE2MjEyNzM0
-WhcNMjIwNTE0MjEyNzM0WjB3MQswCQYDVQQGEwJVUzESMBAGA1UECBMJTWlubmVzb3RhMRQwEgYD
-VQQHEwtNaW5uZWFwb2xpczEbMBkGA1UEChMSQ2FwZWxsYSBVbml2ZXJzaXR5MQswCQYDVQQLEwJJ
-VDEUMBIGA1UEAxMLY2FwZWxsYS1pZHAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDh
-HG8seF+2p1nfpLIl25JwFu9/l4Qkkodvn6dR9FKdqrbG4YzRrFL0eZX3GjiXxdO4EvP9tyZcnWo7
-tcQETdBBG+WdKhF8/ufDjlh8xVUnhTywdEBM3TwpUMQrl3kpA0XDV2PL+pMY4wUK9ZWOHXugfITa
-uYZWgF+oXKnlr4FRx198YV2mpFIx6Cp6eD6F3IdDWpd/hk87NSPspilsmwk/8QdniGyCYC0HwWeq
-w6Frddt85g483icKe/uYS0Br13mC3idsjih87SGKTnsLZomdCAhvkGvqzHsqhDyZG0UkcL4CrTGK
-yxk/K1TAP6bHpoDnHQqf72PIBC+GjeXfrMNDAgMBAAEwDQYJKoZIhvcNAQEEBQADggEBAGuTQIli
-PaReWGl8X37s2eF14tiChzoQ4VvWKGUCMi9sFmnXbVev0tbwgfINiTyLV1yBm6ksDn7zGR/knBYn
-C5gPAQfaQ9KxZ0vGkO/cd0r5XRF82GFcyFbU9e7B+IMTnplFjMBecy9O/L1GuptEkqbLlSy6I1iM
-1G2kOdU+BPDc8BAS2DThMhUd4hGh1XJo8eGrHjUxdvuA9xGbYLKWEaREJw2gXKBBmhs0RVx0oKR+
-8KhkknImHBoobn9fC6X2NbCbq2fFl7ToETDtOHyOfea/GjhqBLjIGdML/yslGrwX4AmSrwyclk4e
-Hh6Nd35KRm7+gqZhZXpHBm3kbX+mqUs=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gateway.capella.edu/FIM/sps/capella_saml2_idp/saml20/login"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gateway.capella.edu/FIM/sps/capella_saml2_idp/saml20/login"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Capella University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Capella University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.capella.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Angie Shand</md:GivenName>
-    <md:EmailAddress>Angie.Shand@capella.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/gateway.ncl.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index fc7a0f70..00000000
--- a/swamid-interfederations-2.0/gateway.ncl.ac.uk-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://gateway.ncl.ac.uk/idp/shibboleth">
-  <!--
-		This is the IdP for the University of Newcastle upon Tyne.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Newcastle University</mdui:DisplayName>
-        <mdui:Logo height="69" width="186">https://gateway.ncl.ac.uk/images/gateway_ncl_logo.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://gateway.ncl.ac.uk/images/gateway_ncl.ico</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncl.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIULMVH+d794/0tHGBCoqe7TG75FeMwDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAxMRZ2F0ZXdheS5uY2wuYWMudWswHhcNMDkwMzMxMDgzNjQy
-						WhcNMjkwMzMxMDgzNjQyWjAcMRowGAYDVQQDExFnYXRld2F5Lm5jbC5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALm01D6AF7BDlk72DEDkVOfV
-						hJYOTQUmgZlVj2LYKhX4hA+3/qT5h3J18Q5ap5++HbgqyGW3vDWoqBWZb/MY3eal
-						nhhVv/EPr/ArGThyTOy1pXUBsCH18EpbXsgqP+VTG4LrS5usYLP/3RFqFgb/KxmT
-						kbVGK5lxXFjHgYIegfF/QYIQ9VYCNSxl2DgE1/bl3XxoDEf2Jckh3vrjfDIYxhsb
-						JYmK9QQymOqCZSwBB9t4HvUEGjSQBidaBvfpLEciztWHCaYVoRoeupA53Unl5xnC
-						H/4+Ds1nUg7Kjn6dxHZI5U65U3054ev5hOJjGeal/ebUjAH1TfVFWRdrM1rnnUEC
-						AwEAAaNpMGcwRgYDVR0RBD8wPYIRZ2F0ZXdheS5uY2wuYWMudWuGKGh0dHBzOi8v
-						Z2F0ZXdheS5uY2wuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGAesT0R
-						oVezoU/7a8tsnsNtS3waMA0GCSqGSIb3DQEBBQUAA4IBAQC3ksC1VClv88voWcgq
-						l4BZ6fjIoFTiXGWD26lbm2earRfkSigJY1incBZ75rF7zpuUHLPs3rnVqoNf91PX
-						PoGx9HcJXjzm4EXtNznjjWfHbzr5R18YFOJL8VrTwBlB8PMbPIH/Tmq+g0+EAdMf
-						X4FAN+ZuyeVOUh7U4vKP5VdtJhuFduepCTR7rz+Pwcwr1EgN2LyXQ+5wuUScw5iF
-						HSiU3gRV6PZDcbhausvsBGCpIdgwl5dgieqgoLBaQqpR7KrSgpT12wUPHSFSzPGD
-						EFniPxIMoZkVwLWNjfP2R2s2cg1B3LL3H3I72IGqFJegGqrgJgHuHbanWJwIMAtl
-						B8/r
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.ncl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gateway.ncl.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://gateway.ncl.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gateway.ncl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gateway.ncl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gateway.ncl.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">ncl.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIULMVH+d794/0tHGBCoqe7TG75FeMwDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAxMRZ2F0ZXdheS5uY2wuYWMudWswHhcNMDkwMzMxMDgzNjQy
-						WhcNMjkwMzMxMDgzNjQyWjAcMRowGAYDVQQDExFnYXRld2F5Lm5jbC5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALm01D6AF7BDlk72DEDkVOfV
-						hJYOTQUmgZlVj2LYKhX4hA+3/qT5h3J18Q5ap5++HbgqyGW3vDWoqBWZb/MY3eal
-						nhhVv/EPr/ArGThyTOy1pXUBsCH18EpbXsgqP+VTG4LrS5usYLP/3RFqFgb/KxmT
-						kbVGK5lxXFjHgYIegfF/QYIQ9VYCNSxl2DgE1/bl3XxoDEf2Jckh3vrjfDIYxhsb
-						JYmK9QQymOqCZSwBB9t4HvUEGjSQBidaBvfpLEciztWHCaYVoRoeupA53Unl5xnC
-						H/4+Ds1nUg7Kjn6dxHZI5U65U3054ev5hOJjGeal/ebUjAH1TfVFWRdrM1rnnUEC
-						AwEAAaNpMGcwRgYDVR0RBD8wPYIRZ2F0ZXdheS5uY2wuYWMudWuGKGh0dHBzOi8v
-						Z2F0ZXdheS5uY2wuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGAesT0R
-						oVezoU/7a8tsnsNtS3waMA0GCSqGSIb3DQEBBQUAA4IBAQC3ksC1VClv88voWcgq
-						l4BZ6fjIoFTiXGWD26lbm2earRfkSigJY1incBZ75rF7zpuUHLPs3rnVqoNf91PX
-						PoGx9HcJXjzm4EXtNznjjWfHbzr5R18YFOJL8VrTwBlB8PMbPIH/Tmq+g0+EAdMf
-						X4FAN+ZuyeVOUh7U4vKP5VdtJhuFduepCTR7rz+Pwcwr1EgN2LyXQ+5wuUScw5iF
-						HSiU3gRV6PZDcbhausvsBGCpIdgwl5dgieqgoLBaQqpR7KrSgpT12wUPHSFSzPGD
-						EFniPxIMoZkVwLWNjfP2R2s2cg1B3LL3H3I72IGqFJegGqrgJgHuHbanWJwIMAtl
-						B8/r
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.ncl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gateway.ncl.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 Newcastle upon Tyne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newcastle University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpline</GivenName>
-    <EmailAddress>mailto:webmaster@ncl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Caleb</GivenName>
-    <SurName>Racey</SurName>
-    <EmailAddress>mailto:Caleb.Racey@ncl.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e6d7e8e8..00000000
--- a/swamid-interfederations-2.0/gateway.wolfson.ox.ac.uk-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://gateway.wolfson.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Wolfson College Members Portal" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2012-02-06T16:32:59Z">
-      <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://gateway.wolfson.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOkS8eC5Y3zuMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGdhdGV3YXkud29sZnNvbi5veC5hYy51azAeFw0xMjAyMDMxMzU0MjlaFw0y
-						MjAxMzExMzU0MjlaMCMxITAfBgNVBAMTGGdhdGV3YXkud29sZnNvbi5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMmt177KXs5KAESLHAE6
-						msW2Jce4pFG5mmhaSrL8gFQs85FN+o6/gW3k5unIxZu+NUJ6moX4ndWNfEQiS6AN
-						WLDRCnohMPPZ0+7Dxh7YdLrHUphP37aAYriv2B0caMwDicS5UAILZUlseD9SSJIH
-						3yLlMUuJ/W0qQQX6t/jOYH8QS580cCZozyoy4/4B5d8RfkPRRx1eEh0F3vip+CXv
-						MiqPcjj4yLDRmpgaj5vb+6nReaw3xZNTBz/YCMQoHe2lzSAeRKKgeSQ4XFZA+jo+
-						5CrgW4SX0Ee5Bgjp9owJai8SQ+CfqQk0D73vRco3TWq5ECjX22GvpUdDueNOrZaL
-						3oMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZ2F0ZXdheS53b2xmc29uLm94LmFjLnVr
-						MB0GA1UdDgQWBBSzAatpjhACRYzE8BCtxnHdVt+6PjANBgkqhkiG9w0BAQUFAAOC
-						AQEAZSYFk41ZDyTd62QwjxpjSSqwICuV0RFiZwQzwRzCVhv5F8JxHjklC7SKOpKE
-						8T1lhR5OjHGV60lst5XM3eS6A7VBjmK4JY6ladf06IeKVtkby9gbHN5P69Iv9s4o
-						upHabcw0/gz9clmaCxOjgKdPfVZrHcfXfwbrNU+b/QONcvHs1Xmr05sL7f6n11cU
-						Ti/ntWb0fTkn3XtkhaML4EsDPZIYW9iz2ZXTI3Hh1OBbNPZQuMBT4zeEfHPCk5hU
-						d2IccXOROWcZUMinWh2lVzj6id/tIyKEUzJypBdkrkCvau1FcNz7Z/NIJ4GFet6n
-						57qQTrBZCtib803Sq8yAEbi+WQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://gateway.wolfson.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gateway.wolfson.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Wolfson College Members Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wolfson.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Wolfson College IT Team</GivenName>
-    <EmailAddress>mailto:it.support@wolfson.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Wolfson College IT Team</GivenName>
-    <EmailAddress>mailto:it.support@wolfson.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gcidp.gloscol.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/gcidp.gloscol.ac.uk-shibboleth.xml
deleted file mode 100644
index 87510a5b..00000000
--- a/swamid-interfederations-2.0/gcidp.gloscol.ac.uk-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://gcidp.gloscol.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Gloucestershire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-14T15:23: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">gloscol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdDCCAlwCCQCFLFRZJoQD7DANBgkqhkiG9w0BAQUFADB8MQswCQYDVQQGEwJH
-						QjEYMBYGA1UECBMPR2xvdWNlc3RlcnNoaXJlMRMwEQYDVQQHEwpHbG91Y2VzdGVy
-						MSAwHgYDVQQKExdHbG91Y2VzdGVyc2hpcmUgQ29sbGVnZTEcMBoGA1UEAxMTZ2Np
-						ZHAuZ2xvc2NvbC5hYy51azAeFw0xNDA5MDQxMjM1MDNaFw0zNDA4MzAxMjM1MDNa
-						MHwxCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9HbG91Y2VzdGVyc2hpcmUxEzARBgNV
-						BAcTCkdsb3VjZXN0ZXIxIDAeBgNVBAoTF0dsb3VjZXN0ZXJzaGlyZSBDb2xsZWdl
-						MRwwGgYDVQQDExNnY2lkcC5nbG9zY29sLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEAsMUVkCGjKBCiO/eUFXf5dKpvjFOkca/nkGxMGgB9nG6+
-						/fCol/mEu0ctS0NgDQSadkfSIJGm4la5vIZKmbfnzZcxUHW8L1n/OkmQf8UwDjCZ
-						u9TZWi7022U1tetOIYf6grw9YPbXYvBZ/X6bddOHgQS7iy78ygadig7C+dTyNFqm
-						1O2T6tJ9U6DbI8lolkvApz9BEo+yeFq0oIibO0C+77Jt7TlIqv7C7g74RKCxNZr2
-						WhZsCQ0qFNqASEOIFxeDI7uXcNyx1eBPxIKf/LsrFf0Kr++yCe0FpGIjjQFGvKoi
-						roEqZSojBi/D4bOlCBNM4UoSD9YTCHT5gukFTD2xSQIDAQABMA0GCSqGSIb3DQEB
-						BQUAA4IBAQClJpH/7g2E6cGYU+NMuXUwzWKhuDnmyB8nb8+Y/RfpMJbBRZvLPuI9
-						+jGTaso1W01S2GX/uI6n5n8awxd/LZjIfbw/aKHBeMYpmzYlarJlUqWinLh30S01
-						f5A6YDpZXHtcZzPvV0jsIunjj5OZ3XEYuhRzbyzSxLoHHEHR3f7GYJ0pvKDtuOUp
-						v8D1vRzVBo5+J76Z7KDyOYrmrnN1S1K3VAQjSOy1QPADspwnnzKWhO69ipXLZFcY
-						288Rsd2pEqK3MvTLrPlrHBqfCsYSvdeqNifmictbFNSM+r9MaGp0+tWHgiBc7tm8
-						q8cpQ2yjPF7ooQVX/ms9u9q6wa4Q4dit
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gcidp.gloscol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gcidp.gloscol.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://gcidp.gloscol.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gcidp.gloscol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gcidp.gloscol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gcidp.gloscol.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">gloscol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdDCCAlwCCQCFLFRZJoQD7DANBgkqhkiG9w0BAQUFADB8MQswCQYDVQQGEwJH
-						QjEYMBYGA1UECBMPR2xvdWNlc3RlcnNoaXJlMRMwEQYDVQQHEwpHbG91Y2VzdGVy
-						MSAwHgYDVQQKExdHbG91Y2VzdGVyc2hpcmUgQ29sbGVnZTEcMBoGA1UEAxMTZ2Np
-						ZHAuZ2xvc2NvbC5hYy51azAeFw0xNDA5MDQxMjM1MDNaFw0zNDA4MzAxMjM1MDNa
-						MHwxCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9HbG91Y2VzdGVyc2hpcmUxEzARBgNV
-						BAcTCkdsb3VjZXN0ZXIxIDAeBgNVBAoTF0dsb3VjZXN0ZXJzaGlyZSBDb2xsZWdl
-						MRwwGgYDVQQDExNnY2lkcC5nbG9zY29sLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEAsMUVkCGjKBCiO/eUFXf5dKpvjFOkca/nkGxMGgB9nG6+
-						/fCol/mEu0ctS0NgDQSadkfSIJGm4la5vIZKmbfnzZcxUHW8L1n/OkmQf8UwDjCZ
-						u9TZWi7022U1tetOIYf6grw9YPbXYvBZ/X6bddOHgQS7iy78ygadig7C+dTyNFqm
-						1O2T6tJ9U6DbI8lolkvApz9BEo+yeFq0oIibO0C+77Jt7TlIqv7C7g74RKCxNZr2
-						WhZsCQ0qFNqASEOIFxeDI7uXcNyx1eBPxIKf/LsrFf0Kr++yCe0FpGIjjQFGvKoi
-						roEqZSojBi/D4bOlCBNM4UoSD9YTCHT5gukFTD2xSQIDAQABMA0GCSqGSIb3DQEB
-						BQUAA4IBAQClJpH/7g2E6cGYU+NMuXUwzWKhuDnmyB8nb8+Y/RfpMJbBRZvLPuI9
-						+jGTaso1W01S2GX/uI6n5n8awxd/LZjIfbw/aKHBeMYpmzYlarJlUqWinLh30S01
-						f5A6YDpZXHtcZzPvV0jsIunjj5OZ3XEYuhRzbyzSxLoHHEHR3f7GYJ0pvKDtuOUp
-						v8D1vRzVBo5+J76Z7KDyOYrmrnN1S1K3VAQjSOy1QPADspwnnzKWhO69ipXLZFcY
-						288Rsd2pEqK3MvTLrPlrHBqfCsYSvdeqNifmictbFNSM+r9MaGp0+tWHgiBc7tm8
-						q8cpQ2yjPF7ooQVX/ms9u9q6wa4Q4dit
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gcidp.gloscol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gcidp.gloscol.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">Gloucestershire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Gloucestershire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gloscol.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helen</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:Helen.Smith@gloscol.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shane</GivenName>
-    <SurName>Elliot</SurName>
-    <EmailAddress>mailto:helpdesk@gloscol.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gcs.simitive.com.xml b/swamid-interfederations-2.0/gcs.simitive.com.xml
deleted file mode 100644
index e6dedc54..00000000
--- a/swamid-interfederations-2.0/gcs.simitive.com.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://gcs.simitive.com">
-  <!--
-		This is a "GCS Simitive" Shibboleth SP for Simitive 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-12-22T11:11:17Z">
-      <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://gcs.simitive.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://gcs.simitive.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+TCCAeGgAwIBAgIJAJRQgVZWDd/zMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCElTLTI0ODMxMB4XDTE0MTIxNjExMTkyOFoXDTI0MTIxMzExMTkyOFowEzER
-						MA8GA1UEAxMISVMtMjQ4MzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC0THPJbqQqabRo8UmrYIVXK5FbfeMbRzh+KY+OKj+y1JPBwaF2eiyGW6y6yfaW
-						u/ht+IVlmEIGkNCPSYDhRLVeX/EoFjXMSO8WFNUmrcK3V/nzvl4LpD1+5EIUT9ew
-						X20Orkct5earRWmIa/DUfwL+7nHucu48b/0CNVVVqs1t/Qpnk1RU3n1lWZhN4R3m
-						cUu8w1tyrZ52+bGUVPKtYgQSt9Qi66lonzz5k/ZLlSHTbdpPl85eO9ZGetiqqDjT
-						kYF0juPHPQJyhX1y3N9yhDSX4MYKbCVXwLUek4UbYX9YjGfaaegGPv5g7DjgfPGV
-						nxTINfawpUcYazq3Gq/wZTVRAgMBAAGjUDBOMC0GA1UdEQQmMCSCCElTLTI0ODMx
-						hhhodHRwczovL2djcy5zaW1pdGl2ZS5jb20wHQYDVR0OBBYEFEW/SH169Rn82c3p
-						hFRU/6GjSchgMA0GCSqGSIb3DQEBBQUAA4IBAQCWFmKpMIImEy1wWxc2vbZzqFIw
-						w+k/dBQIXXrBfUckYA6WqvsUCGkGQpkUDtmaGRwkOWr2rGvhZZOqTDk2gt09Eatq
-						DmiFWH4n7Bn9J02xXL+A+b0NRWtm4+UBRMZtyO5tvdW9ZzNNyBzAzo10i6WkcntJ
-						kFuhwz2Y7CKka8ekE0gvanRjChmghI+SapQSdyLaa0RYTD/Dhoe4CqbsNkuGg/2A
-						LJRFvT+VJIoJphSZ92EKiMxg7wQQmJkLBLlcmBCDzlXIa0YDezgSES7aXaqnx3cr
-						derpKZtZARC+hGy1ZeUjiZGXXiGfEa23WC71DtIvJU8B8TbmgoKDWGeARwKK
-					</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://gcs.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gcs.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gcs.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gcs.simitive.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gcs.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gcs.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gcs.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gcs.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gcs.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gcs.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gcs.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Simitive Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GCS Simitive</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.simitive.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adrian</GivenName>
-    <SurName>Latham</SurName>
-    <EmailAddress>mailto:adrian.latham@simitive.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adrian</GivenName>
-    <SurName>Latham</SurName>
-    <EmailAddress>mailto:adrian.latham@simitive.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gcu.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/gcu.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index f7e49588..00000000
--- a/swamid-interfederations-2.0/gcu.idm.oclc.org-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://gcu.idm.oclc.org/shibboleth">
-  <!--
-		This is a "Glasgow Caledonian University" EZproxy SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-09T14:33:01Z">
-      <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 ">
-    <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://login.gcu.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEAjCCAuqgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMRswGQYDVQQDFBIqLmdj
-						dS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSgwJgYJ
-						KoZIhvcNAQkBFhlqYW1lcy5odXRjaGluc29uQG9jbGMub3JnMB4XDTE0MDQwODA5
-						MjMwNFoXDTI0MDQwNzA5MjMwNFowYzEbMBkGA1UEAxQSKi5nY3UuaWRtLm9jbGMu
-						b3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEoMCYGCSqGSIb3DQEJARYZ
-						amFtZXMuaHV0Y2hpbnNvbkBvY2xjLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAMT0xloPYpMr8p6BWPrrVfiOCy/o3FUyA5TshNxjVayC0Y+jHlwf
-						jlqZoseU0tFUkRPll5wioukxcvR1O1fgBRM1hdNAbiHg6y2T677ji4GO+/Ya8Lt6
-						7OdgDtoliP7wUaBq7rHiQgpzWDh82tEKQ95m+qEIBtOG2lGEeAoy0D01+p2W5grm
-						FZyoN/YA68Cd5xtloOwRNaOZ63imjXi9mjxrHaLrlRCEHnvRGm6HWW1niCeu7EDY
-						S9g4fVQY0rMIMd/Q9ISzqzhF1akZERG2GsjJctSVtbq1MIN6aC4Eh2kdbEytfEbD
-						dlK/4kvT9ycYMm0kOk/LdmOtTN11t15jzE0CAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
-						enw01HVcsPIbyZ8kLsB/u2a6BS8wgY0GA1UdIwSBhTCBgoAUenw01HVcsPIbyZ8k
-						LsB/u2a6BS+hZ6RlMGMxGzAZBgNVBAMUEiouZ2N1LmlkbS5vY2xjLm9yZzELMAkG
-						A1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxKDAmBgkqhkiG9w0BCQEWGWphbWVzLmh1
-						dGNoaW5zb25Ab2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAeEfQ8o/m5HDO/5H5Hk2KFUVB7eh6eLGrT8cO4uj6ajWvx2DMkjiI7Xfg
-						gYmIbLsbSR3iryoxoTsiakLB1Cvt3reVagah1sAkVqQl9yLw56q8V4AbfJN4OdTH
-						6u49A/SY7quj8eDrUDqTVP9arCWu153U/h+KFzjTuEVTxxYuMGXMzElf32lYMjrO
-						4FFpcyVbHiLfkGed+1e9c9tVQm6gNj34Yim0xTEQIW+TD3PV9OxZvTZ5wKxYAZuP
-						Nn3NCKYoSTvPu2dJGROCnlm3bnkTz4fW5hwlFImzA4tv+tsjZtnsQp/XfJ+5h7le
-						dfzIYdf+lychhwisBoYuI4TC5BOFBQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.gcu.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Glasgow Caledonian University Hosted EZProxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml b/swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml
deleted file mode 100644
index 28a7c792..00000000
--- a/swamid-interfederations-2.0/gencap-area.mlib.cnr.it-simplesaml-module.php-saml-sp-metadata.php-rm1_mlib-sp.xml
+++ /dev/null
@@ -1,134 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/metadata.php/rm1_mlib-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-03-17T12:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="it">Wi-Fi Zone erogato da C.N.R. Area della Ricerca - Roma 1</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Wi-Fi Zone provided by C.N.R. Research Area - Roma 1</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Federated Internet Access</mdui:Description>
-        <mdui:Description xml:lang="it">Accesso Federato ad Internet </mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://gencap-area.mlib.cnr.it/policy-embed.php</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://gencap-area.mlib.cnr.it/policy-embed.php</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://gencap-area.mlib.cnr.it/policy-embed.php</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://gencap-area.mlib.cnr.it/policy-embed.php</mdui:PrivacyStatementURL>
-        <mdui:Logo height="57" width="103" xml:lang="it">https://gencap-area.mlib.cnr.it/logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://gencap-area.mlib.cnr.it/logoRM1.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEIzCCAwugAwIBAgIJAKMLKso2OfmxMA0GCSqGSIb3DQEBBQUAMIGnMQswCQYD
-VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBFJvbWUxDzANBgNVBAoM
-BkMuTi5SLjEhMB8GA1UECwwYSXN0aXR1dG8gQ3Jpc3RhbGxvZ3JhZmlhMSAwHgYD
-VQQDDBdnZW5jYXAtYXJlYS5tbGliLmNuci5pdDEjMCEGCSqGSIb3DQEJARYUbHVj
-YS5pbm5pZWxsb0BjbnIuaXQwHhcNMTQxMDE3MTUwMjU4WhcNMjQxMDE2MTUwMjU4
-WjCBpzELMAkGA1UEBhMCSVQxDjAMBgNVBAgMBUl0YWx5MQ0wCwYDVQQHDARSb21l
-MQ8wDQYDVQQKDAZDLk4uUi4xITAfBgNVBAsMGElzdGl0dXRvIENyaXN0YWxsb2dy
-YWZpYTEgMB4GA1UEAwwXZ2VuY2FwLWFyZWEubWxpYi5jbnIuaXQxIzAhBgkqhkiG
-9w0BCQEWFGx1Y2EuaW5uaWVsbG9AY25yLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAsdzpyUSHVbEJwYZS/U7HiNg6TocjTxQYCrFRWsHegvz1iBg0
-o0WGqdSkGGNbvGssJV4cbzvPkSQopGV7clHzAwTPl01QqDyi4oG1cdfSA5ypfYuy
-Hu+jrfNemYEDlRIKcxiEk2SGDA5LmS2XGoTDR/BQUuLrC1z/p9uyDEfHFlrTSZwI
-zzcYDPqJOREBRxDmUGF5rJFA6b/O5kcB8K5IsWgV27ExYDCjRW077JNA1sq5qnCh
-fw9VPNAaT84nJ0/16OXiHn6PXwtsDAbc5G9hASajoEkgVB+sOYi/9FHazOZQGv/a
-vp30w89RBpGMuR6jLtD0xIfOa0aqTPsY2vpM3wIDAQABo1AwTjAdBgNVHQ4EFgQU
-4KbX4x+x9t5Lk/4A6rIbKPl9UMcwHwYDVR0jBBgwFoAU4KbX4x+x9t5Lk/4A6rIb
-KPl9UMcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAHJkqe4Lbt5L6
-TXVw1ukyF06wH96Nfmc4/YSSOU967zvi5lHd7NJkjT3OYNL3hcoZilfcs9iXRVO3
-CZz4OX05skMffJk83RfHqPQluJLm/GSo7DY5Wwm2T9OonoNv3GM3xs37+Xst31/j
-FryrEKLI2Wld/Glez0FGWjla0FABRy2ii7Kgsi3Zu+jfgbgbHrqDxjX5LwVP5J8A
-x4ukmcpF4Ue/kgn8k0w9LUrrUA0pAOvoRtKQnDsfQ8vIlxRUOYTL6UP8LQJ0viNp
-UnrO911SW0m/dV9+xLqV1rf1vrPQDXk72mRl70KFcHd+4jh7+OJ4reGVsV6r8aC4
-shhU9uviPg==
-</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>
-MIIEIzCCAwugAwIBAgIJAKMLKso2OfmxMA0GCSqGSIb3DQEBBQUAMIGnMQswCQYD
-VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBFJvbWUxDzANBgNVBAoM
-BkMuTi5SLjEhMB8GA1UECwwYSXN0aXR1dG8gQ3Jpc3RhbGxvZ3JhZmlhMSAwHgYD
-VQQDDBdnZW5jYXAtYXJlYS5tbGliLmNuci5pdDEjMCEGCSqGSIb3DQEJARYUbHVj
-YS5pbm5pZWxsb0BjbnIuaXQwHhcNMTQxMDE3MTUwMjU4WhcNMjQxMDE2MTUwMjU4
-WjCBpzELMAkGA1UEBhMCSVQxDjAMBgNVBAgMBUl0YWx5MQ0wCwYDVQQHDARSb21l
-MQ8wDQYDVQQKDAZDLk4uUi4xITAfBgNVBAsMGElzdGl0dXRvIENyaXN0YWxsb2dy
-YWZpYTEgMB4GA1UEAwwXZ2VuY2FwLWFyZWEubWxpYi5jbnIuaXQxIzAhBgkqhkiG
-9w0BCQEWFGx1Y2EuaW5uaWVsbG9AY25yLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAsdzpyUSHVbEJwYZS/U7HiNg6TocjTxQYCrFRWsHegvz1iBg0
-o0WGqdSkGGNbvGssJV4cbzvPkSQopGV7clHzAwTPl01QqDyi4oG1cdfSA5ypfYuy
-Hu+jrfNemYEDlRIKcxiEk2SGDA5LmS2XGoTDR/BQUuLrC1z/p9uyDEfHFlrTSZwI
-zzcYDPqJOREBRxDmUGF5rJFA6b/O5kcB8K5IsWgV27ExYDCjRW077JNA1sq5qnCh
-fw9VPNAaT84nJ0/16OXiHn6PXwtsDAbc5G9hASajoEkgVB+sOYi/9FHazOZQGv/a
-vp30w89RBpGMuR6jLtD0xIfOa0aqTPsY2vpM3wIDAQABo1AwTjAdBgNVHQ4EFgQU
-4KbX4x+x9t5Lk/4A6rIbKPl9UMcwHwYDVR0jBBgwFoAU4KbX4x+x9t5Lk/4A6rIb
-KPl9UMcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAHJkqe4Lbt5L6
-TXVw1ukyF06wH96Nfmc4/YSSOU967zvi5lHd7NJkjT3OYNL3hcoZilfcs9iXRVO3
-CZz4OX05skMffJk83RfHqPQluJLm/GSo7DY5Wwm2T9OonoNv3GM3xs37+Xst31/j
-FryrEKLI2Wld/Glez0FGWjla0FABRy2ii7Kgsi3Zu+jfgbgbHrqDxjX5LwVP5J8A
-x4ukmcpF4Ue/kgn8k0w9LUrrUA0pAOvoRtKQnDsfQ8vIlxRUOYTL6UP8LQJ0viNp
-UnrO911SW0m/dV9+xLqV1rf1vrPQDXk72mRl70KFcHd+4jh7+OJ4reGVsV6r8aC4
-shhU9uviPg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml2-logout.php/rm1_mlib-sp"/>
-    <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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml2-acs.php/rm1_mlib-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml1-acs.php/rm1_mlib-sp/artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml2-acs.php/rm1_mlib-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gencap-area.mlib.cnr.it/simplesaml/module.php/saml/sp/saml1-acs.php/rm1_mlib-sp" index="4"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="it">Wi-Fi Zone erogato da C.N.R. Area della Ricerca - Roma 1</md:ServiceName>
-      <md:ServiceName xml:lang="en">Wi-Fi Zone provided by C.N.R. Research Area - Roma 1</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Federated Internet Access</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Accesso Federato ad Internet </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="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:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" 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="it">C.N.R. Area della Ricerca - Roma  1</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">C.N.R. Research Area - Roma 1</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Wi-Fi Zone erogato da C.N.R. Area della Ricerca - Roma 1</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Wi-Fi Zone provided by C.N.R. Research Area - Roma 1</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.mlib.cnr.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.mlib.cnr.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Luca</md:GivenName>
-    <md:SurName>Ianniello</md:SurName>
-    <md:EmailAddress>mailto:luca.ianniello@cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Augusto</md:GivenName>
-    <md:SurName>Pifferi</md:SurName>
-    <md:EmailAddress>mailto:augusto.pifferi@cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Luca</md:GivenName>
-    <md:SurName>Ianniello</md:SurName>
-    <md:EmailAddress>mailto:luca.ianniello@cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Staff</md:GivenName>
-    <md:SurName>Mlib</md:SurName>
-    <md:EmailAddress>mailto:staff@sra.mlib.cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.xml
deleted file mode 100644
index a5722f1e..00000000
--- a/swamid-interfederations-2.0/geoshibb.edina.ac.uk-shibboleth.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://geoshibb.edina.ac.uk/shibboleth">
-  <!--
-		This is an "EDINA: Digimap (live)" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-04-24T16:39:26Z">
-      <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Digimap Collections</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Online maps and spatial data of Great Britain</mdui:Description>
-        <mdui:Logo height="90" width="350">https://vsp2.edina.ac.uk/public/images/splogos/digimap.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <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>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2a.edina.ac.uk/digimap/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2a.edina.ac.uk/digimap/Shibboleth.sso/SAML/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA: Digimap (live)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/about/</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/ghgtool.grnet.gr-shibboleth.xml b/swamid-interfederations-2.0/ghgtool.grnet.gr-shibboleth.xml
deleted file mode 100644
index bc6f8e56..00000000
--- a/swamid-interfederations-2.0/ghgtool.grnet.gr-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://ghgtool.grnet.gr/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">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"/>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ghgtool.grnet.gr/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SLO/Artifact"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ghgtool.grnet.gr/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="en">GHG report tool</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">GHG online reporting tool</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="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"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" 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="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="cn" Name="urn:oid:2.5.4.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="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="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="surname" Name="urn:mace:dir:attribute-def:sn" 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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md: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"/>
-      <md:RequestedAttribute FriendlyName="shacHomeOrganization" Name="urn:mace:terena.org:attribute-def:schacHomeOrganization" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="orgName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="orgName" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Greek Research and Technology Network</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-    <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>Vasiliki Giannikopoulou</md:GivenName>
-    <md:EmailAddress>vasilg@admin.grnet.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Constantinos Vassilakis</md:GivenName>
-    <md:EmailAddress>cvassilakis@admin.grnet.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d115131c..00000000
--- a/swamid-interfederations-2.0/ghgtool.grnet.gr.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://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="http://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="http://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:schac: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.federations.renam.md.xml b/swamid-interfederations-2.0/gidp.federations.renam.md.xml
deleted file mode 100644
index a6b894dc..00000000
--- a/swamid-interfederations-2.0/gidp.federations.renam.md.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gidp.federations.renam.md">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federations.renam.md/" registrationInstant="2015-12-01T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federations.renam.md</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="ro">GIDP-RENAM</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">GIDP-RENAM</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ru">GIDP-RENAM</mdui:DisplayName>
-        <mdui:Description xml:lang="ro">GIDP-RENAM - prestator de servicii de identitate utilizat de RENAM</mdui:Description>
-        <mdui:Description xml:lang="en">GIDP-RENAM - identity provider used by RENAM</mdui:Description>
-        <mdui:Description xml:lang="ru">GIDP-RENAM - сервис для идентификации сотрудников RENAM</mdui:Description>
-        <mdui:InformationURL xml:lang="ro">https://gidp.federations.renam.md</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://gidp.federations.renam.md</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="ru">https://gidp.federations.renam.md</mdui:InformationURL>
-        <mdui:Logo height="121" width="205">https://gidp.federations.renam.md/renam.jpg</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>
-MIIE7zCCA9egAwIBAgICAPAwDQYJKoZIhvcNAQELBQAwdDESMBAGCgmSJomT8ixk
-ARkTAk1EMRcwFQYKCZImiZPyLGQBGRMHTUQtR3JpZDEOMAwGA1UEChMFUkVOQU0x
-IDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQDEwpNRC1H
-cmlkIENBMB4XDTE1MTEyODIxMTkzM1oXDTI1MTEyNTIxMTkzM1owVzESMBAGCgmS
-JomT8ixkARkWAk1EMRowGAYKCZImiZPyLGQBGRYKRmVkZXJhdGlvbjEOMAwGA1UE
-ChMFUkVOQU0xFTATBgNVBAMTDEdJRFBNZXRhU2lnbjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAPF69NvGFIb22cXX2ikG6oRGwfe3h/qdeEiYirjhkp49
-XuGpQ4zY1TXEczuI28oTvLPNbDKPu+11w6Ncmie1Kwsj7C6VOo5c5ru9QVDJt1xF
-7DVWpSZhdKeRNKm1Jtg9W6ghAzl+BQzl4R8K4SmznPoBsCzJoLGbEQ7Vgfmy2uWE
-DN2cb37Fyw/dktzD0wVWC/YS8ZAFoPW/6eCJyqrF0zQ+gxgkEAFOX6+UycG7AIHm
-GJEyFQdJZDzsejlCH5KpzlsuRuZzhA/upSYVROrf+KTDTmydsdskcXCy3vAEWLjP
-OuAfFN8j7ij8+/Q1k1lTdy5IZ4xDTsU5h2/JOt8aMJECAwEAAaOCAaYwggGiMB0G
-A1UdDgQWBBTwpsknXDfs+ZgEhfq1cY6m8hv/cjAfBgNVHSMEGDAWgBQHQ26bo1u5
-q+z02L86Gw2jKbg1YjA6BggrBgEFBQcBAQQuMCwwKgYIKwYBBQUHMAKGHmh0dHA6
-Ly9jYS5ncmlkLm1kL2ZpbGVzL2NhLmNydDAzBgNVHR8ELDAqMCigJqAkhiJodHRw
-Oi8vY2EuZ3JpZC5tZC9maWxlcy9jcmwtdjIuY3JsMAsGA1UdEQQEMAKCADApBgNV
-HRIEIjAggQtjYUByZW5hbS5tZIYRaHR0cDovL2NhLmdyaWQubWQwgbYGA1UdIASB
-rjCBqzAOBgwrBgEEAYHzWgoBAQQwgZgGCiqGSIb3TAUCAgEwgYkwNgYIKwYBBQUH
-AgEWKmh0dHA6Ly9jYS5ncmlkLm1kL2ZpbGVzL01ELUdyaWQtQ1AtQ1BTLnBkZjBP
-BggrBgEFBQcCAjBDGkFMaW1pdGVkIExpYWJpbGl0eSwgc2VlIGh0dHA6Ly9jYS5n
-cmlkLm1kL2ZpbGVzL01ELUdyaWQtQ1AtQ1BTLnBkZjANBgkqhkiG9w0BAQsFAAOC
-AQEATlnDNLLCx2eiTYLDPeeS3IntyilM/ND90Coy8Ogb4+ZLfJzQBPdWUhv8+VUb
-2HcBt+1ytJ3c+nfiZS09CBmR0pXr8QtHKJnL72SOO7Jj1LnZ1jqQkm70xcG7/pgn
-81EYQAm5O4i3xAdAbFOSAPYWcIEdvXFdt1B4LxYaogpJBF6dfxWrQlp5oHtaYmx3
-2Hal2K3pUMSxtEAvE7cXddjsGVU+o4mCXIBTmBG5qfJ193xNLkFwuhMODYiU+cTs
-+cHDef8L8nqolX1coNKIwJnd8jQalj7W5wvAlBIq47Uog2zWxyi5LS3R9UApI7Bp
-cOnlbkVFhq8dS6BrkwXGRrnBNg==
-</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>
-MIIE7zCCA9egAwIBAgICAPAwDQYJKoZIhvcNAQELBQAwdDESMBAGCgmSJomT8ixk
-ARkTAk1EMRcwFQYKCZImiZPyLGQBGRMHTUQtR3JpZDEOMAwGA1UEChMFUkVOQU0x
-IDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQDEwpNRC1H
-cmlkIENBMB4XDTE1MTEyODIxMTkzM1oXDTI1MTEyNTIxMTkzM1owVzESMBAGCgmS
-JomT8ixkARkWAk1EMRowGAYKCZImiZPyLGQBGRYKRmVkZXJhdGlvbjEOMAwGA1UE
-ChMFUkVOQU0xFTATBgNVBAMTDEdJRFBNZXRhU2lnbjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAPF69NvGFIb22cXX2ikG6oRGwfe3h/qdeEiYirjhkp49
-XuGpQ4zY1TXEczuI28oTvLPNbDKPu+11w6Ncmie1Kwsj7C6VOo5c5ru9QVDJt1xF
-7DVWpSZhdKeRNKm1Jtg9W6ghAzl+BQzl4R8K4SmznPoBsCzJoLGbEQ7Vgfmy2uWE
-DN2cb37Fyw/dktzD0wVWC/YS8ZAFoPW/6eCJyqrF0zQ+gxgkEAFOX6+UycG7AIHm
-GJEyFQdJZDzsejlCH5KpzlsuRuZzhA/upSYVROrf+KTDTmydsdskcXCy3vAEWLjP
-OuAfFN8j7ij8+/Q1k1lTdy5IZ4xDTsU5h2/JOt8aMJECAwEAAaOCAaYwggGiMB0G
-A1UdDgQWBBTwpsknXDfs+ZgEhfq1cY6m8hv/cjAfBgNVHSMEGDAWgBQHQ26bo1u5
-q+z02L86Gw2jKbg1YjA6BggrBgEFBQcBAQQuMCwwKgYIKwYBBQUHMAKGHmh0dHA6
-Ly9jYS5ncmlkLm1kL2ZpbGVzL2NhLmNydDAzBgNVHR8ELDAqMCigJqAkhiJodHRw
-Oi8vY2EuZ3JpZC5tZC9maWxlcy9jcmwtdjIuY3JsMAsGA1UdEQQEMAKCADApBgNV
-HRIEIjAggQtjYUByZW5hbS5tZIYRaHR0cDovL2NhLmdyaWQubWQwgbYGA1UdIASB
-rjCBqzAOBgwrBgEEAYHzWgoBAQQwgZgGCiqGSIb3TAUCAgEwgYkwNgYIKwYBBQUH
-AgEWKmh0dHA6Ly9jYS5ncmlkLm1kL2ZpbGVzL01ELUdyaWQtQ1AtQ1BTLnBkZjBP
-BggrBgEFBQcCAjBDGkFMaW1pdGVkIExpYWJpbGl0eSwgc2VlIGh0dHA6Ly9jYS5n
-cmlkLm1kL2ZpbGVzL01ELUdyaWQtQ1AtQ1BTLnBkZjANBgkqhkiG9w0BAQsFAAOC
-AQEATlnDNLLCx2eiTYLDPeeS3IntyilM/ND90Coy8Ogb4+ZLfJzQBPdWUhv8+VUb
-2HcBt+1ytJ3c+nfiZS09CBmR0pXr8QtHKJnL72SOO7Jj1LnZ1jqQkm70xcG7/pgn
-81EYQAm5O4i3xAdAbFOSAPYWcIEdvXFdt1B4LxYaogpJBF6dfxWrQlp5oHtaYmx3
-2Hal2K3pUMSxtEAvE7cXddjsGVU+o4mCXIBTmBG5qfJ193xNLkFwuhMODYiU+cTs
-+cHDef8L8nqolX1coNKIwJnd8jQalj7W5wvAlBIq47Uog2zWxyi5LS3R9UApI7Bp
-cOnlbkVFhq8dS6BrkwXGRrnBNg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gidp.federations.renam.md/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://gidp.federations.renam.md/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="ro">RENAM</md:OrganizationName>
-    <md:OrganizationName xml:lang="ru">RENAM</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">RENAM</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="ro">RENAM</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="ru">RENAM</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">RENAM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="ru">http://renam.md</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="ro">http://renam.md</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://renam.md</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Valentin</md:GivenName>
-    <md:SurName>Pocotilenco</md:SurName>
-    <md:EmailAddress>mailto:pvv@renam.md</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 71932963..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 "GÉANT Guest Identity Provider" simpleSAMLphp IdP for GÉANT 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">GÉANT Guest 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">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Guest 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/gigamove.rz.rwth-aachen.de.xml b/swamid-interfederations-2.0/gigamove.rz.rwth-aachen.de.xml
deleted file mode 100644
index ea9e9234..00000000
--- a/swamid-interfederations-2.0/gigamove.rz.rwth-aachen.de.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gigamove.rz.rwth-aachen.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>gigamove.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=gigamove.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentrum\, Rechen- und Datendienste,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEEGUc0TANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0xMDA3MjAxMzA2
-MTBaFw0xNTA3MTkxMzA2MTBaMIG9MQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjFEMEIGA1UECxM7UmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-cnVtLCBSZWNoZW4tIHVuZCBEYXRlbmRpZW5zdGUxIzAhBgNVBAMTGmdpZ2Ftb3Zl
-LnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAw5oSNnj5OnksH17vLiIW4eVaISVecF9k7N933dASblf0sIPlim/xt7+l1+GA
-wlXL76sphwDlyStV0ksEDqVgmiAmxyWVdU2qqz/c/wzEfXbz4g5b3nOLliNhLIZH
-JlQ6eej/bdnFFNWdYmV6N1i5qSRQ6lM68gLb0MxYXQtby49pG49+XbwLhYk1tadr
-pfOee5JcKo90fD+TE7aisYbu+DWqFP3YuH3ozn5+XLc2blE1f31McZ7x4cxF/T2D
-VMQwgP9zJ7lWftC7+yNFlbxf9L1Ll/U872KEr8M3zr0VQ4MMYaLuF5xTT6uJQtBr
-K2+Sy28eorNi25OdbkFjdoNd8wIDAQABo4IBtzCCAbMwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBQBcFna0WNtKjKrTFh/vGa85+ZrVzAfBgNVHSMEGDAWgBRu1T7AHC9xyTy/SU7v
-alVI7NHyODAoBgNVHREEITAfgR1zZXJ2aWNlZGVza0Byei5yd3RoLWFhY2hlbi5k
-ZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgt
-Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAKtXbuQ2IhWlCUGkC5UgBxG70j0msyu+Pe+cFTtmRoEw8Cxh2lmFAIhv
-vlsxRaRCkAAxmL+pUAHXr8t8OSUloGQMmr4DcSQaObT7hiVnWXrdEq1QDFjKYRTw
-YVa32GVMFN4GnzsBlsRnCnJF0fMmXUn/b3vTgWOads4WXDdycbKwMpuEN6QEMxBF
-bFmgAMCYkqD4/r4LeQPNv3AnyAQhCsjNqdjiThfbrSQra5h3PCPh1FfRdZl1r64i
-60zjipJhnGIWeUyKy6GF4xi5+SggN4h2piODLAAkpXslD0wR1v5Jms33iOZ1Q4No
-z1aY/8rMNVvOdeJ6ZFHEsAEMV6ZruCY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>gigamove.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=gigamove.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentrum\, Rechen- und Datendienste,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEEGUc0TANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0xMDA3MjAxMzA2
-MTBaFw0xNTA3MTkxMzA2MTBaMIG9MQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjFEMEIGA1UECxM7UmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-cnVtLCBSZWNoZW4tIHVuZCBEYXRlbmRpZW5zdGUxIzAhBgNVBAMTGmdpZ2Ftb3Zl
-LnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAw5oSNnj5OnksH17vLiIW4eVaISVecF9k7N933dASblf0sIPlim/xt7+l1+GA
-wlXL76sphwDlyStV0ksEDqVgmiAmxyWVdU2qqz/c/wzEfXbz4g5b3nOLliNhLIZH
-JlQ6eej/bdnFFNWdYmV6N1i5qSRQ6lM68gLb0MxYXQtby49pG49+XbwLhYk1tadr
-pfOee5JcKo90fD+TE7aisYbu+DWqFP3YuH3ozn5+XLc2blE1f31McZ7x4cxF/T2D
-VMQwgP9zJ7lWftC7+yNFlbxf9L1Ll/U872KEr8M3zr0VQ4MMYaLuF5xTT6uJQtBr
-K2+Sy28eorNi25OdbkFjdoNd8wIDAQABo4IBtzCCAbMwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBQBcFna0WNtKjKrTFh/vGa85+ZrVzAfBgNVHSMEGDAWgBRu1T7AHC9xyTy/SU7v
-alVI7NHyODAoBgNVHREEITAfgR1zZXJ2aWNlZGVza0Byei5yd3RoLWFhY2hlbi5k
-ZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgt
-Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAKtXbuQ2IhWlCUGkC5UgBxG70j0msyu+Pe+cFTtmRoEw8Cxh2lmFAIhv
-vlsxRaRCkAAxmL+pUAHXr8t8OSUloGQMmr4DcSQaObT7hiVnWXrdEq1QDFjKYRTw
-YVa32GVMFN4GnzsBlsRnCnJF0fMmXUn/b3vTgWOads4WXDdycbKwMpuEN6QEMxBF
-bFmgAMCYkqD4/r4LeQPNv3AnyAQhCsjNqdjiThfbrSQra5h3PCPh1FfRdZl1r64i
-60zjipJhnGIWeUyKy6GF4xi5+SggN4h2piODLAAkpXslD0wR1v5Jms33iOZ1Q4No
-z1aY/8rMNVvOdeJ6ZFHEsAEMV6ZruCY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gigamove.rz.rwth-aachen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">RWTH Aachen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Gigamove - RWTH Aachen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://gigamove.rz.rwth-aachen.de/help</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Guido</GivenName>
-    <SurName>Bunsen</SurName>
-    <EmailAddress>servicedesk@rz.rwth-aachen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml b/swamid-interfederations-2.0/gihidentity01.ihs.se-idp-shibboleth.xml
deleted file mode 100644
index b191352a..00000000
--- a/swamid-interfederations-2.0/gihidentity01.ihs.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://gihidentity01.ihs.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">gih.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitetsutgivare för Gymnastik- och Idrottshögskolan vid Stockholms Stadion</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for The Swedish School of Sport and Health Sciences</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://gihidentity01.ihs.se/idp/Authn/UserPassword</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://gihidentity01.ihs.se/idp/Authn/UserPassword</mdui:InformationURL>
-        <mdui:Logo height="107" width="204" xml:lang="sv">https://gihidentity01.ihs.se/idp/images/gihlogo.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>gih.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.3467350,18.0811920</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDOzCCAiOgAwIBAgIUX4LM+yBFUKdFziHUCVyiPPGiL8YwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUZ2loaWRlbnRpdHkwMS5paHMuc2UwHhcNMTMwOTIwMTA1
-NTIzWhcNMzMwOTIwMTA1NTIzWjAfMR0wGwYDVQQDExRnaWhpZGVudGl0eTAxLmlo
-cy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjZBXC3TcY47KYX
-t3n4IH6X8Jszyeinq+Zo6mtsJgzu9JPikIiG9jDJj+ylQiTDSSTBMSAUZ3p6ola/
-+/IlDu0q5oLFCMEe3m9AdJIwyT6CjIJOiLSzeaTOqQNtXowLFCxj+PPrVRaqJiYc
-+7f3+5SMwn2iOLkr6/ZFW5cuhw9flzR/Qp7m9ByTIcs73XK1JcQPP1UoPgo8mUXj
-/IHbxB/+P0NzjMXbKZEFEnZQzDoxNYDbARh6T/hJreIKBr+B0KnKogZnM9WgdJof
-O6GKR1lETrGgmCITblP7dbrRIL2VxMmXQEMhdS78Y5GNRPnGxp00kT2h/tTA1Reb
-52sROA0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUZ2loaWRlbnRpdHkwMS5paHMuc2WG
-K2h0dHBzOi8vZ2loaWRlbnRpdHkwMS5paHMuc2UvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFIzCrjaWTfLensnYqTm/G3CNWsbNMA0GCSqGSIb3DQEBBQUAA4IBAQB7
-pVQO0Su0rB9WHWpitL0kNNfFQgapWHHZ8hYUDFWxiON7IGG6GlVsqgvwGCQwYgci
-E+WrKirES8+tE/EWhNfSvydlBuHwkvBP2WqsjUVbG0U4xbguE3C1ZrcfKcjBkSDH
-YmMuoYqX6RkHuwExl0xLr1ApVz8l2D9HVXdVi3aG31gMpo4/G1GukY8Pny8ZSbNP
-cb9+7g88/LLBLc5cx1iccfK4h0Er5QAFjNd3uKD3p0sxQYKPGs5X2ZwOxJlmeAiU
-3Ujhy7jzfaV7bFtz+GL8WTHoi2OfI1YqES5Jr3sQnlArhemcYUxnpBN4yvDF2QK1
-icptKTpDxrRjfCXibBT1
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gihidentity01.ihs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gihidentity01.ihs.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://gihidentity01.ihs.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gihidentity01.ihs.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gihidentity01.ihs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gihidentity01.ihs.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">ihs.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDOzCCAiOgAwIBAgIUX4LM+yBFUKdFziHUCVyiPPGiL8YwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUZ2loaWRlbnRpdHkwMS5paHMuc2UwHhcNMTMwOTIwMTA1
-NTIzWhcNMzMwOTIwMTA1NTIzWjAfMR0wGwYDVQQDExRnaWhpZGVudGl0eTAxLmlo
-cy5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjZBXC3TcY47KYX
-t3n4IH6X8Jszyeinq+Zo6mtsJgzu9JPikIiG9jDJj+ylQiTDSSTBMSAUZ3p6ola/
-+/IlDu0q5oLFCMEe3m9AdJIwyT6CjIJOiLSzeaTOqQNtXowLFCxj+PPrVRaqJiYc
-+7f3+5SMwn2iOLkr6/ZFW5cuhw9flzR/Qp7m9ByTIcs73XK1JcQPP1UoPgo8mUXj
-/IHbxB/+P0NzjMXbKZEFEnZQzDoxNYDbARh6T/hJreIKBr+B0KnKogZnM9WgdJof
-O6GKR1lETrGgmCITblP7dbrRIL2VxMmXQEMhdS78Y5GNRPnGxp00kT2h/tTA1Reb
-52sROA0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUZ2loaWRlbnRpdHkwMS5paHMuc2WG
-K2h0dHBzOi8vZ2loaWRlbnRpdHkwMS5paHMuc2UvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFIzCrjaWTfLensnYqTm/G3CNWsbNMA0GCSqGSIb3DQEBBQUAA4IBAQB7
-pVQO0Su0rB9WHWpitL0kNNfFQgapWHHZ8hYUDFWxiON7IGG6GlVsqgvwGCQwYgci
-E+WrKirES8+tE/EWhNfSvydlBuHwkvBP2WqsjUVbG0U4xbguE3C1ZrcfKcjBkSDH
-YmMuoYqX6RkHuwExl0xLr1ApVz8l2D9HVXdVi3aG31gMpo4/G1GukY8Pny8ZSbNP
-cb9+7g88/LLBLc5cx1iccfK4h0Er5QAFjNd3uKD3p0sxQYKPGs5X2ZwOxJlmeAiU
-3Ujhy7jzfaV7bFtz+GL8WTHoi2OfI1YqES5Jr3sQnlArhemcYUxnpBN4yvDF2QK1
-icptKTpDxrRjfCXibBT1
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gihidentity01.ihs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gihidentity01.ihs.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish School of sport and health sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gih.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
-    <md:SurName>Fredrik Nilsson</md:SurName>
-    <md:EmailAddress>mailto:fredrik.nilsson@gih.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 12053734</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
-    <md:SurName>Michael Thunell</md:SurName>
-    <md:EmailAddress>mailto:michael.thunell@gih.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 12053807</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>The Swedish School of Sport and Health Sciences</md:Company>
-    <md:SurName>Charlie Skog</md:SurName>
-    <md:EmailAddress>mailto:charlie.skog@gih.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 12053792</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gimb-idp-1.gimb.org-idp-20130521.xml b/swamid-interfederations-2.0/gimb-idp-1.gimb.org-idp-20130521.xml
deleted file mode 100644
index 45655808..00000000
--- a/swamid-interfederations-2.0/gimb-idp-1.gimb.org-idp-20130521.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://gimb-idp-1.gimb.org/idp/20130521">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-04-07T09:04:08Z">
-      <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 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">gimb.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Gimnazija Bežigrad high school</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Gimnazija Bežigrad</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization Gimnazija Bežigrad high school</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Gimnazija Bežigrad</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization Gimnazija Bežigrad high school</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Gimnazija Bežigrad</mdui:Keywords>
-        <mdui:Logo height="253" width="300">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAD9CAYAAAAGaEpLAAAABHNCSVQICAgIfAhkiAAAAAFzUkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAACXBIWXMAABJ0AAASdAHeZh94AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAYZRJREFUeF7tnQdgFNUWhv/0AkkgIfTee+/SFZGmIAgoioANsSKC5VlQH/byVFCsoNJBioUiUqRI773XENJ72xTe/e/OYAwpW2Y3W+bDcXfuJpvdmTv/nHPuued6XBdAR6cAUfGZiIozbtHieXRcBq7FZ4n9DMQlGJBhyEV6Zg4yMvmoPs+RzzOycuHt5QEfb09lMz73Vp57e3kipKwPKpTzk1uYslUo5yse/REW4ouKYf5oUCMI/n5eyifS0QF0wXJDEpKzcOJCCk6eT8api8k4eVE8vyAexZZzJVX0CvFDnuJ/3ITw3Hh+Y+O7iEfxHzzUx3zP86P2Lvko/ndjXzzJE495fGR7gX1uucbNo1oZNK4djEZ1xFZLbLWD0FA8dmoRJsVPx33QBcuFuXwtHbuPxmHPsXjsEY+7jsQh6XSiUXSEpQNe7BQkuYnnbONrFB5HQQqZIl45fBSqJoVMPBrEFuKHNm3DcUvrcHQVW/c24aheKVD5ZR1XQxcsF4FitHH3NbFFY+v+GKSdTTIKkA+FSNn4nOLkSIJkLRSzbCFc2bnKo9hEl67avAJ6tK2Iu/pUx/DbauiWmIugC5YTcvBkAjbsisLGPWITj6lnhNXEWI+v2ChKrihM5sAunaOIV5YQsvQc+AmX8u5ba+Cu3kLA+tYUBqWbHhsnRxcsJ2D7oVj8uikCv/x1BUf/jjS6bb5ClFSBcmdxMhUKmEGIlyJg/nWCMaRPDYy7qy5u71JF+SEdR0cXLAdk24FY/PznRfz6VwTO7I4yunOqBUWh0sXJelQBy8gRFhlw++A6eGx4A2mF6TguumA5ALGJWZj723ksXHsJOzdcFmdFNPrnc/F0gbItjIPR8qJ4CRHr2q+WFK8xQsR0HAtdsEqJNdsi8ZMQqQVrLuD61TQg0NtoRXHTBar04OWgipfY2t9WE2890RJ33FJV+QGd0kQXLDuyYPUFfLv8LDasuqBYUYpI0eVzZIrqIsKrkq/xZfVn8j9XyS/AfKqmThT1tR1FsPk9KF6p2UBZH0yZ0AL/faIVfGn16pQKumDZmBmLTuE7IVIHNl4xunmqSDnSKFXBLsBdxnhk7pN4pMvENv4cH+W+2EL8ERjsgwDxncqI7xbg543AAC8Ein1vbw9kZ19HTm6e2MSjeJ8c8Xvp6TmITcpCaqIBSM7iXzOKmBQwsfG5mhcmH5X2gthb1Jj3JT47kg1o19dodfXXrS67owuWDfhl0xW8O/sYtguLCoE+QIAQKUcJluc/3TdymBRx4j4fhTVRp34IGtcOQZO6wWhcJwTVKwagUoUAVK3gj8riUUsoakxyPX0xBWcup+DUJbGJ56cuJOOs2JCQaRQwHj6KFzeZvkHhN76HxB7Hl8fvhtXlixeE1fXus62VF3VsjS5YGnH8XBLe+f4Yfpp3klcgUEYIlSPEo9TTSzFiZjgTLKXlJLZwf3RrUxFdW4WjY/NQtG8ahlpVyxh/3sGIScjCaSFkZ4WgHTubhI27o7CTI6jpQjhUa8zeIkarK01YXULAJgpXcebL7ZUXdGyFLlhWYBCWydvfHcV7wprKvCgsgSBfozVVmu6eejrpymWJjY/cyvujf49q6HdLFTl9pW2TUOPPOTmpQrD+2mvM7t8kBGwHRSwtn4jdGGlVfsEWAsabAf+mEK9xjzXHt693gmdp9gEXRhcsC5j7+3m8L0Tq8F8RRpHiCF9pBc7zW1B0VRQrqkrTUAwWAtW3cxX061oFQbT43ITUjGxs2RuDbQdisGrLVexXk219xJZ/kENr8eK5oMWVYsDIsU0w580uerUJjdEFy0QuRqbh2ff3YsXS08aOTgEorbiUesoYe8oUIkULKtAHQwfUxsh+tcRW0/i6zg02Cyts+frLmLf6AmJOJRrPHS2v/AMgWp1Lnh8G6JMMuPO+RljxSXfx1qXQT1wQXbBKYN32SDz93l6c+PsqUM7POMpXGuZ+fpFSEhzrta0op5bc07cWGtYKMr6uUyLs8kv/vIyl6y5h8ZqLQGJWvtkEGlpfqnClZuO11zrijcdbKi/oWIouWEUwY+EpTP5wHwxXU2UJExkLsbdO5RepTAZ384RIheNpcdeeMLw+fBlg1rGaqzHp+FkI2BeLTuMEY2AULd6YtBIvuutJQhRFP1ozq4900XUsQxesfOSKjvXcB3vx2azDxk7G+FRpxKZ4SjiSR0tKuHxSpO5tjAn31NNFysbw0H+z7AxmihvWIWFd33Ab1RuWNeJF1z02A006V8Hm2behQnl/5QUdU9EFS3D2SiqeencPVi85LXOQZHzK3m4fTwPPhDotRHTm/zzaHC+Nb4oyHHnUKRVmrzwrLa89WyL+cRvVQLql4kVrOS4LYye2wOw3OiuNOqbg1oJ16FQihj+/Bad3iDsp73bMRLd3cJSHnzlRzCcSd+C+A+vgVSFU3dtWVH5Ax1GYu+o8Zi44jR0bLxstLt5IWCSRmNtveN6ZfCos6VXz+ulZ8ybiloJ16Voahjy7GftZGSEswP7xKfWQ05pKz0HZ6mXkHLVnRjc2tus4NLxkPvrxON765giSL6X+I16MHpgrXHT9RX/sP6IhVs3spTTqFIVbCVZiikFYVFuxftkZIVTCovITnczeQsWjrVQCaNG5Mj57qQN6tdOtKWfl+PkkvD/nOObMP2kcHKGVbonLKPom42W7fx6I9s3ClEadgriFYHGu2r0vbMPSn04YR/wCaFHZUal4iGU2tBAq4fbdM7IhPn6+rb5YgouxfMMVvP3tEezZctU4wkiri9n2pvY1BuWvpePBiS1k0qnOzbi8YD361k5888VhYzCdGemlIVSMVQhr7pWnWslZ/jqujUEIz9vfHMUbMw8Ky0mce/Y7U1Mk2GeSDfAK9ceplYNRt3pZ5QUd4rKC9bkw0Z+eutVonlOsSkuohIvw/osdMOXBJsqL7s3Ro0dx5swZlC9f/sYWGhqKwEDXtDaXb7yC5z/ah3MHY43uIq0udsWS+iPdy+h0vPRqJ7z9dCulUcflBCsyNgPtRq1B5Il4QNyl7JqewEPJIConwoqO+eGL7TF5jC5UZPHixTh48CC8vLzkxm6Xl5f3r8egoCApYOHh4XKrVKmS3MqVK6e8i/Ny7koqXv78IBYtOmUMzrPsUEnuIvtTXCZad6uK/Qv7K43ujUsJ1qT39+F/H+5VAupK4NMe8BCqFpUw/z95qQOevV8f8SNnz57FTz/9JK5LD/j6+srHwmA3VMUr/5abmytfpxVWtWpVudWsWVNuFD5n5P05x/DyZweRG5dhtLhKCtKLfuUZ5Iu4LcNQrqyv0uieuIRgcVXjTvevRV4Cpz+IE1qSua0VPHQ8ehQqcbf8+PVOmKQL1Q02bNiAtWvXIiQkBJ6eSgzHAvILGQWMW05OjrS8qlWrhtq1a6N+/fqoXLmy8hvOwR/bIzHlk/04tOOaMTVCxljFC4X1X67wk2zA+uWD0KdDJaXR/XB6wbrzmb/wK4eUOeJmz2k0PGzK1JknHm+JGS/pxdvys3fvXixZssRm7hy7Lbf8AkZRrFWrltwaN26M6tWrKz/t2DCM8eqMQ/iOo9hClKW7yITUgsJFKz4yDa9M64S3nnDPuJbTCla6EIqwHkuQGZsJBNkxqM7DxbtdSjb6DqqLXz7tDn/mc+n8ixdffFFaVvYsq5JfwLKzs6UL2qRJE7Ro0UIKmDMwc9EpvPi/A0jlpHu1/j8PoXoc2f+EwN3Stya2zrnd2OZGOKVg7Twci86DfjHeiewVq+Jh4hSaFAPqtayAVTN76yVdiuDAgQOYP38+ypQpIwWrsK0wimq3FLqQtLwoXuzmDRo0QLNmzdCqVSv4+Ii+48CwguqLnx7ANs7G4ARsuoscQFKPkeiH/hUCkLhlOPzoTroJTidYHwuzefJzm4HKwgVkGVx7QFNcdBDP8n747fPe6H+LXh6kOBISEnDkyBFkZmYiLS3tpo1Cona7/I8MotOt45ZfvLQQMr4/xUsVsBo1akjrq0OHDlJYHZWEZANenXkQM2cfh6zHT+Fi6IPHhJOoc68jdvcohLFWmxvgVII1TAjVMjVepfHduFB4aJQVUp6b1BYfTW6jvKBjLRSOjIwMuSUnJyMuLg5RUVFyi46Olq8TihsFiyKmCpqKpULGLq/GvbKysmTAvlu3bmjUqJHyE47JrKWn8cInB5B8he6isKroXSgLYZz7ewTqOOgCIlriNIIlM9ZZpyrcDgmGPCTMpxJ3tybtKmLrnL4I5ZQeHbtBQaGIcYuNjb0hZnzOLsvN29tbipgqXJYImCpetAaZvNq5c2d0797doV3GLftiMOWTfdi5OcLoLtIlTDLg4Ma70bJheeWnXBOnEKxfN1/FnUN+BWraIWbEw8E0BXH3WvS/nhhxu14f3dG4evUqrly5gnPnzuHChQvSSqIlplphan6WuQLG9zAYDHJr2rQpevToIfO9HBUufUZ38asfhbtIT0BYWpvWDkFPF55M7xSCNey5LVi2QLiCFfxtG7fiocjIwRPjmmLGSx2URh1HJz09XQrYpUuXpIhFRkZKy4mCRUvJXAuMv0t3kVYX0zL69euHli0dew4oRxeZ05UhrK8FvwzCqDtqK6+4Fk7jEi5cexH3PrHROFIi52OZb/6XCIPrgoUfdJOrz+g4LxSu48ePy7mLFDR2c4qXudYX3UXG2Zhpf+edd8p4lyOzcVcUhk/dgv881BzPPeB6ScxOFXQnbUetxv5tkcaMdnNKd5gKRSsuE9WahmLbj7ejVhXXD2S6OomJiTh16hQOHz4sLTF2ebqPjIFRuEwRLwoXha9KlSoYOnSozLB3ZHYcikVN0XerhgcoLa6B0wkWWbb+MoY9+5exvhQrMdhigjNjAvGZeOypVpj1SkelUccV4PzGQ4cOSeuLKQ60ukwVL7qKTM2oV68ehgwZggoVKiiv6NgDpxQslfGv78Ds744aV7dhvSGtrS0emmSDEEVfrP36VtzexbnmqumUDMWL04hOnjwpxYjCxY0UJ1782dTUVLRp0wYjR45UWnVsjVMLFjkfkYru49Yh4mQCECyEK382sFawEmRMBm7pXwt/CuHyd6PMYnfixIkTUrxYr4sjhiXFvHjpcESRjBgxQiai6tgWpxcslS8Xn8bEV/4GhLagjA2C8jxMnOwsXMX33+iMKWObKi/ouCLM1N++fTsiIiLkPsWrYAa+CsWN1hYTT0ePHn3DQtPRHpcRLJUBT27C6pXnjBOimVSntXAxKJ+QiQr1Q/D3D/3QwB65YTqlBuNVtLp27NghnxcX76K1RVeRQXm6ijra43KCRXYdicNtj61HSkTaP26i1rBiQ3wmXn6lI6Y/qZewdQcuX76MnTt34tixY3LUUHUZ8wsXLydaW3Xq1MHDDz+stOpohUsKlsqbXx3B6+/uNlpatsjd4qGLz0K1JuVxZOlAlKM46rgFLPe8bds2Oe+RgqUmqKriRWuLYjZhwgSEhenLdmmFSwsWScvIQZ+H12MXlxrnaGJhhdGshbPm07Lx9ac98cjdjp1YqKMt8fHx0urat2+fFKn8gXrGtuhGDh8+HG3btpVtOtbh8oKl8vuWq7jzmU3IS8ySaQqau4mMbcVkoMOtNbBrbj+lUcedYGb9li1b5FxHotawT0lJQbt27TBs2DDZrmM5biNYKk++swczZx36p/i/1tYWV8wRb7l6dl/ccUtVpdG9uC7+RWfHwtfDDz4e3uLRB96eXvCUy8W4PiyXs3v3buzatUvOR2SQngmqXBFo0qRJyk/pWILbCRa5Gp2BbuP+wPkjccaVoLW2tlijSPyNYQ80xtIPuyuNrs/JjLN4+8pMbEnZjey8bCWew1IwRhHz8/RBiFcwgrzKIthbbJ5lUdk3HDX8qqGuXw3U8a+BBv514e/pOrFA5nRt3boVFy9elC5jQEAAnn/+efj7+ys/oWMObilYKu/NPoYX39iRr3a2hsLFw5oiLlohiKd/GYx6NVx7Bd8vrv2E/175DKHe5aRF5elxszXFrpYnpStPeNB8FM+u5yFX/Mu5Lv4vNj7W9KuKhgF10Uhs7cq0QO+QrvD2cO5kXU6g3rNnjxQvWmC0tCpWdN0yMLbCrQWLxCUZ0G7Ualw8ZiNri2VtE7Iw56s+eHBwXaXRtXjgzLPYkrQLYd7lFavKctgdc4Wg5VzPkeKVfT1b7rcr0xxdg9rjjvK90CyggfLTzgkrSaxfvx633XabTH/QMR23FyyVt789iv/8d9c/pWe1tLYYkI9Kx73jm2H+O12VRtdg2MkJOJR2HCHetkugZRelcBnElpGXKd3KzkFt0TO4I4aE9kMZL+dc5p5VJFxhVWt7ogtWPqLjM9HhvrW4xGXutU445WEW1lzVBuVw7vc7XWKlk2+iFmD6lc9RwSdUabEPucKNpIBl5WWJxxz0Ldcd4yqOEBZYO+UndFwVXbAK4Y1ZhzFturC2mLel9fQezkcUFteOZYPQqYVzJxTW2ttVuIHl4CEXzisea13FomD3zbpuQEpuGqr6VsSIsMF4uNJIGdjXcT10wSqC4+eS0XLE78jh8vesuaXlBadUf3jnnVvw4njnnER9LP0Uuhweioo+FaQYeUrZMv5jYF1IifFRdC8+MqWBgXgvsfEfH42/JQ4t/2lwfBnzysjLQKawvHqFdMGkKg+jdRl9kroroQtWCdz66HpsWHPRGJBnhVOt4GEXotVrQB1s/PZWpdF5SMpNxrrEbSgnLBlfT1/4efjBTzxSiAx52TJoTneNG+NOUdkxYotDlCEG0eLxouEy0nIzb8SmeDz4Pt4e3lLGrBEx1eriZ+xcti1er/Esmgc69hJeOqahC5YJfLX0DCY8vxkIEJaW1oUCkw0IrhqIhM33wNMWk7QdGKY0XDZEIiIrEmczL2Jbyl7sSz+MjNwsaSUxlYEpEl7i0RIBY9emGCbkJKFbcAdMqzEJjQPqKa/qOCO6YJnItdgMNL37dyRcTjEG5LUULca1hBBe+2s4KoXqCYURWddwJP0kdqTux9bk3YjJiRNWWpaQLMDf00+6lBQv/jMFo3AZhHAlC1exM96sMRl1/fXl25wRXbDMZOTUrVi88BTApcG1tIhYriYzB/tXD0HrRq69GKa50No6ln4afyRtxm8J6xGfnShdTn9Pf2mFmWp9sasbXcUUjAkfhuk1pyiv6DgLumBZwOyV5zD+yU3GlXu8NZwfx2B8QiZ+XdAfg3o49qospQndxz8Tt2F5/GpcMVxDVp5BWl6ct2iKeLHLp+alCXfTF+/WegEDyztfDNFd0QXLQg6eSkTrO38x7miZaKokmc74tCeeGNVQadQpimhDHP5K2YHFsb/heMYZKV4BquVVgtvIqUBxOYloX6YlZtR9S6ZF6Dg2umBZQUZWLqr1XYYEVjbVMvWBp+RaOiZNbYePJ+t1lEwlXojPqoQNmBe7AhczI2SaQ4CXEC/8uypoQehyJuemYnKVR/BM1fFKq44joguWBnR+4A/s3HzFGNfSUrRiMnDniIZY+b8eSqOOqVzKuorfEv7EothfEZUdK9sY82KRm8LEi5dBQm4SGvnXxdwGnyHMR58y44jogqURE97aha++OgxwlE/LYHxcBgbcVQ+/z+ilNOiYywnhKi6LW4OVCetkioOX+McSNupoY3443SctLxPv1nwBIyoMUlp1HAVdsDTk2+Vn8cgzm4BgYWlpGYwXojX0ngZY9rFuaVnLntTDWBz3G/5M2oqUnFRjgUEmvOYTL+aHxeYkyBSI7+p+AB9PfdkuR0EXLI3hij2dBq5U6sdrKFqxGRh1f2MsePcWpUHHWjYl78ByYXltT9kn5yLmylQJP3gp2fbM0KeIfVl3OnoEd1J+S6c00QXLBhw5k4QWfZcBgcraiFoRk44HxzfDnLe6KA06WsERxq3Ju/B7wkZczLqC1Nx0Oc3IU9heibmJuLfCEHxU+xXlp3VKC12wbMTpi8lo2FuIVoCXEC0NS8lEp+PRx1vgq1f1O76toFjtTj2APWmHsVe4kOcyLyFOuIiBngH4pt576BykL5JaWuiCZUMuXk1D7Z5LjVaWVvWveLaEaD35TGt8/mJ7Y5uOzeHk7UhDNE5nXsAdIb0Q5F1GeUXHnuiCZWOuxmSg2i1LjOshaiZa4pRdS8fr0zph2uMtlUYdHddHFyw7EJuYhfAui407zIrXAp62yHQsW9QfQ3tXVxp1dFwbXbDsRFJKNsp1WWSceqOVpcX3isvAqb9HokEt29VU19FxFHTBsiPJaTkIaTXPuNCFVikPnDCdnYecYw/AS8sCgzo6DoiGY+46JRFcxhsn/hwqzK0szrxVWq2Ewid0qkKvpUqDjo7rogsWEUZmrhAQg7BUbE2j2sFYtbC/dOWkS6cF/t5IvJqGLmP+UBp0dFwTt3EJMw25iInPwu6jsdh7PAEHTiTg7JVU4aZlwyBey8jKE4KVi5pVyqBe9bJoVj8ET45qKJ7bJjb02fyTeGbKVmEa+YuzoJErF5uBiRNbYubLHZQGHR3XwqUEi18kPSNHCFEK9hyNx95j8Th6LgnnhTBdEhviMo012elGcWPMh1qhCgYf6KpxY2woKxetb6mK955pjdu7VjH+jIaMfulvzBfChXIalVzmqYxMx7pfB+O2TpWVRh0d18FpBStPuFPMcVq97So27o7GmUvJOB+RhljWXM/MNSZrSmESQkBh8hTPxX9mCQMPjRAtLjX/yJOt8PWrHZUXtKPOgJW4cCbROI1HC3KF0Kbn4PrZsUqDjo7r4FSClStEatn6S5ix8DT2Cesp9WKyMUVAFSeWdZHiZIYomQIPkRCtRm3CcWLlYKVROzya/GT83PwOWpCejZatKuDgkoFKg46Oa+AUgkVL6sl3dmP5n5dlzfMbk4qlS6exOBWH+Nt3D2+Anz/qrjRow/HzSWjabQkQFqCd2Mak44O3b8HzDzZRGnR0nB+HFqyEZAMefnMnli05bbSkmL/kpZEVYgk8VNfS8cO3t2LM4LpKozZM+/Iw3nh7l7EAoBYizBHI2Axc3n8fqlcKVBp1dJwbhxWs2SvPYvzkreKZ+Hi0qLR283hBczPXDWOMKCsP10+NURq0Q8azziXJNAVNMOQiIMgX6TtHKg06Os5NKZorRdNj3DqMf3wjECAu3LK+2ooV9ZkLl4qLOZTWTKrB2GYqtPCycvDBnONKg3YcXzFQfLZc7fKzhFWaEZWOh6btVBp0dJwbhxKsnNzrCO/9M7b8FQGEBxhjVFpBUeKIX5IBrVuH4/jqIYjbPBy9etWQAXWzRCvYF1Pf26PsaIe/rzd+nNnLmH6hleEb4ovvZx1CFN9TR8fJcRjByhRi4tN2PmKvpmm7FDwvfOZUJWahSvWy+GNhf+xf1B+N6wTLlzd+eytentLOPNGilSXe79CpRKVBOx4YVAcN21c0iqsW8DiW80PPh/5UGtwHS6Md/D0HDu26NQ4TwwrotBCZwvrRLH5D6FqlZMMnzB+zXu2I8XcVHSif+sl+fPDxPtOD3mnZePiBxvjmNe0rf8YIMazY9CejlamFcPMMR6fhl4UDMLin+6woffHiRaxYsQKBgcZBB1WI1C6ff7+wNk9PT/j4+MDLywve3t5y4z4f/fz84OvrKx/Zpu5z498LCQmRberv6WiDQwhWzTtW4PLZJKCMRsmT/EoGYVVl5GCMEJUfTKyB3m3sOmzbetW4KGpJCKvN288b2XtHKQ3awjSOmV8fES6dn9JiJbQyxWG5fvR+pcE9mDNnDs6dOyeFpCDFLa6qkv/yUJ/nfyyqLS8v74Z4cQsICJCPQUFBUszUrVy5cvLnVGHUKZ5SF6znP96Pj4R1A2EFaQKtKmGpVawXglUze6Fdk1DlBdPwaDnPtNFDHrbINFyPflRp0B6P5nONT7RKKBWW23NPtsJHz7vXatJvvfWWFANaTPaioICpG4Ws4CMtsTJlykgBCw0NRZUqVeRWsWJFKWa6hfYPpSpYJ84nowkrcVbSwPXh1+CUnNw8vPxMG0x/qpXygnnM+/0C7n9svTGJs6SPFJeJjcsHoRdjTjbgx9/O48EJG4AK4rNoAYU4NgOpZ8eiDEdg3YTLly9j1qxZKFu2rElWlT1RLz9VvNQtNzdXflbVEitfvvy/hIwWmz0F2FEoVcHybrcAuZk51q8qw68grIdGbSpi3Ve9UaOSdQsEhNyyGMmJBmM2fXEkG/D6lHaY9ngLpUF7vNrMRx7L3mhlZaVlY+jgOm63KOvvv/+OnTt33ohnOQO8NAsTMkJLrFKlSqhbty4aNGggXUt3cClLTbBGvbAVixaftj5Gw9iMEI6JE1hWRZtVZOavuoDRjwvLpnwJbqq4+O+7pz7mvW27xU01t7J4uqMzkBPxELy0TsZ1cD7++GOkpaXJeJEzk1/EcnJy5EYLLDw8HHXq1EHDhg0RFhbm9N+zMEpFsI6cSUSLrsIVrCIsIWtMdFpnudex7Ks+GNqnhtKoDR7VvjWKRHGfT/z9Hl2r4K/v+yoNtsG7rbBEDeLOqpWVlWrAQw80wbevu9fahgaDAe+8846MCbmSNcJLmButL27Z2dkIDg6WAlazZk20atVKPncFSkWw5BSU88mWryDDjyysqgq1gnF02UBUZCqCxvR+eD02bY0oPs1CiEjt2sE4v+oupcE2fLv8DB55dnPJFp+pMJaVkInrlx9SGtyH6OhofPbZZ9I1dNUYkCpg+S0wxr3q16+Ptm3bonJl562VZnfBWr8rCrfd+QvAOJMlxpW82LIwcEhd/PZ5L6VRe+YJt/D+iRtl0mWR5ObBU1g9ufvvUxpsh0ft74Fg8Vm0cuOE4E99uhXee9b9VjE+duwY5s2b55BBeFuQX7xofVWoUEHGvtq1a4eqVas61TGwu2AFCVcwlQminHbDYDKre/K5KdYWJx4nGvDBf7vYvGxKbGImwhv/BFQuJoDPQxeTgetXH1YabMeDr27HjwtPaZerRuFPzcb1c+5Z6G/Tpk34888/ZTpBcRes6mLxgufPcaNlpj4S9fcLPjoiqnjxe9FFZvCeca8OHTqgenXHX9/SroIlUwYeZcqAcG2EpdCyYTk0qh2Ea7FZ2LI9snjRUoLri769DSNur6k02haPunOMSaTFWTXMxYp6RNmxHZFCGKu2mCss00BeEUqrlQi38IsPu+PxexooDe7Fzz//jAMHDkj3sDCR4UXN17p16yYTPhmwT0lJQXJyMpKSkuRzXvSq20Vh40byi5r63NEEraB40drq3LkzWrdufUOMHQ27CtaNpEyxNW0SiqM/GytiXolKR43W840XY2FQrFJzsH5xf/TpWElptD2tR6zGwcOxxQtpdDoiD49GZeZt2Zg6A5XYn1YLsRpyUatWMC6stm0MzpGha3jy5MlC0x1SU1MxdepUGcAuDopUZmbmjY1CRkGjsF27dg2JiYnIysqSr/Fn1SRWPuYXsdIUMsoAhYufk64yA/W33HKLFGpHwm6CNff383iAw/O8sMWF0rBBOZzMV25YlgmW9dcLKDvdwORs7F87BK0bl1ca7YNcJOLn08XXW4/NwKGNw9BCfB9b88XiU3jihW3aTdfhqb+WjqSzYxFsynQkF4XTd86fPy+TMfND4Zk2bZom6QGqkFG8KGLcOADAdlXMKGIcwSxokdkbWl20uCgNjRo1Qo8ePRzGXfQSJ2Sa8tymdBy9FrkUI7pXudcRJtzCp+5tpLwKHL+UgqNH4/6dRMr4VmIWNq8YhE4tKiiN9oOlizduvlq8hZWeg0ceaIwqWuVJFUNLIYr/fX+v0U3VojMr7+Hp741b3XiVHbpAp0+fRkJCwr+mwfDC5egaEzSthe/LeBnzo2rVqoVmzZqhY8eO6NSpk7RmmjRpIi051cXMyMi44V6S/JaYreHf4OflFhcXJxNuT5w4IeNd3EoTuziqKzdeQRbLxhSTRzSOlRQ4tUZFGXpf/kM/dG9rm6kvJSFL0NDCKwHW8bIHfsIVDG8qOgxdZK0I8MaHP2pfjNDZePTRR+XoGa0dFVpWmzdvVvZsA91CZqnXrl0bffr0wSOPPIJnn30Wjz/+OAYNGiRTESh0FM/09HQpaHTd7OEYUbh4DPj34+PjMXv2bHz//ffSMiwt7CJY46btMK69Vwx33FLVaFHxRHCLy8SXn/TAkD6lZ4pWqyisJgpncYgbnr0Eizw6rP6/hd1axE3EcDlFzut0d5588kk5b4+iQGhhXL16VVZ7sCf8u7TqOHJ37733SgGbOHEiRo8eLS0xf3//G66kPcRLtbgoXBEREfj888+xePFiGeOzNzYXrA27riGBhe4KzBf0VmJVf+64hjGvbEfdAb8AoUpsJiELY8Y3wwQTR6/ym85aUqGcvxAsZadIPIQJr6HFUwLjh9QzlnjWkrK++GTuCWXHvaE4MJal9ikG45ctWyaflyacetO4cWPcc889eO655/Dwww+jffv2UkTUGBhdSVuKl2px8ZgcP34cH330EdasWSNF017YPOheqc/PiL6W/u+RLWG1+Pp5ybxR6SoGeovXhYDRZRQXYyPh9pxYYfr6f8uXL8fQoUOVPe3gqj2hjX4sevSSCEtw/bKB6NPBfqOXHjW+Fz1YwyTS7DyEVvBH3F/DlQb3hu7X+++/LwWALhvdoQ8++EB51fGgi0YBOXLkiPysFBCWpaHAcLMVlA4KJcvj9O/fH23a2D4J2aYW1rodkYg+nnDzMLy40AxZucjiXEBW1WQyJC0wulZ+3maJFU3Uw4cPK3vaUp6lmkvSc7qEdrSwSIPW4drGsbw9EH9CnCcdCUfpJk2aJJ9zVI+5SY4MBwZ69uyJJ554Qrq1Xbp0kZYQA/e2tLoohurIKnPamCJCsbclNhWsURyCV928gtA6yJ/CwIMqrJXdC/srDaZBk5QnxmYwhlXCCc+2YwyL9GYuGmcJaAXvwsLiXcVqqzoSWg1q8HvYsGFKq+ND17Ffv36YPHmydB856ZkuIzdbiQkFnq7pmTNn8O6779o05mczwVqzLRLxhcSuikS4Xw8+0hztm5k+bMq8Fh4kmxIgrL8S9CjPhJFELelN95PVG7RECNbKDZeVHR3CBEqO3jkjFJEWLVrgsccek6LbsmVLaRHx5m4L4eJ7U+RpzXEk8ddff1Ve0RabCda9L24t2roqiLAWfCsEYM6b5pneq1atkiapGmewBZ5h4juUYGHZu65UT1Y41dLCIsJt/3n9FWVHx5XgiCNjvLS6evfuLUWFsSdbCBevRVpbe/bswSeffILY2FjlFW2wiWB9vuAUEi8km2ZdUQziM7F3wR1Kg2nQNz948KD01anuTPqzBRVZ0qWE1AZvrepUmYhMUs0Rn6kEITULbw/EHbeN6Os4BgzE9+rVC1OmTJEpE7yG6CpqHeNSY1uce8lSPlp6QSVeaRwpi4w1PUaUJy7up1/cZnrtpowc9BlcB83rmze1Ze3atdIE5cGh+Uv30BZU4lSiEm5EpVK5kyOrWvYzcRxZEvoEbzQ6Lg2Fa+DAgTI9ghn3FC11Ko6WMHeLOWOc+rRv3z6l1TpKFKzouExUbT5XuHjbcOZSyaLQY/w6wE+8rSkXMS2XtGz8PsP8ulY7duyQB55QtGyVxFapgnAJi7OwxEveWq5QbSIh1cuWaPmZjbCybLE4rI5jwhjd8OHD8dRTT8lYHTPptXYT1YA8RxE3btyotFpOiYJVo3KgtDAWLj2DBj2WosN9a/DH9kikFZK8uG77NWxbc1FO9zCJ1Gw89XRr+JtZfYC1jArOdLeZhRVaUrb7dfFZ7OsSkjrVhGBpPTopXNvDp/X0BneD8xvHjBkjRxWZw6W1tcXrk+LI+mNc2NYaSrzSAik+1AVOuA32xZ590eg3YjVChXh1un8tXplxEO/PPob5qy9g0NObSq6DrkIRED/22QvmLxxBpVatK6KVhbU37eZ8roocOCjBkvEqBQvLJoIlhPfwad3Cclc4kshyOqwDr7W1pYrW3r178eOPPyqt5mOaaUC15UY3jzXOxUVsyMzBrj1RmP7Jfrzw1i6MnrgRBlpdpgaghSv4rAXLY9G6IjQ1VbSIYe1NO4LNSTuVvX8ocT6heKk0XEJ/ut2aBrEEwiU8qLuEbg3jwmPHjsWQIUNkUF7LaW8ULTVfi3MRLcE0dQlixrfynNCCohtE8eJrzAhnjSZTxYriJ8Tt48nmr0BM64oHNT88ENYK1vgzz6NxQD1l7x86Nq9QYlZ5aVhYWmuVRJzTC+eSlB0dd4b13pkGwQoWzN3S0kXkCOKhQ4eki2guJimMFxdi0PADU6wGDW8ghcYcCrOuCN+HeSWW8lPMMlzIvIzqflWUln/o2ircWB2huO9vC/EoAQ9au1r/XR7WZGOlAh0dWkNMOmURP7qIWomWamnR+DB39NAkwapAwdLKneWXTs7GFy93UBpMpzDrSsVS05WnYNrlTxDsFYSKPjcXCZTGZI2gouNF4vVsO88lJGZqvYmINy2F76Lj2Nx3332yXDLzqrQULca0OHp44cIFpbVkzBAsbT4oL4gKjcsbRx/NQB0SLWhdEX55tYaRuTx5/lX4evgI4bqOSoUIFnn4buEqFlODKodJnHbG0xaKxbe0jRLqODl33HEHBg8erGkwXrW0OJWHNfBNwSTBCmcpE61cwoxcPDv6n9LIpkJ3kEloRWGJhXUp6ypWxv2BQM8ApaVwJt3fGEgRgljoMfBAjp3nEpJEfh5bJKzKt7S/AOs4PiznzPQHLaf10ADhiP8333yjtBSPSYLVtF4541QQa+EFn5aNZ0YLATCDDRs2SDXmVhhFtZfEU+dfQ3nvEOHtXkeoT9GZ9o1qB6PX4Drys9+E+NP2rDiqciEizUaC5YGUNI0LBOq4DA0aNJCipWVMixnxXGFo3bp1SkvRmCRY7ZpoVEc8Ow9VW1ZAWU4rMQNaV0XFrlTMFa2/U/Zif9oR6Q7miX9FuYMqa77oDdbqktU+C5yoUhGsSCFYNhqdLI2YnI7zwDrzLLnD3EetRIsjh7zOWX+sOEwTrKbltRGszFw8fZ957iCDcvmz2ovDnFKtky68iVDvcvJ9865TsMKVVwqHC0Ak7RqJEBYcjMsEssTf4jHJuw6D1pUTTCAlItU2FpbogKEmLiM24ezLeOD0JEw89wqevzAdr136CO9GfIHPImfj26iFmBezAqsTNuF4xhlEGqKRmpuu/KaOs8Pqon379tVMtHgdUrS40EVxmFwi2SP8a6BqGekyWEx0Ok7vHIX6NcoqDcXDQNx7770nF3MsSbBoUk6fPt0kYZsfuwKvXPzwhhuYkZeJO8r1wke1X5H7JfHDr+fwxqwjiE3MQsrlFCz65jaM6Gef1ahVPCoKn79KoHXnoyDsCZGiA0Y/atwvBnabynvaI9wnVA5YsBfJR+Wf3BONtF5zxA2hrFcgQryC5BbsHYRqvpVQy6866vnXQovAxuKGEQY/T9OEUsdxWLlypcxeL2whWkugq8mKElxBqDBMFqyQW5YgWVygnNFvERxlTDLg+sVxSkPJfP3114iKipIlZEqCgvX2228re8XTaF9vBHoFCI/K+F145x9XcQReqDZB7ptKhrAYo+MzhUXiiyCWebYTsQlZCG/2E1BRm05yA3aF+CxcvzxeaSia5fFrMUVYVeW8i18VmbCLqf9ozTJmyMcc5Aoxy5HnoYpPJVT1q4Q2gc3QJagNGvjXlW66KTcgndLFnOu0JNhXmAT+5ptvythWQUxWn0eHc3kpK4Kxwm1q1/XmxMyi4Eq8Fy9eLPRDF4aJuovpV2ZQpm+IFTHGsMKUPdMJ8PdCLWF12lOsyOZ90ZbfOIqDNxUTywKtFILlb6JFRNHxFMfby8NLfGwfYUn5IsDLH0FeZeSgR5BnWSTlJuNI2kl8H70YY05Pxm3H7kXfY6Mx4dzLWJPwFxJy9Ax8R2X8+PFylF6LkUP2FcarWZyzMEzu9RPuEYJV2CiZqWTl4s5epq8xuGTJEmlmanmHTReu39dR81DWU7i2+eDdvmIJMSxHYtOeKBsJltCrEtaPVNmQtB1+Hqb9bEnwHHt7eEsho+sYJlx1X/HeMTnx2JK8CxPP/we3Hr0Xo049gR+if0aE4ZrymzqOAI0KlqnRKrGUaQ5cbbqw9zK519erHmSsxGBpzpEhF4N6VFV2imfXrl3SLGSw3VRMOVBTL76NMp43i6AMuvvafyl8S9m0hxaWeSV5TEKc2wY1xXkugYtZEUqOqe3cNVpkPkLEAjz95eAIz+7R9NP475XPhHjdhwHHx+LDq18L8RLirVPqsNIDUx60mCzNfkXR4gIzBTHrNv3GU62AFAs+EHubIQ9tmR5hAmqtdlOhWBWWAZ+fpJwUrIxbKy+AguQK06JyCWkNjsThvTaysHKuo0Ozkl3j3akHpQVkT+jC0wIL8Q5CoDiHEVmR+CZqPm4Tltfo089gk7D4tLi761gOqzzwHGjhGlKw/v77b2XvH8zq9a891kLIn3hibt4RO1KwaXGehQsXSoUtSYAKkr8+VmG8cvlDBHmVLdQqMLqEziFYyakG4dvm0ARRWjQkJ8+kVYt2px6S1k9pIa0vTx95PnkDOph2DOPOPI+eR0fg/YhZuKpbXaUGp/BYU4hAhdcpPSwmjefH7Nv0nM96Aqzxbs7dTFwIdRqWV3aK5uzZs7LsREniUxAqOtdjK4rk3FSsiC/cuuIdIVf8K80L0ByWb7hiLOtjCyhYTUsWrCPpx2XMyRGgeDH4T7cxOTcF30UvlPGuB08/h2MZNl4CTucmOH2Ho4VaWVkshZ4fswXrwcF10Y7B81QzXEPharRqVLJgzZ8/X87gNjc2woPDMq9F8cqlDxDkWabQ9+VQOys1OAvfrTgnBMsG8SvegAy5Ji0GcjnrmhzxcyR4bimiqtW1J+0Q7jw+HmPPTMbJjLPKT+nYA62sLHpZTEzNv4SfRYGQPQvuQJnwQKNrYgq5eWhVgoW1aNEiKTzmuoKEvxcaWrhlkJKbJnOGCrOuCFMaKvs6zwjhlnWXxK3HBmLBlIbK/x49LYq4nATRcWzgkmoErS6ebyapMt428Pg4jD87Baczzis/oWNLuIQYrSMtrCymOHCNQxWLBIvEbR6GshWECNDSKsk9FBZWozpFWzHMubLEFVQpzsJ6P+JLlC1kZFAllyOEThK/2rg7ynisbRG/ysrF3bfVUHaKhqkhnpQrM63g0oCfURWuncn75cjiQ2emIDI7WvkJHVtBK4vLh1kL3cv9+/cre1YIFufWpfw9Ao2bC6GIF+ZfcfWyxEUWFlx0kuHcuXNlXZyiLoKSRn/4elExrLmxy4u0rogpE58dhe9XCNfG1BWJzEUI1rC+tZSdormSFelw7mBJSOGSiaplsT1lH/ocGYVPIr9VXtWxBe3bt5dze60duaXHxSl66qRoiwVL5fiKQXiZK9+wtG56EdaWELNQFgEsBBajL84V5Gsshl/cF+eBYe3pgnwdNR8+8JYuQlHIHCwnEay5K20Yv8rMxajbS54PGWGgYFndbUoFFj3klCzewGZE/iBHFSlgOrahadOm8tq1FnpeBw4ckM816XnTn2yFs1vvQc/u1eRcNClc+VMfxNNQLlRRgN27dxfrClKsGLwbN24ciqq/o7YVFsP6PHI2yngVP9+OFla4EwjW7qPxRkvWFmsginNVtl4IPE0oV3Mi45zMaeNUmaScZDkCm5qbhrTcdDmJPCvPgOzrOdLVtvbuait4A+OUoMTsJIw+/TQmnHtJfg8dbeGIoaWVgPPD9IZLly7J55r1/rrVy2LTd7dh37ohGNivNtUGSGAZFqGwOXkIKzDlIyIiQs70LsoVZGenSI0ePRrVq1eXFRsKuwBoXXEdtYKsTtwkLqSMEt0XWlisOODovPg/cYfhCkW2QLiDo/qV7A6SYWH98VuT2fi67jt4r9ZLeLHaREyo/ABGVbgT/cv1QqsyTVHZJ1yG5ONzEpEoRI2TyzPzsqSQOZKIMZervFcI/kraiS6Hh2BJ7O/KKzpaUK9ePek5WXvOKViXL1+Wz02u1mAucUkGzP3tPH4S294/L+F6zD8lS5i+z8oKDKgV5gryI3E4kyvRtm7dWrZxbuHx48dvssZogfXo0eOmchS9j45CfHaC7JTFQUthTv2P0D24o9LimHhU+RbgGolFxPms4loajmy7B81YWVYDeP4ScpMQJwTrRPppmQ/F1IKrhmiczbwoU0mYO+Utbib85wgB/NzruVJc+5XviVl1Tav6oVMyy5cvx+HDhy0eUCPsT6zG8s4772hnYRUkLMQXz4xuJFMgLh4erbQamTFjhhSq4sRqwIABN8SK1KlTp9ACfTQ5uYZafi5lRcghbFOSG2lhVfB2bAtr+rdHjbErW1zYwvr1qR6kmVgRChATORv418bg0L54odrj+L7+h1jT9Edsar4Y/605BV2C2sr8N1phKcIdoyuZZ5t7p0nQEudn5hSfjofuxIE0ccx1rKZJkyZWx7HYnzjBOjIy0naClZ+a+fJ75s2bJ6P+hdXOUcWqZ8+eclmh/NSqVesmweJ+uXLlEBISorQY+SpqnrgYTEtAZQwrzKfkpNbS5PUvDgG2KmGTkYOpY5soO7aHhftGVRiMb+q9hz+bzsPapnPxbJXxaBJQH6l5aVK8svNKx3VkfynrVUaIZxaGnZyAj66atjCCTtHUrl1bk8A73cKrV6/aR7BUOC+Ibl1h9dnZQVmegklnt99+u9L6D8yzKpiIxjyPW2+9Vdn7h0Vxv5lcq8nRLaztB2ORK1w2k1fVNgeKQmo2XhjXVGmwL76evmgYUAePVx6DxY2+wKZmizCh0v2ycgYtr/TcDOQIV83eMIzA3K2Z137AkBMPS+tPxzK40hWv94LXrrnQG4uJibGfYG3btk0KVmFBdlWs2rZtK9f0Lwx+YP6eeuflAaCVVtAdXJv4lxSh4lIZVPherNRgkzX+NGL8tB2AiTXWzSY7D7XbV7J7AcKiqCqsr0lVH8Yfwur6tfH3GBjaR954KF7Zedk3zr09kCOJXiE4lXFeBuRPZ+pZ8pZC78haweK1z3i1XQSLZSJWr15drFh17NgRd999t9JaOCzox5/nRtfx3nvvVV75h1nXWKDPtNLBDP6yPpajsv9EPE5sv0ZTRGnRmMQszHypvbLjWDQv0wgf1PoPtjRfgvdrvYxwnzA5JchgR+FiX2XeFgPyA449iN8S1iuv6JgD489axLEyMjJsL1hbtmyR9a2KE6uuXbvizjvvVFqLRi0ORrHq1q2bXG4oP8wH4twxHw/TLAbWFnfklIZ7nt8KcBHbAsdNE3LyEFCjLAZ0M62oYmnBczk8bAD+bDZfxr1q+1WTwsU4k72Eiy5iWa+yeOrca/ggYpbSqmMqlStX1sTCsrlgrVixAmvXri1SrCg83bt3lyOCpsCf53bbbbcV+js/xvyMMuKOWPBvFYUjx692H4nD2b3RtrOukrIw65VOyo5z0Ldcd/zS5Hssbvglmgc2lKkTjC/ZQ7iY3c9RxC+vzcVDZ6YqrTqmUFQOpTnwmraZS8gPx/Xy9+3bV6xYMXeqX79+SmvJtGjRAs899xx69+6ttPybJXGr4F/MvMGCOPII4T1TbGhdscx1sB/GcDVrJ6RjUCssaDgTKxp/g7p+NaTFxdV3bA37MTPkWWe+/7ExSqtOSQQHB2tiYTGR3GTBKiwHqjC40g3XEmRmKsscFxQrfnC6gf379y90hK84HnzwwULnDBJmU8vcK5g+1455PxW8HU+wth+MwcUDMfRFlBaNSTTg0/90UHacl5aBTbCyyXeYUfctOT+QiZ+cEmRL2J+DvcviQlYEeh65xy5C6eywxp21gkWoQSVeEcx9+OWXX/DVV18pLUXDovHfffedfGMOZRYUK7bTrON0G8agtORnYV2x1nfBv1kcXObTES2sQU//ZTvrKjsPvpUDzV6B25EZVP5WbG+xAk9XGQfDdYOc12hrN5Ghh1hh2XU9fLesuaZTPBzlt/acMFu+SMFiBvm3334rhYplSgsGuPNz8OBBfPDBB9i+fbu0qgpb7YajBFTZiRMnyuxXrVka/7tZ7iDhKGGAp+mLXdiDz+afRPzZJHF2bFSVIS4Da78s3KV2dihYf7dYLlfxppvIuYu2hFYdJ3x3O3I3orJjlVadwmA+ljWCxd+VU/mU/X9BYeG8HVpX/EMUIJaKKMiRI0cwc+ZMLF26VApcYS4gYYInLa7nn39ejhhoDYVnf+oxs+uyq3PaHIlnXv4bCDVPeE0mKxcte1RDr/aVlAbXgwmfn9R5DQsazoC/hx+Sc1Jtam1xJR++fa8jI3A+y1hRQOdmqCnmeD+FUaRgceUaQhOMf4QnXC2QxyWpmQD64YcfylpWCQkJMj+qMKuKv8d4VdWqVTFlyhSzlu4yh5/jVou73c0uaEmwo/mZmAJhD+6YuNEYt7JFRVF+2cQs/PmVeXFDZ4VzFXe2XIlhYQPkJGwmntoKX08fuezZHcfGICJLX+S1MKyNYVFLqB83CRatKlpO+WdX08piisInn3yCL7/8Eps3b5ZWE9+AkxILEwp+QI4Eck7gI488orTahtUJG8WdznxLyZEsrH3H47F2+Vkg0EYVRYVYPTO5LcIZG3Mj3qk1FcsazUJZ7zKyjpetrC0fT29p0fU9fr9csVrn35g6aFcU1BOONt4kWFy5pmAqAkWJddc5rEjXTnUTi7JomODJ7YEHHpC1nW3N1pQ94g5nvqVkFCwbuV9m0vOhP4UraKNAu3AFy9cKxv+m/Hsak7vQtmwLbGu+DKPDhyBWiAkz120BE0w5Ss0SzFxyTOcftBAsFjn4l2BxdQpWUijMvaNoFSdShHcvZqPyjSdPnozGjRsrr9iO6Ow4OUnWlLmDheHvaaOieGbwyoyDSL2SKnq8DQLtrLWfbMCRnwcqDe7LtBqT8FOD/8lgfEau9ctQFQbdQ9LzyEhk5tnmbzgr5oZs8kNtucnC2rhxo7SeLEF1AVnD6umnn5a5F/Zgc/JOi906Wlh+HqVrYf2xPRLT39ljTGOwBXGZePutzqga7lijoaVFj+BO2NFiJRoF1kN8dqJNXEQG4nOuZ6O7zNOyf7UJR4PeljViRagvLIN+Q7AYu+LKFIUV1SsOnnB1OR8mdg4dOlQ+txdbk3fduKuZi9ElLD0LK0qISb9719jOFUzLRtNOlfDS+GZKgw4p6xWIZY2+wpNVHrRZljxjqul5Gehz9OYJ+u4GF0I1V1cKwrQoDt7deBfVujJHCVWriq7fCy+8gIYNGyqv2I9NwsKyJH5FKLYcXSwNsnPyULnPz8Yguy0WlsgWd/YAbxxdNkhp0CnIc1UfwVIhXLSxmE+lNczTis6OxfCTE5QW9yQuLs4qweJ1ynAU4+fyXdhw9OhRGacyBf48M9bJmDFjMHLkyELjXraGsavYbHEw/u3ZmoUlo4taENRlsQyG22wV5yQDzq8pvLaYzj+0L9sCO4WLWNuvhpzaw76tJbTmDqQdw9MXXlda3A+mPlkjWAzYV6lSRT6X76KKVUnWFU8m/VGOFrZs2VJaVY0ald4Uj79T90rBsdQ/Lo20BmpJaI8lyBKCAn8bpDDwgotKx8Lv+qJ2VdOWnnd32Ad+bzIbd4XeLlMStK4tz2TWX+P+xPtuWprGWpeQgsVSy0S+C8sWl2Rd8Zfo/lWqVAlPPfWULLZXGlZVfk5lnDNpoYmiYLc0NzveGq7GZMC77QIkRGXYJt+KF1p0Bp6b2h4j+5W8KKrOv/mo9it4q+ZkxMu4lnbBct5QWZpm5rUfsSD2F6XVfeCagtZoBbWnQYMG8rkUrBMnThQpWIxT0aJiWvx9992HRx99FBUrVlReLV1OZVyQS0VZCu2y7Dz7jOJsPxSLasINvM51Gm213HxcJh54qCk+mtxGadAxlwfDh2Npo1lyErWWtdwpWmFCtF64+A72ph5WWt0DrkFqqYWlenU3BItWk6zkV+ANVaFiOwvmTZ06Fc2aOdZo06lMYWGZUU7mZjyQfd12UzZUuDZj10HizsqlumwRsyLxmRgwtB5+/G9XpUHHUtqXbYntzVegnHewrPygFcwVpGjdd/ppZLrJwhbR0dFSQywN21CHwsPDlT1xDK9cufKvJbdofqlCxdVrGKfiQqWOCBcGKGll5+LgITTYWLBe/PQAxjy+wbiQhC1WviEJWejcqxp+/7yX0qBjLSHeQdjSfCmaBjY0BuNlAMF62F8Zhhhw3D0KAHKGjDXuINMZ8hde8ORkZooTX6C1xaFDVgGlULFmlaXKaHuuW5XhbsR2FhbTFlqNWIX3Pt4HlPdnT1Ve0RBeQ8KyuqV3dWz/0fTKrTqm87NwDweF3orY7ATNRhAZ5L+SFYmnz09TWlwXCpap2QeFwRzP9u3/WSjFkwExuoQMpjNGxRIwnLDsuEJl5GTGOblAgTXwK9piFj+z131bz8eh/TFAOWFZ2ar6Qmw67h7eAFvn9FUadWzB/2q/jmerPITonDhwHQAtCPIqi5Xxf2BezHKlxTU5e/asxRYW3UHWg89fZdiT83NYJ50VFQqreeWocL04awLuxEP8y7xuzNLXisf/uxv9Rq427nC9P1sIP8UqKh0TJrbCzx93Vxp1bMmkqg/hUyFcLFWjxeRpNQj/8qX35c3XFWGuJstLWWr8MNjOhZXz43nXXXc5zKifOcTnJlqVMEooWIxPaEFCsgF1BqzErG8OG60qW8WruIBETAbefKMzvnSBuuzOxN1h/bGo4Uwk5aZoMp1HLtbqHYK7Tz6qtLgW+/fvv1FTzxIoeDcJlvLodDB+Za3x4knByrVesBatvYjQ9gtwgaWNbeUCEmbGp+dgzc8D8epjLZRGHXvSOagNfms8W84TzM6zXrTUPMKBx8fKR1di7969/xrQMwcO/oWFhcnKL/lxXsHKy5QWkjV4iDsci7pZw8ip2zDqkfWAn3BPmV9lKxdQWHDBof64tnsk+nUxTlPQKR2aBjbAn00XIFv840rU1sIgPN1CuoeuAgWHBRUKpkuZCt3B/MF2FacVLObHWCtY0sKywiWsO3AlFi8+ZSwNY4sJzIQuYHQG+t5eE0nb7kGlUL1MjCNQ06+qTHvwFDeozDzr4qDsx5y+wwD8yoR1SqtzQ3eQ1pUl7iBHYzk62LFjR6XlH5xXsIRJbr1geSI5z3wL68LVNHi0mY/zpxOBEF/bWFUkXdy9M3Mx99vb8MesPkqjjqMQ5l1eLi/GCc7WVnswBuHL45nzr+OKwfnrwnMRZUvdQY4OcrIz14ooiPO6hLSwrBQK3h1ZsdQc9hyLQx210kKgjUYBpVWVjpatwpG4/z6MHmic+KnjeLCEzPYWKxHuHWZ1VjyD8CGewRh8fJzS4rxcuHDB4nQGplkVtSK80wpWap4GLqGHFy5nXVX2SiYuMQsdBvwCBAmhstW6gckGcYu5jhkf98DBJQMQUtayu5SO/WAv3NR8Eer410RKbqqx0UK4mEWGcDHHnZmstDgff/31l8Wjg7SuuKZEUVVgnFawOKxsrW3jJb7+JTMEqy2rgzK4rnXKAoUqI0dmrY8Z3Qg5h0bjiVH2L4aoYx2rmsxBq8BmSLIyVaaMZwA2Jm3HkrjflRbnYsuWLf9adcscmMrAuctF4bSCxUxha+d38Q5gauzh0KlEXNoXbZzArBWqUMVkokP7ijj99wj88FYXYUo77WlxexY3momeIZ0Rn5OotJgP+yXL0Uy5MF28T5LS6hycOXNGio4lo4O0rvh7BXOv8uO0V0ZZrzJWF1qjS8lseVPiWIv/uKhd5jqr+DGgHpuJbl2r4NBfw7Br3h2oXyNI+QEdZ+bbeu9jaGg/xGbHW3xTZTwrWNyUh56w7ZqeWvPnn39avJANV4/v2bOnslc4TmxhlbHawiJe4p8pcays7DxjsMJSKK6GXLmgKZM/+91WE8e33oMts/uiRYNyyg/puAof1X4VYyvdgxgrRMvX0xcRhmt4/fLHSotjk5KSYnGxPqYysABD7969lZbCcVrBCvcORZ74Zy0s93Em84KyVzS3dqosUwzMgpYURxNTDDKXqmbNILw3rRPSj9yPNV/0RuM6wcoPuh4c6WFpXJYv4gRYugonT56U5biPHTsm9zmSxNdjY2NvrBHgSkyrPgmPV34A0YY4eUFaAvOzZkcvxq7UA0qL46JaV5YE22ldFZZ3VRAPcSCtN1NKgd8S1uPZ82/IImvWwCk+w8L6462azystRePR8Efe9oylYvKfFB5CaicFiikJtMYMYvP2QPN2FTG4Z3WMvbMOGtZyPYFieSIK07Vr1+TGgm1M+mM8gndMZjzzeWHdjPEKdm7ekVmChI/M3alWrRpq1aoll3Vi8TaWPHJmPr76DT6J/BYVvStYdDFzsjVHDk+02aC0OB48z6+99ppcj9Tc78i+Qets2rRpJQbrnVawDqUdx10nHkaYT3mlxTI4taKefy0sb/y10lI081ddwOix66QQSThnMFccPo4cBvmgUsVANBFWU7umoejWpiL6CqusjC1qt5cS7JSXL1/GxYsXpYVEy4h3Rk6joPhQcFQRIgU7bv79gt1O3ecj/w43vhfFinftGjVqyIUI6tati/LlrTvnpcGMyB/wbsQXqORjmWjxxto8sBEWN/pCaXEsli1bhsOHD1t0c1EnOQ8cWPLq5E4rWIk5SWhxoB8q+f5TK8cSWN8oJTcNp9v+pbQUT0patjSkEpKykJyeg0qh/igrRMlbWF1+tip/XIokJyfj3LlzOHjwoJwbxs7FC44WUXHipAXsmupGAaPFRgusXLlyaNOmDZo0aSInyDoLX0fNx5uXP7VItHgMOPL4Wo1nMK7iCKXVMaBF/cYbb8jaVeZ+L1rf6u+bgtMKFqm1rysqeJW36mJhQDTKEItzbbfIIKeOMf7EWNPOnTvlmnK0oigUtKB4rG0hTqagdlV2cn4miibrubVu3RotWrSQS5k7Oj/ELMHLFz9AZZ9w8y9u8f25DueOlitR1beS0lr6LFy4EKdOnbIo94r1sljiqrCJzoXh1II1+Ph4XMyKsHipepX47EQsaTQL7co2V1rcE66eRJGi20c3TxUpUloiVRzsuqp40dpj3KtPnz6oWdOxlzhbELsCz1942yLRYoVcfy9/ufirI0DBmT59ukXWFa1m9jEucGMqXtMY6XJSTmSexeH0k1YLVo74V8u/mlwtxd2gOb5t2zYsXrxYTlhl8FMNfpe2RVUS/FwUKvWzJiYmyhpMjKVw4izLfjsiLQIbo5ZfNSyNW4WynoFmHV+OaqtJqazNVdosWrRIipZ6YzMH9rXx48ffVPOqOJw2rYG0L9NSk0UkfD18sSV5t7LnHjBg/vPPP+P999/Hhg0bZHyIwW1e/PljU84CPy8/O78D425Lly7Fe++9J8XYERkeNgBf1J2Oa9kxMo5qDiz6Z221XS3geoPFrWlaHLTg69WrJwdTzMGpXUKu7VZvXzdU9hWmtRVZnewwLHt7tu0WpcV1YdrBqlWrZA6UepHz0dkEqiTYrbnRguRk2jvuuAMtWzqeBb06cRMeOfMCKvqEyex2U2DRSa5QParCnUpL6cCbHYXHXOuK54U3lVdeeUWeG3NwagvL39MXNYVpbe2iAOwotNSuGqKUFtcjJiYGP/zwA7744gsZo+LwMzdntKZMgd+J340WFy8qWlyff/65FGpHon+5XvihwUeIyTZ9RR4mTLN2VmmydetWuSygJa4gR5q5Mpe5YkWcWrDI7SHdkaVBmVo/Dz/hFu5S9lwH3sl+/PFHzJw5U+ZPUaRUq8od4PfkRRUQEICkpCR8//33+O6772TcxVG4NaQbFjX6ArE5CSbdfGmhcHJ0acFg+Zo1a+QxNRf+Lm8igwYNUlrMw+kFa0hYP6TnWb+cOAP321L2KHuuAV2/jz/+WFoVFCprVjBxdvi9GWvhRcbYywcffCCtBEeha1A7/Nr4O1myO6cE0ZIWlpUJ09bw008/WdSXKLS0ysaOtXzBDacXrDZlmslSM9a6hX4evvgjcbOy59xwpIxDzbt27XJ7oSoIjwOPB7c//vhDuolxceZVnbUVrco0xR/N5iI1Nw3ZxSwjRsEqLQuL80JPnz4trXRzYTyxS5cusvyxpTi9YJH7wodYvRAA41isjeXMi1pyLt+nn36KlStXyguTYqULVeEwvqW6iTxmFC9HoIF/HWxqthhZoj8XtiIPrZSc63my9ExpMHfuXBl7Mrdf0RVkf7zzTusGClxCsB6qOFKO8vFkWkOAZ4BcPtwZ+fXXX2VAnbktvBBdNZiuJTw+qpvI9IfPPvvMIWJb1f0q4+8Wy6UllZVnUFqNsK2iT+lk9M+ZM0ceM/Ytc1BdQeZcWYtLCBbnZnUq28bqnCyOOi6PX6PsOQfnz5+X+UZ0A3nh8QLUhco8eLwYCKa1xaF6HsvShi7frpa/yBrv+b2HXGFd1fGzfyY/55JywrslriBHBbt27apJIq9LCBb5T/UnkSisLGswFvOLtLomt71glvHs2bNl0qejun+8u3JTJy8zxYBTabgxpqFuahtfV8vSWGsxmwOPHS9GHscVK1bIwHJpEygs/j0tfpPVdTNyjfXCcsU/ZsnbE56PJUuWWOwK8mYwePBgpcU6nDpxtCC3HB6G1Lw0+CjLf1tCck6qFL8HKw5XWhwP5lHxguIF7khCxa7EuX3spOojN1p+nKTMjc8Z8FbFgSkH/B6qSPFuTLdW3fgaf4YbXRH10Zbwe/BzsB7XY489prSWLr2PjsQ1Q4x0CZ+t/BAer/KA8ortmTFjhpwEb651xePItJrJkyejQgXrqqqouJRgbUj6G2PPPCd8fMsPDkdnynuHYFOzRUqLY7F69Wr8/fff8q7Fi7e0oTBRbLixK6lF9ypXrozq1avLESEKk6VQtCjQLL3LLH1WKGWciaKnCpktBJvfi9be66+/rrSUPv2PP4hdKQewvtl8tC7TTGm1LawiunnzZnmjMfc489zRsurcubPSYj0uJVik/7Exsg62paVieDiis2Oxo+UvqOZAJTwYtGTCI6t7UqxKy6ri8VEtJ1o/nKXPonqsTcXNknll5hIZGYkjR47IIXaKGe/83LQUcH4/Vs985plnlBbHYPjJx7G00ZfKnm1hfPSbb76xqBID3fw6depgzJgxSos2uJxgcZ3BzofvQhWfihZf1FzBd2SFwZhWY5LSUrqwigLjKqpVURpipQoUH1m+hRNXWYOqYsWKyk+UDqzdtX37dhw4cEBO6NZq4IEuYY8ePWS5GneEFvObb74pb47muuDsI/ydl156SWnRDpcTLPLUudexLmmzDFZaAud0MRZ2qo1pVUhtCYOdhw4dkheirWM3BWHXYMelKHCEh4sEcHMEV7QwaHlx1WGWl1GTQy0RLn5vlqp5++23Hfa72hrOkEhPTzfbYuaxoyv44osvypil1rikYJEmB26Fv4ewSDws63Bx2QmYU/9j9AzppLTYFwoF86qYhW1vF1C1ptg1mjVrhu7du8vYlLPAGBdjL0xPoOCYK1y8UGldFbcCsSvD2misOMubpLkwNWTUqFFo1aqV0qItLitY+1OPYuCJsRa7hkzYa16mERY0+FxpsR8MMDNdgRaVPfOqVGuKIzq0pBgsdWYLg8LLQQq6jBR9U44lhZqxq+eee05pcS92794tZ0pYksLAvsMwwfDhththd1nBIi9deg9LY39HiAVLgfGwRGXH4lDrtXadt8URGU4TYcVMe7mAFCpaFQySsm6UuUXVHB0OWLC8DOuO80IsTIR5vhm3Yl14Rwu02wtW8/jqq68sCrKzD/Gm8PzzJS+XZw0uLVik19ERiBXunb+n+UPrXFrpjvK98HHtV5UW27JgwQK5yCjFyh5WlSpUFCiW+3A1oSoIL0gOXjA9gqkW6g1BdYFZ4G/kyJGyzd2gqHPGhCWxUrWuPgvy2XqU2OUFi19PxrM8fWVpWXPg79LKutR+BzytWqe+ZFiviheSPeJVvEApVMyVolDRsnInuAI10yKYDMljzQGFW2+91aKYjavw3//+Vx4Lc0MAvEYYZKdlZY9Vi1xesMilrAh0PXy3WWVoVVjqY0z4cLxc/QmlRVvo97NaAO9QzCWypVjxTkihYoyKi1Y2aNBAeUXHnfnf//4nRceSTHYG2R9++GHUr19fabUtbiFYZGPydow+9bTZQXimOCTkJuF8W+0XM+DCpIwZsKPY0pTmKWYiH//G0KFD5cifjg5hBQYWeKRlby6cdkMLnROb7YV9E3tKkd7BXTCn/keIzI6WF7CpcHELTjxdpnEVByY60g1kLMWWYsU4Fe+eXAqcMQZdrHRUmOPHVb0tmTpFS52Ln9pTrIjbWFgqqxI24qGzU1Deqxy8hHvI2JSHeKQwGf8ZyUWeLFfDNeDGhA/De7W0y9rdtGkT1q1bJ4fPbeUC0v1jPlK1atVw3333yeXddXRUfvvtN7loriUDPLTWOUf00UcfVVrsh9sJFqForUrYgOTcNMTlJCAhJwnpeRnIEFtaboZcpzDcpzzalWmBCVXuR8vAJspvWg/rrHPysiV5LqbA08l4GBkyZIjNEvgcncRkAw6cSsDuo3GIiMpAmQAv+Pt5i008+noiQDz6+HjCz9sTvmLf19dLPGeSqQd82e4jnvNRtBv3xc8oW4B4Hy8v29xo7MH69euxceNGi/ogJ4TTfZwyZYrSYl8cQrCyc4Q1wy37unjMFRsf82CQbcprSpu6pWbkoGWDcqhdtXRKxVqCOs3GVmkLHP2jVUX3j7Eqd2TGwlN4dcZBJEaniwMiunae2DyVYy17uvgfH7mpp4Dn4sZz5X/599VzxQf+niEX18+Pk03OBq2qX375xSLrnuEF8vLLL9t9mpiKpoLVZcwfiIzJEO6IuMsLocnKzjU+GvKQK54LL8tI/j+pPlXbbuwr/1P3Sf621Gw8PbktPp3ajo0OD5faYsVGDp1rLVY8hTTTOQWFZWiZruBurN0WiTvG/SHufqKTBXoDXuKCUg9zYcdb7UslUdiPCDE8u+de1K3uPDdLwjmWzPWzJDGUN0MKFic0s5+VFprK5MDuVXHxUCwuX0lBVFQ6EhOykC6ERYoV4Z2OmzDDb2zCxJabML3lJkx1uflzEx0vQGzsgNzKcPMByootxBfnI1KN7+vgcCSQpVBsIVaMVXG0pnnz5vLO545i9eXi07jj7t+M/SdYXEzCnZP9jMe6qOPNZvX14ja1z+bfRL/ctNu5Ft3l3EBrxIphBrqBpSlWRCiFdrzySHPx7cQdThUiVZR4t5ObOFDcCusExW0FOxE38X7nrji+YDHHiqvZ2CIhlJ2IG/NgbDl/y5FJTDFg4tObgEqBxr6m8TEuFNEnr8ZmKDuOD8Vq3rx5FokVb4jMFeTcSoYyShtxhrXl3nFNgfSi11TTDOF2Vgp17MxkJuSxTImlZU6Kgi4grapatWph2rRpsjaVu/LqzMNGq5s3NjuSw/hYCfyVtBNvXPkUb17+H9YnaZ/HZwrM6LdGrBgTnTRpEkJCQpTW0kVzwfr29U5AbCavKqXFRmTmYkB3yxdktDUUK4oKc1y0FCt1/h9LeDz44INKq/uydX+00Zq3J+JmWadK0bXWZkcvRtMDt+Lhs1OxIGYFvotehN8TNiiv2g/GrObPn2+RWPGmyPy9J598EmFhYUpr6aP5mQ4U/v27H3UHom1oMtPtFNvkMZanG1zMvKI8055PPvlEipWW/j47EE1zju689tprcqKuDmR6AnLEzVHpE6Zt/Pl8G0cSzdkyctC7483ls1Nz09H9yHBMvzJDriTOxU5ZRLKMZ6BVC6NYAkejLY1Zsa9xys2ECROsWqXZFtjk1vTC+Kbof3d94FqasYNohdJZcC0dvy/srzSazzdRC9Dq0B1y0QqtoVjxzqS1WFEA27Vrh2effdbsOV+uzLP3NwK8PeArbpS+ft7wEQLm7esFLx8veIrNI38MlReu3MQv0gPgJtweKXg54pGDQwZlyxJbpuhr3BjiSM82bskGINQfNQtYWAfSjqLlwduRmJOMEK8gsHCkKhRMQq7hZ78Ln/W/uAScpW4g+xpXC2LIwdGwaR7WRz8ex/Nv7waSxEm2JtGOn5DCJzpfj361MOs/HdCkrgU+tXifYScfw4H0Ywjw9Ecd/5r4tfF3yovW89FHH91Y0UUr6ALSsrr//vvlIg86jsd+IVaDj49HuE+oFKqCMDH5i7rT0a9cD6XFdqxZswZbt261KCmUYsUyM0888YScIeGI2CVxdP+JeHjxDmcJ4tMxR61W5TIIYjqDhWxN2YWHzrwgbsZe8Pfwk+u7cWrOnpa/Kz9hHbYQKxaUY8djHMGdS584MgfTjmHQ8XFCrAqvBMLLi/NXL7XbbnZ5I3NhkUKu0GxJYjJTF3hjZPFCLtPmqLjF1JypF9/BothfEeodcuMOyCoMKblpON3W+oUmPvvssxujgVrAU0K3ktNq3LWgnDNwKP0EBhwbq1hWhd+Qs/OyUcknHH80m6u02AZWXeBEZkty/ShWTDxm6oKjzzm10OxxDqKyY9D18FCsiF+LCt7l/2Wu08KqZMWCqypMCrVkVdyioFlOsRoxYoQuVg7MhcwrGHD8wWLFiqTmpWN8ZdueRy5WwhIxlogVQw6cH8hVbpxhgrzLCtac6CXocOhOOXIT5HmzP88VntuUbarsWcYPP/wga1rRsjK3oxQGOw43ZhS3bt1aadVxNDhR/tZj94qbYPFilXud4fY8jAobrLRoz4cffoiYmBiL0mcoVrTmOUPCEZJCTcElBWvEqYl488qn0qry9Sy8iidN9XZlLa9kwFEYTrfRKoOd8QOO6nBp9PLlyyutOo5Il0NDZKoC46FFQbHiCuJz63+qtGgLb2zTp0+X/caSGyZnSLAc8n/+8x9N4662xqViWDtT9+PB05OFCnvIUcDiTuI1Qwz2t1olg6XmwtnuXA5Ji6oLPPwcmeFcwHvvvVdp1XFUeh4ZgdiceNm/isKQZ0BGXhbWNZuH2n7VlVbtYI4UFzq1tFItRY4rdnM00NlwGQvr5Usf4J6TE0VH8kOAV/FiZRDWFRP6LBErLtC5a9cuzcSKna9///66WDkB4888j2vZ0cWuwMR6an7i9SOt19lErCIiIvD+++9Lq8hcsVJvjo0aNXJKsSJOb2El56ai/7ExiMmOR5AQoZJEhAuk5l7Pw98tlqGcmesV7tu3Tw4dW5KQVxCOzHCKDas2OmKCns6/OZlxFr2Pjip2TQAmjTYNbIBfNMztyw/LanNVZs52MLceFS9zJoRydSBnXtHaqS2spJwUtD04QIqWKWLFdQYDhSl/VNz9zBUrjsKwAJ8WYsX4Ad+D8QNdrJyD2dFLUM4ruNBzTzFgvGpgaB+biRVLGqv9z5J1A2nJ04p39uX3ndrCanOwv7SWGFgviRQharWEif5HU/PzYXiyucikFmLFZFAG1d11dWFnpf2hQTKQXjCTnZfP1ewovFrjGUys9IDSqi3fffcduAispTlWtOTpAlatWlVpdV6c1sJ65dIHSMtNN0msODWC9dktESuecAY4tVgwgh2nZs2aulg5GUyNiTREi4vl35cLBYxZ7PMafGoTsWLfY7zqypUrFokVLXkKKtMWXEGsiFMKVo7oKN9HLxJuYMklamOy43Bn+b6Y3/BzpcU8aFlxNMaaGtbsNEwGZW4VSxjrOBcnM8/C1+Pf6TEcuGEoYlvzZegTcovSqh1RUVF48803peiYm7bA/sZpYlzRmku7cXqXq+CUgvX2lRkILiKeoCJNdUMUnqzyID6p85rSah6sFsrkOmvWDeTnoEvZt29f3H333UqrjjPBG+Q/C8AZY6E+nt442no96vjXUFq1Y//+/bKemrpmpblixf7WrVs3WXHB1XBKwVqRsFamLxQFT1qE4Ro+rP0KplSdoLSaB+dmWTvlhp+Dcwy5LmCvXr2UVh1nIzMvC6peJeUkS5Ha2/J3+Htqn3D566+/ypHo4OBgs616upC05Fkyu1+/fkqra+F0gsW4VZQhVnzwwj86JzUzCLqg4QzcV+EupdU8Vq9eLbPYrakWqtYVYrBTL7bn3HDyck5ejgwv3F6uJ35vMkd5RVu++eYbmZBsSbyUk5cpcK+++irq16+vtLoeTidYOUKQjKs133xCc64bO9X6pgvQO6SL0moeLCu7ZcsWqxJD6UZyNPCFF16QQXYd56ZxQF0YkI1JVR/BzLpvKa3awWk2jJVyXqq5wXVa8bSq2M+4BBd/35VxyrSGynvao4q46+UfYmYQlJNSmRBa0cIqDHFxcXIyKc1xS8WKnY+/S7HSK4O6DimcRO+l/QRhWvKzZ8+Wc1I5t8+cfqe6gHfddRe6dLHsBu1sOKVg/ZW8A/effkbYWUYDkROZWeZjT6vf5DLzlsJa6ew4lo4I0ixnrhbrCunolMTatWuxadMmi5JBacGzrzLkwN93F5w6cfRc5kWEeIcgzNv6Oj60rNgJLB0RZI5V9erV5VQbHZ2SmDVrlsUuIEcBO3bs6Jajzk4/l1ALOCLIqTeWBtk5obRFixZ6wT2dEuGo8eeffy6FhyEDc/obww3Myxo7dqzbrkXp9oK1bt06bN682aIgOw8d73acUMo8Kx2d4mB+Vf7Jy6b2N/YzJoIyW33ixIlKq3vi1oJ1+vRpOU+Lq9paIla8W7KUMZff0tEpDgoVF4gwN2WBVhXrVw0dOhQdOnRQWt0XtxYsztNih+DojDmoYvXQQw+hYcOGSquOzs0wH09dq9KckIO65FbdunVlPzP3huqqOF0ellbExsZK0TF3dEYt1cHRGV2sdErirbfekgMy5ogVR5s5APTAAw/IrHVdrP7BbQXrxIkTZk8qVe96TFvQE0J1TIETj02NVzGvijdR3gg58VlfOPdm3FawOKRsjnXFzsQ7JZdDYj1sHR1TMGU1Gt4IGVTnqOFTTz2ll8suBrcVLFpKpgoWp9pwOJmJpcyC19ExFSZ3FhUmZjtdP7qAzKmaOnWqwy4R7yi4rWBxYrIpZjqD8mTatGlOtRySjmNAC6ugYHGfN0D2wa5du+KNN95AmzZtlFd1isNtBYujNiUJFjsVzXQWQdMDnzqWwEx2VbBUoeKgTYMGDeS6grfffrt8Tcc03Faw6NoVvPPlR50XyJiVjo6l0CVkjIr9iRZVs2bNpEXFOJW5I9Q6bixYYWFhsiMVBuMK4eHhmDRpktKio2MZtNBpzTPp85133sGwYcNkioOOZbht4ihXb+Y6bwXjUhwJrF27tl57XUcTIiMjUaVKFWVPx1rc1sJq1aqVNNPzw6Hlxo0b62Kloxm6WGmL2woWFzBlfIH5VXQNGV/gnEDWX9fR0XFM3HouYUREBObNmyfdwu7du+uTmHV0HBrg/wxPYKtJk+FQAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.gimb.org/index.php?id=29</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.gimb.org</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>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</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>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gimb.org/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.gimb.org/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIMNAZIJA BEŽIGRAD LJUBLJANA</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">GIMNAZIJA BEŽIGRAD LJUBLJANA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIMNAZIJA BEŽIGRAD LJUBLJANA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">GIMNAZIJA BEŽIGRAD LJUBLJANA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gimb.org/index.php?id=29</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.gimb.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Janez</md:GivenName>
-    <md:SurName>Šušteršič</md:SurName>
-    <md:EmailAddress>mailto:janez.sustersic@gimb.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:samo.matjan@gimb.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gregor</md:GivenName>
-    <md:SurName>Anželj</md:SurName>
-    <md:EmailAddress>mailto:gregor.anzelj@gimb.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Samo</md:GivenName>
-    <md:SurName>Matjan</md:SurName>
-    <md:EmailAddress>mailto:samo.matjan@gimb.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Samo</md:GivenName>
-    <md:SurName>Matjan</md:SurName>
-    <md:EmailAddress>mailto:samo.matjan@gimb.org</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 676b7451..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gisela-gw.ct.infn.it/shibboleth">
-  <md: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>
-  </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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">GISELA Science Gateway</md:ServiceName>
-      <md: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
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Diego</md:GivenName>
-    <md:SurName>Scardaci</md:SurName>
-    <md:EmailAddress>mailto:diego.scardaci@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8337d484..00000000
--- a/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml
+++ /dev/null
@@ -1,131 +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://gisela-gw.ct.infn.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-21T17:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-      <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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gisela-gw.ct.infn.it/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://gisela-gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
-        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
-        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
-        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
-        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
-        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
-        <ds:KeyName>www.chain-project.eu</ds:KeyName>
-        <ds:KeyName>www.special-project.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
-                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
-                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
-                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
-                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
-                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
-                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
-                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
-                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
-                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
-                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
-                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
-                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
-                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
-                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
-                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
-                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
-                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
-                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
-                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
-                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
-                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
-                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
-                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">GISELA Science Gateway</md:ServiceName>
-      <md: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
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GISELA Science Gateway provided by INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">GISELA Science Gateway erogato da INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Diego</md:GivenName>
-    <md:SurName>Scardaci</md:SurName>
-    <md:EmailAddress>mailto:diego.scardaci@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 dbf58db0..00000000
--- a/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gitlab-dev.in2p3.fr/sp">
-  <md: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:AttributeValue>https://federation.renater.fr/category/preprod</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IN2P3 - Gitlab dev</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://gitlab-dev.in2p3.fr/</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab-dev.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gitlab-dev.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">IN2P3 - Gitlab dev</md:ServiceName>
-      <md:ServiceName xml:lang="en">IN2P3 - Gitlab dev</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs (instance de test).</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates (test instance).</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="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="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="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CNRS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CNRS</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dsi.cnrs.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>webmaster@in2p3.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d9f37338..00000000
--- a/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.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://gitlab.in2p3.fr/sp">
-  <md: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:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IN2P3 - Gitlab</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://gitlab.in2p3.fr/</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gitlab.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">IN2P3 - Gitlab</md:ServiceName>
-      <md:ServiceName xml:lang="en">IN2P3 - Gitlab</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates.</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="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="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CNRS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CNRS</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dsi.cnrs.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>webmaster@in2p3.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 149e3d02..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gn-vho.grnet.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">gn-vho.grnet.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://gn-vho.grnet.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gn-vho.grnet.gr/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gn-vho.grnet.gr/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">gn-vho.grnet.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gn-vho.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gn-vho.grnet.gr: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">GRNET Virtual Home Organization (VHO) for GÉANT</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GRNET Virtual Home Organization (VHO) for GÉANT</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Εικονικός Οικείος Φορέας (VHO) του ΕΔΕΤ για το GÉANT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.noc.grnet.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Greek Research and Technology Network</md:Company>
-    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-    <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Greek Research and Technology Network</md:Company>
-    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 3001817d..00000000
--- a/swamid-interfederations-2.0/goto-prod.sbs.ox.ac.uk-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://goto-prod.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Said Business School GOTO production" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T12:26:13Z"/>
-  </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://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAMAONeRqTU2xMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmdvdG8tcHJvZC5zYnMub3guYWMudWswHhcNMTIxMjEyMDgxMDExWhcNMjIx
-						MjEwMDgxMDExWjAhMR8wHQYDVQQDExZnb3RvLXByb2Quc2JzLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0OE96RgaUQaT5/T2QJyauFFB
-						aK3eWXF4S9ortfE06ofcp3JIvqPzSoxQ2IHMzQpXEmy7fGIKgusCXpjUAtgbRFrP
-						oK4DGCS2E8HmP1PryKj6UTpj7HBR+2kJ8JCVCslOEsLvjPQRjNDliZ2wvr8bw7+H
-						NnAQ1GmObjVHp7Mm4aY7TzJ5oKI1GZTV7nyhWvQATS3qdGLYvgNm86gAi1GTKIwv
-						qbon2bBRs96HYzH+BtPObBl1HJwjCXSACRHGxG4l5TBy0bde/9vp+O3rqjDrspxt
-						om6j5N5xenRhZyaY9UGpGsTpU8P4MfWjeRe5UG2IfCYAvafvHfc499lhPSXwIwID
-						AQABo0QwQjAhBgNVHREEGjAYghZnb3RvLXByb2Quc2JzLm94LmFjLnVrMB0GA1Ud
-						DgQWBBSeowx6+U31cl0vAiB9QBPLDyzoGzANBgkqhkiG9w0BAQUFAAOCAQEAucxx
-						6svK/sfjLoJN1yvVw1fOUkeIWJQ5cxvINN2S6VrifOxYnODAGPKmMluQZSA/veco
-						+2YrAbpGCftbZhUK1h2TAupy7/Kob6dpqaPfpiZTL2mWFUUShHapyZQzV6U2qtjU
-						ZBkzwMpBcaqQFRDo17qrebrskP7Baw6G4Z7p5PEVxzkvsecryOKEbZ+umu0tJkIU
-						X07ML5IKwkPS9TgHu5K1N9fP8H143PPO4xbc1HOLN+EjTM7v4lbebDaR0mbq4Pf1
-						kUtULGLhBnRXk4+7BNARn1XTkVz5pm8paytoEuj0XaICV1XFBFRjuioehkZsDzlg
-						qGeMk89a5KytkMHT/g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://goto-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School GOTO production</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Aaron</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 12a8d750..00000000
--- a/swamid-interfederations-2.0/goto-test.sbs.ox.ac.uk-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://goto-test.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Said Business School GOTO test" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T12:26:27Z"/>
-  </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://goto-test.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAK4NFQlrOPTZMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmdvdG8tdGVzdC5zYnMub3guYWMudWswHhcNMTIxMjEyMDgwOTUxWhcNMjIx
-						MjEwMDgwOTUxWjAhMR8wHQYDVQQDExZnb3RvLXRlc3Quc2JzLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwN78tIqm1HaRSzAbBC57G0Rn
-						sd3H7OjbdoNWvY+LpLsVnsCRAzhMzty4gtLeKooTBI2bVNTpQOIXaINWpvZWk2qM
-						hRrykAdzLZd25li6AJAPRgy6KwS0kE3KvzaSLoC755RSChxtT82tZgX3g+eTY9//
-						4qVakTe+RfjWrx/VwHTJUSPJ36LiG6UhU7pMMYbkccxa5U3fpIRCyWdRDH2T8Rdx
-						LB1JpwHW8q4pUbHQphaRevJLu4mPdf6NxvCNnTAfDylpo5WGzL901fMBdZjrC9Xh
-						wyRLFzhQ0LlN1k9fohiO0NDIS5nTja/Ve8dTf7GdDLE+QQY2bZ63Qi6ip4ltBQID
-						AQABo0QwQjAhBgNVHREEGjAYghZnb3RvLXRlc3Quc2JzLm94LmFjLnVrMB0GA1Ud
-						DgQWBBRKKlFeaR+LtgyfVmnGIuR5P+IUOTANBgkqhkiG9w0BAQUFAAOCAQEAq2lB
-						FuRq1gW83y/NJwZeWj098TSXPD+3s7PdnUTZq5PDGLubx1Xl+aWkC07x6Q+uLgmz
-						WKjR8jZl9eQR4T0hKu4+pzcQ+tdG/+AUTArHSFQj0r7J2yolKDzDOYsm8jL6IODs
-						yZedsc//NYUn+880r3gWA4xpIGpp66ONXSCCBcGNnnNI/q6SqmF4oiChJEMqnNyg
-						3Z81IFG5BwddG3DMmaif787Zi5cKeZWv4JjiHz6d4GF+nfNmF0Zjn77dfbnTbu0V
-						BRfD+J+9Fiemupo5x2aW+XZ06Hrfd56MJbyEZkEB5c+JRfD+RxxkTQemwQsAeoQ2
-						w7NRClEZf+d10tzZmg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://goto-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School GOTO test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Aaron</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/goto.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ee456ac6..00000000
--- a/swamid-interfederations-2.0/goto.sbs.ox.ac.uk-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://goto.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Said Business School GOTO" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T12:25:58Z"/>
-  </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://goto.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+jCCAeKgAwIBAgIJAMmSuBKQmM1rMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWdvdG8uc2JzLm94LmFjLnVrMB4XDTEyMTIxMjA3NTc1NFoXDTIyMTIxMDA3
-						NTc1NFowHDEaMBgGA1UEAxMRZ290by5zYnMub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDQ+u2W+HEKK/t0hZ3j6LQRIoj5YJDVw5Uz/Nrk
-						GsWLQf5NgXca0FggN4/MuT5wBOt11knZcqkroo9eTd5+JXYVKq8FNFLHcBm7F/D2
-						JMEofQssbW3jAfC5Ih9ns7dxWRPlQIyy747Czj5QeYgsd3VwxTCTmImet8QcczuE
-						60qUZwE57QYia1EbuQelVkFQaQFfObAlCp+z4zDbd5S4yqF+9KJIGgYgKSM5BGr0
-						TUILXxGKNwSV2W34nCGq7uyVbnKlQ/oNibOvc7kJD73QyRVQF9hJsEwCqR/Ie+xq
-						YlSMf7+oreYt6tBfAbsSYyMD/Yqj/3dGqAEmrqgsrummjnPZAgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEWdvdG8uc2JzLm94LmFjLnVrMB0GA1UdDgQWBBS4YdkEzNKVMvr3
-						16Wgs7zbMgV5+zANBgkqhkiG9w0BAQUFAAOCAQEAYRhCCsoR4ju1QbL51GKTmwOW
-						Qcc4Gx4bAu+ICEYHf65bbuY9H3LgwM7DIC+2iF9lyldaDO1VftBT2t5LFi6uoEU6
-						i1X6ArIXbiMBw/zmZVKSZnClBY/X5QkeDg+tA3FnDQ45WWXlukyx3DUThr1qne1A
-						sL1zu3tS/jg10A9ZTy6rgtNln6r/Zaumc7jQnRSv8zYICghX6YQHxaznQkBG4RYY
-						ieWFGVN7lSw52O0YCd9DwGNg44HuTea+hE/XIkqx0LNcEGtmuJsqVGZv9yKykY0B
-						iYcth/iCOH/Jh/+w1+VW3sZV3mKLQDT80uDGsCDg3LGDBpY95xQAek9MapwQ4w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://goto.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School GOTO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Aaron</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gotodev.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/gotodev.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c3dca188..00000000
--- a/swamid-interfederations-2.0/gotodev.sbs.ox.ac.uk-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://gotodev.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "SBS GOTO development server" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-09T14:48:02Z"/>
-  </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://gotodev.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEYjCCA0qgAwIBAgIJAMxRpN+bfVZcMA0GCSqGSIb3DQEBBQUAMIGxMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxHTAbBgNVBAsTFFNhaWQgQnVz
-						aW5lc3MgU2Nob29sMR0wGwYDVQQDExRnb3RvZGV2LnNicy5veC5hYy51azEeMBwG
-						CSqGSIb3DQEJARYPaXRAc2JzLm94LmFjLnVrMB4XDTEyMTEwNjEzNDc0MloXDTIy
-						MTExNDEzNDc0MlowgbExCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGly
-						ZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9y
-						ZDEdMBsGA1UECxMUU2FpZCBCdXNpbmVzcyBTY2hvb2wxHTAbBgNVBAMTFGdvdG9k
-						ZXYuc2JzLm94LmFjLnVrMR4wHAYJKoZIhvcNAQkBFg9pdEBzYnMub3guYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMUo3kXqzjNhZ47wpN836R
-						JRjPTKNjkrrT99lDQCgkUQWrQCiX5q0MWU3EfkeTUv5kvtNiA/ud+bFWSk+u2Mr0
-						HXjFzDLo3uHMNWGOhY8gcUpYrfT2SSDZ/G5U3mdC+lFAhZGxi8aMMTzzbPtlw/cf
-						uJrJ2XuKHhGCZAk37v+aszDsMwK6T7O2EDNeLHhD/2UKdt15tsRjL351ynf0oNUZ
-						QFkwBwtCc4o3DeFI44v0FbWhMVU4h+zi8ShybiyIMwE0hjijlk9o9wZPEk77SCRG
-						tKZ18k0prKpsU/R/kiWGA6oUmKGpGdohOAgY5hp6bK/1XMHAFvU8NRbvhbunEIml
-						AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu
-						ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRbIHw8+hvh5bg/mOK4XN1rQ4ZG
-						TzAfBgNVHSMEGDAWgBRbIHw8+hvh5bg/mOK4XN1rQ4ZGTzANBgkqhkiG9w0BAQUF
-						AAOCAQEAbfdWWFYJrdAjMzQrJX5yOtLb/EhBp1tV0UxYZtqFW639rjOs6KcqUXn2
-						Fox/NxmjR1JmKu90xrZvzAH8J/pAzzViNVIpu8e/TlPOcecCQb88trfPTE2LpJaq
-						kwn1+rFTwV1IibpmG9nkZ70yrLly8gAkeDcnU4THkUG6Qk9c1F+92tgxAhEPjBCy
-						9CfllJl01IvvzuZbpWjnCPNDiSntlhIda9zxiLtQyKjigEJwdaIP13bRZQ4108Xf
-						+Z624SIh+fsdncCNJ0L2KckxNe6p4Ji6TtHJoLdaS3fwj5fL0uuyxGbEd4bjTbYb
-						MGkV0HZLEY8UU6+u3JprQ4btOSl4ig==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gotodev.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SBS GOTO development server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Woods</SurName>
-    <EmailAddress>mailto:andrew.woods@sbs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Woods</SurName>
-    <EmailAddress>mailto:andrew.woods@sbs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml b/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml
deleted file mode 100644
index 46e9d55a..00000000
--- a/swamid-interfederations-2.0/gracedb.ligo.org-shibboleth-sp.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gracedb.ligo.org/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://gracedb.ligo.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Gravitational-wave Candidate Event Database</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GraceDB organizes candidate events from gravitational-wave searches and provides an environment to record information about follow-ups. </mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://gracedb.ligo.org/SPInfo</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://gracedb.ligo.org/SPPrivacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIJAPkWkyNL3l8nMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEGdyYWNlZGIubGlnby5vcmcwHhcNMTQxMDIwMTUyODQ2WhcNMjQxMDE3MTUy
-ODQ2WjAbMRkwFwYDVQQDExBncmFjZWRiLmxpZ28ub3JnMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA/o9eGY4UWkqL2GhIryXEpNAqqXTEJnEVv7zaV62o
-DDiDbYEZdYkd9r9wuKtDO7t1OqHE98BrvcOZI+2Yu4REUm6I0MSsdtQTDr5SUfAe
-aS6C1XS1hg1b+IMeRBOVunmdGYGPqOjBkQ32MhPFPyJ57DFTfEYiSAI16kMJH2xe
-cw/sbnJt0+0x6zL9O4sGUM3BKHeFh2n6Z7lV8rrDR/5pJAAD7Ida4bSNCe7ovuWJ
-XIgWdxskeqOuZT45biPEjT+UGTfZG7jEzMc2IXBBg55sIFSihv6utwGpD43jX3ex
-Hl9opHgB1djMdK3rOsBQbI2um+ssrMqtL3RArd7u3YF6SwIDAQABo2YwZDBDBgNV
-HREEPDA6ghBncmFjZWRiLmxpZ28ub3JnhiZodHRwczovL2dyYWNlZGIubGlnby5v
-cmcvc2hpYmJvbGV0aC1zcDAdBgNVHQ4EFgQU/oULXvyKrAjzat8Uex0YHjAZCWow
-DQYJKoZIhvcNAQEFBQADggEBAPgDTXaELegbLw3Zf7/BE/NCjjGNrX6Cj6wqkp98
-1KT886B7bDlCdmiPDLXgok3oI67+Flk1PFw9r8KFYkZOgB2EPKYLsUTUg+yH8NSe
-b6H/iq+ziJOQmnSZWvx/d88xTkOF4aEP1f0hQOXt3ElmZldgQfCCteVLLbhSF5D0
-RmuXgPAZEv19nTEdQKEFyx9iFmdOFc7/IKQdPQWVriSBzJRdc7dl1+RnUzZ2hsY3
-1BLiz9m09Au4/VVc1Sc4h8k5rs2+SWmAOk1Zob2yKKzdLwxuiCExg6XHgWSR/xgs
-2K9d1rqY3G7AQFM+zmhbRzIA18x4oVi4gTckD5Uxq1e0pdw=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gracedb.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gracedb.ligo.org/lvem_view/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Gravitational-wave Candidate Event Database</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">GraceDB organizes candidate events from gravitational-wave searches and provides an environment to record information about follow-ups. </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Warren Anderson</md:GivenName>
-    <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Branson Stephens</md:GivenName>
-    <md:EmailAddress>branson.stephens@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LIGO Identity Management Help Desk</md:GivenName>
-    <md:EmailAddress>rt-auth@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LIGO Security Committee</md:GivenName>
-    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/grnetbox.cti.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/grnetbox.cti.gr-idp-shibboleth.xml
deleted file mode 100644
index 48d39bd6..00000000
--- a/swamid-interfederations-2.0/grnetbox.cti.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grnetbox.cti.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">cti.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CTI "Diophantus" - Research Unit 6</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">ΙΤΥΕ "Διόφαντος" - Ερευνητική Μονάδα 6</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Computer Technology Institute and Press "Diophantus" - Research Unit 6</mdui:Description>
-        <mdui:Description xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος" - Ερευνητική Μονάδα 6</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://ru6.cti.gr</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://ru6.cti.gr</mdui:InformationURL>
-        <mdui:Logo height="71" width="80" xml:lang="en">https://grnetbox.cti.gr/cti_en_logo_80x71.png</mdui:Logo>
-        <mdui:Logo height="71" width="80" xml:lang="el">https://grnetbox.cti.gr/cti_el_logo_80x71.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>ru6.cti.gr</mdui:DomainHint>
-        <mdui:IPHint>150.140.141.26/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:38.284662,21.787677</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>
-                            MIIEmDCCA4CgAwIBAgIQSX8yHXzz9hg6XdP2oR84WzANBgkqhkiG9w0BAQsFADBk
-                            MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-                            QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-                            Q0EgMjAeFw0xNTA2MTIwMDAwMDBaFw0xODA2MTEyMzU5NTlaMD0xITAfBgNVBAsT
-                            GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPZ3JuZXRib3guY3Rp
-                            LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvh1mFzC0BCzWiG9B
-                            MBSX1oyHASuxGJ7JlIu0CfupqiUMEZrv26LBvHaUpLdT0cnSmm8wBClMobW+EYzV
-                            ZCxVPsS44g1QgBoaKhr0Zx56ZwR5Nm3TKt0rOQU8cvXNlnqhF7cDxj6sZQ747h7A
-                            XgEPx864oLKZsvZhHT4b2V1xVpQbB5KwyoJSiSzUUyTmIiARaQPXB4v08DiPDjxj
-                            IntgROorBHhhXG0LPnOfYaPiovMtZTILPRxj0R1U9NmBLXJaf5NqVHH0KX4x385x
-                            BBsx5j4rqu/4zF0j8ivEPad7pI55JlDEAmMrsnHx6xzrYzRW/cbUFzK4/dhbksVl
-                            azynjQIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
-                            tr0wHQYDVR0OBBYEFOu/WQYZrIY3FViO4CTF0t51QM+2MA4GA1UdDwEB/wQEAwIF
-                            oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-                            BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-                            LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
-                            BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
-                            LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
-                            c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2dybmV0Ym94LmN0aS5ncjANBgkqhkiG
-                            9w0BAQsFAAOCAQEALVhk2th0HUwzvv0z1C3Y5IpKKmJMbfJ2Kxe3m9iw/OF9xveK
-                            uMNBOSrh0pdxlzW4kJMhRrjS9J00OIQmoEcz3CrhtVYdqoOGvYkWfbsoGc/8aQR9
-                            cmrXD9TXYjUQij1JhwWjFkbEvZI3QAhREZaLRJWW0SNQjUANEumCaKwn9ffVlfnA
-                            xofVBaBLaXLx3rFL4zY5X86wbG3FoM7Vh8D2ueHefKyNAIMr+bhU/SO9wuMrfSq/
-                            fXoID3F8cXkL2t042ksY1Qq4jON+NiYnJuTFfNNVUv1HRvF5dSEvQqL967qrloGh
-                            rGgcng6u119aLlR16giDPrK1sqcjTM2nALu/bA==
-                            
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grnetbox.cti.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grnetbox.cti.gr: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://grnetbox.cti.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grnetbox.cti.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://grnetbox.cti.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grnetbox.cti.gr/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">cti.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEmDCCA4CgAwIBAgIQSX8yHXzz9hg6XdP2oR84WzANBgkqhkiG9w0BAQsFADBk
-                            MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-                            QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-                            Q0EgMjAeFw0xNTA2MTIwMDAwMDBaFw0xODA2MTEyMzU5NTlaMD0xITAfBgNVBAsT
-                            GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPZ3JuZXRib3guY3Rp
-                            LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvh1mFzC0BCzWiG9B
-                            MBSX1oyHASuxGJ7JlIu0CfupqiUMEZrv26LBvHaUpLdT0cnSmm8wBClMobW+EYzV
-                            ZCxVPsS44g1QgBoaKhr0Zx56ZwR5Nm3TKt0rOQU8cvXNlnqhF7cDxj6sZQ747h7A
-                            XgEPx864oLKZsvZhHT4b2V1xVpQbB5KwyoJSiSzUUyTmIiARaQPXB4v08DiPDjxj
-                            IntgROorBHhhXG0LPnOfYaPiovMtZTILPRxj0R1U9NmBLXJaf5NqVHH0KX4x385x
-                            BBsx5j4rqu/4zF0j8ivEPad7pI55JlDEAmMrsnHx6xzrYzRW/cbUFzK4/dhbksVl
-                            azynjQIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
-                            tr0wHQYDVR0OBBYEFOu/WQYZrIY3FViO4CTF0t51QM+2MA4GA1UdDwEB/wQEAwIF
-                            oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-                            BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-                            LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
-                            BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
-                            LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
-                            c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2dybmV0Ym94LmN0aS5ncjANBgkqhkiG
-                            9w0BAQsFAAOCAQEALVhk2th0HUwzvv0z1C3Y5IpKKmJMbfJ2Kxe3m9iw/OF9xveK
-                            uMNBOSrh0pdxlzW4kJMhRrjS9J00OIQmoEcz3CrhtVYdqoOGvYkWfbsoGc/8aQR9
-                            cmrXD9TXYjUQij1JhwWjFkbEvZI3QAhREZaLRJWW0SNQjUANEumCaKwn9ffVlfnA
-                            xofVBaBLaXLx3rFL4zY5X86wbG3FoM7Vh8D2ueHefKyNAIMr+bhU/SO9wuMrfSq/
-                            fXoID3F8cXkL2t042ksY1Qq4jON+NiYnJuTFfNNVUv1HRvF5dSEvQqL967qrloGh
-                            rGgcng6u119aLlR16giDPrK1sqcjTM2nALu/bA==
-                            
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grnetbox.cti.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grnetbox.cti.gr: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">Computer Technology Institute - Research Unit 6</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών - Ερευνητική Μονάδα 6</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Computer Technology Institute - Research Unit 6</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών - Ερευνητική Μονάδα 6</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://ru6.cti.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://ru6.cti.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Greek Research and Technology Network</md:Company>
-    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-    <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml
deleted file mode 100644
index 130765be..00000000
--- a/swamid-interfederations-2.0/grnetbox.duth.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grnetbox.duth.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">duth.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Democritus University of Thrace</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Δημοκρίτειο Πανεπιστήμιο Θράκης</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.duth.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.duth.gr/</mdui:InformationURL>
-        <mdui:Logo height="69" width="156">https://utopia.duth.gr/images/duth_logo_156x69.png</mdui:Logo>
-        <mdui:Logo height="64" width="64">https://utopia.duth.gr/images/duth_logo_64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>duth.gr</mdui:DomainHint>
-        <mdui:IPHint>192.108.114.0/24</mdui:IPHint>
-        <mdui:IPHint>83.212.128.0/19</mdui:IPHint>
-        <mdui:IPHint>83.212.160.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:648:2e80::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:41.136504, 25.372488</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>
-                            MIIF/TCCBWagAwIBAgIBBzANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCR1Ix
-                            LjAsBgNVBAoTJUdyZWVrIFJlc2VhcmNoIGFuZCBUZWNobm9sb2d5IE5ldHdvcmsx
-                            LzAtBgNVBAMTJkdSTkVUIEdybmV0Ym94IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-                            MR4wHAYJKoZIhvcNAQkBFg9jYUBub2MuZ3JuZXQuZ3IwHhcNMTAwMTI3MTMxMDAw
-                            WhcNMTUwMTI2MTMxMDAwWjBYMQswCQYDVQQGEwJHUjEuMCwGA1UEChMlR3JlZWsg
-                            UmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEZMBcGA1UEAxMQZ3JuZXRi
-                            b3guZHV0aC5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnj3Hsi
-                            yckz+IisKeI8KCCapb42qNVJ3qEm26dLQcSfz9EGL955L6dhlqEdsdtviml6to9w
-                            sVV/EgzZNw+9zGDD33Qbq770RCrGwj47VkTeN20ECB06PW0qUVZuYwL3D0jeq09U
-                            65MXFa0W3DinYGlH/0kj0NrYNutKqspQXgxj587CfiQEvNf52W3HYhI46ZpdafUZ
-                            txOGd6f33kFFtchkfs1K7WXNI2Myr18kWsGn+8UZdSrv6HRn3cx8KqDP23C4WeAa
-                            9CWqZCd0mQ9x7CTtpaGdptRrUKeaL7zmo/c7aGhbHyXnDszP+/GkbvFAsqqrgqFF
-                            b0qEEL7oTXrn7AECAwEAAaOCAxowggMWMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4
-                            QgEBBAQDAgbAMIGPBglghkgBhvhCAQ0EgYEWf1RoaXMgY2VydGlmaWNhdGUgaXMg
-                            c3ViamVjdCB0byBHcmVlayBsYXdzIGFuZCBHUk5FVCdzIENQUyBhbmQgbXVzdCBv
-                            bmx5IGJlIHVzZWQgZm9yIEFjYWRlbWljLCBSZXNlYXJjaCBvciBFZHVjYXRpb25h
-                            bCBwdXJwb3Nlcy4wHQYDVR0OBBYEFOcrove1OrOCKMabX2D9cx4TP0IXMIG7BgNV
-                            HSMEgbMwgbCAFAoZMZ2th54nXoq9jp6+4FZvEvnPoYGUpIGRMIGOMQswCQYDVQQG
-                            EwJHUjEuMCwGA1UEChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0
-                            d29yazEzMDEGA1UEAxMqR1JuZXQgQ2VudHJhbCBDZXJ0aWZpY2F0aW9uIEF1dGhv
-                            cml0eSAyMDA5MRowGAYJKoZIhvcNAQkBFgtjYUBncm5ldC5ncoIBAzAgBgNVHSUB
-                            Af8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgTwMBsGA1Ud
-                            EQQUMBKCEGdybmV0Ym94LmR1dGguZ3IwPgYJYIZIAYb4QgECBDEWL2h0dHBzOi8v
-                            Y3JsdjEucGtpLmdybmV0LmdyL0dybmV0U2VydmVyc0NBLzIwMDkvMCMGCWCGSAGG
-                            +EIBBAQWFhRuc19yZXZva2VfcXVlcnkucGhwPzBPBglghkgBhvhCAQgEQhZAaHR0
-                            cDovL3d3dy5wa2kuZ3JuZXQuZ3IvZG9jdW1lbnRzL0dybmV0U2VydmVyc0NBLzIw
-                            MDkvQ1AxLjAuaHRtbDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6
-                            Ly9vY3NwLnBraS5ncm5ldC5nci8wSAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL2Ny
-                            bHYxLnBraS5ncm5ldC5nci9Hcm5ldFNlcnZlcnNDQS8yMDA5L2NybHYxLmNybDAN
-                            BgkqhkiG9w0BAQUFAAOBgQB2M+X92LGPeSzIHK32x2RCeo+j4tCazhkl7kSGd4NY
-                            eiWAYwH4cpOr5Xi0zLBG/vdCRuZGsRZgoRAeqMQO0mRhCSOK+s1APux6yDQLk+Yy
-                            pNBpS87jQzgaOP0J4JXKd+lcLNN+FYoA+PZX8zaPELVWTG1DYBK//D4qe0/GCAQt
-                            zg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.duth.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.duth.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.duth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.duth.gr/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">duth.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIF/TCCBWagAwIBAgIBBzANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMCR1Ix
-                            LjAsBgNVBAoTJUdyZWVrIFJlc2VhcmNoIGFuZCBUZWNobm9sb2d5IE5ldHdvcmsx
-                            LzAtBgNVBAMTJkdSTkVUIEdybmV0Ym94IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-                            MR4wHAYJKoZIhvcNAQkBFg9jYUBub2MuZ3JuZXQuZ3IwHhcNMTAwMTI3MTMxMDAw
-                            WhcNMTUwMTI2MTMxMDAwWjBYMQswCQYDVQQGEwJHUjEuMCwGA1UEChMlR3JlZWsg
-                            UmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEZMBcGA1UEAxMQZ3JuZXRi
-                            b3guZHV0aC5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMnj3Hsi
-                            yckz+IisKeI8KCCapb42qNVJ3qEm26dLQcSfz9EGL955L6dhlqEdsdtviml6to9w
-                            sVV/EgzZNw+9zGDD33Qbq770RCrGwj47VkTeN20ECB06PW0qUVZuYwL3D0jeq09U
-                            65MXFa0W3DinYGlH/0kj0NrYNutKqspQXgxj587CfiQEvNf52W3HYhI46ZpdafUZ
-                            txOGd6f33kFFtchkfs1K7WXNI2Myr18kWsGn+8UZdSrv6HRn3cx8KqDP23C4WeAa
-                            9CWqZCd0mQ9x7CTtpaGdptRrUKeaL7zmo/c7aGhbHyXnDszP+/GkbvFAsqqrgqFF
-                            b0qEEL7oTXrn7AECAwEAAaOCAxowggMWMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4
-                            QgEBBAQDAgbAMIGPBglghkgBhvhCAQ0EgYEWf1RoaXMgY2VydGlmaWNhdGUgaXMg
-                            c3ViamVjdCB0byBHcmVlayBsYXdzIGFuZCBHUk5FVCdzIENQUyBhbmQgbXVzdCBv
-                            bmx5IGJlIHVzZWQgZm9yIEFjYWRlbWljLCBSZXNlYXJjaCBvciBFZHVjYXRpb25h
-                            bCBwdXJwb3Nlcy4wHQYDVR0OBBYEFOcrove1OrOCKMabX2D9cx4TP0IXMIG7BgNV
-                            HSMEgbMwgbCAFAoZMZ2th54nXoq9jp6+4FZvEvnPoYGUpIGRMIGOMQswCQYDVQQG
-                            EwJHUjEuMCwGA1UEChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0
-                            d29yazEzMDEGA1UEAxMqR1JuZXQgQ2VudHJhbCBDZXJ0aWZpY2F0aW9uIEF1dGhv
-                            cml0eSAyMDA5MRowGAYJKoZIhvcNAQkBFgtjYUBncm5ldC5ncoIBAzAgBgNVHSUB
-                            Af8EFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgTwMBsGA1Ud
-                            EQQUMBKCEGdybmV0Ym94LmR1dGguZ3IwPgYJYIZIAYb4QgECBDEWL2h0dHBzOi8v
-                            Y3JsdjEucGtpLmdybmV0LmdyL0dybmV0U2VydmVyc0NBLzIwMDkvMCMGCWCGSAGG
-                            +EIBBAQWFhRuc19yZXZva2VfcXVlcnkucGhwPzBPBglghkgBhvhCAQgEQhZAaHR0
-                            cDovL3d3dy5wa2kuZ3JuZXQuZ3IvZG9jdW1lbnRzL0dybmV0U2VydmVyc0NBLzIw
-                            MDkvQ1AxLjAuaHRtbDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6
-                            Ly9vY3NwLnBraS5ncm5ldC5nci8wSAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL2Ny
-                            bHYxLnBraS5ncm5ldC5nci9Hcm5ldFNlcnZlcnNDQS8yMDA5L2NybHYxLmNybDAN
-                            BgkqhkiG9w0BAQUFAAOBgQB2M+X92LGPeSzIHK32x2RCeo+j4tCazhkl7kSGd4NY
-                            eiWAYwH4cpOr5Xi0zLBG/vdCRuZGsRZgoRAeqMQO0mRhCSOK+s1APux6yDQLk+Yy
-                            pNBpS87jQzgaOP0J4JXKd+lcLNN+FYoA+PZX8zaPELVWTG1DYBK//D4qe0/GCAQt
-                            zg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grnetbox.duth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grnetbox.duth.gr: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">Democritus University of Thrace</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Δημοκρίτειο Πανεπιστήμιο Θράκης</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Democritus University of Thrace</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Δημοκρίτειο Πανεπιστήμιο Θράκης</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.duth.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.duth.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Democritus University of Thrace NOC</md:Company>
-    <md:EmailAddress>noc@duth.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-25410-79200</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Democritus University of Thrace NOC</md:Company>
-    <md:EmailAddress>noc@duth.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-25410-79200</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
deleted file mode 100644
index bbfaa609..00000000
--- a/swamid-interfederations-2.0/grouper.idem.garr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,56 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper.idem.garr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-21T14:30:22Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUYTvnXW3b3991IXgqQUMkP+nhKqkwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAwwUZ3JvdXBlci5pZGVtLmdhcnIuaXQwHhcNMTUwMzMwMjIx
-MzAwWhcNMzUwMzMwMjIxMzAwWjAfMR0wGwYDVQQDDBRncm91cGVyLmlkZW0uZ2Fy
-ci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7913BgHLAXXvsj
-37Sg8o8tjoXNo/C13zueCqiIJKsu2qhpwiy7KpgLADpCzLFArgT0r/aup0saMFfx
-tUa8et39E0TfPwNBLeI77TUt7QE/NHtVwDph8d0ocizAxqJC1yhUMSuwDzRU/U5H
-Y1qGJ6NrmzYqG4dKNr5CC+FUhDfdSn/UJ8o95PLV7xkqpDCcXf2WVSSmGAlR1jDP
-rdE9PcfNSvNzA71EaYTdlUXr/MadlNFf7H7rgEyZwqHrIQGjizpcWsPrZW1k0ZlB
-pgLjZFK5w0lzcS5Qt0gjdYJvdmTlyt2AZ4XurrKGMaAFNc/004DMnQYG1EYxr0kr
-LoCQV3kCAwEAAaNvMG0wHQYDVR0OBBYEFPnHU6MSgDLEwrBmW9dmMwBp/YStMEwG
-A1UdEQRFMEOCFGdyb3VwZXIuaWRlbS5nYXJyLml0hitodHRwczovL2dyb3VwZXIu
-aWRlbS5nYXJyLml0L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQB6
-X8cCYmz+iKywoiMIlXxMGRXtACODRIWh8jdUqyJwUdHqvmSPnaHSjW41By4wZcFx
-GRwURHaJfFqpG6JMFbIIlBmmdroQ02vWWalA9bhShgBhbGiHbKw4Clma9n7jDFtT
-UTEYR6Riveae/n9/PYBQrFnrMTsoV/0ig20VI70bTyY4wBkTTJgwYNon+MpMGp34
-N34CsdueAafyNMLr+BdNqmDpbLUncKxGU0z56M5r1xD/oYpWzm3asUHqPuojtFlb
-KwS+Xn3HU5Hd928ljFR+l+62LhqN8zb5SaNCJkfDkGlZU0RZEAYAWq7v5mk3A5oh
-KYJMKvnMhrAnlcxegh90
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://grouper.idem.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Attribute Authority per IDEM by Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Attribute Authority for IDEM by Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IDEM</md:GivenName>
-    <md:SurName>Help</md:SurName>
-    <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml b/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml
deleted file mode 100644
index 82326a8b..00000000
--- a/swamid-interfederations-2.0/grouper.idem.garr.it-shibboleth.xml
+++ /dev/null
@@ -1,95 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://grouper.idem.garr.it/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-21T11:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://grouper.idem.garr.it/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://grouper.idem.garr.it/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IDEM Grouper SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IDEM Grouper SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Grouper SP for IDEM provided by GARR</mdui:Description>
-        <mdui:Description xml:lang="it">Grouper SP per IDEM fornito da GARR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://grouper.idem.garr.it/grouper-sp/en/info.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://grouper.idem.garr.it/grouper-sp/it/info.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://grouper.idem.garr.it/grouper-sp/en/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://grouper.idem.garr.it/grouper-sp/it/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="120" width="180">https://grouper.idem.garr.it/grouper-sp/grouper_logo_180x120.png</mdui:Logo>
-        <mdui:Logo height="32" width="32">https://grouper.idem.garr.it/grouper-sp/grouper_logo_32x32.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDAzCCAeugAwIBAgIJAIJNTw7flL9uMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGdyb3VwZXIuaWRlbS5nYXJyLml0MB4XDTE1MDMxODE0NDg0OVoXDTI1MDMx
-NTE0NDg0OVowHzEdMBsGA1UEAxMUZ3JvdXBlci5pZGVtLmdhcnIuaXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzwqbkYCC3F5+SSkaqTUQwaN/dwyYH
-j1k6Z7+30/hTSSerJF33Lofmq69EaSx2R+NpeZF6FjdoAIZouwrFsgnxfo1ToJCl
-AqFfq0at395CTrk1r0RHyAIN3o3H/mN9gu2asYGfAs7cPFDmIpy2Cm3wOObtu3YV
-ccqlcf8h3DS0iNtPyqoVzShfKE54E1QQLgl+QFFbxomMD2RJCTdexNG2oeOVLoDR
-AJeX6iRThsbMjcz0W+G94YixmHeJ3E1STgT71irMEtumbS4D/ow7HdVF0RKLIKob
-dfQ8ALPV1R1C1hM5xwy4JjzlurTl28ir9AL/pv14TOWxePs6ZuKcVkipAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFGdyb3VwZXIuaWRlbS5nYXJyLml0MB0GA1UdDgQWBBQ+
-1mQ9Sz4LMwDdtI2Fwcpc3NEuoTANBgkqhkiG9w0BAQUFAAOCAQEAOqe6gZCcoNW2
-8Z7hU0icrKnCx3llcCyWgX3yn1ef7zWeLy7wZGpKgOHQDbmdOaMa3vk4t0PeL7IP
-5dnmhxu15A5t+csMvTNTi5G4L3pl5vKg6Jv6V5n94UlS5sam+TtO4WPsJ8gyhIGu
-/CY+Sq/BPVs8Sy8quoTIfCtDJLYuK+rF1sHDtGlQ4dGnTWLYw4auGess8b3vxNkq
-EMA/9OGny/lSYy2Ihh97+m2w8lZPskio9dnC9BbWbiyGY5hjd1W50c6HVmR+b0fe
-ujg8dxgduViYDlu51BFyleoAxHhnauOlpFNzJuHMakCKv0riztIH3gAun7RPnFYF
-0Man4StZKw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <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#rsa-oaep-mgf1p"/>
-      <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/2009/xmlenc11#rsa-oaep"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper.idem.garr.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://grouper.idem.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">IDEM Grouper SP</md:ServiceName>
-      <md:ServiceName xml:lang="it">IDEM Grouper SP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Grouper SP for IDEM provided by GARR</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Grouper SP per IDEM erogato da GARR</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="surname" 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="commonName" Name="urn:oid:2.5.4.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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Grouper erogato da Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Grouper provided by Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IDEM</md:GivenName>
-    <md:SurName>Help</md:SurName>
-    <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/groupes-aa.renater.fr.xml b/swamid-interfederations-2.0/groupes-aa.renater.fr.xml
deleted file mode 100644
index d2332dfd..00000000
--- a/swamid-interfederations-2.0/groupes-aa.renater.fr.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://groupes-aa.renater.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-25T15:11:29Z">
-      <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>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">RENATER - Validation of the Authorization Service</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://groupes-aa.renater.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Authorization service based on Sympa group manager (Universalistes) and SAML Attributes Authorities.
-It allows virtual organizations (e.g. research communities) composed by people belonging to different institutions (i.e. managed by different referentials) to access to common resources (if authorization was granted) after having been authenticated by their respective institutions.
-This service will be in charge of authentication and provide accurate access control on a community's web resource (group defined in Sympa). This resource can therefore be hosted anywhere.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">RENATER - Validation du Service d'autorisation</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Service d'autorisation basé sur le gestionnaire de groupes Sympa (Universalistes) et les Attributes Authorities SAML.
-Il permet à des organisations virtuelles (VO, communautés de chercheurs) appartenant à des établissements différents (donc gérés dans des référentiels différents) d'accéder à des ressources communes (sur autorisation) après authentification auprès de leurs établissements respectifs.
-Ce service se chargera de l'authentification et permettra un contrôle d'accès fin sur une ressource Web d'une communauté (groupe défini dans Sympa) qui peut donc être hébergée n'importe où.</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>
-					      MIIC+jCCAeKgAwIBAgIJALBSjVtKCuQcMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWRhbW9uYS5yZW5hdGVyLmZyMB4XDTE0MDkyMjE0NDgxMVoXDTI0MDkxOTE0
-NDgxMVowHDEaMBgGA1UEAxMRZGFtb25hLnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDm5OyzbhKkpArqcqSUY0eMh62d8p+/Y0Cssiie
-Mb2tiETFm2GSssPWSKl8NdIKY31TnQT8kJesZLllfIuIHZAsw2vv3VNVQJsTbY8o
-indBepdVJWejKxgp80ylL9QDZhtz2dG6VJhtrypT45/f8rTtMfcIY1sN95FEigwZ
-GLXlEPTIH9r7U831DQDaOn5uR0jz+wO7bA+NvBGove4BkD1HJ4fkLWC9amSgQpan
-Lw0YJ5xgYpCDZk4y0oDQObd4oBVXb30+jr2vnYZFTTfM0mxTj5naDia6ez7rAQwv
-qViUwQE+Z+thInH6erNHF7G5LJA4u4PX2s/u3TSitQePs3IbAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEWRhbW9uYS5yZW5hdGVyLmZyMB0GA1UdDgQWBBQXqnecrfW7ivww
-4GfxSu1We4CLOjANBgkqhkiG9w0BAQUFAAOCAQEAeD8GgYq59YNJv1u9j7M5/j3O
-gmk1jxFrcCeH82qF4/eQPkqMwtOlWRi4EW7ZIQusnchXyllBtOBasQNmPBfjq0GX
-zALi3Sd8sLDODKa+rRoJzZs0V3mlRU6UaEHyXMlnrpv3yn92buVxjMpX6PXFlQbB
-+Aqsv8O0II4O/6eU+hDXSpZEQFUc6iRZ7fT4IXD5SHrbHDbAU0w7ZTknn3YlQglh
-B2xZ41JS1unwqh1+azyjNCYMn9P8UYanAOTDdycZqCOFASXGSkd+aCHWrHz1lVGo
-bGESZR7Tv0Rg476ex/x+VHEXmJZurlD9Sf7UAMbErhorRKPsfrReAuWpaqSJyw==
-
-					    </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>
-					      MIIC+jCCAeKgAwIBAgIJALBSjVtKCuQcMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWRhbW9uYS5yZW5hdGVyLmZyMB4XDTE0MDkyMjE0NDgxMVoXDTI0MDkxOTE0
-NDgxMVowHDEaMBgGA1UEAxMRZGFtb25hLnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDm5OyzbhKkpArqcqSUY0eMh62d8p+/Y0Cssiie
-Mb2tiETFm2GSssPWSKl8NdIKY31TnQT8kJesZLllfIuIHZAsw2vv3VNVQJsTbY8o
-indBepdVJWejKxgp80ylL9QDZhtz2dG6VJhtrypT45/f8rTtMfcIY1sN95FEigwZ
-GLXlEPTIH9r7U831DQDaOn5uR0jz+wO7bA+NvBGove4BkD1HJ4fkLWC9amSgQpan
-Lw0YJ5xgYpCDZk4y0oDQObd4oBVXb30+jr2vnYZFTTfM0mxTj5naDia6ez7rAQwv
-qViUwQE+Z+thInH6erNHF7G5LJA4u4PX2s/u3TSitQePs3IbAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEWRhbW9uYS5yZW5hdGVyLmZyMB0GA1UdDgQWBBQXqnecrfW7ivww
-4GfxSu1We4CLOjANBgkqhkiG9w0BAQUFAAOCAQEAeD8GgYq59YNJv1u9j7M5/j3O
-gmk1jxFrcCeH82qF4/eQPkqMwtOlWRi4EW7ZIQusnchXyllBtOBasQNmPBfjq0GX
-zALi3Sd8sLDODKa+rRoJzZs0V3mlRU6UaEHyXMlnrpv3yn92buVxjMpX6PXFlQbB
-+Aqsv8O0II4O/6eU+hDXSpZEQFUc6iRZ7fT4IXD5SHrbHDbAU0w7ZTknn3YlQglh
-B2xZ41JS1unwqh1+azyjNCYMn9P8UYanAOTDdycZqCOFASXGSkd+aCHWrHz1lVGo
-bGESZR7Tv0Rg476ex/x+VHEXmJZurlD9Sf7UAMbErhorRKPsfrReAuWpaqSJyw==
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groupes-aa.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groupes-aa.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">RENATER - Validation du Service d'autorisation</md:ServiceName>
-      <md:ServiceName xml:lang="en">RENATER - Validation of the Authorization Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Service d'autorisation basé sur le gestionnaire de groupes Sympa (Universalistes) et les Attributes Authorities SAML.
-Il permet à des organisations virtuelles (VO, communautés de chercheurs) appartenant à des établissements différents (donc gérés dans des référentiels différents) d'accéder à des ressources communes (sur autorisation) après authentification auprès de leurs établissements respectifs.
-Ce service se chargera de l'authentification et permettra un contrôle d'accès fin sur une ressource Web d'une communauté (groupe défini dans Sympa) qui peut donc être hébergée n'importe où.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Authorization service based on Sympa group manager (Universalistes) and SAML Attributes Authorities.
-It allows virtual organizations (e.g. research communities) composed by people belonging to different institutions (i.e. managed by different referentials) to access to common resources (if authorization was granted) after having been authenticated by their respective institutions.
-This service will be in charge of authentication and provide accurate access control on a community's web resource (group defined in Sympa). This resource can therefore be hosted anywhere.</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>support@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2840887f..00000000
--- a/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.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://groupes.france-bioinformatique.fr/sympa">
-  <md: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>
-    <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>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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:InformationURL xml:lang="fr">https://groupes.france-bioinformatique.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique</md:ServiceName>
-      <md:ServiceName xml:lang="en">Group service for the French Institute of BioInformatics</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique : 
--listes de diffusions
--wikis
--sondages
--planification de réunion</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Group service for the French Institute of BioInformatics :
--mailing lists
--wikis
--surveys
--meeting scheduler</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>support@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/groupes.renater.fr-sympa.xml b/swamid-interfederations-2.0/groupes.renater.fr-sympa.xml
deleted file mode 100644
index 996ec832..00000000
--- a/swamid-interfederations-2.0/groupes.renater.fr-sympa.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://groupes.renater.fr/sympa">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2012-02-01T11:45:56Z">
-      <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>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">RENATER - Universalistes</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://groupes.renater.fr/sympa</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">RENATER - Universalistes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Universalistes est le service de groupware de RENATER.
-
-Il permet aux utilisateurs de créer des groupes disposant des outils suivants :
-- liste de diffusion
-- wiki
-- prise de rendez-vous
-- sondage</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>
-					      MIICoTCCAgqgAwIBAgIJAPdDY8XfnR75MA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNV
-BAYTAkZSMRQwEgYDVQQKEwtHSVAgUkVOQVRFUjEbMBkGA1UEAxMSZ3JvdXBlcy5y
-ZW5hdGVyLmZyMB4XDTEyMDQwNDE1MTc1MloXDTMyMDMzMDE1MTc1MlowQDELMAkG
-A1UEBhMCRlIxFDASBgNVBAoTC0dJUCBSRU5BVEVSMRswGQYDVQQDExJncm91cGVz
-LnJlbmF0ZXIuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJGMhk8cQ8Ti
-g+xtLGz5Acg0KpRBndgzMvN4Tp1NAkh+C8+zUfFfiAErA4L7h1P1eeP34z9hXMVH
-BAKdOluSsMRpXeuFsFvw1H2wVrPdrAYWL4HEnhvvmHtUyt7r2+w0AMcoYmYovpJy
-YuLS05aTNRx/NqCaHENcJWjNePy1I7dVAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFGln
-RkCGn5XLH3Pc4q5jx0ysRGN2MHAGA1UdIwRpMGeAFGlnRkCGn5XLH3Pc4q5jx0ys
-RGN2oUSkQjBAMQswCQYDVQQGEwJGUjEUMBIGA1UEChMLR0lQIFJFTkFURVIxGzAZ
-BgNVBAMTEmdyb3VwZXMucmVuYXRlci5mcoIJAPdDY8XfnR75MAwGA1UdEwQFMAMB
-Af8wDQYJKoZIhvcNAQEFBQADgYEALwdiWiyOmhGyozhBa+lT0i+JFKpLJzQUilqI
-BixcuiH/bClNPNA0Rr3gNOlzl5uMxz0s1Dfp+M0mjf1+AgQ5i7Vu3vG2bh10xR9t
-slMraAvScqJOYoi798luASiH/LBBFUXHbPx4zk+JxNDTfXhat6OmWzi/Xld6nRry
-tRX99iQ=
-					    </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>
-					      MIICoTCCAgqgAwIBAgIJAPdDY8XfnR75MA0GCSqGSIb3DQEBBQUAMEAxCzAJBgNV
-BAYTAkZSMRQwEgYDVQQKEwtHSVAgUkVOQVRFUjEbMBkGA1UEAxMSZ3JvdXBlcy5y
-ZW5hdGVyLmZyMB4XDTEyMDQwNDE1MTc1MloXDTMyMDMzMDE1MTc1MlowQDELMAkG
-A1UEBhMCRlIxFDASBgNVBAoTC0dJUCBSRU5BVEVSMRswGQYDVQQDExJncm91cGVz
-LnJlbmF0ZXIuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJGMhk8cQ8Ti
-g+xtLGz5Acg0KpRBndgzMvN4Tp1NAkh+C8+zUfFfiAErA4L7h1P1eeP34z9hXMVH
-BAKdOluSsMRpXeuFsFvw1H2wVrPdrAYWL4HEnhvvmHtUyt7r2+w0AMcoYmYovpJy
-YuLS05aTNRx/NqCaHENcJWjNePy1I7dVAgMBAAGjgaIwgZ8wHQYDVR0OBBYEFGln
-RkCGn5XLH3Pc4q5jx0ysRGN2MHAGA1UdIwRpMGeAFGlnRkCGn5XLH3Pc4q5jx0ys
-RGN2oUSkQjBAMQswCQYDVQQGEwJGUjEUMBIGA1UEChMLR0lQIFJFTkFURVIxGzAZ
-BgNVBAMTEmdyb3VwZXMucmVuYXRlci5mcoIJAPdDY8XfnR75MAwGA1UdEwQFMAMB
-Af8wDQYJKoZIhvcNAQEFBQADgYEALwdiWiyOmhGyozhBa+lT0i+JFKpLJzQUilqI
-BixcuiH/bClNPNA0Rr3gNOlzl5uMxz0s1Dfp+M0mjf1+AgQ5i7Vu3vG2bh10xR9t
-slMraAvScqJOYoi798luASiH/LBBFUXHbPx4zk+JxNDTfXhat6OmWzi/Xld6nRry
-tRX99iQ=
-					    </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>
-					      MIICjzCCAfigAwIBAgIJANzMu0IV83S0MA0GCSqGSIb3DQEBBQUAMDoxCzAJBgNV
-BAYTAkZSMRAwDgYDVQQKEwdSRU5BVEVSMRkwFwYDVQQDExBiYWJlbC5yZW5hdGVy
-LmZyMB4XDTEyMDEzMTEwNDY1M1oXDTMyMDEyNjEwNDY1M1owOjELMAkGA1UEBhMC
-RlIxEDAOBgNVBAoTB1JFTkFURVIxGTAXBgNVBAMTEGJhYmVsLnJlbmF0ZXIuZnIw
-gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAORAbR40lHI9l3gICzBcydh2DdAW
-vAVzjyyDvhpaMUkAfYEp6lHOfqOC6f1JsGiu3bfWoZqTf1knW+95xnvuMiJAMY8C
-5P0hRgPIkiejYC7igm0JHAeFTya4hzY+ZJKkC/PY6mKZVzWfdBeLZhYozqXiG6Wt
-0x79EYxPbwqNRsxVAgMBAAGjgZwwgZkwHQYDVR0OBBYEFPSl1AwmOjcQTd/nF+F6
-rzkg2/SUMGoGA1UdIwRjMGGAFPSl1AwmOjcQTd/nF+F6rzkg2/SUoT6kPDA6MQsw
-CQYDVQQGEwJGUjEQMA4GA1UEChMHUkVOQVRFUjEZMBcGA1UEAxMQYmFiZWwucmVu
-YXRlci5mcoIJANzMu0IV83S0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-gYEAbA8HBZTvGmi1mANKgPKlknYAT9olC6wHuCZI5UHYxaoRv6lY6LA8BjeyFPWy
-xQ9lTeD31gYHQRlu9NxaKFTnay58By/PAkdRzZfpohXFCj2gTX2Vnd/of0F5+4mS
-OcnzyMjo+f3ngAPx/LMg/pxM21R1GzpaZeyz9ErgUvc8MJs=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groupes.renater.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groupes.renater.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">RENATER - Universalistes</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Universalistes est le service de groupware de RENATER.
-
-Il permet aux utilisateurs de créer des groupes disposant des outils suivants :
-- liste de diffusion
-- wiki
-- prise de rendez-vous
-- sondage</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>listmaster@groupes.renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gteavirtual.org.xml b/swamid-interfederations-2.0/gteavirtual.org.xml
deleted file mode 100644
index 9aa43c3b..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/guardian.otl.lstest.co.uk-shibboleth.xml b/swamid-interfederations-2.0/guardian.otl.lstest.co.uk-shibboleth.xml
deleted file mode 100644
index ec3a9c4a..00000000
--- a/swamid-interfederations-2.0/guardian.otl.lstest.co.uk-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://guardian.otl.lstest.co.uk/shibboleth">
-  <!--
-		This is a "MyConcern Demo Site" Shibboleth SP for One Team Logic Ltd.
-	-->
-  <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="2014-11-14T11:30:16Z">
-      <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://guardian.otl.lstest.co.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">MyConcern Demo Site</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The MyConcern Demo Site is used for demonstrations and IDP testing</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAIC+mVqksujcMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEmphY2tzb24ubHNkbC5sb2NhbDAeFw0xNDA2MTMwOTEyMTRaFw0yNDA2MTAw
-						OTEyMTRaMB0xGzAZBgNVBAMTEmphY2tzb24ubHNkbC5sb2NhbDCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBALvN/EIs7X3jeG1Nfb3z4p2DFAiu021Nkxax
-						mXWCxF04c+6E96orGzHsBAXyXX/p52mQTV97oMBxVCoA+NtKJxKlRZPAZ7b6myPe
-						IrS5qnclav1tc93LJTXnq7ebDx+YI3R1yf/7wAJMWkh9r7wJF6CTE7JblQ4oXzOt
-						0VuLvXg43BGBpgD5pG/WK986vMOlbjxIJvWH6MFtjKSokGhEItkxtYqapD5nPT96
-						HDrMfCIJLjR8e/dcM7m6GVgYjP5pOpcKlCC5QD+aTObTmXdDe7wxeEGdvyokGB/0
-						/dcv0ymilEjGVy/5Gc+MNcGyGeB/YeouHh/AobPUQOFIrfA1YHcCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISamFja3Nvbi5sc2RsLmxvY2FsMB0GA1UdDgQWBBRfX3iNqzGm
-						mRtsw9rVmqWuNGlvgzANBgkqhkiG9w0BAQUFAAOCAQEAV6T62R7NDAhoFJMYH331
-						t/ZG/zRF9d3g+1pVtEztUUJj8I3mzK3PX9xilRQF/usZdUAjR04BHxhRREuPSK0q
-						eEJzDJdLu6L35VHGxuXFblsb8nQ1tphszZSoUaB/6/k4Y3fSN9hRwWKnJMUAmW17
-						pdFmkeYsCt3ZPzSLCscM0p47vP0Wm75GKnx+iqt0PxTWhIRrvi99iUecxRdzeWFr
-						xk2uAecO5lDszLN0N8s7cUVs1q2Zt2+TGFOWlhMK7Wq6mVrWuK7BKHQ1GdtV9kjR
-						4LEDRGJXQIZvDkZioAwbvaqw4PfoGxlNv6COk+V829HOptvHV1a9va1bYRLA25eZ
-						1g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://guardian.otl.lstest.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://guardian.otl.lstest.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">One Team Logic Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MyConcern Demo Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oneteamlogic.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nick</GivenName>
-    <SurName>Bennett</SurName>
-    <EmailAddress>mailto:nick.bennett@logicsoftware.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Tucker</SurName>
-    <EmailAddress>mailto:ian.tucker@logicsoftware.co.uk</EmailAddress>
-  </ContactPerson>
-</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 f7cb9e8f..00000000
--- a/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/lists/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://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>
-      <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 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 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 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 Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Gravitational Wave Astronomy Community List Server</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community list server used to support collaboration across astronomy and astrophysics projects.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UWM CGCA Help</md:GivenName>
-    <md:EmailAddress>uwm-help@gravity.phys.uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Branson Stephens</md:GivenName>
-    <md:EmailAddress>stephenb@uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Warren Anderson</md:GivenName>
-    <md:EmailAddress>anders15@uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LIGO Scientific Collaboration Security Committee</md:GivenName>
-    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 80c6bc9a..00000000
--- a/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://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>
-      <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 Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService 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 Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Gravitational Wave Astronomy Community Registry</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" 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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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="givenName" Name="urn:mace:dir:attribute-def:givenName" 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="mail" Name="urn:mace:dir:attribute-def:mail" 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="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UWM CGCA Help</md:GivenName>
-    <md:EmailAddress>uwm-help@gravity.phys.uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Branson Stephens</md:GivenName>
-    <md:EmailAddress>stephenb@uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Warren Anderson</md:GivenName>
-    <md:EmailAddress>anders15@uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LIGO Scientific Collaboration Security Committee</md:GivenName>
-    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b74d98f1..00000000
--- a/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.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://gw-astronomy.org/wiki/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://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>
-      <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 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 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 Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/wiki/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Gravitational Wave Astronomy Community Wiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community wiki used to support collaboration across astronomy and astrophysics projects.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UWM CGCA Help</md:GivenName>
-    <md:EmailAddress>uwm-help@gravity.phys.uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Warren Anderson</md:GivenName>
-    <md:EmailAddress>anders15@uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LIGO Scientific Collaboration Security Committee</md:GivenName>
-    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Branson Stephens</md:GivenName>
-    <md:EmailAddress>stephanb@uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 13030d35..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw.ct.infn.it/shibboleth">
-  <md: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>
-  </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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Science Gateway to IGI </md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Science Gateway to IGI provided by INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Science Gateway to IGI erogato da INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 62e2b921..00000000
--- a/swamid-interfederations-2.0/gw.ct.infn.it.xml
+++ /dev/null
@@ -1,124 +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://gw.ct.infn.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-02T17:20:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-      <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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gw.ct.infn.it/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://gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
-        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
-        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
-        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
-        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
-        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
-        <ds:KeyName>www.chain-project.eu</ds:KeyName>
-        <ds:KeyName>www.special-project.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
-                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
-                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
-                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
-                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
-                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
-                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
-                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
-                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
-                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
-                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
-                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
-                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
-                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
-                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
-                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
-                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
-                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
-                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
-                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
-                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
-                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
-                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
-                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Science Gateway to IGI </md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Science Gateway to IGI provided by INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Science Gateway to IGI erogato da INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 dadb29ea..00000000
--- a/swamid-interfederations-2.0/haka.saimia.fi.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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>MIIEOzCCAyOgAwIBAgIQG5tFJqoAOg0tfJqHF23wQDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQG
-EwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTExMDUz
-MTEyNDYwNloXDTE0MDUzMDEyNDYwNlowgZsxCzAJBgNVBAYTAkZJMRUwEwYDVQQHDAxMYXBwZWVu
-cmFudGExKzApBgNVBAoMIkV0ZWxhLUthcmphbGFuIGtvdWx1dHVza3VudGF5aHR5bWExLzAtBgNV
-BAsMJlNhaW1hYW4gYW1tYXR0aWtvcmtlYWtvdWx1IElULXBhbHZlbHV0MRcwFQYDVQQDDA5oYWth
-LnNhaW1pYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANwog+tZrZLi7m6W7JZq
-ZiLb34PPi3zU76SRx24WWra9Ox8g6CTpdpaHoYC/vZ/XDQMbm2LD56Bey/8+krwx0o/exlPrqCTZ
-2M1A0WegCsqd16oc9+6/XjhWtAgXwLD6sqc0xhy+CCwRhyr9cWBVvvIaBoSkZ93Mjv7POmPruLwN
-fvnpa2gHIWjcSBuvWJmDWsUEtN0HcbfJiiEU1rpGFohkBOES0/bIcEfBNQqA60pdaZVZoWeALE1Y
-bGXc/M8cTXvTYeam24lB7rbso77VthVIocRjwVWU1n70Nw7+byD6lbDq7uFHQLe0q+quKgZiJzUE
-0+sl4YrIsv/NKC3oFr8CAwEAAaOB2zCB2DATBgNVHSMEDDAKgAhKoKpYhNNePDAZBgNVHSAEEjAQ
-MA4GDCsGAQQBgg8CAwEBAjByBgNVHR8EazBpMGegZaBjhmFsZGFwOi8vMTk0LjI1Mi4xMjQuMjQx
-OjM4OS9jbj1Tb25lcmElMjBDbGFzczIlMjBDQSxvPVNvbmVyYSxjPUZJP2NlcnRpZmljYXRlcmV2
-b2NhdGlvbmxpc3Q7YmluYXJ5MBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBTAKn7790r6
-rue5HERaCD9UIhaneDANBgkqhkiG9w0BAQUFAAOCAQEAQRcZw/94TbMLV12F00oMZy1dy9A6ds2v
-6Gc7DalfI4d2+0r4D9LTIG9Z4BHXYBiutnBgFPlN9dzzlEmaagARD/zFNgS9ytk9O/CJezSTXdhh
-iznhaKCwr2hx8u6vDCil6WZyIWDSg5kruK2T7e/1QaQOxEsTT5+hgUSIr9aZEa3iSVh+QxfWFlm6
-rxtt3+x31+aDvBWHF2OLR0EkuLYSsVZpB3+vZ26bGQQ1Xkz4zApdNrUgBuPtODNR/gc6mg2qvPxv
-r0N2fY6OHHOJvApQ3LnUu0FGgxC50zQ623Vcyxz8Y5sVbMQVkoSoOW2Yds0hVBXLPZyLrHEuarDE
-urebDA==</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>MIIEOzCCAyOgAwIBAgIQG5tFJqoAOg0tfJqHF23wQDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQG
-EwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTExMDUz
-MTEyNDYwNloXDTE0MDUzMDEyNDYwNlowgZsxCzAJBgNVBAYTAkZJMRUwEwYDVQQHDAxMYXBwZWVu
-cmFudGExKzApBgNVBAoMIkV0ZWxhLUthcmphbGFuIGtvdWx1dHVza3VudGF5aHR5bWExLzAtBgNV
-BAsMJlNhaW1hYW4gYW1tYXR0aWtvcmtlYWtvdWx1IElULXBhbHZlbHV0MRcwFQYDVQQDDA5oYWth
-LnNhaW1pYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANwog+tZrZLi7m6W7JZq
-ZiLb34PPi3zU76SRx24WWra9Ox8g6CTpdpaHoYC/vZ/XDQMbm2LD56Bey/8+krwx0o/exlPrqCTZ
-2M1A0WegCsqd16oc9+6/XjhWtAgXwLD6sqc0xhy+CCwRhyr9cWBVvvIaBoSkZ93Mjv7POmPruLwN
-fvnpa2gHIWjcSBuvWJmDWsUEtN0HcbfJiiEU1rpGFohkBOES0/bIcEfBNQqA60pdaZVZoWeALE1Y
-bGXc/M8cTXvTYeam24lB7rbso77VthVIocRjwVWU1n70Nw7+byD6lbDq7uFHQLe0q+quKgZiJzUE
-0+sl4YrIsv/NKC3oFr8CAwEAAaOB2zCB2DATBgNVHSMEDDAKgAhKoKpYhNNePDAZBgNVHSAEEjAQ
-MA4GDCsGAQQBgg8CAwEBAjByBgNVHR8EazBpMGegZaBjhmFsZGFwOi8vMTk0LjI1Mi4xMjQuMjQx
-OjM4OS9jbj1Tb25lcmElMjBDbGFzczIlMjBDQSxvPVNvbmVyYSxjPUZJP2NlcnRpZmljYXRlcmV2
-b2NhdGlvbmxpc3Q7YmluYXJ5MBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBTAKn7790r6
-rue5HERaCD9UIhaneDANBgkqhkiG9w0BAQUFAAOCAQEAQRcZw/94TbMLV12F00oMZy1dy9A6ds2v
-6Gc7DalfI4d2+0r4D9LTIG9Z4BHXYBiutnBgFPlN9dzzlEmaagARD/zFNgS9ytk9O/CJezSTXdhh
-iznhaKCwr2hx8u6vDCil6WZyIWDSg5kruK2T7e/1QaQOxEsTT5+hgUSIr9aZEa3iSVh+QxfWFlm6
-rxtt3+x31+aDvBWHF2OLR0EkuLYSsVZpB3+vZ26bGQQ1Xkz4zApdNrUgBuPtODNR/gc6mg2qvPxv
-r0N2fY6OHHOJvApQ3LnUu0FGgxC50zQ623Vcyxz8Y5sVbMQVkoSoOW2Yds0hVBXLPZyLrHEuarDE
-urebDA==</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">Yrkehogskola 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">Yrkehogskola 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 8a5d3593..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://halfback.cnaf.infn.it/casshib/app2">
-  <md: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>
-  </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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/SOAP"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/SOAP"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">IGI Grid Portal provided by INFN</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide</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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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"/>
-      <md:RequestedAttribute FriendlyName="localityName" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">IGI Grid Portal erogato da INFN</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">IGI Grid Portal provided by INFN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.infn.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.infn.it/indexen.php</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:igi-portal-admin@lists.italiangrid.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 235d4d14..00000000
--- a/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml
+++ /dev/null
@@ -1,90 +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://halfback.cnaf.infn.it/casshib/app2">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-10-23T09:45:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-      <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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/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://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>halfback.cnaf.infn.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=halfback.cnaf.infn.it,O=Istituto Nazionale di Fisica Nucleare,C=IT</ds:X509SubjectName>
-          <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/SOAP"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/SOAP"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">IGI Grid Portal provided by INFN</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide</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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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"/>
-      <md:RequestedAttribute FriendlyName="localityName" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">IGI Grid Portal erogato da INFN</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">IGI Grid Portal provided by INFN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.infn.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.infn.it/indexen.php</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>igi-portal-admin@lists.italiangrid.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/harper-adams.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/harper-adams.ac.uk-oala-metadata.xml
deleted file mode 100644
index a63ea203..00000000
--- a/swamid-interfederations-2.0/harper-adams.ac.uk-oala-metadata.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://harper-adams.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Harper Adams University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-13T13:06:17Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">harper-adams.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEAjCCAuoCCQDNHBk2GcsHfjANBgkqhkiG9w0BAQUFADCBwjELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgTClNocm9wc2hpcmUxEDAOBgNVBAcTB05ld3BvcnQxIDAeBgNV
-						BAoTF0hhcnBlciBBZGFtcyBVbml2ZXJzaXR5MR0wGwYDVQQLExRJbmZvcm1hdGlv
-						biBTZXJ2aWNlczEfMB0GA1UEAxMWaWRwLmhhcnBlci1hZGFtcy5hYy51azEqMCgG
-						CSqGSIb3DQEJARYbc29mdHdhcmVAaGFycGVyLWFkYW1zLmFjLnVrMB4XDTE0MDcy
-						MzE2NTk0MVoXDTI0MDcyMDE2NTk0MVowgcIxCzAJBgNVBAYTAkdCMRMwEQYDVQQI
-						EwpTaHJvcHNoaXJlMRAwDgYDVQQHEwdOZXdwb3J0MSAwHgYDVQQKExdIYXJwZXIg
-						QWRhbXMgVW5pdmVyc2l0eTEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMx
-						HzAdBgNVBAMTFmlkcC5oYXJwZXItYWRhbXMuYWMudWsxKjAoBgkqhkiG9w0BCQEW
-						G3NvZnR3YXJlQGhhcnBlci1hZGFtcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBALEONJ55wbiivBF8gwlBSeXD7Dj/fQIEYzghkwoB72twLO8t
-						WruKDBri6vZPmw+ghlF91JCyLrCci5BWqV7Bmy+OacuYFyVOoYUj9fwcRXDvDp8A
-						3aUHn0Hbv11SsHdR/d24zleK0L5TMN/h0XcGJqvod/suJwzniFY8/kvoZGHV1LQA
-						tPz3lhlmcnh1dtdVKt+lskVzhoylO7YOFIYoyxQEt1JclHAFfHwmhu1um3A3/6xY
-						n9IrMQUI4RDZgM97dFb1HcxWI+gAVXj/CFOeLBVLomVeuTj6SeUL9IYYFPRR1cdY
-						+PbsPtha5BuH3v4aNugdNN63gQRndk2/RtiDjVUCAwEAATANBgkqhkiG9w0BAQUF
-						AAOCAQEAQZJQOD87UQCXBk5JnTar9EKuoBApbvwMSyAIQ05PQPoSWaEeevFcN/1y
-						uxOEzWHfXoNjj1+88Y6CfSDShnpXZAXKacwaq1Aw6oCRZLhV5UZVN483s+Ca6DEF
-						FhQrDXkhfUIS5nd28ftvFaJ+KCSNNQX9F7ceWvY5osqU2rz1QdXN5eeIXYC4q151
-						ltkIk3Qy1uShE+B9c13u2PoaUZa4PcsBbympy7adBqF/W1kf9a9UF0NGpQ8UZ5/V
-						GhSMUg8KVy3+6yjCxLtd0T1O0Lz2AEfwD7I867d+Sj5jiy1R11reQZojvEW5PVmV
-						Fwo9FhtsbeJO4cy9AuY7t9MOXGA4/g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.harper-adams.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.harper-adams.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Harper Adams University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Harper Adams University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.harper-adams.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Curwen</GivenName>
-    <SurName>Thomas</SurName>
-    <EmailAddress>mailto:cthomas@harper-adams.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:servicedesk@harper-adams.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/hau.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index 6facaf17..00000000
--- a/swamid-interfederations-2.0/hau.idm.oclc.org-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://hau.idm.oclc.org/shibboleth">
-  <!--
-		This is an EZproxy SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-20T14:51:18Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEAjCCAuqgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMRswGQYDVQQDFBIqLmhh
-						dS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSgwJgYJ
-						KoZIhvcNAQkBFhlqYW1lcy5odXRjaGluc29uQG9jbGMub3JnMB4XDTEzMDYxOTEz
-						NDI0OVoXDTIzMDYxOTEzNDI0OVowYzEbMBkGA1UEAxQSKi5oYXUuaWRtLm9jbGMu
-						b3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEoMCYGCSqGSIb3DQEJARYZ
-						amFtZXMuaHV0Y2hpbnNvbkBvY2xjLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAL+VJNJG4tqZr20wvtzRlanUsfO1ABtqgQlFBYcD4DHqxHa/uCi9
-						rXpelbL/JA0VbfCImusX41lvY+lQmCit2KX1+3UxDcP7HEhifQS2GQeu4Mddfyyt
-						VIzWGB0Nf5rBATk8lZoQ7zQyICP9/829pxkVAhBh0jUy5u8dYNfftK+IZ5nO6CpW
-						TcySNz5jFUgYwIdwVFYUMaPqOLVeqe75LdHkrjdGcpKZGyfy1/sXVL/Ckq5sinhK
-						VNVH1ECU49lkO64gLbg/6/ySjDjayFzFB8mPSAtWrlQgujYkfxIeqTTxZ25HJtGA
-						eLcdYVL9qAz7G7BtvJRY6eOnN06d1F+rLmkCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
-						eOxbtlcwwkedaRnaoihkJ55Bn9QwgY0GA1UdIwSBhTCBgoAUeOxbtlcwwkedaRna
-						oihkJ55Bn9ShZ6RlMGMxGzAZBgNVBAMUEiouaGF1LmlkbS5vY2xjLm9yZzELMAkG
-						A1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxKDAmBgkqhkiG9w0BCQEWGWphbWVzLmh1
-						dGNoaW5zb25Ab2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAM+XxeKigNVAlRB9uju8MoJPMIyzGFl4//GuDmPwvPj28FHRziy2f38L2
-						UOua3OfllHjzY+rTCpuiC5FLKWDR/x4Zk6JNEC5NWZFszBhv5QK+T2qoa7ZqLdfL
-						aUOa+zIXkG9oqJv8V+cjvikl3y03GVPIJaSnqZ8ZqvZHUD6LTL1i6jbDmQS56B8w
-						Y20Exlm2l53EUtht3XyuABZiPmhAEly26MlvzWz4y6FkvVWAFph9aKwa1m+W5ZgD
-						KwXsAjQzn0TR9ccTAc0le+5wVW8BEqvJZOsF3ZJBB3G3zoss1E1y6bXkO5UOWRhz
-						MWGYa0Oj1hdjm0Tf2O/qQdfY6+X6Fw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.hau.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.hau.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.hau.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Harper Adams University Hosted EZProxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>OCLC UK Helpdesk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>OCLC UK Helpdesk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index e811c556..00000000
--- a/swamid-interfederations-2.0/havana.ucs.ed.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://havana.ucs.ed.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth test SP hosted by the University of Edinburgh
-		for the JANET(UK) JVCS booking system.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIID2DCCAsACCQDhpWXD/oCByTANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-						R0IxETAPBgNVBAgTCFNjb3RsYW5kMRIwEAYDVQQHEwlFZGluYnVyZ2gxJDAiBgNV
-						BAoTG1RoZSBVbml2ZXJzaXR5IG9mIEVkaW5idXJnaDEPMA0GA1UECxMGSVMtSVRJ
-						MRwwGgYDVQQDExNoYXZhbmEudWNzLmVkLmFjLnVrMSIwIAYJKoZIhvcNAQkBFhNt
-						Lm1jaW50b3NoQGVkLmFjLnVrMB4XDTEzMDczMDE0MDM1N1oXDTMzMDcyNTE0MDM1
-						N1owga0xCzAJBgNVBAYTAkdCMREwDwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJ
-						RWRpbmJ1cmdoMSQwIgYDVQQKExtUaGUgVW5pdmVyc2l0eSBvZiBFZGluYnVyZ2gx
-						DzANBgNVBAsTBklTLUlUSTEcMBoGA1UEAxMTaGF2YW5hLnVjcy5lZC5hYy51azEi
-						MCAGCSqGSIb3DQEJARYTbS5tY2ludG9zaEBlZC5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAK2yC2qIxgLO+wMp4SKVyKCDpwDurMHkZkkTSidQ
-						MtWLNgYwHezrL0m8iZKnCNEzT2R5i2w23aKtBkBpDqyLFWKHVGEj5O386T4AB1BL
-						NJ1uqL6tNf1tkTxIBpubWWKKE8XIM/lLoN/mRJ54f/2yxiqvzvImoWA+3Uz7fIpW
-						/kcfyDNnWInxPDkY65Jj7Ymd9L1bRvejIeMTkAwjMatA+astXHL/fepWEu7dvXCU
-						6Bhi95nmZTAw1dmiOCE7pfMYLM7Dn9yDNxTsk+pw0RQrEtFNoGPwxp68xJ2OmKmD
-						iIdxOp9Q0hm9KnnflTTMeGKFxsp+sjksdHh2M0N/h4JMAl8CAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEAUdniY6kaIwI0T6XxNTDUihAOwp2DAoEM/EaYRcR6DrxarzIu
-						1UbxqKRkavje+s9HO8iiFPwpLM7fnksxBAnaeNTveH7hgvJ67ELGmTd303yf7FaY
-						PpB7VX5d95seuSYqedgciSA6pJRi7oalCryRSCZ0+9uqfO7DZQ8BnzjGZKvOU44q
-						TjlvzyFrtqiwsl8a0vDk7a7YLpD+tsgxgzvQ++x7x4RBiMLxPfoLtN4h13SoLya5
-						JwJJ+DMu7camjdGd1nyg1jv/eEUA3vuQg7CPR3jONSw5dSsNK+jHMzeogG165oAV
-						IKD+m69XgWLE9gQQCzekuQChiZg5+O5EcyPAUA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://havana.ucs.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: JANET(UK) JVCS booking system</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jvcs.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>McIntosh</SurName>
-    <EmailAddress>mailto:M.McIntosh@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>McIntosh</SurName>
-    <EmailAddress>mailto:M.McIntosh@ed.ac.uk</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 d6ad1a9e..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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hbidp.hb.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hbidp.hb.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hbidp.hb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hbidp.hb.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">hb.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hbidp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hbidp.hb.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">HB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Borås</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hb.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:it-avdelningen@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>Per-Olof Axelsson</md:SurName>
-    <md:EmailAddress>mailto:Per-Olof.Axelsson@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4697</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Borås</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:it-avdelningen@hb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md: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 2769678e..00000000
--- a/swamid-interfederations-2.0/hbidp.hb.se.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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:DomainHint>hb.se</mdui:DomainHint>
-        <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="technical">
-    <Company>Högskolan i Borås</Company>
-    <EmailAddress>mikael.furth@hb.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/health.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8716ed8f..00000000
--- a/swamid-interfederations-2.0/health.balliol.ox.ac.uk-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://health.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Balliol College Health Monitoring" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-06-19T17:10:03Z"/>
-  </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://health.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAISjz39anYvxMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2hlYWx0aC5iYWxsaW9sLm94LmFjLnVrMB4XDTEzMDYxNDE1NDcxMVoXDTIz
-						MDYxMjE1NDcxMVowIjEgMB4GA1UEAxMXaGVhbHRoLmJhbGxpb2wub3guYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEM4MhQGL1WH/wnDLogYmE
-						22fAMVtR3DdC2JCgUbjFNDij2iEGwo+uq6sqOPxgFI8LHJd6DG0RTpn6TdPC8q6o
-						q2vtpa6ncJcFIKjger8UPcOaCBf74+x2O+UF1W7BQw6MVt1dJaM05s7kk2lg+ezX
-						LdMOpbzy0JLY2c6x5PEMuHqkK8slABuKBBEqxZQwrLgo4SYgxP9I2Et7OEyQHw4G
-						EO5ADb7ZVpwY6JaSmcvHYbrXU9AsInhAhKa8AL4oSMFmbgvkgc3Y76+h+N3GPYOD
-						y3XEEY38hWvPHSOP0cA/97PeD8G0MaGx2MfY1JizaPuFWv7l/0gGMK4qyW/wtiQR
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2hlYWx0aC5iYWxsaW9sLm94LmFjLnVrMB0G
-						A1UdDgQWBBRHj9z9ifwaUesGamTczMNhu52ttzANBgkqhkiG9w0BAQUFAAOCAQEA
-						K7y6McC/jFSF5NSFePI1TYzPvgm7b5aJ5ZYyjbYvib4zqzICoEr+ehFG0lK/Q2Go
-						BJa4gr7dVZLR09n15Z/OaLxpJPXfcSPCYFtMi3ZUUXbFmLjp/U2G0rB1Lciv6leY
-						NCxxd7afv6NbvsRDXLCadPbRULjQepz6R0A0ewyrlw2kl1k5GB52HsjbPpXpWKTd
-						xFFtqC450OBmGvKCxrBmXmKRgKSqBMCZuayejedIlTc3CsXfL3Yt89oqbINUAlHk
-						jH6XT7Moapdct22P+qnwRCS/apvjf+xLuRWz7qEm/HK+dnMG1ZLEYTMAMY2tvPsr
-						AKnWzztuE6aBJIRLC1YhqQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://health.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://health.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Balliol College Health Monitoring</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Plummer</SurName>
-    <EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Plummer</SurName>
-    <EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hefce-shib.hefce.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/hefce-shib.hefce.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 0607aa8c..00000000
--- a/swamid-interfederations-2.0/hefce-shib.hefce.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://hefce-shib.hefce.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the Higher Education Funding Council for England.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">hefce.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUezj/faBM5uouEQmqmYzIjOz/6JEwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWaGVmY2Utc2hpYi5oZWZjZS5hYy51azAeFw0wOTA3MTYx
-						MjA3MzZaFw0yOTA3MTYxMjA3MzZaMCExHzAdBgNVBAMTFmhlZmNlLXNoaWIuaGVm
-						Y2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEaksTLYnl
-						GL5voE3VgwtWMCMv3geB6Py4KTrP31bm1+lh0uOmLnvA/hWynXSVZlNneaxRKFMG
-						VWeqPzA7Pgr18kNGsN3dL5Uqgsa5wHRssRERQLi7gGsOgDLeDHAVPeHdfq4Xf7xa
-						txX+0OEQ8o/8rBrVCrXvbb5+bYSdmrN9EljMpb9Thos3LN4kSentD6Ynmatsh/yc
-						+aAc7T6OrIG1tIsahaIMAdS2bWufCKhKZTLvkQy5RypcfTUiRqdfGm+YUt5mI29J
-						NVx0zVTfiv6EZNwrWdk23E0JyRn2qEQlnShyJD6TmVJfrX4XpPGx54DbZebMNpVK
-						81xTMIgY9/69AgMBAAGjczBxMFAGA1UdEQRJMEeCFmhlZmNlLXNoaWIuaGVmY2Uu
-						YWMudWuGLWh0dHBzOi8vaGVmY2Utc2hpYi5oZWZjZS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUGy/6MNFxhre5bjKaqpv+vZ9gETEwDQYJKoZIhvcNAQEF
-						BQADggEBAGMdM/fMvuLzyNWsEiFZ9/8j0w3J24GP3vVHW5Qo78cgJFefvRCIiRyc
-						Vgd9xbOwa73jQmJfJVdVU2wQxE/zDlblpuVJRF2C5ZeNb02utv6k4z//aitqeJWs
-						+iUj1PrebWVVQowkSjAs2q94qaQcwjYRajsp5WZak+nwknPJghRqwr3zhW4RlxV6
-						ZdwS2D2Ckz3bxI+EQDS4PNpxQA/rczG4H2FgvsLGXV9+s3LmVMtkrfGNdLhTd9yi
-						wXj9oLBF9cMb98YjywMT6pVbuGtbJVxnFqb0RAAkUrCkNdNLAUUGD8S3tRVLi7Cv
-						BNj9t+EYKF8K7y4unRFf9gVHwyWBLq0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hefce-shib.hefce.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hefce-shib.hefce.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://hefce-shib.hefce.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hefce-shib.hefce.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hefce-shib.hefce.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hefce-shib.hefce.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">hefce.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUezj/faBM5uouEQmqmYzIjOz/6JEwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWaGVmY2Utc2hpYi5oZWZjZS5hYy51azAeFw0wOTA3MTYx
-						MjA3MzZaFw0yOTA3MTYxMjA3MzZaMCExHzAdBgNVBAMTFmhlZmNlLXNoaWIuaGVm
-						Y2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEaksTLYnl
-						GL5voE3VgwtWMCMv3geB6Py4KTrP31bm1+lh0uOmLnvA/hWynXSVZlNneaxRKFMG
-						VWeqPzA7Pgr18kNGsN3dL5Uqgsa5wHRssRERQLi7gGsOgDLeDHAVPeHdfq4Xf7xa
-						txX+0OEQ8o/8rBrVCrXvbb5+bYSdmrN9EljMpb9Thos3LN4kSentD6Ynmatsh/yc
-						+aAc7T6OrIG1tIsahaIMAdS2bWufCKhKZTLvkQy5RypcfTUiRqdfGm+YUt5mI29J
-						NVx0zVTfiv6EZNwrWdk23E0JyRn2qEQlnShyJD6TmVJfrX4XpPGx54DbZebMNpVK
-						81xTMIgY9/69AgMBAAGjczBxMFAGA1UdEQRJMEeCFmhlZmNlLXNoaWIuaGVmY2Uu
-						YWMudWuGLWh0dHBzOi8vaGVmY2Utc2hpYi5oZWZjZS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUGy/6MNFxhre5bjKaqpv+vZ9gETEwDQYJKoZIhvcNAQEF
-						BQADggEBAGMdM/fMvuLzyNWsEiFZ9/8j0w3J24GP3vVHW5Qo78cgJFefvRCIiRyc
-						Vgd9xbOwa73jQmJfJVdVU2wQxE/zDlblpuVJRF2C5ZeNb02utv6k4z//aitqeJWs
-						+iUj1PrebWVVQowkSjAs2q94qaQcwjYRajsp5WZak+nwknPJghRqwr3zhW4RlxV6
-						ZdwS2D2Ckz3bxI+EQDS4PNpxQA/rczG4H2FgvsLGXV9+s3LmVMtkrfGNdLhTd9yi
-						wXj9oLBF9cMb98YjywMT6pVbuGtbJVxnFqb0RAAkUrCkNdNLAUUGD8S3tRVLi7Cv
-						BNj9t+EYKF8K7y4unRFf9gVHwyWBLq0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hefce-shib.hefce.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hefce-shib.hefce.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">Higher Education Funding Council for England</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Higher Education Funding Council for England</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hefce.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Gareth</GivenName>
-    <SurName>Edwards</SurName>
-    <EmailAddress>mailto:g.edwards@hefce.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gareth</GivenName>
-    <SurName>Edwards</SurName>
-    <EmailAddress>mailto:g.edwards@hefce.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/heimdall.comodo.net-idp-shibboleth.xml b/swamid-interfederations-2.0/heimdall.comodo.net-idp-shibboleth.xml
deleted file mode 100644
index f328b2ca..00000000
--- a/swamid-interfederations-2.0/heimdall.comodo.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,60 +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://heimdall.comodo.net/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">comodo.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Comodo CA Ltd.</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>
-MIIDNzCCAh+gAwIBAgIUeoauRjtUFtyGeW8GAiurwge2vzswDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTaGVpbWRhbGwuY29tb2RvLm5ldDAeFw0xNTA3MTQxMzQy
-MzBaFw0zNTA3MTQxMzQyMzBaMB4xHDAaBgNVBAMME2hlaW1kYWxsLmNvbW9kby5u
-ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCB7a9NlB0HesrZ51OT
-Z90aB/lgb3IJJ80lwIGKBd0GE2qa/DKpcrGL+pai7JJbqbO3tnP+1nMS+xTvkrQY
-++TiQDBOT5nVKPOq7tikq5/Z1rVkmYdU+KUkFwsi5ZKRAEdvzXWmjJ5rF1oGKL9d
-N9//ZxksKQd8y78q/5DSKrN69VCzzCD1Z9zfE9dQnUKEl/MtOPv/qnPBcZ/JgDOZ
-0fnWgDFi4JeKEXI6kknALuQ8OVNDPF/UJ4sYEtTuxyYS9cgOb/4ZKWlVpR6FKJmy
-/y7+DuyNrUR9Ey7o4RfG7IsTT+VQ8G5pKeMc10/p+430ZGlE8N1CyU0tyQAtjIf0
-kpE5AgMBAAGjbTBrMB0GA1UdDgQWBBTvrrr8YxgnyduHiDye722jC+a3/DBKBgNV
-HREEQzBBghNoZWltZGFsbC5jb21vZG8ubmV0hipodHRwczovL2hlaW1kYWxsLmNv
-bW9kby5uZXQvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAErHkST3
-be+V085kSTF03R2SP6DdlLXuSiYX6tdmZRRBeWm7ls0PEdTlsLDdadYw2EnTZSAY
-UwjPCMSY6W5SQe2nNijJWCDMrlhNR4/7HdiB7rCsSJOBPncz2qdfFN0ZmJksPout
-RBGtViHoSZjtSvggJiU2vg8fVudqCObfSrODSDBBLO7Yp7XQ6uQi3kttXZPVS6cN
-Efw+g0ff7sNi8dyUW2ZiCndGXag4E7O04cqCpJln0ngTpfQkULA9D8tE5BkYUpid
-1FzEexQmwIXLUTmlL9NdxGlhKhi6mZXqEYqoubwN3xfzQQhApYzNrNVaQ2UJ4qzP
-3PIcpg44PgkUh1w=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://heimdall.comodo.net/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://heimdall.comodo.net/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Comodo CA Ltd.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Comodo CA Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.comodo.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Vladimir Markevich</md:GivenName>
-    <md:EmailAddress>vladimir.markevich@comodo.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Grigoriy Sandu</md:GivenName>
-    <md:EmailAddress>grigoriy.sandu@comodo.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/heinonline.org-entity.xml b/swamid-interfederations-2.0/heinonline.org-entity.xml
deleted file mode 100644
index db1db0c2..00000000
--- a/swamid-interfederations-2.0/heinonline.org-entity.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://heinonline.org/entity">
-  <!--
-		This is an OpenAthens SP for William S. Hein & Co., Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-21T15:27:59Z">
-      <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: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">HeinOnline</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The World's Largest Image-based Legal Research Database</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID1jCCAr6gAwIBAgIJAKKIx7G8Se2XMA0GCSqGSIb3DQEBBQUAMGwxCzAJBgNV
-						BAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazEPMA0GA1UEBxMGSXRoYWNhMSAwHgYD
-						VQQKExdXUyBIZWluIGFuZCBDb21wYW55IEluYzEXMBUGA1UEAxMOaGVpbm9ubGlu
-						ZS5vcmcwHhcNMTEwNTIwMTYzNjEzWhcNMjEwNTE3MTYzNjEzWjBsMQswCQYDVQQG
-						EwJVUzERMA8GA1UECBMITmV3IFlvcmsxDzANBgNVBAcTBkl0aGFjYTEgMB4GA1UE
-						ChMXV1MgSGVpbiBhbmQgQ29tcGFueSBJbmMxFzAVBgNVBAMTDmhlaW5vbmxpbmUu
-						b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2w2m3RnHsi1LOOmJ
-						cbxPV/qCPbUoG7J6MqodKyKB3cLpGTvTk1u+iFh/TpYGe2jvUZywoW7fH6cc6rZM
-						QC3Ix9BODKBIFuvMs5XYqdwIHq3kZ1st8FubN6sQZ9dEf9IKDflvHSMYzxzsZnfR
-						Y5XsEnQRU9R9M91NEabXF4SMCyn45obWpKhBdLzX435I41AFtRLBYIr46bq89lWE
-						VHkc8ic/w4Q+QB1f1q5ej37ogiuiPbSLDpvscUTpUipUHzOj1oE7/zvAoZ48WYqx
-						8x01C8xVtwiIy8p3new658A7rwrveq8CbeglUE1uaXq+swePZMH57TIT1SB4Hrnu
-						97sWEwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUrKKkqy079i1m8wc8+kyp
-						Jne7OtMwHwYDVR0jBBgwFoAUrKKkqy079i1m8wc8+kypJne7OtMwDQYJKoZIhvcN
-						AQEFBQADggEBADFtM86JUBLYkundSv7WlNQK7HDi76ZHeYg4PcHMVQhdOHTvQm9J
-						WqwyHRB7Lk+eOl2DQDXMjWjh+FgvM7VNHqGzldR+uLgLShJgZrb6pYZYuxXNrK6l
-						MxfOkN2YPwIsI+jK1DEKArjZ+Z0QlH8osJTR1HtWjbLEqi7Vy3k6jXq7rDD+QTiV
-						L/+tbPcnYvRa54AKEdoHGsnFlw/WTWT/umc330g9aAGFeD1KlI1cSW2naSUqRnvK
-						wCfR0ocvN3eEaulmUByr3AB7NwgjLjLHplwRPBz8O/cRJfCM1PzP6updCHhQX3em
-						ut67QhF+oJkUpBvydg21h7fQUnuSK9KlI9k=
-					</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>
-						MIID1jCCAr6gAwIBAgIJAKKIx7G8Se2XMA0GCSqGSIb3DQEBBQUAMGwxCzAJBgNV
-						BAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazEPMA0GA1UEBxMGSXRoYWNhMSAwHgYD
-						VQQKExdXUyBIZWluIGFuZCBDb21wYW55IEluYzEXMBUGA1UEAxMOaGVpbm9ubGlu
-						ZS5vcmcwHhcNMTEwNTIwMTYzNjEzWhcNMjEwNTE3MTYzNjEzWjBsMQswCQYDVQQG
-						EwJVUzERMA8GA1UECBMITmV3IFlvcmsxDzANBgNVBAcTBkl0aGFjYTEgMB4GA1UE
-						ChMXV1MgSGVpbiBhbmQgQ29tcGFueSBJbmMxFzAVBgNVBAMTDmhlaW5vbmxpbmUu
-						b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2w2m3RnHsi1LOOmJ
-						cbxPV/qCPbUoG7J6MqodKyKB3cLpGTvTk1u+iFh/TpYGe2jvUZywoW7fH6cc6rZM
-						QC3Ix9BODKBIFuvMs5XYqdwIHq3kZ1st8FubN6sQZ9dEf9IKDflvHSMYzxzsZnfR
-						Y5XsEnQRU9R9M91NEabXF4SMCyn45obWpKhBdLzX435I41AFtRLBYIr46bq89lWE
-						VHkc8ic/w4Q+QB1f1q5ej37ogiuiPbSLDpvscUTpUipUHzOj1oE7/zvAoZ48WYqx
-						8x01C8xVtwiIy8p3new658A7rwrveq8CbeglUE1uaXq+swePZMH57TIT1SB4Hrnu
-						97sWEwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUrKKkqy079i1m8wc8+kyp
-						Jne7OtMwHwYDVR0jBBgwFoAUrKKkqy079i1m8wc8+kypJne7OtMwDQYJKoZIhvcN
-						AQEFBQADggEBADFtM86JUBLYkundSv7WlNQK7HDi76ZHeYg4PcHMVQhdOHTvQm9J
-						WqwyHRB7Lk+eOl2DQDXMjWjh+FgvM7VNHqGzldR+uLgLShJgZrb6pYZYuxXNrK6l
-						MxfOkN2YPwIsI+jK1DEKArjZ+Z0QlH8osJTR1HtWjbLEqi7Vy3k6jXq7rDD+QTiV
-						L/+tbPcnYvRa54AKEdoHGsnFlw/WTWT/umc330g9aAGFeD1KlI1cSW2naSUqRnvK
-						wCfR0ocvN3eEaulmUByr3AB7NwgjLjLHplwRPBz8O/cRJfCM1PzP6updCHhQX3em
-						ut67QhF+oJkUpBvydg21h7fQUnuSK9KlI9k=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://heinonline.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://heinonline.org/oa/auth/rcv/saml2/post" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">William S. Hein &amp; Co., Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">William S. Hein &amp; Co., Inc.: HeinOnline</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wshein.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Help Desk</GivenName>
-    <EmailAddress>mailto:techsupport@wshein.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Marisa</SurName>
-    <EmailAddress>mailto:rjm2@cornell.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Tramp</SurName>
-    <EmailAddress>mailto:atramp@wshein.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kyle</GivenName>
-    <SurName>Daving</SurName>
-    <EmailAddress>mailto:kdaving@wshein.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/helium.jcu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/helium.jcu.cz-idp-shibboleth.xml
deleted file mode 100644
index 2a0d7b1a..00000000
--- a/swamid-interfederations-2.0/helium.jcu.cz-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://helium.jcu.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:40: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/university</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">jcu.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of South Bohemia in Ceske Budejovice</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Jihočeská univerzita v Českých Budějovicích</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for SBU in Ceské Budejovice</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro JČU v Českých Budějovicích</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.jcu.cz/?set_language=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.jcu.cz</mdui:InformationURL>
-        <mdui:Logo height="40" width="38">http://helium.jcu.cz/logo-ju-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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUT352/cuSCyIoBXXvytfYj0l2xeAwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaGVsaXVtLmpjdS5jejAeFw0xMDA1MDMwOTQ1MDZaFw0z
-MDA1MDMwOTQ1MDZaMBgxFjAUBgNVBAMTDWhlbGl1bS5qY3UuY3owggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVeR3QqDjqBUa8PvQHUCAYk16vc/tCuGH0
-330jNRPCXp4/OBBH8Z/jNe1ikVgzYXnN8qgf8ZqVXMDhdZD4T2Ewhhg1ZoqasCIV
-8lGFGCdGkQlTfM1NZWLcXtC/aB99EtV9yXowIHWZiggW5PLB2ggGxn4hk7EMEywa
-IKJ+rUSzx0cXgxNQMrHTcYtCVOlwKWbAk8l9ZlKllSgekwyhXknx9kXAIkr12N3h
-wHixnVqaMNAHkb4Ghcx66HTByRQhvh5g5mDcGV9ZhwSTPrXsfRyD06P7fVzCZjV8
-FiuNxgdNQ9Q+PvZcy/sH5Gxdu1i4VaJvPK9Gk3jCnDaXmBTT/UwlAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWhlbGl1bS5qY3UuY3qGJGh0dHBzOi8vaGVsaXVtLmpjdS5j
-ei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUl6GU8/XvLl9I4+OaJjqAEW22yY8w
-DQYJKoZIhvcNAQEFBQADggEBAC5Rgn6IZByCrNOSqggl7j1T254ZzUKauG7joWW8
-HvrPcYWQsl4OU+FHErx4GAwOq9YpKpoJzcLGX3XBCJyo+Pw9ohbqWAgyBCYyBTQh
-mWV8+7BTWEZ6RCnGKcWfNRGg8mEMB6y+7YNdm+60YdCrbVasOstlDKoqTOa1gwD8
-fKpd1AzFldX7PwxwagGWYycYkSDXoS7nADEFzgn3cGlU9QnW4YtBBp30sOJjGgTj
-Qm2JkTDk/UKsYKYDrHoZ4vk71XTFLAgsCfBE2/2VJpIkOutXtqz78E07C4y2+4O3
-FcCuzEOMSqDr2DwNtwLU1t+o7IUndlfTGRBD+LfXQBWxuEo=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://helium.jcu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://helium.jcu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://helium.jcu.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://helium.jcu.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://helium.jcu.cz: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://helium.jcu.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://helium.jcu.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://helium.jcu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://helium.jcu.cz/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">jcu.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUT352/cuSCyIoBXXvytfYj0l2xeAwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaGVsaXVtLmpjdS5jejAeFw0xMDA1MDMwOTQ1MDZaFw0z
-MDA1MDMwOTQ1MDZaMBgxFjAUBgNVBAMTDWhlbGl1bS5qY3UuY3owggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVeR3QqDjqBUa8PvQHUCAYk16vc/tCuGH0
-330jNRPCXp4/OBBH8Z/jNe1ikVgzYXnN8qgf8ZqVXMDhdZD4T2Ewhhg1ZoqasCIV
-8lGFGCdGkQlTfM1NZWLcXtC/aB99EtV9yXowIHWZiggW5PLB2ggGxn4hk7EMEywa
-IKJ+rUSzx0cXgxNQMrHTcYtCVOlwKWbAk8l9ZlKllSgekwyhXknx9kXAIkr12N3h
-wHixnVqaMNAHkb4Ghcx66HTByRQhvh5g5mDcGV9ZhwSTPrXsfRyD06P7fVzCZjV8
-FiuNxgdNQ9Q+PvZcy/sH5Gxdu1i4VaJvPK9Gk3jCnDaXmBTT/UwlAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWhlbGl1bS5qY3UuY3qGJGh0dHBzOi8vaGVsaXVtLmpjdS5j
-ei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUl6GU8/XvLl9I4+OaJjqAEW22yY8w
-DQYJKoZIhvcNAQEFBQADggEBAC5Rgn6IZByCrNOSqggl7j1T254ZzUKauG7joWW8
-HvrPcYWQsl4OU+FHErx4GAwOq9YpKpoJzcLGX3XBCJyo+Pw9ohbqWAgyBCYyBTQh
-mWV8+7BTWEZ6RCnGKcWfNRGg8mEMB6y+7YNdm+60YdCrbVasOstlDKoqTOa1gwD8
-fKpd1AzFldX7PwxwagGWYycYkSDXoS7nADEFzgn3cGlU9QnW4YtBBp30sOJjGgTj
-Qm2JkTDk/UKsYKYDrHoZ4vk71XTFLAgsCfBE2/2VJpIkOutXtqz78E07C4y2+4O3
-FcCuzEOMSqDr2DwNtwLU1t+o7IUndlfTGRBD+LfXQBWxuEo=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://helium.jcu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://helium.jcu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of South Bohemia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of South Bohemia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Jihočeská univerzita v Českých Budějovicích</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.jcu.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Marek</md:SurName>
-    <md:EmailAddress>jmarek@jcu.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/help.it.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 61663318..00000000
--- a/swamid-interfederations-2.0/help.it.ox.ac.uk-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://help.it.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-12T12:49:23Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJANte3kl4BkiUMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGhlbHAuaXQub3guYWMudWswHhcNMTQwOTA5MDY1OTQ3WhcNMjQwOTA2MDY1
-						OTQ3WjAbMRkwFwYDVQQDExBoZWxwLml0Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA2zwEWrEoHWjxIRuQAw521bgEWTgvziYBx2XtNzG+
-						AGfK9XPrIn9KDxR9Ve0ROx5bvTMYEKi8TMWp2wUaGIYqizDfoDADSeTOaBa8XnC1
-						MgshF/zYKLPbOtoXMwu8kc5p5h+ETXzw7XYG3l1+ERS8cdQ9ozNVlJEYjnYLDT2Z
-						px1yHmlpul9jFpMqgT4qIzaMFv0EFo69R1REa4eLDiLrJk32Fb14X2tQWCYdMMlK
-						5jXj+RfTvIQgfwTvdur+3v87orQB952uXJ0fXTbPPgq76ri3YH0IbYMYaiZRirqX
-						YJ+WNkKuD9pejZiEWpdD+l9zbrCTUDzBK2NYdCKelN/scQIDAQABoz4wPDAbBgNV
-						HREEFDASghBoZWxwLml0Lm94LmFjLnVrMB0GA1UdDgQWBBTRtIlT5Ks2V33XiWgA
-						U9eviW2LwTANBgkqhkiG9w0BAQUFAAOCAQEALmvigxrsTaGMK+RTB4MmI17ARfNe
-						UFgG42mqlEqLaeW1SzfD3v1jkwcKAccd4V5XcgKB09fa9bVjX2PN58XvX8K/bRBw
-						0Spa+fhxS/QqjatYKGrMqSood+WRaQi/voduAv11W1utpn9qTwaaZYKdzhx/dEK5
-						RJZzJiHWSDd121TIo2JsZ22GTCwt/aZjTpSHsl+PmYtXMu/wwPxD/7Lh37hNwqq4
-						RE9E7Wvu6AtrcbaVeu1r574c808GWDiArwPSBD5AHVBALXvTlO+W4+YmN9Ua3Y9N
-						A12BEgZWkUPf9LMkt++7lXugQ8mmODZtHFKglE1pty65rct/NFdRfErFwg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://help.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://help-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - help.it.ox.ac.uk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://help.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hereford.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/hereford.ac.uk-oala-metadata.xml
deleted file mode 100644
index d6aace66..00000000
--- a/swamid-interfederations-2.0/hereford.ac.uk-oala-metadata.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://hereford.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Hereford Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-23T09:59:18Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">hereford.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWDCCAkCgAwIBAgIILT4zd54jo/wwDQYJKoZIhvcNAQEFBQAwQzEkMCIGA1UE
-						CgwbSGVyZWZvcmQgU2l4dGggRm9ybSBDb2xsZWdlMRswGQYDVQQDDBJpZHAuaGVy
-						ZWZvcmQuYWMudWswHhcNMTMwNjE5MTAzNTM2WhcNMjMwNjE5MTAzNTM2WjBDMSQw
-						IgYDVQQKDBtIZXJlZm9yZCBTaXh0aCBGb3JtIENvbGxlZ2UxGzAZBgNVBAMMEmlk
-						cC5oZXJlZm9yZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AIfFoXIUvMYf21sWKJQfFVVOi0h8y7aC/dvDJA4lOBImafBE5Nj5X4LzK2LKMVp8
-						majS8DXN3GHhjtNWNiq6H/+7uGUZZjOhXvirrt8NIunX3Sxh+utQHV1MHkcHYaLz
-						4k6j7ZdzFv1XrAsELK+/qjLkj0stXwYPSwYFIzrF1wBdqn8wqc8dzem30D8gWJ8i
-						GzXXDGnp3UHqxgk1rx26HCbWqNY4BqwT3OO7H324hxQIcFWdD096NYxE9Cam8fUI
-						qknu5RBAD25wqJVDrOWBYtl9A4IvczNVjcOrs6MpjmI0OspHQvY9V9G5TYObHG5Q
-						bnzhYPyG7EVtsldbNWMeSjUCAwEAAaNQME4wHQYDVR0OBBYEFANLmaGyW7F0uvbZ
-						Ve1RHwWuqN7DMB8GA1UdIwQYMBaAFANLmaGyW7F0uvbZVe1RHwWuqN7DMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAQPkd/yCL7mA9DSkO8t65XZ+IDT
-						VCBxORxaTmXjmtbtiKkFfF5LxCOAaoVbiuBQLPm5mn6vH9kgzyApMhfwSYgGMssP
-						eckyVfa28lGU5B+0Ug6QOb90kjFD7OUFx+510xyRkPtU6WmF+VJgXbsJQa6z96wb
-						vfK1jq82mtG1hUGG5CzNxAGeyGLE3w7wd22gXclr//LVjdCBDmrKDCZuRZtIcspl
-						/QfZ2h67XMQyd8Jdu0oxB1XgXPgzqI/LbokdqnHCLEjOyqJ/dNwf/CACNKxFPZTM
-						rpEhJNmmPFKIi9lPEv6R3hzNVPsfyxYFHsVL+hA5xx6Ak8t96zdGWMA9RCY=
-					</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>
-						MIIDWDCCAkCgAwIBAgIILT4zd54jo/wwDQYJKoZIhvcNAQEFBQAwQzEkMCIGA1UE
-						CgwbSGVyZWZvcmQgU2l4dGggRm9ybSBDb2xsZWdlMRswGQYDVQQDDBJpZHAuaGVy
-						ZWZvcmQuYWMudWswHhcNMTMwNjE5MTAzNTM2WhcNMjMwNjE5MTAzNTM2WjBDMSQw
-						IgYDVQQKDBtIZXJlZm9yZCBTaXh0aCBGb3JtIENvbGxlZ2UxGzAZBgNVBAMMEmlk
-						cC5oZXJlZm9yZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AIfFoXIUvMYf21sWKJQfFVVOi0h8y7aC/dvDJA4lOBImafBE5Nj5X4LzK2LKMVp8
-						majS8DXN3GHhjtNWNiq6H/+7uGUZZjOhXvirrt8NIunX3Sxh+utQHV1MHkcHYaLz
-						4k6j7ZdzFv1XrAsELK+/qjLkj0stXwYPSwYFIzrF1wBdqn8wqc8dzem30D8gWJ8i
-						GzXXDGnp3UHqxgk1rx26HCbWqNY4BqwT3OO7H324hxQIcFWdD096NYxE9Cam8fUI
-						qknu5RBAD25wqJVDrOWBYtl9A4IvczNVjcOrs6MpjmI0OspHQvY9V9G5TYObHG5Q
-						bnzhYPyG7EVtsldbNWMeSjUCAwEAAaNQME4wHQYDVR0OBBYEFANLmaGyW7F0uvbZ
-						Ve1RHwWuqN7DMB8GA1UdIwQYMBaAFANLmaGyW7F0uvbZVe1RHwWuqN7DMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAQPkd/yCL7mA9DSkO8t65XZ+IDT
-						VCBxORxaTmXjmtbtiKkFfF5LxCOAaoVbiuBQLPm5mn6vH9kgzyApMhfwSYgGMssP
-						eckyVfa28lGU5B+0Ug6QOb90kjFD7OUFx+510xyRkPtU6WmF+VJgXbsJQa6z96wb
-						vfK1jq82mtG1hUGG5CzNxAGeyGLE3w7wd22gXclr//LVjdCBDmrKDCZuRZtIcspl
-						/QfZ2h67XMQyd8Jdu0oxB1XgXPgzqI/LbokdqnHCLEjOyqJ/dNwf/CACNKxFPZTM
-						rpEhJNmmPFKIi9lPEv6R3hzNVPsfyxYFHsVL+hA5xx6Ak8t96zdGWMA9RCY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hereford.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hereford.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Hereford Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hereford Sixth Form College OALA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hereford.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tom</GivenName>
-    <SurName>Saville</SurName>
-    <EmailAddress>mailto:tbs@hereford.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Saville</SurName>
-    <EmailAddress>mailto:tbs@hereford.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/hermes.kendal.ac.uk-shibboleth.xml
deleted file mode 100644
index 30b09476..00000000
--- a/swamid-interfederations-2.0/hermes.kendal.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://hermes.kendal.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Kendal College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-06T16:19:57Z">
-      <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">kendal.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJjCCAg4CCQCftH7JV+1i/jANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGS2VuZGFsMRcwFQYDVQQKEw5LZW5kYWwgQ29sbGVnZTEcMBoG
-						A1UEAxMTaGVybWVzLmtlbmRhbC5hYy51azAeFw0xNDA0MDkwNzQ1MjZaFw0zNDA0
-						MDQwNzQ1MjZaMFUxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZLZW5kYWwxFzAVBgNV
-						BAoTDktlbmRhbCBDb2xsZWdlMRwwGgYDVQQDExNoZXJtZXMua2VuZGFsLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuFaEIWh3r5giUZD7uIDh
-						OoIuUVdZk1FGrFAjRqOHQFLy6Hn7nWTDvUs4TmrIk/iJUhQ+J9m03R+0b5lIvzyX
-						6Ln8x4ROrEgNHjTAHexaISufWOD5n9Tpbb6Ty3B6KkoKHKbiwTQIULiAQ6kexY7n
-						l7+ygcj8FgjMpf58SWplsBuvvBDf/2AZ8hAax9m3KSvF6JM31o49q+xdMmAlbr9t
-						RGXgY4+SyRAu3k0cnJengS6IyiUU+xAMU6i5p6vOGMedXRega8cZ5brWVujIxFR0
-						UWbdZF801hazxntEA60mENp5oe9XaGOVfx8mz43MTStI0Zu88MtcnXpHzjzf0wxY
-						uQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCGEX09Mj8zeAGHJYoN9zulj6Clf8Ho
-						ZckCbIS9TmADXSzLi4WGrXT5MwRxWZAvyJM6tL2XqZDjLcRzoFZrqy6UHedbWPbk
-						yI+BvWNcI+5qA6vzp102hh4oe9o6zQYnM/RnQHxWPLChdviskN+sjDk9vXi6ggAg
-						ZhXigT6XazIAF42mib9Cb2CWmT5DC5ELdUgZNPdkSeHEHcf3OTmMTfyuZM6P4woT
-						wKjIrfioxNzLdB35vkRFWWUDw1PdFn1kUq1VgjuEqbD38eUA4iNd6F6m3SvcQAqE
-						0D/QX0C9pKDMUOwrgNQfQOdQBE6gPCqk5zaD8tc/WOKE8wia27HWDmH2
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hermes.kendal.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hermes.kendal.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://hermes.kendal.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hermes.kendal.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hermes.kendal.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hermes.kendal.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">kendal.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJjCCAg4CCQCftH7JV+1i/jANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGS2VuZGFsMRcwFQYDVQQKEw5LZW5kYWwgQ29sbGVnZTEcMBoG
-						A1UEAxMTaGVybWVzLmtlbmRhbC5hYy51azAeFw0xNDA0MDkwNzQ1MjZaFw0zNDA0
-						MDQwNzQ1MjZaMFUxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZLZW5kYWwxFzAVBgNV
-						BAoTDktlbmRhbCBDb2xsZWdlMRwwGgYDVQQDExNoZXJtZXMua2VuZGFsLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuFaEIWh3r5giUZD7uIDh
-						OoIuUVdZk1FGrFAjRqOHQFLy6Hn7nWTDvUs4TmrIk/iJUhQ+J9m03R+0b5lIvzyX
-						6Ln8x4ROrEgNHjTAHexaISufWOD5n9Tpbb6Ty3B6KkoKHKbiwTQIULiAQ6kexY7n
-						l7+ygcj8FgjMpf58SWplsBuvvBDf/2AZ8hAax9m3KSvF6JM31o49q+xdMmAlbr9t
-						RGXgY4+SyRAu3k0cnJengS6IyiUU+xAMU6i5p6vOGMedXRega8cZ5brWVujIxFR0
-						UWbdZF801hazxntEA60mENp5oe9XaGOVfx8mz43MTStI0Zu88MtcnXpHzjzf0wxY
-						uQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCGEX09Mj8zeAGHJYoN9zulj6Clf8Ho
-						ZckCbIS9TmADXSzLi4WGrXT5MwRxWZAvyJM6tL2XqZDjLcRzoFZrqy6UHedbWPbk
-						yI+BvWNcI+5qA6vzp102hh4oe9o6zQYnM/RnQHxWPLChdviskN+sjDk9vXi6ggAg
-						ZhXigT6XazIAF42mib9Cb2CWmT5DC5ELdUgZNPdkSeHEHcf3OTmMTfyuZM6P4woT
-						wKjIrfioxNzLdB35vkRFWWUDw1PdFn1kUq1VgjuEqbD38eUA4iNd6F6m3SvcQAqE
-						0D/QX0C9pKDMUOwrgNQfQOdQBE6gPCqk5zaD8tc/WOKE8wia27HWDmH2
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hermes.kendal.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hermes.kendal.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">Kendal College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Kendal College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kendal.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Donna</GivenName>
-    <SurName>Clarke</SurName>
-    <EmailAddress>mailto:donna.clarke@kendal.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Donna</GivenName>
-    <SurName>Clarke</SurName>
-    <EmailAddress>mailto:donna.clarke@kendal.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hexaa.eduid.hu-hexaa.xml b/swamid-interfederations-2.0/hexaa.eduid.hu-hexaa.xml
deleted file mode 100644
index c9f7738f..00000000
--- a/swamid-interfederations-2.0/hexaa.eduid.hu-hexaa.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hexaa.eduid.hu/hexaa">
-  <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="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>niifi</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>hexaa</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:AttributeAuthorityDescriptor 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>MIID3zCCAsegAwIBAgIJAOSPjcyD6TerMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYDVQQGEwJIVTERMA8GA1UECAwIQnVkYXBlc3QxETAPBgNVBAcMCEJ1ZGFwZXN0MQ0wCwYDVQQKDAROSUlGMQwwCgYDVQQLDANBQUkxFzAVBgNVBAMMDmhleGFhLmVkdWlkLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTAeFw0xNDA3MjUwOTEwMTNaFw0yNDA3MjQwOTEwMTNaMIGFMQswCQYDVQQGEwJIVTERMA8GA1UECAwIQnVkYXBlc3QxETAPBgNVBAcMCEJ1ZGFwZXN0MQ0wCwYDVQQKDAROSUlGMQwwCgYDVQQLDANBQUkxFzAVBgNVBAMMDmhleGFhLmVkdWlkLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKi1DVFU8Ga62OqleMLg6zHXEmuqRgFt5+3JhKo+/OdZW0MofJguzFusTj/EMwb8uq8ty/rerb3GoYptgiz5UOQ6xv+7xAgwn4ED0soj34vutl8s3CxYHTBSNKyMHh7WQaAUNB7iVCoQLhia0/VFT2JNJ7ZUs/H/da96pvwTCMVwUlPn7ajaotRjmEUbDhYopkxRGV9lFvPWSPaEAycUWMCf4WR1QZ6KdeWJ5+Aju+8R0+h4MeH/IG7KfWvIoSH3TW6UlfkNbIrxRUaVo4T5PgNEGX//tQgLb2ghDLOBIaSPD3MiovQOz44n+yhGs29jb9ldBZ5Fuqsx+/H2oi7NJzMCAwEAAaNQME4wHQYDVR0OBBYEFKqg4P+UsMvBcN8y/nDTbG4lCRn1MB8GA1UdIwQYMBaAFKqg4P+UsMvBcN8y/nDTbG4lCRn1MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIXoj/th9jwTHaFR1zRamEgM4DC5cIAWgy2gdrZIV1J/KZFDLQVZgP76xc4nBk8ulP5iBOx33RmODNj6mu+/OB8W39Zvg+eYes474x4P5M/HAP52hZFR6IUW8MyiMw/Kb+VZ8+5wQ2OZ8BnuKIogMVrI4fE4gvAxUkZMCDP4Fmdf8WcFhPVFRQLAG3UjgsErJ5a95M16upPM8bFnDh5XES3TR/fwKiU2CHnx45v+ajvLOmtQWu+Lb/HX4RL4N3PmERrBuAG0lMcwR33i/uf21jbeLH2u+qPemRIOhUv+h2MIpocW+Io92B+v/JCPIfrg+RE6QVnNXD3XGn1LQ8Wi3Xg=</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>hexaa.eduid.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hexaa.eduid.hu:8443/simplesaml/module.php/aa/attributeserver.php"/>
-    <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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml b/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.xml
deleted file mode 100644
index a501fbb7..00000000
--- a/swamid-interfederations-2.0/hexaa.eduid.hu-shibboleth.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://hexaa.eduid.hu/shibboleth">
-  <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>hexaa</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">HEXAA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">HEXAA</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">A HEXAA egy külső attribútum szolgáltatás. A szolgáltatás célja az, hogy felhasználói adatokat rögzíthessenek bele, amelyet megoszthatnak tartalomszolgáltatókkal. A HEXAA-ban nyilvántarthatóak csoportok, virtuális szervezetek, jogosultsági információk, valamint a felhasználóra jellemző egyéb információk is.</mdui:Description>
-        <mdui:Description xml:lang="en">HEXAA is an External Attribute Authority.  It can store user attributes that can be shared with Service Providers. Virtual organizations and groups can also be managed with HEXAA as well as access control infromation and profile information.</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">https://hexaa.eduid.hu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://www.eduid.hu/hu/hexaa-adatkezelesi-szabalyzat/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDXDCCAkQCCQCFm32D8C9qujANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJIVTERMA8GA1UECAwIQnVkYXBlc3QxETAPBgNVBAcMCEJ1ZGFwZXN0MRMwEQYDVQQKDApNVEEgU1pUQUtJMQ0wCwYDVQQLDARIQklUMRcwFQYDVQQDDA5oZXhhYS5lZHVpZC5odTAeFw0xNDA3MjExMjUxMTJaFw0yNDA3MTgxMjUxMTJaMHAxCzAJBgNVBAYTAkhVMREwDwYDVQQIDAhCdWRhcGVzdDERMA8GA1UEBwwIQnVkYXBlc3QxEzARBgNVBAoMCk1UQSBTWlRBS0kxDTALBgNVBAsMBEhCSVQxFzAVBgNVBAMMDmhleGFhLmVkdWlkLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqlgn1/34g4IAzPjQeLtKEF4EsTrKyEYiRrUstWzyGUkZ0WbNzisXUvjY0yuxeWiJmv2XiMF/Y80TpR/buFptCOxZBIsc+gPPfqHlaR4zYhe+bBNUDzetXrKuuuQYOlZnABLaMnSbUYMEjXev4fxJdNhwBGaGxZMnfDGvTRZY9nbj3RU7ziVrQcYP95SI2xUyMmugpTVQknHDsR7/ipqjrrS1Hwsx3MwitHrfr5GMgdCdz/d0mA8kqla8pXCvCrniKteMmoQFUiQ4Fv74PqFxEpYISUYQ6JUjd+j1oOKo+RmCGaQfRdPIR8GVojYMFUyRiINaFs+7WpHC5GbwLq2SEQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA3+3pXTc2rXs0D7uZkMpIKDJbYoBDwmXjt8rw4aTsEqrABQqWfyIZvQj1kPwEd9644ZMeEL53ajMeATjeovtfhGXiofCiP1HNfpAUD4DrNYTA57f6hVRBE/ec3hQ5x2uCwD4kLvbA9LVjP3OImG0PaOHWCz+7AmXAEkO+M5lhJJ7DkKpsfTu8tP/xucCDT5kwtp9IgV8PIM9tbUX3wDyAmsOE4Vy6ZPNra3+wXfSAuNigP9vqrpvqVXJkwTm2kmoMy+nOlxS6mQCQXj5TRwwztQBM9H0zNDwQEJNc27lOCiTIZ92uBxhghsW5tZJVmEHXqFp1uBKdiICgBSgNhaQkr</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>hexaa.eduid.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hexaa.eduid.hu/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-Artifact" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hexaa.eduid.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="hu">HEXAA</md:ServiceName>
-      <md:ServiceName xml:lang="en">HEXAA</md:ServiceName>
-      <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="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="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>aai@niif.hu</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>aai@niif.hu</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>aai@niif.hu</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml
deleted file mode 100644
index e7fdb341..00000000
--- a/swamid-interfederations-2.0/hidp.ucc.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hidp.ucc.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-10-25T00:00:00Z"/>
-    <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucc.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University College Cork</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Coláiste na hOllscoile Corcaigh</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ucc.ie/en/sit/</mdui:InformationURL>
-        <mdui:Logo height="71" width="200">https://edugate.heanet.ie/rr3/logos/ucc.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:51.893285131676606,-8.492431640625</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUJ3jATJ9q82dE+ma0p9zSXbsubOUwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQbWFlbHN0cm9tLnVjYy5pZTAeFw0xMDEyMjAxMTQ0MDRa
-Fw0zMDEyMjAxMTQ0MDRaMBsxGTAXBgNVBAMTEG1hZWxzdHJvbS51Y2MuaWUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCB90H3EcbGIbs1MYIbcGF8RAT8
-JZyn4G6XUBrgBebshGsiPqO/9bJ5om/vvO+fgIyrMFHVKRYyH9coSJgGSWN+FWDT
-y/ez3/s9X5kZ2rniZUpbS/7g1wezuxpDfBvaPoOfIIEtVpW9rbVGXTpSrQnMrIRb
-dF1wBJgi9s8dVgGzz6qIVYJdmTMnOxI7iX2OhxYFOXzF6vSkiKKujWGT1q/ty9Hf
-v3ZNzZeiQcpEbaXyFCyLiTFyJqYpLhEH6F4JKnNwpGsBrRVzuYErvQRGBFQxJYSg
-Nq4Vh7yfSc3vS19DsSIBvXK/9scjb0RmB2u0j+jN+gfMireDZJ/a974/yil7AgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEG1hZWxzdHJvbS51Y2MuaWWGJ2h0dHBzOi8vbWFl
-bHN0cm9tLnVjYy5pZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUysqfxq96kxiv
-chu/icPiuQA+YB0wDQYJKoZIhvcNAQEFBQADggEBABZETTa2/zk6c4gzvI7v+P/z
-bPEud4kXGZaXMO+ISMwXFra+xq961++7609SXklwW2UMatcwPl4H+72ionc69Cel
-lMnV3tNNkJsc+a5YNFw6sBmlQAoQoyKcZPYrghcFf9YUuuzyKMSyoHFibsPfDiQq
-sCOjwT0V8PGx79b88ZJp1Na/QBrsl3UWpCDtQCxgCu/PWDE23tWc9s29XIOIUEO1
-sUm5ezY/tfP6H2REvnOkBZ4Y1zDFoEjJojHOQQgRHOagmeItT/XhBP1bVOPKoyMd
-jtlb4YINkQ8aWIF5en7doTGXzvLeD5H1Oj8gm9iB2J+5eSzcj0g3ONNkBjSscoE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hidp.ucc.ie/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hidp.ucc.ie/idp/profile/SAML2/POST/SLO"/>
-    <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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hidp.ucc.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hidp.ucc.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hidp.ucc.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://hidp.ucc.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University College Cork</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University College Cork</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucc.ie/en/sit/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Denis</md:GivenName>
-    <md:SurName>O'Sullivan</md:SurName>
-    <md:EmailAddress>mailto:denis@ucc.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Hostmaster</md:GivenName>
-    <md:SurName>UCC</md:SurName>
-    <md:EmailAddress>mailto:Hostmaster@ucc.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>sne@ucc.ie</md:SurName>
-    <md:EmailAddress>mailto:sne@ucc.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-shibboleth.xml
deleted file mode 100644
index 08858471..00000000
--- a/swamid-interfederations-2.0/historicaltexts.jisc.ac.uk-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://historicaltexts.jisc.ac.uk/shibboleth">
-  <!--
-		This is a "Historical Texts" Shibboleth SP for The University of Manchester.
-	-->
-  <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="2014-05-13T15:26:22Z">
-      <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">Historical Texts</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Collections of texts from the late fifteenth to long nineteenth century</mdui:Description>
-        <mdui:Logo height="81" width="300">https://historicaltexts.jisc.ac.uk/Login/historicaltexts.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://historicaltexts.jisc.ac.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://historicaltexts.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEETCCAvmgAwIBAgIJAOP4YayhAdK+MA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
-						BAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVy
-						MQ0wCwYDVQQKEwRKaXNjMQ4wDAYDVQQLEwVNaW1hczEjMCEGA1UEAxMaaGlzdG9y
-						aWNhbHRleHRzLmppc2MuYWMudWswHhcNMTQwNDI1MDk0MTU2WhcNMjQwNDIyMDk0
-						MTU2WjB7MQswCQYDVQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UE
-						BxMKTWFuY2hlc3RlcjENMAsGA1UEChMESmlzYzEOMAwGA1UECxMFTWltYXMxIzAh
-						BgNVBAMTGmhpc3RvcmljYWx0ZXh0cy5qaXNjLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA+VVk9NbTl+5Gfe3+UD0WJ8B94T7FHT3qq6rXPqiy
-						Q1TqfU+hfseNm/kOSZKbvJJ6ejAnJutSS+srq1G/FcfWVksyQqkaL/hYcYRaanO6
-						rnhxts8phGiVK3jmFQH8ABviUtqzfEl/6fLdkK96+BoQChYYy+n1ixc/CjX2CvIm
-						h+uqkoTx3HfFVTeSA8ts693oAETQ8KQLgx72Iat6VNCmQ+IbFTBdhpKkmrz0b2PY
-						qXdJiBwVAHcyUtgiOzeQmFlLqIEJynMZfJOrtJFsl/K7up8XralxOptZjf5e3MEF
-						Jav0iuF/bPEBZxDEr/jdMalUWWpOigUovyPnMc95ErrcDwIDAQABo4GXMIGUMAkG
-						A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-						BQcDAjAlBgNVHREEHjAcghpoaXN0b3JpY2FsdGV4dHMuamlzYy5hYy51azA0BgNV
-						HRIELTArgSltaW1hcy1zaGliLXRlY2hAbGlzdHNlcnYubWFuY2hlc3Rlci5hYy51
-						azANBgkqhkiG9w0BAQUFAAOCAQEAO9iMvuz4oMurJ+4kOGnB6mHtMcUkWkBCCr3r
-						UswJA0PD8C1Tln+X7f7d3ClTg/6endwI045/joh4FWfo0yBrvHirGoyZhW/8bvWH
-						De91vuWDRcEqeUhBWjbfe2wcLMk5r4Lmy2bsYuhaNjLdC2+xxMSyziKtiNIl9Wfd
-						6fsIsQjIx0YTnn6MN99JphafYPY/evhmVXn1XOxpLIVAUAPJDh8HYhnYxToJiy7D
-						cN0OP7gQMBvefAqfEp4UDUNVGJaiMDsGvsIRLCuvkqJJnSDsJz+atC9D7aU8oSrP
-						nbpSNtZzDlQj2Ow1DZqEMXQEHhXkjN6qTEt9VMLRBSjNNcb8Bw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://historicaltexts.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://historicaltexts.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Historical Texts</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://mimas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Historical Texts Helpdesk</GivenName>
-    <EmailAddress>mailto:historicaltexts@mimas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml b/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.xml
deleted file mode 100644
index e4d82ddd..00000000
--- a/swamid-interfederations-2.0/hls.uwe.ac.uk-athens.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://hls.uwe.ac.uk/athens">
-  <!--
-		This is an "HLS SP" OpenAthens SP for the University of the West of England, Bristol. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-15T16:34:27Z">
-      <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>
-						MIIDWDCCAkCgAwIBAgIJAIF9qCDnlp/PMA0GCSqGSIb3DQEBBQUAMCYxDDAKBgNV
-						BAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3ZS5hYy51azAeFw0xMzExMTIxMTAxNTJa
-						Fw0yMzExMTAxMTAxNTJaMCYxDDAKBgNVBAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3
-						ZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeL+4hyrrRQ
-						44APl//eH/UQDbjO/tyPSpmOi50u6u/qfoYr4bc5qCSlToN3im30Gxq8YJ58mHVx
-						dto7txqz4D0CFUMZBmRCcarLrMXEXUfebzPNkFV0LL6Ae12G9MfqWLCGJDQrJraX
-						gT4xQYcMZlzHBTFfsGMF6LaOic/l3wyXVq3qeEwo2hmcEHTnW3wEf1+cY8dwL7Ms
-						8hBsGGl8lKYOvUCv28rhBsHjffkf3DtJNlaE/0CeU1K0qRFiVusta7FuEG3K8B1p
-						o1B6sEuXPRbgjzHLeIWySE8GLJlb6iErpjLsym93acFQXYgBPdku78TUEQMiX4+k
-						CnHLSb+E+Z8CAwEAAaOBiDCBhTAdBgNVHQ4EFgQU3PcvI9B6dkUu9jAFhjLjjnPN
-						b2AwVgYDVR0jBE8wTYAU3PcvI9B6dkUu9jAFhjLjjnPNb2ChKqQoMCYxDDAKBgNV
-						BAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3ZS5hYy51a4IJAIF9qCDnlp/PMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJmty3rQooOzSXU6q/IsS6+/DIpo
-						2YUrHeuWtiS9yZKVFu+UkjXBs6pub/R7K70119ju/6XzkYYuF7uCjht6m3VaX5pK
-						0v5p1+TTSxad18iyWBdZCSEbhnyhw39hg1BBrzxPHjgGANTxiw3KY90+4kDvfQM+
-						B8jDb19FkDP2s385z0fqejBp+5LeEtY518lIdmQgT8cnqrW2z+2oLc0FdLL072Vo
-						wBMgfMJKeD0m1I9uREqMO1eg5feDEqfn+rrk88x8e/Pkz2njekPMadJNd9HE/tQi
-						WiII6YDODMbcjfRCAJxuFOADibLPnWl0Zx22X2AZKgQEgqBY4ch6WKCaTZQ=
-					</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>
-						MIIDWDCCAkCgAwIBAgIJAIF9qCDnlp/PMA0GCSqGSIb3DQEBBQUAMCYxDDAKBgNV
-						BAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3ZS5hYy51azAeFw0xMzExMTIxMTAxNTJa
-						Fw0yMzExMTAxMTAxNTJaMCYxDDAKBgNVBAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3
-						ZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKeL+4hyrrRQ
-						44APl//eH/UQDbjO/tyPSpmOi50u6u/qfoYr4bc5qCSlToN3im30Gxq8YJ58mHVx
-						dto7txqz4D0CFUMZBmRCcarLrMXEXUfebzPNkFV0LL6Ae12G9MfqWLCGJDQrJraX
-						gT4xQYcMZlzHBTFfsGMF6LaOic/l3wyXVq3qeEwo2hmcEHTnW3wEf1+cY8dwL7Ms
-						8hBsGGl8lKYOvUCv28rhBsHjffkf3DtJNlaE/0CeU1K0qRFiVusta7FuEG3K8B1p
-						o1B6sEuXPRbgjzHLeIWySE8GLJlb6iErpjLsym93acFQXYgBPdku78TUEQMiX4+k
-						CnHLSb+E+Z8CAwEAAaOBiDCBhTAdBgNVHQ4EFgQU3PcvI9B6dkUu9jAFhjLjjnPN
-						b2AwVgYDVR0jBE8wTYAU3PcvI9B6dkUu9jAFhjLjjnPNb2ChKqQoMCYxDDAKBgNV
-						BAoTA1VXRTEWMBQGA1UEAxMNaGxzLnV3ZS5hYy51a4IJAIF9qCDnlp/PMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJmty3rQooOzSXU6q/IsS6+/DIpo
-						2YUrHeuWtiS9yZKVFu+UkjXBs6pub/R7K70119ju/6XzkYYuF7uCjht6m3VaX5pK
-						0v5p1+TTSxad18iyWBdZCSEbhnyhw39hg1BBrzxPHjgGANTxiw3KY90+4kDvfQM+
-						B8jDb19FkDP2s385z0fqejBp+5LeEtY518lIdmQgT8cnqrW2z+2oLc0FdLL072Vo
-						wBMgfMJKeD0m1I9uREqMO1eg5feDEqfn+rrk88x8e/Pkz2njekPMadJNd9HE/tQi
-						WiII6YDODMbcjfRCAJxuFOADibLPnWl0Zx22X2AZKgQEgqBY4ch6WKCaTZQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hls.uwe.ac.uk/athens/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of the West of England, Bristol</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of the West of England (UWE) - HLS SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uwe.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library IT Team</GivenName>
-    <EmailAddress>mailto:lib.it@uwe.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Library IT Team</GivenName>
-    <EmailAddress>mailto:lib.it@uwe.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hmauth.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/hmauth.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e2391c72..00000000
--- a/swamid-interfederations-2.0/hmauth.balliol.ox.ac.uk-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://hmauth.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a 'Balliol Holywell & Jowett Walk Network' Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-11-06T15:22: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAMpMPemIjmgrMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2htYXV0aC5iYWxsaW9sLm94LmFjLnVrMB4XDTEzMTAyMjEyNDgyNVoXDTIz
-						MTAyMDEyNDgyNVowIjEgMB4GA1UEAxMXaG1hdXRoLmJhbGxpb2wub3guYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBtZ/YetQGdunVnG/sWKrK
-						cJ6dRGvUBlZQhyVeMmgqceFbWUyCZd6pTgMoXO/rkxM6+NgD1jYZ4hZ8kMnqNAei
-						iko+UCEh2NK+js+mrVP6AEcYbg/gr2AlLhyKVXxNHNsGJHeVqpF0cNQY6T+pGHOI
-						TbVfRAFSTB5XavhDbvjcO7iMl0P3EDMXykXmn82Eaomo8FBvF0kziKn7isiWHacv
-						/VuTCIK9JhKc4p1kSGZtDf4FmwoItbXQYe2N2HnEdMqrudQuBqmY546RxFhM4eoq
-						AXp2PLnPiKveVKmdQNSdz+5v9eotACDQ9I5E/DQAy+EBvnZag8AHDK+sC+15CiK9
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2htYXV0aC5iYWxsaW9sLm94LmFjLnVrMB0G
-						A1UdDgQWBBQR0m+Jjz9sdV3MM2jrQtuqQxRERjANBgkqhkiG9w0BAQUFAAOCAQEA
-						Xf86t46FkrRK33WlZvzSASZuE9a5e/w5eVpMjhJjVirO6TA9WbjP3H16Ru4B0WiA
-						pXxEhKt8Essw0bddsuxXbBzImVkMZb6NjdEZmwtzlAM9iSTJj1S/nUDow9s3g/8M
-						XeUZjMow7WEwStRerRyyL75rjjRYWDgvxqR8GleNgJOmh3I5Bro3DqP5H6XurxS5
-						rkwtsUVWEIyXjrS9x1lqQW0Bbmu2yOh3pRVrmPB0Ap2VKjno4ywQSBDW+lZeCwQa
-						Vf5FPYgZfoknCmWSh1gmL0HXSCP5U0x1IKDAke487auoocgT5PGCOiYMAsNplYdR
-						b5EutOMJW28GnGrGr4vYhw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://hmauth.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hmauth.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Balliol Holywell &amp; Jowett Walk Network</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 7fc592b7..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">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor 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/hornet.stars.manchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/hornet.stars.manchester.ac.uk-shibboleth.xml
deleted file mode 100644
index 0074aa83..00000000
--- a/swamid-interfederations-2.0/hornet.stars.manchester.ac.uk-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://hornet.stars.manchester.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for The University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://hornet.stars.manchester.ac.uk/Shibboleth.sso/STARSDS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3zCCAcegAwIBAgIJAJuqRlY/1A1jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHZpbGxhbnVzMB4XDTA5MDUyMjA5MjYyN1oXDTE5MDUyMDA5MjYyN1owEzER
-						MA8GA1UEAxMIdmlsbGFudXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDMytraxBwzCmyK3cnajuHo5sb2Hhs0aTIAEaUTpcP2qo/yQlT/S5Wjsm5tPtue
-						pA8z0h56Y4on/k9gGGXnjej+23pfX/dPFCLEyE3MODunTkml1ObptRdMJT6CWRwg
-						m9tdWr8r355vAbS/nEn0s0z3dwHBSuf7/q4GZoBkdbUG5TkOJidlWwe5y2OXSspU
-						lehsON69DPXTxujsn9QNYzmdGxui+nrhHsj8hjPEQc9QcFDq7kXuDkM3Lry84h2p
-						kWGXRebVqEGvs6b7CUxvS5xiOChpx6fTi0/LZQQRCzrtVOuYeb9o6wVejmzW6qun
-						KH7dJCc14fgN2Icd7XYqIXYNAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHZpbGxhbnVz
-						MB0GA1UdDgQWBBTwGMy2sDPsfBZdE/1WuaxJDqVNuzANBgkqhkiG9w0BAQUFAAOC
-						AQEAlvJzqsg5+ZiZ0XChtGL3j1n8PbGeah5AfEfXRvS6RrHu7/3w4WOy+XBpGteu
-						8rqE/HkgqcpnXGS61TEU2HmdnNxqMTpGZoI7zbOkkcsNpvvG+dU5OdlEoTgJHuRI
-						12EgBWjTXMweohxDkLANWaqfB9yVDT1MspMkxKmYalZK95N9M/d6gJfXWwU4GSd0
-						4jfwMr9FzpOLAbxAHIohMA2djNfA2gNuve8PqIfBz6iaUAN0SGhGWMWWEL2B+uYZ
-						2vtfZ+CtpWQteMiXFGEfEL/3U5OtjBxt7JaQxaJJ6iRTk5jdl+EI4NxHzmITf3+O
-						EId1IbbmDWSHoeSw5za0bFOJcg==
-					</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>
-						MIIC3zCCAcegAwIBAgIJAJuqRlY/1A1jMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHZpbGxhbnVzMB4XDTA5MDUyMjA5MjYyN1oXDTE5MDUyMDA5MjYyN1owEzER
-						MA8GA1UEAxMIdmlsbGFudXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDMytraxBwzCmyK3cnajuHo5sb2Hhs0aTIAEaUTpcP2qo/yQlT/S5Wjsm5tPtue
-						pA8z0h56Y4on/k9gGGXnjej+23pfX/dPFCLEyE3MODunTkml1ObptRdMJT6CWRwg
-						m9tdWr8r355vAbS/nEn0s0z3dwHBSuf7/q4GZoBkdbUG5TkOJidlWwe5y2OXSspU
-						lehsON69DPXTxujsn9QNYzmdGxui+nrhHsj8hjPEQc9QcFDq7kXuDkM3Lry84h2p
-						kWGXRebVqEGvs6b7CUxvS5xiOChpx6fTi0/LZQQRCzrtVOuYeb9o6wVejmzW6qun
-						KH7dJCc14fgN2Icd7XYqIXYNAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHZpbGxhbnVz
-						MB0GA1UdDgQWBBTwGMy2sDPsfBZdE/1WuaxJDqVNuzANBgkqhkiG9w0BAQUFAAOC
-						AQEAlvJzqsg5+ZiZ0XChtGL3j1n8PbGeah5AfEfXRvS6RrHu7/3w4WOy+XBpGteu
-						8rqE/HkgqcpnXGS61TEU2HmdnNxqMTpGZoI7zbOkkcsNpvvG+dU5OdlEoTgJHuRI
-						12EgBWjTXMweohxDkLANWaqfB9yVDT1MspMkxKmYalZK95N9M/d6gJfXWwU4GSd0
-						4jfwMr9FzpOLAbxAHIohMA2djNfA2gNuve8PqIfBz6iaUAN0SGhGWMWWEL2B+uYZ
-						2vtfZ+CtpWQteMiXFGEfEL/3U5OtjBxt7JaQxaJJ6iRTk5jdl+EI4NxHzmITf3+O
-						EId1IbbmDWSHoeSw5za0bFOJcg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hornet.stars.manchester.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Manchester: Hornet (Halls of Residence Network)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.manchester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stars Authentication Support</GivenName>
-    <EmailAddress>mailto:pssauth.support@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stars Authentication Support</GivenName>
-    <EmailAddress>mailto:pssauth.support@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hotfixpub1.imodules.com-sp.xml b/swamid-interfederations-2.0/hotfixpub1.imodules.com-sp.xml
deleted file mode 100644
index a3f5d1df..00000000
--- a/swamid-interfederations-2.0/hotfixpub1.imodules.com-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="http://hotfixpub1.imodules.com/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">iModules Hotfix Test</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDBDCCAeygAwIBAgIQzEDukSw9R5BHpxVmr1UwFjANBgkqhkiG9w0BAQQFADAX
-MRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wHhcNMTQwNjEwMjExODU3WhcNMzQwNjEw
-MjExODU2WjAXMRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDC5hlDfEQ7RoqQgtcZjOxN2FdUOMu4MI8hIeydiFDy
-1fT1t1jJHmFF5V4JDGpITIapK2caenljBcGl7CGC+Z6EXID8i0lxc7lLWOOrYkJb
-8PeuVOpbxTZfOxfkC3jf4IfLZPtBfDvWjYtVUPwDCpwLLE/GQzz6HySoMIcWAkQ9
-bPoAIITTRnDpo1f4J6nO81DKx0XjBVIbz6aTsF60pcXQzLJ69KGI5Jkh3DjmNbeq
-EXH6ENtq823q4JGXRrKvCPrTlt+79EI1p+ECSaRUx006raAYHktUTT2KY1oUlsuk
-qVA+LMmhX/+jF1fgOehHEurOiKQp2aGmeV4PnJ8pXKM9AgMBAAGjTDBKMEgGA1Ud
-AQRBMD+AEG94Y5yfOU4e+OzhpzVt1UyhGTAXMRUwEwYDVQQDEwxpbW9kdWxlcy5j
-b22CEMxA7pEsPUeQR6cVZq9VMBYwDQYJKoZIhvcNAQEEBQADggEBAFDDvIjK8eJO
-YjDqnY9DfzUEN6Vp80w3ZLhT/K49/McNbbGkt0bgg45MeJ78IxLdclTIhOEeHACN
-F71+XLb9PjRfISiB37V157w0nKF5MsMYU1dathFrVOzCIxvhERgoD4lMNtwZiKKH
-J/xYeczpnHz5iFpoiCvsvPTP5sZqAKvf5ovpermVcLyqEPJJHvLHe+TbwdwTuGMS
-pF2w1WQGpSgdbcxWWwmwpbeiF5ADI6UTS5txOfG0p8L2RTxgRJ6Nb7lNrelIEcup
-6nWHUla/60ENe+AN9qsqYh1vnknLi7kSMHwvtyzFQDHnXhwhLa9mkpsZVkeLEGsR
-MJlfQnuceWY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hotfixpubsecure.imodules.com/controls/login/AssertionConsumerService.aspx?sid=6&amp;gid=2" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josh Wicoff</md:GivenName>
-    <md:EmailAddress>jwicoff@imodules.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/hpc-wayf.sdu.dk-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index f4ab8b45..00000000
--- a/swamid-interfederations-2.0/hpc-wayf.sdu.dk-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:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://hpc-wayf.sdu.dk/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2014-05-27T10:41:03Z" 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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="da">Formålet er at administrere bruger-adgangen til HPC-centret.</mdui:Description>
-        <mdui:Description xml:lang="en">The purpose is to manage user access to the HPC centre.</mdui:Description>
-        <mdui:DisplayName xml:lang="da">DeIC Nationale HPC-Center, SDU</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DeIC National HPC Centre, SDU</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIQB39SLNLwoqeoeeq8If/1ITANBgkqhkiG9w0BAQsFADBk MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg Q0EgMzAeFw0xNTA5MDMwMDAwMDBaFw0xODA5MDcxMjAwMDBaMIGBMQswCQYDVQQG EwJESzEaMBgGA1UECBMRUmVnaW9uIFN5ZGRhbm1hcmsxDzANBgNVBAcTBk9kZW5z ZTEdMBsGA1UEChMUU3lkZGFuc2sgVW5pdmVyc2l0ZXQxEzARBgNVBAsTCklULVNl cnZpY2UxETAPBgNVBAMMCCouc2R1LmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A MIIBCgKCAQEAzVQFqrhdUdkursHSLNBKUiPfkiKA1O1zSd7h0sUR0qrbzc2zKCkt ipe30W5lSuPZm1uJIsA1RzyQ5B1ER32kQRQBXctmTRVPKgem+J2wiQV7jkauDbsC TrfSeWesFfKyV7dKo0iKD4A0SASRMhoRCPxPI3/k4GqXFhJeySEK61YNWP80zaXg UMhMIdCXp0M2ZHFXC0thCul0/c5zUIxalN4i4wFCXl1cFt/9xb4qcu4IdAswghus Lbvs2LAMOGkKRp7PMX5uUE3Sln25EhvUJiGQFhqCPhhTNnjUwDUzPkFkYjFNF591 Go6MqWG/2xmNlovSWp4c3CJtwOit2JSn1wIDAQABo4IByTCCAcUwHwYDVR0jBBgw FoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFI2NVtdB0beyq/m/Ptty DLz2BW2XMBsGA1UdEQQUMBKCCCouc2R1LmRrggZzZHUuZGswDgYDVR0PAQH/BAQD AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+g LaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAv oC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmww TAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93 d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQG CCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKG LGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwG A1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBACwyOmcd3i6MYbah+i/MzZWi yUWsG/FOJmdG0krY+RtiBlLQ8UKDyJMjaeg/NNriwq7z3WZGpciSLRgEWPeoSsYT YQlR50Qn9CXIGWq6AOpIHFA3nMsicPjw7uZzSKRMWUS7DcQghBFZTXd2e1Ad5lBY 1hBjnsaVNJTLPhw0sGbJps2yzlm/ea3YnsmjdeOjXf1H1qA+3JgSJrSQlUkbrSyk DujmhIyKT/QZ9t/a3z8meNCiZogGDtehtmbPlPXWz6Tk6qif1dR4wF4t8/YwEjsr gKZxbMEVH0NYQf+3t4TiQyY1eJWbb70ALhio4HgYEpTy+6nPBP8kuDsl69X4esw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://hpc-wayf.sdu.dk/module.php/saml/sp/saml2-acs.php/default-sp"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="da">DeIC Nationale HPC-Center, SDU</md:ServiceName>
-      <md:ServiceName xml:lang="en">DeIC National HPC Centre, SDU</md:ServiceName>
-      <md:ServiceDescription xml:lang="da">Formålet er at administrere bruger-adgangen til HPC-centret.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">The purpose is to manage user access to the HPC centre.</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="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="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="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="da">Syddansk Universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Southern Denmark</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="da">Syddansk Universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Southern Denmark</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="da">http://sdu.dk</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.sdu.dk/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/hscshib1.qub.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 7abdf705..00000000
--- a/swamid-interfederations-2.0/hscshib1.qub.ac.uk-idp-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://hscshib1.qub.ac.uk/idp/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="2013-01-04T11:59:59Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">honni.qub.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUZayvO9xYY8CR1y0pwTGPs9KIzC0wDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSaHNjLXNoaWIucXViLmFjLnVrMB4XDTE1MTExMDA4MTk0
-						M1oXDTM1MTExMDA4MTk0M1owHTEbMBkGA1UEAxMSaHNjLXNoaWIucXViLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiL/Lr+7KiGp3LM2YZYEQ
-						JGwPGfKZnu9fUWORH5Bj7yCSDyU1efyxjnAvwgVeArgliZNJh2ux6Hm8izqeDWuL
-						ShCq9rAHyTa8s68abT47OiOIdqGtYVcWueOPljOghiloNQw3b025jdSuyk9pTMAU
-						saoUkTBbdrKwIXigKlUCQ1y6bc2e8PCdOrLs2n5QL7JGCns7/eK+ZVXywAjUAChW
-						ZYHEwijiDx/E4WSHbG1eTH+ep9gOy8P3e05/LrSiDp3ZfBlp74UqBVj+tyTut0nw
-						ZormRTd9yGO26/mwWeeQrfhPAhEUs0r12lD1G1tbUCFRxlWbceBUzVa9QfbD/0QV
-						qwIDAQABo2swaTBIBgNVHREEQTA/ghJoc2Mtc2hpYi5xdWIuYWMudWuGKWh0dHBz
-						Oi8vaHNjLXNoaWIucXViLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQR
-						SXVKceopY/texxj9jBmxSjCsbzANBgkqhkiG9w0BAQUFAAOCAQEAbm2e/5gMgp79
-						SVOxVfxcBD4MxNgangNQ1l3v83NGhzXKKDnFwup5Nllq9S9P4IiTsB4avy8D+XBr
-						KRERQmh65FYcBhELHMtd6CD+qiMftPcWtom747fp8cnM6shaehrsgg4a9J7t5IBB
-						pMFvKinh78DghwuA+h96XoqVv3+KJdR8Vrx0gcTWrlZiIc710gz470q+fhNwkcYd
-						VaVeY9/1bRYtkS8Xehr5lLBLYixCqaHFki/qu0IezZ0GzTGVP3x5ZaGz1up4ysdd
-						xD/wWsUwD8KQDwanJormGA7fh42ZkmnnQAEjgVmUxMFv0eTrald6mZ78fWQqBC5A
-						tzZmZKhhgA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsc-shib.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://hsc-shib.qub.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hsc-shib.qub.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hsc-shib.qub.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hsc-shib.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">honni.qub.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUZayvO9xYY8CR1y0pwTGPs9KIzC0wDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSaHNjLXNoaWIucXViLmFjLnVrMB4XDTE1MTExMDA4MTk0
-						M1oXDTM1MTExMDA4MTk0M1owHTEbMBkGA1UEAxMSaHNjLXNoaWIucXViLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiL/Lr+7KiGp3LM2YZYEQ
-						JGwPGfKZnu9fUWORH5Bj7yCSDyU1efyxjnAvwgVeArgliZNJh2ux6Hm8izqeDWuL
-						ShCq9rAHyTa8s68abT47OiOIdqGtYVcWueOPljOghiloNQw3b025jdSuyk9pTMAU
-						saoUkTBbdrKwIXigKlUCQ1y6bc2e8PCdOrLs2n5QL7JGCns7/eK+ZVXywAjUAChW
-						ZYHEwijiDx/E4WSHbG1eTH+ep9gOy8P3e05/LrSiDp3ZfBlp74UqBVj+tyTut0nw
-						ZormRTd9yGO26/mwWeeQrfhPAhEUs0r12lD1G1tbUCFRxlWbceBUzVa9QfbD/0QV
-						qwIDAQABo2swaTBIBgNVHREEQTA/ghJoc2Mtc2hpYi5xdWIuYWMudWuGKWh0dHBz
-						Oi8vaHNjLXNoaWIucXViLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQR
-						SXVKceopY/texxj9jBmxSjCsbzANBgkqhkiG9w0BAQUFAAOCAQEAbm2e/5gMgp79
-						SVOxVfxcBD4MxNgangNQ1l3v83NGhzXKKDnFwup5Nllq9S9P4IiTsB4avy8D+XBr
-						KRERQmh65FYcBhELHMtd6CD+qiMftPcWtom747fp8cnM6shaehrsgg4a9J7t5IBB
-						pMFvKinh78DghwuA+h96XoqVv3+KJdR8Vrx0gcTWrlZiIc710gz470q+fhNwkcYd
-						VaVeY9/1bRYtkS8Xehr5lLBLYixCqaHFki/qu0IezZ0GzTGVP3x5ZaGz1up4ysdd
-						xD/wWsUwD8KQDwanJormGA7fh42ZkmnnQAEjgVmUxMFv0eTrald6mZ78fWQqBC5A
-						tzZmZKhhgA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://hsc-shib.qub.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hsc-shib.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">DHSSPS: honni-HSC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.honni.qub.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>E-Resouces Team</GivenName>
-    <EmailAddress>mailto:eresources@qub.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Goodall</SurName>
-    <EmailAddress>mailto:m.goodall@qub.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hstalks.com-shibboleth.xml b/swamid-interfederations-2.0/hstalks.com-shibboleth.xml
deleted file mode 100644
index 4902d02f..00000000
--- a/swamid-interfederations-2.0/hstalks.com-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://hstalks.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Henry Stewart Talks Ltd.
-	-->
-  <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-08-26T08:48:02Z"/>
-  </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">Henry Stewart Talks</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Online presentations by leading world experts in biomedicine, life sciences, management &amp; marketing.</mdui:Description>
-        <mdui:Logo height="78" width="96">https://hstalks.com/shibboleth/img/logo.gif</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://hstalks.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://hstalks.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAPOoQOYTDcolMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTFzIxMTA0Ni13d3cxLmhzdGFsa3MuY29tMB4XDTEzMDgxOTA4NDIzNVoXDTIz
-						MDgxNzA4NDIzNVowIjEgMB4GA1UEAxMXMjExMDQ2LXd3dzEuaHN0YWxrcy5jb20w
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDwUS4Z4M6ixecb4Vbc0df
-						SM0rK7UoFyUZL/uSvhDcDQ1mVIaZW2/JVrNwvyoypQfezCAYrHhynA/JajADjftM
-						rh/TEUSh/BcL/xyohZ6WsyWn22vvQRRSWTNOvY0P+c2VnW59o6yS3Xlw7HVIBS3E
-						jUBu2NDbU/UmxAAAgtv2ItIq3vY0zAj11ZsXypvGY9UiB2sWVdaz/DhffJlMUfKw
-						6seKYXY24FoRLO1NsxPl5K3sA6h9kpvh/ptuoaqUiWurVW5b09Cag/C3qTWGZ3f4
-						bSTAlNfBzESKAKQ6p7i7ykSGBxFOzyuSgOrdzBmiHHTSADN2s8kOqmMq8SdFRJ09
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCFzIxMTA0Ni13d3cxLmhzdGFsa3MuY29tMB0G
-						A1UdDgQWBBRcbPDBD7FUM6VckPyUUf1FJaoOljANBgkqhkiG9w0BAQUFAAOCAQEA
-						Qf4hezdmCmhSfbg3ocxbWrROdwYUAW8JaBxerYTKdVOVIVgsNHZh8e1joDYBcmjK
-						TYGmC4C0mXhzdIwqnPdBpY7S8RXcl71FRbn4CdqOzIgn4O8Y4bgwMwSNs7JH+qFy
-						OpekXMCX0409+PmdbNvQBFk3uznEiCdkW+P2RnlNF3HaAfd8U9YBVGZvlHE/i1Qt
-						evKdTg8DniD9m/fmUJySob5xsbCyNb0DW+52VzVBlOWDteMdD5snEKi49Lod1RIN
-						/SLLOwRq3tC3sJSqLJKeYl1AJrhenhReOXXMuk+CNGpag/HRtsObyEpV8upRF3wy
-						5KwSB/UVbWmCLme4qlhnRQ==
-					</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://hstalks.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hstalks.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hstalks.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hstalks.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hstalks.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hstalks.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hstalks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hstalks.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hstalks.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hstalks.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hstalks.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Henry Stewart Talks Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Henry Stewart Talks</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://hstalks.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>HST - Support Team</GivenName>
-    <EmailAddress>mailto:support@hstalks.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Barak</GivenName>
-    <SurName>Shohat</SurName>
-    <EmailAddress>mailto:barak@bazzisoft.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iam.atypon.com-shibboleth.xml b/swamid-interfederations-2.0/iam.atypon.com-shibboleth.xml
deleted file mode 100644
index a854e5cc..00000000
--- a/swamid-interfederations-2.0/iam.atypon.com-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://iam.atypon.com/shibboleth">
-  <!--
-		This is an "Atypon SP" OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-08T13:39:46Z">
-      <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">Atypon SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Atypon Service Provider</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.atypon.com</mdui:InformationURL>
-        <mdui:Logo height="75" width="241">https://iam.atypon.com/sda/1004/atypon_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFDCCAfygAwIBAgIJAO6CoIEi6CasMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDmlhbS5hdHlwb24uY29tMB4XDTE1MDMyMDE1NDE0OFoXDTE4MDMxOTE1NDE0
-						OFowGTEXMBUGA1UEAxMOaWFtLmF0eXBvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQC4u+54JO70zG5x0q61H8Mq3Pjf/gBEIrfs/E6+0QF27Qqc
-						pxKly7r5OAnLJ+QOk3gAsK3LELmRRu6eBIE/wtKMpm9GfAtznr4Ts7eFUx6aBthc
-						KUG2YWPOtbg3jFh92BHaB37GnVAoTSfT4nVuFSeWGgfoi6ny50IXpnhXFTvddNai
-						0eNZEPgliIgZ8sVbssDGOzyJ4TLADFGd1XstW52zh17ceUn4DEOCpMc4yDtRZWTL
-						jbfatEVvrKNbBhs1lvGa+UqLxD2Sb5PneRt7R/s4OICaM4D0y2S4y+5zkwLc65fO
-						0m/FAnxPjBPXZFqoNX1FtGuMd7wbryYDlbFbah4FAgMBAAGjXzBdMDwGA1UdEQQ1
-						MDOCDmlhbS5hdHlwb24uY29thiFodHRwczovL2lhbS5hdHlwb24uY29tL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFOzD1qWEnKX/3+ulIieqI3ZSTumhMA0GCSqGSIb3DQEB
-						BQUAA4IBAQADIEJbWhPEFvYPsE63K3Y8pW7GYcxItU+0WJdNjoKixKfK2m7wuPjb
-						9DT5JqOBqglFVygbKujATJKBmDM3AGaQSsv36V6rypd3vrzcxbCg1BuhvBsLnOt+
-						mrnh/Qgnj/LHzxanzX2IMaM3zRTkDni2/nNlXY3YNlKfzV2pEOvIY13cautAzkbV
-						RHyeLh1sv+GYbxEEpX61/0Wspsh98H01XqvziuqOs2ybCNRzYwqxgwb4K4Noi22U
-						ZFCNuvYP54V/cy2/QhB/1TvFTRqVlL0KzuoqChjuw3XJI+6PYfnjfMHkTKcnqQk+
-						bqny/aV5srItkU3iMCsXEbaV5Rf0xBcr
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iam.atypon.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iam.atypon.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iam.atypon.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.atypon.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/iam.cf.ac.uk-sp-shibboleth.xml b/swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml
deleted file mode 100644
index d0a32bad..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>Philip </GivenName>
-    <SurName>Smart</SurName>
-    <EmailAddress>mailto:smartp@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/iamlearning.co.uk-shibboleth.xml b/swamid-interfederations-2.0/iamlearning.co.uk-shibboleth.xml
deleted file mode 100644
index e7eec66c..00000000
--- a/swamid-interfederations-2.0/iamlearning.co.uk-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://iamlearning.co.uk/shibboleth">
-  <!--
-		This is an "I am learning" Shibboleth SP for I Education Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-      <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://iamlearning.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC2TCCAcGgAwIBAgIJAMokAyU3GHytMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
-						BAMTBmlkNjMxOTAeFw0xMDAxMTkwOTU0MDZaFw0yMDAxMTcwOTU0MDZaMBExDzAN
-						BgNVBAMTBmlkNjMxOTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMYE
-						oDy4UOTnFc4+FU/zVYM1/+TpqI2+7paafYg6wwacMkMbEGHqp4F/uvM8UnPZcPGO
-						4s4BJO30ltKsCqexIxnTvg66V6aw5Gq/PooUCxXGP6rnUyDyTrSm9WWF17WVuLpH
-						pzMo5Ki8zlBWPxD2gd1uJuy+Lf8BJJ9aa9cYzx+glEARMXepiDaKpJFfkeSKemh5
-						BGVfH38NvBfN+lzaqhkjfyc9IuDPbFoNS5FNCiEN4zgvKxzGXVCZ6kdOgIuJ5Y0G
-						xENR6oRTJuXQqSSXyaVg1Vk4Z4a5IRIZaM/bOEFwDQGMKFWFIALybFncKQu5/wW1
-						4x5aIyLLxHmCnbobTsUCAwEAAaM0MDIwEQYDVR0RBAowCIIGaWQ2MzE5MB0GA1Ud
-						DgQWBBSbQnqKj1RxIHMszD6H3Yutb3tlkzANBgkqhkiG9w0BAQUFAAOCAQEAeEED
-						N2aGD0CE1PGcyPhARqR6RiXouYrXPhLmHz17SRn0VWBIDMSdZz7OKV8aoq08/qcA
-						V9ZnxpUBa6fFOOdMhWcMpHT6Wuroiv2Ny5NQBXT7Xpuswqnv+MuNgOqpKBTQCmU5
-						ILxIOviUIcAGZgNej3nHfgsT4NzydsiHVgFALirWLXH1J/NmB34+phUtMtaBa9T9
-						GrFRWzfWm+K5BCsK7pee4B0GXvbvmDO2BQ7WfIhuZ++8b3uIR+0Z0Giri+waZNPp
-						QdYt8st5T7TLnAVqn9pXqrKSHdHjrxfyfCgJOzSPQklYcPeTsnD5M5saEQhIo7WD
-						PIDUzYqlDKOVDtrCmA==
-					</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>
-						MIIC2TCCAcGgAwIBAgIJAMokAyU3GHytMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
-						BAMTBmlkNjMxOTAeFw0xMDAxMTkwOTU0MDZaFw0yMDAxMTcwOTU0MDZaMBExDzAN
-						BgNVBAMTBmlkNjMxOTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMYE
-						oDy4UOTnFc4+FU/zVYM1/+TpqI2+7paafYg6wwacMkMbEGHqp4F/uvM8UnPZcPGO
-						4s4BJO30ltKsCqexIxnTvg66V6aw5Gq/PooUCxXGP6rnUyDyTrSm9WWF17WVuLpH
-						pzMo5Ki8zlBWPxD2gd1uJuy+Lf8BJJ9aa9cYzx+glEARMXepiDaKpJFfkeSKemh5
-						BGVfH38NvBfN+lzaqhkjfyc9IuDPbFoNS5FNCiEN4zgvKxzGXVCZ6kdOgIuJ5Y0G
-						xENR6oRTJuXQqSSXyaVg1Vk4Z4a5IRIZaM/bOEFwDQGMKFWFIALybFncKQu5/wW1
-						4x5aIyLLxHmCnbobTsUCAwEAAaM0MDIwEQYDVR0RBAowCIIGaWQ2MzE5MB0GA1Ud
-						DgQWBBSbQnqKj1RxIHMszD6H3Yutb3tlkzANBgkqhkiG9w0BAQUFAAOCAQEAeEED
-						N2aGD0CE1PGcyPhARqR6RiXouYrXPhLmHz17SRn0VWBIDMSdZz7OKV8aoq08/qcA
-						V9ZnxpUBa6fFOOdMhWcMpHT6Wuroiv2Ny5NQBXT7Xpuswqnv+MuNgOqpKBTQCmU5
-						ILxIOviUIcAGZgNej3nHfgsT4NzydsiHVgFALirWLXH1J/NmB34+phUtMtaBa9T9
-						GrFRWzfWm+K5BCsK7pee4B0GXvbvmDO2BQ7WfIhuZ++8b3uIR+0Z0Giri+waZNPp
-						QdYt8st5T7TLnAVqn9pXqrKSHdHjrxfyfCgJOzSPQklYcPeTsnD5M5saEQhIo7WD
-						PIDUzYqlDKOVDtrCmA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iamlearning.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iamlearning.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iamlearning.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iamlearning.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://iamlearning.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iamlearning.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iamlearning.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iamlearning.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://iamlearning.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">I Education Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">I am learning: Games based revision and assessment for KS1, KS2, KS3, GCSE, Diplomas</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.iamlearning.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Wilkinson</SurName>
-    <EmailAddress>mailto:michael@i-ed.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Wilkinson</SurName>
-    <EmailAddress>mailto:michael@i-ed.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ibook.conel.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/ibook.conel.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 60770584..00000000
--- a/swamid-interfederations-2.0/ibook.conel.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://ibook.conel.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The College of Haringey, Enfield and North East London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-11-04T14:33: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">conel.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDljCCAn4CCQC2GrtEWJa7ZDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMT8wPQYDVQQKEzZU
-						aGUgQ29sbGVnZSBvZiBIYXJpbmdleSwgRW5maWVsZCBhbmQgTm9ydGggRWFzdCBM
-						b25kb24xGjAYBgNVBAMTEWlib29rLmNvbmVsLmFjLnVrMB4XDTE0MDgxOTA5NTgw
-						NloXDTM0MDgxNDA5NTgwNlowgYwxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25k
-						b24xDzANBgNVBAcTBkxvbmRvbjE/MD0GA1UEChM2VGhlIENvbGxlZ2Ugb2YgSGFy
-						aW5nZXksIEVuZmllbGQgYW5kIE5vcnRoIEVhc3QgTG9uZG9uMRowGAYDVQQDExFp
-						Ym9vay5jb25lbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ALI+EwkxJR4p9fFczE57JfAem52vTCttAPtmBYDi1yYWbLJoxU1cJ6rUg8XF55ko
-						XdntgC1lNhywPVI3wz391cTC1uEnI3aFzl2at2n52PZvxjXIdCjdKAbPJe8yDfAn
-						WlXwas6bmA5XB6gKiH8jlILbf8y9kKfS1mtIPZRcpLI4jJRmLwjH+XRB5u7OmyJP
-						umIc09m4n2F/lweM9iTCtpVX9386b53Y/vwC2hZvhyfkgdlzJJrsFboUSi/HHFQi
-						Q30yJ2mVYL5ouNibulPvKDML+z5eEsi2GmWmzN6LWaEsOo922G29hS4b3rTSXhs6
-						OQ9Nkzv8dTZyUyUT1t4sfD0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAmPG1EWh8
-						xeUk2+eIWxLUQIGfIvz+WQ1bMjsZ5gm5/OhcXDDXXs5cbDOXU80HLs+wrnBJYzTi
-						dgFduibuySRlLoJCx1bYuXtDF3YK1t0n53bHInvH/PXdmyY7JtKhq7Pz3QC50nBU
-						hvvt9vs0J534adQVSjdqRmWkztXfuavPpYRuBY2ShKWQ1NvQHOqQFnyhjoa102Cg
-						YR1ERoGgZVHUbUQ54/imCgKab0BIX3jQEqKrG+I9r0N9wuDN5ipzOJLhZ5P+7pcG
-						SPr9fTvqh5qQ+fx10Op5B8aMQFNCPFs4ZWRYKelBhsvpVTSv4VFTIL4dNs/io6EV
-						7JTb12wkv7+BIg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ibook.conel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ibook.conel.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://ibook.conel.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ibook.conel.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ibook.conel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ibook.conel.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">conel.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDljCCAn4CCQC2GrtEWJa7ZDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMT8wPQYDVQQKEzZU
-						aGUgQ29sbGVnZSBvZiBIYXJpbmdleSwgRW5maWVsZCBhbmQgTm9ydGggRWFzdCBM
-						b25kb24xGjAYBgNVBAMTEWlib29rLmNvbmVsLmFjLnVrMB4XDTE0MDgxOTA5NTgw
-						NloXDTM0MDgxNDA5NTgwNlowgYwxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25k
-						b24xDzANBgNVBAcTBkxvbmRvbjE/MD0GA1UEChM2VGhlIENvbGxlZ2Ugb2YgSGFy
-						aW5nZXksIEVuZmllbGQgYW5kIE5vcnRoIEVhc3QgTG9uZG9uMRowGAYDVQQDExFp
-						Ym9vay5jb25lbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ALI+EwkxJR4p9fFczE57JfAem52vTCttAPtmBYDi1yYWbLJoxU1cJ6rUg8XF55ko
-						XdntgC1lNhywPVI3wz391cTC1uEnI3aFzl2at2n52PZvxjXIdCjdKAbPJe8yDfAn
-						WlXwas6bmA5XB6gKiH8jlILbf8y9kKfS1mtIPZRcpLI4jJRmLwjH+XRB5u7OmyJP
-						umIc09m4n2F/lweM9iTCtpVX9386b53Y/vwC2hZvhyfkgdlzJJrsFboUSi/HHFQi
-						Q30yJ2mVYL5ouNibulPvKDML+z5eEsi2GmWmzN6LWaEsOo922G29hS4b3rTSXhs6
-						OQ9Nkzv8dTZyUyUT1t4sfD0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAmPG1EWh8
-						xeUk2+eIWxLUQIGfIvz+WQ1bMjsZ5gm5/OhcXDDXXs5cbDOXU80HLs+wrnBJYzTi
-						dgFduibuySRlLoJCx1bYuXtDF3YK1t0n53bHInvH/PXdmyY7JtKhq7Pz3QC50nBU
-						hvvt9vs0J534adQVSjdqRmWkztXfuavPpYRuBY2ShKWQ1NvQHOqQFnyhjoa102Cg
-						YR1ERoGgZVHUbUQ54/imCgKab0BIX3jQEqKrG+I9r0N9wuDN5ipzOJLhZ5P+7pcG
-						SPr9fTvqh5qQ+fx10Op5B8aMQFNCPFs4ZWRYKelBhsvpVTSv4VFTIL4dNs/io6EV
-						7JTb12wkv7+BIg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ibook.conel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ibook.conel.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 College of Haringey, Enfield and North East London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The College of Haringey, Enfield and North East London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.conel.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Varley</SurName>
-    <EmailAddress>mailto:jvarley@staff.conel.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Varley</SurName>
-    <EmailAddress>mailto:jvarley@staff.conel.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/icarus.sdstate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/icarus.sdstate.edu-idp-shibboleth.xml
deleted file mode 100644
index ca4fe2af..00000000
--- a/swamid-interfederations-2.0/icarus.sdstate.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,72 +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://icarus.sdstate.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://icarus.sdstate.edu/error.html/" 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">sdstate.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">South Dakota State University</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>
-MIIDMzCCAhugAwIBAgIUKA/N5InEM8Fk3MEN5e7UAQ9cOzcwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWNhcnVzLnNkc3RhdGUuZWR1MB4XDTEyMDUzMTIwMTg0
-NloXDTMyMDUzMTIwMTg0NlowHTEbMBkGA1UEAxMSaWNhcnVzLnNkc3RhdGUuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkNiBja9DimDPJi8snAgp
-sOFdV8AZxumd2LwAvfVygEuUZFMBsZQlF25f4CHoCJm7zga4molJK4Y4EUn8rz0u
-IgSZKQrbEPvqL2k8Zd8jx0FtFEExzhkWvM4NtTkYm6FTrOMmEyQq6A3Zc1e4QT5z
-t8TFTze1637Ow12L/QHuqtwwYIPenzmEsondUe5vyrciEpFmL8ajR1/VxD4EUg1m
-gwgx13wIghyaq2J47TgjPZdKbEuvWsDTnOHNkF3C/BzhmKPSLCyhCqKZLYWAkWGT
-W3f9UDDE8hlvKosukhc+hv271p1wLR4/V5nENtJ6WqHH2xLDbsRzOifQ2YXv1Rdw
-awIDAQABo2swaTBIBgNVHREEQTA/ghJpY2FydXMuc2RzdGF0ZS5lZHWGKWh0dHBz
-Oi8vaWNhcnVzLnNkc3RhdGUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQa
-EzkNjjzfH2WlulsJQaKUTG0J2zANBgkqhkiG9w0BAQUFAAOCAQEATpTa8hA5Txcn
-Dtz2rijhsam8OR5FZoJtnNf75QMiy2lKanXGwmKPszzFWb8DLmpFkxGVcfTauA/n
-gd/YaaZwuE0Y4xVReRd1marJgoTM+vzc/I8C4LXfJYH/p6E+JIYFTv6Q8FCSqc7Z
-aNOJ92M42hKbI3CK+GyOHOtwLfUmYNw880X64PkH+LWZ7NyyTxazfGDijDnRSPej
-KY8D/vt7ACNjpqMMsbBxDlB/wqcy655OeW4Ek1u0GzbmButiwjbsQ1V1wI7jdj52
-yUueGe5EjM8yKE0EhGTpcsf+7p7sbEJMFNZbOiJWKKIMlGD9NQnOKVesZCjrhsuA
-eDYD2tg4hg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://icarus.sdstate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://icarus.sdstate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://icarus.sdstate.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://icarus.sdstate.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://icarus.sdstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://icarus.sdstate.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">South Dakota State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">South Dakota State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www3.sdstate.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gary Christensen</md:GivenName>
-    <md:EmailAddress>Gary.Christensen@sdstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andy Kanuch</md:GivenName>
-    <md:EmailAddress>Andy.Kanuch@sdstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kevin Brandt</md:GivenName>
-    <md:EmailAddress>Kevin.Brandt@sdstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ryan Knutson</md:GivenName>
-    <md:EmailAddress>Ryan.Knutson@sdstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b6652dae..00000000
--- a/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.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://id.auf.org/idp/saml2/metadata">
-  <md: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>
-  </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 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="en">Agence Universitaire de la Francophonie (AUF)</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGFBMVEX///+zs7PY2Ngdndn/1QCNviNwIoPlJyeeATQOAAAAkklEQVQ4y2P8////fwYKAAsDAwPDli1b4AI+Pj4MyGI+Pj4o7Js3bzLcvn0bzmdC1oxuGDYA0wwDTOg2EwNUVVXh6pnI8fft27fhLmVioBAwEet3dIDhBVLCAKsLKPYCLkDIa0z4ogofHwYYKU7KcvNuwTmPLNTh7L6XynD245QEOLuUdQmcLXXjBh0CkRCgOAwAGl44oeCo9bsAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.auf.org</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Employees of the Agence universitaire de la Francophonie</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Agence universitaire de la Francophonie (AUF)</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Employés de l'Agence universitaire de la Francophonie</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>
-					      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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.auf.org/idp/saml2/slo"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.auf.org/idp/saml2/slo"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.auf.org/idp/saml2/slo/soap"/>
-    <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-POST" Location="https://id.auf.org/idp/saml2/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.auf.org/idp/saml2/sso"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.auf.org/idp/saml2/slo/soap"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Agence universitaire de la Francophonie (AUF)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Agence universitaire de la Francophonie (AUF)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.auf.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>ressources-informatiques@auf.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.nps.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/id.nps.edu-idp-shibboleth.xml
deleted file mode 100644
index 379785c4..00000000
--- a/swamid-interfederations-2.0/id.nps.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,73 +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://id.nps.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://id.nps.edu/idp/help.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nps.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Naval Postgraduate School</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Naval Postgraduate School Identity Provider</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.nps.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://my.nps.edu/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="69" width="100" xml:lang="en">https://id.nps.edu/idp/images/nps_logo.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>
-MIIDFDCCAfygAwIBAgIVAM2gN4tPKNZOEipQHfXFdM1sxWfzMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkLm5wcy5lZHUwHhcNMTUxMjA0MTkzMTE3WhcNMzUx
-MjA0MTkzMTE3WjAVMRMwEQYDVQQDDAppZC5ucHMuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgP9en/WfxAWe9aDUXWnup+Xeslht28QK5J2B9I+4
-EhEJ6CXJgX4q0cWLj18T76WBo2ZvKpgwMh49XDyGxPavnJryVosHQoirHpr5N33z
-Z5+geXrDmPkkKXO7iTCoiQ8DQWYEvmrlj1wTlq2Nd8FwgSozTprnWtyijhNZlm2K
-5i4r2te3HQdeegb9k44n7DboYnRFLaKwy+74LQ5/RbwIA5oZfQ76b8kWzSCdRC0z
-HK2WnAuyxy+4u7JTI4QjQ+GputqEyM1fMeLsF/23GqSMDVpD/BtJRzY3D3j3cz6B
-Ue+ABaJGbBAcQ4VPHWnKxx5U8VKood97XqnpN/2AHFUZSwIDAQABo1swWTAdBgNV
-HQ4EFgQUWxDS23WSKHpO0zaU1LD4hgvdFBYwOAYDVR0RBDEwL4IKaWQubnBzLmVk
-dYYhaHR0cHM6Ly9pZC5ucHMuZWR1L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA1e3zWP1ke/drvQ1i8SavOC2hBjpYfoIGNdLTdop2UR85vWQVn/cW8
-o6DmV/Jc5oAVdBVMnXCLgYIhFtOOokc8VYHo9Q2u0fQhcQWjpv07EVKgxplTCar0
-5r5NvNilpwQuMUfhBSaidCY3ogmVZsaGDDMxIba+VbkkflcqRJNrng/jsVRLJbGK
-jrQk4BB+3mECgvZw9Z1ejXIwif6LK+y1ErY0e6xQ0PyMOp39lS2ZpWf0IFqyKdV9
-vdTNeb8Pauw8SObWRJ91C0Hn5eajfmm4iaCOh5nkAyexSrOzdI/deoKfAVOOyBvl
-ccPVb6WCA68tlf2YbL2E57QkuO8lV1TL
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.nps.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.nps.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.nps.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://id.nps.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Naval Postgraduate School</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Naval Postgraduate School</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nps.navy.mil/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NPS Webmaster</md:GivenName>
-    <md:EmailAddress>webmaster@nps.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NPS Webmaster</md:GivenName>
-    <md:EmailAddress>webmaster@nps.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NPS TAC</md:GivenName>
-    <md:EmailAddress>tac@nps.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>NPS Cybersecurity</md:GivenName>
-    <md:EmailAddress>ia-support@nps.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml
deleted file mode 100644
index 0f0ac21f..00000000
--- a/swamid-interfederations-2.0/id.uakron.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://id.uakron.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://auth.uakron.edu/zid/app/info_shibboleth.cgi" 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">uakron.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Akron, Main Campus, The</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>
-MIIDHzCCAgegAwIBAgIUWqlhIDDhtbdTxv8PudiQyd/lZz8wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWQudWFrcm9uLmVkdTAeFw0wOTA3MzExODUxMzFaFw0y
-OTA3MzExODUxMzFaMBgxFjAUBgNVBAMTDWlkLnVha3Jvbi5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ9Wma2T+JSh/pLQgTf53zN0MQMRyNkWEe
-r1AENHUkIUBNillAznTgcIMOQH4r6x+LMZ6m4dqYjEwiCALJFwLoMT8zNlaijehw
-mw/jhHJL8W5YWOD2JoMI4tbS7e9fT17213HaIQkNPraEDazph5AXNlnnK68ZsdPR
-6BGNv+JQ8MseScY5mABb6atGbIG7glGrbaJmGz9sZxR3YKGMsjl0YXi1JNodAVCY
-QFie3D9wFkqkLh8r5+EI/OaBR/qm4stUYCeHq2MStSfTzBiw4Oa/TVJ1/5HUPjbV
-BR9kSAYEuDBU/OxvsI9QI7nfTztXmQMT+ASJERUJGmYokSqsg98bAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkLnVha3Jvbi5lZHWGJGh0dHBzOi8vaWQudWFrcm9uLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUgXS38monlKlGJjC0Bjq5AH6ROTUw
-DQYJKoZIhvcNAQEFBQADggEBAArFR6KCxhSujKxGNg/4HGsXA4+nJO4s2EHOxzwS
-r7x1/4nRvo7bkTupeIEXr8h7mRh3OYMQNIyAnJeeBAPuYqxQJKrnkdW654OPcSuM
-tFNDc0i7G0Sw1Uzh1Nqu1r2RDCoElzs9DjtuD8VYab1MB8YY9XInLxNzj6h79yu9
-be/YWBIuiufRvSSJBF+bLJDosEGW5c/Q2fugkeTEogZxkg6bYLSyUE847ZSECvDT
-JxjcvM9YQU0Yo4B1G3Z2r9ffCvOilvF8WOJdsJ6RtlSGaekP6lmvY0fM5bGg/RET
-yKK0Tva8sW6/o1lASk+4Xe+Gj9fkQ8TdonS43+5kgepXP0U=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.uakron.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.uakron.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.uakron.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.uakron.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uakron.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uakron.edu/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">uakron.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUWqlhIDDhtbdTxv8PudiQyd/lZz8wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWQudWFrcm9uLmVkdTAeFw0wOTA3MzExODUxMzFaFw0y
-OTA3MzExODUxMzFaMBgxFjAUBgNVBAMTDWlkLnVha3Jvbi5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ9Wma2T+JSh/pLQgTf53zN0MQMRyNkWEe
-r1AENHUkIUBNillAznTgcIMOQH4r6x+LMZ6m4dqYjEwiCALJFwLoMT8zNlaijehw
-mw/jhHJL8W5YWOD2JoMI4tbS7e9fT17213HaIQkNPraEDazph5AXNlnnK68ZsdPR
-6BGNv+JQ8MseScY5mABb6atGbIG7glGrbaJmGz9sZxR3YKGMsjl0YXi1JNodAVCY
-QFie3D9wFkqkLh8r5+EI/OaBR/qm4stUYCeHq2MStSfTzBiw4Oa/TVJ1/5HUPjbV
-BR9kSAYEuDBU/OxvsI9QI7nfTztXmQMT+ASJERUJGmYokSqsg98bAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkLnVha3Jvbi5lZHWGJGh0dHBzOi8vaWQudWFrcm9uLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUgXS38monlKlGJjC0Bjq5AH6ROTUw
-DQYJKoZIhvcNAQEFBQADggEBAArFR6KCxhSujKxGNg/4HGsXA4+nJO4s2EHOxzwS
-r7x1/4nRvo7bkTupeIEXr8h7mRh3OYMQNIyAnJeeBAPuYqxQJKrnkdW654OPcSuM
-tFNDc0i7G0Sw1Uzh1Nqu1r2RDCoElzs9DjtuD8VYab1MB8YY9XInLxNzj6h79yu9
-be/YWBIuiufRvSSJBF+bLJDosEGW5c/Q2fugkeTEogZxkg6bYLSyUE847ZSECvDT
-JxjcvM9YQU0Yo4B1G3Z2r9ffCvOilvF8WOJdsJ6RtlSGaekP6lmvY0fM5bGg/RET
-yKK0Tva8sW6/o1lASk+4Xe+Gj9fkQ8TdonS43+5kgepXP0U=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.uakron.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.uakron.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Akron, Main Campus, The</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Akron, Main Campus, The</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uakron.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Keith Hunt</md:GivenName>
-    <md:EmailAddress>keith@uakron.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Keith Piepho</md:GivenName>
-    <md:EmailAddress>kap@uakron.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andrew Lucas</md:GivenName>
-    <md:EmailAddress>arl14@uakron.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d08788dc..00000000
--- a/swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.ucly.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université Catholique de Lyon</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACr0lEQVQ4y3WSW4jUZRjGf+/3ff/TjLsz4+q2ajSVK7pGyxbShhdqemO0mFCIF4E3ddGNd+KFIIoRsd2kFAgWXkmwUIQhXWwKVkgHSvEAbdHJPCCpjO7M/Gfmf3i9mF3dWnvgg5fv4sfzvs8j3+8Z33/x8LFdfqk36tTuAhBUSrRrd8k6HQRh8ZqnAbh1YQpNUwCM77W9KDpoR89dm/RLPcGGI+9w+cQpxBo2fDjOlcmvyTsJ6z44QHnFE/RUH6U29RudO9OItWiWuTSOn3eoOrGWsFIGERAhXFgmi9us2vEqLgqZfG0nzg9xxQhxDgBEEGutQQSAPMuYVZ5lqCqPjI5w5ctvsM7HFSMeJjM7yJxPQREjuEJE2owRI/yfTNdN17qmKZpm3TlXOtN1wr4KeSdB8xxU5wPECEm9gQ0DykODVFYPYgOf9u0afx6fZPm2MYrLBggrJWwYzIPYlwsD+9Jmi/jGTQa3jbFoZDW/fnwczXNqv/yBGMPKHa/Qv2aYmz9eIJluIMY8WPejyrCKCEkzxjhH2mwxsPZZtn41wU9vvc+ZvW9TKC8mjVtY30dVyZMEF4Ug0r2BquKiEOM5jHN4xcJMTAYrPoUl/Ty2eT02DOipLqP60sbuOrni5l1FusBZcK4pYV+FzZ8d4fTru6mObWLRM08xMfIiwEMAc5QnKUrOjW/Pcv30d4zsfpPi0n5+2PceyXQDr3fBgx78y8RM7uWVT1Ld+AJBuYfzh45SWvE4eZrx+ydf4ArhTA/+E4uIkMVt6n9fY8m659h07CB9w0NcPXWGLG7x1+cnqV++er/SjlwVg8xW2kYBty5O8eno1vudb9+uMbh9CzYK+fnoBMbzQBVVxQy9sf1doDXXiWYZSaPZffUGiGADn3Pjh/nn7CVs4GM8r+OXeg/dAz0dAW3p/6VRAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjQ0KzAyOjAwpD3o3wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo0NCswMjowMNVgUGMAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-catholyon.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université Catholique de Lyon</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>
-					      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>
-    </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-POST" Location="https://id.ucly.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.ucly.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.ucly.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université Catholique de Lyon</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Catholique de Lyon</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-catholyon.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>support.informatique@univ-catholyon.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.uni.lu-idp.xml b/swamid-interfederations-2.0/id.uni.lu-idp.xml
deleted file mode 100644
index 660dcfd5..00000000
--- a/swamid-interfederations-2.0/id.uni.lu-idp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.uni.lu/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-11-12T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-10.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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>MIIFrDCCBJSgAwIBAgIDBUc8MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkxVMRYwFAYDVQQKEw1MdXhUcnVzdCBTLkEuMR4wHAYDVQQDExVMdXhUcnVzdCBRdWFsaWZpZWQgQ0EwHhcNMTIxMTI4MDg0OTQ5WhcNMTUxMTI4MDg0OTQ5WjCBsDELMAkGA1UEBhMCTFUxEzARBgNVBAgTCkx1eGVtYm91cmcxEzARBgNVBAcTCkx1eGVtYm91cmcxITAfBgNVBAoTGFVuaXZlcnNpdHkgb2YgTHV4ZW1ib3VyZzEdMBsGA1UECxMUU2VydmljZSBJbmZvcm1hdGlxdWUxETAPBgNVBAMUCCoudW5pLmx1MSIwIAYJKoZIhvcNAQkBFhNjZXJ0aWZpY2F0ZXNAdW5pLmx1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx7I7hBbO60P7dLN40GIbAE3foBXJYpvBUPmPQ7RLd9XVsalzXyIsRFo4f0PHfwNq33dzcnKW8fAcAqhjDSB2BGjNdntXHyXN79aejifNp0XkKizMXTeJwo9Glk+QUAtwXMUdQSoc6l77uUYkrtASQmPEQcRffsB//lhstNZuk/aXu4C4hle5yQDLweEmLZ3W0vuTVZL+7ZvJv1Jswv4Ftyp8bIvZKkkcrOUtyxytPEUkT373OtM+c41s5dm89pL5OTQVbXCb51V7bG0sGjSla0dC8oWGSrdkQ5CYqFmtYQ1qrj8uM57+MurkZ0Cw2qARHgM3KwdJynO3xkzySYzJgwIDAQABo4ICNzCCAjMwDAYDVR0TAQH/BAIwADBgBggrBgEFBQcBAQRUMFIwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmx1eHRydXN0Lmx1MCsGCCsGAQUFBzAChh9odHRwOi8vY2EubHV4dHJ1c3QubHUvTFRRQ0EuY3J0MIIBAAYDVR0gBIH4MIH1MIHoBggrgSsBAQIGATCB2zCBrQYIKwYBBQUHAgIwgaAagZ1MdXhUcnVzdCBTZXJ2ZXIgQ2VydGlmaWNhdGUuIE5vdCBzdXBwb3J0ZWQgYnkgU1NDRCwgS2V5IEdlbmVyYXRpb24gYnkgU3Vic2NyaWJlci4gR1RDLCBDUCBhbmQgQ1BTIG9uIGh0dHA6Ly9yZXBvc2l0b3J5Lmx1eHRydXN0Lmx1LiBTaWduZWQgYnkgYSBRdWFsaWZpZWQgQ0EuMCkGCCsGAQUFBwIBFh1odHRwOi8vcmVwb3NpdG9yeS5sdXh0cnVzdC5sdTAIBgYEAI96AQMwEQYJYIZIAYb4QgEBBAQDAgXgMA4GA1UdDwEB/wQEAwIEsDAnBgNVHSUEIDAeBggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEMB8GA1UdIwQYMBaAFI2QowfdGhN3mUySq01D3j/NKWQFMDEGA1UdHwQqMCgwJqAkoCKGIGh0dHA6Ly9jcmwubHV4dHJ1c3QubHUvTFRRQ0EuY3JsMB0GA1UdDgQWBBS2o4jPLL1nP8gTGV5uScNo06jzajANBgkqhkiG9w0BAQUFAAOCAQEAc22D7Hdvn8Nyz2Zzh9JYfFOEYg4Sb6yyfPBjjJtDSFAq4asIoMG7b/TRbASX6VX/NGkOw3OhlKF15tPqNpG481K8xmgonA7b95eks0JeYX0Mvub+eYxDcatXPa/WXxTnRlDU7/ihZvyBwALDSSLyQ+NK31iTt5uBaQnChgyGYvIqB3j0zbPfUoX0v+SW/hy+tczC8XA/lv10W4VQ3LrELkRgK4CrOVDNp4IV+43TCFVKO3+ddVGo8Kjw4nJJ4HzPKLpU89GXscLu5wOKTjPLM8fmMCGszZuY1ZOtR2BaTws/38OjgY5O1MBBWMoqrfy7Do8JiMswQjbSHAUKKX4YZQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.uni.lu/saml/idp/profile/post/sls" ResponseLocation="https://id.uni.lu/saml/idp/profile/post/slr"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.uni.lu/saml/idp/profile/redirectorpost/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uni.lu/saml/idp/profile/redirectorpost/sso"/>
-  </md:IDPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index af8752df..00000000
--- a/swamid-interfederations-2.0/id.uni.lu-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.uni.lu/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-12-07T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-10.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">University of Luxembourg</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for members of the University of Luxembourg</mdui:Description>
-        <mdui:Keywords xml:lang="en">Uni.lu+login</mdui:Keywords>
-        <mdui:Logo width="73" height="78" xml:lang="en">https://id.uni.lu/uni.lu.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>158.64.76.0/16</mdui:IPHint>
-        <mdui:IPHint>158.64.77.0/16</mdui:IPHint>
-        <mdui:IPHint>158.64.79.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:a18:a/48</mdui:IPHint>
-        <mdui:DomainHint>uni.lu</mdui:DomainHint>
-        <mdui:DomainHint>www.uni.lu</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:49.507027, 5.997479</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>MIIEXzCCA0egAwIBAgIJAKDm6mKXJYiwMA0GCSqGSIb3DQEBCwUAMIHFMQswCQYDVQQGEwJMVTEhMB8GA1UECAwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMRkwFwYDVQQHDBBFc2NoLXN1ci1BbHpldHRlMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIEx1eGVtYm91cmcxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMRIwEAYDVQQDDAlpZC51bmkubHUxIjAgBgkqhkiG9w0BCQEWE2NlcnRpZmljYXRlc0B1bmkubHUwHhcNMTUxMjAyMDkxMDMxWhcNMjUxMjAxMDkxMDMxWjCBxTELMAkGA1UEBhMCTFUxITAfBgNVBAgMGFVuaXZlcnNpdHkgb2YgTHV4ZW1ib3VyZzEZMBcGA1UEBwwQRXNjaC1zdXItQWx6ZXR0ZTEhMB8GA1UECgwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMR0wGwYDVQQLDBRTZXJ2aWNlIEluZm9ybWF0aXF1ZTESMBAGA1UEAwwJaWQudW5pLmx1MSIwIAYJKoZIhvcNAQkBFhNjZXJ0aWZpY2F0ZXNAdW5pLmx1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ZMI3ywdamSEBCfIWxqsES7P0nZCMgd9Qw+mIe6p4pBbP6+mRdqgoZeyrBsHYf+nSMGq5Ac1h+0OyKhpVf7bW7E0MFUbAxl14dlc6J6QkDexCQbxxQNZQu89zSggdyOhp8dv/1z37vLMR2JDNBqiu9KmpptSyqPQwXE4+DFipMjvWSXsie+eMh4LTs5wunoVdIyA34lwxseWUg+l5NEfR0MfmOVBpLYmA5rxf5c2p0htMUk9UnaEm/ZiaAqvzOBEzO8HxQaE4PJVi6wx/RKdTMR2yesjf8faHAT5AmFSjGr/N+TZJHy/tndzfusCX1u9hrGABWyo7eyyjGLtJOLG+QIDAQABo1AwTjAdBgNVHQ4EFgQU6lnJmhtoUhVPR80x/CqoH7oPzNUwHwYDVR0jBBgwFoAU6lnJmhtoUhVPR80x/CqoH7oPzNUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVbf3wP9fXOjWAGL32mRZ5PuW8ZsyL+cYGLu6fS8diqTu7fCkQWLwjzXIHWSMgRyflDv6BLmVuAVz/wOnDUb4tRl/FYxShpHjQ1LbyqO2MJmtQxw/v+vjb25Gr/9cPPCDtUrdOcGhK3Hz/p5+6ti+qaZdSLFo1/S6q2UWoYvVq1WhRzC5SyLRrFUS09S8bABDSYiLKNwJwhoiP3LpUuXtG37ai8xojQcjAwWiuw73MYcCH+909HKvRUcgiJoIdYoEV1Nh/Fz5CtIBC3TCvF84UXn5ycB0GU7qL9o04O7tYgtW0w5sCCxvD5ks03KYY1JKY1UV2n0ITA/rhHw82yMTwA==</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>MIIEXzCCA0egAwIBAgIJAKDm6mKXJYiwMA0GCSqGSIb3DQEBCwUAMIHFMQswCQYDVQQGEwJMVTEhMB8GA1UECAwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMRkwFwYDVQQHDBBFc2NoLXN1ci1BbHpldHRlMSEwHwYDVQQKDBhVbml2ZXJzaXR5IG9mIEx1eGVtYm91cmcxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMRIwEAYDVQQDDAlpZC51bmkubHUxIjAgBgkqhkiG9w0BCQEWE2NlcnRpZmljYXRlc0B1bmkubHUwHhcNMTUxMjAyMDkxMDMxWhcNMjUxMjAxMDkxMDMxWjCBxTELMAkGA1UEBhMCTFUxITAfBgNVBAgMGFVuaXZlcnNpdHkgb2YgTHV4ZW1ib3VyZzEZMBcGA1UEBwwQRXNjaC1zdXItQWx6ZXR0ZTEhMB8GA1UECgwYVW5pdmVyc2l0eSBvZiBMdXhlbWJvdXJnMR0wGwYDVQQLDBRTZXJ2aWNlIEluZm9ybWF0aXF1ZTESMBAGA1UEAwwJaWQudW5pLmx1MSIwIAYJKoZIhvcNAQkBFhNjZXJ0aWZpY2F0ZXNAdW5pLmx1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ZMI3ywdamSEBCfIWxqsES7P0nZCMgd9Qw+mIe6p4pBbP6+mRdqgoZeyrBsHYf+nSMGq5Ac1h+0OyKhpVf7bW7E0MFUbAxl14dlc6J6QkDexCQbxxQNZQu89zSggdyOhp8dv/1z37vLMR2JDNBqiu9KmpptSyqPQwXE4+DFipMjvWSXsie+eMh4LTs5wunoVdIyA34lwxseWUg+l5NEfR0MfmOVBpLYmA5rxf5c2p0htMUk9UnaEm/ZiaAqvzOBEzO8HxQaE4PJVi6wx/RKdTMR2yesjf8faHAT5AmFSjGr/N+TZJHy/tndzfusCX1u9hrGABWyo7eyyjGLtJOLG+QIDAQABo1AwTjAdBgNVHQ4EFgQU6lnJmhtoUhVPR80x/CqoH7oPzNUwHwYDVR0jBBgwFoAU6lnJmhtoUhVPR80x/CqoH7oPzNUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVbf3wP9fXOjWAGL32mRZ5PuW8ZsyL+cYGLu6fS8diqTu7fCkQWLwjzXIHWSMgRyflDv6BLmVuAVz/wOnDUb4tRl/FYxShpHjQ1LbyqO2MJmtQxw/v+vjb25Gr/9cPPCDtUrdOcGhK3Hz/p5+6ti+qaZdSLFo1/S6q2UWoYvVq1WhRzC5SyLRrFUS09S8bABDSYiLKNwJwhoiP3LpUuXtG37ai8xojQcjAwWiuw73MYcCH+909HKvRUcgiJoIdYoEV1Nh/Fz5CtIBC3TCvF84UXn5ycB0GU7qL9o04O7tYgtW0w5sCCxvD5ks03KYY1JKY1UV2n0ITA/rhHw82yMTwA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.uni.lu/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://id.uni.lu/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Luxembourg</md:OrganizationName>
-    <md:OrganizationName xml:lang="fr">Université du Luxembourg</md:OrganizationName>
-    <md:OrganizationName xml:lang="de">Universität  Luxemburg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Luxembourg (Uni.lu)  Users</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uni.lu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.uni.lu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SIU</md:GivenName>
-    <md:SurName>SNS</md:SurName>
-    <md:EmailAddress>eduid@uni.lu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 25aa4b40..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://id.vse.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.vse.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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://id.vse.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.vse.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://id.vse.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.vse.cz/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">vse.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://id.vse.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://id.vse.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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">Vysoká škola ekonomická v Praze</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Economics, Prague</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">Vysoká škola ekonomická v Praze</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Economics, Prague</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="cs">http://www.vse.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.vse.cz/english/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>František</md:GivenName>
-    <md:SurName>Kučera</md:SurName>
-    <md:EmailAddress>frantisek.kucera@vse.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml
deleted file mode 100644
index c4ef8622..00000000
--- a/swamid-interfederations-2.0/idea.ifc.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idea.ifc.cnr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifc.cnr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CNR Institute of Clinical Physiology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">CNR Istituto di Fisiologia Clinica</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for CNR Institute of Clinical Physiology users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR Istituto di Fisiologia Clinica</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://faq.ifc.cnr.it/index.php?sid=51484&amp;lang=it&amp;action=show&amp;cat=3</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.ifc.cnr.it/index.php/en</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAPXQh7YfSjXSWrkZLXYT1bUm2Vj+MA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkZWEuaWZjLmNuci5pdDAeFw0wODExMjYxNjA0MTBa
-Fw0yODExMjYxNjA0MTBaMBoxGDAWBgNVBAMTD2lkZWEuaWZjLmNuci5pdDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI6NBU4faqRoOEnab3DbjGPsno9a
-1j712yFWDpdxErwUmAAHUh83NmtwVKRSrVvZmymnGGEjBk7/2jTGfmpC/YdGm67j
-n/dbU3WCTnl+RhJh4/LrSJCsUmgw9r0JNo5BfHA781xvBIGprsHD8GOnmNIdK4nV
-dGSrslc3VpSP8Zhlaov5F5bGZuHa/dFM/GVI4YLZR0O2QNm6U3gIWM9TeaLofmA3
-p1fFP/3CZlPPyNAHWUkylA4XebuLFwrA4bzpgJgkTdmc1NclfF/qPmYLsE6dxag1
-7mQNp4RPdvgf43Ivmp6Cx4UMYc1+Wu0DolG1c/vesbMnK3QdIYy3xFDjAnsCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRlYS5pZmMuY25yLml0hiZodHRwczovL2lkZWEu
-aWZjLmNuci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUAMIFF2Om2oTqwjUJ
-WyZb5He25R8wDQYJKoZIhvcNAQEFBQADggEBAG2loG5n8grIuX6Vr1H77E3N94O4
-QtNspFXjFOEtsFvgb+glgIRFd/4L3HCW2oWAebZ/s9JRXn+6YcrOA22SP+xg1OcQ
-JWlqTvr3XiSYQ9FjudBSt39cnOxlmwp/7SptWqLeMiZYs/muHaxcLeQMJ7W6z3wc
-SkvwMpHeTlORAfPh3RByRH9MD4rum56xY4CMP0HzcXg3iLvlBgxp63VnT216xKfR
-eI8m4D0Jiu4VLtvkSAfUOcBpXPjW7KSsp6O+GMCHG+DHBcYfv8/FaP80IBenVNfd
-nvu7cp9h/xfMf1OV7tsIADMKQAeFLnIKyd74JxiM9rBSHLqWmcK2jklOHCc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idea.ifc.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idea.ifc.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idea.ifc.cnr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idea.ifc.cnr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idea.ifc.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idea.ifc.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifc.cnr.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAPXQh7YfSjXSWrkZLXYT1bUm2Vj+MA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkZWEuaWZjLmNuci5pdDAeFw0wODExMjYxNjA0MTBa
-Fw0yODExMjYxNjA0MTBaMBoxGDAWBgNVBAMTD2lkZWEuaWZjLmNuci5pdDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI6NBU4faqRoOEnab3DbjGPsno9a
-1j712yFWDpdxErwUmAAHUh83NmtwVKRSrVvZmymnGGEjBk7/2jTGfmpC/YdGm67j
-n/dbU3WCTnl+RhJh4/LrSJCsUmgw9r0JNo5BfHA781xvBIGprsHD8GOnmNIdK4nV
-dGSrslc3VpSP8Zhlaov5F5bGZuHa/dFM/GVI4YLZR0O2QNm6U3gIWM9TeaLofmA3
-p1fFP/3CZlPPyNAHWUkylA4XebuLFwrA4bzpgJgkTdmc1NclfF/qPmYLsE6dxag1
-7mQNp4RPdvgf43Ivmp6Cx4UMYc1+Wu0DolG1c/vesbMnK3QdIYy3xFDjAnsCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRlYS5pZmMuY25yLml0hiZodHRwczovL2lkZWEu
-aWZjLmNuci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUAMIFF2Om2oTqwjUJ
-WyZb5He25R8wDQYJKoZIhvcNAQEFBQADggEBAG2loG5n8grIuX6Vr1H77E3N94O4
-QtNspFXjFOEtsFvgb+glgIRFd/4L3HCW2oWAebZ/s9JRXn+6YcrOA22SP+xg1OcQ
-JWlqTvr3XiSYQ9FjudBSt39cnOxlmwp/7SptWqLeMiZYs/muHaxcLeQMJ7W6z3wc
-SkvwMpHeTlORAfPh3RByRH9MD4rum56xY4CMP0HzcXg3iLvlBgxp63VnT216xKfR
-eI8m4D0Jiu4VLtvkSAfUOcBpXPjW7KSsp6O+GMCHG+DHBcYfv8/FaP80IBenVNfd
-nvu7cp9h/xfMf1OV7tsIADMKQAeFLnIKyd74JxiM9rBSHLqWmcK2jklOHCc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idea.ifc.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idea.ifc.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">CNR Istituto di Fisiologia Clinica</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CNR Institute of Clinical Physiology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">https://www.ifc.cnr.it/index.php/it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.ifc.cnr.it/index.php/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Raffaele Conte</md:SurName>
-    <md:EmailAddress>mailto:idem@ifc.cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml
deleted file mode 100644
index 39263637..00000000
--- a/swamid-interfederations-2.0/idem-idp.ilc.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,120 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem-idp.ilc.cnr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-13T13:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilc.cnr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CNR Institute for Computational Linguistics "Antonio Zampolli"</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for CNR Institute for Computational Linguistics "Antonio Zampolli" users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ilc.cnr.it/en/content/idem-federation</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.ilc.cnr.it/it/content/federazione-idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.ilc.cnr.it/en/content/idem-federation-privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.ilc.cnr.it/it/content/privacy-federazione-idem</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://webmail.ilc.cnr.it/ILC_Logo_IDEM_80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:43.718450,10.421310</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUXkyFgauxs3Gvhmwuh/SlNXsNSc0wDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTaWRlbS1pZHAuaWxjLmNuci5pdDAeFw0wOTA0MTcxNTM5
-MzlaFw0yOTA0MTcxNTM5MzlaMB4xHDAaBgNVBAMTE2lkZW0taWRwLmlsYy5jbnIu
-aXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCldH2pporkbRUOfzYX
-Wk0eARcI/cJeLA1IoAG/UY0fqsWvcNeL5XpJfd/0k6dUW6Rs/FxJ4TMqpwlo8wzX
-8FPHOX4LgZyMyhTL4iSt+aQGL/hkUPhljKblOTNHFZb/wd0K0wAU2qpTHhkMxQw2
-aQNf9jwWF3RJZjfKa3vyXzJJiwp/w2ZRGdX3DX3tLVDqMGZKjn9nSKJ/0RGq3moT
-3XmDi58xnro1YOo5XeTfwoXwNoj/OQEkC09xE7ziXWgSm6X9I2WQz3qeCeTkQz6X
-lrs8EcBXk13A+nRiCvh4EakvkkvR0MndmgjGU4SviQOBC3lW8bHrnZ2umeAydA/d
-KHIhAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkZW0taWRwLmlsYy5jbnIuaXSGKmh0
-dHBzOi8vaWRlbS1pZHAuaWxjLmNuci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUolK5cLQOplyydlyGGibaknSuMpwwDQYJKoZIhvcNAQEFBQADggEBADf3UkpS
-n1jL36PgbCKtDRkzdsOZybkaDixZw1zZ/AFX7cfJ0E/9/jveXzbIxF1VxHbZvQtl
-woq3TK2t3R3sr9BN+uF0C/fMXYfwKxTUVwm9z/QxkXrzZWbfrMvLlZaaE4HyeLTk
-VP1W/JE/J2pT9ohGd0qYMoecrcQJRuiSSnb0wXEZqHFROcirBcvtoitOtESU1JQ6
-5eYHD7pnBG2EiQK5oPXh2U1qphgYCliTuWz4PNv5KtQuBJmH3TBeWj8Ku1V/FVdz
-KB5CmOx6J8t5wNaPfSwzWnk1WWNCfw9mSGWS5deY4w9NCNaGTJLA78MOMuvh7uKh
-4oS/xrwwW80e7RU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem-idp.ilc.cnr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem-idp.ilc.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ilc.cnr.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUXkyFgauxs3Gvhmwuh/SlNXsNSc0wDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTaWRlbS1pZHAuaWxjLmNuci5pdDAeFw0wOTA0MTcxNTM5
-MzlaFw0yOTA0MTcxNTM5MzlaMB4xHDAaBgNVBAMTE2lkZW0taWRwLmlsYy5jbnIu
-aXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCldH2pporkbRUOfzYX
-Wk0eARcI/cJeLA1IoAG/UY0fqsWvcNeL5XpJfd/0k6dUW6Rs/FxJ4TMqpwlo8wzX
-8FPHOX4LgZyMyhTL4iSt+aQGL/hkUPhljKblOTNHFZb/wd0K0wAU2qpTHhkMxQw2
-aQNf9jwWF3RJZjfKa3vyXzJJiwp/w2ZRGdX3DX3tLVDqMGZKjn9nSKJ/0RGq3moT
-3XmDi58xnro1YOo5XeTfwoXwNoj/OQEkC09xE7ziXWgSm6X9I2WQz3qeCeTkQz6X
-lrs8EcBXk13A+nRiCvh4EakvkkvR0MndmgjGU4SviQOBC3lW8bHrnZ2umeAydA/d
-KHIhAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkZW0taWRwLmlsYy5jbnIuaXSGKmh0
-dHBzOi8vaWRlbS1pZHAuaWxjLmNuci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUolK5cLQOplyydlyGGibaknSuMpwwDQYJKoZIhvcNAQEFBQADggEBADf3UkpS
-n1jL36PgbCKtDRkzdsOZybkaDixZw1zZ/AFX7cfJ0E/9/jveXzbIxF1VxHbZvQtl
-woq3TK2t3R3sr9BN+uF0C/fMXYfwKxTUVwm9z/QxkXrzZWbfrMvLlZaaE4HyeLTk
-VP1W/JE/J2pT9ohGd0qYMoecrcQJRuiSSnb0wXEZqHFROcirBcvtoitOtESU1JQ6
-5eYHD7pnBG2EiQK5oPXh2U1qphgYCliTuWz4PNv5KtQuBJmH3TBeWj8Ku1V/FVdz
-KB5CmOx6J8t5wNaPfSwzWnk1WWNCfw9mSGWS5deY4w9NCNaGTJLA78MOMuvh7uKh
-4oS/xrwwW80e7RU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.ilc.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">CNR Istituto di Linguistica Computazionale "Antonio Zampolli"</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CNR Institute for Computational Linguistics "Antonio Zampolli"</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.ilc.cnr.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ilc.cnr.it/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alessandro</md:GivenName>
-    <md:SurName>Enea</md:SurName>
-    <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Del Gratta</md:SurName>
-    <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:idem@ilc.cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml
deleted file mode 100644
index 45ee2cd3..00000000
--- a/swamid-interfederations-2.0/idem-idp.imtlucca.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem-idp.imtlucca.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-09T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imtlucca.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IMT Lucca - Identity Provider</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IMT Lucca - Identity Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for IMT Lucca users. This IdP permits to access services presents in the IDEM GARR Federation</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti di IMT Lucca. Questo IdP permette di accedere a servizi disponibili nella federazione GARR IDEM</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.imtlucca.it/campus/idem.php</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.imtlucca.it/campus/idem.php</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://www.imtlucca.it/_img/logo/new/logo_imt_16x16_square_blueback.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://www.imtlucca.it/_img/logo/new/logo_imt_16x16_square_blueback.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://www.imtlucca.it/_img/logo/new/logo_imt_80x80_square_blueback.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://www.imtlucca.it/_img/logo/new/logo_imt_80x80_square_blueback.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.imtlucca.it/campus/idem.php</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.imtlucca.it/campus/idem.php</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAIF5g404xBT9pz/2nuMWOQA6KHj6MA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGlkZW0taWRwLmltdGx1Y2NhLml0MB4XDTEzMDkxMDE2
-MTEyNVoXDTMzMDkxMDE2MTEyNVowHzEdMBsGA1UEAxMUaWRlbS1pZHAuaW10bHVj
-Y2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCecL5DE82gqAf8
-cuxD6rg+49Rt5l/hie4RKn2YpPYoxLxrr0TuE2PV2D/04dHJmT4g8HClV80HwHHx
-cT6hItjkLtBN2JeogwefBnk4tQdaEluvd/r3RNZF9Re5NKcrHNMPJGd8RqZPwL/Z
-MpPIHTJzO1WNpPO+H4w/tYVJdhlE1vn/0d3lCYBdX6FT4i10XxWx7er9sdEj9ndX
-8LhHuA2O2z197jHEEufG6XAThBV8XACOaqNkw+nVbk2GS4EltIOZRqdeC0qvATs8
-AiWGpK5K7bgdIfItscYTkDpbOeZwFUkdxpOJ7ujqMgjZCbJ0WfPXmWEFGuixYXki
-LXM7vQQLAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkZW0taWRwLmltdGx1Y2NhLml0
-hitodHRwczovL2lkZW0taWRwLmltdGx1Y2NhLml0L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRw6DX3JFHnfUlXHQXxcYUaIkKDmTANBgkqhkiG9w0BAQUFAAOCAQEA
-EzNzUHWImZwxpf8bu1BudPjcmtyQqHyPThTrpAd6UWm+MiwCPRdEYEfgWSnvGh0B
-STzyTtF/0PTMXNt+ocPryWFlpigO6d4H/QBWNtlPqWmLfLFsrTm1Cvy6ihmSsqVk
-nFN3qHAfJd0Xl05zk0oxDg6u8CXWzlFJcKxm2P8ujJYkJVHkt3saNinZop7+oazU
-YM5NpKde4RG0tQJvDuzN3xFLCtTUZe9EnOV0tniikwk4ZGDFy7F14POhmYvq+V+W
-PMrXoG08C30q+20nepBYJz2JoY9nQlmGor4yK6Ft8RvgmYq1BuwEkAHYnWf4B26l
-BgRrAVj5NpDfLOfRZq+LOg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.imtlucca.it: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://idem-idp.imtlucca.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem-idp.imtlucca.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imtlucca.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAIF5g404xBT9pz/2nuMWOQA6KHj6MA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGlkZW0taWRwLmltdGx1Y2NhLml0MB4XDTEzMDkxMDE2
-MTEyNVoXDTMzMDkxMDE2MTEyNVowHzEdMBsGA1UEAxMUaWRlbS1pZHAuaW10bHVj
-Y2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCecL5DE82gqAf8
-cuxD6rg+49Rt5l/hie4RKn2YpPYoxLxrr0TuE2PV2D/04dHJmT4g8HClV80HwHHx
-cT6hItjkLtBN2JeogwefBnk4tQdaEluvd/r3RNZF9Re5NKcrHNMPJGd8RqZPwL/Z
-MpPIHTJzO1WNpPO+H4w/tYVJdhlE1vn/0d3lCYBdX6FT4i10XxWx7er9sdEj9ndX
-8LhHuA2O2z197jHEEufG6XAThBV8XACOaqNkw+nVbk2GS4EltIOZRqdeC0qvATs8
-AiWGpK5K7bgdIfItscYTkDpbOeZwFUkdxpOJ7ujqMgjZCbJ0WfPXmWEFGuixYXki
-LXM7vQQLAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkZW0taWRwLmltdGx1Y2NhLml0
-hitodHRwczovL2lkZW0taWRwLmltdGx1Y2NhLml0L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRw6DX3JFHnfUlXHQXxcYUaIkKDmTANBgkqhkiG9w0BAQUFAAOCAQEA
-EzNzUHWImZwxpf8bu1BudPjcmtyQqHyPThTrpAd6UWm+MiwCPRdEYEfgWSnvGh0B
-STzyTtF/0PTMXNt+ocPryWFlpigO6d4H/QBWNtlPqWmLfLFsrTm1Cvy6ihmSsqVk
-nFN3qHAfJd0Xl05zk0oxDg6u8CXWzlFJcKxm2P8ujJYkJVHkt3saNinZop7+oazU
-YM5NpKde4RG0tQJvDuzN3xFLCtTUZe9EnOV0tniikwk4ZGDFy7F14POhmYvq+V+W
-PMrXoG08C30q+20nepBYJz2JoY9nQlmGor4yK6Ft8RvgmYq1BuwEkAHYnWf4B26l
-BgRrAVj5NpDfLOfRZq+LOg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem-idp.imtlucca.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IMT Institute for Advanced Studies Lucca</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IMT Institute for Advanced Studies Lucca</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IMT Institute for Advanced Studies Lucca</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">IMT Institute for Advanced Studies Lucca</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.imtlucca.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.imtlucca.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:webmaster@imtlucca.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f64f3e23..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.ced.inaf.it/idp/shibboleth">
-  <md: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>
-  </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">inaf.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ira.inaf.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iasfbo.inaf.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://idem.ced.inaf.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.ced.inaf.it/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.ced.inaf.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inaf.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ira.inaf.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iasfbo.inaf.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.ced.inaf.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Istituto Nazionale di Astrofisica (INAF)</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Institute for Astrophysics (INAF)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Istituto Nazionale di Astrofisica - INAF</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">National Institute for Astrophysics - INAF</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">https://www.inaf.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.inaf.it/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mauro</md:GivenName>
-    <md:SurName>Nanni</md:SurName>
-    <md:EmailAddress>mailto:m.nanni@ira.inaf.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Franco</md:GivenName>
-    <md:SurName>Tinarelli</md:SurName>
-    <md:EmailAddress>mailto:f.tinarelli@ira.inaf.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:inaf-idem@ced.inaf.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 7a0370b0..00000000
--- a/swamid-interfederations-2.0/idem.ced.inaf.it.xml
+++ /dev/null
@@ -1,79 +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: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://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="2013-03-18T15:45: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/ZLgwDQYJKoZIhvcNAQEFBQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFaFw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDuLeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/FeDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kncFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMBAAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRlbS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twivL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRaje20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFXE2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDpV8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHsS7SNwUd0JmQ3xk5iZ/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/ZLgwDQYJKoZIhvcNAQEFBQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFaFw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDuLeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/FeDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kncFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMBAAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRlbS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twivL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRaje20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFXE2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDpV8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHsS7SNwUd0JmQ3xk5iZ/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.unina2.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml
deleted file mode 100644
index e83c7011..00000000
--- a/swamid-interfederations-2.0/idem.unina2.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unina2.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-06-07T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unina2.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Second University of Naples</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Seconda Università degli Studi di Napoli</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Second University of Naples users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti della Seconda Università degli Studi di Napoli</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://idem.unina2.it/info/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://idem.unina2.it/info_en/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://idem.unina2.it/info/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://idem.unina2.it/info_en/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAMeHVbcMgkiyi7G8YIyVSk6/OsAEMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pbmEyLml0MB4XDTEwMDkyNDEyNTcxNFoX
-DTMwMDkyNDEyNTcxNFowGTEXMBUGA1UEAxMOaWRlbS51bmluYTIuaXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEJP3ZKXEqVvt+BU4r7yPQG3RNUCTx
-WQ+4k+nPi/UFRpRk5IHLpbO+/mqbkEJ8Z45eF+uSIsU37DGBmEkWB1ig6OrLqKdZ
-Y7/9XAxM2bACl8uCQqDZSod8etUQU60bxlxvAhYips6zKV3d7GKcvLbg6DwYCjL9
-rEdiXlbf/XMkx8H0s5JT/WeJN1UZmlfBbwAMj3kXPrxzexGFMj+xg87C/WWA4wPL
-EjIRMRu4URhwqowcaYBXDN6/d7zXoLCC7VzJjV2mPNqJXJD6Cius5aqLcGImmJPF
-OwufXmPu+cpYc7h5NWd6KMjvUEQ3ucniAEucn8S78Iakd3Kcm3VLZX9/AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pbmEyLml0hiVodHRwczovL2lkZW0udW5p
-bmEyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRh0OcndkGzMmnRUBpvGQ4s
-F9pzKzANBgkqhkiG9w0BAQUFAAOCAQEAJ7aS6KvM/hgIoSgK0iGogbCpxrLTVz/3
-MzsgbGBceGiv+zLe0kV8Qz4SIQYPg8Yi71vCel/Fn8UPCC9O9PzD/wwqmFxFnCtB
-kO/ERSlXHZ1X2JM/1mEfBQvyYONbf/8EaYQkuhu/niLB3arnftrOoWNFpGfVttgw
-9OCxJa+998vCAZF9Bj++lZ5LxBDMVbKhxj0XSZw+r8KTon6/X/xRmYpOLjqDiYUd
-kGo9S0UZfQNFVe9/H0TZ6CMUeSAFWsycyaAvApoOUbPD7qqTlfacQgB2MEhPSLq7
-Q1xivizsXOeSZk/Q9/DJDN5TzuB1vxSPpGwc5ghEtOnpUr+lMfdesw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unina2.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unina2.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.unina2.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.unina2.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.unina2.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.unina2.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unina2.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAMeHVbcMgkiyi7G8YIyVSk6/OsAEMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pbmEyLml0MB4XDTEwMDkyNDEyNTcxNFoX
-DTMwMDkyNDEyNTcxNFowGTEXMBUGA1UEAxMOaWRlbS51bmluYTIuaXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEJP3ZKXEqVvt+BU4r7yPQG3RNUCTx
-WQ+4k+nPi/UFRpRk5IHLpbO+/mqbkEJ8Z45eF+uSIsU37DGBmEkWB1ig6OrLqKdZ
-Y7/9XAxM2bACl8uCQqDZSod8etUQU60bxlxvAhYips6zKV3d7GKcvLbg6DwYCjL9
-rEdiXlbf/XMkx8H0s5JT/WeJN1UZmlfBbwAMj3kXPrxzexGFMj+xg87C/WWA4wPL
-EjIRMRu4URhwqowcaYBXDN6/d7zXoLCC7VzJjV2mPNqJXJD6Cius5aqLcGImmJPF
-OwufXmPu+cpYc7h5NWd6KMjvUEQ3ucniAEucn8S78Iakd3Kcm3VLZX9/AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pbmEyLml0hiVodHRwczovL2lkZW0udW5p
-bmEyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRh0OcndkGzMmnRUBpvGQ4s
-F9pzKzANBgkqhkiG9w0BAQUFAAOCAQEAJ7aS6KvM/hgIoSgK0iGogbCpxrLTVz/3
-MzsgbGBceGiv+zLe0kV8Qz4SIQYPg8Yi71vCel/Fn8UPCC9O9PzD/wwqmFxFnCtB
-kO/ERSlXHZ1X2JM/1mEfBQvyYONbf/8EaYQkuhu/niLB3arnftrOoWNFpGfVttgw
-9OCxJa+998vCAZF9Bj++lZ5LxBDMVbKhxj0XSZw+r8KTon6/X/xRmYpOLjqDiYUd
-kGo9S0UZfQNFVe9/H0TZ6CMUeSAFWsycyaAvApoOUbPD7qqTlfacQgB2MEhPSLq7
-Q1xivizsXOeSZk/Q9/DJDN5TzuB1vxSPpGwc5ghEtOnpUr+lMfdesw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unina2.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unina2.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Seconda Università degli Studi di Napoli</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Second University of Naples</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Seconda Università di Napoli</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Second University of Naplesi</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://idem.unina2.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://idem.unina2.it/index.php/international</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>CSI</md:SurName>
-    <md:EmailAddress>mailto:csi@unina2.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml
deleted file mode 100644
index 2cc9669c..00000000
--- a/swamid-interfederations-2.0/idem.uniroma2.eu-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.uniroma2.eu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-17T10:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniroma2.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">studenti.uniroma2.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniroma2.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cloud.uniroma2.eu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cloudsa.uniroma2.eu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Rome Tor Vergata</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Roma Tor Vergata</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università degli Studi di Roma Tor Vergata</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for University of Rome Tor Vergata users</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idem.uniroma2.eu/idem/info.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idem.uniroma2.eu/idem/info.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idem.uniroma2.eu/idem/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idem.uniroma2.eu/idem/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="150" xml:lang="it">https://idem.uniroma2.eu/idp/images/logo_TV.png</mdui:Logo>
-        <mdui:Logo height="150" width="150" xml:lang="en">https://idem.uniroma2.eu/idp/images/logo_TV.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:41.849584,12.597735</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>
-MIIDLDCCAhSgAwIBAgIVAMT3ZP1vXP9LkRyZyvz9Od+bd1LcMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkZW0udW5pcm9tYTIuZXUwHhcNMTQwNTA3MDkyODUz
-WhcNMzQwNTA3MDkyODUzWjAbMRkwFwYDVQQDExBpZGVtLnVuaXJvbWEyLmV1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkuGCpVdbNddO1Y1/nfCCitMt
-psnFcRP+jnpUp+FH1DpaKlJIPZ8SwJr2n/aq+uHZ5WcIYTUSTdBF64nlTqPnIrd7
-kn5CqxPFWDokOpYvzkL4Y2JABNlrr8pGv6luhNHWg619eYl+HAlgedJIOwup6PRm
-jf+GDDL1ofbXtFIsS+4ZoaNA7ZB0ulE80Qj3CQk6DAfUUWw3aQutQASQ+IZuHTx0
-sBKP/19y72sFpNBC3XehF2EVAluo8OkwcxOfML3O1BDVFnxkaXgo4UC81c6Gb16Y
-j8AyaRuC+eWKAMioLYsw128SkO9/p3xjJ+VK7JQjOvAodj2uVoL4dQdvBIJ5gQID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZGVtLnVuaXJvbWEyLmV1hidodHRwczovL2lk
-ZW0udW5pcm9tYTIuZXUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFZhPdMjQi84
-e8GXhvjdCwBzAghaMA0GCSqGSIb3DQEBBQUAA4IBAQBfg0bUDlyUQlgN6D1vJ8YI
-xu8b23e5G3GVdQu9VyRTiF5UcCidP0ZCz8ZcheYszxqZJKFIQx9be3gEL/a/1WB9
-NtErtsMMUFgXv1PdlKi1pl/STyDc4Ix7UeOT/X+7zKciNjPOf1fPIfmwQzGdf0SV
-aUB5M/tyb+68hQLqJe5PJgKBseaB5uonphJ59lnfJCo9uaVLNo2FMbsHAC+0Ww8u
-e7eM2DsQ6gf26KQ9LRoHh/8cnmZQobvhjSgcA01AsrpGFCLBEx2Y5ifLRhDbhhxt
-14LaFQskrKfMFDS2at9c7lcwTEcf1sZaBNT6i0LiAFvT+hG0Lug3KGgMbQ24TEp+
-</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>
-MIIDLDCCAhSgAwIBAgIVAMT3ZP1vXP9LkRyZyvz9Od+bd1LcMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkZW0udW5pcm9tYTIuZXUwHhcNMTQwNTA3MDkyODUz
-WhcNMzQwNTA3MDkyODUzWjAbMRkwFwYDVQQDExBpZGVtLnVuaXJvbWEyLmV1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkuGCpVdbNddO1Y1/nfCCitMt
-psnFcRP+jnpUp+FH1DpaKlJIPZ8SwJr2n/aq+uHZ5WcIYTUSTdBF64nlTqPnIrd7
-kn5CqxPFWDokOpYvzkL4Y2JABNlrr8pGv6luhNHWg619eYl+HAlgedJIOwup6PRm
-jf+GDDL1ofbXtFIsS+4ZoaNA7ZB0ulE80Qj3CQk6DAfUUWw3aQutQASQ+IZuHTx0
-sBKP/19y72sFpNBC3XehF2EVAluo8OkwcxOfML3O1BDVFnxkaXgo4UC81c6Gb16Y
-j8AyaRuC+eWKAMioLYsw128SkO9/p3xjJ+VK7JQjOvAodj2uVoL4dQdvBIJ5gQID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZGVtLnVuaXJvbWEyLmV1hidodHRwczovL2lk
-ZW0udW5pcm9tYTIuZXUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFZhPdMjQi84
-e8GXhvjdCwBzAghaMA0GCSqGSIb3DQEBBQUAA4IBAQBfg0bUDlyUQlgN6D1vJ8YI
-xu8b23e5G3GVdQu9VyRTiF5UcCidP0ZCz8ZcheYszxqZJKFIQx9be3gEL/a/1WB9
-NtErtsMMUFgXv1PdlKi1pl/STyDc4Ix7UeOT/X+7zKciNjPOf1fPIfmwQzGdf0SV
-aUB5M/tyb+68hQLqJe5PJgKBseaB5uonphJ59lnfJCo9uaVLNo2FMbsHAC+0Ww8u
-e7eM2DsQ6gf26KQ9LRoHh/8cnmZQobvhjSgcA01AsrpGFCLBEx2Y5ifLRhDbhhxt
-14LaFQskrKfMFDS2at9c7lcwTEcf1sZaBNT6i0LiAFvT+hG0Lug3KGgMbQ24TEp+
-</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-POST" Location="https://idem.uniroma2.eu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.uniroma2.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.uniroma2.eu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Roma Tor Vergata</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Rome Tor Vergata</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Roma Tor Vergata</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Rome Tor Vergata</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.uniroma2.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uniroma2.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Orazi</md:SurName>
-    <md:EmailAddress>mailto:marco.orazi@uniroma2.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IDEM</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:idem-support@ccd.uniroma2.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml
deleted file mode 100644
index ccc63bc0..00000000
--- a/swamid-interfederations-2.0/idem.unisa.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unisa.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-09-03T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisa.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Salerno</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Salerno</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Salerno users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Salerno</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://idem.unisa.it/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idem.unisa.it/idem</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC7jCCAdagAwIBAgIJAK9AYb5yf3pVMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDWlkZW0udW5pc2EuaXQwHhcNMTIwNjE0MDk1ODA3WhcNMjIwNjEyMDk1ODA3
-WjAYMRYwFAYDVQQDEw1pZGVtLnVuaXNhLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA1VHQdr4Tb+RtusjJUZk3G0bq/6s7JApSBXzOYtyeiphCwQna
-vgNNPthoFlZxtGcBtJTXnW0oW1yhKyC06uUbmwVNj7bGBRI3Xp5hTLk/AJzNDO6a
-PfRzycKYv+U9q/TFIe1J5zCYtPmLHm0ICHzBt9ZQwItEy3SwlYIU3APeJOhr5dQm
-g0gLBsxE9Dq89tNxiyD05kRNrujSiU+KBCvw6SbFW0365YCQF8BN77azqfl1nDSg
-pCqKAn2J8fWO7A006ZyMuDE9XQ/mT18lHONB9tcv4e7U68W84OtYfSnGYXKrSIYQ
-L1he2PvMb9cFZWLp7OJlb/zB0nqbfzQT2nAyUwIDAQABozswOTAYBgNVHREEETAP
-gg1pZGVtLnVuaXNhLml0MB0GA1UdDgQWBBSDp64wPSaJatAa+oAT8bTY0pFq7DAN
-BgkqhkiG9w0BAQUFAAOCAQEAh8L97UoAQlzORLWJjbtXi8J62EDzOdky2AhjciCC
-IvW9CRGP1b4QaXwTJGt47kEsu0b29+nC2bBrMmiu2tY5xqLIlbx57c5AYPULh8nY
-3F0Rgd5O3Xu3rUv1IkDU9UgX/efBCXlXUGildaEH7NQFt4+uuuvj4g5/eC8LO3Jm
-kJPg082WdRTF5EQWgmhuthZ72bwWf5xsYQMxir6TNKGXH0OUPW5krreqEGuyiwfm
-rcVfFMnm/X2nD7kZLxU2HmQRExPpk1dvBltxADIpvu5TkKYG9xeehwRsIX2C0dcG
-1wv94P/hAfJya3Wttvz8Hui7i6pnarj9UtiAU0AtsA5uQA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisa.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisa.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.unisa.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.unisa.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.unisa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.unisa.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisa.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC7jCCAdagAwIBAgIJAK9AYb5yf3pVMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDWlkZW0udW5pc2EuaXQwHhcNMTIwNjE0MDk1ODA3WhcNMjIwNjEyMDk1ODA3
-WjAYMRYwFAYDVQQDEw1pZGVtLnVuaXNhLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA1VHQdr4Tb+RtusjJUZk3G0bq/6s7JApSBXzOYtyeiphCwQna
-vgNNPthoFlZxtGcBtJTXnW0oW1yhKyC06uUbmwVNj7bGBRI3Xp5hTLk/AJzNDO6a
-PfRzycKYv+U9q/TFIe1J5zCYtPmLHm0ICHzBt9ZQwItEy3SwlYIU3APeJOhr5dQm
-g0gLBsxE9Dq89tNxiyD05kRNrujSiU+KBCvw6SbFW0365YCQF8BN77azqfl1nDSg
-pCqKAn2J8fWO7A006ZyMuDE9XQ/mT18lHONB9tcv4e7U68W84OtYfSnGYXKrSIYQ
-L1he2PvMb9cFZWLp7OJlb/zB0nqbfzQT2nAyUwIDAQABozswOTAYBgNVHREEETAP
-gg1pZGVtLnVuaXNhLml0MB0GA1UdDgQWBBSDp64wPSaJatAa+oAT8bTY0pFq7DAN
-BgkqhkiG9w0BAQUFAAOCAQEAh8L97UoAQlzORLWJjbtXi8J62EDzOdky2AhjciCC
-IvW9CRGP1b4QaXwTJGt47kEsu0b29+nC2bBrMmiu2tY5xqLIlbx57c5AYPULh8nY
-3F0Rgd5O3Xu3rUv1IkDU9UgX/efBCXlXUGildaEH7NQFt4+uuuvj4g5/eC8LO3Jm
-kJPg082WdRTF5EQWgmhuthZ72bwWf5xsYQMxir6TNKGXH0OUPW5krreqEGuyiwfm
-rcVfFMnm/X2nD7kZLxU2HmQRExPpk1dvBltxADIpvu5TkKYG9xeehwRsIX2C0dcG
-1wv94P/hAfJya3Wttvz8Hui7i6pnarj9UtiAU0AtsA5uQA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisa.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisa.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università di Salerno</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Salerno</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Salerno</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Salerno</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unisa.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unisa.it/english/index</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alfonso</md:GivenName>
-    <md:SurName>Sparano</md:SurName>
-    <md:EmailAddress>mailto:idem@unisa.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
deleted file mode 100644
index 2ca4e045..00000000
--- a/swamid-interfederations-2.0/idem.unisalento.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.unisalento.it/idp/shibboleth">
-  <md: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>
-  </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">unisalento.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Salento</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università del Salento</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Salento users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università del Salento</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://idem-idp.unisalento.it/info</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUA+PvTTuv3pJPbxuuJd/3LE3JtcEwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0MB4XDTEwMDcxMzEyMTg1
-NloXDTMwMDcxMzEyMTg1NlowHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgla3juJH8iD+hOUKUgES
-hp9QqZOEuEPDSaS9SpYZHxscsgz0RXljN2yMw8fS7ih4LCZT98okH+lBG4wKndMg
-0X2gDQfpMpA9ly/Ei5htxtBQGcuIVtmfI1BPwMTGqlvxnO3HCRNdzbb/UivCtvZt
-g0cr0P6qYr11ExntVQInEq2S18S1xRLAZOL5SId8AcGUugVqZM1Q4L8anJclCww5
-Hmnl27QQSrVTgoPjPt2KI7ALVEsTbY54gEti6YRX6VmXYtCiFOkLFK0A/Q5hcy7Z
-XDuZnhqYGh11iwh2xGRu8ZXYPKtEhKf+Y3+BqOB9j7+kSHRHbVqegREOm/Ude+WC
-lwIDAQABo2swaTBIBgNVHREEQTA/ghJpZGVtLnVuaXNhbGVudG8uaXSGKWh0dHBz
-Oi8vaWRlbS51bmlzYWxlbnRvLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSD
-vtPQz4E2/RAEnZwWLaMi6MgpXzANBgkqhkiG9w0BAQUFAAOCAQEALqmALOf4h9Q+
-OT27WFz2eBzr8X39M3MZ60b2xXxGn36VRlkfrBS2sCSZz/8JZrFsDr650I0v5ZHV
-8I0pMfTzUyylxch4T8Y92779JifANL1ypLKLzsgXtO0zKut6AvxRG+6AnECQtFMg
-i3JWjW8VY7HVpvCSRpIZtLEBoYfSsGEB8vkdhbJvz15cmwwtBX9bHGyiqGdG8NSi
-t8hsGA3CsRPAhEgvzTX5bXdp9P2SZYcc/+jbsOLy2i5ECApA/BAUFkWVxo3zpdQc
-TuRSdi628uP4JhrF+naNDmjtypIhcFWxTb9nS0Q7pNztRk8WeKJWRJOPpmUcOti9
-cwGgvFbTug==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisalento.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisalento.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.unisalento.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.unisalento.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.unisalento.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.unisalento.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unisalento.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUA+PvTTuv3pJPbxuuJd/3LE3JtcEwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0MB4XDTEwMDcxMzEyMTg1
-NloXDTMwMDcxMzEyMTg1NlowHTEbMBkGA1UEAxMSaWRlbS51bmlzYWxlbnRvLml0
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgla3juJH8iD+hOUKUgES
-hp9QqZOEuEPDSaS9SpYZHxscsgz0RXljN2yMw8fS7ih4LCZT98okH+lBG4wKndMg
-0X2gDQfpMpA9ly/Ei5htxtBQGcuIVtmfI1BPwMTGqlvxnO3HCRNdzbb/UivCtvZt
-g0cr0P6qYr11ExntVQInEq2S18S1xRLAZOL5SId8AcGUugVqZM1Q4L8anJclCww5
-Hmnl27QQSrVTgoPjPt2KI7ALVEsTbY54gEti6YRX6VmXYtCiFOkLFK0A/Q5hcy7Z
-XDuZnhqYGh11iwh2xGRu8ZXYPKtEhKf+Y3+BqOB9j7+kSHRHbVqegREOm/Ude+WC
-lwIDAQABo2swaTBIBgNVHREEQTA/ghJpZGVtLnVuaXNhbGVudG8uaXSGKWh0dHBz
-Oi8vaWRlbS51bmlzYWxlbnRvLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSD
-vtPQz4E2/RAEnZwWLaMi6MgpXzANBgkqhkiG9w0BAQUFAAOCAQEALqmALOf4h9Q+
-OT27WFz2eBzr8X39M3MZ60b2xXxGn36VRlkfrBS2sCSZz/8JZrFsDr650I0v5ZHV
-8I0pMfTzUyylxch4T8Y92779JifANL1ypLKLzsgXtO0zKut6AvxRG+6AnECQtFMg
-i3JWjW8VY7HVpvCSRpIZtLEBoYfSsGEB8vkdhbJvz15cmwwtBX9bHGyiqGdG8NSi
-t8hsGA3CsRPAhEgvzTX5bXdp9P2SZYcc/+jbsOLy2i5ECApA/BAUFkWVxo3zpdQc
-TuRSdi628uP4JhrF+naNDmjtypIhcFWxTb9nS0Q7pNztRk8WeKJWRJOPpmUcOti9
-cwGgvFbTug==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.unisalento.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.unisalento.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università del Salento</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Salentoo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università del Salento</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Salento</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unisalento.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.unisalento.it/web/guest/home_page</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Antonio Campa</md:SurName>
-    <md:EmailAddress>mailto:dorsale@unisalento.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 4e83bfc0..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.univpm.it/idp/shibboleth">
-  <md: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>
-  </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">univpm.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.univpm.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.univpm.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.univpm.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.univpm.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univpm.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Universita' Politecnica delle Marche</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Universita' Politecnica delle Marche</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universita' Politecnica delle Marche</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Universita' Politecnica delle Marche</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univpm.it/English/Engine/RAServePG.php/P/25001ENG0101/L/0</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.univpm.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idem-help@univpm.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 382c314c..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemfero.units.it/idp/shibboleth">
-  <md: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>
-  </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">units.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemfero.units.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idemfero.units.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idemfero.units.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idemfero.units.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemfero.units.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">units.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemfero.units.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemfero.units.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Trieste</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Trieste</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Trieste</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Trieste</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.units.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://international.units.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Staff Tecnico</md:GivenName>
-    <md:EmailAddress>mailto:idem@units.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e471f5b5..00000000
--- a/swamid-interfederations-2.0/idemfero.units.it.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemfero.units.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-10-09T08: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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">units.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1MzgwNFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtSSGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKBBJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IGFMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Orh9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczovL2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZPuEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtYLWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiyaQYbJQ== </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">units.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Trieste AA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Trieste AA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Attribute Authority for University of Trieste members</mdui:Description>
-        <mdui:Description xml:lang="it">Attribute Authority 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:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1MzgwNFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtSSGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKBBJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IGFMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Orh9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczovL2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZPuEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtYLWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiyaQYbJQ== </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/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 0ab34693..00000000
--- a/swamid-interfederations-2.0/idemidp.unipmn.it-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,102 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemidp.unipmn.it/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-01-20T14:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipmn.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Piemonte Orientale</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Universita degli studi del Piemonte Orientale</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for Piemonte Orientale university users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell Universita degli studi del Piemonte orientale</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://idemidp.unipmn.it/simplesaml/pagina.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://idemidp.unipmn.it/simplesaml/pagina.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idemidp.unipmn.it/simplesaml/pagina.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idemidp.unipmn.it/simplesaml/pagina.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="129">https://idemidp.unipmn.it/simplesaml/logobaseupo129x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="34">https://idemidp.unipmn.it/simplesaml/logobaseupo34x16.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>
-MIIEOTCCAyGgAwIBAgIJAPHensWnKvc4MA0GCSqGSIb3DQEBBQUAMIGyMQswCQYD
-VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxFDASBgNVBAcMC0FsZXNzYW5kcmlhMSow
-KAYDVQQKDCF1bml2ZXJzaXRhIGRlbCBwaWVtb250ZSBvcmllbnRhbGUxFjAUBgNV
-BAsMDXVmZmljaW8gcmVmb3MxGjAYBgNVBAMMEWlkZW1pZHAudW5pcG1uLml0MR0w
-GwYJKoZIhvcNAQkBFg5yZXRlQHVuaXBtbi5pdDAeFw0xNDA5MDIwOTM1MzFaFw00
-NDA4MjUwOTM1MzFaMIGyMQswCQYDVQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxFDAS
-BgNVBAcMC0FsZXNzYW5kcmlhMSowKAYDVQQKDCF1bml2ZXJzaXRhIGRlbCBwaWVt
-b250ZSBvcmllbnRhbGUxFjAUBgNVBAsMDXVmZmljaW8gcmVmb3MxGjAYBgNVBAMM
-EWlkZW1pZHAudW5pcG1uLml0MR0wGwYJKoZIhvcNAQkBFg5yZXRlQHVuaXBtbi5p
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALzKLUEUSuClrvGdFqdn
-jAhBqxjjecka5KyBUY92QwqY0FSRzG14PN62ZHEghdLvZ8MBLrEuMUHfENNY1xFB
-k0rqydhooZmk6fW56WF3DGdFTkm7IvIxsqqTcxR2V1I2R10QHIaDYgx/fNE7VSd6
-7n7eP7PhwIslSDFcxq45M+ETa8VZ0q1256w7XyUsZFRSBZtrz+bY4hVf6pNpTLkk
-RRU0cbf2U2KmcNP8T05ax1PSupJX+RU6yMVvgXMQh86s6h8sKcD13oOj1OeM7CI1
-gH92uKM4HzxD7wmiFRlwPabCjPUZzBDggMgeOL96heJK8EtBH/yERq8CDvW0OYaR
-AtUCAwEAAaNQME4wHQYDVR0OBBYEFDbNfOhxDESf0UuXY6AarCfFlzvqMB8GA1Ud
-IwQYMBaAFDbNfOhxDESf0UuXY6AarCfFlzvqMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADggEBAFFI0ONX+syhY0MtoUrf5WPa8pmRFSxzjW0X/FB8kmGxfQ/w
-1P/ocgLffsjR32FEueGnWvBhSnsdxeMEhEjnMcCtqYm4g5+lbddpD11FyaDBXOeb
-AS0NPOsaEToivw/303/fepy9jv1+VGKOrDUJNwL4txEp8q7QD+9VrtRC2nPHnZeW
-BjwLPcfjJenFfLGcer9rguP1ca5QD10FPr3gFUBJl77E2ii1LfIRZ1+Ch+h3t8b8
-XzIpMr9KOQzrPy5rn5TVW66UWusGJZB9pHVK6mJroUQ2snSghcGWLczvgNcIWjW9
-YcakJXMzsLy+YtFi6nau47S1TJCnJPCFoWvElYQ=
-</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>
-MIIEOTCCAyGgAwIBAgIJAPHensWnKvc4MA0GCSqGSIb3DQEBBQUAMIGyMQswCQYD
-VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxFDASBgNVBAcMC0FsZXNzYW5kcmlhMSow
-KAYDVQQKDCF1bml2ZXJzaXRhIGRlbCBwaWVtb250ZSBvcmllbnRhbGUxFjAUBgNV
-BAsMDXVmZmljaW8gcmVmb3MxGjAYBgNVBAMMEWlkZW1pZHAudW5pcG1uLml0MR0w
-GwYJKoZIhvcNAQkBFg5yZXRlQHVuaXBtbi5pdDAeFw0xNDA5MDIwOTM1MzFaFw00
-NDA4MjUwOTM1MzFaMIGyMQswCQYDVQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxFDAS
-BgNVBAcMC0FsZXNzYW5kcmlhMSowKAYDVQQKDCF1bml2ZXJzaXRhIGRlbCBwaWVt
-b250ZSBvcmllbnRhbGUxFjAUBgNVBAsMDXVmZmljaW8gcmVmb3MxGjAYBgNVBAMM
-EWlkZW1pZHAudW5pcG1uLml0MR0wGwYJKoZIhvcNAQkBFg5yZXRlQHVuaXBtbi5p
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALzKLUEUSuClrvGdFqdn
-jAhBqxjjecka5KyBUY92QwqY0FSRzG14PN62ZHEghdLvZ8MBLrEuMUHfENNY1xFB
-k0rqydhooZmk6fW56WF3DGdFTkm7IvIxsqqTcxR2V1I2R10QHIaDYgx/fNE7VSd6
-7n7eP7PhwIslSDFcxq45M+ETa8VZ0q1256w7XyUsZFRSBZtrz+bY4hVf6pNpTLkk
-RRU0cbf2U2KmcNP8T05ax1PSupJX+RU6yMVvgXMQh86s6h8sKcD13oOj1OeM7CI1
-gH92uKM4HzxD7wmiFRlwPabCjPUZzBDggMgeOL96heJK8EtBH/yERq8CDvW0OYaR
-AtUCAwEAAaNQME4wHQYDVR0OBBYEFDbNfOhxDESf0UuXY6AarCfFlzvqMB8GA1Ud
-IwQYMBaAFDbNfOhxDESf0UuXY6AarCfFlzvqMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADggEBAFFI0ONX+syhY0MtoUrf5WPa8pmRFSxzjW0X/FB8kmGxfQ/w
-1P/ocgLffsjR32FEueGnWvBhSnsdxeMEhEjnMcCtqYm4g5+lbddpD11FyaDBXOeb
-AS0NPOsaEToivw/303/fepy9jv1+VGKOrDUJNwL4txEp8q7QD+9VrtRC2nPHnZeW
-BjwLPcfjJenFfLGcer9rguP1ca5QD10FPr3gFUBJl77E2ii1LfIRZ1+Ch+h3t8b8
-XzIpMr9KOQzrPy5rn5TVW66UWusGJZB9pHVK6mJroUQ2snSghcGWLczvgNcIWjW9
-YcakJXMzsLy+YtFi6nau47S1TJCnJPCFoWvElYQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemidp.unipmn.it/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://idemidp.unipmn.it/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Universita degli studi del Piemonte Orientale</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Piemonte Orientale</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Universita degli studi del Piemonte Orientale</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Piemonte Orientale</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">https://www.unipmn.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.unipmn.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>FulvioScorza</md:SurName>
-    <md:EmailAddress>mailto:rete@unipmn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml
deleted file mode 100644
index 292d03c2..00000000
--- a/swamid-interfederations-2.0/idemshibb.unina.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemshibb.unina.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-12-22T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unina.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Naples Federico II</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Napoli Federico II</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Naples Federico II users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università degli Studi di Napoli Federico II</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://idemshibb.unina.it/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idemshibb.unina.it/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVALEKMVRz1NfaMCKF5EPhGe+47TRvMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkZW1zaGliYi51bmluYS5pdDAeFw0xMDA1MjgxMDQ0
-MjdaFw0zMDA1MjgxMDQ0MjdaMB0xGzAZBgNVBAMTEmlkZW1zaGliYi51bmluYS5p
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbuWYYevoNFjmTCeWFz
-2/1VIW8CA0IQe3eS4gkQNaeT2M048DrDpxdnVRmmqU0QEemG3VkYhwm8TISWMcfJ
-CvnOQ0s5mmBm40fdPkeXnrGv+5SMJw9OA8Ph7U9RIXkqqiuXNiw7torML1mHkYAI
-AXPd+4cyK9QKc228fj5FFOrq9bT3hr+TgoChfrRcpmh8b5FFjpZSOtrH47kWe7Tz
-HlE4ie/jH5TXfExk/9ZDKYelEui9WbmiaT80cMMCmDMDZuCp3l6TN0wWyjPCbbn2
-FBKtJu1lmNnbSF+CAf87EUwjzWfK/KhmfjLf0jlS7jpuANaXPeOEMzDjP3Baj0i4
-tAcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRlbXNoaWJiLnVuaW5hLml0hilodHRw
-czovL2lkZW1zaGliYi51bmluYS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-oeCNNNtnZLqkQBIKTTmQkkhGXZIwDQYJKoZIhvcNAQEFBQADggEBAK9tcsT8mMjt
-k2nE3Onmy61lfPKF9CX34dMX4Wsowx48LJpVWghi66rzbX3ZAK3vTrCkkYX372J8
-k6QCA7H45VhW/JVwRFnPtYiTYGXpgUQmisZgCIsS4gWUK4yc+7e5+vHz34wDEyFO
-LZU/u4XA2QSiTwZvixf1f9iFc18yhCCQhNQFcbjqqcPTidm6FiYLSqu5X166Ydip
-lNbtoSVzFkyF8GC+4otLRQs5b6jMxjNj99gXcrf8v0dcWSt4P7HUqNKJe2YAkh5L
-rsb9FCAbsY9KMtPcpExwaAFgeX2eZ5Z6JGAQLP3AWZ1NyqtN+ol41o2X5SxiJL1w
-0avB9R6fGjI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemshibb.unina.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemshibb.unina.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idemshibb.unina.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idemshibb.unina.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idemshibb.unina.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idemshibb.unina.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unina.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVALEKMVRz1NfaMCKF5EPhGe+47TRvMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkZW1zaGliYi51bmluYS5pdDAeFw0xMDA1MjgxMDQ0
-MjdaFw0zMDA1MjgxMDQ0MjdaMB0xGzAZBgNVBAMTEmlkZW1zaGliYi51bmluYS5p
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbuWYYevoNFjmTCeWFz
-2/1VIW8CA0IQe3eS4gkQNaeT2M048DrDpxdnVRmmqU0QEemG3VkYhwm8TISWMcfJ
-CvnOQ0s5mmBm40fdPkeXnrGv+5SMJw9OA8Ph7U9RIXkqqiuXNiw7torML1mHkYAI
-AXPd+4cyK9QKc228fj5FFOrq9bT3hr+TgoChfrRcpmh8b5FFjpZSOtrH47kWe7Tz
-HlE4ie/jH5TXfExk/9ZDKYelEui9WbmiaT80cMMCmDMDZuCp3l6TN0wWyjPCbbn2
-FBKtJu1lmNnbSF+CAf87EUwjzWfK/KhmfjLf0jlS7jpuANaXPeOEMzDjP3Baj0i4
-tAcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRlbXNoaWJiLnVuaW5hLml0hilodHRw
-czovL2lkZW1zaGliYi51bmluYS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-oeCNNNtnZLqkQBIKTTmQkkhGXZIwDQYJKoZIhvcNAQEFBQADggEBAK9tcsT8mMjt
-k2nE3Onmy61lfPKF9CX34dMX4Wsowx48LJpVWghi66rzbX3ZAK3vTrCkkYX372J8
-k6QCA7H45VhW/JVwRFnPtYiTYGXpgUQmisZgCIsS4gWUK4yc+7e5+vHz34wDEyFO
-LZU/u4XA2QSiTwZvixf1f9iFc18yhCCQhNQFcbjqqcPTidm6FiYLSqu5X166Ydip
-lNbtoSVzFkyF8GC+4otLRQs5b6jMxjNj99gXcrf8v0dcWSt4P7HUqNKJe2YAkh5L
-rsb9FCAbsY9KMtPcpExwaAFgeX2eZ5Z6JGAQLP3AWZ1NyqtN+ol41o2X5SxiJL1w
-0avB9R6fGjI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idemshibb.unina.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idemshibb.unina.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Napoli Federico II</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Naples Federico II</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Napoli Federico II</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Naples Federico II</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unina.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.international.unina.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Giuseppe Vitagliano</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.vitagliano@unina.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:contactcenter@unina.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 58809db5..00000000
--- a/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-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://ident-shib.ensc-rennes.fr/idp/shibboleth">
-  <md: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>
-  </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 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:InformationURL xml:lang="fr">http://www.univ-rennes1.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://ident-shib.ensc-rennes.fr/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.ensc-rennes.fr/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.ensc-rennes.fr/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure de Chimie de Rennes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-rennes1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@listes.univ-rennes1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 379eba46..00000000
--- a/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ident-shib.sciencespo-rennes.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACxklEQVQ4y3WTzWuTSQDGf/N+xCS1JjVJG0Pr1kabralRq4Jfdd0VEXG7yrruwupBBBU8ePCgtMWL4kVPHi3oH6D25AeoCNtdtOqqjYrgVpJu+rHRsElja5r0Td53PKQEa/GBYQ4zz28eZp4R+eR7mR14gSyW+Fx6jas8u924I2HBVySSt+/K54ePY+bzsxY8G9czNTyCZRgE9vzIxJIAm44emQNSAMx8AXMqXxmyZAKQG0rw8W2MwQsXqXmX4creffJLgPZldADFZkNKibM+QFVTI7YaNwJB87YfoPfabIDQNWAGrCjIYhF7wE/joQNY7moy4xkK4+OUfD5CrWGi13vl7c5uut6+EbMTzJirW0KEL5whNfmB+ydP8mFsDONjjvq2NpxeDw1r2jjYe5WuSOTzBAIsC93lornzBK+ePOa/aJTxxDClQgHb/CqcPi+Jh/3E+/4k9eYf8sn30rGoTlQSSNPE9307eVcVTy5foW55C7WhZoxcjoXBIJlYDCOXQ9E0xqJREgPPKUxMSAVFKb+nruNp38DIwAB14eVoDgfHH/wlnB4Po0+fko4PAWCVSmSG/uVmVzeTqRRa5eY1DZvPS+rvfmJ/9AHQs6tDmtPTTKUziJmDAISikPs/zWTyXbkH0rIQWplVMgwUVUVRVYYfPUadN49AJIK0rApAWhaKpqHqOorqsONcXM/o6mUMxgfxt7ZWNprFIqPPnmGvcRNYGUHVdaRlIaXEE2yi2u9HSWbTbH/5UBy7f080tW9mxe4OvMuWouo6AEZuikT/IzS7naat3+FdGsThchHZ+zMLG78Rc7p95+w5ueN0tzjfulKm43GEqlZi2xcsoGHdWtbs/53Vv/0qKBdgrh5c6pH+lm95feMWsb4+siOjuBvqqQ2FCP/Uwap9v1R8X/2mPTt3yW2dp5hfW4dpTAOQz2YJbtkyy/MJFfAaZK23CdUAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MzYrMDI6MDA5Z/DvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjM2KzAyOjAwSDpIUwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-rennes1.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://ident-shib.sciencespo-rennes.fr/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.sciencespo-rennes.fr/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.sciencespo-rennes.fr/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Sciences Po Rennes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sciences Po Rennes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-rennes1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@listes.univ-rennes1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 1921aafc..00000000
--- a/swamid-interfederations-2.0/ident.ensta-bretagne.fr-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://ident.ensta-bretagne.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACrUlEQVQoz2WSW0jTcRzFz2///25/dc6pyymmLvPavCWCJpZKUokPyRCHJs2SAgnDQKl8WERSpJVpCuJLGJVGYhcoSLFEkURz0MTQVEpted10bm5zf/89KGF23r6cz5fzcA7hOA7/amrBNGlcJoQE+3mHyqV7XHr3Ufem/3LLhw5dYW5FC9xFcLHw9nhSnFWQFveXIdsJHBBe2Tyhn4a7yPT0upfmFtwEALDFwbJxLF7ZpdNSZFeC5l67Nv6AMC1GKBKs2+yRYf5j47MQCkAAAT9V6fdi4Gt+imrn4cHrvrb3I21iPjZZVVSgmE9XHI+zpse+GzAsbzgenT81uEr6TYhYccXJaMJxXEB5oy4j1rjupPm8IH+5r49swcaOm1mxu7R73iGnt57NOpoS3UY/99eX5NCGuaVfozOdUiZfnVOk38w2EQX4UhdVM2YBtYQtLmUf8yzGobnzGIvW6qITPOOSGQL6TFZS0ZXaOu8ZdZinxckyPIACgNxgyc1w+88fs7C7IObPrVh4ACCgKYqae16l6+hbGOrNDfZkOYDDfolQ7fE7s+RhcpRSKvfEFgeADpTL4HDl6Vo1GapPVQU0xRuaMAT5hMG2WpPO5JU3QiI2mdcOK7y7pxYDfTzpCIUMjFCdGKqQSGNutGvjgnKSQrNDaEG2Ilq01nDhJGGYiXlz95fJhPgQNz5FOI6re9WvUkqOHOxxsr7rDkXHsO/g2HjDpdOSi/dhc8DuBAGszq7bxZkq5U7TXqUNZxMCarWR49NlvrJko+Vc08eJxs5eMEIQwOooPHqotUwNgLfd9Hx96Uv9XHW7We6TZbPb3Ujl1WwPMB5gWZis+anR2zQAcLvU3KW3bYzMGK+NTWmGDegxTEF79+3Qt90M+X/eLtayZv1u31zxk6XwiHiP+wf18yywx7+vAwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MCswMjowML+wp/IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDArMDI6MDDO7R9OAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ensta-bretagne.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</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>
-					      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>
-    </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-POST" Location="https://ident.ensta-bretagne.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.ensta-bretagne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.ensta-bretagne.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENSTA Bretagne - Ecole Nationale Supérieure des Techniques Avancées</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ensta-bretagne.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean-Paul KIRKBRIDE</md:SurName>
-    <md:EmailAddress>jean-paul.kirkbride@ensta-bretagne.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 60a5aa24..00000000
--- a/swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.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://ident.ensta.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB5UlEQVQoz5WST0gUYRjGn3edXXfMWh0Fw7KNDiuikh0CS7AgD6F1KDaS/ihsWIIX9aKQXTRQ6BIEZQc7SAUeqkMQeZIM9FCHOtTB2N0UFRV3pp1Z3Wl29ns7jA2rsEHP6ft4nwe+9/l+xMz4H0nuKSuYiNwrMwo8+QOzc1/PNN0ASl0/oE29ftRQHxKCg0cqZL93VyAejaEsqJTLANTENjaN5taWq9dGYToPtgAen+i9E7m8E1jZSMJLatrC0ub4s/7bNy+R5CE6qwQD7PcRIJi7bz2J/VwlZ+nq010L84vXI43PJ4YBTH7+0fnmU9VBxf723ZyepUIvMxORqpk7ey3Mzwzdv+K4AXS++1IZkIVpSrU1nEoDICLDsi+eq5MAqJpxvKl55G6XW0WoRFbTtr/Ag4ztlCUEZ+Krjz8+JWZ++35uK6W3h8+7gcT279qRlwBlZj5wQtdSFta2ovHJY0cPSwBWlhZLlNLcssuKCtfHXqDcB5OR0oeGO+4NRHw+r/NB3Df4EDgVjS3zX2m/DKCyNTww9WrasrKcI2JmT6idN3Qk18IdF9paTuzbf6DqUEXjybq8aDzoaSsulgHYdjappxOqoQSK8rFEQohchHJY2gUlAQwQgfYMGEwg5NdeIP/tBvAHTRnd7UvROpAAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDAZx6xGAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjQxKzAyOjAwaJoU+gAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ensta-paristech.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</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>
-					      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>
-    </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-POST" Location="https://ident.ensta.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.ensta.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.ensta.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENSTA Paristech - Ecole Nationale Supérieure de Techniques Avancées</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ensta-paristech.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Alain Paris</md:SurName>
-    <md:EmailAddress>alain.paris@ensta-paristech.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Arnaud Peron</md:SurName>
-    <md:EmailAddress>arnaud.peron@ensta-paristech.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 703b00b0..00000000
--- a/swamid-interfederations-2.0/ident.groupe-esa.com-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://ident.groupe-esa.com/idp/shibboleth">
-  <md: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>
-  </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 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="en">Ecole Supérieure d'Agriculture d'Angers</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB70lEQVQoz4VRTWsTURQ9b/Iy+eikmZmYNm21mkK0YI0J2toiQt3WZVGQLhSX1oUb0T/gQlyISxFRFyLoQrqpC7spaotJaqjVIJgItipqPiYxzYcz8zIung1DtHhX5957zr3nvkcmnvYPdg0BMFpG3dzU9ELh13cAAETBRQjBVpgtg1mMdjtlo2VQgQZcPcP+aJPV5zYeAHAQR2qq4KVSW3Drw7Xr767QbDWDf0XEt9/OBhBTjgAQsE3E1QkOHn+6863xGcAB+TAB2VYQU8c5uJe7mSw+B+ClkiwG/rOhwWrZauZteYUXg+6QIAquv9l+pxKW9gJY01LMYm1Bj7uPzoTPHw+dSBVfpEvLS/kFZjHuh4AAWNUSADKVtAWLgOxwhYS7uRuzielsNTM9ePbJZHK4Owogpvw5YFV7BaBqVNZrOQCyqAo8n//y6GLq9IXEyavx2/Yn4hsAcFcEhNqtr9dyFb0ki+pBZYxX7h99xoEqBjmgHec2W42Ib8Tn9PN0SNrXQegUDHh275EiHG/UPpb0fLsVVcY6BVMDp97/fBPf+rLL6XOJwmK7Oze5AoCOyId2esOKGIip46oYvPT6zMNjiwCYZa5pSfu4l/kFAGR0Ptjr7m+welkvlvUSgD7PLgJiWuaP5le7wOPoEojwG6Syr579qdfjAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjU4KzAyOjAwQPXpCwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo1OCswMjowMDGoUbcAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.groupe-esa.com/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Ecole Supérieure d'Agriculture d'Angers</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>
-					      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>
-    </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-POST" Location="https://ident.groupe-esa.com/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident.groupe-esa.com/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident.groupe-esa.com/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Supérieure d'Agriculture d'Angers</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Supérieure d'Agriculture d'Angers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.groupe-esa.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>info@groupe-esa.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml b/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml
deleted file mode 100644
index 25ded13a..00000000
--- a/swamid-interfederations-2.0/identite.intranet.univ-lille.fr-shibboleth.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identite.intranet.univ-lille.fr/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-15T14:45:34Z">
-      <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>https://federation.renater.fr/category/web</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Lille - plate-forme charte digitale (identité)</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://identite.univ-lille.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">This platform allows the responsables of the communication to load digital identification elements they need</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Lille - plate-forme charte digitale (identité)</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Cette plate-forme permet aux responsables de communication de charger les éléments d'identification numérique</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>
-					      MIIDFTCCAf2gAwIBAgIJALIbtMdZhxM2MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGmRydXBhbC13ZWIxLnVuaXYtbGlsbGUxLmZyMB4XDTE0MDgwMTA3NDM1NloX
-DTI0MDcyOTA3NDM1NlowJTEjMCEGA1UEAxMaZHJ1cGFsLXdlYjEudW5pdi1saWxs
-ZTEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrnebq+nhIUfCL
-6I0Zs/hG4XeRItJBgsQQ2AB2JndoMZaRewzKT/9Ht/EqObllh5C3qFhMDitBd5Au
-E6/+Dhff00q4GGskt3Nf0qsV9EuOvyr2z2kx94wnilABMm+dZo4j0NBLuGo+vPNc
-sbjUjmo/fmD5N47iI3+UqcZPmKlp5mnfJ/QfMWYhkE9xSknu+jwr85mtYPJlMLLR
-bYwaVoCpNNn/dI9AmKPV0j4Hy7Wi3ZHehqg1e2qHaejGdTt61W5hzVfzXgc/VznF
-kISdtz8ohNq5NqXNKdddyDY60miygAtY/3BVf5/FQklalDtVWnVbFR2iqDLiRhpm
-XKBzPwIbAgMBAAGjSDBGMCUGA1UdEQQeMByCGmRydXBhbC13ZWIxLnVuaXYtbGls
-bGUxLmZyMB0GA1UdDgQWBBR4MjERy9HNblRVIBMMXv6lw+oJxjANBgkqhkiG9w0B
-AQUFAAOCAQEAJhvOYbbYtxKGw3GfYyAIag15zgdx/Zv0R8/aMtq4lum5ibJeh559
-tpJBBtqclTvMPzA0pjO61NWavFC+ROU4FMDL4HZF2fJN44VBloK2qSExD+jU3ARy
-iH7gAMMeRvnUUanQaefaacSKvrIL1EU2PCcaTHyRGqzILBi6ZbvmmZLhFB1OmlYH
-FwPWP4omGY8/MYNYuW5oU/HtpkdLWUed9DqGQSJDodBVdJHyjWEzNwf+mxBlwSXa
-4VEJouPfrQAD6PqFhsz9qQpx8gYuNN3iUVSL0CIjthzBGp/B2d+813Haio+5qsOL
-Dj+RBXEEXq6BPJ4ZI/vQ8DB6K34mTzfQKg==
-					    </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>
-					      MIIDFTCCAf2gAwIBAgIJALIbtMdZhxM2MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGmRydXBhbC13ZWIxLnVuaXYtbGlsbGUxLmZyMB4XDTE0MDgwMTA3NDM1NloX
-DTI0MDcyOTA3NDM1NlowJTEjMCEGA1UEAxMaZHJ1cGFsLXdlYjEudW5pdi1saWxs
-ZTEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrnebq+nhIUfCL
-6I0Zs/hG4XeRItJBgsQQ2AB2JndoMZaRewzKT/9Ht/EqObllh5C3qFhMDitBd5Au
-E6/+Dhff00q4GGskt3Nf0qsV9EuOvyr2z2kx94wnilABMm+dZo4j0NBLuGo+vPNc
-sbjUjmo/fmD5N47iI3+UqcZPmKlp5mnfJ/QfMWYhkE9xSknu+jwr85mtYPJlMLLR
-bYwaVoCpNNn/dI9AmKPV0j4Hy7Wi3ZHehqg1e2qHaejGdTt61W5hzVfzXgc/VznF
-kISdtz8ohNq5NqXNKdddyDY60miygAtY/3BVf5/FQklalDtVWnVbFR2iqDLiRhpm
-XKBzPwIbAgMBAAGjSDBGMCUGA1UdEQQeMByCGmRydXBhbC13ZWIxLnVuaXYtbGls
-bGUxLmZyMB0GA1UdDgQWBBR4MjERy9HNblRVIBMMXv6lw+oJxjANBgkqhkiG9w0B
-AQUFAAOCAQEAJhvOYbbYtxKGw3GfYyAIag15zgdx/Zv0R8/aMtq4lum5ibJeh559
-tpJBBtqclTvMPzA0pjO61NWavFC+ROU4FMDL4HZF2fJN44VBloK2qSExD+jU3ARy
-iH7gAMMeRvnUUanQaefaacSKvrIL1EU2PCcaTHyRGqzILBi6ZbvmmZLhFB1OmlYH
-FwPWP4omGY8/MYNYuW5oU/HtpkdLWUed9DqGQSJDodBVdJHyjWEzNwf+mxBlwSXa
-4VEJouPfrQAD6PqFhsz9qQpx8gYuNN3iUVSL0CIjthzBGp/B2d+813Haio+5qsOL
-Dj+RBXEEXq6BPJ4ZI/vQ8DB6K34mTzfQKg==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://identite.intranet.univ-lille.fr/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identite.intranet.univ-lille.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Université de Lille - plate-forme charte digitale (identité)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Université de Lille - plate-forme charte digitale (identité)</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Cette plate-forme permet aux responsables de communication de charger les éléments d'identification numérique</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">This platform allows the responsables of the communication to load digital identification elements they need</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="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>VIEVILLE CLAUDE</md:SurName>
-    <md:EmailAddress>claude.vieville@univ-lille1.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>WALLON ANTOINE</md:SurName>
-    <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2cfae49b..00000000
--- a/swamid-interfederations-2.0/identites.ec-lyon.fr-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://identites.ec-lyon.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Ecole Centrale de Lyon</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98KBw0LB42T+3kAAAITSURBVDjLdZNBaBNREIa/3QatJeoeBL0UUxFKUEJQKejBxj0JElvFq1hyeCAqih6VHgpexaIi+w6lLfXioQ3koocuwYi0QuretBfNIqFgBTcRaiyh8eBseUYdeCwz+7//zfwzY3U6HQvDtNZZIAJSgC9hF6gBKaVU2cRbJoHWegoYi8H8aXFsWilViIOJLlB8yQEeAq/EPy3EANm/MpCXs3KmgdtKqairNAd4IEQBECilCpbneWeMWstKKdfvG9wauHuDqLIMQDKT5vPjGdyNVVtr7QO5WJuefD5vASOSdqparYZH9h0YGbh3Hbu3l2Qmzf5L52g3miysfQyBm4YmkwmpOwUUhXl8bW6Bb5W3tKPvv4VydtMK63Dizrh0qAyMAinbSH8WOAYEyUyaU+99hpaKZJ4/of/alViKQDCz4vuW53kdcS4qpYoAft/g1tBSkWQmDUArrPMm7eJurNoi6CgwD2DLkMSt2rb10iIA7UaTT/cfkdi7x/wdY92EiFEDxrTWE8DUoV07t19uN5qslxbZ3PyJ1noeKBjDVjNFBFgBitHwcbeun40DuaiyjL0jUY5OHp0AzgvGibvWUyqVwmq1elDUzQIffhzun7kw99R7d/ZyoxXWXw5/Da6+bnyJpN05EfOFUmqyexdWhCSSieweZScetv/tQmAQ3JJjLpMj339vo2SRMzave50dpVRg4n8Bxo3SMex00ZQAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ec-lyon.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Ecole Centrale de Lyon</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>
-					      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>
-    </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-POST" Location="https://identites.ec-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identites.ec-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identites.ec-lyon.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Centrale de Lyon</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Centrale de Lyon</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ec-lyon.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Cheval Régis</md:SurName>
-    <md:EmailAddress>regis.cheval@ec-lyon.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 fa49303e..00000000
--- a/swamid-interfederations-2.0/identites.enim.fr-idp-.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identites.enim.fr/idp/">
-  <md: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>
-  </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 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="en">ENIM</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB/ElEQVQ4y92Sv2tTURiGn3PvPfmlRUutVm1jA4XgoMEsgrg4iCBCqVihTiL+Ax0EXQq6iGgnByelBdFR6VZBKGIHKdqCaazVptFqkyYNbRJzU3Nzz3EI3rSiLm6+08fD4eX9zvvBP0r8CsbGnuql9ALZwlfepTN8W8qTqxR482pa/NXg2fMXeuTRCB8T83Ttbqfuusynsty4dY3+3j7xpwQWQPzoEX3l6iCmoeho3YeWgkK5SMXO8vnLBwB0dkJTnGR9uUbZHyN87KzwEty5fVPv7z7E/dFhpGihbgZIJd8T3VHh0qkSse6D9HRaUEqi7SKF7w4zdpSTgwlh/Ywy0H9G3L3epykqkgUwIh0cP2zTG13AkkEyy35er7cQ1AHibRli8hNPhuLa2rzP5RMamZ3i4ZTLvdEVMT4OFx/E9N5QiYnZNBeGawIg9fi0DstpjLU5jM0GAenDrNTZE2r32K6eTpTaYBs+jx3oasP0aaRlbzVQSPA7FMl5TNZNlAFVqxl2Q1g4hCgrs2EQjnQ3OnWqOIaJ2fwalKiBkphaeSzoaqy6iSHdhsH5cwONShRIx8Xn+L3Hhghh4OKTbc3jUSWEofD5I1tX+K1UGYCaWvGQDmxvDLVFtrTwciaPvbjGaqDVY5OJHJXFDPnqTsAG4O3sKqtzy6TXLf4D/QATVME3IBx2pQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMyswMjowMISdtHYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzMrMDI6MDD1wAzKAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.enim.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENIM</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>
-					      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>
-    </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-POST" Location="https://authshib.enim.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authshib.enim.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://authshib.enim.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENIM</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENIM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.enim.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>admininfo@enim.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 25b09599..00000000
--- a/swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identites.ensea.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENSEA</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACbUlEQVQoz12STUhUYRSG3++795s7P14ddVSU0ZkYGk3DTINAKgsi2wT9LdoJtSxaCNaiRQjSSkRo0a8tQkhLpDKLkkyQwjRMRCLUxaQzjpo6js517sz9+VpMqc27POd9znkPHBL5OK4OTaowsSNuYMvq8TrKvBufJ8xYAqCphhVUXO0fYW39UST/esENxF1nTtCwHmp+qgXXCKfbkygsouCwrhEtCj1V0qEUXT4fi2tLHV0EjIJxYgAgIAA4CN2VBDoUV/1xlp8TftZLYaNgBlQOE+A6FA5OAHEnODglrKChfvZquwlNR4zDkP3lks+dDC459nkj70b4pi7uvhUQ5Oq9pY+bFrsHjITqOlWbe+5Y5MOYHokuvxg0lC1A2gEIqMGVwO0npR03XGePAFCm5xbu9qwNjG5++wkYAmwEZPcGiHAsdr9def+lsq81/KAv1NlDQCgkConAksrwH5CS83CVtaQg3PlGRAb9Z+DgJlQOMx0woWXU+C15TmaVVXVBhB0gJjQC5qw9lF1UmA4IYOvDk1Ri1WP3Qw97lR8hQnjGAZ+zrlqPqxt3utIBCnt0eGz25r2Sxkv+9sZ4aCURWFCmAsG27sjQqBMWcft5AErBOAwC4VdrR7D1OZUkGGZSXzURZ8giYARU5OCEiZn7q8yklgwuC7JdjyqiIRNJtPmKlKlApqdCzJZj32cE2WaVs4Trdafp/IbvZbO2tQ6NVLxqkXyFeiS2p+WKzV+8OTFd+qjJXuH9/fqT51aD79pFaihqrsXuSHDLzHyO1UG/zhZfOJlNLcbguPtgubuyzGkKbHKuIN/tOVpD83L/AGvaAbP3x8gPAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjM4KzAyOjAwhprgjAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozOCswMjowMPfHWDAAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ensea.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENSEA</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://identites.ensea.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identites.ensea.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identites.ensea.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensea.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identites.ensea.fr/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">ENSEA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENSEA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ensea.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>federation@ensea.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 7406d283..00000000
--- a/swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identities.univ-jfc.fr/idp/prod">
-  <md: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>
-  </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 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="en">CUFR Jean-François Champollion</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABLUlEQVQ4y5WSP0vDQBjGf5c/NbVN3ZycdamL6OC3cHLRzbWLJIu4iUM1CQhuRXBxd/MzCA5uIv0Qgklp7aWXcwhIMWmbvNu9PL/nnuc4qDHfIU9JyO38zqgKxxEPnXVOgO783qoCJxGX7TXOplPQkNRO0G5ynfyAZcJwyGnlBHHAAPiQEhomTCQv+wPSeY25EA7x3BYXcsaWgM1ZBq7P9n9daYVRwHGrQZiMwTToOjZkGb0yrSjcfMOOZfOpNGidR08Vr67PYZlBIYEwedPksCFAKsaL4ILBV5/dtoOrsvzs2KAVR8seulAhCZEI7KYNk5Q71+N8mUGhQqa5bzVgLHlfBZcaKHgcSVTHZ28VDCUfyRY8G3BQBS5MHHAVh3h1mL8Kus+GIRAdn6iOwS+GaFo8eiBYWAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMiswMjowMCLqv8IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzIrMDI6MDBTtwd+AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-jfc.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CUFR Jean-François Champollion</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>
-					      MIIEnjCCA4agAwIBAgIQKfC7PoBqgitD7hgMJJZhtzANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDEyMTUwMDAwMDBaFw0xNzEyMTQyMzU5NTlaMEAxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSY2FicmVsLnVuaXYt
-amZjLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApTfvTrYBl56c
-iIbkgBbvhrgC1LViU8mt0cqFUEsumOqCnpM21XfZTeE60cK35tl00bU9rvAvOsS6
-gVEnTIW1JfjE4j+dyODlCETWExkbfEVpRlhzSDO1hClOobWOS9top0Z9LfpRaUk2
-Bf0Nnf0IWrvH+fM/N+LquRzVLTMBZl3pm5CiQM4TofMVNadgVR66E8HllM/kFnPB
-LSsJD9Fa/66QgIxeRsN7Yos2tTjMTbnwQ4sYa5Q/B12/5c3SG1ImcJWHOYe/+scZ
-tiNUuOXKXucZsj7nKEOmaAqupbOCey/dPxDi4F5/QsJR0O+KlY4cfIOFHJeIgcpx
-ZhFPxUpz0wIDAQABo4IBbjCCAWowHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GG
-KLD9tr0wHQYDVR0OBBYEFCKA92H/uYHKIR4GxXHdlujIJvc7MA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNy
-bDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRy
-dXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2Nz
-cC51c2VydHJ1c3QuY29tMB0GA1UdEQQWMBSCEmNhYnJlbC51bml2LWpmYy5mcjAN
-BgkqhkiG9w0BAQsFAAOCAQEAdZc1KklhQc9qUvXfLL8pSRDf1YAr3TiazYRgs11d
-VT49T+XjywaEwt/EuO37kjgWEdDaUIixW+GbeOFmiOVL1SEzMfKFY8I3kOpvDObD
-3jsmc+bgInT2XR30NXpZqEZ/SR4E8Arhx1x88INL/vkZ8kc6fJ3Jd7JP90nTt9WV
-tmdx8n8rj2sNTl89FnNemEJYWQwF0nKuywnhLip82VqJCkWfL7lp9bdC+WU03DzF
-zr2zHMbf8Bks0RPLRRjYiGdyfU2+4JqdaCDsJqVRfSYWN0MLNazWWnmuUZ8aXNCm
-rZ7HQsIozzk8IpYy1UKXZtaGL3Rr/EyYfKsSeYGTGTX6Zw==
-					    </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>
-					      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>
-    </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-POST" Location="https://cabrel.univ-jfc.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cabrel.univ-jfc.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cabrel.univ-jfc.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CUFR Jean-François Champollion</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CUFR Jean-François Champollion</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-jfc.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>J.-M. Kubek</md:SurName>
-    <md:EmailAddress>jean-marie.kubek@univ-jfc.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.andrew.cmu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.andrew.cmu.edu-idp-shibboleth.xml
deleted file mode 100644
index f7064f1b..00000000
--- a/swamid-interfederations-2.0/identity.andrew.cmu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,111 +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://identity.andrew.cmu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://identity.andrew.cmu.edu/error" 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">affiliates.cmu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Carnegie Mellon University Tartan-ConnectID for Guests</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Carnegie Mellon University Social Identity Gateway</mdui:Description>
-        <mdui:Logo height="125" width="200" xml:lang="en">https://identity.andrew.cmu.edu/incommon/connectid-200x125.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>
-MIIDuDCCAqACCQDIvSXrEZve3TANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-VVMxFTATBgNVBAgTDFBlbm5zeWx2YW5pYTETMBEGA1UEBxMKUGl0dHNidXJnaDEj
-MCEGA1UEChMaQ2FybmVnaWUgTWVsbG9uIFVuaXZlcnNpdHkxGzAZBgNVBAsTEkNv
-bXB1dGluZyBTZXJ2aWNlczEgMB4GA1UEAxMXaWRlbnRpdHkuYW5kcmV3LmNtdS5l
-ZHUwHhcNMTQwMzA2MjI1MzExWhcNMzAwNjMwMjI1MzExWjCBnTELMAkGA1UEBhMC
-VVMxFTATBgNVBAgTDFBlbm5zeWx2YW5pYTETMBEGA1UEBxMKUGl0dHNidXJnaDEj
-MCEGA1UEChMaQ2FybmVnaWUgTWVsbG9uIFVuaXZlcnNpdHkxGzAZBgNVBAsTEkNv
-bXB1dGluZyBTZXJ2aWNlczEgMB4GA1UEAxMXaWRlbnRpdHkuYW5kcmV3LmNtdS5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjHgNRn0GrJDtLTfyx
-fCqvLzcLf0b2CVUrGpBIMhQZWatwMJGOiOYn8kUcYJhiERORyqR3vrckAs51DZIr
-03qDOHjIirncVAkm2o/fwVIw2076+iVRYRBVEEZnl4Yt1tVBSS92tu+JmY+cxj84
-DJI6JqAJOexeMWA5+jzTBapqHLPUa/p0hs0g8ycOraF1LXgxV0nD27ewa3nC5Y3e
-HHC4m9mBSGlHlPmNmuH9DQKfi9xfW8m1leJ5jmXK2MNvu72MSzynGJbbsqFSQHo3
-zW8Mvg737wQBDlbdKk7FSMZujVHeYu9DwgO/hWS98vBBDCej5BJmm0FKN9MUhDs5
-1t11AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJ7hT6nmzQuTqgn035Q8aOO6ACEW
-InS8ZcJIPZ8RL0xgldl5QYcah8U9vM2g8blc0aZWTZSxpMsyT5U4cH/ueahJAdqQ
-2XsXcrukx4ocbhT4xfxKZc65QwV0G8PO+jo2yrDvegGEzD3cR2nV3qZnprP+sRw9
-R0ysGS+bQIz2sVx/R+zfPbCEqUdELzRCUg+SnEdgIo2ODzpsCVK1y7t4lz2eyKYC
-8emMX99xUeAxCWjkCfjLHjnt99qn2HH6m5e/5A2y9/++CxpCQHUhDwbO0xUt2SKI
-JS1Wnyp2ix95wfTeksnSAxcWuXoPcfc1y96uW5M+7MbCwbqmkd18C9aXHEs=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.andrew.cmu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.andrew.cmu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.andrew.cmu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.andrew.cmu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.andrew.cmu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.andrew.cmu.edu/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">affiliates.cmu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDuDCCAqACCQDIvSXrEZve3TANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-VVMxFTATBgNVBAgTDFBlbm5zeWx2YW5pYTETMBEGA1UEBxMKUGl0dHNidXJnaDEj
-MCEGA1UEChMaQ2FybmVnaWUgTWVsbG9uIFVuaXZlcnNpdHkxGzAZBgNVBAsTEkNv
-bXB1dGluZyBTZXJ2aWNlczEgMB4GA1UEAxMXaWRlbnRpdHkuYW5kcmV3LmNtdS5l
-ZHUwHhcNMTQwMzA2MjI1MzExWhcNMzAwNjMwMjI1MzExWjCBnTELMAkGA1UEBhMC
-VVMxFTATBgNVBAgTDFBlbm5zeWx2YW5pYTETMBEGA1UEBxMKUGl0dHNidXJnaDEj
-MCEGA1UEChMaQ2FybmVnaWUgTWVsbG9uIFVuaXZlcnNpdHkxGzAZBgNVBAsTEkNv
-bXB1dGluZyBTZXJ2aWNlczEgMB4GA1UEAxMXaWRlbnRpdHkuYW5kcmV3LmNtdS5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjHgNRn0GrJDtLTfyx
-fCqvLzcLf0b2CVUrGpBIMhQZWatwMJGOiOYn8kUcYJhiERORyqR3vrckAs51DZIr
-03qDOHjIirncVAkm2o/fwVIw2076+iVRYRBVEEZnl4Yt1tVBSS92tu+JmY+cxj84
-DJI6JqAJOexeMWA5+jzTBapqHLPUa/p0hs0g8ycOraF1LXgxV0nD27ewa3nC5Y3e
-HHC4m9mBSGlHlPmNmuH9DQKfi9xfW8m1leJ5jmXK2MNvu72MSzynGJbbsqFSQHo3
-zW8Mvg737wQBDlbdKk7FSMZujVHeYu9DwgO/hWS98vBBDCej5BJmm0FKN9MUhDs5
-1t11AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJ7hT6nmzQuTqgn035Q8aOO6ACEW
-InS8ZcJIPZ8RL0xgldl5QYcah8U9vM2g8blc0aZWTZSxpMsyT5U4cH/ueahJAdqQ
-2XsXcrukx4ocbhT4xfxKZc65QwV0G8PO+jo2yrDvegGEzD3cR2nV3qZnprP+sRw9
-R0ysGS+bQIz2sVx/R+zfPbCEqUdELzRCUg+SnEdgIo2ODzpsCVK1y7t4lz2eyKYC
-8emMX99xUeAxCWjkCfjLHjnt99qn2HH6m5e/5A2y9/++CxpCQHUhDwbO0xUt2SKI
-JS1Wnyp2ix95wfTeksnSAxcWuXoPcfc1y96uW5M+7MbCwbqmkd18C9aXHEs=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.andrew.cmu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.andrew.cmu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Carnegie Mellon University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Carnegie Mellon University Tartan-ConnectID for Guests</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cmu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth Support Team</md:GivenName>
-    <md:EmailAddress>shibboleth-team@andrew.cmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Deborah Schill</md:GivenName>
-    <md:EmailAddress>dschill@cmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jeffrey Eaton</md:GivenName>
-    <md:EmailAddress>jeaton@cmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Computing Services Help Center</md:GivenName>
-    <md:EmailAddress>it-help@cmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.fu-berlin.de.xml b/swamid-interfederations-2.0/identity.fu-berlin.de.xml
deleted file mode 100644
index 849d596f..00000000
--- a/swamid-interfederations-2.0/identity.fu-berlin.de.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.fu-berlin.de/idp-fub">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fu-berlin.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identity.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identity.fu-berlin.de,OU=ZEDAT,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFPzCCBCegAwIBAgIECy24gDANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlG
-cmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4GA1UE
-AxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4wHAYJ
-KoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMDcxMDExMTUwMjA5WhcNMTIx
-MDA5MTUwMjA5WjCBgzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0G
-A1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGlu
-MQ4wDAYDVQQLEwVaRURBVDEeMBwGA1UEAxMVaWRlbnRpdHkuZnUtYmVybGluLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxN7G1kbqz9IzkY73eH68
-mfqsXSdxQSzmT2GSMvI8y2TiO6qqAxUoLF0MyPGyHVTVa4gyQrnII49qmxsLWUU7
-VBsoPo8QkQbNBzApAdqaPZfFYj+ri3ixcoetYIW67EmXu3wKpDDRbyTsPH/3YWn1
-nM9n3ALv6lfxVUo0l2Ye1djZqtHqVTeMSXeQmQpxHiwL+9b9XCVmRHSEhgpIa7G7
-g7ZD41WQUSZKaojsaTV7ckusz3mH70ooELVZE5Gg4yy813n/WxAioa+IMD4HAjUy
-Wvg7fz4TX/C7eBoM3P2mfIu27VFvILDhADwaL2AeGTiqdPOOoKaeNxunlrbS1LZl
-pwIDAQABo4IBhTCCAYEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBScIsvBg740AqEq6gzeuns7
-FCwotDAfBgNVHSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBs
-MDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBHtof8w5DsNBf25l+i
-RajpMiZte4BnVTuCRExLjT3Q5lIrhtfVVqXCwuVvTaaMV70IMKaMM5THR3pRogTU
-rZh+DirxBmcvGkhMtdwYxkRWZxzdA4afV2B0ynf8dCD1Weob9R2SCQTd7syig0CE
-PqCoVSXm/L7LcyoByv7aGlOBUCZ5aMvfJ4pPfewLVR7FylYw63EAcAc9/7Mup5wb
-57IMDKHlFwW6mTrwkpo5qDuYlcPjUBOMjF2eP70L7RbV4iAcqDxBBIB+8l1flXw7
-LQdAat7jcaUtmmt1vRWLDdbv0njl1gze/ShPK2mc6ZUPb6TKikKuUjOgcSzE4Lmb
-5Av8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identity.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identity.fu-berlin.de,OU=ZEDAT,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFPzCCBCegAwIBAgIECy24gDANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlG
-cmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4GA1UE
-AxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4wHAYJ
-KoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMDcxMDExMTUwMjA5WhcNMTIx
-MDA5MTUwMjA5WjCBgzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0G
-A1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGlu
-MQ4wDAYDVQQLEwVaRURBVDEeMBwGA1UEAxMVaWRlbnRpdHkuZnUtYmVybGluLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxN7G1kbqz9IzkY73eH68
-mfqsXSdxQSzmT2GSMvI8y2TiO6qqAxUoLF0MyPGyHVTVa4gyQrnII49qmxsLWUU7
-VBsoPo8QkQbNBzApAdqaPZfFYj+ri3ixcoetYIW67EmXu3wKpDDRbyTsPH/3YWn1
-nM9n3ALv6lfxVUo0l2Ye1djZqtHqVTeMSXeQmQpxHiwL+9b9XCVmRHSEhgpIa7G7
-g7ZD41WQUSZKaojsaTV7ckusz3mH70ooELVZE5Gg4yy813n/WxAioa+IMD4HAjUy
-Wvg7fz4TX/C7eBoM3P2mfIu27VFvILDhADwaL2AeGTiqdPOOoKaeNxunlrbS1LZl
-pwIDAQABo4IBhTCCAYEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBScIsvBg740AqEq6gzeuns7
-FCwotDAfBgNVHSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBs
-MDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBHtof8w5DsNBf25l+i
-RajpMiZte4BnVTuCRExLjT3Q5lIrhtfVVqXCwuVvTaaMV70IMKaMM5THR3pRogTU
-rZh+DirxBmcvGkhMtdwYxkRWZxzdA4afV2B0ynf8dCD1Weob9R2SCQTd7syig0CE
-PqCoVSXm/L7LcyoByv7aGlOBUCZ5aMvfJ4pPfewLVR7FylYw63EAcAc9/7Mup5wb
-57IMDKHlFwW6mTrwkpo5qDuYlcPjUBOMjF2eP70L7RbV4iAcqDxBBIB+8l1flXw7
-LQdAat7jcaUtmmt1vRWLDdbv0njl1gze/ShPK2mc6ZUPb6TKikKuUjOgcSzE4Lmb
-5Av8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.fu-berlin.de:8444/idp-fub/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.fu-berlin.de:8444/idp-fub/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.fu-berlin.de/idp-fub/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.fu-berlin.de/idp-fub/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.fu-berlin.de/idp-fub/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.fu-berlin.de/idp-fub/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fu-berlin.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identity.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identity.fu-berlin.de,OU=ZEDAT,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFPzCCBCegAwIBAgIECy24gDANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlG
-cmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4GA1UE
-AxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4wHAYJ
-KoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMDcxMDExMTUwMjA5WhcNMTIx
-MDA5MTUwMjA5WjCBgzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0G
-A1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGlu
-MQ4wDAYDVQQLEwVaRURBVDEeMBwGA1UEAxMVaWRlbnRpdHkuZnUtYmVybGluLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxN7G1kbqz9IzkY73eH68
-mfqsXSdxQSzmT2GSMvI8y2TiO6qqAxUoLF0MyPGyHVTVa4gyQrnII49qmxsLWUU7
-VBsoPo8QkQbNBzApAdqaPZfFYj+ri3ixcoetYIW67EmXu3wKpDDRbyTsPH/3YWn1
-nM9n3ALv6lfxVUo0l2Ye1djZqtHqVTeMSXeQmQpxHiwL+9b9XCVmRHSEhgpIa7G7
-g7ZD41WQUSZKaojsaTV7ckusz3mH70ooELVZE5Gg4yy813n/WxAioa+IMD4HAjUy
-Wvg7fz4TX/C7eBoM3P2mfIu27VFvILDhADwaL2AeGTiqdPOOoKaeNxunlrbS1LZl
-pwIDAQABo4IBhTCCAYEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBScIsvBg740AqEq6gzeuns7
-FCwotDAfBgNVHSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBs
-MDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBHtof8w5DsNBf25l+i
-RajpMiZte4BnVTuCRExLjT3Q5lIrhtfVVqXCwuVvTaaMV70IMKaMM5THR3pRogTU
-rZh+DirxBmcvGkhMtdwYxkRWZxzdA4afV2B0ynf8dCD1Weob9R2SCQTd7syig0CE
-PqCoVSXm/L7LcyoByv7aGlOBUCZ5aMvfJ4pPfewLVR7FylYw63EAcAc9/7Mup5wb
-57IMDKHlFwW6mTrwkpo5qDuYlcPjUBOMjF2eP70L7RbV4iAcqDxBBIB+8l1flXw7
-LQdAat7jcaUtmmt1vRWLDdbv0njl1gze/ShPK2mc6ZUPb6TKikKuUjOgcSzE4Lmb
-5Av8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identity.fu-berlin.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identity.fu-berlin.de,OU=ZEDAT,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFPzCCBCegAwIBAgIECy24gDANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlG
-cmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4GA1UE
-AxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4wHAYJ
-KoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMDcxMDExMTUwMjA5WhcNMTIx
-MDA5MTUwMjA5WjCBgzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0G
-A1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGlu
-MQ4wDAYDVQQLEwVaRURBVDEeMBwGA1UEAxMVaWRlbnRpdHkuZnUtYmVybGluLmRl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxN7G1kbqz9IzkY73eH68
-mfqsXSdxQSzmT2GSMvI8y2TiO6qqAxUoLF0MyPGyHVTVa4gyQrnII49qmxsLWUU7
-VBsoPo8QkQbNBzApAdqaPZfFYj+ri3ixcoetYIW67EmXu3wKpDDRbyTsPH/3YWn1
-nM9n3ALv6lfxVUo0l2Ye1djZqtHqVTeMSXeQmQpxHiwL+9b9XCVmRHSEhgpIa7G7
-g7ZD41WQUSZKaojsaTV7ckusz3mH70ooELVZE5Gg4yy813n/WxAioa+IMD4HAjUy
-Wvg7fz4TX/C7eBoM3P2mfIu27VFvILDhADwaL2AeGTiqdPOOoKaeNxunlrbS1LZl
-pwIDAQABo4IBhTCCAYEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBScIsvBg740AqEq6gzeuns7
-FCwotDAfBgNVHSMEGDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDB1BgNVHR8EbjBs
-MDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCBgDA+BggrBgEFBQcwAoYyaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-PgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnUtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBHtof8w5DsNBf25l+i
-RajpMiZte4BnVTuCRExLjT3Q5lIrhtfVVqXCwuVvTaaMV70IMKaMM5THR3pRogTU
-rZh+DirxBmcvGkhMtdwYxkRWZxzdA4afV2B0ynf8dCD1Weob9R2SCQTd7syig0CE
-PqCoVSXm/L7LcyoByv7aGlOBUCZ5aMvfJ4pPfewLVR7FylYw63EAcAc9/7Mup5wb
-57IMDKHlFwW6mTrwkpo5qDuYlcPjUBOMjF2eP70L7RbV4iAcqDxBBIB+8l1flXw7
-LQdAat7jcaUtmmt1vRWLDdbv0njl1gze/ShPK2mc6ZUPb6TKikKuUjOgcSzE4Lmb
-5Av8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.fu-berlin.de:8444/idp-fub/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.fu-berlin.de:8444/idp-fub/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Freie Universität Berlin</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Freie Universität Berlin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Steffen</GivenName>
-    <SurName>Hofmann</SurName>
-    <EmailAddress>fudis@zedat.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hans</GivenName>
-    <SurName>Benedict</SurName>
-    <EmailAddress>fudis@zedat.fu-berlin.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.gettysburg.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.gettysburg.edu-idp-shibboleth.xml
deleted file mode 100644
index 02fc8f20..00000000
--- a/swamid-interfederations-2.0/identity.gettysburg.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +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://identity.gettysburg.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">gettysburg.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Gettysburg College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Single Sign On system for Gettysburg College students, faculty, staff, administrators and affiliates.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.gettysburg.edu/global/privacy_statement.dot</mdui:PrivacyStatementURL>
-        <mdui:Logo height="33" width="125" xml:lang="en">https://www.gettysburg.edu/global2/images/template/logo2.gif</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>
-MIIDRzCCAi+gAwIBAgIUa3MGMc8uaB4aTTQas66uRLYPddMwDQYJKoZIhvcNAQEF
-BQAwIjEgMB4GA1UEAxMXaWRlbnRpdHkuZ2V0dHlzYnVyZy5lZHUwHhcNMTQwNTAy
-MjAxODIzWhcNMzQwNTAyMjAxODIzWjAiMSAwHgYDVQQDExdpZGVudGl0eS5nZXR0
-eXNidXJnLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ8MSZuX
-QgeOYDw1Ym7kYYHBhuhm0Uvg+RKf3ASzvtsfI+ikRuYdjpiTDVxjBnSfCiJt12pl
-91YkchSk9cZZRdnlbgfxWEAb9oVmAxuSRF22sfdoZLu2fduTy9j/jb7zgT0VUatG
-54kleuiRStaIUdzxwEc3gmRuO6uFxv5Kg2caovFfxWgYdTmvjRSom7A6H4GNJ/5N
-IBVn1ygB8d3KZ65uocaZ6nXGY8Rursz1h324Zwd0DLYmLviKdq+R42poIOzLwMdz
-IWZX2BVzafibId6Cer8KzxW12heM+brfD/DmMDi+QPnZDglNPDZj0pxYjGPwwYqI
-NpKOV5ftGZ/vpdMCAwEAAaN1MHMwUgYDVR0RBEswSYIXaWRlbnRpdHkuZ2V0dHlz
-YnVyZy5lZHWGLmh0dHBzOi8vaWRlbnRpdHkuZ2V0dHlzYnVyZy5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFFYwuZiYNzL+zr9/ji52hEFMLZk8MA0GCSqGSIb3
-DQEBBQUAA4IBAQB6CMZYhPdkC6O6uGwg4bTWdlyZ1S4eAZBJbc9L05CmMpjqjHS+
-Mz2QYy2Kss0CjDTEBDKplOF5AywgtROqff1vtzI4Ms3exfeeShfPTFry5pCSc4i3
-Aref+AumaQYPc+IlHQuU5k3IhbU8wZLZpEOo/Z5hXdNMcy+A5k3TP/QTNgVY5efk
-gcSrWUynbwYsBwNVPprtFIDzt0ZUD6A1Gw6FYMW6gapHaNkZu0Nbw/5r/F8JrX8s
-2OfeRMA7g+yi6cFxonAIXYiwtkFqunjgM+GVtj3RkfA7AkYiOgKGAW+FSvqgGWdw
-qxNBz1YaAbi+ryPrCrHRrXZViELMLbf1WkK3
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.gettysburg.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.gettysburg.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.gettysburg.edu:8444/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.gettysburg.edu:8444/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.gettysburg.edu:8444/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">gettysburg.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRzCCAi+gAwIBAgIUa3MGMc8uaB4aTTQas66uRLYPddMwDQYJKoZIhvcNAQEF
-BQAwIjEgMB4GA1UEAxMXaWRlbnRpdHkuZ2V0dHlzYnVyZy5lZHUwHhcNMTQwNTAy
-MjAxODIzWhcNMzQwNTAyMjAxODIzWjAiMSAwHgYDVQQDExdpZGVudGl0eS5nZXR0
-eXNidXJnLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ8MSZuX
-QgeOYDw1Ym7kYYHBhuhm0Uvg+RKf3ASzvtsfI+ikRuYdjpiTDVxjBnSfCiJt12pl
-91YkchSk9cZZRdnlbgfxWEAb9oVmAxuSRF22sfdoZLu2fduTy9j/jb7zgT0VUatG
-54kleuiRStaIUdzxwEc3gmRuO6uFxv5Kg2caovFfxWgYdTmvjRSom7A6H4GNJ/5N
-IBVn1ygB8d3KZ65uocaZ6nXGY8Rursz1h324Zwd0DLYmLviKdq+R42poIOzLwMdz
-IWZX2BVzafibId6Cer8KzxW12heM+brfD/DmMDi+QPnZDglNPDZj0pxYjGPwwYqI
-NpKOV5ftGZ/vpdMCAwEAAaN1MHMwUgYDVR0RBEswSYIXaWRlbnRpdHkuZ2V0dHlz
-YnVyZy5lZHWGLmh0dHBzOi8vaWRlbnRpdHkuZ2V0dHlzYnVyZy5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFFYwuZiYNzL+zr9/ji52hEFMLZk8MA0GCSqGSIb3
-DQEBBQUAA4IBAQB6CMZYhPdkC6O6uGwg4bTWdlyZ1S4eAZBJbc9L05CmMpjqjHS+
-Mz2QYy2Kss0CjDTEBDKplOF5AywgtROqff1vtzI4Ms3exfeeShfPTFry5pCSc4i3
-Aref+AumaQYPc+IlHQuU5k3IhbU8wZLZpEOo/Z5hXdNMcy+A5k3TP/QTNgVY5efk
-gcSrWUynbwYsBwNVPprtFIDzt0ZUD6A1Gw6FYMW6gapHaNkZu0Nbw/5r/F8JrX8s
-2OfeRMA7g+yi6cFxonAIXYiwtkFqunjgM+GVtj3RkfA7AkYiOgKGAW+FSvqgGWdw
-qxNBz1YaAbi+ryPrCrHRrXZViELMLbf1WkK3
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.gettysburg.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.gettysburg.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Gettysburg College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Gettysburg College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gettysburg.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Eric Yurick</md:GivenName>
-    <md:EmailAddress>netmaint@gettysburg.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:EmailAddress>ITHelpdesk@gettysburg.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Michael Hayden</md:GivenName>
-    <md:EmailAddress>netmaint@gettysburg.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml
deleted file mode 100644
index ebfd36e0..00000000
--- a/swamid-interfederations-2.0/identity.istat.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.istat.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">istat.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Italian National Institute of Statistics</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Istituto Nazionale di Statistica</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for ISTAT users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti ISTAT</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.istat.it/it/informazioni/per-i-ricercatori/accesso-ai-servizi-web</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.istat.it/en/information/researchers</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://identity.istat.it/idp/informativa.jsp</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="207" xml:lang="en">https://identity-ext.istat.it/img/Logo_Istat80.png</mdui:Logo>
-        <mdui:Logo height="16" width="55" xml:lang="en">https://identity-ext.istat.it/img/Logo_Istat16.png</mdui:Logo>
-        <mdui:Logo height="16" width="55" xml:lang="it">https://identity-ext.istat.it/img/Logo_Istat16.png</mdui:Logo>
-        <mdui:Logo height="60" width="207" xml:lang="it">https://identity-ext.istat.it/img/Logo_Istat80.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUGtRU3zo/2OMlhNaUyGcCUcx93HowDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRlbnRpdHkuaXN0YXQuaXQwHhcNMTEwMjI0MTEyMTIx
-WhcNMzEwMjI0MTEyMTIxWjAcMRowGAYDVQQDExFpZGVudGl0eS5pc3RhdC5pdDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMuRDh3nQ52K48KChGDuTuRN
-/DUGcOruszmQXShTktPdfLd5sw15vVKsW1Nenwyoda5c2NUkyE1JfIOBvmbntzg+
-coCAT5/QKsZymsBgRpOKCbzrXDK3oBO1ptkflLXb91M9lrNN06fhhiduJS4wmAUU
-hAhAV3xRurswE5DSah1I8NmwwbIN5Us4uDKxWoXEn6Z6Y2ugT/ZygbhvjCELu+Ht
-hHggctKBY5bqHbvgf72SWCl6tesRpE8/2HtCXgNeDDyLdVTGZoTa9Ni0vXVcTKuW
-0wlT0LC4Awo44FpBVzsOyGFIJ9S96MV3gzrC88Z4gFkYqeTsEQ7gk7kZuDryLOsC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRlbnRpdHkuaXN0YXQuaXSGKGh0dHBzOi8v
-aWRlbnRpdHkuaXN0YXQuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLcpT4bm
-slGxKZUp7NmUOpBoP4ORMA0GCSqGSIb3DQEBBQUAA4IBAQBLCO43R7UyOAycOGPk
-Xys3D3GVpLUw51Yr9BRLN16cJkqjRNwOPP1Cyro07i+DK9dp2OQqPDA5XMQy06Ws
-x1spOeR0hbkUTsrSTQVIcg9qoXnL6gDOALsCqB1GXnpp9yDK+HrJoYfRSFEU6GP9
-liKdSZe4QD78Y+MnMLjOtEwRp8fLy5zh0tpKBLDoln1GW+WhAtPCRdAWSr7dZhko
-v430rOfzsqysrxY0NvApAJe4ioA0/kgeJYYPg48F8Tykda2xgBNXaB9gdTR4FyB6
-3t2yL9i9sqXCq4uRlQqUXGzVQuFUX/BxU+Coph5YPhkn3snHBJWKTzpA0ZMwbq1X
-Tly+
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.istat.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.istat.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.istat.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.istat.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.istat.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.istat.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">istat.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUGtRU3zo/2OMlhNaUyGcCUcx93HowDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRlbnRpdHkuaXN0YXQuaXQwHhcNMTEwMjI0MTEyMTIx
-WhcNMzEwMjI0MTEyMTIxWjAcMRowGAYDVQQDExFpZGVudGl0eS5pc3RhdC5pdDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMuRDh3nQ52K48KChGDuTuRN
-/DUGcOruszmQXShTktPdfLd5sw15vVKsW1Nenwyoda5c2NUkyE1JfIOBvmbntzg+
-coCAT5/QKsZymsBgRpOKCbzrXDK3oBO1ptkflLXb91M9lrNN06fhhiduJS4wmAUU
-hAhAV3xRurswE5DSah1I8NmwwbIN5Us4uDKxWoXEn6Z6Y2ugT/ZygbhvjCELu+Ht
-hHggctKBY5bqHbvgf72SWCl6tesRpE8/2HtCXgNeDDyLdVTGZoTa9Ni0vXVcTKuW
-0wlT0LC4Awo44FpBVzsOyGFIJ9S96MV3gzrC88Z4gFkYqeTsEQ7gk7kZuDryLOsC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRlbnRpdHkuaXN0YXQuaXSGKGh0dHBzOi8v
-aWRlbnRpdHkuaXN0YXQuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLcpT4bm
-slGxKZUp7NmUOpBoP4ORMA0GCSqGSIb3DQEBBQUAA4IBAQBLCO43R7UyOAycOGPk
-Xys3D3GVpLUw51Yr9BRLN16cJkqjRNwOPP1Cyro07i+DK9dp2OQqPDA5XMQy06Ws
-x1spOeR0hbkUTsrSTQVIcg9qoXnL6gDOALsCqB1GXnpp9yDK+HrJoYfRSFEU6GP9
-liKdSZe4QD78Y+MnMLjOtEwRp8fLy5zh0tpKBLDoln1GW+WhAtPCRdAWSr7dZhko
-v430rOfzsqysrxY0NvApAJe4ioA0/kgeJYYPg48F8Tykda2xgBNXaB9gdTR4FyB6
-3t2yL9i9sqXCq4uRlQqUXGzVQuFUX/BxU+Coph5YPhkn3snHBJWKTzpA0ZMwbq1X
-Tly+
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.istat.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.istat.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Istituto Nazionale di Statistica</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Italian National Institute of Statistics</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">ISTAT</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ISTAT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.istat.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.istat.it/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Supporto Tecnico</md:SurName>
-    <md:EmailAddress>mailto:idem@istat.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 3514ec6e..00000000
--- a/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +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>
-  <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">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:InformationURL xml:lang="sv">http://www.mdh.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.mdh.se</mdui:InformationURL>
-        <mdui:Logo height="117" width="216">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
-        <mdui:Logo height="117" width="216" xml:lang="sv">https://identity.mdh.se/img/logo-sv.png</mdui:Logo>
-        <mdui:Logo height="117" width="216" xml:lang="en">https://identity.mdh.se/img/logo-en.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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.mdh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.mdh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.mdh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.mdh.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">mdh.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.mdh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.mdh.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">MDH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Mälardalens Högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Mälardalen University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mdh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Mälardalen University</md:Company>
-    <md:SurName>Peter Falck</md:SurName>
-    <md:EmailAddress>mailto:peter.falck@mdh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 21 101499</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Mälardalen University</md:Company>
-    <md:SurName>MDH Drift</md:SurName>
-    <md:EmailAddress>mailto:drift.ita@mdh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 21 101499</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Mälardalen University</md:Company>
-    <md:SurName>Helpdesk MDH</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@mdh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 16 101550</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 88e51c09..00000000
--- a/swamid-interfederations-2.0/identity.mdh.se.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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: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.ugent.be-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 5662e308..00000000
--- a/swamid-interfederations-2.0/identity.ugent.be-simplesaml-saml2-idp-metadata.php.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://identity.ugent.be/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">Ghent University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="nl">Universiteit Gent</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Ghent University is a top 100 university founded in 1817. As one of the major universities in Belgium, our 11 faculties offer a wide range of courses and conduct in-depth research in both exact and social sciences.</mdui:Description>
-        <mdui:Description xml:lang="nl">De Universiteit Gent (UGent) werd opgericht in 1817 door koning Willem I van Oranje. Vandaag is de UGent een top 100 universiteit een van de grootste universiteiten in het Nederlandse taalgebied. Meer dan 100 vakgroepen bieden ruim 230 opleidingen aan. Disciplines als biotechnologie, aquacultuur, micro-elektronica en geschiedenis genieten wereldfaam. De UGent is een creatieve gemeenschap van medewerkers, studenten en alumni, verbonden door engagement, openheid en pluralisme.</mdui:Description>
-        <mdui:Logo height="68" width="95" xml:lang="en">https://identity.ugent.be/images/universiteit_gent.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>157.193.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>ugent.be</mdui:DomainHint>
-        <mdui:DomainHint>www.ugent.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:51.0473100,3.7281500</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>MIIFNjCCBB6gAwIBAgIQDTNsKIIro/EZAVFJOfYCYTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTA4MTcwMDAwMDBaFw0xODA4MjExMjAwMDBaMIGFMQswCQYDVQQGEwJCRTEYMBYGA1UECBMPT29zdC1WbGFhbmRlcmVuMQ0wCwYDVQQHEwRHZW50MRowGAYDVQQKExFVbml2ZXJzaXRlaXQgR2VudDEVMBMGA1UECxMMRGlyZWN0aWUgSUNUMRowGAYDVQQDExFpZGVudGl0eS51Z2VudC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkIIBPrfC+bJdACG9LCraoxf9OaHJdkMRFmNoF6kZagLlrL0mQA5WQKo3rRaN/NDPXThwC5Xn2sjxFPwaYwFj+S9MxWhc0FrsmXBPSyTLixOxAJ2WaRVJK9dh2dvawz9bOhOhc86np1ussiM9S0mWN/txZHlTh7BmmQkHxRcdjIpMRDTCA5Sg4XKwKPPuA+l7hPB6vfIhVi2e/rTMFjGXU/4bt00GjW44kfvnNc6UqXX9WeQdQ+Bq6jaBN5q8R+Q0K2CgQYBG4ERDfNcoc8Te61vk0mlhuFXVyctpESqQ0n0YEg9T7dYj+SGJiGQQJ1EKUBxuMjvO2JKprpT1THZfsCAwEAAaOCAcAwggG8MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBS5ySEy32qxhCWj+uA2++OpxXiDjjAcBgNVHREEFTATghFpZGVudGl0eS51Z2VudC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAxO7M96KkXO0rBlWrKmFwaRVItStjleeemn9IC+Jax/+ZWiwTlxGTZBC5t+6QHIn0xv32MvvTHtnWcK8WC1eBM7v9Iyxr+1YBuQLN0fJ79K4BDQRXmrnMjWAK2pIp5BTdUNvBrs9ll6m7Hq7TQanB3obGZtIrNv2uuvBHHXvtht3k1em1k6qZoSOaiRFiA8WuKsVA6zjTLQi+Mp/2rb6WF2GoSD+cCniWmDzOvbENPN+LMcx/WyoDGEL4n9ewU0OXsCBz2W/h34iFHAHZEAClPV8mnyQA7C7uj8H2kkBM3YhXR+/Atua33FFyaku1joJElpo1+UmG7HbrCWSFUn5Pt</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>MIIFNjCCBB6gAwIBAgIQDTNsKIIro/EZAVFJOfYCYTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTA4MTcwMDAwMDBaFw0xODA4MjExMjAwMDBaMIGFMQswCQYDVQQGEwJCRTEYMBYGA1UECBMPT29zdC1WbGFhbmRlcmVuMQ0wCwYDVQQHEwRHZW50MRowGAYDVQQKExFVbml2ZXJzaXRlaXQgR2VudDEVMBMGA1UECxMMRGlyZWN0aWUgSUNUMRowGAYDVQQDExFpZGVudGl0eS51Z2VudC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkIIBPrfC+bJdACG9LCraoxf9OaHJdkMRFmNoF6kZagLlrL0mQA5WQKo3rRaN/NDPXThwC5Xn2sjxFPwaYwFj+S9MxWhc0FrsmXBPSyTLixOxAJ2WaRVJK9dh2dvawz9bOhOhc86np1ussiM9S0mWN/txZHlTh7BmmQkHxRcdjIpMRDTCA5Sg4XKwKPPuA+l7hPB6vfIhVi2e/rTMFjGXU/4bt00GjW44kfvnNc6UqXX9WeQdQ+Bq6jaBN5q8R+Q0K2CgQYBG4ERDfNcoc8Te61vk0mlhuFXVyctpESqQ0n0YEg9T7dYj+SGJiGQQJ1EKUBxuMjvO2JKprpT1THZfsCAwEAAaOCAcAwggG8MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBS5ySEy32qxhCWj+uA2++OpxXiDjjAcBgNVHREEFTATghFpZGVudGl0eS51Z2VudC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAxO7M96KkXO0rBlWrKmFwaRVItStjleeemn9IC+Jax/+ZWiwTlxGTZBC5t+6QHIn0xv32MvvTHtnWcK8WC1eBM7v9Iyxr+1YBuQLN0fJ79K4BDQRXmrnMjWAK2pIp5BTdUNvBrs9ll6m7Hq7TQanB3obGZtIrNv2uuvBHHXvtht3k1em1k6qZoSOaiRFiA8WuKsVA6zjTLQi+Mp/2rb6WF2GoSD+cCniWmDzOvbENPN+LMcx/WyoDGEL4n9ewU0OXsCBz2W/h34iFHAHZEAClPV8mnyQA7C7uj8H2kkBM3YhXR+/Atua33FFyaku1joJElpo1+UmG7HbrCWSFUn5Pt</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>MIIFNjCCBB6gAwIBAgIQDTNsKIIro/EZAVFJOfYCYTANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTA4MTcwMDAwMDBaFw0xODA4MjExMjAwMDBaMIGFMQswCQYDVQQGEwJCRTEYMBYGA1UECBMPT29zdC1WbGFhbmRlcmVuMQ0wCwYDVQQHEwRHZW50MRowGAYDVQQKExFVbml2ZXJzaXRlaXQgR2VudDEVMBMGA1UECxMMRGlyZWN0aWUgSUNUMRowGAYDVQQDExFpZGVudGl0eS51Z2VudC5iZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkIIBPrfC+bJdACG9LCraoxf9OaHJdkMRFmNoF6kZagLlrL0mQA5WQKo3rRaN/NDPXThwC5Xn2sjxFPwaYwFj+S9MxWhc0FrsmXBPSyTLixOxAJ2WaRVJK9dh2dvawz9bOhOhc86np1ussiM9S0mWN/txZHlTh7BmmQkHxRcdjIpMRDTCA5Sg4XKwKPPuA+l7hPB6vfIhVi2e/rTMFjGXU/4bt00GjW44kfvnNc6UqXX9WeQdQ+Bq6jaBN5q8R+Q0K2CgQYBG4ERDfNcoc8Te61vk0mlhuFXVyctpESqQ0n0YEg9T7dYj+SGJiGQQJ1EKUBxuMjvO2JKprpT1THZfsCAwEAAaOCAcAwggG8MB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBS5ySEy32qxhCWj+uA2++OpxXiDjjAcBgNVHREEFTATghFpZGVudGl0eS51Z2VudC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMG4GCCsGAQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAxO7M96KkXO0rBlWrKmFwaRVItStjleeemn9IC+Jax/+ZWiwTlxGTZBC5t+6QHIn0xv32MvvTHtnWcK8WC1eBM7v9Iyxr+1YBuQLN0fJ79K4BDQRXmrnMjWAK2pIp5BTdUNvBrs9ll6m7Hq7TQanB3obGZtIrNv2uuvBHHXvtht3k1em1k6qZoSOaiRFiA8WuKsVA6zjTLQi+Mp/2rb6WF2GoSD+cCniWmDzOvbENPN+LMcx/WyoDGEL4n9ewU0OXsCBz2W/h34iFHAHZEAClPV8mnyQA7C7uj8H2kkBM3YhXR+/Atua33FFyaku1joJElpo1+UmG7HbrCWSFUn5Pt</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.ugent.be/simplesaml/saml2/idp/ArtifactResolutionService.php" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.ugent.be/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://identity.ugent.be/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UGent</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UGent</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ugent.be</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Frank</md:GivenName>
-    <md:SurName>Meisschaert</md:SurName>
-    <md:EmailAddress>Frank.Meisschaert@UGent.be</md:EmailAddress>
-  </md: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 106aecc6..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.unamur.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">unamur.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unamur.be/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unamur.be/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be: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://identity.unamur.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unamur.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.unamur.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unamur.be/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">unamur.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unamur.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be: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">
-	UNamur
-	</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">
-	Universite de Namur
-	</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">
-	http://www.unamur.be
-	</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>siu-serveurs@unamur.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml
deleted file mode 100644
index 794b5f10..00000000
--- a/swamid-interfederations-2.0/identity.unife.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://identity.unife.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-03-05T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unife.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="it">Università di Ferrara</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Ferrara</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti UniFe</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for UniFe users</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://www.unife.it/areainformatica/idem</mdui:InformationURL>
-        <mdui:Logo height="16" width="16">https://identity.unife.it/idp/images/unife_logo_16x16.png</mdui:Logo>
-        <mdui:Logo height="50" width="50">https://identity.unife.it/idp/images/unife_logo_50x50.png</mdui:Logo>
-        <mdui:Logo height="80" width="80">https://identity.unife.it/idp/images/unife_logo_80x80.png</mdui:Logo>
-        <mdui:Logo height="240" width="320">https://identity.unife.it/idp/images/unife_logo_320x240.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUDWEaqSaZUTmDi7c3RlBaYiGftv0wDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRlbnRpdHkudW5pZmUuaXQwHhcNMDkwNzI5MTEwNTIw
-WhcNMjkwNzI5MTEwNTIwWjAcMRowGAYDVQQDExFpZGVudGl0eS51bmlmZS5pdDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIuX3iSXtW169zLcTcysXr9e
-25aIejzGKV1IDrJBbJq2uKe4nZ3GGxlqtGRSJafP1RtemUbJ6LU0hxkHvsa6aCfT
-4UcRWEADvcDLa/KGih65D1GkY7oKA3ByAS7e2QgpoaEYy5U8Qb6vu7/+bTl6oKbe
-qrtGQmPwexue4zRjNmq3LOyTSsaQzF/Z9j5STbm2uiwMZ0vErhvCg8eX+Lmaq3Sh
-RCan/C8kcaXrTQlxb0BDcORmXnod8C4ga7Rg4JIdncNTFji32bF0mKWS2rmXBK+4
-R1GHOh7oExCsGk2fUN5435A0Umg065UxeeUdgKnIykPCjSmMx8WgMPk5KI0cxUUC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRlbnRpdHkudW5pZmUuaXSGKGh0dHBzOi8v
-aWRlbnRpdHkudW5pZmUuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCjBKR23
-A353XL6vQpwmLg5C301wMA0GCSqGSIb3DQEBBQUAA4IBAQB7g5t/5SuRdF+WPqnj
-IsmWerN+wALIsmFpq+AAqSSTA5a+9SXxczO/Ui6y+/zE714UiE0CCAeYmJztBDtA
-BwQx/dj8QgX80/++MIB+5obKRFRztpuwChGHAStxY4vNF9Lnc+urdi3hSMVn+rZS
-34ONTWpp+DkiXajfsNRaN4w1egn3cWFquIlQAHr21OcZCbDuCO6p7UVnkdM8unGV
-NBtU+t32f6cR3HVdjUqH3LCigvGsh/viXYXYg7QRoj3fNM93EAIwakh4784E6plK
-N1yMa0xze5ryRX4S7pHiaSQRiKNb8xIPgzOaaAQFTm8O9UcdF7xPuoWePXE1lvUR
-VgF8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unife.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unife.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.unife.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unife.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.unife.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unife.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unife.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUDWEaqSaZUTmDi7c3RlBaYiGftv0wDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRlbnRpdHkudW5pZmUuaXQwHhcNMDkwNzI5MTEwNTIw
-WhcNMjkwNzI5MTEwNTIwWjAcMRowGAYDVQQDExFpZGVudGl0eS51bmlmZS5pdDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIuX3iSXtW169zLcTcysXr9e
-25aIejzGKV1IDrJBbJq2uKe4nZ3GGxlqtGRSJafP1RtemUbJ6LU0hxkHvsa6aCfT
-4UcRWEADvcDLa/KGih65D1GkY7oKA3ByAS7e2QgpoaEYy5U8Qb6vu7/+bTl6oKbe
-qrtGQmPwexue4zRjNmq3LOyTSsaQzF/Z9j5STbm2uiwMZ0vErhvCg8eX+Lmaq3Sh
-RCan/C8kcaXrTQlxb0BDcORmXnod8C4ga7Rg4JIdncNTFji32bF0mKWS2rmXBK+4
-R1GHOh7oExCsGk2fUN5435A0Umg065UxeeUdgKnIykPCjSmMx8WgMPk5KI0cxUUC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRlbnRpdHkudW5pZmUuaXSGKGh0dHBzOi8v
-aWRlbnRpdHkudW5pZmUuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCjBKR23
-A353XL6vQpwmLg5C301wMA0GCSqGSIb3DQEBBQUAA4IBAQB7g5t/5SuRdF+WPqnj
-IsmWerN+wALIsmFpq+AAqSSTA5a+9SXxczO/Ui6y+/zE714UiE0CCAeYmJztBDtA
-BwQx/dj8QgX80/++MIB+5obKRFRztpuwChGHAStxY4vNF9Lnc+urdi3hSMVn+rZS
-34ONTWpp+DkiXajfsNRaN4w1egn3cWFquIlQAHr21OcZCbDuCO6p7UVnkdM8unGV
-NBtU+t32f6cR3HVdjUqH3LCigvGsh/viXYXYg7QRoj3fNM93EAIwakh4784E6plK
-N1yMa0xze5ryRX4S7pHiaSQRiKNb8xIPgzOaaAQFTm8O9UcdF7xPuoWePXE1lvUR
-VgF8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unife.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unife.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Ferrara</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Ferrara</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Ferrara</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Ferrara</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unife.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unife.it/unife-en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michele</md:GivenName>
-    <md:SurName>Lugli</md:SurName>
-    <md:EmailAddress>mailto:michele.lugli@unife.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Enrico</md:GivenName>
-    <md:SurName>Ardizzoni</md:SurName>
-    <md:EmailAddress>mailto:enrico.ardizzoni@unife.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:reti.sistemi@unife.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/identityprovider.anl.gov-idp-shibboleth.xml b/swamid-interfederations-2.0/identityprovider.anl.gov-idp-shibboleth.xml
deleted file mode 100644
index 9deebc40..00000000
--- a/swamid-interfederations-2.0/identityprovider.anl.gov-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://identityprovider.anl.gov/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login.anl.gov/idp/error.jsp" 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">anl.gov</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Argonne National Laboratory</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.anl.gov</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.anl.gov/notice.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="227" xml:lang="en">https://login.anl.gov/idp/images/argonne_header_logo_white.jpg</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>
-MIIDSzCCAjOgAwIBAgIUd1lQByK+80eHKNHL1oZcQacjU9EwDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRlbnRpdHlwcm92aWRlci5hbmwuZ292MB4XDTExMDYw
-MzE0Mjk1N1oXDTMxMDYwMzE0Mjk1N1owIzEhMB8GA1UEAxMYaWRlbnRpdHlwcm92
-aWRlci5hbmwuZ292MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs/yy
-tOLCEwBO6AzixU7TRPutPRZ5/sdzQkGNfyP7JPO5+oI+MIuVqwqrx74RujsOxMpb
-Bn+ndYmreuJpDqXPFUezGD/AQ08zOXH53/J6IKOHvDD2MfDOKUNjsh5wGXtcKxSU
-kl6g/tM2/0VOfYR653ZkawPxtGk9Rpl5Pqq+s5RFuVNFMb0NPhbeyAk/PrltkRTU
-YJRqh0vCCm2plkiZ+g3A8fxyNpYCRYG//guGIk/sVkYiu8Z/sten1CTlmxWvJJRB
-27U/PhIQFnj762x3sgTJidibKS/zYa2WVYHv2u4ufuKgZK6SiUUvOGFTu+6NZIr3
-u3FlWCGXrw3fRIu8QQIDAQABo3cwdTBUBgNVHREETTBLghhpZGVudGl0eXByb3Zp
-ZGVyLmFubC5nb3aGL2h0dHBzOi8vaWRlbnRpdHlwcm92aWRlci5hbmwuZ292L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBTOVxBosibb45yMEFFWzP8mHovAkjANBgkq
-hkiG9w0BAQUFAAOCAQEACjYGMFjNayjnIXjx+rjmejNgJCrddjJVLm0NRsf6ZRtX
-ib3OHwGysSEd/DQUTuf1UGrQXOYH2ifK/KZMUJ5Mcg7XHbmzMYX0OdbQi5oYgUJY
-R4nIN4BlwlxsE9RhNCJ2VzcNQF/CL9LvuVPQlJpD8TLBswqBvM/e6ifx6DdIP0MG
-mMoA4tvGzp293Lo3UoNpvdRtr6+GRTdOKggPQjKqu3V2jzOELGq7CIxn59/XasoU
-p0zxTYpUGhmHWBe5HmeezrYkX34iEAvmHaTN9Fbji9HnfdlWGDvzDjK9T3jgdyuV
-mftOvQo7MiSZrcQLClWSbNfouzKanesq48qbGPLLXg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.anl.gov:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.anl.gov:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.anl.gov/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.anl.gov/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.anl.gov/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">anl.gov</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSzCCAjOgAwIBAgIUd1lQByK+80eHKNHL1oZcQacjU9EwDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRlbnRpdHlwcm92aWRlci5hbmwuZ292MB4XDTExMDYw
-MzE0Mjk1N1oXDTMxMDYwMzE0Mjk1N1owIzEhMB8GA1UEAxMYaWRlbnRpdHlwcm92
-aWRlci5hbmwuZ292MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs/yy
-tOLCEwBO6AzixU7TRPutPRZ5/sdzQkGNfyP7JPO5+oI+MIuVqwqrx74RujsOxMpb
-Bn+ndYmreuJpDqXPFUezGD/AQ08zOXH53/J6IKOHvDD2MfDOKUNjsh5wGXtcKxSU
-kl6g/tM2/0VOfYR653ZkawPxtGk9Rpl5Pqq+s5RFuVNFMb0NPhbeyAk/PrltkRTU
-YJRqh0vCCm2plkiZ+g3A8fxyNpYCRYG//guGIk/sVkYiu8Z/sten1CTlmxWvJJRB
-27U/PhIQFnj762x3sgTJidibKS/zYa2WVYHv2u4ufuKgZK6SiUUvOGFTu+6NZIr3
-u3FlWCGXrw3fRIu8QQIDAQABo3cwdTBUBgNVHREETTBLghhpZGVudGl0eXByb3Zp
-ZGVyLmFubC5nb3aGL2h0dHBzOi8vaWRlbnRpdHlwcm92aWRlci5hbmwuZ292L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBTOVxBosibb45yMEFFWzP8mHovAkjANBgkq
-hkiG9w0BAQUFAAOCAQEACjYGMFjNayjnIXjx+rjmejNgJCrddjJVLm0NRsf6ZRtX
-ib3OHwGysSEd/DQUTuf1UGrQXOYH2ifK/KZMUJ5Mcg7XHbmzMYX0OdbQi5oYgUJY
-R4nIN4BlwlxsE9RhNCJ2VzcNQF/CL9LvuVPQlJpD8TLBswqBvM/e6ifx6DdIP0MG
-mMoA4tvGzp293Lo3UoNpvdRtr6+GRTdOKggPQjKqu3V2jzOELGq7CIxn59/XasoU
-p0zxTYpUGhmHWBe5HmeezrYkX34iEAvmHaTN9Fbji9HnfdlWGDvzDjK9T3jgdyuV
-mftOvQo7MiSZrcQLClWSbNfouzKanesq48qbGPLLXg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.anl.gov:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Argonne National Laboratory</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Argonne National Laboratory</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.anl.gov/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Help Desk - Shibboleth</md:GivenName>
-    <md:EmailAddress>help@anl.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>John Volmer</md:GivenName>
-    <md:EmailAddress>volmer@anl.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Doug Engert</md:GivenName>
-    <md:EmailAddress>deengert@anl.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idf.pucsp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idf.pucsp.br-idp-shibboleth.xml
deleted file mode 100644
index e9ba0be7..00000000
--- a/swamid-interfederations-2.0/idf.pucsp.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,142 +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://idf.pucsp.br/idp/shibboleth">
-  <md: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>
-  </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">pucsp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.pucsp.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.pucsp.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIGqDCCBZCgAwIBAgIQBvjtk3/wFt3MCgKdqTU41DANBgkqhkiG9w0BAQUFADBm
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBDQS0zMB4XDTEzMDQxMDAwMDAwMFoXDTE2MDcyOTEyMDAwMFowbDELMAkGA1UE
-BhMCQlIxEzARBgNVBAgMClPDo28gUGF1bG8xEzARBgNVBAcMClPDo28gUGF1bG8x
-HjAcBgNVBAoMFUZ1bmRhw6fDo28gU8OjbyBQYXVsbzETMBEGA1UEAwwKKi5wdWNz
-cC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKKy/3JfNyIwygXb
-lT3ERFAUilgzBVyE2cHYe3qu4tV0Xk/XjUIndEjMDcF2PwqeOFcY5vePMOtU+h95
-nvnNccuDht40zMP7X1bkEKSCq+kJwehPCexbAdyyC0o25WgsYE1PU+RFFR+2bLi6
-VEDdPOJYuHQtHpYLYnlh/X3WIDbOMT3vjoMTbXNdEOkOsLxEEwZ0GB3xSUyX3ZY8
-o5UPvZO6JUfmCRoa/SOCOn5NEQT/303FDPHUog5g4LMotQgpOS4U5Vaq9V/HBBd+
-5iK2m5IRwGebVBU5Xcz2fTEzBSx4a8u+ZLKC5c2HK/bJ247bfiBif0l7Dymi9EHk
-y9ANTrsCAwEAAaOCA0owggNGMB8GA1UdIwQYMBaAFFDqc4nbKfsQj57lASDU3nmZ
-SIP3MB0GA1UdDgQWBBRKcTWMtu3P8Feutfe40/U7ChUgjzAfBgNVHREEGDAWggoq
-LnB1Y3NwLmJygghwdWNzcC5icjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwEGCCsGAQUFBwMCMGEGA1UdHwRaMFgwKqAooCaGJGh0dHA6Ly9jcmwz
-LmRpZ2ljZXJ0LmNvbS9jYTMtZzIwLmNybDAqoCigJoYkaHR0cDovL2NybDQuZGln
-aWNlcnQuY29tL2NhMy1nMjAuY3JsMIIBxAYDVR0gBIIBuzCCAbcwggGzBglghkgB
-hv1sAQEwggGkMDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9z
-c2wtY3BzLXJlcG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4A
-eQAgAHUAcwBlACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQA
-ZQAgAGMAbwBuAHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUA
-IABvAGYAIAB0AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAA
-YQBuAGQAIAB0AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcA
-cgBlAGUAbQBlAG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIA
-aQBsAGkAdAB5ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQA
-ZQBkACAAaABlAHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMHsG
-CCsGAQUFBwEBBG8wbTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQu
-Y29tMEUGCCsGAQUFBzAChjlodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGln
-aUNlcnRIaWdoQXNzdXJhbmNlQ0EtMy5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG
-9w0BAQUFAAOCAQEAd2V/wK7FFLYL4Vz+QJxSUERa8Q0FuzwDfxbCZaJB/w0WOP3P
-P0wM+mwz/XVcoI5KfeqNBNkWQQu3EyUkew3cIE5tFZC+fAchuMJ05fhdMYPxiyfZ
-juWCSywGbbm/772/qeGlI2eSV0eDHeZwzMX3iGES06ZgdNqOFUAArYRwk5J9+BNQ
-glcuYmRh9QQdBBx45IGNa+TdrA+hhV2wNMytAOn0CwnOi5bPf1vTYBzdSbRc5wup
-FhXfpisK4LMHDM8JFdlZVXOxZfAGqQ59hiDpXMXYedj3F+0pJvh2+dh6IG0l35LL
-AY+3V4U1qNrpwyazvjVrqVVzY2LjNW9gbC+zzg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idf.pucsp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idf.pucsp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://idf.pucsp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idf.pucsp.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idf.pucsp.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idf.pucsp.br/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">pucsp.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIGqDCCBZCgAwIBAgIQBvjTK3/wFt3MCgKdqTU41DANBgkqhkiG9w0BAQUFADBm
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBDQS0zMB4XDTEzMDQxMDAwMDAwMFoXDTE2MDcyOTEyMDAwMFowbDELMAkGA1UE
-BhMCQlIxEzARBgNVBAgMClPDo28gUGF1bG8xEzARBgNVBAcMClPDo28gUGF1bG8x
-HjAcBgNVBAoMFUZ1bmRhw6fDo28gU8OjbyBQYXVsbzETMBEGA1UEAwwKKi5wdWNz
-cC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKKy/3JfNyIwygXb
-lT3ERFAUilgzBVyE2cHYe3qu4tV0Xk/XjUIndEjMDcF2PwqeOFcY5vePMOtU+h95
-nvnNccuDht40zMP7X1bkEKSCq+kJwehPCexbAdyyC0o25WgsYE1PU+RFFR+2bLi6
-VEDdPOJYuHQtHpYLYnlh/X3WIDbOMT3vjoMTbXNdEOkOsLxEEwZ0GB3xSUyX3ZY8
-o5UPvZO6JUfmCRoa/SOCOn5NEQT/303FDPHUog5g4LMotQgpOS4U5Vaq9V/HBBd+
-5iK2m5IRwGebVBU5Xcz2fTEzBSx4a8u+ZLKC5c2HK/bJ247bfiBif0l7Dymi9EHk
-y9ANTrsCAwEAAaOCA0owggNGMB8GA1UdIwQYMBaAFFDqc4nbKfsQj57lASDU3nmZ
-SIP3MB0GA1UdDgQWBBRKcTWMtu3P8Feutfe40/U7ChUgjzAfBgNVHREEGDAWggoq
-LnB1Y3NwLmJygghwdWNzcC5icjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwEGCCsGAQUFBwMCMGEGA1UdHwRaMFgwKqAooCaGJGh0dHA6Ly9jcmwz
-LmRpZ2ljZXJ0LmNvbS9jYTMtZzIwLmNybDAqoCigJoYkaHR0cDovL2NybDQuZGln
-aWNlcnQuY29tL2NhMy1nMjAuY3JsMIIBxAYDVR0gBIIBuzCCAbcwggGzBglghkgB
-hv1sAQEwggGkMDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9z
-c2wtY3BzLXJlcG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4A
-eQAgAHUAcwBlACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQA
-ZQAgAGMAbwBuAHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUA
-IABvAGYAIAB0AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAA
-YQBuAGQAIAB0AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcA
-cgBlAGUAbQBlAG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIA
-aQBsAGkAdAB5ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQA
-ZQBkACAAaABlAHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMHsG
-CCsGAQUFBwEBBG8wbTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQu
-Y29tMEUGCCsGAQUFBzAChjlodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGln
-aUNlcnRIaWdoQXNzdXJhbmNlQ0EtMy5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG
-9w0BAQUFAAOCAQEAd2V/wK7FFLYL4Vz+QJxSUERa8Q0FuzwDfxbCZaJB/w0WOP3P
-P0wM+mwz/XVcoI5KfeqNBNkWQQu3EyUkew3cIE5tFZC+fAchuMJ05fhdMYPxiyfZ
-juWCSywGbbm/772/qeGlI2eSV0eDHeZwzMX3iGES06ZgdNqOFUAArYRwk5J9+BNQ
-glcuYmRh9QQdBBx45IGNa+TdrA+hhV2wNMytAOn0CwnOi5bPf1vTYBzdSbRc5wup
-FhXfpisK4LMHDM8JFdlZVXOxZfAGqQ59hiDpXMXYedj3F+0pJvh2+dh6IG0l35LL
-AY+3V4U1qNrpwyazvjVrqVVzY2LjNW9gbC+zzg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idf.pucsp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idf.pucsp.br:8443/idp/profile/SAML1/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">PUC-SP- Pontificia Universidade Catolica de Sao Paulo</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">PUC-SP- Pontificia Universidade Catolica de Sao Paulo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">PUC-SP - Pontificia Universidade Catolica de Sao Paulo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pucsp.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.pucsp.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Victor Emmanuel J.S. Vicente</md:SurName>
-    <md:EmailAddress>dti@pucsp.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idm.hrz.uni-kassel.de.xml b/swamid-interfederations-2.0/idm.hrz.uni-kassel.de.xml
deleted file mode 100644
index e6938423..00000000
--- a/swamid-interfederations-2.0/idm.hrz.uni-kassel.de.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idm.hrz.uni-kassel.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idm.hrz.uni-kassel.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idm.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGcYVzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
-Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
-CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDc1MDMyWhcNMTMwNjA0MDc1
-MDMyWjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
-bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRt
-Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA3BD0wA5kA3SikAQ6YcM3F6neb0XSF5pjO3RHIXzzFIb8srPOsZdJKlZfM6CN
-dVbR7e19j4BkoKBvkjAvKqAcC3bw1vCZVh0m25Xm8XwrUGgefS+bkcVCN30ExAP7
-Xf1melL3UwFNUafkD6gAbtSnuHwpbn1xK0h3tT1BO0CzUPGUNw0Dpm5gEZ1GB65a
-mM4ZftaRo9KG52OPSIzXh5ENS6L/kI0S7Po7kSrQjNnt2OWZe6gdxNgZowxsNpnk
-JAsJYv1mIvLpQ3cmZGwKp7CQzAAqeYAbvUkxa/B+0Xpu4tkt67qhBI+Ci3poX5JR
-vc7sichzh/ndueq5/+ncwG9YwwIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBT2AJWxeDMJqYj+BZXkSuy4/AqT/zAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
-l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
-bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
-SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
-YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAGD5o
-yg5wbZkdaU/7yN6Z3Z/MBRRjWcHiEoMYBWcjVzJTYtEtvP0Eb6jQClW5m1BDs+G6
-D6O9e9FNXi26K3x/2QU6jwexkfd5vzrxwCTeJOW/9KiUq0xXcf7uc7sniGse4WhE
-oDhDaSGp+1f4yC6LFgdPggYIA4SK94mhDFIS6XoDQpAPU1fhENbxs1kb5bnvTmMe
-8lWIthsgEv4MBfoHBk+Ilb6zxjA/2GhTLRObQuthcxS2l5VFuThkoOv3QYobW5yu
-zcNFhgo8JRFEAH41DNd2QiwgwdfrQOqgWqUbJP4JZ2CyM7W9Aw9uPezzM4Aj8hFD
-GCdlg18LEvx13ba5EQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idm.hrz.uni-kassel.de/shibboleth-sp/Shibboleth.sso/SAML/Artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idm.hrz.uni-kassel.de/shibboleth-sp/Shibboleth.sso/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Kassel</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">idm.hrz.uni-kassel.de</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-kassel.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Zanger</SurName>
-    <EmailAddress>zanger@hrz.uni-kassel.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml b/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml
deleted file mode 100644
index 7418c38d..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>
-  <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/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 c2af193d..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-cafe.ifrr.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.ifrr.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.ifrr.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.ifrr.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.ifrr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md: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"/>
-    <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">IFRR - Instituto Federal de Roraima</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFRR - Instituto Federal de Roraima</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFRR - Instituto Federal de Roraima</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifrr.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifrr.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Francisco Cavalcante Filho</md:SurName>
-    <md:EmailAddress>francisco.filho@ifrr.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 dca95568..00000000
--- a/swamid-interfederations-2.0/idp-cafe.ifrr.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://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">www.ifrr.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ifrr.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID6jCCAtICAQAwDQYJKoZIhvcNAQEFBQAwgboxLDAqBgNVBAoTI0lGUlIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkZSBSb3JhaW1hMQwwCgYDVQQLEwNEVEkxKjAoBgkq
-hkiG9w0BCQEWG2ZyYW5jaXNjby5maWxob0BpZnJyLmVkdS5icjESMBAGA1UEBxMJ
-Qm9hIFZpc3RhMRAwDgYDVQQIEwdSb3JhaW1hMQswCQYDVQQGEwJCUjEdMBsGA1UE
-AxMUaWRwLWNhZmUuaWZyci5lZHUuYnIwHhcNMTMxMjE2MTQ1NzQ5WhcNMTYxMjE1
-MTQ1NzQ5WjCBujEsMCoGA1UEChMjSUZSUiAtIEluc3RpdHV0byBGZWRlcmFsIGRl
-IFJvcmFpbWExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbZnJhbmNpc2Nv
-LmZpbGhvQGlmcnIuZWR1LmJyMRIwEAYDVQQHEwlCb2EgVmlzdGExEDAOBgNVBAgT
-B1JvcmFpbWExCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRpZHAtY2FmZS5pZnJyLmVk
-dS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQpv/NepaRd
-zlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8HuCzk/nWr
-zEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY38BYCGQm
-uppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5YBrVE/LqU
-B6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uwhvb8sOYi
-TgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zqGZMyVBZZ
-AXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEACdiiXBqqmOCLw+B6JV+oEp/t
-TztM4r2U2/bkzyn+a7Cr682mObxSmN6S7mzkygxDh17TOhz9hxTmGY4dWAFXI8Ju
-QSHNpEI3dWudkbteAM0W5s/j8kEE4fT6uDKT6CkRxDHY+URX+rYlKbOdTmSPvf2H
-GPes1sk3zkhce385uC+84RsgbnJqCVwc/fB8lrQS3fY6vXn8LA62OsS1I3gajpQU
-zATEnq6HJ6HzqyqZSQBgq7w51CFtOmrUhyHlHW+qJ/0JwagX44XfOfrgSzRJlBTE
-ExS/YebGVKmcocAT/7o2wq+q+5cn02H0/PpznKf0Ykv3k0UBRrCfZ+vWGLDHaw==
-            </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>
-      
-MIID6jCCAtICAQAwDQYJKoZIhvcNAQEFBQAwgboxLDAqBgNVBAoTI0lGUlIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkZSBSb3JhaW1hMQwwCgYDVQQLEwNEVEkxKjAoBgkq
-hkiG9w0BCQEWG2ZyYW5jaXNjby5maWxob0BpZnJyLmVkdS5icjESMBAGA1UEBxMJ
-Qm9hIFZpc3RhMRAwDgYDVQQIEwdSb3JhaW1hMQswCQYDVQQGEwJCUjEdMBsGA1UE
-AxMUaWRwLWNhZmUuaWZyci5lZHUuYnIwHhcNMTMxMjE2MTQ1NzQ5WhcNMTYxMjE1
-MTQ1NzQ5WjCBujEsMCoGA1UEChMjSUZSUiAtIEluc3RpdHV0byBGZWRlcmFsIGRl
-IFJvcmFpbWExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbZnJhbmNpc2Nv
-LmZpbGhvQGlmcnIuZWR1LmJyMRIwEAYDVQQHEwlCb2EgVmlzdGExEDAOBgNVBAgT
-B1JvcmFpbWExCzAJBgNVBAYTAkJSMR0wGwYDVQQDExRpZHAtY2FmZS5pZnJyLmVk
-dS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2QLiQpv/NepaRd
-zlGTeoyC//4t4vPsByuVLTF9BJ9zXfpgb70bFt5Ka4FXaYEafGC76n8HuCzk/nWr
-zEKuNMZMPgQbteCpvhrGm8RziPF7zelZl2Q4FDAORAOQwfw/GIyadsmY38BYCGQm
-uppiCAL5SUvGBHvEPyGwJnLBqnE/f1e66ZXfLvniYqRjKvU1VSsUUF5YBrVE/LqU
-B6OA7uJEKTtp6uCx8XNUNYGML6hHR9joDZrQuK4wYOocjdWuWn0/1/uwhvb8sOYi
-TgAPap4UtTxTqVZ6XBRWmWVP9fTEjpSNEgeaWBvNpmJx+Ci9Hi5+F0zqGZMyVBZZ
-AXsBBj0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEACdiiXBqqmOCLw+B6JV+oEp/t
-TztM4r2U2/bkzyn+a7Cr682mObxSmN6S7mzkygxDh17TOhz9hxTmGY4dWAFXI8Ju
-QSHNpEI3dWudkbteAM0W5s/j8kEE4fT6uDKT6CkRxDHY+URX+rYlKbOdTmSPvf2H
-GPes1sk3zkhce385uC+84RsgbnJqCVwc/fB8lrQS3fY6vXn8LA62OsS1I3gajpQU
-zATEnq6HJ6HzqyqZSQBgq7w51CFtOmrUhyHlHW+qJ/0JwagX44XfOfrgSzRJlBTE
-ExS/YebGVKmcocAT/7o2wq+q+5cn02H0/PpznKf0Ykv3k0UBRrCfZ+vWGLDHaw==
-
-                    
-            </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">www.ifrr.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">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 238dbe28..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-cafe.unir.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp-cafe.unir.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-cafe.unir.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-cafe.unir.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-cafe.unir.br/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">unir.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-cafe.unir.br:8443/idp/profile/SAML1/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">UNIR - Universidade Federal de Rondonia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNIR - Universidade Federal de Rondonia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNIR - Universidade Federal de Rondonia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unir.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unir.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Fabio Leite Dias</md:SurName>
-    <md:EmailAddress>fabioleite@unir.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 5eea4cbb..00000000
--- a/swamid-interfederations-2.0/idp-cafe.unir.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://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>
-    MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxMDAuBgNVBAoTJ1VOSVIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kb25pYTE0MDIGA1UECxMrRFRJIC0g
-RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEaMBgGCSqGSIb3
-DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMREwDwYDVQQI
-EwhSb25kb25pYTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGlkcC1jYWZlLnVuaXIu
-YnIwHhcNMTMwNTE3MTkyMzIxWhcNMTYwNTE2MTkyMzIxWjCB1TEwMC4GA1UEChMn
-VU5JUiAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFJvbmRvbmlhMTQwMgYDVQQL
-EytEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMRow
-GAYJKoZIhvcNAQkBFgtkdGlAdW5pci5icjEUMBIGA1UEBxMLUG9ydG8gVmVsaG8x
-ETAPBgNVBAgTCFJvbmRvbmlhMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQaWRwLWNh
-ZmUudW5pci5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdrFEht
-Fvef4Bq9AceT1QYEv7KRfjEq9zZmYLyIo7+G1key90a+bLAsR5Pmx8W4JESIG1F6
-fe8sEgIM+4UgcIZktHbjZfypaSDYiqWgbS3CBf6b/8bu2hmwESLRjqt2Pb3k+HtY
-P1iyXEl+PrYE2AURXqgsDrlOSGjueD/77HnhruXvGO19b7XA9Da0ZjT7TYLcaZ0k
-XJmCt08+4VzgjWAE8YM8c568cGSlMa0u1qD8FzKU1JKx6jxDGuL5l6CaXq14AjhF
-PhzyYE1v0EnQ7TU78HkaWw7g9+ZTrYWapZNDu8HrsSLXSct1a9N21Khq75aIzXrj
-m/F1b1y5Ft4mI9UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAxmg+k+tpOnQXgP8h
-HfJtEN2Ih1Gf7eJVj9Pe0DptNSK9S6lgs98uyl/a+n/pW/kJIJdP99L1RWNBVhgi
-1EGuLy6mSggvehvZd0vAKm2dXSBmDUdzVX3opk7lqFWRtP0W+cPcNCNSfzTqVolz
-V7gKZITYmiQXQPDLpldhYr0SqIfmmg9f4GzCbY9x7a2IeC+U31aZEQLXy+912sKa
-m49ny7xM0seNUS/2JhN2v1k/CkVjiAp03PeAS2XxOBWUPNqVS6rUwccLDKWgitzy
-YB++4eQ2xGpKsSArDNxQrqRPcxevz8S42GsZV1DGl6CYfJAKykVeTd/ipeMdcdqi
-9y9IHg==
-            </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>
-      
-MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxMDAuBgNVBAoTJ1VOSVIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkZSBSb25kb25pYTE0MDIGA1UECxMrRFRJIC0g
-RGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEaMBgGCSqGSIb3
-DQEJARYLZHRpQHVuaXIuYnIxFDASBgNVBAcTC1BvcnRvIFZlbGhvMREwDwYDVQQI
-EwhSb25kb25pYTELMAkGA1UEBhMCQlIxGTAXBgNVBAMTEGlkcC1jYWZlLnVuaXIu
-YnIwHhcNMTMwNTE3MTkyMzIxWhcNMTYwNTE2MTkyMzIxWjCB1TEwMC4GA1UEChMn
-VU5JUiAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFJvbmRvbmlhMTQwMgYDVQQL
-EytEVEkgLSBEaXJldG9yaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvMRow
-GAYJKoZIhvcNAQkBFgtkdGlAdW5pci5icjEUMBIGA1UEBxMLUG9ydG8gVmVsaG8x
-ETAPBgNVBAgTCFJvbmRvbmlhMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQaWRwLWNh
-ZmUudW5pci5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANdrFEht
-Fvef4Bq9AceT1QYEv7KRfjEq9zZmYLyIo7+G1key90a+bLAsR5Pmx8W4JESIG1F6
-fe8sEgIM+4UgcIZktHbjZfypaSDYiqWgbS3CBf6b/8bu2hmwESLRjqt2Pb3k+HtY
-P1iyXEl+PrYE2AURXqgsDrlOSGjueD/77HnhruXvGO19b7XA9Da0ZjT7TYLcaZ0k
-XJmCt08+4VzgjWAE8YM8c568cGSlMa0u1qD8FzKU1JKx6jxDGuL5l6CaXq14AjhF
-PhzyYE1v0EnQ7TU78HkaWw7g9+ZTrYWapZNDu8HrsSLXSct1a9N21Khq75aIzXrj
-m/F1b1y5Ft4mI9UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAxmg+k+tpOnQXgP8h
-HfJtEN2Ih1Gf7eJVj9Pe0DptNSK9S6lgs98uyl/a+n/pW/kJIJdP99L1RWNBVhgi
-1EGuLy6mSggvehvZd0vAKm2dXSBmDUdzVX3opk7lqFWRtP0W+cPcNCNSfzTqVolz
-V7gKZITYmiQXQPDLpldhYr0SqIfmmg9f4GzCbY9x7a2IeC+U31aZEQLXy+912sKa
-m49ny7xM0seNUS/2JhN2v1k/CkVjiAp03PeAS2XxOBWUPNqVS6rUwccLDKWgitzy
-YB++4eQ2xGpKsSArDNxQrqRPcxevz8S42GsZV1DGl6CYfJAKykVeTd/ipeMdcdqi
-9y9IHg==
-
-                  
-            </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-campus-condorcet.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml
deleted file mode 100644
index 845d1575..00000000
--- a/swamid-interfederations-2.0/idp-campus-condorcet.renater.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-campus-condorcet.renater.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-01T12:05:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campus-condorcet.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CAMPUS CONDORCET</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAACESURBVDhPY7jGIPufEkw9A25JGv8nBWAY8MAhDCpFHMAwgFj8uqEPuwHEuACk7uuB43A2dQ2AOQ1Ew8SwYZxeQDcARCNjkM0wDAIgF+M1gBCA6cPrApAt6BimHobhBsCcBqJhikGGYDMIZgmKASBBUgBOA5Bdgg3DXIVhALmYQgNk/wMAQ2Cys1X73UcAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Utilisateurs Campus Condorcet</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CAMPUS CONDORCET</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Utilisateurs Campus Condorcet</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>
-					      MIIDaTCCAlGgAwIBAgIUUbskQm6flzcLwm00UebURsVlOqowDQYJKoZIhvcNAQELBQAwKjEoMCYGA1UEAwwfaWRwLWNhbXB1cy1jb25kb3JjZXQucmVuYXRlci5mcjAeFw0xNTEyMDExMDQ2MDRaFw0zNTEyMDExMDQ2MDRaMCoxKDAmBgNVBAMMH2lkcC1jYW1wdXMtY29uZG9yY2V0LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVdtz5q49daXITC5ulby/+ec+hxd3z24LWZwMkGJuPo1toKdEAmzKfRvwV5jiWMlj2AVTRB20qA0YfhcB8DOdeWdcOn+ioyumjzgEyIu5CpFhQEk47C+t/PsHAhz4W+gPKjz/FLXMNHzb9gqWB4X3twaCywFbwp0pazvnXFPNCps1hpQZg91HgmUeKuG7D5ph2hWNeZsafeSTAuOUfI6K3mBuqyX5gooUjkmC2yChehI8M4vOrCDbpduNHSpIvcyh1lWQYgOFOsrvmPxcvX6FS6D332fr5pk8rH/n/ZVTjhXJQGjhXsE66D7Prl9G0u0fyxjo1wk3hbzZ6SNT2cMT/AgMBAAGjgYYwgYMwHQYDVR0OBBYEFOAGUo52UE2qpWvbFZUrCS9fBRECMGIGA1UdEQRbMFmCH2lkcC1jYW1wdXMtY29uZG9yY2V0LnJlbmF0ZXIuZnKGNmh0dHBzOi8vaWRwLWNhbXB1cy1jb25kb3JjZXQucmVuYXRlci5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATuf7qRpXVm9OPx4ZktinHIJI+YHlCUCbl+t28Nb2sJqqv/hSHKnm9DClLp8/ewlVY1Mb/vYtJz6byHuHzwzTf1POsVoV8WZwgg4loAarIIAO5nS9pwhAr86uK40bD0L2y+YIw+ltXxL5+YTwxkdYYyAEnin0lCclr8NQDSP3cYRPbCgAdTHBsX1o4yatgcC0Yf9nmIrrgpa7HYksjZNLiasjWjQeKsra1b/ifjrSFLwXgWkXSkjo7xWUIRfwvbBMFvbQc1NuZa4egPeyraK5ImrrhjaX9+jJrgw84aIrvkyaEClGMtH4nmc/LJAZexmwDgYutes8KufHfDLKAKmSvw==
-					    </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-POST" Location="https://idp-campus-condorcet.renater.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-campus-condorcet.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-campus-condorcet.renater.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campus-condorcet.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDaTCCAlGgAwIBAgIUUbskQm6flzcLwm00UebURsVlOqowDQYJKoZIhvcNAQELBQAwKjEoMCYGA1UEAwwfaWRwLWNhbXB1cy1jb25kb3JjZXQucmVuYXRlci5mcjAeFw0xNTEyMDExMDQ2MDRaFw0zNTEyMDExMDQ2MDRaMCoxKDAmBgNVBAMMH2lkcC1jYW1wdXMtY29uZG9yY2V0LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVdtz5q49daXITC5ulby/+ec+hxd3z24LWZwMkGJuPo1toKdEAmzKfRvwV5jiWMlj2AVTRB20qA0YfhcB8DOdeWdcOn+ioyumjzgEyIu5CpFhQEk47C+t/PsHAhz4W+gPKjz/FLXMNHzb9gqWB4X3twaCywFbwp0pazvnXFPNCps1hpQZg91HgmUeKuG7D5ph2hWNeZsafeSTAuOUfI6K3mBuqyX5gooUjkmC2yChehI8M4vOrCDbpduNHSpIvcyh1lWQYgOFOsrvmPxcvX6FS6D332fr5pk8rH/n/ZVTjhXJQGjhXsE66D7Prl9G0u0fyxjo1wk3hbzZ6SNT2cMT/AgMBAAGjgYYwgYMwHQYDVR0OBBYEFOAGUo52UE2qpWvbFZUrCS9fBRECMGIGA1UdEQRbMFmCH2lkcC1jYW1wdXMtY29uZG9yY2V0LnJlbmF0ZXIuZnKGNmh0dHBzOi8vaWRwLWNhbXB1cy1jb25kb3JjZXQucmVuYXRlci5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATuf7qRpXVm9OPx4ZktinHIJI+YHlCUCbl+t28Nb2sJqqv/hSHKnm9DClLp8/ewlVY1Mb/vYtJz6byHuHzwzTf1POsVoV8WZwgg4loAarIIAO5nS9pwhAr86uK40bD0L2y+YIw+ltXxL5+YTwxkdYYyAEnin0lCclr8NQDSP3cYRPbCgAdTHBsX1o4yatgcC0Yf9nmIrrgpa7HYksjZNLiasjWjQeKsra1b/ifjrSFLwXgWkXSkjo7xWUIRfwvbBMFvbQc1NuZa4egPeyraK5ImrrhjaX9+jJrgw84aIrvkyaEClGMtH4nmc/LJAZexmwDgYutes8KufHfDLKAKmSvw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-campus-condorcet.renater.fr/idp/profile/SAML1/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">CAMPUS CONDORCET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CAMPUS CONDORCET</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Anass Chabli</md:SurName>
-    <md:EmailAddress>anass.chabli@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-co.calstate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-co.calstate.edu-idp-shibboleth.xml
deleted file mode 100644
index f2bf4a34..00000000
--- a/swamid-interfederations-2.0/idp-co.calstate.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +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://idp-co.calstate.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">co.calstate.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Office of the Chancellor</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>
-MIIDPjCCAiagAwIBAgIJAPBOOrypT78oMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2lkcC1jby5jYWxzdGF0ZS5lZHUwHhcNMTEwMzIxMTYwMTIzWhcNMjEwMzE4
-MTYwMTIzWjAeMRwwGgYDVQQDExNpZHAtY28uY2Fsc3RhdGUuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA24Qp4dSLiG0FbRIgM+3tHcdzJDRgYrpO
-Yrvyl411IEKqxN3BeibppRp1nejlnsLa5IW2zl46XJeoH3XVtdZbwYlfas4JX5lo
-kso+lDBmss1KuTi2kKA9tCZXPuErPV8/U/pMqGxSSMZLW6SoVn2hy906FJVloEPe
-Z4awPZp/IAHnGaXRoZByr7qyagWdeXYX++zQ6AayTi8fhBkJC+WQnHjQY1mNuVBP
-zghI8H+5Osgpo3lCEBCMg9XcS/y/tku4ByRybWjsL2YXmFvhL87CCSy5CACuhVK1
-mN+xtDqA6IjWTLCN7u3q/FlirD9x0MUHGr+ceedWiQJtE79dYjQMWwIDAQABo38w
-fTAdBgNVHQ4EFgQUBZHCC43QDl6aonyzJnPBiaQTTnowTgYDVR0jBEcwRYAUBZHC
-C43QDl6aonyzJnPBiaQTTnqhIqQgMB4xHDAaBgNVBAMTE2lkcC1jby5jYWxzdGF0
-ZS5lZHWCCQDwTjq8qU+/KDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQAm/080HwIDQhVaCqqnt2JVECLaX3pU9fBBjAPa8p7/VoUYjgFh9dOkvwng4x9K
-ga2E+p0YXl4Uj/F+MOo2+Rot9DBYUHHYJZIMUsEdYNXnL8esXGoTxASVP0cmW7/D
-HXtAk5cK81Wle/tZBD5tNgeMgE6GzoVsmzaNS9/qW6tirp8Zy5rXj8mqIKmH5wHo
-5wWVD6IrsVOFFRrtNCkfpb5YoXRGIix01iYiHFLSkzdSiIAGu9m0DUwmFPpzOmGu
-omaVi3Po04oaAqKFo9NnTmwoMRtoqm1kWFf27pah+JkibTMLoiHKe5F94v9Sbm7s
-gDk7zgM8NwgZL2Yr9kJ/Yhr5
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-co.calstate.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-co.calstate.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-co.calstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-co.calstate.edu/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">co.calstate.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPjCCAiagAwIBAgIJAPBOOrypT78oMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2lkcC1jby5jYWxzdGF0ZS5lZHUwHhcNMTEwMzIxMTYwMTIzWhcNMjEwMzE4
-MTYwMTIzWjAeMRwwGgYDVQQDExNpZHAtY28uY2Fsc3RhdGUuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA24Qp4dSLiG0FbRIgM+3tHcdzJDRgYrpO
-Yrvyl411IEKqxN3BeibppRp1nejlnsLa5IW2zl46XJeoH3XVtdZbwYlfas4JX5lo
-kso+lDBmss1KuTi2kKA9tCZXPuErPV8/U/pMqGxSSMZLW6SoVn2hy906FJVloEPe
-Z4awPZp/IAHnGaXRoZByr7qyagWdeXYX++zQ6AayTi8fhBkJC+WQnHjQY1mNuVBP
-zghI8H+5Osgpo3lCEBCMg9XcS/y/tku4ByRybWjsL2YXmFvhL87CCSy5CACuhVK1
-mN+xtDqA6IjWTLCN7u3q/FlirD9x0MUHGr+ceedWiQJtE79dYjQMWwIDAQABo38w
-fTAdBgNVHQ4EFgQUBZHCC43QDl6aonyzJnPBiaQTTnowTgYDVR0jBEcwRYAUBZHC
-C43QDl6aonyzJnPBiaQTTnqhIqQgMB4xHDAaBgNVBAMTE2lkcC1jby5jYWxzdGF0
-ZS5lZHWCCQDwTjq8qU+/KDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQAm/080HwIDQhVaCqqnt2JVECLaX3pU9fBBjAPa8p7/VoUYjgFh9dOkvwng4x9K
-ga2E+p0YXl4Uj/F+MOo2+Rot9DBYUHHYJZIMUsEdYNXnL8esXGoTxASVP0cmW7/D
-HXtAk5cK81Wle/tZBD5tNgeMgE6GzoVsmzaNS9/qW6tirp8Zy5rXj8mqIKmH5wHo
-5wWVD6IrsVOFFRrtNCkfpb5YoXRGIix01iYiHFLSkzdSiIAGu9m0DUwmFPpzOmGu
-omaVi3Po04oaAqKFo9NnTmwoMRtoqm1kWFf27pah+JkibTMLoiHKe5F94v9Sbm7s
-gDk7zgM8NwgZL2Yr9kJ/Yhr5
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-co.calstate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-co.calstate.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Office of the Chancellor</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Office of the Chancellor</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.calstate.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marcus Mizushima</md:GivenName>
-    <md:EmailAddress>iamadmin@calstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Eli Pham</md:GivenName>
-    <md:EmailAddress>iamadmin@calstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-couperin.renater.fr-idp-shibboleth.xml
deleted file mode 100644
index 0afd0741..00000000
--- a/swamid-interfederations-2.0/idp-couperin.renater.fr-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-couperin.renater.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-01T17:29:32Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">couperin.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">COUPERIN</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAA3NCSVQICAjb4U/gAAABKUlEQVQokWM0Nk5jIAWwoPFl1L6pGX/m4v0L4V44IPDkFheyAka4DZw8fzJ776obf0Ez4sIB/gUNCt+/QI1mlpIyhrAq5t9Q0v327TPz0na5Vb2ye5eLvXnOpqT7VVb9u6Lu1+NbRFCcpGb8WVb9OwMDw4IGhYsHBSCC+5aLP7nFVTzzlrrxF2HJn2+fs2PxA1w1BNw6y3vzLA8DAwMn71+G59g8jQn60tWRuUwENaCBAdfAyfNn5pmzM8+cVTP+jKLh7TM2CMMp8iWyBueoVwwMDN8+M986ywsRgYbS2+fsxzYLW/m+DS9+YuDwASKtZvwZEvGremXgRjAiJz6nyJe+ac/hCYmBgeHNM7ZVvbLIkcOImVpl1L5B9Hz7zIyW8hiwRhymImQAABoAaLnD7wajAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Service d'authentification de Couperin</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">COUPERIN</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Service d'authentification de Couperin</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>
-					      MIIDSDCCAjCgAwIBAgIVAMULo4bCEwXQpVzPDquvwEPmzkVrMA0GCSqGSIb3DQEB
-CwUAMCIxIDAeBgNVBAMMF2lkcC1jb3VwZXJpbi5yZW5hdGVyLmZyMB4XDTE1MDYw
-MjEzMjc1M1oXDTM1MDYwMjEzMjc1M1owIjEgMB4GA1UEAwwXaWRwLWNvdXBlcmlu
-LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtjxsz
-BuG1iCzsTXkK+6koRh28hxJqOIlitP3hawDeXx+m73jNm9nYxvbXi4wNVLIfXMGk
-ien8yhwC7jn5daBz1/DpwJHxi9qC3/c5IrN3MmfcSYsS6pVW1+bLssOBdRusu8CN
-cltECD/F8NsTNubx0Dp3iQzOj+2ePiDZT7hF2qKneOl6VQAT5m6+CC9SlrhZKlAo
-j2Y71cSmnulzOpx/791duI1fFhOG+uB01iimekPTzCAs34g8nA3g7t776Pvf4lL6
-HyQdgg/5ty+lFT4Z01gpqO+3E3m0AVZx44RtU1+e8tpJtwHNksDwRh4hFlV5EVHC
-R8+Pqqm915QZNP13AgMBAAGjdTBzMB0GA1UdDgQWBBTM5/T7q4JJ5LhIHRNnTA3g
-s4qhWjBSBgNVHREESzBJghdpZHAtY291cGVyaW4ucmVuYXRlci5mcoYuaHR0cHM6
-Ly9pZHAtY291cGVyaW4ucmVuYXRlci5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEAhtPzNITQtpPpLLzDo1ihtgDcUOpdM0DAQ0vvLjaPNBRWqwGA
-STfAd9a90JZmO862Q8BMTdHHF4Buy+eROTL1w0VXkuP423sJvqlpQ2PhiZAf0Eyf
-50SyQnzXQQ2+VUoMws+oe+qyZWsi6eGV10lmVs+su982pJnH730B+CzMCPK7WHtt
-22tF63XjAZwBWK9iYx3+H7uAHf09PA8cE2Tvf8VotrrZP4JA9zThj/oXt+eKYR4d
-9uO1aL0aX8uJvW1pBzHLduUpoGEKoaTf4JxRereiuuKCCiMcI3ETSpq7QpmChzt9
-t07R76998/yfPxz/Dakn82YII+tPFsgpgJXT4g==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-couperin.renater.fr/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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-couperin.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-couperin.renater.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">couperin.org</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIVAMULo4bCEwXQpVzPDquvwEPmzkVrMA0GCSqGSIb3DQEB
-CwUAMCIxIDAeBgNVBAMMF2lkcC1jb3VwZXJpbi5yZW5hdGVyLmZyMB4XDTE1MDYw
-MjEzMjc1M1oXDTM1MDYwMjEzMjc1M1owIjEgMB4GA1UEAwwXaWRwLWNvdXBlcmlu
-LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtjxsz
-BuG1iCzsTXkK+6koRh28hxJqOIlitP3hawDeXx+m73jNm9nYxvbXi4wNVLIfXMGk
-ien8yhwC7jn5daBz1/DpwJHxi9qC3/c5IrN3MmfcSYsS6pVW1+bLssOBdRusu8CN
-cltECD/F8NsTNubx0Dp3iQzOj+2ePiDZT7hF2qKneOl6VQAT5m6+CC9SlrhZKlAo
-j2Y71cSmnulzOpx/791duI1fFhOG+uB01iimekPTzCAs34g8nA3g7t776Pvf4lL6
-HyQdgg/5ty+lFT4Z01gpqO+3E3m0AVZx44RtU1+e8tpJtwHNksDwRh4hFlV5EVHC
-R8+Pqqm915QZNP13AgMBAAGjdTBzMB0GA1UdDgQWBBTM5/T7q4JJ5LhIHRNnTA3g
-s4qhWjBSBgNVHREESzBJghdpZHAtY291cGVyaW4ucmVuYXRlci5mcoYuaHR0cHM6
-Ly9pZHAtY291cGVyaW4ucmVuYXRlci5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEAhtPzNITQtpPpLLzDo1ihtgDcUOpdM0DAQ0vvLjaPNBRWqwGA
-STfAd9a90JZmO862Q8BMTdHHF4Buy+eROTL1w0VXkuP423sJvqlpQ2PhiZAf0Eyf
-50SyQnzXQQ2+VUoMws+oe+qyZWsi6eGV10lmVs+su982pJnH730B+CzMCPK7WHtt
-22tF63XjAZwBWK9iYx3+H7uAHf09PA8cE2Tvf8VotrrZP4JA9zThj/oXt+eKYR4d
-9uO1aL0aX8uJvW1pBzHLduUpoGEKoaTf4JxRereiuuKCCiMcI3ETSpq7QpmChzt9
-t07R76998/yfPxz/Dakn82YII+tPFsgpgJXT4g==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-couperin.renater.fr/idp/profile/SAML1/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">COUPERIN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">COUPERIN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>chabli Anass</md:SurName>
-    <md:EmailAddress>anass.chabli@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 54a88042..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-css.irccs.garr.it/idp/shibboleth">
-  <md: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>
-  </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">operapadrepio.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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: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:Logo height="32" width="32" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="32" width="32" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-css.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">operapadrepio.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.operapadrepio.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.operapadrepio.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dev.bangor.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp-dev.bangor.ac.uk-shibboleth.xml
deleted file mode 100644
index 12575901..00000000
--- a/swamid-interfederations-2.0/idp-dev.bangor.ac.uk-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://idp-dev.bangor.ac.uk/shibboleth">
-  <!--
-		This is a "development" Shibboleth IdP for Bangor University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-10T13:00:11Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">bangor.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Bangor University: Development</mdui:DisplayName>
-        <mdui:Logo height="73" width="59">https://www.bangor.ac.uk/shibboleth-logos/bangor-73x59.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.bangor.ac.uk/shibboleth-logos/bangor-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAKmysGQnotgkz47fU4wbfPvxaTf1MA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFGlkcC1kZXYuYmFuZ29yLmFjLnVrMB4XDTEzMDEwOTE2
-						MzY0NVoXDTMzMDEwOTE2MzY0NVowHzEdMBsGA1UEAxMUaWRwLWRldi5iYW5nb3Iu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCA3wF9jL1ckLqJ
-						8vWJ9FnW3DT/jytDdHTPcquK/N05Et3RQGxaP5ZQ4ToDej1q9x2cmyhdwnsMVSDJ
-						g7kuhbEyrLagh570FxBVPkEcDfho63As2C2a0WUH7d3aNOSMFGRsM+x+5+R1oItl
-						wcGWGjO40SN+n0POE0lB6CZvWwJXd1rG6xBAXUUMzdkfHrc7lAr4SuC30GXyk+3G
-						neGeDNcmOMbsjKhegJV3IC+BbisiZ2el7SM9pLsoRgIcmQN/Wn4mMsZGmXwhl2Da
-						lYrulj8U5+L33nzOnSvPZsj4GgtmzEYUzZmswYHgQJcpCQ2zigfwICQx5NHBwi2Q
-						nf7TcDjNAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC1kZXYuYmFuZ29yLmFjLnVr
-						hitodHRwczovL2lkcC1kZXYuYmFuZ29yLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBRpMzDTSqUcqggU6NNbFaGjxVxKQzANBgkqhkiG9w0BAQUFAAOCAQEA
-						dKnHPvi+VdsbWai4TPQbjRGAoRtgrpSqH+nE0N1mqUGVTC/L8mBeHJEXPJgA7etu
-						l7USXan5zL3ZXG/+3fQ+QBU07l3oeatYoit1P1R1c5tJTxR+N5fIpQ12xy1amEWx
-						X5EPAaS/y+BXJhAtZnqJi7FqtkfcfHWIsju8GBekUSaeDWSmhO6Jd/9ehr7H6k5r
-						0msFJOQWAsi3+KyEtbmjuI8UadcqwBY/9+1Y4exr7G0bZRFJDqO7Yy6d53MhAjVA
-						3eN5JibS7UcufNOYFglCndMKbf1xVAJzk8+HIy6qmiRkRuyQu4sbkW5UKUVhZt/N
-						8GDE235W9a6OGG3Ho/qA3g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.bangor.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.bangor.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.bangor.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.bangor.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.bangor.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.bangor.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.bangor.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">bangor.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAKmysGQnotgkz47fU4wbfPvxaTf1MA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFGlkcC1kZXYuYmFuZ29yLmFjLnVrMB4XDTEzMDEwOTE2
-						MzY0NVoXDTMzMDEwOTE2MzY0NVowHzEdMBsGA1UEAxMUaWRwLWRldi5iYW5nb3Iu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCA3wF9jL1ckLqJ
-						8vWJ9FnW3DT/jytDdHTPcquK/N05Et3RQGxaP5ZQ4ToDej1q9x2cmyhdwnsMVSDJ
-						g7kuhbEyrLagh570FxBVPkEcDfho63As2C2a0WUH7d3aNOSMFGRsM+x+5+R1oItl
-						wcGWGjO40SN+n0POE0lB6CZvWwJXd1rG6xBAXUUMzdkfHrc7lAr4SuC30GXyk+3G
-						neGeDNcmOMbsjKhegJV3IC+BbisiZ2el7SM9pLsoRgIcmQN/Wn4mMsZGmXwhl2Da
-						lYrulj8U5+L33nzOnSvPZsj4GgtmzEYUzZmswYHgQJcpCQ2zigfwICQx5NHBwi2Q
-						nf7TcDjNAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC1kZXYuYmFuZ29yLmFjLnVr
-						hitodHRwczovL2lkcC1kZXYuYmFuZ29yLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBRpMzDTSqUcqggU6NNbFaGjxVxKQzANBgkqhkiG9w0BAQUFAAOCAQEA
-						dKnHPvi+VdsbWai4TPQbjRGAoRtgrpSqH+nE0N1mqUGVTC/L8mBeHJEXPJgA7etu
-						l7USXan5zL3ZXG/+3fQ+QBU07l3oeatYoit1P1R1c5tJTxR+N5fIpQ12xy1amEWx
-						X5EPAaS/y+BXJhAtZnqJi7FqtkfcfHWIsju8GBekUSaeDWSmhO6Jd/9ehr7H6k5r
-						0msFJOQWAsi3+KyEtbmjuI8UadcqwBY/9+1Y4exr7G0bZRFJDqO7Yy6d53MhAjVA
-						3eN5JibS7UcufNOYFglCndMKbf1xVAJzk8+HIy6qmiRkRuyQu4sbkW5UKUVhZt/N
-						8GDE235W9a6OGG3Ho/qA3g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.bangor.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.bangor.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">Bangor University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bangor University: Development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bangor.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matthew</GivenName>
-    <SurName>Williams</SurName>
-    <EmailAddress>mailto:matthew.williams@bangor.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Williams</SurName>
-    <EmailAddress>mailto:matthew.williams@bangor.ac.uk</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 d6a430fc..00000000
--- a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,219 +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 "Test - Dev" Shibboleth IdP for Cardiff University.
-	-->
-  <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-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>
-      <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/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <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: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">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>
-						MIIDMTCCAhmgAwIBAgIVALPBj+mIv2yR8UAKD/i7vqdumwAGMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC1kZXYuY2YuYWMudWswHhcNMTUwNzE3MTUwOTU2
-						WhcNMzUwNzE3MTUwOTU2WjAbMRkwFwYDVQQDDBBpZHAtZGV2LmNmLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzNzXx9QPeqnTqiMaYFT+Ly5O
-						ZvPDY74rqLbjcRmKi6Zu3E/lPyBrt7grW7K/6+9LisOvqhCd6Z9gebrOCYuUbnKN
-						4NQkjhgtI/w2373wctrClGweWjfhFtX1fWcsw+FDErR7vji9cjhkkVQJq87M+C5l
-						Eh1tHUX+x8UkUhjFyTLwU0b5ZNXRBDlewZGmgeT4rzkhnpVHEpXgFPoF93DSPlkk
-						vSwFF/sjYUcbpRsnZdiqEv2Bqt/hhnpon56pfr/VuvzyShzD5IpSeLsy9K/7jxTA
-						TIhXOvXwISynpLKKkj0EzyRxjTPrvHuBKkGJRvN1C3S30M4UBW7aijzNzgMmeQID
-						AQABo2wwajAdBgNVHQ4EFgQUc3nUBpNUbK7zrNnDKps3T1hf03owSQYDVR0RBEIw
-						QIIQaWRwLWRldi5jZi5hYy51a4YsaHR0cHM6Ly9pZHAtZGV2LmNhcmRpZmYuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAAfTGvlqkq/t92EQ
-						tYYKioOdQmZ8BM+bXHeu0k17/0EofcsRAG8j6OdgdDk8SAGkrR1IaIVQRAEUoD9n
-						KnUcMdpGGGAUyGCQeT3ZOr/Y3A0T6ah3J1b/1Ldg3X5pKk/B7R2f/hrSrtZ/xO+Q
-						9Rwa3Rg6GCQpIH2W1ZCDzbpD+KCFVB6zVqhvQQfeAusZaKBcfyClpAEzRcRcae1b
-						RkcJLKZ2BTeNJj0NqvoKP4H38bolf8XNSfrLYIoDxeZUr+DfSHnhuVEGR5rfqVxv
-						+z6Cc6ob6jVxV/i8CWr8OMGqwGPpZ4gsMTt9h9p0m4J2ZeWLTw5M4hv8Poodx3q7
-						nqVb/BQ=
-					</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>
-						MIIDMTCCAhmgAwIBAgIVAO09ALr3KSIWq/Qs0c6n8L+5X4QfMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC1kZXYuY2YuYWMudWswHhcNMTUwNzE3MTUwOTU1
-						WhcNMzUwNzE3MTUwOTU1WjAbMRkwFwYDVQQDDBBpZHAtZGV2LmNmLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtGv7j42xrk+K5jFa7xO9FG5Y
-						g0uoSK9cCcf2/wSPAWxR8pSF8lvFk501GnGaCzesFV9MZER+rOxFAGvsYF4pvfwg
-						IqcVmlpwK4RvfDHxI5VRcbtAIsNQBYI31lD7Op4V0e7sPJPHN9WwaLO3E3TejgA+
-						2SBGO3ziYVj/5bzEThSzypqcUe5lwMwQR+alnVemKpgC0nCiYexjzmLkieCc3SFE
-						QqagkyTD0hbT64PNJ8+8NPr5OKmYzh7GJf8Wk6yD4F1C5rh3fwnd2o4ijAgP2PQP
-						qYCKJszmSx2QMlrCzZGnlchuw822iFFkxgH/SHdqLPFs4JRUhBg/XNTPPvdwOwID
-						AQABo2wwajAdBgNVHQ4EFgQU/zSfj92Vu+a2QSW3KCiSJgnqlrgwSQYDVR0RBEIw
-						QIIQaWRwLWRldi5jZi5hYy51a4YsaHR0cHM6Ly9pZHAtZGV2LmNhcmRpZmYuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAJtR0BdSGErSR290
-						b1JsMR1qSPDzwETSZsOAX+fSx73IfM1BN78dOzOREICxLq8JZXLAS9JcNK0UIwko
-						YPs6j8ciISm9u/sJGqDHI9oxKyRfMxY/+pXS8uiVDOba9w66GMvJ0Q1XXQcivkko
-						fT/BXAFhxyMrz1OBvs0FgTfm05uK3nu4g6EjB+Y3iFhYrrhOOUyH4VjIPIJh4nNk
-						TO7s59duUfcssdfB4ukafbBK9+qmMe7fUYQ5naOGZttGRctJ4ZyWX25e0iSS45Ke
-						j7tYiMu6aOeGGOPvaHfWJKuUZaVcyYy1/3P1f5s+qBmx2Qip/lMoyRlp2koQtq0i
-						C6/ezjY=
-					</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>
-						MIIDMTCCAhmgAwIBAgIVAL6YvjNSscjvYb9Vqel/0PQDF0u1MA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC1kZXYuY2YuYWMudWswHhcNMTUwNzE3MTUwOTU1
-						WhcNMzUwNzE3MTUwOTU1WjAbMRkwFwYDVQQDDBBpZHAtZGV2LmNmLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoxLdHnRHMBBYz3qdPA8AzDuy
-						BTbXNKF74QAN0n3rJrFapCf4PhPk1PIunCEhTXVfoQ1T0yGIa9rPjfi7DyD7WQK5
-						RLsJK/wCNyUJjXloKIhOGnVCJQiuJScTfpJSbnR1LGtsYq+UrjbEXBhWOog2D+fs
-						1lV2a++paF+pGepL182UiWJEQFJHrbKES4wNNxsVTq7/yHgSwH2fMWj02AsL3dVJ
-						WskeRu7iChVEpkhx/nhneRz14OlfKdZ1aqHy7NmSpkWq8J5xSWffPcY0PuTYasfi
-						DZhGlDuq0LQ7P1kM7mi6mv6JXkj8JUf8n0m8qkTxlXSbxs5hg9b4pLG6tyiVhQID
-						AQABo2wwajAdBgNVHQ4EFgQUs0UFtkEBY7ESxQ8hzQPWU9d14OQwSQYDVR0RBEIw
-						QIIQaWRwLWRldi5jZi5hYy51a4YsaHR0cHM6Ly9pZHAtZGV2LmNhcmRpZmYuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAB5LiV2qAlPr8PCS
-						zAFDri0qhl15twzESJyqrsuZUapEA1hCtWVgTCHjJkhosHL1oNQMpmygOYmpLPLM
-						WptyFTTyNvMRW3Zpk4uyyRJL2w5lEgMTUOvqTvbdbD3QGO4O9tNse2xaAWd1GZVw
-						sFJiOiNpQX5O2aK04m119NBkbVJ97K9ZcaQrE0CxXuR1s8G0TNI53j6zpcCtZjN/
-						QXjTGm16Si2BcuL3XyACXLXhA2MOR3UzNxOR8StkRvTqrC8KVrNMTOml6B3vmg3H
-						2nfE9xwWXO3lIWCeJ/cM3+1wAZoD1CZpMLele8bMNve5aU1K3NPSozCTCHu9CeaP
-						j6UiIXk=
-					</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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</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"/>
-  </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">cardiff.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMTCCAhmgAwIBAgIVALPBj+mIv2yR8UAKD/i7vqdumwAGMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC1kZXYuY2YuYWMudWswHhcNMTUwNzE3MTUwOTU2
-						WhcNMzUwNzE3MTUwOTU2WjAbMRkwFwYDVQQDDBBpZHAtZGV2LmNmLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzNzXx9QPeqnTqiMaYFT+Ly5O
-						ZvPDY74rqLbjcRmKi6Zu3E/lPyBrt7grW7K/6+9LisOvqhCd6Z9gebrOCYuUbnKN
-						4NQkjhgtI/w2373wctrClGweWjfhFtX1fWcsw+FDErR7vji9cjhkkVQJq87M+C5l
-						Eh1tHUX+x8UkUhjFyTLwU0b5ZNXRBDlewZGmgeT4rzkhnpVHEpXgFPoF93DSPlkk
-						vSwFF/sjYUcbpRsnZdiqEv2Bqt/hhnpon56pfr/VuvzyShzD5IpSeLsy9K/7jxTA
-						TIhXOvXwISynpLKKkj0EzyRxjTPrvHuBKkGJRvN1C3S30M4UBW7aijzNzgMmeQID
-						AQABo2wwajAdBgNVHQ4EFgQUc3nUBpNUbK7zrNnDKps3T1hf03owSQYDVR0RBEIw
-						QIIQaWRwLWRldi5jZi5hYy51a4YsaHR0cHM6Ly9pZHAtZGV2LmNhcmRpZmYuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAAfTGvlqkq/t92EQ
-						tYYKioOdQmZ8BM+bXHeu0k17/0EofcsRAG8j6OdgdDk8SAGkrR1IaIVQRAEUoD9n
-						KnUcMdpGGGAUyGCQeT3ZOr/Y3A0T6ah3J1b/1Ldg3X5pKk/B7R2f/hrSrtZ/xO+Q
-						9Rwa3Rg6GCQpIH2W1ZCDzbpD+KCFVB6zVqhvQQfeAusZaKBcfyClpAEzRcRcae1b
-						RkcJLKZ2BTeNJj0NqvoKP4H38bolf8XNSfrLYIoDxeZUr+DfSHnhuVEGR5rfqVxv
-						+z6Cc6ob6jVxV/i8CWr8OMGqwGPpZ4gsMTt9h9p0m4J2ZeWLTw5M4hv8Poodx3q7
-						nqVb/BQ=
-					</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>
-						MIIDMTCCAhmgAwIBAgIVAO09ALr3KSIWq/Qs0c6n8L+5X4QfMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC1kZXYuY2YuYWMudWswHhcNMTUwNzE3MTUwOTU1
-						WhcNMzUwNzE3MTUwOTU1WjAbMRkwFwYDVQQDDBBpZHAtZGV2LmNmLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtGv7j42xrk+K5jFa7xO9FG5Y
-						g0uoSK9cCcf2/wSPAWxR8pSF8lvFk501GnGaCzesFV9MZER+rOxFAGvsYF4pvfwg
-						IqcVmlpwK4RvfDHxI5VRcbtAIsNQBYI31lD7Op4V0e7sPJPHN9WwaLO3E3TejgA+
-						2SBGO3ziYVj/5bzEThSzypqcUe5lwMwQR+alnVemKpgC0nCiYexjzmLkieCc3SFE
-						QqagkyTD0hbT64PNJ8+8NPr5OKmYzh7GJf8Wk6yD4F1C5rh3fwnd2o4ijAgP2PQP
-						qYCKJszmSx2QMlrCzZGnlchuw822iFFkxgH/SHdqLPFs4JRUhBg/XNTPPvdwOwID
-						AQABo2wwajAdBgNVHQ4EFgQU/zSfj92Vu+a2QSW3KCiSJgnqlrgwSQYDVR0RBEIw
-						QIIQaWRwLWRldi5jZi5hYy51a4YsaHR0cHM6Ly9pZHAtZGV2LmNhcmRpZmYuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAJtR0BdSGErSR290
-						b1JsMR1qSPDzwETSZsOAX+fSx73IfM1BN78dOzOREICxLq8JZXLAS9JcNK0UIwko
-						YPs6j8ciISm9u/sJGqDHI9oxKyRfMxY/+pXS8uiVDOba9w66GMvJ0Q1XXQcivkko
-						fT/BXAFhxyMrz1OBvs0FgTfm05uK3nu4g6EjB+Y3iFhYrrhOOUyH4VjIPIJh4nNk
-						TO7s59duUfcssdfB4ukafbBK9+qmMe7fUYQ5naOGZttGRctJ4ZyWX25e0iSS45Ke
-						j7tYiMu6aOeGGOPvaHfWJKuUZaVcyYy1/3P1f5s+qBmx2Qip/lMoyRlp2koQtq0i
-						C6/ezjY=
-					</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>
-						MIIDMTCCAhmgAwIBAgIVAL6YvjNSscjvYb9Vqel/0PQDF0u1MA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC1kZXYuY2YuYWMudWswHhcNMTUwNzE3MTUwOTU1
-						WhcNMzUwNzE3MTUwOTU1WjAbMRkwFwYDVQQDDBBpZHAtZGV2LmNmLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoxLdHnRHMBBYz3qdPA8AzDuy
-						BTbXNKF74QAN0n3rJrFapCf4PhPk1PIunCEhTXVfoQ1T0yGIa9rPjfi7DyD7WQK5
-						RLsJK/wCNyUJjXloKIhOGnVCJQiuJScTfpJSbnR1LGtsYq+UrjbEXBhWOog2D+fs
-						1lV2a++paF+pGepL182UiWJEQFJHrbKES4wNNxsVTq7/yHgSwH2fMWj02AsL3dVJ
-						WskeRu7iChVEpkhx/nhneRz14OlfKdZ1aqHy7NmSpkWq8J5xSWffPcY0PuTYasfi
-						DZhGlDuq0LQ7P1kM7mi6mv6JXkj8JUf8n0m8qkTxlXSbxs5hg9b4pLG6tyiVhQID
-						AQABo2wwajAdBgNVHQ4EFgQUs0UFtkEBY7ESxQ8hzQPWU9d14OQwSQYDVR0RBEIw
-						QIIQaWRwLWRldi5jZi5hYy51a4YsaHR0cHM6Ly9pZHAtZGV2LmNhcmRpZmYuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAB5LiV2qAlPr8PCS
-						zAFDri0qhl15twzESJyqrsuZUapEA1hCtWVgTCHjJkhosHL1oNQMpmygOYmpLPLM
-						WptyFTTyNvMRW3Zpk4uyyRJL2w5lEgMTUOvqTvbdbD3QGO4O9tNse2xaAWd1GZVw
-						sFJiOiNpQX5O2aK04m119NBkbVJ97K9ZcaQrE0CxXuR1s8G0TNI53j6zpcCtZjN/
-						QXjTGm16Si2BcuL3XyACXLXhA2MOR3UzNxOR8StkRvTqrC8KVrNMTOml6B3vmg3H
-						2nfE9xwWXO3lIWCeJ/cM3+1wAZoD1CZpMLele8bMNve5aU1K3NPSozCTCHu9CeaP
-						j6UiIXk=
-					</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"/>
-  </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>Identity Management</GivenName>
-    <EmailAddress>mailto:idman@cardiff.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Philip </GivenName>
-    <SurName>Smart</SurName>
-    <EmailAddress>mailto:smartp@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 59b543d0..00000000
--- a/swamid-interfederations-2.0/idp-dev.cardiff.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-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"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</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.rcpch.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-dev.rcpch.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index abe1c98a..00000000
--- a/swamid-interfederations-2.0/idp-dev.rcpch.ac.uk-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://idp-dev.rcpch.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP for the Royal College of Paediatrics and Child Health.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-25T14:30:02Z">
-      <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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Royal College of Paediatrics and Child Health [test]</mdui:DisplayName>
-        <mdui:Logo height="168" width="238">https://www.rcpch.ac.uk/sites/default/themes/rcpch/logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.rcpch.ac.uk/sites/default/themes/rcpch/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcpch.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUUwvZSbWLgYhL1zmD7JfQa6+QIrAwDQYJKoZIhvcNAQEF
-						BQAwHjEcMBoGA1UEAwwTaWRwLWRldi5yY3BjaC5hYy51azAeFw0xNTAxMjYxMzEx
-						MzFaFw0zNTAxMjYxMzExMzFaMB4xHDAaBgNVBAMME2lkcC1kZXYucmNwY2guYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDITfyNqu48UzQ3os3X
-						cqtO/TUOxT5LjGfmbheDYdJHbp1wwkGIlC6NV11Gfg8JIRb7JJY3UuYyY13MREaR
-						/A8FIkDjkt+7xMTTHOS/tJIyeHDJa/iFc5EhI8+tCIz8gz4rhKqFzcOeRbn8vvf7
-						XJ/UlIRuX+JHAVGdrKh2UmEPZBUK6sHAeOIxk4KEXzrkpv+OFs7HyTlpIR1RxTVD
-						xMefqAplUB4dgjx0W0NNEmfOgftlI3nJODCfbxyzpTfVOQzrpkNVwkeyebw2wCHC
-						RvBNM/1huejvQ8TWugi0emtkRnwOMEGSezmGVyOPD+1grhqlPBRf4LDS5NvVZcCO
-						6jejAgMBAAGjbTBrMB0GA1UdDgQWBBRvqxDvr2Yb5KVK8QtIJgaZVMJ2cTBKBgNV
-						HREEQzBBghNpZHAtZGV2LnJjcGNoLmFjLnVrhipodHRwczovL2lkcC1kZXYucmNw
-						Y2guYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAFikVOm1
-						+YxvDJxGa5gN0/c2lx2lztN8tNSWUSECht3zHxDiDmaeBcmjeX/pxh7tUAWoTuhk
-						hLEgVLar8xfbaPaG077pFMXTzSrNDkPHZFYUZB9IT4bAsYoCnYMotXrCsNyifeLM
-						7I6SCZHSOmOgBzGO714fzkkUMgflvawYxIZXi4+WAUmfQbH+q1CEwucdkPhKX8Wf
-						D7pDfo9ZmkpMD6UGSh5ASWP4OygI1tJsrWMfIE+AOi6EEaxwITeSjyhwvWTvxwrK
-						gfjzLnyVmzTZMLzIwV+IztQoakTC3YOkcDQbXXbAPYlris23WcxuLYhU3C4/w+SN
-						wwvpWerUYSmTk8k=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.rcpch.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.rcpch.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.rcpch.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.rcpch.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.rcpch.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.rcpch.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.rcpch.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">rcpch.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUUwvZSbWLgYhL1zmD7JfQa6+QIrAwDQYJKoZIhvcNAQEF
-						BQAwHjEcMBoGA1UEAwwTaWRwLWRldi5yY3BjaC5hYy51azAeFw0xNTAxMjYxMzEx
-						MzFaFw0zNTAxMjYxMzExMzFaMB4xHDAaBgNVBAMME2lkcC1kZXYucmNwY2guYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDITfyNqu48UzQ3os3X
-						cqtO/TUOxT5LjGfmbheDYdJHbp1wwkGIlC6NV11Gfg8JIRb7JJY3UuYyY13MREaR
-						/A8FIkDjkt+7xMTTHOS/tJIyeHDJa/iFc5EhI8+tCIz8gz4rhKqFzcOeRbn8vvf7
-						XJ/UlIRuX+JHAVGdrKh2UmEPZBUK6sHAeOIxk4KEXzrkpv+OFs7HyTlpIR1RxTVD
-						xMefqAplUB4dgjx0W0NNEmfOgftlI3nJODCfbxyzpTfVOQzrpkNVwkeyebw2wCHC
-						RvBNM/1huejvQ8TWugi0emtkRnwOMEGSezmGVyOPD+1grhqlPBRf4LDS5NvVZcCO
-						6jejAgMBAAGjbTBrMB0GA1UdDgQWBBRvqxDvr2Yb5KVK8QtIJgaZVMJ2cTBKBgNV
-						HREEQzBBghNpZHAtZGV2LnJjcGNoLmFjLnVrhipodHRwczovL2lkcC1kZXYucmNw
-						Y2guYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAFikVOm1
-						+YxvDJxGa5gN0/c2lx2lztN8tNSWUSECht3zHxDiDmaeBcmjeX/pxh7tUAWoTuhk
-						hLEgVLar8xfbaPaG077pFMXTzSrNDkPHZFYUZB9IT4bAsYoCnYMotXrCsNyifeLM
-						7I6SCZHSOmOgBzGO714fzkkUMgflvawYxIZXi4+WAUmfQbH+q1CEwucdkPhKX8Wf
-						D7pDfo9ZmkpMD6UGSh5ASWP4OygI1tJsrWMfIE+AOi6EEaxwITeSjyhwvWTvxwrK
-						gfjzLnyVmzTZMLzIwV+IztQoakTC3YOkcDQbXXbAPYlris23WcxuLYhU3C4/w+SN
-						wwvpWerUYSmTk8k=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.rcpch.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.rcpch.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">Royal College of Paediatrics and Child Health</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal College of Paediatrics and Child Health [test]</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rcpch.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Overt Software</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Overt Software</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dev.sussex.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-dev.sussex.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 2ebf2f8f..00000000
--- a/swamid-interfederations-2.0/idp-dev.sussex.ac.uk-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://idp-dev.sussex.ac.uk/idp/shibboleth">
-  <!--
-		This is a development Identity Provider for the University of Sussex.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <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">University of Sussex (development)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Sussex (development)</mdui:Description>
-        <mdui:Logo height="60" width="147">https://www.sussex.ac.uk/includes/images/external/logo.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.sussex.ac.uk/includes/images/external/favicon.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUaXHTQJ0iHL7M96NNUnD8cG38agowDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUaWRwLWRldi5zdXNzZXguYWMudWswHhcNMTMwODAyMTMy
-						MjI3WhcNMzMwODAyMTMyMjI3WjAfMR0wGwYDVQQDExRpZHAtZGV2LnN1c3NleC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIw2HMiV8nzFA8Af
-						OW2WvgKdr/rsNxXTNhMFNH8dFKnUlBkz7SHAg9ikrDOrJYsZ+19o0B6eUFzO9O9j
-						/weeCN6hSXp3Fm9PKrWx8atVR6mK3sBvN4UjwPy5SrArkvDeZddNYAiklIDo2VXg
-						Qt5C2/0uCfa7GnRwKYrN0Pr83V4w1XAOaY10PhV5au7q2kTtNJo1WZHHT6Kf4K5g
-						fEEYG9P+9M7C846vqEkow5K57cz+/LDBTKJXeuCRNdWydnfn6leDFtCh2ZXviAYs
-						Fhug70+RxVSsJ0eZx5G31y3Z8GB8UfWjWF+a1fQy6vrgK4XZc9QxLc6urOMdmDfL
-						NKzkbdECAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLWRldi5zdXNzZXguYWMudWuG
-						K2h0dHBzOi8vaWRwLWRldi5zdXNzZXguYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFKuGMvjPXWBURM7ApWOBW81l8cfZMA0GCSqGSIb3DQEBBQUAA4IBAQAx
-						XWbyQnOLcIsVg77HRr+FBRmkIv11efMGAdGx8N5S3RJ1T52QquHuizTKO0pldfzx
-						uHPc1FoAW92dIdlaImZbss9BNFvdjQ+oDbjst32RpXmpBr703p4FbxTk30ceZhhd
-						HLTr8pd9Ti2k9XNI+cAaSjCfwcXiJ0BVDDhs+tD6aLmnFPZZbab6Rd01acxmXn/H
-						ac+9/iJP8c3w50IarnevAh7/3Jpfxgrv8MilBzFuDu1VqR1mRvQqaI86FLYkxhgF
-						rWyVSAMwo1dTlw0V7i05upCRLj6pDHJwq8dX5iHO1Gt8JSFfY6aNdIz+kfVgM321
-						YV5CgHdLYfAq+Bcvp9eq
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.sussex.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.sussex.ac.uk: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-dev.sussex.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dev.sussex.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dev.sussex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dev.sussex.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">sussex.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUaXHTQJ0iHL7M96NNUnD8cG38agowDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUaWRwLWRldi5zdXNzZXguYWMudWswHhcNMTMwODAyMTMy
-						MjI3WhcNMzMwODAyMTMyMjI3WjAfMR0wGwYDVQQDExRpZHAtZGV2LnN1c3NleC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIw2HMiV8nzFA8Af
-						OW2WvgKdr/rsNxXTNhMFNH8dFKnUlBkz7SHAg9ikrDOrJYsZ+19o0B6eUFzO9O9j
-						/weeCN6hSXp3Fm9PKrWx8atVR6mK3sBvN4UjwPy5SrArkvDeZddNYAiklIDo2VXg
-						Qt5C2/0uCfa7GnRwKYrN0Pr83V4w1XAOaY10PhV5au7q2kTtNJo1WZHHT6Kf4K5g
-						fEEYG9P+9M7C846vqEkow5K57cz+/LDBTKJXeuCRNdWydnfn6leDFtCh2ZXviAYs
-						Fhug70+RxVSsJ0eZx5G31y3Z8GB8UfWjWF+a1fQy6vrgK4XZc9QxLc6urOMdmDfL
-						NKzkbdECAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLWRldi5zdXNzZXguYWMudWuG
-						K2h0dHBzOi8vaWRwLWRldi5zdXNzZXguYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFKuGMvjPXWBURM7ApWOBW81l8cfZMA0GCSqGSIb3DQEBBQUAA4IBAQAx
-						XWbyQnOLcIsVg77HRr+FBRmkIv11efMGAdGx8N5S3RJ1T52QquHuizTKO0pldfzx
-						uHPc1FoAW92dIdlaImZbss9BNFvdjQ+oDbjst32RpXmpBr703p4FbxTk30ceZhhd
-						HLTr8pd9Ti2k9XNI+cAaSjCfwcXiJ0BVDDhs+tD6aLmnFPZZbab6Rd01acxmXn/H
-						ac+9/iJP8c3w50IarnevAh7/3Jpfxgrv8MilBzFuDu1VqR1mRvQqaI86FLYkxhgF
-						rWyVSAMwo1dTlw0V7i05upCRLj6pDHJwq8dX5iHO1Gt8JSFfY6aNdIz+kfVgM321
-						YV5CgHdLYfAq+Bcvp9eq
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dev.sussex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dev.sussex.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">University of Sussex</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Sussex (development)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sussex.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dave</GivenName>
-    <SurName>Lewney</SurName>
-    <EmailAddress>mailto:d.m.lewney@sussex.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dave</GivenName>
-    <SurName>Lewney</SurName>
-    <EmailAddress>mailto:d.m.lewney@sussex.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 e6a348c2..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dgnocchi.irccs.garr.it/idp/shibboleth">
-  <md: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>
-  </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">dongnocchi.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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: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:Logo height="32" width="32" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="32" width="32" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-dgnocchi.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dongnocchi.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dongnocchi.it/documenti/eng/index_eng.htm</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.dongnocchi.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml
deleted file mode 100644
index f12a819e..00000000
--- a/swamid-interfederations-2.0/idp-emedea.irccs.garr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-emedea.irccs.garr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-12T08:30:34Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emedea.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IRCCS Eugenio Medea</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IRCCS Eugenio Medea</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for IRCCS "Eugenio Medea" users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'IRCCS "Eugenio Medea"</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.emedea.it/ricerca/idem-garr-en.php</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.emedea.it/ricerca/idem-garr.php</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.emedea.it/ricerca/idem-garr-en.php</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.emedea.it/ricerca/idem-garr.php</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-emedea.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-emedea.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-emedea.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-emedea.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSzCCAjOgAwIBAgIUJ4fNWGX5+08debnn/nkHiEjdar8wDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwLWVtZWRlYS5pcmNjcy5nYXJyLml0MB4XDTE0MTIw
-MzE0NTI1MFoXDTM0MTIwMzE0NTI1MFowIzEhMB8GA1UEAxMYaWRwLWVtZWRlYS5p
-cmNjcy5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgSTZ
-erZWMbKpBbRjuYs/cV3i+w+VxlEX/vBCeZNGm0GuA/83OSaBPgybFy++HadFeGwv
-CHJ0ezfzKBcChCrmc8fDEeGAGGPTCDf/fwUcHfDkNXVADV0gc9ArOf/c+n27gpeP
-dQjR8PEe5LjAmPxSu3FaYHaDCDolp6+fCF/kO/iRAkovLhkciWvZ6UByp7za187b
-Q9+oAywSZ+YRU8R7FA1r2DcYEL1bYm0BVGgieQViDXIQ1IxoFONXPkqh5hIWWafZ
-PkpD93sGtasppKmZJgBnoLbxqJr1yM6+G1lWoAl86jJcrYcbhSz3s1JooJU/ixm8
-D/TiBLNuWQXBvmBjdQIDAQABo3cwdTBUBgNVHREETTBLghhpZHAtZW1lZGVhLmly
-Y2NzLmdhcnIuaXSGL2h0dHBzOi8vaWRwLWVtZWRlYS5pcmNjcy5nYXJyLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRGrPEKhYrWASXXduqff7O6vmNl3TANBgkq
-hkiG9w0BAQUFAAOCAQEAdMxKPZHKW7KPpNiNKKPCqB6IN8v0kG1y2MseXKZK4zvG
-DGpRO1Ct25Y5AryzXi7yUmtXfU2xDywgrf8met+OrlYBnEStx2iEmRLqWy9uno36
-RYu7oCdQ/IA4glu6fFOaXrxqy+oph/popolaYZukfFZpxtMz+K8vDiZHC9MG2aed
-puDKQAij1jLb7WuFJDThpxZoqlh/5K9pC8zvupkflSB3ryDiD238MEG0XeJP4lrd
-71LUNetzMHi2RIWXjBtFyQrtWHEhkZRDLy5tTVgnRWbj7fW5LsUDSg7IXhTXlvGd
-K9UQVp9FsBNJgDA7bdiWsS8s4kOuhwB7w52dprEQ+w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-emedea.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-emedea.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-emedea.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-emedea.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-emedea.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-emedea.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emedea.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSzCCAjOgAwIBAgIUJ4fNWGX5+08debnn/nkHiEjdar8wDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwLWVtZWRlYS5pcmNjcy5nYXJyLml0MB4XDTE0MTIw
-MzE0NTI1MFoXDTM0MTIwMzE0NTI1MFowIzEhMB8GA1UEAxMYaWRwLWVtZWRlYS5p
-cmNjcy5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgSTZ
-erZWMbKpBbRjuYs/cV3i+w+VxlEX/vBCeZNGm0GuA/83OSaBPgybFy++HadFeGwv
-CHJ0ezfzKBcChCrmc8fDEeGAGGPTCDf/fwUcHfDkNXVADV0gc9ArOf/c+n27gpeP
-dQjR8PEe5LjAmPxSu3FaYHaDCDolp6+fCF/kO/iRAkovLhkciWvZ6UByp7za187b
-Q9+oAywSZ+YRU8R7FA1r2DcYEL1bYm0BVGgieQViDXIQ1IxoFONXPkqh5hIWWafZ
-PkpD93sGtasppKmZJgBnoLbxqJr1yM6+G1lWoAl86jJcrYcbhSz3s1JooJU/ixm8
-D/TiBLNuWQXBvmBjdQIDAQABo3cwdTBUBgNVHREETTBLghhpZHAtZW1lZGVhLmly
-Y2NzLmdhcnIuaXSGL2h0dHBzOi8vaWRwLWVtZWRlYS5pcmNjcy5nYXJyLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRGrPEKhYrWASXXduqff7O6vmNl3TANBgkq
-hkiG9w0BAQUFAAOCAQEAdMxKPZHKW7KPpNiNKKPCqB6IN8v0kG1y2MseXKZK4zvG
-DGpRO1Ct25Y5AryzXi7yUmtXfU2xDywgrf8met+OrlYBnEStx2iEmRLqWy9uno36
-RYu7oCdQ/IA4glu6fFOaXrxqy+oph/popolaYZukfFZpxtMz+K8vDiZHC9MG2aed
-puDKQAij1jLb7WuFJDThpxZoqlh/5K9pC8zvupkflSB3ryDiD238MEG0XeJP4lrd
-71LUNetzMHi2RIWXjBtFyQrtWHEhkZRDLy5tTVgnRWbj7fW5LsUDSg7IXhTXlvGd
-K9UQVp9FsBNJgDA7bdiWsS8s4kOuhwB7w52dprEQ+w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-emedea.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-emedea.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">IRCCS Eugenio Medea</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">IRCCS Eugenio Medea</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">IRCCS Eugenio Medea</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">IRCCS Eugenio Medea</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.emedea.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.emedea.it/english_medea/index.php</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 fde8df21..00000000
--- a/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-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-ensr.ens-rennes.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENS Rennes</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACpUlEQVQoz5XSy29MbRwH8O/v9zznnOk4HZTqq42QCtWmQ9SCkgaxQFzjUhGXhDZWdiI2wso1Lu/mjZC8NlILCRYWxMJCXKKvpihqlN50qKlpp1MzZ3rOc57nXcxf4Lv8fDffxZcad7UBICJjTGFSObYUgrQ2RQSMV1COLYTgIjIAIvh+qJRZVD2DiXL5gIiIEASh7+ua6jLBXEQAkghK6bJpkXPHm9yoBdDZa6/efx6xJE8tdc4db4q5NhFduN7e+TFVEpHMTL/zQeue+JeBzMbD9+4/7lnZUAkgX1AtzfGBZHZTy/17j3pWLatSSgOQAIxBzHVedw1rbe4+/BworbROpfOOJfqGxnN5/987XbFSx51iaW3EnLqdIPQPZS+eWK2N6fjw869y9+iBpZvXVj/v+L5/e936pnkV5dHur2lmAsAghKGeU1maSud7B8ctyWeOrSqJyIlc0NIcP3X1+ZOXg1vWzW/ZHZ/I+YKJieAHetOa6n9udd5+0L1wXpltiZNXnp3++8WvUW/2LPf89faTl56taKi0LaGNkQCY6eOX9L5ttYnesdY98UTfmG2JivLof13Drc31vd8yR/YuGUxm/SCMRqSoqt3h2KLzQ2p2uXtwR92PVO7ijXYhyBi8T/yaOb3k0O7676nfl292CCYiUOOuNmMgBbtRK+Y6/cnxugUzBpLZuVWx5PCEFCLU2pYiCHUmW2AmyUxeQS2umblu5VytjVdQb7pT+7bWvvs00rihprJiSv9QNp3xevoy6TFPCJYwkILSmcKjp32TfhgoPZL2mOlt94hXUE5CJHpHG+orRsc9ZgIMLd/ZRoAKtdaGmYrzJoPQsYXvhwBsS6hQE0EKNoB0JAA4kkGAAQADlNhCG0QsUfxBxGaYYgnq/zaGP8n/Wtk90FXUG3sAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzcrMDI6MDBw0pBlAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM3KzAyOjAwAY8o2QAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ens-rennes.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp-ensr.ens-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-ensr.ens-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-ensr.ens-rennes.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENS Rennes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENS Rennes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ens-rennes.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>postmaster@ens-rennes.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 3c2b6529..00000000
--- a/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.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://idp-etu.crous-grenoble.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Grenoble - étudiants</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOCswMjowMMS/5/EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTgrMDI6MDC14l9NAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-grenoble.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Grenoble - étudiants</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>
-					      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>
-    </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-POST" Location="https://idp-etu.crous-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-etu.crous-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-etu.crous-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Grenoble - étudiants</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Grenoble - étudiants</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-grenoble.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>informatique@crous-grenoble.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
deleted file mode 100644
index ec8abe54..00000000
--- a/swamid-interfederations-2.0/idp-hosting.renater.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-hosting.renater.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-11-17T17:56:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">genci.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GENCI</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">IdP Hosting</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">GENCI</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">IdP Hosting</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>
-					      MIIDQzCCAiugAwIBAgIUZRhn1oG2f7FG4yfsnI73Z2W/5jswDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWaWRwLWhvc3RpbmcucmVuYXRlci5mcjAeFw0xNTExMTcx
-NjM4NDVaFw0zNTExMTcxNjM4NDVaMCExHzAdBgNVBAMMFmlkcC1ob3N0aW5nLnJl
-bmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCLq4oRzxaf
-XL5i0ZfOQhGvcAW7awDjuMgYzi1geOxe1aTlCrYFosPkzSY9J/HarXGc8pS6VY2q
-brHh7wHTxP2QPw64CaQYUumOhZRvlkSGdj0vKYn7DBKewYfHND1nr+TN4ZybZVCe
-GvpIQBhwN2SARKPAxjVZIpwcKskLcHsakh2TNknkxSsu4LBkx6VYzQr8JCcH+YCx
-rVTGHoMdjNDlrEkKBJrReB7VpC1yKdXDXsQNtWKojiQvbI3Zau2gduxaAUAs4Wlz
-+3gC3poaANXsRbYO5t8PU8VLulVx1j8SkRcyAunXXGLuPIZ0AwX6cREM77vuMoF1
-rgc6sdu8WEmTAgMBAAGjczBxMB0GA1UdDgQWBBRHn9jRWEpSgGuXm+Fcat1vfMSM
-ZzBQBgNVHREESTBHghZpZHAtaG9zdGluZy5yZW5hdGVyLmZyhi1odHRwczovL2lk
-cC1ob3N0aW5nLnJlbmF0ZXIuZnIvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAIiIsPKolz/Ct7HOQDvJXJ3VT2ov8TQT2DA75cJ9qK1TVEQTnZtsla2x
-heA2WFYt2Hf1/N/y9salEo1r5zXlaTi/D3QQBjl8jQK9uibY3Ta4bk27XePxAv8I
-MAWWy529LU5M7/AViEMkPT96kPcOJST5XgXzZN2I8dkVQ+L6SUutqvvVju7MDwP/
-dSqzvGLJpKzSnmgITqMT/RBPbgJUsETAr/5gOnfkJ1RQfbKjl/QzuQTKYPu4XeKJ
-z7+v1Ag9m2btxCUdJMaMDn/FUJKSzxOogW3vJ1ZIAXFMnEgSuhrM5/GoyiEqyCfj
-eTynT1A7tmOPmxyMyv76cficIt0xGao=
-					    </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-POST" Location="https://idp-hosting.renater.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-hosting.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-hosting.renater.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">genci.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUZRhn1oG2f7FG4yfsnI73Z2W/5jswDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWaWRwLWhvc3RpbmcucmVuYXRlci5mcjAeFw0xNTExMTcx
-NjM4NDVaFw0zNTExMTcxNjM4NDVaMCExHzAdBgNVBAMMFmlkcC1ob3N0aW5nLnJl
-bmF0ZXIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCLq4oRzxaf
-XL5i0ZfOQhGvcAW7awDjuMgYzi1geOxe1aTlCrYFosPkzSY9J/HarXGc8pS6VY2q
-brHh7wHTxP2QPw64CaQYUumOhZRvlkSGdj0vKYn7DBKewYfHND1nr+TN4ZybZVCe
-GvpIQBhwN2SARKPAxjVZIpwcKskLcHsakh2TNknkxSsu4LBkx6VYzQr8JCcH+YCx
-rVTGHoMdjNDlrEkKBJrReB7VpC1yKdXDXsQNtWKojiQvbI3Zau2gduxaAUAs4Wlz
-+3gC3poaANXsRbYO5t8PU8VLulVx1j8SkRcyAunXXGLuPIZ0AwX6cREM77vuMoF1
-rgc6sdu8WEmTAgMBAAGjczBxMB0GA1UdDgQWBBRHn9jRWEpSgGuXm+Fcat1vfMSM
-ZzBQBgNVHREESTBHghZpZHAtaG9zdGluZy5yZW5hdGVyLmZyhi1odHRwczovL2lk
-cC1ob3N0aW5nLnJlbmF0ZXIuZnIvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAIiIsPKolz/Ct7HOQDvJXJ3VT2ov8TQT2DA75cJ9qK1TVEQTnZtsla2x
-heA2WFYt2Hf1/N/y9salEo1r5zXlaTi/D3QQBjl8jQK9uibY3Ta4bk27XePxAv8I
-MAWWy529LU5M7/AViEMkPT96kPcOJST5XgXzZN2I8dkVQ+L6SUutqvvVju7MDwP/
-dSqzvGLJpKzSnmgITqMT/RBPbgJUsETAr/5gOnfkJ1RQfbKjl/QzuQTKYPu4XeKJ
-z7+v1Ag9m2btxCUdJMaMDn/FUJKSzxOogW3vJ1ZIAXFMnEgSuhrM5/GoyiEqyCfj
-eTynT1A7tmOPmxyMyv76cficIt0xGao=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-hosting.renater.fr/idp/profile/SAML1/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">GENCI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GENCI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Anass Chabli</md:SurName>
-    <md:EmailAddress>anass.chabli@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml
deleted file mode 100644
index 502c5cb4..00000000
--- a/swamid-interfederations-2.0/idp-iccu.beniculturali.garr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,109 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-iccu.beniculturali.garr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-05-16T09:30:33Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iccu.sbn.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ICCU - Central Institute for the Union Catalogue</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">ICCU - Istituto Centrale per il Catalogo Unico</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider of ICCU - Central Institute for the Union Catalogue</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider di ICCU - Istituto Centrale per il Catalogo Unico</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.iccu.sbn.it/opencms/opencms/it/main/attivita/internaz/pagina_0015.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.iccu.sbn.it/opencms/opencms/it/main/attivita/internaz/pagina_0015.html</mdui:InformationURL>
-        <mdui:Logo height="32" width="32" xml:lang="en">https://idp-iccu.beniculturali.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-iccu.beniculturali.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="32" width="32" xml:lang="it">https://idp-iccu.beniculturali.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-iccu.beniculturali.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.iccu.sbn.it/opencms/opencms/it/main/attivita/internaz/pagina_0016.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.iccu.sbn.it/opencms/opencms/it/main/attivita/internaz/pagina_0016.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDZTCCAk2gAwIBAgIUIBwjXMe2oAvEscwSyDPZ2w15rKAwDQYJKoZIhvcNAQEF
-BQAwKTEnMCUGA1UEAxMeaWRwLWljY3UuYmVuaWN1bHR1cmFsaS5nYXJyLml0MB4X
-DTE0MDMzMTE0MDMyMloXDTM0MDMzMTE0MDMyMlowKTEnMCUGA1UEAxMeaWRwLWlj
-Y3UuYmVuaWN1bHR1cmFsaS5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA0hRtV5cbO/QFVeesgFrHkXERWyEgi0kWbzUkN28vJcQ4pBZE2vhn
-ev+TswjSjxAA6LgknhU8OrIMT6kjCPaxWiFrp/4WWQSy5JJTFI2uxUEVy9obZn5w
-mpGfWipEMyjwRGo0Bi3jywdRdviVPG7noRUA/BSvk2GX/6gNuEU1oZ++paCtf+nz
-qW1lVLWgOMEx4otPOkh+gusmuE/VijvzLfVnoddbQCnG8WUiYdy1S6IKqHEgC3uv
-FPmXKGPO5L91fhKqIdgBt4sTyV5YLsQ2G5RRGZX5FthUixjGJeVO5c0SZHC0uGvH
-0QXhBWDUTfyHj8Kzlxd3m4q+4aLw+OKBkQIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
-HmlkcC1pY2N1LmJlbmljdWx0dXJhbGkuZ2Fyci5pdIY1aHR0cHM6Ly9pZHAtaWNj
-dS5iZW5pY3VsdHVyYWxpLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
-FNoX/Ke7X3A11sdLTRKRSc0fjdoDMA0GCSqGSIb3DQEBBQUAA4IBAQCyyso8o1SP
-eoywZJwORU95X4iUXHFlHN+GV1EBMHbrbMSzQeQemNUaWcqTQ5N1j3RCE/1RE/op
-4JrLgKGgjCCxxN72bKw/6INzMT6qp5gQ8jMPxVONAxLqyFt86w/XkiJ83pb0VKmC
-pUVSCkv9vwCDd0O4ztRogxZ6enT9oEBBreD5UoRAi1yaVV1BAbR15A9qe2ryQDeA
-loIyp3aV/yzb9FOpDKSQfdowClVBDPVGnjjVcq4A2aHjxAJmMu9DFr3qNH3r2DVZ
-YEnhjJ7l96aa+WFWqg2KWh4eulWpQrg6eGEw/yWuKU3gc4x7BPVDP7goKnbHqNbR
-kwEmPrzpV6W3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-iccu.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-iccu.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-iccu.beniculturali.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-iccu.beniculturali.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-iccu.beniculturali.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-iccu.beniculturali.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iccu.sbn.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDZTCCAk2gAwIBAgIUIBwjXMe2oAvEscwSyDPZ2w15rKAwDQYJKoZIhvcNAQEF
-BQAwKTEnMCUGA1UEAxMeaWRwLWljY3UuYmVuaWN1bHR1cmFsaS5nYXJyLml0MB4X
-DTE0MDMzMTE0MDMyMloXDTM0MDMzMTE0MDMyMlowKTEnMCUGA1UEAxMeaWRwLWlj
-Y3UuYmVuaWN1bHR1cmFsaS5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA0hRtV5cbO/QFVeesgFrHkXERWyEgi0kWbzUkN28vJcQ4pBZE2vhn
-ev+TswjSjxAA6LgknhU8OrIMT6kjCPaxWiFrp/4WWQSy5JJTFI2uxUEVy9obZn5w
-mpGfWipEMyjwRGo0Bi3jywdRdviVPG7noRUA/BSvk2GX/6gNuEU1oZ++paCtf+nz
-qW1lVLWgOMEx4otPOkh+gusmuE/VijvzLfVnoddbQCnG8WUiYdy1S6IKqHEgC3uv
-FPmXKGPO5L91fhKqIdgBt4sTyV5YLsQ2G5RRGZX5FthUixjGJeVO5c0SZHC0uGvH
-0QXhBWDUTfyHj8Kzlxd3m4q+4aLw+OKBkQIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
-HmlkcC1pY2N1LmJlbmljdWx0dXJhbGkuZ2Fyci5pdIY1aHR0cHM6Ly9pZHAtaWNj
-dS5iZW5pY3VsdHVyYWxpLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
-FNoX/Ke7X3A11sdLTRKRSc0fjdoDMA0GCSqGSIb3DQEBBQUAA4IBAQCyyso8o1SP
-eoywZJwORU95X4iUXHFlHN+GV1EBMHbrbMSzQeQemNUaWcqTQ5N1j3RCE/1RE/op
-4JrLgKGgjCCxxN72bKw/6INzMT6qp5gQ8jMPxVONAxLqyFt86w/XkiJ83pb0VKmC
-pUVSCkv9vwCDd0O4ztRogxZ6enT9oEBBreD5UoRAi1yaVV1BAbR15A9qe2ryQDeA
-loIyp3aV/yzb9FOpDKSQfdowClVBDPVGnjjVcq4A2aHjxAJmMu9DFr3qNH3r2DVZ
-YEnhjJ7l96aa+WFWqg2KWh4eulWpQrg6eGEw/yWuKU3gc4x7BPVDP7goKnbHqNbR
-kwEmPrzpV6W3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-iccu.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-iccu.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ICCU - Central Institute for the Union Catalogue</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">ICCU - Istituto Centrale per il Catalogo Unico</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ICCU - Central Institute for the Union Catalogue</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">ICCU - Istituto Centrale per il Catalogo Unico</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iccu.sbn.it/opencms/opencms/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.iccu.sbn.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:ic-cu.idem@beniculturali.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml
deleted file mode 100644
index e7a4548d..00000000
--- a/swamid-interfederations-2.0/idp-iov.irccs.garr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-iov.irccs.garr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-30T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ioveneto.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Istituto Oncologico Veneto - IOV IRCCS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Istituto Oncologico Veneto - IOV IRCCS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider of Istituto Oncologico Veneto - IOV IRCCS</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider di Istituto Oncologico Veneto - IOV IRCCS</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idp-iov.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idp-iov.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-iov.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-iov.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-iov.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-iov.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.ioveneto.it/index.php?page=privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.ioveneto.it/index.php?page=privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAKZ6hm3VBBJOouu37feeqiHLQhlAMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFWlkcC1pb3YuaXJjY3MuZ2Fyci5pdDAeFw0xMzA3MjQx
-MzIzMzNaFw0zMzA3MjQxMzIzMzNaMCAxHjAcBgNVBAMTFWlkcC1pb3YuaXJjY3Mu
-Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1xUKxiZIEL
-P35mXSO10mng2aL/TVZJAj9Z3NfTq7SrfdfFnEWX/VT6or/p9s4RgUYOZosRfY98
-H8IpOuDfpiUWv0bQRUe+pjk6IPBTreQf6GwwqeojmpG2BLsllq8vvb0am0yl/rn6
-Uv9yCfsFAtIm3cmhHkS0AI8mOcsh+0BVT794pDz70W+o3DdiNF0Dp+VINpXXSUoE
-F72QcC9SkOVryiGjErJL97YzHGXRZmY1Rqqjf/jQFJovxvBh9ATBOF90ilHHKeR6
-y6Ey4vrXgez/WDWsHm0lS0S6LzuUf0keT3yoeFQgnCW/PTUqw/jv4/v1v+e2yBUz
-ugZCI9kqhqMCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLWlvdi5pcmNjcy5nYXJy
-Lml0hixodHRwczovL2lkcC1pb3YuaXJjY3MuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQU2lu3OlDrvKjMBNWa0xF78Dlx4TgwDQYJKoZIhvcNAQEFBQAD
-ggEBAFIYXX2LtDHTX+yX8plAqqgBuud3FGUa3id/jsnQ8ODoHRT31tbsfLkvXYjU
-H4JJaNVP563A0sEnPTzunIStxDwp8dAylqWNNspGRtN/a5YUx+psjp/05ishMwKE
-aIUFfOUa5DvEyGOLXp5jaSvcgUEMKWc8naSQ6JA0W9gQeaK+knz3ayK6TSzLFTAP
-Audn0iIIkzUxpLnNr8MZhRGXyX+zjsePxg4BfPtaLi0fA3aQg84Quf9E0mcnTcAo
-gd3FYweSWBnbIC1TQgBYoCexPPkeKLunXiZDnOV7JW4lysMfm87YERWJjjpJuqj6
-2V5Vl5f33hs+jOp95tFlpm+RzwU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-iov.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-iov.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-iov.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-iov.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-iov.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-iov.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ioveneto.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAKZ6hm3VBBJOouu37feeqiHLQhlAMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFWlkcC1pb3YuaXJjY3MuZ2Fyci5pdDAeFw0xMzA3MjQx
-MzIzMzNaFw0zMzA3MjQxMzIzMzNaMCAxHjAcBgNVBAMTFWlkcC1pb3YuaXJjY3Mu
-Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1xUKxiZIEL
-P35mXSO10mng2aL/TVZJAj9Z3NfTq7SrfdfFnEWX/VT6or/p9s4RgUYOZosRfY98
-H8IpOuDfpiUWv0bQRUe+pjk6IPBTreQf6GwwqeojmpG2BLsllq8vvb0am0yl/rn6
-Uv9yCfsFAtIm3cmhHkS0AI8mOcsh+0BVT794pDz70W+o3DdiNF0Dp+VINpXXSUoE
-F72QcC9SkOVryiGjErJL97YzHGXRZmY1Rqqjf/jQFJovxvBh9ATBOF90ilHHKeR6
-y6Ey4vrXgez/WDWsHm0lS0S6LzuUf0keT3yoeFQgnCW/PTUqw/jv4/v1v+e2yBUz
-ugZCI9kqhqMCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLWlvdi5pcmNjcy5nYXJy
-Lml0hixodHRwczovL2lkcC1pb3YuaXJjY3MuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQU2lu3OlDrvKjMBNWa0xF78Dlx4TgwDQYJKoZIhvcNAQEFBQAD
-ggEBAFIYXX2LtDHTX+yX8plAqqgBuud3FGUa3id/jsnQ8ODoHRT31tbsfLkvXYjU
-H4JJaNVP563A0sEnPTzunIStxDwp8dAylqWNNspGRtN/a5YUx+psjp/05ishMwKE
-aIUFfOUa5DvEyGOLXp5jaSvcgUEMKWc8naSQ6JA0W9gQeaK+knz3ayK6TSzLFTAP
-Audn0iIIkzUxpLnNr8MZhRGXyX+zjsePxg4BfPtaLi0fA3aQg84Quf9E0mcnTcAo
-gd3FYweSWBnbIC1TQgBYoCexPPkeKLunXiZDnOV7JW4lysMfm87YERWJjjpJuqj6
-2V5Vl5f33hs+jOp95tFlpm+RzwU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-iov.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-iov.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Istituto Oncologico Veneto - IOV IRCCS</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Istituto Oncologico Veneto - IOV IRCCS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Istituto Oncologico Veneto - IOV IRCCS</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Istituto Oncologico Veneto - IOV IRCCS</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ioveneto.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ioveneto.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Admin IdP IOV Veneto</md:GivenName>
-    <md:EmailAddress>mailto:idem@ioveneto.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml
deleted file mode 100644
index 215132e3..00000000
--- a/swamid-interfederations-2.0/idp-oasi.irccs.garr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-oasi.irccs.garr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-11-26T09:11:49Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oasi.en.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IRCCS Associazione Oasi Maria SS. Onlus</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IRCCS Associazione Oasi Maria SS. Onlus</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider of IRCCS Associazione Oasi Maria SS. Onlus</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider di IRCCS Associazione Oasi Maria SS. Onlus</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idp-oasi.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idp-oasi.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:Logo height="32" width="32" xml:lang="it">https://idp-oasi.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="32" width="32" xml:lang="en">https://idp-oasi.irccs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-oasi.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-oasi.irccs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.oasi.en.it/notelegali.asp?lingua=eng</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.oasi.en.it/notelegali.asp?lingua=ita</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAItYUuNAsLYinqdB4KXgk7MQhAUoMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFmlkcC1vYXNpLmlyY2NzLmdhcnIuaXQwHhcNMTQwNDA5
-MTQxMDI0WhcNMzQwNDA5MTQxMDI0WjAhMR8wHQYDVQQDExZpZHAtb2FzaS5pcmNj
-cy5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHli0IW5
-P2W6uTNhHtrV8Ovst07uI53ND6aPqY3cGdh7yE3o+LHZ/EUorhQV+VqvdF6Xc9ph
-H3y79BvN95CBuWORPETP4ykQI0oj7+X4h2bCkROtLb2/Uqvd0ezdsky/ib9KlPIB
-9ITaXYzvQFQhb2SL6k0IqFgK/V5F5TtcpbwcqdOze7sI6DFFRv5ILnHmoi1/zzig
-PJ3LbbGtmmDyScshtdmIEd576NJ2ZBVFKp3bNsJLlHU2QsEZ7CdhEl2pGX5pT5F9
-kwv7bpsjHfy8c/4Kd/MGQdNu0Ed+GH0mkwaUI1bM4ue6nle9RK+WpgRBafe1ateR
-WESnoVCkdRziZwIDAQABo3MwcTBQBgNVHREESTBHghZpZHAtb2FzaS5pcmNjcy5n
-YXJyLml0hi1odHRwczovL2lkcC1vYXNpLmlyY2NzLmdhcnIuaXQvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFG95nc5uYtIKO3eNZgvDoTbETHipMA0GCSqGSIb3DQEB
-BQUAA4IBAQB67cYPYRgCpIyYlTtnkX/2+85GueTDpk3dI048t8/nyyNugq/W8B4o
-SHjHtI9H1l7lTWtDFejySri3uBzL5Qe1xq6RkcxCuLwcNKPJAlTFadl3PTVDqD/s
-/EVEOXzkt5VTd6RT8h5ILl388vaImuaYxv3vBhYBJ7xAIfNznIiCSkpXsuFOswHn
-g8NZtk5jC9hKCG0MQPN4anGR8P07DelxBa1S15gDweHa3p6n2c83u8pbEmbODRP3
-NlHngiNNaUEs+F+l2daLy1p0uxYqAMp4Z6mgwqg7R6S0GRcH6GXaL2PnMNEvBbLF
-RJOqpoMO/5mjCebxoT9AWqFmjVIlFwkv
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-oasi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-oasi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-oasi.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-oasi.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-oasi.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-oasi.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oasi.en.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAItYUuNAsLYinqdB4KXgk7MQhAUoMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFmlkcC1vYXNpLmlyY2NzLmdhcnIuaXQwHhcNMTQwNDA5
-MTQxMDI0WhcNMzQwNDA5MTQxMDI0WjAhMR8wHQYDVQQDExZpZHAtb2FzaS5pcmNj
-cy5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHli0IW5
-P2W6uTNhHtrV8Ovst07uI53ND6aPqY3cGdh7yE3o+LHZ/EUorhQV+VqvdF6Xc9ph
-H3y79BvN95CBuWORPETP4ykQI0oj7+X4h2bCkROtLb2/Uqvd0ezdsky/ib9KlPIB
-9ITaXYzvQFQhb2SL6k0IqFgK/V5F5TtcpbwcqdOze7sI6DFFRv5ILnHmoi1/zzig
-PJ3LbbGtmmDyScshtdmIEd576NJ2ZBVFKp3bNsJLlHU2QsEZ7CdhEl2pGX5pT5F9
-kwv7bpsjHfy8c/4Kd/MGQdNu0Ed+GH0mkwaUI1bM4ue6nle9RK+WpgRBafe1ateR
-WESnoVCkdRziZwIDAQABo3MwcTBQBgNVHREESTBHghZpZHAtb2FzaS5pcmNjcy5n
-YXJyLml0hi1odHRwczovL2lkcC1vYXNpLmlyY2NzLmdhcnIuaXQvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFG95nc5uYtIKO3eNZgvDoTbETHipMA0GCSqGSIb3DQEB
-BQUAA4IBAQB67cYPYRgCpIyYlTtnkX/2+85GueTDpk3dI048t8/nyyNugq/W8B4o
-SHjHtI9H1l7lTWtDFejySri3uBzL5Qe1xq6RkcxCuLwcNKPJAlTFadl3PTVDqD/s
-/EVEOXzkt5VTd6RT8h5ILl388vaImuaYxv3vBhYBJ7xAIfNznIiCSkpXsuFOswHn
-g8NZtk5jC9hKCG0MQPN4anGR8P07DelxBa1S15gDweHa3p6n2c83u8pbEmbODRP3
-NlHngiNNaUEs+F+l2daLy1p0uxYqAMp4Z6mgwqg7R6S0GRcH6GXaL2PnMNEvBbLF
-RJOqpoMO/5mjCebxoT9AWqFmjVIlFwkv
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-oasi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-oasi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IRCCS Associazione Oasi Maria SS. Onlus</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IRCCS Associazione Oasi Maria SS. Onlus</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IRCCS Associazione Oasi Maria SS. Onlus</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">IRCCS Associazione Oasi Maria SS. Onlus</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.oasi.en.it/?lingua=eng</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.oasi.en.it/?lingua=ita</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idpcloud-service@oasi.en.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml
deleted file mode 100644
index fca12354..00000000
--- a/swamid-interfederations-2.0/idp-portici.izs.garr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-portici.izs.garr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-05-06T12:28:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izsmportici.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IZS del Mezzogiorno</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IZS del Mezzogiorno</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for IZS del Mezzogiorno users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell\"IZS del Mezzogiorno</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idp-portici.izs.garr.it/idp/Authn/UserPassword</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idp-portici.izs.garr.it/idp/Authn/UserPassword</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp-portici.izs.garr.it/idp/Authn/UserPassword</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idp-portici.izs.garr.it/idp/Authn/UserPassword</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-portici.izs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-portici.izs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-portici.izs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-portici.izs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRzCCAi+gAwIBAgIUcbihemtvbR0F1l3UeGO6+md4QscwDQYJKoZIhvcNAQEF
-BQAwIjEgMB4GA1UEAxMXaWRwLXBvcnRpY2kuaXpzLmdhcnIuaXQwHhcNMTUwNDE2
-MTQ0NDA4WhcNMzUwNDE2MTQ0NDA4WjAiMSAwHgYDVQQDExdpZHAtcG9ydGljaS5p
-enMuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIZfeg9L
-LhKfl539hiDSdSOl1f2W51YK467Y4xOTJ2FAkUWXrqmRUEV7sOuTk9hKhVdJOS7P
-2K9z9wqA0Bg0eXzdjgVwSJ+XlIRu4FzDqJwBY7/aB8P591GS3A21nfLyFsbqki1m
-chYtvUag45KK6A2lc8tnS+JdfflKUtbiMJcoTmJAa+2vO1pxzwv4Poc/C6/jjM6O
-O9+iVm7r6i5QEcfwki5JOfQbxey2PEuE3DduvvsfU43vojYBVKxLO5akHf/YNzfX
-Yt5es9NhuMEjZMsNUZZBNsLrbiw3NNG4au8pVRR1yNOdlgfNy99Ju1ST5SVcxbry
-I2CD3VX8JH87zF8CAwEAAaN1MHMwUgYDVR0RBEswSYIXaWRwLXBvcnRpY2kuaXpz
-LmdhcnIuaXSGLmh0dHBzOi8vaWRwLXBvcnRpY2kuaXpzLmdhcnIuaXQvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFNpqHerKcSzVvwBqzBiHeY5McINbMA0GCSqGSIb3
-DQEBBQUAA4IBAQANN3+3IkrDmDH9/N9s5+ChZwNansp1+dF0rJKnINE5nFKDIUbM
-FU1lSrCtWKzR66vk8/kVEG8ll2/6qtUrfyEmKA8sNlZj57yOqITCLzw6b8zBtXc7
-eOccyVeyIwfmBJEICY6X9PODKolq1pf8QKdxUwzgV/6YPLGdPS2Q7+NGSkF6ku1R
-QLhlUCOqabh4svEAremqhpa7r6+9MwlP26PDs9ehE2jTh759lg8tf19xxtFe7/vA
-f+/Pp4yPPKhWxwSKUI452MKUZf4J4KCW5p3mQ3Ba3cQjzryTL7yhbe74n2D4Z+eW
-sqq9jO4cSh8lUmsCNuyWD99IFy1Y7mSMt+L8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-portici.izs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-portici.izs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-portici.izs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-portici.izs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-portici.izs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-portici.izs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izsmportici.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRzCCAi+gAwIBAgIUcbihemtvbR0F1l3UeGO6+md4QscwDQYJKoZIhvcNAQEF
-BQAwIjEgMB4GA1UEAxMXaWRwLXBvcnRpY2kuaXpzLmdhcnIuaXQwHhcNMTUwNDE2
-MTQ0NDA4WhcNMzUwNDE2MTQ0NDA4WjAiMSAwHgYDVQQDExdpZHAtcG9ydGljaS5p
-enMuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIZfeg9L
-LhKfl539hiDSdSOl1f2W51YK467Y4xOTJ2FAkUWXrqmRUEV7sOuTk9hKhVdJOS7P
-2K9z9wqA0Bg0eXzdjgVwSJ+XlIRu4FzDqJwBY7/aB8P591GS3A21nfLyFsbqki1m
-chYtvUag45KK6A2lc8tnS+JdfflKUtbiMJcoTmJAa+2vO1pxzwv4Poc/C6/jjM6O
-O9+iVm7r6i5QEcfwki5JOfQbxey2PEuE3DduvvsfU43vojYBVKxLO5akHf/YNzfX
-Yt5es9NhuMEjZMsNUZZBNsLrbiw3NNG4au8pVRR1yNOdlgfNy99Ju1ST5SVcxbry
-I2CD3VX8JH87zF8CAwEAAaN1MHMwUgYDVR0RBEswSYIXaWRwLXBvcnRpY2kuaXpz
-LmdhcnIuaXSGLmh0dHBzOi8vaWRwLXBvcnRpY2kuaXpzLmdhcnIuaXQvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFNpqHerKcSzVvwBqzBiHeY5McINbMA0GCSqGSIb3
-DQEBBQUAA4IBAQANN3+3IkrDmDH9/N9s5+ChZwNansp1+dF0rJKnINE5nFKDIUbM
-FU1lSrCtWKzR66vk8/kVEG8ll2/6qtUrfyEmKA8sNlZj57yOqITCLzw6b8zBtXc7
-eOccyVeyIwfmBJEICY6X9PODKolq1pf8QKdxUwzgV/6YPLGdPS2Q7+NGSkF6ku1R
-QLhlUCOqabh4svEAremqhpa7r6+9MwlP26PDs9ehE2jTh759lg8tf19xxtFe7/vA
-f+/Pp4yPPKhWxwSKUI452MKUZf4J4KCW5p3mQ3Ba3cQjzryTL7yhbe74n2D4Z+eW
-sqq9jO4cSh8lUmsCNuyWD99IFy1Y7mSMt+L8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-portici.izs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-portici.izs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">IZS del Mezzogiorno</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">IZS del Mezzogiorno</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">IZS del Mezzogiorno</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">IZS del Mezzogiorno</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.izsmportici.it/portale/index.php</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.izsmportici.it/portale/index.php</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8678624f..00000000
--- a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-preprod.cardiff.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP (clustered with Terracotta 3.0) for Cardiff University.
-	-->
-  <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-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>
-      <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/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <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>Identity Management</GivenName>
-    <EmailAddress>mailto:idman@cardiff.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Philip </GivenName>
-    <SurName>Smart</SurName>
-    <EmailAddress>mailto:smartp@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 546b3910..00000000
--- a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-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"/>
-    <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.u-strasbg.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-preprod.u-strasbg.fr-idp-shibboleth.xml
deleted file mode 100644
index d66d0ba2..00000000
--- a/swamid-interfederations-2.0/idp-preprod.u-strasbg.fr-idp-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://idp-preprod.u-strasbg.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2010-11-29T23:54:59Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 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 - preprod</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>
-					      MIIDSzCCAjOgAwIBAgIULfcTXg+1f1A9POWPjeEqyjQ3YpMwDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwLXByZXByb2QudS1zdHJhc2JnLmZyMB4XDTEwMTIx
-MDE2MjQzN1oXDTMwMTIxMDE2MjQzN1owIzEhMB8GA1UEAxMYaWRwLXByZXByb2Qu
-dS1zdHJhc2JnLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk3R4
-f2lLgVgSq6induOx60M0LceabUqrowPsVZKz+A5Fbe9Cq5iYtcm0IU1NyZcRCFfr
-kdPmL1wFUKi8QTzUKOkcpb/ch0lQy7f/ROS0InnkEY2nyQgI8iI+pBuLMb83HQoU
-dljjTUIXIaK4vJw51EDnjrFoEuzn67+ij3wv/2mVXiw7jXp6cYxnBqN/RTH523wV
-blC47c8A/xy7i/dymS0wcCp3W9gTlsEpKqcI1Ts6bh6VRnlJJMwRKuuxlwDnWHst
-ErFMeSVTQIcQweqSkV8lIblFfuDHH4SEZ82g1HXEdU8GDqkTfuH5vBM+BpRuo7aA
-hBiWrew9/vuSAfcy/wIDAQABo3cwdTBUBgNVHREETTBLghhpZHAtcHJlcHJvZC51
-LXN0cmFzYmcuZnKGL2h0dHBzOi8vaWRwLXByZXByb2QudS1zdHJhc2JnLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDsaRU+tIpNjeoqPDvxX4tmVmLjDANBgkq
-hkiG9w0BAQUFAAOCAQEAaqBHu8f3XNFT4LDx/J8a1MOwHJUbUkfNX2kQTBdMVbL7
-dXOfJLYz5Q38RzSmfVZEz1qFwPIlngYZGOrV3ZutbR1T5vM1DoP/zkMeyDAVrzlt
-aqFQQfzaRwXBYBhSamZv8dZFsckqW6Zwbo0YDvpbjY9admBSlpHwPqLeSDBzb6CH
-BCUw7wra89o/o4LHUK4XPdhVRxI8rU4bqVa0XQ34SmeuV2IgZDyJhszh6iDyMDph
-ifnUGIAadjwrZWyJVniJuLuGPciUqWAKU4v8bx0qh2LBA4+aDhusFZiif4sUATvZ
-doL6Ha9LiNnIrmFxun4dtq9GN/WkCKTdQiojbiXNtg==
-					    </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-POST" Location="https://idp-preprod.u-strasbg.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-preprod.u-strasbg.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-preprod.u-strasbg.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Strasbourg - preprod</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Strasbourg - preprod</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean Benoit</md:SurName>
-    <md:EmailAddress>jean@unistra.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
deleted file mode 100644
index 79007840..00000000
--- a/swamid-interfederations-2.0/idp-prod.cc.ucf.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,144 +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://idp-prod.cc.ucf.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">ucf.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Central Florida</mdui:DisplayName>
-        <mdui:Logo height="75" width="150" xml:lang="en">https://idp-prod.cc.ucf.edu/idp/ucflogo.gif</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>
-MIIDODCCAiCgAwIBAgIVAMvE2hm/0pdXtouxqrRuMPJtXmUzMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC1wcm9kLmNjLnVjZi5lZHUwHhcNMTEwNTE5MjEx
-MDQzWhcNMzEwNTE5MjExMDQzWjAeMRwwGgYDVQQDExNpZHAtcHJvZC5jYy51Y2Yu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAghk3G4M/Iyq50iUv
-sL+m5QT24JkJOSJWEAXm1eEMeYoSsmHWxZhLeHDjUlP8THadLCn4+KO1tMdCuhw4
-5bC/jOqVPzXig10+KY79TuasbF9Dwa3EtW88Gt7FqrjXtQMZPfqJ/97EGZMPJF3f
-ZXDX06BQMypHFYBzuO234+w4IJzy97wnyTz0qpjq9Vc0MK1vX9D+3JyU2Vg7MPQ8
-/gMnoNM/prapBiUeG4Fi4tPwSwKCqgrrxWvHYA7CWS/y7hq8IvGf+vM6kYuEc1fa
-VuKOP7X+B2wlL8nx0VchLaLkGyu9HG69zL5RJlUGhwIu/+tXBBZvqhzisyir7Rvh
-T+FUPwIDAQABo20wazBKBgNVHREEQzBBghNpZHAtcHJvZC5jYy51Y2YuZWR1hipo
-dHRwczovL2lkcC1wcm9kLmNjLnVjZi5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFOKN9QfppJIne49jBCn+VTA6JxN0MA0GCSqGSIb3DQEBBQUAA4IBAQAerM6c
-ebboDhXRxJNQyrcrQT8ACDDdRTX3l+inDZZ7AdsywW/IKGLznA8756oGbG1vKhlw
-B31Mu6TmsMtpuC6ThikTzoqTqaoFIvEhEfeQgzXwkOrnXyx1TL1/I04JBHsPo2iO
-EfayKCmafksmUTzr1voSFmM9Bp2/S79jOX7zD+RsxLc/sc82b5B1Hx9VFSnVVZlp
-gQFQHIvnPTccKgoZts0CMVqPD2rzOuK2excw5D1s5hxIiZ5Bi6pG9FfYWybR2SQ8
-u9ZyOOyULacfY5dN4/BJ293av9Xmq7skS0DcikqAJ/ZQlEV/NDexFGpABUmfQo37
-0q3VVc70nXU1d7cV
-          </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>
-MIIFMjCCBBqgAwIBAgIQXAU976ByHakHmxGdYsAfRzANBgkqhkiG9w0BAQUFADBR
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNv
-bW1vbjEbMBkGA1UEAxMSSW5Db21tb24gU2VydmVyIENBMB4XDTExMDUwOTAwMDAw
-MFoXDTEyMDUwODIzNTk1OVowgaQxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJGTDEQ
-MA4GA1UEBxMHT3JsYW5kbzEmMCQGA1UEChMdVW5pdmVyc2l0eSBvZiBDZW50cmFs
-IEZsb3JpZGExGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRQwEgYDVQQLEwtQ
-bGF0aW51bVNTTDEcMBoGA1UEAxMTaWRwLXByb2QuY2MudWNmLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMysvlrvbtoZic5wpQSW2Er1CJivM4nA
-zRoKkRC4q/cGlfMTTCTF8b/yTT1ExlnN+cDhR9dyuDfMv+ghEE3K8RyoLokp0u76
-9SJyPSbRIlBiWgjzn3HweY+/Q8H0cNcnH+XvwlnhPAdJhcZAan5qq1/5mJqxLwYd
-sSbB4O8ZfY9jLSAY1s7eQJi33jR2Oge3onqSzAGRWH5YBrlMgZWXN31TnP8ZGwXq
-wy2iJjjCu97mzF0voxO48OkVfca2Bvvv/q+RPs4ZCfLqw8zQuBhiGzdaLiKT/PiU
-46Lf2RGZPAuqUjCVPVOfIoMDLk4SmmeNXHCBCrtlCt6zqOD5hcKG+WkCAwEAAaOC
-AbAwggGsMB8GA1UdIwQYMBaAFEhPWvovSppe4FDza3tVpd71vjRdMB0GA1UdDgQW
-BBSGN0T+h5IO7pQRbBcw/BnsGpYmazAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/
-BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwXQYDVR0gBFYwVDBS
-BgwrBgEEAa4jAQQDAQEwQjBABggrBgEFBQcCARY0aHR0cHM6Ly93d3cuaW5jb21t
-b24ub3JnL2NlcnQvcmVwb3NpdG9yeS9jcHNfc3NsLnBkZjA9BgNVHR8ENjA0MDKg
-MKAuhixodHRwOi8vY3JsLmluY29tbW9uLm9yZy9JbkNvbW1vblNlcnZlckNBLmNy
-bDBvBggrBgEFBQcBAQRjMGEwOQYIKwYBBQUHMAKGLWh0dHA6Ly9jZXJ0LmluY29t
-bW9uLm9yZy9JbkNvbW1vblNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDov
-L29jc3AuaW5jb21tb24ub3JnMB4GA1UdEQQXMBWCE2lkcC1wcm9kLmNjLnVjZi5l
-ZHUwDQYJKoZIhvcNAQEFBQADggEBADWsx84TkGK7p30UE7XJWuabbu+A0XIuBy/l
-kq3BfZ2tIQwiUmITq6DwPcI88JEA3HwHnxaS/fDs1rnl/SNR4VhdPibTCvhPZk7m
-IJ1r1GPZG4PoUvwZFOar+mPKw2SkeO9zOXNt0291HW/oRpt5EQ/iQZpnINmmsS1q
-tQ2H8SS7hUbzmD/NTO6cEsYjU1nxz28ibqYXxarPm52u4JsM6BTpoNT/Oghfs3gZ
-iQtMxythgcIG+srpD7je26DK05H3d4qgjOzNogepc0Z1rCUxc1xOP/5QdoJ7dOhK
-iVr4j+vsHmoBJB+J5VAC8/SAzG/s4VDMBZ2yqMvzeEXkmaOTrso=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-prod.cc.ucf.edu/idp/profile/Shibboleth/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-prod.cc.ucf.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucf.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAMvE2hm/0pdXtouxqrRuMPJtXmUzMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC1wcm9kLmNjLnVjZi5lZHUwHhcNMTEwNTE5MjEx
-MDQzWhcNMzEwNTE5MjExMDQzWjAeMRwwGgYDVQQDExNpZHAtcHJvZC5jYy51Y2Yu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAghk3G4M/Iyq50iUv
-sL+m5QT24JkJOSJWEAXm1eEMeYoSsmHWxZhLeHDjUlP8THadLCn4+KO1tMdCuhw4
-5bC/jOqVPzXig10+KY79TuasbF9Dwa3EtW88Gt7FqrjXtQMZPfqJ/97EGZMPJF3f
-ZXDX06BQMypHFYBzuO234+w4IJzy97wnyTz0qpjq9Vc0MK1vX9D+3JyU2Vg7MPQ8
-/gMnoNM/prapBiUeG4Fi4tPwSwKCqgrrxWvHYA7CWS/y7hq8IvGf+vM6kYuEc1fa
-VuKOP7X+B2wlL8nx0VchLaLkGyu9HG69zL5RJlUGhwIu/+tXBBZvqhzisyir7Rvh
-T+FUPwIDAQABo20wazBKBgNVHREEQzBBghNpZHAtcHJvZC5jYy51Y2YuZWR1hipo
-dHRwczovL2lkcC1wcm9kLmNjLnVjZi5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFOKN9QfppJIne49jBCn+VTA6JxN0MA0GCSqGSIb3DQEBBQUAA4IBAQAerM6c
-ebboDhXRxJNQyrcrQT8ACDDdRTX3l+inDZZ7AdsywW/IKGLznA8756oGbG1vKhlw
-B31Mu6TmsMtpuC6ThikTzoqTqaoFIvEhEfeQgzXwkOrnXyx1TL1/I04JBHsPo2iO
-EfayKCmafksmUTzr1voSFmM9Bp2/S79jOX7zD+RsxLc/sc82b5B1Hx9VFSnVVZlp
-gQFQHIvnPTccKgoZts0CMVqPD2rzOuK2excw5D1s5hxIiZ5Bi6pG9FfYWybR2SQ8
-u9ZyOOyULacfY5dN4/BJ293av9Xmq7skS0DcikqAJ/ZQlEV/NDexFGpABUmfQo37
-0q3VVc70nXU1d7cV
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-prod.cc.ucf.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Central Florida</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Central Florida</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucf.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tim Larson</md:GivenName>
-    <md:EmailAddress>tim@ucf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jim Ennis</md:GivenName>
-    <md:EmailAddress>jim@ucf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Laurence Siew</md:GivenName>
-    <md:EmailAddress>ls@ucf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Tim Larson</md:GivenName>
-    <md:EmailAddress>tim@ucf.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-renater.pulsalys.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-renater.pulsalys.fr-idp-shibboleth.xml
deleted file mode 100644
index c3c38be6..00000000
--- a/swamid-interfederations-2.0/idp-renater.pulsalys.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-renater.pulsalys.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-11T09:55:41Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pulsalys.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SATT Lyon Saint-Etienne</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADIGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjAgNjEuMTM0Nzc3LCAyMDEwLzAyLzEyLTE3OjMyOjAwICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MEZEREU2MTA0RTM3MTFFNEIyRDI5MjEwNTlDQTM3M0UiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MEZEREU2MTE0RTM3MTFFNEIyRDI5MjEwNTlDQTM3M0UiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowRkRERTYwRTRFMzcxMUU0QjJEMjkyMTA1OUNBMzczRSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowRkRERTYwRjRFMzcxMUU0QjJEMjkyMTA1OUNBMzczRSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgXnGU8AAAIpSURBVDhPpVM7aFRBFD133tvdty/uJpLE9RNJlhiQEFCipLHQwl8jWFsIKxYpUsQitYWFWNmkEEypFmktBD+FjYVYRJsUKoiCIoIm2ay7+37jue+9LGKIhR4Y7sydued+R5rzMxb/AZPLf4axUQgbBbDdNmWYKm0cwdok21ubntO93v8eL++M2VuHUz+CwqlLMMMHYdubcPaNQ4pl2CSmC0P9KGzQgTM6SbKcRIm7P2GKZxow+ycgfVX4C/cBv4LC2QZkaARgZGbwAIqnL8OufYU3uwjQSBnUuHTxGmsQxwhfPkT3wQ20F2dRmLkA29oA1LuC92B6KdrNTCoYiRmbUoIA7uQJFM9fhXflFqLXzwDXzV8Rkq8/4ZYQrTwhAXMRvz9No3PvOpIv7yG87EWQsJiyvVlSKiN8vkwCPg5XnqK7fBPx21eQcgW2+R2mOgTbaUEqg0xpvUdiwy4LmnfMcWCk5LHiHuD1QQr0zBU8uovy3B2448fgzy8heLxEPd84Ltzpc9DCa0ecieOQ1u2GjT+8IbeBSJasejAjh2FqdSSfVpF8+0itwDk0DcPumNoYotUXEHW6MXfUwin0jLeQDU2ePz2n+y2dLkMdTYy4xW3GCtFO8JG4JOcwSf8wi12l3ENC2uzazZSZ/k6fSafQDNTgTJ1E8vkd9yzq5g/IAAm0M4xKi7szgbaXVUbJzwzSSGiUDhNNGLnir99ZSXRO8lMuma5mnB6BX43W3MOLAiGEAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://satt.fr/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Users coming from Pulsalys (SATT Lyon Saint-Etienne)</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">SATT Lyon Saint-Etienne</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Utilisateurs en provenance de Pulsalys (SATT Lyon Saint-Etienne)</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>
-					      MIIDSDCCAjCgAwIBAgIVANyXdn2kcABS19rWW4TdzwbFNVoOMA0GCSqGSIb3DQEB
-CwUAMCIxIDAeBgNVBAMMF2lkcC1wdWxzYWx5cy5pbnRlZ3JhLmZyMB4XDTE2MDEx
-NDA4NDczMVoXDTM2MDExNDA4NDczMVowIjEgMB4GA1UEAwwXaWRwLXB1bHNhbHlz
-LmludGVncmEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUNlUc
-EsWHimFFQaK58li2WEZtg7/bsDtpgA8nRa/qCNqGwV/VK4dlv29FX4IN3hjSMQGd
-go22oFDOV0DhaB1F0Fvt9pUQIlEgYEPeA7Plh/iln5JMRGjEJG3nzOitZzbNPthk
-G1VgeGB1BQe7r84JWTHIuj8Uuwy/ToM988XI7fPRopjzpRgKtwCppo6m9xbht6u7
-SSCrbTDuhr7iExc7qZ58+uoY4J+PjUqWjalJRJLYG1VFzp/+Zg37z60fdwZaQo73
-Fwe59yqdBK4fBzdvRNr2NTGnxYD7CrF57HpHdhoZFOSb5QnWAzo/4Ewm3DhdNE2r
-tmCRbM8SVmXu6QiHAgMBAAGjdTBzMB0GA1UdDgQWBBS+p4mw5WqEadBYzFEoHB5l
-VmD8EzBSBgNVHREESzBJghdpZHAtcHVsc2FseXMuaW50ZWdyYS5mcoYuaHR0cHM6
-Ly9pZHAtcHVsc2FseXMuaW50ZWdyYS5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEATfJSpqrJQWwHx9NFVHUGmJpheGOP15N2r26oy9JGYv1y1zry
-NgU4jX4a3yjFUPnC2/R8Z1ceKTwhi0jTi0pwWHmUD0V/we+h5xoMRvVhKi60sA9v
-+prp3s5Vvf7DMPgHX/5Z/dOtsLcxcJ8d+nwVe6pFCfMsEHeVLmU5X+lo+WXs0DD3
-hJoLqJfPPGTTyE4tXJDJVOxN8Wa4TrtiHV9SKWV9Ely/QlNUxD/Q5Uw+S84nXGW9
-z61yeVT6XIKGKlhhCVZkkxWzU6qNfsVYg4VIFUeWmwmDK0moFxicPlzlnFs8mbzf
-PntJFpzykWk0h7PG5jwH+NLa0T+A/0P8bZuBzQ==
-					    </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-POST" Location="https://idp-renater.pulsalys.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-renater.pulsalys.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-renater.pulsalys.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SATT Lyon Saint-Etienne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SATT Lyon Saint-Etienne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://satt.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Julien Simbola</md:SurName>
-    <md:EmailAddress>jsimbola@integra.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-rt.ph-ludwigsburg.de.xml b/swamid-interfederations-2.0/idp-rt.ph-ludwigsburg.de.xml
deleted file mode 100644
index 62754f5c..00000000
--- a/swamid-interfederations-2.0/idp-rt.ph-ludwigsburg.de.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-rt.ph-ludwigsburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rt.ph-ludwigsburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp-rt.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp-rt.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIED0iGwDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIxNjE2MjIwOFoXDTE0MTIxNTE2MjIwOFow
-gaoxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xITAfBgNV
-BAMTGGlkcC1ydC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOlfVJ+BOPIIKrio5cCulc7caJyZUWo6iXnYqDsbi2lw5jaI
-2dKH70rjMDN6Kk920fLjSP9tDPxa2ZfxhV0WdwX+PzYIoOo6adlIpCbDqeUrHVCM
-tGOxl73SgFFgVcph8K+P26R9/cEfm3U/N0VGlKs4vYsM2P9q21P44UZ+/ibVM9Sd
-tO8oiFQR9o2YOju7ZMl2Dm7btVMXGBSSFJp/c98HoMEv9LzBbySp6DhU7TwWp7AW
-DHCXdddn3KxcXkAJfMceFYjsyqKJbbZsx6O1VDrQ+heACwimXQpJocBaIeKwkmJD
-wCCf82ZQzhmk1gR8CFbcMm3gHNfyrgkSC50GWukCAwEAAaOCAc8wggHLMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
-BBSrhDr6g21PRg8qbvxBPkSvgCvQhzAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//
-9+oAgoYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3Ni
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9waC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAPTYrn/qAq
-gho/Jcd9INy6tQKqgzvs+W0FI/+nL4RKA42fc9KPHloqHTuYTQY1MEmYFYNM6nH1
-RH3shMwaEs9NAaN0sXYa/q0J7LWvqgE9toBwc5HUqQZzUR+TitIm7rFRSNW1KuNs
-OFc7tpFCzqodRMnu798HOPMwybjPqPf1cPVV9w/DygqtMddw0Jju0T8Cgt952TdL
-1DKyrwmOqJDQ7I9UVwNnWL+Nd0o2rcAUW/fWeC8iso/eWB0h7oukxA21lY1wTsuJ
-zZeb6N6alXQu7akgdaddCkQ5UlAbVmdHjweHa0hdyBLTLxxUJvRpKyW2ZSfuy0Y7
-bbuICC2tb/mG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp-rt.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp-rt.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIED0iGwDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIxNjE2MjIwOFoXDTE0MTIxNTE2MjIwOFow
-gaoxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xITAfBgNV
-BAMTGGlkcC1ydC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOlfVJ+BOPIIKrio5cCulc7caJyZUWo6iXnYqDsbi2lw5jaI
-2dKH70rjMDN6Kk920fLjSP9tDPxa2ZfxhV0WdwX+PzYIoOo6adlIpCbDqeUrHVCM
-tGOxl73SgFFgVcph8K+P26R9/cEfm3U/N0VGlKs4vYsM2P9q21P44UZ+/ibVM9Sd
-tO8oiFQR9o2YOju7ZMl2Dm7btVMXGBSSFJp/c98HoMEv9LzBbySp6DhU7TwWp7AW
-DHCXdddn3KxcXkAJfMceFYjsyqKJbbZsx6O1VDrQ+heACwimXQpJocBaIeKwkmJD
-wCCf82ZQzhmk1gR8CFbcMm3gHNfyrgkSC50GWukCAwEAAaOCAc8wggHLMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
-BBSrhDr6g21PRg8qbvxBPkSvgCvQhzAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//
-9+oAgoYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3Ni
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9waC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAPTYrn/qAq
-gho/Jcd9INy6tQKqgzvs+W0FI/+nL4RKA42fc9KPHloqHTuYTQY1MEmYFYNM6nH1
-RH3shMwaEs9NAaN0sXYa/q0J7LWvqgE9toBwc5HUqQZzUR+TitIm7rFRSNW1KuNs
-OFc7tpFCzqodRMnu798HOPMwybjPqPf1cPVV9w/DygqtMddw0Jju0T8Cgt952TdL
-1DKyrwmOqJDQ7I9UVwNnWL+Nd0o2rcAUW/fWeC8iso/eWB0h7oukxA21lY1wTsuJ
-zZeb6N6alXQu7akgdaddCkQ5UlAbVmdHjweHa0hdyBLTLxxUJvRpKyW2ZSfuy0Y7
-bbuICC2tb/mG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-rt.ph-ludwigsburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-rt.ph-ludwigsburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-rt.ph-ludwigsburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-rt.ph-ludwigsburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-rt.ph-ludwigsburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-rt.ph-ludwigsburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rt.ph-ludwigsburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp-rt.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp-rt.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIED0iGwDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIxNjE2MjIwOFoXDTE0MTIxNTE2MjIwOFow
-gaoxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xITAfBgNV
-BAMTGGlkcC1ydC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOlfVJ+BOPIIKrio5cCulc7caJyZUWo6iXnYqDsbi2lw5jaI
-2dKH70rjMDN6Kk920fLjSP9tDPxa2ZfxhV0WdwX+PzYIoOo6adlIpCbDqeUrHVCM
-tGOxl73SgFFgVcph8K+P26R9/cEfm3U/N0VGlKs4vYsM2P9q21P44UZ+/ibVM9Sd
-tO8oiFQR9o2YOju7ZMl2Dm7btVMXGBSSFJp/c98HoMEv9LzBbySp6DhU7TwWp7AW
-DHCXdddn3KxcXkAJfMceFYjsyqKJbbZsx6O1VDrQ+heACwimXQpJocBaIeKwkmJD
-wCCf82ZQzhmk1gR8CFbcMm3gHNfyrgkSC50GWukCAwEAAaOCAc8wggHLMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
-BBSrhDr6g21PRg8qbvxBPkSvgCvQhzAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//
-9+oAgoYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3Ni
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9waC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAPTYrn/qAq
-gho/Jcd9INy6tQKqgzvs+W0FI/+nL4RKA42fc9KPHloqHTuYTQY1MEmYFYNM6nH1
-RH3shMwaEs9NAaN0sXYa/q0J7LWvqgE9toBwc5HUqQZzUR+TitIm7rFRSNW1KuNs
-OFc7tpFCzqodRMnu798HOPMwybjPqPf1cPVV9w/DygqtMddw0Jju0T8Cgt952TdL
-1DKyrwmOqJDQ7I9UVwNnWL+Nd0o2rcAUW/fWeC8iso/eWB0h7oukxA21lY1wTsuJ
-zZeb6N6alXQu7akgdaddCkQ5UlAbVmdHjweHa0hdyBLTLxxUJvRpKyW2ZSfuy0Y7
-bbuICC2tb/mG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp-rt.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp-rt.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1TCCBL2gAwIBAgIED0iGwDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIxNjE2MjIwOFoXDTE0MTIxNTE2MjIwOFow
-gaoxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xITAfBgNV
-BAMTGGlkcC1ydC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAOlfVJ+BOPIIKrio5cCulc7caJyZUWo6iXnYqDsbi2lw5jaI
-2dKH70rjMDN6Kk920fLjSP9tDPxa2ZfxhV0WdwX+PzYIoOo6adlIpCbDqeUrHVCM
-tGOxl73SgFFgVcph8K+P26R9/cEfm3U/N0VGlKs4vYsM2P9q21P44UZ+/ibVM9Sd
-tO8oiFQR9o2YOju7ZMl2Dm7btVMXGBSSFJp/c98HoMEv9LzBbySp6DhU7TwWp7AW
-DHCXdddn3KxcXkAJfMceFYjsyqKJbbZsx6O1VDrQ+heACwimXQpJocBaIeKwkmJD
-wCCf82ZQzhmk1gR8CFbcMm3gHNfyrgkSC50GWukCAwEAAaOCAc8wggHLMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
-BBSrhDr6g21PRg8qbvxBPkSvgCvQhzAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//
-9+oAgoYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3Ni
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9waC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAPTYrn/qAq
-gho/Jcd9INy6tQKqgzvs+W0FI/+nL4RKA42fc9KPHloqHTuYTQY1MEmYFYNM6nH1
-RH3shMwaEs9NAaN0sXYa/q0J7LWvqgE9toBwc5HUqQZzUR+TitIm7rFRSNW1KuNs
-OFc7tpFCzqodRMnu798HOPMwybjPqPf1cPVV9w/DygqtMddw0Jju0T8Cgt952TdL
-1DKyrwmOqJDQ7I9UVwNnWL+Nd0o2rcAUW/fWeC8iso/eWB0h7oukxA21lY1wTsuJ
-zZeb6N6alXQu7akgdaddCkQ5UlAbVmdHjweHa0hdyBLTLxxUJvRpKyW2ZSfuy0Y7
-bbuICC2tb/mG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-rt.ph-ludwigsburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-rt.ph-ludwigsburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">PH Ludwigsburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PH Ludwigsburg - Campus Reutlingen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-ludwigsburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Christoph</GivenName>
-    <SurName>List</SurName>
-    <EmailAddress>list@ph-ludwigsburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Eberhard</GivenName>
-    <SurName>Ostertag</SurName>
-    <EmailAddress>ostertag@ph-ludwigsburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml
deleted file mode 100644
index 8cab4816..00000000
--- a/swamid-interfederations-2.0/idp-sicilia.izs.garr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-sicilia.izs.garr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-01-31T10:02:41Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izssicilia.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IZS Sicilia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IZS Sicilia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Istituto Zooprofilattico Sperimentale della Sicilia users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Istituto Zooprofilattico Sperimentale della Sicilia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idp-sicilia.izs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idp-sicilia.izs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:Logo height="33" width="32" xml:lang="en">https://idp-sicilia.izs.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="164" width="160" xml:lang="en">https://idp-sicilia.izs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="33" width="32" xml:lang="it">https://idp-sicilia.izs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="164" width="160" xml:lang="it">https://idp-sicilia.izs.garr.it/idp/images/institutionLogo-160x120_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp-sicilia.izs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idp-sicilia.izs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAPEWcrJjf1McdVn5rw3nQ6Gim4w8MA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2lkcC1zaWNpbGlhLml6cy5nYXJyLml0MB4XDTE0MDIw
-NTE2MDMyM1oXDTM0MDIwNTE2MDMyM1owIjEgMB4GA1UEAxMXaWRwLXNpY2lsaWEu
-aXpzLmdhcnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCR9Z1x
-JehS/JqknbxipZrecsFTPiFxJGZ5dAXv2zhWd8Qfz8QICRird41HMbm7KJlXYcrM
-P2t/mDZppK0RK1rQFk22Jl4ao/yTH9MDMZbQk6PVjv7xFwTvH8xUYa23rjAfQwxE
-7Q50pZ9SAkMP1kcMeVO7stnHxto3gs0aZOAq9FeeX+oYzcMkplhlz/eejVeeCUPM
-EMgt4cE43lvz1FHzyYa0njwgQpPGZCOqsKmTdCOaYMUK6iiKrY3YwAsdya1sWLW0
-4SWr9Ag5r6tZ+pGJ7Yz2cCumzdvOQbQDjqBrQC26MYib+uRqG4SrpukB/AsyVoTZ
-l/bw/Wedcd4QRG53AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC1zaWNpbGlhLml6
-cy5nYXJyLml0hi5odHRwczovL2lkcC1zaWNpbGlhLml6cy5nYXJyLml0L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTM1pPjW1tY7OE5cQFT6Dhr7DPhJjANBgkqhkiG
-9w0BAQUFAAOCAQEAPElPerHGkqU6Gla03PS5WccIUazEgyiG3bhQTl1iGBEeo0Lx
-Zc9R7E5N+VX5UKIe2kkkAYXGdXBhgR8kLptTlbiS7ZdMm4g+iSnc4nrNw3BnXHog
-ConqGhfg/9loGA83A69/axkSZIyaKBCIMq+lhBcuSJ0ug26WSDU4ujh3rfabFpyg
-7EOla/1MHSnxaxtglWwyk2EsCcqRKeaZvqeC7zDICxjP510OHp9SksmAMMK7fopr
-poPD+5Yg0WJ+wYjoy4BNVeCpElAPujBOSpd47amEWkGr13k6vtIy+9WLFEIlmJKD
-DXuwjmwjokkHQaTBMi+WlFlUWfdpPOQVT9f/Iw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-sicilia.izs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-sicilia.izs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-sicilia.izs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-sicilia.izs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-sicilia.izs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-sicilia.izs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izssicilia.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAPEWcrJjf1McdVn5rw3nQ6Gim4w8MA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2lkcC1zaWNpbGlhLml6cy5nYXJyLml0MB4XDTE0MDIw
-NTE2MDMyM1oXDTM0MDIwNTE2MDMyM1owIjEgMB4GA1UEAxMXaWRwLXNpY2lsaWEu
-aXpzLmdhcnIuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCR9Z1x
-JehS/JqknbxipZrecsFTPiFxJGZ5dAXv2zhWd8Qfz8QICRird41HMbm7KJlXYcrM
-P2t/mDZppK0RK1rQFk22Jl4ao/yTH9MDMZbQk6PVjv7xFwTvH8xUYa23rjAfQwxE
-7Q50pZ9SAkMP1kcMeVO7stnHxto3gs0aZOAq9FeeX+oYzcMkplhlz/eejVeeCUPM
-EMgt4cE43lvz1FHzyYa0njwgQpPGZCOqsKmTdCOaYMUK6iiKrY3YwAsdya1sWLW0
-4SWr9Ag5r6tZ+pGJ7Yz2cCumzdvOQbQDjqBrQC26MYib+uRqG4SrpukB/AsyVoTZ
-l/bw/Wedcd4QRG53AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC1zaWNpbGlhLml6
-cy5nYXJyLml0hi5odHRwczovL2lkcC1zaWNpbGlhLml6cy5nYXJyLml0L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTM1pPjW1tY7OE5cQFT6Dhr7DPhJjANBgkqhkiG
-9w0BAQUFAAOCAQEAPElPerHGkqU6Gla03PS5WccIUazEgyiG3bhQTl1iGBEeo0Lx
-Zc9R7E5N+VX5UKIe2kkkAYXGdXBhgR8kLptTlbiS7ZdMm4g+iSnc4nrNw3BnXHog
-ConqGhfg/9loGA83A69/axkSZIyaKBCIMq+lhBcuSJ0ug26WSDU4ujh3rfabFpyg
-7EOla/1MHSnxaxtglWwyk2EsCcqRKeaZvqeC7zDICxjP510OHp9SksmAMMK7fopr
-poPD+5Yg0WJ+wYjoy4BNVeCpElAPujBOSpd47amEWkGr13k6vtIy+9WLFEIlmJKD
-DXuwjmwjokkHQaTBMi+WlFlUWfdpPOQVT9f/Iw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-sicilia.izs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-sicilia.izs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IZS Sicilia</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IZS Sicilia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IZS Sicilia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">IZS Sicilia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.izssicilia.it/idem/idem-info-en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.izssicilia.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f3e85b86..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-ssbar.beniculturali.garr.it/idp/shibboleth">
-  <md: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>
-  </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">archeoroma.beniculturali.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Soprintendenza Speciale per il Colosseo</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti della Soprintendenza Speciale per il Colosseo</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="32" width="32" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/institutionLogo-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="32" width="32" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/institutionLogo-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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-ssbar.beniculturali.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">archeoroma.beniculturali.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">SSCOL - Soprintendenza Speciale per il Colosseo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://archeoroma.beniculturali.it/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://archeoroma.beniculturali.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml
deleted file mode 100644
index 2ad85b7d..00000000
--- a/swamid-interfederations-2.0/idp-staf-prod.cineca.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,120 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-staf-prod.cineca.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-05-25T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cineca.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CINECA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">CINECA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for CINECA users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti CINECA</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cineca.it/content/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.cineca.it/content/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.cineca.it/content/idem</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.cineca.it/content/idem</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-is.cineca.it/idp/images/cineca-logo-16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-is.cineca.it/idp/images/cineca-logo-16.png</mdui:Logo>
-        <mdui:Logo height="60" width="60" xml:lang="en">https://idp-is.cineca.it/idp/images/cineca-logo-60.png</mdui:Logo>
-        <mdui:Logo height="60" width="60" xml:lang="it">https://idp-is.cineca.it/idp/images/cineca-logo-60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEezCCA2OgAwIBAgIQHvkLjPc6sKc/y3ML5fDtCjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDgyOTAwMDAwMFoXDTE2MDgyODIzNTk1OVowRTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExdpZHAtc3RhZi1w
-cm9kLmNpbmVjYS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1o
-S5a3gDgHXWvpiXSIMP27bxsuFk4+C1zWUAP1OA8ryPf4RI1PfWzqSCosY4BJv43a
-Oe3nvkKJ5bZN2bAD8+Swd87ErVglHIopx4eUdjDeKGl9QvOzWLVnbP7EWxQtr8UO
-4chaywyiixUSZ95yf2dY/5x3bhiong46mFPBj7aUYw5WBgPy9DgVYYF/i3DRSUMp
-mEtYFNGTOGRkqDosTN4zF+tksQUcOJGwZ+AYtb0tjgefPJ18wYi/UQWYaDgW9Tuv
-Fgw2BPn7iC7gj0cUgGrT8JtAH9wZsrUvJHSPGmnu2moKHrLFwol36wD/FxJPCbTo
-5T/+PXuSePY4/7j62MUCAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSZiwnGwfISVNpZA5rwwrXyP9a2azAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXaWRwLXN0YWYtcHJv
-ZC5jaW5lY2EuaXQwDQYJKoZIhvcNAQEFBQADggEBAAfichwgOLLw/LMdKky6/k9+
-szwlUqnZ9T7ReNXmK+csh2ZaXp3BTIDPsA6W51biiWvTT15jcIlsMKGPdQVIUfwQ
-s1Ad7XP/21AWj6PC7MuBxBxRdSjPp6/dg2dx7gNyR3o1H37MlueD6c2N0A6lGcxJ
-N26ippAsHEIFeKPqHFiWH+qaKdxLDN/rY86QSmJiv8k03qJc8kFE7mGL42ZPxmB2
-U4h397kwgoSX2U9JmMp9IMdhI3osgFEX02Hfjiqb31kjwF/H8jNIdSbkJvWOdGL+
-PXnuP6cpOu/jRJmIlE28j4zIeBBNNB86tTBwAVYaJSM4QdcGW9JaNO6WNZC7rUw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-is.cineca.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-is.cineca.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-is.cineca.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-is.cineca.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-is.cineca.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-is.cineca.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cineca.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEezCCA2OgAwIBAgIQHvkLjPc6sKc/y3ML5fDtCjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDgyOTAwMDAwMFoXDTE2MDgyODIzNTk1OVowRTEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExdpZHAtc3RhZi1w
-cm9kLmNpbmVjYS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1o
-S5a3gDgHXWvpiXSIMP27bxsuFk4+C1zWUAP1OA8ryPf4RI1PfWzqSCosY4BJv43a
-Oe3nvkKJ5bZN2bAD8+Swd87ErVglHIopx4eUdjDeKGl9QvOzWLVnbP7EWxQtr8UO
-4chaywyiixUSZ95yf2dY/5x3bhiong46mFPBj7aUYw5WBgPy9DgVYYF/i3DRSUMp
-mEtYFNGTOGRkqDosTN4zF+tksQUcOJGwZ+AYtb0tjgefPJ18wYi/UQWYaDgW9Tuv
-Fgw2BPn7iC7gj0cUgGrT8JtAH9wZsrUvJHSPGmnu2moKHrLFwol36wD/FxJPCbTo
-5T/+PXuSePY4/7j62MUCAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896r
-o0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSZiwnGwfISVNpZA5rwwrXyP9a2azAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFT
-U0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0
-LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0
-cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXaWRwLXN0YWYtcHJv
-ZC5jaW5lY2EuaXQwDQYJKoZIhvcNAQEFBQADggEBAAfichwgOLLw/LMdKky6/k9+
-szwlUqnZ9T7ReNXmK+csh2ZaXp3BTIDPsA6W51biiWvTT15jcIlsMKGPdQVIUfwQ
-s1Ad7XP/21AWj6PC7MuBxBxRdSjPp6/dg2dx7gNyR3o1H37MlueD6c2N0A6lGcxJ
-N26ippAsHEIFeKPqHFiWH+qaKdxLDN/rY86QSmJiv8k03qJc8kFE7mGL42ZPxmB2
-U4h397kwgoSX2U9JmMp9IMdhI3osgFEX02Hfjiqb31kjwF/H8jNIdSbkJvWOdGL+
-PXnuP6cpOu/jRJmIlE28j4zIeBBNNB86tTBwAVYaJSM4QdcGW9JaNO6WNZC7rUw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-is.cineca.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-is.cineca.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">CINECA</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CINECA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">CINECA Consorzio Interuniversitario</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CINECA Inter-University Consortium</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.cineca.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.cineca.it/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Tecnical Staff</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@cineca.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-staging.shibboleth.ox.ac.uk-shibboleth-idp.xml b/swamid-interfederations-2.0/idp-staging.shibboleth.ox.ac.uk-shibboleth-idp.xml
deleted file mode 100644
index 68d6b19c..00000000
--- a/swamid-interfederations-2.0/idp-staging.shibboleth.ox.ac.uk-shibboleth-idp.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-staging.shibboleth.ox.ac.uk/shibboleth-idp">
-  <!--
-		This is a Shibboleth IdP for the University of Oxford.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-20T09:42:30Z">
-      <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 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">ox.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlKgAwIBAgIVAIAtmK4I7O7bvf0RPA0ZNHo2hkSAMA0GCSqGSIb3DQEB
-						CwUAMCoxKDAmBgNVBAMMH2lkcC1zdGFnaW5nLnNoaWJib2xldGgub3guYWMudWsw
-						HhcNMTYwMTE0MTczMTAyWhcNMzYwMTE0MTczMTAyWjAqMSgwJgYDVQQDDB9pZHAt
-						c3RhZ2luZy5zaGliYm9sZXRoLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAlzER+bRzfZzTQ8dJKKfyBC6niOcIMI8fpEK3MDOFRaNjmrrm
-						ZShSh0ea/a0XcuK2KE1nJbqBdDYnLps120T/qCUd21dqL+z62HPMjSOddJvj5TNa
-						vylmkLQHNxhbzdqY6IghQWUIvbNKujQMe632ZIR3mx6t/yAXG9H4r1/0vzbcDGS+
-						qtGIgOlnxTxS8RFfw4dKV8FdaeljvlmL8nqHMhdmR7SEjnZ0m08v20kmKG6Siu2f
-						QD0/B3s23rz/M7e6z4mGc1OrSUzmuPZHnyY8A6eLZbYMbd7RCO34gs1TXVGTEY/t
-						AnfcZF3sqk1PPpVn4MQAJrcunx06TAzqlvhQTwIDAQABo4GGMIGDMB0GA1UdDgQW
-						BBSWC0uobK7TWktESwIkRr0J2+tltDBiBgNVHREEWzBZgh9pZHAtc3RhZ2luZy5z
-						aGliYm9sZXRoLm94LmFjLnVrhjZodHRwczovL2lkcC1zdGFnaW5nLnNoaWJib2xl
-						dGgub3guYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAD1u
-						AItT11Prv9vZFYJeLgaMKwcFifjuBgbTW1e/6Z56LtsnRCVYeoaAL0isxkNuRpLg
-						25aFKkN+iU1TIuD8Qd2j36EtVA8CqVH2iybnwLky2jWZh75dbYyOCvp0YUSCPBPJ
-						OIVmhxVH5trGgcn6mWvKBqlOwxRzPi5xPV/WzQvRwb18VMKPHTgfgVMO8By/dxYV
-						z7bXOSrQjLP60GNEg1ruVkYIMQCp2kAukFU61xmOhDX2u/2cUhOLchU6WGX2NkOV
-						sfemgQTqBY1Rk1/XM+fn4aKWfsbmvAJilAD46sUZtiBvUNlMLwAb9j49t0aITeNz
-						CjMKBIk+697oQF/5Zhw=
-					</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>
-						MIIDaDCCAlCgAwIBAgITekZgmzIaNoFuS/6wcr6UR9MwiDANBgkqhkiG9w0BAQsF
-						ADAqMSgwJgYDVQQDDB9pZHAtc3RhZ2luZy5zaGliYm9sZXRoLm94LmFjLnVrMB4X
-						DTE2MDExNDE3MzA1NFoXDTM2MDExNDE3MzA1NFowKjEoMCYGA1UEAwwfaWRwLXN0
-						YWdpbmcuc2hpYmJvbGV0aC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAI+WPG01l8PhqRj4EpKqLOCs5PIsWMhrjSEUtK7Q2TV5vbsmtEFm
-						yivfgB3ZQeUedxhMY5gD7wHbVzRf/bUmxz+I2orfOpBsaDxh6TH1J7NIbDXUyK+J
-						tF0jirsCWjYHZ1gGj/OshWjCQvWP4qX4e4pYmIdyTJJpIi2KIRwxh7KVAedFbdT+
-						dqgOnaygrjZ6jV49RyJ+FLUU1E+g61jL4bIl4fsipLm/zy4N6+qo85BV2JFLd/xU
-						LaTBO9IhxYxsU0Qo2GMzGD+XE2o5+w42QUfBYRd8xEVQkNbxTwxzTV+gcMpbfRys
-						YNCMmVmSb3zGMyZNUJOeatVYV04GAxcEcdUCAwEAAaOBhjCBgzAdBgNVHQ4EFgQU
-						4pAfbU3vAHNn9RLiF+8p5f8aEwkwYgYDVR0RBFswWYIfaWRwLXN0YWdpbmcuc2hp
-						YmJvbGV0aC5veC5hYy51a4Y2aHR0cHM6Ly9pZHAtc3RhZ2luZy5zaGliYm9sZXRo
-						Lm94LmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCFuOAP
-						a1jPW7sQIL536NCD9t/m3rBNk6xIIkgTDVbTOU/xpj6JsEOm3WiO/ukRPfDybYNJ
-						Q9rHqSvM6/IB/Ao0cdgnMbTf5yoYhBy7F5HXv7NXyYHZ/tTnIIr/fLZpzXnjb6PQ
-						LSJi70+wK0TdTLA5eHXW04h8h12Tt/aRHZ76rP+F/JykrLX2okgP1FQAc5JOYtDC
-						bQjgdqBZIu75bAIOOGPEHtwD9glkbpP3prJZo6Ib9kxXEA3C3FRgXSOL8bC18lx3
-						sqFWVybrxsBpkuXMazAh7vzbszSc5PRDllivVZCEVzzj3+uNR6s1GwBcDvOQzvJs
-						xMLJFJJld3a0yB22
-					</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>
-						MIIDajCCAlKgAwIBAgIVAPRlUe+MIjGNcHPwwfonzqdE0uphMA0GCSqGSIb3DQEB
-						CwUAMCoxKDAmBgNVBAMMH2lkcC1zdGFnaW5nLnNoaWJib2xldGgub3guYWMudWsw
-						HhcNMTYwMTE0MTczMDU0WhcNMzYwMTE0MTczMDU0WjAqMSgwJgYDVQQDDB9pZHAt
-						c3RhZ2luZy5zaGliYm9sZXRoLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAiLVYz2X2tTa7+ujJmdeI2Hg2hDmEejDV2MzXGJgVkyQ/mt08
-						8a2cEK+4SkSDSwYtQG1ru0yn5OjB38HTcFpUbxGpMl/1WOIPGxHYb55p+d0DR0q6
-						+08y1vlwT5h4RVFaFj+Tx0LmDcip5kxYzPkmItiunKsMOsxDgnuC1yFxT/UFors+
-						ZWsb8wkbk2OX0K3jHbD3Hbm7bqmKOIp5NsmZaSbXUOw3FIxnPZwX+oZLerU7LRgd
-						dHrLdtf8Q5FUCuVPESjTyGw/k62LlTJRcCUXrlJ3K2mZZET3M+Xl+B/jl4NVBp4v
-						NPmpKuRlwNejIKKHy0Cb5utpJCPg5JHVa6qESwIDAQABo4GGMIGDMB0GA1UdDgQW
-						BBQm5+FRSx0Sid4vbNqz8nzNjRLV3TBiBgNVHREEWzBZgh9pZHAtc3RhZ2luZy5z
-						aGliYm9sZXRoLm94LmFjLnVrhjZodHRwczovL2lkcC1zdGFnaW5nLnNoaWJib2xl
-						dGgub3guYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACPw
-						86BQmyOetDs77HbNi8ixLchm29yxdvpSTwJeyjtGo2y6puW0lZQm4P4hEQSHHnLj
-						wQpgq8XbQkep3ZOBObeVAbfrjSr0jL+ZCIogUveEpsIFwJRvamEZX679gzw0sRgK
-						C+CqY2raoShDE+tlrfjOTGEULJ3icNvrvy+babwlKQDKxUVu4mROwoet7tIe4jm6
-						VzgVIhY7jGZH59TvcN32ddAlYbzlqxbP+89yzOY4jUPDpUym41m1CUc2a4ne7e1u
-						lOakNEYy9WRL8/SBEMSQdlAs5vKh6nvlOdX9cYLGJEQ/BpRPB40O6eqbcFbIhJSk
-						Uf13ppG6F4RF0QOHD3Y=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-staging.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-staging.shibboleth.ox.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-staging.shibboleth.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-staging.shibboleth.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-staging.shibboleth.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-staging.shibboleth.ox.ac.uk/idp/profile/SAML2/Redirect/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">ox.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlKgAwIBAgIVAIAtmK4I7O7bvf0RPA0ZNHo2hkSAMA0GCSqGSIb3DQEB
-						CwUAMCoxKDAmBgNVBAMMH2lkcC1zdGFnaW5nLnNoaWJib2xldGgub3guYWMudWsw
-						HhcNMTYwMTE0MTczMTAyWhcNMzYwMTE0MTczMTAyWjAqMSgwJgYDVQQDDB9pZHAt
-						c3RhZ2luZy5zaGliYm9sZXRoLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAlzER+bRzfZzTQ8dJKKfyBC6niOcIMI8fpEK3MDOFRaNjmrrm
-						ZShSh0ea/a0XcuK2KE1nJbqBdDYnLps120T/qCUd21dqL+z62HPMjSOddJvj5TNa
-						vylmkLQHNxhbzdqY6IghQWUIvbNKujQMe632ZIR3mx6t/yAXG9H4r1/0vzbcDGS+
-						qtGIgOlnxTxS8RFfw4dKV8FdaeljvlmL8nqHMhdmR7SEjnZ0m08v20kmKG6Siu2f
-						QD0/B3s23rz/M7e6z4mGc1OrSUzmuPZHnyY8A6eLZbYMbd7RCO34gs1TXVGTEY/t
-						AnfcZF3sqk1PPpVn4MQAJrcunx06TAzqlvhQTwIDAQABo4GGMIGDMB0GA1UdDgQW
-						BBSWC0uobK7TWktESwIkRr0J2+tltDBiBgNVHREEWzBZgh9pZHAtc3RhZ2luZy5z
-						aGliYm9sZXRoLm94LmFjLnVrhjZodHRwczovL2lkcC1zdGFnaW5nLnNoaWJib2xl
-						dGgub3guYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAD1u
-						AItT11Prv9vZFYJeLgaMKwcFifjuBgbTW1e/6Z56LtsnRCVYeoaAL0isxkNuRpLg
-						25aFKkN+iU1TIuD8Qd2j36EtVA8CqVH2iybnwLky2jWZh75dbYyOCvp0YUSCPBPJ
-						OIVmhxVH5trGgcn6mWvKBqlOwxRzPi5xPV/WzQvRwb18VMKPHTgfgVMO8By/dxYV
-						z7bXOSrQjLP60GNEg1ruVkYIMQCp2kAukFU61xmOhDX2u/2cUhOLchU6WGX2NkOV
-						sfemgQTqBY1Rk1/XM+fn4aKWfsbmvAJilAD46sUZtiBvUNlMLwAb9j49t0aITeNz
-						CjMKBIk+697oQF/5Zhw=
-					</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>
-						MIIDaDCCAlCgAwIBAgITekZgmzIaNoFuS/6wcr6UR9MwiDANBgkqhkiG9w0BAQsF
-						ADAqMSgwJgYDVQQDDB9pZHAtc3RhZ2luZy5zaGliYm9sZXRoLm94LmFjLnVrMB4X
-						DTE2MDExNDE3MzA1NFoXDTM2MDExNDE3MzA1NFowKjEoMCYGA1UEAwwfaWRwLXN0
-						YWdpbmcuc2hpYmJvbGV0aC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAI+WPG01l8PhqRj4EpKqLOCs5PIsWMhrjSEUtK7Q2TV5vbsmtEFm
-						yivfgB3ZQeUedxhMY5gD7wHbVzRf/bUmxz+I2orfOpBsaDxh6TH1J7NIbDXUyK+J
-						tF0jirsCWjYHZ1gGj/OshWjCQvWP4qX4e4pYmIdyTJJpIi2KIRwxh7KVAedFbdT+
-						dqgOnaygrjZ6jV49RyJ+FLUU1E+g61jL4bIl4fsipLm/zy4N6+qo85BV2JFLd/xU
-						LaTBO9IhxYxsU0Qo2GMzGD+XE2o5+w42QUfBYRd8xEVQkNbxTwxzTV+gcMpbfRys
-						YNCMmVmSb3zGMyZNUJOeatVYV04GAxcEcdUCAwEAAaOBhjCBgzAdBgNVHQ4EFgQU
-						4pAfbU3vAHNn9RLiF+8p5f8aEwkwYgYDVR0RBFswWYIfaWRwLXN0YWdpbmcuc2hp
-						YmJvbGV0aC5veC5hYy51a4Y2aHR0cHM6Ly9pZHAtc3RhZ2luZy5zaGliYm9sZXRo
-						Lm94LmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCFuOAP
-						a1jPW7sQIL536NCD9t/m3rBNk6xIIkgTDVbTOU/xpj6JsEOm3WiO/ukRPfDybYNJ
-						Q9rHqSvM6/IB/Ao0cdgnMbTf5yoYhBy7F5HXv7NXyYHZ/tTnIIr/fLZpzXnjb6PQ
-						LSJi70+wK0TdTLA5eHXW04h8h12Tt/aRHZ76rP+F/JykrLX2okgP1FQAc5JOYtDC
-						bQjgdqBZIu75bAIOOGPEHtwD9glkbpP3prJZo6Ib9kxXEA3C3FRgXSOL8bC18lx3
-						sqFWVybrxsBpkuXMazAh7vzbszSc5PRDllivVZCEVzzj3+uNR6s1GwBcDvOQzvJs
-						xMLJFJJld3a0yB22
-					</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>
-						MIIDajCCAlKgAwIBAgIVAPRlUe+MIjGNcHPwwfonzqdE0uphMA0GCSqGSIb3DQEB
-						CwUAMCoxKDAmBgNVBAMMH2lkcC1zdGFnaW5nLnNoaWJib2xldGgub3guYWMudWsw
-						HhcNMTYwMTE0MTczMDU0WhcNMzYwMTE0MTczMDU0WjAqMSgwJgYDVQQDDB9pZHAt
-						c3RhZ2luZy5zaGliYm9sZXRoLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAiLVYz2X2tTa7+ujJmdeI2Hg2hDmEejDV2MzXGJgVkyQ/mt08
-						8a2cEK+4SkSDSwYtQG1ru0yn5OjB38HTcFpUbxGpMl/1WOIPGxHYb55p+d0DR0q6
-						+08y1vlwT5h4RVFaFj+Tx0LmDcip5kxYzPkmItiunKsMOsxDgnuC1yFxT/UFors+
-						ZWsb8wkbk2OX0K3jHbD3Hbm7bqmKOIp5NsmZaSbXUOw3FIxnPZwX+oZLerU7LRgd
-						dHrLdtf8Q5FUCuVPESjTyGw/k62LlTJRcCUXrlJ3K2mZZET3M+Xl+B/jl4NVBp4v
-						NPmpKuRlwNejIKKHy0Cb5utpJCPg5JHVa6qESwIDAQABo4GGMIGDMB0GA1UdDgQW
-						BBQm5+FRSx0Sid4vbNqz8nzNjRLV3TBiBgNVHREEWzBZgh9pZHAtc3RhZ2luZy5z
-						aGliYm9sZXRoLm94LmFjLnVrhjZodHRwczovL2lkcC1zdGFnaW5nLnNoaWJib2xl
-						dGgub3guYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACPw
-						86BQmyOetDs77HbNi8ixLchm29yxdvpSTwJeyjtGo2y6puW0lZQm4P4hEQSHHnLj
-						wQpgq8XbQkep3ZOBObeVAbfrjSr0jL+ZCIogUveEpsIFwJRvamEZX679gzw0sRgK
-						C+CqY2raoShDE+tlrfjOTGEULJ3icNvrvy+babwlKQDKxUVu4mROwoet7tIe4jm6
-						VzgVIhY7jGZH59TvcN32ddAlYbzlqxbP+89yzOY4jUPDpUym41m1CUc2a4ne7e1u
-						lOakNEYy9WRL8/SBEMSQdlAs5vKh6nvlOdX9cYLGJEQ/BpRPB40O6eqbcFbIhJSk
-						Uf13ppG6F4RF0QOHD3Y=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-staging.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Staging IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Identity and Access Management</GivenName>
-    <EmailAddress>mailto:iam@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Identity and Access Management</GivenName>
-    <EmailAddress>mailto:iam@it.ox.ac.uk</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 834498e2..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-stellamaris.irccs.garr.it/idp/shibboleth">
-  <md: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>
-  </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">irccs-stellamaris.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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/institutionLogo-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/institutionLogo-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/institutionLogo-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/institutionLogo-160x120_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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-stellamaris.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irccs-stellamaris.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.irccs-stellamaris.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.irccs-stellamaris.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>technical support</md:GivenName>
-    <md:EmailAddress>mailto:ced@irccs-stellamaris.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.brighton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp-test.brighton.ac.uk-shibboleth.xml
deleted file mode 100644
index fde56a7e..00000000
--- a/swamid-interfederations-2.0/idp-test.brighton.ac.uk-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" entityID="https://idp-test.brighton.ac.uk/shibboleth">
-  <!--
-		This is a "Test" Shibboleth IdP for the University of Brighton.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">brighton.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Brighton (Test)</mdui:DisplayName>
-        <mdui:Logo height="30" width="32">https://idp-test.brighton.ac.uk/idp/images/logo-brighton.ac.uk.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp-test.brighton.ac.uk/idp/images/favicon-brighton.ac.uk.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQjCCAiqgAwIBAgITX3a30d9XiqM9vVXseM3W2/n/pTANBgkqhkiG9w0BAQUF
-						ADAiMSAwHgYDVQQDExdpZHAtdGVzdC5icmlnaHRvbi5hYy51azAeFw0xMjAxMDQx
-						NjI4MDJaFw0zMjAxMDQxNjI4MDJaMCIxIDAeBgNVBAMTF2lkcC10ZXN0LmJyaWdo
-						dG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtXsLP8lj
-						TZBZq7GWtNTG8NKBOiJXmCUooceYKX8EyBa+XFgh5M9LrlmA0Tj4RisfUloypn6S
-						lYrBPa7CGk69QUvi9DMv2dNPnvM6KR86u9NRmmT0s8s+/KERqAMbiLMzqbHbfNIY
-						Y564ereP2g24Hfx9/nvOHcQvYIhtjel3T2ML1Zxbzluo9r37KGI4wb3Ci3KHXsNo
-						4FNpHSZXEDU9DpOsl5t5xbNymZEqMk4s7Gc7ZF0soK8I2jw4t/sCzx8gdBK1sDf5
-						psoZTwc8mpzxE/PeGvMv4h1/J20zX/3vqi7WWumFjV/kAsf4KzYmW1UIIYnmdRds
-						qD8YHc/XcePrkwIDAQABo3EwbzBOBgNVHREERzBFghdpZHAtdGVzdC5icmlnaHRv
-						bi5hYy51a4YqaHR0cHM6Ly9pZHAtdGVzdC5icmlnaHRvbi5hYy51ay9zaGliYm9s
-						ZXRoMB0GA1UdDgQWBBRqz9oLJ6hnTdKJOE6IPOMwqMqt8zANBgkqhkiG9w0BAQUF
-						AAOCAQEANMlzps/viJeW3tg2wYNqkesMZqlTALqLKIUtprj1KDDpeMk8gHPB7ToP
-						NlDa/raTGb5+zgQDQpBmnd/RfN4XpRQaNjXCFEG+3TUxLhhCik0uutmHC4cH7609
-						B8ZdsKsygm3s1Vwejw8itwnSER2nw7xsliE4WiG93fd6VW0DtYDGGLBnX506d/3U
-						vM+/JtaiL84GEjgw7jRMXaMEJofZIEUIjbYZgGdUvlqrvJBAzN71MB5Ry0Nr1qDq
-						TyUmU5tpQkbm7llvISEh/TfpYWyDpJohYPAT2BmH06biaAP0n+oXvHCpRwz4KSwI
-						ZGopIeez+JgQien0+2hmrAoCEBscww==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.brighton.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.brighton.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.brighton.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.brighton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.brighton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.brighton.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">brighton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQjCCAiqgAwIBAgITX3a30d9XiqM9vVXseM3W2/n/pTANBgkqhkiG9w0BAQUF
-						ADAiMSAwHgYDVQQDExdpZHAtdGVzdC5icmlnaHRvbi5hYy51azAeFw0xMjAxMDQx
-						NjI4MDJaFw0zMjAxMDQxNjI4MDJaMCIxIDAeBgNVBAMTF2lkcC10ZXN0LmJyaWdo
-						dG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtXsLP8lj
-						TZBZq7GWtNTG8NKBOiJXmCUooceYKX8EyBa+XFgh5M9LrlmA0Tj4RisfUloypn6S
-						lYrBPa7CGk69QUvi9DMv2dNPnvM6KR86u9NRmmT0s8s+/KERqAMbiLMzqbHbfNIY
-						Y564ereP2g24Hfx9/nvOHcQvYIhtjel3T2ML1Zxbzluo9r37KGI4wb3Ci3KHXsNo
-						4FNpHSZXEDU9DpOsl5t5xbNymZEqMk4s7Gc7ZF0soK8I2jw4t/sCzx8gdBK1sDf5
-						psoZTwc8mpzxE/PeGvMv4h1/J20zX/3vqi7WWumFjV/kAsf4KzYmW1UIIYnmdRds
-						qD8YHc/XcePrkwIDAQABo3EwbzBOBgNVHREERzBFghdpZHAtdGVzdC5icmlnaHRv
-						bi5hYy51a4YqaHR0cHM6Ly9pZHAtdGVzdC5icmlnaHRvbi5hYy51ay9zaGliYm9s
-						ZXRoMB0GA1UdDgQWBBRqz9oLJ6hnTdKJOE6IPOMwqMqt8zANBgkqhkiG9w0BAQUF
-						AAOCAQEANMlzps/viJeW3tg2wYNqkesMZqlTALqLKIUtprj1KDDpeMk8gHPB7ToP
-						NlDa/raTGb5+zgQDQpBmnd/RfN4XpRQaNjXCFEG+3TUxLhhCik0uutmHC4cH7609
-						B8ZdsKsygm3s1Vwejw8itwnSER2nw7xsliE4WiG93fd6VW0DtYDGGLBnX506d/3U
-						vM+/JtaiL84GEjgw7jRMXaMEJofZIEUIjbYZgGdUvlqrvJBAzN71MB5Ry0Nr1qDq
-						TyUmU5tpQkbm7llvISEh/TfpYWyDpJohYPAT2BmH06biaAP0n+oXvHCpRwz4KSwI
-						ZGopIeez+JgQien0+2hmrAoCEBscww==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.brighton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.brighton.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 Brighton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Brighton (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brighton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:servicedesk@brighton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Holden</SurName>
-    <EmailAddress>mailto:ukfederation-tech@brighton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.bsms.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp-test.bsms.ac.uk-shibboleth.xml
deleted file mode 100644
index d2c669be..00000000
--- a/swamid-interfederations-2.0/idp-test.bsms.ac.uk-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" entityID="https://idp-test.bsms.ac.uk/shibboleth">
-  <!--
-		This is a Test IdP for Brighton and Sussex Medical School (owned by the University of Brighton).
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">brighton.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Brighton and Sussex Medical School (Test)</mdui:DisplayName>
-        <mdui:Logo height="63" width="40">https://idp-test.bsms.ac.uk/idp/images/logo-bsms.ac.uk.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp-test.bsms.ac.uk/idp/images/favicon-bsms.ac.uk.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAMOvj1rjzW6b/X9XZ3j1EUBtCU2TMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE2lkcC10ZXN0LmJzbXMuYWMudWswHhcNMTIwMTA0MTYy
-						ODA5WhcNMzIwMTA0MTYyODA5WjAeMRwwGgYDVQQDExNpZHAtdGVzdC5ic21zLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxzsApSD1TEB3bPOk
-						+DTAPumCIRiZmHOncQ5ki6b/znHmtqsFWmfQp8lHBB7DNEUvhdLi7O/yRYKZe8Hj
-						evuPCTv4bHAejyME8XYyoQmHkVGfyOeT8xPSI1AIkV3R6lGEi7Xdi8M15M4PMJ/V
-						X+FoMACN/5z16y7ppoioCMnVPpmV/6QbzJSwYsVGUFPYvBxEpHVVVoShjgxVhAYL
-						pdFC+C9tdtpNpxLWYhF+n9Z7t6A7T6TfogFmXH7SFruwU7vVCp1/dMehg2TOppPi
-						9GouMfeFj44ijf/RViKwGZPNW6kE0/amfhslCfsv3/lq4YeI+JlNPMqmTXfoJUSu
-						mxGF8wIDAQABo2kwZzBGBgNVHREEPzA9ghNpZHAtdGVzdC5ic21zLmFjLnVrhiZo
-						dHRwczovL2lkcC10ZXN0LmJzbXMuYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						hqiSOiWevN21AzwBuYHdQSX/y5EwDQYJKoZIhvcNAQEFBQADggEBAFC5TWxPIPTm
-						/QVEjmIP6V0YmE7/uHDv+2xt8X6OC0uDndotIsQEmdpoK2DbdsQA+YrNDB2IrZpu
-						RqB+Cdfe9s5sDkoWzk5ID7Hv6PRMQCFs+Vdl0ab46Ru2+y+CbydcyMJVt2lg2olA
-						Ba60gQz6HR1eSBkTuCV8CkN+8rSFv+mkWkWHfmS3GZRLH81/YjCLdoU+LJvdjPZ8
-						s63TODIhTZQ5JqX4DDpP1ptSTuD2toVIgJbt5/0cixm4HDE79mgFYvq5praLbzXy
-						O57WM45US3pZcz15guQB57aIg2+BtLfebM+aNxsCMYVlt31goe51bqG2Y/jT6HnQ
-						YXhX6GjmeXs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.bsms.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.bsms.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.bsms.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.bsms.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.bsms.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.bsms.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">brighton.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAMOvj1rjzW6b/X9XZ3j1EUBtCU2TMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE2lkcC10ZXN0LmJzbXMuYWMudWswHhcNMTIwMTA0MTYy
-						ODA5WhcNMzIwMTA0MTYyODA5WjAeMRwwGgYDVQQDExNpZHAtdGVzdC5ic21zLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxzsApSD1TEB3bPOk
-						+DTAPumCIRiZmHOncQ5ki6b/znHmtqsFWmfQp8lHBB7DNEUvhdLi7O/yRYKZe8Hj
-						evuPCTv4bHAejyME8XYyoQmHkVGfyOeT8xPSI1AIkV3R6lGEi7Xdi8M15M4PMJ/V
-						X+FoMACN/5z16y7ppoioCMnVPpmV/6QbzJSwYsVGUFPYvBxEpHVVVoShjgxVhAYL
-						pdFC+C9tdtpNpxLWYhF+n9Z7t6A7T6TfogFmXH7SFruwU7vVCp1/dMehg2TOppPi
-						9GouMfeFj44ijf/RViKwGZPNW6kE0/amfhslCfsv3/lq4YeI+JlNPMqmTXfoJUSu
-						mxGF8wIDAQABo2kwZzBGBgNVHREEPzA9ghNpZHAtdGVzdC5ic21zLmFjLnVrhiZo
-						dHRwczovL2lkcC10ZXN0LmJzbXMuYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						hqiSOiWevN21AzwBuYHdQSX/y5EwDQYJKoZIhvcNAQEFBQADggEBAFC5TWxPIPTm
-						/QVEjmIP6V0YmE7/uHDv+2xt8X6OC0uDndotIsQEmdpoK2DbdsQA+YrNDB2IrZpu
-						RqB+Cdfe9s5sDkoWzk5ID7Hv6PRMQCFs+Vdl0ab46Ru2+y+CbydcyMJVt2lg2olA
-						Ba60gQz6HR1eSBkTuCV8CkN+8rSFv+mkWkWHfmS3GZRLH81/YjCLdoU+LJvdjPZ8
-						s63TODIhTZQ5JqX4DDpP1ptSTuD2toVIgJbt5/0cixm4HDE79mgFYvq5praLbzXy
-						O57WM45US3pZcz15guQB57aIg2+BtLfebM+aNxsCMYVlt31goe51bqG2Y/jT6HnQ
-						YXhX6GjmeXs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.bsms.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.bsms.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 Brighton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brighton and Sussex Medical School (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bsms.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:servicedesk@brighton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Holden</SurName>
-    <EmailAddress>mailto:ukfederation-tech@brighton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.essex.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.essex.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 23b63e71..00000000
--- a/swamid-interfederations-2.0/idp-test.essex.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-test.essex.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP for the University of Essex.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-03T15:04:21Z">
-      <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 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">essex.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Essex test IdP</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUc2qae097+pkdjp+uUEKBZzGqiSQwDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QuZXNzZXguYWMudWswHhcNMTUwNTE1MTAw
-						MzA3WhcNMzUwNTE1MTAwMzA3WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5lc3NleC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIyLl/oc4Xy4HOcG
-						eHwsRcgGzWFj9NK3V72WgWazSbE4AiLDqt02vaOBhclR8R1SegCrObOFj0b82sJN
-						5vjndItF3CP9I8rEaHV5AXUNfzgbzbSbUGCCAm56PCGjZJAqnIbzXww2VZy8Hrfi
-						igO1M7+6MJ+VlWSy8goKEjTTUxIP+lLKXBigLJ5TaEX7XjL82XwGP/dySlugbv+A
-						GvKl60o19R91RLXnW4JJxqwTtbcXsmCBt8+Y7u2ydLd0npSqVsuU83J4QDobqNd9
-						m63+dY8ZWIVT9dAhS/axohCnB1fLw6rAJVFv8dxUFwy9K1qmJNlmXeo8Wh5Ri1LC
-						X9TQUiUCAwEAAaNvMG0wHQYDVR0OBBYEFBiAv2kRo1+4l0cY7QOfqGKVib4FMEwG
-						A1UdEQRFMEOCFGlkcC10ZXN0LmVzc2V4LmFjLnVrhitodHRwczovL2lkcC10ZXN0
-						LmVzc2V4LmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA0
-						EQeoXFQ3WXuPikpsVSxUcQnUXSQq7vk189C5kLJaB6Cl1kBbBBhl0dshxTq6byGq
-						iX0ERW7Yu3aNi1cJTODsPj8DT7Z5zGOqhqET+YjpNrjrG9c4DTq8MPioyjaaeFnW
-						+yHoAfDCmD08B836EQ3FkoX6O7PwnERqacvTWlqkVVmrvIDQYkrgHMwIqC7qA7iW
-						kkf29rslAhqUpnm3ivN7MLRkUxcYUZSgClbCOKU8vv/kRcKNhdHq2s9iQQMJrBzL
-						XlioySiVaS8oqLO5edwzwVRYdnBcz0BLKLKmKIcIx06TBQ3mBp9rtmOGToAhS6X3
-						yGMY1s5np9J/xHxJjwaE
-					</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>
-						MIIDOzCCAiOgAwIBAgIULJr1XXhT+S3ey6YboSWZXF4zcoYwDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QuZXNzZXguYWMudWswHhcNMTUwNTE1MTAw
-						MzA1WhcNMzUwNTE1MTAwMzA1WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5lc3NleC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJEuHJm+QRG19FyF
-						g5TWqE8KHXqOU7jWgTS3N83Pf0FyMGOvXsxBqNZumsYRbSgMX9IaI8N/uQZc8N1w
-						WRefVBK4I5grCJGdVQVYfUa9ezNkV3CtbIkHavxcSYeSA+caWPDpTUliTmDhdDiP
-						V0b74WdDrs0a1HaHm7M7b5TFizx+zVQde6XweF/mYuMaanZWi2DULmOOvOj1j0Ep
-						Lb4NzXR4Atci0UwH1lY4zqmEC2cUMOlKJ9D3ofEXU+eISRUQEGAPw74avPONdKTh
-						ipStt/v0UvAuFVYQMm8oTxiwAFQ7fhDt0wQrCcHfH5nInUUE4oJPa7Lap7x56FGi
-						Eyl89GsCAwEAAaNvMG0wHQYDVR0OBBYEFLnNt2t9J3W56iiW3JuCujd/TLRpMEwG
-						A1UdEQRFMEOCFGlkcC10ZXN0LmVzc2V4LmFjLnVrhitodHRwczovL2lkcC10ZXN0
-						LmVzc2V4LmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBV
-						upSeT6edpnEJVB7ExAX3guINejlieUJJhiOGxaNzMKvII6znTDsRMauoVptgymGR
-						YeGee42mLF0T3sbejYr8gFo9r3jVrGwjdL4ITMEGp3olTUuqDBfqsqZKFlKhZHZj
-						gsci2Y24nD0Hv6YeZqVwitndQLtozwUSUyL2vU2xvF1L23sygV0FIoDT4lsRwNcI
-						pZGKEorIgOTjx7Bc+MANEZoLDZraFm0TOH6qv4zEUIETMbcVOIphIUyrxx5jVrKF
-						0VpLooL/mMU9VbJR6WT1+uX7uJ+3qLZhLYeV2Yjl4T2QkQUtziJfxdqXcu6fPycZ
-						GFtAhBQHvhlmPU7wzNwn
-					</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>
-						MIIDOzCCAiOgAwIBAgIUZozs58pLdQvrhtNplOVI0oAY+cYwDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QuZXNzZXguYWMudWswHhcNMTUwNTE1MTAw
-						MzA2WhcNMzUwNTE1MTAwMzA2WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5lc3NleC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1SMdXONgTIC6Xi
-						+OMn34w2H4HdvT2py71AYE8J5HEgXSv3ummvnLPT/oXose66nkef9/CVpsgChSYv
-						WvNc7zXpxcnAU9fHwqMxN+ztrmf3w1KvAQb6GTteXUR1lNljPubrV+95r5XbWl7C
-						dttSLoYe1gvqew1iw/x6Onm1HerShUlofucfjp9M9pUSMgS1ASX3kt7lOhgMpvRf
-						6HnMe3MpuPHms0F9fvJhJ0SC6c0a7XRCKa6lhC14Y8/mjVYSQBGKvtgZOHW7K4uB
-						XDn7uJon4+YA12LyuEP4gPytZVvju2u2jry45tBdBUGk8rUn5edlWXXFUsCGVRJn
-						r3xCnIkCAwEAAaNvMG0wHQYDVR0OBBYEFIVRQ4elcjZ6FYNL/Mvrq53zgdviMEwG
-						A1UdEQRFMEOCFGlkcC10ZXN0LmVzc2V4LmFjLnVrhitodHRwczovL2lkcC10ZXN0
-						LmVzc2V4LmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBp
-						CxluAdTD3wtu2ONWT8pQZHjW7XKLJadu3nVZ6+tpb0vBGUrIYoA2yw1a/qKaAa4Z
-						JYnoMLPHFA6y8b8YQfGh8RqsJf0ElUMr05SE+qXyqVbH+lX1u24RQPQ9oeECW65I
-						Qu+C/eVSsoS3Necoc7bdMD0tZ5G4+hKZb1HtVwOZjT+4e2pSV8jPc2gdaSfwlyu6
-						FQwQez6M2RAaQHCGGDUOU4ak6eDVAa0P1V1i8QWWBu14wVdDvVWle8+oFG6eDMP6
-						1oRl6W8FAYaIrGHdwkMNRDBKnbPub6Qm6TYbEN6CNRNm9yn8PWLSLSPukxZO9Syd
-						OHCALjxd0RBvEBzxEmDl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.essex.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.essex.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.essex.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.essex.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.essex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.essex.ac.uk/idp/profile/SAML2/Redirect/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">essex.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUc2qae097+pkdjp+uUEKBZzGqiSQwDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QuZXNzZXguYWMudWswHhcNMTUwNTE1MTAw
-						MzA3WhcNMzUwNTE1MTAwMzA3WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5lc3NleC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIyLl/oc4Xy4HOcG
-						eHwsRcgGzWFj9NK3V72WgWazSbE4AiLDqt02vaOBhclR8R1SegCrObOFj0b82sJN
-						5vjndItF3CP9I8rEaHV5AXUNfzgbzbSbUGCCAm56PCGjZJAqnIbzXww2VZy8Hrfi
-						igO1M7+6MJ+VlWSy8goKEjTTUxIP+lLKXBigLJ5TaEX7XjL82XwGP/dySlugbv+A
-						GvKl60o19R91RLXnW4JJxqwTtbcXsmCBt8+Y7u2ydLd0npSqVsuU83J4QDobqNd9
-						m63+dY8ZWIVT9dAhS/axohCnB1fLw6rAJVFv8dxUFwy9K1qmJNlmXeo8Wh5Ri1LC
-						X9TQUiUCAwEAAaNvMG0wHQYDVR0OBBYEFBiAv2kRo1+4l0cY7QOfqGKVib4FMEwG
-						A1UdEQRFMEOCFGlkcC10ZXN0LmVzc2V4LmFjLnVrhitodHRwczovL2lkcC10ZXN0
-						LmVzc2V4LmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA0
-						EQeoXFQ3WXuPikpsVSxUcQnUXSQq7vk189C5kLJaB6Cl1kBbBBhl0dshxTq6byGq
-						iX0ERW7Yu3aNi1cJTODsPj8DT7Z5zGOqhqET+YjpNrjrG9c4DTq8MPioyjaaeFnW
-						+yHoAfDCmD08B836EQ3FkoX6O7PwnERqacvTWlqkVVmrvIDQYkrgHMwIqC7qA7iW
-						kkf29rslAhqUpnm3ivN7MLRkUxcYUZSgClbCOKU8vv/kRcKNhdHq2s9iQQMJrBzL
-						XlioySiVaS8oqLO5edwzwVRYdnBcz0BLKLKmKIcIx06TBQ3mBp9rtmOGToAhS6X3
-						yGMY1s5np9J/xHxJjwaE
-					</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>
-						MIIDOzCCAiOgAwIBAgIULJr1XXhT+S3ey6YboSWZXF4zcoYwDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QuZXNzZXguYWMudWswHhcNMTUwNTE1MTAw
-						MzA1WhcNMzUwNTE1MTAwMzA1WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5lc3NleC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJEuHJm+QRG19FyF
-						g5TWqE8KHXqOU7jWgTS3N83Pf0FyMGOvXsxBqNZumsYRbSgMX9IaI8N/uQZc8N1w
-						WRefVBK4I5grCJGdVQVYfUa9ezNkV3CtbIkHavxcSYeSA+caWPDpTUliTmDhdDiP
-						V0b74WdDrs0a1HaHm7M7b5TFizx+zVQde6XweF/mYuMaanZWi2DULmOOvOj1j0Ep
-						Lb4NzXR4Atci0UwH1lY4zqmEC2cUMOlKJ9D3ofEXU+eISRUQEGAPw74avPONdKTh
-						ipStt/v0UvAuFVYQMm8oTxiwAFQ7fhDt0wQrCcHfH5nInUUE4oJPa7Lap7x56FGi
-						Eyl89GsCAwEAAaNvMG0wHQYDVR0OBBYEFLnNt2t9J3W56iiW3JuCujd/TLRpMEwG
-						A1UdEQRFMEOCFGlkcC10ZXN0LmVzc2V4LmFjLnVrhitodHRwczovL2lkcC10ZXN0
-						LmVzc2V4LmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBV
-						upSeT6edpnEJVB7ExAX3guINejlieUJJhiOGxaNzMKvII6znTDsRMauoVptgymGR
-						YeGee42mLF0T3sbejYr8gFo9r3jVrGwjdL4ITMEGp3olTUuqDBfqsqZKFlKhZHZj
-						gsci2Y24nD0Hv6YeZqVwitndQLtozwUSUyL2vU2xvF1L23sygV0FIoDT4lsRwNcI
-						pZGKEorIgOTjx7Bc+MANEZoLDZraFm0TOH6qv4zEUIETMbcVOIphIUyrxx5jVrKF
-						0VpLooL/mMU9VbJR6WT1+uX7uJ+3qLZhLYeV2Yjl4T2QkQUtziJfxdqXcu6fPycZ
-						GFtAhBQHvhlmPU7wzNwn
-					</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>
-						MIIDOzCCAiOgAwIBAgIUZozs58pLdQvrhtNplOVI0oAY+cYwDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QuZXNzZXguYWMudWswHhcNMTUwNTE1MTAw
-						MzA2WhcNMzUwNTE1MTAwMzA2WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5lc3NleC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1SMdXONgTIC6Xi
-						+OMn34w2H4HdvT2py71AYE8J5HEgXSv3ummvnLPT/oXose66nkef9/CVpsgChSYv
-						WvNc7zXpxcnAU9fHwqMxN+ztrmf3w1KvAQb6GTteXUR1lNljPubrV+95r5XbWl7C
-						dttSLoYe1gvqew1iw/x6Onm1HerShUlofucfjp9M9pUSMgS1ASX3kt7lOhgMpvRf
-						6HnMe3MpuPHms0F9fvJhJ0SC6c0a7XRCKa6lhC14Y8/mjVYSQBGKvtgZOHW7K4uB
-						XDn7uJon4+YA12LyuEP4gPytZVvju2u2jry45tBdBUGk8rUn5edlWXXFUsCGVRJn
-						r3xCnIkCAwEAAaNvMG0wHQYDVR0OBBYEFIVRQ4elcjZ6FYNL/Mvrq53zgdviMEwG
-						A1UdEQRFMEOCFGlkcC10ZXN0LmVzc2V4LmFjLnVrhitodHRwczovL2lkcC10ZXN0
-						LmVzc2V4LmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBp
-						CxluAdTD3wtu2ONWT8pQZHjW7XKLJadu3nVZ6+tpb0vBGUrIYoA2yw1a/qKaAa4Z
-						JYnoMLPHFA6y8b8YQfGh8RqsJf0ElUMr05SE+qXyqVbH+lX1u24RQPQ9oeECW65I
-						Qu+C/eVSsoS3Necoc7bdMD0tZ5G4+hKZb1HtVwOZjT+4e2pSV8jPc2gdaSfwlyu6
-						FQwQez6M2RAaQHCGGDUOU4ak6eDVAa0P1V1i8QWWBu14wVdDvVWle8+oFG6eDMP6
-						1oRl6W8FAYaIrGHdwkMNRDBKnbPub6Qm6TYbEN6CNRNm9yn8PWLSLSPukxZO9Syd
-						OHCALjxd0RBvEBzxEmDl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.essex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Essex</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Essex test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.essex.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alexis</GivenName>
-    <SurName>Wolton</SurName>
-    <EmailAddress>mailto:awolton@essex.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alexis</GivenName>
-    <SurName>Wolton</SurName>
-    <EmailAddress>mailto:awolton@essex.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.lancs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.lancs.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index a286e5f5..00000000
--- a/swamid-interfederations-2.0/idp-test.lancs.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-test.lancs.ac.uk/idp/shibboleth">
-  <!--
-		This is a 'Test IdP' Shibboleth IdP for the University of Lancaster.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-06T09:32:03Z">
-      <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">lancaster.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUYU6NkvsQbpPZ0YcuNXj04ufIkuUwDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUaWRwLXRlc3QubGFuY3MuYWMudWswHhcNMTMwMjIyMTA0
-						MDQ5WhcNMzMwMjIyMTA0MDQ5WjAfMR0wGwYDVQQDExRpZHAtdGVzdC5sYW5jcy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIYOZJi8AQIEug05
-						w+DVk2VhVCZJU2o4JVj70tGyXnj1CEMAwZGjFKmPTX8YtDv3e4eHwjk2AgX3rcKy
-						Ohr5sD0vaAdHdY51aq2P8QQ+8zTZSP4CNML2fMtrbCNzDj+L/KPA9Tnm3iXStDqd
-						bKiEn7Sc+DgPKPe4o3oz00pymHGMuL2MHMnCUqyOE+vtF6YQzAFei81IUCVeiF/p
-						jtKqtDvTHST4LNcSslqDaVA90zRv/QynXaUnsr6WYwEoBefGBzSBWpn6rYG6jFgu
-						T6stqf0q3CpziDw6cxKrnl6HR9bRDFnYFElg0/g8Al7jcPB/lAkLmGU3GILG8mcq
-						dax/4YsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLXRlc3QubGFuY3MuYWMudWuG
-						K2h0dHBzOi8vaWRwLXRlc3QubGFuY3MuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFOcwlLDv1eWSzgWtwDtw8slIuiKQMA0GCSqGSIb3DQEBBQUAA4IBAQAB
-						C0NMk4y8FnYX9JrWYhp8XQcPc/q0ezkF3w3gUtHNEVllAmUSiNaGapkJcufMMNtk
-						eM1za6BnrhPrNeXJlOzc8P6ZyT8HSOPx/oIoKY+UuLyAfLk0FZM3KkHobSiLO+K6
-						4B7u30Q93XTgelXKnViqTC1XW/QptiH2n3uyBh1ojrrkUTqZZDLit+54JZpG6qVo
-						cxQedBTTZehgVYUnS3FidiJwSg+aUQUf0ubVzooYOkhCtr+C9C8W8dxj1O4Tj+68
-						6DVOmoLSq0nR7CUO5lFWaSTpD0w/xOBwVYMAZGlUJH5fnF5qyisYIKNYAgBtPMYO
-						paN4cH6RgjoaIKmzc9qC
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.lancs.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.lancs.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.lancs.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.lancs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.lancs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.lancs.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">lancaster.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUYU6NkvsQbpPZ0YcuNXj04ufIkuUwDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUaWRwLXRlc3QubGFuY3MuYWMudWswHhcNMTMwMjIyMTA0
-						MDQ5WhcNMzMwMjIyMTA0MDQ5WjAfMR0wGwYDVQQDExRpZHAtdGVzdC5sYW5jcy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIYOZJi8AQIEug05
-						w+DVk2VhVCZJU2o4JVj70tGyXnj1CEMAwZGjFKmPTX8YtDv3e4eHwjk2AgX3rcKy
-						Ohr5sD0vaAdHdY51aq2P8QQ+8zTZSP4CNML2fMtrbCNzDj+L/KPA9Tnm3iXStDqd
-						bKiEn7Sc+DgPKPe4o3oz00pymHGMuL2MHMnCUqyOE+vtF6YQzAFei81IUCVeiF/p
-						jtKqtDvTHST4LNcSslqDaVA90zRv/QynXaUnsr6WYwEoBefGBzSBWpn6rYG6jFgu
-						T6stqf0q3CpziDw6cxKrnl6HR9bRDFnYFElg0/g8Al7jcPB/lAkLmGU3GILG8mcq
-						dax/4YsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLXRlc3QubGFuY3MuYWMudWuG
-						K2h0dHBzOi8vaWRwLXRlc3QubGFuY3MuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFOcwlLDv1eWSzgWtwDtw8slIuiKQMA0GCSqGSIb3DQEBBQUAA4IBAQAB
-						C0NMk4y8FnYX9JrWYhp8XQcPc/q0ezkF3w3gUtHNEVllAmUSiNaGapkJcufMMNtk
-						eM1za6BnrhPrNeXJlOzc8P6ZyT8HSOPx/oIoKY+UuLyAfLk0FZM3KkHobSiLO+K6
-						4B7u30Q93XTgelXKnViqTC1XW/QptiH2n3uyBh1ojrrkUTqZZDLit+54JZpG6qVo
-						cxQedBTTZehgVYUnS3FidiJwSg+aUQUf0ubVzooYOkhCtr+C9C8W8dxj1O4Tj+68
-						6DVOmoLSq0nR7CUO5lFWaSTpD0w/xOBwVYMAZGlUJH5fnF5qyisYIKNYAgBtPMYO
-						paN4cH6RgjoaIKmzc9qC
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.lancs.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 Lancaster</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lancaster University (Test IdP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lancaster.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ISS Service Desk</GivenName>
-    <EmailAddress>mailto:iss-service-desk@lancaster.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Bennett</SurName>
-    <EmailAddress>mailto:S.Bennett@lancaster.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.llgc.org.uk-idp-shibboleth.xml
deleted file mode 100644
index 75710243..00000000
--- a/swamid-interfederations-2.0/idp-test.llgc.org.uk-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-test.llgc.org.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the National Library of Wales.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-11T09:38:34Z">
-      <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">llgc.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUf+ROdABvulYM0eBNBrr08C6TvOswDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMB4XDTE1MDUwNTEwNDI1NFoX
-						DTM1MDUwNTEwNDI1NFowGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIPzF237qyE3Px+37CeRobRfkDWI
-						PvHdJlD5nJkW8U+PTWnJ8At4PXC3gqV80EjSQHIFcyXkO261EHlA8SNWEcHRgpCj
-						viziINYRCPAzdtGmx75iqiFVwEskj1PODD4NjHRdCs4F3QQxmLZxlT2e2qufzuLm
-						0xcW7sopBpni3DOSLhy4EmaVXOe2WJFSWpLeAJYqBykWp53M2yfa7YM9i0DYiGee
-						sKFdTmP6N650488Aolw9PbECYZfVeqEhT5GbOZMZyE0Uhorjf3zvEGG8nPwEmF5x
-						hdx8dwUpnEByoLYZ1dz+S6TfKsckFxLpCk+AbFSTFTcqazUK3WO3aBzXUwIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg9pZHAubGxnYy5vcmcudWuGJmh0dHBzOi8vaWRwLmxs
-						Z2Mub3JnLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQxx9cjObvnnBMR+VUm
-						LHVQdWfcUzANBgkqhkiG9w0BAQUFAAOCAQEAisO2C392/EeLBOD69GQ/4Xu7W9IQ
-						OdTV18rWXJVEPYDP7YmrcSk818fRVqK/jmxPtD6ue11ahS4ANoWYfL961uerYBy3
-						dH9DaLES8Z1q0Ph/9FaCToX54Qf3QZjeC+Z2cJxdU3GKW+jcAC2MA6xn8EZrav6o
-						wOtPF5sGumbFgmTsexNsy1yuavRO5Ss4L0PW6QaqZOnf6/qE84KxVz17F6liGtO5
-						jTr3pKI/A3iBWZt2V88lvRAxEQET8C6M9GnrRkSuLQUs6GWDbXKZHZPIs/qCvPG9
-						ZKiIFQhzp7jfUxRJaFznq0Ysg4Ftq0JIV+j8n7+JE4dO9Dp4c/rj6uzjDQ==
-					</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>
-						MIIDOzCCAiOgAwIBAgIUNwI1rG1GW4KhaBBV9eamjmqtA/0wDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QubGxnYy5vcmcudWswHhcNMTUwOTEwMDg1
-						MTM4WhcNMzUwOTEwMDg1MTM4WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5sbGdjLm9y
-						Zy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIdiMUrH+n6Gkn5K
-						GmJgtKy8BeJ5Ome3Y5eS3YrdBAyIR0mFjelwuWbZdpByD4zaqbqVuKUTNJslPb5g
-						YeagrhGCoGr6WgRHGUN7+MDPLrRHbl5NPqXXkjEZyDbEle6phlItK4JyR5X3DUWo
-						08aYz01nVg+O+ausLEgCmP4bPDm/x5yNCjqg+jyxogwoIevhIqg3ZvYSZeCqmu3Z
-						K5O1RAofCbyMc7qambuNelfO/wgwv/MHIb/k0eMhzfr4JbDcCmO1uhx4XkVvPuRS
-						JnSDt24Ys3ByrRWUl3k8XygPoF9wuCzbmhGX5uWobvPXn0AojqoEyssFhkAUynSJ
-						NQ01n/ECAwEAAaNvMG0wHQYDVR0OBBYEFOnOx26moRMowzyEmzizjCcXEN4QMEwG
-						A1UdEQRFMEOCFGlkcC10ZXN0LmxsZ2Mub3JnLnVrhitodHRwczovL2lkcC10ZXN0
-						LmxsZ2Mub3JnLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQBc
-						hz3TSLkztcI4fo7D0ZSrcQctBRQQ49uGPHJmkU/3O6ru32J3ooEnSV5MgEucE8k7
-						obdn9Iwx9UpROdsy6FlUFwNKsoBvt6X0xh+5vz7TqnZIZKV7YMmeaBsrml7qxVcJ
-						HDCFGJcnCNPjfZhq/Ebm9yjiFiWa+/0G137i454wxSO0VWjBG/AKXh+Q7rWYiizl
-						b43VJAwhfMV+EirlWbSK8tDyUfEPPI8gmpaNFAz4GohZKHHaBfPoQmfVFXEvaaVJ
-						0UUjKXItpyV5GmOLloJRLKdTLV00sxDAlcqNaY5pJQb1AUwlc3yqhB6vT7I0jSh+
-						b2ksiYiK8n1E6BC6oG2v
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.llgc.org.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-test.llgc.org.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.llgc.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.llgc.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">llgc.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUf+ROdABvulYM0eBNBrr08C6TvOswDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMB4XDTE1MDUwNTEwNDI1NFoX
-						DTM1MDUwNTEwNDI1NFowGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIPzF237qyE3Px+37CeRobRfkDWI
-						PvHdJlD5nJkW8U+PTWnJ8At4PXC3gqV80EjSQHIFcyXkO261EHlA8SNWEcHRgpCj
-						viziINYRCPAzdtGmx75iqiFVwEskj1PODD4NjHRdCs4F3QQxmLZxlT2e2qufzuLm
-						0xcW7sopBpni3DOSLhy4EmaVXOe2WJFSWpLeAJYqBykWp53M2yfa7YM9i0DYiGee
-						sKFdTmP6N650488Aolw9PbECYZfVeqEhT5GbOZMZyE0Uhorjf3zvEGG8nPwEmF5x
-						hdx8dwUpnEByoLYZ1dz+S6TfKsckFxLpCk+AbFSTFTcqazUK3WO3aBzXUwIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg9pZHAubGxnYy5vcmcudWuGJmh0dHBzOi8vaWRwLmxs
-						Z2Mub3JnLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQxx9cjObvnnBMR+VUm
-						LHVQdWfcUzANBgkqhkiG9w0BAQUFAAOCAQEAisO2C392/EeLBOD69GQ/4Xu7W9IQ
-						OdTV18rWXJVEPYDP7YmrcSk818fRVqK/jmxPtD6ue11ahS4ANoWYfL961uerYBy3
-						dH9DaLES8Z1q0Ph/9FaCToX54Qf3QZjeC+Z2cJxdU3GKW+jcAC2MA6xn8EZrav6o
-						wOtPF5sGumbFgmTsexNsy1yuavRO5Ss4L0PW6QaqZOnf6/qE84KxVz17F6liGtO5
-						jTr3pKI/A3iBWZt2V88lvRAxEQET8C6M9GnrRkSuLQUs6GWDbXKZHZPIs/qCvPG9
-						ZKiIFQhzp7jfUxRJaFznq0Ysg4Ftq0JIV+j8n7+JE4dO9Dp4c/rj6uzjDQ==
-					</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>
-						MIIDOzCCAiOgAwIBAgIUNwI1rG1GW4KhaBBV9eamjmqtA/0wDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAwwUaWRwLXRlc3QubGxnYy5vcmcudWswHhcNMTUwOTEwMDg1
-						MTM4WhcNMzUwOTEwMDg1MTM4WjAfMR0wGwYDVQQDDBRpZHAtdGVzdC5sbGdjLm9y
-						Zy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIdiMUrH+n6Gkn5K
-						GmJgtKy8BeJ5Ome3Y5eS3YrdBAyIR0mFjelwuWbZdpByD4zaqbqVuKUTNJslPb5g
-						YeagrhGCoGr6WgRHGUN7+MDPLrRHbl5NPqXXkjEZyDbEle6phlItK4JyR5X3DUWo
-						08aYz01nVg+O+ausLEgCmP4bPDm/x5yNCjqg+jyxogwoIevhIqg3ZvYSZeCqmu3Z
-						K5O1RAofCbyMc7qambuNelfO/wgwv/MHIb/k0eMhzfr4JbDcCmO1uhx4XkVvPuRS
-						JnSDt24Ys3ByrRWUl3k8XygPoF9wuCzbmhGX5uWobvPXn0AojqoEyssFhkAUynSJ
-						NQ01n/ECAwEAAaNvMG0wHQYDVR0OBBYEFOnOx26moRMowzyEmzizjCcXEN4QMEwG
-						A1UdEQRFMEOCFGlkcC10ZXN0LmxsZ2Mub3JnLnVrhitodHRwczovL2lkcC10ZXN0
-						LmxsZ2Mub3JnLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQBc
-						hz3TSLkztcI4fo7D0ZSrcQctBRQQ49uGPHJmkU/3O6ru32J3ooEnSV5MgEucE8k7
-						obdn9Iwx9UpROdsy6FlUFwNKsoBvt6X0xh+5vz7TqnZIZKV7YMmeaBsrml7qxVcJ
-						HDCFGJcnCNPjfZhq/Ebm9yjiFiWa+/0G137i454wxSO0VWjBG/AKXh+Q7rWYiizl
-						b43VJAwhfMV+EirlWbSK8tDyUfEPPI8gmpaNFAz4GohZKHHaBfPoQmfVFXEvaaVJ
-						0UUjKXItpyV5GmOLloJRLKdTLV00sxDAlcqNaY5pJQb1AUwlc3yqhB6vT7I0jSh+
-						b2ksiYiK8n1E6BC6oG2v
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.llgc.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.llgc.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">National Library of Wales</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Library of Wales test IdP - DO NOT USE</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cy">IdP prawf Llyfrgell Genedlaethol Cymru - PEIDIWCH DEFNYDDIO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.llgc.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Illtud</GivenName>
-    <SurName>Daniel</SurName>
-    <EmailAddress>mailto:shibboleth-support@llgc.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Illtud</GivenName>
-    <SurName>Daniel</SurName>
-    <EmailAddress>mailto:shibboleth-technical@llgc.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.londonmet.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.londonmet.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 46eeffb5..00000000
--- a/swamid-interfederations-2.0/idp-test.londonmet.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-test.londonmet.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for London Metropolitan University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">londonmet.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIVAPy27MCB6aTiLx0QJJIVl19/Nlg5MA0GCSqGSIb3DQEB
-						BQUAMCMxITAfBgNVBAMTGGlkcC10ZXN0LmxvbmRvbm1ldC5hYy51azAeFw0xNDA2
-						MjQwNzIwNDdaFw0zNDA2MjQwNzIwNDdaMCMxITAfBgNVBAMTGGlkcC10ZXN0Lmxv
-						bmRvbm1ldC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAID+
-						dg8AkTAgBe05Q3qR5tGRDPl53Ziss6MIUTthVI/tUDI9zwh6OxcoulGNKjbYQah8
-						NqbbRbMsBiaL8tYeJxI84nZlAlQQtWUhlO4fCwy9U2PpqGUVZqJtJ2tGrHqbUIJG
-						fywNBtA6OOOMhiusyJOkY9R85mCSUlsuZ/XDSZ+fFAEYlVn7gE/ypKzR9MZatElO
-						xYUxKwfQUzONUlT4me1Cq/RyjkB6xDjpM59ByuS91t/xYoAgd0Vwha8YcgBpuDaH
-						VsIxlEEVY5Sx1Tr3Z+2KWd+N9ApWyQrGZiLOp0wcDtAZduWXi3z20w9FB3b2Hxxz
-						S3Y88pjGSh+s3xyUve8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLXRlc3QubG9u
-						ZG9ubWV0LmFjLnVrhi9odHRwczovL2lkcC10ZXN0LmxvbmRvbm1ldC5hYy51ay9p
-						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhxXd7trX1bTg9l2tEg61AIXkPXwwDQYJ
-						KoZIhvcNAQEFBQADggEBADVh39wUjao0ZwNiMy3/P/V4ls1/pyT8wZgBwEr+XDqM
-						vg2AD5eP+Ys/W9FY22/Zetu2AEWqxOq07sAQ6EKTbqHcSjF849tO7KrwvJRzldKh
-						7uVuFnLB5KltBJHh6c9osJhuNyR3WhLmMaWlrWo+WSNqWQCmTroE7WJnopZ0J3TR
-						FLMQIOXLLWqe+oOFFl2bJ5vNaIljMfM/0mkFt4+NRRdmpCjLv4vQq8PsCr37Bq2o
-						whQdva1gQF2TXgJSIQN4n8gBVQ25HrITKlbnbQl2JKiFn/4RdNGi3CkWsFdpaYnP
-						MdvSvmbXG0Pvff01bGQ5w+2NV847gBm2lLigGenD5aI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.londonmet.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.londonmet.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.londonmet.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.londonmet.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.londonmet.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.londonmet.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">londonmet.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIVAPy27MCB6aTiLx0QJJIVl19/Nlg5MA0GCSqGSIb3DQEB
-						BQUAMCMxITAfBgNVBAMTGGlkcC10ZXN0LmxvbmRvbm1ldC5hYy51azAeFw0xNDA2
-						MjQwNzIwNDdaFw0zNDA2MjQwNzIwNDdaMCMxITAfBgNVBAMTGGlkcC10ZXN0Lmxv
-						bmRvbm1ldC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAID+
-						dg8AkTAgBe05Q3qR5tGRDPl53Ziss6MIUTthVI/tUDI9zwh6OxcoulGNKjbYQah8
-						NqbbRbMsBiaL8tYeJxI84nZlAlQQtWUhlO4fCwy9U2PpqGUVZqJtJ2tGrHqbUIJG
-						fywNBtA6OOOMhiusyJOkY9R85mCSUlsuZ/XDSZ+fFAEYlVn7gE/ypKzR9MZatElO
-						xYUxKwfQUzONUlT4me1Cq/RyjkB6xDjpM59ByuS91t/xYoAgd0Vwha8YcgBpuDaH
-						VsIxlEEVY5Sx1Tr3Z+2KWd+N9ApWyQrGZiLOp0wcDtAZduWXi3z20w9FB3b2Hxxz
-						S3Y88pjGSh+s3xyUve8CAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLXRlc3QubG9u
-						ZG9ubWV0LmFjLnVrhi9odHRwczovL2lkcC10ZXN0LmxvbmRvbm1ldC5hYy51ay9p
-						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhxXd7trX1bTg9l2tEg61AIXkPXwwDQYJ
-						KoZIhvcNAQEFBQADggEBADVh39wUjao0ZwNiMy3/P/V4ls1/pyT8wZgBwEr+XDqM
-						vg2AD5eP+Ys/W9FY22/Zetu2AEWqxOq07sAQ6EKTbqHcSjF849tO7KrwvJRzldKh
-						7uVuFnLB5KltBJHh6c9osJhuNyR3WhLmMaWlrWo+WSNqWQCmTroE7WJnopZ0J3TR
-						FLMQIOXLLWqe+oOFFl2bJ5vNaIljMfM/0mkFt4+NRRdmpCjLv4vQq8PsCr37Bq2o
-						whQdva1gQF2TXgJSIQN4n8gBVQ25HrITKlbnbQl2JKiFn/4RdNGi3CkWsFdpaYnP
-						MdvSvmbXG0Pvff01bGQ5w+2NV847gBm2lLigGenD5aI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.londonmet.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.londonmet.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">London Metropolitan University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London Metropolitan University - Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.londonmet.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rui</GivenName>
-    <SurName>Zong</SurName>
-    <EmailAddress>mailto:r.zong@londonmet.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rui</GivenName>
-    <SurName>Zong</SurName>
-    <EmailAddress>mailto:r.zong@londonmet.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.shibboleth.ox.ac.uk-shibboleth-idp.xml b/swamid-interfederations-2.0/idp-test.shibboleth.ox.ac.uk-shibboleth-idp.xml
deleted file mode 100644
index b11b2cb5..00000000
--- a/swamid-interfederations-2.0/idp-test.shibboleth.ox.ac.uk-shibboleth-idp.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-test.shibboleth.ox.ac.uk/shibboleth-idp">
-  <!--
-		This is a "Test" Shibboleth IdP for the University of Oxford.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-26T13:38: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">ox.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWzCCAkOgAwIBAgIJAJndjhMuiIt3MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-						BAMTHGlkcC10ZXN0LnNoaWJib2xldGgub3guYWMudWswHhcNMTMxMjEzMTIwNTM3
-						WhcNMzMxMjA4MTIwNTM3WjAnMSUwIwYDVQQDExxpZHAtdGVzdC5zaGliYm9sZXRo
-						Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0+4POi97
-						yt16S/kjeolw+uj6SEdMFqfgQhgwd/AC05Fp9MQ8pPNIQR5DhIRPFi6L4H0ea/Uk
-						frc0twJtfrqEx7tp0eCe0wB6LecKxx6+DnYtmfyz/tCjvvvFmfbrJ14ubrMHmF1u
-						RfeWSQBtg36lcpPV9QIQM1FAwab9CLREmxsZ72zZSuZCeNRmaCrdQd43NgfHzFYb
-						xnvKP8D806OEEniSBFcPpwzKPp2ctho+NNmsJT/8GyVTbrKzSpvZjf5zgsPK+O0R
-						kH7qZ8cExZkSDktyRyhCNi95FXbnPrANI6oSVs8+ouhe9J/6bnO04FyFecA893hJ
-						pxNXNrmpXhZgFQIDAQABo4GJMIGGMB0GA1UdDgQWBBQMsSajqoz91UxUUJ52fzjF
-						n5Gy/TBXBgNVHSMEUDBOgBQMsSajqoz91UxUUJ52fzjFn5Gy/aErpCkwJzElMCMG
-						A1UEAxMcaWRwLXRlc3Quc2hpYmJvbGV0aC5veC5hYy51a4IJAJndjhMuiIt3MAwG
-						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFjpOucHm+eFuvP/AhCEd4ei
-						3VUoKeVNUdtX1qpbv+ZH/ftkJaeRsRan4DAx4MWcEYED/+2DfYa+IWrNLVqp/ikl
-						omdSgjL+KHjIUh+YZR3M/Citl60RLQp8x1leC1jInfafS8S/MJLAwCRtKlgcVHeL
-						s1Tsvt1k++uaB4uKV/lWE8PS0H3hFnzE4i1S94HNWhC3S+2XB7AE6MXUCHQTknep
-						BxEOB8wOhHyZdUMLGDMf1Vh8FsLeBbEyTSufmCMElvvhyypcf6OeRkoorvg6DO5z
-						mLIz9BqxkSzMZ08i2sFYDzsN1brrua9J38vP2UXhUBER7f4jaituaTx0ZA1vYJs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.shibboleth.ox.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.shibboleth.ox.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.shibboleth.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.shibboleth.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.shibboleth.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.shibboleth.ox.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">ox.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWzCCAkOgAwIBAgIJAJndjhMuiIt3MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-						BAMTHGlkcC10ZXN0LnNoaWJib2xldGgub3guYWMudWswHhcNMTMxMjEzMTIwNTM3
-						WhcNMzMxMjA4MTIwNTM3WjAnMSUwIwYDVQQDExxpZHAtdGVzdC5zaGliYm9sZXRo
-						Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0+4POi97
-						yt16S/kjeolw+uj6SEdMFqfgQhgwd/AC05Fp9MQ8pPNIQR5DhIRPFi6L4H0ea/Uk
-						frc0twJtfrqEx7tp0eCe0wB6LecKxx6+DnYtmfyz/tCjvvvFmfbrJ14ubrMHmF1u
-						RfeWSQBtg36lcpPV9QIQM1FAwab9CLREmxsZ72zZSuZCeNRmaCrdQd43NgfHzFYb
-						xnvKP8D806OEEniSBFcPpwzKPp2ctho+NNmsJT/8GyVTbrKzSpvZjf5zgsPK+O0R
-						kH7qZ8cExZkSDktyRyhCNi95FXbnPrANI6oSVs8+ouhe9J/6bnO04FyFecA893hJ
-						pxNXNrmpXhZgFQIDAQABo4GJMIGGMB0GA1UdDgQWBBQMsSajqoz91UxUUJ52fzjF
-						n5Gy/TBXBgNVHSMEUDBOgBQMsSajqoz91UxUUJ52fzjFn5Gy/aErpCkwJzElMCMG
-						A1UEAxMcaWRwLXRlc3Quc2hpYmJvbGV0aC5veC5hYy51a4IJAJndjhMuiIt3MAwG
-						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFjpOucHm+eFuvP/AhCEd4ei
-						3VUoKeVNUdtX1qpbv+ZH/ftkJaeRsRan4DAx4MWcEYED/+2DfYa+IWrNLVqp/ikl
-						omdSgjL+KHjIUh+YZR3M/Citl60RLQp8x1leC1jInfafS8S/MJLAwCRtKlgcVHeL
-						s1Tsvt1k++uaB4uKV/lWE8PS0H3hFnzE4i1S94HNWhC3S+2XB7AE6MXUCHQTknep
-						BxEOB8wOhHyZdUMLGDMf1Vh8FsLeBbEyTSufmCMElvvhyypcf6OeRkoorvg6DO5z
-						mLIz9BqxkSzMZ08i2sFYDzsN1brrua9J38vP2UXhUBER7f4jaituaTx0ZA1vYJs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.shibboleth.ox.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 Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services IAM Team</GivenName>
-    <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Services IAM Team</GivenName>
-    <EmailAddress>mailto:team@sysdev.oucs.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.shu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.shu.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 62148945..00000000
--- a/swamid-interfederations-2.0/idp-test.shu.ac.uk-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://idp-test.shu.ac.uk/idp/shibboleth">
-  <!--
-		This is a Test Shibboleth IdP for Sheffield Hallam University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-01T18:42: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">shu.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sheffield Hallam University (TEST ONLY)</mdui:DisplayName>
-        <mdui:Logo height="43" width="80">https://extra.shu.ac.uk/ukfed/shu-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDxjCCAq6gAwIBAgIEU62O9jANBgkqhkiG9w0BAQsFADCBpDELMAkGA1UEBhMC
-						R0IxGDAWBgNVBAgMD1NvdXRoIFlvcmtzaGlyZTESMBAGA1UEBwwJU2hlZmZpZWxk
-						MSQwIgYDVQQKDBtTaGVmZmllbGQgSGFsbGFtIFVuaXZlcnNpdHkxJDAiBgNVBAsM
-						G1N0dWRlbnQgJiBMZWFybmluZyBTZXJ2aWNlczEbMBkGA1UEAwwSaWRwLXRlc3Qu
-						c2h1LmFjLnVrMB4XDTE0MDYyNzE1MzUwMFoXDTI0MDYyNzE1MzUwMFowgaQxCzAJ
-						BgNVBAYTAkdCMRgwFgYDVQQIDA9Tb3V0aCBZb3Jrc2hpcmUxEjAQBgNVBAcMCVNo
-						ZWZmaWVsZDEkMCIGA1UECgwbU2hlZmZpZWxkIEhhbGxhbSBVbml2ZXJzaXR5MSQw
-						IgYDVQQLDBtTdHVkZW50ICYgTGVhcm5pbmcgU2VydmljZXMxGzAZBgNVBAMMEmlk
-						cC10ZXN0LnNodS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AImtxGNIGiEzwpQuB45m9gWeFZqDrQnsMMNNsNRIOwjC0r4pnv2CUpxNTyC/s5fy
-						IgHFam/uNa9uoUd572ZCLkbz9aJzl9WIJWig30wMZmcYMWmShWnVfTT5sFqY8wT3
-						KH9H2YzZg9CsLY533aY0zytJPeTa3Zrv9doQ1HXT0Ucx+lCaLKaLQwjxN8q/t0eT
-						gw763kcBvJl9eD8At1OXicH9zqWWa30wL80HQgQQEpBdcvrwL28oJ6zV2AJzheGD
-						X4X28k3SC5XDC0YEobewiufbQrWa6GBvluZxl1vk2/s/awKa+ACZVgQxlqWCRoWo
-						hXe19s8y8DPKNxsWOkrGCE8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAEnzcbMqy
-						SJlvgznSg3U2qzvQAEqHcS3O9q/9vgH2vsNhHJNlNYuO0pdYsZLnjiynZfJCqlCz
-						xM377Ai/n2dIopidnFrVhUhmBHrPLZrWN4not/whSiampJbEk+FtRUqlvnlOwPMS
-						7FEVpljvIUM5yH2gwxykwUDh6Cww6vb0LmMIg3XXqoWb7W1La3/SN861kE3lrjBd
-						kLbSWD/+/ZKH8U8PpRzt3jQ7qs6Y6oU+AViuijrqABVEMkkQQ95TNl8gOlx7GV9H
-						Wiv9QUX8zNtt8reICQ8CmcKXLEV196GK9HU7nXwBDDo2tGGFh9PPhRV4F2kZteDx
-						8D/dzUJDDSS5HQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.shu.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.shu.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.shu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.shu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.shu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.shu.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">shu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDxjCCAq6gAwIBAgIEU62O9jANBgkqhkiG9w0BAQsFADCBpDELMAkGA1UEBhMC
-						R0IxGDAWBgNVBAgMD1NvdXRoIFlvcmtzaGlyZTESMBAGA1UEBwwJU2hlZmZpZWxk
-						MSQwIgYDVQQKDBtTaGVmZmllbGQgSGFsbGFtIFVuaXZlcnNpdHkxJDAiBgNVBAsM
-						G1N0dWRlbnQgJiBMZWFybmluZyBTZXJ2aWNlczEbMBkGA1UEAwwSaWRwLXRlc3Qu
-						c2h1LmFjLnVrMB4XDTE0MDYyNzE1MzUwMFoXDTI0MDYyNzE1MzUwMFowgaQxCzAJ
-						BgNVBAYTAkdCMRgwFgYDVQQIDA9Tb3V0aCBZb3Jrc2hpcmUxEjAQBgNVBAcMCVNo
-						ZWZmaWVsZDEkMCIGA1UECgwbU2hlZmZpZWxkIEhhbGxhbSBVbml2ZXJzaXR5MSQw
-						IgYDVQQLDBtTdHVkZW50ICYgTGVhcm5pbmcgU2VydmljZXMxGzAZBgNVBAMMEmlk
-						cC10ZXN0LnNodS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AImtxGNIGiEzwpQuB45m9gWeFZqDrQnsMMNNsNRIOwjC0r4pnv2CUpxNTyC/s5fy
-						IgHFam/uNa9uoUd572ZCLkbz9aJzl9WIJWig30wMZmcYMWmShWnVfTT5sFqY8wT3
-						KH9H2YzZg9CsLY533aY0zytJPeTa3Zrv9doQ1HXT0Ucx+lCaLKaLQwjxN8q/t0eT
-						gw763kcBvJl9eD8At1OXicH9zqWWa30wL80HQgQQEpBdcvrwL28oJ6zV2AJzheGD
-						X4X28k3SC5XDC0YEobewiufbQrWa6GBvluZxl1vk2/s/awKa+ACZVgQxlqWCRoWo
-						hXe19s8y8DPKNxsWOkrGCE8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAEnzcbMqy
-						SJlvgznSg3U2qzvQAEqHcS3O9q/9vgH2vsNhHJNlNYuO0pdYsZLnjiynZfJCqlCz
-						xM377Ai/n2dIopidnFrVhUhmBHrPLZrWN4not/whSiampJbEk+FtRUqlvnlOwPMS
-						7FEVpljvIUM5yH2gwxykwUDh6Cww6vb0LmMIg3XXqoWb7W1La3/SN861kE3lrjBd
-						kLbSWD/+/ZKH8U8PpRzt3jQ7qs6Y6oU+AViuijrqABVEMkkQQ95TNl8gOlx7GV9H
-						Wiv9QUX8zNtt8reICQ8CmcKXLEV196GK9HU7nXwBDDo2tGGFh9PPhRV4F2kZteDx
-						8D/dzUJDDSS5HQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.shu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.shu.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">Sheffield Hallam University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sheffield Hallam University (TEST ONLY)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.shu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Turner</SurName>
-    <EmailAddress>mailto:a.p.turner@shu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Gavin</GivenName>
-    <SurName>Moore</SurName>
-    <EmailAddress>mailto:g.r.moore@shu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Turner</SurName>
-    <EmailAddress>mailto:a.p.turner@shu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gavin</GivenName>
-    <SurName>Moore</SurName>
-    <EmailAddress>mailto:g.r.moore@shu.ac.uk</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 bad6bfbc..00000000
--- a/swamid-interfederations-2.0/idp-test.ucs.ed.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-test.ucs.ed.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Edinburgh.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <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-test.warwick.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-test.warwick.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 28c4663d..00000000
--- a/swamid-interfederations-2.0/idp-test.warwick.ac.uk-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" entityID="https://idp-test.warwick.ac.uk/idp/shibboleth">
-  <!--
-		This is a test Shibboleth IdP for the University of Warwick.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-24T16:20: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">warwick.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUMIS+8kDOqLvJbUPFF2xn+2rtu2AwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWaWRwLXRlc3Qud2Fyd2ljay5hYy51azAeFw0xNDA3MDkx
-						NDM4NTdaFw0zNDA3MDkxNDM4NTdaMCExHzAdBgNVBAMTFmlkcC10ZXN0Lndhcndp
-						Y2suYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlWqm4NoAE
-						tvOm4rJwmxQROFZePbsoT+s2AKABtCe+huTRwccxoMVKxNcRgiXrC9axXOMYtn2F
-						7Vet6JPTSh2byxP/GRAFzgmbB5wUtDEWnrchbDELwDBBs4gf0f2+xsW8CcDnwAKO
-						Yn70mFO5z+gOfrNQjUN4NoIrrXKhOXmvus+3igWcJtgZBjZ4GWEybkk45PNPvLmM
-						NTAchGTn+XJeOqYQi5YrxQOr7AaQX5lMNULZ/vC8d38lfwnKEbnZ6RNA7BS7Oo4K
-						/kYbnZCJ4Surzd86PCRXqPWECqZukH30QUclQ7vgajZNQ5nYkw17fRVxRl0lzR6y
-						AwwbVjUr63NxAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC10ZXN0LndhcndpY2su
-						YWMudWuGLWh0dHBzOi8vaWRwLXRlc3Qud2Fyd2ljay5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUNlj6h7hKB35Ej1IlTOV6jeEtFt4wDQYJKoZIhvcNAQEF
-						BQADggEBAHARtRPuPljRh+ExT44KfsA82jRt5H9y/B4BRR4Inn0is2F5RgYn4N3u
-						KkCYBEos0ntfnjx+pzI7wJS3AETizZoqVGdPscxsXrvqyx563yr4ceoy0DSRfroE
-						x9r1dEYMCwmk21c4LSB7pKY3n0bGfKkoxoOU2HtjeZ2c0W0YfnhgUu1YWPBRMah6
-						ZYMBot6VqwVMhwBhubbKp1qmLGS8s6YT7UvTUtSI3G9h6W8FWgCQF4X5i8MjTisJ
-						I4SuWzKOc8mKnhAOms8r10DMOttuIvgCs1cZtHZmZPen1SpXVFx92sWeN2oRlN99
-						UkwJwkWY8lTvMN7ELcyAHFYYTqjILF4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.warwick.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.warwick.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.warwick.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.warwick.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.warwick.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.warwick.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">warwick.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUMIS+8kDOqLvJbUPFF2xn+2rtu2AwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWaWRwLXRlc3Qud2Fyd2ljay5hYy51azAeFw0xNDA3MDkx
-						NDM4NTdaFw0zNDA3MDkxNDM4NTdaMCExHzAdBgNVBAMTFmlkcC10ZXN0Lndhcndp
-						Y2suYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlWqm4NoAE
-						tvOm4rJwmxQROFZePbsoT+s2AKABtCe+huTRwccxoMVKxNcRgiXrC9axXOMYtn2F
-						7Vet6JPTSh2byxP/GRAFzgmbB5wUtDEWnrchbDELwDBBs4gf0f2+xsW8CcDnwAKO
-						Yn70mFO5z+gOfrNQjUN4NoIrrXKhOXmvus+3igWcJtgZBjZ4GWEybkk45PNPvLmM
-						NTAchGTn+XJeOqYQi5YrxQOr7AaQX5lMNULZ/vC8d38lfwnKEbnZ6RNA7BS7Oo4K
-						/kYbnZCJ4Surzd86PCRXqPWECqZukH30QUclQ7vgajZNQ5nYkw17fRVxRl0lzR6y
-						AwwbVjUr63NxAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC10ZXN0LndhcndpY2su
-						YWMudWuGLWh0dHBzOi8vaWRwLXRlc3Qud2Fyd2ljay5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUNlj6h7hKB35Ej1IlTOV6jeEtFt4wDQYJKoZIhvcNAQEF
-						BQADggEBAHARtRPuPljRh+ExT44KfsA82jRt5H9y/B4BRR4Inn0is2F5RgYn4N3u
-						KkCYBEos0ntfnjx+pzI7wJS3AETizZoqVGdPscxsXrvqyx563yr4ceoy0DSRfroE
-						x9r1dEYMCwmk21c4LSB7pKY3n0bGfKkoxoOU2HtjeZ2c0W0YfnhgUu1YWPBRMah6
-						ZYMBot6VqwVMhwBhubbKp1qmLGS8s6YT7UvTUtSI3G9h6W8FWgCQF4X5i8MjTisJ
-						I4SuWzKOc8mKnhAOms8r10DMOttuIvgCs1cZtHZmZPen1SpXVFx92sWeN2oRlN99
-						UkwJwkWY8lTvMN7ELcyAHFYYTqjILF4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.warwick.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 Warwick</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Warwick (Test IdP - do not use)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.warwick.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nick</GivenName>
-    <SurName>Howes</SurName>
-    <EmailAddress>mailto:n.howes@warwick.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Howes</SurName>
-    <EmailAddress>mailto:n.howes@warwick.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.wmin.ac.uk-idp-entity.xml b/swamid-interfederations-2.0/idp-test.wmin.ac.uk-idp-entity.xml
deleted file mode 100644
index 0bbbe55e..00000000
--- a/swamid-interfederations-2.0/idp-test.wmin.ac.uk-idp-entity.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-test.wmin.ac.uk/idp/entity">
-  <!--
-		This is a Shibboleth IdP for University of Westminster.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-07T09:38:05Z">
-      <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">wmin.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUO4Z4TGad3zOqf20WubZJx3X2ObgwDQYJKoZIhvcNAQEF
-						BQAwHjEcMBoGA1UEAwwTaWRwLXRlc3Qud21pbi5hYy51azAeFw0xNTAzMzAxMDM2
-						MzdaFw0zNTAzMzAxMDM2MzdaMB4xHDAaBgNVBAMME2lkcC10ZXN0LndtaW4uYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAVH3CIndACrrHHL1i
-						TFzRPgE7dMzkdy4PkKi7FN16c90JN0GjtZkPwDerouxDLHWhzrjbwYLmAezRJDCE
-						dsR2p59gNxDeM/0qe1F2K/o1UHlSazvoR1hsBHUJVPkGGah+KyI8p7sAK+4koQvS
-						RoCrbNs0XZjPfG66e7QlWMnsSx1m2duQcp6m8mUtRZNLxZ14Q/2OVM38Ym3v5cyw
-						Mz42Ty0sFj3ywaDp7NaU98FqpdunRn/MZjZIHg1sXtdvxeLuhiCchPl1JcUXQm5+
-						znqS+VWcG1/Dzu1ldk4VYMLFOpIRAvFM3v6y3Qvopt4CswMfSgJSvn/EGu3MiDjk
-						5WoHAgMBAAGjbTBrMB0GA1UdDgQWBBQpHLN33OnCZT8LJuWmDca/QEKgSDBKBgNV
-						HREEQzBBghNpZHAtdGVzdC53bWluLmFjLnVrhipodHRwczovL2lkcC10ZXN0Lndt
-						aW4uYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAGjR1lvn
-						mipDI/6XMFVHHH7z++YN2qzI1a/LvV1G7cZ7b8dprmPDg0DggzrKC7T1EceWKEF+
-						NWIWh5Kcu0sO6uwA515FrjuvRoVGFHq7LT0LaWBmpLHYxxX6RIiRuRxsbHDqTXPp
-						z2tCp10b38xJ3QxKgOxc8TCd2jccTiaEUDwePu6N3R4h3X8z5+pq+LtVucEvWjfy
-						jTXJc8V4EoN98r0wsyFC21jc9D0aOM+ZpE1JznXFFnOdqiQZuWa9ckpkymJ0BpWM
-						RMBgwrAipmgIcDLOeMl+oGrjXtnN+8bFdNpaf+h+VHa3y27tX/6HhP4/Fo+qhOO+
-						6/Qdq15NW15ehGY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.wmin.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.wmin.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-test.wmin.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.wmin.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-test.wmin.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-test.wmin.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.wmin.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">wmin.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUO4Z4TGad3zOqf20WubZJx3X2ObgwDQYJKoZIhvcNAQEF
-						BQAwHjEcMBoGA1UEAwwTaWRwLXRlc3Qud21pbi5hYy51azAeFw0xNTAzMzAxMDM2
-						MzdaFw0zNTAzMzAxMDM2MzdaMB4xHDAaBgNVBAMME2lkcC10ZXN0LndtaW4uYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAVH3CIndACrrHHL1i
-						TFzRPgE7dMzkdy4PkKi7FN16c90JN0GjtZkPwDerouxDLHWhzrjbwYLmAezRJDCE
-						dsR2p59gNxDeM/0qe1F2K/o1UHlSazvoR1hsBHUJVPkGGah+KyI8p7sAK+4koQvS
-						RoCrbNs0XZjPfG66e7QlWMnsSx1m2duQcp6m8mUtRZNLxZ14Q/2OVM38Ym3v5cyw
-						Mz42Ty0sFj3ywaDp7NaU98FqpdunRn/MZjZIHg1sXtdvxeLuhiCchPl1JcUXQm5+
-						znqS+VWcG1/Dzu1ldk4VYMLFOpIRAvFM3v6y3Qvopt4CswMfSgJSvn/EGu3MiDjk
-						5WoHAgMBAAGjbTBrMB0GA1UdDgQWBBQpHLN33OnCZT8LJuWmDca/QEKgSDBKBgNV
-						HREEQzBBghNpZHAtdGVzdC53bWluLmFjLnVrhipodHRwczovL2lkcC10ZXN0Lndt
-						aW4uYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAGjR1lvn
-						mipDI/6XMFVHHH7z++YN2qzI1a/LvV1G7cZ7b8dprmPDg0DggzrKC7T1EceWKEF+
-						NWIWh5Kcu0sO6uwA515FrjuvRoVGFHq7LT0LaWBmpLHYxxX6RIiRuRxsbHDqTXPp
-						z2tCp10b38xJ3QxKgOxc8TCd2jccTiaEUDwePu6N3R4h3X8z5+pq+LtVucEvWjfy
-						jTXJc8V4EoN98r0wsyFC21jc9D0aOM+ZpE1JznXFFnOdqiQZuWa9ckpkymJ0BpWM
-						RMBgwrAipmgIcDLOeMl+oGrjXtnN+8bFdNpaf+h+VHa3y27tX/6HhP4/Fo+qhOO+
-						6/Qdq15NW15ehGY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-test.wmin.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.wmin.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 Westminster</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Westminster - Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.westminster.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>FixIT</GivenName>
-    <EmailAddress>mailto:it-servicedesk@westminster.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>ProofID</GivenName>
-    <EmailAddress>mailto:support@proofid.co.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 46faf1e6..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-unito-prod.cineca.it/idp/shibboleth">
-  <md: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>
-  </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">unito.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unito.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unito.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unito.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unito.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unito.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unito.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unito.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unito.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università di Torino</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Turin</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Torino</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Turin</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unito.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unito.it/unitoWAR/portletlocator/home_en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>mailto:portale-supporto@unito.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2f977757..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: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="http://www.w3.org/2001/XMLSchema-instance" 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-03-15T14:45: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 (new idp)</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-unitus-prod.cineca.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml
deleted file mode 100644
index 685df22c..00000000
--- a/swamid-interfederations-2.0/idp-unitus-prod.cineca.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,126 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-unitus-prod.cineca.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-20T08:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitus.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="it">Universita' Studi della Tuscia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universita' Studi della Tuscia</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider di produzione utenti Tuscia</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider production users Tuscia</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://idp.unitus.it/static/help.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://idp.unitus.it/static/help.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idp.unitus.it/static/help.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp.unitus.it/static/help.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.unitus.it/static/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>
-MIIE8zCCA9ugAwIBAgICB58wDQYJKoZIhvcNAQEFBQAwgbUxCzAJBgNVBAYTAklU
-MQ4wDAYDVQQIEwVJdGFseTEhMB8GA1UEBxMYQ2FzYWxlY2NoaW8gZGkgUmVubyAo
-Qk8pMSwwKgYDVQQKEyNDSU5FQ0EgQ29uc29yemlvIEludGVydW5pdmVyc2l0YXJp
-bzENMAsGA1UECxMERFNFVDEQMA4GA1UEAxMHRFNFVCBDQTEkMCIGCSqGSIb3DQEJ
-ARYVc2VydmljZWRlc2tAY2luZWNhLml0MB4XDTE1MDMwOTE2NTgwMVoXDTE4MDMw
-ODE2NTgwMVowgaYxCzAJBgNVBAYTAklUMQ4wDAYDVQQIEwVJdGFseTEhMB8GA1UE
-BxMYQ2FzYWxlY2NoaW8gZGkgUmVubyAoQk8pMSwwKgYDVQQKEyNDSU5FQ0EgQ29u
-c29yemlvIEludGVydW5pdmVyc2l0YXJpbzENMAsGA1UECxMERFNFVDEnMCUGA1UE
-AxMec2FtbC11bml0dXMtaWRwLXByb2QuY2luZWNhLml0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAosNTObNDAdBrEkQ/EkdHvTeD5XYXGQp3O4LEyXwk
-wfZHMTF3Ve0uFgNcRlj65KkcMHaldnXne4KjbtLSBONMrc7QSmruPhr3plJlqxK6
-3SbQAQSOYEjEwFn889LDdYXTX7hfduF0Y379tsTfHqiixhj+HF2/fTWYjQOKLLBf
-ztcs3qRZThG4vbUfQk2qyErzNwyH1bBum8tkTSlgO1URvRt69d+WIpDV82kvjTAf
-nzqEiNrOtlKhqWQyHpe9He3a34np0KpCyW2m/uPDyubVjTIdGfA1NjVJWzmDD5XY
-ruNFkceohNcaInKz/OzKzXjh08MNM+GHSgiJ92XldG0h6wIDAQABo4IBGDCCARQw
-CQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBkAwHQYDVR0OBBYEFFGdL7ioyAYY
-pmlePOrulCSc5O+HMIHUBgNVHSMEgcwwgcmhgbukgbgwgbUxCzAJBgNVBAYTAklU
-MQ4wDAYDVQQIEwVJdGFseTEhMB8GA1UEBxMYQ2FzYWxlY2NoaW8gZGkgUmVubyAo
-Qk8pMSwwKgYDVQQKEyNDSU5FQ0EgQ29uc29yemlvIEludGVydW5pdmVyc2l0YXJp
-bzENMAsGA1UECxMERFNFVDEQMA4GA1UEAxMHRFNFVCBDQTEkMCIGCSqGSIb3DQEJ
-ARYVc2VydmljZWRlc2tAY2luZWNhLml0ggkAj5pklc/pVTswDQYJKoZIhvcNAQEF
-BQADggEBANPIDlafdZ/9lcfZ5X/UMJdVNFZuWSJxJAiHJK10Q2+9IN1XDaoBWGOV
-a7/HPzgOd2oYMCpAm/yu/9zg74M0sSMvjODAa6y1kVTEjLx+UCjsyWyPVZD3Xj97
-ZJ9x9ZgTf0HOH1GRdQuOhTKa2F4esWEpvNgud0unSEt5/l8Qhz3ejHsAPuMJymb+
-qdwba7WvaoL4eyGeUMFwFyg2wQdNeMW7/APQFMGz9qX2yq4vnnwjwFzeWR+euXPs
-LWxendzaDigSKZxGj2JNiAySgZ2su+k2h07itO1VPGi/HhlbC+Cd+AndH8zGjFHf
-N2UAjpeR7GCIUbqf35pg6y/RlJFI46w=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitus.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitus.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitus.it:443/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitus.it:443/idp/profile/SAML2/POST/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.unitus.it:443/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitus.it:443/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unitus.it:443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitus.it:443/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">unitus.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE8zCCA9ugAwIBAgICB58wDQYJKoZIhvcNAQEFBQAwgbUxCzAJBgNVBAYTAklU
-MQ4wDAYDVQQIEwVJdGFseTEhMB8GA1UEBxMYQ2FzYWxlY2NoaW8gZGkgUmVubyAo
-Qk8pMSwwKgYDVQQKEyNDSU5FQ0EgQ29uc29yemlvIEludGVydW5pdmVyc2l0YXJp
-bzENMAsGA1UECxMERFNFVDEQMA4GA1UEAxMHRFNFVCBDQTEkMCIGCSqGSIb3DQEJ
-ARYVc2VydmljZWRlc2tAY2luZWNhLml0MB4XDTE1MDMwOTE2NTgwMVoXDTE4MDMw
-ODE2NTgwMVowgaYxCzAJBgNVBAYTAklUMQ4wDAYDVQQIEwVJdGFseTEhMB8GA1UE
-BxMYQ2FzYWxlY2NoaW8gZGkgUmVubyAoQk8pMSwwKgYDVQQKEyNDSU5FQ0EgQ29u
-c29yemlvIEludGVydW5pdmVyc2l0YXJpbzENMAsGA1UECxMERFNFVDEnMCUGA1UE
-AxMec2FtbC11bml0dXMtaWRwLXByb2QuY2luZWNhLml0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAosNTObNDAdBrEkQ/EkdHvTeD5XYXGQp3O4LEyXwk
-wfZHMTF3Ve0uFgNcRlj65KkcMHaldnXne4KjbtLSBONMrc7QSmruPhr3plJlqxK6
-3SbQAQSOYEjEwFn889LDdYXTX7hfduF0Y379tsTfHqiixhj+HF2/fTWYjQOKLLBf
-ztcs3qRZThG4vbUfQk2qyErzNwyH1bBum8tkTSlgO1URvRt69d+WIpDV82kvjTAf
-nzqEiNrOtlKhqWQyHpe9He3a34np0KpCyW2m/uPDyubVjTIdGfA1NjVJWzmDD5XY
-ruNFkceohNcaInKz/OzKzXjh08MNM+GHSgiJ92XldG0h6wIDAQABo4IBGDCCARQw
-CQYDVR0TBAIwADARBglghkgBhvhCAQEEBAMCBkAwHQYDVR0OBBYEFFGdL7ioyAYY
-pmlePOrulCSc5O+HMIHUBgNVHSMEgcwwgcmhgbukgbgwgbUxCzAJBgNVBAYTAklU
-MQ4wDAYDVQQIEwVJdGFseTEhMB8GA1UEBxMYQ2FzYWxlY2NoaW8gZGkgUmVubyAo
-Qk8pMSwwKgYDVQQKEyNDSU5FQ0EgQ29uc29yemlvIEludGVydW5pdmVyc2l0YXJp
-bzENMAsGA1UECxMERFNFVDEQMA4GA1UEAxMHRFNFVCBDQTEkMCIGCSqGSIb3DQEJ
-ARYVc2VydmljZWRlc2tAY2luZWNhLml0ggkAj5pklc/pVTswDQYJKoZIhvcNAQEF
-BQADggEBANPIDlafdZ/9lcfZ5X/UMJdVNFZuWSJxJAiHJK10Q2+9IN1XDaoBWGOV
-a7/HPzgOd2oYMCpAm/yu/9zg74M0sSMvjODAa6y1kVTEjLx+UCjsyWyPVZD3Xj97
-ZJ9x9ZgTf0HOH1GRdQuOhTKa2F4esWEpvNgud0unSEt5/l8Qhz3ejHsAPuMJymb+
-qdwba7WvaoL4eyGeUMFwFyg2wQdNeMW7/APQFMGz9qX2yq4vnnwjwFzeWR+euXPs
-LWxendzaDigSKZxGj2JNiAySgZ2su+k2h07itO1VPGi/HhlbC+Cd+AndH8zGjFHf
-N2UAjpeR7GCIUbqf35pg6y/RlJFI46w=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitus.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitus.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Universita' degli Studi della Tuscia</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Universita' degli Studi della TusciaTuscia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Universita' Studi della Tuscia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Universita' Studi della Tuscia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www3.unitus.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www3.unitus.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Maurizio</md:GivenName>
-    <md:SurName>Menicacci</md:SurName>
-    <md:EmailAddress>mailto:webmaster@unitus.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.4cd.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.4cd.edu-idp-shibboleth.xml
deleted file mode 100644
index 5d4fe227..00000000
--- a/swamid-interfederations-2.0/idp.4cd.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,88 +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://idp.4cd.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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">4cd.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Contra Costa Community College District</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>
-MIIC3jCCAcagAwIBAgIQY/dQsE83PaZJoxxonVIzyzANBgkqhkiG9w0BAQUFADAY
-MRYwFAYDVQQDEw1NRUcuYWMucG9ydGFsMB4XDTE1MDczMDE3MzU0NVoXDTE2MDcz
-MDAwMDAwMFowGDEWMBQGA1UEAxMNTUVHLmFjLnBvcnRhbDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJuqbkxV/IezNIvfuL/JYtWjVc+A4GYsfHV0t77/
-KP7RzXD8uUfax9NaNo6Vvh35fD8FjBRBybOnjsA9mBcHGC3uhQeveX5qgrzqvZfa
-cBlQ0nnXDzAEAdM20mFRATpqZMqaR83ZsSdul2Mvf29KJdktPBNfvBiuXfGNP0Bb
-hQWsc4XOVjSvtYd3vKUmJUtor8UttL4V4YJLXy7jcKPBYHEIjiaoDSv3A14waZmO
-iO9kK6520bEnJfRZ1s0QzIXfJRY/YWAFxSmnWLu99tunzNY7JiK3GXj9LbY643Ou
-IafLtJP6+/ZjYJG8SX+nThYUmvXbsgMFzZ/3fJELnk1xXZECAwEAAaMkMCIwCwYD
-VR0PBAQDAgQwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4IB
-AQBEysihZ5OnJKTHDaV3h/HEcAxY0ALCrVwk4Buv1SHdeZowCgA0Dqey1j24tANH
-P3CEd4HX6C7wBBMtrMBtZUDH7yZpjfh0YAXZD289l7Frm6P2/4eIXEzdYUvN9X+M
-5vBo2RSgfV0Z8CvdfahVe6zj3B2LURzZ6/Aj5CpAIQnv9qyQ5LJ0eDPIkcHvq+xy
-6WEb/JeSfcXjfbEvt8A7XhsaCYH+EDxLNqazR0y+/CGdzldZzT484KH3ighNM7It
-VGhn/FMx6CwPgaVvSUFhZSF1S/Zy5LGo5L+NwSskBZbsggvcFK81A8OQyRpqkfJ0
-FdNlLCLTu6n6ORJmir+X2PzI
-          </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>
-MIIDFzCCAf+gAwIBAgIUbFc/9Zd90s2OyW+CDf6IsoyodFIwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwLjRjZC5lZHUwHhcNMTUwNzE1MjIwNTM4WhcNMzUw
-NzE1MjIwNTM4WjAWMRQwEgYDVQQDDAtpZHAuNGNkLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJbSYoWAUTBA7xoIOTmGtfr9OmJixa3N/euDzOay
-Ztlcf7S48qoo7uBW0H4QHkIIBBkK8YstmsgIqRtA03QL+62trDygN9oWqdbtT5CE
-q7JBI0qxcHb2AXW2LMAW1rjgSeyjRMxUdrbii8aNpJ/PQyHSwqo6l62Xdg9kzDRH
-s7NPchMrplv1NIILukLR87Lu1heirZtpBEzJcc/bj8T98A7Pt/BJURsJsixO3pkq
-q8DmCWggrajOFsYuUsNuwK7AObp3SEv/RvDHwoVLbtO9hCqMzVcS5DwpmHT/TRNd
-Su03LWv/U2tWAY7r2HVeVJmB1QoZCXDtIvCtLa8KkFKCP9kCAwEAAaNdMFswHQYD
-VR0OBBYEFPmijRIb0Yjq1QnJUWQQee6zJVxFMDoGA1UdEQQzMDGCC2lkcC40Y2Qu
-ZWR1hiJodHRwczovL2lkcC40Y2QuZWR1L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQCJjWVXlEaCfNiUUngeOgeU/Afe6juBV7kN0C9+SqxlmK/hgj9l
-32yoALnA/jec86VVif2sQUy7IJBwsl4+rqx4x04mfZxb0y719YDj5kIgP8ZxOT2s
-yknrDzqbGwe21sAkeirtLANYDjCTgWUB3BpKdqz9iBHI8A0rY1g4glKcWxTYVnej
-mDPEfrVywFVFmXyEtwyEYJSYXsfWLrFwAOpeiO1mq9T1Vk2Mr3P/F5+2E4+J06wg
-+iP2GsQmy1PGMfVhuKKGDMDx2YhCzbiGaDjF2782KYJ5xHr8jRIr3qzTRr/SIMsd
-5JecuW9DWVNJsuwR/jW02/KrcCa429lfK5mp
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.4cd.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.4cd.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.4cd.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.4cd.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.4cd.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.4cd.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.4cd.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Contra Costa Community College District</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Contra Costa Community College District</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.4cd.edu/default.aspx</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Fred Tahan</md:GivenName>
-    <md:EmailAddress>ftahan@4cd.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jeanie Smith</md:GivenName>
-    <md:EmailAddress>jsmith@4cd.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 bfcdd249..00000000
--- a/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
+++ /dev/null
@@ -1,562 +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 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">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">ucenec.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">ucenec.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">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">ucenec.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-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">ucenec.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">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">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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-majdevrhovnik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-fokovci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-novejarse.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgradec.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfml.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">prezihovvoranc.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszboraodposlancev.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ponikva.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimsen.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bled.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bostanj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smarje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-predoslje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirius-vipava.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-sentjernej.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gro.sik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsv.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-atl.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjenka.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mojstrana.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-rence.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobrova.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimoste.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hoce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">egss.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">o-cezanjevci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossiska.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vodice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrovte.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-spidrija.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osagpostojna.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koroskijeklarji.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-prestranek.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">askerc.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sencur.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osribnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbistricaobsotli.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvsmuc.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osminka.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossevnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cerkljeobkrki.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sostro.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podbocje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ingoliceva.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tretja.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mozirje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrakek.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfrslj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osborovnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mpt-velenje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osms.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvelikadolina.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">francebevk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-trzic.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmnr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrihardajakopica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-naklo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmepius.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slomskov-zavod.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfpmaribor.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">prvagim.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dijaki.prvagim.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mg-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospodzemelj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os4ms.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossecovlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grm-nm.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.grm-nm.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osprule.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tabor.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vojnik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-litija.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sostanj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-makole.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podcetrtek.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mfdps.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssfkz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfp.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-salovci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc-naklo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ddajdovscina.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentrupert.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gcc1.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hvu.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslovrenc.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsnm.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scpo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ges-sb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">viviss.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podbrdo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zgnl.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.zgnl.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-koper.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.os-koper.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-iskvarce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-loskipotok.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospvmb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-tezno.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">facka.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscv.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gskranj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seslj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sts-koper.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossempas.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vizvisnjagora.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssdomzale.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stps-trbovlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ludvik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sveta-ana.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kozara.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dd-msobota.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskomenda-moste.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">padeznik-mojasola.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">centerjanezalevca.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdj-cerklje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimnazija-brezice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-duplek.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sodrazica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-frana-rosa.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sggos.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbi.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sturje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskorena.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smartno.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-domzale.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-velikigaber.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kidricevo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslasko.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-marijevere.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osribnicanapohorju.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">makspecar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.makspecar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskoroskabela.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vipava.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssof.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hajdina.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">acs.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimvic.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pedag.gimvic.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.gimvic.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sticna.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jakobaaljaza.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospolje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-strazisce-kr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gcc.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossentvid.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-petrovce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stanislav.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvic.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vv.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mirna.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossavskonaselje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbogojina.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jd.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-vodice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-skofljica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ev-prade.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solavidem.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenci.os-mk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glazer.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kdk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenci.os-kdk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iosce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskrize.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osnovna-sola-idrija.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-novefuzine.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbenedikt.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hrpelje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossjsmlednik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iios-rogaska.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerkvenjak.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kobarid.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ivanjkovci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vrhovci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">1osrogaska.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">3os-celje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zssm.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osapace.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zadobrova.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-borcev.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjkb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zirovnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmklj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmezica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-franakranjca.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svsgl.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osszkr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gozdis.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-branik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">opvbistricams.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobova.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dravograd.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslivade.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskobilje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osziri.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">antonukmar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-col.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mladika.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimng.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szks.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerkno.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dekani.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osartice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-smartnolitija.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-fgp.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-stranje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslivada.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospodgorje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-komen.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-trzin.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmuta.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospesnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmmsentjanz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-poljane.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-selnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-frankolovo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-globoko.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jela-janezica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slodrs.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostpavcka.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-konjice-zrece.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cresnjevec.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssgt-mb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gim-ms.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrzisce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossredisceobdravi.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-krsko.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oshorjul.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrogatec.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-lipnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zveza-slepih.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskrsko.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-knezak.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">olgica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospoljcane.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmarezige.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-planina.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osic.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dusanabordona.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sempeter.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knjiznica-velenje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">presernova.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-miren.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tsaljose.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">solaklavora.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gsve.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmatijecopa.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-vavta-vas.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimtol.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tolmin.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">2os-slb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dos1-lendava.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorisnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjvkg.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdramlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scuoladecastro.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sckr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sesgs.sckr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sser.sckr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sts.sckr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vss.sckr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sg.sckr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mic.sckr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-rodica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osoplotnica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrnovo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssj-jesenice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osams.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimnazija-skofjaloka.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osvelikanedelja.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pregarje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osig.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-crna.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vitakraigherja.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonecufar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ddmaribor.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-trbovlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cepovan.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-destrnik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lu-koper.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbrezice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslenart.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dosdobrovnik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbraslovce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slander.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bozidarjajakca.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ribalon.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobrepolje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os3ms.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbrestanica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgrad.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorica-velenje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osjursinci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brinje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbezigrad.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-krizevci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ssom.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossenovo.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-maksadurjave.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbicevje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-otlica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgrm.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-toncke-cec.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-leskovec.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osobrinzi.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 identity</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">arnes idp identiteta</mdui:Keywords>
-        <mdui:Logo height="135" width="150">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.arnes.si/en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.arnes.si/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.arnes.si/en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sl">http://www.arnes.si/</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>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="support">
-    <md:GivenName>Arnes</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <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="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 feb13fb9..00000000
--- a/swamid-interfederations-2.0/idp.aai.arnes.si.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.aai.arnes.si/idp/20090116">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2009-01-16T14:05:41Z">
-      <mdrpi:RegistrationPolicy xml:lang="sl">http://aai.arnes.si/fed/doc/ArnesAAI_splosni_pogoji.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.arnes.si/fed/doc/ArnesAAI_general.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="true">^(.+\.)?arnes\.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">Academic and Research Network of Slovenia</mdui:Description>
-        <mdui:Description xml:lang="sl">Akademska in raziskovalna mreža Slovenije</mdui:Description>
-        <mdui:Keywords xml:lang="en">arnes academic arnesaai aai</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">arnes akademska arnesaai aai</mdui:Keywords>
-        <mdui:Logo height="67" width="64">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.arnes.si/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.arnes.si</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.arnes.si/pomoc-uporabnikom/pravila-uporabe-omrezja-arnes.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sl">http://www.arnes.si/pomoc-uporabnikom/pravila-uporabe-omrezja-arnes.html</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>MIIDEzCCAnygAwIBAgIJAMxgJo23GoaPMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYDVQQGEwJTSTESMBAGA1UEBxMJTGp1YmxqYW5hMQ4wDAYDVQQKEwVBUk5FUzEMMAoGA1UECxMDQUFJMSwwKgYDVQQDDCNBcm5lcyBGZWRlcmF0aW9uIC0gUHJpbWFyeSBJZFAgJiBEUzEjMCEGCSqGSIb3DQEJARYUYWFhLXBvZHBvcmFAYXJuZXMuc2kwHhcNMDkwMjE4MDcyNzAyWhcNMTkwMjE2MDcyNzAyWjCBkjELMAkGA1UEBhMCU0kxEjAQBgNVBAcTCUxqdWJsamFuYTEOMAwGA1UEChMFQVJORVMxDDAKBgNVBAsTA0FBSTEsMCoGA1UEAwwjQXJuZXMgRmVkZXJhdGlvbiAtIFByaW1hcnkgSWRQICYgRFMxIzAhBgkqhkiG9w0BCQEWFGFhYS1wb2Rwb3JhQGFybmVzLnNpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgs61n1RVSUtLLu22gSg2f1+hJpoPvI1OkLNltFJJDpaeoLQ4sLirEfnnfNHk0J/VaGP+MmYg1+/OXSSFBTGdJ97xfNFslhqQTwMgsjLXKhESMT+JX9rW1wotJ9Wd2hSlbz1VHWnBgLrDWHOwjIXewyzoMpQxt5qHonqvoInZaBwIDAQABo28wbTATBgNVHSUEDDAKBggrBgEFBQcDATBWBgNVHREETzBNhwTBAgF5ghB3ZWJhYWkxLmFybmVzLnNpghBpZHAuYWFpLmFybmVzLnNpgg9kcy5hYWkuYXJuZXMuc2mCEGlkbS5hYWkuYXJuZXMuc2kwDQYJKoZIhvcNAQEFBQADgYEAIkzjQYMOZ6O4XjBPw1FdjfrDJbB90wHBJ/7E/++9KuNHUPar2ltyyg3mdrj3XNX4W8RtuzmG5IttqdJDJCE2geaZw5j8/u13nxEScJoYWIhA1vHBWciwLhswUKP0teYXhaczT27+cQarDoIqiKEsFFRfRESy2f1XNFflAYcZxrw=</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>MIIDEzCCAnygAwIBAgIJAMxgJo23GoaPMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYDVQQGEwJTSTESMBAGA1UEBxMJTGp1YmxqYW5hMQ4wDAYDVQQKEwVBUk5FUzEMMAoGA1UECxMDQUFJMSwwKgYDVQQDDCNBcm5lcyBGZWRlcmF0aW9uIC0gUHJpbWFyeSBJZFAgJiBEUzEjMCEGCSqGSIb3DQEJARYUYWFhLXBvZHBvcmFAYXJuZXMuc2kwHhcNMDkwMjE4MDcyNzAyWhcNMTkwMjE2MDcyNzAyWjCBkjELMAkGA1UEBhMCU0kxEjAQBgNVBAcTCUxqdWJsamFuYTEOMAwGA1UEChMFQVJORVMxDDAKBgNVBAsTA0FBSTEsMCoGA1UEAwwjQXJuZXMgRmVkZXJhdGlvbiAtIFByaW1hcnkgSWRQICYgRFMxIzAhBgkqhkiG9w0BCQEWFGFhYS1wb2Rwb3JhQGFybmVzLnNpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCgs61n1RVSUtLLu22gSg2f1+hJpoPvI1OkLNltFJJDpaeoLQ4sLirEfnnfNHk0J/VaGP+MmYg1+/OXSSFBTGdJ97xfNFslhqQTwMgsjLXKhESMT+JX9rW1wotJ9Wd2hSlbz1VHWnBgLrDWHOwjIXewyzoMpQxt5qHonqvoInZaBwIDAQABo28wbTATBgNVHSUEDDAKBggrBgEFBQcDATBWBgNVHREETzBNhwTBAgF5ghB3ZWJhYWkxLmFybmVzLnNpghBpZHAuYWFpLmFybmVzLnNpgg9kcy5hYWkuYXJuZXMuc2mCEGlkbS5hYWkuYXJuZXMuc2kwDQYJKoZIhvcNAQEFBQADgYEAIkzjQYMOZ6O4XjBPw1FdjfrDJbB90wHBJ/7E/++9KuNHUPar2ltyyg3mdrj3XNX4W8RtuzmG5IttqdJDJCE2geaZw5j8/u13nxEScJoYWIhA1vHBWciwLhswUKP0teYXhaczT27+cQarDoIqiKEsFFRfRESy2f1XNFflAYcZxrw=</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">Academic and Research Network of Slovenia</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Akademska in raziskovalna mreža Slovenije</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</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.arnes.si/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ARNES Helpdesk</md:GivenName>
-    <md:SurName>ARNES Helpdesk</md:SurName>
-    <md:EmailAddress>helpdesk@arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ARNES AAI</md:GivenName>
-    <md:SurName>ARNES AAI</md:SurName>
-    <md:EmailAddress>aaa-podpora@arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>ARNES AAI</md:GivenName>
-    <md:SurName>ARNES AAI</md:SurName>
-    <md:EmailAddress>aaa-podpora@arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aai.um.si-idp.xml b/swamid-interfederations-2.0/idp.aai.um.si-idp.xml
deleted file mode 100644
index 8baf4b7a..00000000
--- a/swamid-interfederations-2.0/idp.aai.um.si-idp.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://idp.aai.um.si/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-10-29T16:10:11Z">
-      <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 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">um.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.um.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.um.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-m.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.u-m.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.u-m.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Maribor</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Univerza v Mariboru</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization University of Maribor</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Mariboru</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization University of Maribor</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Mariboru</mdui:Keywords>
-        <mdui:Logo height="300" width="300">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.um.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.um.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>MIIFLDCCBBSgAwIBAgIQBo+ihSvv1AM22JegJK80uzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMTIwMDAwMDBaFw0xODEwMTYxMjAwMDBaMHYxCzAJBgNVBAYTAlNJMRAwDgYDVQQIEwdNYXJpYm9yMRAwDgYDVQQHEwdNYXJpYm9yMRwwGgYDVQQKExNVbml2ZXJ6YSB2IE1hcmlib3J1MQ0wCwYDVQQLEwRSQ1VNMRYwFAYDVQQDEw1pZHAuYWFpLnVtLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqUTJlMY3iryERJfgAOyN2Z9RqItpG9UZ63QyTlSewr32Nod/F/mo1D/gaKsz4qYxpn6eFbPRHtIN7/lumrvFqQpeeA8NmMofSwMCQMEOwHJljFjXNVSqUHE6a2ITNZBFbMo3anAHF0szsuJrD5Zj/ySpnEwhkujrFuB6zD0Gryy/6wUgbqr1T7uZ8Y+YXn6PlzgwGi6WPK85rECPwL2GM/2FqOj1ETMaU3zns8gkOzx+Dg8itMdCQ2R3KslwCTfSH0Hnq1/TpNGNNKpTNCmGV5PzF+xKF6tpY8feSMnwTBJrMkLj8yI/SKRds+LrwKz5WrYakUvt+03zUMbpU1L9iQIDAQABo4IBxjCCAcIwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFBYZXkaBvHQ/t/2l0BQv6GGzXcOVMBgGA1UdEQQRMA+CDWlkcC5hYWkudW0uc2kwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHzsWmpmNEXZTh43jRCebi1s2maPZjf9s9L4Tq53Ojlg1VCYmLbBAKlasxivlUWNuaOL/IdU/ZS8vet8I3bqc4aLum7J0wyJ4cXLv9KlO1kxSIlKRDKN6xOxxKAg3wLZwrxgn86guncXIsr8qokuBxJyQVEBXgtpd6okVHSXo0XgbNLup7dgJHUIW4KodEPcPG03RA/qPD9lMBDCUrcKTOLd4+Ip3xaEXl3WIuKgS9wangJwxZ/ySzFBwZ7tAe8D0x9P3bB/XjNeXyURp4vvbrminhdTpsgxwU37xRzoczV9+HV5DAErDJ3+BKP7dZ1l2ILvXd5+8NRGftwdEnyQVoM=</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>MIIFLDCCBBSgAwIBAgIQBo+ihSvv1AM22JegJK80uzANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMTIwMDAwMDBaFw0xODEwMTYxMjAwMDBaMHYxCzAJBgNVBAYTAlNJMRAwDgYDVQQIEwdNYXJpYm9yMRAwDgYDVQQHEwdNYXJpYm9yMRwwGgYDVQQKExNVbml2ZXJ6YSB2IE1hcmlib3J1MQ0wCwYDVQQLEwRSQ1VNMRYwFAYDVQQDEw1pZHAuYWFpLnVtLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqUTJlMY3iryERJfgAOyN2Z9RqItpG9UZ63QyTlSewr32Nod/F/mo1D/gaKsz4qYxpn6eFbPRHtIN7/lumrvFqQpeeA8NmMofSwMCQMEOwHJljFjXNVSqUHE6a2ITNZBFbMo3anAHF0szsuJrD5Zj/ySpnEwhkujrFuB6zD0Gryy/6wUgbqr1T7uZ8Y+YXn6PlzgwGi6WPK85rECPwL2GM/2FqOj1ETMaU3zns8gkOzx+Dg8itMdCQ2R3KslwCTfSH0Hnq1/TpNGNNKpTNCmGV5PzF+xKF6tpY8feSMnwTBJrMkLj8yI/SKRds+LrwKz5WrYakUvt+03zUMbpU1L9iQIDAQABo4IBxjCCAcIwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFBYZXkaBvHQ/t/2l0BQv6GGzXcOVMBgGA1UdEQQRMA+CDWlkcC5hYWkudW0uc2kwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHzsWmpmNEXZTh43jRCebi1s2maPZjf9s9L4Tq53Ojlg1VCYmLbBAKlasxivlUWNuaOL/IdU/ZS8vet8I3bqc4aLum7J0wyJ4cXLv9KlO1kxSIlKRDKN6xOxxKAg3wLZwrxgn86guncXIsr8qokuBxJyQVEBXgtpd6okVHSXo0XgbNLup7dgJHUIW4KodEPcPG03RA/qPD9lMBDCUrcKTOLd4+Ip3xaEXl3WIuKgS9wangJwxZ/ySzFBwZ7tAe8D0x9P3bB/XjNeXyURp4vvbrminhdTpsgxwU37xRzoczV9+HV5DAErDJ3+BKP7dZ1l2ILvXd5+8NRGftwdEnyQVoM=</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.um.si/idp/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.um.si/idp/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Univerza v Mariboru</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Univerza v Mariboru</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Univerza v Mariboru</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Univerza v Mariboru</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.um.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.um.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Izidor</md:GivenName>
-    <md:SurName>Golob</md:SurName>
-    <md:EmailAddress>mailto:izidor.golob@uni-mb.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:skrbnik@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gorazd</md:GivenName>
-    <md:SurName>Ropoša</md:SurName>
-    <md:EmailAddress>mailto:gorazd.roposa@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Danijel</md:GivenName>
-    <md:SurName>Rebolj</md:SurName>
-    <md:EmailAddress>mailto:danijel.rebolj@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janez</md:GivenName>
-    <md:SurName>Brezovnik</md:SurName>
-    <md:EmailAddress>mailto:janez.brezovnik@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Albin</md:GivenName>
-    <md:SurName>Bregant</md:SurName>
-    <md:EmailAddress>mailto:albin.bregant@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gorazd</md:GivenName>
-    <md:SurName>Ropoša</md:SurName>
-    <md:EmailAddress>mailto:gorazd.roposa@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Izidor</md:GivenName>
-    <md:SurName>Golob</md:SurName>
-    <md:EmailAddress>mailto:izidor.golob@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Eneko</md:GivenName>
-    <md:SurName>Anorga Irigoyen</md:SurName>
-    <md:EmailAddress>mailto:eneko.anorga@um.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aai.uni-mb.si-idp-20100614.xml b/swamid-interfederations-2.0/idp.aai.uni-mb.si-idp-20100614.xml
deleted file mode 100644
index f30439dd..00000000
--- a/swamid-interfederations-2.0/idp.aai.uni-mb.si-idp-20100614.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://idp.aai.uni-mb.si/idp/20100614">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-02-06T11:02:33Z">
-      <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 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">um.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.um.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mb.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-m.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Maribor</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Univerza v Mariboru</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization University of Maribor</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Mariboru</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization University of Maribor</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Mariboru</mdui:Keywords>
-        <mdui:Logo height="300" width="300">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAMAAABOo35HAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAYBQTFRFUpWsEW2NzeDnYZ6z8Pb42ejtbKW5wdnhI3iV/v//OYahmsHPfa/BqcrW4u3xyd7lWpqwdKq8PYiiGHGQjLnI1OXq+vz9TZKqMoKdudXelr/MhbTFHHSSrs3YnsTRvtfgibfGAWSFRY6mCWmJ3Onu9Pj6vNbf7vX3Xp2yAFl+5vDzpsnUea6/oMXSosbTkLvKFnCQIHaU0eLp6vL15O7ygLHCLX+attLc+Pv8sM7ZKn2ZQIukkrzKNIOestDacKi7aKO3DGqLD2yM7fT2BGWGSpCoZaC1x9zkR42mVpiuNoSfKnSSWJmvLHqXBmeIxNvjwtriAGGD1ubrD2OGcqm8xdzj6fL0ZqK2L4CbrMzXOISeHnWTXpetZqG2d6y+FHCPJnuY6PH0GnOR0+Tq/f7+g7PEQ4yl8/j5Yp+06/P1+/393+vw2Ofsq8zXKHuY9fn69/r7o8fTW5uxtNHblb3LCmeIT5OrosXSMX+budHbu9PdIm+OvNPdhLPDAGOF////pnTxhQAAAIB0Uk5T/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////wA4BUtnAAAMg0lEQVR42uzd+V/aTAIGcEBE3iAeUCuKB4eCRdqKFVQochi0uC6trla6vhKKinhXX7d7Z/71nZkcBKptd9e3+n7e5/khJiEN+HVmMhnSxESQ744JBMACFrCABSxggQBYwAIWsIAFLBAAC1jAAhawgAUCYAELWMACFrBAACxgAQtYwAIWCIAFLGABC1jAAgGwgAUsYAELWCAAFrCABSxgAQsEwAIWsIAFLGCBAFjAAhawgAUsEAALWMACFrCABQJgAQtYwAIWsEAALGABC1jAAhYIgAUsYAELWMACAbCABSxgAQtYIAAWsIAFLGD9gPzUHmDdnaua3ZBYch9Yd6fzLxvGeBaAdXdOBmVjvGizvpbxqayenZX3wPpam1VfE5pZK8wD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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.um.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.um.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>MIIEbzCCA1egAwIBAgIQGydARAgRllyMchH9n/20tDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDQwNTAwMDAwMFoXDTE2MDQwNDIzNTk1OVowPzEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAuYWFpLnVuaS1tYi5zaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMv6FWZcSMfkJ+dCXrrcOo1XQSgikBMybpgcNAXvC3tyBidPt+UCLzJ9OM2XxHJRLlsQOQPW8w+NkaU8oshs0WmzzJkoIppOEF6mul3htBqIVCZmvv0IWOsrzMHbgx3IPfy4/pKmWueLPMXVHt+5a3NarBSs076LruJIXBkllrgou6gMYUg7T5HdHv8tqOtZpgt/5zB5jhRsHVROwm/bc6bKQby7/+LsrjQBARyMRpPrU6u4ROVVwRSvNKyZTI4YPzLyHXpqxcogaMLmlMPeZsswn3Pn9qR/e0NLxodr4E9MNYbZcwcs8P+jp4ebYBBuJWNOhLT33rpzicgHy9akBRsCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRQW7zSmEln7cleE8f8x+ZF/uPrsTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLmFhaS51bmktbWIuc2kwDQYJKoZIhvcNAQEFBQADggEBAIsg2qCwCHmOsJc+3CUrzTePQ/io9QMewsIFZGy8hTJIwssWzBHHQIqk782ZJmTgSh5/HDfbWdk0+GA+B9+qkelpajcmAdAWD9BxLexSH2TAtwiFO5n4q9oSpeCa+QujOWdGv8OlV4YGISalLkq07D3IpOGOJF3RReO5/lRRsynXCbkfe5bb4OE4rWXhAxGhbaQmd6dAy/40TOVMeDW+TEyKoEhaAsbX9Gfoe5YG/rhT51omx6cw81B1kMNJfFWI05n6aD86Q5SHYUTtGtDLzXHR1mA827Sm3Xz5tS2MUTshXqBc2pCVp5QcXd6T9SkUAJLFvn+8quGij9fEluFGvgU=</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>MIIEbzCCA1egAwIBAgIQGydARAgRllyMchH9n/20tDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDQwNTAwMDAwMFoXDTE2MDQwNDIzNTk1OVowPzEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAuYWFpLnVuaS1tYi5zaTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMv6FWZcSMfkJ+dCXrrcOo1XQSgikBMybpgcNAXvC3tyBidPt+UCLzJ9OM2XxHJRLlsQOQPW8w+NkaU8oshs0WmzzJkoIppOEF6mul3htBqIVCZmvv0IWOsrzMHbgx3IPfy4/pKmWueLPMXVHt+5a3NarBSs076LruJIXBkllrgou6gMYUg7T5HdHv8tqOtZpgt/5zB5jhRsHVROwm/bc6bKQby7/+LsrjQBARyMRpPrU6u4ROVVwRSvNKyZTI4YPzLyHXpqxcogaMLmlMPeZsswn3Pn9qR/e0NLxodr4E9MNYbZcwcs8P+jp4ebYBBuJWNOhLT33rpzicgHy9akBRsCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRQW7zSmEln7cleE8f8x+ZF/uPrsTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLmFhaS51bmktbWIuc2kwDQYJKoZIhvcNAQEFBQADggEBAIsg2qCwCHmOsJc+3CUrzTePQ/io9QMewsIFZGy8hTJIwssWzBHHQIqk782ZJmTgSh5/HDfbWdk0+GA+B9+qkelpajcmAdAWD9BxLexSH2TAtwiFO5n4q9oSpeCa+QujOWdGv8OlV4YGISalLkq07D3IpOGOJF3RReO5/lRRsynXCbkfe5bb4OE4rWXhAxGhbaQmd6dAy/40TOVMeDW+TEyKoEhaAsbX9Gfoe5YG/rhT51omx6cw81B1kMNJfFWI05n6aD86Q5SHYUTtGtDLzXHR1mA827Sm3Xz5tS2MUTshXqBc2pCVp5QcXd6T9SkUAJLFvn+8quGij9fEluFGvgU=</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.uni-mb.si/idp/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.uni-mb.si/idp/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Univerza v Mariboru</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Univerza v Mariboru</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Univerza v Mariboru</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Univerza v Mariboru</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.um.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.um.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Izidor</md:GivenName>
-    <md:SurName>Golob</md:SurName>
-    <md:EmailAddress>mailto:izidor.golob@uni-mb.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:skrbnik@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gorazd</md:GivenName>
-    <md:SurName>Ropoša</md:SurName>
-    <md:EmailAddress>mailto:gorazd.roposa@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Danijel</md:GivenName>
-    <md:SurName>Rebolj</md:SurName>
-    <md:EmailAddress>mailto:danijel.rebolj@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janez</md:GivenName>
-    <md:SurName>Brezovnik</md:SurName>
-    <md:EmailAddress>mailto:janez.brezovnik@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Albin</md:GivenName>
-    <md:SurName>Bregant</md:SurName>
-    <md:EmailAddress>mailto:albin.bregant@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gorazd</md:GivenName>
-    <md:SurName>Ropoša</md:SurName>
-    <md:EmailAddress>mailto:gorazd.roposa@um.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Izidor</md:GivenName>
-    <md:SurName>Golob</md:SurName>
-    <md:EmailAddress>mailto:izidor.golob@um.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
index 72f6b0fd..36023a52 100644
--- a/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aalto.fi/idp/shibboleth">
-  <md: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-support" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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.aalto.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aalto.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">aalto.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Aalto-yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Aalto University</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Aalto-universitetet</mdui:DisplayName>
         <mdui:Description xml:lang="fi">Aalto-yliopiston opiskelijoita, tutkijoita, opetushenkilökuntaa ja työntekijöitä.</mdui:Description>
         <mdui:Description xml:lang="en">Aalto University students, faculty and employees.</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">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>MIIEZTCCA02gAwIBAgIQfPk0tfjUFfPvbNYjMlu/rDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
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.abcolstudents.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.abcolstudents.ac.uk-shibboleth.xml
deleted file mode 100644
index 36ea2149..00000000
--- a/swamid-interfederations-2.0/idp.abcolstudents.ac.uk-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.abcolstudents.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for North East Scotland College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">abcol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEazCCA1OgAwIBAgIQWFCsR4118wFHf6QomFJIKzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDcwMjAwMDAwMFoXDTE2MDcwMTIzNTk1OVowPTEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuYWJjb2wu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjzjy7IGELdcJY
-						q1+i2nNp8OsBRrVmdLhjRqZlJZ3f1cDOe8yDar0n42y60QPG3jgtsH6FI3B4Lzm6
-						tDNX/v29iFoiyfMQYdYCF7DwAyQFCycwHwEbTcXEdf8Y6IX3jUDqSeP3hgR1+YaQ
-						EeOIJjjSpPzSuL2Ul0zxjmrHJnmBZUEKJz3Ehdtk+cW3LcflKtUhVF72VoaG1z2r
-						J/cNZm2zPe+BIFoy8/M0vgIB4JVHIJQYeSI4Vadd3McgHTM50jbXIRSvcYqfXy9r
-						KNdepJeE6ilKk4xzrN9aBpzBniSJAv1Y6UAoAMMTIaKy2lWi1+RmU4fkX9FK/36p
-						2dSDOx/zAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-						kOO57TAdBgNVHQ4EFgQUI0fnT1n1QGoAHbsRLic/ix/ZO90wDgYDVR0PAQH/BAQD
-						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-						L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-						MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-						LnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5hYmNvbC5hYy51azANBgkq
-						hkiG9w0BAQUFAAOCAQEASrIrG4gq7T0pClccyhnLQPKv8VN78Cs34XPtTOVMRPJ9
-						NMKboL9GLcAJtqBJxfhfehN5IKrSHkjiW9R7b54YbISWT8EXeo3kVq/HpG81oBs/
-						VFJJRgeUUgDx3FaaZvUpArHhcE85b1TQ0THzFfDlla6D5NW9B1rzZnNTA4eosyLT
-						zdwMoCo1HOMHTZjuH7I+gHT9yIAVR6Ta8WuqiuMp6EPNOPa/Hn6o+XnW+QemAn1b
-						TLOnwbPjz3Oj+2iU+qJxX8H1l8Zm0eqdX9jwUEXvY+MQTN7t/l75dboWxoJEgFc2
-						AEc9TSZC/52ZK8pdi8uPrmoni5mnqRFdF8VH/seegw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.abcol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.abcol.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.abcol.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.abcol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.abcol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abcol.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">abcol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEazCCA1OgAwIBAgIQWFCsR4118wFHf6QomFJIKzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDcwMjAwMDAwMFoXDTE2MDcwMTIzNTk1OVowPTEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuYWJjb2wu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjzjy7IGELdcJY
-						q1+i2nNp8OsBRrVmdLhjRqZlJZ3f1cDOe8yDar0n42y60QPG3jgtsH6FI3B4Lzm6
-						tDNX/v29iFoiyfMQYdYCF7DwAyQFCycwHwEbTcXEdf8Y6IX3jUDqSeP3hgR1+YaQ
-						EeOIJjjSpPzSuL2Ul0zxjmrHJnmBZUEKJz3Ehdtk+cW3LcflKtUhVF72VoaG1z2r
-						J/cNZm2zPe+BIFoy8/M0vgIB4JVHIJQYeSI4Vadd3McgHTM50jbXIRSvcYqfXy9r
-						KNdepJeE6ilKk4xzrN9aBpzBniSJAv1Y6UAoAMMTIaKy2lWi1+RmU4fkX9FK/36p
-						2dSDOx/zAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-						kOO57TAdBgNVHQ4EFgQUI0fnT1n1QGoAHbsRLic/ix/ZO90wDgYDVR0PAQH/BAQD
-						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-						L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-						MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-						LnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5hYmNvbC5hYy51azANBgkq
-						hkiG9w0BAQUFAAOCAQEASrIrG4gq7T0pClccyhnLQPKv8VN78Cs34XPtTOVMRPJ9
-						NMKboL9GLcAJtqBJxfhfehN5IKrSHkjiW9R7b54YbISWT8EXeo3kVq/HpG81oBs/
-						VFJJRgeUUgDx3FaaZvUpArHhcE85b1TQ0THzFfDlla6D5NW9B1rzZnNTA4eosyLT
-						zdwMoCo1HOMHTZjuH7I+gHT9yIAVR6Ta8WuqiuMp6EPNOPa/Hn6o+XnW+QemAn1b
-						TLOnwbPjz3Oj+2iU+qJxX8H1l8Zm0eqdX9jwUEXvY+MQTN7t/l75dboWxoJEgFc2
-						AEc9TSZC/52ZK8pdi8uPrmoni5mnqRFdF8VH/seegw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.abcol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.abcol.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">North East Scotland College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">North East Scotland College OLD</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.abcol.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Sherrit</SurName>
-    <EmailAddress>mailto:m.sherrit@nescol.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Sherrit</SurName>
-    <EmailAddress>mailto:m.sherrit@nescol.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.abingdon-witney.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.abingdon-witney.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 80ce1e9c..00000000
--- a/swamid-interfederations-2.0/idp.abingdon-witney.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.abingdon-witney.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Abingdon and Witney College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-02T15:50:56Z">
-      <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 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">abingdon-witney.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Abingdon and Witney College</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://idp.abingdon-witney.ac.uk/idp/images/awcicon16x16.png</mdui:Logo>
-        <mdui:Logo height="80" width="60">https://idp.abingdon-witney.ac.uk/idp/images/awclogored80x60.png</mdui:Logo>
-        <mdui:Logo height="350" width="170">https://idp.abingdon-witney.ac.uk/idp/images/awclogored350x170.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUfiVxgSRDxCzABDMLiAjqfpU+PuMwDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZaWRwLmFiaW5nZG9uLXdpdG5leS5hYy51azAeFw0xNTEw
-						MzAxMDI4MzlaFw0zNTEwMzAxMDI4MzlaMCQxIjAgBgNVBAMMGWlkcC5hYmluZ2Rv
-						bi13aXRuZXkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE
-						5+Ga0Ez064Yi3cnMFh4gYXJEcALYJXGUxUuT7kd4Po3JVVtGLw9bXvZD+0JlUfac
-						3LOg1erBo43Neav8xHPGjvlIbDSJr0xwxSpU6epxbb+kRY/iuEPn0nN/hSWvMJTV
-						GP7Nbuqbw5By1mhlQGQYUXiioDl7PMzJzqT/Gq766AjLDoLMmJroWvPHHkxZ5MK+
-						Oytm9QQw/9CXdWhgj+WB1KarAwwmWCZH39wiA/NUHRqiSW86tlZSRhk5y2LbRP5l
-						wQaU4UiuMXCEzcyLXyssPsV85H+yIlEmEaoNgbEiNA/CUnOrxpsRy0wUUIB48/5V
-						Si0974dTHn/Hh8erV/UtAgMBAAGjeTB3MB0GA1UdDgQWBBTkF099+qcKWGi4cP55
-						kqdWPhj8DzBWBgNVHREETzBNghlpZHAuYWJpbmdkb24td2l0bmV5LmFjLnVrhjBo
-						dHRwczovL2lkcC5hYmluZ2Rvbi13aXRuZXkuYWMudWsvaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBAGJj6+R4nrxc8Fd2fLflEMGvI2XREWPNArMfwkUo
-						v4q4miUqsOldJmmTDn9IfBRN6IfwmY4udAQmMbNKnVe97y1X2iLp/bjbIjebln6M
-						L2SNM2RwupVRDyUhVGSB8Y1oR6KXptKnNsceqpGgWOPUIPQhRN0anlm8Bokd5+Ty
-						httuagrntS9WLIseHe0HmAMwfZqnIBX9uofB1dr6+nibLNxTp8sU1cKvm/qSKii0
-						ktEDvpbOHC8IJyp4vTGgiIy+G08diHDDGRjVx/2NCNGhO8OkYqijFKBFw1sH02N/
-						YCK7eydlkPufBd4mL2wfQ9HGBEq9bbc8w407g/NrkJb/KT8=
-					</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>
-						MIIDTzCCAjegAwIBAgIUPdKuMgQHT3w/Ux+Tj8Vneskj30owDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZaWRwLmFiaW5nZG9uLXdpdG5leS5hYy51azAeFw0xNTEw
-						MzAxMDI4MzRaFw0zNTEwMzAxMDI4MzRaMCQxIjAgBgNVBAMMGWlkcC5hYmluZ2Rv
-						bi13aXRuZXkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCf
-						qKxQIKszUVA4rjh+y7WYlbVtJxD2XtNEtMpfauulelxFx47GVAozNSJE3Yot5FA6
-						WYIGWM8SXe1a/9wrLkWvSbHm09cChSWvdvHpOS5SCqNYoekw72W2Wct/cdyhlwwt
-						4w6QSJJedyEm2wjUuKJGdkw9CBo1xcL3gvb+39fiialCSx4zZFQacMDHhVOtcrDO
-						sOT1akP7jIxaQng0PGHp48MrsVzcRT3t7KMuPiWlF8d/BTcs10EbqFyaV1VrEBJ8
-						sUZk6dlqEBEtdC67V1F4PA9ybCALEtpUfKc1JynjYlkhtuAWVWem4rHgbYew5CRz
-						T+seuy7W1jJHG4/WNR+xAgMBAAGjeTB3MB0GA1UdDgQWBBR0vwEhtdD3PhB7+f7Z
-						cI8O7pfYfjBWBgNVHREETzBNghlpZHAuYWJpbmdkb24td2l0bmV5LmFjLnVrhjBo
-						dHRwczovL2lkcC5hYmluZ2Rvbi13aXRuZXkuYWMudWsvaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBAJFMU/i/7sVsL/3q2Cjpl4xGphIqw/xA5wy2xp0Y
-						mXEPK5mSeZQTmYfQhH8SJeba/CapeXoXzdFwveF0jLgpjB1k4JIsFjeav4IQqO6+
-						jAF8AqOZHF3meSxlyQgoqJGwdrGSIvh4gy+muMh/D5k2TofqIHIxxTm2feb4PuMR
-						cuboNR5MDxzEiHgGBKvFPpea2AENpjgBuRBxogi6LU2jsaB8MjweyZZJLeMYuRrl
-						+0jolUo6/0w181pG0tK3jSqRRG3UAvxp7v/oMkdH+0fNmhbwIEUfAb2wdc2cNLko
-						z/nsVV3bjy7BvANR9zBR2P2kSUigfb8XlBN+FrVImqdtIj8=
-					</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>
-						MIIDTzCCAjegAwIBAgIUASRtwxa77nvzG1pY8eQRuAM5HGcwDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZaWRwLmFiaW5nZG9uLXdpdG5leS5hYy51azAeFw0xNTEw
-						MzAxMDI4MzdaFw0zNTEwMzAxMDI4MzdaMCQxIjAgBgNVBAMMGWlkcC5hYmluZ2Rv
-						bi13aXRuZXkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM
-						zNX2/zEDgoRs6AgceOSWEZREYiIaFzC3kkK8iIQRfn8GLhk0P9qzTeFNlfgewMri
-						T3vbeTPyrgSHIgHpjK0/o9ir3PJMzfove5oywzJomvO7+6EbIuWCmZHoIsbYVhVP
-						d6xR7vpuo2iSpsqsUnNJfSL1eSb7HGgZtuqwUKBnYFQokw/lxBukD5vj94sZowlU
-						pMbSMGdFolws8KSjCJworK61wFwexVwL18X+h47GnAx/zqTDXQOIgLscbPmxHCB9
-						d/HrdXjt9w+nnF/UvhGI/9rypKTL8IgEQpB1gBwwE2ktcGipUXqMBXncZmvzVOS6
-						udqWX73azf7CjZLzQNy1AgMBAAGjeTB3MB0GA1UdDgQWBBSZLe0Cy8n6uaEE8UYu
-						9bYxqg/afzBWBgNVHREETzBNghlpZHAuYWJpbmdkb24td2l0bmV5LmFjLnVrhjBo
-						dHRwczovL2lkcC5hYmluZ2Rvbi13aXRuZXkuYWMudWsvaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBAMKn76gfCQqUoYWVfCHm+nVIjQrFuf7F7rNPCJN4
-						Ja1bp8nmhnWuJj4oW7T6iyX2+ttXVd0vMzrqBM0qETG1rzTYJjuLvTjKwRAsIrlJ
-						/Cc5iY6Xa5jfUoSMTAnuLZ9h/UIkPIMkeFfxG9qK5pE7s7piGPO7tUccAU0DQVCY
-						duE2wbUYZNfHwieygpg0Kn8n34Qjpddp4KNN5gwBoKll/x6fIczePfg37VQcrq44
-						ObrTbjOI4EheoS793EIihLWUkN1/1P2rZI+KhAgXqOtnpaUKdga6z8BjQExpJMzr
-						Wrt0e8XJ7W1dmFHPHsp9LRKIPSbXP+gDI+GHEQGxXxAmUYk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.abingdon-witney.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.abingdon-witney.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.abingdon-witney.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.abingdon-witney.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.abingdon-witney.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abingdon-witney.ac.uk/idp/profile/SAML2/Redirect/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">abingdon-witney.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUfiVxgSRDxCzABDMLiAjqfpU+PuMwDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZaWRwLmFiaW5nZG9uLXdpdG5leS5hYy51azAeFw0xNTEw
-						MzAxMDI4MzlaFw0zNTEwMzAxMDI4MzlaMCQxIjAgBgNVBAMMGWlkcC5hYmluZ2Rv
-						bi13aXRuZXkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE
-						5+Ga0Ez064Yi3cnMFh4gYXJEcALYJXGUxUuT7kd4Po3JVVtGLw9bXvZD+0JlUfac
-						3LOg1erBo43Neav8xHPGjvlIbDSJr0xwxSpU6epxbb+kRY/iuEPn0nN/hSWvMJTV
-						GP7Nbuqbw5By1mhlQGQYUXiioDl7PMzJzqT/Gq766AjLDoLMmJroWvPHHkxZ5MK+
-						Oytm9QQw/9CXdWhgj+WB1KarAwwmWCZH39wiA/NUHRqiSW86tlZSRhk5y2LbRP5l
-						wQaU4UiuMXCEzcyLXyssPsV85H+yIlEmEaoNgbEiNA/CUnOrxpsRy0wUUIB48/5V
-						Si0974dTHn/Hh8erV/UtAgMBAAGjeTB3MB0GA1UdDgQWBBTkF099+qcKWGi4cP55
-						kqdWPhj8DzBWBgNVHREETzBNghlpZHAuYWJpbmdkb24td2l0bmV5LmFjLnVrhjBo
-						dHRwczovL2lkcC5hYmluZ2Rvbi13aXRuZXkuYWMudWsvaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBAGJj6+R4nrxc8Fd2fLflEMGvI2XREWPNArMfwkUo
-						v4q4miUqsOldJmmTDn9IfBRN6IfwmY4udAQmMbNKnVe97y1X2iLp/bjbIjebln6M
-						L2SNM2RwupVRDyUhVGSB8Y1oR6KXptKnNsceqpGgWOPUIPQhRN0anlm8Bokd5+Ty
-						httuagrntS9WLIseHe0HmAMwfZqnIBX9uofB1dr6+nibLNxTp8sU1cKvm/qSKii0
-						ktEDvpbOHC8IJyp4vTGgiIy+G08diHDDGRjVx/2NCNGhO8OkYqijFKBFw1sH02N/
-						YCK7eydlkPufBd4mL2wfQ9HGBEq9bbc8w407g/NrkJb/KT8=
-					</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>
-						MIIDTzCCAjegAwIBAgIUPdKuMgQHT3w/Ux+Tj8Vneskj30owDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZaWRwLmFiaW5nZG9uLXdpdG5leS5hYy51azAeFw0xNTEw
-						MzAxMDI4MzRaFw0zNTEwMzAxMDI4MzRaMCQxIjAgBgNVBAMMGWlkcC5hYmluZ2Rv
-						bi13aXRuZXkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCf
-						qKxQIKszUVA4rjh+y7WYlbVtJxD2XtNEtMpfauulelxFx47GVAozNSJE3Yot5FA6
-						WYIGWM8SXe1a/9wrLkWvSbHm09cChSWvdvHpOS5SCqNYoekw72W2Wct/cdyhlwwt
-						4w6QSJJedyEm2wjUuKJGdkw9CBo1xcL3gvb+39fiialCSx4zZFQacMDHhVOtcrDO
-						sOT1akP7jIxaQng0PGHp48MrsVzcRT3t7KMuPiWlF8d/BTcs10EbqFyaV1VrEBJ8
-						sUZk6dlqEBEtdC67V1F4PA9ybCALEtpUfKc1JynjYlkhtuAWVWem4rHgbYew5CRz
-						T+seuy7W1jJHG4/WNR+xAgMBAAGjeTB3MB0GA1UdDgQWBBR0vwEhtdD3PhB7+f7Z
-						cI8O7pfYfjBWBgNVHREETzBNghlpZHAuYWJpbmdkb24td2l0bmV5LmFjLnVrhjBo
-						dHRwczovL2lkcC5hYmluZ2Rvbi13aXRuZXkuYWMudWsvaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBAJFMU/i/7sVsL/3q2Cjpl4xGphIqw/xA5wy2xp0Y
-						mXEPK5mSeZQTmYfQhH8SJeba/CapeXoXzdFwveF0jLgpjB1k4JIsFjeav4IQqO6+
-						jAF8AqOZHF3meSxlyQgoqJGwdrGSIvh4gy+muMh/D5k2TofqIHIxxTm2feb4PuMR
-						cuboNR5MDxzEiHgGBKvFPpea2AENpjgBuRBxogi6LU2jsaB8MjweyZZJLeMYuRrl
-						+0jolUo6/0w181pG0tK3jSqRRG3UAvxp7v/oMkdH+0fNmhbwIEUfAb2wdc2cNLko
-						z/nsVV3bjy7BvANR9zBR2P2kSUigfb8XlBN+FrVImqdtIj8=
-					</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>
-						MIIDTzCCAjegAwIBAgIUASRtwxa77nvzG1pY8eQRuAM5HGcwDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZaWRwLmFiaW5nZG9uLXdpdG5leS5hYy51azAeFw0xNTEw
-						MzAxMDI4MzdaFw0zNTEwMzAxMDI4MzdaMCQxIjAgBgNVBAMMGWlkcC5hYmluZ2Rv
-						bi13aXRuZXkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDM
-						zNX2/zEDgoRs6AgceOSWEZREYiIaFzC3kkK8iIQRfn8GLhk0P9qzTeFNlfgewMri
-						T3vbeTPyrgSHIgHpjK0/o9ir3PJMzfove5oywzJomvO7+6EbIuWCmZHoIsbYVhVP
-						d6xR7vpuo2iSpsqsUnNJfSL1eSb7HGgZtuqwUKBnYFQokw/lxBukD5vj94sZowlU
-						pMbSMGdFolws8KSjCJworK61wFwexVwL18X+h47GnAx/zqTDXQOIgLscbPmxHCB9
-						d/HrdXjt9w+nnF/UvhGI/9rypKTL8IgEQpB1gBwwE2ktcGipUXqMBXncZmvzVOS6
-						udqWX73azf7CjZLzQNy1AgMBAAGjeTB3MB0GA1UdDgQWBBSZLe0Cy8n6uaEE8UYu
-						9bYxqg/afzBWBgNVHREETzBNghlpZHAuYWJpbmdkb24td2l0bmV5LmFjLnVrhjBo
-						dHRwczovL2lkcC5hYmluZ2Rvbi13aXRuZXkuYWMudWsvaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBAMKn76gfCQqUoYWVfCHm+nVIjQrFuf7F7rNPCJN4
-						Ja1bp8nmhnWuJj4oW7T6iyX2+ttXVd0vMzrqBM0qETG1rzTYJjuLvTjKwRAsIrlJ
-						/Cc5iY6Xa5jfUoSMTAnuLZ9h/UIkPIMkeFfxG9qK5pE7s7piGPO7tUccAU0DQVCY
-						duE2wbUYZNfHwieygpg0Kn8n34Qjpddp4KNN5gwBoKll/x6fIczePfg37VQcrq44
-						ObrTbjOI4EheoS793EIihLWUkN1/1P2rZI+KhAgXqOtnpaUKdga6z8BjQExpJMzr
-						Wrt0e8XJ7W1dmFHPHsp9LRKIPSbXP+gDI+GHEQGxXxAmUYk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.abingdon-witney.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Abingdon and Witney College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Abingdon and Witney College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.abingdon-witney.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT services</GivenName>
-    <EmailAddress>mailto:itservices@abingdon-witney.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT services</GivenName>
-    <EmailAddress>mailto:itservices@abingdon-witney.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
index 84136891..8889ea8a 100644
--- a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.abo.fi/idp/shibboleth">
-  <md: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-support" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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.abo.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abo.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">abo.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Åbo Akademi</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Åbo Akademi</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Åbo Akademi University</mdui:DisplayName>
@@ -27,12 +17,16 @@
         <mdui:InformationURL xml:lang="sv">http://www.abo.fi/?lang=sv</mdui:InformationURL>
         <mdui:InformationURL xml:lang="fi">http://www.abo.fi/?lang=fi</mdui:InformationURL>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:DomainHint>abo.fi</mdui:DomainHint>
       </mdui:DiscoHints>
+      <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>MIIEYjCCA0qgAwIBAgIRAPtd73PPNmqn8n4RXo42m8MwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
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 4b24448a..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">Abo Akademi</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Abo Akademi University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Abo Akademi</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Abo Akademi</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Abo Akademi University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Abo 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.accross.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.accross.ac.uk-shibboleth.xml
deleted file mode 100644
index ee533f87..00000000
--- a/swamid-interfederations-2.0/idp.accross.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.accross.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Accrington and Rossendale College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-22T16:16:19Z">
-      <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 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">accross.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Accrington &amp; Rossendale College</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://idp.accross.ac.uk/images/accross-logo-80x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.accross.ac.uk/images/accross-logo-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAMq0Vv+YzRX5vh1Y4Lz5r1/3SHdQMA0GCSqGSIb3DQEB
-						CwUAMBwxGjAYBgNVBAMMEWlkcC5hY2Nyb3NzLmFjLnVrMB4XDTE1MTAyNzE1MTEz
-						MloXDTM1MTAyNzE0MTEzMlowHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEf3f2kDlcQudZo2BnnfZT
-						o+vRcMMqKaQUOZNtQD0iivKzOYrXPcDm+CMAEpN87i1RCFJy1M9QiQ8Mtxmz7vsI
-						bo+zvEag/AXcYeHw2MJ2dPosbcMAyvpACm+ggaiP8ztSDNHBoPlMO2G/CEVHDwSa
-						xR/sYYwY2hBsx7R0qj0YjjFOHN2oxOLl38ZhJRMysJlIY/u/e+/2ILn8PP/db7yW
-						pz3IBqa3ZMiLVuG5nor7fDi0H9197SUho0jxOfSa2w21Z3Zdrx63Ka/X62N1eLac
-						Ir8DCMGfZpteEU66nPic1M8Xzy1LPopRZfS/ZLBIav0wTXvTH7HDYaprV4fjVg2/
-						AgMBAAGjZTBjMB0GA1UdDgQWBBT3IpR0IYKNNbwPaxuzlDSfVa3rNjBCBgNVHREE
-						OzA5ghFpZHAuYWNjcm9zcy5hYy51a4YkaHR0cHM6Ly9pZHAuYWNjcm9zcy5hYy51
-						ay9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAbTKEBm/sKKxkxLAjL7LTx
-						qE9AVbOg/uvlmTL4pxbnThjx8fd2TgmfcRMBwP9LD+lVm/+pGL+g1Soh89B7cKlD
-						HQBfNfaO0fNonctx6BSm4guSCWHY36kJpGPpIEHGddDrodFKoUYr/O31xOlSY7Xf
-						ioOjA5atLkYpYe4x5hRnbqQqnYrHpbO8MQU+zMXjI08WOfYKuOKRdu1NlE65f8cI
-						tHR3hAmLNxQ4sbUmRJV6QzY9lbrEyI1fpwSFW0ly/RrvzaDSXeaCvfe8OzVcLubM
-						4S3BP+CQStlZdm89skKfpQuf+o7uQWXoM1IYlPfkjUY2sTh6y4fl7HAjLXoLWDa5
-					</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>
-						MIIDKzCCAhOgAwIBAgIUL734gRp+xFc7syC52EK33icqG0wwDQYJKoZIhvcNAQEL
-						BQAwHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWswHhcNMTUxMDI3MTUxMTMw
-						WhcNMzUxMDI3MTQxMTMwWjAcMRowGAYDVQQDDBFpZHAuYWNjcm9zcy5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKiskedri/4S0ZaAkzb04v4J
-						r4lZrQRE6Eva7bOHswGhr8OjOHOOFJEp8kQCj6ESQDevjWXNo8bIBKH2OV2cq0V8
-						CBzquhgLS037NWR1ay11YowkUxbSvv7LbVbqu3itrtciCtENmILDRWi+Al7tC0iY
-						jQ9UJH7A3L0vXagu+UWR9t7H5zkDzoMOaTETq+kU4Jz2vF5YiIEBMwpSnA0QibtV
-						XLUbKm5eyuxmIPD4Z+uYUpZi5vCssFh5Aanr8ZOIzAzywgFuQzY7bb76JY4NS5W2
-						W7uST4/DdcQbmDP337oj/wFieSPwhtGmozic0s+155NqN1NKvXB6O6keQaYDje0C
-						AwEAAaNlMGMwHQYDVR0OBBYEFG2PqgAQLBQ38kIwFP0AH2CMSnL1MEIGA1UdEQQ7
-						MDmCEWlkcC5hY2Nyb3NzLmFjLnVrhiRodHRwczovL2lkcC5hY2Nyb3NzLmFjLnVr
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAD8z8ok3fxo9p6cQfkMNcFxN
-						g8iADZJoS5Mqdpfu/BR+s0Z0LFELHsAJux7DIWwxqMnY4pd4LpyhN5HZhSG8pCQw
-						zkDO1S1Bxew7VjM+FNpMonQduCZSQ7EZmvJ+zSrotdy1XfuNmn3PnPs9ku7MzJEq
-						SCodGjndUk+PMY7u6GAhkEUv0nS6gXSqJBe9sdq0Vt/Oe6O4Bp4sZa+arc+3U/QK
-						HH7m3nc5OkK4HzPj+3ttOdXsoM7prcEziHkXbO/yxUp0j3s2oLgqZWHOwEqzY0a+
-						IRRswVGPP8t4dQnVn8iyvb3Omzzk/tgM/VO4yfA+vG5ILv/moWR9ppjEaeHdj+Y=
-					</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>
-						MIIDLDCCAhSgAwIBAgIVALHFYHDwuzoc1vC86QChN5nghZOFMA0GCSqGSIb3DQEB
-						CwUAMBwxGjAYBgNVBAMMEWlkcC5hY2Nyb3NzLmFjLnVrMB4XDTE1MTAyNzE1MTEz
-						MloXDTM1MTAyNzE0MTEzMlowHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCob8/Gmg9U/DPhw8H9PXG1
-						mEyn+QNb3c33qcyIZXw/0UWs2HKZXCOF8QjXYgZW1zIhC9ibvLkbvdZbOmH1FJYL
-						nm4A1rORc5Ow5nOHkHdN56dwwgbaJsR1rTmuP3WGU6Pvua+Nqjbg4ndzRdUcwbWl
-						W8JAoGZrbLT0HddsS4nMYmRLYKlN6/Es3nICz2mCsdz36C0mNCYMwBXAoxGmOqaE
-						R68Z1lIZCD8ywzOYke8fBsMztyK8UXytKkz/CGDrJWhvOlsaoBdbpZqeCr0GFoTL
-						GJ1cKXD7Td+NMsAtRBh1Wxo5buyqTTxjddLayVAYgMwkjc3xVRPXP4n3qPYw/spv
-						AgMBAAGjZTBjMB0GA1UdDgQWBBQYskrYA5h5kOnt5tEJzmD1Sd3/OzBCBgNVHREE
-						OzA5ghFpZHAuYWNjcm9zcy5hYy51a4YkaHR0cHM6Ly9pZHAuYWNjcm9zcy5hYy51
-						ay9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBolSV/bXek2SBV8CgbLm0z
-						DuT+eMdm6f+qJ2FkosenPbM/0s68vxf3/ryr25n1RTggANdD5BZGUYDZzxAB9t9s
-						ZssCldB6LApXDZhUtnGbgnynlY8v2SrMvBGbDfS+A/3CMJ+VWZVQ348Dge7m03ty
-						yFhzTModCkKjDd5E9xHt9cSfImH6vYIWvenDdSUhQqf9SUXk44+mk7vuo4bykIhW
-						pI/E1tMBlsPPGnq2dJWNouCPVS8VeIrYX4mmdBp2pW7GY5QsUp+zjM7J8xSLLuiO
-						P2UJp9bK8uFepWiwmKCO4nroELlmRYJOpJebxeA8OI8dGguscbzpHCJLDQEJIp2G
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.accross.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.accross.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.accross.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.accross.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.accross.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 urn:oasis:names">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">accross.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					MIIDLDCCAhSgAwIBAgIVAMq0Vv+YzRX5vh1Y4Lz5r1/3SHdQMA0GCSqGSIb3DQEB
-					CwUAMBwxGjAYBgNVBAMMEWlkcC5hY2Nyb3NzLmFjLnVrMB4XDTE1MTAyNzE1MTEz
-					MloXDTM1MTAyNzE0MTEzMlowHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWsw
-					ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEf3f2kDlcQudZo2BnnfZT
-					o+vRcMMqKaQUOZNtQD0iivKzOYrXPcDm+CMAEpN87i1RCFJy1M9QiQ8Mtxmz7vsI
-					bo+zvEag/AXcYeHw2MJ2dPosbcMAyvpACm+ggaiP8ztSDNHBoPlMO2G/CEVHDwSa
-					xR/sYYwY2hBsx7R0qj0YjjFOHN2oxOLl38ZhJRMysJlIY/u/e+/2ILn8PP/db7yW
-					pz3IBqa3ZMiLVuG5nor7fDi0H9197SUho0jxOfSa2w21Z3Zdrx63Ka/X62N1eLac
-					Ir8DCMGfZpteEU66nPic1M8Xzy1LPopRZfS/ZLBIav0wTXvTH7HDYaprV4fjVg2/
-					AgMBAAGjZTBjMB0GA1UdDgQWBBT3IpR0IYKNNbwPaxuzlDSfVa3rNjBCBgNVHREE
-					OzA5ghFpZHAuYWNjcm9zcy5hYy51a4YkaHR0cHM6Ly9pZHAuYWNjcm9zcy5hYy51
-					ay9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAbTKEBm/sKKxkxLAjL7LTx
-					qE9AVbOg/uvlmTL4pxbnThjx8fd2TgmfcRMBwP9LD+lVm/+pGL+g1Soh89B7cKlD
-					HQBfNfaO0fNonctx6BSm4guSCWHY36kJpGPpIEHGddDrodFKoUYr/O31xOlSY7Xf
-					ioOjA5atLkYpYe4x5hRnbqQqnYrHpbO8MQU+zMXjI08WOfYKuOKRdu1NlE65f8cI
-					tHR3hAmLNxQ4sbUmRJV6QzY9lbrEyI1fpwSFW0ly/RrvzaDSXeaCvfe8OzVcLubM
-					4S3BP+CQStlZdm89skKfpQuf+o7uQWXoM1IYlPfkjUY2sTh6y4fl7HAjLXoLWDa5
-				</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>
-						MIIDKzCCAhOgAwIBAgIUL734gRp+xFc7syC52EK33icqG0wwDQYJKoZIhvcNAQEL
-						BQAwHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWswHhcNMTUxMDI3MTUxMTMw
-						WhcNMzUxMDI3MTQxMTMwWjAcMRowGAYDVQQDDBFpZHAuYWNjcm9zcy5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKiskedri/4S0ZaAkzb04v4J
-						r4lZrQRE6Eva7bOHswGhr8OjOHOOFJEp8kQCj6ESQDevjWXNo8bIBKH2OV2cq0V8
-						CBzquhgLS037NWR1ay11YowkUxbSvv7LbVbqu3itrtciCtENmILDRWi+Al7tC0iY
-						jQ9UJH7A3L0vXagu+UWR9t7H5zkDzoMOaTETq+kU4Jz2vF5YiIEBMwpSnA0QibtV
-						XLUbKm5eyuxmIPD4Z+uYUpZi5vCssFh5Aanr8ZOIzAzywgFuQzY7bb76JY4NS5W2
-						W7uST4/DdcQbmDP337oj/wFieSPwhtGmozic0s+155NqN1NKvXB6O6keQaYDje0C
-						AwEAAaNlMGMwHQYDVR0OBBYEFG2PqgAQLBQ38kIwFP0AH2CMSnL1MEIGA1UdEQQ7
-						MDmCEWlkcC5hY2Nyb3NzLmFjLnVrhiRodHRwczovL2lkcC5hY2Nyb3NzLmFjLnVr
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAD8z8ok3fxo9p6cQfkMNcFxN
-						g8iADZJoS5Mqdpfu/BR+s0Z0LFELHsAJux7DIWwxqMnY4pd4LpyhN5HZhSG8pCQw
-						zkDO1S1Bxew7VjM+FNpMonQduCZSQ7EZmvJ+zSrotdy1XfuNmn3PnPs9ku7MzJEq
-						SCodGjndUk+PMY7u6GAhkEUv0nS6gXSqJBe9sdq0Vt/Oe6O4Bp4sZa+arc+3U/QK
-						HH7m3nc5OkK4HzPj+3ttOdXsoM7prcEziHkXbO/yxUp0j3s2oLgqZWHOwEqzY0a+
-						IRRswVGPP8t4dQnVn8iyvb3Omzzk/tgM/VO4yfA+vG5ILv/moWR9ppjEaeHdj+Y=
-					</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>
-						MIIDLDCCAhSgAwIBAgIVALHFYHDwuzoc1vC86QChN5nghZOFMA0GCSqGSIb3DQEB
-						CwUAMBwxGjAYBgNVBAMMEWlkcC5hY2Nyb3NzLmFjLnVrMB4XDTE1MTAyNzE1MTEz
-						MloXDTM1MTAyNzE0MTEzMlowHDEaMBgGA1UEAwwRaWRwLmFjY3Jvc3MuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCob8/Gmg9U/DPhw8H9PXG1
-						mEyn+QNb3c33qcyIZXw/0UWs2HKZXCOF8QjXYgZW1zIhC9ibvLkbvdZbOmH1FJYL
-						nm4A1rORc5Ow5nOHkHdN56dwwgbaJsR1rTmuP3WGU6Pvua+Nqjbg4ndzRdUcwbWl
-						W8JAoGZrbLT0HddsS4nMYmRLYKlN6/Es3nICz2mCsdz36C0mNCYMwBXAoxGmOqaE
-						R68Z1lIZCD8ywzOYke8fBsMztyK8UXytKkz/CGDrJWhvOlsaoBdbpZqeCr0GFoTL
-						GJ1cKXD7Td+NMsAtRBh1Wxo5buyqTTxjddLayVAYgMwkjc3xVRPXP4n3qPYw/spv
-						AgMBAAGjZTBjMB0GA1UdDgQWBBQYskrYA5h5kOnt5tEJzmD1Sd3/OzBCBgNVHREE
-						OzA5ghFpZHAuYWNjcm9zcy5hYy51a4YkaHR0cHM6Ly9pZHAuYWNjcm9zcy5hYy51
-						ay9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBolSV/bXek2SBV8CgbLm0z
-						DuT+eMdm6f+qJ2FkosenPbM/0s68vxf3/ryr25n1RTggANdD5BZGUYDZzxAB9t9s
-						ZssCldB6LApXDZhUtnGbgnynlY8v2SrMvBGbDfS+A/3CMJ+VWZVQ348Dge7m03ty
-						yFhzTModCkKjDd5E9xHt9cSfImH6vYIWvenDdSUhQqf9SUXk44+mk7vuo4bykIhW
-						pI/E1tMBlsPPGnq2dJWNouCPVS8VeIrYX4mmdBp2pW7GY5QsUp+zjM7J8xSLLuiO
-						P2UJp9bK8uFepWiwmKCO4nroELlmRYJOpJebxeA8OI8dGguscbzpHCJLDQEJIp2G
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.accross.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Accrington and Rossendale College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Accrington &amp; Rossendale College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.accross.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Carol</GivenName>
-    <SurName>Visser</SurName>
-    <EmailAddress>mailto:cvisser@accross.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Shipway</SurName>
-    <EmailAddress>mailto:mshipway@accross.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 d54a51f0..00000000
--- a/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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="de">ACOnet Team</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ACOnet staff</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider des ACOnet-Teams</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for ACOnet staff</mdui:Description>
-        <mdui:Logo width="137" height="60">https://idp.aco.net/logos/137x60.gif</mdui:Logo>
-        <mdui:Logo width="16" height="16">https://eduid.at/style/aconet16x16.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.aco.net/organisation.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.aco.net/organisation.html?L=1</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 Team</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ACOnet staff</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 6d8cf509..00000000
--- a/swamid-interfederations-2.0/idp.aco.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.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"/>
-  </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>
-      <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: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>
-      <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>ACOnet</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@aco.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.acs-schools.com-openathens.xml b/swamid-interfederations-2.0/idp.acs-schools.com-openathens.xml
deleted file mode 100644
index 78e8e00d..00000000
--- a/swamid-interfederations-2.0/idp.acs-schools.com-openathens.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.acs-schools.com/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for ACS International Schools Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T17:22:59Z"/>
-  </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">acs-schools.com</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/acs-schools.com/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/acs-schools.com/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ACS Schools</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.acs-schools.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</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 242223ab..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.admin.grnet.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.admin.grnet.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.admin.grnet.gr/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.admin.grnet.gr/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">grnet-hq.admin.grnet.gr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.admin.grnet.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Greek Research and Technology Network</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Greek Research and Technology Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
-    <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:Company>Greek Research and Technology Network</md:Company>
-    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-    <md:TelephoneNumber>+30-2109569181</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>GRNET headquarters</md:Company>
-    <md:EmailAddress>support@admin.grnet.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-2107474275</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 de5b7cf6..00000000
--- a/swamid-interfederations-2.0/idp.admin.grnet.gr.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://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: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>
-                            MIIEpDCCA4ygAwIBAgIRAKGPd452mGFc3b3N6ZmgGQYwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMjAyMDkwMDAwMDBaFw0xNTAyMDgyMzU5NTlaMHwxCzAJBgNV
-                            BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
-                            ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEbMBkGA1UE
-                            AxMSaWRwLmFkbWluLmdybmV0LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-                            CgKCAQEAsWs2s179mep3fvpBmZBSPEQddRjZHqOYoeoh4uGIb2y91ZPCfko/dot+
-                            OLk23F1cgil/rZgVda8eVFhClOFXtM2TSOyETpK/q+EzndCRemLy8pCOJDPMe9J5
-                            FPM4IQNaVenL5EHHlBoQlEM6I2BSHGx/KGJaAbYqDXLG5BcyEVtMnUy7jZG9feb1
-                            ij1V54qt4P4/uNtqS1hv1IvrpSrTRFSzIo80f3bY4hKDFhgElrp6Q+eShGW6HWMM
-                            z+UfDi46/eOcmAZAubCDbBpQ+jG/lCcnU36ERzveMgjNlzWCBH8A500xcpuD+WcT
-                            xUykI27QoUx9QE2Fg8GiXPQfiF6d+wIDAQABo4IBZTCCAWEwHwYDVR0jBBgwFoAU
-                            DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNqijEdD34nYXWT6a9gXKvPi
-                            pfSPMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-                            AQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1Ud
-                            HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-                            Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-                            Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-                            Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5hZG1pbi5ncm5l
-                            dC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAAtkgWgP0BN0+d964wIaL+P9428fcrfXo
-                            L95csqyi1G32STgdEp1iv8tNCCTKuMAO/6N0lVqqKw88PlRjAmTmmVUULj2WLQ+X
-                            XZ9OPB4OeL0Iu8VA7Habvf9mRiLjEWsxtZ0OYTB54kVwBvPy2JeBQkkZxYL2e4EV
-                            gZWYYUvA7CBafflULEIQlY//oE17RfFtfnS+XFmHy3/c2++vuSCZzpC6PIkxly1o
-                            chrXCBK9CuZKRCOQ/Muw/1EBhsapcuj6+S/7ddc+ALajq2XpjLewFRIjEsDGy1Xh
-                            ROGYFhnOGXLGpmAVBl+mRonKWzzm26wJfRpxE7pXT9zJw9MNExNUkA==
-                        </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>
-                            MIIEpDCCA4ygAwIBAgIRAKGPd452mGFc3b3N6ZmgGQYwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMjAyMDkwMDAwMDBaFw0xNTAyMDgyMzU5NTlaMHwxCzAJBgNV
-                            BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEuMCwGA1UE
-                            ChMlR3JlZWsgUmVzZWFyY2ggYW5kIFRlY2hub2xvZ3kgTmV0d29yazEbMBkGA1UE
-                            AxMSaWRwLmFkbWluLmdybmV0LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-                            CgKCAQEAsWs2s179mep3fvpBmZBSPEQddRjZHqOYoeoh4uGIb2y91ZPCfko/dot+
-                            OLk23F1cgil/rZgVda8eVFhClOFXtM2TSOyETpK/q+EzndCRemLy8pCOJDPMe9J5
-                            FPM4IQNaVenL5EHHlBoQlEM6I2BSHGx/KGJaAbYqDXLG5BcyEVtMnUy7jZG9feb1
-                            ij1V54qt4P4/uNtqS1hv1IvrpSrTRFSzIo80f3bY4hKDFhgElrp6Q+eShGW6HWMM
-                            z+UfDi46/eOcmAZAubCDbBpQ+jG/lCcnU36ERzveMgjNlzWCBH8A500xcpuD+WcT
-                            xUykI27QoUx9QE2Fg8GiXPQfiF6d+wIDAQABo4IBZTCCAWEwHwYDVR0jBBgwFoAU
-                            DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFNqijEdD34nYXWT6a9gXKvPi
-                            pfSPMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-                            AQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1Ud
-                            HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-                            Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-                            Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-                            Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5hZG1pbi5ncm5l
-                            dC5ncjANBgkqhkiG9w0BAQUFAAOCAQEAAtkgWgP0BN0+d964wIaL+P9428fcrfXo
-                            L95csqyi1G32STgdEp1iv8tNCCTKuMAO/6N0lVqqKw88PlRjAmTmmVUULj2WLQ+X
-                            XZ9OPB4OeL0Iu8VA7Habvf9mRiLjEWsxtZ0OYTB54kVwBvPy2JeBQkkZxYL2e4EV
-                            gZWYYUvA7CBafflULEIQlY//oE17RfFtfnS+XFmHy3/c2++vuSCZzpC6PIkxly1o
-                            chrXCBK9CuZKRCOQ/Muw/1EBhsapcuj6+S/7ddc+ALajq2XpjLewFRIjEsDGy1Xh
-                            ROGYFhnOGXLGpmAVBl+mRonKWzzm26wJfRpxE7pXT9zJw9MNExNUkA==
-                        </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.aegean.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml
deleted file mode 100644
index 6400cfac..00000000
--- a/swamid-interfederations-2.0/idp.aegean.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aegean.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">aegean.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of the Aegean</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Αιγαίου</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.aegean.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.aegean.gr/</mdui:InformationURL>
-        <mdui:Logo height="54" width="125">https://ype.aegean.gr/logo/mdui_aegean_logo_125x54.png</mdui:Logo>
-        <mdui:Logo height="64" width="65">https://ype.aegean.gr/logo/mdui_aegean_logo_65x64.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>admin.aegean.gr</mdui:DomainHint>
-        <mdui:DomainHint>noc.aegean.gr</mdui:DomainHint>
-        <mdui:IPHint>195.251.128.0/18</mdui:IPHint>
-        <mdui:IPHint>2001:648:2050::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:39.085161,26.568544</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>
-                            MIIEaDCCA1CgAwIBAgIRAMYUOgVr0qiLghJGEEbiPEYwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwLmFlZ2Vh
-                            bi5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALI83xoE/W1Xstz+
-                            FJdZFhyuHLCphlxPwQk/w5g+QAA4RjyFPUTJz5UQesKmXbqGHS10EBjOoAzeMx6t
-                            rEERkCitwCSChMFleBadRgjIsM1sNP9YJaWsZtetbUhTKjTsmHims4qXe+gMo1QT
-                            1M++ZbbYYWNKaTDt1rWNuCdSwG/MIr786z96MbKy1zh/7wBVmM/Sfdmon2FOn1NB
-                            q1hJiTf7Z5QsYg9fHSAVviS6Xjl8ZFh74ASfMi+OcHv23Rpd5XYaurHxjFDY1FjI
-                            6P7sPxrclSm9TMBPpLJzBKUToA36KuPAaKWZ2TT6K1dDSApfKnH3Vi71BaZk6Mbj
-                            Abg/CbMCAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-                            47ntMB0GA1UdDgQWBBSsdMSo7r4Cx2K4pGwFyF2a4CbBnjAOBgNVHQ8BAf8EBAMC
-                            BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-                            IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
-                            oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-                            bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-                            dGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwLmFlZ2Vhbi5ncjANBgkqhkiG
-                            9w0BAQUFAAOCAQEASrt6DqtFqpALJEiuSd+VDYQ+n/dTu/fdo/N+lyCbsk0ItiQ5
-                            g0t6JyUGCs2KZf4qiXqk79cC6kKFt7bm4FRTcWCRqDfNJfELjYlDjda39fBhEDwq
-                            PIjhdQO9iNSvCiUA4QfOhVQ2w/MnhgFoOWcn1FX3XTG2xGhFYmhxCOzxUOLLZLph
-                            gymmlTKUo1aNXhZ1OGtFxZVamKj3mgND5NyW/0vfjypSuZC4mpLtegSvQc+tToz+
-                            8rrgJ/4uT/w1V4FnzEWdMmvMjNO6GFMobA5StKvLTZwKMR6TnP7HVOPuacnk6Jse
-                            gdlRNUv8weObUJDrlAGWvVbepBwpG7+UNXa9ew==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aegean.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aegean.gr: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.aegean.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aegean.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aegean.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aegean.gr/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">aegean.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEaDCCA1CgAwIBAgIRAMYUOgVr0qiLghJGEEbiPEYwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwLmFlZ2Vh
-                            bi5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALI83xoE/W1Xstz+
-                            FJdZFhyuHLCphlxPwQk/w5g+QAA4RjyFPUTJz5UQesKmXbqGHS10EBjOoAzeMx6t
-                            rEERkCitwCSChMFleBadRgjIsM1sNP9YJaWsZtetbUhTKjTsmHims4qXe+gMo1QT
-                            1M++ZbbYYWNKaTDt1rWNuCdSwG/MIr786z96MbKy1zh/7wBVmM/Sfdmon2FOn1NB
-                            q1hJiTf7Z5QsYg9fHSAVviS6Xjl8ZFh74ASfMi+OcHv23Rpd5XYaurHxjFDY1FjI
-                            6P7sPxrclSm9TMBPpLJzBKUToA36KuPAaKWZ2TT6K1dDSApfKnH3Vi71BaZk6Mbj
-                            Abg/CbMCAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-                            47ntMB0GA1UdDgQWBBSsdMSo7r4Cx2K4pGwFyF2a4CbBnjAOBgNVHQ8BAf8EBAMC
-                            BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-                            IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
-                            oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-                            bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-                            dGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwLmFlZ2Vhbi5ncjANBgkqhkiG
-                            9w0BAQUFAAOCAQEASrt6DqtFqpALJEiuSd+VDYQ+n/dTu/fdo/N+lyCbsk0ItiQ5
-                            g0t6JyUGCs2KZf4qiXqk79cC6kKFt7bm4FRTcWCRqDfNJfELjYlDjda39fBhEDwq
-                            PIjhdQO9iNSvCiUA4QfOhVQ2w/MnhgFoOWcn1FX3XTG2xGhFYmhxCOzxUOLLZLph
-                            gymmlTKUo1aNXhZ1OGtFxZVamKj3mgND5NyW/0vfjypSuZC4mpLtegSvQc+tToz+
-                            8rrgJ/4uT/w1V4FnzEWdMmvMjNO6GFMobA5StKvLTZwKMR6TnP7HVOPuacnk6Jse
-                            gdlRNUv8weObUJDrlAGWvVbepBwpG7+UNXa9ew==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aegean.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aegean.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of the Aegean</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Αιγαίου</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of the Aegean</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Αιγαίου</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.aegean.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.aegean.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tasos</md:GivenName>
-    <md:SurName>Moschos</md:SurName>
-    <md:EmailAddress>tmos@aegean.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of the Aegean</md:Company>
-    <md:EmailAddress>noc@aegean.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ait.ie-idp-shibboleth.xml
deleted file mode 100644
index a019d5b1..00000000
--- a/swamid-interfederations-2.0/idp.ait.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.ait.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-01-20T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ait.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Athlone Institute of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Institúid Teicneolaíochta Bhaile Átha Luain</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ait.ie/informationforcurrentstudents/</mdui:InformationURL>
-        <mdui:Logo height="73" width="211" xml:lang="en">https://edugate.heanet.ie/rr3/logos/ait.png</mdui:Logo>
-        <mdui:Logo height="73" width="211" xml:lang="en">data:image/png;base64,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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.4108177,-7.8923645</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAKw7msQ/Rhb4chwEi3azizevjePPMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5haXQuaWUwHhcNMTEwMzIxMTUyMjUyWhcNMzEw
-MzIxMTUyMjUyWjAVMRMwEQYDVQQDEwppZHAuYWl0LmllMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAn2HDYEWizKKegiu4xpCgnEqZ9NEa9UV2Yau/py7b
-nNyxI9Y4xyihPx7CqGZEsBdk4buJpVhwMiNk4p0BXtgpUV937E4fsKl1XyHSnFAa
-XQyx6Fw+UtA1/Y74k+WHJ3aOReSL4Jr5PC8NFi//XgaV/uKiXXk7jkwKMrngBZk/
-y+DHZHNPuw3XSED7e6/v+EKWqQ8jpr2GvU+S1+IqVApZ/32XqdidXwJUAc2v1Sw8
-yLrWWtAnYOjSOr0fw9jPGtpJRsCnHa44pDL7zOoS6o3S9+GQxUO0Eqoe9ySq+UEE
-rSxAhaBqQmHODeoeyzGmIF1Y7/JWfOu0PXkgcunGUKQaLQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuYWl0LmllhiFodHRwczovL2lkcC5haXQuaWUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFL/kQjcyF+wSC4KxLfM1LwK9gzp4MA0GCSqGSIb3DQEB
-BQUAA4IBAQCVn5uKkeelZcbCFenjwTSlcv/Ej8IPF3CqN25Eeva1C4PUdwWyo/NS
-mgvDgICYJDo70kxvK5/SBkBlFtlAQ8BVIhRWZIWEXR1z3UJpuUsxKXmN3ESTLI+d
-qJdIBfPThCK9QJgj1/RA/ZAnSMRR/ZWP3Ys/Gse+KhkPKx0Lj6RTO/R32KXPBM+V
-xSS9WVQ7qm9/LoId9C1bBTSgSoE/3190gEO1Rox09dNKh2qZBlxqzg9VWaGodw1+
-S9AlbrF9+Pfu2lmvqmVUw6OQW0Usf6ANTb0pXim274/efX34EVz63en/hFbP97eQ
-Ge5BNlqT3Xh9wwnHhhgTKZivKII/N7hZ
-</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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ait.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ait.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ait.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Athlone Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Athlone Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ait.ie/informationforcurrentstudents/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>COlin</md:GivenName>
-    <md:SurName>Donohue</md:SurName>
-    <md:EmailAddress>mailto:colindonohue@ait.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ian</md:GivenName>
-    <md:SurName>Hallissy</md:SurName>
-    <md:EmailAddress>mailto:ihallissy@ait.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Rossa</md:GivenName>
-    <md:SurName>Coleman</md:SurName>
-    <md:EmailAddress>mailto:rcoleman@ait.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.altoncollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.altoncollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index c9d66f69..00000000
--- a/swamid-interfederations-2.0/idp.altoncollege.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.altoncollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Alton College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-25T10:39:55Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">altoncollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjgCCQC9aDsLCT+yJTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJH
-						QjESMBAGA1UECAwJSGFtcHNoaXJlMQ4wDAYDVQQHDAVBbHRvbjEWMBQGA1UECgwN
-						QWx0b24gQ29sbGVnZTEfMB0GA1UEAwwWaWRwLmFsdG9uY29sbGVnZS5hYy51azAe
-						Fw0xMzAyMTkxNzI0MjRaFw0zMzAyMTQxNzI0MjRaMGoxCzAJBgNVBAYTAkdCMRIw
-						EAYDVQQIDAlIYW1wc2hpcmUxDjAMBgNVBAcMBUFsdG9uMRYwFAYDVQQKDA1BbHRv
-						biBDb2xsZWdlMR8wHQYDVQQDDBZpZHAuYWx0b25jb2xsZWdlLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0QQESMIq4pyRj3urGeRTqGCnKkqI
-						otYZ90HBsx9qQM2WB5/7VjyFdP8SHj9gZXeLODaZQpKHcP/QUPjJkQb8PGLc1C5r
-						TLMN4KcQlNUOHJf7ss60JfVs9YAUC6ClMyY/jB/FTD4o0bAjAbkWt3Bgd6Hd89XC
-						xhZA/oRJ+fYEciD6SwctjIWKRA4s6/+QLy/ON1YugiQNTwa2dhDrx1n4pedE1eVN
-						MpOnkeHHU57ri98ta+KvzayPYSBoC0m+vG8ChxDySdsBsRUBxxU+OUVYRyatgklc
-						FyRx2jIblObP7/MDHsKDtrOj6hhoVqY+QDlIGIo0+FeP4cUMcShCWMDp/wIDAQAB
-						MA0GCSqGSIb3DQEBBQUAA4IBAQApabwAaLn7eBgnFmqTd4VeOcFVN4N4nmNkXcrq
-						YlFfcZEGxH0S8chY5wUg49DwzJlSbOsOBV+xTqeE1wBaEKO+oMRi1iP2eSKucAp7
-						ryH8LDb0Wa6BO80rjG1P0lfYlldDmPGycIF2qhHPIiuKSBxdCptKyHGDBk6kgAnk
-						UtX3A3o6EO/So2nHKr4niblixFI/pkBfbMbln3Yv/ExIpi/TX9r4p/YeJHiSnbGA
-						9HL3TJh7T9W2wwiXCPBrbBXgsMEJbqBD8IqmduocWIEmoS42u/NRDqm2Pd0Xo6ek
-						X3N5HAhy6iR2no15bK6N+a+qaju+C9vIQyHuWCAf3xfr8loi
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.altoncollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.altoncollege.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.altoncollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.altoncollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.altoncollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.altoncollege.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">altoncollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjgCCQC9aDsLCT+yJTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJH
-						QjESMBAGA1UECAwJSGFtcHNoaXJlMQ4wDAYDVQQHDAVBbHRvbjEWMBQGA1UECgwN
-						QWx0b24gQ29sbGVnZTEfMB0GA1UEAwwWaWRwLmFsdG9uY29sbGVnZS5hYy51azAe
-						Fw0xMzAyMTkxNzI0MjRaFw0zMzAyMTQxNzI0MjRaMGoxCzAJBgNVBAYTAkdCMRIw
-						EAYDVQQIDAlIYW1wc2hpcmUxDjAMBgNVBAcMBUFsdG9uMRYwFAYDVQQKDA1BbHRv
-						biBDb2xsZWdlMR8wHQYDVQQDDBZpZHAuYWx0b25jb2xsZWdlLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0QQESMIq4pyRj3urGeRTqGCnKkqI
-						otYZ90HBsx9qQM2WB5/7VjyFdP8SHj9gZXeLODaZQpKHcP/QUPjJkQb8PGLc1C5r
-						TLMN4KcQlNUOHJf7ss60JfVs9YAUC6ClMyY/jB/FTD4o0bAjAbkWt3Bgd6Hd89XC
-						xhZA/oRJ+fYEciD6SwctjIWKRA4s6/+QLy/ON1YugiQNTwa2dhDrx1n4pedE1eVN
-						MpOnkeHHU57ri98ta+KvzayPYSBoC0m+vG8ChxDySdsBsRUBxxU+OUVYRyatgklc
-						FyRx2jIblObP7/MDHsKDtrOj6hhoVqY+QDlIGIo0+FeP4cUMcShCWMDp/wIDAQAB
-						MA0GCSqGSIb3DQEBBQUAA4IBAQApabwAaLn7eBgnFmqTd4VeOcFVN4N4nmNkXcrq
-						YlFfcZEGxH0S8chY5wUg49DwzJlSbOsOBV+xTqeE1wBaEKO+oMRi1iP2eSKucAp7
-						ryH8LDb0Wa6BO80rjG1P0lfYlldDmPGycIF2qhHPIiuKSBxdCptKyHGDBk6kgAnk
-						UtX3A3o6EO/So2nHKr4niblixFI/pkBfbMbln3Yv/ExIpi/TX9r4p/YeJHiSnbGA
-						9HL3TJh7T9W2wwiXCPBrbBXgsMEJbqBD8IqmduocWIEmoS42u/NRDqm2Pd0Xo6ek
-						X3N5HAhy6iR2no15bK6N+a+qaju+C9vIQyHuWCAf3xfr8loi
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.altoncollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.altoncollege.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">Alton College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Alton College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.altoncollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Guy</GivenName>
-    <SurName>Hines-Dedman</SurName>
-    <EmailAddress>mailto:guy.hines-dedman@altoncollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Guy</GivenName>
-    <SurName>Hines-Dedman</SurName>
-    <EmailAddress>mailto:guy.hines-dedman@altoncollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.american.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.american.edu-idp-shibboleth.xml
deleted file mode 100644
index 2cb91d28..00000000
--- a/swamid-interfederations-2.0/idp.american.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +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://idp.american.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">american.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">American University</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>
-MIIDLDCCAhSgAwIBAgIVAJDrEjwuZf7tKwar/iJcnJUpBaD3MA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcC5hbWVyaWNhbi5lZHUwHhcNMTEwNzA2MTc1NDA1
-WhcNMzEwNzA2MTc1NDA1WjAbMRkwFwYDVQQDExBpZHAuYW1lcmljYW4uZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlMec/brVKO//Y6LSzqHWBOtO
-9HvX5R49417xn/3gXnC8OIFyJpZLFDITOPfze8FC8fzgNw7HIDkR9Qvb/sqZ6yys
-rH00gblENowjF7L6b+GnDfjZdGtTSxh72JxkY/Gc/zc1hsA0VwBir12YZxgKX4ta
-ftC1lAeq5qgHDgkitQB8sbXyCdnj+iC1ZYQB2voNvX943W0Zoz9vtAzAYsmsxV3S
-LDvyN8MHBqipXWGWunloRke/JmugBOzYIZ4lGRWY0Upu24GqAhCOcS/tii3FwFZ1
-lxZ/w/wXrNyley32KoIPfY9awbZEMxQZvSWbZ78QXpvMj0m8a10Gloy7AL1n0QID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuYW1lcmljYW4uZWR1hidodHRwczovL2lk
-cC5hbWVyaWNhbi5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIX7x6u7hEbE
-QV3quLr2nrucZDXxMA0GCSqGSIb3DQEBBQUAA4IBAQB3sqVb/IQToX7s/0xMxzEV
-BBG/IQtOiJla3BfOQrcLtakPNX5svAQusE7r2m5YrZlmjuznGg+riNFUYBm0u089
-zTtMuRrRCaxg3NUU2JuqTo17lFNguUB7+uzfop//nu+u7PyT6325o/Bla1iP4HNc
-0Y+NWgqsewCcbwAg9QHGrHef6SAFVkeEwevEEJRB7B3I0TQBPirj9BoZjUVwDwV1
-Qld5H3yair/rrHPwpk3aH+torcKqdV/VlyPcgwXZ1LhqmgBIbQ6jGWZsniwh+xfs
-GSfLlV8bGtUawXlz2hsCK4EGIzVMeGanIBE/kozBqy3Ul6SVPZzxsU2nJCRuIHS5
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.american.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.american.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.american.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.american.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.american.edu/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">american.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAJDrEjwuZf7tKwar/iJcnJUpBaD3MA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcC5hbWVyaWNhbi5lZHUwHhcNMTEwNzA2MTc1NDA1
-WhcNMzEwNzA2MTc1NDA1WjAbMRkwFwYDVQQDExBpZHAuYW1lcmljYW4uZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlMec/brVKO//Y6LSzqHWBOtO
-9HvX5R49417xn/3gXnC8OIFyJpZLFDITOPfze8FC8fzgNw7HIDkR9Qvb/sqZ6yys
-rH00gblENowjF7L6b+GnDfjZdGtTSxh72JxkY/Gc/zc1hsA0VwBir12YZxgKX4ta
-ftC1lAeq5qgHDgkitQB8sbXyCdnj+iC1ZYQB2voNvX943W0Zoz9vtAzAYsmsxV3S
-LDvyN8MHBqipXWGWunloRke/JmugBOzYIZ4lGRWY0Upu24GqAhCOcS/tii3FwFZ1
-lxZ/w/wXrNyley32KoIPfY9awbZEMxQZvSWbZ78QXpvMj0m8a10Gloy7AL1n0QID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuYW1lcmljYW4uZWR1hidodHRwczovL2lk
-cC5hbWVyaWNhbi5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIX7x6u7hEbE
-QV3quLr2nrucZDXxMA0GCSqGSIb3DQEBBQUAA4IBAQB3sqVb/IQToX7s/0xMxzEV
-BBG/IQtOiJla3BfOQrcLtakPNX5svAQusE7r2m5YrZlmjuznGg+riNFUYBm0u089
-zTtMuRrRCaxg3NUU2JuqTo17lFNguUB7+uzfop//nu+u7PyT6325o/Bla1iP4HNc
-0Y+NWgqsewCcbwAg9QHGrHef6SAFVkeEwevEEJRB7B3I0TQBPirj9BoZjUVwDwV1
-Qld5H3yair/rrHPwpk3aH+torcKqdV/VlyPcgwXZ1LhqmgBIbQ6jGWZsniwh+xfs
-GSfLlV8bGtUawXlz2hsCK4EGIzVMeGanIBE/kozBqy3Ul6SVPZzxsU2nJCRuIHS5
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.american.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">American University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">American University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.american.edu/index1.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Saeed Pater-Rov</md:GivenName>
-    <md:EmailAddress>paterrov@american.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Eric Weakland</md:GivenName>
-    <md:EmailAddress>eric@american.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.amersham.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.amersham.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b19d45f9..00000000
--- a/swamid-interfederations-2.0/idp.amersham.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.amersham.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Amersham & Wycombe College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T19:36:23Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">amersham.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Amersham &amp; Wycombe College</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVALWxW6Db2xAPZ4pIJ+T4NU75vxlwMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5hbWVyc2hhbS5hYy51azAeFw0xMzA2MjUwOTAy
-						MDBaFw0zMzA2MjUwOTAyMDBaMB0xGzAZBgNVBAMTEmlkcC5hbWVyc2hhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBkBn27OKELkBJlv3xe
-						xyxrvYJPhrrcBe5aaNzPDLZTjf2zpF92jpg6oyMJv7PQK2HXEx2fHFy/NCXjkDl+
-						pxiqgb7SZJiJ1YGecBRPG1oknGjfUqVXwXTCr26QB33MXVIbgQj1408jC9qdZo9x
-						ncXPgZYFOChtwsfu2U6aGRjikTuLSh4zTsVIFWR/gR8ngaqILV6cYx3tiS2c3rct
-						/porpcnulNMws8d2YzKV3QX6/W6arNh+lPjBs6Vs1BdkvwumJahwuZulIxMQcpZ6
-						7i/JO6SguAWwfbTJTecgXR5gffP6Yu/O33XgL2jk+04YFIn9LUGilJmiybv+NS18
-						//ECAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmFtZXJzaGFtLmFjLnVrhilodHRw
-						czovL2lkcC5hbWVyc2hhbS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						VMTR+Ij7KaIfnySohB/Q57z9M+AwDQYJKoZIhvcNAQEFBQADggEBADSE/dbwVCpK
-						ZrwpDxt4orHeX9/xPeUmxu8+uE34TgjCtmUq1HrkvIIDAQBtJlxcSC3hC4YTCa+S
-						ha1f6ydDdui5qhnXB9lsp3GIoiEQ6dp9+UdugUnugk8Fr+PCkqKg4DLlZDexgWRQ
-						2yYSL7KWBmNJsV+SnTOS2HZcFRKP1JxLjquZ49MXqmb0zm0itXCBkjsTUBbnAkCV
-						Vrs01QqpXSy391maFDQlnzLS9Tf1lDC9k2Ap41tV34a39CdU4hk5eSd1izdg1F/C
-						T1m7Vb/gKNqpwHzxUnfNtZm8EOudFsbqyPO5YIVJ7Bh4GOf1L8q8JTSRwR/Sle0R
-						7tCYiJS1fps=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.amersham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amersham.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.amersham.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amersham.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.amersham.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.amersham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amersham.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">amersham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVALWxW6Db2xAPZ4pIJ+T4NU75vxlwMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5hbWVyc2hhbS5hYy51azAeFw0xMzA2MjUwOTAy
-						MDBaFw0zMzA2MjUwOTAyMDBaMB0xGzAZBgNVBAMTEmlkcC5hbWVyc2hhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBkBn27OKELkBJlv3xe
-						xyxrvYJPhrrcBe5aaNzPDLZTjf2zpF92jpg6oyMJv7PQK2HXEx2fHFy/NCXjkDl+
-						pxiqgb7SZJiJ1YGecBRPG1oknGjfUqVXwXTCr26QB33MXVIbgQj1408jC9qdZo9x
-						ncXPgZYFOChtwsfu2U6aGRjikTuLSh4zTsVIFWR/gR8ngaqILV6cYx3tiS2c3rct
-						/porpcnulNMws8d2YzKV3QX6/W6arNh+lPjBs6Vs1BdkvwumJahwuZulIxMQcpZ6
-						7i/JO6SguAWwfbTJTecgXR5gffP6Yu/O33XgL2jk+04YFIn9LUGilJmiybv+NS18
-						//ECAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmFtZXJzaGFtLmFjLnVrhilodHRw
-						czovL2lkcC5hbWVyc2hhbS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						VMTR+Ij7KaIfnySohB/Q57z9M+AwDQYJKoZIhvcNAQEFBQADggEBADSE/dbwVCpK
-						ZrwpDxt4orHeX9/xPeUmxu8+uE34TgjCtmUq1HrkvIIDAQBtJlxcSC3hC4YTCa+S
-						ha1f6ydDdui5qhnXB9lsp3GIoiEQ6dp9+UdugUnugk8Fr+PCkqKg4DLlZDexgWRQ
-						2yYSL7KWBmNJsV+SnTOS2HZcFRKP1JxLjquZ49MXqmb0zm0itXCBkjsTUBbnAkCV
-						Vrs01QqpXSy391maFDQlnzLS9Tf1lDC9k2Ap41tV34a39CdU4hk5eSd1izdg1F/C
-						T1m7Vb/gKNqpwHzxUnfNtZm8EOudFsbqyPO5YIVJ7Bh4GOf1L8q8JTSRwR/Sle0R
-						7tCYiJS1fps=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.amersham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.amersham.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">Amersham &amp; Wycombe College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Amersham &amp; Wycombe College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.amersham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Phil</GivenName>
-    <SurName>Dawe</SurName>
-    <EmailAddress>mailto:pdawe@amersham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Phil</GivenName>
-    <SurName>Dawe</SurName>
-    <EmailAddress>mailto:pdawe@amersham.ac.uk</EmailAddress>
-  </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 001c29e5..00000000
--- a/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.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" entityID="https://idp.amue.fr/idp/saml2/metadata">
-  <md: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>
-  </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">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="en">AMUE - Agence de Mutualisation des Universités et Etablissements</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACPUlEQVQoz0WSTWvcdRSFn/Ob/39eMi+ZaTohQZKmtJESg0VrKYgLa9d2IQWX0u9gsR+gq+7EhWtBUVzUna2LQsVli2CFSLEgpiZqdLQZZzLJvNzTxST1rB8u5977KCIEZhqDBEZS7OxN7v7Sffhkd/14+eLp1sJsCcg4pJ+jBoH/HcRH33c+3+j0O9393d6V1eaNd9bnm+V0NF1gW4CxYas3/nazNxxFMqOIOw+2bt/fNJGBpjCW5e3d4QGpVkqWQxEJW8mF3v7w8R//ycrAWEB/OL71w/aDv31iqf1SK7vQzt9aqn/WHQ9kK4oFWtUcOYGAvWF8eOena1/+SLXSNwO7WdL1C/Ofvr30ysnjM6VsrjFzbrWNU5JAvr+x8/HXj7qD+POfvsNyEqmcab1dO7e6uNyeffeNldfX5hGZHSZ9cu/RYDhJmb97uLn9tN9dnlurzZ0+lueKtVmffXPp0qlmXkgCxWTy607v8o1vfuuOD2qVVK81qqU0Uy7WK5dfbL5/fmGxWgDr8OgkxJPO3sEgQAGJMMkwmvDVz90vNjqAjj4FTuCD8WhijHAiku2kQshj69bjXcASxNSFZFK7XinmqcBEMokkwk4WxGAsHBCQpnzCrL4we2a5BZmFkGUcCMRKIxdJCJAkkSTKxcIHV15u1TOZUIAksBq5rq63pjBHSQKhV0/N3XzvtYtn2rnSdOmTzfza+YVLJ6rg/20GRQQIYhz+/en+xl+Dre5oppKdXaytNIrlfKraYSXgGXy1Bx0qBeYCAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE0KzAyOjAwAx+NhQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNCswMjowMHJCNTkAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.amue.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">AMUE - Agence de Mutualisation des Universités et Etablissements</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.amue.fr/idp/saml2/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amue.fr/idp/saml2/sso"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">AMUE - Agence de Mutualisation des Universités et Etablissements</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.amue.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>German hurtado</md:SurName>
-    <md:EmailAddress>German.hurtado@amue.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Didier Denjean</md:SurName>
-    <md:EmailAddress>Didier.denjean@amue.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.anglia.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.anglia.ac.uk-openathens.xml
deleted file mode 100644
index 3b5b2cc5..00000000
--- a/swamid-interfederations-2.0/idp.anglia.ac.uk-openathens.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://idp.anglia.ac.uk/openathens">
-  <!--
-		This is an OpenAthens LA IdP for Anglia Ruskin University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-17T17:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">anglia.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEbjCCA1agAwIBAgIJAKgOBqreKA7kMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
-						VQQGEwJHQjEOMAwGA1UECAwFRXNzZXgxEzARBgNVBAcMCkNoZWxtc2ZvcmQxITAf
-						BgNVBAoMGEFuZ2xpYSBSdXNraW4gVW5pdmVyc2l0eTEbMBkGA1UECwwSVW5pdmVy
-						c2l0eSBMaWJyYXJ5MRkwFwYDVQQDDBBpZHAuYW5nbGlhLmFjLnVrMSgwJgYJKoZI
-						hvcNAQkBFhlhbGV4LmNvbGxpbnNAYW5nbGlhLmFjLnVrMB4XDTEzMDQyMzEyMTcy
-						MFoXDTIzMDQyMTEyMTcyMFowgbcxCzAJBgNVBAYTAkdCMQ4wDAYDVQQIDAVFc3Nl
-						eDETMBEGA1UEBwwKQ2hlbG1zZm9yZDEhMB8GA1UECgwYQW5nbGlhIFJ1c2tpbiBV
-						bml2ZXJzaXR5MRswGQYDVQQLDBJVbml2ZXJzaXR5IExpYnJhcnkxGTAXBgNVBAMM
-						EGlkcC5hbmdsaWEuYWMudWsxKDAmBgkqhkiG9w0BCQEWGWFsZXguY29sbGluc0Bh
-						bmdsaWEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9zvXg
-						KC3ZqFlCLXKPIkXy3+RBCGjq6MdFPna0mTN78dDm3BGxDa5ZSGOAbmymkLifZQAO
-						auoab/IP4+cwRLk1mVZs64zGr7HkWjisEJxJ1prP+L7Vhxx5im1SITbMcf3YbfRu
-						e88es/O2pJuAMNl3FG6ZskxKxT1cwKuvd9exelplJfBwYI0lbKZkQLMTvGfMr7B2
-						X0HXeGnb4mVRAI3C/uLQ3Y3zCgHyFoofvLUEugAh8zfInnLsk6CQee4tmdL/Vhj1
-						2FoKZcAywTv0MxR0zvROKkB/9N1ARtnqUQ6+wndtTJmKkvAEZjC33l5VuguzAbgr
-						LmgzQJBSbcb5r8a7AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
-						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRC1E3gBT7m
-						KDcJFkGEIMx61RnTrTAfBgNVHSMEGDAWgBRC1E3gBT7mKDcJFkGEIMx61RnTrTAN
-						BgkqhkiG9w0BAQUFAAOCAQEAFnUD7xfFhO6ypILsd3MSTO9piV3Wn+aNbtHHvZTk
-						cwwQzPAX3ZeZfSRbXA8VANOMedxhWnAppPy3qus8kwMtM7YrZe9yYasppou7+uWp
-						dSKq0fC8MLIKyC4JSujcTDKNB7aBNm9OPGE0oCoeYDIyTrWMHX2GFzR5xf/N6o/M
-						aHYdqraRkIveOsr8qqIX0ivXULDDVobITuWReZDqvPKnnbMbuSAt/2gp5+5+RN28
-						IR9hHcyp+OyjkSQAtk4aR3EG4ETL1DRg1lOn4vLx0iZvunV414E+oz4AjRor9NDO
-						jhjABmtX2fYOehXDJQvAW8f+ExSl+RlQHZNyTQX3V3xJXA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.anglia.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.anglia.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Anglia Ruskin University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Anglia Ruskin University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://libweb.anglia.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alex</GivenName>
-    <SurName>Collins</SurName>
-    <EmailAddress>mailto:alex.collins@anglia.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alex</GivenName>
-    <SurName>Collins</SurName>
-    <EmailAddress>mailto:alex.collins@anglia.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.xml
deleted file mode 100644
index 638a3a0b..00000000
--- a/swamid-interfederations-2.0/idp.ap-hm.fr-idp-shibboleth.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://idp.ap-hm.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-10-23T17:04:52Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</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">ap-hm.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aphm.ap-hm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Assistance Publique - Hôpitaux de Marseille</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/x-icon;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://fr.ap-hm.fr/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">French public hospital of Marseille</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Assistance Publique - Hôpitaux de Marseille</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Employés de l'Assistance Publique Hôpitaux de Marseille (AP-HM)</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>
-					      MIIDHDCCAgSgAwIBAgIVAOhqE6xG9Jim8D5otVZZ5i3uzRwKMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMMDGlkcC5hcC1obS5mcjAeFw0xNTEwMTUxMzU4NDZaFw0z
-NTEwMTUxMzU4NDZaMBcxFTATBgNVBAMMDGlkcC5hcC1obS5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIY+rUb89aEIChTwFLs99gcGQ5EtHJaulqox
-MSUiWmEXfCCBQKGFS1mAU+ZguVmKgO/6m9l0Yo1PtR5w8w0+RpA3MYoodWbLbYeX
-oZwjBpfUuExo33jVXLE/mfp5qIWkXx3U48znJaeBvSsE+V2zhobM1bgMcRCLTYOz
-BbyO+BjUeWO0RMw1iEy3T1sRXE/R73x7gYllpDmL7KSLg7HV5p7IGWyRicVtkzZd
-CBtt8mvvsYfRUcU+bSL0Ihjg6V34WG7WfvKNyxOkA/6hEB/2uV0VQpT+Y+YLJIgi
-eq8CUbZIuopfiUP/cRDuLfZHQX+zjGLG4zALWo4C5nEPgMH0PS8CAwEAAaNfMF0w
-HQYDVR0OBBYEFG9t3xe+StEVwDkJANyAvP/sZft8MDwGA1UdEQQ1MDOCDGlkcC5h
-cC1obS5mcoYjaHR0cHM6Ly9pZHAuYXAtaG0uZnIvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQEFBQADggEBAGK9aEzoWXWZioZQ0977aE6liNJ7gtaNEvzJ/5nJ/l2R
-Ee/zTfDr7kZCtwSga+cJMONNM6DIh6yIceHo8iIQYARQJ8FbsZkr0wMUDqeSva4I
-dUzkSiFNLDl0G/pQHnpc9zjtVAkGGRxyF4FH4UQw5Dk2Mw6EJbQumh4YXaeZ2zrP
-fv3rQ2OiSWaCaqlaS3NZ5FrBQ3qak8qdgbEEJMfXZn5Sktz8x+HgaSw8VaJy/9eo
-1lDRwcJL6+TF26PhCgpxAuG57NVtKW/HFGtvKdQ5ViHJ/8KfSErtB4l9akt7cHYW
-dmh1bRX6hc+FqDavw7bMJS6CyMnsnGL6oVO75Q3H/Is=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ap-hm.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ap-hm.fr/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Assistance Publique - Hôpitaux de Marseille</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Assistance Publique - Hôpitaux de Marseille</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://fr.ap-hm.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>systunix@ap-hm.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.apu.edu-shibboleth.xml b/swamid-interfederations-2.0/idp.apu.edu-shibboleth.xml
deleted file mode 100644
index cdeca447..00000000
--- a/swamid-interfederations-2.0/idp.apu.edu-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://idp.apu.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">apu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Azusa Pacific University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Azusa Pacific University's Faculty, Staff, Students and Alumni.</mdui:Description>
-        <mdui:Logo height="100" width="150" xml:lang="en">https://idp.apu.edu/images/apu_logo.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>
-MIIDsDCCApgCCQCjgzJFa0BoNzANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC
-VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExDjAMBgNVBAcMBUF6dXNhMSEwHwYDVQQK
-DBhBenVzYSBQYWNpZmljIFVuaXZlcnNpdHkxDDAKBgNVBAsMA0lNVDEUMBIGA1UE
-AwwLaWRwLmFwdS5lZHUxHjAcBgkqhkiG9w0BCQEWD3N1cHBvcnRAYXB1LmVkdTAe
-Fw0xMjA3MTgxNjExMTFaFw0yMjA3MTYxNjExMTFaMIGZMQswCQYDVQQGEwJVUzET
-MBEGA1UECAwKQ2FsaWZvcm5pYTEOMAwGA1UEBwwFQXp1c2ExITAfBgNVBAoMGEF6
-dXNhIFBhY2lmaWMgVW5pdmVyc2l0eTEMMAoGA1UECwwDSU1UMRQwEgYDVQQDDAtp
-ZHAuYXB1LmVkdTEeMBwGCSqGSIb3DQEJARYPc3VwcG9ydEBhcHUuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNJT1fDYUrwYvxXbg7bAXncDOkYz
-3me6vdO2/WN8Yq7P1vyTmapKy7V8ckIW/F0mCLGKsskeZX7RW5zKOvjgx6xlJMzU
-l8HROk8l2KdC6sTbocX9A+56Oz5aKQRHxeRcrcUNWO5XWZApOyTr6sIJQ0kRzijS
-BtHBQfd4zT5RPiealoIJ5QTCQ6By9ot5fyKDQMEcugPMcTH8tn9chgE4kyTR3wc+
-FSWYUe7Jpl5sn5IwzBtlvxx9I3o6y3O+QXC/zOYjpF+l0XOFWC9WQ6LkqhTzUTBA
-7jOaOWjT0DLRlp+Hx6v2/FZDyZbC9anWM0FA2ooIPTxFbGLgc9UW3jPsTwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQCyEGM2Pkw4ew1bYldINc8bfwlxcnZIiGcsCTwf
-lPdkw4Qgf08kwCrDMj75g5J9YaGiK9yLaShTahbsP/G8UzLLbqlaTtKZkwTD/ZD9
-1cFpK4X/V3PoiO4BtzCLsUFR0hNi9RcxEahNBfERs5zWEoL0E6SPbEBYASsOPnNg
-uASqOe8zF+6kXJQf1LVb9y+VXT0TeqUrROQhsoQlDyaCrEYZNnp3fvzeCNoqUSzH
-DcuZ4AsMi4iOwJWnfPD7+R9RHW5E8or/a1lmGLcPkS4KaEvMmJ139KFuFFU2sfAI
-MtHJYXN/BoS3/iNepB1mnnaprpvPqcp56isQ48gVvWuqEEVF
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.apu.edu:8443/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.apu.edu:8443/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.apu.edu/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.apu.edu/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.apu.edu/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.apu.edu/profile/SAML2/POST-SimpleSign/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">apu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDsDCCApgCCQCjgzJFa0BoNzANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC
-VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExDjAMBgNVBAcMBUF6dXNhMSEwHwYDVQQK
-DBhBenVzYSBQYWNpZmljIFVuaXZlcnNpdHkxDDAKBgNVBAsMA0lNVDEUMBIGA1UE
-AwwLaWRwLmFwdS5lZHUxHjAcBgkqhkiG9w0BCQEWD3N1cHBvcnRAYXB1LmVkdTAe
-Fw0xMjA3MTgxNjExMTFaFw0yMjA3MTYxNjExMTFaMIGZMQswCQYDVQQGEwJVUzET
-MBEGA1UECAwKQ2FsaWZvcm5pYTEOMAwGA1UEBwwFQXp1c2ExITAfBgNVBAoMGEF6
-dXNhIFBhY2lmaWMgVW5pdmVyc2l0eTEMMAoGA1UECwwDSU1UMRQwEgYDVQQDDAtp
-ZHAuYXB1LmVkdTEeMBwGCSqGSIb3DQEJARYPc3VwcG9ydEBhcHUuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNJT1fDYUrwYvxXbg7bAXncDOkYz
-3me6vdO2/WN8Yq7P1vyTmapKy7V8ckIW/F0mCLGKsskeZX7RW5zKOvjgx6xlJMzU
-l8HROk8l2KdC6sTbocX9A+56Oz5aKQRHxeRcrcUNWO5XWZApOyTr6sIJQ0kRzijS
-BtHBQfd4zT5RPiealoIJ5QTCQ6By9ot5fyKDQMEcugPMcTH8tn9chgE4kyTR3wc+
-FSWYUe7Jpl5sn5IwzBtlvxx9I3o6y3O+QXC/zOYjpF+l0XOFWC9WQ6LkqhTzUTBA
-7jOaOWjT0DLRlp+Hx6v2/FZDyZbC9anWM0FA2ooIPTxFbGLgc9UW3jPsTwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQCyEGM2Pkw4ew1bYldINc8bfwlxcnZIiGcsCTwf
-lPdkw4Qgf08kwCrDMj75g5J9YaGiK9yLaShTahbsP/G8UzLLbqlaTtKZkwTD/ZD9
-1cFpK4X/V3PoiO4BtzCLsUFR0hNi9RcxEahNBfERs5zWEoL0E6SPbEBYASsOPnNg
-uASqOe8zF+6kXJQf1LVb9y+VXT0TeqUrROQhsoQlDyaCrEYZNnp3fvzeCNoqUSzH
-DcuZ4AsMi4iOwJWnfPD7+R9RHW5E8or/a1lmGLcPkS4KaEvMmJ139KFuFFU2sfAI
-MtHJYXN/BoS3/iNepB1mnnaprpvPqcp56isQ48gVvWuqEEVF
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.apu.edu:8443/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.apu.edu:8443/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Azusa Pacific University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Azusa Pacific University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.apu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Joshua Riffle</md:GivenName>
-    <md:EmailAddress>jriffle@apu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.apus.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.apus.edu-idp-shibboleth.xml
deleted file mode 100644
index 0c994c39..00000000
--- a/swamid-interfederations-2.0/idp.apus.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://idp.apus.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">mycampus.apus.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">American Public University System</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>
-MIIDGzCCAgOgAwIBAgIUDhoamxOWGuk5FrIlSwlhAgBHcNowDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaWRwLmFwdXMuZWR1MB4XDTE1MDkyNDE1MjcxOFoXDTM1
-MDkyNDE1MjcxOFowFzEVMBMGA1UEAwwMaWRwLmFwdXMuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkLKoU5xvhAuqHVRvn22P9232fbSeMWz8V8e1
-FDNSMfm1ksKKSdUI2NURdDPWEolNZWRoAYUMromdq3Dz76iogUMiH4PAr63Ehow9
-wAZUnxoD38g3Ss4w3Ri3GLz5ySh4h1tlIB2Eie2tjosvL8pCitd5wqDFioigT+li
-FN0PVF2eMnnAdl6RH4j+3JFVhbCZwyscYKZNWTPU0o2fHcgyVtLO6p0dp0ywM5km
-BjIhxBU1G9zzUwavE1gWh2fD0Aw9qduaDvv5uDr6EAQtGXCWo/Anr6pVX4KnSspa
-2Rz/Q4IR0A7MuRszZKnLKPJg7Tt1Y1dDXjvSnfD+yPXR5JdhfwIDAQABo18wXTAd
-BgNVHQ4EFgQUHIu2L8zKe5HgbHhXb/60LgJhPXgwPAYDVR0RBDUwM4IMaWRwLmFw
-dXMuZWR1hiNodHRwczovL2lkcC5hcHVzLmVkdS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQsFAAOCAQEAhLa7Z0z6YK8smDjbNZcjDI/aGzJUy+A4sVE3LW+j4QGp
-SXYpcXWGuwHiUT5dehAK/+hXYyHTcsOxXKqfRR18D1oDd1ao9d1XMB+FvnzQjYkS
-Dg4EeGcU51f0WOVDan5uskXicOPmDCrE21LW1UEbDGTqQDHQduKf1gqCX4t7uYAr
-o24OC3bgXJbuG2OrqKHbKVbfkHEHydJwRvKzxU6+64Pn+0UvJpaBd+HksJAW0fx5
-uGx5aijPhN0BbMOsIwLQfzfGgq+yrBFBwbLIbdDWjJLWtz9F8DRGSBp0VwPU9jnA
-l892XxjtwvFhA5uiw4A/hMfzfwONtSoAe9wGpcCtVw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.apus.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.apus.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.apus.edu/idp/profile/Logout"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.apus.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.apus.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.apus.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mycampus.apus.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUDhoamxOWGuk5FrIlSwlhAgBHcNowDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaWRwLmFwdXMuZWR1MB4XDTE1MDkyNDE1MjcxOFoXDTM1
-MDkyNDE1MjcxOFowFzEVMBMGA1UEAwwMaWRwLmFwdXMuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkLKoU5xvhAuqHVRvn22P9232fbSeMWz8V8e1
-FDNSMfm1ksKKSdUI2NURdDPWEolNZWRoAYUMromdq3Dz76iogUMiH4PAr63Ehow9
-wAZUnxoD38g3Ss4w3Ri3GLz5ySh4h1tlIB2Eie2tjosvL8pCitd5wqDFioigT+li
-FN0PVF2eMnnAdl6RH4j+3JFVhbCZwyscYKZNWTPU0o2fHcgyVtLO6p0dp0ywM5km
-BjIhxBU1G9zzUwavE1gWh2fD0Aw9qduaDvv5uDr6EAQtGXCWo/Anr6pVX4KnSspa
-2Rz/Q4IR0A7MuRszZKnLKPJg7Tt1Y1dDXjvSnfD+yPXR5JdhfwIDAQABo18wXTAd
-BgNVHQ4EFgQUHIu2L8zKe5HgbHhXb/60LgJhPXgwPAYDVR0RBDUwM4IMaWRwLmFw
-dXMuZWR1hiNodHRwczovL2lkcC5hcHVzLmVkdS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQsFAAOCAQEAhLa7Z0z6YK8smDjbNZcjDI/aGzJUy+A4sVE3LW+j4QGp
-SXYpcXWGuwHiUT5dehAK/+hXYyHTcsOxXKqfRR18D1oDd1ao9d1XMB+FvnzQjYkS
-Dg4EeGcU51f0WOVDan5uskXicOPmDCrE21LW1UEbDGTqQDHQduKf1gqCX4t7uYAr
-o24OC3bgXJbuG2OrqKHbKVbfkHEHydJwRvKzxU6+64Pn+0UvJpaBd+HksJAW0fx5
-uGx5aijPhN0BbMOsIwLQfzfGgq+yrBFBwbLIbdDWjJLWtz9F8DRGSBp0VwPU9jnA
-l892XxjtwvFhA5uiw4A/hMfzfwONtSoAe9wGpcCtVw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.apus.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">American Public University System</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">American Public University System</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.apus.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sean O'Driscoll</md:GivenName>
-    <md:EmailAddress>sodriscoll@apus.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Joe Colon</md:GivenName>
-    <md:EmailAddress>jcolon@apus.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.aquinas.ac.uk-shibboleth.xml
deleted file mode 100644
index 2da6b5d2..00000000
--- a/swamid-interfederations-2.0/idp.aquinas.ac.uk-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://idp.aquinas.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Aquinas College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-25T21:10: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">aquinas.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjgCCQCg2y4jrOTluTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJH
-						QjERMA8GA1UECBMIQ2hlc2hpcmUxEjAQBgNVBAcTCVN0b2NrcG9ydDEYMBYGA1UE
-						ChMPQXF1aW5hcyBDb2xsZWdlMRowGAYDVQQDExFpZHAuYXF1aW5hcy5hYy51azAe
-						Fw0xNDA0MDgxMDA3MjBaFw0zNDA0MDMxMDA3MjBaMGoxCzAJBgNVBAYTAkdCMREw
-						DwYDVQQIEwhDaGVzaGlyZTESMBAGA1UEBxMJU3RvY2twb3J0MRgwFgYDVQQKEw9B
-						cXVpbmFzIENvbGxlZ2UxGjAYBgNVBAMTEWlkcC5hcXVpbmFzLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tlIUE/uX9+0jJwcVVuvnketFM++
-						XqlEGjnrZ5cbnC8diPZ4msx1IsZQuOuvc36VIp9IzU0xqbw7sNr6lBbfO3ORTn9W
-						tuceKX6lFRm2U9GJpj3FEDUG0adBprgCgaEZ4StYNe2tgOSF1W9PkLTMn1UplH0w
-						r+e+D7v2o1uo/0gHE1AEJwbwK/JHBE8rnVLSzHkcvT820QEybW1pLjcN4WeL6IO+
-						ECxpje1qZNuI42aKrya56iMqxdtVcsjWzJq8fS0ihY+lC+rV+IzZasscyU214O2G
-						z9qw7MqglfBXDKInLK66Sb/v06OlE+sv+DQ81mDiSGIvk6fkkC1wTxEuqwIDAQAB
-						MA0GCSqGSIb3DQEBBQUAA4IBAQC0OqEHX/q+5l3PHh5rXnLKalvBWD/BaIgGXXL1
-						bYhSYA85A4sZ+dXznZPH1hLbv4g4YV2S8rrN6o/nFZFzGF6jTW+2FeYIkSnLUEY8
-						uxFL/+DTMbYpGhvTpkZdetmzE1IDygV9UaTqA7M80yyQxBVy60LIdekJcp7Fpn5Y
-						LRU8AVk2UUQgQ7rM51uy8hyTp2cN8OVGcNPJMbVtiAcPRn/0aYwMhJ9gFkPFEatC
-						C6j3J1qFgiVaMhKL9ylqHcQEpgoGmC3AuU+C7b2hRmeshOu9J8KkCzW/ypbkbmjz
-						gksEb356B4ItPcFswd5Xuzp4GArt+NVr/4whnniyfRjS+Ryl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aquinas.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aquinas.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.aquinas.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aquinas.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aquinas.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aquinas.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">aquinas.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjgCCQCg2y4jrOTluTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJH
-						QjERMA8GA1UECBMIQ2hlc2hpcmUxEjAQBgNVBAcTCVN0b2NrcG9ydDEYMBYGA1UE
-						ChMPQXF1aW5hcyBDb2xsZWdlMRowGAYDVQQDExFpZHAuYXF1aW5hcy5hYy51azAe
-						Fw0xNDA0MDgxMDA3MjBaFw0zNDA0MDMxMDA3MjBaMGoxCzAJBgNVBAYTAkdCMREw
-						DwYDVQQIEwhDaGVzaGlyZTESMBAGA1UEBxMJU3RvY2twb3J0MRgwFgYDVQQKEw9B
-						cXVpbmFzIENvbGxlZ2UxGjAYBgNVBAMTEWlkcC5hcXVpbmFzLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tlIUE/uX9+0jJwcVVuvnketFM++
-						XqlEGjnrZ5cbnC8diPZ4msx1IsZQuOuvc36VIp9IzU0xqbw7sNr6lBbfO3ORTn9W
-						tuceKX6lFRm2U9GJpj3FEDUG0adBprgCgaEZ4StYNe2tgOSF1W9PkLTMn1UplH0w
-						r+e+D7v2o1uo/0gHE1AEJwbwK/JHBE8rnVLSzHkcvT820QEybW1pLjcN4WeL6IO+
-						ECxpje1qZNuI42aKrya56iMqxdtVcsjWzJq8fS0ihY+lC+rV+IzZasscyU214O2G
-						z9qw7MqglfBXDKInLK66Sb/v06OlE+sv+DQ81mDiSGIvk6fkkC1wTxEuqwIDAQAB
-						MA0GCSqGSIb3DQEBBQUAA4IBAQC0OqEHX/q+5l3PHh5rXnLKalvBWD/BaIgGXXL1
-						bYhSYA85A4sZ+dXznZPH1hLbv4g4YV2S8rrN6o/nFZFzGF6jTW+2FeYIkSnLUEY8
-						uxFL/+DTMbYpGhvTpkZdetmzE1IDygV9UaTqA7M80yyQxBVy60LIdekJcp7Fpn5Y
-						LRU8AVk2UUQgQ7rM51uy8hyTp2cN8OVGcNPJMbVtiAcPRn/0aYwMhJ9gFkPFEatC
-						C6j3J1qFgiVaMhKL9ylqHcQEpgoGmC3AuU+C7b2hRmeshOu9J8KkCzW/ypbkbmjz
-						gksEb356B4ItPcFswd5Xuzp4GArt+NVr/4whnniyfRjS+Ryl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aquinas.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aquinas.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">Aquinas College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aquinas College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aquinas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Phil</GivenName>
-    <SurName>Houghton</SurName>
-    <EmailAddress>mailto:philh@aquinas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Phil</GivenName>
-    <SurName>Houghton</SurName>
-    <EmailAddress>mailto:philh@aquinas.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ariadne-t.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ariadne-t.gr-idp-shibboleth.xml
deleted file mode 100644
index a8be0acd..00000000
--- a/swamid-interfederations-2.0/idp.ariadne-t.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ariadne-t.gr/idp/shibboleth">
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">demokritos.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDLDCCAhSgAwIBAgIVALxnNk/iLXAEN6bKpJarNog5IEulMA0GCSqGSIb3DQEB
-                            BQUAMBsxGTAXBgNVBAMTEGlkcC5hcmlhZG5lLXQuZ3IwHhcNMTAwNjIxMDc0MDU2
-                            WhcNMzAwNjIxMDc0MDU2WjAbMRkwFwYDVQQDExBpZHAuYXJpYWRuZS10LmdyMIIB
-                            IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm10a9mhvZaiyx2elikDtNwHq
-                            rO/aDSi53RrzZ7ttRuM2TIglp/9EBFAPKF1M6Xl+0u3omIm++llqs4NU/siqQb4f
-                            eg2jp5AlvS0Y7nv5VIedxPaQj9VnlFF2m4pTRTCc4dH26PT0I0dJVNx3q3RVW9+i
-                            NRqmtDrS/u3ycSjwEIePbnBiomwxqTp3FU804kpK9YQ9FhM26vs02VmCvxkDCoDh
-                            9Q04E1SYhArgX3PsyQf+U8UpIjihroMqDtqUUiGBerxWtj74UzYEkOu33UBgXoS2
-                            TR9fPZTtzChvHpJ7yfz42pBGjLdiDn2h+7thOhfnXlEIqugFyLH8QdEnG5ENYQID
-                            AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuYXJpYWRuZS10LmdyhidodHRwczovL2lk
-                            cC5hcmlhZG5lLXQuZ3IvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIx052YHyolu
-                            Kv/orpOISSGGtLSaMA0GCSqGSIb3DQEBBQUAA4IBAQAQEzLt4f9b1idlxXeY7QlA
-                            DJ/Sz6PYV7ZLuI6WgndCMdToHFX2KA13JbQ0lSUz5q/MHbG8i30qu4EFAMSnPVA/
-                            dc2ziwYL0RnuGmjSdr0KZze6jtE29iU/Lfru4jFU/Fw1Gtr6I4xKOmHeaRhVxdjv
-                            hafAvNUWVTKfGiFW7s7fI9N7L3RAMrJncqDeZZM7pw2Ade/JnLVCED9lbRB5HXsV
-                            PQeV5TE2rBwMS6hsjSo+C2/BkOAjGoGO3dpiHZBcOFAi6r/Ig03JjIFUL7xN0yYH
-                            VOeb9+qOojXunPrN/2skpWXv/1x0bwMDDIZqXQMQHQHjmKiK3k13OETi/EZTbwmE
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ariadne-t.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ariadne-t.gr: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.ariadne-t.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ariadne-t.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ariadne-t.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ariadne-t.gr/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">demokritos.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDLDCCAhSgAwIBAgIVALxnNk/iLXAEN6bKpJarNog5IEulMA0GCSqGSIb3DQEB
-                            BQUAMBsxGTAXBgNVBAMTEGlkcC5hcmlhZG5lLXQuZ3IwHhcNMTAwNjIxMDc0MDU2
-                            WhcNMzAwNjIxMDc0MDU2WjAbMRkwFwYDVQQDExBpZHAuYXJpYWRuZS10LmdyMIIB
-                            IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm10a9mhvZaiyx2elikDtNwHq
-                            rO/aDSi53RrzZ7ttRuM2TIglp/9EBFAPKF1M6Xl+0u3omIm++llqs4NU/siqQb4f
-                            eg2jp5AlvS0Y7nv5VIedxPaQj9VnlFF2m4pTRTCc4dH26PT0I0dJVNx3q3RVW9+i
-                            NRqmtDrS/u3ycSjwEIePbnBiomwxqTp3FU804kpK9YQ9FhM26vs02VmCvxkDCoDh
-                            9Q04E1SYhArgX3PsyQf+U8UpIjihroMqDtqUUiGBerxWtj74UzYEkOu33UBgXoS2
-                            TR9fPZTtzChvHpJ7yfz42pBGjLdiDn2h+7thOhfnXlEIqugFyLH8QdEnG5ENYQID
-                            AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuYXJpYWRuZS10LmdyhidodHRwczovL2lk
-                            cC5hcmlhZG5lLXQuZ3IvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIx052YHyolu
-                            Kv/orpOISSGGtLSaMA0GCSqGSIb3DQEBBQUAA4IBAQAQEzLt4f9b1idlxXeY7QlA
-                            DJ/Sz6PYV7ZLuI6WgndCMdToHFX2KA13JbQ0lSUz5q/MHbG8i30qu4EFAMSnPVA/
-                            dc2ziwYL0RnuGmjSdr0KZze6jtE29iU/Lfru4jFU/Fw1Gtr6I4xKOmHeaRhVxdjv
-                            hafAvNUWVTKfGiFW7s7fI9N7L3RAMrJncqDeZZM7pw2Ade/JnLVCED9lbRB5HXsV
-                            PQeV5TE2rBwMS6hsjSo+C2/BkOAjGoGO3dpiHZBcOFAi6r/Ig03JjIFUL7xN0yYH
-                            VOeb9+qOojXunPrN/2skpWXv/1x0bwMDDIZqXQMQHQHjmKiK3k13OETi/EZTbwmE
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ariadne-t.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ariadne-t.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NCSR Demokritos</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">ΕΚΕΦΕ Δημόκριτος</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NCSR Demokritos</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">ΕΚΕΦΕ Δημόκριτος</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.demokritos.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.demokritos.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Charalampos</md:GivenName>
-    <md:SurName>Koutsouris</md:SurName>
-    <md:EmailAddress>harisk@ariadne-t.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Ariadne-t NOC</md:GivenName>
-    <md:EmailAddress>noc@ariadne-t.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-210-650-3125</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.arts.ac.uk-entity.xml
deleted file mode 100644
index 3865d8a5..00000000
--- a/swamid-interfederations-2.0/idp.arts.ac.uk-entity.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.arts.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for the University of the Arts London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">arts.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID5DCCAswCCQD996epTPDENDANBgkqhkiG9w0BAQUFADCBszELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgMDkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xJzAl
-						BgNVBAoMHlVuaXZlcnNpdHkgb2YgdGhlIEFydHMsIExvbmRvbjEUMBIGA1UECwwL
-						SVQgU2VydmljZXMxFzAVBgNVBAMMDmlkcC5hcnRzLmFjLnVrMSIwIAYJKoZIhvcN
-						AQkBFhNzc2xhZG1pbkBhcnRzLmFjLnVrMB4XDTE0MDEwODExMjAzMVoXDTM0MDEy
-						MzExMjAzMVowgbMxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5HcmVhdGVyIExvbmRv
-						bjEPMA0GA1UEBwwGTG9uZG9uMScwJQYDVQQKDB5Vbml2ZXJzaXR5IG9mIHRoZSBB
-						cnRzLCBMb25kb24xFDASBgNVBAsMC0lUIFNlcnZpY2VzMRcwFQYDVQQDDA5pZHAu
-						YXJ0cy5hYy51azEiMCAGCSqGSIb3DQEJARYTc3NsYWRtaW5AYXJ0cy5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6O2rZ7nuoylsc2Zd9Mahbc
-						yvGGqZMmx+mO414AqbuMn4R0kat5rKpuaq2kj/M18NBJaNti2UzYBvfEx+SPOZDl
-						zCFAup8NqJwZXGPP5NGNXeAFQWCzIfDZpcOqrrjDA5/dJtDpIST4kGLaFUUwfmE3
-						6Ikpye28h3v4oYPH4bxGkodWsVkU2AMAObbsFu2C5FxRP9jXE42q7AjRyZNOM5jt
-						izy1jjFEhdsU1gYJyaN/XEpMZA2x1h+t+DcCEqlp9+BFn24t2krubxfXo6fy/zqH
-						tUPPMHElAALmzFZyhz4BMtfxGmuYu5+5nROjz7wh0QANgo5s2chALSVBhN1coMsC
-						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAvL41pZYkDiD0qBQK+ndeXOsBSQbHXLEl
-						WwQttoLoo23kRPU+Q1guFwk2pIgKb6SDSSflwrT+SjeCAmNOnBE5+J2fXqynj/CW
-						up2U9ejHg5ZEn4GPwLOftqycM/2tOzxjY/6/5NbM+BEZs+T15XqhsBQacPMg2PSJ
-						i+e8IPQeKWZlpBRf4NMghdfb7+vfTpDqOFB4kik+VesdEBE/zgGSTdcUNaAB1Hqq
-						+QSJKGU5LkUlhzDceN+QA/RuIuTUF0VSi283LNzyyp2q9ya+mv7UYVaGJs7AYuNR
-						mUNMMO4EcXmyJkn6gSTesu0OCj76227/ss3Ni3p+nehxcBY9R/olXg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.arts.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.arts.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.arts.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.arts.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.arts.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.arts.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">arts.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID5DCCAswCCQD996epTPDENDANBgkqhkiG9w0BAQUFADCBszELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgMDkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xJzAl
-						BgNVBAoMHlVuaXZlcnNpdHkgb2YgdGhlIEFydHMsIExvbmRvbjEUMBIGA1UECwwL
-						SVQgU2VydmljZXMxFzAVBgNVBAMMDmlkcC5hcnRzLmFjLnVrMSIwIAYJKoZIhvcN
-						AQkBFhNzc2xhZG1pbkBhcnRzLmFjLnVrMB4XDTE0MDEwODExMjAzMVoXDTM0MDEy
-						MzExMjAzMVowgbMxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5HcmVhdGVyIExvbmRv
-						bjEPMA0GA1UEBwwGTG9uZG9uMScwJQYDVQQKDB5Vbml2ZXJzaXR5IG9mIHRoZSBB
-						cnRzLCBMb25kb24xFDASBgNVBAsMC0lUIFNlcnZpY2VzMRcwFQYDVQQDDA5pZHAu
-						YXJ0cy5hYy51azEiMCAGCSqGSIb3DQEJARYTc3NsYWRtaW5AYXJ0cy5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6O2rZ7nuoylsc2Zd9Mahbc
-						yvGGqZMmx+mO414AqbuMn4R0kat5rKpuaq2kj/M18NBJaNti2UzYBvfEx+SPOZDl
-						zCFAup8NqJwZXGPP5NGNXeAFQWCzIfDZpcOqrrjDA5/dJtDpIST4kGLaFUUwfmE3
-						6Ikpye28h3v4oYPH4bxGkodWsVkU2AMAObbsFu2C5FxRP9jXE42q7AjRyZNOM5jt
-						izy1jjFEhdsU1gYJyaN/XEpMZA2x1h+t+DcCEqlp9+BFn24t2krubxfXo6fy/zqH
-						tUPPMHElAALmzFZyhz4BMtfxGmuYu5+5nROjz7wh0QANgo5s2chALSVBhN1coMsC
-						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAvL41pZYkDiD0qBQK+ndeXOsBSQbHXLEl
-						WwQttoLoo23kRPU+Q1guFwk2pIgKb6SDSSflwrT+SjeCAmNOnBE5+J2fXqynj/CW
-						up2U9ejHg5ZEn4GPwLOftqycM/2tOzxjY/6/5NbM+BEZs+T15XqhsBQacPMg2PSJ
-						i+e8IPQeKWZlpBRf4NMghdfb7+vfTpDqOFB4kik+VesdEBE/zgGSTdcUNaAB1Hqq
-						+QSJKGU5LkUlhzDceN+QA/RuIuTUF0VSi283LNzyyp2q9ya+mv7UYVaGJs7AYuNR
-						mUNMMO4EcXmyJkn6gSTesu0OCj76227/ss3Ni3p+nehxcBY9R/olXg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.arts.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.arts.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 the Arts London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of the Arts London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.arts.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UAL Service desk</GivenName>
-    <EmailAddress>mailto:servicedesk@arts.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:shib-support@arts.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ashridge.org.uk-openathens.xml b/swamid-interfederations-2.0/idp.ashridge.org.uk-openathens.xml
deleted file mode 100644
index 2b694475..00000000
--- a/swamid-interfederations-2.0/idp.ashridge.org.uk-openathens.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.ashridge.org.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for The Ashridge (Bonar Law Memorial) Trust.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-10T09:48: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 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">ashridge.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ashridge.org.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ashridge.org.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ashridge</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ashridge.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 68393d8d..00000000
--- a/swamid-interfederations-2.0/idp.asu.cas.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.asu.cas.cz/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-23T10:20: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asu.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Astronomical Institute of the Czech Academy of Sciences</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Astronomický ústav Akademie věd České Republiky</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for employees of Astronomical Institute of the Czech Academy of Sciences.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance Astronomického ústavu Akademie věd České Republiky.</mdui:Description>
-        <mdui:Logo height="40" width="99">https://idp.asu.cas.cz/logo-asu_99_40.png</mdui:Logo>
-        <mdui:Logo height="76" width="187">https://idp.asu.cas.cz/logo-asu_187_76.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>
-MIIDJDCCAgygAwIBAgIVANrv5WGUsquQhfjq0eTxVi20NsReMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDmlkcC5hc3UuY2FzLmN6MB4XDTE1MDcyMzA5MDgzMloX
-DTM1MDcyMzA5MDgzMlowGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtgoG22mEK+lNwgVWg+1wUkii+TLrW
-g5CO0r/WOODmehK4kkyM/jfKeyNHp3na2KgSIVcJprguPYZ9Yhg1UU5h4TgNCEeB
-qZcJwbNNSC0lLKHvbStR7FrMiSgtnQEcghM67DvGfN88xgdUzS2DNW3Z+dCPi/AI
-GcVlzcaITsp9Ho1SUBu5uPKeCLtZ+BbuSKfekw9+vhtIdm4cK6456wNnXWGjXM2J
-wI/wShdKY5oYG5bUO9Mj2Dxq+aV6EQLMkRLSZ9LE04sYalOKIyt+LDEzmyqwVmz1
-SXb5HkA46RoWZgdIex+YIF9NasCsXwv9dyM5mvvpuqUpmhW+9LN22G9lAgMBAAGj
-YzBhMB0GA1UdDgQWBBT3XNIHand3OlDfGi4BptalsTc9WDBABgNVHREEOTA3gg5p
-ZHAuYXN1LmNhcy5jeoYlaHR0cHM6Ly9pZHAuYXN1LmNhcy5jei9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAnZHWNtaZVfZEqU6af5xuULlBNUlGIh4O
-uMZeSbDu9pnVV0VDoIQxO+JUYXkdQduzLR564oyK/zhWKZg06f4YrsXWtkeXT3KN
-mFpVLGCOvbaD27h0hqv2CiioBcG2gAQ/t5rtU3iQCgaSqU8FP476zBh8dBVCB/xv
-jdMW+fZSfndHznmHrVjnhwMqaPgNOM45vkuwZeT0WZuhAhNXcCw3AGGrB8W4nmNd
-dsQVYrfF/KF/LG3HI3nCPWbe7vSKzdRidotQof3ZpVx/+mhM2xQu5PPAJKvT5TyO
-k7HbFDf0m9+/4WILNVLYF8L10+Gg2NSrdovl9NkyiEYi8udx9G9zvw==
-                        </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>
-MIIDJDCCAgygAwIBAgIVAJdNb/Rhko4nwYw+ygi1hua8ErgsMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDmlkcC5hc3UuY2FzLmN6MB4XDTE1MDcyMzA5MDgzMVoX
-DTM1MDcyMzA5MDgzMVowGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9FHZ+PdNss6t/V4/KurzMsMHp1Zoq
-l07jPffg5B8B1NqlLacljuvRFS8B+sGZeQQWa9HtDzxBSrlemoc9EdmC3N5QQ5+F
-1giiFJosgEd0in3h5NilYEfmovc+SLoPoLfQj21kAGLP0bMMW3wa8rl3oGTtPmJ8
-9jAc1FX6u6p3g61jeREidhMylO6GtbREhL6hXKqiyglR0zWjZCYfQCzF392lyyeQ
-nMJqI4oKREGSN27MX1YIhplnkV3amGcH/sqMjdStcYFqJc5+h/6X9iFWHFohqLpF
-rIYeVePQhbj1VDPIPUqyVBeGlsk+xpzKnSnbDsaYh/MhFJXnmn6rEbTvAgMBAAGj
-YzBhMB0GA1UdDgQWBBRWbgeUKb4C9ZnYCV4qpFnILVSyHjBABgNVHREEOTA3gg5p
-ZHAuYXN1LmNhcy5jeoYlaHR0cHM6Ly9pZHAuYXN1LmNhcy5jei9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAJd0Z2rahGuNgnK/+H3ohx7fLvpGeW2ne
-BhSVrBFTr5zVHOrfkrZvdnpV0CI65T00lYRWpIkqAN8aEJujjJXsE0kEagFM/ap8
-mQB9CZwbEKXCU7vGyoRcegrZZl3srZ62YwxfLRJjAK3DSgKM0BtMSff1rJE2K8+L
-VQqEbFfPqunsbacUA1zF4HZ3ceJQNKzIFYuFTpp+1i5RZN/+28zwNQj1XlCJ8+fN
-5KC/z5C4Kfg6PKnx5A0EJAr6Dk8afdoj6UO92/t+GF7Devsohpe2excLJ3zVJKWN
-0mIfCxb1hPlXsnaFfv/ekGZcz+JHqpHyEAXEUwLhqy97bRlPjKMFSQ==
-                        </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>
-MIIDIzCCAgugAwIBAgIUHD3PnOGmtImskndM+6f3qKBHwkUwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owHhcNMTUwNzIzMDkwODMyWhcN
-MzUwNzIzMDkwODMyWjAZMRcwFQYDVQQDDA5pZHAuYXN1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALa+vR6ycaZQ3w7ropKE1MxxemCC4QIn
-jz5+Ch5gLNDyj4eIYQgvgGcS+cFzmht2oBiP4eeNyX2bNwcSerH0lANCpyBUNQOr
-jQMf0KwNgiUkkYy8Ii4CRGhcq6yhFxT6W/dx7NCx0tg44rFOLmpPXSBvZ0AepzmN
-hoaGihixtQxMSZ6VCA5oZP9E/nMgwv/PBgVHZ03Ip0djdcv2dSQyeXcCAXqcOdDf
-AQkH3aTwcLIWEJa2WdvoUTAzqgE0sKUbvDqIngP3zimFS2t2XSln1/2ThH67RQpJ
-75cBdHlUU6w+a1dkBRg+0KORyt+QoqQgQx4vYmySDU2I/l1x5zQ7ma0CAwEAAaNj
-MGEwHQYDVR0OBBYEFGSRwgu2RzBPeQQ5AMgT+VMpnyHWMEAGA1UdEQQ5MDeCDmlk
-cC5hc3UuY2FzLmN6hiVodHRwczovL2lkcC5hc3UuY2FzLmN6L2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCva6u3xg7RFn+3lcwKfCSDU3o9WyLdPfuM
-VHydFjfIxxjlBOE4sMPAbFwTvlRi+TlZXgmJDBwv1UReC68Sik+3PjAYiLwclGP/
-y0pSMmN1A1dFK/v1PrIeaZ/YZvnuh/k7IpVKX81Kg+qhkeh9eAxiLZi6Bdd3jB6r
-4mdt/d/pPHbgkVj/qZCgBBYM0S3K/KyJcEU0ku0z447/TeGOUqDQoE7l5BNBLFi9
-RLH/RkYhMb3hf89qLrOFgXCR3hAyX4xQAnyTZyxliYteSiGMfmLW6Mmr+MNaojx5
-CuBQbcFvp2S6zogNWjt2678eGQSvtIIqAVNLzE9FpmksXm5Gyimt
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.asu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.asu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.asu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.asu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asu.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVANrv5WGUsquQhfjq0eTxVi20NsReMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDmlkcC5hc3UuY2FzLmN6MB4XDTE1MDcyMzA5MDgzMloX
-DTM1MDcyMzA5MDgzMlowGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtgoG22mEK+lNwgVWg+1wUkii+TLrW
-g5CO0r/WOODmehK4kkyM/jfKeyNHp3na2KgSIVcJprguPYZ9Yhg1UU5h4TgNCEeB
-qZcJwbNNSC0lLKHvbStR7FrMiSgtnQEcghM67DvGfN88xgdUzS2DNW3Z+dCPi/AI
-GcVlzcaITsp9Ho1SUBu5uPKeCLtZ+BbuSKfekw9+vhtIdm4cK6456wNnXWGjXM2J
-wI/wShdKY5oYG5bUO9Mj2Dxq+aV6EQLMkRLSZ9LE04sYalOKIyt+LDEzmyqwVmz1
-SXb5HkA46RoWZgdIex+YIF9NasCsXwv9dyM5mvvpuqUpmhW+9LN22G9lAgMBAAGj
-YzBhMB0GA1UdDgQWBBT3XNIHand3OlDfGi4BptalsTc9WDBABgNVHREEOTA3gg5p
-ZHAuYXN1LmNhcy5jeoYlaHR0cHM6Ly9pZHAuYXN1LmNhcy5jei9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAnZHWNtaZVfZEqU6af5xuULlBNUlGIh4O
-uMZeSbDu9pnVV0VDoIQxO+JUYXkdQduzLR564oyK/zhWKZg06f4YrsXWtkeXT3KN
-mFpVLGCOvbaD27h0hqv2CiioBcG2gAQ/t5rtU3iQCgaSqU8FP476zBh8dBVCB/xv
-jdMW+fZSfndHznmHrVjnhwMqaPgNOM45vkuwZeT0WZuhAhNXcCw3AGGrB8W4nmNd
-dsQVYrfF/KF/LG3HI3nCPWbe7vSKzdRidotQof3ZpVx/+mhM2xQu5PPAJKvT5TyO
-k7HbFDf0m9+/4WILNVLYF8L10+Gg2NSrdovl9NkyiEYi8udx9G9zvw==
-                        </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>
-MIIDJDCCAgygAwIBAgIVAJdNb/Rhko4nwYw+ygi1hua8ErgsMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDmlkcC5hc3UuY2FzLmN6MB4XDTE1MDcyMzA5MDgzMVoX
-DTM1MDcyMzA5MDgzMVowGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9FHZ+PdNss6t/V4/KurzMsMHp1Zoq
-l07jPffg5B8B1NqlLacljuvRFS8B+sGZeQQWa9HtDzxBSrlemoc9EdmC3N5QQ5+F
-1giiFJosgEd0in3h5NilYEfmovc+SLoPoLfQj21kAGLP0bMMW3wa8rl3oGTtPmJ8
-9jAc1FX6u6p3g61jeREidhMylO6GtbREhL6hXKqiyglR0zWjZCYfQCzF392lyyeQ
-nMJqI4oKREGSN27MX1YIhplnkV3amGcH/sqMjdStcYFqJc5+h/6X9iFWHFohqLpF
-rIYeVePQhbj1VDPIPUqyVBeGlsk+xpzKnSnbDsaYh/MhFJXnmn6rEbTvAgMBAAGj
-YzBhMB0GA1UdDgQWBBRWbgeUKb4C9ZnYCV4qpFnILVSyHjBABgNVHREEOTA3gg5p
-ZHAuYXN1LmNhcy5jeoYlaHR0cHM6Ly9pZHAuYXN1LmNhcy5jei9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAJd0Z2rahGuNgnK/+H3ohx7fLvpGeW2ne
-BhSVrBFTr5zVHOrfkrZvdnpV0CI65T00lYRWpIkqAN8aEJujjJXsE0kEagFM/ap8
-mQB9CZwbEKXCU7vGyoRcegrZZl3srZ62YwxfLRJjAK3DSgKM0BtMSff1rJE2K8+L
-VQqEbFfPqunsbacUA1zF4HZ3ceJQNKzIFYuFTpp+1i5RZN/+28zwNQj1XlCJ8+fN
-5KC/z5C4Kfg6PKnx5A0EJAr6Dk8afdoj6UO92/t+GF7Devsohpe2excLJ3zVJKWN
-0mIfCxb1hPlXsnaFfv/ekGZcz+JHqpHyEAXEUwLhqy97bRlPjKMFSQ==
-                        </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>
-MIIDIzCCAgugAwIBAgIUHD3PnOGmtImskndM+6f3qKBHwkUwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwOaWRwLmFzdS5jYXMuY3owHhcNMTUwNzIzMDkwODMyWhcN
-MzUwNzIzMDkwODMyWjAZMRcwFQYDVQQDDA5pZHAuYXN1LmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALa+vR6ycaZQ3w7ropKE1MxxemCC4QIn
-jz5+Ch5gLNDyj4eIYQgvgGcS+cFzmht2oBiP4eeNyX2bNwcSerH0lANCpyBUNQOr
-jQMf0KwNgiUkkYy8Ii4CRGhcq6yhFxT6W/dx7NCx0tg44rFOLmpPXSBvZ0AepzmN
-hoaGihixtQxMSZ6VCA5oZP9E/nMgwv/PBgVHZ03Ip0djdcv2dSQyeXcCAXqcOdDf
-AQkH3aTwcLIWEJa2WdvoUTAzqgE0sKUbvDqIngP3zimFS2t2XSln1/2ThH67RQpJ
-75cBdHlUU6w+a1dkBRg+0KORyt+QoqQgQx4vYmySDU2I/l1x5zQ7ma0CAwEAAaNj
-MGEwHQYDVR0OBBYEFGSRwgu2RzBPeQQ5AMgT+VMpnyHWMEAGA1UdEQQ5MDeCDmlk
-cC5hc3UuY2FzLmN6hiVodHRwczovL2lkcC5hc3UuY2FzLmN6L2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCva6u3xg7RFn+3lcwKfCSDU3o9WyLdPfuM
-VHydFjfIxxjlBOE4sMPAbFwTvlRi+TlZXgmJDBwv1UReC68Sik+3PjAYiLwclGP/
-y0pSMmN1A1dFK/v1PrIeaZ/YZvnuh/k7IpVKX81Kg+qhkeh9eAxiLZi6Bdd3jB6r
-4mdt/d/pPHbgkVj/qZCgBBYM0S3K/KyJcEU0ku0z447/TeGOUqDQoE7l5BNBLFi9
-RLH/RkYhMb3hf89qLrOFgXCR3hAyX4xQAnyTZyxliYteSiGMfmLW6Mmr+MNaojx5
-CuBQbcFvp2S6zogNWjt2678eGQSvtIIqAVNLzE9FpmksXm5Gyimt
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.asu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Astronomical Institute of the CAS</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Astronomický ústav AVČR, v.v.i.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Astronomical institute of the Czech Academy of Sciences</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Astronomický ústav Akademie věd České republiky</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.asu.cas.cz/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.asu.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Ryšavý</md:SurName>
-    <md:EmailAddress>petr.rysavy@asu.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.xml
deleted file mode 100644
index a0a1af26..00000000
--- a/swamid-interfederations-2.0/idp.athukfed2.openathens.net-openathens.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.athukfed2.openathens.net/openathens">
-  <!--
-		This is an OpenAthens MD "athukfed2" IdP for Eduserv.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-29T10:19:00Z"/>
-  </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">athukfed2.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfederation"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed2.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv athukfed2</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.xml
deleted file mode 100644
index 0bf96500..00000000
--- a/swamid-interfederations-2.0/idp.athukfed3.openathens.net-openathens.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.athukfed3.openathens.net/openathens">
-  <!--
-		This is an "athukfed3" OpenAthens MD Test IdP for Eduserv.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-12T16:04:09Z"/>
-  </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">athukfed3.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfederation"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfederation"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed3.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv athukfed3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.xml
deleted file mode 100644
index 5980e81a..00000000
--- a/swamid-interfederations-2.0/idp.athukfed4.openathens.net-openathens.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.athukfed4.openathens.net/openathens">
-  <!--
-		This is an "athukfed4" OpenAthens MD Test IdP for Eduserv.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-25T13:51:09Z"/>
-  </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">athukfed4.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfed/67475576"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfed/67475576"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed4.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv athukfed4</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml b/swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.xml
deleted file mode 100644
index 9a6690e2..00000000
--- a/swamid-interfederations-2.0/idp.athukfed5.openathens.net-openathens.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.athukfed5.openathens.net/openathens">
-  <!--
-		This is an "athukfed5" OpenAthens MD Test IdP for Eduserv.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-25T13:51:09Z"/>
-  </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">athukfed5.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net/ukfed/67484437"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.athensams.net/ukfed/67484437"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">athukfed5.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv athukfed5</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aua.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aua.gr-idp-shibboleth.xml
deleted file mode 100644
index 02d90217..00000000
--- a/swamid-interfederations-2.0/idp.aua.gr-idp-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://idp.aua.gr/idp/shibboleth">
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">aua.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEYTCCA0mgAwIBAgIQLao5DrjKl4jtinW5yqZdmDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDcxNTAwMDAwMFoXDTE2MDcxNDIzNTk1OVowODEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAuYXVhLmdy
-                            MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAudMiLYCnGTOdy3cDiHPh
-                            4YtBdPR5g9XEXhVD8bCLlYY64H8RGiZlkBlfEYOKc8JR20/hbHlGotP9wcibK8GP
-                            ZJ1w7qll1oiE8OAU+9KzpzZYzLJ8pwuCOpiqfy4SztBK0JUq9Nd0tCjQ4B+v9gnm
-                            cBzqiE+1vQ/5CBnEhGg+Oy5jzyHQVSnQ241CT3VsjIRs1ZzBtI/EODNnnamV/d1x
-                            zZwqybklD3jOMzRzvcAOV3aaTJrFma2rt3tWpdAykO4EMNQRu6DFmZv7TcbVElIy
-                            T9PiA9Bvjaj99V/8oP2vcYEMf7Le0Zg0KGSegNRXmkDe2j/ltzq7dMKfeIz9zLOu
-                            3QIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-                            HQYDVR0OBBYEFEJL3TxlxKi8XGNZygQlIqZA9dmjMA4GA1UdDwEB/wQEAwIFoDAM
-                            BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-                            HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-                            hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-                            BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-                            cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-                            dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAuYXVhLmdyMA0GCSqGSIb3DQEBBQUA
-                            A4IBAQAIQM5R4k0UvejW0sGjN8BjY3SI9NCqGpWqa2KvahG0S7hKseCLRhasrORa
-                            rBlW2Fc4ANdbt2ixp9GBFq+0Jr8uI8Gk4yuQsPEJ4TBp3rywC43QFE2MXyhzgCso
-                            wgA5AjFA+5k8ceZN6PK0O6bWcNyNdgFsIF4KgW/+SelgxT8AnJYG0GRUBAf3DIrQ
-                            Nuw5bEgQ0r45EPQALqs2qKANJDWNiC4Ad5WB5QkVbw/eODpQXGbOVyV6vbb++0df
-                            mQptmsByxpJOAuAuzFRgct/YD2rGwiP2/iuL/QX2wSvWZpABTSAPaynG10ScZl55
-                            HWQrDaq4qyBzo7Flcck4QDjBirDo
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aua.gr: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.aua.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aua.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aua.gr/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">aua.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEYTCCA0mgAwIBAgIQLao5DrjKl4jtinW5yqZdmDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDcxNTAwMDAwMFoXDTE2MDcxNDIzNTk1OVowODEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAuYXVhLmdy
-                            MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAudMiLYCnGTOdy3cDiHPh
-                            4YtBdPR5g9XEXhVD8bCLlYY64H8RGiZlkBlfEYOKc8JR20/hbHlGotP9wcibK8GP
-                            ZJ1w7qll1oiE8OAU+9KzpzZYzLJ8pwuCOpiqfy4SztBK0JUq9Nd0tCjQ4B+v9gnm
-                            cBzqiE+1vQ/5CBnEhGg+Oy5jzyHQVSnQ241CT3VsjIRs1ZzBtI/EODNnnamV/d1x
-                            zZwqybklD3jOMzRzvcAOV3aaTJrFma2rt3tWpdAykO4EMNQRu6DFmZv7TcbVElIy
-                            T9PiA9Bvjaj99V/8oP2vcYEMf7Le0Zg0KGSegNRXmkDe2j/ltzq7dMKfeIz9zLOu
-                            3QIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-                            HQYDVR0OBBYEFEJL3TxlxKi8XGNZygQlIqZA9dmjMA4GA1UdDwEB/wQEAwIFoDAM
-                            BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-                            HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-                            hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-                            BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-                            cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-                            dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAuYXVhLmdyMA0GCSqGSIb3DQEBBQUA
-                            A4IBAQAIQM5R4k0UvejW0sGjN8BjY3SI9NCqGpWqa2KvahG0S7hKseCLRhasrORa
-                            rBlW2Fc4ANdbt2ixp9GBFq+0Jr8uI8Gk4yuQsPEJ4TBp3rywC43QFE2MXyhzgCso
-                            wgA5AjFA+5k8ceZN6PK0O6bWcNyNdgFsIF4KgW/+SelgxT8AnJYG0GRUBAf3DIrQ
-                            Nuw5bEgQ0r45EPQALqs2qKANJDWNiC4Ad5WB5QkVbw/eODpQXGbOVyV6vbb++0df
-                            mQptmsByxpJOAuAuzFRgct/YD2rGwiP2/iuL/QX2wSvWZpABTSAPaynG10ScZl55
-                            HWQrDaq4qyBzo7Flcck4QDjBirDo
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aua.gr: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">Agricultural University of Athens</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Γεωπονικό Πανεπιστήμιο Αθηνών</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Agricultural University of Athens</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Γεωπονικό Πανεπιστήμιο Αθηνών</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.aua.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.aua.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alexandros</md:GivenName>
-    <md:SurName>Lekatsas</md:SurName>
-    <md:EmailAddress>alex@aua.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Alexandros</md:GivenName>
-    <md:SurName>Lekatsas</md:SurName>
-    <md:EmailAddress>alex@aua.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aub.edu.lb-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aub.edu.lb-idp-shibboleth.xml
deleted file mode 100644
index c067de2d..00000000
--- a/swamid-interfederations-2.0/idp.aub.edu.lb-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://idp.aub.edu.lb/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">aub.edu.lb</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">American University of Beirut</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>
-MIIDIzCCAgugAwIBAgIULYKLvS4tqdodA2Tpx8fCYWx2u9AwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmF1Yi5lZHUubGIwHhcNMTQwNzIyMDkxMTM4WhcN
-MzQwNzIyMDkxMTM4WjAZMRcwFQYDVQQDEw5pZHAuYXViLmVkdS5sYjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZmVQ3esrju64+cm06CzqI3ibvg3E3I
-Fnox2okzwxJMAl4SJTunO4NVX1quiXbURRk7aY8XOY7aZYJ6ruatsh0Ng/q/PyoI
-l3EWI3MmE7h55DsIi+NRd/oQZG57ENr2UKkZQca5esRtfWx/mqkTEcf48hOMmmwd
-IpnGnxpTu9bsWCf+RiRTySZnWcXpllvHSrkAET7Kl3Aeexs8WYAlJ8WYg8blx5QS
-QHIM2wIbRbhVWOaTO905J6lLF3LhrWdZ7637RMDivVTNwdA8nuk0QJm0dZN5Z+hE
-2MbUnOvB5SYFLLo3mrU4a7b0Bl1J/pxMJZrlaoVn8OhJrDqkf77jxFECAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmF1Yi5lZHUubGKGJWh0dHBzOi8vaWRwLmF1Yi5l
-ZHUubGIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOdoJG41Ncg47yzvfG0DH3HZ
-oaT+MA0GCSqGSIb3DQEBBQUAA4IBAQBs+g6B7jh5AFf6bXX+TzFJalywRYNfTBfU
-YDF64/TFX8OziVUb5d+up9B+EFDudMASU5BqTr8pGfoQackmI0TEvl9n/BZBEhrr
-lel95gK/Y614xMJkoFFZle3u3Kp415r56M7PDRkDJ+a4QTn5ILEjLVoZvwrboHWb
-JfTFVPALyF2oZex7bbHZ2i6CyE0qLetqWmZGgLEl2SscK2Ue1w/pqW6yoo2YMsOC
-X4Ic+GreOjVGJN1TRDjBY6sei0ef+aAulVL1K1aWSjFWjJUazdq4TlZsOF0Z/WGG
-Zderlj8oMgziT8XJHB+2YcRnJm63bJ4PpmitJEcGpgcszR+U1OoQ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aub.edu.lb:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aub.edu.lb:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aub.edu.lb/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aub.edu.lb/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aub.edu.lb/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aub.edu.lb/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aub.edu.lb/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aub.edu.lb/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aub.edu.lb</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIULYKLvS4tqdodA2Tpx8fCYWx2u9AwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmF1Yi5lZHUubGIwHhcNMTQwNzIyMDkxMTM4WhcN
-MzQwNzIyMDkxMTM4WjAZMRcwFQYDVQQDEw5pZHAuYXViLmVkdS5sYjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZmVQ3esrju64+cm06CzqI3ibvg3E3I
-Fnox2okzwxJMAl4SJTunO4NVX1quiXbURRk7aY8XOY7aZYJ6ruatsh0Ng/q/PyoI
-l3EWI3MmE7h55DsIi+NRd/oQZG57ENr2UKkZQca5esRtfWx/mqkTEcf48hOMmmwd
-IpnGnxpTu9bsWCf+RiRTySZnWcXpllvHSrkAET7Kl3Aeexs8WYAlJ8WYg8blx5QS
-QHIM2wIbRbhVWOaTO905J6lLF3LhrWdZ7637RMDivVTNwdA8nuk0QJm0dZN5Z+hE
-2MbUnOvB5SYFLLo3mrU4a7b0Bl1J/pxMJZrlaoVn8OhJrDqkf77jxFECAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmF1Yi5lZHUubGKGJWh0dHBzOi8vaWRwLmF1Yi5l
-ZHUubGIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOdoJG41Ncg47yzvfG0DH3HZ
-oaT+MA0GCSqGSIb3DQEBBQUAA4IBAQBs+g6B7jh5AFf6bXX+TzFJalywRYNfTBfU
-YDF64/TFX8OziVUb5d+up9B+EFDudMASU5BqTr8pGfoQackmI0TEvl9n/BZBEhrr
-lel95gK/Y614xMJkoFFZle3u3Kp415r56M7PDRkDJ+a4QTn5ILEjLVoZvwrboHWb
-JfTFVPALyF2oZex7bbHZ2i6CyE0qLetqWmZGgLEl2SscK2Ue1w/pqW6yoo2YMsOC
-X4Ic+GreOjVGJN1TRDjBY6sei0ef+aAulVL1K1aWSjFWjJUazdq4TlZsOF0Z/WGG
-Zderlj8oMgziT8XJHB+2YcRnJm63bJ4PpmitJEcGpgcszR+U1OoQ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aub.edu.lb:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">American University of Beirut</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">American University of Beirut</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.aub.edu.lb/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mona Assi</md:GivenName>
-    <md:EmailAddress>monassi@aub.edu.lb</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Shibboleth Support Team</md:GivenName>
-    <md:EmailAddress>Shibboleth@aub.edu.lb</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth Techincal Team</md:GivenName>
-    <md:EmailAddress>Shibboleth@aub.edu.lb</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Maher Kassab</md:GivenName>
-    <md:EmailAddress>maherk@aub.edu.lb</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.xml
deleted file mode 100644
index ba0f35bb..00000000
--- a/swamid-interfederations-2.0/idp.aucb.ac.uk-oala-metadata.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.aucb.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the Arts University Bournemouth.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-09T14:13:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">aucb.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Arts University Bournemouth</mdui:DisplayName>
-        <mdui:Logo height="80" width="80">https://idp.aub.ac.uk/oala/aub-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>
-						MIIDPjCCAiYCCQC8xJ9vaIeK2DANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJH
-						QjEUMBIGA1UEBwwLQm91cm5lbW91dGgxJDAiBgNVBAoMG0FydHMgVW5pdmVyc2l0
-						eSBCb3VybmVtb3V0aDEWMBQGA1UEAwwNaWRwLmF1Yi5hYy51azAeFw0xNTA1MTIw
-						ODQ1MjVaFw0yNTA1MDkwODQ1MjVaMGExCzAJBgNVBAYTAkdCMRQwEgYDVQQHDAtC
-						b3VybmVtb3V0aDEkMCIGA1UECgwbQXJ0cyBVbml2ZXJzaXR5IEJvdXJuZW1vdXRo
-						MRYwFAYDVQQDDA1pZHAuYXViLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEArtZuTj9pqpzsS5Av4dy3JhOyA3KZ9DrUaRfvTikSzNTapKHm/rgs
-						NvFEdIsFlRTaEVrXVku9skreApztHqIOxKOnW+b1f4Pz2qVHw8VhQ1So5+dw1lKK
-						yVJYIqR789B2m5sw1RebkcWGxqgp9YnVVy1Sxwl3G9p+iK50+T9/IYFHmN1t+O7+
-						ZdkzgwSgVRXJOJpL4xpqpN5yAdWT6Xy715dUcb6n+Q+DwVl8kQ0ijAeTxmvgGwri
-						byHVFQNjRwp5g8fpSOD8aARJo+zHlXPnDNtVi9hGAmF7sqsw+yofm9yij0Trr3nt
-						eXhO5uXI6ll9WvaZs7TWgbi8EwDGSBsT9wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-						AQAHvTcz3Z92jat8NIvJjGIhwFFkLi3nesGD4PHhpGyETg+mjhixmePgg8XQ8Riv
-						7ISypDV7YXpjpTpjWYfpmFoml72sekqFX3ytAiHcRDM8ntwXqx+Iv7pyefxHYb6w
-						HiYYr7QMoY+BCa4RPac7YZ+Gy2Z0q9tnmQxbDKkFl8n0u6x/XTMvi6Ur3nuVOU2r
-						4oG91+csISAK+agYgKqY/aKVuGIMTb9dNYmtdm1H9t5psHwLtorlfzlJ3c1WzcK2
-						zBqWdOpqVeBsiTPjpR7wL3RTPF4IrjBp0SuDmglqX0F/kV/3dniVZxGDx0pIralA
-						QrGWIgmGZgtbr5YI+CYEjTax
-					</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>
-						MIIDPjCCAiYCCQC8xJ9vaIeK2DANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQGEwJH
-						QjEUMBIGA1UEBwwLQm91cm5lbW91dGgxJDAiBgNVBAoMG0FydHMgVW5pdmVyc2l0
-						eSBCb3VybmVtb3V0aDEWMBQGA1UEAwwNaWRwLmF1Yi5hYy51azAeFw0xNTA1MTIw
-						ODQ1MjVaFw0yNTA1MDkwODQ1MjVaMGExCzAJBgNVBAYTAkdCMRQwEgYDVQQHDAtC
-						b3VybmVtb3V0aDEkMCIGA1UECgwbQXJ0cyBVbml2ZXJzaXR5IEJvdXJuZW1vdXRo
-						MRYwFAYDVQQDDA1pZHAuYXViLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEArtZuTj9pqpzsS5Av4dy3JhOyA3KZ9DrUaRfvTikSzNTapKHm/rgs
-						NvFEdIsFlRTaEVrXVku9skreApztHqIOxKOnW+b1f4Pz2qVHw8VhQ1So5+dw1lKK
-						yVJYIqR789B2m5sw1RebkcWGxqgp9YnVVy1Sxwl3G9p+iK50+T9/IYFHmN1t+O7+
-						ZdkzgwSgVRXJOJpL4xpqpN5yAdWT6Xy715dUcb6n+Q+DwVl8kQ0ijAeTxmvgGwri
-						byHVFQNjRwp5g8fpSOD8aARJo+zHlXPnDNtVi9hGAmF7sqsw+yofm9yij0Trr3nt
-						eXhO5uXI6ll9WvaZs7TWgbi8EwDGSBsT9wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-						AQAHvTcz3Z92jat8NIvJjGIhwFFkLi3nesGD4PHhpGyETg+mjhixmePgg8XQ8Riv
-						7ISypDV7YXpjpTpjWYfpmFoml72sekqFX3ytAiHcRDM8ntwXqx+Iv7pyefxHYb6w
-						HiYYr7QMoY+BCa4RPac7YZ+Gy2Z0q9tnmQxbDKkFl8n0u6x/XTMvi6Ur3nuVOU2r
-						4oG91+csISAK+agYgKqY/aKVuGIMTb9dNYmtdm1H9t5psHwLtorlfzlJ3c1WzcK2
-						zBqWdOpqVeBsiTPjpR7wL3RTPF4IrjBp0SuDmglqX0F/kV/3dniVZxGDx0pIralA
-						QrGWIgmGZgtbr5YI+CYEjTax
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aub.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aub.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Arts University Bournemouth</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Arts University Bournemouth</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://aub.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Calvert</SurName>
-    <EmailAddress>mailto:acalvert@aub.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@aub.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml
deleted file mode 100644
index 52adbbe6..00000000
--- a/swamid-interfederations-2.0/idp.aueb.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.aueb.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">aueb.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Athens University of Economics and Business</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.aueb.gr/index_en.php</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.aueb.gr/</mdui:InformationURL>
-        <mdui:Logo width="83" height="83">https://idp.aueb.gr/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.251.248.0/21</mdui:IPHint>
-        <mdui:IPHint>195.251.232.0/22</mdui:IPHint>
-        <mdui:IPHint>83.212.204.0/22</mdui:IPHint>
-        <mdui:DomainHint>aueb.gr</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:37.593870,23.435599</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>
-                            MIIEYzCCA0ugAwIBAgIQMkBM34MgBP6WOyvexdVHxDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDYxNzAwMDAwMFoXDTE2MDYxNjIzNTk1OVowOTEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuYXVlYi5n
-                            cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOfIC/gPjg+7dui8kUXs
-                            aFkPywX/bAknzwhwr8Q1pq6L9tjSWXnJQm4K9MZCtOl6oKlFSb9/XjsD6V6cf+Yd
-                            pf0U9Va7nDNDvGXhBLKoXF92s6qGQa3rFM6l4y0ReRsjMa8U5XTtDrgcR4XVcWp2
-                            Z7Y19J6I4uhbjZpz1t4DaDWp3VEDH2czxVV4Iguqo8+g7ZbQNE0UKW8FNBUO6G+R
-                            3L4itrm6kxAqmATAEAzuLO5qcZz0qgCOnAI+darK+LYm7ea5Go9FU8iTRb5kTg2V
-                            vEb56q3wK+pirgAM9CZFpruzLOJrLFkvMl5UIDwcr1X7URmkPn0K9hGayd29UZ4C
-                            GE0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-                            MB0GA1UdDgQWBBT/nu7O+ufwZ5Uguq8QAOFZvR/6wjAOBgNVHQ8BAf8EBAMCBaAw
-                            DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
-                            VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
-                            K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-                            KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-                            b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-                            LnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILaWRwLmF1ZWIuZ3IwDQYJKoZIhvcNAQEF
-                            BQADggEBAH0+NT4B1JPMraU0ddjLW9pHK1O26iPvhQ8kLPvy6xorXq69tgnkQfpW
-                            r+AcASJHzvtBRvGJbE88YItIiXaX5MPkLlVx+VP8PqYpyG9FuHE6x40jbIgCVZh8
-                            gvTWNIFj4CGP+RzGj++SqIaYiRDmjEwO6aBQWdt+9dAcSHwDepCKhiMOnxo3KjU/
-                            EOL74P1xOJ8Yiata5m14tUtgH3sT4HMBLL+NOcA141SCOxATMDqA14J/YKH7qBmD
-                            ra+kKyuWg+uN0sCITnS3SE0TkcHSgLPTUZmtEeDW30p2X/9VODp79ypkyPBIzQe5
-                            0Mzg/vjsooFHC3rLHgFtsJIKEBgHv+4=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aueb.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aueb.gr: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.aueb.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aueb.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aueb.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aueb.gr/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">aueb.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEYzCCA0ugAwIBAgIQMkBM34MgBP6WOyvexdVHxDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDYxNzAwMDAwMFoXDTE2MDYxNjIzNTk1OVowOTEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuYXVlYi5n
-                            cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOfIC/gPjg+7dui8kUXs
-                            aFkPywX/bAknzwhwr8Q1pq6L9tjSWXnJQm4K9MZCtOl6oKlFSb9/XjsD6V6cf+Yd
-                            pf0U9Va7nDNDvGXhBLKoXF92s6qGQa3rFM6l4y0ReRsjMa8U5XTtDrgcR4XVcWp2
-                            Z7Y19J6I4uhbjZpz1t4DaDWp3VEDH2czxVV4Iguqo8+g7ZbQNE0UKW8FNBUO6G+R
-                            3L4itrm6kxAqmATAEAzuLO5qcZz0qgCOnAI+darK+LYm7ea5Go9FU8iTRb5kTg2V
-                            vEb56q3wK+pirgAM9CZFpruzLOJrLFkvMl5UIDwcr1X7URmkPn0K9hGayd29UZ4C
-                            GE0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-                            MB0GA1UdDgQWBBT/nu7O+ufwZ5Uguq8QAOFZvR/6wjAOBgNVHQ8BAf8EBAMCBaAw
-                            DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
-                            VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
-                            K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-                            KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-                            b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-                            LnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILaWRwLmF1ZWIuZ3IwDQYJKoZIhvcNAQEF
-                            BQADggEBAH0+NT4B1JPMraU0ddjLW9pHK1O26iPvhQ8kLPvy6xorXq69tgnkQfpW
-                            r+AcASJHzvtBRvGJbE88YItIiXaX5MPkLlVx+VP8PqYpyG9FuHE6x40jbIgCVZh8
-                            gvTWNIFj4CGP+RzGj++SqIaYiRDmjEwO6aBQWdt+9dAcSHwDepCKhiMOnxo3KjU/
-                            EOL74P1xOJ8Yiata5m14tUtgH3sT4HMBLL+NOcA141SCOxATMDqA14J/YKH7qBmD
-                            ra+kKyuWg+uN0sCITnS3SE0TkcHSgLPTUZmtEeDW30p2X/9VODp79ypkyPBIzQe5
-                            0Mzg/vjsooFHC3rLHgFtsJIKEBgHv+4=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aueb.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aueb.gr: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">Athens University of Economics and Business</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Athens University of Economics and Business</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Οικονομικό Πανεπιστήμιο Αθηνών</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.aueb.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.aueb.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Yiorgos</md:GivenName>
-    <md:SurName>Alexandris</md:SurName>
-    <md:EmailAddress>alexandr@aueb.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Athens University of Economics and Business</md:Company>
-    <md:EmailAddress>noc@aueb.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aus.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aus.edu-idp-shibboleth.xml
deleted file mode 100644
index 39636d94..00000000
--- a/swamid-interfederations-2.0/idp.aus.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +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://idp.aus.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">aus.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">American University of Sharjah</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for the American University of Sharjah </mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.aus.edu</mdui:InformationURL>
-        <mdui:Logo height="71" width="394" xml:lang="en">https://www.aus.edu/site/styles/css_img/logo-final.gif</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>
-MIIDJjCCAg4CCQC0u6dmZ9/CYDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJB
-RTEQMA4GA1UECAwHU2hhcmphaDEQMA4GA1UEBwwHU2hhcmphaDEMMAoGA1UECgwD
-QVVTMRQwEgYDVQQDDAtpZHAuYXVzLmVkdTAeFw0xNTAyMDkxNTEwMTJaFw0yNTAy
-MDgxNTEwMTJaMFUxCzAJBgNVBAYTAkFFMRAwDgYDVQQIDAdTaGFyamFoMRAwDgYD
-VQQHDAdTaGFyamFoMQwwCgYDVQQKDANBVVMxFDASBgNVBAMMC2lkcC5hdXMuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArnIAxDkCLqj1r6dLNow+
-MZO+fyMglmyJTiZU1Jnq/qv8RGfODs+MXQ719T8PgrPpTLjO2H2hR62oaAxygEC8
-YKsgLZoWehvkvSBQcF7vCvDYtimusiR0HVD+1ZkL9ivFoDcH1uNZ998bW0B+yynf
-WR8+Y2ALhmKd0EvHvMtYLdnKSk7Bs73loAtT1/g+GWEKINjDigW31usFOw9Ty2xZ
-/LXTY3DEpQLDRVod9b7pBCdRNwYW1ELZXEE8hofFIArhxDCGqCTUjUiJYyvol4Qc
-mZ27PoYC/lhb6EWLXGZ4Y9NWwzpOSlJycY5G5jdsDHSF0oNfmhXvSF/A5liMwKnk
-xQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAkzksTVrYM0fh2OjSXdP8n/BKmK4xt
-skvPq0cBCBraY9ckQiBf5frJLMbOr5WuEolJBwJVOljlN2PcYgxtQJ+VtqsvLCaU
-HVYH+YfHi0eUNJHB4/l2mEOCuDB3yo9wmevmwyayO5MxvurZsH+xZmPpiyv3AKTz
-fM7tDfyk1i3MtP1v7RecCSDboJGCYUgxtOApAOvBttTYh8Aswc9X6+JHDTXiUS+6
-bdFUpKzYfJN5qvPbN7aO4b6WYutrATd2XleDvTwdMF9/GuxATxAZuWAgSPDmIGMC
-dyrwmVwoKB3/P28kLxOLL8gvjSnWnKo3GJPob/c5rP13XMj7wRDdMpAJ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aus.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aus.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.aus.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.aus.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.aus.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aus.edu/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">aus.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJjCCAg4CCQC0u6dmZ9/CYDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJB
-RTEQMA4GA1UECAwHU2hhcmphaDEQMA4GA1UEBwwHU2hhcmphaDEMMAoGA1UECgwD
-QVVTMRQwEgYDVQQDDAtpZHAuYXVzLmVkdTAeFw0xNTAyMDkxNTEwMTJaFw0yNTAy
-MDgxNTEwMTJaMFUxCzAJBgNVBAYTAkFFMRAwDgYDVQQIDAdTaGFyamFoMRAwDgYD
-VQQHDAdTaGFyamFoMQwwCgYDVQQKDANBVVMxFDASBgNVBAMMC2lkcC5hdXMuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArnIAxDkCLqj1r6dLNow+
-MZO+fyMglmyJTiZU1Jnq/qv8RGfODs+MXQ719T8PgrPpTLjO2H2hR62oaAxygEC8
-YKsgLZoWehvkvSBQcF7vCvDYtimusiR0HVD+1ZkL9ivFoDcH1uNZ998bW0B+yynf
-WR8+Y2ALhmKd0EvHvMtYLdnKSk7Bs73loAtT1/g+GWEKINjDigW31usFOw9Ty2xZ
-/LXTY3DEpQLDRVod9b7pBCdRNwYW1ELZXEE8hofFIArhxDCGqCTUjUiJYyvol4Qc
-mZ27PoYC/lhb6EWLXGZ4Y9NWwzpOSlJycY5G5jdsDHSF0oNfmhXvSF/A5liMwKnk
-xQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAkzksTVrYM0fh2OjSXdP8n/BKmK4xt
-skvPq0cBCBraY9ckQiBf5frJLMbOr5WuEolJBwJVOljlN2PcYgxtQJ+VtqsvLCaU
-HVYH+YfHi0eUNJHB4/l2mEOCuDB3yo9wmevmwyayO5MxvurZsH+xZmPpiyv3AKTz
-fM7tDfyk1i3MtP1v7RecCSDboJGCYUgxtOApAOvBttTYh8Aswc9X6+JHDTXiUS+6
-bdFUpKzYfJN5qvPbN7aO4b6WYutrATd2XleDvTwdMF9/GuxATxAZuWAgSPDmIGMC
-dyrwmVwoKB3/P28kLxOLL8gvjSnWnKo3GJPob/c5rP13XMj7wRDdMpAJ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.aus.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.aus.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">American University of Sharjah</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">American University of Sharjah</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.aus.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IdP Support Team</md:GivenName>
-    <md:EmailAddress>idp_support@aus.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IdP Support Team</md:GivenName>
-    <md:EmailAddress>idp_support@aus.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IdP Support Team</md:GivenName>
-    <md:EmailAddress>idp_support@aus.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>IdP Support Team</md:GivenName>
-    <md:EmailAddress>idp_support@aus.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.xml
deleted file mode 100644
index 1556f6fc..00000000
--- a/swamid-interfederations-2.0/idp.ayrcoll.ac.uk-entity.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.ayrcoll.ac.uk/entity">
-  <!--
-		This is an IdP (owned by Eduserv) for Ayrshire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">ayrcoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ayrcoll.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ayrcoll.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ayrshire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ayrshire.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bangor.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bangor.ac.uk-shibboleth.xml
deleted file mode 100644
index 28b28659..00000000
--- a/swamid-interfederations-2.0/idp.bangor.ac.uk-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.bangor.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Bangor University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-25T14:44:01Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">bangor.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Bangor University</mdui:DisplayName>
-        <mdui:Logo height="73" width="59">https://www.bangor.ac.uk/shibboleth-logos/bangor-73x59.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.bangor.ac.uk/shibboleth-logos/bangor-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIUF2tfR3F/95LsBO8Z7dI/3Od1JrEwDQYJKoZIhvcNAQEF
-						BQAwGzEZMBcGA1UEAxMQaWRwLmJhbmdvci5hYy51azAeFw0xMzAxMTYxNjM3NTNa
-						Fw0zMzAxMTYxNjM3NTNaMBsxGTAXBgNVBAMTEGlkcC5iYW5nb3IuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJBQhi8lIehZpcfLy6pzq9+YrE
-						s8ECs4yWxQ9zaw8YFq19G1ErjQiP9lr7MVho9zUfl2d0Amo/zXvfU6Uhbc9ZFk3R
-						nE8taqdwTya5x8m8vpbzxCw0h2+v8+FneDuPrxRgTajeHGhqm6hSb8XuJyoXQL5h
-						lkPaP0aXcGnpehaGJORhFTy7eBxWGOAqEs0FswNVYDo2RjUhlkO2t3YkjVuvdaOU
-						4gXKkoC+mpZJNHyz1soHz6gfbPgoDe7tzY+x4riJJPJ83LoEvYLzBR8FeSIbHhLQ
-						LmNOk/Y0fKjIqtGFscZ+zm8iRvL/i0fo9p7SnSOH6IOkQAQlV4hGZtjrGi0fAgMB
-						AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5iYW5nb3IuYWMudWuGJ2h0dHBzOi8vaWRw
-						LmJhbmdvci5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU42JN8CxdI3UM
-						PnzBlxj2J0DY1AEwDQYJKoZIhvcNAQEFBQADggEBAFq+GsW2kGNchObmYHO6sBFs
-						YVXlPEhrw2c/IsnentSOUV+1HJpfBajvdIHvGeCjG2Hwn+iCTW6P7LMDoqaJDxH7
-						PhvzJzMk8haPjzOMIZhbRghkg45abX6SDP7AHsCoAkROHz4aVC4EuN+UyNCsxSTC
-						KHuE39z3Nw3ENn7zSt0oTeHUy5anfrYDsECbp6NKFcPCeEHHgcRltqssPOcNj84X
-						bOwIjKElyD6/LYB0zUAsVYvMHuwP/hpMpwyOk6baedxu7Ij0Rfea+m3yJOWzQkap
-						BXv9usAPuXT0WpAXr236FlYZCkMosBJavcYBZVuKlS2JhipYXJyJfcRvFRw7dnI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bangor.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bangor.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.bangor.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bangor.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bangor.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bangor.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">bangor.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIUF2tfR3F/95LsBO8Z7dI/3Od1JrEwDQYJKoZIhvcNAQEF
-						BQAwGzEZMBcGA1UEAxMQaWRwLmJhbmdvci5hYy51azAeFw0xMzAxMTYxNjM3NTNa
-						Fw0zMzAxMTYxNjM3NTNaMBsxGTAXBgNVBAMTEGlkcC5iYW5nb3IuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJBQhi8lIehZpcfLy6pzq9+YrE
-						s8ECs4yWxQ9zaw8YFq19G1ErjQiP9lr7MVho9zUfl2d0Amo/zXvfU6Uhbc9ZFk3R
-						nE8taqdwTya5x8m8vpbzxCw0h2+v8+FneDuPrxRgTajeHGhqm6hSb8XuJyoXQL5h
-						lkPaP0aXcGnpehaGJORhFTy7eBxWGOAqEs0FswNVYDo2RjUhlkO2t3YkjVuvdaOU
-						4gXKkoC+mpZJNHyz1soHz6gfbPgoDe7tzY+x4riJJPJ83LoEvYLzBR8FeSIbHhLQ
-						LmNOk/Y0fKjIqtGFscZ+zm8iRvL/i0fo9p7SnSOH6IOkQAQlV4hGZtjrGi0fAgMB
-						AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5iYW5nb3IuYWMudWuGJ2h0dHBzOi8vaWRw
-						LmJhbmdvci5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU42JN8CxdI3UM
-						PnzBlxj2J0DY1AEwDQYJKoZIhvcNAQEFBQADggEBAFq+GsW2kGNchObmYHO6sBFs
-						YVXlPEhrw2c/IsnentSOUV+1HJpfBajvdIHvGeCjG2Hwn+iCTW6P7LMDoqaJDxH7
-						PhvzJzMk8haPjzOMIZhbRghkg45abX6SDP7AHsCoAkROHz4aVC4EuN+UyNCsxSTC
-						KHuE39z3Nw3ENn7zSt0oTeHUy5anfrYDsECbp6NKFcPCeEHHgcRltqssPOcNj84X
-						bOwIjKElyD6/LYB0zUAsVYvMHuwP/hpMpwyOk6baedxu7Ij0Rfea+m3yJOWzQkap
-						BXv9usAPuXT0WpAXr236FlYZCkMosBJavcYBZVuKlS2JhipYXJyJfcRvFRw7dnI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bangor.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bangor.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">Bangor University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bangor University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bangor.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>mailto:c.m.jones@bangor.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Williams</SurName>
-    <EmailAddress>mailto:matthew.williams@bangor.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.xml b/swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.xml
deleted file mode 100644
index b5508a6c..00000000
--- a/swamid-interfederations-2.0/idp.barkingcollege.ac.uk-shibbolethidp.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://idp.barkingcollege.ac.uk/shibbolethidp">
-  <!--
-		This is a Shibboleth IdP for Barking and Dagenham College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-31T10:43: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">barkingcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDejCCAmICCQCUfpmzVfedFDANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
-						QjEOMAwGA1UECBMFRXNzZXgxEDAOBgNVBAcTB1JvbWZvcmQxIzAhBgNVBAoUGkJh
-						cmtpbmcgJiBEYWdlbmhhbSBDb2xsZWdlMSkwJwYDVQQDEyBpZHAuYmFya2luZ2Rh
-						Z2VuaGFtY29sbGVnZS5hYy51azAeFw0xNDA5MTAwOTE4MTBaFw0zNDA5MDUwOTE4
-						MTBaMH8xCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVFc3NleDEQMA4GA1UEBxMHUm9t
-						Zm9yZDEjMCEGA1UEChQaQmFya2luZyAmIERhZ2VuaGFtIENvbGxlZ2UxKTAnBgNV
-						BAMTIGlkcC5iYXJraW5nZGFnZW5oYW1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxosouASSI48U5Rj7J/CAeIpA7GAK+JXFuqtN
-						ApG5F1+uVRqoUPBZ07ToDpqBMYlNq0FRRf5kPb/M/I60OqMcQUuKMJKj9tiYYNS1
-						FvTX9nMCKCxx+HUpUenQ6BUhDElu3TqiHbh1nsIqErDLShY+/rYOeOYqmiIOJthr
-						cWeXJ+x90ZjIJcJe9RdC5LXQF67e8xEyZttS1fgl2k1IN1PQrUr/rfrbE5U0sta4
-						9stGa8EtjiRMk/5yPH/gLZrQs3qyh0nOaP4K4m7oOC5iubiNIm4CiCEl9vLtY4G/
-						Gw0eNzn89+0C6TR0Iyw7jpYg7cOXf/uXTf8n7Gtxe2pk9xznswIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQBuvV6Pq6axEKaDG3tESzL7mmB3rZAnNx6AZKJ2KlUysBRQ
-						gmRiTWpoPF7alHkLb853H7w13+uw4698rQyh+iVmWBcH4bgcLDerV40aB8AI7Ii1
-						IPIw+3XVWeWmREG402NBelkfp4FKL2Bj5moWISC+Jo7za2/5lA/Jj/eEqV+xtY5C
-						6U2QcOAeaJNeJgrMYWhTPEbd9cdx7/kiku89UdXzmKD29fC8C1c0/G7rXhvzcCsu
-						ztgXowLLdqXkiomBszPW+IERhpRPMd14IJJye7kQ/CDJLCbhb7VJfsrTxgef1LV+
-						Nb4mckExHiZcajH+gD63kcn29VoGBsEefG88zI9R
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barkingdagenhamcollege.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.barkingdagenhamcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barkingdagenhamcollege.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">barkingcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDejCCAmICCQCUfpmzVfedFDANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
-						QjEOMAwGA1UECBMFRXNzZXgxEDAOBgNVBAcTB1JvbWZvcmQxIzAhBgNVBAoUGkJh
-						cmtpbmcgJiBEYWdlbmhhbSBDb2xsZWdlMSkwJwYDVQQDEyBpZHAuYmFya2luZ2Rh
-						Z2VuaGFtY29sbGVnZS5hYy51azAeFw0xNDA5MTAwOTE4MTBaFw0zNDA5MDUwOTE4
-						MTBaMH8xCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVFc3NleDEQMA4GA1UEBxMHUm9t
-						Zm9yZDEjMCEGA1UEChQaQmFya2luZyAmIERhZ2VuaGFtIENvbGxlZ2UxKTAnBgNV
-						BAMTIGlkcC5iYXJraW5nZGFnZW5oYW1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxosouASSI48U5Rj7J/CAeIpA7GAK+JXFuqtN
-						ApG5F1+uVRqoUPBZ07ToDpqBMYlNq0FRRf5kPb/M/I60OqMcQUuKMJKj9tiYYNS1
-						FvTX9nMCKCxx+HUpUenQ6BUhDElu3TqiHbh1nsIqErDLShY+/rYOeOYqmiIOJthr
-						cWeXJ+x90ZjIJcJe9RdC5LXQF67e8xEyZttS1fgl2k1IN1PQrUr/rfrbE5U0sta4
-						9stGa8EtjiRMk/5yPH/gLZrQs3qyh0nOaP4K4m7oOC5iubiNIm4CiCEl9vLtY4G/
-						Gw0eNzn89+0C6TR0Iyw7jpYg7cOXf/uXTf8n7Gtxe2pk9xznswIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQBuvV6Pq6axEKaDG3tESzL7mmB3rZAnNx6AZKJ2KlUysBRQ
-						gmRiTWpoPF7alHkLb853H7w13+uw4698rQyh+iVmWBcH4bgcLDerV40aB8AI7Ii1
-						IPIw+3XVWeWmREG402NBelkfp4FKL2Bj5moWISC+Jo7za2/5lA/Jj/eEqV+xtY5C
-						6U2QcOAeaJNeJgrMYWhTPEbd9cdx7/kiku89UdXzmKD29fC8C1c0/G7rXhvzcCsu
-						ztgXowLLdqXkiomBszPW+IERhpRPMd14IJJye7kQ/CDJLCbhb7VJfsrTxgef1LV+
-						Nb4mckExHiZcajH+gD63kcn29VoGBsEefG88zI9R
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barkingdagenhamcollege.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">Barking and Dagenham College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Barking &amp; Dagenham College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.barkingdagenhamcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Overt Software Solutions Ltd Support</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Overt Software Solutions Ltd Support</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.barkingdagenhamcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.barkingdagenhamcollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 66c76a34..00000000
--- a/swamid-interfederations-2.0/idp.barkingdagenhamcollege.ac.uk-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" entityID="https://idp.barkingdagenhamcollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth Test IdP for Barking and Dagenham College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-10-07T13:21: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">barkingdagenhamcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDejCCAmICCQD/ZQQfcmZ8hjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
-						QjEOMAwGA1UECBMFRXNzZXgxEDAOBgNVBAcTB1JvbWZvcmQxIzAhBgNVBAoUGkJh
-						cmtpbmcgJiBEYWdlbmhhbSBDb2xsZWdlMSkwJwYDVQQDEyBpZHAuYmFya2luZ2Rh
-						Z2VuaGFtY29sbGVnZS5hYy51azAeFw0xMTA5MjkxODM3MzJaFw0zMTA5MjQxODM3
-						MzJaMH8xCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVFc3NleDEQMA4GA1UEBxMHUm9t
-						Zm9yZDEjMCEGA1UEChQaQmFya2luZyAmIERhZ2VuaGFtIENvbGxlZ2UxKTAnBgNV
-						BAMTIGlkcC5iYXJraW5nZGFnZW5oYW1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwa9EQ61PP+dHS22rPI0rhCuFbGAmZP4FRaXp
-						MWAg+KNnU/iFw/L//5Fe7vOw+x3mrCgmVejtDcjM4V3eOrcQ6Uhw0ju2hKFDXtA1
-						jkSKDh5AZjAQ4wFh/+Yz3QVPui57hzzP6uvPOGFFrTPXAJ31FPuTjtRJ9xV743MU
-						pnAlNpr7VobIB77/S4TIOF6VTIe1WVHEx2UnsLc39D5FAotX58NM9zTI0s2l780T
-						wG+8HgGwAaDLFJE6P5m+p/2CwaWipuRW0NjZ1cjExANYxCO0EKUKdQ7GiFtFFRSI
-						fSnRmW+TcdqRV2cHW/kC8507BqEXPeX1cq/8W/Kh4agoGOS6VQIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQC1rDTuyYlLsswBpXgfHf5ODCNmkmU7QKECKl4p6KhZrdki
-						acVnen1fOpY+1mqJ1v+YdStYVffuTfFcZfdXNrdaWklUYfkTJYRtq8LwvkTgoi8O
-						KJTZODdFgfWHHAvAv2QNELLN6OSkMZ3uZ4n/oW1h5m+ROtAxYSbRQjSjG8PHeYBg
-						Os+DeSwUoaH6XdBTJmoWnRiGuMLNvKpzrgCNMAxmIJZI1kb0iGqcV7rHQn1DvZlv
-						AUxTm+GBLNybpZcm5xOJYncOwq8sZCty4GHUKtz/GyPn2HmzxOVPNMTQusWwBdVc
-						QMY0U7rEj5aWo7GrBazucvLC4XteBdQoOnwlG+Ez
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barkingdagenhamcollege.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.barkingdagenhamcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.barkingdagenhamcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barkingdagenhamcollege.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">barkingdagenhamcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDejCCAmICCQD/ZQQfcmZ8hjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
-						QjEOMAwGA1UECBMFRXNzZXgxEDAOBgNVBAcTB1JvbWZvcmQxIzAhBgNVBAoUGkJh
-						cmtpbmcgJiBEYWdlbmhhbSBDb2xsZWdlMSkwJwYDVQQDEyBpZHAuYmFya2luZ2Rh
-						Z2VuaGFtY29sbGVnZS5hYy51azAeFw0xMTA5MjkxODM3MzJaFw0zMTA5MjQxODM3
-						MzJaMH8xCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVFc3NleDEQMA4GA1UEBxMHUm9t
-						Zm9yZDEjMCEGA1UEChQaQmFya2luZyAmIERhZ2VuaGFtIENvbGxlZ2UxKTAnBgNV
-						BAMTIGlkcC5iYXJraW5nZGFnZW5oYW1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwa9EQ61PP+dHS22rPI0rhCuFbGAmZP4FRaXp
-						MWAg+KNnU/iFw/L//5Fe7vOw+x3mrCgmVejtDcjM4V3eOrcQ6Uhw0ju2hKFDXtA1
-						jkSKDh5AZjAQ4wFh/+Yz3QVPui57hzzP6uvPOGFFrTPXAJ31FPuTjtRJ9xV743MU
-						pnAlNpr7VobIB77/S4TIOF6VTIe1WVHEx2UnsLc39D5FAotX58NM9zTI0s2l780T
-						wG+8HgGwAaDLFJE6P5m+p/2CwaWipuRW0NjZ1cjExANYxCO0EKUKdQ7GiFtFFRSI
-						fSnRmW+TcdqRV2cHW/kC8507BqEXPeX1cq/8W/Kh4agoGOS6VQIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQC1rDTuyYlLsswBpXgfHf5ODCNmkmU7QKECKl4p6KhZrdki
-						acVnen1fOpY+1mqJ1v+YdStYVffuTfFcZfdXNrdaWklUYfkTJYRtq8LwvkTgoi8O
-						KJTZODdFgfWHHAvAv2QNELLN6OSkMZ3uZ4n/oW1h5m+ROtAxYSbRQjSjG8PHeYBg
-						Os+DeSwUoaH6XdBTJmoWnRiGuMLNvKpzrgCNMAxmIJZI1kb0iGqcV7rHQn1DvZlv
-						AUxTm+GBLNybpZcm5xOJYncOwq8sZCty4GHUKtz/GyPn2HmzxOVPNMTQusWwBdVc
-						QMY0U7rEj5aWo7GrBazucvLC4XteBdQoOnwlG+Ez
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barkingdagenhamcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barkingdagenhamcollege.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">Barking and Dagenham College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Barking &amp; Dagenham College TEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.barkingdagenhamcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Ewens</SurName>
-    <EmailAddress>mailto:John.Ewens@bdc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Farrant</SurName>
-    <EmailAddress>mailto:David.Farrant@bdc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.barnetsouthgate.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.barnetsouthgate.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 4a75d2f0..00000000
--- a/swamid-interfederations-2.0/idp.barnetsouthgate.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.barnetsouthgate.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Barnet and Southgate College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-15T09:44:10Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">barnetsouthgate.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVALtgf/tnX8POhw6lNPBrB0KlwpZ6MA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGWlkcC5iYXJuZXRzb3V0aGdhdGUuYWMudWswHhcNMTMw
-						MTE0MTI0MzQ4WhcNMzMwMTE0MTI0MzQ4WjAkMSIwIAYDVQQDExlpZHAuYmFybmV0
-						c291dGhnYXRlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						r+e9wCL7JCdkcPekUVtvWeyGBt9ZmEbhfpqp6iGU8k4V648rLJ+WgcdmG8ySslRW
-						nwC9arYzJe0CKxr2a2Ym2/Zr+FQfC8/N4fC8gGyofCWKMraP96+DuP9s2f8cpuG9
-						xZ739oFkWYINupeHRamXQQunTXUahLpG1gho7qZwMsscPT0LKTevGOYisnyZ3U5+
-						yQNCPqftvM9LXyr+NOoPEOFm+VBHBSmoe2S8WkG9ZzchC87LXmrpibMAPk8UOsQT
-						3ccwonJznnKmwXxV8WK1BGrhXGtQzKnCsoPtz22gvA56svSIiGsrCeUp/K1cq1mu
-						xKGZWCfPV0Wd1LsCyrgAsQIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuYmFybmV0
-						c291dGhnYXRlLmFjLnVrhjBodHRwczovL2lkcC5iYXJuZXRzb3V0aGdhdGUuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFI5dJH5PCJgmNc6UAyQicW7aF6Tr
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBez0X0P76l74nbqKmG5TDpPnkC+J3T1Gagpp6X
-						gg1GC85s41bASa2ZnRnJfILR4aWxU0OsZalJUULbloG82iamTiT5ziS5a+zB7wel
-						8BXuVVvIaT2KUZqpVm/katlQwWRbrq1HwcoyxKV8i/Yph4SyK0fn/ZX/3Btvp2+j
-						45yt334InrF0dzqxTGy3dIEfig3KuEvgJYZlX5sA2v7Ru08VfjD/8ufLRxxaFwoD
-						iRZLwturU+9n8xCFM9j8todbW0nwgCvPdBLfyqIxXN/CljNpF9kZKCKIMV4HJAzi
-						Y+/goLkSyma0k8zstnZ+JNmISHaATJXpLgfl0CsNZay6C3od
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barnetsouthgate.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnetsouthgate.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.barnetsouthgate.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barnetsouthgate.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.barnetsouthgate.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barnetsouthgate.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">barnetsouthgate.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVALtgf/tnX8POhw6lNPBrB0KlwpZ6MA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGWlkcC5iYXJuZXRzb3V0aGdhdGUuYWMudWswHhcNMTMw
-						MTE0MTI0MzQ4WhcNMzMwMTE0MTI0MzQ4WjAkMSIwIAYDVQQDExlpZHAuYmFybmV0
-						c291dGhnYXRlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						r+e9wCL7JCdkcPekUVtvWeyGBt9ZmEbhfpqp6iGU8k4V648rLJ+WgcdmG8ySslRW
-						nwC9arYzJe0CKxr2a2Ym2/Zr+FQfC8/N4fC8gGyofCWKMraP96+DuP9s2f8cpuG9
-						xZ739oFkWYINupeHRamXQQunTXUahLpG1gho7qZwMsscPT0LKTevGOYisnyZ3U5+
-						yQNCPqftvM9LXyr+NOoPEOFm+VBHBSmoe2S8WkG9ZzchC87LXmrpibMAPk8UOsQT
-						3ccwonJznnKmwXxV8WK1BGrhXGtQzKnCsoPtz22gvA56svSIiGsrCeUp/K1cq1mu
-						xKGZWCfPV0Wd1LsCyrgAsQIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuYmFybmV0
-						c291dGhnYXRlLmFjLnVrhjBodHRwczovL2lkcC5iYXJuZXRzb3V0aGdhdGUuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFI5dJH5PCJgmNc6UAyQicW7aF6Tr
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBez0X0P76l74nbqKmG5TDpPnkC+J3T1Gagpp6X
-						gg1GC85s41bASa2ZnRnJfILR4aWxU0OsZalJUULbloG82iamTiT5ziS5a+zB7wel
-						8BXuVVvIaT2KUZqpVm/katlQwWRbrq1HwcoyxKV8i/Yph4SyK0fn/ZX/3Btvp2+j
-						45yt334InrF0dzqxTGy3dIEfig3KuEvgJYZlX5sA2v7Ru08VfjD/8ufLRxxaFwoD
-						iRZLwturU+9n8xCFM9j8todbW0nwgCvPdBLfyqIxXN/CljNpF9kZKCKIMV4HJAzi
-						Y+/goLkSyma0k8zstnZ+JNmISHaATJXpLgfl0CsNZay6C3od
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barnetsouthgate.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnetsouthgate.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">Barnet and Southgate College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Barnet and Southgate College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.barnetsouthgate.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Garry</GivenName>
-    <SurName>Waters</SurName>
-    <EmailAddress>mailto:garry.waters@barnetsouthgate.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>mailto:Richard.Jones@barnetsouthgate.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.barnfield.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.barnfield.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 1b4217d5..00000000
--- a/swamid-interfederations-2.0/idp.barnfield.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.barnfield.ac.uk/idp/shibboleth">
-  <!--
-		This is a 'Barnfield College' Shibboleth IdP for Barnfield Education Services Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-29T09:52:10Z">
-      <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">barnfield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAPkbgLWmrMD9YvMjkZ3ZIvYHZY8yMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE2lkcC5iYXJuZmllbGQuYWMudWswHhcNMTMwNzA4MTAx
-						NDIyWhcNMzMwNzA4MTAxNDIyWjAeMRwwGgYDVQQDExNpZHAuYmFybmZpZWxkLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn2fQZU1OD3HxwwjM
-						sMaiV9e6lHs0zhXle9vH+OTQY88KxItAnQH9vO8AlBChb8FtDIANpVYjD0zfrUNI
-						D0NUs97fPIVnt1/X+28XbgKR23jt//BQ710iHIokB/MShyYwRfM/NxERtrbS1GRf
-						06S6+D9QKEl1G/PoCaQARrW94GA4pXYNuuyxzs8WycxtMpSOnmCCA0BjvkVPvxRG
-						dpKndZW0Nb+rKhoaRr9C8zrSUMzxFusi3+bc9qBG8mGHe8EFzByweCrkGzKcrlg4
-						oVUUihKM7AE+6xORjuSkMPkutbvVZVoUbQDIobRsLoLrUe5YL5xCELdFBrShHuZJ
-						8kARewIDAQABo20wazBKBgNVHREEQzBBghNpZHAuYmFybmZpZWxkLmFjLnVrhipo
-						dHRwczovL2lkcC5iYXJuZmllbGQuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFFtBAaXbDnJ/zV4WWTnLReZzRhQ8MA0GCSqGSIb3DQEBBQUAA4IBAQAK3zaH
-						/TESVviKnN3cHyX9d4Q/iklnt2Uh8jpccpG/YmpSHxm1+9jpAHaewxARDGl5eCB5
-						Y5usjhoo8CuPnZzaWc5OE9DOdyHijJYjKAKMniUV02efAoMPR2MBZ9v1lpFkM7sH
-						xKICAwo9ItYnV8qsRBhTgcI2YdXVtFuiyOtUhATalnO2nM011izOG4weF5ppUaVt
-						k9youSyNB8DkibbpcjM+l4PlmllCq+c7yh07tdKUnGIKynR/+WsJPWCIRiV9v44l
-						i+Y3qCR43frIAR8fVowgjw4CESHWXG1Pok8zWN9WN5vLZdsQnviCmMgysWMp2bN/
-						V1gTnOpDSSuVdzxe
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barnfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnfield.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.barnfield.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnfield.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.barnfield.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.barnfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.barnfield.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">barnfield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAPkbgLWmrMD9YvMjkZ3ZIvYHZY8yMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE2lkcC5iYXJuZmllbGQuYWMudWswHhcNMTMwNzA4MTAx
-						NDIyWhcNMzMwNzA4MTAxNDIyWjAeMRwwGgYDVQQDExNpZHAuYmFybmZpZWxkLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn2fQZU1OD3HxwwjM
-						sMaiV9e6lHs0zhXle9vH+OTQY88KxItAnQH9vO8AlBChb8FtDIANpVYjD0zfrUNI
-						D0NUs97fPIVnt1/X+28XbgKR23jt//BQ710iHIokB/MShyYwRfM/NxERtrbS1GRf
-						06S6+D9QKEl1G/PoCaQARrW94GA4pXYNuuyxzs8WycxtMpSOnmCCA0BjvkVPvxRG
-						dpKndZW0Nb+rKhoaRr9C8zrSUMzxFusi3+bc9qBG8mGHe8EFzByweCrkGzKcrlg4
-						oVUUihKM7AE+6xORjuSkMPkutbvVZVoUbQDIobRsLoLrUe5YL5xCELdFBrShHuZJ
-						8kARewIDAQABo20wazBKBgNVHREEQzBBghNpZHAuYmFybmZpZWxkLmFjLnVrhipo
-						dHRwczovL2lkcC5iYXJuZmllbGQuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFFtBAaXbDnJ/zV4WWTnLReZzRhQ8MA0GCSqGSIb3DQEBBQUAA4IBAQAK3zaH
-						/TESVviKnN3cHyX9d4Q/iklnt2Uh8jpccpG/YmpSHxm1+9jpAHaewxARDGl5eCB5
-						Y5usjhoo8CuPnZzaWc5OE9DOdyHijJYjKAKMniUV02efAoMPR2MBZ9v1lpFkM7sH
-						xKICAwo9ItYnV8qsRBhTgcI2YdXVtFuiyOtUhATalnO2nM011izOG4weF5ppUaVt
-						k9youSyNB8DkibbpcjM+l4PlmllCq+c7yh07tdKUnGIKynR/+WsJPWCIRiV9v44l
-						i+Y3qCR43frIAR8fVowgjw4CESHWXG1Pok8zWN9WN5vLZdsQnviCmMgysWMp2bN/
-						V1gTnOpDSSuVdzxe
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.barnfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.barnfield.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">Barnfield Education Services Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Barnfield College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.barnfield.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adam</GivenName>
-    <SurName>Norman</SurName>
-    <EmailAddress>mailto:adam.norman@barnfield.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Norman</SurName>
-    <EmailAddress>mailto:adam.norman@barnfield.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.barnsley.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.barnsley.ac.uk-openathens.xml
deleted file mode 100644
index 655aec55..00000000
--- a/swamid-interfederations-2.0/idp.barnsley.ac.uk-openathens.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.barnsley.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Barnsley College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">barnsley.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/barnsley.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/barnsley.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Barnsley College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.barnsley.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.barton.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.barton.ac.uk-openathens.xml
deleted file mode 100644
index 5995f3e5..00000000
--- a/swamid-interfederations-2.0/idp.barton.ac.uk-openathens.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.barton.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Barton Peveril College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">barton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/barton.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/barton.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Barton Peveril College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.barton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bath.ac.uk-shibboleth.xml
deleted file mode 100644
index aef757f7..00000000
--- a/swamid-interfederations-2.0/idp.bath.ac.uk-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.bath.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Bath.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-09-21T13:17: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">bath.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Bath</mdui:DisplayName>
-        <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIVAOqBrGCnJlQiSzyI6NPPnvws1tCfMA0GCSqGSIb3DQEB
-						BQUAMBoxGDAWBgNVBAMTD2F1dGguYmF0aC5hYy51azAeFw0xMTA4MTYwNjM1MjVa
-						Fw0zMTA4MTYwNjM1MjVaMBoxGDAWBgNVBAMTD2F1dGguYmF0aC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL95cyOywpJXBzn8efSdlNIJQiZi
-						dNagu7t8YjInzqARwzB/7Ii2QHNkYVbOHeYuRdlQGeSS350NdHV7Cyn4IhurrEUW
-						NG9JFQ1knyw2O6A8ZkoT6QE5XBt1j/aQi9emY8id3vcIdZCWFVRBVjEZ6BR58ne9
-						5FGMVVusGfHgtayt3MoJvQUcl7m7bP+mvNwPL/wXBWmvg83g3Ngi6B4R3uHY0kkL
-						hSsYJEkoX91cv7RAspKYDjtuhdrvoywcwltwD7GDs+e6wXAdMyVgMRNq2ACK+age
-						IQCWZ3o/1cd0RFAVCwmUOzGd4jFmqaWneQFK+DqFyOxTW3LO3zLZ3xq22RsCAwEA
-						AaNlMGMwQgYDVR0RBDswOYIPYXV0aC5iYXRoLmFjLnVrhiZodHRwczovL2F1dGgu
-						YmF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUMBAXgoXqNZufAstd
-						XJjQBDQka9wwDQYJKoZIhvcNAQEFBQADggEBAJlY93MwsogYvqEA32y+uhe516tb
-						VpnagIQ6EdPfZlibvHM5RQy1sYdSXkg5aab1aBP05yaA/S23DARAQocbBUGvmM3q
-						2Kv/r6XoGZxWZp1d0iIRnDnRBcY/KlGqzoHGOpEp06wgbUSSrYQAgLMcZat7lER7
-						TRrqZ6mwhHVpiJkRsZWTshVZEw0Mz44NoeADcM2Ao6U+h6oc9CCJmBguXdPFH+ti
-						gc9lPrivWMfMU64EedcDvakTkW8wPne4BklOmYPecOG6k/CW8F27k0T7nuJKKa41
-						wVJCyjIVKbGuDsEITTV/TE4sTDQCvRXjKF3enji4c0Ap3MBGaCBo/FDYXAI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.bath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.bath.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://auth.bath.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.bath.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.bath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.bath.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">bath.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIVAOqBrGCnJlQiSzyI6NPPnvws1tCfMA0GCSqGSIb3DQEB
-						BQUAMBoxGDAWBgNVBAMTD2F1dGguYmF0aC5hYy51azAeFw0xMTA4MTYwNjM1MjVa
-						Fw0zMTA4MTYwNjM1MjVaMBoxGDAWBgNVBAMTD2F1dGguYmF0aC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL95cyOywpJXBzn8efSdlNIJQiZi
-						dNagu7t8YjInzqARwzB/7Ii2QHNkYVbOHeYuRdlQGeSS350NdHV7Cyn4IhurrEUW
-						NG9JFQ1knyw2O6A8ZkoT6QE5XBt1j/aQi9emY8id3vcIdZCWFVRBVjEZ6BR58ne9
-						5FGMVVusGfHgtayt3MoJvQUcl7m7bP+mvNwPL/wXBWmvg83g3Ngi6B4R3uHY0kkL
-						hSsYJEkoX91cv7RAspKYDjtuhdrvoywcwltwD7GDs+e6wXAdMyVgMRNq2ACK+age
-						IQCWZ3o/1cd0RFAVCwmUOzGd4jFmqaWneQFK+DqFyOxTW3LO3zLZ3xq22RsCAwEA
-						AaNlMGMwQgYDVR0RBDswOYIPYXV0aC5iYXRoLmFjLnVrhiZodHRwczovL2F1dGgu
-						YmF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUMBAXgoXqNZufAstd
-						XJjQBDQka9wwDQYJKoZIhvcNAQEFBQADggEBAJlY93MwsogYvqEA32y+uhe516tb
-						VpnagIQ6EdPfZlibvHM5RQy1sYdSXkg5aab1aBP05yaA/S23DARAQocbBUGvmM3q
-						2Kv/r6XoGZxWZp1d0iIRnDnRBcY/KlGqzoHGOpEp06wgbUSSrYQAgLMcZat7lER7
-						TRrqZ6mwhHVpiJkRsZWTshVZEw0Mz44NoeADcM2Ao6U+h6oc9CCJmBguXdPFH+ti
-						gc9lPrivWMfMU64EedcDvakTkW8wPne4BklOmYPecOG6k/CW8F27k0T7nuJKKa41
-						wVJCyjIVKbGuDsEITTV/TE4sTDQCvRXjKF3enji4c0Ap3MBGaCBo/FDYXAI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://auth.bath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.bath.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 Bath</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bath</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bath.ac.uk/bucs/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Webmaster</GivenName>
-    <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Phillips</SurName>
-    <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml
deleted file mode 100644
index 5dca3bcd..00000000
--- a/swamid-interfederations-2.0/idp.bbmri-eric.eu-idp-shibboleth.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bbmri-eric.eu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-10-15T10:10: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>
-    <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/other</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bbmri-eric.eu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">BBMRI-ERIC</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">BBMRI-ERIC</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for BBMRI-ERIC</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider BBMRI-ERIC</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.bbmri-eric.eu/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.bbmri-eric.eu/</mdui:InformationURL>
-        <mdui:Logo height="176" width="531">https://idp.bbmri-eric.eu/idp/images/BBMRI-ERIC_3lines.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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAItr4H0b26J+BZNSg6o1nw3b7SBZMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWlkcC5iYm1yaS1lcmljLmV1MB4XDTE1MDkxNzEzNDc0
-M1oXDTM1MDkxNzEzNDc0M1owHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiUBpLbWqjyjRh/ga8bSYo
-6kV+GZm3QieBLmWY7eB2S4yNzAp2oA7bAq/3Gpqs7/+T2rRtDXbwQrOnCfVobevh
-ALWLZ3ZpY0WmGDJIQizXHFe4pv05BKVxXg1loBJxHyYC87YmZdKtar7gXcOGOG66
-+fEWuUz0VRZc+hnamkguKYFg/45ZMs6neblBdeYc01qj18LdkGS/VRWoK2zCvqPI
-WW72/VJt2+SvnIMX0JIeeIJUz/zk3Ay1p/LP53IlhLaGY5k0vbN3G1K8vCbaV3Uv
-CfyEXRUfG4FxULQk48Iy30dJMdoV44BJqQnQvJErXko0523c9BQAe7VEnFX7ZF6p
-AgMBAAGjaTBnMB0GA1UdDgQWBBQr1SV/uokWTbctT6SrOjrSqBDaizBGBgNVHREE
-PzA9ghFpZHAuYmJtcmktZXJpYy5ldYYoaHR0cHM6Ly9pZHAuYmJtcmktZXJpYy5l
-dS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAQetx10CWgE5kitDC
-wVpIzugr7OUcyweNhXj42doeC7rFcoqc4ejUvJmq9sVxHLNTAktJ8+r/gr03MLEP
-ToLY1llky7TfJhKcZ/p8mfIurVXxQKlGlXbsiYWm4APDntUWi6OzRI9yslTBTI6d
-ZN5qf7OxYnXaRAhfxQT51DfpBdjUhxDGC2Z+VnTVYSmNItRxX24mW5LN6ik0ZEis
-Ls/XqOydBMvp9i4A5kYYXXCT/TMVoaTbPFOqq2F6yFVzuUeTtToB4aCBEnNqL+ps
-xovLThSc13PPlfcRv72JKYFcO6pabOeMJwwhQ/p5WMILbSl+sPlscEW0c+7oJXvz
-cnEwlw==
-                        </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>
-MIIDMDCCAhigAwIBAgIVANM3aONpPS/BDOU54pnvNyySwvuOMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWlkcC5iYm1yaS1lcmljLmV1MB4XDTE1MDkxNzEzNDcz
-N1oXDTM1MDkxNzEzNDczN1owHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHm/dRHIesayMcqVEcNvZZ
-KRaJH4ZbOwp9j+d9hqQcagnS9XV11UmqVxsES12M++h9NzfRZhWdU54TYVL+FqR8
-MU74L0q4IFKrXMwsGzXHbvFCdMBKYM0P04PkbH9E6b/yG/kpeSpFZoLPXCaB1omB
-qFLW/gCEhGUTt2XgsMLmtArI9aF05M45k99bMHJaDC3xGKztU7J8OmjfGT/nIEfz
-pfgI2kAlmZlXjSuWRdLlJjE5K1asTUK8SfqEAs3XiiXoBwa2ZDyWf78tq3Eop2Rv
-auYJV+rG07whtPNrU1KSJdfjq6eRfR6eGfY5i8nOGIJhYZyYzOeXboX+FAdqx2r1
-AgMBAAGjaTBnMB0GA1UdDgQWBBQZqO66zPnH8lTjRTAYWlXRK0djLzBGBgNVHREE
-PzA9ghFpZHAuYmJtcmktZXJpYy5ldYYoaHR0cHM6Ly9pZHAuYmJtcmktZXJpYy5l
-dS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAUY3QXtVsLwRMkm7m
-etZ6o8imeKTvMKs2u41mvrLl6YscRZf2CqRYTLdrd1i5SKpCaIynSBqXIED7QtlW
-ubcp85iTjgRMBR/KvzS3augBlGiPiNvsGBHUoMMixeDIRsArtHgM7s3STtor6suU
-SjaGOGvYOQg4olR947pzjB7E0eAGAzdfT8xHQkjysyeADPx/G/lUux1WfIcbA4BC
-NyXyU13Jj+eQlD4g/kNDlLG4cG0wg1RN9czgI6kKsI4Pn2qspOjzSwDHQ7bdcMRV
-0QbS/x2x/DAgBV0b1RKGTWHh+bokeB5IG3Il4pUs+4yVEihFgnzaQo96Pd5nOv+S
-p6gqsg==
-                        </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>
-MIIDLzCCAhegAwIBAgIUdIWoF+CL+1dNJmpv1Np09b5b45kwDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUwHhcNMTUwOTE3MTM0NzQx
-WhcNMzUwOTE3MTM0NzQxWjAcMRowGAYDVQQDDBFpZHAuYmJtcmktZXJpYy5ldTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnqshgMN56eFz2oUNtPd/hq
-+BisHeX3mW1g8kLVgS6p5wNORZZ/7sHzKb6Yy3F3krUgNOwhcBO0uF9VBwVS06Fi
-Le1gh44CKnf4CJQdKaQEb848aDEbp9LKVnjyXGBXOQxQ9HfxedurXf70SYnzsGg3
-c8JURgJIisXU4bFUqyPCW+DnbCHzSjByyuOSHnM//aLIbDRYZfT1hVjg0MebYjmn
-oHu9rpe0KJ7abO2HTrfhjZpTQkRiAG+3Otv3Xp9E1OZ8LphtNs6786yH3ZLiEuKW
-y4NOa/a7+jR4ts3aNO73rNVH/36YTt41YPKahOg36b8HaJkTjCrxcC+gMGb2dCsC
-AwEAAaNpMGcwHQYDVR0OBBYEFOjpMeOkSkFRhwT3EHx7YEH3aCZ5MEYGA1UdEQQ/
-MD2CEWlkcC5iYm1yaS1lcmljLmV1hihodHRwczovL2lkcC5iYm1yaS1lcmljLmV1
-L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCOs7h7cyiemGVKdGYh
-4L1IYTQi3gDpC+5ajerQi3bPQrTrMvBK5b0XR5rvTFgkc2hfQOculd+yXcPCkBMP
-H39lVHIlekAV02m+RE9Lbh2mZTTD+q+ZW6kbMh6Wst0eQdiGMIomtvplTUScsh5j
-rjYOIEBK0y8pEICMChL1F05NX2cVxE1wkiwRbsanNm2kedRIYHHpODXLBk81oeKe
-BFQ09uQ7MqzlPcyRnkgJ4fjNqf8dnl6IACD1E7Qq3xbVfDD9UshJRIqiNe5O80jQ
-4EtMufd1/de2bNG37ttdxCSKrMevZJEh8lX+TmGZAUcYEZdhwfsOmC8njY5Qh+Xx
-Urzk
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bbmri-eric.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bbmri-eric.eu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bbmri-eric.eu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bbmri-eric.eu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bbmri-eric.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bbmri-eric.eu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bbmri-eric.eu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAItr4H0b26J+BZNSg6o1nw3b7SBZMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWlkcC5iYm1yaS1lcmljLmV1MB4XDTE1MDkxNzEzNDc0
-M1oXDTM1MDkxNzEzNDc0M1owHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiUBpLbWqjyjRh/ga8bSYo
-6kV+GZm3QieBLmWY7eB2S4yNzAp2oA7bAq/3Gpqs7/+T2rRtDXbwQrOnCfVobevh
-ALWLZ3ZpY0WmGDJIQizXHFe4pv05BKVxXg1loBJxHyYC87YmZdKtar7gXcOGOG66
-+fEWuUz0VRZc+hnamkguKYFg/45ZMs6neblBdeYc01qj18LdkGS/VRWoK2zCvqPI
-WW72/VJt2+SvnIMX0JIeeIJUz/zk3Ay1p/LP53IlhLaGY5k0vbN3G1K8vCbaV3Uv
-CfyEXRUfG4FxULQk48Iy30dJMdoV44BJqQnQvJErXko0523c9BQAe7VEnFX7ZF6p
-AgMBAAGjaTBnMB0GA1UdDgQWBBQr1SV/uokWTbctT6SrOjrSqBDaizBGBgNVHREE
-PzA9ghFpZHAuYmJtcmktZXJpYy5ldYYoaHR0cHM6Ly9pZHAuYmJtcmktZXJpYy5l
-dS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAQetx10CWgE5kitDC
-wVpIzugr7OUcyweNhXj42doeC7rFcoqc4ejUvJmq9sVxHLNTAktJ8+r/gr03MLEP
-ToLY1llky7TfJhKcZ/p8mfIurVXxQKlGlXbsiYWm4APDntUWi6OzRI9yslTBTI6d
-ZN5qf7OxYnXaRAhfxQT51DfpBdjUhxDGC2Z+VnTVYSmNItRxX24mW5LN6ik0ZEis
-Ls/XqOydBMvp9i4A5kYYXXCT/TMVoaTbPFOqq2F6yFVzuUeTtToB4aCBEnNqL+ps
-xovLThSc13PPlfcRv72JKYFcO6pabOeMJwwhQ/p5WMILbSl+sPlscEW0c+7oJXvz
-cnEwlw==
-                        </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>
-MIIDMDCCAhigAwIBAgIVANM3aONpPS/BDOU54pnvNyySwvuOMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWlkcC5iYm1yaS1lcmljLmV1MB4XDTE1MDkxNzEzNDcz
-N1oXDTM1MDkxNzEzNDczN1owHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHm/dRHIesayMcqVEcNvZZ
-KRaJH4ZbOwp9j+d9hqQcagnS9XV11UmqVxsES12M++h9NzfRZhWdU54TYVL+FqR8
-MU74L0q4IFKrXMwsGzXHbvFCdMBKYM0P04PkbH9E6b/yG/kpeSpFZoLPXCaB1omB
-qFLW/gCEhGUTt2XgsMLmtArI9aF05M45k99bMHJaDC3xGKztU7J8OmjfGT/nIEfz
-pfgI2kAlmZlXjSuWRdLlJjE5K1asTUK8SfqEAs3XiiXoBwa2ZDyWf78tq3Eop2Rv
-auYJV+rG07whtPNrU1KSJdfjq6eRfR6eGfY5i8nOGIJhYZyYzOeXboX+FAdqx2r1
-AgMBAAGjaTBnMB0GA1UdDgQWBBQZqO66zPnH8lTjRTAYWlXRK0djLzBGBgNVHREE
-PzA9ghFpZHAuYmJtcmktZXJpYy5ldYYoaHR0cHM6Ly9pZHAuYmJtcmktZXJpYy5l
-dS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAUY3QXtVsLwRMkm7m
-etZ6o8imeKTvMKs2u41mvrLl6YscRZf2CqRYTLdrd1i5SKpCaIynSBqXIED7QtlW
-ubcp85iTjgRMBR/KvzS3augBlGiPiNvsGBHUoMMixeDIRsArtHgM7s3STtor6suU
-SjaGOGvYOQg4olR947pzjB7E0eAGAzdfT8xHQkjysyeADPx/G/lUux1WfIcbA4BC
-NyXyU13Jj+eQlD4g/kNDlLG4cG0wg1RN9czgI6kKsI4Pn2qspOjzSwDHQ7bdcMRV
-0QbS/x2x/DAgBV0b1RKGTWHh+bokeB5IG3Il4pUs+4yVEihFgnzaQo96Pd5nOv+S
-p6gqsg==
-                        </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>
-MIIDLzCCAhegAwIBAgIUdIWoF+CL+1dNJmpv1Np09b5b45kwDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRaWRwLmJibXJpLWVyaWMuZXUwHhcNMTUwOTE3MTM0NzQx
-WhcNMzUwOTE3MTM0NzQxWjAcMRowGAYDVQQDDBFpZHAuYmJtcmktZXJpYy5ldTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnqshgMN56eFz2oUNtPd/hq
-+BisHeX3mW1g8kLVgS6p5wNORZZ/7sHzKb6Yy3F3krUgNOwhcBO0uF9VBwVS06Fi
-Le1gh44CKnf4CJQdKaQEb848aDEbp9LKVnjyXGBXOQxQ9HfxedurXf70SYnzsGg3
-c8JURgJIisXU4bFUqyPCW+DnbCHzSjByyuOSHnM//aLIbDRYZfT1hVjg0MebYjmn
-oHu9rpe0KJ7abO2HTrfhjZpTQkRiAG+3Otv3Xp9E1OZ8LphtNs6786yH3ZLiEuKW
-y4NOa/a7+jR4ts3aNO73rNVH/36YTt41YPKahOg36b8HaJkTjCrxcC+gMGb2dCsC
-AwEAAaNpMGcwHQYDVR0OBBYEFOjpMeOkSkFRhwT3EHx7YEH3aCZ5MEYGA1UdEQQ/
-MD2CEWlkcC5iYm1yaS1lcmljLmV1hihodHRwczovL2lkcC5iYm1yaS1lcmljLmV1
-L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCOs7h7cyiemGVKdGYh
-4L1IYTQi3gDpC+5ajerQi3bPQrTrMvBK5b0XR5rvTFgkc2hfQOculd+yXcPCkBMP
-H39lVHIlekAV02m+RE9Lbh2mZTTD+q+ZW6kbMh6Wst0eQdiGMIomtvplTUScsh5j
-rjYOIEBK0y8pEICMChL1F05NX2cVxE1wkiwRbsanNm2kedRIYHHpODXLBk81oeKe
-BFQ09uQ7MqzlPcyRnkgJ4fjNqf8dnl6IACD1E7Qq3xbVfDD9UshJRIqiNe5O80jQ
-4EtMufd1/de2bNG37ttdxCSKrMevZJEh8lX+TmGZAUcYEZdhwfsOmC8njY5Qh+Xx
-Urzk
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bbmri-eric.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">BBMRI-ERIC</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">BBMRI-ERIC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">BBMRI-ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">BBMRI-ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bbmri-eric.eu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Holub</md:SurName>
-    <md:EmailAddress>petr.holub@bbmri-eric.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 1e533415..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bc.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.cas.cz: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.bc.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bc.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bc.cas.cz/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">bc.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bc.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Biology Centre AS CR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Biologické centrum AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Biology Centre AS CR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Biologické centrum AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bc.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.bc.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bcot.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.bcot.ac.uk-entity.xml
deleted file mode 100644
index 7a8c47e1..00000000
--- a/swamid-interfederations-2.0/idp.bcot.ac.uk-entity.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.bcot.ac.uk/entity">
-  <!--
-		This is an IdP (owned by Eduserv) for Basingstoke College of Technology.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">bcot.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bcot.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bcot.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Basingstoke College of Technology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bcot.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bedford.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bedford.ac.uk-shibboleth.xml
deleted file mode 100644
index 0b90ffb0..00000000
--- a/swamid-interfederations-2.0/idp.bedford.ac.uk-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.bedford.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Bedford College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">bedford.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bedford.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bedford.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bedford College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bedford.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml
deleted file mode 100644
index a5912fb2..00000000
--- a/swamid-interfederations-2.0/idp.beds.ac.uk-entity.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.beds.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for the University of Bedfordshire.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-08T18:08: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">beds.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEaTCCA1GgAwIBAgIQSzfaeKahBOK3I4on09FG0DANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowPDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5pZHAuYmVkcy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKetA8/6veT4+GRV
-						uOGRULFxQkPXGXQ1V04ax3w9/xwgh60cCo/YnuVlcEjDkcSeXamwUp1lduMi8dRg
-						CHH0wfD4vni2iacjSnnfO9rSsLchaGJgvUpW+NO/Byh77rFVE4iWz7j/P2oMaxWJ
-						/mAxGcF/4SvrzSJpQ4Bvb3ERkT2IlOvS0RDJ2hpaFCH3QPSLbItg4zmg3gNigO/c
-						fJFiM0l5ej3j8A9TM7rnsQkqCRYvVQ4Hx0cCo0T0NfNIqpd4qe02itjS8KisLM5K
-						xWAAsKxu7vm8MNDBwbz1fdrtU2y95rvba27iU0wsGvXMOW7AuAKcVghw8Kj3RSRN
-						WjHQtzcCAwEAAaOCAWswggFnMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-						47ntMB0GA1UdDgQWBBT8n949CVd+XA8RY2eIr6uEvqJKTzAOBgNVHQ8BAf8EBAMC
-						BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-						IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
-						oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-						bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-						bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-						dGNzLnRlcmVuYS5vcmcwGQYDVR0RBBIwEIIOaWRwLmJlZHMuYWMudWswDQYJKoZI
-						hvcNAQEFBQADggEBAKV1I2UeqFfZJD9iJqVigp+RHtC4czWu83SSV9b/sNFlUp8U
-						MPrEiFQyrKePjkpXOV0nampl2sfH+tlleaPJE6HQkU0fYXlPakWFn6V/4E9zoTuH
-						ezaXF+x9paTlrcjj46VCA/Ioo/DG7O1fg+Al7/NAofrMcDwEtuEbFoXesj1cAbxL
-						AfI9EdCkiY/95rhoDk3F3B/NrdNPLsJwLw5R5kQpaVhSIEdiUaYZ50yLQzLtHLRF
-						8EYzIAss513al942nZiH4RfHtOKUs5waxCaLb7QPH4mKUe9IK/Pg444YJsrEgaAO
-						9QLVsNMkaE7Rl0xZfbp08NbjxGvR3pziJ0AFcS4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.beds.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.beds.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://shib1.beds.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.beds.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib1.beds.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.beds.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">beds.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEaTCCA1GgAwIBAgIQSzfaeKahBOK3I4on09FG0DANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowPDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRcwFQYDVQQDEw5pZHAuYmVkcy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKetA8/6veT4+GRV
-						uOGRULFxQkPXGXQ1V04ax3w9/xwgh60cCo/YnuVlcEjDkcSeXamwUp1lduMi8dRg
-						CHH0wfD4vni2iacjSnnfO9rSsLchaGJgvUpW+NO/Byh77rFVE4iWz7j/P2oMaxWJ
-						/mAxGcF/4SvrzSJpQ4Bvb3ERkT2IlOvS0RDJ2hpaFCH3QPSLbItg4zmg3gNigO/c
-						fJFiM0l5ej3j8A9TM7rnsQkqCRYvVQ4Hx0cCo0T0NfNIqpd4qe02itjS8KisLM5K
-						xWAAsKxu7vm8MNDBwbz1fdrtU2y95rvba27iU0wsGvXMOW7AuAKcVghw8Kj3RSRN
-						WjHQtzcCAwEAAaOCAWswggFnMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-						47ntMB0GA1UdDgQWBBT8n949CVd+XA8RY2eIr6uEvqJKTzAOBgNVHQ8BAf8EBAMC
-						BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-						IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
-						oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-						bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-						bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-						dGNzLnRlcmVuYS5vcmcwGQYDVR0RBBIwEIIOaWRwLmJlZHMuYWMudWswDQYJKoZI
-						hvcNAQEFBQADggEBAKV1I2UeqFfZJD9iJqVigp+RHtC4czWu83SSV9b/sNFlUp8U
-						MPrEiFQyrKePjkpXOV0nampl2sfH+tlleaPJE6HQkU0fYXlPakWFn6V/4E9zoTuH
-						ezaXF+x9paTlrcjj46VCA/Ioo/DG7O1fg+Al7/NAofrMcDwEtuEbFoXesj1cAbxL
-						AfI9EdCkiY/95rhoDk3F3B/NrdNPLsJwLw5R5kQpaVhSIEdiUaYZ50yLQzLtHLRF
-						8EYzIAss513al942nZiH4RfHtOKUs5waxCaLb7QPH4mKUe9IK/Pg444YJsrEgaAO
-						9QLVsNMkaE7Rl0xZfbp08NbjxGvR3pziJ0AFcS4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.beds.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.beds.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 Bedfordshire</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bedfordshire</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.beds.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Haysom</SurName>
-    <EmailAddress>mailto:paul.haysom@beds.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Haysom</SurName>
-    <EmailAddress>mailto:paul.haysom@beds.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bham.ac.uk-shibboleth.xml
deleted file mode 100644
index e78d5bd0..00000000
--- a/swamid-interfederations-2.0/idp.bham.ac.uk-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.bham.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Birmingham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">bham.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Birmingham</mdui:DisplayName>
-        <mdui:Logo height="34" width="141">https://shibbolethidp2.bham.ac.uk/idp/images/University-of-Birmingham-logo.gif</mdui:Logo>
-        <mdui:Logo height="48" width="39">https://shibbolethidp2.bham.ac.uk/idp/images/University-of-Birmingham-crest.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVANTuNiziz4l2CViQyzhD3hfr5trpMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGhpZHAyLmJoYW0uYWMudWswHhcNMTIw
-						NjE5MDgyMzM2WhcNMzIwNjE5MDgyMzM2WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-						aWRwMi5iaGFtLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						oRlhyEKWt6PWevWIRBbE7g8uCdCUmFsjY+hGWYAOrYKworqlT0zuDIHU1AtFpcNo
-						CrjfCaRTAzi6llolA3R5oe+Yj/9tT9Ft/dHGPejxto/Dmr3ujIvNhNRRl0I0K2/X
-						AYipqla6kgQ9dz23JDLjDewVolNrSULW2/Az42z6BMeIpGd/S796U+5Zy4D0CSK9
-						H79IbfRH6/gf2rUWq9x44yVEZHDFtT9yc0Ve1xL73ztznhTTh4WaM4JV5DDnAQs7
-						glE6OILv+6ELDlv44jaCn0Q0CC+s++4WPXo46b6jYFfSWUdDd++Kujmg9TfAnOX5
-						MzK3WMSnR7ersXEl1K1bcQIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-						aWRwMi5iaGFtLmFjLnVrhjBodHRwczovL3NoaWJib2xldGhpZHAyLmJoYW0uYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLeRPHREWj++JVtbqdmpnHmmDGCy
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBb/EvK4M26WIFe28cgRYlQZjUv90JzxWtvnQRk
-						jdBW18+PWJ+mFdZ4B0p+iNO5/hw/mZs7ueHjQlaofEs1NZvGbbusKgGn4Nn4hO77
-						reVGThMKjpxkQR2NXq6nPKSnJBOGTdbjJ2woNReNakMIDs5JQAXpl1qmtwOQNKnG
-						E6ayBTQAANKDAY5rVawdHIBqUO4GPD1waxXh/1zKAcVktHtamRinthZXRh0WHdHO
-						QWiiYxZz8CM72DGVGuJ2OxH2NboDiQeEyZYsbM/HYOlIyAMc237cHWz5dz38fZdF
-						ddkS4AwsjYMI7dZhdZmcD+lNoak8kCkaypOHKqjRV/UKJBrD
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbolethidp2.bham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbolethidp2.bham.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://shibbolethidp2.bham.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbolethidp2.bham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbolethidp2.bham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbolethidp2.bham.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">bham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVANTuNiziz4l2CViQyzhD3hfr5trpMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGhpZHAyLmJoYW0uYWMudWswHhcNMTIw
-						NjE5MDgyMzM2WhcNMzIwNjE5MDgyMzM2WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-						aWRwMi5iaGFtLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						oRlhyEKWt6PWevWIRBbE7g8uCdCUmFsjY+hGWYAOrYKworqlT0zuDIHU1AtFpcNo
-						CrjfCaRTAzi6llolA3R5oe+Yj/9tT9Ft/dHGPejxto/Dmr3ujIvNhNRRl0I0K2/X
-						AYipqla6kgQ9dz23JDLjDewVolNrSULW2/Az42z6BMeIpGd/S796U+5Zy4D0CSK9
-						H79IbfRH6/gf2rUWq9x44yVEZHDFtT9yc0Ve1xL73ztznhTTh4WaM4JV5DDnAQs7
-						glE6OILv+6ELDlv44jaCn0Q0CC+s++4WPXo46b6jYFfSWUdDd++Kujmg9TfAnOX5
-						MzK3WMSnR7ersXEl1K1bcQIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-						aWRwMi5iaGFtLmFjLnVrhjBodHRwczovL3NoaWJib2xldGhpZHAyLmJoYW0uYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLeRPHREWj++JVtbqdmpnHmmDGCy
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBb/EvK4M26WIFe28cgRYlQZjUv90JzxWtvnQRk
-						jdBW18+PWJ+mFdZ4B0p+iNO5/hw/mZs7ueHjQlaofEs1NZvGbbusKgGn4Nn4hO77
-						reVGThMKjpxkQR2NXq6nPKSnJBOGTdbjJ2woNReNakMIDs5JQAXpl1qmtwOQNKnG
-						E6ayBTQAANKDAY5rVawdHIBqUO4GPD1waxXh/1zKAcVktHtamRinthZXRh0WHdHO
-						QWiiYxZz8CM72DGVGuJ2OxH2NboDiQeEyZYsbM/HYOlIyAMc237cHWz5dz38fZdF
-						ddkS4AwsjYMI7dZhdZmcD+lNoak8kCkaypOHKqjRV/UKJBrD
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbolethidp2.bham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbolethidp2.bham.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 Birmingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Birmingham</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Graham</GivenName>
-    <SurName>Bryan</SurName>
-    <EmailAddress>mailto:J.G.Bryan@bham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Graham</GivenName>
-    <SurName>Bryan</SurName>
-    <EmailAddress>mailto:J.G.Bryan@bham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bhasvic.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.bhasvic.ac.uk-entity.xml
deleted file mode 100644
index c1446f8e..00000000
--- a/swamid-interfederations-2.0/idp.bhasvic.ac.uk-entity.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.bhasvic.ac.uk/entity">
-  <!--
-		This is an IdP (owned by Eduserv) for Brighton, Hove and Sussex Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">bhasvic.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bhasvic.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bhasvic.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brighton Hove &amp; Sussex 6th Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bhasvic.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bilborough.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.bilborough.ac.uk-openathens.xml
deleted file mode 100644
index 7ff769c2..00000000
--- a/swamid-interfederations-2.0/idp.bilborough.ac.uk-openathens.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.bilborough.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Bilborough Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">bilborough.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bilborough.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bilborough.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bilborough College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bilborough.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bishopb-college.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bishopb-college.ac.uk-shibboleth.xml
deleted file mode 100644
index f4a712e0..00000000
--- a/swamid-interfederations-2.0/idp.bishopb-college.ac.uk-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.bishopb-college.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Bishop Burton College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">bishopb-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bishopb-college.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bishopb-college.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bishop Burton College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bishopb-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bishopg.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bishopg.ac.uk-shibboleth.xml
deleted file mode 100644
index f6498b9b..00000000
--- a/swamid-interfederations-2.0/idp.bishopg.ac.uk-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.bishopg.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Bishop Grosseteste University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">bishopg.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bishopg.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bishopg.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bishop Grosseteste University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bishopg.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.blackburn.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.blackburn.ac.uk-entity.xml
deleted file mode 100644
index cc501a96..00000000
--- a/swamid-interfederations-2.0/idp.blackburn.ac.uk-entity.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://idp.blackburn.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for Blackburn College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-03T16:57: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">blackburn.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXDCCAkQCCQCDh5l0tXKOTzANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
-						QjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2tidXJuMRowGAYD
-						VQQKExFCbGFja2J1cm4gQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmJsYWNrYnVybi5h
-						Yy51azAeFw0xNDA0MDkwNzU2MzNaFw0zNDA0MDQwNzU2MzNaMHAxCzAJBgNVBAYT
-						AkdCMRMwEQYDVQQIEwpMYW5jYXNoaXJlMRIwEAYDVQQHEwlCbGFja2J1cm4xGjAY
-						BgNVBAoTEUJsYWNrYnVybiBDb2xsZWdlMRwwGgYDVQQDExNpZHAuYmxhY2tidXJu
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwBW5mNKzK19M
-						0cPz3xt5l5rckUonhNxfbzrEYqrRomyBRMPwv9rDcepIvl/ATrRqkhqppibRnAk9
-						s7RsDCoLboLTHLi/1bb3I8+Pm1Hy+ay0+BgSvMnBHeLqCAwLiE5V+oexN4ha3JJH
-						PVpwN7+HFdGtHO2ZO9K2VrpvwuaUZfhOEAnfuNFnTHA7doKwQWWyvlTfqrY2XNuE
-						ZkUD6RdvxeDB555Nzl7BvMWL+nr41WuWW5r7jZyl5EEOgr7AiwbyRrpaKdZ4ditW
-						ozyRSSo/gQDbXF0fhlomrPQzegnOwRmmD96lKAcd1xk61PE3AkrC8oA0pj+PWe90
-						vUxeeftg2QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBjnFevePhXMt3YQOIs3l2p
-						35bLcLUc1yLy+2+7ynCH2Vsy8UpB1puQQE3wug7/zYhxp6RV2OKpTXPugW9Mx8TB
-						8eM/ZCoqVbc4H6VH29G8XhwI+XYBnsnT6wS9KU3v5fEUIErP2dLnSBDpqBKyuAwP
-						yzpDwmqPTzifuv5QB2MaFMM5t/qBUFAXbSuueRgA1gICtdb7kVUv0n/7BE6IsncC
-						oaR0/Gdlwm+88m394nirzjEkGX3YHIPMh5Sd6DOyiyG+apm59uv5lzl4WNZbCBhl
-						iJ5xfqTVtk2Ic+IW+u3PQ8sqH9v+UnIxr1o51pAQL4ambSFHaE7mr4tMUHv5mlFC
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.blackburn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.blackburn.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.blackburn.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.blackburn.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.blackburn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.blackburn.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">blackburn.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXDCCAkQCCQCDh5l0tXKOTzANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
-						QjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2tidXJuMRowGAYD
-						VQQKExFCbGFja2J1cm4gQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmJsYWNrYnVybi5h
-						Yy51azAeFw0xNDA0MDkwNzU2MzNaFw0zNDA0MDQwNzU2MzNaMHAxCzAJBgNVBAYT
-						AkdCMRMwEQYDVQQIEwpMYW5jYXNoaXJlMRIwEAYDVQQHEwlCbGFja2J1cm4xGjAY
-						BgNVBAoTEUJsYWNrYnVybiBDb2xsZWdlMRwwGgYDVQQDExNpZHAuYmxhY2tidXJu
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwBW5mNKzK19M
-						0cPz3xt5l5rckUonhNxfbzrEYqrRomyBRMPwv9rDcepIvl/ATrRqkhqppibRnAk9
-						s7RsDCoLboLTHLi/1bb3I8+Pm1Hy+ay0+BgSvMnBHeLqCAwLiE5V+oexN4ha3JJH
-						PVpwN7+HFdGtHO2ZO9K2VrpvwuaUZfhOEAnfuNFnTHA7doKwQWWyvlTfqrY2XNuE
-						ZkUD6RdvxeDB555Nzl7BvMWL+nr41WuWW5r7jZyl5EEOgr7AiwbyRrpaKdZ4ditW
-						ozyRSSo/gQDbXF0fhlomrPQzegnOwRmmD96lKAcd1xk61PE3AkrC8oA0pj+PWe90
-						vUxeeftg2QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBjnFevePhXMt3YQOIs3l2p
-						35bLcLUc1yLy+2+7ynCH2Vsy8UpB1puQQE3wug7/zYhxp6RV2OKpTXPugW9Mx8TB
-						8eM/ZCoqVbc4H6VH29G8XhwI+XYBnsnT6wS9KU3v5fEUIErP2dLnSBDpqBKyuAwP
-						yzpDwmqPTzifuv5QB2MaFMM5t/qBUFAXbSuueRgA1gICtdb7kVUv0n/7BE6IsncC
-						oaR0/Gdlwm+88m394nirzjEkGX3YHIPMh5Sd6DOyiyG+apm59uv5lzl4WNZbCBhl
-						iJ5xfqTVtk2Ic+IW+u3PQ8sqH9v+UnIxr1o51pAQL4ambSFHaE7mr4tMUHv5mlFC
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.blackburn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.blackburn.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">Blackburn College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Blackburn College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.blackburn.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Hussein</GivenName>
-    <SurName>Lorgat</SurName>
-    <EmailAddress>mailto:h.lorgat@blackburn.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hussein</GivenName>
-    <SurName>Lorgat</SurName>
-    <EmailAddress>mailto:h.lorgat@blackburn.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bnl.gov-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bnl.gov-idp-shibboleth.xml
deleted file mode 100644
index 76f9630b..00000000
--- a/swamid-interfederations-2.0/idp.bnl.gov-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://idp.bnl.gov/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.bnl.gov/idp_error.html" 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">bnl.gov</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Brookhaven National Laboratory</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Brookhaven National Laboratory - BNL.GOV</mdui:Description>
-        <mdui:Logo height="145" width="396" xml:lang="en">https://idp.bnl.gov/images/logo.jpg</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>
-MIIDGDCCAgCgAwIBAgIVAOGh/YR9xc1MGpDIq3Ut/5BiePy1MA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5ibmwuZ292MB4XDTEyMTAwNTE3NDgyOFoXDTMy
-MTAwNTE3NDgyOFowFjEUMBIGA1UEAxMLaWRwLmJubC5nb3YwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCDnv3j+FAGjSGGH7R0PymO7aL6c0HJFGBrkC2d
-8QjEkUJlhzYRgxl2brpJJVdj0zwB32I4JOfs4CEFOLVrR8Jk1CYlw8Hohrn3fh40
-wOEzkwMPX1H2lYLudvVU4a/FCCB6r3XboWJf8oS2KQCELjz9lEcRarh9dyKgE3jq
-zZ8sXODN8qDuOq7T/HFju1IXaca6Lu5PtHK1be4BveZXVc3PZa17V9/dwNMKm0Ok
-qKNi71pnP3iQCNKoFpEQ9BqE652QfgZUVF7lo7zSDR3JThvOCV59/auJYzhaHzvR
-e0nNI2N6BDqXcOpq9BAy0dnf/3KhkZ3XvNoV9q0Ffybiv7rpAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5ibmwuZ292hiJodHRwczovL2lkcC5ibmwuZ292L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBT7MzJ0eTBK55W2zMQt68r2PGSuRjANBgkqhkiG
-9w0BAQUFAAOCAQEAYPIZ5c19Xop5Ouvl1RKhCIi0sxxdDl9CGkrdoNJSzkCGmOSL
-iXLDJfconYKd/tRXVwV3oQcFzqAmuCvoysKHv0YAfsmVwHD+JR7tipewMHAlopEy
-xXjhEla2gwSj2eqL58vBAbPrxtevlDvidLSWbCJ4Mb8qxQwgst/czEzlXJjODexs
-TTO9Lz2eYKw0tkAVekSQIVlYaM9ORfS3mw9tzGvdHDtXdSf4+h1T8vdDbP5T4NG7
-IKJ4yJBMQ4EpreFzVEdfm0IEnIUUbMl66EKRary7Eqiv9GRDlBmon+lF/AtLMCSv
-EjMU9o0OaQzgglUiyJA4z6uMNmIWWttLoEtZjQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bnl.gov/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bnl.gov/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bnl.gov/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bnl.gov/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bnl.gov/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">bnl.gov</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAOGh/YR9xc1MGpDIq3Ut/5BiePy1MA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5ibmwuZ292MB4XDTEyMTAwNTE3NDgyOFoXDTMy
-MTAwNTE3NDgyOFowFjEUMBIGA1UEAxMLaWRwLmJubC5nb3YwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCDnv3j+FAGjSGGH7R0PymO7aL6c0HJFGBrkC2d
-8QjEkUJlhzYRgxl2brpJJVdj0zwB32I4JOfs4CEFOLVrR8Jk1CYlw8Hohrn3fh40
-wOEzkwMPX1H2lYLudvVU4a/FCCB6r3XboWJf8oS2KQCELjz9lEcRarh9dyKgE3jq
-zZ8sXODN8qDuOq7T/HFju1IXaca6Lu5PtHK1be4BveZXVc3PZa17V9/dwNMKm0Ok
-qKNi71pnP3iQCNKoFpEQ9BqE652QfgZUVF7lo7zSDR3JThvOCV59/auJYzhaHzvR
-e0nNI2N6BDqXcOpq9BAy0dnf/3KhkZ3XvNoV9q0Ffybiv7rpAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5ibmwuZ292hiJodHRwczovL2lkcC5ibmwuZ292L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBT7MzJ0eTBK55W2zMQt68r2PGSuRjANBgkqhkiG
-9w0BAQUFAAOCAQEAYPIZ5c19Xop5Ouvl1RKhCIi0sxxdDl9CGkrdoNJSzkCGmOSL
-iXLDJfconYKd/tRXVwV3oQcFzqAmuCvoysKHv0YAfsmVwHD+JR7tipewMHAlopEy
-xXjhEla2gwSj2eqL58vBAbPrxtevlDvidLSWbCJ4Mb8qxQwgst/czEzlXJjODexs
-TTO9Lz2eYKw0tkAVekSQIVlYaM9ORfS3mw9tzGvdHDtXdSf4+h1T8vdDbP5T4NG7
-IKJ4yJBMQ4EpreFzVEdfm0IEnIUUbMl66EKRary7Eqiv9GRDlBmon+lF/AtLMCSv
-EjMU9o0OaQzgglUiyJA4z6uMNmIWWttLoEtZjQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bnl.gov/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bnl.gov/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Brookhaven National Laboratory</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Brookhaven National Laboratory</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bnl.gov/world/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>David Cortijo</md:GivenName>
-    <md:EmailAddress>dcortijo@bnl.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>David Cortijo</md:GivenName>
-    <md:EmailAddress>dcortijo@bnl.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David Cortijo</md:GivenName>
-    <md:EmailAddress>dcortijo@bnl.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bnu.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bnu.fr-idp-shibboleth.xml
deleted file mode 100644
index 96b0ee7e..00000000
--- a/swamid-interfederations-2.0/idp.bnu.fr-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.bnu.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-09T11:18:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bnu.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Library national and university of Strasbourg</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABxElEQVQoz7WSPWtTcRjFz/nfm5vevN6+GVKjGIJ0EieXIChChn4Bd8EvohT9FtrFl0m0u4Igols3hy5ttU0tKWma3t7X/o9DNPiydPFMz3B+DxzO4eqjB5JwPnkFz5zTOtX/B1wAAC3584FkLQ0tSAkiCRGyMoS1hCsSWdSJd1wiNDP9WtBq7O/ttoGsXD4JsnRkg1FaueJvHWaLOYqGYHSwvXLwbNzf6+6sXfqyUZ191+u9OBx4g1F0o/KqXdoZnto7c08WZg4kY0RYC+tgKfBdt9ifb31434uTb92bHwU/V9HKAZhZSBRkAJBIhDdp83O2fDvcaF6eX3t69/q1txcWB5CxMHFufmWEgSCc1YF73mbX29xV2TXZxaXO85e3GgvRp6/tldbr+1fXF2vYGjcciKuPHx4fDTn+7hKZV1HND0q58sbR8Uk90HDkmmi7WY33badarhQLBRdStR6gPgugKAurPAV5Vqv6NkdQAarLJ2CNggTQBQAJkKS5hXnP8wgmaVL2S2F06pdK8Wl0OBgAkxBypxUSCMNwfDx2HIeGSRxbKQxDA/7b9IRgGiUgsjT9aw4k/wAkkZyMnOD0nlp/3/8PhU7WXFblrvUAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MTUrMDI6MDClaIYxAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjE1KzAyOjAw1DU+jQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.bnu.fr/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Reader and staff of Library national and university of Strasbourg</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Bibliothèque nationale et universitaire de Strasbourg</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Lecteurs et professionnels de la Bibliothèque nationale et universitaire de Strasbourg</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>
-					      MIIDFDCCAfygAwIBAgIVAIqFkPqShP9ZsMHoAJ0532bYIA0WMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMMCmlkcC5ibnUuZnIwHhcNMTUwNTIxMDg0MzIzWhcNMzUw
-NTIxMDg0MzIzWjAVMRMwEQYDVQQDDAppZHAuYm51LmZyMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAkqG9zVH+XQL30F4zO7xcT71p/8bLBephIK7R71Ee
-PySloU5xJzezCr15BjAbLKGP4To3vC+gJe9M2vE5LsM79rQPY1nZEDad3bcZcvEk
-u0rnNmyxWgDoylqhDG6ZhcotydoQGyUv5EOeFNlmBbM6y/eh6vYSowuUD/04Tnwt
-gG56BE9nXWOhlPdzLx32TW0krdnJtQqTnyQFKbWM6WfaNMVX2Qc8pVh/BKLj9Ygs
-eXg5XeEMsQf7Aimg97vUmzsLk2lvgyizuHdd2N5kDlKtLAeri0wD+EMUvgbKlIMM
-aknr51WxPSmlB0S/UBN7fKPy5SblfKWv8cpOfciIZo99awIDAQABo1swWTAdBgNV
-HQ4EFgQUSck0EuzJ+smfxBVTGqGB65a0aAcwOAYDVR0RBDEwL4IKaWRwLmJudS5m
-coYhaHR0cHM6Ly9pZHAuYm51LmZyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-BQUAA4IBAQCLEW/HL+soLi8+kuF62ydiLvXEIx7kcRc86n46qZ7uI8M6Bybwr4La
-CGEphhX5VtYWVbYsdWKwlPCFrqTnrsSOIaTX8Q8PiKqzP+Ei18UvpISqWp7vX7LQ
-lG9WUEoC3NsBKuuIqwvfyehsH9FGr32nHF2PMPSdSzF7garOCo0aR35US+WURyAY
-WaJdEwyYrUUlEVmCcXthRUrsqKAucbQ5OSI5aCSL2GntpPnNfIKaZTjsicu4c2Ec
-v3RK5o8jPATSY0QS09guocYWN/UJDOjtw08i3fL1bdVn4L3fn7Lf2Z4HBVvV9KQz
-B39rhMMXfIl8Qj4ieypYMBZ2buHRZt1n
-					    </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-POST" Location="https://idp.bnu.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bnu.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bnu.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Bibliothèque nationale et universitaire de Strasbourg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Bibliothèque nationale et universitaire de Strasbourg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bnu.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>cri@bnu.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.boisestate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.boisestate.edu-idp-shibboleth.xml
deleted file mode 100644
index b7fb57d1..00000000
--- a/swamid-interfederations-2.0/idp.boisestate.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,147 +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://idp.boisestate.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">boisestate.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Boise State University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">You are connecting to a Boise State University website that requires authentication.  Please enter your BroncoWeb username and password to continue.</mdui:Description>
-        <mdui:Logo height="50" width="180" xml:lang="en">https://news.boisestate.edu/files/2009/07/horz_blue_on_white180.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>
-MIIDNDCCAhygAwIBAgIVAIuvWcgfE1GnTa2d9w2NekBq5X02MA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC5ib2lzZXN0YXRlLmVkdTAeFw0xMjAxMjMyMTUz
-NDlaFw0zMjAxMjMyMTUzNDlaMB0xGzAZBgNVBAMTEmlkcC5ib2lzZXN0YXRlLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJCfxfhgj0ubYcM9xfa
-c3b+VKswFUW+3IfdQ1KicDRSePnvt4qKjQcpUhOA41JibEzfiQuOekAjdHhYZIgX
-g2RvViMD6TDvvbLwj+3qNQltIHQysqJkt3RIP+ypPrl3Ewb/ny5yhuQKo1S47N4q
-cZNio5Ow41Xl4pLQgtsLWkZaADrBYjVVau1Am5TRJ4NsgxUD7n3pWdiMuWR/FJy6
-s0Z4bO+QynfClXmhmUAlIqrpE8Ykq6XQ2eAt7cKlCKEsxsg+p/Cm669vxyxYCJSs
-NBAAmePoEKonnJpy0iEmhLh1Dgmx63EXLCajFml7ZyeiEOaCIUExtEi19iJ7gslR
-N+ECAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmJvaXNlc3RhdGUuZWR1hilodHRw
-czovL2lkcC5ib2lzZXN0YXRlLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-zzJn05it7sLBpk2+UaHJEZzt4OIwDQYJKoZIhvcNAQEFBQADggEBADT3CT8hqP+K
-8GhcI9d1KthRhmf/Izf+yAb0EcPU8KtNAK4eZ/XKbfzjjyOXot8ifmmIDR5V1MFU
-rI6KgO0GpNIjGN6UJkBJiHZ6VPElN+uzk+1D/M5rOTO7Mn/BdrITG1KmfOfx8cWb
-nwWAmnQSwNm1b4KPCnxtpwm8fJweSFW10KuJXrJDcnDlJPkpy5H6QEc0o9ku/fXT
-ZZDyc0uTM8Ivrz1OKpryFLNjj7i8lLE2IWv1ufJMdy1MFKEKlzyxzLlF4Znqk2s8
-AGyfAOotjoF4AwX5oD3TWE76qjnurlM3rp+BfjBqgJ/3dL+7My7Sl44vCwB5s5nd
-TJz5EX3kAK4=
-          </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>
-MIIDUjCCAjoCCQCh7DpvHeKsfDANBgkqhkiG9w0BAQUFADBrMRswGQYDVQQDDBJp
-ZHAuYm9pc2VzdGF0ZS5lZHUxHzAdBgNVBAoMFkJvaXNlIFN0YXRlIFVuaXZlcnNp
-dHkxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVJZGFobzEOMAwGA1UEBwwFQm9pc2Uw
-HhcNMTMwNDIzMTQzNjMzWhcNMTQwNDIzMTQzNjMzWjBrMRswGQYDVQQDDBJpZHAu
-Ym9pc2VzdGF0ZS5lZHUxHzAdBgNVBAoMFkJvaXNlIFN0YXRlIFVuaXZlcnNpdHkx
-CzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVJZGFobzEOMAwGA1UEBwwFQm9pc2UwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdpTsAI/J8GlL0/kfB+kxCYXtv
-jucZEpup00f+HyptS72xQIhfa59rXpJu3OOXaj+KL2ldOj/SE57TLJMjt8VzzZ+R
-q8LvDum8nA3OrlBCrKxT+hO1JHnEGhQ74Qq4IxuL2nzaffd+gmzgNHvpUjZwxN5C
-D0OQqjziTdiRz9H2O75ghiLBrZ7i1a05f0nm8kAskcso3FvvmCV2PbtXRvc4J+l1
-jHYx55fVoBQrL9p78d96rmhy1Bc2IbGES01qa2+psoDOdQB9enPVUqi93mSrI3S2
-mEMRl4pORap+gx3WOGhx6x7RL6PZ78P0rUNaXtGhnw6lHb5fjSA6ZVH2mKkpAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAEv0B5K2pMgQxY995qCn282pXT3oaSRfHuFe
-nbNXTKWzNEiAxWQTwP8J9HQa+ehuSd+Xs0Kj0yRGHe6w9LCuwhbmL05TXNQndEuM
-3KaQE9aAeChE6TM6NtyWirpaeqyKU5k2aPlIWknyKifOKZS4rnY2Tb0044MlAxuR
-js0N1pt9WALg5Z/wpN2r7M/DMFwomZIQFE3CjSubL7/8XzWnpVt8+FWCJ3llkmky
-e1qTYz22pd6BmkSUdiibOtx9EYOpDyc39BFQhf6g0L+z8sgd1T+QXUHiU3kPN3Sh
-5+1SoObQOrckBNFUqBaK0Xp302oAlbQcZoTzjWHQY3w+CitVoJY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.boisestate.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.boisestate.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.boisestate.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.boisestate.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.boisestate.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.boisestate.edu/idp/profile/SAML2/POST-SimpleSign/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">boisestate.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAIuvWcgfE1GnTa2d9w2NekBq5X02MA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC5ib2lzZXN0YXRlLmVkdTAeFw0xMjAxMjMyMTUz
-NDlaFw0zMjAxMjMyMTUzNDlaMB0xGzAZBgNVBAMTEmlkcC5ib2lzZXN0YXRlLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJCfxfhgj0ubYcM9xfa
-c3b+VKswFUW+3IfdQ1KicDRSePnvt4qKjQcpUhOA41JibEzfiQuOekAjdHhYZIgX
-g2RvViMD6TDvvbLwj+3qNQltIHQysqJkt3RIP+ypPrl3Ewb/ny5yhuQKo1S47N4q
-cZNio5Ow41Xl4pLQgtsLWkZaADrBYjVVau1Am5TRJ4NsgxUD7n3pWdiMuWR/FJy6
-s0Z4bO+QynfClXmhmUAlIqrpE8Ykq6XQ2eAt7cKlCKEsxsg+p/Cm669vxyxYCJSs
-NBAAmePoEKonnJpy0iEmhLh1Dgmx63EXLCajFml7ZyeiEOaCIUExtEi19iJ7gslR
-N+ECAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmJvaXNlc3RhdGUuZWR1hilodHRw
-czovL2lkcC5ib2lzZXN0YXRlLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-zzJn05it7sLBpk2+UaHJEZzt4OIwDQYJKoZIhvcNAQEFBQADggEBADT3CT8hqP+K
-8GhcI9d1KthRhmf/Izf+yAb0EcPU8KtNAK4eZ/XKbfzjjyOXot8ifmmIDR5V1MFU
-rI6KgO0GpNIjGN6UJkBJiHZ6VPElN+uzk+1D/M5rOTO7Mn/BdrITG1KmfOfx8cWb
-nwWAmnQSwNm1b4KPCnxtpwm8fJweSFW10KuJXrJDcnDlJPkpy5H6QEc0o9ku/fXT
-ZZDyc0uTM8Ivrz1OKpryFLNjj7i8lLE2IWv1ufJMdy1MFKEKlzyxzLlF4Znqk2s8
-AGyfAOotjoF4AwX5oD3TWE76qjnurlM3rp+BfjBqgJ/3dL+7My7Sl44vCwB5s5nd
-TJz5EX3kAK4=
-          </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>
-MIIDUjCCAjoCCQCh7DpvHeKsfDANBgkqhkiG9w0BAQUFADBrMRswGQYDVQQDDBJp
-ZHAuYm9pc2VzdGF0ZS5lZHUxHzAdBgNVBAoMFkJvaXNlIFN0YXRlIFVuaXZlcnNp
-dHkxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVJZGFobzEOMAwGA1UEBwwFQm9pc2Uw
-HhcNMTMwNDIzMTQzNjMzWhcNMTQwNDIzMTQzNjMzWjBrMRswGQYDVQQDDBJpZHAu
-Ym9pc2VzdGF0ZS5lZHUxHzAdBgNVBAoMFkJvaXNlIFN0YXRlIFVuaXZlcnNpdHkx
-CzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVJZGFobzEOMAwGA1UEBwwFQm9pc2UwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdpTsAI/J8GlL0/kfB+kxCYXtv
-jucZEpup00f+HyptS72xQIhfa59rXpJu3OOXaj+KL2ldOj/SE57TLJMjt8VzzZ+R
-q8LvDum8nA3OrlBCrKxT+hO1JHnEGhQ74Qq4IxuL2nzaffd+gmzgNHvpUjZwxN5C
-D0OQqjziTdiRz9H2O75ghiLBrZ7i1a05f0nm8kAskcso3FvvmCV2PbtXRvc4J+l1
-jHYx55fVoBQrL9p78d96rmhy1Bc2IbGES01qa2+psoDOdQB9enPVUqi93mSrI3S2
-mEMRl4pORap+gx3WOGhx6x7RL6PZ78P0rUNaXtGhnw6lHb5fjSA6ZVH2mKkpAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAEv0B5K2pMgQxY995qCn282pXT3oaSRfHuFe
-nbNXTKWzNEiAxWQTwP8J9HQa+ehuSd+Xs0Kj0yRGHe6w9LCuwhbmL05TXNQndEuM
-3KaQE9aAeChE6TM6NtyWirpaeqyKU5k2aPlIWknyKifOKZS4rnY2Tb0044MlAxuR
-js0N1pt9WALg5Z/wpN2r7M/DMFwomZIQFE3CjSubL7/8XzWnpVt8+FWCJ3llkmky
-e1qTYz22pd6BmkSUdiibOtx9EYOpDyc39BFQhf6g0L+z8sgd1T+QXUHiU3kPN3Sh
-5+1SoObQOrckBNFUqBaK0Xp302oAlbQcZoTzjWHQY3w+CitVoJY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.boisestate.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.boisestate.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Boise State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Boise State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://boisestate.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gary Kincaid</md:GivenName>
-    <md:EmailAddress>gkincaid@boisestate.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.boltoncc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.boltoncc.ac.uk-shibboleth.xml
deleted file mode 100644
index b5ea7157..00000000
--- a/swamid-interfederations-2.0/idp.boltoncc.ac.uk-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://idp.boltoncc.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Bolton College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-15T18:01: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">bolton-community-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRjCCAi4CCQCsi3PM6isCkjANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGQm9sdG9uMQ8wDQYDVQQHEwZCb2x0b24xFzAVBgNVBAoTDkJv
-						bHRvbiBDb2xsZWdlMRswGQYDVQQDExJpZHAuYm9sdG9uY2MuYWMudWswHhcNMTMx
-						MjA5MDk1NjEyWhcNMzMxMjA0MDk1NjEyWjBlMQswCQYDVQQGEwJHQjEPMA0GA1UE
-						CBMGQm9sdG9uMQ8wDQYDVQQHEwZCb2x0b24xFzAVBgNVBAoTDkJvbHRvbiBDb2xs
-						ZWdlMRswGQYDVQQDExJpZHAuYm9sdG9uY2MuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDt/7etyusEoPkmBjb+vlI5qWaSK/nunnDDfKji4Rf1
-						J2LcJ0AQBE7EZ9a3uaFLe3sHLIxav/VwuOGlLEFA+bIlpfuIUI00Pkv5lWpoSv3Q
-						qDHKniLxLgOxeO3WKO0ziALCM9gKor0iZkPwESKjp8PkM4Kn9CgpM8BlYBdvedBA
-						fxF3+OHy+RtsRRw1ObfG7U3mS8msLKjV8ziVK50XiM60EOvoK9Bb2QzLVxzL/Z3C
-						Kwv8EpTSZMD0OFTBI/+vZ7evhPT96qYGvMomPZ2WjkcdfkmXRc8+IY7vfL1m5jp3
-						3C2DkOHgEny4lQd/qJucf9jnhUkT69YoEsEXf0JE29NjAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBAEjerzNXlUF0L/dYMpidDZmVpQpHSEjBhbcR3wravACGkwJcL2ek
-						YUD5Jee1Kd7D/H2MmmBKtK8u7j7FbLIxxA/lnXMbAOecD1apzeG2jEz88PGnJswl
-						g9XnRu/DvUggQs626CbJ3a9QkFrHel3VrL/WMnHn0aVEiBZphoiFSBZUpb8QuNyy
-						FGkWWWeUJO9f7TG5qbW6TGKeOx6IlxmVmbui8gYrZ8rur5zKhAzd640zbtCgYh6O
-						QUfQMXNSt4yna9Dh4QT6SaMcD4tKhA1nqlghNPBFFGgZo3hCyWzwCXVEIpCJmNqR
-						K9mlz3r6b+Vka51fYE5nKPrUGT60d4hOe+s=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.boltoncc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.boltoncc.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.boltoncc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.boltoncc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.boltoncc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.boltoncc.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">bolton-community-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRjCCAi4CCQCsi3PM6isCkjANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGQm9sdG9uMQ8wDQYDVQQHEwZCb2x0b24xFzAVBgNVBAoTDkJv
-						bHRvbiBDb2xsZWdlMRswGQYDVQQDExJpZHAuYm9sdG9uY2MuYWMudWswHhcNMTMx
-						MjA5MDk1NjEyWhcNMzMxMjA0MDk1NjEyWjBlMQswCQYDVQQGEwJHQjEPMA0GA1UE
-						CBMGQm9sdG9uMQ8wDQYDVQQHEwZCb2x0b24xFzAVBgNVBAoTDkJvbHRvbiBDb2xs
-						ZWdlMRswGQYDVQQDExJpZHAuYm9sdG9uY2MuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDt/7etyusEoPkmBjb+vlI5qWaSK/nunnDDfKji4Rf1
-						J2LcJ0AQBE7EZ9a3uaFLe3sHLIxav/VwuOGlLEFA+bIlpfuIUI00Pkv5lWpoSv3Q
-						qDHKniLxLgOxeO3WKO0ziALCM9gKor0iZkPwESKjp8PkM4Kn9CgpM8BlYBdvedBA
-						fxF3+OHy+RtsRRw1ObfG7U3mS8msLKjV8ziVK50XiM60EOvoK9Bb2QzLVxzL/Z3C
-						Kwv8EpTSZMD0OFTBI/+vZ7evhPT96qYGvMomPZ2WjkcdfkmXRc8+IY7vfL1m5jp3
-						3C2DkOHgEny4lQd/qJucf9jnhUkT69YoEsEXf0JE29NjAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBAEjerzNXlUF0L/dYMpidDZmVpQpHSEjBhbcR3wravACGkwJcL2ek
-						YUD5Jee1Kd7D/H2MmmBKtK8u7j7FbLIxxA/lnXMbAOecD1apzeG2jEz88PGnJswl
-						g9XnRu/DvUggQs626CbJ3a9QkFrHel3VrL/WMnHn0aVEiBZphoiFSBZUpb8QuNyy
-						FGkWWWeUJO9f7TG5qbW6TGKeOx6IlxmVmbui8gYrZ8rur5zKhAzd640zbtCgYh6O
-						QUfQMXNSt4yna9Dh4QT6SaMcD4tKhA1nqlghNPBFFGgZo3hCyWzwCXVEIpCJmNqR
-						K9mlz3r6b+Vka51fYE5nKPrUGT60d4hOe+s=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.boltoncc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.boltoncc.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">Bolton College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bolton College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bolton-community-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Railton</GivenName>
-    <SurName>Knott</SurName>
-    <EmailAddress>mailto:railton.knott@boltoncc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dean</GivenName>
-    <SurName>Baggaley</SurName>
-    <EmailAddress>mailto:Dean.Baggaley@boltoncc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.borderscollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.borderscollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index edb7bc53..00000000
--- a/swamid-interfederations-2.0/idp.borderscollege.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.borderscollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Borders College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-20T15:57: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">borderscollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID/DCCAuQCCQDmNVK58fWDtTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-						R0IxGjAYBgNVBAgMEVNjb3R0aXNoIEJvcmRlcnMgMRMwEQYDVQQHDApHYWxhc2hp
-						ZWxzMRgwFgYDVQQKDA9Cb3JkZXJzIENvbGxlZ2UxFzAVBgNVBAsMDklDVCBEZXBh
-						cnRtZW50MSEwHwYDVQQDDBhpZHAuYm9yZGVyc2NvbGxlZ2UuYWMudWsxKTAnBgkq
-						hkiG9w0BCQEWGkdTYXVuQGJvcmRlcnNjb2xsZWdlLmFjLnVrMB4XDTE1MDIxODE1
-						MzQ1M1oXDTI1MDIxNTE1MzQ1M1owgb8xCzAJBgNVBAYTAkdCMRowGAYDVQQIDBFT
-						Y290dGlzaCBCb3JkZXJzIDETMBEGA1UEBwwKR2FsYXNoaWVsczEYMBYGA1UECgwP
-						Qm9yZGVycyBDb2xsZWdlMRcwFQYDVQQLDA5JQ1QgRGVwYXJ0bWVudDEhMB8GA1UE
-						AwwYaWRwLmJvcmRlcnNjb2xsZWdlLmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpHU2F1
-						bkBib3JkZXJzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAO/lris+8qS70Yb/6096UTgmMZcJEsPHweU8GmZDgIeb3b+/5vSlixlh
-						utP8tiF7oeLx/rapMSSLbbP0muG+aePPk2TNCR8mklYYzaAumBKIfJL4NJLz5qYN
-						XXeu31yHoK865kN7d27l7EaH0hlbGz9KR1PbCtD5/Db35MU1uPWAaNAUB9KZrqeF
-						x+C+bCvRbAfbQXAIOg0E0mdJpYQnx2b1wIucY7zoemkivBdlHkr00OUn8hCSD+bb
-						zL/OQO77/CKxPYn2cAeE8cPQPNJOISiupEVSY7rqNuktw6knrl4zQdXNoCXO86Nd
-						uQK4fRC9lCq9/HNmwiWjzHbtRZ/UpnMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						LtT/rEHRmejcFxajw0S+QrvnQOo51UbCrn5Uj+sB/vNWNNO/H2q7Z4vqcttd5Md3
-						B5pcDenz3EnlsNb/MPQNxA2ilf56llPM7WBQlbM74gKRIo5i5Nn98henvD8+m3tj
-						NdapAU3pl5pqocCwQL3gE5NC4L6YhY7UBKdqbRE6vPBOtbHIJAF0BKM5Crxp3ee+
-						YWig50w3rNKFyBWQ0xHLVEs+FeiZBbSBNBBK1Gqjg8bWylPyvK0kCgLyVIjZX9D9
-						9pPT26OiCFI3SypXYPOYjSWiNz5tlY3CYna/x7LAZSg3h+RJmp0VByjNe0s3CkZg
-						ez/Z03T/OFgp5FhaUpqzxQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.borderscollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.borderscollege.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.borderscollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.borderscollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.borderscollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.borderscollege.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">borderscollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID/DCCAuQCCQDmNVK58fWDtTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-						R0IxGjAYBgNVBAgMEVNjb3R0aXNoIEJvcmRlcnMgMRMwEQYDVQQHDApHYWxhc2hp
-						ZWxzMRgwFgYDVQQKDA9Cb3JkZXJzIENvbGxlZ2UxFzAVBgNVBAsMDklDVCBEZXBh
-						cnRtZW50MSEwHwYDVQQDDBhpZHAuYm9yZGVyc2NvbGxlZ2UuYWMudWsxKTAnBgkq
-						hkiG9w0BCQEWGkdTYXVuQGJvcmRlcnNjb2xsZWdlLmFjLnVrMB4XDTE1MDIxODE1
-						MzQ1M1oXDTI1MDIxNTE1MzQ1M1owgb8xCzAJBgNVBAYTAkdCMRowGAYDVQQIDBFT
-						Y290dGlzaCBCb3JkZXJzIDETMBEGA1UEBwwKR2FsYXNoaWVsczEYMBYGA1UECgwP
-						Qm9yZGVycyBDb2xsZWdlMRcwFQYDVQQLDA5JQ1QgRGVwYXJ0bWVudDEhMB8GA1UE
-						AwwYaWRwLmJvcmRlcnNjb2xsZWdlLmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpHU2F1
-						bkBib3JkZXJzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAO/lris+8qS70Yb/6096UTgmMZcJEsPHweU8GmZDgIeb3b+/5vSlixlh
-						utP8tiF7oeLx/rapMSSLbbP0muG+aePPk2TNCR8mklYYzaAumBKIfJL4NJLz5qYN
-						XXeu31yHoK865kN7d27l7EaH0hlbGz9KR1PbCtD5/Db35MU1uPWAaNAUB9KZrqeF
-						x+C+bCvRbAfbQXAIOg0E0mdJpYQnx2b1wIucY7zoemkivBdlHkr00OUn8hCSD+bb
-						zL/OQO77/CKxPYn2cAeE8cPQPNJOISiupEVSY7rqNuktw6knrl4zQdXNoCXO86Nd
-						uQK4fRC9lCq9/HNmwiWjzHbtRZ/UpnMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						LtT/rEHRmejcFxajw0S+QrvnQOo51UbCrn5Uj+sB/vNWNNO/H2q7Z4vqcttd5Md3
-						B5pcDenz3EnlsNb/MPQNxA2ilf56llPM7WBQlbM74gKRIo5i5Nn98henvD8+m3tj
-						NdapAU3pl5pqocCwQL3gE5NC4L6YhY7UBKdqbRE6vPBOtbHIJAF0BKM5Crxp3ee+
-						YWig50w3rNKFyBWQ0xHLVEs+FeiZBbSBNBBK1Gqjg8bWylPyvK0kCgLyVIjZX9D9
-						9pPT26OiCFI3SypXYPOYjSWiNz5tlY3CYna/x7LAZSg3h+RJmp0VByjNe0s3CkZg
-						ez/Z03T/OFgp5FhaUpqzxQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.borderscollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.borderscollege.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">Borders College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Borders College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.borderscollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Kyle</SurName>
-    <EmailAddress>mailto:AKyle@borderscollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gary</GivenName>
-    <SurName>Saunders</SurName>
-    <EmailAddress>mailto:GSaun@borderscollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bournemouth.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.bournemouth.ac.uk-oala-metadata.xml
deleted file mode 100644
index ee3d9ec3..00000000
--- a/swamid-interfederations-2.0/idp.bournemouth.ac.uk-oala-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://idp.bournemouth.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Bournemouth University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">bournemouth.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqTCCApGgAwIBAgIJALZkHs4cgnSCMA0GCSqGSIb3DQEBBQUAMEExHzAdBgNV
-						BAoTFkJvdXJuZW1vdXRoIFVuaXZlcnNpdHkxHjAcBgNVBAMTFWlkcC5ib3VybmVt
-						b3V0aC5hYy51azAeFw0xNDAxMjAwOTI3NDlaFw0yNDAxMTgwOTI3NDlaMEExHzAd
-						BgNVBAoTFkJvdXJuZW1vdXRoIFVuaXZlcnNpdHkxHjAcBgNVBAMTFWlkcC5ib3Vy
-						bmVtb3V0aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOCN
-						LseVokel4GJsn3t04U7WLorCo75qr7okZHWI+OONBJmdREUjdB56r4pzHgpQGXJq
-						vlK4FNS35wStcziZwZNI9tH1Q4yieZSGdQ0bqBqxQJ/Jz4bEHV4sD88qoFiXgH3+
-						ri3ONHw0q7R5A7ZbDEuV0dJm8yIRo9jDKo4muW8OEe9sCorp4CyQpCFBXnTOWzKN
-						7soj7VW8GAYNPim3uiuwv62wTykWw+zEQI40cjttauEFTv+UwqX9OgfVHA/je2HA
-						48hZav2g9YU+Yo/WouwgMO+Y8wDSrlcTs+p2shDDdcSU26O2uoQyKqY+cNKmBtF3
-						TiZE/+zRt3DE/akHl+MCAwEAAaOBozCBoDAdBgNVHQ4EFgQUXssZRCo90zME4EbK
-						maLozgGIjZ8wcQYDVR0jBGowaIAUXssZRCo90zME4EbKmaLozgGIjZ+hRaRDMEEx
-						HzAdBgNVBAoTFkJvdXJuZW1vdXRoIFVuaXZlcnNpdHkxHjAcBgNVBAMTFWlkcC5i
-						b3VybmVtb3V0aC5hYy51a4IJALZkHs4cgnSCMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEFBQADggEBANwscCtfXRADL1PjVgDyt2tiCitj/0DFJUSgj1g+9vpxo94s
-						cwRAn3TF/w8izcwAOp5h3R+Sgfqdgeaqm0FzruZHHfpPnG+o+UUwaxymt/wMMtOE
-						Tal5ajyjgcvHp5D4PvKvvZfV1VlB9FO4F21+suY4aeLfet9s238s1Kzh66PHfn8b
-						gRycyQReJHmOqpqfmcvhv1dd0itTz1W4D7ZcA0PkAfjoAf3Lb6ChExbfuujm3S0Q
-						dITlX1wWoQsNsCXRR+ss3mhVrQhbWPBDvOQcSTqY9sHCEEvVVEelccI7DaXTr1RE
-						sNEN/lIZ5gfmE611CgjOy8LpmWwzM1n45XVK9Wo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bournemouth.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bournemouth.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Bournemouth University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bournemouth University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bournemouth.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Foy</SurName>
-    <EmailAddress>mailto:mfoy@bournemouth.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Foy</SurName>
-    <EmailAddress>mailto:mfoy@bournemouth.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bournville.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bournville.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 779962dd..00000000
--- a/swamid-interfederations-2.0/idp.bournville.ac.uk-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.bournville.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Bournville College of Further Education.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-14T16:14:23Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">bournville.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Bournville College of Further Education</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAMVOqQ1Map32HnZJGhKs8Wp1jYykMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFGlkcC5ib3VybnZpbGxlLmFjLnVrMB4XDTEzMDExNDA5
-						MTAxOFoXDTMzMDExNDA5MTAxOFowHzEdMBsGA1UEAxMUaWRwLmJvdXJudmlsbGUu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYoem7DBPG4jdk
-						EVlcLTjO/LIKz3gGO7e9grN1421mzM3A1kZSyeuxafhpOoAFJyJjyCjnl4zMaj/l
-						Y0OZER+9uRxRRoXjDPL669HNq8cpxDIxS7NOW+kAEm57hd6ep4HCqXbnlfWt8WGe
-						Hb4SN7VPkv77cHXa6dgd3KAhyZ6WPxYiLvat0ek9I/FgePw7+4OGqal94HgNLFE9
-						BUKBk5LXHM4mu60jgdquizkFNf0nLpgoyFYRmN8khbWF9qa9wlLgv5PkqhBrKmlO
-						8k4+3udGbA1OjwDTqtwyMVHtvAb+F0iiud6g6Q2tQ7SroqG0znygy1rwIxKgq5Ox
-						3aN+OVYTAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC5ib3VybnZpbGxlLmFjLnVr
-						hitodHRwczovL2lkcC5ib3VybnZpbGxlLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBT4YMqKmVMZslHbFSfAyWXTnYAJ4jANBgkqhkiG9w0BAQUFAAOCAQEA
-						fHiWcumz6a+MOT0mhfrS8aSmW50uxoJcKcao/DiNRFvQGBLb/WaDVV4OkvE2sPuH
-						o/36kgbsZPOBsefMQLvvztijWO/mKtKztRyq7T3wIOx931Yt3v8DNGyIBG7nx5l1
-						HjYILU50oZ3l/UEZrLirbbdjNTQ9xmVL0s/0/SnZDHwesiyqrQJDz5FGdOe1Y0dd
-						eYqNqQ5BLnDstFFIEBsh5PKdJed7yFYlZPWnin3jjYmvOFPClS8irmcImEONqoBq
-						KI23lp0qS3GeWPrif5C8EMO0nh/9yJ3UUTrHCsMZVT5Zb/9uPPKWC6dMS0Ywanu+
-						t9/SkewVV1FPgkkbJ2LVTQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bournville.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bournville.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.bournville.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bournville.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bournville.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bournville.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">bournville.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAMVOqQ1Map32HnZJGhKs8Wp1jYykMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFGlkcC5ib3VybnZpbGxlLmFjLnVrMB4XDTEzMDExNDA5
-						MTAxOFoXDTMzMDExNDA5MTAxOFowHzEdMBsGA1UEAxMUaWRwLmJvdXJudmlsbGUu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYoem7DBPG4jdk
-						EVlcLTjO/LIKz3gGO7e9grN1421mzM3A1kZSyeuxafhpOoAFJyJjyCjnl4zMaj/l
-						Y0OZER+9uRxRRoXjDPL669HNq8cpxDIxS7NOW+kAEm57hd6ep4HCqXbnlfWt8WGe
-						Hb4SN7VPkv77cHXa6dgd3KAhyZ6WPxYiLvat0ek9I/FgePw7+4OGqal94HgNLFE9
-						BUKBk5LXHM4mu60jgdquizkFNf0nLpgoyFYRmN8khbWF9qa9wlLgv5PkqhBrKmlO
-						8k4+3udGbA1OjwDTqtwyMVHtvAb+F0iiud6g6Q2tQ7SroqG0znygy1rwIxKgq5Ox
-						3aN+OVYTAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC5ib3VybnZpbGxlLmFjLnVr
-						hitodHRwczovL2lkcC5ib3VybnZpbGxlLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBT4YMqKmVMZslHbFSfAyWXTnYAJ4jANBgkqhkiG9w0BAQUFAAOCAQEA
-						fHiWcumz6a+MOT0mhfrS8aSmW50uxoJcKcao/DiNRFvQGBLb/WaDVV4OkvE2sPuH
-						o/36kgbsZPOBsefMQLvvztijWO/mKtKztRyq7T3wIOx931Yt3v8DNGyIBG7nx5l1
-						HjYILU50oZ3l/UEZrLirbbdjNTQ9xmVL0s/0/SnZDHwesiyqrQJDz5FGdOe1Y0dd
-						eYqNqQ5BLnDstFFIEBsh5PKdJed7yFYlZPWnin3jjYmvOFPClS8irmcImEONqoBq
-						KI23lp0qS3GeWPrif5C8EMO0nh/9yJ3UUTrHCsMZVT5Zb/9uPPKWC6dMS0Ywanu+
-						t9/SkewVV1FPgkkbJ2LVTQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bournville.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bournville.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">Bournville College of Further Education</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bournville College of Further Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bournville.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jacob</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:jacob.smith@bournville.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Sumner</SurName>
-    <EmailAddress>mailto:james.sumner@bournville.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bpc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bpc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index fa0e5075..00000000
--- a/swamid-interfederations-2.0/idp.bpc.ac.uk-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.bpc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The Bournemouth and Poole College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-29T16:48: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">bpc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQC43jaLLv2IZzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGRG9yc2V0MQ4wDAYDVQQHEwVQb29sZTEqMCgGA1UEChMhVGhl
-						IEJvdXJuZW1vdXRoIGFuZCBQb29sZSBDb2xsZWdlMRYwFAYDVQQDEw1pZHAuYnBj
-						LmFjLnVrMB4XDTEzMDUxNTA4MDcxNFoXDTMzMDUxMDA4MDcxNFowcjELMAkGA1UE
-						BhMCR0IxDzANBgNVBAgTBkRvcnNldDEOMAwGA1UEBxMFUG9vbGUxKjAoBgNVBAoT
-						IVRoZSBCb3VybmVtb3V0aCBhbmQgUG9vbGUgQ29sbGVnZTEWMBQGA1UEAxMNaWRw
-						LmJwYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAObHXYyl
-						+LXHlkgq7okCVpPnwlmS++5Rm5npa3NT26lPzKOvCt1q0yxFoA5BUeP9s/Do+n1U
-						TIv64PAgNeS3Qct6+TvZ2ZQnf0GJxEA7fcP+OSCseYRU2BzLf2WveS/Zl67WnJpR
-						nE+65CCYQ513xpJ4LHAKrBcoScQpJRSeFuFiMHztp+63uSZAK52ovAYMFi6P0wIA
-						yfdAQtx2WIqgpYMCzeNGuLHD2JTlAfcfgybLEAaTIG+ahOrZ2ZFG9FQ+ZnCqJ2nR
-						+3+MMDcC0BWzoEw7BVzH/IYe0QnELkKCC6tHO12n1SHlLSfAHvBNqsyO2B7RzaPy
-						1BmiAtVH/v6u2x8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdoT73tpcY2zUt9HQ
-						qOcu+wmVVIM2Xmcn1z1deW9Sqw5+MKrKoIPflT3iOKYd8qvcweJ5pKfNuSVPPlkl
-						s+/u5+OgIbbh7nN0mUTn1C4frdRcO/7wArwML1+1LWcMt17bJZu0B/BxO6e0DCcH
-						DT1R9QQNblw0sO0faT2txKm7bhiQEmQh+LZdsi5wH5M33/dsE+HxrJ78fqMKX/sf
-						c238Fq/VBxwiL7zwzyWV6mleZHqnHKqshbQvieDVkzvcnX7H+lyXnk3UtIG9QNAE
-						H7WG4Yb5iX6P99OsC2A+qeDjftPDFrQ50Io7382aXqH1fApzAmG4A3TtBb9ZRGC/
-						Yl8vCw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bpc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bpc.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.bpc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bpc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bpc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bpc.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">bpc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQC43jaLLv2IZzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGRG9yc2V0MQ4wDAYDVQQHEwVQb29sZTEqMCgGA1UEChMhVGhl
-						IEJvdXJuZW1vdXRoIGFuZCBQb29sZSBDb2xsZWdlMRYwFAYDVQQDEw1pZHAuYnBj
-						LmFjLnVrMB4XDTEzMDUxNTA4MDcxNFoXDTMzMDUxMDA4MDcxNFowcjELMAkGA1UE
-						BhMCR0IxDzANBgNVBAgTBkRvcnNldDEOMAwGA1UEBxMFUG9vbGUxKjAoBgNVBAoT
-						IVRoZSBCb3VybmVtb3V0aCBhbmQgUG9vbGUgQ29sbGVnZTEWMBQGA1UEAxMNaWRw
-						LmJwYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAObHXYyl
-						+LXHlkgq7okCVpPnwlmS++5Rm5npa3NT26lPzKOvCt1q0yxFoA5BUeP9s/Do+n1U
-						TIv64PAgNeS3Qct6+TvZ2ZQnf0GJxEA7fcP+OSCseYRU2BzLf2WveS/Zl67WnJpR
-						nE+65CCYQ513xpJ4LHAKrBcoScQpJRSeFuFiMHztp+63uSZAK52ovAYMFi6P0wIA
-						yfdAQtx2WIqgpYMCzeNGuLHD2JTlAfcfgybLEAaTIG+ahOrZ2ZFG9FQ+ZnCqJ2nR
-						+3+MMDcC0BWzoEw7BVzH/IYe0QnELkKCC6tHO12n1SHlLSfAHvBNqsyO2B7RzaPy
-						1BmiAtVH/v6u2x8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdoT73tpcY2zUt9HQ
-						qOcu+wmVVIM2Xmcn1z1deW9Sqw5+MKrKoIPflT3iOKYd8qvcweJ5pKfNuSVPPlkl
-						s+/u5+OgIbbh7nN0mUTn1C4frdRcO/7wArwML1+1LWcMt17bJZu0B/BxO6e0DCcH
-						DT1R9QQNblw0sO0faT2txKm7bhiQEmQh+LZdsi5wH5M33/dsE+HxrJ78fqMKX/sf
-						c238Fq/VBxwiL7zwzyWV6mleZHqnHKqshbQvieDVkzvcnX7H+lyXnk3UtIG9QNAE
-						H7WG4Yb5iX6P99OsC2A+qeDjftPDFrQ50Io7382aXqH1fApzAmG4A3TtBb9ZRGC/
-						Yl8vCw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bpc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bpc.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 Bournemouth and Poole College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bournemouth and Poole College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bpc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Deb</GivenName>
-    <SurName>Farrell</SurName>
-    <EmailAddress>mailto:farrelld@bpc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Davis</SurName>
-    <EmailAddress>mailto:davism@bpc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index a99b4564..00000000
--- a/swamid-interfederations-2.0/idp.braidense.it-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,106 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.braidense.it/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-06-11T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">braidense.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Biblioteca Nazionale Braidense</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Biblioteca Nazionale Braidense</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Biblioteca Nazionale Braidense users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti della Biblioteca Nazionale Braidense</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.braidense.it/servizi/idem.php</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.braidense.it/index_en.php</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.braidense.it/servizi/idem.php</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>
-MIIEvTCCA6WgAwIBAgIJAKoe0ICAn2PqMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
-VQQGEwJJVDETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0GA1UEBxMGTWlsYW5vMScw
-JQYDVQQKEx5CaWJsaW90ZWNhIE5hemlvbmFsZSBCcmFpZGVuc2UxGTAXBgNVBAMT
-EGlkcC5icmFpZGVuc2UuaXQxITAfBgkqhkiG9w0BCQEWEnN0YWZmX2FhaUBjaWxl
-YS5pdDAeFw0xMjA1MTcwODQ3NDNaFw0yMjA1MTcwODQ3NDNaMIGaMQswCQYDVQQG
-EwJJVDETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0GA1UEBxMGTWlsYW5vMScwJQYD
-VQQKEx5CaWJsaW90ZWNhIE5hemlvbmFsZSBCcmFpZGVuc2UxGTAXBgNVBAMTEGlk
-cC5icmFpZGVuc2UuaXQxITAfBgkqhkiG9w0BCQEWEnN0YWZmX2FhaUBjaWxlYS5p
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOJ+4MEKxdD1YuwbybMg
-H+LV0vmw9YsLmktL3WkJkHUpEYl6RomsaP+4fz4ugrnSUI3RZuKY1+Hz4RWXeweP
-c1vetbHoz0wzBtZuARj6fC9tQW7It0lRGeWIyO4mnMexfa2IGuUn8YD21WUT4be5
-aYICi10JM1muUcEGuqcV7/cGHGsTdgFubLGUrXq84Yb8Cjg7tG6RkBymNbA/xmod
-iuuIDrODJsQI17MXgzeedyy85FhgqIqsOrBOKUqf40XA6oBP54S04VJF+82rRkgT
-TfrjSilxITya8+Bez1WWPccFBjdamCtmOwwvazX7k2QCocQJXgQYdFtJ8vNAJxdx
-td8CAwEAAaOCAQIwgf8wHQYDVR0OBBYEFLepRlg0/cmwZl7TagT4ZuiSARbJMIHP
-BgNVHSMEgccwgcSAFLepRlg0/cmwZl7TagT4ZuiSARbJoYGgpIGdMIGaMQswCQYD
-VQQGEwJJVDETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0GA1UEBxMGTWlsYW5vMScw
-JQYDVQQKEx5CaWJsaW90ZWNhIE5hemlvbmFsZSBCcmFpZGVuc2UxGTAXBgNVBAMT
-EGlkcC5icmFpZGVuc2UuaXQxITAfBgkqhkiG9w0BCQEWEnN0YWZmX2FhaUBjaWxl
-YS5pdIIJAKoe0ICAn2PqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-ANTSsYzqWdHwD0LPMAlL8bccFq3j2JihAhMVomPBnwxiwUosRneHmvzn6AQW0YbV
-ck7UAH5dgpVd9ztlhFP/Bhq+1slodFz61fz3DkU8rDpTrQKhIYvcNCY2vwhKq12n
-JJN/GoYkTr0NlMmPD+pUr0BMuiic2d5rKQBv5UWNbYoT9gBrujIToVjg45uzqL5S
-RTijkVLaaEAn1KpGCcPr04bXH3ENXJOzF/+wf/GCgcdgNHPbhAblGwSWiPCISzdw
-ep81NcbzNK0XZJLI4dVtJnvr8eE3YyRROe0lT8f7Oa1btTk2n8RNWA6UCdJtAOw3
-A0BHS0jXr1yTM2p2/tqoNbc=
-</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>
-MIIEvTCCA6WgAwIBAgIJAKoe0ICAn2PqMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
-VQQGEwJJVDETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0GA1UEBxMGTWlsYW5vMScw
-JQYDVQQKEx5CaWJsaW90ZWNhIE5hemlvbmFsZSBCcmFpZGVuc2UxGTAXBgNVBAMT
-EGlkcC5icmFpZGVuc2UuaXQxITAfBgkqhkiG9w0BCQEWEnN0YWZmX2FhaUBjaWxl
-YS5pdDAeFw0xMjA1MTcwODQ3NDNaFw0yMjA1MTcwODQ3NDNaMIGaMQswCQYDVQQG
-EwJJVDETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0GA1UEBxMGTWlsYW5vMScwJQYD
-VQQKEx5CaWJsaW90ZWNhIE5hemlvbmFsZSBCcmFpZGVuc2UxGTAXBgNVBAMTEGlk
-cC5icmFpZGVuc2UuaXQxITAfBgkqhkiG9w0BCQEWEnN0YWZmX2FhaUBjaWxlYS5p
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOJ+4MEKxdD1YuwbybMg
-H+LV0vmw9YsLmktL3WkJkHUpEYl6RomsaP+4fz4ugrnSUI3RZuKY1+Hz4RWXeweP
-c1vetbHoz0wzBtZuARj6fC9tQW7It0lRGeWIyO4mnMexfa2IGuUn8YD21WUT4be5
-aYICi10JM1muUcEGuqcV7/cGHGsTdgFubLGUrXq84Yb8Cjg7tG6RkBymNbA/xmod
-iuuIDrODJsQI17MXgzeedyy85FhgqIqsOrBOKUqf40XA6oBP54S04VJF+82rRkgT
-TfrjSilxITya8+Bez1WWPccFBjdamCtmOwwvazX7k2QCocQJXgQYdFtJ8vNAJxdx
-td8CAwEAAaOCAQIwgf8wHQYDVR0OBBYEFLepRlg0/cmwZl7TagT4ZuiSARbJMIHP
-BgNVHSMEgccwgcSAFLepRlg0/cmwZl7TagT4ZuiSARbJoYGgpIGdMIGaMQswCQYD
-VQQGEwJJVDETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0GA1UEBxMGTWlsYW5vMScw
-JQYDVQQKEx5CaWJsaW90ZWNhIE5hemlvbmFsZSBCcmFpZGVuc2UxGTAXBgNVBAMT
-EGlkcC5icmFpZGVuc2UuaXQxITAfBgkqhkiG9w0BCQEWEnN0YWZmX2FhaUBjaWxl
-YS5pdIIJAKoe0ICAn2PqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-ANTSsYzqWdHwD0LPMAlL8bccFq3j2JihAhMVomPBnwxiwUosRneHmvzn6AQW0YbV
-ck7UAH5dgpVd9ztlhFP/Bhq+1slodFz61fz3DkU8rDpTrQKhIYvcNCY2vwhKq12n
-JJN/GoYkTr0NlMmPD+pUr0BMuiic2d5rKQBv5UWNbYoT9gBrujIToVjg45uzqL5S
-RTijkVLaaEAn1KpGCcPr04bXH3ENXJOzF/+wf/GCgcdgNHPbhAblGwSWiPCISzdw
-ep81NcbzNK0XZJLI4dVtJnvr8eE3YyRROe0lT8f7Oa1btTk2n8RNWA6UCdJtAOw3
-A0BHS0jXr1yTM2p2/tqoNbc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.braidense.it/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.braidense.it/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Biblioteca Nazionale Braidense</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Biblioteca Nazionale Braidense</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Biblioteca Nazionale Braidense</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Biblioteca Nazionale Braidense</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.braidense.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.braidense.it/index_en.php</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Staff</md:GivenName>
-    <md:SurName>AAI CILEA</md:SurName>
-    <md:EmailAddress>mailto:staff_aai@cilea.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bridgend.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bridgend.ac.uk-shibboleth.xml
deleted file mode 100644
index 5f5e6ccf..00000000
--- a/swamid-interfederations-2.0/idp.bridgend.ac.uk-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.bridgend.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Bridgend College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">bridgend.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/bridgend.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/bridgend.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bridgend College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bridgend.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bridgeport.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bridgeport.edu-idp-shibboleth.xml
deleted file mode 100644
index 0c155e21..00000000
--- a/swamid-interfederations-2.0/idp.bridgeport.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,91 +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://idp.bridgeport.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">bridgeport.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Bridgeport</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>
-MIIDNDCCAhygAwIBAgIVAJBfTu+adrdocAWNWMrxwsQDwbgMMA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEmlkcC5icmlkZ2Vwb3J0LmVkdTAeFw0xNTAyMTcxNzAy
-MDhaFw0zNTAyMTcxNzAyMDhaMB0xGzAZBgNVBAMMEmlkcC5icmlkZ2Vwb3J0LmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAISnvHsXiLtSfOwZmxMk
-ZWpmFniFsXRUG5G5NJY2SSScW0lVGdiPHQWL8Zr9YmFiAdSyI4oCt3R5I7U+IG1l
-FYhUkPFSr8glxU41G6iFhPBdpW3DNM0dYZeIE4/3ZX4JSaYEEUDtYtL4v2V7+gho
-FXWTu0gKieH4AME2MPBhK9KKeCbK0Lb1GmotenJbytjLQ3g6iTvbxoVxdTEFQgqZ
-eG63w9yxCuc7VikYO9xRSboI9cv4JikOeX0D2WmjwydJnb4qpFg06oImMqt+PdHW
-RyYlrrPj3hPHF1HZpbGtMh+yIC+L9rUDyWtRJbExSbNQpE/y17sQ4PCDHyn0H93o
-4vECAwEAAaNrMGkwHQYDVR0OBBYEFKPBWfXIDrPwfVJvMxMrrwkygF+GMEgGA1Ud
-EQRBMD+CEmlkcC5icmlkZ2Vwb3J0LmVkdYYpaHR0cHM6Ly9pZHAuYnJpZGdlcG9y
-dC5lZHUvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFuGe9J4DqlY
-9jdvpul5xzjlGqDJYh5ieLmDQKd/6El74jknxzBe68Mk2e1kqHtzvtFVWFPn2EES
-nD5P3xQ6Pxgy2TIZtiBRbbajkyVUF7keKjVDP9iUFbW8189wCjgLVtfOhAEnh7eX
-OU6Gs/5IQM4ji4XL9OH9GMTX2JWWPNBgmFgEhSOtQUAglVvVcfBZPNTwuVeF5y/q
-rYyOmoL9mXRqzHMl05ZcI8fUZlT+E/yVPIvs973WwsG5ucJhtRJo1MCDTJvjWw2e
-4b4d7MXdduNZ9DTkP+xKvxcR0/7njMmhDx+2Ziy6RAXD2NPOPoK7qZU0b2RFkGj2
-Je/ZCyY6zCI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bridgeport.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bridgeport.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bridgeport.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bridgeport.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bridgeport.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bridgeport.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAJBfTu+adrdocAWNWMrxwsQDwbgMMA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEmlkcC5icmlkZ2Vwb3J0LmVkdTAeFw0xNTAyMTcxNzAy
-MDhaFw0zNTAyMTcxNzAyMDhaMB0xGzAZBgNVBAMMEmlkcC5icmlkZ2Vwb3J0LmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAISnvHsXiLtSfOwZmxMk
-ZWpmFniFsXRUG5G5NJY2SSScW0lVGdiPHQWL8Zr9YmFiAdSyI4oCt3R5I7U+IG1l
-FYhUkPFSr8glxU41G6iFhPBdpW3DNM0dYZeIE4/3ZX4JSaYEEUDtYtL4v2V7+gho
-FXWTu0gKieH4AME2MPBhK9KKeCbK0Lb1GmotenJbytjLQ3g6iTvbxoVxdTEFQgqZ
-eG63w9yxCuc7VikYO9xRSboI9cv4JikOeX0D2WmjwydJnb4qpFg06oImMqt+PdHW
-RyYlrrPj3hPHF1HZpbGtMh+yIC+L9rUDyWtRJbExSbNQpE/y17sQ4PCDHyn0H93o
-4vECAwEAAaNrMGkwHQYDVR0OBBYEFKPBWfXIDrPwfVJvMxMrrwkygF+GMEgGA1Ud
-EQRBMD+CEmlkcC5icmlkZ2Vwb3J0LmVkdYYpaHR0cHM6Ly9pZHAuYnJpZGdlcG9y
-dC5lZHUvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFuGe9J4DqlY
-9jdvpul5xzjlGqDJYh5ieLmDQKd/6El74jknxzBe68Mk2e1kqHtzvtFVWFPn2EES
-nD5P3xQ6Pxgy2TIZtiBRbbajkyVUF7keKjVDP9iUFbW8189wCjgLVtfOhAEnh7eX
-OU6Gs/5IQM4ji4XL9OH9GMTX2JWWPNBgmFgEhSOtQUAglVvVcfBZPNTwuVeF5y/q
-rYyOmoL9mXRqzHMl05ZcI8fUZlT+E/yVPIvs973WwsG5ucJhtRJo1MCDTJvjWw2e
-4b4d7MXdduNZ9DTkP+xKvxcR0/7njMmhDx+2Ziy6RAXD2NPOPoK7qZU0b2RFkGj2
-Je/ZCyY6zCI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bridgeport.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Bridgeport</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Bridgeport</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://bridgeport.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UB SysAdmin Group</md:GivenName>
-    <md:EmailAddress>sysadmin@bridgeport.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bridgewater.edu-simplesaml.xml b/swamid-interfederations-2.0/idp.bridgewater.edu-simplesaml.xml
deleted file mode 100644
index 9022077a..00000000
--- a/swamid-interfederations-2.0/idp.bridgewater.edu-simplesaml.xml
+++ /dev/null
@@ -1,64 +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://idp.bridgewater.edu/simplesaml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">bridgewater.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Bridgewater College</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>
-MIIEPTCCAyWgAwIBAgIJAII+Q2YNzT28MA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
-VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExFDASBgNVBAcMC0JyaWRnZXdhdGVy
-MRwwGgYDVQQKDBNCcmlkZ2V3YXRlciBDb2xsZWdlMRkwFwYDVQQLDBBOZXR3b3Jr
-IFNlcnZpY2VzMRwwGgYDVQQDDBNpZHAuYnJpZGdld2F0ZXIuZWR1MSUwIwYJKoZI
-hvcNAQkBFhZuZXRzdmNAYnJpZGdld2F0ZXIuZWR1MB4XDTEzMDIxMjE2MjM1MFoX
-DTIzMDIxMjE2MjM1MFowgbQxCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhWaXJnaW5p
-YTEUMBIGA1UEBwwLQnJpZGdld2F0ZXIxHDAaBgNVBAoME0JyaWRnZXdhdGVyIENv
-bGxlZ2UxGTAXBgNVBAsMEE5ldHdvcmsgU2VydmljZXMxHDAaBgNVBAMME2lkcC5i
-cmlkZ2V3YXRlci5lZHUxJTAjBgkqhkiG9w0BCQEWFm5ldHN2Y0BicmlkZ2V3YXRl
-ci5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDl0pc4OXFU/BIH
-nDguV+BRDzx+e6/1xrGCt2Lu0NhtxLUuJ0c1YfNAHFje6GzdMC0TPEUKxvNd1Inh
-5YQsSzWKJd5WnHugGrs/shRR4xM4wDpBKJ70cvaOADxAC2/BPdZb1SsDfkJqTUgi
-7odjIx9G50TnhixhKk71Zn8HTKBYkTDEV1BECJdrtVs0jHNvkC8ZJYYJOvNhWVcS
-2MSbPlrAnvDQgbmjdWbo3K7+bpvlRsckwiBK7LJKKX47TvM59hee09KCZwRcrLOp
-jbIB8JVo9GyaZFppxwDzYGv+nlRmXIKlaVL1ijzGIKYkGFATEHx5XHK15A9yNiHi
-ukU2Hyi/AgMBAAGjUDBOMB0GA1UdDgQWBBTjU+IbTyKzYTAcXKKut7CTO+lADDAf
-BgNVHSMEGDAWgBTjU+IbTyKzYTAcXKKut7CTO+lADDAMBgNVHRMEBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4IBAQCSOMzaE5FQUYK25NU2oFpKjYlBn8XPYm5KDzbP6wez
-nTRWYLwm2PUZNvItzPtydqmfvZhZSLyJ4AwSIsKEFurXESTfm7cWxHKPqgtInIZu
-/3HOe7j1ccthfRMPX7g1rBzYLVIlIEnOSms5NZ9usYa54Xx/252VaE6xU1A3D6jZ
-hqWNeWfsSSUxNSVs79QUGZnXUPnnczpPFqdvxKm7YGKu3Wil1Fc7dCJnFFtDzmTq
-g5qWuTqkZt9Y5cXLfvodkWCrsXZQMwlVZI1E26T0zGN81+uJieXdUrcY3acvAj3S
-cQDTdDSmMKz8ApAZjSXYVuZIfayMuifajRVC8Ls6U91/
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bridgewater.edu/simplesaml/shib13/idp/ArtifactResolutionService.php" index="1"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bridgewater.edu/simplesaml/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bridgewater.edu/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bridgewater.edu/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bridgewater.edu/simplesaml/saml2/idp/ArtifactResolutionService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Bridgewater College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Bridgewater College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bridgewater.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>charles frank</md:GivenName>
-    <md:EmailAddress>cfrank@bridgewater.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brighton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.brighton.ac.uk-shibboleth.xml
deleted file mode 100644
index 221ff9d4..00000000
--- a/swamid-interfederations-2.0/idp.brighton.ac.uk-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.brighton.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Brighton.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">brighton.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Brighton</mdui:DisplayName>
-        <mdui:Logo height="30" width="32">https://idp.brighton.ac.uk/idp/images/logo-brighton.ac.uk.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.brighton.ac.uk/idp/images/favicon-brighton.ac.uk.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAJtTrJ6fUZBDJiA/AL+K10ByMCF5MA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5icmlnaHRvbi5hYy51azAeFw0xMjAxMTExMDE3
-						MzlaFw0zMjAxMTExMDE3MzlaMB0xGzAZBgNVBAMTEmlkcC5icmlnaHRvbi5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK78vKo40NZ7No1AlT01
-						oewusm35cDYzGHmgVI+Blb8Pd1LmwfIIGOTyyOab+3+qV/PTVwTPIjQBRDINhUk6
-						TFZN/AspdbZQhAGLKbW7QAwvJEiHDjEPYpwIByCPz3dr9OM3awLThovrdoegnYg1
-						s+nhT0ub2TI43rYRZds0P1xx8uBBst4Q1dTfeRN3aq2XUtMoR0d5O4fSVpfZ1mBe
-						WZTLlbfrS+j0I5IsCd2EXmKaeIeJtyTr2qIfFk+0RdT5RqI2vt513+zwNHi3dJmb
-						wlR5rQdTphXcQkgsegdvpxom59vRwjvGrwohDwWvjKgAmede4SjRS0Fwbas6wylX
-						fjMCAwEAAaNnMGUwRAYDVR0RBD0wO4ISaWRwLmJyaWdodG9uLmFjLnVrhiVodHRw
-						czovL2lkcC5icmlnaHRvbi5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBSa7vVm
-						ylujM9iFlPHXlbcIG3n5oDANBgkqhkiG9w0BAQUFAAOCAQEAUmCdQF3CHxz5dfbv
-						28Mrc83FzRVCexxa6iHL/lDlsIRxN0M+sN/qj0EovgUh7rYITpCZ30daaawUUbM5
-						j1XOYsvkiAOjYJ/hDwpKm+6Ww+Rl6yhDFTRX5cyDiOwZFIBhTZwkiQ1aJ6xpuDI6
-						BQTHaVODaE+nKb2CKSmozuIejYEvRVxKRQJgzpgv1AaLI0MTwMpk3gVoz5MzPCod
-						JGjYZQTFlvBAGdjsXeKfXxxDk8W+lO2Nb4+gE8HEN1hAXTKRJZW0G1M/wFJ+MSUd
-						7E1eO+mot7dPa60wFfoDkGGIq7OBnXwFjXxBOmrjpr9tEA41vVu4MNQCEG9Omt1y
-						LmAj9g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brighton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brighton.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.brighton.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brighton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brighton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brighton.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">brighton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAJtTrJ6fUZBDJiA/AL+K10ByMCF5MA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5icmlnaHRvbi5hYy51azAeFw0xMjAxMTExMDE3
-						MzlaFw0zMjAxMTExMDE3MzlaMB0xGzAZBgNVBAMTEmlkcC5icmlnaHRvbi5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK78vKo40NZ7No1AlT01
-						oewusm35cDYzGHmgVI+Blb8Pd1LmwfIIGOTyyOab+3+qV/PTVwTPIjQBRDINhUk6
-						TFZN/AspdbZQhAGLKbW7QAwvJEiHDjEPYpwIByCPz3dr9OM3awLThovrdoegnYg1
-						s+nhT0ub2TI43rYRZds0P1xx8uBBst4Q1dTfeRN3aq2XUtMoR0d5O4fSVpfZ1mBe
-						WZTLlbfrS+j0I5IsCd2EXmKaeIeJtyTr2qIfFk+0RdT5RqI2vt513+zwNHi3dJmb
-						wlR5rQdTphXcQkgsegdvpxom59vRwjvGrwohDwWvjKgAmede4SjRS0Fwbas6wylX
-						fjMCAwEAAaNnMGUwRAYDVR0RBD0wO4ISaWRwLmJyaWdodG9uLmFjLnVrhiVodHRw
-						czovL2lkcC5icmlnaHRvbi5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBSa7vVm
-						ylujM9iFlPHXlbcIG3n5oDANBgkqhkiG9w0BAQUFAAOCAQEAUmCdQF3CHxz5dfbv
-						28Mrc83FzRVCexxa6iHL/lDlsIRxN0M+sN/qj0EovgUh7rYITpCZ30daaawUUbM5
-						j1XOYsvkiAOjYJ/hDwpKm+6Ww+Rl6yhDFTRX5cyDiOwZFIBhTZwkiQ1aJ6xpuDI6
-						BQTHaVODaE+nKb2CKSmozuIejYEvRVxKRQJgzpgv1AaLI0MTwMpk3gVoz5MzPCod
-						JGjYZQTFlvBAGdjsXeKfXxxDk8W+lO2Nb4+gE8HEN1hAXTKRJZW0G1M/wFJ+MSUd
-						7E1eO+mot7dPa60wFfoDkGGIq7OBnXwFjXxBOmrjpr9tEA41vVu4MNQCEG9Omt1y
-						LmAj9g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brighton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brighton.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 Brighton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Brighton</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brighton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:servicedesk@brighton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Holden</SurName>
-    <EmailAddress>mailto:ukfederation-tech@brighton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bris.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bris.ac.uk-shibboleth.xml
deleted file mode 100644
index 56618a2e..00000000
--- a/swamid-interfederations-2.0/idp.bris.ac.uk-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://idp.bris.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Bristol. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-09-09T16:18:44Z">
-      <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">bris.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEljCCA36gAwIBAgIQOrmPBwdw3r9jz9aNrrpM0jANBgkqhkiG9w0BAQsFADBk
-						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-						Q0EgMjAeFw0xNDEyMTYwMDAwMDBaFw0xNzEyMTUyMzU5NTlaMDwxITAfBgNVBAsT
-						GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLmJyaXMuYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNcvws6DzheGMeK50J
-						DT/+cCH9lHlzh+Viy2+latyjB7vyqX183o1Nz9z8BX9t/c9svXdu+qmMI99FAUPZ
-						V0LCZnIQfHVpbLiMshtil8Bp/MXziVJsjOhdqE7/EDtEeVGXBwaT/Dfnx/MMv7ez
-						HtW9051m2t6VoxCOcYw9ZBwEeHgHwWhRyq063JJ1sL6juGGOGrWA3VNqxlZR/8Kw
-						JEkLZvSOHIBLkrHQOq8dEA/YaD8peoP4HkGCxrvVGNAsm/PXq7QJGLcPgHbfFPPs
-						6L2rEPECQOLdyJ0j1vbcge/gixIk3mT9rS42XqJucPj0RDNDDL+pbYfEa2l9DAZk
-						U1B/AgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYosP22
-						vTAdBgNVHQ4EFgQUIsFG5x1s52UwPP6n70N14TtRV7AwDgYDVR0PAQH/BAQDAgWg
-						MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
-						A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
-						oCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3JsMGwG
-						CCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1c3Qu
-						Y29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVz
-						ZXJ0cnVzdC5jb20wGQYDVR0RBBIwEIIOaWRwLmJyaXMuYWMudWswDQYJKoZIhvcN
-						AQELBQADggEBAJzI7SxFz5KPYhKkIecGpL3b0DuNyMrXYR1j9gUXWQMLLayTqhFn
-						oiGCsWF2Xa9LdAryGq0vyQWmVg47I5xsBfFVrbaddax9pSw+/1DigFIK956XV3Rr
-						cY4t10ey1wyP8pMjyER+Lrvg1J9+ZKYuRq4+XQO197HbL85OHw1YKLT7pcqCPuZd
-						2C0uQE7Yiv9dPnrzptjMknuk+eDTm1XDKAccz3LoBrOxOAzFlgOxxv2pE7d8lCU/
-						60p76Z72Ue7R6QXHKlr8+eYm6SoERL93VH0x0/qIsWbr54dQnj1BIGdGEMNxg9Ic
-						qlIicnNUlmiEdCe+ehY7lX0ogvFplRO6Kp4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bris.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bris.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.bris.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bris.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bris.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bris.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">bris.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEljCCA36gAwIBAgIQOrmPBwdw3r9jz9aNrrpM0jANBgkqhkiG9w0BAQsFADBk
-						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-						Q0EgMjAeFw0xNDEyMTYwMDAwMDBaFw0xNzEyMTUyMzU5NTlaMDwxITAfBgNVBAsT
-						GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLmJyaXMuYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNcvws6DzheGMeK50J
-						DT/+cCH9lHlzh+Viy2+latyjB7vyqX183o1Nz9z8BX9t/c9svXdu+qmMI99FAUPZ
-						V0LCZnIQfHVpbLiMshtil8Bp/MXziVJsjOhdqE7/EDtEeVGXBwaT/Dfnx/MMv7ez
-						HtW9051m2t6VoxCOcYw9ZBwEeHgHwWhRyq063JJ1sL6juGGOGrWA3VNqxlZR/8Kw
-						JEkLZvSOHIBLkrHQOq8dEA/YaD8peoP4HkGCxrvVGNAsm/PXq7QJGLcPgHbfFPPs
-						6L2rEPECQOLdyJ0j1vbcge/gixIk3mT9rS42XqJucPj0RDNDDL+pbYfEa2l9DAZk
-						U1B/AgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYosP22
-						vTAdBgNVHQ4EFgQUIsFG5x1s52UwPP6n70N14TtRV7AwDgYDVR0PAQH/BAQDAgWg
-						MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
-						A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
-						oCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3JsMGwG
-						CCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1c3Qu
-						Y29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVz
-						ZXJ0cnVzdC5jb20wGQYDVR0RBBIwEIIOaWRwLmJyaXMuYWMudWswDQYJKoZIhvcN
-						AQELBQADggEBAJzI7SxFz5KPYhKkIecGpL3b0DuNyMrXYR1j9gUXWQMLLayTqhFn
-						oiGCsWF2Xa9LdAryGq0vyQWmVg47I5xsBfFVrbaddax9pSw+/1DigFIK956XV3Rr
-						cY4t10ey1wyP8pMjyER+Lrvg1J9+ZKYuRq4+XQO197HbL85OHw1YKLT7pcqCPuZd
-						2C0uQE7Yiv9dPnrzptjMknuk+eDTm1XDKAccz3LoBrOxOAzFlgOxxv2pE7d8lCU/
-						60p76Z72Ue7R6QXHKlr8+eYm6SoERL93VH0x0/qIsWbr54dQnj1BIGdGEMNxg9Ic
-						qlIicnNUlmiEdCe+ehY7lX0ogvFplRO6Kp4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bris.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bris.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 Bristol</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bristol</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bristol.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Naveed</GivenName>
-    <SurName>Hashmi</SurName>
-    <EmailAddress>mailto:Naveed.Hashmi@bristol.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Naveed</GivenName>
-    <SurName>Hashmi</SurName>
-    <EmailAddress>mailto:Naveed.Hashmi@bristol.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.broadinstitute.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.broadinstitute.org-idp-shibboleth.xml
deleted file mode 100644
index 43bffe32..00000000
--- a/swamid-interfederations-2.0/idp.broadinstitute.org-idp-shibboleth.xml
+++ /dev/null
@@ -1,75 +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://idp.broadinstitute.org/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.broadinstitute.org/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">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">broadinstitute.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The Broad Institute of MIT and Harvard</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Authenticates employees and associates of the Broad Institute.</mdui:Description>
-        <mdui:Logo height="100" width="214" xml:lang="en">https://idp.broadinstitute.org/identity/servlet/logo</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>
-MIID4jCCAsoCCQClF9rYNH4miDANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
-VVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMxEjAQBgNVBAcMCUNhbWJyaWRnZTEY
-MBYGA1UECgwPQnJvYWQgSW5zdGl0dXRlMQ0wCwYDVQQLDARCSVRTMR8wHQYDVQQD
-DBZpZHAuYnJvYWRpbnN0aXR1dGUub3JnMS0wKwYJKoZIhvcNAQkBFh53ZWJtYXN0
-ZXJAYnJvYWRpbnN0aXRpdHV0ZS5vcmcwHhcNMTQwNjAyMTIwOTUyWhcNMTkwNjAy
-MTIwOTUyWjCBsjELMAkGA1UEBhMCVVMxFjAUBgNVBAgMDU1hc3NhY2h1c2V0dHMx
-EjAQBgNVBAcMCUNhbWJyaWRnZTEYMBYGA1UECgwPQnJvYWQgSW5zdGl0dXRlMQ0w
-CwYDVQQLDARCSVRTMR8wHQYDVQQDDBZpZHAuYnJvYWRpbnN0aXR1dGUub3JnMS0w
-KwYJKoZIhvcNAQkBFh53ZWJtYXN0ZXJAYnJvYWRpbnN0aXRpdHV0ZS5vcmcwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+uTnE/e9tjrfFrzNzLDyTe7wT
-Eo8eSJa2MczNDbTfzC8mgcMZTPxlp0azAh+dQEJlFgUnXT39xU9WpuZBvM2rBTvR
-eQPJCIr+vX/r7WKT+7b6EoRwR3X65X+TGLuonCixxQrur84TyhqCD03Hi6EGqbxq
-4WNnfCBiftnl3EOndShEz+SIkTtY7i2yxQo8XE9j9pNrQXA5ujYd+ivD+p1IMKyy
-CNPDk0+Clzl2JLsDSaQ21SjgzHtU1bRDsw/MdQXg2VrfvJT5pz87k4/LEcHCUryH
-kpl5svVFKADmo/T18JsEeruyWd7gPpOjdnAbLMt9joMeNiyOEVTzDbeA1WEJAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAE5EsOxsvK3BL5Xulnj7O8d7aBtkA5PL8BIC
-MnVKvxjlbmC8M+cJ82OqnTIC2YuPywHgxsDgDrPt00MoPRdW2jLmpYZwAZ8Q1RTO
-PamR3Bf4PrB7fSLsWkZYxnr5lu9NyY6qhirIDQOte7GQ9/IbF3GtIpeoVgYp5rY+
-4a4IUWjZEZKRhNjAMuqynqqEjKUax47eotoZ96kxopVWPlVGzktyFwArrpm3PcOo
-ERfaoBjWG6QK6bRz1aocVgG9dZOLAX1NxO/hw67JBo9oywbLuCpEwBTPWmz322+e
-aRRs2nf6FLKMWFwZT6JgxR1b9Y4EbOFPTrapEU/56Q09wG5n15A=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.broadinstitute.org/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.broadinstitute.org/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.broadinstitute.org/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.broadinstitute.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Broad Institute of MIT and Harvard</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The Broad Institute of MIT and Harvard</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.broadinstitute.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>InCommon Admin</md:GivenName>
-    <md:EmailAddress>incommon@broadinstitute.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>InCommon Admin</md:GivenName>
-    <md:EmailAddress>incommon@broadinstitute.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>InCommon Admin</md:GivenName>
-    <md:EmailAddress>incommon@broadinstitute.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>InCommon Admin</md:GivenName>
-    <md:EmailAddress>incommon@broadinstitute.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brock.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.brock.ac.uk-entity.xml
deleted file mode 100644
index 0c2de078..00000000
--- a/swamid-interfederations-2.0/idp.brock.ac.uk-entity.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://idp.brock.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for Brockenhurst College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-19T15:11:51Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">brock.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIVANN1qLwgEDjyuLo3Focb4T3EV2gCMA0GCSqGSIb3DQEB
-						BQUAMBoxGDAWBgNVBAMTD2lkcC5icm9jay5hYy51azAeFw0xMzAyMTgwOTA1NDla
-						Fw0zMzAyMTgwOTA1NDlaMBoxGDAWBgNVBAMTD2lkcC5icm9jay5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrnJtQiC1X81M7+DWcfoRnbQG4W
-						6npvaBkLrBFA8ax53ocICKOyJ6GM1lKOKG3D34U7r6KO+vdFk/xKqQ+SOmNc6flx
-						VCv4hyY6hL2I43+XpPYyhVYLdHOBUmhwS1iI/MV2ZBEe2Lde39JwAlsDG1maL7Gm
-						QffCCWkzECXQj4tTCB7A/IjTqchH15ONVQ5E/FLNBoJgMexsOttaF5mriUjeeE0Z
-						NQRTdquqqfUsH1b5fupGBrJ8mAEEvy5Mq2kTCqwjTjLnbSNBCDUeiFNJc2VmH4Fa
-						RHs556u+sB+2/UkV83dfMS90SEJeAVc8dpA5GUWSWOKpC9ucRyc2Zl192SsCAwEA
-						AaNlMGMwQgYDVR0RBDswOYIPaWRwLmJyb2NrLmFjLnVrhiZodHRwczovL2lkcC5i
-						cm9jay5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU87QGKLBQ6rJ9iKC9
-						tMLCBSx1qXUwDQYJKoZIhvcNAQEFBQADggEBAEX8DbfcfkOH6Qx8L35niQuZQA6h
-						6ysVBS9A1rfs2wmBktWJhBAtSx4vfZBervafqstZ75Tf0OOXtjWR2r5HzZKXF7/N
-						wYBpFm/ZeCGIXIWqRMsZTZpaZ1p3VuzXrr5R+LwI3pheNqI9gUMIkXyC4rsI+Dbb
-						VNGTt+C4rwqOvpwY2yEtmYgUffYG6gYi5t/PznbObAUfXNGIrBYdj3qQvNxaTrV4
-						p0qobtoz00+ETWsQ82JOccQ93FWqkzwEAvdD2oc8KDBQgeSLYT2fhppTtmlmSNDk
-						okEJmm6PxABBZBrAZUlLPTzfIG9tQiZD8a/JIrUo8nH3xjQhgMtOuyTLH/c=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brock.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brock.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.brock.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brock.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brock.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brock.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">brock.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIVANN1qLwgEDjyuLo3Focb4T3EV2gCMA0GCSqGSIb3DQEB
-						BQUAMBoxGDAWBgNVBAMTD2lkcC5icm9jay5hYy51azAeFw0xMzAyMTgwOTA1NDla
-						Fw0zMzAyMTgwOTA1NDlaMBoxGDAWBgNVBAMTD2lkcC5icm9jay5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIrnJtQiC1X81M7+DWcfoRnbQG4W
-						6npvaBkLrBFA8ax53ocICKOyJ6GM1lKOKG3D34U7r6KO+vdFk/xKqQ+SOmNc6flx
-						VCv4hyY6hL2I43+XpPYyhVYLdHOBUmhwS1iI/MV2ZBEe2Lde39JwAlsDG1maL7Gm
-						QffCCWkzECXQj4tTCB7A/IjTqchH15ONVQ5E/FLNBoJgMexsOttaF5mriUjeeE0Z
-						NQRTdquqqfUsH1b5fupGBrJ8mAEEvy5Mq2kTCqwjTjLnbSNBCDUeiFNJc2VmH4Fa
-						RHs556u+sB+2/UkV83dfMS90SEJeAVc8dpA5GUWSWOKpC9ucRyc2Zl192SsCAwEA
-						AaNlMGMwQgYDVR0RBDswOYIPaWRwLmJyb2NrLmFjLnVrhiZodHRwczovL2lkcC5i
-						cm9jay5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU87QGKLBQ6rJ9iKC9
-						tMLCBSx1qXUwDQYJKoZIhvcNAQEFBQADggEBAEX8DbfcfkOH6Qx8L35niQuZQA6h
-						6ysVBS9A1rfs2wmBktWJhBAtSx4vfZBervafqstZ75Tf0OOXtjWR2r5HzZKXF7/N
-						wYBpFm/ZeCGIXIWqRMsZTZpaZ1p3VuzXrr5R+LwI3pheNqI9gUMIkXyC4rsI+Dbb
-						VNGTt+C4rwqOvpwY2yEtmYgUffYG6gYi5t/PznbObAUfXNGIrBYdj3qQvNxaTrV4
-						p0qobtoz00+ETWsQ82JOccQ93FWqkzwEAvdD2oc8KDBQgeSLYT2fhppTtmlmSNDk
-						okEJmm6PxABBZBrAZUlLPTzfIG9tQiZD8a/JIrUo8nH3xjQhgMtOuyTLH/c=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brock.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brock.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">Brockenhurst College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brockenhurst College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brock.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Shepherd</SurName>
-    <EmailAddress>mailto:pshepherd@brock.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Shepherd</SurName>
-    <EmailAddress>mailto:pshepherd@brock.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brookehouse.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.brookehouse.ac.uk-openathens.xml
deleted file mode 100644
index 129b10ca..00000000
--- a/swamid-interfederations-2.0/idp.brookehouse.ac.uk-openathens.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.brookehouse.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Brooke House Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">brookehouse.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/brookehouse.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/brookehouse.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bsix Brooke House Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brookehouse.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brookes.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.brookes.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 32b4637e..00000000
--- a/swamid-interfederations-2.0/idp.brookes.ac.uk-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.brookes.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Oxford Brookes University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-24T15:34:16Z">
-      <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">brookes.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAJUaJYwXesdgxfeIuyhEEzVnxSpLMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEWlkcC5icm9va2VzLmFjLnVrMB4XDTEyMTAyMzEwNTUz
-						NFoXDTMyMTAyMzEwNTUzNFowHDEaMBgGA1UEAxMRaWRwLmJyb29rZXMuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWkInyc7OtvgQF9bYDoP1+
-						DUiDKJBZBCzzK6soKUD6WGVcKUsqN9ACyKj/i0kYEMigaYZE3XSLYENrWxA+sPbd
-						KW6V1ko3TDzmJF/COoCMXUHWsp5JK8HWO5NncY6ruapEYdkjBpUN0LKJBaQBvbz8
-						teaQ6LXt7zFm67+9B2GCsRd7WO3snUVNtiD2/7Q6lfCl5MnCzDex0xRZwHkN358n
-						F5kAMhl8+dX+O4hzMiCeMSxyh4exQoGE6kPUy4v/1v74EVmnhHZfmF0Wb05QIESL
-						671BS0ztGBPPHmgmyfM3uwRYqp0kIiZRU+vSHMZn1w7pad42O+HDjW5CTbONEhNb
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5icm9va2VzLmFjLnVrhihodHRwczov
-						L2lkcC5icm9va2VzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBShqU0t
-						7KfNrqRSbJXdLu1nKL5U9zANBgkqhkiG9w0BAQUFAAOCAQEALY66hUj/NgEuTmQB
-						38jSG6Cy8Po8btADRxDq21TpoBoP0yqQRk/7dgB/9xa3kYDTJHrhA8FD1Piv+tDZ
-						P8Nx/6hJwDn0GIIonx3Kxkn1PYmUsG8tQAmIBXGN+g1X/gjKcKrAPCyWqGzrqRuX
-						o8KO6F6oQ8P6q6XVkJVEEAus2dkzJg1BxLxbWR9h9rEH2UCjWrTAgCSi0nRaqpZk
-						tx+h/tvZMJljItE3iOWjnxOagFweI1EUoGW1JCaTCl/MCB+jGG45W7JCWqSqI/CQ
-						XY8id/1W4LtBx8ydd17dZx5v8SV8fXIsoO46FfPns3K/B104YQm2mqDyqvkHQMbq
-						doYQJw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brookes.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brookes.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.brookes.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brookes.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.brookes.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brookes.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brookes.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">brookes.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAJUaJYwXesdgxfeIuyhEEzVnxSpLMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEWlkcC5icm9va2VzLmFjLnVrMB4XDTEyMTAyMzEwNTUz
-						NFoXDTMyMTAyMzEwNTUzNFowHDEaMBgGA1UEAxMRaWRwLmJyb29rZXMuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWkInyc7OtvgQF9bYDoP1+
-						DUiDKJBZBCzzK6soKUD6WGVcKUsqN9ACyKj/i0kYEMigaYZE3XSLYENrWxA+sPbd
-						KW6V1ko3TDzmJF/COoCMXUHWsp5JK8HWO5NncY6ruapEYdkjBpUN0LKJBaQBvbz8
-						teaQ6LXt7zFm67+9B2GCsRd7WO3snUVNtiD2/7Q6lfCl5MnCzDex0xRZwHkN358n
-						F5kAMhl8+dX+O4hzMiCeMSxyh4exQoGE6kPUy4v/1v74EVmnhHZfmF0Wb05QIESL
-						671BS0ztGBPPHmgmyfM3uwRYqp0kIiZRU+vSHMZn1w7pad42O+HDjW5CTbONEhNb
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5icm9va2VzLmFjLnVrhihodHRwczov
-						L2lkcC5icm9va2VzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBShqU0t
-						7KfNrqRSbJXdLu1nKL5U9zANBgkqhkiG9w0BAQUFAAOCAQEALY66hUj/NgEuTmQB
-						38jSG6Cy8Po8btADRxDq21TpoBoP0yqQRk/7dgB/9xa3kYDTJHrhA8FD1Piv+tDZ
-						P8Nx/6hJwDn0GIIonx3Kxkn1PYmUsG8tQAmIBXGN+g1X/gjKcKrAPCyWqGzrqRuX
-						o8KO6F6oQ8P6q6XVkJVEEAus2dkzJg1BxLxbWR9h9rEH2UCjWrTAgCSi0nRaqpZk
-						tx+h/tvZMJljItE3iOWjnxOagFweI1EUoGW1JCaTCl/MCB+jGG45W7JCWqSqI/CQ
-						XY8id/1W4LtBx8ydd17dZx5v8SV8fXIsoO46FfPns3K/B104YQm2mqDyqvkHQMbq
-						doYQJw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brookes.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brookes.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">Oxford Brookes University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oxford Brookes University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brookes.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:servicedesk@brookes.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>OBIS Sysadmin</GivenName>
-    <EmailAddress>mailto:obis-sysadmin@brookes.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brooklands.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.brooklands.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 95310d65..00000000
--- a/swamid-interfederations-2.0/idp.brooklands.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.brooklands.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Brooklands College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-13T13:27:34Z">
-      <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">brooklands.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUXTHSnL92ioEhfn9CpPYcgVRrCm0wDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUaWRwLmJyb29rbGFuZHMuYWMudWswHhcNMTQwNTI4MTM1
-						OTQ3WhcNMzQwNTI4MTM1OTQ3WjAfMR0wGwYDVQQDExRpZHAuYnJvb2tsYW5kcy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK52gpxhDNJWpaRz
-						rgnCHXO9t7IgexRTKM3V2IPmsj/kVRGcnYjCrD9BI54sjWuYuNtknVmvu4XSc6pq
-						qQyK5mQKqfBuenloi/RtOuOzdspu7DnQ85WDaln6Enhtxr0D/ZsUEZwBupltWVv9
-						9REW2YFliMNir7g/uW3BDmAMjOpkbi8ee5zG7TbBzyIOYZqTo0evLF2u2BRY54HL
-						CBKxSfNXmglhD8IHvj0Z7fbWMKODuZQ4ZKdy0UTxVFyrshcZXV2Qx7NGAnPgIRLA
-						VOD4Q+NyeV4lJZ5d6n/Jz9Aja4QaERIVum5nN8Y0lg2lYRZLJjEr39EepGWXPgQk
-						+clOFysCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLmJyb29rbGFuZHMuYWMudWuG
-						K2h0dHBzOi8vaWRwLmJyb29rbGFuZHMuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFJUptrrUSg7zjWY1J4ZMTmZIsuFPMA0GCSqGSIb3DQEBBQUAA4IBAQCZ
-						0U77Z4Eqi/I+xBREEDxCkLzqb3wPGIcOQ7S1K12/mtFOnTSM0v4N/OGBtQZOtPjp
-						Cr2TRcibo93Cs3RW3NaDsARpeluuZmJWrIGnRnKustgGmqqfHFSpYfD8kcWZHiRr
-						Ss1wyDGmprH2xyySRH0mSAwwz9tFYT+k31PI52hiP3n0zJh9SC3p3nWyGEsj6lMW
-						93ledG58FkdklzARJiruUuAYZwAxCER7VdxCjb+Do6YSu5cNdXIk8ZH8AQsigAp6
-						558y9UPG4tE2GRueRJyjyH+6orKixPCF4f2DHJ+wKqITQ8n1xfpTFcvDw/Zo0GZL
-						u4XG40SUQeuZ0sZZHe+V
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brooklands.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brooklands.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.brooklands.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brooklands.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.brooklands.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brooklands.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brooklands.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">brooklands.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUXTHSnL92ioEhfn9CpPYcgVRrCm0wDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUaWRwLmJyb29rbGFuZHMuYWMudWswHhcNMTQwNTI4MTM1
-						OTQ3WhcNMzQwNTI4MTM1OTQ3WjAfMR0wGwYDVQQDExRpZHAuYnJvb2tsYW5kcy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK52gpxhDNJWpaRz
-						rgnCHXO9t7IgexRTKM3V2IPmsj/kVRGcnYjCrD9BI54sjWuYuNtknVmvu4XSc6pq
-						qQyK5mQKqfBuenloi/RtOuOzdspu7DnQ85WDaln6Enhtxr0D/ZsUEZwBupltWVv9
-						9REW2YFliMNir7g/uW3BDmAMjOpkbi8ee5zG7TbBzyIOYZqTo0evLF2u2BRY54HL
-						CBKxSfNXmglhD8IHvj0Z7fbWMKODuZQ4ZKdy0UTxVFyrshcZXV2Qx7NGAnPgIRLA
-						VOD4Q+NyeV4lJZ5d6n/Jz9Aja4QaERIVum5nN8Y0lg2lYRZLJjEr39EepGWXPgQk
-						+clOFysCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLmJyb29rbGFuZHMuYWMudWuG
-						K2h0dHBzOi8vaWRwLmJyb29rbGFuZHMuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFJUptrrUSg7zjWY1J4ZMTmZIsuFPMA0GCSqGSIb3DQEBBQUAA4IBAQCZ
-						0U77Z4Eqi/I+xBREEDxCkLzqb3wPGIcOQ7S1K12/mtFOnTSM0v4N/OGBtQZOtPjp
-						Cr2TRcibo93Cs3RW3NaDsARpeluuZmJWrIGnRnKustgGmqqfHFSpYfD8kcWZHiRr
-						Ss1wyDGmprH2xyySRH0mSAwwz9tFYT+k31PI52hiP3n0zJh9SC3p3nWyGEsj6lMW
-						93ledG58FkdklzARJiruUuAYZwAxCER7VdxCjb+Do6YSu5cNdXIk8ZH8AQsigAp6
-						558y9UPG4tE2GRueRJyjyH+6orKixPCF4f2DHJ+wKqITQ8n1xfpTFcvDw/Zo0GZL
-						u4XG40SUQeuZ0sZZHe+V
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brooklands.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brooklands.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">Brooklands College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brooklands College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brooklands.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Vicky</GivenName>
-    <SurName>Wright</SurName>
-    <EmailAddress>mailto:vicky.wright@brooklands.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Roy</GivenName>
-    <SurName>Pachnanda</SurName>
-    <EmailAddress>mailto:roy.pachnanda@brooklands.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.xml
deleted file mode 100644
index 47d57e46..00000000
--- a/swamid-interfederations-2.0/idp.brunel.ac.uk-entity.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.brunel.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for Brunel University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-23T11:55: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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Brunel University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Brunel University identity provider</mdui:Description>
-        <mdui:Logo height="60" width="80">https://idp.brunel.ac.uk/logo/80x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.brunel.ac.uk/logo/16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>134.83.0.0/16</mdui:IPHint>
-      </mdui:DiscoHints>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brunel.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAgygAwIBAgIVAN2ITPb7HnQnnS6Q5lFqSQWjQjlUMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC5icnVuZWwuYWMudWswHhcNMTMwODE5MTE0NzE5
-						WhcNMzMwODE5MTE0NzE5WjAbMRkwFwYDVQQDExBpZHAuYnJ1bmVsLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnkfBXFS9PX/FYzw7I/LYOOn9
-						gkCpLbs8qI8QuyxJ2klbG9RdImTz7R+WrBmAHHoaqkyOSOJYAtBb7Gh+IaD8VsvV
-						GrmQt2eJJ5KKxJnam+GLg9bfJSQ5d+vnyWEubMyCRYUCFig8QTTplK6Izum0Er6L
-						pON/bhJeGZiUp6zoXQaQ81jWS+/qS6hH960SxrTdqRl8E8ZJa9pRYCPUYLbUUoNt
-						Oewf5CD62CUTJIyk2wiz6oczWbNzkvk4ZVtccFEKdnH4G12edZzU9dLZAlquVFm5
-						ofSZecXeNdcpzGC1gqmJVHVKRq18aKi0SHnQLs9yom4XZ4smDSatESalOHvXVQID
-						AQABo18wXTA8BgNVHREENTAzghBpZHAuYnJ1bmVsLmFjLnVrhh9odHRwczovL2lk
-						cC5icnVuZWwuYWMudWsvZW50aXR5MB0GA1UdDgQWBBSjsC6Rm0NkXec+MLFab1O1
-						BuP5IjANBgkqhkiG9w0BAQUFAAOCAQEAnX5jlFGsB2NFZO4VsQAp4IUNn46lxGfP
-						wNJHiDFKI8CB95C/LSPZjn0VVZxZgvNZrSmd+fWEsevpPymn2fme+sTHVog8zO+w
-						PWmhIUfskbfJ02l3/AwtWkAougMAd5uf1j8cnNY9qjiyS459TYmz0/R5le53V8E7
-						nAH57apwn9GHm9SQ06K/kP5ayMskIkptz/Bhi815NVoI5F3stNyu6oBVT4xKVXCN
-						3UdINWCXCsiS4l3wREpoNON+ZcAxX+Y7PhvkYQD4XwKMZ3lXfWOHEDhzaeReClWi
-						VSQUpuMp4dipeRerfQ1jhB9bZ0t09/Omp2wA2PqPJqtrQT48fpBTxA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brunel.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.brunel.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brunel.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.brunel.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.brunel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brunel.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">brunel.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAgygAwIBAgIVAN2ITPb7HnQnnS6Q5lFqSQWjQjlUMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC5icnVuZWwuYWMudWswHhcNMTMwODE5MTE0NzE5
-						WhcNMzMwODE5MTE0NzE5WjAbMRkwFwYDVQQDExBpZHAuYnJ1bmVsLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnkfBXFS9PX/FYzw7I/LYOOn9
-						gkCpLbs8qI8QuyxJ2klbG9RdImTz7R+WrBmAHHoaqkyOSOJYAtBb7Gh+IaD8VsvV
-						GrmQt2eJJ5KKxJnam+GLg9bfJSQ5d+vnyWEubMyCRYUCFig8QTTplK6Izum0Er6L
-						pON/bhJeGZiUp6zoXQaQ81jWS+/qS6hH960SxrTdqRl8E8ZJa9pRYCPUYLbUUoNt
-						Oewf5CD62CUTJIyk2wiz6oczWbNzkvk4ZVtccFEKdnH4G12edZzU9dLZAlquVFm5
-						ofSZecXeNdcpzGC1gqmJVHVKRq18aKi0SHnQLs9yom4XZ4smDSatESalOHvXVQID
-						AQABo18wXTA8BgNVHREENTAzghBpZHAuYnJ1bmVsLmFjLnVrhh9odHRwczovL2lk
-						cC5icnVuZWwuYWMudWsvZW50aXR5MB0GA1UdDgQWBBSjsC6Rm0NkXec+MLFab1O1
-						BuP5IjANBgkqhkiG9w0BAQUFAAOCAQEAnX5jlFGsB2NFZO4VsQAp4IUNn46lxGfP
-						wNJHiDFKI8CB95C/LSPZjn0VVZxZgvNZrSmd+fWEsevpPymn2fme+sTHVog8zO+w
-						PWmhIUfskbfJ02l3/AwtWkAougMAd5uf1j8cnNY9qjiyS459TYmz0/R5le53V8E7
-						nAH57apwn9GHm9SQ06K/kP5ayMskIkptz/Bhi815NVoI5F3stNyu6oBVT4xKVXCN
-						3UdINWCXCsiS4l3wREpoNON+ZcAxX+Y7PhvkYQD4XwKMZ3lXfWOHEDhzaeReClWi
-						VSQUpuMp4dipeRerfQ1jhB9bZ0t09/Omp2wA2PqPJqtrQT48fpBTxA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brunel.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">Brunel University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brunel University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brunel.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Computing Support</GivenName>
-    <EmailAddress>mailto:Computing-Support@brunel.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Web</GivenName>
-    <EmailAddress>mailto:sysweb@brunel.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.brynmawr.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.brynmawr.edu-idp-shibboleth.xml
deleted file mode 100644
index fdd0b41a..00000000
--- a/swamid-interfederations-2.0/idp.brynmawr.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://idp.brynmawr.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">brynmawr.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Bryn Mawr College</mdui:DisplayName>
-        <mdui:Logo height="89" width="325" xml:lang="en">https://idp.brynmawr.edu/idp/images/logo.jpg</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>
-MIIDLDCCAhSgAwIBAgIVAMZQic8OVtgucOwzh/ScyVxJkqleMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcC5icnlubWF3ci5lZHUwHhcNMTQwNjEyMTUzNDEw
-WhcNMzQwNjEyMTUzNDEwWjAbMRkwFwYDVQQDExBpZHAuYnJ5bm1hd3IuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0WTH1kLr4ttRM/+0iFLGE+xG
-hlwgOKVjQL8yG5nBp/mFRV8kwZB5u6iOEcUfibRUvlDg2oXwMNtEbj0ieNBg8BC4
-7l3/Y7SYc70b7gB6vwzFGvzbYpro15RoJQn3HyEcAIT14sJ29cO/o4PUjvkp3Awd
-DsoekKLpGBHwnYhlr4MSBs/pWrpVXYhpJhtCr3ZcgD3lnEKXkrwFJ+/CTti2MvTy
-p6qg2znoLPtfjBi7PtkMyrNUpb7x1Ug6QszCU77bVD8QURqgTkb3mXVei2y+0zvV
-Da6gpiDeCF4KAzaY/6mZHJ//qySQlIE5h+88POfENbIOAKcisjNht9a7XbPhcQID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuYnJ5bm1hd3IuZWR1hidodHRwczovL2lk
-cC5icnlubWF3ci5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFr80dQNdVOL
-O13FO9DjVgsJgFZkMA0GCSqGSIb3DQEBBQUAA4IBAQBcJI4BqqaP7eCXOtlkUxpZ
-bUzqc/24RN20Fnp/Tva35Tnpd2XwNlRTILmmRJ1Zt525ikKTFz7zzCZFg/TuGasA
-GdOEqebquuPlInkU0QShR35azgopDRLT+xT6D0kk+Mcb6R6RcuhJJX6qncnOpxBn
-7ua73b32Yv4S+YEmXa4iZ7X9k2Su5xHXoGzcI25J2XRA7PSUhpS4XtaZ/hv9Jbz7
-Ei862+zrJ/dFHIW9QSPKAXPKbHd6e7dhkcNu338z+lbiat4i809Q66vNdYFwSSKD
-zLCYZhlk3ldpmygjFF5SpsEJjBIkDYxwiFYAzGQcDIawRMw21Gh3LJ2GRYUtIyrL
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brynmawr.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.brynmawr.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.brynmawr.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.brynmawr.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.brynmawr.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brynmawr.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIGPzCCBSegAwIBAgIQCKxWt74u7PaFnYsZWE0RpTANBgkqhkiG9w0BAQsFADBE
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMR4wHAYDVQQDExV0
-aGF3dGUgRVYgU1NMIENBIC0gRzMwHhcNMTUwNTI4MDAwMDAwWhcNMTYwNjI2MjM1
-OTU5WjCB7zETMBEGCysGAQQBgjc8AgEDEwJVUzEdMBsGCysGAQQBgjc8AgECDAxQ
-ZW5uc3lsdmFuaWExGjAYBgNVBAoMEUJyeW4gTWF3ciBDb2xsZWdlMQswCQYDVQQG
-EwJVUzEVMBMGA1UECAwMUGVubnN5bHZhbmlhMRIwEAYDVQQHDAlCcnluIE1hd3Ix
-GjAYBgNVBA8TEUdvdmVybm1lbnQgRW50aXR5MQ8wDQYDVQQFEwY2MzMwMzkxHTAb
-BgNVBAsMFEluZm9ybWF0aW9uIFNlcnZpY2VzMRkwFwYDVQQDDBBpZHAuYnJ5bm1h
-d3IuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl27VxxThM7OF
-3Wqnix4tmw+I5tWvOMLSNG4hUmYuf4HoUJ9R7XnN/OZiIa4Ba8y9usufGjlH2cjf
-FNTw3PyqkCOhJ9A80/i0oDtV/aCmAUHvaYSUPxHABMFLwbxjmPAQcWv9dGCuWOD6
-svES5t+YLFFMO9NUw8B/X2YqGj7zAq09xbiqkel4tRr4OJtX+P53n1aS2q31HgYz
-OOGuddmdHD5eaA9ZFPo23ZCcLXFZ8HvV4/DBn5b0FhXKrA857nsSnP/MlOTnRcok
-ddb6HgnzXWt0czBW2wj0pRaGWeNac5Mjil/MGzgcZ0zFju7rcY09KdmZDe0dcuXB
-9QgQRZgkZwIDAQABo4ICfzCCAnswGwYDVR0RBBQwEoIQaWRwLmJyeW5tYXdyLmVk
-dTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIFoDArBgNVHR8EJDAiMCCgHqAchhpo
-dHRwOi8vdGkuc3ltY2IuY29tL3RpLmNybDBzBgNVHSAEbDBqMGgGC2CGSAGG+EUB
-BzABMFkwJgYIKwYBBQUHAgEWGmh0dHBzOi8vd3d3LnRoYXd0ZS5jb20vY3BzMC8G
-CCsGAQUFBwICMCMMIWh0dHBzOi8vd3d3LnRoYXd0ZS5jb20vcmVwb3NpdG9yeTAd
-BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAU8HBR2tMq
-kU9Sd9eGd3QPznEabCIwVwYIKwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNodHRw
-Oi8vdGkuc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8vdGkuc3ltY2IuY29t
-L3RpLmNydDCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2AKS5CZC0GFgUh7sTosxn
-cAo8NZgE+RvfuON3zQ7IDdwQAAABTZu8EsAAAAQDAEcwRQIgNxUBjyLe4AvGjHh/
-xoORLUdt4bQZSmUeQUjHCfmCMwcCIQCSRxV7XBV5uxuO0hegmtqqK1lysAhTLoab
-Ix3pc7C7RAB2AFYUBpov18Ls0/XhvUSyPsdGdrm8mRFcwO+UmFXWidDdAAABTZu8
-E4YAAAQDAEcwRQIhAPVTKyWqPr9Mr6gJ7Sf4GIGwnMvzQwTkrovxI9iJvNy4AiAl
-wc0/fu1htlgpsQ0gVl0h0pB3vDIgMzTvmmcSNXeM1jANBgkqhkiG9w0BAQsFAAOC
-AQEAC3ee1Ad7L1ZUa8HdBAEU+BJ5JE3QvYxyP8yN5kwZxZi8mKZe5/qq3myIzpzD
-kArM8AgvLibKGPSQy6/zPmYeZ1seDZGgR9SJxFLWc0ncJewvE9Whz7D7T10+ZRZT
-XVyJZnZq/pdlHOqwEwEPgNv7tgrBIl1OR4W0cOjHpL+EFpIIrgbiCnhaRnmIF8uL
-5+nz1Oo/ySxCZkbgvHhSAjQGtLbDj4Tn9zksncaa5BNzug+73FqyxLkFPJY0hpzn
-YbJymzZUJQrdF0OsNdwIvWD52OiT9leFj9lR1BTkVyeEsrQO8UOiTCsQSo4igNHi
-PgfUnmesa3ddg0twrkz5l+SIJw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.brynmawr.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Bryn Mawr College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Bryn Mawr College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.brynmawr.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andrew Chiarello</md:GivenName>
-    <md:EmailAddress>achiarello@brynmawr.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Bryn Mawr Help Desk</md:GivenName>
-    <md:EmailAddress>help@brynmawr.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David Bertagni</md:GivenName>
-    <md:EmailAddress>dbertagni@brynmawr.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bsb-muenchen.de.xml b/swamid-interfederations-2.0/idp.bsb-muenchen.de.xml
deleted file mode 100644
index 5874bd26..00000000
--- a/swamid-interfederations-2.0/idp.bsb-muenchen.de.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bsb-muenchen.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">bsb-muenchen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.bsb-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.bsb-muenchen.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFyzCCBLOgAwIBAgIEDqnUpjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNVBAoT
-G0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJpc2No
-ZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG9w0B
-CQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMDkwODE4MDcyNDA2WhcNMTQwODE3
-MDcyNDA2WjCBmzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UE
-BxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhl
-azEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRwwGgYDVQQD
-ExNpZHAuYnNiLW11ZW5jaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAu10Ex/QDbubmYK1QWLogPhfddcwJGVyBH7lsuQ9okyOZ7dO4aw3re1Ls
-XFxWLtxGibDTotM0IuPzZ1up8K8YU22TJMmZEGkaGg1BOtv98und18UnHeR6FBUJ
-cjWrP/Id4uBQQRbrRuxbZaNQn/OAMiKfot+E0TeCUGyoobvrpMtzn7G33UhFpyLO
-GkyFC14hs/OA7KXpBNouRxYBc0wwUCFxBXZ1E5T9VgWF/x9KvcRKJTsSs/nATcBL
-mAbazCqBbh4yHf4w4WVgddQKergqzdFG1e8CqaQB+0B6Gu+TD/5RKjLM5N/vcjZE
-dtTMu/vVVWVDJcntAgUNv1xMnxJ65wIDAQABo4IB/DCCAfgwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBRSCVCYWkX6bfOd5rKzPx+gWDFMvzAfBgNVHSMEGDAWgBR6Z4xbGhNEgrMh
-WhsqivOfMeDEYTCBsQYDVR0fBIGpMIGmMFGgT6BNhktodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Ny
-bC9jYWNybC5jcmwwUaBPoE2GS2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5ZXJp
-c2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB
-ygYIKwYBBQUHAQEEgb0wgbowWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABxaMl/VzI0WspTpteSwMtN3
-McavKK8g1O/hp7yL5ke+QNKS/rLcwbpNn0nZWSjY8Lu+CooyYlKtjT2vbCP2ZIgF
-PflxBL0K1IKuLSbQVYywpAhA9n3V4zWSYqusJgtCcrPQNC5ZSCbaLcdqWKhp5R2q
-xQzo7ZZnuN5FbV4tJJKILTq5LSVVGoAqc3dN+kEvsha+du9rMqY2ts0Y/iT/FaW/
-elX553R4xhOC0PPNdI8GjqXe/xUOVZPDXHzyeyX2651fJCvF2jlsi5dJBvzAHwcT
-3882V6QluB2+yQigVZFHih/MT03/XDkWQGzb/TdbD7RlKAcb7Ft8UP9ZTzXDXn8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://elektra-idp.bsb-muenchen.de:8443/shibboleth/Artifact" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bsb-muenchen.de/shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">bsb-muenchen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.bsb-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.bsb-muenchen.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFyzCCBLOgAwIBAgIEDqnUpjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNVBAoT
-G0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJpc2No
-ZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG9w0B
-CQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMDkwODE4MDcyNDA2WhcNMTQwODE3
-MDcyNDA2WjCBmzELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UE
-BxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhl
-azEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRwwGgYDVQQD
-ExNpZHAuYnNiLW11ZW5jaGVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAu10Ex/QDbubmYK1QWLogPhfddcwJGVyBH7lsuQ9okyOZ7dO4aw3re1Ls
-XFxWLtxGibDTotM0IuPzZ1up8K8YU22TJMmZEGkaGg1BOtv98und18UnHeR6FBUJ
-cjWrP/Id4uBQQRbrRuxbZaNQn/OAMiKfot+E0TeCUGyoobvrpMtzn7G33UhFpyLO
-GkyFC14hs/OA7KXpBNouRxYBc0wwUCFxBXZ1E5T9VgWF/x9KvcRKJTsSs/nATcBL
-mAbazCqBbh4yHf4w4WVgddQKergqzdFG1e8CqaQB+0B6Gu+TD/5RKjLM5N/vcjZE
-dtTMu/vVVWVDJcntAgUNv1xMnxJ65wIDAQABo4IB/DCCAfgwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBRSCVCYWkX6bfOd5rKzPx+gWDFMvzAfBgNVHSMEGDAWgBR6Z4xbGhNEgrMh
-WhsqivOfMeDEYTCBsQYDVR0fBIGpMIGmMFGgT6BNhktodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Ny
-bC9jYWNybC5jcmwwUaBPoE2GS2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5ZXJp
-c2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB
-ygYIKwYBBQUHAQEEgb0wgbowWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABxaMl/VzI0WspTpteSwMtN3
-McavKK8g1O/hp7yL5ke+QNKS/rLcwbpNn0nZWSjY8Lu+CooyYlKtjT2vbCP2ZIgF
-PflxBL0K1IKuLSbQVYywpAhA9n3V4zWSYqusJgtCcrPQNC5ZSCbaLcdqWKhp5R2q
-xQzo7ZZnuN5FbV4tJJKILTq5LSVVGoAqc3dN+kEvsha+du9rMqY2ts0Y/iT/FaW/
-elX553R4xhOC0PPNdI8GjqXe/xUOVZPDXHzyeyX2651fJCvF2jlsi5dJBvzAHwcT
-3882V6QluB2+yQigVZFHih/MT03/XDkWQGzb/TdbD7RlKAcb7Ft8UP9ZTzXDXn8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsb-muenchen.de:8443/shibboleth/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">BSB München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://elektra.bsb-muenchen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Wunderle</GivenName>
-    <SurName>Heinrich</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Wunderle</GivenName>
-    <SurName>Heinrich</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bsms.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.bsms.ac.uk-shibboleth.xml
deleted file mode 100644
index 28b0464d..00000000
--- a/swamid-interfederations-2.0/idp.bsms.ac.uk-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.bsms.ac.uk/shibboleth">
-  <!--
-		This is a "Brighton and Sussex Medical School" Shibboleth IdP for the University of Brighton.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">brighton.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Brighton and Sussex Medical School</mdui:DisplayName>
-        <mdui:Logo height="63" width="40">https://idp.bsms.ac.uk/idp/images/logo-bsms.ac.uk.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.bsms.ac.uk/idp/images/favicon-bsms.ac.uk.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUVPdR3/QgLrYLEH5e7QfhKE8r9VkwDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOaWRwLmJzbXMuYWMudWswHhcNMTIwMTExMTAxNzQ5WhcN
-						MzIwMTExMTAxNzQ5WjAZMRcwFQYDVQQDEw5pZHAuYnNtcy5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALnAV+wrTxO7xJI38Rgiug18H58qBLB0
-						6WuUwpUieb4FL263NiSvFn/PF2JLjTUx/1/B2JHyfaDxFpgco9PjQvOizTW4VRHV
-						T4Oh5anJHbMPzECm1MgxqBS8RXSuqBiTWXMCZG3X84Qq6BzGuAzEOh05JFx9xn3K
-						e8u3LTAFDiQS/Ig9u80NER1Coc0D8YXIsP+2A5XzfZ+o15aPPMaj+4oiKYzHj078
-						vGA5krpb8hevv0n0meUo1iadCA5GUaGqEmV3J6mSHAE/28/ehFdj2SN4b5AkBsNa
-						NvQ30i0ZZbMzV2F4LnJ0lIM+7Q73dfVS1IdUrH/e02ahbJal4ez5v2MCAwEAAaNf
-						MF0wPAYDVR0RBDUwM4IOaWRwLmJzbXMuYWMudWuGIWh0dHBzOi8vaWRwLmJzbXMu
-						YWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUNEeuu+lzrJ9Cm/bRaeX/5qVeEsIw
-						DQYJKoZIhvcNAQEFBQADggEBAA6T6+dtIoK6TMsHCgocxshlDa/fkPVc4QxVuf7+
-						gqEGqiSdKs559ttMw12onBtfqEgLippyVo9M0mi8Xu5/iid+BYQrPKPh0ibVMaik
-						msKZhO1AlmgGwi0ZosGVywcVeYnADEuDYMAO3ENEOzcs3nwYrHgoPUT8ozEoWRfU
-						36CbxIdpBxW9E8KbPY9ILo6EH/AeaPY9HNklJr/oaWYgFyHlasMruZrD77mgNwCI
-						r2gkn2ffy5Z/2izMU7nHRjO8z93LBHAsUlZK1qdbnKQa9ft5SEqVl22Ww/xWvrCD
-						DCf9hZ/XDTkhfXkdFY4uujO+3Qqlin9ufSQG5VHzUVZ4knc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsms.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsms.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.bsms.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bsms.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bsms.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bsms.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">brighton.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUVPdR3/QgLrYLEH5e7QfhKE8r9VkwDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOaWRwLmJzbXMuYWMudWswHhcNMTIwMTExMTAxNzQ5WhcN
-						MzIwMTExMTAxNzQ5WjAZMRcwFQYDVQQDEw5pZHAuYnNtcy5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALnAV+wrTxO7xJI38Rgiug18H58qBLB0
-						6WuUwpUieb4FL263NiSvFn/PF2JLjTUx/1/B2JHyfaDxFpgco9PjQvOizTW4VRHV
-						T4Oh5anJHbMPzECm1MgxqBS8RXSuqBiTWXMCZG3X84Qq6BzGuAzEOh05JFx9xn3K
-						e8u3LTAFDiQS/Ig9u80NER1Coc0D8YXIsP+2A5XzfZ+o15aPPMaj+4oiKYzHj078
-						vGA5krpb8hevv0n0meUo1iadCA5GUaGqEmV3J6mSHAE/28/ehFdj2SN4b5AkBsNa
-						NvQ30i0ZZbMzV2F4LnJ0lIM+7Q73dfVS1IdUrH/e02ahbJal4ez5v2MCAwEAAaNf
-						MF0wPAYDVR0RBDUwM4IOaWRwLmJzbXMuYWMudWuGIWh0dHBzOi8vaWRwLmJzbXMu
-						YWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUNEeuu+lzrJ9Cm/bRaeX/5qVeEsIw
-						DQYJKoZIhvcNAQEFBQADggEBAA6T6+dtIoK6TMsHCgocxshlDa/fkPVc4QxVuf7+
-						gqEGqiSdKs559ttMw12onBtfqEgLippyVo9M0mi8Xu5/iid+BYQrPKPh0ibVMaik
-						msKZhO1AlmgGwi0ZosGVywcVeYnADEuDYMAO3ENEOzcs3nwYrHgoPUT8ozEoWRfU
-						36CbxIdpBxW9E8KbPY9ILo6EH/AeaPY9HNklJr/oaWYgFyHlasMruZrD77mgNwCI
-						r2gkn2ffy5Z/2izMU7nHRjO8z93LBHAsUlZK1qdbnKQa9ft5SEqVl22Ww/xWvrCD
-						DCf9hZ/XDTkhfXkdFY4uujO+3Qqlin9ufSQG5VHzUVZ4knc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsms.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsms.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 Brighton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brighton and Sussex Medical School</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bsms.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:servicedesk@brighton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Holden</SurName>
-    <EmailAddress>mailto:ukfederation-tech@bsms.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bsz-bw.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.bsz-bw.de-idp-shibboleth.xml
deleted file mode 100644
index 0e7e13fe..00000000
--- a/swamid-interfederations-2.0/idp.bsz-bw.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.bsz-bw.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-28T08:48:10Z">
-      <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>
-  </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">bsz-bw.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Bibliotheksservice-Zentrum Baden-Württemberg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Bibliotheksservice-Zentrum Baden-Wuerttemberg</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider des Bibliotheksservice-Zentrums Baden-Württemberg</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider of Bibliotheksservice-Zentrums Baden-Wuerttemberg</mdui:Description>
-        <mdui:Logo height="32" width="32">https://idp.bsz-bw.de/idp/images/favicon.ico</mdui:Logo>
-        <mdui:Logo height="49" width="350">https://idp.bsz-bw.de/idp/images/logo.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.bsz-bw.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.bsz-bw.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.bsz-bw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.bsz-bw.de,OU=Webserver,O=Bibliotheksservice-Zentrum Baden-Wuerttemberg,L=Konstanz,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGyjCCBbKgAwIBAgIHGAAaqAVbcDANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQG
-EwJERTE2MDQGA1UEChMtQmlibGlvdGhla3NzZXJ2aWNlLVplbnRydW0gQmFkZW4t
-V3VlcnR0ZW1iZXJnMRgwFgYDVQQDEw9CU1otQlcgQ0EgLSBHMDIxHDAaBgkqhkiG
-9w0BCQEWDXBraUBic3otYncuZGUwHhcNMTQwODA1MDkwMDA4WhcNMTkwNzA5MjM1
-OTAwWjCBoTELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVy
-ZzERMA8GA1UEBxMIS29uc3RhbnoxNjA0BgNVBAoTLUJpYmxpb3RoZWtzc2Vydmlj
-ZS1aZW50cnVtIEJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UECxMJV2Vic2VydmVy
-MRYwFAYDVQQDEw1pZHAuYnN6LWJ3LmRlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEA40EKD87MORYBm5wcgU+yBnDrhhagRIwZIVaf/FWqx+gR2XRZdMR3
-81QIS1lEgftaypDdGFIAOptLSZChXBT0fzOCVeP3rOruo7Ge7xV0i/ak9LiukmXP
-7mBd9PCh6UVJDBX8lZVmo17W8efVvW6t02jkQ7WfS3+LCFWtM1cCoxhqBS+/KHyX
-+Hde0YZWn0MJp6QdXpMy6aNBQOebtSnkvN4BBHX47er5NkQGrAq31JOr3CPcEMr3
-y3QfB9Rwqhh5mWNNTnmy2pt+LQQ3jgcFwFOVxyZkU/9Y0ku18K1phmxkjq2tqhCH
-0FF3J39DuVSavXbcWNIJvhaNy3FdlyMWQOl7wWUZfBHZcARMnth96PIzFNLZ+Xr7
-OypsJvdQ0yHScirbw2myz1BKabP7m2udlyPNMHzzW7nuXxfKmv0iUBhvdmMbn58J
-H04/a8j+upmkO9YzvfLFIRugRecGfoVYLtHv4f7t51HiHqZ37eYgtKQ8ZE/g9s3G
-BnmpMHHHPkJIQvRMFBsNqaaeG/Y0FZLLgPVIlNZtrDJThLOgAaHiHSzH2DnhV/2u
-brorFUPWYKaZ/2Lr6LXVou6Md8orNjLMN3i37a/w/K9fSsmF10MKqovNFkjYkGKo
-4b5b5N46q2XJIVWHgtpQMBBq4y09Ci+Ip9frRINacl3wGgGl/vlmsrsCAwEAAaOC
-AigwggIkMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMBMBEGDysGAQQBga0h
-giwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBT0rDaMLGE+KhQ5mWTW
-H4ot4S4iHjAfBgNVHSMEGDAWgBQprQDey2blH96qjW3snLRC/vubITAYBgNVHREE
-ETAPgg1pZHAuYnN6LWJ3LmRlMIGBBgNVHR8EejB4MDqgOKA2hjRodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2Jzei1idy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDqgOKA2
-hjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Jzei1idy1jYS9wdWIvY3JsL2dfY2Fj
-cmwuY3JsMIHRBggrBgEFBQcBAQSBxDCBwTAzBggrBgEFBQcwAYYnaHR0cDovL29j
-c3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEQGCCsGAQUFBzAChjhodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2Jzei1idy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ic3otYnct
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAFla
-FkPfe3hOBnsSDbtmz+OmRGhEXd11I42oAGf/H5Hk5wuLX8xGFdFhxU4p2sMJm7IT
-8kMUx2QVX+S/Suf597COomXBJ3UGv3ORaB8s9a45KnQJ3rY+8CH1gxPMRjzDc2e0
-LujerJOMeBpNb19bIO8PcJgOot21CgdEZLpigWr2+lZkVDUNVnKDqkW24MC5QBV7
-O/EgLANDyqhTS0VUr76KxiPZYOPOhVJPvughrbxZMtOSl+aYNOUrXEFxbfB/Zr9m
-FJfk2TC3SL5x295M818e8rJwkn22fjo9oLRUaWcg7oM6eXB9DcDDcIy31hObpnLa
-cyobduSNkOZaUoroSIY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bsz-bw.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bsz-bw.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bsz-bw.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bsz-bw.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bsz-bw.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bsz-bw.de/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsz-bw.de/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">bsz-bw.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.bsz-bw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.bsz-bw.de,OU=Webserver,O=Bibliotheksservice-Zentrum Baden-Wuerttemberg,L=Konstanz,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGyjCCBbKgAwIBAgIHGAAaqAVbcDANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQG
-EwJERTE2MDQGA1UEChMtQmlibGlvdGhla3NzZXJ2aWNlLVplbnRydW0gQmFkZW4t
-V3VlcnR0ZW1iZXJnMRgwFgYDVQQDEw9CU1otQlcgQ0EgLSBHMDIxHDAaBgkqhkiG
-9w0BCQEWDXBraUBic3otYncuZGUwHhcNMTQwODA1MDkwMDA4WhcNMTkwNzA5MjM1
-OTAwWjCBoTELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVy
-ZzERMA8GA1UEBxMIS29uc3RhbnoxNjA0BgNVBAoTLUJpYmxpb3RoZWtzc2Vydmlj
-ZS1aZW50cnVtIEJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UECxMJV2Vic2VydmVy
-MRYwFAYDVQQDEw1pZHAuYnN6LWJ3LmRlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEA40EKD87MORYBm5wcgU+yBnDrhhagRIwZIVaf/FWqx+gR2XRZdMR3
-81QIS1lEgftaypDdGFIAOptLSZChXBT0fzOCVeP3rOruo7Ge7xV0i/ak9LiukmXP
-7mBd9PCh6UVJDBX8lZVmo17W8efVvW6t02jkQ7WfS3+LCFWtM1cCoxhqBS+/KHyX
-+Hde0YZWn0MJp6QdXpMy6aNBQOebtSnkvN4BBHX47er5NkQGrAq31JOr3CPcEMr3
-y3QfB9Rwqhh5mWNNTnmy2pt+LQQ3jgcFwFOVxyZkU/9Y0ku18K1phmxkjq2tqhCH
-0FF3J39DuVSavXbcWNIJvhaNy3FdlyMWQOl7wWUZfBHZcARMnth96PIzFNLZ+Xr7
-OypsJvdQ0yHScirbw2myz1BKabP7m2udlyPNMHzzW7nuXxfKmv0iUBhvdmMbn58J
-H04/a8j+upmkO9YzvfLFIRugRecGfoVYLtHv4f7t51HiHqZ37eYgtKQ8ZE/g9s3G
-BnmpMHHHPkJIQvRMFBsNqaaeG/Y0FZLLgPVIlNZtrDJThLOgAaHiHSzH2DnhV/2u
-brorFUPWYKaZ/2Lr6LXVou6Md8orNjLMN3i37a/w/K9fSsmF10MKqovNFkjYkGKo
-4b5b5N46q2XJIVWHgtpQMBBq4y09Ci+Ip9frRINacl3wGgGl/vlmsrsCAwEAAaOC
-AigwggIkMDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMBMBEGDysGAQQBga0h
-giwCAQQDATAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBT0rDaMLGE+KhQ5mWTW
-H4ot4S4iHjAfBgNVHSMEGDAWgBQprQDey2blH96qjW3snLRC/vubITAYBgNVHREE
-ETAPgg1pZHAuYnN6LWJ3LmRlMIGBBgNVHR8EejB4MDqgOKA2hjRodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2Jzei1idy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDqgOKA2
-hjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Jzei1idy1jYS9wdWIvY3JsL2dfY2Fj
-cmwuY3JsMIHRBggrBgEFBQcBAQSBxDCBwTAzBggrBgEFBQcwAYYnaHR0cDovL29j
-c3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEQGCCsGAQUFBzAChjhodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL2Jzei1idy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ic3otYnct
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAFla
-FkPfe3hOBnsSDbtmz+OmRGhEXd11I42oAGf/H5Hk5wuLX8xGFdFhxU4p2sMJm7IT
-8kMUx2QVX+S/Suf597COomXBJ3UGv3ORaB8s9a45KnQJ3rY+8CH1gxPMRjzDc2e0
-LujerJOMeBpNb19bIO8PcJgOot21CgdEZLpigWr2+lZkVDUNVnKDqkW24MC5QBV7
-O/EgLANDyqhTS0VUr76KxiPZYOPOhVJPvughrbxZMtOSl+aYNOUrXEFxbfB/Zr9m
-FJfk2TC3SL5x295M818e8rJwkn22fjo9oLRUaWcg7oM6eXB9DcDDcIy31hObpnLa
-cyobduSNkOZaUoroSIY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bsz-bw.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bsz-bw.de: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">e56</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e56</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Bibliotheksservice Zentrum Baden-Wuerttemberg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Bibliotheksservice Zentrum Baden-Wuerttemberg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.bsz-bw.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.bsz-bw.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>DFN-AAI</md:GivenName>
-    <md:SurName>Hotline</md:SurName>
-    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>DFN-AAI</md:GivenName>
-    <md:SurName>Hotline</md:SurName>
-    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0021971d..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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.bth.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.bth.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.bth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.bth.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">bth.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.bth.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">BTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Personal</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Personnel</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Blekinge Institute of Technology- Personnel</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Blekinge Institute of Technology- Personnel</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Blekinge Institute of Technology- Personnel</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 381500</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 f87ff55f..00000000
--- a/swamid-interfederations-2.0/idp.bth.se.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://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>
-    </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="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Martinsson</SurName>
-    <EmailAddress>tom.martinsson@bth.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.bucks.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.bucks.ac.uk-entity.xml
deleted file mode 100644
index 17efe0bb..00000000
--- a/swamid-interfederations-2.0/idp.bucks.ac.uk-entity.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://idp.bucks.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for Buckinghamshire New University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">bucks.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVANqu+NZEXr9JDN0KL+SXOAzT26P1MA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcDIuYnVja3MuYWMudWswHhcNMTAwMjIyMTEyNDQ3
-						WhcNMzAwMjIyMTEyNDQ3WjAbMRkwFwYDVQQDExBpZHAyLmJ1Y2tzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm+/eL9vGVVAi8+UjXdF14DBe
-						n8iaPlI97zOPvd0mXE9eTf9/3ZwpERG1RdlYStTyKzKJn9wSEOg09F9xjoCLjwLC
-						8FYxUYstC+nMxSkvWVOc2KuSCxZ8k2rMYd8oIBa4S+Z8T1LZVlPLG3BUh/PPeITB
-						qBU6mkAw463N4vcN0d5uTN4lmvb4pndeUwQNSFUgn8gdNo053iY0Rz96YkyqnZBT
-						Y0oJCi6xBdVZMGlaA7M85RZXF31gH3e1/XOKXTqG5/k4Wxz8Axsd+T3l2rF/Rf6u
-						zDZNgDqpLUv173+NsV3OUy4pb0HL+T4lQbpzJAMwfpaoFNuW5EIYSFObRCApGQID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAyLmJ1Y2tzLmFjLnVrhidodHRwczovL2lk
-						cDIuYnVja3MuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFMyfmRe4iDP
-						7zdjl7Q2Xaj4kD2hMA0GCSqGSIb3DQEBBQUAA4IBAQBeiHBWZO3Uo8VRvtRi+XgE
-						pw5kQCWc9N3z1jrDu6ue5jV6FiK+cimpyBtjRi83UA1mmyE3gnMBn3pUDmcyBAEr
-						h5Pft+/Yeqw4D7Z9u6zl3QxCSxXy5nz3kUQ2rfX7EaZaypH8vs1blmf/mYf8+WJ7
-						Ng/p0UgFFHR4w1GBms9bBV8oomirzKNBc1BhynaQ5QL8ebYIFAN+M5qf4p2w2ZHb
-						ZYZ8rzVKUn7pgsboBcZrcDJu5U80WKeE9UeCeb2NiySJozPNDyIxH5AAzfXTT+jd
-						biSMmVvAhGXgJqfaAeAqGEUayk8ttUtYCXDV3T+XkcJr8P8Iiwq5hejvWSb+cKwr
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.bucks.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://idp2.bucks.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.bucks.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.bucks.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.bucks.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">bucks.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVANqu+NZEXr9JDN0KL+SXOAzT26P1MA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcDIuYnVja3MuYWMudWswHhcNMTAwMjIyMTEyNDQ3
-						WhcNMzAwMjIyMTEyNDQ3WjAbMRkwFwYDVQQDExBpZHAyLmJ1Y2tzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm+/eL9vGVVAi8+UjXdF14DBe
-						n8iaPlI97zOPvd0mXE9eTf9/3ZwpERG1RdlYStTyKzKJn9wSEOg09F9xjoCLjwLC
-						8FYxUYstC+nMxSkvWVOc2KuSCxZ8k2rMYd8oIBa4S+Z8T1LZVlPLG3BUh/PPeITB
-						qBU6mkAw463N4vcN0d5uTN4lmvb4pndeUwQNSFUgn8gdNo053iY0Rz96YkyqnZBT
-						Y0oJCi6xBdVZMGlaA7M85RZXF31gH3e1/XOKXTqG5/k4Wxz8Axsd+T3l2rF/Rf6u
-						zDZNgDqpLUv173+NsV3OUy4pb0HL+T4lQbpzJAMwfpaoFNuW5EIYSFObRCApGQID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAyLmJ1Y2tzLmFjLnVrhidodHRwczovL2lk
-						cDIuYnVja3MuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFMyfmRe4iDP
-						7zdjl7Q2Xaj4kD2hMA0GCSqGSIb3DQEBBQUAA4IBAQBeiHBWZO3Uo8VRvtRi+XgE
-						pw5kQCWc9N3z1jrDu6ue5jV6FiK+cimpyBtjRi83UA1mmyE3gnMBn3pUDmcyBAEr
-						h5Pft+/Yeqw4D7Z9u6zl3QxCSxXy5nz3kUQ2rfX7EaZaypH8vs1blmf/mYf8+WJ7
-						Ng/p0UgFFHR4w1GBms9bBV8oomirzKNBc1BhynaQ5QL8ebYIFAN+M5qf4p2w2ZHb
-						ZYZ8rzVKUn7pgsboBcZrcDJu5U80WKeE9UeCeb2NiySJozPNDyIxH5AAzfXTT+jd
-						biSMmVvAhGXgJqfaAeAqGEUayk8ttUtYCXDV3T+XkcJr8P8Iiwq5hejvWSb+cKwr
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.bucks.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">Buckinghamshire New University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Buckinghamshire New University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bucks.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>University IT Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@bucks.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Oliver</GivenName>
-    <SurName>Facey</SurName>
-    <EmailAddress>mailto:Oliver.Facey@bucks.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cadcol.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 248e52d6..00000000
--- a/swamid-interfederations-2.0/idp.cadcol.ac.uk-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" entityID="https://idp.cadcol.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP owned by Cadbury Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">cadcol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEsjCCA5qgAwIBAgIQC6lglEc1muN3LFkfQ12m7DANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEyMTExNjAwMDAwMFoXDTE1MTExNjIzNTk1OVowgYwxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIEw1XZXN0IE1pZGxhbmRzMRMwEQYDVQQHEwpCaXJtaW5n
-						aGFtMSMwIQYDVQQKExpDYWRidXJ5IFNpeHRoIEZvcm0gQ29sbGVnZTEQMA4GA1UE
-						CxMHSVQgRGVwdDEZMBcGA1UEAxMQaWRwLmNhZGNvbC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBANtWIz33YCsijFXx4/b95qkgF1m0MeB6S8dX
-						oOaZnEQUOWcPgBh4JJBwHH3SLvQP3G1F58YXL0v8Pgab5tDDavLgbi7DFkW0OetW
-						jT4/xPT9UxHiHmMnxCjs0JpxahCxucQYU5EG6c1sCdi3/6z04RGutyp3UEoVkXpK
-						5+mtQCt8bhu0HOT9tvHIPxy4KXaFsb22RjIQFq98gW4bI4phXQTrDbeab21OPwJ3
-						QRSIQ8i2/J8i5pyQO8uNSyuu+JEDiXiijkUbVEzgMD0O+kvzTtZ/7RV7Cg0Mnvaf
-						hYW5l5iMCnU7kCrIAnGMtrHnhprIvHzeJdVGb1SUhHQupxawKBECAwEAAaOCAWMw
-						ggFfMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRb
-						f5RSMowa+lFIjSPl8Xfv6CL8sDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-						ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-						BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-						bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-						MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-						CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDAS
-						ghBpZHAuY2FkY29sLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBF7oVjVs9tgJ1B
-						rvciHb+40CQqIbz86igO5mdrzpj+FgZtIWbkgEAa9Vboy8lZz2OQsFX1IfLc6GqJ
-						bnOqyjKPokM3xInZIjJKB5klR7pwb8ew7xztth6HI5kunUbqgJyUIps/UW5Wmebk
-						s4C3/IyCgKKhFuyy3TjvzaZ3AgNaIevVG1J86kdJp/o/e8lcK+B1Uc+YUXw88d7e
-						cqnkbj0rF6nJt0Qv6ybzByBjB/NyjQ0I45WALx6pRfyw7zau8ySfvBrjY8PcFvq1
-						Eh8cGFy2epl4edQCAfQPBq+MeewnhuSXh60WLN3MUAk9kG1ULtKvfU2gWTNFez20
-						yE/uAc/7
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cadcol.ac.uk/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cadcol.ac.uk/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.cadcol.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cadcol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cadcol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cadcol.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">cadcol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEsjCCA5qgAwIBAgIQC6lglEc1muN3LFkfQ12m7DANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEyMTExNjAwMDAwMFoXDTE1MTExNjIzNTk1OVowgYwxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIEw1XZXN0IE1pZGxhbmRzMRMwEQYDVQQHEwpCaXJtaW5n
-						aGFtMSMwIQYDVQQKExpDYWRidXJ5IFNpeHRoIEZvcm0gQ29sbGVnZTEQMA4GA1UE
-						CxMHSVQgRGVwdDEZMBcGA1UEAxMQaWRwLmNhZGNvbC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBANtWIz33YCsijFXx4/b95qkgF1m0MeB6S8dX
-						oOaZnEQUOWcPgBh4JJBwHH3SLvQP3G1F58YXL0v8Pgab5tDDavLgbi7DFkW0OetW
-						jT4/xPT9UxHiHmMnxCjs0JpxahCxucQYU5EG6c1sCdi3/6z04RGutyp3UEoVkXpK
-						5+mtQCt8bhu0HOT9tvHIPxy4KXaFsb22RjIQFq98gW4bI4phXQTrDbeab21OPwJ3
-						QRSIQ8i2/J8i5pyQO8uNSyuu+JEDiXiijkUbVEzgMD0O+kvzTtZ/7RV7Cg0Mnvaf
-						hYW5l5iMCnU7kCrIAnGMtrHnhprIvHzeJdVGb1SUhHQupxawKBECAwEAAaOCAWMw
-						ggFfMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRb
-						f5RSMowa+lFIjSPl8Xfv6CL8sDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-						ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-						BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-						bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-						MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-						CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDAS
-						ghBpZHAuY2FkY29sLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBF7oVjVs9tgJ1B
-						rvciHb+40CQqIbz86igO5mdrzpj+FgZtIWbkgEAa9Vboy8lZz2OQsFX1IfLc6GqJ
-						bnOqyjKPokM3xInZIjJKB5klR7pwb8ew7xztth6HI5kunUbqgJyUIps/UW5Wmebk
-						s4C3/IyCgKKhFuyy3TjvzaZ3AgNaIevVG1J86kdJp/o/e8lcK+B1Uc+YUXw88d7e
-						cqnkbj0rF6nJt0Qv6ybzByBjB/NyjQ0I45WALx6pRfyw7zau8ySfvBrjY8PcFvq1
-						Eh8cGFy2epl4edQCAfQPBq+MeewnhuSXh60WLN3MUAk9kG1ULtKvfU2gWTNFez20
-						yE/uAc/7
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cadcol.ac.uk/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cadcol.ac.uk/idp/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">Cadbury Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cadbury Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cadcol.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Naseer</GivenName>
-    <SurName>Iqbal</SurName>
-    <EmailAddress>mailto:Naseer.Iqbal@cadcol.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Naseer</GivenName>
-    <SurName>Iqbal</SurName>
-    <EmailAddress>mailto:Naseer.Iqbal@cadcol.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.calderdale.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.calderdale.ac.uk-shibboleth.xml
deleted file mode 100644
index f435a97a..00000000
--- a/swamid-interfederations-2.0/idp.calderdale.ac.uk-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.calderdale.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Calderdale College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-07T17:36: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">calderdale.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZDCCAkwCCQDCBJgSsIDDIjANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJH
-						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEDAOBgNVBAcTB0hhbGlmYXgxGzAZ
-						BgNVBAoTEkNhbGRlcmRhbGUgQ29sbGVnZTEdMBsGA1UEAxMUaWRwLmNhbGRlcmRh
-						bGUuYWMudWswHhcNMTMwODIwMDk0OTE1WhcNMzMwODE1MDk0OTE1WjB0MQswCQYD
-						VQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEDAOBgNVBAcTB0hhbGlm
-						YXgxGzAZBgNVBAoTEkNhbGRlcmRhbGUgQ29sbGVnZTEdMBsGA1UEAxMUaWRwLmNh
-						bGRlcmRhbGUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDl
-						d9r2GlhawshfKg2mLNnNM/cDXMuNmFyO5WqggGq/KYHz0IBPyiyta6i+br5eXBKO
-						1AqN50NOCd/+R8Sn6od72hEt8Rqw/mNeBpeunugR6osrfXU2jLJC3s1arRzeq9Su
-						tiJIfcH5W+D/DNU8HohGu0S1O850RDNczxgv3XRtgpIZ7+StR/i7K/87CnfqPa7N
-						Z5HnroRkOvnJvWVQqxeWq4uyg1SvmduZM3M5q9GHPIWNNOGD2tweqedebRfuKGS0
-						zFli/TuNt71KRfbe69XRJJ8+qonpZQnBXAB9Yoy54Cdfx5xVEPM8cDIym18PPFBt
-						z8XvtHII5NLdfyVeXR8TAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBALpqSF1/M+T+
-						tgTfWN+2Okc+AH9CyDweJWpzlrOGNyp7A5ZlACnxtDacwOweI2smD2dw40kePPYG
-						EDXNI38vkdzVLOOEVdJYXNIl48Y2bXuqP+vpzu6LCP7YtuaooutLN5o+XEuGyvkn
-						teHT5ghzinJTZSYxJbm3KoXntug1voV18Z6naYJiazdhs2e5EvrnjFkwNgzjKXqx
-						lDLBTzo4/aBLVsUmfJ1ulvsIeUja2lHL7jZ68ENOjtH3ttQgoCcsd26iKqyaTzrI
-						DmObHsLnFUzF6kTwb/GOVLcTnRMIt6geVfLn+Fvd8TEvRL/9tpnU1QjnvfalQrec
-						uF5jkFFaZrc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calderdale.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calderdale.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.calderdale.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.calderdale.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.calderdale.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.calderdale.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">calderdale.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZDCCAkwCCQDCBJgSsIDDIjANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJH
-						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEDAOBgNVBAcTB0hhbGlmYXgxGzAZ
-						BgNVBAoTEkNhbGRlcmRhbGUgQ29sbGVnZTEdMBsGA1UEAxMUaWRwLmNhbGRlcmRh
-						bGUuYWMudWswHhcNMTMwODIwMDk0OTE1WhcNMzMwODE1MDk0OTE1WjB0MQswCQYD
-						VQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEDAOBgNVBAcTB0hhbGlm
-						YXgxGzAZBgNVBAoTEkNhbGRlcmRhbGUgQ29sbGVnZTEdMBsGA1UEAxMUaWRwLmNh
-						bGRlcmRhbGUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDl
-						d9r2GlhawshfKg2mLNnNM/cDXMuNmFyO5WqggGq/KYHz0IBPyiyta6i+br5eXBKO
-						1AqN50NOCd/+R8Sn6od72hEt8Rqw/mNeBpeunugR6osrfXU2jLJC3s1arRzeq9Su
-						tiJIfcH5W+D/DNU8HohGu0S1O850RDNczxgv3XRtgpIZ7+StR/i7K/87CnfqPa7N
-						Z5HnroRkOvnJvWVQqxeWq4uyg1SvmduZM3M5q9GHPIWNNOGD2tweqedebRfuKGS0
-						zFli/TuNt71KRfbe69XRJJ8+qonpZQnBXAB9Yoy54Cdfx5xVEPM8cDIym18PPFBt
-						z8XvtHII5NLdfyVeXR8TAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBALpqSF1/M+T+
-						tgTfWN+2Okc+AH9CyDweJWpzlrOGNyp7A5ZlACnxtDacwOweI2smD2dw40kePPYG
-						EDXNI38vkdzVLOOEVdJYXNIl48Y2bXuqP+vpzu6LCP7YtuaooutLN5o+XEuGyvkn
-						teHT5ghzinJTZSYxJbm3KoXntug1voV18Z6naYJiazdhs2e5EvrnjFkwNgzjKXqx
-						lDLBTzo4/aBLVsUmfJ1ulvsIeUja2lHL7jZ68ENOjtH3ttQgoCcsd26iKqyaTzrI
-						DmObHsLnFUzF6kTwb/GOVLcTnRMIt6geVfLn+Fvd8TEvRL/9tpnU1QjnvfalQrec
-						uF5jkFFaZrc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calderdale.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calderdale.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">Calderdale College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Calderdale College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.calderdale.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Haworth</SurName>
-    <EmailAddress>mailto:michaelh@calderdale.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Haworth</SurName>
-    <EmailAddress>mailto:michaelh@calderdale.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.calpoly.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.calpoly.edu-idp-shibboleth.xml
deleted file mode 100644
index 6080ad45..00000000
--- a/swamid-interfederations-2.0/idp.calpoly.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,137 +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://idp.calpoly.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">calpoly.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California Polytechnic State University-San Luis Obispo</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.calpoly.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://afd.calpoly.edu/security/policies/index.html</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>
-MIIGXzCCBUegAwIBAgIQJ+EtooE7aPQyEUAEQQAwyjANBgkqhkiG9w0BAQsFADB2
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjES
-MBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMW
-SW5Db21tb24gUlNBIFNlcnZlciBDQTAeFw0xNDEwMTMwMDAwMDBaFw0xNzEwMTIy
-MzU5NTlaMIH0MQswCQYDVQQGEwJVUzETMBEGA1UEERMKOTM0MDctMDE1NDELMAkG
-A1UECBMCQ0ExGDAWBgNVBAcTD1NhbiBMdWlzIE9iaXNwbzEiMCAGA1UECRMZQ2Fs
-IFBvbHkgU3RhdGUgVW5pdmVyc2l0eTFBMD8GA1UEChM4Q2FsaWZvcm5pYSBQb2x5
-dGVjaG5pYyBTdGF0ZSBVbml2ZXJzaXR5LCBTYW4gTHVpcyBPYmlzcG8xKDAmBgNV
-BAsTH0luZm9ybWF0aW9uIFRlY2hub2xvZ3kgU2VydmljZXMxGDAWBgNVBAMTD2lk
-cC5jYWxwb2x5LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcA
-Y5VxfpqVsoDVEOM3E/m2WsLFKf+lHV/M7neRFa0Sn9j5ha0tM9+vNmhMU4RgX6gc
-IdX7XRkXw80KzqQxeiwyISbiXCDS1zvTJpjyKtgbDrcPGBWaXjl8Mjythfy0WdFN
-QCDI8PQ7XgX1qjrjGKp4IIAMfoqdedwHTingJCOs1XOd1LZm9OMaMiMVtOjSzGpN
-calID/YLecguXlITBlRzJHgfTDTxuElyLxkCH++fQFYUUYUjJhuKOVaXvH6YUlm2
-wPlhsh/kvKtNDNzbPfiUzHafN31oswFGPR7ZHItAeqvR3n8gkp0hyKbKdupzyMop
-JIGkyE6Aq8LwWhNHnP0CAwEAAaOCAmgwggJkMB8GA1UdIwQYMBaAFB4Fo3ePbJbi
-W4dLprSGrHEADOc4MB0GA1UdDgQWBBTSJqS8qnRCnVm/WzmLgoB7oBXQBTAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEwQjBABggrBgEFBQcC
-ARY0aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVwb3NpdG9yeS9jcHNf
-c3NsLnBkZjAIBgZngQwBAgIwRAYDVR0fBD0wOzA5oDegNYYzaHR0cDovL2NybC5p
-bmNvbW1vbi1yc2Eub3JnL0luQ29tbW9uUlNBU2VydmVyQ0EuY3JsMHUGCCsGAQUF
-BwEBBGkwZzA+BggrBgEFBQcwAoYyaHR0cDovL2NydC51c2VydHJ1c3QuY29tL0lu
-Q29tbW9uUlNBU2VydmVyQ0FfMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3Nw
-LnVzZXJ0cnVzdC5jb20wgb4GA1UdEQSBtjCBs4IPaWRwLmNhbHBvbHkuZWR1ghdp
-ZHAtaGEtMS0wMS5jYWxwb2x5LmVkdYIbaWRwLWhhLTEtMDEuaXRzLmNhbHBvbHku
-ZWR1ghdpZHAtaGEtMi0wMi5jYWxwb2x5LmVkdYIbaWRwLWhhLTItMDIuaXRzLmNh
-bHBvbHkuZWR1ghdpZHAtaGEtMy0wMy5jYWxwb2x5LmVkdYIbaWRwLWhhLTMtMDMu
-aXRzLmNhbHBvbHkuZWR1MA0GCSqGSIb3DQEBCwUAA4IBAQCQQjzy+wjJCRNTiXhc
-aDJXwPgvRH9QOHKE3rcpOFAoWnr6QSMnISXb/uLuqW0OPMxpsrh0d7La0YNU5v3K
-exkmFKBg2kyJsssfvD7khldgCJHEtjdBIofN+jVB3RG5H48xowujuiYhRR4uo2IB
-HDwXJ8Nu/98HyZfv4Wahw7JzKN6D4NDIdiNNcWUBLura157+3HSKp0I+nhiKKZDs
-ZmYEyv4r6X6Fk0bEMhAJwM7Qjau0KACibd8lNUyfKRpKwFjlIPwM3bRoMCWptH2K
-ytVSwHP8Fc4H3kO1pfS7kmpmR1eaVapLHcNo+/7GQXET7X9xo5jAP/LslBgvWoZn
-/xkI
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calpoly.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calpoly.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.calpoly.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.calpoly.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.calpoly.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.calpoly.edu/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">calpoly.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIGXzCCBUegAwIBAgIQJ+EtooE7aPQyEUAEQQAwyjANBgkqhkiG9w0BAQsFADB2
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjES
-MBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMW
-SW5Db21tb24gUlNBIFNlcnZlciBDQTAeFw0xNDEwMTMwMDAwMDBaFw0xNzEwMTIy
-MzU5NTlaMIH0MQswCQYDVQQGEwJVUzETMBEGA1UEERMKOTM0MDctMDE1NDELMAkG
-A1UECBMCQ0ExGDAWBgNVBAcTD1NhbiBMdWlzIE9iaXNwbzEiMCAGA1UECRMZQ2Fs
-IFBvbHkgU3RhdGUgVW5pdmVyc2l0eTFBMD8GA1UEChM4Q2FsaWZvcm5pYSBQb2x5
-dGVjaG5pYyBTdGF0ZSBVbml2ZXJzaXR5LCBTYW4gTHVpcyBPYmlzcG8xKDAmBgNV
-BAsTH0luZm9ybWF0aW9uIFRlY2hub2xvZ3kgU2VydmljZXMxGDAWBgNVBAMTD2lk
-cC5jYWxwb2x5LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcA
-Y5VxfpqVsoDVEOM3E/m2WsLFKf+lHV/M7neRFa0Sn9j5ha0tM9+vNmhMU4RgX6gc
-IdX7XRkXw80KzqQxeiwyISbiXCDS1zvTJpjyKtgbDrcPGBWaXjl8Mjythfy0WdFN
-QCDI8PQ7XgX1qjrjGKp4IIAMfoqdedwHTingJCOs1XOd1LZm9OMaMiMVtOjSzGpN
-calID/YLecguXlITBlRzJHgfTDTxuElyLxkCH++fQFYUUYUjJhuKOVaXvH6YUlm2
-wPlhsh/kvKtNDNzbPfiUzHafN31oswFGPR7ZHItAeqvR3n8gkp0hyKbKdupzyMop
-JIGkyE6Aq8LwWhNHnP0CAwEAAaOCAmgwggJkMB8GA1UdIwQYMBaAFB4Fo3ePbJbi
-W4dLprSGrHEADOc4MB0GA1UdDgQWBBTSJqS8qnRCnVm/WzmLgoB7oBXQBTAOBgNV
-HQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-KwYBBQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEwQjBABggrBgEFBQcC
-ARY0aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVwb3NpdG9yeS9jcHNf
-c3NsLnBkZjAIBgZngQwBAgIwRAYDVR0fBD0wOzA5oDegNYYzaHR0cDovL2NybC5p
-bmNvbW1vbi1yc2Eub3JnL0luQ29tbW9uUlNBU2VydmVyQ0EuY3JsMHUGCCsGAQUF
-BwEBBGkwZzA+BggrBgEFBQcwAoYyaHR0cDovL2NydC51c2VydHJ1c3QuY29tL0lu
-Q29tbW9uUlNBU2VydmVyQ0FfMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3Nw
-LnVzZXJ0cnVzdC5jb20wgb4GA1UdEQSBtjCBs4IPaWRwLmNhbHBvbHkuZWR1ghdp
-ZHAtaGEtMS0wMS5jYWxwb2x5LmVkdYIbaWRwLWhhLTEtMDEuaXRzLmNhbHBvbHku
-ZWR1ghdpZHAtaGEtMi0wMi5jYWxwb2x5LmVkdYIbaWRwLWhhLTItMDIuaXRzLmNh
-bHBvbHkuZWR1ghdpZHAtaGEtMy0wMy5jYWxwb2x5LmVkdYIbaWRwLWhhLTMtMDMu
-aXRzLmNhbHBvbHkuZWR1MA0GCSqGSIb3DQEBCwUAA4IBAQCQQjzy+wjJCRNTiXhc
-aDJXwPgvRH9QOHKE3rcpOFAoWnr6QSMnISXb/uLuqW0OPMxpsrh0d7La0YNU5v3K
-exkmFKBg2kyJsssfvD7khldgCJHEtjdBIofN+jVB3RG5H48xowujuiYhRR4uo2IB
-HDwXJ8Nu/98HyZfv4Wahw7JzKN6D4NDIdiNNcWUBLura157+3HSKp0I+nhiKKZDs
-ZmYEyv4r6X6Fk0bEMhAJwM7Qjau0KACibd8lNUyfKRpKwFjlIPwM3bRoMCWptH2K
-ytVSwHP8Fc4H3kO1pfS7kmpmR1eaVapLHcNo+/7GQXET7X9xo5jAP/LslBgvWoZn
-/xkI
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calpoly.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calpoly.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California Polytechnic State University-San Luis Obispo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California Polytechnic State University-San Luis Obispo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.calpoly.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Identity Management Team</md:GivenName>
-    <md:EmailAddress>identity-management@calpoly.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Dan Malone</md:GivenName>
-    <md:EmailAddress>dmalone@calpoly.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Identity Management Team</md:GivenName>
-    <md:EmailAddress>identity-management@calpoly.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.calstatela.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.calstatela.edu-idp-shibboleth.xml
deleted file mode 100644
index 1f22b1f2..00000000
--- a/swamid-interfederations-2.0/idp.calstatela.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,129 +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://idp.calstatela.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">calstatela.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Los Angeles</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>
-MIIFkDCCBHigAwIBAgIJAN84AoxNS7qCMA0GCSqGSIb3DQEBBQUAMIHfMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLTG9zIEFuZ2Vs
-ZXMxMTAvBgNVBAoTKENhbGlmb3JuaWEgU3RhdGUgVW5pdmVyc2l0eSwgTG9zIEFu
-Z2VsZXMxKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRlY2hub2xvZ3kgU2VydmljZXMx
-GzAZBgNVBAMTEmlkcC5jYWxzdGF0ZWxhLmVkdTErMCkGCSqGSIb3DQEJARYcbWFr
-b3RvLnRhbmFrYUBjYWxzdGF0ZWxhLmVkdTAeFw0xMDEyMTAxODAwMTJaFw0xMzEy
-MDkxODAwMTJaMIHfMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEU
-MBIGA1UEBxMLTG9zIEFuZ2VsZXMxMTAvBgNVBAoTKENhbGlmb3JuaWEgU3RhdGUg
-VW5pdmVyc2l0eSwgTG9zIEFuZ2VsZXMxKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRl
-Y2hub2xvZ3kgU2VydmljZXMxGzAZBgNVBAMTEmlkcC5jYWxzdGF0ZWxhLmVkdTEr
-MCkGCSqGSIb3DQEJARYcbWFrb3RvLnRhbmFrYUBjYWxzdGF0ZWxhLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfSFCbth3fhrnbb7LKKIm3Gu81N
-wsXhIt4YYkvhTklVek8ET0+u8PRkBjWn7HI2mki/VNysE8mMJO/C/JjRM3CN7fFw
-+9KoDUO1NY4nS9PQdViReJw3PY0garTm0E8SfFjBQXeyNdcrN/8PvVoPfyjga23b
-Q9PAAKq1vTrhZ7xxCqxK0T2WvUjv+Bc1IkSNJ3a91hcaA77S65SaUBoZTZjngVgb
-BofYOHRDr22QWQ04y+jFmXVpwUReX3Aynb0Juf5Vdc2egZXR7fvudwTQcVoYzOQB
-8qtt4cdgXnzjLt3r5L0ddhikHQaN5bB5dD9OY8C6xyn+IB9MyB1Lf8oh7xUCAwEA
-AaOCAUswggFHMB0GA1UdDgQWBBQB7byhZ19tqtIdB0+29idldrJMOTCCARYGA1Ud
-IwSCAQ0wggEJgBQB7byhZ19tqtIdB0+29idldrJMOaGB5aSB4jCB3zELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC0xvcyBBbmdlbGVz
-MTEwLwYDVQQKEyhDYWxpZm9ybmlhIFN0YXRlIFVuaXZlcnNpdHksIExvcyBBbmdl
-bGVzMSgwJgYDVQQLEx9JbmZvcm1hdGlvbiBUZWNobm9sb2d5IFNlcnZpY2VzMRsw
-GQYDVQQDExJpZHAuY2Fsc3RhdGVsYS5lZHUxKzApBgkqhkiG9w0BCQEWHG1ha290
-by50YW5ha2FAY2Fsc3RhdGVsYS5lZHWCCQDfOAKMTUu6gjAMBgNVHRMEBTADAQH/
-MA0GCSqGSIb3DQEBBQUAA4IBAQCvGvoT2OXt+0p0UDImC+1JZr3G8WdH3B0eDtRM
-6PBg9r3sC/R5tff8rWbKquf1X7jLybuuclwrQhOz3mV96miiarGQtS4YSR8xaO/T
-uXxOCu/a3zMgYHHyCvHdJx9NUQ8NCNJ9h9EPg1Ectd91QqlWsw9RWs5ADuFoHjx8
-fkG6JS2f2VWBm21DqQBkddxT/NCj9Kia/FUwppyx2ceBYoWdGsKiEX6WA3lBI+N/
-NIlrOaf/+H8n2yV3uFO5ARjQVwY678a31gUq9CBwlapYYEUrGwj0dQeAAZyLEjVz
-FCK5DwJyRwWe486Q2eZYqETX7uSR1TXgtlr/PGbSvzsIXW7b
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calstatela.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calstatela.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.calstatela.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.calstatela.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.calstatela.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.calstatela.edu/idp/profile/Shibboleth/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">calstatela.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFkDCCBHigAwIBAgIJAN84AoxNS7qCMA0GCSqGSIb3DQEBBQUAMIHfMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLTG9zIEFuZ2Vs
-ZXMxMTAvBgNVBAoTKENhbGlmb3JuaWEgU3RhdGUgVW5pdmVyc2l0eSwgTG9zIEFu
-Z2VsZXMxKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRlY2hub2xvZ3kgU2VydmljZXMx
-GzAZBgNVBAMTEmlkcC5jYWxzdGF0ZWxhLmVkdTErMCkGCSqGSIb3DQEJARYcbWFr
-b3RvLnRhbmFrYUBjYWxzdGF0ZWxhLmVkdTAeFw0xMDEyMTAxODAwMTJaFw0xMzEy
-MDkxODAwMTJaMIHfMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEU
-MBIGA1UEBxMLTG9zIEFuZ2VsZXMxMTAvBgNVBAoTKENhbGlmb3JuaWEgU3RhdGUg
-VW5pdmVyc2l0eSwgTG9zIEFuZ2VsZXMxKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRl
-Y2hub2xvZ3kgU2VydmljZXMxGzAZBgNVBAMTEmlkcC5jYWxzdGF0ZWxhLmVkdTEr
-MCkGCSqGSIb3DQEJARYcbWFrb3RvLnRhbmFrYUBjYWxzdGF0ZWxhLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfSFCbth3fhrnbb7LKKIm3Gu81N
-wsXhIt4YYkvhTklVek8ET0+u8PRkBjWn7HI2mki/VNysE8mMJO/C/JjRM3CN7fFw
-+9KoDUO1NY4nS9PQdViReJw3PY0garTm0E8SfFjBQXeyNdcrN/8PvVoPfyjga23b
-Q9PAAKq1vTrhZ7xxCqxK0T2WvUjv+Bc1IkSNJ3a91hcaA77S65SaUBoZTZjngVgb
-BofYOHRDr22QWQ04y+jFmXVpwUReX3Aynb0Juf5Vdc2egZXR7fvudwTQcVoYzOQB
-8qtt4cdgXnzjLt3r5L0ddhikHQaN5bB5dD9OY8C6xyn+IB9MyB1Lf8oh7xUCAwEA
-AaOCAUswggFHMB0GA1UdDgQWBBQB7byhZ19tqtIdB0+29idldrJMOTCCARYGA1Ud
-IwSCAQ0wggEJgBQB7byhZ19tqtIdB0+29idldrJMOaGB5aSB4jCB3zELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC0xvcyBBbmdlbGVz
-MTEwLwYDVQQKEyhDYWxpZm9ybmlhIFN0YXRlIFVuaXZlcnNpdHksIExvcyBBbmdl
-bGVzMSgwJgYDVQQLEx9JbmZvcm1hdGlvbiBUZWNobm9sb2d5IFNlcnZpY2VzMRsw
-GQYDVQQDExJpZHAuY2Fsc3RhdGVsYS5lZHUxKzApBgkqhkiG9w0BCQEWHG1ha290
-by50YW5ha2FAY2Fsc3RhdGVsYS5lZHWCCQDfOAKMTUu6gjAMBgNVHRMEBTADAQH/
-MA0GCSqGSIb3DQEBBQUAA4IBAQCvGvoT2OXt+0p0UDImC+1JZr3G8WdH3B0eDtRM
-6PBg9r3sC/R5tff8rWbKquf1X7jLybuuclwrQhOz3mV96miiarGQtS4YSR8xaO/T
-uXxOCu/a3zMgYHHyCvHdJx9NUQ8NCNJ9h9EPg1Ectd91QqlWsw9RWs5ADuFoHjx8
-fkG6JS2f2VWBm21DqQBkddxT/NCj9Kia/FUwppyx2ceBYoWdGsKiEX6WA3lBI+N/
-NIlrOaf/+H8n2yV3uFO5ARjQVwY678a31gUq9CBwlapYYEUrGwj0dQeAAZyLEjVz
-FCK5DwJyRwWe486Q2eZYqETX7uSR1TXgtlr/PGbSvzsIXW7b
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.calstatela.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.calstatela.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Los Angeles</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Los Angeles</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.calstatela.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sheryl Okuno</md:GivenName>
-    <md:EmailAddress>seng@calstatela.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>David Ng</md:GivenName>
-    <md:EmailAddress>dng3@cslanet.calstatela.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jason Solis</md:GivenName>
-    <md:EmailAddress>jason.solis@calstatela.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Michael Lee</md:GivenName>
-    <md:EmailAddress>mlee40@calstatela.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.caltech.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.caltech.edu-idp-shibboleth.xml
deleted file mode 100644
index faf75aae..00000000
--- a/swamid-interfederations-2.0/idp.caltech.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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://idp.caltech.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.caltech.edu/idp/profile/error" 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">caltech.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California Institute of Technology</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>
-MIIDJzCCAg+gAwIBAgIUC0Z5A7Hz0aGgHdvfgWBw/TW939IwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmNhbHRlY2guZWR1MB4XDTEwMDIwNDAwMzgxNFoX
-DTMwMDIwNDAwMzgxNFowGjEYMBYGA1UEAxMPaWRwLmNhbHRlY2guZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjUfvISEj5BkXO8k4dKr7C1NdlDIs
-osNxbjP39/8oVwgGaMSnkfMhY6xct9gnxTzCRXe49MU+UyVRlljTqTeIJf8VG0K2
-aPSRk9xpzWje/fEkUHgpOjLDM0TNB2tWIQbHQwHz7HsuB/Au870PBMv4EfVz4us8
-yTmYvY2ZJPe192BnIbNyLub138HXjr7TrLBxMg7KulnanGnN75UrVjueRzAvFZlE
-lAZ+shDsjVYAoceEaFn7TF37ehVdjbXwOegtu+vU0kjjCS3cQUXXOs1Ojz6Vood/
-oP1SOisW3bEhboKMUCWEcDckUXHVd/qCekbUsJEt5KAK6Gmf5Ygha748kQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuY2FsdGVjaC5lZHWGJmh0dHBzOi8vaWRwLmNh
-bHRlY2guZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRlqKQBRnVFASGfdigd
-a/ihuq365zANBgkqhkiG9w0BAQUFAAOCAQEAck8P9JfpOWTpgc4LCyaY3WiJFIGe
-WT25D+6Gj7ADxj7+o2UZCcB2sI5LvyFJaetQSB/7p0F+hmU8/csunwoWARnbOcJt
-SmbyiJQ6eKUXOklOEqxEpGZRa2MbRwukfVx+v6U3N75JxoyuNfqC/G3tKzOIo4qz
-uxiE+1ntesuGTmWuLx9dIKILJ6XuD/rmGSkeKWljLC1jNQEjHioskqIFhcF1JxDv
-qnn8IBfnaoc4GX6AV3fEHifdQEOu7GdicUeA8o+cKqddCZf1PoUTSPby1NcFeDO6
-PPYq4pWYGD1Sc8SOXB+99YOD8hJObGIcskF0VRwv1Kg7rrTBqPLic7kcRA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.caltech.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.caltech.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.caltech.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.caltech.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.caltech.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.caltech.edu/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">caltech.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUC0Z5A7Hz0aGgHdvfgWBw/TW939IwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmNhbHRlY2guZWR1MB4XDTEwMDIwNDAwMzgxNFoX
-DTMwMDIwNDAwMzgxNFowGjEYMBYGA1UEAxMPaWRwLmNhbHRlY2guZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjUfvISEj5BkXO8k4dKr7C1NdlDIs
-osNxbjP39/8oVwgGaMSnkfMhY6xct9gnxTzCRXe49MU+UyVRlljTqTeIJf8VG0K2
-aPSRk9xpzWje/fEkUHgpOjLDM0TNB2tWIQbHQwHz7HsuB/Au870PBMv4EfVz4us8
-yTmYvY2ZJPe192BnIbNyLub138HXjr7TrLBxMg7KulnanGnN75UrVjueRzAvFZlE
-lAZ+shDsjVYAoceEaFn7TF37ehVdjbXwOegtu+vU0kjjCS3cQUXXOs1Ojz6Vood/
-oP1SOisW3bEhboKMUCWEcDckUXHVd/qCekbUsJEt5KAK6Gmf5Ygha748kQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuY2FsdGVjaC5lZHWGJmh0dHBzOi8vaWRwLmNh
-bHRlY2guZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRlqKQBRnVFASGfdigd
-a/ihuq365zANBgkqhkiG9w0BAQUFAAOCAQEAck8P9JfpOWTpgc4LCyaY3WiJFIGe
-WT25D+6Gj7ADxj7+o2UZCcB2sI5LvyFJaetQSB/7p0F+hmU8/csunwoWARnbOcJt
-SmbyiJQ6eKUXOklOEqxEpGZRa2MbRwukfVx+v6U3N75JxoyuNfqC/G3tKzOIo4qz
-uxiE+1ntesuGTmWuLx9dIKILJ6XuD/rmGSkeKWljLC1jNQEjHioskqIFhcF1JxDv
-qnn8IBfnaoc4GX6AV3fEHifdQEOu7GdicUeA8o+cKqddCZf1PoUTSPby1NcFeDO6
-PPYq4pWYGD1Sc8SOXB+99YOD8hJObGIcskF0VRwv1Kg7rrTBqPLic7kcRA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.caltech.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.caltech.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.caltech.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Zailo Leite</md:GivenName>
-    <md:EmailAddress>zleite@caltech.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>RuthAnne Bevier</md:GivenName>
-    <md:EmailAddress>ruthanne@caltech.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cambria.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.cambria.ac.uk-oala-metadata.xml
deleted file mode 100644
index d5d9ed87..00000000
--- a/swamid-interfederations-2.0/idp.cambria.ac.uk-oala-metadata.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://idp.cambria.ac.uk/oala/metadata">
-  <!--
-		This is an IdP for Coleg Cambria.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-26T16:07:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">cambria.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIIJdvNXzLQftIwDQYJKoZIhvcNAQEFBQAwNzEWMBQGA1UE
-						CgwNQ29sZWcgQ2FtYnJpYTEdMBsGA1UEAwwUb2EuaWRwLmNhbWJyaWEuYWMudWsw
-						HhcNMTQwMzE3MTY0MTE5WhcNMjQwMzE3MTY0MTE5WjA3MRYwFAYDVQQKDA1Db2xl
-						ZyBDYW1icmlhMR0wGwYDVQQDDBRvYS5pZHAuY2FtYnJpYS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIF4LXxMc/8UP7vZal6t9DeVSbXFa3Gv
-						5B/ckX4ICa+pfG7qwnr9WNzXISW0iUN+DukAFkvnMrWPJDrOm1HSsfLq2nvDXK81
-						hmuRmRK2V+gUiFh1qhkD9gkaLYzL65xSdC0gz9yP/MwZ+ZKyuNSm+X75GpJ63sLU
-						r+CQEq7S7bKzhftuyFy2OmO5FF8g4BCpHT9C3raOkw5Ni3gyuQkecCJwEtjPFRd4
-						zAM5J/B80c55sTqGh3UfsiUvTaxP5hGpEsnBRdsuFpK0zHozP6jVjxtTbsCrepU1
-						Y2GMGrM+uosjww21YCrj56kDPFMOMaV1463oI9R2TS2OYHwrmZDYlAkCAwEAAaNQ
-						ME4wHQYDVR0OBBYEFGKhkgRWPho7NkRfT3ECt9pkbulGMB8GA1UdIwQYMBaAFGKh
-						kgRWPho7NkRfT3ECt9pkbulGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBABv/D6QzfsuSGfYDgHy/aNPw9VGZJX1pf+5EZXE/vJOKdE+GIasZD1NcSV7I
-						n7UK+JcRDXbeHRc7BvTSth8/MZZPfeh69CIoLsucrQSmh5GasMjplOe8twJSGvRS
-						snKY2a+aGqmh++cCg05uyErkSSFo1SzdQtrLs8kUmsdw06eIzYL1enkIIYwB29Bq
-						Ov2I/duV8Tjgwq8KBpha0dNd1RWT2xp6pKxEwKfPtbNEV4+fZe8lfFHmtajqlIya
-						jApRsetq7QEV/7x+RV5EbhiimKvcEMYW+6js87AIgF5t4ULsFq23KCRu6bQdyku+
-						tBTjcCcqhVBGKeac/ZQWuEP2P2I=
-					</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>
-						MIIDQDCCAiigAwIBAgIIJdvNXzLQftIwDQYJKoZIhvcNAQEFBQAwNzEWMBQGA1UE
-						CgwNQ29sZWcgQ2FtYnJpYTEdMBsGA1UEAwwUb2EuaWRwLmNhbWJyaWEuYWMudWsw
-						HhcNMTQwMzE3MTY0MTE5WhcNMjQwMzE3MTY0MTE5WjA3MRYwFAYDVQQKDA1Db2xl
-						ZyBDYW1icmlhMR0wGwYDVQQDDBRvYS5pZHAuY2FtYnJpYS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIF4LXxMc/8UP7vZal6t9DeVSbXFa3Gv
-						5B/ckX4ICa+pfG7qwnr9WNzXISW0iUN+DukAFkvnMrWPJDrOm1HSsfLq2nvDXK81
-						hmuRmRK2V+gUiFh1qhkD9gkaLYzL65xSdC0gz9yP/MwZ+ZKyuNSm+X75GpJ63sLU
-						r+CQEq7S7bKzhftuyFy2OmO5FF8g4BCpHT9C3raOkw5Ni3gyuQkecCJwEtjPFRd4
-						zAM5J/B80c55sTqGh3UfsiUvTaxP5hGpEsnBRdsuFpK0zHozP6jVjxtTbsCrepU1
-						Y2GMGrM+uosjww21YCrj56kDPFMOMaV1463oI9R2TS2OYHwrmZDYlAkCAwEAAaNQ
-						ME4wHQYDVR0OBBYEFGKhkgRWPho7NkRfT3ECt9pkbulGMB8GA1UdIwQYMBaAFGKh
-						kgRWPho7NkRfT3ECt9pkbulGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBABv/D6QzfsuSGfYDgHy/aNPw9VGZJX1pf+5EZXE/vJOKdE+GIasZD1NcSV7I
-						n7UK+JcRDXbeHRc7BvTSth8/MZZPfeh69CIoLsucrQSmh5GasMjplOe8twJSGvRS
-						snKY2a+aGqmh++cCg05uyErkSSFo1SzdQtrLs8kUmsdw06eIzYL1enkIIYwB29Bq
-						Ov2I/duV8Tjgwq8KBpha0dNd1RWT2xp6pKxEwKfPtbNEV4+fZe8lfFHmtajqlIya
-						jApRsetq7QEV/7x+RV5EbhiimKvcEMYW+6js87AIgF5t4ULsFq23KCRu6bQdyku+
-						tBTjcCcqhVBGKeac/ZQWuEP2P2I=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oa.idp.cambria.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oa.idp.cambria.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Coleg Cambria</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Coleg Cambria</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cambria.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Brandish</SurName>
-    <EmailAddress>mailto:mark.brandish@cambria.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Brandish</SurName>
-    <EmailAddress>mailto:mark.brandish@cambria.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.xml b/swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.xml
deleted file mode 100644
index 22e2d3fb..00000000
--- a/swamid-interfederations-2.0/idp.cambridgeimaging.co.uk-entity.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.cambridgeimaging.co.uk/entity">
-  <!--
-		This is a test Shibboleth IdP for Cambridge Imaging Systems Limited.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T14:39:45Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">cambridgeimaging.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUFqyUnksKx2uVyCZeWl+JRq1o2rcwDQYJKoZIhvcNAQEF
-						BQAwJTEjMCEGA1UEAxMaaWRwLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMw
-						MjIxMTA0NDQ4WhcNMzMwMjIxMTA0NDQ4WjAlMSMwIQYDVQQDExppZHAuY2FtYnJp
-						ZGdlaW1hZ2luZy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AMoKTCTiBT2WdSJHckKjl5POvjT+j37fzENQRrdyTtU7OAI4EPZ4RXTC38K2hPFQ
-						09pK904bqaWP4y/Kvg7cXLJ7+//lJQZDFFO7TFKLsUJK086hkEsKrWUx9ykU4kFG
-						P2LdBxvYcZvtdthzfVtDrdmiJwVwgrCHmhqxX1ICGiz4oXC8FTRSGmgkBZesaD33
-						aItvb4WK78dpQdcCmaZkFFLGUsFcSTCLKwYVcTJeBJ5HSdOvBPJ8Kcvd6RUFbp5N
-						jBk68T4sfH1tsKHqnGHg+UK22WOtpGgIt8zT5pS2l17EJ2s3hz0snJF3c6Lh8eMO
-						nzpq+MFhVFQpV/ZOm920iZ0CAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLmNhbWJy
-						aWRnZWltYWdpbmcuY28udWuGMWh0dHBzOi8vaWRwLmNhbWJyaWRnZWltYWdpbmcu
-						Y28udWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJcUHacY77LJTqyMRSqeZtkF
-						Dbr6MA0GCSqGSIb3DQEBBQUAA4IBAQAFXd/wFyF3UWF5q1NMFqCPPjyqk1jL60WO
-						E0NBCfM9VX24CgrL3QSYTLeVHKwJ/qGznh7/pbMhfAsPFAiX0vQyYTBeKeP1o2V/
-						Dq16b525gritaMhhPg+205Bf3MpD0oJWfM3YwDboC49bqN2/pe2l0QG5+hVp6YN9
-						Hem1W9OFrByZNezVqUxqtWzkShG9xUdsB2DlaRGkakzYz4NY4hAYcsNjQQ7DLXsx
-						jAAuZz8W5S4RMFM1Poe4uEhH5A8dUr31EBcsNTygQOyphzfB/UQmg+Zc4aoDJOqq
-						HNe8mt/HQOesfG/fANyKI7HUpXtIeIqRt/hbk8X+Dy3Dn+lxCmUW
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cambridgeimaging.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cambridgeimaging.co.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.cambridgeimaging.co.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cambridgeimaging.co.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cambridgeimaging.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cambridgeimaging.co.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">cambridgeimaging.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUFqyUnksKx2uVyCZeWl+JRq1o2rcwDQYJKoZIhvcNAQEF
-						BQAwJTEjMCEGA1UEAxMaaWRwLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMw
-						MjIxMTA0NDQ4WhcNMzMwMjIxMTA0NDQ4WjAlMSMwIQYDVQQDExppZHAuY2FtYnJp
-						ZGdlaW1hZ2luZy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AMoKTCTiBT2WdSJHckKjl5POvjT+j37fzENQRrdyTtU7OAI4EPZ4RXTC38K2hPFQ
-						09pK904bqaWP4y/Kvg7cXLJ7+//lJQZDFFO7TFKLsUJK086hkEsKrWUx9ykU4kFG
-						P2LdBxvYcZvtdthzfVtDrdmiJwVwgrCHmhqxX1ICGiz4oXC8FTRSGmgkBZesaD33
-						aItvb4WK78dpQdcCmaZkFFLGUsFcSTCLKwYVcTJeBJ5HSdOvBPJ8Kcvd6RUFbp5N
-						jBk68T4sfH1tsKHqnGHg+UK22WOtpGgIt8zT5pS2l17EJ2s3hz0snJF3c6Lh8eMO
-						nzpq+MFhVFQpV/ZOm920iZ0CAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLmNhbWJy
-						aWRnZWltYWdpbmcuY28udWuGMWh0dHBzOi8vaWRwLmNhbWJyaWRnZWltYWdpbmcu
-						Y28udWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJcUHacY77LJTqyMRSqeZtkF
-						Dbr6MA0GCSqGSIb3DQEBBQUAA4IBAQAFXd/wFyF3UWF5q1NMFqCPPjyqk1jL60WO
-						E0NBCfM9VX24CgrL3QSYTLeVHKwJ/qGznh7/pbMhfAsPFAiX0vQyYTBeKeP1o2V/
-						Dq16b525gritaMhhPg+205Bf3MpD0oJWfM3YwDboC49bqN2/pe2l0QG5+hVp6YN9
-						Hem1W9OFrByZNezVqUxqtWzkShG9xUdsB2DlaRGkakzYz4NY4hAYcsNjQQ7DLXsx
-						jAAuZz8W5S4RMFM1Poe4uEhH5A8dUr31EBcsNTygQOyphzfB/UQmg+Zc4aoDJOqq
-						HNe8mt/HQOesfG/fANyKI7HUpXtIeIqRt/hbk8X+Dy3Dn+lxCmUW
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cambridgeimaging.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cambridgeimaging.co.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">Cambridge Imaging Systems Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cambridge Imaging Systems (test only)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://cambridgeimaging.co.uk/identity_provider</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Graham</GivenName>
-    <SurName>Hemington</SurName>
-    <EmailAddress>mailto:graham.hemington@cambridgeimaging.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>McConkey</SurName>
-    <EmailAddress>mailto:paul.mcconkey@cambridgeimaging.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.camosun.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.camosun.ca-idp-shibboleth.xml
deleted file mode 100644
index 4bf036c5..00000000
--- a/swamid-interfederations-2.0/idp.camosun.ca-idp-shibboleth.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.camosun.ca/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-24T20:22:29Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">camosun.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Camosun College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Camosun College</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.camosun.ca</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>MIIDJDCCAgygAwIBAgIVAPhUQO35onbVePkXGdKrAkBJk0uiMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMMDmlkcC5jYW1vc3VuLmNhMB4XDTE1MDYxOTE5MDkwOVoX
-DTM1MDYxOTE5MDkwOVowGTEXMBUGA1UEAwwOaWRwLmNhbW9zdW4uY2EwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCHBmK+VJdfG5ksaVqQfNbmMxJCU6k
-s7xLXLbFtV0/cHdYLyHIDc6NYceBjW7aeLon2shOywHinogpLJHZM2VhOFnYSXNT
-AMIqrMPnr6DlDKfX1I1Fn2E1BQcUFDXflzbXAtK+hkQEdDNAByvdtp+XvPa8ke0h
-sq0k5gbF/3jA1stUOMCIh5mIwRrPZGavWe9HpNazX6roCYPypIS9EO9KSargefkY
-gAQ5JpZKYmtIr59n7bSILdEsJIsXAvCcSsaGixicbJtQ+Gexvf61QndsXeu5hZn7
-wG5/oalIEoUFxYdq2vquFTidhLeHhkvO0k9oVmxWH+a4uL/N1HCTt/MHAgMBAAGj
-YzBhMB0GA1UdDgQWBBSHc3+KmnnEmJ5GHGDU9S2wPHOQHDBABgNVHREEOTA3gg5p
-ZHAuY2Ftb3N1bi5jYYYlaHR0cHM6Ly9pZHAuY2Ftb3N1bi5jYS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQUFAAOCAQEASv2BCHVX/ZO47qRm8Yu0Qvg0yyPnHMWp
-AFzAwJiRH7sWOlcYOUof8Kff7j1w0HgrF4yx+umnMK5761jNUEY3qxGS4YUQWLA9
-iI4CZ7cBEbo/Li69ms3vBQjiwoW5XCMu8EfGqtowAv6pnhGNoV87PAR3q/1UdsoQ
-pw5z4m/INOggN7LnZTx8B5+slUFaspox2RU0MWAUdn9AZ0E4DWtxpyrJQMacKUu5
-kNRHgdvfQkrNQk/qOpdDh10wJSP50jy+tZaVw/rjqwnzkU/KoaNakopLHOqLRuXB
-fMDTRYP77TLlpD+uApJmxedJ67j4aOhQ2v7iOZewpThU3Wpzndpo9Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.camosun.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.camosun.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.camosun.ca/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.camosun.ca/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.camosun.ca: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.camosun.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.camosun.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.camosun.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.camosun.ca/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">camosun.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAPhUQO35onbVePkXGdKrAkBJk0uiMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMMDmlkcC5jYW1vc3VuLmNhMB4XDTE1MDYxOTE5MDkwOVoX
-DTM1MDYxOTE5MDkwOVowGTEXMBUGA1UEAwwOaWRwLmNhbW9zdW4uY2EwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCHBmK+VJdfG5ksaVqQfNbmMxJCU6k
-s7xLXLbFtV0/cHdYLyHIDc6NYceBjW7aeLon2shOywHinogpLJHZM2VhOFnYSXNT
-AMIqrMPnr6DlDKfX1I1Fn2E1BQcUFDXflzbXAtK+hkQEdDNAByvdtp+XvPa8ke0h
-sq0k5gbF/3jA1stUOMCIh5mIwRrPZGavWe9HpNazX6roCYPypIS9EO9KSargefkY
-gAQ5JpZKYmtIr59n7bSILdEsJIsXAvCcSsaGixicbJtQ+Gexvf61QndsXeu5hZn7
-wG5/oalIEoUFxYdq2vquFTidhLeHhkvO0k9oVmxWH+a4uL/N1HCTt/MHAgMBAAGj
-YzBhMB0GA1UdDgQWBBSHc3+KmnnEmJ5GHGDU9S2wPHOQHDBABgNVHREEOTA3gg5p
-ZHAuY2Ftb3N1bi5jYYYlaHR0cHM6Ly9pZHAuY2Ftb3N1bi5jYS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQUFAAOCAQEASv2BCHVX/ZO47qRm8Yu0Qvg0yyPnHMWp
-AFzAwJiRH7sWOlcYOUof8Kff7j1w0HgrF4yx+umnMK5761jNUEY3qxGS4YUQWLA9
-iI4CZ7cBEbo/Li69ms3vBQjiwoW5XCMu8EfGqtowAv6pnhGNoV87PAR3q/1UdsoQ
-pw5z4m/INOggN7LnZTx8B5+slUFaspox2RU0MWAUdn9AZ0E4DWtxpyrJQMacKUu5
-kNRHgdvfQkrNQk/qOpdDh10wJSP50jy+tZaVw/rjqwnzkU/KoaNakopLHOqLRuXB
-fMDTRYP77TLlpD+uApJmxedJ67j4aOhQ2v7iOZewpThU3Wpzndpo9Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.camosun.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.camosun.ca: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">Camosun College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Camosun College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.camosun.ca</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Stephen Campbell, Camosun College Information Technology Services</md:SurName>
-    <md:EmailAddress>mailto:campbells@camosun.bc.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.camre.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.camre.ac.uk-shibboleth.xml
deleted file mode 100644
index 22ec0cfb..00000000
--- a/swamid-interfederations-2.0/idp.camre.ac.uk-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.camre.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Cambridge Regional College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">camre.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/camre.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/camre.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cambridge Regional College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.camre.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</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 85f55d09..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.canarie.ca/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.canarie.ca: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.canarie.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.canarie.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.canarie.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.canarie.ca/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">canarie.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.canarie.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.canarie.ca: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">CANARIE</md:OrganizationName>
-    <md:OrganizationName xml:lang="fr">CANARIE </md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Canada's Advanced Research and Innovation Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">Le réseau évolué de recherche et d'innovation du Canada</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Network Operations Center</md:SurName>
-    <md:EmailAddress>noc@canarie.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 7ea0bd11..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.candi.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.candi.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 4729f37b..00000000
--- a/swamid-interfederations-2.0/idp.candi.ac.uk-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.candi.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for City and Islington College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-06T17:37: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">candi.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXjCCAkYCCQCg/FLFP/fzOTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGTG9uZG9uMRIwEAYDVQQHEwlJc2xpbmd0b24xIzAhBgNVBAoT
-						GkNpdHkgYW5kIElzbGluZ3RvbiBDb2xsZWdlMRgwFgYDVQQDEw9pZHAuY2FuZGku
-						YWMudWswHhcNMTQwODExMTA1MDAxWhcNMzQwODA2MTA1MDAxWjBxMQswCQYDVQQG
-						EwJHQjEPMA0GA1UECBMGTG9uZG9uMRIwEAYDVQQHEwlJc2xpbmd0b24xIzAhBgNV
-						BAoTGkNpdHkgYW5kIElzbGluZ3RvbiBDb2xsZWdlMRgwFgYDVQQDEw9pZHAuY2Fu
-						ZGkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYGeuw+zrL
-						Zf6PQdtZWCTr8hno/45ceRQxSzgkTQTvn9RNXjx1uUeXbektJang4mm8WPIBgPcf
-						qeP+ySSswFnCQW/sH2qKUYUjQ8k9Jvumjc5z1EJJLSPnwCn4xKmNVTcioMZXmdz8
-						0dbbJQllbRNUJzesKpEY3BxlaxtvNyY+G7l7dcDdtpCcuC5qpeFmBobH8+l6x5kv
-						dwTqyynGIkzGGF9CmV24ZEDuRGhxmllkOeous5PGIugTS/fJzNUt0YutPO9gVJl6
-						lSuLndEYogecKvlegQJ+cj7jxbK/PTFrHP+hQcjKYbZqRT5h9pBHsxzEoSYSzpvX
-						XIKIQtCwkpgRAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADiE+smBM3xMAZ9uD5rX
-						/cVK+a9iC4ZLq99x6sbuCt40/nUkQeImH0XMQS2D8OqY0dkVC3Sgdpxr2rk9uNzB
-						5BuP1ESK1Qm0PZ9883V0N5JJI5nAxlMvwBq0qFbiUpgs9XASK9vcL84a9B43IhKP
-						BmUkLXnsyH/2lb5FqnOOOIASLg+kPH5pZgaBzlevct+T1EJ0n9lUpJOsCG7xG40R
-						OTQ0RbpF+nldggrOT5IdT2xfd4GVmYuqBjnEZTjCFonujU5hVJ2rqacxDjK/qy1r
-						PVGtTIe+TUbsRU4VYYaUPQx9TY5zeg5y5P71c0QhVOFl4vGU2Usoaa3/5GpdoRxT
-						lHI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.candi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.candi.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.candi.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.candi.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.candi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.candi.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">candi.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXjCCAkYCCQCg/FLFP/fzOTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGTG9uZG9uMRIwEAYDVQQHEwlJc2xpbmd0b24xIzAhBgNVBAoT
-						GkNpdHkgYW5kIElzbGluZ3RvbiBDb2xsZWdlMRgwFgYDVQQDEw9pZHAuY2FuZGku
-						YWMudWswHhcNMTQwODExMTA1MDAxWhcNMzQwODA2MTA1MDAxWjBxMQswCQYDVQQG
-						EwJHQjEPMA0GA1UECBMGTG9uZG9uMRIwEAYDVQQHEwlJc2xpbmd0b24xIzAhBgNV
-						BAoTGkNpdHkgYW5kIElzbGluZ3RvbiBDb2xsZWdlMRgwFgYDVQQDEw9pZHAuY2Fu
-						ZGkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYGeuw+zrL
-						Zf6PQdtZWCTr8hno/45ceRQxSzgkTQTvn9RNXjx1uUeXbektJang4mm8WPIBgPcf
-						qeP+ySSswFnCQW/sH2qKUYUjQ8k9Jvumjc5z1EJJLSPnwCn4xKmNVTcioMZXmdz8
-						0dbbJQllbRNUJzesKpEY3BxlaxtvNyY+G7l7dcDdtpCcuC5qpeFmBobH8+l6x5kv
-						dwTqyynGIkzGGF9CmV24ZEDuRGhxmllkOeous5PGIugTS/fJzNUt0YutPO9gVJl6
-						lSuLndEYogecKvlegQJ+cj7jxbK/PTFrHP+hQcjKYbZqRT5h9pBHsxzEoSYSzpvX
-						XIKIQtCwkpgRAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADiE+smBM3xMAZ9uD5rX
-						/cVK+a9iC4ZLq99x6sbuCt40/nUkQeImH0XMQS2D8OqY0dkVC3Sgdpxr2rk9uNzB
-						5BuP1ESK1Qm0PZ9883V0N5JJI5nAxlMvwBq0qFbiUpgs9XASK9vcL84a9B43IhKP
-						BmUkLXnsyH/2lb5FqnOOOIASLg+kPH5pZgaBzlevct+T1EJ0n9lUpJOsCG7xG40R
-						OTQ0RbpF+nldggrOT5IdT2xfd4GVmYuqBjnEZTjCFonujU5hVJ2rqacxDjK/qy1r
-						PVGtTIe+TUbsRU4VYYaUPQx9TY5zeg5y5P71c0QhVOFl4vGU2Usoaa3/5GpdoRxT
-						lHI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.candi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.candi.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">City and Islington College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">City and Islington College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.candi.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Terri</GivenName>
-    <SurName>Omer</SurName>
-    <EmailAddress>mailto:terri.omer@candi.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Thambiayah</GivenName>
-    <SurName>Sivakumar</SurName>
-    <EmailAddress>mailto:Thambiayah.Sivakumar@candi.ac.uk</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 dbc65fec..00000000
--- a/swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://idp.capes.gov.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDmDCCAoACAQAwDQYJKoZIhvcNAQEFBQAwgZExDjAMBgNVBAoTBUNBUEVTMQ4w
-DAYDVQQLEwVDQVBFUzEgMB4GCSqGSIb3DQEJARYRcmVkZUBjYXBlcy5nb3YuYnIx
-EjAQBgNVBAcUCUJyYXPDaWxpYTERMA8GA1UECBMIQnJhc2lsaWExCzAJBgNVBAYT
-AkJSMRkwFwYDVQQDExBpZHAuY2FwZXMuZ292LmJyMB4XDTE1MDIyNDIwMDQ1MloX
-DTIwMDIyMzIwMDQ1MlowgZExDjAMBgNVBAoTBUNBUEVTMQ4wDAYDVQQLEwVDQVBF
-UzEgMB4GCSqGSIb3DQEJARYRcmVkZUBjYXBlcy5nb3YuYnIxEjAQBgNVBAcUCUJy
-YXPDaWxpYTERMA8GA1UECBMIQnJhc2lsaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
-ExBpZHAuY2FwZXMuZ292LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwI90QNUmsF2GRpWA4DR+UEg0fXIkwS1u25J4ZcQIcSyCwmxgS7uuuwPYnfAO
-XkGMGUs63+ZDfRj6Es75AyBr15+inuH5gO4HAb+rfQmCTGz0LXh2MCR53jF9YT3C
-nRPwqkftNUe9hggxQgOsbVNGjJ6U9ZHKTFbkAtyz9hmSVCJhSCGh92HkJC3o4BRo
-XsgQKuj5zv8l0e83SWPKyx8zmA8REdsVF1V6MxxMo6IuO1UoJTXJ0J6zs2FGYlZk
-35PqNa/DxkRHsdCTA5/opIRHk6+M80jLLeUB7AES6Jub8g+DsJzciaPZCRCxygzF
-E1vIruhQpozTE/xXCgst1jemvwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC1ZrRa
-gcKuLZlFmgq8Cb5R8qpWNc8HJG+cFArJ82EfVrfHE/Sbs2y+OQAYrRwueCgXiOpi
-WhmRjyfa9dXncRd9OgJ4iuiAC4LyKyBrr0hNF/CBeMATH1TY9ExwMo7Ib2AyL9yL
-IjoiAa4xqjg5SLe5/kagAGY8wmkKl9d0RfAWJLhyFI9vBBZC7s8J8Zi/n24164xN
-rmpcmEWQr4TehtiDJTAWcxlPuBp4SepXQwiFl3mnc7T7YHFLah5FLiIgnp6okU97
-WcQDFcFmVxjm4aNnbIYplvTtHd9skzcB5myj5qSNvVgHAqsL0WNXRQIfZk87IdZG
-lLrJjJ6tQYgZleqz
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.capes.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.capes.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.capes.gov.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.capes.gov.br/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">gov.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-
-MIIDmDCCAoACAQAwDQYJKoZIhvcNAQEFBQAwgZExDjAMBgNVBAoTBUNBUEVTMQ4w
-DAYDVQQLEwVDQVBFUzEgMB4GCSqGSIb3DQEJARYRcmVkZUBjYXBlcy5nb3YuYnIx
-EjAQBgNVBAcUCUJyYXPDaWxpYTERMA8GA1UECBMIQnJhc2lsaWExCzAJBgNVBAYT
-AkJSMRkwFwYDVQQDExBpZHAuY2FwZXMuZ292LmJyMB4XDTE1MDIyNDIwMDQ1MloX
-DTIwMDIyMzIwMDQ1MlowgZExDjAMBgNVBAoTBUNBUEVTMQ4wDAYDVQQLEwVDQVBF
-UzEgMB4GCSqGSIb3DQEJARYRcmVkZUBjYXBlcy5nb3YuYnIxEjAQBgNVBAcUCUJy
-YXPDaWxpYTERMA8GA1UECBMIQnJhc2lsaWExCzAJBgNVBAYTAkJSMRkwFwYDVQQD
-ExBpZHAuY2FwZXMuZ292LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwI90QNUmsF2GRpWA4DR+UEg0fXIkwS1u25J4ZcQIcSyCwmxgS7uuuwPYnfAO
-XkGMGUs63+ZDfRj6Es75AyBr15+inuH5gO4HAb+rfQmCTGz0LXh2MCR53jF9YT3C
-nRPwqkftNUe9hggxQgOsbVNGjJ6U9ZHKTFbkAtyz9hmSVCJhSCGh92HkJC3o4BRo
-XsgQKuj5zv8l0e83SWPKyx8zmA8REdsVF1V6MxxMo6IuO1UoJTXJ0J6zs2FGYlZk
-35PqNa/DxkRHsdCTA5/opIRHk6+M80jLLeUB7AES6Jub8g+DsJzciaPZCRCxygzF
-E1vIruhQpozTE/xXCgst1jemvwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC1ZrRa
-gcKuLZlFmgq8Cb5R8qpWNc8HJG+cFArJ82EfVrfHE/Sbs2y+OQAYrRwueCgXiOpi
-WhmRjyfa9dXncRd9OgJ4iuiAC4LyKyBrr0hNF/CBeMATH1TY9ExwMo7Ib2AyL9yL
-IjoiAa4xqjg5SLe5/kagAGY8wmkKl9d0RfAWJLhyFI9vBBZC7s8J8Zi/n24164xN
-rmpcmEWQr4TehtiDJTAWcxlPuBp4SepXQwiFl3mnc7T7YHFLah5FLiIgnp6okU97
-WcQDFcFmVxjm4aNnbIYplvTtHd9skzcB5myj5qSNvVgHAqsL0WNXRQIfZk87IdZG
-lLrJjJ6tQYgZleqz
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.capes.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.capes.gov.br:8443/idp/profile/SAML1/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">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">CAPES - Coordenacao de Aperfeicoamento de Pessoal de Nivel Superior</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.capes.gov.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.capes.gov.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>DTI/CGII</md:SurName>
-    <md:EmailAddress>rede@capes.gov.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 fcab7ddf..00000000
--- a/swamid-interfederations-2.0/idp.cardiff.ac.uk-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" 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>
-    <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: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>Philip </GivenName>
-    <SurName>Smart</SurName>
-    <EmailAddress>mailto:smartp@cardiff.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cardiffmet.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cardiffmet.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index bb4817a7..00000000
--- a/swamid-interfederations-2.0/idp.cardiffmet.ac.uk-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" entityID="https://idp.cardiffmet.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Cardiff Metropolitan University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-26T17:02:53Z">
-      <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">cardiffmet.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cardiff Metropolitan University</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://idplogos.uwic.ac.uk/cmet80x60.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idplogos.uwic.ac.uk/cmet_16x16_crest.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAM/WrHuhoD12UZd9duSVXiTcAQKqMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMMFGlkcC5jYXJkaWZmbWV0LmFjLnVrMB4XDTE0MTEyODE0
-						NTA1OFoXDTM0MTEyODE0NTA1OFowHzEdMBsGA1UEAwwUaWRwLmNhcmRpZmZtZXQu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCibib8LKS+kWc/
-						4jFZaF5lJlCYKGc2M3h7Dzx7En9rOaP/4BnyRXmIfX0XQQ43Zl/M3TZ1V3lfOMl0
-						mS7qxiNP9tRR44Imj4tAlPGTL0/G6wKrRgZwT5Ya5Situ4uGSjRqlEXKp0WPX9DB
-						rV40f+n3amXbG6968QkBgMTVQoYSfPYPDeYvMkJgIBJ7fFEfoiUEMLbmApFvKAOF
-						fh3AyRIgIvNZGuhCmOurAxrK83NQf8GxYCrxWVYBDxy2zM+ieqIQfXq7vKPwRj0i
-						I93TqeH3tW+NNXxp3L2Vhqp6QjNwTJuQoq8CyeFAppZ3R7I76gS0a/G65BnDexXr
-						s35piiX3AgMBAAGjbzBtMB0GA1UdDgQWBBRhlIKvVhsJq55eRmziUxsfKVzMkjBM
-						BgNVHREERTBDghRpZHAuY2FyZGlmZm1ldC5hYy51a4YraHR0cHM6Ly9pZHAuY2Fy
-						ZGlmZm1ldC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
-						V2tNA0SAzHCAXhPCbT2SAMgB4bSGM51OLwKn+tJNC5gasFq62kERnXcRbl/Ii5VZ
-						Iu1t8ml0jTLBjiFYCFtq4uGEMeDPPxKNUNEPkWfIqCq693CrSHc1M5Lso4CmhiCK
-						CAnz0V1oVkgyBW9e7WnDzRGvVN12hTGmS33ZINOamwmQErUbeEdRnlB7fa3BZHB9
-						kdW3SZRhb7CynWQoB6byYyBBWKfTuD1qScRQlIFhOscGX3qxBYBIqwzsJkd4qXPK
-						3qrSFwHAyC6nXz1MLyanluHTBD+41hABSHxu5pwWhD8xXbFS0dA+8qJwagPvuO8q
-						JA5KMQm1uzCs13HbQj79Nw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardiffmet.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardiffmet.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.cardiffmet.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardiffmet.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.cardiffmet.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cardiffmet.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cardiffmet.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">cardiffmet.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAM/WrHuhoD12UZd9duSVXiTcAQKqMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMMFGlkcC5jYXJkaWZmbWV0LmFjLnVrMB4XDTE0MTEyODE0
-						NTA1OFoXDTM0MTEyODE0NTA1OFowHzEdMBsGA1UEAwwUaWRwLmNhcmRpZmZtZXQu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCibib8LKS+kWc/
-						4jFZaF5lJlCYKGc2M3h7Dzx7En9rOaP/4BnyRXmIfX0XQQ43Zl/M3TZ1V3lfOMl0
-						mS7qxiNP9tRR44Imj4tAlPGTL0/G6wKrRgZwT5Ya5Situ4uGSjRqlEXKp0WPX9DB
-						rV40f+n3amXbG6968QkBgMTVQoYSfPYPDeYvMkJgIBJ7fFEfoiUEMLbmApFvKAOF
-						fh3AyRIgIvNZGuhCmOurAxrK83NQf8GxYCrxWVYBDxy2zM+ieqIQfXq7vKPwRj0i
-						I93TqeH3tW+NNXxp3L2Vhqp6QjNwTJuQoq8CyeFAppZ3R7I76gS0a/G65BnDexXr
-						s35piiX3AgMBAAGjbzBtMB0GA1UdDgQWBBRhlIKvVhsJq55eRmziUxsfKVzMkjBM
-						BgNVHREERTBDghRpZHAuY2FyZGlmZm1ldC5hYy51a4YraHR0cHM6Ly9pZHAuY2Fy
-						ZGlmZm1ldC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
-						V2tNA0SAzHCAXhPCbT2SAMgB4bSGM51OLwKn+tJNC5gasFq62kERnXcRbl/Ii5VZ
-						Iu1t8ml0jTLBjiFYCFtq4uGEMeDPPxKNUNEPkWfIqCq693CrSHc1M5Lso4CmhiCK
-						CAnz0V1oVkgyBW9e7WnDzRGvVN12hTGmS33ZINOamwmQErUbeEdRnlB7fa3BZHB9
-						kdW3SZRhb7CynWQoB6byYyBBWKfTuD1qScRQlIFhOscGX3qxBYBIqwzsJkd4qXPK
-						3qrSFwHAyC6nXz1MLyanluHTBD+41hABSHxu5pwWhD8xXbFS0dA+8qJwagPvuO8q
-						JA5KMQm1uzCs13HbQj79Nw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardiffmet.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardiffmet.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 Metropolitan University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff Metropolitan University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cardiffmet.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:ithelpdesk@cardiffmet.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andi</GivenName>
-    <SurName>Morris</SurName>
-    <EmailAddress>mailto:amorris@cardiffmet.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cardinalnewman.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cardinalnewman.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index db66864c..00000000
--- a/swamid-interfederations-2.0/idp.cardinalnewman.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.cardinalnewman.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Cardinal Newman College, Preston.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">cardinalnewman.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIVAJXtCjT47ZPtsA2VBKyWHL0NGjqUMA0GCSqGSIb3DQEB
-						BQUAMCMxITAfBgNVBAMTGGlkcC5jYXJkaW5hbG5ld21hbi5hYy51azAeFw0xMTA4
-						MDgwOTU2NTBaFw0zMTA4MDgwOTU2NTBaMCMxITAfBgNVBAMTGGlkcC5jYXJkaW5h
-						bG5ld21hbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJQW
-						EmuHiLRzTQs3XvnVaQGZvME2NGRwEOUfrWsoVCSJjV3YUZ7inuMBtqJXTul3PlAZ
-						ELzz3+NgNX/PP7HT4rV5Uhj/L5R/VwgmgjTXYUIi2d7wdg1HOJ2nYvAm9LnkSYFY
-						0b1OT5YmIL/LSfSaj0RVs4SOCuvzOu+WaZjo6Z5MnLV/MiwCno4vBn0TrIcZ9H4y
-						BsOR6+gh3iBev/PSjt5VN9oViD/vD3RNYY0woYZtbKvGhACVAKLok4HEYsJ2hcbS
-						P+LwOFsCMy69FHawLejegqCF+Yhh1HMHRwz6MGxBrrGo100vdeJTcQtACguXL0bn
-						rPFqeboyfkZ/j1P3uicCAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLmNhcmRpbmFs
-						bmV3bWFuLmFjLnVrhi9odHRwczovL2lkcC5jYXJkaW5hbG5ld21hbi5hYy51ay9p
-						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVZfvR2nlc/IkJOBss2ktW/Hg3uswDQYJ
-						KoZIhvcNAQEFBQADggEBAB6DXw0SAw+1hnjApCsG20tA0U2y6RgVJrylms5BM2ca
-						zkgFwYNpbEq5NpuWwTzf5APbEIyAbF90Im5x5YBf0BqFuUYu4k7+KDRZKkMkkbmV
-						gEWKlkI33tF+OmMIhjJPeFwMMMe+yeBWed2quQYky7DhDnGQDgjaczug4GfZcty6
-						D65BSsxZ1l+pD/MIz+bEFMWckIGCI20CufIMzBasW8+CwQL6DOu80yQe+/fTSNxM
-						DKKf5b/CUVzrbvNvNpbxgqiH0CHQ+c62cxglU5i28G11UvlhSpm1GZ1LAeE+rEEO
-						/vAZMV0yVq3MPZvOkL6Nktyh9Q/qV+6INTMpDQMv7Uk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardinalnewman.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardinalnewman.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.cardinalnewman.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cardinalnewman.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cardinalnewman.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cardinalnewman.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">cardinalnewman.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIVAJXtCjT47ZPtsA2VBKyWHL0NGjqUMA0GCSqGSIb3DQEB
-						BQUAMCMxITAfBgNVBAMTGGlkcC5jYXJkaW5hbG5ld21hbi5hYy51azAeFw0xMTA4
-						MDgwOTU2NTBaFw0zMTA4MDgwOTU2NTBaMCMxITAfBgNVBAMTGGlkcC5jYXJkaW5h
-						bG5ld21hbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJQW
-						EmuHiLRzTQs3XvnVaQGZvME2NGRwEOUfrWsoVCSJjV3YUZ7inuMBtqJXTul3PlAZ
-						ELzz3+NgNX/PP7HT4rV5Uhj/L5R/VwgmgjTXYUIi2d7wdg1HOJ2nYvAm9LnkSYFY
-						0b1OT5YmIL/LSfSaj0RVs4SOCuvzOu+WaZjo6Z5MnLV/MiwCno4vBn0TrIcZ9H4y
-						BsOR6+gh3iBev/PSjt5VN9oViD/vD3RNYY0woYZtbKvGhACVAKLok4HEYsJ2hcbS
-						P+LwOFsCMy69FHawLejegqCF+Yhh1HMHRwz6MGxBrrGo100vdeJTcQtACguXL0bn
-						rPFqeboyfkZ/j1P3uicCAwEAAaN3MHUwVAYDVR0RBE0wS4IYaWRwLmNhcmRpbmFs
-						bmV3bWFuLmFjLnVrhi9odHRwczovL2lkcC5jYXJkaW5hbG5ld21hbi5hYy51ay9p
-						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVZfvR2nlc/IkJOBss2ktW/Hg3uswDQYJ
-						KoZIhvcNAQEFBQADggEBAB6DXw0SAw+1hnjApCsG20tA0U2y6RgVJrylms5BM2ca
-						zkgFwYNpbEq5NpuWwTzf5APbEIyAbF90Im5x5YBf0BqFuUYu4k7+KDRZKkMkkbmV
-						gEWKlkI33tF+OmMIhjJPeFwMMMe+yeBWed2quQYky7DhDnGQDgjaczug4GfZcty6
-						D65BSsxZ1l+pD/MIz+bEFMWckIGCI20CufIMzBasW8+CwQL6DOu80yQe+/fTSNxM
-						DKKf5b/CUVzrbvNvNpbxgqiH0CHQ+c62cxglU5i28G11UvlhSpm1GZ1LAeE+rEEO
-						/vAZMV0yVq3MPZvOkL6Nktyh9Q/qV+6INTMpDQMv7Uk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cardinalnewman.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cardinalnewman.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">Cardinal Newman College, Preston</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardinal Newman College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cardinalnewman.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steven</GivenName>
-    <SurName>Gray</SurName>
-    <EmailAddress>mailto:sgray@cardinalnewman.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Anthony</GivenName>
-    <SurName>Dickinson</SurName>
-    <EmailAddress>mailto:ADickinson@cardinalnewman.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Gray</SurName>
-    <EmailAddress>mailto:sgray@cardinalnewman.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Anthony</GivenName>
-    <SurName>Dickinson</SurName>
-    <EmailAddress>mailto:ADickinson@cardinalnewman.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.carnegiecollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.carnegiecollege.ac.uk-shibboleth.xml
deleted file mode 100644
index be21d2d6..00000000
--- a/swamid-interfederations-2.0/idp.carnegiecollege.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://idp.carnegiecollege.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Fife College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">carnegiecollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVAOUN5zR4W0Yp623P7ivOXWG1NWWNMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGWlkcC5jYXJuZWdpZWNvbGxlZ2UuYWMudWswHhcNMTEw
-						ODAxMTE1MTA0WhcNMzEwODAxMTE1MTA0WjAkMSIwIAYDVQQDExlpZHAuY2FybmVn
-						aWVjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						jiGLbGd7T4/psE8UmyiVNE1j/T4sNaEwOdLvp0stPmfu8I+heqJ/TgblcJs0d3Vg
-						2I0SQoXqecXxZMYEXvHL80lHKZUKgCF5U7hEbCdc2Q6mtGhxbcmxonbGxXEEnzci
-						v2HMvXND/uKlS/walNdpWxUZTruElufziDsJJ2bvbOFbK29JQmpbtovryCP68+TC
-						qUHeyhy9vekri0tHeB/R1lIZHuUUVkhlhHD9njlNxaireJDmOouef7aYmKpX+CA7
-						HD/pWazQnBLTJi1cLSbez12QDwDjKhIEh17+ne945Ibo9laDBmxhkHQ8CHsk09T5
-						Bh+mImcqg2fREh8c+ELjLQIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuY2FybmVn
-						aWVjb2xsZWdlLmFjLnVrhjBodHRwczovL2lkcC5jYXJuZWdpZWNvbGxlZ2UuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMz/6hexyF79UfvamqhIzF41IeCX
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBPsSxzTWj/1zTaokQqCzcw3ULAb77rgV3ldUN/
-						BdFGDIOn96JBAH5th8IBduafAFr9C8tfzmAV9uYLPoIeVWaZy+vjI2jIMr6Ciurt
-						uV96WaUEfdqHXzST6zGQl3Zg1XLZIyNJFDTPjurufLNCEGdC1/9qFtYfNL/MVXsK
-						qawDw3GsR+96Nl1QTYpYeRllUABAbxTZO/jm7gOLx+II4b7/3y5cpnKKlLmO7ALx
-						6HponMBdA1XIp7jA/UAjqgj1uxj0VWwIB3th1ZHHC5iGSZoZsT2F/61MWws0DoTz
-						UcbdW5gmbo27wUFi3yN1cTFz2SMowbSx4fOzJcu/ulqb2Cz+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.carnegiecollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.carnegiecollege.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.carnegiecollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.carnegiecollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.carnegiecollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.carnegiecollege.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">carnegiecollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVAOUN5zR4W0Yp623P7ivOXWG1NWWNMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGWlkcC5jYXJuZWdpZWNvbGxlZ2UuYWMudWswHhcNMTEw
-						ODAxMTE1MTA0WhcNMzEwODAxMTE1MTA0WjAkMSIwIAYDVQQDExlpZHAuY2FybmVn
-						aWVjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						jiGLbGd7T4/psE8UmyiVNE1j/T4sNaEwOdLvp0stPmfu8I+heqJ/TgblcJs0d3Vg
-						2I0SQoXqecXxZMYEXvHL80lHKZUKgCF5U7hEbCdc2Q6mtGhxbcmxonbGxXEEnzci
-						v2HMvXND/uKlS/walNdpWxUZTruElufziDsJJ2bvbOFbK29JQmpbtovryCP68+TC
-						qUHeyhy9vekri0tHeB/R1lIZHuUUVkhlhHD9njlNxaireJDmOouef7aYmKpX+CA7
-						HD/pWazQnBLTJi1cLSbez12QDwDjKhIEh17+ne945Ibo9laDBmxhkHQ8CHsk09T5
-						Bh+mImcqg2fREh8c+ELjLQIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuY2FybmVn
-						aWVjb2xsZWdlLmFjLnVrhjBodHRwczovL2lkcC5jYXJuZWdpZWNvbGxlZ2UuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMz/6hexyF79UfvamqhIzF41IeCX
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBPsSxzTWj/1zTaokQqCzcw3ULAb77rgV3ldUN/
-						BdFGDIOn96JBAH5th8IBduafAFr9C8tfzmAV9uYLPoIeVWaZy+vjI2jIMr6Ciurt
-						uV96WaUEfdqHXzST6zGQl3Zg1XLZIyNJFDTPjurufLNCEGdC1/9qFtYfNL/MVXsK
-						qawDw3GsR+96Nl1QTYpYeRllUABAbxTZO/jm7gOLx+II4b7/3y5cpnKKlLmO7ALx
-						6HponMBdA1XIp7jA/UAjqgj1uxj0VWwIB3th1ZHHC5iGSZoZsT2F/61MWws0DoTz
-						UcbdW5gmbo27wUFi3yN1cTFz2SMowbSx4fOzJcu/ulqb2Cz+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.carnegiecollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.carnegiecollege.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">Fife College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Carnegie College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://carnegiecollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sarah Louise</GivenName>
-    <SurName>MacAdie</SurName>
-    <EmailAddress>mailto:sarahlouisemacadie@fife.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Campbell</SurName>
-    <EmailAddress>mailto:paulcampbell@fife.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cc.uga.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cc.uga.edu-idp-shibboleth.xml
deleted file mode 100644
index 68a0baee..00000000
--- a/swamid-interfederations-2.0/idp.cc.uga.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,142 +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://idp.cc.uga.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uga.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Georgia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Shibboleth 2.x</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>
-MIIDRjCCAi4CCQD0C+UOJQz5qjANBgkqhkiG9w0BAQUFADBlMRgwFgYDVQQDDA9p
-ZHAuZGV2LnVnYS5lZHUxHjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgR2VvcmdpYTEL
-MAkGA1UEBhMCVVMxCzAJBgNVBAgMAkdBMQ8wDQYDVQQHDAZBdGhlbnMwHhcNMTUw
-MzEzMTU0ODI3WhcNMTYwMzEyMTU0ODI3WjBlMRgwFgYDVQQDDA9pZHAuZGV2LnVn
-YS5lZHUxHjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgR2VvcmdpYTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAkdBMQ8wDQYDVQQHDAZBdGhlbnMwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC39mQdrZiYhMAfLcMQCWDUU2IySnIbro+xWE29UKZl
-3OAjD2UjjDBOs77YDk2TmUsKucG7vEogVIPPAtWK+RCuIkLMUFs+v3ZPvYuRqBDY
-9ComFpsuVqXaopaYRcddAIkHf+bgNwLCMYe4E8xGdumr95EnV7qdPPZqoju72VL5
-UgSris8FMoXFkkh5SEgvchV2voeKVySi8XjP3U4lubqhAyP6s0Kl5EgVNeha3JXI
-wdWBcAizE7vO/tgClDNdcgN0lOghNX7neWxkT8I7JACKnn277kQPNOiXq0z2EEzl
-AFDvGbzhEHDCq31hJ1XH2DujLoN2EfSPlGZsu/YGMF63AgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAJUXilMXABVFYbaEvptvMvuoN5yvxu6U1xhGKJ6RHNqcF32Kq8M8
-cn4VsbTaT4OmaP77TcbnaoxbYwA9kmQI/s0I7IRkYnGSFm7fIjmttLHwci9Ve8lN
-RI44IKzN3h2IENCq86zLpu0t9eBb6FRT1QBxr42p6Gv+PwNyDfthxW85bO2sSVDd
-1DOzxzmOfWekXdypSsC/FKqtk2+bordT5n9A61x8xfKG8LtM1ThhHqAO/0j8fd8N
-Ki/S+qS1S8KfxPmHlUYIw7dHs3xrAJXmKadkZK30KhT5nw2dJ6iLDoOMRV7Xq18W
-Pod/7K5BxkdiDL8kTktbtYDFm1OdZXo/isk=
-          </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>
-MIIDIDCCAggCCQDYTLE1vTqdiTANBgkqhkiG9w0BAQUFADBSMRcwFQYDVQQDDA5p
-ZHAuY2MudWdhLmVkdTEMMAoGA1UECgwDVUdBMQswCQYDVQQGEwJVUzELMAkGA1UE
-CAwCR0ExDzANBgNVBAcMBkF0aGVuczAeFw0xNTAzMjMxNDM0NTlaFw0xNjAzMjIx
-NDM0NTlaMFIxFzAVBgNVBAMMDmlkcC5jYy51Z2EuZWR1MQwwCgYDVQQKDANVR0Ex
-CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJHQTEPMA0GA1UEBwwGQXRoZW5zMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsD6dDssY48p9YeR/G+zoJEqvaFKz
-WaCdYLsFxfGf7wF/ChgAtRZd29s6Flz9acht+2zhiuf8jIdvuB8OX2Bvq+CkJDNi
-3SU46W3e7meY4Hzs7kLcOFh03lbcrInGJbnDYR9yxLhrLINVhOzaLD0qf8dxLt/N
-g0Jr96atvpHmY4hv8BIbuqDO8ViR0Qckoe6qcR8S6Ezca4vWZNwrvBPuorn5kVFV
-XJqNciwsIE1d3cHpjb2s5jrEW7JsliHjXrtcj0/u5TFtyNmH0Wme9jQTeEy88iO0
-nIxx683zS7OEWYRzidJY7iXnHC9ulc8fY5cE2ZEWjz23LPDctMiITP51zQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQABXOtGnkLzWTHFcRPpwOIrkN1vytQKk2UTFEvt
-s2orodiL7j8yoXViYogxzyQuRk1wJmDS8arUHNDMa/ph0+1aWV4kg1AgvnSCMIg+
-2PdyCVklbI+CRoDbSUonlC9PtKlCkxUK8BBM+P+qrxJ6I703pDR/wEfI3OoxLv8T
-BGrzVttkbT455bMbCQC/PBdpVRuEpUMiXQCMOymr2Jw2yOaazS8u0k3JCA4LOCDU
-AJ9/YMkcjWB3NvaXhpKoeYlvMHEsxvSZT0mqNXImDI7VttSVS3Oxm05/JRGfdqRa
-M/mm6iec1w/QK2k+0r/xVKB8C6q9AYPPhXQsPnS6xhugQNWn
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cc.uga.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cc.uga.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cc.uga.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cc.uga.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cc.uga.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uga.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRjCCAi4CCQD0C+UOJQz5qjANBgkqhkiG9w0BAQUFADBlMRgwFgYDVQQDDA9p
-ZHAuZGV2LnVnYS5lZHUxHjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgR2VvcmdpYTEL
-MAkGA1UEBhMCVVMxCzAJBgNVBAgMAkdBMQ8wDQYDVQQHDAZBdGhlbnMwHhcNMTUw
-MzEzMTU0ODI3WhcNMTYwMzEyMTU0ODI3WjBlMRgwFgYDVQQDDA9pZHAuZGV2LnVn
-YS5lZHUxHjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgR2VvcmdpYTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAkdBMQ8wDQYDVQQHDAZBdGhlbnMwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC39mQdrZiYhMAfLcMQCWDUU2IySnIbro+xWE29UKZl
-3OAjD2UjjDBOs77YDk2TmUsKucG7vEogVIPPAtWK+RCuIkLMUFs+v3ZPvYuRqBDY
-9ComFpsuVqXaopaYRcddAIkHf+bgNwLCMYe4E8xGdumr95EnV7qdPPZqoju72VL5
-UgSris8FMoXFkkh5SEgvchV2voeKVySi8XjP3U4lubqhAyP6s0Kl5EgVNeha3JXI
-wdWBcAizE7vO/tgClDNdcgN0lOghNX7neWxkT8I7JACKnn277kQPNOiXq0z2EEzl
-AFDvGbzhEHDCq31hJ1XH2DujLoN2EfSPlGZsu/YGMF63AgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAJUXilMXABVFYbaEvptvMvuoN5yvxu6U1xhGKJ6RHNqcF32Kq8M8
-cn4VsbTaT4OmaP77TcbnaoxbYwA9kmQI/s0I7IRkYnGSFm7fIjmttLHwci9Ve8lN
-RI44IKzN3h2IENCq86zLpu0t9eBb6FRT1QBxr42p6Gv+PwNyDfthxW85bO2sSVDd
-1DOzxzmOfWekXdypSsC/FKqtk2+bordT5n9A61x8xfKG8LtM1ThhHqAO/0j8fd8N
-Ki/S+qS1S8KfxPmHlUYIw7dHs3xrAJXmKadkZK30KhT5nw2dJ6iLDoOMRV7Xq18W
-Pod/7K5BxkdiDL8kTktbtYDFm1OdZXo/isk=
-          </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>
-MIIDIDCCAggCCQDYTLE1vTqdiTANBgkqhkiG9w0BAQUFADBSMRcwFQYDVQQDDA5p
-ZHAuY2MudWdhLmVkdTEMMAoGA1UECgwDVUdBMQswCQYDVQQGEwJVUzELMAkGA1UE
-CAwCR0ExDzANBgNVBAcMBkF0aGVuczAeFw0xNTAzMjMxNDM0NTlaFw0xNjAzMjIx
-NDM0NTlaMFIxFzAVBgNVBAMMDmlkcC5jYy51Z2EuZWR1MQwwCgYDVQQKDANVR0Ex
-CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJHQTEPMA0GA1UEBwwGQXRoZW5zMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsD6dDssY48p9YeR/G+zoJEqvaFKz
-WaCdYLsFxfGf7wF/ChgAtRZd29s6Flz9acht+2zhiuf8jIdvuB8OX2Bvq+CkJDNi
-3SU46W3e7meY4Hzs7kLcOFh03lbcrInGJbnDYR9yxLhrLINVhOzaLD0qf8dxLt/N
-g0Jr96atvpHmY4hv8BIbuqDO8ViR0Qckoe6qcR8S6Ezca4vWZNwrvBPuorn5kVFV
-XJqNciwsIE1d3cHpjb2s5jrEW7JsliHjXrtcj0/u5TFtyNmH0Wme9jQTeEy88iO0
-nIxx683zS7OEWYRzidJY7iXnHC9ulc8fY5cE2ZEWjz23LPDctMiITP51zQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQABXOtGnkLzWTHFcRPpwOIrkN1vytQKk2UTFEvt
-s2orodiL7j8yoXViYogxzyQuRk1wJmDS8arUHNDMa/ph0+1aWV4kg1AgvnSCMIg+
-2PdyCVklbI+CRoDbSUonlC9PtKlCkxUK8BBM+P+qrxJ6I703pDR/wEfI3OoxLv8T
-BGrzVttkbT455bMbCQC/PBdpVRuEpUMiXQCMOymr2Jw2yOaazS8u0k3JCA4LOCDU
-AJ9/YMkcjWB3NvaXhpKoeYlvMHEsxvSZT0mqNXImDI7VttSVS3Oxm05/JRGfdqRa
-M/mm6iec1w/QK2k+0r/xVKB8C6q9AYPPhXQsPnS6xhugQNWn
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cc.uga.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Georgia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Georgia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uga.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Keith Martin</md:GivenName>
-    <md:EmailAddress>keith.martin@uga.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ccad.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ccad.ac.uk-shibboleth.xml
deleted file mode 100644
index d320350d..00000000
--- a/swamid-interfederations-2.0/idp.ccad.ac.uk-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.ccad.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Cleveland College of Art and Design.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">ccad.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ccad.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ccad.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cleveland College of Art and Design</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ccad.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cced.cranfield.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.cced.cranfield.ac.uk-openathens.xml
deleted file mode 100644
index 8a1eed47..00000000
--- a/swamid-interfederations-2.0/idp.cced.cranfield.ac.uk-openathens.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.cced.cranfield.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Cranfield University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T15:41:49Z"/>
-  </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">cced.cranfield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/cced.cranfield.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/cced.cranfield.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cranfield University SoM Executive Development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cranfield.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ccn.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ccn.ac.uk-shibboleth.xml
deleted file mode 100644
index bf803ca3..00000000
--- a/swamid-interfederations-2.0/idp.ccn.ac.uk-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.ccn.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for City College Norwich.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">ccn.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ccn.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ccn.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">City College Norwich</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ccn.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cdd.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.cdd.ac.uk-shibboleth.xml
deleted file mode 100644
index 63da0781..00000000
--- a/swamid-interfederations-2.0/idp.cdd.ac.uk-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.cdd.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for The Conservatoire for Dance and Drama.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">cdd.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/cdd.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/cdd.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Conservatoire for Dance and Drama</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cdd.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.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 def2d0ce..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cedia.org.ec/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://minga.cedia.org.ec" registrationInstant="2014-11-27T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="es">
-                                http://www.cedia.org.ec/minga
-                        </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">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>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cedia.org.ec/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec: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.cedia.org.ec/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cedia.org.ec/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">org.ec</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec: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">CEDIA - Consorcio Ecuatoriano para el desarrollo de Internet Avanzado</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CEDIA - Consorcio Ecuatoriano para el desarrollo de Internet Avanzado</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cedia.org.ec/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Claudio Chacon A</md:SurName>
-    <md:EmailAddress>neg@cedia.org.ec</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.centralsussex.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.centralsussex.ac.uk-shibboleth.xml
deleted file mode 100644
index 6ecfcb31..00000000
--- a/swamid-interfederations-2.0/idp.centralsussex.ac.uk-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.centralsussex.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Central Sussex College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">centralsussex.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/centralsussex.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/centralsussex.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Central Sussex College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.centralsussex.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ceredigion.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.ceredigion.ac.uk-openathens.xml
deleted file mode 100644
index 430f579e..00000000
--- a/swamid-interfederations-2.0/idp.ceredigion.ac.uk-openathens.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.ceredigion.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Coleg Ceredigion.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-14T14:42:22Z"/>
-  </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">ceredigion.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ceredigion.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ceredigion.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Coleg Ceredigion</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ceredigion.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</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 d09a3025..00000000
--- a/swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.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.cereq.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CEREQ - Centre d'études et de recherches sur les qualifications</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABRElEQVQoz2NUXLiHgRTARJJqBgYGFjQ+GzOTlYSgugAPGzMTMxPj//8MN95/Pv7i/adff7DYwMHMlKYtH64qxcbM9Ozrj2dffghzsBYbKjvLiGCxgZuVeaGL4c+//3IOXn7/8zdEcNUdBksJwb///6NrEGRnLTNSUeLjctpw/ANMNQQcf/Eei6c95MWClSW3PniJphpnKGkK8rAwMV5994XYYGVkZGRgYPiH5FYCGu5+/PqfgUFNkIdYDTsfvd7+8JW3vBgXCzNWdb/+Qq2Hanj+9UfTqVs//v7rstZiZUKJHBkeDhFONjZmpt///zEwMDAipyVBdtYSQ2VRTvbjL949/vKdiYFRiZ9LX4Rv6uUH1959+fPvHxMjIyNm4lMT4NEU4uFhZfn999+bH7+uvP386vtPLDENB7c+fLn1AWf4kpxaARQUdfeFK9YsAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE1KzAyOjAwpWiGMQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNSswMjowMNQ1Po0AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.cereq.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CEREQ - Centre d'études et de recherches sur les qualifications</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>
-					      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>
-    </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-POST" Location="https://idp.cereq.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cereq.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cereq.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cereq.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cereq.fr/idp/profile/SAML1/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">CEREQ - Centre d'études et de recherches sur les qualifications</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CEREQ - Centre d'études et de recherches sur les qualifications</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cereq.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean Pele</md:SurName>
-    <md:EmailAddress>pele@cereq.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml
deleted file mode 100644
index 95172471..00000000
--- a/swamid-interfederations-2.0/idp.chalmers.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,363 +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://idp.chalmers.se/adfs/services/trust">
-  <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="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.chalmers.se" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType">
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <fed:ClaimTypesRequested>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress">
-        <auth:DisplayName>E-Mail Address</auth:DisplayName>
-        <auth:Description>The e-mail address of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
-        <auth:DisplayName>Given Name</auth:DisplayName>
-        <auth:Description>The given name of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
-        <auth:DisplayName>Name</auth:DisplayName>
-        <auth:Description>The unique name of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn">
-        <auth:DisplayName>UPN</auth:DisplayName>
-        <auth:Description>The user principal name (UPN) of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/CommonName">
-        <auth:DisplayName>Common Name</auth:DisplayName>
-        <auth:Description>The common name of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/EmailAddress">
-        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/Group">
-        <auth:DisplayName>Group</auth:DisplayName>
-        <auth:Description>A group that the user is a member of</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/UPN">
-        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role">
-        <auth:DisplayName>Role</auth:DisplayName>
-        <auth:Description>A role that the user has</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
-        <auth:DisplayName>Surname</auth:DisplayName>
-        <auth:Description>The surname of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier">
-        <auth:DisplayName>PPID</auth:DisplayName>
-        <auth:Description>The private identifier of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier">
-        <auth:DisplayName>Name ID</auth:DisplayName>
-        <auth:Description>The SAML name identifier of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant">
-        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
-        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod">
-        <auth:DisplayName>Authentication method</auth:DisplayName>
-        <auth:Description>The method used to authenticate the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid">
-        <auth:DisplayName>Deny only group SID</auth:DisplayName>
-        <auth:Description>The deny-only group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid">
-        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-        <auth:Description>The deny-only primary SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid">
-        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-        <auth:Description>The deny-only primary group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid">
-        <auth:DisplayName>Group SID</auth:DisplayName>
-        <auth:Description>The group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid">
-        <auth:DisplayName>Primary group SID</auth:DisplayName>
-        <auth:Description>The primary group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid">
-        <auth:DisplayName>Primary SID</auth:DisplayName>
-        <auth:Description>The primary SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname">
-        <auth:DisplayName>Windows account name</auth:DisplayName>
-        <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
-      </auth:ClaimType>
-    </fed:ClaimTypesRequested>
-    <fed:TargetScopes>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://idp.chalmers.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://idp.chalmers.se/adfs/services/trust/2005/issuedtokenmixedsymmetricbasic256</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://idp.chalmers.se/adfs/services/trust/13/issuedtokenmixedasymmetricbasic256</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://idp.chalmers.se/adfs/services/trust/13/issuedtokenmixedsymmetricbasic256</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://idp.chalmers.se/adfs/ls/</Address>
-      </EndpointReference>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>http://idp.chalmers.se/adfs/services/trust</Address>
-      </EndpointReference>
-    </fed:TargetScopes>
-    <fed:ApplicationServiceEndpoint>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://idp.chalmers.se/adfs/services/trust/2005/issuedtokenmixedasymmetricbasic256</Address>
-      </EndpointReference>
-    </fed:ApplicationServiceEndpoint>
-    <fed:PassiveRequestorEndpoint>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://idp.chalmers.se/adfs/ls/</Address>
-      </EndpointReference>
-    </fed:PassiveRequestorEndpoint>
-  </md:RoleDescriptor>
-  <md:RoleDescriptor xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.chalmers.se" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:SecurityTokenServiceType">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</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>MIIEazCCA1OgAwIBAgIQYiCzN6Gt8LkhjGEzm+oYbzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDEyMDAwMDAwMFoXDTE3MDEyNDIzNTk1OVowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmWN/0UvY2KySOfg77U+ORidbq0YyqVSUxTEN5HT0WRRF/k7bdhyNp1mf8OuzefbFbTRwUyqi8BaFSdGaB2ifbyYhprchRdBXQzfS9OSzKRWQrRPPJRc7YF+h0OR2Byjy9Wkm3qzOzbv96DSihNuyhd+q+jUBUoJ+MWAj+K1/rsghrvAcKtedADR+62QaCQCkD6Pv7+njyWWAA1cJAm5KoEzXqANi3SkTwqUYB6PCMKnUBsh/w0I6Qv5lD0i/OXCZJguPhcGM5M/wSZq6iDLdtZ/EDNm82UXO3j+zBFDLSbiWuh74+/dtOyJKYZn5q9lGbhVqvFs/smAztKUSHndmbAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUaL0QFrip30INB0btXzbf1qhorUswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5jaGFsbWVycy5zZTANBgkqhkiG9w0BAQUFAAOCAQEAll6pgh+zFiNIwql7sPVIQqhOCRjz1fOYfJUNAQQKiNeiWtZHC0PU7gcdKUmyDEmvdVuvMjnmuBzMCmTwYWBroWPMJCoHvWQGGTElForaG2AU7ghASUeGn2rtXdnj62dbhNhuh/yZfywKmCbRoKYsQB6/6TkmkQcXm7teOqzq3jOjlnJmMCRRSM8z7ZDI6KkcX+FFfsNR9zp76Xi3T6hsfNQJOD593JA7Ub8rX2p3YQIYLNGARfR7fAQoSBgibcGX6buthzFl1Af+ghyy99nezrJ1srvD81AKG7a55znKBcQLPTTsqMlaG9tM9ERe/wQhf9zEUBPDB8PLmA+FfmR3Mg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <fed:TokenTypesOffered>
-      <fed:TokenType Uri="urn:oasis:names:tc:SAML:2.0:assertion"/>
-      <fed:TokenType Uri="urn:oasis:names:tc:SAML:1.0:assertion"/>
-    </fed:TokenTypesOffered>
-    <fed:ClaimTypesOffered>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress">
-        <auth:DisplayName>E-Mail Address</auth:DisplayName>
-        <auth:Description>The e-mail address of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
-        <auth:DisplayName>Given Name</auth:DisplayName>
-        <auth:Description>The given name of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
-        <auth:DisplayName>Name</auth:DisplayName>
-        <auth:Description>The unique name of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn">
-        <auth:DisplayName>UPN</auth:DisplayName>
-        <auth:Description>The user principal name (UPN) of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/CommonName">
-        <auth:DisplayName>Common Name</auth:DisplayName>
-        <auth:Description>The common name of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/EmailAddress">
-        <auth:DisplayName>AD FS 1.x E-Mail Address</auth:DisplayName>
-        <auth:Description>The e-mail address of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/Group">
-        <auth:DisplayName>Group</auth:DisplayName>
-        <auth:Description>A group that the user is a member of</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/claims/UPN">
-        <auth:DisplayName>AD FS 1.x UPN</auth:DisplayName>
-        <auth:Description>The UPN of the user when interoperating with AD FS 1.1 or ADFS 1.0</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role">
-        <auth:DisplayName>Role</auth:DisplayName>
-        <auth:Description>A role that the user has</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
-        <auth:DisplayName>Surname</auth:DisplayName>
-        <auth:Description>The surname of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier">
-        <auth:DisplayName>PPID</auth:DisplayName>
-        <auth:Description>The private identifier of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier">
-        <auth:DisplayName>Name ID</auth:DisplayName>
-        <auth:Description>The SAML name identifier of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant">
-        <auth:DisplayName>Authentication time stamp</auth:DisplayName>
-        <auth:Description>Used to display the time and date that the user was authenticated</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod">
-        <auth:DisplayName>Authentication method</auth:DisplayName>
-        <auth:Description>The method used to authenticate the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid">
-        <auth:DisplayName>Deny only group SID</auth:DisplayName>
-        <auth:Description>The deny-only group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid">
-        <auth:DisplayName>Deny only primary SID</auth:DisplayName>
-        <auth:Description>The deny-only primary SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid">
-        <auth:DisplayName>Deny only primary group SID</auth:DisplayName>
-        <auth:Description>The deny-only primary group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid">
-        <auth:DisplayName>Group SID</auth:DisplayName>
-        <auth:Description>The group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid">
-        <auth:DisplayName>Primary group SID</auth:DisplayName>
-        <auth:Description>The primary group SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid">
-        <auth:DisplayName>Primary SID</auth:DisplayName>
-        <auth:Description>The primary SID of the user</auth:Description>
-      </auth:ClaimType>
-      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Optional="true" Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname">
-        <auth:DisplayName>Windows account name</auth:DisplayName>
-        <auth:Description>The domain account name of the user in the form of &lt;domain&gt;\&lt;user&gt;</auth:Description>
-      </auth:ClaimType>
-    </fed:ClaimTypesOffered>
-    <fed:SecurityTokenServiceEndpoint>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://idp.chalmers.se/adfs/services/trust/2005/certificatemixed</Address>
-        <Metadata>
-          <Metadata xmlns="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <wsx:MetadataSection xmlns="" Dialect="http://schemas.xmlsoap.org/ws/2004/09/mex">
-              <wsx:MetadataReference>
-                <Address xmlns="http://www.w3.org/2005/08/addressing">https://idp.chalmers.se/adfs/services/trust/mex</Address>
-              </wsx:MetadataReference>
-            </wsx:MetadataSection>
-          </Metadata>
-        </Metadata>
-      </EndpointReference>
-    </fed:SecurityTokenServiceEndpoint>
-    <fed:PassiveRequestorEndpoint>
-      <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>https://idp.chalmers.se/adfs/ls/</Address>
-      </EndpointReference>
-    </fed:PassiveRequestorEndpoint>
-  </md:RoleDescriptor>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</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>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</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>MIIEazCCA1OgAwIBAgIQYiCzN6Gt8LkhjGEzm+oYbzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDEyMDAwMDAwMFoXDTE3MDEyNDIzNTk1OVowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmWN/0UvY2KySOfg77U+ORidbq0YyqVSUxTEN5HT0WRRF/k7bdhyNp1mf8OuzefbFbTRwUyqi8BaFSdGaB2ifbyYhprchRdBXQzfS9OSzKRWQrRPPJRc7YF+h0OR2Byjy9Wkm3qzOzbv96DSihNuyhd+q+jUBUoJ+MWAj+K1/rsghrvAcKtedADR+62QaCQCkD6Pv7+njyWWAA1cJAm5KoEzXqANi3SkTwqUYB6PCMKnUBsh/w0I6Qv5lD0i/OXCZJguPhcGM5M/wSZq6iDLdtZ/EDNm82UXO3j+zBFDLSbiWuh74+/dtOyJKYZn5q9lGbhVqvFs/smAztKUSHndmbAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUaL0QFrip30INB0btXzbf1qhorUswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5jaGFsbWVycy5zZTANBgkqhkiG9w0BAQUFAAOCAQEAll6pgh+zFiNIwql7sPVIQqhOCRjz1fOYfJUNAQQKiNeiWtZHC0PU7gcdKUmyDEmvdVuvMjnmuBzMCmTwYWBroWPMJCoHvWQGGTElForaG2AU7ghASUeGn2rtXdnj62dbhNhuh/yZfywKmCbRoKYsQB6/6TkmkQcXm7teOqzq3jOjlnJmMCRRSM8z7ZDI6KkcX+FFfsNR9zp76Xi3T6hsfNQJOD593JA7Ub8rX2p3YQIYLNGARfR7fAQoSBgibcGX6buthzFl1Af+ghyy99nezrJ1srvD81AKG7a55znKBcQLPTTsqMlaG9tM9ERe/wQhf9zEUBPDB8PLmA+FfmR3Mg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.chalmers.se/adfs/ls/" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/" index="2"/>
-  </md:SPSSODescriptor>
-  <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">chalmers.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</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>MIIEgjCCA2qgAwIBAgIRAJmWfwVBm8cQS1Ty7e6QuJgwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMTAxMjcwMDAwMDBaFw0xNDAxMjYyMzU5NTlaMF0xCzAJBgNVBAYTAlNFMSYwJAYDVQQKEx1DaGFsbWVycyBUZWtuaXNrYSBIb2dza29sYSBBQjEMMAoGA1UECxMDSVRTMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj5S9nh00xzrsXmphDbOz4RPwG0JONHrBtVOm6NNwTTQhl8eZSG4oIT/ATXAaQjGXAnz04HDShP6xKwsPN0wZTpuEci4XLlbUaWvcuefPAwGO8Be/HWEB03ilM+FLmJ55CYvpFfxbuElA30YzQcw2xU637g/+rshELRCMZB9Thp3j0tZ09sQTXbodnStm3hN0azuqvtXhZ63+q47GpocyiOlj7wHY6zZ4OfCj2YxFIeiLBBur6/mBKH3uA/xkuIv6NPAN+BI0L4iH1q+umCjeE/qfzWLO3Fe3ngYTWx0YFEIduRWCz7fyLUITNJBSK7YENFdIB0g8wXBWcTVpAv08RAgMBAAGjggFiMIIBXjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6ZdOotf55GTP/djvkXZgjXBGSqQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGgYDVR0RBBMwEYIPaWRwLmNoYWxtZXJzLnNlMA0GCSqGSIb3DQEBBQUAA4IBAQBsPH77mopZLCpQgcrIYyZJfGKrXb7rQ4NNaBOR8o/KLNptvY7NPtOnu0HRJrYfZIx4Abj0VgDs/CBWSnBJQcE+aGMQmcPhrSDua9S5p+Cpq4AV7bhCRIovWPFPNQ7TTYRKCkFCmnkM/Y3EyliddxM1JsIL5rw+k8/O/KUJPCSff7yDsSmse5qUrJ12Nh+aG/MB4NknOJuAsLjs0HpIjdVTNFb9dbhrE+8x3AiL0Nk9G69gff1V7uxndvWhCoDUW3RVkpj9xssfHj4atp9F7t3q0bKdt7Y3HWQm8wpSJd7OUWI2WXbA6kjI2YZtFcUCOzy32crsMxLXKsHJyMp/XYyw</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>MIIEazCCA1OgAwIBAgIQYiCzN6Gt8LkhjGEzm+oYbzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDEyMDAwMDAwMFoXDTE3MDEyNDIzNTk1OVowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRgwFgYDVQQDEw9pZHAuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmWN/0UvY2KySOfg77U+ORidbq0YyqVSUxTEN5HT0WRRF/k7bdhyNp1mf8OuzefbFbTRwUyqi8BaFSdGaB2ifbyYhprchRdBXQzfS9OSzKRWQrRPPJRc7YF+h0OR2Byjy9Wkm3qzOzbv96DSihNuyhd+q+jUBUoJ+MWAj+K1/rsghrvAcKtedADR+62QaCQCkD6Pv7+njyWWAA1cJAm5KoEzXqANi3SkTwqUYB6PCMKnUBsh/w0I6Qv5lD0i/OXCZJguPhcGM5M/wSZq6iDLdtZ/EDNm82UXO3j+zBFDLSbiWuh74+/dtOyJKYZn5q9lGbhVqvFs/smAztKUSHndmbAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUaL0QFrip30INB0btXzbf1qhorUswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBoGA1UdEQQTMBGCD2lkcC5jaGFsbWVycy5zZTANBgkqhkiG9w0BAQUFAAOCAQEAll6pgh+zFiNIwql7sPVIQqhOCRjz1fOYfJUNAQQKiNeiWtZHC0PU7gcdKUmyDEmvdVuvMjnmuBzMCmTwYWBroWPMJCoHvWQGGTElForaG2AU7ghASUeGn2rtXdnj62dbhNhuh/yZfywKmCbRoKYsQB6/6TkmkQcXm7teOqzq3jOjlnJmMCRRSM8z7ZDI6KkcX+FFfsNR9zp76Xi3T6hsfNQJOD593JA7Ub8rX2p3YQIYLNGARfR7fAQoSBgibcGX6buthzFl1Af+ghyy99nezrJ1srvD81AKG7a55znKBcQLPTTsqMlaG9tM9ERe/wQhf9zEUBPDB8PLmA+FfmR3Mg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chalmers.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.se/adfs/ls/"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="E-Mail Address" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Given Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="UPN" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Common Name" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x E-Mail Address" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x UPN" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Role" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Surname" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="PPID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name ID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication time stamp" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication method" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only group SID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Windows account name" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CHALMERS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.chalmers.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Chalmers</md:Company>
-    <md:EmailAddress>mailto:nrq@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Chalmers</md:Company>
-    <md:EmailAddress>mailto:biorn@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.chesterfield.ac.uk-shibboleth.xml
deleted file mode 100644
index 141e9761..00000000
--- a/swamid-interfederations-2.0/idp.chesterfield.ac.uk-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" entityID="https://idp.chesterfield.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Chesterfield College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-14T16:43: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">chesterfield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEIDCCAwigAwIBAgIJAI1fOA60F77hMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
-						VQQGEwJHQjETMBEGA1UECAwKRGVyYnlzaGlyZTEVMBMGA1UEBwwMQ2hlc3RlcmZp
-						ZWxkMR0wGwYDVQQKDBRDaGVzdGVyZmllbGQgQ29sbGVnZTEVMBMGA1UECwwMSUNU
-						IFNlcnZpY2VzMR8wHQYDVQQDDBZpZHAuY2hlc3RlcmZpZWxkLmFjLnVrMB4XDTE0
-						MDkwMzA3MzI1MFoXDTI0MDgzMTA3MzI1MFowgZAxCzAJBgNVBAYTAkdCMRMwEQYD
-						VQQIDApEZXJieXNoaXJlMRUwEwYDVQQHDAxDaGVzdGVyZmllbGQxHTAbBgNVBAoM
-						FENoZXN0ZXJmaWVsZCBDb2xsZWdlMRUwEwYDVQQLDAxJQ1QgU2VydmljZXMxHzAd
-						BgNVBAMMFmlkcC5jaGVzdGVyZmllbGQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDQ4RgYUZeGBKe+Fhgtg9h00S6vTVBeD8923xUfwF53XKbu
-						NvfQq3331N0ELndolFPFknRdJt0tfUxlpqa9GospV+JJ3tIv6MrpVbkOZyxPI5Fd
-						Ja1lc+5gkw/1S7k8dWJVlN1pcXrV9XBxIcANKsVZG0smM1H8cuenopMfCWC9PdNE
-						TJzU/NvNthQizV4dEC5SP2/MVBUTvltN2JUq0/SjVl0GyKe4lHO6FVsKo5SlIEx/
-						pUVCiyTufkaCf+PhULsOlgdGYd0NIT5pmnL58LRVbF9EqDKHeTcqJeSkfKTedwVN
-						wzvU3wtdh8c7Ub5oODs50Ec5ast+oyksmhCc5f0fAgMBAAGjezB5MAkGA1UdEwQC
-						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
-						MB0GA1UdDgQWBBRwFnwr6pO2a5pd2/7uh8/ktJxREDAfBgNVHSMEGDAWgBRwFnwr
-						6pO2a5pd2/7uh8/ktJxREDANBgkqhkiG9w0BAQUFAAOCAQEANhffi0UUOoXQPaPg
-						ayl8ylOUKb6ne6GyeE0qPiQG21JR+ndijGw9WkyVc62cvDJBrU9tXUhmxjdsd+Ro
-						zyZvVHL+pQaym/nPu6XoNHdjed68b5vVc0d7ImDP2Pre3VgGdpfCxWCHVmC6kCG7
-						wRwnF/Le1YKLChloc++jgu0mSFozmws0xT8jHZC/Dl6+vERzgcVWY4raB6Z4qY19
-						2GwOn1AMDj0vpiTWn7fvv9hivJLcJ45DLMG9ItiAQqaXsgmLGUrLsQPV/waJBcWn
-						f78RSU1/IrqCyKLhCu0MpaqsNBW6vettZXLYfwS32SQXnLKdPRCsOpC/paeyfkpB
-						TDscwQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.chesterfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chesterfield.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.chesterfield.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chesterfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.chesterfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chesterfield.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">chesterfield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEIDCCAwigAwIBAgIJAI1fOA60F77hMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
-						VQQGEwJHQjETMBEGA1UECAwKRGVyYnlzaGlyZTEVMBMGA1UEBwwMQ2hlc3RlcmZp
-						ZWxkMR0wGwYDVQQKDBRDaGVzdGVyZmllbGQgQ29sbGVnZTEVMBMGA1UECwwMSUNU
-						IFNlcnZpY2VzMR8wHQYDVQQDDBZpZHAuY2hlc3RlcmZpZWxkLmFjLnVrMB4XDTE0
-						MDkwMzA3MzI1MFoXDTI0MDgzMTA3MzI1MFowgZAxCzAJBgNVBAYTAkdCMRMwEQYD
-						VQQIDApEZXJieXNoaXJlMRUwEwYDVQQHDAxDaGVzdGVyZmllbGQxHTAbBgNVBAoM
-						FENoZXN0ZXJmaWVsZCBDb2xsZWdlMRUwEwYDVQQLDAxJQ1QgU2VydmljZXMxHzAd
-						BgNVBAMMFmlkcC5jaGVzdGVyZmllbGQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDQ4RgYUZeGBKe+Fhgtg9h00S6vTVBeD8923xUfwF53XKbu
-						NvfQq3331N0ELndolFPFknRdJt0tfUxlpqa9GospV+JJ3tIv6MrpVbkOZyxPI5Fd
-						Ja1lc+5gkw/1S7k8dWJVlN1pcXrV9XBxIcANKsVZG0smM1H8cuenopMfCWC9PdNE
-						TJzU/NvNthQizV4dEC5SP2/MVBUTvltN2JUq0/SjVl0GyKe4lHO6FVsKo5SlIEx/
-						pUVCiyTufkaCf+PhULsOlgdGYd0NIT5pmnL58LRVbF9EqDKHeTcqJeSkfKTedwVN
-						wzvU3wtdh8c7Ub5oODs50Ec5ast+oyksmhCc5f0fAgMBAAGjezB5MAkGA1UdEwQC
-						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
-						MB0GA1UdDgQWBBRwFnwr6pO2a5pd2/7uh8/ktJxREDAfBgNVHSMEGDAWgBRwFnwr
-						6pO2a5pd2/7uh8/ktJxREDANBgkqhkiG9w0BAQUFAAOCAQEANhffi0UUOoXQPaPg
-						ayl8ylOUKb6ne6GyeE0qPiQG21JR+ndijGw9WkyVc62cvDJBrU9tXUhmxjdsd+Ro
-						zyZvVHL+pQaym/nPu6XoNHdjed68b5vVc0d7ImDP2Pre3VgGdpfCxWCHVmC6kCG7
-						wRwnF/Le1YKLChloc++jgu0mSFozmws0xT8jHZC/Dl6+vERzgcVWY4raB6Z4qY19
-						2GwOn1AMDj0vpiTWn7fvv9hivJLcJ45DLMG9ItiAQqaXsgmLGUrLsQPV/waJBcWn
-						f78RSU1/IrqCyKLhCu0MpaqsNBW6vettZXLYfwS32SQXnLKdPRCsOpC/paeyfkpB
-						TDscwQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.chesterfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chesterfield.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">Chesterfield College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Chesterfield College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.chesterfield.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@chesterfield.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Houghton</SurName>
-    <EmailAddress>mailto:houghtonr@chesterfield.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.chichester.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.chichester.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 24cfd7fa..00000000
--- a/swamid-interfederations-2.0/idp.chichester.ac.uk-idp-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://idp.chichester.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Chichester College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">chichester.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAJjvxUK9DXhdlH/EkMId7VAbUERjMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFGlkcC5jaGljaGVzdGVyLmFjLnVrMB4XDTEzMDcwMzE1
-						MjUxNloXDTMzMDcwMzE1MjUxNlowHzEdMBsGA1UEAxMUaWRwLmNoaWNoZXN0ZXIu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCPypPq8ApF4OPt
-						ENNcoWFIOnyJtNDbGoaRRlMTg7CDf1HkQb6Y9+zeK3gg1HC4PdI4Hxw+gqyhdeLE
-						Op9uKvu9Mc2vx3ekfzQ5gbt9m0XgmnBAo+Pp21nOIwwQHRM3bLmld1A9jW3hcgA6
-						MIjuJ6SeETWpbuFx00KNUXO7BuxBtvnhPesp1NRK03yHSI9T+pevq1Im1U0aplHP
-						747tAS7/lGZBk/f3Xa0iCkriO6/9fEuXianylagIyJnvLBTImwMHPFYU1hrcpBez
-						nfHYpHmUEQ26ol83ZrwT+oDgY6mBsZKcMp4pn9aBVxqXSIP9wB3C0kMYzTPvj6vI
-						3tAIJ0krAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC5jaGljaGVzdGVyLmFjLnVr
-						hitodHRwczovL2lkcC5jaGljaGVzdGVyLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBQVTtCrfHJjvTZ+wDTp5oNJlTJRRjANBgkqhkiG9w0BAQUFAAOCAQEA
-						O3KMZhp4iLbEGamacfT0kOrh9IDuhcjHlwRbATf7VBW2IuHZbBPNO11Z8Km6a2g0
-						NDIHuc8jPYxY6rt//kjQwf4UEGxjiYwuplGsiN9FJfHcbXUkt9+8HUJpCX2C/jcg
-						yEX9NGRp+4VGnqLV5ddJcFa7hH2g08bj6hfNBKQcmSdeuWAKR/XBM6xCW9yNskpb
-						GMvVNbPQiLbkXCaEqgu3qOHuUXExez+BYT3WL7XL4yencFGtbZccgDMjS5zk3gYL
-						11qYKdO9e8zZ1qufcZmIXPh4pVeM9WuRPq378hTwCMgBCEKM+/UMqcfagwLe+180
-						n9abLyFHDmPsq3igTHKAkQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.chichester.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chichester.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.chichester.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chichester.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.chichester.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chichester.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">chichester.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAJjvxUK9DXhdlH/EkMId7VAbUERjMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFGlkcC5jaGljaGVzdGVyLmFjLnVrMB4XDTEzMDcwMzE1
-						MjUxNloXDTMzMDcwMzE1MjUxNlowHzEdMBsGA1UEAxMUaWRwLmNoaWNoZXN0ZXIu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCPypPq8ApF4OPt
-						ENNcoWFIOnyJtNDbGoaRRlMTg7CDf1HkQb6Y9+zeK3gg1HC4PdI4Hxw+gqyhdeLE
-						Op9uKvu9Mc2vx3ekfzQ5gbt9m0XgmnBAo+Pp21nOIwwQHRM3bLmld1A9jW3hcgA6
-						MIjuJ6SeETWpbuFx00KNUXO7BuxBtvnhPesp1NRK03yHSI9T+pevq1Im1U0aplHP
-						747tAS7/lGZBk/f3Xa0iCkriO6/9fEuXianylagIyJnvLBTImwMHPFYU1hrcpBez
-						nfHYpHmUEQ26ol83ZrwT+oDgY6mBsZKcMp4pn9aBVxqXSIP9wB3C0kMYzTPvj6vI
-						3tAIJ0krAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC5jaGljaGVzdGVyLmFjLnVr
-						hitodHRwczovL2lkcC5jaGljaGVzdGVyLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBQVTtCrfHJjvTZ+wDTp5oNJlTJRRjANBgkqhkiG9w0BAQUFAAOCAQEA
-						O3KMZhp4iLbEGamacfT0kOrh9IDuhcjHlwRbATf7VBW2IuHZbBPNO11Z8Km6a2g0
-						NDIHuc8jPYxY6rt//kjQwf4UEGxjiYwuplGsiN9FJfHcbXUkt9+8HUJpCX2C/jcg
-						yEX9NGRp+4VGnqLV5ddJcFa7hH2g08bj6hfNBKQcmSdeuWAKR/XBM6xCW9yNskpb
-						GMvVNbPQiLbkXCaEqgu3qOHuUXExez+BYT3WL7XL4yencFGtbZccgDMjS5zk3gYL
-						11qYKdO9e8zZ1qufcZmIXPh4pVeM9WuRPq378hTwCMgBCEKM+/UMqcfagwLe+180
-						n9abLyFHDmPsq3igTHKAkQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.chichester.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.chichester.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">Chichester College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Chichester College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.chichester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@chichester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Owen</GivenName>
-    <SurName>Heaume</SurName>
-    <EmailAddress>mailto:Owen.Heaume@chichester.ac.uk</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 d224d1eb..00000000
--- a/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.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://idp.cirad.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CIRAD</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC30lEQVQ4y42TT2hcVRTGf/e++5o3k5nYTDStjVMRqrVaVwaRVmlFqYLQLoxIl4KgC0GwRbQuBEVRrCK6s4uCFPyH0kUVqlJJpabVtFWowSZNE9PEZjKTzL/MTO68d+9xkWgtdeHZnvN9nPOd71P8jxLeBFQfuWAfPVoYaz+reBEA9V+AE7KeU0zxBLBOfQZMvb3wiNorqw2q4qiPz/9481hrq+JdzL+BEwIj3N2bZ3J/P0G/xnUy+EazcGjn7XoqRzLZQOYTmGMLXH/1BpMChtRTlbHWAQPEAsnEdaSmb8FGRRZe38xtc1vw9RhpO5+nK1C8hAYYFojZ9fiFc60D01WYqMGlIsQjN2G1Z2Y4wvXNcmHTNwRtjWVpHO4BWD6h/0vh4LrsQZ1EiCh8mHDDmT6SDnAkLA5pulcJNl2lfOcoc7+tObaBB1cI5CM+ZfvTl49HndYqRAlBKSDfTNFKe8p/xGQqBtedYERzSp/lXjl//MSKAPodPmHoaPn+2VYnpXaaYpwmms5gtWfJO7LnIoQEv+TQNcfpBywl6R1YTRYAvUd9TV13rC1aQ6ltmE1COkuKZuyoNTWpszHOeoKm4+eKZeEhQ7kWbdis6ssEz8kurDZxOTZUEkO1ZTBtoeU8a2YjShcXoZVQHvV8vy9k0RpmGqH++3t6E2l8IzlfE0PNBdRcQOw8DRHCXx0K8IWAQ/tT2J6AahyQi1QRkWWCZ9TH7NjZ+0Gzrah7RUVpZtKazHyIG6zB2gwfvpflzzw0rKLqNT25eOgXOq4Y6SvZxpGTjaODF+2O0AtWwfZLkFlSfH6HkE0g8CBAOoK3Bopqmypc8cGjapDDsvXhUtXODxdULlLCd3nwCGkLHnBArDUvDPD8F9wFFK4N07eykSMj4ejhM/pW7yBc6YoCZeC+3V2vTrDqlR/UsX8w16TxpKynAk82fbT7pzHV2xGp+MYu+f2xbv/y+/ip19T4VfN/AbdxUQrXQYS3AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE2KzAyOjAwlICcrAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMOXdJBAAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.cirad.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CIRAD</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>
-					      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>
-    </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-POST" Location="https://idp.cirad.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirad.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cirad.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CIRAD</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CIRAD</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cirad.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Frédéric MAZZINI</md:SurName>
-    <md:EmailAddress>frederic.mazzini@cirad.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cirencester.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.cirencester.ac.uk-oala-metadata.xml
deleted file mode 100644
index 304f52fc..00000000
--- a/swamid-interfederations-2.0/idp.cirencester.ac.uk-oala-metadata.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://idp.cirencester.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens IdP for Cirencester College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-22T15:23:18Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">cirencester.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTjCCAjagAwIBAgIIRKejSpcxL9UwDQYJKoZIhvcNAQEFBQAwPjEcMBoGA1UE
-						CgwTQ2lyZW5jZXN0ZXIgQ29sbGVnZTEeMBwGA1UEAwwVaWRwLmNpcmVuY2VzdGVy
-						LmFjLnVrMB4XDTE0MDcyMTA5NTIwNFoXDTI0MDcyMTA5NTIwNFowPjEcMBoGA1UE
-						CgwTQ2lyZW5jZXN0ZXIgQ29sbGVnZTEeMBwGA1UEAwwVaWRwLmNpcmVuY2VzdGVy
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqBjd6qPpatXK
-						rzW4mAym0qYPqX4p7ZNX5LynuSpZupD+p1apZmRJDIPLQZUfIV5k6b0hvu+jPFCo
-						ChQC74PBjEh+WdWDoG/l3Ab1w81GA5MjKIi3kvd98eAuBRdDp7kTy8xU8HeMZ/Jb
-						gjgHgkvJIOhA7KAEuEn3iz8DF+sAhtzNYO/2YXlULo+qdqSPKu/exsddEiSOlrxv
-						B2ocRmcxjstHHWbl709CoxP3Uf6tmc8uQKTnqNF/abYQBofx1rEk2DIT6x+Qnlj9
-						MBpxme2BlRY2QFYsWQBgaMgUiaxHXFYmBAA2B4+JbJIMbXx+OLHguAyv8srAb0TV
-						nHLOWLgOxQIDAQABo1AwTjAdBgNVHQ4EFgQU2MzRSQipMAAPr5CCC2qd8JujL9Uw
-						HwYDVR0jBBgwFoAU2MzRSQipMAAPr5CCC2qd8JujL9UwDAYDVR0TBAUwAwEB/zAN
-						BgkqhkiG9w0BAQUFAAOCAQEALLzd9/KWXmLO2bLM0bxMC3/xmGxMJFbcS3F+Bf/u
-						XRFDiZDWvOa4bS01h95kGcR1geN2Ag0414B1nF8jHvQ+px7+bjzJgakGeUtgbo2W
-						kyY++i1YitrgSbBp5m50a1kBh/gRhBsFx9qU14XEft11f1Eht5Q2L52B6S89HB8I
-						SzbB/2SijZht33CJYqDVG9SKLhoVI27MCRVNUlmXFFvUXi05KFDbmtadPkSAR5R0
-						xXole5MprQ9wmqmmf5lMO/Q/lDJKgS05SPkfCH6qXTbWr7UTruSVJGbg5ZQxyMak
-						Dy5B9h6OWZR1PUUJlALjWmBQaZKFTBhHgACu0br2JUgSqw==
-					</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>
-						MIIDTjCCAjagAwIBAgIIRKejSpcxL9UwDQYJKoZIhvcNAQEFBQAwPjEcMBoGA1UE
-						CgwTQ2lyZW5jZXN0ZXIgQ29sbGVnZTEeMBwGA1UEAwwVaWRwLmNpcmVuY2VzdGVy
-						LmFjLnVrMB4XDTE0MDcyMTA5NTIwNFoXDTI0MDcyMTA5NTIwNFowPjEcMBoGA1UE
-						CgwTQ2lyZW5jZXN0ZXIgQ29sbGVnZTEeMBwGA1UEAwwVaWRwLmNpcmVuY2VzdGVy
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqBjd6qPpatXK
-						rzW4mAym0qYPqX4p7ZNX5LynuSpZupD+p1apZmRJDIPLQZUfIV5k6b0hvu+jPFCo
-						ChQC74PBjEh+WdWDoG/l3Ab1w81GA5MjKIi3kvd98eAuBRdDp7kTy8xU8HeMZ/Jb
-						gjgHgkvJIOhA7KAEuEn3iz8DF+sAhtzNYO/2YXlULo+qdqSPKu/exsddEiSOlrxv
-						B2ocRmcxjstHHWbl709CoxP3Uf6tmc8uQKTnqNF/abYQBofx1rEk2DIT6x+Qnlj9
-						MBpxme2BlRY2QFYsWQBgaMgUiaxHXFYmBAA2B4+JbJIMbXx+OLHguAyv8srAb0TV
-						nHLOWLgOxQIDAQABo1AwTjAdBgNVHQ4EFgQU2MzRSQipMAAPr5CCC2qd8JujL9Uw
-						HwYDVR0jBBgwFoAU2MzRSQipMAAPr5CCC2qd8JujL9UwDAYDVR0TBAUwAwEB/zAN
-						BgkqhkiG9w0BAQUFAAOCAQEALLzd9/KWXmLO2bLM0bxMC3/xmGxMJFbcS3F+Bf/u
-						XRFDiZDWvOa4bS01h95kGcR1geN2Ag0414B1nF8jHvQ+px7+bjzJgakGeUtgbo2W
-						kyY++i1YitrgSbBp5m50a1kBh/gRhBsFx9qU14XEft11f1Eht5Q2L52B6S89HB8I
-						SzbB/2SijZht33CJYqDVG9SKLhoVI27MCRVNUlmXFFvUXi05KFDbmtadPkSAR5R0
-						xXole5MprQ9wmqmmf5lMO/Q/lDJKgS05SPkfCH6qXTbWr7UTruSVJGbg5ZQxyMak
-						Dy5B9h6OWZR1PUUJlALjWmBQaZKFTBhHgACu0br2JUgSqw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cirencester.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirencester.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cirencester College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cirencester Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cirencester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matt</GivenName>
-    <SurName>Forsdike</SurName>
-    <EmailAddress>mailto:matt.forsdike@cirencester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matt</GivenName>
-    <SurName>Forsdike</SurName>
-    <EmailAddress>mailto:matt.forsdike@cirencester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cirrusidentity.com-idp.xml b/swamid-interfederations-2.0/idp.cirrusidentity.com-idp.xml
deleted file mode 100644
index 5456c836..00000000
--- a/swamid-interfederations-2.0/idp.cirrusidentity.com-idp.xml
+++ /dev/null
@@ -1,71 +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://idp.cirrusidentity.com/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">cirrusidentity.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cirrus Identity, Inc.</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Cirrus Identity employees.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://cirrusidentity.com/about/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="144" width="144" xml:lang="en">https://apps.cirrusidentity.com/console/static/images/cirrusidentity-ipad-144.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>
-MIID+jCCAuICCQDuv6UDX8Sf4zANBgkqhkiG9w0BAQUFADCBvjELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEDAOBgNVBAcTB09ha2xhbmQxHjAcBgNV
-BAoTFUNpcnJ1cyBJZGVudGl0eSwgSW5jLjEcMBoGA1UECxMTQ2lycnVzIElkZW50
-aXR5IElkUDEfMB0GA1UEAxMWaWRwLmNpcnJ1c2lkZW50aXR5LmNvbTEpMCcGCSqG
-SIb3DQEJARYac3VwcG9ydEBjaXJydXNpZGVudGl0eS5jb20wHhcNMTQwMTIzMTky
-MjAwWhcNMzQwMTIyMTkyMjAwWjCBvjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
-bGlmb3JuaWExEDAOBgNVBAcTB09ha2xhbmQxHjAcBgNVBAoTFUNpcnJ1cyBJZGVu
-dGl0eSwgSW5jLjEcMBoGA1UECxMTQ2lycnVzIElkZW50aXR5IElkUDEfMB0GA1UE
-AxMWaWRwLmNpcnJ1c2lkZW50aXR5LmNvbTEpMCcGCSqGSIb3DQEJARYac3VwcG9y
-dEBjaXJydXNpZGVudGl0eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC7Bcp2eHUniOxeNqM0RVZlfeS8p/7XfJBa/Gdp4CMrpxXNzgVqyXwwkSuQ
-mHE9syDuxrhlggk5qHBf19vyCh6GYgKdNJf/v+b4YJ7cp48hSniVVCKHEOq4gMb+
-p5d8iAYPFITxU7juJjDbovb9togCo9bLTYTVomo1i/tEoCLmDWZ4NpJOwaDU0HJO
-xmMi3AuSbfnrZvEZNTIvI6Xs0h0Ix2pqI2uIfJrgGssRubV0sqNJBvzUWjEg2Ozz
-BFiuAR1xHiGQDM651EmSow0TzxW54osdQWmlq+TqWQeMbZalRCwhRG2PATip0rMm
-LsxxDxXXPpvbtEy9BxzKK3Vh+21rAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAHG1
-iVl6WziIuLTA3F6sZ+C0rnESIVuvahJ1FHL6B0mPDKE2AazM+fzD6SIPgXxzFi/P
-hRHrhSa/XQ6i8gHqpACtURnJpPBy4mpM2ykA+40VJniwFpjeqe3t5PDYOsYxo4LZ
-pavOLU3ty7oitsVi+P2rC0LOE7Nn4lslc7Ah1J2unfyzAx9GBdeGu3TXmeBh4P3g
-JvbaSUb9vNgYNja2LTw2akvA9sOZis5VSqOyG9kU/6jBONiKqioQzTTVb+H/Mw2v
-/RrmIthzClneATCN70+7IYQUKe+jIksRg7CnWLJAXdHOI1vHxF0TV8Zk6VXOvLYF
-2DR8dnwEcMytTiMxvGk=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirrusidentity.com/idp/SLOService/HTTP-Redirect"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cirrusidentity.com/idp/SSOService/HTTP-Redirect"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cirrus Identity, Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cirrus Identity, Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://cirrusidentity.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Cirrus Identity Support</md:GivenName>
-    <md:EmailAddress>support@cirrusidentity.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Cirrus Identity Security</md:GivenName>
-    <md:EmailAddress>security@cirrusidentity.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Patrick Radtke</md:GivenName>
-    <md:EmailAddress>support@cirrusidentity.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cit.ie-idp.xml b/swamid-interfederations-2.0/idp.cit.ie-idp.xml
deleted file mode 100644
index dc2757c4..00000000
--- a/swamid-interfederations-2.0/idp.cit.ie-idp.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.cit.ie/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-01-20T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cit.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cork Institute of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Chorcaí</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.cit.ie</mdui:InformationURL>
-        <mdui:Logo height="61" width="250">https://edugate.heanet.ie/rr3/logos/cit.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:51.88399481564332,-8.53386640548706</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgACCQCHeJdzXpsZGDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJJ
-RTENMAsGA1UECBMEQ29yazENMAsGA1UEBxMEQ29yazEMMAoGA1UEChMDQ0lUMRMw
-EQYDVQQDEwppZHAuY2l0LmllMB4XDTA5MDgyNTExMjIzN1oXDTEyMDUyMTExMjIz
-N1owTjELMAkGA1UEBhMCSUUxDTALBgNVBAgTBENvcmsxDTALBgNVBAcTBENvcmsx
-DDAKBgNVBAoTA0NJVDETMBEGA1UEAxMKaWRwLmNpdC5pZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALQIuQmcQIAA6wgZRguOjAvFODCGd8+3++uzJuTl
-tCjZJ9w9a7fweRqGN81WaqF6i+wkgWgJ5JwLsnR7hsSu3NXPQ7GqQCVXFL8aUNjf
-YoT+/qCsCy9sKQBxLt4c15x9CG+tOCqwhfV5RMJp/TBJQemAxfpU6wrBnQkJmxUN
-JBHHmuqpzIqnTGQN1SdJcKgAjlLtwPIGi+LyamelSev84+SReAykG6n8onIGGwoJ
-walMUF6+kgXVfbupkM02dGzOOBkLz9hh41rhEzpbXWioT0ffz2V9jQXMsWLwFdNw
-vf8D5DG+vaJ7xXIs2nP3Xs3Sp9buH0qulSjWx9gcwY5CH7MCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAAtMrd6DHKUoHYDazlOp+w+RHt6oAOqZDwGIqPn6WqUQdfZeM
-Q7fPgfiO3o5LIfKddS8p4YfADwLv3CIJqZxOmXKR5lupEG3tjxpQL21VhzUNuoLn
-U8w0QgpWiq2w8mJT46sXp5//BDTluHg3MTwr0CvlQvpwh86fPF79ZZ2FmjeXvoSN
-2eFpMHG+/9W3WsEGZNHqXxR6ZAaBy+9ANQuQ1Z2UAKFcelwaMRqYn8zhsmQk+1dn
-WBXb83go+9GYN/H/CV61rR3LEWwx7WxE9CNb4IXfBou0B7O59G7TQ9dmzmwIcua7
-XgaFswJzpOWgaoJH7ftFEX2PALtD1x0PEFC+aw==
-</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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cit.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cit.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cit.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cork Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cork Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cit.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Anna</md:GivenName>
-    <md:SurName>ODonovan</md:SurName>
-    <md:EmailAddress>mailto:anna.odonovan@cit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IT</md:GivenName>
-    <md:SurName>Services</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@cit.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.citybathcoll.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.citybathcoll.ac.uk-oala-metadata.xml
deleted file mode 100644
index dbc33dc1..00000000
--- a/swamid-interfederations-2.0/idp.citybathcoll.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.citybathcoll.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Bath College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T18:17:54Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">citybathcoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUjCCAjqgAwIBAgIIfbSOFSC/ASkwDQYJKoZIhvcNAQEFBQAwQDEdMBsGA1UE
-						CgwUQ2l0eSBvZiBCYXRoIENvbGxlZ2UxHzAdBgNVBAMMFmlkcC5jaXR5YmF0aGNv
-						bGwuYWMudWswHhcNMTMwNDE4MTMyMTUzWhcNMjMwNDE4MTMyMTUzWjBAMR0wGwYD
-						VQQKDBRDaXR5IG9mIEJhdGggQ29sbGVnZTEfMB0GA1UEAwwWaWRwLmNpdHliYXRo
-						Y29sbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIpNwR6K
-						qvXHyj9FgnJ49oM25jOaqYfwXfc4EIq/1wEmuulwRVz0YdizYN0nQZNyujfFi7Wn
-						V+1r14vOg6Zke+VT6u4jlL9H+reg8gieN/ybVIMNqzfddY7a82N/ZABoEQ1Wckol
-						GAjcYrxO2hW71AKIixUT0S0sw8zpCCTntvqIhw+SB7fDT1v5oN0snLPplTdfwEk2
-						lLLEECZnf0IP/+5o76K/7KYO/+LrKS0eSrFQwQxz1IX6Vh413lMwa597gAXT2IKn
-						aYPAStni01WUFPuAs5eVWoXtAEx7sbhmPoxmhFGo4xVwhTVzJLo19QdagBb9jSRa
-						QaX+wKN6Ykp2RQsCAwEAAaNQME4wHQYDVR0OBBYEFHCktVxixSE9H7lUY6M2eMtN
-						KdKjMB8GA1UdIwQYMBaAFHCktVxixSE9H7lUY6M2eMtNKdKjMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBAEVLIzBFQ9u2sQ6esQMyWGZ74U5lgWqKOrLy
-						hjRFKFlEmL14S3w9b/Lj/KOGQ7QyH4P8bc7pnApftQSFTpCtLIjRRgSyuvoTUYXX
-						9mnEB4xpMDZfoHd+CP3Ipcfg08KTh1G9BEFJEeQW4zVxXp1YHd32/XBvT6vfxrKE
-						7zQPX/4mWDTmOTOs+7LmxhioeAeSgPbRh8waA0O3YRJCZ4Sw/Fel8wfmnu9X6DAH
-						4hLCRi7w+XmEl47/Lc7uJfuwoBl7h01Tdw4y8gPPLBoXKbg0MdYxbUbEONaFfNc/
-						3Lx/vmCft7bkCTFeY/m+j8a6an5M5PxQXyB3QaHDcuITralR0bQ=
-					</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>
-						MIIDUjCCAjqgAwIBAgIIfbSOFSC/ASkwDQYJKoZIhvcNAQEFBQAwQDEdMBsGA1UE
-						CgwUQ2l0eSBvZiBCYXRoIENvbGxlZ2UxHzAdBgNVBAMMFmlkcC5jaXR5YmF0aGNv
-						bGwuYWMudWswHhcNMTMwNDE4MTMyMTUzWhcNMjMwNDE4MTMyMTUzWjBAMR0wGwYD
-						VQQKDBRDaXR5IG9mIEJhdGggQ29sbGVnZTEfMB0GA1UEAwwWaWRwLmNpdHliYXRo
-						Y29sbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIpNwR6K
-						qvXHyj9FgnJ49oM25jOaqYfwXfc4EIq/1wEmuulwRVz0YdizYN0nQZNyujfFi7Wn
-						V+1r14vOg6Zke+VT6u4jlL9H+reg8gieN/ybVIMNqzfddY7a82N/ZABoEQ1Wckol
-						GAjcYrxO2hW71AKIixUT0S0sw8zpCCTntvqIhw+SB7fDT1v5oN0snLPplTdfwEk2
-						lLLEECZnf0IP/+5o76K/7KYO/+LrKS0eSrFQwQxz1IX6Vh413lMwa597gAXT2IKn
-						aYPAStni01WUFPuAs5eVWoXtAEx7sbhmPoxmhFGo4xVwhTVzJLo19QdagBb9jSRa
-						QaX+wKN6Ykp2RQsCAwEAAaNQME4wHQYDVR0OBBYEFHCktVxixSE9H7lUY6M2eMtN
-						KdKjMB8GA1UdIwQYMBaAFHCktVxixSE9H7lUY6M2eMtNKdKjMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBAEVLIzBFQ9u2sQ6esQMyWGZ74U5lgWqKOrLy
-						hjRFKFlEmL14S3w9b/Lj/KOGQ7QyH4P8bc7pnApftQSFTpCtLIjRRgSyuvoTUYXX
-						9mnEB4xpMDZfoHd+CP3Ipcfg08KTh1G9BEFJEeQW4zVxXp1YHd32/XBvT6vfxrKE
-						7zQPX/4mWDTmOTOs+7LmxhioeAeSgPbRh8waA0O3YRJCZ4Sw/Fel8wfmnu9X6DAH
-						4hLCRi7w+XmEl47/Lc7uJfuwoBl7h01Tdw4y8gPPLBoXKbg0MdYxbUbEONaFfNc/
-						3Lx/vmCft7bkCTFeY/m+j8a6an5M5PxQXyB3QaHDcuITralR0bQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.citybathcoll.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.citybathcoll.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Bath College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bath College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.citybathcoll.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Naomi</GivenName>
-    <SurName>Elliott</SurName>
-    <EmailAddress>mailto:naomi.elliott@bathcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Justin</GivenName>
-    <SurName>Haskins</SurName>
-    <EmailAddress>mailto:haskinsj@bathcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cityofbristol.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.cityofbristol.ac.uk-shibboleth.xml
deleted file mode 100644
index c8c6e684..00000000
--- a/swamid-interfederations-2.0/idp.cityofbristol.ac.uk-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" entityID="https://idp.cityofbristol.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for City of Bristol College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">cityofbristol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEZjCCA06gAwIBAgIJAI1toHyODheqMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDEgMB4G
-						A1UEChMXQ2l0eSBvZiBCcmlzdG9sIENvbGxlZ2UxDDAKBgNVBAsTA0lDVDEgMB4G
-						A1UEAxMXaWRwLmNpdHlvZmJyaXN0b2wuYWMudWsxLjAsBgkqhkiG9w0BCQEWH2l0
-						LmhlbHBkZXNrQGNpdHlvZmJyaXN0b2wuYWMudWswHhcNMTMwOTA5MTQyMTA2WhcN
-						MjMwOTA3MTQyMTA2WjCBszELMAkGA1UEBhMCR0IxEDAOBgNVBAgTB0JyaXN0b2wx
-						EDAOBgNVBAcTB0JyaXN0b2wxIDAeBgNVBAoTF0NpdHkgb2YgQnJpc3RvbCBDb2xs
-						ZWdlMQwwCgYDVQQLEwNJQ1QxIDAeBgNVBAMTF2lkcC5jaXR5b2ZicmlzdG9sLmFj
-						LnVrMS4wLAYJKoZIhvcNAQkBFh9pdC5oZWxwZGVza0BjaXR5b2ZicmlzdG9sLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxEl6P5t+xyRzY0Wa
-						bd/a2MC83Kxrc97VfUi3fMh2+FPQ/Dgu7o7KwTL+HhC7cQNJUHyTRUMV43TrIRPs
-						LjHtCzVi0XYQSBE88p77aVX7K/OEcrxkKdQ/pIAafw9pXeSc1FAu48npCypP6w3b
-						4cFRd0SzbYHGThMBDVoSqraK6c2lB1g2z4f0q4IP6RmM3/5UCqO2vw4wKNLfvfVV
-						tC9fu+UHv1hMvBjb0JLpRNQk/RWQSIXJmAycpzAzbnUJnEtief8xktMbcsWRrJL4
-						T0xeFFlfH6vf3MMaJ2IvRuIqr5yf/RqACda27qKxuxND3TXb2ZFBYv9p8ECxWmda
-						0GnIdQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUzvFe/y/teU8C+1OsLgTj
-						kDxpTrgwHwYDVR0jBBgwFoAUzvFe/y/teU8C+1OsLgTjkDxpTrgwDQYJKoZIhvcN
-						AQEFBQADggEBAK0jlGscDnh+m84UTJ364uJ5tzDQaaVQ+OhjQBGQV9m2uRj4t2EU
-						/Exc05LVgRK14pBWwlJ6EaJm7y5PUOQRD7PiCTq3nIEObvbg7X+8/Cj3KHrquSBE
-						Ww9GQ/d4MSbRMJISEkaCy4onoTlg4ulzzkSChpqJeRyk+acUCVYcfZxW2aHcAdFm
-						pPyEOMOQGHUDtD+9c1fb2ICmcVs6vHM05QXaXzAP5wS66+Z2L3wI0RPHJji8RMzT
-						RcBdINvWCrZHyLLxIqCpE9U95kY1JYsxLuVpkwTlf25VZIhAO0aTu0RI9Waq+DIm
-						Fn2vK00uJvNRLNZs0Cjgz4ZWOQzJHWQt0Tk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cityofbristol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofbristol.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.cityofbristol.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cityofbristol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cityofbristol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cityofbristol.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">cityofbristol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEZjCCA06gAwIBAgIJAI1toHyODheqMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDEgMB4G
-						A1UEChMXQ2l0eSBvZiBCcmlzdG9sIENvbGxlZ2UxDDAKBgNVBAsTA0lDVDEgMB4G
-						A1UEAxMXaWRwLmNpdHlvZmJyaXN0b2wuYWMudWsxLjAsBgkqhkiG9w0BCQEWH2l0
-						LmhlbHBkZXNrQGNpdHlvZmJyaXN0b2wuYWMudWswHhcNMTMwOTA5MTQyMTA2WhcN
-						MjMwOTA3MTQyMTA2WjCBszELMAkGA1UEBhMCR0IxEDAOBgNVBAgTB0JyaXN0b2wx
-						EDAOBgNVBAcTB0JyaXN0b2wxIDAeBgNVBAoTF0NpdHkgb2YgQnJpc3RvbCBDb2xs
-						ZWdlMQwwCgYDVQQLEwNJQ1QxIDAeBgNVBAMTF2lkcC5jaXR5b2ZicmlzdG9sLmFj
-						LnVrMS4wLAYJKoZIhvcNAQkBFh9pdC5oZWxwZGVza0BjaXR5b2ZicmlzdG9sLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxEl6P5t+xyRzY0Wa
-						bd/a2MC83Kxrc97VfUi3fMh2+FPQ/Dgu7o7KwTL+HhC7cQNJUHyTRUMV43TrIRPs
-						LjHtCzVi0XYQSBE88p77aVX7K/OEcrxkKdQ/pIAafw9pXeSc1FAu48npCypP6w3b
-						4cFRd0SzbYHGThMBDVoSqraK6c2lB1g2z4f0q4IP6RmM3/5UCqO2vw4wKNLfvfVV
-						tC9fu+UHv1hMvBjb0JLpRNQk/RWQSIXJmAycpzAzbnUJnEtief8xktMbcsWRrJL4
-						T0xeFFlfH6vf3MMaJ2IvRuIqr5yf/RqACda27qKxuxND3TXb2ZFBYv9p8ECxWmda
-						0GnIdQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUzvFe/y/teU8C+1OsLgTj
-						kDxpTrgwHwYDVR0jBBgwFoAUzvFe/y/teU8C+1OsLgTjkDxpTrgwDQYJKoZIhvcN
-						AQEFBQADggEBAK0jlGscDnh+m84UTJ364uJ5tzDQaaVQ+OhjQBGQV9m2uRj4t2EU
-						/Exc05LVgRK14pBWwlJ6EaJm7y5PUOQRD7PiCTq3nIEObvbg7X+8/Cj3KHrquSBE
-						Ww9GQ/d4MSbRMJISEkaCy4onoTlg4ulzzkSChpqJeRyk+acUCVYcfZxW2aHcAdFm
-						pPyEOMOQGHUDtD+9c1fb2ICmcVs6vHM05QXaXzAP5wS66+Z2L3wI0RPHJji8RMzT
-						RcBdINvWCrZHyLLxIqCpE9U95kY1JYsxLuVpkwTlf25VZIhAO0aTu0RI9Waq+DIm
-						Fn2vK00uJvNRLNZs0Cjgz4ZWOQzJHWQt0Tk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cityofbristol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofbristol.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">City of Bristol College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">City of Bristol College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cityofbristol.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:it.helpdesk@cityofbristol.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dale</GivenName>
-    <SurName>Simpkins</SurName>
-    <EmailAddress>mailto:dale.simpkins@cityofbristol.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cityofglasgowcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cityofglasgowcollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index fc74383d..00000000
--- a/swamid-interfederations-2.0/idp.cityofglasgowcollege.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.cityofglasgowcollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the City of Glasgow College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-02T14:34:09Z">
-      <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">cityofglasgowcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZjCCAk6gAwIBAgIVAI38uSRnFA9tDvzGsjh8FcUJn5XSMA0GCSqGSIb3DQEB
-						BQUAMCkxJzAlBgNVBAMTHmlkcC5jaXR5b2ZnbGFzZ293Y29sbGVnZS5hYy51azAe
-						Fw0xNDA1MTkwOTIyMDVaFw0zNDA1MTkwOTIyMDVaMCkxJzAlBgNVBAMTHmlkcC5j
-						aXR5b2ZnbGFzZ293Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAJthr2byyj0MBLQhYUMjKtn4jUJzN+1/3bzxFjCYtgPf6rQqhG2e
-						gaoOkDx2r3Tqq/Rh66oQYqqR/+T02JzQKFaUrYllBNDLRmoY6ks52ayLTrhY3kZy
-						VYntEzsKiRZ15lPMDxGs/LpyXoxW2DfWhUF6clXeyTUJwLBVSM1eHvtXcaMpf85F
-						+F3zfdt+ReHqBM2gzy/6zN9QPi3u6UUSDkKHjkxjnn4Uf2vyo8WREjildb4Xdon2
-						Tf3Gmg3zfLgs0qZI2X5+Z/KbSu+Dp1MjnannE+MKoqPU6cjc13CFxXR3CDozwrAc
-						8O7tJktCHDTMqkBEwFCijV70OTukkapjP8ECAwEAAaOBhDCBgTBgBgNVHREEWTBX
-						gh5pZHAuY2l0eW9mZ2xhc2dvd2NvbGxlZ2UuYWMudWuGNWh0dHBzOi8vaWRwLmNp
-						dHlvZmdsYXNnb3djb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
-						BBRAcYAdOlKRaOjN2yAIoJy7Q1hAyjANBgkqhkiG9w0BAQUFAAOCAQEAQTWIeg+3
-						VunEEEvdbvvhcDwMJkzK+AXoCMU9CwXn0fIpjNCV9/sGLdKLJr9RlYk3mnOWRwR6
-						JNWOWRBe9OVw7t59LY0orNSLGR6hK1lv74P7sjmwy3wOuN1suPGYkgj9Z20n7Q/j
-						3P5yoL9o3OR5qheUO1q/nB9BSf3PZMWtgGHuas4xd9H611JaFXn3Twol6IZfqfjP
-						JTx/ZE9prDzEYog9nZyWMrazcMRg0ZKNvgd7vuk6x8VIZYTUYONQ2h0h+Crz1dz6
-						IKiRu3CJ7CUBlfqfhvOAlSfA6aPZZK7UqVXaB2JNlw2gqvoms/9/WAiph1lk6kSj
-						jatFpe4qgOFjPw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cityofglasgowcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofglasgowcollege.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.cityofglasgowcollege.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofglasgowcollege.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.cityofglasgowcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cityofglasgowcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cityofglasgowcollege.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">cityofglasgowcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZjCCAk6gAwIBAgIVAI38uSRnFA9tDvzGsjh8FcUJn5XSMA0GCSqGSIb3DQEB
-						BQUAMCkxJzAlBgNVBAMTHmlkcC5jaXR5b2ZnbGFzZ293Y29sbGVnZS5hYy51azAe
-						Fw0xNDA1MTkwOTIyMDVaFw0zNDA1MTkwOTIyMDVaMCkxJzAlBgNVBAMTHmlkcC5j
-						aXR5b2ZnbGFzZ293Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAJthr2byyj0MBLQhYUMjKtn4jUJzN+1/3bzxFjCYtgPf6rQqhG2e
-						gaoOkDx2r3Tqq/Rh66oQYqqR/+T02JzQKFaUrYllBNDLRmoY6ks52ayLTrhY3kZy
-						VYntEzsKiRZ15lPMDxGs/LpyXoxW2DfWhUF6clXeyTUJwLBVSM1eHvtXcaMpf85F
-						+F3zfdt+ReHqBM2gzy/6zN9QPi3u6UUSDkKHjkxjnn4Uf2vyo8WREjildb4Xdon2
-						Tf3Gmg3zfLgs0qZI2X5+Z/KbSu+Dp1MjnannE+MKoqPU6cjc13CFxXR3CDozwrAc
-						8O7tJktCHDTMqkBEwFCijV70OTukkapjP8ECAwEAAaOBhDCBgTBgBgNVHREEWTBX
-						gh5pZHAuY2l0eW9mZ2xhc2dvd2NvbGxlZ2UuYWMudWuGNWh0dHBzOi8vaWRwLmNp
-						dHlvZmdsYXNnb3djb2xsZWdlLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
-						BBRAcYAdOlKRaOjN2yAIoJy7Q1hAyjANBgkqhkiG9w0BAQUFAAOCAQEAQTWIeg+3
-						VunEEEvdbvvhcDwMJkzK+AXoCMU9CwXn0fIpjNCV9/sGLdKLJr9RlYk3mnOWRwR6
-						JNWOWRBe9OVw7t59LY0orNSLGR6hK1lv74P7sjmwy3wOuN1suPGYkgj9Z20n7Q/j
-						3P5yoL9o3OR5qheUO1q/nB9BSf3PZMWtgGHuas4xd9H611JaFXn3Twol6IZfqfjP
-						JTx/ZE9prDzEYog9nZyWMrazcMRg0ZKNvgd7vuk6x8VIZYTUYONQ2h0h+Crz1dz6
-						IKiRu3CJ7CUBlfqfhvOAlSfA6aPZZK7UqVXaB2JNlw2gqvoms/9/WAiph1lk6kSj
-						jatFpe4qgOFjPw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cityofglasgowcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cityofglasgowcollege.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">City of Glasgow College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">City of Glasgow College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cityofglasgowcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:servicedesk@cityofglasgowcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Marco</GivenName>
-    <SurName>Landi</SurName>
-    <EmailAddress>mailto:marco.landi@cityofglasgowcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.citysun.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.citysun.ac.uk-shibboleth.xml
deleted file mode 100644
index abe3a414..00000000
--- a/swamid-interfederations-2.0/idp.citysun.ac.uk-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://idp.citysun.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Sunderland College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-02T17:44: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">citysun.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXDCCAkQCCQCvtyS3mHeGmjANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
-						QjETMBEGA1UECAwKU3VuZGVybGFuZDETMBEGA1UEBwwKU3VuZGVybGFuZDEbMBkG
-						A1UECgwSU3VuZGVybGFuZCBDb2xsZWdlMRowGAYDVQQDDBFpZHAuY2l0eXN1bi5h
-						Yy51azAeFw0xNDA2MDMwOTQzNDFaFw0zNDA1MjkwOTQzNDFaMHAxCzAJBgNVBAYT
-						AkdCMRMwEQYDVQQIDApTdW5kZXJsYW5kMRMwEQYDVQQHDApTdW5kZXJsYW5kMRsw
-						GQYDVQQKDBJTdW5kZXJsYW5kIENvbGxlZ2UxGjAYBgNVBAMMEWlkcC5jaXR5c3Vu
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAre4HrH3LHyb0
-						9qb9U8p4/8prj/rZrN7FJDyMeeYC6a9/S+PMk+iQXk3h52l1kudDn8G67kSOEbhc
-						HTAenOXlIF9r3oeBjrpc6IPwzMsM8jX0h+Gs5dOBtu1HrpVfy2XwYuDjkM5J0Pzx
-						eYP2qvZFDsZiwzj4t+1Cq1G74dLpjQmyP7P6jrNf05wsXdzL12d7t8KWk14FuOIQ
-						lEDON2GUaHx2rgi1lyG5UqqILWAhAqj+SxIZ+33nVXG+xrhFPJT8BIrkeMmlP88l
-						ck8r1qF9/K8mkA5qY9HOJKjnI4yk1tdIfGG3/u83OUwuoFXMlbj8Q8jbPVbDOeK2
-						E7HuEfA6SwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBufJMekr7JjV7klcgwXNm8
-						KNnAaK7noWqHerMF5/ZQShvaDVTlkwzgonnZI3ZbmUJBk6a2Tu3b4uwCPsGvQ+Hj
-						mQssqbYEVWnN0rNeHlQkS3haXZHFXX4wlpTdbv43fAtrxEG+8Jp8QKitKhG8GAtB
-						bto0gBmpteW4fc8opi/+U8K1OfnTRtGOnZfkfcfOKc1LZRhN8PvToLeOStRPNdLP
-						xaJMNNnK3Fwjt+RODk9qCoaqM4D8sSLoRUgOJa4OXrwLH+e7++NOeqeM9ScjFrFt
-						cflw6bvFBAvh/kDN5LUPBYeVYTmdB5RAahYEvCVpecQG2yVChpfCyV2PywtMn0Mt
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.citysun.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.citysun.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.citysun.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.citysun.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.citysun.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.citysun.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">citysun.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXDCCAkQCCQCvtyS3mHeGmjANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
-						QjETMBEGA1UECAwKU3VuZGVybGFuZDETMBEGA1UEBwwKU3VuZGVybGFuZDEbMBkG
-						A1UECgwSU3VuZGVybGFuZCBDb2xsZWdlMRowGAYDVQQDDBFpZHAuY2l0eXN1bi5h
-						Yy51azAeFw0xNDA2MDMwOTQzNDFaFw0zNDA1MjkwOTQzNDFaMHAxCzAJBgNVBAYT
-						AkdCMRMwEQYDVQQIDApTdW5kZXJsYW5kMRMwEQYDVQQHDApTdW5kZXJsYW5kMRsw
-						GQYDVQQKDBJTdW5kZXJsYW5kIENvbGxlZ2UxGjAYBgNVBAMMEWlkcC5jaXR5c3Vu
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAre4HrH3LHyb0
-						9qb9U8p4/8prj/rZrN7FJDyMeeYC6a9/S+PMk+iQXk3h52l1kudDn8G67kSOEbhc
-						HTAenOXlIF9r3oeBjrpc6IPwzMsM8jX0h+Gs5dOBtu1HrpVfy2XwYuDjkM5J0Pzx
-						eYP2qvZFDsZiwzj4t+1Cq1G74dLpjQmyP7P6jrNf05wsXdzL12d7t8KWk14FuOIQ
-						lEDON2GUaHx2rgi1lyG5UqqILWAhAqj+SxIZ+33nVXG+xrhFPJT8BIrkeMmlP88l
-						ck8r1qF9/K8mkA5qY9HOJKjnI4yk1tdIfGG3/u83OUwuoFXMlbj8Q8jbPVbDOeK2
-						E7HuEfA6SwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBufJMekr7JjV7klcgwXNm8
-						KNnAaK7noWqHerMF5/ZQShvaDVTlkwzgonnZI3ZbmUJBk6a2Tu3b4uwCPsGvQ+Hj
-						mQssqbYEVWnN0rNeHlQkS3haXZHFXX4wlpTdbv43fAtrxEG+8Jp8QKitKhG8GAtB
-						bto0gBmpteW4fc8opi/+U8K1OfnTRtGOnZfkfcfOKc1LZRhN8PvToLeOStRPNdLP
-						xaJMNNnK3Fwjt+RODk9qCoaqM4D8sSLoRUgOJa4OXrwLH+e7++NOeqeM9ScjFrFt
-						cflw6bvFBAvh/kDN5LUPBYeVYTmdB5RAahYEvCVpecQG2yVChpfCyV2PywtMn0Mt
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.citysun.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.citysun.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">Sunderland College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sunderland College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.citysun.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Fernando</GivenName>
-    <SurName>Mora</SurName>
-    <EmailAddress>mailto:fernando.mora@sunderlandcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Fernando</GivenName>
-    <SurName>Mora</SurName>
-    <EmailAddress>mailto:fernando.mora@sunderlandcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.clarion.edu-idp.xml b/swamid-interfederations-2.0/idp.clarion.edu-idp.xml
deleted file mode 100644
index 3b44a7dc..00000000
--- a/swamid-interfederations-2.0/idp.clarion.edu-idp.xml
+++ /dev/null
@@ -1,91 +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://idp.clarion.edu/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">clarion.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Clarion University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Clarion University is a member of the Pennsylvania State System of Higher Education</mdui:Description>
-        <mdui:Logo height="68" width="207" xml:lang="en">https://idp.clarion.edu/idp/images/eagle_logo2.gif</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>
-MIIDJzCCAg+gAwIBAgIUBafbshnnIQs9vn04YDHVguyflZswDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmNsYXJpb24uZWR1MB4XDTEyMTIxODE1MDc0N1oX
-DTMyMTIxODE1MDc0N1owGjEYMBYGA1UEAxMPaWRwLmNsYXJpb24uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhQ1hrfd9TG7GUt01LXLCXY3Sb7we
-rvPCxnff63bJlvrDprQwhLU0gZcOYPxHgnj9xCglvGzfxHYN7k6b8rmtSYE+i/As
-eAmxIadE8UtFyhzQigpmbkuc26T/mrKBH4X5fJC6Shv7bhGMkxAdIVfVKVAk8z2e
-JV10baku4n3heyJ+FpmybPGmgkxAS1zbgC2MZJUkZAW+7C6+FoUgWCezCA0+VB87
-6QiMeX04Y6PG4FimGp6WJWDkW2KGPalIv6fdJAZOrOg3aJakpJFPyg1fUaEUHIPd
-1ip+P7DisITQeRwVqOiW5N9UTUktba0X6R0BqHuQlbfV5bIUDicSpP7iqwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuY2xhcmlvbi5lZHWGJmh0dHBzOi8vaWRwLmNs
-YXJpb24uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQvjjlxOgaZw1afROEy
-0g3wElY5ZjANBgkqhkiG9w0BAQUFAAOCAQEABLcQuMrWaIjTiWPEowG+sQRwnewI
-OkmtVC/r2hAz7p/m0WvdPFzcciGY2h6j/jqfH+iy9sYH4yM9u4J9WAumQK1Q4GlI
-0IcvbzMS/z0J4c7DZMf5o2bOW2nNnYH+snLifzQ3oFdb/41ZHc4DJPmdUQrGe5zu
-R/+XlwCtHu5YnWULAF6CiyS7z1KXj12fT8a4brLHLV1WGDYeOP3Wt0gF0lalQ+0x
-EnfRqvXvlWlxTuzRLDqKXzowjyAsGsxCItlvmIwANgYxn1SxDBTW0ZwMZ6lVR0F2
-8ergXvj+UYo/oR2H/HIprHaREQadi68xBDCSKMaZVqbdk/DfFzNiUEeOyQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.clarion.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.clarion.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.clarion.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.clarion.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.clarion.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">clarion.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUBafbshnnIQs9vn04YDHVguyflZswDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmNsYXJpb24uZWR1MB4XDTEyMTIxODE1MDc0N1oX
-DTMyMTIxODE1MDc0N1owGjEYMBYGA1UEAxMPaWRwLmNsYXJpb24uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhQ1hrfd9TG7GUt01LXLCXY3Sb7we
-rvPCxnff63bJlvrDprQwhLU0gZcOYPxHgnj9xCglvGzfxHYN7k6b8rmtSYE+i/As
-eAmxIadE8UtFyhzQigpmbkuc26T/mrKBH4X5fJC6Shv7bhGMkxAdIVfVKVAk8z2e
-JV10baku4n3heyJ+FpmybPGmgkxAS1zbgC2MZJUkZAW+7C6+FoUgWCezCA0+VB87
-6QiMeX04Y6PG4FimGp6WJWDkW2KGPalIv6fdJAZOrOg3aJakpJFPyg1fUaEUHIPd
-1ip+P7DisITQeRwVqOiW5N9UTUktba0X6R0BqHuQlbfV5bIUDicSpP7iqwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuY2xhcmlvbi5lZHWGJmh0dHBzOi8vaWRwLmNs
-YXJpb24uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQvjjlxOgaZw1afROEy
-0g3wElY5ZjANBgkqhkiG9w0BAQUFAAOCAQEABLcQuMrWaIjTiWPEowG+sQRwnewI
-OkmtVC/r2hAz7p/m0WvdPFzcciGY2h6j/jqfH+iy9sYH4yM9u4J9WAumQK1Q4GlI
-0IcvbzMS/z0J4c7DZMf5o2bOW2nNnYH+snLifzQ3oFdb/41ZHc4DJPmdUQrGe5zu
-R/+XlwCtHu5YnWULAF6CiyS7z1KXj12fT8a4brLHLV1WGDYeOP3Wt0gF0lalQ+0x
-EnfRqvXvlWlxTuzRLDqKXzowjyAsGsxCItlvmIwANgYxn1SxDBTW0ZwMZ6lVR0F2
-8ergXvj+UYo/oR2H/HIprHaREQadi68xBDCSKMaZVqbdk/DfFzNiUEeOyQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.clarion.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Clarion University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Clarion University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.clarion.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michael Phillips</md:GivenName>
-    <md:EmailAddress>mphillips@clarion.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cloud.rsmart.com-saml.xml b/swamid-interfederations-2.0/idp.cloud.rsmart.com-saml.xml
deleted file mode 100644
index 44e231d9..00000000
--- a/swamid-interfederations-2.0/idp.cloud.rsmart.com-saml.xml
+++ /dev/null
@@ -1,61 +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://idp.cloud.rsmart.com/saml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.cloud.rsmart.com/error" 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">rsmart.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">RSmart</mdui:DisplayName>
-        <mdui:Description xml:lang="en">rSmart Corporate IdP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://rsmart.com</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://rsmart.com/privacy</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>
-MIIDETCCAfmgAwIBAgIJAMOVQ66HI1iJMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMMFGlkcC5jbG91ZC5yc21hcnQuY29tMB4XDTE0MDgyMjAzMTA1NloXDTI0MDgy
-MTAzMTA1NlowHzEdMBsGA1UEAwwUaWRwLmNsb3VkLnJzbWFydC5jb20wggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD1nKxBxHabmRa+ldtR4nduYhun8jph
-OgFcvnewXk/cgG+b+DbvFRB7cFAuEKYRsRd7BFZHHOLuwOYoKI+Ih64lgoMeZ5+V
-QUBIyujk5d5NlQLFWrEJ+qVj33bxnlkD/k8SwOZ7601m33gM+2GFJcTCHGGPeUZO
-Xr6B5YBkQi4T1ygCOtP3ND+VgFWZy5aVpn18kd04kw9A2R36zGqE7o550j8ASwLv
-sCNKEubAuw3GpYu666SA/aCpwRukBIX8HO//K69TIx/V87jxL3U/ktdqZvEcYeWQ
-zNE2/DzIRjntMINQXYmPk1xFzgrQAFB93rJumiHcYZCm8ETBiHKHrufnAgMBAAGj
-UDBOMB0GA1UdDgQWBBQ0nS+aXjzlydfphC8jT07rhRTFdjAfBgNVHSMEGDAWgBQ0
-nS+aXjzlydfphC8jT07rhRTFdjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
-A4IBAQCrVxMmJLgZvpDee+2upfdyZma9Xvqt96diO6Kebte0Z1lNi0LIvoaUAqq1
-rAUEqIn55+DJsvdRNWvLVHvTOSrONwH7F8GjNS/EqO1j/6OP0UR1eJwdnSA+5EfB
-7c8cP8PmKvdul0uhOLAj4YjNjCHW04SxKWMeEBvvNaA/gXFIGnSFfgZeXcFrhc+h
-+zSm7YYGwLgTDkHOQZRIaHDVbuMuVCdkMLLFkbJOT8diJWZbSXt1oTOsr9mGvlJm
-hyZQAvr/QOSMv/csIOcNnq5bJ5rkMPUHC5+/BWO88iO5wMm+vxIYRnTB1flw/o0i
-cpX6/qZs7VVwnx5qd3n4+ZUKOzN4
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cloud.rsmart.com/saml/saml2/sso" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cloud.rsmart.com/saml/saml2/slo"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cloud.rsmart.com/saml/saml1/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cloud.rsmart.com/saml/saml2/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cloud.rsmart.com/saml/saml2/sso"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:EmailAddress>support@rsmart.com</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 dce61b33..00000000
--- a/swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.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://idp.cnous.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CNOUS</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMJSAnKwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTYrMDI6MDDl3SQQAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.cnous.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CNOUS</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>
-					      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>
-    </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-POST" Location="https://idp.cnous.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cnous.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cnous.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CNOUS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CNOUS</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cnous.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Christian Muller</md:SurName>
-    <md:EmailAddress>christian.muller@cnous.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>José tripet</md:SurName>
-    <md:EmailAddress>jose.tripet@cnous.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml
deleted file mode 100644
index e1b33912..00000000
--- a/swamid-interfederations-2.0/idp.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cnr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-07-06T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Research Council (CNR)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for National Research Council (CNR) users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Consiglio Nazionale delle Ricerche (CNR)</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://utenti.cnr.it/utenti/info-idem.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.cnr.it/sitocnr/home.html</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUQn+v41WHgk0kt62N0i1wzsHc0TgwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmNuci5pdDAeFw0xMDAyMjQwODE1MTBaFw0zMDAy
-MjQwODE1MTBaMBUxEzARBgNVBAMTCmlkcC5jbnIuaXQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDlDQud7JblaNOgr0fuqphs5R2I3dvRfaL1ttm6MlmK
-2/GQZ9M+vn3ACHQoWVxmibPiZSm45Q9cdD3ZOE0GOeFbj6mE5zRlUleFI4mI17iB
-LtcjV4CsdpG2l7MC3Lreh6UEL1xkkjQk2PSMvY8l2x4ojyRsxOQDIsZksvkdLz0P
-L/2YV5+0R7ZSBN6kvWKTfDn38zl3kDuq39GcXphbcaqXlymNSXw7BH7p/Psm+J/C
-aOHFxtZ5CU4TyrCMqXWscNDgtdqWajwFVY7yQzNDHSFwccS6ToY23Mr6kGdfC4Z0
-Sm87uudoPxUKRi9MrWzSYLKjaEGXUF89KXO0UKdHyH2fAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5jbnIuaXSGIWh0dHBzOi8vaWRwLmNuci5pdC9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU9zuZcJbHOOpslfMMz71HfiXR1iEwDQYJKoZIhvcNAQEF
-BQADggEBAKWK5XLASdpMoZAnAZ0uZfONig7/GQPyEINJpyh4BQj6ioZfbLl9MviB
-dNo0K0YdbE5/8eVQ9W9ZiERf0nGY3eSeJRa1mgxmcZbHtEjn9e8GKrUM39XGmWNX
-T+R15myyOYa+1d1FX4DIjnFhXozMCwOwpiWUgHQAPuSJhlcLKRCgByfYazBFI8Rq
-qYXCWIXhdSsaFnMN6lrjawxHOnFCL81KXoin971tbpEyHp10MeDUjEgVvU6K5FTV
-Mmm/TDBCUAo0neP/1zhO1oLqVcG0Of92sCIat4pJ3pz6c+Bu/VvSuY7WIWQ9ceUi
-VpIFeEz7cGIaIfECnuZZVeoum3xqc9k=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cnr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cnr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnr.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUQn+v41WHgk0kt62N0i1wzsHc0TgwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmNuci5pdDAeFw0xMDAyMjQwODE1MTBaFw0zMDAy
-MjQwODE1MTBaMBUxEzARBgNVBAMTCmlkcC5jbnIuaXQwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDlDQud7JblaNOgr0fuqphs5R2I3dvRfaL1ttm6MlmK
-2/GQZ9M+vn3ACHQoWVxmibPiZSm45Q9cdD3ZOE0GOeFbj6mE5zRlUleFI4mI17iB
-LtcjV4CsdpG2l7MC3Lreh6UEL1xkkjQk2PSMvY8l2x4ojyRsxOQDIsZksvkdLz0P
-L/2YV5+0R7ZSBN6kvWKTfDn38zl3kDuq39GcXphbcaqXlymNSXw7BH7p/Psm+J/C
-aOHFxtZ5CU4TyrCMqXWscNDgtdqWajwFVY7yQzNDHSFwccS6ToY23Mr6kGdfC4Z0
-Sm87uudoPxUKRi9MrWzSYLKjaEGXUF89KXO0UKdHyH2fAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5jbnIuaXSGIWh0dHBzOi8vaWRwLmNuci5pdC9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU9zuZcJbHOOpslfMMz71HfiXR1iEwDQYJKoZIhvcNAQEF
-BQADggEBAKWK5XLASdpMoZAnAZ0uZfONig7/GQPyEINJpyh4BQj6ioZfbLl9MviB
-dNo0K0YdbE5/8eVQ9W9ZiERf0nGY3eSeJRa1mgxmcZbHtEjn9e8GKrUM39XGmWNX
-T+R15myyOYa+1d1FX4DIjnFhXozMCwOwpiWUgHQAPuSJhlcLKRCgByfYazBFI8Rq
-qYXCWIXhdSsaFnMN6lrjawxHOnFCL81KXoin971tbpEyHp10MeDUjEgVvU6K5FTV
-Mmm/TDBCUAo0neP/1zhO1oLqVcG0Of92sCIat4pJ3pz6c+Bu/VvSuY7WIWQ9ceUi
-VpIFeEz7cGIaIfECnuZZVeoum3xqc9k=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">National Research Council (CNR)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.cnr.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.cnr.it/sitocnr/home.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Silvio Scipioni</md:SurName>
-    <md:EmailAddress>mailto:silvio.scipioni@cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:supporto.idp@cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cnwl.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cnwl.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 01dc17e0..00000000
--- a/swamid-interfederations-2.0/idp.cnwl.ac.uk-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.cnwl.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the College of North West London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-22T16:13:14Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">cnwl.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIzCCAgugAwIBAgIUEJciO46aX1zd30VubLZW8mTbPWcwDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOaWRwLmNud2wuYWMudWswHhcNMTMwMjIyMTM0MTQ2WhcN
-						MzMwMjIyMTM0MTQ2WjAZMRcwFQYDVQQDEw5pZHAuY253bC5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKw5eKNDVnIjYE4C57t/K2+u+4c/tirp
-						rk9ozEGO0JCSnCq+GcxJm5Mfxs5sM6u919g7BOZZU5zm5sykEvhM1YonMcjzcBsd
-						EHVs78c9Nlv6ZueO5923ArCYybTPTpqZWr9px0XdltBkLafFOWPUt3mUVUglv6X6
-						esMQaiDPAbrG+Nvdo0ZbnlA5tBy7WMNEk6SyB0VhxIN3KDWsTi39tRpNVaroO+VG
-						pdrC31S4g5aropb/27kOTIltrxVokJDLHjo0PMO2o2eKLZvtgYRnL8/XTTXexZyy
-						U85U3G5zPw2jptUHHx1W9Ojs/9rUsp61znAJEXfgMS5iQLl2JwA9EsUCAwEAAaNj
-						MGEwQAYDVR0RBDkwN4IOaWRwLmNud2wuYWMudWuGJWh0dHBzOi8vaWRwLmNud2wu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBWW2Q/zTBI5/JWM/SHx/Kg2
-						YRleMA0GCSqGSIb3DQEBBQUAA4IBAQAFcWzf6iOnJGNSlIOCJjj6aOoM3wNqLZ7s
-						WAtBhxVb+w2vs5w2mTrgpj24wbfpyQVhCrQjUFLdVmOqyUlpF9A/kJOgUYuq5JZa
-						GeJy1cwl1CdVtzsZ7UZPz6ToC97uVuhKiVevPoAmaJ+zDiFdVPBiTmkOz7nMZnCt
-						5PqDYeRNAlFDTx0nQ1WjaPuwWBhdii3EaHLQWrFPN6dfoxX6YPtboQKZk9b3/r7N
-						WzPw4pujvskfh9Hw6/3ghnooiV9ZYq3SrpCB8m+xj78CoSz6FPXKvFoQGEKPbOQn
-						8Ava86ENk3hQjKbGmaS8RNl6EtCrQNiAaBNYx1xlAoP3IZ+nO1h9
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cnwl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cnwl.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.cnwl.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cnwl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cnwl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cnwl.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">cnwl.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIzCCAgugAwIBAgIUEJciO46aX1zd30VubLZW8mTbPWcwDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOaWRwLmNud2wuYWMudWswHhcNMTMwMjIyMTM0MTQ2WhcN
-						MzMwMjIyMTM0MTQ2WjAZMRcwFQYDVQQDEw5pZHAuY253bC5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKw5eKNDVnIjYE4C57t/K2+u+4c/tirp
-						rk9ozEGO0JCSnCq+GcxJm5Mfxs5sM6u919g7BOZZU5zm5sykEvhM1YonMcjzcBsd
-						EHVs78c9Nlv6ZueO5923ArCYybTPTpqZWr9px0XdltBkLafFOWPUt3mUVUglv6X6
-						esMQaiDPAbrG+Nvdo0ZbnlA5tBy7WMNEk6SyB0VhxIN3KDWsTi39tRpNVaroO+VG
-						pdrC31S4g5aropb/27kOTIltrxVokJDLHjo0PMO2o2eKLZvtgYRnL8/XTTXexZyy
-						U85U3G5zPw2jptUHHx1W9Ojs/9rUsp61znAJEXfgMS5iQLl2JwA9EsUCAwEAAaNj
-						MGEwQAYDVR0RBDkwN4IOaWRwLmNud2wuYWMudWuGJWh0dHBzOi8vaWRwLmNud2wu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBWW2Q/zTBI5/JWM/SHx/Kg2
-						YRleMA0GCSqGSIb3DQEBBQUAA4IBAQAFcWzf6iOnJGNSlIOCJjj6aOoM3wNqLZ7s
-						WAtBhxVb+w2vs5w2mTrgpj24wbfpyQVhCrQjUFLdVmOqyUlpF9A/kJOgUYuq5JZa
-						GeJy1cwl1CdVtzsZ7UZPz6ToC97uVuhKiVevPoAmaJ+zDiFdVPBiTmkOz7nMZnCt
-						5PqDYeRNAlFDTx0nQ1WjaPuwWBhdii3EaHLQWrFPN6dfoxX6YPtboQKZk9b3/r7N
-						WzPw4pujvskfh9Hw6/3ghnooiV9ZYq3SrpCB8m+xj78CoSz6FPXKvFoQGEKPbOQn
-						8Ava86ENk3hQjKbGmaS8RNl6EtCrQNiAaBNYx1xlAoP3IZ+nO1h9
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cnwl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cnwl.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">College of North West London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">College North West London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cnwl.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Overt Software </GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Overt Software </GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.colby.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.colby.edu-idp-shibboleth.xml
deleted file mode 100644
index afd1b5e0..00000000
--- a/swamid-interfederations-2.0/idp.colby.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,156 +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://idp.colby.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://www.colby.edu/search_cs/search.html" 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">colby.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Colby College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Colby College Shibboleth Identity Provider Service</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.colby.edu/administration_cs/its/policies/index.cfm</mdui:InformationURL>
-        <mdui:Logo height="75" width="149" xml:lang="en">https://www.colby.edu/images/ColbyLogo_280_1.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>
-MIIDojCCAooCCQD+HsLeuS+i6TANBgkqhkiG9w0BAQUFADCBkjELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAk1FMRMwEQYDVQQHDApXYXRlcnZpbGxlMRYwFAYDVQQKDA1D
-b2xieSBDb2xsZWdlMQwwCgYDVQQLDANJVFMxFjAUBgNVBAMMDWlkcC5jb2xieS5l
-ZHUxIzAhBgkqhkiG9w0BCQEWFGluY29tbW9uY2FAY29sYnkuZWR1MB4XDTEzMTIw
-MjIyMDkwNFoXDTIzMTIwMjIyMDkwNFowgZIxCzAJBgNVBAYTAlVTMQswCQYDVQQI
-DAJNRTETMBEGA1UEBwwKV2F0ZXJ2aWxsZTEWMBQGA1UECgwNQ29sYnkgQ29sbGVn
-ZTEMMAoGA1UECwwDSVRTMRYwFAYDVQQDDA1pZHAuY29sYnkuZWR1MSMwIQYJKoZI
-hvcNAQkBFhRpbmNvbW1vbmNhQGNvbGJ5LmVkdTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMPz3tu+BESQZNcAXXWLf+WVD4JozBF4bKvQnYYiPMrKc/ay
-sqwWRasGtfazdPb+npbeHrGmd8EXOfi2jIxyq2LPWvX9pS4mHxmCWyNs63mYgs2U
-uE0dpC6kBJea0dQEJ+9o3PXlG9VlVZQ4JnuVsOMlz0WNCyYGp9tJ+HhJHn9If2Rt
-XNgioCpNVdmyJ1n8GXzcuv7hb4MDbxzzRy4VAAXI062OURs4w6ZRgQ2Q7KRSeVB6
-IdK5hoTOsoLEgn8qvYgNoQCaBGW84F6njc0jZx/a9TV24Zci+sC0ivRKgEjSDp3r
-dAYUeenUxJ1x8uOdJoQgUtIC7kmOtpQ/JKEk/hECAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAqFxpW7m89Hh7DOIfmhrJk5nH/2JSsWjaKI0FP2H7uaWZgqtsF8L0xWMU
-pf8DrAsEn7tMGp8f19vcxW/d4lTFU7t28DZiUEV0m4+ClILwZdkneT6zE/VUeEhz
-2mNFlSzJrUJUiieRRCtrAHe/gSJ5voxrzs90zFNe1JNO9TuO5Itb5kp+kJAtOHkY
-Hpab4IvZysoebT5U//OQ3Ct5e0tyj8jZkEeBDGvyHQ15+uszE7N+fteM2ezplDU/
-1GuxzsqRMQG9RlzDIWJPv8kek9V7eBcMjg5q+28ahgx/lY1Fs4SbVqk3WbaPbdF0
-PK29MmCAAwy8UHLt802YOYiAxSCvTw==
-          </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>
-MIIDOjCCAiICCQDPAjl6rCMrhTANBgkqhkiG9w0BAQUFADBfMRYwFAYDVQQDDA1p
-ZHAuY29sYnkuZWR1MRYwFAYDVQQKDA1Db2xieSBDb2xsZWdlMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCTUUxEzARBgNVBAcMCldhdGVydmlsbGUwHhcNMTIxMjE0MjAx
-NzAzWhcNMTMxMjE0MjAxNzAzWjBfMRYwFAYDVQQDDA1pZHAuY29sYnkuZWR1MRYw
-FAYDVQQKDA1Db2xieSBDb2xsZWdlMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTUUx
-EzARBgNVBAcMCldhdGVydmlsbGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDUYAdbuO3YMDJtqpOtAByF7PSU7gc+iSBf9z24Kl92NBCHTx1owcCgYhJn
-L/hvceInZsFRaPo7Wx5P4nkIE8FlLg4zecGLgzdDbZcrt7UY1FJ7VW2GPQ/j4Vqy
-Se90cXfcxFEI47fgkZPGRB4nfS6Vo4aJ3rJnSKVqiD2zWGqGtquIrWQnQJ0Yns5L
-zsLcypq6Wc8CNYWugTyxdZZ+8YXG5ZVz4p5m75uBtbst2U1caFR4ZOEjNd5yUBbv
-393OcLk5wtGtngqcgmFndbd+Oum2KzKMPxBRZQsrjOqb7QFUduMrDGNEn2wBzFku
-2ANj8InQG1AFSUuW1C2bCkE0v+mjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAH3o
-Sd0G1hZ0wA71HJOf5ki6xKLH+QNDvQPS9XZJqMi1VZ//GiIzPK1lsOLH+VD2sAV2
-Rx67OvmjPpR9Y0iUpVDVBltVB2LxX/e+s5nrM2oCLXRIenbInX5iFjPJQOLhH/jp
-NQlwC1CiYgKXmrc2mXBW89BLpEzDrgjeDGBZ9y5b3/mEdNV+Sf5thXTSAU7l+9He
-rTzqxMMsR9dpLWvTd5DVSXK204Hk6gL8ZWRAEZc/dMXfq+kOKAcsDHM4UHMklise
-pLPbEgpvIgAyy2liUsYhCCcvuR6b2IiDdtmyQwnfVqnZEXipGKvN4ZmN+Wk1wCw+
-kcpHik3So/cLW9CwMZ4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.colby.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.colby.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.colby.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.colby.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.colby.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.colby.edu/idp/profile/SAML2/POST-SimpleSign/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">colby.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDojCCAooCCQD+HsLeuS+i6TANBgkqhkiG9w0BAQUFADCBkjELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAk1FMRMwEQYDVQQHDApXYXRlcnZpbGxlMRYwFAYDVQQKDA1D
-b2xieSBDb2xsZWdlMQwwCgYDVQQLDANJVFMxFjAUBgNVBAMMDWlkcC5jb2xieS5l
-ZHUxIzAhBgkqhkiG9w0BCQEWFGluY29tbW9uY2FAY29sYnkuZWR1MB4XDTEzMTIw
-MjIyMDkwNFoXDTIzMTIwMjIyMDkwNFowgZIxCzAJBgNVBAYTAlVTMQswCQYDVQQI
-DAJNRTETMBEGA1UEBwwKV2F0ZXJ2aWxsZTEWMBQGA1UECgwNQ29sYnkgQ29sbGVn
-ZTEMMAoGA1UECwwDSVRTMRYwFAYDVQQDDA1pZHAuY29sYnkuZWR1MSMwIQYJKoZI
-hvcNAQkBFhRpbmNvbW1vbmNhQGNvbGJ5LmVkdTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMPz3tu+BESQZNcAXXWLf+WVD4JozBF4bKvQnYYiPMrKc/ay
-sqwWRasGtfazdPb+npbeHrGmd8EXOfi2jIxyq2LPWvX9pS4mHxmCWyNs63mYgs2U
-uE0dpC6kBJea0dQEJ+9o3PXlG9VlVZQ4JnuVsOMlz0WNCyYGp9tJ+HhJHn9If2Rt
-XNgioCpNVdmyJ1n8GXzcuv7hb4MDbxzzRy4VAAXI062OURs4w6ZRgQ2Q7KRSeVB6
-IdK5hoTOsoLEgn8qvYgNoQCaBGW84F6njc0jZx/a9TV24Zci+sC0ivRKgEjSDp3r
-dAYUeenUxJ1x8uOdJoQgUtIC7kmOtpQ/JKEk/hECAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAqFxpW7m89Hh7DOIfmhrJk5nH/2JSsWjaKI0FP2H7uaWZgqtsF8L0xWMU
-pf8DrAsEn7tMGp8f19vcxW/d4lTFU7t28DZiUEV0m4+ClILwZdkneT6zE/VUeEhz
-2mNFlSzJrUJUiieRRCtrAHe/gSJ5voxrzs90zFNe1JNO9TuO5Itb5kp+kJAtOHkY
-Hpab4IvZysoebT5U//OQ3Ct5e0tyj8jZkEeBDGvyHQ15+uszE7N+fteM2ezplDU/
-1GuxzsqRMQG9RlzDIWJPv8kek9V7eBcMjg5q+28ahgx/lY1Fs4SbVqk3WbaPbdF0
-PK29MmCAAwy8UHLt802YOYiAxSCvTw==
-          </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>
-MIIDOjCCAiICCQDPAjl6rCMrhTANBgkqhkiG9w0BAQUFADBfMRYwFAYDVQQDDA1p
-ZHAuY29sYnkuZWR1MRYwFAYDVQQKDA1Db2xieSBDb2xsZWdlMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCTUUxEzARBgNVBAcMCldhdGVydmlsbGUwHhcNMTIxMjE0MjAx
-NzAzWhcNMTMxMjE0MjAxNzAzWjBfMRYwFAYDVQQDDA1pZHAuY29sYnkuZWR1MRYw
-FAYDVQQKDA1Db2xieSBDb2xsZWdlMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTUUx
-EzARBgNVBAcMCldhdGVydmlsbGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDUYAdbuO3YMDJtqpOtAByF7PSU7gc+iSBf9z24Kl92NBCHTx1owcCgYhJn
-L/hvceInZsFRaPo7Wx5P4nkIE8FlLg4zecGLgzdDbZcrt7UY1FJ7VW2GPQ/j4Vqy
-Se90cXfcxFEI47fgkZPGRB4nfS6Vo4aJ3rJnSKVqiD2zWGqGtquIrWQnQJ0Yns5L
-zsLcypq6Wc8CNYWugTyxdZZ+8YXG5ZVz4p5m75uBtbst2U1caFR4ZOEjNd5yUBbv
-393OcLk5wtGtngqcgmFndbd+Oum2KzKMPxBRZQsrjOqb7QFUduMrDGNEn2wBzFku
-2ANj8InQG1AFSUuW1C2bCkE0v+mjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAH3o
-Sd0G1hZ0wA71HJOf5ki6xKLH+QNDvQPS9XZJqMi1VZ//GiIzPK1lsOLH+VD2sAV2
-Rx67OvmjPpR9Y0iUpVDVBltVB2LxX/e+s5nrM2oCLXRIenbInX5iFjPJQOLhH/jp
-NQlwC1CiYgKXmrc2mXBW89BLpEzDrgjeDGBZ9y5b3/mEdNV+Sf5thXTSAU7l+9He
-rTzqxMMsR9dpLWvTd5DVSXK204Hk6gL8ZWRAEZc/dMXfq+kOKAcsDHM4UHMklise
-pLPbEgpvIgAyy2liUsYhCCcvuR6b2IiDdtmyQwnfVqnZEXipGKvN4ZmN+Wk1wCw+
-kcpHik3So/cLW9CwMZ4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.colby.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.colby.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Colby College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Colby College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.colby.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Colby College ITS PCSS</md:GivenName>
-    <md:EmailAddress>support@colby.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Colby College ITS Shibboleth</md:GivenName>
-    <md:EmailAddress>shibboleth@colby.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.colchester.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.colchester.ac.uk-shibboleth.xml
deleted file mode 100644
index 8f7358d5..00000000
--- a/swamid-interfederations-2.0/idp.colchester.ac.uk-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.colchester.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Colchester Institute Enterprises Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">colchester.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/colchester.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/colchester.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Colchester Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.colchester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.colchsfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.colchsfc.ac.uk-shibboleth.xml
deleted file mode 100644
index 62457fe8..00000000
--- a/swamid-interfederations-2.0/idp.colchsfc.ac.uk-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.colchsfc.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for The Sixth Form College, Colchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">colchsfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/colchsfc.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/colchsfc.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Sixth Form College, Colchester</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.colchsfc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.coleg-powys.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index c493fb33..00000000
--- a/swamid-interfederations-2.0/idp.coleg-powys.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.coleg-powys.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Neath Port Talbot College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">coleg-powys.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">NPTC Group (former Coleg Powys users)</mdui:DisplayName>
-        <mdui:Logo height="122" width="100">https://idp.coleg-powys.ac.uk/idp/images/coleg-powys-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDgDCCAmgCCQCjEQP33+OFtzANBgkqhkiG9w0BAQUFADCBgTEUMBIGA1UEChML
-						Q29sZWcgUG93eXMxGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRAwDgYDVQQH
-						EwdOZXd0b3duMQ4wDAYDVQQIEwVQb3d5czELMAkGA1UEBhMCR0IxHjAcBgNVBAMT
-						FWlkcC5jb2xlZy1wb3d5cy5hYy51azAeFw0xMzA1MDkxNTU3MTVaFw0yMzA1MDcx
-						NTU3MTVaMIGBMRQwEgYDVQQKEwtDb2xlZyBQb3d5czEaMBgGA1UECxMRQ29tcHV0
-						ZXIgU2VydmljZXMxEDAOBgNVBAcTB05ld3Rvd24xDjAMBgNVBAgTBVBvd3lzMQsw
-						CQYDVQQGEwJHQjEeMBwGA1UEAxMVaWRwLmNvbGVnLXBvd3lzLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dfdyK7811MVGI1rUn+ftWqIsSd2
-						TlpUnse7ohcs5Wk1goFph32IMhJO4A/utB0ruCK9fBmDI52cfAuIpnK/CoKIymsp
-						y0YfqQy9zj+lvCVHi985l9YN7nL6xFzyqJ38/7roOc4qDZy5E7ZpA6b70R90K8rD
-						h59MLJ/rrUWhBR94aQ3JzKDUeYyMGoAK2oTnmq7ecLy6Z0egAVbMLY9KnadKi9WL
-						ulKCOLNkd/j7+TVxLTrC92z8trXLrXZYjBvjCyVZiGHD/8DQ9ZagNbLxL8HvY/F/
-						g5a52Ep0db408n4TGLUzp6xdg7Q9pc5NoKxVoEtiD3okafByvvHMjC3LTQIDAQAB
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCHuH6vFAogF0VBZXgrgSbBx6vi/w981vUnO71H
-						1bbirh216vUn8a/BPAHuLU1KwK6aOZvnNbFTE5xgORHQWA0gEsUKAhgZt+dUuAVs
-						qWpIzgc5eyqFMA9mOJGy6HbHsUtu4ZnnnL/gSJ5A68eP0drtjfK/84N0HOZnPXqF
-						2SP8s6cs6Qc8aO/C/iLcAg+UYprIs8pcIbYQOPeuqo8bYAAzD78udsaiBmdB9mqh
-						t6sfik6Q3GLW1U0wRHE0JN42Y8EqJ96/2PFxun0sAkNJczpt9R8P6PxM0cfLVOth
-						gugBHo3aeeUlP0WHK5s/hswzuZwxBV4lGIu0R5azAEx9EXem
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleg-powys.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.coleg-powys.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coleg-powys.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.coleg-powys.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.coleg-powys.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">coleg-powys.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDgDCCAmgCCQCjEQP33+OFtzANBgkqhkiG9w0BAQUFADCBgTEUMBIGA1UEChML
-						Q29sZWcgUG93eXMxGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMRAwDgYDVQQH
-						EwdOZXd0b3duMQ4wDAYDVQQIEwVQb3d5czELMAkGA1UEBhMCR0IxHjAcBgNVBAMT
-						FWlkcC5jb2xlZy1wb3d5cy5hYy51azAeFw0xMzA1MDkxNTU3MTVaFw0yMzA1MDcx
-						NTU3MTVaMIGBMRQwEgYDVQQKEwtDb2xlZyBQb3d5czEaMBgGA1UECxMRQ29tcHV0
-						ZXIgU2VydmljZXMxEDAOBgNVBAcTB05ld3Rvd24xDjAMBgNVBAgTBVBvd3lzMQsw
-						CQYDVQQGEwJHQjEeMBwGA1UEAxMVaWRwLmNvbGVnLXBvd3lzLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dfdyK7811MVGI1rUn+ftWqIsSd2
-						TlpUnse7ohcs5Wk1goFph32IMhJO4A/utB0ruCK9fBmDI52cfAuIpnK/CoKIymsp
-						y0YfqQy9zj+lvCVHi985l9YN7nL6xFzyqJ38/7roOc4qDZy5E7ZpA6b70R90K8rD
-						h59MLJ/rrUWhBR94aQ3JzKDUeYyMGoAK2oTnmq7ecLy6Z0egAVbMLY9KnadKi9WL
-						ulKCOLNkd/j7+TVxLTrC92z8trXLrXZYjBvjCyVZiGHD/8DQ9ZagNbLxL8HvY/F/
-						g5a52Ep0db408n4TGLUzp6xdg7Q9pc5NoKxVoEtiD3okafByvvHMjC3LTQIDAQAB
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCHuH6vFAogF0VBZXgrgSbBx6vi/w981vUnO71H
-						1bbirh216vUn8a/BPAHuLU1KwK6aOZvnNbFTE5xgORHQWA0gEsUKAhgZt+dUuAVs
-						qWpIzgc5eyqFMA9mOJGy6HbHsUtu4ZnnnL/gSJ5A68eP0drtjfK/84N0HOZnPXqF
-						2SP8s6cs6Qc8aO/C/iLcAg+UYprIs8pcIbYQOPeuqo8bYAAzD78udsaiBmdB9mqh
-						t6sfik6Q3GLW1U0wRHE0JN42Y8EqJ96/2PFxun0sAkNJczpt9R8P6PxM0cfLVOth
-						gugBHo3aeeUlP0WHK5s/hswzuZwxBV4lGIu0R5azAEx9EXem
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleg-powys.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleg-powys.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">Neath Port Talbot College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NPTC Group (former Coleg Powys users)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.coleg-powys.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@nptcgroup.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Lewis</SurName>
-    <EmailAddress>mailto:chris.lewis@nptcgroup.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.coleggwent.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.coleggwent.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 6464beee..00000000
--- a/swamid-interfederations-2.0/idp.coleggwent.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.coleggwent.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Coleg Gwent.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-17T13:52:25Z">
-      <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">coleggwent.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAPoQhjG640bUBDqHyzpK76yMFB02MA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFGlkcC5jb2xlZ2d3ZW50LmFjLnVrMB4XDTE0MDQyNTA4
-						MzYyM1oXDTM0MDQyNTA4MzYyM1owHzEdMBsGA1UEAxMUaWRwLmNvbGVnZ3dlbnQu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1MAfdEF6a0yIc
-						NuS/2PRg5YVuRi2PezJggImTYVpNYZ9zd6RZGdBdWMs3jqPZUMJFUvK+RIdzMHp6
-						zNXTIORDX0HNwaMmzhqDjpK3SrNj8V6R2YN9jeQPC4LCpxBDejems7eT+xch+QyZ
-						dSR5N0aL6XWFfQdnDyJU/ADDlSTnegmyGaYZSxJ/7zwFjG5+mDhJVtVwrr/Bfbwi
-						pOECsI9ZSYjnvA9FdeX8X8/mOs3RYXDVLFHEF/lSQiUffBH2CNXuy6v945tBaGk9
-						BV9vw3UdKUFEZJ9v7POxIG2S6cN+gNd8BHOhcHLxJKVlDDbGpuEFNhAqRnTkLdg6
-						nMYEMrg/AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC5jb2xlZ2d3ZW50LmFjLnVr
-						hitodHRwczovL2lkcC5jb2xlZ2d3ZW50LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBSG0tN9RyOtbHWu1y8wN6J9tLIlbTANBgkqhkiG9w0BAQUFAAOCAQEA
-						IFJqEr40T7U8Bz8oECDeUaeUacZZDgV50qoGegCDpcjbO4rxq0scjBtLNu/rd+1N
-						3oOyfkhPPxGpDzFjezywMAn/6wfl6yAzOLU4ctTcs4Z41uYZYvGktwSEvVhKgK9k
-						/BRzjmalx7FXZwnvUcVG+h2vCk6I+vN3/d6eEL2+CQumK9S32fS60pP7jAF8sYe+
-						FfZmV1VDEv2FnYJkXRb5YIZd45OtU9xF+HdkAIhhHVf1s6Hl3HJR4SoU58iEK7Qy
-						Nlbpu18iaBSCPJEjejsFcA3LTDD5Iu2DNjxLLL5gBlq/n2ad9k4GB5ImwlXwA+cM
-						zir7XsM02jLj1MPVeD9xgw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleggwent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleggwent.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.coleggwent.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleggwent.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.coleggwent.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.coleggwent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.coleggwent.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">coleggwent.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAPoQhjG640bUBDqHyzpK76yMFB02MA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFGlkcC5jb2xlZ2d3ZW50LmFjLnVrMB4XDTE0MDQyNTA4
-						MzYyM1oXDTM0MDQyNTA4MzYyM1owHzEdMBsGA1UEAxMUaWRwLmNvbGVnZ3dlbnQu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1MAfdEF6a0yIc
-						NuS/2PRg5YVuRi2PezJggImTYVpNYZ9zd6RZGdBdWMs3jqPZUMJFUvK+RIdzMHp6
-						zNXTIORDX0HNwaMmzhqDjpK3SrNj8V6R2YN9jeQPC4LCpxBDejems7eT+xch+QyZ
-						dSR5N0aL6XWFfQdnDyJU/ADDlSTnegmyGaYZSxJ/7zwFjG5+mDhJVtVwrr/Bfbwi
-						pOECsI9ZSYjnvA9FdeX8X8/mOs3RYXDVLFHEF/lSQiUffBH2CNXuy6v945tBaGk9
-						BV9vw3UdKUFEZJ9v7POxIG2S6cN+gNd8BHOhcHLxJKVlDDbGpuEFNhAqRnTkLdg6
-						nMYEMrg/AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcC5jb2xlZ2d3ZW50LmFjLnVr
-						hitodHRwczovL2lkcC5jb2xlZ2d3ZW50LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBSG0tN9RyOtbHWu1y8wN6J9tLIlbTANBgkqhkiG9w0BAQUFAAOCAQEA
-						IFJqEr40T7U8Bz8oECDeUaeUacZZDgV50qoGegCDpcjbO4rxq0scjBtLNu/rd+1N
-						3oOyfkhPPxGpDzFjezywMAn/6wfl6yAzOLU4ctTcs4Z41uYZYvGktwSEvVhKgK9k
-						/BRzjmalx7FXZwnvUcVG+h2vCk6I+vN3/d6eEL2+CQumK9S32fS60pP7jAF8sYe+
-						FfZmV1VDEv2FnYJkXRb5YIZd45OtU9xF+HdkAIhhHVf1s6Hl3HJR4SoU58iEK7Qy
-						Nlbpu18iaBSCPJEjejsFcA3LTDD5Iu2DNjxLLL5gBlq/n2ad9k4GB5ImwlXwA+cM
-						zir7XsM02jLj1MPVeD9xgw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coleggwent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coleggwent.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">Coleg Gwent</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Coleg Gwent</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.coleggwent.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Mugleston</SurName>
-    <EmailAddress>mailto:paul.mugleston@coleggwent.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Mugleston</SurName>
-    <EmailAddress>mailto:paul.mugleston@coleggwent.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.colegsirgar.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.colegsirgar.ac.uk-shibboleth.xml
deleted file mode 100644
index b1da13a8..00000000
--- a/swamid-interfederations-2.0/idp.colegsirgar.ac.uk-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.colegsirgar.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Coleg Sir Gar.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-22T15:44: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">colegsirgar.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUcXEex5qLM9Uo7l8DfFXeVTtBhmYwDQYJKoZIhvcNAQEF
-						BQAwIDEeMBwGA1UEAxMVaWRwLmNvbGVnc2lyZ2FyLmFjLnVrMB4XDTE0MDQwOTEw
-						NDI0NloXDTM0MDQwOTEwNDI0NlowIDEeMBwGA1UEAxMVaWRwLmNvbGVnc2lyZ2Fy
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn/fhd3ZpIGbd
-						CclJAt2vSNKAbIjElHCPeNqFHaf1N876DrQKCBl3a9jll6k0IqqM4Fuc5x8WqBhv
-						f7gQHqnsq+9omih0daOpaAJlB9mxeJEthQVB2R/C8JYAJK5akNIc84tDJqI4wSM9
-						5dl9CftHSdd/tj/+63RLotEYsStKsnCS1jxm5qNiVfUdn08xIOp1NieF1zRTrdNU
-						jvgI/91Q/3kgz81nGcmd2XWO4MIdPEpdxSiHriBpTuWPd/phN9uaCCYrc1SBkcG1
-						SOMgvuUxlRvbUeDamHEtLvfJ4n7Os4UmJtjp/yGBdoLyhRl3aiEd34gPG6fdKOib
-						1yQqxKRz1wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAuY29sZWdzaXJnYXIuYWMu
-						dWuGLGh0dHBzOi8vaWRwLmNvbGVnc2lyZ2FyLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MB0GA1UdDgQWBBSJsyRsmK01s/7klVm/PRh/sgHQujANBgkqhkiG9w0BAQUFAAOC
-						AQEALQtvoB83wkiziavm5rKms3q465cEno7Ze85297sTez3VVUSjuCg+yfZhN/Eh
-						uBBPX2/eE44d51DHWMb9hWcKGAvBpWFOIFMgUY4xMpFRpSEtlNr0GHUb58sgcBAS
-						AVDTrhhRKC9mNMA0yXI1NlX8QetQbeTR9H6XEOHWiyuf8mZ8BvA3mqZ6I1Uhb4EM
-						8PPEnYnz4zaL0xBKYuc6sUqmQthnnSK2n9YtXaM76xysgu38wGRLV5GmxM8vm+6P
-						T963ybvq+9CIZ0qvUFn/ammOGusgWgvc5IK51/Fjo1fYX9fDQCUK+3AXku3r/Hvs
-						wH9HtsMk6cu5RM+dfunpIVkgHg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.colegsirgar.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.colegsirgar.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.colegsirgar.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.colegsirgar.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.colegsirgar.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.colegsirgar.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">colegsirgar.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUcXEex5qLM9Uo7l8DfFXeVTtBhmYwDQYJKoZIhvcNAQEF
-						BQAwIDEeMBwGA1UEAxMVaWRwLmNvbGVnc2lyZ2FyLmFjLnVrMB4XDTE0MDQwOTEw
-						NDI0NloXDTM0MDQwOTEwNDI0NlowIDEeMBwGA1UEAxMVaWRwLmNvbGVnc2lyZ2Fy
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn/fhd3ZpIGbd
-						CclJAt2vSNKAbIjElHCPeNqFHaf1N876DrQKCBl3a9jll6k0IqqM4Fuc5x8WqBhv
-						f7gQHqnsq+9omih0daOpaAJlB9mxeJEthQVB2R/C8JYAJK5akNIc84tDJqI4wSM9
-						5dl9CftHSdd/tj/+63RLotEYsStKsnCS1jxm5qNiVfUdn08xIOp1NieF1zRTrdNU
-						jvgI/91Q/3kgz81nGcmd2XWO4MIdPEpdxSiHriBpTuWPd/phN9uaCCYrc1SBkcG1
-						SOMgvuUxlRvbUeDamHEtLvfJ4n7Os4UmJtjp/yGBdoLyhRl3aiEd34gPG6fdKOib
-						1yQqxKRz1wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAuY29sZWdzaXJnYXIuYWMu
-						dWuGLGh0dHBzOi8vaWRwLmNvbGVnc2lyZ2FyLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MB0GA1UdDgQWBBSJsyRsmK01s/7klVm/PRh/sgHQujANBgkqhkiG9w0BAQUFAAOC
-						AQEALQtvoB83wkiziavm5rKms3q465cEno7Ze85297sTez3VVUSjuCg+yfZhN/Eh
-						uBBPX2/eE44d51DHWMb9hWcKGAvBpWFOIFMgUY4xMpFRpSEtlNr0GHUb58sgcBAS
-						AVDTrhhRKC9mNMA0yXI1NlX8QetQbeTR9H6XEOHWiyuf8mZ8BvA3mqZ6I1Uhb4EM
-						8PPEnYnz4zaL0xBKYuc6sUqmQthnnSK2n9YtXaM76xysgu38wGRLV5GmxM8vm+6P
-						T963ybvq+9CIZ0qvUFn/ammOGusgWgvc5IK51/Fjo1fYX9fDQCUK+3AXku3r/Hvs
-						wH9HtsMk6cu5RM+dfunpIVkgHg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.colegsirgar.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.colegsirgar.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">Coleg Sir Gar</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Coleg Sir Gar</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.colegsirgar.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@colegsirgar.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Palmer</SurName>
-    <EmailAddress>mailto:simon.palmer@colegsirgar.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.collyers.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.collyers.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 75d879f7..00000000
--- a/swamid-interfederations-2.0/idp.collyers.ac.uk-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.collyers.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the College of Richard Collyer.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-14T14:42:57Z">
-      <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">collyers.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAIwzwFahDGtgvAo3yaV1wQYu8pOQMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMMEmlkcC5jb2xseWVycy5hYy51azAeFw0xNTAyMTcxNTEy
-						NDZaFw0zNTAyMTcxNTEyNDZaMB0xGzAZBgNVBAMMEmlkcC5jb2xseWVycy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ+XQJl+LmxYFS/8qM6M
-						YlN5KF1IhUO1Sf6Sg1XYYFs231/UQqojXVnQcP3g+mDSglFbw6kFptZs/Tiv7Sat
-						o2uWv5DyF0Y0PiRN3j9YDFu3ggOiqK37njPDmtvHBIo5+8AeCvdFdTDvs3peOzKp
-						9wnAOe5PVhyEycBMovFH2ggt7lxmXT59u46L6/wvAqVpDsRC8C6jGhFIv6Pn0+9m
-						Hw+oLMyUOcOFwYMKFG6++h+jP8dkI8FsPBwYP6haznb2dTv8hNE5Bqju7ipWOywp
-						jgCgbqOk6l71E+NNN90SK4qVXfg1APBy4m6XuA31mR/F5ag4r2n9Kj1Jpb+EqjrL
-						cR0CAwEAAaNrMGkwHQYDVR0OBBYEFBY0Byns90tm8csaG6KelyGNOJx0MEgGA1Ud
-						EQRBMD+CEmlkcC5jb2xseWVycy5hYy51a4YpaHR0cHM6Ly9pZHAuY29sbHllcnMu
-						YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAA5gxgF7Q0mh
-						EQavO9p8RQFpfB2lgU6odilbt0283w9L4TUh0iDt+t83qDmoyAuj85viSWQ7iPhS
-						sj/1xUH2lxUorvdTnC3TGWvMBKWpVVLzbw06jJ1moaOBKx7CxIEBDY8HYsE0L/6N
-						YbOEtaSWxbBJ/QpJUJKihWoP6mmDZV/SP64jUmbqaW+IL4m3aMz2iS3Vu9whRTDL
-						6b4EPlUXtzxwSNJraFJuBgWt3UpJfTa3ZsWAcSbT1hv82EG3v8rQosvsfChG9m3g
-						Q06WBiCxhbesDgUD9FtbRVYKYB6LSnEm8sPJXfLFI2LuvxHY0uz27MaBgb86NUQj
-						6CN0OPho9gU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.collyers.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.collyers.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.collyers.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.collyers.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.collyers.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.collyers.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.collyers.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">collyers.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAIwzwFahDGtgvAo3yaV1wQYu8pOQMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMMEmlkcC5jb2xseWVycy5hYy51azAeFw0xNTAyMTcxNTEy
-						NDZaFw0zNTAyMTcxNTEyNDZaMB0xGzAZBgNVBAMMEmlkcC5jb2xseWVycy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ+XQJl+LmxYFS/8qM6M
-						YlN5KF1IhUO1Sf6Sg1XYYFs231/UQqojXVnQcP3g+mDSglFbw6kFptZs/Tiv7Sat
-						o2uWv5DyF0Y0PiRN3j9YDFu3ggOiqK37njPDmtvHBIo5+8AeCvdFdTDvs3peOzKp
-						9wnAOe5PVhyEycBMovFH2ggt7lxmXT59u46L6/wvAqVpDsRC8C6jGhFIv6Pn0+9m
-						Hw+oLMyUOcOFwYMKFG6++h+jP8dkI8FsPBwYP6haznb2dTv8hNE5Bqju7ipWOywp
-						jgCgbqOk6l71E+NNN90SK4qVXfg1APBy4m6XuA31mR/F5ag4r2n9Kj1Jpb+EqjrL
-						cR0CAwEAAaNrMGkwHQYDVR0OBBYEFBY0Byns90tm8csaG6KelyGNOJx0MEgGA1Ud
-						EQRBMD+CEmlkcC5jb2xseWVycy5hYy51a4YpaHR0cHM6Ly9pZHAuY29sbHllcnMu
-						YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAA5gxgF7Q0mh
-						EQavO9p8RQFpfB2lgU6odilbt0283w9L4TUh0iDt+t83qDmoyAuj85viSWQ7iPhS
-						sj/1xUH2lxUorvdTnC3TGWvMBKWpVVLzbw06jJ1moaOBKx7CxIEBDY8HYsE0L/6N
-						YbOEtaSWxbBJ/QpJUJKihWoP6mmDZV/SP64jUmbqaW+IL4m3aMz2iS3Vu9whRTDL
-						6b4EPlUXtzxwSNJraFJuBgWt3UpJfTa3ZsWAcSbT1hv82EG3v8rQosvsfChG9m3g
-						Q06WBiCxhbesDgUD9FtbRVYKYB6LSnEm8sPJXfLFI2LuvxHY0uz27MaBgb86NUQj
-						6CN0OPho9gU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.collyers.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.collyers.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">College of Richard Collyer</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The College of Richard Collyer</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.collyers.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Collyer’s ITSupport</GivenName>
-    <EmailAddress>mailto:itsupport@collyers.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Collyer’s ITSupport</GivenName>
-    <EmailAddress>mailto:itsupport@collyers.ac.uk</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 66829c66..00000000
--- a/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.condorcet.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">condorcet.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">HEPH-Condorcet</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students and Teachers from Haute-Ecole Provinciale de Hainaut-Condorcet</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">HEPH-Condorcet</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etudiants et Enseignants de Haute-Ecole Provinciale de Hainaut-Condorcet</mdui:Description>
-        <mdui:Logo height="16" width="16">https://cdn.ecampus-hainaut.be/logos/idp-condorcet-16x16.jpg</mdui:Logo>
-        <mdui:Logo height="291" width="88">https://cdn.ecampus-hainaut.be/logos/idp-condorcet-291x88.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.190.199.64/26</mdui:IPHint>
-        <mdui:DomainHint>condorcet.be</mdui:DomainHint>
-        <mdui:GeolocationHint>50.41719089999999,4.448670300000003</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>
-MIIDLDCCAhSgAwIBAgIVALMBuiwacb0fss6ngQ0ewYTIrDGhMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE5
-WhcNMzUxMjAzMjIzOTE5WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgvk9OnaDFkoCIOryGzIOF9Mq
-QL/TEkYPArKYUjj9wRZGeYgUcw2KOSr5EzSXBB64fDdxzhmwYBWligcvpCGxKwOJ
-iVpd7kvw01vK2DzhOm4FiDe8kUlxd554Yhq2EJE5wQzy/ny/KyF5nTegDZ8TkCua
-lpWPB0D+kRWf/xgFnpVJqTHBEpHVpw5DAqPufpAQWhZ9igzqWqrroCmrIv9+WQMb
-k79AbmYjJdKynjOGjc4UzrYkE7Hd3P8TOXCkr7sfC6qs8KsZveoJkZmvrXEe9njN
-uZtQH7oN7PuguCtStPnQMtPzyXWuC/BEQweGANyX3MagJsOM8rf+Kr1TTSacmwID
-AQABo2cwZTAdBgNVHQ4EFgQUg57FS35PSVovzamiYS9D38HM4JYwRAYDVR0RBD0w
-O4IQaWRwLmNvbmRvcmNldC5iZYYnaHR0cHM6Ly9pZHAuY29uZG9yY2V0LmJlL2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB0XKyy/ILdvSv1Y1acxGR0
-Cchq0uTo8w1dHc/cWskTkawb1o2IR/oogei4OM+lu1E9Ri6+2LRsQ54Wc69kdA26
-9XuG+o6RJ7UmUSnGkl08bpLNPed2Psrneb/7v8sn6G0zcpokhxLmFMMYKWmWAOW6
-SLy2w40fyTB8FxmO3/ZONg/rcz58I6JhVSanp6S/OaqjNGe+B4KSwmDS75suq0bS
-h3K1osgFBrZ3YK6BxS9ByhIBkmqOU0lF+upb529Mqeg29IkS7aNDZlxh/ZhP4JNE
-2UBsrhGATLxuAYrFlUQ+Vf+LLt/MNpRoQ1lnp5A5QDPHaksm6LOdxcCY8gNlk/kf
-                        </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>
-MIIDLDCCAhSgAwIBAgIVAPBmR/6jQO37H6ozLvBQxojFpGugMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE4
-WhcNMzUxMjAzMjIzOTE4WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmd+oyDtzupF9rGBLGW4MIHkx
-gR35uU3quBBNGvLLqq6fWDlDJMcwVbTUlseCyfrFhSMX+ptLdUbYAICydlIhIwCN
-cl1QUVg+wrkds6q2Ea698vTiwWIUMFWFo7xaz2TNUuSh2paiiETtIULEB2iQJ3a1
-H5FWI0Fp74HGek7cV2TCrG8yssELY0ilysUC/dFr6/iaxepiZehmnCysxXBsvuDR
-tyYNtcxbGi0BdRJ1IXegTofpAbaJDPp8D2gWlh+wA8mfqyc4svzOedwKJxGUAn+O
-yai0BVgnRAwh7kCg/vll/sS9S08aif1/ve+FnEECFJtJAOkuoKjVGAKCFPO9pQID
-AQABo2cwZTAdBgNVHQ4EFgQUrwNoXcSmCwJDz7YP5xx132nedmAwRAYDVR0RBD0w
-O4IQaWRwLmNvbmRvcmNldC5iZYYnaHR0cHM6Ly9pZHAuY29uZG9yY2V0LmJlL2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQApYNw6ZvbMVRsX7zTBvX+H
-zujWq+BytfDyCU5pGYeeyQItBb12ckOoHVCj1bLvDN4JZEXZjpO8xihlWgCSef4+
-YzDH4MBqxGurGB0hQ7UBb5UnXt2HguXL6IVOOjYIHtx6cqwJ4xOwLufdoFAY6KSH
-JKPMAY8gO2RTlBxQQ57bF7vgC1XxBgcynXCgsDr1UQWg9or9tXivzXR66wPpi1o7
-9fOjpyT43yy8NS6BxZLpbXJbLi2mDEthM3fyXkyi85LVHx+uwrhpy8MeGBhdqdiX
-aYNVyrYc5coxp6GPVBJv8YKHqNG3Dw9TqI4LTTyWcJA9Hwu/+qo6eh2nk5Ps9JVX
-                        </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>
-MIIDLDCCAhSgAwIBAgIVAKzR+oWciVWzsTL99fnG6ihy4LtOMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE4
-WhcNMzUxMjAzMjIzOTE4WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Xl9pWh2KY2ifAlxsox1IsSb
-cq9JclYprGeLU9RGynJbkA7F1+puwCuDa7/lHCYJpZDk6AmSxB0R02VpEE+CrQMt
-7xegealN2gEhRQWaEJ1H2bjWV6swVmo10AIkhmyUdKGBr+kChVYr0kq78JpRxEFA
-Z741/VOvamSVsYhXiUBaE/WnmUUCuJW/Bks+DbmNOF+W/vlQOgedL4Ox1Aj9gnCz
-sbSXpPjJcXv0aW9L7w03sJwE2M4kkWpp5DWdpXyVWjF8JvuFu8CHwTuSrJu8u0hZ
-eNRJt0c+G7JI+Hgr++8VnBdNbkprcCZQTK9NYyqCLW4J0XcaDkIJJCFJ8UmV0QID
-AQABo2cwZTAdBgNVHQ4EFgQUijIkcisJLNO4M/AZ/x1ZRzQjCIgwRAYDVR0RBD0w
-O4IQaWRwLmNvbmRvcmNldC5iZYYnaHR0cHM6Ly9pZHAuY29uZG9yY2V0LmJlL2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA2yyecgvrae2VNTaTyft2e
-nkXipQ6HnTCtKaJxDMlrUvUBobOWWklvd8O4hCTUL26nOIqN+X66AtRP01lwiOng
-/Xx22Vv86E37XD64oA6BOhgJVgOgelp+QzlTjdaw+1ryhCxCmkAbXIBH8yjVQ6Db
-2QZCPkNDkfPYWoldf/OUSreH9U3+PX6rY0ev/mzzZutxqMJHgEaA7IMqrR5PVzhU
-Qzo5DYd+FzazDipqCATv/67WjzZny4+/apNoKIrsh6zm/tOaeGx2h9TlLt+Rxqfd
-2KZ0zVbf8I3/d+fMjwQNaSKPKqQM4u+1Ji7o0czZdsegOS4V+m3NST/VR3mHpdcp
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.condorcet.be/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.condorcet.be/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.condorcet.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be: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.condorcet.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.condorcet.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.condorcet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.condorcet.be/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be/idp/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">condorcet.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVALMBuiwacb0fss6ngQ0ewYTIrDGhMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE5
-WhcNMzUxMjAzMjIzOTE5WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgvk9OnaDFkoCIOryGzIOF9Mq
-QL/TEkYPArKYUjj9wRZGeYgUcw2KOSr5EzSXBB64fDdxzhmwYBWligcvpCGxKwOJ
-iVpd7kvw01vK2DzhOm4FiDe8kUlxd554Yhq2EJE5wQzy/ny/KyF5nTegDZ8TkCua
-lpWPB0D+kRWf/xgFnpVJqTHBEpHVpw5DAqPufpAQWhZ9igzqWqrroCmrIv9+WQMb
-k79AbmYjJdKynjOGjc4UzrYkE7Hd3P8TOXCkr7sfC6qs8KsZveoJkZmvrXEe9njN
-uZtQH7oN7PuguCtStPnQMtPzyXWuC/BEQweGANyX3MagJsOM8rf+Kr1TTSacmwID
-AQABo2cwZTAdBgNVHQ4EFgQUg57FS35PSVovzamiYS9D38HM4JYwRAYDVR0RBD0w
-O4IQaWRwLmNvbmRvcmNldC5iZYYnaHR0cHM6Ly9pZHAuY29uZG9yY2V0LmJlL2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB0XKyy/ILdvSv1Y1acxGR0
-Cchq0uTo8w1dHc/cWskTkawb1o2IR/oogei4OM+lu1E9Ri6+2LRsQ54Wc69kdA26
-9XuG+o6RJ7UmUSnGkl08bpLNPed2Psrneb/7v8sn6G0zcpokhxLmFMMYKWmWAOW6
-SLy2w40fyTB8FxmO3/ZONg/rcz58I6JhVSanp6S/OaqjNGe+B4KSwmDS75suq0bS
-h3K1osgFBrZ3YK6BxS9ByhIBkmqOU0lF+upb529Mqeg29IkS7aNDZlxh/ZhP4JNE
-2UBsrhGATLxuAYrFlUQ+Vf+LLt/MNpRoQ1lnp5A5QDPHaksm6LOdxcCY8gNlk/kf
-                        </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>
-MIIDLDCCAhSgAwIBAgIVAPBmR/6jQO37H6ozLvBQxojFpGugMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE4
-WhcNMzUxMjAzMjIzOTE4WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmd+oyDtzupF9rGBLGW4MIHkx
-gR35uU3quBBNGvLLqq6fWDlDJMcwVbTUlseCyfrFhSMX+ptLdUbYAICydlIhIwCN
-cl1QUVg+wrkds6q2Ea698vTiwWIUMFWFo7xaz2TNUuSh2paiiETtIULEB2iQJ3a1
-H5FWI0Fp74HGek7cV2TCrG8yssELY0ilysUC/dFr6/iaxepiZehmnCysxXBsvuDR
-tyYNtcxbGi0BdRJ1IXegTofpAbaJDPp8D2gWlh+wA8mfqyc4svzOedwKJxGUAn+O
-yai0BVgnRAwh7kCg/vll/sS9S08aif1/ve+FnEECFJtJAOkuoKjVGAKCFPO9pQID
-AQABo2cwZTAdBgNVHQ4EFgQUrwNoXcSmCwJDz7YP5xx132nedmAwRAYDVR0RBD0w
-O4IQaWRwLmNvbmRvcmNldC5iZYYnaHR0cHM6Ly9pZHAuY29uZG9yY2V0LmJlL2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQApYNw6ZvbMVRsX7zTBvX+H
-zujWq+BytfDyCU5pGYeeyQItBb12ckOoHVCj1bLvDN4JZEXZjpO8xihlWgCSef4+
-YzDH4MBqxGurGB0hQ7UBb5UnXt2HguXL6IVOOjYIHtx6cqwJ4xOwLufdoFAY6KSH
-JKPMAY8gO2RTlBxQQ57bF7vgC1XxBgcynXCgsDr1UQWg9or9tXivzXR66wPpi1o7
-9fOjpyT43yy8NS6BxZLpbXJbLi2mDEthM3fyXkyi85LVHx+uwrhpy8MeGBhdqdiX
-aYNVyrYc5coxp6GPVBJv8YKHqNG3Dw9TqI4LTTyWcJA9Hwu/+qo6eh2nk5Ps9JVX
-                        </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>
-MIIDLDCCAhSgAwIBAgIVAKzR+oWciVWzsTL99fnG6ihy4LtOMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGlkcC5jb25kb3JjZXQuYmUwHhcNMTUxMjAzMjIzOTE4
-WhcNMzUxMjAzMjIzOTE4WjAbMRkwFwYDVQQDDBBpZHAuY29uZG9yY2V0LmJlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Xl9pWh2KY2ifAlxsox1IsSb
-cq9JclYprGeLU9RGynJbkA7F1+puwCuDa7/lHCYJpZDk6AmSxB0R02VpEE+CrQMt
-7xegealN2gEhRQWaEJ1H2bjWV6swVmo10AIkhmyUdKGBr+kChVYr0kq78JpRxEFA
-Z741/VOvamSVsYhXiUBaE/WnmUUCuJW/Bks+DbmNOF+W/vlQOgedL4Ox1Aj9gnCz
-sbSXpPjJcXv0aW9L7w03sJwE2M4kkWpp5DWdpXyVWjF8JvuFu8CHwTuSrJu8u0hZ
-eNRJt0c+G7JI+Hgr++8VnBdNbkprcCZQTK9NYyqCLW4J0XcaDkIJJCFJ8UmV0QID
-AQABo2cwZTAdBgNVHQ4EFgQUijIkcisJLNO4M/AZ/x1ZRzQjCIgwRAYDVR0RBD0w
-O4IQaWRwLmNvbmRvcmNldC5iZYYnaHR0cHM6Ly9pZHAuY29uZG9yY2V0LmJlL2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA2yyecgvrae2VNTaTyft2e
-nkXipQ6HnTCtKaJxDMlrUvUBobOWWklvd8O4hCTUL26nOIqN+X66AtRP01lwiOng
-/Xx22Vv86E37XD64oA6BOhgJVgOgelp+QzlTjdaw+1ryhCxCmkAbXIBH8yjVQ6Db
-2QZCPkNDkfPYWoldf/OUSreH9U3+PX6rY0ev/mzzZutxqMJHgEaA7IMqrR5PVzhU
-Qzo5DYd+FzazDipqCATv/67WjzZny4+/apNoKIrsh6zm/tOaeGx2h9TlLt+Rxqfd
-2KZ0zVbf8I3/d+fMjwQNaSKPKqQM4u+1Ji7o0czZdsegOS4V+m3NST/VR3mHpdcp
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.condorcet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.condorcet.be: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">High School from Province de Hainaut</md:OrganizationName>
-    <md:OrganizationName xml:lang="fr">Enseignement Superieur de la Province de Hainaut</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HEPH-Condorcet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">HEPH-Condorcet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.condorcet.be</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>webmaster@condorcet.be</md:EmailAddress>
-    <md:TelephoneNumber>+3271531578</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 e2938d0e..00000000
--- a/swamid-interfederations-2.0/idp.condorcet.be.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://idp.condorcet.be/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope 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.cornwall.ac.uk-shibboleth-idp.xml b/swamid-interfederations-2.0/idp.cornwall.ac.uk-shibboleth-idp.xml
deleted file mode 100644
index c29cc1e5..00000000
--- a/swamid-interfederations-2.0/idp.cornwall.ac.uk-shibboleth-idp.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.cornwall.ac.uk/shibboleth-idp">
-  <!--
-		This is a Shibboleth IdP for Cornwall College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-05T14:38:25.779805Z">
-      <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">cornwall.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAOk7GwlKWRg+w8gK7LWBuLRrQts1MA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5jb3Jud2FsbC5hYy51azAeFw0xMzA5MDIxMDE4
-						MjdaFw0zMzA5MDIxMDE4MjdaMB0xGzAZBgNVBAMTEmlkcC5jb3Jud2FsbC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLIUX5+M6fr44ZuLex4
-						m4EfwVdRt6Wm/9Cj7uxUXcYKoVHdpKWeyWKD27Fuc/eI7b5B2v1MO0i/IpeT1o2H
-						tSmty0gKcYt6+7FMfydazu8MFVgHklElFeFtMxOLsnnIS618gcP5uwbiWkba4BN6
-						80XHQyECDqKf6XOPAls+ZDqm85IzLZc9+EyFNJBGrNzC6nUASXuJjU5Ws1BdVn/r
-						eD9XQH6n5IjEB9ZJdmyuD8PyAoEDhmAG67A8BiAx6mLLWbBc32yvNuVRoOOWxLSA
-						Ai+huqmGrkrk48QGiF9IIyC1FjdYsjhWbnx+cJJInuxi+8R6f4i9vUOG8OOcTcYx
-						p78CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmNvcm53YWxsLmFjLnVrhilodHRw
-						czovL2lkcC5jb3Jud2FsbC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						uT8cKbmugXbKgJV02McvjAUP1N8wDQYJKoZIhvcNAQEFBQADggEBABvVUiY2qgLg
-						SI27b2IFdRhGorAJ9Ed/hCOO/lE0ICRzb6qksRiKCyWEm9uEG7TSQfsjJ2s6KaT3
-						FWdt3UaVomeaVyuu/jDO1kxIO8CCZXl/m9nrK/3AazVwlfgGvE5jDi13Gw2iS69I
-						7hZL/RId3JYKJUAiXyaUOojiyL36A2M5/ZJgwrZJlgUiJX/eonzUznVRLGW9hU1q
-						QLN5cohidCL6W7v51hKwIxs1FdB1kRHuqNjF3DLwgf8tx4+a4W5LMKOlgMZzfVCj
-						roP2vsH3YT6V9Ecg5BeGCcLX1qjv5SYA7mPpmo8n9a75raAoRKYxdHLiB5RNCAfk
-						cbka+/2Fop4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cornwall.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cornwall.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.cornwall.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cornwall.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cornwall.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cornwall.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">cornwall.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAOk7GwlKWRg+w8gK7LWBuLRrQts1MA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5jb3Jud2FsbC5hYy51azAeFw0xMzA5MDIxMDE4
-						MjdaFw0zMzA5MDIxMDE4MjdaMB0xGzAZBgNVBAMTEmlkcC5jb3Jud2FsbC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLIUX5+M6fr44ZuLex4
-						m4EfwVdRt6Wm/9Cj7uxUXcYKoVHdpKWeyWKD27Fuc/eI7b5B2v1MO0i/IpeT1o2H
-						tSmty0gKcYt6+7FMfydazu8MFVgHklElFeFtMxOLsnnIS618gcP5uwbiWkba4BN6
-						80XHQyECDqKf6XOPAls+ZDqm85IzLZc9+EyFNJBGrNzC6nUASXuJjU5Ws1BdVn/r
-						eD9XQH6n5IjEB9ZJdmyuD8PyAoEDhmAG67A8BiAx6mLLWbBc32yvNuVRoOOWxLSA
-						Ai+huqmGrkrk48QGiF9IIyC1FjdYsjhWbnx+cJJInuxi+8R6f4i9vUOG8OOcTcYx
-						p78CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmNvcm53YWxsLmFjLnVrhilodHRw
-						czovL2lkcC5jb3Jud2FsbC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						uT8cKbmugXbKgJV02McvjAUP1N8wDQYJKoZIhvcNAQEFBQADggEBABvVUiY2qgLg
-						SI27b2IFdRhGorAJ9Ed/hCOO/lE0ICRzb6qksRiKCyWEm9uEG7TSQfsjJ2s6KaT3
-						FWdt3UaVomeaVyuu/jDO1kxIO8CCZXl/m9nrK/3AazVwlfgGvE5jDi13Gw2iS69I
-						7hZL/RId3JYKJUAiXyaUOojiyL36A2M5/ZJgwrZJlgUiJX/eonzUznVRLGW9hU1q
-						QLN5cohidCL6W7v51hKwIxs1FdB1kRHuqNjF3DLwgf8tx4+a4W5LMKOlgMZzfVCj
-						roP2vsH3YT6V9Ecg5BeGCcLX1qjv5SYA7mPpmo8n9a75raAoRKYxdHLiB5RNCAfk
-						cbka+/2Fop4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cornwall.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cornwall.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">Cornwall College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cornwall College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cornwall.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@cornwall.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jon</GivenName>
-    <SurName>Wright</SurName>
-    <EmailAddress>mailto:jon.wright@cornwall.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.coulsdon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.coulsdon.ac.uk-shibboleth.xml
deleted file mode 100644
index caa847f3..00000000
--- a/swamid-interfederations-2.0/idp.coulsdon.ac.uk-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://idp.coulsdon.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Coulsdon College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">coulsdon.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEcTCCA1mgAwIBAgIQJOqN2v68Irpt7BTwM8+KxjANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDMyMTAwMDAwMFoXDTE3MDMyMDIzNTk1OVowQDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAuY291bHNk
-						b24uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKZJnCyrgv
-						aLfVlYa+UZ2acK6Ar+dvMpZwzImpr0pRAO6AnUXQvu0pfDiFmZaPiKxXqruXKHDv
-						8zcbK+zkhTw3MEsWUMrR9z1vrGV/3HJ5N8o0Ruosiu08VVeQWu6gV9XqWvwBHpE2
-						29Ks8xYi2OjxciIsdYkEQVFtQOITWlqxDgawaixpNNjupUpCDhD57jzPRMt3K4bi
-						FnO1D7fY5aGnVAE86KGmeehe+3OvNPzuohTAatcgAwQMTpzrkK7DuGPrz0o4BsfZ
-						Dvixo2bhTsxY5iQ0x5qxvi75jPUXnJfS4zRgONk8v2EL6ICIAt4pqSHSgNDkapbN
-						RdDj3hejrBYfAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-						V0fqkOO57TAdBgNVHQ4EFgQU51eJ++2LXmhsG5ZPFnLIEdNx5s8wDgYDVR0PAQH/
-						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-						Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5jb3Vsc2Rvbi5hYy51
-						azANBgkqhkiG9w0BAQUFAAOCAQEAWpY694i09h9vXRu8Bjf24MEtUMndoHt5SkyJ
-						whDc2n1xIynpxJXFobAAIx69dlVx/u1cEyPprqVcI2AY1Ru3lfJL0e+vtMH+5rXz
-						/22F5Rwth2bgeL/Veu7dEZXakzlolQfbRpV2QqKKUDlicIxypHMjbeqtBSLk45eW
-						x84AKfCKhDmSxTVGoIEON34LbjTb1CjmhwEaAK/3yvwjY+czY+62LjxYw4GILlhZ
-						ehBx0xhazJ7MDpZJRO3txDvCmyy3MTxIJIOudwPYUOCwu4Tlk+6CGei1JxmpHFLf
-						LqhXBlXEMKCLqNZrOnwROhwtx7lCv2GG4iVldu9inS5XW3xFuA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coulsdon.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coulsdon.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.coulsdon.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.coulsdon.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.coulsdon.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.coulsdon.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">coulsdon.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEcTCCA1mgAwIBAgIQJOqN2v68Irpt7BTwM8+KxjANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDMyMTAwMDAwMFoXDTE3MDMyMDIzNTk1OVowQDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAuY291bHNk
-						b24uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKZJnCyrgv
-						aLfVlYa+UZ2acK6Ar+dvMpZwzImpr0pRAO6AnUXQvu0pfDiFmZaPiKxXqruXKHDv
-						8zcbK+zkhTw3MEsWUMrR9z1vrGV/3HJ5N8o0Ruosiu08VVeQWu6gV9XqWvwBHpE2
-						29Ks8xYi2OjxciIsdYkEQVFtQOITWlqxDgawaixpNNjupUpCDhD57jzPRMt3K4bi
-						FnO1D7fY5aGnVAE86KGmeehe+3OvNPzuohTAatcgAwQMTpzrkK7DuGPrz0o4BsfZ
-						Dvixo2bhTsxY5iQ0x5qxvi75jPUXnJfS4zRgONk8v2EL6ICIAt4pqSHSgNDkapbN
-						RdDj3hejrBYfAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-						V0fqkOO57TAdBgNVHQ4EFgQU51eJ++2LXmhsG5ZPFnLIEdNx5s8wDgYDVR0PAQH/
-						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-						Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5jb3Vsc2Rvbi5hYy51
-						azANBgkqhkiG9w0BAQUFAAOCAQEAWpY694i09h9vXRu8Bjf24MEtUMndoHt5SkyJ
-						whDc2n1xIynpxJXFobAAIx69dlVx/u1cEyPprqVcI2AY1Ru3lfJL0e+vtMH+5rXz
-						/22F5Rwth2bgeL/Veu7dEZXakzlolQfbRpV2QqKKUDlicIxypHMjbeqtBSLk45eW
-						x84AKfCKhDmSxTVGoIEON34LbjTb1CjmhwEaAK/3yvwjY+czY+62LjxYw4GILlhZ
-						ehBx0xhazJ7MDpZJRO3txDvCmyy3MTxIJIOudwPYUOCwu4Tlk+6CGei1JxmpHFLf
-						LqhXBlXEMKCLqNZrOnwROhwtx7lCv2GG4iVldu9inS5XW3xFuA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.coulsdon.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.coulsdon.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">Coulsdon College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Coulsdon Sixth Form College in Croydon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.coulsdon.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nick</GivenName>
-    <SurName>Gullick</SurName>
-    <EmailAddress>mailto:nick.gullick@coulsdon.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Gullick</SurName>
-    <EmailAddress>mailto:nick.gullick@coulsdon.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.courtauld.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.courtauld.ac.uk-shibboleth.xml
deleted file mode 100644
index e6e9b6f1..00000000
--- a/swamid-interfederations-2.0/idp.courtauld.ac.uk-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.courtauld.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for the Courtauld Institute of Art.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">courtauld.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/courtauld.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/courtauld.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Courtauld Institute of Art</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.courtauld.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</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 1550a47d..00000000
--- a/swamid-interfederations-2.0/idp.cpe.fr-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.cpe.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CPE Lyon</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABpElEQVQoz81SS0sbYRS936OZb0hmHB9RUURRdJFYoRT0F2QjdOFC7e8oCN0UXPQX+APcdWXxAa7ElfiCxoW4LFoTiamP6CSZmcw3M99cFxPqUnTVs73n3HPu4RJEhNeAvor9FgF/keG6ru/7jDHLsp4FrSjePK+fPcouPTWXrl1fVzUhAikdx6GMUUpzuVwiIIjoRXH6x2/gBAj5Pm7crH67KFXmFxcbdXty8v30zAznXNM0RCSEkKSluxBcqUYy7OT4IESay+dN00zMkzyMMUpp26FYLG5trBcKhe6erK7rCKCUEkJomqbr+j9lgrYDhtK2bQIYs1SXZQB9l4wb9oNseY7jKqV6BwZNs4MDwMrpfclTGU537lpHs/3T26WFwfS9VKMZPtEp1i6DMSNbk2rZ6Gi39LPi7s0OA8BCzXfCOEPhY4/40wjqgao0A47Yp5EvU9l2JkQc3bh48KNaK/q0U75qBksH1b9uWG4EiPj1sPrrxrv1wqoTICIiEkTcLTfLzRABPmTFkJG69aJ8t0jW7Vfc87qMAXROP09Yz0f/T8/3BDRyz7/Sk8ilAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE3KzAyOjAwMveXGAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMEOqL6QAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.cpe.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CPE Lyon</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>
-					      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>
-    </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-POST" Location="https://idp.cpe.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cpe.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cpe.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CPE Lyon</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CPE Lyon</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cpe.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>webmaster@cpe.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cpp.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cpp.edu-idp-shibboleth.xml
deleted file mode 100644
index d433085b..00000000
--- a/swamid-interfederations-2.0/idp.cpp.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,58 +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://idp.cpp.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">cpp.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State Polytechnic University, Pomona</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>
-MIIDFzCCAf+gAwIBAgIUcgDt3ZH+mG2Chj61P92XzVTNbBkwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAwwLaWRwLmNwcC5lZHUwHhcNMTQxMjE5MDM1ODMxWhcNMzQx
-MjE5MDM1ODMxWjAWMRQwEgYDVQQDDAtpZHAuY3BwLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKhqSiN7v+1ENcPxskjwEgayl8fHt5AWL93BOyP6
-LKc427BDR+beOW+iAJAtx44Vz0Fi8n/UoEC/cNbOxCk/Br1ZR7DcL/NYY9EbCd4S
-3uiGOPCiDQO9UVT6HcuhtR9/UXP2MWA8X7RHJFKR5hNQREWGaoriccpdMbfdKDM1
-/otvxyfJjQWaKm16EN8JE26E7EhBgsJn/YklafuDZGnliYX8XQ5LoZZPTApOuaSa
-7c6Uzeb+16reCP/AknTut0F4s3+G60wrSvCb/N0Ha3tVB8RscJL14PG39sYa53HQ
-HeD5FbFh/nw3VVfP8xNi1RoNff+WYrm5WMPWcx6LesPe/5UCAwEAAaNdMFswHQYD
-VR0OBBYEFF8DROHsl63pHHskwsoyBNrVB4oNMDoGA1UdEQQzMDGCC2lkcC5jcHAu
-ZWR1hiJodHRwczovL2lkcC5jcHAuZWR1L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBBQUAA4IBAQBLM5KaygDxcrC2SMxx72gca7A5Jk4y8XT7QZoaLk7aFKFC3b03
-AjIuVlnt6Ki0gsGQvcK509D4Y5gtipwiQYNZ9l7Pyi8w/BPNun26LYTCrTc1zW/N
-HOXvSvSkBI1fjHUF9M9GPhgSpOWTHSO6S3ugS4EcOfwdzcM4w61few5VVscAaUlH
-w6C2piN3HPUa0+88hna1AN0dGGmpVKdR7Xkac6LIMCdEsAwlBpHzlWGNnilE4qEe
-wQmsBX7k7/eUcdm/yH1rGY7oJExcfp/868ns8xN9o8E1xXFnwTCni+3EmtrMCw6t
-B/i23als47eQ6V3GQjcS0HkMkF6kkuZhMEv0
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cpp.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cpp.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State Polytechnic University, Pomona</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State Polytechnic University, Pomona</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cpp.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Paul Henson</md:GivenName>
-    <md:EmailAddress>henson@cpp.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.craven-college.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.craven-college.ac.uk-shibboleth.xml
deleted file mode 100644
index 617f8bcc..00000000
--- a/swamid-interfederations-2.0/idp.craven-college.ac.uk-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.craven-college.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Craven College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">craven-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/craven-college.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/craven-college.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Craven College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.craven-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</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 3aa34e23..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.craw.eu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">cra.wallonie.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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/PorMSJ0AABA5SURBVHja7F0JdFTl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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu: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.craw.eu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.craw.eu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.craw.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.craw.eu/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">craw.eu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu: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">CRA-W</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CRA-W</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cra.wallonie.be</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mikhael</md:GivenName>
-    <md:SurName>Jacquemain</md:SurName>
-    <md:EmailAddress>maintenance@cra.wallonie.be</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 838a109a..00000000
--- a/swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.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" entityID="https://idp.crihan.fr/saml2/idp/metadata.php">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABT0lEQVQ4y2P8//8/A15w9boVw4ePoljltDVPMhI0ICF775N9B5ywScksnxvAxEAhYMEq+ueBMsP/P2wMDAwMDLkuy2WijfcgvPRF9EnfzEL8BrwJ2/X7+wMlBgYGBgYhKIYCVoaOKmSllHvhOcMv7U0Mr5JhAvoMvCctSDHgFcMvlYzOBrifustr5sAMYGXne8/AonkNRYegxBMZa8vDDAwMDAz8/G9Z8BrPanBuwos1F86+YjBAEo1nSPH6xcDAwFAvy/APvwEMDAwnXzIYrl65Cms6yNMNm4zdAGapJ6ycDAwMzOLPGRgYpPCGAbrA4u2bbJg8Jx1mYGC4qcbAeZ1kAy5duqRRfOmSBgMDA0N0VPReBgZH/LEgxcB2bW15ayU2SUkGjoeTbjKk4DVAlIHtdhCDeAcuBZMY8BtAMDdee89g9fEXA9bsrC3IcBIA1PliFBHj7mMAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDAy95cYAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjE3KzAyOjAwQ6ovpAAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crihan.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CRIHAN</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>
-					      MIIEMDCCAxigAwIBAgIJALCJicfy3l9fMA0GCSqGSIb3DQEBBQUAMG0xCzAJBgNV
-BAYTAkZSMRIwEAYDVQQIEwlOb3JtYW5kaWUxITAfBgNVBAcTGFNhaW50LUV0aWVu
-bmUgZHUgUm91dnJheTEPMA0GA1UEChMGQ1JJQU5OMRYwFAYDVQQDEw1pZHAuY3Jp
-aGFuLmZyMB4XDTE2MDEzMDA4MTQwNFoXDTI2MDEyOTA4MTQwNFowbTELMAkGA1UE
-BhMCRlIxEjAQBgNVBAgTCU5vcm1hbmRpZTEhMB8GA1UEBxMYU2FpbnQtRXRpZW5u
-ZSBkdSBSb3V2cmF5MQ8wDQYDVQQKEwZDUklBTk4xFjAUBgNVBAMTDWlkcC5jcmlo
-YW4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCRF3F8Xj4/pRJA
-XgtY8GaziqAjFd+nwPzYHfwwQyOSYSpTfYVo2rS9QZxz2ZLYzEev5AKyg8LrUs5g
-x0JLmgf3tjugkuu38ucZHVQXchiMsv8wfb7mvHEazBMwdAhIVoQHTZ8PV0LRNjDI
-o1PZG5nwViVmLPlBy/vEMtgXMR0GrpWOtNp2/inS3sMxpqlHINhfmPklDvjNWQ8w
-sTY0rYdIGcvFyC4b8oJxu81zseY5H3VGByXJwXxF1+MKCidnBrCRxfS6yWudDKvA
-8bJCUxpgUOlHZ6harP+ae0FzL0ES325Kcrjh0kWWsf4R59XzeOhBhWr14KIAkv0Z
-p4YHH7nLAgMBAAGjgdIwgc8wHQYDVR0OBBYEFA7szVvW/AggKws67w2S1wnTJ9xe
-MIGfBgNVHSMEgZcwgZSAFA7szVvW/AggKws67w2S1wnTJ9xeoXGkbzBtMQswCQYD
-VQQGEwJGUjESMBAGA1UECBMJTm9ybWFuZGllMSEwHwYDVQQHExhTYWludC1FdGll
-bm5lIGR1IFJvdXZyYXkxDzANBgNVBAoTBkNSSUFOTjEWMBQGA1UEAxMNaWRwLmNy
-aWhhbi5mcoIJALCJicfy3l9fMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBAGvNAC00j+Rg7nSSEvhndvOg+wOniyWfRO24nSOiYXmLw2uLP/de04baLSKN
-gd1Zt397QFeeV7eTfXBd6PeUCsR872OHF46jcH0P3Yk7KvH7K9xqq/nYgO4PJM68
-EIrhhwyx46Hpc4F4Pmsosd6Mzx1+EL0p6QMLHIts1/HAfr3vkUelEMJzcwcbxw6r
-cMxWulDqZ0MiWHl8vc3bUuu0mduSYnC+pyKgGn1UOMavTHt4NiNPZEPl1ybnVts8
-hhAgrOk7nLzUy5KGqQnfZx11bGfzVYGEYz6s8pQ/TtPmR/Ss9oxxL1DUL2i4Re9e
-m3xBa+Rq08OxM9OK2vxKdca6tuo=
-					    </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>
-					      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>
-    </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-POST" Location="https://idp.crihan.fr/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crihan.fr/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crihan.fr/shib13/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CRIHAN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CRIHAN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crihan.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Alain Bidaud</md:SurName>
-    <md:EmailAddress>alain.bidaud@crihan.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 81a6bc74..00000000
--- a/swamid-interfederations-2.0/idp.crous-antillesguyane.fr-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.crous-antillesguyane.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMDL3lxgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDBDqi+kAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-antillesguyane.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.crous-antillesguyane.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-antillesguyane.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-antillesguyane.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-antillesguyane.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-antillesguyane.fr/idp/profile/SAML1/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">CROUS Antilles-Guyane</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Antilles-Guyane</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-antillesguyane.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>philippe.luce@crous-antillesguyane.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ab6f0918..00000000
--- a/swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-besancon.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Besançon</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMDL3lxgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDBDqi+kAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-besancon.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Besançon</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>
-					      MIIDQDCCAiigAwIBAgIVAJKYjj9OSC7KZE34z1uQZxmgaFj4MA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFWlkcC5jcm91cy1iZXNhbmNvbi5mcjAeFw0xMzAxMTcx
-MDE2MjVaFw0zMzAxMTcxMDE2MjVaMCAxHjAcBgNVBAMTFWlkcC5jcm91cy1iZXNh
-bmNvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALa4HONZlpur
-S4GmtXZ+XztZnIcen8ha9hIdJy1CesFpM9mX+ghN8mD+nQoE/BHOa2H/47A+j0v6
-WmFuLXR32lHtDGNSKBqvXYoXPQNogjzEggUAj2Rd8jayvwQ4DpXhlL3JTyOpXmEr
-Ix1mOv9GgBPXN3QK79CEzb8cPIi/XZiNb5Mr1ZEaIhUUuweVk5uWPWpmz/HjF5h2
-lFvA126puPwiCYVCoP8jgjqfo8jjMQ4Xm0q36FXQ1pRDPHYIY+/YliVnzp/ROgv/
-+xEFxX/7JhllcKKVAd9TJHbp9t/douCCdC75ri2PAomiDeoOOOfB1SfoslOxJiiw
-tCq+i582Zt0CAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLmNyb3VzLWJlc2FuY29u
-LmZyhixodHRwczovL2lkcC5jcm91cy1iZXNhbmNvbi5mci9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUCuVUZJRAqTFwAWrlmNslzdbTK+wwDQYJKoZIhvcNAQEFBQAD
-ggEBAFP0B012jmUQt/Kwa9TOnbebipdWdG8/Cq7uaEvjLFjKPbgx5Lb7nYMnZ8NA
-Dy/xEMN1UntC+axX41RtvKYiTmM1mSN2F+EaFxIhnFocT/443/n5Pdw9LsBp3rPS
-5RaT3DyoYJXVDBSjGpHvIapdjEI+8mebpIl4GfS8sdZ0IyBEkAiXV4EDWjMTk/fy
-X1zZFs+5KyGiROxd1qaYNX6NNL4o9Cvi3ABfPjYzUo6QQsxJ6AT6kWPfm68o9odZ
-gqLnE6GRTLSvQGXJQoV+S60pL2W2Sg8VCqzcy7rzcHWgVRuPduIZyHas5cUO9+hK
-+5m49wuMpzvHegwlKwKm9Ce8Jtk=
-					    </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-POST" Location="https://idp.crous-besancon.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-besancon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-besancon.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-besancon.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQDCCAiigAwIBAgIVAJKYjj9OSC7KZE34z1uQZxmgaFj4MA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFWlkcC5jcm91cy1iZXNhbmNvbi5mcjAeFw0xMzAxMTcx
-MDE2MjVaFw0zMzAxMTcxMDE2MjVaMCAxHjAcBgNVBAMTFWlkcC5jcm91cy1iZXNh
-bmNvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALa4HONZlpur
-S4GmtXZ+XztZnIcen8ha9hIdJy1CesFpM9mX+ghN8mD+nQoE/BHOa2H/47A+j0v6
-WmFuLXR32lHtDGNSKBqvXYoXPQNogjzEggUAj2Rd8jayvwQ4DpXhlL3JTyOpXmEr
-Ix1mOv9GgBPXN3QK79CEzb8cPIi/XZiNb5Mr1ZEaIhUUuweVk5uWPWpmz/HjF5h2
-lFvA126puPwiCYVCoP8jgjqfo8jjMQ4Xm0q36FXQ1pRDPHYIY+/YliVnzp/ROgv/
-+xEFxX/7JhllcKKVAd9TJHbp9t/douCCdC75ri2PAomiDeoOOOfB1SfoslOxJiiw
-tCq+i582Zt0CAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLmNyb3VzLWJlc2FuY29u
-LmZyhixodHRwczovL2lkcC5jcm91cy1iZXNhbmNvbi5mci9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUCuVUZJRAqTFwAWrlmNslzdbTK+wwDQYJKoZIhvcNAQEFBQAD
-ggEBAFP0B012jmUQt/Kwa9TOnbebipdWdG8/Cq7uaEvjLFjKPbgx5Lb7nYMnZ8NA
-Dy/xEMN1UntC+axX41RtvKYiTmM1mSN2F+EaFxIhnFocT/443/n5Pdw9LsBp3rPS
-5RaT3DyoYJXVDBSjGpHvIapdjEI+8mebpIl4GfS8sdZ0IyBEkAiXV4EDWjMTk/fy
-X1zZFs+5KyGiROxd1qaYNX6NNL4o9Cvi3ABfPjYzUo6QQsxJ6AT6kWPfm68o9odZ
-gqLnE6GRTLSvQGXJQoV+S60pL2W2Sg8VCqzcy7rzcHWgVRuPduIZyHas5cUO9+hK
-+5m49wuMpzvHegwlKwKm9Ce8Jtk=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-besancon.fr/idp/profile/SAML1/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">CROUS Besançon</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Besançon</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-besancon.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Christophe GONZALEZ</md:SurName>
-    <md:EmailAddress>christophe.gonzalez@crous-besancon.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 c73710c4..00000000
--- a/swamid-interfederations-2.0/idp.crous-caen.fr-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://idp.crous-caen.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMDL3lxgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDBDqi+kAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-caen.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.crous-caen.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-caen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-caen.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-caen.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-caen.fr/idp/profile/SAML1/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">CROUS Caen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Caen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-caen.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>service.informatique@crous-caen.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d8c892a6..00000000
--- a/swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.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.crous-clermont.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Clermont-Ferrand</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-clermont.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Clermont-Ferrand</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>
-					      MIIDPzCCAiegAwIBAgIUSGgZ2BiSEkpo4LfpMRytX1Ewj7YwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLmNyb3VzLWNsZXJtb250LmZyMB4XDTEzMDIxMjA5
-MTIxNVoXDTMzMDIxMjA5MTIxNVowIDEeMBwGA1UEAxMVaWRwLmNyb3VzLWNsZXJt
-b250LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypdI1XWeWpyQ
-KK2ipthV2k6uItAQ0D1T2JW5iQd7VSXGRDVW87Zc4pORHHYpP9a6Pod8RiQ3oV3g
-Nxbe6KmqJHG2FWi7rU6YVD9P9Cq4ehXeHE1IPP/EyJWkQ+bwQsIdjsA4APhUZfZK
-y4yQ5GHH/kTPXSVtmzmL52vyHADo2JJgeFoENn5Oowgp2NiC5j8W/SCIYVXSWOFx
-+9xFNpuI1crvroONko9OHGryf3w8SbkzAfBm2CfyJbwiprFo6T+uF3VDSUUss/m/
-WUL+hJT7z5UjaQg6wazyMHuQBUP1pZ9a48V6eTbRaGjpVwrW7PxJarUviA5DLK5S
-pHAU0KaDWwIDAQABo3EwbzBOBgNVHREERzBFghVpZHAuY3JvdXMtY2xlcm1vbnQu
-ZnKGLGh0dHBzOi8vaWRwLmNyb3VzLWNsZXJtb250LmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBQIPelJ6PRctrShUnviqE24f1IPtDANBgkqhkiG9w0BAQUFAAOC
-AQEAh/cffEhRnuqX6aMzkHWVe4QA3nuUUTO+ckfbdxqXqu8tqIab1zpSibhFYz6N
-990n2k8Pj6AcVDslx3HntU2z8fuCwZXerk3YuIbcncRcoR+Dq0BuE+Lz2fwkF/xR
-GW7Fs7QPT1u9e6Gc4LD/JVjUK/7WdwgGMQpYnUt6HLefsgdmAEwJZXR4XnUf26yn
-wanyC1UVgvD9u8IHnKUgJ1zB0nEEhtc6i0gpGxireo0fAEPIRkJNYmOPWobj0k5u
-W2E7UTJHp3V5SlkS0nBj+hIa9UYTFtWpDWNooygEWKdJ6qtVNq0LCRoLwS1icdPB
-rQpa7Omoq1LaBUSMRTaVxentYQ==
-					    </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-POST" Location="https://idp.crous-clermont.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-clermont.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-clermont.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-clermont.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDPzCCAiegAwIBAgIUSGgZ2BiSEkpo4LfpMRytX1Ewj7YwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLmNyb3VzLWNsZXJtb250LmZyMB4XDTEzMDIxMjA5
-MTIxNVoXDTMzMDIxMjA5MTIxNVowIDEeMBwGA1UEAxMVaWRwLmNyb3VzLWNsZXJt
-b250LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAypdI1XWeWpyQ
-KK2ipthV2k6uItAQ0D1T2JW5iQd7VSXGRDVW87Zc4pORHHYpP9a6Pod8RiQ3oV3g
-Nxbe6KmqJHG2FWi7rU6YVD9P9Cq4ehXeHE1IPP/EyJWkQ+bwQsIdjsA4APhUZfZK
-y4yQ5GHH/kTPXSVtmzmL52vyHADo2JJgeFoENn5Oowgp2NiC5j8W/SCIYVXSWOFx
-+9xFNpuI1crvroONko9OHGryf3w8SbkzAfBm2CfyJbwiprFo6T+uF3VDSUUss/m/
-WUL+hJT7z5UjaQg6wazyMHuQBUP1pZ9a48V6eTbRaGjpVwrW7PxJarUviA5DLK5S
-pHAU0KaDWwIDAQABo3EwbzBOBgNVHREERzBFghVpZHAuY3JvdXMtY2xlcm1vbnQu
-ZnKGLGh0dHBzOi8vaWRwLmNyb3VzLWNsZXJtb250LmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBQIPelJ6PRctrShUnviqE24f1IPtDANBgkqhkiG9w0BAQUFAAOC
-AQEAh/cffEhRnuqX6aMzkHWVe4QA3nuUUTO+ckfbdxqXqu8tqIab1zpSibhFYz6N
-990n2k8Pj6AcVDslx3HntU2z8fuCwZXerk3YuIbcncRcoR+Dq0BuE+Lz2fwkF/xR
-GW7Fs7QPT1u9e6Gc4LD/JVjUK/7WdwgGMQpYnUt6HLefsgdmAEwJZXR4XnUf26yn
-wanyC1UVgvD9u8IHnKUgJ1zB0nEEhtc6i0gpGxireo0fAEPIRkJNYmOPWobj0k5u
-W2E7UTJHp3V5SlkS0nBj+hIa9UYTFtWpDWNooygEWKdJ6qtVNq0LCRoLwS1icdPB
-rQpa7Omoq1LaBUSMRTaVxentYQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-clermont.fr/idp/profile/SAML1/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">CROUS Clermont-Ferrand</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Clermont-Ferrand</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-clermont.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi@crous-clermont.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8d237965..00000000
--- a/swamid-interfederations-2.0/idp.crous-creteil.fr-idp-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.crous-creteil.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOCswMjowMMS/5/EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTgrMDI6MDC14l9NAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-creteil.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.crous-creteil.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-creteil.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-creteil.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Créteil</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Créteil</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-creteil.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>informatique@crous-creteil.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 55f2ca49..00000000
--- a/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-dijon.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Dijon - Personnels</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOCswMjowMMS/5/EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTgrMDI6MDC14l9NAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-dijon.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Dijon - Personnels</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>
-					      MIIDMzCCAhugAwIBAgIUXZf8djanPtL+INJI961K5kFsBf8wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAwwSaWRwLmNyb3VzLWRpam9uLmZyMB4XDTE1MDgyNDE0NTU1
-NFoXDTM1MDgyNDE0NTU1NFowHTEbMBkGA1UEAwwSaWRwLmNyb3VzLWRpam9uLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArVfO+wFeSZeOHnc1JAYL
-4i3MQbeQkQElEuN1f+GikD8A9UWn39PHAv/3IivGLm27yngEasC74zQaPlk6BS2c
-gLksqzoBWMdjVkuPXiGEBSSDKaxRplzTsAPPVdkyBlEQFqoPAZS/+wg5g7yU3SuK
-0BKKGyP+Izfn+MBMBFRjMuwhzV2wLqFZsgZF1YZiCzlpuiFn09N2p182ha9zqian
-0RTH2Lsq/rNip0DzeaNG4gfuRBdOZwraw1uBfB0yvHd0oZRrzeQCByBBjdKrj2Qt
-sng4zx9gwU0ghHvQNgi8DY/Yne9u6LGrwWwuX2Qv461P/G8pj1ecQadoNGDJElSB
-WQIDAQABo2swaTAdBgNVHQ4EFgQU+keN+vwttrmrAqr4XoFcSMrJWKwwSAYDVR0R
-BEEwP4ISaWRwLmNyb3VzLWRpam9uLmZyhilodHRwczovL2lkcC5jcm91cy1kaWpv
-bi5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAeD2xGUMdtpXi
-f33R0MT8fLTpvjZx22SkqZpmgMPN1Mv36pevCqM3DQglu53mUcp7uowpNlxKINfV
-wKsLB31Uu3ADLKWWOU1Zhmqa8R2V05odXecAQgdcojS162TSkwzTeI43/Nc9zrtC
-iO5xMR3wznB/kfmVpTvbEY8dsjZryxWnVsuFh23EbZc3r/W4JfE4cvfUNBVOJm0l
-55m1tP45kBigy5No2O7YC+TzGy+b2rABfPL6D0eYQhhvfBw5WbDCAtW+DaAV0AuB
-T+zF8GLFgOT6h68tIL0eLGprCAKV1x0RF2y2hYQMlxMfVQCobgHEtJoEudpNj0kN
-AWeDYzsI0g==
-					    </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>
-					      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>
-    </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-POST" Location="https://idp.crous-dijon.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-dijon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-dijon.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-dijon.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUXZf8djanPtL+INJI961K5kFsBf8wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAwwSaWRwLmNyb3VzLWRpam9uLmZyMB4XDTE1MDgyNDE0NTU1
-NFoXDTM1MDgyNDE0NTU1NFowHTEbMBkGA1UEAwwSaWRwLmNyb3VzLWRpam9uLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArVfO+wFeSZeOHnc1JAYL
-4i3MQbeQkQElEuN1f+GikD8A9UWn39PHAv/3IivGLm27yngEasC74zQaPlk6BS2c
-gLksqzoBWMdjVkuPXiGEBSSDKaxRplzTsAPPVdkyBlEQFqoPAZS/+wg5g7yU3SuK
-0BKKGyP+Izfn+MBMBFRjMuwhzV2wLqFZsgZF1YZiCzlpuiFn09N2p182ha9zqian
-0RTH2Lsq/rNip0DzeaNG4gfuRBdOZwraw1uBfB0yvHd0oZRrzeQCByBBjdKrj2Qt
-sng4zx9gwU0ghHvQNgi8DY/Yne9u6LGrwWwuX2Qv461P/G8pj1ecQadoNGDJElSB
-WQIDAQABo2swaTAdBgNVHQ4EFgQU+keN+vwttrmrAqr4XoFcSMrJWKwwSAYDVR0R
-BEEwP4ISaWRwLmNyb3VzLWRpam9uLmZyhilodHRwczovL2lkcC5jcm91cy1kaWpv
-bi5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAeD2xGUMdtpXi
-f33R0MT8fLTpvjZx22SkqZpmgMPN1Mv36pevCqM3DQglu53mUcp7uowpNlxKINfV
-wKsLB31Uu3ADLKWWOU1Zhmqa8R2V05odXecAQgdcojS162TSkwzTeI43/Nc9zrtC
-iO5xMR3wznB/kfmVpTvbEY8dsjZryxWnVsuFh23EbZc3r/W4JfE4cvfUNBVOJm0l
-55m1tP45kBigy5No2O7YC+TzGy+b2rABfPL6D0eYQhhvfBw5WbDCAtW+DaAV0AuB
-T+zF8GLFgOT6h68tIL0eLGprCAKV1x0RF2y2hYQMlxMfVQCobgHEtJoEudpNj0kN
-AWeDYzsI0g==
-					    </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>
-					      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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-dijon.fr/idp/AA"/>
-    <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">CROUS Dijon - Personnels</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Dijon - Personnels</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-dijon.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi@crous-dijon.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f9dd4d31..00000000
--- a/swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.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://idp.crous-grenoble.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Grenoble - Personnels</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOCswMjowMMS/5/EAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTgrMDI6MDC14l9NAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-grenoble.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Grenoble - Personnels</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>
-					      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>
-    </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-POST" Location="https://idp.crous-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Grenoble - Personnels</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Grenoble - Personnels</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-grenoble.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Benoit LION</md:SurName>
-    <md:EmailAddress>benoit.lion@crous-grenoble.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sébastien LEYRELOUP</md:SurName>
-    <md:EmailAddress>sebastien.leyreloup@crous-grenoble.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0c51bb52..00000000
--- a/swamid-interfederations-2.0/idp.crous-limoges.fr-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://idp.crous-limoges.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-limoges.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.crous-limoges.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-limoges.fr/cas/login"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-limoges.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-limoges.fr/idp/profile/SAML1/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">CROUS de Limoges</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS de Limoges</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-limoges.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>informatique@crous-limoges.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 14d1afd9..00000000
--- a/swamid-interfederations-2.0/idp.crous-montpellier.fr-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://idp.crous-montpellier.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Montpellier</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOSswMjowMGLI7EUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTkrMDI6MDATlVT5AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-montpellier.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Montpellier</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>
-					      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>
-    </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-POST" Location="https://idp.crous-montpellier.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-montpellier.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-montpellier.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-montpellier.fr/idp/profile/SAML1/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">CROUS Montpellier</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Montpellier</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-montpellier.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Olivier COUADE</md:SurName>
-    <md:EmailAddress>olivier.couade@crous-montpellier.com</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6a49d305..00000000
--- a/swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.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://idp.crous-nancy-metz.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Nancy-Metz Lorraine</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOSswMjowMGLI7EUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTkrMDI6MDATlVT5AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-nancy-metz.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Nancy-Metz Lorraine</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>
-					      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>
-    </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-POST" Location="https://idp.crous-nancy-metz.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nancy-metz.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nancy-metz.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Nancy-Metz Lorraine</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Nancy-Metz Lorraine</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-nancy-metz.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Bernard ZANGA</md:SurName>
-    <md:EmailAddress>bernard.zanga@crous-nancy-metz.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Bruno LIENARD</md:SurName>
-    <md:EmailAddress>bruno.lienard@crous-nancy-metz.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 3282f23b..00000000
--- a/swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.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" entityID="https://idp.crous-nantes.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-nantes.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://idp.crous-nantes.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nantes.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS de Nantes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS de Nantes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-nantes.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi.exploitation@crous-nantes.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2adea4db..00000000
--- a/swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.crous-nice.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMSswMjowMBMCpV8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzErMDI6MDBiXx3jAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-nice.fr/</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEnTCCA4WgAwIBAgIRALWuRLNLEVeuImgWjTlsB5wwDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTUwNjIyMDAwMDAwWhcNMTgwNjIxMjM1OTU5WjA/MSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGjAYBgNVBAMTEWlkcC5jcm91cy1u
-aWNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv+s0X6a4wci3
-rmTkh4xxRhWHM5Y9WfwuA6b9avcjmPUopag4ShXtaAUysZQYPHa44V94wrYGg2k7
-Y8RmFMFa26Zaw3CyZNSpLY4ZDHxGQYrkeQwRNGlKkBRmdwBFj3PrNhYADXHghnQj
-qBYrd9zh5oHT7vI6tYBKl4EZKypdyjViKR4dNgr+WiUvJCR7kfxsLX9/2sJ05rbF
-VjWemEVz2RQ4R5xkWXnraVTgwhKeykGKiDWuBYrVmuuBgYUDZZauazF/v5jhqqtD
-CoBNEfzecuO47/bhumxf5tAqRjqaLnvlqXdAwr05idgZ3xQsP3uryIktA8t/h7zm
-e3ZF/5sxIQIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GG
-KLD9tr0wHQYDVR0OBBYEFOhlPBId5zoytuUUEuvPr9WifWqAMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNy
-bDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRy
-dXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2Nz
-cC51c2VydHJ1c3QuY29tMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1uaWNlLmZyMA0G
-CSqGSIb3DQEBCwUAA4IBAQBQgxw83uEggYS9E40PJf40hjkl26GVcwMrW5H2MtrV
-PlHy2rpfcKoBkxpuNOOvUOeo9cIzGqppXyMVrpRZcZK66DGLOaHx8LDxUBnwTR7M
-24+UNiPWT39qKat/H5kXZy4TOsdF4puPiWitVfCH/u8eDRw1NDfqoBhdD1IzZSrO
-7tE8qkrqW8XBIU+i8PlwhAdwOxqNWZwogCXK7zaX4LXMe50OtKXBFBKdIzKopKkl
-xSXuRsQd98MTvUs41HrExz459kOUv/w6RyW1OOCZhyl+1hFvIATcTdYYy7VWR6ed
-BOyEhdt1trDRK1pwnstRuxBk4KpHuLw1t5N/vnjMCxUQ
-					    </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>
-					      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>
-    </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-POST" Location="https://idp.crous-nice.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-nice.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-nice.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-nice.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEnTCCA4WgAwIBAgIRALWuRLNLEVeuImgWjTlsB5wwDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTUwNjIyMDAwMDAwWhcNMTgwNjIxMjM1OTU5WjA/MSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGjAYBgNVBAMTEWlkcC5jcm91cy1u
-aWNlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv+s0X6a4wci3
-rmTkh4xxRhWHM5Y9WfwuA6b9avcjmPUopag4ShXtaAUysZQYPHa44V94wrYGg2k7
-Y8RmFMFa26Zaw3CyZNSpLY4ZDHxGQYrkeQwRNGlKkBRmdwBFj3PrNhYADXHghnQj
-qBYrd9zh5oHT7vI6tYBKl4EZKypdyjViKR4dNgr+WiUvJCR7kfxsLX9/2sJ05rbF
-VjWemEVz2RQ4R5xkWXnraVTgwhKeykGKiDWuBYrVmuuBgYUDZZauazF/v5jhqqtD
-CoBNEfzecuO47/bhumxf5tAqRjqaLnvlqXdAwr05idgZ3xQsP3uryIktA8t/h7zm
-e3ZF/5sxIQIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GG
-KLD9tr0wHQYDVR0OBBYEFOhlPBId5zoytuUUEuvPr9WifWqAMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNy
-bDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRy
-dXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2Nz
-cC51c2VydHJ1c3QuY29tMBwGA1UdEQQVMBOCEWlkcC5jcm91cy1uaWNlLmZyMA0G
-CSqGSIb3DQEBCwUAA4IBAQBQgxw83uEggYS9E40PJf40hjkl26GVcwMrW5H2MtrV
-PlHy2rpfcKoBkxpuNOOvUOeo9cIzGqppXyMVrpRZcZK66DGLOaHx8LDxUBnwTR7M
-24+UNiPWT39qKat/H5kXZy4TOsdF4puPiWitVfCH/u8eDRw1NDfqoBhdD1IzZSrO
-7tE8qkrqW8XBIU+i8PlwhAdwOxqNWZwogCXK7zaX4LXMe50OtKXBFBKdIzKopKkl
-xSXuRsQd98MTvUs41HrExz459kOUv/w6RyW1OOCZhyl+1hFvIATcTdYYy7VWR6ed
-BOyEhdt1trDRK1pwnstRuxBk4KpHuLw1t5N/vnjMCxUQ
-					    </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>
-					      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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.crous-nice.fr/idp/profile/SAML1/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">CROUS de Nice - Personnels</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS de Nice - Personnels</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-nice.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>admin@crous-nice.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d34457a2..00000000
--- a/swamid-interfederations-2.0/idp.crous-orleans-tours.fr-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.crous-orleans-tours.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxOSswMjowMGLI7EUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTkrMDI6MDATlVT5AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-orleans-tours.fr/</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.crous-orleans-tours.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-orleans-tours.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-orleans-tours.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Orléans-Tours - Personnels</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Orléans-Tours - Personnels</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-orleans-tours.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>LEROY Thierry</md:SurName>
-    <md:EmailAddress>thierry.leroy@crous-orleans-tours.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>VINCENT Régis</md:SurName>
-    <md:EmailAddress>regis.vincent@crous-orleans-tours.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8ece24dc..00000000
--- a/swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.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.crous-paris.fr/idp/shibboleth">
-  <md: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>
-  </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 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:InformationURL xml:lang="fr">http://www.crous-paris.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://idp.crous-paris.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-paris.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-paris.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Paris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Paris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-paris.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>informatique@crous-paris.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 aeb47e06..00000000
--- a/swamid-interfederations-2.0/idp.crous-poitiers.fr-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.crous-poitiers.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS de Poitiers</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMSswMjowMBMCpV8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzErMDI6MDBiXx3jAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ac-poitiers.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS de Poitiers</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>
-					      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>
-    </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-POST" Location="https://idp.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS de Poitiers</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS de Poitiers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ac-poitiers.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>crous.informatique@crous-poitiers.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2362c1ae..00000000
--- a/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.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.crous-reims.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Reims</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/vnd.microsoft.icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAACAcAAAgHAAAAAAAAAAAAAD//////////////v/9////0M37/3Nz9f9CQO7/LCPv/ysl8P9CQO3/d3L1/8zJ+v/////////////////9//////////3//v///v//cW7z/wMA6f8EAev/EAjo/yQe7f8mHe//Egrr/wAA6/8CAur/b2vz//////////7///7////+//////z/VE/y/wAA5v8bEe3/JB/s/yQb7v8nG+//JBzr/ygd7/8oHuz/GhLr/wAA6P9RSu/////+////////////fHj2/wQA6f8hG+z/JRzu/yUd7P8mHu3/Ihns/xkQ7f8aEu3/GRPu/yAW7P8mHe//AADo/3h09f//////2tj8/wMA6v8bD+v/Ix7r/yQb7f8iHO3/IBju/ywk7f9BOu//OTTt/0M37/82LPD/Hhjr/xoS6/8BAOr/19P8/3178/8AAOr/JR/u/yIc7f8jHez/Jxvv/xMM6f8/Ou//f3rz/2xp9P91cPP/OjHs/wwE6/8TB+3/AgDo/2di8/9IQfD/DwXr/ycc7v8kG+7/Jhvt/yYd7/8UCez/V1Tw/2dh9v8sJ+7/KCDv/01I8f8wJu7/Uk3w/yUg7f9jXfL/LCPv/yYe7f8iHOv/Ix3u/yIc6/8UCur/UEzx/5SQ9/89Ou3/iYP0/5iW9v/Kyfv/nZ33/7e0+f+alvb/v7z6/yok7/8oHuz/JRzu/yQb7v8kG+3/Fgvr/0lF8v+UkfT/VVTy/1lV8P9rZfT/ZGHy/2Zd8/9LRfD/VlLx/3dy9f9KRPH/DQbr/yUc7v8jHez/Jhzr/yUd7P8QCuv/TkXw/2hg8/8UCev/CQPq/wwD7f8QCOn/Fwzs/wEA6v8zKe3/gn34/wQB6/8mHu3/JRzv/yId6v8iGvH/Jx/u/w8J6v8NBun/JRzu/yIb7v8mHOv/JRzu/yUh7P8BAOr/e3f0/9rc+v8GAOn/FxDt/ycd7P8iHO3/JBzr/yYc6/8mG+3/JRvx/yQc6/8jHO//Jhvt/yUd7P8bEuv/BgDq/9jX/v/9////gXz1/wIA6P8gGez/Jh3v/yEc7f8lHO7/Ix3u/yUc7v8lHuv/JBzr/yUe6/8hG+z/AADp/3549f/8//3////+//////9aUvP/AgDo/xoR6v8kH+z/Ix3s/yQb7f8kG+3/JBvu/ycf7v8XEez/AQHn/1RN8v/+/v7////////+/////v3//f///3N09P8JAOr/AAHp/xIH6v8lHez/JB/s/xIG7P8AAOv/BQHq/3Jv9P///v////////z//f/////////+/////v/9////0dD8/3t3+P9JQ/D/KyXu/yom8f9HQ/D/d3b2/9TP/P////7////+//3/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-reims.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Server Shibboleth</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Reims</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Serveur  Shibboleth fournisseur d'identitée</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>
-					      MIIDKDCCAhCgAwIBAgIJAOjHz8Rlt5DLMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmlkcC5jcm91cy1yZWltcy5mcjAeFw0xNTEyMjIwNTIwMjRaFw0xODEyMjEw
-NTIwMjRaMB0xGzAZBgNVBAMTEmlkcC5jcm91cy1yZWltcy5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAM3dwzfpnyEAOsmLeJZ8yxlrOAZv/1V6w4yR
-abxkwBF8o0++QUB1uyduzHrBQWcgDtMfhuY6/gIAeCXl6sX681l/9aqhvY3q7fe0
-zkx2NbpNHYGH95kN1oSg0mhCjoR2QA/jnuA+epuw0mgMiJXB22bvogqr6xtPORa8
-Obuvxbr9T5HhykgQCKBhl1qJ0Urehobfe7Py0ksJg/XpW57KQjv0QFhLEmhVRLle
-Hda54Yyrl/vMGVlpqkrFKuEw9hzk9OfVVMbGlamVkay35e8U0h2A0yQY5RxeC6S9
-oGiBICOgBQD4Ofxn3avCokUCsXiMPEG5u37tV0+6bWdvOITlWmECAwEAAaNrMGkw
-SAYDVR0RBEEwP4ISaWRwLmNyb3VzLXJlaW1zLmZyhilodHRwczovL2lkcC5jcm91
-cy1yZWltcy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU9QiwBg78Xxdav9h+
-hy5om5GJbPkwDQYJKoZIhvcNAQEFBQADggEBALAmbzYRQmKJMDVcqnrA8EUA7VpC
-g+MQ9Zv43NN24J2mfxZ+dp9P1a2YdsN//Ruukrf9+G/04BlQD8nnX5abCjnCxUKN
-THSRSEyhzGO+958eYuBCweB0h9hGzPATks0NsOxDIH6WMymVhE0HfkTmXN7Db8vU
-yme8Rjea2onN07ookIVgM+MbGVEL+eA+y0TGRk+/WR1wtN2cj/e+g9/GXvHcqQlP
-gXKNVq8c9yhEuK0mhtZ7n3AlCLrDQUKWetzGbaSvHFTNd/XYwYKc9lfVEu71II6a
-JRfS8xrL01pysyULxIGNBTU1zdajH4UHS3EqRRLKCm4gF5CU40pxLSEqm/E=
-					    </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>
-					      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>
-    </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-POST" Location="https://idp.crous-reims.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-reims.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Reims</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Reims</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-reims.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>informatique@crous-reims.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 84156ab3..00000000
--- a/swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.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://idp.crous-rennes.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Rennes - Personnels</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-rennes.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Rennes - Personnels</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>
-					      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>
-    </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-POST" Location="https://idp.crous-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-rennes.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Rennes - Personnels</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Rennes - Personnels</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-rennes.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean-Louis Allier</md:SurName>
-    <md:EmailAddress>jean-louis.allier@crous-rennes.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Michel Gaigeard</md:SurName>
-    <md:EmailAddress>michel.gaigeard@crous-rennes.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 49ed5bf2..00000000
--- a/swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-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.crous-strasbourg.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACCklEQVQ4y4WTXUhTYRjHf+ecjtuynBHEao5GluIHgRWjDwmShBJCTbHoIqUg8CbWXd0YQmB3XXsVfWEMM4OwaLvJi9nHvEiDhiiCJUyrzQ23c/ZxzttFMaq5+V4+7///e3j4P4/UNfDGYJPX73hFSG/k45orXxsdbAVALmU0ULDJaU4qAVqVCXRhKdCUBGimhWbbNKocAwQSIv8nNgOkhYpLXeFixQQg8TmzH+MvuRAlADmhYJFyeHfcxy5/ZT7dyOvkaWxyrgCw5X+zicx2WaPf/ghVyvI21cLjWBs/Uxm2WXOgloORxjAFiiwVAgQSlUocv3aCcKKGpflP6KsBwiE/GBl2H/Bw7OwVsiaUbTSCgsG3nIPp7GHCwTGuV08x6S3jxd1LyKbOQuglgQe3SOv6xiPkIXNTnFGec6FhF+kvQXLLdupq9tFw8BDdXZ3Yy8uKAwCWZ/0kKxMMjaosmXXUNnfzbLwTV5XzH10hQJJACIzYIhO6m+E7D7lx3IO1SKvCGP/EI6lbWY9H8TTVFzWHw3Mb7cFvgrP2KCur37ncdxVTFKrevf/AyMiT4pu4t6mNnQ4342M+OjvamZmZRdM04vE4Pp+P3t4+2jvOI5W6Rj0RIfj0NrHIIgCuqj1oqSQ/onEGh+4xcNNbPAUAa4WDlmvDrC1MEpkPsZ6I4qx2c6T+FC3negD4BdjWw757j+xjAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMwKzAyOjAwtXWu6wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMMQoFlcAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous.u-strasbg.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.crous-strasbourg.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.crous-strasbourg.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.crous-strasbourg.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Strasbourg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Strasbourg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous.u-strasbg.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>serviceinfo@crous.u-strasbg.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.croydon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.croydon.ac.uk-shibboleth.xml
deleted file mode 100644
index e70a699a..00000000
--- a/swamid-interfederations-2.0/idp.croydon.ac.uk-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.croydon.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Croydon College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">croydon.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/croydon.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/croydon.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Croydon College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.croydon.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</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 b9ee2b38..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cs.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.cas.cz: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.cs.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.cas.cz/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">cs.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Computer Science Academy</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav informatiky AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Computer Science Academy of Sciences of the Czech Republic</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav informatiky AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ustavinformatiky.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ustavinformatiky.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cs.unicam.it-idp-shibboleth.xml
deleted file mode 100644
index b52b96e8..00000000
--- a/swamid-interfederations-2.0/idp.cs.unicam.it-idp-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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cs.unicam.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-09T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Camerino</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Camerino</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Camerino</mdui:Description>
-        <mdui:Description xml:lang="it">Università di Camerino</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://idp.cs.unicam.it/idp/idem.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idp.cs.unicam.it/idp/idem.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.cs.unicam.it/idp/images/logo-unicam-16x16.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="it">https://idp.cs.unicam.it/idp/images/logo-unicam-50x50.png</mdui:Logo>
-        <mdui:Logo height="80" width="60" xml:lang="it">https://idp.cs.unicam.it/idp/images/logo-unicam-80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicam.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEfDCCA2SgAwIBAgIRAOgs3+B31TERERfJASxzXvYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMjgwMDAwMDBaFw0xNjAxMjgyMzU5NTlaMFYxCzAJBgNV
-BAYTAklUMSwwKgYDVQQKDCNVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBDYW1l
-cmlubzEZMBcGA1UEAxMQaWRwLmNzLnVuaWNhbS5pdDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKT3N48e6nmcWjwBz3ePL+7tU5Nc+Lw26bQDeFWBSQvv
-kydsS1lXrgX3KOpQrRcPxJjGj9zGIjm7xtUVzWkPrrs31xOI32DJEwcXoGAE1xYu
-H2KiBJU0dOcBKFIzmG5gROYupg2nfFglw8c9UYon68ijwJyvrfJA5FVsDmHOV1ye
-UlL2xByb/+4xAObDcgh7Ch5o0Gftoo61whsrwmdUTtULdyYtxRXXrvVHn4+Kvhvb
-yOJTkO1FhqhYiZJg/pVqZE3oP7jm4juLJnyOgcCavCp6tUDG8PyDozO/pGf8TFUM
-AJZwhnDhGOVmDVmC1gAFKBip4S2U82x5//2UK+eiEgkCAwEAAaOCAWMwggFfMB8G
-A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR3pdAQO58E
-cxsg3VQr4ZHa5XCPGDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
-AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAu
-Y3MudW5pY2FtLml0MA0GCSqGSIb3DQEBBQUAA4IBAQC26PQ1dLZLbyh3ju1J09C4
-oiR0SmJPN/R4U7HDQyl4XEKe5mSuCgQoLPdcmmLQAMtoLZYOLA4IJKKcSF35wnU2
-vX0bR2tykCgLm2MHwX6FLICf29LV1FrfU4JkzK5MWEwgldsJgE7z3sSlmnXQG+Qb
-ZFZil9eNRDQZufyYoGXYjmgD7OeipgCkiehoAmEwCma9bh+0g6HKxx+Sq0Lu3HB8
-LY1z9p7iDg7if8hjoMenPCR4IZnwo/h2GMCUbwYa662rz47L0ljNySq+tc8XbAIw
-rDw7hsCAc6V/pEBg0fiRxhcmkoGuctH13pNHAPNBIu0IXOn4SQbSOAuD0As+SpR2
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.unicam.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.unicam.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cs.unicam.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cs.unicam.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cs.unicam.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cs.unicam.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicam.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEfDCCA2SgAwIBAgIRAOgs3+B31TERERfJASxzXvYwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzAxMjgwMDAwMDBaFw0xNjAxMjgyMzU5NTlaMFYxCzAJBgNV
-BAYTAklUMSwwKgYDVQQKDCNVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBDYW1l
-cmlubzEZMBcGA1UEAxMQaWRwLmNzLnVuaWNhbS5pdDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKT3N48e6nmcWjwBz3ePL+7tU5Nc+Lw26bQDeFWBSQvv
-kydsS1lXrgX3KOpQrRcPxJjGj9zGIjm7xtUVzWkPrrs31xOI32DJEwcXoGAE1xYu
-H2KiBJU0dOcBKFIzmG5gROYupg2nfFglw8c9UYon68ijwJyvrfJA5FVsDmHOV1ye
-UlL2xByb/+4xAObDcgh7Ch5o0Gftoo61whsrwmdUTtULdyYtxRXXrvVHn4+Kvhvb
-yOJTkO1FhqhYiZJg/pVqZE3oP7jm4juLJnyOgcCavCp6tUDG8PyDozO/pGf8TFUM
-AJZwhnDhGOVmDVmC1gAFKBip4S2U82x5//2UK+eiEgkCAwEAAaOCAWMwggFfMB8G
-A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBR3pdAQO58E
-cxsg3VQr4ZHa5XCPGDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
-AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAu
-Y3MudW5pY2FtLml0MA0GCSqGSIb3DQEBBQUAA4IBAQC26PQ1dLZLbyh3ju1J09C4
-oiR0SmJPN/R4U7HDQyl4XEKe5mSuCgQoLPdcmmLQAMtoLZYOLA4IJKKcSF35wnU2
-vX0bR2tykCgLm2MHwX6FLICf29LV1FrfU4JkzK5MWEwgldsJgE7z3sSlmnXQG+Qb
-ZFZil9eNRDQZufyYoGXYjmgD7OeipgCkiehoAmEwCma9bh+0g6HKxx+Sq0Lu3HB8
-LY1z9p7iDg7if8hjoMenPCR4IZnwo/h2GMCUbwYa662rz47L0ljNySq+tc8XbAIw
-rDw7hsCAc6V/pEBg0fiRxhcmkoGuctH13pNHAPNBIu0IXOn4SQbSOAuD0As+SpR2
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cs.unicam.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cs.unicam.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli studi di Camerino</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Camerino</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Camerino</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Camerino</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unicam.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unicam.it/international/welcome/index.asp</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:marco.maccari@unicam.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:support_idem@unicam.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 25dd1068..59a6027c 100644
--- a/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
@@ -1,40 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csc.fi/idp/shibboleth">
-  <md: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-support" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csc.fi</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">funet.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <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:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</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:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
+        <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
         <mdui:Logo height="16" width="16">https://idp.csc.fi/img/csc16.png</mdui:Logo>
-        <mdui:Logo height="256" width="256">https://idp.csc.fi/img/csc.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
         <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: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>
+      <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>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
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 e855d232..00000000
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ /dev/null
@@ -1,80 +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="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
-        <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</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:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</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:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEfTCCA2WgAwIBAgIQUB8GAq0UqrSAF/D1Yq57fDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTAxNTAwMDAwMFoXDTE2MTAxNDIzNTk1OVowODEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAuY3NjLmZp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt9O61taFpnXBLgpt9TIy
-9838XN93089o/ATNm9YxJkrX8hqpCNHUM3bzsEe/X7hKcT5xjVxTiwacHw8kYP2Y
-gVPz4HDLbL1wakiq2MvbQFmYvcEw8YsA3AbZWn/QlrOgbP+e81aaUCWq3emm1QBo
-qTCidlczNetoCU+LuuUjEvvqWZaiGSacAZ9qzl7U5MmH7TYt6AovSlVrWZnNagLF
-aaxQsSt9ccgkVfAXupCqvoSlF2VbuXWuK3GWEbELmR9LrSx5idX3JGnjIVjFOMYc
-eBDsJJHLaicsiBgL3imt9EulnoY+5ifuKr5HGFkQzcF1Qsq2y3lLFVv3whLTGio+
-bwIDAQABo4IBgzCCAX8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-HQYDVR0OBBYEFHtybSZjYQP+ZNnxCQbK8njRX51hMA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-dGVyZW5hLm9yZzAxBgNVHREEKjAoggppZHAuY3NjLmZpggxpZHAwMS5jc2MuZmmC
-DGlkcDAyLmNzYy5maTANBgkqhkiG9w0BAQUFAAOCAQEAJg8/vlHPhYOW/oVhdkjD
-mNbEA0B6WysVPHyZjjJ6MXnCioZYa0plsnQjvmcaB2BLgPBw95dsC+7/FS6/TCZW
-HLta5Z3ziwvfsIRtiVKRQLn2CgvZob3EBQVHZ+5DvFXTAptlMvvrmOV0XHhZIM2B
-Pg7pj5SpsgWOtHVlyyFD/mGUKSJymncWq310/CY1tQlwB1u40q23rIjYQEyurJRp
-s6fLXrTs0qcyA+Es3RBwbXfSEJqeXOm01K3Ys+JWUNzrg30P1z7zmx0M4nhqaI9N
-H3YX4fNdibt18KEE5w7rXmwJTJwwDxw3UHR3rAcu+PxREwAl22zTk2oSc7DLUMib
-Iw==</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.csp.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml
deleted file mode 100644
index 0183d03c..00000000
--- a/swamid-interfederations-2.0/idp.csp.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csp.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-12-10T10:15:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csp.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CSP - innovation in ICT</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">CSP - innovazione nelle ICT</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for users of CSP</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di CSP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.csp.it/federation/?lang=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.csp.it/federation/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.csp.it/federation/?lang=en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.csp.it/federation/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.csp.it/images/csp_logo_16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.csp.it/images/csp_logo_16x16.png</mdui:Logo>
-        <mdui:Logo height="80" width="80" xml:lang="en">https://idp.csp.it/images/csp_logo_80x80.png</mdui:Logo>
-        <mdui:Logo height="80" width="80" xml:lang="it">https://idp.csp.it/images/csp_logo_80x80.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiACCQCReOiXnCENdDANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQGEwJJ
-VDEPMA0GA1UECAwGSXRhbGlhMQ8wDQYDVQQHDAZUb3Jpbm8xGDAWBgNVBAoMD0NT
-UCBzLmMuIGEgci5sLjETMBEGA1UEAwwKaWRwLmNzcC5pdDAeFw0xNTA3MDYxMzQ2
-MDhaFw0xODA3MDUxMzQ2MDhaMF4xCzAJBgNVBAYTAklUMQ8wDQYDVQQIDAZJdGFs
-aWExDzANBgNVBAcMBlRvcmlubzEYMBYGA1UECgwPQ1NQIHMuYy4gYSByLmwuMRMw
-EQYDVQQDDAppZHAuY3NwLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArIW/22Capx4kczh11KT82mcGLfi1BuPougYP6oKQq3epldXn1Us0+cRw56Gc
-UymB4jEIANn5UGSDmJ/SXzUYp6LgLqkPde6+J/A4MgdrPPkh+kjpy8z31YwZuxhB
-8esHhyEg1uHNcv8VNnuM4iYd2cxTfY6TL/77brbFRmNMnSf45sQkn+sfgyDSuVuX
-dimwDm+yOZp7RbWRx/Mo3GQjc12ih2BGys61W/fGdd/prt2c6VMCEFkl+Y9yXPoa
-SX2kEapKh1uLl4ea/6FfmZjsSDf3tCTr9kh0S1dOcECmd1JVQgwaYCRwWAakOsXV
-N+WenSxWptcH64hvy+8cIXlQFwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCRfa2I
-1dqqVXmOJLggn+yccwJ4kPuKIhtcgjAXPpnYhi+sUF5g4iJc6CV0yUF/6X2Rz9Kb
-avKt3lL11Or1SLVbOvzDTGcNtTtGj32waeA7xsGYfWJi8sIght2AmQSfr9sDZs+k
-e0MTAMlaXSMdQWuxQYaYHG+Nv1nQtubovHInsCTXfOvKG59ANcHaW/dm/kqrQhu+
-ddapBkoj1jOH/wOkqr/5Z8+rD4KiZTlu1oePCR4VgmbvF7evBmbYt+QpFqDb+2ZI
-7XS6kqWgiX9aEs7nTyB8lEeaDCEIj5VaMc7LfBiJ/d5sPf5mr7wtxsfuQgZh8Sli
-lLa8jXRZC5nmEmQd
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csp.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it: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.csp.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csp.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.csp.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csp.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csp.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiACCQCReOiXnCENdDANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQGEwJJ
-VDEPMA0GA1UECAwGSXRhbGlhMQ8wDQYDVQQHDAZUb3Jpbm8xGDAWBgNVBAoMD0NT
-UCBzLmMuIGEgci5sLjETMBEGA1UEAwwKaWRwLmNzcC5pdDAeFw0xNTA3MDYxMzQ2
-MDhaFw0xODA3MDUxMzQ2MDhaMF4xCzAJBgNVBAYTAklUMQ8wDQYDVQQIDAZJdGFs
-aWExDzANBgNVBAcMBlRvcmlubzEYMBYGA1UECgwPQ1NQIHMuYy4gYSByLmwuMRMw
-EQYDVQQDDAppZHAuY3NwLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArIW/22Capx4kczh11KT82mcGLfi1BuPougYP6oKQq3epldXn1Us0+cRw56Gc
-UymB4jEIANn5UGSDmJ/SXzUYp6LgLqkPde6+J/A4MgdrPPkh+kjpy8z31YwZuxhB
-8esHhyEg1uHNcv8VNnuM4iYd2cxTfY6TL/77brbFRmNMnSf45sQkn+sfgyDSuVuX
-dimwDm+yOZp7RbWRx/Mo3GQjc12ih2BGys61W/fGdd/prt2c6VMCEFkl+Y9yXPoa
-SX2kEapKh1uLl4ea/6FfmZjsSDf3tCTr9kh0S1dOcECmd1JVQgwaYCRwWAakOsXV
-N+WenSxWptcH64hvy+8cIXlQFwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCRfa2I
-1dqqVXmOJLggn+yccwJ4kPuKIhtcgjAXPpnYhi+sUF5g4iJc6CV0yUF/6X2Rz9Kb
-avKt3lL11Or1SLVbOvzDTGcNtTtGj32waeA7xsGYfWJi8sIght2AmQSfr9sDZs+k
-e0MTAMlaXSMdQWuxQYaYHG+Nv1nQtubovHInsCTXfOvKG59ANcHaW/dm/kqrQhu+
-ddapBkoj1jOH/wOkqr/5Z8+rD4KiZTlu1oePCR4VgmbvF7evBmbYt+QpFqDb+2ZI
-7XS6kqWgiX9aEs7nTyB8lEeaDCEIj5VaMc7LfBiJ/d5sPf5mr7wtxsfuQgZh8Sli
-lLa8jXRZC5nmEmQd
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csp.it:8443/idp/profile/SAML1/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="it">CSP - innovazione nelle ICT</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSP - innovation in ICT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">CSP - innovazione nelle ICT</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSP - innovation in ICT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.csp.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csp.it/?lang=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:info-idem@csp.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml b/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml
deleted file mode 100644
index 8fff762b..00000000
--- a/swamid-interfederations-2.0/idp.csp.it-sp-shibboleth.xml
+++ /dev/null
@@ -1,84 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.csp.it/sp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-01-02T14:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://idp.csp.it/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">WiFi Tower CSP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">WiFi Tower CSP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Access to WiFi Tower provided by CSP</mdui:Description>
-        <mdui:Description xml:lang="it">Accesso alla rete WiFi Tower erogata da CSP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.csp.it/federation/?lang=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.csp.it/federation/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.csp.it/federation/?lang=en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.csp.it/federation/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.csp.it/images/csp_logo_16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.csp.it/images/csp_logo_16x16.png</mdui:Logo>
-        <mdui:Logo height="80" width="80" xml:lang="en">https://idp.csp.it/images/csp_logo_80x80.png</mdui:Logo>
-        <mdui:Logo height="80" width="80" xml:lang="it">https://idp.csp.it/images/csp_logo_80x80.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC0DCCAbigAwIBAgIJAMxj7o7FT11OMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
-BAMTA2lkcDAeFw0xMzAyMjUxMDEwNTBaFw0yMzAyMjMxMDEwNTBaMA4xDDAKBgNV
-BAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBf7mmx56i5
-D21+iW0FYxVaZtRjZiWsP7+1OgDXYoFFCw6I3d3IyBw/w2l248/SHFA8Tb3R8rn7
-yjY/3X1KHfR/tjiJql9WuW1S++2jfhTWMc1BZaf2oKseBaFHWSMJ9wnnCU64P6GX
-ssxauRpLXT6Yv1kAINnHqmaP1MsN5Y4TL5hGK2g764gLjXNqv1+rUMhqIs5o3Owx
-utg/xEiqZY1pOrP385b+JTzg4Cv5fuGC/b3+nq490paML9R5URQVHErpL8tSFcwr
-mnq8ymoghRXgsQ70O+1EAt1HTJc/oKwKVxtuR+5uXvBPPU1s777WH1iB0U6pZdAf
-+/qitsavsCUCAwEAAaMxMC8wDgYDVR0RBAcwBYIDaWRwMB0GA1UdDgQWBBT9zbqw
-THojBpjCsQhOhg2kIPzj5DANBgkqhkiG9w0BAQUFAAOCAQEAYUg98pUGUlGri0H0
-ZO8UEtMpd+6QRXZp0JYYz5JFBtFEVIW8pcr7VIB2THSJGFnttpQKBDy6/TedQcsf
-5Bz1hVAOL8R5UG5GcRhxZ+trh9XcdBls7dCXRgLaZIi0FJgxGjZXObvrjVxggGv9
-rHrgSt0DmAux/xTmzgorGgor6Fue9O0/q+PyMuoUBOzZ3sSldkh09CA1f96mBu3f
-bQLibp8moXN3SjxRvqufUJIgFeh/JoonndDaC3k6tQRbGXxQnDXa/RoDSDwSyRsE
-EkfeWh8XDP1T2B4AiP38KYZRsfnOi+jtS2Q44doZpNfQk+LFbBhh5V74LeKTaDE3
-LcBp9w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csp.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csp.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csp.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.csp.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csp.it/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.csp.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.csp.it/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idp.csp.it/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.csp.it/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idp.csp.it/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">WiFi Tower CSP</md:ServiceName>
-      <md:ServiceName xml:lang="it">WiFi Tower CSP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Access to WiFi Tower provided by CSP</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Accesso alla rete WiFi Tower erogata da CSP</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="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="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">CSP - innovazione nelle ICT</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSP - innovation in ICT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">WiFi Tower erogata da CSP</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">WiFi Tower provided by CSP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.csp.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csp.it/?lang=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>System</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:info-idem@csp.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cssd.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.cssd.ac.uk-shibboleth.xml
deleted file mode 100644
index 0eb6ea4e..00000000
--- a/swamid-interfederations-2.0/idp.cssd.ac.uk-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.cssd.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for The Royal Central School of Speech and Drama.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">cssd.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/cssd.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/cssd.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Central School of Speech and Drama</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cssd.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csudh.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csudh.edu-idp-shibboleth.xml
deleted file mode 100644
index 47df1a1b..00000000
--- a/swamid-interfederations-2.0/idp.csudh.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +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://idp.csudh.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">csudh.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Dominguez Hills</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>
-MIIFizCCBHOgAwIBAgICAm0wDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MDgxMDE3NTMxNFoXDTExMDgx
-MTE3NTMxNFowGDEWMBQGA1UEAxMNaWRwLmNzdWRoLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKfAyfjcPsk/7da74lfelxUZZ8sHUsakoVd+94TL
-T53OzSsZrCz0GgH1ECzYbYrojfv6L3dZmBCwJzssmK0sziUTyoxPT1/IwpG1Nfmn
-V7UKCZcDVB3FCUkjdjhp9gnmfRHHF3GOp2PbLM23gAqKJasKyAPBrvIE0YEr1vnN
-8KPI36lPmDkZ+poY70RGLt4oT72Ezzt7muvUQrTc/KEG4BbhUCzcJegVIQvMLMu8
-PgHwB2Qc2riUSDUkL3ZXzGunHEsdvGGLmBF1DyVa2T8lDAfW6rhFqewSo7IzWQtN
-QbqsJ4jX8f7DSYGHbphcVLgd/5NrDr7KeMgBIUMwnrgROBsCAwEAAaOCAp8wggKb
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUwqZaeiLSv2CSUIBYNHS6xPRSkIUwfgYD
-VR0jBHcwdYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVT
-MRwwGgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1v
-biBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIBADCBsgYIKwYBBQUHAQEEgaUwgaIw
-TwYIKwYBBQUHMAKGQ2h0dHA6Ly9pbmNvbW1vbmNhMS5pbmNvbW1vbmZlZGVyYXRp
-b24ub3JnL2JyaWRnZS9jZXJ0cy9jYS1jZXJ0cy5wN2IwTwYIKwYBBQUHMAKGQ2h0
-dHA6Ly9pbmNvbW1vbmNhMi5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2JyaWRnZS9j
-ZXJ0cy9jYS1jZXJ0cy5wN2IwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDovL2lu
-Y29tbW9uY3JsMS5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2NybC9lZWNybHMuY3Js
-MD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwyLmluY29tbW9uZmVkZXJhdGlvbi5v
-cmcvY3JsL2VlY3Jscy5jcmwwXgYDVR0gBFcwVTBTBgsrBgEEAa4jAQQBATBEMEIG
-CCsGAQUFBwIBFjZodHRwOi8vaW5jb21tb25jYS5pbmNvbW1vbmZlZGVyYXRpb24u
-b3JnL3ByYWN0aWNlcy5wZGYwGAYDVR0RBBEwD4INaWRwLmNzdWRoLmVkdTANBgkq
-hkiG9w0BAQUFAAOCAQEAIJVMQA/nHK/g2Cl2Q18Es9TZYwOX9uT7IvoTwIFl/Yq0
-untwsTmtPA2R6nEm5vl57Un0Fx3ngOg5UcKeMc9mV/uRrm2E9ODRZzynYEn4H54p
-2O3C2zN0oVniMjcvVh390EykGYIFNazPvKpl2SYSFALALW5meas8K3vFus71oqu+
-r3cf52wnQAsbE5cXL4Mf9wDvAFOlK+pgkstgJvpibk/JfUesgSCvmZwGyrQGK1lR
-0wPmWZthqEjNQhZ6UVb1sSFijfYNnsrPZS+xujaKqzJrSXLR09VtAUYPuP20PY/N
-YzlLClhgY9axf7qCtv/2rUKxME2tnK8GLNnGXGkvTg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csudh.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csudh.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.csudh.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csudh.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csudh.edu/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">csudh.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFizCCBHOgAwIBAgICAm0wDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MDgxMDE3NTMxNFoXDTExMDgx
-MTE3NTMxNFowGDEWMBQGA1UEAxMNaWRwLmNzdWRoLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKfAyfjcPsk/7da74lfelxUZZ8sHUsakoVd+94TL
-T53OzSsZrCz0GgH1ECzYbYrojfv6L3dZmBCwJzssmK0sziUTyoxPT1/IwpG1Nfmn
-V7UKCZcDVB3FCUkjdjhp9gnmfRHHF3GOp2PbLM23gAqKJasKyAPBrvIE0YEr1vnN
-8KPI36lPmDkZ+poY70RGLt4oT72Ezzt7muvUQrTc/KEG4BbhUCzcJegVIQvMLMu8
-PgHwB2Qc2riUSDUkL3ZXzGunHEsdvGGLmBF1DyVa2T8lDAfW6rhFqewSo7IzWQtN
-QbqsJ4jX8f7DSYGHbphcVLgd/5NrDr7KeMgBIUMwnrgROBsCAwEAAaOCAp8wggKb
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUwqZaeiLSv2CSUIBYNHS6xPRSkIUwfgYD
-VR0jBHcwdYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVT
-MRwwGgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1v
-biBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIBADCBsgYIKwYBBQUHAQEEgaUwgaIw
-TwYIKwYBBQUHMAKGQ2h0dHA6Ly9pbmNvbW1vbmNhMS5pbmNvbW1vbmZlZGVyYXRp
-b24ub3JnL2JyaWRnZS9jZXJ0cy9jYS1jZXJ0cy5wN2IwTwYIKwYBBQUHMAKGQ2h0
-dHA6Ly9pbmNvbW1vbmNhMi5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2JyaWRnZS9j
-ZXJ0cy9jYS1jZXJ0cy5wN2IwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDovL2lu
-Y29tbW9uY3JsMS5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2NybC9lZWNybHMuY3Js
-MD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwyLmluY29tbW9uZmVkZXJhdGlvbi5v
-cmcvY3JsL2VlY3Jscy5jcmwwXgYDVR0gBFcwVTBTBgsrBgEEAa4jAQQBATBEMEIG
-CCsGAQUFBwIBFjZodHRwOi8vaW5jb21tb25jYS5pbmNvbW1vbmZlZGVyYXRpb24u
-b3JnL3ByYWN0aWNlcy5wZGYwGAYDVR0RBBEwD4INaWRwLmNzdWRoLmVkdTANBgkq
-hkiG9w0BAQUFAAOCAQEAIJVMQA/nHK/g2Cl2Q18Es9TZYwOX9uT7IvoTwIFl/Yq0
-untwsTmtPA2R6nEm5vl57Un0Fx3ngOg5UcKeMc9mV/uRrm2E9ODRZzynYEn4H54p
-2O3C2zN0oVniMjcvVh390EykGYIFNazPvKpl2SYSFALALW5meas8K3vFus71oqu+
-r3cf52wnQAsbE5cXL4Mf9wDvAFOlK+pgkstgJvpibk/JfUesgSCvmZwGyrQGK1lR
-0wPmWZthqEjNQhZ6UVb1sSFijfYNnsrPZS+xujaKqzJrSXLR09VtAUYPuP20PY/N
-YzlLClhgY9axf7qCtv/2rUKxME2tnK8GLNnGXGkvTg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csudh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csudh.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Dominguez Hills</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Dominguez Hills</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.csudh.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Edgar Lazarian</md:GivenName>
-    <md:EmailAddress>elazarian@csudh.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csus.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csus.edu-idp-shibboleth.xml
deleted file mode 100644
index 9df731c6..00000000
--- a/swamid-interfederations-2.0/idp.csus.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,167 +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://idp.csus.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.csus.edu/idp/error.jsp" 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">csus.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Sacramento</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>
-MIIFiTCCBHGgAwIBAgICAp8wDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MTAxMzE3NTkwOFoXDTExMTAx
-NDE3NTkwOFowFzEVMBMGA1UEAxMMaWRwLmNzdXMuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAsK3s8yjwINisx1tBv8/BaXvdawmKEnpOzAkz5G8H
-cca8nP1Rlp+tSXFTcnm8fdMj10TO1XLNbF6xOYtFXZ2pZykRz6tBeM4cxNUPLafP
-YQTCkKRZ7OXXqhacnZ7X2nUl+6JZYZpNAAjAl5pX0jznXCltQzHUx0DCE4z0CTny
-mVQ+6Q9Ou2w4giJEVEtgFvtUZFccxBM7ifV376GeRQKz83OMwWcvQZNvbHthbxc/
-1+Xhv4XgJhYMqXHYNG5Fkg4rX/dAsQHff4Ncdh+cCjGSzCQvxvKZNENFIwPPV2Cw
-1LXJEGy5R8dnG5KTZ9pmoF6whN7+70GUBxUJ3ENsiBqvvQIDAQABo4ICnjCCApow
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMB0GA1UdDgQWBBQA+XJi1NGtvakAmNAlHsMDqC2G7jB+BgNV
-HSMEdzB1gBSTLchhGK1j45tls53djZO658pjRaFapFgwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMIGyBggrBgEFBQcBAQSBpTCBojBP
-BggrBgEFBQcwAoZDaHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlv
-bi5vcmcvYnJpZGdlL2NlcnRzL2NhLWNlcnRzLnA3YjBPBggrBgEFBQcwAoZDaHR0
-cDovL2luY29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2Nl
-cnRzL2NhLWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5j
-b21tb25jcmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmww
-P6A9oDuGOWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9y
-Zy9jcmwvZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYI
-KwYBBQUHAgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5v
-cmcvcHJhY3RpY2VzLnBkZjAXBgNVHREEEDAOggxpZHAuY3N1cy5lZHUwDQYJKoZI
-hvcNAQEFBQADggEBAFglriksNFsyek2Q8Cmtkr98MAVA7Hw9IcNkoZ8d886nPcud
-ATOziI1uHF/eavbd0n7voFgk3zOTnNTPpGKdiFvhqCx4PvsRm4UFuKcrU1Pl1OoY
-KivxKK2xGYlmJDEqbLu+k8Puta1AGfMNJq54xdv8bTKJMkxlR8ATJA7DlJd2YYy1
-0KLNf6rTBgNvL4EndNGD7sUHXyGsNea7ERSdYhP1VbC703V6dn6Qinhm2qwthgm3
-ehMZ8k1NjYWDUUWO3GzrWr0L7ay9XgMSr6/5A3L2IVBaaPbhC2/XAVAl+YLpqaDw
-ZGqHp4D/LP3T5x1Tr5iE1zNrNAVeaetMeqA2PGI=
-          </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>
-MIIDKTCCAhGgAwIBAgIJAIrcLAZd2tlUMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC5jc3VzLmVkdTAeFw0xMTEwMTExNTU1MzBaFw0yMTEwMDgxNTU1MzBa
-MBcxFTATBgNVBAMTDGlkcC5jc3VzLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAM62rDQa6qRVEXoqEm+kWeFInc5oACzU5pJqkKxEmKizZ8P/Y8aB
-/w2vWzFoWWefNPb/zrg6wijOb6FAbTJe/zBexa+JibUg1uk4BlfOmebWvCIoOhRx
-U7GfR5czHcsiGyzIiwGCchBOIIAsUYtVdT1VNzybetbaKSTTEe/N2+otM76EBGl0
-N95X5LdUxRYydteqIl8hmLrCP06WjGjIukIjQcMgNomRckFedyGHgywYU30Mo9Tm
-CYz/pbiQDQbJPgFjDmbOd4iYsyzdJpE8pbsaEJZ1XcNgxe5Y9BOoexLp0+/Bvebm
-uanwRiy+/THhIqQ38mMKaNjRbzyNJgDl3KsCAwEAAaN4MHYwHQYDVR0OBBYEFPYi
-UhafxN4O1ADU9mFoKPAep57OMEcGA1UdIwRAMD6AFPYiUhafxN4O1ADU9mFoKPAe
-p57OoRukGTAXMRUwEwYDVQQDEwxpZHAuY3N1cy5lZHWCCQCK3CwGXdrZVDAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAgV3TIJrLbxLn7Df0pWdX3ODHq
-3xLyeurA/QtVE9Xp+x98wi6HfTljnSYRlL3PrQdSpELh7D0T18BUgzBhGATQ7g5m
-H8nxcCMsKC75SYnQSBspuosDBSrcpfV8wfHpcEOiqUIYPg/9kzbu79YzQr/2W61N
-fIctPqr43IlDuZqDDWbbCOPti49oTcMGDeVHJPfR6o2kGeM8qo+uQlHpU030mjtR
-Lgbeue9s2vlzQoPbAW2ZIjMtxkSztb4dXEiDz6jBf788NVKCfeKrL52TMF1kT/NM
-A4DxizdeC1TEfLUgq0gDwe8XIYYldlIDI2XAwlm69GmSAVWtw91I4TbeJGJT
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csus.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csus.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csus.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.csus.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csus.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.csus.edu/idp/profile/Shibboleth/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">csus.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFiTCCBHGgAwIBAgICAp8wDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MTAxMzE3NTkwOFoXDTExMTAx
-NDE3NTkwOFowFzEVMBMGA1UEAxMMaWRwLmNzdXMuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAsK3s8yjwINisx1tBv8/BaXvdawmKEnpOzAkz5G8H
-cca8nP1Rlp+tSXFTcnm8fdMj10TO1XLNbF6xOYtFXZ2pZykRz6tBeM4cxNUPLafP
-YQTCkKRZ7OXXqhacnZ7X2nUl+6JZYZpNAAjAl5pX0jznXCltQzHUx0DCE4z0CTny
-mVQ+6Q9Ou2w4giJEVEtgFvtUZFccxBM7ifV376GeRQKz83OMwWcvQZNvbHthbxc/
-1+Xhv4XgJhYMqXHYNG5Fkg4rX/dAsQHff4Ncdh+cCjGSzCQvxvKZNENFIwPPV2Cw
-1LXJEGy5R8dnG5KTZ9pmoF6whN7+70GUBxUJ3ENsiBqvvQIDAQABo4ICnjCCApow
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMB0GA1UdDgQWBBQA+XJi1NGtvakAmNAlHsMDqC2G7jB+BgNV
-HSMEdzB1gBSTLchhGK1j45tls53djZO658pjRaFapFgwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMIGyBggrBgEFBQcBAQSBpTCBojBP
-BggrBgEFBQcwAoZDaHR0cDovL2luY29tbW9uY2ExLmluY29tbW9uZmVkZXJhdGlv
-bi5vcmcvYnJpZGdlL2NlcnRzL2NhLWNlcnRzLnA3YjBPBggrBgEFBQcwAoZDaHR0
-cDovL2luY29tbW9uY2EyLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvYnJpZGdlL2Nl
-cnRzL2NhLWNlcnRzLnA3YjCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vaW5j
-b21tb25jcmwxLmluY29tbW9uZmVkZXJhdGlvbi5vcmcvY3JsL2VlY3Jscy5jcmww
-P6A9oDuGOWh0dHA6Ly9pbmNvbW1vbmNybDIuaW5jb21tb25mZWRlcmF0aW9uLm9y
-Zy9jcmwvZWVjcmxzLmNybDBeBgNVHSAEVzBVMFMGCysGAQQBriMBBAEBMEQwQgYI
-KwYBBQUHAgEWNmh0dHA6Ly9pbmNvbW1vbmNhLmluY29tbW9uZmVkZXJhdGlvbi5v
-cmcvcHJhY3RpY2VzLnBkZjAXBgNVHREEEDAOggxpZHAuY3N1cy5lZHUwDQYJKoZI
-hvcNAQEFBQADggEBAFglriksNFsyek2Q8Cmtkr98MAVA7Hw9IcNkoZ8d886nPcud
-ATOziI1uHF/eavbd0n7voFgk3zOTnNTPpGKdiFvhqCx4PvsRm4UFuKcrU1Pl1OoY
-KivxKK2xGYlmJDEqbLu+k8Puta1AGfMNJq54xdv8bTKJMkxlR8ATJA7DlJd2YYy1
-0KLNf6rTBgNvL4EndNGD7sUHXyGsNea7ERSdYhP1VbC703V6dn6Qinhm2qwthgm3
-ehMZ8k1NjYWDUUWO3GzrWr0L7ay9XgMSr6/5A3L2IVBaaPbhC2/XAVAl+YLpqaDw
-ZGqHp4D/LP3T5x1Tr5iE1zNrNAVeaetMeqA2PGI=
-          </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>
-MIIDKTCCAhGgAwIBAgIJAIrcLAZd2tlUMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC5jc3VzLmVkdTAeFw0xMTEwMTExNTU1MzBaFw0yMTEwMDgxNTU1MzBa
-MBcxFTATBgNVBAMTDGlkcC5jc3VzLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAM62rDQa6qRVEXoqEm+kWeFInc5oACzU5pJqkKxEmKizZ8P/Y8aB
-/w2vWzFoWWefNPb/zrg6wijOb6FAbTJe/zBexa+JibUg1uk4BlfOmebWvCIoOhRx
-U7GfR5czHcsiGyzIiwGCchBOIIAsUYtVdT1VNzybetbaKSTTEe/N2+otM76EBGl0
-N95X5LdUxRYydteqIl8hmLrCP06WjGjIukIjQcMgNomRckFedyGHgywYU30Mo9Tm
-CYz/pbiQDQbJPgFjDmbOd4iYsyzdJpE8pbsaEJZ1XcNgxe5Y9BOoexLp0+/Bvebm
-uanwRiy+/THhIqQ38mMKaNjRbzyNJgDl3KsCAwEAAaN4MHYwHQYDVR0OBBYEFPYi
-UhafxN4O1ADU9mFoKPAep57OMEcGA1UdIwRAMD6AFPYiUhafxN4O1ADU9mFoKPAe
-p57OoRukGTAXMRUwEwYDVQQDEwxpZHAuY3N1cy5lZHWCCQCK3CwGXdrZVDAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAgV3TIJrLbxLn7Df0pWdX3ODHq
-3xLyeurA/QtVE9Xp+x98wi6HfTljnSYRlL3PrQdSpELh7D0T18BUgzBhGATQ7g5m
-H8nxcCMsKC75SYnQSBspuosDBSrcpfV8wfHpcEOiqUIYPg/9kzbu79YzQr/2W61N
-fIctPqr43IlDuZqDDWbbCOPti49oTcMGDeVHJPfR6o2kGeM8qo+uQlHpU030mjtR
-Lgbeue9s2vlzQoPbAW2ZIjMtxkSztb4dXEiDz6jBf788NVKCfeKrL52TMF1kT/NM
-A4DxizdeC1TEfLUgq0gDwe8XIYYldlIDI2XAwlm69GmSAVWtw91I4TbeJGJT
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csus.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csus.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Sacramento</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Sacramento</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.csus.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Brennan Pike</md:GivenName>
-    <md:EmailAddress>idm@csus.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csusb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csusb.edu-idp-shibboleth.xml
deleted file mode 100644
index 934fec3f..00000000
--- a/swamid-interfederations-2.0/idp.csusb.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,83 +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://idp.csusb.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">csusb.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, San Bernardino</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://iam.csusb.edu/incommon/incommonpop.pdf</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://iam.csusb.edu/incommon/incommonpop.pdf</mdui:PrivacyStatementURL>
-        <mdui:Logo height="90" width="217" xml:lang="en">https://www.csusb.edu/banner/Content/images/csusb_logo.gif</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>
-MIIFkzCCBHugAwIBAgIJAPhN/M4Uk+9nMA0GCSqGSIb3DQEBBQUAMIHgMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEXMBUGA1UEBxMOU2FuIEJlcm5h
-cmRpbm8xNDAyBgNVBAoTK0NhbGlmb3JuaWEgU3RhdGUgVW5pdmVyc2l0eSwgU2Fu
-IEJlcm5hcmRpbm8xKjAoBgNVBAsTIUFkbWluaXN0cmF0aXZlIENvbXB1dGluZyBT
-ZXJ2aWNlczEWMBQGA1UEAxMNaWRwLmNzdXNiLmVkdTEpMCcGCSqGSIb3DQEJARYa
-aWRlbnRpdHktbWFuYWdlckBjc3VzYi5lZHUwHhcNMTIxMTE0MjI0MDExWhcNMzIx
-MTE0MjI0MDExWjCB4DELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWEx
-FzAVBgNVBAcTDlNhbiBCZXJuYXJkaW5vMTQwMgYDVQQKEytDYWxpZm9ybmlhIFN0
-YXRlIFVuaXZlcnNpdHksIFNhbiBCZXJuYXJkaW5vMSowKAYDVQQLEyFBZG1pbmlz
-dHJhdGl2ZSBDb21wdXRpbmcgU2VydmljZXMxFjAUBgNVBAMTDWlkcC5jc3VzYi5l
-ZHUxKTAnBgkqhkiG9w0BCQEWGmlkZW50aXR5LW1hbmFnZXJAY3N1c2IuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwASlG0zGEhefU6EcBIVgws1b
-NQv5xBQVw36JiG39KaG3gZIfI1yfLCeb+mzVsa2QKIGYI21wORqPZY7u6x/3OXJY
-ZW/1yUmiLAjrL6WkbUBiCORHTH7J051K2eSLaVs6MkgZg1udSfp3mdtmdw3vH0WU
-F5dPndb9FFlFGtqV5ijebO82ZuH2nWrLyBGIQBqOvBg4YGsofHM497ya97ft12Ys
-hGzrOsTnAMvqKbCFSbs2YqCf7iZU2DRHpNUAL81naXXNPUYyMKRKg9IUzmxYeURb
-fhI9yKBjMi7Ofy/KKc9N7AkEkw+4afQi1fdg1raoasxwP3xG62T1GtOvKxMpHwID
-AQABo4IBTDCCAUgwHQYDVR0OBBYEFLttuA7qJP91mlhzWHiqhgjhQExZMIIBFwYD
-VR0jBIIBDjCCAQqAFLttuA7qJP91mlhzWHiqhgjhQExZoYHmpIHjMIHgMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEXMBUGA1UEBxMOU2FuIEJlcm5h
-cmRpbm8xNDAyBgNVBAoTK0NhbGlmb3JuaWEgU3RhdGUgVW5pdmVyc2l0eSwgU2Fu
-IEJlcm5hcmRpbm8xKjAoBgNVBAsTIUFkbWluaXN0cmF0aXZlIENvbXB1dGluZyBT
-ZXJ2aWNlczEWMBQGA1UEAxMNaWRwLmNzdXNiLmVkdTEpMCcGCSqGSIb3DQEJARYa
-aWRlbnRpdHktbWFuYWdlckBjc3VzYi5lZHWCCQD4TfzOFJPvZzAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBp8IvcE30f2QPx1Bkh1e1H/+oTLN/IlrSb
-+mpztwDX/2RBk0ScKtkOWpA3nJlByEZYA7vJtpDXY36RlLXM7CGWxTJ5g7izpLnE
-9A4XyoMAvYB+i3mOPI9ZtrL3+Wh8cBe7rAAoMDa8n2h0wdLIV12fYYJFwIW0fg72
-juBt2YirtWhAUY+HR7ApLdlvKKg+gTLxX2YOToR6645jofAzpXXWynvhRyd76W/6
-pT7OwkmgJuWT3ilNr4cBTgzYppu+5OftV+9J6h/5BKs+ovA5VpgYx5EymV1WuEdO
-CgPX+7AgL/9d4y21rvonsHXhSYZ+t5WcwEQI8J4uaWuNeLPDSUFJ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csusb.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csusb.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, San Bernardino</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, San Bernardino</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.csusb.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Javier Torner</md:GivenName>
-    <md:EmailAddress>jtorner@csusb.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sunny Lin</md:GivenName>
-    <md:EmailAddress>slin@csusb.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>James Macdonell</md:GivenName>
-    <md:EmailAddress>jmacdone@csusb.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Lenora Rogers</md:GivenName>
-    <md:EmailAddress>lenora@csusb.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.csusm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.csusm.edu-idp-shibboleth.xml
deleted file mode 100644
index e1654549..00000000
--- a/swamid-interfederations-2.0/idp.csusm.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +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://idp.csusm.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">csusm.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, San Marcos</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>
-MIIDHzCCAgegAwIBAgIURBObONYB1aVZUkchbN9Vm7i8Il4wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLmNzdXNtLmVkdTAeFw0wOTA4MjQxNzQ1MDZaFw0y
-OTA4MjQxNzQ1MDZaMBgxFjAUBgNVBAMTDWlkcC5jc3VzbS5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNxuYDajoiDXTQ4TvPcWGZy167mRRwlH1i
-rfxHV90o0XHKoL/FTJ3sh/Zj7S/7bCTPVB8mEXmIeTfGURUkwM8dSVeVLpX3j8jz
-DdtVhEGBxQUPtZsQPWt7vP+mk+w5t85nA8ShbKmvPNVS1kFBfb9+EYVVBwaN8aXH
-f0jXKVnt041DxOAXWGz958SaIetTVqa/P6XsBz6E9heulp3CgXSBLBlBQ/EKYcPz
-+NtLYG5iKbH9u6ka3zfTbefsZ1W/7fe8j416TgZdgUaKN7GNsgU9O/jCqHkGVURt
-pN9/rtkN0feQhpcW8ZKWN727zmqbUIka6kPA8N0h8IVEMpgvzYCTAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5jc3VzbS5lZHWGJGh0dHBzOi8vaWRwLmNzdXNtLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUUWLdnhv2ZxtBMXDDAlaFWeDgDaYw
-DQYJKoZIhvcNAQEFBQADggEBAEuAj7CnXZppeRZ149EiZ4T54Gq6GNlIFzWfoD8Z
-sxiIOxcJbM/lJ9rXGtHwV5RE1cxNXncLMfA7XAtDoRtHIDQ+KL0JEd7hqjZFz2/1
-jNXMxjNO8oQnTEqtwuo6yH8fKuAxHGAoLK1/ZXOC4MV4Gj265hhR2vUOp7WzRWKk
-IUnVPqjV3HQd+eTL4yQQM1s4NANaMsCoQ/u0C/j5C92ERrYmKZ3axgVh5iuEMcRI
-noZH8nkxLFKIpQhm5kJlWq5YOKrdyTUF9lF7lD3YqacBcK/gctKBxbAmHwPqn2kc
-erUVBDmnMbYvO+WkO29HAl4Q0MbsXjQOm0C8cdFfI7gnehE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csusm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csusm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.csusm.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.csusm.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csusm.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.csusm.edu/idp/profile/Shibboleth/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">csusm.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIURBObONYB1aVZUkchbN9Vm7i8Il4wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLmNzdXNtLmVkdTAeFw0wOTA4MjQxNzQ1MDZaFw0y
-OTA4MjQxNzQ1MDZaMBgxFjAUBgNVBAMTDWlkcC5jc3VzbS5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNxuYDajoiDXTQ4TvPcWGZy167mRRwlH1i
-rfxHV90o0XHKoL/FTJ3sh/Zj7S/7bCTPVB8mEXmIeTfGURUkwM8dSVeVLpX3j8jz
-DdtVhEGBxQUPtZsQPWt7vP+mk+w5t85nA8ShbKmvPNVS1kFBfb9+EYVVBwaN8aXH
-f0jXKVnt041DxOAXWGz958SaIetTVqa/P6XsBz6E9heulp3CgXSBLBlBQ/EKYcPz
-+NtLYG5iKbH9u6ka3zfTbefsZ1W/7fe8j416TgZdgUaKN7GNsgU9O/jCqHkGVURt
-pN9/rtkN0feQhpcW8ZKWN727zmqbUIka6kPA8N0h8IVEMpgvzYCTAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC5jc3VzbS5lZHWGJGh0dHBzOi8vaWRwLmNzdXNtLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUUWLdnhv2ZxtBMXDDAlaFWeDgDaYw
-DQYJKoZIhvcNAQEFBQADggEBAEuAj7CnXZppeRZ149EiZ4T54Gq6GNlIFzWfoD8Z
-sxiIOxcJbM/lJ9rXGtHwV5RE1cxNXncLMfA7XAtDoRtHIDQ+KL0JEd7hqjZFz2/1
-jNXMxjNO8oQnTEqtwuo6yH8fKuAxHGAoLK1/ZXOC4MV4Gj265hhR2vUOp7WzRWKk
-IUnVPqjV3HQd+eTL4yQQM1s4NANaMsCoQ/u0C/j5C92ERrYmKZ3axgVh5iuEMcRI
-noZH8nkxLFKIpQhm5kJlWq5YOKrdyTUF9lF7lD3YqacBcK/gctKBxbAmHwPqn2kc
-erUVBDmnMbYvO+WkO29HAl4Q0MbsXjQOm0C8cdFfI7gnehE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.csusm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.csusm.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, San Marcos</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, San Marcos</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.csusm.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>April Grommo</md:GivenName>
-    <md:EmailAddress>agrommo@csusm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Diane Petersen</md:GivenName>
-    <md:EmailAddress>kai@csusm.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml
deleted file mode 100644
index ed84e697..00000000
--- a/swamid-interfederations-2.0/idp.cti.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cti.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cti.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CTI "Diophantus"</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Computer Technology Institute and Press "Diophantus"</mdui:Description>
-        <mdui:DisplayName xml:lang="el">ΙΤΥΕ "Διόφαντος"</mdui:DisplayName>
-        <mdui:Description xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος"</mdui:Description>
-        <mdui:Logo height="71" width="87" xml:lang="en">https://idp.cti.gr/cti_en_logo_80x71.png</mdui:Logo>
-        <mdui:Logo height="71" width="87" xml:lang="el">https://idp.cti.gr/cti_en_logo_80x71.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>cti.gr</mdui:DomainHint>
-        <mdui:IPHint>150.140.0.0/17</mdui:IPHint>
-        <mdui:GeolocationHint>geo:38.291031,21.796414</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>
-                            MIIDFDCCAfygAwIBAgIVAPDB3O4Jt71/WaU2UiNReDy9dbsIMA0GCSqGSIb3DQEB
-                            CwUAMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwHhcNMTUxMDI3MTgwNzE5WhcNMzUx
-                            MDI3MTcwNzE5WjAVMRMwEQYDVQQDDAppZHAuY3RpLmdyMIIBIjANBgkqhkiG9w0B
-                            AQEFAAOCAQ8AMIIBCgKCAQEAtcmw8xHKAYVkFPvvb9wOelVxKiOj8UhmEadhBS5K
-                            HKSW6yUDmRM1fSZRC4qYzwLlcCUVIxxjWHqaxJh+jmqFAl1HgkRfZfst1LlBfhFe
-                            oPpIFg/8++WCDi97/9UA9R6QxslxDCfQO6Pm4AZbXJyd+ihWPW2UB2vmsrbM1cII
-                            t49nFbjAF8XTiF+mYGtyxFCGnjNwLE/KeoBWmC1XebZDA2VjEBW43Q8cGmTgzfbh
-                            +njsMVsDHFfx5DzPMUgdIvKW++EJCj/Sgi/xxI9Rtyd/wDClIcWocnOFQQ7a2Ego
-                            N7LQmPp/WBKTDeZQ7xcT8hzU38Rys8o1aKnw10tpGbo88wIDAQABo1swWTAdBgNV
-                            HQ4EFgQUa/1IvZV5VVEpl5dqjg+8VQZLxN0wOAYDVR0RBDEwL4IKaWRwLmN0aS5n
-                            coYhaHR0cHM6Ly9pZHAuY3RpLmdyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-                            CwUAA4IBAQCDj/Q4Y9wJ8Ao81kfngAPdCeVKhoiT9lFZeJRBUFZXwSvdZa76CXnb
-                            RBcroGskxN+FdBCtXbnHFRWzY4NAiCItk41HHkf9sW1DeYoA2v11VFGdSCwMh4hq
-                            AyI+5OnH4gG2GZa1A2U/IRDGryG/PejE3KJjc06UKtszSPsgCLIn8BWUvfVZoP4v
-                            G85dA66o50DcG9OKY8l1QON6IcrsWVqlTaMSGYMu2tHsXeN7wZakHUz/jbhKqA/E
-                            CKL20oxVcOZjco6xEjM6oaiHI4dDr9wO9lF3TA+DcWSdRrCprSPalVzVn8HmUhOc
-                            K/B20docwc7tKIOQGaEpjo2lmbquG/ib
-                        </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>
-                            MIIDFDCCAfygAwIBAgIVAKCs+DufmEJRT/Iei5Y37ZP32r4sMA0GCSqGSIb3DQEB
-                            CwUAMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwHhcNMTUxMDI3MTgwNzE2WhcNMzUx
-                            MDI3MTcwNzE2WjAVMRMwEQYDVQQDDAppZHAuY3RpLmdyMIIBIjANBgkqhkiG9w0B
-                            AQEFAAOCAQ8AMIIBCgKCAQEA3/Sl3y8hjZ0PnfIyr/OnxNtJQaLdH3YbKnqJIc/r
-                            /zgcYgOQp1abbZa+QEECx9KSSaQUzM+M1PS3k8SS/A7xRRXr2KaUyCMTEcZXeeEw
-                            0PG8++SbZcgYIqOEJl2w6AX7gy/RLiIalqlfJBFVe6677pigTi4QgSNFTelzx4Ul
-                            mtlypAHXTLzTJUCarlxEQ61HdBvFg9tUuKDPKHGe8OJMsszfBkcw8FXNrnTAGLcy
-                            T5moao+qw4BnPLL2TmxIbRYJ9TfTLmVXJ3/5/g0RWvJ+4/k6IxOoAlZPbHVFP0UQ
-                            dNgcqDvI2GEgNnOWhqL/5R/Sk60VP+txj96U7fAhSUGTAwIDAQABo1swWTAdBgNV
-                            HQ4EFgQU+p3GP2Ho/99FAqc0Zrf3RhityqIwOAYDVR0RBDEwL4IKaWRwLmN0aS5n
-                            coYhaHR0cHM6Ly9pZHAuY3RpLmdyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-                            CwUAA4IBAQAPtqj6FtNvluE3YnnwzAPdDF2/yUHpH+Z7y9o5YWyyhqGUevXh1sJ3
-                            VWM9HHjGZvCSvBHFL9UwolQYuj59LT2InnwzDO2Hypl6uP805Fqz5yaFAzCLt1eI
-                            +AMc8xozRUROqQbRm0/qJ+jIACWqcWkShBckqI6c0K6EZvBjmqi0cRuQMoq32fGJ
-                            RxmX9FlIgBD/UBb9djP5GYZTqwF+SY/ZNrXGSdn9eNfQffLhvRj4Z4IaShG1E7xZ
-                            aZOQwUGSYAxOQ1t5ECcLon8toelZ4gPCBd65HRt9DRiHH3llPX0bhTLgEWJoJGXD
-                            32KKXNIN34sD1e3mqloO1Xq0z6x8OgHD
-                        </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>
-                            MIIDEzCCAfugAwIBAgIUSKHnO5Jifa6uUWyYYBAzykF1pmcwDQYJKoZIhvcNAQEL
-                            BQAwFTETMBEGA1UEAwwKaWRwLmN0aS5ncjAeFw0xNTEwMjcxODA3MThaFw0zNTEw
-                            MjcxNzA3MThaMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwggEiMA0GCSqGSIb3DQEB
-                            AQUAA4IBDwAwggEKAoIBAQCZAFgMwehKNSh+awk9loDhabToZbjuua3mShc7OW5k
-                            5nb4SpIOVwasJ54bY9UH1Y1+qS8Hd+xIUGGqs7U5ONRhRRqQ7CubqNoNF5zpKHbI
-                            +sBNfelcwEc8FaxGMcwKuu53sMwIvdlWEU0/AiPjYOAZpqYtmggUPSnnlaxkYF7e
-                            ctT8swrgJb0KotcyvxWmh2aB1YH01A0bb99acIo8Pjmj+0llABRGsZ5xxA8LgsoI
-                            UziyMdbzPnfcuhGa7aJXFCs8InJj4aXu/QXATIfP12+8e2vPJltFSOL5XIWpXa3O
-                            jKW7wUlWBqZxUO1d6j8jPJYFsjgDZCRnXw5oU0VsQkMDAgMBAAGjWzBZMB0GA1Ud
-                            DgQWBBTACXTvIIdNP2fzze/sSnbZrsbiszA4BgNVHREEMTAvggppZHAuY3RpLmdy
-                            hiFodHRwczovL2lkcC5jdGkuZ3IvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-                            BQADggEBAF16I4lbJsZl6wtWs4E+C0e4td1FwsdNtOLKZ/C3ZYi3/2RWcVs3gfzJ
-                            76wu5AHrtcfYwRjuZkVD3sDQca579qF84js3wSvT27uxqZYU6WfGHwHGjkMoo/WR
-                            6ZTa6Aa58KRJTnAIAMCfY1Bbo76CFcAG8IZoRisJ7PATnvPvOD4RqVy2c7XmW5dn
-                            lvItaLcyG46QbGp8OUnooTYGq6wlTU2LSEfJvt/1BeSS+VzFEF5+434+mFqjC320
-                            laQD5tUeCkThxG23v8VCVdAFOwPnewoxqrD/Wyv6O7d/JF7nddS4f42XGxpQjReM
-                            XKRoBZLikxPeZrLAGknFeSzOJHc13hU=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cti.gr/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cti.gr/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cti.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cti.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cti.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cti.gr/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cti.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDFDCCAfygAwIBAgIVAPDB3O4Jt71/WaU2UiNReDy9dbsIMA0GCSqGSIb3DQEB
-                            CwUAMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwHhcNMTUxMDI3MTgwNzE5WhcNMzUx
-                            MDI3MTcwNzE5WjAVMRMwEQYDVQQDDAppZHAuY3RpLmdyMIIBIjANBgkqhkiG9w0B
-                            AQEFAAOCAQ8AMIIBCgKCAQEAtcmw8xHKAYVkFPvvb9wOelVxKiOj8UhmEadhBS5K
-                            HKSW6yUDmRM1fSZRC4qYzwLlcCUVIxxjWHqaxJh+jmqFAl1HgkRfZfst1LlBfhFe
-                            oPpIFg/8++WCDi97/9UA9R6QxslxDCfQO6Pm4AZbXJyd+ihWPW2UB2vmsrbM1cII
-                            t49nFbjAF8XTiF+mYGtyxFCGnjNwLE/KeoBWmC1XebZDA2VjEBW43Q8cGmTgzfbh
-                            +njsMVsDHFfx5DzPMUgdIvKW++EJCj/Sgi/xxI9Rtyd/wDClIcWocnOFQQ7a2Ego
-                            N7LQmPp/WBKTDeZQ7xcT8hzU38Rys8o1aKnw10tpGbo88wIDAQABo1swWTAdBgNV
-                            HQ4EFgQUa/1IvZV5VVEpl5dqjg+8VQZLxN0wOAYDVR0RBDEwL4IKaWRwLmN0aS5n
-                            coYhaHR0cHM6Ly9pZHAuY3RpLmdyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-                            CwUAA4IBAQCDj/Q4Y9wJ8Ao81kfngAPdCeVKhoiT9lFZeJRBUFZXwSvdZa76CXnb
-                            RBcroGskxN+FdBCtXbnHFRWzY4NAiCItk41HHkf9sW1DeYoA2v11VFGdSCwMh4hq
-                            AyI+5OnH4gG2GZa1A2U/IRDGryG/PejE3KJjc06UKtszSPsgCLIn8BWUvfVZoP4v
-                            G85dA66o50DcG9OKY8l1QON6IcrsWVqlTaMSGYMu2tHsXeN7wZakHUz/jbhKqA/E
-                            CKL20oxVcOZjco6xEjM6oaiHI4dDr9wO9lF3TA+DcWSdRrCprSPalVzVn8HmUhOc
-                            K/B20docwc7tKIOQGaEpjo2lmbquG/ib
-                        </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>
-                            MIIDFDCCAfygAwIBAgIVAKCs+DufmEJRT/Iei5Y37ZP32r4sMA0GCSqGSIb3DQEB
-                            CwUAMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwHhcNMTUxMDI3MTgwNzE2WhcNMzUx
-                            MDI3MTcwNzE2WjAVMRMwEQYDVQQDDAppZHAuY3RpLmdyMIIBIjANBgkqhkiG9w0B
-                            AQEFAAOCAQ8AMIIBCgKCAQEA3/Sl3y8hjZ0PnfIyr/OnxNtJQaLdH3YbKnqJIc/r
-                            /zgcYgOQp1abbZa+QEECx9KSSaQUzM+M1PS3k8SS/A7xRRXr2KaUyCMTEcZXeeEw
-                            0PG8++SbZcgYIqOEJl2w6AX7gy/RLiIalqlfJBFVe6677pigTi4QgSNFTelzx4Ul
-                            mtlypAHXTLzTJUCarlxEQ61HdBvFg9tUuKDPKHGe8OJMsszfBkcw8FXNrnTAGLcy
-                            T5moao+qw4BnPLL2TmxIbRYJ9TfTLmVXJ3/5/g0RWvJ+4/k6IxOoAlZPbHVFP0UQ
-                            dNgcqDvI2GEgNnOWhqL/5R/Sk60VP+txj96U7fAhSUGTAwIDAQABo1swWTAdBgNV
-                            HQ4EFgQU+p3GP2Ho/99FAqc0Zrf3RhityqIwOAYDVR0RBDEwL4IKaWRwLmN0aS5n
-                            coYhaHR0cHM6Ly9pZHAuY3RpLmdyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-                            CwUAA4IBAQAPtqj6FtNvluE3YnnwzAPdDF2/yUHpH+Z7y9o5YWyyhqGUevXh1sJ3
-                            VWM9HHjGZvCSvBHFL9UwolQYuj59LT2InnwzDO2Hypl6uP805Fqz5yaFAzCLt1eI
-                            +AMc8xozRUROqQbRm0/qJ+jIACWqcWkShBckqI6c0K6EZvBjmqi0cRuQMoq32fGJ
-                            RxmX9FlIgBD/UBb9djP5GYZTqwF+SY/ZNrXGSdn9eNfQffLhvRj4Z4IaShG1E7xZ
-                            aZOQwUGSYAxOQ1t5ECcLon8toelZ4gPCBd65HRt9DRiHH3llPX0bhTLgEWJoJGXD
-                            32KKXNIN34sD1e3mqloO1Xq0z6x8OgHD
-                        </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>
-                            MIIDEzCCAfugAwIBAgIUSKHnO5Jifa6uUWyYYBAzykF1pmcwDQYJKoZIhvcNAQEL
-                            BQAwFTETMBEGA1UEAwwKaWRwLmN0aS5ncjAeFw0xNTEwMjcxODA3MThaFw0zNTEw
-                            MjcxNzA3MThaMBUxEzARBgNVBAMMCmlkcC5jdGkuZ3IwggEiMA0GCSqGSIb3DQEB
-                            AQUAA4IBDwAwggEKAoIBAQCZAFgMwehKNSh+awk9loDhabToZbjuua3mShc7OW5k
-                            5nb4SpIOVwasJ54bY9UH1Y1+qS8Hd+xIUGGqs7U5ONRhRRqQ7CubqNoNF5zpKHbI
-                            +sBNfelcwEc8FaxGMcwKuu53sMwIvdlWEU0/AiPjYOAZpqYtmggUPSnnlaxkYF7e
-                            ctT8swrgJb0KotcyvxWmh2aB1YH01A0bb99acIo8Pjmj+0llABRGsZ5xxA8LgsoI
-                            UziyMdbzPnfcuhGa7aJXFCs8InJj4aXu/QXATIfP12+8e2vPJltFSOL5XIWpXa3O
-                            jKW7wUlWBqZxUO1d6j8jPJYFsjgDZCRnXw5oU0VsQkMDAgMBAAGjWzBZMB0GA1Ud
-                            DgQWBBTACXTvIIdNP2fzze/sSnbZrsbiszA4BgNVHREEMTAvggppZHAuY3RpLmdy
-                            hiFodHRwczovL2lkcC5jdGkuZ3IvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-                            BQADggEBAF16I4lbJsZl6wtWs4E+C0e4td1FwsdNtOLKZ/C3ZYi3/2RWcVs3gfzJ
-                            76wu5AHrtcfYwRjuZkVD3sDQca579qF84js3wSvT27uxqZYU6WfGHwHGjkMoo/WR
-                            6ZTa6Aa58KRJTnAIAMCfY1Bbo76CFcAG8IZoRisJ7PATnvPvOD4RqVy2c7XmW5dn
-                            lvItaLcyG46QbGp8OUnooTYGq6wlTU2LSEfJvt/1BeSS+VzFEF5+434+mFqjC320
-                            laQD5tUeCkThxG23v8VCVdAFOwPnewoxqrD/Wyv6O7d/JF7nddS4f42XGxpQjReM
-                            XKRoBZLikxPeZrLAGknFeSzOJHc13hU=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cti.gr/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cti.gr/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Computer Technology Institute and Press "Diophantus"</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος"</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Computer Technology Institute and Press "Diophantus"</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Τεχνολογίας Υπολογιστών και Εκδόσεων "Διόφαντος"</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cti.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.cti.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Giorgos</md:GivenName>
-    <md:SurName>Kokolakis</md:SurName>
-    <md:EmailAddress>kokolakis@cti.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-2610960319</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>CTI "Diophantus"</md:Company>
-    <md:EmailAddress>noc@cti.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-2610690300</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ctksfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ctksfc.ac.uk-shibboleth.xml
deleted file mode 100644
index 32bf88c8..00000000
--- a/swamid-interfederations-2.0/idp.ctksfc.ac.uk-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.ctksfc.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Christ the King Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">ctksfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ctksfc.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ctksfc.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Christ the King VI Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ctksfc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</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 875af329..00000000
--- a/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-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.cue-lillenorddefrance.fr/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACWUlEQVQoz2WS0UtTcRTHz7m7d5u77m53t101m86cgYWz1cyXknpKoZf+A5+jxyCIwKCnHnqIIIQkiJCShN56KQhS1LA0NdzG0kpHurar0+vudu+dv9PDwHJ+nw7ncM73C+cDREREjDHTqjwffZUv6KzaIaoWNeKA7QEZCHYms/J6fHRpad6yLW17a2FxgYDgiJDsn18np0KRqEVchceGptDmRm5sbHzi4/TIyEgwIOPhBR4QVVXVdV1UJPEYTsy98biDgix4mptJkm0AZ60D0wG41dU1FIvJ3Pu5bzN+d+hU9JopxWcmF29dv+wDqGbjAAGAK6Lrh6YFW9vWN7OGZRKSZZv+gFzh+KJhufYBbUgup54MD+8TIwDH4L2bt4fu1otiLHZ2b6coVLwdofOK1OZwePvjndKa8ejO0O/C1tsP7wYG+p1ugbdNs7srKsvyrmZ4TKUncpIRf1wJlfOlsacvb/Rd7e29UBdRW7paSlBGxjse3n8QbgiVCkZ3++n1+bRdsIhzOUXJK/l5nvME6s5cjFoVTWmsf/ziWdkFyBgDgF29uDj7pU1uOhEOr2R/2U6htT28D5BOp7Ibq/463DF2BbUx0hnlABEQJa946Uqf7rAn5qe9iqzl//AA2/mcz+fdKZVml7/LwXCsI5ZPZ5ARAQACEBEBMkaJRCKZTCqKUkEKd7SWLTORSgUknxudPed6kKj2/0RklExN06Y+zcTjceBIkQOiKAqcA6vjo2KMzX6ey2xmjyLIATAAdnD7f58mVUWAA5YIgAC4Q5zgP9JUVcUa7gAA4C+Yj1Q/FwTkJgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMiswMjowMCLqv8IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzIrMDI6MDBTtwd+AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.espe-lnf.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cue-lillenorddefrance.fr/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cue-lillenorddefrance.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cue-lillenorddefrance.fr/profile/SAML1/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">Communauté d'Universités et d'Etablissements - Lille Nord de France</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Communauté d'Universités et d'Etablissements - Lille Nord de France</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.espe-lnf.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>info-infra.dir@espe-lnf.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cumbria.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cumbria.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 7d952ea5..00000000
--- a/swamid-interfederations-2.0/idp.cumbria.ac.uk-idp-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://idp.cumbria.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Cumbria.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">cumbria.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAOXrI5dTcF3eJhiLgfzEAFQ4YYsBMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEWlkcC5jdW1icmlhLmFjLnVrMB4XDTA5MDExNTE1NTIz
-						N1oXDTI5MDExNTE1NTIzN1owHDEaMBgGA1UEAxMRaWRwLmN1bWJyaWEuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdWjeuWQMYzEhv2jD6MRfP
-						W9l3zXUEudlO8XkGrEZWh3l/eplcaXarfz2z1oG0tYtv+xEcQ4NftHo4fWaaU89h
-						pAT70SpKG+PcFX2huAWil+sRy9N0etuisjwBhKGSju1L9V1rbWal9tqjMQhV09vf
-						YP9fguCVG2DrkGWtnmjDmhM1Eh1p+EQm0kaMP0pggK5uSt9C17x6m411Dj3VaP3w
-						zFeCa+0r8tm4IDhw+uUNkmTg+mufUSr7S5VALSnX0ar4k94GykReJYbwewb3Tcro
-						jd/QJPHpNEtZsh3GfQnQxx9sVYgLkMzU8Jz5gdSnGOuMPrGVRYvpSQbl8Urm36cL
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5jdW1icmlhLmFjLnVrhihodHRwczov
-						L2lkcC5jdW1icmlhLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT+Y0Hg
-						StI1y0DAcJa8e/llpIYdqzANBgkqhkiG9w0BAQUFAAOCAQEARy2hdKks9/AOlcZO
-						GxfN/9kyO4ho4j2PRQuoOOwI8Pj4DztWjOtrWFcqqKYx40LzoyFtDnadfAnaSTti
-						/nBWQeLK0gz2CRXOJWc2GkCBGT0YEAiwfRn4d86JSH/CssDRDZ62w2znxsll3RPe
-						gW5SuXclwMfcFrtJNeH4Uh6X/lDbrrHZOwQn9muNeZ56g15ShGZrAhW/Ji2ELc/Q
-						VD5iBtR6NguO05rckJFHFCAoR496bf3yvsV3y8PMPFypErQ+ZQgoms3YVMS/JJqM
-						DQlpy9y9C7nh97jPpOF0dPVKnbaGRYwmHCfuI2iV4QllpGRnGzEDBIMHsaTlkE3o
-						yamQLw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cumbria.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cumbria.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.cumbria.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cumbria.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cumbria.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cumbria.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">cumbria.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAOXrI5dTcF3eJhiLgfzEAFQ4YYsBMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEWlkcC5jdW1icmlhLmFjLnVrMB4XDTA5MDExNTE1NTIz
-						N1oXDTI5MDExNTE1NTIzN1owHDEaMBgGA1UEAxMRaWRwLmN1bWJyaWEuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdWjeuWQMYzEhv2jD6MRfP
-						W9l3zXUEudlO8XkGrEZWh3l/eplcaXarfz2z1oG0tYtv+xEcQ4NftHo4fWaaU89h
-						pAT70SpKG+PcFX2huAWil+sRy9N0etuisjwBhKGSju1L9V1rbWal9tqjMQhV09vf
-						YP9fguCVG2DrkGWtnmjDmhM1Eh1p+EQm0kaMP0pggK5uSt9C17x6m411Dj3VaP3w
-						zFeCa+0r8tm4IDhw+uUNkmTg+mufUSr7S5VALSnX0ar4k94GykReJYbwewb3Tcro
-						jd/QJPHpNEtZsh3GfQnQxx9sVYgLkMzU8Jz5gdSnGOuMPrGVRYvpSQbl8Urm36cL
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5jdW1icmlhLmFjLnVrhihodHRwczov
-						L2lkcC5jdW1icmlhLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT+Y0Hg
-						StI1y0DAcJa8e/llpIYdqzANBgkqhkiG9w0BAQUFAAOCAQEARy2hdKks9/AOlcZO
-						GxfN/9kyO4ho4j2PRQuoOOwI8Pj4DztWjOtrWFcqqKYx40LzoyFtDnadfAnaSTti
-						/nBWQeLK0gz2CRXOJWc2GkCBGT0YEAiwfRn4d86JSH/CssDRDZ62w2znxsll3RPe
-						gW5SuXclwMfcFrtJNeH4Uh6X/lDbrrHZOwQn9muNeZ56g15ShGZrAhW/Ji2ELc/Q
-						VD5iBtR6NguO05rckJFHFCAoR496bf3yvsV3y8PMPFypErQ+ZQgoms3YVMS/JJqM
-						DQlpy9y9C7nh97jPpOF0dPVKnbaGRYwmHCfuI2iV4QllpGRnGzEDBIMHsaTlkE3o
-						yamQLw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cumbria.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cumbria.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 Cumbria</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Cumbria</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cumbria.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Technical Operations</GivenName>
-    <EmailAddress>mailto:ictstechops@cumbria.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Operations</GivenName>
-    <EmailAddress>mailto:ictstechops@cumbria.ac.uk</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 6fdbbf7f..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cvgz.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.cas.cz: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.cvgz.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cvgz.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cvgz.cas.cz/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">cvgz.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cvgz.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Global Change Research Centre AS CR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Centrum výzkumu globální změny AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Global Change Research Centre AS CR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Centrum výzkumu globální změny AV ČR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.czechglobe.cz/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.czechglobe.cz/cs/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cwc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cwc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index fc16b696..00000000
--- a/swamid-interfederations-2.0/idp.cwc.ac.uk-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.cwc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the City of Westminster College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-26T10:27:14Z">
-      <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">cwc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUGMUEvqcH0AW3uF4F0/urAdo29hQwDQYJKoZIhvcNAQEF
-						BQAwGDEWMBQGA1UEAxMNaWRwLmN3Yy5hYy51azAeFw0xMzA5MTgxMTIwNDJaFw0z
-						MzA5MTgxMTIwNDJaMBgxFjAUBgNVBAMTDWlkcC5jd2MuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsO608HeIDdoDe9MLtR9Q6F9ZfWR0u90jc
-						Zp6DwseLlwwNHbysoJQocFh5rxY5IYPxz3W1S1WbN3apcYJ9eNO7ze3QLWycl2J8
-						4KS6Y76ViCpcBut3JhJHa/w9p4pfev27yfEIpc/wd9GsTHnz0hvUFKeFhAi/et9e
-						nsDwJivp2Nj3MvK7K+j0HGwdwwmww6K0/YneMnTb6/piCOBrLc04/picXISI64H/
-						oU7FwCXLQLTQY4MWhZccPhuSlI+KhnhFF+mJHsbfjpp5ClNYtK1UmQJghp/UoroM
-						13O2DyjGbC6vKS+9M6XWinhhp743/m/Aykiakb853/HOsjM0bAx1AgMBAAGjYTBf
-						MD4GA1UdEQQ3MDWCDWlkcC5jd2MuYWMudWuGJGh0dHBzOi8vaWRwLmN3Yy5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU/CWbrA4a96ioSsOcKUzzmWC2sSAw
-						DQYJKoZIhvcNAQEFBQADggEBAE7Mk9gNMgKIfx8J9blqvCakuxkHoNMJCH+74kre
-						1ZBFXl3dlr8LINw8EDiAXUigQgSb3FSpGlsEzi9UUreJ45y+E0sbrzFRRcsIi2GP
-						8fuXkweKi7mZVFPjVv9dC771tMij7vioKljDxPYsFTXVORnnrdWcAse2BxnGbydf
-						M1xHoXl+agxTld1R3L4aP1guxomfOK48a1UCz0VlNNius0IVgw7fMCXjSrNDM3nL
-						mqhLbqrMAQbaSkLiOHbN8ZZ+c/2q2Yv5HEdgvrsxXCpgINSA9zcMIEl9rAADbOOG
-						K3oBkLQYth/QakEkMIiItL8GzAU0TNWO+72vhyYn7qm5W+M=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cwc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cwc.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.cwc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cwc.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.cwc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cwc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cwc.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">cwc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUGMUEvqcH0AW3uF4F0/urAdo29hQwDQYJKoZIhvcNAQEF
-						BQAwGDEWMBQGA1UEAxMNaWRwLmN3Yy5hYy51azAeFw0xMzA5MTgxMTIwNDJaFw0z
-						MzA5MTgxMTIwNDJaMBgxFjAUBgNVBAMTDWlkcC5jd2MuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsO608HeIDdoDe9MLtR9Q6F9ZfWR0u90jc
-						Zp6DwseLlwwNHbysoJQocFh5rxY5IYPxz3W1S1WbN3apcYJ9eNO7ze3QLWycl2J8
-						4KS6Y76ViCpcBut3JhJHa/w9p4pfev27yfEIpc/wd9GsTHnz0hvUFKeFhAi/et9e
-						nsDwJivp2Nj3MvK7K+j0HGwdwwmww6K0/YneMnTb6/piCOBrLc04/picXISI64H/
-						oU7FwCXLQLTQY4MWhZccPhuSlI+KhnhFF+mJHsbfjpp5ClNYtK1UmQJghp/UoroM
-						13O2DyjGbC6vKS+9M6XWinhhp743/m/Aykiakb853/HOsjM0bAx1AgMBAAGjYTBf
-						MD4GA1UdEQQ3MDWCDWlkcC5jd2MuYWMudWuGJGh0dHBzOi8vaWRwLmN3Yy5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU/CWbrA4a96ioSsOcKUzzmWC2sSAw
-						DQYJKoZIhvcNAQEFBQADggEBAE7Mk9gNMgKIfx8J9blqvCakuxkHoNMJCH+74kre
-						1ZBFXl3dlr8LINw8EDiAXUigQgSb3FSpGlsEzi9UUreJ45y+E0sbrzFRRcsIi2GP
-						8fuXkweKi7mZVFPjVv9dC771tMij7vioKljDxPYsFTXVORnnrdWcAse2BxnGbydf
-						M1xHoXl+agxTld1R3L4aP1guxomfOK48a1UCz0VlNNius0IVgw7fMCXjSrNDM3nL
-						mqhLbqrMAQbaSkLiOHbN8ZZ+c/2q2Yv5HEdgvrsxXCpgINSA9zcMIEl9rAADbOOG
-						K3oBkLQYth/QakEkMIiItL8GzAU0TNWO+72vhyYn7qm5W+M=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cwc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cwc.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">City of Westminster College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">City of Westminster College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cwc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Yves</GivenName>
-    <SurName>Bozzo-Rey</SurName>
-    <EmailAddress>mailto:yves_bozzo-rey@cwc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Yves</GivenName>
-    <SurName>Bozzo-Rey</SurName>
-    <EmailAddress>mailto:yves_bozzo-rey@cwc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cwu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cwu.edu-idp-shibboleth.xml
deleted file mode 100644
index 15040f21..00000000
--- a/swamid-interfederations-2.0/idp.cwu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,91 +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://idp.cwu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">cwu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Central Washington University</mdui:DisplayName>
-        <mdui:Logo height="50" width="153" xml:lang="en">https://idp.cwu.edu/images/cwulogo.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>
-MIIDGDCCAgCgAwIBAgIVAPt8x8FtcfDVuV6N/QbiW4L+1GRpMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5jd3UuZWR1MB4XDTEzMTIwOTE3NDEyMVoXDTMz
-MTIwOTE3NDEyMVowFjEUMBIGA1UEAxMLaWRwLmN3dS5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCyMIfTzVuFDgmSsKioh1W0EtU9/W8/RMnj9Lug
-Rc+5ncjiv5fM9ZRFu/iMiNpXDcjD9eeR7RK+jkbN50A/b3PBNLrUjfMljncT924O
-mfZ6BB1Z4Ih+XBB7BM0Y0hXUb+OcyvA9h9vfbWkheShbxkaXMZFLQykQdPUY3acl
-MjrBiFsuaWapIrctNNk8ie5pNN9lTXvULxlqxvmwrexRqTGjYZ+FHfUajdODw7Q+
-CBK4pnVwlln5PNvOK7NGZjFIaNVIcQh5inSCXi5hWK0+rhI1x/JojuHg63d24TLk
-BHgzORK0FCoAQEI3OxQA+6IMxsceYVQddC9rXWHvgZayIXtJAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5jd3UuZWR1hiJodHRwczovL2lkcC5jd3UuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBS+taocgWGI+SqvSzy4cJpnL9Uf2DANBgkqhkiG
-9w0BAQUFAAOCAQEAOYxelqkSners+2VJvi9pJmU6xPAL74OYZhhRtPtuRL1Mvjan
-hvrZjtx2lsqZkhUKEEn7IQtVFR5Gw3lW7vNZ2tcNx+aKmXWEhrTqLtuZxM6Zp0oz
-4+J1OGLC4U4V1vcPptSEmdh+0gz9pm+hD1WQkMSYS9QQ3Ik5hTKnKd/vb5/KdPys
-XvhjWr8zU3ZEJPyUIub9bVyhDhX6RxPZU1oelWxaU3+9LI7bShYb6FMnbZh4dDvC
-3jj2YybUOSZmNTOILtnCYiSVeTKwVvGEuzLk1ipBjR+L1ACsmT2WBeKraszHpDMr
-uh7Ac/yv6fmgKvc2SYn3Z6ZzsAmMrUUZyQ4A4g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cwu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cwu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cwu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cwu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cwu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cwu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cwu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAPt8x8FtcfDVuV6N/QbiW4L+1GRpMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5jd3UuZWR1MB4XDTEzMTIwOTE3NDEyMVoXDTMz
-MTIwOTE3NDEyMVowFjEUMBIGA1UEAxMLaWRwLmN3dS5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCyMIfTzVuFDgmSsKioh1W0EtU9/W8/RMnj9Lug
-Rc+5ncjiv5fM9ZRFu/iMiNpXDcjD9eeR7RK+jkbN50A/b3PBNLrUjfMljncT924O
-mfZ6BB1Z4Ih+XBB7BM0Y0hXUb+OcyvA9h9vfbWkheShbxkaXMZFLQykQdPUY3acl
-MjrBiFsuaWapIrctNNk8ie5pNN9lTXvULxlqxvmwrexRqTGjYZ+FHfUajdODw7Q+
-CBK4pnVwlln5PNvOK7NGZjFIaNVIcQh5inSCXi5hWK0+rhI1x/JojuHg63d24TLk
-BHgzORK0FCoAQEI3OxQA+6IMxsceYVQddC9rXWHvgZayIXtJAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5jd3UuZWR1hiJodHRwczovL2lkcC5jd3UuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBS+taocgWGI+SqvSzy4cJpnL9Uf2DANBgkqhkiG
-9w0BAQUFAAOCAQEAOYxelqkSners+2VJvi9pJmU6xPAL74OYZhhRtPtuRL1Mvjan
-hvrZjtx2lsqZkhUKEEn7IQtVFR5Gw3lW7vNZ2tcNx+aKmXWEhrTqLtuZxM6Zp0oz
-4+J1OGLC4U4V1vcPptSEmdh+0gz9pm+hD1WQkMSYS9QQ3Ik5hTKnKd/vb5/KdPys
-XvhjWr8zU3ZEJPyUIub9bVyhDhX6RxPZU1oelWxaU3+9LI7bShYb6FMnbZh4dDvC
-3jj2YybUOSZmNTOILtnCYiSVeTKwVvGEuzLk1ipBjR+L1ACsmT2WBeKraszHpDMr
-uh7Ac/yv6fmgKvc2SYn3Z6ZzsAmMrUUZyQ4A4g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cwu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Central Washington University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Central Washington University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cwu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>CWU Identity Provider Administrators</md:GivenName>
-    <md:EmailAddress>idp-admins@networks.cwu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b53ffe25..00000000
--- a/swamid-interfederations-2.0/idp.cyceron.fr-8443-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cyceron.fr:8443/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAADMElEQVQ4y22RS2xUdRSHv3PvbTudFix9wbRMg1SYxrqoiyaiVRttQI1JAxpaRlNlgY9EAxFikES3ImpiCmpQA6YUKyXysInRoEZJqo1voaWdKS1CH1P6ng6dKZm5/+NiqInitzmbky+/3znCDcYbFLHBUl4bi0d8vhzfTgxxAwzEQkfKlwZOAZ/1RXtavxrp2LL99t2voOyTRcFMUOmfDe//fOTEC6D4PKWhJ8qaKjrGTu+6GAu/uTLH/+emssaqg6Hmybg7X+DLLg03rGoKOIsCVyEU66sGTSe6PhZIZcAj/vr3fpv6ed2d+dXdM9dn93psTyxhFvKrC9d1WgL/CGyB5dklo6G5HgBUFZRyFwaq8qofa7/U2j2aGKos9Zadayp/ZoPAGRSc6QYlZQClYjAWCuRlLousylndfWH2fM3h/oNnvY73mtfxzkQSI2tBSJlkLoYzJhOKWgXH2NSdHGrbP7lw1Z9leeaeXvNcCQq1vvXB5t43jkaT0wDkZS4bMsbMWWKhNvdKiktTQR12jg22NI/GhytEhJJsf8gIFLcJE436iSpHFyuuWVrRc3dx7cO2UHa4/4OuhBtf8nxgxwHraiJSLpJ+RiwZLVADU1t02y+TXaccy4kDWFjUFNWeLGoTUhYqwIKbyD3Q+9Z2+evxaPNH/e++iApP3bbt9fysgt/fubC3XVFUlZcq97xs4Aex6BTApKA7+seJbyNfbnzUv6lFJoIKLpuxSFjQ8cXw6UPhub6tikkL7thTZ1y+EYHCT4XJ9D4qrFWbsGOnAIt2o2AUNpTU/xqe690qCDeqZYkNtknfoiCZnnJcwgAyEVRsAeMSRFjdcvHDJxNuYsUtmXnns21P1pX5y1WlXv/gRn/j+qJjcoX/4GgS1OHZ5t597xtcEYQdlbt32TZvHwl/POhqKmNo/nLAsrgHuElgFR8XuiY6HzK4AmCJxfeRr6eTSVjp9Q8AeGzPvIEB/gcH4NYl5SM/jp8FAaOG+5fXxY0F9614sL6m+IFXLZHv1OWn8Qal+Jj8SyDTm5WUQDjac2hkYch/V0HNuZzM3J0KGaLkqJCylWtGoLBNbkrwNwFPZv62pB5FAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMyKzAyOjAwIuq/wgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMiswMjowMFO3B34AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.cyceron.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.cyceron.fr:8443/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cyceron.fr:8443/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cyceron.fr:8443/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cyceron.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cyceron.fr:8443/idp/profile/SAML1/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">Cyceron</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cyceron</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cyceron.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Antoine Nourry</md:SurName>
-    <md:EmailAddress>nourry@cyceron.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b011619f..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.cyceron.fr:8443/idp/shibboleth">
-  <md: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>
-  </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 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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.cyceron.fr:8443/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cyceron.fr:8443/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cyceron.fr:8443/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cyceron.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cyceron.fr:8443/idp/profile/SAML1/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">Cyceron</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cyceron</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Antoine Nourry</md:SurName>
-    <md:EmailAddress>nourry@cyceron.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ea275c28..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 "GÉANT Staff Identity Provider" Shibboleth IdP for GÉANT 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">GÉANT Staff Identity Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GÉANT 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/geant_logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://idp.dante.net/idp/images/geant_logo-80x60.png</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">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Staff Identity Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>DANTE Support</GivenName>
-    <EmailAddress>mailto:idp-support@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DANTE Support</GivenName>
-    <EmailAddress>mailto:idp-support@geant.org</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.davidsonccc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.davidsonccc.edu-idp-shibboleth.xml
deleted file mode 100644
index ada9f81a..00000000
--- a/swamid-interfederations-2.0/idp.davidsonccc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +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://idp.davidsonccc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">davidsonccc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Davidson County Community College</mdui:DisplayName>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.davidsonccc.edu/about-dccc/consumer-information</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>
-MIIDODCCAiCgAwIBAgIVAOPBqGh9irD58qMJrkXkh/ezrjfMMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC5kYXZpZHNvbmNjYy5lZHUwHhcNMTQwNDEwMTUz
-NDA4WhcNMzQwNDEwMTUzNDA4WjAeMRwwGgYDVQQDExNpZHAuZGF2aWRzb25jY2Mu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgwDFkLeubg1tsp9u
-7DHvJcOPiwgrYeKok6Vj4UXwz4tDkapdJYh/E1pl9rT6dgkL0US1b82RFqm8Yue2
-d2jW6K2srUC7agsXZgpgW2a3m3bi/BGZw8DkS9CQIe8xadfzhfDLa783qq3hBpcK
-U3xA7FDbdLT2Esl/C2xs/Ba582XSxzEHQZiMLte9u71d6pCmcpYsvK6EQ06DXg4V
-Scb/eI0iNakeYfV18HjZckPBj+Vy9EbfHfOpL9eF7z/94vWgV/NsP5MOu0D2xvJM
-seD8ivFlhh2KUO5pwjfRXP4D2Vs5O/4r/KClxKKH5EMme2biuMZfuSNTvETJduLj
-4qD1QQIDAQABo20wazBKBgNVHREEQzBBghNpZHAuZGF2aWRzb25jY2MuZWR1hipo
-dHRwczovL2lkcC5kYXZpZHNvbmNjYy5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFJI6cN+BwFdJN7T2pAEoF8e2rnSoMA0GCSqGSIb3DQEBBQUAA4IBAQBKj7NQ
-nOs2xkYeMXw9uE8uAgTcLBD1/wgeSU33yg/G+CSZqTn6bkLegvQcmiMYUptq8nyQ
-YNMTYEHOtKYNCgbAbm15PzUVqAFibC908FvHZrVl6ikbVel8JRmZAHVY/h5afDzR
-bwBZpmSAmNn2LvOAkNkuLco9Mdk684pvzIOf9IYVtIo/D5IxPD3vTWItvVozOdqH
-qC2o1XXHUUwLwPgrSOcGIJw6C59R6EljLEKdGh7y+w+ilOgYg124WsGfU3d8Fl3w
-F6ZaB5MM41/G/pJ4M3CEOhOKVa4H/0+IGBf+K6pNcBGbCqXz0GDPgBGlsiU/7yfS
-F3CFoqtbWNwbBjfZ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.davidsonccc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.davidsonccc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.davidsonccc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.davidsonccc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">davidsonccc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAOPBqGh9irD58qMJrkXkh/ezrjfMMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC5kYXZpZHNvbmNjYy5lZHUwHhcNMTQwNDEwMTUz
-NDA4WhcNMzQwNDEwMTUzNDA4WjAeMRwwGgYDVQQDExNpZHAuZGF2aWRzb25jY2Mu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgwDFkLeubg1tsp9u
-7DHvJcOPiwgrYeKok6Vj4UXwz4tDkapdJYh/E1pl9rT6dgkL0US1b82RFqm8Yue2
-d2jW6K2srUC7agsXZgpgW2a3m3bi/BGZw8DkS9CQIe8xadfzhfDLa783qq3hBpcK
-U3xA7FDbdLT2Esl/C2xs/Ba582XSxzEHQZiMLte9u71d6pCmcpYsvK6EQ06DXg4V
-Scb/eI0iNakeYfV18HjZckPBj+Vy9EbfHfOpL9eF7z/94vWgV/NsP5MOu0D2xvJM
-seD8ivFlhh2KUO5pwjfRXP4D2Vs5O/4r/KClxKKH5EMme2biuMZfuSNTvETJduLj
-4qD1QQIDAQABo20wazBKBgNVHREEQzBBghNpZHAuZGF2aWRzb25jY2MuZWR1hipo
-dHRwczovL2lkcC5kYXZpZHNvbmNjYy5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFJI6cN+BwFdJN7T2pAEoF8e2rnSoMA0GCSqGSIb3DQEBBQUAA4IBAQBKj7NQ
-nOs2xkYeMXw9uE8uAgTcLBD1/wgeSU33yg/G+CSZqTn6bkLegvQcmiMYUptq8nyQ
-YNMTYEHOtKYNCgbAbm15PzUVqAFibC908FvHZrVl6ikbVel8JRmZAHVY/h5afDzR
-bwBZpmSAmNn2LvOAkNkuLco9Mdk684pvzIOf9IYVtIo/D5IxPD3vTWItvVozOdqH
-qC2o1XXHUUwLwPgrSOcGIJw6C59R6EljLEKdGh7y+w+ilOgYg124WsGfU3d8Fl3w
-F6ZaB5MM41/G/pJ4M3CEOhOKVa4H/0+IGBf+K6pNcBGbCqXz0GDPgBGlsiU/7yfS
-F3CFoqtbWNwbBjfZ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.davidsonccc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Davidson County Community College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Davidson County Community College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.davidsonccc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Donald Beck</md:GivenName>
-    <md:EmailAddress>donald_beck@davidsonccc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.delval.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.delval.edu-idp-shibboleth.xml
deleted file mode 100644
index f4a97e9b..00000000
--- a/swamid-interfederations-2.0/idp.delval.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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://idp.delval.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">delval.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Delaware Valley University</mdui:DisplayName>
-        <mdui:Logo height="100" width="900" xml:lang="en">https://idp.delval.edu/identity/servlet/logo</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>
-MIIDUDCCAjgCCQCCO+P3N8He3TANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCUEExEzARBgNVBAcMCkRveWxlc3Rvd24xIDAeBgNVBAoMF0Rl
-bGF3YXJlIFZhbGxleSBDb2xsZWdlMRcwFQYDVQQDDA5pZHAuZGVsdmFsLmVkdTAe
-Fw0xNDA3MjUxNTA5MjZaFw0xOTA3MjUxNTA5MjZaMGoxCzAJBgNVBAYTAlVTMQsw
-CQYDVQQIDAJQQTETMBEGA1UEBwwKRG95bGVzdG93bjEgMB4GA1UECgwXRGVsYXdh
-cmUgVmFsbGV5IENvbGxlZ2UxFzAVBgNVBAMMDmlkcC5kZWx2YWwuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw1YNCyTmA7Tt3//dWCRBryL2UTYG
-L5YCM2F/f0F//u9kWja7euowoVF8C6NIhPkFWxEeDaDNkVt+toesOGZS8lo/bVJ1
-oQgWlcyqHcfzS8g14r9PoSTCZHcpgqSUyjsgCnBq0iLFRymKgEpLxroL2nGjm9BU
-+Cu4sMQ01zjeb68zGz+lycbtpeuDgRhtwuWxGJurHZPHsDdLpn3sfk6joCgaQHJd
-yCDNnRimZkSQa5/rFlaF7J1ERe6s1txC7R1RLz0k+7KcUoMn4IJIQFH0VoGorrDJ
-2mJMVcpNMHtFpc6z2gqeQS9KIzqr2KqckedItOjV6MSdbCI5Td+JLtgKnwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQAn+LUZmRsw35GenabcrwVqHJd8G+qp6IfZD6sX
-UH6Yh2G7TiH+V0GqqVhyvD8DC/ji3BDQeoBLpBUZQJ7rTjpC0Z4Hr8Wnv0jecqGs
-uCEbIY2EsXHYFYiyyR9XvvsS3KDpAU7teTY/Oy6BfE48ebZf+mp35V7znU8DXOBq
-wPniAvPRS3QU9fqinSDPLwrjTrTdwgyXODK/7+nQx5C/qtoIee4BsPYlbqsxvBNB
-1TMWJUVw23yBL0hC7l0gxswxbrIxAwKA7aWQyM1apS9ke9x9Xghw6Zk1g+UqW+3C
-9nVqTm0Sk6c7D6fSOhfvXFNGOQGYAUZLRWAQx7V6nwmQ8Xx1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.delval.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.delval.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.delval.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.delval.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.delval.edu/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">delval.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDUDCCAjgCCQCCO+P3N8He3TANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCUEExEzARBgNVBAcMCkRveWxlc3Rvd24xIDAeBgNVBAoMF0Rl
-bGF3YXJlIFZhbGxleSBDb2xsZWdlMRcwFQYDVQQDDA5pZHAuZGVsdmFsLmVkdTAe
-Fw0xNDA3MjUxNTA5MjZaFw0xOTA3MjUxNTA5MjZaMGoxCzAJBgNVBAYTAlVTMQsw
-CQYDVQQIDAJQQTETMBEGA1UEBwwKRG95bGVzdG93bjEgMB4GA1UECgwXRGVsYXdh
-cmUgVmFsbGV5IENvbGxlZ2UxFzAVBgNVBAMMDmlkcC5kZWx2YWwuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw1YNCyTmA7Tt3//dWCRBryL2UTYG
-L5YCM2F/f0F//u9kWja7euowoVF8C6NIhPkFWxEeDaDNkVt+toesOGZS8lo/bVJ1
-oQgWlcyqHcfzS8g14r9PoSTCZHcpgqSUyjsgCnBq0iLFRymKgEpLxroL2nGjm9BU
-+Cu4sMQ01zjeb68zGz+lycbtpeuDgRhtwuWxGJurHZPHsDdLpn3sfk6joCgaQHJd
-yCDNnRimZkSQa5/rFlaF7J1ERe6s1txC7R1RLz0k+7KcUoMn4IJIQFH0VoGorrDJ
-2mJMVcpNMHtFpc6z2gqeQS9KIzqr2KqckedItOjV6MSdbCI5Td+JLtgKnwIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQAn+LUZmRsw35GenabcrwVqHJd8G+qp6IfZD6sX
-UH6Yh2G7TiH+V0GqqVhyvD8DC/ji3BDQeoBLpBUZQJ7rTjpC0Z4Hr8Wnv0jecqGs
-uCEbIY2EsXHYFYiyyR9XvvsS3KDpAU7teTY/Oy6BfE48ebZf+mp35V7znU8DXOBq
-wPniAvPRS3QU9fqinSDPLwrjTrTdwgyXODK/7+nQx5C/qtoIee4BsPYlbqsxvBNB
-1TMWJUVw23yBL0hC7l0gxswxbrIxAwKA7aWQyM1apS9ke9x9Xghw6Zk1g+UqW+3C
-9nVqTm0Sk6c7D6fSOhfvXFNGOQGYAUZLRWAQx7V6nwmQ8Xx1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.delval.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.delval.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Delaware Valley University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Delaware Valley University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.delval.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Michael Davis</md:GivenName>
-    <md:EmailAddress>michael.davis@delval.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Charles Scally</md:GivenName>
-    <md:EmailAddress>charles.scally@delval.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Michael Davis</md:GivenName>
-    <md:EmailAddress>michael.davis@delval.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Chris Shriver</md:GivenName>
-    <md:EmailAddress>chris.shriver@delval.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.derby-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.derby-college.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 59d23757..00000000
--- a/swamid-interfederations-2.0/idp.derby-college.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.derby-college.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Derby College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-04T12:29:50Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">derby-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIUcC6CXJaCoz2x+pFU5TLdMtrg238wDQYJKoZIhvcNAQEF
-						BQAwIjEgMB4GA1UEAxMXaWRwLmRlcmJ5LWNvbGxlZ2UuYWMudWswHhcNMTMwMjI3
-						MTQ1MjI3WhcNMzMwMjI3MTQ1MjI3WjAiMSAwHgYDVQQDExdpZHAuZGVyYnktY29s
-						bGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANKo3Qc2
-						RMSfWk1c1/JbDgHOfWx7BuEhOPpxw1wA315Bx7qEY028YMvkjdBB4DZ6ZPlzGFGi
-						u1bQ2nVGz4ahT+LJ+1e9kdye++z2/y/na9kccJVONn6pQlPgug52YYVs1wI/ACIt
-						PiJB6IOIIUgtJN72uinqr+I8wWKcRPBJ6ZUFU4BHFzmC0iC7UPijsv+fHmcthY3k
-						kjdMKKVLbEyq48zV/oPzDI+4B2VQu1P9M1m7+XXKRFYuXuUS7710UsaU2j4gQOjh
-						FCthyCt3gttOTbLlaec/V0Hr8ctqhTGuaW634A0Bko/fODY/cpIrLU6jRfAduOys
-						X+tyrAWT8hOxaOMCAwEAAaN1MHMwUgYDVR0RBEswSYIXaWRwLmRlcmJ5LWNvbGxl
-						Z2UuYWMudWuGLmh0dHBzOi8vaWRwLmRlcmJ5LWNvbGxlZ2UuYWMudWsvaWRwL3No
-						aWJib2xldGgwHQYDVR0OBBYEFOVeW4p4HL3i4+XUVYpOWc8AfM+cMA0GCSqGSIb3
-						DQEBBQUAA4IBAQC+SiFq81er0JPaxOKmw0XHjk0PKu2DAIsB1Xq0A1Djk1OMHpKQ
-						/lCjaD3qU6RASglCJZTvxk5gzqgDIxDNjQSpMg9/V809+obnMfKm1wwm9KHTFSEk
-						tO+NXUTVcPDWuvSyz/Xv/M0dwxGcBsA+saiw+UvZu2gbWgNVLosn4SZoAFyD1l8w
-						6YNqj0N7g3wnxLC6Dteg+/Lf6j4jHLDpcCxxUisEe0+GFAOSw2bGoeyQEeiTF6KH
-						mQf6rM44WGIuo+CX4bDORSxyyv8iQ8L2G07CxC8+Cc0eh+WKH83V0zCXKMJYNkaP
-						TBvmtDKuzTAZk6ZEZ+7qKvpc/kVYTqFBqyD0
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.derby-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.derby-college.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.derby-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.derby-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.derby-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.derby-college.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">derby-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIUcC6CXJaCoz2x+pFU5TLdMtrg238wDQYJKoZIhvcNAQEF
-						BQAwIjEgMB4GA1UEAxMXaWRwLmRlcmJ5LWNvbGxlZ2UuYWMudWswHhcNMTMwMjI3
-						MTQ1MjI3WhcNMzMwMjI3MTQ1MjI3WjAiMSAwHgYDVQQDExdpZHAuZGVyYnktY29s
-						bGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANKo3Qc2
-						RMSfWk1c1/JbDgHOfWx7BuEhOPpxw1wA315Bx7qEY028YMvkjdBB4DZ6ZPlzGFGi
-						u1bQ2nVGz4ahT+LJ+1e9kdye++z2/y/na9kccJVONn6pQlPgug52YYVs1wI/ACIt
-						PiJB6IOIIUgtJN72uinqr+I8wWKcRPBJ6ZUFU4BHFzmC0iC7UPijsv+fHmcthY3k
-						kjdMKKVLbEyq48zV/oPzDI+4B2VQu1P9M1m7+XXKRFYuXuUS7710UsaU2j4gQOjh
-						FCthyCt3gttOTbLlaec/V0Hr8ctqhTGuaW634A0Bko/fODY/cpIrLU6jRfAduOys
-						X+tyrAWT8hOxaOMCAwEAAaN1MHMwUgYDVR0RBEswSYIXaWRwLmRlcmJ5LWNvbGxl
-						Z2UuYWMudWuGLmh0dHBzOi8vaWRwLmRlcmJ5LWNvbGxlZ2UuYWMudWsvaWRwL3No
-						aWJib2xldGgwHQYDVR0OBBYEFOVeW4p4HL3i4+XUVYpOWc8AfM+cMA0GCSqGSIb3
-						DQEBBQUAA4IBAQC+SiFq81er0JPaxOKmw0XHjk0PKu2DAIsB1Xq0A1Djk1OMHpKQ
-						/lCjaD3qU6RASglCJZTvxk5gzqgDIxDNjQSpMg9/V809+obnMfKm1wwm9KHTFSEk
-						tO+NXUTVcPDWuvSyz/Xv/M0dwxGcBsA+saiw+UvZu2gbWgNVLosn4SZoAFyD1l8w
-						6YNqj0N7g3wnxLC6Dteg+/Lf6j4jHLDpcCxxUisEe0+GFAOSw2bGoeyQEeiTF6KH
-						mQf6rM44WGIuo+CX4bDORSxyyv8iQ8L2G07CxC8+Cc0eh+WKH83V0zCXKMJYNkaP
-						TBvmtDKuzTAZk6ZEZ+7qKvpc/kVYTqFBqyD0
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.derby-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.derby-college.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">Derby College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Derby College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.derby-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tim</GivenName>
-    <SurName>De Ville</SurName>
-    <EmailAddress>mailto:Tim.DeVille@derby-college.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>De Ville</SurName>
-    <EmailAddress>mailto:Tim.DeVille@derby-college.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.devsnc.com-openam.xml b/swamid-interfederations-2.0/idp.devsnc.com-openam.xml
deleted file mode 100644
index 4b223858..00000000
--- a/swamid-interfederations-2.0/idp.devsnc.com-openam.xml
+++ /dev/null
@@ -1,65 +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://idp.devsnc.com/openam">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">servicenow.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ServiceNow</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IdP DevSNC OpenAM</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>
-MIIDYDCCAkigAwIBAgIEUv1eqjANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCQ0ExFDASBgNVBAcTC1NhbnRhIENsYXJhMRMwEQYDVQQKEwpT
-ZXJ2aWNlTm93MRQwEgYDVQQLEwtFbmdpbmVlcmluZzEVMBMGA1UEAxMMV2FsbGFj
-ZSBQZW5nMB4XDTE0MDIxNDAwMDkxNFoXDTI0MDIxMjAwMDkxNFowcjELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAkNBMRQwEgYDVQQHEwtTYW50YSBDbGFyYTETMBEGA1UE
-ChMKU2VydmljZU5vdzEUMBIGA1UECxMLRW5naW5lZXJpbmcxFTATBgNVBAMTDFdh
-bGxhY2UgUGVuZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJgL8oWn
-2ifDtr4SgvY/ahFw5UhcoMi4EPxy3yiYZq+Oqetro70N+9AlNBj4gXFgNpndU/zd
-Mhl0sWWL/rSTo09Q2KCDq8oAZ5/1J+GGTzeBguxvTi1D/54A6eRbMAVRJKavieuN
-0U836VNfQf5eXruoD5FOXaoeUQE02m6DiZPN7r6YfNuzDYHdOAzXOWLPAgWYNijP
-q2AMgIqLyjt1qODTB8IvFiFV36vORgIaizcltdyT+1dyWuZ8ckgNAKgCU231KsQ4
-dxBaOJOc2K32j8UQoqm72RxQvCiZelGEJmOBhfCc3L8eKyHfv8EmXOpgzbncRbN0
-mo5snfmPEydrU0MCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdRA+gycQmCNMMNF3
-HjMmFEO8mBfFSHPfJC/1K5WhmIkIkoWw0dmboFAMBwUIagj+MsNbPem1+zRdxhgS
-MdYLy/BhHv7s/XKPIfOTtdjctHM036KEd4+KmtZZP6/9y2jDYe/TxNMXfpN9Y8Gv
-JCUw7YsJV/RF5b7WNOzQplL8Cqc7gjlZcrvsRitEPnqE/fB0hBGty6LsgzBu9COg
-wTGjcOEw8I4GgES7mOVHfmvRGK2q+yQtagYyyKp4qtOdqIpNFO0jpNzIuQH2Af4Q
-PVv4KGpczHsOlYles0VAmQLOhON2gVMIiYg9C/3/cybnhL48K+OjqFwxbGH0jvu4
-Rx+sUg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.devsnc.com/openam/SSORedirect/metaAlias/idp"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ServiceNow</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ServiceNow</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.servicenow.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Wallace Peng</md:GivenName>
-    <md:EmailAddress>wallace.peng@servicenow.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Aamir Siddiqui</md:GivenName>
-    <md:EmailAddress>aamir.siddiqui@servicenow.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Aparna Ganti</md:GivenName>
-    <md:EmailAddress>aparna.ganti@servicenow.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml
deleted file mode 100644
index 3011994a..00000000
--- a/swamid-interfederations-2.0/idp.dfn-cert.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn-cert.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:12Z">
-      <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>
-  </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">dfn-cert.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DFN-CERT Services GmbH</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DFN-CERT Services GmbH</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity-Provider der DFN-CERT Services GmbH</mdui:Description>
-        <mdui:Description xml:lang="en">Identity-Provider der DFN-CERT Services GmbH</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.dfn-cert.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.dfn-cert.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
-REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xNDA0MDgxNTIzMTBa
-Fw0xOTAyMTMwMDAwMDBaMGwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
-MRAwDgYDVQQHEwdIYW1idXJnMR8wHQYDVQQKExZERk4tQ0VSVCBTZXJ2aWNlcyBH
-bWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDGmE9dz1W6j62JiorQhJWhp5tVKpvt2YR3RbS4UWUQljBk
-Oab9wFq8zsGgL94aZRWllmixsOJStEdi+TvyPhG6FOmR/ETXvvfPbho3FCZ/Sfip
-lbQnnqETSZfVW0UoP8Tr46zY+hZYMEoxfmH8rj72rSmCIrOLjgdIf5UZ0KNwLMvd
-ywd0qXAjWOWDBWEVX/Ob4C5w+w2wWX6doHHSBWSifyCCyDgmacRWAnclNDj6LC5e
-JPQTBqJNf1CMqxduQELCPjOvJP7Sovf/BttiO4Jcp247dRdIWwef8/zSsRtWf6Ap
-61iNGsrCJBShu5ebfeFBhcpHljyCacj2KajrmpiTAgMBAAGjggJsMIICaDA5BgNV
-HSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYG
-Z4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUF
-BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUmRPhL/ARwEPGWe/29pCd6OFlW8UwHwYD
-VR0jBBgwFoAUxovP+kT8OmpLaKvo5784I+W6CpYwGgYDVR0RBBMwEYIPaWRwLmRm
-bi1jZXJ0LmRlMIGjBgNVHR8EgZswgZgwSqBIoEaGRGh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
-Y2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3JsLmNybDCB8QYIKwYBBQUHAQEEgeQw
-geEwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2
-ZXIvT0NTUDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4t
-Y2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MFQG
-CCsGAQUFBzAChkhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
-Y2VzLWdtYmgtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
-BQADggEBAJwW/bCz/aJ0t1CU9CC52mjFS3hVzMkPCmToRpYuQDuITRjakMphjlVw
-D2b/utqr6RBB0x2ocQrUznqj4qIlT4AINihxn4sH5ATYGAqAfQ0dZ6IO4bDDHc6P
-dip93yux2f31NAcQCuew9kFdZOU76p/t15FaIFTJIFLKR7yQegFV5tI4IPTT9aLK
-TyC6KMj0jBoQs13PFTaQdc5/aFAq7qZfU73T09v/vMvXYToQjyrAZPoxHZv1P0GR
-piCOUUEOz3aTwZx19BPTfUlejSY4OBi3sYJy7rEORlEpWXwkHw6FAC4ePvquxva5
-PNajQeL3bxnnkz4YuncP/ay7SKMycRo=
-</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>idp.dfn-cert.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
-REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xNDA0MDgxNTIzMTBa
-Fw0xOTAyMTMwMDAwMDBaMGwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
-MRAwDgYDVQQHEwdIYW1idXJnMR8wHQYDVQQKExZERk4tQ0VSVCBTZXJ2aWNlcyBH
-bWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDGmE9dz1W6j62JiorQhJWhp5tVKpvt2YR3RbS4UWUQljBk
-Oab9wFq8zsGgL94aZRWllmixsOJStEdi+TvyPhG6FOmR/ETXvvfPbho3FCZ/Sfip
-lbQnnqETSZfVW0UoP8Tr46zY+hZYMEoxfmH8rj72rSmCIrOLjgdIf5UZ0KNwLMvd
-ywd0qXAjWOWDBWEVX/Ob4C5w+w2wWX6doHHSBWSifyCCyDgmacRWAnclNDj6LC5e
-JPQTBqJNf1CMqxduQELCPjOvJP7Sovf/BttiO4Jcp247dRdIWwef8/zSsRtWf6Ap
-61iNGsrCJBShu5ebfeFBhcpHljyCacj2KajrmpiTAgMBAAGjggJsMIICaDA5BgNV
-HSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYG
-Z4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUF
-BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUmRPhL/ARwEPGWe/29pCd6OFlW8UwHwYD
-VR0jBBgwFoAUxovP+kT8OmpLaKvo5784I+W6CpYwGgYDVR0RBBMwEYIPaWRwLmRm
-bi1jZXJ0LmRlMIGjBgNVHR8EgZswgZgwSqBIoEaGRGh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
-Y2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3JsLmNybDCB8QYIKwYBBQUHAQEEgeQw
-geEwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2
-ZXIvT0NTUDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4t
-Y2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MFQG
-CCsGAQUFBzAChkhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
-Y2VzLWdtYmgtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
-BQADggEBAJwW/bCz/aJ0t1CU9CC52mjFS3hVzMkPCmToRpYuQDuITRjakMphjlVw
-D2b/utqr6RBB0x2ocQrUznqj4qIlT4AINihxn4sH5ATYGAqAfQ0dZ6IO4bDDHc6P
-dip93yux2f31NAcQCuew9kFdZOU76p/t15FaIFTJIFLKR7yQegFV5tI4IPTT9aLK
-TyC6KMj0jBoQs13PFTaQdc5/aFAq7qZfU73T09v/vMvXYToQjyrAZPoxHZv1P0GR
-piCOUUEOz3aTwZx19BPTfUlejSY4OBi3sYJy7rEORlEpWXwkHw6FAC4ePvquxva5
-PNajQeL3bxnnkz4YuncP/ay7SKMycRo=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <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-POST" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn-cert.de/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dfn-cert.de/idp/profile/Shibboleth/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">dfn-cert.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
-REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xNDA0MDgxNTIzMTBa
-Fw0xOTAyMTMwMDAwMDBaMGwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
-MRAwDgYDVQQHEwdIYW1idXJnMR8wHQYDVQQKExZERk4tQ0VSVCBTZXJ2aWNlcyBH
-bWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDGmE9dz1W6j62JiorQhJWhp5tVKpvt2YR3RbS4UWUQljBk
-Oab9wFq8zsGgL94aZRWllmixsOJStEdi+TvyPhG6FOmR/ETXvvfPbho3FCZ/Sfip
-lbQnnqETSZfVW0UoP8Tr46zY+hZYMEoxfmH8rj72rSmCIrOLjgdIf5UZ0KNwLMvd
-ywd0qXAjWOWDBWEVX/Ob4C5w+w2wWX6doHHSBWSifyCCyDgmacRWAnclNDj6LC5e
-JPQTBqJNf1CMqxduQELCPjOvJP7Sovf/BttiO4Jcp247dRdIWwef8/zSsRtWf6Ap
-61iNGsrCJBShu5ebfeFBhcpHljyCacj2KajrmpiTAgMBAAGjggJsMIICaDA5BgNV
-HSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYG
-Z4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUF
-BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUmRPhL/ARwEPGWe/29pCd6OFlW8UwHwYD
-VR0jBBgwFoAUxovP+kT8OmpLaKvo5784I+W6CpYwGgYDVR0RBBMwEYIPaWRwLmRm
-bi1jZXJ0LmRlMIGjBgNVHR8EgZswgZgwSqBIoEaGRGh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
-Y2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3JsLmNybDCB8QYIKwYBBQUHAQEEgeQw
-geEwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2
-ZXIvT0NTUDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4t
-Y2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MFQG
-CCsGAQUFBzAChkhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
-Y2VzLWdtYmgtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
-BQADggEBAJwW/bCz/aJ0t1CU9CC52mjFS3hVzMkPCmToRpYuQDuITRjakMphjlVw
-D2b/utqr6RBB0x2ocQrUznqj4qIlT4AINihxn4sH5ATYGAqAfQ0dZ6IO4bDDHc6P
-dip93yux2f31NAcQCuew9kFdZOU76p/t15FaIFTJIFLKR7yQegFV5tI4IPTT9aLK
-TyC6KMj0jBoQs13PFTaQdc5/aFAq7qZfU73T09v/vMvXYToQjyrAZPoxHZv1P0GR
-piCOUUEOz3aTwZx19BPTfUlejSY4OBi3sYJy7rEORlEpWXwkHw6FAC4ePvquxva5
-PNajQeL3bxnnkz4YuncP/ay7SKMycRo=
-</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>idp.dfn-cert.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHF2OR7ehZwzANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
-REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xNDA0MDgxNTIzMTBa
-Fw0xOTAyMTMwMDAwMDBaMGwxCzAJBgNVBAYTAkRFMRAwDgYDVQQIEwdIYW1idXJn
-MRAwDgYDVQQHEwdIYW1idXJnMR8wHQYDVQQKExZERk4tQ0VSVCBTZXJ2aWNlcyBH
-bWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDGmE9dz1W6j62JiorQhJWhp5tVKpvt2YR3RbS4UWUQljBk
-Oab9wFq8zsGgL94aZRWllmixsOJStEdi+TvyPhG6FOmR/ETXvvfPbho3FCZ/Sfip
-lbQnnqETSZfVW0UoP8Tr46zY+hZYMEoxfmH8rj72rSmCIrOLjgdIf5UZ0KNwLMvd
-ywd0qXAjWOWDBWEVX/Ob4C5w+w2wWX6doHHSBWSifyCCyDgmacRWAnclNDj6LC5e
-JPQTBqJNf1CMqxduQELCPjOvJP7Sovf/BttiO4Jcp247dRdIWwef8/zSsRtWf6Ap
-61iNGsrCJBShu5ebfeFBhcpHljyCacj2KajrmpiTAgMBAAGjggJsMIICaDA5BgNV
-HSAEMjAwMBEGDysGAQQBga0hgiwBAQQDATARBg8rBgEEAYGtIYIsAgEEAwEwCAYG
-Z4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUF
-BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUmRPhL/ARwEPGWe/29pCd6OFlW8UwHwYD
-VR0jBBgwFoAUxovP+kT8OmpLaKvo5784I+W6CpYwGgYDVR0RBBMwEYIPaWRwLmRm
-bi1jZXJ0LmRlMIGjBgNVHR8EgZswgZgwSqBIoEaGRGh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
-Y2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3JsLmNybDCB8QYIKwYBBQUHAQEEgeQw
-geEwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2
-ZXIvT0NTUDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4t
-Y2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MFQG
-CCsGAQUFBzAChkhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi1jZXJ0LXNlcnZp
-Y2VzLWdtYmgtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
-BQADggEBAJwW/bCz/aJ0t1CU9CC52mjFS3hVzMkPCmToRpYuQDuITRjakMphjlVw
-D2b/utqr6RBB0x2ocQrUznqj4qIlT4AINihxn4sH5ATYGAqAfQ0dZ6IO4bDDHc6P
-dip93yux2f31NAcQCuew9kFdZOU76p/t15FaIFTJIFLKR7yQegFV5tI4IPTT9aLK
-TyC6KMj0jBoQs13PFTaQdc5/aFAq7qZfU73T09v/vMvXYToQjyrAZPoxHZv1P0GR
-piCOUUEOz3aTwZx19BPTfUlejSY4OBi3sYJy7rEORlEpWXwkHw6FAC4ePvquxva5
-PNajQeL3bxnnkz4YuncP/ay7SKMycRo=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de: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">e16</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e16</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">DFN-CERT Services GmbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">DFN-CERT Services GmbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.dfn-cert.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.dfn-cert.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Reimer</md:GivenName>
-    <md:SurName>Karlsen-Masur</md:SurName>
-    <md:EmailAddress>mailto:dfnpca@dfn-cert.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Reimer</md:GivenName>
-    <md:SurName>Karlsen-Masur</md:SurName>
-    <md:EmailAddress>mailto:dfnpca@dfn-cert.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn-cert.de.xml b/swamid-interfederations-2.0/idp.dfn-cert.de.xml
deleted file mode 100644
index 882533f1..00000000
--- a/swamid-interfederations-2.0/idp.dfn-cert.de.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dfn-cert.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn-cert.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFAzCCA+ugAwIBAgIHE1nFqSIIizANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
-REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xMjAyMTQxMTQwMTBa
-Fw0xNzAyMTIxMTQwMTBaMEgxCzAJBgNVBAYTAkRFMR8wHQYDVQQKExZERk4tQ0VS
-VCBTZXJ2aWNlcyBHbWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfUZBEY/6TQKhaAi5+mSuzC7qBGTiK
-vnbLnPSJ9axhZVV36kNvq/vexr9RbU3W8iSXVhLh738us/6jGDs8GSiyOK2EWKFH
-7r1POSFNewb7ry0xArh8z0FrLpg2EUQvPpGsItKCMV4uReLxS8/7XYGIxoT1mTz5
-wgZrlZZcNiMOZ6uN0A6nrwGfd031Q/MceEU90gEKzhHp3NVm4qDE0jhJMyGa6qiC
-vqZh3LnGagT2RDgKXP1jKb4ULdF6Xbl0hRtV3muqk4nq1NJtksAYqFYWzqVT4D7H
-Khni/+VaBLNxetcqDbfs4UZlJtb+wrtqCq0qUamgBY7K1R9KC2JsOB5JAgMBAAGj
-ggHgMIIB3DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFLAcXeAt16k87Y1X6GZNW5YeVNg2MB8G
-A1UdIwQYMBaAFMaLz/pE/DpqS2ir6Oe/OCPlugqWMIGjBgNVHR8EgZswgZgwSqBI
-oEaGRGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21i
-aC1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Rmbi1jZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3Js
-LmNybDCBvAYIKwYBBQUHAQEEga8wgawwVAYIKwYBBQUHMAKGSGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY2FjZXJ0
-L2dfY2FjZXJ0LmNydDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9kZm4tY2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcSKzlUFeCSHaZZwzS1+SW57QtFICzLUef
-BKp/s1syyrCi9IwyASFvKz/xXf2F5GocDsOeChQEdqyNe36wn7zAS/jWl4HfuyHA
-3H/XkqI5F8uoAZbwANkY/D+nLEivSLYICnfGHc3a0ZlJxNgW4Sa4pK7uYaxnudeC
-WSq4tGkmKUohZqozTC516HM6q62Gx5aI1ue/kKz13sX6YXSKxx73HJTTz9G/OIqX
-DhbibRKIEWUj38LD1Ch27wnyhfkMZFrhDoqdGOpVK37+Y6vaIM3gvJsOaljzRONt
-qyOgc+RqwPzmxl8ZI0GATuXgNJ7wJWxULj9tonaiJEtKHHqN062f
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFAzCCA+ugAwIBAgIHE1nFqSIIizANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
-REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xMjAyMTQxMTQwMTBa
-Fw0xNzAyMTIxMTQwMTBaMEgxCzAJBgNVBAYTAkRFMR8wHQYDVQQKExZERk4tQ0VS
-VCBTZXJ2aWNlcyBHbWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfUZBEY/6TQKhaAi5+mSuzC7qBGTiK
-vnbLnPSJ9axhZVV36kNvq/vexr9RbU3W8iSXVhLh738us/6jGDs8GSiyOK2EWKFH
-7r1POSFNewb7ry0xArh8z0FrLpg2EUQvPpGsItKCMV4uReLxS8/7XYGIxoT1mTz5
-wgZrlZZcNiMOZ6uN0A6nrwGfd031Q/MceEU90gEKzhHp3NVm4qDE0jhJMyGa6qiC
-vqZh3LnGagT2RDgKXP1jKb4ULdF6Xbl0hRtV3muqk4nq1NJtksAYqFYWzqVT4D7H
-Khni/+VaBLNxetcqDbfs4UZlJtb+wrtqCq0qUamgBY7K1R9KC2JsOB5JAgMBAAGj
-ggHgMIIB3DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFLAcXeAt16k87Y1X6GZNW5YeVNg2MB8G
-A1UdIwQYMBaAFMaLz/pE/DpqS2ir6Oe/OCPlugqWMIGjBgNVHR8EgZswgZgwSqBI
-oEaGRGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21i
-aC1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Rmbi1jZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3Js
-LmNybDCBvAYIKwYBBQUHAQEEga8wgawwVAYIKwYBBQUHMAKGSGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY2FjZXJ0
-L2dfY2FjZXJ0LmNydDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9kZm4tY2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcSKzlUFeCSHaZZwzS1+SW57QtFICzLUef
-BKp/s1syyrCi9IwyASFvKz/xXf2F5GocDsOeChQEdqyNe36wn7zAS/jWl4HfuyHA
-3H/XkqI5F8uoAZbwANkY/D+nLEivSLYICnfGHc3a0ZlJxNgW4Sa4pK7uYaxnudeC
-WSq4tGkmKUohZqozTC516HM6q62Gx5aI1ue/kKz13sX6YXSKxx73HJTTz9G/OIqX
-DhbibRKIEWUj38LD1Ch27wnyhfkMZFrhDoqdGOpVK37+Y6vaIM3gvJsOaljzRONt
-qyOgc+RqwPzmxl8ZI0GATuXgNJ7wJWxULj9tonaiJEtKHHqN062f
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn-cert.de/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn-cert.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dfn-cert.de/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dfn-cert.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFAzCCA+ugAwIBAgIHE1nFqSIIizANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
-REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xMjAyMTQxMTQwMTBa
-Fw0xNzAyMTIxMTQwMTBaMEgxCzAJBgNVBAYTAkRFMR8wHQYDVQQKExZERk4tQ0VS
-VCBTZXJ2aWNlcyBHbWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfUZBEY/6TQKhaAi5+mSuzC7qBGTiK
-vnbLnPSJ9axhZVV36kNvq/vexr9RbU3W8iSXVhLh738us/6jGDs8GSiyOK2EWKFH
-7r1POSFNewb7ry0xArh8z0FrLpg2EUQvPpGsItKCMV4uReLxS8/7XYGIxoT1mTz5
-wgZrlZZcNiMOZ6uN0A6nrwGfd031Q/MceEU90gEKzhHp3NVm4qDE0jhJMyGa6qiC
-vqZh3LnGagT2RDgKXP1jKb4ULdF6Xbl0hRtV3muqk4nq1NJtksAYqFYWzqVT4D7H
-Khni/+VaBLNxetcqDbfs4UZlJtb+wrtqCq0qUamgBY7K1R9KC2JsOB5JAgMBAAGj
-ggHgMIIB3DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFLAcXeAt16k87Y1X6GZNW5YeVNg2MB8G
-A1UdIwQYMBaAFMaLz/pE/DpqS2ir6Oe/OCPlugqWMIGjBgNVHR8EgZswgZgwSqBI
-oEaGRGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21i
-aC1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Rmbi1jZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3Js
-LmNybDCBvAYIKwYBBQUHAQEEga8wgawwVAYIKwYBBQUHMAKGSGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY2FjZXJ0
-L2dfY2FjZXJ0LmNydDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9kZm4tY2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcSKzlUFeCSHaZZwzS1+SW57QtFICzLUef
-BKp/s1syyrCi9IwyASFvKz/xXf2F5GocDsOeChQEdqyNe36wn7zAS/jWl4HfuyHA
-3H/XkqI5F8uoAZbwANkY/D+nLEivSLYICnfGHc3a0ZlJxNgW4Sa4pK7uYaxnudeC
-WSq4tGkmKUohZqozTC516HM6q62Gx5aI1ue/kKz13sX6YXSKxx73HJTTz9G/OIqX
-DhbibRKIEWUj38LD1Ch27wnyhfkMZFrhDoqdGOpVK37+Y6vaIM3gvJsOaljzRONt
-qyOgc+RqwPzmxl8ZI0GATuXgNJ7wJWxULj9tonaiJEtKHHqN062f
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dfn-cert.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dfn-cert.de,O=DFN-CERT Services GmbH,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFAzCCA+ugAwIBAgIHE1nFqSIIizANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWREZOLUNFUlQgU2VydmljZXMgR21iSDEoMCYGA1UEAxMf
-REZOLUNFUlQgU2VydmljZXMgR21iSCBDQSAtIEcwMjAeFw0xMjAyMTQxMTQwMTBa
-Fw0xNzAyMTIxMTQwMTBaMEgxCzAJBgNVBAYTAkRFMR8wHQYDVQQKExZERk4tQ0VS
-VCBTZXJ2aWNlcyBHbWJIMRgwFgYDVQQDEw9pZHAuZGZuLWNlcnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfUZBEY/6TQKhaAi5+mSuzC7qBGTiK
-vnbLnPSJ9axhZVV36kNvq/vexr9RbU3W8iSXVhLh738us/6jGDs8GSiyOK2EWKFH
-7r1POSFNewb7ry0xArh8z0FrLpg2EUQvPpGsItKCMV4uReLxS8/7XYGIxoT1mTz5
-wgZrlZZcNiMOZ6uN0A6nrwGfd031Q/MceEU90gEKzhHp3NVm4qDE0jhJMyGa6qiC
-vqZh3LnGagT2RDgKXP1jKb4ULdF6Xbl0hRtV3muqk4nq1NJtksAYqFYWzqVT4D7H
-Khni/+VaBLNxetcqDbfs4UZlJtb+wrtqCq0qUamgBY7K1R9KC2JsOB5JAgMBAAGj
-ggHgMIIB3DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFLAcXeAt16k87Y1X6GZNW5YeVNg2MB8G
-A1UdIwQYMBaAFMaLz/pE/DpqS2ir6Oe/OCPlugqWMIGjBgNVHR8EgZswgZgwSqBI
-oEaGRGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21i
-aC1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEqgSKBGhkRodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2Rmbi1jZXJ0LXNlcnZpY2VzLWdtYmgtY2EvcHViL2NybC9nX2NhY3Js
-LmNybDCBvAYIKwYBBQUHAQEEga8wgawwVAYIKwYBBQUHMAKGSGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvZGZuLWNlcnQtc2VydmljZXMtZ21iaC1jYS9wdWIvY2FjZXJ0
-L2dfY2FjZXJ0LmNydDBUBggrBgEFBQcwAoZIaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9kZm4tY2VydC1zZXJ2aWNlcy1nbWJoLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcSKzlUFeCSHaZZwzS1+SW57QtFICzLUef
-BKp/s1syyrCi9IwyASFvKz/xXf2F5GocDsOeChQEdqyNe36wn7zAS/jWl4HfuyHA
-3H/XkqI5F8uoAZbwANkY/D+nLEivSLYICnfGHc3a0ZlJxNgW4Sa4pK7uYaxnudeC
-WSq4tGkmKUohZqozTC516HM6q62Gx5aI1ue/kKz13sX6YXSKxx73HJTTz9G/OIqX
-DhbibRKIEWUj38LD1Ch27wnyhfkMZFrhDoqdGOpVK37+Y6vaIM3gvJsOaljzRONt
-qyOgc+RqwPzmxl8ZI0GATuXgNJ7wJWxULj9tonaiJEtKHHqN062f
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn-cert.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DFN-CERT Services GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DFN-CERT Services GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dfn-cert.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Reimer</GivenName>
-    <SurName>Karlsen-Masur</SurName>
-    <EmailAddress>dfnpca@dfn-cert.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Reimer</GivenName>
-    <SurName>Karlsen-Masur</SurName>
-    <EmailAddress>dfnpca@dfn-cert.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml
deleted file mode 100644
index 77b0b7f2..00000000
--- a/swamid-interfederations-2.0/idp.dfn.de-idp-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://idp.dfn.de/idp/shibboleth">
-  <md: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>
-    <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</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">dfn.de</shibmd: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dfn.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dfn.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dfn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dfn.de/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">dfn.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dfn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dfn.de: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">e15</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e15</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Verein zur Förderung eines Deutschen Forschungsnetzes</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">German National Research and Education Network, DFN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.dfn.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.dfn.de/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ulrich</md:GivenName>
-    <md:SurName>Kähler</md:SurName>
-    <md:EmailAddress>mailto:kaehler@dfn.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Raoul</md:GivenName>
-    <md:SurName>Borenius</md:SurName>
-    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>DFN-AAI</md:GivenName>
-    <md:SurName>Hotline</md:SurName>
-    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6389209d..00000000
--- a/swamid-interfederations-2.0/idp.dfn.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.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>MIIFmDCCBICgAwIBAgIHFmEkcjGkZzANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMzA5MjQx
-NDUxMTRaFw0xODA5MjMxNDUxMTRaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
-ZXJsaW4xDzANBgNVBAcTBkJlcmxpbjETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcG
-A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTETMBEGA1UEAxMKaWRwLmRmbi5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK84rlbKWfWE0umBtTqYIOXPZxK5
-yCZ4Mp62I8l8Blj3vb2Zu/YPShFqfRkM6KdTAGEBaSI9n4KjMvRg8OmbgZQrHZji
-7pKFHBGDxkSj2b6Np+nv+cZne3mqOoud+AkJkJIexdKKsiu2R9r7YdtIfAvPXbxn
-AALrwVRS9U2aMiEefdLi3wPnaK1O4oPpc4RL+OkVg+E4XT9ynvX3+v7EYb7XfFlD
-CDQZK6mYi/LrOKqNYcgO+BEsSqPThnpL1OJID9AWwhvusSLH0mYlTHWUSqNmURmR
-bvaBOvjbb4FNRhAWYGCSqpvC41h2YAzr0uTaGUZxEf+U2deed7Tgq7XN0QcCAwEA
-AaOCAkMwggI/MDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMAMBEGDysGAQQB
-ga0hgiwCAQQDADAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRsH29YUtAAzq1Y
-LThSQ+zcb8bhwTAfBgNVHSMEGDAWgBR5omIvzvEGOVLndm1ix96banVLSTAVBgNV
-HREEDjAMggppZHAuZGZuLmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3Mt
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3wYIKwYBBQUHAQEEgdIwgc8wMwYIKwYB
-BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBL
-BggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdz
-LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9nX2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBACvTlwnYC7H5XHT9cys+jKWbSu8h
-p07/4KCR0+wCFnMnyzPYc7buaff3MopsDkSrZWqWSFf6bDCmH3PbFE1j7wzrvUNi
-NQVzhKOUsfz/7Vv7qD4uY9NoJ6ujwOhe+fnsinZJXqaaMB4ODXjlmaqxWTtUhWdR
-yPtE6EEIWnzEnkQiBu7MsjKwQtJoohi5Yv/ia5q7dAYEux/z4C5o50gGVql+LFkS
-RMnQcO1XTzDAqXVwrrAi4nKeuup0NSi8GsLxTv3R4t31DOYKtuRBad95GQfCMeRt
-76UNQ60XhhXmSqN6jPetvxqRtKLzreFJjD5hQhtN8YzAk9zvzSfzweQv25I=
-</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>MIIFmDCCBICgAwIBAgIHFmEkcjGkZzANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcGA1UECxMQR2VzY2hhZWZ0c3N0
-ZWxsZTEfMB0GA1UEAxMWREZOLVZlcmVpbi1HUy1DQSAtIEcwMjAeFw0xMzA5MjQx
-NDUxMTRaFw0xODA5MjMxNDUxMTRaMHQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
-ZXJsaW4xDzANBgNVBAcTBkJlcmxpbjETMBEGA1UEChMKREZOLVZlcmVpbjEZMBcG
-A1UECxMQR2VzY2hhZWZ0c3N0ZWxsZTETMBEGA1UEAxMKaWRwLmRmbi5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK84rlbKWfWE0umBtTqYIOXPZxK5
-yCZ4Mp62I8l8Blj3vb2Zu/YPShFqfRkM6KdTAGEBaSI9n4KjMvRg8OmbgZQrHZji
-7pKFHBGDxkSj2b6Np+nv+cZne3mqOoud+AkJkJIexdKKsiu2R9r7YdtIfAvPXbxn
-AALrwVRS9U2aMiEefdLi3wPnaK1O4oPpc4RL+OkVg+E4XT9ynvX3+v7EYb7XfFlD
-CDQZK6mYi/LrOKqNYcgO+BEsSqPThnpL1OJID9AWwhvusSLH0mYlTHWUSqNmURmR
-bvaBOvjbb4FNRhAWYGCSqpvC41h2YAzr0uTaGUZxEf+U2deed7Tgq7XN0QcCAwEA
-AaOCAkMwggI/MDkGA1UdIAQyMDAwEQYPKwYBBAGBrSGCLAEBBAMAMBEGDysGAQQB
-ga0hgiwCAQQDADAIBgZngQwBAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRsH29YUtAAzq1Y
-LThSQ+zcb8bhwTAfBgNVHSMEGDAWgBR5omIvzvEGOVLndm1ix96banVLSTAVBgNV
-HREEDjAMggppZHAuZGZuLmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvZGZuLXZlcmVpbi1ncy1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3Mt
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3wYIKwYBBQUHAQEEgdIwgc8wMwYIKwYB
-BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBL
-BggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tdmVyZWluLWdz
-LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2Rmbi12ZXJlaW4tZ3MtY2EvcHViL2NhY2VydC9nX2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBACvTlwnYC7H5XHT9cys+jKWbSu8h
-p07/4KCR0+wCFnMnyzPYc7buaff3MopsDkSrZWqWSFf6bDCmH3PbFE1j7wzrvUNi
-NQVzhKOUsfz/7Vv7qD4uY9NoJ6ujwOhe+fnsinZJXqaaMB4ODXjlmaqxWTtUhWdR
-yPtE6EEIWnzEnkQiBu7MsjKwQtJoohi5Yv/ia5q7dAYEux/z4C5o50gGVql+LFkS
-RMnQcO1XTzDAqXVwrrAi4nKeuup0NSi8GsLxTv3R4t31DOYKtuRBad95GQfCMeRt
-76UNQ60XhhXmSqN6jPetvxqRtKLzreFJjD5hQhtN8YzAk9zvzSfzweQv25I=
-</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.dhbw-loerrach.de.xml b/swamid-interfederations-2.0/idp.dhbw-loerrach.de.xml
deleted file mode 100644
index fc9e757e..00000000
--- a/swamid-interfederations-2.0/idp.dhbw-loerrach.de.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dhbw-loerrach.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-loerrach.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dhbw-loerrach.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dhbw-loerrach.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBDCCA+ygAwIBAgIED5OdtzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTExNTIwMDhaFw0xNTAy
-MTAxNTIwMDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1sb2VycmFjaC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqMjwEuRk5vpI2/oAUQzip3
-POivvkc6Xi8KIJz3y79Fut8fq2HFJ1yBV+MRwHSfYue7CMNh1EUH1XzbjuWKP3Kk
-31jJw5WjBBicz2eiUJlRoBa5dPafNVr7asukQ/bSv1tm6ODCCpIZ8jCDtAziS25t
-i5D55PY/3eYzNAFj+ytAFWGc/lZwuWC68Z3PmKdhnEkcK7brQRanJCBNZClHC95g
-LHTXfnaEc4abEExuphk775Zon1HLAnGTt6T3L7bjwDyGKtLf4zlS/QParQQAjsBh
-eZHH1tgsfPb8NPrI888QoAUQrxr+vuF/S1tZMAAQCKcdk2lzF6UM6yPH9GzOGCcC
-AwEAAaOCAdwwggHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/AA/r1LLK1Ar9ArIQtc2RXEg
-aAQwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswHgYDVR0RBBcwFYET
-cnpAZGhidy1sb2VycmFjaC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
-ZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsG
-AQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAWbZ55kDs1kd5npZLVo32GKHGwhy+IsKV
-tNRDP6X8LjqzsURM21RzziJ2BaeNUyNZ82KJ/3BxeKdykuV8sFzVacSBO4N7vKfx
-NMjSnmGQ0YHC6X+C5mazggtdZPy6tMc8brC+LfwVJyqSf6azFioVj/BPH8oQiVuC
-sBryipXHM2+0/Gjk6fFPZ5WPtuc3LXISbTy4X4knkKdD9Jne/hsFYohDNElme5Tg
-LN9D7xKa+nFIhRPyODX06w5jAbYQyfwkIiW+7V5ckmwzPmqP2Vt1aW9iWoNk9TGT
-B6hy4uPU3H/uHBwKWjRk2rKmuXDdMW7NlKilqxOF2MYmG5hGq8h7SQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dhbw-loerrach.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dhbw-loerrach.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBDCCA+ygAwIBAgIED5OdtzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTExNTIwMDhaFw0xNTAy
-MTAxNTIwMDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1sb2VycmFjaC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqMjwEuRk5vpI2/oAUQzip3
-POivvkc6Xi8KIJz3y79Fut8fq2HFJ1yBV+MRwHSfYue7CMNh1EUH1XzbjuWKP3Kk
-31jJw5WjBBicz2eiUJlRoBa5dPafNVr7asukQ/bSv1tm6ODCCpIZ8jCDtAziS25t
-i5D55PY/3eYzNAFj+ytAFWGc/lZwuWC68Z3PmKdhnEkcK7brQRanJCBNZClHC95g
-LHTXfnaEc4abEExuphk775Zon1HLAnGTt6T3L7bjwDyGKtLf4zlS/QParQQAjsBh
-eZHH1tgsfPb8NPrI888QoAUQrxr+vuF/S1tZMAAQCKcdk2lzF6UM6yPH9GzOGCcC
-AwEAAaOCAdwwggHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/AA/r1LLK1Ar9ArIQtc2RXEg
-aAQwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswHgYDVR0RBBcwFYET
-cnpAZGhidy1sb2VycmFjaC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
-ZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsG
-AQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAWbZ55kDs1kd5npZLVo32GKHGwhy+IsKV
-tNRDP6X8LjqzsURM21RzziJ2BaeNUyNZ82KJ/3BxeKdykuV8sFzVacSBO4N7vKfx
-NMjSnmGQ0YHC6X+C5mazggtdZPy6tMc8brC+LfwVJyqSf6azFioVj/BPH8oQiVuC
-sBryipXHM2+0/Gjk6fFPZ5WPtuc3LXISbTy4X4knkKdD9Jne/hsFYohDNElme5Tg
-LN9D7xKa+nFIhRPyODX06w5jAbYQyfwkIiW+7V5ckmwzPmqP2Vt1aW9iWoNk9TGT
-B6hy4uPU3H/uHBwKWjRk2rKmuXDdMW7NlKilqxOF2MYmG5hGq8h7SQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-loerrach.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-loerrach.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dhbw-loerrach.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dhbw-loerrach.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dhbw-loerrach.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dhbw-loerrach.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-loerrach.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dhbw-loerrach.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dhbw-loerrach.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBDCCA+ygAwIBAgIED5OdtzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTExNTIwMDhaFw0xNTAy
-MTAxNTIwMDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1sb2VycmFjaC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqMjwEuRk5vpI2/oAUQzip3
-POivvkc6Xi8KIJz3y79Fut8fq2HFJ1yBV+MRwHSfYue7CMNh1EUH1XzbjuWKP3Kk
-31jJw5WjBBicz2eiUJlRoBa5dPafNVr7asukQ/bSv1tm6ODCCpIZ8jCDtAziS25t
-i5D55PY/3eYzNAFj+ytAFWGc/lZwuWC68Z3PmKdhnEkcK7brQRanJCBNZClHC95g
-LHTXfnaEc4abEExuphk775Zon1HLAnGTt6T3L7bjwDyGKtLf4zlS/QParQQAjsBh
-eZHH1tgsfPb8NPrI888QoAUQrxr+vuF/S1tZMAAQCKcdk2lzF6UM6yPH9GzOGCcC
-AwEAAaOCAdwwggHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/AA/r1LLK1Ar9ArIQtc2RXEg
-aAQwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswHgYDVR0RBBcwFYET
-cnpAZGhidy1sb2VycmFjaC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
-ZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsG
-AQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAWbZ55kDs1kd5npZLVo32GKHGwhy+IsKV
-tNRDP6X8LjqzsURM21RzziJ2BaeNUyNZ82KJ/3BxeKdykuV8sFzVacSBO4N7vKfx
-NMjSnmGQ0YHC6X+C5mazggtdZPy6tMc8brC+LfwVJyqSf6azFioVj/BPH8oQiVuC
-sBryipXHM2+0/Gjk6fFPZ5WPtuc3LXISbTy4X4knkKdD9Jne/hsFYohDNElme5Tg
-LN9D7xKa+nFIhRPyODX06w5jAbYQyfwkIiW+7V5ckmwzPmqP2Vt1aW9iWoNk9TGT
-B6hy4uPU3H/uHBwKWjRk2rKmuXDdMW7NlKilqxOF2MYmG5hGq8h7SQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dhbw-loerrach.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dhbw-loerrach.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBDCCA+ygAwIBAgIED5OdtzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTExNTIwMDhaFw0xNTAy
-MTAxNTIwMDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1sb2VycmFjaC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqMjwEuRk5vpI2/oAUQzip3
-POivvkc6Xi8KIJz3y79Fut8fq2HFJ1yBV+MRwHSfYue7CMNh1EUH1XzbjuWKP3Kk
-31jJw5WjBBicz2eiUJlRoBa5dPafNVr7asukQ/bSv1tm6ODCCpIZ8jCDtAziS25t
-i5D55PY/3eYzNAFj+ytAFWGc/lZwuWC68Z3PmKdhnEkcK7brQRanJCBNZClHC95g
-LHTXfnaEc4abEExuphk775Zon1HLAnGTt6T3L7bjwDyGKtLf4zlS/QParQQAjsBh
-eZHH1tgsfPb8NPrI888QoAUQrxr+vuF/S1tZMAAQCKcdk2lzF6UM6yPH9GzOGCcC
-AwEAAaOCAdwwggHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/AA/r1LLK1Ar9ArIQtc2RXEg
-aAQwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswHgYDVR0RBBcwFYET
-cnpAZGhidy1sb2VycmFjaC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
-ZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsG
-AQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0
-LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAWbZ55kDs1kd5npZLVo32GKHGwhy+IsKV
-tNRDP6X8LjqzsURM21RzziJ2BaeNUyNZ82KJ/3BxeKdykuV8sFzVacSBO4N7vKfx
-NMjSnmGQ0YHC6X+C5mazggtdZPy6tMc8brC+LfwVJyqSf6azFioVj/BPH8oQiVuC
-sBryipXHM2+0/Gjk6fFPZ5WPtuc3LXISbTy4X4knkKdD9Jne/hsFYohDNElme5Tg
-LN9D7xKa+nFIhRPyODX06w5jAbYQyfwkIiW+7V5ckmwzPmqP2Vt1aW9iWoNk9TGT
-B6hy4uPU3H/uHBwKWjRk2rKmuXDdMW7NlKilqxOF2MYmG5hGq8h7SQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-loerrach.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-loerrach.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DHBW Lörrach</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DHBW Lörrach</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dhbw-loerrach.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Schwindt</SurName>
-    <EmailAddress>schwindt@dhbw-loerrach.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dhbw-mannheim.de.xml b/swamid-interfederations-2.0/idp.dhbw-mannheim.de.xml
deleted file mode 100644
index c71fe6c8..00000000
--- a/swamid-interfederations-2.0/idp.dhbw-mannheim.de.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dhbw-mannheim.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-mannheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dhbw-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dhbw-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFDTCCA/WgAwIBAgIED5oe9DANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTYxMzQ1MDhaFw0xNTAy
-MTUxMzQ1MDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1tYW5uaGVpbS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4HcD6iRl82cDFmVIXVWrt0
-B3mdaeXvAjMwhPP9fwYrjseqCHdB6tGwpM7qGqDqn4oH2cm84Oe5LgsfNEl/de86
-FmG+uwlSO34ztqmgm0fbvssrYUUXDW5sHBdLEcVYfuE7F9FziZ319OAyMfDr0TzA
-QuTx6EskDQi3z6VQDSKd4ecukdzJlPqWXqKSyPgLmBx7cAgi9wLefywxj8MdIy6w
-wYn7EXr2VqxO4FyENLYP3sE4X7OI9cQnjZNpmumMtbYMBsmPlvBrb4zTIBvdeddT
-vnDsAGJnRBwUCSnLSCh181LUd3EouygVKpBC0p1x80x0KLMCAjlrolAKCw8kKRkC
-AwEAAaOCAeUwggHhMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUEBW5zFwFRcHimyV0gzL/04l/
-EpUwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswJwYDVR0RBCAwHoEc
-YWFpX3RlY2huaWtAZGhidy1tYW5uaGVpbS5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9
-hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9i
-YWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGd
-MIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1z
-ZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAMaLUWMFvevF1ZcYO+TMm
-ShhWkK7DiZqZ34K/4yqLVZc3JphztPT4ROohQz7xxkAcE8JOiieJCUnGGv4j7q1Z
-u7Enek/8VtFZBCXl/LiE3hH0KNaDEgRS4J+T0slTMGJxNqgPgy09A4xYlXUhznKt
-zFz46kMafDW0djOIzvvaMfkYqd6Px5gjJPiHUfVRMhhMspRSHTAp5aLMhBhznpPo
-7daIwVJjyoLxjm2E2aQ1ICC2uKy+q2qqeQZJB+LNbrYa0i/xtzToa4uD3jnqi/2H
-+hlMbJ6WpFHIBUd4Y1JfW7VEr4Ym1LtRPYYpfE7m0GrM7QPh5ph+YpC6uX2mlIZW
-Tw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-mannheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dhbw-mannheim.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dhbw-mannheim.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dhbw-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dhbw-mannheim.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-mannheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dhbw-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dhbw-mannheim.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFDTCCA/WgAwIBAgIED5oe9DANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAyMTYxMzQ1MDhaFw0xNTAy
-MTUxMzQ1MDhaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuZGhidy1tYW5uaGVpbS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN4HcD6iRl82cDFmVIXVWrt0
-B3mdaeXvAjMwhPP9fwYrjseqCHdB6tGwpM7qGqDqn4oH2cm84Oe5LgsfNEl/de86
-FmG+uwlSO34ztqmgm0fbvssrYUUXDW5sHBdLEcVYfuE7F9FziZ319OAyMfDr0TzA
-QuTx6EskDQi3z6VQDSKd4ecukdzJlPqWXqKSyPgLmBx7cAgi9wLefywxj8MdIy6w
-wYn7EXr2VqxO4FyENLYP3sE4X7OI9cQnjZNpmumMtbYMBsmPlvBrb4zTIBvdeddT
-vnDsAGJnRBwUCSnLSCh181LUd3EouygVKpBC0p1x80x0KLMCAjlrolAKCw8kKRkC
-AwEAAaOCAeUwggHhMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUEBW5zFwFRcHimyV0gzL/04l/
-EpUwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswJwYDVR0RBCAwHoEc
-YWFpX3RlY2huaWtAZGhidy1tYW5uaGVpbS5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9
-hjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9i
-YWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGd
-MIGaMEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1z
-ZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAMaLUWMFvevF1ZcYO+TMm
-ShhWkK7DiZqZ34K/4yqLVZc3JphztPT4ROohQz7xxkAcE8JOiieJCUnGGv4j7q1Z
-u7Enek/8VtFZBCXl/LiE3hH0KNaDEgRS4J+T0slTMGJxNqgPgy09A4xYlXUhznKt
-zFz46kMafDW0djOIzvvaMfkYqd6Px5gjJPiHUfVRMhhMspRSHTAp5aLMhBhznpPo
-7daIwVJjyoLxjm2E2aQ1ICC2uKy+q2qqeQZJB+LNbrYa0i/xtzToa4uD3jnqi/2H
-+hlMbJ6WpFHIBUd4Y1JfW7VEr4Ym1LtRPYYpfE7m0GrM7QPh5ph+YpC6uX2mlIZW
-Tw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-mannheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DHBW Mannheim IDP</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DHBW Mannheim</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dhbw-mannheim.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthias</GivenName>
-    <SurName>Weinbrenner</SurName>
-    <EmailAddress>weinbrenner@dhbw-mannheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dhbw-vs.de.xml b/swamid-interfederations-2.0/idp.dhbw-vs.de.xml
deleted file mode 100644
index c6fdf443..00000000
--- a/swamid-interfederations-2.0/idp.dhbw-vs.de.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dhbw-vs.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-vs.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identls01.dhbw-vs.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identls01.dhbw-vs.de,OU=Villingen-Schwenningen,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQzCCBCugAwIBAgIEEYRTSzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
-RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
-FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
-LXZzLmRlMB4XDTExMDIyMzA5MzkwN1oXDTE2MDIyMjA5MzkwN1owezELMAkGA1UE
-BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
-ZXJnMR8wHQYDVQQLExZWaWxsaW5nZW4tU2Nod2VubmluZ2VuMR0wGwYDVQQDExRp
-ZGVudGxzMDEuZGhidy12cy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANx/3v0g+7OKuJhOb0B9VFtO8XYh9ZwNci6Kfc3E5+UL/SqKqtHyT0gatKPd
-L9jYoEuSN2Ou551tT03SjOTMxpzjsbDNiYsSO7dFlsEeQ0kSvPtjmtxHlWPKjy2o
-7nCHz0dxicNgvO6YCR03Ktz3d+3H0sD4y8dXQQOE7VhMcNIQBngTtWvwN5Y21FSd
-z279KmGQLX/4jsi0uFQxo6wca4CQv+zeO6iUAxeOOqHxwXwLftNvyPsfFWEyZmLW
-DP8UtbtLVCMaIpcsU54MVpZiXPqjVajD0ahMM0VF5OAVSXB8DnzxBsEdpRWjp1Mn
-vlCabW+BS+LBQeC2SclZQucYuLECAwEAAaOCAdYwggHSMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUkFH/eg9OXb/u72UfzdOkz7BefbEwHwYDVR0jBBgwFoAUjOlwcWC4U59Expde
-Qh/tKHK9Dn4wRwYDVR0RBEAwPoIUaWRlbnRsczAxLmRoYnctdnMuZGWCDmlkcC5k
-aGJ3LXZzLmRlghBpZHAwMS5kaGJ3LXZzLmRlhwTBxLs6MHkGA1UdHwRyMHAwNqA0
-oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEATmYhNFiBBQTc
-zWXCHTmhCiWrxks4i2u4W9XulYPkfUKg0LpM7bslDii9UJmVMDg+3nu5fnSRwsTx
-xffHXVvZc42FVdjoRb6N2+Vm5R70nyNyMwa9uSyyOxd8HquDrbpwi1hjsgCUMewN
-BVAm42c0G+wy7xlzQQhMflZ2rJpxNq7Qw7QcXYdXGQajz+XpaV+Apqzs5oMCYd1E
-9h/L3g3k5kyPnGa6aJy7swsOemiT3kRtS8pb/kYjQXp4RG4TK4iADiodhwq/W2F+
-WFvBsDZ+9FkpReY5zJj8BUBJqMZ3l5teI6XMa+1DzDVaF9G9XNrPa82A6Y3w820I
-uxD/wQ4p7Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identls01.dhbw-vs.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identls01.dhbw-vs.de,OU=Villingen-Schwenningen,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQzCCBCugAwIBAgIEEYRTSzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
-RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
-FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
-LXZzLmRlMB4XDTExMDIyMzA5MzkwN1oXDTE2MDIyMjA5MzkwN1owezELMAkGA1UE
-BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
-ZXJnMR8wHQYDVQQLExZWaWxsaW5nZW4tU2Nod2VubmluZ2VuMR0wGwYDVQQDExRp
-ZGVudGxzMDEuZGhidy12cy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANx/3v0g+7OKuJhOb0B9VFtO8XYh9ZwNci6Kfc3E5+UL/SqKqtHyT0gatKPd
-L9jYoEuSN2Ou551tT03SjOTMxpzjsbDNiYsSO7dFlsEeQ0kSvPtjmtxHlWPKjy2o
-7nCHz0dxicNgvO6YCR03Ktz3d+3H0sD4y8dXQQOE7VhMcNIQBngTtWvwN5Y21FSd
-z279KmGQLX/4jsi0uFQxo6wca4CQv+zeO6iUAxeOOqHxwXwLftNvyPsfFWEyZmLW
-DP8UtbtLVCMaIpcsU54MVpZiXPqjVajD0ahMM0VF5OAVSXB8DnzxBsEdpRWjp1Mn
-vlCabW+BS+LBQeC2SclZQucYuLECAwEAAaOCAdYwggHSMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUkFH/eg9OXb/u72UfzdOkz7BefbEwHwYDVR0jBBgwFoAUjOlwcWC4U59Expde
-Qh/tKHK9Dn4wRwYDVR0RBEAwPoIUaWRlbnRsczAxLmRoYnctdnMuZGWCDmlkcC5k
-aGJ3LXZzLmRlghBpZHAwMS5kaGJ3LXZzLmRlhwTBxLs6MHkGA1UdHwRyMHAwNqA0
-oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEATmYhNFiBBQTc
-zWXCHTmhCiWrxks4i2u4W9XulYPkfUKg0LpM7bslDii9UJmVMDg+3nu5fnSRwsTx
-xffHXVvZc42FVdjoRb6N2+Vm5R70nyNyMwa9uSyyOxd8HquDrbpwi1hjsgCUMewN
-BVAm42c0G+wy7xlzQQhMflZ2rJpxNq7Qw7QcXYdXGQajz+XpaV+Apqzs5oMCYd1E
-9h/L3g3k5kyPnGa6aJy7swsOemiT3kRtS8pb/kYjQXp4RG4TK4iADiodhwq/W2F+
-WFvBsDZ+9FkpReY5zJj8BUBJqMZ3l5teI6XMa+1DzDVaF9G9XNrPa82A6Y3w820I
-uxD/wQ4p7Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-vs.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-vs.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dhbw-vs.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dhbw-vs.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dhbw-vs.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dhbw-vs.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-vs.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identls01.dhbw-vs.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identls01.dhbw-vs.de,OU=Villingen-Schwenningen,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQzCCBCugAwIBAgIEEYRTSzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
-RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
-FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
-LXZzLmRlMB4XDTExMDIyMzA5MzkwN1oXDTE2MDIyMjA5MzkwN1owezELMAkGA1UE
-BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
-ZXJnMR8wHQYDVQQLExZWaWxsaW5nZW4tU2Nod2VubmluZ2VuMR0wGwYDVQQDExRp
-ZGVudGxzMDEuZGhidy12cy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANx/3v0g+7OKuJhOb0B9VFtO8XYh9ZwNci6Kfc3E5+UL/SqKqtHyT0gatKPd
-L9jYoEuSN2Ou551tT03SjOTMxpzjsbDNiYsSO7dFlsEeQ0kSvPtjmtxHlWPKjy2o
-7nCHz0dxicNgvO6YCR03Ktz3d+3H0sD4y8dXQQOE7VhMcNIQBngTtWvwN5Y21FSd
-z279KmGQLX/4jsi0uFQxo6wca4CQv+zeO6iUAxeOOqHxwXwLftNvyPsfFWEyZmLW
-DP8UtbtLVCMaIpcsU54MVpZiXPqjVajD0ahMM0VF5OAVSXB8DnzxBsEdpRWjp1Mn
-vlCabW+BS+LBQeC2SclZQucYuLECAwEAAaOCAdYwggHSMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUkFH/eg9OXb/u72UfzdOkz7BefbEwHwYDVR0jBBgwFoAUjOlwcWC4U59Expde
-Qh/tKHK9Dn4wRwYDVR0RBEAwPoIUaWRlbnRsczAxLmRoYnctdnMuZGWCDmlkcC5k
-aGJ3LXZzLmRlghBpZHAwMS5kaGJ3LXZzLmRlhwTBxLs6MHkGA1UdHwRyMHAwNqA0
-oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEATmYhNFiBBQTc
-zWXCHTmhCiWrxks4i2u4W9XulYPkfUKg0LpM7bslDii9UJmVMDg+3nu5fnSRwsTx
-xffHXVvZc42FVdjoRb6N2+Vm5R70nyNyMwa9uSyyOxd8HquDrbpwi1hjsgCUMewN
-BVAm42c0G+wy7xlzQQhMflZ2rJpxNq7Qw7QcXYdXGQajz+XpaV+Apqzs5oMCYd1E
-9h/L3g3k5kyPnGa6aJy7swsOemiT3kRtS8pb/kYjQXp4RG4TK4iADiodhwq/W2F+
-WFvBsDZ+9FkpReY5zJj8BUBJqMZ3l5teI6XMa+1DzDVaF9G9XNrPa82A6Y3w820I
-uxD/wQ4p7Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>identls01.dhbw-vs.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=identls01.dhbw-vs.de,OU=Villingen-Schwenningen,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQzCCBCugAwIBAgIEEYRTSzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
-RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
-FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
-LXZzLmRlMB4XDTExMDIyMzA5MzkwN1oXDTE2MDIyMjA5MzkwN1owezELMAkGA1UE
-BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
-ZXJnMR8wHQYDVQQLExZWaWxsaW5nZW4tU2Nod2VubmluZ2VuMR0wGwYDVQQDExRp
-ZGVudGxzMDEuZGhidy12cy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANx/3v0g+7OKuJhOb0B9VFtO8XYh9ZwNci6Kfc3E5+UL/SqKqtHyT0gatKPd
-L9jYoEuSN2Ou551tT03SjOTMxpzjsbDNiYsSO7dFlsEeQ0kSvPtjmtxHlWPKjy2o
-7nCHz0dxicNgvO6YCR03Ktz3d+3H0sD4y8dXQQOE7VhMcNIQBngTtWvwN5Y21FSd
-z279KmGQLX/4jsi0uFQxo6wca4CQv+zeO6iUAxeOOqHxwXwLftNvyPsfFWEyZmLW
-DP8UtbtLVCMaIpcsU54MVpZiXPqjVajD0ahMM0VF5OAVSXB8DnzxBsEdpRWjp1Mn
-vlCabW+BS+LBQeC2SclZQucYuLECAwEAAaOCAdYwggHSMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUkFH/eg9OXb/u72UfzdOkz7BefbEwHwYDVR0jBBgwFoAUjOlwcWC4U59Expde
-Qh/tKHK9Dn4wRwYDVR0RBEAwPoIUaWRlbnRsczAxLmRoYnctdnMuZGWCDmlkcC5k
-aGJ3LXZzLmRlghBpZHAwMS5kaGJ3LXZzLmRlhwTBxLs6MHkGA1UdHwRyMHAwNqA0
-oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEATmYhNFiBBQTc
-zWXCHTmhCiWrxks4i2u4W9XulYPkfUKg0LpM7bslDii9UJmVMDg+3nu5fnSRwsTx
-xffHXVvZc42FVdjoRb6N2+Vm5R70nyNyMwa9uSyyOxd8HquDrbpwi1hjsgCUMewN
-BVAm42c0G+wy7xlzQQhMflZ2rJpxNq7Qw7QcXYdXGQajz+XpaV+Apqzs5oMCYd1E
-9h/L3g3k5kyPnGa6aJy7swsOemiT3kRtS8pb/kYjQXp4RG4TK4iADiodhwq/W2F+
-WFvBsDZ+9FkpReY5zJj8BUBJqMZ3l5teI6XMa+1DzDVaF9G9XNrPa82A6Y3w820I
-uxD/wQ4p7Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dhbw-vs.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dhbw-vs.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Duale Hochschule BW</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DHBW-VS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dhbw-vs.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Speck</SurName>
-    <EmailAddress>Thomas.Speck@dhbw-vs.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
deleted file mode 100644
index c10b2930..00000000
--- a/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,76 +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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dias.ie/idp/profile/Shibboleth/SSO"/>
-  </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>mailto: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>mailto: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>mailto: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 6d1a591f..00000000
--- a/swamid-interfederations-2.0/idp.dijon.iufm.fr-idp-shibboleth.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://idp.dijon.iufm.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ESPE de Bourgogne - Dpt MEEF</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.dijon.iufm.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ESPE de Bourgogne - Dpt MEEF</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>
-					      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>
-    </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-POST" Location="https://idp.dijon.iufm.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dijon.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dijon.iufm.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ESPE de Bourgogne - Dpt MEEF</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ESPE de Bourgogne - Dpt MEEF</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dijon.iufm.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Bourdin Jean-Michel</md:SurName>
-    <md:EmailAddress>jean-michel.bourdin@dijon.iufm.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 71d9ecf5..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dir.garr.it/idp/shibboleth">
-  <md: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>
-  </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">garr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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:PrivacyStatementURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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.dir.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dir.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GARR</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GARR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">GARR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it/b/eng</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.garr.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:system.support@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 919cc783..00000000
--- a/swamid-interfederations-2.0/idp.dir.garr.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: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.dir.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-07-29T12: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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GARR AA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Attribute Authority for GARR staff</mdui:Description>
-        <mdui:DisplayName xml:lang="it">GARR AA</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Attribute Authority per il personale GARR</mdui:Description>
-      </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>
-    <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 c617035d..00000000
--- a/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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-06T23:00:00Z"/>
-    <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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:Logo height="124" width="124" xml:lang="en">data:image/png;base64,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</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:DomainHint>dit.ie</mdui:DomainHint>
-        <mdui:IPHint>147.252.0.0/16</mdui:IPHint>
-        <mdui:IPHint>193.1.28.0/24</mdui:IPHint>
-        <mdui:IPHint>193.186.8.0/29</mdui:IPHint>
-        <mdui:IPHint>193.1.186.8/29</mdui:IPHint>
-        <mdui:IPHint>2001:0770:0068::/48</mdui:IPHint>
-      </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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dit.ie/idp/profile/Shibboleth/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>mailto:liam.duffy@dit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@dit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tracey</md:GivenName>
-    <md:SurName>Roche</md:SurName>
-    <md:EmailAddress>mailto: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 705f219e..00000000
--- a/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.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" 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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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:Logo height="98" width="155" xml:lang="en">data:image/png;base64,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</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:DomainHint>dkit.ie</mdui:DomainHint>
-        <mdui:IPHint>193.1.40.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:0770:0028::/48</mdui:IPHint>
-      </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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dkit.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dkit.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dkit.ie/idp/profile/Shibboleth/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>Michael</md:GivenName>
-    <md:SurName>Deenihan</md:SurName>
-    <md:EmailAddress>mailto:michael.denihan@dkit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Frank</md:GivenName>
-    <md:SurName>Brady</md:SurName>
-    <md:EmailAddress>mailto:frank.brady@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 13e6686e..00000000
--- a/swamid-interfederations-2.0/idp.dkit.ie.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dkit.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo 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 regexp="false">dkit.ie</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Logo height="98" width="155">https://edugate.heanet.ie/rr3/logos/dkit.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">Dundalk Institute of Technology</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.dkit.ie</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:GeolocationHint>geo:53.984667,-6.394150</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <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.dlr.de.xml b/swamid-interfederations-2.0/idp.dlr.de.xml
deleted file mode 100644
index 420d10b1..00000000
--- a/swamid-interfederations-2.0/idp.dlr.de.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dlr.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dlr.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dlr.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dlr.de,O=Deutsches Zentrum fuer Luft- und Raumfahrt e.V. (DLR),C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBzCCA++gAwIBAgIEC8u/fjANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
-RTE+MDwGA1UEChM1RGV1dHNjaGVzIFplbnRydW0gZnVlciBMdWZ0LSB1bmQgUmF1
-bWZhaHJ0IGUuVi4gKERMUikxFTATBgNVBAMTDERMUiBDQSAtIEcwMjEYMBYGCSqG
-SIb3DQEJARYJY2FAZGxyLmRlMB4XDTA4MDIwODExNTAwN1oXDTEzMDIwNjExNTAw
-N1owYjELMAkGA1UEBhMCREUxPjA8BgNVBAoTNURldXRzY2hlcyBaZW50cnVtIGZ1
-ZXIgTHVmdC0gdW5kIFJhdW1mYWhydCBlLlYuIChETFIpMRMwEQYDVQQDEwppZHAu
-ZGxyLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxh5rErO6Qlwc
-druGYlRGvcT9dWfHzsas2PJFWqhV/rftZbnWytSVVKhnFkuanBjf8L3J2eV19OW7
-WwX/rp+q5Pi/Z6JaMlP6fxUN/WTpk78g4+0OhRuoLV1KHdu15MoWs3783PlUcJgJ
-ct5WWj+xF7JHbhhNFDe+Rgvj8YxGDBPKP6P2Ut7CZn4NpVxdhklst9+f9atdeZIN
-X1V4o/T9cwzaCOGq/YQpwaelNPftQL+bafAvTti9VjU3mb2j3lE4PzqYYGOV+x6p
-zbo11okLeWqTxjojGPkMdN4N41fa7VFY2ePvI4vB1yMl5+GeK4U3DyVCQLW2QwW5
-qCA6JYbSlwIDAQABo4IBpzCCAaMwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQRq/Omucsl/TzT
-65CUDwGldzWRKTAfBgNVHSMEGDAWgBRmoqXzRT2+lHczLTCbISj3/AwdtTAUBgNV
-HREEDTALgQlyYUBkbHIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9kbHItY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9kbHItY2EvcHViL2NybC9nX2NhY3JsLmNybDCB
-lgYIKwYBBQUHAQEEgYkwgYYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvZGxyLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
-hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rsci1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAEJI2dEuw0JLghN/WqQg5F/3hm+GK
-7O/JP1cumra0PUdRBRcNunqMKFQmZsXs+qOFhsHeYWK6mPfxqOUV7mXLRfintjLZ
-IyvfIEuJgQRL9ksiqs5M0aqdSfjueIdw969pyr2fINpY206EWnoj7w9ULFAEhNPv
-+8sezskmCtSdz67IoKMO/xeboHkXT/gzPwYtqgJUmGollv579ZETb2ILy67OKDAe
-yXbmklXUV0ItF6seXlz1/wtmShoUWmXh7pBLp2Dl/642X0PrsLv1fjCeOlvVHGIo
-HUbHHKBnr2VeUN5gxHUc2RJRuPhywCI8IfdyZP8YboU8BYMt6uE8SmIl3A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dlr.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dlr.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dlr.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dlr.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dlr.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dlr.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dlr.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.dlr.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.dlr.de,O=Deutsches Zentrum fuer Luft- und Raumfahrt e.V. (DLR),C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBzCCA++gAwIBAgIEC8u/fjANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
-RTE+MDwGA1UEChM1RGV1dHNjaGVzIFplbnRydW0gZnVlciBMdWZ0LSB1bmQgUmF1
-bWZhaHJ0IGUuVi4gKERMUikxFTATBgNVBAMTDERMUiBDQSAtIEcwMjEYMBYGCSqG
-SIb3DQEJARYJY2FAZGxyLmRlMB4XDTA4MDIwODExNTAwN1oXDTEzMDIwNjExNTAw
-N1owYjELMAkGA1UEBhMCREUxPjA8BgNVBAoTNURldXRzY2hlcyBaZW50cnVtIGZ1
-ZXIgTHVmdC0gdW5kIFJhdW1mYWhydCBlLlYuIChETFIpMRMwEQYDVQQDEwppZHAu
-ZGxyLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxh5rErO6Qlwc
-druGYlRGvcT9dWfHzsas2PJFWqhV/rftZbnWytSVVKhnFkuanBjf8L3J2eV19OW7
-WwX/rp+q5Pi/Z6JaMlP6fxUN/WTpk78g4+0OhRuoLV1KHdu15MoWs3783PlUcJgJ
-ct5WWj+xF7JHbhhNFDe+Rgvj8YxGDBPKP6P2Ut7CZn4NpVxdhklst9+f9atdeZIN
-X1V4o/T9cwzaCOGq/YQpwaelNPftQL+bafAvTti9VjU3mb2j3lE4PzqYYGOV+x6p
-zbo11okLeWqTxjojGPkMdN4N41fa7VFY2ePvI4vB1yMl5+GeK4U3DyVCQLW2QwW5
-qCA6JYbSlwIDAQABo4IBpzCCAaMwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQRq/Omucsl/TzT
-65CUDwGldzWRKTAfBgNVHSMEGDAWgBRmoqXzRT2+lHczLTCbISj3/AwdtTAUBgNV
-HREEDTALgQlyYUBkbHIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9kbHItY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9kbHItY2EvcHViL2NybC9nX2NhY3JsLmNybDCB
-lgYIKwYBBQUHAQEEgYkwgYYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvZGxyLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
-hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Rsci1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAEJI2dEuw0JLghN/WqQg5F/3hm+GK
-7O/JP1cumra0PUdRBRcNunqMKFQmZsXs+qOFhsHeYWK6mPfxqOUV7mXLRfintjLZ
-IyvfIEuJgQRL9ksiqs5M0aqdSfjueIdw969pyr2fINpY206EWnoj7w9ULFAEhNPv
-+8sezskmCtSdz67IoKMO/xeboHkXT/gzPwYtqgJUmGollv579ZETb2ILy67OKDAe
-yXbmklXUV0ItF6seXlz1/wtmShoUWmXh7pBLp2Dl/642X0PrsLv1fjCeOlvVHGIo
-HUbHHKBnr2VeUN5gxHUc2RJRuPhywCI8IfdyZP8YboU8BYMt6uE8SmIl3A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dlr.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dlr.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DLR - Deutsches Zentrum fuer Luft- und Raumfahrt e.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DLR - Deutsches Zentrum fuer Luft- und Raumfahrt e.V.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dlr.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Gert</GivenName>
-    <SurName>Ohme</SurName>
-    <EmailAddress>Gert.Ohme@t-systems-sfr.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gert</GivenName>
-    <SurName>Ohme</SurName>
-    <EmailAddress>Gert.Ohme@t-systems-sfr.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.drew.edu-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.drew.edu-nidp-saml2-metadata.xml
deleted file mode 100644
index 28531098..00000000
--- a/swamid-interfederations-2.0/idp.drew.edu-nidp-saml2-metadata.xml
+++ /dev/null
@@ -1,79 +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://idp.drew.edu/nidp/saml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">drew.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Drew University</mdui:DisplayName>
-        <mdui:Logo height="40" width="171" xml:lang="en">https://www.drew.edu/wp-content/themes/drew-v8/images/drew.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>
-MIIFcDCCBFigAwIBAgIkAhwR/6UpY1+NpltpnhnZa/x7S0A+G7lu0QhsucXUAgIiSVXDMA0GCSqG
-SIb3DQEBBQUAMDIxGjAYBgNVBAsTEU9yZ2FuaXphdGlvbmFsIENBMRQwEgYDVQQKFAtmcmlkZ2Vf
-dHJlZTAeFw0xNTEwMjcwMTUxMzVaFw0yNDAxMjcwMjUxMzVaMH0xFTATBgNVBAMTDGlkcC5kcmV3
-LmVkdTEeMBwGA1UECxMVVW5pdmVyc2l0eSBUZWNobm9sb2d5MRgwFgYDVQQKEw9EcmV3IFVuaXZl
-cnNpdHkxEDAOBgNVBAcTB01hZGlzb24xCzAJBgNVBAgTAk5KMQswCQYDVQQGEwJVUzCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZOAXI9sEgr11k23oOv59ipULZ3YmHhFSMHBTT2WM4v
-WSaIPoo/qO1jCHzSYQGYCMgqU5Wez9KMWWDny4suz6/IbwY/IjG/nNoJnJknXfgckikIpQE8RYIH
-yGL2TgnSM2SbMDSpFdHvXrgoQaWOxy7GhZxVkZk8LqIRUlitkzkgncqa/RgrQJwUTFz1LYxI+3DW
-hqpxLT3SP76xG1LaWiKJa+hbQXV700W3XOMSo4JR9xaz6XtmkswslLIqE1T3tOTZHQGAKD/Ksy7s
-ETdgyAZw7d6jBs/qn4i2Ckn1oPsJAWMm1qywk3aehsH5u/VlO2Iey+JHIwqgygnPqXkjB6sCAwEA
-AaOCAiEwggIdMB0GA1UdDgQWBBT9LlVNRNY5uA1ZRSyL0AQ9L7kPOjAfBgNVHSMEGDAWgBSeeJux
-dKPExgACWHnJ4kSeQU068TALBgNVHQ8EBAMCBLAwggHMBgtghkgBhvg3AQkEAQSCAbswggG3BAIB
-AAEB/xMdTm92ZWxsIFNlY3VyaXR5IEF0dHJpYnV0ZSh0bSkWQ2h0dHA6Ly9kZXZlbG9wZXIubm92
-ZWxsLmNvbS9yZXBvc2l0b3J5L2F0dHJpYnV0ZXMvY2VydGF0dHJzX3YxMC5odG0wggFIoBoBAQAw
-CDAGAgEBAgFGMAgwBgIBAQIBCgIBaaEaAQEAMAgwBgIBAQIBADAIMAYCAQECAQACAQCiBgIBFwEB
-/6OCAQSgWAIBAgICAP8CAQADDQCAAAAAAAAAAAAAAAADCQCAAAAAAAAAADAYMBACAQACCH//////
-////AQEAAgQG8N9IMBgwEAIBAAIIf/////////8BAQACBAbw30ihWAIBAgICAP8CAQADDQBAAAAA
-AAAAAAAAAAADCQBAAAAAAAAAADAYMBACAQACCH//////////AQEAAgQR/6UpMBgwEAIBAAIIf///
-//////8BAQACBBH/pSmiTjBMAgECAgEAAgIA/wMNAIAAAAAAAAAAAAAAAAMJAIAAAAAAAAAAMBIw
-EAIBAAIIf/////////8BAQAwEjAQAgEAAgh//////////wEBADANBgkqhkiG9w0BAQUFAAOCAQEA
-Hzr+bV/7L4d9s0cDLL7m8RoqKO41olQONsEYhVCW7xS3DbZaO6qour0dNAtjqxFvhd5wO3MvCyvC
-iLXNxJMzPhbQFmZJQ14jZGoW7s876YdLGlj86p4QxUoY+m5cR+vOnf6a3yAU7v1Z/n1sjs3wPplz
-7UoAwC49BUkCfWK1Ko9Gj3yKv0IrxlGVsueiK7wfOWRG3stofjXwH/kVmae+i6z/VQwEfKeq2E48
-H7xmsk1TgDb04z+fo4dPJo31XGKXgD45/6WqhFC1+JJ625C7Pv0X6vcbdOSaE9XeBlkRdB6twTwR
-KcA2ygevOdEnii3nfZPpOW5q6at9iJ8GNzCphQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.drew.edu/nidp/saml2/soap" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.drew.edu/nidp/saml2/slo"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.drew.edu/nidp/saml2/slo"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.drew.edu/nidp/saml2/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.drew.edu/nidp/saml2/sso"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Drew University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Drew University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.drew.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>E. Axel Larsson</md:GivenName>
-    <md:EmailAddress>elarsson@drew.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>E. Axel Larsson</md:GivenName>
-    <md:EmailAddress>elarsson@drew.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>E. Axel Larsson</md:GivenName>
-    <md:EmailAddress>elarsson@drew.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>E. Axel Larsson</md:GivenName>
-    <md:EmailAddress>elarsson@drew.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dudleycol.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.dudleycol.ac.uk-openathens.xml
deleted file mode 100644
index dea10ec3..00000000
--- a/swamid-interfederations-2.0/idp.dudleycol.ac.uk-openathens.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.dudleycol.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Dudley College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">dudleycol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/dudleycol.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/dudleycol.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Dudley College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dudleycol.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dundee.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.dundee.ac.uk-shibboleth.xml
deleted file mode 100644
index 1bed4ee5..00000000
--- a/swamid-interfederations-2.0/idp.dundee.ac.uk-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.dundee.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Dundee.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-13T11:16: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">dundee.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Dundee</mdui:DisplayName>
-        <mdui:Logo height="60" width="85">https://idp.dundee.ac.uk/DundeeUniversityCrest.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEbTCCA1WgAwIBAgIQV2n6T3aZYb1/Q1TOgutwUDANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPjEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBpZHAuZHVuZGVl
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6aM3dG470zLr
-						E1ZfL3otFt97pzqN7dOgZfspYFemKltvl5pgkkUCh/APf1Z/VOwJb9P0nGpvipDF
-						wg2CpiPATch++ibtEM+usyE9HP6LyPGqdmN2nX987lRgzDiEZh5mkti9Mx8K1SqD
-						FI8NnApuBJuOCZvdV70Ls1FtuCuKgFGVdY7O/4VM4TIEz4HDOy0guETkrpY45S+1
-						LAqjgCcLn80oW9dXFvzIGQCB/XVf0AZdADH67wIv/WOmHUyCPmxYBmp5GHSHSjLZ
-						B0P50FktnCIIOhWZyecK30yeANwa2Fnn3OSRSOoN+NrxmglhbdNtMdZ/FBis8BwM
-						PscTJoZrTwIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-						6pDjue0wHQYDVR0OBBYEFCzxjhGJww5E4wXnImLxRONeoHnbMA4GA1UdDwEB/wQE
-						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-						cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAuZHVuZGVlLmFjLnVrMA0G
-						CSqGSIb3DQEBBQUAA4IBAQAZuc8up4a9nKNHHv2wkU76tQ2u6gIkMz6dGDVPGbZ2
-						qRTLYyNVjkpXQHagA9uNed7xn34whCpXLNmaz5iNLdr1RFbBnQkSN4NPUWUG+vdF
-						q9MkZCJuy29f25cArKPI54PghhRyA7r1+6DG0uOrcOsKRTNbcxm3ITKIA9ZpIZV1
-						DNuEZiiHUJrUFmnPtKVRmDfFG97lWi/aeP4lfnzlZtk+DICTOINJsCuGY4VCCeCT
-						R6x32NTkq6tL+Okm4fMv7U0m4YN3QCYzAkNz40Z6uuJAWzQo8Ny4aZp2/bQZMVzd
-						1fy9pk0OX0CO+CoX2G2EJWz1abxjt5NLB4GwIM3g7bjE
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dundee.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dundee.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.dundee.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dundee.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dundee.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dundee.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">dundee.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEbTCCA1WgAwIBAgIQV2n6T3aZYb1/Q1TOgutwUDANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPjEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBpZHAuZHVuZGVl
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6aM3dG470zLr
-						E1ZfL3otFt97pzqN7dOgZfspYFemKltvl5pgkkUCh/APf1Z/VOwJb9P0nGpvipDF
-						wg2CpiPATch++ibtEM+usyE9HP6LyPGqdmN2nX987lRgzDiEZh5mkti9Mx8K1SqD
-						FI8NnApuBJuOCZvdV70Ls1FtuCuKgFGVdY7O/4VM4TIEz4HDOy0guETkrpY45S+1
-						LAqjgCcLn80oW9dXFvzIGQCB/XVf0AZdADH67wIv/WOmHUyCPmxYBmp5GHSHSjLZ
-						B0P50FktnCIIOhWZyecK30yeANwa2Fnn3OSRSOoN+NrxmglhbdNtMdZ/FBis8BwM
-						PscTJoZrTwIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-						6pDjue0wHQYDVR0OBBYEFCzxjhGJww5E4wXnImLxRONeoHnbMA4GA1UdDwEB/wQE
-						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-						cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBpZHAuZHVuZGVlLmFjLnVrMA0G
-						CSqGSIb3DQEBBQUAA4IBAQAZuc8up4a9nKNHHv2wkU76tQ2u6gIkMz6dGDVPGbZ2
-						qRTLYyNVjkpXQHagA9uNed7xn34whCpXLNmaz5iNLdr1RFbBnQkSN4NPUWUG+vdF
-						q9MkZCJuy29f25cArKPI54PghhRyA7r1+6DG0uOrcOsKRTNbcxm3ITKIA9ZpIZV1
-						DNuEZiiHUJrUFmnPtKVRmDfFG97lWi/aeP4lfnzlZtk+DICTOINJsCuGY4VCCeCT
-						R6x32NTkq6tL+Okm4fMv7U0m4YN3QCYzAkNz40Z6uuJAWzQo8Ny4aZp2/bQZMVzd
-						1fy9pk0OX0CO+CoX2G2EJWz1abxjt5NLB4GwIM3g7bjE
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dundee.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dundee.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 Dundee</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Dundee</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dundee.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ICS Service Desk</GivenName>
-    <EmailAddress>mailto:ics-servicedesk@dundee.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Swiffin</SurName>
-    <EmailAddress>mailto:a.l.swiffin@dundee.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dunstable.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.dunstable.ac.uk-openathens.xml
deleted file mode 100644
index aeac4d2e..00000000
--- a/swamid-interfederations-2.0/idp.dunstable.ac.uk-openathens.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.dunstable.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for the Central Bedfordshire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">dunstable.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/dunstable.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/dunstable.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Central Bedfordshire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dunstable.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eastridingcollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.eastridingcollege.ac.uk-shibboleth.xml
deleted file mode 100644
index 80e6a27a..00000000
--- a/swamid-interfederations-2.0/idp.eastridingcollege.ac.uk-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.eastridingcollege.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for East Riding College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">eastridingcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/eastridingcollege.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/eastridingcollege.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">East Riding College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eastridingcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</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 9e06cae1..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>Jonathan</GivenName>
-    <SurName>Barker</SurName>
-    <EmailAddress>mailto:jbarker@ebi.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Barker</SurName>
-    <EmailAddress>mailto:jbarker@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 afbbc09e..00000000
--- a/swamid-interfederations-2.0/idp.ec-lille.fr-idp-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.ec-lille.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Ecole Centrale de LILLE</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.ec-lille.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Ecole Centrale de LILLE</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>
-					      MIIEmDCCA4CgAwIBAgIQcy0ZZwSdmc+3hWilVNQxZzANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTAzMjMwMDAwMDBaFw0xODAzMjIyMzU5NTlaMD0xITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLmVjLWxpbGxl
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvIvmvu5jWlZn0Eva
-R1CvZIIeGgeXJviar84SKY7g5zXrKtKw2036rCkEw+cTCum8DIVhd79V4fo7SO7X
-wIqPc+fGO+hI3vxQGCcPSwCQOXEK+1/+4mWhFqhaMlLvZdXb80gKTJWPCV6TumcU
-DdEFT01R/+HUvPvD+LZocS0zsdKRLxKoeiiLWiN9reHMh4J4awZTTBzqLVCMfnV0
-hnlH028J8iN+/eMSTz9BycRnJ2exLtGdBL5ovRS8djKHYfCv+AXlHAR6Abyb4Uwv
-MiLUDk7HTqFQ0pf+Eh/y5NTHZSmgCj8UluRWE8OiBKBcxx7S/kz4+gULJoYu9WTi
-nRvN3wIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
-tr0wHQYDVR0OBBYEFFFdGtRc1Qnq/4/65VH9LwZZHNjRMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
-BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
-LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
-c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2lkcC5lYy1saWxsZS5mcjANBgkqhkiG
-9w0BAQsFAAOCAQEAjfGK/BTPOw5NI4lI8ui8Zn3W4k4gOg/LrfU9w4NS/ZLovbMH
-m+K8DLDLr1Z13vI39AxclUo6SkTJlXDkCUIMgkjSbEmXh7hUs5aHqw69dSCMeL9c
-D6bY0VzxOu6mwuzmqXWEZbGNrCIgzaCkgfVeza8Pic1qyZxVOfhhiOIdoKl4OZn5
-lOmT/ktPTXy+RT89JlL+Qx/89eRXDQuyZFBsSh3XMULUaR3KIR6mamS/O4rxOvGa
-CdxKtn2kD2HvpO5vJdrfiXRa9unqJZaT9Dx9huACKUTnXFPx5sOq659EvjN23Htt
-mSbHEPZCcinNQ9WAP2AgelqpJ6dm3OxPuWFe+w==
-					    </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-POST" Location="https://idp.ec-lille.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ec-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ec-lille.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Centrale de LILLE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Centrale de LILLE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ec-lille.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jonathan Chatriot</md:SurName>
-    <md:EmailAddress>jonathan.chatriot@ec-lille.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ff827e20..00000000
--- a/swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.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" entityID="https://idp.ecam.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABL0lEQVQoz2P8//8/AymAiSTVDAwMLAwMDNeuPH/86D0zMyMedf/+/RcQ4DKzVGBhYGDYuvlqV9VpfmGWv3/+//2J3YXffvz1ClVYBNHAxsosJsvGycUsJsEtJs7z7x8WPX/+/NPQEoU6CQI+f/hb32nq629ArKcZGRm+fvlFlKcxwZaNl30Dtsixs8JF/v787xOvOGNBCHYNikrCE3vMWVmZoc5gZrx35/3bN99x2qCtK6WtK4Uscu7MkwmdB3FqePni851br5mYoT5kZma8dP4ZCxsTVMM/jNRx/OjdwJC1DAxsyILx4SpQDcLCnL9+/GNmRoSYpZXykYOJyCL//v/n4+NgYGBg+P///5cvv5QFengZWhcvOP6fEGCAUF+//l69/My1q88IamAkNXkDAGPws0KPMnsoAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMyKzAyOjAwIuq/wgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMiswMjowMFO3B34AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ecam.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.ecam.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ecam.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ecam.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecam.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ecam.fr/idp/profile/SAML1/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">ECAM Lyon</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ECAM Lyon</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ecam.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>sysadmin@ecam.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ecole-navale.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ecole-navale.fr-idp-shibboleth.xml
deleted file mode 100644
index bdcfaf1e..00000000
--- a/swamid-interfederations-2.0/idp.ecole-navale.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ecole-navale.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-02-12T14:48:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecole-navale.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ecole Navale</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.ecole-navale.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Ecole Navale</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Ecole Navale</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Ecole Navale</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>
-					      MIIHFDCCBfygAwIBAgIRAN/99OwB6bXHosvP+tqCI94wDQYJKoZIhvcNAQEFBQAw                                                                                                          
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B                                                                                                          
-IFNTTCBDQTAeFw0xNDA0MTgwMDAwMDBaFw0xNzA0MTcyMzU5NTlaMEExITAfBgNV                                                                                                          
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTd3d3LmVjb2xl                                                                                                          
-LW5hdmFsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALsw+dln                                                                                                          
-sBBhHCxtW6vz2ty64+0kFZ+Wzi7mb3bj+jAs1ybeABQxtMtmULlYGmmve/AKrdfc                                                                                                          
-RuoZw2/CnO9pqrVtd3d2dZecyC+BFLwbn5ZfQUvgQBeU6W7DlTUIs33o2nvB5Th8                                                                                                          
-1hkdNkT0hnOu2firWt7GZt6opzsvC/DK4HFMECoAbZkxwSdr0wqPFJlrDy/Zesu0                                                                                                          
-VgZ9DHpbdKlqu1FIN3Y7oQ6HxTqh4zJkgRuIKEAc5Qk9qEOGXtD3ONpmu4J5n8KH                                                                                                          
-wqm0tKItMlso1u/w8Bo4SmqnCzYv8CHN+WoO+V/77VShmGUwNG3zqoXUzJnqWrd8                                                                                                          
-givD+8yzm+2Tb70CAwEAAaOCBBAwggQMMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr                                                                                                          
-KzdXR+qQ47ntMB0GA1UdDgQWBBTge8meqqavoNPKBO/AxAmtOhOvADAOBgNVHQ8B                                                                                                          
-Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB                                                                                                          
-BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f                                                                                                          
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwggK8BgNVHREEggKzMIICr4ITd3d3LmVjb2xl
-LW5hdmFsZS5mcoIVYWlnbGUuZWNvbGUtbmF2YWxlLmZyghhhbm51YWlyZS5lY29s
-ZS1uYXZhbGUuZnKCGmFzc2lzdGFuY2UuZWNvbGUtbmF2YWxlLmZyghRhdXRoLmVj
-b2xlLW5hdmFsZS5mcoIVY291cnMuZWNvbGUtbmF2YWxlLmZyghlkaWZmdXNpb24u
-ZWNvbGUtbmF2YWxlLmZyghhkb2xpYmFyci5lY29sZS1uYXZhbGUuZnKCFWZpbGV6
-LmVjb2xlLW5hdmFsZS5mcoIVZm9ydW0uZWNvbGUtbmF2YWxlLmZyghdnZXN0aW9u
-LmVjb2xlLW5hdmFsZS5mcoITaWRwLmVjb2xlLW5hdmFsZS5mcoIWamFwcGl4LmVj
-b2xlLW5hdmFsZS5mcoIWbGlzdGVzLmVjb2xlLW5hdmFsZS5mcoIUbGl2ZS5lY29s
-ZS1uYXZhbGUuZnKCFW1lZGlhLmVjb2xlLW5hdmFsZS5mcoIbbWVzZmljaGllcnMu
-ZWNvbGUtbmF2YWxlLmZyghVwaG90by5lY29sZS1uYXZhbGUuZnKCG3Bob3RvdGhl
-cXVlLmVjb2xlLW5hdmFsZS5mcoIYcGlsb3RhZ2UuZWNvbGUtbmF2YWxlLmZyghhw
-bGFubmluZy5lY29sZS1uYXZhbGUuZnKCF3JlZG1pbmUuZWNvbGUtbmF2YWxlLmZy
-ghtyZXNlcnZhdGlvbi5lY29sZS1uYXZhbGUuZnKCF3NlY291cnMuZWNvbGUtbmF2
-YWxlLmZyghhzb25kYWdlcy5lY29sZS1uYXZhbGUuZnKCE3N2bi5lY29sZS1uYXZh
-bGUuZnKCF3dlYm1haWwuZWNvbGUtbmF2YWxlLmZyghR3aWtpLmVjb2xlLW5hdmFs
-ZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAKpU8yupf4hYd+QxSmgNJ+J9nWT3FUnMv
-s/EOxEm2Olexxu7avf9ywoQ7ejCPZIJ+cuFq7yfQnOpxFOYemeTw7jMkNMrO9f7p
-dG8EUqxt7PuyvbYm/f5/QbM/Xy/1y078y7wgElgS4j+Sls9FKe6soQuQP+1KIAbF
-2Lgz6hNu74TPcEBL4BaEjRSXeexkE77+JIYnF1CYqluXAaCnswAdtQoK7BXwJ3DA
-94YNbKlwTl4fjBHo0j4uvMoSjvfg6NBeNDjix2WlKqyhQ8A0HT3qz6EJAwdJLl7J
-ONfoXgNShfdvleuZQiM4FXhXxPY28yXrGT0cc7dSZe2HVJdgMU1Lcw==
-					    </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-POST" Location="https://idp.ecole-navale.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ecole-navale.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ecole-navale.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Navale</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Navale</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ecole-navale.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>postmaster</md:SurName>
-    <md:EmailAddress>postmaster@ecole-navale.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b3bf6219..00000000
--- a/swamid-interfederations-2.0/idp.ed.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.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>
-    <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.edina.ac.uk-shibboleth-devel.xml b/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth-devel.xml
deleted file mode 100644
index b0b4f8f7..00000000
--- a/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth-devel.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.edina.ac.uk/shibboleth-devel">
-  <!--
-		This is an "EDINA Development" Shibboleth IdP for the University of Edinburgh.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EDINA - development</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test IdP for DS &amp; IdP development</mdui:Description>
-        <mdui:Logo height="58" width="110">https://dlib-adidp.ucs.ed.ac.uk:442/Images/EdinaLogo110x58px.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://dlib-adidp.ucs.ed.ac.uk:442/images/edina-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>82.68.124.32/29</mdui:IPHint>
-        <mdui:DomainHint>ucs.ed.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:55.935575,-3.1800687</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edina.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdss.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQjCCAiqgAwIBAgIJAK0rgSd/uZWTMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMMF2RsaWItYWRpZHAudWNzLmVkLmFjLnVrMB4XDTEzMDQyNTA4MDMyN1oXDTIz
-						MDQyMzA4MDMyN1owIjEgMB4GA1UEAwwXZGxpYi1hZGlkcC51Y3MuZWQuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk39sTO/cBCGsSsoD9jV8g
-						5SMiKKDPRrGQcNiYadjhhnQhvDu8GgCtaJxkdFPf8jFNJeiaiEj/dF/fupX41gBy
-						7j+wDbxeB19GwEAZV8zLvLTL3/R3HooXNP3dEoX8lyzWaO9EGI0D3ow16T6b7JLN
-						Od2AIdMX6/Hbk4gnyPM2t/JFatI4PrfxllU88BZnmp+1ViSmzD07El3YqlE2VcZd
-						Wp9WnEAn8VCvl1WSP8LjjYnLo94SNQYkoAixrdsRTj3rwoEbF1dQKxlEbdgACCWq
-						SuBADzOYe8zrQ4Zx170nv9MkoW3LPlA47e5K7PLJJxS7iKK8MvR9VqMJyXMPDfK9
-						AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu
-						ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBT7Rvy1Cv6qn4zu/hh6y2ukpRlV
-						AjAfBgNVHSMEGDAWgBT7Rvy1Cv6qn4zu/hh6y2ukpRlVAjANBgkqhkiG9w0BAQUF
-						AAOCAQEAz3byn5zwGYZmAyWIcvrcKdB4XIRSMHtcJuDMRhGxVwGx3pFjaYkRY/le
-						tqo05KlnbGBKygEJYlA1ukpwbGXSU2WX8gRelFQX7KJFuITMawejR5qH3z45XniQ
-						AvFZJy2DYcIoIEGJcLIWyD4vOP8VQXEIDkgLZ1+EydiKlg2Az2uElc7jniaaVJh0
-						p7Gkyk+vHsgl9lUE+ZG4DX3G4FfolDHdyNRw1cLkjshebXCqzM2AcjAmcHMB0dYg
-						pIGtkImdP6hN2vNeuqaTC9IpGGC+o79WGeH7ZX5GLf5G//peP0FqNWdyzXoTn+SX
-						RSdfrDdMNzV9UpPuCre7zj6+ww7aEw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-adidp.ucs.ed.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-adidp.ucs.ed.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://dlib-adidp.ucs.ed.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-adidp.ucs.ed.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-adidp.ucs.ed.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-adidp.ucs.ed.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">edina.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdss.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQjCCAiqgAwIBAgIJAK0rgSd/uZWTMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMMF2RsaWItYWRpZHAudWNzLmVkLmFjLnVrMB4XDTEzMDQyNTA4MDMyN1oXDTIz
-						MDQyMzA4MDMyN1owIjEgMB4GA1UEAwwXZGxpYi1hZGlkcC51Y3MuZWQuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk39sTO/cBCGsSsoD9jV8g
-						5SMiKKDPRrGQcNiYadjhhnQhvDu8GgCtaJxkdFPf8jFNJeiaiEj/dF/fupX41gBy
-						7j+wDbxeB19GwEAZV8zLvLTL3/R3HooXNP3dEoX8lyzWaO9EGI0D3ow16T6b7JLN
-						Od2AIdMX6/Hbk4gnyPM2t/JFatI4PrfxllU88BZnmp+1ViSmzD07El3YqlE2VcZd
-						Wp9WnEAn8VCvl1WSP8LjjYnLo94SNQYkoAixrdsRTj3rwoEbF1dQKxlEbdgACCWq
-						SuBADzOYe8zrQ4Zx170nv9MkoW3LPlA47e5K7PLJJxS7iKK8MvR9VqMJyXMPDfK9
-						AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu
-						ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBT7Rvy1Cv6qn4zu/hh6y2ukpRlV
-						AjAfBgNVHSMEGDAWgBT7Rvy1Cv6qn4zu/hh6y2ukpRlVAjANBgkqhkiG9w0BAQUF
-						AAOCAQEAz3byn5zwGYZmAyWIcvrcKdB4XIRSMHtcJuDMRhGxVwGx3pFjaYkRY/le
-						tqo05KlnbGBKygEJYlA1ukpwbGXSU2WX8gRelFQX7KJFuITMawejR5qH3z45XniQ
-						AvFZJy2DYcIoIEGJcLIWyD4vOP8VQXEIDkgLZ1+EydiKlg2Az2uElc7jniaaVJh0
-						p7Gkyk+vHsgl9lUE+ZG4DX3G4FfolDHdyNRw1cLkjshebXCqzM2AcjAmcHMB0dYg
-						pIGtkImdP6hN2vNeuqaTC9IpGGC+o79WGeH7ZX5GLf5G//peP0FqNWdyzXoTn+SX
-						RSdfrDdMNzV9UpPuCre7zj6+ww7aEw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-adidp.ucs.ed.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-adidp.ucs.ed.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">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA - development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/about/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rod</GivenName>
-    <SurName>Widdowson</SurName>
-    <EmailAddress>mailto:idp-admin@steadingsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rod</GivenName>
-    <SurName>Widdowson</SurName>
-    <EmailAddress>mailto:idp-admin@steadingsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.edina.ac.uk-shibboleth.xml
deleted file mode 100644
index 0eb987b1..00000000
--- a/swamid-interfederations-2.0/idp.edina.ac.uk-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://idp.edina.ac.uk/shibboleth">
-  <!--
-		This is a "EDINA (staff and trials)" 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="2009-06-24T17:03: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">edina.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EDINA (staff and trials)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EDINA-internal IdP</mdui:Description>
-        <mdui:Logo height="57" width="113">https://dlib-idp.edina.ac.uk/img/edina.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://dlib-idp.edina.ac.uk/img/edina-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUZ8boiTD4RixSt29es15v8YO8F34wDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAwwUZGxpYi1pZHAuZWRpbmEuYWMudWswHhcNMTUwNDE1MTQz
-						MjQ0WhcNMzUwNDE1MTQzMjQ0WjAfMR0wGwYDVQQDDBRkbGliLWlkcC5lZGluYS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAItcB9RJ4egqyCLB
-						muirezae3x3BYwITlDc9JTCGHJkqZigd8lwL6POMgjFip1uIqjd4SRmh3ToXD7+I
-						Ji1kLFbRD7ndpoC4Y/x2Szsgq2Vfly22znIR4825KroMPd4VlpLFs9U0oK2Mh12J
-						l7srcFAnUWHVLKFDL+jpKPCuX0Iioy+Wxkku9Hpo/J+I+ftDCk7f2dMw+1ZPOsBj
-						FYRfQhb2ttfs+tiiE5QWanFArQrEMfKB+9OaheBOd8GnxgQaL4tomf3P33vcz3T5
-						+fpu38bjBFe7BlUGCLF0YGXrNV7DfT1HIf/tJtcbrZhcWmEUCxZSWpUnQ6RVTeBQ
-						UjZAFdMCAwEAAaNvMG0wHQYDVR0OBBYEFD2dMjYASBgbSAgYQecY5Rk+9zCeMEwG
-						A1UdEQRFMEOCFGRsaWItaWRwLmVkaW5hLmFjLnVrhitodHRwczovL2RsaWItaWRw
-						LmVkaW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQA8
-						/cfWH9Dw05/JDdZxpW5lDqbIC9sMBZoJUmxLGCRSAiOI+yftyO8tcX7kCmRGPkdp
-						rXY1Mhta/ZfZTp82wiqfS7xAXAPKn5ExuuNnIVCYLjzsgsyYVeJeB8nCSkXe9bdp
-						vzRDO+Sa2gZLM16CdsEIfuKUzqO68gIcFeZentQHYjCYFfwGUVrf7XF8yosRXIvx
-						1roqZA3Ej7bVZ2d1sQVM0G77BT7Yngefz66rQUcgHMQHdXiF1/9XeVDeyzDI85AU
-						bFwFjyGIOmTeUTfN4ekLZ596U7/IHoJRqIzWRtgKhIq9UgQpRNijkIjyEXxnIU4b
-						TJoGlwD1bfDo3vnukwHI
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-idp.edina.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://dlib-idp.edina.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-idp.edina.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dlib-idp.edina.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">edina.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trial.edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUZ8boiTD4RixSt29es15v8YO8F34wDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAwwUZGxpYi1pZHAuZWRpbmEuYWMudWswHhcNMTUwNDE1MTQz
-						MjQ0WhcNMzUwNDE1MTQzMjQ0WjAfMR0wGwYDVQQDDBRkbGliLWlkcC5lZGluYS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAItcB9RJ4egqyCLB
-						muirezae3x3BYwITlDc9JTCGHJkqZigd8lwL6POMgjFip1uIqjd4SRmh3ToXD7+I
-						Ji1kLFbRD7ndpoC4Y/x2Szsgq2Vfly22znIR4825KroMPd4VlpLFs9U0oK2Mh12J
-						l7srcFAnUWHVLKFDL+jpKPCuX0Iioy+Wxkku9Hpo/J+I+ftDCk7f2dMw+1ZPOsBj
-						FYRfQhb2ttfs+tiiE5QWanFArQrEMfKB+9OaheBOd8GnxgQaL4tomf3P33vcz3T5
-						+fpu38bjBFe7BlUGCLF0YGXrNV7DfT1HIf/tJtcbrZhcWmEUCxZSWpUnQ6RVTeBQ
-						UjZAFdMCAwEAAaNvMG0wHQYDVR0OBBYEFD2dMjYASBgbSAgYQecY5Rk+9zCeMEwG
-						A1UdEQRFMEOCFGRsaWItaWRwLmVkaW5hLmFjLnVrhitodHRwczovL2RsaWItaWRw
-						LmVkaW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQA8
-						/cfWH9Dw05/JDdZxpW5lDqbIC9sMBZoJUmxLGCRSAiOI+yftyO8tcX7kCmRGPkdp
-						rXY1Mhta/ZfZTp82wiqfS7xAXAPKn5ExuuNnIVCYLjzsgsyYVeJeB8nCSkXe9bdp
-						vzRDO+Sa2gZLM16CdsEIfuKUzqO68gIcFeZentQHYjCYFfwGUVrf7XF8yosRXIvx
-						1roqZA3Ej7bVZ2d1sQVM0G77BT7Yngefz66rQUcgHMQHdXiF1/9XeVDeyzDI85AU
-						bFwFjyGIOmTeUTfN4ekLZ596U7/IHoJRqIzWRtgKhIq9UgQpRNijkIjyEXxnIU4b
-						TJoGlwD1bfDo3vnukwHI
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dlib-idp.edina.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dlib-idp.edina.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">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA (staff and trials)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/about/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>EDINA Helpdesk</GivenName>
-    <EmailAddress>mailto:edina@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>EDINA Infrastructure</GivenName>
-    <EmailAddress>mailto:edina.infrastructure@ed.ac.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/idp.edinburghcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index f29507d0..00000000
--- a/swamid-interfederations-2.0/idp.edinburghcollege.ac.uk-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" entityID="https://idp.edinburghcollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Edinburgh College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-17T13:40:35Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">edinburghcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgTCCA2mgAwIBAgIQK6upqHeZFTtRMqjw0pSkmzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMTAxNDAwMDAwMFoXDTE2MTAxMzIzNTk1OVowSDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExppZHAuZWRpbmJ1
-						cmdoY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ANDTceThPhtkN4vHjeJeXfWN6vv+haVyaabv0If2HIsQQfinei7rKJ7+QfaMZbVI
-						SdhNx9FlnsE8O4KHYCrr4wZbRuvarj/5VVpEccczxIIqrMa1GSCAF6WS456+RYwK
-						mFcQxENki52AhuTbtgaDtI9Lv0oU1N+oqMqk88VkKMR6APV1EVyLbUE8NQhfrC5f
-						dadIGwwK9ws/H7DgMcUYzeHfUQtjd0ePq8bYXS0YbD336ytQmuNnEXqPlFD8Qjyv
-						oYw9SDRRQPMbBRDU9rvLcDJDj4tjqinH+SHYcUdjd4bQlWDxlZaIIbP29mUskhPY
-						xPqd1s59EQAAAauHjzQxKI0CAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBS6CgBynqxsyXiGOQ1pI61lS7LoojAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaaWRwLmVkaW5i
-						dXJnaGNvbGxlZ2UuYWMudWswDQYJKoZIhvcNAQEFBQADggEBABYjPfDTpKf2NKnz
-						LTrQ5IvyeVTu/xSCNkmG7M2yI7anN7nZ9xJVWO0ymbjJjZJ4623lLlWnx8gMUIdl
-						xpqJRf8af4uGONpbj5wNIphbPnexaTYEQHi0n8DPSsiPTt7clDI3SYQf9DyLnUEI
-						VNk9o5wwI4R1SfiCTFEoOcLaVrfBTuLmXl2TOVZ5M3tqOkOQeLkP/jPeQq7LxfSd
-						TfwVM+xalQwYU80gajMoy8UIarLR3blfjbe/s1W971x9oFfTIpcayIHioyCsn3jd
-						y9m05ArSqVX/R92evdM8ajQRyzw8Y8zndJen0Ird3BTeYP0Qzuk5N4rccgAgUgyx
-						JlE9suQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.edinburghcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.edinburghcollege.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.edinburghcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.edinburghcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.edinburghcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.edinburghcollege.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">edinburghcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgTCCA2mgAwIBAgIQK6upqHeZFTtRMqjw0pSkmzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMTAxNDAwMDAwMFoXDTE2MTAxMzIzNTk1OVowSDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExppZHAuZWRpbmJ1
-						cmdoY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ANDTceThPhtkN4vHjeJeXfWN6vv+haVyaabv0If2HIsQQfinei7rKJ7+QfaMZbVI
-						SdhNx9FlnsE8O4KHYCrr4wZbRuvarj/5VVpEccczxIIqrMa1GSCAF6WS456+RYwK
-						mFcQxENki52AhuTbtgaDtI9Lv0oU1N+oqMqk88VkKMR6APV1EVyLbUE8NQhfrC5f
-						dadIGwwK9ws/H7DgMcUYzeHfUQtjd0ePq8bYXS0YbD336ytQmuNnEXqPlFD8Qjyv
-						oYw9SDRRQPMbBRDU9rvLcDJDj4tjqinH+SHYcUdjd4bQlWDxlZaIIbP29mUskhPY
-						xPqd1s59EQAAAauHjzQxKI0CAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBS6CgBynqxsyXiGOQ1pI61lS7LoojAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaaWRwLmVkaW5i
-						dXJnaGNvbGxlZ2UuYWMudWswDQYJKoZIhvcNAQEFBQADggEBABYjPfDTpKf2NKnz
-						LTrQ5IvyeVTu/xSCNkmG7M2yI7anN7nZ9xJVWO0ymbjJjZJ4623lLlWnx8gMUIdl
-						xpqJRf8af4uGONpbj5wNIphbPnexaTYEQHi0n8DPSsiPTt7clDI3SYQf9DyLnUEI
-						VNk9o5wwI4R1SfiCTFEoOcLaVrfBTuLmXl2TOVZ5M3tqOkOQeLkP/jPeQq7LxfSd
-						TfwVM+xalQwYU80gajMoy8UIarLR3blfjbe/s1W971x9oFfTIpcayIHioyCsn3jd
-						y9m05ArSqVX/R92evdM8ajQRyzw8Y8zndJen0Ird3BTeYP0Qzuk5N4rccgAgUgyx
-						JlE9suQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.edinburghcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.edinburghcollege.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">Edinburgh College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Edinburgh College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.edinburghcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lindsey</GivenName>
-    <SurName>Parish</SurName>
-    <EmailAddress>mailto:Lindsey.parish@edinburghcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gordon</GivenName>
-    <SurName>Hope</SurName>
-    <EmailAddress>mailto:gordon.hope@edinburghcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Julian</GivenName>
-    <SurName>Ward</SurName>
-    <EmailAddress>mailto:julian.ward@edinburghcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Archer</SurName>
-    <EmailAddress>mailto:paul.archer@edinburghcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.educause.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.educause.edu-idp-shibboleth.xml
deleted file mode 100644
index 5a935407..00000000
--- a/swamid-interfederations-2.0/idp.educause.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://idp.educause.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">educause.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EDUCAUSE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EDUCAUSE IdP server</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.educause.edu/about/incommon</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.educause.edu/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="57" width="225" xml:lang="en">https://idp.educause.edu/idp/images/educause_logo.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>
-MIIDLDCCAhSgAwIBAgIVAJNPiKyEc5HKN8RKL24zsWZeSSk0MA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMMEGlkcC5lZHVjYXVzZS5lZHUwHhcNMTUxMTA1MDAzMzUz
-WhcNMzUxMTA1MDAzMzUzWjAbMRkwFwYDVQQDDBBpZHAuZWR1Y2F1c2UuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApAl9m3C4SRNIdDAqPs3SmgnL
-PjRsg0HJC++axyofMIgOB7rZKBrearu5jjY5NcVkSh5rb0ik75hqhgqPg7LtImFd
-bKeU5Tppd1FXeFoc9yBF5pBbHaZWl1VLERBIyX1wTKKnBAHuzCpnwh7/kbq42bMD
-e77AVxEzuMFXOVy8ng35eDgeqqFwxXBdoGQlM31S7PzTAP7OtkY85WOgRqVoRlDG
-z/yGvqi5m3lb4225UhyaHmP9l6NeJvwwftnHO0FeZQIaDmQxaRBk4Oy+EmHQXOQp
-Ssxf0TAVQkxZspQcEPljfJA99dBrxZfPTpHJYcecYVIsWwYMEVAaciNKjcyKJQID
-AQABo2cwZTAdBgNVHQ4EFgQUbeBXV+O0oh0vgJOoHZ9sN6l0vcUwRAYDVR0RBD0w
-O4IQaWRwLmVkdWNhdXNlLmVkdYYnaHR0cHM6Ly9pZHAuZWR1Y2F1c2UuZWR1L2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQAZ5Zjf8+NGtL/ourPI/kNM
-SqlN3jCnZUi59EB7V8G2HEP3OaF61LIxmkBQFIBbNRDIpk20+ji+r3KmO0hhB0zX
-L4YeTSvi+ASTcR4kHPVaEJb7sB5Sl7OpSZ/7wHCEZELn2riGoYfTcuz17ztjOQKq
-K1yH/FHWh0PWngLrDAjxi4tMy3B+DNoyIZeMAA5ZYJ8bzcYs9FJW+1Tcz483U2Ub
-1QwAk4MHPT7KZ8+9A9cH7rLsHjnslO31Mv9mQC9IBVg77h0v92CbzVV7I497kkFZ
-eyM2CkBFPjiindy5cUI/vzdn+zrf7DSh4VH2s5sBBaGT6oMkNpSpU7wa7NN5AuPI
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.educause.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.educause.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.educause.edu/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.educause.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.educause.edu/idp/SAML2/Redirect/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.educause.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.educause.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.educause.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">educause.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAJNPiKyEc5HKN8RKL24zsWZeSSk0MA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMMEGlkcC5lZHVjYXVzZS5lZHUwHhcNMTUxMTA1MDAzMzUz
-WhcNMzUxMTA1MDAzMzUzWjAbMRkwFwYDVQQDDBBpZHAuZWR1Y2F1c2UuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApAl9m3C4SRNIdDAqPs3SmgnL
-PjRsg0HJC++axyofMIgOB7rZKBrearu5jjY5NcVkSh5rb0ik75hqhgqPg7LtImFd
-bKeU5Tppd1FXeFoc9yBF5pBbHaZWl1VLERBIyX1wTKKnBAHuzCpnwh7/kbq42bMD
-e77AVxEzuMFXOVy8ng35eDgeqqFwxXBdoGQlM31S7PzTAP7OtkY85WOgRqVoRlDG
-z/yGvqi5m3lb4225UhyaHmP9l6NeJvwwftnHO0FeZQIaDmQxaRBk4Oy+EmHQXOQp
-Ssxf0TAVQkxZspQcEPljfJA99dBrxZfPTpHJYcecYVIsWwYMEVAaciNKjcyKJQID
-AQABo2cwZTAdBgNVHQ4EFgQUbeBXV+O0oh0vgJOoHZ9sN6l0vcUwRAYDVR0RBD0w
-O4IQaWRwLmVkdWNhdXNlLmVkdYYnaHR0cHM6Ly9pZHAuZWR1Y2F1c2UuZWR1L2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQAZ5Zjf8+NGtL/ourPI/kNM
-SqlN3jCnZUi59EB7V8G2HEP3OaF61LIxmkBQFIBbNRDIpk20+ji+r3KmO0hhB0zX
-L4YeTSvi+ASTcR4kHPVaEJb7sB5Sl7OpSZ/7wHCEZELn2riGoYfTcuz17ztjOQKq
-K1yH/FHWh0PWngLrDAjxi4tMy3B+DNoyIZeMAA5ZYJ8bzcYs9FJW+1Tcz483U2Ub
-1QwAk4MHPT7KZ8+9A9cH7rLsHjnslO31Mv9mQC9IBVg77h0v92CbzVV7I497kkFZ
-eyM2CkBFPjiindy5cUI/vzdn+zrf7DSh4VH2s5sBBaGT6oMkNpSpU7wa7NN5AuPI
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.educause.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">EDUCAUSE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">EDUCAUSE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.educause.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alex Chaux</md:GivenName>
-    <md:EmailAddress>achaux@educause.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>EDUCAUSE IT Support</md:GivenName>
-    <md:EmailAddress>ITHelpdesk@educause.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>EDUCAUSE IT Administrative Support</md:GivenName>
-    <md:EmailAddress>ITinfo@educause.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>EDUCAUSE IT Support</md:GivenName>
-    <md:EmailAddress>ITHelpdesk@educause.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml
deleted file mode 100644
index 97ea08f7..00000000
--- a/swamid-interfederations-2.0/idp.eduhainaut.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.eduhainaut.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eduhainaut.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">eduHainaut</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students and Teachers from Secondary Schools of Province de Hainaut</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">eduHainaut</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etudiants et Enseignants de l'Enseignement Secondaire de la Province de Hainaut</mdui:Description>
-        <mdui:Logo height="16" width="16">https://cdn.ecampus-hainaut.be/logos/idp-eduhainaut-16x16.jpg</mdui:Logo>
-        <mdui:Logo height="291" width="88">https://cdn.ecampus-hainaut.be/logos/idp-eduhainaut-291x88.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.190.199.64/26</mdui:IPHint>
-        <mdui:DomainHint>eduhainaut.be</mdui:DomainHint>
-        <mdui:GeolocationHint>50.41719089999999,4.448670300000003</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>
-MIIDLzCCAhegAwIBAgIUenYDsKxgJAPyGsM4iuM30gfFOzUwDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUwHhcNMTUxMDI2MjEzMDQw
-WhcNMzUxMDI2MjAzMDQwWjAcMRowGAYDVQQDDBFpZHAuZWR1aGFpbmF1dC5iZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqFXaGIaZwtPZ0MT5gFEZrz
-372fULiqBq7NWjqtlpKsov03Q10INyDXiNlTfSeMzTENzdyt0a6dDU1PwRL6fTSs
-9R/7YzAVstXj5mAcPC7sa8WqleUI5nN3FdOWfq+99oyTlt5uacCyRQfDFDd6hojA
-y+pSLAtVJI7yZM0XvUtTSvm6f6kakowziRnyHZWx+yrfUll35qcgKjwclIUHLSum
-EsVKpM8FCdR5qCu3wOysV+o7ta25FDWIZ4vxrXajnLfBjWTjPJRi5QLB+O2Xf8Hd
-cYEm6B64vpyExUDyUiXBApv4VxZZQjxlOYezPdy8mGbvPQaW/QNaELPD6PrfCUkC
-AwEAAaNpMGcwHQYDVR0OBBYEFKRrH8u31ucPW+tvUiTg59WWmoLhMEYGA1UdEQQ/
-MD2CEWlkcC5lZHVoYWluYXV0LmJlhihodHRwczovL2lkcC5lZHVoYWluYXV0LmJl
-L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA7870M5hvHnWGF0K1O
-JLY/tfC6Lmn7o0MVCbj/OeSHsfRqCmTn82flXDBipkwUaBiVdxrzD4dSHr7wAwzn
-qIfAlM1i8ssYOYOd9ZLSKkkDLarKXsK5wZFCtJB5n/CPSAyd3MwFPAQpkh9Dgwgs
-Yehd+xab1FK2V8dQDVqQDuz7CYY9lo8pvZfvOk92HkVeuCfUgBXTADlMsV11XCpj
-dCWzqSHBZiWc3dxV/Ftw6om/Un117Jo1nsw1JkiibgpxKaUrfCsUNckyYaQo8DWz
-Z76DYvVYsUda8q0eNnaxDthEU9q6MLWI4reu5OVFzIduzA3al83RhoilmF5khZLg
-IKAB
-                        </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>
-MIIDMDCCAhigAwIBAgIVAP1gRpy9QjNBjUFGEadtET7Yz08HMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWlkcC5lZHVoYWluYXV0LmJlMB4XDTE1MTAyNjIxMzAz
-OFoXDTM1MTAyNjIwMzAzOFowHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNe+qXDsnSTOX5QpEHFUC/
-J0MqSQ43ICl9CPUUAdmVo4z5l037kaHwmJL/xJp5+8jjtbNNv3fxMKI4DFr+H55w
-oFeQ5heYT7c3mQ5ABJsoaJim9UWyGknBk7ADVFwcaA49h3F1oxVoTmBJnq2rARXr
-G9cqoPpXZrFysNy+VgwEg4aWKFfr4RWpiT9VGNuyxTwoQUTr7KmcOd/B8w6kY2rZ
-pPIuWmPkInhvZrklEooESNobulFQq1CMoaoah5wn7qA0G//DSNwrbeLBDePUAAKW
-shVN36AvlmzvNKxVVgNPV7EmauhkJth1Uw21ZcTa9X99fsZDoAxsR5gntVaU+Fj7
-AgMBAAGjaTBnMB0GA1UdDgQWBBR2ceWDhljU3+FtPKnpaNGACGK7DzBGBgNVHREE
-PzA9ghFpZHAuZWR1aGFpbmF1dC5iZYYoaHR0cHM6Ly9pZHAuZWR1aGFpbmF1dC5i
-ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAMspHwijR4MCx2CZs
-sHRd1J21Y/QTeBLcfUPy7cMFwlASEEItYBT+5Z6Bh1UusPdZaSkDgH94NyEP1Ayk
-1jmToANHN+szrWz4wd8ZYiUCnACIYRTv1jDNV8pFqfgbYxMGNFPIoc1LTniNSiWe
-RfJ+zhFfIsYhN9ykL08GvfYDkThrOPn/i2cd/NjLajUXAr2UXla0HRpr3dr2L/0Q
-/vLVAl7j5rzMDUuvprwxJSANlZMHNoz43cJhyb/uf94T9XWuoryH/mQBg3McYrNC
-Ub1iY5BW/4fmTkmnIU/L/t/vH+aFBrdhRpT6T+icOC6/pN1sOU+iymNhmZNeq5Oj
-YY+sLg==
-                        </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>
-MIIDMDCCAhigAwIBAgIVAITAPpgbgYKWacifpIzYiDCLJilfMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWlkcC5lZHVoYWluYXV0LmJlMB4XDTE1MTAyNjIxMzAz
-OVoXDTM1MTAyNjIwMzAzOVowHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCRoNFDIELAzMOv/zIUfIZG
-/usJeoEA7jnJcoTA5P0G0Y8DBKLk7YuF+EA+zQDBSacBsCCTX9XmC1nCXWb1D7s1
-r6ITuF6o3bUNYQd9hFF4BWzLSsdbrtuqkcDDW8nXWe6c/zUbenRS/0EGSoct0W7S
-dyGQOC9gxeONsrznA7Uo/V29HiRrFxiwgRTAnVBAjmrANOaX1Y8humP62EqpYJOM
-L/XdwweoMIY8YqqmVLkyAuLSW9okFq0+lLIIlaXpn/3rF1lJQ8drbjW+rKennkYA
-gGBLDA4rGiY9XhoMG55mgWgAUVcABrST/+HxfmBy63+/2tEsojPh9njPeMpH/Mhf
-AgMBAAGjaTBnMB0GA1UdDgQWBBTgnucKIXIOOhfdr039lc5N+UHBBTBGBgNVHREE
-PzA9ghFpZHAuZWR1aGFpbmF1dC5iZYYoaHR0cHM6Ly9pZHAuZWR1aGFpbmF1dC5i
-ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAJzKRXTVuiT1qIVUW
-kB9SLKFk5e/dDeX42pDidr8PDb+go/lFMQI5wigbH9JsMes21rn7bWkZIn/wH+WP
-WPvMIvr1SSrqoGgysRUdeoUpqSAn4JgiR18tOrEP90InWflMv0xeM3LDK43tZpP3
-68a5KQOKu2zKyCQ0t8+bcy9RJIsgQvDv6yUXtNsx8q4nc6jZ16gM19Bp63aME4mg
-LR/to7vufiLAWBELcYxGqPvuaETJDZ2msYwnaWp9uWn4IzadH5WeS16yKxBsJAnY
-JbvCJSPArtmzQsUC6GSq/Col1DpLLbkqxE01S0Zg4Evi8jImwyhTYnNdLIB2tvgZ
-M5p59Q==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eduhainaut.be/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be: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.eduhainaut.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eduhainaut.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eduhainaut.be/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be/idp/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eduhainaut.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUenYDsKxgJAPyGsM4iuM30gfFOzUwDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUwHhcNMTUxMDI2MjEzMDQw
-WhcNMzUxMDI2MjAzMDQwWjAcMRowGAYDVQQDDBFpZHAuZWR1aGFpbmF1dC5iZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqFXaGIaZwtPZ0MT5gFEZrz
-372fULiqBq7NWjqtlpKsov03Q10INyDXiNlTfSeMzTENzdyt0a6dDU1PwRL6fTSs
-9R/7YzAVstXj5mAcPC7sa8WqleUI5nN3FdOWfq+99oyTlt5uacCyRQfDFDd6hojA
-y+pSLAtVJI7yZM0XvUtTSvm6f6kakowziRnyHZWx+yrfUll35qcgKjwclIUHLSum
-EsVKpM8FCdR5qCu3wOysV+o7ta25FDWIZ4vxrXajnLfBjWTjPJRi5QLB+O2Xf8Hd
-cYEm6B64vpyExUDyUiXBApv4VxZZQjxlOYezPdy8mGbvPQaW/QNaELPD6PrfCUkC
-AwEAAaNpMGcwHQYDVR0OBBYEFKRrH8u31ucPW+tvUiTg59WWmoLhMEYGA1UdEQQ/
-MD2CEWlkcC5lZHVoYWluYXV0LmJlhihodHRwczovL2lkcC5lZHVoYWluYXV0LmJl
-L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA7870M5hvHnWGF0K1O
-JLY/tfC6Lmn7o0MVCbj/OeSHsfRqCmTn82flXDBipkwUaBiVdxrzD4dSHr7wAwzn
-qIfAlM1i8ssYOYOd9ZLSKkkDLarKXsK5wZFCtJB5n/CPSAyd3MwFPAQpkh9Dgwgs
-Yehd+xab1FK2V8dQDVqQDuz7CYY9lo8pvZfvOk92HkVeuCfUgBXTADlMsV11XCpj
-dCWzqSHBZiWc3dxV/Ftw6om/Un117Jo1nsw1JkiibgpxKaUrfCsUNckyYaQo8DWz
-Z76DYvVYsUda8q0eNnaxDthEU9q6MLWI4reu5OVFzIduzA3al83RhoilmF5khZLg
-IKAB
-                        </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>
-MIIDMDCCAhigAwIBAgIVAP1gRpy9QjNBjUFGEadtET7Yz08HMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWlkcC5lZHVoYWluYXV0LmJlMB4XDTE1MTAyNjIxMzAz
-OFoXDTM1MTAyNjIwMzAzOFowHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNe+qXDsnSTOX5QpEHFUC/
-J0MqSQ43ICl9CPUUAdmVo4z5l037kaHwmJL/xJp5+8jjtbNNv3fxMKI4DFr+H55w
-oFeQ5heYT7c3mQ5ABJsoaJim9UWyGknBk7ADVFwcaA49h3F1oxVoTmBJnq2rARXr
-G9cqoPpXZrFysNy+VgwEg4aWKFfr4RWpiT9VGNuyxTwoQUTr7KmcOd/B8w6kY2rZ
-pPIuWmPkInhvZrklEooESNobulFQq1CMoaoah5wn7qA0G//DSNwrbeLBDePUAAKW
-shVN36AvlmzvNKxVVgNPV7EmauhkJth1Uw21ZcTa9X99fsZDoAxsR5gntVaU+Fj7
-AgMBAAGjaTBnMB0GA1UdDgQWBBR2ceWDhljU3+FtPKnpaNGACGK7DzBGBgNVHREE
-PzA9ghFpZHAuZWR1aGFpbmF1dC5iZYYoaHR0cHM6Ly9pZHAuZWR1aGFpbmF1dC5i
-ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAMspHwijR4MCx2CZs
-sHRd1J21Y/QTeBLcfUPy7cMFwlASEEItYBT+5Z6Bh1UusPdZaSkDgH94NyEP1Ayk
-1jmToANHN+szrWz4wd8ZYiUCnACIYRTv1jDNV8pFqfgbYxMGNFPIoc1LTniNSiWe
-RfJ+zhFfIsYhN9ykL08GvfYDkThrOPn/i2cd/NjLajUXAr2UXla0HRpr3dr2L/0Q
-/vLVAl7j5rzMDUuvprwxJSANlZMHNoz43cJhyb/uf94T9XWuoryH/mQBg3McYrNC
-Ub1iY5BW/4fmTkmnIU/L/t/vH+aFBrdhRpT6T+icOC6/pN1sOU+iymNhmZNeq5Oj
-YY+sLg==
-                        </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>
-MIIDMDCCAhigAwIBAgIVAITAPpgbgYKWacifpIzYiDCLJilfMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWlkcC5lZHVoYWluYXV0LmJlMB4XDTE1MTAyNjIxMzAz
-OVoXDTM1MTAyNjIwMzAzOVowHDEaMBgGA1UEAwwRaWRwLmVkdWhhaW5hdXQuYmUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCRoNFDIELAzMOv/zIUfIZG
-/usJeoEA7jnJcoTA5P0G0Y8DBKLk7YuF+EA+zQDBSacBsCCTX9XmC1nCXWb1D7s1
-r6ITuF6o3bUNYQd9hFF4BWzLSsdbrtuqkcDDW8nXWe6c/zUbenRS/0EGSoct0W7S
-dyGQOC9gxeONsrznA7Uo/V29HiRrFxiwgRTAnVBAjmrANOaX1Y8humP62EqpYJOM
-L/XdwweoMIY8YqqmVLkyAuLSW9okFq0+lLIIlaXpn/3rF1lJQ8drbjW+rKennkYA
-gGBLDA4rGiY9XhoMG55mgWgAUVcABrST/+HxfmBy63+/2tEsojPh9njPeMpH/Mhf
-AgMBAAGjaTBnMB0GA1UdDgQWBBTgnucKIXIOOhfdr039lc5N+UHBBTBGBgNVHREE
-PzA9ghFpZHAuZWR1aGFpbmF1dC5iZYYoaHR0cHM6Ly9pZHAuZWR1aGFpbmF1dC5i
-ZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAJzKRXTVuiT1qIVUW
-kB9SLKFk5e/dDeX42pDidr8PDb+go/lFMQI5wigbH9JsMes21rn7bWkZIn/wH+WP
-WPvMIvr1SSrqoGgysRUdeoUpqSAn4JgiR18tOrEP90InWflMv0xeM3LDK43tZpP3
-68a5KQOKu2zKyCQ0t8+bcy9RJIsgQvDv6yUXtNsx8q4nc6jZ16gM19Bp63aME4mg
-LR/to7vufiLAWBELcYxGqPvuaETJDZ2msYwnaWp9uWn4IzadH5WeS16yKxBsJAnY
-JbvCJSPArtmzQsUC6GSq/Col1DpLLbkqxE01S0Zg4Evi8jImwyhTYnNdLIB2tvgZ
-M5p59Q==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eduhainaut.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eduhainaut.be: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">Enseignement Secondaire de la Province de Hainaut</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">eduHainaut</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.eduhainaut.be</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>webmaster@eduhainaut.be</md:EmailAddress>
-    <md:TelephoneNumber>+3271531578</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 eb06d7d3..00000000
--- a/swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ehess.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">EHESS</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACjklEQVQoz1XPy3LTSBhA4b9bre7WxbrYSIlsgicZLguGJyFF1dTwejxHii3FgkuxwXGoOMSETHAcJzK2ZKlbslrNgs3MWZ/Nh8bjEzIcyOll4PtxHH09n9qW5bru/ObG97z1ep0kiQYdR9G79x8Ggz5Wqn3seEophFFdb4PAPzjYZ4yGQTAcPoii6C5NdasBQCllWzYGAACglO7dv885E0JqrctS5JsNAGRZZtv27yfw/V6vi05PJ3EcCSm39TaK7mVZXpblYNBfrddlUVq21el05tfznd2d+fzGJAQzzvN8Qwximublv1er9Xp//48PHz8JIRhnQsijo9eNUm/evAWA8+k3DFozRj3PQwhms+vx+CTP89lsJoSsZEUM48mTx45je14nz/NuNyRKqU1R5pvC9zqu61gWn13PszyvqgpjZFLzN2A4HBLDOJ1MMKXU97zA97WGnZ243084Yy//+fter3d2dh5HUTcMHdv5PBpprU3TNJ4fHtZ1/Xl0TCk1DNy27c1icXHxnVFalIWQ8u4uZZy1qj2dTIhh4O22SZKk3+8/++vpYnG7WNy2rU6SZPrt4tGjh8vlMuyGUsjR8RgBiuOYcM4sy4L/16oWGxgj/OfBwfF4vLe39+LwuQZ9dfWDNI06n07DMACAoijCMKzr7eL2NtndHZ98GfQT1+0slz/TNNUapJTox2zmOk7TKEIMKSulFOe8bVuMUdM0GBuU0lEjjrMVAPQoI0qp1Wrtuk5V1VmWOY6TLlPOuG3bWZ7HUXSXpkfV6tXlVwB42vExaKCU1vUWADjnTdMEvs84a1vFGStL4brOf3kYIbQpNoyzuq4JIVprIaQQQsqqqmrHsVc/VwQhhg2GDRPjX3KEWNzfIhepAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMzKzAyOjAwhJ20dgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMyswMjowMPXADMoAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ehess.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">EHESS</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>
-					      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>
-    </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-POST" Location="https://idp.ehess.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ehess.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ehess.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">EHESS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">EHESS</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ehess.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>admin@ehess.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ekt.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ekt.gr-idp-shibboleth.xml
deleted file mode 100644
index 95a481c9..00000000
--- a/swamid-interfederations-2.0/idp.ekt.gr-idp-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://idp.ekt.gr/idp/shibboleth">
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">ekt.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ekt.gr</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEizCCA3OgAwIBAgIQb1SWwkDV328A41lusr2JKzANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTA5MTEwOTAwMDAwMFoXDTEyMTEwODIzNTk1OVowbDELMAkGA1UE
-                            BhMCR1IxJjAkBgNVBAoTHU5hdGlvbmFsIERvY3VtZW50YXRpb24gQ2VudHJlMSAw
-                            HgYDVQQLExdJbmZvcm1hdGlvbiBTeXN0ZW1zIERwdDETMBEGA1UEAxMKaWRwLmVr
-                            dC5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK6Wn8EfealHFYNP
-                            YsHwvpH8mdSGI9MEXS+NLBsWpI6tS3DiqA/Z1QCxYaA7jB18Sb8gC00VOeuwdO9p
-                            xLblVLi9kciz0XuVyHLA1n6XgxXARGE15m+o21Vj50US8LmW3X44E0WXnh6QqiAN
-                            w1EJCCGk6nuqCe/Uy/Jc2je2GNrbnVIAUcLxKDIp0Sca62uIc5rXGSKkrNbFJw1+
-                            jIYOZTKlfwSiY5iDeN8gTKijpPVt/5iwyiAejZiNjBURVHa/hl4/h04RFZn3LowG
-                            Tp2ije0yz0Qh7ZfFRauIi326oI9JdQDtR3x0S+w2X1IbaUODWnOS2whapglxhic0
-                            gaC0rcUCAwEAAaOCAV0wggFZMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-                            47ntMB0GA1UdDgQWBBQG37V9qM5AYApDpVPtb+z6G0Z8RzAOBgNVHQ8BAf8EBAMC
-                            BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-                            GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-                            Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-                            AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-                            RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-                            Lm9yZzAVBgNVHREEDjAMggppZHAuZWt0LmdyMA0GCSqGSIb3DQEBBQUAA4IBAQBX
-                            onl6/uH2I669/xvf0mS/SSAWV7HemtNb5MEm6ObMakarTs7Zz/Lr/Y815kKCbY3/
-                            yckJmCqm5hVrczJREw9/y9IF421qaWq9fA1mUfWgNNh1t9Lc7yw6TzgiHJsaUQyM
-                            1qz6BQsNNctdBtiDXx2It1Z6kG3ImLZdPsTIs+CuwVtIrbpR8yTuvRF/PVFg0WSS
-                            fB7jhjdgJoQvPbSxSuA2N9fbZewG9m0x8WBN+up4AIhR9pBPG//4qD7a6qlpasS5
-                            ivmIXUACm7ISQ8obzJ6mm2QPGWHgl4/XHpMouNjrI9piCuoU7PxPf4wESiiH/qbT
-                            KdYmP9TqxG7mvPfMZHTx
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ekt.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ekt.gr: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.ekt.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ekt.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ekt.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ekt.gr/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">ekt.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ekt.gr</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEizCCA3OgAwIBAgIQb1SWwkDV328A41lusr2JKzANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTA5MTEwOTAwMDAwMFoXDTEyMTEwODIzNTk1OVowbDELMAkGA1UE
-                            BhMCR1IxJjAkBgNVBAoTHU5hdGlvbmFsIERvY3VtZW50YXRpb24gQ2VudHJlMSAw
-                            HgYDVQQLExdJbmZvcm1hdGlvbiBTeXN0ZW1zIERwdDETMBEGA1UEAxMKaWRwLmVr
-                            dC5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK6Wn8EfealHFYNP
-                            YsHwvpH8mdSGI9MEXS+NLBsWpI6tS3DiqA/Z1QCxYaA7jB18Sb8gC00VOeuwdO9p
-                            xLblVLi9kciz0XuVyHLA1n6XgxXARGE15m+o21Vj50US8LmW3X44E0WXnh6QqiAN
-                            w1EJCCGk6nuqCe/Uy/Jc2je2GNrbnVIAUcLxKDIp0Sca62uIc5rXGSKkrNbFJw1+
-                            jIYOZTKlfwSiY5iDeN8gTKijpPVt/5iwyiAejZiNjBURVHa/hl4/h04RFZn3LowG
-                            Tp2ije0yz0Qh7ZfFRauIi326oI9JdQDtR3x0S+w2X1IbaUODWnOS2whapglxhic0
-                            gaC0rcUCAwEAAaOCAV0wggFZMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-                            47ntMB0GA1UdDgQWBBQG37V9qM5AYApDpVPtb+z6G0Z8RzAOBgNVHQ8BAf8EBAMC
-                            BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-                            GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-                            Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-                            AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-                            RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-                            Lm9yZzAVBgNVHREEDjAMggppZHAuZWt0LmdyMA0GCSqGSIb3DQEBBQUAA4IBAQBX
-                            onl6/uH2I669/xvf0mS/SSAWV7HemtNb5MEm6ObMakarTs7Zz/Lr/Y815kKCbY3/
-                            yckJmCqm5hVrczJREw9/y9IF421qaWq9fA1mUfWgNNh1t9Lc7yw6TzgiHJsaUQyM
-                            1qz6BQsNNctdBtiDXx2It1Z6kG3ImLZdPsTIs+CuwVtIrbpR8yTuvRF/PVFg0WSS
-                            fB7jhjdgJoQvPbSxSuA2N9fbZewG9m0x8WBN+up4AIhR9pBPG//4qD7a6qlpasS5
-                            ivmIXUACm7ISQ8obzJ6mm2QPGWHgl4/XHpMouNjrI9piCuoU7PxPf4wESiiH/qbT
-                            KdYmP9TqxG7mvPfMZHTx
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ekt.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ekt.gr: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="en">National Documentation Centre</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Εθνικό Κέντρο Τεκμηρίωσης</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Documentation Centre</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Εθνικό Κέντρο Τεκμηρίωσης</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ekt.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.ekt.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>National Documentation Centre NOC</md:SurName>
-    <md:EmailAddress>noc@ekt.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.elon.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.elon.edu-idp-shibboleth.xml
deleted file mode 100644
index 6d8add11..00000000
--- a/swamid-interfederations-2.0/idp.elon.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +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://idp.elon.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">elon.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Elon University</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>
-MIIDGzCCAgOgAwIBAgIUErCouPRaW5QGkEHS598bwC7vTI4wDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLmVsb24uZWR1MB4XDTExMDQyNjE1MjgyM1oXDTMx
-MDQyNjE1MjgyM1owFzEVMBMGA1UEAxMMaWRwLmVsb24uZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA19/GTJENTS8CCrh87Fr89XSbtgJo24ctlQ0k
-12sB6jOsFDIO+U0I0/nO4WcIouDfAjgtzquEAiv92ZCbpMVhA+r86LWqUbF94tTD
-BBdAI7JTXEwPNnFVttpI8w15kRVKBIL7uewQI8UhYtPPnzbOuFq2PgCd1CAaRL2s
-2ly2Ttb1eBRYjnq1aCW0vKLW36u/6Doupes/q6bA9dD3r4ThfZRNuEw4Y7yM+th+
-eVPisEnMHMI+hcTlM0GfQwi9f3YBsskq5t+G+4wk29IPwadKP1LMWdKkQtmLNiWU
-wHoJjFvsKcchuh1zsd3T7jTEgbVjIjgv9hXUu8PV1upYF1vTwQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuZWxvbi5lZHWGI2h0dHBzOi8vaWRwLmVsb24uZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQYxrFRiIbMBJGM8kQ2vH7o70KWhzANBgkq
-hkiG9w0BAQUFAAOCAQEAK6w0oQT3rB9jYH1D32om2DDBY1ecKuTCOJMtbghdNkeU
-de+AXFvDUWPCLkhVeRVa1vYEmpp32wx0opb0TeK98JWbJ1nwoQ7jxv2YElpVkEA5
-GuHD95osYhVhWG8ME5JvjOqaXU+78GJ7AFJOaIejrG6dhg5++lC26M/M406njKbu
-smWmOQNGuBMna6h+vWWNc7DDSCEkL47jn86mGMhfivdMEsWAsixio2Oqi8/bf64G
-nxN2pAEY7/jalr7ldm6HDj+Cq6DzsUKGeY+eUFwa2DDwhdkDZI6W56v+2/zVxV6d
-pPnfmAnNrKnsHEet6lA93TS62NXQGgBuT0K69ASB/w==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.elon.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.elon.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.elon.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.elon.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.elon.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elon.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUErCouPRaW5QGkEHS598bwC7vTI4wDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLmVsb24uZWR1MB4XDTExMDQyNjE1MjgyM1oXDTMx
-MDQyNjE1MjgyM1owFzEVMBMGA1UEAxMMaWRwLmVsb24uZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA19/GTJENTS8CCrh87Fr89XSbtgJo24ctlQ0k
-12sB6jOsFDIO+U0I0/nO4WcIouDfAjgtzquEAiv92ZCbpMVhA+r86LWqUbF94tTD
-BBdAI7JTXEwPNnFVttpI8w15kRVKBIL7uewQI8UhYtPPnzbOuFq2PgCd1CAaRL2s
-2ly2Ttb1eBRYjnq1aCW0vKLW36u/6Doupes/q6bA9dD3r4ThfZRNuEw4Y7yM+th+
-eVPisEnMHMI+hcTlM0GfQwi9f3YBsskq5t+G+4wk29IPwadKP1LMWdKkQtmLNiWU
-wHoJjFvsKcchuh1zsd3T7jTEgbVjIjgv9hXUu8PV1upYF1vTwQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuZWxvbi5lZHWGI2h0dHBzOi8vaWRwLmVsb24uZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQYxrFRiIbMBJGM8kQ2vH7o70KWhzANBgkq
-hkiG9w0BAQUFAAOCAQEAK6w0oQT3rB9jYH1D32om2DDBY1ecKuTCOJMtbghdNkeU
-de+AXFvDUWPCLkhVeRVa1vYEmpp32wx0opb0TeK98JWbJ1nwoQ7jxv2YElpVkEA5
-GuHD95osYhVhWG8ME5JvjOqaXU+78GJ7AFJOaIejrG6dhg5++lC26M/M406njKbu
-smWmOQNGuBMna6h+vWWNc7DDSCEkL47jn86mGMhfivdMEsWAsixio2Oqi8/bf64G
-nxN2pAEY7/jalr7ldm6HDj+Cq6DzsUKGeY+eUFwa2DDwhdkDZI6W56v+2/zVxV6d
-pPnfmAnNrKnsHEet6lA93TS62NXQGgBuT0K69ASB/w==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.elon.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Elon University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Elon University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.elon.edu/home/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Greg Colby</md:GivenName>
-    <md:EmailAddress>gcolby@elon.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 86a3153d..00000000
--- a/swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.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.elte.hu/auth/saml2/idp/metadata.php">
-  <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="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>elte</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>href-idps</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:47.49005,19.05955</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">elte.hu</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.elte.hu/auth/saml2/idp/ArtifactResolutionService.php" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.elte.hu/auth/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.elte.hu/auth/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">ELTE</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">ELTE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">ELTE</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ELTE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.elte.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.elte.hu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ELTE IIG Informatikai Szolgáltatási Osztály</md:SurName>
-    <md:EmailAddress>mailto:system@caesar.elte.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>ELTE IIG Informatikai Szolgáltatási Osztály</md:SurName>
-    <md:EmailAddress>mailto:system@caesar.elte.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>ELTE IIG Ügyféltámogatási Osztály</md:SurName>
-    <md:EmailAddress>mailto:operator@caesar.elte.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.enac.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.enac.fr-idp-shibboleth.xml
deleted file mode 100644
index a30718bd..00000000
--- a/swamid-interfederations-2.0/idp.enac.fr-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.enac.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-25T17:15:45Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enac.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ENAC - Ecole Nationale de l'Aviation Civile</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB8UlEQVQoz2P8//8/AymAiSTVDAwMLGj895++fvnyjZuL88v3H6wsLJKiAtg1fP359/XbD2s2HxASEWZnZeXl4fj05dvPX3+drHQUpURQNDx98XbGyt18PNx/fv/6/OW7mir/w6cvONhZf/z8JSYk+OLlO1YmBhkJhB6mq3ee/P3zT01Bcv/Jaw5W+k9fvr5+9/Hdx88ZGRjFRAWOn7+5avvJo+du3X/6FqKB8fq9ZyKCfP1z18tIiAgL8h8/f93dzkRFXvLVm3eHTl0VFRXg4eQQExK4df/pnccvEoOcGP///3/51sMJczb6ulkLC/B8+/Hz3YfPkT7WEPOu3np07d6zyzcfcrCxRfnbKkiJMP38/Xfa4m1hfo637z+5cuvhvmOXWFmYzcJr7zx8sfvY1UfP3zx/+SbO3+7v759yUiIMDAxMz168ZmRm5uHm0tdSNtdXYmNlVleS8bTU3nLgnLAAz7ZD51++/bR654m4IEdIlDGxsrJ8/vJdWU7URE+ZgYFJWV7y+at3ccFOdx8827z3lJe9sTA/t7gI//o9Z85ff8jAwMDw7///gubZe49f/v3n7/cfP2/cffLkxdtfv/+8+/j10bPX////f/fxy/efv2/ff/r85bv///8z/P////bDl/tPXv5PHGCkeeIjWQMAwd8TKvlXU44AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzMrMDI6MDCEnbR2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMzKzAyOjAw9cAMygAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.enac.fr/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Students, Researchers and Staff</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ENAC - Ecole Nationale de l'Aviation Civile</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Apprenants,Chercheurs et Personnels</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>
-					      MIIDQDCCAiigAwIBAgIVALjMEvpFsfHdqv4aYoi82tdjMJg9MA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMMFWlkcC5yZWNoZXJjaGUuZW5hYy5mcjAeFw0xNDExMTcx
-NzMxMDNaFw0zNDExMTcxNzMxMDNaMCAxHjAcBgNVBAMMFWlkcC5yZWNoZXJjaGUu
-ZW5hYy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIDNPO0L9Xkl
-Db1GUrFEoY56R+3WyTCWXYgD8K3Q5+8Am9DCltbnlx/hqbV1osKZIlJPvo189VH6
-QuEPhjTqTYPlPGvA04OYwDtKPBNKGSL4iapsovMh5vgHcV4qi2n9eMABOVRo80NC
-C+U+HkZNuYiNeFhZ+iGdfAFS9sgoRNSsLGDLXJC07nSLznf1BuOT2ipHuaz5No98
-HD+tfE3rZAlWT0Iq+NNGdpG+eERLM0KwmrCJ6WpKY7EPDxw1Wrc7DN7llBIys4HI
-IMwHoCIkJqElofAuCMnnFeZWJZ4O5mS+ucNQga0V29CHYUVZuhLWLfBV01VLQ9Ho
-s+Z7Duht01sCAwEAAaNxMG8wHQYDVR0OBBYEFKIVSiPZ5+jJqGUvMhVVhO/uAh+b
-ME4GA1UdEQRHMEWCFWlkcC5yZWNoZXJjaGUuZW5hYy5mcoYsaHR0cHM6Ly9pZHAu
-cmVjaGVyY2hlLmVuYWMuZnIvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQAD
-ggEBAEtxX5sqTKoZ6pP1UnihbwYHTfAMpLeqkXUCDl5JI7gPmUE9JYocAFKmbD/Z
-nscHzNQA2G1D+g2YhAOEpNk7VcgQnsgsldbyYCPE9gqU8pt5CfObmrLIY4an1OxJ
-UcpnjVs8OH0blae/KOrMkc4353Klwo3YFxrkqyRFsNGpYOdDJUEDd6X5NF47wvS0
-eR5z1/IoEPIVcVuR/xWmpK95gcJ/DFgFrebwCE+FjS89pBjH5bHMS/QNzKef0tqY
-gd7OPw24Ut2oiKcpjkQjV8SBxAY/i5GnwUrt9E1J5p4IHiETJ0q9s9GVUTA2S1/U
-/e8nBK9EJdoDnEi1985qGA1FYp4=
-					    </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-POST" Location="https://idp.enac.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enac.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enac.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENAC - Ecole Nationale de l'Aviation Civile</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENAC - Ecole Nationale de l'Aviation Civile</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.enac.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Didier MAGRE</md:SurName>
-    <md:EmailAddress>didier.magre@enac.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Alexandre COHEN</md:SurName>
-    <md:EmailAddress>alexandre.cohen@enac.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e34cc374..00000000
--- a/swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enib.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABPUlEQVQoz92SMS9DURhAz3fvq0u1tBYLIjFJOjEZjBhIDLqbDEYmfoEw24WYGMTAQmJgsYgEaSWkJNKUlJZ6r+17fe/6DTZx5nO2I9ZafoP6lf1Xg0NhU1gXisec3VJvApwusCav3vv89cvJh89Jli3hIAMo3F5c6IT2NF6d1R0CMGkUSnRcq5gSqkme4PwO90GxNM3KJMlLesaIfJRi44i3KgkEm9CCslw57MPFMLt5h5kCpTLNA6odOAYb0grYfmYcpSWtlSZiaJapURoeuZJD9owCVG64KBJbxrcEEU2XDfSi7TVOQoE2BEJLGBmU6HlPGoooJNVHlKFUJmao5HFfg4m5oi/d7bFUoUTVxbSRGZDc/aMoMcbUPU9rG0FnPF5r+F2Vz+9kXMIwaLWS6e6v2ncYhoP9A/IPXvoBu+aAJu8X7C4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzMrMDI6MDCEnbR2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMzKzAyOjAw9cAMygAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.enib.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENIB - Ecole Nationale d'Ingénieurs de Brest</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>
-					      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>
-    </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-POST" Location="https://idp.enib.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enib.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enib.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENIB - Ecole Nationale d'Ingénieurs de Brest</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.enib.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>cri@enib.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 bffd7339..00000000
--- a/swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enit.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENIT Ecole Nationale Ingénieurs Tarbes</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.enit.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENIT Ecole Nationale Ingénieurs Tarbes</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>
-					      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>
-    </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-POST" Location="https://idp.enit.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enit.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enit.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENIT Ecole Nationale Ingénieurs Tarbes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENIT Ecole Nationale Ingénieurs Tarbes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.enit.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Viret</md:SurName>
-    <md:EmailAddress>jean-marc.viret@enit.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Barriere</md:SurName>
-    <md:EmailAddress>jean-philippe.barriere@enit.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 cde52fac..00000000
--- a/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.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://idp.enitab.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENITA de Bordeaux</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACjUlEQVQozzWSS0hUcRjFz/e/d+4dR1PHBA0netBoQgYuSoQiWhS5ibKsoNq0y4VBES4ipE1RbYKgiFBcSIaLXptQQyHIzBaaVGTjKwsf89ByZpy5r+9rMXoWZ/XjbM6PRARArkEg8FJqIpn8t2vLPhGdyGH4FAMQKEIOXQ/Lmqy1D9643I6bz3b8XBgS4a6+ts+Tr0VEvHWKWDwBlKgMkm1dF+ZWh4LBQGkB7wzUhXece9LTxChpvdi1N9QAAPAUhAEG4fbz1tFEn2kW+ojY03aFD9/vvqcXBlUAj160pJ0oBCKiiJSC/n588NXXx4a5CURwM5XljZO/aTw2bTlFhm6u2Isvh5+CAOhKhGzYs9npbWV7ddtgWLpTeLj2fPvbN6qgcDlTFMvqccvXP9aRwRIEioh+zP+41XGn+XirmQ7Y8qe28tRqFBPpT7oyI/P8bdG1EbLseGR+hBQUgJmlqZg2Ozo+c/poSyaNgzVnhyaG/UZeNGbMJ7NC+Yos23Bn4zMAFADHcfx+o2Ogc09VfXXJse1FlaO/vq+m/X9XsqSBRAi20rXlZAyADiAU3Eqsp4xE77uPV888BPKmFqOrcUARAUQEQBh5mgFAgbF7a/UmDgZ8+T0fugvMEKB+LcVyWwBEAIK4qNhcDUAJuNhf3FjX5Fk8Z3/5tvAdAGkmyAMAEgGzsE8L1oQPwIWCUgCunLxeLMGU5kSnpwBUloUhDti0yHY1K7Wcbj7yoAjl0KEEAKMir6zzWrvySuficQD7w9XI2tCynmWnEl5r471DVQ25p+EJiyvssAhHUpH+j70iMhAZRj1wYsvJu5dGFsZERBxhYRGBiMfCvO6im9M2w2sjvyf/rCXcDZF5A/kPEBuA6WS49/UAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzUrMDI6MDDnTYFMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM1KzAyOjAwlhA58AAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.enitab.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENITA de Bordeaux</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>
-					      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>
-    </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-POST" Location="https://idp.enitab.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enitab.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enitab.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENITA de Bordeaux</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENITA de Bordeaux</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.enitab.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>MEUNIER Richard</md:SurName>
-    <md:EmailAddress>r-meunier@enitab.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>PRIOUX Pascal</md:SurName>
-    <md:EmailAddress>ppx@enitab.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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.fr-idp-idp.xml b/swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml
deleted file mode 100644
index 0e1560a1..00000000
--- a/swamid-interfederations-2.0/idp.ens.fr-idp-idp.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://idp.ens.fr/idp/idp">
-  <md: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>
-  </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 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="en">Ecole normale supérieure</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAACESURBVCjPzY8xCoNQEETfFytBSBHsgiiSTkjtabxQEHKOHMAbBNIJqexTpRAESx0L/WCifXzVsjMMM/B/jD0kgIEBdxJmxV267xyJCLejJCnTRxO17H+RUFAgHpQ4xOsOTx0IuOKTEnNed2h40ZNT0fIm2Vpx40TExQrmx9DJ+95v2A0jM8olr6uCeR8AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTkrMDI6MDDmguK/AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU5KzAyOjAwl99aAwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ens.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Ecole normale supérieure</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>
-					      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>
-    </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-POST" Location="https://idp.ens.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ens.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole normale supérieure</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole normale supérieure</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ens.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Julien Moutel</md:SurName>
-    <md:EmailAddress>julien.moutel@ens.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean-François Barbé</md:SurName>
-    <md:EmailAddress>jean-francois.barbe@ens.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ens2m.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ens2m.fr-idp-shibboleth.xml
deleted file mode 100644
index c082ad36..00000000
--- a/swamid-interfederations-2.0/idp.ens2m.fr-idp-shibboleth.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" entityID="https://idp.ens2m.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-23T15:44:56Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens2m.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ENSMM Besançon - National School of Mechanical and Microtechnology</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAS1BMVEUpsnul38Y5nsbO7957vt7e7/dry6Vjstb3+/dCvoyt1+dKps6cz+f3+//O5/cxtoTW8+eEw97n8/97z61rttZSw5S12+9Sqs7///8a7shsAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAbElEQVQY01WOSRKAIAwEcVALFwyWC/n/SwXCZuCQajoZlKpFPAGITT4zvwJKDdZHUN7p4R0/Q/NdgCjugAASwYkgKeFedgXqjoC0RQaUZnJEMzT7Dd2OJ/26pdDFJ/oRZdj/jNke6I1Fm7GCD7ICBO10G0ltAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjQwKzAyOjAwv7Cn8gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo0MCswMjowMM7tH04AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ens2m.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Identity provider for National School of Mechanical and Microtechnology (ENSMM) in Besançon (France).</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ENSMM Besançon - Ecole Nationale Supérieure de Mécanique et des Microtechniques</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Fournisseur d'identités de l'Ecole Nationale Supérieure de Mécanique et des Microtechniques (ENSMM) de Besançon (France).</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>
-					      MIIDGzCCAgOgAwIBAgIUCPhPfM614xhs9L5rQkMnQiu0FLEwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAwwMaWRwLmVuczJtLmZyMB4XDTE1MDYxODEyMjMyOFoXDTM1
-MDYxODEyMjMyOFowFzEVMBMGA1UEAwwMaWRwLmVuczJtLmZyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ACNvQOiYEZqAMH2dLBn0NdBFBWB8GFQC2OF
-dZhEgSdnlWCDlOnFsO2kjG5sEzzIR3h2qbMlYjj8FvEDRbYjGINN0SvJL/PAN1d2
-qNKYqhSIYFsFcgnH1xpiG6eg8QKtbjOmzJj1eAXbrFR2aLIu09HNjVZopYDzNXY2
-C9/vzPUbJehxs0CRGk1frrF8SlGeB0qiScxHZ8b85pmEQmEqoifJjySYX+ptu7CF
-biJJfpo6BfOXx7dooOEK3+f6lG73nXyXG1iRUiOzi+9zSCULZSNTo6NnFLeqKj9o
-kdpiEA5++CJI8GKX1yJdzROLg3QUa/rbuv8fLXOYzNj6L0EJOQIDAQABo18wXTAd
-BgNVHQ4EFgQUudW36zQf0nUJolV6lgXTQ5ay3GkwPAYDVR0RBDUwM4IMaWRwLmVu
-czJtLmZyhiNodHRwczovL2lkcC5lbnMybS5mci9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQUFAAOCAQEAHMtuDl2N6BGSsGLDzo6QzkF58TT1iuZFErOEqYOKKxVh
-yvcqgeUtZXLbUDsktHbyhLB/7iY7Ir0GLKhoARf/FzONjEXVMoZahSINF+ofD1N8
-GNBaks//DsTG2CZYX0RJOuB5ZtGxVMiFuRS9pLvAidTW54tJhQFg8ijRSLrxyRTF
-smhsf28+MyQdS2YwI9Dd0AYr13lbpIG6gSM31pZcTlZgIcG8fpmpKOmSeI7OjON9
-IAHuePwMdXUtlSEjSNksGIsPneqPNxZAviKRYZSgreG1UfwjelD81/gaPq/YYnpd
-gxA3odPxwH4odsi5EqqsqUhod7C5oBdc5fgaYPNrPQ==
-					    </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-POST" Location="https://idp.ens2m.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ens2m.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ens2m.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens2m.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGzCCAgOgAwIBAgIUCPhPfM614xhs9L5rQkMnQiu0FLEwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAwwMaWRwLmVuczJtLmZyMB4XDTE1MDYxODEyMjMyOFoXDTM1
-MDYxODEyMjMyOFowFzEVMBMGA1UEAwwMaWRwLmVuczJtLmZyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ACNvQOiYEZqAMH2dLBn0NdBFBWB8GFQC2OF
-dZhEgSdnlWCDlOnFsO2kjG5sEzzIR3h2qbMlYjj8FvEDRbYjGINN0SvJL/PAN1d2
-qNKYqhSIYFsFcgnH1xpiG6eg8QKtbjOmzJj1eAXbrFR2aLIu09HNjVZopYDzNXY2
-C9/vzPUbJehxs0CRGk1frrF8SlGeB0qiScxHZ8b85pmEQmEqoifJjySYX+ptu7CF
-biJJfpo6BfOXx7dooOEK3+f6lG73nXyXG1iRUiOzi+9zSCULZSNTo6NnFLeqKj9o
-kdpiEA5++CJI8GKX1yJdzROLg3QUa/rbuv8fLXOYzNj6L0EJOQIDAQABo18wXTAd
-BgNVHQ4EFgQUudW36zQf0nUJolV6lgXTQ5ay3GkwPAYDVR0RBDUwM4IMaWRwLmVu
-czJtLmZyhiNodHRwczovL2lkcC5lbnMybS5mci9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQUFAAOCAQEAHMtuDl2N6BGSsGLDzo6QzkF58TT1iuZFErOEqYOKKxVh
-yvcqgeUtZXLbUDsktHbyhLB/7iY7Ir0GLKhoARf/FzONjEXVMoZahSINF+ofD1N8
-GNBaks//DsTG2CZYX0RJOuB5ZtGxVMiFuRS9pLvAidTW54tJhQFg8ijRSLrxyRTF
-smhsf28+MyQdS2YwI9Dd0AYr13lbpIG6gSM31pZcTlZgIcG8fpmpKOmSeI7OjON9
-IAHuePwMdXUtlSEjSNksGIsPneqPNxZAviKRYZSgreG1UfwjelD81/gaPq/YYnpd
-gxA3odPxwH4odsi5EqqsqUhod7C5oBdc5fgaYPNrPQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ens2m.fr/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">ENSMM Besançon - Ecole Nationale Supérieure de Mécanique et des Microtechniques</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENSMM Besançon - Ecole Nationale Supérieure de Mécanique et des Microtechniques</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ens2m.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>cri@ens2m.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 766c5594..00000000
--- a/swamid-interfederations-2.0/idp.ensai.fr-idp-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://idp.ensai.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.ensai.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENSAI - Ecole Nationale Statistique Analyse de l'Information</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>
-					      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>
-    </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-POST" Location="https://idp.ensai.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensai.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensai.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENSAI - Ecole Nationale Statistique Analyse de l'Information</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ensai.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi@ensai.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9d50919f..00000000
--- a/swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.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://idp.ensait.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENSAIT - Roubaix</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.ensait.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENSAIT - Roubaix</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>
-					      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>
-    </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-POST" Location="https://idp.ensait.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensait.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensait.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENSAIT - Roubaix</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENSAIT - Roubaix</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ensait.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Vincent Dubreu</md:SurName>
-    <md:EmailAddress>vincent.dubreu@ensait.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ba5b10b5..00000000
--- a/swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ensma.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.ensma.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</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>
-					      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>
-    </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-POST" Location="https://idp.ensma.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ensma.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ensma.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENSMA - Ecole Nationale Supérieure de Mécanique et d'Aérotechnique</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ensma.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Edouard MOREAU</md:SurName>
-    <md:EmailAddress>edouard.moreau@ensma.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Patrice ALLARY</md:SurName>
-    <md:EmailAddress>patrice.allary@ensma.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 23466289..00000000
--- a/swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.enssib.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENSSIB</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA60lEQVQ4y52SsQ3CMBBFX0gQBQWK2ICOmp7KK2QFVvAKWSErZAUoGCCMQMECQTQIkCzTXKTD2CDlpBT2//fz774zRpTfbtdAQZZNijECl8fjeHVu6SCfjBF4ej9zkOM9MQcbwKjzAThpwmI6vbnXq7h7Pw8bO8BHvr3gyaoU+QzUgAUaoJf7PiWyUqQmgpeBSBkSGgHbhPj+3yhnAUPABn+2qfkH9dQyW3FSSjrml4ANllkpnpH7LhQYZuxVcx1Z1rCrr0XvVGOXiMoojongHy6szDykoMeKxQxityX+Cv8266pESMfXpmwDvAHzaWd4jzdWHAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MCswMjowML+wp/IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDArMDI6MDDO7R9OAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.enssib.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENSSIB</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>
-					      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>
-    </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-POST" Location="https://idp.enssib.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.enssib.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.enssib.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enssib.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.enssib.fr/idp/profile/SAML1/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">ENSSIB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENSSIB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.enssib.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sébastien BOUTELIER</md:SurName>
-    <md:EmailAddress>sebastien.boutelier@enssib.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Isabelle RECH-LE-RECIS</md:SurName>
-    <md:EmailAddress>isabelle.rech-le-recis@enssib.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ab4b563e..00000000
--- a/swamid-interfederations-2.0/idp.ent.dauphine.fr-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.ent.dauphine.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Paris 9 - Dauphine</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/gif;base64,R0lGODlhEAAQAOeVAFGwxkiv+kO441S05Ee4+kLA8FrE0UnJ5mnE1o271XzKzHrI7mXT4obO5IbQ04fb/5He5p3b6qrX7pre56nh+Mji+brt/r709Mrz+d3w9sb3/vHx8efz//Tx//zv/+r46ef3//zx//T28fT37vz0///0+PX47//0+v/0/P/29/j4+OX9///2/v/2/+H///33///3+v/3+/T6///3/f/49fn5//H98f758/b87vH8///4//X7///5+fP8/+n////5+v75///5/f/5//b8/O//9Pr7/f/6+f/6+vD+/+7/+//6++3///L/8f/6/fD/+P/6//D/+vL/9u/////7+fr99PL/+PH/+//7+vD///f9//z8/Pv8//f+9/H///38+v/7//L///T/+vX/+P/8+fP////8+vX/+vX/+/T////8/ff/+P/8//X///b//f39/fn/9vr+/f/9+fj/+v/9+vr+//f///n/+vj//f7+9v/9/fz+/fj////9//z+//z/9vn///3+///++v/++/7+/vz/+v/+/P7+//7/9v/+/f//9Pz//f7/+P/+//z///7/+v//+P7/+/7//f//+/7//////f///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////yH+EUNyZWF0ZWQgd2l0aCBHSU1QACwAAAAAEAAQAAAI/gBnnPgDBssfRlMEFYqkCE6jRkUo6WnESEcJSGYaAarE6MqYQIGcKEoB48ocSSLiGGmio8WLLGTq5OFxI4qVSS3SRDqTBIqaRzQqeXl0SA4aEGAkIeLDAoihPV34tKliQkiHBAAy9Piig4WSQItqDCHkqI+LBQICEChwgAEEDGD2PIkx6QKCAQ9scJnUJ0cFCRSYrJHRwICFJ0EqDXJTqbGKDU9WKIiwZccSPIoZN9aigoMDDTpIsKGSqPGgQY0bT8DiYc2jD2+OpJ5dyUeIPERw/PiCBHVq3y3u2PEjhqsU36bduBlRBg4dIXukoKCteNCbMHx0rGEkyI9p5JUCAQIAOw==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.dauphine.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Paris 9 - Dauphine</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>
-					      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>
-    </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-POST" Location="https://idp.ent.dauphine.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ent.dauphine.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ent.dauphine.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Paris 9 - Dauphine</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Paris 9 - Dauphine</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dauphine.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Lionel LENOBLE</md:SurName>
-    <md:EmailAddress>lionel.lenoble@dauphine.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 821579fa..00000000
--- a/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.entpe.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENTPE - Vaulx en Velin</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACbElEQVQoz22SX0hTcRTHz343Ze3CxHsnzgRRRviyXjYIroKGKPgYk2BPPfhgNIMMEnwxMgkGvRqUjEEzhnuZIhs97UE0GLIYXaFE6U52R7TrXeH+uXZ/93d60Mq07/P5HL7nfL+WhTX8XofL8nvrn96v9vT0jI6OIkJaAVmFe7cA8H/KZrOSJAUCAUrpjzrOxzEQwdpPRMSLAKV0ZWVFFMXZ2dlm0/hyhMNBXN5EhkgpPTw8/AcolUp+v7+lpWVpaclkbO0D3nyGG1lExEajkUgk8vn8X2B7e9vj8QiCsL6+Tk1c3kT3PG7tIyIqipJIJGRZZoydAclksqOjw+12y7L87RgfvEXPU5RVZIxlMpk3kcje3t7pJNRqtWAwKAjC+Pi4ph2lPuONJyg9x5yOlNJUKhUOh/Oq+scI+CYmrFbr4uJioWQ8jqHjIfpfYeUEq9VqMpmMRqO6rp+/E8rlsqZp+0WceIn8fVzYwJMm6roeiUTi8Xi1Wr3wRovJMJqG4DuoNeDFHfB5mSzLu7u7XV1dQ0NDra2tFwK1PFrF0BYMuOD1XbhmN9LptKIoLpdLkiSO4y434MrwdSb1wW2vhbMgIkHEkZGR7u5u+F0CQsiZewBCCHdS/Fj/mrFdtc7MzBiGoapqpVKZmpra2dkxTXNubi4Wi/X394+NjZXL5cHBQcJxXGdnp8PhaGtrC4VC7e3tPp/P6XROT0/zPC+KYi6XO93d29tHCCEAwPO8zWaTpAFN0w4ODs47LhaL4XDYbrcTQkRRAADCGDNNs1AoAODk5KSmaQBgmiallDHmdDq9Xi9jzDAMXdebzeYvcjfFs1cEA2EAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDAZx6xGAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjQxKzAyOjAwaJoU+gAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.entpe.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENTPE - Vaulx en Velin</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>
-					      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>
-    </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-POST" Location="https://idp.entpe.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.entpe.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.entpe.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.entpe.fr/idp/profile/SAML1/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">ENTPE - Vaulx en Velin</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENTPE - Vaulx en Velin</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.entpe.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Christian GARDET</md:SurName>
-    <md:EmailAddress>christian.gardet@entpe.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 5a088b45..00000000
--- a/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.epfl.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-12-02T16:36:50Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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+b5x77r85PAQ6kalRPj8S40srMycsZ5EFhT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</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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.epfl.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.epfl.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.epfl.ch/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.epfl.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epfl.ch</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.epfl.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.epfl.ch: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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">epfl.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">EPFL - EPF Lausanne</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">EPFL - EPF Lausanne</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">EPFL - EPF Lausanne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.epfl.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.epfl.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.epfl.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>EPFL Team</md:SurName>
-    <md:EmailAddress>mailto:aai@epfl.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>EPFL Team</md:SurName>
-    <md:EmailAddress>mailto:aai@epfl.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.es.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.es.net-idp-shibboleth.xml
deleted file mode 100644
index 0ce38960..00000000
--- a/swamid-interfederations-2.0/idp.es.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +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://idp.es.net/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.es.net/idp/error.html" 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">es.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ESnet</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Energy Sciences Network </mdui:Description>
-        <mdui:Logo height="22" width="72" xml:lang="en">https://www.es.net/assets/Logos/ESnetFinalRGB.jpg</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>
-MIIDFDCCAfygAwIBAgIVAO4b4WF67Uq3LsXyIhUEBd7dB/JoMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5lcy5uZXQwHhcNMTExMjEzMjMwNTM4WhcNMzEx
-MjEzMjMwNTM4WjAVMRMwEQYDVQQDEwppZHAuZXMubmV0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAi2esIvvexX85muTD8yzJF9InJ8NwysxfxyWDDLco
-1G4ypEPN6121TbKotdF83keigjRsK/+jsq1VyMJeUW6kXlZ9N6Xzet8Zt/uxBamB
-Q2iipdNwDJtLty3zEtGbsQywYkZSfBm7Dse2cB8+GZTBeJUXN3BGetKFUX/IM7RE
-3y5j0c/Oem+Gd7HvZLVSNsy4CvBnPhs3w2mhJkh4FFbOdPMnQSP2/hQt0hAVfhzr
-bA8IKI2dv/f5nlOJd/6X1uM2IfgSG3M1dp+AIcD4Frdl65T9eyTKHBIxh8Sng1Lf
-lf6C4yiFq4KvKOYB0byGGEo4SGQKsXnxWPzw9te02K5xuwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuZXMubmV0hiFodHRwczovL2lkcC5lcy5uZXQvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFKWAyXCw7X2OjsdUocqtpHTLbasKMA0GCSqGSIb3DQEB
-BQUAA4IBAQBPsEx37NAmxr6zUpMCu7SKdVaf8r9ppieqQxbHBVVxVsQ5IX7IY1AB
-qcUzMVY0m5Hnp4GbU0xkuiRqUNrlsp+n52MosJwPiWkO0m9ljN0Dn8kkRExJq/bS
-d6W45OX283biF1VpolxwQKvNNJdIliLexfiFnwxTGMT5OzQzQ8qX/Jr31DmT5y91
-lVH5KPTu0rxTbbtx75SaPJ9FXmiHFe25kZd+hyZs/XB8ExN58jukXygMUOUgIuRP
-sb1TR90+G0WLUJlIxr1SeRpeHFUWcHkEmss3FIwgJrRVwfSQxwQgTRFRELJInRQI
-nciX8msJNoIgdL+nElSBTZ1kUT569c8d
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.es.net/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.es.net/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.es.net/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.es.net/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.es.net/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">es.net</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAO4b4WF67Uq3LsXyIhUEBd7dB/JoMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5lcy5uZXQwHhcNMTExMjEzMjMwNTM4WhcNMzEx
-MjEzMjMwNTM4WjAVMRMwEQYDVQQDEwppZHAuZXMubmV0MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAi2esIvvexX85muTD8yzJF9InJ8NwysxfxyWDDLco
-1G4ypEPN6121TbKotdF83keigjRsK/+jsq1VyMJeUW6kXlZ9N6Xzet8Zt/uxBamB
-Q2iipdNwDJtLty3zEtGbsQywYkZSfBm7Dse2cB8+GZTBeJUXN3BGetKFUX/IM7RE
-3y5j0c/Oem+Gd7HvZLVSNsy4CvBnPhs3w2mhJkh4FFbOdPMnQSP2/hQt0hAVfhzr
-bA8IKI2dv/f5nlOJd/6X1uM2IfgSG3M1dp+AIcD4Frdl65T9eyTKHBIxh8Sng1Lf
-lf6C4yiFq4KvKOYB0byGGEo4SGQKsXnxWPzw9te02K5xuwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuZXMubmV0hiFodHRwczovL2lkcC5lcy5uZXQvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFKWAyXCw7X2OjsdUocqtpHTLbasKMA0GCSqGSIb3DQEB
-BQUAA4IBAQBPsEx37NAmxr6zUpMCu7SKdVaf8r9ppieqQxbHBVVxVsQ5IX7IY1AB
-qcUzMVY0m5Hnp4GbU0xkuiRqUNrlsp+n52MosJwPiWkO0m9ljN0Dn8kkRExJq/bS
-d6W45OX283biF1VpolxwQKvNNJdIliLexfiFnwxTGMT5OzQzQ8qX/Jr31DmT5y91
-lVH5KPTu0rxTbbtx75SaPJ9FXmiHFe25kZd+hyZs/XB8ExN58jukXygMUOUgIuRP
-sb1TR90+G0WLUJlIxr1SeRpeHFUWcHkEmss3FIwgJrRVwfSQxwQgTRFRELJInRQI
-nciX8msJNoIgdL+nElSBTZ1kUT569c8d
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.es.net/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ESnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ESnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.es.net/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dhiva Muruganantham</md:GivenName>
-    <md:EmailAddress>dhiva@es.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ESnet Operations</md:GivenName>
-    <md:EmailAddress>trouble@es.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.esc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.esc.edu-idp-shibboleth.xml
deleted file mode 100644
index 86bab003..00000000
--- a/swamid-interfederations-2.0/idp.esc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://idp.esc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">esc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SUNY Empire State College</mdui:DisplayName>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.esc.edu/policies/?search=cid%3D35661</mdui:PrivacyStatementURL>
-        <mdui:Logo height="302" width="57" xml:lang="en">https://www.esc.edu/media/esc-website/style-assets/images/logos/esc-logo-orange-bkg.jpg</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>
-MIIDFzCCAf+gAwIBAgIUJ2V9Z0LCoLuWMLmlW0TccM7q5bowDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmVzYy5lZHUwHhcNMTMwNzAyMDM1NDAyWhcNMzMw
-NzAyMDM1NDAyWjAWMRQwEgYDVQQDEwtpZHAuZXNjLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJJ8cy7KjNKGMI+N4hImtIreeCTdVbErSBtjAWj9
-A4YNjwnxEMhkO5eYj4+FjEOLG3UmaEoRwMmwahPIeLEk5gCbQ66nLbwdIub77dly
-ajsoqwdLkU9zbSLKbshQuwR8dPzTjQSuDPSpqXaAN+o63FTs+zxNsUgWx87NXpVs
-ODWJAGYCOocuXfNJYF4VrKEtpDjb4RX2ssaGlJEN0c/HeB2OwKFkYkf6U5I2upYL
-BXI7ZDuZv8CnDGbvrDJQnvu8XM17Bp/rTECAVdxY6IOeVeS9yGPSYk16I5zELATH
-kNeER3HmxujGQa6AXV5EPwMClRvlzfuU10NN+IzsdBoClU8CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmVzYy5lZHWGImh0dHBzOi8vaWRwLmVzYy5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFHW1WXdqkMDDqwdR3I7qfSGJ0rXFMA0GCSqGSIb3
-DQEBBQUAA4IBAQAAxbWVsS2P1gyG8jnD5PhDp97nfeHTxseaeNLZE35WpXc9CACP
-9Blj9v9jSWX6sg/tv2v+tZ9zrPHyeKmnDd7u9y3Z0jeyEptkhA4pxQ8nBTnizT81
-Sqh2y4PEHbiMGhxo7yjscGrQH3+68me4zZRh8K4cwb2Yc5U1OX1AitTrRILjdmnk
-O+FO67Fjb0M3vJBtnzPE+yrHcs1X3ziXNfLiKBpMxd8F/doaBB1NsDyaZE1MvM8w
-Q3Xxxt1gOGGfIHd26VZaZAu2yQbStPmuE39wSd6qHdjhRANX/bvB9BwwWaViSwLL
-cpt9YIL8me3wWdKKULCHEj8ZjnvogpRWvrZm
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.esc.edu/cas/logout"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.esc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esc.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUJ2V9Z0LCoLuWMLmlW0TccM7q5bowDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmVzYy5lZHUwHhcNMTMwNzAyMDM1NDAyWhcNMzMw
-NzAyMDM1NDAyWjAWMRQwEgYDVQQDEwtpZHAuZXNjLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJJ8cy7KjNKGMI+N4hImtIreeCTdVbErSBtjAWj9
-A4YNjwnxEMhkO5eYj4+FjEOLG3UmaEoRwMmwahPIeLEk5gCbQ66nLbwdIub77dly
-ajsoqwdLkU9zbSLKbshQuwR8dPzTjQSuDPSpqXaAN+o63FTs+zxNsUgWx87NXpVs
-ODWJAGYCOocuXfNJYF4VrKEtpDjb4RX2ssaGlJEN0c/HeB2OwKFkYkf6U5I2upYL
-BXI7ZDuZv8CnDGbvrDJQnvu8XM17Bp/rTECAVdxY6IOeVeS9yGPSYk16I5zELATH
-kNeER3HmxujGQa6AXV5EPwMClRvlzfuU10NN+IzsdBoClU8CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmVzYy5lZHWGImh0dHBzOi8vaWRwLmVzYy5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFHW1WXdqkMDDqwdR3I7qfSGJ0rXFMA0GCSqGSIb3
-DQEBBQUAA4IBAQAAxbWVsS2P1gyG8jnD5PhDp97nfeHTxseaeNLZE35WpXc9CACP
-9Blj9v9jSWX6sg/tv2v+tZ9zrPHyeKmnDd7u9y3Z0jeyEptkhA4pxQ8nBTnizT81
-Sqh2y4PEHbiMGhxo7yjscGrQH3+68me4zZRh8K4cwb2Yc5U1OX1AitTrRILjdmnk
-O+FO67Fjb0M3vJBtnzPE+yrHcs1X3ziXNfLiKBpMxd8F/doaBB1NsDyaZE1MvM8w
-Q3Xxxt1gOGGfIHd26VZaZAu2yQbStPmuE39wSd6qHdjhRANX/bvB9BwwWaViSwLL
-cpt9YIL8me3wWdKKULCHEj8ZjnvogpRWvrZm
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SUNY Empire State College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SUNY Empire State College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.esc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Adam Cross</md:GivenName>
-    <md:EmailAddress>adam.cross@esc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Koch</md:GivenName>
-    <md:EmailAddress>john.koch@esc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>AJ Lacomba</md:GivenName>
-    <md:EmailAddress>aj.lacomba@esc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.escelje.si-idp-20140916.xml b/swamid-interfederations-2.0/idp.escelje.si-idp-20140916.xml
deleted file mode 100644
index 1c98172b..00000000
--- a/swamid-interfederations-2.0/idp.escelje.si-idp-20140916.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.escelje.si/idp/20140916">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-02-13T13:02:08Z">
-      <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 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">escelje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.escelje.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">School of economics Celje</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Ekonomska šola Celje</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for school of economics Celje</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet ekonomske šole Celje</mdui:Description>
-        <mdui:Keywords xml:lang="en">identity provider school economics idp</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">ponudnik identit ekonomska šola Celje idp</mdui:Keywords>
-        <mdui:Logo height="180" width="180">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.escelje.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.escelje.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>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</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>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.escelje.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.escelje.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">EKONOMSKA ŠOLA CELJE</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">EKONOMSKA ŠOLA CELJE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">EKONOMSKA ŠOLA CELJE</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">EKONOMSKA ŠOLA CELJE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.escelje.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.escelje.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Maja</md:GivenName>
-    <md:SurName>Krajnc</md:SurName>
-    <md:EmailAddress>mailto:maja.krajnc@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:info@escelje.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Bernarda</md:GivenName>
-    <md:SurName>Marčeta</md:SurName>
-    <md:EmailAddress>mailto:bernarda.marceta@escelje.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ivan</md:GivenName>
-    <md:SurName>Kolenko</md:SurName>
-    <md:EmailAddress>mailto:ivan.kolenko@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ivan</md:GivenName>
-    <md:SurName>Kolenko</md:SurName>
-    <md:EmailAddress>mailto:ivan.kolenko@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ivan</md:GivenName>
-    <md:SurName>Kolenko</md:SurName>
-    <md:EmailAddress>mailto:ivan.kolenko@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tomaž</md:GivenName>
-    <md:SurName>Ferbežar</md:SurName>
-    <md:EmailAddress>mailto:tomaz.ferbezar@sc-nm.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.esh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.esh.se-idp-shibboleth.xml
deleted file mode 100644
index 4c5caaae..00000000
--- a/swamid-interfederations-2.0/idp.esh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.esh.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">esh.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Ersta Sköndal Högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Ersta Sköndal University College</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Ersta Sköndal University College</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the Royal Swedish Academy of Sciences</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVALaN98IcoLX3UQ+fKlQVmqP23WvBMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5lc2guc2UwHhcNMTMwODA3MDkwOTU4WhcNMzMw
-ODA3MDkwOTU4WjAVMRMwEQYDVQQDEwppZHAuZXNoLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAn2ZQb1kuPTXtueUtR79lZa5hCV2fMlOlfFJFMyC3
-+6qQR6CGGZ7GvntHtIKpbfFqIeCsWNGXLttNDmGroG6koge0CEKv6z6JVD5tHert
-UVRA7GpDZpZLR7qRYcrbZp1tLrk9gKL3/PaudZhwAKuWiMz5HNyqk9Ojh3YRWJUD
-1O3RX6l2tvc8MjT8JYE2D+TpqqiT5k1WgV7zgCv3QVnazfuANKZ2qjxiKVi3bh1w
-V/3VDJiN9DYhN1NvU412QBZR1AU1XJL36qkKmeTOi8qhhlxh6abl2oEpgyjR0lxn
-o1HwkDipkIJJiN/h7CKlUnEHpPidI5tMy/PezW78h2znfwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuZXNoLnNlhiFodHRwczovL2lkcC5lc2guc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFDGWVB2qNc/D6uRZt2wqI4/SM3Y6MA0GCSqGSIb3DQEB
-BQUAA4IBAQCMaKhHwEwcXTM7/HO6RbavAsisMab0TsCmuYsrCtYFccdrFNEUs+R5
-qGwHre8J+0cMi0WgSIHXLnbhvjG3JPmBeLkZdSw/rOGtF6w6VSVpT2iGvfjNbsBq
-wFGkaEnsDKzhiBaIOcJyAJoh97PJygz7yriziwxDZrB7b0xnBHVs6u4HNuQjd/NA
-geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
-+PUaqX2b8yCDIeHr7NkqtYf1nqphQ71OvdKe1R6Pzw9N19ny10FJcZypisRt/ghv
-9SqhISRU1eEjg6GtcLZCkvdVGag/E4qO
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.esh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.esh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVALaN98IcoLX3UQ+fKlQVmqP23WvBMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5lc2guc2UwHhcNMTMwODA3MDkwOTU4WhcNMzMw
-ODA3MDkwOTU4WjAVMRMwEQYDVQQDEwppZHAuZXNoLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAn2ZQb1kuPTXtueUtR79lZa5hCV2fMlOlfFJFMyC3
-+6qQR6CGGZ7GvntHtIKpbfFqIeCsWNGXLttNDmGroG6koge0CEKv6z6JVD5tHert
-UVRA7GpDZpZLR7qRYcrbZp1tLrk9gKL3/PaudZhwAKuWiMz5HNyqk9Ojh3YRWJUD
-1O3RX6l2tvc8MjT8JYE2D+TpqqiT5k1WgV7zgCv3QVnazfuANKZ2qjxiKVi3bh1w
-V/3VDJiN9DYhN1NvU412QBZR1AU1XJL36qkKmeTOi8qhhlxh6abl2oEpgyjR0lxn
-o1HwkDipkIJJiN/h7CKlUnEHpPidI5tMy/PezW78h2znfwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuZXNoLnNlhiFodHRwczovL2lkcC5lc2guc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFDGWVB2qNc/D6uRZt2wqI4/SM3Y6MA0GCSqGSIb3DQEB
-BQUAA4IBAQCMaKhHwEwcXTM7/HO6RbavAsisMab0TsCmuYsrCtYFccdrFNEUs+R5
-qGwHre8J+0cMi0WgSIHXLnbhvjG3JPmBeLkZdSw/rOGtF6w6VSVpT2iGvfjNbsBq
-wFGkaEnsDKzhiBaIOcJyAJoh97PJygz7yriziwxDZrB7b0xnBHVs6u4HNuQjd/NA
-geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
-+PUaqX2b8yCDIeHr7NkqtYf1nqphQ71OvdKe1R6Pzw9N19ny10FJcZypisRt/ghv
-9SqhISRU1eEjg6GtcLZCkvdVGag/E4qO
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Ersta Sköndal Högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Ersta Sköndal Högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Ersta Sköndal University College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.esh.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/idp.esher.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.esher.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 253c7c10..00000000
--- a/swamid-interfederations-2.0/idp.esher.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.esher.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Esher College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-19T11:08:16Z">
-      <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">esher.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Esher College</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUTqf68WmrG3w0sWAxe9mg3otFIZswDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAwwPaWRwLmVzaGVyLmFjLnVrMB4XDTE0MTIxNzEyMTMzNVoX
-						DTM0MTIxNzEyMTMzNVowGjEYMBYGA1UEAwwPaWRwLmVzaGVyLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0HdpuV5htwYC8WF3zeFZTKJ2AYbP
-						WZ7SU/LvVYqrD9cfm68KNG7HBpECZ7eZ1JggqUZDiFQToRGfBGH4jhsxjjhDP0KV
-						Oo8mKB/vNkKwd+bBjg9IGko4k/LfT0hxyGIPMG0CJWBazhPwG7JHj2Dh8kuJwCJA
-						Cebu+zRQeKgOdwtM2C08GmqYKRksRTqyLCaYUvF8wRF9J1aIMjOvwhyzgzSlw12w
-						y7brj8XBHwoY5oNpZEM9Zu8cv7uQNTrI7Up6pNYcEEVIp1KFLk+biBg6zPFykBNQ
-						OaatiJscuqjjX29hfraT1gbEaMgTXzjrlzMPOns04HNx+mrE0kIUdQ8prQIDAQAB
-						o2UwYzAdBgNVHQ4EFgQUUHA9nhSU3TIZcNn44UKjCf5sIxMwQgYDVR0RBDswOYIP
-						aWRwLmVzaGVyLmFjLnVrhiZodHRwczovL2lkcC5lc2hlci5hYy51ay9pZHAvc2hp
-						YmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAGDEpLkm/u08qjo/CnqYyHB5Oh7LF
-						Koorx5Ag47xgR0l2rtnTe5KO88IhnkBLzU15RzPAH8yZacto0Yp06Eq/2EoMjfRd
-						1CeeAFrDPZsBuMLKqXYcGeFkIkCPZMrRkhN4EzYRiJzs6IzJdqNnNSOJ4yYu6iga
-						CqrktgZRjlFK/WRiGD7KfTOanA4PUw5EPovKKM5vcIsBO/5dSjmZSWbBK0hTWUCr
-						hetlcmrGJDayU8XF/HZYDRPIe+ZABsaaqkrFgLGjTHeHv95TNk9r7oVF3V+G4M2q
-						XTPQTiNsUr7+4LYPFUtOa6fi1GHeYLkqLiuuhX9v2GW8jXtV+XUA7+r1MQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esher.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esher.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.esher.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esher.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esher.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.esher.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esher.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.esher.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esher.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">esher.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUTqf68WmrG3w0sWAxe9mg3otFIZswDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAwwPaWRwLmVzaGVyLmFjLnVrMB4XDTE0MTIxNzEyMTMzNVoX
-						DTM0MTIxNzEyMTMzNVowGjEYMBYGA1UEAwwPaWRwLmVzaGVyLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0HdpuV5htwYC8WF3zeFZTKJ2AYbP
-						WZ7SU/LvVYqrD9cfm68KNG7HBpECZ7eZ1JggqUZDiFQToRGfBGH4jhsxjjhDP0KV
-						Oo8mKB/vNkKwd+bBjg9IGko4k/LfT0hxyGIPMG0CJWBazhPwG7JHj2Dh8kuJwCJA
-						Cebu+zRQeKgOdwtM2C08GmqYKRksRTqyLCaYUvF8wRF9J1aIMjOvwhyzgzSlw12w
-						y7brj8XBHwoY5oNpZEM9Zu8cv7uQNTrI7Up6pNYcEEVIp1KFLk+biBg6zPFykBNQ
-						OaatiJscuqjjX29hfraT1gbEaMgTXzjrlzMPOns04HNx+mrE0kIUdQ8prQIDAQAB
-						o2UwYzAdBgNVHQ4EFgQUUHA9nhSU3TIZcNn44UKjCf5sIxMwQgYDVR0RBDswOYIP
-						aWRwLmVzaGVyLmFjLnVrhiZodHRwczovL2lkcC5lc2hlci5hYy51ay9pZHAvc2hp
-						YmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAGDEpLkm/u08qjo/CnqYyHB5Oh7LF
-						Koorx5Ag47xgR0l2rtnTe5KO88IhnkBLzU15RzPAH8yZacto0Yp06Eq/2EoMjfRd
-						1CeeAFrDPZsBuMLKqXYcGeFkIkCPZMrRkhN4EzYRiJzs6IzJdqNnNSOJ4yYu6iga
-						CqrktgZRjlFK/WRiGD7KfTOanA4PUw5EPovKKM5vcIsBO/5dSjmZSWbBK0hTWUCr
-						hetlcmrGJDayU8XF/HZYDRPIe+ZABsaaqkrFgLGjTHeHv95TNk9r7oVF3V+G4M2q
-						XTPQTiNsUr7+4LYPFUtOa6fi1GHeYLkqLiuuhX9v2GW8jXtV+XUA7+r1MQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esher.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esher.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">Esher College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Esher College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.esher.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Daniel</GivenName>
-    <SurName>Loughlin</SurName>
-    <EmailAddress>mailto:operations@esher.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Daniel</GivenName>
-    <SurName>Loughlin</SurName>
-    <EmailAddress>mailto:operations@esher.ac.uk</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 aa846885..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.eso.org/idp/shibboleth">
-  <md: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>
-  </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">eso.org</shibmd: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eso.org/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eso.org/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org: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.eso.org/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eso.org/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eso.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eso.org/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">eso.org</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eso.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org: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">e446</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e446</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">ESO - European Organisation for Astronomical Research</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ESO - European Organisation for Astronomical Research</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.eso.org</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.eso.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Florian</md:GivenName>
-    <md:SurName>Heissenhuber</md:SurName>
-    <md:EmailAddress>mailto:fheissen@eso.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Florian</md:GivenName>
-    <md:SurName>Heissenhuber</md:SurName>
-    <md:EmailAddress>mailto:fheissen@eso.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.esrc.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.esrc.ac.uk-openathens.xml
deleted file mode 100644
index 18a49586..00000000
--- a/swamid-interfederations-2.0/idp.esrc.ac.uk-openathens.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.esrc.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for the Economic and Social Research Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">esrc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/esrc.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/esrc.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Economic &amp; Social Research Council</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.esrc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.essingtoncc.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.essingtoncc.co.uk-idp-shibboleth.xml
deleted file mode 100644
index 156c8c94..00000000
--- a/swamid-interfederations-2.0/idp.essingtoncc.co.uk-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" entityID="https://idp.essingtoncc.co.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Essington Computer Consultancy Limited.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-21T15:59:21Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">essingtoncc.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID0jCCAroCCQCGyNfhukfamTANBgkqhkiG9w0BAQUFADCBqjELMAkGA1UEBhMC
-						R0IxFjAUBgNVBAgMDVN0YWZmb3Jkc2hpcmUxEjAQBgNVBAcMCUVzc2luZ3RvbjEr
-						MCkGA1UECgwiRXNzaW5ndG9uIENvbXB1dGVyIENvbnN1bHRhbmN5IEx0ZDEeMBwG
-						A1UEAwwVaWRwLmVzc2luZ3RvbmNjLmNvLnVrMSIwIAYJKoZIhvcNAQkBFhNzdXBw
-						b3J0QGFnbTE5NjAuY29tMB4XDTE0MDUwMjEzNDk0N1oXDTI0MDQyOTEzNDk0N1ow
-						gaoxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1TdGFmZm9yZHNoaXJlMRIwEAYDVQQH
-						DAlFc3Npbmd0b24xKzApBgNVBAoMIkVzc2luZ3RvbiBDb21wdXRlciBDb25zdWx0
-						YW5jeSBMdGQxHjAcBgNVBAMMFWlkcC5lc3Npbmd0b25jYy5jby51azEiMCAGCSqG
-						SIb3DQEJARYTc3VwcG9ydEBhZ20xOTYwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAMsPBbmhQnhaUeaTfJcOioEIyFDMOEvnKf1bAiFqa3CRw8mX
-						QSFLhOofkLQppkdBgPN+i9kDqc+noa4QXw2gZxzePLiipjJ1oA50FNVhEUd86/cL
-						8gGfrY0Xt0l9JtU7XWGQPAjVv0oAa5FDbEyWBsGkWekD1wxNd3jGDyGDn6/0sxm6
-						jxVExyDp3mzX/v17xsAW+t9+hhvSh8yxSQj+IH9Un5AXq2sPOrya7JgSsHbJl6Ql
-						mnCO12+bHz59F/GTdGtAvz2lQQ/QqVRG8QGqL6Q5xyM1AYq4RxJVRBza1t+LD4u0
-						2yJSstGOWdC4O/T8yiNDQyQt3wOPTrMuBiGiDMcCAwEAATANBgkqhkiG9w0BAQUF
-						AAOCAQEAPsofQ9oo0zDYNV8Yxo+S2xyRV5LqfpamWqclIZs3Mu1Yt4RkopnoiCfv
-						RP/bb6h/hM+5LbCtcl/6HzYuPcJvs3kqKMbOXhVtqR6ad9PYH6gLr3wzaDDioYcC
-						0LMvvhhUUfPFqbkNV7cH1+qRq1SHi9GXWeBeUISrm+gHXsu7CuoY5Cynv5u2ugv1
-						Giv+wxW8FWn4kVV5g77tP/FphuHqeKEAesjOMS2b4MU8DB2ptzj5NfGEmcWpf3cU
-						ZKkmrie5td8TdkKkn8UyJbGsbLcv6fFbFTCh9V/n8uBUCJTT+CQpKDNmPKNuRxSW
-						x1EIfHvBWWZhPjOeFVoyVrdxsAdnIA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.essingtoncc.co.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.essingtoncc.co.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.essingtoncc.co.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.essingtoncc.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.essingtoncc.co.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">essingtoncc.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID0jCCAroCCQCGyNfhukfamTANBgkqhkiG9w0BAQUFADCBqjELMAkGA1UEBhMC
-						R0IxFjAUBgNVBAgMDVN0YWZmb3Jkc2hpcmUxEjAQBgNVBAcMCUVzc2luZ3RvbjEr
-						MCkGA1UECgwiRXNzaW5ndG9uIENvbXB1dGVyIENvbnN1bHRhbmN5IEx0ZDEeMBwG
-						A1UEAwwVaWRwLmVzc2luZ3RvbmNjLmNvLnVrMSIwIAYJKoZIhvcNAQkBFhNzdXBw
-						b3J0QGFnbTE5NjAuY29tMB4XDTE0MDUwMjEzNDk0N1oXDTI0MDQyOTEzNDk0N1ow
-						gaoxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1TdGFmZm9yZHNoaXJlMRIwEAYDVQQH
-						DAlFc3Npbmd0b24xKzApBgNVBAoMIkVzc2luZ3RvbiBDb21wdXRlciBDb25zdWx0
-						YW5jeSBMdGQxHjAcBgNVBAMMFWlkcC5lc3Npbmd0b25jYy5jby51azEiMCAGCSqG
-						SIb3DQEJARYTc3VwcG9ydEBhZ20xOTYwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAMsPBbmhQnhaUeaTfJcOioEIyFDMOEvnKf1bAiFqa3CRw8mX
-						QSFLhOofkLQppkdBgPN+i9kDqc+noa4QXw2gZxzePLiipjJ1oA50FNVhEUd86/cL
-						8gGfrY0Xt0l9JtU7XWGQPAjVv0oAa5FDbEyWBsGkWekD1wxNd3jGDyGDn6/0sxm6
-						jxVExyDp3mzX/v17xsAW+t9+hhvSh8yxSQj+IH9Un5AXq2sPOrya7JgSsHbJl6Ql
-						mnCO12+bHz59F/GTdGtAvz2lQQ/QqVRG8QGqL6Q5xyM1AYq4RxJVRBza1t+LD4u0
-						2yJSstGOWdC4O/T8yiNDQyQt3wOPTrMuBiGiDMcCAwEAATANBgkqhkiG9w0BAQUF
-						AAOCAQEAPsofQ9oo0zDYNV8Yxo+S2xyRV5LqfpamWqclIZs3Mu1Yt4RkopnoiCfv
-						RP/bb6h/hM+5LbCtcl/6HzYuPcJvs3kqKMbOXhVtqR6ad9PYH6gLr3wzaDDioYcC
-						0LMvvhhUUfPFqbkNV7cH1+qRq1SHi9GXWeBeUISrm+gHXsu7CuoY5Cynv5u2ugv1
-						Giv+wxW8FWn4kVV5g77tP/FphuHqeKEAesjOMS2b4MU8DB2ptzj5NfGEmcWpf3cU
-						ZKkmrie5td8TdkKkn8UyJbGsbLcv6fFbFTCh9V/n8uBUCJTT+CQpKDNmPKNuRxSW
-						x1EIfHvBWWZhPjOeFVoyVrdxsAdnIA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.essingtoncc.co.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">Essington Computer Consultancy Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Essington Computer Consultancy Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.essingtoncc.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Morris</SurName>
-    <EmailAddress>mailto:andy@essingtoncc.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Morris</SurName>
-    <EmailAddress>mailto:andy@essingtoncc.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.esufa.edu.co-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.esufa.edu.co-idp-shibboleth.xml
deleted file mode 100644
index 9ef18965..00000000
--- a/swamid-interfederations-2.0/idp.esufa.edu.co-idp-shibboleth.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.esufa.edu.co/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://colfire.co" registrationInstant="2014-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="es">http://colfire.co/?page_id=55</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esufa.edu.co</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ESUFA - Escuela de Suboficiales de la Fuerza Aerea</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ESUFA - Escuela de Suboficiales de la Fuerza Aerea</mdui:Description>
-        <mdui:Logo height="116" width="104">https://www.esufa.edu.co/sites/all/themes/escudos/images/logo1.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>
-MIIDKzCCAhOgAwIBAgIUR3iBFy9n6nA18hMLsJm30tEjr2IwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaWRwLmVzdWZhLmVkdS5jbzAeFw0xNTEwMjcxNTE5MTda
-Fw0zNTEwMjcxNTE5MTdaMBsxGTAXBgNVBAMMEGlkcC5lc3VmYS5lZHUuY28wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfGR5eateagj0PnAw+ysxMmMmQ
-td6hMmG/hAHPUtIgGjriykJW62N9Pdnq96sQb6yGsErFcWwid0hPSNZUAqPjx32w
-akkVQnXmYwWnlldRXueFFyerHvD/vPBDrsClEQFDNoIAjtwcXW2myrdrY9Uvr7s0
-1HR+8ZANeddKnvn0BiZGvOR48MS8+JCAP2sCF0S0HcP49fCM8t/c3tl52HDgbeO6
-kfn4VH86JTyhghC2bNs9RM5UyzSiPYneSPuZDxi6mTxfyFIwAvYT+TcBTcP+/cYa
-4FXsF7TF+umPxRqnLMknFxOLsvblM5GDDuJzn3Yja+4GM5HyO4aprMlCqkL/AgMB
-AAGjZzBlMB0GA1UdDgQWBBQxt9Jk6AVo/EYsLzL+207UfLe7jDBEBgNVHREEPTA7
-ghBpZHAuZXN1ZmEuZWR1LmNvhidodHRwczovL2lkcC5lc3VmYS5lZHUuY28vaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAIAeemyYbRf2nWT67tetcpVM
-Gd2+Ws9nQhUEN/ZWTjCFu372m8o/nzNNNAh5+xSTFcrd6VMCbbm+XnVtPwt2WoRg
-NCCz8K45VIWmrgGwm8Nt6U+oAkumlswuAepJcfahsnKgv0U7qf2BVSL0jpy19c0p
-0H1p+mLIonGK1qOogKyfBZjyxawnTzZofLtfA8vUx7/IDuxTfgV6nnnc+Z/aDATB
-+fmWslC91CbfhCbMDmFA5qlNhCkvByn4ftNc4KVFXBa9yBZxCtv1ICIrMfNeGn6Z
-MRirrsA/Pf/HUBYniJVLRsfIJEZTI7zKqnKaS6EmM8qq40LW/Myj2MtEJ1rW1VA=
-                        </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>
-MIIDKzCCAhOgAwIBAgIUG1YyO7RicWuwZ/ERCAXtNnt0OUMwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaWRwLmVzdWZhLmVkdS5jbzAeFw0xNTEwMjcxNTE5MTZa
-Fw0zNTEwMjcxNTE5MTZaMBsxGTAXBgNVBAMMEGlkcC5lc3VmYS5lZHUuY28wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCr05q168l9MK8YfXb9yxrL4QV
-a2gxg+CvJc3VlEiZ+upXbmnZCOr+5O8CccokRBV3WG9qfS5rLAZl/AmxF/Stcs0s
-an0eeMin9t44FZU12HM5VX1IS1oIVVOSp/EF7t5puIIMqPN6kIbKQOT3EqxOTEe/
-W+M0ofl+/DZg0qgDENMUaG9FU7qrA/4pehmytdv9JmhSTycg4nipr5iVAFvWy4vk
-5zNFzCvqtHxE1CegJUF72M5EITEUqihafnGoxAXVEyIWtD3q+XcxmI1PF6eUD7jH
-R+RBbdDKrfMsec3Dpd3/UsGcVKxztfUcSf/Yh2VRBkLLPixKdCE8ePzbIlHfAgMB
-AAGjZzBlMB0GA1UdDgQWBBRp8fBDzfSEIvqWJKHvQviqpLvUHzBEBgNVHREEPTA7
-ghBpZHAuZXN1ZmEuZWR1LmNvhidodHRwczovL2lkcC5lc3VmYS5lZHUuY28vaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGxgl6cHcqOCDahO5pJaSlDV
-meFA/vg53pTunK4VVtbZwoagVUVOsYW38zU2ANKXetkx5yK38O7SPWL6GF7vVp9M
-VA3ILqEDEOYRgnjGA+sw5P3KU0zhzT6948EeD5qSdtfXxzlvh15I2nSeL9/8O3wQ
-1o8pKnIC0maLySulIP9BxFYBJExJi/7LrxNFPCsMAroHq7XEiEQyXi9f4ZWE+DJp
-pBwyZmIKeUrMNRxpglFHiSIrrV44vzBTElJEUpB2cLnwGxu8LK2LYP/DkDDQl5Di
-atE5Y2eHiCk2ku+gXCHtL6uQrGyxSIQHWcH49ohEKS/Jm2qnMNkG/YLE5PLefz0=
-                        </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>
-MIIDKzCCAhOgAwIBAgIUHzrD9JrVS3L07QCTwd1q9TdsaoMwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaWRwLmVzdWZhLmVkdS5jbzAeFw0xNTEwMjcxNTE5MTda
-Fw0zNTEwMjcxNTE5MTdaMBsxGTAXBgNVBAMMEGlkcC5lc3VmYS5lZHUuY28wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcSXgBUncSqkmxkIxtxSK8e4k3
-+XZ1qbxhkHiGT+tSzxWNdyNy7JmNtpKNTDSvFF9el+sICWkdMUYj+LeFXB6gcJDK
-tr6tp3fVaXRKYXaT1rrStRbIzcRe7XMRqtRZTVnBhAXY7e0TJgKyZcSGrWz0wnxl
-fk0EKwBIVK3CiguAjndelPJbp11ZOSHOgUWBExAwUAKecb02IhgWe5g79ZdGB2be
-0MC/e2xB9DfVbQ/Z+8Iz9hxx+njvTiHknaypJDV2KQHeUXLxhL86FCwCdaCFBYO9
-kBBG5sVimpoY2xBrngdJuAagYhcWwExcIEswJmx1W+pmgempFk0cNO6w4zdJAgMB
-AAGjZzBlMB0GA1UdDgQWBBSzwJJHyRiw4DQZnbs6x67gmzOzHTBEBgNVHREEPTA7
-ghBpZHAuZXN1ZmEuZWR1LmNvhidodHRwczovL2lkcC5lc3VmYS5lZHUuY28vaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAIad6RjxaKwApgDD3iY13HnZ
-2tmfEov0VY9hBBHI6jUJIb4+qWw4BIlbYzx8Z4r1Hc8B7J/xFU4oOevsLzuKiQbY
-89x01GEXT3cFPTZEoz6DX6npNBgzQVAGnC74f/nxGIy3Sbi8gJCSousfOn1H5LFg
-CIDMjvtwdqw0t+EDARXO5vBJ4UCtPAW/9dsnzcCliUYWCJ04iN+UMejkazqAIqbz
-3HGnmU5jCG2qaLE0D6NaZkj7wptqkwRpGm+vDE8YsEIhhl+LbsvA1GY579P978Pt
-3iMRmTxHiqJ9Le8DuivZ/9PrQRFDlqzrgfbADCkJRsowwXq3pTJZYuxs+9ynVEw=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esufa.edu.co:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.esufa.edu.co: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.esufa.edu.co/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.esufa.edu.co/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.esufa.edu.co/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.esufa.edu.co/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esufa.edu.co</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUR3iBFy9n6nA18hMLsJm30tEjr2IwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaWRwLmVzdWZhLmVkdS5jbzAeFw0xNTEwMjcxNTE5MTda
-Fw0zNTEwMjcxNTE5MTdaMBsxGTAXBgNVBAMMEGlkcC5lc3VmYS5lZHUuY28wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfGR5eateagj0PnAw+ysxMmMmQ
-td6hMmG/hAHPUtIgGjriykJW62N9Pdnq96sQb6yGsErFcWwid0hPSNZUAqPjx32w
-akkVQnXmYwWnlldRXueFFyerHvD/vPBDrsClEQFDNoIAjtwcXW2myrdrY9Uvr7s0
-1HR+8ZANeddKnvn0BiZGvOR48MS8+JCAP2sCF0S0HcP49fCM8t/c3tl52HDgbeO6
-kfn4VH86JTyhghC2bNs9RM5UyzSiPYneSPuZDxi6mTxfyFIwAvYT+TcBTcP+/cYa
-4FXsF7TF+umPxRqnLMknFxOLsvblM5GDDuJzn3Yja+4GM5HyO4aprMlCqkL/AgMB
-AAGjZzBlMB0GA1UdDgQWBBQxt9Jk6AVo/EYsLzL+207UfLe7jDBEBgNVHREEPTA7
-ghBpZHAuZXN1ZmEuZWR1LmNvhidodHRwczovL2lkcC5lc3VmYS5lZHUuY28vaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAIAeemyYbRf2nWT67tetcpVM
-Gd2+Ws9nQhUEN/ZWTjCFu372m8o/nzNNNAh5+xSTFcrd6VMCbbm+XnVtPwt2WoRg
-NCCz8K45VIWmrgGwm8Nt6U+oAkumlswuAepJcfahsnKgv0U7qf2BVSL0jpy19c0p
-0H1p+mLIonGK1qOogKyfBZjyxawnTzZofLtfA8vUx7/IDuxTfgV6nnnc+Z/aDATB
-+fmWslC91CbfhCbMDmFA5qlNhCkvByn4ftNc4KVFXBa9yBZxCtv1ICIrMfNeGn6Z
-MRirrsA/Pf/HUBYniJVLRsfIJEZTI7zKqnKaS6EmM8qq40LW/Myj2MtEJ1rW1VA=
-                        </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>
-MIIDKzCCAhOgAwIBAgIUG1YyO7RicWuwZ/ERCAXtNnt0OUMwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaWRwLmVzdWZhLmVkdS5jbzAeFw0xNTEwMjcxNTE5MTZa
-Fw0zNTEwMjcxNTE5MTZaMBsxGTAXBgNVBAMMEGlkcC5lc3VmYS5lZHUuY28wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCr05q168l9MK8YfXb9yxrL4QV
-a2gxg+CvJc3VlEiZ+upXbmnZCOr+5O8CccokRBV3WG9qfS5rLAZl/AmxF/Stcs0s
-an0eeMin9t44FZU12HM5VX1IS1oIVVOSp/EF7t5puIIMqPN6kIbKQOT3EqxOTEe/
-W+M0ofl+/DZg0qgDENMUaG9FU7qrA/4pehmytdv9JmhSTycg4nipr5iVAFvWy4vk
-5zNFzCvqtHxE1CegJUF72M5EITEUqihafnGoxAXVEyIWtD3q+XcxmI1PF6eUD7jH
-R+RBbdDKrfMsec3Dpd3/UsGcVKxztfUcSf/Yh2VRBkLLPixKdCE8ePzbIlHfAgMB
-AAGjZzBlMB0GA1UdDgQWBBRp8fBDzfSEIvqWJKHvQviqpLvUHzBEBgNVHREEPTA7
-ghBpZHAuZXN1ZmEuZWR1LmNvhidodHRwczovL2lkcC5lc3VmYS5lZHUuY28vaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGxgl6cHcqOCDahO5pJaSlDV
-meFA/vg53pTunK4VVtbZwoagVUVOsYW38zU2ANKXetkx5yK38O7SPWL6GF7vVp9M
-VA3ILqEDEOYRgnjGA+sw5P3KU0zhzT6948EeD5qSdtfXxzlvh15I2nSeL9/8O3wQ
-1o8pKnIC0maLySulIP9BxFYBJExJi/7LrxNFPCsMAroHq7XEiEQyXi9f4ZWE+DJp
-pBwyZmIKeUrMNRxpglFHiSIrrV44vzBTElJEUpB2cLnwGxu8LK2LYP/DkDDQl5Di
-atE5Y2eHiCk2ku+gXCHtL6uQrGyxSIQHWcH49ohEKS/Jm2qnMNkG/YLE5PLefz0=
-                        </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>
-MIIDKzCCAhOgAwIBAgIUHzrD9JrVS3L07QCTwd1q9TdsaoMwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaWRwLmVzdWZhLmVkdS5jbzAeFw0xNTEwMjcxNTE5MTda
-Fw0zNTEwMjcxNTE5MTdaMBsxGTAXBgNVBAMMEGlkcC5lc3VmYS5lZHUuY28wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcSXgBUncSqkmxkIxtxSK8e4k3
-+XZ1qbxhkHiGT+tSzxWNdyNy7JmNtpKNTDSvFF9el+sICWkdMUYj+LeFXB6gcJDK
-tr6tp3fVaXRKYXaT1rrStRbIzcRe7XMRqtRZTVnBhAXY7e0TJgKyZcSGrWz0wnxl
-fk0EKwBIVK3CiguAjndelPJbp11ZOSHOgUWBExAwUAKecb02IhgWe5g79ZdGB2be
-0MC/e2xB9DfVbQ/Z+8Iz9hxx+njvTiHknaypJDV2KQHeUXLxhL86FCwCdaCFBYO9
-kBBG5sVimpoY2xBrngdJuAagYhcWwExcIEswJmx1W+pmgempFk0cNO6w4zdJAgMB
-AAGjZzBlMB0GA1UdDgQWBBSzwJJHyRiw4DQZnbs6x67gmzOzHTBEBgNVHREEPTA7
-ghBpZHAuZXN1ZmEuZWR1LmNvhidodHRwczovL2lkcC5lc3VmYS5lZHUuY28vaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAIad6RjxaKwApgDD3iY13HnZ
-2tmfEov0VY9hBBHI6jUJIb4+qWw4BIlbYzx8Z4r1Hc8B7J/xFU4oOevsLzuKiQbY
-89x01GEXT3cFPTZEoz6DX6npNBgzQVAGnC74f/nxGIy3Sbi8gJCSousfOn1H5LFg
-CIDMjvtwdqw0t+EDARXO5vBJ4UCtPAW/9dsnzcCliUYWCJ04iN+UMejkazqAIqbz
-3HGnmU5jCG2qaLE0D6NaZkj7wptqkwRpGm+vDE8YsEIhhl+LbsvA1GY579P978Pt
-3iMRmTxHiqJ9Le8DuivZ/9PrQRFDlqzrgfbADCkJRsowwXq3pTJZYuxs+9ynVEw=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.esufa.edu.co:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">
-	    ESUFA - Escuela de Suboficiales de la Fuerza Aerea
-	</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">
-
-	     ESUFA - Escuela de Suboficiales de la Fuerza Aerea
-	</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.esufa.edu.co</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="es">http://www.esufa.edu.co</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Carlos Ramirez</md:SurName>
-    <md:EmailAddress>ingenieria@renata.edu.co</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.etrs.terre.defense.gouv.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.etrs.terre.defense.gouv.fr-idp-shibboleth.xml
deleted file mode 100644
index 2120898b..00000000
--- a/swamid-interfederations-2.0/idp.etrs.terre.defense.gouv.fr-idp-shibboleth.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://idp.etrs.terre.defense.gouv.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-06-16T13:41:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etrs.terre.defense.gouv.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ETRS - Ecole des Transmissions</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/vnd.microsoft.icon;base64,AAABAAEAEBACAAEAAQCwAAAAFgAAACgAAAAQAAAAIAAAAAEAAQAAAAAAAAgAAAAAAAAAAAAAAgAAAAAAAACEIxoAfuP8APAPAAD4HwAA+B8AAPw/AAD8PwAA/D8AAPw/AAD8PwAA/D8AAPw/AAB8PgAAHDgAAAAAAAAAAAAAAAAAAH/+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.etrs.terre.defense.gouv.fr/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Staff and students of Ecole des Transmissions</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ETRS - Ecole des Transmissions</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels et stagiaires de l'Ecole des Transmissions</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>
-					      MIIDZTCCAk2gAwIBAgIUJ8+wj9VvvaWkYWc7Lv9ZrozEz5wwDQYJKoZIhvcNAQEF
-BQAwKTEnMCUGA1UEAwweaWRwLmV0cnMudGVycmUuZGVmZW5zZS5nb3V2LmZyMB4X
-DTE1MDYwNDEyNDMzM1oXDTM1MDYwNDEyNDMzM1owKTEnMCUGA1UEAwweaWRwLmV0
-cnMudGVycmUuZGVmZW5zZS5nb3V2LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAncSOI7ZLCUW1YAQxsXx9sGUhIETkAQD0rW31036RsUcxJKHvSfvH
-Lz9t95F0OmCw4K+gVFFobxoOzwWrfNkQKNLmWJjfqVWe7euL5S6a5CLdzvosDCIa
-P63/9JAlAlAPvVQ3JYH08FcLQL2zcbxshZJBvsAQrSOOnkytXndkmpjlvPZNn3Hb
-ofiSA2CDDfNjIgFq1AS0nGJyuHSDD+Foi2TsU8ejirYVZPxn8wacxpt9GtIuY/tl
-eYTjdH41kskaXqRGoN0X7aC2Xea357hf950lEbacTOxztYITIJFZVkQjjea+YdGU
-9fsjrAkxuAyXX5yHD9SU8t9Px1Y/jwVWxwIDAQABo4GEMIGBMB0GA1UdDgQWBBRV
-5pi3YXYkaI4CLWcEtD2SiRteWTBgBgNVHREEWTBXgh5pZHAuZXRycy50ZXJyZS5k
-ZWZlbnNlLmdvdXYuZnKGNWh0dHBzOi8vaWRwLmV0cnMudGVycmUuZGVmZW5zZS5n
-b3V2LmZyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQB7c5PZS50w
-lcNUHGNv0QbHmFIEl2qSVW5p+y4lZX3QBEy+dyKw9qaTFGDD+qLfa9QKo6s31uLo
-cW7aGmG2ok6U0XjT7fCKIR8YljugdZfetCw5BiHRIaDzVhj8ozZPmb0OxlTecpJ/
-gQ3wik7Qo9ZPU/wLObyVcxGBeIiQxXhCTu0Gqvl2UUV1Jwo4OEt5Vb6oBjN7HMDj
-CSaG+Q/uQK0g4lfhJr2ZvpDrAy+f5ZJcccgz4uPJk0hqdydB6gHGIbSYVt1X89vW
-WYYigdavCrEx/mzNsCIdNuvFCFWQxDTr62aRd9Ib9VdrTc4GL7w+Gi7Ne++PRgzX
-laUPwIb+uQ6Z
-					    </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-POST" Location="https://idp.etrs.terre.defense.gouv.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.etrs.terre.defense.gouv.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.etrs.terre.defense.gouv.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ETRS - Ecole des Transmissions</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ETRS - Ecole des Transmissions</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.etrs.terre.defense.gouv.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Fabrice Pollet</md:SurName>
-    <md:EmailAddress>fabrice.pollet@etrs.terre.defense.gouv.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eup.edinboro.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.eup.edinboro.edu-idp-shibboleth.xml
deleted file mode 100644
index 1a325b4c..00000000
--- a/swamid-interfederations-2.0/idp.eup.edinboro.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,68 +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://idp.eup.edinboro.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">edinboro.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Edinboro University of Pennsylvania</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>
-MIIDOzCCAiOgAwIBAgIUFianlABIFtAs3u/76iVhSuuoZOwwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLmV1cC5lZGluYm9yby5lZHUwHhcNMTUxMTAyMTYw
-OTEzWhcNMzUxMTAyMTUwOTEzWjAfMR0wGwYDVQQDDBRpZHAuZXVwLmVkaW5ib3Jv
-LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANRhIJ6kQolqSWPU
-J7ZgbiAf06AWsgCMBjro82YcYEMPlOuPmOc1Nu9mgd+SIVDyAWoGifohy7MAwtZK
-EBAb1N7D8mbwSGCmfULdbgQ79o0CBO/AGmXtgaLLQf2Xkk7jxCv3MKie+F+VB6V4
-BwQtxId8p4jrnAcZlRYVDD09GQD9hiWLbrnSV/mLYJgMX4RHgzPnxPWYb3r4GfvI
-xsKhL+opeVubvENsKN6CDzIE8Kp+dkH11nwDL4V3ZMEu/Ym7ngKIxFDfr7Mdc7Yf
-p+/cZAY7C6u+7c+0Pncftl3AyJKehHrv2UwEwjeQhuKHkW+UxiGFHswgzPBA5SRQ
-1BWMSpUCAwEAAaNvMG0wHQYDVR0OBBYEFJUOYM/B5CgyRGRrs3wWaEo/nP5fMEwG
-A1UdEQRFMEOCFGlkcC5ldXAuZWRpbmJvcm8uZWR1hitodHRwczovL2lkcC5ldXAu
-ZWRpbmJvcm8uZWR1L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQDJ
-KmhNtUXQvB8HyONKSjJJHtQ6rLut8pn6vuRkdM7W04flENGI7Yby2JYgAm2f39Kl
-oYm1LJvbsQWsXLizVIQZCtFKkdAtiH+am1qFXpYDIeWeq2Ha4rsvsu59GAjN7rah
-o6RP+sRKFgt8HlMFaf74er6gtKIhZCbztDYehOiq/hkNTMbW9jbEdglrMYAlasNm
-zB/u9DYj/GrUTzuffJ4p4e4OQ+b43VUQqt/2V/jh7ZuAHFha+RaMEU0oKy+Gb3Zd
-Z1gkNL/ThIrfbDze5fC0/hfEFbUOksDJarAyckTgJ2y04gEg+rXTHou780DtxSuK
-aujsroEAboRTQ/jskvQa
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eup.edinboro.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eup.edinboro.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Edinboro University of Pennsylvania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Edinboro University of Pennsylvania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.edinboro.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ralph Boyles</md:GivenName>
-    <md:EmailAddress>boyles@edinboro.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ralph Boyles</md:GivenName>
-    <md:EmailAddress>boyles@edinboro.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Ralph Boyles</md:GivenName>
-    <md:EmailAddress>boyles@edinboro.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Ralph Boyles</md:GivenName>
-    <md:EmailAddress>boyles@edinboro.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 71a3e320..00000000
--- a/swamid-interfederations-2.0/idp.eurecom.fr-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.eurecom.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABD0lEQVQ4y+2RPUoDURCAv3nv7SYqWFlYqFHQQlJYaRG9RzyH5/AMggfwHFFEPIHFyrZKwNWQ5L0Zi82yRNQT5KuGYfjmD1aImRlAURQktX+LD/Z7iMhSLjRBWZYAVJ2KL93jNWwud/IZ/UoQATMY5DPWOnk9gaq2ZoPe7TNmnqCtICK8b7TSariDuFALkiqj0SOgTELGNGTYQmpmiAhBJ5yfndYdgPUkeB/aGzRMqNi9+eQjj3iD1KxsgkrCIzhXMb48Ine+FjzcPxFjBKArb0x1G41dNMyZkQEwuDjGDPIkuAS+++MLDS8Kh3dj/DziVEFcPcCiKrnE1Ynnur/1uyCpoQjB/fFSFSQZZMKKmm+AtoEKVdONaAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MiswMjowMCgvttsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDIrMDI6MDBZcg5nAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.eurecom.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.eurecom.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eurecom.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.eurecom.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">EURECOM</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">EURECOM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.eurecom.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>shibboleth@eurecom.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index ba83ddd9..00000000
--- a/swamid-interfederations-2.0/idp.exe-coll.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.exe-coll.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Exeter College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-22T10:10:10Z">
-      <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 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">exe-coll.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Exeter College</mdui:DisplayName>
-        <mdui:Logo height="80" width="60">https://www.exe-coll.ac.uk/Images/ukfederation/eclogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAOBgSoILoqxp6Sd97P44EOTJO6BmMA0GCSqGSIb3DQEB
-						CwUAMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51azAeFw0xNTEwMDUxNDQ4
-						NTBaFw0zNTEwMDUxNDQ4NTBaMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJDt47Xw9yoz4+kmm7d8
-						aUBogCQUuoYHtKfSHtQXSwWzAGA44zNhRXrCtkaWQRcWziwpbEISl7N1DA/Et7K8
-						GWxkPHLb9AY1hmuqJhI7VTcnRW9K1c35dkcU8y8iq/KtEs/Scqykk7mRdYP0220z
-						MkGsKyGX4lnca+3qjTZEjIQmmrQkG6MT2TSwYIP4okPVsf0psa4gFm9zIcQ833xq
-						aM/JeGhWy8wC1XAR0QdON4KOmlRbOz8Gt24SZ5uFCYP/0M0bsi5bT9VFbIzDHeOU
-						2Ksp3LCGW+auudlvpYNCw/f/z6zJzyjbEaaZWEC5EUNp5I17BNut+AHfQEUGg2KW
-						QmcCAwEAAaNrMGkwHQYDVR0OBBYEFECBehw5Kkbqihxtl4i9xVqD+/FnMEgGA1Ud
-						EQRBMD+CEmlkcC5leGUtY29sbC5hYy51a4YpaHR0cHM6Ly9pZHAuZXhlLWNvbGwu
-						YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGCt0iihFupc
-						7R0GLGlBisiOFz+9+DH3m1c7AXUOBSj7JeDlhD/HeN0abj4oRu3vNuDSSVbQ8r2A
-						0eJAMlT+2KGjvDOpgZZM6ch2b4DwlDmaK52GAMBP34muY42GaoCA9EJ9BAM+sLQb
-						OQXdOxtfEXP/Fw9khCTGXsLMm+069lR+1c0PFhKEY9ZMIYEL9H+VvXpyRRA70QP9
-						glZa39ROiCKWcxTaat0q4uGrfd7rFDOZu33wfDSjQcznJdLYrsppbKWGK7gE5C8+
-						EEwb4NmJVaB29/9uUdGVA7AWh5HnuGgc5mGXx7TGwFx8/xE7qk8XjwyT24BbFJ0A
-						Ldsw0D2RloY=
-					</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>
-						MIIDMzCCAhugAwIBAgIUBbXkHi70ulJrjIlvWCIzdMBJiHEwDQYJKoZIhvcNAQEL
-						BQAwHTEbMBkGA1UEAwwSaWRwLmV4ZS1jb2xsLmFjLnVrMB4XDTE1MTAwNTE0NDg0
-						OFoXDTM1MTAwNTE0NDg0OFowHTEbMBkGA1UEAwwSaWRwLmV4ZS1jb2xsLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvwPQqi7IeM//8uxLAoaJ
-						p6buQefMlgcZp26Ab0lKfllI9qXnbw7mcZVJM6GVAgiSss3qmjnbCrSNvIe/lsK6
-						2Bhl7JIC50VPbR3DXYJiCZpiWAptaIJ3lFSQMBA/6aIAtqO4Uoq0mAl//qWdFnKY
-						cMw3BRhI1YKTEQa78jetAklmnKEQ+8RruirfcV4l10Sn/HN54WFAzhuH/W6numGo
-						NOUcp7rRhiVtBPt6mhZQQZkGCG+EkOMh8P72OBDZ5Ky9zrloPQvbv+MN26dsuOWt
-						Na4R32Y+LA0zrVa2qXLsE63cJs1OS2GgZfbzhtcbsKyaRNazH39mjyw8XthMj1nN
-						hwIDAQABo2swaTAdBgNVHQ4EFgQUdcbpv8lSyws0CaM6oeNcbjyumiIwSAYDVR0R
-						BEEwP4ISaWRwLmV4ZS1jb2xsLmFjLnVrhilodHRwczovL2lkcC5leGUtY29sbC5h
-						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlALDqVXXotPR
-						SIewI6t+QxCe+7U/V3gI/pREVIUhKgyURFkarxSbAoqLma6ttM8FjQijbRPUKMGl
-						a0ug36cGohcVYKtGKySnuQDZc6MpmtjpQBYR3O1RPLXRPQpFB46qXTd8jJE3eVXI
-						WIhoDPHwXECNph7Zc+37/qAplKADt+gCqOZOvb/dFywG61lkv2RLfqWu0jZAwBeB
-						xd2NnxQAzOGQXarWIOBDdC+Rm57Yo4QcDIDaWIFai02h30SDVNbD2IOKTTFlB9BU
-						VbqI3mpvBerOgVstriPdd4rGSb6qfF+cZYiwroaQ6zEri+sVrV8qZ/w4+Xt4ncu0
-						jr+x5aa4EQ==
-					</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>
-						MIIDNDCCAhygAwIBAgIVAKrBnUGd75sXdnSjpLBrMHUL9Z7hMA0GCSqGSIb3DQEB
-						CwUAMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51azAeFw0xNTEwMDUxNDQ4
-						NDlaFw0zNTEwMDUxNDQ4NDlaMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKf2PWKyWWY1Xv/CvpBI
-						a4ajaR9YX4wdOV9Ba+zdB3kHQyXLSMNb4OV7xaRaih6XzRjUm8tBUki+MU8k5Ncr
-						R8w8EzLnxLiqsuIn+5WdXng1CaGNnw0YYzyfxU/3zuLy7/QnoRUj8TKC6zzdAanl
-						05idK4kB6ZS9LNnfEq9GYRYJBBaFI0XAKMHqXGKRBmlTThd00qb+gpcSkXRDmafA
-						JBBRmIc62ilViQkTB6Nu6dUmQTDTWRip3X6rJynKXX1vHCZP00aXOBiZgbD+Nu+F
-						mMXEqMvA+Nm+VzX0CrffvfTLbZWoGXjea1jKYT7S+L/bt0wEcFnPTiX4ITNos18/
-						mLUCAwEAAaNrMGkwHQYDVR0OBBYEFNBFc8Ql0nmSGxBro64kDuZHn+KRMEgGA1Ud
-						EQRBMD+CEmlkcC5leGUtY29sbC5hYy51a4YpaHR0cHM6Ly9pZHAuZXhlLWNvbGwu
-						YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAA/sn2WL7uDS
-						Z1txLqmXLjqCD2K8U3VPgJqsQ7da+w/MQDiYQUKs4iUe/HJNN9mkGrg4BWq/YB0v
-						RP922H76+ne+JFFV/k+EZxpVcjiB+kLeIiBS341Wucdh3gJW8Sultx76Eu/POH+f
-						ohmndUNvofFwbMSPholtz6YhrlgXoWWzp7EVqraOZJJs2PFylngOytoqz8MKsoqg
-						Zi1Eyw3fIflsineDleFHE0ALKqbf2vA7r931j/GntEQ5gZfr4ytdxu6isiGM3adg
-						ZySpPoJYHPmJimQ7K8FRBhRuiXinhoQm9Pi/5VbPO4fZmX2rYFTUHE+6zDB2gJjN
-						/F0mlEEmxK8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.exe-coll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.exe-coll.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.exe-coll.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.exe-coll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.exe-coll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.exe-coll.ac.uk/idp/profile/SAML2/Redirect/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">exe-coll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAOBgSoILoqxp6Sd97P44EOTJO6BmMA0GCSqGSIb3DQEB
-						CwUAMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51azAeFw0xNTEwMDUxNDQ4
-						NTBaFw0zNTEwMDUxNDQ4NTBaMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJDt47Xw9yoz4+kmm7d8
-						aUBogCQUuoYHtKfSHtQXSwWzAGA44zNhRXrCtkaWQRcWziwpbEISl7N1DA/Et7K8
-						GWxkPHLb9AY1hmuqJhI7VTcnRW9K1c35dkcU8y8iq/KtEs/Scqykk7mRdYP0220z
-						MkGsKyGX4lnca+3qjTZEjIQmmrQkG6MT2TSwYIP4okPVsf0psa4gFm9zIcQ833xq
-						aM/JeGhWy8wC1XAR0QdON4KOmlRbOz8Gt24SZ5uFCYP/0M0bsi5bT9VFbIzDHeOU
-						2Ksp3LCGW+auudlvpYNCw/f/z6zJzyjbEaaZWEC5EUNp5I17BNut+AHfQEUGg2KW
-						QmcCAwEAAaNrMGkwHQYDVR0OBBYEFECBehw5Kkbqihxtl4i9xVqD+/FnMEgGA1Ud
-						EQRBMD+CEmlkcC5leGUtY29sbC5hYy51a4YpaHR0cHM6Ly9pZHAuZXhlLWNvbGwu
-						YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGCt0iihFupc
-						7R0GLGlBisiOFz+9+DH3m1c7AXUOBSj7JeDlhD/HeN0abj4oRu3vNuDSSVbQ8r2A
-						0eJAMlT+2KGjvDOpgZZM6ch2b4DwlDmaK52GAMBP34muY42GaoCA9EJ9BAM+sLQb
-						OQXdOxtfEXP/Fw9khCTGXsLMm+069lR+1c0PFhKEY9ZMIYEL9H+VvXpyRRA70QP9
-						glZa39ROiCKWcxTaat0q4uGrfd7rFDOZu33wfDSjQcznJdLYrsppbKWGK7gE5C8+
-						EEwb4NmJVaB29/9uUdGVA7AWh5HnuGgc5mGXx7TGwFx8/xE7qk8XjwyT24BbFJ0A
-						Ldsw0D2RloY=
-					</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>
-						MIIDMzCCAhugAwIBAgIUBbXkHi70ulJrjIlvWCIzdMBJiHEwDQYJKoZIhvcNAQEL
-						BQAwHTEbMBkGA1UEAwwSaWRwLmV4ZS1jb2xsLmFjLnVrMB4XDTE1MTAwNTE0NDg0
-						OFoXDTM1MTAwNTE0NDg0OFowHTEbMBkGA1UEAwwSaWRwLmV4ZS1jb2xsLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvwPQqi7IeM//8uxLAoaJ
-						p6buQefMlgcZp26Ab0lKfllI9qXnbw7mcZVJM6GVAgiSss3qmjnbCrSNvIe/lsK6
-						2Bhl7JIC50VPbR3DXYJiCZpiWAptaIJ3lFSQMBA/6aIAtqO4Uoq0mAl//qWdFnKY
-						cMw3BRhI1YKTEQa78jetAklmnKEQ+8RruirfcV4l10Sn/HN54WFAzhuH/W6numGo
-						NOUcp7rRhiVtBPt6mhZQQZkGCG+EkOMh8P72OBDZ5Ky9zrloPQvbv+MN26dsuOWt
-						Na4R32Y+LA0zrVa2qXLsE63cJs1OS2GgZfbzhtcbsKyaRNazH39mjyw8XthMj1nN
-						hwIDAQABo2swaTAdBgNVHQ4EFgQUdcbpv8lSyws0CaM6oeNcbjyumiIwSAYDVR0R
-						BEEwP4ISaWRwLmV4ZS1jb2xsLmFjLnVrhilodHRwczovL2lkcC5leGUtY29sbC5h
-						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlALDqVXXotPR
-						SIewI6t+QxCe+7U/V3gI/pREVIUhKgyURFkarxSbAoqLma6ttM8FjQijbRPUKMGl
-						a0ug36cGohcVYKtGKySnuQDZc6MpmtjpQBYR3O1RPLXRPQpFB46qXTd8jJE3eVXI
-						WIhoDPHwXECNph7Zc+37/qAplKADt+gCqOZOvb/dFywG61lkv2RLfqWu0jZAwBeB
-						xd2NnxQAzOGQXarWIOBDdC+Rm57Yo4QcDIDaWIFai02h30SDVNbD2IOKTTFlB9BU
-						VbqI3mpvBerOgVstriPdd4rGSb6qfF+cZYiwroaQ6zEri+sVrV8qZ/w4+Xt4ncu0
-						jr+x5aa4EQ==
-					</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>
-						MIIDNDCCAhygAwIBAgIVAKrBnUGd75sXdnSjpLBrMHUL9Z7hMA0GCSqGSIb3DQEB
-						CwUAMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51azAeFw0xNTEwMDUxNDQ4
-						NDlaFw0zNTEwMDUxNDQ4NDlaMB0xGzAZBgNVBAMMEmlkcC5leGUtY29sbC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKf2PWKyWWY1Xv/CvpBI
-						a4ajaR9YX4wdOV9Ba+zdB3kHQyXLSMNb4OV7xaRaih6XzRjUm8tBUki+MU8k5Ncr
-						R8w8EzLnxLiqsuIn+5WdXng1CaGNnw0YYzyfxU/3zuLy7/QnoRUj8TKC6zzdAanl
-						05idK4kB6ZS9LNnfEq9GYRYJBBaFI0XAKMHqXGKRBmlTThd00qb+gpcSkXRDmafA
-						JBBRmIc62ilViQkTB6Nu6dUmQTDTWRip3X6rJynKXX1vHCZP00aXOBiZgbD+Nu+F
-						mMXEqMvA+Nm+VzX0CrffvfTLbZWoGXjea1jKYT7S+L/bt0wEcFnPTiX4ITNos18/
-						mLUCAwEAAaNrMGkwHQYDVR0OBBYEFNBFc8Ql0nmSGxBro64kDuZHn+KRMEgGA1Ud
-						EQRBMD+CEmlkcC5leGUtY29sbC5hYy51a4YpaHR0cHM6Ly9pZHAuZXhlLWNvbGwu
-						YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAA/sn2WL7uDS
-						Z1txLqmXLjqCD2K8U3VPgJqsQ7da+w/MQDiYQUKs4iUe/HJNN9mkGrg4BWq/YB0v
-						RP922H76+ne+JFFV/k+EZxpVcjiB+kLeIiBS341Wucdh3gJW8Sultx76Eu/POH+f
-						ohmndUNvofFwbMSPholtz6YhrlgXoWWzp7EVqraOZJJs2PFylngOytoqz8MKsoqg
-						Zi1Eyw3fIflsineDleFHE0ALKqbf2vA7r931j/GntEQ5gZfr4ytdxu6isiGM3adg
-						ZySpPoJYHPmJimQ7K8FRBhRuiXinhoQm9Pi/5VbPO4fZmX2rYFTUHE+6zDB2gJjN
-						/F0mlEEmxK8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.exe-coll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Exeter College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Exeter College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.exe-coll.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:itserivces@exe-coll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nigel</GivenName>
-    <SurName>Burrows</SurName>
-    <EmailAddress>mailto:NigelBurrows@exe-coll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IdP Admin</GivenName>
-    <EmailAddress>mailto:idpadmin@exe-coll.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fareham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.fareham.ac.uk-shibboleth.xml
deleted file mode 100644
index 49c1105b..00000000
--- a/swamid-interfederations-2.0/idp.fareham.ac.uk-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.fareham.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Fareham College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">fareham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/fareham.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/fareham.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Fareham College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fareham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.farn-ct.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.farn-ct.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 150435d6..00000000
--- a/swamid-interfederations-2.0/idp.farn-ct.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.farn-ct.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Farnborough College of Technology.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-12T11:59: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">farn-ct.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID+DCCAuACCQDiBNfRRk2CeTANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-						R0IxEjAQBgNVBAgMCUhhbXBzaGlyZTEUMBIGA1UEBwwLRmFybmJvcm91Z2gxKjAo
-						BgNVBAoMIUZhcm5ib3JvdWdoIENvbGxlZ2Ugb2YgVGVjaG5vbG9neTEUMBIGA1UE
-						CwwLSVQgU2VydmljZXMxGjAYBgNVBAMMEWlkcC5mYXJuLWN0LmFjLnVrMSYwJAYJ
-						KoZIhvcNAQkBFhd3LmhhbHNhbGxAZmFybi1jdC5hYy51azAeFw0xNDAzMDMxMjE4
-						MzhaFw0yNDAyMjkxMjE4MzhaMIG9MQswCQYDVQQGEwJHQjESMBAGA1UECAwJSGFt
-						cHNoaXJlMRQwEgYDVQQHDAtGYXJuYm9yb3VnaDEqMCgGA1UECgwhRmFybmJvcm91
-						Z2ggQ29sbGVnZSBvZiBUZWNobm9sb2d5MRQwEgYDVQQLDAtJVCBTZXJ2aWNlczEa
-						MBgGA1UEAwwRaWRwLmZhcm4tY3QuYWMudWsxJjAkBgkqhkiG9w0BCQEWF3cuaGFs
-						c2FsbEBmYXJuLWN0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAw3S9I4W4QmKzx4xKCW/RRmBwyNJaUSe7idAWZvh/4g3pG4ZqfvjTiwHPH2QF
-						hHwl6+BH52jfpCMliKwYh+JyN0dStTdyvz96/G7fyBb4ZZouVuh1BOX0F8Uz8xKA
-						FqJ4iS4ld9YgBhT9F57W0uGLmS4Jy0W6BWv2lPmv1OMZaL3c2CQizLs2wV0GcVxx
-						KJgdVCoopE0nqi6PIBehlU2cSuluiclfojFmRLaEv8T/6C/b+MogfqR+s93RwMrn
-						7v3+G6xURcDaT+OMXP7sIT/0St28+MPR+rEwbZPNjkhTnoUnPhAWl6ZZTHM46nbN
-						hNr4vlJL+ZGqocmQI3seEyXboQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCW+V0X
-						iZ1t1PpdU0b7hgZAG0qh6R7UmUY5Baxtp4FIN1WebvnSr0keskwff59iIHeZ4/Km
-						u4Q7fkvghlteTti7r2LTS47CASwKi1UrtvmNMerSmdYeDYeymt94LXiTzK9dlXRW
-						ZYM5LPHeEIoHOFeRvwnXACKvJs0y4MwshxDGn4WIfLKj+z9y/FRsohRlxQihFx5y
-						qwjP8f2vXwGgZnM1WvcyH+Q/uhypmjdKmI1OkevgTclBZC8m6OJz0bwKqVnRD9AZ
-						Bqgu4cXU7lk5y1nreWIF8soBdlqgGwIngb+obZjG/cWsP4wGoVyFPgdHbpqTZVaf
-						TgP5ojXtIFXiNKGS
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.farn-ct.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.farn-ct.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.farn-ct.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.farn-ct.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.farn-ct.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.farn-ct.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">farn-ct.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID+DCCAuACCQDiBNfRRk2CeTANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-						R0IxEjAQBgNVBAgMCUhhbXBzaGlyZTEUMBIGA1UEBwwLRmFybmJvcm91Z2gxKjAo
-						BgNVBAoMIUZhcm5ib3JvdWdoIENvbGxlZ2Ugb2YgVGVjaG5vbG9neTEUMBIGA1UE
-						CwwLSVQgU2VydmljZXMxGjAYBgNVBAMMEWlkcC5mYXJuLWN0LmFjLnVrMSYwJAYJ
-						KoZIhvcNAQkBFhd3LmhhbHNhbGxAZmFybi1jdC5hYy51azAeFw0xNDAzMDMxMjE4
-						MzhaFw0yNDAyMjkxMjE4MzhaMIG9MQswCQYDVQQGEwJHQjESMBAGA1UECAwJSGFt
-						cHNoaXJlMRQwEgYDVQQHDAtGYXJuYm9yb3VnaDEqMCgGA1UECgwhRmFybmJvcm91
-						Z2ggQ29sbGVnZSBvZiBUZWNobm9sb2d5MRQwEgYDVQQLDAtJVCBTZXJ2aWNlczEa
-						MBgGA1UEAwwRaWRwLmZhcm4tY3QuYWMudWsxJjAkBgkqhkiG9w0BCQEWF3cuaGFs
-						c2FsbEBmYXJuLWN0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAw3S9I4W4QmKzx4xKCW/RRmBwyNJaUSe7idAWZvh/4g3pG4ZqfvjTiwHPH2QF
-						hHwl6+BH52jfpCMliKwYh+JyN0dStTdyvz96/G7fyBb4ZZouVuh1BOX0F8Uz8xKA
-						FqJ4iS4ld9YgBhT9F57W0uGLmS4Jy0W6BWv2lPmv1OMZaL3c2CQizLs2wV0GcVxx
-						KJgdVCoopE0nqi6PIBehlU2cSuluiclfojFmRLaEv8T/6C/b+MogfqR+s93RwMrn
-						7v3+G6xURcDaT+OMXP7sIT/0St28+MPR+rEwbZPNjkhTnoUnPhAWl6ZZTHM46nbN
-						hNr4vlJL+ZGqocmQI3seEyXboQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCW+V0X
-						iZ1t1PpdU0b7hgZAG0qh6R7UmUY5Baxtp4FIN1WebvnSr0keskwff59iIHeZ4/Km
-						u4Q7fkvghlteTti7r2LTS47CASwKi1UrtvmNMerSmdYeDYeymt94LXiTzK9dlXRW
-						ZYM5LPHeEIoHOFeRvwnXACKvJs0y4MwshxDGn4WIfLKj+z9y/FRsohRlxQihFx5y
-						qwjP8f2vXwGgZnM1WvcyH+Q/uhypmjdKmI1OkevgTclBZC8m6OJz0bwKqVnRD9AZ
-						Bqgu4cXU7lk5y1nreWIF8soBdlqgGwIngb+obZjG/cWsP4wGoVyFPgdHbpqTZVaf
-						TgP5ojXtIFXiNKGS
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.farn-ct.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.farn-ct.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">Farnborough College of Technology</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Farnborough College of Technology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.farn-ct.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Pat</GivenName>
-    <SurName>Knight</SurName>
-    <EmailAddress>mailto:p.knight@farn-ct.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ted</GivenName>
-    <SurName>Hancock</SurName>
-    <EmailAddress>mailto:e.hancock@farn-ct.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.farnborough.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.farnborough.ac.uk-shibboleth.xml
deleted file mode 100644
index 8dbd70a1..00000000
--- a/swamid-interfederations-2.0/idp.farnborough.ac.uk-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.farnborough.ac.uk/shibboleth">
-  <!--
-		This is an OpenAthens LA IdP for the Sixth Form College, Farnborough.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-23T16:06:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 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">farnboroughsfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDcDCCAligAwIBAgIIL2mEl0oUtHAwDQYJKoZIhvcNAQEFBQAwTzErMCkGA1UE
-						CgwiVGhlIFNpeHRoIEZvcm0gQ29sbGVnZSBGYXJuYm9yb3VnaDEgMB4GA1UEAwwX
-						bG9naW4uZmFybmJvcm91Z2guYWMudWswHhcNMTMwMjA4MTU0NDEwWhcNMjMwMjA4
-						MTU0NDEwWjBPMSswKQYDVQQKDCJUaGUgU2l4dGggRm9ybSBDb2xsZWdlIEZhcm5i
-						b3JvdWdoMSAwHgYDVQQDDBdsb2dpbi5mYXJuYm9yb3VnaC5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRVMpKY0pRwd8ia8sEN5DpxKvSIBmxq
-						BuK/7SOhA5zQvifhWPOezXNxBBEaSmnt7/5H/TRdVOcyO6drd+spmqlZ0RrciBOL
-						ASbaU42liQfwUq3MRreefgFxaoio8DDN3VPtb5M/U2WR0bTduCBV2EaoODHKHtuD
-						M2NJsEYs4qHUiTR5Hnzr4Yweg+TUACHnrYfL3V+C79cTdkYbvEESdx4kavVPDRIr
-						m1j6nH7iKWvJR2AECI19WeRyIbTFMqQIYvHqIcCjf1KC/U1sq3gOkxEULDoxo0iV
-						+cHgTj17D83ytp5bZMTv9CNznRvtQy3jR5A3kPeEHWT2QZRPnFrwnC0CAwEAAaNQ
-						ME4wHQYDVR0OBBYEFPfWxt/apKNnKbzYtLQ0V1yHWa+uMB8GA1UdIwQYMBaAFPfW
-						xt/apKNnKbzYtLQ0V1yHWa+uMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAH4/t3tZRL+l9A5KQPO4gvJNuDwzBOjcH6mAg2ShAjx3PQhC98zN1u5lzQGs
-						b01J4jMZoXM+k3zJU8TNKxm7fKK2/lVE2HtI5Bl7IrFJ/Tdl2n6pbCkRX78ZrDXo
-						nOkdd31uvbwIHurMBxe0mVEhyrZ+VXr5u8XBnnHgANOU6hzQrwTJsXEmHDLjytbw
-						hFQ66uuWGMtgbHjRhZ6r8xn04af3JCFY+WToDjTAgeGGU7D4qa59j0aGyy4D3raP
-						hQZM94Sfx+/GBTyMsBHnXGmwzQcPF+50REkOgz4NRihK849CiSBV4Il3geGvpWzm
-						XV1TX8+5LwiT8F8J8CFKgoB2RnI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.farnborough.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.farnborough.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Sixth Form College, Farnborough</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Sixth Form College Farnborough</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.farnborough.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adam</GivenName>
-    <SurName>Pollard</SurName>
-    <EmailAddress>mailto:apollard@farnborough.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Pollard</SurName>
-    <EmailAddress>mailto:apollard@farnborough.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fashionretailacademy.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.fashionretailacademy.ac.uk-shibboleth.xml
deleted file mode 100644
index 3ed35a4d..00000000
--- a/swamid-interfederations-2.0/idp.fashionretailacademy.ac.uk-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.fashionretailacademy.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for The Fashion Retail Academy.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">fashionretailacademy.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/fashionretailacademy.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/fashionretailacademy.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Fashion Retail Academy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fashionretailacademy.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fccn.pt-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fccn.pt-idp-shibboleth.xml
deleted file mode 100644
index 0fc88da1..00000000
--- a/swamid-interfederations-2.0/idp.fccn.pt-idp-shibboleth.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://idp.fccn.pt/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.fccn.pt" registrationInstant="2011-12-16T09:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fccn.pt</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FCT|FCCN</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.fccn.pt/</mdui:InformationURL>
-        <mdui:Logo height="55" width="300">https://rctsaai-rr.fccn.pt/rr/logos/FCT-FCCN_cmyk.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:38.7591742762959,-9.142287969589233</mdui:GeolocationHint>
-        <mdui:DomainHint>fccn.pt</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUGjtxtRHoicZCdPTxK6N9BrR1vZ8wDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLmZjY24ucHQwHhcNMTExMjE1MTUzOTExWhcNMzEx
-MjE1MTUzOTExWjAWMRQwEgYDVQQDEwtpZHAuZmNjbi5wdDCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMk7r9by+CMZzGA/003Hjz08jJ9JrtfEQYOLVeh3
-CaMM3vAfwg5BljE+c7/fBs0teQRcnkx8oEGwGuBUV91qN5CIwRRgraXg2Xl5NDd+
-E76ebKWuOYqsB07V99esvRWwGMhAJrjd2Lc3u/th+8PNBfeXJOt49ZkC27uZ8ikf
-QauE0s9H+4i4c3bldrSVSuDq45yWr0wIHdox6dN/TjMk4kxSxyADmb/Ebp8N5n9v
-2l7Q9HFoaU2LnPJYyrbLrSepoFwdXgEYiu1pnrvbqT0SJ3vREctngTJ8MaL9dTLK
-2QaLN3cJkUby8254idNi8zPUHkvp2IFjuCcLc1k+ezdbc6kCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLmZjY24ucHSGImh0dHBzOi8vaWRwLmZjY24ucHQvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFAPVb6XSbR8AYJEn/xiLnVzx8KSoMA0GCSqGSIb3
-DQEBBQUAA4IBAQDF0YZ3v7xshyEUHIRxc8c2jM2cJOUBRj7aOqnJvOnK7FI/AaSG
-qtEMx9RJ+NHxr5sALx1/DBu1XPEdtuBfueL0C5ky4H8a78LRqH3x50oZto+Oq1DG
-hZr/kURJyAM9dzi8BYZx5K2wB9vvJO2DICmnla20DTlKPY8NMZwtFbwfMloQduMi
-bLam1wEq+9o8TKYrw4C0pBGa8nY9gDjB1yzbT04VAuqctQL0+Sw+cXFDEk2JLbCl
-Bo4JbRU3T37aRSPJmLSx/lEQMBKP3cqlq+eig/e6thk3SA494XDUFlO6V+0XQF+u
-G5N6VkL0FX4oQt/9e14FaHZtwfb5uf02x6oO
-</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.fccn.pt/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fccn.pt/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fccn.pt/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fccn.pt/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="pt">FCCN - unidade da FCT I.P.</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">FCCN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="pt">FCCN - unidade da FCT I.P.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">FCCN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="pt">https://www.fccn.pt</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.fccn.pt</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Esmeralda</md:GivenName>
-    <md:SurName>Pires</md:SurName>
-    <md:EmailAddress>mailto:rctsaai@fccn.pt</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Equipa</md:GivenName>
-    <md:SurName>RCTSaai</md:SurName>
-    <md:EmailAddress>mailto:rctsaai@fccn.pt</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index c0e51158..e7b15bb0 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -1,465 +1,461 @@
 <?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:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" 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:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2010-08-13T10:34:14Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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: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">alvdal.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">ansgarhogskole.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">balsfjord.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">berlevag.kommune.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">birkenes.kommune.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">bodo.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">bygland.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bykle.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmi.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">danielsen-skoler.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">e-h.kommune.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">ekrehagen.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">fagerhaugoppvekst.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.akademiet.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.egms.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.heltberg.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">fhs.mil.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">folldal.kommune.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">fossumkollektivet.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">framnes.vgs.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">friskolen.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">fyresdal.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">gausdal.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">gratangen.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">grue.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.orskog.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">hasvik.kommune.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">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">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">hvaler.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">inderoy.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">innfjorden.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iveland.kommune.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">karasjok.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karlsoy.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">kautokeino.kommune.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">kvafjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvalsund.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">lillehammer.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">loppa.kommune.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">metisutdanning.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">modum.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">nesseby.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">nifu.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">nissedal.kommune.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">nord-odal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord.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">ntg.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">oya.vgs.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oyer.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">porsanger.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">porsgrunn.kommune.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">rakkestad.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">re.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rendalen.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">rindal.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">samisk.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">sigdal.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sintef.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">siu.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">sonans.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">songdalen.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">sor-fron.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">tana.kommune.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">tolga.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">toppidrettsgymnaset.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">tynset.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">ulstein.kommune.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">unis.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">valle.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">vennesla.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">verran.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">vid.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">vindafjord.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vinje.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">voss.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">westerdals.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">alvdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">andebu.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">ansgarhogskole.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">balsfjord.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">berlevag.kommune.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">birkenes.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bo.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bodo.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">bygland.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bykle.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">cmi.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">danielsen-skoler.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">e-h.kommune.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">ekrehagen.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">fagerhaugoppvekst.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.akademiet.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.egms.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.heltberg.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">fhs.mil.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">folldal.kommune.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">fossumkollektivet.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">framnes.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">frana.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">friskolen.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">fyresdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gaular.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">gausdal.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">gratangen.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">grue.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.orskog.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">hasvik.kommune.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">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">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">hvaler.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">inderoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">innfjorden.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">iveland.kommune.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">karasjok.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">karlsoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kautokeino.kommune.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">kvafjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kvalsund.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">lillehammer.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">loppa.kommune.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">metisutdanning.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">modum.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">nesseby.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">nifu.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nih.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nissedal.kommune.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">nord-odal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nord.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">ntg.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">oya.vgs.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">oyer.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">porsanger.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">porsgrunn.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">radoy.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rakkestad.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">re.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">rendalen.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">rindal.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">samisk.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">sigdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sintef.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">siu.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">sonans.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">songdalen.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sor-aurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sor-fron.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">tana.kommune.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">tolga.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tonsberg.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">toppidrettsgymnaset.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">tynset.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">ulstein.kommune.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">unis.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">valle.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">vennesla.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">verran.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">vid.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vindafjord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">vinje.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">voss.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">westerdals.no</shibmd:Scope>
     </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>
@@ -469,10 +465,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>
@@ -480,4 +476,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 3ceb2573..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fgu.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.cas.cz: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.fgu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fgu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fgu.cas.cz/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">fgu.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fgu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Physiology</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Fyziologický ústav AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Physiology, Public Research Institution</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Fyziologický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fgu.cas.cz/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.fgu.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-duesseldorf.de.xml b/swamid-interfederations-2.0/idp.fh-duesseldorf.de.xml
deleted file mode 100644
index 9d5f964d..00000000
--- a/swamid-interfederations-2.0/idp.fh-duesseldorf.de.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-duesseldorf.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-duesseldorf.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-duesseldorf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-duesseldorf.de,OU=Server,O=Fachhochschule Duesseldorf,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEEU5FUzANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-REUxFzAVBgNVBAoTDkZIIER1ZXNzZWxkb3JmMQwwCgYDVQQLEwNEVloxMzAxBgNV
-BAMTKlplcnRpZml6aWVydW5nc3N0ZWxsZSBGSCBEdWVzc2VsZG9yZiAtIEcwMjEk
-MCIGCSqGSIb3DQEJARYVcGtpQGZoLWR1ZXNzZWxkb3JmLmRlMB4XDTExMDExMzA5
-MzcwN1oXDTE0MDExMjA5MzcwN1owYzELMAkGA1UEBhMCREUxIzAhBgNVBAoTGkZh
-Y2hob2Noc2NodWxlIER1ZXNzZWxkb3JmMQ8wDQYDVQQLEwZTZXJ2ZXIxHjAcBgNV
-BAMTFWlkcC5maC1kdWVzc2VsZG9yZi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKHr4GsKk5j+5SafTR3aNu962v7Ys5rrGUBABB8jU1MQZ+kN0fpo
-FzSlpfNvwgIkDWAKj3Un9Qq0il5c0W10jCSOIPdkV2HqEsiJjKlj2UEH2CEtgS5/
-VLRg+K54sdnBg5yfeskBxcm02TXx8OP2z7MdRxqgQkiVoBynaMecJc0vHj3G6/bb
-C6G10La0A0BJhOahIIrRaKSg2LvLJ6rZY+9dd81BtLOnku0jd1xHlqyYr6QASg9s
-Bt64WgTpA3+BWp6tsLvOhM4h1ndXiRKSz4qTtjBLfTTtifxqCv0e2L3K50+B4x59
-kPfgItloZaT8i8CuplxDPP3s5Pen34kLspUCAwEAAaOCAggwggIEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcDAQYK
-KwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBQTTDWstp1ovgrktfT1xy9P
-T//XuzAfBgNVHSMEGDAWgBSe8wPRIOch6nFIXRFDBlV4+cgO5jA7BgNVHREENDAy
-ghVpZHAuZmgtZHVlc3NlbGRvcmYuZGWCGXd3dy5pZHAuZmgtZHVlc3NlbGRvcmYu
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvZ19j
-YWNybC5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQu
-Y3J0MEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNz
-ZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAY
-q0VkPw7f9LSdKWZ1pQY8OvNc9cPbd1ObnpdaWDzNmNWaOoidVPCWU/9JKUos/spL
-VuYibTPDhc8TdcvKNRTL7ti3u7wv5U+buIsIdYPh/uf5+kjTkqD6dSa/PIDUqfKW
-8woY63VWdkwCQJhSVFBylC9x22ggqn3Hf+hizrRbRHoqvaP+270IZjJbjHc/0KtF
-7MmJYA0DLvjPjhK/lYYhv9INU38caM2y4Cqe9p+sPeBJyYPsQAhK8/42Dg9bvKr4
-PrjgvyPNxkU9mdhcGp8RlSt66Di+Yxh39FU5INx1MBzIisFaGmz1aVSnjYyhiPlO
-HAfOyhCqg1OPKRSVyFh7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-duesseldorf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-duesseldorf.de,OU=Server,O=Fachhochschule Duesseldorf,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEEU5FUzANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-REUxFzAVBgNVBAoTDkZIIER1ZXNzZWxkb3JmMQwwCgYDVQQLEwNEVloxMzAxBgNV
-BAMTKlplcnRpZml6aWVydW5nc3N0ZWxsZSBGSCBEdWVzc2VsZG9yZiAtIEcwMjEk
-MCIGCSqGSIb3DQEJARYVcGtpQGZoLWR1ZXNzZWxkb3JmLmRlMB4XDTExMDExMzA5
-MzcwN1oXDTE0MDExMjA5MzcwN1owYzELMAkGA1UEBhMCREUxIzAhBgNVBAoTGkZh
-Y2hob2Noc2NodWxlIER1ZXNzZWxkb3JmMQ8wDQYDVQQLEwZTZXJ2ZXIxHjAcBgNV
-BAMTFWlkcC5maC1kdWVzc2VsZG9yZi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKHr4GsKk5j+5SafTR3aNu962v7Ys5rrGUBABB8jU1MQZ+kN0fpo
-FzSlpfNvwgIkDWAKj3Un9Qq0il5c0W10jCSOIPdkV2HqEsiJjKlj2UEH2CEtgS5/
-VLRg+K54sdnBg5yfeskBxcm02TXx8OP2z7MdRxqgQkiVoBynaMecJc0vHj3G6/bb
-C6G10La0A0BJhOahIIrRaKSg2LvLJ6rZY+9dd81BtLOnku0jd1xHlqyYr6QASg9s
-Bt64WgTpA3+BWp6tsLvOhM4h1ndXiRKSz4qTtjBLfTTtifxqCv0e2L3K50+B4x59
-kPfgItloZaT8i8CuplxDPP3s5Pen34kLspUCAwEAAaOCAggwggIEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcDAQYK
-KwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBQTTDWstp1ovgrktfT1xy9P
-T//XuzAfBgNVHSMEGDAWgBSe8wPRIOch6nFIXRFDBlV4+cgO5jA7BgNVHREENDAy
-ghVpZHAuZmgtZHVlc3NlbGRvcmYuZGWCGXd3dy5pZHAuZmgtZHVlc3NlbGRvcmYu
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvZ19j
-YWNybC5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQu
-Y3J0MEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNz
-ZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAY
-q0VkPw7f9LSdKWZ1pQY8OvNc9cPbd1ObnpdaWDzNmNWaOoidVPCWU/9JKUos/spL
-VuYibTPDhc8TdcvKNRTL7ti3u7wv5U+buIsIdYPh/uf5+kjTkqD6dSa/PIDUqfKW
-8woY63VWdkwCQJhSVFBylC9x22ggqn3Hf+hizrRbRHoqvaP+270IZjJbjHc/0KtF
-7MmJYA0DLvjPjhK/lYYhv9INU38caM2y4Cqe9p+sPeBJyYPsQAhK8/42Dg9bvKr4
-PrjgvyPNxkU9mdhcGp8RlSt66Di+Yxh39FU5INx1MBzIisFaGmz1aVSnjYyhiPlO
-HAfOyhCqg1OPKRSVyFh7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-duesseldorf.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-duesseldorf.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-duesseldorf.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-duesseldorf.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-duesseldorf.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-duesseldorf.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-duesseldorf.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-duesseldorf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-duesseldorf.de,OU=Server,O=Fachhochschule Duesseldorf,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEEU5FUzANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-REUxFzAVBgNVBAoTDkZIIER1ZXNzZWxkb3JmMQwwCgYDVQQLEwNEVloxMzAxBgNV
-BAMTKlplcnRpZml6aWVydW5nc3N0ZWxsZSBGSCBEdWVzc2VsZG9yZiAtIEcwMjEk
-MCIGCSqGSIb3DQEJARYVcGtpQGZoLWR1ZXNzZWxkb3JmLmRlMB4XDTExMDExMzA5
-MzcwN1oXDTE0MDExMjA5MzcwN1owYzELMAkGA1UEBhMCREUxIzAhBgNVBAoTGkZh
-Y2hob2Noc2NodWxlIER1ZXNzZWxkb3JmMQ8wDQYDVQQLEwZTZXJ2ZXIxHjAcBgNV
-BAMTFWlkcC5maC1kdWVzc2VsZG9yZi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKHr4GsKk5j+5SafTR3aNu962v7Ys5rrGUBABB8jU1MQZ+kN0fpo
-FzSlpfNvwgIkDWAKj3Un9Qq0il5c0W10jCSOIPdkV2HqEsiJjKlj2UEH2CEtgS5/
-VLRg+K54sdnBg5yfeskBxcm02TXx8OP2z7MdRxqgQkiVoBynaMecJc0vHj3G6/bb
-C6G10La0A0BJhOahIIrRaKSg2LvLJ6rZY+9dd81BtLOnku0jd1xHlqyYr6QASg9s
-Bt64WgTpA3+BWp6tsLvOhM4h1ndXiRKSz4qTtjBLfTTtifxqCv0e2L3K50+B4x59
-kPfgItloZaT8i8CuplxDPP3s5Pen34kLspUCAwEAAaOCAggwggIEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcDAQYK
-KwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBQTTDWstp1ovgrktfT1xy9P
-T//XuzAfBgNVHSMEGDAWgBSe8wPRIOch6nFIXRFDBlV4+cgO5jA7BgNVHREENDAy
-ghVpZHAuZmgtZHVlc3NlbGRvcmYuZGWCGXd3dy5pZHAuZmgtZHVlc3NlbGRvcmYu
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvZ19j
-YWNybC5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQu
-Y3J0MEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNz
-ZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAY
-q0VkPw7f9LSdKWZ1pQY8OvNc9cPbd1ObnpdaWDzNmNWaOoidVPCWU/9JKUos/spL
-VuYibTPDhc8TdcvKNRTL7ti3u7wv5U+buIsIdYPh/uf5+kjTkqD6dSa/PIDUqfKW
-8woY63VWdkwCQJhSVFBylC9x22ggqn3Hf+hizrRbRHoqvaP+270IZjJbjHc/0KtF
-7MmJYA0DLvjPjhK/lYYhv9INU38caM2y4Cqe9p+sPeBJyYPsQAhK8/42Dg9bvKr4
-PrjgvyPNxkU9mdhcGp8RlSt66Di+Yxh39FU5INx1MBzIisFaGmz1aVSnjYyhiPlO
-HAfOyhCqg1OPKRSVyFh7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-duesseldorf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-duesseldorf.de,OU=Server,O=Fachhochschule Duesseldorf,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEEU5FUzANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-REUxFzAVBgNVBAoTDkZIIER1ZXNzZWxkb3JmMQwwCgYDVQQLEwNEVloxMzAxBgNV
-BAMTKlplcnRpZml6aWVydW5nc3N0ZWxsZSBGSCBEdWVzc2VsZG9yZiAtIEcwMjEk
-MCIGCSqGSIb3DQEJARYVcGtpQGZoLWR1ZXNzZWxkb3JmLmRlMB4XDTExMDExMzA5
-MzcwN1oXDTE0MDExMjA5MzcwN1owYzELMAkGA1UEBhMCREUxIzAhBgNVBAoTGkZh
-Y2hob2Noc2NodWxlIER1ZXNzZWxkb3JmMQ8wDQYDVQQLEwZTZXJ2ZXIxHjAcBgNV
-BAMTFWlkcC5maC1kdWVzc2VsZG9yZi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKHr4GsKk5j+5SafTR3aNu962v7Ys5rrGUBABB8jU1MQZ+kN0fpo
-FzSlpfNvwgIkDWAKj3Un9Qq0il5c0W10jCSOIPdkV2HqEsiJjKlj2UEH2CEtgS5/
-VLRg+K54sdnBg5yfeskBxcm02TXx8OP2z7MdRxqgQkiVoBynaMecJc0vHj3G6/bb
-C6G10La0A0BJhOahIIrRaKSg2LvLJ6rZY+9dd81BtLOnku0jd1xHlqyYr6QASg9s
-Bt64WgTpA3+BWp6tsLvOhM4h1ndXiRKSz4qTtjBLfTTtifxqCv0e2L3K50+B4x59
-kPfgItloZaT8i8CuplxDPP3s5Pen34kLspUCAwEAAaOCAggwggIEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcDAQYK
-KwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBQTTDWstp1ovgrktfT1xy9P
-T//XuzAfBgNVHSMEGDAWgBSe8wPRIOch6nFIXRFDBlV4+cgO5jA7BgNVHREENDAy
-ghVpZHAuZmgtZHVlc3NlbGRvcmYuZGWCGXd3dy5pZHAuZmgtZHVlc3NlbGRvcmYu
-ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMEKgQKA+hjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvZ19j
-YWNybC5jcmwwgaAGCCsGAQUFBwEBBIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2ZoLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQu
-Y3J0MEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2ZoLWR1ZXNz
-ZWxkb3JmLWNhL3B1Yi9jYS9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAY
-q0VkPw7f9LSdKWZ1pQY8OvNc9cPbd1ObnpdaWDzNmNWaOoidVPCWU/9JKUos/spL
-VuYibTPDhc8TdcvKNRTL7ti3u7wv5U+buIsIdYPh/uf5+kjTkqD6dSa/PIDUqfKW
-8woY63VWdkwCQJhSVFBylC9x22ggqn3Hf+hizrRbRHoqvaP+270IZjJbjHc/0KtF
-7MmJYA0DLvjPjhK/lYYhv9INU38caM2y4Cqe9p+sPeBJyYPsQAhK8/42Dg9bvKr4
-PrjgvyPNxkU9mdhcGp8RlSt66Di+Yxh39FU5INx1MBzIisFaGmz1aVSnjYyhiPlO
-HAfOyhCqg1OPKRSVyFh7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-duesseldorf.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-duesseldorf.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Fachhochschule Düsseldorf</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Fachhochschule Düsseldorf</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fh-duesseldorf.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Roland</GivenName>
-    <SurName>Conradshaus</SurName>
-    <EmailAddress>roland.conradshaus@fh-duesseldorf.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roland</GivenName>
-    <SurName>Conradshaus</SurName>
-    <EmailAddress>roland.conradshaus@fh-duesseldorf.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-joanneum.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fh-joanneum.at-idp-shibboleth.xml
deleted file mode 100644
index 3228917e..00000000
--- a/swamid-interfederations-2.0/idp.fh-joanneum.at-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.fh-joanneum.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-02-16T10:29:20Z">
-      <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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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-joanneum.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">FH Joanneum</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">FH Joanneum</mdui:DisplayName>
-        <mdui:Logo width="218" height="47">https://www.fh-joanneum.at/custom/images/logo_1001.png</mdui:Logo>
-        <mdui:Logo width="16" height="16">https://www.fh-joanneum.at/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>fh-joanneum.at</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.06931,15.40799</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:47.45431,15.33112</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.87544,15.90241</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>
-MIIDMzCCAhugAwIBAgIULPWP1POqPuJKTnkDdlx69nSwI/owDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAwwSaWRwLmZoLWpvYW5uZXVtLmF0MB4XDTE0MTEwNjA4MjY0
-OVoXDTM0MTEwNjA4MjY0OVowHTEbMBkGA1UEAwwSaWRwLmZoLWpvYW5uZXVtLmF0
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1F56hDJn3Wak6ykkjmqB
-Vc7KfehBvDV/7Zr08IkW0PmbSCRNao0MOT5NvmJWuvRguc9gPgPJC+hodomIdBXb
-NlECN5k+6WG/8lEr2roC9SGtbjz4GjU/hVDbB3v5kNs0ovV4DHwn6pGzArY0Wqv3
-urzaSEPXdB6j9/tWNMch2UY1nQE8BPJmt8bXNKJjgNBx1YkdOK/YUlGr5wNEwYBU
-yR5W409Yj1/+KZrhXcsXEEQRcWh3slasDh/P3dcWzqIoNWHDuvO2n/casdaplASY
-Mha6cZyiIlAmzjCb/EBH+ET3lbLUqaa9QAB/gpQA+GJ8sqRyV46OtgJWH7r1XhXo
-9QIDAQABo2swaTAdBgNVHQ4EFgQU7sDCk08y2FydgwEKMrw9hyaC1BIwSAYDVR0R
-BEEwP4ISaWRwLmZoLWpvYW5uZXVtLmF0hilodHRwczovL2lkcC5maC1qb2FubmV1
-bS5hdC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAbgEklICx1nWj
-BOLoNsIxfLStKrZ/OGQPZA4qs8SnKrn5ZHWwGkYQVOUjdlj9Ujx5G7jT29m1fG9Z
-5iwDDHtYcgqzJBZo4nVdwnexbZcIB05+/L3xgbbIcnXOu3WlaleTYH9sef8/ExT2
-KT1bQbbDmXXzzvxnkEUcWIs/r3GRE45GnSVUAcZQqvheF9ELKUFzd8C36glQ98D4
-CpiRk275uQjBfzjFS7xpOuNR8tqe+sx7bxNoFL6aHHr8zJ8RWLmXc8S3xLtDTpgT
-FaM76TBX0JxWOxqWce24DPI/3UTL/iGk+WE61+ar5rD+jAdtgHFhc9UMvxdZYJmz
-8zYGzVn2IQ==</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-joanneum.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-joanneum.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-joanneum.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://idp.fh-joanneum.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-joanneum.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-joanneum.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-joanneum.at</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIULPWP1POqPuJKTnkDdlx69nSwI/owDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAwwSaWRwLmZoLWpvYW5uZXVtLmF0MB4XDTE0MTEwNjA4MjY0
-OVoXDTM0MTEwNjA4MjY0OVowHTEbMBkGA1UEAwwSaWRwLmZoLWpvYW5uZXVtLmF0
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1F56hDJn3Wak6ykkjmqB
-Vc7KfehBvDV/7Zr08IkW0PmbSCRNao0MOT5NvmJWuvRguc9gPgPJC+hodomIdBXb
-NlECN5k+6WG/8lEr2roC9SGtbjz4GjU/hVDbB3v5kNs0ovV4DHwn6pGzArY0Wqv3
-urzaSEPXdB6j9/tWNMch2UY1nQE8BPJmt8bXNKJjgNBx1YkdOK/YUlGr5wNEwYBU
-yR5W409Yj1/+KZrhXcsXEEQRcWh3slasDh/P3dcWzqIoNWHDuvO2n/casdaplASY
-Mha6cZyiIlAmzjCb/EBH+ET3lbLUqaa9QAB/gpQA+GJ8sqRyV46OtgJWH7r1XhXo
-9QIDAQABo2swaTAdBgNVHQ4EFgQU7sDCk08y2FydgwEKMrw9hyaC1BIwSAYDVR0R
-BEEwP4ISaWRwLmZoLWpvYW5uZXVtLmF0hilodHRwczovL2lkcC5maC1qb2FubmV1
-bS5hdC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAbgEklICx1nWj
-BOLoNsIxfLStKrZ/OGQPZA4qs8SnKrn5ZHWwGkYQVOUjdlj9Ujx5G7jT29m1fG9Z
-5iwDDHtYcgqzJBZo4nVdwnexbZcIB05+/L3xgbbIcnXOu3WlaleTYH9sef8/ExT2
-KT1bQbbDmXXzzvxnkEUcWIs/r3GRE45GnSVUAcZQqvheF9ELKUFzd8C36glQ98D4
-CpiRk275uQjBfzjFS7xpOuNR8tqe+sx7bxNoFL6aHHr8zJ8RWLmXc8S3xLtDTpgT
-FaM76TBX0JxWOxqWce24DPI/3UTL/iGk+WE61+ar5rD+jAdtgHFhc9UMvxdZYJmz
-8zYGzVn2IQ==</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-joanneum.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-joanneum.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">FH Joanneum Ges.m.b.H</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">FH Joanneum Ges.m.b.H</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">FH Joanneum</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">FH Joanneum</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fh-joanneum.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fh-joanneum.at/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ZIT</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@fh-joanneum.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ZIT</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@fh-joanneum.at</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 29b15047..00000000
--- a/swamid-interfederations-2.0/idp.fh-kaernten.at-idp-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://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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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-offenburg.de.xml b/swamid-interfederations-2.0/idp.fh-offenburg.de.xml
deleted file mode 100644
index 7beab85d..00000000
--- a/swamid-interfederations-2.0/idp.fh-offenburg.de.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-offenburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-offenburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>info4.rz.fh-offenburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=info4.rz.fh-offenburg.de,OU=Hochschulrechenzentrum,O=Hochschule Offenburg,L=Offenburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjzCCBHegAwIBAgIEDiItUDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1cmcxIDAeBgNVBAMTF0hvY2hz
-Y2h1bGUgT2ZmZW5idXJnIENBMB4XDTA5MDUwNzA5NTQwOVoXDTE0MDUwNjA5NTQw
-OVowgaExCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCU9mZmVuYnVyZzEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1
-cmcxHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xITAfBgNVBAMTGGlu
-Zm80LnJ6LmZoLW9mZmVuYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANwMeO8B8lQdlQN70K5tfMIEWqCJ4U78WonDVHYFyFRD/KYB4z7dSSM3
-MzOuA3VCbnJ/jLVOCmL9GRiVi4IzlxeZXojsTnLh/TIFxUVjrkAgyGQDtvLNaWc8
-k3yEk9jA1VGat7VSjjswn/MiSOneC/UNNKXE+6zjTZibp5rPHM7WMgnMKYD4jOk3
-pfDB3Wo9iMFoKiJxJbxvwVV68sKOcUdPoraeSeOEitOyNXxCiLa6vCWtpRTvDg+5
-oJeTuvOxRZBQ5vvumuFzc8QqbGbm5/W4TVl33MzmTItUZPiMKXwZxBiXe8aOj+ow
-aJanSRx2lMnQRQWK97sFw0jF0jUq/y0CAwEAAaOCAh8wggIbMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUcgJR20j+DDoKv7a99zTBC96IP0EwHwYDVR0jBBgwFoAU6GrWkgEDfG2a
-vBrgNHRVjPuMxSIwbQYDVR0RBGYwZIEXaHJ6aW5mb0BmaC1vZmZlbmJ1cmcuZGWC
-GGluZm80LnJ6LmZoLW9mZmVuYnVyZy5kZYIUd3d3NC5maC1vZmZlbmJ1cmcuZGWC
-E2lkcC5maC1vZmZlbmJ1cmcuZGWHBI1PCgUwgYsGA1UdHwSBgzCBgDA+oDygOoY4
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2EvcHViL2NybC9j
-YWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb2ZmZW5i
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggr
-BgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLW9mZmVuYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBACs4+GsekaL9EC21bqOWndYkJaAhJjcsQcULsJKr
-OgNMoDEYjQKTSNwcExkI9yZQUzXdi9b6lOICVzTByyBc1N2c1PZiSCHOsQY9yA7o
-ggjEwyezd+VWQlJseyd8+Vh7lKohfmTtQpY92NB4aK0qOVrJN4h6Fb1oBQRJDiVr
-c/HEJcJVWW/f/00lFNMJ4SeiLe6g5cXD2Vmv7tgNpHqRLHPLOoJWuHb4Dw4KCM0J
-3LxcpXdFSGhuJfl1Ie7th6LFildxtK6vlTB2DCvkE7O8YH5s2V1AMLJLun5ZqiEf
-a08DxZBJP7cE4JeAX1B8m5N46/4vGCfAd46oHq2etUyUl1M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>info4.rz.fh-offenburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=info4.rz.fh-offenburg.de,OU=Hochschulrechenzentrum,O=Hochschule Offenburg,L=Offenburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjzCCBHegAwIBAgIEDiItUDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1cmcxIDAeBgNVBAMTF0hvY2hz
-Y2h1bGUgT2ZmZW5idXJnIENBMB4XDTA5MDUwNzA5NTQwOVoXDTE0MDUwNjA5NTQw
-OVowgaExCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCU9mZmVuYnVyZzEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1
-cmcxHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xITAfBgNVBAMTGGlu
-Zm80LnJ6LmZoLW9mZmVuYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANwMeO8B8lQdlQN70K5tfMIEWqCJ4U78WonDVHYFyFRD/KYB4z7dSSM3
-MzOuA3VCbnJ/jLVOCmL9GRiVi4IzlxeZXojsTnLh/TIFxUVjrkAgyGQDtvLNaWc8
-k3yEk9jA1VGat7VSjjswn/MiSOneC/UNNKXE+6zjTZibp5rPHM7WMgnMKYD4jOk3
-pfDB3Wo9iMFoKiJxJbxvwVV68sKOcUdPoraeSeOEitOyNXxCiLa6vCWtpRTvDg+5
-oJeTuvOxRZBQ5vvumuFzc8QqbGbm5/W4TVl33MzmTItUZPiMKXwZxBiXe8aOj+ow
-aJanSRx2lMnQRQWK97sFw0jF0jUq/y0CAwEAAaOCAh8wggIbMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUcgJR20j+DDoKv7a99zTBC96IP0EwHwYDVR0jBBgwFoAU6GrWkgEDfG2a
-vBrgNHRVjPuMxSIwbQYDVR0RBGYwZIEXaHJ6aW5mb0BmaC1vZmZlbmJ1cmcuZGWC
-GGluZm80LnJ6LmZoLW9mZmVuYnVyZy5kZYIUd3d3NC5maC1vZmZlbmJ1cmcuZGWC
-E2lkcC5maC1vZmZlbmJ1cmcuZGWHBI1PCgUwgYsGA1UdHwSBgzCBgDA+oDygOoY4
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2EvcHViL2NybC9j
-YWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb2ZmZW5i
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggr
-BgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLW9mZmVuYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBACs4+GsekaL9EC21bqOWndYkJaAhJjcsQcULsJKr
-OgNMoDEYjQKTSNwcExkI9yZQUzXdi9b6lOICVzTByyBc1N2c1PZiSCHOsQY9yA7o
-ggjEwyezd+VWQlJseyd8+Vh7lKohfmTtQpY92NB4aK0qOVrJN4h6Fb1oBQRJDiVr
-c/HEJcJVWW/f/00lFNMJ4SeiLe6g5cXD2Vmv7tgNpHqRLHPLOoJWuHb4Dw4KCM0J
-3LxcpXdFSGhuJfl1Ie7th6LFildxtK6vlTB2DCvkE7O8YH5s2V1AMLJLun5ZqiEf
-a08DxZBJP7cE4JeAX1B8m5N46/4vGCfAd46oHq2etUyUl1M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-offenburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-offenburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-offenburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-offenburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-offenburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-offenburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-offenburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>info4.rz.fh-offenburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=info4.rz.fh-offenburg.de,OU=Hochschulrechenzentrum,O=Hochschule Offenburg,L=Offenburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjzCCBHegAwIBAgIEDiItUDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1cmcxIDAeBgNVBAMTF0hvY2hz
-Y2h1bGUgT2ZmZW5idXJnIENBMB4XDTA5MDUwNzA5NTQwOVoXDTE0MDUwNjA5NTQw
-OVowgaExCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCU9mZmVuYnVyZzEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1
-cmcxHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xITAfBgNVBAMTGGlu
-Zm80LnJ6LmZoLW9mZmVuYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANwMeO8B8lQdlQN70K5tfMIEWqCJ4U78WonDVHYFyFRD/KYB4z7dSSM3
-MzOuA3VCbnJ/jLVOCmL9GRiVi4IzlxeZXojsTnLh/TIFxUVjrkAgyGQDtvLNaWc8
-k3yEk9jA1VGat7VSjjswn/MiSOneC/UNNKXE+6zjTZibp5rPHM7WMgnMKYD4jOk3
-pfDB3Wo9iMFoKiJxJbxvwVV68sKOcUdPoraeSeOEitOyNXxCiLa6vCWtpRTvDg+5
-oJeTuvOxRZBQ5vvumuFzc8QqbGbm5/W4TVl33MzmTItUZPiMKXwZxBiXe8aOj+ow
-aJanSRx2lMnQRQWK97sFw0jF0jUq/y0CAwEAAaOCAh8wggIbMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUcgJR20j+DDoKv7a99zTBC96IP0EwHwYDVR0jBBgwFoAU6GrWkgEDfG2a
-vBrgNHRVjPuMxSIwbQYDVR0RBGYwZIEXaHJ6aW5mb0BmaC1vZmZlbmJ1cmcuZGWC
-GGluZm80LnJ6LmZoLW9mZmVuYnVyZy5kZYIUd3d3NC5maC1vZmZlbmJ1cmcuZGWC
-E2lkcC5maC1vZmZlbmJ1cmcuZGWHBI1PCgUwgYsGA1UdHwSBgzCBgDA+oDygOoY4
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2EvcHViL2NybC9j
-YWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb2ZmZW5i
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggr
-BgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLW9mZmVuYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBACs4+GsekaL9EC21bqOWndYkJaAhJjcsQcULsJKr
-OgNMoDEYjQKTSNwcExkI9yZQUzXdi9b6lOICVzTByyBc1N2c1PZiSCHOsQY9yA7o
-ggjEwyezd+VWQlJseyd8+Vh7lKohfmTtQpY92NB4aK0qOVrJN4h6Fb1oBQRJDiVr
-c/HEJcJVWW/f/00lFNMJ4SeiLe6g5cXD2Vmv7tgNpHqRLHPLOoJWuHb4Dw4KCM0J
-3LxcpXdFSGhuJfl1Ie7th6LFildxtK6vlTB2DCvkE7O8YH5s2V1AMLJLun5ZqiEf
-a08DxZBJP7cE4JeAX1B8m5N46/4vGCfAd46oHq2etUyUl1M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>info4.rz.fh-offenburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=info4.rz.fh-offenburg.de,OU=Hochschulrechenzentrum,O=Hochschule Offenburg,L=Offenburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjzCCBHegAwIBAgIEDiItUDANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1cmcxIDAeBgNVBAMTF0hvY2hz
-Y2h1bGUgT2ZmZW5idXJnIENBMB4XDTA5MDUwNzA5NTQwOVoXDTE0MDUwNjA5NTQw
-OVowgaExCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCU9mZmVuYnVyZzEdMBsGA1UEChMUSG9jaHNjaHVsZSBPZmZlbmJ1
-cmcxHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xITAfBgNVBAMTGGlu
-Zm80LnJ6LmZoLW9mZmVuYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANwMeO8B8lQdlQN70K5tfMIEWqCJ4U78WonDVHYFyFRD/KYB4z7dSSM3
-MzOuA3VCbnJ/jLVOCmL9GRiVi4IzlxeZXojsTnLh/TIFxUVjrkAgyGQDtvLNaWc8
-k3yEk9jA1VGat7VSjjswn/MiSOneC/UNNKXE+6zjTZibp5rPHM7WMgnMKYD4jOk3
-pfDB3Wo9iMFoKiJxJbxvwVV68sKOcUdPoraeSeOEitOyNXxCiLa6vCWtpRTvDg+5
-oJeTuvOxRZBQ5vvumuFzc8QqbGbm5/W4TVl33MzmTItUZPiMKXwZxBiXe8aOj+ow
-aJanSRx2lMnQRQWK97sFw0jF0jUq/y0CAwEAAaOCAh8wggIbMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUcgJR20j+DDoKv7a99zTBC96IP0EwHwYDVR0jBBgwFoAU6GrWkgEDfG2a
-vBrgNHRVjPuMxSIwbQYDVR0RBGYwZIEXaHJ6aW5mb0BmaC1vZmZlbmJ1cmcuZGWC
-GGluZm80LnJ6LmZoLW9mZmVuYnVyZy5kZYIUd3d3NC5maC1vZmZlbmJ1cmcuZGWC
-E2lkcC5maC1vZmZlbmJ1cmcuZGWHBI1PCgUwgYsGA1UdHwSBgzCBgDA+oDygOoY4
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2EvcHViL2NybC9j
-YWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb2ZmZW5i
-dXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggr
-BgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1vZmZlbmJ1cmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLW9mZmVuYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBACs4+GsekaL9EC21bqOWndYkJaAhJjcsQcULsJKr
-OgNMoDEYjQKTSNwcExkI9yZQUzXdi9b6lOICVzTByyBc1N2c1PZiSCHOsQY9yA7o
-ggjEwyezd+VWQlJseyd8+Vh7lKohfmTtQpY92NB4aK0qOVrJN4h6Fb1oBQRJDiVr
-c/HEJcJVWW/f/00lFNMJ4SeiLe6g5cXD2Vmv7tgNpHqRLHPLOoJWuHb4Dw4KCM0J
-3LxcpXdFSGhuJfl1Ie7th6LFildxtK6vlTB2DCvkE7O8YH5s2V1AMLJLun5ZqiEf
-a08DxZBJP7cE4JeAX1B8m5N46/4vGCfAd46oHq2etUyUl1M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-offenburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-offenburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Offenburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Offenburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fh-offenburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Mirko</GivenName>
-    <SurName>Guldner</SurName>
-    <EmailAddress>guldner@fh-offenburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Christian</GivenName>
-    <SurName>Obermann</SurName>
-    <EmailAddress>christian.obermann@fh-offenburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
deleted file mode 100644
index 10058738..00000000
--- a/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,222 +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-rosenheim.de/idp/shibboleth">
-  <md: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>
-  </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-rosenheim.de</shibmd: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>
-    </md:Extensions>
-    <md: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>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNTA3
-MzAxMjAzMTBaFw0xODEwMjYxMjAzMTBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CAwGQmF5ZXJuMRIwEAYDVQQHDAlSb3NlbmhlaW0xHTAbBgNVBAoMFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLDA1SZWNoZW56ZW50cnVtMRwwGgYDVQQDDBNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAt++hJd5t48KJPKqUqz6zzYQYp6JAvxAioSYcTMoWlPwpfEnBHXMdYe9X+Yka
-G4mdn6vrrm60mFPi+IIIHUYYnSB0Q2VV12gOzOfcu+oveGb4Jd0PnR0beud5ns2q
-cfZ/AD8pn2Y2uHYw7Y/yIzAtejhO7waBt6gSthv2Kw/LtvMjCMG0bXhOobOQ1Kqb
-Xw8r3yN8o5DD43SoKHX1HN5krEYqnKu2M/KcO9FJgYlk8RrwWWffXgfTO55ISysX
-dW4B55mDvCxCqQmzKDSbwZBTKoG8RXHtnonmedtm2egVwxH8HPfWj84Fpk2eCVQj
-78fkh+neUWGL/lOCdr3nDy6i6wIDAQABo4ICXjCCAlowTwYDVR0gBEgwRjARBg8r
-BgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
-AQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBR6kwflRNnIjgBvGKaO
-+Jz7PAY2OTAfBgNVHSMEGDAWgBQgZm4lL6ljTaLgJ7qJf8sVuj+ukTAeBgNVHREE
-FzAVghNpZHAuZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19j
-YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5o
-ZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5o
-ZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2FjZXJ0L2df
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAT0veIj3G+Z2c+lWdFmHjl1MY
-vGLdqSz/kOBTP0TQmaR0F3XfwAeq2vzjLrIKzq2dLta7B8XM2z6SQP076+bDitwn
-PyjzjBHhcH0+9qbW7NyuAqGJ7QLDNgHdTp6Vy9NL3n3DWQcyl5+IJF0/AaOTcGpv
-TzuebWBhhABPYYHBzqwFL1PQho8hY3k/HgYbKe0LZT1qskSuGwaKwUgxS4nj6TB0
-Rjabz+0qMj6nOvfzyxRHCmD2F58f/vRXQ5GjDK9BJDs7m9a7X0HFydFA1ICzXy3h
-9ByxH89P1vaG3uoL/8eUitiZIHEjnbRywqTb4ymRNc25zHssb3nB9JElcjpesQ==
-</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>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>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNTA3
-MzAxMjAzMTBaFw0xODEwMjYxMjAzMTBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CAwGQmF5ZXJuMRIwEAYDVQQHDAlSb3NlbmhlaW0xHTAbBgNVBAoMFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLDA1SZWNoZW56ZW50cnVtMRwwGgYDVQQDDBNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAt++hJd5t48KJPKqUqz6zzYQYp6JAvxAioSYcTMoWlPwpfEnBHXMdYe9X+Yka
-G4mdn6vrrm60mFPi+IIIHUYYnSB0Q2VV12gOzOfcu+oveGb4Jd0PnR0beud5ns2q
-cfZ/AD8pn2Y2uHYw7Y/yIzAtejhO7waBt6gSthv2Kw/LtvMjCMG0bXhOobOQ1Kqb
-Xw8r3yN8o5DD43SoKHX1HN5krEYqnKu2M/KcO9FJgYlk8RrwWWffXgfTO55ISysX
-dW4B55mDvCxCqQmzKDSbwZBTKoG8RXHtnonmedtm2egVwxH8HPfWj84Fpk2eCVQj
-78fkh+neUWGL/lOCdr3nDy6i6wIDAQABo4ICXjCCAlowTwYDVR0gBEgwRjARBg8r
-BgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
-AQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBR6kwflRNnIjgBvGKaO
-+Jz7PAY2OTAfBgNVHSMEGDAWgBQgZm4lL6ljTaLgJ7qJf8sVuj+ukTAeBgNVHREE
-FzAVghNpZHAuZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19j
-YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5o
-ZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5o
-ZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2FjZXJ0L2df
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAT0veIj3G+Z2c+lWdFmHjl1MY
-vGLdqSz/kOBTP0TQmaR0F3XfwAeq2vzjLrIKzq2dLta7B8XM2z6SQP076+bDitwn
-PyjzjBHhcH0+9qbW7NyuAqGJ7QLDNgHdTp6Vy9NL3n3DWQcyl5+IJF0/AaOTcGpv
-TzuebWBhhABPYYHBzqwFL1PQho8hY3k/HgYbKe0LZT1qskSuGwaKwUgxS4nj6TB0
-Rjabz+0qMj6nOvfzyxRHCmD2F58f/vRXQ5GjDK9BJDs7m9a7X0HFydFA1ICzXy3h
-9ByxH89P1vaG3uoL/8eUitiZIHEjnbRywqTb4ymRNc25zHssb3nB9JElcjpesQ==
-</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-rosenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-rosenheim.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-rosenheim.de/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-rosenheim.de/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-rosenheim.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNTA3
-MzAxMjAzMTBaFw0xODEwMjYxMjAzMTBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CAwGQmF5ZXJuMRIwEAYDVQQHDAlSb3NlbmhlaW0xHTAbBgNVBAoMFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLDA1SZWNoZW56ZW50cnVtMRwwGgYDVQQDDBNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAt++hJd5t48KJPKqUqz6zzYQYp6JAvxAioSYcTMoWlPwpfEnBHXMdYe9X+Yka
-G4mdn6vrrm60mFPi+IIIHUYYnSB0Q2VV12gOzOfcu+oveGb4Jd0PnR0beud5ns2q
-cfZ/AD8pn2Y2uHYw7Y/yIzAtejhO7waBt6gSthv2Kw/LtvMjCMG0bXhOobOQ1Kqb
-Xw8r3yN8o5DD43SoKHX1HN5krEYqnKu2M/KcO9FJgYlk8RrwWWffXgfTO55ISysX
-dW4B55mDvCxCqQmzKDSbwZBTKoG8RXHtnonmedtm2egVwxH8HPfWj84Fpk2eCVQj
-78fkh+neUWGL/lOCdr3nDy6i6wIDAQABo4ICXjCCAlowTwYDVR0gBEgwRjARBg8r
-BgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
-AQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBR6kwflRNnIjgBvGKaO
-+Jz7PAY2OTAfBgNVHSMEGDAWgBQgZm4lL6ljTaLgJ7qJf8sVuj+ukTAeBgNVHREE
-FzAVghNpZHAuZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19j
-YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5o
-ZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5o
-ZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2FjZXJ0L2df
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAT0veIj3G+Z2c+lWdFmHjl1MY
-vGLdqSz/kOBTP0TQmaR0F3XfwAeq2vzjLrIKzq2dLta7B8XM2z6SQP076+bDitwn
-PyjzjBHhcH0+9qbW7NyuAqGJ7QLDNgHdTp6Vy9NL3n3DWQcyl5+IJF0/AaOTcGpv
-TzuebWBhhABPYYHBzqwFL1PQho8hY3k/HgYbKe0LZT1qskSuGwaKwUgxS4nj6TB0
-Rjabz+0qMj6nOvfzyxRHCmD2F58f/vRXQ5GjDK9BJDs7m9a7X0HFydFA1ICzXy3h
-9ByxH89P1vaG3uoL/8eUitiZIHEjnbRywqTb4ymRNc25zHssb3nB9JElcjpesQ==
-</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>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>MIIFyjCCBLKgAwIBAgIHGdmQDevy+jANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xNTA3
-MzAxMjAzMTBaFw0xODEwMjYxMjAzMTBaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CAwGQmF5ZXJuMRIwEAYDVQQHDAlSb3NlbmhlaW0xHTAbBgNVBAoMFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLDA1SZWNoZW56ZW50cnVtMRwwGgYDVQQDDBNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAt++hJd5t48KJPKqUqz6zzYQYp6JAvxAioSYcTMoWlPwpfEnBHXMdYe9X+Yka
-G4mdn6vrrm60mFPi+IIIHUYYnSB0Q2VV12gOzOfcu+oveGb4Jd0PnR0beud5ns2q
-cfZ/AD8pn2Y2uHYw7Y/yIzAtejhO7waBt6gSthv2Kw/LtvMjCMG0bXhOobOQ1Kqb
-Xw8r3yN8o5DD43SoKHX1HN5krEYqnKu2M/KcO9FJgYlk8RrwWWffXgfTO55ISysX
-dW4B55mDvCxCqQmzKDSbwZBTKoG8RXHtnonmedtm2egVwxH8HPfWj84Fpk2eCVQj
-78fkh+neUWGL/lOCdr3nDy6i6wIDAQABo4ICXjCCAlowTwYDVR0gBEgwRjARBg8r
-BgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
-AQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBR6kwflRNnIjgBvGKaO
-+Jz7PAY2OTAfBgNVHSMEGDAWgBQgZm4lL6ljTaLgJ7qJf8sVuj+ukTAeBgNVHREE
-FzAVghNpZHAuZmgtcm9zZW5oZWltLmRlMIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jcmwvZ19j
-YWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5o
-ZWltLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgd0GCCsGAQUFBwEBBIHQMIHNMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtcm9zZW5o
-ZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2ZoLXJvc2VuaGVpbS1jYS9wdWIvY2FjZXJ0L2df
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAT0veIj3G+Z2c+lWdFmHjl1MY
-vGLdqSz/kOBTP0TQmaR0F3XfwAeq2vzjLrIKzq2dLta7B8XM2z6SQP076+bDitwn
-PyjzjBHhcH0+9qbW7NyuAqGJ7QLDNgHdTp6Vy9NL3n3DWQcyl5+IJF0/AaOTcGpv
-TzuebWBhhABPYYHBzqwFL1PQho8hY3k/HgYbKe0LZT1qskSuGwaKwUgxS4nj6TB0
-Rjabz+0qMj6nOvfzyxRHCmD2F58f/vRXQ5GjDK9BJDs7m9a7X0HFydFA1ICzXy3h
-9ByxH89P1vaG3uoL/8eUitiZIHEjnbRywqTb4ymRNc25zHssb3nB9JElcjpesQ==
-</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-rosenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-rosenheim.de: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">e360</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e360</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Hochschule Rosenheim</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Rosenheim</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fh-rosenheim.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fh-rosenheim.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Robert</md:GivenName>
-    <md:SurName>Meier</md:SurName>
-    <md:EmailAddress>mailto:robert.meier@fh-rosenheim.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Robert</md:GivenName>
-    <md:SurName>Meier</md:SurName>
-    <md:EmailAddress>mailto:idm-support@fh-rosenheim.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 138a4ae5..00000000
--- a/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml
+++ /dev/null
@@ -1,220 +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: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>MIIFxjCCBK6gAwIBAgIHFU/PxHfMczANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
-MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAyhCy0rXS5fekkK2Le4aNG4+rIgl3mO7oWqTeCeJFwQCcmKcDQMkASHlr/GqO
-6n5H1jOZkzjzaNefT/A+yGArfXiSsngms6+2TDOaPhUzXBhSyeb02euNXSpsyGPj
-C4W8O+310Uo9nReRoyHY5pqRhL7MbumK83w6+A9xplJVeOUcTwc6mrzmyzwJS4fr
-xtavvrAIy4FEPjijLIKZPFNOsdKwxMFn/lmeDvwbvvdZoP0+iEu4OEA43S7SkOT1
-obFMYtBMEMmh8vBvpbgvB/ZQbwzHtj2c3yBV4ss0GlCyfAvyBIAGXNwx30CqIRNe
-bGdzpeCckD1dVNISHhZMxPHkEQIDAQABo4ICWjCCAlYwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUcbjWiDJp71A980bkUsSr7h222qcwHwYDVR0jBBgwFoAUIGZuJS+pY02i4Ce6
-iX/LFbo/rpEwOgYDVR0RBDMwMYITaWRwLmZoLXJvc2VuaGVpbS5kZYEacnotc3Vw
-cG9ydEBmaC1yb3NlbmhlaW0uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0tY2EvcHViL2NybC9nX2NhY3Js
-LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
-BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcJ1g+O9GwcgBS8rDmDpaUIQhMNKQV
-Mq6IuS388MKc74CYfjeeZ9+5OSTQUfKp7h5Z4O7Zq1ksv5E8HpsHxZJog3gHVaXs
-NeFvoqK5ehCqDdzVB48uAERxSXYM9E135HwAOpTi6AMQZ8mcNBt3pfXRCSvt20P4
-nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
-7D8+hg9JhMiw3zogwAKy1plNcbgh4b/AdHa77Z8gGZw6pHwQuF3vFkZ6In5ohgdQ
-/1s5HODE5YfEIoWQHniE/QLWdUMzv4p6ZIYi1AjGDijnnaM9xCFvfRna
-</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>MIIFxjCCBK6gAwIBAgIHFU/PxHfMczANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
-MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAyhCy0rXS5fekkK2Le4aNG4+rIgl3mO7oWqTeCeJFwQCcmKcDQMkASHlr/GqO
-6n5H1jOZkzjzaNefT/A+yGArfXiSsngms6+2TDOaPhUzXBhSyeb02euNXSpsyGPj
-C4W8O+310Uo9nReRoyHY5pqRhL7MbumK83w6+A9xplJVeOUcTwc6mrzmyzwJS4fr
-xtavvrAIy4FEPjijLIKZPFNOsdKwxMFn/lmeDvwbvvdZoP0+iEu4OEA43S7SkOT1
-obFMYtBMEMmh8vBvpbgvB/ZQbwzHtj2c3yBV4ss0GlCyfAvyBIAGXNwx30CqIRNe
-bGdzpeCckD1dVNISHhZMxPHkEQIDAQABo4ICWjCCAlYwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUcbjWiDJp71A980bkUsSr7h222qcwHwYDVR0jBBgwFoAUIGZuJS+pY02i4Ce6
-iX/LFbo/rpEwOgYDVR0RBDMwMYITaWRwLmZoLXJvc2VuaGVpbS5kZYEacnotc3Vw
-cG9ydEBmaC1yb3NlbmhlaW0uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0tY2EvcHViL2NybC9nX2NhY3Js
-LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
-BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcJ1g+O9GwcgBS8rDmDpaUIQhMNKQV
-Mq6IuS388MKc74CYfjeeZ9+5OSTQUfKp7h5Z4O7Zq1ksv5E8HpsHxZJog3gHVaXs
-NeFvoqK5ehCqDdzVB48uAERxSXYM9E135HwAOpTi6AMQZ8mcNBt3pfXRCSvt20P4
-nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
-7D8+hg9JhMiw3zogwAKy1plNcbgh4b/AdHa77Z8gGZw6pHwQuF3vFkZ6In5ohgdQ
-/1s5HODE5YfEIoWQHniE/QLWdUMzv4p6ZIYi1AjGDijnnaM9xCFvfRna
-</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>MIIFxjCCBK6gAwIBAgIHFU/PxHfMczANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
-MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAyhCy0rXS5fekkK2Le4aNG4+rIgl3mO7oWqTeCeJFwQCcmKcDQMkASHlr/GqO
-6n5H1jOZkzjzaNefT/A+yGArfXiSsngms6+2TDOaPhUzXBhSyeb02euNXSpsyGPj
-C4W8O+310Uo9nReRoyHY5pqRhL7MbumK83w6+A9xplJVeOUcTwc6mrzmyzwJS4fr
-xtavvrAIy4FEPjijLIKZPFNOsdKwxMFn/lmeDvwbvvdZoP0+iEu4OEA43S7SkOT1
-obFMYtBMEMmh8vBvpbgvB/ZQbwzHtj2c3yBV4ss0GlCyfAvyBIAGXNwx30CqIRNe
-bGdzpeCckD1dVNISHhZMxPHkEQIDAQABo4ICWjCCAlYwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUcbjWiDJp71A980bkUsSr7h222qcwHwYDVR0jBBgwFoAUIGZuJS+pY02i4Ce6
-iX/LFbo/rpEwOgYDVR0RBDMwMYITaWRwLmZoLXJvc2VuaGVpbS5kZYEacnotc3Vw
-cG9ydEBmaC1yb3NlbmhlaW0uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0tY2EvcHViL2NybC9nX2NhY3Js
-LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
-BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcJ1g+O9GwcgBS8rDmDpaUIQhMNKQV
-Mq6IuS388MKc74CYfjeeZ9+5OSTQUfKp7h5Z4O7Zq1ksv5E8HpsHxZJog3gHVaXs
-NeFvoqK5ehCqDdzVB48uAERxSXYM9E135HwAOpTi6AMQZ8mcNBt3pfXRCSvt20P4
-nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
-7D8+hg9JhMiw3zogwAKy1plNcbgh4b/AdHa77Z8gGZw6pHwQuF3vFkZ6In5ohgdQ
-/1s5HODE5YfEIoWQHniE/QLWdUMzv4p6ZIYi1AjGDijnnaM9xCFvfRna
-</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>MIIFxjCCBK6gAwIBAgIHFU/PxHfMczANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
-EwJERTEhMB8GA1UEChMYRmFjaGhvY2hzY2h1bGUgUm9zZW5oZWltMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMRcwFQYDVQQDEw5GSC1STyBDQSAtIEcwMjAeFw0xMzAz
-MDEwNzAxMDlaFw0xODAyMjgwNzAxMDlaMIGHMQswCQYDVQQGEwJERTEPMA0GA1UE
-CBMGQmF5ZXJuMRIwEAYDVQQHEwlSb3NlbmhlaW0xHTAbBgNVBAoTFEhvY2hzY2h1
-bGUgUm9zZW5oZWltMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQDExNp
-ZHAuZmgtcm9zZW5oZWltLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAyhCy0rXS5fekkK2Le4aNG4+rIgl3mO7oWqTeCeJFwQCcmKcDQMkASHlr/GqO
-6n5H1jOZkzjzaNefT/A+yGArfXiSsngms6+2TDOaPhUzXBhSyeb02euNXSpsyGPj
-C4W8O+310Uo9nReRoyHY5pqRhL7MbumK83w6+A9xplJVeOUcTwc6mrzmyzwJS4fr
-xtavvrAIy4FEPjijLIKZPFNOsdKwxMFn/lmeDvwbvvdZoP0+iEu4OEA43S7SkOT1
-obFMYtBMEMmh8vBvpbgvB/ZQbwzHtj2c3yBV4ss0GlCyfAvyBIAGXNwx30CqIRNe
-bGdzpeCckD1dVNISHhZMxPHkEQIDAQABo4ICWjCCAlYwOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUcbjWiDJp71A980bkUsSr7h222qcwHwYDVR0jBBgwFoAUIGZuJS+pY02i4Ce6
-iX/LFbo/rpEwOgYDVR0RBDMwMYITaWRwLmZoLXJvc2VuaGVpbS5kZYEacnotc3Vw
-cG9ydEBmaC1yb3NlbmhlaW0uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0tY2EvcHViL2NybC9nX2NhY3Js
-LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
-BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9maC1yb3NlbmhlaW0t
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvZmgtcm9zZW5oZWltLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCcJ1g+O9GwcgBS8rDmDpaUIQhMNKQV
-Mq6IuS388MKc74CYfjeeZ9+5OSTQUfKp7h5Z4O7Zq1ksv5E8HpsHxZJog3gHVaXs
-NeFvoqK5ehCqDdzVB48uAERxSXYM9E135HwAOpTi6AMQZ8mcNBt3pfXRCSvt20P4
-nejQJyf6UfCdTTaV/MjILk53qrIIW5e12nmbq8880Dy3st2Qrq1JDA3FaA0gUvd8
-7D8+hg9JhMiw3zogwAKy1plNcbgh4b/AdHa77Z8gGZw6pHwQuF3vFkZ6In5ohgdQ
-/1s5HODE5YfEIoWQHniE/QLWdUMzv4p6ZIYi1AjGDijnnaM9xCFvfRna
-</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-trier.de.xml b/swamid-interfederations-2.0/idp.fh-trier.de.xml
deleted file mode 100644
index a454e314..00000000
--- a/swamid-interfederations-2.0/idp.fh-trier.de.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fh-trier.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-trier.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-trier.de,OU=Rechenzentrum,O=Fachhochschule Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEDCgewzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
-REUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1bSBL
-YWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqGSIb3
-DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMDgwNDE4MTMyNTA4WhcNMTMwNDE3
-MTMyNTA4WjCBiDELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFs
-ejEOMAwGA1UEBxMFVHJpZXIxHTAbBgNVBAoTFEZhY2hob2Noc2NodWxlIFRyaWVy
-MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRgwFgYDVQQDEw9pZHAuZmgtdHJpZXIu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvOnNbphWz43pYMMFL
-HempeM92apNBg5udhUvAI6EciTT9r4ErnoM1GLR7UiN3vYtKZf3kIcqXoNMNcAvA
-6Fw9zWX0KjUNDjAzLCC36Y39YdiMZ3gk53VhXb0vuKdMauFQx132tMB26NKjzlro
-WByftqrpb/b366pdiPRy+I2vTWa1RmisUBbqnuH2a7ASwryOasCNPFnm6PwmmOWM
-3p3k+k2weFqu3OzbQImY+jX7lqrtx4dwWVmWR8gNwI4Rl6FX145A0cIjwVsQOqgk
-25t++GW+YOCQ/Lj+ewyjcdJ6mYsvO8TLwGmJGOEUBrvBqiQGgIrVmAzN/wE42SN7
-Xm1ZAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUE
-DDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUnU/WDF5uFdXSenyzvejfX+uGWsAwHwYD
-VR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwSAYDVR0RBEEwP4EUaXAtYWRt
-aW5AZmgtdHJpZXIuZGWCD2lkcC5maC10cmllci5kZYIWc2hpYmJvbGV0aC5maC10
-cmllci5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3JocmstY2EvcHViL2NybC9nX2NhY3JsLmNybDA4oDagNIYyaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgZgGCCsGAQUF
-BwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3Jo
-cmstY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEApNN+8655Bl55688Hex3dbKQ712rV/scJEkm6
-g2ofH0vFWMNqx11dAEcSgVt5Eprt0JUBCCegRtefkHFcdrAB/MZOewMtWjlg5llA
-tgIedaTUFbZdGLVrgmCLtlmULiJOeWUvoFqqmQ4Z8N83qKiv4t2lMH7/MOX2S+2l
-RCsYlh0zH0+QqVngnprNkFTh5OJr8FLE2g31GL8U1MN5jrmYyIjbZYMOgucbnyfF
-c2ibGAM4qFYC6GGz56URRUwpjzufssCGxRzt7IdNU0/nxMtM9gJYF2j5W3BJKlFq
-0/c4114PR1zEeMEtMlibxdQmFlgeH9B6jY3zBoLARCwKE3OkLg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-trier.de,OU=Rechenzentrum,O=Fachhochschule Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEDCgewzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
-REUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1bSBL
-YWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqGSIb3
-DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMDgwNDE4MTMyNTA4WhcNMTMwNDE3
-MTMyNTA4WjCBiDELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFs
-ejEOMAwGA1UEBxMFVHJpZXIxHTAbBgNVBAoTFEZhY2hob2Noc2NodWxlIFRyaWVy
-MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRgwFgYDVQQDEw9pZHAuZmgtdHJpZXIu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvOnNbphWz43pYMMFL
-HempeM92apNBg5udhUvAI6EciTT9r4ErnoM1GLR7UiN3vYtKZf3kIcqXoNMNcAvA
-6Fw9zWX0KjUNDjAzLCC36Y39YdiMZ3gk53VhXb0vuKdMauFQx132tMB26NKjzlro
-WByftqrpb/b366pdiPRy+I2vTWa1RmisUBbqnuH2a7ASwryOasCNPFnm6PwmmOWM
-3p3k+k2weFqu3OzbQImY+jX7lqrtx4dwWVmWR8gNwI4Rl6FX145A0cIjwVsQOqgk
-25t++GW+YOCQ/Lj+ewyjcdJ6mYsvO8TLwGmJGOEUBrvBqiQGgIrVmAzN/wE42SN7
-Xm1ZAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUE
-DDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUnU/WDF5uFdXSenyzvejfX+uGWsAwHwYD
-VR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwSAYDVR0RBEEwP4EUaXAtYWRt
-aW5AZmgtdHJpZXIuZGWCD2lkcC5maC10cmllci5kZYIWc2hpYmJvbGV0aC5maC10
-cmllci5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3JocmstY2EvcHViL2NybC9nX2NhY3JsLmNybDA4oDagNIYyaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgZgGCCsGAQUF
-BwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3Jo
-cmstY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEApNN+8655Bl55688Hex3dbKQ712rV/scJEkm6
-g2ofH0vFWMNqx11dAEcSgVt5Eprt0JUBCCegRtefkHFcdrAB/MZOewMtWjlg5llA
-tgIedaTUFbZdGLVrgmCLtlmULiJOeWUvoFqqmQ4Z8N83qKiv4t2lMH7/MOX2S+2l
-RCsYlh0zH0+QqVngnprNkFTh5OJr8FLE2g31GL8U1MN5jrmYyIjbZYMOgucbnyfF
-c2ibGAM4qFYC6GGz56URRUwpjzufssCGxRzt7IdNU0/nxMtM9gJYF2j5W3BJKlFq
-0/c4114PR1zEeMEtMlibxdQmFlgeH9B6jY3zBoLARCwKE3OkLg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-trier.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-trier.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fh-trier.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fh-trier.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fh-trier.de/idp/profile/SAML2/POST-Simple-Sign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fh-trier.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-trier.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-trier.de,OU=Rechenzentrum,O=Fachhochschule Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEDCgewzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
-REUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1bSBL
-YWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqGSIb3
-DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMDgwNDE4MTMyNTA4WhcNMTMwNDE3
-MTMyNTA4WjCBiDELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFs
-ejEOMAwGA1UEBxMFVHJpZXIxHTAbBgNVBAoTFEZhY2hob2Noc2NodWxlIFRyaWVy
-MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRgwFgYDVQQDEw9pZHAuZmgtdHJpZXIu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvOnNbphWz43pYMMFL
-HempeM92apNBg5udhUvAI6EciTT9r4ErnoM1GLR7UiN3vYtKZf3kIcqXoNMNcAvA
-6Fw9zWX0KjUNDjAzLCC36Y39YdiMZ3gk53VhXb0vuKdMauFQx132tMB26NKjzlro
-WByftqrpb/b366pdiPRy+I2vTWa1RmisUBbqnuH2a7ASwryOasCNPFnm6PwmmOWM
-3p3k+k2weFqu3OzbQImY+jX7lqrtx4dwWVmWR8gNwI4Rl6FX145A0cIjwVsQOqgk
-25t++GW+YOCQ/Lj+ewyjcdJ6mYsvO8TLwGmJGOEUBrvBqiQGgIrVmAzN/wE42SN7
-Xm1ZAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUE
-DDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUnU/WDF5uFdXSenyzvejfX+uGWsAwHwYD
-VR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwSAYDVR0RBEEwP4EUaXAtYWRt
-aW5AZmgtdHJpZXIuZGWCD2lkcC5maC10cmllci5kZYIWc2hpYmJvbGV0aC5maC10
-cmllci5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3JocmstY2EvcHViL2NybC9nX2NhY3JsLmNybDA4oDagNIYyaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgZgGCCsGAQUF
-BwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3Jo
-cmstY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEApNN+8655Bl55688Hex3dbKQ712rV/scJEkm6
-g2ofH0vFWMNqx11dAEcSgVt5Eprt0JUBCCegRtefkHFcdrAB/MZOewMtWjlg5llA
-tgIedaTUFbZdGLVrgmCLtlmULiJOeWUvoFqqmQ4Z8N83qKiv4t2lMH7/MOX2S+2l
-RCsYlh0zH0+QqVngnprNkFTh5OJr8FLE2g31GL8U1MN5jrmYyIjbZYMOgucbnyfF
-c2ibGAM4qFYC6GGz56URRUwpjzufssCGxRzt7IdNU0/nxMtM9gJYF2j5W3BJKlFq
-0/c4114PR1zEeMEtMlibxdQmFlgeH9B6jY3zBoLARCwKE3OkLg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fh-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fh-trier.de,OU=Rechenzentrum,O=Fachhochschule Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEDCgewzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
-REUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1bSBL
-YWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqGSIb3
-DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMDgwNDE4MTMyNTA4WhcNMTMwNDE3
-MTMyNTA4WjCBiDELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFs
-ejEOMAwGA1UEBxMFVHJpZXIxHTAbBgNVBAoTFEZhY2hob2Noc2NodWxlIFRyaWVy
-MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRgwFgYDVQQDEw9pZHAuZmgtdHJpZXIu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvOnNbphWz43pYMMFL
-HempeM92apNBg5udhUvAI6EciTT9r4ErnoM1GLR7UiN3vYtKZf3kIcqXoNMNcAvA
-6Fw9zWX0KjUNDjAzLCC36Y39YdiMZ3gk53VhXb0vuKdMauFQx132tMB26NKjzlro
-WByftqrpb/b366pdiPRy+I2vTWa1RmisUBbqnuH2a7ASwryOasCNPFnm6PwmmOWM
-3p3k+k2weFqu3OzbQImY+jX7lqrtx4dwWVmWR8gNwI4Rl6FX145A0cIjwVsQOqgk
-25t++GW+YOCQ/Lj+ewyjcdJ6mYsvO8TLwGmJGOEUBrvBqiQGgIrVmAzN/wE42SN7
-Xm1ZAgMBAAGjggHVMIIB0TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUE
-DDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUnU/WDF5uFdXSenyzvejfX+uGWsAwHwYD
-VR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwSAYDVR0RBEEwP4EUaXAtYWRt
-aW5AZmgtdHJpZXIuZGWCD2lkcC5maC10cmllci5kZYIWc2hpYmJvbGV0aC5maC10
-cmllci5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3JocmstY2EvcHViL2NybC9nX2NhY3JsLmNybDA4oDagNIYyaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgZgGCCsGAQUF
-BwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3Jo
-cmstY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEApNN+8655Bl55688Hex3dbKQ712rV/scJEkm6
-g2ofH0vFWMNqx11dAEcSgVt5Eprt0JUBCCegRtefkHFcdrAB/MZOewMtWjlg5llA
-tgIedaTUFbZdGLVrgmCLtlmULiJOeWUvoFqqmQ4Z8N83qKiv4t2lMH7/MOX2S+2l
-RCsYlh0zH0+QqVngnprNkFTh5OJr8FLE2g31GL8U1MN5jrmYyIjbZYMOgucbnyfF
-c2ibGAM4qFYC6GGz56URRUwpjzufssCGxRzt7IdNU0/nxMtM9gJYF2j5W3BJKlFq
-0/c4114PR1zEeMEtMlibxdQmFlgeH9B6jY3zBoLARCwKE3OkLg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fh-trier.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fh-trier.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Trier Rechenzentrum (r/ft)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Fachhochschule Trier</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fh-trier.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ralf</GivenName>
-    <SurName>Becker</SurName>
-    <EmailAddress>beckerr@fh-trier.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Becker</SurName>
-    <EmailAddress>beckerr@fh-trier.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fife.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fife.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index bc1f3886..00000000
--- a/swamid-interfederations-2.0/idp.fife.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fife.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Fife College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-21T13:01:31Z">
-      <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 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">fife.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.fife.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Fife College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Fife College</mdui:Description>
-        <mdui:Logo height="58" width="191">https://www.fife.ac.uk/Style%20Library/Images/ASC/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>
-						MIIDJDCCAgygAwIBAgIVAMSH7t+3wR8HvHhTV60wiQbeGyS9MA0GCSqGSIb3DQEB
-						CwUAMBkxFzAVBgNVBAMMDmlkcC5maWZlLmFjLnVrMB4XDTE1MDgxODEzNTUzN1oX
-						DTM1MDgxODEzNTUzN1owGTEXMBUGA1UEAwwOaWRwLmZpZmUuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZUZMO2Jq43iFJUkENA3C2HAUa5D6h
-						SSA13NIFOO2vD+8w+UCruVl70Q6dL8J8oamGnPmuXEX6j7s8xuPXh1jW8Bgg9qCf
-						8oFn97naV7z4Q0v9wz7yrFZdhV695TwuuPqiSvfpQhV3fRDCAM8v2T0FLYnN6e2K
-						0EuuN8nnXdIeTnUORTKuDSW8tUEo+Aifoq8w1Xxr4t63sTLZf7H2/S+RYS3llzT+
-						lyeUFeN51KWTegrWBQ0e4y+v5p7waYr4CtgO652TlChL3zzl4dXi3ebW8oPwHfK6
-						fnw7gTLNLeMe/X4IE/UBruP5egKmB7CPpFRaBWdKb3MeN6ha854tWkqRAgMBAAGj
-						YzBhMB0GA1UdDgQWBBS4nOBhTboXA7kKfrJ4asvwp9dcajBABgNVHREEOTA3gg5p
-						ZHAuZmlmZS5hYy51a4YlaHR0cHM6Ly9pZHAuZmlmZS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAOVr86ThzRpiWYDEMTRaPc/qNUwUCu8+x
-						VJ/72p/LNTKMapIJZM/riSbi6E0sCiGRmzVSYLISMXVOEdTQIH0EDTuxHd8HBQKP
-						YNm4w51czi9Echtrb1d0ARGM/E8w09xv2pRDmf1VSIwAFjFxpzw765sFt13TD9sO
-						X/jLji5/T0vcSRlwCI+xCAkFiGcECK/jBeA2DkgzqRecblufds5ncWZegy6Q1qXc
-						ZE6B8vB7q83XEaN04YQ3MoQuLZvAK8MAKI2XS5pOIysDZiLFXdHoW3ZcBT13NB3F
-						d4dRnvjAIVLYNByna61xG/WJVi5siHSmGZBoGt7qEl0LBQqv6V0txw==
-					</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>
-						MIIDJDCCAgygAwIBAgIVAL6RCJkK1lwbxWiAZtEZ4gUt74gZMA0GCSqGSIb3DQEB
-						CwUAMBkxFzAVBgNVBAMMDmlkcC5maWZlLmFjLnVrMB4XDTE1MDgxODEzNTUzNVoX
-						DTM1MDgxODEzNTUzNVowGTEXMBUGA1UEAwwOaWRwLmZpZmUuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtZj1WvUnkQUXPjTFrK10RUW4F5TS1
-						0aaHRMl/bEHW2xugFMFRlYz/61d6DQ8J+g3vZMqLE42s9J8e6tYeORVQGVoeLkUm
-						Ab8NB1jGbg4Pst/DNLiJYTQHWl6RemiNjVNgDfMEbr6Uh/AYdKtH4H3DTOIBWzLD
-						kJ7KwkC4pOmBs1rx3DjppTvmltUM+8oL1v/h5jw9r646gVjCkgrnquumbYUZoTSs
-						ApYExLeDmttSVEt080YpAF7b6LSAP5vBKdhbR/SZr0cRyGX9W/0vKW/6GxknM1Ih
-						q22SklWPZMW4ayVEtm38JLPifvtlKprZCiVgcMbH4YdsLJRdQI3cLcoHAgMBAAGj
-						YzBhMB0GA1UdDgQWBBSOGtYQOZyJe7EAgJ0oGjUfHiE7GDBABgNVHREEOTA3gg5p
-						ZHAuZmlmZS5hYy51a4YlaHR0cHM6Ly9pZHAuZmlmZS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAFD3TLoOSuo8WYapOqpR4UinnB+dks5ko
-						Vqe4KDFX8S4Q/1GpG+GOEvXOqFE1eir+XIX2oLYU+514FxJOGlPPJsG4ojVMmj/F
-						6b8vWbjAHkUQfMgVVxT/G8kFzn9z5pm2/EGtC1xbP8Yub+hzL6B9tJzKMLu2MP1M
-						BTvY1FM/OG/O+piRz+8OtKkwXgGf7B3uYZHZDV80KUK+E/laktIJJR3IEL/HYG5o
-						VZvWsWhxkzf2C/EoORlAR/bdf/jHdVqJos/b+pDYixhpuYggrUqUEHzo2yCFxh57
-						m9piTkbs/Wlkejr7HQmExiq37uFjZR62Pyp9nzTj20VFz8Pdca7G0Q==
-					</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>
-						MIIDIzCCAgugAwIBAgIURu5IcL5iFuwZvk3l1cGg1/CZ/eYwDQYJKoZIhvcNAQEL
-						BQAwGTEXMBUGA1UEAwwOaWRwLmZpZmUuYWMudWswHhcNMTUwODE4MTM1NTM2WhcN
-						MzUwODE4MTM1NTM2WjAZMRcwFQYDVQQDDA5pZHAuZmlmZS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIEI8ZGZ4tKFlRJvAocI8HKyfVJ0Xvwn
-						4SGPTIJiB3+mha+HHizAd9qpwkpXivXKZHMBFVksfuPgQR9qIurHbUzPiBxCsdM/
-						wuwwJijyL1Im5thCFJkksWsod+rvlvvVVt1GI83D3inbKg116J0wKKg4TmhXB9QM
-						0o1tB5d+XT9sYTst52PJT5bXI08awZou+z6To2aE2HgXLsqQTq88CZKSESCJaT8j
-						rVONzjG6Q87qlw8wH2JelG017wAPDLvcwBQhQNCp3V/j0ttfG0XtEuX4/zqVzD07
-						l7lzUsIHPgXr+t27Z7Zx6RJwjgXBriTjEuz4UIw1tgbUDf6ooyxXH8MCAwEAAaNj
-						MGEwHQYDVR0OBBYEFEyL2dSl3fdiPDu8eXNtSrrRYozMMEAGA1UdEQQ5MDeCDmlk
-						cC5maWZlLmFjLnVrhiVodHRwczovL2lkcC5maWZlLmFjLnVrL2lkcC9zaGliYm9s
-						ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQApwpwY0+dd+6MB3HLP+uXFHvHOatbRLjgi
-						F3ox1F0Fgj9tAwER4LC1NSzap7kvVJgX85+owEkOcbWzrccZKu1vL3qfxMcRfz+G
-						zav5Qr0R59j3agVwVUCPAq7ZXkCZhtwZv3REPf4Z5oHmGwCHGCndHVYtrm8rbRc8
-						YCVw1iGpRQylmhpZrZdOAfDAGLDlMf4Ls3FAAg97IKhVBaxKj2RX4cnT/L70qpdB
-						7qRSPgZKsX/P0D5zgX1ul8I0WaKhlb4q/eWw+p0EtJHgL+R6vO9mu+FalYW+CtXW
-						Vg3hbcA7wQhdcxyFQemk4H24VNtDXOP1KQOm5Gd2EgLi+OaTo3/Z
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fife.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fife.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.fife.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fife.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fife.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fife.ac.uk/idp/profile/SAML2/Redirect/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">fife.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.fife.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAgygAwIBAgIVAMSH7t+3wR8HvHhTV60wiQbeGyS9MA0GCSqGSIb3DQEB
-						CwUAMBkxFzAVBgNVBAMMDmlkcC5maWZlLmFjLnVrMB4XDTE1MDgxODEzNTUzN1oX
-						DTM1MDgxODEzNTUzN1owGTEXMBUGA1UEAwwOaWRwLmZpZmUuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZUZMO2Jq43iFJUkENA3C2HAUa5D6h
-						SSA13NIFOO2vD+8w+UCruVl70Q6dL8J8oamGnPmuXEX6j7s8xuPXh1jW8Bgg9qCf
-						8oFn97naV7z4Q0v9wz7yrFZdhV695TwuuPqiSvfpQhV3fRDCAM8v2T0FLYnN6e2K
-						0EuuN8nnXdIeTnUORTKuDSW8tUEo+Aifoq8w1Xxr4t63sTLZf7H2/S+RYS3llzT+
-						lyeUFeN51KWTegrWBQ0e4y+v5p7waYr4CtgO652TlChL3zzl4dXi3ebW8oPwHfK6
-						fnw7gTLNLeMe/X4IE/UBruP5egKmB7CPpFRaBWdKb3MeN6ha854tWkqRAgMBAAGj
-						YzBhMB0GA1UdDgQWBBS4nOBhTboXA7kKfrJ4asvwp9dcajBABgNVHREEOTA3gg5p
-						ZHAuZmlmZS5hYy51a4YlaHR0cHM6Ly9pZHAuZmlmZS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAOVr86ThzRpiWYDEMTRaPc/qNUwUCu8+x
-						VJ/72p/LNTKMapIJZM/riSbi6E0sCiGRmzVSYLISMXVOEdTQIH0EDTuxHd8HBQKP
-						YNm4w51czi9Echtrb1d0ARGM/E8w09xv2pRDmf1VSIwAFjFxpzw765sFt13TD9sO
-						X/jLji5/T0vcSRlwCI+xCAkFiGcECK/jBeA2DkgzqRecblufds5ncWZegy6Q1qXc
-						ZE6B8vB7q83XEaN04YQ3MoQuLZvAK8MAKI2XS5pOIysDZiLFXdHoW3ZcBT13NB3F
-						d4dRnvjAIVLYNByna61xG/WJVi5siHSmGZBoGt7qEl0LBQqv6V0txw==
-					</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>
-						MIIDJDCCAgygAwIBAgIVAL6RCJkK1lwbxWiAZtEZ4gUt74gZMA0GCSqGSIb3DQEB
-						CwUAMBkxFzAVBgNVBAMMDmlkcC5maWZlLmFjLnVrMB4XDTE1MDgxODEzNTUzNVoX
-						DTM1MDgxODEzNTUzNVowGTEXMBUGA1UEAwwOaWRwLmZpZmUuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtZj1WvUnkQUXPjTFrK10RUW4F5TS1
-						0aaHRMl/bEHW2xugFMFRlYz/61d6DQ8J+g3vZMqLE42s9J8e6tYeORVQGVoeLkUm
-						Ab8NB1jGbg4Pst/DNLiJYTQHWl6RemiNjVNgDfMEbr6Uh/AYdKtH4H3DTOIBWzLD
-						kJ7KwkC4pOmBs1rx3DjppTvmltUM+8oL1v/h5jw9r646gVjCkgrnquumbYUZoTSs
-						ApYExLeDmttSVEt080YpAF7b6LSAP5vBKdhbR/SZr0cRyGX9W/0vKW/6GxknM1Ih
-						q22SklWPZMW4ayVEtm38JLPifvtlKprZCiVgcMbH4YdsLJRdQI3cLcoHAgMBAAGj
-						YzBhMB0GA1UdDgQWBBSOGtYQOZyJe7EAgJ0oGjUfHiE7GDBABgNVHREEOTA3gg5p
-						ZHAuZmlmZS5hYy51a4YlaHR0cHM6Ly9pZHAuZmlmZS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAFD3TLoOSuo8WYapOqpR4UinnB+dks5ko
-						Vqe4KDFX8S4Q/1GpG+GOEvXOqFE1eir+XIX2oLYU+514FxJOGlPPJsG4ojVMmj/F
-						6b8vWbjAHkUQfMgVVxT/G8kFzn9z5pm2/EGtC1xbP8Yub+hzL6B9tJzKMLu2MP1M
-						BTvY1FM/OG/O+piRz+8OtKkwXgGf7B3uYZHZDV80KUK+E/laktIJJR3IEL/HYG5o
-						VZvWsWhxkzf2C/EoORlAR/bdf/jHdVqJos/b+pDYixhpuYggrUqUEHzo2yCFxh57
-						m9piTkbs/Wlkejr7HQmExiq37uFjZR62Pyp9nzTj20VFz8Pdca7G0Q==
-					</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>
-						MIIDIzCCAgugAwIBAgIURu5IcL5iFuwZvk3l1cGg1/CZ/eYwDQYJKoZIhvcNAQEL
-						BQAwGTEXMBUGA1UEAwwOaWRwLmZpZmUuYWMudWswHhcNMTUwODE4MTM1NTM2WhcN
-						MzUwODE4MTM1NTM2WjAZMRcwFQYDVQQDDA5pZHAuZmlmZS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIEI8ZGZ4tKFlRJvAocI8HKyfVJ0Xvwn
-						4SGPTIJiB3+mha+HHizAd9qpwkpXivXKZHMBFVksfuPgQR9qIurHbUzPiBxCsdM/
-						wuwwJijyL1Im5thCFJkksWsod+rvlvvVVt1GI83D3inbKg116J0wKKg4TmhXB9QM
-						0o1tB5d+XT9sYTst52PJT5bXI08awZou+z6To2aE2HgXLsqQTq88CZKSESCJaT8j
-						rVONzjG6Q87qlw8wH2JelG017wAPDLvcwBQhQNCp3V/j0ttfG0XtEuX4/zqVzD07
-						l7lzUsIHPgXr+t27Z7Zx6RJwjgXBriTjEuz4UIw1tgbUDf6ooyxXH8MCAwEAAaNj
-						MGEwHQYDVR0OBBYEFEyL2dSl3fdiPDu8eXNtSrrRYozMMEAGA1UdEQQ5MDeCDmlk
-						cC5maWZlLmFjLnVrhiVodHRwczovL2lkcC5maWZlLmFjLnVrL2lkcC9zaGliYm9s
-						ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQApwpwY0+dd+6MB3HLP+uXFHvHOatbRLjgi
-						F3ox1F0Fgj9tAwER4LC1NSzap7kvVJgX85+owEkOcbWzrccZKu1vL3qfxMcRfz+G
-						zav5Qr0R59j3agVwVUCPAq7ZXkCZhtwZv3REPf4Z5oHmGwCHGCndHVYtrm8rbRc8
-						YCVw1iGpRQylmhpZrZdOAfDAGLDlMf4Ls3FAAg97IKhVBaxKj2RX4cnT/L70qpdB
-						7qRSPgZKsX/P0D5zgX1ul8I0WaKhlb4q/eWw+p0EtJHgL+R6vO9mu+FalYW+CtXW
-						Vg3hbcA7wQhdcxyFQemk4H24VNtDXOP1KQOm5Gd2EgLi+OaTo3/Z
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fife.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Fife College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Fife College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fife.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Campbell</SurName>
-    <EmailAddress>mailto:paulcampbell@fife.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alastair</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:alastairsmith@fife.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fnal.gov-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fnal.gov-idp-shibboleth.xml
deleted file mode 100644
index a1f538e6..00000000
--- a/swamid-interfederations-2.0/idp.fnal.gov-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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://idp.fnal.gov/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://pingprod.fnal.gov:9031/files/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fnal.gov</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Fermi National Accelerator Laboratory</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Fermilab's Production IdP Server</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fnal.gov/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.fnal.gov/pub/disclaim.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="90" width="597" xml:lang="en">https://pingprod.fnal.gov:9031/files/flogo.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>
-MIIDtDCCApygAwIBAgIGAU5qDxk/MA0GCSqGSIb3DQEBCwUAMIGaMQswCQYDVQQGEwJVUzELMAkG
-A1UECBMCSUwxEDAOBgNVBAcTB0JhdGF2aWExLjAsBgNVBAoTJUZlcm1pIE5hdGlvbmFsIEFjY2Vs
-ZXJhdG9yIExhYm9yYXRvcnkxIDAeBgNVBAsTF0F1dGhlbnRpY2F0aW9uIFNlcnZpY2VzMRowGAYD
-VQQDExFwaW5ncHJvZC5mbmFsLmdvdjAeFw0xNTA3MDcxOTQ3MzFaFw0xODA3MDYxOTQ3MzFaMIGa
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCSUwxEDAOBgNVBAcTB0JhdGF2aWExLjAsBgNVBAoTJUZl
-cm1pIE5hdGlvbmFsIEFjY2VsZXJhdG9yIExhYm9yYXRvcnkxIDAeBgNVBAsTF0F1dGhlbnRpY2F0
-aW9uIFNlcnZpY2VzMRowGAYDVQQDExFwaW5ncHJvZC5mbmFsLmdvdjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJd08n1npTMlLcBxZ8x/Wq99VdL0+EcipNjlJtwi9A8pXs4b42eokzpH
-WBOLWW7CF8KVkkeJsZHI9F/ik8u3V6r2BiPOEp9vjRgqE+BAt2zlRor+H/nqv5PyZ/L6/yLY4p8H
-AwdzjXa+CeWMlW8sClwNBR28yqt0a+lUyxApWNR2kyMU98EteGnAzEHdu6kCX6rDc1VoDlLbGajm
-TrPMypPcU3+PgDmVcRNLId3Htlq9IU82zgn9qMVDV6n8p85Yh+RzJDwETIqB8Us8697MDribOa0o
-3t4QOSJKFfbP3o8y/E+GEqWOGxsprJuI+EMb+zFVq1VdkhMi5fG6AKAXKzECAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAaWUX/S/J4FoNHaN0jW2la9XpjEmIH0zzHCKkv794CtkJwihfKrXH/5ntu3z6
-WTtRUQRiv3JtTsRyNBDJeY1EJGlxnAoeGk1shSc9wbqXXm/XbhUTiZa9/NOG9jlq/7EWaaCaTRa7
-1eDB/QOMVwGm0RWW7j9r42hg/l9Sm+LtfCdkvTqZAQIz5UMD7LvWAvyv7EGv9t3NH6USbzrADsax
-vmLXS1toaIkjZd90Pvl5MkNQ7k7YXYaOJThjpXOBDyNdPGanCcaJQItGS6EG3dbKRdOqLxhYym42
-63F3WI6GgeS6dTHvrYMBaR6B5dDX7xa2rdsSp8pkSE3xk3OwvbJePw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingprod.fnal.gov:9031/idp/ARS.ssaml2" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingprod.fnal.gov:9031/idp/SSO.saml2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingprod.fnal.gov:9031/idp/SSO.saml2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecp-test.fnal.gov/idp/profile/SAML2/SOAP/ECP"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecp-prod.fnal.gov/idp/profile/SAML2/SOAP/ECP"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecp-prod.fnal.gov/idp-krb/profile/SAML2/SOAP/ECP"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecp-test.fnal.gov/idp-krb/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fnal.gov</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDtDCCApygAwIBAgIGAU5qDxk/MA0GCSqGSIb3DQEBCwUAMIGaMQswCQYDVQQGEwJVUzELMAkG
-A1UECBMCSUwxEDAOBgNVBAcTB0JhdGF2aWExLjAsBgNVBAoTJUZlcm1pIE5hdGlvbmFsIEFjY2Vs
-ZXJhdG9yIExhYm9yYXRvcnkxIDAeBgNVBAsTF0F1dGhlbnRpY2F0aW9uIFNlcnZpY2VzMRowGAYD
-VQQDExFwaW5ncHJvZC5mbmFsLmdvdjAeFw0xNTA3MDcxOTQ3MzFaFw0xODA3MDYxOTQ3MzFaMIGa
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCSUwxEDAOBgNVBAcTB0JhdGF2aWExLjAsBgNVBAoTJUZl
-cm1pIE5hdGlvbmFsIEFjY2VsZXJhdG9yIExhYm9yYXRvcnkxIDAeBgNVBAsTF0F1dGhlbnRpY2F0
-aW9uIFNlcnZpY2VzMRowGAYDVQQDExFwaW5ncHJvZC5mbmFsLmdvdjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJd08n1npTMlLcBxZ8x/Wq99VdL0+EcipNjlJtwi9A8pXs4b42eokzpH
-WBOLWW7CF8KVkkeJsZHI9F/ik8u3V6r2BiPOEp9vjRgqE+BAt2zlRor+H/nqv5PyZ/L6/yLY4p8H
-AwdzjXa+CeWMlW8sClwNBR28yqt0a+lUyxApWNR2kyMU98EteGnAzEHdu6kCX6rDc1VoDlLbGajm
-TrPMypPcU3+PgDmVcRNLId3Htlq9IU82zgn9qMVDV6n8p85Yh+RzJDwETIqB8Us8697MDribOa0o
-3t4QOSJKFfbP3o8y/E+GEqWOGxsprJuI+EMb+zFVq1VdkhMi5fG6AKAXKzECAwEAATANBgkqhkiG
-9w0BAQsFAAOCAQEAaWUX/S/J4FoNHaN0jW2la9XpjEmIH0zzHCKkv794CtkJwihfKrXH/5ntu3z6
-WTtRUQRiv3JtTsRyNBDJeY1EJGlxnAoeGk1shSc9wbqXXm/XbhUTiZa9/NOG9jlq/7EWaaCaTRa7
-1eDB/QOMVwGm0RWW7j9r42hg/l9Sm+LtfCdkvTqZAQIz5UMD7LvWAvyv7EGv9t3NH6USbzrADsax
-vmLXS1toaIkjZd90Pvl5MkNQ7k7YXYaOJThjpXOBDyNdPGanCcaJQItGS6EG3dbKRdOqLxhYym42
-63F3WI6GgeS6dTHvrYMBaR6B5dDX7xa2rdsSp8pkSE3xk3OwvbJePw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pingprod.fnal.gov:9031/idp/attrsvc.ssaml2"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Fermi National Accelerator Laboratory</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Fermi National Accelerator Laboratory</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fnal.gov/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Olga Terlyga</md:GivenName>
-    <md:EmailAddress>terlyga@fnal.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Al Lilianstrom</md:GivenName>
-    <md:EmailAddress>lilstrom@fnal.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mine Altunay</md:GivenName>
-    <md:EmailAddress>maltunay@fnal.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Art Lee</md:GivenName>
-    <md:EmailAddress>artlee@fnal.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fraunhofer.de.xml b/swamid-interfederations-2.0/idp.fraunhofer.de.xml
deleted file mode 100644
index b876867f..00000000
--- a/swamid-interfederations-2.0/idp.fraunhofer.de.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fraunhofer.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fraunhofer.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fraunhofer.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fraunhofer.de,OU=Services,O=Fraunhofer,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlzCCBH+gAwIBAgIKItv3iwAAAAAFZjANBgkqhkiG9w0BAQUFADBqMQswCQYD
-VQQGEwJERTETMBEGA1UEChMKRnJhdW5ob2ZlcjEhMB8GA1UECxMYRnJhdW5ob2Zl
-ciBDb3Jwb3JhdGUgUEtJMSMwIQYDVQQDExpGcmF1bmhvZmVyIFNlcnZpY2UgQ0Eg
-MjAwNzAeFw0wOTEwMTkxMjU4MzVaFw0xMjEwMTgxMjU4MzVaMFExCzAJBgNVBAYT
-AkRFMRMwEQYDVQQKEwpGcmF1bmhvZmVyMREwDwYDVQQLEwhTZXJ2aWNlczEaMBgG
-A1UEAxMRaWRwLmZyYXVuaG9mZXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDPUzd9s+oAZjXcRndTpxcQWCLnMdzWQxDgJKCcJpIi1Q8sy5fNF1g2
-8OHf265MI8CjVxE+aszRF6gon1EJ2xNB1JHWHIF5WPWXRpZ3eU7rZvD7Yg3Pn9Gx
-AknE/6VG6h9bETLdR83VrH9kNgrba6+Es/xmfBv+YIMNmwit6LG18bolUV2Yck3h
-KvvvjMjrabivBff+QvdbxkqNMJQDOJ/eKvpe9DF24xCdJH0xdAfgFBuLiN3LTW3z
-pN/if2bc5nBIcN6azpdfqAQKPwoQ3tj+kvY+7f7wTjjGgDqd6mYBDptwY5JGUSHP
-r7UVxDHWD2OSIdMc7CwoehroGAQXBnl5AgMBAAGjggJWMIICUjAdBgNVHQ4EFgQU
-Xbfs+lf4eVt4eeEXLUR3IrRQK7MwHwYDVR0jBBgwFoAUOE0MHcR3p7P4Z4bQGFGf
-WJ8eniUwewYDVR0fBHQwcjBwoG6gbIY0aHR0cDovL2NybC5wa2kuZnJhdW5ob2Zl
-ci5kZS9maGctc2VydmljZS1jYS0yMDA3LmNybIY0aHR0cDovL2NybC5mcmF1bmhv
-ZmVyLXBraS5kZS9maGctc2VydmljZS1jYS0yMDA3LmNybDCCARgGCCsGAQUFBwEB
-BIIBCjCCAQYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZXJ0LnBraS5mcmF1bmhvZmVy
-LmRlL2ZoZy1zZXJ2aWNlLWNhLTIwMDcuY2VyMEEGCCsGAQUFBzAChjVodHRwOi8v
-Y2VydC5mcmF1bmhvZmVyLXBraS5kZS9maGctc2VydmljZS1jYS0yMDA3LmNlcjA+
-BggrBgEFBQcwAYYyaHR0cDovL2ZoZy1zZXJ2aWNlLWNhLTIwMDcub2NzcC5wa2ku
-ZnJhdW5ob2Zlci5kZS8wPgYIKwYBBQUHMAGGMmh0dHA6Ly9maGctc2VydmljZS1j
-YS0yMDA3Lm9jc3AuZnJhdW5ob2Zlci1wa2kuZGUvMAwGA1UdEwEB/wQCMAAwDgYD
-VR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMEQGA1UdIAQ9MDswOQYL
-KwYBBAGGClADAQEwKjAoBggrBgEFBQcCARYcaHR0cDovL3BraS5mcmF1bmhvZmVy
-LmRlL2NwLzANBgkqhkiG9w0BAQUFAAOCAQEAFMT1W6HlRwoeSoqZu7LyWqPVAV0P
-8i3Mhv9x0By4hsXpekDivJTjkb8agXEY6180Pxwcw7fzNoNKPZNRxRSSojCFVQ85
-20EPKzuzWchsS+UxtPK9CzdobpzTFFfCsO3RAxOogYD6WvrjfOwsSQ2s3cgrEziy
-WX93W5Ff2rtSxwDqNnIgWOPfbkK5cQ233iSxsDAl1kiqpQbtlVqGo3flLeVbIeDJ
-DGTj0/pCHl9hInA7+4bNWtIWVgU/5yJKe/Tnqhve7CBWtne0sT7P55cgvd4eCPUB
-h+etu2WeqrKmqJBZ6ZSrvDWFkUHg7WprvPK2tGS+aNA3tpCDPdfh6wEoLw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fraunhofer.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fraunhofer.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fraunhofer.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fraunhofer.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.fraunhofer.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fraunhofer.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">fraunhofer.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.fraunhofer.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.fraunhofer.de,OU=Services,O=Fraunhofer,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlzCCBH+gAwIBAgIKItv3iwAAAAAFZjANBgkqhkiG9w0BAQUFADBqMQswCQYD
-VQQGEwJERTETMBEGA1UEChMKRnJhdW5ob2ZlcjEhMB8GA1UECxMYRnJhdW5ob2Zl
-ciBDb3Jwb3JhdGUgUEtJMSMwIQYDVQQDExpGcmF1bmhvZmVyIFNlcnZpY2UgQ0Eg
-MjAwNzAeFw0wOTEwMTkxMjU4MzVaFw0xMjEwMTgxMjU4MzVaMFExCzAJBgNVBAYT
-AkRFMRMwEQYDVQQKEwpGcmF1bmhvZmVyMREwDwYDVQQLEwhTZXJ2aWNlczEaMBgG
-A1UEAxMRaWRwLmZyYXVuaG9mZXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDPUzd9s+oAZjXcRndTpxcQWCLnMdzWQxDgJKCcJpIi1Q8sy5fNF1g2
-8OHf265MI8CjVxE+aszRF6gon1EJ2xNB1JHWHIF5WPWXRpZ3eU7rZvD7Yg3Pn9Gx
-AknE/6VG6h9bETLdR83VrH9kNgrba6+Es/xmfBv+YIMNmwit6LG18bolUV2Yck3h
-KvvvjMjrabivBff+QvdbxkqNMJQDOJ/eKvpe9DF24xCdJH0xdAfgFBuLiN3LTW3z
-pN/if2bc5nBIcN6azpdfqAQKPwoQ3tj+kvY+7f7wTjjGgDqd6mYBDptwY5JGUSHP
-r7UVxDHWD2OSIdMc7CwoehroGAQXBnl5AgMBAAGjggJWMIICUjAdBgNVHQ4EFgQU
-Xbfs+lf4eVt4eeEXLUR3IrRQK7MwHwYDVR0jBBgwFoAUOE0MHcR3p7P4Z4bQGFGf
-WJ8eniUwewYDVR0fBHQwcjBwoG6gbIY0aHR0cDovL2NybC5wa2kuZnJhdW5ob2Zl
-ci5kZS9maGctc2VydmljZS1jYS0yMDA3LmNybIY0aHR0cDovL2NybC5mcmF1bmhv
-ZmVyLXBraS5kZS9maGctc2VydmljZS1jYS0yMDA3LmNybDCCARgGCCsGAQUFBwEB
-BIIBCjCCAQYwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZXJ0LnBraS5mcmF1bmhvZmVy
-LmRlL2ZoZy1zZXJ2aWNlLWNhLTIwMDcuY2VyMEEGCCsGAQUFBzAChjVodHRwOi8v
-Y2VydC5mcmF1bmhvZmVyLXBraS5kZS9maGctc2VydmljZS1jYS0yMDA3LmNlcjA+
-BggrBgEFBQcwAYYyaHR0cDovL2ZoZy1zZXJ2aWNlLWNhLTIwMDcub2NzcC5wa2ku
-ZnJhdW5ob2Zlci5kZS8wPgYIKwYBBQUHMAGGMmh0dHA6Ly9maGctc2VydmljZS1j
-YS0yMDA3Lm9jc3AuZnJhdW5ob2Zlci1wa2kuZGUvMAwGA1UdEwEB/wQCMAAwDgYD
-VR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMEQGA1UdIAQ9MDswOQYL
-KwYBBAGGClADAQEwKjAoBggrBgEFBQcCARYcaHR0cDovL3BraS5mcmF1bmhvZmVy
-LmRlL2NwLzANBgkqhkiG9w0BAQUFAAOCAQEAFMT1W6HlRwoeSoqZu7LyWqPVAV0P
-8i3Mhv9x0By4hsXpekDivJTjkb8agXEY6180Pxwcw7fzNoNKPZNRxRSSojCFVQ85
-20EPKzuzWchsS+UxtPK9CzdobpzTFFfCsO3RAxOogYD6WvrjfOwsSQ2s3cgrEziy
-WX93W5Ff2rtSxwDqNnIgWOPfbkK5cQ233iSxsDAl1kiqpQbtlVqGo3flLeVbIeDJ
-DGTj0/pCHl9hInA7+4bNWtIWVgU/5yJKe/Tnqhve7CBWtne0sT7P55cgvd4eCPUB
-h+etu2WeqrKmqJBZ6ZSrvDWFkUHg7WprvPK2tGS+aNA3tpCDPdfh6wEoLw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fraunhofer.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fraunhofer.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Fraunhofer-Gesellschaft</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Fraunhofer-Gesellschaft</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.fraunhofer.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Björn</GivenName>
-    <SurName>Vollmer</SurName>
-    <EmailAddress>bjoern.vollmer@zv.fraunhofer.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 15a2c5f0..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.fzu.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.fzu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.fzu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.fzu.cas.cz/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">fzu.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.fzu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.fzu.cas.cz: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">Institute of Physics AS CR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Physics AS CR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Fyzikální ústav Akademie věd ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fzu.cz/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.fzu.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 720ae10a..00000000
--- a/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gakunin.nii.ac.jp/idp/shibboleth">
-  <md: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>
-  </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 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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFjCCA/6gAwIBAgIIQvhX//m5bm0wDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
-BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
-dHV0ZSBvZiBJbmZvcm1hdGljczEgMB4GA1UEAxMXTklJIE9wZW4gRG9tYWluIENB
-IC0gRzQwHhcNMTUwMjA0MDgwNzAzWhcNMTcwMzA2MDgwNzAzWjCBqTELMAkGA1UE
-BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
-dHV0ZSBvZiBJbmZvcm1hdGljczE8MDoGA1UECxMzQ3liZXIgU2NpZW5jZSBJbmZy
-YXN0cnVjdHVyZSBEZXZlbG9wbWVudCBEZXBhcnRtZW50MR4wHAYDVQQDExVpZHAu
-Z2FrdW5pbi5uaWkuYWMuanAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDXXwFpWC18sK3XbwBgN5HCYCS79K85nL9v95nVJzQoWrihKuEEMgd6gzo0fjk6
-j6fb3/CZwihxnzMExyhadH6zC84Q92B7riSpv+gABvJW6no5js9gmDUqkyUG9qaS
-QSQtqNv/RKsuCRW79xeiYZnCMFvUEXiOQ4zFFAZX00ywz9jxWP7E56yAKHyLBgNl
-ZFGTKAFH0W35831dWlj3HsU0sbpoBiSrWSXvx7lJefifK5vqQc7tuDSx0kRa/aqT
-7fb6cq8EQURzdcuQnIFaUaKRggeV1VOBk7fMNuL6dSz0zFRtnS+bBZbJ+1GQJ/0+
-HatU3vCzfpuuLy/C9AHIUOQ9AgMBAAGjggF7MIIBdzAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUGQtvOR8xAzRf5NJAHzfmjediOXww
-SgYDVR0fBEMwQTA/oD2gO4Y5aHR0cDovL3JlcG8xLnNlY29tdHJ1c3QubmV0L3Nw
-cGNhL25paS9vZGNhMy9mdWxsY3JsZzQuY3JsMA4GA1UdDwEB/wQEAwIFoDAdBgNV
-HQ4EFgQUXtG5Fo87Sb3QyTZYKnEj9dGy1QwwWgYDVR0gBFMwUTBPBgwrBgEEAYH8
-CAMCAQEwPzA9BggrBgEFBQcCARYxaHR0cHM6Ly9yZXBvMS5zZWNvbXRydXN0Lm5l
-dC9zcGNwcC9jcHMvaW5kZXguaHRtbDA8BggrBgEFBQcBAQQwMC4wLAYIKwYBBQUH
-MAGGIGh0dHA6Ly9uaWlnNC5vY3NwLnNlY29tdHJ1c3QubmV0MCAGA1UdEQQZMBeC
-FWlkcC5nYWt1bmluLm5paS5hYy5qcDANBgkqhkiG9w0BAQsFAAOCAQEAIu3RKglN
-OD7MqWIlsOAMu+DuNRUgp7pb378ZWIAUjl8EkTrQxEPkkoLhq9DW5lgzL7ZnLEyf
-/abCfJrFtgkGEDg9y1iT0RsDa0vpnC6wzaGcC3U0dgOW+R3SHqrXtMl+Rj/bbOCW
-0BWHGatck3VuOAc88RcDREd56JCg/wSdUYjYFpmnlqHgg7a99v0AEVS4KK1vZE+u
-MpBaL5qG7KNpHy8CCU1wNjs1HOcwgHGs9KSxbNGjANe9zaaO8MjjTtWbLIOGKhmb
-VUx4Q0xL6Qh+DGRS32KKmGkY8/7O/mdjT1O7rFqFgDgZJSThq5fnDpZm1vIoOPJh
-w7tfpr+kkFoj6Q==</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.gakunin.nii.ac.jp/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gakunin.nii.ac.jp/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gakunin.nii.ac.jp/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">gakunin.nii.ac.jp</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFjCCA/6gAwIBAgIIQvhX//m5bm0wDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
-BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
-dHV0ZSBvZiBJbmZvcm1hdGljczEgMB4GA1UEAxMXTklJIE9wZW4gRG9tYWluIENB
-IC0gRzQwHhcNMTUwMjA0MDgwNzAzWhcNMTcwMzA2MDgwNzAzWjCBqTELMAkGA1UE
-BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
-dHV0ZSBvZiBJbmZvcm1hdGljczE8MDoGA1UECxMzQ3liZXIgU2NpZW5jZSBJbmZy
-YXN0cnVjdHVyZSBEZXZlbG9wbWVudCBEZXBhcnRtZW50MR4wHAYDVQQDExVpZHAu
-Z2FrdW5pbi5uaWkuYWMuanAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDXXwFpWC18sK3XbwBgN5HCYCS79K85nL9v95nVJzQoWrihKuEEMgd6gzo0fjk6
-j6fb3/CZwihxnzMExyhadH6zC84Q92B7riSpv+gABvJW6no5js9gmDUqkyUG9qaS
-QSQtqNv/RKsuCRW79xeiYZnCMFvUEXiOQ4zFFAZX00ywz9jxWP7E56yAKHyLBgNl
-ZFGTKAFH0W35831dWlj3HsU0sbpoBiSrWSXvx7lJefifK5vqQc7tuDSx0kRa/aqT
-7fb6cq8EQURzdcuQnIFaUaKRggeV1VOBk7fMNuL6dSz0zFRtnS+bBZbJ+1GQJ/0+
-HatU3vCzfpuuLy/C9AHIUOQ9AgMBAAGjggF7MIIBdzAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUGQtvOR8xAzRf5NJAHzfmjediOXww
-SgYDVR0fBEMwQTA/oD2gO4Y5aHR0cDovL3JlcG8xLnNlY29tdHJ1c3QubmV0L3Nw
-cGNhL25paS9vZGNhMy9mdWxsY3JsZzQuY3JsMA4GA1UdDwEB/wQEAwIFoDAdBgNV
-HQ4EFgQUXtG5Fo87Sb3QyTZYKnEj9dGy1QwwWgYDVR0gBFMwUTBPBgwrBgEEAYH8
-CAMCAQEwPzA9BggrBgEFBQcCARYxaHR0cHM6Ly9yZXBvMS5zZWNvbXRydXN0Lm5l
-dC9zcGNwcC9jcHMvaW5kZXguaHRtbDA8BggrBgEFBQcBAQQwMC4wLAYIKwYBBQUH
-MAGGIGh0dHA6Ly9uaWlnNC5vY3NwLnNlY29tdHJ1c3QubmV0MCAGA1UdEQQZMBeC
-FWlkcC5nYWt1bmluLm5paS5hYy5qcDANBgkqhkiG9w0BAQsFAAOCAQEAIu3RKglN
-OD7MqWIlsOAMu+DuNRUgp7pb378ZWIAUjl8EkTrQxEPkkoLhq9DW5lgzL7ZnLEyf
-/abCfJrFtgkGEDg9y1iT0RsDa0vpnC6wzaGcC3U0dgOW+R3SHqrXtMl+Rj/bbOCW
-0BWHGatck3VuOAc88RcDREd56JCg/wSdUYjYFpmnlqHgg7a99v0AEVS4KK1vZE+u
-MpBaL5qG7KNpHy8CCU1wNjs1HOcwgHGs9KSxbNGjANe9zaaO8MjjTtWbLIOGKhmb
-VUx4Q0xL6Qh+DGRS32KKmGkY8/7O/mdjT1O7rFqFgDgZJSThq5fnDpZm1vIoOPJh
-w7tfpr+kkFoj6Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gakunin.nii.ac.jp: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">National Institute of Informatics</md:OrganizationName>
-    <md:OrganizationName xml:lang="ja">国立情報学研究所</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GakuNin IdP</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="ja">学認IdP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.gakunin.jp/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>GakuNin Office</md:GivenName>
-    <md:EmailAddress>mailto:gakunin-help@nii.ac.jp</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
deleted file mode 100644
index 94b5f0b8..00000000
--- a/swamid-interfederations-2.0/idp.gallaudet.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +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://idp.gallaudet.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.gallaudet.edu/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">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gallaudet.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Gallaudet University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Gallaudet University IDP</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>
-MIIFWzCCBEOgAwIBAgIQcxLz64WSGpB5dcmeJhykXTANBgkqhkiG9w0BAQUFADBR
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNv
-bW1vbjEbMBkGA1UEAxMSSW5Db21tb24gU2VydmVyIENBMB4XDTEzMDMyNjAwMDAw
-MFoXDTE2MDMyNTIzNTk1OVowgcUxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUyMDAw
-MjELMAkGA1UECBMCREMxEzARBgNVBAcTCldhc2hpbmd0b24xGzAZBgNVBAkTEjgw
-MCBGbG9yaWRhIEF2ZSBORTEdMBsGA1UEChMUR2FsbGF1ZGV0IFVuaXZlcnNpdHkx
-LDAqBgNVBAsTI0dUUyAtIEdhbGxhdWRldCBUZWNobm9sb2d5IFNlcnZpY2VzMRow
-GAYDVQQDExFpZHAuZ2FsbGF1ZGV0LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANfcspLsGM55hXwOdOmwYne/M2rZ+7rqKtMoDjUNZARc+oTEK3Nf
-w0nPXN6d6vIlemEB/kvC3HAZy6zcUTrFpDYNPjqqI6eGfprOXO3VSXm0bLBeWNGX
-Ak9ccgpcGXBxNtJTQMuv6HEBOpiCbd7/eBDRG14yPb4ydUX1DbXez4uAP65b2nRz
-X4THs9bveQbUcBks+pl8PfPZCPv1ahxyodIR2eF2YsebJHphSkX6ivX0BVslk384
-/jUR3KM4efP2kG2p56BYlpp3D0KG5EG9LKFhHxq/3YUhVhqnVkeGl4XPIpOBzZlO
-ttep/75p1yjktaBfmhd5WMW7uIKyBySrqskCAwEAAaOCAbgwggG0MB8GA1UdIwQY
-MBaAFEhPWvovSppe4FDza3tVpd71vjRdMB0GA1UdDgQWBBRCk3Cnk79hmYIoCVhI
-V4MOg8l9dzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEw
-QjBABggrBgEFBQcCARY0aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVw
-b3NpdG9yeS9jcHNfc3NsLnBkZjAIBgZngQwBAgIwPQYDVR0fBDYwNDAyoDCgLoYs
-aHR0cDovL2NybC5pbmNvbW1vbi5vcmcvSW5Db21tb25TZXJ2ZXJDQS5jcmwwbwYI
-KwYBBQUHAQEEYzBhMDkGCCsGAQUFBzAChi1odHRwOi8vY2VydC5pbmNvbW1vbi5v
-cmcvSW5Db21tb25TZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
-LmluY29tbW9uLm9yZzAcBgNVHREEFTATghFpZHAuZ2FsbGF1ZGV0LmVkdTANBgkq
-hkiG9w0BAQUFAAOCAQEABGCKCRVS1KcSMAgYOQPwruCoVdNxKEEaqbeKhWiC1k5y
-flJQw1fb2jzHFVg4YoI9A3KL3MrCxDMYq+ROhDS3f4aEEwMpSKSeNw/1riqBLtqn
-YSa9mY7Q+QHQxus8ZZceNn8zyI1xuK7TG83ZsOf75S4uPnlekaqHldC9QWPsGc8p
-nEEexraMIjgeDTEHxKOjGMLpIRdS20PTiXg5kDPdi60x39q/E0wY+oiwgmhKslwZ
-T3fg7+A8alM88HA16P2N/y7IKythkrPB87EkNQHfzXWJNhFLx/EnezW/aFj672YS
-+YG4S3bQoO1MSjlD3J5g6MTHmxlO9w8+rppgNEi6PQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gallaudet.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gallaudet.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gallaudet.edu:443/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gallaudet.edu:443/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gallaudet.edu:443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gallaudet.edu/idp/profile/Shibboleth/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">gallaudet.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFWzCCBEOgAwIBAgIQcxLz64WSGpB5dcmeJhykXTANBgkqhkiG9w0BAQUFADBR
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNv
-bW1vbjEbMBkGA1UEAxMSSW5Db21tb24gU2VydmVyIENBMB4XDTEzMDMyNjAwMDAw
-MFoXDTE2MDMyNTIzNTk1OVowgcUxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUyMDAw
-MjELMAkGA1UECBMCREMxEzARBgNVBAcTCldhc2hpbmd0b24xGzAZBgNVBAkTEjgw
-MCBGbG9yaWRhIEF2ZSBORTEdMBsGA1UEChMUR2FsbGF1ZGV0IFVuaXZlcnNpdHkx
-LDAqBgNVBAsTI0dUUyAtIEdhbGxhdWRldCBUZWNobm9sb2d5IFNlcnZpY2VzMRow
-GAYDVQQDExFpZHAuZ2FsbGF1ZGV0LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANfcspLsGM55hXwOdOmwYne/M2rZ+7rqKtMoDjUNZARc+oTEK3Nf
-w0nPXN6d6vIlemEB/kvC3HAZy6zcUTrFpDYNPjqqI6eGfprOXO3VSXm0bLBeWNGX
-Ak9ccgpcGXBxNtJTQMuv6HEBOpiCbd7/eBDRG14yPb4ydUX1DbXez4uAP65b2nRz
-X4THs9bveQbUcBks+pl8PfPZCPv1ahxyodIR2eF2YsebJHphSkX6ivX0BVslk384
-/jUR3KM4efP2kG2p56BYlpp3D0KG5EG9LKFhHxq/3YUhVhqnVkeGl4XPIpOBzZlO
-ttep/75p1yjktaBfmhd5WMW7uIKyBySrqskCAwEAAaOCAbgwggG0MB8GA1UdIwQY
-MBaAFEhPWvovSppe4FDza3tVpd71vjRdMB0GA1UdDgQWBBRCk3Cnk79hmYIoCVhI
-V4MOg8l9dzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEw
-QjBABggrBgEFBQcCARY0aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVw
-b3NpdG9yeS9jcHNfc3NsLnBkZjAIBgZngQwBAgIwPQYDVR0fBDYwNDAyoDCgLoYs
-aHR0cDovL2NybC5pbmNvbW1vbi5vcmcvSW5Db21tb25TZXJ2ZXJDQS5jcmwwbwYI
-KwYBBQUHAQEEYzBhMDkGCCsGAQUFBzAChi1odHRwOi8vY2VydC5pbmNvbW1vbi5v
-cmcvSW5Db21tb25TZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
-LmluY29tbW9uLm9yZzAcBgNVHREEFTATghFpZHAuZ2FsbGF1ZGV0LmVkdTANBgkq
-hkiG9w0BAQUFAAOCAQEABGCKCRVS1KcSMAgYOQPwruCoVdNxKEEaqbeKhWiC1k5y
-flJQw1fb2jzHFVg4YoI9A3KL3MrCxDMYq+ROhDS3f4aEEwMpSKSeNw/1riqBLtqn
-YSa9mY7Q+QHQxus8ZZceNn8zyI1xuK7TG83ZsOf75S4uPnlekaqHldC9QWPsGc8p
-nEEexraMIjgeDTEHxKOjGMLpIRdS20PTiXg5kDPdi60x39q/E0wY+oiwgmhKslwZ
-T3fg7+A8alM88HA16P2N/y7IKythkrPB87EkNQHfzXWJNhFLx/EnezW/aFj672YS
-+YG4S3bQoO1MSjlD3J5g6MTHmxlO9w8+rppgNEi6PQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gallaudet.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gallaudet.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Gallaudet University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Gallaudet University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gallaudet.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Earl Parks</md:GivenName>
-    <md:EmailAddress>earl.parks@gallaudet.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Hatim Vali</md:GivenName>
-    <md:EmailAddress>hatim.vali@gallaudet.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Mohib</md:GivenName>
-    <md:EmailAddress>mohib@gluu.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gatech.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gatech.edu-idp-shibboleth.xml
deleted file mode 100644
index 1856baa3..00000000
--- a/swamid-interfederations-2.0/idp.gatech.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,96 +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://idp.gatech.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">gatech.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Georgia Institute of Technology</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>
-MIIDJDCCAgygAwIBAgIVAJeYp1xfzkkooZfwaJ6PLVzxpUOYMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5nYXRlY2guZWR1MB4XDTEwMDcxOTE5MDQwMloX
-DTMwMDcxOTE5MDQwMlowGTEXMBUGA1UEAxMOaWRwLmdhdGVjaC5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeLDQlcxJ84qjwccY08hQH4Ul0ltFh
-uR4Tre62YRv7QgpGYXSoholvpXtL6lnF6FWA//5wZ6QHz0FZUdqlYSZDI4Fzigq1
-yKiHDWPOpfPduf3ReYJ4BVl9tr+6tfKTeCPLcNJrEIF+1TzgzVuaRaSZPCOTnP1E
-JQCcDfbs8Owao8nffQ/NMG2PzRNyHZRxeEDHWGu02vZmt/gx4WxUN3TQ2LNLI9EJ
-D/8SQVTy8mOrMc8ekkbtG9eGwpIu9LIzXGdUNeusnwd1LI77l5uD7AECF9hx9RXV
-1Xh+OBgzPH/4OtspSrp6+KbU/ldBfnklvmB2g5fToyx+tZ6JU99OrcHnAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5nYXRlY2guZWR1hiVodHRwczovL2lkcC5nYXRl
-Y2guZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSVrddxm1Erocf++nxW4r7n
-IlLNtTANBgkqhkiG9w0BAQUFAAOCAQEATvnnmmviZyKiXFXY26jsK/wIrubtsJxY
-ziJF27fEzTI4E5Wa1JgEhwlQXmchoMuVOleZ0rWaVd5YLiUz64qN+fy3HLAYumwH
-saadGj7tAwIYMH6AGeRmFcXFFENFNPJpnFrAcNwwpTWlopb1/tEH3a97WH94u1of
-R3Zj5VQNnX1b9qEo4rttcogIWcvyJd2vaFfeWgQs+RR2tRE5gibvxxGssjCrf1yV
-OtgZkTz+hoiGXSRnHFjmp/H6Bh27Vgx8sNTKIFffNZ4wNH7efgV5V3mib57YL050
-mFIG3ks+6YbZokQ+i6nzRLwk9JxbsVJl1tzraBmxUNWT+HtiNJ6fzw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gatech.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gatech.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gatech.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gatech.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gatech.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gatech.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJeYp1xfzkkooZfwaJ6PLVzxpUOYMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5nYXRlY2guZWR1MB4XDTEwMDcxOTE5MDQwMloX
-DTMwMDcxOTE5MDQwMlowGTEXMBUGA1UEAxMOaWRwLmdhdGVjaC5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeLDQlcxJ84qjwccY08hQH4Ul0ltFh
-uR4Tre62YRv7QgpGYXSoholvpXtL6lnF6FWA//5wZ6QHz0FZUdqlYSZDI4Fzigq1
-yKiHDWPOpfPduf3ReYJ4BVl9tr+6tfKTeCPLcNJrEIF+1TzgzVuaRaSZPCOTnP1E
-JQCcDfbs8Owao8nffQ/NMG2PzRNyHZRxeEDHWGu02vZmt/gx4WxUN3TQ2LNLI9EJ
-D/8SQVTy8mOrMc8ekkbtG9eGwpIu9LIzXGdUNeusnwd1LI77l5uD7AECF9hx9RXV
-1Xh+OBgzPH/4OtspSrp6+KbU/ldBfnklvmB2g5fToyx+tZ6JU99OrcHnAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5nYXRlY2guZWR1hiVodHRwczovL2lkcC5nYXRl
-Y2guZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSVrddxm1Erocf++nxW4r7n
-IlLNtTANBgkqhkiG9w0BAQUFAAOCAQEATvnnmmviZyKiXFXY26jsK/wIrubtsJxY
-ziJF27fEzTI4E5Wa1JgEhwlQXmchoMuVOleZ0rWaVd5YLiUz64qN+fy3HLAYumwH
-saadGj7tAwIYMH6AGeRmFcXFFENFNPJpnFrAcNwwpTWlopb1/tEH3a97WH94u1of
-R3Zj5VQNnX1b9qEo4rttcogIWcvyJd2vaFfeWgQs+RR2tRE5gibvxxGssjCrf1yV
-OtgZkTz+hoiGXSRnHFjmp/H6Bh27Vgx8sNTKIFffNZ4wNH7efgV5V3mib57YL050
-mFIG3ks+6YbZokQ+i6nzRLwk9JxbsVJl1tzraBmxUNWT+HtiNJ6fzw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gatech.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Georgia Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Georgia Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gatech.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Eric Buckhalt</md:GivenName>
-    <md:EmailAddress>eric.buckhalt@oit.gatech.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Robert Viduya</md:GivenName>
-    <md:EmailAddress>robert.viduya@oit.gatech.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gateshead.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.gateshead.ac.uk-shibboleth.xml
deleted file mode 100644
index a054426c..00000000
--- a/swamid-interfederations-2.0/idp.gateshead.ac.uk-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.gateshead.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Gateshead College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">gateshead.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/gateshead.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/gateshead.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Gateshead College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gateshead.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.geo-zs.si-idp-20110325.xml b/swamid-interfederations-2.0/idp.geo-zs.si-idp-20110325.xml
deleted file mode 100644
index ee6807dd..00000000
--- a/swamid-interfederations-2.0/idp.geo-zs.si-idp-20110325.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.geo-zs.si/idp/20110325">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-07T14:11:09Z">
-      <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 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">geo-zs.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Gological Survey of Slovenia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Geološki zavod Slovenije</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization Gological Survey of Slovenia</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Geološki zavod Slovenije</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization Gological Survey of Slovenia</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Geološki zavod Slovenije</mdui:Keywords>
-        <mdui:Logo height="150" width="129">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.geo-zs.si/eng/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.geo-zs.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>MIIFljCCA36gAwIBAgIGElFy1KcxMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExQDA+BgNVBAMMN0dlb2xvc2tpIHphdm9kIFNsb3ZlbmlqZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMDI4MjA1NzQwWhcNMzQwNzE1MjA1NzQwWjBjMQswCQYDVQQGEwJTSTESMBAGA1UEBwwJTGp1YmxqYW5hMUAwPgYDVQQDDDdHZW9sb3NraSB6YXZvZCBTbG92ZW5pamUsIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAs4icY7e4QJ3C3daJA2b6m0WJbQ0HebtKR0wXYukm/xxJPDGmUf92eCVljnQVJyvMcDuSCzttELGX8ro/bEjlmAyGWMrqknIPKaZT+oeLIVRf71XOA55D8HapOrBUW/2hWYThBhzbrnW3Q4aKCAofJyU5DLg07iPXtxWnAAIvXSxaNNcI1PNZbK4wNPaCpgRCFhjf8PSyd2ybXkPFYwHtxHFMG2MgSo9a6gsEPMfnbkMNSZI17mc+BhCLAc42E3Vix5IzzLB2zweFmzATs57ZiTfQXNlaOS+EYYkpjRwhmcNUPxIaTrgXkPU6ZSkERFkLZIofpCnxZd9/vJmnYXgJEt2Yazhnbx3XgQ4ISoLRQyf58Tq0FVydOqZmFCoy6WJ/NRwka66vDYmA1Ii6E4uSx0SahueQUkFL9ADB1IdIx7RO597yr+KxJP0ygoEnlABMKLkbtR+iK9f6ZgxKNMPVV3Cn5n1QSl7YNsxDbUrCj31Xxx6Hq9jM2/PbsHHx5DYViumuvxKJIbDj9W5iR8uiNJwn5KHu2+VGZSmmOsrN01u4Cw7oemhrNjDYJMLx6DFMB13C9WE7K53AD6ZgNQIXBC66Gjk6PCou1gy2O9F4OaiNKhxvJv/2C+H0Ik/4ixnzQuDhKufYN32QqDDTYPnhG/vnClpc91Sijzm93wLVOpsCAwEAAaNQME4wHQYDVR0OBBYEFNffgevYxBGO5L1E0BUspXFrWK+jMB8GA1UdIwQYMBaAFNffgevYxBGO5L1E0BUspXFrWK+jMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAEmvLJpxYwz3xweIDSoQAv6DgWptBrxmhq2CPpmzKfnnB2w1pNVpYLKMuA/WMcA5p3KUSf0UG2ALdBlS2g2wjPEqFCmOh6xcFzt35dzEJZXXdzw8yCufQ2TQx4SG0/AxBTBUqVFt7rVcDuIPCGx1CHLoaSONilrty6XCalXdWl5zjxa29TZRQhyTswyAWZkEdpGobTbNXOpXYzId0kff5sWJc/DvZ2tz4cbyy8mZ7JxXz/4KijUTrrsFrXLMo7wwDnO+NH5NBJCD3NFw+ctB7OBlOK30LnLH9T+IqXKGiII9w/fiY6l2nGS3DHK0wiwncFDg2W8kcsXCtLtwn9DF0qVHYFFrZ5ndcXRPKpFEHv6NhDt1ZoLV6VdZ6CVtmvDFroRCnuaJcUUpgraM56NIjtMDWTZSWqBTWfBStlfRTXcW5dkxUyqLICtpZcYYe7WOjaQdiYmhR/te1tsc7SXaB8a2R7sfJvi12rTv6ZgnIP5jVqD/u68xJ8S/T8t1OnC6X+0MLvP3uX/S/LkYi+mlhrxqcW+x2p7RJBaPvAJOxgF+OvTxR/uU2JxN8q64wE/1ySkh/tNqAZ9y47IoKTbCmAJ/1EPBv5HjYHATFMYJXREkRvXOunHeTg9mMMfGU2KWMSVJo8wntFzKKHC252gFI50XaLDGH4JdneO3Vy4wMu5U</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>MIIFljCCA36gAwIBAgIGElFy1KcxMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExQDA+BgNVBAMMN0dlb2xvc2tpIHphdm9kIFNsb3ZlbmlqZSwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMDI4MjA1NzQwWhcNMzQwNzE1MjA1NzQwWjBjMQswCQYDVQQGEwJTSTESMBAGA1UEBwwJTGp1YmxqYW5hMUAwPgYDVQQDDDdHZW9sb3NraSB6YXZvZCBTbG92ZW5pamUsIHByaWphdm5pIHN0cmV6bmlrIHphIEFybmVzQUFJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAs4icY7e4QJ3C3daJA2b6m0WJbQ0HebtKR0wXYukm/xxJPDGmUf92eCVljnQVJyvMcDuSCzttELGX8ro/bEjlmAyGWMrqknIPKaZT+oeLIVRf71XOA55D8HapOrBUW/2hWYThBhzbrnW3Q4aKCAofJyU5DLg07iPXtxWnAAIvXSxaNNcI1PNZbK4wNPaCpgRCFhjf8PSyd2ybXkPFYwHtxHFMG2MgSo9a6gsEPMfnbkMNSZI17mc+BhCLAc42E3Vix5IzzLB2zweFmzATs57ZiTfQXNlaOS+EYYkpjRwhmcNUPxIaTrgXkPU6ZSkERFkLZIofpCnxZd9/vJmnYXgJEt2Yazhnbx3XgQ4ISoLRQyf58Tq0FVydOqZmFCoy6WJ/NRwka66vDYmA1Ii6E4uSx0SahueQUkFL9ADB1IdIx7RO597yr+KxJP0ygoEnlABMKLkbtR+iK9f6ZgxKNMPVV3Cn5n1QSl7YNsxDbUrCj31Xxx6Hq9jM2/PbsHHx5DYViumuvxKJIbDj9W5iR8uiNJwn5KHu2+VGZSmmOsrN01u4Cw7oemhrNjDYJMLx6DFMB13C9WE7K53AD6ZgNQIXBC66Gjk6PCou1gy2O9F4OaiNKhxvJv/2C+H0Ik/4ixnzQuDhKufYN32QqDDTYPnhG/vnClpc91Sijzm93wLVOpsCAwEAAaNQME4wHQYDVR0OBBYEFNffgevYxBGO5L1E0BUspXFrWK+jMB8GA1UdIwQYMBaAFNffgevYxBGO5L1E0BUspXFrWK+jMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggIBAEmvLJpxYwz3xweIDSoQAv6DgWptBrxmhq2CPpmzKfnnB2w1pNVpYLKMuA/WMcA5p3KUSf0UG2ALdBlS2g2wjPEqFCmOh6xcFzt35dzEJZXXdzw8yCufQ2TQx4SG0/AxBTBUqVFt7rVcDuIPCGx1CHLoaSONilrty6XCalXdWl5zjxa29TZRQhyTswyAWZkEdpGobTbNXOpXYzId0kff5sWJc/DvZ2tz4cbyy8mZ7JxXz/4KijUTrrsFrXLMo7wwDnO+NH5NBJCD3NFw+ctB7OBlOK30LnLH9T+IqXKGiII9w/fiY6l2nGS3DHK0wiwncFDg2W8kcsXCtLtwn9DF0qVHYFFrZ5ndcXRPKpFEHv6NhDt1ZoLV6VdZ6CVtmvDFroRCnuaJcUUpgraM56NIjtMDWTZSWqBTWfBStlfRTXcW5dkxUyqLICtpZcYYe7WOjaQdiYmhR/te1tsc7SXaB8a2R7sfJvi12rTv6ZgnIP5jVqD/u68xJ8S/T8t1OnC6X+0MLvP3uX/S/LkYi+mlhrxqcW+x2p7RJBaPvAJOxgF+OvTxR/uU2JxN8q64wE/1ySkh/tNqAZ9y47IoKTbCmAJ/1EPBv5HjYHATFMYJXREkRvXOunHeTg9mMMfGU2KWMSVJo8wntFzKKHC252gFI50XaLDGH4JdneO3Vy4wMu5U</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.geo-zs.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.geo-zs.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Geološki zavod Slovenije</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Geološki zavod Slovenije</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Geološki zavod Slovenije</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Geološki zavod Slovenije</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.geo-zs.si/eng/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.geo-zs.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Marko</md:GivenName>
-    <md:SurName>Komac</md:SurName>
-    <md:EmailAddress>mailto:marko.komac@geo-zs.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@geo-zs.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mitja</md:GivenName>
-    <md:SurName>Požar</md:SurName>
-    <md:EmailAddress>mailto:mitja.pozar@geo-zs.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jasna</md:GivenName>
-    <md:SurName>Sinigoj</md:SurName>
-    <md:EmailAddress>mailto:jasna.sinigoj@geo-zs.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jasna</md:GivenName>
-    <md:SurName>Šinigoj</md:SurName>
-    <md:EmailAddress>mailto:jasna.sinigoj@geo-zs.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.george-monoux.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.george-monoux.ac.uk-shibboleth.xml
deleted file mode 100644
index 4c14dbaf..00000000
--- a/swamid-interfederations-2.0/idp.george-monoux.ac.uk-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.george-monoux.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Sir George Monoux College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">george-monoux.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/george-monoux.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/george-monoux.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sir George Monoux College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.george-monoux.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</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 003d5042..00000000
--- a/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.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.georgikon.hu/idp/saml2/idp/metadata.php">
-  <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="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>georgikon</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-test</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>href-idps</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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">
-        <mdui:DisplayName xml:lang="hu">Georgikon - Pannon Egyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Georgikon - University of Pannonia</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Pannon Egyetem Georgikon Kar</mdui:Description>
-        <mdui:Description xml:lang="en">University of Pannonia Georgikon Faculty</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">georgikon.hu</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.georgikon.hu/idp/saml2/idp/SingleLogoutService.php"/>
-    <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.georgikon.hu/idp/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">Georgikon Keszthely</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Pannonia Georgikon Faculty of Agriculture</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">Georgikon Keszthely</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Pannonia Georgikon Faculty of Agriculture</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.georgikon.hu/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.georgikon.hu/English/folap.aspx</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Héder Miklós</md:SurName>
-    <md:EmailAddress>mailto:heder@georgikon.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Héder Miklós</md:SurName>
-    <md:EmailAddress>mailto:heder@georgikon.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Héder Miklós</md:SurName>
-    <md:EmailAddress>mailto:heder@georgikon.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 4e861d97..00000000
--- a/swamid-interfederations-2.0/idp.georgikon.hu.xml
+++ /dev/null
@@ -1,52 +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>
-    </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.gla.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.gla.ac.uk-shibboleth.xml
deleted file mode 100644
index d500d86f..00000000
--- a/swamid-interfederations-2.0/idp.gla.ac.uk-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" entityID="https://idp.gla.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Glasgow.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-09-19T15:05: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">gla.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Glasgow</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://milngavie.cent.gla.ac.uk/UoG_colour_80x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://milngavie.cent.gla.ac.uk/UoG_colour_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>130.209.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>gla.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:55.8719,4.2875</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIJALu/c0dZr5HvMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGG1pbG5nYXZpZS5jZW50LmdsYS5hYy51azAeFw0xNTA3MDgwOTMwMDRaFw0y
-						NTA3MDUwOTMwMDRaMCMxITAfBgNVBAMTGG1pbG5nYXZpZS5jZW50LmdsYS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCmMFy3+cEAbb32fmt1
-						KKDupzffR58n1wxNVxVl6pOvaoLAQMpNL0bmZ+tVQFyNwqrMf9fWqcGgOks8q3PL
-						AJfgki/J8Aee9ZmYmJjcTHA6C1SPGG7CyUHoea1CWuhOWPl9zI2AhfCZlse57CuL
-						WBkMnK+cTZ2wV3UXnUYf6UqsFsD76l+/twGitqyyBO1HDS/r26jhRz0kdxYUaP1q
-						5TKqgbGcfGsBFVek9CuRCb6scDxEqwRT2g5ilktBoMLQ8CUlZ/By5t4Iq7juoWw3
-						zcMxD3QOkenQSBakYWTHpuxMzloJLnZq/7tKKq8EtHLlWFTOELvE75Naco7vsdxH
-						+3sCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
-						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFL36+xUfcTRDzqjdEkeBHLK3
-						nLjIMB8GA1UdIwQYMBaAFL36+xUfcTRDzqjdEkeBHLK3nLjIMA0GCSqGSIb3DQEB
-						BQUAA4IBAQAm2mIyoqYsTh+xG2JM1JMBh9XYHcv3an0m1hJKr9LBpUsGF0z4LZOT
-						UspSvK/uCMrjM7+Ga1PyAzd0MZsH/QCSYIlA7MtDSneWkOkib2pxMygxBSyMkxKo
-						1+OKUrSrnqNFZSYyQe82L4wGet3UibP82tQJNAr15f3KCy0p5C7adRLWxDyoIjit
-						HVKZLW3laxlBiiUBLY3jmaeZ0biLM3KIFgDSL2M1aBDHqquexHoZst4EQXpam9aI
-						RlkVhC02pga9ohbCFw4Hv0ZfqMvRxDS5J+KsZpudx17DXrPjkBxTHWtZ02t/WOyS
-						37U4ys02cmPuuNCVlsTarDiF2R1ZNCMt
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://milngavie.cent.gla.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://milngavie.cent.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://milngavie.cent.gla.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://milngavie.cent.gla.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://milngavie.cent.gla.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://milngavie.cent.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">gla.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIJALu/c0dZr5HvMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGG1pbG5nYXZpZS5jZW50LmdsYS5hYy51azAeFw0xNTA3MDgwOTMwMDRaFw0y
-						NTA3MDUwOTMwMDRaMCMxITAfBgNVBAMTGG1pbG5nYXZpZS5jZW50LmdsYS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCmMFy3+cEAbb32fmt1
-						KKDupzffR58n1wxNVxVl6pOvaoLAQMpNL0bmZ+tVQFyNwqrMf9fWqcGgOks8q3PL
-						AJfgki/J8Aee9ZmYmJjcTHA6C1SPGG7CyUHoea1CWuhOWPl9zI2AhfCZlse57CuL
-						WBkMnK+cTZ2wV3UXnUYf6UqsFsD76l+/twGitqyyBO1HDS/r26jhRz0kdxYUaP1q
-						5TKqgbGcfGsBFVek9CuRCb6scDxEqwRT2g5ilktBoMLQ8CUlZ/By5t4Iq7juoWw3
-						zcMxD3QOkenQSBakYWTHpuxMzloJLnZq/7tKKq8EtHLlWFTOELvE75Naco7vsdxH
-						+3sCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
-						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFL36+xUfcTRDzqjdEkeBHLK3
-						nLjIMB8GA1UdIwQYMBaAFL36+xUfcTRDzqjdEkeBHLK3nLjIMA0GCSqGSIb3DQEB
-						BQUAA4IBAQAm2mIyoqYsTh+xG2JM1JMBh9XYHcv3an0m1hJKr9LBpUsGF0z4LZOT
-						UspSvK/uCMrjM7+Ga1PyAzd0MZsH/QCSYIlA7MtDSneWkOkib2pxMygxBSyMkxKo
-						1+OKUrSrnqNFZSYyQe82L4wGet3UibP82tQJNAr15f3KCy0p5C7adRLWxDyoIjit
-						HVKZLW3laxlBiiUBLY3jmaeZ0biLM3KIFgDSL2M1aBDHqquexHoZst4EQXpam9aI
-						RlkVhC02pga9ohbCFw4Hv0ZfqMvRxDS5J+KsZpudx17DXrPjkBxTHWtZ02t/WOyS
-						37U4ys02cmPuuNCVlsTarDiF2R1ZNCMt
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://milngavie.cent.gla.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://milngavie.cent.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">University of Glasgow</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gla.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>User Support</GivenName>
-    <EmailAddress>mailto:helpdesk@it.gla.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:d.anderson@compserv.gla.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.xml
deleted file mode 100644
index 805ba579..00000000
--- a/swamid-interfederations-2.0/idp.glasgowkelvin.ac.uk-openathens.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.glasgowkelvin.ac.uk/openathens">
-  <!--
-		This is an OpenAthens LA IdP for Glasgow Kelvin College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-22T14:18:15Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">glasgowkelvin.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Glasgow Kelvin College</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWDCCAkCgAwIBAgIIEcxlhYHW7FYwDQYJKoZIhvcNAQEFBQAwQzEfMB0GA1UE
-						CgwWR2xhc2dvdyBLZWx2aW4gQ29sbGVnZTEgMB4GA1UEAwwXaWRwLmdsYXNnb3dr
-						ZWx2aW4uYWMudWswHhcNMTQwODI5MTMyODUyWhcNMjQwODI5MTMyODUyWjBDMR8w
-						HQYDVQQKDBZHbGFzZ293IEtlbHZpbiBDb2xsZWdlMSAwHgYDVQQDDBdpZHAuZ2xh
-						c2dvd2tlbHZpbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AOxm3dLSX+UNx+aVR24NNhE03L/lpOpLPxU+COARq2kuD8AGv6OxUWt0tdDYskJp
-						SwMQRQmqP2R32ulYMQBeeD0e+Kale+b9uX/Zkut8PohQZeSkCMpV0lEmkK07ivOB
-						Mh6FiViWZ0XWAQ/6RfnSC/9L+PJcqpRkAwr0qkGo7k2eaE7ffIhZY7ImKVAiPS7r
-						YAgZPCiWHtC8eN6+h9kJJo7FyFacKMO82lid+rHdUq+X3335xHL7tFjOCzk/AcI8
-						9DSdgvrL3rB/bMmsko7+tz/DbEfrFwMqwpVuX1Cs7YWl88E7VB+FBJZsTLJH2XDQ
-						m9930Nq2iULafPahz+IHhgECAwEAAaNQME4wHQYDVR0OBBYEFGZmAoJCe7wdXY7f
-						/pFKFpXXbwZDMB8GA1UdIwQYMBaAFGZmAoJCe7wdXY7f/pFKFpXXbwZDMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEPUdwYfF7ElyNcGzmGgCz0sqZAC
-						UaNoersFgCvSzrc2BWmeivgBUy0VVt5tU2YZKTAcIhvh/ZXNbJzoc+YH/KuLJ1hi
-						7b/jDBPH7QZZ4uv4U/WkSr4n/1tRpUnLrY505X/hCxpH11MOs2OHd5edwiIDuiUA
-						3hDuvyCQYLy386VhX3UZVBtew16Z5KUhPcbtW/k+RhYuH/j2Inq/4W1UpmsNR2Ug
-						l2RyOBeMBakzxmb2R6y3nWcxAidG42LV8DLVUbqwoEcIg4Mt5jbZDrlEhPvW4zal
-						TWIuR+MKKnSlSNym/jSdIEVMIQ/mmLy8Pmqg/bdX5zgOHNLQEtGgpX0ReOo=
-					</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>
-						MIIDWDCCAkCgAwIBAgIIEcxlhYHW7FYwDQYJKoZIhvcNAQEFBQAwQzEfMB0GA1UE
-						CgwWR2xhc2dvdyBLZWx2aW4gQ29sbGVnZTEgMB4GA1UEAwwXaWRwLmdsYXNnb3dr
-						ZWx2aW4uYWMudWswHhcNMTQwODI5MTMyODUyWhcNMjQwODI5MTMyODUyWjBDMR8w
-						HQYDVQQKDBZHbGFzZ293IEtlbHZpbiBDb2xsZWdlMSAwHgYDVQQDDBdpZHAuZ2xh
-						c2dvd2tlbHZpbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AOxm3dLSX+UNx+aVR24NNhE03L/lpOpLPxU+COARq2kuD8AGv6OxUWt0tdDYskJp
-						SwMQRQmqP2R32ulYMQBeeD0e+Kale+b9uX/Zkut8PohQZeSkCMpV0lEmkK07ivOB
-						Mh6FiViWZ0XWAQ/6RfnSC/9L+PJcqpRkAwr0qkGo7k2eaE7ffIhZY7ImKVAiPS7r
-						YAgZPCiWHtC8eN6+h9kJJo7FyFacKMO82lid+rHdUq+X3335xHL7tFjOCzk/AcI8
-						9DSdgvrL3rB/bMmsko7+tz/DbEfrFwMqwpVuX1Cs7YWl88E7VB+FBJZsTLJH2XDQ
-						m9930Nq2iULafPahz+IHhgECAwEAAaNQME4wHQYDVR0OBBYEFGZmAoJCe7wdXY7f
-						/pFKFpXXbwZDMB8GA1UdIwQYMBaAFGZmAoJCe7wdXY7f/pFKFpXXbwZDMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEPUdwYfF7ElyNcGzmGgCz0sqZAC
-						UaNoersFgCvSzrc2BWmeivgBUy0VVt5tU2YZKTAcIhvh/ZXNbJzoc+YH/KuLJ1hi
-						7b/jDBPH7QZZ4uv4U/WkSr4n/1tRpUnLrY505X/hCxpH11MOs2OHd5edwiIDuiUA
-						3hDuvyCQYLy386VhX3UZVBtew16Z5KUhPcbtW/k+RhYuH/j2Inq/4W1UpmsNR2Ug
-						l2RyOBeMBakzxmb2R6y3nWcxAidG42LV8DLVUbqwoEcIg4Mt5jbZDrlEhPvW4zal
-						TWIuR+MKKnSlSNym/jSdIEVMIQ/mmLy8Pmqg/bdX5zgOHNLQEtGgpX0ReOo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.glasgowkelvin.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.glasgowkelvin.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Glasgow Kelvin College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Glasgow Kelvin College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.glasgowkelvin.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matt</GivenName>
-    <SurName>Campbell</SurName>
-    <EmailAddress>mailto:MCampbell@glasgowkelvin.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>McBride</SurName>
-    <EmailAddress>mailto:amcbride@glasgowkelvin.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.glazer.si-idp-20131113.xml b/swamid-interfederations-2.0/idp.glazer.si-idp-20131113.xml
deleted file mode 100644
index 457d974d..00000000
--- a/swamid-interfederations-2.0/idp.glazer.si-idp-20131113.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.glazer.si/idp/20131113">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-16T12:12:07Z">
-      <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 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">glazer.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Primary school Janka Glazerja Ruše</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">OŠ Janka Glazerja Ruše</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization Primary school Janka Glazerja Ruše</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije OŠ Janka Glazerja Ruše</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization Primary school Janka Glazerja Ruše</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije OŠ Janka Glazerja Ruše</mdui:Keywords>
-        <mdui:Logo height="100" width="85">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.glazer.si/eng/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.glazer.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>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</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>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.glazer.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.glazer.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">OSNOVNA ŠOLA JANKA GLAZERJA RUŠE</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">OSNOVNA ŠOLA JANKA GLAZERJA RUŠE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">OSNOVNA ŠOLA JANKA GLAZERJA RUŠE</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">OSNOVNA ŠOLA JANKA GLAZERJA RUŠE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.glazer.si/eng/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.glazer.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ladislav</md:GivenName>
-    <md:SurName>Pepelnik</md:SurName>
-    <md:EmailAddress>mailto:rav-osmbjg@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:franc.jakos@glazer.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Franc</md:GivenName>
-    <md:SurName>Jakoš</md:SurName>
-    <md:EmailAddress>mailto:franc.jakos@glazer.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Franc</md:GivenName>
-    <md:SurName>Jakoš</md:SurName>
-    <md:EmailAddress>mailto:franc.jakos@glazer.si</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 94d75255..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gli.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gli.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.cas.cz: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.gli.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gli.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gli.cas.cz/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">gli.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gli.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Geology AS CR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Geologický ústav AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Geology AS CR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Geologický ústav AV ČR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gli.cas.cz/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.gli.cas.cz/cs</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gmit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gmit.ie-idp-shibboleth.xml
deleted file mode 100644
index 28114c40..00000000
--- a/swamid-interfederations-2.0/idp.gmit.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.gmit.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-03T00: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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gmit.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="ga">Institúid Teicneolaíochta na Gaillimhe-Maigh Eo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Galway-Mayo Institute of Technology</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.gmit.ie</mdui:InformationURL>
-        <mdui:Logo height="69" width="220">https://edugate.heanet.ie/rr3/logos/gmit.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.2777683,-9.014748</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAK1VqQ01fdIHdnIs7Fwl1MsmJPtwMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5nbWl0LmllMB4XDTEwMTExNjE2NTAwM1oXDTMw
-MTExNjE2NTAwM1owFjEUMBIGA1UEAxMLaWRwLmdtaXQuaWUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCgPVXvHQh3F+3gO0sfFAVRwENQ75ZDdvLraifP
-KX7cmP700PPyVl/lab3aoei080w4iZ++yDrgHVg0O6+CSqLylPKX4Pdv7Ps/UAPd
-AA/yteXGUe0sRxzmgOGmDA2uDt6FYORt2NHcIIuBtKFSi7HMkLe8pVs1NMGMx59X
-TaArq/vfQnPaSEW4N2CcVAArku1wohHOlC1TMf+6jRU/N456Zjq+ZRylefluTVdx
-3tBn2GZiiYJD3q4nbNJeDjnOS5dn4nvTjLTd7Y+5E8t8yCJyCyTE6U9d3m4+Mfh9
-jrtk7HO5HDO8WCoBA4OmsOTLquqQWZhnqMQY6wuWTLU9lf+lAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5nbWl0LmllhiJodHRwczovL2lkcC5nbWl0LmllL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQAy0oW5uPZ0SagPA9AU5m0PWSQEjANBgkqhkiG
-9w0BAQUFAAOCAQEAVZhK+rTfpxznv4ihlhBYvuibLTvWJWD6zqrc3CRVElaKpC2N
-HKCPxF5Yw783trr/DWgkHVpva6yGDrDVRd45qCqJmNGKRniR9+kgjsbvfBPEoDeQ
-we2aIVIPuAArSitpWyiZ+betcnUQSV6vq6SEZrlb9SG1hMd3ckBd9t5xj0cd61Cx
-2CR9ovcj7c97IVlWb4AN93uWsVV8hGpF0d/hJfkT0Wfr5oEfOn8P/1O18M3z000s
-VRvGY2BZumdJim91SBMiwBI51Xv44nkEUtrIwVRipdAshJAynpRHPVEyJQmxn4sR
-Sg5aRgRfZLgvyxogDq0OlqHMA3nOustdeietHQ==
-</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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gmit.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gmit.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gmit.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Galway-Mayo Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Galway-Mayo Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gmit.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Donal</md:GivenName>
-    <md:SurName>McGinty</md:SurName>
-    <md:EmailAddress>mailto:dmcginty@gmit.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.godalming.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.godalming.ac.uk-shibboleth.xml
deleted file mode 100644
index a1da9592..00000000
--- a/swamid-interfederations-2.0/idp.godalming.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://idp.godalming.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Godalming College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-06T17:13: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">godalming.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjwCCQDYuaHlo6w4dTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlHb2RhbG1pbmcxGjAYBgNVBAoT
-						EUdvZGFsbWluZyBDb2xsZWdlMRwwGgYDVQQDExNpZHAuZ29kYWxtaW5nLmFjLnVr
-						MB4XDTEzMTEwNTEzNTk1NloXDTMzMTAzMTEzNTk1NlowbDELMAkGA1UEBhMCR0Ix
-						DzANBgNVBAgTBlN1cnJleTESMBAGA1UEBxMJR29kYWxtaW5nMRowGAYDVQQKExFH
-						b2RhbG1pbmcgQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmdvZGFsbWluZy5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXVhe3ogE/3heu0gX8lxWxf
-						9BEKJuvE3iNKpopu8xob4BjkExlapGP3WWcZ7bdDqdrkF6StEvAZeWkFtgdeDguA
-						Jbe/GgnYfjufgeiTGSKWwM7AOV3rz5txBcyKOrC88qorYl6gUdc7p2GPZFDZgcu7
-						cCGKIMTVqUcMIp3uIZv0M/u+Vn4CI+BeUTZENIAZfeUHNTUxkcH6Oqhb6hnCYwmi
-						sa+zu/701srcXEJV2ioPU9u765ssWKk3vrbw5Yl8sEDm/jyirhesyjh01YA/YMov
-						3XgSQabUIY7q1QHztqHXNwA/tDnxzShEHPpuIMsz7PSYsCP4EA63iWGDx0WqfS8C
-						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAojTGzBpaChl86wL81BcANWi+VhfXJTWu
-						TbY897lnhDaYjZQVEimRZjY17+NLepjySmjC7CJylZQrRvnSS5DnZZXqi+Vj6vJE
-						jvaouneVqCXJuj6aqtuqIhVYsyuLo2C2gUhb6wWJd0LNvNkTHEtSsWA7MR6oG3on
-						Mq/u7YNxv0+M0hBvbPF7UhFX5ZcpQx6+Oz/YDKUaJ2mkyeskMa45zM3KS89izU3a
-						BfhIQnUh08BVlrphQmoeTxMvRQ4onNp4uy0UtoFfD6WGEIwfzckosJcEkukGNfUJ
-						3PcXdcBw5DL6rHdWkpNGnyuWj4w/csNAa8/ie/hWF5FgVJduilLWXA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.godalming.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.godalming.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.godalming.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.godalming.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.godalming.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.godalming.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">godalming.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjwCCQDYuaHlo6w4dTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlHb2RhbG1pbmcxGjAYBgNVBAoT
-						EUdvZGFsbWluZyBDb2xsZWdlMRwwGgYDVQQDExNpZHAuZ29kYWxtaW5nLmFjLnVr
-						MB4XDTEzMTEwNTEzNTk1NloXDTMzMTAzMTEzNTk1NlowbDELMAkGA1UEBhMCR0Ix
-						DzANBgNVBAgTBlN1cnJleTESMBAGA1UEBxMJR29kYWxtaW5nMRowGAYDVQQKExFH
-						b2RhbG1pbmcgQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmdvZGFsbWluZy5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXVhe3ogE/3heu0gX8lxWxf
-						9BEKJuvE3iNKpopu8xob4BjkExlapGP3WWcZ7bdDqdrkF6StEvAZeWkFtgdeDguA
-						Jbe/GgnYfjufgeiTGSKWwM7AOV3rz5txBcyKOrC88qorYl6gUdc7p2GPZFDZgcu7
-						cCGKIMTVqUcMIp3uIZv0M/u+Vn4CI+BeUTZENIAZfeUHNTUxkcH6Oqhb6hnCYwmi
-						sa+zu/701srcXEJV2ioPU9u765ssWKk3vrbw5Yl8sEDm/jyirhesyjh01YA/YMov
-						3XgSQabUIY7q1QHztqHXNwA/tDnxzShEHPpuIMsz7PSYsCP4EA63iWGDx0WqfS8C
-						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAojTGzBpaChl86wL81BcANWi+VhfXJTWu
-						TbY897lnhDaYjZQVEimRZjY17+NLepjySmjC7CJylZQrRvnSS5DnZZXqi+Vj6vJE
-						jvaouneVqCXJuj6aqtuqIhVYsyuLo2C2gUhb6wWJd0LNvNkTHEtSsWA7MR6oG3on
-						Mq/u7YNxv0+M0hBvbPF7UhFX5ZcpQx6+Oz/YDKUaJ2mkyeskMa45zM3KS89izU3a
-						BfhIQnUh08BVlrphQmoeTxMvRQ4onNp4uy0UtoFfD6WGEIwfzckosJcEkukGNfUJ
-						3PcXdcBw5DL6rHdWkpNGnyuWj4w/csNAa8/ie/hWF5FgVJduilLWXA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.godalming.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.godalming.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">Godalming College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Godalming College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.godalming.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:ITSupport@godalming.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:ITSupport@godalming.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b0af1710..00000000
--- a/swamid-interfederations-2.0/idp.goldsmiths.ac.uk-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" entityID="https://idp.goldsmiths.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Goldsmiths, University of London" Shibboleth IdP for Goldsmiths' College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-21T11: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">gold.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Goldsmiths, University of London</mdui:DisplayName>
-        <mdui:Logo height="66" width="180">https://www.gold.ac.uk/static/images/gold/logo_goldsmiths.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.gold.ac.uk/static/images/g-16x16.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF/TCCBOWgAwIBAgIUMqPz7osmzn9Ev8smgoB4KL4/2zgwDQYJKoZIhvcNAQEL
-						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDYxODEwMTMy
-						NVoXDTE4MDYxODEwMTMyM1owgYcxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25k
-						b24xETAPBgNVBAcTCE5FV0NST1NTMRwwGgYDVQQKExNHb2xkc21pdGhzJyBDb2xs
-						ZWdlMRcwFQYDVQQLEw5JbmZyYXN0cnVjdHVyZTEdMBsGA1UEAxMUaWRwLmdvbGRz
-						bWl0aHMuYWMudWswggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCi3wFk
-						aznZ+SpYvrsnww1uupnCpggywmvM5SCyqMa1YjecRF+ehyhEpTM+lmpOBp5VunM0
-						2dx7Hdt10I3C1gNZemlacaihn573tJUSq44K/hw7JPifTKDxxyF9bTh3LgyYIoQC
-						JMlKreErgcs+AqJHAo3ta96MIP3bBzT6tYshIwtTdLwE0M6Y5gcrDyTtDws1jmKu
-						9Kt5Ht0ZW5iDh+BkfRRvW3+FTwmooL24oJ8ZXBUmGmxOha4nMHUwDDOGR6bpLO7C
-						QozFmTWln2kqhxkXcS212JIHEkqb6wa42+szlVfY4USwOuSJHFQgpbApjg5rrr1p
-						FGTCcpbLMt+feQ77kHorhIXeG70rXWsFhLGrGl4Z7E17p/mc0qe1CdB/t8WQsDQt
-						Pl27TIY/rcj5FU/IoVVOq+Z4UoWWkpnj2Kpouu0aqZQbzcAIXj+e2i6npQ1+tpfJ
-						g7fDEYxQbzd1CEZkGG8mT6iyctIvA/Ev+aooUEjbe1CdfB5suLu1EphINkTPdtRg
-						SqvF+/2u1xKyNEvVr+OHCQDgneu9FwTrrP6JBMzL0DIfbulbH6KC/cAQdc0suA3I
-						k2A8DnCy4fp9po8oS9sva2bfICo6ufesl6OeKs/BzQf3JvN1MnzDRPSvcZr/vKnF
-						3GggIRT7y280FLbevP4EZ4KM97zGM0lxZF0omQIDAQABo4IBmDCCAZQwcwYIKwYB
-						BQUHAQEEZzBlMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2Jh
-						bC5jb20wNwYIKwYBBQUHMAKGK2h0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5j
-						b20vcXZzc2xnMi5jcnQwHwYDVR0RBBgwFoIUaWRwLmdvbGRzbWl0aHMuYWMudWsw
-						UQYDVR0gBEowSDBGBgwrBgEEAb5YAAJkAQEwNjA0BggrBgEFBQcCARYoaHR0cDov
-						L3d3dy5xdW92YWRpc2dsb2JhbC5jb20vcmVwb3NpdG9yeTAOBgNVHQ8BAf8EBAMC
-						BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFJEZ
-						Yq1bF6cw+/DeOSWxvYy5uFEnMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
-						cXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsZzIuY3JsMB0GA1UdDgQWBBQudULPA4BU
-						R/Wtj7MvpnX1q4RqEjANBgkqhkiG9w0BAQsFAAOCAQEA3jIcYplsH+C8CnQRW7v5
-						EmAuEnBu3Q8lLZWG/gsVhoM3oZLtbwzJVVf5bU/mvymGOSbuZUdhG9A3zE3mNDro
-						uMpX55yoaQ80OfSkgtFulLS/D1e+0+h8sa5O+mYgTz0G0yfl9mc/YBD1E3yb4xeW
-						YACVP2hh69Th2eJ7wELZIY6lxisJQuIxJyTMWLIodOCqm7/+T6rzKcFCjVZqVVsW
-						MU979J/yG2UPvY0ZzjlYJCJBYna/oxazCndtgbPw700yM7d/+3rUdhAVfibBmnzy
-						XjNUc3WA20A5xtfJa3B4RHmSp1zlvwxvPOU+DC/TPIfe9fz923/qDhMgCKylFbpP
-						VA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goldsmiths.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.goldsmiths.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.goldsmiths.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.goldsmiths.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goldsmiths.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">gold.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF/TCCBOWgAwIBAgIUMqPz7osmzn9Ev8smgoB4KL4/2zgwDQYJKoZIhvcNAQEL
-						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDYxODEwMTMy
-						NVoXDTE4MDYxODEwMTMyM1owgYcxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25k
-						b24xETAPBgNVBAcTCE5FV0NST1NTMRwwGgYDVQQKExNHb2xkc21pdGhzJyBDb2xs
-						ZWdlMRcwFQYDVQQLEw5JbmZyYXN0cnVjdHVyZTEdMBsGA1UEAxMUaWRwLmdvbGRz
-						bWl0aHMuYWMudWswggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCi3wFk
-						aznZ+SpYvrsnww1uupnCpggywmvM5SCyqMa1YjecRF+ehyhEpTM+lmpOBp5VunM0
-						2dx7Hdt10I3C1gNZemlacaihn573tJUSq44K/hw7JPifTKDxxyF9bTh3LgyYIoQC
-						JMlKreErgcs+AqJHAo3ta96MIP3bBzT6tYshIwtTdLwE0M6Y5gcrDyTtDws1jmKu
-						9Kt5Ht0ZW5iDh+BkfRRvW3+FTwmooL24oJ8ZXBUmGmxOha4nMHUwDDOGR6bpLO7C
-						QozFmTWln2kqhxkXcS212JIHEkqb6wa42+szlVfY4USwOuSJHFQgpbApjg5rrr1p
-						FGTCcpbLMt+feQ77kHorhIXeG70rXWsFhLGrGl4Z7E17p/mc0qe1CdB/t8WQsDQt
-						Pl27TIY/rcj5FU/IoVVOq+Z4UoWWkpnj2Kpouu0aqZQbzcAIXj+e2i6npQ1+tpfJ
-						g7fDEYxQbzd1CEZkGG8mT6iyctIvA/Ev+aooUEjbe1CdfB5suLu1EphINkTPdtRg
-						SqvF+/2u1xKyNEvVr+OHCQDgneu9FwTrrP6JBMzL0DIfbulbH6KC/cAQdc0suA3I
-						k2A8DnCy4fp9po8oS9sva2bfICo6ufesl6OeKs/BzQf3JvN1MnzDRPSvcZr/vKnF
-						3GggIRT7y280FLbevP4EZ4KM97zGM0lxZF0omQIDAQABo4IBmDCCAZQwcwYIKwYB
-						BQUHAQEEZzBlMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2Jh
-						bC5jb20wNwYIKwYBBQUHMAKGK2h0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5j
-						b20vcXZzc2xnMi5jcnQwHwYDVR0RBBgwFoIUaWRwLmdvbGRzbWl0aHMuYWMudWsw
-						UQYDVR0gBEowSDBGBgwrBgEEAb5YAAJkAQEwNjA0BggrBgEFBQcCARYoaHR0cDov
-						L3d3dy5xdW92YWRpc2dsb2JhbC5jb20vcmVwb3NpdG9yeTAOBgNVHQ8BAf8EBAMC
-						BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFJEZ
-						Yq1bF6cw+/DeOSWxvYy5uFEnMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
-						cXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsZzIuY3JsMB0GA1UdDgQWBBQudULPA4BU
-						R/Wtj7MvpnX1q4RqEjANBgkqhkiG9w0BAQsFAAOCAQEA3jIcYplsH+C8CnQRW7v5
-						EmAuEnBu3Q8lLZWG/gsVhoM3oZLtbwzJVVf5bU/mvymGOSbuZUdhG9A3zE3mNDro
-						uMpX55yoaQ80OfSkgtFulLS/D1e+0+h8sa5O+mYgTz0G0yfl9mc/YBD1E3yb4xeW
-						YACVP2hh69Th2eJ7wELZIY6lxisJQuIxJyTMWLIodOCqm7/+T6rzKcFCjVZqVVsW
-						MU979J/yG2UPvY0ZzjlYJCJBYna/oxazCndtgbPw700yM7d/+3rUdhAVfibBmnzy
-						XjNUc3WA20A5xtfJa3B4RHmSp1zlvwxvPOU+DC/TPIfe9fz923/qDhMgCKylFbpP
-						VA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goldsmiths.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goldsmiths.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">Goldsmiths' College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Goldsmiths, University of London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.goldsmiths.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@gold.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>George</GivenName>
-    <SurName>Thompson</SurName>
-    <EmailAddress>mailto:g.thompson@gold.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.goodwin.edu-idp-saml.xml b/swamid-interfederations-2.0/idp.goodwin.edu-idp-saml.xml
deleted file mode 100644
index 9e50e7c3..00000000
--- a/swamid-interfederations-2.0/idp.goodwin.edu-idp-saml.xml
+++ /dev/null
@@ -1,60 +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://idp.goodwin.edu/idp/saml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">goodwin.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Goodwin College</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>
-MIIDBzCCAe+gAwIBAgIJANwMbYMK70vwMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMMD2lkcC5nb29kd2luLmVkdTAeFw0xMzA4MTIxNDQ2NTJaFw0yMzA4MTIxNDQ2
-NTJaMBoxGDAWBgNVBAMMD2lkcC5nb29kd2luLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAM7Sif8QaDrfgy5Y6uWlq5FmYh54l7f9l/MgaYTll+VO
-I4zVFiNg7JD1+g48eCc9l+l2wxeTV/lJ3heTiQiuqZl9V4ZCsgMfQwfwu2XU9HjQ
-ZcrvJbewicpy/gBnrT9VH0ez8yXsO8qt0CrPIOgGMA1OVgOcaXPHrDxyZwWgUgFT
-Qoph5m8h2h5mJm0zrwGhU1/o3W/g0DdojzjL4ytQ6AhENtjj/su1C50pq93fMD/y
-aPMW7CPKd4jVzXL7elzNCJ7HeHXuOR26/tOiCyZIwED6ais1syHlN3K+pZBJQiY8
-Zx0mGl39chRF6JnH+mPJX/bbEY1rp6aqbiNM/ZgfYTsCAwEAAaNQME4wHQYDVR0O
-BBYEFP4r5oKBA7L4RfkrOHo0TA06ho/EMB8GA1UdIwQYMBaAFP4r5oKBA7L4Rfkr
-OHo0TA06ho/EMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFDZfoCW
-dTPKWtBCRq1NIeJKq0lPBn/xrw64eSzKQwMdWQasuuSeCEkDqkMDmohe/sLxMrjv
-HMWOrLuPuZY8/8MUojLjGZQJxVtLkiXyZtkNvSZeRC2k31ADtMfpAQ4i2w7y5s7q
-LS72WeChkhTkAJrvTE/XtCI+OH9o23JLnXX0rLegXeiFWCdSOAJNon1TxQyAeNIj
-Zr+Vr8S5ZCVqxbBpIOO/hB+cLQnFzt13cdc60L/YVV2UpCrFx+wOoanPpStFiRWL
-CIiU7ZioGEoYcgH4XdXKLBZfS8PQqwNFlAtHZ59KLl6Mbtzd9dZcdHS5toIbot4V
-mftEeS74CI/fFwQ=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goodwin.edu/saml/saml2/slo"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.goodwin.edu/saml/saml1/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goodwin.edu/saml/saml2/sso"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Goodwin College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Goodwin College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.goodwin.edu/default_flash.asp</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Simon Lee</md:GivenName>
-    <md:EmailAddress>simon@9starresearch.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Marilyn Nowlan</md:GivenName>
-    <md:EmailAddress>Mnowlan@goodwin.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.goucher.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.goucher.edu-idp-shibboleth.xml
deleted file mode 100644
index e6759f29..00000000
--- a/swamid-interfederations-2.0/idp.goucher.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,151 +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://idp.goucher.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">goucher.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Goucher College</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>
-MIIDQDCCAigCCQD9EXATFfpNHTANBgkqhkiG9w0BAQUFADBiMRgwFgYDVQQDDA9p
-ZHAuZ291Y2hlci5lZHUxGDAWBgNVBAoMD0dvdWNoZXIgQ29sbGVnZTELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgMAk1EMRIwEAYDVQQHDAlCYWx0aW1vcmUwHhcNMTIwMjAy
-MTg0MDMwWhcNMTMwMjAxMTg0MDMwWjBiMRgwFgYDVQQDDA9pZHAuZ291Y2hlci5l
-ZHUxGDAWBgNVBAoMD0dvdWNoZXIgQ29sbGVnZTELMAkGA1UEBhMCVVMxCzAJBgNV
-BAgMAk1EMRIwEAYDVQQHDAlCYWx0aW1vcmUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDGCDPliCbx4QcxYEVBjwMRd/4R6L1LcZ21PIBu9qKlfJTp+44p
-RMFFQkvHQgtQnWKBSMK39vG6H7+wBFIdFfavxT9DcPkiqvoe7++VyYm2VWZt6HCQ
-cYK5Nwg2AGOIodIIpwncUJhnHNJ8YHKkdwwFcexEKrcvurTMok1BYlGsr6uX5p0C
-ooZmsdX7sffjSiZI0+/kZgI0gSQOjk6hGyY1QZz47q3aTbAn63eZv9zbwLqdBtr3
-mQGDtZ6C0N7Z8H2PiMgeKHqXXHna+XEVk1/lZjVJbLf0x1og8RgvDmXvFyE7hmxE
-dmljVWwHsKWzfaWYX0WTgO5D6+vNQopqoOPdAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAE1hv6gGPVcFulSyyNpmBd8hPZUI4Ibnqc7dBFgCdljB6jrBj+6iEE3pd0eW
-bEDAlpT9kyNweZY0qjzKK2gvjMAUTcGUo/W8Nfmoi8py07GZYdBglNIL69xY1qoe
-0rltvb47yAL+1A6eeBGlgsj5/o9wkV1fXOJ7ojKV2S7CbTJpgr1MdWSrTSI3+Jwl
-iCflXm96nzl+CxorqVb0yJB2jmRd6WAAOunl4dIL8J7lkkrqBv42TaKExkUcf3eT
-yosKfff3G3KPsQzaU1kDWVGhbhS322uy7gjy929RALCmoUD6QQXRidkRYacCMHXC
-oL1bvJlGv+az8jFu7bFvQ6WA7Lc=
-          </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>
-MIIDhDCCAmwCCQDipYp7QAFE6DANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAk1EMRIwEAYDVQQHDAlCYWx0aW1vcmUxGDAWBgNVBAoMD0dv
-dWNoZXIgQ29sbGVnZTEfMB0GA1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEY
-MBYGA1UEAwwPaWRwLmdvdWNoZXIuZWR1MB4XDTEzMDExNjE2MjI0MVoXDTIzMDEx
-NDE2MjI0MVowgYMxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNRDESMBAGA1UEBwwJ
-QmFsdGltb3JlMRgwFgYDVQQKDA9Hb3VjaGVyIENvbGxlZ2UxHzAdBgNVBAsMFklu
-Zm9ybWF0aW9uIFRlY2hub2xvZ3kxGDAWBgNVBAMMD2lkcC5nb3VjaGVyLmVkdTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALelEr2mpG/5wjI/aR2JgfEz
-jwrfenWU3A9yqS0bsNI1Y9lVoAe0vIyqTC1glkcEApIHUVumFpbrmmJQngt84l+C
-uz/n1bHELjM0oRJ0rIxhPrEiiLX8HabCOWPtXNUAQgJUSw+xjoOwEJfYRXDkcSQQ
-1S2GKvDTGDZhBOG2Ov4OjVyRQkMQO/aOBjd8VZKthlMBGUg6yD2AklIRUBuPOEN4
-myOk2fWHttPNSj7cfcTnSszLPrYOE7bHOSYILnDcu4lbTjnR3EqkrtSzXligebKJ
-hxqFYf0caTEu+RMPKttHdEf7u4j2G6i+6euj7yWnbYDs7piFKsl0TFnEUWpaGR0C
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdgn6vRTI37/8+I8I5+9yrUXqU6aVftp8
-P53nVPUB41JeZUb3Dfj1Mswg51DY99LT+xAh1oxDKNUzrnXr2af8YIFQ0N2rNV55
-1LODkspwP5kYzyT5cyINEsfUs4wqjwMI65RYeOwd14adVcUMFFyedlSsoIWyzrO1
-ucIe40Y2h8mhtRsWqMH8e220dYf2QMueJo7zt9xruOUTT7Jn+mGQUtH2tYlhOREU
-D6X8ax3ngFyLz8Cte0qDYPQpZU93xd8tuQTWRBeGA+AxJMQ3/Gn78uKZJDNUqdhf
-U9RfcD99MmNTz6iedYMFbAIs1113GJVjiRe15qyz74tLxexzwiPxXA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goucher.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goucher.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.goucher.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.goucher.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.goucher.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.goucher.edu/idp/profile/SAML2/POST-SimpleSign/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">goucher.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAigCCQD9EXATFfpNHTANBgkqhkiG9w0BAQUFADBiMRgwFgYDVQQDDA9p
-ZHAuZ291Y2hlci5lZHUxGDAWBgNVBAoMD0dvdWNoZXIgQ29sbGVnZTELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgMAk1EMRIwEAYDVQQHDAlCYWx0aW1vcmUwHhcNMTIwMjAy
-MTg0MDMwWhcNMTMwMjAxMTg0MDMwWjBiMRgwFgYDVQQDDA9pZHAuZ291Y2hlci5l
-ZHUxGDAWBgNVBAoMD0dvdWNoZXIgQ29sbGVnZTELMAkGA1UEBhMCVVMxCzAJBgNV
-BAgMAk1EMRIwEAYDVQQHDAlCYWx0aW1vcmUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDGCDPliCbx4QcxYEVBjwMRd/4R6L1LcZ21PIBu9qKlfJTp+44p
-RMFFQkvHQgtQnWKBSMK39vG6H7+wBFIdFfavxT9DcPkiqvoe7++VyYm2VWZt6HCQ
-cYK5Nwg2AGOIodIIpwncUJhnHNJ8YHKkdwwFcexEKrcvurTMok1BYlGsr6uX5p0C
-ooZmsdX7sffjSiZI0+/kZgI0gSQOjk6hGyY1QZz47q3aTbAn63eZv9zbwLqdBtr3
-mQGDtZ6C0N7Z8H2PiMgeKHqXXHna+XEVk1/lZjVJbLf0x1og8RgvDmXvFyE7hmxE
-dmljVWwHsKWzfaWYX0WTgO5D6+vNQopqoOPdAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAE1hv6gGPVcFulSyyNpmBd8hPZUI4Ibnqc7dBFgCdljB6jrBj+6iEE3pd0eW
-bEDAlpT9kyNweZY0qjzKK2gvjMAUTcGUo/W8Nfmoi8py07GZYdBglNIL69xY1qoe
-0rltvb47yAL+1A6eeBGlgsj5/o9wkV1fXOJ7ojKV2S7CbTJpgr1MdWSrTSI3+Jwl
-iCflXm96nzl+CxorqVb0yJB2jmRd6WAAOunl4dIL8J7lkkrqBv42TaKExkUcf3eT
-yosKfff3G3KPsQzaU1kDWVGhbhS322uy7gjy929RALCmoUD6QQXRidkRYacCMHXC
-oL1bvJlGv+az8jFu7bFvQ6WA7Lc=
-          </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>
-MIIDhDCCAmwCCQDipYp7QAFE6DANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAk1EMRIwEAYDVQQHDAlCYWx0aW1vcmUxGDAWBgNVBAoMD0dv
-dWNoZXIgQ29sbGVnZTEfMB0GA1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEY
-MBYGA1UEAwwPaWRwLmdvdWNoZXIuZWR1MB4XDTEzMDExNjE2MjI0MVoXDTIzMDEx
-NDE2MjI0MVowgYMxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJNRDESMBAGA1UEBwwJ
-QmFsdGltb3JlMRgwFgYDVQQKDA9Hb3VjaGVyIENvbGxlZ2UxHzAdBgNVBAsMFklu
-Zm9ybWF0aW9uIFRlY2hub2xvZ3kxGDAWBgNVBAMMD2lkcC5nb3VjaGVyLmVkdTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALelEr2mpG/5wjI/aR2JgfEz
-jwrfenWU3A9yqS0bsNI1Y9lVoAe0vIyqTC1glkcEApIHUVumFpbrmmJQngt84l+C
-uz/n1bHELjM0oRJ0rIxhPrEiiLX8HabCOWPtXNUAQgJUSw+xjoOwEJfYRXDkcSQQ
-1S2GKvDTGDZhBOG2Ov4OjVyRQkMQO/aOBjd8VZKthlMBGUg6yD2AklIRUBuPOEN4
-myOk2fWHttPNSj7cfcTnSszLPrYOE7bHOSYILnDcu4lbTjnR3EqkrtSzXligebKJ
-hxqFYf0caTEu+RMPKttHdEf7u4j2G6i+6euj7yWnbYDs7piFKsl0TFnEUWpaGR0C
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdgn6vRTI37/8+I8I5+9yrUXqU6aVftp8
-P53nVPUB41JeZUb3Dfj1Mswg51DY99LT+xAh1oxDKNUzrnXr2af8YIFQ0N2rNV55
-1LODkspwP5kYzyT5cyINEsfUs4wqjwMI65RYeOwd14adVcUMFFyedlSsoIWyzrO1
-ucIe40Y2h8mhtRsWqMH8e220dYf2QMueJo7zt9xruOUTT7Jn+mGQUtH2tYlhOREU
-D6X8ax3ngFyLz8Cte0qDYPQpZU93xd8tuQTWRBeGA+AxJMQ3/Gn78uKZJDNUqdhf
-U9RfcD99MmNTz6iedYMFbAIs1113GJVjiRe15qyz74tLxexzwiPxXA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.goucher.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.goucher.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Goucher College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Goucher College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://goucher.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Rob Pfeffer</md:GivenName>
-    <md:EmailAddress>rpfeffer@goucher.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rob Pfeffer</md:GivenName>
-    <md:EmailAddress>rpfeffer@goucher.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gowercollegeswansea.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gowercollegeswansea.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index bbe750c0..00000000
--- a/swamid-interfederations-2.0/idp.gowercollegeswansea.ac.uk-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://idp.gowercollegeswansea.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Gower College Swansea.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">gowercollegeswansea.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYTCCAkmgAwIBAgIVAPaKVO7qjn5iTZ8Gic6gQPWYymlgMA0GCSqGSIb3DQEB
-						BQUAMCgxJjAkBgNVBAMTHWlkcC5nb3dlcmNvbGxlZ2Vzd2Fuc2VhLmFjLnVrMB4X
-						DTExMDgyNDEyNDQ1NloXDTMxMDgyNDEyNDQ1NlowKDEmMCQGA1UEAxMdaWRwLmdv
-						d2VyY29sbGVnZXN3YW5zZWEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQD7EU6nahXNJNscC+4O8qkavjfcOAnWVaBl7WyAmryYsudXcIitwlqv
-						zjJrfc4Ncs0q6pKawJWBrqjiNyRBS4SEZpfgD2UXq/+LjfGJQKSXz4QzVmicGji6
-						ezsXQ0fvf7Nq7QqmT50M4xUWAbq71s6uZPKApui1hHGtFlp6IbLErcpB3jmp7skg
-						Au7OoZ7lbWuRKkRea9mBuUq3+uMlONfghNb5rkX+MHvXbpbFfG+W4ERLQMPWPeAw
-						V7vMInXysu70CakNJzIcvf41V73dR6LhooZyr4sIOPJdUWXBRGEWrGuBD/eGFxwY
-						3c+XIeVs37RmKwxLFRjJPkT6lxPfpoUtAgMBAAGjgYEwfzBeBgNVHREEVzBVgh1p
-						ZHAuZ293ZXJjb2xsZWdlc3dhbnNlYS5hYy51a4Y0aHR0cHM6Ly9pZHAuZ293ZXJj
-						b2xsZWdlc3dhbnNlYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUij+g
-						aDdeycJoti2x2hF12wErnSEwDQYJKoZIhvcNAQEFBQADggEBAEaiPWm87wZCFKlb
-						uM8BNEQccKBxVSYdYvb5W50EPPI0FIPWc09H4EDtd8ekJHlK6uML3AYdAI4GKniL
-						esApCmAdNP2jm752tp3FwTENcD/roYRWk/L+BCVSgrj+lwJNc+R+9HIqG6ZFiAG1
-						/Jr5t/XLTj4W+OO99dQLpNiXnGcn3AluRVpmO2oSmQAINAVkzOv+FRaVElRZ6NMH
-						58L5gnD0BmNPToS9XYiJbiJID1ViEjrkFPDfCUCC6XEEnPJ3hu/im0H8twKLb52Y
-						lCgXikLauknBHaF7kl1iiuMIyNn3KATJn53IQnYEhIe3eweTHTwXiAVOOnn2MXd3
-						VUkeVwI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gowercollegeswansea.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gowercollegeswansea.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.gowercollegeswansea.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gowercollegeswansea.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gowercollegeswansea.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gowercollegeswansea.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">gowercollegeswansea.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYTCCAkmgAwIBAgIVAPaKVO7qjn5iTZ8Gic6gQPWYymlgMA0GCSqGSIb3DQEB
-						BQUAMCgxJjAkBgNVBAMTHWlkcC5nb3dlcmNvbGxlZ2Vzd2Fuc2VhLmFjLnVrMB4X
-						DTExMDgyNDEyNDQ1NloXDTMxMDgyNDEyNDQ1NlowKDEmMCQGA1UEAxMdaWRwLmdv
-						d2VyY29sbGVnZXN3YW5zZWEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQD7EU6nahXNJNscC+4O8qkavjfcOAnWVaBl7WyAmryYsudXcIitwlqv
-						zjJrfc4Ncs0q6pKawJWBrqjiNyRBS4SEZpfgD2UXq/+LjfGJQKSXz4QzVmicGji6
-						ezsXQ0fvf7Nq7QqmT50M4xUWAbq71s6uZPKApui1hHGtFlp6IbLErcpB3jmp7skg
-						Au7OoZ7lbWuRKkRea9mBuUq3+uMlONfghNb5rkX+MHvXbpbFfG+W4ERLQMPWPeAw
-						V7vMInXysu70CakNJzIcvf41V73dR6LhooZyr4sIOPJdUWXBRGEWrGuBD/eGFxwY
-						3c+XIeVs37RmKwxLFRjJPkT6lxPfpoUtAgMBAAGjgYEwfzBeBgNVHREEVzBVgh1p
-						ZHAuZ293ZXJjb2xsZWdlc3dhbnNlYS5hYy51a4Y0aHR0cHM6Ly9pZHAuZ293ZXJj
-						b2xsZWdlc3dhbnNlYS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUij+g
-						aDdeycJoti2x2hF12wErnSEwDQYJKoZIhvcNAQEFBQADggEBAEaiPWm87wZCFKlb
-						uM8BNEQccKBxVSYdYvb5W50EPPI0FIPWc09H4EDtd8ekJHlK6uML3AYdAI4GKniL
-						esApCmAdNP2jm752tp3FwTENcD/roYRWk/L+BCVSgrj+lwJNc+R+9HIqG6ZFiAG1
-						/Jr5t/XLTj4W+OO99dQLpNiXnGcn3AluRVpmO2oSmQAINAVkzOv+FRaVElRZ6NMH
-						58L5gnD0BmNPToS9XYiJbiJID1ViEjrkFPDfCUCC6XEEnPJ3hu/im0H8twKLb52Y
-						lCgXikLauknBHaF7kl1iiuMIyNn3KATJn53IQnYEhIe3eweTHTwXiAVOOnn2MXd3
-						VUkeVwI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gowercollegeswansea.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gowercollegeswansea.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">Gower College Swansea</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Gower College Swansea</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gowercollegeswansea.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Parkhouse</SurName>
-    <EmailAddress>mailto:ian.parkhouse@gowercollegeswansea.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Parkhouse</SurName>
-    <EmailAddress>mailto:ian.parkhouse@gowercollegeswansea.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml b/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.xml
deleted file mode 100644
index 4601db57..00000000
--- a/swamid-interfederations-2.0/idp.gpiran.si-idp-20110919.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" entityID="https://idp.gpiran.si/idp/20110919">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-03-09T08:03:12Z">
-      <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 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">gpiran.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.gpiran.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Gymnasium Piran</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Gimnazija, elektro in pomorska šola Piran</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization Gymnasium Piran</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Gimnazija Piran</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization Gymnasium Piran</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Gimnazija Piran</mdui:Keywords>
-        <mdui:Logo height="299" width="300">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.gpiran.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.gpiran.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>MIIFejCCA2KgAwIBAgIEATLeRzANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMjEwMTAyNTAxWhcNMzQwODI3MTAyNTAxWjBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJDW6GNvyv/4uQs+YMi+A1cfj2JpBJ7DI1dz2AawdyUN1u07XPApyqSkwAgIgOrLTwD78qezCnMbNmJKxKgCW3nCLcHm1hoF4UgI7sD2ouJYiFAFAskIAidj4/26niCiYKF/RhjNr79m23SsUk6P/ouFIpy5s04VlF0Ev0QEhIgi2w79lpKDLhAvTovyTAvYiz64WXSIPKST68dU4jTWSSSpa1xAmvKf+yXoYT7+nzTskxeaE7NwDl2pCun9BODP4G/cOtxE6oiracde+Rewlikqc1Z+ksHsEM3z3UIwPg41stAydIX9Y79To2DXxhTRiwINlHg6Utjsd7fdEwnTMlC4Q5P9UBX01TlASnfLqetoh0doNShcrYRNgvN9eLhFe0ocZdSBw473A0n87WB84E9i9yZXAoKRbGw5/JadtChsPtlItaKxHWkJWTNQHVn3poQjvx7aOxqXEaWq4KDAPZjI7SwBDjUGKlBlrakyAhuQKQXcAdYFayrk2i/SsUy6RSKFEVJylTMfFmcvmE4aL+PNK4j/Xj5WixABZRMBVE+g3DHrXgXyj5pASnTsWlC1dH8XZm7eogLTAgvbkmd/i4VhfVPIo8rugi390Sqaxis+2df1m8pcPUYboilNGj9c9eU1KQS8jhcmH7CWw1btScAAhB9W0uxiVKKIVYjQKEyQIDAQABo1AwTjAdBgNVHQ4EFgQUXaCKA7A9IOWCijj2X1qW1iQqlYgwHwYDVR0jBBgwFoAUXaCKA7A9IOWCijj2X1qW1iQqlYgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAD+QHXbGFpPV8vBUR2UHEjdMOHBinFweVml66OPPsFz1lcHEEVaXYKmhUhXkxlHGq95lq2WgIwbjC/+oEt2nX6Dp6Q4Qx5Fbbm2h2wWz3q8z2NxtgT3NtToybPaOkNsK27FUENsj4bz92eIToyWqQMsolVZ6+efOMXeASSd0wfo5ePhm5fSEquKmRWxQHyBl1e3BsfcxeIbGhDHmwBC0IVyX+KO1IuYSCqwYnZviN9+g/U6vqUfz+LyJm7oQtM5SXAiR/bUWDKKfzHPWWZvLDH5GlSDAN5znktSDkVbCgYnmmCifmJS1MPnNoUSf5Nb8pFJ1LLavH8ru3mEzVKJfb8uk+5QVXWJHobeDaXhfW38V78KcIUr0mHNx/VV+2D+dhtsS+KjdxMbKRh9c6H8tuMHICYwY4wQVSuQzM3K09RySp9SABwL6kqxBDvxne7mb4TEG3czU2LCHWHJk+yxxwJnTNp83SdJM4nqX9p0EGJfLtqY8bP2pMGBDD6a+9U/dqTO75rzHJKYl1RNtLLVMpTmChVDa+yUh1uN1jUQCJ76QOoewKmYVLSopT2p3nEzWsHJFWN6/xaYmu9e/GkCJ/bDOU5zJPzrnfJc6fr3PboaOR3yx71geO+nZXrVSlBpBY6tc+TVVlpxlhsoWXFbm4t0nTp9ORSFkJnQCZmOjV2mA=</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>MIIFejCCA2KgAwIBAgIEATLeRzANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwHhcNMTQxMjEwMTAyNTAxWhcNMzQwODI3MTAyNTAxWjBWMQswCQYDVQQGEwJTSTEOMAwGA1UEBwwFUGlyYW4xNzA1BgNVBAMMLkdpbW5hemlqYSBQaXJhbiwgcHJpamF2bmkgc3RyZXpuaWsgemEgQXJuZXNBQUkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJDW6GNvyv/4uQs+YMi+A1cfj2JpBJ7DI1dz2AawdyUN1u07XPApyqSkwAgIgOrLTwD78qezCnMbNmJKxKgCW3nCLcHm1hoF4UgI7sD2ouJYiFAFAskIAidj4/26niCiYKF/RhjNr79m23SsUk6P/ouFIpy5s04VlF0Ev0QEhIgi2w79lpKDLhAvTovyTAvYiz64WXSIPKST68dU4jTWSSSpa1xAmvKf+yXoYT7+nzTskxeaE7NwDl2pCun9BODP4G/cOtxE6oiracde+Rewlikqc1Z+ksHsEM3z3UIwPg41stAydIX9Y79To2DXxhTRiwINlHg6Utjsd7fdEwnTMlC4Q5P9UBX01TlASnfLqetoh0doNShcrYRNgvN9eLhFe0ocZdSBw473A0n87WB84E9i9yZXAoKRbGw5/JadtChsPtlItaKxHWkJWTNQHVn3poQjvx7aOxqXEaWq4KDAPZjI7SwBDjUGKlBlrakyAhuQKQXcAdYFayrk2i/SsUy6RSKFEVJylTMfFmcvmE4aL+PNK4j/Xj5WixABZRMBVE+g3DHrXgXyj5pASnTsWlC1dH8XZm7eogLTAgvbkmd/i4VhfVPIo8rugi390Sqaxis+2df1m8pcPUYboilNGj9c9eU1KQS8jhcmH7CWw1btScAAhB9W0uxiVKKIVYjQKEyQIDAQABo1AwTjAdBgNVHQ4EFgQUXaCKA7A9IOWCijj2X1qW1iQqlYgwHwYDVR0jBBgwFoAUXaCKA7A9IOWCijj2X1qW1iQqlYgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAD+QHXbGFpPV8vBUR2UHEjdMOHBinFweVml66OPPsFz1lcHEEVaXYKmhUhXkxlHGq95lq2WgIwbjC/+oEt2nX6Dp6Q4Qx5Fbbm2h2wWz3q8z2NxtgT3NtToybPaOkNsK27FUENsj4bz92eIToyWqQMsolVZ6+efOMXeASSd0wfo5ePhm5fSEquKmRWxQHyBl1e3BsfcxeIbGhDHmwBC0IVyX+KO1IuYSCqwYnZviN9+g/U6vqUfz+LyJm7oQtM5SXAiR/bUWDKKfzHPWWZvLDH5GlSDAN5znktSDkVbCgYnmmCifmJS1MPnNoUSf5Nb8pFJ1LLavH8ru3mEzVKJfb8uk+5QVXWJHobeDaXhfW38V78KcIUr0mHNx/VV+2D+dhtsS+KjdxMbKRh9c6H8tuMHICYwY4wQVSuQzM3K09RySp9SABwL6kqxBDvxne7mb4TEG3czU2LCHWHJk+yxxwJnTNp83SdJM4nqX9p0EGJfLtqY8bP2pMGBDD6a+9U/dqTO75rzHJKYl1RNtLLVMpTmChVDa+yUh1uN1jUQCJ76QOoewKmYVLSopT2p3nEzWsHJFWN6/xaYmu9e/GkCJ/bDOU5zJPzrnfJc6fr3PboaOR3yx71geO+nZXrVSlBpBY6tc+TVVlpxlhsoWXFbm4t0nTp9ORSFkJnQCZmOjV2mA=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gpiran.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.gpiran.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Gymnasium Piran</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Gimnazija, elektro in pomorska šola Piran</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Gymnasium Piran</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Gimnazija, elektro in pomorska šola Piran</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gpiran.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.gpiran.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Borut</md:GivenName>
-    <md:SurName>Butinar</md:SurName>
-    <md:EmailAddress>mailto:ravnatelj@gpiran.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:oki@gpiran.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Igor</md:GivenName>
-    <md:SurName>Kralj</md:SurName>
-    <md:EmailAddress>mailto:igor.kralj1@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Igor</md:GivenName>
-    <md:SurName>Kralj</md:SurName>
-    <md:EmailAddress>mailto:oki@gpiran.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.grantham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.grantham.ac.uk-shibboleth.xml
deleted file mode 100644
index b11700ed..00000000
--- a/swamid-interfederations-2.0/idp.grantham.ac.uk-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.grantham.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Grantham College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">grantham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/grantham.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/grantham.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Grantham College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.grantham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gre.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.gre.ac.uk-oala-metadata.xml
deleted file mode 100644
index 87516fbf..00000000
--- a/swamid-interfederations-2.0/idp.gre.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gre.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the University of Greenwich.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-01T09:20:51Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">gre.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRjCCAi6gAwIBAgIIZQXHbuQMihkwDQYJKoZIhvcNAQEFBQAwOjEgMB4GA1UE
-						CgwXVW5pdmVyc2l0eSBvZiBHcmVlbndpY2gxFjAUBgNVBAMMDWlkcC5ncmUuYWMu
-						dWswHhcNMTMwNjA2MTIzMDE5WhcNMjMwNjA2MTIzMDE5WjA6MSAwHgYDVQQKDBdV
-						bml2ZXJzaXR5IG9mIEdyZWVud2ljaDEWMBQGA1UEAwwNaWRwLmdyZS5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIvRxjI34duzh2spZJCamd9E
-						8OwnYWdLNS9ZEdorE9x9ZXQA/ejG4x10O1Ljr0N6+0T9YEEa/1JiNp2tUvX3UT7b
-						34EKrE5WcYJVZxmPptfge6NakSRBgA5lptbP4mUa4nF52mcovhIWpuk/UYlBKIlJ
-						kyodxPGsC4t2cQpvmbSs0RksyIbw7LVBV4MQ6lJtUr1z8KSgyykl2nYfvtWVFmjM
-						smHYt5hXI0Wnmb7mzaRpum1jCWDOfM7frUeA/LR82Vht5QwLBofN1foBy+epycoQ
-						mWhalR5RO9O4fcKpdDivesBRr2Azv1yqYAWHFHSuWZIBVu0tJFIOENNAnfdG0PkC
-						AwEAAaNQME4wHQYDVR0OBBYEFHyc5wEg+klCOqiJqFE473Ty1/YnMB8GA1UdIwQY
-						MBaAFHyc5wEg+klCOqiJqFE473Ty1/YnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
-						AQEFBQADggEBAC6aG56JBmxTiBDNatEhacitubAc+4g/4fKMY/dAVd9SR/Qc8BN4
-						YGaM5lR5hhjITyDD/HRI90EEhVXL/TrVmHECXL2SSXRaKJElUIWBtZggFDcyWBC+
-						jQPsf/QvfYTheFklroidGqhKUtATdsWtL5iYKjUSYySWQXeujpmNXNjUKJDXsPPX
-						iUSrx58Jl1ywPSdJfbDBb8jcb/8TTSq5xEl37TkXp86zvOUrmYFn+RexScPt+kHG
-						i4v7/IIqQEnbyG6PZ5CmgZLw5kz1RaQHxfeDomry3wDksX3X3fJUszF3NFBuuPyU
-						+w4TA7Ns7GKZQL7rjKJD7Q35wrF/KnjuwCo=
-					</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>
-						MIIDRjCCAi6gAwIBAgIIZQXHbuQMihkwDQYJKoZIhvcNAQEFBQAwOjEgMB4GA1UE
-						CgwXVW5pdmVyc2l0eSBvZiBHcmVlbndpY2gxFjAUBgNVBAMMDWlkcC5ncmUuYWMu
-						dWswHhcNMTMwNjA2MTIzMDE5WhcNMjMwNjA2MTIzMDE5WjA6MSAwHgYDVQQKDBdV
-						bml2ZXJzaXR5IG9mIEdyZWVud2ljaDEWMBQGA1UEAwwNaWRwLmdyZS5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIvRxjI34duzh2spZJCamd9E
-						8OwnYWdLNS9ZEdorE9x9ZXQA/ejG4x10O1Ljr0N6+0T9YEEa/1JiNp2tUvX3UT7b
-						34EKrE5WcYJVZxmPptfge6NakSRBgA5lptbP4mUa4nF52mcovhIWpuk/UYlBKIlJ
-						kyodxPGsC4t2cQpvmbSs0RksyIbw7LVBV4MQ6lJtUr1z8KSgyykl2nYfvtWVFmjM
-						smHYt5hXI0Wnmb7mzaRpum1jCWDOfM7frUeA/LR82Vht5QwLBofN1foBy+epycoQ
-						mWhalR5RO9O4fcKpdDivesBRr2Azv1yqYAWHFHSuWZIBVu0tJFIOENNAnfdG0PkC
-						AwEAAaNQME4wHQYDVR0OBBYEFHyc5wEg+klCOqiJqFE473Ty1/YnMB8GA1UdIwQY
-						MBaAFHyc5wEg+klCOqiJqFE473Ty1/YnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
-						AQEFBQADggEBAC6aG56JBmxTiBDNatEhacitubAc+4g/4fKMY/dAVd9SR/Qc8BN4
-						YGaM5lR5hhjITyDD/HRI90EEhVXL/TrVmHECXL2SSXRaKJElUIWBtZggFDcyWBC+
-						jQPsf/QvfYTheFklroidGqhKUtATdsWtL5iYKjUSYySWQXeujpmNXNjUKJDXsPPX
-						iUSrx58Jl1ywPSdJfbDBb8jcb/8TTSq5xEl37TkXp86zvOUrmYFn+RexScPt+kHG
-						i4v7/IIqQEnbyG6PZ5CmgZLw5kz1RaQHxfeDomry3wDksX3X3fJUszF3NFBuuPyU
-						+w4TA7Ns7GKZQL7rjKJD7Q35wrF/KnjuwCo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gre.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gre.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Greenwich</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Greenwich - OpenAthens</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gre.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nadine</GivenName>
-    <SurName>Edwards</SurName>
-    <EmailAddress>mailto:n.c.edwards@gre.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Geoff</GivenName>
-    <SurName>Hunter</SurName>
-    <EmailAddress>mailto:g.j.hunter@gre.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.greatplains.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.greatplains.net-idp-shibboleth.xml
deleted file mode 100644
index 10190394..00000000
--- a/swamid-interfederations-2.0/idp.greatplains.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://idp.greatplains.net/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.greatplains.net/idp-errorURL.html" 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">greatplains.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GPN (Great Plains Network)</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>
-MIIDNzCCAh+gAwIBAgIUFkE64moFaIhXMDCjOYF/pXt+myEwDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTaWRwLmdyZWF0cGxhaW5zLm5ldDAeFw0xMjA4MjgxODA4
-MTVaFw0zMjA4MjgxODA4MTVaMB4xHDAaBgNVBAMTE2lkcC5ncmVhdHBsYWlucy5u
-ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCJb1/fIoXiV9S24Zs
-KIBkZXWFGg4CFofLrt+Ofqe3KScPgrSuOaAIRGFV6H45ffjpxH2O7MegQEfS0T82
-YL6i9fGIBKDelhUaGpQr2lXy0YpxtMuS/U3TgWlj+MQhF5PT9e2hstc1x0zNLPdd
-nLyMuros0Zgqpmx7JgxdLD3WyCpErfYQUL1tOL0L+gZz+Q3hDzj9thZOBbktG9yW
-FYCS10g/2bpF4i+vn0o5sn95Zn2N2KXzn4PyzpRknA3o9g/mL3LVXEj/ZUPMt1xQ
-OGO8e4ipbp9FiSSdcLbRaoangRmTZdr7b3O6Lez1W5oAKHO3XIQ46pXByPevVeQv
-tl1HAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkcC5ncmVhdHBsYWlucy5uZXSGKmh0
-dHBzOi8vaWRwLmdyZWF0cGxhaW5zLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUXYulMzBC7goBszw85WRWDuitUnkwDQYJKoZIhvcNAQEFBQADggEBAFjokVaL
-MFLCkRElu52HjU12YPMOkrFX9i7swTbu5Z+YN8Y1GfN7R0frH5kBB8X3U6bdg/aJ
-ZoS8iF/dJR8wGZoU3br8wVLYm7iQOtyxGr1AHuzu0/DfO/P12a/Xnz8AL3ObfUtU
-wuuKwiCIZiXJ66nN4FN77K2Sh1l8Jdm+CvDdJnA7royifENjXYIx/PcM6xx5tH1a
-nLo/T26nCpBMgsgy02vDr7mrjW7MlTONGkyFO3nSv8rkdDMM+55YG8j+JwsMZLij
-O9bdKwzjyxN8V1LdoKcQnW6pgSNaw7TXudUNyLDr7WhXLny2RmDpVgljo7HYm6wH
-UgsT6cj2ibjVHHo=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.greatplains.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.greatplains.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.greatplains.net/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.greatplains.net/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.greatplains.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">greatplains.net</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUFkE64moFaIhXMDCjOYF/pXt+myEwDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTaWRwLmdyZWF0cGxhaW5zLm5ldDAeFw0xMjA4MjgxODA4
-MTVaFw0zMjA4MjgxODA4MTVaMB4xHDAaBgNVBAMTE2lkcC5ncmVhdHBsYWlucy5u
-ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCJb1/fIoXiV9S24Zs
-KIBkZXWFGg4CFofLrt+Ofqe3KScPgrSuOaAIRGFV6H45ffjpxH2O7MegQEfS0T82
-YL6i9fGIBKDelhUaGpQr2lXy0YpxtMuS/U3TgWlj+MQhF5PT9e2hstc1x0zNLPdd
-nLyMuros0Zgqpmx7JgxdLD3WyCpErfYQUL1tOL0L+gZz+Q3hDzj9thZOBbktG9yW
-FYCS10g/2bpF4i+vn0o5sn95Zn2N2KXzn4PyzpRknA3o9g/mL3LVXEj/ZUPMt1xQ
-OGO8e4ipbp9FiSSdcLbRaoangRmTZdr7b3O6Lez1W5oAKHO3XIQ46pXByPevVeQv
-tl1HAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkcC5ncmVhdHBsYWlucy5uZXSGKmh0
-dHBzOi8vaWRwLmdyZWF0cGxhaW5zLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUXYulMzBC7goBszw85WRWDuitUnkwDQYJKoZIhvcNAQEFBQADggEBAFjokVaL
-MFLCkRElu52HjU12YPMOkrFX9i7swTbu5Z+YN8Y1GfN7R0frH5kBB8X3U6bdg/aJ
-ZoS8iF/dJR8wGZoU3br8wVLYm7iQOtyxGr1AHuzu0/DfO/P12a/Xnz8AL3ObfUtU
-wuuKwiCIZiXJ66nN4FN77K2Sh1l8Jdm+CvDdJnA7royifENjXYIx/PcM6xx5tH1a
-nLo/T26nCpBMgsgy02vDr7mrjW7MlTONGkyFO3nSv8rkdDMM+55YG8j+JwsMZLij
-O9bdKwzjyxN8V1LdoKcQnW6pgSNaw7TXudUNyLDr7WhXLny2RmDpVgljo7HYm6wH
-UgsT6cj2ibjVHHo=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.greatplains.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.greatplains.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GPN (Great Plains Network)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GPN (Great Plains Network)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.greatplains.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kate Adams</md:GivenName>
-    <md:EmailAddress>kate@greatplains.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Denis Hancock</md:GivenName>
-    <md:EmailAddress>HancockDC@missouri.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Greg Monaco</md:GivenName>
-    <md:EmailAddress>greg@greatplains.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml
deleted file mode 100644
index f83bf4b2..00000000
--- a/swamid-interfederations-2.0/idp.grena.ge-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.grena.ge/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://mtd.gif.grena.ge" registrationInstant="2015-07-17T13:04:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://gif.grena.ge/admin/editor/uploads/files/GIF%20Identity%20Federation%20Policy.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">GRENA Identity Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GRENA Identity Provider</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://gif.grena.ge</mdui:InformationURL>
-        <mdui:Logo width="375" height="156" xml:lang="en">https://idp.grena.ge/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:41.70478,44.78696</mdui:GeolocationHint>
-        <mdui:IPHint>217.147.239.162/32</mdui:IPHint>
-        <mdui:DomainHint>idp.grena.ge</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID6zCCAtOgAwIBAgIJAMK8nCcQGikvMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
-VQQGEwJHRTEQMA4GA1UECAwHR2VvcmdpYTEQMA4GA1UEBwwHVGJpbGlzaTFBMD8G
-A1UECgw4R2VvcmdpYW4gUmVzZWFyY2ggQW5kIEVkdWNhdGlvbmFsIE5ldHdvcmtp
-bmcgQXNzb2NpYXRpb24xFTATBgNVBAMMDGlkcC5ncmVuYS5nZTAeFw0xNTA3MTcx
-MTIwMTlaFw0yNTA3MTYxMTIwMTlaMIGLMQswCQYDVQQGEwJHRTEQMA4GA1UECAwH
-R2VvcmdpYTEQMA4GA1UEBwwHVGJpbGlzaTFBMD8GA1UECgw4R2VvcmdpYW4gUmVz
-ZWFyY2ggQW5kIEVkdWNhdGlvbmFsIE5ldHdvcmtpbmcgQXNzb2NpYXRpb24xFTAT
-BgNVBAMMDGlkcC5ncmVuYS5nZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAKmRiKfjvn2QbIqLA+yaZf1OpKhMAhFSWcWPZD7kyc87BJXOD3YOgeds+RP8
-mLLjQZPWcSeZFJWHCVHv7KlktKtm2oZ3W44cnAIFhhrC0t2mT1pnYjYGuw7TiLsr
-qtjcsaxnzxOlp0rQH478sdGJwOhn6ue37sQ9rg9WL8LQ0NZtnuSshCHc7l+wla1k
-EwhGkWEmiNtmgFR+1PeXAmwsBI0TDP7dA4yAUycD9npAWniEzNhIDA/2+q7E6FlV
-hVW2aGF0LyJW83TgsXQdmzo/Ty2vun6SszW4jhkJ6o5zBNejIDvBuxI/z0Qsnxv+
-sSBjTxSR47hpdGOcp53B3jzLzScCAwEAAaNQME4wHQYDVR0OBBYEFCOwPyzLpYFQ
-a2pFDQb1caVLFakjMB8GA1UdIwQYMBaAFCOwPyzLpYFQa2pFDQb1caVLFakjMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKEbjiRTIxTQsA6JuDc5GjdS
-axaYXy3vCjkqxEKT+yG4EglBVKn2sZAPK4sZAOM3rQo1h4edQ8y4EO9U/CqvqLjY
-4A4UEzqoLbREJGoQ58BNSvbl9DDktW2S0tTo+Jb7GRL0MnLxKNk3iyn474l/oC7o
-3v4V9RaaUC5Q+/cmsGbJVsTuvI/kKta4smE59jsZTsmw4opW8Hi0rzENAw4Yw4we
-qM2ADO+fHzadaRenQyRaUz5HtKKJjDpbXSAvPpQVdcX18Ci8lrkTEcxHcEguviQb
-0GPUicJISIenHlfwmQyRZpxfi4EtvvSl8Eyr2EiOHgUjI/4MspHWuVEkQDaQGoE=
-</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>
-MIID6zCCAtOgAwIBAgIJAMK8nCcQGikvMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
-VQQGEwJHRTEQMA4GA1UECAwHR2VvcmdpYTEQMA4GA1UEBwwHVGJpbGlzaTFBMD8G
-A1UECgw4R2VvcmdpYW4gUmVzZWFyY2ggQW5kIEVkdWNhdGlvbmFsIE5ldHdvcmtp
-bmcgQXNzb2NpYXRpb24xFTATBgNVBAMMDGlkcC5ncmVuYS5nZTAeFw0xNTA3MTcx
-MTIwMTlaFw0yNTA3MTYxMTIwMTlaMIGLMQswCQYDVQQGEwJHRTEQMA4GA1UECAwH
-R2VvcmdpYTEQMA4GA1UEBwwHVGJpbGlzaTFBMD8GA1UECgw4R2VvcmdpYW4gUmVz
-ZWFyY2ggQW5kIEVkdWNhdGlvbmFsIE5ldHdvcmtpbmcgQXNzb2NpYXRpb24xFTAT
-BgNVBAMMDGlkcC5ncmVuYS5nZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAKmRiKfjvn2QbIqLA+yaZf1OpKhMAhFSWcWPZD7kyc87BJXOD3YOgeds+RP8
-mLLjQZPWcSeZFJWHCVHv7KlktKtm2oZ3W44cnAIFhhrC0t2mT1pnYjYGuw7TiLsr
-qtjcsaxnzxOlp0rQH478sdGJwOhn6ue37sQ9rg9WL8LQ0NZtnuSshCHc7l+wla1k
-EwhGkWEmiNtmgFR+1PeXAmwsBI0TDP7dA4yAUycD9npAWniEzNhIDA/2+q7E6FlV
-hVW2aGF0LyJW83TgsXQdmzo/Ty2vun6SszW4jhkJ6o5zBNejIDvBuxI/z0Qsnxv+
-sSBjTxSR47hpdGOcp53B3jzLzScCAwEAAaNQME4wHQYDVR0OBBYEFCOwPyzLpYFQ
-a2pFDQb1caVLFakjMB8GA1UdIwQYMBaAFCOwPyzLpYFQa2pFDQb1caVLFakjMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAKEbjiRTIxTQsA6JuDc5GjdS
-axaYXy3vCjkqxEKT+yG4EglBVKn2sZAPK4sZAOM3rQo1h4edQ8y4EO9U/CqvqLjY
-4A4UEzqoLbREJGoQ58BNSvbl9DDktW2S0tTo+Jb7GRL0MnLxKNk3iyn474l/oC7o
-3v4V9RaaUC5Q+/cmsGbJVsTuvI/kKta4smE59jsZTsmw4opW8Hi0rzENAw4Yw4we
-qM2ADO+fHzadaRenQyRaUz5HtKKJjDpbXSAvPpQVdcX18Ci8lrkTEcxHcEguviQb
-0GPUicJISIenHlfwmQyRZpxfi4EtvvSl8Eyr2EiOHgUjI/4MspHWuVEkQDaQGoE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.grena.ge/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.grena.ge/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Georgian Research And Educational Networking Association</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Georgian Research And Educational Networking Association</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://grena.ge/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Temur</md:GivenName>
-    <md:SurName>Maisuradze</md:SurName>
-    <md:EmailAddress>mailto:sysadmin@grena.ge</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.xml
deleted file mode 100644
index d011382a..00000000
--- a/swamid-interfederations-2.0/idp.grimsby.ac.uk-oala-metadata.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.grimsby.ac.uk/oala/metadata">
-  <!--
-		This is a "Test" OpenAthens LA IdP for the Grimsby Institute of Further and Higher Education.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-23T09:44:56Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">grimsby.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-							MIIDhDCCAmygAwIBAgIIH70XfscAcqYwDQYJKoZIhvcNAQEFBQAwWTE7MDkGA1UE
-							CgwyR3JpbXNieSBJbnN0aXR1dGUgZm9yIEZ1cnRoZXIgYW5kIEhpZ2hlciBFZHVj
-							YXRpb24xGjAYBgNVBAMMEWlkcC5ncmltc2J5LmFjLnVrMB4XDTE0MDYwMzEzMjky
-							OVoXDTI0MDYwMzEzMjkyOVowWTE7MDkGA1UECgwyR3JpbXNieSBJbnN0aXR1dGUg
-							Zm9yIEZ1cnRoZXIgYW5kIEhpZ2hlciBFZHVjYXRpb24xGjAYBgNVBAMMEWlkcC5n
-							cmltc2J5LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh+gq
-							7zDrrAi7jZFx0cUlhbbcxUFDR1oTGlXf/jPDjKWavaIM/Gl1iQ9mrQVLmkH/W/IA
-							Vbk6sofrhnmzadRKq0OT4Vui4IjjeeYGYvTq5naNE+oh+W4au1oZOMQeglgIDhWd
-							ZGmimiq7k/t82K/84z6rD33/2Jt6wPZmynrhdNA0DWTGM6Ri0RQNT1SFbCousvhm
-							G4eGvfK/rlRbouRQjRoBFOW8tdJk2fIwczS5xJoDCPP+1awIIVUYHBM1rhORFtTS
-							sn/YWlvAp0ZahXuN/KUXtV6HQz70+LX7qPT1G3Pj2PJll+hMUD14OpMOVR0kB6MJ
-							vHxF37Ux4DsMQRh27wIDAQABo1AwTjAdBgNVHQ4EFgQUaZXT/v4e36tmutKwfdoU
-							M0KH9acwHwYDVR0jBBgwFoAUaZXT/v4e36tmutKwfdoUM0KH9acwDAYDVR0TBAUw
-							AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEARhiT5E/0HuU6FcdPenL+PXlWODHxeISi
-							w5idnZGVCiWCR+KNz+OEzF+aiQdIFDO3hAb/MGFJ8CPFEogdApZJouRmHxz8i3Y6
-							0tuSDLJpI1t4hs2Be+PrXGHueK4+srZfpca2ns3s8Jp61r353iG+qLV1V8iQmxKy
-							D4IlEvMsstT1ICScNeItMIb4O515zxNix+hf2CdEK5yknZSvdeYfk3A/Dgh8o4FZ
-							lDzym0z/+t36nVPVTlYDzeOXN/e9B2LLzJwRmLG87VZj+pA3pjBKIu341QzZ1pz+
-							nWsg1LPp3/B6n72ejbSVL5kmuwr5dWE4gcD9xLNAz2LrGPyA/ziZhw==
-						</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>
-							MIIDhDCCAmygAwIBAgIIH70XfscAcqYwDQYJKoZIhvcNAQEFBQAwWTE7MDkGA1UE
-							CgwyR3JpbXNieSBJbnN0aXR1dGUgZm9yIEZ1cnRoZXIgYW5kIEhpZ2hlciBFZHVj
-							YXRpb24xGjAYBgNVBAMMEWlkcC5ncmltc2J5LmFjLnVrMB4XDTE0MDYwMzEzMjky
-							OVoXDTI0MDYwMzEzMjkyOVowWTE7MDkGA1UECgwyR3JpbXNieSBJbnN0aXR1dGUg
-							Zm9yIEZ1cnRoZXIgYW5kIEhpZ2hlciBFZHVjYXRpb24xGjAYBgNVBAMMEWlkcC5n
-							cmltc2J5LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh+gq
-							7zDrrAi7jZFx0cUlhbbcxUFDR1oTGlXf/jPDjKWavaIM/Gl1iQ9mrQVLmkH/W/IA
-							Vbk6sofrhnmzadRKq0OT4Vui4IjjeeYGYvTq5naNE+oh+W4au1oZOMQeglgIDhWd
-							ZGmimiq7k/t82K/84z6rD33/2Jt6wPZmynrhdNA0DWTGM6Ri0RQNT1SFbCousvhm
-							G4eGvfK/rlRbouRQjRoBFOW8tdJk2fIwczS5xJoDCPP+1awIIVUYHBM1rhORFtTS
-							sn/YWlvAp0ZahXuN/KUXtV6HQz70+LX7qPT1G3Pj2PJll+hMUD14OpMOVR0kB6MJ
-							vHxF37Ux4DsMQRh27wIDAQABo1AwTjAdBgNVHQ4EFgQUaZXT/v4e36tmutKwfdoU
-							M0KH9acwHwYDVR0jBBgwFoAUaZXT/v4e36tmutKwfdoUM0KH9acwDAYDVR0TBAUw
-							AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEARhiT5E/0HuU6FcdPenL+PXlWODHxeISi
-							w5idnZGVCiWCR+KNz+OEzF+aiQdIFDO3hAb/MGFJ8CPFEogdApZJouRmHxz8i3Y6
-							0tuSDLJpI1t4hs2Be+PrXGHueK4+srZfpca2ns3s8Jp61r353iG+qLV1V8iQmxKy
-							D4IlEvMsstT1ICScNeItMIb4O515zxNix+hf2CdEK5yknZSvdeYfk3A/Dgh8o4FZ
-							lDzym0z/+t36nVPVTlYDzeOXN/e9B2LLzJwRmLG87VZj+pA3pjBKIu341QzZ1pz+
-							nWsg1LPp3/B6n72ejbSVL5kmuwr5dWE4gcD9xLNAz2LrGPyA/ziZhw==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.grimsby.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.grimsby.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Grimsby Institute of Further and Higher Education</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Grimsby Institute of Further &amp; Higher Education (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.grimsby.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Fiona</GivenName>
-    <SurName>Lilley</SurName>
-    <EmailAddress>mailto:lilleyf@grimsby.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Barry</GivenName>
-    <SurName>Clarkson</SurName>
-    <EmailAddress>mailto:clarksonbc@grimsby.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gsm.org.uk-entity.xml b/swamid-interfederations-2.0/idp.gsm.org.uk-entity.xml
deleted file mode 100644
index 48c898f0..00000000
--- a/swamid-interfederations-2.0/idp.gsm.org.uk-entity.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.gsm.org.uk/entity">
-  <!--
-		This is an IdP (owned by Eduserv) for Greenwich School of Management Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-26T10:55:52Z">
-      <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 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">gsm.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/gsm.org.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/gsm.org.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GSM London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gsm.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gsmd.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.gsmd.ac.uk-openathens.xml
deleted file mode 100644
index 4a653070..00000000
--- a/swamid-interfederations-2.0/idp.gsmd.ac.uk-openathens.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.gsmd.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Guildhall School of Music and Drama.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">gsmd.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/gsmd.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/gsmd.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Guildhall School of Music &amp; Drama</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gsmd.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml b/swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml
deleted file mode 100644
index a854af7c..00000000
--- a/swamid-interfederations-2.0/idp.gssk.si-idp-20141130.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gssk.si/idp/20141130">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-02T11:12:08Z">
-      <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 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">gssk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.gssk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dijak.gssk.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Gimnazija in srednja šola Kočevje</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Gimnazija in srednja šola Kočevje</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for Gimnazija in srednja šola Kočevje</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet Gimnazija in srednja šola Kočevje</mdui:Description>
-        <mdui:Keywords xml:lang="en">identity provider idp Gimnazija in srednja šola Kočevje</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">ponudink identitet idp Gimnazija in srednja šola Kočevje</mdui:Keywords>
-        <mdui:Logo height="115" width="120">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.gssk.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.gssk.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>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</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>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gssk.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.gssk.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIMNAZIJA IN SREDNJA ŠOLA KOČEVJE - Gimnazija</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">GIMNAZIJA IN SREDNJA ŠOLA KOČEVJE - Gimnazija</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIMNAZIJA IN SREDNJA ŠOLA KOČEVJE - Gimnazija</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">GIMNAZIJA IN SREDNJA ŠOLA KOČEVJE - Gimnazija</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gssk.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.gssk.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Meta</md:GivenName>
-    <md:SurName>Kamšek</md:SurName>
-    <md:EmailAddress>mailto:meta.kamsek@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:info@gssk.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Toni</md:GivenName>
-    <md:SurName>Mihelič</md:SurName>
-    <md:EmailAddress>mailto:toni.mihelic@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Anton</md:GivenName>
-    <md:SurName>Mihelic</md:SurName>
-    <md:EmailAddress>mailto:toni.mihelic@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tomaž</md:GivenName>
-    <md:SurName>Ferbežar</md:SurName>
-    <md:EmailAddress>mailto:tomaz.ferbezar@sc-nm.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Anton</md:GivenName>
-    <md:SurName>Mihelic</md:SurName>
-    <md:EmailAddress>mailto:toni.mihelic@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gsu.edu-idp-shibboleth.xml
deleted file mode 100644
index 6765f3ad..00000000
--- a/swamid-interfederations-2.0/idp.gsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,158 +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://idp.gsu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.gsu.edu/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">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Georgia State University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Georgia State University is located in the heart of downtown Atlanta. Georgia State is one of the country's leading urban research universities.</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>
-MIIDiDCCAnACCQCrY2VVpigyOTANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-VVMxEDAOBgNVBAgMB0dlb3JnaWExEDAOBgNVBAcMB0F0bGFudGExDDAKBgNVBAoM
-A0dTVTENMAsGA1UECwwESVMmVDEUMBIGA1UEAwwLaWRwLmdzdS5lZHUxHzAdBgkq
-hkiG9w0BCQEWEHJyZWRkaXNoQGdzdS5lZHUwHhcNMTMwODEyMTYzMzEyWhcNMjMw
-ODEyMTYzMzEyWjCBhTELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0dlb3JnaWExEDAO
-BgNVBAcMB0F0bGFudGExDDAKBgNVBAoMA0dTVTENMAsGA1UECwwESVMmVDEUMBIG
-A1UEAwwLaWRwLmdzdS5lZHUxHzAdBgkqhkiG9w0BCQEWEHJyZWRkaXNoQGdzdS5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCi46F3cO420nIJduG7
-bz9n2uBJQyyulhsMQ1NkV1AyZgjXhPWOf1eH8UgP1Z1w4qZiCEJZ2ESkmpGLOvCv
-XZOoF7Re+IZ+RcfNvTIkrsYmUi7QJMUdsmHojnFbgrygc/liFen50x3lB7YWz2hg
-Oh82QJ1LGeNLDy2UWXjBOsNQgZ0kLXBIoqRaGFoj7+DxsrPheaXnFGLEIQo0NHRt
-ZMJWOkDoLwadWBEprMcTiEgBQhyTDjinA1c9smZ8xHxhyUY/b8X6uLlPfQSTR2H3
-/bP3DdvUtjawOBD0fTGyaHHyVgKh9VHoprjpFzghPn2oS3/FNO1S8japHQYcQ4Yw
-Z2IJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEx2wJjdE2IR2j4ak4iHKvnEFBwP
-BERQgwVN3Hg652gZBEo0rjRWE2gojCf1Aw8cgi1qGH5mRys3I837WwBuQBRd9Q+E
-aoV966qWrbAkWUPpE0XXquXcCheSJIN3OzlHZesynoeFeFLRGLp4xYfSwAqQuIHt
-bjfhewGhe4cfwJlWByoS9RDQUVrHGl6MgMvk/l2wXIFn4I+6DqJYsHAWl/e1m9Zh
-tN0DE2kMdJnP9uo3P2zbnx1OjnhEKq8USicqfJ0WURaAf3pvB2CQlfHJpLyTk4su
-MaNh4Mq+DwonONJ2IrxNOVDGr1OizMya+fiAPFA2l+XvfveCYE4qgQrBubA=
-          </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>
-MIIDiDCCAnACCQDgmtUnSYaEQzANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-VVMxEDAOBgNVBAgMB0dlb3JnaWExEDAOBgNVBAcMB0F0bGFudGExDDAKBgNVBAoM
-A0dTVTENMAsGA1UECwwESVMmVDEUMBIGA1UEAwwLaWRwLmdzdS5lZHUxHzAdBgkq
-hkiG9w0BCQEWEHJyZWRkaXNoQGdzdS5lZHUwHhcNMTIwODIzMTgyNjQxWhcNMTMw
-ODIzMTgyNjQxWjCBhTELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0dlb3JnaWExEDAO
-BgNVBAcMB0F0bGFudGExDDAKBgNVBAoMA0dTVTENMAsGA1UECwwESVMmVDEUMBIG
-A1UEAwwLaWRwLmdzdS5lZHUxHzAdBgkqhkiG9w0BCQEWEHJyZWRkaXNoQGdzdS5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+iygvUXA1CzRqsw7P
-N9cFg/9h/Gw8TNlj/XR9Sv2RlEUdnuSNTMgF6lF7lbU5eqfjEG4aKyP2aI6Krdl7
-lqqYrXCY3WOrnHo8SfNUsdbdT8tmm46ye4n2S0dDVII0RuJ5POKdtSjhKF2TZWlo
-lk6DyltMAq6803bdWStsZN0L/sQyaqmLkWLIH7S0FCsus7ypS2EA4IjcZVbuWoy0
-ughOCRqmJCzLEkFaTysMzrVgSrAjT4WHrFFfBV9gBdalrJ9Kmqhr1BlUWOJmFLah
-TOW8Q81034cAApmY6DkiWVO69+IzUWxhsjrXk9Lt0tem4ovr/yMPdtxYJgsDJgAA
-TtDtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAENAbC841AsHB1tQ1VjltsH4uWct
-woTLcdkuX4owoYLlddpG1IUk0iCr9ugjk2WIAK+kFbJzxB9IvXPYuWn9GQlWjlug
-LnLL6XizmhPUuHpAAkjM48RgJkxZkBlKdy+JyUK9Wz9syXx5SisfDBXadL4QsKx2
-Xz3sw2sFRwZfMd1Ir2BFufxHwyR1wDMISkLW4KIh2Y/A4T5PJnyr1gvqCuGFBmVa
-bnsCGHbhR1ukH8bdVEe3cfowAMDJEJHVZGEJYruqe0hjIa/ZDKXFWaDuyaknM5OD
-BCoW3mMYc0Wvo936Rx/CEhxnkL8hh/p+qdyWRZOJy3H1eHEP91+c5Uy+T7U=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gsu.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gsu.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gsu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gsu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.gsu.edu/idp/profile/SAML2/POST-SimpleSign/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">gsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDiDCCAnACCQCrY2VVpigyOTANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-VVMxEDAOBgNVBAgMB0dlb3JnaWExEDAOBgNVBAcMB0F0bGFudGExDDAKBgNVBAoM
-A0dTVTENMAsGA1UECwwESVMmVDEUMBIGA1UEAwwLaWRwLmdzdS5lZHUxHzAdBgkq
-hkiG9w0BCQEWEHJyZWRkaXNoQGdzdS5lZHUwHhcNMTMwODEyMTYzMzEyWhcNMjMw
-ODEyMTYzMzEyWjCBhTELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0dlb3JnaWExEDAO
-BgNVBAcMB0F0bGFudGExDDAKBgNVBAoMA0dTVTENMAsGA1UECwwESVMmVDEUMBIG
-A1UEAwwLaWRwLmdzdS5lZHUxHzAdBgkqhkiG9w0BCQEWEHJyZWRkaXNoQGdzdS5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCi46F3cO420nIJduG7
-bz9n2uBJQyyulhsMQ1NkV1AyZgjXhPWOf1eH8UgP1Z1w4qZiCEJZ2ESkmpGLOvCv
-XZOoF7Re+IZ+RcfNvTIkrsYmUi7QJMUdsmHojnFbgrygc/liFen50x3lB7YWz2hg
-Oh82QJ1LGeNLDy2UWXjBOsNQgZ0kLXBIoqRaGFoj7+DxsrPheaXnFGLEIQo0NHRt
-ZMJWOkDoLwadWBEprMcTiEgBQhyTDjinA1c9smZ8xHxhyUY/b8X6uLlPfQSTR2H3
-/bP3DdvUtjawOBD0fTGyaHHyVgKh9VHoprjpFzghPn2oS3/FNO1S8japHQYcQ4Yw
-Z2IJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEx2wJjdE2IR2j4ak4iHKvnEFBwP
-BERQgwVN3Hg652gZBEo0rjRWE2gojCf1Aw8cgi1qGH5mRys3I837WwBuQBRd9Q+E
-aoV966qWrbAkWUPpE0XXquXcCheSJIN3OzlHZesynoeFeFLRGLp4xYfSwAqQuIHt
-bjfhewGhe4cfwJlWByoS9RDQUVrHGl6MgMvk/l2wXIFn4I+6DqJYsHAWl/e1m9Zh
-tN0DE2kMdJnP9uo3P2zbnx1OjnhEKq8USicqfJ0WURaAf3pvB2CQlfHJpLyTk4su
-MaNh4Mq+DwonONJ2IrxNOVDGr1OizMya+fiAPFA2l+XvfveCYE4qgQrBubA=
-          </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>
-MIIDiDCCAnACCQDgmtUnSYaEQzANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-VVMxEDAOBgNVBAgMB0dlb3JnaWExEDAOBgNVBAcMB0F0bGFudGExDDAKBgNVBAoM
-A0dTVTENMAsGA1UECwwESVMmVDEUMBIGA1UEAwwLaWRwLmdzdS5lZHUxHzAdBgkq
-hkiG9w0BCQEWEHJyZWRkaXNoQGdzdS5lZHUwHhcNMTIwODIzMTgyNjQxWhcNMTMw
-ODIzMTgyNjQxWjCBhTELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0dlb3JnaWExEDAO
-BgNVBAcMB0F0bGFudGExDDAKBgNVBAoMA0dTVTENMAsGA1UECwwESVMmVDEUMBIG
-A1UEAwwLaWRwLmdzdS5lZHUxHzAdBgkqhkiG9w0BCQEWEHJyZWRkaXNoQGdzdS5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+iygvUXA1CzRqsw7P
-N9cFg/9h/Gw8TNlj/XR9Sv2RlEUdnuSNTMgF6lF7lbU5eqfjEG4aKyP2aI6Krdl7
-lqqYrXCY3WOrnHo8SfNUsdbdT8tmm46ye4n2S0dDVII0RuJ5POKdtSjhKF2TZWlo
-lk6DyltMAq6803bdWStsZN0L/sQyaqmLkWLIH7S0FCsus7ypS2EA4IjcZVbuWoy0
-ughOCRqmJCzLEkFaTysMzrVgSrAjT4WHrFFfBV9gBdalrJ9Kmqhr1BlUWOJmFLah
-TOW8Q81034cAApmY6DkiWVO69+IzUWxhsjrXk9Lt0tem4ovr/yMPdtxYJgsDJgAA
-TtDtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAENAbC841AsHB1tQ1VjltsH4uWct
-woTLcdkuX4owoYLlddpG1IUk0iCr9ugjk2WIAK+kFbJzxB9IvXPYuWn9GQlWjlug
-LnLL6XizmhPUuHpAAkjM48RgJkxZkBlKdy+JyUK9Wz9syXx5SisfDBXadL4QsKx2
-Xz3sw2sFRwZfMd1Ir2BFufxHwyR1wDMISkLW4KIh2Y/A4T5PJnyr1gvqCuGFBmVa
-bnsCGHbhR1ukH8bdVEe3cfowAMDJEJHVZGEJYruqe0hjIa/ZDKXFWaDuyaknM5OD
-BCoW3mMYc0Wvo936Rx/CEhxnkL8hh/p+qdyWRZOJy3H1eHEP91+c5Uy+T7U=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gsu.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gsu.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Georgia State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Georgia State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gsu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ron Reddish</md:GivenName>
-    <md:EmailAddress>rreddish@gsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Joel Burke</md:GivenName>
-    <md:EmailAddress>burke@gsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jeremy Mullins</md:GivenName>
-    <md:EmailAddress>mullins@gsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.gyc.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.gyc.ac.uk-openathens.xml
deleted file mode 100644
index 0499dc35..00000000
--- a/swamid-interfederations-2.0/idp.gyc.ac.uk-openathens.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.gyc.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Great Yarmouth College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">gyc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/gyc.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/gyc.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Great Yarmouth College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gyc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hackney.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.hackney.ac.uk-shibboleth.xml
deleted file mode 100644
index 66197f35..00000000
--- a/swamid-interfederations-2.0/idp.hackney.ac.uk-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.hackney.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Hackney Community College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">hackney.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/hackney.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/hackney.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hackney Community College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hackney.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hadlow.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hadlow.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index d7130602..00000000
--- a/swamid-interfederations-2.0/idp.hadlow.ac.uk-idp-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://idp.hadlow.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Hadlow College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-19T15:03:35Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">hadlow.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIUUn7bQ0XDWcr3Co/oK0CMHoqS5fowDQYJKoZIhvcNAQEF
-						BQAwGzEZMBcGA1UEAxMQaWRwLmhhZGxvdy5hYy51azAeFw0xMzA4MTkwODU3MTBa
-						Fw0zMzA4MTkwODU3MTBaMBsxGTAXBgNVBAMTEGlkcC5oYWRsb3cuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQaykOHXOVF0pQE7TXZnKVRhY0
-						+JJeP3kvp64iwEL9NeyYP133uHLZC+NjUkbTpUehkMJP1se48RF9zxTElCsCZD0C
-						PU53UcSawLVB0LdthbndIoXpJspSldbXYsFCSgJ0y4ET488L+DXrdXs+URLrtwlJ
-						u1/VyCDabGiKbwMhie44kjmraPh5Saw2Q8zmI/BLlePkDbxgUjS9VVdlDcntLxVv
-						wmgOwe7UyJ8GoXQTea4n2gozK/1joIQT+QS1UDoq71fSzbU9wVLLAp17ayS0vdZ2
-						vszXsoNMJ82dpyh/SxGscdsN0ES+yxmRxoCC80ZO9WhZr4yKNALXgwjisuN5AgMB
-						AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5oYWRsb3cuYWMudWuGJ2h0dHBzOi8vaWRw
-						LmhhZGxvdy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU0wtjFNb5tSCT
-						jngzlq6ZqphRzh0wDQYJKoZIhvcNAQEFBQADggEBAI693mT576C3fcOKTsEW8yoQ
-						E6g3O73nq4tNlk5JIXrTLELjqj6rJJWHFS81MNlXPBWa2wOEZuFxufHJdsMQuKq4
-						5RZw0e/pSvH/IdyoHwq0lI5tBFVme/KezBkFIrfsRg7U6+1bkEHC6RnHq7Z99QIH
-						rEHDp4jdvsKe93mv2iGFY/9Og/LTDSJHMS/qAdQ6wBrl8z5slZgjMBocRm5P3jHg
-						+RrN+5fIqWtyTCU3m5GS6DWkMniRDCH6GyvScizqAKlmO+T/YHI4HbXCv16kdoh2
-						U0KM6sPHjZWhRj2/g5+7WpHT5b8olPEUoWArqU3fl/u5A2obzw7p2fOEt7adcak=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hadlow.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hadlow.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.hadlow.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hadlow.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.hadlow.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hadlow.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hadlow.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">hadlow.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIUUn7bQ0XDWcr3Co/oK0CMHoqS5fowDQYJKoZIhvcNAQEF
-						BQAwGzEZMBcGA1UEAxMQaWRwLmhhZGxvdy5hYy51azAeFw0xMzA4MTkwODU3MTBa
-						Fw0zMzA4MTkwODU3MTBaMBsxGTAXBgNVBAMTEGlkcC5oYWRsb3cuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQaykOHXOVF0pQE7TXZnKVRhY0
-						+JJeP3kvp64iwEL9NeyYP133uHLZC+NjUkbTpUehkMJP1se48RF9zxTElCsCZD0C
-						PU53UcSawLVB0LdthbndIoXpJspSldbXYsFCSgJ0y4ET488L+DXrdXs+URLrtwlJ
-						u1/VyCDabGiKbwMhie44kjmraPh5Saw2Q8zmI/BLlePkDbxgUjS9VVdlDcntLxVv
-						wmgOwe7UyJ8GoXQTea4n2gozK/1joIQT+QS1UDoq71fSzbU9wVLLAp17ayS0vdZ2
-						vszXsoNMJ82dpyh/SxGscdsN0ES+yxmRxoCC80ZO9WhZr4yKNALXgwjisuN5AgMB
-						AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5oYWRsb3cuYWMudWuGJ2h0dHBzOi8vaWRw
-						LmhhZGxvdy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU0wtjFNb5tSCT
-						jngzlq6ZqphRzh0wDQYJKoZIhvcNAQEFBQADggEBAI693mT576C3fcOKTsEW8yoQ
-						E6g3O73nq4tNlk5JIXrTLELjqj6rJJWHFS81MNlXPBWa2wOEZuFxufHJdsMQuKq4
-						5RZw0e/pSvH/IdyoHwq0lI5tBFVme/KezBkFIrfsRg7U6+1bkEHC6RnHq7Z99QIH
-						rEHDp4jdvsKe93mv2iGFY/9Og/LTDSJHMS/qAdQ6wBrl8z5slZgjMBocRm5P3jHg
-						+RrN+5fIqWtyTCU3m5GS6DWkMniRDCH6GyvScizqAKlmO+T/YHI4HbXCv16kdoh2
-						U0KM6sPHjZWhRj2/g5+7WpHT5b8olPEUoWArqU3fl/u5A2obzw7p2fOEt7adcak=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hadlow.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hadlow.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">Hadlow College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hadlow College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://hadlow.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Overt Software Solutions Ltd</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hadlow College Computer Services</GivenName>
-    <EmailAddress>mailto:IT.support@hadlow.ac.uk</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 72769773..00000000
--- a/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hainaut-promsoc.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hainaut-promsoc.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Hainaut-PromSoc</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Students and Teachers from Social Promotion Schools of Province de Hainaut</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Hainaut-PromSoc</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etudiants et Enseignants de l'Enseignement de Promotion Sociale de la Province de Hainaut</mdui:Description>
-        <mdui:Logo height="16" width="16">https://cdn.ecampus-hainaut.be/logos/idp-hps-16x16.jpg</mdui:Logo>
-        <mdui:Logo height="291" width="88">https://cdn.ecampus-hainaut.be/logos/idp-hps-291x88.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.190.199.64/26</mdui:IPHint>
-        <mdui:DomainHint>hainaut-promsoc.be</mdui:DomainHint>
-        <mdui:GeolocationHint>50.41719089999999,4.448670300000003</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>
-MIIDRDCCAiygAwIBAgIVAN68rKymbP0przSDvaG0eMoh/UGiMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXByb21zb2MuYmUwHhcNMTUxMjAz
-MTIxMTQ0WhcNMzUxMjAzMTIxMTQ0WjAhMR8wHQYDVQQDDBZpZHAuaGFpbmF1dC1w
-cm9tc29jLmJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgFh9v8nu
-DZ22vG1hQaV9mA6+H6eobWNhEKHO/YdcC+uNU8dNrHgfvdGjTrrIk9BGFdsTuxak
-UnmVYQho3ASbc7LQdTlxJegvogiI6e+zl8vGrwKyhCYmAz3oDHnLA/YAkgk0EWRE
-juD2qYAYfgqMg/M6goWyn1EsCUk9pFc4D1tnmqsUWzG2dTwAfOlbDduMhJrU9F+v
-nNlayDAHWiPxASDsbQSRYtkA9O4xjujLcj65r3p2c+Xba5fVu9M57yeykvjVkYs2
-x+3rKyMzLEV46emeLCHiltpzHr3VJBlkT6ny66eXYd2Y7nTnRNEka/JACmcFFpO4
-hHPl8Rrf0qBqiQIDAQABo3MwcTAdBgNVHQ4EFgQU2/sCjD8jZll6GJw9Kf5qRcu+
-T7owUAYDVR0RBEkwR4IWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZYYtaHR0cHM6Ly9p
-ZHAuaGFpbmF1dC1wcm9tc29jLmJlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQBqaAQAbDvMlqplLVZpzw0F+UgxxsOL3kI2ATOH6jGrTqrWA/7bj8Ma
-oYM22iUjtuMPa9r9+F3IA08krhALvMhgRsseM8n0kxWxIWtcGEE37MlHgaCsNUXt
-FnkP8thyCr8CnwzqWpFj5ouXaNqtDhx+qFM08XBDJh2mkCDQriD8lqHE2NUnfgGl
-Du+vSV7PfHKMdpMYJLFmT+Ry3bjrNA/WibJkQ4Hf9OtuOQ4M5k3VodWj2LCO4Ybh
-lGfxo5nF26RIBrY4mtTninIvP75nJjAJoS029RDpoYpl8Mh8t+lxsY0tisaYoJgF
-FgGl1jbigT4J3Bxxv1wcRfblufkR5grP
-                        </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>
-MIIDRDCCAiygAwIBAgIVAPLtvCrrYfdTvxrnQNxT4wh/M2m9MA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXByb21zb2MuYmUwHhcNMTUxMjAz
-MTIxMTQyWhcNMzUxMjAzMTIxMTQyWjAhMR8wHQYDVQQDDBZpZHAuaGFpbmF1dC1w
-cm9tc29jLmJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9Z7Y1aEi
-Bjtge0mCkmRNZBB+ZCJa/w1WFVh2kuY0gFYzeHdsN91yxUiaDujaXigN9rl9Z+cv
-AE/RN0MQtZbRROu89WA6ZcDcgsvcKLWfXr/RjC/nmtxuwBcvfJyFphXaaz1V2334
-6m1lIFQ43aE5s4NhrtENXhiukbHeCvaN1rwjdski73+POVKTDUr4a00r8/tybJgO
-iUZrFDbRBZJ/TnQohhhGWTJEHbrvYApwKju8JQcMwk7R+bABsgf/oqki4pNmxXH8
-HevxO72Exn6uVi6AWO5rGiQX+jIyIJZprZCPeUoMjge5bpz3+vRlm9kO9Y0ablbT
-urOW9BAgDEHcNQIDAQABo3MwcTAdBgNVHQ4EFgQU6QJuMQqUcLoXMT4CrRK/yO8x
-z1wwUAYDVR0RBEkwR4IWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZYYtaHR0cHM6Ly9p
-ZHAuaGFpbmF1dC1wcm9tc29jLmJlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQDmP+yXnrrlRJ2D+inYx0mRAClGzzo3fG4Jgr46DWXrsRcrCJH3sjQr
-5MKNtgyPyZDy/NXcNtVS3IFJZkg27pokUD28RQtRB1dcCT++YIoViKtXnPct9nSQ
-jnORWcsiw2Yx48rauTpJzA5vIEmwSv79iidoalBaxpiO7gXJL7JNqgVjhjBd9yDX
-RVL+pTLN5MhbSF6izeLcpvI/xhneStzW3b3IhHS+rPikg3GufLhM++5A45qAAqAz
-VRQosvXh6gvNKUDJpqCMK+m4b/Ue9rOBqtV9g8peJfZ9TQ9CKwDB0UbPPCfEEI/7
-MilG31thHKJnTIULp8CAkF+DIFtOcpk6
-                        </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>
-MIIDQzCCAiugAwIBAgIUcuiw7sw3OSPjhIvrmbLChEBZ60AwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZTAeFw0xNTEyMDMx
-MjExNDJaFw0zNTEyMDMxMjExNDJaMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXBy
-b21zb2MuYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfLBJTJiLz
-o30Vpv8ZwM2q/p9p6RdXo/zpvhNO3nkcvLYHPZssOR/u6MDCNNbjP/3PeLdqepvo
-UOzEw3hPg/IWsoPTnr3MYHRWYmzvBnr33rA/QAmv6OnW3RQjtCwQFH5UXQ9S/Xv3
-o5YbB8vRaVrPZPd5EzyXoyo2zIZc5si2pbQj/0B40BPI8M+dsrInvtwOCJ6CgLkq
-zCD1bzY0P3EtbxGRFSA4fyZDO+72sIXX1fU0jniek/oEDTjRsi0svgUdwNcTi+qV
-totEXOvkjv8jRJnzh0E2jOqGeXcSv6673gZvddG+Tcy8aQlNhfF9nvA9scNxtU1s
-b9Kor1NNei7ZAgMBAAGjczBxMB0GA1UdDgQWBBQBxbm5XMUopQNiz45GhwbwO0MZ
-qTBQBgNVHREESTBHghZpZHAuaGFpbmF1dC1wcm9tc29jLmJlhi1odHRwczovL2lk
-cC5oYWluYXV0LXByb21zb2MuYmUvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAJitAtWal9yuAUxDZhwEcq8s7R8+UpopnmhanN/8/QbaJq5SnsDecbRe
-0vds9Q8WQ2C/WBUq33+Szk5jxSO2b830qqaQoS3+aaXM6f9tnROYGpLcGxubtpa6
-WS0SvJWfMV82YL6KMkRbKmhjOUaOsS9kzbG+pevWlB5HtqwqYo13auvD8pzdZj6O
-kXjj5QdTeFZqiqhfLGzAbN2PT8m9ooeompaKdXPPPE6lGxBbkxb7oaiTbhQ2Vq2a
-ThgBAs9l2+KxbBZMSIKonHuNy4rabps8OlUROSbh9uwTGfK/wP540Ig3zmKlNJ2n
-yre8A56stjeXAkdXHlOhm0/9YlW1hHQ=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be: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.hainaut-promsoc.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be/idp/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hainaut-promsoc.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAN68rKymbP0przSDvaG0eMoh/UGiMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXByb21zb2MuYmUwHhcNMTUxMjAz
-MTIxMTQ0WhcNMzUxMjAzMTIxMTQ0WjAhMR8wHQYDVQQDDBZpZHAuaGFpbmF1dC1w
-cm9tc29jLmJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgFh9v8nu
-DZ22vG1hQaV9mA6+H6eobWNhEKHO/YdcC+uNU8dNrHgfvdGjTrrIk9BGFdsTuxak
-UnmVYQho3ASbc7LQdTlxJegvogiI6e+zl8vGrwKyhCYmAz3oDHnLA/YAkgk0EWRE
-juD2qYAYfgqMg/M6goWyn1EsCUk9pFc4D1tnmqsUWzG2dTwAfOlbDduMhJrU9F+v
-nNlayDAHWiPxASDsbQSRYtkA9O4xjujLcj65r3p2c+Xba5fVu9M57yeykvjVkYs2
-x+3rKyMzLEV46emeLCHiltpzHr3VJBlkT6ny66eXYd2Y7nTnRNEka/JACmcFFpO4
-hHPl8Rrf0qBqiQIDAQABo3MwcTAdBgNVHQ4EFgQU2/sCjD8jZll6GJw9Kf5qRcu+
-T7owUAYDVR0RBEkwR4IWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZYYtaHR0cHM6Ly9p
-ZHAuaGFpbmF1dC1wcm9tc29jLmJlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQBqaAQAbDvMlqplLVZpzw0F+UgxxsOL3kI2ATOH6jGrTqrWA/7bj8Ma
-oYM22iUjtuMPa9r9+F3IA08krhALvMhgRsseM8n0kxWxIWtcGEE37MlHgaCsNUXt
-FnkP8thyCr8CnwzqWpFj5ouXaNqtDhx+qFM08XBDJh2mkCDQriD8lqHE2NUnfgGl
-Du+vSV7PfHKMdpMYJLFmT+Ry3bjrNA/WibJkQ4Hf9OtuOQ4M5k3VodWj2LCO4Ybh
-lGfxo5nF26RIBrY4mtTninIvP75nJjAJoS029RDpoYpl8Mh8t+lxsY0tisaYoJgF
-FgGl1jbigT4J3Bxxv1wcRfblufkR5grP
-                        </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>
-MIIDRDCCAiygAwIBAgIVAPLtvCrrYfdTvxrnQNxT4wh/M2m9MA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXByb21zb2MuYmUwHhcNMTUxMjAz
-MTIxMTQyWhcNMzUxMjAzMTIxMTQyWjAhMR8wHQYDVQQDDBZpZHAuaGFpbmF1dC1w
-cm9tc29jLmJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9Z7Y1aEi
-Bjtge0mCkmRNZBB+ZCJa/w1WFVh2kuY0gFYzeHdsN91yxUiaDujaXigN9rl9Z+cv
-AE/RN0MQtZbRROu89WA6ZcDcgsvcKLWfXr/RjC/nmtxuwBcvfJyFphXaaz1V2334
-6m1lIFQ43aE5s4NhrtENXhiukbHeCvaN1rwjdski73+POVKTDUr4a00r8/tybJgO
-iUZrFDbRBZJ/TnQohhhGWTJEHbrvYApwKju8JQcMwk7R+bABsgf/oqki4pNmxXH8
-HevxO72Exn6uVi6AWO5rGiQX+jIyIJZprZCPeUoMjge5bpz3+vRlm9kO9Y0ablbT
-urOW9BAgDEHcNQIDAQABo3MwcTAdBgNVHQ4EFgQU6QJuMQqUcLoXMT4CrRK/yO8x
-z1wwUAYDVR0RBEkwR4IWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZYYtaHR0cHM6Ly9p
-ZHAuaGFpbmF1dC1wcm9tc29jLmJlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQDmP+yXnrrlRJ2D+inYx0mRAClGzzo3fG4Jgr46DWXrsRcrCJH3sjQr
-5MKNtgyPyZDy/NXcNtVS3IFJZkg27pokUD28RQtRB1dcCT++YIoViKtXnPct9nSQ
-jnORWcsiw2Yx48rauTpJzA5vIEmwSv79iidoalBaxpiO7gXJL7JNqgVjhjBd9yDX
-RVL+pTLN5MhbSF6izeLcpvI/xhneStzW3b3IhHS+rPikg3GufLhM++5A45qAAqAz
-VRQosvXh6gvNKUDJpqCMK+m4b/Ue9rOBqtV9g8peJfZ9TQ9CKwDB0UbPPCfEEI/7
-MilG31thHKJnTIULp8CAkF+DIFtOcpk6
-                        </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>
-MIIDQzCCAiugAwIBAgIUcuiw7sw3OSPjhIvrmbLChEBZ60AwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWaWRwLmhhaW5hdXQtcHJvbXNvYy5iZTAeFw0xNTEyMDMx
-MjExNDJaFw0zNTEyMDMxMjExNDJaMCExHzAdBgNVBAMMFmlkcC5oYWluYXV0LXBy
-b21zb2MuYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCfLBJTJiLz
-o30Vpv8ZwM2q/p9p6RdXo/zpvhNO3nkcvLYHPZssOR/u6MDCNNbjP/3PeLdqepvo
-UOzEw3hPg/IWsoPTnr3MYHRWYmzvBnr33rA/QAmv6OnW3RQjtCwQFH5UXQ9S/Xv3
-o5YbB8vRaVrPZPd5EzyXoyo2zIZc5si2pbQj/0B40BPI8M+dsrInvtwOCJ6CgLkq
-zCD1bzY0P3EtbxGRFSA4fyZDO+72sIXX1fU0jniek/oEDTjRsi0svgUdwNcTi+qV
-totEXOvkjv8jRJnzh0E2jOqGeXcSv6673gZvddG+Tcy8aQlNhfF9nvA9scNxtU1s
-b9Kor1NNei7ZAgMBAAGjczBxMB0GA1UdDgQWBBQBxbm5XMUopQNiz45GhwbwO0MZ
-qTBQBgNVHREESTBHghZpZHAuaGFpbmF1dC1wcm9tc29jLmJlhi1odHRwczovL2lk
-cC5oYWluYXV0LXByb21zb2MuYmUvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAJitAtWal9yuAUxDZhwEcq8s7R8+UpopnmhanN/8/QbaJq5SnsDecbRe
-0vds9Q8WQ2C/WBUq33+Szk5jxSO2b830qqaQoS3+aaXM6f9tnROYGpLcGxubtpa6
-WS0SvJWfMV82YL6KMkRbKmhjOUaOsS9kzbG+pevWlB5HtqwqYo13auvD8pzdZj6O
-kXjj5QdTeFZqiqhfLGzAbN2PT8m9ooeompaKdXPPPE6lGxBbkxb7oaiTbhQ2Vq2a
-ThgBAs9l2+KxbBZMSIKonHuNy4rabps8OlUROSbh9uwTGfK/wP540Ig3zmKlNJ2n
-yre8A56stjeXAkdXHlOhm0/9YlW1hHQ=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hainaut-promsoc.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hainaut-promsoc.be: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">Enseignement de Promotion Sociale de la Province de Hainaut</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Hainaut-PromSoc</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hainaut-promsoc.be</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>webmaster@hainaut-promsoc.be</md:EmailAddress>
-    <md:TelephoneNumber>+3271531578</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hampshire.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hampshire.edu-idp-shibboleth.xml
deleted file mode 100644
index 308a139a..00000000
--- a/swamid-interfederations-2.0/idp.hampshire.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://idp.hampshire.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">hampshire.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Hampshire College</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>
-MIIDMDCCAhigAwIBAgIVALwMcFu6yCQI/NKTFc9rDbEYlS9FMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC5oYW1wc2hpcmUuZWR1MB4XDTEwMTIxNjIxNDgz
-OVoXDTMwMTIxNjIxNDgzOVowHDEaMBgGA1UEAxMRaWRwLmhhbXBzaGlyZS5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe5/ldBevXTijAqGzYzGTS
-ScCFbIUcaKPFWuI1hp/CEifa95qe6fgMXcm7apemUrAXkPkOU1qyLi1tJaim3Mx8
-hMFLdfY64Hpoq9XcqaQKdoFDpvwxUKTAxvjI6IxL1Z7/X3IFSM7wdrQ4u/kIjBel
-qneDH/7UjAS1G/UfLOY7wgkbPc7QS0Llru5kXZOjoDFFh7MvkCogD1N514G7K+tD
-Ukzqug05AMVrBYK5Z3mslya5Z0X5Q/y63Z9ZTZC9RBFWiZwoVyZwS59mtlV+53Vv
-AbzWHt2wI2GBiQY2WXE3wb+zxb9pTnvey+ZG/wBJy9T4SLi4m0cUahJNeQhS61hH
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5oYW1wc2hpcmUuZWR1hihodHRwczov
-L2lkcC5oYW1wc2hpcmUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ9zs3s
-R/rwqzG6jQ2osIiunDNu+TANBgkqhkiG9w0BAQUFAAOCAQEATV1+GoSdEhH7RM6v
-LxJB849ke8Y76EXda7tI5Mh8HZorkiS15yWUNlJv/0dFuwwdHvurYn4sRCX0kgST
-775+ixbx3gVHz1GE2hPxyt4XFOriBR/dIPpzb1KrX7jWlvUe39uTzlyP0kPiKB9T
-UZAFtHU9eEIgBF2K8BXrgOJlFdafpO+BvnddSDulD1arCNR4v5m/AUQgbjzOTIb5
-7+agSMUvFerHCtfJCDmZqH26FJl+TsMc+TJUuojStICm0CDrDL1InZRDQVA1chw/
-VvX8muYzljIcbhSKscHFh9jTgF3tS1Q+X1Jg3E3kC8CVgHP3wvPX6Z+I0bmfSvRo
-CnVcoA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hampshire.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hampshire.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hampshire.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hampshire.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hampshire.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hampshire.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVALwMcFu6yCQI/NKTFc9rDbEYlS9FMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC5oYW1wc2hpcmUuZWR1MB4XDTEwMTIxNjIxNDgz
-OVoXDTMwMTIxNjIxNDgzOVowHDEaMBgGA1UEAxMRaWRwLmhhbXBzaGlyZS5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe5/ldBevXTijAqGzYzGTS
-ScCFbIUcaKPFWuI1hp/CEifa95qe6fgMXcm7apemUrAXkPkOU1qyLi1tJaim3Mx8
-hMFLdfY64Hpoq9XcqaQKdoFDpvwxUKTAxvjI6IxL1Z7/X3IFSM7wdrQ4u/kIjBel
-qneDH/7UjAS1G/UfLOY7wgkbPc7QS0Llru5kXZOjoDFFh7MvkCogD1N514G7K+tD
-Ukzqug05AMVrBYK5Z3mslya5Z0X5Q/y63Z9ZTZC9RBFWiZwoVyZwS59mtlV+53Vv
-AbzWHt2wI2GBiQY2WXE3wb+zxb9pTnvey+ZG/wBJy9T4SLi4m0cUahJNeQhS61hH
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5oYW1wc2hpcmUuZWR1hihodHRwczov
-L2lkcC5oYW1wc2hpcmUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ9zs3s
-R/rwqzG6jQ2osIiunDNu+TANBgkqhkiG9w0BAQUFAAOCAQEATV1+GoSdEhH7RM6v
-LxJB849ke8Y76EXda7tI5Mh8HZorkiS15yWUNlJv/0dFuwwdHvurYn4sRCX0kgST
-775+ixbx3gVHz1GE2hPxyt4XFOriBR/dIPpzb1KrX7jWlvUe39uTzlyP0kPiKB9T
-UZAFtHU9eEIgBF2K8BXrgOJlFdafpO+BvnddSDulD1arCNR4v5m/AUQgbjzOTIb5
-7+agSMUvFerHCtfJCDmZqH26FJl+TsMc+TJUuojStICm0CDrDL1InZRDQVA1chw/
-VvX8muYzljIcbhSKscHFh9jTgF3tS1Q+X1Jg3E3kC8CVgHP3wvPX6Z+I0bmfSvRo
-CnVcoA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hampshire.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Hampshire College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Hampshire College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hampshire.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Chris Kitzmiller</md:GivenName>
-    <md:EmailAddress>ckitzmiller@hampshire.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Josiah Erikson</md:GivenName>
-    <md:EmailAddress>wjeNS@hampshire.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Becca Groveman</md:GivenName>
-    <md:EmailAddress>bgroveman@hampshire.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.harrow.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.harrow.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 6a0c0d09..00000000
--- a/swamid-interfederations-2.0/idp.harrow.ac.uk-idp-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://idp.harrow.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Harrow College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">harrow.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAIAV6r9T9UOFBwHmuFZHQ/Zrx7aPMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC5oYXJyb3cuYWMudWswHhcNMTIwMjA4MDk0MjIw
-						WhcNMzIwMjA4MDk0MjIwWjAbMRkwFwYDVQQDExBpZHAuaGFycm93LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlmctLybnvCCmJ/okx0YFhn03
-						b/2PuyksfVZ0LI986BrnNSvYYlm69Z0Y+wO8FLzN7fW2ztz5Xyag3eakCiyKAfP0
-						23OLkdjG42bVlpjhYzW9OyamNtd9MbvkF5vNU8QA5eyRm+jhuqgmRiwhdfbwDvdw
-						eW6SmDHChmGr6YGfHMfvBjQNAO/x+VPdqcz7TREb4AtGLch8+pRMSslTaMZibdYe
-						zKmOMKqywQBRYiUxP6Msys1kTkEAUQbN/ZQ5Eny1ys/cXiqCwraOfqrLeaCM3qaX
-						D84w1/2OQCWlpzsmG5kBOg8EpuVLfUTMSRdYwPfV67J9r90r+8XNkyKAGzYb4wID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuaGFycm93LmFjLnVrhidodHRwczovL2lk
-						cC5oYXJyb3cuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEE/B4YVPRZs
-						hx5Gp1R7uhe+AMnTMA0GCSqGSIb3DQEBBQUAA4IBAQAep4beNMViVZQ7+v1Qu9WA
-						LAzsaiBDj/jkcj+iQaCzxrfzi9tkA/eP87iuMVc9y8MXbmclSZoDl91x2EZ7ohmd
-						lmuA6fTdWuZ3gTFVoVD1fssqnQ5yZusGlLRtoZDqIowhiy04IVwvCopNHwu111M4
-						m74wYHqOLXRK/3w/0WA/KVItqlhUBpv3ClOZWnG//zTRkmyienu7sksiRZy79H40
-						nzqETopxqXGh+VtCAGvaHN2sO9Td+s03xE8YO3DSIdt8ykhOQh/yYRhRrREHAqTg
-						D6jRZoljE6KqZDICisJHSEinDErpP8g07mv2HH62e25QQikqxYKRNGb/7SpAIR9o
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.harrow.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.harrow.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.harrow.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.harrow.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.harrow.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.harrow.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">harrow.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAIAV6r9T9UOFBwHmuFZHQ/Zrx7aPMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC5oYXJyb3cuYWMudWswHhcNMTIwMjA4MDk0MjIw
-						WhcNMzIwMjA4MDk0MjIwWjAbMRkwFwYDVQQDExBpZHAuaGFycm93LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlmctLybnvCCmJ/okx0YFhn03
-						b/2PuyksfVZ0LI986BrnNSvYYlm69Z0Y+wO8FLzN7fW2ztz5Xyag3eakCiyKAfP0
-						23OLkdjG42bVlpjhYzW9OyamNtd9MbvkF5vNU8QA5eyRm+jhuqgmRiwhdfbwDvdw
-						eW6SmDHChmGr6YGfHMfvBjQNAO/x+VPdqcz7TREb4AtGLch8+pRMSslTaMZibdYe
-						zKmOMKqywQBRYiUxP6Msys1kTkEAUQbN/ZQ5Eny1ys/cXiqCwraOfqrLeaCM3qaX
-						D84w1/2OQCWlpzsmG5kBOg8EpuVLfUTMSRdYwPfV67J9r90r+8XNkyKAGzYb4wID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuaGFycm93LmFjLnVrhidodHRwczovL2lk
-						cC5oYXJyb3cuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEE/B4YVPRZs
-						hx5Gp1R7uhe+AMnTMA0GCSqGSIb3DQEBBQUAA4IBAQAep4beNMViVZQ7+v1Qu9WA
-						LAzsaiBDj/jkcj+iQaCzxrfzi9tkA/eP87iuMVc9y8MXbmclSZoDl91x2EZ7ohmd
-						lmuA6fTdWuZ3gTFVoVD1fssqnQ5yZusGlLRtoZDqIowhiy04IVwvCopNHwu111M4
-						m74wYHqOLXRK/3w/0WA/KVItqlhUBpv3ClOZWnG//zTRkmyienu7sksiRZy79H40
-						nzqETopxqXGh+VtCAGvaHN2sO9Td+s03xE8YO3DSIdt8ykhOQh/yYRhRrREHAqTg
-						D6jRZoljE6KqZDICisJHSEinDErpP8g07mv2HH62e25QQikqxYKRNGb/7SpAIR9o
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.harrow.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.harrow.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">Harrow College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Harrow College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.harrow.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dan</GivenName>
-    <SurName>Biggs</SurName>
-    <EmailAddress>mailto:dbiggs@harrow.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dan</GivenName>
-    <SurName>Biggs</SurName>
-    <EmailAddress>mailto:dbiggs@harrow.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hartlepoolfe.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.hartlepoolfe.ac.uk-openathens.xml
deleted file mode 100644
index 6615f0bb..00000000
--- a/swamid-interfederations-2.0/idp.hartlepoolfe.ac.uk-openathens.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.hartlepoolfe.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Hartlepool College of Further Education.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">hartlepoolfe.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/hartlepoolfe.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/hartlepoolfe.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hartlepool College of FE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hartlepoolfe.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.havant.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.havant.ac.uk-shibboleth.xml
deleted file mode 100644
index 3f3aebe1..00000000
--- a/swamid-interfederations-2.0/idp.havant.ac.uk-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.havant.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Havant College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">havant.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/havant.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/havant.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Havant College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.havant.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.havering-college.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.havering-college.ac.uk-openathens.xml
deleted file mode 100644
index 395041c9..00000000
--- a/swamid-interfederations-2.0/idp.havering-college.ac.uk-openathens.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.havering-college.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Havering College of Further and Higher Education.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">havering-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/havering-college.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/havering-college.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Havering College of Further &amp; Higher Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.havering-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.havering-sfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.havering-sfc.ac.uk-shibboleth.xml
deleted file mode 100644
index abd8001f..00000000
--- a/swamid-interfederations-2.0/idp.havering-sfc.ac.uk-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.havering-sfc.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Havering Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">havering-sfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/havering-sfc.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/havering-sfc.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Havering Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.havering-sfc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hawaii.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hawaii.edu-idp-shibboleth.xml
deleted file mode 100644
index 828923da..00000000
--- a/swamid-interfederations-2.0/idp.hawaii.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +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://idp.hawaii.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">hawaii.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Hawaii</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>
-MIIDIzCCAgugAwIBAgIUbG6AsWJKVFL4BChkxcf2t9iBajMwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmhhd2FpaS5lZHUwHhcNMTAwNjA4MDE0ODI4WhcN
-MzAwNjA4MDE0ODI4WjAZMRcwFQYDVQQDEw5pZHAuaGF3YWlpLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBANw36Y5YP/lArq7ctP14ghwuWEUeMUUl
-5Nkd7TpKa4aeHyj+UoCTQQHfy+arJO1itCPHz98Uhaw4G4XQnxQhfuw6L6mz2//A
-eOdlpt5GkJMQIy5pE4pLOXOhHBYJmBLsTPWB8I0QizAAb3xXTeUB++ww0IO9bOR0
-VA8tI6kWSCWlxDAQQ4Thn/Jz0XEX1R2YJQR8b5oo+FIuV9In+qJ3j4NbUqfeKMzL
-vK+fNeH/XhyT20dkp8g3gXfEX0zVwFSjiYeYDulD/HTnjoy6ZBheXPJOSAW8ywAC
-0xd4hmFpsGjmPNHL+17suRCKXcDkwUsmwcZ9/RWvo/iJLE1Ol763OhUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmhhd2FpaS5lZHWGJWh0dHBzOi8vaWRwLmhhd2Fp
-aS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFH/WD1Sn9/gtumFPjrjPJaeN
-zMYVMA0GCSqGSIb3DQEBBQUAA4IBAQAuNKVRhisKC2eBievJQzGjMV7WAsAnRrR6
-6bMHDqIp3xfi+/H0b9dVm8SqBj/p4mHp/aL8156Swm02souRvqg6WaKsV4q3BDKk
-aXeO5QDC+tC6HB7NSofJV7IcJLs5cZjqSRf3grbSWMugafBVbIvJuhs7uTYVZJby
-6h/kbkMY4Y7Fgg7Vg9yLtmyDMJs7eUz5pY4vPHzxwMVC6amJSMmMVhjsRWnmaAq+
-+jxLLXON7aWQGK5hhCLuzDL0zq6pX6THeEoNssY75ZTX0mWIaMwDQnvnA+5E2ca3
-lcsojI5PrsQEZo8UhgHFafO6bTiv+g2a2j0mVhWU1YJGOscK2Awq
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hawaii.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hawaii.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hawaii.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUbG6AsWJKVFL4BChkxcf2t9iBajMwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmhhd2FpaS5lZHUwHhcNMTAwNjA4MDE0ODI4WhcN
-MzAwNjA4MDE0ODI4WjAZMRcwFQYDVQQDEw5pZHAuaGF3YWlpLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBANw36Y5YP/lArq7ctP14ghwuWEUeMUUl
-5Nkd7TpKa4aeHyj+UoCTQQHfy+arJO1itCPHz98Uhaw4G4XQnxQhfuw6L6mz2//A
-eOdlpt5GkJMQIy5pE4pLOXOhHBYJmBLsTPWB8I0QizAAb3xXTeUB++ww0IO9bOR0
-VA8tI6kWSCWlxDAQQ4Thn/Jz0XEX1R2YJQR8b5oo+FIuV9In+qJ3j4NbUqfeKMzL
-vK+fNeH/XhyT20dkp8g3gXfEX0zVwFSjiYeYDulD/HTnjoy6ZBheXPJOSAW8ywAC
-0xd4hmFpsGjmPNHL+17suRCKXcDkwUsmwcZ9/RWvo/iJLE1Ol763OhUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmhhd2FpaS5lZHWGJWh0dHBzOi8vaWRwLmhhd2Fp
-aS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFH/WD1Sn9/gtumFPjrjPJaeN
-zMYVMA0GCSqGSIb3DQEBBQUAA4IBAQAuNKVRhisKC2eBievJQzGjMV7WAsAnRrR6
-6bMHDqIp3xfi+/H0b9dVm8SqBj/p4mHp/aL8156Swm02souRvqg6WaKsV4q3BDKk
-aXeO5QDC+tC6HB7NSofJV7IcJLs5cZjqSRf3grbSWMugafBVbIvJuhs7uTYVZJby
-6h/kbkMY4Y7Fgg7Vg9yLtmyDMJs7eUz5pY4vPHzxwMVC6amJSMmMVhjsRWnmaAq+
-+jxLLXON7aWQGK5hhCLuzDL0zq6pX6THeEoNssY75ZTX0mWIaMwDQnvnA+5E2ca3
-lcsojI5PrsQEZo8UhgHFafO6bTiv+g2a2j0mVhWU1YJGOscK2Awq
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hawaii.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Hawaii</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Hawaii</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hawaii.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UH ITS Identity and Access Management</md:GivenName>
-    <md:EmailAddress>its-iam-help@lists.hawaii.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Michael Hodges</md:GivenName>
-    <md:EmailAddress>mhodges@hawaii.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hca.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.hca.ac.uk-shibboleth.xml
deleted file mode 100644
index 0d3dc0ec..00000000
--- a/swamid-interfederations-2.0/idp.hca.ac.uk-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.hca.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Hereford College of Arts.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">hca.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/hca.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/hca.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hereford College of Arts</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hca.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</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 2c82a974..00000000
--- a/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>
-    <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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>https://edugate.heanet.ie/rr3/p/page/HEAnetInternalEC</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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 Staff</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.heanet.ie</mdui:InformationURL>
-        <mdui:Logo height="82" width="200" xml:lang="en">data:image/png;base64,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</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:DomainHint>heanet.ie</mdui:DomainHint>
-        <mdui:IPHint>193.1.228.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:770:f0:10::/64</mdui:IPHint>
-      </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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.heanet.ie/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/profile/SAML2/POST/SLO"/>
-    <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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.heanet.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HEAnet Limited.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HEAnet Limited.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://idp.heanet.ie/support.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Glenn Wearen</md:SurName>
-    <md:EmailAddress>mailto:glenn.wearen@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Janusz Ulanowski</md:SurName>
-    <md:EmailAddress>mailto:janusz.ulanowski@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto: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 68a3f5fe..00000000
--- a/swamid-interfederations-2.0/idp.heanet.ie.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.heanet.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">heanet.ie</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Logo height="82" width="200">https://edugate.heanet.ie/rr3/logos/heanet.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">HEAnet</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://idp.heanet.ie/support.htm</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:GeolocationHint>geo:53.34964831237833,-6.246660947799683</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/logout.jsp"/>
-    <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.heanet.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.heanet.ie/idp/profile/SAML2/POST/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 97ca6f0d..00000000
--- a/swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hebis.de/uni-frankfurt">
-  <md: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>
-  </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-frankfurt.de</shibmd: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>
-    </md:Extensions>
-    <md: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>MIIGNzCCBR+gAwIBAgIHGFx3pTtgCDANBgkqhkiG9w0BAQsFADCBoTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1h
-aW4xLDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0
-MRMwEQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJh
-bmtmdXJ0LmRlMB4XDTE0MTAxNDEwMjUyNVoXDTE5MDcwOTIzNTkwMFowgb0xCzAJ
-BgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBh
-bSBNYWluMT4wPAYDVQQKEzVKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNp
-dGFldCBGcmFua2Z1cnQgYW0gTWFpbjEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVu
-emVudHJ1bTEgMB4GA1UEAxMXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsALjc6bzE8TAoxd+kKkFWraG2H0Bl
-xWDmfi5ByQbQ3XZrF0PsCZhZn6C1WBIWqaMgFmnlpK7/zJt/V2m9pJ1a3jNuYdKi
-JjD17U1xXLcV2hpq1LsIuIRjukS2bZB6baH6gc2QuSQ3e8UlRYjoJrZI6YLTaRh1
-eYqAsHORfjNXk5wrq1KRepH/akKp4hwB5Gy7lN9U9+klk2z+GN6BXndCGL2Y+fiT
-X2HE26HCZ8N7O9GyDSoX1KTr0ErD1bQblMnYh9E+7BnYk4FFeUH7MWUT3CF/rWZB
-qcmZpUZ7MSwH7kHjqrRLthaeJUITBs8JSLrsOweD2NSt41NEG+9E4w+pAgMBAAGj
-ggJUMIICUDBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGt
-IYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU
-5aI383EINa1iBCqan/ibbpmKNkYwHwYDVR0jBBgwFoAUY1l3sUZv4earr8LHk/9f
-cQ1P4P8wIgYDVR0RBBswGYIXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGUwgY0GA1Ud
-HwSBhTCBgjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJhbmtm
-dXJ0LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgdsGCCsG
-AQUFBwEBBIHOMIHLMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
-L09DU1AtU2VydmVyL09DU1AwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYI
-KwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBACH5yde6
-vRx/6F/xAdh6P8Ns0+j4nAkmx6c/NsK972ieieZ6MMCz5WjuDafhg1oDRq7GHYaN
-61N3zfNmYj8wtLrCgsrv8HCGNGFJmdKcga7IUssiRjAUA91VUU5qerQJ1w3qrxCS
-B4NMolDbixNUnNu6UmquzSPYCXFfSbUIzuygmo/i9DLaBfC/QsJHiKk8k4bfOMA6
-ojbuWH+kSD4sRA5eWgtLj8nbBimO/IdsgB2Ytbl4azRwUl9EWALgzU8bk6sGx4y2
-DQXMmdFBkY9JHcxY7nGJXXGHQ26SFFV3dveQE+GAtG/jIFCsxm9D9NmVQxd9W3i5
-bRTKhSFui7ClOO0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ub.uni-frankfurt.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.uni-frankfurt.de/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.uni-frankfurt.de/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-frankfurt.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>MIIGNzCCBR+gAwIBAgIHGFx3pTtgCDANBgkqhkiG9w0BAQsFADCBoTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1h
-aW4xLDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0
-MRMwEQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJh
-bmtmdXJ0LmRlMB4XDTE0MTAxNDEwMjUyNVoXDTE5MDcwOTIzNTkwMFowgb0xCzAJ
-BgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBh
-bSBNYWluMT4wPAYDVQQKEzVKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNp
-dGFldCBGcmFua2Z1cnQgYW0gTWFpbjEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVu
-emVudHJ1bTEgMB4GA1UEAxMXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsALjc6bzE8TAoxd+kKkFWraG2H0Bl
-xWDmfi5ByQbQ3XZrF0PsCZhZn6C1WBIWqaMgFmnlpK7/zJt/V2m9pJ1a3jNuYdKi
-JjD17U1xXLcV2hpq1LsIuIRjukS2bZB6baH6gc2QuSQ3e8UlRYjoJrZI6YLTaRh1
-eYqAsHORfjNXk5wrq1KRepH/akKp4hwB5Gy7lN9U9+klk2z+GN6BXndCGL2Y+fiT
-X2HE26HCZ8N7O9GyDSoX1KTr0ErD1bQblMnYh9E+7BnYk4FFeUH7MWUT3CF/rWZB
-qcmZpUZ7MSwH7kHjqrRLthaeJUITBs8JSLrsOweD2NSt41NEG+9E4w+pAgMBAAGj
-ggJUMIICUDBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGt
-IYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU
-5aI383EINa1iBCqan/ibbpmKNkYwHwYDVR0jBBgwFoAUY1l3sUZv4earr8LHk/9f
-cQ1P4P8wIgYDVR0RBBswGYIXaWRwLnViLnVuaS1mcmFua2Z1cnQuZGUwgY0GA1Ud
-HwSBhTCBgjA/oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJhbmtm
-dXJ0LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgdsGCCsG
-AQUFBwEBBIHOMIHLMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
-L09DU1AtU2VydmVyL09DU1AwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYI
-KwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBACH5yde6
-vRx/6F/xAdh6P8Ns0+j4nAkmx6c/NsK972ieieZ6MMCz5WjuDafhg1oDRq7GHYaN
-61N3zfNmYj8wtLrCgsrv8HCGNGFJmdKcga7IUssiRjAUA91VUU5qerQJ1w3qrxCS
-B4NMolDbixNUnNu6UmquzSPYCXFfSbUIzuygmo/i9DLaBfC/QsJHiKk8k4bfOMA6
-ojbuWH+kSD4sRA5eWgtLj8nbBimO/IdsgB2Ytbl4azRwUl9EWALgzU8bk6sGx4y2
-DQXMmdFBkY9JHcxY7nGJXXGHQ26SFFV3dveQE+GAtG/jIFCsxm9D9NmVQxd9W3i5
-bRTKhSFui7ClOO0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.uni-frankfurt.de: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">e35</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e35</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Johann Wolfgang Goethe-Universität Frankfurt am Main</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Johann Wolfgang Goethe-Universität Frankfurt am Main</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-frankfurt.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-frankfurt.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Axel</md:GivenName>
-    <md:SurName>Doerrer</md:SurName>
-    <md:EmailAddress>mailto:a.doerrer@ub.uni-frankfurt.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Axel</md:GivenName>
-    <md:SurName>Doerrer</md:SurName>
-    <md:EmailAddress>mailto:a.doerrer@ub.uni-frankfurt.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hebis.de.xml b/swamid-interfederations-2.0/idp.hebis.de.xml
deleted file mode 100644
index 74129dec..00000000
--- a/swamid-interfederations-2.0/idp.hebis.de.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hebis.de/uni-frankfurt">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-frankfurt.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hebis.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hebis.de,OU=Universitaetsbibliothek,OU=HeBIS,O=Johann Wolfgang Goethe-Universitaet,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIEDv1DQTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1haW4x
-LDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0MRMw
-EQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJhbmtm
-dXJ0LmRlMB4XDTA5MTAyMDE0MTQwOVoXDTE0MTAxOTE0MTQwOVowgbExCzAJBgNV
-BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBhbSBN
-YWluMSwwKgYDVQQKEyNKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNpdGFl
-dDEOMAwGA1UECxMFSGVCSVMxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90
-aGVrMRUwEwYDVQQDEwxpZHAuaGViaXMuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDUmu8TmWy7MNC9TUDOJLWZiBoWFR3NefKueJBi3dFPTmNw9cWk
-xxGz1rkdUQaOsDE1gnt+/Bqf8qIw1qSOLYRDVQQVmmmWdkrSUYuKx8yR7fQQzn3b
-vJEazxjB9wRsvF8hdXImWNd9v91ktRjkNJ9xl/LgRI7hc6mJbmCFz1LvyzYokzX3
-GuHZsjpjM4S9oBPPn04nmcTQSfhHve0unSYsSenuoahv9xR574+QjpElpvwYr8Tn
-2Vk4X8wpaXSEj+mGqYAfmAUTbkl/D5zcxMNjbvySoCG1Rh5X8WtOZKyVVvDtw0rL
-7wrSm2twGn1nL2vrzDWYxSrhVO6DqOGwSZPbAgMBAAGjggHfMIIB2zAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFKHxmzsUvTLPzqnRjVvmZh6CdpedMB8GA1UdIwQYMBaAFGNZd7FG
-b+Hmq6/Cx5P/X3ENT+D/MCkGA1UdEQQiMCCBHmRvZXJyZXJAaGViaXMudW5pLWZy
-YW5rZnVydC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuG
-OWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBABOmIw57NEumxxyr/4fUsAUlER2xbSXtX8/joRU0jdguyPKpOIAMtmyF
-2O80OUgF/N3+J/PXAKXieHjoO/v68xf34aJITNwSC0VJRPf3HppVXpixoW3z0Wty
-DhqmWBeclHHAxszIP2CitCwqaArkZd9gn64usv68od0Fn30v+fyzghaDRNn44xCK
-hgCb6TiKz41Ub8RkP3/P4xVcEhT4m1lnBf6Ntw9jq3OlLNziNGoZpulcDkDcFudA
-jmbAPxhOXGMrlD1pTsHQj66upfHV+rV9k34wYqjKrnUjNt0jXV6JeKFQRj6opWdD
-DXS5AcmG+q28AsMaFukbkLkJ6aWPyUw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hebis.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hebis.de,OU=Universitaetsbibliothek,OU=HeBIS,O=Johann Wolfgang Goethe-Universitaet,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIEDv1DQTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1haW4x
-LDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0MRMw
-EQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJhbmtm
-dXJ0LmRlMB4XDTA5MTAyMDE0MTQwOVoXDTE0MTAxOTE0MTQwOVowgbExCzAJBgNV
-BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBhbSBN
-YWluMSwwKgYDVQQKEyNKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNpdGFl
-dDEOMAwGA1UECxMFSGVCSVMxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90
-aGVrMRUwEwYDVQQDEwxpZHAuaGViaXMuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDUmu8TmWy7MNC9TUDOJLWZiBoWFR3NefKueJBi3dFPTmNw9cWk
-xxGz1rkdUQaOsDE1gnt+/Bqf8qIw1qSOLYRDVQQVmmmWdkrSUYuKx8yR7fQQzn3b
-vJEazxjB9wRsvF8hdXImWNd9v91ktRjkNJ9xl/LgRI7hc6mJbmCFz1LvyzYokzX3
-GuHZsjpjM4S9oBPPn04nmcTQSfhHve0unSYsSenuoahv9xR574+QjpElpvwYr8Tn
-2Vk4X8wpaXSEj+mGqYAfmAUTbkl/D5zcxMNjbvySoCG1Rh5X8WtOZKyVVvDtw0rL
-7wrSm2twGn1nL2vrzDWYxSrhVO6DqOGwSZPbAgMBAAGjggHfMIIB2zAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFKHxmzsUvTLPzqnRjVvmZh6CdpedMB8GA1UdIwQYMBaAFGNZd7FG
-b+Hmq6/Cx5P/X3ENT+D/MCkGA1UdEQQiMCCBHmRvZXJyZXJAaGViaXMudW5pLWZy
-YW5rZnVydC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuG
-OWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBABOmIw57NEumxxyr/4fUsAUlER2xbSXtX8/joRU0jdguyPKpOIAMtmyF
-2O80OUgF/N3+J/PXAKXieHjoO/v68xf34aJITNwSC0VJRPf3HppVXpixoW3z0Wty
-DhqmWBeclHHAxszIP2CitCwqaArkZd9gn64usv68od0Fn30v+fyzghaDRNn44xCK
-hgCb6TiKz41Ub8RkP3/P4xVcEhT4m1lnBf6Ntw9jq3OlLNziNGoZpulcDkDcFudA
-jmbAPxhOXGMrlD1pTsHQj66upfHV+rV9k34wYqjKrnUjNt0jXV6JeKFQRj6opWdD
-DXS5AcmG+q28AsMaFukbkLkJ6aWPyUw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hebis.de:8443/uni-frankfurt/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hebis.de:8443/uni-frankfurt/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hebis.de/uni-frankfurt/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hebis.de/uni-frankfurt/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hebis.de/uni-frankfurt/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hebis.de/uni-frankfurt/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-frankfurt.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hebis.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hebis.de,OU=Universitaetsbibliothek,OU=HeBIS,O=Johann Wolfgang Goethe-Universitaet,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIEDv1DQTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1haW4x
-LDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0MRMw
-EQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJhbmtm
-dXJ0LmRlMB4XDTA5MTAyMDE0MTQwOVoXDTE0MTAxOTE0MTQwOVowgbExCzAJBgNV
-BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBhbSBN
-YWluMSwwKgYDVQQKEyNKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNpdGFl
-dDEOMAwGA1UECxMFSGVCSVMxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90
-aGVrMRUwEwYDVQQDEwxpZHAuaGViaXMuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDUmu8TmWy7MNC9TUDOJLWZiBoWFR3NefKueJBi3dFPTmNw9cWk
-xxGz1rkdUQaOsDE1gnt+/Bqf8qIw1qSOLYRDVQQVmmmWdkrSUYuKx8yR7fQQzn3b
-vJEazxjB9wRsvF8hdXImWNd9v91ktRjkNJ9xl/LgRI7hc6mJbmCFz1LvyzYokzX3
-GuHZsjpjM4S9oBPPn04nmcTQSfhHve0unSYsSenuoahv9xR574+QjpElpvwYr8Tn
-2Vk4X8wpaXSEj+mGqYAfmAUTbkl/D5zcxMNjbvySoCG1Rh5X8WtOZKyVVvDtw0rL
-7wrSm2twGn1nL2vrzDWYxSrhVO6DqOGwSZPbAgMBAAGjggHfMIIB2zAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFKHxmzsUvTLPzqnRjVvmZh6CdpedMB8GA1UdIwQYMBaAFGNZd7FG
-b+Hmq6/Cx5P/X3ENT+D/MCkGA1UdEQQiMCCBHmRvZXJyZXJAaGViaXMudW5pLWZy
-YW5rZnVydC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuG
-OWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBABOmIw57NEumxxyr/4fUsAUlER2xbSXtX8/joRU0jdguyPKpOIAMtmyF
-2O80OUgF/N3+J/PXAKXieHjoO/v68xf34aJITNwSC0VJRPf3HppVXpixoW3z0Wty
-DhqmWBeclHHAxszIP2CitCwqaArkZd9gn64usv68od0Fn30v+fyzghaDRNn44xCK
-hgCb6TiKz41Ub8RkP3/P4xVcEhT4m1lnBf6Ntw9jq3OlLNziNGoZpulcDkDcFudA
-jmbAPxhOXGMrlD1pTsHQj66upfHV+rV9k34wYqjKrnUjNt0jXV6JeKFQRj6opWdD
-DXS5AcmG+q28AsMaFukbkLkJ6aWPyUw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hebis.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hebis.de,OU=Universitaetsbibliothek,OU=HeBIS,O=Johann Wolfgang Goethe-Universitaet,L=Frankfurt am Main,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIEDv1DQTANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkhlc3NlbjEaMBgGA1UEBxMRRnJhbmtmdXJ0IGFtIE1haW4x
-LDAqBgNVBAoTI0pvaGFubiBXb2xmZ2FuZyBHb2V0aGUtVW5pdmVyc2l0YWV0MRMw
-EQYDVQQDEwpVTkktRkZNIENBMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktZnJhbmtm
-dXJ0LmRlMB4XDTA5MTAyMDE0MTQwOVoXDTE0MTAxOTE0MTQwOVowgbExCzAJBgNV
-BAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xGjAYBgNVBAcTEUZyYW5rZnVydCBhbSBN
-YWluMSwwKgYDVQQKEyNKb2hhbm4gV29sZmdhbmcgR29ldGhlLVVuaXZlcnNpdGFl
-dDEOMAwGA1UECxMFSGVCSVMxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90
-aGVrMRUwEwYDVQQDEwxpZHAuaGViaXMuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDUmu8TmWy7MNC9TUDOJLWZiBoWFR3NefKueJBi3dFPTmNw9cWk
-xxGz1rkdUQaOsDE1gnt+/Bqf8qIw1qSOLYRDVQQVmmmWdkrSUYuKx8yR7fQQzn3b
-vJEazxjB9wRsvF8hdXImWNd9v91ktRjkNJ9xl/LgRI7hc6mJbmCFz1LvyzYokzX3
-GuHZsjpjM4S9oBPPn04nmcTQSfhHve0unSYsSenuoahv9xR574+QjpElpvwYr8Tn
-2Vk4X8wpaXSEj+mGqYAfmAUTbkl/D5zcxMNjbvySoCG1Rh5X8WtOZKyVVvDtw0rL
-7wrSm2twGn1nL2vrzDWYxSrhVO6DqOGwSZPbAgMBAAGjggHfMIIB2zAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFKHxmzsUvTLPzqnRjVvmZh6CdpedMB8GA1UdIwQYMBaAFGNZd7FG
-b+Hmq6/Cx5P/X3ENT+D/MCkGA1UdEQQiMCCBHmRvZXJyZXJAaGViaXMudW5pLWZy
-YW5rZnVydC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1mcmFua2Z1cnQtY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuG
-OWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWZyYW5rZnVydC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBABOmIw57NEumxxyr/4fUsAUlER2xbSXtX8/joRU0jdguyPKpOIAMtmyF
-2O80OUgF/N3+J/PXAKXieHjoO/v68xf34aJITNwSC0VJRPf3HppVXpixoW3z0Wty
-DhqmWBeclHHAxszIP2CitCwqaArkZd9gn64usv68od0Fn30v+fyzghaDRNn44xCK
-hgCb6TiKz41Ub8RkP3/P4xVcEhT4m1lnBf6Ntw9jq3OlLNziNGoZpulcDkDcFudA
-jmbAPxhOXGMrlD1pTsHQj66upfHV+rV9k34wYqjKrnUjNt0jXV6JeKFQRj6opWdD
-DXS5AcmG+q28AsMaFukbkLkJ6aWPyUw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hebis.de:8443/uni-frankfurt/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hebis.de:8443/uni-frankfurt/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Frankfurt am Main (Johann Wolfgang Goethe-Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Frankfurt</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-frankfurt.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Axel</GivenName>
-    <SurName>Dörrer</SurName>
-    <EmailAddress>doerrer@hebis.uni-frankfurt.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Axel</GivenName>
-    <SurName>Dörrer</SurName>
-    <EmailAddress>doerrer@hebis.uni-frankfurt.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.xml
deleted file mode 100644
index 9f73372c..00000000
--- a/swamid-interfederations-2.0/idp.hec.fr-idp-shibboleth.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://idp.hec.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-30T17:41:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hec.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hec.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">HEC Paris</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABUklEQVQoz2P8//8/AymAiSTVKBp+/v5z6sq9S7cfo6m4cf/ZqSt3v/34BeX/h4EfP3+JOWZHVkz9jwpKepdzWSS///wVwkXYwMTExMTEyMbKgmYDOxsLEyMjCxMTxX5ABv8ZGP79/w8JQHERfglhfkZGRogUI8Rlr99/Pnn5bmz1TH5eTi1F6c9fv3/+/vPPn78szEy83JxyEkJWBqrWBmo6KjIsh87ePHL+poy4kKaSNDsbi72JxoLGNAZGhr9//33/8evD52+NMzcs3nLk+ZuPNVPXLmhKY9FUkrQ1UmNkZPz95y8TEyMTIyMTEyMDAwMTCzMrDycfD6ekCD87G8vmSYX//v3/9/8/i6ggH5He5ePhpF4oEaXh9+8/7Kysv37/QVPx8/cfbk72nzBxRnhq/ffv/5fvP5gYGXm4OJA1fP3+8+/ff9xc7MxMTCgaiAQAn/KfpHDvcnoAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDErMDI6MDByT8mCAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwAxJxPgAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.hec.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">hec.fr</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">HEC Paris</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">hec.fr</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>
-					      MIIDFDCCAfygAwIBAgIVAIBa5+GwoumXjRKqli33Kv809ka2MA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oZWMuZnIwHhcNMTQwNTI2MTI1MjQ1WhcNMzQw
-NTI2MTI1MjQ1WjAVMRMwEQYDVQQDEwppZHAuaGVjLmZyMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAs2ddxGn8jnI0f+CiK8kkYgXsmvo0mdj7d9ONHxqo
-u9/eM0iVxBJ3Nm8DE8NPfwqQ8b7YgYp3D4IABKQsf9qv3ZY9d8t5ZIH4QpGYV0oQ
-7vA8ENTxT8w9/guwzQ/IbHRRxOrb/yUnWGGHNhdkqK9R/dicYIJtqaEVvV5nXak1
-kWS8NSKt0lqBsVk4nbEMBiQ4DSioh94QmM9Gk9C7KGsbWYlou/7OaEAnrxLuJjhu
-LVp2oyqlNpLa0D3MUP0cFCJdvC7adCYp9QhfM+F3RT9F5VswssQpwjzy73LPSsIM
-MtnQDpFbWzxatab6YrHsYd27VVsSKBMaDi+V8P62nwbAnQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaGVjLmZyhiFodHRwczovL2lkcC5oZWMuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFBrlIFW8BhPWzf/KmmnPQeDLI6emMA0GCSqGSIb3DQEB
-BQUAA4IBAQAlHB/u8LUZqoFJcyHutPdhyIppdHMyN3E/cHVsOeHnAZzXrCaiNXak
-vZjymOGHsPq1ySs7ytueu0glwIy76fdLYws1z+iM3swctvAqgRNCv6W2foSLxygD
-B4z5EvUrYQe5a2UdJPYkx8IQSF7PVB6+737ecXPL6zE77wJun9vQjvYBnK0p+aJE
-E78mIpl/HazMsw7Hi5drLGi5hl0D4QWg1FlCtEdQlLizzwTA1fQpFR4B8V7Pi7BD
-urLe9BfmSB9pKYM38V5hbcPoZWXMHASiOsWem0KLofPQe+uLd3SS//aqJJy7tWna
-yR8iVSZb+1XrsdYfsXmZIJjw/OfeN3eA
-					    </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-POST" Location="https://idp.hec.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hec.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hec.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HEC Paris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HEC Paris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hec.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>sysrxadm@hec.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d75e621b..00000000
--- a/swamid-interfederations-2.0/idp.hesam.eu-idp-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://idp.hesam.eu/idp/shibboleth">
-  <md: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>
-  </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 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="en">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACTUlEQVQozy2RTW9UdRjFz3nuvZ25M50OgynQaYxsWCklIRC1hLelrYatW2JMXLLgA1Bd6I7vYWTDBzCmISFpTdRahAJlBtJO36S2vfPWmft/jovp4iRn8cs5OTl0d5CAUyaCAuiAQR5oEQBBECmJJI0gFAgDAAnASKJFcMFBJykZSQCUhBNqlO1A7AgKaLVaQ2GsVA7SYHA8ffqDUlqIgRyIBZCATCAJQ4QIhULS39mOtzaSQjw8aPsnHyM9Y0IsBfKkgeSordPpkTx35izJLMvK5XKSJAA46A/NLEoAt9EQR7CjTjeOARwHL46PHw/zJImLQkRYt58t/PD94uKTYP587cXe7nZ4/Et3eTFN04P/3tcqpXdr/zRfPNt4+SoyCIhhUa1Wfba6svrH30t//X7p08+/u3ghipNWs/ngpx+vXL5arUy8aa43Gut3734zOztrvU7/5q1rc/Pzr96sl4rp1FQ9+fB84c+nr3/7tbm9u7b2/ObtG1/OfTUzM9Nutx3CcNBtS5mrJ63sH+5K7tL+fke+1Hi3etBuuw6zo9bG5sFhJhdzhajRwNu3qE9iLPWdzZBWh+W01OurPsluX9MfkZEACqJzsLq89cWsTU7ZeMWHvbhYFfL8372x+rRNnc9+flS7f+/UwkNIBEXEUe1c5etvhaDsSJWJqFrJ9/bGPHB8gowm7swVP7tOAKDolFESBDloDhpCLosIQkIekMSgC0bkUCyCrkCYIxgijH6DOWSg4AAIA9xBAwEYYRA4ooUAG+0DwBN65AlB0v/Y2TfAeC+JywAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMyswMjowMGtf30gAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzMrMDI6MDAaAmf0AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-paris1.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</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>
-					      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>
-    </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-POST" Location="https://idp.hesam.eu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hesam.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hesam.eu/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hesam.eu</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hesam.eu/idp/profile/SAML1/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">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">PRES HESAM - Hautes Etudes-Sorbonne-Arts et Métiers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-paris1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@univ-paris1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hgo.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hgo.se-idp-shibboleth.xml
deleted file mode 100644
index 2982afca..00000000
--- a/swamid-interfederations-2.0/idp.hgo.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hgo.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">hgo.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDWDCCAkCgAwIBAgIES4+8uzANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
-MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
-c2UwHhcNMTAwMzA0MTM1OTIzWhcNMjAwMzAxMTM1OTIzWjBuMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
-MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZMqgS3wqDLOKVwYHG
-5FRrM13gk+lP+Alm45T0pK192Cl3OWildw4qNiMv10oocbZUoE9PFn6PESSwF6Nt
-2nm3um4ePSbzowYwGOuRLQJfXj4FK3Dj2PO1OLD7oK4VXgka+kG93/oyEaeSfe3t
-93eFgp8bb58b42ED/CAcxvGzcHHyG0WzFTtO3hSuscy/6BKEekVefQJfpPnCuuMN
-2NothDvL+IHO7+DXMeHfH56L1P4fLz+jSMCL2hXGuZxc1f/+l9b4VpegUQx9IGk2
-Rspt3CtOHDI7hhUu5xlbxad0uyAu34dMOz/6jB3UDHYTOEoCjBGhf8RE9zeWFT5D
-VXhtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZdx0R84klmPoZq7uMPh1pPJ76X
-2xpmzCoxhRqjq2Uy9HKfiu9pwo21H9w+PvXhUtdsTInAAhPl1khupPzV/uJeCybl
-mbgtQgNr5UnLtfNz7GQD0EXe0UuC+bP+Qrl6NrCke73MCOLITajJ4ggdfdF3C55e
-G1kXEv3DPMpB8tRlcf4W3fT9ZKR+6zzSOkvuMzLIzv1UBTxUas19DYYNzE3+u/9Q
-8IHjPqr0JsKZiNBRofXwLZ6y2xztQqBVDmV4yNoOLNUDDOFHYwiuR1aAJ2rNoOF7
-UTU+mTp7woVtJsWWGJRG1iDB7UxpIHdPwDBDPEfxlw11kdJ+HIyaYCrQL4A=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hgo.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hgo.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hgo.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hgo.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hgo.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hgo.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">hgo.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDWDCCAkCgAwIBAgIES4+8uzANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
-MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
-c2UwHhcNMTAwMzA0MTM1OTIzWhcNMjAwMzAxMTM1OTIzWjBuMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHR290bGFuZDEOMAwGA1UEBxMFVmlzYnkxCzAJBgNVBAoTAklU
-MRswGQYDVQQLExJHb3RsYW5kIFVuaXZlcnNpdHkxEzARBgNVBAMTCmlkcC5oZ28u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZMqgS3wqDLOKVwYHG
-5FRrM13gk+lP+Alm45T0pK192Cl3OWildw4qNiMv10oocbZUoE9PFn6PESSwF6Nt
-2nm3um4ePSbzowYwGOuRLQJfXj4FK3Dj2PO1OLD7oK4VXgka+kG93/oyEaeSfe3t
-93eFgp8bb58b42ED/CAcxvGzcHHyG0WzFTtO3hSuscy/6BKEekVefQJfpPnCuuMN
-2NothDvL+IHO7+DXMeHfH56L1P4fLz+jSMCL2hXGuZxc1f/+l9b4VpegUQx9IGk2
-Rspt3CtOHDI7hhUu5xlbxad0uyAu34dMOz/6jB3UDHYTOEoCjBGhf8RE9zeWFT5D
-VXhtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIZdx0R84klmPoZq7uMPh1pPJ76X
-2xpmzCoxhRqjq2Uy9HKfiu9pwo21H9w+PvXhUtdsTInAAhPl1khupPzV/uJeCybl
-mbgtQgNr5UnLtfNz7GQD0EXe0UuC+bP+Qrl6NrCke73MCOLITajJ4ggdfdF3C55e
-G1kXEv3DPMpB8tRlcf4W3fT9ZKR+6zzSOkvuMzLIzv1UBTxUas19DYYNzE3+u/9Q
-8IHjPqr0JsKZiNBRofXwLZ6y2xztQqBVDmV4yNoOLNUDDOFHYwiuR1aAJ2rNoOF7
-UTU+mTp7woVtJsWWGJRG1iDB7UxpIHdPwDBDPEfxlw11kdJ+HIyaYCrQL4A=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hgo.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hgo.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">HGO</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan på Gotland</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Högskolan på Gotland</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hgo.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Joacim</md:GivenName>
-    <md:SurName>Breiler</md:SurName>
-    <md:EmailAddress>joacim.breiler@hgo.se</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 64ff7fce..00000000
--- a/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hig.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hig.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hig.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">hig.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hig.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">HIG</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gävle</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hig.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Gävle</md:Company>
-    <md:SurName>Network Operations</md:SurName>
-    <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Gävle</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Gävle</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@hig.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 1fca3c64..00000000
--- a/swamid-interfederations-2.0/idp.hig.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://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/logga3.png</mdui:Logo>
-      </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>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">Högskolan i Gävle</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hig.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Högskolan i Gävle</Company>
-    <EmailAddress>anders.lordal@hig.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.highbury.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.highbury.ac.uk-entity.xml
deleted file mode 100644
index 625de6bc..00000000
--- a/swamid-interfederations-2.0/idp.highbury.ac.uk-entity.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.highbury.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for Highbury College, Portsmouth.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-20T12:09: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">highbury.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUQBVfv1Tnt7N17RL6y6sE8mngYOYwDQYJKoZIhvcNAQEF
-						BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aDIuaGlnaGJ1cnkuYWMudWswHhcNMTQx
-						MjE3MDk0NDEzWhcNMjQxMjE3MDk0NDEzWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
-						Mi5oaWdoYnVyeS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AIGsz5d+S+Z7C3YQjZXV0cDX4KzZw/AdpgMtdCKAq/KAv4FcXqWUgmm8UNqSUpaZ
-						j+yai6rtwWfDxa6PO1nz6X827qmc+ZNzSSwn8P5vRjEune7M+dp2Azf1iZTEdEvo
-						WxeHBadrsK35IVv8gpenI+/oECfw1TJgbZ50b+lC1GYa42BSu9oT0c9ngcmd9MIg
-						mZtah4vnTG9GavQh7JiKRJEAy/oKLVZ+QxHwqNvoPjmHXNH31P4yG0uSkQMXIncF
-						b02LrVM6N5zQHNj3BxT5OiC9XMJTJIE3qezgp4jVeHgchk8bbQbAd4LrPMl8UmGW
-						2N4+EJs9AOKWcqME7sIN1HkCAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYmJvbGV0
-						aDIuaGlnaGJ1cnkuYWMudWuGMWh0dHBzOi8vc2hpYmJvbGV0aDIuaGlnaGJ1cnku
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNXlKPvM2RUd6FsHoFbZSI9T
-						vK4QMA0GCSqGSIb3DQEBBQUAA4IBAQA4+wfuBit/wjBIgqDiR45MkZGITZHX3lZc
-						0KW7qSCxsJvmBnlluHUzMpvYEfa0PFgNHTcdCVPOAShSjq4GvZIEloDDw/rIU9X0
-						TdluFnW38P3KZ+e8+veBkmEQpHBJr8j2+mHGURjS5uFIYpbRRDl7Zhbjx/aCNECD
-						kfGgRUQOcrFOLZC7yZVKLPhen6FrglCpMHxTAOEVudICBM8qix8Sa9RSF/Wa+koC
-						++RNvHw5/Gy8oAgdLUWga8jTEy9814Omh+CZ1aD57edykSPBYqVgPbp4+qe6qHjP
-						W7hlXIP3zSHP9R17i+v25+UsbOTujB09Q1480Yte2Urglnv7umRs
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.highbury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.highbury.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://shibboleth2.highbury.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.highbury.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.highbury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.highbury.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">highbury.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUQBVfv1Tnt7N17RL6y6sE8mngYOYwDQYJKoZIhvcNAQEF
-						BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aDIuaGlnaGJ1cnkuYWMudWswHhcNMTQx
-						MjE3MDk0NDEzWhcNMjQxMjE3MDk0NDEzWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
-						Mi5oaWdoYnVyeS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AIGsz5d+S+Z7C3YQjZXV0cDX4KzZw/AdpgMtdCKAq/KAv4FcXqWUgmm8UNqSUpaZ
-						j+yai6rtwWfDxa6PO1nz6X827qmc+ZNzSSwn8P5vRjEune7M+dp2Azf1iZTEdEvo
-						WxeHBadrsK35IVv8gpenI+/oECfw1TJgbZ50b+lC1GYa42BSu9oT0c9ngcmd9MIg
-						mZtah4vnTG9GavQh7JiKRJEAy/oKLVZ+QxHwqNvoPjmHXNH31P4yG0uSkQMXIncF
-						b02LrVM6N5zQHNj3BxT5OiC9XMJTJIE3qezgp4jVeHgchk8bbQbAd4LrPMl8UmGW
-						2N4+EJs9AOKWcqME7sIN1HkCAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYmJvbGV0
-						aDIuaGlnaGJ1cnkuYWMudWuGMWh0dHBzOi8vc2hpYmJvbGV0aDIuaGlnaGJ1cnku
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNXlKPvM2RUd6FsHoFbZSI9T
-						vK4QMA0GCSqGSIb3DQEBBQUAA4IBAQA4+wfuBit/wjBIgqDiR45MkZGITZHX3lZc
-						0KW7qSCxsJvmBnlluHUzMpvYEfa0PFgNHTcdCVPOAShSjq4GvZIEloDDw/rIU9X0
-						TdluFnW38P3KZ+e8+veBkmEQpHBJr8j2+mHGURjS5uFIYpbRRDl7Zhbjx/aCNECD
-						kfGgRUQOcrFOLZC7yZVKLPhen6FrglCpMHxTAOEVudICBM8qix8Sa9RSF/Wa+koC
-						++RNvHw5/Gy8oAgdLUWga8jTEy9814Omh+CZ1aD57edykSPBYqVgPbp4+qe6qHjP
-						W7hlXIP3zSHP9R17i+v25+UsbOTujB09Q1480Yte2Urglnv7umRs
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.highbury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.highbury.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">Highbury College, Portsmouth</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Highbury College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.highbury.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Butcher</SurName>
-    <EmailAddress>mailto:paul.butcher@highbury.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>College IT Helpdesk</GivenName>
-    <EmailAddress>mailto:servicedesk@highbury.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Whitehead</SurName>
-    <EmailAddress>mailto:ian.whitehead@highbury.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.his.se-idp-shibboleth.xml
deleted file mode 100644
index 46f5e92b..00000000
--- a/swamid-interfederations-2.0/idp.his.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://idp.his.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">his.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Skövde</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Skövde</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Skövde</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for University of Skövde</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.his.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.his.se/en/</mdui:InformationURL>
-        <mdui:Logo height="196" width="193">https://idp.his.se/his_eng_rubin.png</mdui:Logo>
-        <mdui:Logo height="196" width="206" xml:lang="sv">https://idp.his.se/his_se_rubin.png</mdui:Logo>
-        <mdui:Logo height="196" width="193" xml:lang="en">https://idp.his.se/his_eng_rubin.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">skövde his</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">skövde his</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>his.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.176.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.184.0/23</mdui:IPHint>
-        <mdui:IPHint>193.11.96.0/22</mdui:IPHint>
-        <mdui:IPHint>212.25.128.0/23</mdui:IPHint>
-        <mdui:IPHint>212.25.134.0/23</mdui:IPHint>
-        <mdui:GeolocationHint>geo:58.39,13.85</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:58.39412,13.85542</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAOlJBVpaMgEd+tU+i5F9QK3R5+6IMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oaXMuc2UwHhcNMTAwNDE0MTIxNTI0WhcNMzAw
-NDE0MTIxNTI0WjAVMRMwEQYDVQQDEwppZHAuaGlzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAm+RktUz4LD4GyD5AIBsAfy40Z7mZvYdKdCaTWAmd
-WucpWyu/0H2J3SFtXgOGedzgWjm7nbTmrnZHB87zc/yVuGdtpebq4Ye0XdBLg2A4
-H43lyPdknzQDxD035wzfcyi6/+PRzTK0jucR9KGtEPkNhPg0ziAbHggROKQ1ylNd
-RAul/8b2wDOA4yzBvO4FYFQj+H9bgge869M65P5f/AdBZAWtXy0Ox4G+2ysZfOSi
-7rGMyiX1/s+hgLO2AdosfAnQkKUOax3YsyRzyqbCu8PHEuDciwI2y968Kuq7kv7J
-7vMbZmPLcO4mLjsRnxrfyKlGG+Jpg0BGxRlMlmKn79kdEwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaGlzLnNlhiFodHRwczovL2lkcC5oaXMuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFE1bH9W+VqwoZnGTvPca0DNTcLL3MA0GCSqGSIb3DQEB
-BQUAA4IBAQBUX+vjv7eCQRljAwrRjH8jNoJyUwMIjQsyStbHM7A5y7+MIdOjBELv
-eNYBKGHHEMOiPiB0uPPFrgdN82q8l3PCcYMAYO6aWcwBJsHTpcEBx0lVa4OmW0/r
-Bc4RC+rrqNNf8XkYQnD80Px3ncb0OfXmNwSLnLDIKOoQq7hh4DGY73K66vi0sSor
-9e7hji23KpjhR2vPqmiNAvJuEMzDolB3hn2oz+rWfwynb85vFAghd4gJxTMPzsUj
-hNY1IDFKGebFhCWmlG7MMPDm/omu6mBurSE9EAhVTretr0YXxmkfFrOvDysPOYWj
-drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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.his.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.his.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.his.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.his.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">his.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAOlJBVpaMgEd+tU+i5F9QK3R5+6IMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oaXMuc2UwHhcNMTAwNDE0MTIxNTI0WhcNMzAw
-NDE0MTIxNTI0WjAVMRMwEQYDVQQDEwppZHAuaGlzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAm+RktUz4LD4GyD5AIBsAfy40Z7mZvYdKdCaTWAmd
-WucpWyu/0H2J3SFtXgOGedzgWjm7nbTmrnZHB87zc/yVuGdtpebq4Ye0XdBLg2A4
-H43lyPdknzQDxD035wzfcyi6/+PRzTK0jucR9KGtEPkNhPg0ziAbHggROKQ1ylNd
-RAul/8b2wDOA4yzBvO4FYFQj+H9bgge869M65P5f/AdBZAWtXy0Ox4G+2ysZfOSi
-7rGMyiX1/s+hgLO2AdosfAnQkKUOax3YsyRzyqbCu8PHEuDciwI2y968Kuq7kv7J
-7vMbZmPLcO4mLjsRnxrfyKlGG+Jpg0BGxRlMlmKn79kdEwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaGlzLnNlhiFodHRwczovL2lkcC5oaXMuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFE1bH9W+VqwoZnGTvPca0DNTcLL3MA0GCSqGSIb3DQEB
-BQUAA4IBAQBUX+vjv7eCQRljAwrRjH8jNoJyUwMIjQsyStbHM7A5y7+MIdOjBELv
-eNYBKGHHEMOiPiB0uPPFrgdN82q8l3PCcYMAYO6aWcwBJsHTpcEBx0lVa4OmW0/r
-Bc4RC+rrqNNf8XkYQnD80Px3ncb0OfXmNwSLnLDIKOoQq7hh4DGY73K66vi0sSor
-9e7hji23KpjhR2vPqmiNAvJuEMzDolB3hn2oz+rWfwynb85vFAghd4gJxTMPzsUj
-hNY1IDFKGebFhCWmlG7MMPDm/omu6mBurSE9EAhVTretr0YXxmkfFrOvDysPOYWj
-drVlFNv2EtdNX1C9u3EJYqslqtyXv2nZ
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.his.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.his.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">HIS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Skövde</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.his.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Skövde</md:Company>
-    <md:SurName>HiS Netadmin</md:SurName>
-    <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Skövde</md:Company>
-    <md:SurName>HiS Netadmin</md:SurName>
-    <md:EmailAddress>mailto:netadmin@his.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Skövde</md:Company>
-    <md:SurName>IT Helpdesk Högskolan i Skövde</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@his.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 500 448800</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hiu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hiu.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 238adf4b..00000000
--- a/swamid-interfederations-2.0/idp.hiu.cas.cz-idp-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://idp.hiu.cas.cz/idp/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="2015-01-20T09:24: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>
-    <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>
-  <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">hiu.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of History of the ASCR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Historický ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider IH AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance HÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.hiu.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.hiu.cas.cz/cs/</mdui:InformationURL>
-        <mdui:Logo height="44" width="61">https://jiftach.cas.cz/loga/logo-hiu-44.png</mdui:Logo>
-        <mdui:Logo height="530" width="740">https://jiftach.cas.cz/loga/logo-hiu-530.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAI8MkDWeW/BNLq24Uo6mRe3luCklMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5oaXUuY2FzLmN6MB4XDTE0MDgxNDA2MjM1OFoX
-DTM0MDgxNDA2MjM1OFowGTEXMBUGA1UEAxMOaWRwLmhpdS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDEcc4ZXcQ0TjPrmWaiSqowRV0gC2J
-0AEg5vdr9g/IAaiSkL4/pCuA5JkCkVLZ3sICR/lVEoznIKIIy8HODWzOPqk4lms0
-MCmpVybV/KuVbzv0zLoR41tgipMKwcYNc0yya7rqSOf1go/JSbaNvNqsAYwgz645
-pqtA0zx1hj8OXHijdpTTszA/QYdL/XquoqYTwrnYQqqnfZSSrW1bw7Q5Ay5mIBKc
-cHfgsiXJ3DR0qoPEI8tylEANxdGtAyAX/Ee1CJDgezaLE3KgxKSOB25t8Qr4ykUK
-6JA7n8+L9sBbg+5yeka1sHVNmBfDzWDMIdx6Vq6DyaVUslv6kU8suXK/AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5oaXUuY2FzLmN6hiVodHRwczovL2lkcC5oaXUu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS2DVKyehrtvGJR51jA6tCk
-v2zM6zANBgkqhkiG9w0BAQUFAAOCAQEASHg7C6a1JzNmeuEgsZuAeJ0DhtkyNdk9
-zKrMrDwr9vDVhjec5sPk6nYxyWm28sh37WfdvU29z14OGpmOoiV8c5CDxg0e71ay
-G0yWQt10zhLs9gcYCktnwOdx7cxhzGvAXAHpxRAqXLwgKdttK1Nzxc3KIIdUu0R4
-DGmTEE/ebAYi1pQegaFhlVENHtmGGs+WU05qygclhp3XGJou+5chOIZu5lBwEqUh
-OrR2dRjjHPiKAaxqQ8S7GY25pTYIn0Fz/3MlEV86VP7ez+9WT5sV8+teCDiFcQLj
-InEf51JhjceyxF/6DmYwakFJHeZ4IPBQMBAy2Z02wwmKDQ/ESYAWig==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hiu.cas.cz: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.hiu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hiu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hiu.cas.cz/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">hiu.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAI8MkDWeW/BNLq24Uo6mRe3luCklMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5oaXUuY2FzLmN6MB4XDTE0MDgxNDA2MjM1OFoX
-DTM0MDgxNDA2MjM1OFowGTEXMBUGA1UEAxMOaWRwLmhpdS5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDEcc4ZXcQ0TjPrmWaiSqowRV0gC2J
-0AEg5vdr9g/IAaiSkL4/pCuA5JkCkVLZ3sICR/lVEoznIKIIy8HODWzOPqk4lms0
-MCmpVybV/KuVbzv0zLoR41tgipMKwcYNc0yya7rqSOf1go/JSbaNvNqsAYwgz645
-pqtA0zx1hj8OXHijdpTTszA/QYdL/XquoqYTwrnYQqqnfZSSrW1bw7Q5Ay5mIBKc
-cHfgsiXJ3DR0qoPEI8tylEANxdGtAyAX/Ee1CJDgezaLE3KgxKSOB25t8Qr4ykUK
-6JA7n8+L9sBbg+5yeka1sHVNmBfDzWDMIdx6Vq6DyaVUslv6kU8suXK/AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5oaXUuY2FzLmN6hiVodHRwczovL2lkcC5oaXUu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS2DVKyehrtvGJR51jA6tCk
-v2zM6zANBgkqhkiG9w0BAQUFAAOCAQEASHg7C6a1JzNmeuEgsZuAeJ0DhtkyNdk9
-zKrMrDwr9vDVhjec5sPk6nYxyWm28sh37WfdvU29z14OGpmOoiV8c5CDxg0e71ay
-G0yWQt10zhLs9gcYCktnwOdx7cxhzGvAXAHpxRAqXLwgKdttK1Nzxc3KIIdUu0R4
-DGmTEE/ebAYi1pQegaFhlVENHtmGGs+WU05qygclhp3XGJou+5chOIZu5lBwEqUh
-OrR2dRjjHPiKAaxqQ8S7GY25pTYIn0Fz/3MlEV86VP7ez+9WT5sV8+teCDiFcQLj
-InEf51JhjceyxF/6DmYwakFJHeZ4IPBQMBAy2Z02wwmKDQ/ESYAWig==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hiu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of History of the ASCR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Historický ústav AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of History of the ASCR, Public Research Institution</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Historický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hiu.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.hiu.cas.cz/cs/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
deleted file mode 100644
index 7109d3cc..00000000
--- a/swamid-interfederations-2.0/idp.hkr.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hkr.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">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml: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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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">hkr.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan Kristianstad</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Kristianstad University Sweden</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inloggning i webbtjänster för anställda och studenter vid Högskolan Kristianstad.</mdui:Description>
-        <mdui:Description xml:lang="en">The Kristianstad University Login Service is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.hkr.se/sv/om-hkr/organisation/administration-och-stodverksamhet/it-service/kontoinformation/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.hkr.se/en/study-at-hkr/service-and-support/it-support-for-students/user-name-and-password/</mdui:InformationURL>
-        <mdui:Logo height="84" width="96" xml:lang="sv">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
-        <mdui:Logo height="84" width="96" xml:lang="en">https://idp.hkr.se/idp/images/hkrsmall.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hkr.se</mdui:DomainHint>
-        <mdui:IPHint>194.47.24.0/21</mdui:IPHint>
-        <mdui:IPHint>194.47.32.0/21</mdui:IPHint>
-        <mdui:IPHint>194.47.40.0/21</mdui:IPHint>
-        <mdui:GeolocationHint>geo:56.04848,14.14416</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVAJFwJo5KjpvOv/slniklC/Nf19gKMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oa3Iuc2UwHhcNMTAxMjEwMTExMDM2WhcNMzAx
-MjEwMTExMDM2WjAVMRMwEQYDVQQDEwppZHAuaGtyLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAmLMMJQyBS/1Caas2d1zoAj1jlxYs9axLJPDujiP0
-fJ8F3gjMxtl/A7Y+eVFqnRFzHNuaEKaqZ8S+XGnRi8kw3AdPbPJZB4g+LTRPI8WB
-xDo49uubfZbpyi8zZUqoqOSLeNxMKFqgkq9bd0Yeh4bI7r/bjuvcx4tioOP3UnT4
-CBfTL6uxyCWFW8mP9TbmnQ4lZN5O4elIKrea+8XiumRa2q5qpXVtdqF5h9YI+jYK
-6zj9pMzUlPPvIyOzGFLxLSN0KRM7EgV3FRD65y9hCnTzuQtFrqwktBOVs5fwavyr
-bKht5KrIaVrozMBscr8STgQ8SKEDMCDqxu/hS0IqoweTyQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaGtyLnNlhiFodHRwczovL2lkcC5oa3Iuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFLIjYPKZGp/Bncfc+KnH8Pdf7FukMA0GCSqGSIb3DQEB
-BQUAA4IBAQCQ3m4eN6leAlXf9v8xcZjrzQhHCg4ceDnixMUINTsFfXktfYsSSonr
-Cdh/mhttMxnk/34Tu1XMfYn8ABPVxvvcaBZ9Brl21BBsvk3MOdbDNO6cB05GXdms
-exr3aJFvRwY6Vy0AWtUgDFXdYPiIVPUrpC7NA+X78fq3IVmPn0WFlQ9KpM8hXNz0
-HwlY06myFNjI7dvt8xjAqJy+ICilu06RTs7oCynE45nkrLaZjpploIn3xcYt0ceK
-qU1LY9aaqaEgKSsNHlPoCW9eH4oUP3f/X8h21pAtgGA8AIt2RegT6HfVqnZPAtUk
-kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hkr.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hkr.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hkr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hkr.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hkr.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVAJFwJo5KjpvOv/slniklC/Nf19gKMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5oa3Iuc2UwHhcNMTAxMjEwMTExMDM2WhcNMzAx
-MjEwMTExMDM2WjAVMRMwEQYDVQQDEwppZHAuaGtyLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAmLMMJQyBS/1Caas2d1zoAj1jlxYs9axLJPDujiP0
-fJ8F3gjMxtl/A7Y+eVFqnRFzHNuaEKaqZ8S+XGnRi8kw3AdPbPJZB4g+LTRPI8WB
-xDo49uubfZbpyi8zZUqoqOSLeNxMKFqgkq9bd0Yeh4bI7r/bjuvcx4tioOP3UnT4
-CBfTL6uxyCWFW8mP9TbmnQ4lZN5O4elIKrea+8XiumRa2q5qpXVtdqF5h9YI+jYK
-6zj9pMzUlPPvIyOzGFLxLSN0KRM7EgV3FRD65y9hCnTzuQtFrqwktBOVs5fwavyr
-bKht5KrIaVrozMBscr8STgQ8SKEDMCDqxu/hS0IqoweTyQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAuaGtyLnNlhiFodHRwczovL2lkcC5oa3Iuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFLIjYPKZGp/Bncfc+KnH8Pdf7FukMA0GCSqGSIb3DQEB
-BQUAA4IBAQCQ3m4eN6leAlXf9v8xcZjrzQhHCg4ceDnixMUINTsFfXktfYsSSonr
-Cdh/mhttMxnk/34Tu1XMfYn8ABPVxvvcaBZ9Brl21BBsvk3MOdbDNO6cB05GXdms
-exr3aJFvRwY6Vy0AWtUgDFXdYPiIVPUrpC7NA+X78fq3IVmPn0WFlQ9KpM8hXNz0
-HwlY06myFNjI7dvt8xjAqJy+ICilu06RTs7oCynE45nkrLaZjpploIn3xcYt0ceK
-qU1LY9aaqaEgKSsNHlPoCW9eH4oUP3f/X8h21pAtgGA8AIt2RegT6HfVqnZPAtUk
-kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hkr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hkr.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HKR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Kristianstad University Sweden</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.hkr.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hkr.se/en/english-start-page/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Högskolan Kristianstad</md:Company>
-    <md:SurName>Service desk 3030</md:SurName>
-    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Högskolan Kristianstad</md:Company>
-    <md:SurName>Service desk 3030</md:SurName>
-    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Högskolan Kristianstad</md:Company>
-    <md:SurName>Service desk 3030</md:SurName>
-    <md:EmailAddress>mailto:3030@hkr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 44 20 3030</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hochschule-bc.de.xml b/swamid-interfederations-2.0/idp.hochschule-bc.de.xml
deleted file mode 100644
index 3a653d33..00000000
--- a/swamid-interfederations-2.0/idp.hochschule-bc.de.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hochschule-bc.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hochschule-bc.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rz1ads.fh-biberach.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hochschule-bc.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hochschule-bc.de,OU=Rechenzentrum,O=Hochschule Biberach,L=Biberach,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIEEV0vSzANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMIQmliZXJh
-Y2gxHDAaBgNVBAoTE0hvY2hzY2h1bGUgQmliZXJhY2gxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xHTAbBgNVBAMTFEhCQy1HbG9iYWwgQ0EgLSBHIDAxMSEwHwYJKoZI
-hvcNAQkBFhJwa2lAZmgtYmliZXJhY2guZGUwHhcNMTEwMTI0MTcwNzA4WhcNMTYw
-MTIzMTcwNzA4WjCBkjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0
-dGVtYmVyZzERMA8GA1UEBxMIQmliZXJhY2gxHDAaBgNVBAoTE0hvY2hzY2h1bGUg
-QmliZXJhY2gxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHTAbBgNVBAMTFGlkcC5o
-b2Noc2NodWxlLWJjLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-qtj8K4twdlFO6g3v+5yAWFmcQF2w3RB5dt6fUhF79dhb52jSWwqax/zhGjznGHsh
-cGa2ssx0Srbdd0q6B8pE4qj/6aj7Zwex/mUTZpn1ohvAxmtXhu8UorK42klm9NJV
-A/RSs1mNKqG1sMJIVVAxzJrQ0AcIfYVgkh5pY0tuzCWu2badGTdoiY5xzhy1jcGm
-zRZlWFUO/0iUlEPAZbIHbvqjDrEQ5I/O9AGEIoY2bS2ezEqIULPKXILdFLl/W5m6
-15ctpggBz3iIBZXMnmFNhWYsGGMwv+Q2poANbKlZFZBFsjwwa3DJ9YpNzJKyILgm
-16LqgL+fCGMGPOkvmLIgcwIDAQABo4IBzDCCAcgwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
-8JgV2opFP3hcLzImHnukv6OGpjAfBgNVHSMEGDAWgBSREBR4GID92wzwllHKuEQz
-3ElITTAkBgNVHREEHTAbgRlzdHVldHpsZUBob2Noc2NodWxlLWJjLmRlMIGFBgNV
-HR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hiYy1nbG9iYWwt
-Y2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvaGJjLWdsb2JhbC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEE
-gZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGJjLWds
-b2JhbC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvaGJjLWdsb2JhbC1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE5WRkxDRsl5jqKwvJCgE4d223Q0n1Tm
-/6tcHlZRGF9U+xktoJbGW3RWMIEWlhO0fdRpF+5yNoYaCjWRsnb3cHT87RecdMCm
-dr2I3fqtuThgpyU+zfUJKfBBqBsp6bQzxxXqcDvnRuhs6AlFMs4s1TG7NyqAs91u
-jqqXuLDDqLvZ/sYxFbSf1CXga/ccJPds6NVnMjQgE4bh3FawgFkOD/YWwXjTKbFC
-T7JWbpKEY0A7BSZxatAiCiRYlZSQdvAed4gcD2u5exbUehy9H53yaNX/3Kq3W5Zs
-+rz+tAL97HDBS6P/Dla1hVADcTSuIrFu7C4rJ92NHkT4Ol5261esM9s=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hochschule-bc.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hochschule-bc.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hochschule-bc.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hochschule-bc.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hochschule-bc.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hochschule-bc.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hochschule-bc.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rz1ads.fh-biberach.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hochschule-bc.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hochschule-bc.de,OU=Rechenzentrum,O=Hochschule Biberach,L=Biberach,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFlTCCBH2gAwIBAgIEEV0vSzANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMIQmliZXJh
-Y2gxHDAaBgNVBAoTE0hvY2hzY2h1bGUgQmliZXJhY2gxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xHTAbBgNVBAMTFEhCQy1HbG9iYWwgQ0EgLSBHIDAxMSEwHwYJKoZI
-hvcNAQkBFhJwa2lAZmgtYmliZXJhY2guZGUwHhcNMTEwMTI0MTcwNzA4WhcNMTYw
-MTIzMTcwNzA4WjCBkjELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0
-dGVtYmVyZzERMA8GA1UEBxMIQmliZXJhY2gxHDAaBgNVBAoTE0hvY2hzY2h1bGUg
-QmliZXJhY2gxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHTAbBgNVBAMTFGlkcC5o
-b2Noc2NodWxlLWJjLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-qtj8K4twdlFO6g3v+5yAWFmcQF2w3RB5dt6fUhF79dhb52jSWwqax/zhGjznGHsh
-cGa2ssx0Srbdd0q6B8pE4qj/6aj7Zwex/mUTZpn1ohvAxmtXhu8UorK42klm9NJV
-A/RSs1mNKqG1sMJIVVAxzJrQ0AcIfYVgkh5pY0tuzCWu2badGTdoiY5xzhy1jcGm
-zRZlWFUO/0iUlEPAZbIHbvqjDrEQ5I/O9AGEIoY2bS2ezEqIULPKXILdFLl/W5m6
-15ctpggBz3iIBZXMnmFNhWYsGGMwv+Q2poANbKlZFZBFsjwwa3DJ9YpNzJKyILgm
-16LqgL+fCGMGPOkvmLIgcwIDAQABo4IBzDCCAcgwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
-8JgV2opFP3hcLzImHnukv6OGpjAfBgNVHSMEGDAWgBSREBR4GID92wzwllHKuEQz
-3ElITTAkBgNVHREEHTAbgRlzdHVldHpsZUBob2Noc2NodWxlLWJjLmRlMIGFBgNV
-HR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hiYy1nbG9iYWwt
-Y2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvaGJjLWdsb2JhbC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEE
-gZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGJjLWds
-b2JhbC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvaGJjLWdsb2JhbC1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE5WRkxDRsl5jqKwvJCgE4d223Q0n1Tm
-/6tcHlZRGF9U+xktoJbGW3RWMIEWlhO0fdRpF+5yNoYaCjWRsnb3cHT87RecdMCm
-dr2I3fqtuThgpyU+zfUJKfBBqBsp6bQzxxXqcDvnRuhs6AlFMs4s1TG7NyqAs91u
-jqqXuLDDqLvZ/sYxFbSf1CXga/ccJPds6NVnMjQgE4bh3FawgFkOD/YWwXjTKbFC
-T7JWbpKEY0A7BSZxatAiCiRYlZSQdvAed4gcD2u5exbUehy9H53yaNX/3Kq3W5Zs
-+rz+tAL97HDBS6P/Dla1hVADcTSuIrFu7C4rJ92NHkT4Ol5261esM9s=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hochschule-bc.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hochschule-bc.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Biberach</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Biberach</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hochschule-bc.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Roland</GivenName>
-    <SurName>Forderer</SurName>
-    <EmailAddress>forderer@hochschule-bc.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DFN-AAI</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>hotline@aai.dfn.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.holborncollege.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.holborncollege.ac.uk-openathens.xml
deleted file mode 100644
index cb2ef1db..00000000
--- a/swamid-interfederations-2.0/idp.holborncollege.ac.uk-openathens.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.holborncollege.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Holborn College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">holborncollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/holborncollege.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/holborncollege.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Holborn College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.holborncollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.holycross.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.holycross.ac.uk-shibboleth.xml
deleted file mode 100644
index 58bc5f20..00000000
--- a/swamid-interfederations-2.0/idp.holycross.ac.uk-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://idp.holycross.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Holy Cross College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-08T11:07: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">holycross.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjwCCQDPBZyVuDlkujANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
-						QjETMBEGA1UECBMKTGFuY2FzaGlyZTENMAsGA1UEBxMEQnVyeTEbMBkGA1UEChMS
-						SG9seSBDcm9zcyBDb2xsZWdlMRwwGgYDVQQDExNpZHAuaG9seWNyb3NzLmFjLnVr
-						MB4XDTE0MDYyMDEyMDgzOVoXDTM0MDYxNTEyMDgzOVowbDELMAkGA1UEBhMCR0Ix
-						EzARBgNVBAgTCkxhbmNhc2hpcmUxDTALBgNVBAcTBEJ1cnkxGzAZBgNVBAoTEkhv
-						bHkgQ3Jvc3MgQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmhvbHljcm9zcy5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALkf9BA2MoTWP1Et24UtZ4ZE
-						6XsAQ+ykCv3jhfVULoxzTjgSEDepcS1uweBQo0Mua4uB2iAmTe4GCXh2xfdCVNK8
-						3Sm1fusNjjZFyIEOV1Kf+pmqR5IJFtDfVZpfiYiohiBkGm5WX1Ir1BLKUWxZjT0e
-						lW21AdK8vPl5Ag38vAZynNUmKIxCSED9MiZoh373dgtu5Wl01Yjj6NH46JGA7G7/
-						FOId7Ip/jhPYTldVWpGDv/5SHjpP+nMnRmUEw0hSQ/fpNS5fpnnGcoUjFDUHhlZN
-						c8wgfpL1SeG5rdVkMioLvRMCnyyrKQeKyZNhg97WDiKuHag41tf5MQ/LSznH0fsC
-						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAnPfzR48PVuYBh+xA5vAUU+habal3VAoD
-						mEEOU4Zvn2KonwB8JTyNqaNdFHqwmuR8fctB6XV1ZWQeOTDqJp+sc/SZRAFVCG36
-						ZadN0NNByFp0jZblXYI3XQs2MYPzOsqKJgqFUPfDPSfJ2W3aIbD3vDG7UbOfDKkx
-						LtaM9+LmqqBASGV8qwIJhdLG4znAeaeeDdes84gLFcSuxGq9EqvOIO4q+Q+m2JwX
-						WWZqc/Tnz6A60KnEbChH/UnymSArytLz6Zfk47Xzxs+Mq9NzPZ9XPif+Dw04pm69
-						qAp30iOD9pcAPq2kyLUGxrT4XraJjaw/JV+lVPY6QYCcJoj0kKteRA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.holycross.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.holycross.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.holycross.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.holycross.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.holycross.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.holycross.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">holycross.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjwCCQDPBZyVuDlkujANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
-						QjETMBEGA1UECBMKTGFuY2FzaGlyZTENMAsGA1UEBxMEQnVyeTEbMBkGA1UEChMS
-						SG9seSBDcm9zcyBDb2xsZWdlMRwwGgYDVQQDExNpZHAuaG9seWNyb3NzLmFjLnVr
-						MB4XDTE0MDYyMDEyMDgzOVoXDTM0MDYxNTEyMDgzOVowbDELMAkGA1UEBhMCR0Ix
-						EzARBgNVBAgTCkxhbmNhc2hpcmUxDTALBgNVBAcTBEJ1cnkxGzAZBgNVBAoTEkhv
-						bHkgQ3Jvc3MgQ29sbGVnZTEcMBoGA1UEAxMTaWRwLmhvbHljcm9zcy5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALkf9BA2MoTWP1Et24UtZ4ZE
-						6XsAQ+ykCv3jhfVULoxzTjgSEDepcS1uweBQo0Mua4uB2iAmTe4GCXh2xfdCVNK8
-						3Sm1fusNjjZFyIEOV1Kf+pmqR5IJFtDfVZpfiYiohiBkGm5WX1Ir1BLKUWxZjT0e
-						lW21AdK8vPl5Ag38vAZynNUmKIxCSED9MiZoh373dgtu5Wl01Yjj6NH46JGA7G7/
-						FOId7Ip/jhPYTldVWpGDv/5SHjpP+nMnRmUEw0hSQ/fpNS5fpnnGcoUjFDUHhlZN
-						c8wgfpL1SeG5rdVkMioLvRMCnyyrKQeKyZNhg97WDiKuHag41tf5MQ/LSznH0fsC
-						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAnPfzR48PVuYBh+xA5vAUU+habal3VAoD
-						mEEOU4Zvn2KonwB8JTyNqaNdFHqwmuR8fctB6XV1ZWQeOTDqJp+sc/SZRAFVCG36
-						ZadN0NNByFp0jZblXYI3XQs2MYPzOsqKJgqFUPfDPSfJ2W3aIbD3vDG7UbOfDKkx
-						LtaM9+LmqqBASGV8qwIJhdLG4znAeaeeDdes84gLFcSuxGq9EqvOIO4q+Q+m2JwX
-						WWZqc/Tnz6A60KnEbChH/UnymSArytLz6Zfk47Xzxs+Mq9NzPZ9XPif+Dw04pm69
-						qAp30iOD9pcAPq2kyLUGxrT4XraJjaw/JV+lVPY6QYCcJoj0kKteRA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.holycross.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.holycross.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">Holy Cross College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Holy Cross College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.holycross.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:raw@holycross.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:raw@holycross.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 521c3262..00000000
--- a/swamid-interfederations-2.0/idp.howcollege.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.howcollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Heart of Worcestershire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-16T10:12:31Z">
-      <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 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">howcollege.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Heart of Worcestershire College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Bromsgrove, Redditch and Worcester campuses</mdui:Description>
-        <mdui:Logo height="60" width="60">https://idp.howcollege.ac.uk/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>
-						MIIDOzCCAiOgAwIBAgIUIV/bMP5LUHhSHK2H/ftaUcnV+bswDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLmhvd2NvbGxlZ2UuYWMudWswHhcNMTUwNzExMDky
-						ODMxWhcNMzUwNzExMDkyODMxWjAfMR0wGwYDVQQDDBRpZHAuaG93Y29sbGVnZS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJs8SIOo9hC9+gvM
-						tNmvz0M90Uz2Iv6Hdm8PeFmE+b6LQ4HL+pJ112cRhYBTqLB4TigMVUIR0jfghDmY
-						KHfI03mdyd7XF/zW2l9/NASaGCftrYnZ236rEaxttKwpaG+oE4cUjt7jN/1xTsrs
-						OZqRYMviLbN2Z0CilsqH8rEdvhQUP/NQz4m/583oXENRi6CkttlxigeLqgCZJnE4
-						nOOihG+B/mAom4bBrQgoo3AlzJ0xcWz8vu3b25l0wLQJ7++v7ztNRiOeruyr2MDf
-						J0tuP6Mna00iTCcf152/vSNmqsZ1D3B7aPTXb9H1VzfevKpy4tqsczeQmg7s961u
-						hzBz8xECAwEAAaNvMG0wHQYDVR0OBBYEFHqlVB+1t7er6xkztukqjp35urcoMEwG
-						A1UdEQRFMEOCFGlkcC5ob3djb2xsZWdlLmFjLnVrhitodHRwczovL2lkcC5ob3dj
-						b2xsZWdlLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBP
-						1iiYzMc0kuervTw306zKJ0HrXFZCPmWDYU0THB8A8zXxMXjpbL/3qWOw8j37ZSPP
-						cJ8EOi652mPIsWv85WsyQ7ntOhaeFVDD6M/uokGjuzD60cBGdzaxzskN104a7th+
-						hwFI6WMvWTOQgsu18+tch/At3NF0cnL2kbyDArn+X+8BSY5yRdW93Ll1JFvRriM4
-						HNYuh0UNxlwMVjBoM02K1JI+KqBFriF9oV1/Nfywz4fcSr9ad2GLhywUWIY3K21h
-						R52x5YYvbFA6i2Y+iO7O16yCyP08ufkCs8RPqJTaSUCyK1LMAYPln7IwmTvXdwJs
-						MSdGAdy5DQAjICnCqVDR
-					</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>
-						MIIDOzCCAiOgAwIBAgIUVFOr40s9jvy9xnBpp6lJY7DLRdcwDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLmhvd2NvbGxlZ2UuYWMudWswHhcNMTUwNzExMDky
-						ODMwWhcNMzUwNzExMDkyODMwWjAfMR0wGwYDVQQDDBRpZHAuaG93Y29sbGVnZS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIXBTejP8jHfkOUT
-						ogLtt0W1puBnVZRxJCExaU4VEXGN9r/oHW4dFLolNVMN5ZWpldwXlNI9XAAmRZFa
-						8sUHbczGTCZANITH8PbUMMLmCaECRQYsPPNdyCDok0n4r5LVXq6uENv13M1DrMdC
-						WIE+SazO9dvS7iMPY3MLmMr8dtQ1hti4BTJSzBQ/Tic/YBDvKS9vcBrYs5YdIBa7
-						v+kGpPa0K4z4ux7Xpn9u/5lxFiXKolSdEP5xx4lGvhtsN0Pi3MUSXA2F8UaUG2oZ
-						RHzl+vr5yi2/8eitMcF69P938xnLj6X7kyOhJe0CIpqZx6aK1LbekaX1xmw6mgB+
-						6mvfNoECAwEAAaNvMG0wHQYDVR0OBBYEFLgp1MkKweK5Zjto/cR7iThEWh4IMEwG
-						A1UdEQRFMEOCFGlkcC5ob3djb2xsZWdlLmFjLnVrhitodHRwczovL2lkcC5ob3dj
-						b2xsZWdlLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBS
-						RcEOVCR40shleV16Xwl+Q+u52810nUjfG9LNaWBchmTgT/PhzCefiMAvKp+kW+VT
-						2N1JoIT0MUKwQFO6s2TLnMDXFo9RBQPtYWjK+OhrUTIqFCf244/IB5kig9OkA3JY
-						tmIuNRX+toOvIFvdaJ0cudTl0dvrAPP7tLyvbdvZ0MjeG/QhvbTi1MpdQty7xc9v
-						k5VhbRQcokEwwyxhyazf7o5FRwBohYa+NIc7yX7fMnWbiK6Hp1HZCa9r93vavg2j
-						DB5yJZ2YZkqn58Fmt6GuX8Hl+gVvHtVn1/iQvLAawKOPlqoMHOdbgsgqmIH98hFW
-						3ZQeGMhHjAVi/GYJNeCA
-					</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>
-						MIIDPDCCAiSgAwIBAgIVALdi+04fUwNvm/vp9Breq3GSxYrsMA0GCSqGSIb3DQEB
-						CwUAMB8xHTAbBgNVBAMMFGlkcC5ob3djb2xsZWdlLmFjLnVrMB4XDTE1MDcxMTA5
-						MjgzMVoXDTM1MDcxMTA5MjgzMVowHzEdMBsGA1UEAwwUaWRwLmhvd2NvbGxlZ2Uu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1gNa0yhU7yUCi
-						YSjXkBTRzvMlE0ZwC0smMFhm27bvQJx87unl14wVR0H5b/XxLLxPVSpdlKSJUFaL
-						5D+ECuLhJM1uGJImWeloGCtVfwwNooZx6SR0AYi6dH9Zcj+YqwbEwKLTTztFirhw
-						XWgOiHIy+Ky1LYlp23VXpjPZ//GOWI933Gfy0M5rGBU9kHXXjzdOoyWPy61zniQr
-						iaXYobrbsc/CZNNKN/WF9FupHmOnZolhM34kwe7ZcKtcH3x2zyMLmc32pUUAOkOH
-						ZwrElIRy9wgFMiAcMgkfMJcB7UgD1Rro80TkMvYqBCMTXalb/6WDT2BDrwEHP6n/
-						O0+Sj35pAgMBAAGjbzBtMB0GA1UdDgQWBBRZKSb0Fn8mSKc4+dOMkdjV6QOeMzBM
-						BgNVHREERTBDghRpZHAuaG93Y29sbGVnZS5hYy51a4YraHR0cHM6Ly9pZHAuaG93
-						Y29sbGVnZS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-						k3Pg1Cc901Y1yTXwuYbV8RqAAHsHPI/JUOyrJQgZojPCBsmMUiAEeB+Vc9brMVaf
-						xTGbIE0D3P50L09M+M3cQYw9TloDaEn9vWc26CBflCMDRImoLOSRIsGbyW8bXVJ0
-						k9RBMQp0BUnMTjd/NSyLzDb16sxZNiHKz8f0lxA0HtRzkmJ2OgpaiSVK2HPNJOZO
-						X0jQbOjyyM+wxF367SnVktX9cn5vDtKCh5MAj12OsyVcohyvj9HvsI59Gay9TVzE
-						YiJSWzeJD6IRS7rBo04zbII63+d/IqWEtWpumfHi4tcbBZJa8pLs30YrcPzpNtq9
-						iI5BW+3hvx2Iw5bpU//9+g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.howcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.howcollege.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.howcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.howcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.howcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.howcollege.ac.uk/idp/profile/SAML2/Redirect/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">howcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUIV/bMP5LUHhSHK2H/ftaUcnV+bswDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLmhvd2NvbGxlZ2UuYWMudWswHhcNMTUwNzExMDky
-						ODMxWhcNMzUwNzExMDkyODMxWjAfMR0wGwYDVQQDDBRpZHAuaG93Y29sbGVnZS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJs8SIOo9hC9+gvM
-						tNmvz0M90Uz2Iv6Hdm8PeFmE+b6LQ4HL+pJ112cRhYBTqLB4TigMVUIR0jfghDmY
-						KHfI03mdyd7XF/zW2l9/NASaGCftrYnZ236rEaxttKwpaG+oE4cUjt7jN/1xTsrs
-						OZqRYMviLbN2Z0CilsqH8rEdvhQUP/NQz4m/583oXENRi6CkttlxigeLqgCZJnE4
-						nOOihG+B/mAom4bBrQgoo3AlzJ0xcWz8vu3b25l0wLQJ7++v7ztNRiOeruyr2MDf
-						J0tuP6Mna00iTCcf152/vSNmqsZ1D3B7aPTXb9H1VzfevKpy4tqsczeQmg7s961u
-						hzBz8xECAwEAAaNvMG0wHQYDVR0OBBYEFHqlVB+1t7er6xkztukqjp35urcoMEwG
-						A1UdEQRFMEOCFGlkcC5ob3djb2xsZWdlLmFjLnVrhitodHRwczovL2lkcC5ob3dj
-						b2xsZWdlLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBP
-						1iiYzMc0kuervTw306zKJ0HrXFZCPmWDYU0THB8A8zXxMXjpbL/3qWOw8j37ZSPP
-						cJ8EOi652mPIsWv85WsyQ7ntOhaeFVDD6M/uokGjuzD60cBGdzaxzskN104a7th+
-						hwFI6WMvWTOQgsu18+tch/At3NF0cnL2kbyDArn+X+8BSY5yRdW93Ll1JFvRriM4
-						HNYuh0UNxlwMVjBoM02K1JI+KqBFriF9oV1/Nfywz4fcSr9ad2GLhywUWIY3K21h
-						R52x5YYvbFA6i2Y+iO7O16yCyP08ufkCs8RPqJTaSUCyK1LMAYPln7IwmTvXdwJs
-						MSdGAdy5DQAjICnCqVDR
-					</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>
-						MIIDOzCCAiOgAwIBAgIUVFOr40s9jvy9xnBpp6lJY7DLRdcwDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLmhvd2NvbGxlZ2UuYWMudWswHhcNMTUwNzExMDky
-						ODMwWhcNMzUwNzExMDkyODMwWjAfMR0wGwYDVQQDDBRpZHAuaG93Y29sbGVnZS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIXBTejP8jHfkOUT
-						ogLtt0W1puBnVZRxJCExaU4VEXGN9r/oHW4dFLolNVMN5ZWpldwXlNI9XAAmRZFa
-						8sUHbczGTCZANITH8PbUMMLmCaECRQYsPPNdyCDok0n4r5LVXq6uENv13M1DrMdC
-						WIE+SazO9dvS7iMPY3MLmMr8dtQ1hti4BTJSzBQ/Tic/YBDvKS9vcBrYs5YdIBa7
-						v+kGpPa0K4z4ux7Xpn9u/5lxFiXKolSdEP5xx4lGvhtsN0Pi3MUSXA2F8UaUG2oZ
-						RHzl+vr5yi2/8eitMcF69P938xnLj6X7kyOhJe0CIpqZx6aK1LbekaX1xmw6mgB+
-						6mvfNoECAwEAAaNvMG0wHQYDVR0OBBYEFLgp1MkKweK5Zjto/cR7iThEWh4IMEwG
-						A1UdEQRFMEOCFGlkcC5ob3djb2xsZWdlLmFjLnVrhitodHRwczovL2lkcC5ob3dj
-						b2xsZWdlLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBS
-						RcEOVCR40shleV16Xwl+Q+u52810nUjfG9LNaWBchmTgT/PhzCefiMAvKp+kW+VT
-						2N1JoIT0MUKwQFO6s2TLnMDXFo9RBQPtYWjK+OhrUTIqFCf244/IB5kig9OkA3JY
-						tmIuNRX+toOvIFvdaJ0cudTl0dvrAPP7tLyvbdvZ0MjeG/QhvbTi1MpdQty7xc9v
-						k5VhbRQcokEwwyxhyazf7o5FRwBohYa+NIc7yX7fMnWbiK6Hp1HZCa9r93vavg2j
-						DB5yJZ2YZkqn58Fmt6GuX8Hl+gVvHtVn1/iQvLAawKOPlqoMHOdbgsgqmIH98hFW
-						3ZQeGMhHjAVi/GYJNeCA
-					</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>
-						MIIDPDCCAiSgAwIBAgIVALdi+04fUwNvm/vp9Breq3GSxYrsMA0GCSqGSIb3DQEB
-						CwUAMB8xHTAbBgNVBAMMFGlkcC5ob3djb2xsZWdlLmFjLnVrMB4XDTE1MDcxMTA5
-						MjgzMVoXDTM1MDcxMTA5MjgzMVowHzEdMBsGA1UEAwwUaWRwLmhvd2NvbGxlZ2Uu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1gNa0yhU7yUCi
-						YSjXkBTRzvMlE0ZwC0smMFhm27bvQJx87unl14wVR0H5b/XxLLxPVSpdlKSJUFaL
-						5D+ECuLhJM1uGJImWeloGCtVfwwNooZx6SR0AYi6dH9Zcj+YqwbEwKLTTztFirhw
-						XWgOiHIy+Ky1LYlp23VXpjPZ//GOWI933Gfy0M5rGBU9kHXXjzdOoyWPy61zniQr
-						iaXYobrbsc/CZNNKN/WF9FupHmOnZolhM34kwe7ZcKtcH3x2zyMLmc32pUUAOkOH
-						ZwrElIRy9wgFMiAcMgkfMJcB7UgD1Rro80TkMvYqBCMTXalb/6WDT2BDrwEHP6n/
-						O0+Sj35pAgMBAAGjbzBtMB0GA1UdDgQWBBRZKSb0Fn8mSKc4+dOMkdjV6QOeMzBM
-						BgNVHREERTBDghRpZHAuaG93Y29sbGVnZS5hYy51a4YraHR0cHM6Ly9pZHAuaG93
-						Y29sbGVnZS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-						k3Pg1Cc901Y1yTXwuYbV8RqAAHsHPI/JUOyrJQgZojPCBsmMUiAEeB+Vc9brMVaf
-						xTGbIE0D3P50L09M+M3cQYw9TloDaEn9vWc26CBflCMDRImoLOSRIsGbyW8bXVJ0
-						k9RBMQp0BUnMTjd/NSyLzDb16sxZNiHKz8f0lxA0HtRzkmJ2OgpaiSVK2HPNJOZO
-						X0jQbOjyyM+wxF367SnVktX9cn5vDtKCh5MAj12OsyVcohyvj9HvsI59Gay9TVzE
-						YiJSWzeJD6IRS7rBo04zbII63+d/IqWEtWpumfHi4tcbBZJa8pLs30YrcPzpNtq9
-						iI5BW+3hvx2Iw5bpU//9+g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.howcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Heart of Worcestershire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Heart of Worcestershire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.howcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:ITServices@howcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Edmund</GivenName>
-    <SurName>Haworth</SurName>
-    <EmailAddress>mailto:EHaworth@howcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hrz.uni-kassel.de.xml b/swamid-interfederations-2.0/idp.hrz.uni-kassel.de.xml
deleted file mode 100644
index b1fb7c5f..00000000
--- a/swamid-interfederations-2.0/idp.hrz.uni-kassel.de.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hrz.uni-kassel.de/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hrz.uni-kassel.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-kassel.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hrz.uni-kassel.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGccOzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
-Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
-CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDgwNzA4WhcNMTMwNjA0MDgw
-NzA4WjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
-bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRw
-Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAskXMpKBmu5GI3Mb1iVRHJv4Ms6+vneS7ecoq/YkTI2zwrqvAnnd7EqB3Sn00
-lexsTF0oqYDmPn8ycJFvIvJZKJh60wwHDAzo/n2wQ/HPQBxC/Y4MQ574JIwPfgWM
-gDplhHE+givrvdMMxHy4u0be0eDkdMpi+Y7aX5IA9SW1ZQn5SzOlLiwziEahTq9q
-fBBtXTYQvotqc2cgz1r4LICKEHV2BEy42OD+5jBZmYXgp/YiPhkWSNUkbP504q5w
-pZn5N11XwFg7n+Y68W6glWbig98W9mApF1A5XpHVwqrXiUpO8vlCY2cR0NExdQzS
-9tr6Y+l4z9Ka7VvrKOb/wJ+AlQIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTD+bIUdRBli/hPmpc/bDqvt1V/QjAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
-l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
-bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
-SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
-YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAfth7
-akrhZJxio39OkpTWe8ob14bpvMctbQe6zClv0BDQMy69vtLMKtlVJKbvZI37klHe
-6qDP356ikhe6cWNFiYOcddPUwyjj4Gxpys+tp6f9MpgwJSa5X1CvwVNmN6+ncjvm
-E9WCrm2qIPy76legc7Hi1dqiIanggsLj6rloaZvITb4QowLI2dVOVFXZq0lXe4Nd
-WTAMaakGxwWGcijex7MCzyhucNP8QPb73b9YwsHAUQ02NwSkdmryG5DH167O90vT
-dh1uhiCsfbvag0X9UF5ReJlS2/qixI02VyBXvGWHaGB2TXZR62RK+oU8P4KMYvuQ
-NvJcsfo5OyQT/KjEqA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hrz.uni-kassel.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGccOzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
-Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
-CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDgwNzA4WhcNMTMwNjA0MDgw
-NzA4WjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
-bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRw
-Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAskXMpKBmu5GI3Mb1iVRHJv4Ms6+vneS7ecoq/YkTI2zwrqvAnnd7EqB3Sn00
-lexsTF0oqYDmPn8ycJFvIvJZKJh60wwHDAzo/n2wQ/HPQBxC/Y4MQ574JIwPfgWM
-gDplhHE+givrvdMMxHy4u0be0eDkdMpi+Y7aX5IA9SW1ZQn5SzOlLiwziEahTq9q
-fBBtXTYQvotqc2cgz1r4LICKEHV2BEy42OD+5jBZmYXgp/YiPhkWSNUkbP504q5w
-pZn5N11XwFg7n+Y68W6glWbig98W9mApF1A5XpHVwqrXiUpO8vlCY2cR0NExdQzS
-9tr6Y+l4z9Ka7VvrKOb/wJ+AlQIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTD+bIUdRBli/hPmpc/bDqvt1V/QjAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
-l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
-bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
-SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
-YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAfth7
-akrhZJxio39OkpTWe8ob14bpvMctbQe6zClv0BDQMy69vtLMKtlVJKbvZI37klHe
-6qDP356ikhe6cWNFiYOcddPUwyjj4Gxpys+tp6f9MpgwJSa5X1CvwVNmN6+ncjvm
-E9WCrm2qIPy76legc7Hi1dqiIanggsLj6rloaZvITb4QowLI2dVOVFXZq0lXe4Nd
-WTAMaakGxwWGcijex7MCzyhucNP8QPb73b9YwsHAUQ02NwSkdmryG5DH167O90vT
-dh1uhiCsfbvag0X9UF5ReJlS2/qixI02VyBXvGWHaGB2TXZR62RK+oU8P4KMYvuQ
-NvJcsfo5OyQT/KjEqA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hrz.uni-kassel.de:8443/shibboleth-idp/Artifact" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hrz.uni-kassel.de/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hrz.uni-kassel.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-kassel.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hrz.uni-kassel.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGccOzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
-Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
-CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDgwNzA4WhcNMTMwNjA0MDgw
-NzA4WjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
-bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRw
-Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAskXMpKBmu5GI3Mb1iVRHJv4Ms6+vneS7ecoq/YkTI2zwrqvAnnd7EqB3Sn00
-lexsTF0oqYDmPn8ycJFvIvJZKJh60wwHDAzo/n2wQ/HPQBxC/Y4MQ574JIwPfgWM
-gDplhHE+givrvdMMxHy4u0be0eDkdMpi+Y7aX5IA9SW1ZQn5SzOlLiwziEahTq9q
-fBBtXTYQvotqc2cgz1r4LICKEHV2BEy42OD+5jBZmYXgp/YiPhkWSNUkbP504q5w
-pZn5N11XwFg7n+Y68W6glWbig98W9mApF1A5XpHVwqrXiUpO8vlCY2cR0NExdQzS
-9tr6Y+l4z9Ka7VvrKOb/wJ+AlQIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTD+bIUdRBli/hPmpc/bDqvt1V/QjAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
-l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
-bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
-SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
-YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAfth7
-akrhZJxio39OkpTWe8ob14bpvMctbQe6zClv0BDQMy69vtLMKtlVJKbvZI37klHe
-6qDP356ikhe6cWNFiYOcddPUwyjj4Gxpys+tp6f9MpgwJSa5X1CvwVNmN6+ncjvm
-E9WCrm2qIPy76legc7Hi1dqiIanggsLj6rloaZvITb4QowLI2dVOVFXZq0lXe4Nd
-WTAMaakGxwWGcijex7MCzyhucNP8QPb73b9YwsHAUQ02NwSkdmryG5DH167O90vT
-dh1uhiCsfbvag0X9UF5ReJlS2/qixI02VyBXvGWHaGB2TXZR62RK+oU8P4KMYvuQ
-NvJcsfo5OyQT/KjEqA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hrz.uni-kassel.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hrz.uni-kassel.de,OU=Hochschulrechenzentrum,O=Universitaet Kassel,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFeTCCBGGgAwIBAgIEDGccOzANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBLYXNzZWwxHzAdBgNVBAsTFkhvY2hz
-Y2h1bHJlY2hlbnplbnRydW0xQDA+BgNVBAMTN1VuaSBLYXNzZWwgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgKFVuaUthc3NlbC1DQSkgLSBHMDIxHzAdBgkqhkiG9w0B
-CQEWEGNhQHVuaS1rYXNzZWwuZGUwHhcNMDgwNjA1MDgwNzA4WhcNMTMwNjA0MDgw
-NzA4WjBsMQswCQYDVQQGEwJERTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IEthc3Nl
-bDEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVaWRw
-Lmhyei51bmkta2Fzc2VsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAskXMpKBmu5GI3Mb1iVRHJv4Ms6+vneS7ecoq/YkTI2zwrqvAnnd7EqB3Sn00
-lexsTF0oqYDmPn8ycJFvIvJZKJh60wwHDAzo/n2wQ/HPQBxC/Y4MQ574JIwPfgWM
-gDplhHE+givrvdMMxHy4u0be0eDkdMpi+Y7aX5IA9SW1ZQn5SzOlLiwziEahTq9q
-fBBtXTYQvotqc2cgz1r4LICKEHV2BEy42OD+5jBZmYXgp/YiPhkWSNUkbP504q5w
-pZn5N11XwFg7n+Y68W6glWbig98W9mApF1A5XpHVwqrXiUpO8vlCY2cR0NExdQzS
-9tr6Y+l4z9Ka7VvrKOb/wJ+AlQIDAQABo4IB3TCCAdkwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTD+bIUdRBli/hPmpc/bDqvt1V/QjAfBgNVHSMEGDAWgBQXPfKug9xhgKTokMyA
-l3k1DX0CTDArBgNVHREEJDAigSBoYXJuaXNjaG1hY2hlckBocnoudW5pLWthc3Nl
-bC5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1rYXNzZWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDA+oDygOoY4aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS91bmkta2Fzc2VsLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1rYXNzZWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
-SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWthc3NlbC1j
-YS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAfth7
-akrhZJxio39OkpTWe8ob14bpvMctbQe6zClv0BDQMy69vtLMKtlVJKbvZI37klHe
-6qDP356ikhe6cWNFiYOcddPUwyjj4Gxpys+tp6f9MpgwJSa5X1CvwVNmN6+ncjvm
-E9WCrm2qIPy76legc7Hi1dqiIanggsLj6rloaZvITb4QowLI2dVOVFXZq0lXe4Nd
-WTAMaakGxwWGcijex7MCzyhucNP8QPb73b9YwsHAUQ02NwSkdmryG5DH167O90vT
-dh1uhiCsfbvag0X9UF5ReJlS2/qixI02VyBXvGWHaGB2TXZR62RK+oU8P4KMYvuQ
-NvJcsfo5OyQT/KjEqA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hrz.uni-kassel.de:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Kassel</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Kassel</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-kassel.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Peter</GivenName>
-    <SurName>Zanger</SurName>
-    <EmailAddress>zanger@hrz.uni-kassel.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Zanger</SurName>
-    <EmailAddress>zanger@hrz.uni-kassel.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-emden-leer.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hs-emden-leer.de-idp-shibboleth.xml
deleted file mode 100644
index b4c609ee..00000000
--- a/swamid-interfederations-2.0/idp.hs-emden-leer.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-emden-leer.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-12-02T06:52: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>
-  </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">hs-emden-leer.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Hochschule Emden/Leer</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Applied Sciences Emden/Leer</mdui:DisplayName>
-        <mdui:Description xml:lang="de">IDP der Hochschule Emden/Leer</mdui:Description>
-        <mdui:Description xml:lang="en">IDP of the University of Applied Sciences Emden/Leer</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-emden-leer.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-emden-leer.de,OU=Rechenzentrum,O=Hochschule Emden/Leer,L=Emden,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF8TCCBNmgAwIBAgIHF2YO9TQKfTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQG
-EwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjEeMBwGA1UEChMVSG9jaHNjaHVs
-ZSBFbWRlbi9MZWVyMREwDwYDVQQDEwhIUy1FTCBDQTEjMCEGCSqGSIb3DQEJARYU
-cGtpQGhzLWVtZGVuLWxlZXIuZGUwHhcNMTQwNDEwMTI0MTA5WhcNMTkwNDA5MTI0
-MTA5WjCBjDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xDjAM
-BgNVBAcTBUVtZGVuMR4wHAYDVQQKExVIb2Noc2NodWxlIEVtZGVuL0xlZXIxFjAU
-BgNVBAsTDVJlY2hlbnplbnRydW0xHTAbBgNVBAMTFGlkcC5ocy1lbWRlbi1sZWVy
-LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2n62r7K8WT1SOEvK
-lLzfy6eWEmPlaxbiRNSzj9qhGyiG0MT3olJRbk1EYgRQnSskhP1J0fTs8jyRUHTg
-2hpTvQhCKM6hpYpR/syy71GZpxg5kB6XH5yiLq7w7smPhMPXKlvZU7gYdiTxXFud
-RbVt/Wp8uP0hLGMeJqD5lM3Gx1YR7RXt6+R82LhFDzDQJbwucFvCUA84xwRaKs46
-OokRvvttAswlZwW+nLCnIGHQQbeBb8LpvQu88tzrR3/2yOqf0s2SSUxXsoLNbZj9
-BhIL+A8ifijLkevQF6PXUTHIAgolzmJ+I9oYwYvZyY1/mCT713zSlF8+vJXN+wDR
-fB4dQQIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEw
-EQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQE
-AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFHtH
-fymHYWiApAXIHeAn+oCZbeF5MB8GA1UdIwQYMBaAFLWOwZTIi3pZbkGKl9QbJ1kL
-0vLPMD4GA1UdEQQ3MDWCFGlkcC5ocy1lbWRlbi1sZWVyLmRlgR1uaWxzLnZhbi5s
-b2hAaHMtZW1kZW4tbGVlci5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2hzLWVtZGVuLWxlZXItY2EvcHViL2NybC9jYWNybC5j
-cmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZW1kZW4tbGVlci1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYBBQUHAQEEgc4wgcswMwYIKwYBBQUH
-MAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBJBggr
-BgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1lbWRlbi1sZWVyLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9ocy1lbWRlbi1sZWVyLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAWsMlRKRQratCL8EzmlbDeliEGym0a0feGbrh
-RQo8xi9CglyKERHs1cGO3TJuGWgcc7CiPRGA+EEsMWO1n4PHGIQGeTUQpCHqK8N7
-IW7P2e9zyM/meC598PoZxxQaIzT6bo90B07IEooplxASGF4voXkhEWH4fFUkKnp7
-yTPWiLOgIi1biiQXbGPjdeqb4MkrORRXsJTzKMj/RzxrSbFOHVG2dRXGkNDgJfFC
-KI6KoWF8UHUJ0CfutHB1PxWjIcbGGFTglnIcdQRo/N228uw++vAhj5+DdEG6JiQj
-IM1biUq8Xi0kRMiKUCmA6SItkZNrtAgav/JmjITPj8vFR7/JzQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-emden-leer.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-emden-leer.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-emden-leer.de/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">hs-emden-leer.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-emden-leer.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-emden-leer.de,OU=Rechenzentrum,O=Hochschule Emden/Leer,L=Emden,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF8TCCBNmgAwIBAgIHF2YO9TQKfTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQG
-EwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjEeMBwGA1UEChMVSG9jaHNjaHVs
-ZSBFbWRlbi9MZWVyMREwDwYDVQQDEwhIUy1FTCBDQTEjMCEGCSqGSIb3DQEJARYU
-cGtpQGhzLWVtZGVuLWxlZXIuZGUwHhcNMTQwNDEwMTI0MTA5WhcNMTkwNDA5MTI0
-MTA5WjCBjDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xDjAM
-BgNVBAcTBUVtZGVuMR4wHAYDVQQKExVIb2Noc2NodWxlIEVtZGVuL0xlZXIxFjAU
-BgNVBAsTDVJlY2hlbnplbnRydW0xHTAbBgNVBAMTFGlkcC5ocy1lbWRlbi1sZWVy
-LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2n62r7K8WT1SOEvK
-lLzfy6eWEmPlaxbiRNSzj9qhGyiG0MT3olJRbk1EYgRQnSskhP1J0fTs8jyRUHTg
-2hpTvQhCKM6hpYpR/syy71GZpxg5kB6XH5yiLq7w7smPhMPXKlvZU7gYdiTxXFud
-RbVt/Wp8uP0hLGMeJqD5lM3Gx1YR7RXt6+R82LhFDzDQJbwucFvCUA84xwRaKs46
-OokRvvttAswlZwW+nLCnIGHQQbeBb8LpvQu88tzrR3/2yOqf0s2SSUxXsoLNbZj9
-BhIL+A8ifijLkevQF6PXUTHIAgolzmJ+I9oYwYvZyY1/mCT713zSlF8+vJXN+wDR
-fB4dQQIDAQABo4ICZDCCAmAwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEw
-EQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQE
-AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFHtH
-fymHYWiApAXIHeAn+oCZbeF5MB8GA1UdIwQYMBaAFLWOwZTIi3pZbkGKl9QbJ1kL
-0vLPMD4GA1UdEQQ3MDWCFGlkcC5ocy1lbWRlbi1sZWVyLmRlgR1uaWxzLnZhbi5s
-b2hAaHMtZW1kZW4tbGVlci5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2hzLWVtZGVuLWxlZXItY2EvcHViL2NybC9jYWNybC5j
-cmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZW1kZW4tbGVlci1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYBBQUHAQEEgc4wgcswMwYIKwYBBQUH
-MAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBJBggr
-BgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1lbWRlbi1sZWVyLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9ocy1lbWRlbi1sZWVyLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAWsMlRKRQratCL8EzmlbDeliEGym0a0feGbrh
-RQo8xi9CglyKERHs1cGO3TJuGWgcc7CiPRGA+EEsMWO1n4PHGIQGeTUQpCHqK8N7
-IW7P2e9zyM/meC598PoZxxQaIzT6bo90B07IEooplxASGF4voXkhEWH4fFUkKnp7
-yTPWiLOgIi1biiQXbGPjdeqb4MkrORRXsJTzKMj/RzxrSbFOHVG2dRXGkNDgJfFC
-KI6KoWF8UHUJ0CfutHB1PxWjIcbGGFTglnIcdQRo/N228uw++vAhj5+DdEG6JiQj
-IM1biUq8Xi0kRMiKUCmA6SItkZNrtAgav/JmjITPj8vFR7/JzQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-emden-leer.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-emden-leer.de: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">e391</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e391</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Hochschule Emden/Leer</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Emden/Leer</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.hs-emden-leer.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hs-emden-leer.de/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Nils</md:GivenName>
-    <md:SurName>van Loh</md:SurName>
-    <md:EmailAddress>mailto:nils.van.loh@hs-emden-leer.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Nils</md:GivenName>
-    <md:SurName>van Loh</md:SurName>
-    <md:EmailAddress>mailto:nils.van.loh@hs-emden-leer.de</md:EmailAddress>
-  </md: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 1402a365..00000000
--- a/swamid-interfederations-2.0/idp.hs-esslingen.de-idp-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://idp.hs-esslingen.de/idp/shibboleth">
-  <md: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>
-  </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">hs-esslingen.de</shibmd: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>
-    </md:Extensions>
-    <md: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>MIIGATCCBOmgAwIBAgIHGIM+H7hHgTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQG
-EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
-Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTE0MTExMjIwMTgy
-M1oXDTE3MTExMTIwMTgyM1owgZMxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
-bi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUVzc2xpbmdlbjEdMBsGA1UEChMUSG9j
-aHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNV
-BAMTE2lkcC5ocy1lc3NsaW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCspCw3S2FO3CMSrUY5r2SSxB+3lcvQmqQPc2b59fitJewh+aU+W9ja
-XJfHEn84Hp1iNovLtTE3EpKW4/zxSAhhIjUSTVMtHp69Y2EdcQ3u27vYHdCesX1F
-9/GAl7hEqzuYdJ6Bn4lbOamVH/DbfjpOS1RwpQts4eSrSGHtY09ZDr0/4P0C81SO
-uKgb7YFhMNmbgmHKGGghVxZauqpXmkoRBkT5SPRovqqqw3C7/GR5vg+XX5j1SgYi
-1nNBRldUlHHw7SlnPRuVtNs6WDODtbnkhK0rbshWtPNao6mUeC1YORUTiaox/sLK
-B3tiZMny8ncZHRZVzLfreKAmJuIcI/vtAgMBAAGjggKQMIICjDBPBgNVHSAESDBG
-MBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGB
-rSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DA0
-BgNVHSUELTArBggrBgEFBQcDAgYIKwYBBQUHAwEGCisGAQQBgjcKAwMGCWCGSAGG
-+EIEATAdBgNVHQ4EFgQUXy+EB0suzEWuWgR1+jcHV4KnusowHwYDVR0jBBgwFoAU
-41sXvNYsMmUyQN1NF8A33jpNX1wwOQYDVR0RBDIwMIITaWRwLmhzLWVzc2xpbmdl
-bi5kZYEZYWFpLWFkbWluQGhzLWVzc2xpbmdlbi5kZTCBjwYDVR0fBIGHMIGEMECg
-PqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hz
-LWVzc2xpbmdlbi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHdBggrBgEFBQcBAQSB
-0DCBzTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNl
-cnZlci9PQ1NQMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hz
-LWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBKBggrBgEFBQcw
-AoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2Nh
-Y2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBABWsGkFFnlgD/EBe
-NyK5n+RVXXctij9I2XWx/ixLWALPbCzGEoH8Ccxk+Qy0trDwhlWH8ByYHaiuEtFc
-8bnhzdHYWllxdrzrabhxHcRBXeqTZmPkMtWESK/Cn2cQp0c0m7xrWaCoAAdKXtEb
-ZLbNnfLMknNI7k32hXbY19V7pOlqRWeTPX5r5Loe1xSoDM2a/xSbqoBjYNwABul/
-qo2dqCB91xOpkmTY3B0c2ppcAFLXOR7W3a3w2lkV7otX8NQsC1uii+UcYfrbrxS0
-DLo4uxN9cGPqt+1YQpfWvvCc9JewYHekdpNhoH6Wdw5C8MUq8TDRK3FFy0IpJKS/
-AZ2Qfhc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-esslingen.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-esslingen.de/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.de/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">hs-esslingen.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>MIIGATCCBOmgAwIBAgIHGIM+H7hHgTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQG
-EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
-Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTE0MTExMjIwMTgy
-M1oXDTE3MTExMTIwMTgyM1owgZMxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
-bi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUVzc2xpbmdlbjEdMBsGA1UEChMUSG9j
-aHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNV
-BAMTE2lkcC5ocy1lc3NsaW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCspCw3S2FO3CMSrUY5r2SSxB+3lcvQmqQPc2b59fitJewh+aU+W9ja
-XJfHEn84Hp1iNovLtTE3EpKW4/zxSAhhIjUSTVMtHp69Y2EdcQ3u27vYHdCesX1F
-9/GAl7hEqzuYdJ6Bn4lbOamVH/DbfjpOS1RwpQts4eSrSGHtY09ZDr0/4P0C81SO
-uKgb7YFhMNmbgmHKGGghVxZauqpXmkoRBkT5SPRovqqqw3C7/GR5vg+XX5j1SgYi
-1nNBRldUlHHw7SlnPRuVtNs6WDODtbnkhK0rbshWtPNao6mUeC1YORUTiaox/sLK
-B3tiZMny8ncZHRZVzLfreKAmJuIcI/vtAgMBAAGjggKQMIICjDBPBgNVHSAESDBG
-MBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGB
-rSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DA0
-BgNVHSUELTArBggrBgEFBQcDAgYIKwYBBQUHAwEGCisGAQQBgjcKAwMGCWCGSAGG
-+EIEATAdBgNVHQ4EFgQUXy+EB0suzEWuWgR1+jcHV4KnusowHwYDVR0jBBgwFoAU
-41sXvNYsMmUyQN1NF8A33jpNX1wwOQYDVR0RBDIwMIITaWRwLmhzLWVzc2xpbmdl
-bi5kZYEZYWFpLWFkbWluQGhzLWVzc2xpbmdlbi5kZTCBjwYDVR0fBIGHMIGEMECg
-PqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWVzc2xpbmdlbi1jYS9wdWIv
-Y3JsL2dfY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hz
-LWVzc2xpbmdlbi1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHdBggrBgEFBQcBAQSB
-0DCBzTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNl
-cnZlci9PQ1NQMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hz
-LWVzc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBKBggrBgEFBQcw
-AoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2Nh
-Y2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBABWsGkFFnlgD/EBe
-NyK5n+RVXXctij9I2XWx/ixLWALPbCzGEoH8Ccxk+Qy0trDwhlWH8ByYHaiuEtFc
-8bnhzdHYWllxdrzrabhxHcRBXeqTZmPkMtWESK/Cn2cQp0c0m7xrWaCoAAdKXtEb
-ZLbNnfLMknNI7k32hXbY19V7pOlqRWeTPX5r5Loe1xSoDM2a/xSbqoBjYNwABul/
-qo2dqCB91xOpkmTY3B0c2ppcAFLXOR7W3a3w2lkV7otX8NQsC1uii+UcYfrbrxS0
-DLo4uxN9cGPqt+1YQpfWvvCc9JewYHekdpNhoH6Wdw5C8MUq8TDRK3FFy0IpJKS/
-AZ2Qfhc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-esslingen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-esslingen.de: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">e192</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e192</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Hochschule Esslingen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Hochschule Esslingen - University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.hs-esslingen.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hs-esslingen.de/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Schmid</md:SurName>
-    <md:EmailAddress>mailto:admin@hs-esslingen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>HE AAI</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:aai-support@hs-esslingen.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 5d62e2c8..00000000
--- a/swamid-interfederations-2.0/idp.hs-esslingen.de.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.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,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUjCCBDqgAwIBAgIHE+cHYfFBgzANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQG
-EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
-Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTEyMDUzMTE1MTAw
-OVoXDTE1MDUzMTE1MTAwOVowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hz
-Y2h1bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQD
-ExNpZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++
-IyIwIC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEG
-Qxar37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRI
-TMCpIj8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsm
-j9x8id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHM
-Fh3aLisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4ICEzCCAg8wHAYDVR0gBBUwEzAR
-Bg8rBgEEAYGtIYIsAQEEAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwNAYDVR0l
-BC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3CgMDBglghkgBhvhCBAEw
-HQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8GA1UdIwQYMBaAFONbF7zW
-LDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1hZG1pbkBocy1lc3NsaW5n
-ZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2Nh
-Y3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
-cnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWVz
-c2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
-AAOCAQEAaaNOHl2pyUxRanNKMXTXgkpeAKheCxi1eZ4Np/YQWbD/8oiLaeaTrhC3
-dUROgq1om05wCswknqMp4KEtSIsmgY+Lmu4dy9jcGPwU00WK/eM6YlWJFMgHymD+
-9mL5+eY9p5eiKTWoYqXUNpXC09Wv3FIoTU66kyhzYb5JxW/pPlbgjpcN7HI+Ft+p
-Rd2JT9ZOVIUvi+DcMWzUBqi9EQPuhoT2ZYB515PViy8hpkYjH213Qwr+CHsFAVIZ
-0/p4LwiDk9BwUB/EbxvvzDr2CCIH7RUEYKnYoNRu1xIS5F6/2WB9lDtQIf+E09P2
-UNd5+6xR1BuuABBTl3KVhPLMTbceuQ==
-</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,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUjCCBDqgAwIBAgIHE+cHYfFBgzANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQG
-EwJERTEdMBsGA1UEChMUSG9jaHNjaHVsZSBFc3NsaW5nZW4xFjAUBgNVBAsTDVJl
-Y2hlbnplbnRydW0xFDASBgNVBAMTC0hFIENBIC0gRzAyMB4XDTEyMDUzMTE1MTAw
-OVoXDTE1MDUzMTE1MTAwOVowYjELMAkGA1UEBhMCREUxHTAbBgNVBAoTFEhvY2hz
-Y2h1bGUgRXNzbGluZ2VuMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRwwGgYDVQQD
-ExNpZHAuaHMtZXNzbGluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAjzTPiYiYIOSVgiDz4a93Y7tHHSRtop49YDlicY5p2hieQfYq+SPMCq++
-IyIwIC1rpUQ1jIicDMv0zD7aWHEdOAmoT7qoZUWhqOMWKgKrXZQUXA1cjaYbmqEG
-Qxar37UfTJA+UOVKX+JvMl/7Rp6YmsIiLRIR1wWBkAlcdeTKmU1sAVlmU4nQ/VRI
-TMCpIj8/ZQzdoBuhccT92y7Wz8l6GU33UJLwHnzGCgWgyB9D8PwhJj9XEseKBtsm
-j9x8id/S6w7cFDyexuNZd1ceQONUSTlNI2HqV+HRSfaQAUsGC5khG3L2jNwPOvHM
-Fh3aLisPMmZncvKPhia9Ch/i4gRr/QIDAQABo4ICEzCCAg8wHAYDVR0gBBUwEzAR
-Bg8rBgEEAYGtIYIsAQEEAgIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwNAYDVR0l
-BC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYI3CgMDBglghkgBhvhCBAEw
-HQYDVR0OBBYEFHDb9XHfqLM+hzTvY2T/5WRCzj0oMB8GA1UdIwQYMBaAFONbF7zW
-LDJlMkDdTRfAN946TV9cMCQGA1UdEQQdMBuBGWFhaS1hZG1pbkBocy1lc3NsaW5n
-ZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9ocy1lc3NsaW5nZW4tY2EvcHViL2NybC9nX2Nh
-Y3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvaHMtZXNzbGluZ2VuLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
-cnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWVz
-c2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
-AAOCAQEAaaNOHl2pyUxRanNKMXTXgkpeAKheCxi1eZ4Np/YQWbD/8oiLaeaTrhC3
-dUROgq1om05wCswknqMp4KEtSIsmgY+Lmu4dy9jcGPwU00WK/eM6YlWJFMgHymD+
-9mL5+eY9p5eiKTWoYqXUNpXC09Wv3FIoTU66kyhzYb5JxW/pPlbgjpcN7HI+Ft+p
-Rd2JT9ZOVIUvi+DcMWzUBqi9EQPuhoT2ZYB515PViy8hpkYjH213Qwr+CHsFAVIZ
-0/p4LwiDk9BwUB/EbxvvzDr2CCIH7RUEYKnYoNRu1xIS5F6/2WB9lDtQIf+E09P2
-UNd5+6xR1BuuABBTl3KVhPLMTbceuQ==
-</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-harz.de.xml b/swamid-interfederations-2.0/idp.hs-harz.de.xml
deleted file mode 100644
index 71b89871..00000000
--- a/swamid-interfederations-2.0/idp.hs-harz.de.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-harz.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-harz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-harz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-harz.de,O=HS-Harz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIExDCCA6ygAwIBAgIECrqsrTANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJE
-RTEQMA4GA1UEChMHSFMtSGFyejETMBEGA1UEAxMKSFMtSGFyei1DQTEcMBoGCSqG
-SIb3DQEJARYNQ0FAaHMtaGFyei5kZTAeFw0wNzA3MTYwODQxMDNaFw0xMjA3MTQw
-ODQxMDNaMDgxCzAJBgNVBAYTAkRFMRAwDgYDVQQKEwdIUy1IYXJ6MRcwFQYDVQQD
-Ew5pZHAuaHMtaGFyei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxYVPZDgW6mJ2t23ZjG32lf+2D9quHEdjFo76PVtO0MKRSNnlQcoQ4q8zge0YD4
-aDl8QCh109+OXMHQgeKsj6kAiJEq+z2or46WKJoeasZuaFUwKJjx+S9X1nQBvrVH
-kp5Cgj/xGFHe5hOY3maMnyWgv5aXOPe/F2CqTAzkm7a/VkBqg3Hj+JcYYtUFaHJt
-MWcWMFe2JOcB2WFNSxjDJs+gnqUt3FJgq4XbNOjKIOUGGhb5gZl5IWpEQysCjAum
-V/pbdXweGnRxW/mie3+ZLkWtxx3AGNoFiSAWL/gZg2zOc5IlD+OIMVFZvf9Rsmig
-XK9VqRGe5yF6xUZp5MPEqiUCAwEAAaOCAbowggG2MAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-yZAfp+t40QM0qx3i3KNDYzRz1e4wHwYDVR0jBBgwFoAUzPSb/otB41k98TYOmC3w
-vRcaShUwHwYDVR0RBBgwFoEUc3RoaWVsZXJ0QGhzLWhhcnouZGUwfwYDVR0fBHgw
-djA5oDegNYYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1oYXJ6LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMDmgN6A1hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWhh
-cnotY2EvcHViL2NybC9jYWNybC5jcmwwgZoGCCsGAQUFBwEBBIGNMIGKMEMGCCsG
-AQUFBzAChjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWhhcnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEMGCCsGAQUFBzAChjdodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLWhhcnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB0Gf8l2gm25epk2Y7g4dYLDDdzvMFf0TafiKRCl1u6JU/HQdx/MBgh
-r6Dfd1fQj+uf/T8jZVVOvRpG1mZrM/KX82/PHB/ApDhklPGFyY667DD88BqolQ5/
-uKbQ3JDiXVuDR2GbJT7y9NSwBuRWnI3NbGBqlCDBIt8GyT8ziM9k8tEsZfnFDKBw
-ggj4W5LxoI0vjA4ohamti1Xaad2PMONIwQkZPnVAP7l9p+DQugqJGC+Huj5F2UPp
-ROCLSROcz6EErgfueMROuqEcdJ6ahUtCWZzO1ZKeWrC7c6N3A9VPMdQctd8FideJ
-NoNbMT42BLgv4AUChJmddA3h8hvgSH6r
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-harz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-harz.de,O=HS-Harz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIExDCCA6ygAwIBAgIECrqsrTANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJE
-RTEQMA4GA1UEChMHSFMtSGFyejETMBEGA1UEAxMKSFMtSGFyei1DQTEcMBoGCSqG
-SIb3DQEJARYNQ0FAaHMtaGFyei5kZTAeFw0wNzA3MTYwODQxMDNaFw0xMjA3MTQw
-ODQxMDNaMDgxCzAJBgNVBAYTAkRFMRAwDgYDVQQKEwdIUy1IYXJ6MRcwFQYDVQQD
-Ew5pZHAuaHMtaGFyei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxYVPZDgW6mJ2t23ZjG32lf+2D9quHEdjFo76PVtO0MKRSNnlQcoQ4q8zge0YD4
-aDl8QCh109+OXMHQgeKsj6kAiJEq+z2or46WKJoeasZuaFUwKJjx+S9X1nQBvrVH
-kp5Cgj/xGFHe5hOY3maMnyWgv5aXOPe/F2CqTAzkm7a/VkBqg3Hj+JcYYtUFaHJt
-MWcWMFe2JOcB2WFNSxjDJs+gnqUt3FJgq4XbNOjKIOUGGhb5gZl5IWpEQysCjAum
-V/pbdXweGnRxW/mie3+ZLkWtxx3AGNoFiSAWL/gZg2zOc5IlD+OIMVFZvf9Rsmig
-XK9VqRGe5yF6xUZp5MPEqiUCAwEAAaOCAbowggG2MAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-yZAfp+t40QM0qx3i3KNDYzRz1e4wHwYDVR0jBBgwFoAUzPSb/otB41k98TYOmC3w
-vRcaShUwHwYDVR0RBBgwFoEUc3RoaWVsZXJ0QGhzLWhhcnouZGUwfwYDVR0fBHgw
-djA5oDegNYYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1oYXJ6LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMDmgN6A1hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWhh
-cnotY2EvcHViL2NybC9jYWNybC5jcmwwgZoGCCsGAQUFBwEBBIGNMIGKMEMGCCsG
-AQUFBzAChjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWhhcnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEMGCCsGAQUFBzAChjdodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLWhhcnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB0Gf8l2gm25epk2Y7g4dYLDDdzvMFf0TafiKRCl1u6JU/HQdx/MBgh
-r6Dfd1fQj+uf/T8jZVVOvRpG1mZrM/KX82/PHB/ApDhklPGFyY667DD88BqolQ5/
-uKbQ3JDiXVuDR2GbJT7y9NSwBuRWnI3NbGBqlCDBIt8GyT8ziM9k8tEsZfnFDKBw
-ggj4W5LxoI0vjA4ohamti1Xaad2PMONIwQkZPnVAP7l9p+DQugqJGC+Huj5F2UPp
-ROCLSROcz6EErgfueMROuqEcdJ6ahUtCWZzO1ZKeWrC7c6N3A9VPMdQctd8FideJ
-NoNbMT42BLgv4AUChJmddA3h8hvgSH6r
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-harz.de:8443/shibboleth/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-harz.de:8443/shibboleth/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-harz.de/shibboleth/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-harz.de/shibboleth/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-harz.de/shibboleth/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-harz.de/shibboleth/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-harz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-harz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-harz.de,O=HS-Harz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIExDCCA6ygAwIBAgIECrqsrTANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJE
-RTEQMA4GA1UEChMHSFMtSGFyejETMBEGA1UEAxMKSFMtSGFyei1DQTEcMBoGCSqG
-SIb3DQEJARYNQ0FAaHMtaGFyei5kZTAeFw0wNzA3MTYwODQxMDNaFw0xMjA3MTQw
-ODQxMDNaMDgxCzAJBgNVBAYTAkRFMRAwDgYDVQQKEwdIUy1IYXJ6MRcwFQYDVQQD
-Ew5pZHAuaHMtaGFyei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxYVPZDgW6mJ2t23ZjG32lf+2D9quHEdjFo76PVtO0MKRSNnlQcoQ4q8zge0YD4
-aDl8QCh109+OXMHQgeKsj6kAiJEq+z2or46WKJoeasZuaFUwKJjx+S9X1nQBvrVH
-kp5Cgj/xGFHe5hOY3maMnyWgv5aXOPe/F2CqTAzkm7a/VkBqg3Hj+JcYYtUFaHJt
-MWcWMFe2JOcB2WFNSxjDJs+gnqUt3FJgq4XbNOjKIOUGGhb5gZl5IWpEQysCjAum
-V/pbdXweGnRxW/mie3+ZLkWtxx3AGNoFiSAWL/gZg2zOc5IlD+OIMVFZvf9Rsmig
-XK9VqRGe5yF6xUZp5MPEqiUCAwEAAaOCAbowggG2MAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-yZAfp+t40QM0qx3i3KNDYzRz1e4wHwYDVR0jBBgwFoAUzPSb/otB41k98TYOmC3w
-vRcaShUwHwYDVR0RBBgwFoEUc3RoaWVsZXJ0QGhzLWhhcnouZGUwfwYDVR0fBHgw
-djA5oDegNYYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1oYXJ6LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMDmgN6A1hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWhh
-cnotY2EvcHViL2NybC9jYWNybC5jcmwwgZoGCCsGAQUFBwEBBIGNMIGKMEMGCCsG
-AQUFBzAChjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWhhcnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEMGCCsGAQUFBzAChjdodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLWhhcnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB0Gf8l2gm25epk2Y7g4dYLDDdzvMFf0TafiKRCl1u6JU/HQdx/MBgh
-r6Dfd1fQj+uf/T8jZVVOvRpG1mZrM/KX82/PHB/ApDhklPGFyY667DD88BqolQ5/
-uKbQ3JDiXVuDR2GbJT7y9NSwBuRWnI3NbGBqlCDBIt8GyT8ziM9k8tEsZfnFDKBw
-ggj4W5LxoI0vjA4ohamti1Xaad2PMONIwQkZPnVAP7l9p+DQugqJGC+Huj5F2UPp
-ROCLSROcz6EErgfueMROuqEcdJ6ahUtCWZzO1ZKeWrC7c6N3A9VPMdQctd8FideJ
-NoNbMT42BLgv4AUChJmddA3h8hvgSH6r
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-harz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-harz.de,O=HS-Harz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIExDCCA6ygAwIBAgIECrqsrTANBgkqhkiG9w0BAQUFADBSMQswCQYDVQQGEwJE
-RTEQMA4GA1UEChMHSFMtSGFyejETMBEGA1UEAxMKSFMtSGFyei1DQTEcMBoGCSqG
-SIb3DQEJARYNQ0FAaHMtaGFyei5kZTAeFw0wNzA3MTYwODQxMDNaFw0xMjA3MTQw
-ODQxMDNaMDgxCzAJBgNVBAYTAkRFMRAwDgYDVQQKEwdIUy1IYXJ6MRcwFQYDVQQD
-Ew5pZHAuaHMtaGFyei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxYVPZDgW6mJ2t23ZjG32lf+2D9quHEdjFo76PVtO0MKRSNnlQcoQ4q8zge0YD4
-aDl8QCh109+OXMHQgeKsj6kAiJEq+z2or46WKJoeasZuaFUwKJjx+S9X1nQBvrVH
-kp5Cgj/xGFHe5hOY3maMnyWgv5aXOPe/F2CqTAzkm7a/VkBqg3Hj+JcYYtUFaHJt
-MWcWMFe2JOcB2WFNSxjDJs+gnqUt3FJgq4XbNOjKIOUGGhb5gZl5IWpEQysCjAum
-V/pbdXweGnRxW/mie3+ZLkWtxx3AGNoFiSAWL/gZg2zOc5IlD+OIMVFZvf9Rsmig
-XK9VqRGe5yF6xUZp5MPEqiUCAwEAAaOCAbowggG2MAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-yZAfp+t40QM0qx3i3KNDYzRz1e4wHwYDVR0jBBgwFoAUzPSb/otB41k98TYOmC3w
-vRcaShUwHwYDVR0RBBgwFoEUc3RoaWVsZXJ0QGhzLWhhcnouZGUwfwYDVR0fBHgw
-djA5oDegNYYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1oYXJ6LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMDmgN6A1hjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWhh
-cnotY2EvcHViL2NybC9jYWNybC5jcmwwgZoGCCsGAQUFBwEBBIGNMIGKMEMGCCsG
-AQUFBzAChjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWhhcnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEMGCCsGAQUFBzAChjdodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLWhhcnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB0Gf8l2gm25epk2Y7g4dYLDDdzvMFf0TafiKRCl1u6JU/HQdx/MBgh
-r6Dfd1fQj+uf/T8jZVVOvRpG1mZrM/KX82/PHB/ApDhklPGFyY667DD88BqolQ5/
-uKbQ3JDiXVuDR2GbJT7y9NSwBuRWnI3NbGBqlCDBIt8GyT8ziM9k8tEsZfnFDKBw
-ggj4W5LxoI0vjA4ohamti1Xaad2PMONIwQkZPnVAP7l9p+DQugqJGC+Huj5F2UPp
-ROCLSROcz6EErgfueMROuqEcdJ6ahUtCWZzO1ZKeWrC7c6N3A9VPMdQctd8FideJ
-NoNbMT42BLgv4AUChJmddA3h8hvgSH6r
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-harz.de:8443/shibboleth/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-harz.de:8443/shibboleth/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Harz</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">HS-Harz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-harz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Friedemann</GivenName>
-    <SurName>Hass</SurName>
-    <EmailAddress>fhass@hs-harz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sandra</GivenName>
-    <SurName>Thielert</SurName>
-    <EmailAddress>sthielert@hs-harz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hs-karlsruhe.de-idp-shibboleth.xml
deleted file mode 100644
index 88618c0c..00000000
--- a/swamid-interfederations-2.0/idp.hs-karlsruhe.de-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://idp.hs-karlsruhe.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2013-05-31T12:34:09Z">
-      <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>
-  </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">hs-karlsruhe.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Hochschule Karlsruhe - Technik und Wirtschaft</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Applied Sciences Karlsruhe</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der Hochschule Karlsruhe</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider of University of Applied Sciences Karlsruhe</mdui:Description>
-        <mdui:Logo height="16" width="16">https://www.hs-karlsruhe.de/fileadmin/hska/IZ/images/idp-hska_logo_favicon.jpg</mdui:Logo>
-        <mdui:Logo height="80" width="232">https://www.hs-karlsruhe.de/fileadmin/hska/IZ/images/idp-hska_logo_RGB_small.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.hs-karlsruhe.de/iz</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.hs-karlsruhe.de/iz</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">http://www.hs-karlsruhe.de/impressum.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.hs-karlsruhe.de/en/footer-navigation/legal-notice.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-karlsruhe.de,OU=IZ,O=Hochschule Karlsruhe - Technik und Wirtschaft,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGOTCCBSGgAwIBAgIHFOluF5TrEzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
-bHNydWhlMTYwNAYDVQQKEy1Ib2Noc2NodWxlIEthcmxzcnVoZSAtIFRlY2huaWsg
-dW5kIFdpcnRzY2hhZnQxEDAOBgNVBAMTB0hTS0EtQ0ExJDAiBgkqhkiG9w0BCQEW
-FWl6LWNhQGhzLWthcmxzcnVoZS5kZTAeFw0xMjEyMTMxNTEzMTJaFw0xNzEyMTIx
-NTEzMTJaMIGhMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1i
-ZXJnMRIwEAYDVQQHEwlLYXJsc3J1aGUxNjA0BgNVBAoTLUhvY2hzY2h1bGUgS2Fy
-bHNydWhlIC0gVGVjaG5payB1bmQgV2lydHNjaGFmdDELMAkGA1UECxMCSVoxHDAa
-BgNVBAMTE2lkcC5ocy1rYXJsc3J1aGUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCdIPrTI3taaSKjrubvIMjY5LXUIFsEih6etSWtB3N7eBx/4QIZ
-2WDGvS8Wh2m+rQDFgt83CV2M4Dc1X8tSm4LW2Jaj08IIc2VhC/uq+lRT825mMyLL
-dxwLnFF1bq3z781MF5SnSJLjfpd0YNoS8ubLSKWhMe0f4HGUZZ0g6IXGFQ9fDSGg
-em3UsdWQSLZBDUP0u6axsFg4PHUlABvtDFaHEGWct1gOLFvj78fEcP0xpYcIG/Yb
-o+7OIXbo6ujQ3rRXIyRQkTCJqfCGV+iuRZ98cY0M43kdnO8p3QYdjfARzy50Jloz
-2UvNurUpzoqqo68Mkzgvmyrz07gnslWYDx13AgMBAAGjggJlMIICYTA5BgNVHSAE
-MjAwMBEGDysGAQQBga0hgiwBAQQDADARBg8rBgEEAYGtIYIsAgEEAwAwCAYGZ4EM
-AQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC
-BggrBgEFBQcDATAdBgNVHQ4EFgQU/ow8CX1n7XYtZINE1Du423aCERwwHwYDVR0j
-BBgwFoAUTi3+fERcod/hjdI3AJJAkCzbIHswQwYDVR0RBDwwOoITaWRwLmhzLWth
-cmxzcnVoZS5kZYEjSVotQmVudXR6ZXJiZXJhdHVuZ0Bocy1rYXJsc3J1aGUuZGUw
-gYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1r
-YXJsc3J1aGUtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvaHMta2FybHNydWhlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHZ
-BggrBgEFBQcBAQSBzDCByTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRm
-bi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2hzLWthcmxzcnVoZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMta2FybHNydWhl
-LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFreG
-e5Efkl3SOi4hlKAlal7VsAZqwtQCzxICa3HftmhKlUJSKYhG9zMngYJdL+Kwa1aa
-VvwkGCGH7EtqCVQwTfb6Dgm5Skozxn3BZHywJUANvJuSXBGhc3V3UwSMQXwEunEn
-EiGb0NNleAC6oDdg8BPqzUzz3LudKpcEPt+V8wGmeSW14qf6+VWjVTdpxydAXu7N
-fDwQtyU0j2ANmOeoI5qsSO+dr5Kpl8OVqM2kRKF6YCPAHsT0B4944/uhtLPj8+jC
-HauQDCp2XZgqAAGn3j+JVQ8JrIga6WTi0LahPGjMjCFhtjJ65cIQZ6eHv0lXb7ly
-fSqu+5mEPB9XF5S/2w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-karlsruhe.de/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-karlsruhe.de/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">hs-karlsruhe.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-karlsruhe.de,OU=IZ,O=Hochschule Karlsruhe - Technik und Wirtschaft,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGOTCCBSGgAwIBAgIHFOluF5TrEzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
-bHNydWhlMTYwNAYDVQQKEy1Ib2Noc2NodWxlIEthcmxzcnVoZSAtIFRlY2huaWsg
-dW5kIFdpcnRzY2hhZnQxEDAOBgNVBAMTB0hTS0EtQ0ExJDAiBgkqhkiG9w0BCQEW
-FWl6LWNhQGhzLWthcmxzcnVoZS5kZTAeFw0xMjEyMTMxNTEzMTJaFw0xNzEyMTIx
-NTEzMTJaMIGhMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1i
-ZXJnMRIwEAYDVQQHEwlLYXJsc3J1aGUxNjA0BgNVBAoTLUhvY2hzY2h1bGUgS2Fy
-bHNydWhlIC0gVGVjaG5payB1bmQgV2lydHNjaGFmdDELMAkGA1UECxMCSVoxHDAa
-BgNVBAMTE2lkcC5ocy1rYXJsc3J1aGUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCdIPrTI3taaSKjrubvIMjY5LXUIFsEih6etSWtB3N7eBx/4QIZ
-2WDGvS8Wh2m+rQDFgt83CV2M4Dc1X8tSm4LW2Jaj08IIc2VhC/uq+lRT825mMyLL
-dxwLnFF1bq3z781MF5SnSJLjfpd0YNoS8ubLSKWhMe0f4HGUZZ0g6IXGFQ9fDSGg
-em3UsdWQSLZBDUP0u6axsFg4PHUlABvtDFaHEGWct1gOLFvj78fEcP0xpYcIG/Yb
-o+7OIXbo6ujQ3rRXIyRQkTCJqfCGV+iuRZ98cY0M43kdnO8p3QYdjfARzy50Jloz
-2UvNurUpzoqqo68Mkzgvmyrz07gnslWYDx13AgMBAAGjggJlMIICYTA5BgNVHSAE
-MjAwMBEGDysGAQQBga0hgiwBAQQDADARBg8rBgEEAYGtIYIsAgEEAwAwCAYGZ4EM
-AQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC
-BggrBgEFBQcDATAdBgNVHQ4EFgQU/ow8CX1n7XYtZINE1Du423aCERwwHwYDVR0j
-BBgwFoAUTi3+fERcod/hjdI3AJJAkCzbIHswQwYDVR0RBDwwOoITaWRwLmhzLWth
-cmxzcnVoZS5kZYEjSVotQmVudXR6ZXJiZXJhdHVuZ0Bocy1rYXJsc3J1aGUuZGUw
-gYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1r
-YXJsc3J1aGUtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvaHMta2FybHNydWhlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHZ
-BggrBgEFBQcBAQSBzDCByTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRm
-bi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2hzLWthcmxzcnVoZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-SAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMta2FybHNydWhl
-LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAFreG
-e5Efkl3SOi4hlKAlal7VsAZqwtQCzxICa3HftmhKlUJSKYhG9zMngYJdL+Kwa1aa
-VvwkGCGH7EtqCVQwTfb6Dgm5Skozxn3BZHywJUANvJuSXBGhc3V3UwSMQXwEunEn
-EiGb0NNleAC6oDdg8BPqzUzz3LudKpcEPt+V8wGmeSW14qf6+VWjVTdpxydAXu7N
-fDwQtyU0j2ANmOeoI5qsSO+dr5Kpl8OVqM2kRKF6YCPAHsT0B4944/uhtLPj8+jC
-HauQDCp2XZgqAAGn3j+JVQ8JrIga6WTi0LahPGjMjCFhtjJ65cIQZ6eHv0lXb7ly
-fSqu+5mEPB9XF5S/2w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-karlsruhe.de: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">e339</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e339</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Hochschule Karlsruhe - Technik und Wirtschaft</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Applied Sciences Karlsruhe</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.hs-karlsruhe.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hs-karlsruhe.de/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>User</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:iz-benutzerberatung@hs-karlsruhe.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>User</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:iz-benutzerberatung@hs-karlsruhe.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Günther</md:GivenName>
-    <md:SurName>Schreiner</md:SurName>
-    <md:EmailAddress>mailto:guenther.schreiner@hs-karlsruhe.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-magdeburg.de.xml b/swamid-interfederations-2.0/idp.hs-magdeburg.de.xml
deleted file mode 100644
index 03d5560e..00000000
--- a/swamid-interfederations-2.0/idp.hs-magdeburg.de.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-magdeburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-magdeburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-magdeburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-magdeburg.de,OU=ZKI,O=Hochschule Magdeburg Stendal (FH),L=Magdeburg,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFwzCCBKugAwIBAgIEEZQuNDANBgkqhkiG9w0BAQUFADCBtzELMAkGA1UEBhMC
-REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MRIwEAYDVQQHEwlNYWdkZWJ1cmcx
-KjAoBgNVBAoTIUhvY2hzY2h1bGUgTWFnZGVidXJnIFN0ZW5kYWwgKEZIKTErMCkG
-A1UEAxMiSFMgTWFnZGVidXJnIFN0ZW5kYWwgKEZIKSBDQSAtIEcwMTEiMCAGCSqG
-SIb3DQEJARYTcGtpQGhzLW1hZ2RlYnVyZy5kZTAeFw0xMTAzMDcxMDE3MDlaFw0x
-NjAzMDUxMDE3MDlaMIGSMQswCQYDVQQGEwJERTEXMBUGA1UECBMOU2FjaHNlbi1B
-bmhhbHQxEjAQBgNVBAcTCU1hZ2RlYnVyZzEqMCgGA1UEChMhSG9jaHNjaHVsZSBN
-YWdkZWJ1cmcgU3RlbmRhbCAoRkgpMQwwCgYDVQQLEwNaS0kxHDAaBgNVBAMTE2lk
-cC5ocy1tYWdkZWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCfWra0QxT7kYz3JZJ71Suvvz0SwJwXDmBkbGQAs0UQHlu5TSPQk/bKwx4/A6dg
-1KK3IQTnIa0lVzC6sWNTKIt0he4R88PbnxmexZviCqLrQpBshTJ/MhwshlmUP8N7
-1rf5qG8HwUmRj210gITgioc5HPX8nN77NU1PTS4MwwJOmyDKd20C9NpMXk1HudR0
-ZRcy1CuSixH9qNN7IWCIFGidqQe3i625OKnbLfiZ/SzjebhcmNmbipkdPeNMxuFF
-qb6oFsQk66Ij+xp8Suhky3Nzf7H/YizaMNsm5HxQQSMSvNNeZ+Jwod7VcvrTm+O1
-0u+P4AOGIfTHg8y6yJcBabTHAgMBAAGjggH4MIIB9DAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYE
-FB2AyfkgZTkk9/lbj6qo2Jh7/BAnMB8GA1UdIwQYMBaAFDm8cMweiB37HYTeozpy
-6gk3U3vjMCYGA1UdEQQfMB2BG3BldGVyLm1vZXJsQGhzLW1hZ2RlYnVyZy5kZTCB
-mwYDVR0fBIGTMIGQMEagRKBChkBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLW1h
-Z2RlYnVyZy1zdGVuZGFsLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEagRKBChkBodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2hzLW1hZ2RlYnVyZy1zdGVuZGFsLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIG0BggrBgEFBQcBAQSBpzCBpDBQBggrBgEFBQcwAoZEaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9ocy1tYWdkZWJ1cmctc3RlbmRhbC1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwUAYIKwYBBQUHMAKGRGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvaHMtbWFnZGVidXJnLXN0ZW5kYWwtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR76NfHDFqHP2f4XVJbCF4swQV6G5fbjJb
-vnzJN9wMUeoCm07GqSquW8j0H2yvusM5jetU5rXjRizKzNkTL5JZ06odU4cyIWEH
-bvRcFU5ZW0o7S94F++QobaL/8p59ucBARaJGacOYPZNpVMIi4SxC5tuii+bmDkWN
-P/R44wJtNwihO8hRj3XybwP3NXKkhYCnxvq9kY719O0hJPC+HQvAtsMpOEI7D6sx
-38CdBNOOW8YSQbkMKJeeRxzrJy4SwpNvXLwznNVxz01SFNN8w/xeGgpgs+7aBEmK
-XnP7uBaLb4yttKtp2OPvZRMu9QtTFOH90Dk7A+HUF97T41tmJgnl
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-magdeburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-magdeburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-magdeburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-magdeburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-magdeburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-magdeburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-magdeburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-magdeburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-magdeburg.de,OU=ZKI,O=Hochschule Magdeburg Stendal (FH),L=Magdeburg,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFwzCCBKugAwIBAgIEEZQuNDANBgkqhkiG9w0BAQUFADCBtzELMAkGA1UEBhMC
-REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MRIwEAYDVQQHEwlNYWdkZWJ1cmcx
-KjAoBgNVBAoTIUhvY2hzY2h1bGUgTWFnZGVidXJnIFN0ZW5kYWwgKEZIKTErMCkG
-A1UEAxMiSFMgTWFnZGVidXJnIFN0ZW5kYWwgKEZIKSBDQSAtIEcwMTEiMCAGCSqG
-SIb3DQEJARYTcGtpQGhzLW1hZ2RlYnVyZy5kZTAeFw0xMTAzMDcxMDE3MDlaFw0x
-NjAzMDUxMDE3MDlaMIGSMQswCQYDVQQGEwJERTEXMBUGA1UECBMOU2FjaHNlbi1B
-bmhhbHQxEjAQBgNVBAcTCU1hZ2RlYnVyZzEqMCgGA1UEChMhSG9jaHNjaHVsZSBN
-YWdkZWJ1cmcgU3RlbmRhbCAoRkgpMQwwCgYDVQQLEwNaS0kxHDAaBgNVBAMTE2lk
-cC5ocy1tYWdkZWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCfWra0QxT7kYz3JZJ71Suvvz0SwJwXDmBkbGQAs0UQHlu5TSPQk/bKwx4/A6dg
-1KK3IQTnIa0lVzC6sWNTKIt0he4R88PbnxmexZviCqLrQpBshTJ/MhwshlmUP8N7
-1rf5qG8HwUmRj210gITgioc5HPX8nN77NU1PTS4MwwJOmyDKd20C9NpMXk1HudR0
-ZRcy1CuSixH9qNN7IWCIFGidqQe3i625OKnbLfiZ/SzjebhcmNmbipkdPeNMxuFF
-qb6oFsQk66Ij+xp8Suhky3Nzf7H/YizaMNsm5HxQQSMSvNNeZ+Jwod7VcvrTm+O1
-0u+P4AOGIfTHg8y6yJcBabTHAgMBAAGjggH4MIIB9DAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYE
-FB2AyfkgZTkk9/lbj6qo2Jh7/BAnMB8GA1UdIwQYMBaAFDm8cMweiB37HYTeozpy
-6gk3U3vjMCYGA1UdEQQfMB2BG3BldGVyLm1vZXJsQGhzLW1hZ2RlYnVyZy5kZTCB
-mwYDVR0fBIGTMIGQMEagRKBChkBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLW1h
-Z2RlYnVyZy1zdGVuZGFsLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEagRKBChkBodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL2hzLW1hZ2RlYnVyZy1zdGVuZGFsLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIG0BggrBgEFBQcBAQSBpzCBpDBQBggrBgEFBQcwAoZEaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9ocy1tYWdkZWJ1cmctc3RlbmRhbC1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwUAYIKwYBBQUHMAKGRGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvaHMtbWFnZGVidXJnLXN0ZW5kYWwtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR76NfHDFqHP2f4XVJbCF4swQV6G5fbjJb
-vnzJN9wMUeoCm07GqSquW8j0H2yvusM5jetU5rXjRizKzNkTL5JZ06odU4cyIWEH
-bvRcFU5ZW0o7S94F++QobaL/8p59ucBARaJGacOYPZNpVMIi4SxC5tuii+bmDkWN
-P/R44wJtNwihO8hRj3XybwP3NXKkhYCnxvq9kY719O0hJPC+HQvAtsMpOEI7D6sx
-38CdBNOOW8YSQbkMKJeeRxzrJy4SwpNvXLwznNVxz01SFNN8w/xeGgpgs+7aBEmK
-XnP7uBaLb4yttKtp2OPvZRMu9QtTFOH90Dk7A+HUF97T41tmJgnl
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-magdeburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-magdeburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Magdeburg-Stendal</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Magdeburg-Stendal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-magdeburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Mörl</SurName>
-    <EmailAddress>peter.moerl@hs-magdeburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-ruhrwest.de.xml b/swamid-interfederations-2.0/idp.hs-ruhrwest.de.xml
deleted file mode 100644
index b1753d0f..00000000
--- a/swamid-interfederations-2.0/idp.hs-ruhrwest.de.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-ruhrwest.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-ruhrwest.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ad.hs-rw.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-ruhrwest.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-ruhrwest.de,O=Hochschule Ruhr West,L=Muelheim an der Ruhr,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1zCCBL+gAwIBAgIHEwAAF/HYlDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xHTAbBgNVBAcTFE11
-ZWxoZWltIGFuIGRlciBSdWhyMR0wGwYDVQQKExRIb2Noc2NodWxlIFJ1aHIgV2Vz
-dDETMBEGA1UECxMKSVQgU2VydmljZTEgMB4GA1UEAxMXSG9jaHNjaHVsZSBSdWhy
-IFdlc3QgQ0ExHTAbBgkqhkiG9w0BCQEWDmFkbWluQGhzLXJ3LmRlMB4XDTExMTIw
-ODA5MjUyN1oXDTE2MTIwNjA5MjUyN1owgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQI
-ExNOb3JkcmhlaW4tV2VzdGZhbGVuMR0wGwYDVQQHExRNdWVsaGVpbSBhbiBkZXIg
-UnVocjEdMBsGA1UEChMUSG9jaHNjaHVsZSBSdWhyIFdlc3QxGzAZBgNVBAMTEmlk
-cC5ocy1ydWhyd2VzdC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIVwmo5PETA8/cS/ziw8SthhM5n7mW7g5k6H+u4yOYKuVmq+ewRnwjNlmfU6MeIZ
-t1IwuSLcYkqDVZdpE+1tZPH+44AC5bnll4lmUBGZNc1JGlj5u/PTEDfG8WvtesoK
-YLtqRDKpmiV1EFOUKcfG3pEur7k+4vckwqaS7bhW2tKsrsXzhpaTVn0wXrMk24vI
-kG1kTpfLGDPV6bs/DmCLXtP3JkVzyUswqISmWZK+QZhU8Bre+Y/kLxKGr/z5FytD
-8FBW0HwA9Ae5kxQvW6ascq2REWqSHEFhQmw0rqTM/DuwoNZjOAnCmaugAegRfHAy
-GmC7R49YrCttPCCztDrL+uMCAwEAAaOCAg0wggIJMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-pbNwG30kNLJJzYIJ9UYdSQhOQBUwHwYDVR0jBBgwFoAU7gxM+vyS0NqR5Prbdovf
-fG7Z/rEwWwYDVR0RBFQwUoISaWRwLmhzLXJ1aHJ3ZXN0LmRlggxpZHAuaHMtcncu
-ZGWCGXNoaWJib2xldGguaHMtcnVocndlc3QuZGWCE3NoaWJib2xldGguaHMtcncu
-ZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS9o
-cy1ydWhyLXdlc3QtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvaHMtcnVoci13ZXN0LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9ocy1ydWhyLXdlc3QtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgG
-CCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLXJ1aHItd2VzdC1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE0hP0U5
-NYA6R8nDfN3YAIGx42phaGKQ2Xv0sMvDwUosaRtq2vaBjQTAyO5MihfPRD0hDvbO
-faJei8av7Nxfz7GeDUXbKxaPcfLG2oQH+YzXNp3iPPMgcuBJb95GQ6VlFQbgxfl9
-5k1DHA0TDPlCLqqZGmd42zc1ug70/AOh022RDhSKHDoqpVKy814Bs3GZU5k+grkf
-Y3YQLaQZF3f4M1gTWsHnGw4VZL8xa6KJslb78KtHqOeIxqgx2z9VM97XWiyf6WgD
-nRJPHh1Pfo5p5bDFo94SbUKgOny5fQvPE7ZU8Y7Pw6WAN7gWn5wsm+5kykBbKsCQ
-SdioFUOZjcXImts=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-ruhrwest.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-ruhrwest.de,O=Hochschule Ruhr West,L=Muelheim an der Ruhr,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1zCCBL+gAwIBAgIHEwAAF/HYlDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xHTAbBgNVBAcTFE11
-ZWxoZWltIGFuIGRlciBSdWhyMR0wGwYDVQQKExRIb2Noc2NodWxlIFJ1aHIgV2Vz
-dDETMBEGA1UECxMKSVQgU2VydmljZTEgMB4GA1UEAxMXSG9jaHNjaHVsZSBSdWhy
-IFdlc3QgQ0ExHTAbBgkqhkiG9w0BCQEWDmFkbWluQGhzLXJ3LmRlMB4XDTExMTIw
-ODA5MjUyN1oXDTE2MTIwNjA5MjUyN1owgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQI
-ExNOb3JkcmhlaW4tV2VzdGZhbGVuMR0wGwYDVQQHExRNdWVsaGVpbSBhbiBkZXIg
-UnVocjEdMBsGA1UEChMUSG9jaHNjaHVsZSBSdWhyIFdlc3QxGzAZBgNVBAMTEmlk
-cC5ocy1ydWhyd2VzdC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIVwmo5PETA8/cS/ziw8SthhM5n7mW7g5k6H+u4yOYKuVmq+ewRnwjNlmfU6MeIZ
-t1IwuSLcYkqDVZdpE+1tZPH+44AC5bnll4lmUBGZNc1JGlj5u/PTEDfG8WvtesoK
-YLtqRDKpmiV1EFOUKcfG3pEur7k+4vckwqaS7bhW2tKsrsXzhpaTVn0wXrMk24vI
-kG1kTpfLGDPV6bs/DmCLXtP3JkVzyUswqISmWZK+QZhU8Bre+Y/kLxKGr/z5FytD
-8FBW0HwA9Ae5kxQvW6ascq2REWqSHEFhQmw0rqTM/DuwoNZjOAnCmaugAegRfHAy
-GmC7R49YrCttPCCztDrL+uMCAwEAAaOCAg0wggIJMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-pbNwG30kNLJJzYIJ9UYdSQhOQBUwHwYDVR0jBBgwFoAU7gxM+vyS0NqR5Prbdovf
-fG7Z/rEwWwYDVR0RBFQwUoISaWRwLmhzLXJ1aHJ3ZXN0LmRlggxpZHAuaHMtcncu
-ZGWCGXNoaWJib2xldGguaHMtcnVocndlc3QuZGWCE3NoaWJib2xldGguaHMtcncu
-ZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS9o
-cy1ydWhyLXdlc3QtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvaHMtcnVoci13ZXN0LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9ocy1ydWhyLXdlc3QtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgG
-CCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLXJ1aHItd2VzdC1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE0hP0U5
-NYA6R8nDfN3YAIGx42phaGKQ2Xv0sMvDwUosaRtq2vaBjQTAyO5MihfPRD0hDvbO
-faJei8av7Nxfz7GeDUXbKxaPcfLG2oQH+YzXNp3iPPMgcuBJb95GQ6VlFQbgxfl9
-5k1DHA0TDPlCLqqZGmd42zc1ug70/AOh022RDhSKHDoqpVKy814Bs3GZU5k+grkf
-Y3YQLaQZF3f4M1gTWsHnGw4VZL8xa6KJslb78KtHqOeIxqgx2z9VM97XWiyf6WgD
-nRJPHh1Pfo5p5bDFo94SbUKgOny5fQvPE7ZU8Y7Pw6WAN7gWn5wsm+5kykBbKsCQ
-SdioFUOZjcXImts=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-ruhrwest.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-ruhrwest.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-ruhrwest.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hs-ruhrwest.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hs-ruhrwest.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hs-ruhrwest.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-ruhrwest.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ad.hs-rw.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-ruhrwest.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-ruhrwest.de,O=Hochschule Ruhr West,L=Muelheim an der Ruhr,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1zCCBL+gAwIBAgIHEwAAF/HYlDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xHTAbBgNVBAcTFE11
-ZWxoZWltIGFuIGRlciBSdWhyMR0wGwYDVQQKExRIb2Noc2NodWxlIFJ1aHIgV2Vz
-dDETMBEGA1UECxMKSVQgU2VydmljZTEgMB4GA1UEAxMXSG9jaHNjaHVsZSBSdWhy
-IFdlc3QgQ0ExHTAbBgkqhkiG9w0BCQEWDmFkbWluQGhzLXJ3LmRlMB4XDTExMTIw
-ODA5MjUyN1oXDTE2MTIwNjA5MjUyN1owgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQI
-ExNOb3JkcmhlaW4tV2VzdGZhbGVuMR0wGwYDVQQHExRNdWVsaGVpbSBhbiBkZXIg
-UnVocjEdMBsGA1UEChMUSG9jaHNjaHVsZSBSdWhyIFdlc3QxGzAZBgNVBAMTEmlk
-cC5ocy1ydWhyd2VzdC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIVwmo5PETA8/cS/ziw8SthhM5n7mW7g5k6H+u4yOYKuVmq+ewRnwjNlmfU6MeIZ
-t1IwuSLcYkqDVZdpE+1tZPH+44AC5bnll4lmUBGZNc1JGlj5u/PTEDfG8WvtesoK
-YLtqRDKpmiV1EFOUKcfG3pEur7k+4vckwqaS7bhW2tKsrsXzhpaTVn0wXrMk24vI
-kG1kTpfLGDPV6bs/DmCLXtP3JkVzyUswqISmWZK+QZhU8Bre+Y/kLxKGr/z5FytD
-8FBW0HwA9Ae5kxQvW6ascq2REWqSHEFhQmw0rqTM/DuwoNZjOAnCmaugAegRfHAy
-GmC7R49YrCttPCCztDrL+uMCAwEAAaOCAg0wggIJMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-pbNwG30kNLJJzYIJ9UYdSQhOQBUwHwYDVR0jBBgwFoAU7gxM+vyS0NqR5Prbdovf
-fG7Z/rEwWwYDVR0RBFQwUoISaWRwLmhzLXJ1aHJ3ZXN0LmRlggxpZHAuaHMtcncu
-ZGWCGXNoaWJib2xldGguaHMtcnVocndlc3QuZGWCE3NoaWJib2xldGguaHMtcncu
-ZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS9o
-cy1ydWhyLXdlc3QtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvaHMtcnVoci13ZXN0LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9ocy1ydWhyLXdlc3QtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgG
-CCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLXJ1aHItd2VzdC1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE0hP0U5
-NYA6R8nDfN3YAIGx42phaGKQ2Xv0sMvDwUosaRtq2vaBjQTAyO5MihfPRD0hDvbO
-faJei8av7Nxfz7GeDUXbKxaPcfLG2oQH+YzXNp3iPPMgcuBJb95GQ6VlFQbgxfl9
-5k1DHA0TDPlCLqqZGmd42zc1ug70/AOh022RDhSKHDoqpVKy814Bs3GZU5k+grkf
-Y3YQLaQZF3f4M1gTWsHnGw4VZL8xa6KJslb78KtHqOeIxqgx2z9VM97XWiyf6WgD
-nRJPHh1Pfo5p5bDFo94SbUKgOny5fQvPE7ZU8Y7Pw6WAN7gWn5wsm+5kykBbKsCQ
-SdioFUOZjcXImts=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-ruhrwest.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-ruhrwest.de,O=Hochschule Ruhr West,L=Muelheim an der Ruhr,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF1zCCBL+gAwIBAgIHEwAAF/HYlDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xHTAbBgNVBAcTFE11
-ZWxoZWltIGFuIGRlciBSdWhyMR0wGwYDVQQKExRIb2Noc2NodWxlIFJ1aHIgV2Vz
-dDETMBEGA1UECxMKSVQgU2VydmljZTEgMB4GA1UEAxMXSG9jaHNjaHVsZSBSdWhy
-IFdlc3QgQ0ExHTAbBgkqhkiG9w0BCQEWDmFkbWluQGhzLXJ3LmRlMB4XDTExMTIw
-ODA5MjUyN1oXDTE2MTIwNjA5MjUyN1owgYYxCzAJBgNVBAYTAkRFMRwwGgYDVQQI
-ExNOb3JkcmhlaW4tV2VzdGZhbGVuMR0wGwYDVQQHExRNdWVsaGVpbSBhbiBkZXIg
-UnVocjEdMBsGA1UEChMUSG9jaHNjaHVsZSBSdWhyIFdlc3QxGzAZBgNVBAMTEmlk
-cC5ocy1ydWhyd2VzdC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIVwmo5PETA8/cS/ziw8SthhM5n7mW7g5k6H+u4yOYKuVmq+ewRnwjNlmfU6MeIZ
-t1IwuSLcYkqDVZdpE+1tZPH+44AC5bnll4lmUBGZNc1JGlj5u/PTEDfG8WvtesoK
-YLtqRDKpmiV1EFOUKcfG3pEur7k+4vckwqaS7bhW2tKsrsXzhpaTVn0wXrMk24vI
-kG1kTpfLGDPV6bs/DmCLXtP3JkVzyUswqISmWZK+QZhU8Bre+Y/kLxKGr/z5FytD
-8FBW0HwA9Ae5kxQvW6ascq2REWqSHEFhQmw0rqTM/DuwoNZjOAnCmaugAegRfHAy
-GmC7R49YrCttPCCztDrL+uMCAwEAAaOCAg0wggIJMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-pbNwG30kNLJJzYIJ9UYdSQhOQBUwHwYDVR0jBBgwFoAU7gxM+vyS0NqR5Prbdovf
-fG7Z/rEwWwYDVR0RBFQwUoISaWRwLmhzLXJ1aHJ3ZXN0LmRlggxpZHAuaHMtcncu
-ZGWCGXNoaWJib2xldGguaHMtcnVocndlc3QuZGWCE3NoaWJib2xldGguaHMtcncu
-ZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS9o
-cy1ydWhyLXdlc3QtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvaHMtcnVoci13ZXN0LWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9ocy1ydWhyLXdlc3QtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgG
-CCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLXJ1aHItd2VzdC1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAE0hP0U5
-NYA6R8nDfN3YAIGx42phaGKQ2Xv0sMvDwUosaRtq2vaBjQTAyO5MihfPRD0hDvbO
-faJei8av7Nxfz7GeDUXbKxaPcfLG2oQH+YzXNp3iPPMgcuBJb95GQ6VlFQbgxfl9
-5k1DHA0TDPlCLqqZGmd42zc1ug70/AOh022RDhSKHDoqpVKy814Bs3GZU5k+grkf
-Y3YQLaQZF3f4M1gTWsHnGw4VZL8xa6KJslb78KtHqOeIxqgx2z9VM97XWiyf6WgD
-nRJPHh1Pfo5p5bDFo94SbUKgOny5fQvPE7ZU8Y7Pw6WAN7gWn5wsm+5kykBbKsCQ
-SdioFUOZjcXImts=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-ruhrwest.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hs-ruhrwest.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Ruhr West</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Ruhr West</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-ruhrwest.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ossama</GivenName>
-    <SurName>El Abbadi</SurName>
-    <EmailAddress>ossama.elabbadi@hs-ruhrwest.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ossama</GivenName>
-    <SurName>El Abbadi</SurName>
-    <EmailAddress>ossama.elabbadi@hs-ruhrwest.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hs-zigr.de.xml b/swamid-interfederations-2.0/idp.hs-zigr.de.xml
deleted file mode 100644
index ad794ec7..00000000
--- a/swamid-interfederations-2.0/idp.hs-zigr.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hs-zigr.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-zigr.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-zigr.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-zigr.de,OU=HRZ,O=Hochschule Zittau/Goerlitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFKDCCBBCgAwIBAgIECvSmDDANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJE
-RTEjMCEGA1UEChMaSG9jaHNjaHVsZSBaaXR0YXUvR29lcmxpdHoxEzARBgNVBAMT
-CkhTLVpJR1IgQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQGhzLXppZ3IuZGUwHhcNMDcw
-ODI5MDgwNDEzWhcNMTIwODI3MDgwNDEzWjBZMQswCQYDVQQGEwJERTEjMCEGA1UE
-ChMaSG9jaHNjaHVsZSBaaXR0YXUvR29lcmxpdHoxDDAKBgNVBAsTA0hSWjEXMBUG
-A1UEAxMOaWRwLmhzLXppZ3IuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCnIYUEzUHEZUiynwccnpsDz/Op6yAxhy1qBiFzGTdgAdQIAw0XapeuzuIV
-kmVrJvxi4tQIl5PYTAJKT+FAVtehFAwZQKf+yDBZBS6UHfH0f1u0VkgSo8BwHm4g
-PyXETqXSsqB+BE4o+CiUF3YrY0xgY9FMGKvr++8kBuIWHSbg9OPQHmsYBO6tqd0x
-iSWSMikv+SyZfHZ6Ytic0/pM5Wx65fGBnGSIoClTR8L2RpJlmq42Ty8sHfqBXbCu
-fngagqvrOxrQWrcF8dTvp6ZcVCQYQRAd0gdDr+8HDW094s8xAT3UgESxmWR+GCW/
-LIe4fi9bQTWZrneS60YcDpidhj9zAgMBAAGjggHqMIIB5jAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFNHfYAxYCmo6FBhoBUJfKQcKV+WpMB8GA1UdIwQYMBaAFOgDhs9GD/aylS0Z
-IAlPiV5ZJKBHMCAGA1UdEQQZMBeBFXBvc3RtYXN0ZXJAaHMtemlnci5kZTCBlwYD
-VR0fBIGPMIGMMESgQqBAhj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXppdHRh
-dS1nb2VybGl0ei1jYS9wdWIvY3JsL2NhY3JsLmNybDBEoEKgQIY+aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9ocy16aXR0YXUtZ29lcmxpdHotY2EvcHViL2NybC9jYWNy
-bC5jcmwwgbAGCCsGAQUFBwEBBIGjMIGgME4GCCsGAQUFBzAChkJodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2hzLXppdHRhdS1nb2VybGl0ei1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwTgYIKwYBBQUHMAKGQmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMt
-eml0dGF1LWdvZXJsaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAV/Sc6U0LeqKCXNsbTN6WAc6NIfjxE+Znh753BGYiynMKsPXk
-alD64fU6xbLmETLBX0r/UG2ZCfrBp/v94TIFZ+vaQZz/1Qd4DJNjpnjbeA8PNS+C
-teZUgyHanXZue/rdjP7tHVz1B+DX9K1OcExTKDSeDdNzGGC4XN7nsZ71BrcjNPDI
-2cI8s5f1993EcyZE0p0HOM8siKfFaLOhw9KI5jaxr1Z/2EjX7Scm5BQo0SoaFinE
-QXENHu32fRyd0Lo1uO8SzFj16Lpkl2OvZ8v0KBMf6DYnKHAeZe4uVaAi17gphhSn
-olQBNYiM5GZ6vCysmKgMPSbwsQuXkRt8ohOSjg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-zigr.de/shibboleth-idp/Artifact" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hs-zigr.de/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-zigr.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.hs-zigr.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.hs-zigr.de,OU=HRZ,O=Hochschule Zittau/Goerlitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFKDCCBBCgAwIBAgIECvSmDDANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJE
-RTEjMCEGA1UEChMaSG9jaHNjaHVsZSBaaXR0YXUvR29lcmxpdHoxEzARBgNVBAMT
-CkhTLVpJR1IgQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQGhzLXppZ3IuZGUwHhcNMDcw
-ODI5MDgwNDEzWhcNMTIwODI3MDgwNDEzWjBZMQswCQYDVQQGEwJERTEjMCEGA1UE
-ChMaSG9jaHNjaHVsZSBaaXR0YXUvR29lcmxpdHoxDDAKBgNVBAsTA0hSWjEXMBUG
-A1UEAxMOaWRwLmhzLXppZ3IuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCnIYUEzUHEZUiynwccnpsDz/Op6yAxhy1qBiFzGTdgAdQIAw0XapeuzuIV
-kmVrJvxi4tQIl5PYTAJKT+FAVtehFAwZQKf+yDBZBS6UHfH0f1u0VkgSo8BwHm4g
-PyXETqXSsqB+BE4o+CiUF3YrY0xgY9FMGKvr++8kBuIWHSbg9OPQHmsYBO6tqd0x
-iSWSMikv+SyZfHZ6Ytic0/pM5Wx65fGBnGSIoClTR8L2RpJlmq42Ty8sHfqBXbCu
-fngagqvrOxrQWrcF8dTvp6ZcVCQYQRAd0gdDr+8HDW094s8xAT3UgESxmWR+GCW/
-LIe4fi9bQTWZrneS60YcDpidhj9zAgMBAAGjggHqMIIB5jAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFNHfYAxYCmo6FBhoBUJfKQcKV+WpMB8GA1UdIwQYMBaAFOgDhs9GD/aylS0Z
-IAlPiV5ZJKBHMCAGA1UdEQQZMBeBFXBvc3RtYXN0ZXJAaHMtemlnci5kZTCBlwYD
-VR0fBIGPMIGMMESgQqBAhj5odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXppdHRh
-dS1nb2VybGl0ei1jYS9wdWIvY3JsL2NhY3JsLmNybDBEoEKgQIY+aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9ocy16aXR0YXUtZ29lcmxpdHotY2EvcHViL2NybC9jYWNy
-bC5jcmwwgbAGCCsGAQUFBwEBBIGjMIGgME4GCCsGAQUFBzAChkJodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2hzLXppdHRhdS1nb2VybGl0ei1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwTgYIKwYBBQUHMAKGQmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMt
-eml0dGF1LWdvZXJsaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAV/Sc6U0LeqKCXNsbTN6WAc6NIfjxE+Znh753BGYiynMKsPXk
-alD64fU6xbLmETLBX0r/UG2ZCfrBp/v94TIFZ+vaQZz/1Qd4DJNjpnjbeA8PNS+C
-teZUgyHanXZue/rdjP7tHVz1B+DX9K1OcExTKDSeDdNzGGC4XN7nsZ71BrcjNPDI
-2cI8s5f1993EcyZE0p0HOM8siKfFaLOhw9KI5jaxr1Z/2EjX7Scm5BQo0SoaFinE
-QXENHu32fRyd0Lo1uO8SzFj16Lpkl2OvZ8v0KBMf6DYnKHAeZe4uVaAi17gphhSn
-olQBNYiM5GZ6vCysmKgMPSbwsQuXkRt8ohOSjg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hs-zigr.de:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Zittau / Görlitz</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Zittau/Goerlitz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-zigr.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Thomas</GivenName>
-    <SurName>Jaeger</SurName>
-    <EmailAddress>tjaeger@hs-zigr.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Jaeger</SurName>
-    <EmailAddress>tjaeger@hs-zigr.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
deleted file mode 100644
index 36a074b0..00000000
--- a/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.hslu.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-01-15T13:27:55Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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/E2tbXyCHGAR8UkxyelxqZmegWHM4hN4yqQ0jbY0LEalTJIelVTWsF8u3oHjExM5hcXpOZrQmITQGBXnv9CAm9vaH0THV9c3RCempefkl1RUA7K0siYpM4cDaWnv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</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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hslu.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hslu.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hslu.ch/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hslu.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hslu.ch</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hslu.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hslu.ch/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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">hslu.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">HSLU - Hochschule Luzern</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">HSLU - Lucerne University of Applied Sciences and Arts</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.hslu.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hslu.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Hochschule Luzern - IT Services</md:GivenName>
-    <md:SurName>(Hotline)</md:SurName>
-    <md:EmailAddress>mailto:informatikhotline@hslu.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 41 228 21 21</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Hochschule Luzern - IT Services</md:GivenName>
-    <md:SurName>(AAI Technician)</md:SurName>
-    <md:EmailAddress>mailto:aai@hslu.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 29c9efea..00000000
--- a/swamid-interfederations-2.0/idp.hslu.ch.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.hslu.ch/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-01-14T15:12:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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/E2tbXyCHGAR8UkxyelxqZmegWHM4hN4yqQ0jbY0LEalTJIelVTWsF8u3oHjExM5hcXpOZrQmITQGBXnv9CAm9vaH0THV9c3RCempefkl1RUA7K0siYpM4cDaWnv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</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>
-MIIDGDCCAgCgAwIBAgIVAKYe0Z6SH3z8HH5wMaMq5hTEhv/qMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5oc2x1LmNoMB4XDTEzMTIyMDE1MzkzMFoXDTE2
-MTIyMDE1MzkzMFowFjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCzsxMbkNyRCfJACI8ij/xKmC05sI3LIRBmakIZ
-hefl8ZsrmFy9b/D36SXZhQwBCoX/3JqxNFDDGOIZ9Y/zf6Rj3wj9Y2/hoWF+3q7l
-S2VUkPxEecgn+dH5mLAwXS9KG/dungBrPU4XKiQd4+9Hr887A/TcY+Zl9xoEvu3a
-5lfV+k7ZHY23tWaKM8y40dWpmXqEVm0b/XnhSMCT3F6kYs0re+FqBy97IokTTJho
-bJo+mpOfKVldwwEHZ5Fyv1p09qADFizIuZob9WDgW6an/OO/QmqbRK58piltzVJ9
-fusjjAIuJytgIHn8nIeG6GEHlSv8FEiAQ5z0EWhwkluQiXvBAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTmA3UfmymdUeEBYMjH2Ak+bw1FOzANBgkqhkiG
-9w0BAQUFAAOCAQEAUD6gf83UkCE3gknGuckSwp7/dTh+pakqMI3RIEZYXnWFwlec
-0pPS9MHJ+FY5uWCWxAy/W7hLtBt+cJff1OsRkzdm95NObCYmbDytUqCPyIHkedJ8
-vDwD6vJ605tMBKnHYRWIfdmGF91NjdyKp+iHePNXS3gDxLnSYdXFxmTjBTZsN/Ck
-wLUk/ItLwWIOygK6uFLr692+Tcqb36JV56HEx5rBkgDvSHRYdmd/iKiNMJgUzua5
-p6nvn41Jy2ELPJnIG5vcCoCaxj64unP/zvhT3sXXKwV37rYbpQrAXAABucek1ypJ
-OIAxiVh3Ie9eUhg2n9wt3PRnrNvSs+4ujheF4w==
-						</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>
-MIIFGTCCBAGgAwIBAgIUE6o4acnOuBZ6XTtcF9qVfYARsjowDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTAyNjEwNTAxNloXDTE1MTAyNjEwNTAxNlow
-gYwxCzAJBgNVBAYTAkNIMQ8wDQYDVQQIEwZMdXplcm4xDzANBgNVBAcTBkx1emVy
-bjEmMCQGA1UEChMdRmFjaGhvY2hzY2h1bGUgWmVudHJhbHNjaHdlaXoxHTAbBgNV
-BAsTFEFidGVpbHVuZyBJbmZvcm1hdGlrMRQwEgYDVQQDEwtpZHAuaHNsdS5jaDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqWUr4eYHDfEMN8pH6heyTs
-y4dSl8nKvNpQaDHd8uqag+9zndhY329sGOSohA8yrcfB1Mtr8I3F3EA/G03NOu7v
-0sPfggwIz0qrPCrVtr9DSc7nARJpsOfvgv3ypUoXbdB8yDwvEa3wOh38vrraWoct
-sTfntwZC5VWVWo42hGTRtLCp8Xg8Rr/ga4crIxWZRjbsLZO8nJnnhnE/CryZG2A7
-GhpDvBErfWkTWn9rgscgdYWSeq0eCSszFxIOtHoTCI5ebgpa+YOXx4oSnwwmBYfl
-ylTeIkPrGYyNKUdLzr/QhsNSKsr7JuHV5pexx7svi7eUtqpn/gFxLsr0RMc5q3MC
-AwEAAaOCAZEwggGNMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDov
-L29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1
-c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDAWBgNVHREEDzANggtp
-ZHAuaHNsdS5jaDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUF
-BwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4G
-A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD
-VR0jBBgwFoAUMk2hT+rwrpm27psHLIQIEVCL4n4wOwYDVR0fBDQwMjAwoC6gLIYq
-aHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3JsMB0GA1Ud
-DgQWBBT0xkVMnRM30LsfnLQz/IYX2QnjiDANBgkqhkiG9w0BAQUFAAOCAQEAZ5GA
-o26rCT/ZHTDS5wDJZjHIb28MaWia9ACMvzuieUw4KnJfsPoFoWV/Gs83wSX+aZnt
-J9ctbDNJOc0SzqRE8ZqjA62rDIj2wzXlCl+idMh/mHR+//7oCYRpyIgXBjOg3sVn
-R0hvccjUSoDYxy1p2epK/edgGzpKj7oazoh78FjfGOImnGFBZGfj5eTSloxJZInG
-A2P0Zcp8Hhg/aptpC7c7oAMv7TjxTuw/QWSl/87B9Dc/NXzSRL6LFlB04jN/onst
-CLT8QtV+34QCmlhAn7VtgOllBMZ6F3oU0ank+QresyYhWef+CsXDz4XSOt3tmT6s
-moKY92W4xbV9VFcSbg==
-						</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>
-MIIDGDCCAgCgAwIBAgIVAKYe0Z6SH3z8HH5wMaMq5hTEhv/qMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5oc2x1LmNoMB4XDTEzMTIyMDE1MzkzMFoXDTE2
-MTIyMDE1MzkzMFowFjEUMBIGA1UEAxMLaWRwLmhzbHUuY2gwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCzsxMbkNyRCfJACI8ij/xKmC05sI3LIRBmakIZ
-hefl8ZsrmFy9b/D36SXZhQwBCoX/3JqxNFDDGOIZ9Y/zf6Rj3wj9Y2/hoWF+3q7l
-S2VUkPxEecgn+dH5mLAwXS9KG/dungBrPU4XKiQd4+9Hr887A/TcY+Zl9xoEvu3a
-5lfV+k7ZHY23tWaKM8y40dWpmXqEVm0b/XnhSMCT3F6kYs0re+FqBy97IokTTJho
-bJo+mpOfKVldwwEHZ5Fyv1p09qADFizIuZob9WDgW6an/OO/QmqbRK58piltzVJ9
-fusjjAIuJytgIHn8nIeG6GEHlSv8FEiAQ5z0EWhwkluQiXvBAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5oc2x1LmNohiJodHRwczovL2lkcC5oc2x1LmNoL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTmA3UfmymdUeEBYMjH2Ak+bw1FOzANBgkqhkiG
-9w0BAQUFAAOCAQEAUD6gf83UkCE3gknGuckSwp7/dTh+pakqMI3RIEZYXnWFwlec
-0pPS9MHJ+FY5uWCWxAy/W7hLtBt+cJff1OsRkzdm95NObCYmbDytUqCPyIHkedJ8
-vDwD6vJ605tMBKnHYRWIfdmGF91NjdyKp+iHePNXS3gDxLnSYdXFxmTjBTZsN/Ck
-wLUk/ItLwWIOygK6uFLr692+Tcqb36JV56HEx5rBkgDvSHRYdmd/iKiNMJgUzua5
-p6nvn41Jy2ELPJnIG5vcCoCaxj64unP/zvhT3sXXKwV37rYbpQrAXAABucek1ypJ
-OIAxiVh3Ie9eUhg2n9wt3PRnrNvSs+4ujheF4w==
-						</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>
-MIIFGTCCBAGgAwIBAgIUE6o4acnOuBZ6XTtcF9qVfYARsjowDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTAyNjEwNTAxNloXDTE1MTAyNjEwNTAxNlow
-gYwxCzAJBgNVBAYTAkNIMQ8wDQYDVQQIEwZMdXplcm4xDzANBgNVBAcTBkx1emVy
-bjEmMCQGA1UEChMdRmFjaGhvY2hzY2h1bGUgWmVudHJhbHNjaHdlaXoxHTAbBgNV
-BAsTFEFidGVpbHVuZyBJbmZvcm1hdGlrMRQwEgYDVQQDEwtpZHAuaHNsdS5jaDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqWUr4eYHDfEMN8pH6heyTs
-y4dSl8nKvNpQaDHd8uqag+9zndhY329sGOSohA8yrcfB1Mtr8I3F3EA/G03NOu7v
-0sPfggwIz0qrPCrVtr9DSc7nARJpsOfvgv3ypUoXbdB8yDwvEa3wOh38vrraWoct
-sTfntwZC5VWVWo42hGTRtLCp8Xg8Rr/ga4crIxWZRjbsLZO8nJnnhnE/CryZG2A7
-GhpDvBErfWkTWn9rgscgdYWSeq0eCSszFxIOtHoTCI5ebgpa+YOXx4oSnwwmBYfl
-ylTeIkPrGYyNKUdLzr/QhsNSKsr7JuHV5pexx7svi7eUtqpn/gFxLsr0RMc5q3MC
-AwEAAaOCAZEwggGNMHQGCCsGAQUFBwEBBGgwZjAqBggrBgEFBQcwAYYeaHR0cDov
-L29jc3AucXVvdmFkaXNnbG9iYWwuY29tMDgGCCsGAQUFBzAChixodHRwOi8vdHJ1
-c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsaWNhLmNydDAWBgNVHREEDzANggtp
-ZHAuaHNsdS5jaDBRBgNVHSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUF
-BwIBFihodHRwOi8vd3d3LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4G
-A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYD
-VR0jBBgwFoAUMk2hT+rwrpm27psHLIQIEVCL4n4wOwYDVR0fBDQwMjAwoC6gLIYq
-aHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xpY2EuY3JsMB0GA1Ud
-DgQWBBT0xkVMnRM30LsfnLQz/IYX2QnjiDANBgkqhkiG9w0BAQUFAAOCAQEAZ5GA
-o26rCT/ZHTDS5wDJZjHIb28MaWia9ACMvzuieUw4KnJfsPoFoWV/Gs83wSX+aZnt
-J9ctbDNJOc0SzqRE8ZqjA62rDIj2wzXlCl+idMh/mHR+//7oCYRpyIgXBjOg3sVn
-R0hvccjUSoDYxy1p2epK/edgGzpKj7oazoh78FjfGOImnGFBZGfj5eTSloxJZInG
-A2P0Zcp8Hhg/aptpC7c7oAMv7TjxTuw/QWSl/87B9Dc/NXzSRL6LFlB04jN/onst
-CLT8QtV+34QCmlhAn7VtgOllBMZ6F3oU0ank+QresyYhWef+CsXDz4XSOt3tmT6s
-moKY92W4xbV9VFcSbg==
-						</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.htwg-konstanz.de.xml b/swamid-interfederations-2.0/idp.htwg-konstanz.de.xml
deleted file mode 100644
index ec48a491..00000000
--- a/swamid-interfederations-2.0/idp.htwg-konstanz.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.htwg-konstanz.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">htwg-konstanz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.htwg-konstanz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.htwg-konstanz.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCTCCA/GgAwIBAgIED3krjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAxMjIxMzU0MDdaFw0xNTAx
-MjExMzU0MDdaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuaHR3Zy1rb25zdGFuei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCvB8y8jN5yPI18S2YaLk9+
-x8txqfITAVZrVBCb8u8F/bPMso3evG9om1qDeUPlJ8xIhyIsNFfKjWQSrP6EmiI9
-XZXL9Gm4xZhMmDgZ1+cLUViIYT/X+V62h3TKrgMvnzISVFvEZjxINgitV823DZRk
-7zWswOvwV/V4ilDwJRhx6jLCbrztltPMpjIxMFvJFVDvllfPxykg2xQP5rhGa1gn
-ezpWh/ESyeE1VRworNZYQINvUQdTIuJlpj3iSC+pQvldDScEuai4CgGYg6p7gCzG
-1sS7DJnytq5MUgtsduNpELzjFD2xtzQ/3LhsUf0ySpErSGAn5fKWg3Eab7K5NBUC
-AwEAAaOCAeEwggHdMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU+w/Cf4aHFawZhnChB+GawB41
-2Q4wHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIwYDVR0RBBwwGoEY
-c3RldWVydEBodHdnLWtvbnN0YW56LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1z
-ZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBqgYIKwYBBQUHAQEEgZ0wgZow
-SwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZp
-Y2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBLBggrBgEFBQcwAoY/aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAax3k4gqD7d5XAwDWmPs0oPCwW
-DgEofj++OOyp+LqVmayARGMWo501Xew1p/TX1XSRYWKiya+B+qTca7EmI/yThn8v
-yhadmTYazbcZndMv9QScDIVpO1+TdSrPgIF2mL5a+eiI8jNa8PIu04vSGUU5lw52
-i2qcqy905Ip5EmeLUl+ZF3Evy3bFQPcbMHKbTz3Pp3wEnlzH4nv5IaAwOjGhCBCu
-wlDZxietS5h6mhn+0BSBa65u0e8tTzoJn1ZehI0f8lFZTkRTSyPw4J3FPi8aLGvb
-qKa8zt6MpiiTn10CDGdvLnRJ/CzTDL1DZgeCLm4nxZg5CdiYzpWxAaDoHOlV
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.htwg-konstanz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.htwg-konstanz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.htwg-konstanz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.htwg-konstanz.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.htwg-konstanz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.htwg-konstanz.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">htwg-konstanz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.htwg-konstanz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.htwg-konstanz.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCTCCA/GgAwIBAgIED3krjjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAxMjIxMzU0MDdaFw0xNTAx
-MjExMzU0MDdaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRpZHAuaHR3Zy1rb25zdGFuei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCvB8y8jN5yPI18S2YaLk9+
-x8txqfITAVZrVBCb8u8F/bPMso3evG9om1qDeUPlJ8xIhyIsNFfKjWQSrP6EmiI9
-XZXL9Gm4xZhMmDgZ1+cLUViIYT/X+V62h3TKrgMvnzISVFvEZjxINgitV823DZRk
-7zWswOvwV/V4ilDwJRhx6jLCbrztltPMpjIxMFvJFVDvllfPxykg2xQP5rhGa1gn
-ezpWh/ESyeE1VRworNZYQINvUQdTIuJlpj3iSC+pQvldDScEuai4CgGYg6p7gCzG
-1sS7DJnytq5MUgtsduNpELzjFD2xtzQ/3LhsUf0ySpErSGAn5fKWg3Eab7K5NBUC
-AwEAAaOCAeEwggHdMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU+w/Cf4aHFawZhnChB+GawB41
-2Q4wHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIwYDVR0RBBwwGoEY
-c3RldWVydEBodHdnLWtvbnN0YW56LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1z
-ZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBqgYIKwYBBQUHAQEEgZ0wgZow
-SwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZp
-Y2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBLBggrBgEFBQcwAoY/aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAax3k4gqD7d5XAwDWmPs0oPCwW
-DgEofj++OOyp+LqVmayARGMWo501Xew1p/TX1XSRYWKiya+B+qTca7EmI/yThn8v
-yhadmTYazbcZndMv9QScDIVpO1+TdSrPgIF2mL5a+eiI8jNa8PIu04vSGUU5lw52
-i2qcqy905Ip5EmeLUl+ZF3Evy3bFQPcbMHKbTz3Pp3wEnlzH4nv5IaAwOjGhCBCu
-wlDZxietS5h6mhn+0BSBa65u0e8tTzoJn1ZehI0f8lFZTkRTSyPw4J3FPi8aLGvb
-qKa8zt6MpiiTn10CDGdvLnRJ/CzTDL1DZgeCLm4nxZg5CdiYzpWxAaDoHOlV
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.htwg-konstanz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.htwg-konstanz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Konstanz Technik, Wirtschaft und Gestaltung</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">HTWG Konstanz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.htwg-konstanz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Konrad</GivenName>
-    <SurName>Mauz</SurName>
-    <EmailAddress>hostmaster@htwg-konstanz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.hughbaird.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.hughbaird.ac.uk-oala-metadata.xml
deleted file mode 100644
index 469e92b7..00000000
--- a/swamid-interfederations-2.0/idp.hughbaird.ac.uk-oala-metadata.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.hughbaird.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Hugh Baird College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-10T11:25:59Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">hughbaird.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIIX17eEDuOAj8wDQYJKoZIhvcNAQEFBQAwOzEbMBkGA1UE
-						CgwSSHVnaCBCYWlyZCBDb2xsZWdlMRwwGgYDVQQDDBNpZHAuaHVnaGJhaXJkLmFj
-						LnVrMB4XDTEzMDgwODExMTEwMloXDTIzMDgwODExMTEwMlowOzEbMBkGA1UECgwS
-						SHVnaCBCYWlyZCBDb2xsZWdlMRwwGgYDVQQDDBNpZHAuaHVnaGJhaXJkLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsuUznKj9CgzG9HW/AY+K
-						hCfi5qxt1ttqKDe5geSym5DSi6oIFbNyEfYSxvpGKIFUweYKAbWYbWAa+dxJ5iHf
-						ahZr1odOtyBh2XZCHZ4q4LLPeIpfpk3vNPH7GDdWjI2LXEet+/7J8x4jzXrFvJ1O
-						7AX/T5lswOyeEKVIzgXK5Z5wK6K4U9NnMEBGfDtTgOzOYcRsJDlJScEnrdMaSO3E
-						fU54JKVq56ozyzZ/LGGCmtylFuz1vX9ZoL5rP5zErYMND6m7xka0U9XKVLTz1rbA
-						5zDrV+eMI2QYJ7zIPPJA1QDZY5/DUo495l93GWm0nov/cIflF5Q0V8Jdb6zvv92q
-						UwIDAQABo1AwTjAdBgNVHQ4EFgQUVN73EI9lBXn223EfNEMOX/UmSikwHwYDVR0j
-						BBgwFoAUVN73EI9lBXn223EfNEMOX/UmSikwDAYDVR0TBAUwAwEB/zANBgkqhkiG
-						9w0BAQUFAAOCAQEAqzbMViMYly/u3VNWF3xVfadZFpPuea3AsjD8P/ibJ+AK2rJE
-						40KhEFuBpkTdCAmBuXMLqHl1Wpkm1dA1JFyZFYKD2Llt2mn6aTY6XmTuZfp4xJdt
-						iz6Hi+mzKB5oClIeY7Ba0m3KVQCwuoYvIgsJ7Phs9QzdtGDDJMpx/oc9DGbGzcmx
-						M9A6/TMn/ECbGDZX9AAWY1Q06bGQtqOJOUEJcEj51jFMpuN2EJdfkr6tEYYTIjsd
-						jr+w28z0m4rA2ed7r3vvuceGFkOlSy+zp5DR3Nr6hGMCfDSuxVbJOuNpp/VzYyq/
-						sL1NJoJ0e626msAaAaxLyxiHxQ9bJI/Uu0We2Q==
-					</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>
-						MIIDSDCCAjCgAwIBAgIIX17eEDuOAj8wDQYJKoZIhvcNAQEFBQAwOzEbMBkGA1UE
-						CgwSSHVnaCBCYWlyZCBDb2xsZWdlMRwwGgYDVQQDDBNpZHAuaHVnaGJhaXJkLmFj
-						LnVrMB4XDTEzMDgwODExMTEwMloXDTIzMDgwODExMTEwMlowOzEbMBkGA1UECgwS
-						SHVnaCBCYWlyZCBDb2xsZWdlMRwwGgYDVQQDDBNpZHAuaHVnaGJhaXJkLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsuUznKj9CgzG9HW/AY+K
-						hCfi5qxt1ttqKDe5geSym5DSi6oIFbNyEfYSxvpGKIFUweYKAbWYbWAa+dxJ5iHf
-						ahZr1odOtyBh2XZCHZ4q4LLPeIpfpk3vNPH7GDdWjI2LXEet+/7J8x4jzXrFvJ1O
-						7AX/T5lswOyeEKVIzgXK5Z5wK6K4U9NnMEBGfDtTgOzOYcRsJDlJScEnrdMaSO3E
-						fU54JKVq56ozyzZ/LGGCmtylFuz1vX9ZoL5rP5zErYMND6m7xka0U9XKVLTz1rbA
-						5zDrV+eMI2QYJ7zIPPJA1QDZY5/DUo495l93GWm0nov/cIflF5Q0V8Jdb6zvv92q
-						UwIDAQABo1AwTjAdBgNVHQ4EFgQUVN73EI9lBXn223EfNEMOX/UmSikwHwYDVR0j
-						BBgwFoAUVN73EI9lBXn223EfNEMOX/UmSikwDAYDVR0TBAUwAwEB/zANBgkqhkiG
-						9w0BAQUFAAOCAQEAqzbMViMYly/u3VNWF3xVfadZFpPuea3AsjD8P/ibJ+AK2rJE
-						40KhEFuBpkTdCAmBuXMLqHl1Wpkm1dA1JFyZFYKD2Llt2mn6aTY6XmTuZfp4xJdt
-						iz6Hi+mzKB5oClIeY7Ba0m3KVQCwuoYvIgsJ7Phs9QzdtGDDJMpx/oc9DGbGzcmx
-						M9A6/TMn/ECbGDZX9AAWY1Q06bGQtqOJOUEJcEj51jFMpuN2EJdfkr6tEYYTIjsd
-						jr+w28z0m4rA2ed7r3vvuceGFkOlSy+zp5DR3Nr6hGMCfDSuxVbJOuNpp/VzYyq/
-						sL1NJoJ0e626msAaAaxLyxiHxQ9bJI/Uu0We2Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hughbaird.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hughbaird.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Hugh Baird College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hugh Baird College (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hughbaird.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Billington</SurName>
-    <EmailAddress>mailto:john.billington@hughbaird.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Billington</SurName>
-    <EmailAddress>mailto:john.billington@hughbaird.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iadt.ie-idp-shibboleth.xml
deleted file mode 100644
index b9c32a74..00000000
--- a/swamid-interfederations-2.0/idp.iadt.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.iadt.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-10-18T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iadt.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dun Laoghaire Institute of Art Design and Technology</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.iadt.ie</mdui:InformationURL>
-        <mdui:Logo height="101" width="151">https://edugate.heanet.ie/rr3/logos/iadt.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.2802499,-6.1539366</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVALmq0aeEnY2koINV+tGCDu0kV09pMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5pYWR0LmllMB4XDTA5MDQwODE0NDAyMFoXDTI5
-MDQwODE0NDAyMFowFjEUMBIGA1UEAxMLaWRwLmlhZHQuaWUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCPkswyC6jeXgUJzMGhx7QlixYHq4Rqh4KBPlxH
-Ipv4bd3/GfkoZs2avpxD75ksEzNsAbTlq7QyiqVaPB4MXo85NqV5e2xt2NexCmxn
-lEYjtqTkgU83lOPSmu4dQDKhXfoK5ZSoSd9d8BgfmRKQNgr3UdIs0pcVTcRbG+Yz
-JPLyTgewKNdRD1BvimaxbDvjBXxTpGo3KEtv4tEWuVqlo+yqQkFawF11xnNtmLzH
-hub9/GxMdLEySuJIsvfLmawpsoV7Kp6mr9onMPSl/k9x+7dG2b2FSc8blPN6NiPO
-IMs5Dig4OXW6O9N5WsOXNVa7MtpK02t69FlKOm1BjZo6ytIvAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5pYWR0LmllhiJodHRwczovL2lkcC5pYWR0LmllL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBS1GPf9ZZNOFL9/cO4deMgQC/hoXTANBgkqhkiG
-9w0BAQUFAAOCAQEAZEfSyT4N9goj8oSV8NL0B8pXIKyVBZBoE6id+B47VVv7u1vC
-aDHKArulvZPR43lzFx2q6lHclHj2PeNzUgx10ZUrrsXxOd+2FUG8ExaKiMv/F3/w
-ApcMs8kQehlArgcwqVTzGqqZ1+FtMfVDyGS5AX/tZHo4frzFJlcqyKYgnrKTueEi
-2Ytjlo3VTd3RMwTBG2D2PmhoO/Q461J3WYD5IuFZ8a83HZOIXE5mXYx3vBJCxD5s
-6IJk9cDYR07yL/pz7pOLDYcKoo1/lNVMA4IXVzCnXOOrE29pL249ewOlHBX3meoy
-Qrq4WvN81X5uUTN6qJPlL6wd+mT+LsrZPH+zyw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iadt.ie/idp/logout.jsp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iadt.ie/idp/logout.jsp"/>
-    <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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iadt.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iadt.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iadt.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Dun Laoghaire Institute of Art Design and Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Dun Laoghaire Institute of Art Design and Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iadt.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Arif</md:GivenName>
-    <md:SurName>Syed</md:SurName>
-    <md:EmailAddress>mailto:arif.syed@iadt.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Colm</md:GivenName>
-    <md:SurName>Hennessy</md:SurName>
-    <md:EmailAddress>mailto:colm.hennessy@iadt.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Maurice</md:GivenName>
-    <md:SurName>Coen</md:SurName>
-    <md:EmailAddress>mailto:maurice.coen@iadt.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iamtest.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.iamtest.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 6e835088..00000000
--- a/swamid-interfederations-2.0/idp.iamtest.ox.ac.uk-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.iamtest.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Test IdP for IAMTEST authentication stack" Shibboleth IdP for the University of Oxford.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-03T09:53:37Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">ox.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUa38GMB38Bw/fc8DRnws12ed2TT8wDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUaWRwLmlhbXRlc3Qub3guYWMudWswHhcNMTMwMzA3MTIx
-						OTU5WhcNMzMwMzA3MTIxOTU5WjAfMR0wGwYDVQQDExRpZHAuaWFtdGVzdC5veC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKKPxDvVvBDa7oue
-						bcUFyrrd/gLxKTWVR9wObbumUQpi0T5nVa0t8KbpdKdusP1Ymj2bdMw+KPNfZrc4
-						MEAMSD7BJYw9fNwvILS0hBNmn/mBW76zG+HrJjPF5UDHcy+G/PL2h0xdXLSdf/2i
-						uHD5ln6jHyLqRK9K1db+yXXTv9cu5ZFWlh2DF9ByYHb8xMx4df5UWLICT09Vos3a
-						MlkL3Y+MDAKznfjyGLrbac6UwxV2ZIh9F0G2wpgiAJB6zmDmNZeF7dgkvJXng1gi
-						W5qb9qhP67YwlHEir9LDu+YQdEgL2o3J1bzylOX6mt3n9GU04zhkNHKWkUHtmSj2
-						2LntNZMCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLmlhbXRlc3Qub3guYWMudWuG
-						K2h0dHBzOi8vaWRwLmlhbXRlc3Qub3guYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFONo0MnnlYDFHNi9JJ5MYNAFd3WxMA0GCSqGSIb3DQEBBQUAA4IBAQAZ
-						CC8MLlPAXI+CAK33h7LjLYGgzT6xlPL/8qsFuP8bO/WBVg8bjuZpaC3KTi5W2HW6
-						AQ7I0pXAZn7VJuH0KPyiLubgAvjLo1NM8lxkct7x4Y+jZXD2X8t3kS3Abyv69D+P
-						NX3Ubvo6pYHmghQ/fcFvm0stZOo/nIMGwCZIc9wZBaOQ0mLkFQpfdLh/ncN3aaSJ
-						Tu79JDfGxHDvDwMMODuc7mToxakh8wH0v377RdFQ4ARrhVsLxJJhC0NgzKtw0sZd
-						MDhEkM3L6GRkHkQBr16T99CJUDSbIzaYU10ERSEWb1VczZ2/ywvMLar8SszWYmrb
-						+Ii81KZ2VotL9mj7v5li
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iamtest.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iamtest.ox.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.iamtest.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iamtest.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iamtest.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iamtest.ox.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">ox.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUa38GMB38Bw/fc8DRnws12ed2TT8wDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUaWRwLmlhbXRlc3Qub3guYWMudWswHhcNMTMwMzA3MTIx
-						OTU5WhcNMzMwMzA3MTIxOTU5WjAfMR0wGwYDVQQDExRpZHAuaWFtdGVzdC5veC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKKPxDvVvBDa7oue
-						bcUFyrrd/gLxKTWVR9wObbumUQpi0T5nVa0t8KbpdKdusP1Ymj2bdMw+KPNfZrc4
-						MEAMSD7BJYw9fNwvILS0hBNmn/mBW76zG+HrJjPF5UDHcy+G/PL2h0xdXLSdf/2i
-						uHD5ln6jHyLqRK9K1db+yXXTv9cu5ZFWlh2DF9ByYHb8xMx4df5UWLICT09Vos3a
-						MlkL3Y+MDAKznfjyGLrbac6UwxV2ZIh9F0G2wpgiAJB6zmDmNZeF7dgkvJXng1gi
-						W5qb9qhP67YwlHEir9LDu+YQdEgL2o3J1bzylOX6mt3n9GU04zhkNHKWkUHtmSj2
-						2LntNZMCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLmlhbXRlc3Qub3guYWMudWuG
-						K2h0dHBzOi8vaWRwLmlhbXRlc3Qub3guYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFONo0MnnlYDFHNi9JJ5MYNAFd3WxMA0GCSqGSIb3DQEBBQUAA4IBAQAZ
-						CC8MLlPAXI+CAK33h7LjLYGgzT6xlPL/8qsFuP8bO/WBVg8bjuZpaC3KTi5W2HW6
-						AQ7I0pXAZn7VJuH0KPyiLubgAvjLo1NM8lxkct7x4Y+jZXD2X8t3kS3Abyv69D+P
-						NX3Ubvo6pYHmghQ/fcFvm0stZOo/nIMGwCZIc9wZBaOQ0mLkFQpfdLh/ncN3aaSJ
-						Tu79JDfGxHDvDwMMODuc7mToxakh8wH0v377RdFQ4ARrhVsLxJJhC0NgzKtw0sZd
-						MDhEkM3L6GRkHkQBr16T99CJUDSbIzaYU10ERSEWb1VczZ2/ywvMLar8SszWYmrb
-						+Ii81KZ2VotL9mj7v5li
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iamtest.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iamtest.ox.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 Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Test IdP for IAMTEST authentication stack</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ias.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ias.edu-idp-shibboleth.xml
deleted file mode 100644
index 086e713a..00000000
--- a/swamid-interfederations-2.0/idp.ias.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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://idp.ias.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">ias.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute for Advanced Study</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>
-MIIDGDCCAgCgAwIBAgIVAJ4Rw7cCRxZXoeImY29/aVrW2esLMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5pYXMuZWR1MB4XDTExMDMyNTE5MTEyNVoXDTMx
-MDMyNTE5MTEyNVowFjEUMBIGA1UEAxMLaWRwLmlhcy5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCMUHgH7Im7k1tzx4W+Zxl/SJCC+UxEiwfDYUxr
-6gWmhgAfP8L1q6NjZ0uNqv4KX95VNrS6FzqW0mQFhPgVZh8X/b0ZPfHUXQPqqE/0
-yEpPWJBDipAsCiSDGqhgQcMxcsXO9jGLPBXhWD+Wzn7gVIXAn/13ExLh2i69IVrK
-DO7Xf5GXQwf//6TmRoNJnG7ZDPb/nF9dV2Ob+JyvdzIAyJKP6/3lLOpe+S+yacvq
-QLRQBCm0rmtE89Nv6l7meFijEv333I7DpltNsV0E4Sscf7C3bffIHwNyvZaUrhWm
-Q7EuyNXqg3tuAzaAQ+AYNYDWcEeINbPVU8PkCuw4xh3tQe7DAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5pYXMuZWR1hiJodHRwczovL2lkcC5pYXMuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSY93bJArkW7rakEvXuLPKlPY+izDANBgkqhkiG
-9w0BAQUFAAOCAQEAB2vj4jeU+hx42zJUzhUkjCSBcKPMNHhLc7H824X1isfFwPaA
-ahC1lNisUHjdOeugjChmAYKi/RS5PCF8GbEQpG1c4mDwYJFy0YyZkCA81k0y5Ruf
-4THC4P/iLNBUA4UZpECK2Ew96sWHlNcqTCPfhAXDX+P9dYC45Zyw3NIKhMRPlg71
-+D7ebhxnJQxVShc5S4bRB0GORWE4TlLn8sIRAk+R+iGuAghut2ueG44ipp7kIQ/0
-YyxdIMVGKSdzuKeh2yNoiNTzjqKqQc8d4GiWmVcJLw6kwD4MtniEexvkkRzlYW8q
-SvUIEk0xTVbv2eyIxcQBeXXgXyvtErmlxmp5gw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ias.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ias.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ias.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ias.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ias.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ias.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ias.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAJ4Rw7cCRxZXoeImY29/aVrW2esLMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5pYXMuZWR1MB4XDTExMDMyNTE5MTEyNVoXDTMx
-MDMyNTE5MTEyNVowFjEUMBIGA1UEAxMLaWRwLmlhcy5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCMUHgH7Im7k1tzx4W+Zxl/SJCC+UxEiwfDYUxr
-6gWmhgAfP8L1q6NjZ0uNqv4KX95VNrS6FzqW0mQFhPgVZh8X/b0ZPfHUXQPqqE/0
-yEpPWJBDipAsCiSDGqhgQcMxcsXO9jGLPBXhWD+Wzn7gVIXAn/13ExLh2i69IVrK
-DO7Xf5GXQwf//6TmRoNJnG7ZDPb/nF9dV2Ob+JyvdzIAyJKP6/3lLOpe+S+yacvq
-QLRQBCm0rmtE89Nv6l7meFijEv333I7DpltNsV0E4Sscf7C3bffIHwNyvZaUrhWm
-Q7EuyNXqg3tuAzaAQ+AYNYDWcEeINbPVU8PkCuw4xh3tQe7DAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5pYXMuZWR1hiJodHRwczovL2lkcC5pYXMuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSY93bJArkW7rakEvXuLPKlPY+izDANBgkqhkiG
-9w0BAQUFAAOCAQEAB2vj4jeU+hx42zJUzhUkjCSBcKPMNHhLc7H824X1isfFwPaA
-ahC1lNisUHjdOeugjChmAYKi/RS5PCF8GbEQpG1c4mDwYJFy0YyZkCA81k0y5Ruf
-4THC4P/iLNBUA4UZpECK2Ew96sWHlNcqTCPfhAXDX+P9dYC45Zyw3NIKhMRPlg71
-+D7ebhxnJQxVShc5S4bRB0GORWE4TlLn8sIRAk+R+iGuAghut2ueG44ipp7kIQ/0
-YyxdIMVGKSdzuKeh2yNoiNTzjqKqQc8d4GiWmVcJLw6kwD4MtniEexvkkRzlYW8q
-SvUIEk0xTVbv2eyIxcQBeXXgXyvtErmlxmp5gw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ias.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute for Advanced Study</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute for Advanced Study</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ias.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jeffrey Berliner</md:GivenName>
-    <md:EmailAddress>idpadmin@ias.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Federated Authentication Support Team</md:GivenName>
-    <md:EmailAddress>idptech@ias.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Federated Authentication Support</md:GivenName>
-    <md:EmailAddress>idphelp@ias.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iastate.edu-shibboleth.xml b/swamid-interfederations-2.0/idp.iastate.edu-shibboleth.xml
deleted file mode 100644
index e5dc5da1..00000000
--- a/swamid-interfederations-2.0/idp.iastate.edu-shibboleth.xml
+++ /dev/null
@@ -1,73 +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://idp.iastate.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">iastate.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Iowa State University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Iowa State University of Science and Technology</mdui:Description>
-        <mdui:Logo height="249" width="564" xml:lang="en">https://shibboleth.iastate.edu/ISU_InCommon_Nameplate.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>
-MIIDSTCCAjGgAwIBAgIJANtndPl5456+MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnNoaWJib2xldGguaWFzdGF0ZS5lZHUwHhcNMTMwMTA4MjMwOTU3WhcNMjMw
-MTA2MjMwOTU3WjAhMR8wHQYDVQQDExZzaGliYm9sZXRoLmlhc3RhdGUuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAscJCb7+nGki+XK32mLz0xJUY
-AMHPiDBnrepFglaTQ8YkI+FIlH2EWY0AFUCcIyNEXG2AXKhKhAVwv+HR+5WUQk5D
-mvApzDDkmiNTTEzMV8A/ZfHhTcDIHXXz3adLSqcAQBfhPCoOW2rr4KNwylAM3i/e
-PO5DXjQv2PHSYuHYJioki+OB9ISAnFxjlFfjoW8aipHwRs0UsQui13R7plYiM9F8
-PB53ywtGo1wKEyfz7PzA6amCm4ayaV8ffhdr+iVjoemESTBGT3vi0dSqtwQGMqzj
-ZTDKNlg3QLrjT23ZMvhMD9E0WpM+XiDkLeAtwZJWe41FEQepR/pcATu15WAoDQID
-AQABo4GDMIGAMB0GA1UdDgQWBBQEUoHboQ66BZAv4K1HD+eV9R5ARTBRBgNVHSME
-SjBIgBQEUoHboQ66BZAv4K1HD+eV9R5ARaElpCMwITEfMB0GA1UEAxMWc2hpYmJv
-bGV0aC5pYXN0YXRlLmVkdYIJANtndPl5456+MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEFBQADggEBAEh/PmivdsKgKyAbGTSd0EtGBkZi4MIWNdxONJK/S3Yu3yDH
-JmGb092oQUWXuexwNad60fyC5vmjcDoIdc/abFIJ7ZlxO+mwnn91NTpE2KHT0w3G
-SDKQlbvCTERFwKju3CzNSVJgTm/8HcMiVg8Oh0UDtqBbIoWa1+z2vfVfFg42y8kb
-sdhfF/SwKY8OTQ2T5IBB4TX/pc374MeGzyztBkHWI0Wdit4SsqVBk5W/id/Xm6GK
-SjZyukCftG8fPGS9rzYyIHZef/SenG1Jx3H2SK0JfzACakpVnW8rLIz3pOVVn53W
-9X/7A6V/nF9hQCcovLsIvLhCKTmiRoiMQiboEOs=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iastate.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.iastate.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.iastate.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.iastate.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.iastate.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.iastate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Iowa State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Iowa State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iastate.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Iowa State University Shibboleth Technical Team</md:GivenName>
-    <md:EmailAddress>shibboleth@iastate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Iowa State University Solution Center</md:GivenName>
-    <md:EmailAddress>solution@iastate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Iowa State University InCommon Admins</md:GivenName>
-    <md:EmailAddress>incommon-admins@iastate.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ibot.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ibot.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index f97aa433..00000000
--- a/swamid-interfederations-2.0/idp.ibot.cas.cz-idp-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://idp.ibot.cas.cz/idp/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="2014-12-19T14:43: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>
-    <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>
-  <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">ibot.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institut of Botany ASCR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Botanický ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider IBOT AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance BÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ibot.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ibot.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="123">https://jiftach.cas.cz/loga/logo-bu-44.png</mdui:Logo>
-        <mdui:Logo height="284" width="796">https://jiftach.cas.cz/loga/logo-bu-284.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAMxsLpF35rXDQbU29hCvQ9ID+RqhMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC5pYm90LmNhcy5jejAeFw0xNDEyMTUwOTM3MDha
-Fw0zNDEyMTUwOTM3MDhaMBoxGDAWBgNVBAMTD2lkcC5pYm90LmNhcy5jejCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZdXo8BHNDZSJzRLQkKNyg8YnqR
-0MXjl0gFyZXl3FM5MLIZsyBogGpcFf7H0cnOzplcCSxpk5M3yRGKMfX6cjZvoWu1
-A/E9z6NXKte5efB2i/jKYzv6fxujZgRmxuvIilXZMrkXmLEOGCbhmpWy021OD4Vk
-KmtZ+zc1YXDXczPG5ssskhLwP9iVD9jdlL6PBE0+u3f0r+aVnOghDKJj2EnlIua0
-jMDQjDAnIcXWYrSPxF2kmOnOYzI8RWvQkIhXLfNLTl//mjKp78WONO30x6A9jbCe
-wb0dsBAsm8JcB3cAHY4wm/DfFW8ns/SpYVc+SDi5BiVlsctsj2AxJXYz/6MCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLmlib3QuY2FzLmN6hiZodHRwczovL2lkcC5p
-Ym90LmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUNB2G4Wu/pmGzpULg
-qY4Gut3/lYcwDQYJKoZIhvcNAQEFBQADggEBAHWmscEAOQ5tG96tRVZC8VCDUQmI
-8bnnnjbF4llfmJfMOSdkfmSE1A+0sMNbE3zT8jY2TXmBMU3YdyzNDyEG0YGRvghW
-3KpaMEzUJsbkOhWnDTaL6VJqATD/YAJlTgOdkeXbu3V2KJnNB5lj7Tb0QPq/krWU
-/by0EpeS+7FueQ22MAI++DSUBv91SXFGMW/TMnb+/+dE50bV+GV4aCKPew4w8OH0
-ZalqvP5zKZTaT9xbJbh0K+UDgR8nmrd6QTZnFSoylnbX1O+zEyCagZlQQwEDTIVj
-tTzd0Evm3OfMvzbrxeZcRq8rWk2hWbjtw0GbhBkQm41WEgKL+580ax3w65o=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibot.cas.cz: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.ibot.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ibot.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibot.cas.cz/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">ibot.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAMxsLpF35rXDQbU29hCvQ9ID+RqhMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC5pYm90LmNhcy5jejAeFw0xNDEyMTUwOTM3MDha
-Fw0zNDEyMTUwOTM3MDhaMBoxGDAWBgNVBAMTD2lkcC5pYm90LmNhcy5jejCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZdXo8BHNDZSJzRLQkKNyg8YnqR
-0MXjl0gFyZXl3FM5MLIZsyBogGpcFf7H0cnOzplcCSxpk5M3yRGKMfX6cjZvoWu1
-A/E9z6NXKte5efB2i/jKYzv6fxujZgRmxuvIilXZMrkXmLEOGCbhmpWy021OD4Vk
-KmtZ+zc1YXDXczPG5ssskhLwP9iVD9jdlL6PBE0+u3f0r+aVnOghDKJj2EnlIua0
-jMDQjDAnIcXWYrSPxF2kmOnOYzI8RWvQkIhXLfNLTl//mjKp78WONO30x6A9jbCe
-wb0dsBAsm8JcB3cAHY4wm/DfFW8ns/SpYVc+SDi5BiVlsctsj2AxJXYz/6MCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLmlib3QuY2FzLmN6hiZodHRwczovL2lkcC5p
-Ym90LmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUNB2G4Wu/pmGzpULg
-qY4Gut3/lYcwDQYJKoZIhvcNAQEFBQADggEBAHWmscEAOQ5tG96tRVZC8VCDUQmI
-8bnnnjbF4llfmJfMOSdkfmSE1A+0sMNbE3zT8jY2TXmBMU3YdyzNDyEG0YGRvghW
-3KpaMEzUJsbkOhWnDTaL6VJqATD/YAJlTgOdkeXbu3V2KJnNB5lj7Tb0QPq/krWU
-/by0EpeS+7FueQ22MAI++DSUBv91SXFGMW/TMnb+/+dE50bV+GV4aCKPew4w8OH0
-ZalqvP5zKZTaT9xbJbh0K+UDgR8nmrd6QTZnFSoylnbX1O+zEyCagZlQQwEDTIVj
-tTzd0Evm3OfMvzbrxeZcRq8rWk2hWbjtw0GbhBkQm41WEgKL+580ax3w65o=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibot.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institut of Botany ASCR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Botanický ústav AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institut of Botany ASCR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Botanický ústav AV ČR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ibot.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ibot.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 4f3de643..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ibp.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.cas.cz: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.ibp.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ibp.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ibp.cas.cz/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">ibp.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ibp.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Biophysics AS CR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Biofyzikální ústav AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Biophysics AS CR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Biofyzikální ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ibp.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ibp.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0c426a89..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.icpf.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.icpf.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.icpf.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.icpf.cas.cz/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">icpf.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.icpf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.icpf.cas.cz: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">Institute of Chemical Process Fundamentals of the ASCR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav chemických procesů AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Chemical Process Fundamentals of the ASCR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav chemických procesů AV ČR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.icpf.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.icpf.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.identity.uoguelph.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.identity.uoguelph.ca-idp-shibboleth.xml
deleted file mode 100644
index 901fdbd0..00000000
--- a/swamid-interfederations-2.0/idp.identity.uoguelph.ca-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.identity.uoguelph.ca/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-08-21T16:10:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoguelph.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:InformationURL xml:lang="en">http://www.uoguelph.ca/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDyjCCArICCQCluLVINlzKvzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
-Q0ExEDAOBgNVBAgTB09udGFyaW8xDzANBgNVBAcTBkd1ZWxwaDEdMBsGA1UEChMU
-VW5pdmVyc2l0eSBvZiBHdWVscGgxDDAKBgNVBAsTA0NDUzEhMB8GA1UEAxMYaWRw
-LmlkZW50aXR5LnVvZ3VlbHBoLmNhMSQwIgYJKoZIhvcNAQkBFhU1ODg4OGhlbHBA
-dW9ndWVscGguY2EwHhcNMTMwMzE4MjAyODA4WhcNMjAwMzE2MjAyODA4WjCBpjEL
-MAkGA1UEBhMCQ0ExEDAOBgNVBAgTB09udGFyaW8xDzANBgNVBAcTBkd1ZWxwaDEd
-MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBHdWVscGgxDDAKBgNVBAsTA0NDUzEhMB8G
-A1UEAxMYaWRwLmlkZW50aXR5LnVvZ3VlbHBoLmNhMSQwIgYJKoZIhvcNAQkBFhU1
-ODg4OGhlbHBAdW9ndWVscGguY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCf2JJF02xujFYTQAlusr9DOOj9Ks7NgzdHoqxTNYDBvlOOsVZjix0SrkNj
-KfxM/HpPnuN5g4ZpEIkzDB+Hws7RaQC1x6VwR7KdwU9ccCY2uVQy1Yae4xnkbI7y
-c5pPVdjFgq6Rgcmq/x9oU69QdVDHv2vFKr+5zo98WvCV1vSu4TBbNAHpzjF4ebEY
-FqBlCTK5adWPdAv3chinpl39wrAPWcdMm2gNM5J4CieeOXdDV3OTbBRjRWJ6JvX0
-V5uYuW1J5K8CEmrYCvLstZDQZo/yP/SHrRTKrsWSwTuxgJ8QF+ZelOJoV9l0eOsU
-VtVpZfglEMd6vxaCK7lrQxAsoPrDAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAH81
-9z02E4SEiLC8MQnGM09a0FpRhL84wN1qX05isEXxdpzWXCAfxFF6/scuLlSaDJ0j
-941kQhb0vyi+ZMX7FkbDBCDYN9FW92qkhJSo5NbB5w/lZzrFYc9t89l+pHlnebFn
-1ndTWqqA989f9FNoJo/FXY+uiTwbs5caDOiMh0ieglYsv5smHi5BlFJ094NWOB/F
-DKwJwmEkoo0CP9dlI7f618eVybyTmpybxqQ7ZViFD4udvfCjl0j7LzUfefyyyWnO
-8cyvzuy5JWgN0W3dzew7FVx7KDCitI7MVkB7xgjQhYelVv5GJOVER69yU18Svzxn
-a3M+PZV0yTaCYYLgfmI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.identity.uoguelph.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.identity.uoguelph.ca: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.identity.uoguelph.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.identity.uoguelph.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.identity.uoguelph.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.identity.uoguelph.ca/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoguelph.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDyjCCArICCQCluLVINlzKvzANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
-Q0ExEDAOBgNVBAgTB09udGFyaW8xDzANBgNVBAcTBkd1ZWxwaDEdMBsGA1UEChMU
-VW5pdmVyc2l0eSBvZiBHdWVscGgxDDAKBgNVBAsTA0NDUzEhMB8GA1UEAxMYaWRw
-LmlkZW50aXR5LnVvZ3VlbHBoLmNhMSQwIgYJKoZIhvcNAQkBFhU1ODg4OGhlbHBA
-dW9ndWVscGguY2EwHhcNMTMwMzE4MjAyODA4WhcNMjAwMzE2MjAyODA4WjCBpjEL
-MAkGA1UEBhMCQ0ExEDAOBgNVBAgTB09udGFyaW8xDzANBgNVBAcTBkd1ZWxwaDEd
-MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBHdWVscGgxDDAKBgNVBAsTA0NDUzEhMB8G
-A1UEAxMYaWRwLmlkZW50aXR5LnVvZ3VlbHBoLmNhMSQwIgYJKoZIhvcNAQkBFhU1
-ODg4OGhlbHBAdW9ndWVscGguY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCf2JJF02xujFYTQAlusr9DOOj9Ks7NgzdHoqxTNYDBvlOOsVZjix0SrkNj
-KfxM/HpPnuN5g4ZpEIkzDB+Hws7RaQC1x6VwR7KdwU9ccCY2uVQy1Yae4xnkbI7y
-c5pPVdjFgq6Rgcmq/x9oU69QdVDHv2vFKr+5zo98WvCV1vSu4TBbNAHpzjF4ebEY
-FqBlCTK5adWPdAv3chinpl39wrAPWcdMm2gNM5J4CieeOXdDV3OTbBRjRWJ6JvX0
-V5uYuW1J5K8CEmrYCvLstZDQZo/yP/SHrRTKrsWSwTuxgJ8QF+ZelOJoV9l0eOsU
-VtVpZfglEMd6vxaCK7lrQxAsoPrDAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAH81
-9z02E4SEiLC8MQnGM09a0FpRhL84wN1qX05isEXxdpzWXCAfxFF6/scuLlSaDJ0j
-941kQhb0vyi+ZMX7FkbDBCDYN9FW92qkhJSo5NbB5w/lZzrFYc9t89l+pHlnebFn
-1ndTWqqA989f9FNoJo/FXY+uiTwbs5caDOiMh0ieglYsv5smHi5BlFJ094NWOB/F
-DKwJwmEkoo0CP9dlI7f618eVybyTmpybxqQ7ZViFD4udvfCjl0j7LzUfefyyyWnO
-8cyvzuy5JWgN0W3dzew7FVx7KDCitI7MVkB7xgjQhYelVv5GJOVER69yU18Svzxn
-a3M+PZV0yTaCYYLgfmI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.identity.uoguelph.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.identity.uoguelph.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Guelph</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Guelph</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uoguelph.ca/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Identity Services</md:GivenName>
-    <md:EmailAddress>mailto:ideas@uoguelph.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d1240077..00000000
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ids-mannheim.de/idp/shibboleth">
-  <md: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>
-  </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">ids-mannheim.de</shibmd: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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=idp.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGHGxHEF17jANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFu
-bmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZTEV
-MBMGA1UEAxMMSURTLUNBIC0gRzAxMSEwHwYJKoZIhvcNAQkBFhJjYUBpZHMtbWFu
-bmhlaW0uZGUwHhcNMTQxMDMwMTI0ODEzWhcNMTkwNzA5MjM1OTAwWjCBqDELMAkG
-A1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMI
-TWFubmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNo
-ZTEcMBoGA1UEAxMTaWRwLmlkcy1tYW5uaGVpbS5kZTEiMCAGCSqGSIb3DQEJARYT
-YWFpQGlkcy1tYW5uaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMEpjcJqElfR/q7nXOeozPXG5oT5rzHekYQj/I0ct//VV+9eSO6E4hrFINfz
-16tBu0fBjoKK2nkkbTjsUUvyaGCUmwVwi5dQBdSOUFdWyGb2GaXCL5iilen1qv5W
-NS8ZRER/opCL0UxYfH0D4x4QXZxm7SV9DX6p8nce9DX1cPjZa5Fdjhnm6k6CrHPZ
-IT/UjzpogdSKkqyRQ+MKsGm7W5byJYRVzLeF430Wyt8WdFaCFKxABQ6+m7kurr8k
-T6PDdVejJun1f4JPlR7VxKSLgRcVd5DoZZiBKGG8WPVYbNP/BjipICZNcSGudEka
-XF0XELr2jhLVBuamju1hcQ10QrsCAwEAAaOCAlYwggJSMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUEdZJyOrynFzaW702/kSO4hIlTvcwHwYDVR0jBBgwFoAUVrqWhZ2xhKhzkeH2
-OZ+hhjBEDs4wHgYDVR0RBBcwFYITaWRwLmlkcy1tYW5uaGVpbS5kZTCBiwYDVR0f
-BIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2lkcy1tYW5uaGVp
-bS1jYS9wdWIvY3JsL2NhY3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9pZHMtbWFubmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwgdkGCCsGAQUF
-BwEBBIHMMIHJMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09D
-U1AtU2VydmVyL09DU1AwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvaWRzLW1hbm5oZWltLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBIBggrBgEF
-BQcwAoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS9pZHMtbWFubmhlaW0tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0ME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMC
-MBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0h
-giweMA0GCSqGSIb3DQEBCwUAA4IBAQBew4lONOMqaB2fAdWnI7rQF3X6r8WQCxYs
-0BaFT0dY5hR9z1LT5WsSx55B4K0IJoXJjrpdYqh4wLg+pcwwnfFSs4tFO0iqh58X
-Qa2ZTPt4Js8DSDYQPi5Y4SWp6jdUoLuCKn7pOwSEIZTty4N2BvzuO3bmdBPDSpa7
-Ql3oyyqhxTnDVK7RpuTbVvq3DQ2OSy2/BX9KZbDRWJHatM0sW9YXYCBmFMh/Hbts
-hTUqA59XpC37wh9EFzxY+3hjzmZshnlYJ9Cvr6JysmMVryieMJ0QibsirMh5WAe4
-wF9hg13FcbfC9M9Vw8yzlIpbNxbbxyj5DlQ6umERQ+wWQcvGmPIK
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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.ids-mannheim.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ids-mannheim.de/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ids-mannheim.de/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">ids-mannheim.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ids-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=idp.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGHGxHEF17jANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFu
-bmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZTEV
-MBMGA1UEAxMMSURTLUNBIC0gRzAxMSEwHwYJKoZIhvcNAQkBFhJjYUBpZHMtbWFu
-bmhlaW0uZGUwHhcNMTQxMDMwMTI0ODEzWhcNMTkwNzA5MjM1OTAwWjCBqDELMAkG
-A1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMI
-TWFubmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNo
-ZTEcMBoGA1UEAxMTaWRwLmlkcy1tYW5uaGVpbS5kZTEiMCAGCSqGSIb3DQEJARYT
-YWFpQGlkcy1tYW5uaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMEpjcJqElfR/q7nXOeozPXG5oT5rzHekYQj/I0ct//VV+9eSO6E4hrFINfz
-16tBu0fBjoKK2nkkbTjsUUvyaGCUmwVwi5dQBdSOUFdWyGb2GaXCL5iilen1qv5W
-NS8ZRER/opCL0UxYfH0D4x4QXZxm7SV9DX6p8nce9DX1cPjZa5Fdjhnm6k6CrHPZ
-IT/UjzpogdSKkqyRQ+MKsGm7W5byJYRVzLeF430Wyt8WdFaCFKxABQ6+m7kurr8k
-T6PDdVejJun1f4JPlR7VxKSLgRcVd5DoZZiBKGG8WPVYbNP/BjipICZNcSGudEka
-XF0XELr2jhLVBuamju1hcQ10QrsCAwEAAaOCAlYwggJSMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUEdZJyOrynFzaW702/kSO4hIlTvcwHwYDVR0jBBgwFoAUVrqWhZ2xhKhzkeH2
-OZ+hhjBEDs4wHgYDVR0RBBcwFYITaWRwLmlkcy1tYW5uaGVpbS5kZTCBiwYDVR0f
-BIGDMIGAMD6gPKA6hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2lkcy1tYW5uaGVp
-bS1jYS9wdWIvY3JsL2NhY3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9pZHMtbWFubmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwgdkGCCsGAQUF
-BwEBBIHMMIHJMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09D
-U1AtU2VydmVyL09DU1AwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAxLnBjYS5kZm4u
-ZGUvaWRzLW1hbm5oZWltLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBIBggrBgEF
-BQcwAoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS9pZHMtbWFubmhlaW0tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0ME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMC
-MBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0h
-giweMA0GCSqGSIb3DQEBCwUAA4IBAQBew4lONOMqaB2fAdWnI7rQF3X6r8WQCxYs
-0BaFT0dY5hR9z1LT5WsSx55B4K0IJoXJjrpdYqh4wLg+pcwwnfFSs4tFO0iqh58X
-Qa2ZTPt4Js8DSDYQPi5Y4SWp6jdUoLuCKn7pOwSEIZTty4N2BvzuO3bmdBPDSpa7
-Ql3oyyqhxTnDVK7RpuTbVvq3DQ2OSy2/BX9KZbDRWJHatM0sW9YXYCBmFMh/Hbts
-hTUqA59XpC37wh9EFzxY+3hjzmZshnlYJ9Cvr6JysmMVryieMJ0QibsirMh5WAe4
-wF9hg13FcbfC9M9Vw8yzlIpbNxbbxyj5DlQ6umERQ+wWQcvGmPIK
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ids-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ids-mannheim.de: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">e217</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e217</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.ids-mannheim.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ids-mannheim.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Oliver</md:GivenName>
-    <md:SurName>Schonefeld</md:SurName>
-    <md:EmailAddress>mailto:schonefeld@ids-mannheim.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Andreas</md:GivenName>
-    <md:SurName>Witt</md:SurName>
-    <md:EmailAddress>mailto:witt@ids-mannheim.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:aai@ids-mannheim.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 3d3efa06..00000000
--- a/swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://idp.ifal.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFAL - Instituto Federal de Alagoas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFAL - Instituto Federal de Alagoas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFAL - Instituto Federal de Alagoas</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFAL - Instituto Federal 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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExLDAqBgNVBAoTI0lGQUwgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkZSBBbGFnb2FzMQwwCgYDVQQLEwNEVEkxKTAnBgkq
-hkiG9w0BCQEWGmFkcmlhbm8uYXJhdWpvQGlmYWwuZWR1LmJyMQ8wDQYDVQQHEwZN
-YWNlaW8xEDAOBgNVBAgTB0FsYWdvYXMxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9p
-ZHAuaWZhbC5lZHUuYnIwHhcNMTUwNTA2MTQyMjMxWhcNMTgwNTA1MTQyMjMxWjCB
-sTEsMCoGA1UEChMjSUZBTCAtIEluc3RpdHV0byBGZWRlcmFsIGRlIEFsYWdvYXMx
-DDAKBgNVBAsTA0RUSTEpMCcGCSqGSIb3DQEJARYaYWRyaWFuby5hcmF1am9AaWZh
-bC5lZHUuYnIxDzANBgNVBAcTBk1hY2VpbzEQMA4GA1UECBMHQWxhZ29hczELMAkG
-A1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZmFsLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKlJSdX8bYPSSIWiiMIkOc/eKEu3Oa1FiyK56Qtr
-Gq1v4nQ8gNaasT0f/US6S6uWxacNv6/+Y5Z9gR30pMXHr76UW1u6D+5aag86g6VM
-FSB+Nx7gqyr7BClrpTBtheDRZzCjeSe1CBDNfCZ9srEs6tnzxABBoeptyKK5O/WT
-f9c159eHzMatZ5yr3GIP3UeQhaZKyRUcDGdStWk8goZ/kNw+4CKbRhTSDARLDPvH
-Lvh63Z+oT30stuPNm68JW+mGqtjUHHf9cIOWkXh3DCZwiUFo4vopOLDvk9O3/saO
-hfyYkRgwamC/gMCR7BF/o4q7p+HRlxYUzmKCrDjpq2CL988CAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAfwxODo/74q6lPMURqiwijkAa6HcpLNojw9tcJqQ0fs28srZE
-uouwBWatoB85jOG7sz4R9Vrfw870NdRLkunB6NwtredpvA57Vr14z8LaDK6JRDgn
-jMd+RVgBnMy4g3fxsjVZBmJNqZ98q3tyj5mZ0oV591kOmiKyX1ytUIjOj4yaWvmR
-H1qx/y9tGV+Eb5Jy6jbQLG16B+93zPl1fRf8BgPuLjbsjq+f0xvXUkL+8Gi9TBv3
-Y2F2PrpyMw88ibt/qREHIIa3uIdNu3P0Tq0MvEY51PFkAWXC5J/eocGLZbLUwbVL
-SY7q0H0YJyD8xlGRdz+RsDK4pv1PWQ+9OilkLA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.ifal.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifal.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifal.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifal.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID2DCCAsACAQAwDQYJKoZIhvcNAQEFBQAwgbExLDAqBgNVBAoTI0lGQUwgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkZSBBbGFnb2FzMQwwCgYDVQQLEwNEVEkxKTAnBgkq
-hkiG9w0BCQEWGmFkcmlhbm8uYXJhdWpvQGlmYWwuZWR1LmJyMQ8wDQYDVQQHEwZN
-YWNlaW8xEDAOBgNVBAgTB0FsYWdvYXMxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9p
-ZHAuaWZhbC5lZHUuYnIwHhcNMTUwNTA2MTQyMjMxWhcNMTgwNTA1MTQyMjMxWjCB
-sTEsMCoGA1UEChMjSUZBTCAtIEluc3RpdHV0byBGZWRlcmFsIGRlIEFsYWdvYXMx
-DDAKBgNVBAsTA0RUSTEpMCcGCSqGSIb3DQEJARYaYWRyaWFuby5hcmF1am9AaWZh
-bC5lZHUuYnIxDzANBgNVBAcTBk1hY2VpbzEQMA4GA1UECBMHQWxhZ29hczELMAkG
-A1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZmFsLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKlJSdX8bYPSSIWiiMIkOc/eKEu3Oa1FiyK56Qtr
-Gq1v4nQ8gNaasT0f/US6S6uWxacNv6/+Y5Z9gR30pMXHr76UW1u6D+5aag86g6VM
-FSB+Nx7gqyr7BClrpTBtheDRZzCjeSe1CBDNfCZ9srEs6tnzxABBoeptyKK5O/WT
-f9c159eHzMatZ5yr3GIP3UeQhaZKyRUcDGdStWk8goZ/kNw+4CKbRhTSDARLDPvH
-Lvh63Z+oT30stuPNm68JW+mGqtjUHHf9cIOWkXh3DCZwiUFo4vopOLDvk9O3/saO
-hfyYkRgwamC/gMCR7BF/o4q7p+HRlxYUzmKCrDjpq2CL988CAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAfwxODo/74q6lPMURqiwijkAa6HcpLNojw9tcJqQ0fs28srZE
-uouwBWatoB85jOG7sz4R9Vrfw870NdRLkunB6NwtredpvA57Vr14z8LaDK6JRDgn
-jMd+RVgBnMy4g3fxsjVZBmJNqZ98q3tyj5mZ0oV591kOmiKyX1ytUIjOj4yaWvmR
-H1qx/y9tGV+Eb5Jy6jbQLG16B+93zPl1fRf8BgPuLjbsjq+f0xvXUkL+8Gi9TBv3
-Y2F2PrpyMw88ibt/qREHIIa3uIdNu3P0Tq0MvEY51PFkAWXC5J/eocGLZbLUwbVL
-SY7q0H0YJyD8xlGRdz+RsDK4pv1PWQ+9OilkLA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifal.edu.br:8443/idp/profile/SAML1/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">IFAL - Instituto Federal de Alagoas</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFAL - Instituto Federal de Alagoas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFAL - Instituto Federal de Alagoas</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFAL - Instituto Federal de Alagoas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifal.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifal.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Adriano da Silva Araujo</md:SurName>
-    <md:EmailAddress>adriano.araujo@ifal.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b5cfec63..00000000
--- a/swamid-interfederations-2.0/idp.ifal.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.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>
-    MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTEzMTExODE5MjI1OVoXDTE4MTExNzE5
-MjI1OVowKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzGEje2UFUdN1HzSRBsXM
-hixluIlm5hjLoZ7murfl+hzIVNmBZggf51Spj2i2axnbaKZBcTvb7wq/ZB0T5ecU
-VU9tMliIkokFbBWWHO+hTkt408IGABNPpcLf+DfupbEkkg9SQciPDw0fxN7+FBRA
-5if0qT0KPdzlmJVDcqPS7BRhWCfPFOBF/E4Pi5j6b4z+wCsLjqVLclfDHb/e8R8V
-b0OnodoYYm4mkt4f2D4cqgT5+674jP/81Mef63IwAXZXC0Zp4LrlxfxQp1lh8yTb
-8YpBI6QA2cOCPcwPmjK/3CRJH568hBs0ay0c3zHRWuGz9/zBEGJiHYQyHo/fiu5m
-WQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBr10bEQEAyP792qjUSjytDoFqmZMJ6
-YkMQEsd8s153kQLj1NbznzJjwkfZv8aQ0164t1MvBUL6zqav6EyXCydW5RB1I9vv
-ruM9WKzcZLpi4RlvOn0YCR77zwmAMXUNsoeYfELx/yv4IZpT1STux9cke5bkgNZ9
-EZY8zZwPb8K5u7JQ1If4/ZY+eGGpyytbQb8NbaaHcQZN9UHzpyzRSOykJrGesTvb
-IC7sKOtE3w/J385jW6Iy85iF0W5yKYceivIBdz4Hfcy3sBSHY6o+DDGPDsOFdjbd
-lus9J9qu2AFSjFGy7nXL2y2ySANpwFegTOF9sggED8BBKArvWBgrLOJ9
-            </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>
-      
-MIICxjCCAa4CAQAwDQYJKoZIhvcNAQEFBQAwKTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEMMAoGA1UEAxMDaWRwMB4XDTEzMTExODE5MjI1OVoXDTE4MTExNzE5
-MjI1OVowKTEMMAoGA1UECxMDQ1BEMQswCQYDVQQGEwJCUjEMMAoGA1UEAxMDaWRw
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzGEje2UFUdN1HzSRBsXM
-hixluIlm5hjLoZ7murfl+hzIVNmBZggf51Spj2i2axnbaKZBcTvb7wq/ZB0T5ecU
-VU9tMliIkokFbBWWHO+hTkt408IGABNPpcLf+DfupbEkkg9SQciPDw0fxN7+FBRA
-5if0qT0KPdzlmJVDcqPS7BRhWCfPFOBF/E4Pi5j6b4z+wCsLjqVLclfDHb/e8R8V
-b0OnodoYYm4mkt4f2D4cqgT5+674jP/81Mef63IwAXZXC0Zp4LrlxfxQp1lh8yTb
-8YpBI6QA2cOCPcwPmjK/3CRJH568hBs0ay0c3zHRWuGz9/zBEGJiHYQyHo/fiu5m
-WQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBr10bEQEAyP792qjUSjytDoFqmZMJ6
-YkMQEsd8s153kQLj1NbznzJjwkfZv8aQ0164t1MvBUL6zqav6EyXCydW5RB1I9vv
-ruM9WKzcZLpi4RlvOn0YCR77zwmAMXUNsoeYfELx/yv4IZpT1STux9cke5bkgNZ9
-EZY8zZwPb8K5u7JQ1If4/ZY+eGGpyytbQb8NbaaHcQZN9UHzpyzRSOykJrGesTvb
-IC7sKOtE3w/J385jW6Iy85iF0W5yKYceivIBdz4Hfcy3sBSHY6o+DDGPDsOFdjbd
-lus9J9qu2AFSjFGy7nXL2y2ySANpwFegTOF9sggED8BBKArvWBgrLOJ9
-                    
-            </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 c0b9a7c8..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ifap.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.ifap.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifap.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifap.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifap.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifap.edu.br:8443/idp/profile/SAML1/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">IFAP - Instituto Federal do Amapa</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFAP - Instituto Federal do Amapa</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFAP - Instituto Federal do Amapa</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifap.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifap.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Marco Pantoja</md:SurName>
-    <md:EmailAddress>marco.pantoja@ifap.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 18e5cdfc..00000000
--- a/swamid-interfederations-2.0/idp.ifap.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://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">www.ifap.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ifap.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </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>
-    <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">www.ifap.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">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 8be498be..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ifc.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.ifc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifc.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifc.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifc.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifc.edu.br:8443/idp/profile/SAML1/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">IFC - Instituto Federal Catarinense</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFC - Instituto Federal Catarinense</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFC - Instituto Federal Catarinense</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifc.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifc.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Renato de Souza Muniz</md:SurName>
-    <md:EmailAddress>infra@ifc.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 15e94c83..00000000
--- a/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://idp.ifpb.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxLTArBgNVBAoUJElGUEIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhw61iYTEMMAoGA1UECxMDRFRJMSwwKgYJ
-KoZIhvcNAQkBFh1hbGV4YW5kcmUuYWxtZWlkYUBpZnBiLmVkdS5icjEVMBMGA1UE
-BxQMSm/Do28gUGVzc29hMREwDwYDVQQIFAhQYXJhw61iYTELMAkGA1UEBhMCQlIx
-GDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjAeFw0xNTExMjcxOTQ3NDNaFw0xODEx
-MjYxOTQ3NDNaMIG8MS0wKwYDVQQKFCRJRlBCIC0gSW5zdGl0dXRvIEZlZGVyYWwg
-ZGEgUGFyYcOtYmExDDAKBgNVBAsTA0RUSTEsMCoGCSqGSIb3DQEJARYdYWxleGFu
-ZHJlLmFsbWVpZGFAaWZwYi5lZHUuYnIxFTATBgNVBAcUDEpvw6NvIFBlc3NvYTER
-MA8GA1UECBQIUGFyYcOtYmExCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAuaWZw
-Yi5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC86dKAJidm
-TFuVKDguITfO7pAFVrPQ5xTMuuTPfkaajstKL6G28CkK2ovAl8VYkIeH50nqc78i
-2F1kjrxvXYdUU2IiZzILUiuZ6aZDPbxVGWfY1LTenoijNcWFTSsqT8ExvCUqFhCz
-2VPy7bkR3d6jvMDTn+wRuudDzBMIS6XmTXNoqDMp1tTCTrPiKwEJAQDhMQHkXAVB
-IC0U4DuIcARLLqw8nQ73K83BfFlkdbdcwV4A8Y3fNCSTBTslKp9PzA694GdbsfQh
-SbXWQXdO7kI0P3JnyXuxsNvlX3EGdv5tvwPx/W9NXXDH7H99uMpdhUTS6W7rRqWm
-dKf78jPlAeZHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKXXg2ofZPRNfNF9COfu
-NlHawtVoCdWi92smA6LeMt7N9MvCkkpC8ZdwCc1ebS4XDW4wKf8vd30GrQ1qI2PQ
-BB6Iz9r4w3pNwBhSB0iBKRAkkTYLCI80R1ghjdoOO4PHYWxMhzM7Q683PhU0Zhmm
-WO4aOIsUZ6Nse4205I4r/mkxJNrfLtmBxJQGWwUxckFeP4OYipYt8v2lnSPkJOc6
-miCjubGUFtcp0AyIauaCBrDa5yXQC7G4aGsdUmLM9rkVOohfyo6+KXbBXBdH4ohp
-T8Co/9psHWaWH/nbbWkLPelRY7xBqyLbUwdAFj8W6v8BExWLWMJqSZq8A4eD02Ky
-sHw=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifpb.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifpb.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifpb.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxLTArBgNVBAoUJElGUEIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhw61iYTEMMAoGA1UECxMDRFRJMSwwKgYJ
-KoZIhvcNAQkBFh1hbGV4YW5kcmUuYWxtZWlkYUBpZnBiLmVkdS5icjEVMBMGA1UE
-BxQMSm/Do28gUGVzc29hMREwDwYDVQQIFAhQYXJhw61iYTELMAkGA1UEBhMCQlIx
-GDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjAeFw0xNTExMjcxOTQ3NDNaFw0xODEx
-MjYxOTQ3NDNaMIG8MS0wKwYDVQQKFCRJRlBCIC0gSW5zdGl0dXRvIEZlZGVyYWwg
-ZGEgUGFyYcOtYmExDDAKBgNVBAsTA0RUSTEsMCoGCSqGSIb3DQEJARYdYWxleGFu
-ZHJlLmFsbWVpZGFAaWZwYi5lZHUuYnIxFTATBgNVBAcUDEpvw6NvIFBlc3NvYTER
-MA8GA1UECBQIUGFyYcOtYmExCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAuaWZw
-Yi5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC86dKAJidm
-TFuVKDguITfO7pAFVrPQ5xTMuuTPfkaajstKL6G28CkK2ovAl8VYkIeH50nqc78i
-2F1kjrxvXYdUU2IiZzILUiuZ6aZDPbxVGWfY1LTenoijNcWFTSsqT8ExvCUqFhCz
-2VPy7bkR3d6jvMDTn+wRuudDzBMIS6XmTXNoqDMp1tTCTrPiKwEJAQDhMQHkXAVB
-IC0U4DuIcARLLqw8nQ73K83BfFlkdbdcwV4A8Y3fNCSTBTslKp9PzA694GdbsfQh
-SbXWQXdO7kI0P3JnyXuxsNvlX3EGdv5tvwPx/W9NXXDH7H99uMpdhUTS6W7rRqWm
-dKf78jPlAeZHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKXXg2ofZPRNfNF9COfu
-NlHawtVoCdWi92smA6LeMt7N9MvCkkpC8ZdwCc1ebS4XDW4wKf8vd30GrQ1qI2PQ
-BB6Iz9r4w3pNwBhSB0iBKRAkkTYLCI80R1ghjdoOO4PHYWxMhzM7Q683PhU0Zhmm
-WO4aOIsUZ6Nse4205I4r/mkxJNrfLtmBxJQGWwUxckFeP4OYipYt8v2lnSPkJOc6
-miCjubGUFtcp0AyIauaCBrDa5yXQC7G4aGsdUmLM9rkVOohfyo6+KXbBXBdH4ohp
-T8Co/9psHWaWH/nbbWkLPelRY7xBqyLbUwdAFj8W6v8BExWLWMJqSZq8A4eD02Ky
-sHw=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifpb.edu.br:8443/idp/profile/SAML1/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">IFPB - Instituto Federal da Paraiba</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFPB - Instituto Federal da Paraiba</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFPB - Instituto Federal da Paraiba</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifpb.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifpb.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Alexandre Almeida de Lucena</md:SurName>
-    <md:EmailAddress>alexandre.almeida@ifpb.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 5ae2df2d..00000000
--- a/swamid-interfederations-2.0/idp.ifpb.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://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">www.ifpb.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ifpb.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxLDAqBgNVBAoTI0lGUEIgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkYSBQYXJhaWJhMQwwCgYDVQQLEwNEVEkxKjAoBgkq
-hkiG9w0BCQEWG2pvc2UuY2F2YWxjYW50aUBpZnBiLmVkdS5icjEUMBIGA1UEBxML
-Sm9hbyBQZXNzb2ExEDAOBgNVBAgTB1BhcmFpYmExCzAJBgNVBAYTAkJSMRgwFgYD
-VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwMjA3MTc0NTAwWhcNMTcwMjA2MTc0
-NTAwWjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
-cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
-bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
-UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ5IlaQxWRUtbccktlNZQQB
-AWQi/f86zxT/f8ilpR8Lmss8W3TG3/U5L4MoscHCEQfOfBgAoQqxHsj8V1VDoL8B
-NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
-8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
-lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
-I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMNqyTJMIimM12wK6JgQkWAa1q1jB3uAD
-LHfqQIORHweF4cwYJS9EBTowKUr+afYuCEPTIiYtruc0Pb8TlNHI2rR+ydUqKBs9
-ztkvCQY9OaPTT+qd5wK6EfjXIBTsiaDgM3EVHS83UqWGEbUmBRpzymvsN3mZmJ6r
-feY8SJRtmnHUom0uDC1/pmoPJyjbajibkvOiarCFjcHNrEHQouRYpDkutFEErVfk
-SmAY5AgA2xGVuRQuFWzBPKUqgxUZz6f3leD5K8ACJ6pV7z9yfLM8Oks7vC7s+vqB
-Dr8XSTjmu3nlt6pZJDinmZJRGNtTajM6kWc0YWJPaO/+DdKBFS37gQ==
-            </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
-VQQDEw9pZHAuaWZwYi5lZHUuYnIwHhcNMTQwMjA3MTc0NTAwWhcNMTcwMjA2MTc0
-NTAwWjCBtzEsMCoGA1UEChMjSUZQQiAtIEluc3RpdHV0byBGZWRlcmFsIGRhIFBh
-cmFpYmExDDAKBgNVBAsTA0RUSTEqMCgGCSqGSIb3DQEJARYbam9zZS5jYXZhbGNh
-bnRpQGlmcGIuZWR1LmJyMRQwEgYDVQQHEwtKb2FvIFBlc3NvYTEQMA4GA1UECBMH
-UGFyYWliYTELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5pZnBiLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANZ5IlaQxWRUtbccktlNZQQB
-AWQi/f86zxT/f8ilpR8Lmss8W3TG3/U5L4MoscHCEQfOfBgAoQqxHsj8V1VDoL8B
-NfR6XAFqeWfKf8B8wcbX8CnNY9FZbgs2g1z2xsNQuAbFYunxUe3Y5A1xwH0aD04g
-8E4ubcEnLisB3an5zK/dWbGdBjUSuNADzgqbhftpFjZFPDi8DYezjYYxHUX5MNv6
-lb5/uQ7JjTWT3QssD0qG6pgNNANpQA8Jl2IWGb1qnNtjb9UbUPwYF2R6k4oXBFo+
-I2XW2cMUFvowftOpiNP/IrAAKIX0BGWuEtjL4VHoKvOtNwnikGw1DQYtUUvxNvkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMNqyTJMIimM12wK6JgQkWAa1q1jB3uAD
-LHfqQIORHweF4cwYJS9EBTowKUr+afYuCEPTIiYtruc0Pb8TlNHI2rR+ydUqKBs9
-ztkvCQY9OaPTT+qd5wK6EfjXIBTsiaDgM3EVHS83UqWGEbUmBRpzymvsN3mZmJ6r
-feY8SJRtmnHUom0uDC1/pmoPJyjbajibkvOiarCFjcHNrEHQouRYpDkutFEErVfk
-SmAY5AgA2xGVuRQuFWzBPKUqgxUZz6f3leD5K8ACJ6pV7z9yfLM8Oks7vC7s+vqB
-Dr8XSTjmu3nlt6pZJDinmZJRGNtTajM6kWc0YWJPaO/+DdKBFS37gQ==
-
-                    
-            </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">www.ifpb.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">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 737df1e2..00000000
--- a/swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ifremer.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">French Research Institute for Exploitation of the Sea</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.ifremer.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">IFREMER</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>
-					      MIIDIzCCAgugAwIBAgIUOIqkPXAt3sQ6YTpkVpANOLD+UnwwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLmlmcmVtZXIuZnIwHhcNMTUwMzI2MTI0NzI2WhcN
-MzUwMzI2MTE0NzI2WjAZMRcwFQYDVQQDEw5pZHAuaWZyZW1lci5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJrYUW43U4Y3lQNIvuWa/eSgraToesPK
-uVlAZBRGjigr7RXQmFmO5f0RS+sYC6WSLQnVy2JAstZaK+0mU3acO5fP2efkGPex
-0exMrk7q8aniouqpf3GJGFr12oMIm4L7Q2kA3dt1uNrX6Pmi8qr9DuH7qI9v9w9M
-T3TSuw4ckOTHS0n90e4IyEBGHF2fNjPwz+HyGWitfO8z8EY3arRESC6d36waQiwb
-4ihX5AtK5m8xuUswfhnWGWxCr/950KtEdCCBdPGPDofJ6UJk6e3PqpccHKT2fcs0
-mvQOW9+jGVaUJ5DuFzaAB0WAbxCu1mdoF4LZlaA6qdno5Zogov3mgZkCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLmlmcmVtZXIuZnKGJWh0dHBzOi8vaWRwLmlmcmVt
-ZXIuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFIqQvkBVgoKquZTJ7uCj1N0k
-E93+MA0GCSqGSIb3DQEBBQUAA4IBAQAsmJ2glUzXy8KVzB1lnKtOnOvH2LbQOE0k
-p8rOVoXFOFPsL5pHY0pCB647ClImVn6DkdcWmrq2acAw1b8IG6CqedMdpqVhwT0n
-ulijMVTD987oah+xj1TPSW+U7VSHDw1cx0KAKC6QQAKq8qIju9Oy7Dgl/FxnSb3i
-uU4gKDT2h2ygqY9keROeWZaAhsCdz5begn6E4ZfVcntHZbYhSKwZ5VwKa87xOzap
-B0qW+1N+EhA//tGc4457hCnKN/YTj2tVgIiH5WDBLZDLjUWhyjX0e7hVg2NvpGPr
-HMX9vyZ286HenUWfR1k+S712csAxIJihzyf/h4hC3Nh48HmYnWe8
-					    </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>
-					      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>
-    </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-POST" Location="https://idp.ifremer.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifremer.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifremer.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IFREMER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFREMER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifremer.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>David Joncourt</md:SurName>
-    <md:EmailAddress>david.joncourt@ifremer.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Patrick Bossard</md:SurName>
-    <md:EmailAddress>Patrick.Bossard@ifremer.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifs.org.uk-openathens.xml b/swamid-interfederations-2.0/idp.ifs.org.uk-openathens.xml
deleted file mode 100644
index 851cdbdf..00000000
--- a/swamid-interfederations-2.0/idp.ifs.org.uk-openathens.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.ifs.org.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for The Institute for Fiscal Studies.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">ifs.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ifs.org.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ifs.org.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute for Fiscal Studies</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifs.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</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 4f23d9d6..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ifsudestemg.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifsudestemg.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifsudestemg.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML1/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">IF Sudeste MG - Instituto Federal de Educacao, Ciencia e Tecnologia do Sudeste de Minas Gerais</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IF Sudeste MG - Instituto Federal de Educacao, Ciencia e Tecnologia do Sudeste de Minas Gerais</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifsudestemg.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifsudestemg.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Elder Marcelino</md:SurName>
-    <md:EmailAddress>elder.marcelino@ifsudestemg.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2df00787..00000000
--- a/swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://idp.ifto.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFTO - Instituto Federal do Tocantins</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFTO - Instituto Federal do Tocantins</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFTO - Instituto Federal do Tocantins</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFTO - Instituto Federal 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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xLjAsBgNVBAoTJUlGVE8gLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBUb2NhbnRpbnMxDDAKBgNVBAsTA0dUSTEiMCAG
-CSqGSIb3DQEJARYTcGFyZW50ZUBpZnRvLmVkdS5icjEPMA0GA1UEBxMGUGFsbWFz
-MRIwEAYDVQQIEwlUb2NhbnRpbnMxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAu
-aWZ0by5lZHUuYnIwHhcNMTUwNDE2MTUwNzEyWhcNMTgwNDE1MTUwNzEyWjCBrjEu
-MCwGA1UEChMlSUZUTyAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFRvY2FudGluczEM
-MAoGA1UECxMDR1RJMSIwIAYJKoZIhvcNAQkBFhNwYXJlbnRlQGlmdG8uZWR1LmJy
-MQ8wDQYDVQQHEwZQYWxtYXMxEjAQBgNVBAgTCVRvY2FudGluczELMAkGA1UEBhMC
-QlIxGDAWBgNVBAMTD2lkcC5pZnRvLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALL4yXMUcWh6FTF4lQk3AA6kuUlwHMhzXRNrD2hgzSZOFCfi
-sMgEGLE52GEZrtQyu/TTwwdsAd2wp8x3C24JOcJi+/aJ5uwhhORWlygmU7jH1A8D
-P7GI+Spv4lwjN2IDJbEFTkhQUO+TCFojxjfR9ogYl1agiI1IVaI1/GT3nBb2s4+d
-NxeR5sg2yuJKw8lvDQZhLiQpNJ4DdwtPhxYE81Q447tny0BloVjENt/0zgLaw5PY
-rW5AB2zwFni0ZayoalGd/X4OS013VlWXzzlNryHo3sHfbzdRIMQMjzHLwNDE0KUD
-a/namLQn4JeAh7UPQejJ3NA86UUDoi9MYLjtEo0CAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEARD657xlPwu3TOncmCBNQGYLIXr1WfeZcLxbU2WAZZtA5Y/esTt58xlt8
-QllL0GOKrS/JBMl/6E0OP0tZWq5A+3ERxmgzxLSe33MJ8ywZRSTexqrCop3TYHs5
-ezdOr4zxyZHX3300UVkP4nmtjGriRkcxpOKAo/T/DRLkFTeHsWufIkDSo4gaQpH9
-p0i71SOGIoP04RQ6StU3DYC+Ug+CuRVrkPGe2nj9/xwfr6yQ57SOAaucmbxC3wLP
-bOyvYzQg+nOb31kvM2UosnGcpLcVHT6Tgupu5je2Hq8oTgOFPLufjqEIp735x/Yh
-6KX9jDqVrd3n8FtVU0WA7kZ5Lz+EnQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.ifto.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifto.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifto.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifto.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xLjAsBgNVBAoTJUlGVE8gLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBUb2NhbnRpbnMxDDAKBgNVBAsTA0dUSTEiMCAG
-CSqGSIb3DQEJARYTcGFyZW50ZUBpZnRvLmVkdS5icjEPMA0GA1UEBxMGUGFsbWFz
-MRIwEAYDVQQIEwlUb2NhbnRpbnMxCzAJBgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAu
-aWZ0by5lZHUuYnIwHhcNMTUwNDE2MTUwNzEyWhcNMTgwNDE1MTUwNzEyWjCBrjEu
-MCwGA1UEChMlSUZUTyAtIEluc3RpdHV0byBGZWRlcmFsIGRvIFRvY2FudGluczEM
-MAoGA1UECxMDR1RJMSIwIAYJKoZIhvcNAQkBFhNwYXJlbnRlQGlmdG8uZWR1LmJy
-MQ8wDQYDVQQHEwZQYWxtYXMxEjAQBgNVBAgTCVRvY2FudGluczELMAkGA1UEBhMC
-QlIxGDAWBgNVBAMTD2lkcC5pZnRvLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALL4yXMUcWh6FTF4lQk3AA6kuUlwHMhzXRNrD2hgzSZOFCfi
-sMgEGLE52GEZrtQyu/TTwwdsAd2wp8x3C24JOcJi+/aJ5uwhhORWlygmU7jH1A8D
-P7GI+Spv4lwjN2IDJbEFTkhQUO+TCFojxjfR9ogYl1agiI1IVaI1/GT3nBb2s4+d
-NxeR5sg2yuJKw8lvDQZhLiQpNJ4DdwtPhxYE81Q447tny0BloVjENt/0zgLaw5PY
-rW5AB2zwFni0ZayoalGd/X4OS013VlWXzzlNryHo3sHfbzdRIMQMjzHLwNDE0KUD
-a/namLQn4JeAh7UPQejJ3NA86UUDoi9MYLjtEo0CAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEARD657xlPwu3TOncmCBNQGYLIXr1WfeZcLxbU2WAZZtA5Y/esTt58xlt8
-QllL0GOKrS/JBMl/6E0OP0tZWq5A+3ERxmgzxLSe33MJ8ywZRSTexqrCop3TYHs5
-ezdOr4zxyZHX3300UVkP4nmtjGriRkcxpOKAo/T/DRLkFTeHsWufIkDSo4gaQpH9
-p0i71SOGIoP04RQ6StU3DYC+Ug+CuRVrkPGe2nj9/xwfr6yQ57SOAaucmbxC3wLP
-bOyvYzQg+nOb31kvM2UosnGcpLcVHT6Tgupu5je2Hq8oTgOFPLufjqEIp735x/Yh
-6KX9jDqVrd3n8FtVU0WA7kZ5Lz+EnQ==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifto.edu.br:8443/idp/profile/SAML1/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">IFTO - Instituto Federal do Tocantins</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFTO - Instituto Federal do Tocantins</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFTO - Instituto Federal do Tocantins</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFTO - Instituto Federal do Tocantins</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifto.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifto.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Ronaldo</md:SurName>
-    <md:EmailAddress>parente@ifto.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6eb22eaf..00000000
--- a/swamid-interfederations-2.0/idp.ifto.edu.br.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: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>
-    MIIDkDCCAngCAQAwDQYJKoZIhvcNAQEFBQAwgY0xDTALBgNVBAoTBElGVE8xDDAK
-BgNVBAsTA0dUSTEiMCAGCSqGSIb3DQEJARYTcGFyZW50ZUBpZnRvLmVkdS5icjEP
-MA0GA1UEBxMGUGFsbWFzMRIwEAYDVQQIEwlUb2NhbnRpbnMxCzAJBgNVBAYTAkJS
-MRgwFgYDVQQDEw9pZHAuaWZ0by5lZHUuYnIwHhcNMTQwMTE3MjA1MjAyWhcNMTcw
-MTE2MjA1MjAyWjCBjTENMAsGA1UEChMESUZUTzEMMAoGA1UECxMDR1RJMSIwIAYJ
-KoZIhvcNAQkBFhNwYXJlbnRlQGlmdG8uZWR1LmJyMQ8wDQYDVQQHEwZQYWxtYXMx
-EjAQBgNVBAgTCVRvY2FudGluczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5p
-ZnRvLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMk8OtjD
-7xqhE4fSasaQ00hJN8q9KYF64KrLngwXtX8NfgP8bHXddjy+i/ibORZsM69m4vws
-EIEvLLrNdRXym8zcsXjJyuXpmRzlQ28PBNjEZNkcB8tXc7ffRv7YEVIdn6kGKCgx
-YlR725ijgrZrWBge7Xhi5Pnl8OXcHa3MtIfKTWo0yDqDRKA4WMJSB763kCxqyz+c
-xLQ0V/UJFqlOqBpeH5bc4IxRr4fgzRjVXG2Qt3Rf5JJUy05Stoq0qAuDg2Hv/K4i
-ZDjx6tvyeiyC3BDzV6YhEz5Pnka4g7vOxhQsmsqild3cdTiHk4+6dWZwbtd1tI9W
-HaD80/PqnNZW9isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAId/cw2kcfwoKbOmT
-6uCts+ILRJCbb0PHRDUFGUM8JHvaPNmggwYKn8K6VNAVQ2PixdBTaY3MpSTWvt9P
-sRImtkIRYhvFJt1cFivWJb61v5f2+Z2wWexCWl9rqhealb211Pq5lwvLxJ733+73
-2TPVMlpT700O8rf6Uk3PH1CUwxPE1bGwUqTpc5Wb5w0/YBF0Dym2YpKZX0x0L4FI
-p9zWF0hwXQ7h3bUokYWt7R/q0KbQmk/6jBOnegClXkwDB+kxiQMgXnVPVHAoaLeA
-LZyp51nAoUAqcTuXwh/aoe5BkI0SuWD5Z72N5xgJbnVxLFgJdd6tJAtkWmCDAOI6
-Lqis4w==
-            </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>
-      
-MIIDkDCCAngCAQAwDQYJKoZIhvcNAQEFBQAwgY0xDTALBgNVBAoTBElGVE8xDDAK
-BgNVBAsTA0dUSTEiMCAGCSqGSIb3DQEJARYTcGFyZW50ZUBpZnRvLmVkdS5icjEP
-MA0GA1UEBxMGUGFsbWFzMRIwEAYDVQQIEwlUb2NhbnRpbnMxCzAJBgNVBAYTAkJS
-MRgwFgYDVQQDEw9pZHAuaWZ0by5lZHUuYnIwHhcNMTQwMTE3MjA1MjAyWhcNMTcw
-MTE2MjA1MjAyWjCBjTENMAsGA1UEChMESUZUTzEMMAoGA1UECxMDR1RJMSIwIAYJ
-KoZIhvcNAQkBFhNwYXJlbnRlQGlmdG8uZWR1LmJyMQ8wDQYDVQQHEwZQYWxtYXMx
-EjAQBgNVBAgTCVRvY2FudGluczELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC5p
-ZnRvLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMk8OtjD
-7xqhE4fSasaQ00hJN8q9KYF64KrLngwXtX8NfgP8bHXddjy+i/ibORZsM69m4vws
-EIEvLLrNdRXym8zcsXjJyuXpmRzlQ28PBNjEZNkcB8tXc7ffRv7YEVIdn6kGKCgx
-YlR725ijgrZrWBge7Xhi5Pnl8OXcHa3MtIfKTWo0yDqDRKA4WMJSB763kCxqyz+c
-xLQ0V/UJFqlOqBpeH5bc4IxRr4fgzRjVXG2Qt3Rf5JJUy05Stoq0qAuDg2Hv/K4i
-ZDjx6tvyeiyC3BDzV6YhEz5Pnka4g7vOxhQsmsqild3cdTiHk4+6dWZwbtd1tI9W
-HaD80/PqnNZW9isCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAId/cw2kcfwoKbOmT
-6uCts+ILRJCbb0PHRDUFGUM8JHvaPNmggwYKn8K6VNAVQ2PixdBTaY3MpSTWvt9P
-sRImtkIRYhvFJt1cFivWJb61v5f2+Z2wWexCWl9rqhealb211Pq5lwvLxJ733+73
-2TPVMlpT700O8rf6Uk3PH1CUwxPE1bGwUqTpc5Wb5w0/YBF0Dym2YpKZX0x0L4FI
-p9zWF0hwXQ7h3bUokYWt7R/q0KbQmk/6jBOnegClXkwDB+kxiQMgXnVPVHAoaLeA
-LZyp51nAoUAqcTuXwh/aoe5BkI0SuWD5Z72N5xgJbnVxLFgJdd6tJAtkWmCDAOI6
-Lqis4w==
-
-                    
-            </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.ihe.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.xml
deleted file mode 100644
index 0cc155bd..00000000
--- a/swamid-interfederations-2.0/idp.ihe.nl-adfs-services-trust.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="http://idp.ihe.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-02-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">UNESCO-IHE Institute for Water Education</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">UNESCO-IHE Institute for Water Education</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">UNESCO-IHE Institute for Water Education</mdui:Description>
-        <mdui:Description xml:lang="en">UNESCO-IHE Institute for Water Education</mdui:Description>
-        <mdui:Logo height="100" width="108">https://static.surfconext.nl/logos/idp/unesco-ihe.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Research IHE UNESCO-IHE Institute for Water Education</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Research IHE UNESCO-IHE Institute for Water Education</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/67c13bb00741bc9f65da46d70bbad594"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">UNESCO-IHE Institute for Water Education</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">UNESCO-IHE Institute for Water Education</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">UNESCO-IHE Institute for Water Education</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">UNESCO-IHE Institute for Water Education</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.unesco-ihe.org/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unesco-ihe.org/</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/idp.iit.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml
deleted file mode 100644
index f6f72a2c..00000000
--- a/swamid-interfederations-2.0/idp.iit.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iit.cnr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-07-06T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.cnr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CNR Institute of Informatics and Telematics</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">CNR Istituto di Informatica e Telematica</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for CNR Institute of Informatics and Telematics users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR Istituto di Informatica e Telematica</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://idp.iit.cnr.it/idpservice.php</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.iit.cnr.it/en</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVANNctxDOg6xktyigLZGJNgH/9KDGMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5paXQuY25yLml0MB4XDTA5MDMwMjEwMDQ1OFoX
-DTI5MDMwMjEwMDQ1OFowGTEXMBUGA1UEAxMOaWRwLmlpdC5jbnIuaXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUU9hTCDxUfrFa+IsB4gTIYZCyDRau
-tXeow0NhSDYZrDBwYrc2CiuM26zz9N1TKx6Ap+8CXwQA0PXou+WdFCz1RTMJX+Uq
-kOCjAKN2HmoiDIrI5P2MsHKl+DPLd9Lvnob1dTCDYrWMnPNYBm0iuRDvU59RZWPE
-V9hiqKcKAmT3KB4Gt2SqbFoD3ML/VpZOzolak4/7qvV3/YmuBl82ekz1+w3Adbwy
-gNQsyILyw020F1lL2FDWji5LaUuMPqYzPKykZDWT6wnDw2fZ9j0XxmUCWHDKsUqR
-rbPei38Gy+jtToJ2kNQp7qwFW1C9pvP4PBqhq3gGu6QF1qOT8qTEYs8nAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5paXQuY25yLml0hiVodHRwczovL2lkcC5paXQu
-Y25yLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSkgwUVx8ERu+P2jzA6x8r6
-e9wUzTANBgkqhkiG9w0BAQUFAAOCAQEAVoMKYN2nyFAF9dsAV21/r9Gse2s4d/zJ
-4lVNUCJGrKvWkiUD9GKInX8TdqrQOW5bjjTB4ldkzrHKqVfi2sPDTfvscQ/4OM7w
-E6dsFiiTz71NrDQ2bYIplDqrpWNzRTs5hxXCKkXmGwCtWd9MWlb181qCFuKq+3u0
-Oygjy0U5YBCULsebWcg1GT5swQiRYtRuJkFDEnwQ79j91ceADPiQ+DeIdeBeK+Xz
-8eGhNrtn3uOLW2SCx5QBkfE5cBFYMPMSQLM5FaCetuZl6mePHuaj0IkpVQDJpYI6
-RS0HkZxnqxq0gCbYR4dSCVUR/8NFcO/jsQCEZIauvzx9bXt7vpBKSg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.cnr.it/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.cnr.it/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.cnr.it: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.iit.cnr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.cnr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iit.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.cnr.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVANNctxDOg6xktyigLZGJNgH/9KDGMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5paXQuY25yLml0MB4XDTA5MDMwMjEwMDQ1OFoX
-DTI5MDMwMjEwMDQ1OFowGTEXMBUGA1UEAxMOaWRwLmlpdC5jbnIuaXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUU9hTCDxUfrFa+IsB4gTIYZCyDRau
-tXeow0NhSDYZrDBwYrc2CiuM26zz9N1TKx6Ap+8CXwQA0PXou+WdFCz1RTMJX+Uq
-kOCjAKN2HmoiDIrI5P2MsHKl+DPLd9Lvnob1dTCDYrWMnPNYBm0iuRDvU59RZWPE
-V9hiqKcKAmT3KB4Gt2SqbFoD3ML/VpZOzolak4/7qvV3/YmuBl82ekz1+w3Adbwy
-gNQsyILyw020F1lL2FDWji5LaUuMPqYzPKykZDWT6wnDw2fZ9j0XxmUCWHDKsUqR
-rbPei38Gy+jtToJ2kNQp7qwFW1C9pvP4PBqhq3gGu6QF1qOT8qTEYs8nAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5paXQuY25yLml0hiVodHRwczovL2lkcC5paXQu
-Y25yLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSkgwUVx8ERu+P2jzA6x8r6
-e9wUzTANBgkqhkiG9w0BAQUFAAOCAQEAVoMKYN2nyFAF9dsAV21/r9Gse2s4d/zJ
-4lVNUCJGrKvWkiUD9GKInX8TdqrQOW5bjjTB4ldkzrHKqVfi2sPDTfvscQ/4OM7w
-E6dsFiiTz71NrDQ2bYIplDqrpWNzRTs5hxXCKkXmGwCtWd9MWlb181qCFuKq+3u0
-Oygjy0U5YBCULsebWcg1GT5swQiRYtRuJkFDEnwQ79j91ceADPiQ+DeIdeBeK+Xz
-8eGhNrtn3uOLW2SCx5QBkfE5cBFYMPMSQLM5FaCetuZl6mePHuaj0IkpVQDJpYI6
-RS0HkZxnqxq0gCbYR4dSCVUR/8NFcO/jsQCEZIauvzx9bXt7vpBKSg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CNR Institute of Informatics and Telematics</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">CNR Istituto di Informatica e Telematica</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.iit.cnr.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.iit.cnr.it/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:iit-idem@iit.cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 1465c255..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iit.it/idp/shibboleth">
-  <md: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>
-  </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">iit.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.it/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.it/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it: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.iit.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iit.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iit.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iit.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iit.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iit.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IIT - Istituto Italiano di Tecnologia</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IIT - Istituto Italiano di Tecnologia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IIT - Istituto Italiano di Tecnologia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">IIT - Istituto Italiano di Tecnologia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.iit.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.iit.it/en/home.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IIT-Service Desk ICT</md:GivenName>
-    <md:EmailAddress>mailto:ict_servicedesk@iit.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ijs.si-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.ijs.si-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 37e6770e..00000000
--- a/swamid-interfederations-2.0/idp.ijs.si-simplesaml-saml2-idp-metadata.php.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.ijs.si/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-02-10T13:02:29Z">
-      <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">ijs.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Jožef Stefan Institute</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Institut "Jožef Stefan"</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Jožef Stefan Institute</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet za Institut "Jožef Stefan"</mdui:Description>
-        <mdui:Keywords xml:lang="en">jsi ijs institut jozef stefan jožef štefan</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">ijs institut jožef stefan inštitut štefan</mdui:Keywords>
-        <mdui:Logo height="300" width="300">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.ijs.si/ijsw/JSI</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.ijs.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>MIIFEjCCA/qgAwIBAgICA7cwDQYJKoZIhvcNAQENBQAwMjELMAkGA1UEBhMCU0kxDzANBgNVBAoTBlNpR05FVDESMBAGA1UEAxMJU2lHTkVUIENBMB4XDTE0MTIyNDA5NDIzOVoXDTE1MTIyNDA5NDIzOVowTzELMAkGA1UEBhMCU0kxDzANBgNVBAoTBlNpR05FVDEMMAoGA1UEChMDSUpTMQwwCgYDVQQLEwNDTUkxEzARBgNVBAMTCmlkcC5panMuc2kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbVmKfNHpnoMMYrghY4J3HgNgfOYC/jMBQ8A2BN+5Pcv7ZVqi6FJYSVTLK4O0MKiYyKXLhtfNeQYBmaNIrSyvYs8MIPY3z6ZYx0/95lGxzbLn+6d5CKCRHgb/YG5vNl3DulrH72E7L8BpB0hN8wX0aol3O7a7nmlfppqG0ZWBUBNOj3GLE+G95ZXXYMLMWnLpexunyFHRl+YUR1kCCI/5KpcgIwm7Kpih1euvoCHX2ymRhDNvX+paKuGvkkZ1/TgwTmI0PNPYID6ivZPksRhuePxCUiMiGzaK6bQHNFzEL6dY/zj5sjlHh58qUQdOJJz22+CvMmG6+mugFdQzQZBxlAgMBAAGjggITMIICDzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGwDALBgNVHQ8EBAMCBPAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCYGCWCGSAGG+EIBDQQZFhdTZXJ2ZXItQ2xpZW50IG9mIFNpR05FVDAdBgNVHQ4EFgQUG8ciEAHI67SgQpfOh87RhaV2ZzQwWgYDVR0jBFMwUYAUycZzPLenA790qr88vutO7wFl5fGhNqQ0MDIxCzAJBgNVBAYTAlNJMQ8wDQYDVQQKEwZTaUdORVQxEjAQBgNVBAMTCVNpR05FVCBDQYIBADAnBgNVHREEIDAegRBjbWkuYWRtaW5AaWpzLnNpggppZHAuaWpzLnNpMBsGA1UdEgQUMBKBEHNpZ25ldC1jYUBpanMuc2kwGAYDVR0gBBEwDzANBgsrBgEEAfdQAwEBADA+BglghkgBhvhCAQQEMRYvaHR0cDovL3NpZ25ldC1jYS5panMuc2kvcHViL2NybC9zaWduZXQwMmNybC5jcmwwPgYJYIZIAYb4QgEDBDEWL2h0dHA6Ly9zaWduZXQtY2EuaWpzLnNpL3B1Yi9jcmwvc2lnbmV0MDJjcmwuY3JsMEAGA1UdHwQ5MDcwNaAzoDGGL2h0dHA6Ly9zaWduZXQtY2EuaWpzLnNpL3B1Yi9jcmwvc2lnbmV0MDJjcmwuY3JsMA0GCSqGSIb3DQEBDQUAA4IBAQCHeVajfooBA2/jSWyyZP9YHHdJcr3Va95+adILmO0G93bhx2JpqfybFjmN+8YJrcdPg6/Vn1VIhItMdpXwYcnHgqmRxYaSDHqa7AgjFmUTZcqhWQaVY/nqItGwW8AlvGYG36JR9xZNVAPtRyaq5nYWNGHrC3FJf47spgUO5AP6NlXe1QSMixJwCfHPgHwglQ4SvPr/97MNfx90ZyFpKFedpk2laWlYMD8sFxx2e1ZnRagANZNBfH531q4ISISCkLbdNuaV47soRFBXFIT7b2SDMV/pdi9jFcc6BZWPWm913RfG5JU9nHgldPcG93iLAHkPAxNKi/UU9T2s63FusE61</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>MIIFEjCCA/qgAwIBAgICA7cwDQYJKoZIhvcNAQENBQAwMjELMAkGA1UEBhMCU0kxDzANBgNVBAoTBlNpR05FVDESMBAGA1UEAxMJU2lHTkVUIENBMB4XDTE0MTIyNDA5NDIzOVoXDTE1MTIyNDA5NDIzOVowTzELMAkGA1UEBhMCU0kxDzANBgNVBAoTBlNpR05FVDEMMAoGA1UEChMDSUpTMQwwCgYDVQQLEwNDTUkxEzARBgNVBAMTCmlkcC5panMuc2kwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbVmKfNHpnoMMYrghY4J3HgNgfOYC/jMBQ8A2BN+5Pcv7ZVqi6FJYSVTLK4O0MKiYyKXLhtfNeQYBmaNIrSyvYs8MIPY3z6ZYx0/95lGxzbLn+6d5CKCRHgb/YG5vNl3DulrH72E7L8BpB0hN8wX0aol3O7a7nmlfppqG0ZWBUBNOj3GLE+G95ZXXYMLMWnLpexunyFHRl+YUR1kCCI/5KpcgIwm7Kpih1euvoCHX2ymRhDNvX+paKuGvkkZ1/TgwTmI0PNPYID6ivZPksRhuePxCUiMiGzaK6bQHNFzEL6dY/zj5sjlHh58qUQdOJJz22+CvMmG6+mugFdQzQZBxlAgMBAAGjggITMIICDzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGwDALBgNVHQ8EBAMCBPAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCYGCWCGSAGG+EIBDQQZFhdTZXJ2ZXItQ2xpZW50IG9mIFNpR05FVDAdBgNVHQ4EFgQUG8ciEAHI67SgQpfOh87RhaV2ZzQwWgYDVR0jBFMwUYAUycZzPLenA790qr88vutO7wFl5fGhNqQ0MDIxCzAJBgNVBAYTAlNJMQ8wDQYDVQQKEwZTaUdORVQxEjAQBgNVBAMTCVNpR05FVCBDQYIBADAnBgNVHREEIDAegRBjbWkuYWRtaW5AaWpzLnNpggppZHAuaWpzLnNpMBsGA1UdEgQUMBKBEHNpZ25ldC1jYUBpanMuc2kwGAYDVR0gBBEwDzANBgsrBgEEAfdQAwEBADA+BglghkgBhvhCAQQEMRYvaHR0cDovL3NpZ25ldC1jYS5panMuc2kvcHViL2NybC9zaWduZXQwMmNybC5jcmwwPgYJYIZIAYb4QgEDBDEWL2h0dHA6Ly9zaWduZXQtY2EuaWpzLnNpL3B1Yi9jcmwvc2lnbmV0MDJjcmwuY3JsMEAGA1UdHwQ5MDcwNaAzoDGGL2h0dHA6Ly9zaWduZXQtY2EuaWpzLnNpL3B1Yi9jcmwvc2lnbmV0MDJjcmwuY3JsMA0GCSqGSIb3DQEBDQUAA4IBAQCHeVajfooBA2/jSWyyZP9YHHdJcr3Va95+adILmO0G93bhx2JpqfybFjmN+8YJrcdPg6/Vn1VIhItMdpXwYcnHgqmRxYaSDHqa7AgjFmUTZcqhWQaVY/nqItGwW8AlvGYG36JR9xZNVAPtRyaq5nYWNGHrC3FJf47spgUO5AP6NlXe1QSMixJwCfHPgHwglQ4SvPr/97MNfx90ZyFpKFedpk2laWlYMD8sFxx2e1ZnRagANZNBfH531q4ISISCkLbdNuaV47soRFBXFIT7b2SDMV/pdi9jFcc6BZWPWm913RfG5JU9nHgldPcG93iLAHkPAxNKi/UU9T2s63FusE61</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ijs.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.ijs.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Inštitut Jožef Stefan (IJS)</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Inštitut Jožef Stefan (IJS)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Inštitut Jožef Stefan (IJS)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Inštitut Jožef Stefan (IJS)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ijs.si/ijsw/JSI</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.ijs.si/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jadran</md:GivenName>
-    <md:SurName>Lenarčič</md:SurName>
-    <md:EmailAddress>mailto:jadran.lenarcic@ijs.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@ijs.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mark</md:GivenName>
-    <md:SurName>Martinec</md:SurName>
-    <md:EmailAddress>mailto:mark.martinec@ijs.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Jona Javoršek</md:SurName>
-    <md:EmailAddress>mailto:jona.javorsek@ijs.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Jona Javoršek</md:SurName>
-    <md:EmailAddress>mailto:jona.javorsek@ijs.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ill.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ill.fr-idp-shibboleth.xml
deleted file mode 100644
index d2bf5be7..00000000
--- a/swamid-interfederations-2.0/idp.ill.fr-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.ill.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-03T13:42:22Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ill.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ill.eu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institut Laue-Langevin</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAACcdkwA1MKsAMSabADk4twApIp0APTy7ADc0swAvKqUALyKXACkgmQA7OrsALyWbADUyrwAxKJ8APz69ADMlmQA7OLcAOTa1ADUtpQAxJJkAKR+VADcwqwA/Pb0AMSypAC0hlwAzKZ8AKR6VADUxrwAxJ58APT29ADc1swArIJUAPTq5ADcyrQA/P78AOzm3ADElmQAxLakAJx6VADUxrQAzJpkAOTm5AC0ilwA9PL0ALyOXAC8lnQA1MrEAMSihAD8+vwA5N7UAMymhADc1tQArIJcAPTu7ADs5uQAxJZsAMS2rAAAAMUAAAASAAAAAAA4AJgAAMWQAAASSgAAAAAAeAJmAAEkAAAA9wAAAHcAANQ3BADHKMYAEvQSAAB3AADmoNgAK2/FAOX7EgB3dwAANIaWAABGUgAA9E0AwHcAAPh+sgBbRv8AFPT/AAB3/wAAAAAAAAAAAAAAAAAAAAAAXAi5AAACjwBQAEoAAAAAAHIIWAAAYPQAbxgSAAAAAABntk4AAMUAAHISAAAAAAAAYQAEAAAAxgBtABIAAAAAACAA2AAAAMUARgASAAAAAABpTvMAAAAZAGwA5QAAAHcAZUMAAAA6AABzXAAAAEQAAPtvKAAzY+QA5XUVAHdtAAAAZf8AAG7/AAB0/wAAc/8AKCAAAORhAAAVbgAAAGQAACggAADkUwAAFWUAAAB0AAAAdAAA4GkAABVuAAAAZwAAAHNqAOBcAAAVQQAAAGQAAABtUAAAaQMAAG4AAABpAAAHc7gAAHRiAAByFAAAYQAAAHRkAMZlIgASdeUAAHJ3AABcAAAATQEAAGUAAABzAAAA/LgAAMRiAAASAQAAAAAAAJUAAAAsAAAA5RQAAHcAAAAALAAAAMMAAAASAAAAAABUAAAAFwAAAOUAAAB3AAAATrjwAABi+gAAFBIAAAAAAP80AgD/1iQA//T3AP93dwBO8/gAABlUAADl9gAAd3cAWAD/APQA/wASAP8AAAD/AAAojQAA5BYAABX0AAAAdwAkACEAxgAeABIA5QAAAHcA2OAAAGDEAABKEhQAAAAAAAQAAADGAAAAEgAAAAAAAACX8LgAUvpiAE0SFAAAAAAAOAIAAMYkAQAS9wAAAHcAAADwHAAAdxgAAPbmAAB3dwCu/wAAxv8AABL/AAAA/wAAsDQEAP/WAAD/9AAAf3cAAGDzAwDGGQAAEuUAAAB3AADzAAAAGQAAAOUAAAB3AAAAANQAAAB3AAAA5AAAAHcAAPMABAAZAAAA5QAAAHcAAAABMAMAAAAAAAAAAAAAdwAANWAEAHHFAABGEgAAAAAAAGAwAgDGxQAAEhIAAAAAAABgAwAAxk0AABIFAAAAAQAAKA8oDygPKA8oDygPKA8oDygoKCgoKCgoKCgoKCgoKCgoDygPKA8oDygPKA8oDygPKCgoKCgoKCgoKCgoKCgoKCw0GhoaJhoAAAAAABQYEyghIiIKBBAiMC42IiIbNAgoMiIiIhcKIjAbCiIiJQAqKBMgIjAeESIiLhAiIhsmHygTASIiNgwiIikMIiIWCRQoJBkgNSkXFiIWFzAiIgcmKA8LAQYGOAMiIjMGIiIQGigPExIwDh0nIiIdDDAiBQ0oKA83GQ0cCxkcHDcNDRwLKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgPJCQTExMTExMTExMTJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ill.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Institut Laue-Langevin staff</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Institut Laue-Langevin</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnel de l' Institut Laue-Langevin</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>
-					      MIIDJDCCAgygAwIBAgIVAPh1tLy+FaH+WftVWsG4GWw7G8FgMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDmlkcHNoaWIuaWxsLmZyMB4XDTE2MDEyMDEyMjMyOFoX
-DTM2MDEyMDEyMjMyOFowGTEXMBUGA1UEAwwOaWRwc2hpYi5pbGwuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdeEdx5Pnx0T/kATDfudIdkBpDUiOf
-p6Mr9e79VhIm/Wy2X3Jm6kR9dGZMSUkUwsoKTe12L9RqmWBbc11C87Ug3C08+fXF
-EEBImeNAFqHkaal6YEClbwQYcL+YjJvK5zOdFxGTsWCqppp8rT4Uh/Jyx6brCUSm
-MVXYY9yspiWLhr5szy/1yIaLP+ZXgQjMEQWrJIex62N9GlXj4Lu1kHqaC7Oa+iOQ
-bxPN3V4x/MttDoxsXcOboP8UgudKIjlo3ODYC1Iw1Lv8aSET3BH+LljvYBNkOc76
-jF/pokZfNecyIwDRdKomSSwyvOJEWbekApBL5NWh6M5usE4UbknmqhH7AgMBAAGj
-YzBhMB0GA1UdDgQWBBSbwf8yBKxR3J/O/1BD/ZMGMvsdSzBABgNVHREEOTA3gg5p
-ZHBzaGliLmlsbC5mcoYlaHR0cHM6Ly9pZHBzaGliLmlsbC5mci9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAV9aMRpuOeaRTrWaCv0yyVomMU+BO9JAD
-vDb24KxeOiTiZ0Hl8cbF3lckBsA38eXegIkWkprQyNlsu4lAAd+11ocj6iLr2cYu
-oomeohlNkcYvxGOQEdbMz0jkyvWHgy7A8JvgQJE8qJjKQHpt2axMAe9S4Pg2V5dr
-tjuEqopY4pc6Sp7DQaw4YxFhu+cxfrcRgAeRlyW2i9x0m5ZmKMdvmbJd0q8oScTN
-2FmYHprUiwFwHtlGuM8fKyB3Bv0Ys+F3ux5OfxWNykRV5hFwFtdEr1uiaClt9AHD
-E0ardMDf+phlxOcVQexaMrV2+3E+1Y12S/6z761q8J2WqyTX/KYsEQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ill.fr/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ill.fr/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ill.fr/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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ill.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ill.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ill.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institut Laue-Langevin</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institut Laue-Langevin</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ill.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Fabien Pinet</md:SurName>
-    <md:EmailAddress>pinet@ill.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean-François Perrin</md:SurName>
-    <md:EmailAddress>perrin@ill.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e3239906..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.img.cas.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.img.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.img.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.img.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.img.cas.cz/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">img.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.img.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.img.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IMG</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Molecular Genetics of the ASCR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav molekulární genetiky AV ČR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.img.cas.cz/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.img.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michal</md:GivenName>
-    <md:SurName>Zacek</md:SurName>
-    <md:EmailAddress>michal.zacek@img.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 474533e1..00000000
--- a/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inalco.fr/idp">
-  <md: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>
-  </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 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="en">INALCO - Institut National des Langues et Civilisations Orientales</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAxElEQVQoz2P8//8/AymAiSTV5GhgkZ78ijQNz778pbGTKix5sEqwMjH8+suw8vr3Bx+hTmBiZAhU42Bpd+DFZdj0c9/e//gH56boc3U48rLgUj35zNeqg5+//ILGkrsSe401jyAHExYNb7//m3PxW+vRL3DVXsrs/S58snzMDAwMWDQce/Kr+sDnv7AEEKTOMcWNX5KHCWcomUuzlZjzsDEzMjAw+KmiqGZgYGD4jw38/vu/8/jn4LXvHnz4gybFOPgSHwDBT2gg9JyRSwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowMiswMjowMEOn0x8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDIrMDI6MDAy+mujAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://inalco.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">INALCO - Institut National des Langues et Civilisations Orientales</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>
-					      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>
-    </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-POST" Location="https://idp.inalco.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inalco.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inalco.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INALCO - Institut National des Langues et Civilisations Orientales</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INALCO - Institut National des Langues et Civilisations Orientales</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://inalco.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>ldap-adm@inalco.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.incommonfederation.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.incommonfederation.org-idp-shibboleth.xml
deleted file mode 100644
index 21f0b75c..00000000
--- a/swamid-interfederations-2.0/idp.incommonfederation.org-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://idp.incommonfederation.org/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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/hide-from-discovery</saml:AttributeValue>
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</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">incommonfederation.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">incommon.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">InCommon Operations</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>
-MIIDQzCCAiugAwIBAgIBADANBgkqhkiG9w0BAQQFADAlMSMwIQYDVQQDExppZHAu
-aW5jb21tb25mZWRlcmF0aW9uLm9yZzAeFw0xMjA4MjcyMDUyMzFaFw0yMjA4MjUy
-MDUyMzFaMCUxIzAhBgNVBAMTGmlkcC5pbmNvbW1vbmZlZGVyYXRpb24ub3JnMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt+GeQ4P+Zj5FoWT/4EpmKRSN
-ZQ1dNgYvMZDPLpfEbY6Ugumn9CjZeTOXS678k7o83Otrzk1fWzjenOGRDnvSasgE
-FASa5ZFYOfG/7IsAvta1IE/TQsFQ3I79IU53lGSpNFoE+5n56sNii1IGYc8vnkDa
-YKfyaOd6jESVjDOP7kh9Fs6lAe/bnpJhmAzXEgFtg48ABPDuC3CMQkXhNmMz822Z
-T2LGnxACgqYIJRRzoC+NMnHH4sp4c+mBNvVIrEkn4YUKUVLuXoGpS7NKURyrDfcF
-sZ7iXaEA58JgFUfEK9enE6f7UAI28aYzNm4OpZmNA3+XuPuiG+7juxJci39umQID
-AQABo34wfDAdBgNVHQ4EFgQU8BBxA91k1pP0f/luBTRl3sPNQNIwTQYDVR0jBEYw
-RIAU8BBxA91k1pP0f/luBTRl3sPNQNKhKaQnMCUxIzAhBgNVBAMTGmlkcC5pbmNv
-bW1vbmZlZGVyYXRpb24ub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE
-BQADggEBAIMEpWyaYAfJZsULpiJqFjkNACXpQmLIEVCudv4U7xxHi9wnlAFHc3zM
-ArolddB+y8ff9DorJNe2OM9+Xi39vtVkV8eqspmhJL4iW0uXcHeD+02z0w8JySGv
-IsdNGAFeVZn/1v9+nv34z8rvnfFDvP5kfyL2xXeV0rn9ChD/utvf3C0+6HvT1Zls
-1AG71uT/nnMWTGj7xg2rP9+bxVlZLpWliArevXac0/OjOOKQp8x6n+DHE0NVSENK
-5QOJmNi7uAS1xr5AvbV8eVrOGtqemGVlSxJAtjG7DStzfLGDoMKOR5NkBmUzK+8i
-FZHt70mZqw2O8mIkp6DuO+EJLYkB1/4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.incommonfederation.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.incommonfederation.org/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.incommonfederation.org/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.incommonfederation.org/idp/profile/SAML2/SOAP/ECP"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.incommonfederation.org/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">incommonfederation.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">incommon.org</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQzCCAiugAwIBAgIBADANBgkqhkiG9w0BAQQFADAlMSMwIQYDVQQDExppZHAu
-aW5jb21tb25mZWRlcmF0aW9uLm9yZzAeFw0xMjA4MjcyMDUyMzFaFw0yMjA4MjUy
-MDUyMzFaMCUxIzAhBgNVBAMTGmlkcC5pbmNvbW1vbmZlZGVyYXRpb24ub3JnMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt+GeQ4P+Zj5FoWT/4EpmKRSN
-ZQ1dNgYvMZDPLpfEbY6Ugumn9CjZeTOXS678k7o83Otrzk1fWzjenOGRDnvSasgE
-FASa5ZFYOfG/7IsAvta1IE/TQsFQ3I79IU53lGSpNFoE+5n56sNii1IGYc8vnkDa
-YKfyaOd6jESVjDOP7kh9Fs6lAe/bnpJhmAzXEgFtg48ABPDuC3CMQkXhNmMz822Z
-T2LGnxACgqYIJRRzoC+NMnHH4sp4c+mBNvVIrEkn4YUKUVLuXoGpS7NKURyrDfcF
-sZ7iXaEA58JgFUfEK9enE6f7UAI28aYzNm4OpZmNA3+XuPuiG+7juxJci39umQID
-AQABo34wfDAdBgNVHQ4EFgQU8BBxA91k1pP0f/luBTRl3sPNQNIwTQYDVR0jBEYw
-RIAU8BBxA91k1pP0f/luBTRl3sPNQNKhKaQnMCUxIzAhBgNVBAMTGmlkcC5pbmNv
-bW1vbmZlZGVyYXRpb24ub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEE
-BQADggEBAIMEpWyaYAfJZsULpiJqFjkNACXpQmLIEVCudv4U7xxHi9wnlAFHc3zM
-ArolddB+y8ff9DorJNe2OM9+Xi39vtVkV8eqspmhJL4iW0uXcHeD+02z0w8JySGv
-IsdNGAFeVZn/1v9+nv34z8rvnfFDvP5kfyL2xXeV0rn9ChD/utvf3C0+6HvT1Zls
-1AG71uT/nnMWTGj7xg2rP9+bxVlZLpWliArevXac0/OjOOKQp8x6n+DHE0NVSENK
-5QOJmNi7uAS1xr5AvbV8eVrOGtqemGVlSxJAtjG7DStzfLGDoMKOR5NkBmUzK+8i
-FZHt70mZqw2O8mIkp6DuO+EJLYkB1/4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.incommonfederation.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">InCommon LLC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">InCommon Operations</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.incommon.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tech Support</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml
deleted file mode 100644
index 7130d1b4..00000000
--- a/swamid-interfederations-2.0/idp.infn.it-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,174 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.infn.it/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-28T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">INFN - National Institute for Nuclear Physics</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'INFN</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for INFN users</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://web.infn.it/CCR/index.php/i-progetti/aai/federazione-idem</mdui:InformationURL>
-        <mdui:Logo height="79" width="80" xml:lang="it">https://idp.infn.it/utils/infnLogo80x80.png</mdui:Logo>
-        <mdui:Logo height="79" width="80" xml:lang="en">https://idp.infn.it/utils/infnLogo80x80.png</mdui:Logo>
-        <mdui:Logo height="15" width="16" xml:lang="it">https://idp.infn.it/utils/infnLogo16x16.png</mdui:Logo>
-        <mdui:Logo height="15" width="16" xml:lang="en">https://idp.infn.it/utils/infnLogo16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">infn.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDtTCCAp2gAwIBAgIJAOU29OWoolW3MA0GCSqGSIb3DQEBBQUAMEUxFDASBgNV
-BAMTC2lkcC5pbmZuLml0MREwDwYDVQQLEwhJTkZOLUFBSTENMAsGA1UEChMESU5G
-TjELMAkGA1UEBhMCSVQwHhcNMTQwNDE0MTQ1NzI2WhcNNDEwODI5MTQ1NzI2WjBF
-MRQwEgYDVQQDEwtpZHAuaW5mbi5pdDERMA8GA1UECxMISU5GTi1BQUkxDTALBgNV
-BAoTBElORk4xCzAJBgNVBAYTAklUMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAxTXQ7OFlyqDxcDkdUgPXtKrHw2vUkKuGkEMpQrrK/PU/emzT13Jualti
-38jV4NTSBSIXc7P3PTTUsfnk3o+IAej1JKNlQ2klqFDvPiwl9sKFh4Pd66K0g6eb
-GunsRZtR5LJLMJrrqOhRiLZdAcJzB4RxZsqSYxz0EDw6S5r6w6Sgm4xiupviC9gI
-NAzpTkjFR78dbJ7fDzvvVUXxPz1T4awL01RCt0s/05fHeWM1I4cPjoVSB0t6wzv0
-CfaWWlid3I6yyFWiFYeVGvn7eeqhvRckthumYOayL18Ri+S2vxYkDqDcY6b6y2OW
-YhFZ1VTosUoUBPhwXyCYYJ2wAmi2VwIDAQABo4GnMIGkMB0GA1UdDgQWBBROEkiq
-rjIVFsHZKsnYbh+xPNmilDB1BgNVHSMEbjBsgBROEkiqrjIVFsHZKsnYbh+xPNmi
-lKFJpEcwRTEUMBIGA1UEAxMLaWRwLmluZm4uaXQxETAPBgNVBAsTCElORk4tQUFJ
-MQ0wCwYDVQQKEwRJTkZOMQswCQYDVQQGEwJJVIIJAOU29OWoolW3MAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALVVWVWP9nrWlmU37KbTE3kuqJWptGma
-DS2uuOg5RN5lGevQvVu4cac23qaZZ+TN+b6WDXuhEfmVJzBYczxByVeGEvew0fHg
-RRMZLqST6j2gyb89qzNNFyTcyRZ/5Z7jXWjrnDp3pOLNvrr9BhVojoC2F7EYjSdd
-dwq2pb++9FiHglwSTl5WV+V4ZuNUMemY8jzhqayOK6UuwdL61UE4dPGKnlCgMaiY
-VST86HkiqFh9oOJ8D6jtlk695pRaz1h3ajxwB9zOa2VAWEsi40P2tZIzY3ek25wT
-M2vuvHO4YsOmkAOxj2Wk/itj5MnK1tT0u840b61Q/j4SJGuKLe4Tzzg=
-</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>
-MIIDtTCCAp2gAwIBAgIJAOU29OWoolW3MA0GCSqGSIb3DQEBBQUAMEUxFDASBgNV
-BAMTC2lkcC5pbmZuLml0MREwDwYDVQQLEwhJTkZOLUFBSTENMAsGA1UEChMESU5G
-TjELMAkGA1UEBhMCSVQwHhcNMTQwNDE0MTQ1NzI2WhcNNDEwODI5MTQ1NzI2WjBF
-MRQwEgYDVQQDEwtpZHAuaW5mbi5pdDERMA8GA1UECxMISU5GTi1BQUkxDTALBgNV
-BAoTBElORk4xCzAJBgNVBAYTAklUMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAxTXQ7OFlyqDxcDkdUgPXtKrHw2vUkKuGkEMpQrrK/PU/emzT13Jualti
-38jV4NTSBSIXc7P3PTTUsfnk3o+IAej1JKNlQ2klqFDvPiwl9sKFh4Pd66K0g6eb
-GunsRZtR5LJLMJrrqOhRiLZdAcJzB4RxZsqSYxz0EDw6S5r6w6Sgm4xiupviC9gI
-NAzpTkjFR78dbJ7fDzvvVUXxPz1T4awL01RCt0s/05fHeWM1I4cPjoVSB0t6wzv0
-CfaWWlid3I6yyFWiFYeVGvn7eeqhvRckthumYOayL18Ri+S2vxYkDqDcY6b6y2OW
-YhFZ1VTosUoUBPhwXyCYYJ2wAmi2VwIDAQABo4GnMIGkMB0GA1UdDgQWBBROEkiq
-rjIVFsHZKsnYbh+xPNmilDB1BgNVHSMEbjBsgBROEkiqrjIVFsHZKsnYbh+xPNmi
-lKFJpEcwRTEUMBIGA1UEAxMLaWRwLmluZm4uaXQxETAPBgNVBAsTCElORk4tQUFJ
-MQ0wCwYDVQQKEwRJTkZOMQswCQYDVQQGEwJJVIIJAOU29OWoolW3MAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALVVWVWP9nrWlmU37KbTE3kuqJWptGma
-DS2uuOg5RN5lGevQvVu4cac23qaZZ+TN+b6WDXuhEfmVJzBYczxByVeGEvew0fHg
-RRMZLqST6j2gyb89qzNNFyTcyRZ/5Z7jXWjrnDp3pOLNvrr9BhVojoC2F7EYjSdd
-dwq2pb++9FiHglwSTl5WV+V4ZuNUMemY8jzhqayOK6UuwdL61UE4dPGKnlCgMaiY
-VST86HkiqFh9oOJ8D6jtlk695pRaz1h3ajxwB9zOa2VAWEsi40P2tZIzY3ek25wT
-M2vuvHO4YsOmkAOxj2Wk/itj5MnK1tT0u840b61Q/j4SJGuKLe4Tzzg=
-</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>
-MIIEZDCCA0ygAwIBAgIRAJtYpZkrXh+6+4/H9lRGN+gwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzExMDcwMDAwMDBaFw0xNjEyMDMyMzU5NTlaMDkxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UEAxMLaWRwLmluZm4u
-aXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEhXjZzNhibw+wWO18
-a1xsZv+SwEKvfLeDcS+wmkkjt537rJmVJH3NMGRQHxlADQ4VIJHXi5rC7R3tQjHi
-gcxoitPryb02DsrpTz8wNbqF6cY5I02xV2gDjvVZIjBUFEzH2Qq2AvZDlSv2pINk
-AW8NALfk5M8j6yukd35Wxm+EugwlAEaYnGyE7dHpM3AyFJlK+yp0guh1YwGVz4LT
-xI23eHNsdxiJmDSq2ac57D6tmQgUuzj/s5PJOP9n8wDK3YXc48RW8UwQXDxP/o8U
-Wo+ZkcAeNYVpeaSyme2Do/us36Vtk44mL13Sh5MjAplSC2rJdSD2V62eomgTZxsr
-X62BAgMBAAGjggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
-7TAdBgNVHQ4EFgQUvAzDM5m+wp/rK4ScoCezlzF27i8wDgYDVR0PAQH/BAQDAgWg
-MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
-A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
-oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
-CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
-cy50ZXJlbmEub3JnMBYGA1UdEQQPMA2CC2lkcC5pbmZuLml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQBclu01pFdY9/QUnNh89d5BuYj/4Rd9JG8cjTnzjU1+Zb+QHSmUNlk0
-15vebyx30FjbnnCH8NBpiPMG63osofR3Bp098yqV1+W9MGekflromp9mF5w098xL
-313ysJX+29u9uDIWYiQhEYASOxbsubAwX0EZaPL1mwFJVsXzYVTKbrFBHpRthU1c
-6njn9Aks4jqeE30Md3nA720jkc3gjcYU4t0eI/m2dVsTwfnwTJh7SjXS2GrzsNU1
-cDhA29FRWYWUwT0z3fA1EDvmYpfP926yoYcrrwguDJzz7BVjMKsHLD/jn8zb3W0v
-jp7JtavGgA6UwGLX5KnnpPeICQozxORx
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.infn.it/saml2/idp/ArtifactResolutionService.php" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.infn.it/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.infn.it/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDtTCCAp2gAwIBAgIJAOU29OWoolW3MA0GCSqGSIb3DQEBBQUAMEUxFDASBgNV
-BAMTC2lkcC5pbmZuLml0MREwDwYDVQQLEwhJTkZOLUFBSTENMAsGA1UEChMESU5G
-TjELMAkGA1UEBhMCSVQwHhcNMTQwNDE0MTQ1NzI2WhcNNDEwODI5MTQ1NzI2WjBF
-MRQwEgYDVQQDEwtpZHAuaW5mbi5pdDERMA8GA1UECxMISU5GTi1BQUkxDTALBgNV
-BAoTBElORk4xCzAJBgNVBAYTAklUMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAxTXQ7OFlyqDxcDkdUgPXtKrHw2vUkKuGkEMpQrrK/PU/emzT13Jualti
-38jV4NTSBSIXc7P3PTTUsfnk3o+IAej1JKNlQ2klqFDvPiwl9sKFh4Pd66K0g6eb
-GunsRZtR5LJLMJrrqOhRiLZdAcJzB4RxZsqSYxz0EDw6S5r6w6Sgm4xiupviC9gI
-NAzpTkjFR78dbJ7fDzvvVUXxPz1T4awL01RCt0s/05fHeWM1I4cPjoVSB0t6wzv0
-CfaWWlid3I6yyFWiFYeVGvn7eeqhvRckthumYOayL18Ri+S2vxYkDqDcY6b6y2OW
-YhFZ1VTosUoUBPhwXyCYYJ2wAmi2VwIDAQABo4GnMIGkMB0GA1UdDgQWBBROEkiq
-rjIVFsHZKsnYbh+xPNmilDB1BgNVHSMEbjBsgBROEkiqrjIVFsHZKsnYbh+xPNmi
-lKFJpEcwRTEUMBIGA1UEAxMLaWRwLmluZm4uaXQxETAPBgNVBAsTCElORk4tQUFJ
-MQ0wCwYDVQQKEwRJTkZOMQswCQYDVQQGEwJJVIIJAOU29OWoolW3MAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALVVWVWP9nrWlmU37KbTE3kuqJWptGma
-DS2uuOg5RN5lGevQvVu4cac23qaZZ+TN+b6WDXuhEfmVJzBYczxByVeGEvew0fHg
-RRMZLqST6j2gyb89qzNNFyTcyRZ/5Z7jXWjrnDp3pOLNvrr9BhVojoC2F7EYjSdd
-dwq2pb++9FiHglwSTl5WV+V4ZuNUMemY8jzhqayOK6UuwdL61UE4dPGKnlCgMaiY
-VST86HkiqFh9oOJ8D6jtlk695pRaz1h3ajxwB9zOa2VAWEsi40P2tZIzY3ek25wT
-M2vuvHO4YsOmkAOxj2Wk/itj5MnK1tT0u840b61Q/j4SJGuKLe4Tzzg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.infn.it/shib13/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">INFN - National Institute for Nuclear Physics</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">INFN - National Institute for Nuclear Physics</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.infn.it/index.php?lang=it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.infn.it/index.php?lang=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:aai-support@lists.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Enrico Maria Vincenzo</md:GivenName>
-    <md:SurName>Fasanelli</md:SurName>
-    <md:EmailAddress>mailto:Enrico.M.V.Fasanelli@le.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dael</md:GivenName>
-    <md:SurName>Maselli</md:SurName>
-    <md:EmailAddress>mailto:Dael.Maselli@lnf.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Claudio</md:GivenName>
-    <md:SurName>Grandi</md:SurName>
-    <md:EmailAddress>mailto:Claudio.Grandi@bo.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9cf82865..00000000
--- a/swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inha.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">INHA - Institut National de l'Histoire de l'Art</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA5ElEQVQoz92RwUpCURCG/zlzjmhouBNcC5ELERctgkvgRugJfI/eobeqpdKiwkgI2thCaCeSZXrmnGkheLUucdv2rYZhPv4ZhlQVf8GmZRB5vJXxfZy+QCMAqlS5ceySHhVL6Zju4tfhdbq4vJh1G/N+4kc38f1N9zH7ec7U6oWkB1fgo5ZtndBB+dtKJmPNYonY0mE184YMgQyDiJjzCr/zXwXVzT/zCupXCAGfy3yCSHh60PUqTJ51PvspUBodo4zv/PDKD67xsQBbbrZd59SdnVO5kiUAEAEb0E6seLAF0bbxBWW5bejS9CznAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAzKzAyOjAw5dDYqwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMyswMjowMJSNYBcAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.inha.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">INHA - Institut National de l'Histoire de l'Art</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>
-					      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>
-    </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-POST" Location="https://idp.inha.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inha.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inha.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INHA - Institut National de l'Histoire de l'Art</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INHA - Institut National de l'Histoire de l'Art</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.inha.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>admin@inha.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 24d0f905..00000000
--- a/swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.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.inp-toulouse.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">INPT - Institut National Polytechnique de Toulouse</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACJ0lEQVQoz5VSS09TYRA9833fvb29jX1YLRFu0YILwcSAqKQrYxdiWKtrY/xRBBBfIYZI2GnciHFFFHCvFE1/gUjbe2/7PcZFSX3snExmMedMMnPm0NLT51PvPtRebDkEBAMYgiUYINY4HZ+vJrUojka6hUK3WOhWzigAUmuHTnuiFk9G3epoJ5/vlkqdSlnnQgDE/FeurK4xs/Z9IvoHAzMAZoBAOAkBQEpZkFL1epSm0hhhLTmn+33nHAAhIIjSNLXWAlBam0bjpqe8fr/farUOv333fV9rvbh45/jncbFYjKKxOE5yuXB7+/1B81AAsMYaY6y1Cwu3L09P93o9AMxsjGF2e3v7yyuP19dfNhq3jDECw+WEaDab9fp8vT6fJMmwzwDAlZHK4B41BIjIGLO0vPro4YNsEOh+H4Cx9sb1azMzVzrtzubmlu97vwcGM0qptSfP7t+7W6mc3dv/rKT8tLu7s/PR8zyllBBCABBSSCmFFEJIAoIg2Nh41Wq1fM8TUvqen8lkfN8fkJWU4uuXA2ZWShlrpJQAsmH29Zu35XK5WCx02u0BlZmJSBHRj6MjrXWQyXS63Xz+VBInJEQYhnEcx3HMzLkwTNI0CII0TQUzR9GYtXZubjbMZq/OzkqlxkbPjVej8fHqRO1CqVSamrokiC5OTjjnaGV1zTknhDDGSCmttVJKZh5qSkTs3BBSgw8AUEoNKxH9qR6kHDjoxEv/Fb8AE5wH89h/eZ0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDMrMDI6MDDl0NirAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAzKzAyOjAwlI1gFwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.inp-toulouse.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">INPT - Institut National Polytechnique de Toulouse</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://idp.inp-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inp-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inp-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INPT - Institut National Polytechnique de Toulouse</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INPT - Institut National Polytechnique de Toulouse</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.inp-toulouse.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Vincent CHONG-WING</md:SurName>
-    <md:EmailAddress>vincent.chong-wing@inp-toulouse.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 a47454cb..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inpa.gov.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inpa.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inpa.gov.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inpa.gov.br/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">gov.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inpa.gov.br:8443/idp/profile/SAML1/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">INPA - Instituto Nacional de Pesquisas da Amazonia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INPA - Instituto Nacional de Pesquisas da Amazonia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">INPA - Instituto Nacional de Pesquisas da Amazonia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.inpa.gov.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.inpa.gov.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Paulo Henrique Cardoso Maia</md:SurName>
-    <md:EmailAddress>paulo.maia@inpa.gov.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 15ce2401..00000000
--- a/swamid-interfederations-2.0/idp.inpa.gov.br.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://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>
-    MIIDdjCCAl4CAQAwDQYJKoZIhvcNAQEFBQAwgYAxDTALBgNVBAoTBElucGExDDAK
-BgNVBAsTA0NQRDEiMCAGCSqGSIb3DQEJARYTaW5wYW5ldEBpbnBhLmdvdi5icjEP
-MA0GA1UEBxMGTWFuYXVzMREwDwYDVQQIEwhBbWF6b25hczELMAkGA1UEBhMCQlIx
-DDAKBgNVBAMTA2lkcDAeFw0xMjAzMjAxOTM5NTVaFw0xNTAzMjAxOTM5NTVaMIGA
-MQ0wCwYDVQQKEwRJbnBhMQwwCgYDVQQLEwNDUEQxIjAgBgkqhkiG9w0BCQEWE2lu
-cGFuZXRAaW5wYS5nb3YuYnIxDzANBgNVBAcTBk1hbmF1czERMA8GA1UECBMIQW1h
-em9uYXMxCzAJBgNVBAYTAkJSMQwwCgYDVQQDEwNpZHAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC2YWOFB1QlA1CXn4MTVp33reHQq5ExFwOPGkZRmmZA
-5TJJ0wbwTk3BVj+tMke8Mo9Tz7+XZLW86GiXPopHUu32wCMlINQm8h4vxPx6eRD6
-bxM0taw7mCH7UGmrLu8AeJTAAPAwFc+cz/Xy1VnkYU16nmm8dRw2GXYkTWAiDUHX
-7vbsRKN2Gy42vvIp0Y2fK0i1xQmaZJgZy2/wXJOvu3ma2Uh/FdUiUvdyfrEZQWvQ
-OpMbJn3/eIA3Oq1oeIMR5gJMrQySXFgdmorlsBqSDnjj5e38Q+MopXRlCvFzwdoa
-fbdvwdV9Jj3TRU/GFLeyG5jp6BWIxg10HUecV5lS4QdvAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAKg8rgsX7ZpCohbp+qmSQgC/1LTZiX41quwkGb9hHok7w+5aNkT3
-oQDCh2/To1bP1vqHIz4mSlQ9dYc/wH/Wu75XwLyS3pLRkAJVVEUo2Mo/3FqvsQaT
-QyveHw+vvQGny2yqG2aDR5E7CrrLZ72CS1sqVgqUhe6ex086NDFOQ9eXSttV4oOR
-BNZG46z8OvOKiag7OZmq/XBJPzkArnkszJB/0NqQ4aX71lL7nBEAx4mO6LfZTvwF
-fATi4XpVqAbePz+kYqxBiBLNY7Dm6pBfGBjlJPPf+uxYrZ9/+bD7HYzdfpXLrBBo
-ry7RXvOQFKJQWM61DWQrWxWZVG69CJVd/kA=
-            </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>
-      
-MIIDdjCCAl4CAQAwDQYJKoZIhvcNAQEFBQAwgYAxDTALBgNVBAoTBElucGExDDAK
-BgNVBAsTA0NQRDEiMCAGCSqGSIb3DQEJARYTaW5wYW5ldEBpbnBhLmdvdi5icjEP
-MA0GA1UEBxMGTWFuYXVzMREwDwYDVQQIEwhBbWF6b25hczELMAkGA1UEBhMCQlIx
-DDAKBgNVBAMTA2lkcDAeFw0xMjAzMjAxOTM5NTVaFw0xNTAzMjAxOTM5NTVaMIGA
-MQ0wCwYDVQQKEwRJbnBhMQwwCgYDVQQLEwNDUEQxIjAgBgkqhkiG9w0BCQEWE2lu
-cGFuZXRAaW5wYS5nb3YuYnIxDzANBgNVBAcTBk1hbmF1czERMA8GA1UECBMIQW1h
-em9uYXMxCzAJBgNVBAYTAkJSMQwwCgYDVQQDEwNpZHAwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC2YWOFB1QlA1CXn4MTVp33reHQq5ExFwOPGkZRmmZA
-5TJJ0wbwTk3BVj+tMke8Mo9Tz7+XZLW86GiXPopHUu32wCMlINQm8h4vxPx6eRD6
-bxM0taw7mCH7UGmrLu8AeJTAAPAwFc+cz/Xy1VnkYU16nmm8dRw2GXYkTWAiDUHX
-7vbsRKN2Gy42vvIp0Y2fK0i1xQmaZJgZy2/wXJOvu3ma2Uh/FdUiUvdyfrEZQWvQ
-OpMbJn3/eIA3Oq1oeIMR5gJMrQySXFgdmorlsBqSDnjj5e38Q+MopXRlCvFzwdoa
-fbdvwdV9Jj3TRU/GFLeyG5jp6BWIxg10HUecV5lS4QdvAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAKg8rgsX7ZpCohbp+qmSQgC/1LTZiX41quwkGb9hHok7w+5aNkT3
-oQDCh2/To1bP1vqHIz4mSlQ9dYc/wH/Wu75XwLyS3pLRkAJVVEUo2Mo/3FqvsQaT
-QyveHw+vvQGny2yqG2aDR5E7CrrLZ72CS1sqVgqUhe6ex086NDFOQ9eXSttV4oOR
-BNZG46z8OvOKiag7OZmq/XBJPzkArnkszJB/0NqQ4aX71lL7nBEAx4mO6LfZTvwF
-fATi4XpVqAbePz+kYqxBiBLNY7Dm6pBfGBjlJPPf+uxYrZ9/+bD7HYzdfpXLrBBo
-ry7RXvOQFKJQWM61DWQrWxWZVG69CJVd/kA=
-
-                    
-            </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 17ba2576..00000000
--- a/swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inra.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">INRA - Institut National de la Recherche Agronomique</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAt0lEQVQ4y2NkIACmbVL+D2Nn+d1lRJdnQuYs2Kf6nljDqAYYYTZ/+/JPAJsz0W01tuE+wMDAwMAnyPJAk/FcIgsDAwMDTDMDAwPD9f9GDsga9m/+iGLj2SNfkeUTMQKFkL/RXchCaUAx4vIjDJgLXXIkGIiUeIHx+n+jBmQBTcZzKHwsgbofbxigA03GcwfQhBhxckgNxCy/u4yMhDQRHajTNin/J8Z2dHXUT0gMDKghj5yUsWVnAJH5WDhNWjRwAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAzKzAyOjAw5dDYqwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMyswMjowMJSNYBcAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.jouy.inra.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">INRA - Institut National de la Recherche Agronomique</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>
-					      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>
-    </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-POST" Location="https://idp.inra.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inra.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inra.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inra.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inra.fr/idp/profile/SAML1/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">INRA - Institut National de la Recherche Agronomique</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INRA - Institut National de la Recherche Agronomique</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.jouy.inra.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>iris@jouy.inra.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 a4d998ca..00000000
--- a/swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.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://idp.insa-rennes.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">INSA de Rennes</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyBpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBXaW5kb3dzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkIyOEI1MTFDQTMxMjExRTU5MDg2QjFGQzUyODBCMjI5IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkIyOEI1MTFEQTMxMjExRTU5MDg2QjFGQzUyODBCMjI5Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QjI4QjUxMUFBMzEyMTFFNTkwODZCMUZDNTI4MEIyMjkiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QjI4QjUxMUJBMzEyMTFFNTkwODZCMUZDNTI4MEIyMjkiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5mRQOCAAABCUlEQVR42mL8//8/AymAiYFEQHsNLL9mTv42cyKbieWvM8e50vMhbKAEkAskeRq6mdQ1PkX6AtnTbX00HR1ZkHX/OXsKSP6+ee3/549sju6/z5z4tWUd6xdniKzUq6foToKYysjLB2Lv38lqYsHZ0PH77GlGXn6giMrXTyAnoXhISvbfs8csUjLsxdXfZ00G6vkDsu0TxAjJV09fo9nA7uAKsedzcQaLuiaQDdQPdB6EFPr1Q42PB0UDi7EZiFTXBvr7x6Y1EDuBJHdJDTA8gAy1L58YccX0mzdvzp07z8XFBWSIiIhASDk5WRZc4f3mzdsNGzcBVdy4cVNDQx1CarxRZxwGaQkgwACB/3sY4hVazQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.insa-rennes.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">INSA de Rennes</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>
-					      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>
-    </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-POST" Location="https://idp.insa-rennes.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.insa-rennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.insa-rennes.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INSA de Rennes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INSA de Rennes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.insa-rennes.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>cri-systeme@insa-rennes.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml
deleted file mode 100644
index 808907ac..00000000
--- a/swamid-interfederations-2.0/idp.inserm-transfert.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.inserm-transfert.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-10-26T17:34:57Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm-transfert.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">INSERM-Transfert</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.inserm.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">staff</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">INSERM-Transfert</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">personnel</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>
-					      MIIDSDCCAjCgAwIBAgIVAJ0+TvIeavAjFYxpT+7F0r61FktEMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMMF2lkcC5pbnNlcm0tdHJhbnNmZXJ0LmZyMB4XDTE1MTEw
-NTExMTYzM1oXDTM1MTEwNTExMTYzM1owIjEgMB4GA1UEAwwXaWRwLmluc2VybS10
-cmFuc2ZlcnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyFxGe
-9J5hJ5TpheBI7GLLtSoXL8K7CzhW3FSGllYxg/rFOslJZ7reFKvochYc0PBAvXei
-S0XO1eAfMuDhNCchq7bIPkEW78ptBO6VPqCt5QLQTRfAh8TCIRYSPMU4Z643Yuy5
-VWOPhL3h66MYSBaYgFKpdImxO+1f6xlQu59NoshcWL3PhbX8rV/NCrjrk6v+ZBpi
-yMixH5eMihA636eU2JATjRtiqBOtoPyanGD6W095Ojk9PACthlKtEjTdy9p+rQt6
-0vymAAvCbrLSVc5sGwfAF08dGv/tQt+ry6BzQyeJQJW1H0moLfjvDyVi8DEGNDqn
-9QBSVydMSGmRImdFAgMBAAGjdTBzMB0GA1UdDgQWBBSzBOmHUIetjuQbwGmKlilB
-onqRmjBSBgNVHREESzBJghdpZHAuaW5zZXJtLXRyYW5zZmVydC5mcoYuaHR0cHM6
-Ly9pZHAuaW5zZXJtLXRyYW5zZmVydC5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQUFAAOCAQEAc5DK3X/GfYxevOJDvTdAc3W0PkfqBsp1D1ko4/khPvG6MJax
-EMjN/zE5e8miWXnkn+MQpzkKCHsLaeu6HD6LjHqkE+RtVK8fD6AMgw9XXWD+QCyT
-6MOahvn1ibDfQmZt+TOLL9kJOGLUMjeGtcH0yXkXb6bCdq9/yyiev7SnkNjS1YnM
-PtOxxP015w7/b9XDcshiRp7Xq/SExT4u5lweQiuYCtQG50GglyTnAiusgudwOJe2
-x3BVTdBOVbAslCRJv87S1z+DTBWmau+d8f5UDihF4YOpGRfIdo6wMf5JFn9BvZ7X
-JEYjjQM1FVU+uKub1f4DfSjgrc4HvczfZY1hnw==
-					    </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>
-					      MIIDSDCCAjCgAwIBAgIVAIJyc+Gfzp0eVbXdBuMNzE3AyFxwMA0GCSqGSIb3DQEB
-CwUAMCIxIDAeBgNVBAMMF2lkcC5pbnNlcm0tdHJhbnNmZXJ0LmZyMB4XDTE1MDkx
-NzE0MDQ1NloXDTM1MDkxNzE0MDQ1NlowIjEgMB4GA1UEAwwXaWRwLmluc2VybS10
-cmFuc2ZlcnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4J/qi
-FHfMKCtfFrKtx0RO/5ltByejYDObLpFXsRiVw3YgvFw7UEFKPQyDu+zydE3La76v
-eYvYkA0As/x9DxnUxui2FaZrFS8Fyd9Ty//MoeatQ7TptIxsLr8BGS2XXqE0LcuP
-5r/KAMazSvvz77OjjU0XW/prDL+6KSL1RRJoGkVzup9j4dKDtcQ3daj6/ISG3tif
-UfLDDfeW3Q0zBY+ROY69gM5hUytpASLTOXK9acJAle57a2YoyjK2JBdnrFUUHN7p
-h8IV+RB7kvJNVYrgQSM3/UGAgV7kbYfSizByBFcjwdOrkax3brcm1G8GSxmN6kuT
-a7gnycLSevkW5prDAgMBAAGjdTBzMB0GA1UdDgQWBBRIN86FLK0AxMvmltTCimJ3
-mLjKkTBSBgNVHREESzBJghdpZHAuaW5zZXJtLXRyYW5zZmVydC5mcoYuaHR0cHM6
-Ly9pZHAuaW5zZXJtLXRyYW5zZmVydC5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEAatuPIuWH5lqbqqSWL67JrE+BlawU0c/Q5B6Zjs0QRzvwQzrw
-NXzORY0nBEs1xg0VB35h8yMRhZowOj1gMCQDAkw3WeA9/TjZcDzlbHzVmmohlicm
-DF2hFjpP2dj9x2Vsn8/VuENBuJcQl2Zq6WoMlMPijQILJF3kErZM4JrXkbIB3fKd
-CJX0zPBriZsEKtzvHyKP/J8fI2Xn5uyvK8Z2WI1JyGr9r69EHXtN1ERk/jkdM+vf
-IDXLNZxDZcZALVhexi2xQG6uuu4dr/CnjWMJjDPN9nvx4WBsmPl1K7Tx0GRmF7gJ
-xIMPqERTBQpVvk4wmDf5mFKRvz1TjqYd32QhVA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.inserm-transfert.fr/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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm-transfert.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inserm-transfert.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm-transfert.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDSDCCAjCgAwIBAgIVAJ0+TvIeavAjFYxpT+7F0r61FktEMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMMF2lkcC5pbnNlcm0tdHJhbnNmZXJ0LmZyMB4XDTE1MTEw
-NTExMTYzM1oXDTM1MTEwNTExMTYzM1owIjEgMB4GA1UEAwwXaWRwLmluc2VybS10
-cmFuc2ZlcnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyFxGe
-9J5hJ5TpheBI7GLLtSoXL8K7CzhW3FSGllYxg/rFOslJZ7reFKvochYc0PBAvXei
-S0XO1eAfMuDhNCchq7bIPkEW78ptBO6VPqCt5QLQTRfAh8TCIRYSPMU4Z643Yuy5
-VWOPhL3h66MYSBaYgFKpdImxO+1f6xlQu59NoshcWL3PhbX8rV/NCrjrk6v+ZBpi
-yMixH5eMihA636eU2JATjRtiqBOtoPyanGD6W095Ojk9PACthlKtEjTdy9p+rQt6
-0vymAAvCbrLSVc5sGwfAF08dGv/tQt+ry6BzQyeJQJW1H0moLfjvDyVi8DEGNDqn
-9QBSVydMSGmRImdFAgMBAAGjdTBzMB0GA1UdDgQWBBSzBOmHUIetjuQbwGmKlilB
-onqRmjBSBgNVHREESzBJghdpZHAuaW5zZXJtLXRyYW5zZmVydC5mcoYuaHR0cHM6
-Ly9pZHAuaW5zZXJtLXRyYW5zZmVydC5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQUFAAOCAQEAc5DK3X/GfYxevOJDvTdAc3W0PkfqBsp1D1ko4/khPvG6MJax
-EMjN/zE5e8miWXnkn+MQpzkKCHsLaeu6HD6LjHqkE+RtVK8fD6AMgw9XXWD+QCyT
-6MOahvn1ibDfQmZt+TOLL9kJOGLUMjeGtcH0yXkXb6bCdq9/yyiev7SnkNjS1YnM
-PtOxxP015w7/b9XDcshiRp7Xq/SExT4u5lweQiuYCtQG50GglyTnAiusgudwOJe2
-x3BVTdBOVbAslCRJv87S1z+DTBWmau+d8f5UDihF4YOpGRfIdo6wMf5JFn9BvZ7X
-JEYjjQM1FVU+uKub1f4DfSjgrc4HvczfZY1hnw==
-					    </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>
-					      MIIDSDCCAjCgAwIBAgIVAIJyc+Gfzp0eVbXdBuMNzE3AyFxwMA0GCSqGSIb3DQEB
-CwUAMCIxIDAeBgNVBAMMF2lkcC5pbnNlcm0tdHJhbnNmZXJ0LmZyMB4XDTE1MDkx
-NzE0MDQ1NloXDTM1MDkxNzE0MDQ1NlowIjEgMB4GA1UEAwwXaWRwLmluc2VybS10
-cmFuc2ZlcnQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4J/qi
-FHfMKCtfFrKtx0RO/5ltByejYDObLpFXsRiVw3YgvFw7UEFKPQyDu+zydE3La76v
-eYvYkA0As/x9DxnUxui2FaZrFS8Fyd9Ty//MoeatQ7TptIxsLr8BGS2XXqE0LcuP
-5r/KAMazSvvz77OjjU0XW/prDL+6KSL1RRJoGkVzup9j4dKDtcQ3daj6/ISG3tif
-UfLDDfeW3Q0zBY+ROY69gM5hUytpASLTOXK9acJAle57a2YoyjK2JBdnrFUUHN7p
-h8IV+RB7kvJNVYrgQSM3/UGAgV7kbYfSizByBFcjwdOrkax3brcm1G8GSxmN6kuT
-a7gnycLSevkW5prDAgMBAAGjdTBzMB0GA1UdDgQWBBRIN86FLK0AxMvmltTCimJ3
-mLjKkTBSBgNVHREESzBJghdpZHAuaW5zZXJtLXRyYW5zZmVydC5mcoYuaHR0cHM6
-Ly9pZHAuaW5zZXJtLXRyYW5zZmVydC5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEAatuPIuWH5lqbqqSWL67JrE+BlawU0c/Q5B6Zjs0QRzvwQzrw
-NXzORY0nBEs1xg0VB35h8yMRhZowOj1gMCQDAkw3WeA9/TjZcDzlbHzVmmohlicm
-DF2hFjpP2dj9x2Vsn8/VuENBuJcQl2Zq6WoMlMPijQILJF3kErZM4JrXkbIB3fKd
-CJX0zPBriZsEKtzvHyKP/J8fI2Xn5uyvK8Z2WI1JyGr9r69EHXtN1ERk/jkdM+vf
-IDXLNZxDZcZALVhexi2xQG6uuu4dr/CnjWMJjDPN9nvx4WBsmPl1K7Tx0GRmF7gJ
-xIMPqERTBQpVvk4wmDf5mFKRvz1TjqYd32QhVA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inserm-transfert.fr/idp/profile/SAML1/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">INSERM-Transfert</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INSERM-Transfert</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.inserm.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>resnat.dsi@inserm.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 a0dea41d..00000000
--- a/swamid-interfederations-2.0/idp.inserm.fr-idp-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://idp.inserm.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">INSERM</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAANElEQVQ4y2NkwA7+o/EZcahjYGKgEIwaMGoAVQygHfjPwPD/P2aewACMuDSjKaJdZqLYCwC8YAsRZ1lnqQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowNCswMjowMCB35iUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDQrMDI6MDBRKl6ZAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.inserm.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">INSERM</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>
-					      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>
-    </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-POST" Location="https://idp.inserm.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inserm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inserm.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inserm.fr/idp/AA"/>
-    <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">INSERM</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INSERM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.inserm.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>resnat.dsi@inserm.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.inshea.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.inshea.fr-idp-shibboleth.xml
deleted file mode 100644
index 9099506f..00000000
--- a/swamid-interfederations-2.0/idp.inshea.fr-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.inshea.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-05-22T17:43:45Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inshea.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">INS HEA - Institut national supérieur de formation et de recherche pour l'éducation des jeunes handicapés et les enseignements adaptés</mdui:DisplayName>
-        <mdui:Logo height="11" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAYAAAB24g05AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAACwD18GZZAAACHUlEQVQoz41RTUiTcRx+/h/v5qYrRZEEda1w9mGHNazEg0ERFEJE59ahGnmM8hLIMMjo1qEOkdcEDRUkIoKMJJAI6UOSEeU28KPplm2++3j3vv//r8sOHQp84Dk9H/z4PQDA/ssJEgAQmMl14z0deoT7px42PegHgBhiHACTAAj/AhEHYwrT1Jgw6N6Zj6klL8x42l//FBlgGMP6bzsDYhzVVsSIAwAmyON5nn05+OTz1ouzQzNvL14PAcDjcNSoXgl5uC26n2ttKZl0DOURFo9qMTfkDQLb05s/es61bNT0LEx9qtPLi2NdtauYHGgby9l0MHBFMBsGCwejTWWbAqTJx5jOErEWbjpJ1VxXKrc0Hjv5885X8zfUs7qbDN/yrd0B5EwtHElWjrNdvxgAdLVfu6ShTxATq8InKj6nHBc9oeVcci2y+Kb4BUZFdDY7HR6XcllazAlCr2Z4vZQanZXVB6xDyg/SLNgilanMo34TIfdGqzS+H+9la3y14La0m8q2aBCCuxyohMHhAADr9F/ey7jL5S7mKzLdLlZu72k/7U2WQuN5e94kezJRyob3NYhiUTEh2G4lSbggt2zlSMG15jXKY8cD/kI0PZ5ZGB3sOBLuHzm/7Z0NBytXeSSwAniVv1brgiMqUql1t6VXFFclCMfk2m1VJycGAMiQb+rW2Kt3kRupxEjfAQAgVLWdgIDWXB8G1u5eOLrTzB8gJ/AD0J/JFwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowMyswMjowMOXQ2KsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDMrMDI6MDCUjWAXAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.inshea.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">staff and students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">INS HEA - Institut national supérieur de formation et de recherche pour l'éducation des jeunes handicapés et les enseignements adaptés</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnel et étudiants</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>
-					      MIIDHzCCAgegAwIBAgIUJbK6nstF0pm/+lEcGZ5dEj8AFb4wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAwwNaWRwLmluc2hlYS5mcjAeFw0xNTA1MjAwODUxMzhaFw0z
-NTA1MjAwODUxMzhaMBgxFjAUBgNVBAMMDWlkcC5pbnNoZWEuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCahuHmZ6NDcW9HfvttC0XLT2KxuADsDKJe
-2ACC5LNMAKbPDi6V3kjOA1Zk+dbI4BfSGDc0fGuJG/AxwPs2Aib5iNDnqYAGCdsF
-k+Yy30cxyIgAOsSQHcM6ylmiGbSUu/cMi2GnV5wR+hB0Idg4unraPQZZKS8BYAk9
-wsY1/qiEE4yD9xIf+xZN5ayMNwhuuCAtOYCPU/dM1hJS4lcmjxWT6flgiTLqgcd2
-UHMeyjgAx+0XJdDB2sterF9IQaRLW3SeVss1VulpDGuH4a9pIRHwXkZSMgy+l5ta
-zTI58LO55BL9ECg3N3iVehYmdMJyeF4PFUnwAgmv3qdU+SeYlm69AgMBAAGjYTBf
-MB0GA1UdDgQWBBTeDLA+ljfEcR8dCt4jK+6NTNns6zA+BgNVHREENzA1gg1pZHAu
-aW5zaGVhLmZyhiRodHRwczovL2lkcC5pbnNoZWEuZnIvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQEFBQADggEBAFG8x0TGKW8ksapTCq7Zo3jUThjmlqxCVjVj8T//
-SL5wLdXoqT/ykUHwk/w3bhB0suGepIez/UpUahK/wiNxJlWO/HV5fcVucf3Y+X7E
-ipYxj92wwzC5c+BU0Hp/l4YLe/VTI2WRn6Ir1h09udLxrnanvdsqV1FN8wI0bB9T
-Bf9T9mnR+nYvfPnk5/hox3490z7h9wOddP/I+BT55OOCecjZZxc7BhcqCVMHVYop
-7giVJzQjJAvZh/gTvvZE3LFD83JAwjLBovLc8ZPb7xPNy7fk+9eH1hOkEeOs9kcZ
-549vcVK5oOJCGuRuLlb0XayJKoOPX9vZ+DEGQdVAZaRbVuI=
-					    </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-POST" Location="https://idp.inshea.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inshea.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inshea.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INS HEA - Institut national supérieur de formation et de recherche pour l'éducation des jeunes handicapés et les enseignements adaptés</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INS HEA - Institut national supérieur de formation et de recherche pour l'éducation des jeunes handicapés et les enseignements adaptés</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.inshea.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>SOCCALINGAM</md:SurName>
-    <md:EmailAddress>Sejiane.Soccalingam@inshea.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>HAFFNER</md:SurName>
-    <md:EmailAddress>Didier.Haffner@inshea.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 964069b6..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>mailto:psisk@ipa.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Sisk</md:SurName>
-    <md:EmailAddress>mailto: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 ae799c6e..00000000
--- a/swamid-interfederations-2.0/idp.ipa.ie.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ipa.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo 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 regexp="false">ipa.ie</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Logo height="120" width="130">https://edugate.heanet.ie/rr3/logos/ipa.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">Institute of Public Administration</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ipa.ie</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:GeolocationHint>geo:53.3337363,-6.2300127</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <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 c03c48ea..00000000
--- a/swamid-interfederations-2.0/idp.ipb.fr-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.ipb.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">IPB - Bordeaux INP</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAChElEQVQoz22SS0hUARSG//vwqndGx2uW0cjYS5OKIFFRV0WamzaWi9zUwlzkqrCgEoSgVtFCWkhuKnATWJGUaZoaiabRjIlp83J8VI7jdZxmnDuPO/eeFhOi4b85cOD7OYf/B22R6uwhoojNE/7kUqfaaSexAADofg8ACCbN+YYVjRQNQI8DWLt7Lfz8IraIBQA1otrfBZ/e4i2Vnq8veD5CspszF4e6uzhxRKxt/x8Y7hZDkW8ZBYZwR7127Iavr4U2lNjcb9X2xFDdwAgShb3qbNc/QJdnTpUOyAeLJ5RnKUa7eeSqXlInVpdFxybST8a53BORV1WxiccI/tGVIABm2Lm6KMspkRDHhmcTr1srmiHmJc0S1kcJx2f2SAMrmbnd+xhDBgCGiBBcQXA9trwU4KTc4pLNc2OqPrHkPZQayuFjgsBAkGDI427XngbLMXssvKXIKHHgDQCTBHjE+M4LnkBw2s+NLcQ4kyXXJDJEBICi6+rXtoQcpLRSw9laMGm6StYvdcacqkKXQIle7vglHKgBI7AgLdrbFH1bl3L0/EaPN61AUO39gdYHU+6ZktJOsb+pf++439Ko+jZADACQniBNJaKVK+eINN07Hhlolq/fi2jawq8V7cdL7UPLeF/5WmgxmTSSY73jTnzOTkRKd72u/JRvthGR1TZJRPH3TRTwbFaDT/6X1XgfgO6bIn4Xk24mY54cDOTnWwaHPoqZl8tN+8NhZdnrlaQsdlvs2YVizUMA3Jmi4cGhbElyu11Go3F0dMwzP2/KzLTaJrcB4NPACgDSyw5DIwAOp3PV56usrNB1XVGUVEHAjh1WEwmX201EDoczuVnz+6e/z7jdc38B6uOQFkjKTvMAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDUrMDI6MDCGAO2RAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjA1KzAyOjAw911VLQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">https://www.bordeaux-inp.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">IPB - Bordeaux INP</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>
-					      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>
-    </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-POST" Location="https://idp.ipb.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipb.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ipb.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IPB - Bordeaux INP</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IPB - Bordeaux INP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.bordeaux-inp.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Moniez</md:SurName>
-    <md:EmailAddress>philippe.moniez@ipb.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d07aa14f..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ipm.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.cas.cz: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.ipm.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipm.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipm.cas.cz/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">ipm.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipm.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Physics of Materials</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav fyziky materiálů Akademie věd České republiky</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Physics of Materials of the Academy of Sciences of the Czech Republic, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav fyziky materiálů Akademie věd České republiky, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ipm.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ipm.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ipp.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index ad712716..00000000
--- a/swamid-interfederations-2.0/idp.ipp.cas.cz-idp-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://idp.ipp.cas.cz/idp/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="2014-11-24T14:52: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>
-    <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>
-  <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">ipp.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Plasma Physics AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav fyziky plazmatu AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider IPP AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚFP AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ipp.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ipp.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="91">https://jiftach.cas.cz/loga/logo-ipp-44.png</mdui:Logo>
-        <mdui:Logo height="136" width="282">https://jiftach.cas.cz/loga/logo-ipp-136.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVANNKPXr0zaDp+SLe9bDmbfYURJlsMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pcHAuY2FzLmN6MB4XDTE0MTEyNDA4MDkyOFoX
-DTM0MTEyNDA4MDkyOFowGTEXMBUGA1UEAxMOaWRwLmlwcC5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0TdQMt7WnWV3EHS99mypGeymSl8eO
-irfeH/mCY89lkISlzPzgf720FaeKF3laKqwn8JMTHJZEPyq6xlEc/ZVElcbDB6nI
-Q+UjIKBPNcAjUySEbmQH8sWsCOwjRMqFwELl/WXndlsGg7EChwvlz/dKVXqgnSc7
-KH/laYPBLIzigaimWaA7PIpx/YKu9s4jTpKeKSSX8ZaWv1/M+seRaEtGnt8m8WHY
-Jpt6uCk4mcwQG19GkNcS/cvkZ0SqKC0HFvYziaVpzCcHomtWPpo2RXWxBDbaGLAF
-bzLWM1jFrT69grMA8tHa5aOpDInWysQt8WI1annD4I3ejmRtGW6ZPdEvAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pcHAuY2FzLmN6hiVodHRwczovL2lkcC5pcHAu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSB/tJDVhkvn91f9684yT7f
-lrHksTANBgkqhkiG9w0BAQUFAAOCAQEAcZaOUorzs7jRbPxjHHP4MgUGKbejoAIU
-ddkZ3/XYx/uk3pD3WhsN3eBvMT8rRHAe7Us5IGn9YOj1ThlHvejxZDCBtG6liOMM
-xqt8K+B93hmlOoTBEH9Gw0lUX8hT4stq2RM3MQ3Dxmadj5vGvTergGuymiQqg2SI
-php0bSMHfJrOXSBGf//sMBj+qoGzM+dYCGu7VRRnt4CqJXi4WEqRQP0cpS0Izn1W
-NyztXViyX7Ty8PAIGXwq42+/+f+m8Jj/9DwOIBJk706VSEWLxKY54POG4QjWoCmm
-Gm9fZgC9QDcKNl55dlv4/lBPY8ZKvOck3iwTgsoxU+kwPZQp32pULA==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipp.cas.cz: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.ipp.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ipp.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ipp.cas.cz/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">ipp.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVANNKPXr0zaDp+SLe9bDmbfYURJlsMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pcHAuY2FzLmN6MB4XDTE0MTEyNDA4MDkyOFoX
-DTM0MTEyNDA4MDkyOFowGTEXMBUGA1UEAxMOaWRwLmlwcC5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0TdQMt7WnWV3EHS99mypGeymSl8eO
-irfeH/mCY89lkISlzPzgf720FaeKF3laKqwn8JMTHJZEPyq6xlEc/ZVElcbDB6nI
-Q+UjIKBPNcAjUySEbmQH8sWsCOwjRMqFwELl/WXndlsGg7EChwvlz/dKVXqgnSc7
-KH/laYPBLIzigaimWaA7PIpx/YKu9s4jTpKeKSSX8ZaWv1/M+seRaEtGnt8m8WHY
-Jpt6uCk4mcwQG19GkNcS/cvkZ0SqKC0HFvYziaVpzCcHomtWPpo2RXWxBDbaGLAF
-bzLWM1jFrT69grMA8tHa5aOpDInWysQt8WI1annD4I3ejmRtGW6ZPdEvAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pcHAuY2FzLmN6hiVodHRwczovL2lkcC5pcHAu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSB/tJDVhkvn91f9684yT7f
-lrHksTANBgkqhkiG9w0BAQUFAAOCAQEAcZaOUorzs7jRbPxjHHP4MgUGKbejoAIU
-ddkZ3/XYx/uk3pD3WhsN3eBvMT8rRHAe7Us5IGn9YOj1ThlHvejxZDCBtG6liOMM
-xqt8K+B93hmlOoTBEH9Gw0lUX8hT4stq2RM3MQ3Dxmadj5vGvTergGuymiQqg2SI
-php0bSMHfJrOXSBGf//sMBj+qoGzM+dYCGu7VRRnt4CqJXi4WEqRQP0cpS0Izn1W
-NyztXViyX7Ty8PAIGXwq42+/+f+m8Jj/9DwOIBJk706VSEWLxKY54POG4QjWoCmm
-Gm9fZgC9QDcKNl55dlv4/lBPY8ZKvOck3iwTgsoxU+kwPZQp32pULA==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ipp.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Plasma Physics</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav fyziky plazmatu AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Plasma Physics AS CR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav fyziky plazmatu AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ipp.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ipp.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
deleted file mode 100644
index d13562a1..00000000
--- a/swamid-interfederations-2.0/idp.irf.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.irf.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">irf.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Institutet för rymdfysik</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Institute of Space Physics</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Institutet för rymdfysik</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the Swedish Institute of Space Physics</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.irf.se</mdui:InformationURL>
-        <mdui:Logo height="145" width="144">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-        <mdui:Logo height="145" width="144" xml:lang="sv">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-        <mdui:Logo height="145" width="144" xml:lang="en">https://www.irf.se/image/IRF_logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://documents.irf.se/get_document.php?group=Computer%26docid=302</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">irf kiruna rymdcampus rymdfysik</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>irf.se</mdui:DomainHint>
-        <mdui:IPHint>192.71.13.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.33.0/24</mdui:IPHint>
-        <mdui:IPHint>192.71.152.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:67.84,20.41</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDCDCCAfCgAwIBAgIJAOTXvdZcGqcaMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCnd3dy5pcmYuc2UwHhcNMTQwNDExMTIyMzI4WhcNMTcwNDEwMTIyMzI4WjAV
-MRMwEQYDVQQDEwp3d3cuaXJmLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA5j6+1LkPONXRnBX/hijB9EDb8+jg1NpNDEq4kPpxIo+2zPgR8GVqWwND
-NXZZNZWvgb52cCm4ofyOK8p2eOIi5CXJoEhCU1k3LVfaAms+1j02/JpQkKatr8RC
-ONxIvbs45H440KbuK+nmhQI1hRcZ8bB8FadX9EInEWjrxGZNyMlsMnfRLS/BGmc3
-htF8BSNd01XiCy5R6X5OufIlyKHoo/fAcDv1zJlLb4r07PlzbCtfKFIrE7w/KBB8
-fKLkMKI1KRO7FgLET3xf5GH7ZY2N8Y4+fwBf70rHzsh1Grsjk/ZJUOu+2jcxMW1R
-L5/pp229zplUBywYgz2HTxceQNZF4QIDAQABo1swWTA4BgNVHREEMTAvggp3d3cu
-aXJmLnNlhiFodHRwczovL3d3dy5pcmYuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFNIFWvl057NJOMck/J+lUMXn5jKfMA0GCSqGSIb3DQEBBQUAA4IBAQDdA72P
-RuVvpMliAJYK/qTSy9HJH1rptUQcON5SRGY8H9nlJ268FSxf06Hp+2qqqglE/nmA
-fb7Viy/3o2WbnQVLznXoG3mjrRHWMXXniqLryFPcC9/yH4Mz2HBmeDzZyftUgUk2
-PEewRy7hbFCLpItGerJQlaFcyoLG8qR4d+v1ruOSSK/p1Bobk5AhxfSh05TmAKko
-bezn0NFgAFP5ezEjK9uZ2N+vmQbbirVqYslNn/9kK6G+pXQQsBegliIcqNKj7iST
-WKAfSLfPK6//KWPOPnZrpaAuyIMxrM/2/adK6Ko0mjM8D6sIUhT3zcfbq4M/m8vv
-XCYbfP8E3cs4MB+K
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.irf.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.irf.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.irf.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.irf.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.irf.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">irf.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDCDCCAfCgAwIBAgIJAOTXvdZcGqcaMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCnd3dy5pcmYuc2UwHhcNMTQwNDExMTIyMzI4WhcNMTcwNDEwMTIyMzI4WjAV
-MRMwEQYDVQQDEwp3d3cuaXJmLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA5j6+1LkPONXRnBX/hijB9EDb8+jg1NpNDEq4kPpxIo+2zPgR8GVqWwND
-NXZZNZWvgb52cCm4ofyOK8p2eOIi5CXJoEhCU1k3LVfaAms+1j02/JpQkKatr8RC
-ONxIvbs45H440KbuK+nmhQI1hRcZ8bB8FadX9EInEWjrxGZNyMlsMnfRLS/BGmc3
-htF8BSNd01XiCy5R6X5OufIlyKHoo/fAcDv1zJlLb4r07PlzbCtfKFIrE7w/KBB8
-fKLkMKI1KRO7FgLET3xf5GH7ZY2N8Y4+fwBf70rHzsh1Grsjk/ZJUOu+2jcxMW1R
-L5/pp229zplUBywYgz2HTxceQNZF4QIDAQABo1swWTA4BgNVHREEMTAvggp3d3cu
-aXJmLnNlhiFodHRwczovL3d3dy5pcmYuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFNIFWvl057NJOMck/J+lUMXn5jKfMA0GCSqGSIb3DQEBBQUAA4IBAQDdA72P
-RuVvpMliAJYK/qTSy9HJH1rptUQcON5SRGY8H9nlJ268FSxf06Hp+2qqqglE/nmA
-fb7Viy/3o2WbnQVLznXoG3mjrRHWMXXniqLryFPcC9/yH4Mz2HBmeDzZyftUgUk2
-PEewRy7hbFCLpItGerJQlaFcyoLG8qR4d+v1ruOSSK/p1Bobk5AhxfSh05TmAKko
-bezn0NFgAFP5ezEjK9uZ2N+vmQbbirVqYslNn/9kK6G+pXQQsBegliIcqNKj7iST
-WKAfSLfPK6//KWPOPnZrpaAuyIMxrM/2/adK6Ko0mjM8D6sIUhT3zcfbq4M/m8vv
-XCYbfP8E3cs4MB+K
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.irf.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.irf.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">IRF</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.irf.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Swedish Institute of Space Physics</md:Company>
-    <md:SurName>Mats Luspa</md:SurName>
-    <md:EmailAddress>mailto:datagruppen@irf.se</md:EmailAddress>
-    <md:TelephoneNumber>+4698079000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Swedish Institute of Space Physics</md:Company>
-    <md:SurName>Mats Luspa</md:SurName>
-    <md:EmailAddress>mailto:matsl@irf.se</md:EmailAddress>
-    <md:TelephoneNumber>+4698079022</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Swedish Institute of Space Physics</md:Company>
-    <md:SurName>Mats Luspa</md:SurName>
-    <md:EmailAddress>mailto:matsl@irf.se</md:EmailAddress>
-    <md:TelephoneNumber>+4698079022</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 5efb65f8..00000000
--- a/swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.irstea.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACPUlEQVQozzXSv06TYRgF8HOe96UttIgFWygINIiRIIbFP6OJxgtQZxdHL0EXR2/ATRPvwMSIgxegxkENOhgVI2rAlGolYi3t9z7H4dPlOcOTM50fpQQY4AAAAyCAAgARdIgCCSUyAKAkCGB+HDJBpPKyIxkIJ4yCExbzAADgw7d77V9PhX1DABDBjMm9pGAL45emqucBRMAggE6g1Vnb/PHAopiZ038PTjGghNdgqISpyeoFApFwmAlIA/vamf+8d227t9jqzm0NDn0aHFgebl9pnlMqdbNvBOCKkN15uH537fnG+1b77MWJw+PInAxlyuXb/bFs0GT8AkQBNEUgvd9qP3uzheT1OBgzT2ZkJoVItrLir3TkYNg0JsAFMyCcWZ5qVEeg5DCiINIJwBNtN/V/9k8EEABkFAz0lWZ9cf6QQfswKSX5XrIBmeQlhJ1e04Mo5K3o4FxjYnVhcjnpkVKZrIRw+XDpTaf/sct1/9NNi0FIdAqgRxNLEaeO1tdbuzdXxouztTJtOGbjxaFr05WNne5spVEr3+r6FxGEmQhJK8dmauXyTo+v2r3KaNjsqR8KoYDawUoYHonFBXGPSsp3EK3ZqD5++W7/7aYVS99HR153uvWh8HJ0aKPTWywXb1w/vTpzEgz0FHMZ1Urhxb7/3G4B9mpkeGF6dGJ2cnVp+uqxxtL8ZL1aAAIAWKBLEEjcvv/kx252cmn6+Fxtpj4WYi5GMlIQ/5Gju5MEHDIIyTzAcpG5X8n+/53AX9H3FvIIb+2KAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjA1KzAyOjAwhgDtkQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowNSswMjowMPddVS0AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.irstea.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</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>
-					      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>
-    </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-POST" Location="https://idp.irstea.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.irstea.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.irstea.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IRSTEA - Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.irstea.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>federation.contact@lists.irstea.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b13b5c91..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.isibrno.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.cas.cz: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.isibrno.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.isibrno.cas.cz/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">isibrno.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Scientific Instruments of the ASCR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav přístrojové techniky AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Scientific Instruments of the ASCR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav přístrojové techniky AV ČR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.isibrno.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.isibrno.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml
deleted file mode 100644
index f7367e78..00000000
--- a/swamid-interfederations-2.0/idp.ist.ac.at-idp-shibboleth.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ist.ac.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-07-09T08:48:57Z">
-      <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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ist.ac.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">IST Austria</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">IST Austria</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SSO at the Institute of Science and Technology Austria</mdui:Description>
-        <mdui:Logo height="101" width="220">https://idp.ist.ac.at/images/logo.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>
-MIIDIDCCAgigAwIBAgIVAKNzZl6QxKuXj/y1k1CBCEO3WHNBMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwHhcNMTUwNjMwMTAzNTQ0WhcN
-MzUwNjMwMTAzNTQ0WjAYMRYwFAYDVQQDDA1pZHAuaXN0LmFjLmF0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmrQyKAjpM8u8AIxqUkiWFMlkUNiPdlVl
-YcZfFr/2C5iCKC+vRMsgcYBCiZodc9mw0BovZbf4A4T6c3oYgqTIzuSASArR9imL
-u3xYHXUa7bsjge2AZ1SXfQwkaCWyIyMcqqvD0EV4KbZkzNjZ3nzqLX9fAeQ+s51h
-XRO1G50Qq1s4RvJMjZK6j1mn6xdZHx24+D0G3GC4f6Ob6KOslLDWc97uQGmaNBs2
-LLt79q57AKao81QVhP8q94RBQ5OL8ACP+3xYPa71zaDGcixiHUoco527Gr9y+UQp
-8mSM1pQ/16PtAZsDNipwlNgJYt4mcOYi9zkiu0m64zJTeTSi7d46MQIDAQABo2Ew
-XzAdBgNVHQ4EFgQUSLkMFfObfFFP5jchC3yED/7pJmgwPgYDVR0RBDcwNYINaWRw
-LmlzdC5hYy5hdIYkaHR0cHM6Ly9pZHAuaXN0LmFjLmF0L2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAIIjhAwz/xp8LkOtIofUj5qLa3Axta3vcUuviZ
-cYLtEfhCb2dvtj3qwlHz6AeIjBRtuKlptX4Bexg9uA0QYSz+xPXiu43O3qqns/Nb
-5HXFKsCDpRtIZdfYhSJwh5TftsjsYn5zuE34fjPkozjfuHZIIxuVlQW1lELpql1u
-LI5BtXvOmtCt9MxwZ6lwywPSsTeBNKsFuS0Dp4lUBRoSgWu90CiKHkoGLUOUPrlN
-J1TxfFmf6lEHmb7zvSgo8Uchp/uYF7AZ7n8h8Sc+BIXaMAsLlUeFsYJLu18y90Xl
-ojDt/GTfp8exfqbFUriqj6Xhf5eu9fSY/jsodmVaOw2GoZmN</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>
-MIIDIDCCAgigAwIBAgIVAJUtQynzhfho/ZFcuyGKElEn3i4KMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwHhcNMTUwNjMwMTAzNTQzWhcN
-MzUwNjMwMTAzNTQzWjAYMRYwFAYDVQQDDA1pZHAuaXN0LmFjLmF0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo7vDO+qkovMUtazg1uUhu1DJ8OqCnR/n
-xdl24Vdh8gpQJsTrmg3mbpkKXzQcrmbyMVwc0XRk7wq/Fh0QQ2V2OCMkNJ9FSN/j
-VstBWjFeLCL89lYSiW1IFhYC8czmhMY67hOO9NnZB3j3T4wZVPHoALF3n+rTcCGb
-yKjbTZw32oyMZoAUkmFaQPJFvbpAziKj9w/BU+8NVCsO/PXIyVprifIXKcMYtnUr
-Tj4d6U9nurnUPXBrSuvgTsY7+zJ5jpkGGUzTSZHrPHw1FnxJSNRFxSWBIpXH5rZZ
-z6k4I6QRrgrVIcbJbvPyGKOFqGa9ZUdZZZQr3TfEsnl0D8M1SqTk6wIDAQABo2Ew
-XzAdBgNVHQ4EFgQUxeXktWyuUPNEbJZWDV4UPOsTWMMwPgYDVR0RBDcwNYINaWRw
-LmlzdC5hYy5hdIYkaHR0cHM6Ly9pZHAuaXN0LmFjLmF0L2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAXFWeu5vQU22HKaW3vXS4f/OcnOnlQQa1GbrJg
-D7JnoKP2j+RGecYxDQAS5+o5LbBb7wh25hHCM/OuOImbGugN253OR7kCknuMc50+
-ihXXSPFWjL0Gd68pKk3wXJJnIavwB/Evi80hVxL4dDBT498ZiwTE2vTRF1FHlj3O
-b8x/yObUbZVe9wHEr1SxOtMTOSJIb1ns0Br6H+Wji/o6LjSavZYAnxydgnhxcixn
-p9lET5YFTpHa31MRrKpb4XM+sYfrQ0khIhMyLm6BzIkuFaNpxpm/x+bOQEJwoeIW
-dulXVfj+LyVXzjp8pM9wRPfaAFbzZzCLj174b6/CfHWXl7IP</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>
-MIIDHzCCAgegAwIBAgIUeq9cJechTNP7ey2ymp1zDhsMOiswDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNaWRwLmlzdC5hYy5hdDAeFw0xNTA2MzAxMDM1NDRaFw0z
-NTA2MzAxMDM1NDRaMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgocYifpqC91GEQ1TKcyH2RuAK+eX/iStm
-Fzem7rAU/MWscL5ZEnMVwzkG1PPK1VV5EAf1WwWdfK5nxj9YCnXuq3rdtIB5+fJK
-eb8Mli+Xv8xa542cdMF5EkXaf/1iFpd+agXTd9DzjwRF4ONa5uZqEwoTY02fE1dq
-XYV4lkBC8ATfoCE6u5sUHYYJFFI8aAI61POm7CatYrVXYINMy8fubhOW/yhjdJ+S
-4/LN9d0WXrFhJu1+Cw/FYluoYXuhbwpKB2cJLnVlJjWh36TI6D6BaOPxOvgfSPGQ
-IAusp6jusBZzP4ujpmUP7HxcZemq4N0RPINrq6OERG6t/ICVmH3zAgMBAAGjYTBf
-MB0GA1UdDgQWBBSYxs9vRSPODbzitnbft+HnthjuPjA+BgNVHREENzA1gg1pZHAu
-aXN0LmFjLmF0hiRodHRwczovL2lkcC5pc3QuYWMuYXQvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAA1+R1p90OWn1Fizf8UW+vlrdPYf68yFb8snFMxC
-ssFbT6K7YzQRrBmzVeSbDqth85hjibxiPnqivbTK9YBfpX4Q8dd/MxfU9vxHvJoB
-/frFb/nP0OakEcmFma1wln0eIzMofpcKlCJaM38tDGS9bnw6XP19hLAutIzTNH0N
-FQxWpNRAFgItkxMbnPgFcx+zZXjQJVkBtvjEgOa1g/f+Sn0kQGLW0C/dsSZoz5+o
-Knqc5fFVPJWH382R74QJwi7AIy5spcEg5tK1P1rin7g2PYqZyT5RBzmCPbpTsYm2
-ivyYh1imiU7hjVtiJXZPSaWkJr13eoANuG5xURLnr4p6xWU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ist.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.ist.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://idp.ist.ac.at/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ist.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://idp.ist.ac.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ist.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ist.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">ist.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>
-MIIDIDCCAgigAwIBAgIVAKNzZl6QxKuXj/y1k1CBCEO3WHNBMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwHhcNMTUwNjMwMTAzNTQ0WhcN
-MzUwNjMwMTAzNTQ0WjAYMRYwFAYDVQQDDA1pZHAuaXN0LmFjLmF0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmrQyKAjpM8u8AIxqUkiWFMlkUNiPdlVl
-YcZfFr/2C5iCKC+vRMsgcYBCiZodc9mw0BovZbf4A4T6c3oYgqTIzuSASArR9imL
-u3xYHXUa7bsjge2AZ1SXfQwkaCWyIyMcqqvD0EV4KbZkzNjZ3nzqLX9fAeQ+s51h
-XRO1G50Qq1s4RvJMjZK6j1mn6xdZHx24+D0G3GC4f6Ob6KOslLDWc97uQGmaNBs2
-LLt79q57AKao81QVhP8q94RBQ5OL8ACP+3xYPa71zaDGcixiHUoco527Gr9y+UQp
-8mSM1pQ/16PtAZsDNipwlNgJYt4mcOYi9zkiu0m64zJTeTSi7d46MQIDAQABo2Ew
-XzAdBgNVHQ4EFgQUSLkMFfObfFFP5jchC3yED/7pJmgwPgYDVR0RBDcwNYINaWRw
-LmlzdC5hYy5hdIYkaHR0cHM6Ly9pZHAuaXN0LmFjLmF0L2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAIIjhAwz/xp8LkOtIofUj5qLa3Axta3vcUuviZ
-cYLtEfhCb2dvtj3qwlHz6AeIjBRtuKlptX4Bexg9uA0QYSz+xPXiu43O3qqns/Nb
-5HXFKsCDpRtIZdfYhSJwh5TftsjsYn5zuE34fjPkozjfuHZIIxuVlQW1lELpql1u
-LI5BtXvOmtCt9MxwZ6lwywPSsTeBNKsFuS0Dp4lUBRoSgWu90CiKHkoGLUOUPrlN
-J1TxfFmf6lEHmb7zvSgo8Uchp/uYF7AZ7n8h8Sc+BIXaMAsLlUeFsYJLu18y90Xl
-ojDt/GTfp8exfqbFUriqj6Xhf5eu9fSY/jsodmVaOw2GoZmN</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>
-MIIDIDCCAgigAwIBAgIVAJUtQynzhfho/ZFcuyGKElEn3i4KMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwHhcNMTUwNjMwMTAzNTQzWhcN
-MzUwNjMwMTAzNTQzWjAYMRYwFAYDVQQDDA1pZHAuaXN0LmFjLmF0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo7vDO+qkovMUtazg1uUhu1DJ8OqCnR/n
-xdl24Vdh8gpQJsTrmg3mbpkKXzQcrmbyMVwc0XRk7wq/Fh0QQ2V2OCMkNJ9FSN/j
-VstBWjFeLCL89lYSiW1IFhYC8czmhMY67hOO9NnZB3j3T4wZVPHoALF3n+rTcCGb
-yKjbTZw32oyMZoAUkmFaQPJFvbpAziKj9w/BU+8NVCsO/PXIyVprifIXKcMYtnUr
-Tj4d6U9nurnUPXBrSuvgTsY7+zJ5jpkGGUzTSZHrPHw1FnxJSNRFxSWBIpXH5rZZ
-z6k4I6QRrgrVIcbJbvPyGKOFqGa9ZUdZZZQr3TfEsnl0D8M1SqTk6wIDAQABo2Ew
-XzAdBgNVHQ4EFgQUxeXktWyuUPNEbJZWDV4UPOsTWMMwPgYDVR0RBDcwNYINaWRw
-LmlzdC5hYy5hdIYkaHR0cHM6Ly9pZHAuaXN0LmFjLmF0L2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAXFWeu5vQU22HKaW3vXS4f/OcnOnlQQa1GbrJg
-D7JnoKP2j+RGecYxDQAS5+o5LbBb7wh25hHCM/OuOImbGugN253OR7kCknuMc50+
-ihXXSPFWjL0Gd68pKk3wXJJnIavwB/Evi80hVxL4dDBT498ZiwTE2vTRF1FHlj3O
-b8x/yObUbZVe9wHEr1SxOtMTOSJIb1ns0Br6H+Wji/o6LjSavZYAnxydgnhxcixn
-p9lET5YFTpHa31MRrKpb4XM+sYfrQ0khIhMyLm6BzIkuFaNpxpm/x+bOQEJwoeIW
-dulXVfj+LyVXzjp8pM9wRPfaAFbzZzCLj174b6/CfHWXl7IP</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>
-MIIDHzCCAgegAwIBAgIUeq9cJechTNP7ey2ymp1zDhsMOiswDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNaWRwLmlzdC5hYy5hdDAeFw0xNTA2MzAxMDM1NDRaFw0z
-NTA2MzAxMDM1NDRaMBgxFjAUBgNVBAMMDWlkcC5pc3QuYWMuYXQwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgocYifpqC91GEQ1TKcyH2RuAK+eX/iStm
-Fzem7rAU/MWscL5ZEnMVwzkG1PPK1VV5EAf1WwWdfK5nxj9YCnXuq3rdtIB5+fJK
-eb8Mli+Xv8xa542cdMF5EkXaf/1iFpd+agXTd9DzjwRF4ONa5uZqEwoTY02fE1dq
-XYV4lkBC8ATfoCE6u5sUHYYJFFI8aAI61POm7CatYrVXYINMy8fubhOW/yhjdJ+S
-4/LN9d0WXrFhJu1+Cw/FYluoYXuhbwpKB2cJLnVlJjWh36TI6D6BaOPxOvgfSPGQ
-IAusp6jusBZzP4ujpmUP7HxcZemq4N0RPINrq6OERG6t/ICVmH3zAgMBAAGjYTBf
-MB0GA1UdDgQWBBSYxs9vRSPODbzitnbft+HnthjuPjA+BgNVHREENzA1gg1pZHAu
-aXN0LmFjLmF0hiRodHRwczovL2lkcC5pc3QuYWMuYXQvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAA1+R1p90OWn1Fizf8UW+vlrdPYf68yFb8snFMxC
-ssFbT6K7YzQRrBmzVeSbDqth85hjibxiPnqivbTK9YBfpX4Q8dd/MxfU9vxHvJoB
-/frFb/nP0OakEcmFma1wln0eIzMofpcKlCJaM38tDGS9bnw6XP19hLAutIzTNH0N
-FQxWpNRAFgItkxMbnPgFcx+zZXjQJVkBtvjEgOa1g/f+Sn0kQGLW0C/dsSZoz5+o
-Knqc5fFVPJWH382R74QJwi7AIy5spcEg5tK1P1rin7g2PYqZyT5RBzmCPbpTsYm2
-ivyYh1imiU7hjVtiJXZPSaWkJr13eoANuG5xURLnr4p6xWU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ist.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ist.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Institute of Science and Technology Austria</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Institute of Science and Technology Austria</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Institute of Science and Technology Austria</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Science and Technology Austria</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://ist.ac.at/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IT</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:it@ist.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:it@ist.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 cee6bf6c..00000000
--- a/swamid-interfederations-2.0/idp.it-tallaght.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.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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it-tallaght.ie/idp/profile/Shibboleth/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>mailto: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>mailto: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 825b2677..00000000
--- a/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +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>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</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">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:IPHint>130.241.0.0/18</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.gu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.gu.se/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.gu.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">gu.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.gu.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">GU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>Lena Ström</md:SurName>
-    <md:EmailAddress>mailto:lena.strom@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>Pablo Millet</md:SurName>
-    <md:EmailAddress>mailto:pablo.millet@gu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46707104070</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>GU-Support</md:SurName>
-    <md:EmailAddress>mailto:support@gu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46317862020</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 7e402db1..00000000
--- a/swamid-interfederations-2.0/idp.it.gu.se.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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="technical">
-    <Company>Göteborgs universitet</Company>
-    <EmailAddress>pablo.millet@gu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.helsinki.fi.xml b/swamid-interfederations-2.0/idp.it.helsinki.fi.xml
deleted file mode 100644
index cbd09b15..00000000
--- a/swamid-interfederations-2.0/idp.it.helsinki.fi.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.it.helsinki.fi/shibboleth">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEcTCCA1mgAwIBAgIQb6wlPCEcExhVve9XkInJdjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQxNzAwMDAwMFoXDTE2MDQyNTIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAuaXQuaGVs
-c2lua2kuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDcw5b6Irs
-srBw/ZqlYBd56/3TuwKlffQ/PMEWtXlREAr0AqEvfkwkDBcw2l1SukBgxrOrTSt+
-V22gNr4MYG4e5TZXdz/0zE3cIKK0yyl3J2Nx2XlmI9fiR9Sek1nLAOtnLuwWRI8N
-QWdX/Xfy3y2/lQlMMNhhp7aSENrD0aHjtnGkM0VabUps643cTBriFHh7StggFRc8
-hTMRtKiy8YJ/1Zsc9ga5ybM94zu3XIK4zeTJhYyGOgF6TKF7/mZvvLrPNjVOHSeA
-0J/zojBV6GPCxlLSOAdkvV9uVhslLAbGii/0hEZ3pSS7U5XJ6xf54it/ygIgUxIf
-IOb985uDENrlAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUINR5wYeKLCfMrr3Wr5ritvhAkfowDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5pdC5oZWxzaW5raS5m
-aTANBgkqhkiG9w0BAQUFAAOCAQEADRpnZTiCX9noNJx4oRL58PTTLYVlh/VlBMen
-56T532hwjM5mweKxLHdNO4aLSQjTLJG0QrJJwNM8of39eDv5UArRgiwnd9jfw0at
-S006LfAa2a68PWLmeg4MfwQ5IneMvFkS9+1SNL0sGd7nNFz86go7B3UpHbEiHJdv
-S/fr/RDEW7w/VIniSkVp7pSxCPLU0uRxXwIcQ4CLKUJXOPF3pzDPeos79qLMVY9c
-3nqnZg9C2k24ELF6azswhYyTzXHp80ldMrshRglu8oNiVxQP1PuZJQW6UrIJBGeX
-tuqXWyJCptDt66Xp9smuVpRI45ikr+HoVSJnxmAoW/ImSH0oBg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.helsinki.fi/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEcTCCA1mgAwIBAgIQb6wlPCEcExhVve9XkInJdjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQxNzAwMDAwMFoXDTE2MDQyNTIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAuaXQuaGVs
-c2lua2kuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDcw5b6Irs
-srBw/ZqlYBd56/3TuwKlffQ/PMEWtXlREAr0AqEvfkwkDBcw2l1SukBgxrOrTSt+
-V22gNr4MYG4e5TZXdz/0zE3cIKK0yyl3J2Nx2XlmI9fiR9Sek1nLAOtnLuwWRI8N
-QWdX/Xfy3y2/lQlMMNhhp7aSENrD0aHjtnGkM0VabUps643cTBriFHh7StggFRc8
-hTMRtKiy8YJ/1Zsc9ga5ybM94zu3XIK4zeTJhYyGOgF6TKF7/mZvvLrPNjVOHSeA
-0J/zojBV6GPCxlLSOAdkvV9uVhslLAbGii/0hEZ3pSS7U5XJ6xf54it/ygIgUxIf
-IOb985uDENrlAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUINR5wYeKLCfMrr3Wr5ritvhAkfowDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5pdC5oZWxzaW5raS5m
-aTANBgkqhkiG9w0BAQUFAAOCAQEADRpnZTiCX9noNJx4oRL58PTTLYVlh/VlBMen
-56T532hwjM5mweKxLHdNO4aLSQjTLJG0QrJJwNM8of39eDv5UArRgiwnd9jfw0at
-S006LfAa2a68PWLmeg4MfwQ5IneMvFkS9+1SNL0sGd7nNFz86go7B3UpHbEiHJdv
-S/fr/RDEW7w/VIniSkVp7pSxCPLU0uRxXwIcQ4CLKUJXOPF3pzDPeos79qLMVY9c
-3nqnZg9C2k24ELF6azswhYyTzXHp80ldMrshRglu8oNiVxQP1PuZJQW6UrIJBGeX
-tuqXWyJCptDt66Xp9smuVpRI45ikr+HoVSJnxmAoW/ImSH0oBg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.helsinki.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.helsinki.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Olli</md:GivenName>
-    <md:SurName>Saikko</md:SurName>
-    <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Aarno</md:GivenName>
-    <md:SurName>Sandvik</md:SurName>
-    <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
deleted file mode 100644
index 202d3805..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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.it.su.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.su.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.it.su.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md: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">su.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.it.su.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.it.su.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">SU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.su.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Stockholm University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Stockholm University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Stockholm University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 0dc396cf..00000000
--- a/swamid-interfederations-2.0/idp.it.su.se.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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 anställda 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: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: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="technical">
-    <Company>Stockholm University</Company>
-    <EmailAddress>helpdesk@it.su.se</EmailAddress>
-  </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 483ba6fd..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itam.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itam.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.cas.cz: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.itam.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itam.cas.cz/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">itam.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.itam.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.itam.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml
deleted file mode 100644
index f01c7fc0..00000000
--- a/swamid-interfederations-2.0/idp.itcarlow.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itcarlow.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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itcarlow.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Technology Carlow</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.itcarlow.ie</mdui:InformationURL>
-        <mdui:Logo height="89" width="171">https://edugate.heanet.ie/rr3/logos/it-carlow.png</mdui:Logo>
-        <mdui:Logo height="89" width="171" xml:lang="en">data:image/png;base64,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AHAch5tuusk2Gi1x++232/POO08ccshmHnlkJ3fccYednJzkhBNOEEKW3PWrX5Emib3oGReJE44/njRJuOaaa2yWpjz88EPMzMygpCQKQm6+5WZ75ulnCIvlF7+4wZ5x+lliw4YNYmRdrrvuOlsUBevWrWNyclKMGllKydq1azn00EPFjh077CmnnCJarRYA3/ve96wQgmc84xliYWGBY489VuR57SvfeNMNdu/evaxfv56zzjxL7Nm7h127dtnHHnuMqakpzjrzPOH7Pvfeey+33367PfXUU8VombLW8oMf/MBqrXn6058u8jwfT5qJiQm+//3v2yzLePKTnyw2bNjAYYcdJrZu3UoYhtx9993s2LHDttttzj//fJEkCXNzc3z1q1+1GzZsYPv27WJ2dhZrLXfeeae96667uOiii8Ts7CwLCwv86Ec/si984QvF1NQU3/3ud61Siu3bt4tt27YRx/F46f7Qhz5kX/va14o1a9Zw5JFHirm5OUYDXQjBD3/4QxtFESeffLJIkoSqqrjllltst9vlFa94hVBKcf/993P33XfbiYkJTjnlFLFv3z56vR7XXnutffrTny6stfz85z+3vV6PJz3pSWLjxo0IIbjyyitts9nkuOOOE61Wi4WFBYqiYM+ePXbr1q2i1WoRhiH33Xcft956q123bh0nnXSSmJiYYM+ePVx11VV206ZNnHzyycIYw+TkJN/5znes4zhcdNFF4okxhBTiYMQ1mvWtVms4w2/BcRxe/OIXi+9+97tWa8tNN95in/ucS8QJx58kfvTDH9s0ydm0cQsnHH+S6PdjHnpwB74Xcti27WKiM8Xc7FqUdHls526rteXmm24FJL2VATf+4makdLj66p9aKR1+85vf2iCIeP7zXyDuvfd+qspYY8BxPKwVY3ckz0u0tlgreOc7/9E+85nPFkcffYz4whe+ZGdm5vjud//HOo7DLbfcYnsrA15w6YvE3r17GcQD7rzzTru4uMhznvMcsbi4yPz8PL1ej9tuu83+/u//vrj55pvtgw8+yNLSEp/73OfsM5/5TDE1NcVVV11lwzCkLEuazSaf/OQn7Yknniie/exni//8z/+0YRhy//3326WlJX71q19xzTXX2Oc+97nC8zyuueYaG4Yh73znO+3ZZ58t1qxZI66//no78tMOOeQQ8YIXvEB8+9vftiM/7/jjjxetVosvfOEL9rTTThNPfepTxbXXXmtXL/utVgshBGvXrh37oscdd9w4WNuxYwcnnXSS8H2fHTt2MDMzw7e//W37nOc8R5xxxhniiiuusAA//elP7Qte8AIRBAE33XSTbTabKKU47bTTxCh4O+qoo8RFF10kvvnNb1qlFF//+tftRRddJC666CLxla98xU5MTHDdddfZX/3qV/bYY48VvV5vvNRfe+219mUve5mIoojHHnsMgM985jP2la98pdi4caO46qqr7OTkJPfddx9Pe9rTxNatW8WnPvUp+0Tf3Rn5ZaujzZEPW5YlGzZsIAg8JiYmADjiiCPEe97zz3bTpk285CUvEZ4vMQbm5uoGW15eodcb0OlMUhQVzWabbrdLq9URWls2bz6EoqgIggjfD4fuhU+a5tx77/1ceumlAuC0084Qy8vLtqoMnucAEmsFxliCIEJKh15vQJ6XfPGLX7bNZpP5+QMArFu3gbLU3HDDjbzhDW8QeV7ywhf8nuj3+6yZW8f09LTASjas34Tv+9x8883WdV0++clP2iiK2Ldvny3LUrzqVa8S3W6XM888U7z3ve+1F198McYYkiThda97nfjGN75h9+3bN/bZer0eQRCwa9cu+8IXvlD0ej1OP/108YEPfMCeeuqpbN++nfXr11OWJVu3bhUj1GRmZgZjDMvLyxRFwZYtW8bB1ite8QrxH//xHzaKInbs2PE4P3kUUI6ClBHkJIRgamqKQw89lJmZGbTW4r777rMHDhwQcRxzxRVX2DAMx27GOeecI6688kr76KOPcuyxxzI3N4cQgjAMcRyHxcVF5ubmxr42wMUXXyxuuOEG2+12cV2XJEno9Xq89KUvFaOgc82aNWitecYzniE+//nP25WVFc455xx27drFi170IpHnORs3buSII44QRVEwMTFBGIZs3rx5HGCvHrAS5DjqAwiCgOXlZQCs1YRhiLV1Rygl6A9W7F/99V+Iy1/5UvGud/+jraNVAwiMgThOmZqaQimXqakZsqyg3Z4gSTKUclleXsFxPAaDhChqoitQ0iUMfDrtSdqtJlgY9BPrOj6e66ArwEqMBiUF/V5MVRpazRZR2OT3XnSZuOS5zxcve+krRFXC7l17CYKANWvWsbLSJwxDbr75l7bbHbCwsITnBQihKIoKz/PYtm2bOO+888RrX/ta8cxn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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:52.827382668158585,-6.935741901397705</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAJQ2ewGshpdWhwNWnDcU0/wS++8XMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC5pdGNhcmxvdy5pZTAeFw0xMTA3MDExMDEwMjla
-Fw0zMTA3MDExMDEwMjlaMBoxGDAWBgNVBAMTD2lkcC5pdGNhcmxvdy5pZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAILi2BDSdzOK47W/Asb441DU0aCC
-gDByA8UBeSX+3MQSevOnizqWz2bIliqYkvwSP2yZv2EN6shfCXUIODpP08A6I9Y8
-1L45MY69UDW41FwoM6Y8B0AgBwVQoe0somFzoq1TEnGIV+ARS/vp3/SPEw2ZS8xH
-W2SB1gKyir3PibKxd5VYFpmcwo/PxkMZWBl+knE5tIBhsSvUAm9c9NXvXG2JbU/v
-2zPZHYrEsg+87eyOEsqgatTaqkaCMTsDUz+z9QuYuYUFmEE6ZQUqbnvzM/RdUlXV
-ScavCo8L1wU4Kop0Fa6qU5oE0nsXWL+sVPX6KXDgmYOH4+OFmwFw51xywFUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLml0Y2FybG93LmllhiZodHRwczovL2lkcC5p
-dGNhcmxvdy5pZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUqMoNTuKupV4RB2MZ
-J4Yc75IfahQwDQYJKoZIhvcNAQEFBQADggEBAACxOx6jl5eKAIzn6DSogbmVb0VH
-rOYaIIaA0MMUhyH7YqQiOACySCKQqEmiqA3mLYC2n1uMXzRUF0HgFGrgVWQLTkTU
-4cdIPXViPr1TuRCzZw5wISHu9G6F6GX+A0EH6rl3JhemX045aaUYnFn4ZpT2GtMG
-OOCmXDZHfSy1rEg+uS+zEmqwG1mcimp85irrJM8iMGUSbaftJoGjRkNNodOIQQNj
-Hh0m2mAznihkKOHbcM/aKEJFVp3VXIzWHQ3CkjL52JU69HLL/UkSvcmhXOnXzu/w
-Nqk1qHwvphmVTTjuGU3G/X+SBodR/C+F+ahxA0QkHcvBcEoxg20feB3MMgo=
-</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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itcarlow.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itcarlow.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itcarlow.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Technology Carlow</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Carlow</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.itcarlow.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ray</md:GivenName>
-    <md:SurName>Dermody</md:SurName>
-    <md:EmailAddress>mailto:Ray.Dermody@itcarlow.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Ray</md:GivenName>
-    <md:SurName>Dermody</md:SurName>
-    <md:EmailAddress>mailto:Ray.Dermody@itcarlow.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ray</md:GivenName>
-    <md:SurName>Dermody</md:SurName>
-    <md:EmailAddress>mailto:Ray.Dermody@itcarlow.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml
deleted file mode 100644
index 76961ff0..00000000
--- a/swamid-interfederations-2.0/idp.itep.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://idp.itep.br/idp/shibboleth">
-  <md: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>
-  </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">itep.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ITEP - Instituto de Tecnologia de Pernambuco</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">ITEP - Instituto de Tecnologia de Pernambuco</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ITEP - Instituto de Tecnologia de Pernambuco</mdui:Description>
-        <mdui:Description xml:lang="pt-br">ITEP - Instituto de Tecnologia de Pernambuco</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.itep.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.itep.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLjAsBgNVBAoTJUluc3RpdHV0
-byBkZSBUZWNub2xvZ2lhIGRlIFBlcm5hbWJ1Y28xDTALBgNVBAsTBFVUSUMxIzAh
-BgkqhkiG9w0BCQEWFHBsYW50YW8tdXRpY0BpdGVwLmJyMQ8wDQYDVQQHEwZSZWNp
-ZmUxEzARBgNVBAgTClBlcm5hbWJ1Y28xCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
-ZHAuaXRlcC5icjAeFw0xNTAxMzAxNDE2MjFaFw0xODAxMjkxNDE2MjFaMIGtMS4w
-LAYDVQQKEyVJbnN0aXR1dG8gZGUgVGVjbm9sb2dpYSBkZSBQZXJuYW1idWNvMQ0w
-CwYDVQQLEwRVVElDMSMwIQYJKoZIhvcNAQkBFhRwbGFudGFvLXV0aWNAaXRlcC5i
-cjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQG
-EwJCUjEUMBIGA1UEAxMLaWRwLml0ZXAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQD5QoDb/jNA1TiFRbbXcsZhhLj0XbKR2Z2u9PgA+ahtnvCDDvc+
-7oHCYs9t0P/UDIP7t8k1eLgKGb/1Zuw56HK1Ans3MWWr89XqxWo8LZVqlHcVTFL5
-eGtcH5Ew83jBGoaMPkKAPN68DvYVot8AiMrN7m4ZzTrKaW8F+gpyPqX9NdJ1NF3o
-6g6G2187weaHaEcRqBfJ0+9jK61RD+ufcQypZkOi120d/nHWG4gL/MWlYc2GsnHW
-XuAo6G55HNG7N/ihDyNwGGg2P81HLyQ352lom6fdtH9/wPjXHFvhDf9AiD6RK43D
-Q5HKK1jrmGpmgjCnnnU2i/VixR8gR9dutfWFAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAB9RY1YQJqlaJb3mpPdv0tSiG84jvKEcpKT/aNInCJ+E4w823GW5cNYhZDlk
-ZkTeHadbJSLuJrP3T7EGB7Xyvc5h/qMmLhCG3HxGnCgD6qC1xl2EdeMeOGFJy2na
-7HgEF/Z8VVN5q7Bv/dLrtT0R8ASf8pidmTunbJY4wQxdKOJR8tMS7u0kjbjv0rcM
-g15xNx4qO4znwZXq6b/YtHgXSPXH0YXDbDL1V6hzH02OhwnVQvTuqs1U/isTt7un
-ialGuHDf5vCXiTpYL0bb2cI6+5lxtDWkinby7/DJ3w2lExZI1YDmEtOzS+zPpVUu
-Dw6i1eVLb8QLB2R+pfcTZ4PrmFo=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itep.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itep.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://idp.itep.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itep.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itep.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itep.br/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">itep.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID0DCCArgCAQAwDQYJKoZIhvcNAQEFBQAwga0xLjAsBgNVBAoTJUluc3RpdHV0
-byBkZSBUZWNub2xvZ2lhIGRlIFBlcm5hbWJ1Y28xDTALBgNVBAsTBFVUSUMxIzAh
-BgkqhkiG9w0BCQEWFHBsYW50YW8tdXRpY0BpdGVwLmJyMQ8wDQYDVQQHEwZSZWNp
-ZmUxEzARBgNVBAgTClBlcm5hbWJ1Y28xCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtp
-ZHAuaXRlcC5icjAeFw0xNTAxMzAxNDE2MjFaFw0xODAxMjkxNDE2MjFaMIGtMS4w
-LAYDVQQKEyVJbnN0aXR1dG8gZGUgVGVjbm9sb2dpYSBkZSBQZXJuYW1idWNvMQ0w
-CwYDVQQLEwRVVElDMSMwIQYJKoZIhvcNAQkBFhRwbGFudGFvLXV0aWNAaXRlcC5i
-cjEPMA0GA1UEBxMGUmVjaWZlMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYDVQQG
-EwJCUjEUMBIGA1UEAxMLaWRwLml0ZXAuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQD5QoDb/jNA1TiFRbbXcsZhhLj0XbKR2Z2u9PgA+ahtnvCDDvc+
-7oHCYs9t0P/UDIP7t8k1eLgKGb/1Zuw56HK1Ans3MWWr89XqxWo8LZVqlHcVTFL5
-eGtcH5Ew83jBGoaMPkKAPN68DvYVot8AiMrN7m4ZzTrKaW8F+gpyPqX9NdJ1NF3o
-6g6G2187weaHaEcRqBfJ0+9jK61RD+ufcQypZkOi120d/nHWG4gL/MWlYc2GsnHW
-XuAo6G55HNG7N/ihDyNwGGg2P81HLyQ352lom6fdtH9/wPjXHFvhDf9AiD6RK43D
-Q5HKK1jrmGpmgjCnnnU2i/VixR8gR9dutfWFAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAB9RY1YQJqlaJb3mpPdv0tSiG84jvKEcpKT/aNInCJ+E4w823GW5cNYhZDlk
-ZkTeHadbJSLuJrP3T7EGB7Xyvc5h/qMmLhCG3HxGnCgD6qC1xl2EdeMeOGFJy2na
-7HgEF/Z8VVN5q7Bv/dLrtT0R8ASf8pidmTunbJY4wQxdKOJR8tMS7u0kjbjv0rcM
-g15xNx4qO4znwZXq6b/YtHgXSPXH0YXDbDL1V6hzH02OhwnVQvTuqs1U/isTt7un
-ialGuHDf5vCXiTpYL0bb2cI6+5lxtDWkinby7/DJ3w2lExZI1YDmEtOzS+zPpVUu
-Dw6i1eVLb8QLB2R+pfcTZ4PrmFo=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itep.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itep.br:8443/idp/profile/SAML1/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">ITEP - Instituto de Tecnologia de Pernambuco</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">ITEP - Instituto de Tecnologia de Pernambuco</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ITEP - Instituto de Tecnologia de Pernambuco</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">ITEP - Instituto de Tecnologia de Pernambuco</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.itep.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.itep.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Erick Marllon</md:SurName>
-    <md:EmailAddress>erick@itep.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.itmc.tu-dortmund.de:8443.xml b/swamid-interfederations-2.0/idp.itmc.tu-dortmund.de:8443.xml
deleted file mode 100644
index aa991d56..00000000
--- a/swamid-interfederations-2.0/idp.itmc.tu-dortmund.de:8443.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itmc.tu-dortmund.de:8443/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-dortmund.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.itmc.tu-dortmund.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.itmc.tu-dortmund.de,OU=ITMC,O=Technische Universitaet Dortmund,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFITCCBAmgAwIBAgIEDN37ezANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0w
-CwYDVQQLEwRJVE1DMR0wGwYDVQQDExRUVSBEb3J0bXVuZCBDQSAtIEcwMTEkMCIG
-CSqGSIb3DQEJARYVY2FAcGtpLnR1LWRvcnRtdW5kLmRlMB4XDTA4MDkwMzEyMDcw
-N1oXDTEzMDkwMjEyMDcwN1owaTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIFRlY2hu
-aXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0wCwYDVQQLEwRJVE1DMSAwHgYD
-VQQDExdpZHAuaXRtYy50dS1kb3J0bXVuZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALsO2TulgUJ6vDHWIZ5hthkwEUzE3sBDQMPtKSlg1CF0zHJv
-nGQuX9BjpvNXgpSy7HgDW2On9HgBKN8g1eEUxmI2OjA56wnX6usGD0afj6p0klBf
-Ds7tqGKrJFgLfA3kje6XeJxnfZDGcrjoSoF0vBLaGZ7bXGHcHvrfpvX959uLkY0A
-xCfLEsbkpfLi+wGXHqltT65H8dRs/nZzok5G7jdf5W//JccF62r125CZEICUWl7/
-pnPiXg9+3KB1FiVw4ilRWGF0Sr3Gm09DN9hbqO9T+w5ehaigL8FwuQhwqUEMRP5y
-MMfw9sCrPldn0Hx9twUbzs0Fk0Cgk5pqKyYkHFMCAwEAAaOCAaswggGnMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUJUtx5b8beB/Y2+SnhhZaBLqTj7cwHwYDVR0jBBgwFoAU+7Fc
-m23oJeSpqjJE7wKDRQ3mBuwwgYgGA1UdHwSBgDB+MD2gO6A5hjdodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD2g
-O6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBHBggrBgEFBQcwAoY7aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1kb3J0bXVuZC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUt
-ZG9ydG11bmQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQB55LgXkQIGHYZJ2E25mVjlRw8dW7DoUFLEUrtFguMOQdz7QWgtONjQw62v
-BkcnfiArg33xdkHxq4DlJoIGFHiryYrVzBYFVBodYKt8wkk1lmAPz8khR1xlmXdO
-C6EKd5GzNblXNI42MASxV/3JepjsmaZ5aaAdA0rkRSXcV6bcB/i8Dqk7F9TqKLDN
-rkHGfY8GtkLhri23ZSFB4jljOnTlN9DeSW5Lb3V9duDzji1ENBuJuoP5O4Wli3c0
-9OKtHf0euPnKJXWoilT5psU2aPrahvJwBaPQh2YU09PmUYDfk0+L+JW2Vy78rXPq
-r1DtEBo5fNXQ5o94bU4R0XFG+Zaf
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.itmc.tu-dortmund.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.itmc.tu-dortmund.de,OU=ITMC,O=Technische Universitaet Dortmund,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFITCCBAmgAwIBAgIEDN37ezANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0w
-CwYDVQQLEwRJVE1DMR0wGwYDVQQDExRUVSBEb3J0bXVuZCBDQSAtIEcwMTEkMCIG
-CSqGSIb3DQEJARYVY2FAcGtpLnR1LWRvcnRtdW5kLmRlMB4XDTA4MDkwMzEyMDcw
-N1oXDTEzMDkwMjEyMDcwN1owaTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIFRlY2hu
-aXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0wCwYDVQQLEwRJVE1DMSAwHgYD
-VQQDExdpZHAuaXRtYy50dS1kb3J0bXVuZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALsO2TulgUJ6vDHWIZ5hthkwEUzE3sBDQMPtKSlg1CF0zHJv
-nGQuX9BjpvNXgpSy7HgDW2On9HgBKN8g1eEUxmI2OjA56wnX6usGD0afj6p0klBf
-Ds7tqGKrJFgLfA3kje6XeJxnfZDGcrjoSoF0vBLaGZ7bXGHcHvrfpvX959uLkY0A
-xCfLEsbkpfLi+wGXHqltT65H8dRs/nZzok5G7jdf5W//JccF62r125CZEICUWl7/
-pnPiXg9+3KB1FiVw4ilRWGF0Sr3Gm09DN9hbqO9T+w5ehaigL8FwuQhwqUEMRP5y
-MMfw9sCrPldn0Hx9twUbzs0Fk0Cgk5pqKyYkHFMCAwEAAaOCAaswggGnMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUJUtx5b8beB/Y2+SnhhZaBLqTj7cwHwYDVR0jBBgwFoAU+7Fc
-m23oJeSpqjJE7wKDRQ3mBuwwgYgGA1UdHwSBgDB+MD2gO6A5hjdodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD2g
-O6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBHBggrBgEFBQcwAoY7aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1kb3J0bXVuZC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUt
-ZG9ydG11bmQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQB55LgXkQIGHYZJ2E25mVjlRw8dW7DoUFLEUrtFguMOQdz7QWgtONjQw62v
-BkcnfiArg33xdkHxq4DlJoIGFHiryYrVzBYFVBodYKt8wkk1lmAPz8khR1xlmXdO
-C6EKd5GzNblXNI42MASxV/3JepjsmaZ5aaAdA0rkRSXcV6bcB/i8Dqk7F9TqKLDN
-rkHGfY8GtkLhri23ZSFB4jljOnTlN9DeSW5Lb3V9duDzji1ENBuJuoP5O4Wli3c0
-9OKtHf0euPnKJXWoilT5psU2aPrahvJwBaPQh2YU09PmUYDfk0+L+JW2Vy78rXPq
-r1DtEBo5fNXQ5o94bU4R0XFG+Zaf
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itmc.tu-dortmund.de:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itmc.tu-dortmund.de:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itmc.tu-dortmund.de:8443/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itmc.tu-dortmund.de:8443/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itmc.tu-dortmund.de:8443/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.itmc.tu-dortmund.de:8443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-dortmund.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.itmc.tu-dortmund.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.itmc.tu-dortmund.de,OU=ITMC,O=Technische Universitaet Dortmund,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFITCCBAmgAwIBAgIEDN37ezANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0w
-CwYDVQQLEwRJVE1DMR0wGwYDVQQDExRUVSBEb3J0bXVuZCBDQSAtIEcwMTEkMCIG
-CSqGSIb3DQEJARYVY2FAcGtpLnR1LWRvcnRtdW5kLmRlMB4XDTA4MDkwMzEyMDcw
-N1oXDTEzMDkwMjEyMDcwN1owaTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIFRlY2hu
-aXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0wCwYDVQQLEwRJVE1DMSAwHgYD
-VQQDExdpZHAuaXRtYy50dS1kb3J0bXVuZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALsO2TulgUJ6vDHWIZ5hthkwEUzE3sBDQMPtKSlg1CF0zHJv
-nGQuX9BjpvNXgpSy7HgDW2On9HgBKN8g1eEUxmI2OjA56wnX6usGD0afj6p0klBf
-Ds7tqGKrJFgLfA3kje6XeJxnfZDGcrjoSoF0vBLaGZ7bXGHcHvrfpvX959uLkY0A
-xCfLEsbkpfLi+wGXHqltT65H8dRs/nZzok5G7jdf5W//JccF62r125CZEICUWl7/
-pnPiXg9+3KB1FiVw4ilRWGF0Sr3Gm09DN9hbqO9T+w5ehaigL8FwuQhwqUEMRP5y
-MMfw9sCrPldn0Hx9twUbzs0Fk0Cgk5pqKyYkHFMCAwEAAaOCAaswggGnMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUJUtx5b8beB/Y2+SnhhZaBLqTj7cwHwYDVR0jBBgwFoAU+7Fc
-m23oJeSpqjJE7wKDRQ3mBuwwgYgGA1UdHwSBgDB+MD2gO6A5hjdodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD2g
-O6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBHBggrBgEFBQcwAoY7aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1kb3J0bXVuZC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUt
-ZG9ydG11bmQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQB55LgXkQIGHYZJ2E25mVjlRw8dW7DoUFLEUrtFguMOQdz7QWgtONjQw62v
-BkcnfiArg33xdkHxq4DlJoIGFHiryYrVzBYFVBodYKt8wkk1lmAPz8khR1xlmXdO
-C6EKd5GzNblXNI42MASxV/3JepjsmaZ5aaAdA0rkRSXcV6bcB/i8Dqk7F9TqKLDN
-rkHGfY8GtkLhri23ZSFB4jljOnTlN9DeSW5Lb3V9duDzji1ENBuJuoP5O4Wli3c0
-9OKtHf0euPnKJXWoilT5psU2aPrahvJwBaPQh2YU09PmUYDfk0+L+JW2Vy78rXPq
-r1DtEBo5fNXQ5o94bU4R0XFG+Zaf
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.itmc.tu-dortmund.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.itmc.tu-dortmund.de,OU=ITMC,O=Technische Universitaet Dortmund,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFITCCBAmgAwIBAgIEDN37ezANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0w
-CwYDVQQLEwRJVE1DMR0wGwYDVQQDExRUVSBEb3J0bXVuZCBDQSAtIEcwMTEkMCIG
-CSqGSIb3DQEJARYVY2FAcGtpLnR1LWRvcnRtdW5kLmRlMB4XDTA4MDkwMzEyMDcw
-N1oXDTEzMDkwMjEyMDcwN1owaTELMAkGA1UEBhMCREUxKTAnBgNVBAoTIFRlY2hu
-aXNjaGUgVW5pdmVyc2l0YWV0IERvcnRtdW5kMQ0wCwYDVQQLEwRJVE1DMSAwHgYD
-VQQDExdpZHAuaXRtYy50dS1kb3J0bXVuZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALsO2TulgUJ6vDHWIZ5hthkwEUzE3sBDQMPtKSlg1CF0zHJv
-nGQuX9BjpvNXgpSy7HgDW2On9HgBKN8g1eEUxmI2OjA56wnX6usGD0afj6p0klBf
-Ds7tqGKrJFgLfA3kje6XeJxnfZDGcrjoSoF0vBLaGZ7bXGHcHvrfpvX959uLkY0A
-xCfLEsbkpfLi+wGXHqltT65H8dRs/nZzok5G7jdf5W//JccF62r125CZEICUWl7/
-pnPiXg9+3KB1FiVw4ilRWGF0Sr3Gm09DN9hbqO9T+w5ehaigL8FwuQhwqUEMRP5y
-MMfw9sCrPldn0Hx9twUbzs0Fk0Cgk5pqKyYkHFMCAwEAAaOCAaswggGnMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUJUtx5b8beB/Y2+SnhhZaBLqTj7cwHwYDVR0jBBgwFoAU+7Fc
-m23oJeSpqjJE7wKDRQ3mBuwwgYgGA1UdHwSBgDB+MD2gO6A5hjdodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMD2g
-O6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRvcnRtdW5kLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBHBggrBgEFBQcwAoY7aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1kb3J0bXVuZC1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUt
-ZG9ydG11bmQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQB55LgXkQIGHYZJ2E25mVjlRw8dW7DoUFLEUrtFguMOQdz7QWgtONjQw62v
-BkcnfiArg33xdkHxq4DlJoIGFHiryYrVzBYFVBodYKt8wkk1lmAPz8khR1xlmXdO
-C6EKd5GzNblXNI42MASxV/3JepjsmaZ5aaAdA0rkRSXcV6bcB/i8Dqk7F9TqKLDN
-rkHGfY8GtkLhri23ZSFB4jljOnTlN9DeSW5Lb3V9duDzji1ENBuJuoP5O4Wli3c0
-9OKtHf0euPnKJXWoilT5psU2aPrahvJwBaPQh2YU09PmUYDfk0+L+JW2Vy78rXPq
-r1DtEBo5fNXQ5o94bU4R0XFG+Zaf
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itmc.tu-dortmund.de:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itmc.tu-dortmund.de:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Dortmund (Technische Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Dortmund (Technische Universität)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-dortmund.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Stefan</GivenName>
-    <SurName>Rapp</SurName>
-    <EmailAddress>stefan.rapp@tu-dortmund.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Arne</GivenName>
-    <SurName>von Irmer</SurName>
-    <EmailAddress>Arne.vonIrmer@tu-dortmund.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.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 647d8b02..00000000
--- a/swamid-interfederations-2.0/idp.its.fz-juelich.de-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://idp.its.fz-juelich.de/idp/shibboleth">
-  <md: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>
-  </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">fz-juelich.de</shibmd: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:Logo height="16" width="16">https://apps.fz-juelich.de/logos/Juelich-J-16x16.png</mdui:Logo>
-        <mdui:Logo height="114" width="350">https://apps.fz-juelich.de/logos/Logo_FZ_Juelich_350x114.png</mdui:Logo>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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.its.fz-juelich.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.its.fz-juelich.de/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.its.fz-juelich.de/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">fz-juelich.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de: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">e234</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e234</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Forschungszentrum Jülich GmbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Forschungszentrum Jülich GmbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.fz-juelich.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fz-juelich.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jens</md:GivenName>
-    <md:SurName>Heidbüchel</md:SurName>
-    <md:EmailAddress>mailto:j.heidbuechel@fz-juelich.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jens</md:GivenName>
-    <md:SurName>Heidbüchel</md:SurName>
-    <md:EmailAddress>mailto:j.heidbuechel@fz-juelich.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ITS Service Desk</md:GivenName>
-    <md:SurName>Forschungszentrum Jülich GmbH</md:SurName>
-    <md:EmailAddress>mailto:it-services@fz-juelich.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 367186d1..00000000
--- a/swamid-interfederations-2.0/idp.its.fz-juelich.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://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,OU=ITS,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzzCCBLegAwIBAgIHFSIFRQ92ezANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
-MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTEzMDEyNTEzMjUwOVoXDTE4
-MDEyNDEzMjUwOVowgZQxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
-V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxDDAKBgNVBAsTA0lUUzEeMBwGA1UEAxMVaWRw
-Lml0cy5mei1qdWVsaWNoLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA7kqAIZgzj8l8CoExRFQudG0K6+1Rq82IcP8x2qixcpM2+FQUwKfg3ZKEKrzu
-FMMesVzyhyxIol/mp9jQodr5wIdX0/dJZcTPTSwcteWho/nw4xUhFHAJhe1TXmgR
-jNSjj82SEOCF3518xUcGtD8oitgVP5dJZBqsYJxsQY9hj2aOkCblbmBhypqjV+jX
-T4x6fO+5B5cWHEwV8UZDEeugmTIoPacOw0W0YGUJSnDdJ+2XryLQuPXdq8luA3E1
-6BDIzM2IwTZObT+9m3fCIpyVrupebvNHIvrDl4NxzdHUjBpT4y3WN7NNIqjzTuzh
-ubmnwyqnyH3Va/WkYmZGlmH9OwIDAQABo4ICMzCCAi8wOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUpLW/S0BSgTYQGYu2dwI7NQ0f0Y4wHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
-5ZQmVg8RAiUwOgYDVR0RBDMwMYIVaWRwLml0cy5mei1qdWVsaWNoLmRlgRhzLmhl
-aW5yaWNoQGZ6LWp1ZWxpY2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4Yx
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNy
-bDCBywYIKwYBBQUHAQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBj
-YS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9memotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYI
-KwYBBQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNl
-cnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeSJx3gmSpN4y/Xhv/
-I0+fHVmzRy6xA9zkd/vfDVAG1a1a6U0jkuTkuoN2ObXGgPIRpV61joKDruFNWNml
-chVIORDUNE24M27JcLmxBitHrbTJZ4nrVaE57jFqM6Ll4ne4yLcJNKX1k6pOMreD
-ddTOhykyujKnlcLTb2gUgwPiFU9tpCv3aNiTFoiX/XkvHn2MHIZ82sBVEsFRdFxR
-Kxi4CCebueajXrTt7Vptou9vy5anuOI8eymx2+8hcHrDz7up57CI88c+WsvTKE0j
-GY7013lX39RPwVqufTJb1rMq3Aas6tCvKZG4kshC15lWOBZcou2rLUfkABgkC40L
-mqPg
-</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,OU=ITS,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzzCCBLegAwIBAgIHFSIFRQ92ezANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UE
-BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
-MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
-KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTEzMDEyNTEzMjUwOVoXDTE4
-MDEyNDEzMjUwOVowgZQxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
-V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
-emVudHJ1bSBKdWVsaWNoIEdtYkgxDDAKBgNVBAsTA0lUUzEeMBwGA1UEAxMVaWRw
-Lml0cy5mei1qdWVsaWNoLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA7kqAIZgzj8l8CoExRFQudG0K6+1Rq82IcP8x2qixcpM2+FQUwKfg3ZKEKrzu
-FMMesVzyhyxIol/mp9jQodr5wIdX0/dJZcTPTSwcteWho/nw4xUhFHAJhe1TXmgR
-jNSjj82SEOCF3518xUcGtD8oitgVP5dJZBqsYJxsQY9hj2aOkCblbmBhypqjV+jX
-T4x6fO+5B5cWHEwV8UZDEeugmTIoPacOw0W0YGUJSnDdJ+2XryLQuPXdq8luA3E1
-6BDIzM2IwTZObT+9m3fCIpyVrupebvNHIvrDl4NxzdHUjBpT4y3WN7NNIqjzTuzh
-ubmnwyqnyH3Va/WkYmZGlmH9OwIDAQABo4ICMzCCAi8wOQYDVR0gBDIwMDARBg8r
-BgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgGBmeBDAECAjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
-FgQUpLW/S0BSgTYQGYu2dwI7NQ0f0Y4wHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
-5ZQmVg8RAiUwOgYDVR0RBDMwMYIVaWRwLml0cy5mei1qdWVsaWNoLmRlgRhzLmhl
-aW5yaWNoQGZ6LWp1ZWxpY2guZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4Yx
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS9memotY2EvcHViL2NybC9nX2NhY3JsLmNy
-bDCBywYIKwYBBQUHAQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBj
-YS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9memotY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYI
-KwYBBQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9jYWNl
-cnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeSJx3gmSpN4y/Xhv/
-I0+fHVmzRy6xA9zkd/vfDVAG1a1a6U0jkuTkuoN2ObXGgPIRpV61joKDruFNWNml
-chVIORDUNE24M27JcLmxBitHrbTJZ4nrVaE57jFqM6Ll4ne4yLcJNKX1k6pOMreD
-ddTOhykyujKnlcLTb2gUgwPiFU9tpCv3aNiTFoiX/XkvHn2MHIZ82sBVEsFRdFxR
-Kxi4CCebueajXrTt7Vptou9vy5anuOI8eymx2+8hcHrDz7up57CI88c+WsvTKE0j
-GY7013lX39RPwVqufTJb1rMq3Aas6tCvKZG4kshC15lWOBZcou2rLUfkABgkC40L
-mqPg
-</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.utexas.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.its.utexas.edu-idp-shibboleth.xml
deleted file mode 100644
index e650acb5..00000000
--- a/swamid-interfederations-2.0/idp.its.utexas.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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://idp.its.utexas.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.utexas.edu/its/helpdesk/" 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">utexas.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas at Austin</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Logon service for The University of Texas at Austin</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.utexas.edu/its/help/shibboleth</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.utexas.edu/cio/policies/web-privacy/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="344" xml:lang="en">https://www.utexas.edu/includes/core/images/wordmark-stacked-2012.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>
-MIIDNDCCAhygAwIBAgIVAKPStYoZAbTw2rzx/dJ9wcFl/s2ZMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC5pdHMudXRleGFzLmVkdTAeFw0xNDA0MTYxMjA1
-MThaFw0zNDA0MTYxMjA1MThaMB0xGzAZBgNVBAMTEmlkcC5pdHMudXRleGFzLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbHfWtWfUKtVpY5WTie
-4JNr+K4oqXWgEDMzNTY3eRQt5NzkJ9aW6XNMwGCXDjREoFJYvj1NddqHTMu5Ka/c
-/IWPBQ6wk/yOJiqn5pc7r3gxeab8waUXQ7b5lu0gv5OLUUP/FeYfQlYaegFCFkte
-RKq1JzWBKAFmsc4Sp90/R2n4C2cMASAxUQ+HrnCOhebbEBokk9mlo8K+zdxpwKsG
-FuL8SC8VbUtRWDj+l/Z9JiUvvGqLbED8iIrHWl2zGP7omJt2AsRM4YsSHKE0e6w8
-Hp0qRvxGo4e+BW2Ws1KI7NCRKtjPmMGxLt62j4W6Dx9VjcorpRgoqz+qZjOJnxmS
-ve8CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLml0cy51dGV4YXMuZWR1hilodHRw
-czovL2lkcC5pdHMudXRleGFzLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-cKXw6nHvAlzIGDoqsK23wic7dr8wDQYJKoZIhvcNAQEFBQADggEBAHn5gSpEAA5z
-BictD4hXayvmjf47zsh6FnsnJ9+B6+K/mEI5eR3+gjnrnwl68rgj9VHxI53xg1Nl
-6z2r3lqOJ7dwvV1SUis9NH0euSnJdQnCpPaxWu4s06QAaM2zZOHnux3Csug4eHrs
-Si3ZsZwCjhY3ivtdtEHGFYV9fRi2udTfcEcF1fBZsON+5c29W1PmsThYOtF5aldN
-cINu0ZcgPH9q4l8yWDrzRECYbhqEUJdhiOaTlPDMh6/lK/QIttKxhqH+Nx0z3N6F
-VZWH/+OpywKUCeg5c5S6/oGEzmcGSJHH27DJdGPoLefO8/gscFtanxC3aOp6O1Zl
-wy0ZZr9AXLI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.utexas.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.utexas.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.its.utexas.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.its.utexas.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.its.utexas.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.its.utexas.edu/idp/profile/SAML2/POST-SimpleSign/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">utexas.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAKPStYoZAbTw2rzx/dJ9wcFl/s2ZMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC5pdHMudXRleGFzLmVkdTAeFw0xNDA0MTYxMjA1
-MThaFw0zNDA0MTYxMjA1MThaMB0xGzAZBgNVBAMTEmlkcC5pdHMudXRleGFzLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbHfWtWfUKtVpY5WTie
-4JNr+K4oqXWgEDMzNTY3eRQt5NzkJ9aW6XNMwGCXDjREoFJYvj1NddqHTMu5Ka/c
-/IWPBQ6wk/yOJiqn5pc7r3gxeab8waUXQ7b5lu0gv5OLUUP/FeYfQlYaegFCFkte
-RKq1JzWBKAFmsc4Sp90/R2n4C2cMASAxUQ+HrnCOhebbEBokk9mlo8K+zdxpwKsG
-FuL8SC8VbUtRWDj+l/Z9JiUvvGqLbED8iIrHWl2zGP7omJt2AsRM4YsSHKE0e6w8
-Hp0qRvxGo4e+BW2Ws1KI7NCRKtjPmMGxLt62j4W6Dx9VjcorpRgoqz+qZjOJnxmS
-ve8CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLml0cy51dGV4YXMuZWR1hilodHRw
-czovL2lkcC5pdHMudXRleGFzLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-cKXw6nHvAlzIGDoqsK23wic7dr8wDQYJKoZIhvcNAQEFBQADggEBAHn5gSpEAA5z
-BictD4hXayvmjf47zsh6FnsnJ9+B6+K/mEI5eR3+gjnrnwl68rgj9VHxI53xg1Nl
-6z2r3lqOJ7dwvV1SUis9NH0euSnJdQnCpPaxWu4s06QAaM2zZOHnux3Csug4eHrs
-Si3ZsZwCjhY3ivtdtEHGFYV9fRi2udTfcEcF1fBZsON+5c29W1PmsThYOtF5aldN
-cINu0ZcgPH9q4l8yWDrzRECYbhqEUJdhiOaTlPDMh6/lK/QIttKxhqH+Nx0z3N6F
-VZWH/+OpywKUCeg5c5S6/oGEzmcGSJHH27DJdGPoLefO8/gscFtanxC3aOp6O1Zl
-wy0ZZr9AXLI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.utexas.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.utexas.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas at Austin</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas at Austin</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utexas.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>U.T. Austin Shibboleth Team</md:GivenName>
-    <md:EmailAddress>shibboleth@utlists.utexas.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>U.T. Austin Shibboleth Team</md:GivenName>
-    <md:EmailAddress>shibboleth@utlists.utexas.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>U.T. Austin Shibboleth Team</md:GivenName>
-    <md:EmailAddress>shibboleth@utlists.utexas.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 47821306..00000000
--- a/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.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://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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itsligo.ie/idp/profile/Shibboleth/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>mailto: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 c04f948a..00000000
--- a/swamid-interfederations-2.0/idp.ittralee.ie-idp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ittralee.ie/idp/profile/Shibboleth/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>mailto: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>mailto: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>mailto:padraig.dineen@staff.ittralee.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml
deleted file mode 100644
index b6a742e4..00000000
--- a/swamid-interfederations-2.0/idp.iuav.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iuav.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-07-01T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iuav.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University IUAV Venezia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università IUAV di Venezia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University IUAV Venezia users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università IUAV di Venezia</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.iuav.it/idem.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.iuav.it/English-Ve/About-Iuav/Iuav-profi/index.htm</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAOjXzyapswcd6xsf69yjpd4te2HWMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5pdWF2Lml0MB4XDTA5MTEzMDAwMTg0OVoXDTI5
-MTEzMDAwMTg0OVowFjEUMBIGA1UEAxMLaWRwLml1YXYuaXQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCYSifc+LKcPDkWNaSMzsNea55hJnc78G3p0p4I
-iaN79ZcmSMbYDigT7uCN0jqJQhhPu42Bs3zJnwVJhVR8Ag0qIojNMHfsD9p5kZzp
-j2TZ+bcREYQGIsqXy8XfP5UVrw8sV1KN+Xc+2iwNZ3fC7N1JMpDwUTphhHGw1mF3
-k18DjNlO18AiXMvog0FbrvfsqYw9D5vsMfyVnQDw+OX9tMoOLZExZTbEt+bGzjv6
-gStOQADpRKlELSMRWsu09aup+YPDrYTvmIY2LaVtbQidi7fA/tJwr94EKrsdDp+7
-OjsPK45SBRjGdwhdEnnR3pSN3k8jX+7UngY7BPtzEmEblInzAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5pdWF2Lml0hiJodHRwczovL2lkcC5pdWF2Lml0L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQYUwByp5fGRll5VxLUjI76AmM8sjANBgkqhkiG
-9w0BAQUFAAOCAQEAW71PMrdGAbPyJowc6isgMKRAaOesZAn0PiZBG4zB1xZzeJ9S
-WqtCGAunE7Eas7YLFIiAHg+ddonZQUyJHUQPKB9ml7XfAgLUVeT+gPJs2TuL00aj
-cLzbQ/PAYKLAUbZBmDuaSsuV/CyTivBakD6I2p6MxN84GLEmBf/27LYDGbtTOS+i
-UfwqWE4i9xF85M+YZJxfoWHGh+C3L2nuTKuZkZHSVKqpTdoYN47ciumatANtH+H0
-uqj/sHDHt3o0KgBhWw4+MJFAelDhald9bb9/V2E3vZDuV8RSVn1kDIzStdarkhtW
-dgmwVYFjA3Uc77ULxhwfAy4wsbDrXopR4Hxfsg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iuav.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iuav.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iuav.it/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://idp.iuav.it/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iuav.it/idp/profile/SAML2/POST/SLO" ResponseLocation="https://idp.iuav.it/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iuav.it/idp/profile: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.iuav.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iuav.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iuav.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iuav.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAOjXzyapswcd6xsf69yjpd4te2HWMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5pdWF2Lml0MB4XDTA5MTEzMDAwMTg0OVoXDTI5
-MTEzMDAwMTg0OVowFjEUMBIGA1UEAxMLaWRwLml1YXYuaXQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCYSifc+LKcPDkWNaSMzsNea55hJnc78G3p0p4I
-iaN79ZcmSMbYDigT7uCN0jqJQhhPu42Bs3zJnwVJhVR8Ag0qIojNMHfsD9p5kZzp
-j2TZ+bcREYQGIsqXy8XfP5UVrw8sV1KN+Xc+2iwNZ3fC7N1JMpDwUTphhHGw1mF3
-k18DjNlO18AiXMvog0FbrvfsqYw9D5vsMfyVnQDw+OX9tMoOLZExZTbEt+bGzjv6
-gStOQADpRKlELSMRWsu09aup+YPDrYTvmIY2LaVtbQidi7fA/tJwr94EKrsdDp+7
-OjsPK45SBRjGdwhdEnnR3pSN3k8jX+7UngY7BPtzEmEblInzAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5pdWF2Lml0hiJodHRwczovL2lkcC5pdWF2Lml0L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQYUwByp5fGRll5VxLUjI76AmM8sjANBgkqhkiG
-9w0BAQUFAAOCAQEAW71PMrdGAbPyJowc6isgMKRAaOesZAn0PiZBG4zB1xZzeJ9S
-WqtCGAunE7Eas7YLFIiAHg+ddonZQUyJHUQPKB9ml7XfAgLUVeT+gPJs2TuL00aj
-cLzbQ/PAYKLAUbZBmDuaSsuV/CyTivBakD6I2p6MxN84GLEmBf/27LYDGbtTOS+i
-UfwqWE4i9xF85M+YZJxfoWHGh+C3L2nuTKuZkZHSVKqpTdoYN47ciumatANtH+H0
-uqj/sHDHt3o0KgBhWw4+MJFAelDhald9bb9/V2E3vZDuV8RSVn1kDIzStdarkhtW
-dgmwVYFjA3Uc77ULxhwfAy4wsbDrXopR4Hxfsg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iuav.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iuav.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università IUAV di Venezia</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University IUAV Venezia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università IUAV di Venezia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University IUAV Venezia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.iuav.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.iuav.it/English-Ve/About-Iuav/Iuav-profi/index.htm</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Piergiorgio</md:GivenName>
-    <md:SurName>Ghezzo</md:SurName>
-    <md:EmailAddress>mailto:pier@iuav.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idem@iuav.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ivb.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 37a14302..00000000
--- a/swamid-interfederations-2.0/idp.ivb.cas.cz-idp-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://idp.ivb.cas.cz/idp/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="2015-02-03T16:51: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>
-    <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>
-  <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">ivb.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Vertebrate Biology AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav biologie obratlovců AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider IVB AS CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚBO AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ivb.cz/index_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ivb.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="40">https://jiftach.cas.cz/loga/logo-ivb-44.png</mdui:Logo>
-        <mdui:Logo height="733" width="674">https://jiftach.cas.cz/loga/logo-ivb-733.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAKTPOMQGB+LGGdHAwNPUS60Nl+MzMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pdmIuY2FzLmN6MB4XDTE1MDEyMzA5NTYwM1oX
-DTM1MDEyMzA5NTYwM1owGTEXMBUGA1UEAxMOaWRwLml2Yi5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCJqw1u6dlRca0eVr3o6b9l8WGpVcx
-znPTdRAcKS+YL2hj17JWaDz8NwVN0aI7ZCHZYzc4XfwyBJU+lT/eFO6IhE0wrE1l
-fQBfnzJYrGo/z+iOq3SPB2Ig8TEDhnSlRBslNAlbj/Xji9rs5V+6zxMvm5PoJT0F
-69vzskzhccTv7OeqgdMObe1DVizoOI5SxpVkkq/mZm9/u8CaXMy+1tlx9ppUS8X7
-cVkQ7fEUrFViGKTaBlbO09BDc+8mpLNHNrCdxhOtctnKtl/QCH/m+xLzLZjEbqWm
-1an2hObpKzNor/+ffAYs3vUncMBW8QRof2N6/xHXhCuMx7aXcc0ezbYDAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pdmIuY2FzLmN6hiVodHRwczovL2lkcC5pdmIu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRUnpwHrzxgeEohuMfhmUzm
-T97NejANBgkqhkiG9w0BAQUFAAOCAQEAX/mQ4XvMGEvQqFK2WCp4JiKBXPy16HWK
-bAs6VYUf1oinqyHMUr4jGHL4yQYtchj/L8sNnyiCtRJ3SbgvXh6TX0tqf6hJt1KG
-gR/6F6bFn3CQTHilYwlNWUjsEv3/bQeDahskTpJSA8+gRMzEH5UTc/YWILAjpEj1
-Iu5IkEoYKM1JiY/NvfOue/bAdKSJlY8IoHxj0Vgf6dxptoayENBEMxriLYqTZC9z
-eODBz7FUUN5ygnnjLQZYgQ+FPmfz0MnjmcwcIU6oPpaZWFXSwHxLPMCVoM3hGHZM
-m5Bo9+8u/vl5bAhC25NeEfUoI8Q0RVBptV0oQOH5jblwfXBZFXKa+Q==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ivb.cas.cz: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.ivb.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ivb.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ivb.cas.cz/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">ivb.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAKTPOMQGB+LGGdHAwNPUS60Nl+MzMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5pdmIuY2FzLmN6MB4XDTE1MDEyMzA5NTYwM1oX
-DTM1MDEyMzA5NTYwM1owGTEXMBUGA1UEAxMOaWRwLml2Yi5jYXMuY3owggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCJqw1u6dlRca0eVr3o6b9l8WGpVcx
-znPTdRAcKS+YL2hj17JWaDz8NwVN0aI7ZCHZYzc4XfwyBJU+lT/eFO6IhE0wrE1l
-fQBfnzJYrGo/z+iOq3SPB2Ig8TEDhnSlRBslNAlbj/Xji9rs5V+6zxMvm5PoJT0F
-69vzskzhccTv7OeqgdMObe1DVizoOI5SxpVkkq/mZm9/u8CaXMy+1tlx9ppUS8X7
-cVkQ7fEUrFViGKTaBlbO09BDc+8mpLNHNrCdxhOtctnKtl/QCH/m+xLzLZjEbqWm
-1an2hObpKzNor/+ffAYs3vUncMBW8QRof2N6/xHXhCuMx7aXcc0ezbYDAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5pdmIuY2FzLmN6hiVodHRwczovL2lkcC5pdmIu
-Y2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRUnpwHrzxgeEohuMfhmUzm
-T97NejANBgkqhkiG9w0BAQUFAAOCAQEAX/mQ4XvMGEvQqFK2WCp4JiKBXPy16HWK
-bAs6VYUf1oinqyHMUr4jGHL4yQYtchj/L8sNnyiCtRJ3SbgvXh6TX0tqf6hJt1KG
-gR/6F6bFn3CQTHilYwlNWUjsEv3/bQeDahskTpJSA8+gRMzEH5UTc/YWILAjpEj1
-Iu5IkEoYKM1JiY/NvfOue/bAdKSJlY8IoHxj0Vgf6dxptoayENBEMxriLYqTZC9z
-eODBz7FUUN5ygnnjLQZYgQ+FPmfz0MnjmcwcIU6oPpaZWFXSwHxLPMCVoM3hGHZM
-m5Bo9+8u/vl5bAhC25NeEfUoI8Q0RVBptV0oQOH5jblwfXBZFXKa+Q==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ivb.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Vertebrate Biology AS CR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav biologie obratlovců AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Vertebrate Biology AS CR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav biologie obratlovců AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ivb.cz/index_en.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ivb.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</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 a6b29bf7..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.izs.it/idp/shibboleth">
-  <md: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>
-  </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">izs.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.izs.it/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.izs.it/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it: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.izs.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.izs.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.izs.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.izs.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izs.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.izs.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.izs.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.izs.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Fabrizio</md:GivenName>
-    <md:SurName>Quaranta</md:SurName>
-    <md:EmailAddress>mailto:idem@izs.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Daniele</md:GivenName>
-    <md:SurName>Zippo</md:SurName>
-    <md:EmailAddress>mailto:idem@izs.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.jisc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.jisc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 54394ccb..00000000
--- a/swamid-interfederations-2.0/idp.jisc.ac.uk-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" entityID="https://idp.jisc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Jisc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-28T13:43:58Z">
-      <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">jisc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">corp.jisc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLjCCAhYCCQCv1Jl+hrmSWjANBgkqhkiG9w0BAQUFADBZMQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDENMAsGA1UEChME
-						SklTQzEXMBUGA1UEAxMOaWRwLmppc2MuYWMudWswHhcNMTQwMzEzMTAzMzE0WhcN
-						MzQwMzA4MTAzMzE0WjBZMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHQnJpc3RvbDEQ
-						MA4GA1UEBxMHQnJpc3RvbDENMAsGA1UEChMESklTQzEXMBUGA1UEAxMOaWRwLmpp
-						c2MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCds/3E0LCX
-						CKEsKlPjxzFBrktliW7ldFZupqcIdVyXhPYP7u9dKcf5bU3h/1R2Q0AUP1EqCuX/
-						Py8lpJKAO59+YQgM70FWUS0oVr9QxvJiSn5fmCa7vhAIDQtwMekl3523ByfRgynN
-						QRS01OjHPE0oaJAb1dDgt1KK5WCHnW7udrWbdOyRWuvvgDgyqecK253BG8kungcz
-						JvJ+zhI57sEM2+DTCuuzKgVnzqn7WvezswOmWAJvxGXW8iEkJYydrxItCF1aYrU2
-						MgRQZHeyUogJaiLU7PZ0Rq9Pw1McPaZZ4qoo4j09w3AIu9+tUwdhpBmpE9PrVgwo
-						UprGqV4ITCUtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAA12gtk7woOH+ILs1Ynf
-						L4BBT/skUhrKn8XHEynizu4qlcbHVIS5vH7zHp/Fmj2v9Yy9PKrynFCXQvVi0HsH
-						ySBQuNMT40gOFlkQp/CH1fiTZGykl3BsaQEsS5JLmIOfg/LO6rtnEqeHXtBOuDb+
-						aXdMpXwcO7nsHvTE1HWtrIxfBOKpKVa0O7A07iTs+OYaFBCxo3btFpZ/QoZgnyx3
-						Duqj4fvKfPlVB+aysYQV9dQFwaOofRgxAtiivGncenCqmNaF44KacrINzfWY22om
-						8H2um6dpNv1oaivSr1PS79zX6aO4G0jFH9MHotmgICOJx6V2ROMnu1ZdXx2yxRUP
-						dnA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.jisc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.jisc.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.jisc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.jisc.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.jisc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.jisc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.jisc.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">jisc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">corp.jisc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLjCCAhYCCQCv1Jl+hrmSWjANBgkqhkiG9w0BAQUFADBZMQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDENMAsGA1UEChME
-						SklTQzEXMBUGA1UEAxMOaWRwLmppc2MuYWMudWswHhcNMTQwMzEzMTAzMzE0WhcN
-						MzQwMzA4MTAzMzE0WjBZMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHQnJpc3RvbDEQ
-						MA4GA1UEBxMHQnJpc3RvbDENMAsGA1UEChMESklTQzEXMBUGA1UEAxMOaWRwLmpp
-						c2MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCds/3E0LCX
-						CKEsKlPjxzFBrktliW7ldFZupqcIdVyXhPYP7u9dKcf5bU3h/1R2Q0AUP1EqCuX/
-						Py8lpJKAO59+YQgM70FWUS0oVr9QxvJiSn5fmCa7vhAIDQtwMekl3523ByfRgynN
-						QRS01OjHPE0oaJAb1dDgt1KK5WCHnW7udrWbdOyRWuvvgDgyqecK253BG8kungcz
-						JvJ+zhI57sEM2+DTCuuzKgVnzqn7WvezswOmWAJvxGXW8iEkJYydrxItCF1aYrU2
-						MgRQZHeyUogJaiLU7PZ0Rq9Pw1McPaZZ4qoo4j09w3AIu9+tUwdhpBmpE9PrVgwo
-						UprGqV4ITCUtAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAA12gtk7woOH+ILs1Ynf
-						L4BBT/skUhrKn8XHEynizu4qlcbHVIS5vH7zHp/Fmj2v9Yy9PKrynFCXQvVi0HsH
-						ySBQuNMT40gOFlkQp/CH1fiTZGykl3BsaQEsS5JLmIOfg/LO6rtnEqeHXtBOuDb+
-						aXdMpXwcO7nsHvTE1HWtrIxfBOKpKVa0O7A07iTs+OYaFBCxo3btFpZ/QoZgnyx3
-						Duqj4fvKfPlVB+aysYQV9dQFwaOofRgxAtiivGncenCqmNaF44KacrINzfWY22om
-						8H2um6dpNv1oaivSr1PS79zX6aO4G0jFH9MHotmgICOJx6V2ROMnu1ZdXx2yxRUP
-						dnA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.jisc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.jisc.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">Jisc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Jisc</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jisc.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Grigg</SurName>
-    <EmailAddress>mailto:m.grigg@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Grigg</SurName>
-    <EmailAddress>mailto:m.grigg@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.johnruskin.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.johnruskin.ac.uk-shibboleth.xml
deleted file mode 100644
index df6214eb..00000000
--- a/swamid-interfederations-2.0/idp.johnruskin.ac.uk-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.johnruskin.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for John Ruskin College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">johnruskin.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/johnruskin.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/johnruskin.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">John Ruskin College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.johnruskin.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.juilliard.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.juilliard.edu-idp-shibboleth.xml
deleted file mode 100644
index f2d6d319..00000000
--- a/swamid-interfederations-2.0/idp.juilliard.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +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://idp.juilliard.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.juilliard.edu/juilliards-incommon-federated-id-system" 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">juilliard.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The Juilliard School</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The identity provider for InCommon operations.</mdui:Description>
-        <mdui:Logo height="109" width="300" xml:lang="en">https://idp.juilliard.edu/idp/images/jlogo2011.jpg</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>
-MIIDLzCCAhegAwIBAgIUd4dtEwhlfYyB4HH7Ogd0EyU2elIwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLmp1aWxsaWFyZC5lZHUwHhcNMTIwMzAxMjAxNDA5
-WhcNMzIwMzAxMjAxNDA5WjAcMRowGAYDVQQDExFpZHAuanVpbGxpYXJkLmVkdTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjC0qHg4m+AvA1GoEIJ/jX6
-KQxKJNEm4UrcRXbZ3oncAXIYVC/HUmWP6/jcrKhYyxvQoADMi7KLkZsFQ1IiZz7G
-q0KicuR6/DIduO/xhBTRc2gjTtF+f+XuPBx5PMRiZAhDgOwvGGZgKnlgRYihQ0in
-BuU2aEijI67C03n6ohTYM86DLLQUmkIB9YDOrz53glNOCvBxm4NTyYz3G9i6kNaz
-R7ADUTR3sUolhlnO+KKN70Zo2RVfOvKJfuv0w/4d8JUL18ly/+cQyrhf9nsjSHpa
-F//8J0e31VI4wzsRHCrKc2zny5o1D+FGTaoV3y6oF30u1ek6Sy2OsUVI9O/zoyEC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLmp1aWxsaWFyZC5lZHWGKGh0dHBzOi8v
-aWRwLmp1aWxsaWFyZC5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFN3rKo1I
-RY3WwTMF9W/xgty5B5wlMA0GCSqGSIb3DQEBBQUAA4IBAQCVwQkjs3pzOCFOCt4n
-qRuBLtc9UK8Ut9Ridd9DooFiN0NMAe2+e4yVdE7R04oNSlF0k9dQYkFisM5rEOGr
-CRioWvGAmCweetpmDjHwuoo9N93KfJOq9MmnjIfQax/AqdraW8crsKkTJnjD9TnD
-4Wkr7bLv0TuA3FzVRhGzTsnaBLUHQz6tOxJZlZPImhw6GUn+jmbXP9ZehN5RMWgR
-3u3lvuhNYYJ++Wz5qn2TEOjzPOaN78gqrdDQJGrzyupyoQozGPabm54G3TY3j7LN
-wbbE50o+AHJCe0UX6qPQgV/B79j6Z0uAL93NiL+v7e2tJYZj1ePR7gzqBX1YK5zs
-NIEi
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.juilliard.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.juilliard.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.juilliard.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.juilliard.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.juilliard.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">juilliard.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUd4dtEwhlfYyB4HH7Ogd0EyU2elIwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLmp1aWxsaWFyZC5lZHUwHhcNMTIwMzAxMjAxNDA5
-WhcNMzIwMzAxMjAxNDA5WjAcMRowGAYDVQQDExFpZHAuanVpbGxpYXJkLmVkdTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKjC0qHg4m+AvA1GoEIJ/jX6
-KQxKJNEm4UrcRXbZ3oncAXIYVC/HUmWP6/jcrKhYyxvQoADMi7KLkZsFQ1IiZz7G
-q0KicuR6/DIduO/xhBTRc2gjTtF+f+XuPBx5PMRiZAhDgOwvGGZgKnlgRYihQ0in
-BuU2aEijI67C03n6ohTYM86DLLQUmkIB9YDOrz53glNOCvBxm4NTyYz3G9i6kNaz
-R7ADUTR3sUolhlnO+KKN70Zo2RVfOvKJfuv0w/4d8JUL18ly/+cQyrhf9nsjSHpa
-F//8J0e31VI4wzsRHCrKc2zny5o1D+FGTaoV3y6oF30u1ek6Sy2OsUVI9O/zoyEC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLmp1aWxsaWFyZC5lZHWGKGh0dHBzOi8v
-aWRwLmp1aWxsaWFyZC5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFN3rKo1I
-RY3WwTMF9W/xgty5B5wlMA0GCSqGSIb3DQEBBQUAA4IBAQCVwQkjs3pzOCFOCt4n
-qRuBLtc9UK8Ut9Ridd9DooFiN0NMAe2+e4yVdE7R04oNSlF0k9dQYkFisM5rEOGr
-CRioWvGAmCweetpmDjHwuoo9N93KfJOq9MmnjIfQax/AqdraW8crsKkTJnjD9TnD
-4Wkr7bLv0TuA3FzVRhGzTsnaBLUHQz6tOxJZlZPImhw6GUn+jmbXP9ZehN5RMWgR
-3u3lvuhNYYJ++Wz5qn2TEOjzPOaN78gqrdDQJGrzyupyoQozGPabm54G3TY3j7LN
-wbbE50o+AHJCe0UX6qPQgV/B79j6Z0uAL93NiL+v7e2tJYZj1ePR7gzqBX1YK5zs
-NIEi
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.juilliard.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Juilliard School</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The Juilliard School</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.juilliard.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jeremy Pinquist</md:GivenName>
-    <md:EmailAddress>jpinquist@juilliard.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alex Milyavskiy</md:GivenName>
-    <md:EmailAddress>amilyavskiy@juilliard.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tunde Giwa</md:GivenName>
-    <md:EmailAddress>tgiwa@juilliard.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 cd11552d..00000000
--- a/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,222 +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>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md: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 the National Library of Sweden.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kb.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kb.se</mdui:InformationURL>
-        <mdui:Logo height="488" width="516">https://idp.kb.se/idp/images/logga_FB.gif</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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIUVlpEkwM6W7NogVNrIcnSovJJzLowDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmtiLnNlMB4XDTE1MDgxMDEyNTczOVoXDTM1MDgx
-MDEyNTczOVowFDESMBAGA1UEAwwJaWRwLmtiLnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAniN/W+xmhOb6fRxlZzpuExUrXC3MOToI7n1LyH0G2Nhj
-N1yHX8t0HXrN/7yEpfnRfQyoPdFfykbk3m1FisbG9Hb2lKIQgHg/HCeUy8ZjPrv0
-Udm61gDLmAmM3XFlAuTai1VaWM2bZ5ryAj1d0g0D4mhYOX3oX5AkUIsI6paK65Fp
-qIMmjy68mdc4YU46zBMqUDh0XE8QMlTHWn7LGaN++Jzplkb0endf+IHnmHWUp/Sf
-WjZPZoE9QsFiCBwc8QvKq5FHfz46Vmyq15D9SVHB3fTFYf4w0TW55c8pjj85kkIY
-ueiez00hZyTVxSqZseuM9rHRCxB76yEMRgZUJHFKMQIDAQABo1kwVzAdBgNVHQ4E
-FgQUAsbWuxVaIA5eRCHaEyQTzc49AkEwNgYDVR0RBC8wLYIJaWRwLmtiLnNlhiBo
-dHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAWYpAjS5HZumHRA88Gn3l+NynYPYJ59NMte+zxhacisAzB1JCX+zkGXnkoZD6
-rocz8f+oNT/MZ03dpunXKja7dg4YCQD0u1ZN4EhL7CC/FF8MGnGx7jhWg2ZlmcmP
-U4crVcymICV4t5NhPK2/UPQK542Nb8fuOGFwzHKr69JRojgxsf4T/Z8Na0/nLdza
-IEE+xgp+RP9KZExoKSW1kFj73DtXdGIH3JR9kqnuoXB0SfodVn/VDwycz1Z/O0yN
-4A8qH0ICOY7dpFmIlqG3zQt22utADnEPw//MMGt+jPcOmt2oc93fANBuL4Wu3lxM
-6plirV23s6E7Nr/N8VPwy4+Miw==
-                        </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>
-MIIDDzCCAfegAwIBAgIUPRTxiWnkKuI40epCA9OdEIV5odIwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmtiLnNlMB4XDTE1MDgxMDEyNTczN1oXDTM1MDgx
-MDEyNTczN1owFDESMBAGA1UEAwwJaWRwLmtiLnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwg3Y6eES14Isvg/Ap8W5YO4DXF0vwoEDb/7XDRE/WHUi
-q0Ap38W5E1b/NjEEGhLN6JTdDqGIYG4Kto5cX0QR1GnhYOJmzOae03ucFlOVtYCR
-DFk4r/6+cvIr1boHJlO9ImA5kaASu2wkwQyXr0jNFnN+XVp7HLxsW2fU3/QoULst
-yJZZ2WczVdzYnVfTKc1bN5eWPFY0ecPn9aCuhBQtp3PH5cB80z6l3bb1FxmY63O0
-28Jm6zCqcu71i+z0uiCtb2smJn1iNjOC0klZ6IiOIGEYLuZD1DOesjtsOaEolJ9x
-FuB6usz5ihNX0qF/VMpkC53e3aduI0KUgSvJI2nqDwIDAQABo1kwVzAdBgNVHQ4E
-FgQUjcwI2OZxCno35tShnBhWegdInagwNgYDVR0RBC8wLYIJaWRwLmtiLnNlhiBo
-dHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEASGYv4EjsN5N9jiwU2/78TEWYXoo9KIQGjbe5HlEy1VPsUgrwCsyUYfTW1elg
-xezSwNLpkXZ9j4G1LCLUzxDi/SoftR9hBim09A9EiSJCCNpNGdrAgI85k8Jo+8k1
-sQv7s+f3pqBFVrJBw40PngEUQe42R3mbBCqYwUu7g6zdcI3usNX/xS10wLh14uiB
-1GSHDTtjNXPJXUztVqC059+VZd0+XOcVHvCsi3iVUYwmXxGAhNehQ5wwkk3u2M3v
-ID7dVun5XzLL4GkdMk4gz2V0fMGCYFGYdkEO3cuzzzJmrlcb7LLZz/AxG0MH0MsR
-wo6wrN/1o5l0p8UXK9qqgh5+Bw==
-                        </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>
-MIIDEDCCAfigAwIBAgIVAI0FNsztKW2wPAG/Bo8IvsP2dpNeMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5rYi5zZTAeFw0xNTA4MTAxMjU3MzhaFw0zNTA4
-MTAxMjU3MzhaMBQxEjAQBgNVBAMMCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMz0SqErrZekQ6g4Fwg8lNSqp++kITIJzr3HwN9ypTrs
-dlaK+PjcVv2D7xLC1V/PIk26yAzfXdYKWNgSKkPbMLG+ecbmtHDA6d3EC6jqrTWE
-a0u/JyUOVZxPIwwNu2uGmhROsFK3IdW1HSI0e8f4wkxZFuIIFHH37pD/wk2MaMxv
-V/vXnBwwiqXcWTOQrEhHnkVdjLaqSHDiExyTmXstt5BeIzd9rrakg0YlwFxwKtDJ
-P5iPhKS1ZemKRTxIU0vOckk4jvfXaADjbnhTGDuwjcYnfDv+JWP8xt7m4V9z+m8w
-AXt98Wa18VA4N+O62RiVFfm2lslsBRu6zWNpLdR+sckCAwEAAaNZMFcwHQYDVR0O
-BBYEFEZYvgd9ltT45J9pZZvI1H3Y9TcNMDYGA1UdEQQvMC2CCWlkcC5rYi5zZYYg
-aHR0cHM6Ly9pZHAua2Iuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAD8tdkE/VTtTrOo3QI39qM/1SXWLavHxcAezHjPfz0Ny+TUQndJAdrDmx3Tm
-VhYehCFaogq13zv9EmYqOFSvb6XIQ9lvktS3CXu84HTOhUPrfhZhEPCr4dagr7eb
-txzcsI8ROybUkjQ1ZuBhix5ep9zIvvKN9hwX/Lynif1DnPVpHSWkqJUC539yzp/q
-o5Zg08dqglDKEaVM5kaAFrGmDl58sfMfuB+F/C+1U89MeiFSqa6+dXci8swOmOhd
-1YITw59DTTD5FxnbnScRfjOE3tU7Iet2KI85BLnkTxbycEH+6dbmXQJrho5tSfS8
-hJ2GrICmdWsVIb88lmoEw8Hn/ew=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kb.se/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kb.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kb.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kb.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kb.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDzCCAfegAwIBAgIUVlpEkwM6W7NogVNrIcnSovJJzLowDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmtiLnNlMB4XDTE1MDgxMDEyNTczOVoXDTM1MDgx
-MDEyNTczOVowFDESMBAGA1UEAwwJaWRwLmtiLnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAniN/W+xmhOb6fRxlZzpuExUrXC3MOToI7n1LyH0G2Nhj
-N1yHX8t0HXrN/7yEpfnRfQyoPdFfykbk3m1FisbG9Hb2lKIQgHg/HCeUy8ZjPrv0
-Udm61gDLmAmM3XFlAuTai1VaWM2bZ5ryAj1d0g0D4mhYOX3oX5AkUIsI6paK65Fp
-qIMmjy68mdc4YU46zBMqUDh0XE8QMlTHWn7LGaN++Jzplkb0endf+IHnmHWUp/Sf
-WjZPZoE9QsFiCBwc8QvKq5FHfz46Vmyq15D9SVHB3fTFYf4w0TW55c8pjj85kkIY
-ueiez00hZyTVxSqZseuM9rHRCxB76yEMRgZUJHFKMQIDAQABo1kwVzAdBgNVHQ4E
-FgQUAsbWuxVaIA5eRCHaEyQTzc49AkEwNgYDVR0RBC8wLYIJaWRwLmtiLnNlhiBo
-dHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEAWYpAjS5HZumHRA88Gn3l+NynYPYJ59NMte+zxhacisAzB1JCX+zkGXnkoZD6
-rocz8f+oNT/MZ03dpunXKja7dg4YCQD0u1ZN4EhL7CC/FF8MGnGx7jhWg2ZlmcmP
-U4crVcymICV4t5NhPK2/UPQK542Nb8fuOGFwzHKr69JRojgxsf4T/Z8Na0/nLdza
-IEE+xgp+RP9KZExoKSW1kFj73DtXdGIH3JR9kqnuoXB0SfodVn/VDwycz1Z/O0yN
-4A8qH0ICOY7dpFmIlqG3zQt22utADnEPw//MMGt+jPcOmt2oc93fANBuL4Wu3lxM
-6plirV23s6E7Nr/N8VPwy4+Miw==
-                        </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>
-MIIDDzCCAfegAwIBAgIUPRTxiWnkKuI40epCA9OdEIV5odIwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJaWRwLmtiLnNlMB4XDTE1MDgxMDEyNTczN1oXDTM1MDgx
-MDEyNTczN1owFDESMBAGA1UEAwwJaWRwLmtiLnNlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwg3Y6eES14Isvg/Ap8W5YO4DXF0vwoEDb/7XDRE/WHUi
-q0Ap38W5E1b/NjEEGhLN6JTdDqGIYG4Kto5cX0QR1GnhYOJmzOae03ucFlOVtYCR
-DFk4r/6+cvIr1boHJlO9ImA5kaASu2wkwQyXr0jNFnN+XVp7HLxsW2fU3/QoULst
-yJZZ2WczVdzYnVfTKc1bN5eWPFY0ecPn9aCuhBQtp3PH5cB80z6l3bb1FxmY63O0
-28Jm6zCqcu71i+z0uiCtb2smJn1iNjOC0klZ6IiOIGEYLuZD1DOesjtsOaEolJ9x
-FuB6usz5ihNX0qF/VMpkC53e3aduI0KUgSvJI2nqDwIDAQABo1kwVzAdBgNVHQ4E
-FgQUjcwI2OZxCno35tShnBhWegdInagwNgYDVR0RBC8wLYIJaWRwLmtiLnNlhiBo
-dHRwczovL2lkcC5rYi5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-AQEASGYv4EjsN5N9jiwU2/78TEWYXoo9KIQGjbe5HlEy1VPsUgrwCsyUYfTW1elg
-xezSwNLpkXZ9j4G1LCLUzxDi/SoftR9hBim09A9EiSJCCNpNGdrAgI85k8Jo+8k1
-sQv7s+f3pqBFVrJBw40PngEUQe42R3mbBCqYwUu7g6zdcI3usNX/xS10wLh14uiB
-1GSHDTtjNXPJXUztVqC059+VZd0+XOcVHvCsi3iVUYwmXxGAhNehQ5wwkk3u2M3v
-ID7dVun5XzLL4GkdMk4gz2V0fMGCYFGYdkEO3cuzzzJmrlcb7LLZz/AxG0MH0MsR
-wo6wrN/1o5l0p8UXK9qqgh5+Bw==
-                        </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>
-MIIDEDCCAfigAwIBAgIVAI0FNsztKW2wPAG/Bo8IvsP2dpNeMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCWlkcC5rYi5zZTAeFw0xNTA4MTAxMjU3MzhaFw0zNTA4
-MTAxMjU3MzhaMBQxEjAQBgNVBAMMCWlkcC5rYi5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMz0SqErrZekQ6g4Fwg8lNSqp++kITIJzr3HwN9ypTrs
-dlaK+PjcVv2D7xLC1V/PIk26yAzfXdYKWNgSKkPbMLG+ecbmtHDA6d3EC6jqrTWE
-a0u/JyUOVZxPIwwNu2uGmhROsFK3IdW1HSI0e8f4wkxZFuIIFHH37pD/wk2MaMxv
-V/vXnBwwiqXcWTOQrEhHnkVdjLaqSHDiExyTmXstt5BeIzd9rrakg0YlwFxwKtDJ
-P5iPhKS1ZemKRTxIU0vOckk4jvfXaADjbnhTGDuwjcYnfDv+JWP8xt7m4V9z+m8w
-AXt98Wa18VA4N+O62RiVFfm2lslsBRu6zWNpLdR+sckCAwEAAaNZMFcwHQYDVR0O
-BBYEFEZYvgd9ltT45J9pZZvI1H3Y9TcNMDYGA1UdEQQvMC2CCWlkcC5rYi5zZYYg
-aHR0cHM6Ly9pZHAua2Iuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-ggEBAD8tdkE/VTtTrOo3QI39qM/1SXWLavHxcAezHjPfz0Ny+TUQndJAdrDmx3Tm
-VhYehCFaogq13zv9EmYqOFSvb6XIQ9lvktS3CXu84HTOhUPrfhZhEPCr4dagr7eb
-txzcsI8ROybUkjQ1ZuBhix5ep9zIvvKN9hwX/Lynif1DnPVpHSWkqJUC539yzp/q
-o5Zg08dqglDKEaVM5kaAFrGmDl58sfMfuB+F/C+1U89MeiFSqa6+dXci8swOmOhd
-1YITw59DTTD5FxnbnScRfjOE3tU7Iet2KI85BLnkTxbycEH+6dbmXQJrho5tSfS8
-hJ2GrICmdWsVIb88lmoEw8Hn/ew=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga biblioteket</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">National Library of Sweden</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kb.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>National Library of Sweden</md:Company>
-    <md:SurName>Mattias Olsson</md:SurName>
-    <md:EmailAddress>mailto:mattias.olsson@kb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46700073534</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>National Library of Sweden</md:Company>
-    <md:SurName>Mattias Olsson</md:SurName>
-    <md:EmailAddress>mailto:swamid@kb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46700073534</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>National Library of Sweden</md:Company>
-    <md:SurName>swamid@kb.se</md:SurName>
-    <md:EmailAddress>mailto:swamid@kb.se</md:EmailAddress>
-    <md:TelephoneNumber>+46700073555</md:TelephoneNumber>
-  </md: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 0043cb55..00000000
--- a/swamid-interfederations-2.0/idp.kb.se.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.10.249.131/32</mdui:IPHint>
-        <mdui:DomainHint>kb.se</mdui:DomainHint>
-        <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="technical">
-    <Company>Kungliga Biblioteket</Company>
-    <EmailAddress>swamid@kb.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kdg.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kdg.be-idp-shibboleth.xml
deleted file mode 100644
index b4bccaf5..00000000
--- a/swamid-interfederations-2.0/idp.kdg.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,121 +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://idp.kdg.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">kdg.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Karel de Grote-Hogeschool</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Karel de Grote-Hogeschool, Katholieke Hogeschool Antwerpen</mdui:Description>
-        <mdui:Logo height="64" width="250">data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAAPoAAABACAYAAAAzvWouAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlwdGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4KTMInWQAAQABJREFUeAHtvQeAVsX1/332ebbTli4gvQgoCqKAoghir7F3sHfFbjR2Y42JPUosaLBDBFRUpKlUpXeV3qXX7e39fM88d3fBEpNgfvm/MrDPvXfuzJkzZ06bes12h90U2E2B/99TIKmkpKTUjP+WxD9d/Le84qUlVkJcEkn0ptR/SsmhOEVylxQvT/9/dCdUVI9SbmKxmF182Tu2eOkmokoto1K6fTz44l2C2QN/HG6jx8y30pIYoEvsixFXe7leOmUlJcV2STllQKiXqB0aRw+hfZJ2bqeyDKqyE4MY0UNNSlv9TPoKWf/t21Ci8NNdkuOcZKJFiT8Ll11Om38b299exuSRoxZYbkFhaAza6MTj2uxIBRgrBpNMn7nKlq3cRNPRiPBaaXGJHXVEG0tPiycaNTDgjpn/e0/i48DUQdDWb8i1Veu2g23MKucU7TJENm/Js5Vrc2DaUisuEhObFUOLWCz+6wiTyOoEL3FBWb92m02cssxGjlpoS5dttJWrtjgOGWlpVq9uprXbt4F1PbiJ7dN2D6teI8Okd9BH5PVkv9qPDIFEXD8qM5iNUitBISYliU6hXX41BHYD/lkKJD/8+EhbAfPEYkmWHI/9QNDFY3PnfG8nn/W6pWemoqDVnCXWtUtzO+mEtjxiQWnW/+sQrJgsVzkmQfhhsl3IY6o9Ii1OtqJEveNxlF1pMX9i6goIlKPy79+5hSyxdetz7eFHRth7H821qpkpeFmykCoreFZbcgpszabtNnXuGuv39lQ75fg29vjDJyDkKAja9lcPwich5Zs3Ztvk6d9bp471rWq19IQC/tUx2F3Az1AgWXwki602KnUhDqmdv4jMyyuysy94w9IrpViM98WxEmvbtLa9+uJpVlpE44qJpM5DMydYn8cQxUUMAAvwLCvo1kl8t+NtWT5PJxSEUshU/s6jE4AFInErcCGAH9bVBY8CVJ2ghMpTRCl3vlaAyquQvhz3SKiUS10ZLDiWSsoxhGC54nHVszxtlF9pyuNVkkJ53vJ7kSXQK9AnwFq0cKMdefKrlp4St6pVULaY6BhKhW6Xt1lpgv6ir7otyRSx3z4NKEMESFjTBC29aEeBnwpKKbymdDR7gh3A0BNGGAV4Ed68khFIFO1gx49ZanfcO9SWrN7mBmDy6D5WpWqClgKl9GUIcOcwEvX1skKJShNKjtJ7pt0//wEFkr1RI+ZMULekGFsFw6hPdcRxfa1AZC+GsWLFVr9GZRv8j4ucyWLJoUmCfih2heGM4g3lrchdEqKhxhTDxcN9gunk0ZWY8kXxwIuJ1WnoYpzuhOAk0AIGAsVvxIBeOi9VfhL55KZHwhdLMGxIE0EA8E8Eh61kCe6Vuys5joSotLjYkrDcgltaigUX8sUBbokED2/IFSUEVbcGORQ2pC0WctAyCSVUaiQjm7pDogev5OdWCEm8KzF1pfAbACLX/LjT+1lKajKUAgcJOMVWz0q3ow9pbMcd1y7ApfYzZi6zj3Hpl63cYhlVQrokcJXrLL9LeIpGTr/Q8JTjFOIqIQcXJBf9QR4KcdygK+0VaipEI89F9Cat6qaXgPnrS+Ns9aZcS89ItZycPOKKBDXQUW3Ofw0JuXEQTC/OoTgdUNPACpySVEI7uxFRmbvDf0qB5B8DUJqUTOOU2uHHv2QbttAfFdMh5GlYlM8ZfJJ1kkAFK0VrwcxJWI6SEgblaHBZmpJEvzUWh7mc2eIwJEwCo6mL4GOApI3xzhlLEgBcMWJRUbFbhDjCKyUgCyYF4vzET5E4PSFcceWDkcVsJHFGEQ760+WXB8EvoqZywyW44FtYYkUIZzJGNE4f3IPgJlFf8BQ+CjGYvcQVAeQkUsyvuhSVwOhCishkXsWoj0QN/UX9pLA8OfAEJQTBTMJbAA3el9hxp71ODDiJSEIB2jx4+5F21rn7O51VnlCTkHbu2tguv+pQ4AXIguUKyekv2lJHxzOkF9FK8qEtCKWoTRKKRLmjdpCHlJyMggN3ISBBVC2EtPrfkWKlRngSYYAyoUpIR4kSaNKKV5TH+QZIoo+cjWKuLvwoBacjhUu5xncLuai0y4ILulx39bUjjhONL2PUes3KzRDd7ZIVwPCjhl5BweqZBmHQVRpeKebN22SPPPaZTZqxEsYhGniyPimxFDvrd3vbHXce7lYvWIfQ4L0ueNPyioqshEGtq684zA7t1sj69BlioycvhLHjNmbYlVarZujjFReW2g03vm/DJy5T6eJEZ7qDOjS0F1883ZJTxHiworhUxYdLYLDE/T+7yLpKFc2esdouvm6QZWcXUkawzod03NNe7ns29Ajlyn2XPCs4E0vxIYQxhKLfS+Pt+X5TLDc/30kqXGrQV334zmPssMNbCAB5RANZ2gTCDknVkqWTYBfZ+/+YYzlF2ZZammJFlFWQV2xvvXSOdenS0OuntEle4eBNxOKUBA0kWEpAMfzEbdqMFfboYyNQqkTEkq1//3OtYHuRHXbc3yw7P9uyMjJswpjryCPPw2z+gnV2BbRevWp7qK9UAO1x+hF72f0PH+OCL3TlRa3GTb/+hkE8ldoSBmvjIgoFa3Dw2uv+QTcKxQ3vXHnJQdbzmFbKRcoSy95ebGf06m/LVmxIKIwg3Kcf19buvf9YgfcQjMmONIre7b7+cgq4oCt5RVK+/MIE+2LyiiDkMPR2Bno+fOtCq8uoboLT/QpLco3bM38ebc++PRmGRNjglDiCWwLjS3kUlBTY39+faQMYRJo+8XpylLP2zO/WwMjFVlRQbFu2ZNvRJ/zNVqzPRtPDDDJTQgrme/PNKfbAX0a6xsemyJgr2uKUN276cmvf+Qm7/cYe1uuCjkCXPVFw7MhTsWb+4kd/JBNSWBdd+paNn7ISJiYfDCuLEytNtrHQo3XHJ6xdy9qhj26QrgS33IMsV5IVUdaBBz1l2/IKeYvwAcKVAGk2bs6za28dbE0aVLYPPrjChSRQwqUxAUdYJzBHQO97fLTFS5KtEFKoruee3N4OOrixK4mS0qBw3Up73wW6JEDRZE47CXwJOGbnFNr0b9YixHgqeGs5W4usS89ngnKniyZ1o0CPDS/ueVvNjEWSvDPRWppDlCHvgFHf2Pud5trlF3axm/p087oV0dYzvl0bLHUAQx78Ijy52Qs2OGRZ7PXrsp1Gosmdtw+194fNA2Yow/CQiumqiZpvfTDH3v14rn3yzoXWqGmN0A7E7w7/GQXka3lDi0mkoWfP+t7+9LcxNK2amd5iYbH1e/4Ma79//WDwYZ7QD4fFuBcryNWSZyd+y87DiqHFS9Hiefkwo6QSLyCnKNcO6vEc6QU5BFlQCbXgfPLJN7Z8PaP/YiysFHbAy58+dZXd/8QonnEfSVeA61lYWGhpgMgrLkToS+nRxuyBx0fZqtVbvVxBl+ApRILmDz/4kduoSP+xTz79zsZNlpCHhOonFjLgmIuiK/Juh9ms79aBF/i5pQ+crV8phoO7P205eQVeHzofWK18y2KmIkfTe6BTBJEWrthqd93/MXUhEzhSpR8EFV+MpyPX38tCWHMLiqzXhSgyFcZPRA8pU+EbXGuKAWAJ5QQlwsCkvAPyCI5JOXHpduxfoQ9dJtKq3fwVly7dn7K1G+hbE1eKt1FEuXkorVwGZF14HVDMXnx1oj38+OegT34ASFEX8OdjAA5TAPBApPALi6yAP3lK6ve/8MIYGzR8PvirliWWTxrxSD75i6E1D3h4pXbSea87TV3RqFzSqku4O/x7FEgW6cQcspAYVzuz1xsJ/5eGgdEf+P1RdkTPljCLi7RLs1u7qDzyFvGuYe10e/bpM6xho+pWpZLE0Gw7jH7pVQNsBtNzasSNm/JtG3GVK6eGMml8CaL6gKOnLPHGz8hMts57N7DtCEw8nmw33v2hpcKcYhTBGDHoMmvarIbD14KYHrifqamwDUPN55z7ln0xWgtYFNQbFnMHlveoCj8SBZcAMVHCZb325kGWkiaPQCqu1Fo0yrJ+r5yLGxpDiWy34zUoBq6IIMJEHejDK0gBPfXkF7Z5G5ac+xII+Yebe9h557RnEA1Bzy2ym24fYiMnLARy3N79x2y79YbullUtDRQ0WFYBMVKIJugVD2JxSXJedo7t1aqOW2gpSLXZwIEz7Z1BMwItPWHIo2GLHJTTSy+caXVrVfLIOJZb/W0JrIQyD/Pddb+Gloki2rhxuz2CoszB8vvgGjikM9A6aOClVpv8Gm8ZNuI7+/39n3hbaVCyX/+v7MzftbXGzWrauJGB5jfdOsSm0Nbqh2dT/ifvXGy1ameI0lY1K8O2bs23J54fZxmpTA/KS6EOX3x6JZ5iFcfxMxTApX0GWiXaMy+vxO6/95PgxuNNqBWpgtNGdd8d/jUKJGvQzVsC5pKGLnbrjF0lurio0E49eW/XpCKurKSsfpkJUFk8nnPG/nbLrT28ETzKfesky6yUan959EQsSF/66pIntD8avGKQULmiofx9W9eyAW9fyOvQkNsQHFlpzQDI/XvwjiOscZMsd/FieAxNG2fZuy+fY72veQullGKL1m6x71dttT3qVwWE3MIQhPHOQeWKeVQfjfbOnrnW8XOjIZqAwkdDLqPc4CK3aJVmzz1+kl156yCEAEbVAKSUBEFexSvvTIERsTo879+mgV3Yu5PTUOnSYdw/M6fd/uCnUUi4zzyPG7/Cjj++lTBwGOU/KhtlAUwfN9F7olollJtoIfLKDV+7bpvNnLfGbaOUgwuAUCLL9twCK8ajgjC0C22peNpA4xsFAHjjhbOsa9emZcU22/sRFGYaWYstGS/gqy+ut7Q00Sh0hc44vZ2tXLHJnuv3FQN3yUZvxv745y/stRfPsD0QVFnrOMrWxwHwBETC2nUqWZ096O5RqmRz1OcLLTWN8QYQ0szE2OHXWPXaKDvSqy2OOrKlnfe79jbk0zk8l9rAT+bZPfce4x6jMPEKlGG8++ZfoQDz6JDQGTYMreXmM7qeHscywU0w5LkXvWWDB1zkjOeWXPSm0coC9/UbBY0sRvt89AJbs2a7bd2+XZJt2zSgRbwaTkHuXXkgM//F0BqQe6NfLwZ9YBbBx5sY9N50Z2q5h3n5BbZP63q2ZBHLWiVOwpt0NWtlck2hjCIEMNlWrN7sgq5yVKZA6e8HwescxTKNtWazpcLAYkh1RQ7avyEvfYxcqHgX4+hjWlu9x6owE5Hr7F/oiJKM9zLuPrfN4/EntbZFCzbC7ODgAKkTZlYDdRHuQwZPsxOO3+tHLVT5dFbAXJQrYDDSA5V25Uyh3P2gbj4dSNKgq5Rf6UNWtYOELB08DjqoIbSmfrTziGELuKICNJtA3jatayOQogP48iz3WeS6AS/khde/5qkQ0Y3ZN3NWlxFX9dSMhSim/yR3OmoMR/nlhbz1xtdESnXQ3YJgmzbn2ratea6E4sSjAq1zp/o28OPZ7hn57Apw1E2BLYAb4ITa7P79VyiAXiaEtoEZk2zAq+fZuYy40z4QOGZzWKzx4IPD7O67j4bYaF6EVw0lugepKLXlS7fYXQ8Oty8mLGDqLGhvn1cWYJhJcOV+OpMT55ZH+cU9HkqtdvVMVzBBOEmPcE+Ytgj3nXvyVE5PtxPOeQ1m8BYnRhZMmJRYRnoKOgXlxH0OikpB8qWcHspuoghdFVlePt1Ir7OmtjT3ffRhrbgKCJbKywlpO+yzp40ct8C7EhIKBV1KASAc5PTf+9goFNcI8gdF43UCofR0yA39NOW1dPlWz7mzRdezpvfk1kpAw9RTsS2hbw9o8BEFeAFunQ5oaDekdHVlyBsb8sFsRr63BCF3wVGsFKJykBnSSCGe0KMN3odwkQeSDC4b3AFyipCsa0eUHIN2FAW6CD8tHpGq0R5VbTmKXKhszslXAY6LFIZPGTrJVAdAiDBSHt72ZouXbXGaaPYwJS3Zep70kmqiqoQfMsjtT2PNgHArZe2GEgh/1UBdpDL+IMvu8MspEASd9M6zUPyAzg3t7FPa2TsfziJWGj5mr7w93fbZu76dcmo7J7QYUY2nEd0t9Lu6n4xrjjXNROC0GESDZdWqplqtGlWYiy62ZWtgUjE9eSSAFd1M5wV+qpPWA/c+qEODl9DQjheN7C4lbp8vGwEnMUAkJPICVAPZirF4FN0OburvFCsein79NvrRiwA8vBd+cG8RP8lwYu26lcFVDKs/4R4gubAqB3GaWQgBQLyXMCkmWejhDTn8CkoCcuEdiGWNUXCsIXc/YFxJh/JrQFMplB8/uUqlmE2Zscw60K/2xSy869CxnnXYv0FQpDxPm7LcliTWvkt4hLLjLUAeoedkO/SwtkTQuvKeUKhSPkJKdZUacd1KG7um0aCd19+zUFaw8nrKTyjVINHAUHCkQ9m+AIfKqL4evG6UKWUKnVNTgZXAU8XJY9Q1tCeg6DaJWqK1oId2SJSTALn78ssogKBDSDG0C0vI9MD9x9jEr5fasu/ZFEKDpGXE7YY7P7RW9KHbtKnnjaOU0vSnnfE6Lq/6rCXMiZfY+afuaw9WmAfdgnvWodszlspiG43Eu1lR6yp/opHFHMlat5mIE2Ta1qpkyu2jFGBrdPZq+r3JcKEWdrg0hCyeL6HzreMBjRLPgk8BABKD/HiAq6iD8iqFLAedAAaKWDPw+XzreRR9aEdV+ARhX70aq8Q/X9yRGG+QiJNbmLobeuJRLaxh3RrOzOFdeem+gAVhy2N2QsHBl7+mHGL4rzGNVDRGPi4uDrfFiXju+fHW7+WzoXUiH0pAA1S/KACzlCm5UsYyCuW+QEVfbER5aRI4gJYyAKe5+NkL1qPE8cQcuOrtYubFrPye+gtp2qRalTDoqscQKtDZG1eGQsgGJEUzGQ69KqKPfvVFncFJ76AvfCYelBJTOnlqnpV1mUlJqdyrrcpLShS4+/ILKRAseqAoxHR2RyDNPvvkCmt30F+sME8WpdgyGJ0976J3bPKY653pRPQiprdWsoHBG4cCux3Y0IVcll6+oOZeNZimEV8B1Q6v7SyUqFE9YFfOFohDgmMDDlI+Zkf23NuGjFzolkWjxZ0PbGAHH9LcLVho8vKG17LdmAaJEkAFx4XzZwkhvGBurFptlvYWwnzuHlL4iDEL7Y8JYA5HCBEmTl+GYKS6YqvIdykossICmBSQldMr2Y03H+ar5VTn8nSwr8qDmX3QD5oUe8+2HEkV4zRA6G69oqs9/MwXGFwxfpKN+WqpvfzKRLv0ki4uiMgC3Q1VWMJTTotyaBXuSObbiSk7eARqVwmPWUe8ggLqrp4FBdn0Wat8xkOKwfvu0AFRtFkzVtk2pgozMkTnJKteNcPzu5pM0N0jvMIMcTK4EY1RCL+O7Rva0mFzgKly4tTjYJ+BkdJxxa3CpUXAUTSQoikVDMH+Z/ULBe/+/QkKSJ0mQsQoXOmXibjvv94L+UQre8Mxb81c7pEn0q9SUrRviUapxASaK+F2z3pZAZY0t9/F7KqrB8LYCSYjdvyXixPleRYvR4zizO1vPDF3SXb0cXuxDRbuA5eUlFK796FRboWET3Cpy0DZJqbuxnyxuJwfKtbsJ5lEZUlakqxVi5pWhCtaDHPp32amAVcsp79LXmXX9cEHPkbJMRKAgDh44j1wrVo50w2XXN9+70y2ObNWBzeXd6Fuzq2WvS3fHnl4lCsEKS+J8I6BZ+gXQwlccHEnq1wlCFMS9JZVf+zpL+3W2z7yOXrtNZAgRkIeobMDPAfPG38pyoVUat8SrKlw25utrY33qMYbeQ8x28RgY/9+k4CLQKO0A/mS7JY/DGU8RHHAQFMd0rWJ51eeQKcAWw2WAp0WL9QinUA74XT9DV1FDPiBeqOgHrj3U73kT4rEE1L1AGPeN+ts3pz18KK6ieJHpRCf7FC73Q+/kAK0EEwLEdVVi0JgHrMWLWvYdVceTJtCYLlVNMIKBmIuv2Kgz7XLimmgSmMmJbjl734wy55/bqxth5lnzlxtnbs9a9+zVl5iL6UgAdHcOGPUXpSEwhldbptLjpCgOWXu+NOa924HNQp9SYRi9bqt1nK/x+3N/tOZj89FuHPs3bemWKdDnrLOPV+w2fPWkj9URD0BlSuLoqmcHwuBCSmYm5rMFx/BdJMrJRi+JFZk3U/sa7ff/qENfn+unXzqK9b//dm8F0NSiv4ioNwMerO3L/RgCMsyK6fYief+3a67jmWkeDRbt6CExiyx83q9Ze3B9cU3JpFT9WRGQsAqBFdgCBeTXJCgxMaMutqnu9RAShvDnf9gxDe2X9dn7KBuz9vtt33I1OYHdhyrCr+kuwXUBDQRVB6EFBn/JSH8+XShBtooVvPtbjWJv/OW7t6GEJ7INHvo6c/t+JP/Zu8NmGkvPD/R9jrwcfr/m/21fqpWTbcHmfryoCqAc3dN1+EFlLAqTjMY19z2gb3Wb7I999wYu+++YVa/bjWrypSrVvWVMBj40ecL7FAWUY0bs8w2bc22tWuy7Y8PjbC99vszC2b62/drmVqlFd07VHVkQHYkVyh/9+8/pQDqGQFE0AJBA5OIKcQfEuxrrz7EZrEI4vPxS2gg9qwDcvRXi+25pz63667tbn+840i744/DPH8stdSeeXWCPcfKKa3NjiNg1atm2trNOcy9klFKgUbGPjti0QYHlQ1vKAH/cRdx68TUcbT+80+dZsec+IotXbHRp7m00uuPTw63+//ymXIlcEdhAFJ9eYfBr8TCR6zFJ84dqttPc4nq/PgjJ1mnns/SN04GMttykYQhn821IcO/cSHR5o9kKSwxnXonEgr+5AJrvviis/azfgNZwEJcBjCGj59vw05YKIMFPLo6FK9ZiSI/6EPoCNBOQShShhs23qdyM3VsH+t0+DOWmyvvivJIozGPTdn5Nnj4PDIg3j6CpjteqkDqo+k+yYmCSKA6SonHEoo2vAkvjz22rV21YK31fXWqvy+l3AWM9N/zyGjkDAVNm2hXg9x+KeIPB14CP0hRS11TOzyhiy87yJ7qO97yUfriqXz0+WPPfiEdYOefvq/0jY0dca3t1+1pS2HAtoS23MBg7iXXD8RgQBfgOfrwinokcRTS7rBrKICdkNaHUcRgZQF2oaEj+ej7/OlW21dxsSYMNyrGvPWzr09kxdsqO+W0ve36SzpbIQ0rh1aDL1r+EGMVW7WqaTbq0yusMJdGRUWorz9t6oryUpB5l2/nS7GBxJN0/AMUj9rwUmyffniJnXd6e19qqcy+dNNZTN6IYpLZ8FFqnZkxiIKiJeDwZCLsUMEosuyqtJqTnzz6OmgBBtomiwC7m4nAUB3rtPcedsftPQLS0Mf1iuoMw0oAf3/nkfYGG1/E+s60dGkcP+CVyMUGGY1fnOabO1Q0lZRQVgjC0uvPVXDUxU9m4crUMX3ssbuOCCPiEdHkaVFADO9DilJdDikdbYetTV0qZ6H9JOxK50qFe9F1p+Blkr/P1d2s/wunSdYIiC/4SpDl4qvIUvYtNG1Y1aZNuNFq1eH0Gkc9wNeqO42Rv/Pq+T52I73uLj45i8GxyImFpacrNhvF1b51XWhBDcFNCls+jHeaxIsUpkHXfffdQ4jsDruAAklbt+a6pyzmErNLOOU+qqE9SNoR0Fy2MxbSh5U4u8VxBuOYJi13helzthXYEpakzmSnVCHCfurJ7Ritxyqi6bdvyw2wsFQpMG0m+5XFJVu2FgBL7Iz2ZhFHFXfrACchUmuDRwl9NG1llSXRdI7WXg8ZPNsZhkTWrFkd26t1TQZ10rws4a16qEx57KDuvF6tWoZbyWDVAisHpBK/IIE48hPEbAvu9meffcs0cKnVoP/a+cD6lJHB8tEi1r6znt+tZRJLO9MBIIYNikXkkqBt25ZH92WNrVyp+XIYHAt8+BHNGXNIhS5SiKqT8gWlGuFC8V5XRMMRl7cTmiPUS1Y0G1pr/fmIYawZZ9eeKxOw7w58DRSm0yRp6XKRXfR9hHt7NqPXKgR6ZLAE2ae2okK5Bi+OMqC9PCEtX/5k6LeBZtC+U+fGVpvlrJUrs5sQnNXlIzX/1Hpqr/L656HY1XVbsGgDKjjJaterzEKYRqwj0MImeY+oAWDmsJhqHRtoxo75jm6E8C229h0aWMM9syyTEX38NWCjSAJwrvxX0Qm8y9syvAjrBaK3iUS/4BJqoISJO4HjSW3pIVG+y4gjENKVl59I9z98YfEWtdipQmUVFuIRkXXLP98sovQJYihv1NhKruCiArOIUvqn/zsGZU4AKaOmg0wkBUKiReEHz6++pRZ5SAFE0z3+ih8pHwmEQPmgja4hW1mxeta8rAaYXDCB44tGdkgREK1Q5fK3AqD6e5KQTjGa6tMiGykXp49ff6TKyg0Mp5UDCXUM8ASpPDickLLst/ztP78rx78CHZWN8gOfCpHyOnh5eud01JQmD/wFNIOi8dSKrniTeA4XfhNtFuGvIstCWd6yGOihMsrxKH/DnSpBYWEOnzRiBOALR6jtGJbllX5OMEqYUfgJmDsUUP4gT1PTfAEVcJJylUb0a+CZAFH0VD65RVGFfqYOSvo/EvC0A+q7Eh8nnPptDjpBiJ9q0F9csNzeiD/V8GpduaqKi4T/pxtY1QxpSU+ZrhoiLfKLcdgxoVdPkCr0tX+WeXfM/j/zVC6YEfMG1FQ/KVH5BU7Znybvr1KXQF/hRNAF10WelHteYOT+hFwpYce7MGYgT0kZfmkQXyiDCiixjeze+3QoW2jpOtRvkMXiomYOT0plyPuzfLOQuh+nnbEfhoM88JDyywv9Xw67frSD1tEaaU3L+SqqwCK7gAbSuIlGVaO4Bqapnb7qEf58UENVZABNX/kg0s9n+9m3sh7btxfaiae9CqyYNWDk/s03z//ZPP+LL11gsGDzv91gva98l5OEUq0yc+UfDbnE98GLoSG3C9Z/F38ZCcpOWFBZWrHTrOlrbfGidS5c6XQPO3RoVDZm8INNV/8UYTFQxFcxplQ32p2PfMZBJnE7kunDbj0QdIdRak8wo7RqwxaryZoSCbqMjZR8mWfxT8v6v0uw6wVdAqVBHEaX72ON/Kv9J7MjzttH4pkgWiBdWbUlt/62LGaHm3z6xSMHXWL7daiP1kZ5Jyxot8Ofs8WcgqOlsrO+7mM1aoQtmTtkTjxoa2bTfR6GOeL0bwtt8YzbrUq1oCAiKywLUlEZhOdyrIWjhKIs8ErTV6uYFtKgWGLgO/G6PF9Z+p+5+QHsCmn9nbvFIZVckx2ZKypLV4VEN6IiruFF2e+OdSYfkiwareKAiMzUXNvKWfgKbuxkSUXzqBjF/wAHT80PZZPu51zo8rwVAO4EU28UwhiG2QcfzbI335lpE6cudwH3/RMk0pJiNs5bnTqVmSI8zE4+AQGsGAIyFWKiMqOrMAZn8ShRMlJJrFeIM40pGiu7Kq76x9kvncIqUG3TDSG6KkUF3nA4elb46baIUCujh/Iph2f0O4cQ/ZSliyK4lsdVTB/uI/hKvssF3QtmAE4hjX3HGZlsfUzwiCqt0TGNsgoVUVZHQBUzsi5Ku15FkkXIMPcdSKWBrHCyK06ka3iHZJWAnZmZTj6gVZRQwd4p6LXSSwGJSXzTjbeiMFEXQI0pwikjzSaQuqoLwm/Q+SQIKAXo3Ks7UVjAllBeFGo+SbkDEOA5MGIqZgJb6hrQFSOpDMomzplN+b20QEMhogEypfEECUw0YKYQSC04UReClMrDPw1uqSBnYMVw41YRGIGJeXbU9EOpDCJqhiSnmOnFuJbLirLUjFkWhUmTl9hHHM4xn8Usb715nsdV/NFaCS8DSxeWtnrxnmRHmqhuomiijgkggf4Bf72ScG1k5aXWH3y3bBOLcGK+MchH+MFVWl9HaaUywLmZabq4juLZKTiVIvde76iq6qWyyurOjdOIOHUMmFhyydAajLCRRvQhn9pVCUNGLtx7u+lKAsGmLG9HtSsDrt7FjOoZwDgs/QiMDzqrVMFOAAnlJB6VkBAUe2hnLyhE6w25QvmC5XsXInheXih0lwv6jpZG2KjCKgxkIEwKtdNkm5pZc6Vn9ppgHww4hEMJRF2IrFFfZ1QeA47chBAeaZTEc0Sc6DlK93PX8lNKApNHQhdgJRgQ6xYESO49w23gj1H7AT6Kqsoo9Ighl6uWHCIJOb3BAgahwbAMOyAUnqQgArMDFrq4MJNX8qt7wfFReSyMcBbTe4MKGmmEn+AH2gqWmEB5RB/G7Mnja9lVjuArib8RnWFAMaQYkDz+R5rWbWrZ5x9fGZYse58zYdVIKajX3/KhbWTEvzkHcuwcQtnCU7BFR0oDpsoM9wE/VwbAU9kV33siCY3Koq7a4rtsOQeLnNDXVyOmsgpQivSA/RvZ8exb33/fPf28g5WcUzd+8nIbMnQusyM/5dEJD+EDDZ3uoYyAM+h6meV8JZQr8nGoQYhTHpKXB3+pDGoL0SlqJ65E+7yH8jg9y7M5HKdNoIOSAMQTqOzwHJommoWKcAqzHmQImkJFh6xkj/jBhV5tkQi7XNAjwOXXQATVUwsn8qCSbKQLPBgW5WsFGLPnvNf5bFof7eO+zrDlUH7yTpXciYg/mZYXTiwnakgVCKrWp2E0Hwcs9fOcIXHzRTApJG268GmhisBpSQljkxa1SBcESIpBVHeCw++B5aNMoUXUPvrzBT1cvexEy/qgDvfBYCs3sw00WICrlMAmT0iuzIIZGJcbx1dl+ymqSqSCyKN6S7SV2cnlAMScvKUYMY+2jrZkKXA5PSW4KkyQWaSjzS88MOP5g+DJEPBgofQ6lPuDhOQPI9xaOFXOiEoXVI/ELuy/735MX6YJ2YJMG2gat//bF/pe+bDaD/jg3axpTTuke3O7/ZbDyZUQNq+zICoIfxImBFEWVguJNO4QPCVG1X/MsU3UOcAIv0E4A8iK8U5EpYewTk/uA7V5do9Is0VqI9EEdPReaFEvKXHfD+Fvwo/4QtPSQcELZoQMUF3pJ54dEHQTPI9Se1UoS3GhyB+rYYUSd8mt6261gVfuMPY6a053EwcOLGUnlDAUUXQclc4KO7h9fdvAjrcFy1huyRvH/2fwEEFkd/+lkKi86KRTYXJyWB+ghgeXSom+6ebN2/zoo+28y2R9dz1OUcmoJMFXOlVHwiPLmWT5HJukkJpGXeka5HIkU1gByNoA5oOFnRfJjS/GQVD0rDUBtJvD9HR6z58sTwFHaX2/ZhvrF1gMizquxOR4fQ6WLGYqLw7OwTUW5Bin1eYDJ4nNJpy6yxrzHOb5V3EAh5RmNdYX1KuvLcCUiC5axQk8OuZJzFGZ9Qw1+GxTJe1CQwBUeDb1VVL1UTPYaquTcJUxnZMoHDd+JOc61kv4KwgL1UfKrhIeToiJYnlMpND5gzpwQgyekaFuVMinFApSQPqmnRTPrSztTeEAFJ02l8606sTR13iXS7DITrupBbhXf5kIHaIhuDqWrGJQW33PMuRscM0v0NkFyawFSGFBUbQtOiBRURCVv1y4KkID34Sw7hQLQsKHHZyMc3wPX+fl4r2yXCSddQ316lUp6yoqv/OPtDUhLAnnSzzrcllXks1aEfFg3KpXy7RqWRyqAr1zsjGPEEW4+7Hj8F2w3M6Flkd7rl2/3bLpduko9UwGKPfck1OWKoT/ikUXsvCc2siuvPxQq1+vknU75kVnStUX/YqQF9mLj/7OGreoYbfeMcQJ49pLra/1tMr8E+Gfq4OQUWSBQv7nbOiNFrdTz+pn3yxcbzWrZ9iUcX04enqgfTpuoVvFOK6Gzm/bjvA8zuEbF/Q60EFE9icfgWzb6Qkgx+yemw63iy/tZCec/ndbtHw9jV1gsyfc4iPCKlacLDLoR0XrvLu13+dYVvVUX22mOqr/+PCjX9jf+k/EwqbScGh9LJAYuSrfuXvvzV7WsmUtgEgwk1iYk217d2ZJKbAfvPM4a9Yiy86/+E2Wq7NYiVR7oqBGci7b3Lkr+azWGxg3FIVkA3zUJ9eJtcPf62377renH03V9sC/+IKmngdxvPUr57M2/+lwzj5pdfKQ6jl/2Xprvu+joSLENKqfyTr4bS4Ej/7hOM7uY+rJ/1GOmxuvut13zwh788PpFJxk30ztA+NKwQAmEYSThHz9+i0cJ/UtXwcCV07BHf5hb19QJfoog7wed/uhS3D/NYYjIFhBr5gGg1lNOG2FXXzlQNoOq50SLLn2uuuvQ/Oa1pdVjDp3oBAFIQ9TfOqio8Zx3kggVvGi+ggNgoRN5TkPE//XZ8fbY33HMTYlj4pqUk+9TwWXd1/rzXfxOPOPssQFoouMlL6EdNkV73HK8DLkgfEjipbyz6ObctWFne3aaw6xdrSvOrtffXG1n/GQIiIh7IL9+mtf2d0Pj6YbAw1Uf/0jf0Fhvn084FLbe+96pNO42H8haNRdhzmIQNmcA5ebm+8DdTppVBtqdIBDJU6Qad+pgT3x5JdgJMuplWFURoQlY4K2P8DWCU26CvzygzQVI0TcndNqP7YOlJCF69r9GRv19RKsc9wqM42SmqI172ZZWL0H//KlvfDiWGcIIRTxQwar0ARD2lTh+COb+Hr5Kmz86PvqOG9cJS5lK62YSflythXB0NkW50i1S3sfhNBhlRCmjl2ftP6DJoNL3DIYqExhQFNnzokRs0lzxEkv27hxS72cEo0agZxwT+Vvw4bNdtFV71lMeENTDXRqbf2SJevthLPf9ikjWcIUzrxLUx4sjuDWY9dhtKpMp/XIcsgzEJ0yGHdI99WM0AEG09oIWZUMrIa2q+ojm8cfthdej/BNsYeeHOG4uUpT21Ee/535XvvHJGDHrRqf90qTh7BTQ4guos/S5dssBSFnEyX4lVjtPdjbj4Aog/hA6fj1/4kfL1M/EhQNtN50ywd25kXvWi5772VZU6mz2jRVA3r0xWYxuNflqBc5d2GFl0Gxzm/Oa9yHMsrA+s0PrDk86icBgdrBhz1lz7420Q8S1XhCMvwceEKnCSSxyalfWGno3QjhCN8jkZ3ZwzCJbcFqZzkjaketnhR9//7ONLvpRs4opEslpZiCW67z/KLv7p3X613709Pj+OwVOzNw+1LY6JhGu+lsh4y0TPvd+W/YaM5VUFflv2DRNYCJVWQ9tr7kMWvmcvvbK0vs9OP3trc+nAkSEnYYnzPhnnt6jHXef097b8g0GlYVUn9SPbd/Lshqp18Son7PD9ICYBUfKYyDY52ale3LEVf6+mwRaRTW5YrbBzEoxGmvbNq46spDnOGQ4ASY6Boeb7yhpz31t4mM8qfb2ImaDtJXahAQdnS51YCrHnp0OPDiuF2FPrgk5rzh5iHQQXWNW8tmWfb+gN7UX8wdtw+GzLab72GbKAxw3S3v29QJNzmu7o9TPLxmf319kntOhzJQ9eqrfGyCOMnEmWe/bvC44/DWK2dbx46NeIEUoYGHDJ7jVi1gXv6rTS1aQz/lqxtpPymnJOvW86/2/aZsa9Wwus+xK7XK0N+7Q2dZNvvx5SKvZYdjHb4BEAa/1LFKtgV8FCITd13W5qarurpEBrEVlBBkAdHDNogdc+KJIhTLRZykKwF3yx3JdpThR69J1vfF8ZxjMN9P+tGU4Rt/PYudfk0gEpYNYXn0kVHW71027yQX27mXvGWjP7rUGjeuBg1dPQEVjnPJ37GAKE5WU0GKSgrh1t9/ZFs4Z0HEboSH8OlHl1GPIFojPvvGLrt5MN/NS2aD0Gd27PF7kVFWN2aH9HzeLbe+G9C6UQ0b9H5vHzfQGMiEr5fZBVe8Y2OmLac06O9akQLAS8ZKn++eOmc5RcasZZO69tE/eruFF92mz/zezr/0Hepbar0uf8/mz7ztv2HR6ceKp4o52YTKPd1von09Z529DeNqG1gRglRQJL8rmcP759lDz46xhctyIARVIJ9oKiYTM+0cov7OzvE/96w88gIUooaL0ouZqvERQwm5gj7CAGn5/txeHE/VzBm3kC7G0A/nOsHdfPB+ZzjS1od2aqrq2bcL1/jZ8DL2KtW/KQYOOndOQty6cU1rghu5aNF6+2DoHLcQNdhANOgfl8DsGoQjIwx6El+7uZbNQzrUZjP95vfemep6RkdsRYpQ10MYlXYhpzCNXCtoVFpWID2Dwx84Z86DXoHnSae0Ee/8IDjFOY1Gg6SCq0BT+SGZ2pnmz2RUGUTbnx4+iXc6oDNuU33jUhg7kWDJ0/w76ylkjeT19LqsM3SNsHZQ/hOmhsxW098MLV5sZ599AHSijhGSP4JrOYRwpwMs9TGRfKY9dUrwwd2a+BCEBjW1KUsDdxdLgZSk4dXE7GZmE6iZt3Wiqs5z4pUfC1JgCoK3gr0Mg4bO9laQAH760RUe7wnAVacU3X3TYbwvtg3svxiIgvGykOZ1bOeWtkgGp8H/6OVThSpS5/IfdFBj/yqPV1toSNBV98RYyt/fmwq+Mb5klOFCLvqoBlIK7ferZ3fSjZRSTa+SbJ+gbH51i65+TI+jN3GKyWp5mY6sNqo4vhBsj/obrWmTKSgDvUzUJXGFYtbvmb1szUYYKjSDp3HOFEVk7am8tJhrhPCWX5iIuJ0bSqvhJL4eSBC9d9jAKylMspsvP5jsYkLBVho8C2Cd0LOFfTlhCW5rsi1aymGK3thesIMTrIgZpUhO45jsr2euoM7J9jynxNxw42GkozvCcyEnumrAUXjfcFM34ul/TVnFZ6lReqB42w3EUahDB652x+mzRtfiSTzx17F0KdLYe77MzjizA3lFNzUxLiIt+9ADHI+sFoZ2PoMBmarThSh0xi+xd/jqzTnnHQBsmJU4rWkotxiAEu18sIeRExAU60SzDb6kWZaemCgoheh1eI8WuIwpfJkHHB4baccc2zpYIZkncvx9wFR39RvVqQ5q1IyynV5qxygQJ3Ab/EMelALchg1laRUoiWcIH6X+0evIEfP5iEYeJSZb9y5NrFOXxqqRKxtlT9bcNtupb//9EdZ/8EzWQJTYpNkrbQ3HptWpW8nr7qUJRWXYOag9gOcBYzRz7moGDVFm4H7ndd1pb808iCqhTNHv7DM6+IGh2rT1xqBZdvpZ7fn02GDaWHUptdf4doCvIhVYaCMKq+hOnTkPkMVg2t+vHYC+nZzy+/efJOgM+BZzdFt7N1wqL3jA6qebncs4yaNPjeYItlJ7f/CsiOsd7V/lR67Y58Oqc1B/dRiHL63ACMWMDqbybS6NeJ9z4Tb74P39vc8qBAJ7Q0xoIIIpf2RByhBMNHZgFOUJQcSJ8kVatywPN75UhwS+saUiv5BRsHSaypnndUwAg9wqHIKK6m05/VUHXSbRF/dyPVU5kEhpeDR4nMa22tvu+5i+F243GvWGm7qjl8hLQ151zbswe8xHxw85qClZYvbV+EXUIwWxK7avJ62g77iE9MIVMcQqastuckqaj2pLTlawItDn21EIvjQYeAWMvterX03okj4sTBI+N/bpbk88NcoF/94/jbJX351uD9za0w46tKnkzZWKFIPXVRk8iKETcboQXJmJ2oKfeA53IlGpNW9SlUHNLbaE8+a1a68+g3T6ZtssFJ7WGBTDtLfferjjJxydvBEArgKrompmVYZZNzmtxo5ZYl0PbUw87UMdVXdPxOXHwgAUihRTMXS7uJfOpAt4K63zhkqRJABo31Z1bYr3j+O2EI9Kgq62UEhU2e8r/og/JYgeuIwdvcjTqv7zFnxvd9451J/hcioU+EenI6nvLK9qI4elqIzhYxdjNNgRWpBke/IdAq+WF8qPrkKcm57dmtjwcZQha+PKMYmjvla7Z6Tp6Kkoqbs5+UcDjH7mP+VGqljTxGpDKbGEeXO0f70fTURjGdFTNuCVs2zW1FU2dtJSG8eJKIpXhdXoqlpY3iqh4x7XUoRlwHSnoJToSvqYcus05aSjgTVgI/oEAQ1pKmb0DwDiXgZrXfEN0CCuBuNCgEBEhCkMuY3RApqQbsec4Ul9/ygIlsJxR+xtw7+cbyv4WKHXjnh1DybxEUcx2iGdm/hJLUq7go8jSPuXYhEG4goGKypriuYmbZyGlMb2kVXotXFj2PpLDlKE02jatOLgToL2vIsGqqeY4+LeHW0ZW4hff2+Kn32/jLLOZ9CuCQtfXu97JlMxDMZ5zl/6k6hgheTC84mHfmdHn/GqVWFAYNbsVdagfmvaliPJBs1hMIyBMCxfjx4tHC9f4QhuEa0cFPVU2Jcz7MbzTT3V7N2BU63rIU0cP38dfjzdj/3ki+GhUmFRAV+pYaTzBwHcxVwU3In97lMQGoGUN+TIuKv5g0xlEap5RVqtYsGOR0Dv9z6cAwzBkUIKvCu6iCnjKHw1Rz5f7VEooD+bTB5ZZW39dSSUtizoHm/40GYI+mJkR7RCGoClgz1EN3HrlxOXYNET3CLEpFt0FW0pUlD0ZaH/iqD7t8phPvDjgMHVuOtVrBnM9eVXy6gfkVgT15Rgr6sIE9Q9FULIijl1ZscQCNK6VW2OkuZ7bTwmoUycudWIBIGoyETFdG4FHe3BIp0i5rchbhRULq/0XW8F3QsP0cyp5ZE8JdLpcefgDeqRrkbcLT/nzHY2dORcd+f+8sRoRoIPZ2Q8l7lWzT/H7MbrNKgnxmS+GytWWrLO3bBnnziJmYlwzJQ8AAomFb80nrhFSzMraXRNOIKWFmWov69ZZ4+D0ZRe98orHr7vniPtpBNa26OPfm6T5q6gb5rsX0I95LgXbPSQK61J08SJnZ7vn/0E6BVTqR4t9qptVZmd0KedXuaUoWOObu1J3h00zdtz31aaFlRAeTGDEBRyiPFfwEpxHX1kC3v+5Qm8T7JPR8+n2wKjUlF1ieQa/1wQjWRNxXN5+qpGggZleYChZbNq4xxO7NFV7eryzb1Wsv1U2MFrSyTSaLdAqNWfeOgEjA58pnaSUFI8oFVdEqidmT1hfYIMkibDHJ4OV3FrnUjHRSG0ODccnaQaiXtdeAVLgkSJOhm5D5/JbtiQNQFEhWKVTvkEQWUKlkzBrx0oFL6jj0GRIHbBBQfaNdcPspMZ4HqdY5d8Wse1MIhxDcIqTIPAetO7C1QRUb1PssN77GWfclqrXBTNYd51T0+PV01VwVB7v7GtLN3Uialq2PZt6obIxK8ThAwRD0WN7+TWgwNT/76ccDsA0IPSeLrIcWLxDwN4qXK7qft7fE1Wgn733R87I+QW5Fs7zsoHpOdr2rKmTZiyzJm6ZcOa1rRVzcAIAuocQzpvSa665V6oKbuSBOaS8OuB/zCaMHHwcLFmMdprRuO9C2zypOV2zc3v8624fI68SrfHnxxlLzx7uqCG/GW/3FQM3qckwrk3vAgrAt3eOJqdOTji83F4a1NWsOUz277jK64Mxvsg/70cO6YilF3Lc53OFeA7WCKbN6nt88uZfIcvjiD1e/kru/xKRurhCbWVo6l8ngE+cf6QKMT4Wm2WjZu6zA/6WEr3Zr/96odyRA9o5p6askLTzycs0w3rBEotiwNEQMsFVXC9HJXxo0F0Uii1/Ts3si+nLsGjTLK9m9exZnsxFcg/jX2UQRHgKAu3wqEKg2TZLBzTAh8dUlJZi5Y8py5KLPHEA35/Co9SPpE8lFpTvm+oWRy18B7VU+x3zGC5F0FdFHyPA3l86SxppOl/Wn15lv/8R+g42tLgzO+17fAEQpdtDzwxkufArKpCRW0Z0BV19Ccm2ik4k5fY4T2b49JK05u98f40K/LPFmlBREgvTem3EPYWPnKI78uUVJL1ZtGLUz4U5Pj5T+JZBJKFVMHCS/9cW4VcZb+hlPJfT8ejZ9UP4SI+5awabGUloFb+fTZhqY9VnHJkW1basVmERtAiis6sCMzHcmmw72Y+LBlcb5WLggEfZ2YUGhH8caVRJWRqQF+UQlQC/VA+8bpRnCsF7mS1lGp/BH78qOuBxHvgT1dXIhGiOkSwonhdXSlLYBJ1C2MVmhkQc8nTKGH0/WSOzS7mtKB0GzN+MV/vWepz8vVrVbaWe3F8FOn8Y49ewE6l0DYaXNSHLh+9W0qb97Tho8+OtS8+R6GrtsrigkBlVB89i8FhbMG+9bYeklanwXNsK3V6KT2w5RE4nhzKKdZfyboDdYXUdWzHSbhSIyJ1gM/1xwKgEvIELL6gi6BrL4SWHN/0BxZ6YdX0T2gFzucql0ooUBf30MDjxMNbUx4bcljn8MifPneayuukCl5Poayv8E5kqkzQNIYosqstj+zZigUxOrUoyV4bSDcPbwd1xTvqRxk6vUh4qL6qDgD0/9cPqrQLDvOFHDBq05he28LCGSeHCKMEO4XARFHkTgm8wuargapUoVIIu5jv9/cOwyLKMpOAZwmLyh2AEpg0baUTUEdWH3d8aycoNNtlIWL+igDVWKcyLSZXnTa0u+4aigslAS21Ozj/zetIQ6sRjjyqtXcptG5gzvwNNpzR48B0tDDp5Z6L0dXY48Yu83r5PDWV8EG5BFyVr9QqW/AFYzvTcUFx6Q3p8WzkDuLBQiemaFgR+EuClIBO0/mWveBR0ImuATbvQK4KX+jZk66ZZlgGD5ljH32iadRS69KZLcZieILaRWl3ppkLgSswY0ahI6v6skjMyjK6Gb2ufs+eRnD1KWoxtmZDQJ0r9/xbz0j9WgadMhjZbtJIew/MFnO45Yt9xyboQ1rK1l8Md/jU016xknxNARbZPTfjaUAZCagHEu2MW3gR/Ub8WMLKsz34qq6OWCu1+Ys2+jFnXjeeKYk/4EIMtdHEiUu9DAn8vcyOqHE0oPYxp/p+hMen49RkZIRkASvmjuLjpFos5V+41RgULwR7X7yUpntWAzYrDOevtSf42KWmMfWsf4GOAh+zAQN0WOl/ZcGMitFcr7Y6cm6ZEEaDSjOpkTasrYQQRIQjCeHniRzS6DfO9snRn1xr+x/yJJUx+3DYXBv00XQ75dh2MFsNDoXIto+GfWsbOf9NNJdFuwf3WdNTsipyrnZV2FExBagSypYt67JKiRFnyh7w6TwXLm2eqVGdqRwaWe6kPDONqr78zJl2JS51jIGbq/iE86EHNLYbruvK56oqsQY931fE/YXPDjdgMcrwT64MloUy3KKL4VUgwQ2c7sXt1LH3he9Y02bV7eILO1kVBn62bcuxcy99FxZHK/L/1FP283wVfwKkijF8TLNBVb6frr33Sdar91t8rONoX4s/kVHh3nx1RdqzmMqccEQb69v/axs3aZkPcWiN+918fru8WybUqHsC36gUMakYX4pfS39HfHI5U7Mv2grWjmeyWuxZThh+7OkvWCtQ3w49tJV/cCOfZcbDR85jWe5W6/vkqXYs68o/eK+XHdD9Of/y5eMoh1mz19r10DGTFYwbGMS8qs8A27iV9WpUslGD6ixrPsC9APGlsyLlO00TiEW4Sk0qeH+Zq/BMos/d9/nT7JI+tBse6i33DbW3Gfm/87Yjabd0lGwex1mv5JvyY5iGS7UJrNmnqbxtTjhyL3j2O2Zmkq3PHUPtVb5U2717K1u/cau9/vYMX/dQvVJl25DLkenQxXHCKy2OFdp9d/W0S67RQpy4vfT6Vzbqi+/sT3y5uBpjT9pLMmX6Knv0iRGsScixMzgk41fpo0eEEVHEdb4v13Weppck+HC9GJx3Iz5r7ZUIaYn2f2JP0aIiMwQihzjeQ62S0nymm5Lt0/cvsZPPeY2pCpY7st5xKMczB/unsiUArgtZJLGfXXgRjQoojIJfd5T1BHuLqBGnh2IdvfATXpAkIKlIolyThgRlv0ojZvrjXUfbnfezEk40YBXQJWcckBiUUf00SClXqxSr3tJuYq78uZcm+JjGePqaYy9cGtwxAOlkVBUb+mxiONmjoDCFg2ij4L9+r7sk1rBvtnmL1sJU0AVOVr83zqq3GOvIK7HB46ILtX4/5HUACRhRXBjtNfs9awFOPf9NnzL8atZK68FyXA2W9ujS0DXql0sAAB4USURBVC7kYxNq5zj1uPWWHvbia1+jsIQvi4KaVfMNGoIt4Q5tWH4Vxk4r0qpZXCmzwEpfbR097Eq7ke+ufzb6W0tmz0NVFjTNmL/RZnyHW65hZSUHZkZmio0fu9COZewnhYHKLz6+3HrysRENfI0k/tMxi1Gm8B1ZVIZc3KYMCH/24eVBMWowl7oIlntIoZkdVy9EP2UkCjfiXw0mH969pT1w8+H28JNfUIMSPmW9zk7r/QbeZfgEdRIKIIZyr87+AwVteEriMMw/I5i5uQNs5BdLtbzC5tBGc5dwrDlp01kC3YaxpIvOOoBp2o+gW0KRo4x8jUC3Vvb8n06ku/CRu/UL+Ljmqee+wWwD7QqfaGGSugFU1Mt0uvrdLvpxEriUsBKLb6fV4lNHNWtm8pfBfabV5lojq5LvmqrB7pxa7NKpgetYo3q61WQnVbimWw3S6fhlaUXd++BNAunAkzQMFl3MpRHjmV/dZFecfaDv1tKZXukwWTrrhzNZM92J/u/McTfarbf3DI1FAzlzJVquejV2cYFjdT/RlTdiRs1hUw9uUSgQDqaqg2XVSiStRXZATkmOiSa+WharrFjwUjEor6z3AfTjqlVLsRq1MqxOtWp2/Y0HOWN7PWAu2sUFQHmvuaarzZx8gx3FxxAyWeiSSR0qs3S0EktfK+GWdm5X31576SzwwxSLKcnj9INO1aFhCIp1DP167VXdsOSpvn9bH1CohDtYKSPDzjpxb5vM0cuyFBrNkMX1tqKdskjv5IHB/Jt50ED92A/f7s3OL63jBi/W1FdG0VbGijD84Eyu8WGFA9rv6XDVJz4GBSbhjqY/y4WdIjzeq8KP2kV1AoZo4iJZan/mu/RzJt9ml5zdgeXJVdgXofZlf4Gm7LBoVRDy5iysOe2M9u61iS7VqcO08TdYn0ux5Ax0VWaRTAb8KM+gLu9ewXsaPvRyx1XFqL1FBQlIFnxYk6/7Vq4SBDMAZeGReFXv4FsP8IRzEj/nX7C/zZt2C94M6/4Ze8lE2VSFPpkIbGXabr996tkbL54FLwW+1dJv0fy5J0+xiZ9fYycd2ZKuSg0+DZZmJ2PpR31wpQ1+qxddFaw55cgnVoNI4EUbPR5zdBubM+lmO7xzM6dBKs1fhd2KldLSvW0O7rinTRx1XUAVQgvCLg0+CCAmBLKIFzHkf1KI0JRlKWJmSjvKKqLt1h2+l1UMSj4wesXyQi1JJAuP6+nPoKZFDNLiJWhfnWzjLlKCkMLbKSqBV01EKZdlniUcZe+pIi/l0nqUt0QoXd+Ew4b6uIEGTFQ+JSJUTKu4BdlROYR6Uq7gSdkEowUwcJdPAIOUlSGZkv+otIKpW/VPyCTMPa1w5sEZhNuKQYzmhy16FlhJ6xFARxiFrhViKwEAvvqOKldKL0ECB8UrUcZpiE7zNtCL62/6wIZ9/h3zxoW2ZN6djo+jAr2lr92jIjbUV+XpbfC+pD/Fz0JcljeGFxTKhRjkBwv+ygjDE0JDlGrtVlYYURH1nEEbqMoneCGoKH0+OvKMVK8iVkXGGSwOOIgW5CGh3HneEK9aCh40UjyxTieBBMcggIykgIhvJVV8Inh55FW3Js4Aqj5c4QiTVv13nXmv5cEKgQ5CV0iyXPiCN2wic/0qf+LIa6w6Bkl1jbxUeXWaPAs84RAcN89PW4WPV5aNPijBrgtOUyeGU9SF4D+DrgYAaRAPZ3mF52hQR7CTEJzgYlJ6Ys5etFKfzzeycFVjiIFEeBFOTCOx8/9ochdewUrERfUQvMhSqVGV3QWKWAel39BODkvQPeillIfeUZZ3YZBGNYruxWhRw4YMKlvvBF92TUqCkpGgQs2dqoGJQeT8n7MeCsqZk181upSKAAguNSKDGlsCI8YO8VplJ5QlLuE33IlzYwi2aiU8FCtcg5IAD40oqk7+F+ruOEpy+S+BpDDS80HICYs8YbeDWjgM1UPto6D3Cpo1CDgpTu9Cyb7SzzEQzEA3CasPMhHvdBS3858HGJ9v5W2bxpdrZgTcgK8pV3lKgcbAJZ3Pwigb+ErJhnoFnLTTLxJ8xE+AKVx0UONJmPRP8NR+uhdeoR5SxlLirliAK0MX1UtejBANG3ZIJT4jpTNiYgBNC7mCt0M+UisIl40bc2zcrDWkBQP4Thua5MmFAbvAyK7EKCKUF8riQf+dXmQjvT6fsquDYyoCqNCEVCUa9t8tKhBURAgaVTUXSJ9KENGdSVgd5g1CBTEXdLnUFN7YKtetL4wVJJI33lgoB2YCaIawEwyC8KIMrhOMKK01948NugxRnqhH+WWNTvlhaA8B8sbzErknrSguq+iwxUBBEPVOq/o0eiw8wzw4r4kvYWtlTCOw6riRPRyyENLJWhMFPhIcwdOfx3idguJCqMHD4YKnbwUWNxKC26xmh5bUVTm9LrryAH9RP+KpU7gqjxid/BqtF91LtZgH+NATLCmASP5rF49QuuCitxmkYz0WE+hXXXyQICdw9VuHkZO/DuW1kfskPmjJRg/y5xWwjqBkA/DzbWsei2wIpQzg8j1n6qsn1UttJLpp4I72I4Xao4Q2l3fWreVEpII5caXjbRxhJZPfqwxvKVXCo1V7UUzPpJfXoihXdrSl3iov6UVLpXVYnki3xDk+qre8QZJAJn+tbNDY4QNbi3RUhtPL4RTZFXyAtBObkC7T/gpSl/ET+QpYg38U39NLAaigHN+jhX/RGCCJdEJTPIA1h7f8SzzOu5SIwnWlBT6y5Q6XH6G3iwMgnUABbFSB/6QQZ1onBiSBZhWD18AJq9gdy/b28fSqpm4iSEpb8Snk81QJ+OUpQ16VE1mlcK/GEbHVFBKsUILj4OWogChWFiQ8CoZH81qZYC/IJThKiyD7Sz0rPcxFEGPLEkmbByshwQ0Y+iYRL13pA4yQN6FIiCMXahDFBzzne4dZBkFF/GwoKNzKsk0+YonQbc6dDLw4z5tYnbUUmOwIu6uu95sXLyhkPTfLc8G9Tdtcu/OBYcz5SiEgOClFYVumhEFyJEtGQnljVaoU2MLvWnCa62oXWNdhIOrKqDTFijmsMhlr5haR+jAo78GFTTQSs7MxqmvrcbjB5UtfRQ6nt8pxGunXS1XlA5uGRAGeaOXt7z+hkPCGX8Wp7YDlr0XrkC4CsTOvR89epstEKFR4dzr0OV9fkZqeZFnVKjEuksGy4UpM022yNeu3Wgk7nLTFV97JbPri0tWRQYhKLodfhkkF/Bxx/9n1Ft3BUvlQ//AUqFJe6r9xp2ZS+DFQO8btWHY5HhFCEaSARPlTyBel8rLKMkexiUZCx5aXKUHUn97BfQnLqThnLDGzM4/cN/U3JciCl2Aobl2AAahBMWlnEU/WOrh7cjsDjOAa67NGEnKFCHvBCzhGeBUVF7AEFLeP+K25mktliq9oCzvnlrOkOGbbCqcBB+Fn0KO4NI/3bBku3uZgismrIzylGoqKs0kXLIRwkovKcRj+Tn0SF0Tez55+IcKcB2ynhNXOitn1dw62/DxGnhHwZ544w5YtybDHnn8djyWD+e58jk/KYtR/s82dvr89fPcB1uuKGXwqeyVeWPAWRDdMMnRgN5pvCOLRBRylRznCRiIrE+p9aveaRJfyEOhRkU6qYqCVZ1XSiGh+m3hXDiJxF8WrbaKXZTdlcVLIFUP07GX6K9pZV6pWj/7292u30L6ptq4g29ZrJeHCdfCAeIFjqVCQR7HW/ZmnTvYMPiqQAB+VUg4/KrUiflGczNDu8IspIKKKtaKWClqcZwVpeV0USXDrrKTqTrhg0kzBOCeYImoqGFauL2lzC9ajJzjeKYevt4qNsZS5RQucybMLvkW9aAAvx4VPQAoK+X44wqc+d1EJ33gDh4JibaGVchAOvBNoXGqdfT9k4CGcPxa3Xhd/DniGrhCQMAos5SMUJMRiCWrpnoqYRn8c2S2Y/EsqZcWTdzlIh9ABmp9ku+KmL2zxd63wruPWoctca96aLbp6BUSGI7DWNWyvvTZidWO2aGEje/KhrnbXQx/xHbi41dtzqd12z0Zr3nIrigI1kszuRkbJNWCpwdf8PL73BqTtW2vZ5o3VrUrWBvtyVFtr334lB3MupO4ahlN3QgqQivyPh6jlPxh8ia1fm22Ll2ywhUyrLVywEcyTrDInxhzQoaE1aZJlDZjnD4aCmnmb/nuVowuZ4Mx/L///47nEFBJefv8NKuYVskKMzDn0LeWLatdYfuEyhIIDIrmWlOYSx6GEhQgfbJ9XFJaaqqjCojXEsVIwfbFt21iVY4ByvUFlmTQPKrwC08K8pNfAY1AwUiguciEFwBx/Urtlo5xQI48IcSiA7Vsq2TUXn2oHHrzdruWEGmS8jHFkFaP+ZCgTmK5AhAPjBbiOGtDR4SGeSUqIf+lprLhLRpQZ+sjJ56OIGowjyCLNmrI3Ahq3Vvss56MHeXwFphlZ8zk4s4pNHNPUpk+vzPbTJZz8ssa+mV3b5s6qZ/c8OpADDivZS3/pYTNm1GRqKdlatMi1ux4ZzM63bXbfLafxhZZqeCAINoOTGg7pc9s0O6DTTMdXSvXgll9SXlVhkahfGXUct/+ZH5S4e3au/aUOozYPGHrP3Ltt4I+n5yf+oAT/3SD1/RsNEA8BKCrZziqpMZZfuhbLx2mbWMfcglXQJG45RVgliKxBn4LCFfAOn2cuWoltYU8xjSAXUwOAOgpIrqSWZvrosD+oURBOJEprqVNTi1EIqUFEaDu9zcgosIvPvJ4v2PK5n7+9ZAX5CBJZJKre9BJGJdSfu/Xg7ANFitNLwad8LKoOiSDGozVNJDe/SJYcCyvLnZPN3DPxe7fbQD62OKYW2qYNDWzTukxrvNdS+oNSD+p6kIe7JD7mPnEcp88Ad/G39Wzb1krWbr+ldthR01x5fTO7jb356oEcEZVKv7rEjj95th1+7FRbtXRPu/+2o20bp6Dq+/Znnp9u7TqssUfu6mSnnLOSr6zWs1WLKYY6ZW+rbnXrTbW3X2tv69ZUskpVt9ud15/Hrrq4nX3BHKuUlW+vPtvB7rr1DI7weplDHjN9gPLZvoNZPVbZ7r+9m82ZVcv270SFpG104V8wXdRBdHPi6fq/FEBU3oezB+0mpUoIlltIS/XqpW6pjydVvVQnr5SS/0vhtyvokiDc0ZR4ZZu98nLcxRoQTg0gousaFEE02JOWWmJrVtey6rU4mTUp1Ynu77yzKKEnD8KoEfwwEspoEw2Tl5th7791MAceZtkd97zvkJMQOM0Ly+Xsctg3nE2+HXecQ/1S8QpwbSWonK7GSSk6YlmNLiZGCdBvy8WNXbOyFgt8cm3+fLaW4mLve8BKfAP61QjlikV72GcfdURwqliT5qvtxDOmsNBmq23aVIPDdPmG/MEazU6y+249z2ZMq+xWsRq7HB97ZrBVq6k98bAYHkkeXz156bn9vQ7NW+XZ6lVpNuHL9lZnz63uWj9w+yHWqEm2XX3TXPtgYFsb0H8f637UDHvmLwfgA+Tb868Os/oN17DcNtPmzazDN95L+aTWajur92d28akX+Ek6N7AJJBn3fOvWdE6vzbU501vb0mXJfDp5vR1x/CT3IPo918HWrUT14E3k0u3Yv+Nmq1Zrra1fk+UDi5kZ0Jt6QS5Xitn5y6xa5j5ON2K8rvz8jwXxXpBjaaNIdMuFOIoBbU8Xnsvf/+vVCarkX8/3/34OaOe7ilQTrbDzf1oJFe4SzYC1VN86ZheecpmNGdWcbYUMUiF8qaw3TsNtTU8To5EL66qBtPz8arRNkq1euYd9v6quzZvdxIZ92sCaNt1mixbsgR4BfgFp4cFVK+pzZnkVa9R0s61bvYc9ckcve/W5U+2Cky633x17lY0d1SFMD+I5hCkUswXzGttdN/W0PleeYC8/39me//PBdm1vVsqhDObPaWr3sMZ63twsS6+83kYNb2SP3Xe8pWbk24xJ7JajS1C16mYs7rm4wOn2/Guf2MtvfMgGilIbNbIpqGkaTWsPWJbLCDZLAKxF23y79/H37Oo+rNNH2a1bVWoD+x/MKsBiu+Oh0bjfU+2qG8a75Z81vb0de8IqeDdut15zgk3/qq2lZWYzCNfQuyPtDpxq+XgWGk9rt08h02tQCtpu2ZhiDRqtQTnxDXtq0rwVio/lrlJsWj4QZ+loCV5Lbk7MWrVZjn6OM3DF4iGStKRfL9rTClzjnBO3hqvaNIxTqK12h9/4YJzmPhXUpwt9ogJGpTP5yEEmLi9uOIKclVXExpkDscD5TBvVtCFvH22H9pyM5TqOk3IqsVurxC66fJ517THBVi5pbTdd1832abfN5szWBxc4EGkjxwtz2ujo4XUZSKpsV7Yc5F6blsLMmNzchg6pb/t2WoRVS7V581Js1coMO6f3Ahv0VmN7/aW21qXbTEatmUtG82tQf+36VJRLsXU5dK31+cNgu6fPhbZwIctVwffpxw7GI2Db41PvWGbl7fbE/WdzimtVNtUYLnOW9JnlIzCrV2iJKCPhj/SkK4IiSy6yjavrcGXWmjl87f7btjWDIktY2jmJLgVHCaeyMQiBirGwJI++d2VOXapTZyX98FT7dnZzBK2UA0VWW4dOK61Bw6327J/3swfvPtj6D1xuc2Y04ht5LCehGnmF0oqctFufKbjCFJs1tx3WusiaNl9ldetnQ+e4zZyeZd2OyLLB7/ZwT+niK+bSp2+HsJdao2ar3XKvWlZTDhTHY0/hiC8dqawVaVITGvxUq9K2Uua7BV3E+O2OustuR05TSqwuhyeuwjWsalf0PpNjmgtYnIBVK0qGcdfYV2NrY5FiuKCVrP4xy7HMWRy4uMUuu2aFjfykAWvPm1vnrpNhxgZWtRJfWFmpke1VdugRk+2TwQfasKH1bMDQF237Nqa4CtWfZ3aUfv38b1kjTiPUb7DFJo6tw10JrvA8a7n3DDZonGPLl2o0XH1sKSS2MsQKbM3yqri9cbv4qrGcs5fBHu/tPqLNRz4Z4ON4pM45DOzliN0RStSJPAjul36XzvnofGRBPQqgZdUotH323eRjB0rRpescrDjdBsy4ugrTvmYfPQL5/brajGwvsSH/aIwSKQVXNhJl5tnW7FT3WLTC7M3XGhBXSn97lY0f0dXadpxstWrtY5s3IXzooJWrU1nrn+tKBufE6//lZ1k2aXxvO/5339CF4QCFuvnWuMkKO+7EVTZyZF274bITaYNSO7DTZjuw+2Qb/E431qwXgXcBAs1JuJuqcfDjFroZeAYItf5pBdvW3DlWN+tI7iXkftn9AwV+s310CXmYQgqDT3L/ZE1TUvKs++Fb7ZyLtGNIIlDKANNxPir80lsf8pRPviSrXdts+LD9bY96xbZ5AwIM8y1ZkomFLLG7H/+c7Y8c4Mdg27fzarIYooiBpwwUB2WK7TDNsWQUwvIavhNM00vLF3dmG2MK/e2vsJJptmR+Ku9ooGR9bolcCHtKSjEudwMkJcaGiy2sPjMb/wUnmuB5hMU0xbZgPqYW13bzpto25evq1rAxn+tZXZMz5AutYVNO2VE/g7+VK9PtulsnWM72ajb0H4dY3TM+w+2lQIQ5xmGGU76u43V65Zm2zIHvw3bIIs6Dz7FmLZfauRfHbO5NPewm3HONNVStWmxPvTiYgb097fV+TSz571h4BjBv+D3eALtdMqFDh45rmD9nEwr1vvmOWTbskyZ2zIlLGGtYZ/vuu9b2bLqUxTdxO+vCT+28y1E4DCYWM7WmLoSs8qnnjLDTz0FJQooivIJeVw1D9XEgZgEzF/yLuk9uxmlbKU2FsHrQb3/TP79ZQZddiwYwM1Ia2Hb6dg2wVqksOx3xWQ0Y/XxONnmL02oLbNv2LKvToBhLuZ2+dH277tKTsNy51vEgFn2sl8XV3G+RLaffW1KYbo0afw9zYjoxPQu+zeRMLyypdnyIIUkr5kuOFzOVlGqNGrFYhedFC6tbjaoF9E3j7D3nqxwIb5OW2CqtENGofimWjM08a9ek89UOhOW6cznFxWzrllJrsy+LWnBbm7fMsXnfJLPL6yKsMXlp3RtuHQeOme7Wtm2zlXT5dscDX9N378SW2FOwg0m23/54AHgOIB3GEKDNd3PSLK1KoV138yzGGepZhwMW4GnM5YumKbZHg1XWd8DffX4/iXqoS6Gfmul51vfNN13MJKCakhPMR595EwWjksJIfJt9p4PzNMqOWSF4JzMmoP66LHUJSqqI5Z98RYytneSg26OZhpg8Id6HFYQ8azBV3gooo5qAzYAldNyePz8h0LwgPlLmicjf7OU3LOjS+vpLXGCc9Mwt9tc3+tvbL53E0UVVbcrETtb18C99tLdRE60e43jdSXVZf1xotz/4Nd+QW4GrfzYMihDGCzj6ByFohIBh/fLz+VQSG0kKcjlcY1OqvfTCqXbRNYNY2wIUBpni6WzE2JJi7Q/83vu3ixelWdu2DCxRShHCpKUrjRtnO3Il7m8jCAj/pvXJdtiRKzmLbU/7dnGJnXDKGjv5PE7WQdBuvnuQLfqurX09tiVTWsutzX6siMMr0V/ft/u70tBHIZo0n2PPv/6dj2THklh1pi4+/Vy56toDkJdTycuqt2ehtes4xfbhBGx5McXFJKTuOv+P7rvMJTBEQKxuQqgEw2ce5ElLGL1GSKgsLM9aBebnxYOvBv2Ssfjaoy+LLCFXb5sfugmiQAlbag9BESC08RpWNbUZ9Sy2ahn7gTMHLZZmsR2zGbCjTpjKUS7S42IlSUkCU/B+6+E3K+jiHWdCmDU1Xg0Xudj+eOc51v6ADbZgIft/sSI162yG+eATLMd389LsyvMvs1v+MJp3MXvk7i6s4oJJsdQNmuJiw09yz5s2wtWWceFdAcJz452T7Jln9qe/zXFNCTcUv53FM4V2Qe+l1qHzNMveUtmee+0tTkCB+XFFK1fJtr/2ew9vIiyqAEUXwG9naV67mBHqTXb51SP9YH8tHCnG8mm/vIbyW7T8ltNY57kVdAZ34cKSMnXn4uDA6NECx4f+9SzLKevo0huzrdu1jp0DI5qHj0wUADuOh5LEenO3oPJOSKulqYGKsqyyqoXsw9Z5fBqAbEDXo557IjUqdUH0CpilqMX++kbkVQqUBlfUF38aRCNOGscDMarPPwnKAwjKljLTXQhgQ5tJqQCbeoVU0dvf5vW3vTIOqyJTMm/lfbZm08d2721n2fIVybjwxXbGOZOtfefZWLm4bdrMHPKYLpwTvtEO6DbF1qyqxfw4p51U1WAXmy2YtspkAKyAPm6KvtqJdRfjK+gMOC10006jYk0ZUV7gScb5WVAi91SWTopB+8fFub5iiqu4Xwyrf1oOO/LjLvbqC23t1rumoSBmEccIOUIioyqL6JtdUELqCjDRR9m8c8lESIWD4HvQVdNPpVY5bV/SpaMoqjGa31CdYrolHVBm+uRvGnEtfNNKjJkJoaSh++h8snhSBjCoI32EHQRzJ9lSGs9Ldp/dUI2gRxhoFNDd4demwG9a0KP+2zcr77G12wbjrmpqBiZEcvIQQLmh3g+kFfzASRhW87re9YRRtYQVEfSIQoaTU3TIhEuxRFOuqcaCE6wtQeZeg2Ha7aXBNZWj72x5wD13QZV1c5dA/ctc8MHpQlI0uJXLSHdpXherUTeH0XJOL4k1omzWRqe14VqEZ1IL4dRR1jrIQOe0yzLq2CjOjCcuJYaw0idWnz+uYfqdA8Lt+omrC6YrD1lrFBKVdqvt9VOchDUAkBISnoGewMAbCoonUTeSKa0rMDCJ7ita4Z1R2f28aynwm3XdIzLKymXIkm3D+mkZKAKJrLkVFiP696ywcsgkQiPBkRTIYuo5jIgncU4XD1hB3FlxMakFVw5pamoL9npp6SuDW2lNSVbMwpVmFMAUW1JV3PUGCICEtA4CIGvMCrl4WPGmONcGls7gXOTWAl7ykxCycO/YEClhQgElcChFoL0zTXqPkxuvRO49IHB+r0yKkyQKjrwHLtTHg1+kdCJPRGVIyD0TSQQHIfeZAeWAeALleCif6KXnUEQ4Q4A0oVBl2B3+CxT4zQq69+PEgS68MKr+YbUqpbSEKdk/HcvAKrIsliTpjMqLseWqpqXVgalZEZdcj3epvKaPn8I9jO7WlHSxpEyElVUqvyAEcVHpgPMfCvRAXJmwECGrTlm+9xycy/qlJA9HUpULl4RIQh62l6qvK8AqQwIaLLPDkeAD1/UCVz8KS2m8vy58NEbA5FUk1EoDJE9POocLDCEeKRLFhfflwiwa6X/wDMJ0mZRaWR2AtDv8uhT4/wC1JMLrDIdYugAAAABJRU5ErkJggg==
-				</mdui:Logo>
-        <mdui:Logo height="75" width="75">data:image/png;base64,
-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
-</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.190.154.64/26</mdui:IPHint>
-        <mdui:IPHint>193.190.71.0/26</mdui:IPHint>
-        <mdui:IPHint>193.191.182.128/25</mdui:IPHint>
-        <mdui:IPHint>2001:06a8:0540::/48</mdui:IPHint>
-        <mdui:DomainHint>kdg.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:51.2198900,4.4034600</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVAPGgGOPxkWRQN27VjuZmpvCjmnizMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMMCmlkcC5rZGcuYmUwHhcNMTQwODI1MDkwMzMxWhcNMzQw
-ODI1MDkwMzMxWjAVMRMwEQYDVQQDDAppZHAua2RnLmJlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAlmhFinjjac992YuR8BS07MxfWNReYJe+lmhRozRo
-mtptX2VcrTUHKEMhQES1XRsT8EBA/Ib0NkkD8Liw1MvmbZ8GXhBnZ/2wV/KBv8yN
-6YmMb5+1Ss+WwrKQcgarF5RjS7fD7TxjQcxvDrBo43z93aZeImqB/ZRjDb/JZ30y
-DliyUAjEpVt+9BIwTLPmvJkL4kVUBMcqCSO3dFns4Blov7Dm8nURo5C/F3g3CSmw
-6hOi2KdW3EamPcV9ZJ0D5BMBM40Bo3Ko2HGOcxvhKZap6MSIP4lKlWE8RNGXehGY
-P1SOTUQIBekv7rbjRAftcQcSFIeJVX5UUDfHAzDEly5iEQIDAQABo1swWTAdBgNV
-HQ4EFgQUpZDuzFNVGzknO9+UHMTlPr9V/I0wOAYDVR0RBDEwL4IKaWRwLmtkZy5i
-ZYYhaHR0cHM6Ly9pZHAua2RnLmJlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-BQUAA4IBAQBHT0WU2xpqxQlrM5pzEA+6ddq+7M/84eGyzj3L7WRs/RNmtwrxKlv2
-afRgZsMTMBA60AUQz5sBwK5GkIvg+ZYwBl8mGTQYY6/Um3EUqB3SzsHFgIE85NHG
-lR4h7WT9Yb2qPgUWCBkz/UfrphGhje7NUzrCJGJoKPsm6uSNyl804Q1KrWwV1WFM
-eEswby9HNRf2RuAKiVAtSDP1MvLO6wEMTQAgwyBjSb9C8iYdUHUk7ARNz9vBIx55
-Dip0z/sGPBLF+QVmQdY1y0uMawVy9FJp/OzRAQ97PGZrRx9BnuVgQP5qjtLZV+Sg
-WwKI1yjSjIyoht8aBaNNdlNtFLfcf2q3
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kdg.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kdg.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kdg.be/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kdg.be/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kdg.be: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.kdg.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kdg.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kdg.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kdg.be/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">kdg.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVAPGgGOPxkWRQN27VjuZmpvCjmnizMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMMCmlkcC5rZGcuYmUwHhcNMTQwODI1MDkwMzMxWhcNMzQw
-ODI1MDkwMzMxWjAVMRMwEQYDVQQDDAppZHAua2RnLmJlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAlmhFinjjac992YuR8BS07MxfWNReYJe+lmhRozRo
-mtptX2VcrTUHKEMhQES1XRsT8EBA/Ib0NkkD8Liw1MvmbZ8GXhBnZ/2wV/KBv8yN
-6YmMb5+1Ss+WwrKQcgarF5RjS7fD7TxjQcxvDrBo43z93aZeImqB/ZRjDb/JZ30y
-DliyUAjEpVt+9BIwTLPmvJkL4kVUBMcqCSO3dFns4Blov7Dm8nURo5C/F3g3CSmw
-6hOi2KdW3EamPcV9ZJ0D5BMBM40Bo3Ko2HGOcxvhKZap6MSIP4lKlWE8RNGXehGY
-P1SOTUQIBekv7rbjRAftcQcSFIeJVX5UUDfHAzDEly5iEQIDAQABo1swWTAdBgNV
-HQ4EFgQUpZDuzFNVGzknO9+UHMTlPr9V/I0wOAYDVR0RBDEwL4IKaWRwLmtkZy5i
-ZYYhaHR0cHM6Ly9pZHAua2RnLmJlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-BQUAA4IBAQBHT0WU2xpqxQlrM5pzEA+6ddq+7M/84eGyzj3L7WRs/RNmtwrxKlv2
-afRgZsMTMBA60AUQz5sBwK5GkIvg+ZYwBl8mGTQYY6/Um3EUqB3SzsHFgIE85NHG
-lR4h7WT9Yb2qPgUWCBkz/UfrphGhje7NUzrCJGJoKPsm6uSNyl804Q1KrWwV1WFM
-eEswby9HNRf2RuAKiVAtSDP1MvLO6wEMTQAgwyBjSb9C8iYdUHUk7ARNz9vBIx55
-Dip0z/sGPBLF+QVmQdY1y0uMawVy9FJp/OzRAQ97PGZrRx9BnuVgQP5qjtLZV+Sg
-WwKI1yjSjIyoht8aBaNNdlNtFLfcf2q3
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kdg.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kdg.be: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">
-KdG
-</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">
-Karel de Grote-Hogeschool
-</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">
-http://www.kdg.be
-</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dienst ICT</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>helpdesk-ict@kdg.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kidderminster.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kidderminster.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 7386c26b..00000000
--- a/swamid-interfederations-2.0/idp.kidderminster.ac.uk-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.kidderminster.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for NCG Corporation.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-07T10:38: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">kidderminster.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDfjCCAmYCCQC1lEqsdKl1pjANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHDA1LaWRkZXJtaW5z
-						dGVyMR4wHAYDVQQKDBVLaWRkZXJtaW5zdGVyIENvbGxlZ2UxIDAeBgNVBAMMF2lk
-						cC5raWRkZXJtaW5zdGVyLmFjLnVrMB4XDTE0MDUyMjEzMTkzNloXDTM0MDUxNzEz
-						MTkzNlowgYAxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5Xb3JjZXN0ZXJzaGlyZTEW
-						MBQGA1UEBwwNS2lkZGVybWluc3RlcjEeMBwGA1UECgwVS2lkZGVybWluc3RlciBD
-						b2xsZWdlMSAwHgYDVQQDDBdpZHAua2lkZGVybWluc3Rlci5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBANRe5zKGcnY7gv70p75rc68Wrj+q5Zkl
-						k12zx44THBleZAnLqwGRPh8cI1+zEHCJkFYZ+Jb6JUhLMTA4qalwr/Xsnba3e4vF
-						CaSL5IaXT6L08pVj56z3JbOuJSEe1G9seJWpXi6EV7NFWMKV+oBofs7pbvy9TzA1
-						fBGnJ6IAicdaFtlZALeYyGnF1w/QazoxYP0jg/3+l8DT4hQ8+xnyKIiw7F9lvD0z
-						Q+pm0vZavGHT7QXdgLzPFrgS8o07hoQlw5a0uLv0n46MHwZQh5LWj9LCXrspjZ7I
-						SLSOz5XUREIysOTkc+n4HwFDg6oU66eSG7i0+4sMGhufUwwuLpUtp6ECAwEAATAN
-						BgkqhkiG9w0BAQUFAAOCAQEATtVSFphRCI0ZcS+bbndukADAg2wWXZr1XK9ZeAQY
-						Ov2mCxPxeTq1xUW+y2XvTyKzpO5pEmSgcPgLWWAI7DitZZdSjHQF2Tp+611GclqP
-						4RCmSiR6oLFMppbKAoIlt9rM/9YVBUMmg/1UkHfRRl5B3fCEGP6a6gjkFyY3tREr
-						zlRZAqczHRN6KlO+XGd4V2GLEr+5afKgOQ7v6PY8SY2A9aPkb7VXayF9ce6Cp8fM
-						iI7pdvffghmNIpB/5M6m3Pt0ZPCWOTUbAlBt34zSVFfrDIHBHru0D9/ZBjY74j54
-						Tr/tGMotauH4aEa18dgsPJ3fiAlCAOcfTKDJKfzyX7FkIw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kidderminster.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kidderminster.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.kidderminster.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kidderminster.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kidderminster.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kidderminster.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">kidderminster.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDfjCCAmYCCQC1lEqsdKl1pjANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHDA1LaWRkZXJtaW5z
-						dGVyMR4wHAYDVQQKDBVLaWRkZXJtaW5zdGVyIENvbGxlZ2UxIDAeBgNVBAMMF2lk
-						cC5raWRkZXJtaW5zdGVyLmFjLnVrMB4XDTE0MDUyMjEzMTkzNloXDTM0MDUxNzEz
-						MTkzNlowgYAxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5Xb3JjZXN0ZXJzaGlyZTEW
-						MBQGA1UEBwwNS2lkZGVybWluc3RlcjEeMBwGA1UECgwVS2lkZGVybWluc3RlciBD
-						b2xsZWdlMSAwHgYDVQQDDBdpZHAua2lkZGVybWluc3Rlci5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBANRe5zKGcnY7gv70p75rc68Wrj+q5Zkl
-						k12zx44THBleZAnLqwGRPh8cI1+zEHCJkFYZ+Jb6JUhLMTA4qalwr/Xsnba3e4vF
-						CaSL5IaXT6L08pVj56z3JbOuJSEe1G9seJWpXi6EV7NFWMKV+oBofs7pbvy9TzA1
-						fBGnJ6IAicdaFtlZALeYyGnF1w/QazoxYP0jg/3+l8DT4hQ8+xnyKIiw7F9lvD0z
-						Q+pm0vZavGHT7QXdgLzPFrgS8o07hoQlw5a0uLv0n46MHwZQh5LWj9LCXrspjZ7I
-						SLSOz5XUREIysOTkc+n4HwFDg6oU66eSG7i0+4sMGhufUwwuLpUtp6ECAwEAATAN
-						BgkqhkiG9w0BAQUFAAOCAQEATtVSFphRCI0ZcS+bbndukADAg2wWXZr1XK9ZeAQY
-						Ov2mCxPxeTq1xUW+y2XvTyKzpO5pEmSgcPgLWWAI7DitZZdSjHQF2Tp+611GclqP
-						4RCmSiR6oLFMppbKAoIlt9rM/9YVBUMmg/1UkHfRRl5B3fCEGP6a6gjkFyY3tREr
-						zlRZAqczHRN6KlO+XGd4V2GLEr+5afKgOQ7v6PY8SY2A9aPkb7VXayF9ce6Cp8fM
-						iI7pdvffghmNIpB/5M6m3Pt0ZPCWOTUbAlBt34zSVFfrDIHBHru0D9/ZBjY74j54
-						Tr/tGMotauH4aEa18dgsPJ3fiAlCAOcfTKDJKfzyX7FkIw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kidderminster.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kidderminster.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">NCG Corporation</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Kidderminster College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kidderminster.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jon</GivenName>
-    <SurName>Dalton</SurName>
-    <EmailAddress>mailto:jdalton@kidderminster.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Graham</GivenName>
-    <SurName>Mason</SurName>
-    <EmailAddress>mailto:gmason@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kingston-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kingston-college.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 2416e59a..00000000
--- a/swamid-interfederations-2.0/idp.kingston-college.ac.uk-idp-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://idp.kingston-college.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Kingston College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">kingston-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjygAwIBAgIVAMdUWtt4ktwl67ApElUJmzacgr80MA0GCSqGSIb3DQEB
-						BQUAMCUxIzAhBgNVBAMTGmlkcC5raW5nc3Rvbi1jb2xsZWdlLmFjLnVrMB4XDTEz
-						MDQxNzE1MDg0NFoXDTMzMDQxNzE1MDg0NFowJTEjMCEGA1UEAxMaaWRwLmtpbmdz
-						dG9uLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCmDI0iBMmMG2bc5ALSjviEDGlHjgr3taE907rW6ArPCH5xUMBFw9Nwge0mNS3D
-						naqk9WhKANREU5kppNAoWtp65P7jqStN1dgsUpK9ruIpYp2VymgMNnXtqv+EEE12
-						iZW0bZBVhmFVlJBXHIt879+jRXiR3ALSqRuE8MasJIJhwgqMU18qr9lgm3jhwDTt
-						MJdc+N255WStJdWD2Q6OGJUVF2bcoFQcQ8cgxEsGjQIQ3qQ232/Cp8clHzcEBc8V
-						pKtTU4jkmu+OQMsbImeY0OguIpVG1QYsgG8Vz7L9GIwx8ed52QuoJMXW4QaeNenk
-						oEJP2Rq3WTym/Pys1pGcXpynAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC5raW5n
-						c3Rvbi1jb2xsZWdlLmFjLnVrhjFodHRwczovL2lkcC5raW5nc3Rvbi1jb2xsZWdl
-						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRp8Hn8YhPsXqx9UpL1LtVm
-						4c6hVTANBgkqhkiG9w0BAQUFAAOCAQEAHRjHFTvBHVK1NJXYoKAgunVmG4c/pqbv
-						99OrLj2TNrUK/LD4395qpXoBtXAkw+76ZqbF5aBs+3IYLha5MyRZqFfa6KBXEwwj
-						Zej8Bdx809xIBfbkl25uUWGzg+77oaMMog1AzpCAcV0L6wHNnrLBJ6xxOzq/3wNE
-						XwYLU2H+KZ6oA5nV2x7/OVH5uxkrVJpNpTpM/D2TzDvfaO3m4rotmCaKYDWqU+/v
-						g22QCNGnQBNm+23uTa1K4sR+WSZ2SOwwzIdgfATd5XdnnY28BMKy4uNME+XJklhY
-						4O5uQkWDV+eFTekWMLQ1esZs27Pvp0NECx1IgTb2IjoXF8X16uNqDA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kingston-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kingston-college.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.kingston-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kingston-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kingston-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kingston-college.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">kingston-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjygAwIBAgIVAMdUWtt4ktwl67ApElUJmzacgr80MA0GCSqGSIb3DQEB
-						BQUAMCUxIzAhBgNVBAMTGmlkcC5raW5nc3Rvbi1jb2xsZWdlLmFjLnVrMB4XDTEz
-						MDQxNzE1MDg0NFoXDTMzMDQxNzE1MDg0NFowJTEjMCEGA1UEAxMaaWRwLmtpbmdz
-						dG9uLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCmDI0iBMmMG2bc5ALSjviEDGlHjgr3taE907rW6ArPCH5xUMBFw9Nwge0mNS3D
-						naqk9WhKANREU5kppNAoWtp65P7jqStN1dgsUpK9ruIpYp2VymgMNnXtqv+EEE12
-						iZW0bZBVhmFVlJBXHIt879+jRXiR3ALSqRuE8MasJIJhwgqMU18qr9lgm3jhwDTt
-						MJdc+N255WStJdWD2Q6OGJUVF2bcoFQcQ8cgxEsGjQIQ3qQ232/Cp8clHzcEBc8V
-						pKtTU4jkmu+OQMsbImeY0OguIpVG1QYsgG8Vz7L9GIwx8ed52QuoJMXW4QaeNenk
-						oEJP2Rq3WTym/Pys1pGcXpynAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC5raW5n
-						c3Rvbi1jb2xsZWdlLmFjLnVrhjFodHRwczovL2lkcC5raW5nc3Rvbi1jb2xsZWdl
-						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRp8Hn8YhPsXqx9UpL1LtVm
-						4c6hVTANBgkqhkiG9w0BAQUFAAOCAQEAHRjHFTvBHVK1NJXYoKAgunVmG4c/pqbv
-						99OrLj2TNrUK/LD4395qpXoBtXAkw+76ZqbF5aBs+3IYLha5MyRZqFfa6KBXEwwj
-						Zej8Bdx809xIBfbkl25uUWGzg+77oaMMog1AzpCAcV0L6wHNnrLBJ6xxOzq/3wNE
-						XwYLU2H+KZ6oA5nV2x7/OVH5uxkrVJpNpTpM/D2TzDvfaO3m4rotmCaKYDWqU+/v
-						g22QCNGnQBNm+23uTa1K4sR+WSZ2SOwwzIdgfATd5XdnnY28BMKy4uNME+XJklhY
-						4O5uQkWDV+eFTekWMLQ1esZs27Pvp0NECx1IgTb2IjoXF8X16uNqDA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kingston-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kingston-college.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">Kingston College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Kingston College (Shibboleth)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kingston-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:itsupport@kingston-college.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:itsupport@kingston-college.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kingston.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.kingston.ac.uk-shibboleth.xml
deleted file mode 100644
index 60f04dd7..00000000
--- a/swamid-interfederations-2.0/idp.kingston.ac.uk-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://idp.kingston.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Kingston University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-09-04T10:12:40Z">
-      <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">kingston.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Kingston University London</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University based in Kingston upon Thames, Greater London</mdui:Description>
-        <mdui:Logo height="60" width="80">https://staffnet.kingston.ac.uk/includes/img/static/kulogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUQjxnHZMeQMvjHxSoR20dG8MKz1AwDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSaWRwLmtpbmdzdG9uLmFjLnVrMB4XDTEzMDcwMTA5MDkx
-						MloXDTMzMDcwMTA5MDkxMlowHTEbMBkGA1UEAxMSaWRwLmtpbmdzdG9uLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn6CD799xP1TB7SWC+MsZ
-						qGZMmQz9HcavX1oJ2CpIknSzIX95LyPONkSjb331W9ShXl+eKPEH2Mk5bdyaHoSn
-						dXZvwflSxfLKC3UnZNUizA9CCWmGlNbvwkJM+dE/EonpHpfLLCu+F+Q+ojRRyjPc
-						oWfuXl0hdqd2yWo102z1YEsN4PgCkrgwCpVIG0Y5/oYGmnsC4/q8/DOIRLjxEbkg
-						ltnReG6HP+1zuI+ZHq2vqYPT8KngdvLk0wK/f1SdaZxbqNwmOGLm0E/Eo2SUuRIs
-						T3o6jFrh9A4yO+XJN3NqIVuafUX2FMkOKqnj8zg47HOWvqTfBP0S0c/N0aDnwfHB
-						mQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAua2luZ3N0b24uYWMudWuGKWh0dHBz
-						Oi8vaWRwLmtpbmdzdG9uLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSy
-						/YogRZ0oDBUzuNiLdMRngE+ZVTANBgkqhkiG9w0BAQUFAAOCAQEAD4mJs6Bk4UlH
-						KQ4OU2tjaPs9X8olgNvnA1znumIqNBSZKr0fWBp8fjSCmLuF3hnNuhU13N1+BnBt
-						w5wQTyVTaFf7T2WWQyp67vvIKgCXLUsIwQtKasIQ7LHQQvCKym6veIma1Bb1FlrG
-						ZtIo7Px6GKLDQnnahabtPfCdE+6H6oijxucVLda9rxJvQ6M86S6UmnxRgZdL7urm
-						UIozCY3Xlv0VfrHf5HTk6P4DtYV/A8RdlaVw6EQai9IWIujw9bmAFv9OgMNCD9SW
-						4js256ukDUd7eAlrqPbT4TWLEGqdDG2RKB7LdiS9ooSyzX1KLYe2b7CBgZR0zpdh
-						FxWK7Ksb9Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kingston.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kingston.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://shib-login.kingston.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-login.kingston.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-login.kingston.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-login.kingston.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">kingston.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUQjxnHZMeQMvjHxSoR20dG8MKz1AwDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSaWRwLmtpbmdzdG9uLmFjLnVrMB4XDTEzMDcwMTA5MDkx
-						MloXDTMzMDcwMTA5MDkxMlowHTEbMBkGA1UEAxMSaWRwLmtpbmdzdG9uLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn6CD799xP1TB7SWC+MsZ
-						qGZMmQz9HcavX1oJ2CpIknSzIX95LyPONkSjb331W9ShXl+eKPEH2Mk5bdyaHoSn
-						dXZvwflSxfLKC3UnZNUizA9CCWmGlNbvwkJM+dE/EonpHpfLLCu+F+Q+ojRRyjPc
-						oWfuXl0hdqd2yWo102z1YEsN4PgCkrgwCpVIG0Y5/oYGmnsC4/q8/DOIRLjxEbkg
-						ltnReG6HP+1zuI+ZHq2vqYPT8KngdvLk0wK/f1SdaZxbqNwmOGLm0E/Eo2SUuRIs
-						T3o6jFrh9A4yO+XJN3NqIVuafUX2FMkOKqnj8zg47HOWvqTfBP0S0c/N0aDnwfHB
-						mQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAua2luZ3N0b24uYWMudWuGKWh0dHBz
-						Oi8vaWRwLmtpbmdzdG9uLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSy
-						/YogRZ0oDBUzuNiLdMRngE+ZVTANBgkqhkiG9w0BAQUFAAOCAQEAD4mJs6Bk4UlH
-						KQ4OU2tjaPs9X8olgNvnA1znumIqNBSZKr0fWBp8fjSCmLuF3hnNuhU13N1+BnBt
-						w5wQTyVTaFf7T2WWQyp67vvIKgCXLUsIwQtKasIQ7LHQQvCKym6veIma1Bb1FlrG
-						ZtIo7Px6GKLDQnnahabtPfCdE+6H6oijxucVLda9rxJvQ6M86S6UmnxRgZdL7urm
-						UIozCY3Xlv0VfrHf5HTk6P4DtYV/A8RdlaVw6EQai9IWIujw9bmAFv9OgMNCD9SW
-						4js256ukDUd7eAlrqPbT4TWLEGqdDG2RKB7LdiS9ooSyzX1KLYe2b7CBgZR0zpdh
-						FxWK7Ksb9Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kingston.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kingston.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">Kingston University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Kingston University London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kingston.ac.uk/icts/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matthew</GivenName>
-    <SurName>Grove</SurName>
-    <EmailAddress>mailto:m.grove@kingston.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Murray</SurName>
-    <EmailAddress>mailto:k.murray@kingston.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml
deleted file mode 100644
index 70199015..00000000
--- a/swamid-interfederations-2.0/idp.kirkleescollege.ac.uk-entity.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kirkleescollege.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for Kirklees College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">kirkleescollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgDCCA2igAwIBAgIRALyJOa+uq/oIUbNaLn2KXiwwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MDMwMDAwMDBaFw0xNjA0MDIyMzU5NTlaMEcxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLmtpcmts
-						ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ALLhXXGAlGzAXjTroZwzaMOxuBK/OhDokwfsjhn7ZI4MGUIdWvstZeHbkGtLiwuP
-						jWQ/usuTbiDwHWBvIBBLse+3q7k0QmKAtVSXZK6EsK9rPQsQH0eURmD4ja2qC15/
-						LefzP8yPNBhAjMRRrb9bBXry6TtQItIFUvgLUXbdmjWYY2AB41qhSx3ZBPIvVCYF
-						RTwVLykiZ+W8OaviB4N5kKkyNa4eSANcF+g8DC3WozFm6g+He4qtXNvc6iERdvlF
-						TlPcsWfEJoz9JSku2/u9+DNxwN041bLTfJq3Hwy/8lkQE2YbLdmv/IQz1ErYA1qE
-						Ad2faNnHeNjlKfRePnBf8W0CAwEAAaOCAXYwggFyMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSCqCPYjgeb90vOUQbpnXkrucpgoDAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYDVR0RBB0wG4IZaWRwLmtpcmts
-						ZWVzY29sbGVnZS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAQyOuUyGYf8IPri1z
-						Y2yk+b3cpXUmJp1cqAkyrlvGdYzxWwLNTiFmnfqXl2F5NwY1spcoYcoQAVF1NFdr
-						xnEXnt5abNqSQysVoO8x6bhNilzELp25LIQNMhVtgPmm3mOwiYvHTixi0DCf8fy/
-						XsyKGxghAMpcIFwPbB6n+60Z9rKt2IR5eXdBFeP/zlA4rpHkHZKv/4J9XhDUI0Jz
-						756Te1Pz3yg1tf+7sj0pXJVvYMJev2AdBbSpAbjYzM2Ql2yBXMYA+z5zL/if1cUL
-						ogmKl5PdPZpZJfPazJwj6yT/FWPxI0FcA7QtM+TQ6SDrcnPckQHmXAFaI6mbbyzg
-						JtfZCQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kirkleescollege.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.kirkleescollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kirkleescollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kirkleescollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kirkleescollege.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">kirkleescollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgDCCA2igAwIBAgIRALyJOa+uq/oIUbNaLn2KXiwwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MDMwMDAwMDBaFw0xNjA0MDIyMzU5NTlaMEcxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLmtpcmts
-						ZWVzY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ALLhXXGAlGzAXjTroZwzaMOxuBK/OhDokwfsjhn7ZI4MGUIdWvstZeHbkGtLiwuP
-						jWQ/usuTbiDwHWBvIBBLse+3q7k0QmKAtVSXZK6EsK9rPQsQH0eURmD4ja2qC15/
-						LefzP8yPNBhAjMRRrb9bBXry6TtQItIFUvgLUXbdmjWYY2AB41qhSx3ZBPIvVCYF
-						RTwVLykiZ+W8OaviB4N5kKkyNa4eSANcF+g8DC3WozFm6g+He4qtXNvc6iERdvlF
-						TlPcsWfEJoz9JSku2/u9+DNxwN041bLTfJq3Hwy/8lkQE2YbLdmv/IQz1ErYA1qE
-						Ad2faNnHeNjlKfRePnBf8W0CAwEAAaOCAXYwggFyMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSCqCPYjgeb90vOUQbpnXkrucpgoDAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYDVR0RBB0wG4IZaWRwLmtpcmts
-						ZWVzY29sbGVnZS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAQyOuUyGYf8IPri1z
-						Y2yk+b3cpXUmJp1cqAkyrlvGdYzxWwLNTiFmnfqXl2F5NwY1spcoYcoQAVF1NFdr
-						xnEXnt5abNqSQysVoO8x6bhNilzELp25LIQNMhVtgPmm3mOwiYvHTixi0DCf8fy/
-						XsyKGxghAMpcIFwPbB6n+60Z9rKt2IR5eXdBFeP/zlA4rpHkHZKv/4J9XhDUI0Jz
-						756Te1Pz3yg1tf+7sj0pXJVvYMJev2AdBbSpAbjYzM2Ql2yBXMYA+z5zL/if1cUL
-						ogmKl5PdPZpZJfPazJwj6yT/FWPxI0FcA7QtM+TQ6SDrcnPckQHmXAFaI6mbbyzg
-						JtfZCQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kirkleescollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kirkleescollege.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">Kirklees College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Kirklees College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kirkleescollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sam</GivenName>
-    <SurName>Lim</SurName>
-    <EmailAddress>mailto:slim@kirkleescollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Lim</SurName>
-    <EmailAddress>mailto:slim@kirkleescollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml
deleted file mode 100644
index 01681b16..00000000
--- a/swamid-interfederations-2.0/idp.kkh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.kkh.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">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</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">kkh.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungl. Konsthögskolan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Royal Institute of Art</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Kungl. Konsthögskolan (KKH)</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the Royal Institute of Art (KKH)</mdui:Description>
-        <mdui:Keywords xml:lang="sv">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art </mdui:Keywords>
-        <mdui:Keywords xml:lang="en">KKH Kungl.+Konsthögskolan Kungliga+Konsthögskolan Royal+Institute+of+Art </mdui:Keywords>
-        <mdui:InformationURL xml:lang="sv">http://kkh.se/index.php/sv/om-kkh</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://kkh.se/index.php/en/about-kkh</mdui:InformationURL>
-        <mdui:Logo height="110" width="404">https://idp.kkh.se/idp/images/kkh.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://kkh.se/images/stories/helens/Personuppgifter_KKH_infotext.pdf</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kkh.se</mdui:DomainHint>
-        <mdui:IPHint>130.242.7.0/24</mdui:IPHint>
-        <mdui:IPHint>130.242.8.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.324458,18.082998</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVANZ+rVePFlHJtqutoy3Mh9qeZKtuMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMMCmlkcC5ra2guc2UwHhcNMTQxMjEyMDcxOTI1WhcNMzQx
-MjEyMDcxOTI1WjAVMRMwEQYDVQQDDAppZHAua2toLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAm8Np4yJz6CjpvlsIS3p9E7tYXhC+mcxCVMBlSq+1
-FuhKiwoC4IhA0Zht9YDf6KS9z3JZTQ5UDpCikgUcr8KyBwOz5KJhIyELZbQJtvae
-8+5sK5InUCWG3utIA0KpVx/OM46yBfG8Vq7HJUuZTRsM3538nEgrnUJWn3Hruds4
-a1aJFTjbhZsntVh1VzuM/O6F1Y11uaVpRnSvX/kWqrwW0zfAd6fsqDfB9qhqsvHD
-p5EwJ5SR9W1p+1RzvZKiPVr2UHd83izjncf1myrxT7jKwEamMbHnC/MnRo2Jn/Bu
-VTuz4tnmnvfnaVKyp7MOMjmiSvKggUqzu2uIx6fSuEr+WwIDAQABo1swWTAdBgNV
-HQ4EFgQUbLroM3/7JnvbagCwSlCTDIW+CNQwOAYDVR0RBDEwL4IKaWRwLmtraC5z
-ZYYhaHR0cHM6Ly9pZHAua2toLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-BQUAA4IBAQBNt8sEoLRpIMFTjPx/PyUDatWTlp7a5SCtuTwr552b7UvRetz9rDwL
-ip2x2eHt6JoiHx7OabzAOL4oDo/akaqopY0tcmhjrRRw1tuuOxSZiejIh2DXmkn8
-9I/nIGsYx6mFD/yEXMg9pacV+HGQUdvUPpKyYjfMHihz/5A2Q+Qj6PjUthCNR6KX
-rkzEd5A2/OKLgeYgcrLEpShVXxIs2PxwOj3zgNJblb8dT00sajTf9usa9WZk6R9q
-qowogArC+4U1+wcq4ctUoM0Lyh5YaTMs4U31GcmYAotsLw+sY97V0WGQKffURz4f
-/u55VifGWHpaCkgtHFGyHuq6l7I7vZ1A</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kkh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kkh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kkh.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kkh.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kkh.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kkh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kkh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kkh.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">kkh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVANZ+rVePFlHJtqutoy3Mh9qeZKtuMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMMCmlkcC5ra2guc2UwHhcNMTQxMjEyMDcxOTI1WhcNMzQx
-MjEyMDcxOTI1WjAVMRMwEQYDVQQDDAppZHAua2toLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAm8Np4yJz6CjpvlsIS3p9E7tYXhC+mcxCVMBlSq+1
-FuhKiwoC4IhA0Zht9YDf6KS9z3JZTQ5UDpCikgUcr8KyBwOz5KJhIyELZbQJtvae
-8+5sK5InUCWG3utIA0KpVx/OM46yBfG8Vq7HJUuZTRsM3538nEgrnUJWn3Hruds4
-a1aJFTjbhZsntVh1VzuM/O6F1Y11uaVpRnSvX/kWqrwW0zfAd6fsqDfB9qhqsvHD
-p5EwJ5SR9W1p+1RzvZKiPVr2UHd83izjncf1myrxT7jKwEamMbHnC/MnRo2Jn/Bu
-VTuz4tnmnvfnaVKyp7MOMjmiSvKggUqzu2uIx6fSuEr+WwIDAQABo1swWTAdBgNV
-HQ4EFgQUbLroM3/7JnvbagCwSlCTDIW+CNQwOAYDVR0RBDEwL4IKaWRwLmtraC5z
-ZYYhaHR0cHM6Ly9pZHAua2toLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-BQUAA4IBAQBNt8sEoLRpIMFTjPx/PyUDatWTlp7a5SCtuTwr552b7UvRetz9rDwL
-ip2x2eHt6JoiHx7OabzAOL4oDo/akaqopY0tcmhjrRRw1tuuOxSZiejIh2DXmkn8
-9I/nIGsYx6mFD/yEXMg9pacV+HGQUdvUPpKyYjfMHihz/5A2Q+Qj6PjUthCNR6KX
-rkzEd5A2/OKLgeYgcrLEpShVXxIs2PxwOj3zgNJblb8dT00sajTf9usa9WZk6R9q
-qowogArC+4U1+wcq4ctUoM0Lyh5YaTMs4U31GcmYAotsLw+sY97V0WGQKffURz4f
-/u55VifGWHpaCkgtHFGyHuq6l7I7vZ1A</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kkh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kkh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KKH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Royal Institute of Art</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kkh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Kungl. Konsthögskolan</md:Company>
-    <md:SurName>Fredrik Reuterswärd</md:SurName>
-    <md:EmailAddress>mailto:fredrik.reutersward@kkh.se</md:EmailAddress>
-    <md:TelephoneNumber>+4686144064</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Kungl. Konsthögskolan</md:Company>
-    <md:SurName>Fredrik Reuterswärd</md:SurName>
-    <md:EmailAddress>mailto:fredrik.reutersward@kkh.se</md:EmailAddress>
-    <md:TelephoneNumber>+4686144064</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Kungl. Konsthögskolan</md:Company>
-    <md:SurName>Fredrik Reuterswärd</md:SurName>
-    <md:EmailAddress>mailto:fredrik.reutersward@kkh.se</md:EmailAddress>
-    <md:TelephoneNumber>+4686144064</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kmc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.kmc.ac.uk-shibboleth.xml
deleted file mode 100644
index 16590e52..00000000
--- a/swamid-interfederations-2.0/idp.kmc.ac.uk-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.kmc.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Kingston Maurward College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">kmc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/kmc.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/kmc.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Kingston Maurward College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kmc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kmh.se-idp-shibboleth.xml
deleted file mode 100644
index ed164dbb..00000000
--- a/swamid-interfederations-2.0/idp.kmh.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://idp.kmh.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">kmh.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Royal College of Music</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Kungliga Musikhögskolan</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Royal College of Music</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.kmh.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.kmh.se/english</mdui:InformationURL>
-        <mdui:Logo height="141" width="313" xml:lang="sv">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
-        <mdui:Logo height="141" width="313" xml:lang="en">https://idp.kmh.se/idp/images/logo.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">kmh kungliga+musikhogskolan royal+college+of+music stockholm kungl.+musikhögskolan+i+stockholm</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">kmh kungliga+musikhogskolan royal+college+of+music stockholm kungl.+musikhögskolan+i+stockholm</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kmh.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.62.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.34474,18.08126</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUbIUKEMZ6zDwgjsseeJEEBZ0IDv4wDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNTA1MjYxMzIwNTZaFw0zNTA1
-MjYxMzIwNTZaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC8Fndbl7VcQp77YvwrHZJw+P4jup3EJWLqXwTPBQAl
-pUfZXW1ZwlfZ/8Y+ng8GPn11ZS9gVEc9aW5+ZtvIX4rPgceB4Y5z3XFQpQfDrcBY
-g+dZc7xR24UZN5T1Er8i5xZWW7/Q2ariLfarK0X0oDoUEi5kaHcLc0ejvT2K3CVY
-uQ/LCw+4Wl7txbisiwh7AFjlqpgb2lNQxxzP/0xQwUBAMplxOZ/yxlK1RzKCHTOI
-sBHN6Sx3AW27HQduAzvKa3IDw7RV/WBi5ENER5U446LdSfWvObqSq4tNRSSpSszU
-6Vxldhar+0aACK/sBWw8FlLM5OM9K1SWeE7fk5PgTwQbAgMBAAGjWzBZMB0GA1Ud
-DgQWBBTdW08Nts1dNGIfcY8chlK5Yu0MlzA4BgNVHREEMTAvggppZHAua21oLnNl
-hiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEF
-BQADggEBAI20AdShxGWSxSVuiWzRnQKRpHQnalD84ev3BhaurMP93fzWJp4H1FzG
-+1+4K5tz5hbf1J1qaIZPn4+hEhYJLxQCiccH37Nqbs9zJFC6fQrCqKiMnh987f8X
-5X/BVsK9W2bNF8+e/a89O7X9u/4mFW7vdpHcsf/kO2QN1fkkukoCLSEWU4oWnWTr
-D0C4p8pAxxuCh86fN/plT6bfLbne17O9qmyT5miEhmfSG4uHoIgwMtbhOljOarH2
-cHGoE/CfcSGO7FS4bovPq7y8Mo2K5Xi9CXfzKzhWfUD72Md9dDYwFbY+gu31ceP1
-SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kmh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kmh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kmh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kmh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kmh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUbIUKEMZ6zDwgjsseeJEEBZ0IDv4wDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAwwKaWRwLmttaC5zZTAeFw0xNTA1MjYxMzIwNTZaFw0zNTA1
-MjYxMzIwNTZaMBUxEzARBgNVBAMMCmlkcC5rbWguc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC8Fndbl7VcQp77YvwrHZJw+P4jup3EJWLqXwTPBQAl
-pUfZXW1ZwlfZ/8Y+ng8GPn11ZS9gVEc9aW5+ZtvIX4rPgceB4Y5z3XFQpQfDrcBY
-g+dZc7xR24UZN5T1Er8i5xZWW7/Q2ariLfarK0X0oDoUEi5kaHcLc0ejvT2K3CVY
-uQ/LCw+4Wl7txbisiwh7AFjlqpgb2lNQxxzP/0xQwUBAMplxOZ/yxlK1RzKCHTOI
-sBHN6Sx3AW27HQduAzvKa3IDw7RV/WBi5ENER5U446LdSfWvObqSq4tNRSSpSszU
-6Vxldhar+0aACK/sBWw8FlLM5OM9K1SWeE7fk5PgTwQbAgMBAAGjWzBZMB0GA1Ud
-DgQWBBTdW08Nts1dNGIfcY8chlK5Yu0MlzA4BgNVHREEMTAvggppZHAua21oLnNl
-hiFodHRwczovL2lkcC5rbWguc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEF
-BQADggEBAI20AdShxGWSxSVuiWzRnQKRpHQnalD84ev3BhaurMP93fzWJp4H1FzG
-+1+4K5tz5hbf1J1qaIZPn4+hEhYJLxQCiccH37Nqbs9zJFC6fQrCqKiMnh987f8X
-5X/BVsK9W2bNF8+e/a89O7X9u/4mFW7vdpHcsf/kO2QN1fkkukoCLSEWU4oWnWTr
-D0C4p8pAxxuCh86fN/plT6bfLbne17O9qmyT5miEhmfSG4uHoIgwMtbhOljOarH2
-cHGoE/CfcSGO7FS4bovPq7y8Mo2K5Xi9CXfzKzhWfUD72Md9dDYwFbY+gu31ceP1
-SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kmh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kmh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KMH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Royal College of Music</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kmh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Royal College of Music</md:Company>
-    <md:SurName>KMH IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:swamid@kmh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Royal College of Music</md:Company>
-    <md:SurName>KMH IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:swamid@kmh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Royal College of Music</md:Company>
-    <md:SurName>KMH IT HelpDesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@kmh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 161939</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.knowsleycollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.knowsleycollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 3add791d..00000000
--- a/swamid-interfederations-2.0/idp.knowsleycollege.ac.uk-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" entityID="https://idp.knowsleycollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP owned by Knowsley Community College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-01T17:22: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">knowsleycollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgDCCA2igAwIBAgIRAJp6NZY3oZd2UzczIfqpV5UwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xNDAxMDkwMDAwMDBaFw0xNzAxMDgyMzU5NTlaMEcxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLmtub3dz
-						bGV5Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AKRJddwlsUcpb0Wx0i00fAhJCsUmCTfTtmT49JRyCoTYchZlSp7ZS2OAQssFDYiD
-						RHLClkSw+iUgIFCbal1bDSDDFJosZJv4JD4U0FD4q8twDw48bfS3k1+JBPR/M0eU
-						+wd4A0siZf0WcTItiU3MmzLv4I9mOW5IZ8akjZiLCdnkR1zjAbAAoX18mYsld9xA
-						LOSO4NydM08pRLOtWJFtVKlLnQ0tn+cG0NoYELpMueVopSUM7+K5fLaEOqqd5smO
-						eb11WyHbZuxuR1C40Xpb6OsWiNQYoyF7m1G+x3F8GiUvaqiejhSmXm0VkNv1QbHj
-						ko0ygft+w/V2dTQNYdrwqckCAwEAAaOCAXYwggFyMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSx+f3A3ueD76o4IG5ZlByOeLnGmjAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYDVR0RBB0wG4IZaWRwLmtub3dz
-						bGV5Y29sbGVnZS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAaizqm9abK5mC4yKi
-						kAVp7Y2DBzjXB1PUtguSOCx0EbfIX8/OK6PrRa3o45eMSEo5eecwpFJwCSDqg+V0
-						kCJp6lbIz37iP3WaJjaeYCqkBedphtFBSh1QKcrrKjQXvHlezgiNhVie+qcvEyT2
-						F28YSP2Bb3Yyb/LRNX3g8Om9EYUeg1TKy/ECyOwS7Bbqk7I37A8S2c1G0YnbdiFT
-						hkA+eu7b2/C1cZr3ETLYuR5ZQ83pLNmAJRIM89lMukuSeIYrYELOm+o97rw4wqrD
-						PvraWXaWABehzvK7oqqu/SZiVYri54k4w8UA8CL16ME3tL6UGql/05Sl0Q6aQZmT
-						8HV+cQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.knowsleycollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.knowsleycollege.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.knowsleycollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.knowsleycollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.knowsleycollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.knowsleycollege.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">knowsleycollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgDCCA2igAwIBAgIRAJp6NZY3oZd2UzczIfqpV5UwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xNDAxMDkwMDAwMDBaFw0xNzAxMDgyMzU5NTlaMEcxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZaWRwLmtub3dz
-						bGV5Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AKRJddwlsUcpb0Wx0i00fAhJCsUmCTfTtmT49JRyCoTYchZlSp7ZS2OAQssFDYiD
-						RHLClkSw+iUgIFCbal1bDSDDFJosZJv4JD4U0FD4q8twDw48bfS3k1+JBPR/M0eU
-						+wd4A0siZf0WcTItiU3MmzLv4I9mOW5IZ8akjZiLCdnkR1zjAbAAoX18mYsld9xA
-						LOSO4NydM08pRLOtWJFtVKlLnQ0tn+cG0NoYELpMueVopSUM7+K5fLaEOqqd5smO
-						eb11WyHbZuxuR1C40Xpb6OsWiNQYoyF7m1G+x3F8GiUvaqiejhSmXm0VkNv1QbHj
-						ko0ygft+w/V2dTQNYdrwqckCAwEAAaOCAXYwggFyMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSx+f3A3ueD76o4IG5ZlByOeLnGmjAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYDVR0RBB0wG4IZaWRwLmtub3dz
-						bGV5Y29sbGVnZS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAaizqm9abK5mC4yKi
-						kAVp7Y2DBzjXB1PUtguSOCx0EbfIX8/OK6PrRa3o45eMSEo5eecwpFJwCSDqg+V0
-						kCJp6lbIz37iP3WaJjaeYCqkBedphtFBSh1QKcrrKjQXvHlezgiNhVie+qcvEyT2
-						F28YSP2Bb3Yyb/LRNX3g8Om9EYUeg1TKy/ECyOwS7Bbqk7I37A8S2c1G0YnbdiFT
-						hkA+eu7b2/C1cZr3ETLYuR5ZQ83pLNmAJRIM89lMukuSeIYrYELOm+o97rw4wqrD
-						PvraWXaWABehzvK7oqqu/SZiVYri54k4w8UA8CL16ME3tL6UGql/05Sl0Q6aQZmT
-						8HV+cQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.knowsleycollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.knowsleycollege.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">Knowsley Community College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Knowsley College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.knowsleycollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>McDonald</SurName>
-    <EmailAddress>mailto:amcdonald@knowsleycollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>McDonald</SurName>
-    <EmailAddress>mailto:amcdonald@knowsleycollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.konstfack.se-idp-shibboleth.xml
deleted file mode 100644
index 1fdc86ec..00000000
--- a/swamid-interfederations-2.0/idp.konstfack.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://idp.konstfack.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">konstfack.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Konstfack</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Konstfack</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">University College of Arts, Crafts and Design</mdui:Description>
-        <mdui:Description xml:lang="en">University College of Arts, Crafts and Design</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.konstfack.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.konstfack.se/en</mdui:InformationURL>
-        <mdui:Logo height="142" width="142">https://idp.konstfack.se/idp/images/logo.jpg</mdui:Logo>
-        <mdui:Logo height="142" width="142" xml:lang="sv">https://idp.konstfack.se/idp/images/logo.jpg</mdui:Logo>
-        <mdui:Logo height="142" width="142" xml:lang="en">https://idp.konstfack.se/idp/images/logo.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">konstfack</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">konstfack</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>konstfack.se</mdui:DomainHint>
-        <mdui:IPHint>130.242.16.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.299772,17.994303</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPA2v/jvONxWV73+wdqELeA5iFTMMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcC5rb25zdGZhY2suc2UwHhcNMTMwMTIzMDkwMjIy
-WhcNMTYwMTIzMDkwMjIyWjAbMRkwFwYDVQQDExBpZHAua29uc3RmYWNrLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuKqHMcnTbkHRUUPt5SYVWnrz
-vzPsKTo9treYMIVyNsJRqlaTMZxx5Y9AbyWjGq9c1MMP/7oVtu9ABLSzkEu61y8R
-cN0YfKeby8JgLpQ8Wx6tJdHJ2sgBPD7swlf0tIBUR0fEg9/XXzSrlCG92cEphDqF
-7JEs+WjnIGOVZFZ46pc6i0P5UR4zwLI0MnLH18UcztavnK2tqOny7JzO0fyPXpft
-bR5rO6CINXsjwSNhngKsZoQt5rxGO0jOfowtv6CWa0STZKYg+oQFlttmV3TqK5S0
-AZWOjsb5wLbjOxEjJ9imjwYRaLNAIiHf/kPy3510grJ38opoOoyio++Lb2nhQQID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAua29uc3RmYWNrLnNlhidodHRwczovL2lk
-cC5rb25zdGZhY2suc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFQ5EaKkR2w+
-gZn3p2frzQRUOyazMA0GCSqGSIb3DQEBBQUAA4IBAQBYOq5A0EQe9lEfg432gl9S
-4/nnAH1V8OHReiFL6Inz9r3LZi9UUMhOS3P+9zuuRfBuhjRD8Wb7y7OD+ecS2ZMR
-gbzxwpfI8BICrrxTSnBQv1wXQnDvX7XuTH+UqPfc5ZWKInX2kE1VNRb/5mwODPt3
-i+hJa2eQhpQGsv4I8cL1Pu1uIuA1+5y+JLINPrwvqu0BwKdHDApQ7JrGCf0+CbLm
-vw3ZJUolwiBzmSW487sdzsI85Nnp/NFbjZPfVNfwK++e24meft9lZY8oqhPp+B88
-SHHQuQC8v/yTq6ZVFlRvTNkZ+W/vPYOeE6x49Dygeu65WDf/H2NUy6dggcmH+LpS</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.konstfack.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.konstfack.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.konstfack.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.konstfack.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.konstfack.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.konstfack.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">konstfack.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVAPA2v/jvONxWV73+wdqELeA5iFTMMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcC5rb25zdGZhY2suc2UwHhcNMTMwMTIzMDkwMjIy
-WhcNMTYwMTIzMDkwMjIyWjAbMRkwFwYDVQQDExBpZHAua29uc3RmYWNrLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuKqHMcnTbkHRUUPt5SYVWnrz
-vzPsKTo9treYMIVyNsJRqlaTMZxx5Y9AbyWjGq9c1MMP/7oVtu9ABLSzkEu61y8R
-cN0YfKeby8JgLpQ8Wx6tJdHJ2sgBPD7swlf0tIBUR0fEg9/XXzSrlCG92cEphDqF
-7JEs+WjnIGOVZFZ46pc6i0P5UR4zwLI0MnLH18UcztavnK2tqOny7JzO0fyPXpft
-bR5rO6CINXsjwSNhngKsZoQt5rxGO0jOfowtv6CWa0STZKYg+oQFlttmV3TqK5S0
-AZWOjsb5wLbjOxEjJ9imjwYRaLNAIiHf/kPy3510grJ38opoOoyio++Lb2nhQQID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAua29uc3RmYWNrLnNlhidodHRwczovL2lk
-cC5rb25zdGZhY2suc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFQ5EaKkR2w+
-gZn3p2frzQRUOyazMA0GCSqGSIb3DQEBBQUAA4IBAQBYOq5A0EQe9lEfg432gl9S
-4/nnAH1V8OHReiFL6Inz9r3LZi9UUMhOS3P+9zuuRfBuhjRD8Wb7y7OD+ecS2ZMR
-gbzxwpfI8BICrrxTSnBQv1wXQnDvX7XuTH+UqPfc5ZWKInX2kE1VNRb/5mwODPt3
-i+hJa2eQhpQGsv4I8cL1Pu1uIuA1+5y+JLINPrwvqu0BwKdHDApQ7JrGCf0+CbLm
-vw3ZJUolwiBzmSW487sdzsI85Nnp/NFbjZPfVNfwK++e24meft9lZY8oqhPp+B88
-SHHQuQC8v/yTq6ZVFlRvTNkZ+W/vPYOeE6x49Dygeu65WDf/H2NUy6dggcmH+LpS</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.konstfack.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.konstfack.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Konstfack</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Konstfack</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Konstfack</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.konstfack.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Konstfack</md:Company>
-    <md:SurName>Håkan Pettersson</md:SurName>
-    <md:EmailAddress>mailto:hakan.pettersson@konstfack.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 4504396</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Konstfack</md:Company>
-    <md:SurName>Håkan Pettersson</md:SurName>
-    <md:EmailAddress>mailto:hakan.pettersson@konstfack.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 4504396</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Konstfack</md:Company>
-    <md:SurName>Helpdesk IT Konstfack</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@konstfack.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 450 4399</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 8bbc9fef..00000000
--- a/swamid-interfederations-2.0/idp.kpi.ua-simplesaml-saml2-idp-metadata.php.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://idp.kpi.ua/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-05-12T11:00:51Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</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">NTUU KPI IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ru">НТУУ КПИ IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="uk">НТУУ КПІ IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for NTUU "KPI"</mdui:Description>
-        <mdui:Description xml:lang="ru">Identity Provider для НТУУ "КПИ"</mdui:Description>
-        <mdui:Description xml:lang="uk">Identity Provider для НТУУ "КПІ"</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idp.kpi.ua</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="ru">https://idp.kpi.ua</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="uk">https://idp.kpi.ua</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://peano.uran.ua/~eng/policy.htm</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="ru">http://peano.uran.ua/~rus/policy.htm</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="uk">http://peano.uran.ua/~ukr/policy.htm</mdui:PrivacyStatementURL>
-        <mdui:Logo height="219" width="181">https://idp.kpi.ua/kpi-logo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:50.450233,30.461022</mdui:GeolocationHint>
-        <mdui:IPHint>77.47.128.0/17</mdui:IPHint>
-        <mdui:IPHint>2a02:db0::/32</mdui:IPHint>
-        <mdui:DomainHint>kpi.ua</mdui:DomainHint>
-        <mdui:DomainHint>ntu-kpi.kiev.ua</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFkDCCBHigAwIBAgIRAPRpb7ML9+xEG/ROUJsB3TYwDQYJKoZIhvcNAQELBQAw
-gZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYD
-VQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIg
-Q0EwHhcNMTUxMjA3MDAwMDAwWhcNMTcwMzA2MjM1OTU5WjCBmjEhMB8GA1UECxMY
-RG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMUIwQAYDVQQLEzlQcm92aWRlZCBieSBD
-ZW50ZXIgb2YgVWtyYWluaWFuIEludGVybmV0IE5hbWVzIChVS1JOQU1FUykxHDAa
-BgNVBAsTE1Vrcm5hbWVzIERvbWFpbiBTU0wxEzARBgNVBAMTCmlkcC5rcGkudWEw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb2JYyoJKx3Z7kp7V3U5m3
-P8yO+KYxZZZSsxqhcvfJ0RCnPFjhdnHiFn1zkuYmUfx5y1MM3hp12MAQ1QQqK9c8
-SX5+zyJCJ+dUGCY6PBzHEEBYcoN9jKChsicJeHIJ++rkvedt9x4WXcfy9pWIF7Qt
-+nX1shksdB5OxwbIQeVyi+aWIsJudOFCTpaaKTJT5yUBs3yg4FUNgRRliOhefp3T
-8c070I31VZta3ljIvgkAN3WrqKfE9TTsY/UgSuHZrpa+x279ALjIIwcDa9iBf8C8
-yz15gURdiEb8NkF91LeIOXDrIp9cTFSD1jNVQEip32adwJ9wg3QNItEQN151aTib
-AgMBAAGjggHXMIIB0zAfBgNVHSMEGDAWgBSQr2o6lFoL2JDqElZz30O0Oija5zAd
-BgNVHQ4EFgQUxbZ3DShR1AHNzya9dgKB8z5+egAwDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCME8GA1Ud
-IARIMEYwOgYLKwYBBAGyMQECAgcwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1
-cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0
-dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25T
-ZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZD
-aHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlv
-blNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29t
-b2RvY2EuY29tMCUGA1UdEQQeMByCCmlkcC5rcGkudWGCDnd3dy5pZHAua3BpLnVh
-MA0GCSqGSIb3DQEBCwUAA4IBAQAsl4xNgSpfkVyTpTjDy8jGYR5XlNYEk6QSHGwc
-yVNfHLg1IpcXjLvE7skPjUyNIynQOYjLS3Bpakjy6yTkNQU5Cib4ygk5V3dFnddT
-POG+2dCXXuk432RvfumrJRDWO+HF9sAR6ByWCg3Hy+tZ9ZMPWKEbpRPFkQ5wPYPs
-fQW4RquXlpR/6PoDPP6Cf13Rwp7uUf8ztARG7ayFJezjBMfMN5hejC4tPwWG6UJY
-v5XnzHrd9qUFqh0E1Q5gpnAHvQRcpeZ2kvajhOn2pNc+iVdNuWHt04X6NvCHY5dz
-SG0FZDkYw5/MQEKbISmfTiDg+gCz4ZW+BnZRjt/x319pMgsv
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kpi.ua/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.kpi.ua/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="ru">Национальный Технический Университет Украины "Киевский политехнический институт"</md:OrganizationName>
-    <md:OrganizationName xml:lang="uk">Національний Технічний Університет України "Київський політехнічний інститут"</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Technical University of Ukraine "Kyiv Polytechnic Institute"</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="ru">НТУУ "КПИ"</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="uk">НТУУ "КПІ"</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NTUU "KPI"</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="ru">http://kpi.ua/ru</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="uk">http://kpi.ua</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://kpi.ua/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>TechSupport</md:SurName>
-    <md:EmailAddress>mailto:support@kpi.ua</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kutztown.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kutztown.edu-idp-shibboleth.xml
deleted file mode 100644
index c65b3c9c..00000000
--- a/swamid-interfederations-2.0/idp.kutztown.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://idp.kutztown.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.kutztown.edu/idp/error.jsp" 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">kutztown.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Kutztown University</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>
-MIIDLDCCAhSgAwIBAgIVAJ3D3gijWRLD8z8jAWuBcPQG+wpvMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcC5rdXR6dG93bi5lZHUwHhcNMTMwMjAxMjA1NTA2
-WhcNMzMwMjAxMjA1NTA2WjAbMRkwFwYDVQQDExBpZHAua3V0enRvd24uZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiaF7/maNy94CecugFCeuOkeB
-Q4RxCLf+phdRdBvEMDFErMw5blnOvX9DJjkaRVO/YqHaVGanKzDUegVNrhBVoGrO
-XOAkVce8YoDzpH2PS5pabBuB4blKr7wrQg58wIKkslgTuBMFWfjq8R+SAnufY2zt
-RhdHvlpd7/1xNQ9//i1iAwBTEfJzCUnBHxLBYyocPSluTEkIWDINyeQDi/wo3/LV
-0tYK2FPdrz+vOokXeaWu31y4OnkiEnxQKVCttWSR2jDnbt0urekR2L3kaJSq0ZRq
-vbzQGOwfAkFjAdF5JG3/O5MZbDc4Ox744ptu8/uifZV7sH6IogE80v2wPV00ZQID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAua3V0enRvd24uZWR1hidodHRwczovL2lk
-cC5rdXR6dG93bi5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFLsLBZyW9Pj
-MfO/2/7kbDCaS2EOMA0GCSqGSIb3DQEBBQUAA4IBAQCG1OFDvggcXym/LGpxhlB9
-bu4hZOoMmtb0KrxXeYUqVRIs1vUKfotiaPP30BoYEZS2Sbf5HQWL5NBwazGHSgDA
-WhWvEZ0AYyzo3Fgk+iCst/tMb++3yebMxjhY2hDvQmHAHtMAS2NWrg5QuAcWKNUo
-0vez+5K+GHA16PrmwwU0R1hM1k/6H0ddlFoEDvL8q/JK5EYiWBOlrKTJnx8vdSwO
-reL8ewKmZ+HT8AB0pP0jS3Cln94bvncHDNtY/PxTYNFIvLmclhT0+wN/VlCUYzF4
-HKssl2bp1LTZPwNXt8hUArVYIypb1ChoiffijKBeaBT8NSHXKQkH6Kcs6hBiHq3v
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kutztown.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kutztown.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kutztown.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kutztown.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kutztown.edu/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">kutztown.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAJ3D3gijWRLD8z8jAWuBcPQG+wpvMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcC5rdXR6dG93bi5lZHUwHhcNMTMwMjAxMjA1NTA2
-WhcNMzMwMjAxMjA1NTA2WjAbMRkwFwYDVQQDExBpZHAua3V0enRvd24uZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiaF7/maNy94CecugFCeuOkeB
-Q4RxCLf+phdRdBvEMDFErMw5blnOvX9DJjkaRVO/YqHaVGanKzDUegVNrhBVoGrO
-XOAkVce8YoDzpH2PS5pabBuB4blKr7wrQg58wIKkslgTuBMFWfjq8R+SAnufY2zt
-RhdHvlpd7/1xNQ9//i1iAwBTEfJzCUnBHxLBYyocPSluTEkIWDINyeQDi/wo3/LV
-0tYK2FPdrz+vOokXeaWu31y4OnkiEnxQKVCttWSR2jDnbt0urekR2L3kaJSq0ZRq
-vbzQGOwfAkFjAdF5JG3/O5MZbDc4Ox744ptu8/uifZV7sH6IogE80v2wPV00ZQID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAua3V0enRvd24uZWR1hidodHRwczovL2lk
-cC5rdXR6dG93bi5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFLsLBZyW9Pj
-MfO/2/7kbDCaS2EOMA0GCSqGSIb3DQEBBQUAA4IBAQCG1OFDvggcXym/LGpxhlB9
-bu4hZOoMmtb0KrxXeYUqVRIs1vUKfotiaPP30BoYEZS2Sbf5HQWL5NBwazGHSgDA
-WhWvEZ0AYyzo3Fgk+iCst/tMb++3yebMxjhY2hDvQmHAHtMAS2NWrg5QuAcWKNUo
-0vez+5K+GHA16PrmwwU0R1hM1k/6H0ddlFoEDvL8q/JK5EYiWBOlrKTJnx8vdSwO
-reL8ewKmZ+HT8AB0pP0jS3Cln94bvncHDNtY/PxTYNFIvLmclhT0+wN/VlCUYzF4
-HKssl2bp1LTZPwNXt8hUArVYIypb1ChoiffijKBeaBT8NSHXKQkH6Kcs6hBiHq3v
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kutztown.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kutztown.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Kutztown University of Pennsylvania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Kutztown University of Pennsylvania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kutztown.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Richard Miller</md:GivenName>
-    <md:EmailAddress>idpadmin@kutztown.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mitch Freed</md:GivenName>
-    <md:EmailAddress>idpadmin@kutztown.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.kva.se-idp-shibboleth.xml
deleted file mode 100644
index 64a7cfea..00000000
--- a/swamid-interfederations-2.0/idp.kva.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.kva.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">kva.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Kungliga Vetenskapsakademien</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Royal Swedish Academy of Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Kungliga Vetenskapsakademien</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the Royal Swedish Academy of Sciences</mdui:Description>
-        <mdui:Logo height="78" width="179">https://idp.kva.se/idp/images/headerLogo.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>kva.se</mdui:DomainHint>
-        <mdui:IPHint>130.242.20.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.36542,18.05204</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVAIEMcH8g/qilWjlQSS0EYqY8O3hnMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5rdmEuc2UwHhcNMTMwNjExMTIwMzU2WhcNMzMw
-NjExMTIwMzU2WjAVMRMwEQYDVQQDEwppZHAua3ZhLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAhbLQb03KVvHFPZlmohpzwmr6tY7dZCKSRTdfoSpu
-fT6BykDryqo0vg8pSBWghkiFZQr1V36qdK0XUFNAtFEGTtlXyI+PDvtGLTzg2Swb
-9nxpwsXAxRUD1v/2SNUTxQW7O0t4jdZKxGcOEIDO8YHOpV0imw2v+tqzyr8MgwfE
-SSBV3ESUtHmDFvhanEp/TNsT6K8Y1IFqQzHCvNKV1WGW2vEKCjnwmMNd5N55cQrO
-foWCeC7BJhm7dKrzk0WzSZLrX1PtitHB7Ms705x7XRWw1Inbp5jd56ONJ7sZXqpi
-4eb9wVovrZMqcBc/h4GPZN9WTACvfHUKvQ0N0lfzhUuKdQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAua3ZhLnNlhiFodHRwczovL2lkcC5rdmEuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFKpM1lN1+VbR8w+sZ1O3g4Lc0SIxMA0GCSqGSIb3DQEB
-BQUAA4IBAQB+22vGRTKJyRGh5lHVyk0NXWjc8aRAdntepCR+Yy17HB1P4lBSlewS
-bHuDhu7hHp9ItJWJryhkO4F1c+RjELnGf++WvM3Fv05AIV3x0lh/Kxs9X2f4KYBI
-Sa4XUUgl3lbrTI9H0Mse59OK4jz5LRF35OWihdoCNiRaKVjrRmMTZKrxBTJ5gSvf
-ULOTA8+dCegP7Q4xnGmN2M8PfO6Lp6BQh2LaaBt4qDGUytMnclKUhDXpasr/oUfB
-bS0T9qUjP0Djkv1HcffkxHJd9mbHMv4MiQjScE4Gwy4+6PPOO5a/3Q7JoGSbdVfm
-y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kva.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kva.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kva.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kva.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kva.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kva.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDFDCCAfygAwIBAgIVAIEMcH8g/qilWjlQSS0EYqY8O3hnMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5rdmEuc2UwHhcNMTMwNjExMTIwMzU2WhcNMzMw
-NjExMTIwMzU2WjAVMRMwEQYDVQQDEwppZHAua3ZhLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAhbLQb03KVvHFPZlmohpzwmr6tY7dZCKSRTdfoSpu
-fT6BykDryqo0vg8pSBWghkiFZQr1V36qdK0XUFNAtFEGTtlXyI+PDvtGLTzg2Swb
-9nxpwsXAxRUD1v/2SNUTxQW7O0t4jdZKxGcOEIDO8YHOpV0imw2v+tqzyr8MgwfE
-SSBV3ESUtHmDFvhanEp/TNsT6K8Y1IFqQzHCvNKV1WGW2vEKCjnwmMNd5N55cQrO
-foWCeC7BJhm7dKrzk0WzSZLrX1PtitHB7Ms705x7XRWw1Inbp5jd56ONJ7sZXqpi
-4eb9wVovrZMqcBc/h4GPZN9WTACvfHUKvQ0N0lfzhUuKdQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAua3ZhLnNlhiFodHRwczovL2lkcC5rdmEuc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFKpM1lN1+VbR8w+sZ1O3g4Lc0SIxMA0GCSqGSIb3DQEB
-BQUAA4IBAQB+22vGRTKJyRGh5lHVyk0NXWjc8aRAdntepCR+Yy17HB1P4lBSlewS
-bHuDhu7hHp9ItJWJryhkO4F1c+RjELnGf++WvM3Fv05AIV3x0lh/Kxs9X2f4KYBI
-Sa4XUUgl3lbrTI9H0Mse59OK4jz5LRF35OWihdoCNiRaKVjrRmMTZKrxBTJ5gSvf
-ULOTA8+dCegP7Q4xnGmN2M8PfO6Lp6BQh2LaaBt4qDGUytMnclKUhDXpasr/oUfB
-bS0T9qUjP0Djkv1HcffkxHJd9mbHMv4MiQjScE4Gwy4+6PPOO5a/3Q7JoGSbdVfm
-y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kva.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kva.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KVA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Vetenskapsakademien</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Royal Swedish Academy of Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kva.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>The Royal Swedish Academy of Sciences</md:Company>
-    <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>The Royal Swedish Academy of Sciences</md:Company>
-    <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>The Royal Swedish Academy of Sciences</md:Company>
-    <md:EmailAddress>mailto:peter.jacobsson@kva.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 70 6739792</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lambeth.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lambeth.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 4cb01ee3..00000000
--- a/swamid-interfederations-2.0/idp.lambeth.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.lambeth.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Lambeth College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-26T11:10: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">lambeth.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAOew5SzBfog/X45WRCY3nAQXwA63MA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEWlkcC5sYW1iZXRoLmFjLnVrMB4XDTE0MDIxOTA4MTI1
-						NloXDTM0MDIxOTA4MTI1NlowHDEaMBgGA1UEAxMRaWRwLmxhbWJldGguYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmoA8TlAc9wQSYDGtLSn8E
-						DQZ9d72tC4lH45Na9OenSspeZ6l4Oekgv6xGeZcImOUFn9mQ3PZIiHJMYgmo/ouy
-						7sGE+bW7lulmAWQYo6khkRKnu5HqRv2QLZmiS/z2aaqqrWqSd4JlLdVdE9u9Ki7T
-						MCIp2p4HQ0cLg77b8KjRnh/y4/qj2AvDFJPFIfplIh+5mt1M6ka1Ydg5AcfvdT6d
-						EZu9Ams2nJPRPax2s7qq7OETgTODyN5E/7XQTwqjGOxirTS2LHMoVqYHtjmpYq4I
-						resVAqKkkSJLS/dy2hEkpqyLS91IeZF4rODfMkVg0nglPVTt7NHml36DHSkEMcbp
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5sYW1iZXRoLmFjLnVrhihodHRwczov
-						L2lkcC5sYW1iZXRoLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSrBHTL
-						v5ig79YvnYvc1QwZqEORqTANBgkqhkiG9w0BAQUFAAOCAQEAv3AqTafVQD9uWHJh
-						pT6tp4YpFaLNvbj+jRoelUsPDLyLHWXPWqvsuxv1fCpX1UZPs0S9X/jSjCECLmFe
-						51KmsDoKC3nj2KZTjcmkMo34fBxTqRCM2CX+kBPEnXqbtUVhzZ2PRrxPuzeIBmzo
-						vZ1CGq+WaNFuG6dMP4nRZAhJI4pC87l8AlVCHMShcihD1YA6FFEgkPvXTHMv4/hY
-						t+B8dRMudDbFxCbayT0HRBySZrCY8E3mX3FCkLDE0wtTPxxIWq8lyJrGotB5HKXY
-						Dq+Aacae6PXVL70A1dyUC7H5LTpcTdGejtDI+9wSwE3IL7sBh6/OprCp54UeU0Qa
-						ONYm4A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lambeth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lambeth.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.lambeth.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lambeth.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lambeth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lambeth.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">lambeth.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAOew5SzBfog/X45WRCY3nAQXwA63MA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEWlkcC5sYW1iZXRoLmFjLnVrMB4XDTE0MDIxOTA4MTI1
-						NloXDTM0MDIxOTA4MTI1NlowHDEaMBgGA1UEAxMRaWRwLmxhbWJldGguYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmoA8TlAc9wQSYDGtLSn8E
-						DQZ9d72tC4lH45Na9OenSspeZ6l4Oekgv6xGeZcImOUFn9mQ3PZIiHJMYgmo/ouy
-						7sGE+bW7lulmAWQYo6khkRKnu5HqRv2QLZmiS/z2aaqqrWqSd4JlLdVdE9u9Ki7T
-						MCIp2p4HQ0cLg77b8KjRnh/y4/qj2AvDFJPFIfplIh+5mt1M6ka1Ydg5AcfvdT6d
-						EZu9Ams2nJPRPax2s7qq7OETgTODyN5E/7XQTwqjGOxirTS2LHMoVqYHtjmpYq4I
-						resVAqKkkSJLS/dy2hEkpqyLS91IeZF4rODfMkVg0nglPVTt7NHml36DHSkEMcbp
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5sYW1iZXRoLmFjLnVrhihodHRwczov
-						L2lkcC5sYW1iZXRoLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSrBHTL
-						v5ig79YvnYvc1QwZqEORqTANBgkqhkiG9w0BAQUFAAOCAQEAv3AqTafVQD9uWHJh
-						pT6tp4YpFaLNvbj+jRoelUsPDLyLHWXPWqvsuxv1fCpX1UZPs0S9X/jSjCECLmFe
-						51KmsDoKC3nj2KZTjcmkMo34fBxTqRCM2CX+kBPEnXqbtUVhzZ2PRrxPuzeIBmzo
-						vZ1CGq+WaNFuG6dMP4nRZAhJI4pC87l8AlVCHMShcihD1YA6FFEgkPvXTHMv4/hY
-						t+B8dRMudDbFxCbayT0HRBySZrCY8E3mX3FCkLDE0wtTPxxIWq8lyJrGotB5HKXY
-						Dq+Aacae6PXVL70A1dyUC7H5LTpcTdGejtDI+9wSwE3IL7sBh6/OprCp54UeU0Qa
-						ONYm4A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lambeth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lambeth.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">Lambeth College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lambeth College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lambethcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Network Support</GivenName>
-    <EmailAddress>mailto:networksupport@lambeth.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Preston</SurName>
-    <EmailAddress>mailto:TPreston@lambethcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Eric</GivenName>
-    <SurName>Zhuang</SurName>
-    <EmailAddress>mailto:ezhuang@lambeth.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lancs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lancs.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index abe5c6bb..00000000
--- a/swamid-interfederations-2.0/idp.lancs.ac.uk-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.lancs.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Lancaster.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-16T16:54: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">lancaster.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lancaster University</mdui:DisplayName>
-        <mdui:Logo height="54" width="157">https://idp.lancs.ac.uk/logo-small.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJjCCAg6gAwIBAgITE/T96ytOqT8HI/CQq7WILI+KmjANBgkqhkiG9w0BAQUF
-						ADAaMRgwFgYDVQQDEw9pZHAubGFuY3MuYWMudWswHhcNMTMwMjE4MTUwNzQyWhcN
-						MzMwMjE4MTUwNzQyWjAaMRgwFgYDVQQDEw9pZHAubGFuY3MuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsu+5TFlPyDOccJHktBu8NSnY+Vdwq
-						TzwPkSdCGlLzGrqQB0m5vDDIMxBC30i05tknFZP6KBvgPJj5pk0MSmOCXIGU0IG3
-						kWUgpOF4Y7fd9NRuD53EF12pZfj88m3w/pVtPTrQOvi/agKgjZGbTDsEfRe0bIkf
-						c3z4lzohXGIX+YcOGz0IC6b+XEiioAPMRodtTW8O53p3ttnLJ7Zv5Qs4zul8NQKY
-						YmN2/sn2zkJEsE5gz61hY39FFlzAoJ8lGpeF5JgSeJ//2nyFAZ2ik8L8JnvqTwml
-						r1UU7cd7tRxG+xy31gKxzqlNaI1PaafjPVdlXcyHROz7ACfznlrZxntZAgMBAAGj
-						ZTBjMEIGA1UdEQQ7MDmCD2lkcC5sYW5jcy5hYy51a4YmaHR0cHM6Ly9pZHAubGFu
-						Y3MuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLuSKcwtlxU2Ivaq/A7T
-						5g8LjqVRMA0GCSqGSIb3DQEBBQUAA4IBAQCjrOUZv0J2s8E7MWlO0qAlBeRwRI9/
-						/UjuEM1uqgdKqTtFkKkug6BayVXIKErwYVnvhFFkwRqkewPjEeQxIZrnvPYWfqCl
-						KV6zaykfU9VCYmP6/yK89A5nTY93IZQ4Rm63mF20LxqZeRxDNLGAd7Fm6y1pdoq7
-						DuhJoqENTcQ2ludpmptKESInGhn4r/Pzk6x/SQvRF5/jZLLMy8flrB8KPKUJ3sN0
-						6VanTXJSl+jZvaa69WfW+/vlKHnCPEGEuBZFw3b7BJA6wnYuH25Fzrg7zf23nLsB
-						74wrr0WZQi7ryvmVcpxoclU/i5jee6m0IHMOtadvVoA625KVX/JBH4Kf
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lancs.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.lancs.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lancs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lancs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lancs.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">lancaster.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJjCCAg6gAwIBAgITE/T96ytOqT8HI/CQq7WILI+KmjANBgkqhkiG9w0BAQUF
-						ADAaMRgwFgYDVQQDEw9pZHAubGFuY3MuYWMudWswHhcNMTMwMjE4MTUwNzQyWhcN
-						MzMwMjE4MTUwNzQyWjAaMRgwFgYDVQQDEw9pZHAubGFuY3MuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsu+5TFlPyDOccJHktBu8NSnY+Vdwq
-						TzwPkSdCGlLzGrqQB0m5vDDIMxBC30i05tknFZP6KBvgPJj5pk0MSmOCXIGU0IG3
-						kWUgpOF4Y7fd9NRuD53EF12pZfj88m3w/pVtPTrQOvi/agKgjZGbTDsEfRe0bIkf
-						c3z4lzohXGIX+YcOGz0IC6b+XEiioAPMRodtTW8O53p3ttnLJ7Zv5Qs4zul8NQKY
-						YmN2/sn2zkJEsE5gz61hY39FFlzAoJ8lGpeF5JgSeJ//2nyFAZ2ik8L8JnvqTwml
-						r1UU7cd7tRxG+xy31gKxzqlNaI1PaafjPVdlXcyHROz7ACfznlrZxntZAgMBAAGj
-						ZTBjMEIGA1UdEQQ7MDmCD2lkcC5sYW5jcy5hYy51a4YmaHR0cHM6Ly9pZHAubGFu
-						Y3MuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLuSKcwtlxU2Ivaq/A7T
-						5g8LjqVRMA0GCSqGSIb3DQEBBQUAA4IBAQCjrOUZv0J2s8E7MWlO0qAlBeRwRI9/
-						/UjuEM1uqgdKqTtFkKkug6BayVXIKErwYVnvhFFkwRqkewPjEeQxIZrnvPYWfqCl
-						KV6zaykfU9VCYmP6/yK89A5nTY93IZQ4Rm63mF20LxqZeRxDNLGAd7Fm6y1pdoq7
-						DuhJoqENTcQ2ludpmptKESInGhn4r/Pzk6x/SQvRF5/jZLLMy8flrB8KPKUJ3sN0
-						6VanTXJSl+jZvaa69WfW+/vlKHnCPEGEuBZFw3b7BJA6wnYuH25Fzrg7zf23nLsB
-						74wrr0WZQi7ryvmVcpxoclU/i5jee6m0IHMOtadvVoA625KVX/JBH4Kf
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lancs.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 Lancaster</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lancaster University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lancaster.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ISS Service Desk</GivenName>
-    <EmailAddress>mailto:iss-service-desk@lancaster.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Bennett</SurName>
-    <EmailAddress>mailto:S.Bennett@lancaster.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lboro.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.lboro.ac.uk-shibboleth.xml
deleted file mode 100644
index e83bedad..00000000
--- a/swamid-interfederations-2.0/idp.lboro.ac.uk-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.lboro.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Loughborough University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">lboro.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lboro.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lboro.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Loughborough University (ATHENS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lboro.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index c6552e15..00000000
--- a/swamid-interfederations-2.0/idp.lboro.ac.uk-simplesaml-saml2-idp-metadata.php.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.lboro.ac.uk/simplesaml/saml2/idp/metadata.php">
-  <!--
-		This is a simpleSAMLphp IdP for Loughborough University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-10T17:31: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">lboro.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID8zCCAtugAwIBAgIJAJC1ySyy8NnHMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
-						VQQGEwJHQjEXMBUGA1UECAwOTGVpY2VzdGVyc2hpcmUxFTATBgNVBAcMDExvdWdo
-						Ym9yb3VnaDEgMB4GA1UECgwXTG91Z2hib3JvdWdoIFVuaXZlcnNpdHkxFDASBgNV
-						BAsMC0lUIFNlcnZpY2VzMRgwFgYDVQQDDA9pZHAubGJvcm8uYWMudWswHhcNMTQw
-						NjI2MTQ0NTMzWhcNMzQwNjI2MTQ0NTMzWjCBjzELMAkGA1UEBhMCR0IxFzAVBgNV
-						BAgMDkxlaWNlc3RlcnNoaXJlMRUwEwYDVQQHDAxMb3VnaGJvcm91Z2gxIDAeBgNV
-						BAoMF0xvdWdoYm9yb3VnaCBVbml2ZXJzaXR5MRQwEgYDVQQLDAtJVCBTZXJ2aWNl
-						czEYMBYGA1UEAwwPaWRwLmxib3JvLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA3bzqGATB5A3Ve1tYdKK33TzyiojOKh32KKxQSsULl4HAY+tW
-						K6ecQB56Meq7vxkQ0eIau/uyfk7Q87qhH4gX/tTpfsbvrPaaB/X0/AU0uNnaCVK0
-						Vh7AZYzZF+nTgzFxCq+aOiVPCR7f5LLBY3BFj6QdBzKalAShozuwHiLtnL3nYpVt
-						yEwEbbBS1BuKmsGSKAncrMiWKdmzMTMyCZtu0u1dmtpnwbfppFoPlj/zM8KDjBdr
-						Aehg5Rflrj8lifnkJSEpIHT+BTlx6zyvbCPSWdk9VTzXpPM3JlQwIs0dlJzPMh6w
-						CAw66N393Awd9ilkpoGrkdG/hFzPD2D/0RNX7wIDAQABo1AwTjAdBgNVHQ4EFgQU
-						18Vf/8a7klrMfl3UMChCt8tzOG8wHwYDVR0jBBgwFoAU18Vf/8a7klrMfl3UMChC
-						t8tzOG8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAtlrSXUAKW4tV
-						0I7JkmVUvKhrlFlZJMqR8WNwxG5l6+5BFvXLb0DoGH1YdynAWn9MtdvWTm/hGOZ5
-						Vr/FYBbHHjZN4HK6DMceZSq9YAMdEUtpIPMd1sGdplVKofHqYUEbKL+VJnBYSYnr
-						J1VQhScUX0PjM5rAwlXxdh2kBNlyeC1ZsjNvLPH95T+Ev8i6BFVrSbe09I40mBiQ
-						JThq5JpngMmPGZg5r/H3PnAJdN5OwUyLPLj4D/raVOAk7tiySTPWzWRyPxzbRXr0
-						tDPQasPZEABCL4E0cEK4YHwrffT/nd3I0KQ2wS/C17z3798QYPQJ9f6KHty2X5mf
-						PmG2OinSJg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lboro.ac.uk/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.lboro.ac.uk/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Loughborough University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Loughborough University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lboro.ac.uk/it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Loughborough University IT Services</GivenName>
-    <EmailAddress>mailto:it.services@lboro.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Loughborough University IT Services</GivenName>
-    <EmailAddress>mailto:it.services@lboro.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lcwc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.lcwc.ac.uk-shibboleth.xml
deleted file mode 100644
index 82f6e3ce..00000000
--- a/swamid-interfederations-2.0/idp.lcwc.ac.uk-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.lcwc.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Lakes College West Cumbria.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">lcwc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lcwc.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lcwc.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lakes College West Cumbria</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lcwc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.le.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.le.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 26463e65..00000000
--- a/swamid-interfederations-2.0/idp.le.ac.uk-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://idp.le.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Test" Shibboleth IdP for the University of Leicester.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">le.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEEjCCAvqgAwIBAgIJAKikJalhNqxJMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
-						VQQGEwJHQjEXMBUGA1UECBMOTGVpY2VzdGVyc2hpcmUxEjAQBgNVBAcTCUxlaWNl
-						c3RlcjEgMB4GA1UEChMXVW5pdmVyc2l0eSBvZiBMZWljZXN0ZXIxFDASBgNVBAsT
-						C0lUIFNlcnZpY2VzMRUwEwYDVQQDEwxpZHAubGUuYWMudWswHhcNMTMwMzIyMTY0
-						MTI1WhcNMjMwMzIwMTY0MTI1WjCBiTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkxl
-						aWNlc3RlcnNoaXJlMRIwEAYDVQQHEwlMZWljZXN0ZXIxIDAeBgNVBAoTF1VuaXZl
-						cnNpdHkgb2YgTGVpY2VzdGVyMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEVMBMGA1UE
-						AxMMaWRwLmxlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						v48+1bJDraA824vOonzXfO8qI4tshOPN9ZfbQgSVQcC60FwZnpFYKxXSRsHNXS+g
-						6XAmqTFHmZ3XNcnEubHlHhMIWa+h6Y9TGNbE9rYVmsWAsBU9sr8AjRWHVAdNSBOh
-						p+TefRp8Ye5v03c3UlZjyIbx5Spm9QAYhYMUb0vpojyA66/z9wO/HB8aLBXHSG4y
-						AS7L7eU4xLi+dHfKZNXvg+Wg/vQK751vdfCyQixrZ8avNs9XZuHfj1PLR08yeiHt
-						y/U7Ucb1lPFS73qPC20bIYKVibA+Eq6lKLaM1pvZWXe6e8bEBr0pMopLijd0wY1E
-						N5dykwNxRUSMfiYtJTTAlQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
-						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU/2Jr
-						YbAhODGffju6YFik2FQGaYowHwYDVR0jBBgwFoAU/2JrYbAhODGffju6YFik2FQG
-						aYowDQYJKoZIhvcNAQEFBQADggEBACVXwHUVWxnN2S12pCKs6AskooTV6cOa7K8n
-						LkJBPv3DG2hR6Na5rHfWepEJOFvW91KwWYonpxdwvyypDi1oiq8V3n+CO77Ub2zZ
-						5CaZnxM2hRiLTU5HgsUtYoAYxoFLvKAdDsziGfPboF98fWNnuKQprxQJp42pFOuZ
-						K/F3Kc+mrEHx768iQ+flVFeEV7zbzswJQzSQGVdT4PMggd201HHPB2QWAYUUD7r2
-						Odbs8W//GG1PFnFYJUcWsQX9tKPPWOortXmq6hdMpCRacUBnLKkEbVPXAhwc3OCK
-						9oOJu420TumzHCrOZ9nlTK+VFxzPCRiIZ5q/gbltmuFXP5G0pVE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.le.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.le.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.le.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.le.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.le.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.le.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">le.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEEjCCAvqgAwIBAgIJAKikJalhNqxJMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
-						VQQGEwJHQjEXMBUGA1UECBMOTGVpY2VzdGVyc2hpcmUxEjAQBgNVBAcTCUxlaWNl
-						c3RlcjEgMB4GA1UEChMXVW5pdmVyc2l0eSBvZiBMZWljZXN0ZXIxFDASBgNVBAsT
-						C0lUIFNlcnZpY2VzMRUwEwYDVQQDEwxpZHAubGUuYWMudWswHhcNMTMwMzIyMTY0
-						MTI1WhcNMjMwMzIwMTY0MTI1WjCBiTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkxl
-						aWNlc3RlcnNoaXJlMRIwEAYDVQQHEwlMZWljZXN0ZXIxIDAeBgNVBAoTF1VuaXZl
-						cnNpdHkgb2YgTGVpY2VzdGVyMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEVMBMGA1UE
-						AxMMaWRwLmxlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						v48+1bJDraA824vOonzXfO8qI4tshOPN9ZfbQgSVQcC60FwZnpFYKxXSRsHNXS+g
-						6XAmqTFHmZ3XNcnEubHlHhMIWa+h6Y9TGNbE9rYVmsWAsBU9sr8AjRWHVAdNSBOh
-						p+TefRp8Ye5v03c3UlZjyIbx5Spm9QAYhYMUb0vpojyA66/z9wO/HB8aLBXHSG4y
-						AS7L7eU4xLi+dHfKZNXvg+Wg/vQK751vdfCyQixrZ8avNs9XZuHfj1PLR08yeiHt
-						y/U7Ucb1lPFS73qPC20bIYKVibA+Eq6lKLaM1pvZWXe6e8bEBr0pMopLijd0wY1E
-						N5dykwNxRUSMfiYtJTTAlQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
-						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU/2Jr
-						YbAhODGffju6YFik2FQGaYowHwYDVR0jBBgwFoAU/2JrYbAhODGffju6YFik2FQG
-						aYowDQYJKoZIhvcNAQEFBQADggEBACVXwHUVWxnN2S12pCKs6AskooTV6cOa7K8n
-						LkJBPv3DG2hR6Na5rHfWepEJOFvW91KwWYonpxdwvyypDi1oiq8V3n+CO77Ub2zZ
-						5CaZnxM2hRiLTU5HgsUtYoAYxoFLvKAdDsziGfPboF98fWNnuKQprxQJp42pFOuZ
-						K/F3Kc+mrEHx768iQ+flVFeEV7zbzswJQzSQGVdT4PMggd201HHPB2QWAYUUD7r2
-						Odbs8W//GG1PFnFYJUcWsQX9tKPPWOortXmq6hdMpCRacUBnLKkEbVPXAhwc3OCK
-						9oOJu420TumzHCrOZ9nlTK+VFxzPCRiIZ5q/gbltmuFXP5G0pVE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.le.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.le.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 Leicester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Leicester (Shibboleth Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www2.le.ac.uk/offices/itservices/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matthew</GivenName>
-    <SurName>Newton</SurName>
-    <EmailAddress>mailto:mcn4@leicester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Newton</SurName>
-    <EmailAddress>mailto:mcn4@leicester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lec.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lec.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b4404e16..00000000
--- a/swamid-interfederations-2.0/idp.lec.ac.uk-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.lec.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Leicester College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-19T09:21:36Z">
-      <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">lec.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAOhCOyKOXTcMdnvggD4B9+FnzBWtMA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMTDWlkcC5sZWMuYWMudWswHhcNMTQwNjE5MTUyODQxWhcN
-						MzQwNjE5MTUyODQxWjAYMRYwFAYDVQQDEw1pZHAubGVjLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnnerdYQQxQIZU5eVNTKYtAKY3LaWLGFJ
-						h20xeYu8DYnc79EbitOROhHYrg/ORw9Ns63bvaLsXPwj6MC+zo31AF67SvmvKI7C
-						5QqlXBaZVYPvgNEGIPYtqfMdEYBfnCea3Wfrc+R06IcLbC+NLJetv1M1BpzkfmSa
-						xwUA//pZ6iEYkta1StPwX7JwILQHXqNVDYH9QUldvOxyMsM+DpqY0pCnrBxoAvVO
-						15e6aLkLIs3OHzhkREomiu3N3K8Wt4ePkBy8PruVpODWf2Yl1qAbXHczo2jeR9S+
-						jgY8TRdblPn2WcKoZ6Xs0hQldlGzTcoPYREB3J671iI/0Qd4bBky9QIDAQABo2Ew
-						XzA+BgNVHREENzA1gg1pZHAubGVjLmFjLnVrhiRodHRwczovL2lkcC5sZWMuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNq8a16FuYh4F4H642sLTgWlIr5o
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAgoPBw1rcnYM2LrNO4GjATEBUt9mX/OGXCR6ar
-						HrY/tEYn3kDIOukO3mjpVJXuxuRJEZZuG5+iCqb9/icgh7UPRZZ1pQS92JdtSvZk
-						CLZfaEih3jP3khZEzxPSnscMkMYyMxdMxcFIzrq/vt36gzCU5X2F5gO89jn++z2t
-						Ei8LRmUPKJ/czStcMTf8uS6Xy1jrIPoEUcqv8z9TFir+SWynz2NqLlRq8f/q3qNb
-						4c/B50roEAWi6UjG1BoWsAHpAU6vNpAwX5rpPF2jfW3diOaSlOeId7C679ccWmQJ
-						Gp39POQVUg52O0GAfPJgGgmUrlThA5+DQ5KdGTlmOsObK3LV
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lec.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lec.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.lec.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lec.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lec.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.lec.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lec.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lec.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lec.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">lec.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAOhCOyKOXTcMdnvggD4B9+FnzBWtMA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMTDWlkcC5sZWMuYWMudWswHhcNMTQwNjE5MTUyODQxWhcN
-						MzQwNjE5MTUyODQxWjAYMRYwFAYDVQQDEw1pZHAubGVjLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnnerdYQQxQIZU5eVNTKYtAKY3LaWLGFJ
-						h20xeYu8DYnc79EbitOROhHYrg/ORw9Ns63bvaLsXPwj6MC+zo31AF67SvmvKI7C
-						5QqlXBaZVYPvgNEGIPYtqfMdEYBfnCea3Wfrc+R06IcLbC+NLJetv1M1BpzkfmSa
-						xwUA//pZ6iEYkta1StPwX7JwILQHXqNVDYH9QUldvOxyMsM+DpqY0pCnrBxoAvVO
-						15e6aLkLIs3OHzhkREomiu3N3K8Wt4ePkBy8PruVpODWf2Yl1qAbXHczo2jeR9S+
-						jgY8TRdblPn2WcKoZ6Xs0hQldlGzTcoPYREB3J671iI/0Qd4bBky9QIDAQABo2Ew
-						XzA+BgNVHREENzA1gg1pZHAubGVjLmFjLnVrhiRodHRwczovL2lkcC5sZWMuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNq8a16FuYh4F4H642sLTgWlIr5o
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAgoPBw1rcnYM2LrNO4GjATEBUt9mX/OGXCR6ar
-						HrY/tEYn3kDIOukO3mjpVJXuxuRJEZZuG5+iCqb9/icgh7UPRZZ1pQS92JdtSvZk
-						CLZfaEih3jP3khZEzxPSnscMkMYyMxdMxcFIzrq/vt36gzCU5X2F5gO89jn++z2t
-						Ei8LRmUPKJ/czStcMTf8uS6Xy1jrIPoEUcqv8z9TFir+SWynz2NqLlRq8f/q3qNb
-						4c/B50roEAWi6UjG1BoWsAHpAU6vNpAwX5rpPF2jfW3diOaSlOeId7C679ccWmQJ
-						Gp39POQVUg52O0GAfPJgGgmUrlThA5+DQ5KdGTlmOsObK3LV
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lec.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lec.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">Leicester College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leicester College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lec.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lisa</GivenName>
-    <SurName>McDonald</SurName>
-    <EmailAddress>mailto:lmcdonald@lec.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sherwin</GivenName>
-    <SurName>D'Souza</SurName>
-    <EmailAddress>mailto:sdsouza@lec.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.leeds-art.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.leeds-art.ac.uk-openathens.xml
deleted file mode 100644
index 58493ae4..00000000
--- a/swamid-interfederations-2.0/idp.leeds-art.ac.uk-openathens.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.leeds-art.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Leeds College of Art.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">leeds-art.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/leeds-art.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/leeds-art.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds College of Art</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.leeds-art.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.leedscitycollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.leedscitycollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 26e91cae..00000000
--- a/swamid-interfederations-2.0/idp.leedscitycollege.ac.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://idp.leedscitycollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Leeds City College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">leedscitycollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgjCCA2qgAwIBAgIRALCBQlGXGrcD9c9LdG6adR0wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAzMTQwMDAwMDBaFw0xNjAzMTMyMzU5NTlaMEgxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEjMCEGA1UEAxMaaWRwLmxlZWRz
-						Y2l0eWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDAcpLEpdhaHKIAQ0gV+frjeHDaRPrZhXmb1u96oKsRwYqpyr6413IEYdRtkpYw
-						P65xLjyLn538zGAk1N9Z5gW7zjRQ+hFeI4jfyk19FIb+PNVhcCj+gwHQ5UbY+1Iw
-						rrRn8ODaIV0oA6c/XTYcdecJy1XRVKsOT2y/zAV+IsMXWD5fUWcJ6wqNYr7tU6fh
-						ltnrkY+jnsku7ACawXfJjKxcXnKe6mTGEKwYbKnOAGtngMu6lWJJ3pHGRsvnPyDK
-						a73kgwpTnwNFr1tZtconuHgEN2BQYjInvJYChNKBpGXEj5iSHSUgZgxmNxy/IuID
-						/p7S5/xZfNAH9rQV8zxq5QgjAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
-						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUU3P+wtUYFchRKsv6Q4LmIgFLpEcw
-						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCUGA1UdEQQeMByCGmlkcC5sZWVk
-						c2NpdHljb2xsZWdlLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQAZrvDhT0tAcl8+
-						WuPuV3YV9rSyzLakdOMu4LrTSXeXMbqjasyoX6ROcOYX9l2/Tgtc7kerFF5XTzkr
-						nrZoB3JsckEkljtxhrQhFLlZhHO55M8gli21jtczeZxoUCWwuoh8pKmOgXHoOi4f
-						eM4JIVwgyn0ZqelN4SlJwyb1Iw59qSSzLvwHnawHq0wGXwk3bWTaxQL0RdZoOGPN
-						noPr1FoKBvyZ9WDwZcjQ0gB2jfEzg6xEyQXYomxtEVPX06VItORVhuO4yGI7uHqO
-						rq6Bbi0IALgCSKEdElu6sVbcszLHW99ZrXp8YFbfOA0qCWaBhCYGqaauw90fKW1Z
-						wY23or2j
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.leedscitycollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.leedscitycollege.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.leedscitycollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.leedscitycollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.leedscitycollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.leedscitycollege.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">leedscitycollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgjCCA2qgAwIBAgIRALCBQlGXGrcD9c9LdG6adR0wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAzMTQwMDAwMDBaFw0xNjAzMTMyMzU5NTlaMEgxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEjMCEGA1UEAxMaaWRwLmxlZWRz
-						Y2l0eWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDAcpLEpdhaHKIAQ0gV+frjeHDaRPrZhXmb1u96oKsRwYqpyr6413IEYdRtkpYw
-						P65xLjyLn538zGAk1N9Z5gW7zjRQ+hFeI4jfyk19FIb+PNVhcCj+gwHQ5UbY+1Iw
-						rrRn8ODaIV0oA6c/XTYcdecJy1XRVKsOT2y/zAV+IsMXWD5fUWcJ6wqNYr7tU6fh
-						ltnrkY+jnsku7ACawXfJjKxcXnKe6mTGEKwYbKnOAGtngMu6lWJJ3pHGRsvnPyDK
-						a73kgwpTnwNFr1tZtconuHgEN2BQYjInvJYChNKBpGXEj5iSHSUgZgxmNxy/IuID
-						/p7S5/xZfNAH9rQV8zxq5QgjAgMBAAGjggF3MIIBczAfBgNVHSMEGDAWgBQMvZNo
-						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUU3P+wtUYFchRKsv6Q4LmIgFLpEcw
-						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCUGA1UdEQQeMByCGmlkcC5sZWVk
-						c2NpdHljb2xsZWdlLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQAZrvDhT0tAcl8+
-						WuPuV3YV9rSyzLakdOMu4LrTSXeXMbqjasyoX6ROcOYX9l2/Tgtc7kerFF5XTzkr
-						nrZoB3JsckEkljtxhrQhFLlZhHO55M8gli21jtczeZxoUCWwuoh8pKmOgXHoOi4f
-						eM4JIVwgyn0ZqelN4SlJwyb1Iw59qSSzLvwHnawHq0wGXwk3bWTaxQL0RdZoOGPN
-						noPr1FoKBvyZ9WDwZcjQ0gB2jfEzg6xEyQXYomxtEVPX06VItORVhuO4yGI7uHqO
-						rq6Bbi0IALgCSKEdElu6sVbcszLHW99ZrXp8YFbfOA0qCWaBhCYGqaauw90fKW1Z
-						wY23or2j
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.leedscitycollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.leedscitycollege.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">Leeds City College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds City College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.leedscitycollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Robert</GivenName>
-    <SurName>Elliott</SurName>
-    <EmailAddress>mailto:robert.elliott@leedscitycollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Elliott</SurName>
-    <EmailAddress>mailto:robert.elliott@leedscitycollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.leedstrinity.ac.uk-shibboleth.xml
deleted file mode 100644
index f10afe50..00000000
--- a/swamid-interfederations-2.0/idp.leedstrinity.ac.uk-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.leedstrinity.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Leeds Trinity University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">leedstrinity.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/leedstrinity.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/leedstrinity.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds Trinity University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.leedstrinity.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.leyton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.leyton.ac.uk-shibboleth.xml
deleted file mode 100644
index f31f1d76..00000000
--- a/swamid-interfederations-2.0/idp.leyton.ac.uk-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.leyton.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Leyton Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">leyton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/leyton.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/leyton.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leyton Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.leyton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lhup.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lhup.edu-idp-shibboleth.xml
deleted file mode 100644
index 8a74a705..00000000
--- a/swamid-interfederations-2.0/idp.lhup.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +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://idp.lhup.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.lhup.edu/idp/error.jsp" 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">lhup.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lock Haven University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.lhup.edu/computing_and_tech</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.lhup.edu/computing_and_tech/aup.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="42" width="447" xml:lang="en">https://www.lhup.edu/images/web-logo-head-11.jpg</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>
-MIIEuTCCA6GgAwIBAgIQZcvMkgZaqKLekHBsU354XjANBgkqhkiG9w0BAQUFADA8
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-aGF3dGUgU1NMIENBMB4XDTEyMDcyNDAwMDAwMFoXDTE1MDcyNDIzNTk1OVowgY0x
-CzAJBgNVBAYTAlVTMRUwEwYDVQQIEwxQZW5uc3lsdmFuaWExEzARBgNVBAcUCkxv
-Y2sgSGF2ZW4xLjAsBgNVBAoUJUxvY2sgSGF2ZW4gVW5pdmVyc2l0eSBPZiBQZW5u
-c3lsdmFuaWExCzAJBgNVBAsUAklUMRUwEwYDVQQDFAxpZHAubGh1cC5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdFclUfLWsojRGkQA9JO6S8QOl
-FAYb3FaZ9Sn4d5uM7qgSC7EHcZ4UCTPZ3d/ni2Sp5HkFHzAO2Il3lRQN5rgtepk3
-OWW2KcfipbXczbwzBO2U/fz4EQfu+1fz9nhMD3j85nDDhbhEWynYcrfmS2xnRb3p
-llgI5MH0FLSN+5umufSf7yF2lwgl4Lr7vMoKn5hEP+imHDlh9Nq+SHATDIJO6f7x
-JuJL+hAj84xWRJqGfs28TiJMM5R18rsHoE9bjqOwHjeR7SFsZaS77mn+JX5DESzU
-AE+XkGxQq+LQ4dMFXpA3sVotytUxgKUNrp2VFVOTzSixo3JpDk+Jai5W32CvAgMB
-AAGjggFjMIIBXzAXBgNVHREEEDAOggxpZHAubGh1cC5lZHUwCQYDVR0TBAIwADBC
-BgNVHSAEOzA5MDcGCmCGSAGG+EUBBzYwKTAnBggrBgEFBQcCARYbaHR0cHM6Ly93
-d3cudGhhd3RlLmNvbS9jcHMvMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAWgBSn
-ooO7NEVAPfzVME8SuT6hAZ/22zA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vc3Zy
-LW92LWNybC50aGF3dGUuY29tL1RoYXd0ZU9WLmNybDAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwaQYIKwYBBQUHAQEEXTBbMCIGCCsGAQUFBzABhhZodHRw
-Oi8vb2NzcC50aGF3dGUuY29tMDUGCCsGAQUFBzAChilodHRwOi8vc3ZyLW92LWFp
-YS50aGF3dGUuY29tL1RoYXd0ZU9WLmNlcjANBgkqhkiG9w0BAQUFAAOCAQEAdy3s
-U5fAwa249ELF6aywqLvnk0GXaAaikI00D0Hos6tmMuUxTj40eQwICApm5Y6fBQFC
-mBQjFYpHWxvmxTnnED0/GKgfXNA2eUyY0RVHxtydFFJB0tmbMS0w0dhPaSjMjUVE
-kSBlxl5DMgM8CIEohWoZiMahTKVhRsTbpQgOsJCGEHv3qtrvbSfuJwYBP5F4DPPY
-blFlMDAkDVVUynA6Lp+wyrf/C2+2N0jg8EVGl8PuOnBeL860Lg9j+zEwJZiQrllW
-TKvZOVB6ym5AhHfgCOR4ZcQYIh+TVAYjxgtVqTADfuOZ6WiO5D2Hilad+xW3UQyx
-L6VIWeNvK0QGSePPsg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lhup.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lhup.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lhup.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lhup.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lhup.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lhup.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEuTCCA6GgAwIBAgIQZcvMkgZaqKLekHBsU354XjANBgkqhkiG9w0BAQUFADA8
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-aGF3dGUgU1NMIENBMB4XDTEyMDcyNDAwMDAwMFoXDTE1MDcyNDIzNTk1OVowgY0x
-CzAJBgNVBAYTAlVTMRUwEwYDVQQIEwxQZW5uc3lsdmFuaWExEzARBgNVBAcUCkxv
-Y2sgSGF2ZW4xLjAsBgNVBAoUJUxvY2sgSGF2ZW4gVW5pdmVyc2l0eSBPZiBQZW5u
-c3lsdmFuaWExCzAJBgNVBAsUAklUMRUwEwYDVQQDFAxpZHAubGh1cC5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdFclUfLWsojRGkQA9JO6S8QOl
-FAYb3FaZ9Sn4d5uM7qgSC7EHcZ4UCTPZ3d/ni2Sp5HkFHzAO2Il3lRQN5rgtepk3
-OWW2KcfipbXczbwzBO2U/fz4EQfu+1fz9nhMD3j85nDDhbhEWynYcrfmS2xnRb3p
-llgI5MH0FLSN+5umufSf7yF2lwgl4Lr7vMoKn5hEP+imHDlh9Nq+SHATDIJO6f7x
-JuJL+hAj84xWRJqGfs28TiJMM5R18rsHoE9bjqOwHjeR7SFsZaS77mn+JX5DESzU
-AE+XkGxQq+LQ4dMFXpA3sVotytUxgKUNrp2VFVOTzSixo3JpDk+Jai5W32CvAgMB
-AAGjggFjMIIBXzAXBgNVHREEEDAOggxpZHAubGh1cC5lZHUwCQYDVR0TBAIwADBC
-BgNVHSAEOzA5MDcGCmCGSAGG+EUBBzYwKTAnBggrBgEFBQcCARYbaHR0cHM6Ly93
-d3cudGhhd3RlLmNvbS9jcHMvMA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAWgBSn
-ooO7NEVAPfzVME8SuT6hAZ/22zA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vc3Zy
-LW92LWNybC50aGF3dGUuY29tL1RoYXd0ZU9WLmNybDAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwaQYIKwYBBQUHAQEEXTBbMCIGCCsGAQUFBzABhhZodHRw
-Oi8vb2NzcC50aGF3dGUuY29tMDUGCCsGAQUFBzAChilodHRwOi8vc3ZyLW92LWFp
-YS50aGF3dGUuY29tL1RoYXd0ZU9WLmNlcjANBgkqhkiG9w0BAQUFAAOCAQEAdy3s
-U5fAwa249ELF6aywqLvnk0GXaAaikI00D0Hos6tmMuUxTj40eQwICApm5Y6fBQFC
-mBQjFYpHWxvmxTnnED0/GKgfXNA2eUyY0RVHxtydFFJB0tmbMS0w0dhPaSjMjUVE
-kSBlxl5DMgM8CIEohWoZiMahTKVhRsTbpQgOsJCGEHv3qtrvbSfuJwYBP5F4DPPY
-blFlMDAkDVVUynA6Lp+wyrf/C2+2N0jg8EVGl8PuOnBeL860Lg9j+zEwJZiQrllW
-TKvZOVB6ym5AhHfgCOR4ZcQYIh+TVAYjxgtVqTADfuOZ6WiO5D2Hilad+xW3UQyx
-L6VIWeNvK0QGSePPsg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lhup.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lock Haven University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Lock Haven University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lhup.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Lock Haven University IT Department</md:GivenName>
-    <md:EmailAddress>idp@lhup.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Lock Haven University IT Department</md:GivenName>
-    <md:EmailAddress>idp@lhup.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Lock Haven University IT Department</md:GivenName>
-    <md:EmailAddress>idp@lhup.edu</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 6d57ae0a..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lib.cas.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://idp.lib.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lib.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lib.cas.cz/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">lib.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lib.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lib.cas.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="en">Academy of Sciences Library</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Knihovna AV ČR, v. v. i.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Academy of Sciences Library</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Knihovna AV ČR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lib.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.lib.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Duda</md:SurName>
-    <md:EmailAddress>duda@lib.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lincoln.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.lincoln.ac.uk-oala-metadata.xml
deleted file mode 100644
index f0c9bec1..00000000
--- a/swamid-interfederations-2.0/idp.lincoln.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lincoln.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the University of Lincoln.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-24T09:14:03Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">lincoln.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSjCCAjKgAwIBAgIIc6UBcBsQyJgwDQYJKoZIhvcNAQEFBQAwPDEeMBwGA1UE
-						CgwVVW5pdmVyc2l0eSBvZiBMaW5jb2xuMRowGAYDVQQDDBFpZHAubGluY29sbi5h
-						Yy51azAeFw0xMzAxMjkxMDQ5MTFaFw0yMzAxMjkxMDQ5MTFaMDwxHjAcBgNVBAoM
-						FVVuaXZlcnNpdHkgb2YgTGluY29sbjEaMBgGA1UEAwwRaWRwLmxpbmNvbG4uYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmBWA3X5TBChNdRKB7
-						mFrqf85x00gTT72GwVFqsV7BEMZ2UvMqauSS0oWHsCmKr7Q34DcJ1ExFdEI5jfQW
-						InbW2b7AcmnE+oKJEbIhqKBEYeu5Hc/Dw03SyDPH+iSh9bx6EJaH5eugzF9U08tk
-						XME2DEduj3AUIWvUPK9Dv8JXv9VJODB0VtbydHqLNO5mFFarlmXiDeS1nfIP/EaG
-						cgpgeodbYQNksRwlCr+42CDmKEeL9xBPSHffl067Dhdn/BerjGfhhRPIcKGyqqW1
-						dIeIxf4dE7mSjU+Vgi9rAkYYiYmS6VZ+xqUOENBiwmB15U16Zn6RwWRfC+ws1QYl
-						ndEFAgMBAAGjUDBOMB0GA1UdDgQWBBTsQIaEu965VZKaGcma7WN0SOeXAjAfBgNV
-						HSMEGDAWgBTsQIaEu965VZKaGcma7WN0SOeXAjAMBgNVHRMEBTADAQH/MA0GCSqG
-						SIb3DQEBBQUAA4IBAQBOdgr9ODArnjsqvC2pl/UlyStM2J98FrkuliC5N8LXnKPV
-						GnJq8oBk3gt5y0q+79Om3jyN+olZl2htdSx2YWN742ft40532abT/B4/aItMqInZ
-						eZju9+41GQzhRVXwmJTsVIeJi7J4cHj8sVg+AppdfhM9gWfBcBaG+pHjrJPVAzwq
-						KKhlaB5h3oGZW8A6OWJda/+y8JhoAXQMNwP7TriiNxyHeDBhoHZDOwTGw5qMexeA
-						hi/GatyZw+G/0dmCdpKTeUIm1XLmcBya6DJmLvT9hgKjhS/YBfS8pzXYSHSccmmx
-						lhH0f8puYVYzEpQri0i10R25xmhRpI1gEieJUqNQ
-					</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>
-						MIIDSjCCAjKgAwIBAgIIc6UBcBsQyJgwDQYJKoZIhvcNAQEFBQAwPDEeMBwGA1UE
-						CgwVVW5pdmVyc2l0eSBvZiBMaW5jb2xuMRowGAYDVQQDDBFpZHAubGluY29sbi5h
-						Yy51azAeFw0xMzAxMjkxMDQ5MTFaFw0yMzAxMjkxMDQ5MTFaMDwxHjAcBgNVBAoM
-						FVVuaXZlcnNpdHkgb2YgTGluY29sbjEaMBgGA1UEAwwRaWRwLmxpbmNvbG4uYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmBWA3X5TBChNdRKB7
-						mFrqf85x00gTT72GwVFqsV7BEMZ2UvMqauSS0oWHsCmKr7Q34DcJ1ExFdEI5jfQW
-						InbW2b7AcmnE+oKJEbIhqKBEYeu5Hc/Dw03SyDPH+iSh9bx6EJaH5eugzF9U08tk
-						XME2DEduj3AUIWvUPK9Dv8JXv9VJODB0VtbydHqLNO5mFFarlmXiDeS1nfIP/EaG
-						cgpgeodbYQNksRwlCr+42CDmKEeL9xBPSHffl067Dhdn/BerjGfhhRPIcKGyqqW1
-						dIeIxf4dE7mSjU+Vgi9rAkYYiYmS6VZ+xqUOENBiwmB15U16Zn6RwWRfC+ws1QYl
-						ndEFAgMBAAGjUDBOMB0GA1UdDgQWBBTsQIaEu965VZKaGcma7WN0SOeXAjAfBgNV
-						HSMEGDAWgBTsQIaEu965VZKaGcma7WN0SOeXAjAMBgNVHRMEBTADAQH/MA0GCSqG
-						SIb3DQEBBQUAA4IBAQBOdgr9ODArnjsqvC2pl/UlyStM2J98FrkuliC5N8LXnKPV
-						GnJq8oBk3gt5y0q+79Om3jyN+olZl2htdSx2YWN742ft40532abT/B4/aItMqInZ
-						eZju9+41GQzhRVXwmJTsVIeJi7J4cHj8sVg+AppdfhM9gWfBcBaG+pHjrJPVAzwq
-						KKhlaB5h3oGZW8A6OWJda/+y8JhoAXQMNwP7TriiNxyHeDBhoHZDOwTGw5qMexeA
-						hi/GatyZw+G/0dmCdpKTeUIm1XLmcBya6DJmLvT9hgKjhS/YBfS8pzXYSHSccmmx
-						lhH0f8puYVYzEpQri0i10R25xmhRpI1gEieJUqNQ
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lincoln.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lincoln.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Lincoln</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Lincoln</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://lincoln.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Elif</GivenName>
-    <SurName>Varol</SurName>
-    <EmailAddress>mailto:athens@lincoln.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Tompkins</SurName>
-    <EmailAddress>mailto:stompkins@lincoln.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lit.ie-saml2.xml b/swamid-interfederations-2.0/idp.lit.ie-saml2.xml
deleted file mode 100644
index 84669e3d..00000000
--- a/swamid-interfederations-2.0/idp.lit.ie-saml2.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.lit.ie/saml2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-05T00: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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lit.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Limerick Institute of Technology</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://lit.ie</mdui:InformationURL>
-        <mdui:Logo height="68" width="224">https://edugate.heanet.ie/rr3/logos/lit.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:52.67518513199228,-8.64822506904602</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAK59k/q1uMH3/ug2R0Sas9bw35KeMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5saXQuaWUwHhcNMTAwMjA0MTEyOTQxWhcNMzAw
-MjA0MTEyOTQxWjAVMRMwEQYDVQQDEwppZHAubGl0LmllMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA495mH78CGgvQeZvKrOJ4woldl2dp7Ci4QbHLGgTp
-KKfjO76MZHmgHkModQoSBefWldbJlVfWACYl9VbY068M7G1lzK6Zm53YYjOd8Ofx
-ZvQGJKdNwovc3mJj3JIUbKgFYGJB5RelSBiit8THDuIUVbiOjNdEKY5j88FRE7bq
-eOs38te8Mb4M7CmodPNY49L17bKdj9HTDMMy+Eb7K8cXm0tI13u662dv6Eo25gHh
-yOfW+D7yN6M9QpxYiwdGsdyEI1L+3RC2wyeXyD+BPehGFIIS6E98FPrm8aEb5VYF
-LSv6HM7Svh/OYD5SUg0vVaWRq3Zk0Qnh4h3/CjN8IA/BxQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAubGl0LmllhiFodHRwczovL2lkcC5saXQuaWUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFHxvq0yuTJFQfC4suTA1dPy6/UlwMA0GCSqGSIb3DQEB
-BQUAA4IBAQASBDPS14vXHejZhfmJEXVmnV23Zxm0Log8KQz23JKlTETQenL2kmPJ
-FRT2sqYb96vJO+p1oK3NuVHIrqb3/c9GsvieODItogGjMSbZxIE+NEzw6unBUkmu
-ytleOJgoRQpzmV1RYSRUEFC9fqM+a6g/2OEj44k48xyxgsrf2inNGm5h8J3xg92z
-zJ1pOvbz5lQUhwFoXj6hK+Mbf2eMkRPBB2GWyHa+SQ7Od9OiGOXO3yq458Z56Epu
-4bU1gxeWc19hELfEjHGb2GcLShYI6WQMUbW8VYxJHHEko1zuS/Ubblk0L6r7pX01
-JoJbFT2leW55hVI25oEHL5f7LtG353O6
-</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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lit.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lit.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lit.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Limerick Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Limerick Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://lit.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Joe</md:GivenName>
-    <md:SurName>O'Gorman</md:SurName>
-    <md:EmailAddress>mailto:joe.ogorman@lit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michael</md:GivenName>
-    <md:SurName>Tuohy</md:SurName>
-    <md:EmailAddress>mailto:mickt@lit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Niall</md:GivenName>
-    <md:SurName>Corcoran</md:SurName>
-    <md:EmailAddress>mailto:Niall.Corcoran@lit.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ljmu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ljmu.ac.uk-shibboleth.xml
deleted file mode 100644
index 1c305809..00000000
--- a/swamid-interfederations-2.0/idp.ljmu.ac.uk-shibboleth.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://idp.ljmu.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Liverpool John Moores University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-05T17:05:00Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">ljmu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11ArtifactResolver" index="0"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://auth.athensams.net"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ljmu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gateway.athensams.net:5057/services/SAML11AttributeAuthority"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Liverpool John Moores University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ljmu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.llandrillo.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.llandrillo.ac.uk-shibboleth.xml
deleted file mode 100644
index c4486ea5..00000000
--- a/swamid-interfederations-2.0/idp.llandrillo.ac.uk-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.llandrillo.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Grwp Llandrillo Menai.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">llandrillo.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/llandrillo.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/llandrillo.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Grwp Llandrillo Menai</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.llandrillo.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.llgc.org.uk-idp-shibboleth.xml
deleted file mode 100644
index eb878621..00000000
--- a/swamid-interfederations-2.0/idp.llgc.org.uk-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.llgc.org.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the National Library of Wales.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-16T17:10:22Z">
-      <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">llgc.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUf+ROdABvulYM0eBNBrr08C6TvOswDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMB4XDTE1MDUwNTEwNDI1NFoX
-						DTM1MDUwNTEwNDI1NFowGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIPzF237qyE3Px+37CeRobRfkDWI
-						PvHdJlD5nJkW8U+PTWnJ8At4PXC3gqV80EjSQHIFcyXkO261EHlA8SNWEcHRgpCj
-						viziINYRCPAzdtGmx75iqiFVwEskj1PODD4NjHRdCs4F3QQxmLZxlT2e2qufzuLm
-						0xcW7sopBpni3DOSLhy4EmaVXOe2WJFSWpLeAJYqBykWp53M2yfa7YM9i0DYiGee
-						sKFdTmP6N650488Aolw9PbECYZfVeqEhT5GbOZMZyE0Uhorjf3zvEGG8nPwEmF5x
-						hdx8dwUpnEByoLYZ1dz+S6TfKsckFxLpCk+AbFSTFTcqazUK3WO3aBzXUwIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg9pZHAubGxnYy5vcmcudWuGJmh0dHBzOi8vaWRwLmxs
-						Z2Mub3JnLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQxx9cjObvnnBMR+VUm
-						LHVQdWfcUzANBgkqhkiG9w0BAQUFAAOCAQEAisO2C392/EeLBOD69GQ/4Xu7W9IQ
-						OdTV18rWXJVEPYDP7YmrcSk818fRVqK/jmxPtD6ue11ahS4ANoWYfL961uerYBy3
-						dH9DaLES8Z1q0Ph/9FaCToX54Qf3QZjeC+Z2cJxdU3GKW+jcAC2MA6xn8EZrav6o
-						wOtPF5sGumbFgmTsexNsy1yuavRO5Ss4L0PW6QaqZOnf6/qE84KxVz17F6liGtO5
-						jTr3pKI/A3iBWZt2V88lvRAxEQET8C6M9GnrRkSuLQUs6GWDbXKZHZPIs/qCvPG9
-						ZKiIFQhzp7jfUxRJaFznq0Ysg4Ftq0JIV+j8n7+JE4dO9Dp4c/rj6uzjDQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.llgc.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.llgc.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://idp.llgc.org.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.llgc.org.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.llgc.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.llgc.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">llgc.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUf+ROdABvulYM0eBNBrr08C6TvOswDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMB4XDTE1MDUwNTEwNDI1NFoX
-						DTM1MDUwNTEwNDI1NFowGjEYMBYGA1UEAxMPaWRwLmxsZ2Mub3JnLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnIPzF237qyE3Px+37CeRobRfkDWI
-						PvHdJlD5nJkW8U+PTWnJ8At4PXC3gqV80EjSQHIFcyXkO261EHlA8SNWEcHRgpCj
-						viziINYRCPAzdtGmx75iqiFVwEskj1PODD4NjHRdCs4F3QQxmLZxlT2e2qufzuLm
-						0xcW7sopBpni3DOSLhy4EmaVXOe2WJFSWpLeAJYqBykWp53M2yfa7YM9i0DYiGee
-						sKFdTmP6N650488Aolw9PbECYZfVeqEhT5GbOZMZyE0Uhorjf3zvEGG8nPwEmF5x
-						hdx8dwUpnEByoLYZ1dz+S6TfKsckFxLpCk+AbFSTFTcqazUK3WO3aBzXUwIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg9pZHAubGxnYy5vcmcudWuGJmh0dHBzOi8vaWRwLmxs
-						Z2Mub3JnLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQxx9cjObvnnBMR+VUm
-						LHVQdWfcUzANBgkqhkiG9w0BAQUFAAOCAQEAisO2C392/EeLBOD69GQ/4Xu7W9IQ
-						OdTV18rWXJVEPYDP7YmrcSk818fRVqK/jmxPtD6ue11ahS4ANoWYfL961uerYBy3
-						dH9DaLES8Z1q0Ph/9FaCToX54Qf3QZjeC+Z2cJxdU3GKW+jcAC2MA6xn8EZrav6o
-						wOtPF5sGumbFgmTsexNsy1yuavRO5Ss4L0PW6QaqZOnf6/qE84KxVz17F6liGtO5
-						jTr3pKI/A3iBWZt2V88lvRAxEQET8C6M9GnrRkSuLQUs6GWDbXKZHZPIs/qCvPG9
-						ZKiIFQhzp7jfUxRJaFznq0Ysg4Ftq0JIV+j8n7+JE4dO9Dp4c/rj6uzjDQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.llgc.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.llgc.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">National Library of Wales</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Library of Wales</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cy">Llyfrgell Genedlaethol Cymru</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.llgc.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Illtud</GivenName>
-    <SurName>Daniel</SurName>
-    <EmailAddress>mailto:ild@llgc.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Illtud</GivenName>
-    <SurName>Daniel</SurName>
-    <EmailAddress>mailto:ild@llgc.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lmc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lmc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 881d7a28..00000000
--- a/swamid-interfederations-2.0/idp.lmc.ac.uk-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" entityID="https://idp.lmc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Lancaster and Morecambe College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">lmc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEpTCCA42gAwIBAgIRANrEQ8SK6/aNfqeZLMcYlvIwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAxMjkwMDAwMDBaFw0xNjAxMjkyMzU5NTlaMHgxCzAJBgNV
-						BAYTAkdCMRMwEQYDVQQIEwpMYW5jYXNoaXJlMRIwEAYDVQQHEwlMYW5jYXN0ZXIx
-						KDAmBgNVBAoTH0xhbmNhc3RlciBhbmQgTW9yZWNhbWJlIENvbGxlZ2UxFjAUBgNV
-						BAMTDWlkcC5sbWMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCluLZDgGWwGcgMVxaUrk6Sndi0cTm0e6pEfPMA4I+87qOhWIW8AXGwqqvR3e4g
-						+mq+iG5xSPfuUfY5/ydrfoHXJGkLPp6ahhvOeIzbnMUfCT4UDdjFkjwcFkBuO5rR
-						ggG09cK1XrIRK3RlYM/r2yyp/c8PjJvM6aIslqYCuuQkh5257IOfU8DUg4u9nUxJ
-						2PrPoMStJNDF6Z35wYbSAwpk8NkqkeYYcJFM/bSg034q3bv4f7wN+x3MTmw0i0dP
-						Aee4NWlEpj4O3bZHud3cl/pgStgYjcwk3LHGDlVFx6dRJXAhNHOtQR8i8nsmAwA7
-						h9xEepy066ZcXFeKPxdHCSxDAgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBQMvZNo
-						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU1Ehkp2hbUZ/Lk8faPtBptPizvcUw
-						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIC
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDWlkcC5sbWMu
-						YWMudWswDQYJKoZIhvcNAQEFBQADggEBABsF25GfLllyt4c1UAjQWdR0nPerYNlV
-						EJ9xzPMJ5euw4U1CMjNBgmcFMSmiFO86QMjDCiFGO087LgHnSFqMSuI34FJUqWmL
-						eU/Nyks3DR/+IZ9NHeQmQxP7ttRVZLqBwWm5k31d+Ch/rgPrmsmL4X2L2o0pSQJ5
-						pJHYb3Q4TsFbreKBs8Bq7zeGKtMAoiZrjhP9QkXveWV590I9Hj6Z6Wpk9mcBN1Xx
-						EFiUYc67MpmwjkobQXpBBHhdZDq85pddff4kqd/rgjNbAWaBMZ3Db22msPvZkEcw
-						YplNVj4iVlAZp/HFmJURCXZDpHI10D7HTYsUQxZq3Ow+kCXXn2MCu9g=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAPgRF90SkOfrpvO6fGRYgI1fbQGVMA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMMDWlkcC5sbWMuYWMudWswHhcNMTYwMTI3MTY1MzI1WhcN
-						MzYwMTI3MTY1MzI1WjAYMRYwFAYDVQQDDA1pZHAubG1jLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkUGshyWkRQtm/uK0j7jEkw70Es3ZGuHS
-						ihlGpm4nX9H7M/jrAMFNSOsZO1LHYe6m0FZlahn46c8vygU4VSrwwf+Kpxi4TYDK
-						IeON0WQ/vsGp/0NwfzSaaLU+Os02ZDYLdqnvIh27jytp5rDDnBnpxhqgKNc9zjFn
-						i1C4lF3nNiK8XHOm7QJHdYhRBeNbiuRADbhImQdsiisYa7gLpQPTwmLHqtbead5+
-						K30Q1IndesNEQ01s6vzkjo6fddFXYXEOZ7zJDDuinHZZbpNArxYqwdo0+OVP0ylB
-						29NjSZOLNEr2Nb9swyi1HmxeNOkbLC3ev8YOpqOLRH0imkq/gUC7bwIDAQABo2Ew
-						XzAdBgNVHQ4EFgQU/kzETxpCb/KwxtmH7ITaJmenc3MwPgYDVR0RBDcwNYINaWRw
-						LmxtYy5hYy51a4YkaHR0cHM6Ly9pZHAubG1jLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBUk3RzG3TzK8qGS9v4HS70KnFXh1z3HhSIym87
-						CJWIzcLXiqg5+lqcDVgHZ3n4QGtPIjUEaAMr8XnoyBrNbkD7AJQMr5COvlEkDvh6
-						fNWhvR92+m4N0Yo2enGNcTIvunXeC5Shw6uNrqzulqyb+l/I2DzzueztiwRBuc3F
-						uvRl5+UvWUQ1dHbT4Ad06LEe/fz2GijBYN3HZOQWUAR/uO0l33U/F/A4SmaC0rJa
-						Nkdxh/uOkDan5WM/AE5Fe2CouZrHItuY8riu+fWjyGiznIfBoHDTiprbE7NDgd6g
-						nqCb0LLQ84AQKuxaMFLRtqgD4cK5zggpl8SLoPw/IdTulbB8
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lmc.ac.uk/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lmc.ac.uk/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.lmc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lmc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lmc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lmc.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">lmc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEpTCCA42gAwIBAgIRANrEQ8SK6/aNfqeZLMcYlvIwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAxMjkwMDAwMDBaFw0xNjAxMjkyMzU5NTlaMHgxCzAJBgNV
-						BAYTAkdCMRMwEQYDVQQIEwpMYW5jYXNoaXJlMRIwEAYDVQQHEwlMYW5jYXN0ZXIx
-						KDAmBgNVBAoTH0xhbmNhc3RlciBhbmQgTW9yZWNhbWJlIENvbGxlZ2UxFjAUBgNV
-						BAMTDWlkcC5sbWMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCluLZDgGWwGcgMVxaUrk6Sndi0cTm0e6pEfPMA4I+87qOhWIW8AXGwqqvR3e4g
-						+mq+iG5xSPfuUfY5/ydrfoHXJGkLPp6ahhvOeIzbnMUfCT4UDdjFkjwcFkBuO5rR
-						ggG09cK1XrIRK3RlYM/r2yyp/c8PjJvM6aIslqYCuuQkh5257IOfU8DUg4u9nUxJ
-						2PrPoMStJNDF6Z35wYbSAwpk8NkqkeYYcJFM/bSg034q3bv4f7wN+x3MTmw0i0dP
-						Aee4NWlEpj4O3bZHud3cl/pgStgYjcwk3LHGDlVFx6dRJXAhNHOtQR8i8nsmAwA7
-						h9xEepy066ZcXFeKPxdHCSxDAgMBAAGjggFqMIIBZjAfBgNVHSMEGDAWgBQMvZNo
-						DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU1Ehkp2hbUZ/Lk8faPtBptPizvcUw
-						DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-						AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIC
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQRMA+CDWlkcC5sbWMu
-						YWMudWswDQYJKoZIhvcNAQEFBQADggEBABsF25GfLllyt4c1UAjQWdR0nPerYNlV
-						EJ9xzPMJ5euw4U1CMjNBgmcFMSmiFO86QMjDCiFGO087LgHnSFqMSuI34FJUqWmL
-						eU/Nyks3DR/+IZ9NHeQmQxP7ttRVZLqBwWm5k31d+Ch/rgPrmsmL4X2L2o0pSQJ5
-						pJHYb3Q4TsFbreKBs8Bq7zeGKtMAoiZrjhP9QkXveWV590I9Hj6Z6Wpk9mcBN1Xx
-						EFiUYc67MpmwjkobQXpBBHhdZDq85pddff4kqd/rgjNbAWaBMZ3Db22msPvZkEcw
-						YplNVj4iVlAZp/HFmJURCXZDpHI10D7HTYsUQxZq3Ow+kCXXn2MCu9g=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAPgRF90SkOfrpvO6fGRYgI1fbQGVMA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMMDWlkcC5sbWMuYWMudWswHhcNMTYwMTI3MTY1MzI1WhcN
-						MzYwMTI3MTY1MzI1WjAYMRYwFAYDVQQDDA1pZHAubG1jLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkUGshyWkRQtm/uK0j7jEkw70Es3ZGuHS
-						ihlGpm4nX9H7M/jrAMFNSOsZO1LHYe6m0FZlahn46c8vygU4VSrwwf+Kpxi4TYDK
-						IeON0WQ/vsGp/0NwfzSaaLU+Os02ZDYLdqnvIh27jytp5rDDnBnpxhqgKNc9zjFn
-						i1C4lF3nNiK8XHOm7QJHdYhRBeNbiuRADbhImQdsiisYa7gLpQPTwmLHqtbead5+
-						K30Q1IndesNEQ01s6vzkjo6fddFXYXEOZ7zJDDuinHZZbpNArxYqwdo0+OVP0ylB
-						29NjSZOLNEr2Nb9swyi1HmxeNOkbLC3ev8YOpqOLRH0imkq/gUC7bwIDAQABo2Ew
-						XzAdBgNVHQ4EFgQU/kzETxpCb/KwxtmH7ITaJmenc3MwPgYDVR0RBDcwNYINaWRw
-						LmxtYy5hYy51a4YkaHR0cHM6Ly9pZHAubG1jLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBUk3RzG3TzK8qGS9v4HS70KnFXh1z3HhSIym87
-						CJWIzcLXiqg5+lqcDVgHZ3n4QGtPIjUEaAMr8XnoyBrNbkD7AJQMr5COvlEkDvh6
-						fNWhvR92+m4N0Yo2enGNcTIvunXeC5Shw6uNrqzulqyb+l/I2DzzueztiwRBuc3F
-						uvRl5+UvWUQ1dHbT4Ad06LEe/fz2GijBYN3HZOQWUAR/uO0l33U/F/A4SmaC0rJa
-						Nkdxh/uOkDan5WM/AE5Fe2CouZrHItuY8riu+fWjyGiznIfBoHDTiprbE7NDgd6g
-						nqCb0LLQ84AQKuxaMFLRtqgD4cK5zggpl8SLoPw/IdTulbB8
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lmc.ac.uk/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lmc.ac.uk/idp/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">Lancaster and Morecambe College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lancaster and Morecambe College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lmc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Computer Help Desk</GivenName>
-    <EmailAddress>mailto:computerhelpdesk@lmc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>McCaig</SurName>
-    <EmailAddress>mailto:i.mccaig@lmc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
deleted file mode 100644
index 2c477880..00000000
--- a/swamid-interfederations-2.0/idp.lnu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lnu.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">lnu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Linnéuniversitetet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linnæus University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Linnéuniversitetet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Linnæus University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://lnu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://lnu.se/?l=en</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">lnu linné linnæus linne linnaeus linneuniversitetet linnaeus+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">lnu linné linnæus linne linnaeus linneuniversitetet linnaeus+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>lnu.se</mdui:DomainHint>
-        <mdui:IPHint>194.47.64.0/18</mdui:IPHint>
-        <mdui:IPHint>194.47.160.0/19</mdui:IPHint>
-        <mdui:IPHint>194.47.192.0/20</mdui:IPHint>
-        <mdui:GeolocationHint>geo:56.6661,16.3484</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:56.8546,14.8304</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEmzCCA4OgAwIBAgILAQAAAAABJCUIvfswDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
-MTAwNTEzMzEwNVoXDTEyMTAwNTEzMzEwNVowTDELMAkGA1UEBhMCU0UxGzAZBgNV
-BAoTEkhvZ3Nrb2xhbiBpIEthbG1hcjELMAkGA1UECxMCSVQxEzARBgNVBAMTCmlk
-cC5sbnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRORVY50+Y
-2rmvFJS4HSE3EZKXb0UpVj2CfW9D4Vlww78CiqV0KV8HW53XHYlOUK7S+I94adaG
-XoXq19HjqjRi8979qfqzKwICRlkVFBnWkY7N5vo//pStClwdTNv+OihlDY+IA9HN
-QXrWjWTzHCbRguYBEmR0gp7l4tlqILkOCCx1yT5uia4EiJvrSFoIV/iYTQBLaGkc
-ZdO109GqUx5UJB5XxgUoT0k0rOgg1OHsOvkNGOV4/HzkwWUGIaJy462LlLBcmlXg
-IHfDCMH6lg9pBLig4nDlM2W0KzvMID7zagxFJG+K3eMjdkoK1mK12TTz24bifDpf
-XPnbSRKpkLYpAgMBAAGjggFpMIIBZTBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4
-BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5
-L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgcl
-N8lCSlt2d1DhMB0GA1UdDgQWBBQCNc1rrFMLNldAEde83Hr98intIzA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFs
-LmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUu
-Z2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwFQYDVR0RBA4wDIIKaWRwLmxudS5zZTANBgkq
-hkiG9w0BAQUFAAOCAQEAkvJr6ePi1/sSyKtaf1xdOGwde1AteooA0Z9CxG6Ddz2v
-fPbpffm08gnhXr8T2zFnjZN6r1ac3kBFSKQRWOfJiLWwjmJ6wbRYCVDjeTN++Tdf
-IZVsj7l5uyGfM2FjKwRd79Qy33KOb4KtcwgkUs6yqScb0Eeew9q+flkJItaEloaL
-nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
-091ewSnuK+fccVratYgDd4EX3J6uZQnICjIAJ9e44Ab1WhBPQ0Aa+W/52qjbT4yK
-1qXbJLIBEw2yRiL7ayAgirIbuJUR/7+zQVxYX9NyJw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lnu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lnu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lnu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lnu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lnu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lnu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lnu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEmzCCA4OgAwIBAgILAQAAAAABJCUIvfswDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
-MTAwNTEzMzEwNVoXDTEyMTAwNTEzMzEwNVowTDELMAkGA1UEBhMCU0UxGzAZBgNV
-BAoTEkhvZ3Nrb2xhbiBpIEthbG1hcjELMAkGA1UECxMCSVQxEzARBgNVBAMTCmlk
-cC5sbnUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRORVY50+Y
-2rmvFJS4HSE3EZKXb0UpVj2CfW9D4Vlww78CiqV0KV8HW53XHYlOUK7S+I94adaG
-XoXq19HjqjRi8979qfqzKwICRlkVFBnWkY7N5vo//pStClwdTNv+OihlDY+IA9HN
-QXrWjWTzHCbRguYBEmR0gp7l4tlqILkOCCx1yT5uia4EiJvrSFoIV/iYTQBLaGkc
-ZdO109GqUx5UJB5XxgUoT0k0rOgg1OHsOvkNGOV4/HzkwWUGIaJy462LlLBcmlXg
-IHfDCMH6lg9pBLig4nDlM2W0KzvMID7zagxFJG+K3eMjdkoK1mK12TTz24bifDpf
-XPnbSRKpkLYpAgMBAAGjggFpMIIBZTBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4
-BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5
-L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgcl
-N8lCSlt2d1DhMB0GA1UdDgQWBBQCNc1rrFMLNldAEde83Hr98intIzA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFs
-LmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUu
-Z2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwFQYDVR0RBA4wDIIKaWRwLmxudS5zZTANBgkq
-hkiG9w0BAQUFAAOCAQEAkvJr6ePi1/sSyKtaf1xdOGwde1AteooA0Z9CxG6Ddz2v
-fPbpffm08gnhXr8T2zFnjZN6r1ac3kBFSKQRWOfJiLWwjmJ6wbRYCVDjeTN++Tdf
-IZVsj7l5uyGfM2FjKwRd79Qy33KOb4KtcwgkUs6yqScb0Eeew9q+flkJItaEloaL
-nsANXWIYSHmsKeMX/1M+TqMOmUCOExgqTr4yHou54m2SdxcMGJgJp2jcmdF6gbjo
-091ewSnuK+fccVratYgDd4EX3J6uZQnICjIAJ9e44Ab1WhBPQ0Aa+W/52qjbT4yK
-1qXbJLIBEw2yRiL7ayAgirIbuJUR/7+zQVxYX9NyJw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lnu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lnu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LNU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Linnéuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Linnæus University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lnu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Linnæus University</md:Company>
-    <md:EmailAddress>mailto:it.idp@lnu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.london.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.london.ac.uk-shibboleth.xml
deleted file mode 100644
index 1df49467..00000000
--- a/swamid-interfederations-2.0/idp.london.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://idp.london.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for University of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">london.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of London</mdui:DisplayName>
-        <mdui:Logo height="75" width="239">https://idp.london.ac.uk/images/uol-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAJCgNzs/ToqPMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGlkcC5sb25kb24uYWMudWswHhcNMTIwNjIxMTMyODU4WhcNMjIwNjE5MTMy
-						ODU4WjAbMRkwFwYDVQQDExBpZHAubG9uZG9uLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA1LZ7Lmg5HanDG+ZqOnVenp96NaSrrj6ZFWMy9Vlj
-						1E37wy5ooUifd0ICIecUc6FDM7btoMuhRn4YWec7n2purs2O8p9LD11SthO+lwZO
-						qD6F2VzRYuV9KaaaganyoIgbJAt+UowXepcyZJy+wdmLu4neoBuoIfnigoCLnb+9
-						NkArvT91kJvFmKMWXEW9L9rO8vnsJRMcl9WU7VftLXUY4pXLm4C4QdpocFv8J2O1
-						2PIigtSKb4uUulaZpUZ3HfkzMqmkBB7RH1XZVR3l4NmmVs/82knDGv9BOr3hNWeq
-						/2HjRB8z2r2S/oDJ/20Ka8W+jkqCAbkFhxva6F/fDoB/BwIDAQABoz4wPDAbBgNV
-						HREEFDASghBpZHAubG9uZG9uLmFjLnVrMB0GA1UdDgQWBBS8mlo8ov/oCSegN5ZL
-						E7HMjHcdNzANBgkqhkiG9w0BAQUFAAOCAQEAP4E7FG9dDRTYo/w+s4qziV7Vh3IH
-						RYHPfTogu8x2ORmAuSlE6VlFSL5HgTUQcT/JQgAdVYErdGxj7BKTIu+JgwzWJI6W
-						Zh/tb3u2/4kNMGC84UuplJ1XCkltdaKn3Z3rYbowBM8lXrEckfvucE56e+MKNdjx
-						SX9iUs1YEIWsSFoZzjRfEoZi7+bVZ45o5dZWWyJc3wFzke3AjuIBmccAvbA8g6/S
-						ni0aehQMWN4NdxrC/1Q36n95Krbq7dzTNFrpf1nL/egN6rmgCGzyT/GxPfbi/Nvf
-						1aev0Vum2CXcvkJbLl0J2H59qh/IBKgxDIIUItznpVWoi5HDxGWmCNMnUQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.london.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.london.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.london.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.london.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.london.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.london.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">london.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAJCgNzs/ToqPMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGlkcC5sb25kb24uYWMudWswHhcNMTIwNjIxMTMyODU4WhcNMjIwNjE5MTMy
-						ODU4WjAbMRkwFwYDVQQDExBpZHAubG9uZG9uLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA1LZ7Lmg5HanDG+ZqOnVenp96NaSrrj6ZFWMy9Vlj
-						1E37wy5ooUifd0ICIecUc6FDM7btoMuhRn4YWec7n2purs2O8p9LD11SthO+lwZO
-						qD6F2VzRYuV9KaaaganyoIgbJAt+UowXepcyZJy+wdmLu4neoBuoIfnigoCLnb+9
-						NkArvT91kJvFmKMWXEW9L9rO8vnsJRMcl9WU7VftLXUY4pXLm4C4QdpocFv8J2O1
-						2PIigtSKb4uUulaZpUZ3HfkzMqmkBB7RH1XZVR3l4NmmVs/82knDGv9BOr3hNWeq
-						/2HjRB8z2r2S/oDJ/20Ka8W+jkqCAbkFhxva6F/fDoB/BwIDAQABoz4wPDAbBgNV
-						HREEFDASghBpZHAubG9uZG9uLmFjLnVrMB0GA1UdDgQWBBS8mlo8ov/oCSegN5ZL
-						E7HMjHcdNzANBgkqhkiG9w0BAQUFAAOCAQEAP4E7FG9dDRTYo/w+s4qziV7Vh3IH
-						RYHPfTogu8x2ORmAuSlE6VlFSL5HgTUQcT/JQgAdVYErdGxj7BKTIu+JgwzWJI6W
-						Zh/tb3u2/4kNMGC84UuplJ1XCkltdaKn3Z3rYbowBM8lXrEckfvucE56e+MKNdjx
-						SX9iUs1YEIWsSFoZzjRfEoZi7+bVZ45o5dZWWyJc3wFzke3AjuIBmccAvbA8g6/S
-						ni0aehQMWN4NdxrC/1Q36n95Krbq7dzTNFrpf1nL/egN6rmgCGzyT/GxPfbi/Nvf
-						1aev0Vum2CXcvkJbLl0J2H59qh/IBKgxDIIUItznpVWoi5HDxGWmCNMnUQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.london.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.london.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 London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.london.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Hans</GivenName>
-    <SurName>Litteck</SurName>
-    <EmailAddress>mailto:h.litteck@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hans</GivenName>
-    <SurName>Litteck</SurName>
-    <EmailAddress>mailto:h.litteck@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.londonmet.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.londonmet.ac.uk-entity.xml
deleted file mode 100644
index 53ff72d0..00000000
--- a/swamid-interfederations-2.0/idp.londonmet.ac.uk-entity.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.londonmet.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for London Metropolitan University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">londonmet.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUDHdfCxkdKbK8wHhVtq9PRTUWSm0wDQYJKoZIhvcNAQEF
-						BQAwHjEcMBoGA1UEAxMTaWRwLmxvbmRvbm1ldC5hYy51azAeFw0xMDA4MjYxNTA3
-						NDZaFw0zMDA4MjYxNTA3NDZaMB4xHDAaBgNVBAMTE2lkcC5sb25kb25tZXQuYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCR+B1vhlwrPAclk8E8
-						caI6LAji53lGsQxavp7cQoBl7zmZq8V7vH+MkgT+uapudGHd18RBAeUETvsYnD7V
-						+hzefC6B77OfzFuO1WRWsKrUQg+V21Q1kgxPZZTFoJEEjogCOhkmGFy+hpyTljmD
-						ykP9wxq8nT6Oow0aQy987spH1+E1dd4F6GCLphhs0UrwGzAAkC/k5rX9dfMQ8TS0
-						uyj7bxG8cT3wvjbDtpQ1sjd70wm3qNSgF/Hsj+GpXP8L7J/mBdOUsqIFW8TSfFxT
-						4zIBkDyAp1k2zDu/iIN5K+luD5KKB7ReYuEDLYxBbjgaMqqb2G3J1A3Bfhx140O7
-						q59hAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkcC5sb25kb25tZXQuYWMudWuGKmh0
-						dHBzOi8vaWRwLmxvbmRvbm1ldC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-						FgQUVZtYAu6CRSMuMvOOlHw1d6h0MrAwDQYJKoZIhvcNAQEFBQADggEBAGc6MFMQ
-						Q2A8YhaN13qv5pb3BP580s3mmw0kLgbwM9/tirmmIIjazYjHVUcz7IJugVy13siE
-						MFDc0dxKK/9ExXHYS1qvGJPEoMsmzliUBOV6yIesRHw39hK9vUbKV5sb8ahok9Qc
-						DMo2Oi6eF88nwgd3Gee6F973E5g2UEcJGDfN/KTK/b5kmxXtaR/+QGjz1Vzmtm+t
-						nTG9ggzmeCJvWcmldZSYOKchXZPTvYi6n0coTblLIYzo30miElRLEajmiMLxR9xg
-						dl+2HVg3VDLg4o4BRGZnC5Ip8nX8UyDgdiyzeBtFk5pXSXmyDl4ck421skd7CKOW
-						O+pzHAT8SmUOATI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.londonmet.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.londonmet.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.londonmet.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.londonmet.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.londonmet.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.londonmet.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">londonmet.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUDHdfCxkdKbK8wHhVtq9PRTUWSm0wDQYJKoZIhvcNAQEF
-						BQAwHjEcMBoGA1UEAxMTaWRwLmxvbmRvbm1ldC5hYy51azAeFw0xMDA4MjYxNTA3
-						NDZaFw0zMDA4MjYxNTA3NDZaMB4xHDAaBgNVBAMTE2lkcC5sb25kb25tZXQuYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCR+B1vhlwrPAclk8E8
-						caI6LAji53lGsQxavp7cQoBl7zmZq8V7vH+MkgT+uapudGHd18RBAeUETvsYnD7V
-						+hzefC6B77OfzFuO1WRWsKrUQg+V21Q1kgxPZZTFoJEEjogCOhkmGFy+hpyTljmD
-						ykP9wxq8nT6Oow0aQy987spH1+E1dd4F6GCLphhs0UrwGzAAkC/k5rX9dfMQ8TS0
-						uyj7bxG8cT3wvjbDtpQ1sjd70wm3qNSgF/Hsj+GpXP8L7J/mBdOUsqIFW8TSfFxT
-						4zIBkDyAp1k2zDu/iIN5K+luD5KKB7ReYuEDLYxBbjgaMqqb2G3J1A3Bfhx140O7
-						q59hAgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkcC5sb25kb25tZXQuYWMudWuGKmh0
-						dHBzOi8vaWRwLmxvbmRvbm1ldC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-						FgQUVZtYAu6CRSMuMvOOlHw1d6h0MrAwDQYJKoZIhvcNAQEFBQADggEBAGc6MFMQ
-						Q2A8YhaN13qv5pb3BP580s3mmw0kLgbwM9/tirmmIIjazYjHVUcz7IJugVy13siE
-						MFDc0dxKK/9ExXHYS1qvGJPEoMsmzliUBOV6yIesRHw39hK9vUbKV5sb8ahok9Qc
-						DMo2Oi6eF88nwgd3Gee6F973E5g2UEcJGDfN/KTK/b5kmxXtaR/+QGjz1Vzmtm+t
-						nTG9ggzmeCJvWcmldZSYOKchXZPTvYi6n0coTblLIYzo30miElRLEajmiMLxR9xg
-						dl+2HVg3VDLg4o4BRGZnC5Ip8nX8UyDgdiyzeBtFk5pXSXmyDl4ck421skd7CKOW
-						O+pzHAT8SmUOATI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.londonmet.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.londonmet.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">London Metropolitan University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London Metropolitan University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.londonmet.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rui</GivenName>
-    <SurName>Zong</SurName>
-    <EmailAddress>mailto:r.zong@londonmet.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rui</GivenName>
-    <SurName>Zong</SurName>
-    <EmailAddress>mailto:r.zong@londonmet.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.longleypark.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.longleypark.ac.uk-shibboleth.xml
deleted file mode 100644
index 88306481..00000000
--- a/swamid-interfederations-2.0/idp.longleypark.ac.uk-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.longleypark.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Longley Park Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">longleypark.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/longleypark.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/longleypark.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Longley Park Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.longleypark.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.longroad.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.longroad.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 5838a1ff..00000000
--- a/swamid-interfederations-2.0/idp.longroad.ac.uk-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.longroad.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Long Road Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">longroad.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Long Road Sixth Form College</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://idp.longroad.ac.uk/idp/images/idp-logo-80x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.longroad.ac.uk/idp/images/idp-icon-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUCy8kggY2RBllD2ewV21UpOU1mlkwDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSaWRwLmxvbmdyb2FkLmFjLnVrMB4XDTExMDUxMzA4MTI0
-						M1oXDTMxMDUxMzA4MTI0M1owHTEbMBkGA1UEAxMSaWRwLmxvbmdyb2FkLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgcmsqS7ONbUBSlCFn4+5
-						ndvJvVgknMjZVZZulScLs3K1R7cJifMh/njFVDxdZ2fFBFwstUmUljjiM/GgBPGj
-						GMVEysJRzOiuTVaON3t/hE918o6DDZpkIcAC7JRuo9OL21K70WsJV9J1dqmx9t5n
-						e+rj/s/w0HB3GOR/3J2B9xbkX16B7wXBBZILhRcFy4nd1wFOCmurSC20o6iUwBsH
-						9lEVQlx/Es4o9sa8+U+5qtnQGDEiy2l9R7Em1lrpAnFpqM6n7C9kh4sMsIdGRFy5
-						0Q/4hSMRGNWyExP29Ipa0A6r8bfSlnN4lMo1QZMjBXS1NNHnVEpnafmO+CwyWL20
-						bwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAubG9uZ3JvYWQuYWMudWuGKWh0dHBz
-						Oi8vaWRwLmxvbmdyb2FkLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQe
-						dOgyl13wsMnik57R8aImPj76cjANBgkqhkiG9w0BAQUFAAOCAQEAEz5uJOOUmPsn
-						7Mq0h2FY8mDrwmVFTNismazFxmCEykDZON1baS6wnKjQC22w/MWJ8gq0NEwY/If2
-						fg3ZL7L6eEKWPHf10HNi1HdlgdQ6JWf5I/CLnccrQdwAfeeJ4O/1qtscXpylqp5y
-						AesJcymZxwcqQ+rWxFvxXKhk4RNabImkitFqxngqOfEaML+hL0OMlsO9GJbUgUPn
-						KrvGzcxIUT2L7hWBAIkM3rhBUkcEXLJzVcLPXW122Wcjr5gk6/il9cyveqANRbiB
-						X/xSXhUkBYgRzeNd4EaiR4zZLepncxkcIZF+To/nrXNoghw9aQny7LYKL9dOeOIT
-						gyi6viaAxA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.longroad.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.longroad.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.longroad.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.longroad.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.longroad.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.longroad.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">longroad.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUCy8kggY2RBllD2ewV21UpOU1mlkwDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSaWRwLmxvbmdyb2FkLmFjLnVrMB4XDTExMDUxMzA4MTI0
-						M1oXDTMxMDUxMzA4MTI0M1owHTEbMBkGA1UEAxMSaWRwLmxvbmdyb2FkLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgcmsqS7ONbUBSlCFn4+5
-						ndvJvVgknMjZVZZulScLs3K1R7cJifMh/njFVDxdZ2fFBFwstUmUljjiM/GgBPGj
-						GMVEysJRzOiuTVaON3t/hE918o6DDZpkIcAC7JRuo9OL21K70WsJV9J1dqmx9t5n
-						e+rj/s/w0HB3GOR/3J2B9xbkX16B7wXBBZILhRcFy4nd1wFOCmurSC20o6iUwBsH
-						9lEVQlx/Es4o9sa8+U+5qtnQGDEiy2l9R7Em1lrpAnFpqM6n7C9kh4sMsIdGRFy5
-						0Q/4hSMRGNWyExP29Ipa0A6r8bfSlnN4lMo1QZMjBXS1NNHnVEpnafmO+CwyWL20
-						bwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAubG9uZ3JvYWQuYWMudWuGKWh0dHBz
-						Oi8vaWRwLmxvbmdyb2FkLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQe
-						dOgyl13wsMnik57R8aImPj76cjANBgkqhkiG9w0BAQUFAAOCAQEAEz5uJOOUmPsn
-						7Mq0h2FY8mDrwmVFTNismazFxmCEykDZON1baS6wnKjQC22w/MWJ8gq0NEwY/If2
-						fg3ZL7L6eEKWPHf10HNi1HdlgdQ6JWf5I/CLnccrQdwAfeeJ4O/1qtscXpylqp5y
-						AesJcymZxwcqQ+rWxFvxXKhk4RNabImkitFqxngqOfEaML+hL0OMlsO9GJbUgUPn
-						KrvGzcxIUT2L7hWBAIkM3rhBUkcEXLJzVcLPXW122Wcjr5gk6/il9cyveqANRbiB
-						X/xSXhUkBYgRzeNd4EaiR4zZLepncxkcIZF+To/nrXNoghw9aQny7LYKL9dOeOIT
-						gyi6viaAxA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.longroad.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.longroad.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">Long Road Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Long Road Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.longroad.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>CSD Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@longroad.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>CSD Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@longroad.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.longsight.com-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.longsight.com-idp-shibboleth.xml
deleted file mode 100644
index 02c731d2..00000000
--- a/swamid-interfederations-2.0/idp.longsight.com-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://idp.longsight.com/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.longsight.com/contact" 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">longsight.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Longsight</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Longsight IDP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.longsight.com/incommon/pop.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.longsight.com/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="50" width="252" xml:lang="en">https://idp.longsight.com/idp/images/logo.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>
-MIIDLzCCAhegAwIBAgIUGFtcG0YkyyHEvkX3w9yCDcJ2iT4wDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLmxvbmdzaWdodC5jb20wHhcNMTEwOTIyMTc0MTQy
-WhcNMzEwOTIyMTc0MTQyWjAcMRowGAYDVQQDExFpZHAubG9uZ3NpZ2h0LmNvbTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKv+8UKztZW4uA6+du5R5VTF
-llBohQPQir/AZuNLrPhJA7O9EhyiD7VTF9Priybpnu/zZiyLfDwl05R2jGjLjzOD
-QUVKeKhWTtrgAssBGlPR9DWHufoNpKObUSlUsH7tAlKGUAhv6vWgkNGMdJSwVfA3
-XKdkrAVbDWN5YlTUswF7o6Utmwmgf/oUv4RSLTBxnhgF17pRSuqo39bf83iy0Ciy
-apyIoywOQehUBUOM2trTP60Sn5nXtM/DzxCehXuECMPzXxSJ55GNV7cbTcH9kpDw
-djjjEIbD4qytN+jb8n+vjj4sI3ZFey7tBqhROZzUpbndoNw/jZdbN8VfATvV4lMC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLmxvbmdzaWdodC5jb22GKGh0dHBzOi8v
-aWRwLmxvbmdzaWdodC5jb20vaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA619VET
-ASmjLmh391vQ6IhCHuZpMA0GCSqGSIb3DQEBBQUAA4IBAQBTISKOsEdtL/HymAJc
-K73dOjQLFcHAPs1i8MI2dZWDHRjv48lUv5MBxgYjUUz6nvhuLvlGhn2qByICtuf9
-+pMqBdeA+SeExEKFiBAf6/MKWKq+nuOQYq1EacLuEkYGi2WzDuVHE+b0oGV3DL5Q
-OjGQoTG2L8D0eHyxlyGQ+byKJWKUA6hGr2eHIKKMEpUULCTQHFq+POG0H9cXg7KC
-IM9eGjNvKq3WBxpa9x9tEO8wVAphoJ8UG9xKZbqdU2OlNAc3Crn4t5PrcDIcCBtJ
-PM93Xs8kLba8ndrnn7sfuMPPPQmjAYnX1TAQ/w2EIWaM5N0n3zvRRRdrKrenC09T
-wtpJ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.longsight.com/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.longsight.com/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.longsight.com/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.longsight.com/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.longsight.com/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">longsight.com</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUGFtcG0YkyyHEvkX3w9yCDcJ2iT4wDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLmxvbmdzaWdodC5jb20wHhcNMTEwOTIyMTc0MTQy
-WhcNMzEwOTIyMTc0MTQyWjAcMRowGAYDVQQDExFpZHAubG9uZ3NpZ2h0LmNvbTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKv+8UKztZW4uA6+du5R5VTF
-llBohQPQir/AZuNLrPhJA7O9EhyiD7VTF9Priybpnu/zZiyLfDwl05R2jGjLjzOD
-QUVKeKhWTtrgAssBGlPR9DWHufoNpKObUSlUsH7tAlKGUAhv6vWgkNGMdJSwVfA3
-XKdkrAVbDWN5YlTUswF7o6Utmwmgf/oUv4RSLTBxnhgF17pRSuqo39bf83iy0Ciy
-apyIoywOQehUBUOM2trTP60Sn5nXtM/DzxCehXuECMPzXxSJ55GNV7cbTcH9kpDw
-djjjEIbD4qytN+jb8n+vjj4sI3ZFey7tBqhROZzUpbndoNw/jZdbN8VfATvV4lMC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLmxvbmdzaWdodC5jb22GKGh0dHBzOi8v
-aWRwLmxvbmdzaWdodC5jb20vaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA619VET
-ASmjLmh391vQ6IhCHuZpMA0GCSqGSIb3DQEBBQUAA4IBAQBTISKOsEdtL/HymAJc
-K73dOjQLFcHAPs1i8MI2dZWDHRjv48lUv5MBxgYjUUz6nvhuLvlGhn2qByICtuf9
-+pMqBdeA+SeExEKFiBAf6/MKWKq+nuOQYq1EacLuEkYGi2WzDuVHE+b0oGV3DL5Q
-OjGQoTG2L8D0eHyxlyGQ+byKJWKUA6hGr2eHIKKMEpUULCTQHFq+POG0H9cXg7KC
-IM9eGjNvKq3WBxpa9x9tEO8wVAphoJ8UG9xKZbqdU2OlNAc3Crn4t5PrcDIcCBtJ
-PM93Xs8kLba8ndrnn7sfuMPPPQmjAYnX1TAQ/w2EIWaM5N0n3zvRRRdrKrenC09T
-wtpJ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.longsight.com/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Longsight Group LLC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Longsight</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.longsight.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sam Ottenhoff</md:GivenName>
-    <md:EmailAddress>sam@longsight.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Longsight Support</md:GivenName>
-    <md:EmailAddress>support@longsight.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Longsight Operations</md:GivenName>
-    <md:EmailAddress>operations@longsight.com</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 86d57fee..00000000
--- a/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lrz.de/idp/shibboleth">
-  <md: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>
-  </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">lrz.de</shibmd: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lrz.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lrz.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de/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">lrz.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de: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:persistent</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">e38</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e38</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Leibniz-Rechenzentrum der Bayerischen Akademie der Wissenschaften</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ) of the Bavarian Academy of Sciences and Humanities</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.lrz.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.lrz.de/english/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ralf</md:GivenName>
-    <md:SurName>Ebner</md:SurName>
-    <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ralf</md:GivenName>
-    <md:SurName>Ebner</md:SurName>
-    <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Ralf</md:GivenName>
-    <md:SurName>Ebner</md:SurName>
-    <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 80da0cfe..00000000
--- a/swamid-interfederations-2.0/idp.lrz.de.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://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="108" width="100">https://idp.lrz.de/idp/images/lrzlogo.jpg</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,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsDCCBJigAwIBAgIEDyCYejANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMTE2MDkyNzA3WhcNMTQxMTE1MDkyNzA3WjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1scnppZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHsxzqhKyx3Slkyzt4c04/jX
-Q0GUPRaNqRm+oxbsrZg3kAAT0yCYrmXhxzeXobLiHRk5dmrsa/sXXRvxJVPGMAJu
-A1MYKmdiGkDjLx2qum7nL5zBqg77bBLd/sLjPE+JKKBY0JUXY+jSOkOCw7ajYVBS
-M6otuG29Ur0AC2S46PS/2xCVQ43q1hPjBpzOjTmEYzXpDHtzQ/0iN8T4t2h59nOh
-aFdzLZeVcW0/8RBbUZ7ncWNgpFjrb8/jBgO4t56i6oG7O8ov1Fg/FCjs5JkxtjSu
-wPJhf9hn5l/hzD5uvmSQk6FGYEFgcZDwQ+M+9IJYYogyT0aLrXUDsEExfVMQJwID
-AQABo4ICKTCCAiUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ67fNreuuuqZsQxbfwYUDAlgnH
-uzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjCBnQYDVR0RBIGVMIGS
-gR96YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1scnppZHAubHJ6LmRl
-ghZscnppZHAubHJ6LW11ZW5jaGVuLmRlgg5scnppZHAyLmxyei5kZYIXbHJ6aWRw
-Mi5scnotbXVlbmNoZW4uZGWCCmlkcC5scnouZGWCE2lkcC5scnotbXVlbmNoZW4u
-ZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnot
-Y2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/
-BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
-ggEBAGI1WoP7gaN/ncu/zm0JUuTccqL86LCd4g3P9vTP9a4VxWNlOSQg4K7yMRfU
-qX8ucTKUmUKeDpnvwJ9YlWaDqvOYzGLF7fZ6Rbz4W/si2zUiwMolB3CIO/4MXfUM
-/bm8b5lA74/1tZpWmUvxEpc1H0TYqtebUCy8YyRZUiMIJiFfz+z4F1wOee4oX6Cg
-zr9vr1VW+jum9tjzpTKyBUL215I7etftMaPCJG5de3pPHMarpGXm2ceLxxop+p9r
-kmP6mFCnCpJB25WedJapbI4BclKNVU/NseS+NuY2TB0bi2Q35BbvuutJ8gG4MRSD
-t0kVopfGsEIT142DrBwPmGvPGmU=
-</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,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsDCCBJigAwIBAgIEDyCYejANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMTE2MDkyNzA3WhcNMTQxMTE1MDkyNzA3WjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1scnppZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHsxzqhKyx3Slkyzt4c04/jX
-Q0GUPRaNqRm+oxbsrZg3kAAT0yCYrmXhxzeXobLiHRk5dmrsa/sXXRvxJVPGMAJu
-A1MYKmdiGkDjLx2qum7nL5zBqg77bBLd/sLjPE+JKKBY0JUXY+jSOkOCw7ajYVBS
-M6otuG29Ur0AC2S46PS/2xCVQ43q1hPjBpzOjTmEYzXpDHtzQ/0iN8T4t2h59nOh
-aFdzLZeVcW0/8RBbUZ7ncWNgpFjrb8/jBgO4t56i6oG7O8ov1Fg/FCjs5JkxtjSu
-wPJhf9hn5l/hzD5uvmSQk6FGYEFgcZDwQ+M+9IJYYogyT0aLrXUDsEExfVMQJwID
-AQABo4ICKTCCAiUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ67fNreuuuqZsQxbfwYUDAlgnH
-uzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjCBnQYDVR0RBIGVMIGS
-gR96YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1scnppZHAubHJ6LmRl
-ghZscnppZHAubHJ6LW11ZW5jaGVuLmRlgg5scnppZHAyLmxyei5kZYIXbHJ6aWRw
-Mi5scnotbXVlbmNoZW4uZGWCCmlkcC5scnouZGWCE2lkcC5scnotbXVlbmNoZW4u
-ZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnot
-Y2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/
-BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
-ggEBAGI1WoP7gaN/ncu/zm0JUuTccqL86LCd4g3P9vTP9a4VxWNlOSQg4K7yMRfU
-qX8ucTKUmUKeDpnvwJ9YlWaDqvOYzGLF7fZ6Rbz4W/si2zUiwMolB3CIO/4MXfUM
-/bm8b5lA74/1tZpWmUvxEpc1H0TYqtebUCy8YyRZUiMIJiFfz+z4F1wOee4oX6Cg
-zr9vr1VW+jum9tjzpTKyBUL215I7etftMaPCJG5de3pPHMarpGXm2ceLxxop+p9r
-kmP6mFCnCpJB25WedJapbI4BclKNVU/NseS+NuY2TB0bi2Q35BbvuutJ8gG4MRSD
-t0kVopfGsEIT142DrBwPmGvPGmU=
-</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>
-    <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,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsDCCBJigAwIBAgIEDyCYejANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMTE2MDkyNzA3WhcNMTQxMTE1MDkyNzA3WjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1scnppZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHsxzqhKyx3Slkyzt4c04/jX
-Q0GUPRaNqRm+oxbsrZg3kAAT0yCYrmXhxzeXobLiHRk5dmrsa/sXXRvxJVPGMAJu
-A1MYKmdiGkDjLx2qum7nL5zBqg77bBLd/sLjPE+JKKBY0JUXY+jSOkOCw7ajYVBS
-M6otuG29Ur0AC2S46PS/2xCVQ43q1hPjBpzOjTmEYzXpDHtzQ/0iN8T4t2h59nOh
-aFdzLZeVcW0/8RBbUZ7ncWNgpFjrb8/jBgO4t56i6oG7O8ov1Fg/FCjs5JkxtjSu
-wPJhf9hn5l/hzD5uvmSQk6FGYEFgcZDwQ+M+9IJYYogyT0aLrXUDsEExfVMQJwID
-AQABo4ICKTCCAiUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ67fNreuuuqZsQxbfwYUDAlgnH
-uzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjCBnQYDVR0RBIGVMIGS
-gR96YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1scnppZHAubHJ6LmRl
-ghZscnppZHAubHJ6LW11ZW5jaGVuLmRlgg5scnppZHAyLmxyei5kZYIXbHJ6aWRw
-Mi5scnotbXVlbmNoZW4uZGWCCmlkcC5scnouZGWCE2lkcC5scnotbXVlbmNoZW4u
-ZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnot
-Y2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/
-BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
-ggEBAGI1WoP7gaN/ncu/zm0JUuTccqL86LCd4g3P9vTP9a4VxWNlOSQg4K7yMRfU
-qX8ucTKUmUKeDpnvwJ9YlWaDqvOYzGLF7fZ6Rbz4W/si2zUiwMolB3CIO/4MXfUM
-/bm8b5lA74/1tZpWmUvxEpc1H0TYqtebUCy8YyRZUiMIJiFfz+z4F1wOee4oX6Cg
-zr9vr1VW+jum9tjzpTKyBUL215I7etftMaPCJG5de3pPHMarpGXm2ceLxxop+p9r
-kmP6mFCnCpJB25WedJapbI4BclKNVU/NseS+NuY2TB0bi2Q35BbvuutJ8gG4MRSD
-t0kVopfGsEIT142DrBwPmGvPGmU=
-</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,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsDCCBJigAwIBAgIEDyCYejANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMTE2MDkyNzA3WhcNMTQxMTE1MDkyNzA3WjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1scnppZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHsxzqhKyx3Slkyzt4c04/jX
-Q0GUPRaNqRm+oxbsrZg3kAAT0yCYrmXhxzeXobLiHRk5dmrsa/sXXRvxJVPGMAJu
-A1MYKmdiGkDjLx2qum7nL5zBqg77bBLd/sLjPE+JKKBY0JUXY+jSOkOCw7ajYVBS
-M6otuG29Ur0AC2S46PS/2xCVQ43q1hPjBpzOjTmEYzXpDHtzQ/0iN8T4t2h59nOh
-aFdzLZeVcW0/8RBbUZ7ncWNgpFjrb8/jBgO4t56i6oG7O8ov1Fg/FCjs5JkxtjSu
-wPJhf9hn5l/hzD5uvmSQk6FGYEFgcZDwQ+M+9IJYYogyT0aLrXUDsEExfVMQJwID
-AQABo4ICKTCCAiUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ67fNreuuuqZsQxbfwYUDAlgnH
-uzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjCBnQYDVR0RBIGVMIGS
-gR96YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1scnppZHAubHJ6LmRl
-ghZscnppZHAubHJ6LW11ZW5jaGVuLmRlgg5scnppZHAyLmxyei5kZYIXbHJ6aWRw
-Mi5scnotbXVlbmNoZW4uZGWCCmlkcC5scnouZGWCE2lkcC5scnotbXVlbmNoZW4u
-ZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnot
-Y2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/
-BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
-ggEBAGI1WoP7gaN/ncu/zm0JUuTccqL86LCd4g3P9vTP9a4VxWNlOSQg4K7yMRfU
-qX8ucTKUmUKeDpnvwJ9YlWaDqvOYzGLF7fZ6Rbz4W/si2zUiwMolB3CIO/4MXfUM
-/bm8b5lA74/1tZpWmUvxEpc1H0TYqtebUCy8YyRZUiMIJiFfz+z4F1wOee4oX6Cg
-zr9vr1VW+jum9tjzpTKyBUL215I7etftMaPCJG5de3pPHMarpGXm2ceLxxop+p9r
-kmP6mFCnCpJB25WedJapbI4BclKNVU/NseS+NuY2TB0bi2Q35BbvuutJ8gG4MRSD
-t0kVopfGsEIT142DrBwPmGvPGmU=
-</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>
-  </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-muenchen.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.lse.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lse.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 5bd3ded7..00000000
--- a/swamid-interfederations-2.0/idp.lse.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.lse.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibbboleth Test IdP for the London School of Economics and Political Science.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-06T16:43: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">lse.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAMcU7xA7jz0MTrgM81ujFT/gZtT/MA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMTDWlkcC5sc2UuYWMudWswHhcNMTEwMTI3MTAyMjI5WhcN
-						MzEwMTI3MTAyMjI5WjAYMRYwFAYDVQQDEw1pZHAubHNlLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlEbVYJtb1MiMtwXEx9Yd1M1s7/Nbqq+f
-						kbVrYD3FG/zmlEIfL3rLtt2f6xua8UdbG9FucQrogdxNLVmmSQKEulFmJXO7RorK
-						R0+btAil7XVP06YF0wgOZi2jHZkuatoM8H45Q8WaXfijmcTqBPyIPB3FrscFE/Ax
-						JRWMNWuJ172jImtyWxb438XrLn6aOVowHh2m+12T3wvYmPy0BP5sOtyK0jVPNGww
-						OopeQBvAUH/35rpOY57wdUZOTtGHw9+kbhNmoPJnFcHUYzd2ceIE6ABsowmi1CvV
-						dekaT50917AVQ+eEJ03HhEEuDOEsUPE+a9PXNe984ksY6spErmYiPQIDAQABo2Ew
-						XzA+BgNVHREENzA1gg1pZHAubHNlLmFjLnVrhiRodHRwczovL2lkcC5sc2UuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNPKiYRcER1YftSyU3ApwXhpGiY0
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCGcS5ACz6Hx/2QSMHu0RjHievcqfW86iZ26+PX
-						/XrS9MEl7FTUffx4kNril2hUl3c60QcaJVW0YO/axfD8404RntxUzcXFkCNNb/8J
-						oUKxcXtadsn6fgr+uRorkZdmVpmn5ZdEkENEr/4r61gf60JD+zqOr5+M2/95UwpQ
-						VA9B2QyUbBz7Gv6jTSsT0GPwlOnnSLkLrqu/pSewfJh7CJMJfJC3Op3aTX/MLNS4
-						7fu3YOJMs6pwf9/WCqmBlmaX2HWJrkD5UMduUQq6Yg2MFwjr8UkZ5tNC2XYgDCjC
-						zUEMsrJaVSqkypBftCFqjUaPV5uzH1W7rWzwCZGvC2kWJ90c
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lse.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lse.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.lse.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lse.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lse.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lse.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">lse.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAMcU7xA7jz0MTrgM81ujFT/gZtT/MA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMTDWlkcC5sc2UuYWMudWswHhcNMTEwMTI3MTAyMjI5WhcN
-						MzEwMTI3MTAyMjI5WjAYMRYwFAYDVQQDEw1pZHAubHNlLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlEbVYJtb1MiMtwXEx9Yd1M1s7/Nbqq+f
-						kbVrYD3FG/zmlEIfL3rLtt2f6xua8UdbG9FucQrogdxNLVmmSQKEulFmJXO7RorK
-						R0+btAil7XVP06YF0wgOZi2jHZkuatoM8H45Q8WaXfijmcTqBPyIPB3FrscFE/Ax
-						JRWMNWuJ172jImtyWxb438XrLn6aOVowHh2m+12T3wvYmPy0BP5sOtyK0jVPNGww
-						OopeQBvAUH/35rpOY57wdUZOTtGHw9+kbhNmoPJnFcHUYzd2ceIE6ABsowmi1CvV
-						dekaT50917AVQ+eEJ03HhEEuDOEsUPE+a9PXNe984ksY6spErmYiPQIDAQABo2Ew
-						XzA+BgNVHREENzA1gg1pZHAubHNlLmFjLnVrhiRodHRwczovL2lkcC5sc2UuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNPKiYRcER1YftSyU3ApwXhpGiY0
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCGcS5ACz6Hx/2QSMHu0RjHievcqfW86iZ26+PX
-						/XrS9MEl7FTUffx4kNril2hUl3c60QcaJVW0YO/axfD8404RntxUzcXFkCNNb/8J
-						oUKxcXtadsn6fgr+uRorkZdmVpmn5ZdEkENEr/4r61gf60JD+zqOr5+M2/95UwpQ
-						VA9B2QyUbBz7Gv6jTSsT0GPwlOnnSLkLrqu/pSewfJh7CJMJfJC3Op3aTX/MLNS4
-						7fu3YOJMs6pwf9/WCqmBlmaX2HWJrkD5UMduUQq6Yg2MFwjr8UkZ5tNC2XYgDCjC
-						zUEMsrJaVSqkypBftCFqjUaPV5uzH1W7rWzwCZGvC2kWJ90c
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lse.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lse.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">London School of Economics and Political Science</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London School of Economics: Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lse.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Neil</GivenName>
-    <SurName>Prockter</SurName>
-    <EmailAddress>mailto:n.prockter@lse.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Neil</GivenName>
-    <SurName>Prockter</SurName>
-    <EmailAddress>mailto:n.prockter@lse.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth-xfr.xml b/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth-xfr.xml
deleted file mode 100644
index 85cf76bb..00000000
--- a/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth-xfr.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://idp.lshtm.ac.uk/shibboleth-xfr">
-  <!--
-		This is a "test" Shibboleth IdP for the London School of Hygiene and Tropical Medicine.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">lshtm.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIGMjCCBBqgAwIBAgIJAMDPoGjJOgX6MA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xNzA1BgNV
-						BAoTLkxvbmRvbiBTY2hvb2wgb2YgSHlnaWVuZSBhbmQgVHJvcGljYWwgTWVkaWNp
-						bmUxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRkwFwYDVQQDExBpZHAyLmxzaHRtLmFj
-						LnVrMB4XDTEyMTEyMTEwMDQ0N1oXDTIyMTExOTEwMDQ0N1owgZkxCzAJBgNVBAYT
-						AkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjE3MDUGA1UEChMu
-						TG9uZG9uIFNjaG9vbCBvZiBIeWdpZW5lIGFuZCBUcm9waWNhbCBNZWRpY2luZTEU
-						MBIGA1UECxMLSVQgU2VydmljZXMxGTAXBgNVBAMTEGlkcDIubHNodG0uYWMudWsw
-						ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5wsziZNYSjQ6zZruTNpCa
-						Tg/mA8we3vEAMzb8oNoqfoevqwMop2biprlaJk7E9kVmu1ZO2t6vTPucBfb/Oqyo
-						GzRnKlyVGxfCe/yrQ557z3y99xS5jGzu7kOoInpAp9q6tqrqns1A3OEeJSuJ1MJ8
-						ED053xEiSeL0+jSzkXkZVMCXu2p6kJsW5nT3qhqVrXiaGiB02TAOQMs0mmA8aS1h
-						j0bU5gFxKxazt1WYpFW82bSlSd2fz9pOmGklmW5JZxb4Zw8MFbiRfQ1LPwFgZH6E
-						+WJqdPb5fehXkklll9o4xO64bXlGfaRl0+5QGtbnqpix37QaDuQRi+NLUkA2wR2L
-						/rFJvo6uKsAdTuixfU/gNs0CCqVGi2C0/sQaTsE2Ct8H7BYEmrhqHs4VDzvcDq1L
-						2LqMvc4KEEd/Cp6EavaRKI7Edtu4OFUgAgECfbv0C7oouqSHR6X4ciDFfSWk7i92
-						3h5tMHX3wfUHJR/YI/mvguDo61wjnpbwgeAV4rNLsdBUOs5AQTCPUDAuyMepm81t
-						IQRT/XsNuKv4f9y4ORSpBZ/KspE9P5TklIMDuSvZKS8FZQ5ve4UQeUoer7Bn55ot
-						vFTxRrioFUBsmR/5yAsZLJnSU7z09wv3SG1Lj6O79Q9HoJ5M7rKap3+yFkfFqxSP
-						KH7JJd9yDiYVaA0f1R1VfQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
-						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJTj9
-						QFp335nQW77uAnSfAmeytCowHwYDVR0jBBgwFoAUJTj9QFp335nQW77uAnSfAmey
-						tCowDQYJKoZIhvcNAQEFBQADggIBALR0fEhYAGrXCqw9r2IjsXG0h4Kqv298t7Wd
-						fV5Qal71yD2vqVgZBjyoUt6FwQ0GPKhMc/q7Ooy8lfo8NSvZV983MSyWe519xTJ4
-						vtPJtKHd2WKYacrdRFPZJYjtTR4CwMXtwxsB2xJrpaJa/sSyRHvE4+PuUBYOj42t
-						k6MOk3t1GKfaoYOmJBd2teVym9K5bRqGk6WgnKg+jzPDXJy3+kKvZMZKsv7aYafu
-						m2PFoRJu1Nm+6jjTy33SVH3ZS4oydL+uZWfwKvQEqbLOGdRJTZYlDJR2mz6zISbf
-						1+LjnK1aqDETq+loatD4gntbpwoMTBMceoDVyRmlPkuFDF31lzkwyAlE5yFmhC9q
-						mUNMvsbtYJe546ftf+fyRW/PnZaBRqY1Hkk5lBU4BIgt+gk9jqiAae+DvQ4dikLP
-						DWDef3bPLitQA/e/F5YmYq61L7TeIdIiDtD42y5qUW7x+pMTd042EpmoWL9XbdMe
-						tvHx33GTkXDFqg88t/lPD8nN9evHWcPvUL1YS3AvJJ9u1Ttiq+agvGDxClgqa2i/
-						VZd/+nl8pnTI4n7VsiMMSFnBra1FQFoTwvaAHBotttYutz+jPAo/jQRaD+AqAqj3
-						C+Ar+eubE63of1BjM7tWtOldASsG/Kwoq5dNqCWjqmoL3EbLr1hx65qAaRR0XbtB
-						rDHM7cXn
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.lshtm.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://idp2.lshtm.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.lshtm.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.lshtm.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.lshtm.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">lshtm.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIGMjCCBBqgAwIBAgIJAMDPoGjJOgX6MA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xNzA1BgNV
-						BAoTLkxvbmRvbiBTY2hvb2wgb2YgSHlnaWVuZSBhbmQgVHJvcGljYWwgTWVkaWNp
-						bmUxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRkwFwYDVQQDExBpZHAyLmxzaHRtLmFj
-						LnVrMB4XDTEyMTEyMTEwMDQ0N1oXDTIyMTExOTEwMDQ0N1owgZkxCzAJBgNVBAYT
-						AkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjE3MDUGA1UEChMu
-						TG9uZG9uIFNjaG9vbCBvZiBIeWdpZW5lIGFuZCBUcm9waWNhbCBNZWRpY2luZTEU
-						MBIGA1UECxMLSVQgU2VydmljZXMxGTAXBgNVBAMTEGlkcDIubHNodG0uYWMudWsw
-						ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5wsziZNYSjQ6zZruTNpCa
-						Tg/mA8we3vEAMzb8oNoqfoevqwMop2biprlaJk7E9kVmu1ZO2t6vTPucBfb/Oqyo
-						GzRnKlyVGxfCe/yrQ557z3y99xS5jGzu7kOoInpAp9q6tqrqns1A3OEeJSuJ1MJ8
-						ED053xEiSeL0+jSzkXkZVMCXu2p6kJsW5nT3qhqVrXiaGiB02TAOQMs0mmA8aS1h
-						j0bU5gFxKxazt1WYpFW82bSlSd2fz9pOmGklmW5JZxb4Zw8MFbiRfQ1LPwFgZH6E
-						+WJqdPb5fehXkklll9o4xO64bXlGfaRl0+5QGtbnqpix37QaDuQRi+NLUkA2wR2L
-						/rFJvo6uKsAdTuixfU/gNs0CCqVGi2C0/sQaTsE2Ct8H7BYEmrhqHs4VDzvcDq1L
-						2LqMvc4KEEd/Cp6EavaRKI7Edtu4OFUgAgECfbv0C7oouqSHR6X4ciDFfSWk7i92
-						3h5tMHX3wfUHJR/YI/mvguDo61wjnpbwgeAV4rNLsdBUOs5AQTCPUDAuyMepm81t
-						IQRT/XsNuKv4f9y4ORSpBZ/KspE9P5TklIMDuSvZKS8FZQ5ve4UQeUoer7Bn55ot
-						vFTxRrioFUBsmR/5yAsZLJnSU7z09wv3SG1Lj6O79Q9HoJ5M7rKap3+yFkfFqxSP
-						KH7JJd9yDiYVaA0f1R1VfQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
-						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJTj9
-						QFp335nQW77uAnSfAmeytCowHwYDVR0jBBgwFoAUJTj9QFp335nQW77uAnSfAmey
-						tCowDQYJKoZIhvcNAQEFBQADggIBALR0fEhYAGrXCqw9r2IjsXG0h4Kqv298t7Wd
-						fV5Qal71yD2vqVgZBjyoUt6FwQ0GPKhMc/q7Ooy8lfo8NSvZV983MSyWe519xTJ4
-						vtPJtKHd2WKYacrdRFPZJYjtTR4CwMXtwxsB2xJrpaJa/sSyRHvE4+PuUBYOj42t
-						k6MOk3t1GKfaoYOmJBd2teVym9K5bRqGk6WgnKg+jzPDXJy3+kKvZMZKsv7aYafu
-						m2PFoRJu1Nm+6jjTy33SVH3ZS4oydL+uZWfwKvQEqbLOGdRJTZYlDJR2mz6zISbf
-						1+LjnK1aqDETq+loatD4gntbpwoMTBMceoDVyRmlPkuFDF31lzkwyAlE5yFmhC9q
-						mUNMvsbtYJe546ftf+fyRW/PnZaBRqY1Hkk5lBU4BIgt+gk9jqiAae+DvQ4dikLP
-						DWDef3bPLitQA/e/F5YmYq61L7TeIdIiDtD42y5qUW7x+pMTd042EpmoWL9XbdMe
-						tvHx33GTkXDFqg88t/lPD8nN9evHWcPvUL1YS3AvJJ9u1Ttiq+agvGDxClgqa2i/
-						VZd/+nl8pnTI4n7VsiMMSFnBra1FQFoTwvaAHBotttYutz+jPAo/jQRaD+AqAqj3
-						C+Ar+eubE63of1BjM7tWtOldASsG/Kwoq5dNqCWjqmoL3EbLr1hx65qAaRR0XbtB
-						rDHM7cXn
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.lshtm.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">London School of Hygiene and Tropical Medicine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London School of Hygiene and Tropical Medicine (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lshtm.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Christopher</GivenName>
-    <SurName>Manning</SurName>
-    <EmailAddress>mailto:christopher.manning@lshtm.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Whitbread</SurName>
-    <EmailAddress>mailto:steven.whitbread@lshtm.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.lshtm.ac.uk-shibboleth.xml
deleted file mode 100644
index 193d5798..00000000
--- a/swamid-interfederations-2.0/idp.lshtm.ac.uk-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://idp.lshtm.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the London School of Hygiene and Tropical Medicine.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">lshtm.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIGMDCCBBigAwIBAgIJAIUFHfw4Gj9WMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xNzA1BgNV
-						BAoTLkxvbmRvbiBTY2hvb2wgb2YgSHlnaWVuZSBhbmQgVHJvcGljYWwgTWVkaWNp
-						bmUxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRgwFgYDVQQDEw9pZHAubHNodG0uYWMu
-						dWswHhcNMTIxMTIxMTAwMjI4WhcNMjIxMTE5MTAwMjI4WjCBmDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMTcwNQYDVQQKEy5M
-						b25kb24gU2Nob29sIG9mIEh5Z2llbmUgYW5kIFRyb3BpY2FsIE1lZGljaW5lMRQw
-						EgYDVQQLEwtJVCBTZXJ2aWNlczEYMBYGA1UEAxMPaWRwLmxzaHRtLmFjLnVrMIIC
-						IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuTPyCuj1pH4dZ7MqyEruIQ69
-						eHqslz6CkseYXZypQGILVKF7i/QCdfE82mklM0GF5a8KaBvp6F1TNBpOVfe5Wx8y
-						/CqIwfoLqTHtTOwIoBSQTCbcqje8lUR+oP7gA4a+uF7AVurnZOrNFvYJaMvDuYcb
-						RmChofGrsUYUVPYVEC7cT+T4lEZkO7ntQ9SN7If0INa/E2uiHOAmrYTQ9+l6u/nN
-						ri9Lpc+N6Pg5BDwvgztDmQMiDhtMjHVZ4MxHqRlUiSY6m+IPot7YjSJ3XDOrXhrg
-						0zIhmSj0Zm/0htH5jq3yGwbNiVgvf/9r2hM4LC+VyqwCXnk3cUWC1zQZeV6lCy9c
-						ihPen6r9qkShVRzIk788rJfCMDPggPIJXXVs7TosSH+lPgOIcSw18nMPCOb5/iUj
-						nyqGTVrAKEft5o16HpYyivhkJTFoz2msPem1GUztLt+ueZmUir4RCk5Hu1sodoo5
-						UDzRHtsjzBVZ7W3a3y5dYtyxtYkDWKLM46Zew8/qp34wT785zId1WkqYoj+RMFp/
-						3p+zvJK9ykS/I1mW5/6yjZ5rLebw6vhfJzQq3aN40clFkXGAij/VLepgPY8T3F+G
-						fa9UPPI+7s/3GLAGw20bHF3TLhbTPScUt/8uCfZsoHdrFFR9jIu47+RhF08phF2+
-						S90ucfkr77Mka+ZVD4kCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
-						HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFEpDJ6JR
-						dIQLh7IAXnC3xWabzxvcMB8GA1UdIwQYMBaAFEpDJ6JRdIQLh7IAXnC3xWabzxvc
-						MA0GCSqGSIb3DQEBBQUAA4ICAQBpoHHOOMfP6RopKhCLcLDIAfy2VRjv2xcPbyd+
-						pvdti1mIlhdEhNeH7Nn2OekU8Ruh2eKfv9K+6T+zBdrRkYMsGelbtNFZXKkV/OZ3
-						G9lV6KMy1YmvMOEfgf7S7CmIIBaPQ5XDlNI8lyT6If3MaG2p6Z/GsskPGWHMnQWS
-						eTs3dzFLCLCfYzXFBO5oOYJvqLtiXvkDGBj0hVCF3cbQIqICzcT2q3VVF2/EXdtY
-						bClJsI0PXDbmuKqaVxSVBy2BfnkK9iB1QDw3SKvpUNd2ZFeNDRC0ggOwuHXu+fyp
-						ZKdiZ/0LkwtAhnYyYTSip/5d+4Plu6ymqr1ENTyRS8ij5zq8J5rF5DJ+AieBm9uk
-						DSwjsWlCgKwsDdccuSNvapok2As29jGzYbT950jAbkNi4wHjhHDMbbWv5W4EPncU
-						22QW7z+Z+wbR7DtCcoBhoVhHCtYFDzBrFv/emwSLMtdTV/CcCrT6yU7Ds8ogulmw
-						a9gqoEHyBVMKxO2OdzPUtLKvGgr6CdTDJCVnb0b6N900lEJuNQaCMTiqH/C/yj4b
-						fh6K0G6HKsASieVW3J4GUBjwzkcbbAGsJmJG08O6pgxvPPZdUOyF9Omna9aSblwb
-						ztKtqBRmGFEv+NdL7FW65bo+35Gp/Ajdh/bD+t3RPXBZwqNg4snlXRXRcfk2MKis
-						clTSFw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lshtm.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://idp.lshtm.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lshtm.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lshtm.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lshtm.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">lshtm.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIGMDCCBBigAwIBAgIJAIUFHfw4Gj9WMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xNzA1BgNV
-						BAoTLkxvbmRvbiBTY2hvb2wgb2YgSHlnaWVuZSBhbmQgVHJvcGljYWwgTWVkaWNp
-						bmUxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRgwFgYDVQQDEw9pZHAubHNodG0uYWMu
-						dWswHhcNMTIxMTIxMTAwMjI4WhcNMjIxMTE5MTAwMjI4WjCBmDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMTcwNQYDVQQKEy5M
-						b25kb24gU2Nob29sIG9mIEh5Z2llbmUgYW5kIFRyb3BpY2FsIE1lZGljaW5lMRQw
-						EgYDVQQLEwtJVCBTZXJ2aWNlczEYMBYGA1UEAxMPaWRwLmxzaHRtLmFjLnVrMIIC
-						IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuTPyCuj1pH4dZ7MqyEruIQ69
-						eHqslz6CkseYXZypQGILVKF7i/QCdfE82mklM0GF5a8KaBvp6F1TNBpOVfe5Wx8y
-						/CqIwfoLqTHtTOwIoBSQTCbcqje8lUR+oP7gA4a+uF7AVurnZOrNFvYJaMvDuYcb
-						RmChofGrsUYUVPYVEC7cT+T4lEZkO7ntQ9SN7If0INa/E2uiHOAmrYTQ9+l6u/nN
-						ri9Lpc+N6Pg5BDwvgztDmQMiDhtMjHVZ4MxHqRlUiSY6m+IPot7YjSJ3XDOrXhrg
-						0zIhmSj0Zm/0htH5jq3yGwbNiVgvf/9r2hM4LC+VyqwCXnk3cUWC1zQZeV6lCy9c
-						ihPen6r9qkShVRzIk788rJfCMDPggPIJXXVs7TosSH+lPgOIcSw18nMPCOb5/iUj
-						nyqGTVrAKEft5o16HpYyivhkJTFoz2msPem1GUztLt+ueZmUir4RCk5Hu1sodoo5
-						UDzRHtsjzBVZ7W3a3y5dYtyxtYkDWKLM46Zew8/qp34wT785zId1WkqYoj+RMFp/
-						3p+zvJK9ykS/I1mW5/6yjZ5rLebw6vhfJzQq3aN40clFkXGAij/VLepgPY8T3F+G
-						fa9UPPI+7s/3GLAGw20bHF3TLhbTPScUt/8uCfZsoHdrFFR9jIu47+RhF08phF2+
-						S90ucfkr77Mka+ZVD4kCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
-						HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFEpDJ6JR
-						dIQLh7IAXnC3xWabzxvcMB8GA1UdIwQYMBaAFEpDJ6JRdIQLh7IAXnC3xWabzxvc
-						MA0GCSqGSIb3DQEBBQUAA4ICAQBpoHHOOMfP6RopKhCLcLDIAfy2VRjv2xcPbyd+
-						pvdti1mIlhdEhNeH7Nn2OekU8Ruh2eKfv9K+6T+zBdrRkYMsGelbtNFZXKkV/OZ3
-						G9lV6KMy1YmvMOEfgf7S7CmIIBaPQ5XDlNI8lyT6If3MaG2p6Z/GsskPGWHMnQWS
-						eTs3dzFLCLCfYzXFBO5oOYJvqLtiXvkDGBj0hVCF3cbQIqICzcT2q3VVF2/EXdtY
-						bClJsI0PXDbmuKqaVxSVBy2BfnkK9iB1QDw3SKvpUNd2ZFeNDRC0ggOwuHXu+fyp
-						ZKdiZ/0LkwtAhnYyYTSip/5d+4Plu6ymqr1ENTyRS8ij5zq8J5rF5DJ+AieBm9uk
-						DSwjsWlCgKwsDdccuSNvapok2As29jGzYbT950jAbkNi4wHjhHDMbbWv5W4EPncU
-						22QW7z+Z+wbR7DtCcoBhoVhHCtYFDzBrFv/emwSLMtdTV/CcCrT6yU7Ds8ogulmw
-						a9gqoEHyBVMKxO2OdzPUtLKvGgr6CdTDJCVnb0b6N900lEJuNQaCMTiqH/C/yj4b
-						fh6K0G6HKsASieVW3J4GUBjwzkcbbAGsJmJG08O6pgxvPPZdUOyF9Omna9aSblwb
-						ztKtqBRmGFEv+NdL7FW65bo+35Gp/Ajdh/bD+t3RPXBZwqNg4snlXRXRcfk2MKis
-						clTSFw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lshtm.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lshtm.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">London School of Hygiene and Tropical Medicine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London School of Hygiene &amp; Tropical Medicine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lshtm.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Christopher</GivenName>
-    <SurName>Manning</SurName>
-    <EmailAddress>mailto:christopher.manning@lshtm.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Whitbread</SurName>
-    <EmailAddress>mailto:steven.whitbread@lshtm.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lstonline.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lstonline.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b87195f1..00000000
--- a/swamid-interfederations-2.0/idp.lstonline.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.lstonline.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for London School of Theology.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-13T09:04:59Z">
-      <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">lstonline.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAMFlYrF0zZoa942kcmsKFS6POLrtMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMME2lkcC5sc3RvbmxpbmUuYWMudWswHhcNMTQwODE4MDk1
-						NjM3WhcNMzQwODE4MDk1NjM3WjAeMRwwGgYDVQQDDBNpZHAubHN0b25saW5lLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk7ao0zPOg1uysBKB
-						GF4fCHFBuREEWFmSzvqWzQZfyL2TepKrRHxcVEkDZLPvqQMz5Bhelk6u6XFabTWD
-						ywFho2LCk5xHax03ZT/tdkK8GgmopqgyLMSfrKBm0QLFrFne14x3fPUUriiEUAAI
-						5j1AyIusiwBeOJjSz4qh2wQIshL1XsacTpNQtyYb72Ov88gAIsqogc5G24P1xq5d
-						DfOS4tjLgcdZsVUzuCI4nKjrHcVYY0fRTYx8VilH3vYYOZKs8jQ3m79v7KEYBll5
-						DBH7/PoALisut/Bi6jA2nqnrhGT/E7HqeCg8yvoDu7PXz1/Hzs6xiCCCMxRlfCMx
-						/rW/zQIDAQABo20wazAdBgNVHQ4EFgQUlxTFQwycWjBKkLREWm0D6sqE61UwSgYD
-						VR0RBEMwQYITaWRwLmxzdG9ubGluZS5hYy51a4YqaHR0cHM6Ly9pZHAubHN0b25s
-						aW5lLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQBXemp0
-						xzsyQQtxp0BPTGZoPvrV+0mb6q6gWKe6A/zus00SIUSxioMUjS2oiGEsyzWlsP8Q
-						9nmbseTtzz4Bw1cpynOjqCvvJ8/eTdvMCGFEGzknth5ww+dJN/r/9sVDycrTPxyl
-						/z1b8ikFMqNrrkv/Er7r4ldUeoF/skojOBQ5BcHu1D4WRVYpjNlX39nAyjw8pgFc
-						D9r34nfY53dQOgrGUneQtqTLueqQfdonEE/I0IiouehnZ8EjBNMWI2sRHJYsim5a
-						zdHPlAIvSZc7mqH+NprXPLi39BJh6/LVNq/KxBLPh+dXvxOTekhJ/ihW1JGnvBaO
-						J8P9Rw7ynUh4F0pC
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lstonline.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lstonline.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.lstonline.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lstonline.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.lstonline.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lstonline.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lstonline.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">lstonline.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAMFlYrF0zZoa942kcmsKFS6POLrtMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMME2lkcC5sc3RvbmxpbmUuYWMudWswHhcNMTQwODE4MDk1
-						NjM3WhcNMzQwODE4MDk1NjM3WjAeMRwwGgYDVQQDDBNpZHAubHN0b25saW5lLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk7ao0zPOg1uysBKB
-						GF4fCHFBuREEWFmSzvqWzQZfyL2TepKrRHxcVEkDZLPvqQMz5Bhelk6u6XFabTWD
-						ywFho2LCk5xHax03ZT/tdkK8GgmopqgyLMSfrKBm0QLFrFne14x3fPUUriiEUAAI
-						5j1AyIusiwBeOJjSz4qh2wQIshL1XsacTpNQtyYb72Ov88gAIsqogc5G24P1xq5d
-						DfOS4tjLgcdZsVUzuCI4nKjrHcVYY0fRTYx8VilH3vYYOZKs8jQ3m79v7KEYBll5
-						DBH7/PoALisut/Bi6jA2nqnrhGT/E7HqeCg8yvoDu7PXz1/Hzs6xiCCCMxRlfCMx
-						/rW/zQIDAQABo20wazAdBgNVHQ4EFgQUlxTFQwycWjBKkLREWm0D6sqE61UwSgYD
-						VR0RBEMwQYITaWRwLmxzdG9ubGluZS5hYy51a4YqaHR0cHM6Ly9pZHAubHN0b25s
-						aW5lLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQBXemp0
-						xzsyQQtxp0BPTGZoPvrV+0mb6q6gWKe6A/zus00SIUSxioMUjS2oiGEsyzWlsP8Q
-						9nmbseTtzz4Bw1cpynOjqCvvJ8/eTdvMCGFEGzknth5ww+dJN/r/9sVDycrTPxyl
-						/z1b8ikFMqNrrkv/Er7r4ldUeoF/skojOBQ5BcHu1D4WRVYpjNlX39nAyjw8pgFc
-						D9r34nfY53dQOgrGUneQtqTLueqQfdonEE/I0IiouehnZ8EjBNMWI2sRHJYsim5a
-						zdHPlAIvSZc7mqH+NprXPLi39BJh6/LVNq/KxBLPh+dXvxOTekhJ/ihW1JGnvBaO
-						J8P9Rw7ynUh4F0pC
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lstonline.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lstonline.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">London School of Theology</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London School of Theology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lst.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@lst.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@lst.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml
deleted file mode 100644
index f421e84b..00000000
--- a/swamid-interfederations-2.0/idp.lu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lu.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">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml: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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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">lu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Lunds universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lund University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitetstjänst för anställda och studenter vid Lunds universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Lund University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.lu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.lunduniversity.lu.se</mdui:InformationURL>
-        <mdui:Logo height="78" width="450" xml:lang="sv">http://www2.ldc.lu.se/images/LU_swe_logo_450px.jpg</mdui:Logo>
-        <mdui:Logo height="78" width="382" xml:lang="en">http://www2.ldc.lu.se/images/LU_eng_logo_382px.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>lu.se</mdui:DomainHint>
-        <mdui:DomainHint>lth.se</mdui:DomainHint>
-        <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAPx05QNy/rJ5REDxNwYau5tDh3VUMA0GCSqGSIb3DQEB
-BQUAMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTAeFw0xNDA5MTEwNjAwNDhaFw0zNDA5
-MTEwNjAwNDhaMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKpuswtBZvLMD+yzqjQKm/qVOb43dhPlUorjNDA1Vg5N
-f6x+E0HBZfrhK5O2lXevCbK5yE1dAi8Se/3AH/hJYkz+OaQT1QfryvQsbqD6hgN3
-9oXCC8e66vI6PGa1lRrPKK+1xLkWFfnFJtDEGUyGsyZ/1upkyjiaxfegN7gYNOFj
-QBtIQUHwbkITLGbWJBEMGbgaYd77M8zOBDwHh1TNC/9elCVTaU2UMYOLqBmdR1Hl
-o+q3nHjpOlJ4Q85FMhdcOlrzTi43TWDuc1nxgIeGG94+o3ekDBUi7jMIaIgwwBpr
-ExtI/Im319D2l2L9xPrX6Qe+yyPYs+SB7zr0Qxm4YO8CAwEAAaNZMFcwNgYDVR0R
-BC8wLYIJaWRwLmx1LnNlhiBodHRwczovL2lkcC5sdS5zZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUQWUHLXRD0hRwmWtwxFuwf6Kfbd4wDQYJKoZIhvcNAQEFBQAD
-ggEBAB6WOo99LL70V31BADdWiag7Tnq8e+T/cLhb8z4vJk9tD3OJBuNMf1u0yUms
-JJ0gHTM7ctaF/i4XvvCQOgzfZ28yV5QtHpQe38DicVYxWuRRjQ/DYv4no0p4LMat
-CVDEnkB0AHo0XyPi2w/tqup96cbROdgsWo6I/2aatRwrgdG+7T9pL5V+AWeb4Htc
-g+KO8Z/ICMfvzv9w/cP7c9oErCABjLd1y/wUh/YbY4yCgJbZLftm0gjDwGhioj6x
-jofk6rzliDsjfc7aVImQ98eiwlA4GQW2MOnbbQM7PtW3BFax+SJlpJUDcqa379Ol
-u5Q6EI4vlsIGVG1PKyXIIIpgDyQ=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lu.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lu.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">lu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIVAPx05QNy/rJ5REDxNwYau5tDh3VUMA0GCSqGSIb3DQEB
-BQUAMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTAeFw0xNDA5MTEwNjAwNDhaFw0zNDA5
-MTEwNjAwNDhaMBQxEjAQBgNVBAMTCWlkcC5sdS5zZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKpuswtBZvLMD+yzqjQKm/qVOb43dhPlUorjNDA1Vg5N
-f6x+E0HBZfrhK5O2lXevCbK5yE1dAi8Se/3AH/hJYkz+OaQT1QfryvQsbqD6hgN3
-9oXCC8e66vI6PGa1lRrPKK+1xLkWFfnFJtDEGUyGsyZ/1upkyjiaxfegN7gYNOFj
-QBtIQUHwbkITLGbWJBEMGbgaYd77M8zOBDwHh1TNC/9elCVTaU2UMYOLqBmdR1Hl
-o+q3nHjpOlJ4Q85FMhdcOlrzTi43TWDuc1nxgIeGG94+o3ekDBUi7jMIaIgwwBpr
-ExtI/Im319D2l2L9xPrX6Qe+yyPYs+SB7zr0Qxm4YO8CAwEAAaNZMFcwNgYDVR0R
-BC8wLYIJaWRwLmx1LnNlhiBodHRwczovL2lkcC5sdS5zZS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUQWUHLXRD0hRwmWtwxFuwf6Kfbd4wDQYJKoZIhvcNAQEFBQAD
-ggEBAB6WOo99LL70V31BADdWiag7Tnq8e+T/cLhb8z4vJk9tD3OJBuNMf1u0yUms
-JJ0gHTM7ctaF/i4XvvCQOgzfZ28yV5QtHpQe38DicVYxWuRRjQ/DYv4no0p4LMat
-CVDEnkB0AHo0XyPi2w/tqup96cbROdgsWo6I/2aatRwrgdG+7T9pL5V+AWeb4Htc
-g+KO8Z/ICMfvzv9w/cP7c9oErCABjLd1y/wUh/YbY4yCgJbZLftm0gjDwGhioj6x
-jofk6rzliDsjfc7aVImQ98eiwlA4GQW2MOnbbQM7PtW3BFax+SJlpJUDcqa379Ol
-u5Q6EI4vlsIGVG1PKyXIIIpgDyQ=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lu.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">LU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lut.fi.xml b/swamid-interfederations-2.0/idp.lut.fi.xml
index 92081adf..8e98b5a0 100644
--- a/swamid-interfederations-2.0/idp.lut.fi.xml
+++ b/swamid-interfederations-2.0/idp.lut.fi.xml
@@ -1,31 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lut.fi">
-  <md: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-support" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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.lut.fi">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lut.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">lut.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Lappeenranta University of Technology</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Lappeenrannan teknillinen yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Lappeenranta Tekniska Högskolan</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:IPHint>157.24.0.0/16</mdui:IPHint>
         <mdui:DomainHint>lut.fi</mdui:DomainHint>
         <mdui:GeolocationHint>geo:61.06490,28.09240</mdui:GeolocationHint>
       </mdui:DiscoHints>
+      <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>MIIEjjCCA3agAwIBAgIQXxAGKmjmI6A8/AokeEg6njANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
diff --git a/swamid-interfederations-2.0/idp.lutonsfc.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.lutonsfc.ac.uk-openathens.xml
deleted file mode 100644
index 71a290e0..00000000
--- a/swamid-interfederations-2.0/idp.lutonsfc.ac.uk-openathens.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.lutonsfc.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Luton Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">lutonsfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/lutonsfc.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/lutonsfc.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Luton Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lutonsfc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lyit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lyit.ie-idp-shibboleth.xml
deleted file mode 100644
index 93c9bfc6..00000000
--- a/swamid-interfederations-2.0/idp.lyit.ie-idp-shibboleth.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://idp.lyit.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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lyit.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Letterkenny Institute of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Leitir Ceanainn</mdui:DisplayName>
-        <mdui:Logo height="96" width="159">https://edugate.heanet.ie/rr3/logos/lyit.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:54.95229943501583,-7.720813751220703</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:54.95186314818439,-7.721607685089111</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAIygXE7mgeFS1ogZQvsHmJd9TtAHMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5seWl0LmllMB4XDTExMDYzMDE0MTg1N1oXDTMx
-MDYzMDE0MTg1N1owFjEUMBIGA1UEAxMLaWRwLmx5aXQuaWUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCG8w8qqMb2AU+Rv/kYTrStDzTqqhUSc0sHK+bj
-S+R7CujOkxq/PRVxgI7eqMiui5meN6DpJHVHLUiBB08n8+c/Nt7Iaz58pzxZRBY8
-49W1oAlm6NMGrMN540et4AFbiiEUG8oLcokxZrxM9Y30nrS0e7j3ZABebcIAMkOc
-R/i52pCsE++OJ7cZuTI+NbI5uwWNDyum5CJMcgwrJyOrHbXYQZKgbWDfmFGBIegT
-eBb0Mj/6hN/FSuMD8JoZaW/XlqP7uIC1sZk6g2VCEH40fzCFGHEa+1PJN1KuR1f5
-/VmzMfKscoYFnPMEcXGVS7uOULBTyZhibspDnczEeo0dDcp9AgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5seWl0LmllhiJodHRwczovL2lkcC5seWl0LmllL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSlQM4axvPAB7cdNaJnC4Xy1Kq3qzANBgkqhkiG
-9w0BAQUFAAOCAQEAXHq2sHemC0iqJlcmPnxvHAUdGqCsqj+F0zKbvRk3Xf/JG8AH
-CAsZTvKSOZu0aiwlietUW3J6eCJ91IkVTVhrAX71jidAw7+C3d4zi31e+qNqY5Ci
-yb1AkaAt6mi++0BYUj01vzL6+MIuR4svv3R9cpyrg4wkuljt2MDsNpusXJlEpQft
-KuOUA77foIOtvbHY0cYNBcVj9gbQl0+OP78ZlBwvqGnnW1rlLPbtmVCZxz8PeJ2w
-rArDeKt+kQanlUaaYnFd6NVkmDcZH7KtD+/PxbAGs1WS24APYAzSEyc271mWoLBM
-egBqflp2dlNsm6/6kKlbVEgTaD/+ZGSPjqLpgA==
-</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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lyit.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lyit.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lyit.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Letterkenny Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Letterkenny Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://lyit.ie</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Seamus</md:GivenName>
-    <md:SurName>Byron</md:SurName>
-    <md:EmailAddress>mailto:seamus.byron@lyit.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.macclesfield.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.macclesfield.ac.uk-shibboleth.xml
deleted file mode 100644
index 54a7155e..00000000
--- a/swamid-interfederations-2.0/idp.macclesfield.ac.uk-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://idp.macclesfield.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Macclesfield College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">macclesfield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbDCCAlQCCQD/7vODco0h7zANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
-						QjERMA8GA1UECBMIQ2hlc2hpcmUxFTATBgNVBAcTDE1hY2NsZXNmaWVsZDEdMBsG
-						A1UEChMUTWFjY2xlc2ZpZWxkIENvbGxlZ2UxIDAeBgNVBAMTF2lkcDIubWFjY2xl
-						c2ZpZWxkLmFjLnVrMB4XDTEzMDIwNzExMjYwOFoXDTMzMDIwMjExMjYwOFoweDEL
-						MAkGA1UEBhMCR0IxETAPBgNVBAgTCENoZXNoaXJlMRUwEwYDVQQHEwxNYWNjbGVz
-						ZmllbGQxHTAbBgNVBAoTFE1hY2NsZXNmaWVsZCBDb2xsZWdlMSAwHgYDVQQDExdp
-						ZHAyLm1hY2NsZXNmaWVsZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAMDM05odoeteSlOjg3QAARLG25Ze052B7oef9N8SJe9qktTJsCp8lrzo
-						QXR/CN/8XCRGiysNEtD5+dts4Vt16EU5eB3oknVjFwJ2tm14fAsOJkhYxEeL89oQ
-						mGBS0DR5H+O8JFHwTVgYWaMK8Biei81MISIWo0QFgY/lhM4msVbJLmNfbWKvp2bU
-						RQBOIv+zUYiLvESt1ZlXOiFZdJHvXJBhN5xV834x28KJMhsPtuGNI/NcHOpJ7gfy
-						QIS2aDn03hws2UmfFSaNo5Fbv69FmF1b1RNzdl/E91aj2xrwq/kCslBd0qvGVBQS
-						B3zaZvXN+zkvmfm6oqvrzo+ohdozk1kCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						Cbl1ic6Me2HZNOyy42mLGWip6BRF3AmyRlAjYEnGOWjrbjnljF40C2ggFNFnpZZt
-						TiRd7Ovzvbm+xJJiA3TiHiEZcmTH00DG6mEiqpan71wxkMvDrGD3c1KTVk4ALXwb
-						aSPz1JNIrw9XlX+JD6rXr9rH6aUPx7ckWi5nrodY6fW89WDiEtx7WOkDc1Zj77Gq
-						JDpIl002iw2tQp+TRHDUD4Kc73JKc8IuJBDhxSedztn/jyZFfciIHBNMjaBQsd3n
-						9/dIxdTe1CnRSzW8XzAbJPUdaYjy5ORlYKJ28OqKs/11N2llbaTuAwZqm3Ps9bKL
-						URTAw0QV//xFG86AyPeEYg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.macclesfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.macclesfield.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://idp2.macclesfield.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.macclesfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.macclesfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.macclesfield.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">macclesfield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbDCCAlQCCQD/7vODco0h7zANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
-						QjERMA8GA1UECBMIQ2hlc2hpcmUxFTATBgNVBAcTDE1hY2NsZXNmaWVsZDEdMBsG
-						A1UEChMUTWFjY2xlc2ZpZWxkIENvbGxlZ2UxIDAeBgNVBAMTF2lkcDIubWFjY2xl
-						c2ZpZWxkLmFjLnVrMB4XDTEzMDIwNzExMjYwOFoXDTMzMDIwMjExMjYwOFoweDEL
-						MAkGA1UEBhMCR0IxETAPBgNVBAgTCENoZXNoaXJlMRUwEwYDVQQHEwxNYWNjbGVz
-						ZmllbGQxHTAbBgNVBAoTFE1hY2NsZXNmaWVsZCBDb2xsZWdlMSAwHgYDVQQDExdp
-						ZHAyLm1hY2NsZXNmaWVsZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAMDM05odoeteSlOjg3QAARLG25Ze052B7oef9N8SJe9qktTJsCp8lrzo
-						QXR/CN/8XCRGiysNEtD5+dts4Vt16EU5eB3oknVjFwJ2tm14fAsOJkhYxEeL89oQ
-						mGBS0DR5H+O8JFHwTVgYWaMK8Biei81MISIWo0QFgY/lhM4msVbJLmNfbWKvp2bU
-						RQBOIv+zUYiLvESt1ZlXOiFZdJHvXJBhN5xV834x28KJMhsPtuGNI/NcHOpJ7gfy
-						QIS2aDn03hws2UmfFSaNo5Fbv69FmF1b1RNzdl/E91aj2xrwq/kCslBd0qvGVBQS
-						B3zaZvXN+zkvmfm6oqvrzo+ohdozk1kCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						Cbl1ic6Me2HZNOyy42mLGWip6BRF3AmyRlAjYEnGOWjrbjnljF40C2ggFNFnpZZt
-						TiRd7Ovzvbm+xJJiA3TiHiEZcmTH00DG6mEiqpan71wxkMvDrGD3c1KTVk4ALXwb
-						aSPz1JNIrw9XlX+JD6rXr9rH6aUPx7ckWi5nrodY6fW89WDiEtx7WOkDc1Zj77Gq
-						JDpIl002iw2tQp+TRHDUD4Kc73JKc8IuJBDhxSedztn/jyZFfciIHBNMjaBQsd3n
-						9/dIxdTe1CnRSzW8XzAbJPUdaYjy5ORlYKJ28OqKs/11N2llbaTuAwZqm3Ps9bKL
-						URTAw0QV//xFG86AyPeEYg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.macclesfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.macclesfield.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">Macclesfield College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Macclesfield College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.macclesfield.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Scott</GivenName>
-    <SurName>White</SurName>
-    <EmailAddress>mailto:scott.white@macclesfield.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott</GivenName>
-    <SurName>White</SurName>
-    <EmailAddress>mailto:scott.white@macclesfield.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
deleted file mode 100644
index 3175db5d..00000000
--- a/swamid-interfederations-2.0/idp.mah.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mah.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">mah.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Malmö högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Malmö University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Malmö högskola</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Malmö University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.mah.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.mah.se/english</mdui:InformationURL>
-        <mdui:Logo height="195" width="132">http://cdn.mah.se/images/header/en/logo_en.jpg</mdui:Logo>
-        <mdui:Logo height="195" width="132" xml:lang="sv">http://cdn.mah.se/images/header/sv/logo_sv.jpg</mdui:Logo>
-        <mdui:Logo height="195" width="132" xml:lang="en">http://cdn.mah.se/images/header/en/logo_en.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">mah malmo+hogskola malmo+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">mah malmo+hogskola malmo+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>mah.se</mdui:DomainHint>
-        <mdui:IPHint>195.178.224.0/19</mdui:IPHint>
-        <mdui:GeolocationHint>geo:55.608982,12.992469</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAPnyQUYFvhTnodaw9FJqcA/57Yh5MA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5tYWguc2UwHhcNMTAwOTI5MDczODU0WhcNMzAw
-OTI5MDczODU0WjAVMRMwEQYDVQQDEwppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgaMWnEn2Fhn7xNG/PFpKOkACs3I9Rd2AspSE0NPD
-q3EuNx50kXrfeRxFsSntWy1PTQ8XYI1FONZx3l21CSmwsNSYa4coAsHC8U4yBN9b
-c1f/Q+7KQod+Q08cWJ75aiw0zvRl547bWfh0n5v1L21G+0fFUvY/6t5gN/HgHJZA
-9jZNZwVSzteivEmgooiJqXaUM7njWs15Ee1pTO6ib4w8eYj3AJuhWe58W3+Rc6xk
-5u5H/3LZiPMHiTnrqG2Ux+gFJStc5PXWO6NxiCOWtDufmJ6OcPrGkVMJ8LoZvQ1J
-OThRimq3OmaATe03wGqTRP3xHXqRSQPlXEIb86sSPnDU5wIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAubWFoLnNlhiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFHwHbhAp4egiLmh0CawPk430y+D8MA0GCSqGSIb3DQEB
-BQUAA4IBAQA0Hxjvk2Muuzwgyv8Nhvmeb43+qwvqIa+rCSJxZpEpR5xGyMLTApLL
-oRYlPGQIQUj8u8HFtcdRVmc/OWG0NhyBe9OiwFjcGlsdINZiyYm+4whwRrbt6/dn
-ykhKvjQMhX2x/0SjyrA/LjifpZB3VMN6qdRrGY082I7X5tZmmqyoWk/rED4WxL3u
-+j+6GUcWJOdPBAO4uBqUGzw9tvjXHE2nm5eQlKkk+138vFHkeb1fDrDthXuN9f03
-Ttm2GRc6B4kC8/rlYS5Li9yd8QY1yGPnbgLlW5lxOZbJQxdwiUcGCRDoUB1BC9NY
-dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mah.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mah.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mah.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mah.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mah.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mah.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAPnyQUYFvhTnodaw9FJqcA/57Yh5MA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC5tYWguc2UwHhcNMTAwOTI5MDczODU0WhcNMzAw
-OTI5MDczODU0WjAVMRMwEQYDVQQDEwppZHAubWFoLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgaMWnEn2Fhn7xNG/PFpKOkACs3I9Rd2AspSE0NPD
-q3EuNx50kXrfeRxFsSntWy1PTQ8XYI1FONZx3l21CSmwsNSYa4coAsHC8U4yBN9b
-c1f/Q+7KQod+Q08cWJ75aiw0zvRl547bWfh0n5v1L21G+0fFUvY/6t5gN/HgHJZA
-9jZNZwVSzteivEmgooiJqXaUM7njWs15Ee1pTO6ib4w8eYj3AJuhWe58W3+Rc6xk
-5u5H/3LZiPMHiTnrqG2Ux+gFJStc5PXWO6NxiCOWtDufmJ6OcPrGkVMJ8LoZvQ1J
-OThRimq3OmaATe03wGqTRP3xHXqRSQPlXEIb86sSPnDU5wIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAubWFoLnNlhiFodHRwczovL2lkcC5tYWguc2UvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFHwHbhAp4egiLmh0CawPk430y+D8MA0GCSqGSIb3DQEB
-BQUAA4IBAQA0Hxjvk2Muuzwgyv8Nhvmeb43+qwvqIa+rCSJxZpEpR5xGyMLTApLL
-oRYlPGQIQUj8u8HFtcdRVmc/OWG0NhyBe9OiwFjcGlsdINZiyYm+4whwRrbt6/dn
-ykhKvjQMhX2x/0SjyrA/LjifpZB3VMN6qdRrGY082I7X5tZmmqyoWk/rED4WxL3u
-+j+6GUcWJOdPBAO4uBqUGzw9tvjXHE2nm5eQlKkk+138vFHkeb1fDrDthXuN9f03
-Ttm2GRc6B4kC8/rlYS5Li9yd8QY1yGPnbgLlW5lxOZbJQxdwiUcGCRDoUB1BC9NY
-dXq/XDc8QAGFHMyk/P0r1H6pT5HJQfH7
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mah.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">MAH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Malmö högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Malmö University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mah.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Malmö University</md:Company>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mah.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Malmö University</md:Company>
-    <md:SurName>Robert Faling</md:SurName>
-    <md:EmailAddress>mailto:robert.faling@mah.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 768 428753</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Malmö University</md:Company>
-    <md:SurName>Servicedesk Malmö högskola</md:SurName>
-    <md:EmailAddress>mailto:support@mah.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 40 6657555</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.maine.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.maine.edu-idp-shibboleth.xml
deleted file mode 100644
index 2802f082..00000000
--- a/swamid-interfederations-2.0/idp.maine.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,169 +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://idp.maine.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">um.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umf.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umfk.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umm.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umpi.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usm.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ums.maine.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Maine System</mdui:DisplayName>
-        <mdui:Logo height="180" width="250" xml:lang="en">https://identity.maine.edu/cas/images/ums-logo.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>
-MIIDUjCCAjoCCQCFxyTiaTwczjANBgkqhkiG9w0BAQUFADBrMRYwFAYDVQQDDA1p
-ZHAubWFpbmUuZWR1MSMwIQYDVQQKDBpVbml2ZXJzaXR5IG9mIE1haW5lIFN5c3Rl
-bTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBU1haW5lMQ8wDQYDVQQHDAZCYW5nb3Iw
-HhcNMTMwODIwMjMzNTI1WhcNMTQwODIwMjMzNTI1WjBrMRYwFAYDVQQDDA1pZHAu
-bWFpbmUuZWR1MSMwIQYDVQQKDBpVbml2ZXJzaXR5IG9mIE1haW5lIFN5c3RlbTEL
-MAkGA1UEBhMCVVMxDjAMBgNVBAgMBU1haW5lMQ8wDQYDVQQHDAZCYW5nb3IwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrUDwtk+ugK9p9vgJRzu7/o0Wh
-xnRODXEUHOuGhk3oJZJwMJGFuD6PzQecmE1GNwlNQm9CbfBryiM2pd5QCOY+3Oa5
-PicH52tUcIc796LihJC0RfdqCBQG42dTP7IaAmlp9ksgqYOUH5KUppEYlXvUVC43
-jvGdaj/5c08XEI4WlJNRfdaWO5uTE79HzyqfccGaRvJJEpJADrMWZYpKFJTt5+KP
-lxmGcldFLEld1aIWVKaXIP1ccPSfSxlLobRT+rSA5Lb/5FNwY8k1C/zpwk8MoWuu
-pXp5kcxStWKL8PIpKwAFTbExs+hzQ2F4Mzz6J75tJHMkpgg3EQGFX6qNO5uTAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBADkUm2OJ0cyt275w5dY7ScjKHvcPITIfTHNS
-6BlJvb3iYFTqd7HxxSqE3BbSYN/AZxkU9/SsH0p5jvOFaLcAPPuRD3f1c+uVXSQv
-AJimQaG73oy+6RkbLPEIVf8O8zXWjX5pQCfPNjoRx/j7he2+NHOl2jpR6Tj/O4cT
-CX4AhoApL6teiUhjOeyBqRtMLvFrODbyfWOw92v/SBo+IBuskFWczRFfYmpEgcls
-7XUZ1jj9jADb5vUFXttyD6DvlorsrDpym8UUa8xckbEORr039A2inJ1+JCHvF3Lp
-e2iwjc4lUcFC9ro7nesIcjc38rz36026jl8cvuGzfL83/NhL9zY=
-          </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>
-MIIDUjCCAjoCCQDqg7foDxXSlDANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJV
-UzEOMAwGA1UECAwFTWFpbmUxDzANBgNVBAcMBkJhbmdvcjEjMCEGA1UECgwaVW5p
-dmVyc2l0eSBvZiBNYWluZSBTeXN0ZW0xFjAUBgNVBAMMDWlkcC5tYWluZS5lZHUw
-HhcNMTQwNzEwMTE1NTUzWhcNMTkwNzEwMTE1NTUzWjBrMQswCQYDVQQGEwJVUzEO
-MAwGA1UECAwFTWFpbmUxDzANBgNVBAcMBkJhbmdvcjEjMCEGA1UECgwaVW5pdmVy
-c2l0eSBvZiBNYWluZSBTeXN0ZW0xFjAUBgNVBAMMDWlkcC5tYWluZS5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD4793CVUJTF3FFWnlvkTGbFUq3
-xKLy+YSGQ1HTwPMkByw8oStVl1jHu9K6S+0KoZeRZKd/hJZ1TylKETDUEIebc9HP
-ThfWMHrlzBk3Ek5Svq0VXy0QZR4rWmTPkqaIP/R9zySZpo3oWuFwGNErK/mEuTiJ
-JDujsY5fMhGyPf3ebGNhACIFxA1/3XF1D0yRkUdH9S91Hr7MYDN5DER5/JesaBb7
-BIIRJ+5xrTsnYuAQ8Myva5IiGZGv60cp3avXWZjC4EBXKgtBSTiJ/vwlN2YS8EgN
-cCXufgAwT2IhgkaISBZPbnxb+Xk2nD7H+0z634dSb1uV0Wzju42Q/DkSQeEjAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAFANX20L2jY37sGZo9cKItOUHoX9fBvLmkbd
-AmIoUbJ5ZQW3pJ51paUTMmC8GrmNo9IJXMoW4VL+J9LARRndijOgM4sxR/YgAy5M
-j13AjWjiPrPhlzBQubYNrZCWhE2FlCfxpm4RpA1DLAEYsmIuVx5XAkxx1bXUJBEN
-A4CX3y33HFyk/3PXxSxnpaWsuXozahayLy+mjL3INcpCOI4hD3mjhap8HZpz6s53
-xxXxaapewT8D9qN7AOzL5K1HB2z2JgTuG6Ucxwz+DmD+fpTSKZfFka7Aa0xOgk4l
-aPxZ1d6VzB7zlPxt3EBPg+v65IxSNM8rHmxa3Zc2nc6u7dd1uSs=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.maine.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.maine.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.maine.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.maine.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.maine.edu/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">maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">um.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umf.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umfk.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umm.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umpi.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usm.maine.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ums.maine.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDUjCCAjoCCQCFxyTiaTwczjANBgkqhkiG9w0BAQUFADBrMRYwFAYDVQQDDA1p
-ZHAubWFpbmUuZWR1MSMwIQYDVQQKDBpVbml2ZXJzaXR5IG9mIE1haW5lIFN5c3Rl
-bTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBU1haW5lMQ8wDQYDVQQHDAZCYW5nb3Iw
-HhcNMTMwODIwMjMzNTI1WhcNMTQwODIwMjMzNTI1WjBrMRYwFAYDVQQDDA1pZHAu
-bWFpbmUuZWR1MSMwIQYDVQQKDBpVbml2ZXJzaXR5IG9mIE1haW5lIFN5c3RlbTEL
-MAkGA1UEBhMCVVMxDjAMBgNVBAgMBU1haW5lMQ8wDQYDVQQHDAZCYW5nb3IwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrUDwtk+ugK9p9vgJRzu7/o0Wh
-xnRODXEUHOuGhk3oJZJwMJGFuD6PzQecmE1GNwlNQm9CbfBryiM2pd5QCOY+3Oa5
-PicH52tUcIc796LihJC0RfdqCBQG42dTP7IaAmlp9ksgqYOUH5KUppEYlXvUVC43
-jvGdaj/5c08XEI4WlJNRfdaWO5uTE79HzyqfccGaRvJJEpJADrMWZYpKFJTt5+KP
-lxmGcldFLEld1aIWVKaXIP1ccPSfSxlLobRT+rSA5Lb/5FNwY8k1C/zpwk8MoWuu
-pXp5kcxStWKL8PIpKwAFTbExs+hzQ2F4Mzz6J75tJHMkpgg3EQGFX6qNO5uTAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBADkUm2OJ0cyt275w5dY7ScjKHvcPITIfTHNS
-6BlJvb3iYFTqd7HxxSqE3BbSYN/AZxkU9/SsH0p5jvOFaLcAPPuRD3f1c+uVXSQv
-AJimQaG73oy+6RkbLPEIVf8O8zXWjX5pQCfPNjoRx/j7he2+NHOl2jpR6Tj/O4cT
-CX4AhoApL6teiUhjOeyBqRtMLvFrODbyfWOw92v/SBo+IBuskFWczRFfYmpEgcls
-7XUZ1jj9jADb5vUFXttyD6DvlorsrDpym8UUa8xckbEORr039A2inJ1+JCHvF3Lp
-e2iwjc4lUcFC9ro7nesIcjc38rz36026jl8cvuGzfL83/NhL9zY=
-          </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>
-MIIDUjCCAjoCCQDqg7foDxXSlDANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJV
-UzEOMAwGA1UECAwFTWFpbmUxDzANBgNVBAcMBkJhbmdvcjEjMCEGA1UECgwaVW5p
-dmVyc2l0eSBvZiBNYWluZSBTeXN0ZW0xFjAUBgNVBAMMDWlkcC5tYWluZS5lZHUw
-HhcNMTQwNzEwMTE1NTUzWhcNMTkwNzEwMTE1NTUzWjBrMQswCQYDVQQGEwJVUzEO
-MAwGA1UECAwFTWFpbmUxDzANBgNVBAcMBkJhbmdvcjEjMCEGA1UECgwaVW5pdmVy
-c2l0eSBvZiBNYWluZSBTeXN0ZW0xFjAUBgNVBAMMDWlkcC5tYWluZS5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD4793CVUJTF3FFWnlvkTGbFUq3
-xKLy+YSGQ1HTwPMkByw8oStVl1jHu9K6S+0KoZeRZKd/hJZ1TylKETDUEIebc9HP
-ThfWMHrlzBk3Ek5Svq0VXy0QZR4rWmTPkqaIP/R9zySZpo3oWuFwGNErK/mEuTiJ
-JDujsY5fMhGyPf3ebGNhACIFxA1/3XF1D0yRkUdH9S91Hr7MYDN5DER5/JesaBb7
-BIIRJ+5xrTsnYuAQ8Myva5IiGZGv60cp3avXWZjC4EBXKgtBSTiJ/vwlN2YS8EgN
-cCXufgAwT2IhgkaISBZPbnxb+Xk2nD7H+0z634dSb1uV0Wzju42Q/DkSQeEjAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBAFANX20L2jY37sGZo9cKItOUHoX9fBvLmkbd
-AmIoUbJ5ZQW3pJ51paUTMmC8GrmNo9IJXMoW4VL+J9LARRndijOgM4sxR/YgAy5M
-j13AjWjiPrPhlzBQubYNrZCWhE2FlCfxpm4RpA1DLAEYsmIuVx5XAkxx1bXUJBEN
-A4CX3y33HFyk/3PXxSxnpaWsuXozahayLy+mjL3INcpCOI4hD3mjhap8HZpz6s53
-xxXxaapewT8D9qN7AOzL5K1HB2z2JgTuG6Ucxwz+DmD+fpTSKZfFka7Aa0xOgk4l
-aPxZ1d6VzB7zlPxt3EBPg+v65IxSNM8rHmxa3Zc2nc6u7dd1uSs=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.maine.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.maine.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Maine System</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Maine System</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.maine.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>John Grover</md:GivenName>
-    <md:EmailAddress>jgrover@maine.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Drew Northup</md:GivenName>
-    <md:EmailAddress>drew.northup@maine.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Drew Northup</md:GivenName>
-    <md:EmailAddress>drew.northup@maine.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.marjon.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b0038e65..00000000
--- a/swamid-interfederations-2.0/idp.marjon.ac.uk-idp-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://idp.marjon.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of St Mark & St John.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">marjon.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAM3DEG1v9vAV1/UxUuMR5BwJefeEMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC5tYXJqb24uYWMudWswHhcNMDkwMTI2MTUwODIy
-						WhcNMjkwMTI2MTUwODIyWjAbMRkwFwYDVQQDExBpZHAubWFyam9uLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0PtE8uiR4ycRaBYiZctWLqlj
-						n/ZzMDNhasd+hn1xOEi4b+jLK9crBbE2b/u92SK+HF8j2VUuWW6SVxeMNh2r4dn4
-						U7tjj928sv3QevNKTT7luJTsLBvRjah6XXO5TF5cFIOdUgqPb2KxbqBF+pQauEms
-						eYfB6p8uJRssXmaqOQGvkRE5fv1cX/qUkEjSb3zJrsqnIwlU2BHXYMnl3H42z9fz
-						JJd0tijaj2lCB2iRBl053l0wYQ5MLlztrwMOZyy2T3Yz0h1j4CiQ46UNF6djSSio
-						JhvgtfXfe/raEvfQiuq5NwLc28vXlpPBIPkOrwsYig5l6+Y8DHroF/55qyH9HwID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAubWFyam9uLmFjLnVrhidodHRwczovL2lk
-						cC5tYXJqb24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBJxA6jp2sTF
-						oIUUD6OP+Xysl4C+MA0GCSqGSIb3DQEBBQUAA4IBAQC/1l3Tn2q/rNUjSMsOcHIw
-						lhhR47e23Wgr/u5r2jusqK4dx6oSrjWaG+pN6jd2xOC/gG6lm7FiPdQugLdft30c
-						18Ca+HSs6LPWZblYiYkKyQ/UHkXIsu0d81oIn+3vgEThyCmsTbChM68VY7AjVVae
-						AteayWpOCsXmCKWfPPHfuY9q5Oe5PeYv1PK9lS39+qiyp8+ZOsu7PHse3vQZIKup
-						oF1hWv0YvVydDCsa/nN8L3stVEAIvSGzsBS5vkbUXmRE3NuUCcJwkOUzwAzDWdM6
-						DR76/+4E+wc36deoLR3NAIWq4IX54pvX1UqIRIkpekdtAG2vLW3rl3e1IbC1j++6
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marjon.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.marjon.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.marjon.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.marjon.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.marjon.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.marjon.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">marjon.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAM3DEG1v9vAV1/UxUuMR5BwJefeEMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC5tYXJqb24uYWMudWswHhcNMDkwMTI2MTUwODIy
-						WhcNMjkwMTI2MTUwODIyWjAbMRkwFwYDVQQDExBpZHAubWFyam9uLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0PtE8uiR4ycRaBYiZctWLqlj
-						n/ZzMDNhasd+hn1xOEi4b+jLK9crBbE2b/u92SK+HF8j2VUuWW6SVxeMNh2r4dn4
-						U7tjj928sv3QevNKTT7luJTsLBvRjah6XXO5TF5cFIOdUgqPb2KxbqBF+pQauEms
-						eYfB6p8uJRssXmaqOQGvkRE5fv1cX/qUkEjSb3zJrsqnIwlU2BHXYMnl3H42z9fz
-						JJd0tijaj2lCB2iRBl053l0wYQ5MLlztrwMOZyy2T3Yz0h1j4CiQ46UNF6djSSio
-						JhvgtfXfe/raEvfQiuq5NwLc28vXlpPBIPkOrwsYig5l6+Y8DHroF/55qyH9HwID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAubWFyam9uLmFjLnVrhidodHRwczovL2lk
-						cC5tYXJqb24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBJxA6jp2sTF
-						oIUUD6OP+Xysl4C+MA0GCSqGSIb3DQEBBQUAA4IBAQC/1l3Tn2q/rNUjSMsOcHIw
-						lhhR47e23Wgr/u5r2jusqK4dx6oSrjWaG+pN6jd2xOC/gG6lm7FiPdQugLdft30c
-						18Ca+HSs6LPWZblYiYkKyQ/UHkXIsu0d81oIn+3vgEThyCmsTbChM68VY7AjVVae
-						AteayWpOCsXmCKWfPPHfuY9q5Oe5PeYv1PK9lS39+qiyp8+ZOsu7PHse3vQZIKup
-						oF1hWv0YvVydDCsa/nN8L3stVEAIvSGzsBS5vkbUXmRE3NuUCcJwkOUzwAzDWdM6
-						DR76/+4E+wc36deoLR3NAIWq4IX54pvX1UqIRIkpekdtAG2vLW3rl3e1IbC1j++6
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marjon.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.marjon.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 St Mark &amp; St John</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of St Mark &amp; St John</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.marjon.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Moore</SurName>
-    <EmailAddress>mailto:cmoore@marjon.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>St John</SurName>
-    <EmailAddress>mailto:istjohn@marjon.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.marshall.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.marshall.edu-idp-shibboleth.xml
deleted file mode 100644
index bed2bc86..00000000
--- a/swamid-interfederations-2.0/idp.marshall.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,96 +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://idp.marshall.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.marshall.edu/error.html" 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">marshall.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Marshall University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://idp.marshall.edu/idpinfo.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp.marshall.edu/idp_privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="200" width="800" xml:lang="en">https://idp.marshall.edu/logo.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>
-MIIDLDCCAhSgAwIBAgIVANGAwu+l/UWmtqeKbBJJeQMw2rmCMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMMEGlkcC5tYXJzaGFsbC5lZHUwHhcNMTUwMTI2MTg1MjIy
-WhcNMzUwMTI2MTg1MjIyWjAbMRkwFwYDVQQDDBBpZHAubWFyc2hhbGwuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkQnVnt67CT4IQe666qWZD8WI
-/lIHAF1Zm5bGkCiBR2Bz1DhGEPUzGbkbbBFPQK5tmYG71eE0cRckXQRwZNyrTo+Z
-5dB303LF2vXBGDxC5NTP5c2xKy/4OC+nMGkVp6Nwwhs0mLQpR16B438m6DcmiNdp
-vuoWpf25/Azy7RskIKQdXwmfmENbidvHEclS/A13aCLw1KIDvKViPAmYUpzmEVqd
-XUuEOeNCGaUFb2spJ8HqhWHZUpt/k/OjvY02CHDIiBF1SuUtcfdGltOJkMMM35Bs
-js1JeGotEy4IhLYmbpwOBSXbMK7xfCmaf0xQkI9ZLxI9/yGYy+f+WseNrCqjYwID
-AQABo2cwZTAdBgNVHQ4EFgQUPhjqgMn/CPXKcLThs7V9WqJA8ncwRAYDVR0RBD0w
-O4IQaWRwLm1hcnNoYWxsLmVkdYYnaHR0cHM6Ly9pZHAubWFyc2hhbGwuZWR1L2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQBANyIvhLg35hH8hscI3tZa
-HOtCyl0HDpHCNuwWY2k6NPt5LGhPR2YzShyTaxw4uXr/b8LGJt5M4r7xponFJzMl
-wewXOuiqbWnEBFsOIti6VgQxe5ezssfe/FBT9ajXJeaDdvOgynaIYMh8jBHCuYF3
-KTCjPZPIfa7HqJo093cyBY96qCYkYXXJfYGsb/AisqHXyzQQHbIQsW8dLC+ouTEa
-R21kn0ymq/VE5kJml2rLvTB8Msh76fdsxVz1IHvXexZCiuGIYHbVfJEzOlukooug
-t17n6E3j/nC8A5MtLGLUCIpW+p7tJdEF7fRdBxvs2ZyC8NaXfkSJX/ELF5P3km3d
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marshall.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.marshall.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.marshall.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.marshall.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.marshall.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marshall.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVANGAwu+l/UWmtqeKbBJJeQMw2rmCMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMMEGlkcC5tYXJzaGFsbC5lZHUwHhcNMTUwMTI2MTg1MjIy
-WhcNMzUwMTI2MTg1MjIyWjAbMRkwFwYDVQQDDBBpZHAubWFyc2hhbGwuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkQnVnt67CT4IQe666qWZD8WI
-/lIHAF1Zm5bGkCiBR2Bz1DhGEPUzGbkbbBFPQK5tmYG71eE0cRckXQRwZNyrTo+Z
-5dB303LF2vXBGDxC5NTP5c2xKy/4OC+nMGkVp6Nwwhs0mLQpR16B438m6DcmiNdp
-vuoWpf25/Azy7RskIKQdXwmfmENbidvHEclS/A13aCLw1KIDvKViPAmYUpzmEVqd
-XUuEOeNCGaUFb2spJ8HqhWHZUpt/k/OjvY02CHDIiBF1SuUtcfdGltOJkMMM35Bs
-js1JeGotEy4IhLYmbpwOBSXbMK7xfCmaf0xQkI9ZLxI9/yGYy+f+WseNrCqjYwID
-AQABo2cwZTAdBgNVHQ4EFgQUPhjqgMn/CPXKcLThs7V9WqJA8ncwRAYDVR0RBD0w
-O4IQaWRwLm1hcnNoYWxsLmVkdYYnaHR0cHM6Ly9pZHAubWFyc2hhbGwuZWR1L2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQBANyIvhLg35hH8hscI3tZa
-HOtCyl0HDpHCNuwWY2k6NPt5LGhPR2YzShyTaxw4uXr/b8LGJt5M4r7xponFJzMl
-wewXOuiqbWnEBFsOIti6VgQxe5ezssfe/FBT9ajXJeaDdvOgynaIYMh8jBHCuYF3
-KTCjPZPIfa7HqJo093cyBY96qCYkYXXJfYGsb/AisqHXyzQQHbIQsW8dLC+ouTEa
-R21kn0ymq/VE5kJml2rLvTB8Msh76fdsxVz1IHvXexZCiuGIYHbVfJEzOlukooug
-t17n6E3j/nC8A5MtLGLUCIpW+p7tJdEF7fRdBxvs2ZyC8NaXfkSJX/ELF5P3km3d
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.marshall.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Marshall University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Marshall University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.marshall.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Edward Aractingi</md:GivenName>
-    <md:EmailAddress>aractingi1@marshall.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Systems Team</md:GivenName>
-    <md:EmailAddress>systems@marshall.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 32b2742d..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mast.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mast.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.mast.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mast.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mast.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mast.br/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">mast.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mast.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mast.br:8443/idp/profile/SAML1/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">MAST - Museu de Astronomia e Ciencias Afins</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">MAST - Museu de Astronomia e Ciencias Afins</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">MAST - Museu de Astronomia e Ciencias Afins</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mast.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.mast.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Leonardo Cardozo</md:SurName>
-    <md:EmailAddress>leonardo@mast.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e4d9e89d..00000000
--- a/swamid-interfederations-2.0/idp.mast.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.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>
-    MIIEODCCAyACAQAwDQYJKoZIhvcNAQEFBQAwgeExNDAyBgNVBAoTK01BU1QgLSBN
-dXNldSBkZSBBc3Ryb25vbWlhIGUgQ2llbmNpYXMgQWZpbnMxNDAyBgNVBAsTK01B
-U1QgLSBNdXNldSBkZSBBc3Ryb25vbWlhIGUgQ2llbmNpYXMgQWZpbnMxHjAcBgkq
-hkiG9w0BCQEWD3N1cG9ydGVAbWFzdC5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVp
-cm8xFzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjEUMBIGA1UE
-AxMLaWRwLm1hc3QuYnIwHhcNMTEwODEwMTU0ODMzWhcNMTQwODA5MTU0ODMzWjCB
-4TE0MDIGA1UEChMrTUFTVCAtIE11c2V1IGRlIEFzdHJvbm9taWEgZSBDaWVuY2lh
-cyBBZmluczE0MDIGA1UECxMrTUFTVCAtIE11c2V1IGRlIEFzdHJvbm9taWEgZSBD
-aWVuY2lhcyBBZmluczEeMBwGCSqGSIb3DQEJARYPc3Vwb3J0ZUBtYXN0LmJyMRcw
-FQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8x
-CzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAubWFzdC5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALq/Jtq5wZZuruoxS9xHqrKxS184BB7KaKbG4gDe
-rM7i6fjz9FqHiOenzzcPfx8QK3/jx138GeLh+V7xIhKbmkACoOaugVXF9tka5D8C
-T00bWQb3kgVE4o/CENU+0LXTYD1VqI+EPQhtwOtbApMcqgNpl11erTicoro2EUSb
-Nwvk7evnH28I2OR5MyCvc3VKmQYPebSZbZp7JDhTBPb/Eh53SJC0kHrbXvAAhVEy
-J4RNah7aD5LEN0zEsCnuBo82XSxryd5Q9mjYxF8cd5bGKOKMePyle3EMUfSg3E/8
-VijugSLN3Xmary9QNpnJEpK/NvQl8rRKV4H8SQiriR38nIsCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEABbhVYQRVmgVV+ZkapypYtD6xCJy8ARghj1oPU61AbfONICcr
-JBDtNEOWFlH8zTL42/EEEzWFFHjMQffIzEzPiGU4Km8p8bF2PPZC8YA5NCbOMv21
-nyPCnxetzKXU8q/dEoQwJwX7rILsvHglAxjtW6DIW4oWFnVnCjZhQoeVTeRkBywE
-IzG8yFXmV8X9zW3yQfoE3UOOEWkCPwkKE3SgysBrb9Z1C2VbL9pa/t0DcFedbg/3
-M/JFnTWdElxhlTAEUdWG02Q/wBD19fwkL4CUojJik6Jx+GqWojC8vGQ0DqnmWMu7
-ERJxOdpZK0LarTajQiMby3QbU2sYJ0W6f/9uJQ==
-            </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>
-      
-MIIEODCCAyACAQAwDQYJKoZIhvcNAQEFBQAwgeExNDAyBgNVBAoTK01BU1QgLSBN
-dXNldSBkZSBBc3Ryb25vbWlhIGUgQ2llbmNpYXMgQWZpbnMxNDAyBgNVBAsTK01B
-U1QgLSBNdXNldSBkZSBBc3Ryb25vbWlhIGUgQ2llbmNpYXMgQWZpbnMxHjAcBgkq
-hkiG9w0BCQEWD3N1cG9ydGVAbWFzdC5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVp
-cm8xFzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjEUMBIGA1UE
-AxMLaWRwLm1hc3QuYnIwHhcNMTEwODEwMTU0ODMzWhcNMTQwODA5MTU0ODMzWjCB
-4TE0MDIGA1UEChMrTUFTVCAtIE11c2V1IGRlIEFzdHJvbm9taWEgZSBDaWVuY2lh
-cyBBZmluczE0MDIGA1UECxMrTUFTVCAtIE11c2V1IGRlIEFzdHJvbm9taWEgZSBD
-aWVuY2lhcyBBZmluczEeMBwGCSqGSIb3DQEJARYPc3Vwb3J0ZUBtYXN0LmJyMRcw
-FQYDVQQHEw5SaW8gZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8x
-CzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtpZHAubWFzdC5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALq/Jtq5wZZuruoxS9xHqrKxS184BB7KaKbG4gDe
-rM7i6fjz9FqHiOenzzcPfx8QK3/jx138GeLh+V7xIhKbmkACoOaugVXF9tka5D8C
-T00bWQb3kgVE4o/CENU+0LXTYD1VqI+EPQhtwOtbApMcqgNpl11erTicoro2EUSb
-Nwvk7evnH28I2OR5MyCvc3VKmQYPebSZbZp7JDhTBPb/Eh53SJC0kHrbXvAAhVEy
-J4RNah7aD5LEN0zEsCnuBo82XSxryd5Q9mjYxF8cd5bGKOKMePyle3EMUfSg3E/8
-VijugSLN3Xmary9QNpnJEpK/NvQl8rRKV4H8SQiriR38nIsCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEABbhVYQRVmgVV+ZkapypYtD6xCJy8ARghj1oPU61AbfONICcr
-JBDtNEOWFlH8zTL42/EEEzWFFHjMQffIzEzPiGU4Km8p8bF2PPZC8YA5NCbOMv21
-nyPCnxetzKXU8q/dEoQwJwX7rILsvHglAxjtW6DIW4oWFnVnCjZhQoeVTeRkBywE
-IzG8yFXmV8X9zW3yQfoE3UOOEWkCPwkKE3SgysBrb9Z1C2VbL9pa/t0DcFedbg/3
-M/JFnTWdElxhlTAEUdWG02Q/wBD19fwkL4CUojJik6Jx+GqWojC8vGQ0DqnmWMu7
-ERJxOdpZK0LarTajQiMby3QbU2sYJ0W6f/9uJQ==
-                    
-            </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.math.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.math.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index bc11a0a6..00000000
--- a/swamid-interfederations-2.0/idp.math.cas.cz-idp-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://idp.math.cas.cz/idp/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="2014-11-10T13:39: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>
-  </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">math.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Mathematics AS CR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Matematický ústav AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider MU AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance MÚ AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.math.cas.cz/index.php?lang=1</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.math.cas.cz/index.php?lang=0</mdui:InformationURL>
-        <mdui:Logo height="44" width="44">https://jiftach.cas.cz/loga/logo-math-44.png</mdui:Logo>
-        <mdui:Logo height="100" width="100">https://jiftach.cas.cz/loga/logo-math-100.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAMI6h1I2Ucbuc9TH2mQ3pJfm1qhGMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC5tYXRoLmNhcy5jejAeFw0xNDExMDcwOTE0MzRa
-Fw0zNDExMDcwOTE0MzRaMBoxGDAWBgNVBAMTD2lkcC5tYXRoLmNhcy5jejCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL162cnXK9D8343uG82KuAbzVz1p
-sVYb++2LmIjoTV/zyG08zV+uFwcoZbRogE4FUTqCnQjRM0CVmQ83JGuuKy1WoVJ0
-frmAdAPKK2JhF/K6BRVYDMbxl7hfA2UWN1j7lwBivxywaG4yG1yvinevWz/vkLKo
-y3V1k3xMDk41103KYjnZ7zJzREgtpBY9zfiw7MhbeM+I3HHVSo76dQPjdcfJALco
-y3vG7OlsCaS4qovEPu5JbmStjscmNNCCOv89hPah3DZsxGLfZ3olikCGO+rGXPwe
-kzAGKoKVVuxRGCSCf1ppZYVPD5c6I82aFCVuRLDM8O4qQ6Fab6mJ6/rY6ksCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLm1hdGguY2FzLmN6hiZodHRwczovL2lkcC5t
-YXRoLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8puHnxuPvVxmZuQq
-3xOdeo0vxjgwDQYJKoZIhvcNAQEFBQADggEBAJmSwgJ/MOxvBI9NK65zMHYp2tHi
-CyCxtPnGxL3+9A/2Lx0AuxLCYVKDgU0GNaDkIERIQeMm5DyModRgrkhyEplo1Yxw
-aVw3qypUgmWyFx1gZb4zmp79E4AYGhCwWaRpczQsQMgs7w8QLHi9h+LZNo6hCR8w
-CP0e18qET2/sk6jb5d8xNV/KForfL7xWVDFhr4CGYZSfsaBtfmNDYf92XkAbxUrv
-SoTahRu2eTDuvcQSrsIy13GhlWj9D5fTUjeIx9y83wFfR5c1G2u9jWYyjHCP3BPV
-9BY8Bxf+cas1FfM8Ajg8fddlhBG/1/KJwXbjUWw9MNE3hdZQZ0WQ37yhIJs=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.math.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.math.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.math.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.math.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.math.cas.cz: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.math.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.math.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.math.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.math.cas.cz/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">math.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAMI6h1I2Ucbuc9TH2mQ3pJfm1qhGMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC5tYXRoLmNhcy5jejAeFw0xNDExMDcwOTE0MzRa
-Fw0zNDExMDcwOTE0MzRaMBoxGDAWBgNVBAMTD2lkcC5tYXRoLmNhcy5jejCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL162cnXK9D8343uG82KuAbzVz1p
-sVYb++2LmIjoTV/zyG08zV+uFwcoZbRogE4FUTqCnQjRM0CVmQ83JGuuKy1WoVJ0
-frmAdAPKK2JhF/K6BRVYDMbxl7hfA2UWN1j7lwBivxywaG4yG1yvinevWz/vkLKo
-y3V1k3xMDk41103KYjnZ7zJzREgtpBY9zfiw7MhbeM+I3HHVSo76dQPjdcfJALco
-y3vG7OlsCaS4qovEPu5JbmStjscmNNCCOv89hPah3DZsxGLfZ3olikCGO+rGXPwe
-kzAGKoKVVuxRGCSCf1ppZYVPD5c6I82aFCVuRLDM8O4qQ6Fab6mJ6/rY6ksCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLm1hdGguY2FzLmN6hiZodHRwczovL2lkcC5t
-YXRoLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8puHnxuPvVxmZuQq
-3xOdeo0vxjgwDQYJKoZIhvcNAQEFBQADggEBAJmSwgJ/MOxvBI9NK65zMHYp2tHi
-CyCxtPnGxL3+9A/2Lx0AuxLCYVKDgU0GNaDkIERIQeMm5DyModRgrkhyEplo1Yxw
-aVw3qypUgmWyFx1gZb4zmp79E4AYGhCwWaRpczQsQMgs7w8QLHi9h+LZNo6hCR8w
-CP0e18qET2/sk6jb5d8xNV/KForfL7xWVDFhr4CGYZSfsaBtfmNDYf92XkAbxUrv
-SoTahRu2eTDuvcQSrsIy13GhlWj9D5fTUjeIx9y83wFfR5c1G2u9jWYyjHCP3BPV
-9BY8Bxf+cas1FfM8Ajg8fddlhBG/1/KJwXbjUWw9MNE3hdZQZ0WQ37yhIJs=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.math.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.math.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Mathematics</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Matematický ústav</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Mathematics AS CR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Matematický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.math.cas.cz/index.php?lang=0</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.math.cas.cz/index.php?lang=1</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mba.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 9fff0d8c..00000000
--- a/swamid-interfederations-2.0/idp.mba.ac.uk-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" entityID="https://idp.mba.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The Marine Biological Association of the United Kingdom.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-16T15:47: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">mba.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The Marine Biological Association of the UK</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://idp.mba.ac.uk/idp/images/logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.mba.ac.uk/idp/images/logo-icon.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDeDCCAmACCQC//ypb/YRuTTANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJH
-						QjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBseW1vdXRoMTQwMgYDVQQKDCtU
-						aGUgTWFyaW5lIEJpb2xvZ2ljYWwgQXNzb2NpYXRpb24gb2YgdGhlIFVLMRYwFAYD
-						VQQDDA1pZHAubWJhLmFjLnVrMB4XDTE0MDcxNDEwNTg1MloXDTM0MDcwOTEwNTg1
-						MlowfjELMAkGA1UEBhMCR0IxDjAMBgNVBAgMBURldm9uMREwDwYDVQQHDAhQbHlt
-						b3V0aDE0MDIGA1UECgwrVGhlIE1hcmluZSBCaW9sb2dpY2FsIEFzc29jaWF0aW9u
-						IG9mIHRoZSBVSzEWMBQGA1UEAwwNaWRwLm1iYS5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAMrLs4qNhaeMVehDUdMdHKNkzu6FdEIv7+I+fK1N
-						xQEY7/xH4ei0+3szIy9AYFnFq6jQD/gvWg2tQmrzksuUcZPluWv+p1Oa8uAXf/8v
-						o4Nl1kbrw8lPf+QfFdtkRbgNwWQGPb9B46l8WctyyE7gIZMG/3kL13FKMkx2B51c
-						1t1VTdiOEP6+v/TuhQuzk+uczWtQb9JvpSplo25BtLiIobm/aKUtr48vD+yNhEm8
-						KFw9/HENeeCMqrs7+UNSbwyxQA289rVLo0X2mQYKllOt9GSB7TA9QqbogI6aFQg9
-						YcGgLu1r+VUV4tSJDTyWObs/o0FRWj+OAszT7UnhAU2I/D0CAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEANkSL3XK8hSm3z0HVikjTUXTKtv3VLPJqhhMddR9iyxVDoHff
-						nbiO1UlJV2QXxlVbRODZ3cwgjj4SHQFRpX3/2K5dK4WONGhxE37SNNtFrpdW37uv
-						MsaxlRzd8U7RgHyQQW1SlYgjDJt10S8Wh4Ztx3tlpMm/aXZyoRKryuUXK16VbEA6
-						UBYyypbXGq9dHlR/Hln5yEchjXlQe62dG/19UdqC5nC60eFtnSgmMWiLnJO3DjwD
-						cnhP7ImWStAG8MeUbq7PpoEfB29LFlAyelI4VkG6ms51DGE3ApJ5M1My6aAkhKXi
-						+x2qLGn4QG1NifGc7iGgas5AQdopZwumKy8d6A== </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mba.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mba.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.mba.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mba.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mba.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.mba.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mba.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mba.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mba.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">mba.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDeDCCAmACCQC//ypb/YRuTTANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJH
-						QjEOMAwGA1UECAwFRGV2b24xETAPBgNVBAcMCFBseW1vdXRoMTQwMgYDVQQKDCtU
-						aGUgTWFyaW5lIEJpb2xvZ2ljYWwgQXNzb2NpYXRpb24gb2YgdGhlIFVLMRYwFAYD
-						VQQDDA1pZHAubWJhLmFjLnVrMB4XDTE0MDcxNDEwNTg1MloXDTM0MDcwOTEwNTg1
-						MlowfjELMAkGA1UEBhMCR0IxDjAMBgNVBAgMBURldm9uMREwDwYDVQQHDAhQbHlt
-						b3V0aDE0MDIGA1UECgwrVGhlIE1hcmluZSBCaW9sb2dpY2FsIEFzc29jaWF0aW9u
-						IG9mIHRoZSBVSzEWMBQGA1UEAwwNaWRwLm1iYS5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAMrLs4qNhaeMVehDUdMdHKNkzu6FdEIv7+I+fK1N
-						xQEY7/xH4ei0+3szIy9AYFnFq6jQD/gvWg2tQmrzksuUcZPluWv+p1Oa8uAXf/8v
-						o4Nl1kbrw8lPf+QfFdtkRbgNwWQGPb9B46l8WctyyE7gIZMG/3kL13FKMkx2B51c
-						1t1VTdiOEP6+v/TuhQuzk+uczWtQb9JvpSplo25BtLiIobm/aKUtr48vD+yNhEm8
-						KFw9/HENeeCMqrs7+UNSbwyxQA289rVLo0X2mQYKllOt9GSB7TA9QqbogI6aFQg9
-						YcGgLu1r+VUV4tSJDTyWObs/o0FRWj+OAszT7UnhAU2I/D0CAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEANkSL3XK8hSm3z0HVikjTUXTKtv3VLPJqhhMddR9iyxVDoHff
-						nbiO1UlJV2QXxlVbRODZ3cwgjj4SHQFRpX3/2K5dK4WONGhxE37SNNtFrpdW37uv
-						MsaxlRzd8U7RgHyQQW1SlYgjDJt10S8Wh4Ztx3tlpMm/aXZyoRKryuUXK16VbEA6
-						UBYyypbXGq9dHlR/Hln5yEchjXlQe62dG/19UdqC5nC60eFtnSgmMWiLnJO3DjwD
-						cnhP7ImWStAG8MeUbq7PpoEfB29LFlAyelI4VkG6ms51DGE3ApJ5M1My6aAkhKXi
-						+x2qLGn4QG1NifGc7iGgas5AQdopZwumKy8d6A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mba.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mba.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 Marine Biological Association of the United Kingdom</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Marine Biological Association of the UK</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mba.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dan</GivenName>
-    <SurName>Lear</SurName>
-    <EmailAddress>mailto:dble@mba.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dan</GivenName>
-    <SurName>Lear</SurName>
-    <EmailAddress>mailto:dble@mba.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mbl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mbl.edu-idp-shibboleth.xml
deleted file mode 100644
index dbe5993a..00000000
--- a/swamid-interfederations-2.0/idp.mbl.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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://idp.mbl.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">mbl.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Marine Biological Laboratory</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Marine Biological Laboratory Federated Single Sign-On Service</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.mbl.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.mbl.edu/it/files/2013/05/incommon_privacy_statement.pdf</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>
-MIIDeDCCAuGgAwIBAgIJAJXRYjhSMB8sMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
-VQQGEwJVUzEWMBQGA1UECBMNTWFzc2FjaHVzZXR0czElMCMGA1UEChMcTWFyaW5l
-IEJpb2xvZ2ljYWwgTGFib3JhdG9yeTEfMB0GA1UECxMWSW5mb3JtYXRpb24gVGVj
-aG5vbG9neTEUMBIGA1UEAxMLaWRwLm1ibC5lZHUwHhcNMTIwNzE2MTUxNzI1WhcN
-MzIwNzExMTUxNzI1WjB3MQswCQYDVQQGEwJVUzEWMBQGA1UECBMNTWFzc2FjaHVz
-ZXR0czETMBEGA1UEBxMKV29vZHMgSG9sZTElMCMGA1UEChMcTWFyaW5lIEJpb2xv
-Z2ljYWwgTGFib3JhdG9yeTEUMBIGA1UEAxMLaWRwLm1ibC5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDf2IMVS6Uj/AY6Y0M/XlafcHbg0Io2mnqr
-E9rImOw7bx5x9mNZVERGP0IM4tQW8hIHI+OAivK8FhDW5LgLPqqcd0fSeJROFOBW
-u1+ssYXg7Qae+QkAbbkjP7qWV5pF4JSe+NfSZVptIllS/LEb2LThSx1muyKe7dvE
-uruYglpLwtELh9JJt7CFKd+0Z16J1C+mPjXr8v7YSbCEAeakV5EFGrUEx/VzzvRv
-MEn2E+6KM8e78Z6m3aYRKenRF0VryFHpiKkkKhwg3iDKf7Y2SEJf3CnshIxpoUEU
-/YPqr9KSGx4/RDG2Enu2EAAFoKDwZpSpGZqMCNJytauQnBzy+hR7AgMBAAGjezB5
-MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENl
-cnRpZmljYXRlMB0GA1UdDgQWBBQmngP4M69E0dBfby8kif3ltwOxrTAfBgNVHSME
-GDAWgBReurFgimXLG1EYKa8q4rJPb+X7tzANBgkqhkiG9w0BAQUFAAOBgQBWsE6q
-2ba1QbVCDTa7tSODC6vBZT5ioij1JUPeXyoZIS+RW8lvDmkGShG+4iRvEX21pUk2
-LfjdzGmLyOc+oHKS1CuQPe7hZS3IzC8U1fuyY/KIfqjba2zCk4ZyRFCP0vRlzxGc
-D9aaA2f9N+a9QmB0Bnwu75zgxjIrbQmLdJJp+A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbl.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mbl.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbl.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbl.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mbl.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mbl.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDeDCCAuGgAwIBAgIJAJXRYjhSMB8sMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
-VQQGEwJVUzEWMBQGA1UECBMNTWFzc2FjaHVzZXR0czElMCMGA1UEChMcTWFyaW5l
-IEJpb2xvZ2ljYWwgTGFib3JhdG9yeTEfMB0GA1UECxMWSW5mb3JtYXRpb24gVGVj
-aG5vbG9neTEUMBIGA1UEAxMLaWRwLm1ibC5lZHUwHhcNMTIwNzE2MTUxNzI1WhcN
-MzIwNzExMTUxNzI1WjB3MQswCQYDVQQGEwJVUzEWMBQGA1UECBMNTWFzc2FjaHVz
-ZXR0czETMBEGA1UEBxMKV29vZHMgSG9sZTElMCMGA1UEChMcTWFyaW5lIEJpb2xv
-Z2ljYWwgTGFib3JhdG9yeTEUMBIGA1UEAxMLaWRwLm1ibC5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDf2IMVS6Uj/AY6Y0M/XlafcHbg0Io2mnqr
-E9rImOw7bx5x9mNZVERGP0IM4tQW8hIHI+OAivK8FhDW5LgLPqqcd0fSeJROFOBW
-u1+ssYXg7Qae+QkAbbkjP7qWV5pF4JSe+NfSZVptIllS/LEb2LThSx1muyKe7dvE
-uruYglpLwtELh9JJt7CFKd+0Z16J1C+mPjXr8v7YSbCEAeakV5EFGrUEx/VzzvRv
-MEn2E+6KM8e78Z6m3aYRKenRF0VryFHpiKkkKhwg3iDKf7Y2SEJf3CnshIxpoUEU
-/YPqr9KSGx4/RDG2Enu2EAAFoKDwZpSpGZqMCNJytauQnBzy+hR7AgMBAAGjezB5
-MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENl
-cnRpZmljYXRlMB0GA1UdDgQWBBQmngP4M69E0dBfby8kif3ltwOxrTAfBgNVHSME
-GDAWgBReurFgimXLG1EYKa8q4rJPb+X7tzANBgkqhkiG9w0BAQUFAAOBgQBWsE6q
-2ba1QbVCDTa7tSODC6vBZT5ioij1JUPeXyoZIS+RW8lvDmkGShG+4iRvEX21pUk2
-LfjdzGmLyOc+oHKS1CuQPe7hZS3IzC8U1fuyY/KIfqjba2zCk4ZyRFCP0vRlzxGc
-D9aaA2f9N+a9QmB0Bnwu75zgxjIrbQmLdJJp+A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Marine Biological Laboratory</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Marine Biological Laboratory</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mbl.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kent Nasveschuk</md:GivenName>
-    <md:EmailAddress>knasveschuk@mbl.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Christopher Dematos</md:GivenName>
-    <md:EmailAddress>cdematos@mbl.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Christopher Dematos</md:GivenName>
-    <md:EmailAddress>cdematos@mbl.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mbro.ac.uk-metadata.xml b/swamid-interfederations-2.0/idp.mbro.ac.uk-metadata.xml
deleted file mode 100644
index 60441dfa..00000000
--- a/swamid-interfederations-2.0/idp.mbro.ac.uk-metadata.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.mbro.ac.uk/metadata">
-  <!--
-		This is an IdP (owned by Eduserv) for Middlesbrough College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">mbro.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/mbro.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/mbro.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Middlesbrough College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mbro.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</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 187ef96a..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mbu.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.cas.cz: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.mbu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbu.cas.cz/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">mbu.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Microbiology  AS CR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Mikrobiologický ústav AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Microbiology  AS CR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Mikrobiologický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mbu.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.mbu.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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.meduniwien.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml
deleted file mode 100644
index 47ecea14..00000000
--- a/swamid-interfederations-2.0/idp.meduniwien.ac.at-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://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="de">Medizinische Universität Wien</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Medical University of Vienna</mdui:DisplayName>
-        <mdui:Logo width="172" height="82">https://idp.meduniwien.ac.at/idp/images/meduni_logo.gif</mdui:Logo>
-        <mdui:Logo width="16" height="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: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: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.merit.edu.xml b/swamid-interfederations-2.0/idp.merit.edu.xml
deleted file mode 100644
index f1215bcc..00000000
--- a/swamid-interfederations-2.0/idp.merit.edu.xml
+++ /dev/null
@@ -1,61 +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://idp.merit.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">merit.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Merit Network, Inc.</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Merit SSP IDP</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>
-MIIEEzCCAvugAwIBAgIJAJPTkMqcbv2AMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYD
-VQQGEwJVUzELMAkGA1UECAwCTUkxEjAQBgNVBAcMCUFubiBBcmJvcjEWMBQGA1UE
-CgwNTWVyaXQgTmV0d29yazEWMBQGA1UECwwNSVQgT3BlcmF0aW9uczEeMBwGA1UE
-AwwVbWVyaXQtaWRwMDEubWVyaXQuZWR1MR8wHQYJKoZIhvcNAQkBFhBpdC1vcHNA
-bWVyaXQuZWR1MB4XDTEzMDQwNDIwMDcwNloXDTIzMDQwNDIwMDcwNlowgZ8xCzAJ
-BgNVBAYTAlVTMQswCQYDVQQIDAJNSTESMBAGA1UEBwwJQW5uIEFyYm9yMRYwFAYD
-VQQKDA1NZXJpdCBOZXR3b3JrMRYwFAYDVQQLDA1JVCBPcGVyYXRpb25zMR4wHAYD
-VQQDDBVtZXJpdC1pZHAwMS5tZXJpdC5lZHUxHzAdBgkqhkiG9w0BCQEWEGl0LW9w
-c0BtZXJpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvogfB
-MdVIw5G3DNdBBV61/VpmqaX+yd/vsRrrQFk/zEfXBhhLgvPh5klFYUiljjibrgO0
-VRt+tQBdNVkZmZbpUN2dxbcFOT2QGX2XaFcCY2NvBLTqeEe/TpcEmuiN2HM3D5ot
-M1tNT/5ld4kAjJGm8PrKyq7jivO8IbBk2P9QsnD/5yd1MI2s0vqseGY4eMtTUY1f
-Dfj9wZdNXx6Cuc89gHJ6JSWb5/I3m15AEq5cGkeE+FVfyAbOT6SN4o4jXhglOCzM
-eekthNZ8z/vGyzdLKwVdkJwkmCpNJhgnTw2P8xvBo51oh79Bf4c/LNO2eqp33ZBw
-rUmunwNbIogOzvJZAgMBAAGjUDBOMB0GA1UdDgQWBBRkXrVfR6LT5Crhz8S0ndpp
-OJdU5jAfBgNVHSMEGDAWgBRkXrVfR6LT5Crhz8S0ndppOJdU5jAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCstZjbV0uJmAqToHBgTUxW1qekX4fxYOEL
-Fxm8Tl5QNhRomQEWNpu04+eSM8WynMSh8GyS1S2lkRVOcaDQFgvY6PnUZYobTSzD
-oG0SFXgE1Zbvnu56JcWrUKdDrSs0QIxjqTxHiq/jRhztxiExjCI9DFPc8ig/rbzk
-+qsk88XxLJ2e+n0icdXgROWYRTxHbOgsVuHVrbMUMhFxeqwA8UGAAErVW0UpBdxj
-UX42ZnYC7Be3Kknd87onuaSSWLyMQFGqoz0FiBdnH7r0V1s4NDuDawHHk4sMDZBl
-yW53IkO/bdDl7whtv2akTp37DPTKkdCRD0jz51PoJTqf0NaLo6qh
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://merit-idp01.merit.edu/ssp/saml2/idp/SingleLogoutService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://merit-idp01.merit.edu/ssp/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Merit Network, Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Merit Network, Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.merit.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IT Operations</md:GivenName>
-    <md:EmailAddress>it-ops@merit.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.merthyr.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.merthyr.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 9e997748..00000000
--- a/swamid-interfederations-2.0/idp.merthyr.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.merthyr.ac.uk/idp/shibboleth">
-  <!--
-		This is a Merthyr Tydfil College Shibboleth IdP for the University of South Wales.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">merthyr.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIURCB/tUHtc3A/ovYJbLippy5MADIwDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAxMRaWRwLm1lcnRoeXIuYWMudWswHhcNMTEwNzA1MTExMjMx
-						WhcNMzEwNzA1MTExMjMxWjAcMRowGAYDVQQDExFpZHAubWVydGh5ci5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJFAsCItsP8+n3dD74AGDmML
-						LHA+qOSCF9QzNbyG6eUUmbbtq2YL03KomYlI0wV21lK9TDcUIVDwionhN+J5gzp/
-						j0XQ6/aTWIPeT5Igyw6rpYQJHR0F4hSMkZPHgoEIf+pJ4KsOxcS8v45Hs5G5jobz
-						KtksWzWz2saCt4Y0Dkbz1AhZuHeWRYkwx5HT231AdCgEOaCOieYqJizq+LGTNM9r
-						iakEZEoQ1iBwzwOEeeWTCLAdq74nLg1IqvldRE9qrzMD383wp8QDcnFrpRG0FpAP
-						zYDLciyZ6IehEB/197cVjAFhMBcR0g5LdWZRmchLYCIM5IRVeboxSOLJMzeRKUsC
-						AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLm1lcnRoeXIuYWMudWuGKGh0dHBzOi8v
-						aWRwLm1lcnRoeXIuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCnF7X1W
-						OJhryeXx3KqcXqwmzOMAMA0GCSqGSIb3DQEBBQUAA4IBAQBE9l2CvybnLgrucYfg
-						XucF8nJ6iXP2co2/L4YnA9psqMNvHlFGmtqsRGcByS+XlYX1cKGCJ2UHj/0Zti0W
-						RkjM0MT2NS/hBUv321UfMxJ6h7e/Xlrv4CTTxRO6kh5/9nXk8lfT6pcYFSGtC9b6
-						KHr+IQ726FM2L2VCsoH/3htHDM5L89KhzVg8iQmyxpQBNcj3MgURzr9AtBlWRvK0
-						aMsJOAqGAm5SC+E7ckFz57KHdVRYNl+PzG2tsQa491vYhpNAxGb4zHc6xITNZ315
-						0eUpscAC9+6x+Q53jgbzcKJ0011YisfPRo5mS0bMw1eMC849PJeX2p8MZeGgXuf8
-						wQ0d
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.merthyr.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.merthyr.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.merthyr.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.merthyr.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.merthyr.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">merthyr.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIURCB/tUHtc3A/ovYJbLippy5MADIwDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAxMRaWRwLm1lcnRoeXIuYWMudWswHhcNMTEwNzA1MTExMjMx
-						WhcNMzEwNzA1MTExMjMxWjAcMRowGAYDVQQDExFpZHAubWVydGh5ci5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJFAsCItsP8+n3dD74AGDmML
-						LHA+qOSCF9QzNbyG6eUUmbbtq2YL03KomYlI0wV21lK9TDcUIVDwionhN+J5gzp/
-						j0XQ6/aTWIPeT5Igyw6rpYQJHR0F4hSMkZPHgoEIf+pJ4KsOxcS8v45Hs5G5jobz
-						KtksWzWz2saCt4Y0Dkbz1AhZuHeWRYkwx5HT231AdCgEOaCOieYqJizq+LGTNM9r
-						iakEZEoQ1iBwzwOEeeWTCLAdq74nLg1IqvldRE9qrzMD383wp8QDcnFrpRG0FpAP
-						zYDLciyZ6IehEB/197cVjAFhMBcR0g5LdWZRmchLYCIM5IRVeboxSOLJMzeRKUsC
-						AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLm1lcnRoeXIuYWMudWuGKGh0dHBzOi8v
-						aWRwLm1lcnRoeXIuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCnF7X1W
-						OJhryeXx3KqcXqwmzOMAMA0GCSqGSIb3DQEBBQUAA4IBAQBE9l2CvybnLgrucYfg
-						XucF8nJ6iXP2co2/L4YnA9psqMNvHlFGmtqsRGcByS+XlYX1cKGCJ2UHj/0Zti0W
-						RkjM0MT2NS/hBUv321UfMxJ6h7e/Xlrv4CTTxRO6kh5/9nXk8lfT6pcYFSGtC9b6
-						KHr+IQ726FM2L2VCsoH/3htHDM5L89KhzVg8iQmyxpQBNcj3MgURzr9AtBlWRvK0
-						aMsJOAqGAm5SC+E7ckFz57KHdVRYNl+PzG2tsQa491vYhpNAxGb4zHc6xITNZ315
-						0eUpscAC9+6x+Q53jgbzcKJ0011YisfPRo5mS0bMw1eMC849PJeX2p8MZeGgXuf8
-						wQ0d
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.merthyr.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.merthyr.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 South Wales</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Merthyr Tydfil College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.merthyr.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adam</GivenName>
-    <SurName>Watkins</SurName>
-    <EmailAddress>mailto:a.watkins@merthyr.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Watkins</SurName>
-    <EmailAddress>mailto:a.watkins@merthyr.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 dcd62964..00000000
--- a/swamid-interfederations-2.0/idp.metropolia.fi.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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>MIIECzCCAvOgAwIBAgIRAL+szgnI0qWlv5j0dv0UYtswDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
-BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMTEx
-MjQwNjQwMThaFw0xNDExMjMwNjQwMThaMFExCzAJBgNVBAYTAkZJMSYwJAYDVQQKDB1NZXRyb3Bv
-bGlhIEFtbWF0dGlrb3JrZWFrb3VsdTEaMBgGA1UEAwwRaWRwLm1ldHJvcG9saWEuZmkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDS9Nz6Ju8uVYvBqzZq/HSzPL8yZzRRIexBXG7rsZEE
-ti0U+ERX/QJ7nDoQCCn4P8PQoGgZvl6A69F4TBxw27KcLEutuZfFAKhvd8P/X3+vbwDMIlJfMi2o
-oVWGxcIRfvuLoP5gsTJpmuDQE1xB6ZToA0xs5aIQOJFKzAznWOf8PPrUF7V2SE90xt4gE9OmpnOF
-w1gfp243SRnvxNJwai2+3L+FFAyygiCk4ao9IcdguXxpW42bLghb8GZAsla8ULvrNB+PaAMjYYkd
-EbvcoxbxynSE2LBrRlQ7cn769INlQkv7yVgo12zJ1GHBn2JgSdjiK/mPg68M24S5fAZXZVdBAgMB
-AAGjgfUwgfIwEwYDVR0jBAwwCoAISqCqWITTXjwwGQYDVR0gBBIwEDAOBgwrBgEEAYIPAgMBAQIw
-cgYDVR0fBGswaTBnoGWgY4ZhbGRhcDovLzE5NC4yNTIuMTI0LjI0MTozODkvY249U29uZXJhJTIw
-Q2xhc3MyJTIwQ0Esbz1Tb25lcmEsYz1GST9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0O2JpbmFy
-eTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgSwMB0GA1UdDgQW
-BBSetcs1P8mXrxv31HIiIZRlQ5pMizANBgkqhkiG9w0BAQUFAAOCAQEAJXlZQSERzZyIyD5t6zfC
-velNXend4z9jhUb3ZqFd86xAYNPRj+wNJBCSUJ3+mn1MWW5kV8D28jixtVvtqKZUgSCBBrxRJ5D9
-Hl7CRqNPubvcrxkXETZv0uEfnJaEK7wEWR0LP3r5RUjBc9AbSbsHOIX/sBxS/IMjTrb3PAwbAypT
-417lCgBzdpTIiDq+QF4bb4Tt/kjTRqPT21lporYTW+/NWFK02X+rgsABklvOQKSTEGvyDr6dLbSD
-tto9jTy1FzEicXFLvj36B+MB87UChYNTW7IJMJvJZgbuod76mjg9LkY+PHaxcn2kNmUYQKuuio0g
-LQc3QWj/dW5XWHUtjA==</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>MIIECzCCAvOgAwIBAgIRAL+szgnI0qWlv5j0dv0UYtswDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
-BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMTEx
-MjQwNjQwMThaFw0xNDExMjMwNjQwMThaMFExCzAJBgNVBAYTAkZJMSYwJAYDVQQKDB1NZXRyb3Bv
-bGlhIEFtbWF0dGlrb3JrZWFrb3VsdTEaMBgGA1UEAwwRaWRwLm1ldHJvcG9saWEuZmkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDS9Nz6Ju8uVYvBqzZq/HSzPL8yZzRRIexBXG7rsZEE
-ti0U+ERX/QJ7nDoQCCn4P8PQoGgZvl6A69F4TBxw27KcLEutuZfFAKhvd8P/X3+vbwDMIlJfMi2o
-oVWGxcIRfvuLoP5gsTJpmuDQE1xB6ZToA0xs5aIQOJFKzAznWOf8PPrUF7V2SE90xt4gE9OmpnOF
-w1gfp243SRnvxNJwai2+3L+FFAyygiCk4ao9IcdguXxpW42bLghb8GZAsla8ULvrNB+PaAMjYYkd
-EbvcoxbxynSE2LBrRlQ7cn769INlQkv7yVgo12zJ1GHBn2JgSdjiK/mPg68M24S5fAZXZVdBAgMB
-AAGjgfUwgfIwEwYDVR0jBAwwCoAISqCqWITTXjwwGQYDVR0gBBIwEDAOBgwrBgEEAYIPAgMBAQIw
-cgYDVR0fBGswaTBnoGWgY4ZhbGRhcDovLzE5NC4yNTIuMTI0LjI0MTozODkvY249U29uZXJhJTIw
-Q2xhc3MyJTIwQ0Esbz1Tb25lcmEsYz1GST9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0O2JpbmFy
-eTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgSwMB0GA1UdDgQW
-BBSetcs1P8mXrxv31HIiIZRlQ5pMizANBgkqhkiG9w0BAQUFAAOCAQEAJXlZQSERzZyIyD5t6zfC
-velNXend4z9jhUb3ZqFd86xAYNPRj+wNJBCSUJ3+mn1MWW5kV8D28jixtVvtqKZUgSCBBrxRJ5D9
-Hl7CRqNPubvcrxkXETZv0uEfnJaEK7wEWR0LP3r5RUjBc9AbSbsHOIX/sBxS/IMjTrb3PAwbAypT
-417lCgBzdpTIiDq+QF4bb4Tt/kjTRqPT21lporYTW+/NWFK02X+rgsABklvOQKSTEGvyDr6dLbSD
-tto9jTy1FzEicXFLvj36B+MB87UChYNTW7IJMJvJZgbuod76mjg9LkY+PHaxcn2kNmUYQKuuio0g
-LQc3QWj/dW5XWHUtjA==</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 yrkeshogskola</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 yrkeshogskola</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.mf.uni-lj.si-idp-20111101.xml b/swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.xml
deleted file mode 100644
index 8ea84382..00000000
--- a/swamid-interfederations-2.0/idp.mf.uni-lj.si-idp-20111101.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" entityID="https://idp.mf.uni-lj.si/idp/20111101">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-01-13T10:01:30Z">
-      <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 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">mf.uni-lj.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Ljubljana, Faculty of Medicine</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Univerza v Ljubljani, Medicinska fakulteta</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization University of Ljubljana, Faculty of Medicine</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Ljubljani, Medicinska fakulteta</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization University of Ljubljana, Faculty of Medicine</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Ljubljani, Medicinska fakulteta</mdui:Keywords>
-        <mdui:Logo height="287" width="189">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAL0AAAEfCAIAAACbFlA2AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AACAAElEQVR42u1ddXwUx9ufWTn3izsRJGhwd22BGqVCXan8KlSo0JaWlrpQb98aLbRQqkChuHuwAAkh7noue3u7O/P+seG4XELuEoI23w/tJ7nc7c3OfueZZx6FGGPQgQ60EsTFHkAHLkt08KYDbQF1sQdwQcFx2GLh6+p4k4l3uRDPY4oCcjlhNNIREVRYGEWS8GKP8fLAf4I3bjfKPsHs3uPMzHTl57F19byHQRyHEQIEASgKymREeDiV0Vdx882GYcNUHewJCnhl68WlpeymjY41a62HDrrNZkEQMEFACAEAAJ7mhjgBGAOEcFQU/fEnCZMnay/2wC91XLG8KSvz/vG7edly86lclufP0KVlIAS6dpUNGKCgaSjOC4SQIqFUCpUqQqUijAYqPIIKD6cjI2mDgZRI/qMK4hXIG5db+PtPy+df1GWf8Ig7UauAEEDIb04gEPkGIQAAEgSQyaBcToSHU8kp0u7d5QMHqvpkyMPD6It93xcUVxpvCgo8b79dtWqlze1G50lN8d/XIARKFdmli3TqVN011+hSU2UXewIuEK4o3uzf53zhhYoDB1wh7krtApFABAGTk6W33KK/dZYxJkZysWfivOPK4c2RI+7Zs0tyspmLdRoS98Q+GYrHH4+YMkUnkVzJh7IrhDduN5o9u/ivP60UdZGfliBgjYacdZvxiScio6KuWKXnCjkOmEz8sWNugrj4S5wkodOJvvqybvYDJUePuC/2cM4XrhDehIdTw4erMb4kpCeEAEKwZav9wdklmzfbL/ZwzgvI+fPnX+wxtAMoCvburTCZ+Lw8luNwGwQPxiCAc+eoWRMErK3l9u5xdkqWpqTILpiefmFwheg3IpxOYcUK83ff1mdne0K39WEMCAIYjRRNQYQBQpjnsdeLvV7M8xghIAgYAAAhaMMxTRBwQoLko0Xx48ZdUTboK4o3IioqvGvWWP9ZbTt6lLFaz/gW/B+5KF0wxhDCiHDqppsNM2caZDIoICAImGWR243cbmS1CpUV3rJyrqrKW1HBVVVyFgvv9WIIYejmREHAnbvIvvgisX9/5cWem3bDFcgbEU6ncOIEs3ev68ABV36ep97EOx2I5zHGgCShQkHodGSnTpJBg1QTJmh691G0fBBjWeRyoYoKb3Y2s3eva99eV34+y7KhmhYFAQ8fofr666TY2CvEtHPF8sYHrxdbLHx1NWeq5x0OwcthlZI0hlGRkXR4OKVQtPpkgDGoquK2b3P8/LNp716X14sIAgAAg37q3vuMb7wRJ5VeCWeRK5835w8WC//bb5bPPqspLvIG1cQxBioV8emnCddcq7/YA28HdPDmXHHokOuVlyt37HQQwXRmQcADByqX/pwcEXHZ2wOvBJl5cdG3r/LTzxImTdKgYAuQJOHhw+4//7Be7CG3Azp40w5ITJS+/Xb80CFKFIw7HIeXLzfX1XEXe8jnig7etA+SkqSvzI+Ji5Mg1NLbSBJmn2B27nRe7PGeKzp4024YOFB13/1hJBnkbW4GbdxgF22Jly86eNNugBDcfLOxZ095y5wgCHjwoKu25vLeqjp4056IiqKvv17fsjEQQlBRwRUVeS/2YM8JHbxpZ4wdp46IoFowbkAI3G5UWOi52CM9J3Twpp3RqZOsS1dZywcrnsdVVR37VAf8oFAQ6d3kQY2pDodwsUd6TujgTTsDQhCfIAnq7/SwHeepDjSGXk8GPY1f7t7Ny3v0lyYoKnh4l1x+ecf/dfCm/eFmUMtWYwihTnd5V3To4E37o76Ob9n0R9MwIqKDNx3wA0K4pJhtQd5gDGQyGBN9eYdSdPCmnWF3oJwcTwv6DcbAYKBiLvOA0Q7etDNO5TIFBWwL4X8Y44QEOjysY5/qwGlgDDZssJvNfMvnqd59FAplsJP6pY0O3rQnKiq8/6y2tvwemYwYOFB5uafhdfCm3YAx+PVX88ncljYphEBCgiQj47JPpOrgTbvh2DH34sUm1KLfCWM8dKgqJubyPkyBDt60F6w2/r33qkuK2RbyODEGajU5dZr2CqhX2sGbdoDXiz/7tGbNGlvLWVQI4f79FYMGqS72eNsBHbw5VwgCXvxD3Ref1wt8kHfKZMTNtxg0msv7JCWigzfnBI7D339X/8YbVU4navmIJAh44EDFpElXSFWKy9v6dHHhdqPPP6v56KMapxO3XJ4CY6BSkffdH67XXyETfoXcxoVHVRX3wfvVP/1kYlkctKYJxnjaNO3EiVeIsAEdvGkb9u93vr6gaudOJ8bBy3IhBJKTpf97LFIuv3K0gg7etA4WC//LL6YvPq8rLfWSZPD4LIyBRAIffjgiPV1+scfenujgTajgebx3r/PjRbVbttg5DoRog0EYT7lKN/Mmw+XuWAhAB29CwsmTzPff1//xu6W2lifJUIu0IQF0S5c/91zUlXH29kcHb4KgqIj9/Tfzzz+bCwtZCGGIYgYDjDHQ6sjnn4vq1u2K2qFEdPDmrCgs9Pzxh3XFr+a8PBYh0MratpAkwH33hV91te5i38d5QQdvAsHzOCeb+eMPy6pV1sJCr9h1obXNiDDCU6bqHnk0gqavLL3mNDp4cwYOh3DggOvPPyybNtkrK3kA2sIYAIAg4J495fNeijYYrtjpvWJvLHRgDMpKvZu32Ff+bc3MdNlsQqvKEwcAIRARQb/8SkzXrlegWuPDf5o3Lhc6csS1epVt40Z7UVFDgf5zCXLAGEil8IknI8ePv3JMw83iv8gbjEFZGbtls2PVKmtmptti4UUB0y5hMTfdrL/rrrA2i6vLBf+tOrQuFzpyxP3PauuGjbaiQq8oYNrLIocQGDpM+d13na7gtlM+XPnyxuEQqqu5khJv9gn3jh3OA5lui7k9BYwPkAAch5cuNXVOkyUlS+Niaa2WvBRaYp0PXJnyxuEQSkrYE8eZQ4fcx44xpaVek4n3eLDYCPP8mfwRAgBgiYTQ6sj4eLp7d3nv3opevRSpqVK9nrqSXA1XDm8QAtXV3hPHmT17nPv2u/LyWLOZ57xiC6C2n4/aBrFZK8aAoqBGSyZ3kmb0VQwZouzXVxkXL7kCjDqXPW8wBpWV3oOZri1bHXv3uEpKWJcLAdCWXlHnb4Ri2TaplIiJofv1U4wapR4yVNWpk/SidwNtMy5j3lit/KFD7nXrbNu2OoqKvB4PghBAeKnQpVkgBDDCtATGxEiGDlVNmqwZPFgVfRnWGLj8eIMQKCz0rPvXtnq17fhxxm4/JzPdRbwLjLFMRqSlSSdN1k69WpveXSGVXsKUb4zLiTcsiw4dcv/+u2XjBntpqdfXyO6yhljxJCKcGjZCNfNGw7BhKo32Mgi6uDx443Kh3bscy5aZt2511Nfzl6OAaRmiDqRSkf0HKG6aaZg4SRt2aResuNR543ahHTscixfX79jhtNuFK0DAtACRPVIp0bevYtZtxilTLl32XLq88Xrxrl2Ob7+t37bVccUzJgCCgKVSom8/xT33hE2erL0EwwUvRd5gDI4ccX/3Xd3qVTazmT+vjBHvXuzt6/sVNNc83P9PvlPbeaWyIGCFghgxUv3A/eEjR6klkkto3VxyvKms9C5ebFryk6m83NvujPG1fxbzVygKymSEXA61WlKtIZVKQq0iNVpSJoUUDSUSgqIAQoDzYi+HWBY77MjhEFwuweFANpvgdiOPB3EcRugMmdp9wAhhnY669lrtAw9GdO9+qcRmXEK88XjQmjW2zz6tPXzYLUbZtQt8pluCgEoloTeQMdGSpCRJaqosLp6OjKIjI2idjpTLCZkMSiSEL7ulab9xhDDHYY8HMQxyOFBdLVddzVVUegvy2aIitqKCq6/nnU7E87htTepbuAWMcVIn6b33hs2aZbwUwsEuFd6cOuX5+OOaP/+wOp1Cu7gbEQIIYYKEGjURnyDp2kXWq7eiRw95p04So5FWq4l29DhiDNxuwWzmy8q47BPM0aPu7GymuNhrsQg8jwmifU5/CAGKAqNHq5+cEzVkiOrinigvPm88DPrjT8uiRTW5J9lzl/MiXSQSGBVFd+8uHzxYOWCgsnNnmcFAXTCjPsbAauWLi9jMg+69e51ZR5myMi/DoHYxHwgCjoqi77sv/N77wi6i4LnIvCkpYT/8oObXXy1uNzqXORU3EYqC0dF0v/6KcWM1g4eoEhIkMtlFtvOILYMOHXJt2uTYu8dZXOxlWXSOWxhCgCTBuHGauc9F9et3cUq+XTTeIAQ2bbK/ubDq8CE3OAcxIxrsdToyo6/i6qt1I0eqO3WSnuPRQ2ShKLpEDVp80qEk9p59nLiigtu31/nPP9bdu121tTxC+Fx2ZEHAiUnSOXMib77ZcOGXx8XhjcuFvvuu7uNFNWL6Y9suIvoZEpMkkyZqpk7TZfRRqNSts3MwDHI4BLNZqK/namu4ujreahWsVt5uRyyLOR5zHBIEQJKApgiKBnIZodGQOj2p01EREVREOG0MowwGSq0mQn9yLItOnvT8+6/tn9W2nBzG6227twQhoFAQs24zzHkqMjrqghbSvgi8KSvzvvVW1W8rLKFUAGkWgoBpGnbrJrvuOv206bqUFFmI1/F4UG0tX1jgOZXH5ud5CgvZ8nKvzYYcTsHDIFHABJTIhwAETJCo5xIEkMsJlZrU6cj4OElysjStszQtTZacLA0Lo0KhUVUVt369bcUK88FMt9vdxs0LYwAgGDlS9er82D4ZivZ6RkFxoXlz9Ihr3ryKHTtcbVOBBQFTFOjZU3HbbcarrtbGxARfZByHq6u5EyeYAwdcx7KY/HxPTQ3PMEjgMTg3Cx7GAGCAAUAIi7uYQkFERtFpqdJeveQDBirT0+WRkXTL+rjVKmzdav9xsWnPHqfbjdomfQUBd+4se/XVmMlTtBcmMvXC8QZjsH697eWXKk6e9LRhdkSLTnq6bNZthmuu0QdljJfFhUWePbtdO3Y4srKYigqv240AOC/WOf97FHUjggAKBREXL+ndWzFihGrIEFVSkrSFMD+bTdiwwfbjYtPevS6WbQt7EAJh4eQzz0TddVfYBWiKdoF4w/P411/Nr71aWVXFtXZSxCcRHy+ZdZth1qywhISWGIMQKC1lt213bNpgP3jQXV3NiUkLF8HagQHCDUaB6Gh6wADl+AmaESPUcXGSs7HWYuH//sv6zTd1J054MG615RMhoFDAhx+JeOKJKJXq/N7wheANy6Jv/q/unXerbdZWH7YFAWs05PRrtA/cH9Grt6IFOeF0CgcOuP75x7Zls6OkhOU4HKK9xN/5AE5vWM3qGv4+rFY5FsQwP4mUSE6WjBunuepqbd++SoWi+cGVlHh//LFu6VJTVSVPEKBVWo8Y0Xz7HYYXX4wxGs+jdee884Zh0Ecf1Xz8cQ3jbp0WLI4rI0P++BORkydrW5C9dXXc5s32X3+17N/vsoeQpevveZBKoVJJaDRkWBhlNFJ6PaXTETo9pVQSNAVpCaRIKAjYy2Evi10uZLXxVotgsQqmer6+nnc4BKcTeb1YVHGC6rai1UCvJ4cMVc2caRg1St2s7Q4hfOCA68MPqzdttHNc60phiIaDG2boX389NjLyfEWgnl/euFzovfeqPv+szuvFrVIpBAEbjNQdtxvvfyA8Lu6sG1N1DbdqpXX5MvOxY4zH09KRxBccLpFAg4FKTJSkpcnSOktTUmTx8RKjkVKpCKWSpOmQSq9xHHa6BKdDqK/ny0q5/AJPXp4nP48tKfFarbzXi0GLgfHiYORyIiNDccuthquu0oaFNfOAbTZh2S+mL76oKypi27C5T5+uXfhmXOz5aXR1HnnjcqG33qz86qt6jmsFacQto08fxdznoidO1Jxtvurq+FWrLEuXmI4eZTjurAY08QmRJNTrydRU6YAByr59FV27ymNjJRot2Y7aMULAZuPLy7iTJ5mDB12ZB90F+azVKrScsSXG2WT0ld9xR9hVV2mbrVJ7+JDr7berN260C0Lr1HmEwFVXad9977xQ53zxhmHQe+9Vf/JxbatIgxCQy+GMG/Vz5kR16iRt9j1uN1q/3vbVl3WZmS6vt3nG+OgSHk716aMYPUY9aJAqJUWqvVChuxYLn5/P7t3j3LLVnpXFmOp5sfJSs1MhCFgmI4YMUT44O3zMWI2syY5sNvPfflP35Vd19XWtM5MiBK65RvvOu/HtvmGdF96wLF60qPqD92tYthWkEQQcHU3PeSrqttuMzeqMGIMDB1xfflG7bp39bG5zUYHQaMheveVTpuhGjVSlpslaVQBWQNjLYpmMEEfOcdhmEwwGqm0nMpdLOHXKs3Wr499/bcePeZxOoQX2aLTk1Kt1s2eH9+4TaMFDCK9fZ1uwoOrECaa16s6NN+oWvhnfviGn7c8bnsdffFH75sIqhmmdpOnVSz7/1ZgxYzTNfqqujvvhh/rvvq2vrOSanXrRzhsbR0+YoJk+TdevvzJE6ZKV5T5+jOnRU96rl8LtRh98UJ2QILn1VqNor1u3zvbBB9Uff5zYpYus6WcxBl4vCsVeYrHw+/e5/l5p3bzJXl3dUJSp6dUQwomJkgceCL+1uTib7GxmwWuV69fbxUix0HHbbYYFr8e1o7gl58+f317XEu98+XLzgtcqg5ae9/8IAGDKFM2HHyX0769slhBbt9rnzi1f9ovFbkdNnYviJKalSe+5J+yll2NmzTKmpMjOZumvrPRu3erYt9elUBLiSfWbb+qef64iJVU6aJDq1+WmDRtsDz4QIf6J5/GHH1b/s9qekioZMKCZPi4ulzD/lYoNG+zVNZzHgyQSqFA0rzbJ5URqqmziJO3o0Wqthqyr4ywWIaBstngis1rR9u2OrCwmPl4SYOwJD6dHj9awHnz8OMPzoVIHY3DiBIMEPHiIqr2CSdqZNxs32p5/rry+XgidNBQFZ91mWLgwLjGxGYXGYuE//6x2/iuVOdmeprmYCGEAYGqqdPZD4a+8Ejv9Gn1EBB0gxv2tMvv3u959p1oQwMlcBiHQu7cCAFBYyK5bZxs6VBURQX/2Wc0zz0T37NWwTeTnsz/9VO92IYdTmDZN11SuVFRwr86vys31GIzUpo2OokJ22DC1uIE2W0qdJGBUFD16tGbceI1WQ1ZWcRYLH2AtghBgDAoK2C2bHQDgrt3k/t+rUBBDh6nkcuLwYZfHE5JEhxAgBI4edWs0ZN++inZxRLQnbw4dcs15sqy42BtqsVYM5HL42P8iXngxplkzxrEs93PPl/+42OR0BpreRZEeG0c/cH/4awtip07VNXsYQQj89FO9yykkJEg5Ds97sTw2VvLK/NiJE7WdkqQyOQEAqKjwrlppi4mld+92jhqlmX6N3vfx334zx8VKoqLorVucw4ermjL7+HFm8WLTxEnaDz9MmDhR26ePQq0mIQQsiz75pKa6mmu2CC2EwGigRoxQjx2rkcmIkmLW4RACVgVBQIcD7dzpLChgu3WV+2snNA37D1BGR9EHD7ocDhQadTDHgUOH3AmJ0nap3N5u1uiKCu/LL1Xm5obqe0IIKFXE3Oein342St0k/kEQ8MqVlnvvLV7zj61prLEgYJWKuOVW/ZIlyfNeiklJkZ7tWyAEFgv/519WhDDP43oTv2WL4/ffLaWlXtlpZTnMSEulcM0a219/WqurOdH6AgCw2YQD+10TJ2knTtKyLPrnH6toAfJHbq7H40EJ8RKPB6vVZEQELUqLX34xv7mweutWewvaI4SgSxfZq6/G/PhTpxtu0MvlhCA0ejdBAI7Df/xhufe+og0bbP6Xoih4y63Gd9+Lj4ujAj51tm8jCGCxCK+9Wrlvn/PcH3f7yBuXC82fX/HPaluIMhAhoNUS8+bFPPBAuEQSyF2nS/jis9pXX62qKPc2FTMAgH79FK8tiH300cj4eGnAajty2L1mrVUhJ41GSnQCGI3Ub79ZBg9WhYXRFjP/55+WlSutq1dZd+1y6vVkp04ym11Y8avZoKf0OmrTJntkJN2rlwJCsGOH45dfzCYTn53tLipiq6v5yZO1Oh3lfxeiAUkigTt3OI8fc/fprZBKiZ07HR99WFNXxyd3kk6dqvPNicnE8xyWNla8CALGxUkmTNSmpEiLi9naWh74OedFjae6mtu2zSmhYfcecp9zVKRdaprsYKbbYhFC3LAsFr6gwDNqlOYcdeR24I0g4K++qvvyi7oQDVMIAa2WnD8/5q67w5q6iOvquAWvVX7+WZ3bhQJYKAhYr6fufyD8jdfjBgxoRsXDGCz+of7llyvXr7fX1HKREbTRSBuN1KGDLodd6NtX2aOHPCVFihCuquYPHXRnZTGTp2gpCv663BIdLXn6mcht25zbtju6pcsSE6WfflIzYYL2+hv0AwepeB5v2eRMTpb6x2U6HMKnn9byPP7wo4SBg5QaDZWaKisp9X68qHrGDMPx44xSSVx/g0GkviDgNxdWffVVXWqarKkzn6Zh9+7ysWM1GOFTpzweD/LftAgCOp1o506ny4n69lP6q/wpKbKuXWX797vM5pCoQxCwrIyz24RRo9RNV+wF5c2mTfaXX6pwOELyWWIM1GrixXnRd90d3vTBFxWxc58tX7HCEkBB0fXYp49i4Zux99wTHrDo8/M9S5bUR4TTBgOl0ZLr19lMZn77Nue6dfbKKm9kJBUVRa9dYxs7XqNSkj16KqZN00+erKVpsGOHc/wEbWQkvewXs9eLn50bHR5GrV5tO3TITVFw/37nU3OiUlJkERG0TEb88YfFahWmTtX5Hlt+PvvF57XJybJHHolITJSmpsqsduHFF8p79lLccIPh1+VmgoAzZxrEtZGf73n1tarqam7mTcboaFoQsNuNA+JZdTpq9ChNcor01Cm2ro4PUJZ5Hhw65Cov9/btp/DP4ExKkqakyvbucVltIVEHAHDypEerJfsPULXZYn6uvCkpYZ9+uiw/PyQHCsZALifmPhf1wAPNFBLPyWGeeKJs00Z7gIaIEJBK4U03Gd55N37gQFWAEPJ60fz5FR8vqo2IpIcMURmNVH6+Z8gQ1eDBypwcz4YN9rVrbW4XOpnr6dFdnpAgLS1lZTIiKoqmKLhrp/P228PUanLbNodCQUyapB0yRCWXE2FGiiTB6FGaAQOV4lB0WkqlImLj6O7pcvXpZ7Zhg/3X5Zax49TTp+shBAyD3n23qqzUy3nxgQOuw4cZqZS44Qa9QkFgDL75pu6ff6wP3B9xw/X6I0fdH31Us2qVpUsXeYDXmiRht27yESPUZhOfl+fxt9OImtPx455TuZ7+A5T+54DkZGliomTPbpc9BDVZpGB2NpORoUhIlII24Zx4wzDo9der1q6xhUgaigKPPRbx2GORTSXk0SPuJ54o27vHGXAphIDRSD7zTOSzc6P9jeU2m3DwoIskoV5PSSRw3Tp7aal34iSNwUBBCLOOMq+9Fjdpskavp/Lz2O3bndVVvEZLjhunXb7c/NNP9eVl3n9WW6dN00+cqJHLibFjNddfbwgPpyUSYsgQ1YSJ2qHD1Onpch9/ZTJi8BDViBFqtd9C53lsMFLDh6u7dpVxHP7889qcHOaTTxPHjNXK5cSePU43g2bMMGi1ZGkp++r8SgzAuHGav/+y/vuvrVOSZMYMY2qqjKZh07KmYWHU6DFqiYTIOsZ4GptPIQQFBeyJbE+/fgp/b2hqmiwyktq50xGKuRVCYLcLJSXeseM06lYGZbcDb5YvN3/0YU2IBigIwW23GZ9/IVqhCBzooUOuxx8rPXTIHUAaQcBdusjeeSfu1llGnw0DIbB5s/2zz2q2bHYQJOzVS5GQICkq9m7e7AgLp4cMUYWH03/+ZUlOlvbqrRg5Uj1+gsZgpKqq+MpKbvJkrcFA1dRwSgVx7XX6qVN1FAUJAqpUpELR6ky86GjJ6NGazp1lEAK3G2Wf8NxyqzE5WaZUEomJ0o0b7cVF3htn6sPD6W+/qf97pZUi4d69rrHjNM/NjZ40WRcbKxFJ89FH1UePMF27yfztNDIZMXiwKilJknWUEZPk/WYSlpSwx7KYfv2U4eG0b3q7dpVJpHDPbmcoT0RUdBDGI0ao2xBe2Hbe5OYyc58tq6kJycSHEJ48Rbvwzbimdppjx5gnHy89coRpKmkGDVJ++FHCqFEa32LEGKxYYf53rfXee8Pvuis8LU0mlxNi2tS6f+25Jz3jxmliYyWlpWx2tmfESDWEwGCghg9Xj5+gGTJYmZwii4+XjBih7tdfGRMjaRcLmDg0qZQYMEDpk4iCANavt5/KZa+9Vi/weN68CoWcGD5Cffy45+abDf4txNessb38UmV2tmfCRI2PBL5Hm54u79VLfuKEp7qa85dIEMKyMm9OtmfgQKVvpyMI2KuXgnGjzExXiN6jU7me7umytDRZSO/2Qxt54/Gg1xdUbd3qCGXqBQH36aP48MOEhITA3TQ3l3ni8dLMTHfT8/bkyZoPPozv3r2Rh+/ECffbb1XOfS4mI0MplRJyeYP3MSKCrqryrltnl8vhqFFqpZJc8pNpxAi177RpMFAJidILVsiTIGC3bvIuXWVJnaRLlphWr7bdeWfYiOHqVats3brJRoxU+27/qTllNhuaPz9m9Gh1s5MZnyAdPFgppqAHHLLKyrhTpzyDB6t8ug5FwT4ZiqIib06OJ5TdimFQWZl3/ARta3erNp7E1vxj/fNPc4in7uhoev78mLTOgaQuK/c++2z5vn2upnLy2ut0H3wYn5IS+JF16+xOJ05KCuQfScJZt4XFxdHLl1kOHHB16SK75hrdRcxEFY0rd94ZlpoqNRioAQOUM2bo4xMkNA0LC1nRUme18QvfqMrNZR95NGLmTQbfJJhMvFgS1Ydu3eSLFiVMnqwNuCOCANu2OV58oby2hvO9qNdRL82LyciQh2IPJEmYmen+5pu60IyHfl/dhkkpL/MuWlTrdOKgsXGiJ+HpZ6JGj9YE/Mls5ue/Ur5tq6MJafCNM3Vvvx3nb+TwVakpL/fW1nDl5WzA1Xged+kimzZdZ7MJe3Y7pVLi3vvCW45gvzCQSonHHo9c+ktyj54KrZZUKoniYq/bjTAGP/1oWr3adu21uocfPnO6tNuE5+aW/f67OeA6iUnS9z+Inz69KXXgv//aX3+9yuEQfC+mpErnvxobE0M3NXA3+4x+XGzau7d1RuRW71MI4U8/q/vzT2soOxTG4NZZhjlzoujGhgqGQW8urFq61NyUeTNmGBYujPft9AjhvXtdv60w9+6tkEhg9glmzRqbTAZHjWoUCrhypQVjMKC/athw5bXXtT3v1eUSTCbe40Fy+ZkTDs/j+nqeomDbnMkQArWKJEkoqmL1Jn70aI3dLjw3t8JgoD74MMEXj4cQ+Prruqxj7tkPRjR1t2k05JAhquJi9tQpNsC4lZ3NAAgGD1b55iQxUUpSYMd2Z1BjLITA6RTsdjRxkiZ0S2Cr5zfrKPPzUlMoW4Ag4IwM+VNzogLCphACP/1k+v77+oDMSIzBtGm6Ba/H+vvwamq4V16pWLiwevEP9QjhiZM0CQmSHxebly6t5/mGQRw96t60ya5Sk527yKZN05+LBT0ri7lpZsGsWwvz8s6ItD17nI88XFJdxbX5siJUKvLJOVGLPko0GKi6Wq6+nrvlFoN/WM/2bfbVq60vvRTTKVnqdArffFNbWOjxv0JUFP3Wm3HjJ6j9p060x3z5Rd1vK8z+RcFuuz1s2nRdKPFVBAE3bbKv+ccW+r20Tt54POiNN6p27XIGPblhDPQG6s234vr3DyyYsHmTfd6LFTZbI/syQnjcOM1778VHN7bBy+UETcEdO5x79jhTUmTDh6vVanLrVvvGjY6aGs7pRJs22tevt99xR1iABt02KBTEn39Y9+1zpaVJxZEjBL76so4gwMyZxnYpzKPWkDQNJVJi925nly6ygafPVqdOeV5+uWLWbcarrtKJsW/zX6msqeHHjWskBjRacsAAZVaWq7TE6xP5EAKWxVlZ7owMRXx8wwRKJUTXrvJdO50BpuemgBB4vbiqips0URtijn3reLN1q/29d6s5LiSDzQMPhN99d1jAdpaf75nzZFlBQSP7siCAvn0VH3wYn5wcqAgTBEzvLlepyPUbbAf2O/v0UU6eok1Lk9bXcwcz3dnZTEQk9eCDET16tE9qtEJBWCzCli0OAMG0aTqahrW13Jdf1t13f1hq6w+rLX9RYpJ09SqrQkno9VRBgefV+RW9eilmPxRBknD5MtOC16oMBuqxxyK7dZMHzKFeT/XsKd+/311by/tbk61WIb/AM2aMxueFCAuj1Cpy82Z70EdGELCmhgsPpwYOCsn50AreuFxowYLKY1nB41sFAffrp3z9jVh/R5J4hfmvVGzaZPcnDUKgU7Lko48S+vQ5I5lsNj4nhzGZBIWCkMmInj0VCOG1a+3HstyDh6iGD1dPm6afcaPhllsNkyc3H3nTZuh05L//2ktLvWPGqGNiJJs22QuL2NmzI87FC9gsEhIkKamyf/+1rlxpXbvW1q+f8vEnIhUKcu1a63PPVdA0fO/9eJ87XeCx/7RHRUmSU6TbtzscdsGnhxEErCjnvCwaOUrtU8WSk6VFxezx40zQQwxCoKrKO3GiJuCpNYtW8GbTJtsnH9cFtUViDDQacsHrsQE7FMZg8eL6zz+r8/e5YAw0WuL112MnTTrTWHDXLsecOeUfL6pdtsy8d68rMpJOTpZmZCjq6vh1/9pF70xUFK1Wk60KOA8RWi118qRnzx5XXKxk4CDV55/Xjh6jHtBfde5XborISHr4cHX//sqrrtJNnKiVyYitW+1z5pQxbvzmW3HXXqsXJ6q2lvvww+rEBKnOb4UkJUlVKnLHDmdAxkhuLpuQIOnZs0EA0zRMSZFu2eII6jCHEJhMgtFIDRkSXOSEyhunU3jt1ars7ODCBmE880bDww9HBpw+Dh92Pf9cudncyL5MkuCxxyPuuSfcJ4F273Ys+qimTx/FiBFqm1XYscOxbbszJUXSvbsiI0OZk+PZvt0ZFUUPHqw8T9VpSRKSJPznHxvjRkmdJJs2OR5+KOL8VRAmSajRkGo1iTHYts3x1Jyymhr+5fnRs2YZ/dQXuG+va/MWx7BhKp8vAkLQrZvcZuczM92+q4mayqlcz4gR6vDwBpKFhdEIgW3bHEFVZIRAVRU3frxGH6wCXKi82bjJ/tmntUGFDUIgIV7SNE3Q4RBefqli/35XY7UGXz1V98orMUplw1PJy/P88L1p9kMRt95qFNulYAS2b3Pk5rITJ2lioiVdu8ri4ug77wxTqs5jJpReT23b6sjJ8RQWsBkZimnT9Beg5LbbLbz1ZtXu3c4nnoh85NFI2m/V0TSMjqY//bTGbhMG+R22KQr26iU/fsxdUMD668gmE8+40dhxGtEsBCHo1Em6/4CrxE+VbhYQArNZCAunhg4NInJC4o3Hg956q/LoUSbogQJC8PDDEdddZwgwMPy81PzVV412KIRAWpr0vffjfc6Hmhru+efKIyLpW29tWGpKJTl4iKqujt+yxTF0mCotVRYVRQ8Zovbx7DxBLieqq7lNm+wOB5r7bHRC4oWwH9I00b27vLaWi42R9Oun9HeJ5OYyL75YcWC/u6CQ1eupnj3P1FdQKsnkFOnWrQ6bzT+CAhYWsskpUl+9Y4WC0GiIDRscQROuMQZmEz95SpAi7SHpB4cPuXdsdwUlDUKge7ps1m3GAE9nQYHniy9q/XPwMAZKJfHU01H+56DMTNfOnc4fF5sWfVTjPm1oVyiIO+406vQEzzW8cgGWPoRgwkSNwUj26SPv1fsCFbGCEKSlyd5+O76klF2woNJn/921y/HgA8UbNziuv17/wQcJf/5pWbvW6v/B/v1Vjz0eIZVCf+ON0yl88klNWZnX97bx47UTJmiCWpAJAuTmev79N4gtJ7i84Xm86KOaXbucQTUbkgRPPhk5dqwm4OPvv1+z7l+7P5kwxjfO1D/+eJT/qkpIkCQmSPcfcK1dY7PaBF+lD6cT7dntvP32MOMFbHKh11Nx8ZLJU7Spqe15/A4KlYrs31/JenCXLnIIwfLl5mefLS8r5R79X8TLr8T26CEPC6MIAvh77iAEnTvLck+xJ3POaJ8EAWtreLWaHDZMLa40moYGA7XuX3vQ7Bmexw4HuvpqbQvHjuC8yTvFvvlmVdB8C0EAffrIX5wXo2qseezd61r4RqV/MBFCIDVV9vY7cdHRDfI/O5vhOKzXU917yDMyFNknmNWr7YVFbO/eCoOB+me11Wikpk7TXZgKZCIoCvbooWjqwL8AUCrJ7j3kdpvw7jtVb71dBTB8+eXoRx+NFCc2OVmakiKz2wVBAL5VJ5USiYnSLZvt/rsVwqC4mB0+XOXrSx0VRZ865Tl2jAmm5cD6er53hqJL57OumeD71PoNtspKLkhFGYBpGt92myGgdTbDoP/7us7fPAUAkEjgQw+Fd+3asPVWVXHzX6nIyWHEX4cMUX31ddJVV2lXr7I+NLv4669rT2S7mw1GvrJRWen980+rQU9/9FHCvfdF+Id0HT/mnj27+Kuvav29DX36KO69L4z0W7MEAcrLvd9+U+fL7JFKiTvuDDMaqZYPVmIY2qqVVo476/uC8MZqFdassQV1siMBdO0mv+pqXcDrO3c6Nm2y+7Eb8wIaNkx5w4yG3DZBwD/+WN+1m3zECA3GYMcOR3m5NzVV9tGi+DvvCsvMdC9fZrnrrvDLsQPlOaJHT8Wbb8V++lnC9Gt0vkXLMGjpkvo77ixc849tyRJTZuYZJzZBgFtvMfbvr/B/WAQB16yxZWa6fK/0768YM0YdVMuBEO7c4cg75TnbG4LwRqzBGVyzIeD11+mjGpfQdbnQ99/X2/yC7DGGeh310MMRPovk7t3On5eaEhMlEILcXObdd6pqazkAQEQEvXBh3AsvRL+2ILbZlMcrHgQBpk7V+8efnMxh5jxZ+tRT5U4Hnjcv+qHZ4Z9/Vltfd8bbGhFJz54doVSS/gpyfT2/eHE9yzaIJqmUmHmTQTQXtfztVVX8+vVn1Y5b4g1CeO0aq8MhBLXZJCZJpl+jC3jbzh2O7dsaBQQihKdM0Y4apfb9umePo6aGf+WVyrlzyxZ9VDPlKm1GhhIAUFDgOZXLzHkqctiw82KovbxgsQg/fF83a1bh8uUWuYJ44MGwp56Ovu32MI2WXL/B7v/OiZO0Y8c2EicEAdevsx84cEbkDB2qGjhQEVTkIIT/XWezWvlm/9oSb6qquF27nCEEZ+GJkzTJyY1USJZFy5eb/LVpjEF4OHWnX5VUgoCzZ0d+/kVi1y7S776tW7nSCgBwuQRBwJ98UrN1q+M/1OHu7GBZ9PbblU8/XWazCc+/ELVoUUJmprugwCOTES++GDNxgtb/zUolcdfdYVptI5FjNvPLl1v408qKWk1ef70+aCsCgoDZ2Z7jx5nm/9rCJzMPuIqLvUFrLOp01NSrAw87hw+7t251Bgqbq3QBfSg0GvL66/U/LUme+1y0SkW+/FLlIw+XfP55rdnM3zLL2EEbAIBEQgwdqo6Jlbz3fvzTT0dPnarr2VO2aaMdABAZSXM83rzJ7q/TDBumGjeukZ0GQrhxgy075wwDRo/RJCdLA+KfAgAhsNuELVua906clRSCgDdusns8LV4bAIRwRl95QIV3QcC//WY2mXh/YRMWRs2aZRBpjhAoKmRNpgYZGB0tee65mO9/6DR6tHrVKtuij2ruuis86rzVwry8ACGYMkV73XX6kyc9HIcJAjz2WNTMmwziXy1m/pNPqouKzkSZyeXEbbcbNX4ihyBAVRX3558W3ysxMfT4CeqgIV0Yg+3bHFZLM1vVWXlTVcXt3esKulNQFJx6tS4gGr64mN24we7/WYTwqNHqjNP0Mpv5R/9XcsP1+fPmlW/YYKuu5gAAQ4eqvvm20wsvRt11d9iIEeoQpxUhgDDwnwGMga+VCzjdkSpgbSHUUJ8LYyAIWBAwz+OALR+hhvzixlfGviv73uZyIv/riwNodqhnu3LLoGl47z3h+/c7d+92AADUatIXOtItXd4tXSFu8T4MHqwcMkTZ+Hbgv//aqqoazMcEAa++SqfXU8G0Y5ib6zl+opmt6qx2v927nD/9aGpZlCEEYmLoZ+dGB9SO+/03yx9/WP2FjUpFvvBCdJfTNhuSBGWl3r//tu7b61q50rZ+nf3ECcblQlotOWaMZvhwVYjBLvX1/NtvV/31lyU6SuI7q+ecZF57rXLzZnt6ulytJr/4oub/vq7zctjnrBEE/H//V3fsmDsjQ3nihHv+/Mq1a+zbt9tXrbIdOeI2GKiICNrlRB+8X7X8V7NSSfjSJ8rKvAteq1y92pacLPVFQGdluefMKYmPl/oC7Q4fdr3+epXLKXTzy/isrPQuWlSdmiqTSokPP6z++WczxrhLl1CPilod2aOnIjFB6m9WLa/wLvnJ9Ptvltxcxt+jJJEQEIIN6+3C6Vh1CIHVitLTZb74Cq2O2r7dWVLCtnBYhhB4PDg5WTJsWOAyPuvj2bPXKTY0aAEY4/79FZ0aZ6U4HMLqf6y+4F8AAEK4T4Zi8NAzJyMxyv+224wZfRXXXKPzsOjHH03331d844z8o0fcobcX8HrRmn9sS34ym81nZKnVwv+2wrJqpc3lEiAEhw66lywx+8cLiy8eOewGADgc6I/frbt2Oa66SpeaKv14Uc0TT5TW1HAQgo0b7T8uNlVUnDnoOp3C339bf1thsduF0zMA/lltXbPG/tefFt/6rqvjly8zP/98xd9/ndka7Ha0eZPD5UIY461bHd99W19QwILWoHu63JfXV1TEfvxxzU03Fsx7scLhEEgK/v231f/No0dr0tNl/nqPl0WrV1t9iodGQ44Zowrl0LNvr4thApnQ/BNyOAT/k9vZQNNw3HiNRNrou48fZ44eaWTyIUk4dapW29i/qlaTL7wY3aWzbOxY9V9/pX39f4nXX69L6yxLTW2FaV8iIRQKQiqFcr/6o1IpQVFAJoNSCQEhUChIiQRqtWfeQBBQpSbEj8hkBE1DrY7q3195221hiUnSkzlMdTVHS6BYBtu/0QFNQ6kUSqTQly9Rb+I3b3HQNNyyxVFe3sAwpZKQSom6Ov6llyo3b7af/lIgkxMNacVKgqZhG7z6PI8PH3a/Or9yxoyCl1+qtFiE2Q+FLf815cMPEzZssPlrOUYjNaVxbxiCgAf2u0/5mfJGjdYYDGQw2zHMzvaUlnoDXm+eN0WFbN4pT8vmPoRAZCQ9eHCgfWXrFrvVyvt7o+Lj6fHjNU2vEBlJP/Fk5D//2GpquBtuMHzxZdJnnyWGhbdCHSYIQJCAICDl9wjEnrwEAQkSAABIEkAIpI03PoqContf7CQFRVW9iLVZhf79VXGxErHwIIQgIA6GogiSOFP/a88ep9FIjhunKShgd2x3NIwKwtRUyYgRqtJS73Nzy8X6VlD8IgggBATZ0D0v9DsVwXrwu+9UvfNOFeNGjz4a8euKlDfeiOvTR9Grl+KqKVqfPwEAACGYNFkbGUn5H8jr6vjtpwcJAOjaVZaeLmvZkEMQoK6OO3LEHfh6s+8+foIJGlaIMe7eXe7b1EVYrcLWxnFlGONhw1Q+FcFi4fPyPLm5npwc5sgRt9ksxMVKXnm5oqDAQ9NQLJLVOt40dBHzF2+AJM+8CAkAACAbu9JJEoqqG4SAJEFtLff6goo3Xq8cMVL1xsJYYxiFMSZIACEgqYAri98IAQA8hzdvtF9/veH2240QgtX/WBvkOQRRUfRbb8WNGKk6edLzzDPlJ064afJ01wgISAJACMjWx7gqVcT11+sffiR8+a/JC16P7dGjIWRdIoH33R8RUCm3SxfZgAGNtGOE8ObNDtdp9UOtJgcOCt6e0+vFhw4FJpw3E5mAMThyxM3zQbo/QggHD1YGuNqzs5mTOY0ElVRKjBuvEb2SSMAfflj9888WAgKex14vFgQsCIBh0IsvVHz6WWLbazP7V1SEjeoB+la5Pzgv9neUyuXE0KFqiZRYudIqkdS+9lpss/nSEEL/W8vL9+Se8tx+h5EgYWwsvXeP69gxZuBApVi/My1N9u678Y88XJyZ6X722fLHH48UK+hCfHq0bbJOXXud/vob9E23gqbrTSolxo9Xr1lj8zuQw2PHmIJ8T6/TBVMHD1YplXUeT5Cj3YnjjMsl+KvkzTwnl1M4cYJp+UIYA42GaMrWA/tddjvy36QSEyUDB57eyyCcMEGblcXs2ulMTpZ2SpYq5IRMRkikUKMm3W6h2fG0AN952381QAJCAoqF0wEAMimBEPCy/ssOuNxC9GnXPcJApSLHT9CMGavesd257BfzxImaq6/WIQEAALCfRihWqRFP0QCAtWts1dXcx4tqIAQUBc1m/u+/zeISxxgLAk5Pl7/3XsIjj5Ts3OG0mHmpjIAQYACQADAGSAh+g01BUbC4mN261SGTESoVoVKRtATSJJBICJKCCgWRmCjxLYmhQ9UxMXRZWUM4gxhCmpnp8vGme3d5XJzk1Cm2BesuhLCoyFtVxaWltcibqiquuJBtWdPGGMTGSgLqX7As2rvXKQhnljLGuP8Ahe+ETBBgxAh1j+7yX5aZDux3Tp2mnzRJqzqHSGHRDBNgUIEQEBAgjMVTaEyMBGNQWnbmWORyCRXlnGgiQghgBMTHLJUSMhkUBOB2Y4wBL2CMgdDI8AogIX4drq/nt2y1z38lpn9/JYAg84Dr4YdL1/1rf/ghL8ZQEBq6cvbrr3zrnbj/PVqaleVJTZOKUyegwCu3Fnl5Ho7D5eXeulq+X3+lx4P27nGWl3Ndusp++qmTL7U+IVHap4+ipORMUjbP4T27XXfcESY+o4gIOj1ddvJkS7osQYB6E5+b6/F/3M3wpqCANZmDVLVBCHftKg0oZlNezgV0D6AoOLRJjW69gXr44cijw9RLl5p273befLMxI0PRtvAajsOMGzEM3rnTUVvLORxC375KAAAvYDkkxH12zBh15y7Sv/+yDBumyshQuNxo2S8mmQyOGaMBAHi9yOvFTifKy/McP85kZzPp3WUDBig4DrucyOvF+/a6AAB2m5CeLg+PoARBVMPhhvU2jMDoMQ2FORUKoksX2YEDrrX/2hITJB72jCVw9CjN66/HznmyzMtiJACEsMuFOA4HNXOcDUlJ0jfeiAMAnDjBfPll7bPPRP290vLXX2a5nLjjDqN/ES6pFA4eoly9+oxbmyDg0aPumhpOTBygadirt+Kvv6wtfyPrQdnZzNSpuiC88XiCVMknCNirtyKgnMzJk0xtLe/7IMYgPILqe5bG6L17K9LSZKtXW99+u+q66/SzZhnbMIMkCYYOU3XvLs/PZ/NOedxuFBlJR0bSnBdrtaRaTQAAuqXLv/wy6Ycf6r/8otYYRpEEjImlF74ZJ0pBmYyYPEWDAfj5F7PNyt95V9hNNxlSU2VOpzBgoCI2lq6t41avtjqdSCojDAbKyyKNlpTJiXoTf+NMgy8XXaejbp1lCAsn7TZerpAOHqwi/LTDadP0bjfasd0hkUIIQb9+Co2ajIk5V0dK584ymQzOeap000ZHRAT9xsLYSZMCoxIGDFDpdKTVKvjaz1ZWcvn5rC/hpGdPuUJBtKziIATy8jyCcEblDeQNxiAvjxG7JrVwIYUC9mySWpuV5WaYM4XNEcJpabLEsycDKBTEzJmG/v2VQb1gZ0N4OP3uu/Gi2uvrTPbnnxaPB4+f0CAJIARi2ymHXWA8WC4ntH6dp3r0UPzf/3XCGIvVtX0mR6WSfO21OH9FDQC8fbvDYhZumKGPiaEffDDC/4wGIbj77rA77jACAEkSDBqk9pegBAFuucV4ww0GsS/aSy/FtqF9ZlOYTHxFBff339YhQ1RvNZeKDwBITZUmJUl8NfAgBC4XOn6c8UWzpKbKwsOpkhKuRRUHlBR7nU7kWyeBvHG7UVGRN2jAjV5PJSU1IgTL4qyjTMBprUcPeVDrVkAARqsAIfCPB2BZ8Msv9evX2x57LOKhhyMCbI86PaVrcgWCEK8AW76yIOA//rCsWmW77Q7D//4X2axFW0zYO/1zM6P1XbBdyn6dPMk8N7d82zbnxAnat9+J63yWWGCtluzeXX7w4BkDjCDgI0fcPuERHk7Fx0uKi70tHPAghJWVnMnEn5U3VitfXu4NphTjqCg6wEBnNvH+2V/i7PTpI7+QsRA0DSdO1F51lS48nG7f7yUIOGKEZsQITUQEdSHD41tARQV34IBr6jTtwoVxAVY0f5Ak7N1b7i/8IAR5pzw2q2AwUgAAhYJM6iTdvr2lukkQAptNKC9nfYs8kDf1Jr5xBlczwBgkJUkCOg1XVnn962VgDLQ60hd8fmFAECCUTvRtAIQgIOT+oqNPH8ULL0bPmGEI2suuW7pcqSSczobHShCwqoqrreNF3hAESEuTBc3jdLtRddUZJ2CgvK2t5d3uIIYFggDJKdKAE1BxMet0+ocSg4hw+txVvw6cDUYj9fDDkaE0QExIkATkMNjtQmnJGWdWSrI0aPifIICKyjNeqkB5U1vNBc3LIgjYVDAWFLD+3S4RwgkJkqa5ogiBlrIjIAA45IxM2KLFFfr+d5a/AQCA707hWd93SWxKZ7mN0MZmMFCxcXRREdtwQxB4PLiw8AxvIqNopZLwnbmaBcbYPzQgkDcVFd6ghymJBAYkpmAMSorZAONbcrI0oMWoGPiyfYeTpgAAEGMg+iMFBAgCEBCIhxrRJgsJQECAMQAQEISYxNpQidLvMIJJAoqXgrCBdgACSACMAQSAgACDBi5CwvfXhlfFu8QANFSzbaAtgKDB6SjaFUUfJEkChBtKVEJ4+qtgw9MT/xMnoMEqDM+QEgIASYAxhgASEIo/NLxLHC3A4gdFCyYJIYAAYwAJACHACAIozgYWfR3iyZEkIMINfcvx6YFpNOSMGw3+5fsVCiIpSbrDT4NBCBeXnBEe4eGUSkW03FQGY1BdxXEcFpX6wH2qppZrOVYLY6BSEQH9rlkWVdc0iiYkCJiQIAlYrAgBnsdOhzBxolYmAxSFx0/QRERSTqcwbpwmNU1WVeUdPkLdu4+ypNTbv79y8GBVSSnbOU02fLiqptobEU4PH65yOnmKAkOGKMPCqPJyvn9/lVpNVlR6+/VXdO4szTnp7txFlpQkyclmunaR9eotLyz0qNVk794KmoIlpd4ePeRxsXRWljspSdotXVFXx9vtqEtXeZeu8ooK1u4QunaRJSdLGQb9/oflx59Mx465d+92fPNN7Z49Do0aJiVJEhIkOScZu0OIjqb37XNBAkRH01YrfyyLiYqkZVK4Y7tdrSbCw+iso0xNDW80UiYzv3+fy6CnKyu8Bw+5tFqSE9D6jVaJBHhYtH69jSahlIYbN9qtFkEuI3fuchYWshIpPHLYffiwm5LgggLP1q12goTV1d5//rEgjO0O4c+/LE4XYhj055+W2lquro7/4w9rbR1vsTR5FvGSxnnWoKrK6xP8Gg1pMFAth42K8e2+QJxG8gYjYLUGUW4wBgolaTQ22oCcTlTfuIgcRYGmyg1NQ5qCN9ygnzXLmJPNTJqsHTFCXVfLZWQob7rJsOJXs1yuvfvusF07ndXV3tmzIwoKPEePuh/9XyTLon17HY/+LyI8nD561H3HHWG9eyt++L4+MVFyz71hX31Z272H7I47wg4fdlVWcI8/Frlzp8NmFf73WKTdLmQdZR79X0RsrOSbb+p69lLcdVfYoUOu+nr+8ccjCQJWlHsnTNAOH6ESBFxQwFx/vZ6iiBUrzMePM6NGqm+caRgxXOVwCn/9aV250nroEDPzJsOUKVqlioAQ3nlnmMMpDBqkmjBBm5PD/N//1T38cARC2GIWZtyoT02VRUfTdfXco49GFhZ6Pvqo+qGHwvPz2e+/q3vs8Uiex06ncOONhrh4ydy5ZTffYkxOlspkRGyc5MYbDQmJdHU19/jjUTt2ONats819NiYvz/PpJzVPPBHpdqOXX6q4995wo5F6bm7ZTTcZevaUkyQYPFg1cpT62WfKRLtlwMzHxjUqDg8hqK3l3G4kum/lciIsPKhnEDocgi9Uo5G88XLIvwzu2aBSEgE9FlwuwWzm/avhy+UwoonK5nKhEyeYgQOVZWVes4Xv0V1utwt5pzz9+yl4HmdmugYNVAIAdu129M1QQAj27HGlpckUCuLQIbfBQEdG0rm5DMfh1FQZy+KsY27RZngim+nbVwEA2L/f1bWbDEKwf7+zVy85AODkSUYuJyIiaI7DublMjx5yAMCRI+7UFClBQJOJr6/nU1KlAIBTpzwHD7o/eL/mySdLPR688M24RR8nxETTv/5qtlqFhx6O+GFxpwkTNN99W3f77YV797rEAKhu3eTHjjEAgLg4ideLS0pYqZSIi6OPHnUDAHr0kOfleRgGxcZKKIrIyWGSk6VeDuXne2QyIi1VtmevUy4nUlKke/c4AQADByozD7h4Hvfrpzx1irXbhe7d5WYTX1LCJiZKSQoeO8bo9VR0DL1/v5OmYXp3+a5dDgBA/wHK3budUimR1lm2Z08zJ+qoKFoqacQbU73gcjYID4kEajVBA7iAw4l8+XuNeMOyOGj9AIyxWk0EqN8OB2KYRh9UKim9PlApzjvloWnYubMsM9OV3EmqN1DZ2YxKTXRKlpWVed1uoWcvhc0mlJSwAwepBAFnZbmGDlMBAPbvdw4arCIIuH+/q3t3uVJJlJWxPA/S0+WFBSxJwM6dZRyHT53yDByoZBhUXOzt108FAMjKYrqly2ga1tVxDIPT0mQYg7xTHrFBd0kxq1QSSMBLfjI9+0y5y4l69lJ89VXS66/H8jx+bm7Z//5XsmKF5cEHS555pqys3Hv/A+FLlqZMm6rLz2PX/Wv74ft6g4EqLfVyHFarycREyckcDwCgTx9lTo4HAJCSKoUAVFR4pVKiZw/5oUNuhYJIS5OJrBo8VHX8OIMxGDpUnZXlRgj06q1wu1F5uTclRaZWkzk5jMFAJSdLDx1ySySwX1/Fgf1OCMHQoSrRjjd0qOrkScbL4gEDlLV1vMnEjxiuPn7M3TSvW68n5QrCjxnQ6US+TYckoSZY8V4IgYdBvkLujaST14tdzuDyRqMhAyyedjvv9RsrxkAqhU0d3Xv2OkgKHjnC/PuvrUcP+cFM18qVVomEOHzItX2HAyF48qQnJ8djtQoVFVxWlruokLXbhe3bHYcPudPTFQf2u7ZucYwarcnMdG3f7kAInzjOrN9ghxBkZTHV1VxpqddsEnJzrXV1fHUVZzbxu3c5h49QZWa6so663W6Um+tx2IWCAtZmQ0cOuzdssGdmuu67rxhAMH2adtp0vUpFbN/uWPhGVVmpd8gw5YcfJaSlybKy3MuWmZ94vLRHD/kttxhvu914/fX6VautK361OBw8w6CPF9VoNETeKc/hQ+7yCraqitu9y6VRVxMULCj0fvJpbec0aX4ee+qUh2FQTrZn8yZHbS3vsKF9e51vv1UlCHj3Htdbb1Up5ER+Pvveu9WpqbKCfM+nn9Ts2uXIyfHs2OEsKmRLS73Hj7tdbmS18tu3O6VSKCCcmel+7bUKlZrMPsEsWFCp05E7dzn//NN840yj/xNSqUmZjMD4jJeKZZHD71nrdGTQ05nXi52nt6NGfedrqrlp0/JajsbgeXz9Dfpvvknyt9+sW2e9685i3wEeIdC9u2zlqjR/rZ5h0OOPlVA0gQR8NMs9bJia4/DePc5Bg1UyKdy509G9uzwsnN67xxkdQ3dKkh456qZI2L27PL+AtZj5/v2VNTVcXp5nyFAVwGDXLme3dJleR+3c5ejVS2E0UMdPMBiDXr3khw66FAqiS1e52cRnZTFDh6poCTyw3xkeTicnSwuL2MpKTqUkTpzw0DTs3Ud+00zD2HEansdr19r+/MPidAkTJ2qvu06flibzTSXP46xj7hW/mnftdCYkSG6+xThqtJrn8D//WH9eaj540O3xoLAwCiEcGUnTNKyp4eVyqNFSHgaZTHxMjAQSoKrSq9GSKiVZXuE1GkmFgrSYeY7DkZG0xSKwLIqKknBeVFnFiW3Dy8q80dG0RALLyzmDgVSpiMoqTiaFRiNVV8cLAoiKou12wWYT4uMlDINqarjERKnZzI8cpVq0KNGfBxWV3qlX5xUVNmRRil0Hf1mW7EtU+OCD6tderWrhuYsRV78sSxk6VBUobwQE+BD6O0hoGBAK6HIhnvcvp4VVKiJAJuXleWRy4q234teutSUmSp95Nmr/PhdFgdffiKso9zoc/OtvxAMAXnqxbM7T0XFxkhdfLL/hBsPAgcp33qnq0kV+7bW6xYvr+/ZVPPRwRGmp1+7gX3893mziXW7hjTfilEpy/vyK8eM1w4apnn+u/OZbDP36Kf/91xYTQz//QgzLonkvlt9/f0RCouS996pzshmeJyZN0tx8i2HAAGVdHb94cf3atTapFF4zXXfV1bqA4oQAAIqCfTOUGX2Up055/vjD8sEH1d99WzfjRsNVU3RTp+o3rLf99JOpuJgFEL/8SsygQarFP9RJpcTNtxirqrgPPqh+/vlog4H64ouamGjJNdfq33+vKqOvcvwEze5dzk2b7PPmxRzY71r7r/WlebFisd9HH4mIjZcsWFAxbaqu/wDVxx/XJCdLpl+j/+Vnk8MhzJ4dsXmzfddO57x5MTk5zPc/1C9YEGuzobferHxxXkxpqfevvywc16gJo0xKKBSNSMHz2L97iFQaPKlaPA6LPwdUwMc8F5w3YsC2PzgOC42P71IpEUDefXudPXrI5XLi8CHXoMFKioKZma6MDKVcRhw+7E5OkRmN1MmTjFpLJiVJy8u9rAf17Cm324WyMu+AAUpBACdOMIOHqEgSHj/OxMdLwsKoI0fcKSkyvZ4ym3irhe/VS15ZybFe3KWLnCThieOMGOxRV8dbLEJmpmv2g8WbN9qnXKX75JPEDz9KCAuj3n6r+u67ivbvcz34YPiPPybf/0BEU9L4IHZ5ef756MWLk8eN1/y42DRrVuGyX0zDhqt+WpL8yvzYlGT5e+9WL1liCo+gq6o5o5Hq2lUWHkZZrYLRSA0bpi4uYY1GatBgVWEhq9dRgwYpPR7k9eJBg5WcF7sZISFR0rmLLK+ADQujBgxQ5uR4dDpyxHBV7kmPWkWOGKEuLfWSJBw8WOVwCC436tVbIZUQ1dV8crI0JlaSn+/p10/JsqikpFGSDUkAqeTM3gIhEBDwV4NoOrh3Xuyl3QxvBAEIIQQv0k1s0jwHMGr0Ikk1CsX1eFB2jmf4cHVNDWe1Cn37Kt1ulJfvGTJEiTE4fMg9dKgaALB/n2tAf5VIqc5dZGo1eey422ikEhIkxcUszzfkzh0+7BJbfx096h48WAkAOJHNREbSYWH0kSPu5E5SrZZ0u1F5hbdnT3lFhXfpEtPOnc6flpgyMpQ//Jj80rwYtxs9+0zZQw+V1NRyL70U8+13STNmGPzD0GpruaVLTF98UfvFF7Vff1135Ijb/7gRHy955JHIn5Yk3zrLuG6d7fbbCr/8srZPH/kPizs9/njkrp2ODz+o2b7NeeIEgxBITpEePOgSj4G1NXxFhTc9XV5czNbXc2o1GR5OZWa6lEoyOkZyYL94mFJkZjpZFvXtqzx5krFahW7p8rp6rrSUTUyUEhBkZzMGAxURSWdmumgadukq273biRDu21exZ49TJoMpKbL9+50BsbMBfiHsJzwAABI6iLwRjbE+sdJ4nxJC6QLRTJAAx4mWTD9u0Y3iSzZtth875t6xw1FaypaXs3/9ba6t4U/lejZvtv/7r23/AVdUNJWby6xfbxs+QrV4cd3KldaUFOmPP9Zt2eKgKPjjj3VHjrirq7lfV5hYD96506lQEnl57P79rohIKr/As3WLUyIBi3+sW7vGHhVNLVlaX1vD5Z70fPtN3b79LpWKfOWVmEmTtXIZsX27Y/4r5cXF7JChqg8/TBDbzDS9x19+Me3c4RJJWVXFbd5s//rrpAC3SXg4dfvtxunTdVu32n/91fzPauuIkeqbbjJ89XXS7t3OJUtMDz9UHB0jMZt4i1XYudPJ8+D4MdfDDxXL5MSJ454HHyhWKImiQu+WzY7fVliKith/19pWrrK5XMLJk56KSg4jcPSIe/bsYrmMOHLE/eQTZQYjefwYk5vLxsXT+Xns1i2OlSutlZXeulr+YKbTYhHy89nyMq6szGux8jwP7rgj7LQvE1CN1QaEMO/XqIQIIVgXYyCc3lQCmsk2ZI20DIEP/p4AHMp0pabISBIeOugeMFCJBLB/v6tbNzlJwkOHXHGxtFJJnjjOyOVkVJSkpMTrcuKUFFl9vVBa4r3mWr3bhY8dY8aM0fAcOH6c0WlJvY7av98VGUmpVKTFLJSWeqdN09bW8GYTP2igcvtWx7//2kkShkfQTz4RNXKUmmXx2rXWP363OBxo/ATNi/NiO3eWtaAG1tfzo0apH/1fBAAgJ4d58cVylkUANDO7Wi15zTX6CRO0+/Y6ly03P/xwSd8MxS23GD/9NDEz0/XD9/XHT7gZNzboqW7dpAShKCxkBw1SellcU8Nn9FX07Enu2+dCCKeny/btd3lZFB5BW61CWak3vbs8JVVaVMhmZCi7dJHl5nqMRmXXrvJDh1wREVRyivRgpstq5aOj6doavqKCi4qmlSoiL8+T1ElaUcFVV3GNREhTiQDPvCTwwQWGmDPUHG8oSIbAO//8LhE03VTjOZNG7/Egi0V4+JGI6Gj60CHX449HKZXE0SPuhx+J6NxZVlTonTBRM3Kk+uOPawYMVN58s/G338xqNfnggxG7dztM9dz//hdZWMhm5zDiB99/v3r0aPX11xuqqrwDBugnTdIeOeKurOCeeCJq2zbHli2O48eZwkL2hhn6mTMNffooamu577+rW/OPjaLhtOm6qVfr4uKDx1pACHyZR4IQ3LmpUBBjxmqGj1AfOeJavtz8zLOlaamyW241frQo4cQJ5qef6vPzWK2OGjtOs3at9Y034vLz2cU/1C98M46i4CuvVEycqBkxQv3GG5V9M5RXXa3bus2+fr1twYK4vFOezz+refOtOJcbzX+l4sUXYwwG6oUXyu+8M6xXL/nrCyoHDlJOmqT9+qs6WgLvvjts1SrriePMc89Hf/hhtb+ihhrvSgAAovHO5eUAbtGjjDEgCOg76zRacSQB6RDiw3k+sLwDTcOAtctzZ8o7FBayHI87d5bt2+eMiaGNBurEcYaiYVKStLTUazLxPXrIHQ7hVK6nf3+lIOADB1xi6syuXc6MvkoIwZ49jtRUmVJJ2GxCYSHbt6+yvp6vrODEfI7MTJfeQC77xbzwjUpTPZ+YKPn0s8S33opTq8m33qy6846iXbud994X/uNPybNnR4RCmjaDpuGAAap33on/6qtOnTrJFi6s+t+jJRaz8Prrca8tiC0v8765sGrnDufeva7UVClCoLzcS9OwXz+FGMc5ZIjq0GEXQYC+GUqHXaip5rp0kcnlRH6+JyqSTkiQZGW5lUqid2/5wYMuioJDhqoOHXSTJBw2XJWTw2AMBg9SVVVxTicaMUKdddTtVwEDBxgDCaJRKioXwnmIIICPatTZ/tACWC8SBBwQ2kcQjXRq1tsQ0I8Q2L3b2amTFCGwZ49r0EAl40E7dzk6d5YJAt671xkVRclkRGami6RARDidl+exWITkTtLqai4vj73qap3DLhw86L7mGh3jRsey3DQFjAZq9x6nRkNqNGRBAbt6lbWggE1IkFxzrX76dF1YGHXwoOuZp2sPH3Z36Sp74cXooUNVrc22EZeX+DNJti6agiBg9+7y7t3lt99h/Psv65df1f7wA3H9Dbp582LKyr1Ll5rmv1IxYoTS5RLWrrW63RqCgJkHXHv3OnkBnDjObNtmV6lIJIC//rIMGaKiJcTff1kQAjIZsXaNLTKCpki4ebOtRw85y+IjR92bNtkhBCUl3pUrLZGRtM0u/PabOT5OcuqUZ80a65AhKqORQgiwXuTvCCKIRucbjwfhYBEs/iKqkd3PZOKvvy7/yBF3C5magoDHjdcsWZLsbw9Yv852551F/na/9HTZqlVpxjAqL88z+8HiiAharyczM119+ijkcmL/fldamsxopA4ddoeHkYmJ0hMnGAhBerq8uNhrMvF9+yrq6ri8fHbQQKXbjY4eZfr1U8jlxMmTDMagZw/FocMumw3FxdFmsxAZSc240TB+vIam4Y4djmXLzEVF7KCByhtnGjIylEEjkprFggWVtTX8jBv1AICCAvbvvy3ff9/JEKzbRbOoruLWrLX++afVw6Crp2onTdKa6vlflpk2b7JbrYJcTkhlhNuFZDKCoqHdLogVERgP4rxYrSbFjBmNhkQIOxyCWk1CCO12XqEgKJpwOgSahlIZFCvMi5kJPI+VSsLlQlIp/OKLxAkTtRUV3qlX5xUVNbL7LVuWMvR0+cSXXqr4eFFNC88dY2AwkL//nirWyGo0ERIJFHNHWobDLgSINbWGlEigfy6F243cDDICwLhRQqL0mWeitm61K1TE7Acjjh51u9zo6aejq6u8tbXc089EAQDee7f6/gfCo6Lod9+tvnWWoXdvxVdf1g0dpp4wQfP77+a4OMms24xuF3rv/aobbzTUVPOr/7F6PLh3L8Ujj0YOGapk3HjNGtvvv5ttVmHceM3zz0V36So/l4SBa6/R/fBD/S8/m8SVcOsthja3X4yKpu+5J/y66/SbNtlX/Gr+6y/ruLGae+8Jv21W2PJfzf+stmnUZJcusvh46S23GDIzXYcPu++5J5xh0Fdf1dx8szEqiv7667qRI9U9ust//sUUFycZM0azdo3V6RZummncv9956KD7wdkRxYXsH39ZHnsswulE//d13ezZEZVV3IYNtoy+SgCA0yl42EYORIkEqjVnJshq5TDGLchVjIFEQvjSnxvxRiolVMEqlEII7Q7B6210uNBoSJomADjTQsHDIqdTAABkZTH9+inS0+UrVpgnTNCmpso2b7IPH6bq2lWWn8f07CnPyFAezHTFxEpGjFBXVnAyGTF+vJYkgceDJk/WJiZKzWbh+uv1qamyrKPuslLv4h9M9Sb+2mv1M27U9+ihqKnmvv2m/p/VVoKA06brpk7VtUsb3569FO++lyCqaG2rHREAvZ6aMcMwZYp2107nsmXmxx8vHTxENWOGfuZMw19/Wtatt7ldiKLg9Om6vDxPjx4yvZ7KPOiQy4kRI9QF+ayXQ0OGquwOYf9+18CBSpmMWPxDXZ/eithYyYkTTEqKtEcP+Y5djrAwevBg2batDokUXnONbu8eh5jd53Ai1hPgQCR8ezfPY4c9eCqSXAEViub0YpqGmhDkjcuFnM5GX6NWEQoF9Cecy4UsFoHz4oMHXX36KMrKvBXl3i6dZRYLn5XF9OypcLvRnj3OXr0UHg/ascPRtYuU4/Cu3Q7RI3PwoJumYVgYlZvL2KyCSkV+803dM8+W8zwYOEj5zTdJry2IlcuId96uuvvuot27nPfdH/7zL8kPPxzRjr2fRW3PV/GkXaBUkhMnab/+v6T33k8QBDzvxYqlS03jJ2g++yyxbz/FU0+VLlxYWVLMHj3iAgAMHKDev8+FEO4/QHn8OON2o969FZWV3upqb2qqlOdxTi4TGUkZjdShQy65nEjrLN292wkhyOir2LXLqVKT8QlSsY6R2cS73Y3kjVpN+GpCsCy22oSgSSxqFSk5HcDZSN5ACHR6Kqjd0OVCJhPfqdOZvCelijQYqZISry+ClXGj+nou95Rn2zZHfj7LcaiszDtnThnnxfn5nrIyL0mCkyc9hw4z331XfyrPEx5Grf3XXlzslUrg0SPuqiqO8aB77i4ym4Xqam9urkerJW+6yTBlikanow4fdn/ySe26f221tfygwcqePeU11dySn0yn6+ZhAADGZ4KIsc92cboPOTr9Kzz98hnS44a3nVkZfnULGi4OznzA90Wnry3+19heAk+/CM5EvsqkhEZDLPvF/Pdf1pEjVTfMMEycqF2/3rpnt/Ott6pXrrLZbELWUbfFyiME9u51PvFEqUJBHD7kfuaZ8ogI6sgR9/xXKpOSJNnZzP797rVrbSUl3tpa7uhRd309n3vSU1XNFReya9fa3G4BCY2sJxhjYxilPJ2RwjCorpYP6qBSq0mptLnzFAAgOiqIwRlC4HahutpGtj+ViggPaxQxLwigspILj6Dr6vj8fFaMgS0vtwMACAJWVjrEH8RQZ4KApSVnTM6+ZpB5p1iZjBg6VDnjRsPo0WqDgWIYtGqVdds2h8nEZ/RViHVuck56xMDhhph20ZyFG4YLAYTQRxBfYDD2Ba6fORdCCE/zAcKGqHcIG4gCG/7u4wgGUKyQciaKuOE7G0KNT6fzQeALfQbgzAgJCDt1kqYkyzAACIHMA87BQ1RPPRU9bZr+/ferv/u2HiFAEjA31wQAIEmYd4oV5yonxyMe9zBmfOe+3buc4mCOHGbEH3JyPAQBeR4nJdrT0mSCgMjTJXfEbBPFaXljtfKhxHmGhVE+ERXIm5hYCUkGKXXJcbiqcTNtiYQISC9CCJcUe3v2UoDT5T/EH8S/Nv2h8QPwHYAhTQOzRfh5qWnJTyZRlvA8IAgAfCVtgtodYNMXRE5gMXYdQogbAsNh0M+e+Yv/tzcdSQg7mx9dG0TiwYPM55/VESSw2QSahjzfMAm+2QiYH/8V3vRtvsReJIDSUq+fAAYQgphY2vfO+nreP4fpbPcbHUOfNT88IoKSyQm3q6WoP0HAJaVswEWTkqQB55fCItbLIo2GhPAcCp9jUFTA+j8R0dIglxGMB0EIfKX2QgQEgOMxwyCagjI54fVilkUSCSGVtmKIGAO3G2EMRGOEqDooFEQbbhMJwM0gmQxCABgPVigIMaMjIBK3zRAELCBcXMz6j40gYFLiGTWjqooL0H6amTcIY/0CxpvhjUIB3S3WhMQYFBayXm+jCI+UVIlE0rBExK8pLmbj4iRLlySH4mMPGfijj2qqa7mX58W8tqAyPJx+ak5kq6xyEIJt2+yvv1E1YqRq3osxK1aYP/u8bsYN+vvuDw8uuk7DbOGeeabMbkcffhAvCOCpp8sMBvKdt+ND6aAcMJhTeZ5XXql48slICMHbb1e//XZ8SrI09NLGocyYzSY88WRZ4+hvwj8tX6ym03LyE0U1yoUNvE+jkTboqbralqSWWJ3A4RD8w/mSkqQqNWkxn4lErKvlfQVp2hERERTDon4DlFotERFB9RvQ6uuXV3oBAAYj2W+Acu9+J8Y4Oobu178V/RDrTZxMTjAM7tVbwQuYoqBcQWb0U7TBMCiRQYkUdukqIyCkadizp7xrt3busLdzp8NsbpRtotWS8acPnoKA8/M8Yuba2SD2tYxuQd5otWR8vCQnp+UCTLCmhqut4fx5ExUliYigzKYzvLHZhJxsT2t543IhX16PTEoEFLkFuKE6uhjycbaKVV4v9tVGIUmoVAaGp4HT+m/Dz00uJAhY3InEe1EqCP96Ng0l1jAQEG4ordWkRjrGwOVCPiedXEbQzVmuxdpbCDVozk2TWTkO+wLICQIolcEDgQNw7BjjcvkXz8PRMbSvS7TTiYpLglQgwRjo9VRs7Nl5I5cTnZKlQVUkq1UoKGS7pZ8pG2AwUKmpsuwTZwjH8/jIUfetrWnPsXKl5fvvTDyHAQQYgZhY+oUXo5OSWlfopKLCu3BhZUkRJyZokhS4dZbxxhsNZxlGM0VM3G700YfVu3e7fMrvyFGq/z0WGbouhRBYtsy0fJkZCUC8l+QUyQsvxrS2OEFdHbdwYVVeLiveCyTAjBn62243hl4TQxDw0SPuxsXzQJfOUp/5u6aGKy8LXoEkLk7iL02bkaudg1UnAACwLMrKcvsX7pJIYO9eitWrrP5vO36ccTiEEJu28xxe9ou5UyfJuHEaAAAv4I8X1e7Y4Wgtb/buc504zjz2WJSo6u7a5Vi2zDRtmq6FLqMBKC3x/rPadtfdRnFHLy3zLl1quv4GvX831JbBMOiXX0x9+igHD1ICABgPWrSo5sAB17RpuhCvIOLIYfe+fa4nnohUKggAwKFD7mXLzNdcqw/d6WGxCNk5jD8rSBL27qPwPeJTpxiTSQja9ScxSeJfyqgZ3qSkShUKomUFGyFwLIthWeRfQahnL7lcTvi8mwQB8/PY4iI2xFbKCGOOwwMGKK8+Tcfff7O2oRSXx4MiIulp03TiviAgfPw4E7RNlz+8XiSTwYmTtImJUgBAXr5nxQpzKJEGfvODEQJDh6mmTNYCAFgW/fyzyeNp9QGBZbHBQE2dqhMPbgolsWuXM5QYKx/y8jwlxWfazYtp2mL+oYisowzLopYlBUHALl1kjU5kTd+UnCwNCwveKSQvj62ra2T969pVFhlJB3TMOngweL3+xjPe8APP45CiVpsAAgDwmcQMAYFWH48hxOCMqtHm8yA6fQVe1IHaZo3wvxfBd4ehYv9+p39lYIxBXJzElwjsYVHWMSZoRQCFAqY31tab4U1kJJ2SKg2aZV5ZyYnpiT7ExEh69JT7r2yOw7t2O1u1UjvQjvB40J49roCS6X0y5D6luKqSy8kJ0j8VYxAeQaemBeONXN5IjjULCIHLJezZ2ygVWSKBQ4YoCbJRc8eDB90VFV7QgYuBwiL26BGXv5ijaThkiMpn9s3KcldX8UGUG4RTU6QBBZqa/0Sf3vJQwp3273M5G+cFDxyo1OvPVMQgCFBe5t271xn0UmcGdHpEFNlGM7PoMDhjbidCt+edAWxksG/DKMR7OXOFhro9bQBsMpKQL7Nrp7OmRvBXbsLDKV+rSozBnj3O4BokBD16ygNOFc3bqdK7y8PD6ZbbzYvN0AoLWV/RdgBAly7y9HT5zh1O31x7vXjTRrtYgjXI8CAkCHDypGfvXifGQBBAbS0XSj5YACQ0NJuE3budYg7iiRMM0UpPB0UCD4sP7HdVVnEAgOKiRqXEQgFBQAjA8eOMXk9iDBgPsliEEJuxNRoJDW02fs9up1JJQAiystwA4FByVgAADIM2bbT7Fx1GCPfurfBZii0W/sD+4NqnTEb06xd4smmeNwkJ0m7dpOXlLHF24oi9qXfudPrzRqMhx4zR7Nrp8nsb3LPHVVDAdu0a5BBLUXD6NboffjDt2u2EACAMwsLIIUNa3Qe6f3/l39GWBQsqidMO6ltuMbTKjRWfIBk2TPX5F3Wi/1hAYNQoTasqTspkcNo03YoVlvXrbAAAhEF8vERscd0q9OwpT0uVvflmlSgyEAbXXatrtudIU+TkMJkHXQHFeMeO0/gkx7HjzKlTLBGsW1R0NN2rZ2i8USiIQYNUmzY5QIsQBLx5s/2uu8L8Y41HjVJ//lmtr+gXQYDKSm7DentQ3kAIbrklbOJEHXemYzER4hz5o1Mn6ZdfJtlPB7BRFDAaqVbFjKrV5IIFsRZrQ+4yQQC9nmqV45Mk4X33h193vd7nsNNoiDZ0ooiNlXzyaaLdLohbHEUBg4EKRfJhDNautdXX8Wc2KQSioqkRw1W+N2zZbLfbhZavhhDu2VMe0zRh/mwfGDRYpVKRrhYd4wQBjx5hTp3y9Olzho/p6fK+/RQb1tt9AxIE/M8/1ttuNzatiNPkgiA8eOGn4FCpyHNpFwIAkMqIqKhzKmhOkjAioh3KqSqVRICfJBTU1nLr/rU36h+L8aDBypTT7QTNZn77NkfQ65AkHDxE1VTZPeuA0rvJOiVLWjaXiVuVrxWg7z6nTtX5azMEAbOy3Dt32sFlAoRAdTV3/Jg786Dr4EFXTg7ja1l9uWDzJvvJkx5/WSKTEdOm6Xx22oMHXbm5bNATuN5ADmqut9lZF3dYOD18uCrraJBGVAjhtWttd90V5u+8GDNGnZQkzc9nfW2PXC60fLll/Hht6Mb+i4WTJz3ffVe3ZbPDbOZ5AUMAaJqIiqanTdPdfrsxoJDqpQm7Q1j+q5llkb/I795dPnx4Q7UbnserV1mdzuCbVI8e8mYVjLPyBkIwdqzmx8Umtxu3vFWdOM7s2+ecMkXnezE+XjpxoiYvr9Zn2iQIuHOHM/OAa8TIUBuDXxRs3Gh74fkKk4kfMVLVpYtcrKPrcApHj7g/+bhm2zb7O+/E+/pJX7LYvdNxYH8jjZgg4FVXa3z7ZlERu22bM+gZkyDgmDHqZnf8llZ/Rh9laqo06FblcqGVf1v9jcIEAW64QR8R0cjnYLHwS5aYfIUFzyswBiyLxX98yN6cw4fdTz9dptGQYjmS5GSJWk1oNGSfPoqFb8Z98mlCWSn7zDNl1VVcKNUXAAAch33DuAB3LcLlQj/9ZPJV1QcAIARiY+lrr9X7XtmwwVZWxgb1ZRqMpK9tTABaUkKNYdSoUeojR4JsVQQBt2xxZGczvf38lz17KcaOVS9bZvZJQoKA69fb9+11jRx1fkVOVZV30Uc1vq42cjlx513G0aM1LX0GApZFixbVkAR8/Y3YHTscq1ZZjUZKpaQwxmYLz3H40UcjFr4Z/79HSxf/WH/33WEtjwEh8Ndf5j9+P9NHvXdv+SOPRAYtv3ju2LbNvm2b01/YYIwnT9b6GsbUm/g//7T423XOcgu4T29FQK9XH1qiHIRgyhSdwUAFy8QD1dX8H79b/N1jEgm8+WaDTkcGuDm//76eaWuftxCxZYtjzx7nhAmaKZN1U6boKAp+/72paQ0Nf5AEzMn27NzhvOOOsJ07HJs2Od54I27p0pTFP3Za/GOnpUtTbr/d+N671SQBrrpa+/df1upqruVYYodD+L+v62NjJFOm6KZM1o0cqf7rL2vTbsrtDodD+P67eoejUaOM8Ah65k0GH0u2bLZnHfWQwdoJUxS86mrt2dpABflwr96K/v0VoQQhrFplLS5u5OYcPEQ1dpzG/7MEATdssG/ceH4PVi4HSkqS3nNv2J13G++8yzh2rNrDoKC77eHDLooCEZHU2rX2l16OGTFCLYaIkyTU68k77gibOdOwZIlp8CBlTQ2Xn8+2vFVxPOZ5PG269s67jHfebbzr7jBjGOlfT+88YfVq644djYQNQviqKZqMjIatwOkUli83BfUtiA11x449q5AOwhulkpg6TRfURUAQoLjY+8cfFn/JJJcTd91p1OsbtT53OIQvv6ytr+fA+QMEGAOfwU1AwQMPEAaVlV6tjszLYxMS6YHNxSxPn64zmQQvhykK1tRwwU1v8EwkBs9jgFsX/9AGVFZ4v/6qzr+QNMYgMpK+444w3xPcscOxd487aFwexnjsWE0Lya/BFbwxYzSdkqUo2FJBCCxbZikqapQfM3iIavLkRiKHJOG+fa5ly8ztGrJ/rsAYeDyAIkFtLRcfJ212nYSF0woFYTYLBAnbEIF1vkmDEP7xJ9PRo4y/1oIxnj5d18dP2Pzwg8l/FzvbbGi15NRpuhYUoOC8iYuTXH21NqgTliBAQT67fLnJn2FSKXH//eExMbT/izwP/u/r+qys877Z++YhNA8yxBhyPKLPYqCBEJBUSPWFzjqK84n9+10/fF/vP88IAXG/9kUWb95s37HdEVTYIIQHD1YNaDFRJDhvxEN1dLQkqMjBGPy63JKX10jL6ZOhuPkWY+OkL1BczC76qMYZQm32tgH6xWO0NhkOt/FvzU7d6bOkWHnpvMlYq1X48IPqqqpG8QskCe6409itW4O1yWYTfvi+vmXHkQiZnJh5k75l50ZIhohu3eQTJqqDRm0SBCgq8n77bZ3/oiRJeNddxvTuMv8MD4KAa9bYfv31vOxWJAmsNuFkjic3lz11ii0v9zbOiL0QEHtpFRWxp3LZ3Fw2N4d1uxDZph7pQYEQ/unH+s2bHf6ZOoKA+/ZV3HrrmRX711+WXbtcQYWNIODeveVjx2hafltITkSKgjNnGlautNisKGjVgd9/s0ybphsx4oyRJjFR+uijEXOeLPOFrIst1z76sLZ3L0W//u2cmNevv2LFCvPDD5eIc8Rx6PY7jG2I4zkXqNXkyBGqL7+s++47EwBAEHBkFH2euo3u3u387LNajgP+ndu1WvKxxyN9aTelpez//V8dy+KgcQE0DW+8UW8wBiFGqM7nAQOUEydqly+ztBz8Jno6v/i8tk8fhX8IxDXX6LdscSxvZAYEJSXsm29WfflVUlhYO/jAfejVS7l4cbLV1rAJSiQwNlZy7s26WwWahs/Ojb79jjCf3S8sjGpbmbeWUVnpXfhGZVWV198egzGYcaN+0iSt+Ksg4MWL608cZ0IRNr16K6ZN0wf93lCnUyol7rozLGieAwCAIOCmTY7ffrP4v6hQEI8/HikW0fSBJOGWLY6PPqpuXzM8hCAiku7cWSb+S0qStku/7tZCzMH2DeN8kMbtRu++U71nj9ufNIKAu3eXPfJIpC/4Yd8+15KfzKGc6GgJvP12YyjJga1Yhv0HqKZM0Qa1AUIIWBZ/9mntyZONHBTdu8ufnBMVUJYLIfD9d6Zly0yX1LH8sgBC+Icf6n/5xez/orhDPfNsVErKmWDQDz+orq7mgmp4goD79FGEmBnYCt5IJPDOO8Mio+gQRA7Iz/d8/HGtL7FZxIwZ+ptu0vvr16Jb9O23qrduuWyicy4RrF1r++CDmoDmyxCCO+8Ku/pqnfgrxmDpUtPWrY5QQgRlMuKuO40hxpq1btvP6Ku48UZ9KLIBQvjXn9bff2+0GmQy4sk5UQMGKhufrUBlhfeFFyrELnAXD62SeO278aHWHvH37nW+NK+ivq5RCosg4JEjVY8+GuHbl/fvd37xeR0XgnFeEPCIEapQNBsRreMNRcF77gnv0iW4+VjscP/++zUBbEhIkM6fHxMf38gaRJAwO5t5/rly/6bWLV28odrZOT09eHqcwC+XEp6dEQ3fCP0/LJYJa2gC3baj/ulKbq2wFOTkMM8/V15Q0CgQAiGQmip9ZX6sL9GptpZbuLCqvNwb9EyAMdDpydkPhWt1obrrW62spaRI77k3bN4LFUIw6hAEKCxg33qz6vPPE/V+WuHQoernno9+bm65vw2KJOHu3a65z5Z/8GF8fIul8MVcmZderjh1iq2s4Oc+W9aq8UMICgpYjMHRo565c8uyjrpJEm7dahcQqKnhDh3Cp3K9LldZU5nK8zg312M283Y7/+9aW3U1x7jRu+9UIwxcLqG6Crz2aoVcTrRKUROPnzYr+u6bOgAgx2MuWLRQQYHnmadLDx9uVJscIaDTEfNeivH5LzkOf/5ZzY7tIe1QCOFrputGjtAEfeeZkbchB9ts4u+5p2jLlpDGRBDgiScj586N9j/UeL34nXeqFn1Uw/ONlinG4KqrtO++F9+0h/Tpd4C5c8u+/r86AkKCABiAoJKvmSFBQBANXXHEn8WLiCM5S1kdDAEUPwUJgFGD+BEL4RBkQ/2btiX4ESQQK6HqdeSvv6X0O3vFoJIS75NPlG7ebG8cXgMkEjj3uajHHov0uRRWrDA/NacsaJdd0OCOkCxdmtw9WJKuP9pyODQYqSeejDp2jDGbhRC0dPDVV3VpabKbbjL4XpRI4GOPRdZUc0uWNFKAIARr1tgIArz5VlxcXHNSB4Lb7zCOHKW+wPbfCwAMAE3BlOSzFm0pLPQ8+0x5AGkAAAQB7r47bPbsCB9pMjOdC9+osttRKFYrmgazHwpPb2Xwa1vkDQCA5/HrCyoXLaoN5fkhhBMTpV//X1JAZHxNDffE4yVr1wZOBMZgwgT12+/E+5dI/o8jN5d55uny7dudAVRAGNxwve7d9+J99qHycu+DDxTv3OkMZTcQBDxlivarrxK1raxMSM6fP78Nt0EQMK2zbN8+V3m5N6gVEkJosfC5uZ6hQ1X+5i+ViuzXX3kyx1Nc7A04TObne7NPML16K9olBelyx+FDrjlzSnfvdgeSBoHJUzRvvxUXcVoXtlr5efMq1v1rD6UgF0IgOoZ+6+04X1mT0NFG3gAANBoyIpLestnBMDio1BFLXJeUekeMaBQfr9dR/fspjx9nSksb8Q9CUFLCHtjv6pwmS0j870odjMHGjbY5c8oCAmsAAAiBsWPV778fHxffMD8eBr31VtWPP5qCdgQSQVFgzpzI66/Xt8Hr23beAACSkqQMg0MsNwEhKMhnLRZ++HC1f7a20Uj166s4fsJTXsY1ljqwuprbtdtlNFJdugQvHXflgWXx0qWmF1+oKCryNiXN6NGq999PSDq9lXMc/urLuo8/ruW4kEgjCPjqqboXX4xpW0bbOfGGIGB6d/nxE0x+Phvic83OZtwuYfAQlX9xhvBwetBAZW5u4IZFENBqFbZtc7As6tlL3toS15c16uv5d96pev+9GrNZaEqaSZPU73+Q0Om0Ei0I+IfFdW8urG452c3vCjits/T99xPi29r975x4AwBQKIiUFOn27U6LJXhjCLGX8NGjDOfFgwap/E/mxjBq8GBVUZGnoMAL/Cqaid6ufftcBQVsly6y8PD/hLpz5Ij7+efKfl1u8XobRT6IG9D06dp33olPSGggDUL4559Nr86vtNlCOkBhDNRq8rXXYscEC7JpAefKGwBATIzEYKC2bXOwbHCyi9Q5fNiNBNx/gNKfOno9NWy4qr6eP3nSg1Aj6mAMTp5kd+x0aLVkaqoslGaOlykYBv3yi/m5ueUHDrgDqvZgDGga3nGHccHrsVHRDXICIbx8ufnllyst5lBJQxD44Uci77sv/Fz6I7UDbwAAnbvIWA/at88VmusKCAI4eNDtYVD/AUr/iqRqNTlihJoXcNZRd8A+LZpWt2xxVFdxqWnS8xGWcNGRk8MsWFD56Se1dXXN7E0qFfH4E5Fzn4vR6xvunefxkp9Mr7xSGbSQrA8Y42nTdK/MjznHeh3twxuShL16yYuKvDk5nlD2V5E6hw657XZ+wEClv+IikxFDhqjCjFRWlttuFxofsqDXiw8fdu/c4ZTJieRkaRsqWF2asNuEpUvNLzxfvm2bs6HhjR8EASckSF59Nfb++8J9aizH4W+/rVvwWoXFIoSoXAoCzshQvPd+fGzsuXZ3ax/eAABkMqJPb8XRo+6AE/XZ4NN1Kqu4vn0bBQdSFMzoq+zeXZ570lNdzflHB4t+xNpafstme3a2JyKCiomRXNZHLY7DW7c6Xnm54ttv6+vqBF/PJREYA4zBoMHK999PuPrqM4kpTqfw8cc1771b7XCgEG8fIZCYKH3//fg2lP1qijbai8+GI0dcs2eX5GR7Qtw7xS8fN079+huxTcNv8/I877xTvfJva9PAWIwBQjg8nLr+ev0dd4alp59TF9aLAkHAR48yi3+oX7nSajbzAYwBACAE5HJ4442Gp56OTPQzYtXXcwsXVi35yRTikVu8lNFIvvd+/HXXhRop0TLamTcAgM2b7Y8+WlpZwYX+IBHCGRmKBa/H+gq0+OB0CkuXmD7+uLa83NuUi+JyjIujr7tOf8uthq5dLw8zj8Dj4yeYpUtMK1daq6q4powRV0WnTtIn50TOnGnwN7Hk5XlefbVyzT+2EI174tXkCuKV+dH33XtOurA/2p83GIPffzc/N7e8vj5UZQ0AIAg4Pl7y7Nyom24yNq2kt3+/84P3azZvdgScS0WI3uz4eHrKFO2MGw29e8v9de1LCgyDDh1yr/jVvH6dvbLKCwBs9nZkUjhpsvbJJyN9qZbixG7dan91fuWRI0zoEyt6y594MnLOnKhWlShsGe3PG3DaovDSvEqLpRXUQQgolcTd9xgfeyyyqVvKauWXLzN/+WVdYaGHIJpJpkMIYIzDw6mRI9XTr9ENHaq6pHxbVVXczh2OlSutO3c6zWZeLLobAFF8du4ifeThiBtu0Kv8dD63Gy1davrg/erKSi50mSEe3R96OHzu3Gj/2p3njvPCGyBaMH+of3V+ZYjefN99QghGjlI+/3zMwEGqptNz/Djzf1/X/v23zWJpRiEApyW8XE507SqbMFEzdqwmPV3e5pbx5w6rlT92jNm00b5xo/1UHst6UAvDDgujbpihv+++cF+tGhGFhewH71f//ruFYYInQPlfkyTB/feHvzgv+hxP3U1xvngDAOB5/M03daEHgpy+WYAEEB8v+d9jEbfeamxah9brxTt2OL78snbnDqfbjZpffBgICEMIdDoqPV02cpR66FBV166ysDDqAihAAsJ1tXxODrN7l3P7dkdOjkcsJNvsUEXGqFTkmDHqB2eHDxmi8rdqchzesN729tvVR4+KXXpDHYNImrvuNr70Uuz5WDbnkTcAAJ7HP/5Yv+C1qlZtWAAAhIBUCidP0T7+eESzHfPsdmHDBtvixaZ9e12esyxicPqpQAjVaiIxUZLRV9G3r7J7d1liotRgoNoxr8rrxWYzX1TEnjjBHDrkPnLYXVrqdToRxrjlsSkUxNBhqrvuChs7RuNr6C2ipIT98svaX362WCx8q/RZcXu6//6wuc9Fh9j8q7U4v7wBAAgCXrbMPP+Vyro6vlXUEac1IUFy/wPhs2YZjc1lnlos/Pr1tl9+Nh844HY6hbM9Id/VMAYUBTUaMiaWTu4kSU2VpaZJExOlERG0VkuKfdUJArYwToQAQtjjQQ4HstmEmhqupITNz2Pz8z2FRWxVJedwIJ5v4ErLg9FoyMGDlbfeahw3XhPwdBkGrfnH+vHHtVlZDGhl/yGMgVQKH3oo/Olnos5WLevccd55I871yr8tL79cUVLibe05ECFA0WDoENWDD4WPG6tp1iVutwu7djp//dW8Y4ejvl7AOEjlOh+HIAQUBeVyQqkkDAbSYKA0WlKnI7VaSqkkJBJI05AkoSBgzou9Xux0CTabYLMKNptgNvNms+B2I4ZBPI/F/u9BtxJBwJCAkRHU6NHqG2fqBw9WBWgeCOGDB91ffVW7do09aJ3YZqdLoyHmzIl6cHb4eS35eyF4I2L7Nsfzz5cfP860wYQgCFijIa+6WvvA/eF9MhTNXoFl0bFjzNq1tvXrbKdOsR4PavbM0hTiBIhN7X2NWFt+MxQTV2CQN/sgnvUUCqJrV/mkyZrJU7Td0+VNd8mCAs+PP5qWLzM3a9QJZZYiI+l5L0XfcovxfKc2XzjeAACyjrlfeL585w5Xq1Q8EaKQiI6mp1+jmzXL2LOn/GwabnU1t3ePY8NGx969rrJSr1j5tg2P4RwhDhgAIJMRSUmSIUOU48drBg1WN9tIoKSY/e03y7Ll5vw8FmPQBtu3IODOnWWvvhYzZYruAtzpBeUNAKCszPvmwsoVv1l5LqQIowAgBADAMbGSa6/VzZyp795dcbaFJQi4vMKbud+1c6fz0CF3URHrcCBBwBACgjhf9XB8OyBJQo2WTO4k6ddfMWK4ul9/ZUwM3ZToGIOiInbl35blyy25uUGaeLfwpRiA4cNUCxbEZvRtRRf0c8GF5g0AwOEQvvqq7tNPaiyWVu/fIkT2REbR48dpbpypHzBA1UJxKISAycSfymUOHnIfPerOPempqPA6HIjjGlQcccdpA5FEM524u0EC0BTUaMi4OLprV3nvPop+/RRpaTKDgWr2yhyHT5xg/vzTsnq1tajQ2zbGiHcnlcAbbtQ//3x0m4P32oCLwBsg9gdYbX3zzarck542G1TExa3TkYMGqaZN044arYmPl7T8+HkeWyx8aYk3v5DNO+UpLGBLSrxmM2+3Cy4X4nmMUENH+7POFwQkCQkCUBRUqQiNhjQaqYRESUqqNC1VnpIiSUiQ6nVkC6W16uv5vXucq1ZZt21ziN7+NntkRYXmscci7ro7rN0tey3j4vBGRHY28/ZbVWvW2DmuFWbQAIjsoWmYnCwdO04zYYKmTx+FMVi5KBEch91uZLPxZjNfV8fX1/NWq2Cz8ja7wHoAx2GOQ4IAKApQFKRpQiaHWg2p1ZE6HRUeTomlkLRaUqEggoYgOhxCTg6zZbNj/Xp7djbjdqNzUblEIde3n+LFF2PGjNFc+FiAi8kbAIDNJnz7bd1XX9ZVV7fC7dIsxDOLSk107iwbOVI9erQ6PV0eHk6fIyMb9jICtk0sWix8Xp5n507X1i3248cZs1lowRIY+p0qVfDmm/WPPRaVeJGShC4yb8RZ2LPH8d57Vdu3OQWh7UJbhO8Uo1aTCYmSvn0VQ4aoevWSx8VJtNrWdb1rM5xOoaqKy8lm9ux1ZR5w5eezVquA0LnSBZw2FnTrJn9yTuQ11+guotv/4vNGhMnEf/99/bff1lVWtMV00RQYA4wAwlgigXoDlZhAp6fLe/VSdO4si4uThIVTSiXRLsEoCAGPB5nq+aoqLj/fk3XMfeK4p7CIra/jxXL27WUCEASs1ZIzZugffjgioJv3hcelwhsAAMYgM9P12ac169bZz+qwbOuVfU4GhYLQ68noGDopURofL4mOoaOj6ahIWqUh5TJCLidkMkjTkICwoaQNFqteYEHAHg9mGORhkNOF6uq46iqusoorL/MWF3srK7n6et7lEsQavCGaHEMEQoAkQf/+yv/9L2LiJG0oLbrPNy4h3ohwuYTVq61ffFGXdZRp8+m0BTQ6PENAklAigVIpIZdDhZJQKkiFAtI0QVGApiFJQSRgjsc8BzgeMwxyu5DLhRgGeVjkZbHoYTiXw3wIo8VJnaR33Wm85VZjQPP3i4hLjjciKiq8y5aZf15qEtPwzrde4u9q8P0agNNeBej38/kdEkI4IoK+5hrtPfeGp6dfWk32LlHeiDiV6/npp/o//rBUVJyTnePygsgYg4GaPFlz511h/fsrL8E8w0uaNwAAhPDx48zy5eaVK61lpRw4/7Lnot4swBgbw6jx4zSzZhkHD1G1Y0Rw++JS540IjEFODvPbCvOqVbbCQtYX4HLFQAytj46mJkzQ3HyLsV8/5SXLGBGXB298KC5m162z/fWn9cgRt8uFWo6xuvQhbkkSCUxNk029Wjttui49XX4J7kpNcZnxRoTFwu/e7Vy92rprp7OigrvsxI8vejUsjBowUHH11doxYzTnnnt7IXFZ8kYEz+PCQnbLFvv6dfasLMZk4gXhkibQaboAjZbs2lU2Zoxm4gRNenf5eQ3MO0+4jHnjg8uF8vI8O3c6t221HzvG1NfzXq8YZ3PxOSSaixDCFAV1erJzmnT4cPXoMeru3eW+shKXI64E3vjgdqPiYvbwYffevc7Dh92lJV6nE/H8heaQzzxNEFCpJKKj6fR02ZAhqoGDlKmpsouYzNWOuKJ44wNCuL6eL8hnj59gsrLcOdmesjKvzSawLBZD/nzWoHYhk3h+Fg3HEgmh0RDRMXRKiqxPb3mfPorUNFlkJH0pOAfaEVcmb/yBELbbhaoqrqTEm5/vyc9jC4vYujreauHtdsHrxTzfIB4AAG2TTFFRdFInSUKCJClJmpomTUuRxcTSOl175mddarjyeRMAjIHHg+x2wWLh6+q56irOZBIsFjGvhS8r8+bnsWazAEI2MCIEnno6cs6cKJkMtqMv9hLHZayatQ0QArmckMuJyEi6K2jk9OF57HKh3Fxmy2bHqlWW7BwPCiEeCCFcXMRKpf8h0oD/oLwJEeXl3uXLzT98X19aGiRXECHQtav0r7/SoqIvFWf1BcDlZzm4MIiLkzz1VNR333caO1bd8jshBBUVXH6+J7QLXyHo4E1LGDBA+fkXSTfMaCmTDULgdKKjR5lWXPfyRwdvgiA6mn7rrfhrrtW1sJ8LAs7OYYJ2rL2S0MGb4DAaqXnzYtK7y87GDAhBYQHrdre+hdpliw7ehITkZOnNNxvOdraCEFosgsPRwZsONEH//kqFgjzbbuV2C6qEfY4AAARkSURBVAFNr69sdPAmVJyPsPPLFx28CRX79jldLuEsFdewVkudp4polyY6eBMSiorYX5dbztY7GGPQtatMF3Lz7SsAHbwJDrtdePedquzs5ktnYAzkcmLSZM1lEd/ZXujgTRDY7cJbb1WtWGE92xsQwsOHq8aNa3sPsMsR/zm/ZqtQU8O9/nrlsl8sYvBXUyABJCRInn4m6rIO3msD/lt32yoUFLDz5lWs+/esHTSQgCMiqVdfjR08WHWxB3uh0bFPNY9dOx0PPlC8do0NnCUmUBBwUrL0vffjr73uQtRhvNTQEUcRCK8X//ab+c2FVWeLoBCrQ4wYoXpxXsyAAe3QA+xyRAdvGsFuFz7+uOarL+scDnS2hkWdOknuvMt4663GS6rfzAVGB2/OoLLSu+C1yt9+s/B84N4k9hdOTJRMv0Z3yy2Gbt0ureoQFx4dvGlAQSH7/HNlG9Y7QGOFRqzBk5oqve463fU3GDp3lv0HtZmm6OANAADk53uefLJsx3an/96EEIYE6NpFdsutxunTdUlJF6cC46WJDt6A0lL2scdKt25x+MzBDVWukqS3ztLfNNOY2MGYJviv229sNmHBgkp/0ohddK+9Tv/oo5Hdu//X9Ziz4T/NG4TA99/X/fmH1ZdphxCIiCCfeSZ61m3G9m1IeYXhP82bw4ddX39Vz/MNKXYIgago6q134q6Zru9QflvGf3dJcRxevLi+osIrkgZjoFQSL7wY3UGaUPDf5c3Jk8yG9Xa/HQpPnaqdOdPQQZpQ8N/lza5dzupq3idsdDpy1m3GZvswdqAp/qPTJAj46FG3IDTYIBDCKamynj07Tk+h4j/KG47DFeVe368Yg8QEummv8g6cDf9R3ggCZtlGoVgKJXlZlya9wPiPThVJQrmc8JnKIQBWq8DzF3tYlw/+o7yhaRgVdSYKAhKwoIA1mTqIEyr+o7whSdijp9wXlkUQoLiI3bXLcbHHddngP8obAMDQoaow45m8XYZB335bX13NXexxXR747/Kme7p83HiNr8QEScJ9e13vvFPlcAgXe2iXAf67vJHKiNkPRXTqJPFZcTAGP/1onv9KZU1Nh9QJAnL+/PkXewwXDZGRdHg4tXuXU2wRAiFACBw54s7KcsfESOLiJG3ubX7F4z/NGwhB167yuDg6K8ttMQtir0MAQFEhu3Gjo7TUqzeQYWHUfyqBN0R0xPsBAMDBg65Fi2o2bXQ4HQIkIEEAjAHCODyMHjZMOXmyduAgZWyspMN75UMHbxrgcqFt2+y/rbDs3eusqeE5rsGajDGQSGF0FN0tXT6gv7JPH0VCoiQ8nFKpSLEc+n/Tf97Bm0bwenF+vudgpjsz05WX56mu5mw2gWEwxyGxwbNCQRiNVHyCJC1VmpIq7d1HkdFH+Z+qfCOigzfNA2PgcAgOh1BXx5tMPMMglkU8B0gS0BKoUpJaHWk0Uno9qdFQ/0HHVgdvOtAW/PdWSgfaAx286UBb0MGbDrQF/w9GcVjvyzp41AAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNC0wOC0wMVQxMTo0Mzo0NiswMjowMNf1Q+IAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMTItMDZUMTU6MTc6NTErMDE6MDCrFyOJAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.mf.uni-lj.si/eng/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.mf.uni-lj.si</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.mf.uni-lj.si/eng/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sl">http://www.mf.uni-lj.si</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>MIIEBTCCAu2gAwIBAgIJALBMH+OaXfh8MA0GCSqGSIb3DQEBCwUAMIGYMQswCQYDVQQGEwJzaTETMBEGA1UECAwKU2xvdmVuaWphbjESMBAGA1UEBwwJTGp1YmxqYW5hMQ4wDAYDVQQKDAVNRiBVTDENMAsGA1UECwwESUJNSTEZMBcGA1UEAwwQaWRwLm1mLnVuaS1sai5zaTEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckBtZi51bmktbGouc2kwHhcNMTUxMjE2MDgxMzU1WhcNMjUxMjE1MDgxMzU1WjCBmDELMAkGA1UEBhMCc2kxEzARBgNVBAgMClNsb3ZlbmlqYW4xEjAQBgNVBAcMCUxqdWJsamFuYTEOMAwGA1UECgwFTUYgVUwxDTALBgNVBAsMBElCTUkxGTAXBgNVBAMMEGlkcC5tZi51bmktbGouc2kxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAbWYudW5pLWxqLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlkEOHCZe/rh/aax/1sCGsiMvOHzmtSNADTKXadns9/z1Wixq6rW3UbRPGIV+luQ76P5d76Z5xt3LAQ6sbxuaLv41eqAPUdvum5h/NmWF7l34auGsPBc0LxzzLqG+HQFQTi3eLfdTUZqLQwNs9Ka40zSxfeGH5nB8ePtnErg3fYKzCu8X5nETy4M7gous7lVzUePBkxDOe8IPhpH5lUg2YrlxaIoLVLsv+sn3ZhAOOnlw8uJuQwmvBcc0bGwmpGtjVJ+uf79U9xs/QKNSjGx4e0dcZul4/54QEQNLLhGqCsjwrAJLzAgFdD0a8A2D0x5ZvFtDN9VpaMyFcDRHG3TwOQIDAQABo1AwTjAdBgNVHQ4EFgQU+YFl/0f0mbE1vFL1Cb42QZZReuswHwYDVR0jBBgwFoAU+YFl/0f0mbE1vFL1Cb42QZZReuswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAZ1MWeKkY+YVeD0jENxVUzgoA6Kjnwuo0Xwc+oGP0RjecuK1ZzIpt0ed3+gqof8AXAMmX4Q8KFtUrsPGQuB0uAqAb4ZEpwRbhGddE0AcHYT6yQkqxGsEU6I2vrNjiDOi6KNuoWRG/wL+bjQmgqWNY9krVrDW2KpGPurlbhzwDpyvgurxpUZcEJSyfWacrfJbbhyqX9wAaKK47sXExPCtKSzoMS+8tzSir5zG7F5+uxmCsTyG97EuD5eHAjmWRZtUTLh4VX88pQt2RURkWuLpx/7Zah4nt5VgrtjdxJ///jQ5ArTK1WGmeGcmcKWx82sFcA3mTvjI758355gzjtglyFA==</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>MIIEBTCCAu2gAwIBAgIJALBMH+OaXfh8MA0GCSqGSIb3DQEBCwUAMIGYMQswCQYDVQQGEwJzaTETMBEGA1UECAwKU2xvdmVuaWphbjESMBAGA1UEBwwJTGp1YmxqYW5hMQ4wDAYDVQQKDAVNRiBVTDENMAsGA1UECwwESUJNSTEZMBcGA1UEAwwQaWRwLm1mLnVuaS1sai5zaTEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckBtZi51bmktbGouc2kwHhcNMTUxMjE2MDgxMzU1WhcNMjUxMjE1MDgxMzU1WjCBmDELMAkGA1UEBhMCc2kxEzARBgNVBAgMClNsb3ZlbmlqYW4xEjAQBgNVBAcMCUxqdWJsamFuYTEOMAwGA1UECgwFTUYgVUwxDTALBgNVBAsMBElCTUkxGTAXBgNVBAMMEGlkcC5tZi51bmktbGouc2kxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAbWYudW5pLWxqLnNpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlkEOHCZe/rh/aax/1sCGsiMvOHzmtSNADTKXadns9/z1Wixq6rW3UbRPGIV+luQ76P5d76Z5xt3LAQ6sbxuaLv41eqAPUdvum5h/NmWF7l34auGsPBc0LxzzLqG+HQFQTi3eLfdTUZqLQwNs9Ka40zSxfeGH5nB8ePtnErg3fYKzCu8X5nETy4M7gous7lVzUePBkxDOe8IPhpH5lUg2YrlxaIoLVLsv+sn3ZhAOOnlw8uJuQwmvBcc0bGwmpGtjVJ+uf79U9xs/QKNSjGx4e0dcZul4/54QEQNLLhGqCsjwrAJLzAgFdD0a8A2D0x5ZvFtDN9VpaMyFcDRHG3TwOQIDAQABo1AwTjAdBgNVHQ4EFgQU+YFl/0f0mbE1vFL1Cb42QZZReuswHwYDVR0jBBgwFoAU+YFl/0f0mbE1vFL1Cb42QZZReuswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAZ1MWeKkY+YVeD0jENxVUzgoA6Kjnwuo0Xwc+oGP0RjecuK1ZzIpt0ed3+gqof8AXAMmX4Q8KFtUrsPGQuB0uAqAb4ZEpwRbhGddE0AcHYT6yQkqxGsEU6I2vrNjiDOi6KNuoWRG/wL+bjQmgqWNY9krVrDW2KpGPurlbhzwDpyvgurxpUZcEJSyfWacrfJbbhyqX9wAaKK47sXExPCtKSzoMS+8tzSir5zG7F5+uxmCsTyG97EuD5eHAjmWRZtUTLh4VX88pQt2RURkWuLpx/7Zah4nt5VgrtjdxJ///jQ5ArTK1WGmeGcmcKWx82sFcA3mTvjI758355gzjtglyFA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mf.uni-lj.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.mf.uni-lj.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Univerza v Ljubljani Medicinska fakulteta</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mf.uni-lj.si/eng/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.mf.uni-lj.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Dušan</md:GivenName>
-    <md:SurName>Šuput</md:SurName>
-    <md:EmailAddress>mailto:dusan.suput@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Damijan</md:GivenName>
-    <md:SurName>Senčar</md:SurName>
-    <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Emil</md:GivenName>
-    <md:SurName>Hudomalj</md:SurName>
-    <md:EmailAddress>mailto:emil.hudomalj@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Branimir</md:GivenName>
-    <md:SurName>Leskošek</md:SurName>
-    <md:EmailAddress>mailto:brane.leskosek@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jure</md:GivenName>
-    <md:SurName>Pesko</md:SurName>
-    <md:EmailAddress>mailto:jure.pesko@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Damijan</md:GivenName>
-    <md:SurName>Senčar</md:SurName>
-    <md:EmailAddress>mailto:damijan.sencar@mf.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.xml
deleted file mode 100644
index 6ce9e8fb..00000000
--- a/swamid-interfederations-2.0/idp.mic.ul.ie-idp-shibboleth.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.mic.ul.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2012-05-03T00: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">mic.ul.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Mary Immaculate College</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Coláiste Mhuire gan Smál</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.mic.ul.ie/</mdui:InformationURL>
-        <mdui:Logo height="130" width="111">https://edugate.heanet.ie/rr3/logos/mic.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:52.6505454,-8.6402852</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAIm8XfsrXL+n3FjD8+FCAsrpZwqYMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5taWMudWwuaWUwHhcNMTIwNjI1MTM0OTMxWhcN
-MzIwNjI1MTM0OTMxWjAYMRYwFAYDVQQDEw1pZHAubWljLnVsLmllMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArd7puHeojmsokdqd6L8dYDagg59Rxp/W
-+Mgs+D4gm23qDfExzpWaMDtevrmCdspAU0V7sUYF5xnuromTfOgrPB9kFFhRamMz
-gA9VyXxyCYoMaingzRqI1uw0hJ2Qy3BtjIHRVPpKs8R3Dh54UEzAFuFcgOvxNg7a
-y7+yZ7eCNoPaZZqD6+5b/WuXljq+AsIsemVOtKyVCj5rvQSZRw7QTp2s9mN6xnFU
-9aIBY3HJ0uFzKWViGiVEUu7XQKncJqcGuW4V0C6bAfOKqMGtK2ywx1I5Ov8ZGAb5
-o7UjnW1tr8q0KfhTsfUzuGZg2dVEzF/uJOeMNZCnK7rKTnBe3cFEjwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAubWljLnVsLmllhiRodHRwczovL2lkcC5taWMudWwu
-aWUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCMx/V213MoR8FSMT8NB2pSJJDkP
-MA0GCSqGSIb3DQEBBQUAA4IBAQBcPiduSlzgNM8GaczyCr5S2Lz6X3NXZgnExQV7
-EYB74Fh7A7isTv3u3AIaP/rq7YC7JpSOudh0nAQmsjguwBL4H+U4yQ1G8EJW57xX
-Ll/284h2Hz9jIkmeENc8ETBVuBe1QMlhOJ6yRBnV6TDdisPLD2fE+dz/J+zW93dq
-MXhwW3z4Tu/7hjJuQ6dJBN1vGSGS0KhkNmu+Z4uYVzd99Oz0coLrv50tpvpwm0SB
-2QoN+ZsgJIiaLp/+TGaKd9mNRkmbsw/WCW4u4h6gD9hsuXndRdIz+fR9MKmUbx6s
-otIlv/GxlW1INiKMfyASC5mCnkwuLrWXW+8oAgXfPTrtPVu1
-</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.mic.ul.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mic.ul.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mic.ul.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Mary Immaculate College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Mary Immaculate College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mic.ul.ie/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Glenn</md:GivenName>
-    <md:SurName>Wearen</md:SurName>
-    <md:EmailAddress>mailto:gwearen@heanet.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>John</md:GivenName>
-    <md:SurName>Spencer</md:SurName>
-    <md:EmailAddress>mailto:john.spencer@mic.ul.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kieran</md:GivenName>
-    <md:SurName>Pearse</md:SurName>
-    <md:EmailAddress>mailto:kieran.pearse@mic.ul.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.midchesh.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.midchesh.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index e1d7fa64..00000000
--- a/swamid-interfederations-2.0/idp.midchesh.ac.uk-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://idp.midchesh.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Mid-Cheshire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-21T16:28: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">midchesh.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXDCCAkQCCQCXDevqC5AIhDANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
-						QjERMA8GA1UECBMIQ2hlc2hpcmUxEjAQBgNVBAcTCU5vcnRod2ljaDEdMBsGA1UE
-						ChMUTWlkIENoZXNoaXJlIENvbGxlZ2UxGzAZBgNVBAMTEmlkcC5taWRjaGVzaC5h
-						Yy51azAeFw0xNDA1MTQwODU2MjVaFw0zNDA1MDkwODU2MjVaMHAxCzAJBgNVBAYT
-						AkdCMREwDwYDVQQIEwhDaGVzaGlyZTESMBAGA1UEBxMJTm9ydGh3aWNoMR0wGwYD
-						VQQKExRNaWQgQ2hlc2hpcmUgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLm1pZGNoZXNo
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqbxJrYoAOBdU
-						+iG+bIRN1EmtO8tg2omFBwPiiKVCocKYf3uxTsO9kr+875s0ZJZvoVaR16D9lgEF
-						691uxz6N9W7hFexw13oE75JedD+bQH88ZKlheW1azplTEJNlAvMvDeOVKmI3wCcq
-						7jOtsHhiWJ1RN+/3KPRxQ14iJ7wiifANCagqwYGmeC1eVtPPE1g7cpjYzjIpYqZg
-						CBbZvIi11eIBIw0ufnL79suIcrPn/7luCu2fFq4ZbIh6SjVd5JK/N2AFiIWmu4D/
-						YXh/plKwR6jdv5F+P07hYjyEIJMJ27yGD32MLH1mMGEqy65k8dexsfyYgezaYaRy
-						A3inGW0MxwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAi5kjMMZzt42rjO82CmxXs
-						e8wlOz0ScY8eHgO8SKPYxg2CAxoTuOPCqX95V0zioLAqXyrVJxo+Z2FcFFdtWU8V
-						2NC6uoHaN7zLP3sYS1ledVY6PXcJrzb6bNJskL6vXHKuV1Hbj7h6eRYgx14wcADD
-						Cn5HknNl7VgMwQ0XKPBJEbGQNLeNCoUdWgmb71yDHDcmnsEhl726eUE2rKYldxD3
-						HLD4x1Fd+jxUSLr+LVnXDBiGYnzJvghKLS67rv40kH2ozEqUVVZ5WgKfNQeDQ/L8
-						41sdGgX3jERpyhfgZbJH7UihB+MQ+vsRb/BkjH1T0iSvtJE45npvq1FBrYw4soJO
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.midchesh.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.midchesh.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.midchesh.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.midchesh.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.midchesh.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.midchesh.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">midchesh.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXDCCAkQCCQCXDevqC5AIhDANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
-						QjERMA8GA1UECBMIQ2hlc2hpcmUxEjAQBgNVBAcTCU5vcnRod2ljaDEdMBsGA1UE
-						ChMUTWlkIENoZXNoaXJlIENvbGxlZ2UxGzAZBgNVBAMTEmlkcC5taWRjaGVzaC5h
-						Yy51azAeFw0xNDA1MTQwODU2MjVaFw0zNDA1MDkwODU2MjVaMHAxCzAJBgNVBAYT
-						AkdCMREwDwYDVQQIEwhDaGVzaGlyZTESMBAGA1UEBxMJTm9ydGh3aWNoMR0wGwYD
-						VQQKExRNaWQgQ2hlc2hpcmUgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLm1pZGNoZXNo
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqbxJrYoAOBdU
-						+iG+bIRN1EmtO8tg2omFBwPiiKVCocKYf3uxTsO9kr+875s0ZJZvoVaR16D9lgEF
-						691uxz6N9W7hFexw13oE75JedD+bQH88ZKlheW1azplTEJNlAvMvDeOVKmI3wCcq
-						7jOtsHhiWJ1RN+/3KPRxQ14iJ7wiifANCagqwYGmeC1eVtPPE1g7cpjYzjIpYqZg
-						CBbZvIi11eIBIw0ufnL79suIcrPn/7luCu2fFq4ZbIh6SjVd5JK/N2AFiIWmu4D/
-						YXh/plKwR6jdv5F+P07hYjyEIJMJ27yGD32MLH1mMGEqy65k8dexsfyYgezaYaRy
-						A3inGW0MxwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAi5kjMMZzt42rjO82CmxXs
-						e8wlOz0ScY8eHgO8SKPYxg2CAxoTuOPCqX95V0zioLAqXyrVJxo+Z2FcFFdtWU8V
-						2NC6uoHaN7zLP3sYS1ledVY6PXcJrzb6bNJskL6vXHKuV1Hbj7h6eRYgx14wcADD
-						Cn5HknNl7VgMwQ0XKPBJEbGQNLeNCoUdWgmb71yDHDcmnsEhl726eUE2rKYldxD3
-						HLD4x1Fd+jxUSLr+LVnXDBiGYnzJvghKLS67rv40kH2ozEqUVVZ5WgKfNQeDQ/L8
-						41sdGgX3jERpyhfgZbJH7UihB+MQ+vsRb/BkjH1T0iSvtJE45npvq1FBrYw4soJO
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.midchesh.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.midchesh.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">Mid-Cheshire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Mid Cheshire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.midchesh.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Thomas</SurName>
-    <EmailAddress>mailto:sthomas@midchesh.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Thomas</SurName>
-    <EmailAddress>mailto:sthomas@midchesh.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml
deleted file mode 100644
index d012e423..00000000
--- a/swamid-interfederations-2.0/idp.mijnhelicon.nl-nidp-saml2-metadata.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.mijnhelicon.nl/nidp/saml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-05T17:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Helicon Opleidingen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Helicon Opleidingen</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Helicon Opleidingen</mdui:Description>
-        <mdui:Description xml:lang="en">Helicon Opleidingen</mdui:Description>
-        <mdui:Logo height="41" width="108">https://static.surfconext.nl/logos/idp/helicon.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Helicon Opleidingen MBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Helicon Opleidingen MBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/9ab8d5ff3391fff206e4c5c9b138c9d6"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Helicon Opleidingen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Helicon</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.helicon.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/idp.millersville.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.millersville.edu-idp-shibboleth.xml
deleted file mode 100644
index b7537ef0..00000000
--- a/swamid-interfederations-2.0/idp.millersville.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,165 +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://idp.millersville.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">millersville.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Millersville University of Pennsylvania</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Millersville University Shibboleth Identity Provider</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.millersville.edu/registrar/faculty/ferpa.php</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>
-MIIDvjCCAqYCCQCad9weHImjfTANBgkqhkiG9w0BAQUFADCBoDELMAkGA1UEBhMC
-VVMxFTATBgNVBAgMDFBlbm5zeWx2YW5pYTEVMBMGA1UEBwwMTWlsbGVyc3ZpbGxl
-MQswCQYDVQQKDAJNVTELMAkGA1UECwwCSVQxHTAbBgNVBAMMFGlkcC5taWxsZXJz
-dmlsbGUuZWR1MSowKAYJKoZIhvcNAQkBFhtrZWl0aC53ZW56QG1pbGxlcnN2aWxs
-ZS5lZHUwHhcNMTQwMjEyMjAzNDU2WhcNMjQwMjEyMjAzNDU2WjCBoDELMAkGA1UE
-BhMCVVMxFTATBgNVBAgMDFBlbm5zeWx2YW5pYTEVMBMGA1UEBwwMTWlsbGVyc3Zp
-bGxlMQswCQYDVQQKDAJNVTELMAkGA1UECwwCSVQxHTAbBgNVBAMMFGlkcC5taWxs
-ZXJzdmlsbGUuZWR1MSowKAYJKoZIhvcNAQkBFhtrZWl0aC53ZW56QG1pbGxlcnN2
-aWxsZS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcxo3XJyJ4
-XFEbcFxi2tLbeYkgTpkCa5SkJ5iRXJ1nzY3QxtLdUlDPSDZ8yL0/aHmOrNYyblTu
-yS+7AWGONpUcO4TC+o/wXRX2bA351wqP2jB+epZmJeT+sGRwdwD4Zz8LsELlcI79
-KwzefVPE99q0lyeWr8AXK6uW3vV5y8akHmVcrjBxlh36inCwOgTQSlvYtbXHciVP
-B0/tSMGG8pNhKaCDhO9g8GCwJaZOGlA9Xyz42Nl+a+azjLznVMpgWbwY3YEZ3ju+
-jxnImQhKULjT+aY0PNk6+z+7NDeFEFfA/B/Q2QXUR64sVcP5lRNzIcV+56mJAbkM
-vwS7CF5l9FJxAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJZYFahiDe2dzQIRA1jS
-jinR70bTzkiOnQNnGQeLi1soMsix+5+tlUNx51/kHevjEmIXaF/1ExdJMA7WgIrb
-WTkuZZ4Vavfj2R6JoNWu2FRW/2M1DrXJqpbwUGcXjdHQ2rbBYmVwSCatNFTsSHip
-lL2HPQZGvht42iAEbk/V/1yrk3oL2gMCQNE72LZsR+NsBwxqICq8VMA4MhRlmKj9
-W9f49ZEtPeCsIRlBj5+g8bp0Kp/01+ZBsUH3sz4Il7xdKP5SDmSliwsdtFdtGtG3
-B1Hr85xtqTtI/mbxmfcdcmmfrY5MeMsi3FWn25+n9vouDArR9CPBswnaC7QQv8Q5
-XaY=
-          </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>
-MIIDmDCCAoACCQDPokmAeSlZezANBgkqhkiG9w0BAQUFADCBjTEdMBsGA1UEAwwU
-aWRwLm1pbGxlcnN2aWxsZS5lZHUxMTAvBgNVBAoMKE1pbGxlcnN2aWxsZSBVbml2
-ZXJzaXR5IG9mIFBlbm5zeWx2YW5pYSAxCzAJBgNVBAYTAlVTMRUwEwYDVQQIDAxQ
-ZW5uc3lsdmFuaWExFTATBgNVBAcMDE1pbGxlcnN2aWxsZTAeFw0xMzAyMjAwMTEx
-MTFaFw0xNDAyMjAwMTExMTFaMIGNMR0wGwYDVQQDDBRpZHAubWlsbGVyc3ZpbGxl
-LmVkdTExMC8GA1UECgwoTWlsbGVyc3ZpbGxlIFVuaXZlcnNpdHkgb2YgUGVubnN5
-bHZhbmlhIDELMAkGA1UEBhMCVVMxFTATBgNVBAgMDFBlbm5zeWx2YW5pYTEVMBMG
-A1UEBwwMTWlsbGVyc3ZpbGxlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAsk4pBIiHNa6xPAgluBgTro53X6UHITXz8nrMd2vE1q0+e5dBVcFMxtcKgXC9
-Hqeb5h4BCetgMVBjQcUqGVTvkVEc+U0oHYgA30QRknT64cY3fNobabbgDuw/BBM0
-1cvGVh//lg3p9hDfGPSvXDyJLh1+D0vcj+4UgaCYiHLBMvSjaJtzKI12ppvryNG8
-Tx5yVSLJGCFuuq5aeEH8h6i5n46RabRea0+g/Y1AEabToFf+4sJdQ55a96S7O1RR
-mFmFmCpv7DCFI96yaIRUUylGq0wTt0g/NGEbKDBdc1RVdJS0VVvQ12fXgakWtb8U
-YeoQtJyO11UhiY84GF1VB5O4PQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAB8bN2
-Edf1s1dmx3OtrgrhWP+GTPwBXZEkPd89/aauVNF23sgYUYwd1FIJQUF3oxFxf6R4
-YVnaVTHw/6Lgzgkua+Vyq7cNsjmrWSqadFiBsT3lOw6CmTFwpJp1cbA17oEh6MzN
-5pKtg5vkF66uNK48G8McryCcP9jrX3n1ldDV33qITE9JgY9yGOcm5dmhU+tBNmzI
-zMjjr6ZldRn41oqKMVdr6Wsv7FXecCOwbFPzItMINzDJ5GAP8Fm2H02JBkai8jX8
-WAWsqXPCafwwasFkMDtUQbBIB70JqFTLFdb8xbP6ESn8cBr2nbB8qcvWPM8MBvX5
-rkHfGo7YiJzuzWRw
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.millersville.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.millersville.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.millersville.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.millersville.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.millersville.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.millersville.edu/idp/profile/SAML2/POST-SimpleSign/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">millersville.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDvjCCAqYCCQCad9weHImjfTANBgkqhkiG9w0BAQUFADCBoDELMAkGA1UEBhMC
-VVMxFTATBgNVBAgMDFBlbm5zeWx2YW5pYTEVMBMGA1UEBwwMTWlsbGVyc3ZpbGxl
-MQswCQYDVQQKDAJNVTELMAkGA1UECwwCSVQxHTAbBgNVBAMMFGlkcC5taWxsZXJz
-dmlsbGUuZWR1MSowKAYJKoZIhvcNAQkBFhtrZWl0aC53ZW56QG1pbGxlcnN2aWxs
-ZS5lZHUwHhcNMTQwMjEyMjAzNDU2WhcNMjQwMjEyMjAzNDU2WjCBoDELMAkGA1UE
-BhMCVVMxFTATBgNVBAgMDFBlbm5zeWx2YW5pYTEVMBMGA1UEBwwMTWlsbGVyc3Zp
-bGxlMQswCQYDVQQKDAJNVTELMAkGA1UECwwCSVQxHTAbBgNVBAMMFGlkcC5taWxs
-ZXJzdmlsbGUuZWR1MSowKAYJKoZIhvcNAQkBFhtrZWl0aC53ZW56QG1pbGxlcnN2
-aWxsZS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcxo3XJyJ4
-XFEbcFxi2tLbeYkgTpkCa5SkJ5iRXJ1nzY3QxtLdUlDPSDZ8yL0/aHmOrNYyblTu
-yS+7AWGONpUcO4TC+o/wXRX2bA351wqP2jB+epZmJeT+sGRwdwD4Zz8LsELlcI79
-KwzefVPE99q0lyeWr8AXK6uW3vV5y8akHmVcrjBxlh36inCwOgTQSlvYtbXHciVP
-B0/tSMGG8pNhKaCDhO9g8GCwJaZOGlA9Xyz42Nl+a+azjLznVMpgWbwY3YEZ3ju+
-jxnImQhKULjT+aY0PNk6+z+7NDeFEFfA/B/Q2QXUR64sVcP5lRNzIcV+56mJAbkM
-vwS7CF5l9FJxAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJZYFahiDe2dzQIRA1jS
-jinR70bTzkiOnQNnGQeLi1soMsix+5+tlUNx51/kHevjEmIXaF/1ExdJMA7WgIrb
-WTkuZZ4Vavfj2R6JoNWu2FRW/2M1DrXJqpbwUGcXjdHQ2rbBYmVwSCatNFTsSHip
-lL2HPQZGvht42iAEbk/V/1yrk3oL2gMCQNE72LZsR+NsBwxqICq8VMA4MhRlmKj9
-W9f49ZEtPeCsIRlBj5+g8bp0Kp/01+ZBsUH3sz4Il7xdKP5SDmSliwsdtFdtGtG3
-B1Hr85xtqTtI/mbxmfcdcmmfrY5MeMsi3FWn25+n9vouDArR9CPBswnaC7QQv8Q5
-XaY=
-          </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>
-MIIDmDCCAoACCQDPokmAeSlZezANBgkqhkiG9w0BAQUFADCBjTEdMBsGA1UEAwwU
-aWRwLm1pbGxlcnN2aWxsZS5lZHUxMTAvBgNVBAoMKE1pbGxlcnN2aWxsZSBVbml2
-ZXJzaXR5IG9mIFBlbm5zeWx2YW5pYSAxCzAJBgNVBAYTAlVTMRUwEwYDVQQIDAxQ
-ZW5uc3lsdmFuaWExFTATBgNVBAcMDE1pbGxlcnN2aWxsZTAeFw0xMzAyMjAwMTEx
-MTFaFw0xNDAyMjAwMTExMTFaMIGNMR0wGwYDVQQDDBRpZHAubWlsbGVyc3ZpbGxl
-LmVkdTExMC8GA1UECgwoTWlsbGVyc3ZpbGxlIFVuaXZlcnNpdHkgb2YgUGVubnN5
-bHZhbmlhIDELMAkGA1UEBhMCVVMxFTATBgNVBAgMDFBlbm5zeWx2YW5pYTEVMBMG
-A1UEBwwMTWlsbGVyc3ZpbGxlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAsk4pBIiHNa6xPAgluBgTro53X6UHITXz8nrMd2vE1q0+e5dBVcFMxtcKgXC9
-Hqeb5h4BCetgMVBjQcUqGVTvkVEc+U0oHYgA30QRknT64cY3fNobabbgDuw/BBM0
-1cvGVh//lg3p9hDfGPSvXDyJLh1+D0vcj+4UgaCYiHLBMvSjaJtzKI12ppvryNG8
-Tx5yVSLJGCFuuq5aeEH8h6i5n46RabRea0+g/Y1AEabToFf+4sJdQ55a96S7O1RR
-mFmFmCpv7DCFI96yaIRUUylGq0wTt0g/NGEbKDBdc1RVdJS0VVvQ12fXgakWtb8U
-YeoQtJyO11UhiY84GF1VB5O4PQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAB8bN2
-Edf1s1dmx3OtrgrhWP+GTPwBXZEkPd89/aauVNF23sgYUYwd1FIJQUF3oxFxf6R4
-YVnaVTHw/6Lgzgkua+Vyq7cNsjmrWSqadFiBsT3lOw6CmTFwpJp1cbA17oEh6MzN
-5pKtg5vkF66uNK48G8McryCcP9jrX3n1ldDV33qITE9JgY9yGOcm5dmhU+tBNmzI
-zMjjr6ZldRn41oqKMVdr6Wsv7FXecCOwbFPzItMINzDJ5GAP8Fm2H02JBkai8jX8
-WAWsqXPCafwwasFkMDtUQbBIB70JqFTLFdb8xbP6ESn8cBr2nbB8qcvWPM8MBvX5
-rkHfGo7YiJzuzWRw
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.millersville.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.millersville.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Millersville University of Pennsylvania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Millersville University of Pennsylvania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.millersville.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Keith Wenz</md:GivenName>
-    <md:EmailAddress>Keith.Wenz@millersville.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Christopher Medalis</md:GivenName>
-    <md:EmailAddress>Christopher.Medalis@millersville.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Veronica Longenecker</md:GivenName>
-    <md:EmailAddress>Veronica.Longenecker@millersville.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 14b1ae67..00000000
--- a/swamid-interfederations-2.0/idp.mimas.ac.uk-idp-shibboleth.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://idp.mimas.ac.uk/idp/shibboleth">
-  <!--
-		This is a Mimas Shibboleth IdP for The University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">mimas.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUExVE+BsgxiwDLoOHU9bL+UpPdVEwDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPaWRwLm1pbWFzLmFjLnVrMB4XDTEwMTAwNDE3MDczOFoX
-						DTMwMTAwNDE3MDczOFowGjEYMBYGA1UEAxMPaWRwLm1pbWFzLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4w7U5gd6/ifZvu0vwr4rK9zY08DO
-						uxfZDkOAoXnfL6w31loHJQaM1ezLKs9RxVgHk++2vzFUn5Y70Bj7vOEOtaevjsKU
-						VrnJZGpj7pwRtRZinpVUjlT/a8sQUhjDjnag1RceLYthPG8BTd5whlWGLl0+aQHD
-						QbwdPcRqEml+6TZG8sxTZIukWqtdTCzVMl+EYfdclCqDKUFMXm3Uz15OzUje53Bv
-						WIaX2ThmUyqiDPHPGCfknwtcsKYcc3ztyokCamTH7U5FuxJMkTlzrieXJvHGTRjZ
-						uDHQhN6ulvr7/5Zt1v9OngZxptFc5ICUe8YqLelBgpWfeekXwLgP2AOzVQIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg9pZHAubWltYXMuYWMudWuGJmh0dHBzOi8vaWRwLm1p
-						bWFzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRoLGk6jr37RIvGJJ9m
-						Nu2cx/xIRDANBgkqhkiG9w0BAQUFAAOCAQEAxv3qV8i0hLx/UCzgEerrDs0mrMQi
-						2ZZYQQAAfrZmMSAryZu2yBc87Ibku5dbKps89fA47KYG+Fro/ixdx1DTrkod2Gwz
-						28MMRa3WTp3KxOq7NMCSrsk7OEEwyeYo3Ozw1Evmm4LRh3i0MpMNo9SunlU9Xfjk
-						UO2RBp6YWrNL3uOWrdskey+qbXzhnQNGnLqpsL1MDI/tmrWxsyxcjnEyG4F7FSku
-						fvrpFwCGZkEH+4xIDCEGFTxBWBy7Ex/MJ7ltPBeOwej+omCGkJxJcAbzaBsM+5AM
-						fRhXAFKoBmWmKAGSKfZDAIj7HXfN/kBwjy0PyOt8kPDXrvqGmveft0zUvg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mimas.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mimas.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.mimas.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mimas.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mimas.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mimas.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">mimas.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUExVE+BsgxiwDLoOHU9bL+UpPdVEwDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPaWRwLm1pbWFzLmFjLnVrMB4XDTEwMTAwNDE3MDczOFoX
-						DTMwMTAwNDE3MDczOFowGjEYMBYGA1UEAxMPaWRwLm1pbWFzLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4w7U5gd6/ifZvu0vwr4rK9zY08DO
-						uxfZDkOAoXnfL6w31loHJQaM1ezLKs9RxVgHk++2vzFUn5Y70Bj7vOEOtaevjsKU
-						VrnJZGpj7pwRtRZinpVUjlT/a8sQUhjDjnag1RceLYthPG8BTd5whlWGLl0+aQHD
-						QbwdPcRqEml+6TZG8sxTZIukWqtdTCzVMl+EYfdclCqDKUFMXm3Uz15OzUje53Bv
-						WIaX2ThmUyqiDPHPGCfknwtcsKYcc3ztyokCamTH7U5FuxJMkTlzrieXJvHGTRjZ
-						uDHQhN6ulvr7/5Zt1v9OngZxptFc5ICUe8YqLelBgpWfeekXwLgP2AOzVQIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg9pZHAubWltYXMuYWMudWuGJmh0dHBzOi8vaWRwLm1p
-						bWFzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRoLGk6jr37RIvGJJ9m
-						Nu2cx/xIRDANBgkqhkiG9w0BAQUFAAOCAQEAxv3qV8i0hLx/UCzgEerrDs0mrMQi
-						2ZZYQQAAfrZmMSAryZu2yBc87Ibku5dbKps89fA47KYG+Fro/ixdx1DTrkod2Gwz
-						28MMRa3WTp3KxOq7NMCSrsk7OEEwyeYo3Ozw1Evmm4LRh3i0MpMNo9SunlU9Xfjk
-						UO2RBp6YWrNL3uOWrdskey+qbXzhnQNGnLqpsL1MDI/tmrWxsyxcjnEyG4F7FSku
-						fvrpFwCGZkEH+4xIDCEGFTxBWBy7Ex/MJ7ltPBeOwej+omCGkJxJcAbzaBsM+5AM
-						fRhXAFKoBmWmKAGSKfZDAIj7HXfN/kBwjy0PyOt8kPDXrvqGmveft0zUvg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mimas.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mimas.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 University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Manchester: Mimas</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://mimas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mimas helpdesk</GivenName>
-    <EmailAddress>mailto:info@mimas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nicholas</GivenName>
-    <SurName>Syrotiuk</SurName>
-    <EmailAddress>mailto:syrotiuk@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mines.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mines.edu-idp-shibboleth.xml
deleted file mode 100644
index a84d0edc..00000000
--- a/swamid-interfederations-2.0/idp.mines.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,96 +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://idp.mines.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">mines.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Colorado School of Mines</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>
-MIIDIDCCAgigAwIBAgIVALrVjyviCwnipvwjtC7VXHNfQYsFMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5taW5lcy5lZHUwHhcNMTQwNDA3MjAzMTE4WhcN
-MzQwNDA3MjAzMTE4WjAYMRYwFAYDVQQDEw1pZHAubWluZXMuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmypcCiTRtq+l22di6Wp200buqUJTdKZe
-pWQ7uOhe64ns1HbPyXBeCAnUI3yLeUduwrj/VDJEQsh5Sdpg/I8lkf3zUoDNEUeM
-tp8nZjRDCysLZcotlaT1nfFj5g/Yvk1BBb+09y+Orovcv3NLY9DE42qK5CrnWdqO
-6TWme1sgNtClkFBgxDbXGGQzNqHHvAUQooSiDVB716u4t0KlKREvDNdmx5KJ7jjO
-stlMOxw2L1xnGs7dScUDR9AYxWuZ2v7l5sgeTGVGY39DJbRk4jHi4vxsVYBlq18/
-WFoS94t4g32KpDYclxfZIlkgibU0E9Bw8wcnq5h9My1J0aKOS+366QIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAubWluZXMuZWR1hiRodHRwczovL2lkcC5taW5lcy5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNxq63HQJW8lr4dh/q1gtcJJ0bFg
-MA0GCSqGSIb3DQEBBQUAA4IBAQB2/aY7NYBtrztFTQeQjhUg76xuVzBskqvgIKfU
-4YeYjvK86VNEKlppGkylFHm817Sy2yeDozoKV2jS46GOlg9ZgE7NGiLdK1NP2vup
-S5KdtuOu7wnrrzkKQqY3zL4TDwK4qPZxOAFZcFSYdoPNGc+fKrhw7bo6S+ZSjFtm
-68I/MXFy+Q9iGYh6dPC5x3PRn0hn1TPTJ1GczhkNGFZLZqnE4Pb/gPXwbSx3jvyv
-pDZoqzjpdIxwH4osA5q6R8DkFUHxsOQlPHTZozbBtkIcKigYYG2sEmKmHUxmV9zu
-t6dBbef3d3Mj0qVgNOz7Nyvv1qrAUw8WUziVYMzIeS9tQJa1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mines.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mines.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mines.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mines.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mines.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVALrVjyviCwnipvwjtC7VXHNfQYsFMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5taW5lcy5lZHUwHhcNMTQwNDA3MjAzMTE4WhcN
-MzQwNDA3MjAzMTE4WjAYMRYwFAYDVQQDEw1pZHAubWluZXMuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmypcCiTRtq+l22di6Wp200buqUJTdKZe
-pWQ7uOhe64ns1HbPyXBeCAnUI3yLeUduwrj/VDJEQsh5Sdpg/I8lkf3zUoDNEUeM
-tp8nZjRDCysLZcotlaT1nfFj5g/Yvk1BBb+09y+Orovcv3NLY9DE42qK5CrnWdqO
-6TWme1sgNtClkFBgxDbXGGQzNqHHvAUQooSiDVB716u4t0KlKREvDNdmx5KJ7jjO
-stlMOxw2L1xnGs7dScUDR9AYxWuZ2v7l5sgeTGVGY39DJbRk4jHi4vxsVYBlq18/
-WFoS94t4g32KpDYclxfZIlkgibU0E9Bw8wcnq5h9My1J0aKOS+366QIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAubWluZXMuZWR1hiRodHRwczovL2lkcC5taW5lcy5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNxq63HQJW8lr4dh/q1gtcJJ0bFg
-MA0GCSqGSIb3DQEBBQUAA4IBAQB2/aY7NYBtrztFTQeQjhUg76xuVzBskqvgIKfU
-4YeYjvK86VNEKlppGkylFHm817Sy2yeDozoKV2jS46GOlg9ZgE7NGiLdK1NP2vup
-S5KdtuOu7wnrrzkKQqY3zL4TDwK4qPZxOAFZcFSYdoPNGc+fKrhw7bo6S+ZSjFtm
-68I/MXFy+Q9iGYh6dPC5x3PRn0hn1TPTJ1GczhkNGFZLZqnE4Pb/gPXwbSx3jvyv
-pDZoqzjpdIxwH4osA5q6R8DkFUHxsOQlPHTZozbBtkIcKigYYG2sEmKmHUxmV9zu
-t6dBbef3d3Mj0qVgNOz7Nyvv1qrAUw8WUziVYMzIeS9tQJa1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mines.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Colorado School of Mines</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Colorado School of Mines</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mines.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Matthew B. Brookover</md:GivenName>
-    <md:EmailAddress>mbrookov@mines.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Gina Boice</md:GivenName>
-    <md:EmailAddress>gboice@mines.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mkcollege.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.mkcollege.ac.uk-openathens.xml
deleted file mode 100644
index a552178b..00000000
--- a/swamid-interfederations-2.0/idp.mkcollege.ac.uk-openathens.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.mkcollege.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Milton Keynes College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">mkcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/mkcollege.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/mkcollege.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Milton Keynes College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mkcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mmu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.mmu.ac.uk-shibboleth.xml
deleted file mode 100644
index c469a699..00000000
--- a/swamid-interfederations-2.0/idp.mmu.ac.uk-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.mmu.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Manchester Metropolitan University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-09T15:44: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">mmu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF7zCCBNegAwIBAgIKEQ8ZqQAFAAGwijANBgkqhkiG9w0BAQUFADBsMRIwEAYK
-						CZImiZPyLGQBGRYCdWsxEjAQBgoJkiaJk/IsZAEZFgJhYzETMBEGCgmSJomT8ixk
-						ARkWA21tdTESMBAGCgmSJomT8ixkARkWAmFkMRkwFwYDVQQDExBhZC1KREVBRE1H
-						TVQxLUNBMB4XDTE0MDYxMDA5NDY0MloXDTIzMDYwODA5NDY0MlowgY8xCzAJBgNV
-						BAYTAkdCMRAwDgYDVQQIEwdFbmdsYW5kMRswGQYDVQQHExJHcmVhdGVyIE1hbmNo
-						ZXN0ZXIxKzApBgNVBAoTIk1hbmNoZXN0ZXIgTWV0cm9wb2xpdGFuIFVuaXZlcnNp
-						dHkxDDAKBgNVBAsTA0lUUzEWMBQGA1UEAxMNaWRwLm1tdS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2aUJf4/gCMBJ9blo9YjL9nNvw1H61B
-						Pj0B4g3CDLXuAUocLLokpDJgvAqoPou7BXA3q/zeaF1m6mSue/bgg7obCUY/Pjyk
-						PnsSp8YbAoMv5/AeQLb+RGrsZ6Vvnv1/mUglpt6I7/8KuDlq89+x/lXshx09elrI
-						uiUf4vbWIbJjklaW8kLBsGkZ3k4I+sfu/oGRDAo5id5vI8/sWvxwXizJMb5+sC1z
-						AcofB9ux8vlIH8osZK4Jon976j+F+89+lP5R6x5YcXc0XI54X3LkpmKTxxhF0Vg7
-						wymvSihurHOwtAkSsWFZ/rJ/Gn8Zo7HTRopVPTdOiLS6ZNo92aYmiQUCAwEAAaOC
-						Am0wggJpMB0GA1UdDgQWBBSwEMs3Qept/2PCAEj9gGidV4+aYTAfBgNVHSMEGDAW
-						gBTuEDNk61YXy8+cyWM7HuKODmd0zTCB2wYDVR0fBIHTMIHQMIHNoIHKoIHHhoHE
-						bGRhcDovLy9DTj1hZC1KREVBRE1HTVQxLUNBKDUpLENOPUpERUFETUdNVDEsQ049
-						Q0RQLENOPVB1YmxpYyUyMEtleSUyMFNlcnZpY2VzLENOPVNlcnZpY2VzLENOPUNv
-						bmZpZ3VyYXRpb24sREM9YWQsREM9bW11LERDPWFjLERDPXVrP2NlcnRpZmljYXRl
-						UmV2b2NhdGlvbkxpc3Q/YmFzZT9vYmplY3RDbGFzcz1jUkxEaXN0cmlidXRpb25Q
-						b2ludDCByQYIKwYBBQUHAQEEgbwwgbkwgbYGCCsGAQUFBzAChoGpbGRhcDovLy9D
-						Tj1hZC1KREVBRE1HTVQxLUNBLENOPUFJQSxDTj1QdWJsaWMlMjBLZXklMjBTZXJ2
-						aWNlcyxDTj1TZXJ2aWNlcyxDTj1Db25maWd1cmF0aW9uLERDPWFkLERDPW1tdSxE
-						Qz1hYyxEQz11az9jQUNlcnRpZmljYXRlP2Jhc2U/b2JqZWN0Q2xhc3M9Y2VydGlm
-						aWNhdGlvbkF1dGhvcml0eTAOBgNVHQ8BAf8EBAMCBaAwOwYJKwYBBAGCNxUHBC4w
-						LAYkKwYBBAGCNxUIhbWgdYPgngWZjTPfs06EztIPgXexhHaD/MAYAgFkAgEGMBMG
-						A1UdJQQMMAoGCCsGAQUFBwMBMBsGCSsGAQQBgjcVCgQOMAwwCgYIKwYBBQUHAwEw
-						DQYJKoZIhvcNAQEFBQADggEBAJWqoyrhg8HA0WFS/egaof7pmRJaGddx7hOij8As
-						I/aeLxFJoOYz5ahVhFEGUfJYGLQMvTJ0jAU9oMVnOzkw0qeAgjtKUOTq0msOrSWw
-						YgEYtXSyTnr84swBtF5aPsQmn/DTc4PceCKY0AOljsmjxnf51z70CvAQqCbYdAJ+
-						O+pFeLNMCKZSdC4kkLILN4wvfd2FlphLJG2C67yLoo8c7/cDCJxPdLGkJMkCzjRO
-						ZRaaAx9lEqDFa/xy/J6cRxhqq+Dw3TKBvOZyetNHg38Lwy2APwzTVlgdJrbR7+Wg
-						ooB93xRbkV/WtLUE+WHNVFjsTcVoQZ/XY4FMbXl5gqji35I=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mmu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mmu.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.mmu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mmu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mmu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mmu.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">mmu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF7zCCBNegAwIBAgIKEQ8ZqQAFAAGwijANBgkqhkiG9w0BAQUFADBsMRIwEAYK
-						CZImiZPyLGQBGRYCdWsxEjAQBgoJkiaJk/IsZAEZFgJhYzETMBEGCgmSJomT8ixk
-						ARkWA21tdTESMBAGCgmSJomT8ixkARkWAmFkMRkwFwYDVQQDExBhZC1KREVBRE1H
-						TVQxLUNBMB4XDTE0MDYxMDA5NDY0MloXDTIzMDYwODA5NDY0MlowgY8xCzAJBgNV
-						BAYTAkdCMRAwDgYDVQQIEwdFbmdsYW5kMRswGQYDVQQHExJHcmVhdGVyIE1hbmNo
-						ZXN0ZXIxKzApBgNVBAoTIk1hbmNoZXN0ZXIgTWV0cm9wb2xpdGFuIFVuaXZlcnNp
-						dHkxDDAKBgNVBAsTA0lUUzEWMBQGA1UEAxMNaWRwLm1tdS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2aUJf4/gCMBJ9blo9YjL9nNvw1H61B
-						Pj0B4g3CDLXuAUocLLokpDJgvAqoPou7BXA3q/zeaF1m6mSue/bgg7obCUY/Pjyk
-						PnsSp8YbAoMv5/AeQLb+RGrsZ6Vvnv1/mUglpt6I7/8KuDlq89+x/lXshx09elrI
-						uiUf4vbWIbJjklaW8kLBsGkZ3k4I+sfu/oGRDAo5id5vI8/sWvxwXizJMb5+sC1z
-						AcofB9ux8vlIH8osZK4Jon976j+F+89+lP5R6x5YcXc0XI54X3LkpmKTxxhF0Vg7
-						wymvSihurHOwtAkSsWFZ/rJ/Gn8Zo7HTRopVPTdOiLS6ZNo92aYmiQUCAwEAAaOC
-						Am0wggJpMB0GA1UdDgQWBBSwEMs3Qept/2PCAEj9gGidV4+aYTAfBgNVHSMEGDAW
-						gBTuEDNk61YXy8+cyWM7HuKODmd0zTCB2wYDVR0fBIHTMIHQMIHNoIHKoIHHhoHE
-						bGRhcDovLy9DTj1hZC1KREVBRE1HTVQxLUNBKDUpLENOPUpERUFETUdNVDEsQ049
-						Q0RQLENOPVB1YmxpYyUyMEtleSUyMFNlcnZpY2VzLENOPVNlcnZpY2VzLENOPUNv
-						bmZpZ3VyYXRpb24sREM9YWQsREM9bW11LERDPWFjLERDPXVrP2NlcnRpZmljYXRl
-						UmV2b2NhdGlvbkxpc3Q/YmFzZT9vYmplY3RDbGFzcz1jUkxEaXN0cmlidXRpb25Q
-						b2ludDCByQYIKwYBBQUHAQEEgbwwgbkwgbYGCCsGAQUFBzAChoGpbGRhcDovLy9D
-						Tj1hZC1KREVBRE1HTVQxLUNBLENOPUFJQSxDTj1QdWJsaWMlMjBLZXklMjBTZXJ2
-						aWNlcyxDTj1TZXJ2aWNlcyxDTj1Db25maWd1cmF0aW9uLERDPWFkLERDPW1tdSxE
-						Qz1hYyxEQz11az9jQUNlcnRpZmljYXRlP2Jhc2U/b2JqZWN0Q2xhc3M9Y2VydGlm
-						aWNhdGlvbkF1dGhvcml0eTAOBgNVHQ8BAf8EBAMCBaAwOwYJKwYBBAGCNxUHBC4w
-						LAYkKwYBBAGCNxUIhbWgdYPgngWZjTPfs06EztIPgXexhHaD/MAYAgFkAgEGMBMG
-						A1UdJQQMMAoGCCsGAQUFBwMBMBsGCSsGAQQBgjcVCgQOMAwwCgYIKwYBBQUHAwEw
-						DQYJKoZIhvcNAQEFBQADggEBAJWqoyrhg8HA0WFS/egaof7pmRJaGddx7hOij8As
-						I/aeLxFJoOYz5ahVhFEGUfJYGLQMvTJ0jAU9oMVnOzkw0qeAgjtKUOTq0msOrSWw
-						YgEYtXSyTnr84swBtF5aPsQmn/DTc4PceCKY0AOljsmjxnf51z70CvAQqCbYdAJ+
-						O+pFeLNMCKZSdC4kkLILN4wvfd2FlphLJG2C67yLoo8c7/cDCJxPdLGkJMkCzjRO
-						ZRaaAx9lEqDFa/xy/J6cRxhqq+Dw3TKBvOZyetNHg38Lwy2APwzTVlgdJrbR7+Wg
-						ooB93xRbkV/WtLUE+WHNVFjsTcVoQZ/XY4FMbXl5gqji35I=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mmu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mmu.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">Manchester Metropolitan University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Manchester Metropolitan University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://icts.mmu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Servers and Storage Team</GivenName>
-    <EmailAddress>mailto:ss@mmu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Servers and Storage Team</GivenName>
-    <EmailAddress>mailto:ss@mmu.ac.uk</EmailAddress>
-  </ContactPerson>
-</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.morleycollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.morleycollege.ac.uk-shibboleth.xml
deleted file mode 100644
index ee6855b2..00000000
--- a/swamid-interfederations-2.0/idp.morleycollege.ac.uk-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.morleycollege.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Morley College Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">morleycollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/morleycollege.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/morleycollege.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Morley College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.morleycollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.motherwell.co.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.motherwell.co.uk-shibboleth.xml
deleted file mode 100644
index c5c0580c..00000000
--- a/swamid-interfederations-2.0/idp.motherwell.co.uk-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://idp.motherwell.co.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for New College Lanarkshire.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">motherwell.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbDCCAlQCCQCYnW4c5CPhFjANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
-						QjETMBEGA1UECBMKTW90aGVyd2VsbDETMBEGA1UEBxMKTW90aGVyd2VsbDEgMB4G
-						A1UEChMXTmV3IENvbGxlZ2UgTGFuYXJrc2hpcmUxHTAbBgNVBAMTFGlkcC5tb3Ro
-						ZXJ3ZWxsLmNvLnVrMB4XDTE0MDUwNzEzMjUwN1oXDTM0MDUwMjEzMjUwN1oweDEL
-						MAkGA1UEBhMCR0IxEzARBgNVBAgTCk1vdGhlcndlbGwxEzARBgNVBAcTCk1vdGhl
-						cndlbGwxIDAeBgNVBAoTF05ldyBDb2xsZWdlIExhbmFya3NoaXJlMR0wGwYDVQQD
-						ExRpZHAubW90aGVyd2VsbC5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAOigdZo6jqFEwLsAI0rsABIfdOcGaOplDLGe58NaeY3Rhz0Yb9jlqy0X
-						lWtcHYMkSMqaCG8HyX9I/HO4BNLcBG2WieAQwWda0ZDO6e1EpuMgZOZv1EMgCUTZ
-						btxqNIDjAK2DhuHQd+hqWmMORm5w24C2yZa4GHi0DatKUEOufEH6nXArRtRI5AAt
-						OXkDUwnGwLMjkrxLWhPWBHQwoNlHLjIorNixYizvd5uaAA4RtOk9iYmnq2bf2/42
-						MzeuqSf1S3gtpmooQrCDCJr2NOXrrCwtnekdbo77f/BT7KXhhICXF6qw2RM30/Im
-						oJmIaRKuPpZuZ4wi/b49QgM9xiXxFjMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						BXmDILeWGVL4u+dT06/PdDsxSF40ojSWLNS2/gbKIStMUv2Ndj9VayfXR5pjPD0Z
-						p6lwOtnTQ0WDMi3rFn2s2KXzD6JtWnSO42DTZELnfJhE790kO4u7tdNT4VMltjVK
-						DvZcBFufCIU19hc7iAefKvZMFgS9vBhpo8VwoC9B3E8dgD+0BytsjQggdCvN4xwk
-						bsY7NWo0A1FehMIKVHCPqjFfobfg2KYc3ARB6VDTSX8bxiLeR7nmwVI8OPCvbLhY
-						zeCIZ0ypZsxScQBRzsZ9aoS70pV6aQTT4mfGvOaLtOsSg9+43cDUPb1dR7G+VZlx
-						MOK0vjPGiv0YbkI+n6sWVw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.motherwell.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.motherwell.co.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.motherwell.co.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.motherwell.co.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.motherwell.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.motherwell.co.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">motherwell.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbDCCAlQCCQCYnW4c5CPhFjANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
-						QjETMBEGA1UECBMKTW90aGVyd2VsbDETMBEGA1UEBxMKTW90aGVyd2VsbDEgMB4G
-						A1UEChMXTmV3IENvbGxlZ2UgTGFuYXJrc2hpcmUxHTAbBgNVBAMTFGlkcC5tb3Ro
-						ZXJ3ZWxsLmNvLnVrMB4XDTE0MDUwNzEzMjUwN1oXDTM0MDUwMjEzMjUwN1oweDEL
-						MAkGA1UEBhMCR0IxEzARBgNVBAgTCk1vdGhlcndlbGwxEzARBgNVBAcTCk1vdGhl
-						cndlbGwxIDAeBgNVBAoTF05ldyBDb2xsZWdlIExhbmFya3NoaXJlMR0wGwYDVQQD
-						ExRpZHAubW90aGVyd2VsbC5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAOigdZo6jqFEwLsAI0rsABIfdOcGaOplDLGe58NaeY3Rhz0Yb9jlqy0X
-						lWtcHYMkSMqaCG8HyX9I/HO4BNLcBG2WieAQwWda0ZDO6e1EpuMgZOZv1EMgCUTZ
-						btxqNIDjAK2DhuHQd+hqWmMORm5w24C2yZa4GHi0DatKUEOufEH6nXArRtRI5AAt
-						OXkDUwnGwLMjkrxLWhPWBHQwoNlHLjIorNixYizvd5uaAA4RtOk9iYmnq2bf2/42
-						MzeuqSf1S3gtpmooQrCDCJr2NOXrrCwtnekdbo77f/BT7KXhhICXF6qw2RM30/Im
-						oJmIaRKuPpZuZ4wi/b49QgM9xiXxFjMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						BXmDILeWGVL4u+dT06/PdDsxSF40ojSWLNS2/gbKIStMUv2Ndj9VayfXR5pjPD0Z
-						p6lwOtnTQ0WDMi3rFn2s2KXzD6JtWnSO42DTZELnfJhE790kO4u7tdNT4VMltjVK
-						DvZcBFufCIU19hc7iAefKvZMFgS9vBhpo8VwoC9B3E8dgD+0BytsjQggdCvN4xwk
-						bsY7NWo0A1FehMIKVHCPqjFfobfg2KYc3ARB6VDTSX8bxiLeR7nmwVI8OPCvbLhY
-						zeCIZ0ypZsxScQBRzsZ9aoS70pV6aQTT4mfGvOaLtOsSg9+43cDUPb1dR7G+VZlx
-						MOK0vjPGiv0YbkI+n6sWVw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.motherwell.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.motherwell.co.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">New College Lanarkshire</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">New College Lanarkshire</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.motherwell.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stephen</GivenName>
-    <SurName>Jennings</SurName>
-    <EmailAddress>mailto:stephen.jennings@nclan.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stephen</GivenName>
-    <SurName>Jennings</SurName>
-    <EmailAddress>mailto:stephen.jennings@nclan.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.moulton.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.moulton.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 1c19d020..00000000
--- a/swamid-interfederations-2.0/idp.moulton.ac.uk-idp-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://idp.moulton.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Moulton College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">moulton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXDCCAkQCCQDjRj86cKfsGTANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
-						QjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEQMA4GA1UEBxMHTW91bHRvbjEY
-						MBYGA1UEChMPTW91bHRvbiBDb2xsZWdlMRowGAYDVQQDExFpZHAubW91bHRvbi5h
-						Yy51azAeFw0xMzA3MTAwODA2NDZaFw0zMzA3MDUwODA2NDZaMHAxCzAJBgNVBAYT
-						AkdCMRkwFwYDVQQIExBOb3J0aGFtcHRvbnNoaXJlMRAwDgYDVQQHEwdNb3VsdG9u
-						MRgwFgYDVQQKEw9Nb3VsdG9uIENvbGxlZ2UxGjAYBgNVBAMTEWlkcC5tb3VsdG9u
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtOUUz3boGH86
-						Tvg4mW4AYjne2//WqhAjIoSWSTGc+A0r3WSPHzEMh9Y5UMLgcJjsUZhE2MxtCKe0
-						AAlnRGg71sO3h/h6oEV0dZrN6KGut4E43ynfoaqDkRhUR4wJq45y7/6v1GKi0eqk
-						CbTW9fBHjoDBmXuQGmSCTnglZIf7LUdzTevCUhOvxnV+lt9oV9FSV3e7/pnwmBWw
-						a9aVkuXNdeny3nuUgqUpt2/phrKwtNtQrnBRw/gRwsPhak5zb/TI8F2D153SowjC
-						liOb0SL163Sc92XbmNdeVAs42fY+zMs3eAIhlTUh1MHi/9hFUQP8Cjm0eF8Qe2f2
-						eYoFrMNTtQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBAti3u2KuXz0CMGDlW1yXY
-						ktvVMyJR/b3xnESTJm6vj59Sk321SEhrc1vuYEbBZSc2XUGRC1YwsW7X7/wxYKAl
-						LzB72n980lTkBG/S9i012lmhIBJzOFiNeMyHeIxzCqSyiJF/UkmgVGElTB8ByKDK
-						ATobFtFqj5aKvkxaUCXa3ftV+hRF4DPvQFmvRTU1rrGqMvh0mr9XQhYIW1vJ5HCo
-						PRCx2+4iNLJQRd4C/4iv1y4/Lo72pGLFW/DmJFz/34pKiAX/BX5SaCKh0FpxGD72
-						jqR9DG0tXPLWlzynHoSxh9Q98PcM0N927sPgS4ATbex8oDx+iTOADL5+roeXRu7i
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.moulton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.moulton.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.moulton.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.moulton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.moulton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.moulton.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">moulton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXDCCAkQCCQDjRj86cKfsGTANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJH
-						QjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEQMA4GA1UEBxMHTW91bHRvbjEY
-						MBYGA1UEChMPTW91bHRvbiBDb2xsZWdlMRowGAYDVQQDExFpZHAubW91bHRvbi5h
-						Yy51azAeFw0xMzA3MTAwODA2NDZaFw0zMzA3MDUwODA2NDZaMHAxCzAJBgNVBAYT
-						AkdCMRkwFwYDVQQIExBOb3J0aGFtcHRvbnNoaXJlMRAwDgYDVQQHEwdNb3VsdG9u
-						MRgwFgYDVQQKEw9Nb3VsdG9uIENvbGxlZ2UxGjAYBgNVBAMTEWlkcC5tb3VsdG9u
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtOUUz3boGH86
-						Tvg4mW4AYjne2//WqhAjIoSWSTGc+A0r3WSPHzEMh9Y5UMLgcJjsUZhE2MxtCKe0
-						AAlnRGg71sO3h/h6oEV0dZrN6KGut4E43ynfoaqDkRhUR4wJq45y7/6v1GKi0eqk
-						CbTW9fBHjoDBmXuQGmSCTnglZIf7LUdzTevCUhOvxnV+lt9oV9FSV3e7/pnwmBWw
-						a9aVkuXNdeny3nuUgqUpt2/phrKwtNtQrnBRw/gRwsPhak5zb/TI8F2D153SowjC
-						liOb0SL163Sc92XbmNdeVAs42fY+zMs3eAIhlTUh1MHi/9hFUQP8Cjm0eF8Qe2f2
-						eYoFrMNTtQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBAti3u2KuXz0CMGDlW1yXY
-						ktvVMyJR/b3xnESTJm6vj59Sk321SEhrc1vuYEbBZSc2XUGRC1YwsW7X7/wxYKAl
-						LzB72n980lTkBG/S9i012lmhIBJzOFiNeMyHeIxzCqSyiJF/UkmgVGElTB8ByKDK
-						ATobFtFqj5aKvkxaUCXa3ftV+hRF4DPvQFmvRTU1rrGqMvh0mr9XQhYIW1vJ5HCo
-						PRCx2+4iNLJQRd4C/4iv1y4/Lo72pGLFW/DmJFz/34pKiAX/BX5SaCKh0FpxGD72
-						jqR9DG0tXPLWlzynHoSxh9Q98PcM0N927sPgS4ATbex8oDx+iTOADL5+roeXRu7i
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.moulton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.moulton.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">Moulton College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Moulton College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.moulton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:itsupport@moulton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Giles</GivenName>
-    <SurName>Batchelor</SurName>
-    <EmailAddress>mailto:giles.batchelor@moulton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mrc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.mrc.ac.uk-shibboleth.xml
deleted file mode 100644
index 89ca28ed..00000000
--- a/swamid-interfederations-2.0/idp.mrc.ac.uk-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.mrc.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for the Medical Research Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">mrc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/mrc.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/mrc.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Medical Research Council</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mrc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</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 89e8e892..00000000
--- a/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.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.mta.hu/idp/saml2/idp/metadata.php">
-  <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="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:nren</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-test</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>href-idps</saml:AttributeValue>
-        <saml:AttributeValue>mtatitk</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">MTA Akadémiai Adattár (AAT)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hungarian Academy Database (AAT)</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">MTA Titkárság</mdui:Description>
-        <mdui:Description xml:lang="en">Hungarian Academy of Sciences</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">https://aat.mta.hu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">https://aat.mta.hu/aat/Content/documents/35_2013_aat_adatvedelem.en.pdf</mdui:PrivacyStatementURL>
-        <mdui:Logo height="73" width="64">https://aat.mta.hu/aat/Content/images/mta_logo_small.png</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">titkarsag.mta.hu</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mta.hu/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://idp.mta.hu/idp/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">MTA Titkárság</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Hungarian Academy of Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">MTA Titkárság</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Hungarian Academy of Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://aat.mta.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://aat.mta.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>AAT</md:SurName>
-    <md:EmailAddress>mailto:szervezes@titkarsag.mta.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>AAT</md:SurName>
-    <md:EmailAddress>mailto:szervezes@titkarsag.mta.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>AAT</md:SurName>
-    <md:EmailAddress>mailto:szervezes@titkarsag.mta.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mtholyoke.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mtholyoke.edu-idp-shibboleth.xml
deleted file mode 100644
index 4ce6e221..00000000
--- a/swamid-interfederations-2.0/idp.mtholyoke.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://idp.mtholyoke.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">mtholyoke.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Mount Holyoke College</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>
-MIIDMDCCAhigAwIBAgIVAJLHPh0wvbbq2rKg/fYPlc/eTL6CMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC5tdGhvbHlva2UuZWR1MB4XDTExMDQwNjEzNDYz
-NFoXDTMxMDQwNjEzNDYzNFowHDEaMBgGA1UEAxMRaWRwLm10aG9seW9rZS5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCg6TefcVZH73MAVG3ga4dT
-/voaUrbI6ns4+sK0oUcq+0MA4ENv2vzvNQUQbGnxaui2aKyXfAE40M7iyVqmP9i1
-R4iv1V9/HciiGJE9vN99D6WexJ7IN5OoOGucgvChqxYXw3L3xKijXpOsqreY0YWe
-RquJ1iKvaPXQUYgN/EoVeyoLQRnWPIWbs+HhKpgk7nyG8GioCu5FV8nGhiFw5686
-6dOhBV4nDgfjruj+7WHkbibTnig5DrGnGX6xBuJ4rAiqK8RsFo2FdN2IrD3jq8+l
-s/0VQWJRHIP3j3Ed2XdMmPHrAQzKiYXEPlhXLRhfZrOXmP/d6iudqZ35IKQBIFIn
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5tdGhvbHlva2UuZWR1hihodHRwczov
-L2lkcC5tdGhvbHlva2UuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3cyqs
-mOkVuWW3TG37Pj91nh8QLTANBgkqhkiG9w0BAQUFAAOCAQEAPdlrDqY+t/4VRqp0
-7RrNLTj9hMv7uDSzYOVbdNTddeKHeICk099HdZOtFqOaRHweJThUf9R8UmJaVha8
-WCKKavsWd/UMwFjMRzbrQE7c0GxkzJ2dmqwRD7LS8flSy7MgnV8IUXGS2UCHC62P
-j4k1aL6a4WRJTbKFXDsygPui7Fq3lHu2Gak30seK80yKt0MiTA9YGPYYGjqfoG05
-cG0XRJrEP6HIdLq10N59R+sc38y3CkE0oIEQHRnXy4C6OJoM+JDou/86e/qJVbLg
-TimgEPq/+TG6lDTgqjFctblZ8vbJbJvYkAe+4fXrASxBJ7KPGRig7NtfV/Kcb34p
-cTHctQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mtholyoke.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mtholyoke.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mtholyoke.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mtholyoke.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mtholyoke.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mtholyoke.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAJLHPh0wvbbq2rKg/fYPlc/eTL6CMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC5tdGhvbHlva2UuZWR1MB4XDTExMDQwNjEzNDYz
-NFoXDTMxMDQwNjEzNDYzNFowHDEaMBgGA1UEAxMRaWRwLm10aG9seW9rZS5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCg6TefcVZH73MAVG3ga4dT
-/voaUrbI6ns4+sK0oUcq+0MA4ENv2vzvNQUQbGnxaui2aKyXfAE40M7iyVqmP9i1
-R4iv1V9/HciiGJE9vN99D6WexJ7IN5OoOGucgvChqxYXw3L3xKijXpOsqreY0YWe
-RquJ1iKvaPXQUYgN/EoVeyoLQRnWPIWbs+HhKpgk7nyG8GioCu5FV8nGhiFw5686
-6dOhBV4nDgfjruj+7WHkbibTnig5DrGnGX6xBuJ4rAiqK8RsFo2FdN2IrD3jq8+l
-s/0VQWJRHIP3j3Ed2XdMmPHrAQzKiYXEPlhXLRhfZrOXmP/d6iudqZ35IKQBIFIn
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC5tdGhvbHlva2UuZWR1hihodHRwczov
-L2lkcC5tdGhvbHlva2UuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3cyqs
-mOkVuWW3TG37Pj91nh8QLTANBgkqhkiG9w0BAQUFAAOCAQEAPdlrDqY+t/4VRqp0
-7RrNLTj9hMv7uDSzYOVbdNTddeKHeICk099HdZOtFqOaRHweJThUf9R8UmJaVha8
-WCKKavsWd/UMwFjMRzbrQE7c0GxkzJ2dmqwRD7LS8flSy7MgnV8IUXGS2UCHC62P
-j4k1aL6a4WRJTbKFXDsygPui7Fq3lHu2Gak30seK80yKt0MiTA9YGPYYGjqfoG05
-cG0XRJrEP6HIdLq10N59R+sc38y3CkE0oIEQHRnXy4C6OJoM+JDou/86e/qJVbLg
-TimgEPq/+TG6lDTgqjFctblZ8vbJbJvYkAe+4fXrASxBJ7KPGRig7NtfV/Kcb34p
-cTHctQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mtholyoke.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Mount Holyoke College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Mount Holyoke College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mtholyoke.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jeremy Maryott</md:GivenName>
-    <md:EmailAddress>jmaryott@mtholyoke.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ron Peterson</md:GivenName>
-    <md:EmailAddress>rpeterso@mtholyoke.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jeremy Maryott</md:GivenName>
-    <md:EmailAddress>jmaryott@mtholyoke.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.natcen.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.natcen.ac.uk-openathens.xml
deleted file mode 100644
index 02faddbd..00000000
--- a/swamid-interfederations-2.0/idp.natcen.ac.uk-openathens.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.natcen.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for the National Centre for Social Research.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">natcen.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/natcen.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/natcen.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Centre for Social Research</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.natcen.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nbi.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nbi.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 09f62658..00000000
--- a/swamid-interfederations-2.0/idp.nbi.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.nbi.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for NBI Partnership Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-16T17:37:34Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">nbi.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAP8HG8Tqa3oYPeErtZhxjc1ROFKaMA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMTDWlkcC5uYmkuYWMudWswHhcNMTMwNzA5MTY0MDUwWhcN
-						MzMwNzA5MTY0MDUwWjAYMRYwFAYDVQQDEw1pZHAubmJpLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHOt3m/M81BDIw0lEc0SUUyTASbRsYEw
-						Nd7h6F1zL/kdr5b8pZswPinFm5nVQQ5CI9MdtrTs5ACPjqdbqFUPAMrkLq9A4qsI
-						Y6eWkQwiR8t5plmfAxw+WvEkJ89gE9FZ6MSIXDlg1NxWzn9En47tl0T7Q3CeWNde
-						sjnQZN81AC0SLo/wcnxzE8dHftLIqPR1LLuAfuTc3w5GLZS/RZgDTrlhzrXFieho
-						A2WHWfdPa6+RrxHyfWeqXn8ZE04ILIZu78h/BfkKmzLfRqV3ED7nWUujnOSb20Vr
-						PiB0BaHb4iOglArkx4RsybZ/NyADpjNLXtjIWOllruxyznQqLGs3fwIDAQABo2Ew
-						XzA+BgNVHREENzA1gg1pZHAubmJpLmFjLnVrhiRodHRwczovL2lkcC5uYmkuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOpCrmGHgYRnUdKyrHB0VPmKFpbs
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAmcCqvZSGO2hUl5gxzXKaihOeHJCNe9KuC6Dnu
-						cj/ujX//256AnC4TBzrmUgl3RULQE8zs6XGvW9UXEk/3wcKuIJFAt/L2/tS2vhj3
-						x9Dpw3jtm7u2Npl1DUsy73PmlGcJDYepgyZdScl64KuZbfcqJeXEZsWiki2gNZc/
-						44CQn7q7xAfpvyxmW+4MJ+YKAXCauhtR9A0XaSqDek59GREsFR49ELza8bfgNbP6
-						p39TmmBquj3bNJibKeCeQIM3YEwP38H74axMyVSrKyLhAI3atsZdBvpwjJ2bwbMU
-						vJg9GInLqz3AeBmDXF1Kze/Tqpmcsegii41FP5UoBUSMNhZV
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nbi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nbi.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.nbi.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nbi.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.nbi.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nbi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nbi.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">nbi.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAP8HG8Tqa3oYPeErtZhxjc1ROFKaMA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMTDWlkcC5uYmkuYWMudWswHhcNMTMwNzA5MTY0MDUwWhcN
-						MzMwNzA5MTY0MDUwWjAYMRYwFAYDVQQDEw1pZHAubmJpLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApHOt3m/M81BDIw0lEc0SUUyTASbRsYEw
-						Nd7h6F1zL/kdr5b8pZswPinFm5nVQQ5CI9MdtrTs5ACPjqdbqFUPAMrkLq9A4qsI
-						Y6eWkQwiR8t5plmfAxw+WvEkJ89gE9FZ6MSIXDlg1NxWzn9En47tl0T7Q3CeWNde
-						sjnQZN81AC0SLo/wcnxzE8dHftLIqPR1LLuAfuTc3w5GLZS/RZgDTrlhzrXFieho
-						A2WHWfdPa6+RrxHyfWeqXn8ZE04ILIZu78h/BfkKmzLfRqV3ED7nWUujnOSb20Vr
-						PiB0BaHb4iOglArkx4RsybZ/NyADpjNLXtjIWOllruxyznQqLGs3fwIDAQABo2Ew
-						XzA+BgNVHREENzA1gg1pZHAubmJpLmFjLnVrhiRodHRwczovL2lkcC5uYmkuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOpCrmGHgYRnUdKyrHB0VPmKFpbs
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAmcCqvZSGO2hUl5gxzXKaihOeHJCNe9KuC6Dnu
-						cj/ujX//256AnC4TBzrmUgl3RULQE8zs6XGvW9UXEk/3wcKuIJFAt/L2/tS2vhj3
-						x9Dpw3jtm7u2Npl1DUsy73PmlGcJDYepgyZdScl64KuZbfcqJeXEZsWiki2gNZc/
-						44CQn7q7xAfpvyxmW+4MJ+YKAXCauhtR9A0XaSqDek59GREsFR49ELza8bfgNbP6
-						p39TmmBquj3bNJibKeCeQIM3YEwP38H74axMyVSrKyLhAI3atsZdBvpwjJ2bwbMU
-						vJg9GInLqz3AeBmDXF1Kze/Tqpmcsegii41FP5UoBUSMNhZV
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nbi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nbi.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">NBI Partnership Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Norwich Bioscience Institutes</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nbi.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Computing Helpdesk</GivenName>
-    <EmailAddress>mailto:computing.helpdesk@nbi.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mohamed</GivenName>
-    <SurName>Imran</SurName>
-    <EmailAddress>mailto:Mohamed.imran@nbi.ac.uk</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 c3cce0c1..00000000
--- a/swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,76 +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">
-      <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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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: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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-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>mailto:robert.duncan@ncirl.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Robert</md:GivenName>
-    <md:SurName>Duncan</md:SurName>
-    <md:EmailAddress>mailto:robert.duncan@ncirl.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Robert</md:GivenName>
-    <md:SurName>Duncan</md:SurName>
-    <md:EmailAddress>mailto:robert.duncan@ncirl.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ndevon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ndevon.ac.uk-shibboleth.xml
deleted file mode 100644
index 0d0a50ba..00000000
--- a/swamid-interfederations-2.0/idp.ndevon.ac.uk-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.ndevon.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Petroc College.
-		(The College notified its name change from 'North Devon College' on 1st October 2009.)
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">ndevon.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/ndevon.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/ndevon.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Petroc College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.petroc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ndsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ndsu.edu-idp-shibboleth.xml
deleted file mode 100644
index 4cd8770a..00000000
--- a/swamid-interfederations-2.0/idp.ndsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://idp.ndsu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://www.ndsu.edu/its/help_desk/" 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">ndsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">North Dakota State University Main Campus</mdui:DisplayName>
-        <mdui:Description xml:lang="en">North Dakota State University</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.ndsu.edu/eci/shibboleth/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.ndsu.edu/its/security/privacy_statement/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="64" width="350" xml:lang="en">https://www.ndsu.edu/shibboleth/logo.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>
-MIIDKTCCAhGgAwIBAgIJAJsvdlzoRM6CMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC5uZHN1LmVkdTAeFw0xMzA1MTMxOTMxMDVaFw0xODA1MTIxOTMxMDVa
-MBcxFTATBgNVBAMTDGlkcC5uZHN1LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMC7bcUABc9e/fkMLsftMozcIv4StDmtw2WJMkkRjyv1/neZCrQN
-2gwFzXlxwC89+xx+F9Tzj5AwmdHStJVIX3mH28ZXZiIlWkm0aBZ+Jfej71CaDXpn
-VT20rPjo/srBkGGC8k+KWlV+cXw6nXrNXNcxNrM7RK+IV73mbqdduc6mslbF8Sli
-2M+RJ/2SomDRUmCRzY4FMF2pK+0t8EbMH4DyDj/9LOmBXL5iLVZn+ooERjYzMEMY
-QBTpQDCv9MhLe6J6VG0nVk0hnFTl1IAXHPa2EaMVOQ+UOljF4vvgMlHsUGTL6O67
-wlWV7nePC0P9u4eCIE5bkjTUyqNdf9C3HX8CAwEAAaN4MHYwHQYDVR0OBBYEFEBA
-DtYWDs4yQxunFWo59NZgir71MEcGA1UdIwRAMD6AFEBADtYWDs4yQxunFWo59NZg
-ir71oRukGTAXMRUwEwYDVQQDEwxpZHAubmRzdS5lZHWCCQCbL3Zc6ETOgjAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA/mWK3R7KmAxzSAzmhYN/DCndC
-C81ew4MIO1O2hb0HaNL/AHu8HcDvzAaftLWLfaLXPMh9Rjz9uA2STFBBTM/oKUAl
-GFGz7NTnKDuGNMVmuvVsRJZazn358ut1Xfb5/71DsxwShes5EURRGcMS8k3HNMnI
-nPRxc/bMRjwLBPtRcj1xRshA23oVn6lIed1X7v9dw669D1wPokxISGfyhX/VW9Hz
-1T4qDbBdK5k9K5NyX1HtLsLHWVhZoAy1AL5rpS0l0MhLohRz7ID3aclZ8BcXe4+R
-dMYsTGki/jn1sU0tN+ygdpOluNqxubLuutgONSK4fPKLr86vj0B6rzCRo1VM
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ndsu.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ndsu.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ndsu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ndsu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ndsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ndsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKTCCAhGgAwIBAgIJAJsvdlzoRM6CMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC5uZHN1LmVkdTAeFw0xMzA1MTMxOTMxMDVaFw0xODA1MTIxOTMxMDVa
-MBcxFTATBgNVBAMTDGlkcC5uZHN1LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMC7bcUABc9e/fkMLsftMozcIv4StDmtw2WJMkkRjyv1/neZCrQN
-2gwFzXlxwC89+xx+F9Tzj5AwmdHStJVIX3mH28ZXZiIlWkm0aBZ+Jfej71CaDXpn
-VT20rPjo/srBkGGC8k+KWlV+cXw6nXrNXNcxNrM7RK+IV73mbqdduc6mslbF8Sli
-2M+RJ/2SomDRUmCRzY4FMF2pK+0t8EbMH4DyDj/9LOmBXL5iLVZn+ooERjYzMEMY
-QBTpQDCv9MhLe6J6VG0nVk0hnFTl1IAXHPa2EaMVOQ+UOljF4vvgMlHsUGTL6O67
-wlWV7nePC0P9u4eCIE5bkjTUyqNdf9C3HX8CAwEAAaN4MHYwHQYDVR0OBBYEFEBA
-DtYWDs4yQxunFWo59NZgir71MEcGA1UdIwRAMD6AFEBADtYWDs4yQxunFWo59NZg
-ir71oRukGTAXMRUwEwYDVQQDEwxpZHAubmRzdS5lZHWCCQCbL3Zc6ETOgjAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA/mWK3R7KmAxzSAzmhYN/DCndC
-C81ew4MIO1O2hb0HaNL/AHu8HcDvzAaftLWLfaLXPMh9Rjz9uA2STFBBTM/oKUAl
-GFGz7NTnKDuGNMVmuvVsRJZazn358ut1Xfb5/71DsxwShes5EURRGcMS8k3HNMnI
-nPRxc/bMRjwLBPtRcj1xRshA23oVn6lIed1X7v9dw669D1wPokxISGfyhX/VW9Hz
-1T4qDbBdK5k9K5NyX1HtLsLHWVhZoAy1AL5rpS0l0MhLohRz7ID3aclZ8BcXe4+R
-dMYsTGki/jn1sU0tN+ygdpOluNqxubLuutgONSK4fPKLr86vj0B6rzCRo1VM
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ndsu.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">North Dakota State University Main Campus</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">North Dakota State University Main Campus</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ndsu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NDSU Help Desk</md:GivenName>
-    <md:EmailAddress>ndsu.helpdesk@ndsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NDSU Help Desk</md:GivenName>
-    <md:EmailAddress>ndsu.helpdesk@ndsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ne-worcs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ne-worcs.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 079a2dc6..00000000
--- a/swamid-interfederations-2.0/idp.ne-worcs.ac.uk-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" entityID="https://idp.ne-worcs.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Heart of Worcestershire College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-13T12:19:41Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">ne-worcs.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDrDCCApQCCQCVGi7e0Pph5TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMREwDwYDVQQHDAhSZWRkaXRjaDEq
-						MCgGA1UECgwhTm9ydGggRWFzdCBXb3JjZXN0ZXJzaGlyZSBDb2xsZWdlMRMwEQYD
-						VQQLDApJVCBTdXBwb3J0MRswGQYDVQQDDBJpZHAubmUtd29yY3MuYWMudWswHhcN
-						MTMwMTI1MTAwMzQzWhcNMzMwMTIwMTAwMzQzWjCBlzELMAkGA1UEBhMCR0IxFzAV
-						BgNVBAgMDldvcmNlc3RlcnNoaXJlMREwDwYDVQQHDAhSZWRkaXRjaDEqMCgGA1UE
-						CgwhTm9ydGggRWFzdCBXb3JjZXN0ZXJzaGlyZSBDb2xsZWdlMRMwEQYDVQQLDApJ
-						VCBTdXBwb3J0MRswGQYDVQQDDBJpZHAubmUtd29yY3MuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCVcflAUC6XOzv8yhdkX9Zf83iZoUpiKVh
-						Pj0ATct/aPsWsLDQndOzo4sM0FXmrDChA0jvUGlJ5q0R/Sfl/qjNBNBnvvnXsmjj
-						fAzZcMCX7YfKfXgzF0uIdujjGkx1Y6fvD2azVXxf1fAa3IyhM0o+ObfIyErerhNU
-						vxJ4uP1dUrBxIry9qsNwMM51TEOtF6Atvcy1toGdC7dOYHk7+sB+WW8m2QWch2TT
-						4/Q3hNBjXBRQkyY/QIqJLMCGdi6B8bNF2RViiC7yJqqYCnzZQ4YUHMxIJqm3krX5
-						AkEKVXiFZ6TalR3BRyVOyylGQpz8X2Ykzog2E3Lz0erUEjbm7zJfAgMBAAEwDQYJ
-						KoZIhvcNAQEFBQADggEBAI94qHrZZvoCZdgGlQg6vl2A+GwvQuQ2ZIr+CWtq6DzS
-						4IDYqY8GPBBk1zuDx3StGeYfqO7s6jrgup0/gKJD7l4oV8Dq/VUHXdWt11+aMdlb
-						W185fYQw++jcYaEZyr2LzDqOHO7dgbgyrCypjiFtU279lrf+Uz0XDf3FFQm+wg9+
-						HXoRWAAYwZQaMOMADo/70fUHKEe7IH5u81m0Sh1REjX/erBmWoBNXrMBLNa+vhPT
-						uVHlFJixhZuiIvAi/QzgjZruWzKySCZGWSajHqHBdxcojzB4Oao82vsJu4S3Mv/W
-						tT1EKx/axaYI5jW/ThK191F3j5568qM0exHyrfCZbIw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ne-worcs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ne-worcs.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.ne-worcs.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ne-worcs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ne-worcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ne-worcs.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">ne-worcs.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDrDCCApQCCQCVGi7e0Pph5TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgMDldvcmNlc3RlcnNoaXJlMREwDwYDVQQHDAhSZWRkaXRjaDEq
-						MCgGA1UECgwhTm9ydGggRWFzdCBXb3JjZXN0ZXJzaGlyZSBDb2xsZWdlMRMwEQYD
-						VQQLDApJVCBTdXBwb3J0MRswGQYDVQQDDBJpZHAubmUtd29yY3MuYWMudWswHhcN
-						MTMwMTI1MTAwMzQzWhcNMzMwMTIwMTAwMzQzWjCBlzELMAkGA1UEBhMCR0IxFzAV
-						BgNVBAgMDldvcmNlc3RlcnNoaXJlMREwDwYDVQQHDAhSZWRkaXRjaDEqMCgGA1UE
-						CgwhTm9ydGggRWFzdCBXb3JjZXN0ZXJzaGlyZSBDb2xsZWdlMRMwEQYDVQQLDApJ
-						VCBTdXBwb3J0MRswGQYDVQQDDBJpZHAubmUtd29yY3MuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCVcflAUC6XOzv8yhdkX9Zf83iZoUpiKVh
-						Pj0ATct/aPsWsLDQndOzo4sM0FXmrDChA0jvUGlJ5q0R/Sfl/qjNBNBnvvnXsmjj
-						fAzZcMCX7YfKfXgzF0uIdujjGkx1Y6fvD2azVXxf1fAa3IyhM0o+ObfIyErerhNU
-						vxJ4uP1dUrBxIry9qsNwMM51TEOtF6Atvcy1toGdC7dOYHk7+sB+WW8m2QWch2TT
-						4/Q3hNBjXBRQkyY/QIqJLMCGdi6B8bNF2RViiC7yJqqYCnzZQ4YUHMxIJqm3krX5
-						AkEKVXiFZ6TalR3BRyVOyylGQpz8X2Ykzog2E3Lz0erUEjbm7zJfAgMBAAEwDQYJ
-						KoZIhvcNAQEFBQADggEBAI94qHrZZvoCZdgGlQg6vl2A+GwvQuQ2ZIr+CWtq6DzS
-						4IDYqY8GPBBk1zuDx3StGeYfqO7s6jrgup0/gKJD7l4oV8Dq/VUHXdWt11+aMdlb
-						W185fYQw++jcYaEZyr2LzDqOHO7dgbgyrCypjiFtU279lrf+Uz0XDf3FFQm+wg9+
-						HXoRWAAYwZQaMOMADo/70fUHKEe7IH5u81m0Sh1REjX/erBmWoBNXrMBLNa+vhPT
-						uVHlFJixhZuiIvAi/QzgjZruWzKySCZGWSajHqHBdxcojzB4Oao82vsJu4S3Mv/W
-						tT1EKx/axaYI5jW/ThK191F3j5568qM0exHyrfCZbIw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ne-worcs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ne-worcs.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">Heart of Worcestershire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">North East Worcestershire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ne-worcs.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Kings</SurName>
-    <EmailAddress>mailto:dkings@howcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Kings</SurName>
-    <EmailAddress>mailto:dkings@howcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nelson.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.nelson.ac.uk-openathens.xml
deleted file mode 100644
index 4efb2822..00000000
--- a/swamid-interfederations-2.0/idp.nelson.ac.uk-openathens.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.nelson.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Nelson and Colne College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">nelson.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nelson.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nelson.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nelson College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nelson.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</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.nescol.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nescol.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 95be6f6d..00000000
--- a/swamid-interfederations-2.0/idp.nescol.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nescol.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for North East Scotland College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-28T15:27:48Z">
-      <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 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">nescol.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abcol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAKEDzkStX1FCYI1ncdQf2sHeDpAgMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDIx
-						WhcNMzUxMDA3MDc0NDIxWjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvvRWSfVCncXhsWHo1pS9k0CN
-						G1uVARjMiMJWYKWZZMpQwAae2rTUmG8LehI9dLcSwyj0FypFAd1Rm65VMeNmSUnZ
-						vH42FBOu9zUB0wEeU3Gd+d0NIl0iGtMvFqEKyCNXs9BFwXU3c7xuxFYNP7HL2S0z
-						QXCmP/fKQ1dbrtqcoRH5/i5M1ARdRBDOBQNINjeNznpW5P821MgRoZsVomFoj0ns
-						4FWzP5MPIVz6UsYUVHUfsqc9R8+ZL7yVEaYmBNr8PncJPDBMTXScJsq+PbeRElb6
-						QGFNzD7tecIddocqtLP9i8TYtW3qQcvS0HYDdkUkAuXMauVz/+6laoUyyCh/7wID
-						AQABo2cwZTAdBgNVHQ4EFgQUZfGr2q28H23OzD5rr8a7im0zJWAwRAYDVR0RBD0w
-						O4IQaWRwLm5lc2NvbC5hYy51a4YnaHR0cHM6Ly9pZHAubmVzY29sLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCbjtSu5h4rRIO2CaVZZHhX
-						MSpA7ujPbk8SqRiEmdavqvAZuVe0amQIH0jDHKDrj6EL2Q5RiUtSPGtu3fBEH9KR
-						vJ+ty1Hy8A8TDx8o+RzIELwwSQAb/vEoB6lsMeaJPMwKX//hNt1EIA6YIBl5L6Fp
-						5WVVHY3RnaL8TmC6OKukeQTacexRe/P/knf89A6yro3RHujkkA85B5xznRQAaGME
-						npzDfkAZg6ZDHz2b/XDpz3p07Eb7th/Uxhyhtg9YDBJji3g0ozzEC8xTVGPiXyyV
-						90sld2GFXRpujyBGKqq8A2kcuZzp/svH+PaKhkbV6fhL6RIlRemx6dEMA31Ct813
-					</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>
-						MIIDLDCCAhSgAwIBAgIVAIMqlry3pKY0TO9+Ll0+SdKXHYjFMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDE4
-						WhcNMzUxMDA3MDc0NDE4WjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiQOliKKmqz3QoabzR3UdhP5B
-						qq1u4lL6Zy5jpL3UvQ4lT64cZVXO3RhWo0gqa7mynzHJ7Kf11iTHI/7QT6d9iY8I
-						8HSrM1QszFgH+TlkKdNd7Dw5EHZeyY9+TgxmBX2a6A6s8wC7diyttKui/XpeM21t
-						tvzYboR5iU7IAkDq9u83ChSCDfAgzmHKWjrAEko9ZRQ6EUafDUQcaae/tLIZJKVY
-						wsbfECBMznnK0WkxaHZN663Si8EnV7/vlshpQbfFBnQr3HCVDYoh/jT2QSoOImAR
-						Na3Ixk86lQLjukmYe3XIgzb7CA4+6cVmN2SkUA6QCP0cYeFyxd26Zvi8nQsBjQID
-						AQABo2cwZTAdBgNVHQ4EFgQUl5vAQkdSv1GDlG0FhFkgPrUVPf8wRAYDVR0RBD0w
-						O4IQaWRwLm5lc2NvbC5hYy51a4YnaHR0cHM6Ly9pZHAubmVzY29sLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA4ozGUVO6h6JaeJ3JrzGmp
-						38fxbmvDXSasLHoEhVb5JkKOdKTBJpq49YyxmdFtYZSAqBDoC5izY/IsImCzbiKo
-						+yGdOfxR0pKMkvNKaA+JA0bB9OipPGoxrDxz3IUR8OG916ybd/yWmdKBQlQ2tIob
-						rEwBCTD1figB3ZUnUTG05zMn6GR5qDtGcw6JgRiBxEwU/U8D7ttAIaLYD5RsyoQF
-						LLZOOH1RKpXXNoRp521Lei3Mr/EYMwe3pucZu4IC4uERtbVUz/L3XmSzYcCMhCM3
-						ruIQQmwfNLTUYaaqf0RFqHo7tm1BBqeuNuw8t+lGEwI+DQkO6CTrfmct9MzHWs0V
-					</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>
-						MIIDLDCCAhSgAwIBAgIVAPQaMyaBdI++UopEGmsCDtG4CXdlMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDE5
-						WhcNMzUxMDA3MDc0NDE5WjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfvPYUl5SsgvF204YhwitXfS
-						0Lbc+BsJvq/BV/PJIvPkdyr5o3ctVFOm7NGGG0SH3W92rirMrxXdHSRlP+OJkK2G
-						MaygZoz/Fi/RbHlhNRYJXsDTODhKcj9i72LUTLoJZ6cZ0rUvVaGrJjtyKj3YQ+EP
-						tNx5h80WG5txTlWxxBDOVtgJovnOd7ycMU9+Y5QdPqAscXYE13GcyrrR55ihQZou
-						i8+Q7kOr7AJ+64PGzCs1Dl+wNxrzfk4Y5huNqFV6IZndY/xrsD+hXv5RlacEHhNU
-						lT4AmPqKiHyC0TmaT2khfMxUxrdVol1aEEhku8o5eNHY3PNub3MrTPjgJOqFDwID
-						AQABo2cwZTAdBgNVHQ4EFgQUb6hWpMHLzhNa1MWB0vB9AQ7XqMcwRAYDVR0RBD0w
-						O4IQaWRwLm5lc2NvbC5hYy51a4YnaHR0cHM6Ly9pZHAubmVzY29sLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBDecwbJizYy+q9KsC34EK4
-						6H4bcF0ViqYgSI0+PtRZX8awqy1vTaMDJ8UDWu6IfMuA9bx//OORKJqgGYwUaz2X
-						wBLUWJqWfLxmrt233xLsEj/Bwo84jItiXQG5s/bFaDDrI89HgDO69kdbkivLTrIs
-						9B/FSaktbAznrzxFiTxY/VZXEUFiWmjYGrmeXspFU/x7tr9cNl0lXA9S21BfWfC9
-						IDGil+m69K3wBXk7WnA+yAi66E2MWUwOi4qWBCtMq1icN++lpLHZoAa743qkRUly
-						zsjInuoJhw2oC82Qyj8cZIqtSa78iFkJEnih68qBekU4B54y2PvqtkvVZonmTskY
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nescol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nescol.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.nescol.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nescol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nescol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nescol.ac.uk/idp/profile/SAML2/Redirect/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">nescol.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abcol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAKEDzkStX1FCYI1ncdQf2sHeDpAgMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDIx
-						WhcNMzUxMDA3MDc0NDIxWjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvvRWSfVCncXhsWHo1pS9k0CN
-						G1uVARjMiMJWYKWZZMpQwAae2rTUmG8LehI9dLcSwyj0FypFAd1Rm65VMeNmSUnZ
-						vH42FBOu9zUB0wEeU3Gd+d0NIl0iGtMvFqEKyCNXs9BFwXU3c7xuxFYNP7HL2S0z
-						QXCmP/fKQ1dbrtqcoRH5/i5M1ARdRBDOBQNINjeNznpW5P821MgRoZsVomFoj0ns
-						4FWzP5MPIVz6UsYUVHUfsqc9R8+ZL7yVEaYmBNr8PncJPDBMTXScJsq+PbeRElb6
-						QGFNzD7tecIddocqtLP9i8TYtW3qQcvS0HYDdkUkAuXMauVz/+6laoUyyCh/7wID
-						AQABo2cwZTAdBgNVHQ4EFgQUZfGr2q28H23OzD5rr8a7im0zJWAwRAYDVR0RBD0w
-						O4IQaWRwLm5lc2NvbC5hYy51a4YnaHR0cHM6Ly9pZHAubmVzY29sLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCbjtSu5h4rRIO2CaVZZHhX
-						MSpA7ujPbk8SqRiEmdavqvAZuVe0amQIH0jDHKDrj6EL2Q5RiUtSPGtu3fBEH9KR
-						vJ+ty1Hy8A8TDx8o+RzIELwwSQAb/vEoB6lsMeaJPMwKX//hNt1EIA6YIBl5L6Fp
-						5WVVHY3RnaL8TmC6OKukeQTacexRe/P/knf89A6yro3RHujkkA85B5xznRQAaGME
-						npzDfkAZg6ZDHz2b/XDpz3p07Eb7th/Uxhyhtg9YDBJji3g0ozzEC8xTVGPiXyyV
-						90sld2GFXRpujyBGKqq8A2kcuZzp/svH+PaKhkbV6fhL6RIlRemx6dEMA31Ct813
-					</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>
-						MIIDLDCCAhSgAwIBAgIVAIMqlry3pKY0TO9+Ll0+SdKXHYjFMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDE4
-						WhcNMzUxMDA3MDc0NDE4WjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiQOliKKmqz3QoabzR3UdhP5B
-						qq1u4lL6Zy5jpL3UvQ4lT64cZVXO3RhWo0gqa7mynzHJ7Kf11iTHI/7QT6d9iY8I
-						8HSrM1QszFgH+TlkKdNd7Dw5EHZeyY9+TgxmBX2a6A6s8wC7diyttKui/XpeM21t
-						tvzYboR5iU7IAkDq9u83ChSCDfAgzmHKWjrAEko9ZRQ6EUafDUQcaae/tLIZJKVY
-						wsbfECBMznnK0WkxaHZN663Si8EnV7/vlshpQbfFBnQr3HCVDYoh/jT2QSoOImAR
-						Na3Ixk86lQLjukmYe3XIgzb7CA4+6cVmN2SkUA6QCP0cYeFyxd26Zvi8nQsBjQID
-						AQABo2cwZTAdBgNVHQ4EFgQUl5vAQkdSv1GDlG0FhFkgPrUVPf8wRAYDVR0RBD0w
-						O4IQaWRwLm5lc2NvbC5hYy51a4YnaHR0cHM6Ly9pZHAubmVzY29sLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA4ozGUVO6h6JaeJ3JrzGmp
-						38fxbmvDXSasLHoEhVb5JkKOdKTBJpq49YyxmdFtYZSAqBDoC5izY/IsImCzbiKo
-						+yGdOfxR0pKMkvNKaA+JA0bB9OipPGoxrDxz3IUR8OG916ybd/yWmdKBQlQ2tIob
-						rEwBCTD1figB3ZUnUTG05zMn6GR5qDtGcw6JgRiBxEwU/U8D7ttAIaLYD5RsyoQF
-						LLZOOH1RKpXXNoRp521Lei3Mr/EYMwe3pucZu4IC4uERtbVUz/L3XmSzYcCMhCM3
-						ruIQQmwfNLTUYaaqf0RFqHo7tm1BBqeuNuw8t+lGEwI+DQkO6CTrfmct9MzHWs0V
-					</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>
-						MIIDLDCCAhSgAwIBAgIVAPQaMyaBdI++UopEGmsCDtG4CXdlMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC5uZXNjb2wuYWMudWswHhcNMTUxMDA3MDc0NDE5
-						WhcNMzUxMDA3MDc0NDE5WjAbMRkwFwYDVQQDDBBpZHAubmVzY29sLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfvPYUl5SsgvF204YhwitXfS
-						0Lbc+BsJvq/BV/PJIvPkdyr5o3ctVFOm7NGGG0SH3W92rirMrxXdHSRlP+OJkK2G
-						MaygZoz/Fi/RbHlhNRYJXsDTODhKcj9i72LUTLoJZ6cZ0rUvVaGrJjtyKj3YQ+EP
-						tNx5h80WG5txTlWxxBDOVtgJovnOd7ycMU9+Y5QdPqAscXYE13GcyrrR55ihQZou
-						i8+Q7kOr7AJ+64PGzCs1Dl+wNxrzfk4Y5huNqFV6IZndY/xrsD+hXv5RlacEHhNU
-						lT4AmPqKiHyC0TmaT2khfMxUxrdVol1aEEhku8o5eNHY3PNub3MrTPjgJOqFDwID
-						AQABo2cwZTAdBgNVHQ4EFgQUb6hWpMHLzhNa1MWB0vB9AQ7XqMcwRAYDVR0RBD0w
-						O4IQaWRwLm5lc2NvbC5hYy51a4YnaHR0cHM6Ly9pZHAubmVzY29sLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBDecwbJizYy+q9KsC34EK4
-						6H4bcF0ViqYgSI0+PtRZX8awqy1vTaMDJ8UDWu6IfMuA9bx//OORKJqgGYwUaz2X
-						wBLUWJqWfLxmrt233xLsEj/Bwo84jItiXQG5s/bFaDDrI89HgDO69kdbkivLTrIs
-						9B/FSaktbAznrzxFiTxY/VZXEUFiWmjYGrmeXspFU/x7tr9cNl0lXA9S21BfWfC9
-						IDGil+m69K3wBXk7WnA+yAi66E2MWUwOi4qWBCtMq1icN++lpLHZoAa743qkRUly
-						zsjInuoJhw2oC82Qyj8cZIqtSa78iFkJEnih68qBekU4B54y2PvqtkvVZonmTskY
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nescol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">North East Scotland College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">North East Scotland College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nescol.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Sherrit</SurName>
-    <EmailAddress>mailto:m.sherrit@nescol.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Sherrit</SurName>
-    <EmailAddress>mailto:m.sherrit@nescol.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nescot.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nescot.ac.uk-shibboleth.xml
deleted file mode 100644
index 3baf4943..00000000
--- a/swamid-interfederations-2.0/idp.nescot.ac.uk-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.nescot.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for North East Surrey College of Technology.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">nescot.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nescot.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nescot.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NESCOT (North East Surrey College of Technology)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nescot.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.newbold.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.newbold.ac.uk-shibboleth.xml
deleted file mode 100644
index a372b1b6..00000000
--- a/swamid-interfederations-2.0/idp.newbold.ac.uk-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.newbold.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Newbold College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">newbold.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/newbold.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/newbold.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newbold College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.newbold.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml b/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.xml
deleted file mode 100644
index f1acb4d5..00000000
--- a/swamid-interfederations-2.0/idp.newcollege.ac.uk-athensla.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.newcollege.ac.uk/athensla">
-  <!--
-		This is an OpenAthens LA IdP for New College Swindon.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-17T09:21:34Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">newcollege.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">New College Swindon LA</mdui:DisplayName>
-        <mdui:Logo height="523" width="258">https://www.newcollege.ac.uk/athens/logo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkigAwIBAgIIDMoTE+e8SLkwDQYJKoZIhvcNAQEFBQAwRzEcMBoGA1UE
-						CgwTTmV3IENvbGxlZ2UgU3dpbmRvbjEnMCUGA1UEAwweYXRoZW5zcnVudGltZS5u
-						ZXdjb2xsZWdlLmFjLnVrMB4XDTE0MDkwOTEzMjk0N1oXDTI0MDkwOTEzMjk0N1ow
-						RzEcMBoGA1UECgwTTmV3IENvbGxlZ2UgU3dpbmRvbjEnMCUGA1UEAwweYXRoZW5z
-						cnVudGltZS5uZXdjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEA0Ez45eYCSrflOrisYZeEFa67TskdS51M4kAIuscDLu7Kff9H6dBO
-						yYKPBDsYitiyI1z5fY7+cYt4kb+77ke/2AU+JnT3RUePm/9G3xzGFY5Fu4KTXnXj
-						6Bui5zXSna35ry4eLagL0buNRpx/saSyg6+8MFdRBqVb668XYq19xxngRI6DlN2n
-						nM9NiA5AV+NGIsC7/RC0tYXQ2G3VJePi65Iejan+77leUeTp1hufJD5OwfudoXFc
-						58/hdz4PFHC3NUd8UMhL1WyibbvYwhfBta5V6H/Im0BL0e1qQJjdb/vg3P7w0SOI
-						H2qsAPzqa3DZPCTPf4uLorZ87t73q9J+XQIDAQABo1AwTjAdBgNVHQ4EFgQU0HGl
-						6yLJboYAwDMCD8QfzF5odXcwHwYDVR0jBBgwFoAU0HGl6yLJboYAwDMCD8QfzF5o
-						dXcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAoXzQtdDC4MIhfHWZ
-						dydDbdxXdTus14w6betasZ1XdOEAXK+L+yAJ0FWjNsvXAZCKqkOZoQDpfCpTaIkV
-						EQtzHeHO8/xHkobTHrNeuJnPTBbIl5ZWMedaoY5bu2n4+MWW5G08sSfxpZzcTeNw
-						dQJl1Q+eHlcn1zFsZglZvyYF7crg1n0OVH6Ws+yJs772BrNopFqmaMpdPeLpd8Pk
-						eOFLI4LOL8mVNH2lDvt2LYxkOhW2U9XpGc3j2u8kbHEVPXVVrSaaNtwzeSa3W4sY
-						73sUhZUXRR7JmqIZsXmX80WflC+LakBe+LKGsAqzCHcYBP1dFImF5M0fDOFSOqYN
-						/0f/XA==
-					</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>
-						MIIDYDCCAkigAwIBAgIIDMoTE+e8SLkwDQYJKoZIhvcNAQEFBQAwRzEcMBoGA1UE
-						CgwTTmV3IENvbGxlZ2UgU3dpbmRvbjEnMCUGA1UEAwweYXRoZW5zcnVudGltZS5u
-						ZXdjb2xsZWdlLmFjLnVrMB4XDTE0MDkwOTEzMjk0N1oXDTI0MDkwOTEzMjk0N1ow
-						RzEcMBoGA1UECgwTTmV3IENvbGxlZ2UgU3dpbmRvbjEnMCUGA1UEAwweYXRoZW5z
-						cnVudGltZS5uZXdjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEA0Ez45eYCSrflOrisYZeEFa67TskdS51M4kAIuscDLu7Kff9H6dBO
-						yYKPBDsYitiyI1z5fY7+cYt4kb+77ke/2AU+JnT3RUePm/9G3xzGFY5Fu4KTXnXj
-						6Bui5zXSna35ry4eLagL0buNRpx/saSyg6+8MFdRBqVb668XYq19xxngRI6DlN2n
-						nM9NiA5AV+NGIsC7/RC0tYXQ2G3VJePi65Iejan+77leUeTp1hufJD5OwfudoXFc
-						58/hdz4PFHC3NUd8UMhL1WyibbvYwhfBta5V6H/Im0BL0e1qQJjdb/vg3P7w0SOI
-						H2qsAPzqa3DZPCTPf4uLorZ87t73q9J+XQIDAQABo1AwTjAdBgNVHQ4EFgQU0HGl
-						6yLJboYAwDMCD8QfzF5odXcwHwYDVR0jBBgwFoAU0HGl6yLJboYAwDMCD8QfzF5o
-						dXcwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAoXzQtdDC4MIhfHWZ
-						dydDbdxXdTus14w6betasZ1XdOEAXK+L+yAJ0FWjNsvXAZCKqkOZoQDpfCpTaIkV
-						EQtzHeHO8/xHkobTHrNeuJnPTBbIl5ZWMedaoY5bu2n4+MWW5G08sSfxpZzcTeNw
-						dQJl1Q+eHlcn1zFsZglZvyYF7crg1n0OVH6Ws+yJs772BrNopFqmaMpdPeLpd8Pk
-						eOFLI4LOL8mVNH2lDvt2LYxkOhW2U9XpGc3j2u8kbHEVPXVVrSaaNtwzeSa3W4sY
-						73sUhZUXRR7JmqIZsXmX80WflC+LakBe+LKGsAqzCHcYBP1dFImF5M0fDOFSOqYN
-						/0f/XA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://athensruntime.newcollege.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://athensruntime.newcollege.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">New College Swindon</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">New College Swindon LA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.newcollege.ac.uk/athens/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Turpin</SurName>
-    <EmailAddress>mailto:richard.turpin@newcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Hole</SurName>
-    <EmailAddress>mailto:Ian.hole@newcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.newdur.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.newdur.ac.uk-shibboleth.xml
deleted file mode 100644
index ad2e4f3a..00000000
--- a/swamid-interfederations-2.0/idp.newdur.ac.uk-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.newdur.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for New College, Durham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">newdur.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/newdur.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/newdur.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">New College Durham</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.newdur.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.newvic.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 9b0b69f9..00000000
--- a/swamid-interfederations-2.0/idp.newvic.ac.uk-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://idp.newvic.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Newham Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-01T11:40:17Z">
-      <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">newvic.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIUc68eei2OkuHHobEIjasrgMJSBp4wDQYJKoZIhvcNAQEF
-						BQAwGzEZMBcGA1UEAxMQaWRwLm5ld3ZpYy5hYy51azAeFw0xNDAzMDcwOTMyMTJa
-						Fw0zNDAzMDcwOTMyMTJaMBsxGTAXBgNVBAMTEGlkcC5uZXd2aWMuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIgYP2Zg400N4Z1zX9txCaEtQt
-						+42Tc6dKndjl44UctLUg1UNNRMkoEAY+6HqwdE3DgVqd0YMN1wVBkv8EYCqz/TAU
-						WqSIfAEjZDeMJalVoKu1pfdW7mB3aciH8rddMQ1LYQHmEPeNrzC2MjJEJgQ9hOXD
-						ow+hyE+cWhlr4kjJB4gYhfGCiAMkVCi5h6MJvDVARDz/eX75J5yBOsBXYAnEeyG1
-						WArxEwPgfGf0dv0IJxI/gacJg2aeltyhPoTsi074C4L4w2e0S6DGpSDPr2wQO0T2
-						GKrrBfplb/f2z3NqA0FQixn9U9igN59TB3SVcWHmVCGvXJ8MAfMBIKe3K6f7AgMB
-						AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5uZXd2aWMuYWMudWuGJ2h0dHBzOi8vaWRw
-						Lm5ld3ZpYy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVc2r4NVHJPsT
-						HhMYmvd+VlvxnwcwDQYJKoZIhvcNAQEFBQADggEBAAv+49iJGalruBtUdV2g6lFY
-						XpZcFIAAbS5AmBigEalNZJqp1BiWNHitdq+6G0JJzSzMlLlsvRjWRP59E2veuqm6
-						CJchy6WsFPg4aGT77Q28WEbVFSOABF7TLHYeqTBuLUACKlpIdkM/pQxPyPlUg1IV
-						iIeWjqCxVj9glgmPHDpK9gkKXyOhd1b8NhxeBJ/xVId3OosQCIPh++Nc00LRpHqu
-						gqBLVoEVcJJVnarmoxxabzVBfVeG9/x3PbjE0rlJ64l4kp1VM8RKGW1C3RI8bxNN
-						vIEuNvfpiGOHrzJP801TYK1JLfAGxuEqpRictkktztc/gU5mjgoPsMRm6V6r0Zk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.newvic.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.newvic.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.newvic.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.newvic.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.newvic.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.newvic.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.newvic.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">newvic.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIUc68eei2OkuHHobEIjasrgMJSBp4wDQYJKoZIhvcNAQEF
-						BQAwGzEZMBcGA1UEAxMQaWRwLm5ld3ZpYy5hYy51azAeFw0xNDAzMDcwOTMyMTJa
-						Fw0zNDAzMDcwOTMyMTJaMBsxGTAXBgNVBAMTEGlkcC5uZXd2aWMuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCIgYP2Zg400N4Z1zX9txCaEtQt
-						+42Tc6dKndjl44UctLUg1UNNRMkoEAY+6HqwdE3DgVqd0YMN1wVBkv8EYCqz/TAU
-						WqSIfAEjZDeMJalVoKu1pfdW7mB3aciH8rddMQ1LYQHmEPeNrzC2MjJEJgQ9hOXD
-						ow+hyE+cWhlr4kjJB4gYhfGCiAMkVCi5h6MJvDVARDz/eX75J5yBOsBXYAnEeyG1
-						WArxEwPgfGf0dv0IJxI/gacJg2aeltyhPoTsi074C4L4w2e0S6DGpSDPr2wQO0T2
-						GKrrBfplb/f2z3NqA0FQixn9U9igN59TB3SVcWHmVCGvXJ8MAfMBIKe3K6f7AgMB
-						AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC5uZXd2aWMuYWMudWuGJ2h0dHBzOi8vaWRw
-						Lm5ld3ZpYy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVc2r4NVHJPsT
-						HhMYmvd+VlvxnwcwDQYJKoZIhvcNAQEFBQADggEBAAv+49iJGalruBtUdV2g6lFY
-						XpZcFIAAbS5AmBigEalNZJqp1BiWNHitdq+6G0JJzSzMlLlsvRjWRP59E2veuqm6
-						CJchy6WsFPg4aGT77Q28WEbVFSOABF7TLHYeqTBuLUACKlpIdkM/pQxPyPlUg1IV
-						iIeWjqCxVj9glgmPHDpK9gkKXyOhd1b8NhxeBJ/xVId3OosQCIPh++Nc00LRpHqu
-						gqBLVoEVcJJVnarmoxxabzVBfVeG9/x3PbjE0rlJ64l4kp1VM8RKGW1C3RI8bxNN
-						vIEuNvfpiGOHrzJP801TYK1JLfAGxuEqpRictkktztc/gU5mjgoPsMRm6V6r0Zk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.newvic.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.newvic.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">Newham Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newham Sixth Form College (Shibboleth)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.newvic.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Overt Software Support</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Akik</GivenName>
-    <SurName>Miah</SurName>
-    <EmailAddress>mailto:amiah@newvic.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nhc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nhc.ac.uk-shibboleth.xml
deleted file mode 100644
index 28aa70bb..00000000
--- a/swamid-interfederations-2.0/idp.nhc.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://idp.nhc.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for North Hertfordshire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-28T16:56:47Z">
-      <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">nhc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUNuc5nh8nE6/6dgrZJmkSDgYUjPowDQYJKoZIhvcNAQEF
-						BQAwGDEWMBQGA1UEAxMNaWRwLm5oYy5hYy51azAeFw0xMzA5MTcxNDAyNTdaFw0z
-						MzA5MTcxNDAyNTdaMBgxFjAUBgNVBAMTDWlkcC5uaGMuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVAxTlV/bVEVPw+4l3mVPRI/D9qbra1yQ7
-						3vPIJ7Zhn4l4YLRoJsFbRWdEGVfvy1Ie2NutU45AgAnHDmzW2fCKoIaS5KqkJjD7
-						fQHwBxDTrqweQhkrddZ5HuXj/DHlY23q+1/tw1k19fZTuEo6VWZu8orWdo7IOWtk
-						QvCRACAXQcDTKRA5Uhnub8Z08QmdeBlac1wQ6ALcpFHmWA7vqouUGgYnjJNU+Soi
-						XxiUDv7FipkmPWeQpJlHv/5fVkp/PW+bv48cL6DkTis486/8thdIJETySvTEu/oA
-						/MlCKfOnvWm/nJk52Uq7Qot/s4hSGL5mQZTaL52x85HFuh4JgahlAgMBAAGjYTBf
-						MD4GA1UdEQQ3MDWCDWlkcC5uaGMuYWMudWuGJGh0dHBzOi8vaWRwLm5oYy5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdnHc1Y7HF5N9zJhFS1ifKZuSrmcw
-						DQYJKoZIhvcNAQEFBQADggEBAL4RnY4z2aISPmdAiYOXurpzJZvZ3HAJS6UxNyuG
-						ZlAg5CtUM4dLpHjN8ajx9oYpMxK9uG47I/NFKvjxdGScWyTEYR6Myp2eGuz404Un
-						+SMjYxnJ2MQg4TfkX+WdMTp65Zw+6d3hKdcaAgBjske+3C4Shj6rzohXMXav6TMo
-						6kCN7IEhkpk5OQy3iMAhfNy+2rDpnJEHrUrdAIV74V55k60UX3Pg2M72Pexh1FVp
-						qnhkB5Cb3ZOmXacyhKtdqxwdetV/CeBsAgKkgQhpcfOGMVgrDev1TloiTpBhztJ8
-						KUOIvFZJgKFEIOZLmPagprpvbjZAHnZMQCyERkglvdkQ2Z0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nhc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nhc.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.nhc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nhc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nhc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nhc.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">nhc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUNuc5nh8nE6/6dgrZJmkSDgYUjPowDQYJKoZIhvcNAQEF
-						BQAwGDEWMBQGA1UEAxMNaWRwLm5oYy5hYy51azAeFw0xMzA5MTcxNDAyNTdaFw0z
-						MzA5MTcxNDAyNTdaMBgxFjAUBgNVBAMTDWlkcC5uaGMuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVAxTlV/bVEVPw+4l3mVPRI/D9qbra1yQ7
-						3vPIJ7Zhn4l4YLRoJsFbRWdEGVfvy1Ie2NutU45AgAnHDmzW2fCKoIaS5KqkJjD7
-						fQHwBxDTrqweQhkrddZ5HuXj/DHlY23q+1/tw1k19fZTuEo6VWZu8orWdo7IOWtk
-						QvCRACAXQcDTKRA5Uhnub8Z08QmdeBlac1wQ6ALcpFHmWA7vqouUGgYnjJNU+Soi
-						XxiUDv7FipkmPWeQpJlHv/5fVkp/PW+bv48cL6DkTis486/8thdIJETySvTEu/oA
-						/MlCKfOnvWm/nJk52Uq7Qot/s4hSGL5mQZTaL52x85HFuh4JgahlAgMBAAGjYTBf
-						MD4GA1UdEQQ3MDWCDWlkcC5uaGMuYWMudWuGJGh0dHBzOi8vaWRwLm5oYy5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdnHc1Y7HF5N9zJhFS1ifKZuSrmcw
-						DQYJKoZIhvcNAQEFBQADggEBAL4RnY4z2aISPmdAiYOXurpzJZvZ3HAJS6UxNyuG
-						ZlAg5CtUM4dLpHjN8ajx9oYpMxK9uG47I/NFKvjxdGScWyTEYR6Myp2eGuz404Un
-						+SMjYxnJ2MQg4TfkX+WdMTp65Zw+6d3hKdcaAgBjske+3C4Shj6rzohXMXav6TMo
-						6kCN7IEhkpk5OQy3iMAhfNy+2rDpnJEHrUrdAIV74V55k60UX3Pg2M72Pexh1FVp
-						qnhkB5Cb3ZOmXacyhKtdqxwdetV/CeBsAgKkgQhpcfOGMVgrDev1TloiTpBhztJ8
-						KUOIvFZJgKFEIOZLmPagprpvbjZAHnZMQCyERkglvdkQ2Z0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nhc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nhc.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">North Hertfordshire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">North Hertfordshire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nhc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Haley</SurName>
-    <EmailAddress>mailto:mhaley@nhc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Haley</SurName>
-    <EmailAddress>mailto:mhaley@nhc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nhl.nl-.xml b/swamid-interfederations-2.0/idp.nhl.nl-.xml
deleted file mode 100644
index adc5d2ef..00000000
--- a/swamid-interfederations-2.0/idp.nhl.nl-.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nhl.nl/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-01T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">NHL Hogeschool</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NHL Hogeschool</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">NHL Hogeschool</mdui:Description>
-        <mdui:Description xml:lang="en">NHL Hogeschool</mdui:Description>
-        <mdui:Logo height="47" width="68">https://static.surfconext.nl/logos/idp/nhl.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">NHL Hogeschool University Leeuwarden HBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">NHL Hogeschool University Leeuwarden HBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/956bebc4302f328ea5722d84005d17ef"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NHL Hogeschool</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">NHL Hogeschool</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nhl.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/idp.niesr.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.niesr.ac.uk-shibboleth.xml
deleted file mode 100644
index 8b00d049..00000000
--- a/swamid-interfederations-2.0/idp.niesr.ac.uk-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.niesr.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for the National Institute of Economic and Social Research.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">niesr.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/niesr.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/niesr.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Institute of Economic &amp; Social Research</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.niesr.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.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 f6c4159b..00000000
--- a/swamid-interfederations-2.0/idp.niif.hu-shibboleth.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://idp.niif.hu/shibboleth">
-  <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="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:nren</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>niifi</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-test</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>href-idps</saml:AttributeValue>
-        <saml:AttributeValue>hexaa</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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">
-        <mdui:DisplayName xml:lang="hu">NIIF Intézet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NIIF Institute</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</mdui:Description>
-        <mdui:Description xml:lang="en">NIIF Institute - National Information Infrastructure Development</mdui:Description>
-        <mdui:Logo height="86" width="150">https://idp.niif.hu/niifi.png</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niif.hu</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niif.hu/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.niif.hu/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>NIIF AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NIIF AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>NIIF AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 51d2f9ab..00000000
--- a/swamid-interfederations-2.0/idp.niif.hu.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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-edugain</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">hexxa</ns9:MetadataSet>
-    <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: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>MIIDFzCCAf+gAwIBAgIURk5Mvu+xPoln7suz9TRey3n9W6owDQYJKoZIhvcNAQEFBQAwFjEUMBIGA1UEAxMLaWRwLm5paWYuaHUwHhcNMDkwMzE5MTUxNDI5WhcNMjkwMzE5MTUxNDI5WjAWMRQwEgYDVQQDEwtpZHAubmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtb3M1DxuXOF4V9t7rnssnmBOw3TPKE1sbN7bnHZTdutfi/CNpxKHMY8Jz7wpPyXs3Q02mZWWADlp+WaCh1Kg+4UuLFObv3IWm9F2XXrMiFCRATmiB2mkkG07bpe7fNhHT3uBq7UqyhIAPcjynELzVyaawAIUfLSjNaeQGpm6hNCNsj+WeIAzAccH+Rau6N4DUefAmKVSoxwo0WpCJdgu95ApvvpWY1vf7WHxqG4pSjUM0oE0yfg3k3bkj5i2M+NMGZPPPeTf1cVliKD37nGk8QGCubV2VI+NlSnye45nB6irGdkHfIQGzDmfYCQ1gS1hagOryjrq6jJWcXJzIugpsCAwEAAaNdMFswOgYDVR0RBDMwMYILaWRwLm5paWYuaHWGImh0dHBzOi8vaWRwLm5paWYuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLi4+VWomShT2Y6eVzoLuWkkiHYlMA0GCSqGSIb3DQEBBQUAA4IBAQBdZ8ofazFei8yMDzIIrMvdU2szDo538cU8a3hFhDcHC6k30KO0WoTWdwMWGQ70CY5/Kz0PW60esi3WssVG4+uf3km/yemMwaQAvJ1uhRIsH+W4ByQ/c6SLFHb14MFeyONLVB4hFcM5yYlIiCVDfHJTJ5NerOVhDDxh70a1/VdN7jzS/PanEkeLgFsbQp+tQ3UiW2ukCS7FVRFFRwtAyDrjDB0waz+mdLb9JMxbfbSsnHsRM8PwUXAYAhNJP8I1LCTQRUsOXIX2Bu7LDhfPuDfW1uUoD5loXewQUetfYt/L3trt6OplJHdYXd7nL5zWzRdAFzMB7KYuaKgFLjgfQZH/</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.niu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.niu.edu-idp-shibboleth.xml
deleted file mode 100644
index 3d29132a..00000000
--- a/swamid-interfederations-2.0/idp.niu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://idp.niu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</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">niu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Northern Illinois University</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>
-MIIDFzCCAf+gAwIBAgIUKnaPgEQSbfYJd3gH9ZzjBNXVpDwwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLm5pdS5lZHUwHhcNMTIwNjI1MjEyMzQyWhcNMzIw
-NjI1MjEyMzQyWjAWMRQwEgYDVQQDEwtpZHAubml1LmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBANuafXsLdk3SmPpCyiffiR7vZANMZR2z8CLJ/gFX
-3K5Xg9NRxulRbODOc3BPPQ0lsOjDbdJHnS61ynhCkX+TDNjdslINg+GtD25VG3hT
-SAmsu3BLIcYayR6TqB9kOJ5aZD3xi5OX9zgTrJonkpF5O18A/Nf4ze4U0fi284Ff
-MhChMChLTSHdGUX7CMgGtvTLeINUAPTA1y28QdqGa1gXRMrVYh0dHpLOLA0+2rjU
-sTvjyLzr8Mhy+1dLOetZznDodBnNzEHJtOBsgoNYHIzDk9VSvtHf09y5HPDloLY1
-riGYBquHi3j8a0JBujreT9GmNDL+gcq4MX/ciijMkhtO318CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLm5pdS5lZHWGImh0dHBzOi8vaWRwLm5pdS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFKXEzk/Mh/VQaH38rRYuaeMYBvhwMA0GCSqGSIb3
-DQEBBQUAA4IBAQCLljQgIjIbmd2Fpg5M6q6pUNtmmUjXEs9FlcIjJb7A1rh3ViME
-kmEqQsko2Pho4fYs4nV1K3JHwl/cTG9pfv07OaZP/nqnXlUYoz6ExDw8FjVmC1cR
-WrDr1KpMAmr0j3+EqVvWfBIBOCbIgjQAt/N1SOaEDirBYVUcAslZHYZ2bxlYnP20
-UOqBrWO6GFnhn3OYsTxtSiT8RO7XI4tq3aBxKUfjd1p9eM5OtHvOFSZEjGEyFomL
-XQZKskmaxo4qmHMwKxfx3+KgBRWg2Ulsdo2LXvFPNDcpPKqxzMttT63xvyeSDICa
-H83FixTxhPWSdCCW+q92fF/ESMtrlCQHBvAy
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.niu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.niu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.niu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.niu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.niu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">niu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUKnaPgEQSbfYJd3gH9ZzjBNXVpDwwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLm5pdS5lZHUwHhcNMTIwNjI1MjEyMzQyWhcNMzIw
-NjI1MjEyMzQyWjAWMRQwEgYDVQQDEwtpZHAubml1LmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBANuafXsLdk3SmPpCyiffiR7vZANMZR2z8CLJ/gFX
-3K5Xg9NRxulRbODOc3BPPQ0lsOjDbdJHnS61ynhCkX+TDNjdslINg+GtD25VG3hT
-SAmsu3BLIcYayR6TqB9kOJ5aZD3xi5OX9zgTrJonkpF5O18A/Nf4ze4U0fi284Ff
-MhChMChLTSHdGUX7CMgGtvTLeINUAPTA1y28QdqGa1gXRMrVYh0dHpLOLA0+2rjU
-sTvjyLzr8Mhy+1dLOetZznDodBnNzEHJtOBsgoNYHIzDk9VSvtHf09y5HPDloLY1
-riGYBquHi3j8a0JBujreT9GmNDL+gcq4MX/ciijMkhtO318CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLm5pdS5lZHWGImh0dHBzOi8vaWRwLm5pdS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFKXEzk/Mh/VQaH38rRYuaeMYBvhwMA0GCSqGSIb3
-DQEBBQUAA4IBAQCLljQgIjIbmd2Fpg5M6q6pUNtmmUjXEs9FlcIjJb7A1rh3ViME
-kmEqQsko2Pho4fYs4nV1K3JHwl/cTG9pfv07OaZP/nqnXlUYoz6ExDw8FjVmC1cR
-WrDr1KpMAmr0j3+EqVvWfBIBOCbIgjQAt/N1SOaEDirBYVUcAslZHYZ2bxlYnP20
-UOqBrWO6GFnhn3OYsTxtSiT8RO7XI4tq3aBxKUfjd1p9eM5OtHvOFSZEjGEyFomL
-XQZKskmaxo4qmHMwKxfx3+KgBRWg2Ulsdo2LXvFPNDcpPKqxzMttT63xvyeSDICa
-H83FixTxhPWSdCCW+q92fF/ESMtrlCQHBvAy
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.niu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Northern Illinois University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Northern Illinois University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.niu.edu/index.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>David Gersic</md:GivenName>
-    <md:EmailAddress>dgersic@niu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David Gersic</md:GivenName>
-    <md:EmailAddress>dgersic@niu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>David Gersic</md:GivenName>
-    <md:EmailAddress>dgersic@niu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d9cc2778..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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nordu.net/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nordu.net/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nordu.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nordu.net/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordu.net</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nordu.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nordu.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">NORDUnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>NORDUnet</md:Company>
-    <md:SurName>noc@nordu.net</md:SurName>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>NORDUnet</md:Company>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>NORDUnet</md:Company>
-    <md:SurName>NUNOC</md:SurName>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6236c27e..00000000
--- a/swamid-interfederations-2.0/idp.nordu.net.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://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="en">NORDUnet</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The NORDUnet A/S Identity Provider is used by employees and guests of NORDUnet.</mdui:Description>
-        <mdui:Logo 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="technical">
-    <Company>NORDUnet NOC</Company>
-    <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 38ff219f..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.normandie-univ.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Normandie Université</mdui:DisplayName>
-        <mdui:Logo height="12" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAMCAYAAABr5z2BAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAADAC6sfCeAAACd0lEQVQoz22Sy0tUYRjGn/f7vnPxzMXUHMUkKgwU0hbZtlYSkQuLhIhAIhdhtWnTsk1RCFHYoiAIoqBokDaZIEQIhUSUopsuUpapeGvGmTlz5ty+t4W0yucPePjx/B4CAGYQEfjbUIvV3NDRySTDIESshbRMP9xIuGtzdGHcxRYhACjd68qwk76STFud5UpkElgLAmJN2rENq+j5v2TE1xN9w5P/FfDQUbNcl77hZBKXQQAYgGkCQgBBAOgYYKC85n4gr9LTd85aG+hrcgbfaW909q6v/LqqZiYcgkF+8Xdx0TYoNOyNHwDrOFRN5QqqU47KmEoeVLVmWxbZ19lHCP4RKFdQfZXmPCAsU8FdyWHs/XTCFtrA3t3udMvuuANK7gp8v1jwRPPp1v4DKapvWCksL7xYeDgjlBYMQYSkraXUs89GqqaejzoDY+MNA3cepz1mmmDLBGvYs99VikMxWGOnRyzLuNXbeKlOkNDEzARo7fnkbLjUQOCYKUQYoXZpVWwHAAZRwRMJ1gJBHIBAEqa3U6RSy1+Z+SfWyyqKsLC4KFaFpMBQiHN5/Kky+DP5heWkE0+Wivjih5QnoUNmDrSIlaLut7nSk97b+fnceDmiqdWCaHNsBK4fSCWp6+aD5Py+1mC64gvv44x5Rklur0SbG6qYXGKAaFMeAOBUS/9JWySyBIEYPsq+5kJJTiulEzVJ0cKIghorY657y59KleIRRQC/uXpY5ee2JXuOmcXu88EEVdMrKY32SEcJy5DpHfW8XzMjjOKQgVIlKheh9fDLpadrtNU9T2TO7jGT8iJYHCdCIyBMBjMBAoQcx/H9eG7jWhZZ7y9HJjS0VZLfHQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMCswMjowMFq3xdUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzArMDI6MDAr6n1pAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.normandie-univ.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Normandie Université's IDP is only used by people of The Comue Normandie University and not by users members of Normandie Université</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Normandie Université</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">L'IDP Normandie Université est utilisé par les individus de la Comue Normandie Université et non par les individus des établissements qui la composent.</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>
-					      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>
-    </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-POST" Location="https://idp.normandie-univ.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.normandie-univ.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.normandie-univ.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Normandie Université</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Normandie Université</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.normandie-univ.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>exploit@normandie-univ.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.northampton.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.northampton.ac.uk-oala-metadata.xml
deleted file mode 100644
index ae9836cb..00000000
--- a/swamid-interfederations-2.0/idp.northampton.ac.uk-oala-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="http://idp.northampton.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for The University of Northampton.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">northampton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIJAO2YHtS7tStwMA0GCSqGSIb3DQEBBQUAMEgxJjAkBgNV
-						BAoTHVRoZSBVbml2ZXJzaXR5IG9mIE5vcnRoYW1wdG9uMR4wHAYDVQQDExVpZHAu
-						bm9ydGhhbXB0b24uYWMudWswHhcNMTEwNzAxMDkzMTA2WhcNMjEwNjI4MDkzMTA2
-						WjBIMSYwJAYDVQQKEx1UaGUgVW5pdmVyc2l0eSBvZiBOb3J0aGFtcHRvbjEeMBwG
-						A1UEAxMVaWRwLm5vcnRoYW1wdG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAnXNIFiDdMKiB0epr5mrHoxdU9agPeWH+KMyutW6bz/58uYE1
-						yQGCivZPOoYl2rLrkvz/CboDst49EfaphkC2wro4AlZWj3if/g7DBWDOfdFQ+uxQ
-						Zs53Bcx5htjbOAbIgnVM5qUXj0hY48VE4iUhIfXg2sS2rAtZ0mFBfbscxtiGReMy
-						c+RK+d4FVe2FilXuhDsrSTbrzdRD+y/dJgyueh6wtQNK19y5VmrbUQv4eL7zu0Hj
-						FiPBNH/fnAQG9vZJusj2GSGLqUdFwJ5WeBykmSCM0y+zCV7Lg5cgbzaDqw7GkFQ8
-						nGaSChoZeOiZLGYyAJW8SWr4BItMCIzKYu39ZwIDAQABo4GqMIGnMB0GA1UdDgQW
-						BBRubSh5GRDx+a/9clMJCs+uSzUUHjB4BgNVHSMEcTBvgBRubSh5GRDx+a/9clMJ
-						Cs+uSzUUHqFMpEowSDEmMCQGA1UEChMdVGhlIFVuaXZlcnNpdHkgb2YgTm9ydGhh
-						bXB0b24xHjAcBgNVBAMTFWlkcC5ub3J0aGFtcHRvbi5hYy51a4IJAO2YHtS7tStw
-						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJStfpsWeslB4rGZfXcf
-						5L+TQ+01ukSjEVTCPk76BC/xyy8hgzVeHsoO1H1cBeQwiq5metEJvNP6Lws13An5
-						jIDYCUbw79XqfIF8R8ElEX9yDQjQlvE1gnowcu06lnBMrKbSPKigSdfVgZnp5lm1
-						nkOjNCIFua99k4/29oPYjY4N9j1RLfpsQj9I+b89yoRCcTzqdssL28bF5Yj2M9vn
-						i4k/FGuhoklMy5g/PzA0oB9NOY30HJ90V6vcWCXZBx1etmURUhAzm4Ibz7eeoxVj
-						W1alcTc/bTwRSru+aCuukrK0V+jlLDxxKJEwSi3BgOL2+e+RYXOWhU/kDbnbrc1e
-						SCQ=
-					</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>
-						MIIDvjCCAqagAwIBAgIJAO2YHtS7tStwMA0GCSqGSIb3DQEBBQUAMEgxJjAkBgNV
-						BAoTHVRoZSBVbml2ZXJzaXR5IG9mIE5vcnRoYW1wdG9uMR4wHAYDVQQDExVpZHAu
-						bm9ydGhhbXB0b24uYWMudWswHhcNMTEwNzAxMDkzMTA2WhcNMjEwNjI4MDkzMTA2
-						WjBIMSYwJAYDVQQKEx1UaGUgVW5pdmVyc2l0eSBvZiBOb3J0aGFtcHRvbjEeMBwG
-						A1UEAxMVaWRwLm5vcnRoYW1wdG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAnXNIFiDdMKiB0epr5mrHoxdU9agPeWH+KMyutW6bz/58uYE1
-						yQGCivZPOoYl2rLrkvz/CboDst49EfaphkC2wro4AlZWj3if/g7DBWDOfdFQ+uxQ
-						Zs53Bcx5htjbOAbIgnVM5qUXj0hY48VE4iUhIfXg2sS2rAtZ0mFBfbscxtiGReMy
-						c+RK+d4FVe2FilXuhDsrSTbrzdRD+y/dJgyueh6wtQNK19y5VmrbUQv4eL7zu0Hj
-						FiPBNH/fnAQG9vZJusj2GSGLqUdFwJ5WeBykmSCM0y+zCV7Lg5cgbzaDqw7GkFQ8
-						nGaSChoZeOiZLGYyAJW8SWr4BItMCIzKYu39ZwIDAQABo4GqMIGnMB0GA1UdDgQW
-						BBRubSh5GRDx+a/9clMJCs+uSzUUHjB4BgNVHSMEcTBvgBRubSh5GRDx+a/9clMJ
-						Cs+uSzUUHqFMpEowSDEmMCQGA1UEChMdVGhlIFVuaXZlcnNpdHkgb2YgTm9ydGhh
-						bXB0b24xHjAcBgNVBAMTFWlkcC5ub3J0aGFtcHRvbi5hYy51a4IJAO2YHtS7tStw
-						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJStfpsWeslB4rGZfXcf
-						5L+TQ+01ukSjEVTCPk76BC/xyy8hgzVeHsoO1H1cBeQwiq5metEJvNP6Lws13An5
-						jIDYCUbw79XqfIF8R8ElEX9yDQjQlvE1gnowcu06lnBMrKbSPKigSdfVgZnp5lm1
-						nkOjNCIFua99k4/29oPYjY4N9j1RLfpsQj9I+b89yoRCcTzqdssL28bF5Yj2M9vn
-						i4k/FGuhoklMy5g/PzA0oB9NOY30HJ90V6vcWCXZBx1etmURUhAzm4Ibz7eeoxVj
-						W1alcTc/bTwRSru+aCuukrK0V+jlLDxxKJEwSi3BgOL2+e+RYXOWhU/kDbnbrc1e
-						SCQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.northampton.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.northampton.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Northampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Northampton (IDP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.northampton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Aynsworth</SurName>
-    <EmailAddress>mailto:mike.aynsworth@northampton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Aynsworth</SurName>
-    <EmailAddress>mailto:mike.aynsworth@northampton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.northern.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.northern.ac.uk-shibboleth.xml
deleted file mode 100644
index bbbf60f1..00000000
--- a/swamid-interfederations-2.0/idp.northern.ac.uk-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.northern.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Northern College for Residential Adult Education.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">northern.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/northern.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/northern.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Northern College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.northern.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.northland.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.northland.ac.uk-shibboleth.xml
deleted file mode 100644
index c2edf40d..00000000
--- a/swamid-interfederations-2.0/idp.northland.ac.uk-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.northland.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Northumberland College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">northland.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/northland.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/northland.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Northumberland College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.northland.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nottingham.ac.uk-shibboleth.xml
deleted file mode 100644
index a89d85ab..00000000
--- a/swamid-interfederations-2.0/idp.nottingham.ac.uk-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://idp.nottingham.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Nottingham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-25T14:11: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">nottingham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdTCCA12gAwIBAgIQe1M3iT3f/2KTNQrtPxJO9zANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDQxMTAwMDAwMFoXDTE2MDQxMDIzNTk1OVowQjEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRpZHAubm90dGlu
-						Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCJKaG8
-						8WhWnpx1nIaiU+QJnQONYwqLyA8mpBThyXDGBZum2/u7rJeaqAicbtOSO+Wlwfz0
-						nPPxgv7g103BOCELqo5vc2agVJZTTGBHAPbJsSpnqZTcxZVqCooemLFeh+7YS5C/
-						vk1XZmk0O63JAqmTJSFOi4OpdcbI1uojACA5mhpYVb1PllMwbOMOBDPT79DZSUDi
-						8nu3xzEYOkSOw33Fk8wmXMU4/vjn3ZHBv9SbUyA0FyRiMIk3XujXRIUaVrJBKvkQ
-						MFF6r84N6oRQH/UCsvzBYYBIh0f0Vl+irwpzj7e/p/8FV1QQmVMB9D4DG1zcqTiK
-						nEC0YIAnf9ec1JUCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-						KzdXR+qQ47ntMB0GA1UdDgQWBBTQtQfjFYFrVoVdyhsPVSEgFgwwgTAOBgNVHQ8B
-						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-						BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-						QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-						cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-						L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLm5vdHRpbmdoYW0u
-						YWMudWswDQYJKoZIhvcNAQEFBQADggEBAHpnljGSmsagTtG4QQXuYT9riYNyw4lX
-						w3P96GIFPKPH4q1B5IUbIWqvXm5/YWG1t5GK3sdNl/H0I2Araej3h3Ep1VKyU1IS
-						MtmyAMVFbEFK7qpLqGadOCJojIOKkgSNv9B601iJ9MLc3HETBK3/plotP1SBMiBH
-						ErIC3PM2XB6gZ53u7GdsBt58gL0KamrLWRfBymXMB30EdBZyncAUse5EuCmP0+zy
-						YrWrdQpwZFzid6O8ClK4matKCpg4i2XG0mw+5sH7aPN/j+whNj4xzvKbv1T9Yke+
-						mA0w+oSnr4UMSWEb2bb985BmqcNfixmz0EtzfqnKkLL0h1oS9WLoFKs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.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://idp.nottingham.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nottingham.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">nottingham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdTCCA12gAwIBAgIQe1M3iT3f/2KTNQrtPxJO9zANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDQxMTAwMDAwMFoXDTE2MDQxMDIzNTk1OVowQjEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR0wGwYDVQQDExRpZHAubm90dGlu
-						Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCJKaG8
-						8WhWnpx1nIaiU+QJnQONYwqLyA8mpBThyXDGBZum2/u7rJeaqAicbtOSO+Wlwfz0
-						nPPxgv7g103BOCELqo5vc2agVJZTTGBHAPbJsSpnqZTcxZVqCooemLFeh+7YS5C/
-						vk1XZmk0O63JAqmTJSFOi4OpdcbI1uojACA5mhpYVb1PllMwbOMOBDPT79DZSUDi
-						8nu3xzEYOkSOw33Fk8wmXMU4/vjn3ZHBv9SbUyA0FyRiMIk3XujXRIUaVrJBKvkQ
-						MFF6r84N6oRQH/UCsvzBYYBIh0f0Vl+irwpzj7e/p/8FV1QQmVMB9D4DG1zcqTiK
-						nEC0YIAnf9ec1JUCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-						KzdXR+qQ47ntMB0GA1UdDgQWBBTQtQfjFYFrVoVdyhsPVSEgFgwwgTAOBgNVHQ8B
-						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-						BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-						QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-						cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-						L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLm5vdHRpbmdoYW0u
-						YWMudWswDQYJKoZIhvcNAQEFBQADggEBAHpnljGSmsagTtG4QQXuYT9riYNyw4lX
-						w3P96GIFPKPH4q1B5IUbIWqvXm5/YWG1t5GK3sdNl/H0I2Araej3h3Ep1VKyU1IS
-						MtmyAMVFbEFK7qpLqGadOCJojIOKkgSNv9B601iJ9MLc3HETBK3/plotP1SBMiBH
-						ErIC3PM2XB6gZ53u7GdsBt58gL0KamrLWRfBymXMB30EdBZyncAUse5EuCmP0+zy
-						YrWrdQpwZFzid6O8ClK4matKCpg4i2XG0mw+5sH7aPN/j+whNj4xzvKbv1T9Yke+
-						mA0w+oSnr4UMSWEb2bb985BmqcNfixmz0EtzfqnKkLL0h1oS9WLoFKs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.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">University of Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Nottingham</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>University of Nottingham IT Helpline</GivenName>
-    <EmailAddress>mailto:itservicedesk@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Betts</SurName>
-    <EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nottingham.edu.cn-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nottingham.edu.cn-idp-shibboleth.xml
deleted file mode 100644
index c176f448..00000000
--- a/swamid-interfederations-2.0/idp.nottingham.edu.cn-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.nottingham.edu.cn/idp/shibboleth">
-  <!--
-		This is a "University of Nottingham Ningbo, China" Shibboleth IdP for the University of Nottingham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-03-23T11:38: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">nottingham.edu.cn</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEHDCCAwQCCQDij8AO1ZyMHzANBgkqhkiG9w0BAQUFADCBzzELMAkGA1UEBhMC
-						Q04xETAPBgNVBAgTCFpoZWppYW5nMQ8wDQYDVQQHEwZOaW5nYm8xLzAtBgNVBAoT
-						JlVuaXZlcnNpdHkgb2YgTm90dGluZ2hhbSBOaW5nYm8sIENoaW5hMR0wGwYDVQQL
-						ExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEeMBwGA1UEAxMVaWRwLm5vdHRpbmdoYW0u
-						ZWR1LmNuMSwwKgYJKoZIhvcNAQkBFh1pdC1zZXJ2aWNlc0Bub3R0aW5naGFtLmVk
-						dS5jbjAeFw0xMTA1MTkwODM0NTVaFw0zMTA1MTQwODM0NTVaMIHPMQswCQYDVQQG
-						EwJDTjERMA8GA1UECBMIWmhlamlhbmcxDzANBgNVBAcTBk5pbmdibzEvMC0GA1UE
-						ChMmVW5pdmVyc2l0eSBvZiBOb3R0aW5naGFtIE5pbmdibywgQ2hpbmExHTAbBgNV
-						BAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMR4wHAYDVQQDExVpZHAubm90dGluZ2hh
-						bS5lZHUuY24xLDAqBgkqhkiG9w0BCQEWHWl0LXNlcnZpY2VzQG5vdHRpbmdoYW0u
-						ZWR1LmNuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtRiXnUTiNrTR
-						/qHVEWqV50864Thqs3JI1frOi1sjQbaDCkh73hSsNdzxzg5FUdjdZfVrLeh7MVUf
-						Yjp0wWCMvrJDvaZwWgl2mMb2/pvZTkEvTmIwDL/n+G4oyWoUkEjXIrtui4Ie9bAT
-						/tBBN2I+U3c0QTM4DUP21EqjhxwcV3D6gsbGAcay3k5ukpwOgrz30MFqb0b30baj
-						ErqpvWJMVjjV4n8koW4Xa8nt60uwHSbIzr6Fs+cqKgELxjwQ73jI0UfhbkMiu4T+
-						41qg80xlxaXOo1UuAhSxGzinL9sPcQzrKYdBEsw+vYPt8SvbT0kdXjr6Bp997HqL
-						pHMmuBrSjQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCX8yxPXzLmOpULOrxk9gOb
-						uvUNnmaqugXeJU50AwNSvm1foJopXUke/h8wJBfQ3f/WNgW65Q9AStaT3UDdmDX/
-						46g4PneVj7FCsdTMBg79e6uQoraSUb3ngO6hAo0ZBn1xi6Y0a2IBo+H7ln3a10eN
-						prXFgovDfO86hcltDlYDOCTdSG/bWPeqLU0wBaB4oCPm/VsZTx4gg066UAa9HJkp
-						3G1n/aMnGCwRrlQ4jfISBC5nsfksXem8w6Ur+bN2NUo7igMiANRnKJzJgKnT518Z
-						jINg8Q+dQ+hdfSPa4BUC1LiOxbp8IdOkfbG5gtpnANO1Kw2HXWTBakjy+VjrejZp
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.edu.cn:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.edu.cn: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.nottingham.edu.cn/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nottingham.edu.cn/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nottingham.edu.cn/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nottingham.edu.cn/idp/profile/SAML2/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">nottingham.edu.cn</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEHDCCAwQCCQDij8AO1ZyMHzANBgkqhkiG9w0BAQUFADCBzzELMAkGA1UEBhMC
-						Q04xETAPBgNVBAgTCFpoZWppYW5nMQ8wDQYDVQQHEwZOaW5nYm8xLzAtBgNVBAoT
-						JlVuaXZlcnNpdHkgb2YgTm90dGluZ2hhbSBOaW5nYm8sIENoaW5hMR0wGwYDVQQL
-						ExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEeMBwGA1UEAxMVaWRwLm5vdHRpbmdoYW0u
-						ZWR1LmNuMSwwKgYJKoZIhvcNAQkBFh1pdC1zZXJ2aWNlc0Bub3R0aW5naGFtLmVk
-						dS5jbjAeFw0xMTA1MTkwODM0NTVaFw0zMTA1MTQwODM0NTVaMIHPMQswCQYDVQQG
-						EwJDTjERMA8GA1UECBMIWmhlamlhbmcxDzANBgNVBAcTBk5pbmdibzEvMC0GA1UE
-						ChMmVW5pdmVyc2l0eSBvZiBOb3R0aW5naGFtIE5pbmdibywgQ2hpbmExHTAbBgNV
-						BAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMR4wHAYDVQQDExVpZHAubm90dGluZ2hh
-						bS5lZHUuY24xLDAqBgkqhkiG9w0BCQEWHWl0LXNlcnZpY2VzQG5vdHRpbmdoYW0u
-						ZWR1LmNuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtRiXnUTiNrTR
-						/qHVEWqV50864Thqs3JI1frOi1sjQbaDCkh73hSsNdzxzg5FUdjdZfVrLeh7MVUf
-						Yjp0wWCMvrJDvaZwWgl2mMb2/pvZTkEvTmIwDL/n+G4oyWoUkEjXIrtui4Ie9bAT
-						/tBBN2I+U3c0QTM4DUP21EqjhxwcV3D6gsbGAcay3k5ukpwOgrz30MFqb0b30baj
-						ErqpvWJMVjjV4n8koW4Xa8nt60uwHSbIzr6Fs+cqKgELxjwQ73jI0UfhbkMiu4T+
-						41qg80xlxaXOo1UuAhSxGzinL9sPcQzrKYdBEsw+vYPt8SvbT0kdXjr6Bp997HqL
-						pHMmuBrSjQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCX8yxPXzLmOpULOrxk9gOb
-						uvUNnmaqugXeJU50AwNSvm1foJopXUke/h8wJBfQ3f/WNgW65Q9AStaT3UDdmDX/
-						46g4PneVj7FCsdTMBg79e6uQoraSUb3ngO6hAo0ZBn1xi6Y0a2IBo+H7ln3a10eN
-						prXFgovDfO86hcltDlYDOCTdSG/bWPeqLU0wBaB4oCPm/VsZTx4gg066UAa9HJkp
-						3G1n/aMnGCwRrlQ4jfISBC5nsfksXem8w6Ur+bN2NUo7igMiANRnKJzJgKnT518Z
-						jINg8Q+dQ+hdfSPa4BUC1LiOxbp8IdOkfbG5gtpnANO1Kw2HXWTBakjy+VjrejZp
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.edu.cn:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.edu.cn:8443/idp/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 Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Nottingham Ningbo, China</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nottingham.edu.cn/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpline</GivenName>
-    <EmailAddress>mailto:itservicedesk@nottingham.edu.cn</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:itservicedesk@nottingham.edu.cn</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nottingham.edu.my-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nottingham.edu.my-idp-shibboleth.xml
deleted file mode 100644
index 7657ae65..00000000
--- a/swamid-interfederations-2.0/idp.nottingham.edu.my-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.nottingham.edu.my/idp/shibboleth">
-  <!--
-		This is a "University of Nottingham Malaysia Campus" Shibboleth IdP for the University of Nottingham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-11-20T10:50: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">nottingham.edu.my</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID0jCCAroCCQCeoFvQJDQiEjANBgkqhkiG9w0BAQUFADCBqjELMAkGA1UEBhMC
-						bXkxETAPBgNVBAgTCFNlbGFuZ29yMREwDwYDVQQHEwhTZW1lbnlpaDE2MDQGA1UE
-						ChMtVGhlIFVuaXZlcnNpdHkgT2YgTm90dGluZ2hhbSBNYWxheXNpYSBDYW1wdXMg
-						MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEeMBwGA1UEAxMVaWRwLm5v
-						dHRpbmdoYW0uZWR1Lm15MB4XDTEyMDMyMzE0MDIzMVoXDTIyMDMyMTE0MDIzMVow
-						gaoxCzAJBgNVBAYTAm15MREwDwYDVQQIEwhTZWxhbmdvcjERMA8GA1UEBxMIU2Vt
-						ZW55aWgxNjA0BgNVBAoTLVRoZSBVbml2ZXJzaXR5IE9mIE5vdHRpbmdoYW0gTWFs
-						YXlzaWEgQ2FtcHVzIDEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxHjAc
-						BgNVBAMTFWlkcC5ub3R0aW5naGFtLmVkdS5teTCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBANt9uwt87a0uDUwXnCynAFOhpydrO0MzTlQiAxic8o4TY4yG
-						IjBb50cMlOkyseJY5I3qN6fFKmWYiAEQtNeiH0PB2h/tgF8M65aHirnW1Z7zjZYK
-						YHUTntVrL9WCJNg7UJoE2alh7Tn0irWPL4JS5BSbxqLYgTLA05uk6+2XCKY+zYnM
-						rHet/LoNkv2Hge74ES1dU99PSSDCUwDGn27t+iPIYPth1hD1hu7/c3NCY2NmU6VF
-						mg3X3TcNoLtAyzZZn1Fc3+TGIU5LUryF/33+5168JT6J2RznMI5FkQvp+YVroEQ/
-						V5THBheiGsd5CNCwDdqcjj6V8auKXb/QsNYMFQMCAwEAATANBgkqhkiG9w0BAQUF
-						AAOCAQEAFUUJk2E+KDSDBSGE6dU5Tq1cvTmIn2TNMUA5uBC/K1v7WzeZjZiid9CP
-						nri9DbU3SrvAaGqE4+Sxt1AwnLJuq2izqWuouUvywRYhq7fyJpJTl7ydaL00n/fH
-						VOXec31++JNdvqIBERONkv92NC9vBggAK8eFQ3rbqSOAR/Q3r6KcILKbp2gGoAqt
-						a3TO/dtiUzllJqAvg3pWnczxGnK5qE7MSQihSWDcFhzSMLiX1NjR3/hM/Vu/hJi/
-						NlA5Oye9QvSkVvudFAiz8chuXWu+3LevA/C1IVXBfKA+ZDJ+69JbbEmhOiUceBCB
-						HQBzUZxVahSEqoMUTVycJI/zZ6WQwA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.edu.my:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.edu.my: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.nottingham.edu.my/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nottingham.edu.my/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nottingham.edu.my/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nottingham.edu.my/idp/profile/SAML2/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">nottingham.edu.my</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID0jCCAroCCQCeoFvQJDQiEjANBgkqhkiG9w0BAQUFADCBqjELMAkGA1UEBhMC
-						bXkxETAPBgNVBAgTCFNlbGFuZ29yMREwDwYDVQQHEwhTZW1lbnlpaDE2MDQGA1UE
-						ChMtVGhlIFVuaXZlcnNpdHkgT2YgTm90dGluZ2hhbSBNYWxheXNpYSBDYW1wdXMg
-						MR0wGwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEeMBwGA1UEAxMVaWRwLm5v
-						dHRpbmdoYW0uZWR1Lm15MB4XDTEyMDMyMzE0MDIzMVoXDTIyMDMyMTE0MDIzMVow
-						gaoxCzAJBgNVBAYTAm15MREwDwYDVQQIEwhTZWxhbmdvcjERMA8GA1UEBxMIU2Vt
-						ZW55aWgxNjA0BgNVBAoTLVRoZSBVbml2ZXJzaXR5IE9mIE5vdHRpbmdoYW0gTWFs
-						YXlzaWEgQ2FtcHVzIDEdMBsGA1UECxMUSW5mb3JtYXRpb24gU2VydmljZXMxHjAc
-						BgNVBAMTFWlkcC5ub3R0aW5naGFtLmVkdS5teTCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBANt9uwt87a0uDUwXnCynAFOhpydrO0MzTlQiAxic8o4TY4yG
-						IjBb50cMlOkyseJY5I3qN6fFKmWYiAEQtNeiH0PB2h/tgF8M65aHirnW1Z7zjZYK
-						YHUTntVrL9WCJNg7UJoE2alh7Tn0irWPL4JS5BSbxqLYgTLA05uk6+2XCKY+zYnM
-						rHet/LoNkv2Hge74ES1dU99PSSDCUwDGn27t+iPIYPth1hD1hu7/c3NCY2NmU6VF
-						mg3X3TcNoLtAyzZZn1Fc3+TGIU5LUryF/33+5168JT6J2RznMI5FkQvp+YVroEQ/
-						V5THBheiGsd5CNCwDdqcjj6V8auKXb/QsNYMFQMCAwEAATANBgkqhkiG9w0BAQUF
-						AAOCAQEAFUUJk2E+KDSDBSGE6dU5Tq1cvTmIn2TNMUA5uBC/K1v7WzeZjZiid9CP
-						nri9DbU3SrvAaGqE4+Sxt1AwnLJuq2izqWuouUvywRYhq7fyJpJTl7ydaL00n/fH
-						VOXec31++JNdvqIBERONkv92NC9vBggAK8eFQ3rbqSOAR/Q3r6KcILKbp2gGoAqt
-						a3TO/dtiUzllJqAvg3pWnczxGnK5qE7MSQihSWDcFhzSMLiX1NjR3/hM/Vu/hJi/
-						NlA5Oye9QvSkVvudFAiz8chuXWu+3LevA/C1IVXBfKA+ZDJ+69JbbEmhOiUceBCB
-						HQBzUZxVahSEqoMUTVycJI/zZ6WQwA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nottingham.edu.my:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nottingham.edu.my:8443/idp/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 Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Nottingham Malaysia Campus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nottingham.edu.my/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Helpline</GivenName>
-    <EmailAddress>mailto:itservicedesk@nottingham.edu.my</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:itservicedesk@nottingham.edu.my</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nrc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nrc.ac.uk-shibboleth.xml
deleted file mode 100644
index be7afd9f..00000000
--- a/swamid-interfederations-2.0/idp.nrc.ac.uk-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.nrc.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Northern Regional College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-20T16:24: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">nrc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDcjCCAloCCQDyu2TVCpnwTjANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJH
-						QjEZMBcGA1UECBMQTm9ydGhlcm4gSXJlbGFuZDEVMBMGA1UEBxMMTmV3dG93bmFi
-						YmV5MSIwIAYDVQQKExlOb3J0aGVybiBSZWdpb25hbCBDb2xsZWdlMRYwFAYDVQQD
-						Ew1pZHAubnJjLmFjLnVrMB4XDTE0MDYxODEzMjQzM1oXDTM0MDYxMzEzMjQzM1ow
-						ezELMAkGA1UEBhMCR0IxGTAXBgNVBAgTEE5vcnRoZXJuIElyZWxhbmQxFTATBgNV
-						BAcTDE5ld3Rvd25hYmJleTEiMCAGA1UEChMZTm9ydGhlcm4gUmVnaW9uYWwgQ29s
-						bGVnZTEWMBQGA1UEAxMNaWRwLm5yYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAPVbAHe9mFv4n0AFnhR7uN3oetmnyGocFxSVR/3uZVNQWaqx
-						KRZpNawsVdiAQqMP6x9+ymD6e0EKO2YKZSXWvbPxxwG4dwVpJcAy6jYoe71G7Qq1
-						MQxohxtLPMk5hZ4DVTt1xSMc+ZRVr1cE6vlHhC9r6LBmyaoxj+wc+U4/i6dyKs+o
-						wQufX7iIN1G3vDXsBA9sqlxUCdlfUdhbmri/Vf4U6tzYyF3l0txyZejlsmbHDZA0
-						oSrc+3VxosQeJ4irf5yNePeHzCWp0v75tEfLERg/1vIxfEO8nh9Rr3r4tHEKK77G
-						Yl9oU0N7rgQvOGwfuQerFKzSHWv7ZOPXMT77iwkCAwEAATANBgkqhkiG9w0BAQUF
-						AAOCAQEAblCurjRGhUqdFuDlW1TEYNiCLADfS3uuWV+KhUDiQ7zLBdMxD5DpN++v
-						agA4nHoUz+EsYXrD4VPzD1RuPaRuEjSL9hS0UxiRrOR1hIvnAC63H9pi2waZ53hp
-						uMiDVtG0WomR/pJW3puaZs5N/bFL2ZWBvqqaRU0zc9nz4S0odmN+pfSqsrr/Y+JL
-						4s89ev740ocq4FAq6zMwMDjeYvXDx7OibZ0Omq8S1/zPz3yXIM9/mvCm/iOBKxrO
-						fe41HZlxy6Kdw+f/F7agDCNyNUAhC2zaYCWvSgFieJ2kTW+cOyNGwu1GzrxTAj6p
-						QdVc9wctrwklGCXhXqaNBz72HCM6Pg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nrc.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.nrc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nrc.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">nrc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDcjCCAloCCQDyu2TVCpnwTjANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJH
-						QjEZMBcGA1UECBMQTm9ydGhlcm4gSXJlbGFuZDEVMBMGA1UEBxMMTmV3dG93bmFi
-						YmV5MSIwIAYDVQQKExlOb3J0aGVybiBSZWdpb25hbCBDb2xsZWdlMRYwFAYDVQQD
-						Ew1pZHAubnJjLmFjLnVrMB4XDTE0MDYxODEzMjQzM1oXDTM0MDYxMzEzMjQzM1ow
-						ezELMAkGA1UEBhMCR0IxGTAXBgNVBAgTEE5vcnRoZXJuIElyZWxhbmQxFTATBgNV
-						BAcTDE5ld3Rvd25hYmJleTEiMCAGA1UEChMZTm9ydGhlcm4gUmVnaW9uYWwgQ29s
-						bGVnZTEWMBQGA1UEAxMNaWRwLm5yYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAPVbAHe9mFv4n0AFnhR7uN3oetmnyGocFxSVR/3uZVNQWaqx
-						KRZpNawsVdiAQqMP6x9+ymD6e0EKO2YKZSXWvbPxxwG4dwVpJcAy6jYoe71G7Qq1
-						MQxohxtLPMk5hZ4DVTt1xSMc+ZRVr1cE6vlHhC9r6LBmyaoxj+wc+U4/i6dyKs+o
-						wQufX7iIN1G3vDXsBA9sqlxUCdlfUdhbmri/Vf4U6tzYyF3l0txyZejlsmbHDZA0
-						oSrc+3VxosQeJ4irf5yNePeHzCWp0v75tEfLERg/1vIxfEO8nh9Rr3r4tHEKK77G
-						Yl9oU0N7rgQvOGwfuQerFKzSHWv7ZOPXMT77iwkCAwEAATANBgkqhkiG9w0BAQUF
-						AAOCAQEAblCurjRGhUqdFuDlW1TEYNiCLADfS3uuWV+KhUDiQ7zLBdMxD5DpN++v
-						agA4nHoUz+EsYXrD4VPzD1RuPaRuEjSL9hS0UxiRrOR1hIvnAC63H9pi2waZ53hp
-						uMiDVtG0WomR/pJW3puaZs5N/bFL2ZWBvqqaRU0zc9nz4S0odmN+pfSqsrr/Y+JL
-						4s89ev740ocq4FAq6zMwMDjeYvXDx7OibZ0Omq8S1/zPz3yXIM9/mvCm/iOBKxrO
-						fe41HZlxy6Kdw+f/F7agDCNyNUAhC2zaYCWvSgFieJ2kTW+cOyNGwu1GzrxTAj6p
-						QdVc9wctrwklGCXhXqaNBz72HCM6Pg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nrc.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">Northern Regional College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Northern Regional College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nrc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:support@nrc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alan</GivenName>
-    <SurName>Brown</SurName>
-    <EmailAddress>mailto:Alan.Brown@nrc.ac.uk</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 cc51b381..00000000
--- a/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.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://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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nuigalway.ie/idp/profile/Shibboleth/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>mailto:diarmuid.murray@nuigalway.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Diarmuid Murray</md:SurName>
-    <md:EmailAddress>mailto:diarmuid.murray@nuigalway.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>ISS Service Desk</md:SurName>
-    <md:EmailAddress>mailto: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 75b54ce5..00000000
--- a/swamid-interfederations-2.0/idp.nuigalway.ie.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor 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:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nuigalway.ie/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo 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 regexp="false">nuigalway.ie</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Logo height="68" width="225">https://edugate.heanet.ie/rr3/logos/nuig.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">National University of Ireland, Galway</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://nuigalway.ie</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:GeolocationHint>geo:53.278923955103785,-9.060437679290771</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <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.nuim.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
deleted file mode 100644
index efb89645..00000000
--- a/swamid-interfederations-2.0/idp.nuim.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nuim.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-08-16T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nuim.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Maynooth University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://computercentre.nuim.ie/</mdui:InformationURL>
-        <mdui:Logo height="119" width="243">https://edugate.heanet.ie/rr3/logos/MaynoothUniversity.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.3846672,-6.6012125</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFJzCCBA+gAwIBAgIJAIJfD55vGsQ3MA0GCSqGSIb3DQEBBQUAMIG9MQswCQYD
-VQQGEwJJRTEUMBIGA1UECBMLQ28uIEtpbGRhcmUxETAPBgNVBAcTCE1heW5vb3Ro
-MTEwLwYDVQQKEyhOYXRpb25hbCBVbml2ZXJzaXR5IG9mIElyZWxhbmQsIE1heW5v
-b3RoMRowGAYDVQQLExFDb21wdXRlciBTZXJ2aWNlczEUMBIGA1UEAxMLaWRwLm51
-aW0uaWUxIDAeBgkqhkiG9w0BCQEWEXN5cy1ncm91cEBudWltLmllMB4XDTEyMDEx
-MDE0NTUxNFoXDTE3MDEwODE0NTUxNFowgb0xCzAJBgNVBAYTAklFMRQwEgYDVQQI
-EwtDby4gS2lsZGFyZTERMA8GA1UEBxMITWF5bm9vdGgxMTAvBgNVBAoTKE5hdGlv
-bmFsIFVuaXZlcnNpdHkgb2YgSXJlbGFuZCwgTWF5bm9vdGgxGjAYBgNVBAsTEUNv
-bXB1dGVyIFNlcnZpY2VzMRQwEgYDVQQDEwtpZHAubnVpbS5pZTEgMB4GCSqGSIb3
-DQEJARYRc3lzLWdyb3VwQG51aW0uaWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCqYOcqJ5Noxcg5x/pGaiawCouvWi1jYCZWgleEQydX3uPCJYi1s2Ku
-LlOFaJW5tDzHO0dyMQ+y04dRsSKYgczsMgWrSNghD+vCezx3Zeu3g51eXMUz+rbB
-AP9c5TnDHk/ftYChMVbrih+xTJ30jXsQnfwXueO0JhQ5RZ8ON6Cesxq7hjnJJ0EA
-/DH/hiaI2M4KoPyT6b9p808M52cHMac0QpUz4dHSZ87sV4vQKiYIS76uShT7o+Hk
-tUfX24TY8uqoeyBohB/dvBMwdzBjr88TIO5e8ACjl25L+EzkEITSqKppAN3NhCUN
-aDN1g77S19a8X4bGRblkTOrYZoJVj/0/AgMBAAGjggEmMIIBIjAdBgNVHQ4EFgQU
-mQ7I+TlEqPr/emxYU5mFxFeRnkgwgfIGA1UdIwSB6jCB54AUmQ7I+TlEqPr/emxY
-U5mFxFeRnkihgcOkgcAwgb0xCzAJBgNVBAYTAklFMRQwEgYDVQQIEwtDby4gS2ls
-ZGFyZTERMA8GA1UEBxMITWF5bm9vdGgxMTAvBgNVBAoTKE5hdGlvbmFsIFVuaXZl
-cnNpdHkgb2YgSXJlbGFuZCwgTWF5bm9vdGgxGjAYBgNVBAsTEUNvbXB1dGVyIFNl
-cnZpY2VzMRQwEgYDVQQDEwtpZHAubnVpbS5pZTEgMB4GCSqGSIb3DQEJARYRc3lz
-LWdyb3VwQG51aW0uaWWCCQCCXw+ebxrENzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQACcYADyyTILLVeCYD7/m6TcYlwt+0k7wTyhMzOC54h0OVon6FW
-2/E0OyK3izzC6JkuNjbDCpnZG5+DyBj0jZI3UqPSN085z0rOfsPYLLqztytwduZv
-3jfgvDs/myj301xD1FdYWZmyVOuVTjB64XfAtTLqA2YJ9GvOL+egN8gh4DWu/mx9
-YCfuRE0VjS1C5qU3qrvQTRfm+mHIXvCJqEq+QdXMnJm2jc+rvm9s4Y3/P+dOJqZ2
-mSq9+fohezZUYgCirIJuORsZiubp0lExD9/P9hYK6tNtxCeKpOrFKfqDonlcFwq4
-08qWRqOhxna9IY/GleVcTnlR/8w9YOQ9kn0V
-</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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nuim.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nuim.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nuim.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Maynooth University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Maynooth University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://computercentre.nuim.ie/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jason</md:GivenName>
-    <md:SurName>Doran</md:SurName>
-    <md:EmailAddress>mailto:jason.doran@nuim.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Dearbhla O'Reilly</md:SurName>
-    <md:EmailAddress>mailto:dearbhla.oreilly@nuim.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>systrack@nuim.ie</md:SurName>
-    <md:EmailAddress>mailto:systrack@nuim.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nulc.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.nulc.ac.uk-openathens.xml
deleted file mode 100644
index f6d7af85..00000000
--- a/swamid-interfederations-2.0/idp.nulc.ac.uk-openathens.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.nulc.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Newcastle-under-Lyme College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">nulc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/nulc.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/nulc.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newcastle-under-Lyme College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nulc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nwhc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nwhc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 4f723a60..00000000
--- a/swamid-interfederations-2.0/idp.nwhc.ac.uk-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" entityID="https://idp.nwhc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for North Warwickshire and Hinckley College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-15T10:33:15Z">
-      <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">nwhc.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">North Warwickshire &amp; Hinckley College (Shibboleth)</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://www.nwhc.ac.uk/images/logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.nwhc.ac.uk/images/logo-icon.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAgygAwIBAgIVAKUnamKmXgk/Lnzrnwf+feRMH4ddMA0GCSqGSIb3DQEB
-						BQUAMBkxFzAVBgNVBAMTDmlkcC5ud2hjLmFjLnVrMB4XDTEzMDgwNTEwMDExOVoX
-						DTMzMDgwNTEwMDExOVowGTEXMBUGA1UEAxMOaWRwLm53aGMuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiXdo51PeQig41pAibbuK8eFwjkmWH
-						wwlJXw7EKABKtCmOpL00UEYy7qpKg8oHdX2VN9UssKX7PtFnDCMEcS1J7V5lbTCm
-						xOsTc26qIqoPyPY3z5qKETdv9jkl6UezHanB+kG6OOZxYNsZQVmElLsTIbxiW6gT
-						caGp6LotUxxNurn+kbX+EQas4B74IRrGtIhzG66xYFhQaBHqcsghcs4wQnxAz1hY
-						aLJ+dns79/BE/MLV+rOcuqKQuRWp4qBEDEbuVA8mQVhtBZmTbxrUCv81cl0tKCGZ
-						xlc1E3v6jAHGq6sVHJu342NRkW7FCICsKww3RqMUY90G/c1XaUfUAYsTAgMBAAGj
-						YzBhMEAGA1UdEQQ5MDeCDmlkcC5ud2hjLmFjLnVrhiVodHRwczovL2lkcC5ud2hj
-						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSa5qcFRjhigspQsL6d5yEN
-						3Q9YEjANBgkqhkiG9w0BAQUFAAOCAQEAhQxixhw6sfaHJtRPtYZ9hfhQSi/p0O3h
-						PllwONLp9zTaUDvPyu5XQ+Oh0//hT8xAiyEDEYBp04/a1HAPFNYMr3uAaYSiXi0P
-						26zIPlALtOTtF8wpdd88zX4LS567vKihExhZgnJjyLhOlisw4q6PH0FTq1ope8oN
-						SyWYSxSOjXt4S2+vEJMztj7NNicN1Doa1DA5hqrqIhdP5vrcNgWdRztruJ8YBbsC
-						NiuA0dJ/7ViPa01B7CdxRahAGUIc3VFLS3IA8JExlHuwyAy2YCQs7+W0ftZa1DID
-						myaovCB2VxASeOcSFk+AxnroXAhfkukp/5FM4lVI6rOAns40DaSHNw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwhc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwhc.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.nwhc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwhc.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.nwhc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nwhc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nwhc.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">nwhc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAgygAwIBAgIVAKUnamKmXgk/Lnzrnwf+feRMH4ddMA0GCSqGSIb3DQEB
-						BQUAMBkxFzAVBgNVBAMTDmlkcC5ud2hjLmFjLnVrMB4XDTEzMDgwNTEwMDExOVoX
-						DTMzMDgwNTEwMDExOVowGTEXMBUGA1UEAxMOaWRwLm53aGMuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiXdo51PeQig41pAibbuK8eFwjkmWH
-						wwlJXw7EKABKtCmOpL00UEYy7qpKg8oHdX2VN9UssKX7PtFnDCMEcS1J7V5lbTCm
-						xOsTc26qIqoPyPY3z5qKETdv9jkl6UezHanB+kG6OOZxYNsZQVmElLsTIbxiW6gT
-						caGp6LotUxxNurn+kbX+EQas4B74IRrGtIhzG66xYFhQaBHqcsghcs4wQnxAz1hY
-						aLJ+dns79/BE/MLV+rOcuqKQuRWp4qBEDEbuVA8mQVhtBZmTbxrUCv81cl0tKCGZ
-						xlc1E3v6jAHGq6sVHJu342NRkW7FCICsKww3RqMUY90G/c1XaUfUAYsTAgMBAAGj
-						YzBhMEAGA1UdEQQ5MDeCDmlkcC5ud2hjLmFjLnVrhiVodHRwczovL2lkcC5ud2hj
-						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSa5qcFRjhigspQsL6d5yEN
-						3Q9YEjANBgkqhkiG9w0BAQUFAAOCAQEAhQxixhw6sfaHJtRPtYZ9hfhQSi/p0O3h
-						PllwONLp9zTaUDvPyu5XQ+Oh0//hT8xAiyEDEYBp04/a1HAPFNYMr3uAaYSiXi0P
-						26zIPlALtOTtF8wpdd88zX4LS567vKihExhZgnJjyLhOlisw4q6PH0FTq1ope8oN
-						SyWYSxSOjXt4S2+vEJMztj7NNicN1Doa1DA5hqrqIhdP5vrcNgWdRztruJ8YBbsC
-						NiuA0dJ/7ViPa01B7CdxRahAGUIc3VFLS3IA8JExlHuwyAy2YCQs7+W0ftZa1DID
-						myaovCB2VxASeOcSFk+AxnroXAhfkukp/5FM4lVI6rOAns40DaSHNw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwhc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwhc.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">North Warwickshire and Hinckley College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">North Warwickshire &amp; Hinckley College (Shibboleth)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nwhc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Overt Software Support</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Garry</GivenName>
-    <SurName>Plowman</SurName>
-    <EmailAddress>mailto:garry.plowman@nwhc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nwkcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.nwkcollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 426a192c..00000000
--- a/swamid-interfederations-2.0/idp.nwkcollege.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.nwkcollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for North West Kent College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-25T12:01:59Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">nwkcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh4CCQCyyXWzJHWtUDANBgkqhkiG9w0BAQUFADBdMQswCQYDVQQGEwJH
-						QjENMAsGA1UECBMES2VudDEgMB4GA1UEChMXTm9ydGggV2VzdCBLZW50IENvbGxl
-						Z2UxHTAbBgNVBAMTFGlkcC5ud2tjb2xsZWdlLmFjLnVrMB4XDTEyMTIxMTExNDgx
-						NVoXDTIyMTIwOTExNDgxNVowXTELMAkGA1UEBhMCR0IxDTALBgNVBAgTBEtlbnQx
-						IDAeBgNVBAoTF05vcnRoIFdlc3QgS2VudCBDb2xsZWdlMR0wGwYDVQQDExRpZHAu
-						bndrY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						APSswRYhQiGvi0f6QdjpgZq89Y68roiF8SxRL+MQWCTfoyuKff7cgy35BeXi6NrK
-						zVAEWd96DACayN85bzMnby4Si1ntiCpyrRGDFxAoCLQFle2kiAn+n3RLnn/kiuw8
-						MDIplFabdcJf83IQy+TKZgTScqKwfwEaZgsOyMkp006BztmkzYKs0XdLZZW6FAWb
-						+9MWMMNVNwtDZkqJoUTgOlItJYzeukXA5TSNJG/oX3vGpldI+/2GwJEPZQS36qXn
-						t6C+G9TRMHbqO6F2jHdG7xPNeqU5sjlpcd0NJ3TRRYPdMd5iiSBvBdQ4TZxybekE
-						iALOike2BHXM21D85pWkr9UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAYMRQDoWE
-						B/h1NI6oa1FOoY3051eaULcGqPGNm846pdxEU17z6N3YqRWpjh8kEcYxZwPu78Vg
-						DkUKBmV9CZMxNtpjyOKWm7aXUlpcaqyuc+2QpDZYff/y0r2wMnmCQz/GEzUpCehT
-						7DJBgdVLO1d7d2Yl90VoOPxKnhIUY/ZdkHue1NYczwzBoei2id8k3id97mist8yU
-						T8+gGlFBbA9YRd4tbmmyTxQZkm2dFECh4/PdSy9Yd9mmgGUt1f7fUlJdz+mNGPJu
-						W/0kRLt8mAFvSYVo5hAsObBzrtFNrRCDSGSRycRuLHLsSPIaL8FuuIGlpjfFpYzt
-						G9+M5fDBQwR/lA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwkcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwkcollege.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.nwkcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nwkcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nwkcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nwkcollege.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">nwkcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh4CCQCyyXWzJHWtUDANBgkqhkiG9w0BAQUFADBdMQswCQYDVQQGEwJH
-						QjENMAsGA1UECBMES2VudDEgMB4GA1UEChMXTm9ydGggV2VzdCBLZW50IENvbGxl
-						Z2UxHTAbBgNVBAMTFGlkcC5ud2tjb2xsZWdlLmFjLnVrMB4XDTEyMTIxMTExNDgx
-						NVoXDTIyMTIwOTExNDgxNVowXTELMAkGA1UEBhMCR0IxDTALBgNVBAgTBEtlbnQx
-						IDAeBgNVBAoTF05vcnRoIFdlc3QgS2VudCBDb2xsZWdlMR0wGwYDVQQDExRpZHAu
-						bndrY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						APSswRYhQiGvi0f6QdjpgZq89Y68roiF8SxRL+MQWCTfoyuKff7cgy35BeXi6NrK
-						zVAEWd96DACayN85bzMnby4Si1ntiCpyrRGDFxAoCLQFle2kiAn+n3RLnn/kiuw8
-						MDIplFabdcJf83IQy+TKZgTScqKwfwEaZgsOyMkp006BztmkzYKs0XdLZZW6FAWb
-						+9MWMMNVNwtDZkqJoUTgOlItJYzeukXA5TSNJG/oX3vGpldI+/2GwJEPZQS36qXn
-						t6C+G9TRMHbqO6F2jHdG7xPNeqU5sjlpcd0NJ3TRRYPdMd5iiSBvBdQ4TZxybekE
-						iALOike2BHXM21D85pWkr9UCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAYMRQDoWE
-						B/h1NI6oa1FOoY3051eaULcGqPGNm846pdxEU17z6N3YqRWpjh8kEcYxZwPu78Vg
-						DkUKBmV9CZMxNtpjyOKWm7aXUlpcaqyuc+2QpDZYff/y0r2wMnmCQz/GEzUpCehT
-						7DJBgdVLO1d7d2Yl90VoOPxKnhIUY/ZdkHue1NYczwzBoei2id8k3id97mist8yU
-						T8+gGlFBbA9YRd4tbmmyTxQZkm2dFECh4/PdSy9Yd9mmgGUt1f7fUlJdz+mNGPJu
-						W/0kRLt8mAFvSYVo5hAsObBzrtFNrRCDSGSRycRuLHLsSPIaL8FuuIGlpjfFpYzt
-						G9+M5fDBQwR/lA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwkcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwkcollege.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">North West Kent College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">North West Kent College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nwkcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Darren</GivenName>
-    <SurName>Parker</SurName>
-    <EmailAddress>mailto:darrenparker@nwkcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Barb</GivenName>
-    <SurName>Playfoot</SurName>
-    <EmailAddress>mailto:barbplayfoot@nwkcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.nwrc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.nwrc.ac.uk-shibboleth.xml
deleted file mode 100644
index e59d08fb..00000000
--- a/swamid-interfederations-2.0/idp.nwrc.ac.uk-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://idp.nwrc.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for North West Regional College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-02T15:21: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">nwrc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFGzCCBAOgAwIBAgILAQAAAAABL9rLG80wDQYJKoZIhvcNAQEFBQAwajEjMCEG
-						A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
-						bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
-						b24gQ0EwHhcNMTEwNTEwMTYzMTM4WhcNMTYwNTA5MTYzMTM1WjCBmDELMAkGA1UE
-						BhMCR0IxGTAXBgNVBAgTEE5vcnRoZXJuIElyZWxhbmQxFDASBgNVBAcTC0xvbmRv
-						bmRlcnJ5MRkwFwYDVQQLExBOZXR3b3JrIFNlcnZpY2VzMSQwIgYDVQQKExtOb3J0
-						aCBXZXN0IFJlZ2lvbmFsIENvbGxlZ2UxFzAVBgNVBAMTDmlkcC5ud3JjLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArvwghNOYMcckEQp4ILvW
-						N1VfwOcqSwUC5Wnri1NYkuq/6z/QRNMFxxhDuhjokbAgFkHIL8s4D4uXHwwyZ1bw
-						Wj8+XbWtVKc6/E5wmcjt0yH7BiNJd03nwiXSeNV6H8SzmLG/5V5Jp/YyPMa5kThn
-						wgZzWWr+IxS2tsfhK4iulUhZR0CYQaA+EDV2uXuKLvG8c8Ql83mfaVGQjf5Vg/po
-						7yyZq475RB5Lhye0hq0VoYB7KYHNagv4Wt/Sa0OfVQh4BaPpNebl0TPL2sGkubbk
-						JaQeFEVQsEVnjF78Ah8zQxLjrFeeQxDnUJGWJfk33N4k3Ts9zZ3LbndeVaKjReut
-						DQIDAQABo4IBkTCCAY0wHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8w
-						SQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2Jh
-						bHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0
-						cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNV
-						HQ4EFgQUwz1GLmN01kUehYiAvfORDDC9X9AwCQYDVR0TBAIwADAOBgNVHQ8BAf8E
-						BAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMD
-						MEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93
-						d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbA
-						MBkGA1UdEQQSMBCCDmlkcC5ud3JjLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBk
-						HuZ6MGRLm6BlF7ZkyJurH2RtWoa+SPSRXXs+Zbb4pJLCG/tqlWaVsDu+39FGYaC5
-						EQg7cYWz9nPwAzQJUnRJTyDCM7h4cTTqtBRvECTczyyd+kUZ8mgNJwDanT3kfy4F
-						3PEEtoGi62alZsZNGZMKQf3gECv4MdP9cpzWxxravCxrff6N/lEi5TiU6V0tiZkD
-						3+1ZqEyh2XjCwJwK3wdWjcz47QBD2kqgKbbP4sjSpvhIXcSL0/juxhE54VpLWVuS
-						qE4X2h8DoUZ6A0wm1bBCNUAog0FzvPMNsQdxSPaSepkTta2BLmUxJDBG5KfkUbuh
-						LNx//xA71+LpMsQH4pIk
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwrc.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.nwrc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.nwrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.nwrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nwrc.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">nwrc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFGzCCBAOgAwIBAgILAQAAAAABL9rLG80wDQYJKoZIhvcNAQEFBQAwajEjMCEG
-						A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
-						bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
-						b24gQ0EwHhcNMTEwNTEwMTYzMTM4WhcNMTYwNTA5MTYzMTM1WjCBmDELMAkGA1UE
-						BhMCR0IxGTAXBgNVBAgTEE5vcnRoZXJuIElyZWxhbmQxFDASBgNVBAcTC0xvbmRv
-						bmRlcnJ5MRkwFwYDVQQLExBOZXR3b3JrIFNlcnZpY2VzMSQwIgYDVQQKExtOb3J0
-						aCBXZXN0IFJlZ2lvbmFsIENvbGxlZ2UxFzAVBgNVBAMTDmlkcC5ud3JjLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArvwghNOYMcckEQp4ILvW
-						N1VfwOcqSwUC5Wnri1NYkuq/6z/QRNMFxxhDuhjokbAgFkHIL8s4D4uXHwwyZ1bw
-						Wj8+XbWtVKc6/E5wmcjt0yH7BiNJd03nwiXSeNV6H8SzmLG/5V5Jp/YyPMa5kThn
-						wgZzWWr+IxS2tsfhK4iulUhZR0CYQaA+EDV2uXuKLvG8c8Ql83mfaVGQjf5Vg/po
-						7yyZq475RB5Lhye0hq0VoYB7KYHNagv4Wt/Sa0OfVQh4BaPpNebl0TPL2sGkubbk
-						JaQeFEVQsEVnjF78Ah8zQxLjrFeeQxDnUJGWJfk33N4k3Ts9zZ3LbndeVaKjReut
-						DQIDAQABo4IBkTCCAY0wHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8w
-						SQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2Jh
-						bHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0
-						cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNV
-						HQ4EFgQUwz1GLmN01kUehYiAvfORDDC9X9AwCQYDVR0TBAIwADAOBgNVHQ8BAf8E
-						BAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMD
-						MEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93
-						d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbA
-						MBkGA1UdEQQSMBCCDmlkcC5ud3JjLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBk
-						HuZ6MGRLm6BlF7ZkyJurH2RtWoa+SPSRXXs+Zbb4pJLCG/tqlWaVsDu+39FGYaC5
-						EQg7cYWz9nPwAzQJUnRJTyDCM7h4cTTqtBRvECTczyyd+kUZ8mgNJwDanT3kfy4F
-						3PEEtoGi62alZsZNGZMKQf3gECv4MdP9cpzWxxravCxrff6N/lEi5TiU6V0tiZkD
-						3+1ZqEyh2XjCwJwK3wdWjcz47QBD2kqgKbbP4sjSpvhIXcSL0/juxhE54VpLWVuS
-						qE4X2h8DoUZ6A0wm1bBCNUAog0FzvPMNsQdxSPaSepkTta2BLmUxJDBG5KfkUbuh
-						LNx//xA71+LpMsQH4pIk
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.nwrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.nwrc.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">North West Regional College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">North West Regional College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nwrc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>McNatt</SurName>
-    <EmailAddress>mailto:David.McNatt@nwrc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>McNatt</SurName>
-    <EmailAddress>mailto:David.McNatt@nwrc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.oaklands.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.oaklands.ac.uk-shibboleth.xml
deleted file mode 100644
index 6bc2d731..00000000
--- a/swamid-interfederations-2.0/idp.oaklands.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://idp.oaklands.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Oaklands College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">oaklands.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUdO1bzlupfVEClo0yb0fopDjfnGMwDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSaWRwLm9ha2xhbmRzLmFjLnVrMB4XDTEzMDYyNDE1MTE0
-						NloXDTMzMDYyNDE1MTE0NlowHTEbMBkGA1UEAxMSaWRwLm9ha2xhbmRzLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAucodVkDYoamAHb1pnAwj
-						hTGDUfEYfRWZ9DZJ6ugjqXmvh2/B7jEdX99jZUbEtPIA7YSx91DCNN09g+/AUgLr
-						j7A3zQkBhSo5iBQzDHDPoWFgeIZ/LBqsZoXQ2hPD2vLXXAEuqj+MxhfzJQGV68AR
-						L+/B8/EHPDUAuQvvZquL2KG1lRYmYXlZkXJcbh9i+2vtR3PKz0ISZyiaE2I5g37P
-						jt68wAWsHLs+xq6w1zmxmGBUf0iKdJCRKsz6U20eqmA0VBLXJQ94NwdX0tZbjPVy
-						zKgCDaMnLfkQydstKjWVPO7/t7KaGaaTq70p2B3ALk9Ev5jSSio7ar6TDKC0JXUW
-						dQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAub2FrbGFuZHMuYWMudWuGKWh0dHBz
-						Oi8vaWRwLm9ha2xhbmRzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQv
-						NciBvrHpP7NwqqSQA1bdWXPAjTANBgkqhkiG9w0BAQUFAAOCAQEARz63lm6iYeYx
-						W7FD8/S6f8uYGk2mEcLeFzRKi46K2UbDTXhmr9/aJrMgxOLg0zFFeskAuIOOX5d2
-						QV29w8EsbtwnxRvoXqB2zxTETjpSbrz/qRI2wNIoAP7hb57PHJFb/MmKoBQuLqit
-						Qf7s8JQAtu0h7U599O9a1ElArIaYRuVkHqGgQuqKumPO4aFklscTq8B93ae24NqW
-						31spO4LBxtFv7klRIlqSKRzYv+kGb/VyRfQsLrqaLMLgaXzPIVAMJODi3uanRxxi
-						7B6QbgXkTZc99kGDBYkypXIig3oxA8ZWur3sNp7GzNr+8KIPf4tNuQtfTvzhOFWb
-						5FJOqBxaVg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oaklands.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oaklands.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.oaklands.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oaklands.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.oaklands.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oaklands.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">oaklands.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUdO1bzlupfVEClo0yb0fopDjfnGMwDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSaWRwLm9ha2xhbmRzLmFjLnVrMB4XDTEzMDYyNDE1MTE0
-						NloXDTMzMDYyNDE1MTE0NlowHTEbMBkGA1UEAxMSaWRwLm9ha2xhbmRzLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAucodVkDYoamAHb1pnAwj
-						hTGDUfEYfRWZ9DZJ6ugjqXmvh2/B7jEdX99jZUbEtPIA7YSx91DCNN09g+/AUgLr
-						j7A3zQkBhSo5iBQzDHDPoWFgeIZ/LBqsZoXQ2hPD2vLXXAEuqj+MxhfzJQGV68AR
-						L+/B8/EHPDUAuQvvZquL2KG1lRYmYXlZkXJcbh9i+2vtR3PKz0ISZyiaE2I5g37P
-						jt68wAWsHLs+xq6w1zmxmGBUf0iKdJCRKsz6U20eqmA0VBLXJQ94NwdX0tZbjPVy
-						zKgCDaMnLfkQydstKjWVPO7/t7KaGaaTq70p2B3ALk9Ev5jSSio7ar6TDKC0JXUW
-						dQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAub2FrbGFuZHMuYWMudWuGKWh0dHBz
-						Oi8vaWRwLm9ha2xhbmRzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQv
-						NciBvrHpP7NwqqSQA1bdWXPAjTANBgkqhkiG9w0BAQUFAAOCAQEARz63lm6iYeYx
-						W7FD8/S6f8uYGk2mEcLeFzRKi46K2UbDTXhmr9/aJrMgxOLg0zFFeskAuIOOX5d2
-						QV29w8EsbtwnxRvoXqB2zxTETjpSbrz/qRI2wNIoAP7hb57PHJFb/MmKoBQuLqit
-						Qf7s8JQAtu0h7U599O9a1ElArIaYRuVkHqGgQuqKumPO4aFklscTq8B93ae24NqW
-						31spO4LBxtFv7klRIlqSKRzYv+kGb/VyRfQsLrqaLMLgaXzPIVAMJODi3uanRxxi
-						7B6QbgXkTZc99kGDBYkypXIig3oxA8ZWur3sNp7GzNr+8KIPf4tNuQtfTvzhOFWb
-						5FJOqBxaVg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oaklands.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oaklands.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">Oaklands College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oaklands College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oaklands.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Little</SurName>
-    <EmailAddress>mailto:mark.little@oaklands.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Little</SurName>
-    <EmailAddress>mailto:mark.little@oaklands.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.oar.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.oar.net-idp-shibboleth.xml
deleted file mode 100644
index 9776c241..00000000
--- a/swamid-interfederations-2.0/idp.oar.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +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://idp.oar.net/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.oar.net/idp/error.jsp" 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">oar.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ohio Technology Consortium (OH-TECH)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">InCommon Federation Identity Provider for the Ohio Technology Consortium, an activity of the Ohio Board of Regents.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://iamohio.net/content/oh_tech_web_identity_services</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://ohio.gov/policies/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="149" width="353" xml:lang="en">https://idp.oar.net/images/full_logo.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>
-MIIDGDCCAgCgAwIBAgIVAMDIykk/faIk0RTovrokYZYWeLfSMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5vYXIubmV0MB4XDTExMDkxNTE2MTYwOVoXDTMx
-MDkxNTE2MTYwOVowFjEUMBIGA1UEAxMLaWRwLm9hci5uZXQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDPevvM8XlI02Ts4elPWfp9oE/16BQR+YfcoX1n
-qbWOu2D3NCVNhz/AyqFWo/hKA9LewgXdwBcf9xKVsG+KvMtdVEPu1UAOL/wXFztC
-ITMGup3ZIAYzDNYz1UIVUJtdVy8fL6bfsGJxS4Fj6SJKdZi+KWH6kkmrTQOD9/3R
-vTbXtBV5T/lY+5iD9vdP3CN+mfcYe9NSTY1VpYfUPsF/4Rvz7AcuO+zJO4VxTnpj
-qjfREamPozYGF1vR5PXqMU0OWZ8i41fk75h80CtIomEj0pyBIdkg0IYDvTQFDgUh
-LtJJeo+2CtiuNvVGo+62xhktFzcSV3ecyhdDW7g5NswxxNYtAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5vYXIubmV0hiJodHRwczovL2lkcC5vYXIubmV0L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQ21xrbK7nRgX3S+6TWCpKWdI0LLDANBgkqhkiG
-9w0BAQUFAAOCAQEArAa7xs5klJmi4D5iMxj0qEU6kh8Kdk+FtYaAfsOAlzJXOoko
-5rECg6LB4BLT0n1f5EJTg9OafVXdcY0kRDFC2T5CBi/+HiZKf9zTdNJD+/x934/I
-nJdLaoxls9bDv79KxBPtZv1ThiWshGKRD69EZAG9gPTBzV50GMk1JwpYhKBLrsOb
-xm5skvrLDBVtpf7/G/S4oSHtdN1hnXOW6WGmaqnlzPpoF6bGMXMRbW0JsZXH07HO
-2z9hWgIOvL9bjEeEct7yOgbzwWZrHSvPDVHYoSyk+G1+RyL+yokUWMRaZ9YXG8ts
-nsG1QgdEewDOGQVbtLzDHtk+EBCJu03zYZHgoQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oar.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oar.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.oar.net/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.oar.net/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oar.net/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.oar.net/idp/profile/SAML2/POST-SimpleSign/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">oar.net</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAMDIykk/faIk0RTovrokYZYWeLfSMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5vYXIubmV0MB4XDTExMDkxNTE2MTYwOVoXDTMx
-MDkxNTE2MTYwOVowFjEUMBIGA1UEAxMLaWRwLm9hci5uZXQwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDPevvM8XlI02Ts4elPWfp9oE/16BQR+YfcoX1n
-qbWOu2D3NCVNhz/AyqFWo/hKA9LewgXdwBcf9xKVsG+KvMtdVEPu1UAOL/wXFztC
-ITMGup3ZIAYzDNYz1UIVUJtdVy8fL6bfsGJxS4Fj6SJKdZi+KWH6kkmrTQOD9/3R
-vTbXtBV5T/lY+5iD9vdP3CN+mfcYe9NSTY1VpYfUPsF/4Rvz7AcuO+zJO4VxTnpj
-qjfREamPozYGF1vR5PXqMU0OWZ8i41fk75h80CtIomEj0pyBIdkg0IYDvTQFDgUh
-LtJJeo+2CtiuNvVGo+62xhktFzcSV3ecyhdDW7g5NswxxNYtAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5vYXIubmV0hiJodHRwczovL2lkcC5vYXIubmV0L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQ21xrbK7nRgX3S+6TWCpKWdI0LLDANBgkqhkiG
-9w0BAQUFAAOCAQEArAa7xs5klJmi4D5iMxj0qEU6kh8Kdk+FtYaAfsOAlzJXOoko
-5rECg6LB4BLT0n1f5EJTg9OafVXdcY0kRDFC2T5CBi/+HiZKf9zTdNJD+/x934/I
-nJdLaoxls9bDv79KxBPtZv1ThiWshGKRD69EZAG9gPTBzV50GMk1JwpYhKBLrsOb
-xm5skvrLDBVtpf7/G/S4oSHtdN1hnXOW6WGmaqnlzPpoF6bGMXMRbW0JsZXH07HO
-2z9hWgIOvL9bjEeEct7yOgbzwWZrHSvPDVHYoSyk+G1+RyL+yokUWMRaZ9YXG8ts
-nsG1QgdEewDOGQVbtLzDHtk+EBCJu03zYZHgoQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.oar.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.oar.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ohio Technology Consortium ("OH-TECH")</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ohio Technology Consortium (OH-TECH)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://oh-tech.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mark Beadles</md:GivenName>
-    <md:EmailAddress>mbeadles@oar.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>OARnet Support</md:GivenName>
-    <md:EmailAddress>support@oar.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alan Edmonds</md:GivenName>
-    <md:EmailAddress>edmonds@oh-tech.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Matthew Soter</md:GivenName>
-    <md:EmailAddress>msoter@oh-tech.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.xml
deleted file mode 100644
index 3486d92b..00000000
--- a/swamid-interfederations-2.0/idp.ocvc.ac.uk-entity.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.ocvc.ac.uk/entity">
-  <!--
-		This is an OpenAthens LA IdP for Activate Learning.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-19T17:55:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">ocvc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaDCCAlCgAwIBAgIIJK53AJuGOYowDQYJKoZIhvcNAQEFBQAwSzEpMCcGA1UE
-						CgwgT3hmb3JkICYgQ2hlcndlbGwgVmFsbGV5IENvbGxlZ2UxHjAcBgNVBAMMFW9w
-						ZW5hdGhlbnMub2N2Yy5hYy51azAeFw0xMzEwMjgxNDM5NTVaFw0yMzEwMjgxMzM5
-						NTVaMEsxKTAnBgNVBAoMIE94Zm9yZCAmIENoZXJ3ZWxsIFZhbGxleSBDb2xsZWdl
-						MR4wHAYDVQQDDBVvcGVuYXRoZW5zLm9jdmMuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCNnm5Z9gl6f4YR2HJAHY8ne53sVj4L+PL4orRT/cG/
-						CcnldjJRFOEdeJhK53/Gxdgoxt0gtZulIfTofGOPskBu+rr1OWJWW2VeAP2elp2r
-						+Tl/aNjFiMhBriKhAZJJpm1kcZkjO7sYrVvMbreVS0/9y1GuoKKfO7MjIZ5Yxtnq
-						XyimprbRsgNFxxE/B+BWFEsLwsJjhxM6puGOBl3x+3oyfBLDP4qPThG+isa1j/fj
-						8Z3vG2XFfcYj+KvlSYm6IEI/M7V8Eq7tOCPk+4y1fuEMFB1f/M9FgmX4McwhSFMa
-						sjcRrGeXZdPawGqcGv4rgvPcj0frRbMVqWl1JZtqc1Z3AgMBAAGjUDBOMB0GA1Ud
-						DgQWBBSMitszDAvNeoGk0O7s/xrD8Eys9DAfBgNVHSMEGDAWgBSMitszDAvNeoGk
-						0O7s/xrD8Eys9DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA0WOY/
-						phQvI6UKEiIkjS2B9lDB29bR8LFB1AiotU9y3a1ynTzXWDwxHtEpR+kuSC1qgpOI
-						HMqNSsUTvAKs36pPk4/esCCUzdbG2i+6oIEyIykpULBX0zR+XzXPhng8HQCStcGQ
-						U5IsgVzitMO4UlmdF4GiVGb+OCd/pydtBpb2oRK53/x+dW5p49XPN8HjoqpF1tMV
-						uQBLmqpPooVlHC3LZnFRJ9bo1seEpZwBzVdTWaGLRXQu3Hsa8vGZTtefRRPWlPdA
-						8xu4ferryExDoB95D0cLivnE73eO8QlsbdDVjfYRwHDvx3VFWFOwuiDakNE5ZLj8
-						fxjatX0mFmoxpNUu
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.ocvc.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.ocvc.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Activate Learning</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Activate Learning</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ocvc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Support</GivenName>
-    <EmailAddress>mailto:athens@ocvc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:ithelpdesk@ocvc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.okstate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.okstate.edu-idp-shibboleth.xml
deleted file mode 100644
index 446d07ce..00000000
--- a/swamid-interfederations-2.0/idp.okstate.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,163 +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://idp.okstate.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.okstate.edu/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">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">okstate.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Oklahoma State University Main Campus</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Oklahoma State University System</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.it.okstate.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://stillwater.sharepoint.okstate.edu/Policies/Shared%20Documents/Family%20Educational%20Rights%20and%20Privacy%20Acts%20(B</mdui:PrivacyStatementURL>
-        <mdui:Logo height="130" width="200" xml:lang="en">https://app.it.okstate.edu/osucalendar/images/logo.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>
-MIIDYjCCAkoCCQDzMip1XDG8GjANBgkqhkiG9w0BAQUFADBzMRgwFgYDVQQDDA9p
-ZHAub2tzdGF0ZS5lZHUxIjAgBgNVBAoMGU9rbGFob21hIFN0YXRlIFVuaXZlcnNp
-dHkxCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhPa2xhaG9tYTETMBEGA1UEBwwKU3Rp
-bGx3YXRlcjAeFw0xMjA2MTQxNTQ1MTBaFw0xMzA2MTQxNTQ1MTBaMHMxGDAWBgNV
-BAMMD2lkcC5va3N0YXRlLmVkdTEiMCAGA1UECgwZT2tsYWhvbWEgU3RhdGUgVW5p
-dmVyc2l0eTELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE9rbGFob21hMRMwEQYDVQQH
-DApTdGlsbHdhdGVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6Qb5
-pFa2CVE2rTeap0uYEBoJI0q5f3jpHwB/IysHTgDFtO337l4uQbkRBiQamZn/nUGb
-ZwDwB5g/miUNnM+b8UctbiRQ5cbQ9UEGiFDipFklvXci9qTd4954VQabtq09FKx8
-AfKu/fjCL5xJfrkc8+1CY431sYBeVS+EfR1bZv3su0A30HTSK4IhEqrzo3BQbTxj
-es1JOiFNseF7SUqmdqsbSj4HsHjNwaLDEdF5zXuCgUL+USeMkGAmd4e1PXooTGgk
-MP2MiMuNDpHhG6aAbEncEgaFLLums48SY2qjIk3obihjRnU4oppSARom4h0paBkc
-P3TtfPT8vaPvZWUYyQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAMEZIYHHXV/XoO
-A3f7isi1nUY6wTbmifIIAxVFRzKifbAKOjj9jVe3/Mi0dEDXuYTSrEbDgLtmLrxy
-IFmvZopmpGPQQ3BcNzsL+NsKju3DIohXnacuAax4K76a5rVqPu9KlmClSJmr12lB
-/MX45xmrb5jYIkwsG5aSgHJSbArDz9h0cwwOCcExthvp5Brb8F5J3/APluyg0hYj
-pvucaNe/bhjtGVNcPmVkJ2bTzSOlE49icSRuDbc2bkZEqTPdBpSL6b+vKMTF+tDP
-A/br3xw5PtPDxp1uBcpZFuJ6GElZj2vUqXAt+l37NZHicQSRhMzGitXpTcO7OU/g
-7+8OWNW+
-          </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>
-MIIDpDCCAowCCQCjRgnERKTgvDANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
-VVMxETAPBgNVBAgMCE9rbGFob21hMRMwEQYDVQQHDApTdGlsbHdhdGVyMRAwDgYD
-VQQKDAdPS1N0YXRlMQswCQYDVQQLDAJJVDEYMBYGA1UEAwwPaWRwLm9rc3RhdGUu
-ZWR1MSMwIQYJKoZIhvcNAQkBFhRoZWxwZGVza0Bva3N0YXRlLmVkdTAeFw0xMzA1
-MjIxMjAwMTlaFw0yMzA1MjAxMjAwMTlaMIGTMQswCQYDVQQGEwJVUzERMA8GA1UE
-CAwIT2tsYWhvbWExEzARBgNVBAcMClN0aWxsd2F0ZXIxEDAOBgNVBAoMB09LU3Rh
-dGUxCzAJBgNVBAsMAklUMRgwFgYDVQQDDA9pZHAub2tzdGF0ZS5lZHUxIzAhBgkq
-hkiG9w0BCQEWFGhlbHBkZXNrQG9rc3RhdGUuZWR1MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwXKsNMBp5tdIbc1ZYbWy3AIKP3FbTjwLt8JU8Or5fnyg
-yOAxWZ9qSkaEoUNEJ+hF3pddckzdDoFXFu/iT5iNXSkb0fu1Z3TIq2L8ORzRuXmu
-XKaVjCzejeeitlyE9yDvXFQjT+Nvhi4j9PLzZ6cC6KW/fnOIdzrYUd1Gmrbu9bxe
-UXZKOn3u8foDeNmoG7WtmXwOhz8NemtMcEZ1L0VZugPqWQtyxCO7x3TeYwuS/4Te
-M+IqYeezWRhfsk7Vpamtgbfi9VMylC3cquE5f5/P24mp1AQuly81KZ9TZh4A9Mz6
-xUZfV7d+xQlQLimOmd5lXM1En4VhmPFfyfS7s1fWiwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQC48jGan3mFH74r9/cDM44TbmS1LoNbe4ybvI50MgzvV055JRF/nVyf
-5oXYMTytnUCw8xh5IbQbbZnnxN1oJUD7CDcJ3j0alKx8/wsUQeCBnS5LN/WeBiRO
-0fEwOi5tmz7n0O6wQbu9psFPG2yl5Khj/jHYRVxQXwMoBMmrpxUG5Ha0UAoIPM8X
-QWUdAUmhN1oD6YxKK3Bf9pQ2Sinafdsc4k54wvfMZCQkH1f37Pll/cSQCSFxEDKX
-IUS69CJRUBfftvG82kYGdEO5y+FAWBuLyya32MVwWKzHOqh6Q0iTbgEsfWsQL7KU
-aVziUIOjv/nrHap+xcHajNL7CKlXwKQ4
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.okstate.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.okstate.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.okstate.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.okstate.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.okstate.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.okstate.edu/idp/profile/SAML2/POST-SimpleSign/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">okstate.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYjCCAkoCCQDzMip1XDG8GjANBgkqhkiG9w0BAQUFADBzMRgwFgYDVQQDDA9p
-ZHAub2tzdGF0ZS5lZHUxIjAgBgNVBAoMGU9rbGFob21hIFN0YXRlIFVuaXZlcnNp
-dHkxCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhPa2xhaG9tYTETMBEGA1UEBwwKU3Rp
-bGx3YXRlcjAeFw0xMjA2MTQxNTQ1MTBaFw0xMzA2MTQxNTQ1MTBaMHMxGDAWBgNV
-BAMMD2lkcC5va3N0YXRlLmVkdTEiMCAGA1UECgwZT2tsYWhvbWEgU3RhdGUgVW5p
-dmVyc2l0eTELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE9rbGFob21hMRMwEQYDVQQH
-DApTdGlsbHdhdGVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6Qb5
-pFa2CVE2rTeap0uYEBoJI0q5f3jpHwB/IysHTgDFtO337l4uQbkRBiQamZn/nUGb
-ZwDwB5g/miUNnM+b8UctbiRQ5cbQ9UEGiFDipFklvXci9qTd4954VQabtq09FKx8
-AfKu/fjCL5xJfrkc8+1CY431sYBeVS+EfR1bZv3su0A30HTSK4IhEqrzo3BQbTxj
-es1JOiFNseF7SUqmdqsbSj4HsHjNwaLDEdF5zXuCgUL+USeMkGAmd4e1PXooTGgk
-MP2MiMuNDpHhG6aAbEncEgaFLLums48SY2qjIk3obihjRnU4oppSARom4h0paBkc
-P3TtfPT8vaPvZWUYyQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAMEZIYHHXV/XoO
-A3f7isi1nUY6wTbmifIIAxVFRzKifbAKOjj9jVe3/Mi0dEDXuYTSrEbDgLtmLrxy
-IFmvZopmpGPQQ3BcNzsL+NsKju3DIohXnacuAax4K76a5rVqPu9KlmClSJmr12lB
-/MX45xmrb5jYIkwsG5aSgHJSbArDz9h0cwwOCcExthvp5Brb8F5J3/APluyg0hYj
-pvucaNe/bhjtGVNcPmVkJ2bTzSOlE49icSRuDbc2bkZEqTPdBpSL6b+vKMTF+tDP
-A/br3xw5PtPDxp1uBcpZFuJ6GElZj2vUqXAt+l37NZHicQSRhMzGitXpTcO7OU/g
-7+8OWNW+
-          </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>
-MIIDpDCCAowCCQCjRgnERKTgvDANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
-VVMxETAPBgNVBAgMCE9rbGFob21hMRMwEQYDVQQHDApTdGlsbHdhdGVyMRAwDgYD
-VQQKDAdPS1N0YXRlMQswCQYDVQQLDAJJVDEYMBYGA1UEAwwPaWRwLm9rc3RhdGUu
-ZWR1MSMwIQYJKoZIhvcNAQkBFhRoZWxwZGVza0Bva3N0YXRlLmVkdTAeFw0xMzA1
-MjIxMjAwMTlaFw0yMzA1MjAxMjAwMTlaMIGTMQswCQYDVQQGEwJVUzERMA8GA1UE
-CAwIT2tsYWhvbWExEzARBgNVBAcMClN0aWxsd2F0ZXIxEDAOBgNVBAoMB09LU3Rh
-dGUxCzAJBgNVBAsMAklUMRgwFgYDVQQDDA9pZHAub2tzdGF0ZS5lZHUxIzAhBgkq
-hkiG9w0BCQEWFGhlbHBkZXNrQG9rc3RhdGUuZWR1MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwXKsNMBp5tdIbc1ZYbWy3AIKP3FbTjwLt8JU8Or5fnyg
-yOAxWZ9qSkaEoUNEJ+hF3pddckzdDoFXFu/iT5iNXSkb0fu1Z3TIq2L8ORzRuXmu
-XKaVjCzejeeitlyE9yDvXFQjT+Nvhi4j9PLzZ6cC6KW/fnOIdzrYUd1Gmrbu9bxe
-UXZKOn3u8foDeNmoG7WtmXwOhz8NemtMcEZ1L0VZugPqWQtyxCO7x3TeYwuS/4Te
-M+IqYeezWRhfsk7Vpamtgbfi9VMylC3cquE5f5/P24mp1AQuly81KZ9TZh4A9Mz6
-xUZfV7d+xQlQLimOmd5lXM1En4VhmPFfyfS7s1fWiwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQC48jGan3mFH74r9/cDM44TbmS1LoNbe4ybvI50MgzvV055JRF/nVyf
-5oXYMTytnUCw8xh5IbQbbZnnxN1oJUD7CDcJ3j0alKx8/wsUQeCBnS5LN/WeBiRO
-0fEwOi5tmz7n0O6wQbu9psFPG2yl5Khj/jHYRVxQXwMoBMmrpxUG5Ha0UAoIPM8X
-QWUdAUmhN1oD6YxKK3Bf9pQ2Sinafdsc4k54wvfMZCQkH1f37Pll/cSQCSFxEDKX
-IUS69CJRUBfftvG82kYGdEO5y+FAWBuLyya32MVwWKzHOqh6Q0iTbgEsfWsQL7KU
-aVziUIOjv/nrHap+xcHajNL7CKlXwKQ4
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.okstate.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.okstate.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Oklahoma State University Main Campus</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Oklahoma State University System</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://osu.okstate.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shawn Harpe</md:GivenName>
-    <md:EmailAddress>shawn.harpe@okstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tina Meier</md:GivenName>
-    <md:EmailAddress>tina.meier@okstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Raymond Smith</md:GivenName>
-    <md:EmailAddress>Raymond.Smith@okstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.oniris-nantes.fr-idp-shibboleth.xml
deleted file mode 100644
index 24bed3d0..00000000
--- a/swamid-interfederations-2.0/idp.oniris-nantes.fr-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.oniris-nantes.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-11-13T11:01:44Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oniris-nantes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ONIRIS</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/ico;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACAklEQVQ4ja2ST2sTURTFf28yzUzmD4mTWoi2UVFapOBGEDdCS+ln8bu49RtUEPeuLIKgCwUJ7Uaq1do0tRiapH8y0+Zl3sw8F4lJUKiLelaX9847997zjtBaay4B4zKP/4uA+buY3EQIMarTTCMEGBNnf02gNWzshTx9vc/H3S6TrnzYPmSnGY6a/GmZAXDWT6i3JY+XrrNzeM5pT43IlcBHqgytNZv1IzbrR8O74bRaa12rd6kGNj86J0QSzKk8nw7OyJuCq45gsVri+fsmK4sBZS/Py40W9+Y8lu8Ggwl6cYrISfxSk4fz07RDRaVk4dkm08UCfZVRLduU3TyhTJgNLB7NXxmvMFc2ebH1hFn/Do2OpOiYlByTom2SMwy+NbtM+3kQ4ORzaA1vvxyPBaqBS6Vwn9r3mDdbxyxU3JFJcZIyU7Qwhp+g0ozbMwWifjoW6J4nLPjL7LUiHtx0aZ+ekyQKdEI/VuQQkKWcRD2OQ8m7z22uFc1xDr7WDzjoppiqz+7PPkKAbdmDHACNbkiapcjeFFEUMedZTIlsLGDrM063a/i+T5JleJ7HyuoqhmGgteao0+HV+jpOoYCWklApTtQNuLU0EBBCoJRCSklQLrPfaPBsbQ3HcUjTFMd1cV2XdquF67pIKclb1jgHk+nSWhPHMdaQcBGEEAOBfzIvwC9GKvSMrFiGLwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.oniris-nantes.fr/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Teachers, students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ONIRIS</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Les enseignants, les étudiants</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>
-					      MIIDPDCCAiSgAwIBAgIVAOz8cFkBTLbxVln29ynPAKgeQJHNMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMMFGlkcC5vbmlyaXMtbmFudGVzLmZyMB4XDTE1MDkxODE0
-MjA1MVoXDTM1MDkxODE0MjA1MVowHzEdMBsGA1UEAwwUaWRwLm9uaXJpcy1uYW50
-ZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCN+nrKBD7GWB/T
-aJGUh8V98CXhBXVcZLdOvyssCD7FmjDISGEimgaAFRCnExN+0XoZWutK37Mthtn7
-fAPFF92sucimPRluwEFniPHyHGd2Fl1kP5NJM+I0SfyYF/QH3yg/D9ZVd7x4XLFL
-EnH3aPxL+cmUcdAcct26PuvuKiUDXPnAALgUwDaHHN/sPcgmXuJbskka7fzN9eZI
-XAzjP+pHnqZI3gBujQmUeRf5FK12mEcNdL+gYJVjUhnpOj9bgnIA9gB0yxtd+wXo
-zwNc0w2rbu3EuSo58izreXEaiy3CFZrhB+sr8GRqV7YUdNACuxZhRq1PC2rqbdZm
-rd9LylwxAgMBAAGjbzBtMB0GA1UdDgQWBBTZTZo/XqVYLds0PI9G9SObpiScSzBM
-BgNVHREERTBDghRpZHAub25pcmlzLW5hbnRlcy5mcoYraHR0cHM6Ly9pZHAub25p
-cmlzLW5hbnRlcy5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
-QZvGx+m1HA5knbytovMAYLsstIryni09aHxCdP99Ak++pSXWTevvb4DukifIKgfv
-U8vleBoAortLhq+25dAZUsDL45st8tHx2umUOR/0xrujAPzMetZ+eFt1YdgYH1f+
-7d6IVwhObN7FiaV+/D+WZ40eAZT+3nY8V+XnpkP5H6rrauZ7RIJVjGXUW1PuNnAT
-yfFkeSjliStwTQZGY6qn28he9NDqOq7M4ye6zihzbtSa0Md9bYS/OlJHU7UNqbaD
-ujowHlafOBa/eC9WGKT2m2VT2yjF7opAf0d5Y+rIgM4pDglCV2/p9Sz5GGGbO1Fe
-ZKXiB3CTQrnXASQ6EfUC+w==
-					    </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-POST" Location="https://idp.oniris-nantes.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oniris-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.oniris-nantes.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ONIRIS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ONIRIS</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.oniris-nantes.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Didier ROY</md:SurName>
-    <md:EmailAddress>didier.roy@oniris-nantes.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Gregory LEFRANC</md:SurName>
-    <md:EmailAddress>gregory.lefranc@oniris-nantes.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.os-selnica.si-idp-20131118.xml b/swamid-interfederations-2.0/idp.os-selnica.si-idp-20131118.xml
deleted file mode 100644
index 8dec7f39..00000000
--- a/swamid-interfederations-2.0/idp.os-selnica.si-idp-20131118.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.os-selnica.si/idp/20131118">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-16T12:12:11Z">
-      <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 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">os-selnica.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Primary school Selnica ob Dravi</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">OŠ Selnica ob Dravi</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization Primary school Selnica ob Dravi</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije OŠ Selnica ob Dravi</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization Primary school Selnica ob Dravi</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije OŠ Selnica ob Dravi</mdui:Keywords>
-        <mdui:Logo height="74" width="300">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAABKCAYAAAABp2mGAAAtl0lEQVR42u2dCXwTZfr4B5SrbUKBXjnaZCZHBfFEzh6gKNCmXruL6291/7KLy891ZX/igUBzeK8KAk3xYJXTCys0LWfTilWO0kwCiHghckkP2qQtZ+9k/s+bArbJzGQmRw/N8/m8n2iZmUzemfnO8zzvc2BYWMISlrCESBIL7hLjJo0OL9CUw7hImDT7ZQWZj2JrpgwOz05YwhKW3iPbMwbJ8zNewAuyGonCLOrKQP8vN2UapHkTh4QnKSxhCUuvENnGGbNBq2ruDKtfoaVplxdkLgjPUljCEpaeFzD58EJNPR2sOkHr+/BEhSUsYelxkeTNmMgGK/co0LRhM7FrwrPVh2Xcq5+PmLik7LoUY/mEiTnk1EnLybGTjDZF8ut7BOHZ6VtCYVh/6nf6QMrzMxf4BBYM6cYZN4bvlD4oE17fNzI1h1yeZrR+m24kf0nPtdbCOJu+wlqTtoI8mZ5rO5RqJF8a+/JXieHZ6pBz86TDndkqrVOvfJWaJ+01Dlxq7nBhe7byr06deodTqzK365V/peYn/65eOLhJs4MLsOT5mkfCd3JfEYPh2rFL91yflkNumLzC2jx5hY3yNQBirrRccm2q8cBN2My83606nYdh1zj1qg8pvdpF6ZNbnVrlaz2tzVBzRBFtC/F7nHr1acqQTHUd6hqnTvlWm1ZxB5UtlSDtq0dvPfj++mHE0NpYeUJDglxeH4ffWCXC0+oSkkbVxsZGBXJstPqHF2gquQErMycMgj4CKwCVDgB0mguoukBrhc0FGtcvoInljH2DTPg9Tl/7QuWfEKiuAkGvbnTqVIupKdi1PWT+9QNo/gudhzesfh0uvarRpVd/DZrhmrZFyru7G7J12HBhrQR/wCEhVjukyi8dEoUNxo8w7DDa4W+VdrGiyCGW31uK+TeXsnzNSLwwq54LsABsu36/EMiDi5/X+30GY98oTQDYHOQLKnqNi7SMfRPMRIOhf2/9vZUxMckOMbG6Jk56Y5Dg0B/gZKEDQrtO+RSCR7cDy4BdC1rUe26NjwVYXgDTqesovfJ5aoFcTj0THxmKc0fHbIiWRzvE+Fy7hLhYJ1VSPodE2eYQ4Yv8gZasYEYmAOsSJ2AVak6JNo+J+N2xSrrlDgmen7FYtiljEdYDNyxXSVluTU43WncFA1adoFWVllP+IG9o5ZUMjdxWdkNEUVlWVJHlMcEOy+zBxeRkbEuZJFi/tyE6QQ4PSRV6COAN/tOpoUnDAj1my8KkUaCl1NJrMOqjzc8mKnpE69MpH4VzaOMDrF/PO/kipVPvBLPxBSpbPiFY4ILjDKxNkM+Ca3CwTqJwcoLV5QHXq9Euwv/BG1imjCcAWO3cgJV1Rpo3Xflb4RDnBxAvyPwML8hywqcVW9o7I2hvW74nOS2XrEUmXVCBBcdLy7VYxhvLhZxOZKVtQITZohUU2xqFJbYWYYm1TVhsc8J/t8NohdEsLLaeiDBbZ2OlpQGlUNgTCAM8KK6rD0EC/q+AH0K9IsNlSL5A+/CDhuPUq/J64vqemIUNdmlV+/wBVifgulwG9YV2reJ/g3FOtSJiOcx/Kx9QeUDrLEBvAA9C9pMXaJZygdVlk/BsYsH0tD5PKpmpI0oWz8/8KnHTjLFM28WvnxYp35S5vBOxDwnzpg/vbb9n/PLyeNCsSO5ak7U1fYW1nQe0WlON5J1cziXSbHsIgNQ6tMRG+RqCYmuloJh8J2q75Q6Moni99c/Ex8fBw3K4ywMgJnbZY2IEgQFL9TdXZ/8VvWn4cE9c57q5mBDM1U1wjo0BgsvRvEDqt+ZRKRLFOMSKT/wFVedxNi6J4PzFK8cMgOd2Cw9gNeGmzAf6vomHwvoLNS73QFpTHjbQ23GN9U/Kz3wWfnRrpwn4ASVc9rbfk5pjuT8919bEDh5rM0Dn00nG/bMmLi27YWJu2Q2gOd2XmkuauUArLYcs53IuUWbLRi6wujJA43IB4OoFZsv2qK37RnIHlnw8AKu9q29Ecao+PnF0IHPp1KkX+fQV6VUHG7MVPRICQhlio9oWKTLgPH8IBFoAvhf9PQeAVS7Md2ugsIIXjJWPH0uOItwLND9yBhY833JTxpN9Hljx+dPi5AWZBVd/nClzpyR/6ojO2yRunDEdJqf+ckKlEzdpfpLlz/hD7/NhGfqnGa0lzNqR9Wx6LrluzJKy6+h3R/vvnwVa1wlf5uRtS3cTHID1Mh9gdYEXgCuyqPyZiE27RL6+pyZONpHGxDiJls4DcSADjN7moKG0oFionrzq1PwYAYW0LX+ApVc3g1l4nx+aVYRdLH8+YM1KonDapcSu0yOkvPyZUrBuAELNXIHlDm0oyFzam/3OnCWucGq83JRp+vWHZay8sqIgz8+YDLA6c/XfTJnbRfl3juyNvwNFrCOTjcH0a5y0nHxYaTw6yMft3y/NSE6G7atZTcOc/T7V64Fb944Wllhr/IZWidUlMFvLIovYTVBHAj7O+2FQHD0X67+pQ4FWDTD6hOMKnCUY1691gXy8U6t6GwAyF/mp+GmDSj2rFqVVb4Dz/L6zxgi/r9mpVy/J4xnygGLT7GL8GXgpNAesWUmIDyqGS6R850q+KXMGH1i5n91CzSZkLf0mvO7RpinR8gJNUYdpqGlP2pjxf6BpqZGvyq1OFmguyvIz38OMykG98xe4QbOVwQS8MIGj3+mq4/4/uwk43s/pK/Y76YFlfdm3n2HlgKhi6wpk6vkLLTe4zOSnbF9TJUq8jWa5/IeqaJEsEGCBqfQRV00FtKyZAWlzWiILgNLcofUkt6KwCT7HaNepHmM/P/UTKJzBma1cAN/zI4Dx4zatcopf/jPQaAFWl/zVqOBlUgeg+rxWhKf77XsuyHyDL7AIU9Z+LG/mbycIOm7jVALA9NVVJ12hxgLAcqo2ZtZPeO+uf/dmOqe+aVGjNBu6lb1Uo2WV3MB/FW7ikrJb0nNtH4GZ+SN8tnTS1k4jbY6TH6tk/0hhse1sIMASmMn3WVeoYmW30GhYh+0xMlFAEDGo1/CIc/qGWuBfKEVbNp7u0qnOdPUrqX+g5nBfNWvXEn/w4afSXtn26FzM75dubaxUZUfmNj9IuWCf8w6JshxAl20XEbfB/AYEDrlJs58vsFBVB+Ss/80A60y89Aakot6dM/VqbEf6e3dRP4y+zj3xKMakRoT/9QSG9boqhum5ltl05iACFnKsB3r8m5eVRqcstdyWspS8HjOU8gvyyysbDtBZDJrSBf80LMsydh8WfpO3qaE8eF4kigkEWACN97j7g9SXKL3iXt7fA1AC0+wA/Qqk6t/cNUJ1Kjuw1G8Geg+cwOSD7RLlRq6gAkidgGdmaXWCfPJRDAuaZSJamRXBW7u6PCQbpqr7NKRsGDYAJnRKnYT4zCHtsMmtY0ZS9y69nXpiYSr17Q3X0VwIos4hJj62xyfdHcwL4b+v3dAftJ5cOtMNtKsfek10euEeQURR+b1CZCaayf3CEmsTF2BFlVif9/WiodGwyLrhw4WBAIuL071LXJZOlUPx1MIb50ukLJBxcD5fLaHy4cN6P9DLV5OA/z/QkFgi2BWtDrFiP4zFVbGJaYFqUUyCwo/8BRaOyib3ZamNJ54E+NR1eTvD+FmtpipwFauaCxfvQo1YcQDe8HdRPbj6MGalbUBaLllKC6wc8v963aTn5V2D5X8+YsgOy8RIMPcAYOfZY7RsT7M63UfIRtKsEpadxrAhAQHLoH6LZ3jAEb7VHFp0+E0sK5CVnM/3uWFD2YGq3BjIJUMLGPCirmdJsblgFxOPnxMKh+dhoU1bk5syZ/kNLJPmgz4Jqo6cJ+V/HDzTCBiidM84eC7LBlMmzisbkp5L1tIBa9Iyy8RefzGKwGTcYZ091EyW0mpYZnIO2+6VMeJkr2siVewK5A3PCix34rGaNjWmbYFiBi//lT5pKguw9vE5Fmx/iRmmyp2BzEWtBF/HDCuirkbEPzTCb2AVaPQBAOtkaM9uSmnQs+JRyQuHGF/sK+ANbPBGgNF5TtASEQt76nmftGKvLD3XRruaNz6nXNVXXiIRn5NjUcqON7CsD/pwBCtpXiIlgZwLG7CcWuXzAIA36fL5XHoVL8i06/AHWEzCT/kciy2A1KVT2fydi8rh4kSYz6MML+vmOpF8TnfeJ7gp879+A6tQ4xJ9PCUmeGeTR12Dra6OxdaemYqtrdqMratqhvEVjGxsbU0Ktq4yCVtzIhqbSV3j741YnSB7nEmzQjY6wOwtxwjRde5Kjhh2rT1GOsUuwvMcLBnodhHxTY9pWMYDk5nipUa/Uh7fV4AV9Xn5KDAP6zyBFVFk0bDtdzZehntej1qxoiBUwGpbhN9FPS2KcepVB2kBoSNu4A4s4jEWE3MxP2Apd7Ac62d/58Iuxu9GJh9ThDqqddVtN4kxYxBRqNnkC0yKzRrGf5PlzwiS1ZFXGwWgehnGAWxddSu2/gzVZaw70w5/r8DWVu+GsRpbe/ohbEXFCF4+q1ipikmzAlh9gy4OXRJmGSYd4oiT34eWy+n3VbadGjp0WE886JOWkbOYgDXRSE7uK8AaVEISoGEd6xrxbnNG7bBO8QmsTonPHdcDXx8yYGnxaW7YaJX/pF3d0yrncYeMSsucp6h+ghewtKp3g+HA9wYW8YLn/F4ZNSJiWXcWCZSbpkTjBZov2GA1cksmNf2LycwBpKbMWYGfyaqKm0CLqvaClM9R3YCtrXwBm2PjFF/hECueoJv4eomiCt4UN/vaH1VMhG1PeV1AlGIQESPqiQc9xWh5gglYKTnluj5jEhbsEYOGddAj2r1JsG1fCtt+ZzqA1SWXsFZEvB0qYLXr1fejbc4/LYiBbZw0+YV5386kyUmlB9YyJsi0aZX38NOwFFrWsAs/i/iBZbGZ2bLAuzUtSbZpugiAdZANWLPLx1GLvr6RDVivBnYWa8/cA5rTcf6w6qx9VRVja6rl7DehfHCdhMijWfE75kiQjuP8xolJGgMX6hUwA/PqxMQeVDmxJkH+z5560FOWkQ8xJiobLTv7CrCwrbuHCYptXR3vxdbzwiLrOL7AqhHjb4QMWJ1yBwE4u2jgcIjKVnNahHHpleuZINO6yPcLtIt5qVX8gxVYj/tXktguUfzCBKxAotX9kaSNGgKAdZINWNurRNTa4zilZDAL5SbNx/4HkK49MxtgdSEgWHWYi04wE/PZvqpOLE50SLs6D1G5VlR4zM+beiAqYVKJiXq0kuGEZfsyGIGVa2uZ9M6huD4BrM22CKGZ3NoVWOQ5YVHZOPYXiETtqfHWShS6EALr8V99UKpnaFb3mloXyW7lpBXplduZIIOaX/A5Z6SRscSJNVILE2L5zsNxLDKerSDfL3HdW8QwafPd1xMmzTkmWI3amkG1uvpRX9bEUqO3zWAqNVOKTEs/YFU9nwlW135wmpq4fQv1/NdPUR8fv49698jD1O3mz6iIj46zaVkXsKWnhzC/iaU3wOQ3eix/H7OL8WSsD8sk414FU00rd2pOjrX71PaVmyMiSqy3RBRZsiKLbdMiduwdi5nNkdx8mGVDhMVkgYeGdVFYUj6BFVg0uYRgEj4ZMmBpVc9e3W6hciIA6jxN3BOnVWOmEswoMZnvObfq5ONZNKymxueIJL7HrI0R3cq2On5aKOzWmnCyz6ZNQit9TMB6cM9EiqIw6sTFSGpc0V1MwDoi2ZTBM+F6TdVjoBVdogPPNesrqBe/nkfVNI5wf/mVUd8spHZUTKGiPv6ZGVprTjM6aGsT8D/RmIN7TkRHR/dlYKE8wTQjWcFcJZRcO8rw7cCQn8j2XbGgIW0QltgqhcW2FgDOJfisFhZb90aYbfdhpT5CVLZvHyQotm7i78NKmup1XcX47FABq3P9KCpbkejUq7/x3iZ5PzeTUH2MoYlENd9zbnpaJGMDVvN8/i/m6vikLJb4QxeFdW9vA1SEj80cfP2769ysQFrWNAbHO16YdR4vmMFjLt7/ZTRoVg00DnQqcaOV2ls7pguoPMfKnx6iBn14kglYjMXIaiX4KzTLsmZepVl7oYyZYxsAwPqcrRb7pGV7Nb5LywQmArN1MVNlBrTaJygitw0o3nszlpdHD8/d3wwDYH3pURerTVC0n7W0rUMku987rEH+55ABK1t1NbcR5QIy1aJqWiCXcwDWWYZkat7t1SkwIVF9Lqa6V62LVDfzPaZdJJ/DEjBa3933OqrjzgSr67ZkUlsqxFc5sejrGxjBhmrccZxVqh+Ygi8AXNo9YdNvfRW1+ugDVLurPyuwzrVEUn/6ciU9sNZW7nTHctEBS4zn0Lwltudhfb5rbj/Qol4EbcrJUrzvYnqOZeVNS3eGJiLfYOgvNFu/812Yj7RHFZEfoJxCzHyoi6ko2GZRDy2xVnhWIY0qPsAamuFIkD/iBawEWWboNCz1e12c3TrVv/0Jb0CrdgASJwNg9vA+Z4M8GpU8ZtCyWlp1St7xR3YxYWBcIRQTP3a7NWHKNDBBCJmA358TXuVEUVUCW2PV17h943oqErSrn+hg9Y+yN1hB1XmYTk1nCnP4EVt3mvahdIjlr9EAq/RMfHxkHwdWR/G+XOt5n+WNc60/j19SPgpVJw06sIrIYzyrijaA5rU9yky+JCiyLAIN7b90Glrk59a7WP0sYsVcbx9WYlrIgKVVb+i8bctC+XV0pZRROgxbMjTq3Mxiwm3hDyylEM7jJBOwUHNV3sCSKFayhDR0e68/vFCTywShO3dOoZqdvyo759uuZQwglRdoDnL1XT1FZwpm7lxPtbRfyxlYDc0CSvjxEbrVwl/cJift2wJ/liZp83sUTNrXgZXy+h5ButFygGPjibMwnkclY4J2AqA5C81kUSB1r5hGhJm8m9WHJcK1nte1IVZ+c+iApdrqqeE6dapvaRznP1Na5lW0S/MTxSx5hOv5Ays2itKrDtNrbMmtlJbgrXXWillisCTExu6+zwmT5hMmYOkOjfbihObLNCbHe3ts3hQfEfoouHNN1TlPyERvOEJ9XpXKGVZXxiN7ltEAq7oGTE7aZfC6ePkEr5Qc1IVWQvyIVhD7PLRybLdz75Zja0vLIU9OWhG85OhIs+UR0Jqagw2sqGLbTHazBX/DS8MKoDyyL2C5dKovvbbXK5/z2g61CNMmMyZDNy+UqFlSaXL4A0sUgXIZGY7Z1r4Q/5MfGtZWlvzZt7v7HgfQlDABa3dtjBcj9N+MZjQLk3x20VldOYnOjJts3khdbBvMG1gfHb+PDlgN2KrTt9N9fb2ISAJgHaO3xxXn7CLiqb5uHqbnWDfw6UeYvsJan5prMYw3lksD/vLt5cKoIos52MAS7mAPy4Dr9q5XykgkHh8qYAFMvFYA3WahQd3EVunTU1oXKW9lBJZe/Tzfcz49TzoEzqGEEVh+NMsADWsNiw/r+e6+v+WmTNoo95u3T6danN6+b9NpCbNZaMp8h9UxjK2tnE8HrOLKdN6wcjvVKibTAesSaFgahptwALyN32OpcdUE4NoTSLeVHvdlLS1TpueSfDs+t8M++ycttwQetbyNTBCU2LYGE1iCHZZHfTiGP/a8lpUYFhFCYP3kuX3Dk/Jop151gMZ8LGLWiFTpjMUAtSredcwog3yw06DewXDMdhQJzx9Y+OuMUe5ifG63a1imzF/o4PMYSR9ZcKA+2g0zBrOwLN48jUFBWVkZg62p/MwTMOlFJr9ghUZZza10Pqw2bE31TOYVJXycXaI876OszC8o0TmQAnA9DK0haUby7cm5trP8WtFbz6as2P+AFPYPTNM6EIt6EtKVivFLwyqyPsFuthDbPEJV2gN2ybGZhDSF9VB4A2hF73s63+FvjtIp9P322vSEhqGdfFu7Tvl33uc8C4ClU29jBJZexbvLM7I6mJ3u8v/t1ht7e8Yg3KRppIPPmmM41dTev2M4+1/975/OR1FTd05hAtZx5nisVZWp2PrqA53hgmKp8k9N9xtY3zWo6FYKXaBlPcL61oiXP+jwiHinWT28hNRhf1oQ9QYZZcgbmJJDPpC+gqzhA600o7UpNZdcrpwbYMxWXtnwqO3WB4Vm8m1BMXkExWH5rWEVW5/zoWHt9nAGnw0lsABC5+n2cXeuATB45QTqZLR+Qipb8WfGNBo9/y481FzlINDyNjMCC86PN7Di8IdZNKzZ3XU/xxSmCOSmjGV4Ib15d+9XqdTfysd5jYfLJlA3MWtYF5MKpjN0k+rIGewSLHrzlhKq4lK838A6dUHMAKwzf/F1MzpE8gW+oHVZ2zpWEY3f1J0lNIIpSmO5EAC0CznZ+WlbZNmNhr1By0EcWEReLzBb3gD4HBtqJi8g7Ytr+y+B2caaXQ/X8ZBHLaxfQqxhuRh9Uu5qpJ6AU9AmYlNa5WyG45+ntPwql14BlkunNjEBi/IDWDVxidMYgSXxLweXr0jzJg5BTVBRByt/C/exVCBlMGvXVi50Jyh3gssd5s+oc62RfgPrcH0ynQ+rFVtd4XM1BDWfQB1wHGLFKZ/VRKWKs3axYj6fVtq9ScYsscWkGq3PpeVaK3hBy2j9MuW13UlBPZm8vIERm/fdKii2PCoosrwbVWKzCXw0oxAWk2/5WMmq9dCwDocSWGgczfBuPkIZsIFOFMrgvar4PV1pl/Zs5ZMMx69r0ylS+PuwsIGUXrUxqMCKltzE9FzUhLq0jGHKtfimjD8RBZrP2fIHAxkAwg30X76+eoUnXO75Yi3V5rzGb2B9eWY8HbAaYWRxnZOKWPnNdVLiuO/easo2FJMSqDO3Z31b+5VpRrKc+wqizQnb7+bd1ovzDWnoj20/OmjwtgMyANh8gZn8TlhsddE0Uv2I7cVDU5tsb6iBVTeXviOPU6t8hUZjOtekleFe22YzFe9T17Qswm/0B1hgEuYxO92VvEsgofud2Ycl+0uo7lVZ3jQcd/cI1bSGAlSdzMLT9GewrnqjJ1z+ujvHb1ihselkBh2wzoM2N43P5NQPEyXZxfh/HRLCwVRZsZNv64uaOOmNfRVaowylUelGi3ZyrvUk1/CHdKNt1ZiVttCDGgAWtYP8A00j1a2ML5zhEilNiMqOUAOLqVRL83xxsleDCr26uU2v9Ap+hb//hwEuFRQN4HwJKhoIGt4njBqWXulXzTawQuy0JmECPjMksCqYkQka1fFQgqrzENM63tdV7/OEy78srwQErJVH/kKXmlOPra6e7McNOgBl/TtEip99tdpGfq2abq4DFGwwjF9efiOA6wdO2lau9WJqrmVmt5zb1t3DvIFl2c1oDsYkjaHxO34acmAZmBdjQMvxiHpXO1GLeO/tlCsYotJPoprxvM8ZJWLrVR8GHVgS4hC9SSj7Y7Avf9xHU1GBvtruglVHAGnGfDpgnfSEy9NWfUDAyj4wn87pXoOtPj3e72cZw/qjFB7QpL5HZiBzlK/CijQzrA+L1B3+YDXRdYymiYzf313n5VkmeaiZZGzwgZKcaTSs90INrOYFCiUzsNReIHIaVB90bj3v7iytV62mh4vqJ8qPdvKXQyvWM68Sqh/3U8PaQd+AQn5vsK+9LF/zB7wbYXW5uWo5ljfTw8e4ruqiJ1zm7Hs9IGA9uOttuiJ+J7B1FQG3o25IkMvtCfjTAC47g6bV3hO5VMGWca9aRqQZyQ85AKvlhv/s7pYmG5Hm8lc9StOcYgRWPPF3mpSRN0MNrJZFiaMZ99Wp/uJV5kWXvJ+aHyPo5G+6ljKoPmIITD3g1znDMQGMa5id7v4Bq05MvN9dTvekjzTD5KZMM2hZ3QeswqwGWf6dIz01rO884fLH0v9STpf/wBq/bStd4OghdxuwIMmZePmEWglRxejbSuCfn9XrZIrh2vRc6y6m3oZXY7SWW//YHaczuKQ8tXPIAwCLMa4K9YP01rDkhpCbhIuUjCWQW3XKW2DfSg/He+PFZ39th4Wi0gEgmxiAtc2vc0Yalo4eggEBS4S/yGBlrA/F9ZevmTJYXqB5jgDTEGByKeQaV4GmVbYp429dz2Jt1SeecEnbUUDVNQ/1G1gxn35LUw+rugguXVDbxttjFGNYGkn+3K192UIkKcutyem5JKtPKy2HXN0tJ2MqjUaF+zqVoWl3ryjSXRsJsdzruoiIeaEGVmu2YhLjvo/HRrn0Kpt3LXjFnztvQzFEpTt1Sr9M2o7AUXUBC7Ae9RNYj3o2+bh879tDWfxSkj91hHxT5gxUu8rHSt/3MD4H8OxFHXVg/IgXak4Rpiw7Cg7FC3zHb6HmrF3NwrVV87D11a7OcBF/dpA63JDsF6x+Oid3l6WhWSV8IxSTh5oa0BXjd0iVLYFWt+wtkrq8/CUftbQqu+VECvcIAFItnc1CBDFaYImJT4JdHpkLsHzVlrrcGdpTc/rk6vGfI4Y6deqdDOVrXvTPJJQPdulUzMnPfkTPd/iwiDvrpIqzNG4RV0Os7JZQ3w5J+TMeYYONrEBzP4rZwkphoG44aOSNGggAGojSeZDGBkDa6gt6os1ZnVbCV1fcAebasc5w6b++knrnyMO8YeV09aO0B59lqjj6P1e+EsXo1EbGJpwAKyPQSauPk97okCqa6C6aHVRmdIOH9KrNzLsmDRXpe2u/ITXXmj0JzLMxhuCGGqCKDWAa2lnisi6Nf71U2i3A8ggmHWz+CqeByjWoxZrnNalOwB8IvUmoyGDdP1s2iSYeq4Fa1FFFAuCSANrQ1/QNVPkHeHYc011epoypHhbqWO3Pcc/GJSpAmzrJUMRvSUjrutvGDJCbNDY2cy4hL81nNyDclDGNKNS0MQMry5m48a7bft1j/ZlIMNfyPAET++lhqupSDC9gHT0vo9Sm3fTAeu/kyA7fhnwhah8Pb4cTYDZ87ZAQb9XGcGu9RCcIeoztuqWKj7/FsJA2eUgx7vtDeq6tAcVOuUeutTHNSG4es2xXUJu3wne8xRLe0DTpLfLm0AOrPN4z93BAke1Wb1M9RgBzv8vbGSyfHnJgaRX3se4/E7sGAHXaW3vq6KbTmk3cRleO5rLpeK9/wEIF/NSHGIDV3LqAGOvPcdG97RAr9jO0qv8BLVCF6lZI3Jh5G2g/l1hSazhVPU3Iy4iF4xz2EfXu4fJYVfUQHWTu+2I1ZW+K5gQre9Mw6r7SVfQ5hGur9iNN5CJoVQwVEuvgjfCwP9oQ6j0Ib/MKeg2LeDfU3UMAUNXeALG1peZYngrm96TlWB9kWylMXUreGWpeoRZhXmWSd5BTvRdE4uPqxAqr1zWJk00MNbDatYoHfR5Dr3qbph68hXpGEefUqxYz+sd0/oGFmp8sAA3rZ8auOVrC78q6DpF3P4QrcYkArddgvkLS4AQvyHyWzQcFkPk3pwOBuUiYMt9hNwuzWrpWIV1lF4CW9Q1dD8KsneuoWoARazmZ2lupKebPYJ8q+nCGVVW3dYLLOYYJboA38LJKEffmpzY4niMBzwW1uJnmmK3dkQSabiRbmWq0j31jb9C0nlvd9bToVwtRvBacBx9/nV9mssAjrMFddbTIe4WyGt7scD2/83yA6uMVo0MOrGz1I76O0QZmo8uzeoNe3eTUqt8HsNQwHbtxvn8VQpBfDLUHY6oAccGPRqpX53pE4ljmXFvkxyVeC4brpctqYal7tXAbC2RaJBumcg5hkm3S3O/LAS/P9wTgquM3uYvs0WhaIzZ8R31y/B7q9MV46lLbYKrd1Y862xJFHTknp147/DgV+dExpn6EraBddYnirRXjixk71iKtSKz4tCoal7F1zHGrwiPk14E5Wc6cT6X4piFaHt0NwNrL7BC3toN5qEdJzgE+pv1SjOUTQJtrYv4eC6doaZQfKDSTRwRmskpQTH4RVUy+E1lU/mRkETlj0Lbd6iFbyiQRxXvEEUU2UWQpmTBk59eSAUWWmyKLyVloPy5F/OoSkq6Hl8gpj5Wr5iqRbGToNSzftaUo0GicKGqdMVqeFixOf5PsqQVJw2iburrLNasv2OYEtqIHz8x3bBkgoGmV1A1PGFUpEMUghYDC5INPY9IhR4cPF54TSoej1fQ6iURaJcJlqPrv2aFJw9isHdmm6SIw484ya1dZ3/Lp4ByzKkUAwGrw4Xwv6lrUD7XgWlu1jK7NV8eooqSf7afuLV1NPV7+KjXZvIka6m42Uc3UJacBW1PxLLaS6nIxUEdauHkPsOcFEqfqJPJltQkyTYVAMOJKCZmz8TK8RiS7v1ZEfGBnChx12++KbwOtHc5Vxi6xpCOTjMVcc6blkra0HMuj/uT9wT4DUnKts0Fjc7CBMTWHnOPrWAOL9lwvLLFaGasvlFjbhGarQ1hMVl1u63UK/uagS3y+ahKayWe9gNVRo7/O45qcs8cQ7rcuKsBYFS2SIY0L/a1uuDixbjh90jJvH5ZO5dMUQQnSoPEU8wEWbF/h7z1y/mlRDF09rsvHPRXwSjlNzBvNM9WIyv3A5xb43ATXIx9g9jl6FmGcgNEAownVm4O/W1AbMaYXPjIHfUSob8CMGbxMUVl+xss+gFWTtHH69V336nDA2xi7N3Md66qbsDWVf2GZ4FQ7Cvr0VYmhc54g3UogffzVL/XxiaOxbhK0Ipi+wvoVx1pWu9KMu3ip/wC6x9iAeMUkTDOW+wyUBQ1pbbDruoOW9qr3cjt+FzLJvc0ThdUhUVYyadjwEvrGLsFfPBkRI/IXWE6daj6XeXXqVW/wARYcd4u/90jzAvhxTMc1qBgrWNSDKYk0xnYfuYYNYtkttOENgQyJO5XqEy9Lh8L6AZBqmKPTNS48X5PNe5LW3xgJUGphNQtNWTTXFpVMRquG66qb/QAVmIBn9mCrq322LULlMewJxOMALouvSgzcQKW8AMf6rL4HuuykGvfdCaafg2O545o0o3XR+DfKWR2t6TnkpFSj9V3Yvo1DuZnGCcv2sZtb2/bKQFu6GAJgeTUMQAsogT0silb09j8jIh46g3VtPuITWFqVjpOmplVO4wUsluNS86RDnDplIZh93zOMY8zHVW5w/6b5iWIUQ0bpiMdRSWcA6iFXp2auAMyvmMIfqPj4yDq494MKrMuKgld9+NIp1+ImzTnW6PSCGX41ywVgFfjQso7Q77kYNK31VU+DidjMA1b18DkbW9PA2XZFFwrZy2fEsr87pIpq/2FFnALzMSPYzkXOYjD0n7jckpVutLZxrGfVilYXYft3J+TuS8HmbnerzyIwGccvL08FoG2Gf69PX7HfybF88l6miPMrMsRsGx+K3oTCHaRXoTWHBM8OzkOjaKwVE4U1cXHxPEzClzndewAZAMIljv6r9rZFhIbpWO061Ry6hq2cTE2digQYlboM6tNwjLOUXtXO1AADRl3rAsUYWqslNjEt6MDqsFiaUJhK19ipTDPLil4j8nH58xgl5Wf8A/ZvZwmVqGI/wnsVUmxt5VIAkRVbd6YGPp2dcgOdAKkK0MZ2A9hewpYfDqh904X4+LgaseJZUEP3+qx/Bf/mTn6WKPbWivBFoVq65R16kEsuZHaMs2pdl8Dsq4ZPlx/7Vo17dTeXFZl+wiLSLCyxtQW1NyEc03upXfHfYD40dhGxzR4jE3HSsPTKJVyvF2g3hRyBVcOUo4gCTgF8pD+w8mcA3I5QCyUjaJ3vIuKjUEDLLkq8rcsqoSlzIYM56JCZMp729/mRFmTeAFpUFYv2tofDq4jqB4CKw9ZV3gLwugcgNRdg9RqYfg9ha07fgH1YJwzmQ39OKByOJqg2QTELJXGiRgYAp59QojN87nOIiY/sYvl8xwh83NmhQ4dhvUhQl+cUo/UJpB3xBY+foyFt+b6HOZ/gzq8lAjO5LqgmYZGF9F61IoqD/qYXEyaA1RDfPixlLmdgLVLpOEFCn3y48TmCtmQRmHBjXfrk+u4CFoW+iyEerBItXkgUh4MOLDHepZBeYv600QCWJg/tp05eqHkwoAdo5ZgBoL0Vs5iE67GwBF8mLdkrSzVatqGo91CACmlx6Ubyp8k5ttv9Ob/IIvJpYbH146HF1lVCM/mWoKh8SZS5/CVBCbkwcoflqagiy2MCs+WRqJL9DwiKyXsizda7BDtsqRHm8jFopXHQ1t0EVrRLhJkORmNG4yBvk5D4Mfj+FOUFR7z8Xt/AUq/kGmeG4rG4gUJdgkxIumMgEw00LHv3AUtdQRkIxnpvdSJ8Wh2yUIIFK4niO4NnoxeUB2jSrO1IYNacxQsy9yGIBePZkZky/8iUqgOa3fNhuoRIblx8KHLC0n0PpOVarVx9UVza2AOsvkozkrNGLy+P742/2935SExcCoVpAg/ict8moWp13kxu2Q2X5kklLiafUZeVPDVjsw1US4vSMdS6Cj6sWtqzFf/2Nf81IsX9dVKiPtD5Rqu69SJcRvc9qGIDmH8Z8vyMybF5U6KC5w92O/WNnoGkuDu+K+PPYbKEWEQGW0RqrvX59Fzyoq+6VkwNJ+CzLdVIVgAA7w52iZ5gC10t9+D5UhTbfZdI7lpBlPXhRikzOtUZX6Bo1xGszVNRpx4wRa0d5Y79c777AJULtLgL7TrFE1yvAyriZxcrzvNegZco3EG+AKvFXGPjgi0ovxCVpPEwBx1JBRmjwkTpJpmwbJ8czEQtaFwlAK96Lt2e04zWLwFUSyYus9wnnVfWJ7pdO+Jld4RGu1K0g7nzkhtYNKWOOz3cG7iWMUZVFCia+ljew3enHGomNrA9m3jIpVPvoPTJNlTJ1KlXHwS4onHIpU/+Bo51GMDzLZzjd7DdD7Ddjy5D8hH4/Am2OQrjGPz7cZdBfQK2OemEv8Mxdjl1qmWozpeBRw9ONE+1oqTUWjFeCHN3kcOKbDOYf2W1EoW2Nlaq6un7CAWJAqRKrrQRA62rYPiHGcIwSXrAVBz7JpmYZrT9A4CUC59b03PIb8DMs6XlkHmpueR/YPxt0pIDslGGb6N6u0bl9WZPkD9G77glTqCSM/AAGWsTFDpUkdSOVoVRuWuR/FWHGP8KHpgmZqc7XlYbG+tOgG3Xqp5FDSQYfFifoLZa3ICFDQQYFLKvyqkvcjUx3cecg0Wg3MGGJ+XRlKFjnF2QNIzqNM7Nkw6nDB3j/ELJCKrTcEfFG9QdA/3t72ByBtAsGPYd7IiXjrd3RLhf8oqzkih+gWvzoT1BPhml6oS8HBMPGb49Qyg3ZfxTbsp8J+GTGfIwPcISdKmPJ7LgwdA6EuSP2BNkt9cMTVRwLfGDtquJw2+CB+h/7CL5nDqRfB4KXLSLksZ0fpAonSIFHugGBg2Lc1gDKjXDbl66A0aLfivXphaLjXKXFk8gMlE2wukRUklvAlRYwvKbFGTygSm3ld7fpORVH53SKRe5WPxOXFN9whKWsISFUZqeFsk8S8EAeJpbFsqv43Ocdp1qFuzbwhDO4Gydr5wQnu2whCUsAUublshy6lWnL8Oq1alV8u7KA5raXQCmS/SVFNQ1lxbJROGZDktYwhIUufBMfByYdS+0LcTv8Wf/Fl3S9e4cPvrSL/uQAz08y2EJS1h6haC2Xu78PBpzELSvl1AT1PAshSUsYek10p6t/Kt3FQV1zfl/0ScZhyUsYQlLT0o/SqcuuVzCxYWqgFLZeHp4WsISlrD0SmmZLxvp0qm+BPPw67aFipTwjPRO+f8C2kkCqcIvWAAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.os-selnica.si/eng/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.os-selnica.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>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</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>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.os-selnica.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.os-selnica.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">OSNOVNA ŠOLA SELNICA OB DRAVI</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">OSNOVNA ŠOLA SELNICA OB DRAVI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">OSNOVNA ŠOLA SELNICA OB DRAVI</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">OSNOVNA ŠOLA SELNICA OB DRAVI</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.os-selnica.si/eng/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.os-selnica.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jožica</md:GivenName>
-    <md:SurName>Ozmec</md:SurName>
-    <md:EmailAddress>mailto:jozica.ozmec@gmail.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:franc.jakos@glazer.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Franc</md:GivenName>
-    <md:SurName>Jakoš</md:SurName>
-    <md:EmailAddress>mailto:franc.jakos@glazer.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Franc</md:GivenName>
-    <md:SurName>Jakoš</md:SurName>
-    <md:EmailAddress>mailto:franc.jakos@glazer.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.osfc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.osfc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 348d1575..00000000
--- a/swamid-interfederations-2.0/idp.osfc.ac.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://idp.osfc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Oldham Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-18T17:10: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">osfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEaDCCA1CgAwIBAgIJAO0V7MENsS9VMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
-						VQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMQ8wDQYDVQQHEwZP
-						bGRoYW0xIjAgBgNVBAoTGU9sZGhhbSBTaXh0aCBGb3JtIENvbGxlZ2UxFDASBgNV
-						BAsTC0lUIFNlcnZpY2VzMRcwFQYDVQQDEw5pZHAub3NmYy5hYy51azEkMCIGCSqG
-						SIb3DQEJARYVcG9zdG1hc3RlckBvc2ZjLmFjLnVrMB4XDTEzMDUwNzEwNTkyM1oX
-						DTMzMDUwMjEwNTkyM1owgbQxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVy
-						IE1hbmNoZXN0ZXIxDzANBgNVBAcTBk9sZGhhbTEiMCAGA1UEChMZT2xkaGFtIFNp
-						eHRoIEZvcm0gQ29sbGVnZTEUMBIGA1UECxMLSVQgU2VydmljZXMxFzAVBgNVBAMT
-						DmlkcC5vc2ZjLmFjLnVrMSQwIgYJKoZIhvcNAQkBFhVwb3N0bWFzdGVyQG9zZmMu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHw1xtdxKY8QAa
-						tUJWNuHBz8iqOByRx/I3fmSQxvRKaoB6c0UYoPikbq1WDKfjivk+PjJ4p1md8WWp
-						1TGF6xyd3zSe36LWJHI1D6SNMmk8z88FDbZrAG2O5H8KzRC1xQpin8k3WXHLzIvy
-						qpsiiCOWphTAAXTsPzNS3BOfAeghvApzWrM2vXLxlxHsSKZS5J6wP4rIuK2P1X51
-						okIJv8p7AUXQdv3Lyoyba7b0CuuEwEplmXEIv2cB2++eb1Eu7IUnOq0OIjMdAQo1
-						YwXAtAwKs8u53FQ++T+ZSe0SM9VbZsUljUVV3QAtGN3yq54ntaBI1d4mC0NT+iPe
-						TVOlUHIDAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSWogXD4Ld0Dzl6YokJ
-						DP1PO/PRWTAfBgNVHSMEGDAWgBSWogXD4Ld0Dzl6YokJDP1PO/PRWTANBgkqhkiG
-						9w0BAQUFAAOCAQEAZvquJlijNbVU7OnKoJ/UgpyXh31VfKQAKJ7LP+TWDCCUwgyJ
-						klumKlUh7c0JG7D3RRXim7mOxXEvkf4F1njUXWgv8mJmxRPzMkivhEFfnR0MFkjd
-						KFNHuarG3a8pAzFV8aeJSmIVfr7VwGO+pcdQrD7ScLi0ssNi4tf6wz1JaOSz/SUO
-						8llqRWB1ZyEQ1+d28Uzi90R2qu7MVn1Y2RdWfsFNwhcuBh44+a62kexUiYQIv7jb
-						cJkJdvZUqWpZmHLUwdS/ApQGvWPpZqoB8XHXIvjvncnpnX6wwz2wI9//KbHpEnXP
-						7dwWurC7U32FErPq2FW9K41yaFsfpI1kDXtNRw==
-				</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.osfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.osfc.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.osfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.osfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.osfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.osfc.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">osfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEaDCCA1CgAwIBAgIJAO0V7MENsS9VMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
-						VQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMQ8wDQYDVQQHEwZP
-						bGRoYW0xIjAgBgNVBAoTGU9sZGhhbSBTaXh0aCBGb3JtIENvbGxlZ2UxFDASBgNV
-						BAsTC0lUIFNlcnZpY2VzMRcwFQYDVQQDEw5pZHAub3NmYy5hYy51azEkMCIGCSqG
-						SIb3DQEJARYVcG9zdG1hc3RlckBvc2ZjLmFjLnVrMB4XDTEzMDUwNzEwNTkyM1oX
-						DTMzMDUwMjEwNTkyM1owgbQxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVy
-						IE1hbmNoZXN0ZXIxDzANBgNVBAcTBk9sZGhhbTEiMCAGA1UEChMZT2xkaGFtIFNp
-						eHRoIEZvcm0gQ29sbGVnZTEUMBIGA1UECxMLSVQgU2VydmljZXMxFzAVBgNVBAMT
-						DmlkcC5vc2ZjLmFjLnVrMSQwIgYJKoZIhvcNAQkBFhVwb3N0bWFzdGVyQG9zZmMu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHw1xtdxKY8QAa
-						tUJWNuHBz8iqOByRx/I3fmSQxvRKaoB6c0UYoPikbq1WDKfjivk+PjJ4p1md8WWp
-						1TGF6xyd3zSe36LWJHI1D6SNMmk8z88FDbZrAG2O5H8KzRC1xQpin8k3WXHLzIvy
-						qpsiiCOWphTAAXTsPzNS3BOfAeghvApzWrM2vXLxlxHsSKZS5J6wP4rIuK2P1X51
-						okIJv8p7AUXQdv3Lyoyba7b0CuuEwEplmXEIv2cB2++eb1Eu7IUnOq0OIjMdAQo1
-						YwXAtAwKs8u53FQ++T+ZSe0SM9VbZsUljUVV3QAtGN3yq54ntaBI1d4mC0NT+iPe
-						TVOlUHIDAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSWogXD4Ld0Dzl6YokJ
-						DP1PO/PRWTAfBgNVHSMEGDAWgBSWogXD4Ld0Dzl6YokJDP1PO/PRWTANBgkqhkiG
-						9w0BAQUFAAOCAQEAZvquJlijNbVU7OnKoJ/UgpyXh31VfKQAKJ7LP+TWDCCUwgyJ
-						klumKlUh7c0JG7D3RRXim7mOxXEvkf4F1njUXWgv8mJmxRPzMkivhEFfnR0MFkjd
-						KFNHuarG3a8pAzFV8aeJSmIVfr7VwGO+pcdQrD7ScLi0ssNi4tf6wz1JaOSz/SUO
-						8llqRWB1ZyEQ1+d28Uzi90R2qu7MVn1Y2RdWfsFNwhcuBh44+a62kexUiYQIv7jb
-						cJkJdvZUqWpZmHLUwdS/ApQGvWPpZqoB8XHXIvjvncnpnX6wwz2wI9//KbHpEnXP
-						7dwWurC7U32FErPq2FW9K41yaFsfpI1kDXtNRw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.osfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.osfc.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">Oldham Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oldham Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.osfc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Clarke</SurName>
-    <EmailAddress>mailto:JCA@osfc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Clarke</SurName>
-    <EmailAddress>mailto:JCA@osfc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.overtsoftware.com-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.overtsoftware.com-idp-shibboleth.xml
deleted file mode 100644
index 2a03633d..00000000
--- a/swamid-interfederations-2.0/idp.overtsoftware.com-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.overtsoftware.com/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Overt Software Solutions Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">overtsoftware.com</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDiDCCAnACCQDi5A+IRiQjlDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgTDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHEw1LaWRkZXJtaW5z
-						dGVyMSUwIwYDVQQKExxPdmVydCBTb2Z0d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYD
-						VQQDExVpZHAub3ZlcnRzb2Z0d2FyZS5jb20wHhcNMTIwNTI0MTYwMzQzWhcNMzIw
-						NTE5MTYwMzQzWjCBhTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDldvcmNlc3RlcnNo
-						aXJlMRYwFAYDVQQHEw1LaWRkZXJtaW5zdGVyMSUwIwYDVQQKExxPdmVydCBTb2Z0
-						d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYDVQQDExVpZHAub3ZlcnRzb2Z0d2FyZS5j
-						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6aE+W0BP9ibXUGpPZ
-						dRcSNO7frD1wgMjPhtpJfeiI69Yc3gkJGaWKrtkmCuFydQ+rO5fbuKyrZzIQssN5
-						cLHxu8ABHtGMqtk0puKa3ymFvfjgp8IAh/tYgBw8/WLX4VuGA9NOKqXcOME5icCc
-						BaCxseQCwEy/5YT+UAhP7BzUbRg1OEnb8IYGJKAWRoO5hE6CiGugOoplpGv9ovmJ
-						i16CAuSBqbsHKkT9ADJp9DMZpYa/izn9j+/ONW5DcVWasosw6wDewiIp+ttW+Ice
-						EFJ6KbWJHNjRlkdp7FXjvDdVks5sc/ZfSvzF4G9mm2lv//aJu774kZzijkF+Bio4
-						IIxBAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEd9OhZ0ZAB7Cpr+YwzWY+4S8c/w
-						19dwjLqufSlmMqq7fw00mcWxmx2n3ovzqplTRvOxbFiNc00hF85Lf3TRs+ieENWp
-						THQ7KNev/peJ3kggXArmlKBzZmM7xVimwm1d0ehp8359gAH08oGxZFqc1F1VuPyM
-						iXEieN+YvMjmfUs4/O1cDWLcOlrEzb+wDRSgF7osUlqjGxlZ6tfaayMeWcDfJ2hy
-						+lZSS6znrw8dTZ2CYA0JGA1jE/jExB+P5rfGsBSO3ZJZG/YyOJZSxtds2iqCY055
-						apotaZklObBpbolG8BoHy6sqsIpVMVDZqFu9AF5ryJJsaVF8mcWVDDwRnXY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.overtsoftware.com/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.overtsoftware.com/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.overtsoftware.com: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.overtsoftware.com/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.overtsoftware.com/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.overtsoftware.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.overtsoftware.com/idp/profile/SAML2/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">overtsoftware.com</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDiDCCAnACCQDi5A+IRiQjlDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgTDldvcmNlc3RlcnNoaXJlMRYwFAYDVQQHEw1LaWRkZXJtaW5z
-						dGVyMSUwIwYDVQQKExxPdmVydCBTb2Z0d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYD
-						VQQDExVpZHAub3ZlcnRzb2Z0d2FyZS5jb20wHhcNMTIwNTI0MTYwMzQzWhcNMzIw
-						NTE5MTYwMzQzWjCBhTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDldvcmNlc3RlcnNo
-						aXJlMRYwFAYDVQQHEw1LaWRkZXJtaW5zdGVyMSUwIwYDVQQKExxPdmVydCBTb2Z0
-						d2FyZSBTb2x1dGlvbnMgTHRkMR4wHAYDVQQDExVpZHAub3ZlcnRzb2Z0d2FyZS5j
-						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6aE+W0BP9ibXUGpPZ
-						dRcSNO7frD1wgMjPhtpJfeiI69Yc3gkJGaWKrtkmCuFydQ+rO5fbuKyrZzIQssN5
-						cLHxu8ABHtGMqtk0puKa3ymFvfjgp8IAh/tYgBw8/WLX4VuGA9NOKqXcOME5icCc
-						BaCxseQCwEy/5YT+UAhP7BzUbRg1OEnb8IYGJKAWRoO5hE6CiGugOoplpGv9ovmJ
-						i16CAuSBqbsHKkT9ADJp9DMZpYa/izn9j+/ONW5DcVWasosw6wDewiIp+ttW+Ice
-						EFJ6KbWJHNjRlkdp7FXjvDdVks5sc/ZfSvzF4G9mm2lv//aJu774kZzijkF+Bio4
-						IIxBAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEd9OhZ0ZAB7Cpr+YwzWY+4S8c/w
-						19dwjLqufSlmMqq7fw00mcWxmx2n3ovzqplTRvOxbFiNc00hF85Lf3TRs+ieENWp
-						THQ7KNev/peJ3kggXArmlKBzZmM7xVimwm1d0ehp8359gAH08oGxZFqc1F1VuPyM
-						iXEieN+YvMjmfUs4/O1cDWLcOlrEzb+wDRSgF7osUlqjGxlZ6tfaayMeWcDfJ2hy
-						+lZSS6znrw8dTZ2CYA0JGA1jE/jExB+P5rfGsBSO3ZJZG/YyOJZSxtds2iqCY055
-						apotaZklObBpbolG8BoHy6sqsIpVMVDZqFu9AF5ryJJsaVF8mcWVDDwRnXY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.overtsoftware.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.overtsoftware.com:8443/idp/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">Overt Software Solutions Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Overt Software Solutions Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.overtsoftware.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Andre</SurName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Andre</SurName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.painless-security.com-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.painless-security.com-idp-shibboleth.xml
deleted file mode 100644
index bfc19d93..00000000
--- a/swamid-interfederations-2.0/idp.painless-security.com-idp-shibboleth.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.painless-security.com/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Painless Security, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-07T13:46:22Z">
-      <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 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">painless-security.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Painless Security, LLC</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Single sign-on for staff, contractors and guests of Painless Security, LLC.
-				</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUQynxnQARWSAiT433dOEy4rgUWoswDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZaWRwLnBhaW5sZXNzLXNlY3VyaXR5LmNvbTAeFw0xNTA2
-						MDkxOTUyNTlaFw0zNTA2MDkxOTUyNTlaMCQxIjAgBgNVBAMMGWlkcC5wYWlubGVz
-						cy1zZWN1cml0eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCl
-						yldHUHv/seFmWguFN28U6c/zLp6+caSZ2GCC84uP0ffvHbd6TV/JUeo6h5RVjjPB
-						beWDCUFbxpQEOtNokdOAdrmMu11AtW0u0oyppmbVhfd9uIXJxnAUmq/AHtpqngUj
-						yKl8ddJEVTqeX3iBiBZSXRBGjed4ZLqh1wmWfgZDxJS44sK3panId4NdV5SzjgJ8
-						UtKuwtH9P84xvMMQjgLcmBtnRU+3Fwi50f5Q56tkJYJXC0rp8GMJkuX20aKrk9Xx
-						R3E2g3m++A1Flai3k0YK7m4sEK7LMWIby7ALzzXgRyboZVYtYpYRILY/K0lXh9BL
-						3amhcIYQXRalaNYLqX8RAgMBAAGjeTB3MB0GA1UdDgQWBBRrLqZ+Xuc7a8no4h3R
-						KqK0MCyXTzBWBgNVHREETzBNghlpZHAucGFpbmxlc3Mtc2VjdXJpdHkuY29thjBo
-						dHRwczovL2lkcC5wYWlubGVzcy1zZWN1cml0eS5jb20vaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBADnukeJJTy53hb7t2zGznoX8RVJPUXU+YO47ZTnu
-						fq1K6XRqN76baq0Xrie5sgbmryC9OQz087B5PRTD9e7Rb+87JaMfQzfLApb6D2I3
-						nWCI/CaywJ8T2J3+2MY78gjLcWezgigkt1KNDc4nkhSWrMdNlqQ7JbGHWSWiN89P
-						TTe6Z8/NNhCjizcNqZcvmySgRlvIiTdhgLqXxmDAArizrLVq7HElbNoc0IW03LBX
-						QTRNrAggfvMGf32MdIPPCfX9odu63lwZfx17sqPxvdQ2xq2ZL6iAXbC65rtlKTjW
-						gcWNbUNwBO9L972+8/PKLZD/V0mGrrlgDpwI6rKuIlaQTzk=
-					</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>
-						MIIDUDCCAjigAwIBAgIVAMxItCUJxrxuCYpH3cVsXJ/cZImsMA0GCSqGSIb3DQEB
-						CwUAMCQxIjAgBgNVBAMMGWlkcC5wYWlubGVzcy1zZWN1cml0eS5jb20wHhcNMTUw
-						NjA5MTk1MjU5WhcNMzUwNjA5MTk1MjU5WjAkMSIwIAYDVQQDDBlpZHAucGFpbmxl
-						c3Mtc2VjdXJpdHkuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						lnefIU94qiDGGL7oLuD+dUsIfewPwXwQr2bX1NftMpJhlcVWmilKuXvR1zfjifYN
-						f7JZwErLGQpGbooqRhtuyjPh0luxhlAQNhBQqa8aYAZCdghq5TKDikfOM2MCs/W6
-						msKM5sbjKpy+XUsAxWyd1tDYV2e7xI5SY1QBg9Vu1GF8W+FWPCtfEJAVCapkMzGR
-						9US+hU2xM6hSeOegb7CKt/6BcSK+pislffQSApmFtNhP2N3uUePbuZEskGF4qiy0
-						0fdpOxH1G+5iRLSOmGDvKIdzZ+TytQlqAhv+U9VJSaihCR5q2aWVwCkXr9UjcYg2
-						uCW6inEwc28lRkDq9uNt5QIDAQABo3kwdzAdBgNVHQ4EFgQUt6U4epZshqW30TRV
-						w1XGB5DNUXYwVgYDVR0RBE8wTYIZaWRwLnBhaW5sZXNzLXNlY3VyaXR5LmNvbYYw
-						aHR0cHM6Ly9pZHAucGFpbmxlc3Mtc2VjdXJpdHkuY29tL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBCwUAA4IBAQASs4pQKTc/wOFdPdVJjBtJjQQPNOfdkG1hFCWk
-						JbQLaEQb98i4Mnt8mIZhEuYeCI5V7HHILE/z2qFTadLXT982B46r7pTSJVmjf0/Y
-						Z8iB3JlP26HIb5MqA/KvXc13FsvvuPrPqjlvb5peh/UHqQcfTjid7ueDu+GpbWfc
-						5SImh98kP49WzKjMYSINsppQrcq1BuyRrmONLWCOV4+5oLjbRUjQLG7nJ+OQvJ3L
-						Ty+Hnn8QuOxrkKH9RPPJuzZ4GnVrKnYk6ZLR61Ycf4bpoEi74GgjBVqmwXZCET1S
-						x1XIIdYkfjFRbr2dxUIYAI+Hy5VavvRSXBWBDQChKZfE4rFt
-					</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>
-						MIIDTzCCAjegAwIBAgIUU5Vd+CG4Yi2i2PMHz783N0/fwl0wDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZaWRwLnBhaW5sZXNzLXNlY3VyaXR5LmNvbTAeFw0xNTA2
-						MDkxOTUyNTlaFw0zNTA2MDkxOTUyNTlaMCQxIjAgBgNVBAMMGWlkcC5wYWlubGVz
-						cy1zZWN1cml0eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDY
-						9DxmRykS0nefXvs34sK+YDIfCHJr4Eo7i4I/eP3lt86Tnb5EjYknYA5OCEE//bSu
-						H4kllbei0wFVasS4vCM9SScY9jjgCKTsB0wcNSlha1n6IHkSR2z1vAKzCjou6G2Z
-						x8ivnVybPjnzBtAXWRQUUcbTptufm51/zA0h4xB/wgnK4X0iaEdZIAzSuKBtl5ze
-						aJgCGT1roxumpHBCE7RY5k5M+QQWVhoOFN+b2KREtWzLGv0GDovaUk6EeUnkK4l3
-						MkGBFnzCElI+W+/0GGnga4XdTk1dX+C1cO3JZ4vmU3qXX8WJysGoltAM1oJwdBIg
-						Fs9rjEUHFmJvYlWMzyzrAgMBAAGjeTB3MB0GA1UdDgQWBBQfpwL53IrkcS3gHLvw
-						dBq+Geh/VDBWBgNVHREETzBNghlpZHAucGFpbmxlc3Mtc2VjdXJpdHkuY29thjBo
-						dHRwczovL2lkcC5wYWlubGVzcy1zZWN1cml0eS5jb20vaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBAJHvbvh3fHGoXIV0ooIju0FFGgKvvUMqd1RL7jVV
-						uzxH1XWMXK6wvvmlDa5+vSWVkD1amr+D2fqo+Kkyegqh880hl/Vgr5BJEormIZBb
-						8s6v1Azf/n50Kd6m5NErMT+c+eaXE5JvgLIUYEkjeA+fATpy7M/gCB21xb/Zt2OX
-						Rn7bpj1Md0FQtMkwoDPx76m45rkLG+XCcHQydyBzc2G8GH2yxyEUEYwu2CljCyuq
-						btelXBScoXImhOIbPLj4gl5z1YjBf9+kQz6keSoiS1hz+UAz2jkwd5N8lqSnZem9
-						lo/z0pnYq19CeeUvOBclHgP7ADCis7+ulg7ea8s4K3pcHpA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.painless-security.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.painless-security.com: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.painless-security.com/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.painless-security.com/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.painless-security.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.painless-security.com/idp/profile/SAML2/Redirect/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">painless-security.com</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUQynxnQARWSAiT433dOEy4rgUWoswDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZaWRwLnBhaW5sZXNzLXNlY3VyaXR5LmNvbTAeFw0xNTA2
-						MDkxOTUyNTlaFw0zNTA2MDkxOTUyNTlaMCQxIjAgBgNVBAMMGWlkcC5wYWlubGVz
-						cy1zZWN1cml0eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCl
-						yldHUHv/seFmWguFN28U6c/zLp6+caSZ2GCC84uP0ffvHbd6TV/JUeo6h5RVjjPB
-						beWDCUFbxpQEOtNokdOAdrmMu11AtW0u0oyppmbVhfd9uIXJxnAUmq/AHtpqngUj
-						yKl8ddJEVTqeX3iBiBZSXRBGjed4ZLqh1wmWfgZDxJS44sK3panId4NdV5SzjgJ8
-						UtKuwtH9P84xvMMQjgLcmBtnRU+3Fwi50f5Q56tkJYJXC0rp8GMJkuX20aKrk9Xx
-						R3E2g3m++A1Flai3k0YK7m4sEK7LMWIby7ALzzXgRyboZVYtYpYRILY/K0lXh9BL
-						3amhcIYQXRalaNYLqX8RAgMBAAGjeTB3MB0GA1UdDgQWBBRrLqZ+Xuc7a8no4h3R
-						KqK0MCyXTzBWBgNVHREETzBNghlpZHAucGFpbmxlc3Mtc2VjdXJpdHkuY29thjBo
-						dHRwczovL2lkcC5wYWlubGVzcy1zZWN1cml0eS5jb20vaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBADnukeJJTy53hb7t2zGznoX8RVJPUXU+YO47ZTnu
-						fq1K6XRqN76baq0Xrie5sgbmryC9OQz087B5PRTD9e7Rb+87JaMfQzfLApb6D2I3
-						nWCI/CaywJ8T2J3+2MY78gjLcWezgigkt1KNDc4nkhSWrMdNlqQ7JbGHWSWiN89P
-						TTe6Z8/NNhCjizcNqZcvmySgRlvIiTdhgLqXxmDAArizrLVq7HElbNoc0IW03LBX
-						QTRNrAggfvMGf32MdIPPCfX9odu63lwZfx17sqPxvdQ2xq2ZL6iAXbC65rtlKTjW
-						gcWNbUNwBO9L972+8/PKLZD/V0mGrrlgDpwI6rKuIlaQTzk=
-					</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>
-						MIIDUDCCAjigAwIBAgIVAMxItCUJxrxuCYpH3cVsXJ/cZImsMA0GCSqGSIb3DQEB
-						CwUAMCQxIjAgBgNVBAMMGWlkcC5wYWlubGVzcy1zZWN1cml0eS5jb20wHhcNMTUw
-						NjA5MTk1MjU5WhcNMzUwNjA5MTk1MjU5WjAkMSIwIAYDVQQDDBlpZHAucGFpbmxl
-						c3Mtc2VjdXJpdHkuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						lnefIU94qiDGGL7oLuD+dUsIfewPwXwQr2bX1NftMpJhlcVWmilKuXvR1zfjifYN
-						f7JZwErLGQpGbooqRhtuyjPh0luxhlAQNhBQqa8aYAZCdghq5TKDikfOM2MCs/W6
-						msKM5sbjKpy+XUsAxWyd1tDYV2e7xI5SY1QBg9Vu1GF8W+FWPCtfEJAVCapkMzGR
-						9US+hU2xM6hSeOegb7CKt/6BcSK+pislffQSApmFtNhP2N3uUePbuZEskGF4qiy0
-						0fdpOxH1G+5iRLSOmGDvKIdzZ+TytQlqAhv+U9VJSaihCR5q2aWVwCkXr9UjcYg2
-						uCW6inEwc28lRkDq9uNt5QIDAQABo3kwdzAdBgNVHQ4EFgQUt6U4epZshqW30TRV
-						w1XGB5DNUXYwVgYDVR0RBE8wTYIZaWRwLnBhaW5sZXNzLXNlY3VyaXR5LmNvbYYw
-						aHR0cHM6Ly9pZHAucGFpbmxlc3Mtc2VjdXJpdHkuY29tL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBCwUAA4IBAQASs4pQKTc/wOFdPdVJjBtJjQQPNOfdkG1hFCWk
-						JbQLaEQb98i4Mnt8mIZhEuYeCI5V7HHILE/z2qFTadLXT982B46r7pTSJVmjf0/Y
-						Z8iB3JlP26HIb5MqA/KvXc13FsvvuPrPqjlvb5peh/UHqQcfTjid7ueDu+GpbWfc
-						5SImh98kP49WzKjMYSINsppQrcq1BuyRrmONLWCOV4+5oLjbRUjQLG7nJ+OQvJ3L
-						Ty+Hnn8QuOxrkKH9RPPJuzZ4GnVrKnYk6ZLR61Ycf4bpoEi74GgjBVqmwXZCET1S
-						x1XIIdYkfjFRbr2dxUIYAI+Hy5VavvRSXBWBDQChKZfE4rFt
-					</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>
-						MIIDTzCCAjegAwIBAgIUU5Vd+CG4Yi2i2PMHz783N0/fwl0wDQYJKoZIhvcNAQEL
-						BQAwJDEiMCAGA1UEAwwZaWRwLnBhaW5sZXNzLXNlY3VyaXR5LmNvbTAeFw0xNTA2
-						MDkxOTUyNTlaFw0zNTA2MDkxOTUyNTlaMCQxIjAgBgNVBAMMGWlkcC5wYWlubGVz
-						cy1zZWN1cml0eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDY
-						9DxmRykS0nefXvs34sK+YDIfCHJr4Eo7i4I/eP3lt86Tnb5EjYknYA5OCEE//bSu
-						H4kllbei0wFVasS4vCM9SScY9jjgCKTsB0wcNSlha1n6IHkSR2z1vAKzCjou6G2Z
-						x8ivnVybPjnzBtAXWRQUUcbTptufm51/zA0h4xB/wgnK4X0iaEdZIAzSuKBtl5ze
-						aJgCGT1roxumpHBCE7RY5k5M+QQWVhoOFN+b2KREtWzLGv0GDovaUk6EeUnkK4l3
-						MkGBFnzCElI+W+/0GGnga4XdTk1dX+C1cO3JZ4vmU3qXX8WJysGoltAM1oJwdBIg
-						Fs9rjEUHFmJvYlWMzyzrAgMBAAGjeTB3MB0GA1UdDgQWBBQfpwL53IrkcS3gHLvw
-						dBq+Geh/VDBWBgNVHREETzBNghlpZHAucGFpbmxlc3Mtc2VjdXJpdHkuY29thjBo
-						dHRwczovL2lkcC5wYWlubGVzcy1zZWN1cml0eS5jb20vaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBAJHvbvh3fHGoXIV0ooIju0FFGgKvvUMqd1RL7jVV
-						uzxH1XWMXK6wvvmlDa5+vSWVkD1amr+D2fqo+Kkyegqh880hl/Vgr5BJEormIZBb
-						8s6v1Azf/n50Kd6m5NErMT+c+eaXE5JvgLIUYEkjeA+fATpy7M/gCB21xb/Zt2OX
-						Rn7bpj1Md0FQtMkwoDPx76m45rkLG+XCcHQydyBzc2G8GH2yxyEUEYwu2CljCyuq
-						btelXBScoXImhOIbPLj4gl5z1YjBf9+kQz6keSoiS1hz+UAz2jkwd5N8lqSnZem9
-						lo/z0pnYq19CeeUvOBclHgP7ADCis7+ulg7ea8s4K3pcHpA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.painless-security.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Painless Security, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Painless Security, LLC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.painless-security.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sam</GivenName>
-    <SurName>Hartman</SurName>
-    <EmailAddress>mailto:hartmans@painless-security.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Donnelly</SurName>
-    <EmailAddress>mailto:mark@painless-security.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Hartman</SurName>
-    <EmailAddress>mailto:hartmans@painless-security.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Donnelly</SurName>
-    <EmailAddress>mailto:mark@painless-security.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.parchment.com-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.parchment.com-idp-shibboleth.xml
deleted file mode 100644
index e62c3390..00000000
--- a/swamid-interfederations-2.0/idp.parchment.com-idp-shibboleth.xml
+++ /dev/null
@@ -1,122 +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://idp.parchment.com/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">parchment.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Parchment, Inc.</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>
-MIIFpTCCBI2gAwIBAgIRAOvwTZoQX/74EujZauqakIowDQYJKoZIhvcNAQEFBQAw
-gYkxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMS8wLQYD
-VQQDEyZDT01PRE8gSGlnaC1Bc3N1cmFuY2UgU2VjdXJlIFNlcnZlciBDQTAeFw0x
-NDAyMjQwMDAwMDBaFw0xNTA0MTMyMzU5NTlaMIG7MQswCQYDVQQGEwJVUzEOMAwG
-A1UEERMFODUyNTAxCzAJBgNVBAgTAkFaMRMwEQYDVQQHEwpTY290dHNkYWxlMS4w
-LAYDVQQJEyU2MjYzIE5vcnRoIFNjb3R0c2RhbGUgUm9hZCwgU3VpdGUgMzMwMRIw
-EAYDVQQKEwlQYXJjaG1lbnQxHDAaBgNVBAsTE1ByZW1pdW1TU0wgV2lsZGNhcmQx
-GDAWBgNVBAMUDyoucGFyY2htZW50LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANUkP1RCvY0fgAJ1b2t482fgCZRUriTh15Ylwuo5vxhXiNxg7Eit
-Ub2Ixy1dQJ7BYydJCXcC719sv5CZ7TfB3AXCZLMyWhcbd4ZLWGsP5x2ZcDb38bwP
-bKHUQKb/g+zizTi092c6N7toy2V4Pr9d79vTiWf8wU26+F0AkZlGYKO1cthoXR0A
-rQdHmyMAdJpffClZmNW1NtwWxPuEv61REt4ez6br9NfjLXvrDZ/bY5nwOMODlnOT
-lHF28/dj5gChLyHfEAxukbGfjYWe5th4Vdt6FkJGC2USMQbOOA1oiY4FgKgaeD2i
-mS2oMC1bTMNdK0AXjhaOCpwpdXaLOly1jKcCAwEAAaOCAdIwggHOMB8GA1UdIwQY
-MBaAFD/VtdDWRHlQShejm4xK3LiwImRrMB0GA1UdDgQWBBTDfyCJkB4KbmP90POP
-pQIntKnEDDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwUAYDVR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQw
-KzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYG
-Z4EMAQICME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwuY29tb2RvY2EuY29t
-L0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3JsMIGABggrBgEF
-BQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NP
-TU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUFBzAB
-hhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wKQYDVR0RBCIwIIIPKi5wYXJjaG1l
-bnQuY29tgg1wYXJjaG1lbnQuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQBaicNSqh0X
-uPyTEefD9AFCATyBWz0vevGanYqaC8rE5oS5kPeWb2W83uCjTFUX2VA39ETzxn7+
-OaYHDGG5PjxA63pDCpoUvZQrzOv9Wd01Dmc9fBMp10rtnDKSgsIxGv0KWjSG4FLr
-dEjTPLtLqWb+36a/01bK4Z4CwnJS5Dd60xDCv7N37/YY0uBIzx8aeq1A5x3ZxLFZ
-gqOWebh3VgXbxSxE8+uYvJ4+eS13iIy0thwr+Xl1sw9ymXgsxs9FVOA9oPURLzz0
-L40uf/jZGnuHXaQh/XRUbsHUOTa0glWs0lRADrGSQBhRYJxNFgWW4rYntPtYYS92
-LbnhhG02Fwo/
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.parchment.com/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.parchment.com/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.parchment.com/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.parchment.com/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.parchment.com/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.parchment.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">parchment.com</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFpTCCBI2gAwIBAgIRAOvwTZoQX/74EujZauqakIowDQYJKoZIhvcNAQEFBQAw
-gYkxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMS8wLQYD
-VQQDEyZDT01PRE8gSGlnaC1Bc3N1cmFuY2UgU2VjdXJlIFNlcnZlciBDQTAeFw0x
-NDAyMjQwMDAwMDBaFw0xNTA0MTMyMzU5NTlaMIG7MQswCQYDVQQGEwJVUzEOMAwG
-A1UEERMFODUyNTAxCzAJBgNVBAgTAkFaMRMwEQYDVQQHEwpTY290dHNkYWxlMS4w
-LAYDVQQJEyU2MjYzIE5vcnRoIFNjb3R0c2RhbGUgUm9hZCwgU3VpdGUgMzMwMRIw
-EAYDVQQKEwlQYXJjaG1lbnQxHDAaBgNVBAsTE1ByZW1pdW1TU0wgV2lsZGNhcmQx
-GDAWBgNVBAMUDyoucGFyY2htZW50LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANUkP1RCvY0fgAJ1b2t482fgCZRUriTh15Ylwuo5vxhXiNxg7Eit
-Ub2Ixy1dQJ7BYydJCXcC719sv5CZ7TfB3AXCZLMyWhcbd4ZLWGsP5x2ZcDb38bwP
-bKHUQKb/g+zizTi092c6N7toy2V4Pr9d79vTiWf8wU26+F0AkZlGYKO1cthoXR0A
-rQdHmyMAdJpffClZmNW1NtwWxPuEv61REt4ez6br9NfjLXvrDZ/bY5nwOMODlnOT
-lHF28/dj5gChLyHfEAxukbGfjYWe5th4Vdt6FkJGC2USMQbOOA1oiY4FgKgaeD2i
-mS2oMC1bTMNdK0AXjhaOCpwpdXaLOly1jKcCAwEAAaOCAdIwggHOMB8GA1UdIwQY
-MBaAFD/VtdDWRHlQShejm4xK3LiwImRrMB0GA1UdDgQWBBTDfyCJkB4KbmP90POP
-pQIntKnEDDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwUAYDVR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQw
-KzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYG
-Z4EMAQICME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwuY29tb2RvY2EuY29t
-L0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3JsMIGABggrBgEF
-BQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NP
-TU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUFBzAB
-hhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wKQYDVR0RBCIwIIIPKi5wYXJjaG1l
-bnQuY29tgg1wYXJjaG1lbnQuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQBaicNSqh0X
-uPyTEefD9AFCATyBWz0vevGanYqaC8rE5oS5kPeWb2W83uCjTFUX2VA39ETzxn7+
-OaYHDGG5PjxA63pDCpoUvZQrzOv9Wd01Dmc9fBMp10rtnDKSgsIxGv0KWjSG4FLr
-dEjTPLtLqWb+36a/01bK4Z4CwnJS5Dd60xDCv7N37/YY0uBIzx8aeq1A5x3ZxLFZ
-gqOWebh3VgXbxSxE8+uYvJ4+eS13iIy0thwr+Xl1sw9ymXgsxs9FVOA9oPURLzz0
-L40uf/jZGnuHXaQh/XRUbsHUOTa0glWs0lRADrGSQBhRYJxNFgWW4rYntPtYYS92
-LbnhhG02Fwo/
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.parchment.com/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Parchment, Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Parchment, Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.parchment.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Scanlon</md:GivenName>
-    <md:EmailAddress>jscanlon@parchment.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andrew Lillie</md:GivenName>
-    <md:EmailAddress>alillie@parchment.com</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 93709beb..00000000
--- a/swamid-interfederations-2.0/idp.parisdescartes.fr-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.parisdescartes.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Paris 5 - Paris Descartes</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABnElEQVQoz7WSQW7aQBiF/3/sCTgxg42La1SmUiuidFcrEcomd6gq7tELIOUW3IMblC1iRxArUqcSIlG8wC3YnsB4pgtLVZS2Cxb9V++X3tu876HWGg45cpAbAMwXfxzHSZJQSqWUhBDbtn3f/0tguVzO5/NcCJFlgOi6bpqmGiDdbpvNptY6DMNWqwUAuF6vR6MREsxzUWdMCGHbtmVZaBgmNeM4durOw8O9571ChIvzC3MymXieFwTBbrfjnAOAUooQ4/rq05HHKpRKpaLbbxat5FBsf25Mx3EajUYURWEYrlarLMuEEG3Ob2++kvr7vVJ+5cSh9C55rBlHjFLS7XbH47GUslqtcs5ns1me5285D+H0yYQ1ke7xyTGt/NC7DciP7DWWHBaLxWAw6HQ6vV4vCAIAuMYPtU47ypObNE6Lp/Na653lAEH8DW44HPb7fcbYdDrNsux5lZ/9s0v2Zq8LJAT/JJ0kieu6APCFd9tVprQutFKgAQAJeQkOAIQQpZC62KuitP6TdFlrKTbL7xk0nwcQDPzv4zs48AsHHLsLw+Z4gAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMB3sEi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDBssaqTAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.parisdescartes.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Paris 5 - Paris Descartes</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>
-					      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>
-    </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-POST" Location="https://idp.parisdescartes.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.parisdescartes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.parisdescartes.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Paris 5 - Paris Descartes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Paris 5 - Paris Descartes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.parisdescartes.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>adm-fed@parisdescartes.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.pct.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pct.edu-idp-shibboleth.xml
deleted file mode 100644
index 861da7e3..00000000
--- a/swamid-interfederations-2.0/idp.pct.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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://idp.pct.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">pct.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Pennsylvania College of Technology</mdui:DisplayName>
-        <mdui:Logo height="69" width="100" xml:lang="en">https://idp.pct.edu/idp/images/pctlogo-mobile.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>
-MIIDGDCCAgCgAwIBAgIVAPXmOxKE87b9Gpy8v4ZkBQZyM5s7MA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5wY3QuZWR1MB4XDTEzMTExMzE0NDAxNFoXDTMz
-MTExMzE0NDAxNFowFjEUMBIGA1UEAxMLaWRwLnBjdC5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCN2mGb9Z9WEqbuUCnqfcBuI/GnafhX4G6X0/VR
-kL/LqeE8w8yI9le8K9XzSgX03x6gxwYgWQD1AjazDEj22TblQPWhMtSCGnc7NOwp
-1Rqdnjx/126lOZuBJgNrn8MNQicSGTHDERAVSDkRI35MZLgY9IP0RlQwZ3/qUNN8
-AMjt4SNdYsMCpxu7tJ544F5gogiQqXQMGJGd28j0g74XPjAvbL5uCJZXp4boYcsz
-IRV8tmzZS9VVEsjW/X6Uu7O9zuyLvsQw3CzgVF9bD2W0DI10MtyZFA7GAp1BvdZX
-nkHofviJ/nJ8EgY+t+ptpSSV+cBAOCq10EAvq77g+McjUWR1AgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5wY3QuZWR1hiJodHRwczovL2lkcC5wY3QuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQpWKgSLUBAg5gMotsUjTSITgXm+jANBgkqhkiG
-9w0BAQUFAAOCAQEAHy/IIAzOMJDen3jlxWATz3MnlouOdlHQRu2nFWnyOjSRzHY1
-+yQjs557VN+gauVq3rh0Vsh/R3D/YhSHnsYmdw34TLPzF1NTb4/I96wxo84ls6Om
-MvJ43Hya/8HEsBfkcNIozAABsdmMBC3I6JOpdQekRO/oiaBQx9ckmpmf2VAvZ7hn
-pKpuJzdJRb15tTfBN9wL2vlohxJs9So5LyX/u3iTxe0f2HilfWP7prEwvvp5665W
-XZjl65JBgM51Vdxba40Gv6eyRaCM5SvD+3CD7CdAM/tBrFxYiLawxq0qJWr5G/DT
-Ywq4xGOo7ofdpFvfetqvGHrsBuQv2gyG/y7Aew==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pct.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pct.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pct.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pct.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pct.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pct.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAPXmOxKE87b9Gpy8v4ZkBQZyM5s7MA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5wY3QuZWR1MB4XDTEzMTExMzE0NDAxNFoXDTMz
-MTExMzE0NDAxNFowFjEUMBIGA1UEAxMLaWRwLnBjdC5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCN2mGb9Z9WEqbuUCnqfcBuI/GnafhX4G6X0/VR
-kL/LqeE8w8yI9le8K9XzSgX03x6gxwYgWQD1AjazDEj22TblQPWhMtSCGnc7NOwp
-1Rqdnjx/126lOZuBJgNrn8MNQicSGTHDERAVSDkRI35MZLgY9IP0RlQwZ3/qUNN8
-AMjt4SNdYsMCpxu7tJ544F5gogiQqXQMGJGd28j0g74XPjAvbL5uCJZXp4boYcsz
-IRV8tmzZS9VVEsjW/X6Uu7O9zuyLvsQw3CzgVF9bD2W0DI10MtyZFA7GAp1BvdZX
-nkHofviJ/nJ8EgY+t+ptpSSV+cBAOCq10EAvq77g+McjUWR1AgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5wY3QuZWR1hiJodHRwczovL2lkcC5wY3QuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQpWKgSLUBAg5gMotsUjTSITgXm+jANBgkqhkiG
-9w0BAQUFAAOCAQEAHy/IIAzOMJDen3jlxWATz3MnlouOdlHQRu2nFWnyOjSRzHY1
-+yQjs557VN+gauVq3rh0Vsh/R3D/YhSHnsYmdw34TLPzF1NTb4/I96wxo84ls6Om
-MvJ43Hya/8HEsBfkcNIozAABsdmMBC3I6JOpdQekRO/oiaBQx9ckmpmf2VAvZ7hn
-pKpuJzdJRb15tTfBN9wL2vlohxJs9So5LyX/u3iTxe0f2HilfWP7prEwvvp5665W
-XZjl65JBgM51Vdxba40Gv6eyRaCM5SvD+3CD7CdAM/tBrFxYiLawxq0qJWr5G/DT
-Ywq4xGOo7ofdpFvfetqvGHrsBuQv2gyG/y7Aew==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pct.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Pennsylvania College of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Pennsylvania College of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pct.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mike Rae</md:GivenName>
-    <md:EmailAddress>mrae@pct.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Robert Belles</md:GivenName>
-    <md:EmailAddress>robert.belles@pct.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mike Rae</md:GivenName>
-    <md:EmailAddress>mrae@pct.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 0a5cb5d6..00000000
--- a/swamid-interfederations-2.0/idp.pembrokeshire.ac.uk-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.pembrokeshire.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Pembrokeshire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-13T15:22:26Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">pembrokeshire.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDejCCAmICCQDRXJmAKdWRAzANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
-						QjEWMBQGA1UECBMNUGVtYnJva2VzaGlyZTEWMBQGA1UEBxMNSGF2ZXJmb3Jkd2Vz
-						dDEeMBwGA1UEChMVUGVtYnJva2VzaGlyZSBDb2xsZWdlMSAwHgYDVQQDExdpZHAu
-						cGVtYnJva2VzaGlyZS5hYy51azAeFw0xMjEyMTMxMTEwNDhaFw0zMjEyMDgxMTEw
-						NDhaMH8xCzAJBgNVBAYTAkdCMRYwFAYDVQQIEw1QZW1icm9rZXNoaXJlMRYwFAYD
-						VQQHEw1IYXZlcmZvcmR3ZXN0MR4wHAYDVQQKExVQZW1icm9rZXNoaXJlIENvbGxl
-						Z2UxIDAeBgNVBAMTF2lkcC5wZW1icm9rZXNoaXJlLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo43iMdoX7wISei44zg0pzYm/oDHX3EOTqILe
-						XT91H+u9UIa8mqCpQneXmiE6Oo/rvADRHm9+iRHcUf6GDGq4x16DRc+KPR6Dqy2N
-						sGuL1sg3vmTc8njS2AUoVK0PSFb/4AVooN303PWvz0S8nHXGvDmkk7aYtBzpb2K3
-						qKx+BvyTDuJQF/TcEZAKHme3FVGd29tJSLVNtFs86Dtnu15uj6f6EtenaZQ9aF6Z
-						r9f1TH5cAN10k6epmK0PGxXHvv9ymEVhJMW1p1wiKDfakqOiytlpG1Ltjuz+nl6J
-						hMlWZASCK1lBSFRa78Vb+PqHARZvs0nvrjriaPGfA4JIttXTSQIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQAgVzb1cy/TwNSZh3yLMaeBQlMlvZATKqIk3KRYmXo3qAJw
-						ZvK1t38aPzStE7CB8zq+xdp7oUet1/Arus9RAQb/1MUaWyvHnXzstO/aBctwu7QR
-						uqfDg4n13Rhoy5Id370cjLlUKPkkYjvtz3mqaaG2D5xGM88lYznPXBAwjitRYb6F
-						/llj4EdobocZoTO/p3Q1jneiw9q8Sz0Xo0YO5G/G5PqsRk6dzabdbgHhr32fL9H2
-						elD+LKh00BMxGfto3F4AuID2qRcaI+BHK2nK1tKYJgOJ57TarUPbevYx+MN5zUaQ
-						qGIbeRaq+jbj1N5J6kc5YbZDPuvT6BjH0yqKQBCI
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pembrokeshire.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pembrokeshire.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.pembrokeshire.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pembrokeshire.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.pembrokeshire.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pembrokeshire.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">pembrokeshire.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDejCCAmICCQDRXJmAKdWRAzANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
-						QjEWMBQGA1UECBMNUGVtYnJva2VzaGlyZTEWMBQGA1UEBxMNSGF2ZXJmb3Jkd2Vz
-						dDEeMBwGA1UEChMVUGVtYnJva2VzaGlyZSBDb2xsZWdlMSAwHgYDVQQDExdpZHAu
-						cGVtYnJva2VzaGlyZS5hYy51azAeFw0xMjEyMTMxMTEwNDhaFw0zMjEyMDgxMTEw
-						NDhaMH8xCzAJBgNVBAYTAkdCMRYwFAYDVQQIEw1QZW1icm9rZXNoaXJlMRYwFAYD
-						VQQHEw1IYXZlcmZvcmR3ZXN0MR4wHAYDVQQKExVQZW1icm9rZXNoaXJlIENvbGxl
-						Z2UxIDAeBgNVBAMTF2lkcC5wZW1icm9rZXNoaXJlLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo43iMdoX7wISei44zg0pzYm/oDHX3EOTqILe
-						XT91H+u9UIa8mqCpQneXmiE6Oo/rvADRHm9+iRHcUf6GDGq4x16DRc+KPR6Dqy2N
-						sGuL1sg3vmTc8njS2AUoVK0PSFb/4AVooN303PWvz0S8nHXGvDmkk7aYtBzpb2K3
-						qKx+BvyTDuJQF/TcEZAKHme3FVGd29tJSLVNtFs86Dtnu15uj6f6EtenaZQ9aF6Z
-						r9f1TH5cAN10k6epmK0PGxXHvv9ymEVhJMW1p1wiKDfakqOiytlpG1Ltjuz+nl6J
-						hMlWZASCK1lBSFRa78Vb+PqHARZvs0nvrjriaPGfA4JIttXTSQIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQAgVzb1cy/TwNSZh3yLMaeBQlMlvZATKqIk3KRYmXo3qAJw
-						ZvK1t38aPzStE7CB8zq+xdp7oUet1/Arus9RAQb/1MUaWyvHnXzstO/aBctwu7QR
-						uqfDg4n13Rhoy5Id370cjLlUKPkkYjvtz3mqaaG2D5xGM88lYznPXBAwjitRYb6F
-						/llj4EdobocZoTO/p3Q1jneiw9q8Sz0Xo0YO5G/G5PqsRk6dzabdbgHhr32fL9H2
-						elD+LKh00BMxGfto3F4AuID2qRcaI+BHK2nK1tKYJgOJ57TarUPbevYx+MN5zUaQ
-						qGIbeRaq+jbj1N5J6kc5YbZDPuvT6BjH0yqKQBCI
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pembrokeshire.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pembrokeshire.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">Pembrokeshire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Pembrokeshire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.pembrokeshire.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support Dept</GivenName>
-    <EmailAddress>mailto:mekon@pembrokeshire.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Gardner</SurName>
-    <EmailAddress>mailto:r.gardner@pembrokeshire.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.pennkey.upenn.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pennkey.upenn.edu-idp-shibboleth.xml
deleted file mode 100644
index 2f9a6490..00000000
--- a/swamid-interfederations-2.0/idp.pennkey.upenn.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,70 +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://idp.pennkey.upenn.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">upenn.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Pennsylvania</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.upenn.edu/computing/weblogin/shibboleth/attribute.html</mdui:InformationURL>
-        <mdui:Logo height="150" width="466" xml:lang="en">https://idp.pennkey.upenn.edu/UPenn_logo.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>
-MIIDQDCCAiigAwIBAgIVAIW7U17BF4OIuf7KKeJ2n7iZo4sLMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFWlkcC5wZW5ua2V5LnVwZW5uLmVkdTAeFw0xMTAzMzEx
-NTU0MDRaFw0zMTAzMzExNTU0MDRaMCAxHjAcBgNVBAMTFWlkcC5wZW5ua2V5LnVw
-ZW5uLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIEhMlhqtKBa
-i3JwvaN1iMN6t9WUk8jRfd34HrDIpMkziZeVobbwdBhO2Rj3568dnsKlVNEaj7Zr
-3Rf2yUzqb3VfjkW0bLDX0hiJDxogQH5cL2q8cl8jNpFjU40ptKbY5VTFkrR9YAfb
-09mefQcyB5kvFoR8RASSw+9Ea+D1HKEEOaCyy2miwZVdvrCC4sAlsVX9kdaUwo4p
-o7dMpXKEjXEkByGKBh7VHB23OYaSC0gOvcOBy4dYjP3FqL4u8Yk3h9Ir6d3raGCl
-RsdPzH/kHrYbkuWT4pS5b41Ptrjal6mbGK+pKLGIkld5a9sipbjh3cwXm5nFpOTE
-OEWdmBEJkuECAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLnBlbm5rZXkudXBlbm4u
-ZWR1hixodHRwczovL2lkcC5wZW5ua2V5LnVwZW5uLmVkdS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUxDTQGrw4/7tu0/9D7BGoULqcWL4wDQYJKoZIhvcNAQEFBQAD
-ggEBAEkaTyQ3eC8thudSbBAh7bWADu2coDnw0FuWwcmI9ZbVHVU+HKbij5k5phFX
-DZaSTlZIwNkAeV4QTLS15TWmgsdaIxBBKfTfZJNXskfg6++2n91n4BfcDPFdjfn9
-sfp4DKK1/2es+OtgLQVIM1lMU3ZzNGaSr/6UhF5zvY+M1RpxwG3//nBm8y2rOAt7
-Y/REplQZ1ZwSoTxRxPhDa/Hflq+6mzWGdyCYDdq2Nn4Qk0bMnsNvZj3svVJeBfiG
-lnWwaH354x1lW83hhH/URqtxrgkftZ/oUVZCUruU3b5ytcHOYs/vXRTkRFsnb/EN
-iWe0xy1RO5prB/x5xli9fGaUdwE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pennkey.upenn.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pennkey.upenn.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pennkey.upenn.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Pennsylvania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Pennsylvania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.upenn.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UPenn WebLogin Support</md:GivenName>
-    <md:EmailAddress>weblogin-help@isc.upenn.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>UPenn WebLogin Support</md:GivenName>
-    <md:EmailAddress>weblogin-help@isc.upenn.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UPenn WebLogin Support</md:GivenName>
-    <md:EmailAddress>weblogin-help@isc.upenn.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ph-freiburg.de.xml b/swamid-interfederations-2.0/idp.ph-freiburg.de.xml
deleted file mode 100644
index 21727df0..00000000
--- a/swamid-interfederations-2.0/idp.ph-freiburg.de.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ph-freiburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-freiburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-freiburg.de,O=Paedagogische Hochschule Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0XYvTANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMIRnJlaWJ1
-cmcxKjAoBgNVBAoTIVBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBGcmVpYnVyZzEM
-MAoGA1UECxMDWklLMREwDwYDVQQDEwhQSC1GUiBDQTEhMB8GCSqGSIb3DQEJARYS
-cGtpQHBoLWZyZWlidXJnLmRlMB4XDTA5MTIxNDE1MzUxMFoXDTE0MTIxMzE1MzUx
-MFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-ETAPBgNVBAcTCEZyZWlidXJnMSowKAYDVQQKEyFQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgRnJlaWJ1cmcxGzAZBgNVBAMTEmlkcC5waC1mcmVpYnVyZy5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM828KxElHwjl/c6j9CG8AFT+y7J
-4w4yw0qc9Up8zZtzQPuJa+xaG3D3vDcfYB12i2mqdsOrB2ONYUSBgq29myZ6h1kx
-SqQTuOS0Ms+L6xH40XYkApDq76knlDgSzVWy3rnoT539QXLwyo5lMjqqo+/1a5hV
-KP3fygx0BRO45IGgfgvvjSHvEuxWOSTFYSFawj1QhZj1Kdr5LORt1BhG02QADVnA
-j4cTA3gv9O/MN9MnViBM4Vmp4pIUi7SgcwGLxAQcDgoaA4LADU2PF2qsoKCdJOv9
-W4LKtLLqv8rrLajinD/F6rFfbF0Y0MkiE/wQKHY6+DE2LbP5EZwSc8vj5a8CAwEA
-AaOCAaswggGnMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUbBM+NKAEus52mOzdt5CcTaSKs8Qw
-HwYDVR0jBBgwFoAUcc1Tb+nFrN3ri2RPPjhAO2OMRaIwgYgGA1UdHwSBgDB+MD2g
-O6A5hjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWZyZWlidXJnLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMD2gO6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLWZy
-ZWlidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBH
-BggrBgEFBQcwAoY7aHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1mcmVpYnVyZy1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvcGgtZnJlaWJ1cmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQB50CER7ZpXfLAHmrAOUCQXWTDAYWmRCx+kuM93
-LmsV51v9wj3ABXW6gTYf5/uBOqepakXVh6F4UDrOMudsyANOGVAyjKKGsf9O80y2
-RcB44enObtzulPJruBlTjuDeJa0JMG2fktq/G24OQ0EbsE/iU7Bjzi/bhBJ8PZ/Q
-+C2L4u2g+MzuP715KXq0TvF1WrqU6E4SlNo57GGwOTEcc236ldrWkA7E2c27x0Gr
-ACQ2fRteTKA1w2KTSEDlL+tI4L0fj4Vs/6utxsFGQKsLlZh3XYJV6UN+LWuuV4Ld
-skKvylp9V9RQYU0paW2EUEcSWQ4LqNBNFBfyMYd0FkhipnTt
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-freiburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-freiburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ph-freiburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ph-freiburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ph-freiburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ph-freiburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-freiburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-freiburg.de,O=Paedagogische Hochschule Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0XYvTANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMIRnJlaWJ1
-cmcxKjAoBgNVBAoTIVBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBGcmVpYnVyZzEM
-MAoGA1UECxMDWklLMREwDwYDVQQDEwhQSC1GUiBDQTEhMB8GCSqGSIb3DQEJARYS
-cGtpQHBoLWZyZWlidXJnLmRlMB4XDTA5MTIxNDE1MzUxMFoXDTE0MTIxMzE1MzUx
-MFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-ETAPBgNVBAcTCEZyZWlidXJnMSowKAYDVQQKEyFQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgRnJlaWJ1cmcxGzAZBgNVBAMTEmlkcC5waC1mcmVpYnVyZy5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM828KxElHwjl/c6j9CG8AFT+y7J
-4w4yw0qc9Up8zZtzQPuJa+xaG3D3vDcfYB12i2mqdsOrB2ONYUSBgq29myZ6h1kx
-SqQTuOS0Ms+L6xH40XYkApDq76knlDgSzVWy3rnoT539QXLwyo5lMjqqo+/1a5hV
-KP3fygx0BRO45IGgfgvvjSHvEuxWOSTFYSFawj1QhZj1Kdr5LORt1BhG02QADVnA
-j4cTA3gv9O/MN9MnViBM4Vmp4pIUi7SgcwGLxAQcDgoaA4LADU2PF2qsoKCdJOv9
-W4LKtLLqv8rrLajinD/F6rFfbF0Y0MkiE/wQKHY6+DE2LbP5EZwSc8vj5a8CAwEA
-AaOCAaswggGnMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUbBM+NKAEus52mOzdt5CcTaSKs8Qw
-HwYDVR0jBBgwFoAUcc1Tb+nFrN3ri2RPPjhAO2OMRaIwgYgGA1UdHwSBgDB+MD2g
-O6A5hjdodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWZyZWlidXJnLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMD2gO6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLWZy
-ZWlidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGiBggrBgEFBQcBAQSBlTCBkjBH
-BggrBgEFBQcwAoY7aHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1mcmVpYnVyZy1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRwYIKwYBBQUHMAKGO2h0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvcGgtZnJlaWJ1cmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQB50CER7ZpXfLAHmrAOUCQXWTDAYWmRCx+kuM93
-LmsV51v9wj3ABXW6gTYf5/uBOqepakXVh6F4UDrOMudsyANOGVAyjKKGsf9O80y2
-RcB44enObtzulPJruBlTjuDeJa0JMG2fktq/G24OQ0EbsE/iU7Bjzi/bhBJ8PZ/Q
-+C2L4u2g+MzuP715KXq0TvF1WrqU6E4SlNo57GGwOTEcc236ldrWkA7E2c27x0Gr
-ACQ2fRteTKA1w2KTSEDlL+tI4L0fj4Vs/6utxsFGQKsLlZh3XYJV6UN+LWuuV4Ld
-skKvylp9V9RQYU0paW2EUEcSWQ4LqNBNFBfyMYd0FkhipnTt
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-freiburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-freiburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Pädagogische Hochschule Freiburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PH-Freiburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-freiburg.de/zik/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Stephan</GivenName>
-    <SurName>Lauffer</SurName>
-    <EmailAddress>lauffer@ph-freiburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Martin</GivenName>
-    <SurName>Duffner</SurName>
-    <EmailAddress>duffner@ph-freiburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ph-gmuend.de.xml b/swamid-interfederations-2.0/idp.ph-gmuend.de.xml
deleted file mode 100644
index 8a5f7562..00000000
--- a/swamid-interfederations-2.0/idp.ph-gmuend.de.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ph-gmuend.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-gmuend.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-gmuend.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-gmuend.de,OU=MIZ,O=Paedagogische Hochschule Schwaebisch Gmuend,L=Schwaebisch Gmuend,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5jCCBM6gAwIBAgIED0r8wTANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEbMBkGA1UEBxMSU2Nod2Fl
-YmlzY2ggR211ZW5kMTQwMgYDVQQKEytQYWVkYWdvZ2lzY2hlIEhvY2hzY2h1bGUg
-U2Nod2FlYmlzY2ggR211ZW5kMQwwCgYDVQQLEwNNSVoxITAfBgNVBAMTGFBIIFNj
-aHdhZWJpc2NoIEdtdWVuZCBDQTEeMBwGCSqGSIb3DQEJARYPcmFAcGgtZ211ZW5k
-LmRlMB4XDTA5MTIxODEzMTAwOVoXDTE0MTIxNzEzMTAwOVowgaYxCzAJBgNVBAYT
-AkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxGzAZBgNVBAcTElNjaHdh
-ZWJpc2NoIEdtdWVuZDE0MDIGA1UEChMrUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxl
-IFNjaHdhZWJpc2NoIEdtdWVuZDEMMAoGA1UECxMDTUlaMRkwFwYDVQQDExBpZHAu
-cGgtZ211ZW5kLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQ
-aKnQbUq2fijaJ67ZvGkKGk5VowVDEuVpYueKLvpTxx6cEZoT04SylseQju3JUiA+
-ko8sq0cSQCv9QC7V13+yRMZwyYTRAfGuqD6y9CRqdjOBqiGtMKf3b42L+x/0vNFw
-Cs3DVJWC+VbnWOxQqX+oVfIjjADByD1UKUA7tUd8XhsHVeLuIOwJRvz57yQwLQuL
-YYTR4QvO8U5mBvARkvMv4PUFFwYI/bh6TDX234UV5p8Ts1KNvWA87mQNAb5Ww9CA
-z7n7IX3NM31u0SdCJeIEcyhrLHRYsYKOqDW3aC0E2ECK4Sx3J4S7pK1+dMO8mRjq
-ThZYERE/ggE6YSkxVQIDAQABo4IB8DCCAewwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRuSxSz
-wOTL2FpbBa3409qUeFc4wjAfBgNVHSMEGDAWgBRf9JFau8D711VkIvv4P4cNqZ3B
-LDAaBgNVHREEEzARgQ9yYUBwaC1nbXVlbmQuZGUwgZ0GA1UdHwSBlTCBkjBHoEWg
-Q4ZBaHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQt
-Y2EvcHViL2NybC9jYWNybC5jcmwwR6BFoEOGQWh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvcGgtc2Nod2FlYmlzY2gtZ211ZW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIG2
-BggrBgEFBQcBAQSBqTCBpjBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MFEGCCsGAQUFBzAChkVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLXNjaHdh
-ZWJpc2NoLWdtdWVuZC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAAuYqXAmdmJUmgHG2f6dXLWkthD1M+QayGp3W42RsXS2pEGwFptq
-RS+xBVRiNRYCFF40b/Ggu7PVChltD/7cUSjeSQQ9XS/SNt6HRrkaoyGDg4TpQYsG
-ieaK4OAiiP+h0w/UTUwljo9AqJxQd9bov703EnqYuQcReOTBmeL+yzKqa51DTNLe
-/YNbZOb7W3xd4JWY8bDodU1YUvLQo7lixMNCuAQZlkuFiVAdni0xSihJxsDtHx4C
-t4Rp083EJmHLIlB7F7ILgM8v8FmMwjqv2ZZ2lQa4AxQc7ww+VgENSTVXZ09JsFAC
-LeUps76Ek484SMahrIkadUnVpLP5zOo/lss=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-gmuend.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-gmuend.de,OU=MIZ,O=Paedagogische Hochschule Schwaebisch Gmuend,L=Schwaebisch Gmuend,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5jCCBM6gAwIBAgIED0r8wTANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEbMBkGA1UEBxMSU2Nod2Fl
-YmlzY2ggR211ZW5kMTQwMgYDVQQKEytQYWVkYWdvZ2lzY2hlIEhvY2hzY2h1bGUg
-U2Nod2FlYmlzY2ggR211ZW5kMQwwCgYDVQQLEwNNSVoxITAfBgNVBAMTGFBIIFNj
-aHdhZWJpc2NoIEdtdWVuZCBDQTEeMBwGCSqGSIb3DQEJARYPcmFAcGgtZ211ZW5k
-LmRlMB4XDTA5MTIxODEzMTAwOVoXDTE0MTIxNzEzMTAwOVowgaYxCzAJBgNVBAYT
-AkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxGzAZBgNVBAcTElNjaHdh
-ZWJpc2NoIEdtdWVuZDE0MDIGA1UEChMrUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxl
-IFNjaHdhZWJpc2NoIEdtdWVuZDEMMAoGA1UECxMDTUlaMRkwFwYDVQQDExBpZHAu
-cGgtZ211ZW5kLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQ
-aKnQbUq2fijaJ67ZvGkKGk5VowVDEuVpYueKLvpTxx6cEZoT04SylseQju3JUiA+
-ko8sq0cSQCv9QC7V13+yRMZwyYTRAfGuqD6y9CRqdjOBqiGtMKf3b42L+x/0vNFw
-Cs3DVJWC+VbnWOxQqX+oVfIjjADByD1UKUA7tUd8XhsHVeLuIOwJRvz57yQwLQuL
-YYTR4QvO8U5mBvARkvMv4PUFFwYI/bh6TDX234UV5p8Ts1KNvWA87mQNAb5Ww9CA
-z7n7IX3NM31u0SdCJeIEcyhrLHRYsYKOqDW3aC0E2ECK4Sx3J4S7pK1+dMO8mRjq
-ThZYERE/ggE6YSkxVQIDAQABo4IB8DCCAewwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRuSxSz
-wOTL2FpbBa3409qUeFc4wjAfBgNVHSMEGDAWgBRf9JFau8D711VkIvv4P4cNqZ3B
-LDAaBgNVHREEEzARgQ9yYUBwaC1nbXVlbmQuZGUwgZ0GA1UdHwSBlTCBkjBHoEWg
-Q4ZBaHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQt
-Y2EvcHViL2NybC9jYWNybC5jcmwwR6BFoEOGQWh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvcGgtc2Nod2FlYmlzY2gtZ211ZW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIG2
-BggrBgEFBQcBAQSBqTCBpjBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MFEGCCsGAQUFBzAChkVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLXNjaHdh
-ZWJpc2NoLWdtdWVuZC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAAuYqXAmdmJUmgHG2f6dXLWkthD1M+QayGp3W42RsXS2pEGwFptq
-RS+xBVRiNRYCFF40b/Ggu7PVChltD/7cUSjeSQQ9XS/SNt6HRrkaoyGDg4TpQYsG
-ieaK4OAiiP+h0w/UTUwljo9AqJxQd9bov703EnqYuQcReOTBmeL+yzKqa51DTNLe
-/YNbZOb7W3xd4JWY8bDodU1YUvLQo7lixMNCuAQZlkuFiVAdni0xSihJxsDtHx4C
-t4Rp083EJmHLIlB7F7ILgM8v8FmMwjqv2ZZ2lQa4AxQc7ww+VgENSTVXZ09JsFAC
-LeUps76Ek484SMahrIkadUnVpLP5zOo/lss=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-gmuend.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-gmuend.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ph-gmuend.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ph-gmuend.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ph-gmuend.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ph-gmuend.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-gmuend.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-gmuend.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-gmuend.de,OU=MIZ,O=Paedagogische Hochschule Schwaebisch Gmuend,L=Schwaebisch Gmuend,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5jCCBM6gAwIBAgIED0r8wTANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEbMBkGA1UEBxMSU2Nod2Fl
-YmlzY2ggR211ZW5kMTQwMgYDVQQKEytQYWVkYWdvZ2lzY2hlIEhvY2hzY2h1bGUg
-U2Nod2FlYmlzY2ggR211ZW5kMQwwCgYDVQQLEwNNSVoxITAfBgNVBAMTGFBIIFNj
-aHdhZWJpc2NoIEdtdWVuZCBDQTEeMBwGCSqGSIb3DQEJARYPcmFAcGgtZ211ZW5k
-LmRlMB4XDTA5MTIxODEzMTAwOVoXDTE0MTIxNzEzMTAwOVowgaYxCzAJBgNVBAYT
-AkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxGzAZBgNVBAcTElNjaHdh
-ZWJpc2NoIEdtdWVuZDE0MDIGA1UEChMrUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxl
-IFNjaHdhZWJpc2NoIEdtdWVuZDEMMAoGA1UECxMDTUlaMRkwFwYDVQQDExBpZHAu
-cGgtZ211ZW5kLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQ
-aKnQbUq2fijaJ67ZvGkKGk5VowVDEuVpYueKLvpTxx6cEZoT04SylseQju3JUiA+
-ko8sq0cSQCv9QC7V13+yRMZwyYTRAfGuqD6y9CRqdjOBqiGtMKf3b42L+x/0vNFw
-Cs3DVJWC+VbnWOxQqX+oVfIjjADByD1UKUA7tUd8XhsHVeLuIOwJRvz57yQwLQuL
-YYTR4QvO8U5mBvARkvMv4PUFFwYI/bh6TDX234UV5p8Ts1KNvWA87mQNAb5Ww9CA
-z7n7IX3NM31u0SdCJeIEcyhrLHRYsYKOqDW3aC0E2ECK4Sx3J4S7pK1+dMO8mRjq
-ThZYERE/ggE6YSkxVQIDAQABo4IB8DCCAewwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRuSxSz
-wOTL2FpbBa3409qUeFc4wjAfBgNVHSMEGDAWgBRf9JFau8D711VkIvv4P4cNqZ3B
-LDAaBgNVHREEEzARgQ9yYUBwaC1nbXVlbmQuZGUwgZ0GA1UdHwSBlTCBkjBHoEWg
-Q4ZBaHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQt
-Y2EvcHViL2NybC9jYWNybC5jcmwwR6BFoEOGQWh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvcGgtc2Nod2FlYmlzY2gtZ211ZW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIG2
-BggrBgEFBQcBAQSBqTCBpjBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MFEGCCsGAQUFBzAChkVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLXNjaHdh
-ZWJpc2NoLWdtdWVuZC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAAuYqXAmdmJUmgHG2f6dXLWkthD1M+QayGp3W42RsXS2pEGwFptq
-RS+xBVRiNRYCFF40b/Ggu7PVChltD/7cUSjeSQQ9XS/SNt6HRrkaoyGDg4TpQYsG
-ieaK4OAiiP+h0w/UTUwljo9AqJxQd9bov703EnqYuQcReOTBmeL+yzKqa51DTNLe
-/YNbZOb7W3xd4JWY8bDodU1YUvLQo7lixMNCuAQZlkuFiVAdni0xSihJxsDtHx4C
-t4Rp083EJmHLIlB7F7ILgM8v8FmMwjqv2ZZ2lQa4AxQc7ww+VgENSTVXZ09JsFAC
-LeUps76Ek484SMahrIkadUnVpLP5zOo/lss=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-gmuend.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-gmuend.de,OU=MIZ,O=Paedagogische Hochschule Schwaebisch Gmuend,L=Schwaebisch Gmuend,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF5jCCBM6gAwIBAgIED0r8wTANBgkqhkiG9w0BAQUFADCBzjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEbMBkGA1UEBxMSU2Nod2Fl
-YmlzY2ggR211ZW5kMTQwMgYDVQQKEytQYWVkYWdvZ2lzY2hlIEhvY2hzY2h1bGUg
-U2Nod2FlYmlzY2ggR211ZW5kMQwwCgYDVQQLEwNNSVoxITAfBgNVBAMTGFBIIFNj
-aHdhZWJpc2NoIEdtdWVuZCBDQTEeMBwGCSqGSIb3DQEJARYPcmFAcGgtZ211ZW5k
-LmRlMB4XDTA5MTIxODEzMTAwOVoXDTE0MTIxNzEzMTAwOVowgaYxCzAJBgNVBAYT
-AkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxGzAZBgNVBAcTElNjaHdh
-ZWJpc2NoIEdtdWVuZDE0MDIGA1UEChMrUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxl
-IFNjaHdhZWJpc2NoIEdtdWVuZDEMMAoGA1UECxMDTUlaMRkwFwYDVQQDExBpZHAu
-cGgtZ211ZW5kLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQ
-aKnQbUq2fijaJ67ZvGkKGk5VowVDEuVpYueKLvpTxx6cEZoT04SylseQju3JUiA+
-ko8sq0cSQCv9QC7V13+yRMZwyYTRAfGuqD6y9CRqdjOBqiGtMKf3b42L+x/0vNFw
-Cs3DVJWC+VbnWOxQqX+oVfIjjADByD1UKUA7tUd8XhsHVeLuIOwJRvz57yQwLQuL
-YYTR4QvO8U5mBvARkvMv4PUFFwYI/bh6TDX234UV5p8Ts1KNvWA87mQNAb5Ww9CA
-z7n7IX3NM31u0SdCJeIEcyhrLHRYsYKOqDW3aC0E2ECK4Sx3J4S7pK1+dMO8mRjq
-ThZYERE/ggE6YSkxVQIDAQABo4IB8DCCAewwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRuSxSz
-wOTL2FpbBa3409qUeFc4wjAfBgNVHSMEGDAWgBRf9JFau8D711VkIvv4P4cNqZ3B
-LDAaBgNVHREEEzARgQ9yYUBwaC1nbXVlbmQuZGUwgZ0GA1UdHwSBlTCBkjBHoEWg
-Q4ZBaHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQt
-Y2EvcHViL2NybC9jYWNybC5jcmwwR6BFoEOGQWh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvcGgtc2Nod2FlYmlzY2gtZ211ZW5kLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIG2
-BggrBgEFBQcBAQSBqTCBpjBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9waC1zY2h3YWViaXNjaC1nbXVlbmQtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MFEGCCsGAQUFBzAChkVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLXNjaHdh
-ZWJpc2NoLWdtdWVuZC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQEFBQADggEBAAuYqXAmdmJUmgHG2f6dXLWkthD1M+QayGp3W42RsXS2pEGwFptq
-RS+xBVRiNRYCFF40b/Ggu7PVChltD/7cUSjeSQQ9XS/SNt6HRrkaoyGDg4TpQYsG
-ieaK4OAiiP+h0w/UTUwljo9AqJxQd9bov703EnqYuQcReOTBmeL+yzKqa51DTNLe
-/YNbZOb7W3xd4JWY8bDodU1YUvLQo7lixMNCuAQZlkuFiVAdni0xSihJxsDtHx4C
-t4Rp083EJmHLIlB7F7ILgM8v8FmMwjqv2ZZ2lQa4AxQc7ww+VgENSTVXZ09JsFAC
-LeUps76Ek484SMahrIkadUnVpLP5zOo/lss=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-gmuend.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-gmuend.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">PH Schwaebisch Gmuend</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PH Schwäbisch Gmünd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-gmuend.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Christoph</GivenName>
-    <SurName>List</SurName>
-    <EmailAddress>list@ph-ludwigsburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Markus</GivenName>
-    <SurName>Opferkuch</SurName>
-    <EmailAddress>markus.opferkuch@ph-gmuend.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ph-karlsruhe.de.xml b/swamid-interfederations-2.0/idp.ph-karlsruhe.de.xml
deleted file mode 100644
index 3a50ca28..00000000
--- a/swamid-interfederations-2.0/idp.ph-karlsruhe.de.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ph-karlsruhe.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-karlsruhe.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-karlsruhe.de,O=Paedagogische Hochschule Karlsruhe,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIED30NUDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
-RTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEthcmxzcnVoZTEM
-MAoGA1UECxMDWklNMRAwDgYDVQQDEwdQSEtBIENBMSIwIAYJKoZIhvcNAQkBFhNw
-a2lAcGgta2FybHNydWhlLmRlMB4XDTEwMDEyNTEyMzQwOFoXDTE1MDEyNDEyMzQw
-OFowgYkxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCUthcmxzcnVoZTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2No
-c2NodWxlIEthcmxzcnVoZTEcMBoGA1UEAxMTaWRwLnBoLWthcmxzcnVoZS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPFriLqtbhaAaw8XKBhn5VRl
-T6NXyIjyxOzwVJHb41gqQ4/xsvEknqYvuO+yXK8HyngsTSme9i4lLLE7v8WTjxlg
-qV12odFRuVuUqk1tbjn90vNtjuVTAz3GQfd+BSFUPJdgapgqWXfWNOePjGfIDewb
-4NPJja7v2C/7NCe6kEyzRdk+EMvBr8Egl9eeT4eRRA5VAyIRyW7la9g9vdMu1otY
-Q5Rdk76Mz5gLraFWl21Mtf27/K+BmWV/6FlNWwcg9tj2K4jg+fQEm/VoM7ODMu3p
-beipeji8T0qJrWW2UA8VbDS6YfURz1HD9v4K9yXwyytVRynOu5LBvPNeHFsaOp0C
-AwEAAaOCAaYwggGiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBQWRuVoiWRfR6Z5kYikbLWlGW/qyjAfBgNVHSME
-GDAWgBS39nw7HZv7cPa/FT94DlxmLJhyNDCBiwYDVR0fBIGDMIGAMD6gPKA6hjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9waC1rYXJsc3J1
-aGUtY2EvcHViL2NybC9jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsG
-AQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvcGgta2FybHNydWhlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAfWqWmdLsnzrie7tL4xRWiQPSqxb5KwABvUg8ytXA
-4mNc9TzSFoH7wI/7lZI3hThtlw/XZ6Z9MXv7+rJHBRvpx03RE5ALSyj2iUWo8ID0
-Q+yXtgLjFHfgp4BwWt9ZENAzKOKiV9dr/QNrLJeUerEiCKWzg3+MnCnKIS3VA1q/
-7OQ9vPm4bWtoY95ZLlem7f1q2jWztGAYrGKd6+dd/Wxc+Lr83Ak2wdY7zDlUtciG
-N5XHuU1KyEmbsts3AELLtKN9HC2UMvoOeYAUo5O5jwAjDJe4rT8JHGm48AlEp9IP
-kqvDA00yfJM96UJwtEhiKIwA3DfK4gmpAxVuzuqa0X66QA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-karlsruhe.de,O=Paedagogische Hochschule Karlsruhe,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIED30NUDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
-RTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEthcmxzcnVoZTEM
-MAoGA1UECxMDWklNMRAwDgYDVQQDEwdQSEtBIENBMSIwIAYJKoZIhvcNAQkBFhNw
-a2lAcGgta2FybHNydWhlLmRlMB4XDTEwMDEyNTEyMzQwOFoXDTE1MDEyNDEyMzQw
-OFowgYkxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCUthcmxzcnVoZTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2No
-c2NodWxlIEthcmxzcnVoZTEcMBoGA1UEAxMTaWRwLnBoLWthcmxzcnVoZS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPFriLqtbhaAaw8XKBhn5VRl
-T6NXyIjyxOzwVJHb41gqQ4/xsvEknqYvuO+yXK8HyngsTSme9i4lLLE7v8WTjxlg
-qV12odFRuVuUqk1tbjn90vNtjuVTAz3GQfd+BSFUPJdgapgqWXfWNOePjGfIDewb
-4NPJja7v2C/7NCe6kEyzRdk+EMvBr8Egl9eeT4eRRA5VAyIRyW7la9g9vdMu1otY
-Q5Rdk76Mz5gLraFWl21Mtf27/K+BmWV/6FlNWwcg9tj2K4jg+fQEm/VoM7ODMu3p
-beipeji8T0qJrWW2UA8VbDS6YfURz1HD9v4K9yXwyytVRynOu5LBvPNeHFsaOp0C
-AwEAAaOCAaYwggGiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBQWRuVoiWRfR6Z5kYikbLWlGW/qyjAfBgNVHSME
-GDAWgBS39nw7HZv7cPa/FT94DlxmLJhyNDCBiwYDVR0fBIGDMIGAMD6gPKA6hjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9waC1rYXJsc3J1
-aGUtY2EvcHViL2NybC9jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsG
-AQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvcGgta2FybHNydWhlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAfWqWmdLsnzrie7tL4xRWiQPSqxb5KwABvUg8ytXA
-4mNc9TzSFoH7wI/7lZI3hThtlw/XZ6Z9MXv7+rJHBRvpx03RE5ALSyj2iUWo8ID0
-Q+yXtgLjFHfgp4BwWt9ZENAzKOKiV9dr/QNrLJeUerEiCKWzg3+MnCnKIS3VA1q/
-7OQ9vPm4bWtoY95ZLlem7f1q2jWztGAYrGKd6+dd/Wxc+Lr83Ak2wdY7zDlUtciG
-N5XHuU1KyEmbsts3AELLtKN9HC2UMvoOeYAUo5O5jwAjDJe4rT8JHGm48AlEp9IP
-kqvDA00yfJM96UJwtEhiKIwA3DfK4gmpAxVuzuqa0X66QA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-karlsruhe.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ph-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ph-karlsruhe.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ph-karlsruhe.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ph-karlsruhe.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-karlsruhe.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-karlsruhe.de,O=Paedagogische Hochschule Karlsruhe,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIED30NUDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
-RTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEthcmxzcnVoZTEM
-MAoGA1UECxMDWklNMRAwDgYDVQQDEwdQSEtBIENBMSIwIAYJKoZIhvcNAQkBFhNw
-a2lAcGgta2FybHNydWhlLmRlMB4XDTEwMDEyNTEyMzQwOFoXDTE1MDEyNDEyMzQw
-OFowgYkxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCUthcmxzcnVoZTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2No
-c2NodWxlIEthcmxzcnVoZTEcMBoGA1UEAxMTaWRwLnBoLWthcmxzcnVoZS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPFriLqtbhaAaw8XKBhn5VRl
-T6NXyIjyxOzwVJHb41gqQ4/xsvEknqYvuO+yXK8HyngsTSme9i4lLLE7v8WTjxlg
-qV12odFRuVuUqk1tbjn90vNtjuVTAz3GQfd+BSFUPJdgapgqWXfWNOePjGfIDewb
-4NPJja7v2C/7NCe6kEyzRdk+EMvBr8Egl9eeT4eRRA5VAyIRyW7la9g9vdMu1otY
-Q5Rdk76Mz5gLraFWl21Mtf27/K+BmWV/6FlNWwcg9tj2K4jg+fQEm/VoM7ODMu3p
-beipeji8T0qJrWW2UA8VbDS6YfURz1HD9v4K9yXwyytVRynOu5LBvPNeHFsaOp0C
-AwEAAaOCAaYwggGiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBQWRuVoiWRfR6Z5kYikbLWlGW/qyjAfBgNVHSME
-GDAWgBS39nw7HZv7cPa/FT94DlxmLJhyNDCBiwYDVR0fBIGDMIGAMD6gPKA6hjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9waC1rYXJsc3J1
-aGUtY2EvcHViL2NybC9jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsG
-AQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvcGgta2FybHNydWhlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAfWqWmdLsnzrie7tL4xRWiQPSqxb5KwABvUg8ytXA
-4mNc9TzSFoH7wI/7lZI3hThtlw/XZ6Z9MXv7+rJHBRvpx03RE5ALSyj2iUWo8ID0
-Q+yXtgLjFHfgp4BwWt9ZENAzKOKiV9dr/QNrLJeUerEiCKWzg3+MnCnKIS3VA1q/
-7OQ9vPm4bWtoY95ZLlem7f1q2jWztGAYrGKd6+dd/Wxc+Lr83Ak2wdY7zDlUtciG
-N5XHuU1KyEmbsts3AELLtKN9HC2UMvoOeYAUo5O5jwAjDJe4rT8JHGm48AlEp9IP
-kqvDA00yfJM96UJwtEhiKIwA3DfK4gmpAxVuzuqa0X66QA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-karlsruhe.de,O=Paedagogische Hochschule Karlsruhe,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIED30NUDANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJE
-RTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEthcmxzcnVoZTEM
-MAoGA1UECxMDWklNMRAwDgYDVQQDEwdQSEtBIENBMSIwIAYJKoZIhvcNAQkBFhNw
-a2lAcGgta2FybHNydWhlLmRlMB4XDTEwMDEyNTEyMzQwOFoXDTE1MDEyNDEyMzQw
-OFowgYkxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcx
-EjAQBgNVBAcTCUthcmxzcnVoZTErMCkGA1UEChMiUGFlZGFnb2dpc2NoZSBIb2No
-c2NodWxlIEthcmxzcnVoZTEcMBoGA1UEAxMTaWRwLnBoLWthcmxzcnVoZS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPFriLqtbhaAaw8XKBhn5VRl
-T6NXyIjyxOzwVJHb41gqQ4/xsvEknqYvuO+yXK8HyngsTSme9i4lLLE7v8WTjxlg
-qV12odFRuVuUqk1tbjn90vNtjuVTAz3GQfd+BSFUPJdgapgqWXfWNOePjGfIDewb
-4NPJja7v2C/7NCe6kEyzRdk+EMvBr8Egl9eeT4eRRA5VAyIRyW7la9g9vdMu1otY
-Q5Rdk76Mz5gLraFWl21Mtf27/K+BmWV/6FlNWwcg9tj2K4jg+fQEm/VoM7ODMu3p
-beipeji8T0qJrWW2UA8VbDS6YfURz1HD9v4K9yXwyytVRynOu5LBvPNeHFsaOp0C
-AwEAAaOCAaYwggGiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBQWRuVoiWRfR6Z5kYikbLWlGW/qyjAfBgNVHSME
-GDAWgBS39nw7HZv7cPa/FT94DlxmLJhyNDCBiwYDVR0fBIGDMIGAMD6gPKA6hjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9waC1rYXJsc3J1
-aGUtY2EvcHViL2NybC9jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgGCCsG
-AQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWthcmxzcnVoZS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvcGgta2FybHNydWhlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAfWqWmdLsnzrie7tL4xRWiQPSqxb5KwABvUg8ytXA
-4mNc9TzSFoH7wI/7lZI3hThtlw/XZ6Z9MXv7+rJHBRvpx03RE5ALSyj2iUWo8ID0
-Q+yXtgLjFHfgp4BwWt9ZENAzKOKiV9dr/QNrLJeUerEiCKWzg3+MnCnKIS3VA1q/
-7OQ9vPm4bWtoY95ZLlem7f1q2jWztGAYrGKd6+dd/Wxc+Lr83Ak2wdY7zDlUtciG
-N5XHuU1KyEmbsts3AELLtKN9HC2UMvoOeYAUo5O5jwAjDJe4rT8JHGm48AlEp9IP
-kqvDA00yfJM96UJwtEhiKIwA3DfK4gmpAxVuzuqa0X66QA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-karlsruhe.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">PH Karlsruhe</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PH Karlsruhe</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-karlsruhe.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Christoph</GivenName>
-    <SurName>List</SurName>
-    <EmailAddress>list@ph-ludwigsburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Helmut</GivenName>
-    <SurName>Filipp</SurName>
-    <EmailAddress>filipp@ph-karlsruhe.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ph-ludwigsburg.de.xml b/swamid-interfederations-2.0/idp.ph-ludwigsburg.de.xml
deleted file mode 100644
index aee81ee5..00000000
--- a/swamid-interfederations-2.0/idp.ph-ludwigsburg.de.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ph-ludwigsburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lb.ph-ludwigsburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0jCCBLqgAwIBAgIEDz81SDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIwOTE0NDQwOVoXDTE0MTIwODE0NDQwOVow
-gacxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHjAcBgNV
-BAMTFWlkcC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMkQEIsDoi1B59qCHyLsBKYGDUDQADhtwB9IKwzIa6z/Bpnzi84C
-GWQawo38ldADDG3IUH3Hl5ZgnxcpWA1o4Q2YGjlm/5e/37WJo6elr8CoUTac2X/C
-lSPC1ixqXt3EFQmQL+/2qasFA09/ZQqVY60sPhWZ24ye4rpte/8wqAJAFQxt9EPN
-MrZrH8twyGISFmZ14nPRhyfKrwbcFQ8Cjc6s0OzpvLDjy7bWvhU0Yid+UA8BvIhJ
-lCC/iSUUPBQ/tdQINr0othUDyZHbGmzTQ0Q80se3Yy1zFnNtehWPYe0zrfBhBrpR
-xLY5toYo4O+MWjwo0B8gAjRDaFlhuEAHzpcCAwEAAaOCAc8wggHLMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRH
-KqileVWaz7D1moGz0OxdarhLAjAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//9+oA
-goYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0fBIGH
-MIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3NidXJn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEF
-BQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9w
-aC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBBk42cAiBlPx6e
-FrsivSYW5A5mOvQ0AT1WXzb3GW04mxMvOU6L7+uWIN3OJP8j/sF9JgzXwARSTu75
-z08i4ZMm3oQtDJbASGpbmSfls0bF0vgsAAbvOM+4JBhfo0yfUt0O/pxVaL5GzegH
-DyzVsQsstxoDzcc3vVdf70zrOUhUGGanEXHBJ/EJEQ4t8FjnlJm0o2p/wTNs6/zc
-s6oYQCT4b9IPTeZghVW+BkcRIuMdpR/cAX/53Gbrey80wTgjVKAoP4AIS3URIXBW
-p0ACi04yza1yxz2Hm0j/S/kTHhPhiQ2ulrRmg4SPUqQj4isRqLgwASYN0bEWBpL/
-dPUEeVju
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0jCCBLqgAwIBAgIEDz81SDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIwOTE0NDQwOVoXDTE0MTIwODE0NDQwOVow
-gacxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHjAcBgNV
-BAMTFWlkcC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMkQEIsDoi1B59qCHyLsBKYGDUDQADhtwB9IKwzIa6z/Bpnzi84C
-GWQawo38ldADDG3IUH3Hl5ZgnxcpWA1o4Q2YGjlm/5e/37WJo6elr8CoUTac2X/C
-lSPC1ixqXt3EFQmQL+/2qasFA09/ZQqVY60sPhWZ24ye4rpte/8wqAJAFQxt9EPN
-MrZrH8twyGISFmZ14nPRhyfKrwbcFQ8Cjc6s0OzpvLDjy7bWvhU0Yid+UA8BvIhJ
-lCC/iSUUPBQ/tdQINr0othUDyZHbGmzTQ0Q80se3Yy1zFnNtehWPYe0zrfBhBrpR
-xLY5toYo4O+MWjwo0B8gAjRDaFlhuEAHzpcCAwEAAaOCAc8wggHLMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRH
-KqileVWaz7D1moGz0OxdarhLAjAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//9+oA
-goYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0fBIGH
-MIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3NidXJn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEF
-BQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9w
-aC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBBk42cAiBlPx6e
-FrsivSYW5A5mOvQ0AT1WXzb3GW04mxMvOU6L7+uWIN3OJP8j/sF9JgzXwARSTu75
-z08i4ZMm3oQtDJbASGpbmSfls0bF0vgsAAbvOM+4JBhfo0yfUt0O/pxVaL5GzegH
-DyzVsQsstxoDzcc3vVdf70zrOUhUGGanEXHBJ/EJEQ4t8FjnlJm0o2p/wTNs6/zc
-s6oYQCT4b9IPTeZghVW+BkcRIuMdpR/cAX/53Gbrey80wTgjVKAoP4AIS3URIXBW
-p0ACi04yza1yxz2Hm0j/S/kTHhPhiQ2ulrRmg4SPUqQj4isRqLgwASYN0bEWBpL/
-dPUEeVju
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-ludwigsburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-ludwigsburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ph-ludwigsburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ph-ludwigsburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ph-ludwigsburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lb.ph-ludwigsburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0jCCBLqgAwIBAgIEDz81SDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIwOTE0NDQwOVoXDTE0MTIwODE0NDQwOVow
-gacxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHjAcBgNV
-BAMTFWlkcC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMkQEIsDoi1B59qCHyLsBKYGDUDQADhtwB9IKwzIa6z/Bpnzi84C
-GWQawo38ldADDG3IUH3Hl5ZgnxcpWA1o4Q2YGjlm/5e/37WJo6elr8CoUTac2X/C
-lSPC1ixqXt3EFQmQL+/2qasFA09/ZQqVY60sPhWZ24ye4rpte/8wqAJAFQxt9EPN
-MrZrH8twyGISFmZ14nPRhyfKrwbcFQ8Cjc6s0OzpvLDjy7bWvhU0Yid+UA8BvIhJ
-lCC/iSUUPBQ/tdQINr0othUDyZHbGmzTQ0Q80se3Yy1zFnNtehWPYe0zrfBhBrpR
-xLY5toYo4O+MWjwo0B8gAjRDaFlhuEAHzpcCAwEAAaOCAc8wggHLMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRH
-KqileVWaz7D1moGz0OxdarhLAjAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//9+oA
-goYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0fBIGH
-MIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3NidXJn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEF
-BQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9w
-aC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBBk42cAiBlPx6e
-FrsivSYW5A5mOvQ0AT1WXzb3GW04mxMvOU6L7+uWIN3OJP8j/sF9JgzXwARSTu75
-z08i4ZMm3oQtDJbASGpbmSfls0bF0vgsAAbvOM+4JBhfo0yfUt0O/pxVaL5GzegH
-DyzVsQsstxoDzcc3vVdf70zrOUhUGGanEXHBJ/EJEQ4t8FjnlJm0o2p/wTNs6/zc
-s6oYQCT4b9IPTeZghVW+BkcRIuMdpR/cAX/53Gbrey80wTgjVKAoP4AIS3URIXBW
-p0ACi04yza1yxz2Hm0j/S/kTHhPhiQ2ulrRmg4SPUqQj4isRqLgwASYN0bEWBpL/
-dPUEeVju
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ph-ludwigsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ph-ludwigsburg.de,OU=Rechenzentrum,O=Paedagogische Hochschule Ludwigsburg,L=Ludwigsburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0jCCBLqgAwIBAgIEDz81SDANBgkqhkiG9w0BAQUFADCB2jELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEUMBIGA1UEBxMLTHVkd2ln
-c2J1cmcxLTArBgNVBAoTJFBhZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBMdWR3aWdz
-YnVyZzEfMB0GA1UECxMWSG9jaHNjaHVscmVjaGVuemVudHJ1bTEgMB4GA1UEAxMX
-UEggTHVkd2lnc2J1cmcgQ0EgLSBHMDExJjAkBgkqhkiG9w0BCQEWF3J6LWNhQHBo
-LWx1ZHdpZ3NidXJnLmRlMB4XDTA5MTIwOTE0NDQwOVoXDTE0MTIwODE0NDQwOVow
-gacxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxFDAS
-BgNVBAcTC0x1ZHdpZ3NidXJnMS0wKwYDVQQKEyRQYWVkYWdvZ2lzY2hlIEhvY2hz
-Y2h1bGUgTHVkd2lnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHjAcBgNV
-BAMTFWlkcC5waC1sdWR3aWdzYnVyZy5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAMkQEIsDoi1B59qCHyLsBKYGDUDQADhtwB9IKwzIa6z/Bpnzi84C
-GWQawo38ldADDG3IUH3Hl5ZgnxcpWA1o4Q2YGjlm/5e/37WJo6elr8CoUTac2X/C
-lSPC1ixqXt3EFQmQL+/2qasFA09/ZQqVY60sPhWZ24ye4rpte/8wqAJAFQxt9EPN
-MrZrH8twyGISFmZ14nPRhyfKrwbcFQ8Cjc6s0OzpvLDjy7bWvhU0Yid+UA8BvIhJ
-lCC/iSUUPBQ/tdQINr0othUDyZHbGmzTQ0Q80se3Yy1zFnNtehWPYe0zrfBhBrpR
-xLY5toYo4O+MWjwo0B8gAjRDaFlhuEAHzpcCAwEAAaOCAc8wggHLMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRH
-KqileVWaz7D1moGz0OxdarhLAjAfBgNVHSMEGDAWgBQZIWpvm4+pHV6M1f//9+oA
-goYxiDAfBgNVHREEGDAWgRRyekBwaC1sdWR3aWdzYnVyZy5kZTCBjwYDVR0fBIGH
-MIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWx1ZHdpZ3NidXJn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3BoLWx1ZHdpZ3NidXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEF
-BQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9w
-aC1sdWR3aWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcGgtbHVkd2lnc2J1cmctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBBk42cAiBlPx6e
-FrsivSYW5A5mOvQ0AT1WXzb3GW04mxMvOU6L7+uWIN3OJP8j/sF9JgzXwARSTu75
-z08i4ZMm3oQtDJbASGpbmSfls0bF0vgsAAbvOM+4JBhfo0yfUt0O/pxVaL5GzegH
-DyzVsQsstxoDzcc3vVdf70zrOUhUGGanEXHBJ/EJEQ4t8FjnlJm0o2p/wTNs6/zc
-s6oYQCT4b9IPTeZghVW+BkcRIuMdpR/cAX/53Gbrey80wTgjVKAoP4AIS3URIXBW
-p0ACi04yza1yxz2Hm0j/S/kTHhPhiQ2ulrRmg4SPUqQj4isRqLgwASYN0bEWBpL/
-dPUEeVju
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ph-ludwigsburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ph-ludwigsburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">PH Ludwigsburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">PH Ludwigsburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-ludwigsburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Christoph</GivenName>
-    <SurName>List</SurName>
-    <EmailAddress>list@ph-ludwigsburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Eberhard</GivenName>
-    <SurName>Ostertag</SurName>
-    <EmailAddress>ostertag@ph-ludwigsburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.phlu.ch-idp-shibboleth.xml
deleted file mode 100644
index e882fa48..00000000
--- a/swamid-interfederations-2.0/idp.phlu.ch-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.phlu.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2016-01-15T13:29: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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phlu.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">PHLU - Pädagogische Hochschule Luzern</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">PHLU - University of Teacher Education Lucerne</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Pädagogische Hochschule Luzern</mdui:Description>
-        <mdui:Description xml:lang="en">University of Teacher Education Lucerne</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAB2SURBVDhPnczbCYAwDIXhLuebU/ngGkUXaUHco91CEIkcEPGStkl+OE8Jn0vB0zJ05rlj3yjHmT1K5ugqx4l9aO0GkAV5AUiL/ACkQVgASZEigCRIFUAtpAmgGiICUAkRA4hDVAD6ImoAPRETgICsY28HUAqeToLAQo/m8xMUAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:Logo height="33" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAAhCAYAAABObyzJAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA4BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDY3IDc5LjE1Nzc0NywgMjAxNS8wMy8zMC0yMzo0MDo0MiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpCMTdBOUZEMDMxMUExMUU1OUY3QTkyN0RCRUJCRjc2NiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5MkE4RkUwODQwMzIxMUU1OUI2NERCOEIxQUUyOTRCMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5MkE4RkUwNzQwMzIxMUU1OUI2NERCOEIxQUUyOTRCMSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxNSAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpjMGM5NGQ0MS1hZGZlLTQzNDItYjkwMi04NzUyYjQ2ZDI0NDkiIHN0UmVmOmRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDpmNDk3NGYxZi0zNmFjLTExZTUtYWQxYS1lOTNm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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.phlu.ch/ph-lucerne/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.phlu.ch</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>phlu.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.051064,8.302218</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>
-MIIDDDCCAfSgAwIBAgIJAMz6yMoxs++OMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC5waGx1LmNoMB4XDTE0MDQxMTA4MjMwMloXDTE3MDQxMDA4MjMwMlow
-FjEUMBIGA1UEAxMLaWRwLnBobHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDN8Hd2rr6FkYwObqy/Hech8EU5TAiPdel9S4aV4G8cTFpF6dCQyKs8
-tvQPMIz5rsQrtN7Hkf+Oeyy12hZsPDDBk7Y+UCGt4kFhqE1H9ZAlMRi1Ja1Gywdf
-cmZNLVgKgR+njH0AT3gFTjGae1X3Eg1wpbfg5ooJ3Ch8PHxCJsDNP4WgcX4AU+Ss
-1T/ZEzUqfmmqDpq10UPluFDgXujGlRwWqiC8oQGc2Z3PgpJnt8lxWMOhdPGgxEFv
-4TJxUAMyYve3lpkBGk8IN/LWkcsWa8cuks5LzQXralxRofbDFMm6IWdpnaxJ6iZm
-XxlgoU9Qaw+Vd7R0AZ9WsAy2rjkBuWNjAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
-cC5waGx1LmNohiJodHRwczovL2lkcC5waGx1LmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBSkYIdFzSjghnTX5XR6eSSUqOdeTTANBgkqhkiG9w0BAQUFAAOCAQEA
-B1dxA2mQJ6A4Pm5YJdWETk0TCbXKD10r1ymx8Hzj4Bn0NV56Mh6WwVRqdU0CQB+h
-O/hDRztPNkO3HAlMSUlRbYtoRJsAdR0GqQAjXmi6uBuTvi4I/XSwc/MZ+o92HY2c
-coea/JiP9MbEBiuLjlzrNEamEdKLUkr7K6zSXjQJefN+7Gn4JwUf7ppMqtrSW+PI
-Ijzb+o+OlesBN5vYLw/gdf7F2UBQGwTPw3sjkwb13E3w/9fEVIj6gVhj+LAHsXu2
-mZkGrkn8dxV7P3DW8tZZeobO1hevdx/r6POebiXSAWvC9sztV9c7XRv/+KDUrM0z
-UJeTOp8z5dn7ZqOHT7wP8w==
-						</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:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.phlu.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.phlu.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.phlu.ch/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phlu.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDDCCAfSgAwIBAgIJAMz6yMoxs++OMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC5waGx1LmNoMB4XDTE0MDQxMTA4MjMwMloXDTE3MDQxMDA4MjMwMlow
-FjEUMBIGA1UEAxMLaWRwLnBobHUuY2gwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDN8Hd2rr6FkYwObqy/Hech8EU5TAiPdel9S4aV4G8cTFpF6dCQyKs8
-tvQPMIz5rsQrtN7Hkf+Oeyy12hZsPDDBk7Y+UCGt4kFhqE1H9ZAlMRi1Ja1Gywdf
-cmZNLVgKgR+njH0AT3gFTjGae1X3Eg1wpbfg5ooJ3Ch8PHxCJsDNP4WgcX4AU+Ss
-1T/ZEzUqfmmqDpq10UPluFDgXujGlRwWqiC8oQGc2Z3PgpJnt8lxWMOhdPGgxEFv
-4TJxUAMyYve3lpkBGk8IN/LWkcsWa8cuks5LzQXralxRofbDFMm6IWdpnaxJ6iZm
-XxlgoU9Qaw+Vd7R0AZ9WsAy2rjkBuWNjAgMBAAGjXTBbMDoGA1UdEQQzMDGCC2lk
-cC5waGx1LmNohiJodHRwczovL2lkcC5waGx1LmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBSkYIdFzSjghnTX5XR6eSSUqOdeTTANBgkqhkiG9w0BAQUFAAOCAQEA
-B1dxA2mQJ6A4Pm5YJdWETk0TCbXKD10r1ymx8Hzj4Bn0NV56Mh6WwVRqdU0CQB+h
-O/hDRztPNkO3HAlMSUlRbYtoRJsAdR0GqQAjXmi6uBuTvi4I/XSwc/MZ+o92HY2c
-coea/JiP9MbEBiuLjlzrNEamEdKLUkr7K6zSXjQJefN+7Gn4JwUf7ppMqtrSW+PI
-Ijzb+o+OlesBN5vYLw/gdf7F2UBQGwTPw3sjkwb13E3w/9fEVIj6gVhj+LAHsXu2
-mZkGrkn8dxV7P3DW8tZZeobO1hevdx/r6POebiXSAWvC9sztV9c7XRv/+KDUrM0z
-UJeTOp8z5dn7ZqOHT7wP8w==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.phlu.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.phlu.ch/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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">phlu.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">PHLU - Pädagogische Hochschule Luzern</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">PHLU - University of Teacher Education Lucerne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.phlu.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.phlu.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Hochschule Luzern - IT Services</md:GivenName>
-    <md:SurName>(Hotline)</md:SurName>
-    <md:EmailAddress>mailto:informatikhotline@hslu.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41 41 228 21 21</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Hochschule Luzern - IT Services</md:GivenName>
-    <md:SurName>(AAI Technician)</md:SurName>
-    <md:EmailAddress>mailto:aai@hslu.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.pima.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pima.edu-idp-shibboleth.xml
deleted file mode 100644
index dce79e53..00000000
--- a/swamid-interfederations-2.0/idp.pima.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://idp.pima.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">pima.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Pima County Community College District</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.pima.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.pima.edu/privacy-policy/index.html</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>
-MIIDHDCCAgSgAwIBAgIVAI8RApJaLNJSvMXpCrnt7hb5JMR2MA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5waW1hLmVkdTAeFw0xMzEyMTExNjE3MTFaFw0z
-MzEyMTExNjE3MTFaMBcxFTATBgNVBAMTDGlkcC5waW1hLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKaONUO2QeOvi5wklyGNDnrsp1rWU3SxoRK1
-FKCd2SUJXJnmanY3udbCtjEO+VKrhGkc/c+9QOwWGA2n7t9U5S/vvmJNCI1zu6q9
-Jnr7osAnPYwSZ8Ee36HK4epL47vyLjqBC1psspkyBgKwe6h+Dk7QZXXMeClq6GuT
-DRCyEyr0uXgXxbZtvOHjMtNzSZHNPIgd8CTLhXS0K9+zS+67HRRueSfMpXNKtGhn
-xXlefCNZhJeUpMf58DxoGmqko6sy7n6Y2d7gdJUDuAO9Wu1ZDY1Ts4KPoyuFMHzF
-NyI+13RWDkDqPtDaxBNZJRaFPi1pPdW8zBYuQFXxBI5RiNyktbUCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnBpbWEuZWR1hiNodHRwczovL2lkcC5waW1hLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1NqJMb5Tjvls997bnBJR/IFIke4wDQYJ
-KoZIhvcNAQEFBQADggEBAAPJBOHUQ/toEICXbgm/6KOezWlpsj0wT9PtZCV00w01
-+/PIp41j6ChZOi5aznKyje1mXJ7zhs9LsohEJG5M6+2aaOb4DDG2H/WZB/yr4LKw
-t5zmwZkNEhDFpzYjlDAf8czEvAPFeO53kxILu42BEntqyEPqBH8L+8mifwcOiZTr
-1LUkjeG2iCrZ+4AepJuq60mNjdDp78bOnQPTraPsrwysIBO+D0IU70zbJdlTTjqa
-DNcSc3EJTHGKT8FTBZ4AhAqFSC7Y8szne3fNsoCZgy3JUCiYvFqkeZNXqRsWAfh4
-0Tv6+3GYpfV3wLPnSTqH/35dNRD3MJebUFZzPCZdc2E=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pima.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pima.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pima.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pima.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pima.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pima.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAI8RApJaLNJSvMXpCrnt7hb5JMR2MA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5waW1hLmVkdTAeFw0xMzEyMTExNjE3MTFaFw0z
-MzEyMTExNjE3MTFaMBcxFTATBgNVBAMTDGlkcC5waW1hLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKaONUO2QeOvi5wklyGNDnrsp1rWU3SxoRK1
-FKCd2SUJXJnmanY3udbCtjEO+VKrhGkc/c+9QOwWGA2n7t9U5S/vvmJNCI1zu6q9
-Jnr7osAnPYwSZ8Ee36HK4epL47vyLjqBC1psspkyBgKwe6h+Dk7QZXXMeClq6GuT
-DRCyEyr0uXgXxbZtvOHjMtNzSZHNPIgd8CTLhXS0K9+zS+67HRRueSfMpXNKtGhn
-xXlefCNZhJeUpMf58DxoGmqko6sy7n6Y2d7gdJUDuAO9Wu1ZDY1Ts4KPoyuFMHzF
-NyI+13RWDkDqPtDaxBNZJRaFPi1pPdW8zBYuQFXxBI5RiNyktbUCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnBpbWEuZWR1hiNodHRwczovL2lkcC5waW1hLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1NqJMb5Tjvls997bnBJR/IFIke4wDQYJ
-KoZIhvcNAQEFBQADggEBAAPJBOHUQ/toEICXbgm/6KOezWlpsj0wT9PtZCV00w01
-+/PIp41j6ChZOi5aznKyje1mXJ7zhs9LsohEJG5M6+2aaOb4DDG2H/WZB/yr4LKw
-t5zmwZkNEhDFpzYjlDAf8czEvAPFeO53kxILu42BEntqyEPqBH8L+8mifwcOiZTr
-1LUkjeG2iCrZ+4AepJuq60mNjdDp78bOnQPTraPsrwysIBO+D0IU70zbJdlTTjqa
-DNcSc3EJTHGKT8FTBZ4AhAqFSC7Y8szne3fNsoCZgy3JUCiYvFqkeZNXqRsWAfh4
-0Tv6+3GYpfV3wLPnSTqH/35dNRD3MJebUFZzPCZdc2E=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pima.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Pima County Community College District</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Pima County Community College District</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pima.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Erik Jerue</md:GivenName>
-    <md:EmailAddress>ejerue@pima.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kellen Renshaw</md:GivenName>
-    <md:EmailAddress>krenshaw@pima.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Chris Bonhorst</md:GivenName>
-    <md:EmailAddress>cbonhorst@pima.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Matt Weber</md:GivenName>
-    <md:EmailAddress>mweber3@pima.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.pitt.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pitt.edu-idp-shibboleth.xml
deleted file mode 100644
index ad2b1838..00000000
--- a/swamid-interfederations-2.0/idp.pitt.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,167 +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://idp.pitt.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.pitt.edu/idp/error.jsp" 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">pitt.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Pittsburgh</mdui:DisplayName>
-        <mdui:PrivacyStatementURL xml:lang="en">http://technology.pitt.edu/research-computing/rc-incommon-shibboleth/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="400" width="400" xml:lang="en">https://www.pitt.edu/seal/seal-400x400-72rgb.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>
-MIIDKTCCAhGgAwIBAgIJAK/m2puIvEaPMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC5waXR0LmVkdTAeFw0xMDAyMjQyMTE1NDRaFw0xMzAyMjMyMTE1NDRa
-MBcxFTATBgNVBAMTDGlkcC5waXR0LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAPf6lCv9nQN+Fn7ebs+68OhI804i1tn4STw9D9guwsE7Me1bGd4F
-FcIIniLFpt2rj8mmgtZ2klLNiAQlnx/GXpn/76BjSj4YvMEzW/dMmaBIP76bAnQ7
-cKmbFk8leBYGaunz6tqZWmaUFxEGr5ahleS4YWe+dVX86P3+/waPhiXklNeLLM2W
-ZNa1dEDbvMbSuXFKuFWtiaayIiACIhi02pzIVBc/VO7z/uZKkN4g87wGVrlvwSmU
-eI2jchW+CggBVQttF1TNBd+HTHb3J+MONZBGrWA4ZGXhlzFXeP9/PqmrpxRR2soW
-qryVCPr5EsIgJzQVSUXdgDXlrtpR4LZbdpcCAwEAAaN4MHYwHQYDVR0OBBYEFLKs
-08YJmnk/5jSuFpS3fjD6EZMqMEcGA1UdIwRAMD6AFLKs08YJmnk/5jSuFpS3fjD6
-EZMqoRukGTAXMRUwEwYDVQQDEwxpZHAucGl0dC5lZHWCCQCv5tqbiLxGjzAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBR8/mBNuAza6eX2kPXul2zVRzr
-ksZQsPuShBYEp+FN84/gvg55sY2ZOLkGVH55toyyMcouhepsCtqZg/qHsxAv2qaG
-pUNRzRlUBhr5WjMQSmGC1SxeFO8EIZCv/prDi8jvARJwC85Q4mixs/mR8Ys0GWFk
-YhVUcKSUzBNlGJdSYl4CDXWt+e6EVvnyWvAmk4psrqlXeGzBxhSjHrJGQqEDuBjZ
-Rf8ZaY9CbLGbOm/g++Szj1E+1s1cyiBQ5D316JimJ3U5Io2NHV+nSUdYOC8256+j
-dalrcnm0K9z3483QueZhUmPtapzeJz617znahr+cgz1fLZJTtP34AmIUOiVu
-          </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>
-MIIEdDCCA1ygAwIBAgIJAIPyxwkgHIJiMA0GCSqGSIb3DQEBBQUAMIGCMQswCQYD
-VQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRMwEQYDVQQHEwpQaXR0c2J1
-cmdoMSEwHwYDVQQKExhVbml2ZXJzaXR5IE9mIFBpdHRzYnVyZ2gxDTALBgNVBAsT
-BENTU0QxFTATBgNVBAMTDGlkcC5waXR0LmVkdTAeFw0xMzAyMTMyMDA0MTVaFw0z
-MzAyMTMyMDA0MTVaMIGCMQswCQYDVQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZh
-bmlhMRMwEQYDVQQHEwpQaXR0c2J1cmdoMSEwHwYDVQQKExhVbml2ZXJzaXR5IE9m
-IFBpdHRzYnVyZ2gxDTALBgNVBAsTBENTU0QxFTATBgNVBAMTDGlkcC5waXR0LmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9j5BRYQlGalJvTJ8AI
-TJ0jphLF4kRQNhZpTSLp54z0XBn78DLAVHSbxwQ7X0CkFoDipglzFPi7svxO+zd0
-NEGMBml/xoxgRafVeebAPcFCzjIudfNXKp/nv8eeCygjH7syjf/Z4SnZWSKRKlpa
-dZMfgw72ATcVBh7ml6iA7/T7Bms7xAFByPxVyHTK2CUFyx0zCS96jvFLIG3+0lo9
-lUe6tQ5M1QFpSYkCibaIupno6peKceJQxBu1payaGKLWTgAo1vylMF+m0qXBQ6W+
-CX3CsQQnmOrEjQPSJdenFD3O8BoZMrAGT1j/5dZQcXnHjcW1GYa7Imt7P9DNsp1o
-U4sCAwEAAaOB6jCB5zAdBgNVHQ4EFgQU/IWtjcdU4BFSyI92E3kgfh4PdUQwgbcG
-A1UdIwSBrzCBrIAU/IWtjcdU4BFSyI92E3kgfh4PdUShgYikgYUwgYIxCzAJBgNV
-BAYTAlVTMRUwEwYDVQQIEwxQZW5uc3lsdmFuaWExEzARBgNVBAcTClBpdHRzYnVy
-Z2gxITAfBgNVBAoTGFVuaXZlcnNpdHkgT2YgUGl0dHNidXJnaDENMAsGA1UECxME
-Q1NTRDEVMBMGA1UEAxMMaWRwLnBpdHQuZWR1ggkAg/LHCSAcgmIwDAYDVR0TBAUw
-AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAMRihZtUIhu4nStkrlEH2ZHeh32jdgvp7
-f8BPJXsmjwQRLfmiSHY0qX2WdJm3+P79EmA17HLla9S6277RteguH8wzfBgglRVq
-jlVyiKeS6z5doIoKJZwSne0x01kIeeOE9ytr09aQTWbkfXCBwnTjjmwHWhTUpPJv
-kxZC6m7oRw+a9ApJBWV6DB/QKAslvD45aifKijte3plakx2gzbukNhkahUxf+erg
-WSvG0BUC/zdv9BpJuwgRCUq6l58xfgHSXlrbc3gYc74pa/xMHIu82xhZFzmsMnIV
-IBWDyMtrjsnhtDNz0G0ydy2irh47nkM5oANXm5wVre55cfB6zPhK5Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pitt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pitt.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pitt.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.pitt.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.pitt.edu/idp/profile/SAML2/POST-SimpleSign/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">pitt.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKTCCAhGgAwIBAgIJAK/m2puIvEaPMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC5waXR0LmVkdTAeFw0xMDAyMjQyMTE1NDRaFw0xMzAyMjMyMTE1NDRa
-MBcxFTATBgNVBAMTDGlkcC5waXR0LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAPf6lCv9nQN+Fn7ebs+68OhI804i1tn4STw9D9guwsE7Me1bGd4F
-FcIIniLFpt2rj8mmgtZ2klLNiAQlnx/GXpn/76BjSj4YvMEzW/dMmaBIP76bAnQ7
-cKmbFk8leBYGaunz6tqZWmaUFxEGr5ahleS4YWe+dVX86P3+/waPhiXklNeLLM2W
-ZNa1dEDbvMbSuXFKuFWtiaayIiACIhi02pzIVBc/VO7z/uZKkN4g87wGVrlvwSmU
-eI2jchW+CggBVQttF1TNBd+HTHb3J+MONZBGrWA4ZGXhlzFXeP9/PqmrpxRR2soW
-qryVCPr5EsIgJzQVSUXdgDXlrtpR4LZbdpcCAwEAAaN4MHYwHQYDVR0OBBYEFLKs
-08YJmnk/5jSuFpS3fjD6EZMqMEcGA1UdIwRAMD6AFLKs08YJmnk/5jSuFpS3fjD6
-EZMqoRukGTAXMRUwEwYDVQQDEwxpZHAucGl0dC5lZHWCCQCv5tqbiLxGjzAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBR8/mBNuAza6eX2kPXul2zVRzr
-ksZQsPuShBYEp+FN84/gvg55sY2ZOLkGVH55toyyMcouhepsCtqZg/qHsxAv2qaG
-pUNRzRlUBhr5WjMQSmGC1SxeFO8EIZCv/prDi8jvARJwC85Q4mixs/mR8Ys0GWFk
-YhVUcKSUzBNlGJdSYl4CDXWt+e6EVvnyWvAmk4psrqlXeGzBxhSjHrJGQqEDuBjZ
-Rf8ZaY9CbLGbOm/g++Szj1E+1s1cyiBQ5D316JimJ3U5Io2NHV+nSUdYOC8256+j
-dalrcnm0K9z3483QueZhUmPtapzeJz617znahr+cgz1fLZJTtP34AmIUOiVu
-          </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>
-MIIEdDCCA1ygAwIBAgIJAIPyxwkgHIJiMA0GCSqGSIb3DQEBBQUAMIGCMQswCQYD
-VQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRMwEQYDVQQHEwpQaXR0c2J1
-cmdoMSEwHwYDVQQKExhVbml2ZXJzaXR5IE9mIFBpdHRzYnVyZ2gxDTALBgNVBAsT
-BENTU0QxFTATBgNVBAMTDGlkcC5waXR0LmVkdTAeFw0xMzAyMTMyMDA0MTVaFw0z
-MzAyMTMyMDA0MTVaMIGCMQswCQYDVQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZh
-bmlhMRMwEQYDVQQHEwpQaXR0c2J1cmdoMSEwHwYDVQQKExhVbml2ZXJzaXR5IE9m
-IFBpdHRzYnVyZ2gxDTALBgNVBAsTBENTU0QxFTATBgNVBAMTDGlkcC5waXR0LmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK9j5BRYQlGalJvTJ8AI
-TJ0jphLF4kRQNhZpTSLp54z0XBn78DLAVHSbxwQ7X0CkFoDipglzFPi7svxO+zd0
-NEGMBml/xoxgRafVeebAPcFCzjIudfNXKp/nv8eeCygjH7syjf/Z4SnZWSKRKlpa
-dZMfgw72ATcVBh7ml6iA7/T7Bms7xAFByPxVyHTK2CUFyx0zCS96jvFLIG3+0lo9
-lUe6tQ5M1QFpSYkCibaIupno6peKceJQxBu1payaGKLWTgAo1vylMF+m0qXBQ6W+
-CX3CsQQnmOrEjQPSJdenFD3O8BoZMrAGT1j/5dZQcXnHjcW1GYa7Imt7P9DNsp1o
-U4sCAwEAAaOB6jCB5zAdBgNVHQ4EFgQU/IWtjcdU4BFSyI92E3kgfh4PdUQwgbcG
-A1UdIwSBrzCBrIAU/IWtjcdU4BFSyI92E3kgfh4PdUShgYikgYUwgYIxCzAJBgNV
-BAYTAlVTMRUwEwYDVQQIEwxQZW5uc3lsdmFuaWExEzARBgNVBAcTClBpdHRzYnVy
-Z2gxITAfBgNVBAoTGFVuaXZlcnNpdHkgT2YgUGl0dHNidXJnaDENMAsGA1UECxME
-Q1NTRDEVMBMGA1UEAxMMaWRwLnBpdHQuZWR1ggkAg/LHCSAcgmIwDAYDVR0TBAUw
-AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAMRihZtUIhu4nStkrlEH2ZHeh32jdgvp7
-f8BPJXsmjwQRLfmiSHY0qX2WdJm3+P79EmA17HLla9S6277RteguH8wzfBgglRVq
-jlVyiKeS6z5doIoKJZwSne0x01kIeeOE9ytr09aQTWbkfXCBwnTjjmwHWhTUpPJv
-kxZC6m7oRw+a9ApJBWV6DB/QKAslvD45aifKijte3plakx2gzbukNhkahUxf+erg
-WSvG0BUC/zdv9BpJuwgRCUq6l58xfgHSXlrbc3gYc74pa/xMHIu82xhZFzmsMnIV
-IBWDyMtrjsnhtDNz0G0ydy2irh47nkM5oANXm5wVre55cfB6zPhK5Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.pitt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.pitt.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Pittsburgh</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Pittsburgh</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pitt.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Christopher Keslar</md:GivenName>
-    <md:EmailAddress>crk4@pitt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Technology Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@pitt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technology Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@pitt.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.plymouthart.ac.uk-shibboleth.xml
deleted file mode 100644
index 39b4223d..00000000
--- a/swamid-interfederations-2.0/idp.plymouthart.ac.uk-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://idp.plymouthart.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Plymouth College of Art.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">plymouthart.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQDH/h0V1jAUjzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
-						QjEOMAwGA1UECBMFRGV2b24xETAPBgNVBAcTCFBseW1vdXRoMSAwHgYDVQQKExdQ
-						bHltb3V0aCBDb2xsZWdlIG9mIEFydDEeMBwGA1UEAxMVaWRwLnBseW1vdXRoYXJ0
-						LmFjLnVrMB4XDTEyMDcwNjA5Mzg1MVoXDTMyMDcwMTA5Mzg1MVowcjELMAkGA1UE
-						BhMCR0IxDjAMBgNVBAgTBURldm9uMREwDwYDVQQHEwhQbHltb3V0aDEgMB4GA1UE
-						ChMXUGx5bW91dGggQ29sbGVnZSBvZiBBcnQxHjAcBgNVBAMTFWlkcC5wbHltb3V0
-						aGFydC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMuIFsdU
-						c+y05uTuTyjK5jSvxJvPlF9ZSqmKnGstje0V6GfqTME3qc5YlUzMnX/00EE6Uj3f
-						27/1CcK4OLtjpztKVr4qd1vCxZu/5ckFSeK6QXoedjoqHKrF2dx6lMbrBVKWroRb
-						DjyHoZoABZQWhFfwxy9GBrP0i8vY1RDtEv0WJtwd+XBvt0X3Ab6C6qesEhksOkgW
-						muKQenmFiooGtE6twwAAWsjTmvkcUM4nfu28sJxK/UAzbWr7ylzHstz9OfsV1kO9
-						JYYOnq1ohZNsqvd8xg863qpvbxpTRFhn1uwsG2m8Ig1+EJOEgVfWRQDRUAgQSFF3
-						DR7byOg+8aP7xU0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAt3NYYkRNcMHka5WD
-						OWMn3/l8diGWK7MLKi1YhnWaBBnXSTRWMaqJfNvVfE6+kMYOPZxJc18lbC2lfFBS
-						Sa92TG4RpqDZJ+luVcXPZT+2Y68Xp2IgtB4437xBxzw9DI5vYDDXNYIlid0FQx+J
-						IBxUEOK3w1/4uDx/NR/twduiwhsPzyU9Q+ySHW1rOq/XmDl7gL/0qQGZcu0E/KOt
-						WLYmkw40IuvpMB25QnoSiaNzaQpa+niEYb0klHpAE4LE1LVy5ODbRT9JF3p9X9xu
-						+EG3KzV7yU41ZjcAeT1E+q9juJDmBlpMppWPUxnIC/1YUSaS97pdCoBJP048VYB6
-						I4JArg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.plymouthart.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.plymouthart.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.plymouthart.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.plymouthart.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.plymouthart.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.plymouthart.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">plymouthart.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQDH/h0V1jAUjzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
-						QjEOMAwGA1UECBMFRGV2b24xETAPBgNVBAcTCFBseW1vdXRoMSAwHgYDVQQKExdQ
-						bHltb3V0aCBDb2xsZWdlIG9mIEFydDEeMBwGA1UEAxMVaWRwLnBseW1vdXRoYXJ0
-						LmFjLnVrMB4XDTEyMDcwNjA5Mzg1MVoXDTMyMDcwMTA5Mzg1MVowcjELMAkGA1UE
-						BhMCR0IxDjAMBgNVBAgTBURldm9uMREwDwYDVQQHEwhQbHltb3V0aDEgMB4GA1UE
-						ChMXUGx5bW91dGggQ29sbGVnZSBvZiBBcnQxHjAcBgNVBAMTFWlkcC5wbHltb3V0
-						aGFydC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMuIFsdU
-						c+y05uTuTyjK5jSvxJvPlF9ZSqmKnGstje0V6GfqTME3qc5YlUzMnX/00EE6Uj3f
-						27/1CcK4OLtjpztKVr4qd1vCxZu/5ckFSeK6QXoedjoqHKrF2dx6lMbrBVKWroRb
-						DjyHoZoABZQWhFfwxy9GBrP0i8vY1RDtEv0WJtwd+XBvt0X3Ab6C6qesEhksOkgW
-						muKQenmFiooGtE6twwAAWsjTmvkcUM4nfu28sJxK/UAzbWr7ylzHstz9OfsV1kO9
-						JYYOnq1ohZNsqvd8xg863qpvbxpTRFhn1uwsG2m8Ig1+EJOEgVfWRQDRUAgQSFF3
-						DR7byOg+8aP7xU0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAt3NYYkRNcMHka5WD
-						OWMn3/l8diGWK7MLKi1YhnWaBBnXSTRWMaqJfNvVfE6+kMYOPZxJc18lbC2lfFBS
-						Sa92TG4RpqDZJ+luVcXPZT+2Y68Xp2IgtB4437xBxzw9DI5vYDDXNYIlid0FQx+J
-						IBxUEOK3w1/4uDx/NR/twduiwhsPzyU9Q+ySHW1rOq/XmDl7gL/0qQGZcu0E/KOt
-						WLYmkw40IuvpMB25QnoSiaNzaQpa+niEYb0klHpAE4LE1LVy5ODbRT9JF3p9X9xu
-						+EG3KzV7yU41ZjcAeT1E+q9juJDmBlpMppWPUxnIC/1YUSaS97pdCoBJP048VYB6
-						I4JArg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.plymouthart.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.plymouthart.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">Plymouth College of Art</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Plymouth College of Art</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.plymouthart.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Perry</GivenName>
-    <SurName>Middleton</SurName>
-    <EmailAddress>mailto:pmiddleton@plymouthart.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Perry</GivenName>
-    <SurName>Middleton</SurName>
-    <EmailAddress>mailto:pmiddleton@plymouthart.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 29211fed..00000000
--- a/swamid-interfederations-2.0/idp.poliba.it-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,111 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.poliba.it/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-09-01T08:06:49Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poliba.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">studenti.poliba.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Politecnico di Bari</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Politecnico di Bari</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for the users of Politecnico di Bari</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti del Politecnico di Bari</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.poliba.it/ateneo/ideminfo</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://www.poliba.it/ateneo/ideminfo</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.poliba.it/ateneo/idemprivacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://www.poliba.it/ateneo/idemprivacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.poliba.it/logo80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.poliba.it/logo80x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.poliba.it/logo16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.poliba.it/logo16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:41.109481,16.878798</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>
-MIIEEzCCAvugAwIBAgIJAKbucxOGsbx5MA0GCSqGSIb3DQEBCwUAMIGfMQswCQYD
-VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxHDAaBgNVBAoM
-E1BvbGl0ZWNuaWNvIGRpIEJhcmkxFDASBgNVBAsMC1NldHRvcmUgSUNUMRcwFQYD
-VQQDDA53d3c0LnBvbGliYS5pdDEkMCIGCSqGSIb3DQEJARYVbHVpZ2kuZ2F0dG9A
-cG9saWJhLml0MB4XDTE1MDgyMjE3Mjg0NloXDTQ1MDgxNDE3Mjg0NlowgZ8xCzAJ
-BgNVBAYTAklUMQ4wDAYDVQQIDAVJdGFseTENMAsGA1UEBwwEQmFyaTEcMBoGA1UE
-CgwTUG9saXRlY25pY28gZGkgQmFyaTEUMBIGA1UECwwLU2V0dG9yZSBJQ1QxFzAV
-BgNVBAMMDnd3dzQucG9saWJhLml0MSQwIgYJKoZIhvcNAQkBFhVsdWlnaS5nYXR0
-b0Bwb2xpYmEuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrlko9
-49/dYS4bU1T718ZCj6LYl/NFy/7kSfqRFeqal0E8OaD02r/+z8LbZPinSOgrw2DP
-eFXTZv04ZkkOu4dyQKqkOndOVo09VNjRsJS7YK/xHkpCUC260vIV0q1XrNzYaMJ/
-Uu5g2xox2j3nkfyc8wdpQlUQ6j15mxDCAYUfCsMUmvdJ0850TaO2RLCH5gduuJiA
-D1c3YN/G94j9KY7jM8grYyf5A3SGp5n8281ZuKPGKY4TGrxUC46qkeQr4mK7HhJn
-lzDfABYRNjbuWe495XnMCnyJNS/7EylsJ+Cc+B3qEXg/ewdJKLrR3w+X4wgnW78S
-O69S3xYiT2VRde7VAgMBAAGjUDBOMB0GA1UdDgQWBBTdX5So6SB4K2IX59likNO8
-2/usIjAfBgNVHSMEGDAWgBTdX5So6SB4K2IX59likNO82/usIjAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBZs5MMUimtJQKXrNDbOYsXg6yTUhvRQPLj
-kv2M3cH/8lhqnYpU9C3X4FrVPbxx5SxqBBTw8SOUAZfEAlvN+OJC1efq03VQmH3A
-M/GqgwM4ztNUIz1kWgDdIEkUZBEJ2BBN4VP0xH1s0f1gKFMxqOE4BwPNmU7ZFD4O
-QM7qOcq58voRCohpfUeVG6V3BkpKyx/VHFaJpkucI1U/Gw4S/6Slp4qLJ6eHIbQB
-bBEuc7suv0QEIC2VgbkdQ1muEZJfGPaxTYn00BZCPgUG2ka7hgRmKzNDdGjRe8YT
-ICP6wM+pztMtIPWic53DejjEukR860nQx4/53saWj3RRjkuTouv2
-</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>
-MIIEEzCCAvugAwIBAgIJAKbucxOGsbx5MA0GCSqGSIb3DQEBCwUAMIGfMQswCQYD
-VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxHDAaBgNVBAoM
-E1BvbGl0ZWNuaWNvIGRpIEJhcmkxFDASBgNVBAsMC1NldHRvcmUgSUNUMRcwFQYD
-VQQDDA53d3c0LnBvbGliYS5pdDEkMCIGCSqGSIb3DQEJARYVbHVpZ2kuZ2F0dG9A
-cG9saWJhLml0MB4XDTE1MDgyMjE3Mjg0NloXDTQ1MDgxNDE3Mjg0NlowgZ8xCzAJ
-BgNVBAYTAklUMQ4wDAYDVQQIDAVJdGFseTENMAsGA1UEBwwEQmFyaTEcMBoGA1UE
-CgwTUG9saXRlY25pY28gZGkgQmFyaTEUMBIGA1UECwwLU2V0dG9yZSBJQ1QxFzAV
-BgNVBAMMDnd3dzQucG9saWJhLml0MSQwIgYJKoZIhvcNAQkBFhVsdWlnaS5nYXR0
-b0Bwb2xpYmEuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrlko9
-49/dYS4bU1T718ZCj6LYl/NFy/7kSfqRFeqal0E8OaD02r/+z8LbZPinSOgrw2DP
-eFXTZv04ZkkOu4dyQKqkOndOVo09VNjRsJS7YK/xHkpCUC260vIV0q1XrNzYaMJ/
-Uu5g2xox2j3nkfyc8wdpQlUQ6j15mxDCAYUfCsMUmvdJ0850TaO2RLCH5gduuJiA
-D1c3YN/G94j9KY7jM8grYyf5A3SGp5n8281ZuKPGKY4TGrxUC46qkeQr4mK7HhJn
-lzDfABYRNjbuWe495XnMCnyJNS/7EylsJ+Cc+B3qEXg/ewdJKLrR3w+X4wgnW78S
-O69S3xYiT2VRde7VAgMBAAGjUDBOMB0GA1UdDgQWBBTdX5So6SB4K2IX59likNO8
-2/usIjAfBgNVHSMEGDAWgBTdX5So6SB4K2IX59likNO82/usIjAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBZs5MMUimtJQKXrNDbOYsXg6yTUhvRQPLj
-kv2M3cH/8lhqnYpU9C3X4FrVPbxx5SxqBBTw8SOUAZfEAlvN+OJC1efq03VQmH3A
-M/GqgwM4ztNUIz1kWgDdIEkUZBEJ2BBN4VP0xH1s0f1gKFMxqOE4BwPNmU7ZFD4O
-QM7qOcq58voRCohpfUeVG6V3BkpKyx/VHFaJpkucI1U/Gw4S/6Slp4qLJ6eHIbQB
-bBEuc7suv0QEIC2VgbkdQ1muEZJfGPaxTYn00BZCPgUG2ka7hgRmKzNDdGjRe8YT
-ICP6wM+pztMtIPWic53DejjEukR860nQx4/53saWj3RRjkuTouv2
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.poliba.it/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.poliba.it/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Politecnico di Bari</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Politecnico di Bari</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Politecnico di Bari</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Politecnico di Bari</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.poliba.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.poliba.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idem-support@poliba.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:luigi.gatto@poliba.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:giuseppe.lucatorto@poliba.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.xml
deleted file mode 100644
index cffb05e2..00000000
--- a/swamid-interfederations-2.0/idp.polytechnique.fr-idp-shibboleth.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://idp.polytechnique.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-04T14:05:02Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polytechnique.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ecole Polytechnique - Palaiseau</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABTklEQVQ4y52TvUtCARTFf7m3hw6N/RENLfl0rRAqiUgivxAKN5GMwD4kHCTKQgqE0PdSoSGiIJOGkJYIqlmIGiISCYmIuE1Cqc9ene1y7zn3cLgXADQxkxb+AxMArzxytV8wxNAENu4H0JoXpp7HcUQqukQRmD+N4Vy5QZPu9kOu9SLO5eu2ZPfWEUOhh872sgL2wCe+1CHyzaInlcHuF3JGctKkH5tPiJzFAIjfhVC8gipW49EulFZRPEL0IobVLQRzm8bJDUzGSwzOCGNLl53GTLqderUHuqBeM5ORPwrMqllqT324kw7eahaKyRPj1vfeHSheIfPhAUCVYRSvsFsN/E7OCdj9raFFy4vYfNJ6fc2YWCvjSpR+3EAD7m2VkXBFX2TnZZrR6K2uuAhMJc4JH0damwcCwbxmKKM5tUC22UVeLIbfOS2gSm+j/ALc64of8IctPgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo1OCswMjowMED16QsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NTgrMDI6MDAxqFG3AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.polytechnique.edu/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">IDP Ecole Polytechnique - Palaiseau</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Ecole Polytechnique - Palaiseau</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">IDP Ecole Polytechnique - Palaiseau</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>
-					      MIIDOzCCAiOgAwIBAgIUenAlQJGY5nvpRbOTuDq3P/4fTVYwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAwwUaWRwLnBvbHl0ZWNobmlxdWUuZnIwHhcNMTUwMTI5MTUy
-MzQwWhcNMzUwMTI5MTUyMzQwWjAfMR0wGwYDVQQDDBRpZHAucG9seXRlY2huaXF1
-ZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwd3SB1Lwii2xUU
-yoq487drsFL4bpi4zVj/iwV6mYXBfV/bVQrW6PMxfr8T5OIHCRNe3CvAIS0LIlKb
-jLoqaorF4D9daJSR+S/v5qSm7nFmjp0O4SxommuOjHgn1Y/gwUOQrMsrREo71CeR
-7WqXsdvxAs35OO0fit0cTavQjyuiYT45uvvInMHNw3iClh0omueHvP02HYZBFW4M
-LzKLtC6mmz+4PbFXvXrkexwMz2+U0+k+ctP9ubBHIcLJrMULeemEOpbMlY9JAXAf
-7JqV9dOI97DeZec3kE+O3YgaTxZ3a5a0CVdR9Bwjozx8FvPp3FCloVER3OOOkJc5
-2aQYR1sCAwEAAaNvMG0wHQYDVR0OBBYEFK85QKHZCd+M/76TQtYrhl5Kk6+TMEwG
-A1UdEQRFMEOCFGlkcC5wb2x5dGVjaG5pcXVlLmZyhitodHRwczovL2lkcC5wb2x5
-dGVjaG5pcXVlLmZyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQAl
-bSG2vkSOBwry4bM0iju7l7mTV0+xWjEA9hFWBc7cFweQWwKVuw6KseQnGm1iVS1K
-LIH8lpiWW6XD/GPhqNia3iyG4OLuX91bnT1a5onOIt+bLise5bc+Q5oSe+vF3HBb
-6rlumrLdMDn8QFgXhQyVMIbj7br12vn7/0bCyYedqDgDsmr4Vjk9D6oV9ZBjofnV
-pK8FvrHJzFKiz/jLrrhIFuGOXG6oiitYVvc09Mv6a00sMjpDViwtHMVXmNkQN+HZ
-sqcrjIGFkPOyHZqYr2I9f4VKX7/FZn63ID4N2WdU+e3D6ACnJiLpe5tG9vwNPfk5
-rmrzBJcTpS6kyxMBlKCw
-					    </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-POST" Location="https://idp.polytechnique.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.polytechnique.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.polytechnique.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Polytechnique - Palaiseau</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Polytechnique - Palaiseau</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.polytechnique.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>shibboleth@polytechnique.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.port.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.port.ac.uk-entity.xml
deleted file mode 100644
index 9d05d700..00000000
--- a/swamid-interfederations-2.0/idp.port.ac.uk-entity.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.port.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for the University of Portsmouth.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">port.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEIjCCAwqgAwIBAgIJALf8bLjT1bnmMA0GCSqGSIb3DQEBBQUAMIGRMQswCQYD
-						VQQGEwJHQjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpQb3J0c21vdXRo
-						MSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFBvcnRzbW91dGgxHTAbBgNVBAsTFElu
-						Zm9ybWF0aW9uIFNlcnZpY2VzMRcwFQYDVQQDEw5pZHAucG9ydC5hYy51azAeFw0x
-						MjA0MDQxMzIyMTZaFw0yMjA0MDIxMzIyMTZaMIGRMQswCQYDVQQGEwJHQjESMBAG
-						A1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpQb3J0c21vdXRoMSEwHwYDVQQKExhV
-						bml2ZXJzaXR5IG9mIFBvcnRzbW91dGgxHTAbBgNVBAsTFEluZm9ybWF0aW9uIFNl
-						cnZpY2VzMRcwFQYDVQQDEw5pZHAucG9ydC5hYy51azCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAOVFjymX7M8xWKzGhKlZ5/3aDsDeWjQ2oeooO1MSaFbT
-						j/pMtOC3Qrsa7P3Hhwshh5m0nAYTqpdl4NvFFOiMv0WMmKiNDKR3DvrF8p5HP21Z
-						NFFE1EI2K+ciRUpFgFg/+Aiy/J8hiiFvNgY/K1Bu7YzmJHakrrnQRn/1J+vDq7GJ
-						E/9GUz5rqVBjh1Ny+346Pls5SYUf5aj0H5KmD83TRZsjfAQecl4hxsbZTmZQmn/1
-						OTtqBp0yDy3DZYTWoeJ9ab2Smm+KRhP67rNG568S6hRvAPwdOxxQOnLZtZVbZJvl
-						0zjT4no3JBBoJ+25Xdb5LiQKBLh4Q1e0Y0cDW4gPd+ECAwEAAaN7MHkwCQYDVR0T
-						BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh
-						dGUwHQYDVR0OBBYEFGfthAjlQZ/cBPBgNARSaZC1cAfVMB8GA1UdIwQYMBaAFGft
-						hAjlQZ/cBPBgNARSaZC1cAfVMA0GCSqGSIb3DQEBBQUAA4IBAQCqBvYpE7bPdaOa
-						OLoDnDySj0FdExCJCQpRGE1nFQ1eT4GrDjlPO2QE1jE2tStS6Wv4ZuW1qJyuEJDe
-						fMJn7xtilLSDpzvocxhDGoF/SgDdDA5wpHt5iz/4e1wfDHHbUwxDiCXSYSPTn55u
-						2ElvtdyQiiagoPkaIMoco3XKIyIG6LGoZPeFp0FS6GV541T6yJOzE71nCwJZ+RWA
-						iAdkoJsFOs+PgXPPlN9hdEmspKrAKnp9G7JeIjc6at+YijvkSoCmRCdqNFj3jwDR
-						KnGXAg5ikRPxi2wV6VGgyXCqoFhMFVQE/3zlNd8sPy6uEqHUo0gwE6amJJeafsN5
-						tetph4SV
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.port.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.port.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://shib-login.port.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-login.port.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-login.port.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-login.port.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">port.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEIjCCAwqgAwIBAgIJALf8bLjT1bnmMA0GCSqGSIb3DQEBBQUAMIGRMQswCQYD
-						VQQGEwJHQjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpQb3J0c21vdXRo
-						MSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFBvcnRzbW91dGgxHTAbBgNVBAsTFElu
-						Zm9ybWF0aW9uIFNlcnZpY2VzMRcwFQYDVQQDEw5pZHAucG9ydC5hYy51azAeFw0x
-						MjA0MDQxMzIyMTZaFw0yMjA0MDIxMzIyMTZaMIGRMQswCQYDVQQGEwJHQjESMBAG
-						A1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpQb3J0c21vdXRoMSEwHwYDVQQKExhV
-						bml2ZXJzaXR5IG9mIFBvcnRzbW91dGgxHTAbBgNVBAsTFEluZm9ybWF0aW9uIFNl
-						cnZpY2VzMRcwFQYDVQQDEw5pZHAucG9ydC5hYy51azCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAOVFjymX7M8xWKzGhKlZ5/3aDsDeWjQ2oeooO1MSaFbT
-						j/pMtOC3Qrsa7P3Hhwshh5m0nAYTqpdl4NvFFOiMv0WMmKiNDKR3DvrF8p5HP21Z
-						NFFE1EI2K+ciRUpFgFg/+Aiy/J8hiiFvNgY/K1Bu7YzmJHakrrnQRn/1J+vDq7GJ
-						E/9GUz5rqVBjh1Ny+346Pls5SYUf5aj0H5KmD83TRZsjfAQecl4hxsbZTmZQmn/1
-						OTtqBp0yDy3DZYTWoeJ9ab2Smm+KRhP67rNG568S6hRvAPwdOxxQOnLZtZVbZJvl
-						0zjT4no3JBBoJ+25Xdb5LiQKBLh4Q1e0Y0cDW4gPd+ECAwEAAaN7MHkwCQYDVR0T
-						BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh
-						dGUwHQYDVR0OBBYEFGfthAjlQZ/cBPBgNARSaZC1cAfVMB8GA1UdIwQYMBaAFGft
-						hAjlQZ/cBPBgNARSaZC1cAfVMA0GCSqGSIb3DQEBBQUAA4IBAQCqBvYpE7bPdaOa
-						OLoDnDySj0FdExCJCQpRGE1nFQ1eT4GrDjlPO2QE1jE2tStS6Wv4ZuW1qJyuEJDe
-						fMJn7xtilLSDpzvocxhDGoF/SgDdDA5wpHt5iz/4e1wfDHHbUwxDiCXSYSPTn55u
-						2ElvtdyQiiagoPkaIMoco3XKIyIG6LGoZPeFp0FS6GV541T6yJOzE71nCwJZ+RWA
-						iAdkoJsFOs+PgXPPlN9hdEmspKrAKnp9G7JeIjc6at+YijvkSoCmRCdqNFj3jwDR
-						KnGXAg5ikRPxi2wV6VGgyXCqoFhMFVQE/3zlNd8sPy6uEqHUo0gwE6amJJeafsN5
-						tetph4SV
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.port.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.port.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 Portsmouth</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Portsmouth - Legacy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.port.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>University IT Helpdesk</GivenName>
-    <EmailAddress>mailto:servicedesk@port.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Phil</GivenName>
-    <SurName>Burland</SurName>
-    <EmailAddress>mailto:phil.burland@port.ac.uk</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 e16da703..00000000
--- a/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ppke.hu/idp/shibboleth">
-  <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="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>ppke</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>href-idps</saml:AttributeValue>
-        <saml:AttributeValue>sotelib-vs-ppke</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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">
-        <mdui:DisplayName xml:lang="hu">PPKE - Pázmány Péter Katolikus Egyetem</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">PPKE - Pázmány Péter Catholic University</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Pázmány Péter Katolikus Egyetem</mdui:Description>
-        <mdui:Description xml:lang="en">Pazmany Peter Catholic University</mdui:Description>
-        <mdui:Logo height="86" width="86">https://idp.ppke.hu/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ppke.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ppke.hu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ppke.hu/idp/profile/SAML2/POST/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:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ppke.hu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ppke.hu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ppke.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor 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>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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ppke.hu: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="hu">Pázmány Péter Katolikus Egyetem</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Pázmány Péter Catholic University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">Pázmány Péter Katolikus Egyetem</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Pázmány Péter Catholic University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.itk.ppke.hu/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.en.itk.ppke.hu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Detrich Bertalan</md:SurName>
-    <md:EmailAddress>mailto:detrich.bertalan@it.ppke.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Pásztor János</md:SurName>
-    <md:EmailAddress>mailto:pasztor.janos@it.ppke.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Zsombory Gábor</md:SurName>
-    <md:EmailAddress>mailto:zsombory.gabor@it.ppke.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 5084dec7..00000000
--- a/swamid-interfederations-2.0/idp.ppke.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.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: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.primarylogon.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.primarylogon.co.uk-idp-shibboleth.xml
deleted file mode 100644
index b69d3d6b..00000000
--- a/swamid-interfederations-2.0/idp.primarylogon.co.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.primarylogon.co.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth 2.1.3 IdP for Primary Technology.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">primarylogon.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUQ20GO37EJbue7ZaBBSMki0eG82cwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWaWRwLnByaW1hcnlsb2dvbi5jby51azAeFw0wOTEwMjIx
-						NTU4NDVaFw0yOTEwMjIxNTU4NDVaMCExHzAdBgNVBAMTFmlkcC5wcmltYXJ5bG9n
-						b24uY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHJq+LMWRR
-						EN3RrE7Azt7yhROagAU9o+LqtbnbsAOOisiNWbbrLcsO4BzgSFZ3Zvge9YbBb1VC
-						axUOAr5ZzqId4vl/OAO6rIWZ+bGbB9RRTnTI5Rd8C0s5tePvBiiDZZh1AIH9PrIe
-						E61txemyE9tVB/PiAhB9ozll1PN9e1tZdaMd6f/51ulAU0HTq0RS2DUwhkuD10un
-						accS7y+ew8WrnTSlU2x5wkEJUS/ZLGkKB9q03ahqQuzJL0R0yaxRUv9inr6Wj09D
-						wJOJWlDDmclQ4lgKZ2gHSPWUWvKhXggUJrGKnSJqAxRxbn/lxowBl1ErMRoG8LNi
-						cmMl2GmYZgZNAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC5wcmltYXJ5bG9nb24u
-						Y28udWuGLWh0dHBzOi8vaWRwLnByaW1hcnlsb2dvbi5jby51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUMkwl5JK1XdA5VVLrjQ3e2mYUX8wwDQYJKoZIhvcNAQEF
-						BQADggEBADiFXuTUWkokd4aKWZcZfBAJboPnFiQu/LlfSuVaAjESDRgKMlOMfXdt
-						OKLHm0bYtODsDjibIfGZJo7kmJaeJdax2lMrU2jFD6TXZpKmUpYfBi/oiDfEfiBt
-						OLkHmpVbD0g9i/dSb2xiMTCsLiyZe18D9dKskIKlcO4p3X8TrpWRYQ7CqO5izyr6
-						yFjqUtWwlxtWbYmA5PJHZpJAOgG98vb7nrptPbb32axj72eB5dL4F7frICwxernU
-						/0T6Ly1eo1rVrkAdRm2QIJyQZYe7jvPoEsIsq639OXrXDqED+7oKUf6GZYbjIu2Y
-						zRa5RaATgOB2sVdg2eOTs4eqQd1dU6s=                        
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.primarylogon.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.primarylogon.co.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.primarylogon.co.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.primarylogon.co.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.primarylogon.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.primarylogon.co.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">primarylogon.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUQ20GO37EJbue7ZaBBSMki0eG82cwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWaWRwLnByaW1hcnlsb2dvbi5jby51azAeFw0wOTEwMjIx
-						NTU4NDVaFw0yOTEwMjIxNTU4NDVaMCExHzAdBgNVBAMTFmlkcC5wcmltYXJ5bG9n
-						b24uY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHJq+LMWRR
-						EN3RrE7Azt7yhROagAU9o+LqtbnbsAOOisiNWbbrLcsO4BzgSFZ3Zvge9YbBb1VC
-						axUOAr5ZzqId4vl/OAO6rIWZ+bGbB9RRTnTI5Rd8C0s5tePvBiiDZZh1AIH9PrIe
-						E61txemyE9tVB/PiAhB9ozll1PN9e1tZdaMd6f/51ulAU0HTq0RS2DUwhkuD10un
-						accS7y+ew8WrnTSlU2x5wkEJUS/ZLGkKB9q03ahqQuzJL0R0yaxRUv9inr6Wj09D
-						wJOJWlDDmclQ4lgKZ2gHSPWUWvKhXggUJrGKnSJqAxRxbn/lxowBl1ErMRoG8LNi
-						cmMl2GmYZgZNAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcC5wcmltYXJ5bG9nb24u
-						Y28udWuGLWh0dHBzOi8vaWRwLnByaW1hcnlsb2dvbi5jby51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUMkwl5JK1XdA5VVLrjQ3e2mYUX8wwDQYJKoZIhvcNAQEF
-						BQADggEBADiFXuTUWkokd4aKWZcZfBAJboPnFiQu/LlfSuVaAjESDRgKMlOMfXdt
-						OKLHm0bYtODsDjibIfGZJo7kmJaeJdax2lMrU2jFD6TXZpKmUpYfBi/oiDfEfiBt
-						OLkHmpVbD0g9i/dSb2xiMTCsLiyZe18D9dKskIKlcO4p3X8TrpWRYQ7CqO5izyr6
-						yFjqUtWwlxtWbYmA5PJHZpJAOgG98vb7nrptPbb32axj72eB5dL4F7frICwxernU
-						/0T6Ly1eo1rVrkAdRm2QIJyQZYe7jvPoEsIsq639OXrXDqED+7oKUf6GZYbjIu2Y
-						zRa5RaATgOB2sVdg2eOTs4eqQd1dU6s=                        
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.primarylogon.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.primarylogon.co.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">Primary Technology Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Primary Technology: Primary Logon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://primaryt.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>McLear</SurName>
-    <EmailAddress>mailto:John@McLear.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>McLear</SurName>
-    <EmailAddress>mailto:John@McLear.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.princeton.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.princeton.edu-idp-shibboleth.xml
deleted file mode 100644
index 36565d2f..00000000
--- a/swamid-interfederations-2.0/idp.princeton.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,96 +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://idp.princeton.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">princeton.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Princeton University</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>
-MIIDLzCCAhegAwIBAgIUMfmaP7flCY4+d5Gnju4bntgM57wwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLnByaW5jZXRvbi5lZHUwHhcNMDkxMDMwMTI1MTM5
-WhcNMjkxMDMwMTI1MTM5WjAcMRowGAYDVQQDExFpZHAucHJpbmNldG9uLmVkdTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJE0moHwKJGyg9z94dvN0HCB
-klHGPvRdIB0nvzAJxo9KaF81zFaqHpvprwNEoB3Pfy18hIbtnDSv/sV/j6pnKnBw
-XXsf7QJOOF81klkGHZh4C9VnjUL5ok9Ahx1zPgaLcCgvZeGRG7DiRPnOgxVzuwoB
-WFnEWBCoLaqcZUl2njnawRB+LXt8mO+HPhsMO8c7ASJ50hF/l9cGaCs3ucEcwp9d
-FoxSiVy2TMyatszHTHZknaqVyqR+WNCxE/Jpcwfi1oq6k3V5T372GE8WTKclgvpg
-IYV8ISROBHpVlYz9v3N0nnpOn+Io6zuUOS3YNmuX52vaSciaYNoPcmBxYMEG2jcC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnByaW5jZXRvbi5lZHWGKGh0dHBzOi8v
-aWRwLnByaW5jZXRvbi5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPQsLxgr
-W14zmCfogqfOscaIPOtoMA0GCSqGSIb3DQEBBQUAA4IBAQAqkhYwrjjwi31OYkDK
-jeKyss835BrdLVTqqEfssT3lvYW/SGyRMLCr2hS21p9zbt8dJO67C9RYEjJ/05p2
-Keo+ZQj3ehOP80/phxk0r+Je/fNdpO/HbQG9/DfcYp5sLUXk9koYrXrOHq6KnkVh
-rmikDRb9izfU9nDttB8hWGLiX0WhIvk9xkIAW5ueyL5QxcQmRYNcaT3BUpjkGiBu
-FEsLXa42F1nmdBDGrI2woHNEr2diujL5EOxqIsunquUXuu2dFuNtqA0HRK6wj32b
-fsZT9KwTEdLv/oAbgQ8zlVXErx54GJFg1ksGAJY3lsGY+XdvcUaKuVD2IWOrbCtP
-qZfT
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.princeton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.princeton.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.princeton.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.princeton.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.princeton.edu/idp/profile/SAML2/POST-SimpleSign/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">princeton.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUMfmaP7flCY4+d5Gnju4bntgM57wwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLnByaW5jZXRvbi5lZHUwHhcNMDkxMDMwMTI1MTM5
-WhcNMjkxMDMwMTI1MTM5WjAcMRowGAYDVQQDExFpZHAucHJpbmNldG9uLmVkdTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJE0moHwKJGyg9z94dvN0HCB
-klHGPvRdIB0nvzAJxo9KaF81zFaqHpvprwNEoB3Pfy18hIbtnDSv/sV/j6pnKnBw
-XXsf7QJOOF81klkGHZh4C9VnjUL5ok9Ahx1zPgaLcCgvZeGRG7DiRPnOgxVzuwoB
-WFnEWBCoLaqcZUl2njnawRB+LXt8mO+HPhsMO8c7ASJ50hF/l9cGaCs3ucEcwp9d
-FoxSiVy2TMyatszHTHZknaqVyqR+WNCxE/Jpcwfi1oq6k3V5T372GE8WTKclgvpg
-IYV8ISROBHpVlYz9v3N0nnpOn+Io6zuUOS3YNmuX52vaSciaYNoPcmBxYMEG2jcC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnByaW5jZXRvbi5lZHWGKGh0dHBzOi8v
-aWRwLnByaW5jZXRvbi5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFPQsLxgr
-W14zmCfogqfOscaIPOtoMA0GCSqGSIb3DQEBBQUAA4IBAQAqkhYwrjjwi31OYkDK
-jeKyss835BrdLVTqqEfssT3lvYW/SGyRMLCr2hS21p9zbt8dJO67C9RYEjJ/05p2
-Keo+ZQj3ehOP80/phxk0r+Je/fNdpO/HbQG9/DfcYp5sLUXk9koYrXrOHq6KnkVh
-rmikDRb9izfU9nDttB8hWGLiX0WhIvk9xkIAW5ueyL5QxcQmRYNcaT3BUpjkGiBu
-FEsLXa42F1nmdBDGrI2woHNEr2diujL5EOxqIsunquUXuu2dFuNtqA0HRK6wj32b
-fsZT9KwTEdLv/oAbgQ8zlVXErx54GJFg1ksGAJY3lsGY+XdvcUaKuVD2IWOrbCtP
-qZfT
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.princeton.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.princeton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Princeton University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Princeton University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.princeton.edu/index.shtml</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Steven Niedzwiecki</md:GivenName>
-    <md:EmailAddress>steven@princeton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Security and Data Protection</md:GivenName>
-    <md:EmailAddress>sdp@princeton.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.progressivedigitalmedia.com-shibboleth.xml b/swamid-interfederations-2.0/idp.progressivedigitalmedia.com-shibboleth.xml
deleted file mode 100644
index 1e1807e3..00000000
--- a/swamid-interfederations-2.0/idp.progressivedigitalmedia.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://idp.progressivedigitalmedia.com/shibboleth">
-  <!--
-		This is a "MarketLine Dev" Shibboleth SP for Progressive Digital Media Group Plc.
-	-->
-  <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="2016-01-07T14:36:02Z">
-      <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://idp.progressivedigitalmedia.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://idp.progressivedigitalmedia.com/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://idp.progressivedigitalmedia.com/Shibboleth.sso/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://idp.progressivedigitalmedia.com/Shibboleth.sso/UKfederation" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJAJ0anKvb8NpwMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXBkbS1kZXYtd2ViMDEwHhcNMTYwMTIyMTcxMTQ4WhcNMjYwMTE5MTcxMTQ4
-						WjAYMRYwFAYDVQQDEw1wZG0tZGV2LXdlYjAxMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA7FdrCgGZLid5434KxGyqa6VNLIV6wMy6YSBMkmDU0Zu1NdLH
-						cmvQdgCQLalMYROs/gWNtI46zu1K9sLa04CFege3HKdTbNgYKEutm/PefmgpwocY
-						VFaXmfjYwBBPnpNcJx4xOFAU/MBvbnbi13uXORBohpG3Ls6Pt1j9Iq29dKf9AwPY
-						1wdkFPetgc4g+DagfOaCKLy3gUZM3TJrEwu2M6MgqSRE7azZKNXHH25SGcTFtTSB
-						oXv93omnYn3VyfbStqkbFjI61MgyE39ubs62qmgVq78HkDTYu5mNrocbVlbrfGke
-						GPQ9xSXYvoEHcgpMZB8umh76cIRXtaerJQmLbwIDAQABozswOTAYBgNVHREEETAP
-						gg1wZG0tZGV2LXdlYjAxMB0GA1UdDgQWBBRvGfAZty2hHkw+jYQqxVxihYrmTjAN
-						BgkqhkiG9w0BAQUFAAOCAQEAWFzoOr6uoi0PwNcJxKUsr2lbYbJtigUC/IUA5Rnb
-						g68H8dO8go/NWKppp88eEBpI8CGF9wssKX8J1XS0LYAaAHf4AZdUpOSS9Tjk3JlX
-						Yp4tGuyfr9nsbm2q3wBoY3vYEcj1pmqhcAfB+PSR2p9/h29Z0Xm1i2NMMXwjRHSf
-						vg71L+mudKv/gxpX6mKct9mcFisyM1JDtPmO1Rhpqophe4D6Hjevy6tRl5xw2kNg
-						ddwE8o3bWp7Nvl+OuquXBPI2dLrDHL6mYaKW1AJteYgpxSsj4jw4KlugOlrcaYum
-						lXL+Gte857dAAqPxxmXJdHnUDpWHAoIl9dSmoPTNpK9Yyw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://idp.progressivedigitalmedia.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idp.progressivedigitalmedia.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Progressive Digital Media Group Plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MarketLine Dev</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.progressivemediagroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Panagiotis</GivenName>
-    <SurName>Sfikas</SurName>
-    <EmailAddress>mailto:Panagiotis.Sfikas@progressivemediagroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Assad</GivenName>
-    <SurName>Imran</SurName>
-    <EmailAddress>mailto:Assad.Imran@progressivemediagroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.protectnetwork.org-protectnetwork-idp.xml b/swamid-interfederations-2.0/idp.protectnetwork.org-protectnetwork-idp.xml
deleted file mode 100644
index ed2e6b1c..00000000
--- a/swamid-interfederations-2.0/idp.protectnetwork.org-protectnetwork-idp.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.protectnetwork.org/protectnetwork-idp">
-  <!--
-		This is a Shibboleth "ProtectNetwork" open Access IdP for 9Star Research, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">idp.protectnetwork.org</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEMDCCAxigAwIBAgIJALJxC01MGf/hMA0GCSqGSIb3DQEBBQUAMG0xCzAJBgNV
-						BAYTAlVTMQ4wDAYDVQQIEwVUZXhhczEPMA0GA1UEBxMGQXVzdGluMRcwFQYDVQQK
-						Ew5Qcm90ZWN0TmV0d29yazEkMCIGA1UEAxMbdGNhcy1pZHAucHJvdGVjdG5ldHdv
-						cmsub3JnMB4XDTExMDcyMTE2MzMxN1oXDTIxMDcxODE2MzMxN1owbTELMAkGA1UE
-						BhMCVVMxDjAMBgNVBAgTBVRleGFzMQ8wDQYDVQQHEwZBdXN0aW4xFzAVBgNVBAoT
-						DlByb3RlY3ROZXR3b3JrMSQwIgYDVQQDExt0Y2FzLWlkcC5wcm90ZWN0bmV0d29y
-						ay5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWh2R4Tus8Thwl
-						4Fnlmz6QrwL/imYN5di4q0gmWMJ03oBfIGireuZKfiI1FXeBsAq2p5XKZRQvWyKX
-						J1z2Z+FbG1Og5s6bZSzIjq7bGac0FPtJ+0vgIy74RKJZDZNR2rzzlW2WCIe1zHUh
-						bF0K1RVJZz8nbMDQ+H2Zf74Gi4dXwgQnLCkkPV9ocinv3bq6Iq0H/ySgHGdmazzv
-						vSW8C1Ny2WDfEqCWUkR9AKnTjyww3/f0PgHKuuvSKs6KArC00rD+v2hE+PT4M0oa
-						TqSIbM5uu6f+Xfu10EQVG7O7Wmj2aAN0/D8/+Eeeh/8Se6XX81S7h/dNRrQh7yKM
-						6WIp2pPPAgMBAAGjgdIwgc8wHQYDVR0OBBYEFKWOH8Lch5mEhcxZR+E1w8nvx6Hl
-						MIGfBgNVHSMEgZcwgZSAFKWOH8Lch5mEhcxZR+E1w8nvx6HloXGkbzBtMQswCQYD
-						VQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxDzANBgNVBAcTBkF1c3RpbjEXMBUGA1UE
-						ChMOUHJvdGVjdE5ldHdvcmsxJDAiBgNVBAMTG3RjYXMtaWRwLnByb3RlY3RuZXR3
-						b3JrLm9yZ4IJALJxC01MGf/hMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAACHlDYkgEzbaCatnF1IYcvy5j/T7dpOlvww+vJSK9Al3BlOmESHrEIS46XO
-						9vfk/PgNUM3oYG5prW+azSUJVDfJspSzH0d8IFCI95UlItC9Ivmxpuo1ZcH60fpI
-						M4Kb8fLeOfmsbpVZsxj8tSRByARlK4tzHf2+rLOn7jZRTsPcoxrxYIyesbbshhDy
-						v2ZE+NoOehZXaAYgZkB3PE0s6Ph+pUYIRSZ7bud1YNlx9QkUoYuwgR+hX895l19Z
-						fouPZ1KljFoiTY8iwjRUUNV2Lx2hZUsDHj/4Ea23TY+fc/7OSS4K0BIO4LmUQo1Z
-						qg057Ao66R7RAwvB3jNS9ydAiNM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </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.protectnetwork.org/protectnetwork-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">9Star Research, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ProtectNetwork</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.protectnetwork.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tech Support</GivenName>
-    <EmailAddress>mailto:support@protectnetwork.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tech Support</GivenName>
-    <EmailAddress>mailto:support@protectnetwork.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.psc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.psc.ac.uk-shibboleth.xml
deleted file mode 100644
index 840bad64..00000000
--- a/swamid-interfederations-2.0/idp.psc.ac.uk-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://idp.psc.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Peter Symonds' College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">psc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfTCCA2WgAwIBAgIJAJTGWyU15DqcMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYD
-						VQQGEwJHQjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpXaW5jaGVzdGVy
-						MR4wHAYDVQQKExVQZXRlciBTeW1vbmRzIENvbGxlZ2UxFTATBgNVBAsTDFdlYiBT
-						ZXJ2aWNlczEWMBQGA1UEAxMNaWRwLnBzYy5hYy51azAeFw0xMzAzMDUxMTU3MjBa
-						Fw0yMzAzMDMxMTU3MjBaMIGFMQswCQYDVQQGEwJHQjESMBAGA1UECBMJSGFtcHNo
-						aXJlMRMwEQYDVQQHEwpXaW5jaGVzdGVyMR4wHAYDVQQKExVQZXRlciBTeW1vbmRz
-						IENvbGxlZ2UxFTATBgNVBAsTDFdlYiBTZXJ2aWNlczEWMBQGA1UEAxMNaWRwLnBz
-						Yy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/BkETQQVg0
-						gd1gkDIzHKITmUxRJULIYtvl9w5gYI8tiYgkVnr0k3cyw2Q2Fa/hbxUa/H/teqD6
-						/vG360Qj511IA2dfsrqveE5EOuB4eMtraoJ8700UG4qOoDbnRd3wG1MpQVxwqdHB
-						Ttaxf7CzU6hdr82Vqx7RPAhyaXuGSu3iDN6OEBTAZVYe9ZoMwbM9qmcMisY4OXjw
-						KIeDCOTDbwi1TBR3PNhdwwwnQWIR7RR0wnCxSgN3zEFzeXLAWPlHqgnWGVuxTZvN
-						qvnsCLGV6/7uqaxuDjWB/GDlqPyNLlBF7uWOWF5faIKzNKcX08xVLZ9Ldf3gdXYG
-						wRN4hOw0VgkCAwEAAaOB7TCB6jAdBgNVHQ4EFgQUhh3B2sIwzqHYTeONgzD0dly+
-						GcwwgboGA1UdIwSBsjCBr4AUhh3B2sIwzqHYTeONgzD0dly+GcyhgYukgYgwgYUx
-						CzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlIYW1wc2hpcmUxEzARBgNVBAcTCldpbmNo
-						ZXN0ZXIxHjAcBgNVBAoTFVBldGVyIFN5bW9uZHMgQ29sbGVnZTEVMBMGA1UECxMM
-						V2ViIFNlcnZpY2VzMRYwFAYDVQQDEw1pZHAucHNjLmFjLnVrggkAlMZbJTXkOpww
-						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAKu6fVTU68s0G1ypB95ve
-						EAw2je8JM0Dw7WbkC+jgZDwF/Ce0Nh7zu8/4siFA858tMR8aIs8F14CLVZ1XHgam
-						Kc/698wBcZJXBH4CaxgLjwyUJSvHUtAYj3u6mqfwxpDyfbt7coHTF9kS/rD9OhFt
-						ZkNMMMQIjye7CAE5X2TCHkzo0CjuC6bs+7Wgagl3iQDBWGfIO+QHEl1hslFgnKqV
-						alC1bW4zWk0stCkR5BH6BfW9UUJUifB43O4nYfQ5/+nI1j/4EoIIXhyNewyImz6G
-						xMEs4UauNisdmYN9OkMv7J2qgFfm0hLdDqOfzJ7W5zoIXHzjaQpHYYYIUzInI96M
-						jw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psc.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.psc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.psc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.psc.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">psc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfTCCA2WgAwIBAgIJAJTGWyU15DqcMA0GCSqGSIb3DQEBBQUAMIGFMQswCQYD
-						VQQGEwJHQjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpXaW5jaGVzdGVy
-						MR4wHAYDVQQKExVQZXRlciBTeW1vbmRzIENvbGxlZ2UxFTATBgNVBAsTDFdlYiBT
-						ZXJ2aWNlczEWMBQGA1UEAxMNaWRwLnBzYy5hYy51azAeFw0xMzAzMDUxMTU3MjBa
-						Fw0yMzAzMDMxMTU3MjBaMIGFMQswCQYDVQQGEwJHQjESMBAGA1UECBMJSGFtcHNo
-						aXJlMRMwEQYDVQQHEwpXaW5jaGVzdGVyMR4wHAYDVQQKExVQZXRlciBTeW1vbmRz
-						IENvbGxlZ2UxFTATBgNVBAsTDFdlYiBTZXJ2aWNlczEWMBQGA1UEAxMNaWRwLnBz
-						Yy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK/BkETQQVg0
-						gd1gkDIzHKITmUxRJULIYtvl9w5gYI8tiYgkVnr0k3cyw2Q2Fa/hbxUa/H/teqD6
-						/vG360Qj511IA2dfsrqveE5EOuB4eMtraoJ8700UG4qOoDbnRd3wG1MpQVxwqdHB
-						Ttaxf7CzU6hdr82Vqx7RPAhyaXuGSu3iDN6OEBTAZVYe9ZoMwbM9qmcMisY4OXjw
-						KIeDCOTDbwi1TBR3PNhdwwwnQWIR7RR0wnCxSgN3zEFzeXLAWPlHqgnWGVuxTZvN
-						qvnsCLGV6/7uqaxuDjWB/GDlqPyNLlBF7uWOWF5faIKzNKcX08xVLZ9Ldf3gdXYG
-						wRN4hOw0VgkCAwEAAaOB7TCB6jAdBgNVHQ4EFgQUhh3B2sIwzqHYTeONgzD0dly+
-						GcwwgboGA1UdIwSBsjCBr4AUhh3B2sIwzqHYTeONgzD0dly+GcyhgYukgYgwgYUx
-						CzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlIYW1wc2hpcmUxEzARBgNVBAcTCldpbmNo
-						ZXN0ZXIxHjAcBgNVBAoTFVBldGVyIFN5bW9uZHMgQ29sbGVnZTEVMBMGA1UECxMM
-						V2ViIFNlcnZpY2VzMRYwFAYDVQQDEw1pZHAucHNjLmFjLnVrggkAlMZbJTXkOpww
-						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAKu6fVTU68s0G1ypB95ve
-						EAw2je8JM0Dw7WbkC+jgZDwF/Ce0Nh7zu8/4siFA858tMR8aIs8F14CLVZ1XHgam
-						Kc/698wBcZJXBH4CaxgLjwyUJSvHUtAYj3u6mqfwxpDyfbt7coHTF9kS/rD9OhFt
-						ZkNMMMQIjye7CAE5X2TCHkzo0CjuC6bs+7Wgagl3iQDBWGfIO+QHEl1hslFgnKqV
-						alC1bW4zWk0stCkR5BH6BfW9UUJUifB43O4nYfQ5/+nI1j/4EoIIXhyNewyImz6G
-						xMEs4UauNisdmYN9OkMv7J2qgFfm0hLdDqOfzJ7W5zoIXHzjaQpHYYYIUzInI96M
-						jw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psc.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">Peter Symonds' College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Peter Symonds College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.psc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sam</GivenName>
-    <SurName>King</SurName>
-    <EmailAddress>mailto:sking@psc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>King</SurName>
-    <EmailAddress>mailto:sking@psc.ac.uk</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 ad9945ab..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.psu.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.psu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.cas.cz: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.psu.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.psu.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.psu.cas.cz/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">psu.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.psu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Institute of Psychology of Academy of Science of Czech Republic</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Psychologický ústav Akademie věd České republiky</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The Institute of Psychology of Academy of Science of Czech Republic, Public Research Institution</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Psychologický ústav Akademie věd České republiky, v.v.i. </md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.psu.cas.cz/about</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.psu.cas.cz/about</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 49f997f0..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.puc-campinas.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.puc-campinas.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.puc-campinas.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.puc-campinas.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.puc-campinas.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md: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"/>
-    <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">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">PUCC - Pontificia Universidade Catolica de Campinas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.puc-campinas.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.puc-campinas.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Carlos Cesar Braga</md:SurName>
-    <md:EmailAddress>cesar@puc-campinas.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 78f674e3..00000000
--- a/swamid-interfederations-2.0/idp.puc-campinas.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.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>
-    MIIDSDCCAjCgAwIBAgIVAJSO0SM+Bh0UWKa6+hSykXbtplWuMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyMB4XDTEzMDEy
-NDE2NDg0NloXDTMzMDEyNDE2NDg0NlowIjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1w
-aW5hcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzaOH3
-wge0VzZfPtu24lXVFIvA3QQDptndcnpveFvwc9vXXiIKXVwLZvhfbLoKD2h13YCk
-6mqM/FzjyzpCx9fIZOUpTfekIIafVY1t0qcfpFVPkiNVdJMPy+UO0wXNcqv28dvT
-CrSFQnWhXT6pPfV38W0ql/m5l5VD1SOgkyn/XLHkBJiqKfGhymnfMCi+m+gB/SDt
-pH12yiDu1NABLZ1+CZJ6iJeCx4cpBQO9gZL/bOc2jVWuCfT8pECjh1t6CKmamBsm
-VUDs+61fMFsbwXB4uSnS2peqYXN3nBmebgc0V4TWPYhoDnIeyCYoRr1ClE+zIVPB
-GowmO38b4JXrFdq5AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC5wdWMtY2FtcGlu
-YXMuZWR1LmJyhi5odHRwczovL2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSMWdZ868b6RC9YFla5viyRnnZWmzANBgkqhkiG
-9w0BAQUFAAOCAQEAHBJZu7pwvM/QSpf19x6Duw1OCiKu5cGtP+iC6xjDOZrqcwe6
-CfDAWMc8QvwE0P+WhMMXGbsgDhpWGlTw1LrLY3JP7RCFXVAz9veNFjHukrOntumf
-2PDGiAle86ileOhbT9LlsgiVJECXYcL1VcTVgW4VsNRCSmr3OFDGFyrh6hgrBh9U
-BxvO3M9e0h4+8bVKxgQx1OC1GN41ryS2VvWSrgtORvXi+31ejIHlg4y4n6rK6+dW
-zy2FBUkaE8BwZlBgpAnYA2xtJKD4Di3266o9DtsYAKWrZh5SKr379PlFAOGlYgg6
-k/H7oMTExUQohJGKRTPBshsdHdv5MexHA+SxWw==
-            </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>
-      
-MIIDSDCCAjCgAwIBAgIVAJSO0SM+Bh0UWKa6+hSykXbtplWuMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyMB4XDTEzMDEy
-NDE2NDg0NloXDTMzMDEyNDE2NDg0NlowIjEgMB4GA1UEAxMXaWRwLnB1Yy1jYW1w
-aW5hcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzaOH3
-wge0VzZfPtu24lXVFIvA3QQDptndcnpveFvwc9vXXiIKXVwLZvhfbLoKD2h13YCk
-6mqM/FzjyzpCx9fIZOUpTfekIIafVY1t0qcfpFVPkiNVdJMPy+UO0wXNcqv28dvT
-CrSFQnWhXT6pPfV38W0ql/m5l5VD1SOgkyn/XLHkBJiqKfGhymnfMCi+m+gB/SDt
-pH12yiDu1NABLZ1+CZJ6iJeCx4cpBQO9gZL/bOc2jVWuCfT8pECjh1t6CKmamBsm
-VUDs+61fMFsbwXB4uSnS2peqYXN3nBmebgc0V4TWPYhoDnIeyCYoRr1ClE+zIVPB
-GowmO38b4JXrFdq5AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcC5wdWMtY2FtcGlu
-YXMuZWR1LmJyhi5odHRwczovL2lkcC5wdWMtY2FtcGluYXMuZWR1LmJyL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSMWdZ868b6RC9YFla5viyRnnZWmzANBgkqhkiG
-9w0BAQUFAAOCAQEAHBJZu7pwvM/QSpf19x6Duw1OCiKu5cGtP+iC6xjDOZrqcwe6
-CfDAWMc8QvwE0P+WhMMXGbsgDhpWGlTw1LrLY3JP7RCFXVAz9veNFjHukrOntumf
-2PDGiAle86ileOhbT9LlsgiVJECXYcL1VcTVgW4VsNRCSmr3OFDGFyrh6hgrBh9U
-BxvO3M9e0h4+8bVKxgQx1OC1GN41ryS2VvWSrgtORvXi+31ejIHlg4y4n6rK6+dW
-zy2FBUkaE8BwZlBgpAnYA2xtJKD4Di3266o9DtsYAKWrZh5SKr379PlFAOGlYgg6
-k/H7oMTExUQohJGKRTPBshsdHdv5MexHA+SxWw==
-                    
-            </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.pugetsound.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.pugetsound.edu-idp-shibboleth.xml
deleted file mode 100644
index f86e3b09..00000000
--- a/swamid-interfederations-2.0/idp.pugetsound.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,65 +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://idp.pugetsound.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">pugetsound.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Puget Sound</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for the University of Puget Sound</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>
-MIIDNDCCAhygAwIBAgIVAOCcreUOmiOG3xoRIC3Ym1PXDT9rMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcC5wdWdldHNvdW5kLmVkdTAeFw0xNDA0MDQyMDI2
-MTNaFw0zNDA0MDQyMDI2MTNaMB0xGzAZBgNVBAMTEmlkcC5wdWdldHNvdW5kLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKIFr9xIP2yR/5PaQWE1
-KQQsGVBaNLOlWrPyQsre6V6FaBpAp9i0dgFchxQA0ZGibTPxNN05ArpwLgMImZUq
-/4ed5RXC61c6p8Xg75XukTbAnREapifNkN3pgVnfGuaQ5sGHloJseeW7PvXzt+VW
-tltOi2mweNWQfc2eDD0MfGoPjUOKiKVD79QnWr5xezwMPibkDylMBiL9mjRAZy0T
-VnrP1L+haaS6mTDvHgJdqJRMFn9fpqVAXKYKUFPpXv1H3JNYf2n/Js4tySYOkU/H
-qN+CDW12HU124SEoX04PM0HMXdnE3kvKly8XD7kKXsw38JC3febo3G9oe+oeco0p
-0qcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnB1Z2V0c291bmQuZWR1hilodHRw
-czovL2lkcC5wdWdldHNvdW5kLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-KYEx6iRREVlZzqlIpSIBHZlPXqswDQYJKoZIhvcNAQEFBQADggEBAH9cDcUTyhvc
-bQDLqX3WbDADas8DsJDrs4kv3kFZXU96VJ2QCFHuYb2trlrTpzGzeujcFGoVxB91
-gVeMz9KBcnIJzqiIDZ+ihLfJaZZ+ELgd7VLm5SWSKrbffzeQIJj1o6QSURoNKNff
-szMYxuCaiSFyj5lnAqZ1ui9OcICeM3NDZtWy2X9yF14rQhcmFwQXovxBsJAx11vR
-DDLKGMpQHM8nP7V9l8tr69Wk7n8L/FSC7lK4rv2acn5l0akFQKp0NBg2ImeRBuZY
-qdWHUVixGVEY5CgV9iwp1JqiADrKNRol15RSTTW11sOpWjvmMAIUzXYCk5l9lkJB
-b/3hR0no3ho=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.pugetsound.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.pugetsound.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Puget Sound</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Puget Sound</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pugetsound.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mark Young</md:GivenName>
-    <md:EmailAddress>myoung@pugetsound.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mark Young</md:GivenName>
-    <md:EmailAddress>myoung@pugetsound.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jared Hoover</md:GivenName>
-    <md:EmailAddress>jhoover@pugetsound.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.purdue.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.purdue.edu-idp-shibboleth.xml
deleted file mode 100644
index 6cc76c54..00000000
--- a/swamid-interfederations-2.0/idp.purdue.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://idp.purdue.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">purdue.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Purdue University Main Campus</mdui:DisplayName>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.purdue.edu/policies/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="80" width="215" xml:lang="en">https://www.purdue.edu//purdue/globals/graphics/v4_purdue/PU_signature_white_bg_215x80.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>
-MIIFjTCCBHWgAwIBAgICAhMwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MDUxMjE4MDcwMVoXDTExMDUx
-MzE4MDcwMVowGTEXMBUGA1UEAxMOaWRwLnB1cmR1ZS5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCZkIfJGwEcqJVMAW4U4XK+t5A/LeY9jpq5XEK1
-AXtyBOBUPxGpB2RjVw3pywkNEzi5fUIbPTi4wjwGwjaoLBxd8jPhHttySykldPZg
-zThELEGkqomU12ZGb+5SHSsYZhRi5suEZtwFDPvB3onvRpFvk+fXaT9ilf86OsF7
-T+wUYdVjQ53GmML9iGA+/N3fZo9rHJHbMpl9MnC2RjkRAfg3wtXK2wtmI1fUmcu5
-zb6teBpmJ831kC8/M5oAEJUT5vJj8BCPbEqR4jwcWK5E+4fN0SK25g4nlJQJLJad
-idPZD0R/Oh3qPYhsh+lvsG+AFpBD/eH2uyxSc8KPpVfwZlrfAgMBAAGjggKgMIIC
-nDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFNVQRaMIkL7Pq7+Xi5rmaD+wsJbhMH4G
-A1UdIwR3MHWAFJMtyGEYrWPjm2Wznd2Nk7rnymNFoVqkWDBWMQswCQYDVQQGEwJV
-UzEcMBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21t
-b24gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHmCAQAwgbIGCCsGAQUFBwEBBIGlMIGi
-ME8GCCsGAQUFBzAChkNodHRwOi8vaW5jb21tb25jYTEuaW5jb21tb25mZWRlcmF0
-aW9uLm9yZy9icmlkZ2UvY2VydHMvY2EtY2VydHMucDdiME8GCCsGAQUFBzAChkNo
-dHRwOi8vaW5jb21tb25jYTIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9icmlkZ2Uv
-Y2VydHMvY2EtY2VydHMucDdiMIGNBgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6Ly9p
-bmNvbW1vbmNybDEuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwvZWVjcmxzLmNy
-bDA/oD2gO4Y5aHR0cDovL2luY29tbW9uY3JsMi5pbmNvbW1vbmZlZGVyYXRpb24u
-b3JnL2NybC9lZWNybHMuY3JsMF4GA1UdIARXMFUwUwYLKwYBBAGuIwEEAQEwRDBC
-BggrBgEFBQcCARY2aHR0cDovL2luY29tbW9uY2EuaW5jb21tb25mZWRlcmF0aW9u
-Lm9yZy9wcmFjdGljZXMucGRmMBkGA1UdEQQSMBCCDmlkcC5wdXJkdWUuZWR1MA0G
-CSqGSIb3DQEBBQUAA4IBAQC1CV8TtNwQGV5hyacZn5T+jd77o+FEm0TBQYDGJjwl
-E724rX6jQEMSE7nhMjXCdlCV+BToFHYO9yXsgwW3TmHcvAwyBjS5LdJeZ2yW/EOt
-zcLi2vnVrimL5SZyTv+7Cdbki0B3QUFu7lKb/QtLepcnLC8kP57tS/Od28IW8mc9
-zo9MTVXxp293WjGd9y3zdwTvLzSNqQWq7iP1NIPH3zSl700GkuLuZjyq4QBVfqCO
-CdpQCu00whkb535s4BQqDEytemjpc6kxu8jgxql+1Cq7oeQ4XFIpPh6SyTpXJg2b
-61jP76ZJMLx/FTyyxmZ7Das9R/4aLWAIW22uv1fqJ6st
-          </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>
-MIIDIzCCAgugAwIBAgIUL2tBWJ/vs2e4Qf4PHC+BalWFzDwwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnB1cmR1ZS5lZHUwHhcNMTEwNTEwMTkwNjM3WhcN
-MzEwNTEwMTkwNjM3WjAZMRcwFQYDVQQDEw5pZHAucHVyZHVlLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKHqHnSjOFIWQZsoUTY6SXCck1rBihn5
-oBWL/+o4qoWIyXNpqDwpd5PshPXFpe8nSl42ElRFXdkgAIHE2NxpETXZAbDGcbaO
-hjo9z3JP2DBh8NpJAUeRLK3+FaJkKaTs7qQ6T5q1o8q3rMKaYOOET1Dve/3P0z0b
-2ysnvku3/1F+KXan0JxRUFUacK76qMsC/3r0LF3eiS1Qgg8aPYL18axYM1NXavy+
-lGiI+NDX78qTEhNY+nIp/qirSqp7sMCiFxL5EWO8MZKA4WVgntuUVDYM0ajkH1Q9
-YgNzl+ENrHmQUs8q0kQxtxHOGHEroyA7Qv3Pmv8vOVEc/awUABgUqZECAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnB1cmR1ZS5lZHWGJWh0dHBzOi8vaWRwLnB1cmR1
-ZS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBq6iuVS/4AY9WgPsd0tdrpq
-TqrqMA0GCSqGSIb3DQEBBQUAA4IBAQBXsn2jnWXISPczONsw/9TsnD8CdM2Z3F8r
-koEs0OmiZzLr2QJE3BtGYa5YRmydw4vNblcQ7POmeXy3vtq6hFpVzGZJKVSQ7J4j
-wwHJPWtEWmgyco8e1843rS5fCXYB6JD+zJgK9f1dm91cJnTAI3rq7u2A+p4V6Umo
-2/Y6gdKaJJyL9D6ZF0NnndAgrd3fq5fSBY9Q6+B5kEdclo4a1WF+3PvzxZFKrLWe
-LupT/r3MCfWJjCiG6bV98tLeoSHrAME5EXI5pRSedGHkRdHoOT5ONWzj16pnaGsh
-B6EDsv+wL3C3eeQWHJQIYMTpI+DP3bJmfNSPOBnrHbtx2q4ydRF4
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.purdue.edu/apps/idphs/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.purdue.edu/apps/idphs/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.purdue.edu/apps/idphs/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.purdue.edu/apps/idphs/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Purdue University Main Campus</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Purdue University Main Campus</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.purdue.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Purdue Identity and Access Management Office</md:GivenName>
-    <md:EmailAddress>accounts@purdue.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Purdue Identity and Access Management Office</md:GivenName>
-    <md:EmailAddress>accounts@purdue.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Purdue Identity and Access Management Office</md:GivenName>
-    <md:EmailAddress>accounts@purdue.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Purdue Security Team</md:GivenName>
-    <md:EmailAddress>abuse@purdue.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.qatar-weill.cornell.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.qatar-weill.cornell.edu-idp-shibboleth.xml
deleted file mode 100644
index 696e0da8..00000000
--- a/swamid-interfederations-2.0/idp.qatar-weill.cornell.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://idp.qatar-weill.cornell.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">qatar-weill.cornell.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Weill Cornell Medical College in Qatar</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>
-MIIDWDCCAkCgAwIBAgIVAOjd1DnJt9+wai5RSTs4dU7Z3uVDMA0GCSqGSIb3DQEB
-BQUAMCYxJDAiBgNVBAMTG2lkcC5xYXRhci13ZWlsbC5jb3JuZWxsLmVkdTAeFw0x
-NDA2MDMwNzI3NTdaFw0zNDA2MDMwNzI3NTdaMCYxJDAiBgNVBAMTG2lkcC5xYXRh
-ci13ZWlsbC5jb3JuZWxsLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANP9iD4QkVd280O25P9msXPV1fG4Tw2RnrVXwHpIYaOncoLJMyV4SMuuarB1
-Pg2zC3uswMzM1xp5iY56UYCSU4QkPY+NzYoBLC7di3dioQsYIYBtHh39B92be8ur
-oLFQrTA8YYH6SllQjKbX6dXAUrkb7qhy1p/h2K9Go9YQIsmgPTune4yycfJAOU7Q
-JcrlFfhl2qeRSDQ+nK/QasYk3+zfuQ3FI3gpANsbyMlVWJnd+75otbizQsnhdATP
-xgZ+JWENLZ2YV5G0tstNCaqm+lSI5FZELAdl6vA0DnH0AZDhUlKM4IrPxbxtD9GU
-epD1RO/C5aGnjbHiiCMtZI1a1+8CAwEAAaN9MHswWgYDVR0RBFMwUYIbaWRwLnFh
-dGFyLXdlaWxsLmNvcm5lbGwuZWR1hjJodHRwczovL2lkcC5xYXRhci13ZWlsbC5j
-b3JuZWxsLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8m1MSVMJCE8xgnT1
-U9ltWX5HcyYwDQYJKoZIhvcNAQEFBQADggEBAKqChi5QJ/KNcqu/4MxaDkxRyUqG
-sz1VdX3DIHhb0+Ol6ZfU1OJey+pwqZjo6pTfJB1GGCKYeDsiYZavgAwf/vhUdNk6
-IZss1WV4OOw+Bp1zkonLqRR/poXV5RR3Me+SuSwYi4U3UIY1lngN4NP9JXzLqOyN
-CS2nRgHvacwUcMn4jubuUxNFfGk2rrZ+32v+KKfcJP6tIh/u7IbMmQ0VQhEYOai6
-mgJ6/63J0fFOShYaGfVzsJk4VtKoO1VeF80vDTWcQ65sCT0vHG79MMizEX5N+9fQ
-ULb3rAmKgl6xBpBfo+sBJMTbsZsIG/ev/mSRyHhKra1GIAA4GTcBYaeOOt8=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qatar-weill.cornell.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.qatar-weill.cornell.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.qatar-weill.cornell.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.qatar-weill.cornell.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.qatar-weill.cornell.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qatar-weill.cornell.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDWDCCAkCgAwIBAgIVAOjd1DnJt9+wai5RSTs4dU7Z3uVDMA0GCSqGSIb3DQEB
-BQUAMCYxJDAiBgNVBAMTG2lkcC5xYXRhci13ZWlsbC5jb3JuZWxsLmVkdTAeFw0x
-NDA2MDMwNzI3NTdaFw0zNDA2MDMwNzI3NTdaMCYxJDAiBgNVBAMTG2lkcC5xYXRh
-ci13ZWlsbC5jb3JuZWxsLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANP9iD4QkVd280O25P9msXPV1fG4Tw2RnrVXwHpIYaOncoLJMyV4SMuuarB1
-Pg2zC3uswMzM1xp5iY56UYCSU4QkPY+NzYoBLC7di3dioQsYIYBtHh39B92be8ur
-oLFQrTA8YYH6SllQjKbX6dXAUrkb7qhy1p/h2K9Go9YQIsmgPTune4yycfJAOU7Q
-JcrlFfhl2qeRSDQ+nK/QasYk3+zfuQ3FI3gpANsbyMlVWJnd+75otbizQsnhdATP
-xgZ+JWENLZ2YV5G0tstNCaqm+lSI5FZELAdl6vA0DnH0AZDhUlKM4IrPxbxtD9GU
-epD1RO/C5aGnjbHiiCMtZI1a1+8CAwEAAaN9MHswWgYDVR0RBFMwUYIbaWRwLnFh
-dGFyLXdlaWxsLmNvcm5lbGwuZWR1hjJodHRwczovL2lkcC5xYXRhci13ZWlsbC5j
-b3JuZWxsLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU8m1MSVMJCE8xgnT1
-U9ltWX5HcyYwDQYJKoZIhvcNAQEFBQADggEBAKqChi5QJ/KNcqu/4MxaDkxRyUqG
-sz1VdX3DIHhb0+Ol6ZfU1OJey+pwqZjo6pTfJB1GGCKYeDsiYZavgAwf/vhUdNk6
-IZss1WV4OOw+Bp1zkonLqRR/poXV5RR3Me+SuSwYi4U3UIY1lngN4NP9JXzLqOyN
-CS2nRgHvacwUcMn4jubuUxNFfGk2rrZ+32v+KKfcJP6tIh/u7IbMmQ0VQhEYOai6
-mgJ6/63J0fFOShYaGfVzsJk4VtKoO1VeF80vDTWcQ65sCT0vHG79MMizEX5N+9fQ
-ULb3rAmKgl6xBpBfo+sBJMTbsZsIG/ev/mSRyHhKra1GIAA4GTcBYaeOOt8=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qatar-weill.cornell.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Weill Cornell Medical College in Qatar</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Weill Cornell Medical College in Qatar</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.qatar-med.cornell.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sam Agnew</md:GivenName>
-    <md:EmailAddress>saa2012@qatar-med.cornell.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ala' Aljaser</md:GivenName>
-    <md:EmailAddress>ama2027@qatar-med.cornell.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Adam Elrowmeim</md:GivenName>
-    <md:EmailAddress>ade2003@qatar-med.cornell.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.qmu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.qmu.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 772522cb..00000000
--- a/swamid-interfederations-2.0/idp.qmu.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.qmu.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Queen Margaret University, Edinburgh.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-02T13:55:52Z">
-      <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 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">qmu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUeld6GBPF1gEMJF1Cbn4IarRMleUwDQYJKoZIhvcNAQEL
-						BQAwGDEWMBQGA1UEAwwNaWRwLnFtdS5hYy51azAeFw0xNTA4MjUxMzI1NTRaFw0z
-						NTA4MjUxMzI1NTRaMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkJvSQX9O231NMC1VYk5fVWeGmId4ndlmi
-						WljnN9C9LYcaVypSvgxmcDvUzn5FugBCVZYM5NsI2HTwHq35TCMBBzpKlaWtg3Ee
-						/2Sv77vCORa1pRyPNUdO86zDh603CLo0k6o7JNO2MSPfLprObYX2+NNuOhHc1CwV
-						HFB2UxYQzni8xZJG1hRm4vrv3Po/Y2DibKsQNRUW5QQXhzDzfJUn2IQEMrbKr8bb
-						HcjMue5d8/UILt0PNruvyYhFAQFLjnXhhJd6L0ax4LeMpeI7PDj6QtVyQNr5bsrS
-						NH/utrzNpeopKYnBQgdPgJFM3HiHOGUMfbSIRrh2CESMZtdQonH3AgMBAAGjYTBf
-						MB0GA1UdDgQWBBTjtAI0dD9q/Hob5nJHSwwABUuVuTA+BgNVHREENzA1gg1pZHAu
-						cW11LmFjLnVrhiRodHRwczovL2lkcC5xbXUuYWMudWsvaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBAFAnnZiyhEhPxT1iNCFV5lHMDI+fVCJgl2O7Sfx6
-						2utnqoV1oIWjqXKyaNvsEKPoN+8IpBnITNoknudRLY/qLFzualTRSflQonZBCMHJ
-						SCliHcZOVzriCUTWTOh+5Pw0bQ7aJd1DMg8kAnLXhdG+wIRhBSNuqvYgiNmIQZoN
-						EAncOU5+HylasbLL6ZZVIsXDT5lstVMsxZ8QQWVscHK1Ib4jTOvPY+1j9o0oabcz
-						V+EK/7pRHMo+7Lzphh4M+JsfJ2UNGp/mkLeTD6focMqJyQen/YpL/1QR8nu3o5Wb
-						xQfQRA9vi20FOGF8jZCNLk3ywdmThRrTB+tdowQmVlTGmEw=
-					</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>
-						MIIDIDCCAgigAwIBAgIVAJHckdGW1E6nDrwPcGkVRFgwIkLVMA0GCSqGSIb3DQEB
-						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUyWhcN
-						MzUwODI1MTMyNTUyWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhJKUCoRpDd0DgKIvr1QyYsOCN6nxa60f
-						jNX+VVuYHdyZjQCf3sBa3C/NPOifPl8/nORvcQcW4LlUc9t21d7EgNcYYL9+nZ6B
-						kAlVHTmD0ssH4axtHbPwXnMgs60KnZ5TMPQkgERnTIehjPngxzy89sOGESZDcsQz
-						7c9thvLDLvOQwtb168FClmnMonZc2Ey1h5BfS5ZyxAfuckhoDL98iJFdPOW3yp8D
-						bDPKuPpuMcPl+M3pWHvCLkrkScgqRHypmxYwhMId2kDroJQiT3NXmQGvYzHBn3eo
-						Od9PlcJ+2YNyUXnfvgI/0Pv6m8KCRj107HsgVaYi8w1FtoK3Im7/cwIDAQABo2Ew
-						XzAdBgNVHQ4EFgQUdl+HXullkjaAS02+Es07DHWO230wPgYDVR0RBDcwNYINaWRw
-						LnFtdS5hYy51a4YkaHR0cHM6Ly9pZHAucW11LmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBCwUAA4IBAQBi0qp6mORG4KC3dI2HjH35OuHs1NjO44y0Lo76
-						BBDlDfrDxxMm0LniYXmmNVHIjhshDcnpMUPsyoDEE3wieLxwEp0QLmg44LYmB6YD
-						RF3hb3c3EtOs294StyzX3HBzmDbb0YfN6nhLMd2euOB3EYZpLoJzYoy1luIs/KQm
-						pX+c3pqWsgkqGHBd4s6G5DGb8krulZrK9VKXb1HGqqqY17lKwavAzqE06MzhFRRo
-						GgN5wDmdOa/5B1kzbZ9W6/3JbMd+sKVMS93O1zI8fG8DfLq+4g5f6RY23JbD76ss
-						gYK+Lt/CJr+Opa1+bBQrBwkJGoWP8EfuKDyVYj44Wvutm45J
-					</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>
-						MIIDIDCCAgigAwIBAgIVAKQI4LOpTw+gfDcBaUDIhqnlSKnDMA0GCSqGSIb3DQEB
-						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUzWhcN
-						MzUwODI1MTMyNTUzWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2BfAJesvYBMEHgDojaV+sTJ1HbsCXYYy
-						HQeuctNHxMHROrO4dh9fPrILsNyX3u94ub+OZiV/GE5Tlb1rni09BCOWG4Svq1vR
-						YUaZC9FvQo+vMNPR86m6eJbnMDCvi2IOFKcGcdjQIGS2VfA6H0WwRPR3IRYqygOF
-						+KC/lKLcIyjlKCJB21k12GITnn1tsy6y0Ylg2Ets031eUhK5cpEMR70IVtnJSYyn
-						3yYtk8FA517oY/dUaWxCst45ZvU10e5/lue9DO+JVXLXYnr8c0t6bTebpaBXVCKF
-						mq2sGnoE2nSxMhF9vDx5Tw5QE3R7hwoW0z2s6lIiiD58JAjikkoR3wIDAQABo2Ew
-						XzAdBgNVHQ4EFgQUzWcVUZGHqt8uFsmoKsB0xxhz2cgwPgYDVR0RBDcwNYINaWRw
-						LnFtdS5hYy51a4YkaHR0cHM6Ly9pZHAucW11LmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBCwUAA4IBAQAPjIxhzi2FrZtkC734nd0tBZ0e8Alub1o7XMAK
-						NZbBZVAz4pfEIA55PhIS/a43SD6N46DPX/Ufx3AKZZEc7y16xnJTpIZczot9sAzw
-						HNQpneDehvS13eE7LPJ/XBND5Gwelz6rvX0dgsmA7SvNnHgp2yjVWyoswC99zf4U
-						UONrG0m1HRS8bILFSFYwAEsQbQxlZvRwApWKvUDIFmeBke5wuxCzb4dd/zK7H1X9
-						cjRpce3uDuOhKGQtmMHmig3dd72nJeHUoDY1QzQc4nw1IciJyJ6r3LzScy+GpSje
-						k4A44yA3kIp6HlqiHqF23koUpogpejP3TauQB3gGJQaVeLti
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.qmu.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.qmu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.qmu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.qmu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.qmu.ac.uk/idp/profile/SAML2/Redirect/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">qmu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUeld6GBPF1gEMJF1Cbn4IarRMleUwDQYJKoZIhvcNAQEL
-						BQAwGDEWMBQGA1UEAwwNaWRwLnFtdS5hYy51azAeFw0xNTA4MjUxMzI1NTRaFw0z
-						NTA4MjUxMzI1NTRaMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkJvSQX9O231NMC1VYk5fVWeGmId4ndlmi
-						WljnN9C9LYcaVypSvgxmcDvUzn5FugBCVZYM5NsI2HTwHq35TCMBBzpKlaWtg3Ee
-						/2Sv77vCORa1pRyPNUdO86zDh603CLo0k6o7JNO2MSPfLprObYX2+NNuOhHc1CwV
-						HFB2UxYQzni8xZJG1hRm4vrv3Po/Y2DibKsQNRUW5QQXhzDzfJUn2IQEMrbKr8bb
-						HcjMue5d8/UILt0PNruvyYhFAQFLjnXhhJd6L0ax4LeMpeI7PDj6QtVyQNr5bsrS
-						NH/utrzNpeopKYnBQgdPgJFM3HiHOGUMfbSIRrh2CESMZtdQonH3AgMBAAGjYTBf
-						MB0GA1UdDgQWBBTjtAI0dD9q/Hob5nJHSwwABUuVuTA+BgNVHREENzA1gg1pZHAu
-						cW11LmFjLnVrhiRodHRwczovL2lkcC5xbXUuYWMudWsvaWRwL3NoaWJib2xldGgw
-						DQYJKoZIhvcNAQELBQADggEBAFAnnZiyhEhPxT1iNCFV5lHMDI+fVCJgl2O7Sfx6
-						2utnqoV1oIWjqXKyaNvsEKPoN+8IpBnITNoknudRLY/qLFzualTRSflQonZBCMHJ
-						SCliHcZOVzriCUTWTOh+5Pw0bQ7aJd1DMg8kAnLXhdG+wIRhBSNuqvYgiNmIQZoN
-						EAncOU5+HylasbLL6ZZVIsXDT5lstVMsxZ8QQWVscHK1Ib4jTOvPY+1j9o0oabcz
-						V+EK/7pRHMo+7Lzphh4M+JsfJ2UNGp/mkLeTD6focMqJyQen/YpL/1QR8nu3o5Wb
-						xQfQRA9vi20FOGF8jZCNLk3ywdmThRrTB+tdowQmVlTGmEw=
-					</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>
-						MIIDIDCCAgigAwIBAgIVAJHckdGW1E6nDrwPcGkVRFgwIkLVMA0GCSqGSIb3DQEB
-						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUyWhcN
-						MzUwODI1MTMyNTUyWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhJKUCoRpDd0DgKIvr1QyYsOCN6nxa60f
-						jNX+VVuYHdyZjQCf3sBa3C/NPOifPl8/nORvcQcW4LlUc9t21d7EgNcYYL9+nZ6B
-						kAlVHTmD0ssH4axtHbPwXnMgs60KnZ5TMPQkgERnTIehjPngxzy89sOGESZDcsQz
-						7c9thvLDLvOQwtb168FClmnMonZc2Ey1h5BfS5ZyxAfuckhoDL98iJFdPOW3yp8D
-						bDPKuPpuMcPl+M3pWHvCLkrkScgqRHypmxYwhMId2kDroJQiT3NXmQGvYzHBn3eo
-						Od9PlcJ+2YNyUXnfvgI/0Pv6m8KCRj107HsgVaYi8w1FtoK3Im7/cwIDAQABo2Ew
-						XzAdBgNVHQ4EFgQUdl+HXullkjaAS02+Es07DHWO230wPgYDVR0RBDcwNYINaWRw
-						LnFtdS5hYy51a4YkaHR0cHM6Ly9pZHAucW11LmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBCwUAA4IBAQBi0qp6mORG4KC3dI2HjH35OuHs1NjO44y0Lo76
-						BBDlDfrDxxMm0LniYXmmNVHIjhshDcnpMUPsyoDEE3wieLxwEp0QLmg44LYmB6YD
-						RF3hb3c3EtOs294StyzX3HBzmDbb0YfN6nhLMd2euOB3EYZpLoJzYoy1luIs/KQm
-						pX+c3pqWsgkqGHBd4s6G5DGb8krulZrK9VKXb1HGqqqY17lKwavAzqE06MzhFRRo
-						GgN5wDmdOa/5B1kzbZ9W6/3JbMd+sKVMS93O1zI8fG8DfLq+4g5f6RY23JbD76ss
-						gYK+Lt/CJr+Opa1+bBQrBwkJGoWP8EfuKDyVYj44Wvutm45J
-					</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>
-						MIIDIDCCAgigAwIBAgIVAKQI4LOpTw+gfDcBaUDIhqnlSKnDMA0GCSqGSIb3DQEB
-						CwUAMBgxFjAUBgNVBAMMDWlkcC5xbXUuYWMudWswHhcNMTUwODI1MTMyNTUzWhcN
-						MzUwODI1MTMyNTUzWjAYMRYwFAYDVQQDDA1pZHAucW11LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2BfAJesvYBMEHgDojaV+sTJ1HbsCXYYy
-						HQeuctNHxMHROrO4dh9fPrILsNyX3u94ub+OZiV/GE5Tlb1rni09BCOWG4Svq1vR
-						YUaZC9FvQo+vMNPR86m6eJbnMDCvi2IOFKcGcdjQIGS2VfA6H0WwRPR3IRYqygOF
-						+KC/lKLcIyjlKCJB21k12GITnn1tsy6y0Ylg2Ets031eUhK5cpEMR70IVtnJSYyn
-						3yYtk8FA517oY/dUaWxCst45ZvU10e5/lue9DO+JVXLXYnr8c0t6bTebpaBXVCKF
-						mq2sGnoE2nSxMhF9vDx5Tw5QE3R7hwoW0z2s6lIiiD58JAjikkoR3wIDAQABo2Ew
-						XzAdBgNVHQ4EFgQUzWcVUZGHqt8uFsmoKsB0xxhz2cgwPgYDVR0RBDcwNYINaWRw
-						LnFtdS5hYy51a4YkaHR0cHM6Ly9pZHAucW11LmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBCwUAA4IBAQAPjIxhzi2FrZtkC734nd0tBZ0e8Alub1o7XMAK
-						NZbBZVAz4pfEIA55PhIS/a43SD6N46DPX/Ufx3AKZZEc7y16xnJTpIZczot9sAzw
-						HNQpneDehvS13eE7LPJ/XBND5Gwelz6rvX0dgsmA7SvNnHgp2yjVWyoswC99zf4U
-						UONrG0m1HRS8bILFSFYwAEsQbQxlZvRwApWKvUDIFmeBke5wuxCzb4dd/zK7H1X9
-						cjRpce3uDuOhKGQtmMHmig3dd72nJeHUoDY1QzQc4nw1IciJyJ6r3LzScy+GpSje
-						k4A44yA3kIp6HlqiHqF23koUpogpejP3TauQB3gGJQaVeLti
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Margaret University, Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Margaret University, Edinburgh TEST (Do not use)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Garry</GivenName>
-    <SurName>Haining</SurName>
-    <EmailAddress>mailto:ghaining@qmu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Garry</GivenName>
-    <SurName>Haining</SurName>
-    <EmailAddress>mailto:ghaining@qmu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rac.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.rac.ac.uk-oala-metadata.xml
deleted file mode 100644
index 7ddd4ddc..00000000
--- a/swamid-interfederations-2.0/idp.rac.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rac.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the Royal Agricultural University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-30T15:44:04Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">rac.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIIYso0tsUAlx0wDQYJKoZIhvcNAQEFBQAwPTEjMCEGA1UE
-						CgwaUm95YWwgQWdyaWN1bHR1cmFsIENvbGxlZ2UxFjAUBgNVBAMMDWlkcC5yYWMu
-						YWMudWswHhcNMTIwNzE4MTEyMDI1WhcNMjIwNzE4MTEyMDI1WjA9MSMwIQYDVQQK
-						DBpSb3lhbCBBZ3JpY3VsdHVyYWwgQ29sbGVnZTEWMBQGA1UEAwwNaWRwLnJhYy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIgWwNErQdrW7Jge
-						wRcdxffYA3ownBclhJdzCmx6k6SgtSd4LawXlvF/zYU3uq6VT87odI+lFYMGzIhg
-						jpYzpEcYOz+fe6BCo21Ghq6BeMCJwGdkB4gZq+mgz/GYXhjAX+zlw8Ryl0JcaUfS
-						uPcCcccjVSV0ZOIuVc+IQHJWsyWyAz7QbVjQN0C+rCK76JMbprU/B88fE6ZX+j8/
-						9Epqs8YEEDBCxjO7pKcgtGmcVTlmWASmaO4+vndg1uCxb+Twc+ve3OqVF5VQdRQa
-						t4pSgxywFY4qHT2vS9zojmpclPi8CKwASpHVKpYic4vjMggoVXc9Uz1lQmV+8ncn
-						e/1o5+0CAwEAAaNQME4wHQYDVR0OBBYEFD+j5I3TjaVsz/fztmw/pnq6FQIRMB8G
-						A1UdIwQYMBaAFD+j5I3TjaVsz/fztmw/pnq6FQIRMAwGA1UdEwQFMAMBAf8wDQYJ
-						KoZIhvcNAQEFBQADggEBAEw7zYoB5vOTdMWiSaSBKUr91UP8lCH8veVNCVDRwujq
-						pjli3+bwqiWcvXQdObzW5r/EGLRDM2d3u3GsmIoWP/JAxwfaaURSz0tGPr+NOhXI
-						55l2WOX6QfQWOpeQHQs+EJCDg0S2X6jsuILLAZWG4EP+94Fgqbpe2qb5n7aYLAHW
-						9VupAZuqO3LgWjA7qXF0xe8D9E86yGAoqICTQy5IOT0Pbe9Us9QL3CHmTMvCwvpf
-						d0oNG8oZer9agEzQh2gGenDzVmHWTp/n6j+dSjq0TfNXkd3skkcaXv/KXgpzuv3L
-						WZWU2kY5guo5wEXb3L9cxzFAZ+OaHFp31a/I2e0kHS0=
-					</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>
-						MIIDTDCCAjSgAwIBAgIIYso0tsUAlx0wDQYJKoZIhvcNAQEFBQAwPTEjMCEGA1UE
-						CgwaUm95YWwgQWdyaWN1bHR1cmFsIENvbGxlZ2UxFjAUBgNVBAMMDWlkcC5yYWMu
-						YWMudWswHhcNMTIwNzE4MTEyMDI1WhcNMjIwNzE4MTEyMDI1WjA9MSMwIQYDVQQK
-						DBpSb3lhbCBBZ3JpY3VsdHVyYWwgQ29sbGVnZTEWMBQGA1UEAwwNaWRwLnJhYy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIgWwNErQdrW7Jge
-						wRcdxffYA3ownBclhJdzCmx6k6SgtSd4LawXlvF/zYU3uq6VT87odI+lFYMGzIhg
-						jpYzpEcYOz+fe6BCo21Ghq6BeMCJwGdkB4gZq+mgz/GYXhjAX+zlw8Ryl0JcaUfS
-						uPcCcccjVSV0ZOIuVc+IQHJWsyWyAz7QbVjQN0C+rCK76JMbprU/B88fE6ZX+j8/
-						9Epqs8YEEDBCxjO7pKcgtGmcVTlmWASmaO4+vndg1uCxb+Twc+ve3OqVF5VQdRQa
-						t4pSgxywFY4qHT2vS9zojmpclPi8CKwASpHVKpYic4vjMggoVXc9Uz1lQmV+8ncn
-						e/1o5+0CAwEAAaNQME4wHQYDVR0OBBYEFD+j5I3TjaVsz/fztmw/pnq6FQIRMB8G
-						A1UdIwQYMBaAFD+j5I3TjaVsz/fztmw/pnq6FQIRMAwGA1UdEwQFMAMBAf8wDQYJ
-						KoZIhvcNAQEFBQADggEBAEw7zYoB5vOTdMWiSaSBKUr91UP8lCH8veVNCVDRwujq
-						pjli3+bwqiWcvXQdObzW5r/EGLRDM2d3u3GsmIoWP/JAxwfaaURSz0tGPr+NOhXI
-						55l2WOX6QfQWOpeQHQs+EJCDg0S2X6jsuILLAZWG4EP+94Fgqbpe2qb5n7aYLAHW
-						9VupAZuqO3LgWjA7qXF0xe8D9E86yGAoqICTQy5IOT0Pbe9Us9QL3CHmTMvCwvpf
-						d0oNG8oZer9agEzQh2gGenDzVmHWTp/n6j+dSjq0TfNXkd3skkcaXv/KXgpzuv3L
-						WZWU2kY5guo5wEXb3L9cxzFAZ+OaHFp31a/I2e0kHS0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rac.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rac.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Royal Agricultural University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Agricultural University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rac.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Peter</GivenName>
-    <SurName>Brooks</SurName>
-    <EmailAddress>mailto:peter.brooks@rau.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Griffin</SurName>
-    <EmailAddress>mailto:james.griffin@rau.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.racc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.racc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 8df909d1..00000000
--- a/swamid-interfederations-2.0/idp.racc.ac.uk-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.racc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Richmond Adult Community College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-16T09:00:14Z">
-      <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">racc.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Richmond Adult Community College</mdui:DisplayName>
-        <mdui:Logo height="71" width="154">https://www.racc.ac.uk/files/images/racclogo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.racc.ac.uk/files/images/smallracclogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIzCCAgugAwIBAgIUf8EAs09RQNjeRsweRhhhdo0gIh4wDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOaWRwLnJhY2MuYWMudWswHhcNMTQwODEyMTUzMzExWhcN
-						MzQwODEyMTUzMzExWjAZMRcwFQYDVQQDEw5pZHAucmFjYy5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2gWjs0nqPuueSEDuCJHThpcFI7Y0XA
-						u1LbM4nRfXAEOjx9TKQ6H+70I4GZf2ljmbwINbPyVmtpcZgLuXzf7nxTIkIaqSK3
-						o4aDQj72VVQhVSJ2HAYvhkrtOznPDCWY6FyeBjqhuPghvEbgJtW/o+4VClUdkwMX
-						/7PH7gQNqskjkiSdjVOLGD99F0syRFwtxYNoZxMt5gSltz7CmyOPqZDJWfIpJt/1
-						Soj0dAaOrIxz79I9pdmkh/VAb8RyasFRSEE290BtUdAw7BLzlwvEre5k9Yafzg0g
-						RXXYXidZ+Gkt9zz8TYb/p12J+ktMfbJCAtC0KUYkhpY4ZjYE0G/3RRMCAwEAAaNj
-						MGEwQAYDVR0RBDkwN4IOaWRwLnJhY2MuYWMudWuGJWh0dHBzOi8vaWRwLnJhY2Mu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLcKRq3/gCr9G2rw89xbfpI3
-						RHHTMA0GCSqGSIb3DQEBBQUAA4IBAQAdAW7tZBzJOS+ULQ54b20VL2Cmvj0bZuVO
-						nEDW3vnAJdbi3Q6RNDl6ru0KHiGqQxz3SPN6UpKYbydZy/rgBu67tFS2nDPdfv83
-						D0Cozu/u12G7X/9u0HR4QwW51XPUgPjZBOY54ZbnVL7inTYCVwjABA4zNZ9KHgsu
-						iddLoyAZP4t9/hobm3qxeEAItYYz45aQei8f+ztAqhUq789Ble1ll1nw6SOwcujT
-						eSrWyEExSZKTu9diPVDG/ChJCFRBGLR3CScBgaoT6+d6WRYUX8bbeao89JjBm0Nf
-						ACWJFCPa6s7SURC2luCO0NnF6QxNTCBrkXI8Amw4U+Bvpv7v3Fhg
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.racc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.racc.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.racc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.racc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.racc.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.racc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.racc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.racc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.racc.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">racc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIzCCAgugAwIBAgIUf8EAs09RQNjeRsweRhhhdo0gIh4wDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOaWRwLnJhY2MuYWMudWswHhcNMTQwODEyMTUzMzExWhcN
-						MzQwODEyMTUzMzExWjAZMRcwFQYDVQQDEw5pZHAucmFjYy5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2gWjs0nqPuueSEDuCJHThpcFI7Y0XA
-						u1LbM4nRfXAEOjx9TKQ6H+70I4GZf2ljmbwINbPyVmtpcZgLuXzf7nxTIkIaqSK3
-						o4aDQj72VVQhVSJ2HAYvhkrtOznPDCWY6FyeBjqhuPghvEbgJtW/o+4VClUdkwMX
-						/7PH7gQNqskjkiSdjVOLGD99F0syRFwtxYNoZxMt5gSltz7CmyOPqZDJWfIpJt/1
-						Soj0dAaOrIxz79I9pdmkh/VAb8RyasFRSEE290BtUdAw7BLzlwvEre5k9Yafzg0g
-						RXXYXidZ+Gkt9zz8TYb/p12J+ktMfbJCAtC0KUYkhpY4ZjYE0G/3RRMCAwEAAaNj
-						MGEwQAYDVR0RBDkwN4IOaWRwLnJhY2MuYWMudWuGJWh0dHBzOi8vaWRwLnJhY2Mu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLcKRq3/gCr9G2rw89xbfpI3
-						RHHTMA0GCSqGSIb3DQEBBQUAA4IBAQAdAW7tZBzJOS+ULQ54b20VL2Cmvj0bZuVO
-						nEDW3vnAJdbi3Q6RNDl6ru0KHiGqQxz3SPN6UpKYbydZy/rgBu67tFS2nDPdfv83
-						D0Cozu/u12G7X/9u0HR4QwW51XPUgPjZBOY54ZbnVL7inTYCVwjABA4zNZ9KHgsu
-						iddLoyAZP4t9/hobm3qxeEAItYYz45aQei8f+ztAqhUq789Ble1ll1nw6SOwcujT
-						eSrWyEExSZKTu9diPVDG/ChJCFRBGLR3CScBgaoT6+d6WRYUX8bbeao89JjBm0Nf
-						ACWJFCPa6s7SURC2luCO0NnF6QxNTCBrkXI8Amw4U+Bvpv7v3Fhg
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.racc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.racc.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">Richmond Adult Community College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Richmond Adult Community College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.racc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ray</GivenName>
-    <SurName>Matthews</SurName>
-    <EmailAddress>mailto:ray.matthews@racc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ray</GivenName>
-    <SurName>Matthews</SurName>
-    <EmailAddress>mailto:ray.matthews@racc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.radford.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.radford.edu-idp-shibboleth.xml
deleted file mode 100644
index a8bd73e5..00000000
--- a/swamid-interfederations-2.0/idp.radford.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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://idp.radford.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">radford.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Radford University</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>
-MIIDpTCCAo2gAwIBAgIJANeIL5N/K7s2MA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJWQTEQMA4GA1UEBwwHUmFkZm9yZDEUMBIGA1UECgwL
-cmFkZm9yZC5lZHUxCzAJBgNVBAsMAklUMRgwFgYDVQQDDA9zc28ucmFkZm9yZC5l
-ZHUwHhcNMTQwNTI4MTczMzA4WhcNMzQwNTI4MTczMzA4WjBpMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCVkExEDAOBgNVBAcMB1JhZGZvcmQxFDASBgNVBAoMC3JhZGZv
-cmQuZWR1MQswCQYDVQQLDAJJVDEYMBYGA1UEAwwPc3NvLnJhZGZvcmQuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1TGYutWcsJGFBi3p23QrfDKy
-fPMTemhzbpwf2WoyaMqKOogc/NqqdBpQXji0jU05y0yjxGv6Jx7Ey88EnHGVNOJp
-3CeiElOqBJ/hRl+S4l6zmHfofgQWHEhtR2SawRv90Pj/Za5+TiIvfsifvjFWdFSJ
-sOaQ9Z7/SSuXn1Ft9iH844OBcrpYQPYsA0Xk5EgMvv7cXxJjerq5UHdlZlglN96M
-lMD8U6gzAi7rmyhcBTZ50zD01FMZzOyWLjf1zfvwyj6JvRE2e3FGwY6RQt/Y7mXy
-xu7RCtxVKiA+40YM+HN6A9p9A/+srf9tOgNLyjZ0ogNCWp+cFD1mLIzcKNuWqwID
-AQABo1AwTjAdBgNVHQ4EFgQUlzH3pb2TBuySahzZbUNiEFuNT7EwHwYDVR0jBBgw
-FoAUlzH3pb2TBuySahzZbUNiEFuNT7EwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAaq6hZya9JWF5HPxy+PvAkr6XQQLzVs9j00FxAICKrPlgXW3CFvqj
-IbkzsRG0eKtotoQRO3GakOhO2gzyiVCI/6aR/6MX/c9OFwt0qe5HUNsiTiMGOq4V
-tb8i7csaCB49cfwD5tewWQdeIidg7OhPqO5S2FNrdM6jVpEg5kDuI0UIHazdmBOZ
-FDELTQ+nBfCrIa9letM+SoIU4znIvOfd4Z6k4uU11aDaZKej6/9rwMuo4EfgUFTR
-16SeaJX8wNydS4+68Ch9U5Z3saWWuC3aU4pNnMQW1VUt0bqVhtgPkcTaS7uZeYhC
-5ZxW63cQCq8Tt4xwbP8uzhoMCBiAWn+H1g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.radford.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.radford.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.radford.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.radford.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.radford.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.radford.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.radford.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.radford.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">radford.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDpTCCAo2gAwIBAgIJANeIL5N/K7s2MA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJWQTEQMA4GA1UEBwwHUmFkZm9yZDEUMBIGA1UECgwL
-cmFkZm9yZC5lZHUxCzAJBgNVBAsMAklUMRgwFgYDVQQDDA9zc28ucmFkZm9yZC5l
-ZHUwHhcNMTQwNTI4MTczMzA4WhcNMzQwNTI4MTczMzA4WjBpMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCVkExEDAOBgNVBAcMB1JhZGZvcmQxFDASBgNVBAoMC3JhZGZv
-cmQuZWR1MQswCQYDVQQLDAJJVDEYMBYGA1UEAwwPc3NvLnJhZGZvcmQuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1TGYutWcsJGFBi3p23QrfDKy
-fPMTemhzbpwf2WoyaMqKOogc/NqqdBpQXji0jU05y0yjxGv6Jx7Ey88EnHGVNOJp
-3CeiElOqBJ/hRl+S4l6zmHfofgQWHEhtR2SawRv90Pj/Za5+TiIvfsifvjFWdFSJ
-sOaQ9Z7/SSuXn1Ft9iH844OBcrpYQPYsA0Xk5EgMvv7cXxJjerq5UHdlZlglN96M
-lMD8U6gzAi7rmyhcBTZ50zD01FMZzOyWLjf1zfvwyj6JvRE2e3FGwY6RQt/Y7mXy
-xu7RCtxVKiA+40YM+HN6A9p9A/+srf9tOgNLyjZ0ogNCWp+cFD1mLIzcKNuWqwID
-AQABo1AwTjAdBgNVHQ4EFgQUlzH3pb2TBuySahzZbUNiEFuNT7EwHwYDVR0jBBgw
-FoAUlzH3pb2TBuySahzZbUNiEFuNT7EwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAaq6hZya9JWF5HPxy+PvAkr6XQQLzVs9j00FxAICKrPlgXW3CFvqj
-IbkzsRG0eKtotoQRO3GakOhO2gzyiVCI/6aR/6MX/c9OFwt0qe5HUNsiTiMGOq4V
-tb8i7csaCB49cfwD5tewWQdeIidg7OhPqO5S2FNrdM6jVpEg5kDuI0UIHazdmBOZ
-FDELTQ+nBfCrIa9letM+SoIU4znIvOfd4Z6k4uU11aDaZKej6/9rwMuo4EfgUFTR
-16SeaJX8wNydS4+68Ch9U5Z3saWWuC3aU4pNnMQW1VUt0bqVhtgPkcTaS7uZeYhC
-5ZxW63cQCq8Tt4xwbP8uzhoMCBiAWn+H1g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.radford.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Radford University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Radford University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.radford.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Todd Joyce</md:GivenName>
-    <md:EmailAddress>tjoyce@radford.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.raidp.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.raidp.org-idp-shibboleth.xml
deleted file mode 100644
index f401f86a..00000000
--- a/swamid-interfederations-2.0/idp.raidp.org-idp-shibboleth.xml
+++ /dev/null
@@ -1,96 +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://idp.raidp.org/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">raidp.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Clemson's Research Affiliate Identity Provider</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>
-MIIDIDCCAgigAwIBAgIVANe4MvNPyP7NcMJiRmbfGStF9pT7MA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5yYWlkcC5vcmcwHhcNMDgwNzA3MTkyNDU1WhcN
-MjgwNzA3MTkyNDU1WjAYMRYwFAYDVQQDEw1pZHAucmFpZHAub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiKxvSUmtufH5z2l9X1N1OeGlyaknMTeZ
-/yD+ytFXWp1uBkZVy1bQePcrzJcMI2BwaV5c6gykwKx4CGRuXOAp0lvOAk+xf9RK
-HsRWDJpZwcfKwEPjOnVIZTsPPkZJXr0xGNraKtIHHV15F8eX5h6QK5koruiFQ3hY
-fmQ6GA0+0v38pcBa91IiCQiKScSoDn1Xxl0HawgisdDP09kBDDry6CNTcZa+7paS
-rQp8/zE1V8xKa8Ujbz1garXxXkxrmNWER24PCqkhVdAzkyClAgXqMZ2RrKN/X5ng
-5LacsEJ5TEAFKnoqefnJrOvFXFNSSTzr87IovPKt25OGubF7Qpb8TwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAucmFpZHAub3JnhiRodHRwczovL2lkcC5yYWlkcC5v
-cmcvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEdXLarmprvb0PEchR5fnwA5HQWS
-MA0GCSqGSIb3DQEBBQUAA4IBAQAlSIyY5LjRdak1q6J+I17p17+qomJDvuB0jDZj
-+XTPmPkDQ2aaSutB1JbpeFSbI8qFu6FoOEduN7IG5MGPKaxqfka+3d/zOVMQ9uoy
-TCSJIelMlaDdZ4idiNG3EfXSNfCFKMnjuoKdtgVw0eq7Hi0ZIX1zMfhcVl/5gH3f
-og+scNolB7CeplqmlNMaOlWgA+fCVieGvR4PqVlWxhnJA9RUugM/cXttpdtJuGej
-ksFr3hTtLjGHNDF5BaWGFL7Gpi9dW8Z81RI0mE13rfc5COle+TI6gmevZaxz7H0m
-iwmEilmeoV/3V9UVw8F1NSi65seZ1V9DGJfeqeOEPlVG+RYn
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.raidp.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.raidp.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.raidp.org/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.raidp.org/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.raidp.org/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.raidp.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.raidp.org/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">raidp.org</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVANe4MvNPyP7NcMJiRmbfGStF9pT7MA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5yYWlkcC5vcmcwHhcNMDgwNzA3MTkyNDU1WhcN
-MjgwNzA3MTkyNDU1WjAYMRYwFAYDVQQDEw1pZHAucmFpZHAub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiKxvSUmtufH5z2l9X1N1OeGlyaknMTeZ
-/yD+ytFXWp1uBkZVy1bQePcrzJcMI2BwaV5c6gykwKx4CGRuXOAp0lvOAk+xf9RK
-HsRWDJpZwcfKwEPjOnVIZTsPPkZJXr0xGNraKtIHHV15F8eX5h6QK5koruiFQ3hY
-fmQ6GA0+0v38pcBa91IiCQiKScSoDn1Xxl0HawgisdDP09kBDDry6CNTcZa+7paS
-rQp8/zE1V8xKa8Ujbz1garXxXkxrmNWER24PCqkhVdAzkyClAgXqMZ2RrKN/X5ng
-5LacsEJ5TEAFKnoqefnJrOvFXFNSSTzr87IovPKt25OGubF7Qpb8TwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAucmFpZHAub3JnhiRodHRwczovL2lkcC5yYWlkcC5v
-cmcvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEdXLarmprvb0PEchR5fnwA5HQWS
-MA0GCSqGSIb3DQEBBQUAA4IBAQAlSIyY5LjRdak1q6J+I17p17+qomJDvuB0jDZj
-+XTPmPkDQ2aaSutB1JbpeFSbI8qFu6FoOEduN7IG5MGPKaxqfka+3d/zOVMQ9uoy
-TCSJIelMlaDdZ4idiNG3EfXSNfCFKMnjuoKdtgVw0eq7Hi0ZIX1zMfhcVl/5gH3f
-og+scNolB7CeplqmlNMaOlWgA+fCVieGvR4PqVlWxhnJA9RUugM/cXttpdtJuGej
-ksFr3hTtLjGHNDF5BaWGFL7Gpi9dW8Z81RI0mE13rfc5COle+TI6gmevZaxz7H0m
-iwmEilmeoV/3V9UVw8F1NSi65seZ1V9DGJfeqeOEPlVG+RYn
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.raidp.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.raidp.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Clemson University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Clemson's Research Affiliate Identity Provider</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.raidp.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Barry Johnson</md:GivenName>
-    <md:EmailAddress>hbj@clemson.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kathy Wright</md:GivenName>
-    <md:EmailAddress>kewrig@clemson.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.xml
deleted file mode 100644
index 87361466..00000000
--- a/swamid-interfederations-2.0/idp.rca.ac.uk-oala-metadata.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://idp.rca.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the Royal College of Art.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-06T13:38:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">rca.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIIZiSQ6tfQBJIwDQYJKoZIhvcNAQEFBQAwNzEdMBsGA1UE
-						CgwUUm95YWwgQ29sbGVnZSBvZiBBcnQxFjAUBgNVBAMMDWlkcC5yY2EuYWMudWsw
-						HhcNMTIwNjI3MTUxOTA4WhcNMjIwNjI3MTUxOTA4WjA3MR0wGwYDVQQKDBRSb3lh
-						bCBDb2xsZWdlIG9mIEFydDEWMBQGA1UEAwwNaWRwLnJjYS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKTLIImMHtfEOzSFGDWmWaj0Q4PODBKv
-						U5HxSgjRnoxHWuqhHW9LIEA9tSz0iTAZIEkRu/MniPsTuh+GNmDLh9lupzlGlcpv
-						w1JxsMFwJDTT7LtPUWEXcor6MFiJ4hJiaEZzuYh06MNPBeV4Eyl8X3eqxzvjwZ5u
-						38pg/sr6KlSfCDXbiENvithI433CeRzzqWgD2dmAPirn9r2VKpc4K6kzS005cyN2
-						q2AeT67YXZq35nXfZ7fHl4w93b6/cQWEL/JzmmSKfKxGaoHU/6Kzqw3O81CJZUvq
-						8o7okTQINBSWJ35Ap7g6eRVwAWAvqi7l67CjbaF/tl7feQOc07ZVkPMCAwEAAaNQ
-						ME4wHQYDVR0OBBYEFC4++el5Fh1Mm9aTCqz05dVjGlQ8MB8GA1UdIwQYMBaAFC4+
-						+el5Fh1Mm9aTCqz05dVjGlQ8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAJU83TKzvFGDVDTsvbGMOIXiaSeoD1RibFWwjUXdQXyc9y46IAVXbzWEWqw5
-						1EdHu4Ky5BMNHAxN363L38tgI70eXLxHU91pFxS2ccJnSPZBBLPA6GpXWdkoHWP6
-						r8szBgvpAP7bgcXjjjZ5e9vkQiy8Jx2nCNVD8wo3TGiFGBtoEX6J0ZEdSAKyFYh/
-						ncGuI7VOvhaXZqHX2qnXn1+Xnm0UI3wAXcWIvWCOnKXfG1cglrQL0cCsnucUMaWd
-						ZXH1VCl39wBsLDA9tIFFP0j9wrqL0zB/O5Q+MpbXdogr1o1Plf3WT9Gs5X+qxKwQ
-						1PCtHEiZPbi8Pd4Iw2QAOFaTOnE=
-					</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>
-						MIIDQDCCAiigAwIBAgIIZiSQ6tfQBJIwDQYJKoZIhvcNAQEFBQAwNzEdMBsGA1UE
-						CgwUUm95YWwgQ29sbGVnZSBvZiBBcnQxFjAUBgNVBAMMDWlkcC5yY2EuYWMudWsw
-						HhcNMTIwNjI3MTUxOTA4WhcNMjIwNjI3MTUxOTA4WjA3MR0wGwYDVQQKDBRSb3lh
-						bCBDb2xsZWdlIG9mIEFydDEWMBQGA1UEAwwNaWRwLnJjYS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKTLIImMHtfEOzSFGDWmWaj0Q4PODBKv
-						U5HxSgjRnoxHWuqhHW9LIEA9tSz0iTAZIEkRu/MniPsTuh+GNmDLh9lupzlGlcpv
-						w1JxsMFwJDTT7LtPUWEXcor6MFiJ4hJiaEZzuYh06MNPBeV4Eyl8X3eqxzvjwZ5u
-						38pg/sr6KlSfCDXbiENvithI433CeRzzqWgD2dmAPirn9r2VKpc4K6kzS005cyN2
-						q2AeT67YXZq35nXfZ7fHl4w93b6/cQWEL/JzmmSKfKxGaoHU/6Kzqw3O81CJZUvq
-						8o7okTQINBSWJ35Ap7g6eRVwAWAvqi7l67CjbaF/tl7feQOc07ZVkPMCAwEAAaNQ
-						ME4wHQYDVR0OBBYEFC4++el5Fh1Mm9aTCqz05dVjGlQ8MB8GA1UdIwQYMBaAFC4+
-						+el5Fh1Mm9aTCqz05dVjGlQ8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAJU83TKzvFGDVDTsvbGMOIXiaSeoD1RibFWwjUXdQXyc9y46IAVXbzWEWqw5
-						1EdHu4Ky5BMNHAxN363L38tgI70eXLxHU91pFxS2ccJnSPZBBLPA6GpXWdkoHWP6
-						r8szBgvpAP7bgcXjjjZ5e9vkQiy8Jx2nCNVD8wo3TGiFGBtoEX6J0ZEdSAKyFYh/
-						ncGuI7VOvhaXZqHX2qnXn1+Xnm0UI3wAXcWIvWCOnKXfG1cglrQL0cCsnucUMaWd
-						ZXH1VCl39wBsLDA9tIFFP0j9wrqL0zB/O5Q+MpbXdogr1o1Plf3WT9Gs5X+qxKwQ
-						1PCtHEiZPbi8Pd4Iw2QAOFaTOnE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rca.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rca.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Royal College of Art</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal College of Art</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rca.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Elizabeth</GivenName>
-    <SurName>Oliver</SurName>
-    <EmailAddress>mailto:elizabeth.oliver@rca.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Keene</SurName>
-    <EmailAddress>mailto:paul.keene@rca.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rcpch.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rcpch.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index cbc5918c..00000000
--- a/swamid-interfederations-2.0/idp.rcpch.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.rcpch.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the Royal College of Paediatrics and Child Health.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-12T09:11:37Z">
-      <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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Royal College of Paediatrics and Child Health</mdui:DisplayName>
-        <mdui:Logo height="168" width="238">https://www.rcpch.ac.uk/sites/default/themes/rcpch/logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.rcpch.ac.uk/sites/default/themes/rcpch/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcpch.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUJdj239A2eY7O8uJt78R/EdkY8fwwDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAwwPaWRwLnJjcGNoLmFjLnVrMB4XDTE0MTEyNTEwMTcxNloX
-						DTM0MTEyNTEwMTcxNlowGjEYMBYGA1UEAwwPaWRwLnJjcGNoLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgoJ0GABGGYuw7iPiNmz6l9BMW72h
-						AxzjzadeAAo/7ggPeBMnMtksqK5XQ0LhiEVBC+A3vvfqFC1L/cjPX633o5VTViJx
-						2Mt2Wd0q2pF53+iLP8ii2WT1OoVY1HC4nryXAncBYAH7iszGUv/W/EIDt+4vrV0w
-						Av8tOO9HXW8nSk3BV6n2BOlLJLverYTq+jqkAyMFm0Nd7iwnEoCh/9rIL9cmCtNk
-						o/or9T+1c4gb7d1s/r0Lsl8HH6PMzTkBKjoqnmKq8RArclzKTDcYpYokVxcYhyju
-						Cb+viq2gEX9Gs/RHMQrwKeId7/da9YCwtFXwS3xXB7a5s7QCimNlRkS9rQIDAQAB
-						o2UwYzAdBgNVHQ4EFgQUo9jZYx7yrwhezyDWPPXj011eI1gwQgYDVR0RBDswOYIP
-						aWRwLnJjcGNoLmFjLnVrhiZodHRwczovL2lkcC5yY3BjaC5hYy51ay9pZHAvc2hp
-						YmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAWGCG4+am620zp3knjynttbaB41rd
-						4HCuHTqvCYDRkztJu/XxNtymxs2JPCT0+hqH5iHeNIQuufEVMrawJVrdNw45/LbQ
-						RLSyRaOPyQ0kJygZEeomBEX/4ZadKewHm9ZNgyjRj9qD8cLflkrVqfnDoicxKKtS
-						3ew+NPv3tX0raDfZMfq0MWQrFz9eP2qaeibtNO1xGh+Rp/seeG0MZRtCmtEpXGxf
-						NxhnmRLKM0uOMAxtL2/DLfpCJ8w8a6of61Y6l9BqAD5+MYU8Ve4upV+4VGHIbkoB
-						Y3epTNgBJ8fJ+qQVJknINlO/fKJTQmAvap3uwSHeh0mt3tQxEtr1nPoX6A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rcpch.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rcpch.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.rcpch.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rcpch.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.rcpch.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rcpch.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpch.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">rcpch.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUJdj239A2eY7O8uJt78R/EdkY8fwwDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAwwPaWRwLnJjcGNoLmFjLnVrMB4XDTE0MTEyNTEwMTcxNloX
-						DTM0MTEyNTEwMTcxNlowGjEYMBYGA1UEAwwPaWRwLnJjcGNoLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgoJ0GABGGYuw7iPiNmz6l9BMW72h
-						AxzjzadeAAo/7ggPeBMnMtksqK5XQ0LhiEVBC+A3vvfqFC1L/cjPX633o5VTViJx
-						2Mt2Wd0q2pF53+iLP8ii2WT1OoVY1HC4nryXAncBYAH7iszGUv/W/EIDt+4vrV0w
-						Av8tOO9HXW8nSk3BV6n2BOlLJLverYTq+jqkAyMFm0Nd7iwnEoCh/9rIL9cmCtNk
-						o/or9T+1c4gb7d1s/r0Lsl8HH6PMzTkBKjoqnmKq8RArclzKTDcYpYokVxcYhyju
-						Cb+viq2gEX9Gs/RHMQrwKeId7/da9YCwtFXwS3xXB7a5s7QCimNlRkS9rQIDAQAB
-						o2UwYzAdBgNVHQ4EFgQUo9jZYx7yrwhezyDWPPXj011eI1gwQgYDVR0RBDswOYIP
-						aWRwLnJjcGNoLmFjLnVrhiZodHRwczovL2lkcC5yY3BjaC5hYy51ay9pZHAvc2hp
-						YmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAWGCG4+am620zp3knjynttbaB41rd
-						4HCuHTqvCYDRkztJu/XxNtymxs2JPCT0+hqH5iHeNIQuufEVMrawJVrdNw45/LbQ
-						RLSyRaOPyQ0kJygZEeomBEX/4ZadKewHm9ZNgyjRj9qD8cLflkrVqfnDoicxKKtS
-						3ew+NPv3tX0raDfZMfq0MWQrFz9eP2qaeibtNO1xGh+Rp/seeG0MZRtCmtEpXGxf
-						NxhnmRLKM0uOMAxtL2/DLfpCJ8w8a6of61Y6l9BqAD5+MYU8Ve4upV+4VGHIbkoB
-						Y3epTNgBJ8fJ+qQVJknINlO/fKJTQmAvap3uwSHeh0mt3tQxEtr1nPoX6A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rcpch.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rcpch.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">Royal College of Paediatrics and Child Health</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal College of Paediatrics and Child Health</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rcpch.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Overt Software</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Overt Software</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rcpi.ie-idp-shibboleth.xml
deleted file mode 100644
index 81542b50..00000000
--- a/swamid-interfederations-2.0/idp.rcpi.ie-idp-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://idp.rcpi.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2014-08-26T12:51:59Z"/>
-    <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">rcpi.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Royal College of Physicians of Ireland</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.rcpi.ie/</mdui:InformationURL>
-        <mdui:Logo height="150" width="150">https://idp.rcpi.ie/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+gAwIBAgIUH9bbvnLR0v9pD3ammqi5YFwsHv0wDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnJjcGkuaWUwHhcNMTIxMjEwMTUzNTUwWhcNMzIx
-MjEwMTUzNTUwWjAWMRQwEgYDVQQDEwtpZHAucmNwaS5pZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIxoKUdA04fWoW2MLF3uQUqwBGvBj2SSISJiBmNI
-eNRRNW8ARx0/HtpvXTHwTJkQ137YVlYXz8cCFuKpgPBXqyxOX+IErBuyWKLezuW9
-1jep3R6YVAYg5D8keXAda4iE/cAzBXnujAboBWFrvK0H+UFKNjIrvKB0EgcnXnF2
-BNy0bngue3lZiqlR4vZSff1BZ5RgvuvAsGz1PX/3Zmow1HSLUY0i8cVkEabMrirV
-f+fPW3GWyV2pHIeTKpkAMehXYvb00W/M+Ct1yN3pSUfr2YlLYDkQIwvHI1VOZmwz
-hcUclwWisvLwFLi6jH7X24b0WrWS1JZu4nQsH503Tl2TECUCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnJjcGkuaWWGImh0dHBzOi8vaWRwLnJjcGkuaWUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFJDWXw5QGD8eaX9YnvK5tXi4pNdbMA0GCSqGSIb3
-DQEBBQUAA4IBAQBmv7sihWS+vdXCIz2ISFuElyJmFjdziPHv9K50LlMays+FVSKz
-0vtlVdBVPgR2H64z1UocoCiMWiB8CdM2jMFoF1KGFgV2rRl2KiHHPxB4zvW8CnB8
-53T5BT8aZWNV8TM3H7UXgfjuVeC2sb+Ka93uzvCyDS0PWPs3TknFRotVyzWPWe86
-YINLSp6w3cT9k2al0TQwNlzhwGwK9JvFUuzUU5SK0viHoIxdlFSxzZhJxggzmrW8
-8s9Q6HryWs7l9TSCCHb740jYCApjJ1vafAHbgbtBMtHg6mqPLrDDbBTO3Vq0JnmP
-28uRVtp9EMa9ZdTxX444lGzBxeNZWeerUjQG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpi.ie/idp/logout.jsp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rcpi.ie/idp/logout.jsp"/>
-    <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-POST" Location="https://idp.rcpi.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rcpi.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rcpi.ie/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Royal College of Physicians of Ireland</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Royal College of Physicians of Ireland</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rcpi.ie/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Richard</md:GivenName>
-    <md:SurName>Eibrand</md:SurName>
-    <md:EmailAddress>mailto:richardeibrand@rcpi.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Adrian</md:GivenName>
-    <md:SurName>Rath</md:SurName>
-    <md:EmailAddress>mailto:AdrianRath@RCPI.IE</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>RCPI</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@rcpi.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rcplondon.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.rcplondon.ac.uk-openathens.xml
deleted file mode 100644
index eebcfb07..00000000
--- a/swamid-interfederations-2.0/idp.rcplondon.ac.uk-openathens.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.rcplondon.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for the Royal College of Physicians of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">rcplondon.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/rcplondon.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/rcplondon.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal College of Physicians of London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rcplondon.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.reed.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.reed.edu-idp-shibboleth.xml
deleted file mode 100644
index 96a95e5c..00000000
--- a/swamid-interfederations-2.0/idp.reed.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://idp.reed.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">reed.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Reed College</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>
-MIIDHDCCAgSgAwIBAgIVAPuLDfin459bH1TviFJwMkClxzSZMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5yZWVkLmVkdTAeFw0xMDEwMTMxODE1MjJaFw0z
-MDEwMTMxODE1MjJaMBcxFTATBgNVBAMTDGlkcC5yZWVkLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAI0JgYyDRVnupzwsap5SRjk6vQc4KY3A4GcT
-aWmwkbLILkXsK7+LqiJDcfQtyHQwZoJqJVBnd7NDXb1wPidAitC3m+bgOmf0SCM3
-cJ1u0giQGXxKqWW4Netq5ZWG/fZE7wR4rNqbYtQ31WPl5s5dkqVrq6na9NDKyCNb
-6qLd9306BiSCjAagJYN+xyMfCwZ2J2uBPwa1cTlv6B1M9k77v78PlwHeZTRBXQ7z
-J385E+iMnxhuyKhj6bHjFplPJmHTBF1NcK1HLBuraocmwyhyXt6hc/pG1fLhhZ6+
-7RtgsH5RLQgE15MSW0e6UDbZHgxze0g13LfaQBa92KZOesO7V5kCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnJlZWQuZWR1hiNodHRwczovL2lkcC5yZWVkLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU+ZuMoVaqb0MEU+U21XvPJLeCVlowDQYJ
-KoZIhvcNAQEFBQADggEBAC1ygplLdMG2sQC47jxquc0L/QJEZsn91dPv4pb5RbhP
-ICvwKMhHqbG+4gc97ZRa5EzyuGNceHLJaG/MH18MPOyz06KlOL0zy3SdvFpRJMBV
-PfPWTRB/moSkz5lnBadHX3TQqdo/1AZvlzoPrWjz8lOu8//pIP7MxnzMxlm2KNuI
-Tg5D2SHhV9dQur/QGSlkJ2REjrqKhyw9yAogB3AH0IY3rGnpmbmAc3ian+C6IZXH
-BpQPMrLCFksiKP4tBOH88PLItWn3uFc4Q8f1s+5qDxVIqWVTdjOkZnysMRob1y+w
-ROMyInz+7gYPcFok9V3ghjhHj3POw+ZqlJA25Ap6v9Y=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reed.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reed.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reed.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reed.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reed.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">reed.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAPuLDfin459bH1TviFJwMkClxzSZMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5yZWVkLmVkdTAeFw0xMDEwMTMxODE1MjJaFw0z
-MDEwMTMxODE1MjJaMBcxFTATBgNVBAMTDGlkcC5yZWVkLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAI0JgYyDRVnupzwsap5SRjk6vQc4KY3A4GcT
-aWmwkbLILkXsK7+LqiJDcfQtyHQwZoJqJVBnd7NDXb1wPidAitC3m+bgOmf0SCM3
-cJ1u0giQGXxKqWW4Netq5ZWG/fZE7wR4rNqbYtQ31WPl5s5dkqVrq6na9NDKyCNb
-6qLd9306BiSCjAagJYN+xyMfCwZ2J2uBPwa1cTlv6B1M9k77v78PlwHeZTRBXQ7z
-J385E+iMnxhuyKhj6bHjFplPJmHTBF1NcK1HLBuraocmwyhyXt6hc/pG1fLhhZ6+
-7RtgsH5RLQgE15MSW0e6UDbZHgxze0g13LfaQBa92KZOesO7V5kCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnJlZWQuZWR1hiNodHRwczovL2lkcC5yZWVkLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU+ZuMoVaqb0MEU+U21XvPJLeCVlowDQYJ
-KoZIhvcNAQEFBQADggEBAC1ygplLdMG2sQC47jxquc0L/QJEZsn91dPv4pb5RbhP
-ICvwKMhHqbG+4gc97ZRa5EzyuGNceHLJaG/MH18MPOyz06KlOL0zy3SdvFpRJMBV
-PfPWTRB/moSkz5lnBadHX3TQqdo/1AZvlzoPrWjz8lOu8//pIP7MxnzMxlm2KNuI
-Tg5D2SHhV9dQur/QGSlkJ2REjrqKhyw9yAogB3AH0IY3rGnpmbmAc3ian+C6IZXH
-BpQPMrLCFksiKP4tBOH88PLItWn3uFc4Q8f1s+5qDxVIqWVTdjOkZnysMRob1y+w
-ROMyInz+7gYPcFok9V3ghjhHj3POw+ZqlJA25Ap6v9Y=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reed.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Reed College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Reed College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://reed.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ben Poliakoff</md:GivenName>
-    <md:EmailAddress>benp@reed.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Marianne Colgrove</md:GivenName>
-    <md:EmailAddress>mcolgrov@reed.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Computer User Services</md:GivenName>
-    <md:EmailAddress>cus@reed.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technology Infrastucture Services</md:GivenName>
-    <md:EmailAddress>tis@reed.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.reigate.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 7dee0674..00000000
--- a/swamid-interfederations-2.0/idp.reigate.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.reigate.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Reigate College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-29T13:32:19Z">
-      <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">reigate.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAPBD4Ch8c1eFKJwVl1SVemY1lNWFMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMMEWlkcC5yZWlnYXRlLmFjLnVrMB4XDTE1MDkwMzEyNDQz
-						NFoXDTM1MDkwMzEyNDQzNFowHDEaMBgGA1UEAwwRaWRwLnJlaWdhdGUuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMM/KcdoK3m7gK8nwGwsfX
-						JaysjFdGnrj/SMrQJu8VTZ8Xw+SOegbBfi8TBuMSujixsjzHMYCUx4o3wmbGf9Oh
-						8Cl9e0cwKiyjx/qOvG2iGJ3jVitx0UCkaBUhn7U7FXo9HfpO4WB3ag4Slnc1DazW
-						ckINoM0bWEKETOCIyEx6his4La5yaPHk0AknVj3xZUjkRF5N81pCy0O4T1Nb1ULS
-						U23rl1j+qczQXGXOp1nZuR9BBpG2K6NUF0A6AorvwSJPhTWLeK7YTbBvoT3DR+l0
-						QyXR4WoZ2jCtepZLXFyY7zJ3V+tAxnMx+rhJKJfRVKCFPvhOqNovDNUevC8JgiY3
-						AgMBAAGjaTBnMB0GA1UdDgQWBBSbm+055qnFRYimNDAt+YhvstqF1TBGBgNVHREE
-						PzA9ghFpZHAucmVpZ2F0ZS5hYy51a4YoaHR0cHM6Ly9pZHAucmVpZ2F0ZS5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAFF6DG0eNff8fase4
-						YF+Dub2nrJ717scQpdMPKaYZC0Y4EMKNTJnTaWsJ3aIBo1DxzydKlQi2RkZBqGZn
-						Qp1wqL6uHanv9VuquxdOj3hFItEssRi0uvISrSVDsu+9zaDA4W5FYKY+cOs+qAo1
-						gpqHPqswkE7RCXdWZ0NLKQrxEubAACrGDX9E5kbrlxTZAgHTzDd2UWR2E7kD9Bxt
-						3KGq84XhTKd5VOEWf2NfewGDKssWEko673Kgt70inVCuEb9t1BMcv1PV2HNws8bR
-						zUyyzg1bGcmlKawqZ+Yoegt2JNa9yhAsUfvv909vTYw6Uw0LzzEmjZFMc40W3R9c
-						YrbmYw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reigate.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.reigate.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reigate.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.reigate.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.reigate.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reigate.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">reigate.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAPBD4Ch8c1eFKJwVl1SVemY1lNWFMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMMEWlkcC5yZWlnYXRlLmFjLnVrMB4XDTE1MDkwMzEyNDQz
-						NFoXDTM1MDkwMzEyNDQzNFowHDEaMBgGA1UEAwwRaWRwLnJlaWdhdGUuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMM/KcdoK3m7gK8nwGwsfX
-						JaysjFdGnrj/SMrQJu8VTZ8Xw+SOegbBfi8TBuMSujixsjzHMYCUx4o3wmbGf9Oh
-						8Cl9e0cwKiyjx/qOvG2iGJ3jVitx0UCkaBUhn7U7FXo9HfpO4WB3ag4Slnc1DazW
-						ckINoM0bWEKETOCIyEx6his4La5yaPHk0AknVj3xZUjkRF5N81pCy0O4T1Nb1ULS
-						U23rl1j+qczQXGXOp1nZuR9BBpG2K6NUF0A6AorvwSJPhTWLeK7YTbBvoT3DR+l0
-						QyXR4WoZ2jCtepZLXFyY7zJ3V+tAxnMx+rhJKJfRVKCFPvhOqNovDNUevC8JgiY3
-						AgMBAAGjaTBnMB0GA1UdDgQWBBSbm+055qnFRYimNDAt+YhvstqF1TBGBgNVHREE
-						PzA9ghFpZHAucmVpZ2F0ZS5hYy51a4YoaHR0cHM6Ly9pZHAucmVpZ2F0ZS5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAFF6DG0eNff8fase4
-						YF+Dub2nrJ717scQpdMPKaYZC0Y4EMKNTJnTaWsJ3aIBo1DxzydKlQi2RkZBqGZn
-						Qp1wqL6uHanv9VuquxdOj3hFItEssRi0uvISrSVDsu+9zaDA4W5FYKY+cOs+qAo1
-						gpqHPqswkE7RCXdWZ0NLKQrxEubAACrGDX9E5kbrlxTZAgHTzDd2UWR2E7kD9Bxt
-						3KGq84XhTKd5VOEWf2NfewGDKssWEko673Kgt70inVCuEb9t1BMcv1PV2HNws8bR
-						zUyyzg1bGcmlKawqZ+Yoegt2JNa9yhAsUfvv909vTYw6Uw0LzzEmjZFMc40W3R9c
-						YrbmYw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reigate.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reigate.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">Reigate College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Reigate College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.reigate.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ash</GivenName>
-    <SurName>Farbrother</SurName>
-    <EmailAddress>mailto:ash.farbrother@reigate.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Freeman</SurName>
-    <EmailAddress>mailto:Michael.Freeman@reigate.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml
deleted file mode 100644
index 73f71a10..00000000
--- a/swamid-interfederations-2.0/idp.renata.edu.co-idp-shibboleth.xml
+++ /dev/null
@@ -1,181 +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://idp.renata.edu.co/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://colfire.co" registrationInstant="2014-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="es">
-                    http://colfire.co/Politica_IdP.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">edu.co</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">
-                        RENATA - Red Nacional Academica de Tecnologia Avanzada
-                </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">
-                        RENATA - Red Nacional Academica de Tecnologia Avanzada
-                </mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        RENATA - Red Nacional Academica de Tecnologia Avanzada
-                </mdui:Description>
-        <mdui:Description xml:lang="es">
-                        RENATA - Red Nacional Academica de Tecnologia Avanzada
-                </mdui:Description>
-        <mdui:InformationURL xml:lang="en">
-                        http://www.renata.edu.co
-                </mdui:InformationURL>
-        <mdui:InformationURL xml:lang="es">
-                        http://www.renata.edu.co
-                </mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIG3jCCBcagAwIBAgIQA7a3wqJ79UaLPv5KuUFPwzANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwMjAxMDAwMDAwWhcN
-MTcwMjA4MTIwMDAwWjCBpTELMAkGA1UEBhMCQ08xFTATBgNVBAgTDEN1bmRpbmFt
-YXJjYTEPMA0GA1UEBxMGQm9nb3RhMT8wPQYDVQQKEzZSZWQgTmFjaW9uYWwgQWNh
-ZGVtaWNhIGRlIFRlY25vbG9naWEgQXZhbnphZGEgLSBSRU5BVEExEzARBgNVBAsT
-ClRlY25vbG9naWExGDAWBgNVBAMMDyoucmVuYXRhLmVkdS5jbzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALJAw54JxXbJCfivUGdH7p5aMVbWDtURIS4u
-MLAnOi8pcW2U5Bdmgxlgt40eTYHlyXFCO2HHoFLakvdNSiRbiuEuy/P5j26Lq/UA
-BUXdilbK/tZMeEvZiowG0WpOV792v59+2cxQk4un/kQVAkeTGaWjAPu44zKsSWyp
-doCkNqYCjGJM10IgW5TRaw/eolJ48ABKP/xtJa5F76RXGSD1zcoDywgUFSsfmTod
-xuFzuuEr+qEdW58JyNnubK7WMXvJC7VZxml4Zskh2cZ2YuLCMlyLQkcqCZX/wcfr
-HKSOr24lny4682wHr82shejU1KgbGe5Lvj/rHAb1H33zV3ZD0MkCAwEAAaOCA18w
-ggNbMB8GA1UdIwQYMBaAFA+AYRyCMWHVLyjnjUY4tCzhxtniMB0GA1UdDgQWBBQ7
-7XixpUynbtyxuf8Kyc2wRYHOIDApBgNVHREEIjAggg8qLnJlbmF0YS5lZHUuY2+C
-DXJlbmF0YS5lZHUuY28wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdp
-Y2VydC5jb20vc3NjYS1zaGEyLWcxLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGln
-aWNlcnQuY29tL3NzY2Etc2hhMi1nMS5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMG
-CWCGSAGG/WwBATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQu
-Y29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFS
-AEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBj
-AGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBu
-AGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQ
-AFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAg
-AEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABp
-AGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwBy
-AGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBl
-AC4wfAYIKwYBBQUHAQEEcDBuMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
-Y2VydC5jb20wRgYIKwYBBQUHMAKGOmh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNv
-bS9EaWdpQ2VydFNIQTJTZWN1cmVTZXJ2ZXJDQS5jcnQwDAYDVR0TAQH/BAIwADAN
-BgkqhkiG9w0BAQsFAAOCAQEAP6sIijTMWSk92M25IGy/SAGaXIVPMPIy0K4aerw9
-vx9bJ1D2+aZ70EnBlCWdbuWLTlZusRrnf/3ZvB3GgjbZDiMugGq1Mu6o2oEf0304
-yk4E0ftsgBvF+ABPh7UncA7g7Xib9JAApCuO4cVoT+ZCSjiFRwW8IDVgcCZENdeP
-4dxIQ2kOCnB9xctnWyNKZv5AjAp/Trw2l1XhTVeu+U22v2pAlJPrOsiM/yCYaaVj
-yh4ohtfLM8hd099K6Tk5TKIRt+SW1KRgEga4jRrOxMQ0bKjxQWydo93HVfMPiBhn
-FtZcGPmpg9fHry1cbwDW0660J/yOZsUbhNuUu5xv06SOqA==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.renata.edu.co:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.renata.edu.co:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renata.edu.co/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.renata.edu.co/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.renata.edu.co: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.renata.edu.co/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.renata.edu.co/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.renata.edu.co/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renata.edu.co/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">edu.co</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIG3jCCBcagAwIBAgIQA7a3wqJ79UaLPv5KuUFPwzANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwMjAxMDAwMDAwWhcN
-MTcwMjA4MTIwMDAwWjCBpTELMAkGA1UEBhMCQ08xFTATBgNVBAgTDEN1bmRpbmFt
-YXJjYTEPMA0GA1UEBxMGQm9nb3RhMT8wPQYDVQQKEzZSZWQgTmFjaW9uYWwgQWNh
-ZGVtaWNhIGRlIFRlY25vbG9naWEgQXZhbnphZGEgLSBSRU5BVEExEzARBgNVBAsT
-ClRlY25vbG9naWExGDAWBgNVBAMMDyoucmVuYXRhLmVkdS5jbzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALJAw54JxXbJCfivUGdH7p5aMVbWDtURIS4u
-MLAnOi8pcW2U5Bdmgxlgt40eTYHlyXFCO2HHoFLakvdNSiRbiuEuy/P5j26Lq/UA
-BUXdilbK/tZMeEvZiowG0WpOV792v59+2cxQk4un/kQVAkeTGaWjAPu44zKsSWyp
-doCkNqYCjGJM10IgW5TRaw/eolJ48ABKP/xtJa5F76RXGSD1zcoDywgUFSsfmTod
-xuFzuuEr+qEdW58JyNnubK7WMXvJC7VZxml4Zskh2cZ2YuLCMlyLQkcqCZX/wcfr
-HKSOr24lny4682wHr82shejU1KgbGe5Lvj/rHAb1H33zV3ZD0MkCAwEAAaOCA18w
-ggNbMB8GA1UdIwQYMBaAFA+AYRyCMWHVLyjnjUY4tCzhxtniMB0GA1UdDgQWBBQ7
-7XixpUynbtyxuf8Kyc2wRYHOIDApBgNVHREEIjAggg8qLnJlbmF0YS5lZHUuY2+C
-DXJlbmF0YS5lZHUuY28wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdp
-Y2VydC5jb20vc3NjYS1zaGEyLWcxLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGln
-aWNlcnQuY29tL3NzY2Etc2hhMi1nMS5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMG
-CWCGSAGG/WwBATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQu
-Y29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFS
-AEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBj
-AGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBu
-AGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQ
-AFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAg
-AEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABp
-AGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwBy
-AGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBl
-AC4wfAYIKwYBBQUHAQEEcDBuMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
-Y2VydC5jb20wRgYIKwYBBQUHMAKGOmh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNv
-bS9EaWdpQ2VydFNIQTJTZWN1cmVTZXJ2ZXJDQS5jcnQwDAYDVR0TAQH/BAIwADAN
-BgkqhkiG9w0BAQsFAAOCAQEAP6sIijTMWSk92M25IGy/SAGaXIVPMPIy0K4aerw9
-vx9bJ1D2+aZ70EnBlCWdbuWLTlZusRrnf/3ZvB3GgjbZDiMugGq1Mu6o2oEf0304
-yk4E0ftsgBvF+ABPh7UncA7g7Xib9JAApCuO4cVoT+ZCSjiFRwW8IDVgcCZENdeP
-4dxIQ2kOCnB9xctnWyNKZv5AjAp/Trw2l1XhTVeu+U22v2pAlJPrOsiM/yCYaaVj
-yh4ohtfLM8hd099K6Tk5TKIRt+SW1KRgEga4jRrOxMQ0bKjxQWydo93HVfMPiBhn
-FtZcGPmpg9fHry1cbwDW0660J/yOZsUbhNuUu5xv06SOqA==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.renata.edu.co:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.renata.edu.co: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="es">
-		RENATA - Red Nacional Académica de Tecnología Avanzada
-	</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">
-		RENATA - Red Nacional Académica de Tecnología Avanzada
-	</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="es">
-		RENATA - Red Nacional Académica de Tecnología Avanzada
-	</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">
-		RENATA - Red Nacional Académica de Tecnología Avanzada
-	</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="es">
-		http://www.renata.edu.co
-	</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">
-		http://www.renata.edu.co
-	</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>
-		Hernan Garcia
-	</md:SurName>
-    <md:EmailAddress>
-		elcira@renata.edu.co
-	</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>
-		Javier Enrique Lizarazo
-	</md:SurName>
-    <md:EmailAddress>
-		tecnico@renata.edu.co
-	</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 4a0798bb..00000000
--- a/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.renater.fr/idp/shibboleth">
-  <md: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>
-  </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 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">GIP RENATER</mdui:DisplayName>
-        <mdui:Logo height="15" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAPCAIAAABiEdh4AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAADwCRnKNdAAACBElEQVQoz22RPWgTcRjGn/vf5S7XJk1Ja0mDpEYF0cZmMwhpcRI/6GIpXTToIjpUnERQUHQoioM4FQoOFSo6qB3EoKCoKFIdbEBqMKDRpDS9NunFXD7v/q9DNe3VPuvz/njf53lBm2nFqOLI1dv3X/5vMWymh88/olg5fyd++saDDZYNePc5xYkACAAgwC1PxGd7Y7eevEnwfzPC96yWyRXcLU6PWx1//F6VpcP7d+8LBTXd6D83npwvQGQo1eFSrg1HBgf6hKlnM5+SGVVxMECRJSLUGqa/s+3M0IAF6hwe00tViAxEKFQux6ICEf1cyE+/ThR+l0X290LT4opDunjyYHohv23oJtqdAJArfX10gQEI+LyjIwdcqkJEq4AkslrDnHz6ocfnPXUohLoFvXp8MLwr0LUWOtLb07Ca2SCJbO7HolGpHY2GsFK5FOu/d+WEraU92/2c0/rSZElM/dJ8XhcY69vZremGDSgalY3vEGBaVlbT4RRHRieXi2UbsFQoMUGwAYS2VnX67RcoEtyyLEs2IJHKiqLtj0RUrptTr+bgEAGoirwGVOuNVGaZrVvAOYV2dF+/G4eDAYDH6T82pukGa26PhoOAUK2bnMi0uMV5Ir3Y4BQOdGCpDJPPTpzd4mkVmt2v6ls692ImubXLE9kb7Gx3i0wAkC+WSUCHuwXAH/rb+m9hYGX6AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAwKzAyOjAw1DjCNgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMCswMjowMKVleooAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">GIP RENATER</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>
-					      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>
-    </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-POST" Location="https://idp.renater.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.renater.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>support@support.renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 1a459b2d..00000000
--- a/swamid-interfederations-2.0/idp.renater.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.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="en">GIP RENATER</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for RENATER employees</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">GIP RENATER</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Fournisseur d'identités des employés 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>
-					      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">RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support-federation@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 9c1c5fd8..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: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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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 b0b03247..00000000
--- a/swamid-interfederations-2.0/idp.reuna.cl.xml
+++ /dev/null
@@ -1,100 +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="2010-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 IdP</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.reutlingen-university.de.xml b/swamid-interfederations-2.0/idp.reutlingen-university.de.xml
deleted file mode 100644
index ca204a2e..00000000
--- a/swamid-interfederations-2.0/idp.reutlingen-university.de.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.reutlingen-university.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">reutlingen-university.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.reutlingen-university.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.reutlingen-university.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=idp.reutlingen-university.de</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEVDCCAzygAwIBAgIQGu0tZPHDxCAn349M6UNzYDANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
-b21haW4gVmFsaWRhdGVkIFNTTDEZMBcGA1UEAxMQVGhhd3RlIERWIFNTTCBDQTAe
-Fw0xMTA0MDgwMDAwMDBaFw0xNDA2MDYyMzU5NTlaMIHKMSUwIwYDVQQKFBxpZHAu
-cmV1dGxpbmdlbi11bml2ZXJzaXR5LmRlMTswOQYDVQQLEzJHbyB0byBodHRwczov
-L3d3dy50aGF3dGUuY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDEiMCAGA1UECxMZ
-VGhhd3RlIFNTTDEyMyBjZXJ0aWZpY2F0ZTEZMBcGA1UECxMQRG9tYWluIFZhbGlk
-YXRlZDElMCMGA1UEAxQcaWRwLnJldXRsaW5nZW4tdW5pdmVyc2l0eS5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANaMJvMec6ySuYUbVsDA2ZcGxIJy
-GdEvMWszgNidinS/KQlhOHnpfWpyejiZdfoyxjXNJgsEAkFcOliB0WEi1Aav0qf2
-pV2PTfLT9H+Rk8k3GwwyFA8i1B88l9Qv5nuCRULIrsLEZIp/9apMkSxL7NtmzFQ7
-Lq0pMKGG4YMJsIWgd8Leie/mTYffzYcEPOiDBgVEibyxJmi+Dv1RaCEMRKNcQM2Y
-m0Q1D66eGqLB0YWBxjvqW6ekJ0EJ12x576nhy2PqA9FWyFvZyJ+O9FnFiID+XOoH
-aHq1pjJKeSMPotrkOzACQT7A3vP1c3c7KH6ciKZY3kLyN/AjgJtJmHSX8gcCAwEA
-AaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9z
-dnItZHYtY3JsLnRoYXd0ZS5jb20vVGhhd3RlRFYuY3JsMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0
-dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJsqPcMs7qWR
-7l4NVJkHp5XBpLOmAiGEh5SHkk66wK4MBAlc3TAdc7ESFlD33M97SGxYTqhP/nkG
-mqFF6Tq0KxLuPWVn0aU1sbPVcrSHVgRgLwS194ckQIpqYPCx6dqA05dz/tnXxv2Z
-E81NcqLTsSz4hixqAo3Iu2rqnQBt5gDKy9YLyLfMN3FZ/o0WXYfAUqP1akej4py/
-IgJlkfSrx+qtNw22FRWzYZAZpTgI+SCanV+oo3i4xziW6LVrV2f3NpOTi1FnbRHh
-B3b5pqZf9l/qKnN8FuI+cQNZ/03cbjaVUWKsAHGAKbr27ex/FpRZnGbK7OI5IlK/
-kanNbZOkV2o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.reutlingen-university.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.reutlingen-university.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=idp.reutlingen-university.de</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEVDCCAzygAwIBAgIQGu0tZPHDxCAn349M6UNzYDANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
-b21haW4gVmFsaWRhdGVkIFNTTDEZMBcGA1UEAxMQVGhhd3RlIERWIFNTTCBDQTAe
-Fw0xMTA0MDgwMDAwMDBaFw0xNDA2MDYyMzU5NTlaMIHKMSUwIwYDVQQKFBxpZHAu
-cmV1dGxpbmdlbi11bml2ZXJzaXR5LmRlMTswOQYDVQQLEzJHbyB0byBodHRwczov
-L3d3dy50aGF3dGUuY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDEiMCAGA1UECxMZ
-VGhhd3RlIFNTTDEyMyBjZXJ0aWZpY2F0ZTEZMBcGA1UECxMQRG9tYWluIFZhbGlk
-YXRlZDElMCMGA1UEAxQcaWRwLnJldXRsaW5nZW4tdW5pdmVyc2l0eS5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANaMJvMec6ySuYUbVsDA2ZcGxIJy
-GdEvMWszgNidinS/KQlhOHnpfWpyejiZdfoyxjXNJgsEAkFcOliB0WEi1Aav0qf2
-pV2PTfLT9H+Rk8k3GwwyFA8i1B88l9Qv5nuCRULIrsLEZIp/9apMkSxL7NtmzFQ7
-Lq0pMKGG4YMJsIWgd8Leie/mTYffzYcEPOiDBgVEibyxJmi+Dv1RaCEMRKNcQM2Y
-m0Q1D66eGqLB0YWBxjvqW6ekJ0EJ12x576nhy2PqA9FWyFvZyJ+O9FnFiID+XOoH
-aHq1pjJKeSMPotrkOzACQT7A3vP1c3c7KH6ciKZY3kLyN/AjgJtJmHSX8gcCAwEA
-AaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9z
-dnItZHYtY3JsLnRoYXd0ZS5jb20vVGhhd3RlRFYuY3JsMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0
-dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJsqPcMs7qWR
-7l4NVJkHp5XBpLOmAiGEh5SHkk66wK4MBAlc3TAdc7ESFlD33M97SGxYTqhP/nkG
-mqFF6Tq0KxLuPWVn0aU1sbPVcrSHVgRgLwS194ckQIpqYPCx6dqA05dz/tnXxv2Z
-E81NcqLTsSz4hixqAo3Iu2rqnQBt5gDKy9YLyLfMN3FZ/o0WXYfAUqP1akej4py/
-IgJlkfSrx+qtNw22FRWzYZAZpTgI+SCanV+oo3i4xziW6LVrV2f3NpOTi1FnbRHh
-B3b5pqZf9l/qKnN8FuI+cQNZ/03cbjaVUWKsAHGAKbr27ex/FpRZnGbK7OI5IlK/
-kanNbZOkV2o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reutlingen-university.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reutlingen-university.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.reutlingen-university.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.reutlingen-university.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.reutlingen-university.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.reutlingen-university.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">reutlingen-university.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.reutlingen-university.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.reutlingen-university.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=idp.reutlingen-university.de</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEVDCCAzygAwIBAgIQGu0tZPHDxCAn349M6UNzYDANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
-b21haW4gVmFsaWRhdGVkIFNTTDEZMBcGA1UEAxMQVGhhd3RlIERWIFNTTCBDQTAe
-Fw0xMTA0MDgwMDAwMDBaFw0xNDA2MDYyMzU5NTlaMIHKMSUwIwYDVQQKFBxpZHAu
-cmV1dGxpbmdlbi11bml2ZXJzaXR5LmRlMTswOQYDVQQLEzJHbyB0byBodHRwczov
-L3d3dy50aGF3dGUuY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDEiMCAGA1UECxMZ
-VGhhd3RlIFNTTDEyMyBjZXJ0aWZpY2F0ZTEZMBcGA1UECxMQRG9tYWluIFZhbGlk
-YXRlZDElMCMGA1UEAxQcaWRwLnJldXRsaW5nZW4tdW5pdmVyc2l0eS5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANaMJvMec6ySuYUbVsDA2ZcGxIJy
-GdEvMWszgNidinS/KQlhOHnpfWpyejiZdfoyxjXNJgsEAkFcOliB0WEi1Aav0qf2
-pV2PTfLT9H+Rk8k3GwwyFA8i1B88l9Qv5nuCRULIrsLEZIp/9apMkSxL7NtmzFQ7
-Lq0pMKGG4YMJsIWgd8Leie/mTYffzYcEPOiDBgVEibyxJmi+Dv1RaCEMRKNcQM2Y
-m0Q1D66eGqLB0YWBxjvqW6ekJ0EJ12x576nhy2PqA9FWyFvZyJ+O9FnFiID+XOoH
-aHq1pjJKeSMPotrkOzACQT7A3vP1c3c7KH6ciKZY3kLyN/AjgJtJmHSX8gcCAwEA
-AaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9z
-dnItZHYtY3JsLnRoYXd0ZS5jb20vVGhhd3RlRFYuY3JsMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0
-dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJsqPcMs7qWR
-7l4NVJkHp5XBpLOmAiGEh5SHkk66wK4MBAlc3TAdc7ESFlD33M97SGxYTqhP/nkG
-mqFF6Tq0KxLuPWVn0aU1sbPVcrSHVgRgLwS194ckQIpqYPCx6dqA05dz/tnXxv2Z
-E81NcqLTsSz4hixqAo3Iu2rqnQBt5gDKy9YLyLfMN3FZ/o0WXYfAUqP1akej4py/
-IgJlkfSrx+qtNw22FRWzYZAZpTgI+SCanV+oo3i4xziW6LVrV2f3NpOTi1FnbRHh
-B3b5pqZf9l/qKnN8FuI+cQNZ/03cbjaVUWKsAHGAKbr27ex/FpRZnGbK7OI5IlK/
-kanNbZOkV2o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.reutlingen-university.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.reutlingen-university.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=idp.reutlingen-university.de</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEVDCCAzygAwIBAgIQGu0tZPHDxCAn349M6UNzYDANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMR0wGwYDVQQLExRE
-b21haW4gVmFsaWRhdGVkIFNTTDEZMBcGA1UEAxMQVGhhd3RlIERWIFNTTCBDQTAe
-Fw0xMTA0MDgwMDAwMDBaFw0xNDA2MDYyMzU5NTlaMIHKMSUwIwYDVQQKFBxpZHAu
-cmV1dGxpbmdlbi11bml2ZXJzaXR5LmRlMTswOQYDVQQLEzJHbyB0byBodHRwczov
-L3d3dy50aGF3dGUuY29tL3JlcG9zaXRvcnkvaW5kZXguaHRtbDEiMCAGA1UECxMZ
-VGhhd3RlIFNTTDEyMyBjZXJ0aWZpY2F0ZTEZMBcGA1UECxMQRG9tYWluIFZhbGlk
-YXRlZDElMCMGA1UEAxQcaWRwLnJldXRsaW5nZW4tdW5pdmVyc2l0eS5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANaMJvMec6ySuYUbVsDA2ZcGxIJy
-GdEvMWszgNidinS/KQlhOHnpfWpyejiZdfoyxjXNJgsEAkFcOliB0WEi1Aav0qf2
-pV2PTfLT9H+Rk8k3GwwyFA8i1B88l9Qv5nuCRULIrsLEZIp/9apMkSxL7NtmzFQ7
-Lq0pMKGG4YMJsIWgd8Leie/mTYffzYcEPOiDBgVEibyxJmi+Dv1RaCEMRKNcQM2Y
-m0Q1D66eGqLB0YWBxjvqW6ekJ0EJ12x576nhy2PqA9FWyFvZyJ+O9FnFiID+XOoH
-aHq1pjJKeSMPotrkOzACQT7A3vP1c3c7KH6ciKZY3kLyN/AjgJtJmHSX8gcCAwEA
-AaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9z
-dnItZHYtY3JsLnRoYXd0ZS5jb20vVGhhd3RlRFYuY3JsMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0
-dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQADggEBAJsqPcMs7qWR
-7l4NVJkHp5XBpLOmAiGEh5SHkk66wK4MBAlc3TAdc7ESFlD33M97SGxYTqhP/nkG
-mqFF6Tq0KxLuPWVn0aU1sbPVcrSHVgRgLwS194ckQIpqYPCx6dqA05dz/tnXxv2Z
-E81NcqLTsSz4hixqAo3Iu2rqnQBt5gDKy9YLyLfMN3FZ/o0WXYfAUqP1akej4py/
-IgJlkfSrx+qtNw22FRWzYZAZpTgI+SCanV+oo3i4xziW6LVrV2f3NpOTi1FnbRHh
-B3b5pqZf9l/qKnN8FuI+cQNZ/03cbjaVUWKsAHGAKbr27ex/FpRZnGbK7OI5IlK/
-kanNbZOkV2o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.reutlingen-university.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.reutlingen-university.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Reutlingen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Reutlingen University / Hochschule Reutlingen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.reutlingen-university.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Wolfgang</GivenName>
-    <SurName>Honigberger</SurName>
-    <EmailAddress>wolfgang.honigberger@reutlingen-university.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Thalmann</SurName>
-    <EmailAddress>michael.thalmann@reutlingen-university.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rhodes.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rhodes.edu-idp-shibboleth.xml
deleted file mode 100644
index 1fad194c..00000000
--- a/swamid-interfederations-2.0/idp.rhodes.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,121 +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://idp.rhodes.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://www.rhodes.edu/barret/help.asp" 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">rhodes.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rhodes College</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.rhodes.edu/barret/24351.asp</mdui:InformationURL>
-        <mdui:Logo height="160" width="320" xml:lang="en">https://www.rhodes.edu/images/content/Communications/Full_Color_Logo.gif</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>
-MIIEsDCCA5igAwIBAgIQdL5J8ozn++NOGdIt+ubUoDANBgkqhkiG9w0BAQsFADBB
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMRswGQYDVQQDExJ0
-aGF3dGUgU1NMIENBIC0gRzIwHhcNMTUwNDIyMDAwMDAwWhcNMTcwNDIxMjM1OTU5
-WjBzMQswCQYDVQQGEwJVUzESMBAGA1UECAwJVGVubmVzc2VlMRAwDgYDVQQHDAdN
-ZW1waGlzMRcwFQYDVQQKDA5SaG9kZXMgQ29sbGVnZTEMMAoGA1UECwwDSVRTMRcw
-FQYDVQQDDA5pZHAucmhvZGVzLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANQ2zPD2xzBgIRtp8MVD1nEKLIy10zy84B6+86ybyKAZbYQQtK9OGeq/
-EeEDMENmuXmkk5IOQ+yprLGAWHes7fF5Pjr3vKk1nPD0efi2GaJS8AWF0KUPlbE6
-O5uEroZp4wa8XR87Lqkt5ocUQiA0EBiAjg/bn9j4GEhkkGJca1Dp22Nij7xZNWE2
-cPV+rvU0ILJMq5PwxajG5abTDCMpZc4yl66qhXGMrcjlHGri81XW0TLvA8Vxt81x
-rT9nQAV83P4RJ7V6siGI6b/ujktsk6msVt3A8PJBByhNaMCnIrSYxgJ6uvSucZRW
-9jSd7JIh1lZGCb+tVvKf+F/mUPBzjPsCAwEAAaOCAXAwggFsMBkGA1UdEQQSMBCC
-DmlkcC5yaG9kZXMuZWR1MAkGA1UdEwQCMAAwbgYDVR0gBGcwZTBjBgZngQwBAgIw
-WTAmBggrBgEFBQcCARYaaHR0cHM6Ly93d3cudGhhd3RlLmNvbS9jcHMwLwYIKwYB
-BQUHAgIwIwwhaHR0cHM6Ly93d3cudGhhd3RlLmNvbS9yZXBvc2l0b3J5MA4GA1Ud
-DwEB/wQEAwIFoDAfBgNVHSMEGDAWgBTCT0hX/NFPmsBdOH0OBdvZLrVSYDArBgNV
-HR8EJDAiMCCgHqAchhpodHRwOi8vdGouc3ltY2IuY29tL3RqLmNybDAdBgNVHSUE
-FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwVwYIKwYBBQUHAQEESzBJMB8GCCsGAQUF
-BzABhhNodHRwOi8vdGouc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8vdGou
-c3ltY2IuY29tL3RqLmNydDANBgkqhkiG9w0BAQsFAAOCAQEAYPxzMA4Z57DE1Xl7
-B/fIErFwewTKWCu+f8OYY1BBdmwSEJHG+JQyCeB+QR/J4CQLgb7Ei330bMLMbKWi
-w2EnQ1CVq/uXwH6Rn9iHSPVZtdhbinGWRNlAdLIdDij3AXKeObXxeDXa2CUR1U68
-SVVOK0PUHGkOF444sMTTA7gHtM3cWX/aMaLWB9/xubUdJU+G4c862pgcz+LHjQEB
-xVQB7Aban4DI6j/1nP6LxhXFSE0Z/TqA+PyTniUpIG4Gmr8djgwKtWEBljhuaBeG
-KZW8QpiEtyd6IT9DlHYBLdupCdP2tR2kk7QAvQNkRQ2bvEbRzupHtzyUYJkRWc8K
-YblxuA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rhodes.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rhodes.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rhodes.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rhodes.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rhodes.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rhodes.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEsDCCA5igAwIBAgIQdL5J8ozn++NOGdIt+ubUoDANBgkqhkiG9w0BAQsFADBB
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMRswGQYDVQQDExJ0
-aGF3dGUgU1NMIENBIC0gRzIwHhcNMTUwNDIyMDAwMDAwWhcNMTcwNDIxMjM1OTU5
-WjBzMQswCQYDVQQGEwJVUzESMBAGA1UECAwJVGVubmVzc2VlMRAwDgYDVQQHDAdN
-ZW1waGlzMRcwFQYDVQQKDA5SaG9kZXMgQ29sbGVnZTEMMAoGA1UECwwDSVRTMRcw
-FQYDVQQDDA5pZHAucmhvZGVzLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANQ2zPD2xzBgIRtp8MVD1nEKLIy10zy84B6+86ybyKAZbYQQtK9OGeq/
-EeEDMENmuXmkk5IOQ+yprLGAWHes7fF5Pjr3vKk1nPD0efi2GaJS8AWF0KUPlbE6
-O5uEroZp4wa8XR87Lqkt5ocUQiA0EBiAjg/bn9j4GEhkkGJca1Dp22Nij7xZNWE2
-cPV+rvU0ILJMq5PwxajG5abTDCMpZc4yl66qhXGMrcjlHGri81XW0TLvA8Vxt81x
-rT9nQAV83P4RJ7V6siGI6b/ujktsk6msVt3A8PJBByhNaMCnIrSYxgJ6uvSucZRW
-9jSd7JIh1lZGCb+tVvKf+F/mUPBzjPsCAwEAAaOCAXAwggFsMBkGA1UdEQQSMBCC
-DmlkcC5yaG9kZXMuZWR1MAkGA1UdEwQCMAAwbgYDVR0gBGcwZTBjBgZngQwBAgIw
-WTAmBggrBgEFBQcCARYaaHR0cHM6Ly93d3cudGhhd3RlLmNvbS9jcHMwLwYIKwYB
-BQUHAgIwIwwhaHR0cHM6Ly93d3cudGhhd3RlLmNvbS9yZXBvc2l0b3J5MA4GA1Ud
-DwEB/wQEAwIFoDAfBgNVHSMEGDAWgBTCT0hX/NFPmsBdOH0OBdvZLrVSYDArBgNV
-HR8EJDAiMCCgHqAchhpodHRwOi8vdGouc3ltY2IuY29tL3RqLmNybDAdBgNVHSUE
-FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwVwYIKwYBBQUHAQEESzBJMB8GCCsGAQUF
-BzABhhNodHRwOi8vdGouc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8vdGou
-c3ltY2IuY29tL3RqLmNydDANBgkqhkiG9w0BAQsFAAOCAQEAYPxzMA4Z57DE1Xl7
-B/fIErFwewTKWCu+f8OYY1BBdmwSEJHG+JQyCeB+QR/J4CQLgb7Ei330bMLMbKWi
-w2EnQ1CVq/uXwH6Rn9iHSPVZtdhbinGWRNlAdLIdDij3AXKeObXxeDXa2CUR1U68
-SVVOK0PUHGkOF444sMTTA7gHtM3cWX/aMaLWB9/xubUdJU+G4c862pgcz+LHjQEB
-xVQB7Aban4DI6j/1nP6LxhXFSE0Z/TqA+PyTniUpIG4Gmr8djgwKtWEBljhuaBeG
-KZW8QpiEtyd6IT9DlHYBLdupCdP2tR2kk7QAvQNkRQ2bvEbRzupHtzyUYJkRWc8K
-YblxuA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rhodes.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Rhodes College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rhodes College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rhodes.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Doug Walker</md:GivenName>
-    <md:EmailAddress>walkerd@rhodes.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Arthur Rosario</md:GivenName>
-    <md:EmailAddress>rosarioa@rhodes.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk@Rhodes</md:GivenName>
-    <md:EmailAddress>helpdesk@rhodes.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Richie Trenthem</md:GivenName>
-    <md:EmailAddress>trenthem@rhodes.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml b/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.xml
deleted file mode 100644
index a0b79ae4..00000000
--- a/swamid-interfederations-2.0/idp.rhul.ac.uk-oala.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="http://idp.rhul.ac.uk/oala">
-  <!--
-		This is an OpenAthens LA IdP for Royal Holloway and Bedford New College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-04T11:59:06Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">rhul.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkigAwIBAgIIS43HU8EXmhwwDQYJKoZIhvcNAQEFBQAwRzEsMCoGA1UE
-						CgwjUm95YWwgSG9sbG93YXkgVW5pdmVyc2l0eSBvZiBMb25kb24xFzAVBgNVBAMM
-						DmlkcC5yaHVsLmFjLnVrMB4XDTEyMTIxMjEyMjAyM1oXDTIyMTIxMjEyMjAyM1ow
-						RzEsMCoGA1UECgwjUm95YWwgSG9sbG93YXkgVW5pdmVyc2l0eSBvZiBMb25kb24x
-						FzAVBgNVBAMMDmlkcC5yaHVsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEAg4Ij2g/JR+6L9D1i5KQ6tXIEIylJ4npmYfYnAOSkwIpePucRZxQv
-						Cmvn7/sX+zt/11/YF/mqio+tWwkytevh3Ou0FY0ZjDTqlFM+BldrQQ0bWM7SKnMn
-						XMp0AREzc4yhrKVbr5+a2Es3INJbK9Rt+r7fHIK+IfojwQCv8/myAQ+diaO1H62e
-						1KhXgKP1GDHg4NQwlPLq3xtJZJz90I1v6IJVnhw2jyq1gyyTjduMbQZkbzpF8vF1
-						OxZYR45DpW6kTXisIupvZelvFwsa2rDwNz5QKoDfUwnLFTOUIbQc0BLdP8nQZvG7
-						U7Lhqc6azsO2XxZksi6HqfjH0i0kHD3AowIDAQABo1AwTjAdBgNVHQ4EFgQUMFIh
-						i+huyWXzQnJrE+LUc9NSiXswHwYDVR0jBBgwFoAUMFIhi+huyWXzQnJrE+LUc9NS
-						iXswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaf1YLiNdZY2hBK8w
-						xTfO1sR3XOc8y1fCIsQGCHX6uFm8tbWDX5N45mp7jDzMRwZndOXemkIl1ms35RRH
-						OBkTpsrsmD4DyLmPLVGkmQUMVXhmPsFFt+ePaTC8H1Gj5hcCXVWqRWxtGdfjHLsJ
-						psRHDoKZecU5yURn23K1BG6xfjy1evh7GBYu0sl8tbYuiF0/2w/uWR33sYyN4EpR
-						RZzA301WyNKyppCyHwdIX+8kx9gUy5pt4TWUezwtdVsG+hgFFwhg1GAj3iTnbDRI
-						LugYUaKfJyWtcrBUW24OQqf77hwQjtWox3tW9FXGMc3YvBGWFeKlJXMADaqtig1i
-						fRVknA==
-					</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>
-						MIIDYDCCAkigAwIBAgIIS43HU8EXmhwwDQYJKoZIhvcNAQEFBQAwRzEsMCoGA1UE
-						CgwjUm95YWwgSG9sbG93YXkgVW5pdmVyc2l0eSBvZiBMb25kb24xFzAVBgNVBAMM
-						DmlkcC5yaHVsLmFjLnVrMB4XDTEyMTIxMjEyMjAyM1oXDTIyMTIxMjEyMjAyM1ow
-						RzEsMCoGA1UECgwjUm95YWwgSG9sbG93YXkgVW5pdmVyc2l0eSBvZiBMb25kb24x
-						FzAVBgNVBAMMDmlkcC5yaHVsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEAg4Ij2g/JR+6L9D1i5KQ6tXIEIylJ4npmYfYnAOSkwIpePucRZxQv
-						Cmvn7/sX+zt/11/YF/mqio+tWwkytevh3Ou0FY0ZjDTqlFM+BldrQQ0bWM7SKnMn
-						XMp0AREzc4yhrKVbr5+a2Es3INJbK9Rt+r7fHIK+IfojwQCv8/myAQ+diaO1H62e
-						1KhXgKP1GDHg4NQwlPLq3xtJZJz90I1v6IJVnhw2jyq1gyyTjduMbQZkbzpF8vF1
-						OxZYR45DpW6kTXisIupvZelvFwsa2rDwNz5QKoDfUwnLFTOUIbQc0BLdP8nQZvG7
-						U7Lhqc6azsO2XxZksi6HqfjH0i0kHD3AowIDAQABo1AwTjAdBgNVHQ4EFgQUMFIh
-						i+huyWXzQnJrE+LUc9NSiXswHwYDVR0jBBgwFoAUMFIhi+huyWXzQnJrE+LUc9NS
-						iXswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaf1YLiNdZY2hBK8w
-						xTfO1sR3XOc8y1fCIsQGCHX6uFm8tbWDX5N45mp7jDzMRwZndOXemkIl1ms35RRH
-						OBkTpsrsmD4DyLmPLVGkmQUMVXhmPsFFt+ePaTC8H1Gj5hcCXVWqRWxtGdfjHLsJ
-						psRHDoKZecU5yURn23K1BG6xfjy1evh7GBYu0sl8tbYuiF0/2w/uWR33sYyN4EpR
-						RZzA301WyNKyppCyHwdIX+8kx9gUy5pt4TWUezwtdVsG+hgFFwhg1GAj3iTnbDRI
-						LugYUaKfJyWtcrBUW24OQqf77hwQjtWox3tW9FXGMc3YvBGWFeKlJXMADaqtig1i
-						fRVknA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rhul.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rhul.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Royal Holloway and Bedford New College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Holloway, University of London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rhul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library Systems Team</GivenName>
-    <EmailAddress>mailto:libsysteam@rhul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Kiely</SurName>
-    <EmailAddress>mailto:Peter.Kiely@rhul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rice.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rice.edu-idp-shibboleth.xml
deleted file mode 100644
index ed4f1148..00000000
--- a/swamid-interfederations-2.0/idp.rice.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://idp.rice.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">rice.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rice University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Rice University Identity Provider</mdui:Description>
-        <mdui:Logo height="60" width="152" xml:lang="en">https://idp.rice.edu/idp/images/RiceLogo_small.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>
-MIIDGzCCAgOgAwIBAgIUNB1FAd9Ux2knx5u0LT/2TS1LGcYwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnJpY2UuZWR1MB4XDTA5MTAyOTE5NTYzMVoXDTI5
-MTAyOTE5NTYzMVowFzEVMBMGA1UEAxMMaWRwLnJpY2UuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAliD8WG6wXXuqN8dnBBSKBEa0fuwutw4biOSz
-HPN5OLFDH22c9jBFTdPg4ozxGM6x6n30LXVRjAsdx5mFvqWXXrdihpSs2d/VLSSt
-pDjJOOwc0mL+B7mB2zIqvHuJYyUKOaHAOxmjlQ2w74AzToragPQxgEFXkSNGi0TX
-Nl9vtBkuP4XXCnVZaOyNOH5GFYLIw0UjekXCUbUWWQ7YkoZsA/rSgMctM1duiWq6
-cbI9bpl5GPd4Jc1z7c2QYOZYSvrRWnvJWtV1/3rlMfIWSra7FnMCk8OsWgqyozN5
-KGTt/F59qnkVHTp40O2NjqqRGyyZrXxy1TvXNqvglQJDeNuKxQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAucmljZS5lZHWGI2h0dHBzOi8vaWRwLnJpY2UuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBT5ap3rsIH4qpnJk9rKCDdZCxGVdzANBgkq
-hkiG9w0BAQUFAAOCAQEAMI6twrzu3GVsqLcEXvgzomE4NqUjHqLn9LfV7Kts87gE
-7SedxD1UpGke9y/ca5AjwOaJeUdqAgbfD4jNIccpwht4kEZL8ZlBBIkx5fcPJ3uO
-Aj26/fg1C2/JlOFitYP/wsHJGJhPjtK3lRxfXGa+NQzrX8f+9qyLWhwza1CV1Cus
-v+P0jZo3wAfCgA7hw84PHU/Az7nB9sawg2s082B0QKpMfeIjtrmWlRqyZiUxOpyC
-u6hryK6pnoO5TWNzyFnOZq8oNpXi+6+ulfu6Gf8ENofwnhxtj30Drh/uzGjJfwhb
-YGiGeQcYxxiDQvtt3hzYv/pHQ1/6svEiUxzRpwvC7Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rice.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rice.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rice.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rice.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rice.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rice.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rice.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rice.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rice.edu/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">rice.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUNB1FAd9Ux2knx5u0LT/2TS1LGcYwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnJpY2UuZWR1MB4XDTA5MTAyOTE5NTYzMVoXDTI5
-MTAyOTE5NTYzMVowFzEVMBMGA1UEAxMMaWRwLnJpY2UuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAliD8WG6wXXuqN8dnBBSKBEa0fuwutw4biOSz
-HPN5OLFDH22c9jBFTdPg4ozxGM6x6n30LXVRjAsdx5mFvqWXXrdihpSs2d/VLSSt
-pDjJOOwc0mL+B7mB2zIqvHuJYyUKOaHAOxmjlQ2w74AzToragPQxgEFXkSNGi0TX
-Nl9vtBkuP4XXCnVZaOyNOH5GFYLIw0UjekXCUbUWWQ7YkoZsA/rSgMctM1duiWq6
-cbI9bpl5GPd4Jc1z7c2QYOZYSvrRWnvJWtV1/3rlMfIWSra7FnMCk8OsWgqyozN5
-KGTt/F59qnkVHTp40O2NjqqRGyyZrXxy1TvXNqvglQJDeNuKxQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAucmljZS5lZHWGI2h0dHBzOi8vaWRwLnJpY2UuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBT5ap3rsIH4qpnJk9rKCDdZCxGVdzANBgkq
-hkiG9w0BAQUFAAOCAQEAMI6twrzu3GVsqLcEXvgzomE4NqUjHqLn9LfV7Kts87gE
-7SedxD1UpGke9y/ca5AjwOaJeUdqAgbfD4jNIccpwht4kEZL8ZlBBIkx5fcPJ3uO
-Aj26/fg1C2/JlOFitYP/wsHJGJhPjtK3lRxfXGa+NQzrX8f+9qyLWhwza1CV1Cus
-v+P0jZo3wAfCgA7hw84PHU/Az7nB9sawg2s082B0QKpMfeIjtrmWlRqyZiUxOpyC
-u6hryK6pnoO5TWNzyFnOZq8oNpXi+6+ulfu6Gf8ENofwnhxtj30Drh/uzGjJfwhb
-YGiGeQcYxxiDQvtt3hzYv/pHQ1/6svEiUxzRpwvC7Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rice.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rice.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Rice University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rice University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rice.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Paul Engle</md:GivenName>
-    <md:EmailAddress>pengle@rice.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Dean Lane</md:GivenName>
-    <md:EmailAddress>dlane@rice.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.richardtaunton.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.richardtaunton.ac.uk-oala-metadata.xml
deleted file mode 100644
index ff510446..00000000
--- a/swamid-interfederations-2.0/idp.richardtaunton.ac.uk-oala-metadata.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.richardtaunton.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Richard Taunton Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-17T17:45:41Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">richardtaunton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDcjCCAlqgAwIBAgIIP9vOoGDWheQwDQYJKoZIhvcNAQEFBQAwUDErMCkGA1UE
-						CgwiUmljaGFyZCBUYXVudG9uIFNpeHRoIEZvcm0gQ29sbGVnZTEhMB8GA1UEAwwY
-						aWRwLnJpY2hhcmR0YXVudG9uLmFjLnVrMB4XDTE0MDIxMzE0MzI0MVoXDTI0MDIx
-						MzE0MzI0MVowUDErMCkGA1UECgwiUmljaGFyZCBUYXVudG9uIFNpeHRoIEZvcm0g
-						Q29sbGVnZTEhMB8GA1UEAwwYaWRwLnJpY2hhcmR0YXVudG9uLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArrQrUbrEso92Y0nGePC9ddn0ZpZ+
-						pYV39mnbr51NSHQlano4Arn8uBlMi9ALaLON4G6A9Q+S2B6OIorTgMTHyDbrOTya
-						Dw7d9gvlbvKWEnJMBstk+Wpm1G4OKmpm2VrTNzbuPpCTpHVFVqHa8j0XKqnXl4Da
-						U7AU3jfIbpM8TYMZnVOcOTXlRhLKyX75bncjbYjFzbtX1ZsToSPmdLHL2Rl1MCgK
-						sZhgEbx20wZuFatoOZ5MoxmUo8LSAW5HGrKsE9ms/pN+KT6uej4ygOtq1GBq9Lrv
-						W3nKWrRzU/2gBKJKudP7avxS3n0t55ITaS8Emx/lj2uwOSSf7U8pnNBOKwIDAQAB
-						o1AwTjAdBgNVHQ4EFgQUSetuFJXmHRSav/PWbq+q7pA/BTwwHwYDVR0jBBgwFoAU
-						SetuFJXmHRSav/PWbq+q7pA/BTwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAl+DLXiM0SPpko0CalHgKey1WKm7kuM8yr0/SdybnM6SJ42oOoW90pJla
-						GVkFcHsZx4T17MesjXrJyYoH7eTga6HkXCWd6t1Iv9XNL2ugx4BaZKM08n8wNvw1
-						e/rBVAVQQ+ChFQNqRI9W5hXxMcqjpZQQ1soNjQHs12SEzsHqrdL4w+J6YDdpXNzK
-						IwSNoEAPg+maVh3q9qpm059erPkxPR48bp1gdZ75tjo/xiUF4r0aZ8lgFXBsJehF
-						vJLm/3QphXsGgRuXU06Uv84xWffF1zyS74OgLq3xZ0kTWZ9MLfAz2lGiONkBfwUX
-						qfAWYGdWHfXUpfYTT+9iNCwqnPTlvA==
-					</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>
-						MIIDcjCCAlqgAwIBAgIIP9vOoGDWheQwDQYJKoZIhvcNAQEFBQAwUDErMCkGA1UE
-						CgwiUmljaGFyZCBUYXVudG9uIFNpeHRoIEZvcm0gQ29sbGVnZTEhMB8GA1UEAwwY
-						aWRwLnJpY2hhcmR0YXVudG9uLmFjLnVrMB4XDTE0MDIxMzE0MzI0MVoXDTI0MDIx
-						MzE0MzI0MVowUDErMCkGA1UECgwiUmljaGFyZCBUYXVudG9uIFNpeHRoIEZvcm0g
-						Q29sbGVnZTEhMB8GA1UEAwwYaWRwLnJpY2hhcmR0YXVudG9uLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArrQrUbrEso92Y0nGePC9ddn0ZpZ+
-						pYV39mnbr51NSHQlano4Arn8uBlMi9ALaLON4G6A9Q+S2B6OIorTgMTHyDbrOTya
-						Dw7d9gvlbvKWEnJMBstk+Wpm1G4OKmpm2VrTNzbuPpCTpHVFVqHa8j0XKqnXl4Da
-						U7AU3jfIbpM8TYMZnVOcOTXlRhLKyX75bncjbYjFzbtX1ZsToSPmdLHL2Rl1MCgK
-						sZhgEbx20wZuFatoOZ5MoxmUo8LSAW5HGrKsE9ms/pN+KT6uej4ygOtq1GBq9Lrv
-						W3nKWrRzU/2gBKJKudP7avxS3n0t55ITaS8Emx/lj2uwOSSf7U8pnNBOKwIDAQAB
-						o1AwTjAdBgNVHQ4EFgQUSetuFJXmHRSav/PWbq+q7pA/BTwwHwYDVR0jBBgwFoAU
-						SetuFJXmHRSav/PWbq+q7pA/BTwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAl+DLXiM0SPpko0CalHgKey1WKm7kuM8yr0/SdybnM6SJ42oOoW90pJla
-						GVkFcHsZx4T17MesjXrJyYoH7eTga6HkXCWd6t1Iv9XNL2ugx4BaZKM08n8wNvw1
-						e/rBVAVQQ+ChFQNqRI9W5hXxMcqjpZQQ1soNjQHs12SEzsHqrdL4w+J6YDdpXNzK
-						IwSNoEAPg+maVh3q9qpm059erPkxPR48bp1gdZ75tjo/xiUF4r0aZ8lgFXBsJehF
-						vJLm/3QphXsGgRuXU06Uv84xWffF1zyS74OgLq3xZ0kTWZ9MLfAz2lGiONkBfwUX
-						qfAWYGdWHfXUpfYTT+9iNCwqnPTlvA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.richardtaunton.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.richardtaunton.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Richard Taunton Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Richard Taunton Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.richardtaunton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sharon</GivenName>
-    <SurName>Abbott</SurName>
-    <EmailAddress>mailto:abbotts@richardtaunton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Coxson</SurName>
-    <EmailAddress>mailto:syssco@richardtaunton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.richuish.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 6ef53055..00000000
--- a/swamid-interfederations-2.0/idp.richuish.ac.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://idp.richuish.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Richard Huish College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-17T13:52: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">richuish.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEcTCCA1mgAwIBAgIQOK05z/jgLpm7t1J1gbk9JzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDQxMjAwMDAwMFoXDTE2MDQxMTIzNTk1OVowQDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAucmljaHVp
-						c2guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc/+JhPJ6P
-						2RjvN7s7WlFfifcFU/bh9md3XhKI4TqBNPQc3xPaB1m9hJ09pPJqwW58yJTu0F8w
-						eh+0GDq/AEDPPMbWNSGC8hq9Ih4LdB2RdSg81Fl8clFqjNlO4lZjMTXuOVkFwOtm
-						e8gXIsNryCWL5gcuaHzD6AWkTOMVN66HwCuZ/JgFC1KE8b+28pbE0dVmQAD6k4RJ
-						F2RF/GUVV+RyNBiKGQj0STCJmz6wVEZpBw1hq2XxFfyBatk9ASYAAY7oLDNQNDpK
-						4CUSwevosmHPJV4tNvoGsACqMmUxZH/P/WSk20JCUWIiHCy3pdQMxfr1mrH0u1V8
-						KOvmYDdUK49xAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-						V0fqkOO57TAdBgNVHQ4EFgQUDot17IlAyyEIRz0G/r4/UTFoGb0wDgYDVR0PAQH/
-						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-						Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5yaWNodWlzaC5hYy51
-						azANBgkqhkiG9w0BAQUFAAOCAQEAMDv9hIY0OHIXmIEhM40KM0I6LgJ4MQWLO+zH
-						GqiCVokJaAgVN6I7YYmXoZNdVT8ydDXBy3O++c2I79RuGHA3odevop+92VjY25yo
-						lCAhL+aIWy6AD1nzVYTT99qZdkgxCf3d1ryB/A8xhVpkUgSChwlviq09R17+ihYM
-						ZXeFk70BGXMnvbwuEi6fyB5xG1Ki+21ktQBRIaOhlXkPrDsAuUZeVnGZ1AhFvt/K
-						dPPwiuxkdI9aAXORj37yj0HZBCuO4SGnM0hwx5DzgiIzTv6BI7UKkr3rhbGUDPHB
-						0g92pSiGsoE2FzexcNmU7B4J5QH/+CQWTt5zLb6/X0jjC++7Kw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.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.richuish.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.richuish.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.richuish.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">richuish.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEcTCCA1mgAwIBAgIQOK05z/jgLpm7t1J1gbk9JzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDQxMjAwMDAwMFoXDTE2MDQxMTIzNTk1OVowQDEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJpZHAucmljaHVp
-						c2guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc/+JhPJ6P
-						2RjvN7s7WlFfifcFU/bh9md3XhKI4TqBNPQc3xPaB1m9hJ09pPJqwW58yJTu0F8w
-						eh+0GDq/AEDPPMbWNSGC8hq9Ih4LdB2RdSg81Fl8clFqjNlO4lZjMTXuOVkFwOtm
-						e8gXIsNryCWL5gcuaHzD6AWkTOMVN66HwCuZ/JgFC1KE8b+28pbE0dVmQAD6k4RJ
-						F2RF/GUVV+RyNBiKGQj0STCJmz6wVEZpBw1hq2XxFfyBatk9ASYAAY7oLDNQNDpK
-						4CUSwevosmHPJV4tNvoGsACqMmUxZH/P/WSk20JCUWIiHCy3pdQMxfr1mrH0u1V8
-						KOvmYDdUK49xAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-						V0fqkOO57TAdBgNVHQ4EFgQUDot17IlAyyEIRz0G/r4/UTFoGb0wDgYDVR0PAQH/
-						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-						Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC5yaWNodWlzaC5hYy51
-						azANBgkqhkiG9w0BAQUFAAOCAQEAMDv9hIY0OHIXmIEhM40KM0I6LgJ4MQWLO+zH
-						GqiCVokJaAgVN6I7YYmXoZNdVT8ydDXBy3O++c2I79RuGHA3odevop+92VjY25yo
-						lCAhL+aIWy6AD1nzVYTT99qZdkgxCf3d1ryB/A8xhVpkUgSChwlviq09R17+ihYM
-						ZXeFk70BGXMnvbwuEi6fyB5xG1Ki+21ktQBRIaOhlXkPrDsAuUZeVnGZ1AhFvt/K
-						dPPwiuxkdI9aAXORj37yj0HZBCuO4SGnM0hwx5DzgiIzTv6BI7UKkr3rhbGUDPHB
-						0g92pSiGsoE2FzexcNmU7B4J5QH/+CQWTt5zLb6/X0jjC++7Kw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richuish.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.richuish.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">Richard Huish College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Richard Huish College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.richuish.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Roz</GivenName>
-    <SurName>Abbott</SurName>
-    <EmailAddress>mailto:roza@richuish.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Roz</GivenName>
-    <SurName>Abbott</SurName>
-    <EmailAddress>mailto:roza@richuish.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.riversidecollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.riversidecollege.ac.uk-shibboleth.xml
deleted file mode 100644
index 17bde9cb..00000000
--- a/swamid-interfederations-2.0/idp.riversidecollege.ac.uk-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://idp.riversidecollege.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Riverside College Halton.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-02T16:59: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">riversidecollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE5zCCA8+gAwIBAgIRAN9KqPCKq/Fq62pyegYW9yswDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xNDAzMTgwMDAwMDBaFw0xNzAzMTcyMzU5NTlaMIGsMQswCQYD
-						VQQGEwJHQjEQMA4GA1UEERMHV0E4IDdRUTERMA8GA1UECBMIQ2hlc2hpcmUxDzAN
-						BgNVBAcTBldJRE5FUzERMA8GA1UECRMIS2luZ3N3YXkxITAfBgNVBAoTGFJpdmVy
-						c2lkZSBDb2xsZWdlIEhhbHRvbjEMMAoGA1UECxMDQ1NVMSMwIQYDVQQDExppZHAu
-						cml2ZXJzaWRlY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAKsyf+cIJmtmhDgdlzcB62jXuYBtXmDk3ZOv3jq9jMQU3fAppqrMQUHD
-						KyCJzw/iiMkrrXyiZEKSBczn5v2OBGsrUERqpXArO+CbFyfR1fSrgjYoq5yKM46u
-						wnlwRpBYqxkJ8v9XPIv8kcmY0D5BjRLMb63A8Iv48PGt+v0ApPuTAoSjcIcnq06q
-						PquOEpowLlJ0ViN7pIyqR0kXOunEHYdz76hgCYNl41cCURfT0V+90podIB0L688x
-						VWnPWGPq9oD/jMsHbsVOl9KvC4gMuNMyfulZe02XcjeZ/QrPsXsBeQZR97GiWhni
-						le027Jt4b2iOSlDZSbbOpYHyWVxcGLsCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaA
-						FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTnEZ72dGGX2SmqtdFup2nH
-						VHoOwDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-						BgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZn
-						gQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaaWRw
-						LnJpdmVyc2lkZWNvbGxlZ2UuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAFj5SVF7
-						Mz4BykrmoByiWVz/em90XJnaDp/PXqM9kayqS9+dEMDxXAaI67DVToDRLc+aO0YO
-						HBlAee4hc0j/b3rqKHaF1TxuAIT5rJ2f1aWwZ9Uo/UKUp7ZCO/qkh7soSs32eaea
-						+AZ4OwNinXR0rXtzeXD70z6W7JfacsgFQkZEB00+YUnOz4ZVcVj2wwphy3rG1GeF
-						zfW4wuzBStRgI2e+VrBu1/C6JES+NN+DlB8L0RQcR78Qp+SBpPdfihGHBhowMfte
-						FHr7DKIT1YxcTM+OuGX+b42j1HiHGKItFWqcgthiNwAJSkcJi442wHUzR0a5nvFx
-						zMKQseHBHBcMOJc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.riversidecollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.riversidecollege.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.riversidecollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.riversidecollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.riversidecollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.riversidecollege.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">riversidecollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE5zCCA8+gAwIBAgIRAN9KqPCKq/Fq62pyegYW9yswDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xNDAzMTgwMDAwMDBaFw0xNzAzMTcyMzU5NTlaMIGsMQswCQYD
-						VQQGEwJHQjEQMA4GA1UEERMHV0E4IDdRUTERMA8GA1UECBMIQ2hlc2hpcmUxDzAN
-						BgNVBAcTBldJRE5FUzERMA8GA1UECRMIS2luZ3N3YXkxITAfBgNVBAoTGFJpdmVy
-						c2lkZSBDb2xsZWdlIEhhbHRvbjEMMAoGA1UECxMDQ1NVMSMwIQYDVQQDExppZHAu
-						cml2ZXJzaWRlY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAKsyf+cIJmtmhDgdlzcB62jXuYBtXmDk3ZOv3jq9jMQU3fAppqrMQUHD
-						KyCJzw/iiMkrrXyiZEKSBczn5v2OBGsrUERqpXArO+CbFyfR1fSrgjYoq5yKM46u
-						wnlwRpBYqxkJ8v9XPIv8kcmY0D5BjRLMb63A8Iv48PGt+v0ApPuTAoSjcIcnq06q
-						PquOEpowLlJ0ViN7pIyqR0kXOunEHYdz76hgCYNl41cCURfT0V+90podIB0L688x
-						VWnPWGPq9oD/jMsHbsVOl9KvC4gMuNMyfulZe02XcjeZ/QrPsXsBeQZR97GiWhni
-						le027Jt4b2iOSlDZSbbOpYHyWVxcGLsCAwEAAaOCAXcwggFzMB8GA1UdIwQYMBaA
-						FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTnEZ72dGGX2SmqtdFup2nH
-						VHoOwDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-						BgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZn
-						gQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJQYDVR0RBB4wHIIaaWRw
-						LnJpdmVyc2lkZWNvbGxlZ2UuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAFj5SVF7
-						Mz4BykrmoByiWVz/em90XJnaDp/PXqM9kayqS9+dEMDxXAaI67DVToDRLc+aO0YO
-						HBlAee4hc0j/b3rqKHaF1TxuAIT5rJ2f1aWwZ9Uo/UKUp7ZCO/qkh7soSs32eaea
-						+AZ4OwNinXR0rXtzeXD70z6W7JfacsgFQkZEB00+YUnOz4ZVcVj2wwphy3rG1GeF
-						zfW4wuzBStRgI2e+VrBu1/C6JES+NN+DlB8L0RQcR78Qp+SBpPdfihGHBhowMfte
-						FHr7DKIT1YxcTM+OuGX+b42j1HiHGKItFWqcgthiNwAJSkcJi442wHUzR0a5nvFx
-						zMKQseHBHBcMOJc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.riversidecollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.riversidecollege.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">Riverside College Halton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Riverside College Halton</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.riversidecollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Doyle</SurName>
-    <EmailAddress>mailto:ian.doyle@riversidecollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Doyle</SurName>
-    <EmailAddress>mailto:ian.doyle@riversidecollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rkh.se-idp-shibboleth.xml
deleted file mode 100644
index ac6f9c4d..00000000
--- a/swamid-interfederations-2.0/idp.rkh.se-idp-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://idp.rkh.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">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</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">rkh.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Röda Korsets Högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Swedish Red Cross University College</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Röda Korsets Högskola</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Swedish Red Cross University College</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.rkh.se/sv/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.rkh.se/en</mdui:InformationURL>
-        <mdui:Logo height="90" width="165" xml:lang="sv">http://www.rkh.se/images/logo.png</mdui:Logo>
-        <mdui:Logo height="90" width="165" xml:lang="en">http://www.rkh.se/images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>rkh.se</mdui:DomainHint>
-        <mdui:IPHint>193.11.166.66</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUSxTqdp7tDACfsf1wsKvgXqio4y8wDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLnJraC5zZTAeFw0xMjExMTIxMzQ4MzZaFw0zMjEx
-MTIxMzQ4MzZaMBUxEzARBgNVBAMTCmlkcC5ya2guc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCF9AP/NqQC4kdNom3wMY/3DF38Tdgy9bY5qyy/RlOo
-4t+G7MMYHvIKKxpD5s1wFbir4e84mn2eGgiMZ5BqlS4xl3wjBnY3syUpEfGA5QcT
-Ar0uS9ToncrxqbAp4ZzgtF6YrP53cWL9lbHZjImESd5NfIt515mDWFfuxJyCTYxf
-zvtEJLxdTfjj0U8sWFxQ0sW5z4Ib49RvpIEaf+/STAjaqP6l8gfDaLp7chRyLPPN
-4Hywk7ZgK/hGX2pRjXogAkbMDBECaPPtn0XUruHdC8hqshpC33xoHaCvfFE6OYfq
-uZX0I2pCiOKRFy/qO1YoIEE8f0EaQy35wptpiVAGoTmvAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5ya2guc2WGIWh0dHBzOi8vaWRwLnJraC5zZS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUnN5WyGgWFoUD8kRlz0xaculYHQMwDQYJKoZIhvcNAQEF
-BQADggEBABbsy0PiV0PF8zc83scwz29zVf15Bhk7FUgv0mhNd94g/OO7D5hcKlvM
-wEPDvFrmaYxiPDKN+PxIB70fQfjwqoMZHOIhMwqzbKbbzxf3lRlgihtnrbwLw4vp
-ele3AfWv2twARiowDSQuskUNoqiRTA14IXROrRFzr3urcR3V67zS0vdYZmM02+Pu
-nSHk2aE+g4n5CZd5VJYi41Aq17QXnpn+AQGoGGLy88MADah5olUphcwr/GYBLGw2
-pdeXtXJxxPV13GCms9LWYEUHf5JLBCsXPNGOe+6c7qWLVSi1Tn12ZFOOH4JCcoKr
-MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rkh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rkh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rkh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rkh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rkh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rkh.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">rkh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUSxTqdp7tDACfsf1wsKvgXqio4y8wDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLnJraC5zZTAeFw0xMjExMTIxMzQ4MzZaFw0zMjEx
-MTIxMzQ4MzZaMBUxEzARBgNVBAMTCmlkcC5ya2guc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCF9AP/NqQC4kdNom3wMY/3DF38Tdgy9bY5qyy/RlOo
-4t+G7MMYHvIKKxpD5s1wFbir4e84mn2eGgiMZ5BqlS4xl3wjBnY3syUpEfGA5QcT
-Ar0uS9ToncrxqbAp4ZzgtF6YrP53cWL9lbHZjImESd5NfIt515mDWFfuxJyCTYxf
-zvtEJLxdTfjj0U8sWFxQ0sW5z4Ib49RvpIEaf+/STAjaqP6l8gfDaLp7chRyLPPN
-4Hywk7ZgK/hGX2pRjXogAkbMDBECaPPtn0XUruHdC8hqshpC33xoHaCvfFE6OYfq
-uZX0I2pCiOKRFy/qO1YoIEE8f0EaQy35wptpiVAGoTmvAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5ya2guc2WGIWh0dHBzOi8vaWRwLnJraC5zZS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUnN5WyGgWFoUD8kRlz0xaculYHQMwDQYJKoZIhvcNAQEF
-BQADggEBABbsy0PiV0PF8zc83scwz29zVf15Bhk7FUgv0mhNd94g/OO7D5hcKlvM
-wEPDvFrmaYxiPDKN+PxIB70fQfjwqoMZHOIhMwqzbKbbzxf3lRlgihtnrbwLw4vp
-ele3AfWv2twARiowDSQuskUNoqiRTA14IXROrRFzr3urcR3V67zS0vdYZmM02+Pu
-nSHk2aE+g4n5CZd5VJYi41Aq17QXnpn+AQGoGGLy88MADah5olUphcwr/GYBLGw2
-pdeXtXJxxPV13GCms9LWYEUHf5JLBCsXPNGOe+6c7qWLVSi1Tn12ZFOOH4JCcoKr
-MH7l5Ii1TxKGmGspEIChPmEAY1ntIV8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rkh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rkh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Red Cross University College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rkh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Swedish Red Cross University College</md:Company>
-    <md:SurName>IT-support</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46858751607/+46858751603</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Swedish Red Cross University College</md:Company>
-    <md:SurName>IT-support</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46858751607</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Swedish Red Cross University College</md:Company>
-    <md:SurName>IT-Support Röda Korsets Högskola</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@rkh.se</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 d28d070b..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rnp.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.rnp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rnp.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rnp.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rnp.br/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">rnp.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rnp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rnp.br:8443/idp/profile/SAML1/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">RNP - Rede Nacional de Ensino e Pesquisa</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RNP - Rede Nacional de Ensino e Pesquisa</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">RNP - Rede Nacional de Ensino e Pesquisa</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rnp.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.rnp.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>GTI/RNP</md:SurName>
-    <md:EmailAddress>servnac@rnp.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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.rrz.uni-koeln.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml
deleted file mode 100644
index 125f4631..00000000
--- a/swamid-interfederations-2.0/idp.rrz.uni-koeln.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rrz.uni-koeln.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-01-14T13:33:15Z">
-      <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>
-  </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-koeln.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität zu Köln</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität zu Köln</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der Universität zu Köln</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider der Universität zu Köln</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.uni-koeln.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uni-koeln.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF4zCCBMugAwIBAgIHGKTbqpe4RTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQG
-EwJERTEOMAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBL
-b2VsbjEUMBIGA1UEAxMLVW5pS29lbG4gQ0ExJDAiBgkqhkiG9w0BCQEWFWNhbWFz
-dGVyQHVuaS1rb2Vsbi5kZTAeFw0xNDEyMDgwODE1MjJaFw0xOTA3MDkyMzU5MDBa
-MIGdMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEO
-MAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2VsbjEh
-MB8GA1UECxMYUmVnaW9uYWxlcyBSZWNoZW56ZW50cnVtMR0wGwYDVQQDExRpZHAu
-cnJ6LnVuaS1rb2Vsbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AM4GP8tW8SQQPobzRRLMaRvKlyhZJmRwur5W400GV3bRvwJ9RHSsw56ZWX+aV1LS
-tIl0MFmRWI1XtPL9s78mhu9GJGjzY9MDn0zTudD+p70bPuHF6T2dW8l/IgCvi0uJ
-7PlywN3vLAggJe+32tBJuHKhP2CihLRmwKXUdp+YSjHjKMoISMte8LLby4MURlkn
-cm3BP93/IJIvrO44vQ9UBwd2EppoSnzX2yWoqUxgttjXpSTSKii7bgiQohbng6bH
-pamdVckjMn3SHA6BV4qRJAnkKWPU9MsHiHCLamd+ZH/teZHdcoJaJCrhejsd3ySN
-OMOKdVsRdu9DpohKTwk4knECAwEAAaOCAkkwggJFME8GA1UdIARIMEYwEQYPKwYB
-BAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEE
-MA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUFDEeYjgdNwAgmGE/uXTa
-bsDZMOswHwYDVR0jBBgwFoAUKuqJ6w6y0CnF/vlMpXbct29PCbowHwYDVR0RBBgw
-FoIUaWRwLnJyei51bmkta29lbG4uZGUwgYMGA1UdHwR8MHowO6A5oDeGNWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1rb2Vsbi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCB0wYIKwYBBQUHAQEEgcYwgcMwMwYIKwYBBQUHMAGGJ2h0
-dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBFBggrBgEFBQcw
-AoY5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29lbG4tY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
-BQADggEBAIJSLabefTcLzZXepN4KaX3bDpKOPtA2DPZxuntYuLdynZ0GVmZSx3QT
-p/xihO66ZtX2JVVAXvkutqVB1nZQea33zQ+lkIWdJskVQTV/gXFbSBrAHMptTWjJ
-zvadECdJ0MTveZ5ZENGQpEAPvAyk6nJcQICmYskrOQ5Ur9D8dRmtwhSiyMQ6G5Yi
-pHG5aE5lGbCixxFuLT0oor49sDQoVEGX2RSFk+2qpS3JaqhviVie2m0v+1BB7x4D
-NPX6heGTUiNU+OLZAssrrb9s21PeVetFPlc0p+MzE8s8IWTdsKMWkkqSHPkonE7+
-8FOfm4jYwW4p+TqXvGRe+NI3Z3INTLM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <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.rrz.uni-koeln.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rrz.uni-koeln.de/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-koeln.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF4zCCBMugAwIBAgIHGKTbqpe4RTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQG
-EwJERTEOMAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBL
-b2VsbjEUMBIGA1UEAxMLVW5pS29lbG4gQ0ExJDAiBgkqhkiG9w0BCQEWFWNhbWFz
-dGVyQHVuaS1rb2Vsbi5kZTAeFw0xNDEyMDgwODE1MjJaFw0xOTA3MDkyMzU5MDBa
-MIGdMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEO
-MAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2VsbjEh
-MB8GA1UECxMYUmVnaW9uYWxlcyBSZWNoZW56ZW50cnVtMR0wGwYDVQQDExRpZHAu
-cnJ6LnVuaS1rb2Vsbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AM4GP8tW8SQQPobzRRLMaRvKlyhZJmRwur5W400GV3bRvwJ9RHSsw56ZWX+aV1LS
-tIl0MFmRWI1XtPL9s78mhu9GJGjzY9MDn0zTudD+p70bPuHF6T2dW8l/IgCvi0uJ
-7PlywN3vLAggJe+32tBJuHKhP2CihLRmwKXUdp+YSjHjKMoISMte8LLby4MURlkn
-cm3BP93/IJIvrO44vQ9UBwd2EppoSnzX2yWoqUxgttjXpSTSKii7bgiQohbng6bH
-pamdVckjMn3SHA6BV4qRJAnkKWPU9MsHiHCLamd+ZH/teZHdcoJaJCrhejsd3ySN
-OMOKdVsRdu9DpohKTwk4knECAwEAAaOCAkkwggJFME8GA1UdIARIMEYwEQYPKwYB
-BAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEE
-MA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUFDEeYjgdNwAgmGE/uXTa
-bsDZMOswHwYDVR0jBBgwFoAUKuqJ6w6y0CnF/vlMpXbct29PCbowHwYDVR0RBBgw
-FoIUaWRwLnJyei51bmkta29lbG4uZGUwgYMGA1UdHwR8MHowO6A5oDeGNWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MDugOaA3hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1rb2Vsbi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCB0wYIKwYBBQUHAQEEgcYwgcMwMwYIKwYBBQUHMAGGJ2h0
-dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBFBggrBgEFBQcw
-AoY5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29lbG4tY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
-BQADggEBAIJSLabefTcLzZXepN4KaX3bDpKOPtA2DPZxuntYuLdynZ0GVmZSx3QT
-p/xihO66ZtX2JVVAXvkutqVB1nZQea33zQ+lkIWdJskVQTV/gXFbSBrAHMptTWjJ
-zvadECdJ0MTveZ5ZENGQpEAPvAyk6nJcQICmYskrOQ5Ur9D8dRmtwhSiyMQ6G5Yi
-pHG5aE5lGbCixxFuLT0oor49sDQoVEGX2RSFk+2qpS3JaqhviVie2m0v+1BB7x4D
-NPX6heGTUiNU+OLZAssrrb9s21PeVetFPlc0p+MzE8s8IWTdsKMWkkqSHPkonE7+
-8FOfm4jYwW4p+TqXvGRe+NI3Z3INTLM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de: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">e36</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e36</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität zu Köln</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Cologne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-koeln.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-koeln.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Beate</md:GivenName>
-    <md:SurName>Schlesiona</md:SurName>
-    <md:EmailAddress>mailto:beate.schlesiona@uni-koeln.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Beate</md:GivenName>
-    <md:SurName>Schlesiona</md:SurName>
-    <md:EmailAddress>mailto:beate.schlesiona@uni-koeln.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Beate</md:GivenName>
-    <md:SurName>Schlesiona</md:SurName>
-    <md:EmailAddress>mailto:beate.schlesiona@uni-koeln.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rrz.uni-koeln.de.xml b/swamid-interfederations-2.0/idp.rrz.uni-koeln.de.xml
deleted file mode 100644
index f8419da2..00000000
--- a/swamid-interfederations-2.0/idp.rrz.uni-koeln.de.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rrz.uni-koeln.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-koeln.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIED2PRijANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJE
-RTEOMAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2Vs
-bjEUMBIGA1UEAxMLVW5pS29lbG4gQ0ExJDAiBgkqhkiG9w0BCQEWFWNhbWFzdGVy
-QHVuaS1rb2Vsbi5kZTAeFw0xMDAxMDYwOTEyMjdaFw0xNTAxMDUwOTEyMjdaMIGd
-MQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwG
-A1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2VsbjEhMB8G
-A1UECxMYUmVnaW9uYWxlcyBSZWNoZW56ZW50cnVtMR0wGwYDVQQDExRpZHAucnJ6
-LnVuaS1rb2Vsbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4G
-P8tW8SQQPobzRRLMaRvKlyhZJmRwur5W400GV3bRvwJ9RHSsw56ZWX+aV1LStIl0
-MFmRWI1XtPL9s78mhu9GJGjzY9MDn0zTudD+p70bPuHF6T2dW8l/IgCvi0uJ7Ply
-wN3vLAggJe+32tBJuHKhP2CihLRmwKXUdp+YSjHjKMoISMte8LLby4MURlkncm3B
-P93/IJIvrO44vQ9UBwd2EppoSnzX2yWoqUxgttjXpSTSKii7bgiQohbng6bHpamd
-VckjMn3SHA6BV4qRJAnkKWPU9MsHiHCLamd+ZH/teZHdcoJaJCrhejsd3ySNOMOK
-dVsRdu9DpohKTwk4knECAwEAAaOCAaIwggGeMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUFDEe
-YjgdNwAgmGE/uXTabsDZMOswHwYDVR0jBBgwFoAUKuqJ6w6y0CnF/vlMpXbct29P
-CbowgYMGA1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
-LWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1rb2Vsbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYB
-BQUHAQEEgZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-dW5pLWtvZWxuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkta29lbG4tY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBYGBCNNx1TJKuenCFTde4Qs++t
-PTzt3NaPas3IeHdipsxZlrWPV1HyNhX1dJmWd1fvTITBQ8srHOwAZe8oQEvgNh1S
-++2CB9hhHXy3cxmLe2cPFOppmCNna3cV2YViCZZqTJu5EtM0W04F2/aKOZtW9dsU
-zz9+f1iFiI8P0kJEyqpvvbvEEAIiupgsyTZ2L9fTFVm13gG1ypieKfiyxp0M+X+K
-K9nheFGb/VuOJ9BP71gMZVLyvHoLPgCZ9Je+i5LIJbV7AEnjaPfZYM028FETpWqQ
-mb0utRy/FfLpTIGA6BtGZ6SGWModfl4RVB7YydSN8nwUOtJb4jDseKzT8ENR
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rrz.uni-koeln.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rrz.uni-koeln.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-koeln.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rrz.uni-koeln.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rrz.uni-koeln.de,OU=Regionales Rechenzentrum,O=Universitaet zu Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOTCCBCGgAwIBAgIED2PRijANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJE
-RTEOMAwGA1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2Vs
-bjEUMBIGA1UEAxMLVW5pS29lbG4gQ0ExJDAiBgkqhkiG9w0BCQEWFWNhbWFzdGVy
-QHVuaS1rb2Vsbi5kZTAeFw0xMDAxMDYwOTEyMjdaFw0xNTAxMDUwOTEyMjdaMIGd
-MQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwG
-A1UEBxMFS29lbG4xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCB6dSBLb2VsbjEhMB8G
-A1UECxMYUmVnaW9uYWxlcyBSZWNoZW56ZW50cnVtMR0wGwYDVQQDExRpZHAucnJ6
-LnVuaS1rb2Vsbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4G
-P8tW8SQQPobzRRLMaRvKlyhZJmRwur5W400GV3bRvwJ9RHSsw56ZWX+aV1LStIl0
-MFmRWI1XtPL9s78mhu9GJGjzY9MDn0zTudD+p70bPuHF6T2dW8l/IgCvi0uJ7Ply
-wN3vLAggJe+32tBJuHKhP2CihLRmwKXUdp+YSjHjKMoISMte8LLby4MURlkncm3B
-P93/IJIvrO44vQ9UBwd2EppoSnzX2yWoqUxgttjXpSTSKii7bgiQohbng6bHpamd
-VckjMn3SHA6BV4qRJAnkKWPU9MsHiHCLamd+ZH/teZHdcoJaJCrhejsd3ySNOMOK
-dVsRdu9DpohKTwk4knECAwEAAaOCAaIwggGeMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUFDEe
-YjgdNwAgmGE/uXTabsDZMOswHwYDVR0jBBgwFoAUKuqJ6w6y0CnF/vlMpXbct29P
-CbowgYMGA1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
-LWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1rb2Vsbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBngYIKwYB
-BQUHAQEEgZEwgY4wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-dW5pLWtvZWxuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5
-aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkta29lbG4tY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBYGBCNNx1TJKuenCFTde4Qs++t
-PTzt3NaPas3IeHdipsxZlrWPV1HyNhX1dJmWd1fvTITBQ8srHOwAZe8oQEvgNh1S
-++2CB9hhHXy3cxmLe2cPFOppmCNna3cV2YViCZZqTJu5EtM0W04F2/aKOZtW9dsU
-zz9+f1iFiI8P0kJEyqpvvbvEEAIiupgsyTZ2L9fTFVm13gG1ypieKfiyxp0M+X+K
-K9nheFGb/VuOJ9BP71gMZVLyvHoLPgCZ9Je+i5LIJbV7AEnjaPfZYM028FETpWqQ
-mb0utRy/FfLpTIGA6BtGZ6SGWModfl4RVB7YydSN8nwUOtJb4jDseKzT8ENR
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rrz.uni-koeln.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität zu Köln</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität zu Köln</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-koeln.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Beate</GivenName>
-    <SurName>Schlesiona</SurName>
-    <EmailAddress>beate.schlesiona@uni-koeln.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Beate</GivenName>
-    <SurName>Schlesiona</SurName>
-    <EmailAddress>beate.schlesiona@uni-koeln.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rsmith.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.rsmith.org.uk-idp-shibboleth.xml
deleted file mode 100644
index 0e78dbfa..00000000
--- a/swamid-interfederations-2.0/idp.rsmith.org.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rsmith.org.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Rhys Smith.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-07T10:42:01Z">
-      <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 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">rsmith.org.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rhys Smith</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Rhys Smith's development IdP</mdui:Description>
-        <mdui:Logo height="160" width="160">https://idp.rsmith.org.uk/me_160x160.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUK9DEIGDv4Ff0Wi8/uvBeGd5eyBswDQYJKoZIhvcNAQEL
-						BQAwHDEaMBgGA1UEAwwRaWRwLnJzbWl0aC5vcmcudWswHhcNMTUwODI0MTQ1MTEy
-						WhcNMzUwODI0MTQ1MTEyWjAcMRowGAYDVQQDDBFpZHAucnNtaXRoLm9yZy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI7VQekyk7mtK2+Q3bBT1yor
-						LI0EaCfn/iv/+WiLUb46AlbeJ63js5lxnpN13PkA499rmchz1BoZ3TCgY4PORnVq
-						c1tm4FMvEE8J9PGwtzLNjXZRRKcVGH9m+uZD2rKpxCDr7RvVdECXn+Ef4IZuBjfX
-						cf7Av31JhwBFg8klqEYtSrNVkPuLzsZANB7TL7wwvmcXmwg/sAewFuKqn9tzGiRZ
-						Ft6TZckeHiZlFyxu67DZPkI2d+itSRczMiKOLLj1Su+5VkeWXA8DQtB7wNhQH53o
-						tvbLnoAHcgtxAyNLd/edsaUr12cDSwHutnXN0tvUyGZ2NJTWDl9l2+eOZS9oMkUC
-						AwEAAaNpMGcwHQYDVR0OBBYEFCMGVfANgpH28R39mgFLHtIqv68ZMEYGA1UdEQQ/
-						MD2CEWlkcC5yc21pdGgub3JnLnVrhihodHRwczovL2lkcC5yc21pdGgub3JnLnVr
-						L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAOHbNUtEcdeh4abEI9
-						Ow8UorELXPMs8SMEh8uNfWyT5qe3qQ3KvRKt3T7qTAWwxkD3spnnfKAVCm/5BIPQ
-						9BOjlsD/M11CoE3AgGvLTrComFyCUWp9ONtgyN+vG0vWOStfwaNyNAepL/MVyccD
-						6ERiSKKcUrAh5n/+PkA4uLnZTbfxF8RVaQfEHe19JOJyUEF6q2xVyeGMi0UiWvdU
-						ycMpGziHHivS+fp17vBSEm8bxtThUybNf9o3P+xvBcEaoStNsfzjxKBo56OFAqyV
-						p10apvU7O4BFOqWg+8deIyCGZoAHpTm22MeyoLo9LlCvXNdzYRwURxGq36jRnuCL
-						He9a
-					</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>
-						MIIDLzCCAhegAwIBAgIUYnvfoMBUueVONNjmaouAYnntwdUwDQYJKoZIhvcNAQEL
-						BQAwHDEaMBgGA1UEAwwRaWRwLnJzbWl0aC5vcmcudWswHhcNMTUwODI0MTQ1MTA4
-						WhcNMzUwODI0MTQ1MTA4WjAcMRowGAYDVQQDDBFpZHAucnNtaXRoLm9yZy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIGrUlYHovXJOZ98APwykmXr
-						J32JsQOzZGyc5CQ/ybyjdNwlmLDtxNcuqvXxaLPVQOKwx3v4lojTbwXTEUrqTev4
-						t/dUULCosCs2yAxM/qvVos2Eejc2HPpcRCK1RkEiM2Orfy2xtC72SG0/WYeG8XdJ
-						l8npWiUxWjRHAUhvKxqUQ65Yf7r4kN/kQd+IUAF85d3daIBBCt4Het2k8BDh9Oq3
-						bmMfn4QtPVJa006mLAFYu668atPcqQkw/M8vm8epMSWSeVJBJIznGKR+7Slhz7Za
-						qFtkBzp99Bf/IUF89TSuVC1TtVzTPBHu6Kq7Q0S1xtiz5TuWnzzDJJ5j4SzaXicC
-						AwEAAaNpMGcwHQYDVR0OBBYEFJdJhR6iLvVIYxNPBGvcGEMP0yg+MEYGA1UdEQQ/
-						MD2CEWlkcC5yc21pdGgub3JnLnVrhihodHRwczovL2lkcC5yc21pdGgub3JnLnVr
-						L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBlY8o7Xxvx1X2A9hVq
-						a6pubECXMGoKwEKaKPRCg0/MjHxMfNp+W1qry1U4dksY+zkZDYSUyi734evLerzZ
-						ldUBGWBa+0uRQfDZZs6+TUHqwe0C76p4q7gOF20Jpo8EJ6BID52su3IlR2S3GjLH
-						AY36CZ3REpahIC3KBvRq53o9ZI7jLX5IcYAbccptqwOI7PlZDekt0HHRu61KpVZk
-						lZBzsSHZrm4KkpmiOece1xC400Zq8/GLJ2F1kZaih0ugsN5qA2zKqqTJaAhyXwf3
-						LwRivthQNpAmJNymJsAPIh1vJ4DK2NxzIbtDEVOawuPgtb8ACjcpBbeVMmKrBRpE
-						RVjJ
-					</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>
-						MIIDLzCCAhegAwIBAgIUZzaEwAwF83jA7Z8vp4qVNNq1yD8wDQYJKoZIhvcNAQEL
-						BQAwHDEaMBgGA1UEAwwRaWRwLnJzbWl0aC5vcmcudWswHhcNMTUwODI0MTQ1MTA5
-						WhcNMzUwODI0MTQ1MTA5WjAcMRowGAYDVQQDDBFpZHAucnNtaXRoLm9yZy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIggh2f64Q4fwbdSkvzdh07w
-						zeJnTgO2WmzFBJK+P1K8WloxxS4OkeX6cCPgPChmRUBUF1CXNXFyPI0iO4SreJUo
-						09CDo5Jm6n3NKqzxBzDrzDBS3Y2QO5qir55BkDli73+PLDMt58w78sqzFa8vyK9r
-						3j2ZfibIzVDfXuQCvvqeb0l8ltRHauV1anHwAm2yQVSj0ZQd77G6lPtt9dzS/M/i
-						U5SRnYwGJuGcVK+XPafIhbKLyou89W0IpZqN6/QZAc3GuF+k5e25+ux17Qn9m75b
-						CT9OEbFRGUds06VADsSwSYD/NugyeOaHsIx2lQg+aaBMC/VAf/NUVXYKNw9CuvEC
-						AwEAAaNpMGcwHQYDVR0OBBYEFFmsU9OW5eFpKoVKccjaBY3i8R9rMEYGA1UdEQQ/
-						MD2CEWlkcC5yc21pdGgub3JnLnVrhihodHRwczovL2lkcC5yc21pdGgub3JnLnVr
-						L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB1ail1hpHiTjeZAfW4
-						m3KGnnLZEUAV9CKIHrVYjRpQdJeUyHUm86ceKglML3S5EjSeQZrupCTQUzdU/z94
-						xOUGLxq/USPbwW4jFYIrDNta8qA8QsOwovFF94MP9Vk6bkt0LnzcdRvKN5WvB0KT
-						CasTgxcJaADA4UMkXXt0cnEYQhLRVa20SciTBieGAqfh1zT5M6y6zZP7kt2B2y2i
-						nu1p6UpFPXstwY7PlJUlHi2RRMF2WwbWxrgMuOwnFJqvxqFvbfCLsFC9CPNs5o3X
-						dAQ40T5IMDyhZ95T7NVp1jRGcFYAPNwrBTlYOq85hGwlae+5Ma1dzFqU79resaAs
-						QpNX
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rsmith.org.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rsmith.org.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rsmith.org.uk/idp/profile/SAML2/Redirect/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">rsmith.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUK9DEIGDv4Ff0Wi8/uvBeGd5eyBswDQYJKoZIhvcNAQEL
-						BQAwHDEaMBgGA1UEAwwRaWRwLnJzbWl0aC5vcmcudWswHhcNMTUwODI0MTQ1MTEy
-						WhcNMzUwODI0MTQ1MTEyWjAcMRowGAYDVQQDDBFpZHAucnNtaXRoLm9yZy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI7VQekyk7mtK2+Q3bBT1yor
-						LI0EaCfn/iv/+WiLUb46AlbeJ63js5lxnpN13PkA499rmchz1BoZ3TCgY4PORnVq
-						c1tm4FMvEE8J9PGwtzLNjXZRRKcVGH9m+uZD2rKpxCDr7RvVdECXn+Ef4IZuBjfX
-						cf7Av31JhwBFg8klqEYtSrNVkPuLzsZANB7TL7wwvmcXmwg/sAewFuKqn9tzGiRZ
-						Ft6TZckeHiZlFyxu67DZPkI2d+itSRczMiKOLLj1Su+5VkeWXA8DQtB7wNhQH53o
-						tvbLnoAHcgtxAyNLd/edsaUr12cDSwHutnXN0tvUyGZ2NJTWDl9l2+eOZS9oMkUC
-						AwEAAaNpMGcwHQYDVR0OBBYEFCMGVfANgpH28R39mgFLHtIqv68ZMEYGA1UdEQQ/
-						MD2CEWlkcC5yc21pdGgub3JnLnVrhihodHRwczovL2lkcC5yc21pdGgub3JnLnVr
-						L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAOHbNUtEcdeh4abEI9
-						Ow8UorELXPMs8SMEh8uNfWyT5qe3qQ3KvRKt3T7qTAWwxkD3spnnfKAVCm/5BIPQ
-						9BOjlsD/M11CoE3AgGvLTrComFyCUWp9ONtgyN+vG0vWOStfwaNyNAepL/MVyccD
-						6ERiSKKcUrAh5n/+PkA4uLnZTbfxF8RVaQfEHe19JOJyUEF6q2xVyeGMi0UiWvdU
-						ycMpGziHHivS+fp17vBSEm8bxtThUybNf9o3P+xvBcEaoStNsfzjxKBo56OFAqyV
-						p10apvU7O4BFOqWg+8deIyCGZoAHpTm22MeyoLo9LlCvXNdzYRwURxGq36jRnuCL
-						He9a
-					</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>
-						MIIDLzCCAhegAwIBAgIUYnvfoMBUueVONNjmaouAYnntwdUwDQYJKoZIhvcNAQEL
-						BQAwHDEaMBgGA1UEAwwRaWRwLnJzbWl0aC5vcmcudWswHhcNMTUwODI0MTQ1MTA4
-						WhcNMzUwODI0MTQ1MTA4WjAcMRowGAYDVQQDDBFpZHAucnNtaXRoLm9yZy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIGrUlYHovXJOZ98APwykmXr
-						J32JsQOzZGyc5CQ/ybyjdNwlmLDtxNcuqvXxaLPVQOKwx3v4lojTbwXTEUrqTev4
-						t/dUULCosCs2yAxM/qvVos2Eejc2HPpcRCK1RkEiM2Orfy2xtC72SG0/WYeG8XdJ
-						l8npWiUxWjRHAUhvKxqUQ65Yf7r4kN/kQd+IUAF85d3daIBBCt4Het2k8BDh9Oq3
-						bmMfn4QtPVJa006mLAFYu668atPcqQkw/M8vm8epMSWSeVJBJIznGKR+7Slhz7Za
-						qFtkBzp99Bf/IUF89TSuVC1TtVzTPBHu6Kq7Q0S1xtiz5TuWnzzDJJ5j4SzaXicC
-						AwEAAaNpMGcwHQYDVR0OBBYEFJdJhR6iLvVIYxNPBGvcGEMP0yg+MEYGA1UdEQQ/
-						MD2CEWlkcC5yc21pdGgub3JnLnVrhihodHRwczovL2lkcC5yc21pdGgub3JnLnVr
-						L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBlY8o7Xxvx1X2A9hVq
-						a6pubECXMGoKwEKaKPRCg0/MjHxMfNp+W1qry1U4dksY+zkZDYSUyi734evLerzZ
-						ldUBGWBa+0uRQfDZZs6+TUHqwe0C76p4q7gOF20Jpo8EJ6BID52su3IlR2S3GjLH
-						AY36CZ3REpahIC3KBvRq53o9ZI7jLX5IcYAbccptqwOI7PlZDekt0HHRu61KpVZk
-						lZBzsSHZrm4KkpmiOece1xC400Zq8/GLJ2F1kZaih0ugsN5qA2zKqqTJaAhyXwf3
-						LwRivthQNpAmJNymJsAPIh1vJ4DK2NxzIbtDEVOawuPgtb8ACjcpBbeVMmKrBRpE
-						RVjJ
-					</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>
-						MIIDLzCCAhegAwIBAgIUZzaEwAwF83jA7Z8vp4qVNNq1yD8wDQYJKoZIhvcNAQEL
-						BQAwHDEaMBgGA1UEAwwRaWRwLnJzbWl0aC5vcmcudWswHhcNMTUwODI0MTQ1MTA5
-						WhcNMzUwODI0MTQ1MTA5WjAcMRowGAYDVQQDDBFpZHAucnNtaXRoLm9yZy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIggh2f64Q4fwbdSkvzdh07w
-						zeJnTgO2WmzFBJK+P1K8WloxxS4OkeX6cCPgPChmRUBUF1CXNXFyPI0iO4SreJUo
-						09CDo5Jm6n3NKqzxBzDrzDBS3Y2QO5qir55BkDli73+PLDMt58w78sqzFa8vyK9r
-						3j2ZfibIzVDfXuQCvvqeb0l8ltRHauV1anHwAm2yQVSj0ZQd77G6lPtt9dzS/M/i
-						U5SRnYwGJuGcVK+XPafIhbKLyou89W0IpZqN6/QZAc3GuF+k5e25+ux17Qn9m75b
-						CT9OEbFRGUds06VADsSwSYD/NugyeOaHsIx2lQg+aaBMC/VAf/NUVXYKNw9CuvEC
-						AwEAAaNpMGcwHQYDVR0OBBYEFFmsU9OW5eFpKoVKccjaBY3i8R9rMEYGA1UdEQQ/
-						MD2CEWlkcC5yc21pdGgub3JnLnVrhihodHRwczovL2lkcC5yc21pdGgub3JnLnVr
-						L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB1ail1hpHiTjeZAfW4
-						m3KGnnLZEUAV9CKIHrVYjRpQdJeUyHUm86ceKglML3S5EjSeQZrupCTQUzdU/z94
-						xOUGLxq/USPbwW4jFYIrDNta8qA8QsOwovFF94MP9Vk6bkt0LnzcdRvKN5WvB0KT
-						CasTgxcJaADA4UMkXXt0cnEYQhLRVa20SciTBieGAqfh1zT5M6y6zZP7kt2B2y2i
-						nu1p6UpFPXstwY7PlJUlHi2RRMF2WwbWxrgMuOwnFJqvxqFvbfCLsFC9CPNs5o3X
-						dAQ40T5IMDyhZ95T7NVp1jRGcFYAPNwrBTlYOq85hGwlae+5Ma1dzFqU79resaAs
-						QpNX
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rsmith.org.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Rhys Smith</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Rhys Smith</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rsmith.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rhys</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:rhys@rsmith.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rhys</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:rhys@rsmith.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ruskin.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.ruskin.ac.uk-shibboleth.xml
deleted file mode 100644
index 37887cb1..00000000
--- a/swamid-interfederations-2.0/idp.ruskin.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://idp.ruskin.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Ruskin College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">ruskin.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjQCCQCeO7iggJ8z5DANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJH
-						QjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEXMBUGA1UE
-						ChMOUnVza2luIENvbGxlZ2UxGTAXBgNVBAMTEGlkcC5ydXNraW4uYWMudWswHhcN
-						MTIwNzEwMDk1MzQ0WhcNMzIwNzA1MDk1MzQ0WjBoMQswCQYDVQQGEwJHQjEUMBIG
-						A1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEXMBUGA1UEChMOUnVz
-						a2luIENvbGxlZ2UxGTAXBgNVBAMTEGlkcC5ydXNraW4uYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6+fdNYJiZH+zIfW6xLXXv5JNd/uJP8JQh
-						yfrPx2PmggxywfTrMKJdRPpKtAUqPXlSB7acLAjD0U3XErjzYttjt+qXJEU2YUks
-						gvwd7lJiIQXW5cf3LU14YySLpCbh/8dNQ1cmmwjQpAYA+vpYjckdOtL0qkt/7qMV
-						59crl8ZpMpXusWIq2aZLlHU+Gf21Ez18O+aCkSj4vpcjyFc75YPZFNvDkRdccTtg
-						nHxMB3k2ddm8IGbK4VlWymZZWxyl+fNilP0Yqs0OFdCOO6Uo15N60CXw+LcfGhKh
-						hntFJ9+9Z4MEAxKQanezzF2C9VtSHuni1Q5CiQWLXMEgzshgkSO3AgMBAAEwDQYJ
-						KoZIhvcNAQEFBQADggEBAC/xMtV84acTdAf98Pw7W2IGdi3dUXErdQkkmGMPxC/v
-						WJcHbF5+WMozmWSdvci6XhipnxiHWbepsTrpqX4hp83fBb/H7F2NxKHD9VQXLb9m
-						xn4sLVWIE/+JLYYGEMupR71JoPwqNEig2Of8H2Oe8/CNYS6IT0w+18ZbLKRfGEFV
-						TUk4x96tPFm4+ARUZ8ZWeX2p8eCCicfm8UaShK8DQI3jELAkaSJvd1Pq5ZWrQxbj
-						+ZwcGmKwLJavwEiBhafJxXrup5yvzIPOzW0skgpxK2jcfQqWO8I90dF7eqKDaUYW
-						139vmCjkaZwlSi/F6jOBEEseHoL4lXr//gWKExA6bhk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ruskin.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ruskin.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.ruskin.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ruskin.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ruskin.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ruskin.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">ruskin.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjQCCQCeO7iggJ8z5DANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJH
-						QjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEXMBUGA1UE
-						ChMOUnVza2luIENvbGxlZ2UxGTAXBgNVBAMTEGlkcC5ydXNraW4uYWMudWswHhcN
-						MTIwNzEwMDk1MzQ0WhcNMzIwNzA1MDk1MzQ0WjBoMQswCQYDVQQGEwJHQjEUMBIG
-						A1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEXMBUGA1UEChMOUnVz
-						a2luIENvbGxlZ2UxGTAXBgNVBAMTEGlkcC5ydXNraW4uYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6+fdNYJiZH+zIfW6xLXXv5JNd/uJP8JQh
-						yfrPx2PmggxywfTrMKJdRPpKtAUqPXlSB7acLAjD0U3XErjzYttjt+qXJEU2YUks
-						gvwd7lJiIQXW5cf3LU14YySLpCbh/8dNQ1cmmwjQpAYA+vpYjckdOtL0qkt/7qMV
-						59crl8ZpMpXusWIq2aZLlHU+Gf21Ez18O+aCkSj4vpcjyFc75YPZFNvDkRdccTtg
-						nHxMB3k2ddm8IGbK4VlWymZZWxyl+fNilP0Yqs0OFdCOO6Uo15N60CXw+LcfGhKh
-						hntFJ9+9Z4MEAxKQanezzF2C9VtSHuni1Q5CiQWLXMEgzshgkSO3AgMBAAEwDQYJ
-						KoZIhvcNAQEFBQADggEBAC/xMtV84acTdAf98Pw7W2IGdi3dUXErdQkkmGMPxC/v
-						WJcHbF5+WMozmWSdvci6XhipnxiHWbepsTrpqX4hp83fBb/H7F2NxKHD9VQXLb9m
-						xn4sLVWIE/+JLYYGEMupR71JoPwqNEig2Of8H2Oe8/CNYS6IT0w+18ZbLKRfGEFV
-						TUk4x96tPFm4+ARUZ8ZWeX2p8eCCicfm8UaShK8DQI3jELAkaSJvd1Pq5ZWrQxbj
-						+ZwcGmKwLJavwEiBhafJxXrup5yvzIPOzW0skgpxK2jcfQqWO8I90dF7eqKDaUYW
-						139vmCjkaZwlSi/F6jOBEEseHoL4lXr//gWKExA6bhk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ruskin.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ruskin.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">Ruskin College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ruskin College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ruskin.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Bill</GivenName>
-    <SurName>Dewhurst</SurName>
-    <EmailAddress>mailto:bdewhrst@ruskin.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Bill</GivenName>
-    <SurName>Dewhurst</SurName>
-    <EmailAddress>mailto:bdewhrst@ruskin.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rvc.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.rvc.ac.uk-oala-metadata.xml
deleted file mode 100644
index cd9f9bac..00000000
--- a/swamid-interfederations-2.0/idp.rvc.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rvc.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the Royal Veterinary College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-04T14:01:49Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">rvc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIIBIqWvTgzVRkwDQYJKoZIhvcNAQEFBQAwOzEhMB8GA1UE
-						CgwYUm95YWwgVmV0ZXJpbmFyeSBDb2xsZWdlMRYwFAYDVQQDDA1pZHAucnZjLmFj
-						LnVrMB4XDTEyMDgxMzE0MzUyNloXDTIyMDgxMzE0MzUyNlowOzEhMB8GA1UECgwY
-						Um95YWwgVmV0ZXJpbmFyeSBDb2xsZWdlMRYwFAYDVQQDDA1pZHAucnZjLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiKaZ4qU3nGrCoSb9sRkt
-						k/X+131piJUW54UzIR1KPYpQNJgzImdApDSiS4AS60riPIC63PgE/DQg/F2jJRW+
-						S5Sey9Ov20zHIDvKnLJGNC562o+AJ9ycvstXK4fWxRDQTTcUxs0bBiLxgbA1rjNe
-						nw0/yP0EBEc59EhEszgV1B7lQ99AbxXaW3v7cpdsHd3m1+RAaNbnF34XI/SBs4dE
-						bqMH6+5vaBj7d25Qh+O56g/nFK+Za/GrywK8OYJETCCmKTJaDX2KrSWr8GhhCvpH
-						+nxY9AgN8wBF2nC35/0UvHLISvPjHXpCplEqHQ0xHHDsRsv7IVP92a4nimfidNK2
-						8QIDAQABo1AwTjAdBgNVHQ4EFgQUE+HRdHMYPXdEVqlkV13ulYgAJDUwHwYDVR0j
-						BBgwFoAUE+HRdHMYPXdEVqlkV13ulYgAJDUwDAYDVR0TBAUwAwEB/zANBgkqhkiG
-						9w0BAQUFAAOCAQEAD1RaAUKsoucwIWhuX/fXoKvn989YfmBONOGxXJJMLtG9S0/F
-						TRYEPKT0BaKmQvha1NH1Foeo0Qr5PsCyWWA3hUWeNHOwvcBRedzqicf6aYHXRNCB
-						97YK7WEgUNmbzwxiURun+hBNuBKGQgIfJ960HCHt1JneI8rz8I2d0KN9Y5NrUrBB
-						C9E7CL5PvOVAk5ryPt9nnqUH8+lpiWGBftZv45dh0UjsCIkJa4e0eUUQzJo57agJ
-						nk0Yl612TV8ifddkDqmIV6C7iExDA5vZp7VxagIbt7GF8c8ER2nmfp9RKB7Kv8ci
-						hh4lW/+CyvCPkKidV/SU/saCVq78gF2/0QF16w==
-					</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>
-						MIIDSDCCAjCgAwIBAgIIBIqWvTgzVRkwDQYJKoZIhvcNAQEFBQAwOzEhMB8GA1UE
-						CgwYUm95YWwgVmV0ZXJpbmFyeSBDb2xsZWdlMRYwFAYDVQQDDA1pZHAucnZjLmFj
-						LnVrMB4XDTEyMDgxMzE0MzUyNloXDTIyMDgxMzE0MzUyNlowOzEhMB8GA1UECgwY
-						Um95YWwgVmV0ZXJpbmFyeSBDb2xsZWdlMRYwFAYDVQQDDA1pZHAucnZjLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiKaZ4qU3nGrCoSb9sRkt
-						k/X+131piJUW54UzIR1KPYpQNJgzImdApDSiS4AS60riPIC63PgE/DQg/F2jJRW+
-						S5Sey9Ov20zHIDvKnLJGNC562o+AJ9ycvstXK4fWxRDQTTcUxs0bBiLxgbA1rjNe
-						nw0/yP0EBEc59EhEszgV1B7lQ99AbxXaW3v7cpdsHd3m1+RAaNbnF34XI/SBs4dE
-						bqMH6+5vaBj7d25Qh+O56g/nFK+Za/GrywK8OYJETCCmKTJaDX2KrSWr8GhhCvpH
-						+nxY9AgN8wBF2nC35/0UvHLISvPjHXpCplEqHQ0xHHDsRsv7IVP92a4nimfidNK2
-						8QIDAQABo1AwTjAdBgNVHQ4EFgQUE+HRdHMYPXdEVqlkV13ulYgAJDUwHwYDVR0j
-						BBgwFoAUE+HRdHMYPXdEVqlkV13ulYgAJDUwDAYDVR0TBAUwAwEB/zANBgkqhkiG
-						9w0BAQUFAAOCAQEAD1RaAUKsoucwIWhuX/fXoKvn989YfmBONOGxXJJMLtG9S0/F
-						TRYEPKT0BaKmQvha1NH1Foeo0Qr5PsCyWWA3hUWeNHOwvcBRedzqicf6aYHXRNCB
-						97YK7WEgUNmbzwxiURun+hBNuBKGQgIfJ960HCHt1JneI8rz8I2d0KN9Y5NrUrBB
-						C9E7CL5PvOVAk5ryPt9nnqUH8+lpiWGBftZv45dh0UjsCIkJa4e0eUUQzJo57agJ
-						nk0Yl612TV8ifddkDqmIV6C7iExDA5vZp7VxagIbt7GF8c8ER2nmfp9RKB7Kv8ci
-						hh4lW/+CyvCPkKidV/SU/saCVq78gF2/0QF16w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rvc.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rvc.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Royal Veterinary College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Veterinary College: OpenAthens LA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rvc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alison</GivenName>
-    <SurName>Shearer</SurName>
-    <EmailAddress>mailto:ashearer@rvc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alison</GivenName>
-    <SurName>Shearer</SurName>
-    <EmailAddress>mailto:ashearer@rvc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.rz.uni-hohenheim.de.xml b/swamid-interfederations-2.0/idp.rz.uni-hohenheim.de.xml
deleted file mode 100644
index bbd88d90..00000000
--- a/swamid-interfederations-2.0/idp.rz.uni-hohenheim.de.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.rz.uni-hohenheim.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hohenheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rz.uni-hohenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rz.uni-hohenheim.de,OU=Rechenzentrum (620),O=Universitaet Hohenheim,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIEDuJozTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRn
-YXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWltMSAwHgYDVQQDExdV
-bmkuIEhvaGVuaGVpbSBDQSAtIEcwMTEmMCQGCSqGSIb3DQEJARYXcnotcGtpQHVu
-aS1ob2hlbmhlaW0uZGUwHhcNMDkwOTMwMDUyMzA5WhcNMTQwOTI5MDUyMzA5WjCB
-nzELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
-A1UEBxMJU3R1dHRnYXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWlt
-MRwwGgYDVQQLExNSZWNoZW56ZW50cnVtICg2MjApMSAwHgYDVQQDExdpZHAucnou
-dW5pLWhvaGVuaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxMw/ldmqZDM19RlzHiAuVfiMk8yIsdCgU7G2GmtV45Usv81yXZTLf46nwr7P75
-CziDH4K8/kmir0lwHGL0m4T8R+WoV37yKtvcTxxxZdZGdgvjEJss50H7es9AqObC
-SYDw3QsjNuvaWrm9jQQkmF3u4r4GajIUluiU1MmJxvqj4db0EnkzUwcHivuYeC2h
-Krp86el0mUQZiejMUv86JP63FDsPG8fBHmfsOp5oZE/sJOfQ5Ykgai8n9d1c3Rbg
-Uenoyd4Lt1FxmakbY8nKKgFkcwYx13CLGWistanim/mpIMlUo5aDRprMg5dC+ygy
-iP5BzzWT2A3zhg361YPX2W0CAwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-UgPmAwUuKWYh3nL8paIQOiaN4w8wHwYDVR0jBBgwFoAUJbV5duaENMVQY5xBIQFE
-/v0Pm/EwLQYDVR0RBCYwJIEic3RlZmZlbi5idWVjaGVsZXJAdW5pLWhvaGVuaGVp
-bS5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1ob2hlbmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVu
-aGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AKVM9JL7FQ6AvVhbb7cU248DZvTlD7CL2YJ1H9TPWFYa5d/m2pgJRDQ8lKAd4l27
-OX3ZkNIQS6ThmJhcLqXtUmYMCgPNdFtHAJhLszD5qoZ9jD1unUghQTOP5xEeVG5m
-S8USEOusWsdfwPZu9NQlw91tPgomt64Nupd5DQ7AbhYuZunRwzNL24RF9DmJ2tER
-XKULN6l67W3YgsnR/qj/eFkwds1Cefa0LLjsyBgKNZgICpOCsz/4VIzv01n2ibO/
-KrgAiMGIFx87flkleWB2gV28iHM4wLHDWLZv7KL9sXNJoTXhVdecun+AQ1IZNNWt
-dQrQJapTFuFmBHtINb8rzGQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rz.uni-hohenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rz.uni-hohenheim.de,OU=Rechenzentrum (620),O=Universitaet Hohenheim,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIEDuJozTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRn
-YXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWltMSAwHgYDVQQDExdV
-bmkuIEhvaGVuaGVpbSBDQSAtIEcwMTEmMCQGCSqGSIb3DQEJARYXcnotcGtpQHVu
-aS1ob2hlbmhlaW0uZGUwHhcNMDkwOTMwMDUyMzA5WhcNMTQwOTI5MDUyMzA5WjCB
-nzELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
-A1UEBxMJU3R1dHRnYXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWlt
-MRwwGgYDVQQLExNSZWNoZW56ZW50cnVtICg2MjApMSAwHgYDVQQDExdpZHAucnou
-dW5pLWhvaGVuaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxMw/ldmqZDM19RlzHiAuVfiMk8yIsdCgU7G2GmtV45Usv81yXZTLf46nwr7P75
-CziDH4K8/kmir0lwHGL0m4T8R+WoV37yKtvcTxxxZdZGdgvjEJss50H7es9AqObC
-SYDw3QsjNuvaWrm9jQQkmF3u4r4GajIUluiU1MmJxvqj4db0EnkzUwcHivuYeC2h
-Krp86el0mUQZiejMUv86JP63FDsPG8fBHmfsOp5oZE/sJOfQ5Ykgai8n9d1c3Rbg
-Uenoyd4Lt1FxmakbY8nKKgFkcwYx13CLGWistanim/mpIMlUo5aDRprMg5dC+ygy
-iP5BzzWT2A3zhg361YPX2W0CAwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-UgPmAwUuKWYh3nL8paIQOiaN4w8wHwYDVR0jBBgwFoAUJbV5duaENMVQY5xBIQFE
-/v0Pm/EwLQYDVR0RBCYwJIEic3RlZmZlbi5idWVjaGVsZXJAdW5pLWhvaGVuaGVp
-bS5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1ob2hlbmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVu
-aGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AKVM9JL7FQ6AvVhbb7cU248DZvTlD7CL2YJ1H9TPWFYa5d/m2pgJRDQ8lKAd4l27
-OX3ZkNIQS6ThmJhcLqXtUmYMCgPNdFtHAJhLszD5qoZ9jD1unUghQTOP5xEeVG5m
-S8USEOusWsdfwPZu9NQlw91tPgomt64Nupd5DQ7AbhYuZunRwzNL24RF9DmJ2tER
-XKULN6l67W3YgsnR/qj/eFkwds1Cefa0LLjsyBgKNZgICpOCsz/4VIzv01n2ibO/
-KrgAiMGIFx87flkleWB2gV28iHM4wLHDWLZv7KL9sXNJoTXhVdecun+AQ1IZNNWt
-dQrQJapTFuFmBHtINb8rzGQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rz.uni-hohenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rz.uni-hohenheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.rz.uni-hohenheim.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.rz.uni-hohenheim.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.rz.uni-hohenheim.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hohenheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rz.uni-hohenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rz.uni-hohenheim.de,OU=Rechenzentrum (620),O=Universitaet Hohenheim,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIEDuJozTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRn
-YXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWltMSAwHgYDVQQDExdV
-bmkuIEhvaGVuaGVpbSBDQSAtIEcwMTEmMCQGCSqGSIb3DQEJARYXcnotcGtpQHVu
-aS1ob2hlbmhlaW0uZGUwHhcNMDkwOTMwMDUyMzA5WhcNMTQwOTI5MDUyMzA5WjCB
-nzELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
-A1UEBxMJU3R1dHRnYXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWlt
-MRwwGgYDVQQLExNSZWNoZW56ZW50cnVtICg2MjApMSAwHgYDVQQDExdpZHAucnou
-dW5pLWhvaGVuaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxMw/ldmqZDM19RlzHiAuVfiMk8yIsdCgU7G2GmtV45Usv81yXZTLf46nwr7P75
-CziDH4K8/kmir0lwHGL0m4T8R+WoV37yKtvcTxxxZdZGdgvjEJss50H7es9AqObC
-SYDw3QsjNuvaWrm9jQQkmF3u4r4GajIUluiU1MmJxvqj4db0EnkzUwcHivuYeC2h
-Krp86el0mUQZiejMUv86JP63FDsPG8fBHmfsOp5oZE/sJOfQ5Ykgai8n9d1c3Rbg
-Uenoyd4Lt1FxmakbY8nKKgFkcwYx13CLGWistanim/mpIMlUo5aDRprMg5dC+ygy
-iP5BzzWT2A3zhg361YPX2W0CAwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-UgPmAwUuKWYh3nL8paIQOiaN4w8wHwYDVR0jBBgwFoAUJbV5duaENMVQY5xBIQFE
-/v0Pm/EwLQYDVR0RBCYwJIEic3RlZmZlbi5idWVjaGVsZXJAdW5pLWhvaGVuaGVp
-bS5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1ob2hlbmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVu
-aGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AKVM9JL7FQ6AvVhbb7cU248DZvTlD7CL2YJ1H9TPWFYa5d/m2pgJRDQ8lKAd4l27
-OX3ZkNIQS6ThmJhcLqXtUmYMCgPNdFtHAJhLszD5qoZ9jD1unUghQTOP5xEeVG5m
-S8USEOusWsdfwPZu9NQlw91tPgomt64Nupd5DQ7AbhYuZunRwzNL24RF9DmJ2tER
-XKULN6l67W3YgsnR/qj/eFkwds1Cefa0LLjsyBgKNZgICpOCsz/4VIzv01n2ibO/
-KrgAiMGIFx87flkleWB2gV28iHM4wLHDWLZv7KL9sXNJoTXhVdecun+AQ1IZNNWt
-dQrQJapTFuFmBHtINb8rzGQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.rz.uni-hohenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.rz.uni-hohenheim.de,OU=Rechenzentrum (620),O=Universitaet Hohenheim,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFrTCCBJWgAwIBAgIEDuJozTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRn
-YXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWltMSAwHgYDVQQDExdV
-bmkuIEhvaGVuaGVpbSBDQSAtIEcwMTEmMCQGCSqGSIb3DQEJARYXcnotcGtpQHVu
-aS1ob2hlbmhlaW0uZGUwHhcNMDkwOTMwMDUyMzA5WhcNMTQwOTI5MDUyMzA5WjCB
-nzELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAG
-A1UEBxMJU3R1dHRnYXJ0MR8wHQYDVQQKExZVbml2ZXJzaXRhZXQgSG9oZW5oZWlt
-MRwwGgYDVQQLExNSZWNoZW56ZW50cnVtICg2MjApMSAwHgYDVQQDExdpZHAucnou
-dW5pLWhvaGVuaGVpbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALxMw/ldmqZDM19RlzHiAuVfiMk8yIsdCgU7G2GmtV45Usv81yXZTLf46nwr7P75
-CziDH4K8/kmir0lwHGL0m4T8R+WoV37yKtvcTxxxZdZGdgvjEJss50H7es9AqObC
-SYDw3QsjNuvaWrm9jQQkmF3u4r4GajIUluiU1MmJxvqj4db0EnkzUwcHivuYeC2h
-Krp86el0mUQZiejMUv86JP63FDsPG8fBHmfsOp5oZE/sJOfQ5Ykgai8n9d1c3Rbg
-Uenoyd4Lt1FxmakbY8nKKgFkcwYx13CLGWistanim/mpIMlUo5aDRprMg5dC+ygy
-iP5BzzWT2A3zhg361YPX2W0CAwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-UgPmAwUuKWYh3nL8paIQOiaN4w8wHwYDVR0jBBgwFoAUJbV5duaENMVQY5xBIQFE
-/v0Pm/EwLQYDVR0RBCYwJIEic3RlZmZlbi5idWVjaGVsZXJAdW5pLWhvaGVuaGVp
-bS5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3VuaS1ob2hlbmhlaW0tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLWhvaGVuaGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWhvaGVu
-aGVpbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AKVM9JL7FQ6AvVhbb7cU248DZvTlD7CL2YJ1H9TPWFYa5d/m2pgJRDQ8lKAd4l27
-OX3ZkNIQS6ThmJhcLqXtUmYMCgPNdFtHAJhLszD5qoZ9jD1unUghQTOP5xEeVG5m
-S8USEOusWsdfwPZu9NQlw91tPgomt64Nupd5DQ7AbhYuZunRwzNL24RF9DmJ2tER
-XKULN6l67W3YgsnR/qj/eFkwds1Cefa0LLjsyBgKNZgICpOCsz/4VIzv01n2ibO/
-KrgAiMGIFx87flkleWB2gV28iHM4wLHDWLZv7KL9sXNJoTXhVdecun+AQ1IZNNWt
-dQrQJapTFuFmBHtINb8rzGQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.rz.uni-hohenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.rz.uni-hohenheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Hohenheim</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Hohenheim</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.uni-hohenheim.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Steffen</GivenName>
-    <SurName>Bücheler</SurName>
-    <EmailAddress>stb@uni-hohenheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steffen</GivenName>
-    <SurName>Bücheler</SurName>
-    <EmailAddress>stb@uni-hohenheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Björn</GivenName>
-    <SurName>Breiner</SurName>
-    <EmailAddress>bjoern.breiner@uni-hohenheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sandwell.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sandwell.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index f0900fe4..00000000
--- a/swamid-interfederations-2.0/idp.sandwell.ac.uk-idp-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://idp.sandwell.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Sandwell College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">sandwell.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAPG65DBJJFPh5Jipeuryxop1mT/zMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5zYW5kd2VsbC5hYy51azAeFw0xMjExMjgxMjQ3
-						MDFaFw0zMjExMjgxMjQ3MDFaMB0xGzAZBgNVBAMTEmlkcC5zYW5kd2VsbC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIAfYb8Pu2uYwPgeHKrf
-						lPAMO1suHci3KBE5i22esUbqgDb7THIbKO8Hbd+z9tdphWZc6PhmEFeOwD0BE/qO
-						hDlRj9NwqggXezX5ecLWIR4/oYku5O8AD2B6DeksDdUX/zbaDeyDa/guxMbMLzJj
-						PNzS0QR2/wId7sZOnMGhAzyUnMokziGb5H3w0qv121bywNxCBncJpY83RwSy5D14
-						0bsDxkWWwaHTFy3bl9Nl28WfcC294UOIMO/5y2BW6oWGfPo9Bkl4+/Co8Agidk2Q
-						MRWVzp6vtYBWVYASGYmNDw4uiyJ+A+sV3YNCTDwqiuqesPR2saqzIrxjYfYcapJg
-						+gcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNhbmR3ZWxsLmFjLnVrhilodHRw
-						czovL2lkcC5zYW5kd2VsbC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						hFHU5vFeYLlzBNR6FTzu937oV18wDQYJKoZIhvcNAQEFBQADggEBADx5fmZ91UY0
-						UljRC24uNiX0nHOmAwVZDDUdO7UUkTboKh2u+AmiLEAh/3hX4S3GnYKW8p0Q0QNS
-						32eDTMKf/7SWfflBVIhEUWo8DN4rZF4iL7Qoc7DiLt9QtQAPLlRGdenASN6WHpab
-						nH6mBdrLtGZ+EKS6H9DE1+9JVib+CUnLYbzfiWfCXrzHQa2/1GPi8H3vLsC0+s/y
-						xt4afWbbFiZgb0Jkj51pYOzvBJXeHuea8BvlfRb+2KalvimeFsCb2Vd+cmoewYMo
-						HXt7U0zNsoKb3p7Jbx5SlDztMdz52mSSYLa4SuFbE1u6ooMYb7lFWfL1rlDv0SiT
-						MA3XVUiG45c=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sandwell.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sandwell.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.sandwell.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sandwell.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sandwell.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sandwell.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">sandwell.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAPG65DBJJFPh5Jipeuryxop1mT/zMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5zYW5kd2VsbC5hYy51azAeFw0xMjExMjgxMjQ3
-						MDFaFw0zMjExMjgxMjQ3MDFaMB0xGzAZBgNVBAMTEmlkcC5zYW5kd2VsbC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIAfYb8Pu2uYwPgeHKrf
-						lPAMO1suHci3KBE5i22esUbqgDb7THIbKO8Hbd+z9tdphWZc6PhmEFeOwD0BE/qO
-						hDlRj9NwqggXezX5ecLWIR4/oYku5O8AD2B6DeksDdUX/zbaDeyDa/guxMbMLzJj
-						PNzS0QR2/wId7sZOnMGhAzyUnMokziGb5H3w0qv121bywNxCBncJpY83RwSy5D14
-						0bsDxkWWwaHTFy3bl9Nl28WfcC294UOIMO/5y2BW6oWGfPo9Bkl4+/Co8Agidk2Q
-						MRWVzp6vtYBWVYASGYmNDw4uiyJ+A+sV3YNCTDwqiuqesPR2saqzIrxjYfYcapJg
-						+gcCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnNhbmR3ZWxsLmFjLnVrhilodHRw
-						czovL2lkcC5zYW5kd2VsbC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						hFHU5vFeYLlzBNR6FTzu937oV18wDQYJKoZIhvcNAQEFBQADggEBADx5fmZ91UY0
-						UljRC24uNiX0nHOmAwVZDDUdO7UUkTboKh2u+AmiLEAh/3hX4S3GnYKW8p0Q0QNS
-						32eDTMKf/7SWfflBVIhEUWo8DN4rZF4iL7Qoc7DiLt9QtQAPLlRGdenASN6WHpab
-						nH6mBdrLtGZ+EKS6H9DE1+9JVib+CUnLYbzfiWfCXrzHQa2/1GPi8H3vLsC0+s/y
-						xt4afWbbFiZgb0Jkj51pYOzvBJXeHuea8BvlfRb+2KalvimeFsCb2Vd+cmoewYMo
-						HXt7U0zNsoKb3p7Jbx5SlDztMdz52mSSYLa4SuFbE1u6ooMYb7lFWfL1rlDv0SiT
-						MA3XVUiG45c=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sandwell.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sandwell.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">Sandwell College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sandwell College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sandwell.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Network Operations</GivenName>
-    <EmailAddress>mailto:operations@sandwell.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Network Operations</GivenName>
-    <EmailAddress>mailto:operations@sandwell.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sanger.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sanger.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 2275358a..00000000
--- a/swamid-interfederations-2.0/idp.sanger.ac.uk-idp-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://idp.sanger.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Wellcome Trust Sanger Institute" Shibboleth IdP for Genome Research Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-13T11:49: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">sanger.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAKQYJxHECH4G5xoOCxtCz43WOfkYMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC5zYW5nZXIuYWMudWswHhcNMTQwMzI3MTMyMDM0
-						WhcNMzQwMzI3MTIyMDM0WjAbMRkwFwYDVQQDExBpZHAuc2FuZ2VyLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsoZnFVTzScX4KleGsZ0R2/5d
-						E/ab+OrE9bttogijThDmtzzV/2hgkrOspcBHB/g1FzZfaCV5yMBG52W7mGurS6kR
-						F+q7uPhB3UJSoXwUz8tN7w1ZK6MHC8Cwy/nJfsbOhA4kTtk9r+6KFORBh8ek3KPq
-						RkNyDhhEYcIgK5HokuweVGjPWjmGFa7JKRhpnU9V1RnJY7coprT/3IxcJUfvpRam
-						bvYwZfP1VTMj4ia0kFrE6drOArfhq2MZupwN+YxmxXmv75vL2Xblxfrmk0BwHYs5
-						q5hcG75VSCZVeKlDEooPbb5IKjRM9J+ymKlfFyqZbUlkUJyBzHRz+hctqifrZwID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuc2FuZ2VyLmFjLnVrhidodHRwczovL2lk
-						cC5zYW5nZXIuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAl/k8y3QBmG
-						QV6XLFD9CSGFEOC7MA0GCSqGSIb3DQEBBQUAA4IBAQAEn6x7S/SeKxMLZUDkFXuV
-						f9Wv7z5UJ/2Xi4FyQDG+l0QCb+tVeMid1IU1EIuPQWsoWcpl/w9rXpHY2yHxBafA
-						VcHurzix2tquXbfQdrg/gBkwaDVAh/xmr6qhpz9vVyxH4JzUuMg5KFOOKI2UewE8
-						7aPjhhuWkozRDbcDd76EtyJIaknSjRlw6uncnY2JJLITzWnndFxCgZgiyWew6HGp
-						dnZI4GN5IWgtKyLa4PrxWjtPPt+JTbx2iaclyk7AUlB1bN02JZF0BlW35oygFZLd
-						e1ezwFWxhm6gCPNfBWDWNeRZBidDsz193MDbIS/mWBzyAYXot1TxBRXiBeXbaWmB
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sanger.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sanger.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.sanger.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sanger.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sanger.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sanger.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">sanger.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAKQYJxHECH4G5xoOCxtCz43WOfkYMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC5zYW5nZXIuYWMudWswHhcNMTQwMzI3MTMyMDM0
-						WhcNMzQwMzI3MTIyMDM0WjAbMRkwFwYDVQQDExBpZHAuc2FuZ2VyLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsoZnFVTzScX4KleGsZ0R2/5d
-						E/ab+OrE9bttogijThDmtzzV/2hgkrOspcBHB/g1FzZfaCV5yMBG52W7mGurS6kR
-						F+q7uPhB3UJSoXwUz8tN7w1ZK6MHC8Cwy/nJfsbOhA4kTtk9r+6KFORBh8ek3KPq
-						RkNyDhhEYcIgK5HokuweVGjPWjmGFa7JKRhpnU9V1RnJY7coprT/3IxcJUfvpRam
-						bvYwZfP1VTMj4ia0kFrE6drOArfhq2MZupwN+YxmxXmv75vL2Xblxfrmk0BwHYs5
-						q5hcG75VSCZVeKlDEooPbb5IKjRM9J+ymKlfFyqZbUlkUJyBzHRz+hctqifrZwID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAuc2FuZ2VyLmFjLnVrhidodHRwczovL2lk
-						cC5zYW5nZXIuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAl/k8y3QBmG
-						QV6XLFD9CSGFEOC7MA0GCSqGSIb3DQEBBQUAA4IBAQAEn6x7S/SeKxMLZUDkFXuV
-						f9Wv7z5UJ/2Xi4FyQDG+l0QCb+tVeMid1IU1EIuPQWsoWcpl/w9rXpHY2yHxBafA
-						VcHurzix2tquXbfQdrg/gBkwaDVAh/xmr6qhpz9vVyxH4JzUuMg5KFOOKI2UewE8
-						7aPjhhuWkozRDbcDd76EtyJIaknSjRlw6uncnY2JJLITzWnndFxCgZgiyWew6HGp
-						dnZI4GN5IWgtKyLa4PrxWjtPPt+JTbx2iaclyk7AUlB1bN02JZF0BlW35oygFZLd
-						e1ezwFWxhm6gCPNfBWDWNeRZBidDsz193MDbIS/mWBzyAYXot1TxBRXiBeXbaWmB
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sanger.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sanger.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">Genome Research Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Wellcome Trust Sanger Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sanger.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sanger Institute Systems Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@sanger.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Fraser</SurName>
-    <EmailAddress>mailto:srf@sanger.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sbcc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sbcc.edu-idp-shibboleth.xml
deleted file mode 100644
index d8c6259e..00000000
--- a/swamid-interfederations-2.0/idp.sbcc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://idp.sbcc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">sbcc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Santa Barbara City College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Santa Barbara City College Shibboleth and CAS server</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.sbcc.edu/boardoftrustees/files/policies/AP%203720%20Electronic%20Communication%20Procedures.pdf</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>
-MIIDGzCCAgOgAwIBAgIUMMHZfx7g7KGhvDSG44Watjbf8nAwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnNiY2MuZWR1MB4XDTExMDMzMDIyMDY0MFoXDTMx
-MDMzMDIyMDY0MFowFzEVMBMGA1UEAxMMaWRwLnNiY2MuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnN6Qeae3fzGRYjbIsNuoubXFOkVBMxfmiMcJ
-uPqH7PD9/RIBXbma48lGpv3WeRCj9BBYP3hVwfiPWizfPDwyAO5PJo2zui8qy2Zl
-RdGOU2UI0JbrOVpEh+g/Xbr4P/EDdWVzMnUHvmIy6HW9i1rQ5qhLB5XXOjSM7Sv/
-/VisHiQ9+SyBhc7cayaWjcoLmSW+YDswLcy6GFQekEVyYXDwIUFiVXmT+uV98S3k
-DReV+SHQFPIR+vYofJqDYooYDFnLS0MAGtGzkO+VplZHo9AgEIK9QuqQ8LZ0nQ8J
-IyEUCqucCKcReLAY5DCNF+6pOwTFFGEV6Zpi8AtcYSdUriASWQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuc2JjYy5lZHWGI2h0dHBzOi8vaWRwLnNiY2MuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQgNUz2RZi0aiVIoJRvVBRop3HLuzANBgkq
-hkiG9w0BAQUFAAOCAQEAXLqTc1GdORqZeoYeclmR+RniXnTpqOfcLoTqMVRH3bpU
-DJqLgRWRLL3lreQlfrOo414xm7ubNFLWklC8/vwFadaKSRXRNSm3xc/kTd/18SKc
-YMfdmVSVhIsaS+y9G+Z4JcrogXNp9VU9JRKog0t5cngrOTyNMn1C3Raw4H2L9WkL
-mKGlFTzgPur0sqyyd86chFfmtkTvOPsTBaGuBoz4L9Pnl+moxlzMhQBC2Mxmr/FG
-eOKM7YKGt4+pqKx5cp4GeYWHYS8d0/XRF2vyCLwdLLOTai0cRqx+LRNtpEAV6z74
-QnbddsPUWZfmg0tNJbc8OhZPVC6Z0dq++C4sZqhJjw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sbcc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sbcc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sbcc.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sbcc.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sbcc.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sbcc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sbcc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sbcc.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbcc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUMMHZfx7g7KGhvDSG44Watjbf8nAwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnNiY2MuZWR1MB4XDTExMDMzMDIyMDY0MFoXDTMx
-MDMzMDIyMDY0MFowFzEVMBMGA1UEAxMMaWRwLnNiY2MuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnN6Qeae3fzGRYjbIsNuoubXFOkVBMxfmiMcJ
-uPqH7PD9/RIBXbma48lGpv3WeRCj9BBYP3hVwfiPWizfPDwyAO5PJo2zui8qy2Zl
-RdGOU2UI0JbrOVpEh+g/Xbr4P/EDdWVzMnUHvmIy6HW9i1rQ5qhLB5XXOjSM7Sv/
-/VisHiQ9+SyBhc7cayaWjcoLmSW+YDswLcy6GFQekEVyYXDwIUFiVXmT+uV98S3k
-DReV+SHQFPIR+vYofJqDYooYDFnLS0MAGtGzkO+VplZHo9AgEIK9QuqQ8LZ0nQ8J
-IyEUCqucCKcReLAY5DCNF+6pOwTFFGEV6Zpi8AtcYSdUriASWQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuc2JjYy5lZHWGI2h0dHBzOi8vaWRwLnNiY2MuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQgNUz2RZi0aiVIoJRvVBRop3HLuzANBgkq
-hkiG9w0BAQUFAAOCAQEAXLqTc1GdORqZeoYeclmR+RniXnTpqOfcLoTqMVRH3bpU
-DJqLgRWRLL3lreQlfrOo414xm7ubNFLWklC8/vwFadaKSRXRNSm3xc/kTd/18SKc
-YMfdmVSVhIsaS+y9G+Z4JcrogXNp9VU9JRKog0t5cngrOTyNMn1C3Raw4H2L9WkL
-mKGlFTzgPur0sqyyd86chFfmtkTvOPsTBaGuBoz4L9Pnl+moxlzMhQBC2Mxmr/FG
-eOKM7YKGt4+pqKx5cp4GeYWHYS8d0/XRF2vyCLwdLLOTai0cRqx+LRNtpEAV6z74
-QnbddsPUWZfmg0tNJbc8OhZPVC6Z0dq++C4sZqhJjw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sbcc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Santa Barbara City College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Santa Barbara City College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sbcc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michael Ghens</md:GivenName>
-    <md:EmailAddress>mghens@sbcc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ae615fde..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.scc.kit.edu/idp/shibboleth">
-  <md: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>
-  </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">kit.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.kit.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">partner.kit.edu</shibmd: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>
-    </md:Extensions>
-    <md: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>MIIF6TCCBNGgAwIBAgIHGJJryAQp3DANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
-bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
-Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
-A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTE0MTEy
-NDA4MzcxMloXDTE3MTEyMzA4MzcxMlowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQI
-ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
-ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9p
-ZHAuc2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6
-SHeWNp6zK1meHCSku8F6Rs84KD5YambNl7LzwA1ZyVhi37WUHXVOwzqTVJy546ch
-fJbnj1KdEVMXEd0J9wsxkOBWv99y8l9GQgzUBI0foAqSs6AQgjtmhSuAHG8UN1W8
-D54hTZcoIO6woH1L+Q8Se8X9P6O6JTaEY1xVKWfnc34mMAZ6FYNKclTG9usp4Tk5
-EVDF3rIrI1kAJ28nbm1S3CfW0w8P/HoN9/l26vs2zGaZiSGcdd+ybTd8zzyUQjh+
-Ef+K7tvB6dAjEdJ/9Eles0qVubR4M9mw/wxZvuuPvDbKdAmMub1ssdaaA1AnbENd
-H0CecJNRV32EhR3xrxb1AgMBAAGjggIhMIICHTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAzARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAK
-BggrBgEFBQcDATAdBgNVHQ4EFgQUN64AGeNb/L86LwUaKdRer24/bF4wHwYDVR0j
-BBgwFoAUH3Rl9JodevYx6d9hG3MrDW3QM0kwGgYDVR0RBBMwEYIPaWRwLnNjYy5r
-aXQuZWR1MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-a2l0LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUHAQEEgbow
-gbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2
-ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQt
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQELBQADggEBABB39faqcheKsMJKV7+AXlPHnwZNU08qsJljqAWZiJYR9oBA
-u/4CtsIBiP3ze7N8yqD0QSGS1vgUZAhUfK+lVqJJ489NEPZJ+BXNKzyeDuBA8mDf
-OYnlKhPiKVdWNIZGRYMg0QucuomhNF6I1rqUti3f0DB0KRhsGAZ6x9I3XYf13Ysd
-uk6L8FgX8L8oIsCafeAx9d2J/DozuHzpl1sAozMbjko6oFQS+jefrshY/8sOrC2Z
-/Qu/RelkUt/17g7WYLHI2CQ/TWjYDe+tPKaLoCrUqNV1Se3pm/f0lcsOrOdNJXp/
-DDtygfMFcJ7uU7YOIBUyd7s1m23ZZzi6HkTPEtM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.scc.kit.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scc.kit.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu/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">kit.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.kit.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">partner.kit.edu</shibmd:Scope>
-    </md:Extensions>
-    <md: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>MIIF6TCCBNGgAwIBAgIHGJJryAQp3DANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
-bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
-Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
-A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTE0MTEy
-NDA4MzcxMloXDTE3MTEyMzA4MzcxMlowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQI
-ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
-ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9p
-ZHAuc2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6
-SHeWNp6zK1meHCSku8F6Rs84KD5YambNl7LzwA1ZyVhi37WUHXVOwzqTVJy546ch
-fJbnj1KdEVMXEd0J9wsxkOBWv99y8l9GQgzUBI0foAqSs6AQgjtmhSuAHG8UN1W8
-D54hTZcoIO6woH1L+Q8Se8X9P6O6JTaEY1xVKWfnc34mMAZ6FYNKclTG9usp4Tk5
-EVDF3rIrI1kAJ28nbm1S3CfW0w8P/HoN9/l26vs2zGaZiSGcdd+ybTd8zzyUQjh+
-Ef+K7tvB6dAjEdJ/9Eles0qVubR4M9mw/wxZvuuPvDbKdAmMub1ssdaaA1AnbENd
-H0CecJNRV32EhR3xrxb1AgMBAAGjggIhMIICHTBPBgNVHSAESDBGMBEGDysGAQQB
-ga0hgiwBAQQDAzARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
-BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAK
-BggrBgEFBQcDATAdBgNVHQ4EFgQUN64AGeNb/L86LwUaKdRer24/bF4wHwYDVR0j
-BBgwFoAUH3Rl9JodevYx6d9hG3MrDW3QM0kwGgYDVR0RBBMwEYIPaWRwLnNjYy5r
-aXQuZWR1MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-a2l0LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUHAQEEgbow
-gbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2
-ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQt
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQELBQADggEBABB39faqcheKsMJKV7+AXlPHnwZNU08qsJljqAWZiJYR9oBA
-u/4CtsIBiP3ze7N8yqD0QSGS1vgUZAhUfK+lVqJJ489NEPZJ+BXNKzyeDuBA8mDf
-OYnlKhPiKVdWNIZGRYMg0QucuomhNF6I1rqUti3f0DB0KRhsGAZ6x9I3XYf13Ysd
-uk6L8FgX8L8oIsCafeAx9d2J/DozuHzpl1sAozMbjko6oFQS+jefrshY/8sOrC2Z
-/Qu/RelkUt/17g7WYLHI2CQ/TWjYDe+tPKaLoCrUqNV1Se3pm/f0lcsOrOdNJXp/
-DDtygfMFcJ7uU7YOIBUyd7s1m23ZZzi6HkTPEtM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu: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">e148</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e148</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.scc.kit.edu/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.scc.kit.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michael</md:GivenName>
-    <md:SurName>Simon</md:SurName>
-    <md:EmailAddress>mailto:simon@kit.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sebastian</md:GivenName>
-    <md:SurName>Labitzke</md:SurName>
-    <md:EmailAddress>mailto:labitzke@kit.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SCC</md:GivenName>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@scc.kit.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.scc.kit.edu.xml b/swamid-interfederations-2.0/idp.scc.kit.edu.xml
deleted file mode 100644
index 4cb31e97..00000000
--- a/swamid-interfederations-2.0/idp.scc.kit.edu.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.scc.kit.edu/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTjCCBDagAwIBAgIEDumJaTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kx
-JzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0GA1UE
-AxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTA5MTAwNTE1
-MDgxMFoXDTEyMTAwNDE1MDgxMFowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJC
-YWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UEChMh
-S2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9pZHAu
-c2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrJEGv
-HgywdpQ1XnGpOHmN5OhM1fMoetxZLXwW4AeWrgJQZrOxB5GHk8AdSGeQKiYoTYxA
-rkpNru++XzAm+UPFobCEAKeD8RIG7PlakQ3QElpUwri/WlgrUyC9zgflGyJrU2U3
-OA3dVNQMlhCgJDQCMUABp0wxvpEy+ohqJX/g1CMx42eRmkcA7VeSaqR1jmA2pLYE
-wRcFxgvq790HYUlPB82FK/XgxirWDQ5OsI4241PmkuYQhucL28x0BeyMukhx8EwS
-NeHQeurEpyGgc6Hg9HOMrolgvElmX2bvIPTyTQTF7kFYmWumND8scdBtOIq7nSlw
-g/Ndm6jYEAuLdZofAgMBAAGjggGJMIIBhTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKs7oXT1
-kfQjRHD9H6I2NOqaOrCLMB8GA1UdIwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJ
-MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYI
-KwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9raXQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQAHch3yXQKL9IQjM4JVhnQW0WXG9syj4zlXB0/BddCJ//7aHEiztO2xVMRiBPPT
-6nvX1xI66kVZqXtF72pIodEl2Qd4Zw2ykYSYDINsaVOp7Wqrh4RxIYF1BYMxq7re
-NlzFpoUXG8wt4qN21Of8AL+km5HV5virsuBAyKNcBL4fLF5EBCMPuPF6YtlHffEZ
-shz0K0/oMoR6A7g262ZAB+3pcKhq5o2YPYqRI1scffrnQmQJ/dfypwKGlQNZKhU9
-I8mWnl4dfmCZov9Yg31pz39A3lLSi/XuXHL+2Yy4nQyXu4K9IiExyXXMRea7Cmn8
-RK42gc2r8jP4hr5kQZhmEkk0
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTjCCBDagAwIBAgIEDumJaTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kx
-JzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0GA1UE
-AxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTA5MTAwNTE1
-MDgxMFoXDTEyMTAwNDE1MDgxMFowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJC
-YWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UEChMh
-S2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9pZHAu
-c2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrJEGv
-HgywdpQ1XnGpOHmN5OhM1fMoetxZLXwW4AeWrgJQZrOxB5GHk8AdSGeQKiYoTYxA
-rkpNru++XzAm+UPFobCEAKeD8RIG7PlakQ3QElpUwri/WlgrUyC9zgflGyJrU2U3
-OA3dVNQMlhCgJDQCMUABp0wxvpEy+ohqJX/g1CMx42eRmkcA7VeSaqR1jmA2pLYE
-wRcFxgvq790HYUlPB82FK/XgxirWDQ5OsI4241PmkuYQhucL28x0BeyMukhx8EwS
-NeHQeurEpyGgc6Hg9HOMrolgvElmX2bvIPTyTQTF7kFYmWumND8scdBtOIq7nSlw
-g/Ndm6jYEAuLdZofAgMBAAGjggGJMIIBhTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKs7oXT1
-kfQjRHD9H6I2NOqaOrCLMB8GA1UdIwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJ
-MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYI
-KwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9raXQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQAHch3yXQKL9IQjM4JVhnQW0WXG9syj4zlXB0/BddCJ//7aHEiztO2xVMRiBPPT
-6nvX1xI66kVZqXtF72pIodEl2Qd4Zw2ykYSYDINsaVOp7Wqrh4RxIYF1BYMxq7re
-NlzFpoUXG8wt4qN21Of8AL+km5HV5virsuBAyKNcBL4fLF5EBCMPuPF6YtlHffEZ
-shz0K0/oMoR6A7g262ZAB+3pcKhq5o2YPYqRI1scffrnQmQJ/dfypwKGlQNZKhU9
-I8mWnl4dfmCZov9Yg31pz39A3lLSi/XuXHL+2Yy4nQyXu4K9IiExyXXMRea7Cmn8
-RK42gc2r8jP4hr5kQZhmEkk0
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.scc.kit.edu/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.scc.kit.edu/idp/profile/SAML2/POST-Simple-Sign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scc.kit.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">kit.edu</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTjCCBDagAwIBAgIEDumJaTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kx
-JzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0GA1UE
-AxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTA5MTAwNTE1
-MDgxMFoXDTEyMTAwNDE1MDgxMFowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJC
-YWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UEChMh
-S2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9pZHAu
-c2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrJEGv
-HgywdpQ1XnGpOHmN5OhM1fMoetxZLXwW4AeWrgJQZrOxB5GHk8AdSGeQKiYoTYxA
-rkpNru++XzAm+UPFobCEAKeD8RIG7PlakQ3QElpUwri/WlgrUyC9zgflGyJrU2U3
-OA3dVNQMlhCgJDQCMUABp0wxvpEy+ohqJX/g1CMx42eRmkcA7VeSaqR1jmA2pLYE
-wRcFxgvq790HYUlPB82FK/XgxirWDQ5OsI4241PmkuYQhucL28x0BeyMukhx8EwS
-NeHQeurEpyGgc6Hg9HOMrolgvElmX2bvIPTyTQTF7kFYmWumND8scdBtOIq7nSlw
-g/Ndm6jYEAuLdZofAgMBAAGjggGJMIIBhTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKs7oXT1
-kfQjRHD9H6I2NOqaOrCLMB8GA1UdIwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJ
-MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYI
-KwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9raXQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQAHch3yXQKL9IQjM4JVhnQW0WXG9syj4zlXB0/BddCJ//7aHEiztO2xVMRiBPPT
-6nvX1xI66kVZqXtF72pIodEl2Qd4Zw2ykYSYDINsaVOp7Wqrh4RxIYF1BYMxq7re
-NlzFpoUXG8wt4qN21Of8AL+km5HV5virsuBAyKNcBL4fLF5EBCMPuPF6YtlHffEZ
-shz0K0/oMoR6A7g262ZAB+3pcKhq5o2YPYqRI1scffrnQmQJ/dfypwKGlQNZKhU9
-I8mWnl4dfmCZov9Yg31pz39A3lLSi/XuXHL+2Yy4nQyXu4K9IiExyXXMRea7Cmn8
-RK42gc2r8jP4hr5kQZhmEkk0
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.scc.kit.edu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.scc.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTjCCBDagAwIBAgIEDumJaTANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2FybHNy
-dWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kx
-JzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0GA1UE
-AxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTA5MTAwNTE1
-MDgxMFoXDTEyMTAwNDE1MDgxMFowgYQxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJC
-YWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UEChMh
-S2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRgwFgYDVQQDEw9pZHAu
-c2NjLmtpdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrJEGv
-HgywdpQ1XnGpOHmN5OhM1fMoetxZLXwW4AeWrgJQZrOxB5GHk8AdSGeQKiYoTYxA
-rkpNru++XzAm+UPFobCEAKeD8RIG7PlakQ3QElpUwri/WlgrUyC9zgflGyJrU2U3
-OA3dVNQMlhCgJDQCMUABp0wxvpEy+ohqJX/g1CMx42eRmkcA7VeSaqR1jmA2pLYE
-wRcFxgvq790HYUlPB82FK/XgxirWDQ5OsI4241PmkuYQhucL28x0BeyMukhx8EwS
-NeHQeurEpyGgc6Hg9HOMrolgvElmX2bvIPTyTQTF7kFYmWumND8scdBtOIq7nSlw
-g/Ndm6jYEAuLdZofAgMBAAGjggGJMIIBhTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKs7oXT1
-kfQjRHD9H6I2NOqaOrCLMB8GA1UdIwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJ
-MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2tpdC1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUwgYIwPwYI
-KwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9raXQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IB
-AQAHch3yXQKL9IQjM4JVhnQW0WXG9syj4zlXB0/BddCJ//7aHEiztO2xVMRiBPPT
-6nvX1xI66kVZqXtF72pIodEl2Qd4Zw2ykYSYDINsaVOp7Wqrh4RxIYF1BYMxq7re
-NlzFpoUXG8wt4qN21Of8AL+km5HV5virsuBAyKNcBL4fLF5EBCMPuPF6YtlHffEZ
-shz0K0/oMoR6A7g262ZAB+3pcKhq5o2YPYqRI1scffrnQmQJ/dfypwKGlQNZKhU9
-I8mWnl4dfmCZov9Yg31pz39A3lLSi/XuXHL+2Yy4nQyXu4K9IiExyXXMRea7Cmn8
-RK42gc2r8jP4hr5kQZhmEkk0
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.scc.kit.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Karlsruhe Institute of Technology (KIT)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Karlsruhe Institute of Technology (KIT)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.scc.kit.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Simon</SurName>
-    <EmailAddress>simon@kit.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Sebastian</GivenName>
-    <SurName>Labitzke</SurName>
-    <EmailAddress>labitzke@kit.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sccb.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sccb.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 8546d97c..00000000
--- a/swamid-interfederations-2.0/idp.sccb.ac.uk-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://idp.sccb.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for South & City College Birmingham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-06T11:40:46Z">
-      <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">sccb.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID9jCCAt4CCQCXolHXaIzX9DANBgkqhkiG9w0BAQUFADCBvDELMAkGA1UEBhMC
-						R0IxFjAUBgNVBAgMDVdlc3QgTWlkbGFuZHMxEzARBgNVBAcMCkJpcm1pbmdoYW0x
-						KjAoBgNVBAoMIVNvdXRoIGFuZCBDaXR5IENvbGxlZ2UgQmlybWluZ2hhbTEUMBIG
-						A1UECwwLSVQgU2VydmljZXMxFzAVBgNVBAMMDmlkcC5zY2NiLmFjLnVrMSUwIwYJ
-						KoZIhvcNAQkBFhZkYXZpZC5iaXJrc0BzY2NiLmFjLnVrMB4XDTEzMTIwNTEwMjUx
-						NloXDTIzMTIwMzEwMjUxNlowgbwxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1XZXN0
-						IE1pZGxhbmRzMRMwEQYDVQQHDApCaXJtaW5naGFtMSowKAYDVQQKDCFTb3V0aCBh
-						bmQgQ2l0eSBDb2xsZWdlIEJpcm1pbmdoYW0xFDASBgNVBAsMC0lUIFNlcnZpY2Vz
-						MRcwFQYDVQQDDA5pZHAuc2NjYi5hYy51azElMCMGCSqGSIb3DQEJARYWZGF2aWQu
-						Ymlya3NAc2NjYi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ALqU8mPPY95/fMmsQFvqq1uBmB2jn8MFB8g0q2ZCVsAe2TX9wf/8+lz8H41+7ruR
-						Rk1j/oNg6XXRxhUjnOvHyXR2orF7CdiuLK+hqEuBYsMWE+jNWfHGzZegVlcbG2fg
-						GZnIyYJxxxiFkDwX7wxZo8wceljyzKGaEZVFA61eWLhFV9Xz8mjPGOL4zyes+w1N
-						TqGtCeTTeNYe98U5BCFMuf4LkypvZRhCrZJyqlId2vd8p8/iZojrqmR8jlqkQ04t
-						MV7JbmjNsOb0vudRqYHHlDzzi2Z3QczALkd0rSgij++tTKbPHyztyQ6OULNwi2tn
-						s6pFWvSnRpRVnAaMtgsRzMsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEANqsRmxFL
-						k0WvECnB+qPTmjyptPBaJCCDjvz/ZugIa322VefWwcufaV7YREAUjFvLepU6+RvJ
-						6lSkxIYNzx6B7f8F8EcaaebXGr4iOM4YDIoVfswAk3JsjZ3qYHZJkFMNeYg9QUjG
-						Mt35g8aroA9PHDeqIfE2le+15OWcMArivAMs0LM5sp7+H7LQDI8X/MKyCSlU5z+F
-						6rnLCkQDGHq9COUjrZW9fce+ekwK0eWzIWd4QQG0c+cMbp+toSItnYjuW5mkzjCI
-						bqq0+6Ei2JA3AUJaN1EMIIwSv+VG5HhYpNwKA2vOG0E9zMa1ZCIjSZEEWmAyW7iI
-						sKgqO2e98R+sJg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sccb.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sccb.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.sccb.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sccb.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.sccb.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sccb.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sccb.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">sccb.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID9jCCAt4CCQCXolHXaIzX9DANBgkqhkiG9w0BAQUFADCBvDELMAkGA1UEBhMC
-						R0IxFjAUBgNVBAgMDVdlc3QgTWlkbGFuZHMxEzARBgNVBAcMCkJpcm1pbmdoYW0x
-						KjAoBgNVBAoMIVNvdXRoIGFuZCBDaXR5IENvbGxlZ2UgQmlybWluZ2hhbTEUMBIG
-						A1UECwwLSVQgU2VydmljZXMxFzAVBgNVBAMMDmlkcC5zY2NiLmFjLnVrMSUwIwYJ
-						KoZIhvcNAQkBFhZkYXZpZC5iaXJrc0BzY2NiLmFjLnVrMB4XDTEzMTIwNTEwMjUx
-						NloXDTIzMTIwMzEwMjUxNlowgbwxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1XZXN0
-						IE1pZGxhbmRzMRMwEQYDVQQHDApCaXJtaW5naGFtMSowKAYDVQQKDCFTb3V0aCBh
-						bmQgQ2l0eSBDb2xsZWdlIEJpcm1pbmdoYW0xFDASBgNVBAsMC0lUIFNlcnZpY2Vz
-						MRcwFQYDVQQDDA5pZHAuc2NjYi5hYy51azElMCMGCSqGSIb3DQEJARYWZGF2aWQu
-						Ymlya3NAc2NjYi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ALqU8mPPY95/fMmsQFvqq1uBmB2jn8MFB8g0q2ZCVsAe2TX9wf/8+lz8H41+7ruR
-						Rk1j/oNg6XXRxhUjnOvHyXR2orF7CdiuLK+hqEuBYsMWE+jNWfHGzZegVlcbG2fg
-						GZnIyYJxxxiFkDwX7wxZo8wceljyzKGaEZVFA61eWLhFV9Xz8mjPGOL4zyes+w1N
-						TqGtCeTTeNYe98U5BCFMuf4LkypvZRhCrZJyqlId2vd8p8/iZojrqmR8jlqkQ04t
-						MV7JbmjNsOb0vudRqYHHlDzzi2Z3QczALkd0rSgij++tTKbPHyztyQ6OULNwi2tn
-						s6pFWvSnRpRVnAaMtgsRzMsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEANqsRmxFL
-						k0WvECnB+qPTmjyptPBaJCCDjvz/ZugIa322VefWwcufaV7YREAUjFvLepU6+RvJ
-						6lSkxIYNzx6B7f8F8EcaaebXGr4iOM4YDIoVfswAk3JsjZ3qYHZJkFMNeYg9QUjG
-						Mt35g8aroA9PHDeqIfE2le+15OWcMArivAMs0LM5sp7+H7LQDI8X/MKyCSlU5z+F
-						6rnLCkQDGHq9COUjrZW9fce+ekwK0eWzIWd4QQG0c+cMbp+toSItnYjuW5mkzjCI
-						bqq0+6Ei2JA3AUJaN1EMIIwSv+VG5HhYpNwKA2vOG0E9zMa1ZCIjSZEEWmAyW7iI
-						sKgqO2e98R+sJg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sccb.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sccb.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">South &amp; City College Birmingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South and City College Birmingham</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sccb.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Whinnery</SurName>
-    <EmailAddress>mailto:martin.whinnery@sccb.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Birks</SurName>
-    <EmailAddress>mailto:david.birks@sccb.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml
deleted file mode 100644
index 135e542d..00000000
--- a/swamid-interfederations-2.0/idp.sciencelib.ge-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sciencelib.ge/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://mtd.gif.grena.ge" registrationInstant="2015-09-28T10:04:42Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://gif.grena.ge/admin/editor/uploads/files/GIF%20Identity%20Federation%20Policy.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">National Scientific Library - Georgia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">National Scientific Library - Georgia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://sciencelib.ge</mdui:InformationURL>
-        <mdui:Logo width="24" height="23" xml:lang="en">http://www.sciencelib.ge/themes/pushbutton/icon-block.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>217.147.239.76/32</mdui:IPHint>
-        <mdui:DomainHint>idp.sciencelib.ge</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:41.704855,44.787059</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>
-MIIDzTCCArWgAwIBAgIJAOZZxvcv0ZIWMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV
-BAYTAkdFMRAwDgYDVQQIDAdHZW9yZ2lhMRAwDgYDVQQHDAdUYmlsaXNpMS4wLAYD
-VQQKDCVOYXRpb25hbCBTY2llbnRpZmljIExpYnJhcnkgLSBHZW9yZ2lhMRowGAYD
-VQQDDBFpZGYuc2NpZW5jZWxpYi5nZTAeFw0xNTA0MDIxMDM4MTdaFw0yNTA0MDEx
-MDM4MTdaMH0xCzAJBgNVBAYTAkdFMRAwDgYDVQQIDAdHZW9yZ2lhMRAwDgYDVQQH
-DAdUYmlsaXNpMS4wLAYDVQQKDCVOYXRpb25hbCBTY2llbnRpZmljIExpYnJhcnkg
-LSBHZW9yZ2lhMRowGAYDVQQDDBFpZGYuc2NpZW5jZWxpYi5nZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMWUJDOKSpsekasjeobbgvmo/92fLZpLX7q1
-DV2A24ZDhz7hPZU3PgYpnOlS5vpkaaQPcj5L9cSBYgYt+5RMfdbvPRysPxLTiAOO
-AXDdXPLiS+IuV1cBjTzbi0nvt3Fr4JZOqA7GUxkPsupUSd0GAiRzpzORiAS1h7/4
-FN/K2rqSIoUye7/0yLCK8RK9j8N6mvoZ89A1R/KAz1f5NfVCI0y5PfRtlS+g08Go
-C3B07Ho88xeDcydzUBCCKSvsVHVdkongMVxwHXiW+R2v/C7lVs2kJ8Xd2Yq+i0Zb
-qH1gfsWL2frgRhGBK/MQKhj5gsiBQCT+fu1KcMaiUnF7frWHERECAwEAAaNQME4w
-HQYDVR0OBBYEFMiIYakxQtDaRaaspEYY3JZMRMKVMB8GA1UdIwQYMBaAFMiIYakx
-QtDaRaaspEYY3JZMRMKVMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-AKyA+1FhcUjWH9hwN6Jpn9RvE2dnrcwLdQelrmnRXLkFv7z3LYxWiFo3LHePmKKl
-yDnief9e48CDh48Lq6hssK+/Ipw1BLCMGwvDJL4aeswK2uGRdyf4fZEZrE7Jc+Gg
-cHKt7iwCC5aboQTaPX/owxHaCs19p+qsN5zuuW8xq/U2hICWRaMbyEH+G9KhqD47
-ea8/gyK/sFRzez2C8GECAN9DKX9//TJZyVFXKW0NdfvVx69mk4BYE6eycI3fAtIx
-3odqTMpbrMsVQkrJlVSj2dBrvkbnZ+ih1X/QV3T1f8/kiqOQuuGAFuvcl51JsyEH
-W/y6xadzVAo5iK7XtTnwSy0=
-</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>
-MIIDzTCCArWgAwIBAgIJAOZZxvcv0ZIWMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV
-BAYTAkdFMRAwDgYDVQQIDAdHZW9yZ2lhMRAwDgYDVQQHDAdUYmlsaXNpMS4wLAYD
-VQQKDCVOYXRpb25hbCBTY2llbnRpZmljIExpYnJhcnkgLSBHZW9yZ2lhMRowGAYD
-VQQDDBFpZGYuc2NpZW5jZWxpYi5nZTAeFw0xNTA0MDIxMDM4MTdaFw0yNTA0MDEx
-MDM4MTdaMH0xCzAJBgNVBAYTAkdFMRAwDgYDVQQIDAdHZW9yZ2lhMRAwDgYDVQQH
-DAdUYmlsaXNpMS4wLAYDVQQKDCVOYXRpb25hbCBTY2llbnRpZmljIExpYnJhcnkg
-LSBHZW9yZ2lhMRowGAYDVQQDDBFpZGYuc2NpZW5jZWxpYi5nZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMWUJDOKSpsekasjeobbgvmo/92fLZpLX7q1
-DV2A24ZDhz7hPZU3PgYpnOlS5vpkaaQPcj5L9cSBYgYt+5RMfdbvPRysPxLTiAOO
-AXDdXPLiS+IuV1cBjTzbi0nvt3Fr4JZOqA7GUxkPsupUSd0GAiRzpzORiAS1h7/4
-FN/K2rqSIoUye7/0yLCK8RK9j8N6mvoZ89A1R/KAz1f5NfVCI0y5PfRtlS+g08Go
-C3B07Ho88xeDcydzUBCCKSvsVHVdkongMVxwHXiW+R2v/C7lVs2kJ8Xd2Yq+i0Zb
-qH1gfsWL2frgRhGBK/MQKhj5gsiBQCT+fu1KcMaiUnF7frWHERECAwEAAaNQME4w
-HQYDVR0OBBYEFMiIYakxQtDaRaaspEYY3JZMRMKVMB8GA1UdIwQYMBaAFMiIYakx
-QtDaRaaspEYY3JZMRMKVMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
-AKyA+1FhcUjWH9hwN6Jpn9RvE2dnrcwLdQelrmnRXLkFv7z3LYxWiFo3LHePmKKl
-yDnief9e48CDh48Lq6hssK+/Ipw1BLCMGwvDJL4aeswK2uGRdyf4fZEZrE7Jc+Gg
-cHKt7iwCC5aboQTaPX/owxHaCs19p+qsN5zuuW8xq/U2hICWRaMbyEH+G9KhqD47
-ea8/gyK/sFRzez2C8GECAN9DKX9//TJZyVFXKW0NdfvVx69mk4BYE6eycI3fAtIx
-3odqTMpbrMsVQkrJlVSj2dBrvkbnZ+ih1X/QV3T1f8/kiqOQuuGAFuvcl51JsyEH
-W/y6xadzVAo5iK7XtTnwSy0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencelib.ge/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.sciencelib.ge/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Scientific Library - Georgia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Scientific Library - Georgia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://sciencelib.ge/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Temur</md:GivenName>
-    <md:SurName>Maisuradze</md:SurName>
-    <md:EmailAddress>mailto:sysadmin@grena.ge</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 529e0788..00000000
--- a/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-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://idp.sciencespobordeaux.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Sciences Po Bordeaux</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACXUlEQVQoz42SP2gTYQDF33ff5XK96yUYkl7/pCgRaVESIkY6uAnucSgFNx1cBHHrLA4Ozlm6WDertItDqIglEBxCEhcjFEyqTUga05pccnc5knzf52DB6tQ3veXxfjweaTQahmHgfHJdVzYMwzgZQJExYcKywTi8ETFDotkhsSgYE+1fmPKDSiQ4TQOGBC5YrsjefgDjkCS0Orz0FaGg+N5ku59AKSBErQEu2Jv3AIjV7RrDMQLTcIYYuJApxhP4KFmYEfYQo7Ho28SvCNcjMyFXocSyrEAg8B/rxsbG8fGxaZqrq6u5XG55eXk0GlFKFxcXJQgxyWyxbH7yYlN0++xjQTQ75c2tV0+fFwoF27Z3dnYymYyu60dHRwAkEIKTHkDEtzp7l+Ovd8l85IcmvQxenZ2ddRzHdd1EIqFpWjQaBSCdQnQt+vgemY9A8QFYuHQx5jeWlpYcx+Gc7+3tZbNZVVXPBC4EpWuX6a3r8PsA/Pz8pXnnRjwePzw89Pv9Qoi1tTVJkgDIEEK6e5sEdACY8vuePRLNTvJmSntyv1QqMcZSqdRgMBiPx/V6PRgMyiBEil/5O5CmEk1NP3wwHA63t7cPDg5WVlbS6XSlUrFt+wzSv7Jte39/3/M8Qsj6+nqv16vVap7nASCWZVFKLcsqFouRSMQ0zVgs1u/3dV0HIISglP4xhBDXdWUAnudVKpVwOFytVhVFyefzoVCo3W4nk0lVVRljiqK4rqtp2mlDvV7nnE8mE13XOeeDwWBubq5cLlNKw+Ew59w0zWq1mkgkZFkmrVbr/Pd2HOc3KmApaPfUDdwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MzUrMDI6MDAIj+pyAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjM1KzAyOjAwedJSzgAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.sciencespobordeaux.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Sciences Po Bordeaux</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://idp.sciencespobordeaux.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sciencespobordeaux.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sciencespobordeaux.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Sciences Po Bordeaux</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sciences Po Bordeaux</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sciencespobordeaux.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Rouger</md:SurName>
-    <md:EmailAddress>p.rouger@sciencespobordeaux.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.scng.si-idp-20130321.xml b/swamid-interfederations-2.0/idp.scng.si-idp-20130321.xml
deleted file mode 100644
index 53364be0..00000000
--- a/swamid-interfederations-2.0/idp.scng.si-idp-20130321.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://idp.scng.si/idp/20130321">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-04-09T10:04:08Z">
-      <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 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">scng.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tsc.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Campus Nova Gorica</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Kampus Nova Gorica</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization Campus Nova Gorica</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Kampus Nova Gorica</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization Campus Nova Gorica</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Kampus Nova Gorica</mdui:Keywords>
-        <mdui:Logo height="259" width="200">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.scng.si/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.scng.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>MIIDizCCAnOgAwIBAgIFLuqUH18wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCU0kxFDASBgNVBAcMC05vdmEgR29yaWNhMTkwNwYDVQQDDDBBcm5lc0FBSSBGZWRlcmF0aW9uIC0gSWRQIGZvciBDYW1wdXMgTm92YSBHb3JpY2EwHhcNMTUwNDA4MTMzNTU0WhcNMzQxMjI0MTMzNTU0WjBeMQswCQYDVQQGEwJTSTEUMBIGA1UEBwwLTm92YSBHb3JpY2ExOTA3BgNVBAMMMEFybmVzQUFJIEZlZGVyYXRpb24gLSBJZFAgZm9yIENhbXB1cyBOb3ZhIEdvcmljYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANg/oLtcllF/db1++GiXDaZ1dZhMYvILPVhkHhyOj6bXzCA0YyqYUqW63pNyODL+tMZ7p8SXw78Cvvdzd3Pzowv5Yr2soRq9YiRzZn2ELJnITiDfdrWigtJRYssVbA7IGDGyCwVDGwwJIp9GWGMeWWPBDfowy/pQ68oyhUHkRk6sNlyZt5KPhQGDBlMn48UfT+szWpcIhJ+aogeoDtR/JwQDn5Sx8XCCCkmQtEEHRCiIUNY1q2HK1EvQmHzI7yGjIqfaMdxtQMzcDEZAgwI7LMMdi17ojN0eAFQFgfKekeZtCYwNfiIGY4a3yThep2GIRyrWQOavvP3vO+7KrdLVuccCAwEAAaNQME4wHQYDVR0OBBYEFH5hfLauj1fjDi2nQ6GiEfMuRUbQMB8GA1UdIwQYMBaAFH5hfLauj1fjDi2nQ6GiEfMuRUbQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABY59Oav1ERYNvaK3vB24nhRNH+CJ3LM38ZYRsLc5rZ3fwLJMP0716N8jS+rsb+REtWFKgg2+b6Gsuwpu/0L/P+WMHmGREvsKDERr2i8aFGqEbvfDhgd8+hS332JoZ+xfWdmWAOOidFPfBD0CZ+hS6U0b0UWchAHKr83m0SLa2tRGz79oQyVC2ndZgJ1Zu44452MZBqZjRNdAxMJ10DYGDc5uAIpoUlK/wxHeU0rTEwLPbnyYdCHdXDpnn+nqVhTSgeGmbk1zcBlGuw/f3vcBoyZHsFj5h/7pgesXmJIfiHugJEvSGKE+mHm0IQwetQJVafpRS0tWVAywznGtGI6pLI=</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>MIIDizCCAnOgAwIBAgIFLuqUH18wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCU0kxFDASBgNVBAcMC05vdmEgR29yaWNhMTkwNwYDVQQDDDBBcm5lc0FBSSBGZWRlcmF0aW9uIC0gSWRQIGZvciBDYW1wdXMgTm92YSBHb3JpY2EwHhcNMTUwNDA4MTMzNTU0WhcNMzQxMjI0MTMzNTU0WjBeMQswCQYDVQQGEwJTSTEUMBIGA1UEBwwLTm92YSBHb3JpY2ExOTA3BgNVBAMMMEFybmVzQUFJIEZlZGVyYXRpb24gLSBJZFAgZm9yIENhbXB1cyBOb3ZhIEdvcmljYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANg/oLtcllF/db1++GiXDaZ1dZhMYvILPVhkHhyOj6bXzCA0YyqYUqW63pNyODL+tMZ7p8SXw78Cvvdzd3Pzowv5Yr2soRq9YiRzZn2ELJnITiDfdrWigtJRYssVbA7IGDGyCwVDGwwJIp9GWGMeWWPBDfowy/pQ68oyhUHkRk6sNlyZt5KPhQGDBlMn48UfT+szWpcIhJ+aogeoDtR/JwQDn5Sx8XCCCkmQtEEHRCiIUNY1q2HK1EvQmHzI7yGjIqfaMdxtQMzcDEZAgwI7LMMdi17ojN0eAFQFgfKekeZtCYwNfiIGY4a3yThep2GIRyrWQOavvP3vO+7KrdLVuccCAwEAAaNQME4wHQYDVR0OBBYEFH5hfLauj1fjDi2nQ6GiEfMuRUbQMB8GA1UdIwQYMBaAFH5hfLauj1fjDi2nQ6GiEfMuRUbQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABY59Oav1ERYNvaK3vB24nhRNH+CJ3LM38ZYRsLc5rZ3fwLJMP0716N8jS+rsb+REtWFKgg2+b6Gsuwpu/0L/P+WMHmGREvsKDERr2i8aFGqEbvfDhgd8+hS332JoZ+xfWdmWAOOidFPfBD0CZ+hS6U0b0UWchAHKr83m0SLa2tRGz79oQyVC2ndZgJ1Zu44452MZBqZjRNdAxMJ10DYGDc5uAIpoUlK/wxHeU0rTEwLPbnyYdCHdXDpnn+nqVhTSgeGmbk1zcBlGuw/f3vcBoyZHsFj5h/7pgesXmJIfiHugJEvSGKE+mHm0IQwetQJVafpRS0tWVAywznGtGI6pLI=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scng.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.scng.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ŠOLSKI CENTER NOVA GORICA</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">ŠOLSKI CENTER NOVA GORICA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ŠOLSKI CENTER NOVA GORICA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">ŠOLSKI CENTER NOVA GORICA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.scng.si/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.scng.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janko</md:GivenName>
-    <md:SurName>Harej</md:SurName>
-    <md:EmailAddress>mailto:janko.harej@tsc.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Egon</md:GivenName>
-    <md:SurName>Pipan</md:SurName>
-    <md:EmailAddress>mailto:Egon.Pipan@tsc.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:podpora@scng.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Janko</md:GivenName>
-    <md:SurName>Harej</md:SurName>
-    <md:EmailAddress>mailto:janko.harej@tsc.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Milan</md:GivenName>
-    <md:SurName>Podbršček</md:SurName>
-    <md:EmailAddress>mailto:milanp@scng.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janko</md:GivenName>
-    <md:SurName>Harej</md:SurName>
-    <md:EmailAddress>mailto:janko.harej@tsc.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Božič</md:SurName>
-    <md:EmailAddress>mailto:martin.bozic@scng.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Milan</md:GivenName>
-    <md:SurName>Podbršček</md:SurName>
-    <md:EmailAddress>mailto:milanp@scng.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Milan</md:GivenName>
-    <md:SurName>Podbrscek</md:SurName>
-    <md:EmailAddress>mailto:milan.podbrscek@tsc.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Božič</md:SurName>
-    <md:EmailAddress>mailto:martin.bozic@scng.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gregor</md:GivenName>
-    <md:SurName>Cimerman</md:SurName>
-    <md:EmailAddress>mailto:gregor.cimerman@guest.arnes.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml b/swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.xml
deleted file mode 100644
index 780af699..00000000
--- a/swamid-interfederations-2.0/idp.scptuj.si-idp-20111102.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.scptuj.si/idp/20111102">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-01-13T08:01:14Z">
-      <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 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">scptuj.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ŠC Ptuj</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">ŠC Ptuj</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization ŠC Ptuj</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije ŠC Ptuj</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization ŠC Ptuj</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije ŠC Ptuj</mdui:Keywords>
-        <mdui:Logo height="70" width="298">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.scptuj.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.scptuj.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>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</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>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.scptuj.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.scptuj.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ŠOLSKI CENTER PTUJ</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">ŠOLSKI CENTER PTUJ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ŠOLSKI CENTER PTUJ</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">ŠOLSKI CENTER PTUJ</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.scptuj.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.scptuj.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Branko</md:GivenName>
-    <md:SurName>Kumer</md:SurName>
-    <md:EmailAddress>mailto:branko.kumer@scptuj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:marjan.ceh@scptuj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Terbuc</md:SurName>
-    <md:EmailAddress>mailto:martin.terbuc@scptuj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marjan</md:GivenName>
-    <md:SurName>Čeh</md:SurName>
-    <md:EmailAddress>mailto:marjan.ceh@scptuj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>CEH</md:GivenName>
-    <md:SurName>Čeh</md:SurName>
-    <md:EmailAddress>mailto:marjan.ceh@scptuj.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sdsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sdsu.edu-idp-shibboleth.xml
deleted file mode 100644
index 8f2a1dbe..00000000
--- a/swamid-interfederations-2.0/idp.sdsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://idp.sdsu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">sdsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">San Diego State University</mdui:DisplayName>
-        <mdui:Logo height="162" width="235" xml:lang="en">https://newscenter.sdsu.edu/brand/images/primary3color.gif</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>
-MIIDHDCCAgSgAwIBAgIVAMWWto0I48RmvkuXkJ+lKemaw/hrMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5zZHN1LmVkdTAeFw0xMTA1MjAxODU0MTJaFw0z
-MTA1MjAxODU0MTJaMBcxFTATBgNVBAMTDGlkcC5zZHN1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJbJtnmu55QH0hhGveJ4/H9uDPjkLYNYDi5Y
-lxwv0O0rtlaOQXCTqgtS2OF/uymX/o282lruA8XmZ11GEWpf65yopwCRrUpXkQes
-KYqKCv8ukyD3FLkfeCuMKGbCFgDVn4UgJXihKaqpbl4akgp538FNVvH0uKCgf1yH
-89wtugU4QdbglAgiRnxk6VLSg+YTOjfqfcWinTwRr5yIzxwdMnHfUXfSuJj6QhtO
-nWj9HiKKHSzMNioAhQPTitFV+pJLVz/3wHIchSDVdxYPYxDW4+t56Ca9mAEgojKY
-s3Hhb1flxnCB1WdhzWHlWvlLmxrx9qje36G61ZVEXhlF3nF6G6sCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnNkc3UuZWR1hiNodHRwczovL2lkcC5zZHN1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUUUOlgbFxNZPDpAJv1l1BSGZ0G60wDQYJ
-KoZIhvcNAQEFBQADggEBAGLeQcITD841MUUfBlRcreQtdvrecxcDvIpRU7zxPEi2
-bmhbhKEiLb5tcLb3UYCZUyYKS8aLGwmDXnfBbXSpuqSe+pun897ojH1/MRcikei7
-Psdo34PGlaVp5ZO6YsaB7myXkvVSCB9W+g36Ko2hb639dEo3jamHf3IO9iec3/T6
-grlHPK6YpLkl/yFUyG674xclGFYbO5e1oSTo2RI8Prq5SFMm+ZTM8RpJE4S8N2KK
-/xmDUZex0G3l2kQXG453HGvKmtyfatFO0EQsKSXR7TDUA5DlKaTR7TTqJIoQK0th
-H0EQISNFETzOPvigNzdVOpw9ywvLIgC4MAevthLo5ek=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sdsu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sdsu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sdsu.edu/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">sdsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAMWWto0I48RmvkuXkJ+lKemaw/hrMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC5zZHN1LmVkdTAeFw0xMTA1MjAxODU0MTJaFw0z
-MTA1MjAxODU0MTJaMBcxFTATBgNVBAMTDGlkcC5zZHN1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJbJtnmu55QH0hhGveJ4/H9uDPjkLYNYDi5Y
-lxwv0O0rtlaOQXCTqgtS2OF/uymX/o282lruA8XmZ11GEWpf65yopwCRrUpXkQes
-KYqKCv8ukyD3FLkfeCuMKGbCFgDVn4UgJXihKaqpbl4akgp538FNVvH0uKCgf1yH
-89wtugU4QdbglAgiRnxk6VLSg+YTOjfqfcWinTwRr5yIzxwdMnHfUXfSuJj6QhtO
-nWj9HiKKHSzMNioAhQPTitFV+pJLVz/3wHIchSDVdxYPYxDW4+t56Ca9mAEgojKY
-s3Hhb1flxnCB1WdhzWHlWvlLmxrx9qje36G61ZVEXhlF3nF6G6sCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnNkc3UuZWR1hiNodHRwczovL2lkcC5zZHN1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUUUOlgbFxNZPDpAJv1l1BSGZ0G60wDQYJ
-KoZIhvcNAQEFBQADggEBAGLeQcITD841MUUfBlRcreQtdvrecxcDvIpRU7zxPEi2
-bmhbhKEiLb5tcLb3UYCZUyYKS8aLGwmDXnfBbXSpuqSe+pun897ojH1/MRcikei7
-Psdo34PGlaVp5ZO6YsaB7myXkvVSCB9W+g36Ko2hb639dEo3jamHf3IO9iec3/T6
-grlHPK6YpLkl/yFUyG674xclGFYbO5e1oSTo2RI8Prq5SFMm+ZTM8RpJE4S8N2KK
-/xmDUZex0G3l2kQXG453HGvKmtyfatFO0EQsKSXR7TDUA5DlKaTR7TTqJIoQK0th
-H0EQISNFETzOPvigNzdVOpw9ywvLIgC4MAevthLo5ek=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sdsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sdsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">San Diego State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">San Diego State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sdsu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marcus Jeffers</md:GivenName>
-    <md:EmailAddress>mjeffers@mail.sdsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Marcus Jeffers</md:GivenName>
-    <md:EmailAddress>mjeffers@mail.sdsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ETS Help Desk</md:GivenName>
-    <md:EmailAddress>etshelpdesk@mail.sdsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml b/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.xml
deleted file mode 100644
index bb8d7115..00000000
--- a/swamid-interfederations-2.0/idp.sfpkr.si-idp-20141210.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.sfpkr.si/idp/20141210">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-12-12T10:12:07Z">
-      <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 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">sfpkr.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucenec.sfpkr.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Elementary school France Preseren Kranj</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Osnovna šola Franceta Prešerna Kranj</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for elementary schoole France Preseren Kranj</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet osnovne sole Franceta Prešerna Kranj</mdui:Description>
-        <mdui:Keywords xml:lang="en">identity provider elementary schoole France Preseren Kranj idp identity</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">ponudnik identitet osnovna sola Franceta Preserna Kranj idp identiteta</mdui:Keywords>
-        <mdui:Logo height="111" width="111">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.sfpkr.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.sfpkr.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>MIIFlDCCA3ygAwIBAgIGElF9nn59MA0GCSqGSIb3DQEBBQUAMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEyMTAyMjQ1MTRaFw0zNDA4MjcyMjQ1MTRaMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANQTok7kg+1o8RWpRTx91zPwoDoPWPcH9FxeVD1QiMcgB18Ox6exSL11AASI1pAj5evBwX7Wp74M5heQToC++u106HmKPERpIEfPwzY4GKoNwRGXcVzZt+jrCPIH39UYY3XgClM1bq1YUbeM9fheVNIBo0tp08nQEVll127PlKngXDSlAZ5A7qp8amrB8xnZRV9WYZIA6irULJY+DkJvQVuQWvABWVUAkZLVLJQS8aWtY0viHL7Ro4YSYii9yN2+w9TOmvQhto4tYj6eC6AeC7uZhKJGyy3GEaanWIFtqzpVCDEzv7oN9ckErHuwKtnyI68Fb+eHY3jjoKIt/egV3VSqKqkliZ4C6uszKpZPqSJCFoXDd8xZnlOTL2M+OlQExW3r7WBchAb2In/wgM/iUj+79sr1JPN+fRER38MQiUGI4QTP8aR0ifdJKodrTyyLNdmJAxQLhnTBYMLeunXat/SR0SfS5+aTDzMnAIuYcXXS0x3n/uz0d3QHvi13T1BCoBMPt6cFMGSiRQAzfgIZoCXe9O20T7gmJ16kqyq7WtDx5IfzpU7BMGHnQH64sa8dmKN6MXNu3WEu6d50urzojq56d74KZwi/JiZnxW3v3ufc8ajpHB65XN9fswyfLPSnRbZn1VG+8AHgvJexSxxfbeCh+fTFnNFBH9LWay1r1+6LAgMBAAGjUDBOMB0GA1UdDgQWBBRBteojY53LcdnWq8z0FAY/yvVWFjAfBgNVHSMEGDAWgBRBteojY53LcdnWq8z0FAY/yvVWFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAKRqU5Et1ynwkVPqxA4MqLlf4/5BR5iy3r3DvSDwWKgpq4uE8yzwndBo+P9pedTHR86OQo0jo+N1fKgq2e2JNjwIg9551LxLvHdX7M2abpP7cpjwNK0Vj/BD6CKmkfYK32voIPtVbL/1hNuTukceuCFhrRPGP97kXnOm/gF3DH8bV3igiEfIrXbGP5Qb4dwMG3MsvGpm2ruCHN4b/tWbCD8rR58IAG1fg0tq2jy0xK/3kFfcObYYihaPPxw4G2rzPpEo8KwFOyGGnJM2g2WlQOyCSwPvOsl58s/pHOKMb3ca+Mfz6fo7fFvv/J5XWvLwvffnNZ+691js473CQTiiFONIqcmvA2FdLSrtN5c2KBrNtMwNbHInQJUOKCQDhSpFIbx/xyzSNj3HbZf9r3hvTLCEgOpIGkBJILSVx2H+7XUkljLcHv/wU6HBP7BkhpfNVml+d/slUGJjpmkj52ZRTgNv1swJ3QE3quguH29EbgK3y2wPNek4VsIMG+xlA46upsnrOEqVej9apysA4XYMtwqDQ7Ei8OdoHJUIpU/OrXVApb3cGbHxofnf8BfsvEm+QGAZDxtH3kCqmfbQVUULltef11ma0ntXM4rDgR+LPnB0gme2sdug/2KK0iRf0CtbzsHq+JVw0Gz4HCRgWY7m6+9Q3qyiMspCLT+FdmLd7Smg==</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>MIIFlDCCA3ygAwIBAgIGElF9nn59MA0GCSqGSIb3DQEBBQUAMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEyMTAyMjQ1MTRaFw0zNDA4MjcyMjQ1MTRaMGIxCzAJBgNVBAYTAlNJMQ4wDAYDVQQHDAVLcmFuajFDMEEGA1UEAww6T3Nub3ZuYSBzb2xhIEZyYW5jZXRhIFByZXNlcm5hIEtyYW5qLCBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANQTok7kg+1o8RWpRTx91zPwoDoPWPcH9FxeVD1QiMcgB18Ox6exSL11AASI1pAj5evBwX7Wp74M5heQToC++u106HmKPERpIEfPwzY4GKoNwRGXcVzZt+jrCPIH39UYY3XgClM1bq1YUbeM9fheVNIBo0tp08nQEVll127PlKngXDSlAZ5A7qp8amrB8xnZRV9WYZIA6irULJY+DkJvQVuQWvABWVUAkZLVLJQS8aWtY0viHL7Ro4YSYii9yN2+w9TOmvQhto4tYj6eC6AeC7uZhKJGyy3GEaanWIFtqzpVCDEzv7oN9ckErHuwKtnyI68Fb+eHY3jjoKIt/egV3VSqKqkliZ4C6uszKpZPqSJCFoXDd8xZnlOTL2M+OlQExW3r7WBchAb2In/wgM/iUj+79sr1JPN+fRER38MQiUGI4QTP8aR0ifdJKodrTyyLNdmJAxQLhnTBYMLeunXat/SR0SfS5+aTDzMnAIuYcXXS0x3n/uz0d3QHvi13T1BCoBMPt6cFMGSiRQAzfgIZoCXe9O20T7gmJ16kqyq7WtDx5IfzpU7BMGHnQH64sa8dmKN6MXNu3WEu6d50urzojq56d74KZwi/JiZnxW3v3ufc8ajpHB65XN9fswyfLPSnRbZn1VG+8AHgvJexSxxfbeCh+fTFnNFBH9LWay1r1+6LAgMBAAGjUDBOMB0GA1UdDgQWBBRBteojY53LcdnWq8z0FAY/yvVWFjAfBgNVHSMEGDAWgBRBteojY53LcdnWq8z0FAY/yvVWFjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQAKRqU5Et1ynwkVPqxA4MqLlf4/5BR5iy3r3DvSDwWKgpq4uE8yzwndBo+P9pedTHR86OQo0jo+N1fKgq2e2JNjwIg9551LxLvHdX7M2abpP7cpjwNK0Vj/BD6CKmkfYK32voIPtVbL/1hNuTukceuCFhrRPGP97kXnOm/gF3DH8bV3igiEfIrXbGP5Qb4dwMG3MsvGpm2ruCHN4b/tWbCD8rR58IAG1fg0tq2jy0xK/3kFfcObYYihaPPxw4G2rzPpEo8KwFOyGGnJM2g2WlQOyCSwPvOsl58s/pHOKMb3ca+Mfz6fo7fFvv/J5XWvLwvffnNZ+691js473CQTiiFONIqcmvA2FdLSrtN5c2KBrNtMwNbHInQJUOKCQDhSpFIbx/xyzSNj3HbZf9r3hvTLCEgOpIGkBJILSVx2H+7XUkljLcHv/wU6HBP7BkhpfNVml+d/slUGJjpmkj52ZRTgNv1swJ3QE3quguH29EbgK3y2wPNek4VsIMG+xlA46upsnrOEqVej9apysA4XYMtwqDQ7Ei8OdoHJUIpU/OrXVApb3cGbHxofnf8BfsvEm+QGAZDxtH3kCqmfbQVUULltef11ma0ntXM4rDgR+LPnB0gme2sdug/2KK0iRf0CtbzsHq+JVw0Gz4HCRgWY7m6+9Q3qyiMspCLT+FdmLd7Smg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sfpkr.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.sfpkr.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">OSNOVNA ŠOLA FRANCETA PREŠERNA KRANJ</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sfpkr.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.sfpkr.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Aleš</md:GivenName>
-    <md:SurName>Žitnik</md:SurName>
-    <md:EmailAddress>mailto:ales.zitnik@sfpkr.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:info@sfpkr.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tomaž</md:GivenName>
-    <md:SurName>Ferbežar</md:SurName>
-    <md:EmailAddress>mailto:tomaz.ferbezar@sc-nm.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sfsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sfsu.edu-idp-shibboleth.xml
deleted file mode 100644
index 5f8ed6a5..00000000
--- a/swamid-interfederations-2.0/idp.sfsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://idp.sfsu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">sfsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">San Francisco State University</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>
-MIIDGzCCAgOgAwIBAgIUaVXwsxeZ7HtpgzDRqkb/SXmxNCUwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnNmc3UuZWR1MB4XDTEwMDExMjE3NTg0OVoXDTMw
-MDExMjE3NTg0OVowFzEVMBMGA1UEAxMMaWRwLnNmc3UuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnM2TW44FPEMlaZShdBub38iLLGtpvvtTZVvC
-tLo6xRQx0YCPYIQua2hxjf5lYFMe2KlwehxuCfujsTbegBX8TNg86NaN2s5iTFk7
-Q7BKY0o1UGEHhmELKZx/BVSH1AB0qwk1ZF9jGyynTITRwRGsr1yLvFM3aTH1tB4s
-iMpTTp7U4HfWcfCsAepxVJw8o8Nvgujgi6E8Mh4emTz+PdNmx0cgpiu7EpvruUEk
-ELlHifyFRhCCBUeOtxgsJXvXgqIYxLlxcz7aGnsylTCgX8fN2WABkJte90Cv06EU
-mkCnB4x8pKLxSfVkLDRDImpqPwnTjmizD6neSRQ5ano4qdAm9wIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuc2ZzdS5lZHWGI2h0dHBzOi8vaWRwLnNmc3UuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBT7bbal9a/eJjoYsQd6Stdkk9D6uTANBgkq
-hkiG9w0BAQUFAAOCAQEAB2UmDPQkEVR8YPNCUZS2+XjA5Pw7vdswtZpqLbN4x2RG
-AFnaUFs4Qw5/9RScVOdfuSKjbB32LSJzOTLUc2LA2zUhAcieprD9wBcW2gIVnpPC
-PQxMSI7vD7YuF6erW/qFh+gZwBod/PPmP30wy4uDAcWfW09f79wWv67v8ePXS/PA
-Ww8M8pNXffLcYo8NAdTY1ZddhYsqcAduFzL4Q0u/+QpV4K2qpMOK57sJ/4GuI0i4
-TF+IPVqP9ibO/PX7scYZDBm8wGCQ3G3UwADAQxJlSTJzyP7PthgH3ublYb3IbrY6
-OQKTDUHTSx//VpESlGrhleDG/BalOfbtxZka2UF05A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sfsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sfsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sfsu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sfsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sfsu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sfsu.edu/idp/profile/SAML2/POST-SimpleSign/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">sfsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUaVXwsxeZ7HtpgzDRqkb/SXmxNCUwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnNmc3UuZWR1MB4XDTEwMDExMjE3NTg0OVoXDTMw
-MDExMjE3NTg0OVowFzEVMBMGA1UEAxMMaWRwLnNmc3UuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnM2TW44FPEMlaZShdBub38iLLGtpvvtTZVvC
-tLo6xRQx0YCPYIQua2hxjf5lYFMe2KlwehxuCfujsTbegBX8TNg86NaN2s5iTFk7
-Q7BKY0o1UGEHhmELKZx/BVSH1AB0qwk1ZF9jGyynTITRwRGsr1yLvFM3aTH1tB4s
-iMpTTp7U4HfWcfCsAepxVJw8o8Nvgujgi6E8Mh4emTz+PdNmx0cgpiu7EpvruUEk
-ELlHifyFRhCCBUeOtxgsJXvXgqIYxLlxcz7aGnsylTCgX8fN2WABkJte90Cv06EU
-mkCnB4x8pKLxSfVkLDRDImpqPwnTjmizD6neSRQ5ano4qdAm9wIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAuc2ZzdS5lZHWGI2h0dHBzOi8vaWRwLnNmc3UuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBT7bbal9a/eJjoYsQd6Stdkk9D6uTANBgkq
-hkiG9w0BAQUFAAOCAQEAB2UmDPQkEVR8YPNCUZS2+XjA5Pw7vdswtZpqLbN4x2RG
-AFnaUFs4Qw5/9RScVOdfuSKjbB32LSJzOTLUc2LA2zUhAcieprD9wBcW2gIVnpPC
-PQxMSI7vD7YuF6erW/qFh+gZwBod/PPmP30wy4uDAcWfW09f79wWv67v8ePXS/PA
-Ww8M8pNXffLcYo8NAdTY1ZddhYsqcAduFzL4Q0u/+QpV4K2qpMOK57sJ/4GuI0i4
-TF+IPVqP9ibO/PX7scYZDBm8wGCQ3G3UwADAQxJlSTJzyP7PthgH3ublYb3IbrY6
-OQKTDUHTSx//VpESlGrhleDG/BalOfbtxZka2UF05A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sfsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sfsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">San Francisco State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">San Francisco State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sfsu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Supakit Kiatrungrit</md:GivenName>
-    <md:EmailAddress>supakitk@sfsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Joellen Fung</md:GivenName>
-    <md:EmailAddress>jfung@sfsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical support</md:GivenName>
-    <md:EmailAddress>systems@sfsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Supakit Kiatrungrit</md:GivenName>
-    <md:EmailAddress>supakitk@sfsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e08a9e9d..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sgi.cefetmg.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.sgi.cefetmg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sgi.cefetmg.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sgi.cefetmg.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sgi.cefetmg.br/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">cefetmg.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgi.cefetmg.br:8443/idp/profile/SAML1/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">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">CEFET-MG - Centro Federal de Educacao Tecnologica de Minas Gerais</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cefetmg.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.cefetmg.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Clever de O. Junior</md:SurName>
-    <md:EmailAddress>clever@dri.cefetmg.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sgscol.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sgscol.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index eb3d42ee..00000000
--- a/swamid-interfederations-2.0/idp.sgscol.ac.uk-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://idp.sgscol.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The South Gloucestershire and Stroud College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-04T16:23:54Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">sgscol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDjDCCAnQCCQDoMDHwmgfPnzANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-						R0IxGDAWBgNVBAgMD0dsb3VjZXN0ZXJzaGlyZTEQMA4GA1UEBwwHQnJpc3RvbDEx
-						MC8GA1UECgwoU291dGggR2xvdWNlc3RlcnNoaXJlIGFuZCBTdHJvdWQgQ29sbGVn
-						ZTEZMBcGA1UEAwwQaWRwLnNnc2NvbC5hYy51azAeFw0xMjEwMDQxMTQyMDlaFw0z
-						MjA5MjkxMTQyMDlaMIGHMQswCQYDVQQGEwJHQjEYMBYGA1UECAwPR2xvdWNlc3Rl
-						cnNoaXJlMRAwDgYDVQQHDAdCcmlzdG9sMTEwLwYDVQQKDChTb3V0aCBHbG91Y2Vz
-						dGVyc2hpcmUgYW5kIFN0cm91ZCBDb2xsZWdlMRkwFwYDVQQDDBBpZHAuc2dzY29s
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkcliHfq7FNJl
-						TaYElbi8ecmQhZMBQSpvT3AAgXjAL3vCVmhyhXgz189L4CvjagLFL2pu8BimFETi
-						55ll9uoQcBALwesvt9VYxmKuYrSkYqU1+ux+FCnNrEtV+SFX3tb7OcnZZm8GpT8I
-						ql87BKMiTV0rnGUDvFWEblVju+eGFnCRpDIuYBtGjDPdGLSr3X7Xlmaz8R0GhYtp
-						Y2p+ZIOGUh/tAXxTw0BGm94c6bHgIa/OA5IwmDUocS0OH4sKFAFoGttCVlmW+5kP
-						WwsYJEUVqn4wIIl62+LyvrOozicJjQEflOFVqmZPPlCiocTqrkLR32TSq1lLd78a
-						Pvn+ZT8wqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQABZcCusCu8ogYNTg4RJBr7
-						AYsK2iwNM/UhSlMiu56u8CHgZ9mjT0S+P1nOB8R6kNX862hnq+hdxX3K08IOEPca
-						2LavSv3kOjhFxN6lRVvRaTQo0Q2R/jzxYU9y/aXV1410uGk4q7np4cBGAknkh5W8
-						4yaN/1+1r3TJyig+2Rq/mQvIBtsih2deVpPl4CQT3NA5X1aL44exnv9HNs1CeOqk
-						TAOMx4B1IsMnOqA1T+jbYjxN+vWFZ4cjjsK3uDJhLMZJsxc172bF6PmT9cEo+B2S
-						mBhOt3wdkDpzPoqztKmUb3IgdWt4uShjsiUL0m8sClh3fvQ5YcnTxma7Q2/skBYK
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgscol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgscol.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.sgscol.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sgscol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sgscol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sgscol.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">sgscol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDjDCCAnQCCQDoMDHwmgfPnzANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-						R0IxGDAWBgNVBAgMD0dsb3VjZXN0ZXJzaGlyZTEQMA4GA1UEBwwHQnJpc3RvbDEx
-						MC8GA1UECgwoU291dGggR2xvdWNlc3RlcnNoaXJlIGFuZCBTdHJvdWQgQ29sbGVn
-						ZTEZMBcGA1UEAwwQaWRwLnNnc2NvbC5hYy51azAeFw0xMjEwMDQxMTQyMDlaFw0z
-						MjA5MjkxMTQyMDlaMIGHMQswCQYDVQQGEwJHQjEYMBYGA1UECAwPR2xvdWNlc3Rl
-						cnNoaXJlMRAwDgYDVQQHDAdCcmlzdG9sMTEwLwYDVQQKDChTb3V0aCBHbG91Y2Vz
-						dGVyc2hpcmUgYW5kIFN0cm91ZCBDb2xsZWdlMRkwFwYDVQQDDBBpZHAuc2dzY29s
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkcliHfq7FNJl
-						TaYElbi8ecmQhZMBQSpvT3AAgXjAL3vCVmhyhXgz189L4CvjagLFL2pu8BimFETi
-						55ll9uoQcBALwesvt9VYxmKuYrSkYqU1+ux+FCnNrEtV+SFX3tb7OcnZZm8GpT8I
-						ql87BKMiTV0rnGUDvFWEblVju+eGFnCRpDIuYBtGjDPdGLSr3X7Xlmaz8R0GhYtp
-						Y2p+ZIOGUh/tAXxTw0BGm94c6bHgIa/OA5IwmDUocS0OH4sKFAFoGttCVlmW+5kP
-						WwsYJEUVqn4wIIl62+LyvrOozicJjQEflOFVqmZPPlCiocTqrkLR32TSq1lLd78a
-						Pvn+ZT8wqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQABZcCusCu8ogYNTg4RJBr7
-						AYsK2iwNM/UhSlMiu56u8CHgZ9mjT0S+P1nOB8R6kNX862hnq+hdxX3K08IOEPca
-						2LavSv3kOjhFxN6lRVvRaTQo0Q2R/jzxYU9y/aXV1410uGk4q7np4cBGAknkh5W8
-						4yaN/1+1r3TJyig+2Rq/mQvIBtsih2deVpPl4CQT3NA5X1aL44exnv9HNs1CeOqk
-						TAOMx4B1IsMnOqA1T+jbYjxN+vWFZ4cjjsK3uDJhLMZJsxc172bF6PmT9cEo+B2S
-						mBhOt3wdkDpzPoqztKmUb3IgdWt4uShjsiUL0m8sClh3fvQ5YcnTxma7Q2/skBYK
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sgscol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sgscol.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 South Gloucestershire and Stroud College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South Gloucestershire and Stroud College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sgscol.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Aaron</GivenName>
-    <SurName>Hope</SurName>
-    <EmailAddress>mailto:aaron.hope@sgscol.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Aaron</GivenName>
-    <SurName>Hope</SurName>
-    <EmailAddress>mailto:aaron.hope@sgscol.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shef.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.shef.ac.uk-shibboleth.xml
deleted file mode 100644
index cf1ddaa3..00000000
--- a/swamid-interfederations-2.0/idp.shef.ac.uk-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://idp.shef.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Sheffield.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-10-24T12:26: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">sheffield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEajCCA1KgAwIBAgIRAPS6MGNqr12OxPRxE0wftqswDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA1MDcwMDAwMDBaFw0xNjA1MDYyMzU5NTlaMDwxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLnNoZWYu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtvXTQLO2l59pl
-						EFXfI/CecppuNNfWWSEO4PEbvfAPGX0seM4pUU0YKVtLvsP9132Mx8imnrhnQk8x
-						KjxVmfBcPyQHBZTClH+V1H3rygYYnDQACG35/WWshvrfpuDSeOey4MW9Xqv/1ACH
-						PZEhFsZwnaW/ZDotPenOzY9/N0URdSr/hoFIB/mmCqE/6pZu+pLWjeRRQU5sro2X
-						HPQY+GaoFV3gqGbGR1B1nOWctrqxmGPEn2OAf4/R3bwkDMlQNAn7vd8D8CIk9z/e
-						Ntodram+7XFhnAPFMw0EOYk3un+QjdrNke9VYGAL3gqN8uRdPpKl1E84n+jviZCJ
-						c8Uu34odAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-						kOO57TAdBgNVHQ4EFgQUFkISCwlOsYEScVfguhI/NJkkdkkwDgYDVR0PAQH/BAQD
-						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-						L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-						MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-						LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmlkcC5zaGVmLmFjLnVrMA0GCSqG
-						SIb3DQEBBQUAA4IBAQBFQpg8CdAxF+fazlT/4DR43XEtbv+SzLg9H2ST1kKrJSb+
-						KHNS6XFli0JcWP1BNFCA0TV/xyH0KWc/ZwYA5h052QHS5kOK88IjUNwW4wluqajT
-						c1jByBc/bV1nVQBrKd7uLeqlEGlYySnx2kwu043nEGsP0/TDCAvdTQ9jqXCSuepg
-						+IS/jkPCQF+/BvmXNOwLei4mUI2EqVnzIqDq3tA8CLxhRKv4qq1bQqicPMwwP0GV
-						crp7O+zg6I/K55qVp75ePh7jHf32AfqRKN0BhQlYoogsT5noMUDNwhRpqv9/h2MH
-						PyWz043AlJssKremO7+1g998b2MkkVpiHa74usy0
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shef.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shef.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.shef.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shef.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shef.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shef.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">sheffield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEajCCA1KgAwIBAgIRAPS6MGNqr12OxPRxE0wftqswDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA1MDcwMDAwMDBaFw0xNjA1MDYyMzU5NTlaMDwxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMOaWRwLnNoZWYu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtvXTQLO2l59pl
-						EFXfI/CecppuNNfWWSEO4PEbvfAPGX0seM4pUU0YKVtLvsP9132Mx8imnrhnQk8x
-						KjxVmfBcPyQHBZTClH+V1H3rygYYnDQACG35/WWshvrfpuDSeOey4MW9Xqv/1ACH
-						PZEhFsZwnaW/ZDotPenOzY9/N0URdSr/hoFIB/mmCqE/6pZu+pLWjeRRQU5sro2X
-						HPQY+GaoFV3gqGbGR1B1nOWctrqxmGPEn2OAf4/R3bwkDMlQNAn7vd8D8CIk9z/e
-						Ntodram+7XFhnAPFMw0EOYk3un+QjdrNke9VYGAL3gqN8uRdPpKl1E84n+jviZCJ
-						c8Uu34odAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
-						kOO57TAdBgNVHQ4EFgQUFkISCwlOsYEScVfguhI/NJkkdkkwDgYDVR0PAQH/BAQD
-						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-						L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
-						MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
-						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
-						LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmlkcC5zaGVmLmFjLnVrMA0GCSqG
-						SIb3DQEBBQUAA4IBAQBFQpg8CdAxF+fazlT/4DR43XEtbv+SzLg9H2ST1kKrJSb+
-						KHNS6XFli0JcWP1BNFCA0TV/xyH0KWc/ZwYA5h052QHS5kOK88IjUNwW4wluqajT
-						c1jByBc/bV1nVQBrKd7uLeqlEGlYySnx2kwu043nEGsP0/TDCAvdTQ9jqXCSuepg
-						+IS/jkPCQF+/BvmXNOwLei4mUI2EqVnzIqDq3tA8CLxhRKv4qq1bQqicPMwwP0GV
-						crp7O+zg6I/K55qVp75ePh7jHf32AfqRKN0BhQlYoogsT5noMUDNwhRpqv9/h2MH
-						PyWz043AlJssKremO7+1g998b2MkkVpiHa74usy0
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shef.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shef.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 Sheffield</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Sheffield</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.shef.ac.uk/cics/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nomit</GivenName>
-    <SurName>Babraa</SurName>
-    <EmailAddress>mailto:h.babraa@sheffield.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nomit</GivenName>
-    <SurName>Babraa</SurName>
-    <EmailAddress>mailto:h.babraa@sheffield.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sheffcol.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sheffcol.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 8b658903..00000000
--- a/swamid-interfederations-2.0/idp.sheffcol.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.sheffcol.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The Sheffield College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-25T14:08: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">sheffcol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID8DCCAtgCCQD+MvDrUqcVKDANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UEBhMC
-						R0IxGDAWBgNVBAgTD1NvdXRoIFlvcmtzaGlyZTESMBAGA1UEBxMJU2hlZmZpZWxk
-						MR4wHAYDVQQKExVUaGUgU2hlZmZpZWxkIENvbGxlZ2UxFDASBgNVBAsTC0lUIFNl
-						cnZpY2VzMRswGQYDVQQDExJpZHAuc2hlZmZjb2wuYWMudWsxKTAnBgkqhkiG9w0B
-						CQEWGlJvYmluLkNvb2tlQHNoZWZmY29sLmFjLnVrMB4XDTE0MDIyNDE1NDAyOVoX
-						DTI0MDIyMjE1NDAyOVowgbkxCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Tb3V0aCBZ
-						b3Jrc2hpcmUxEjAQBgNVBAcTCVNoZWZmaWVsZDEeMBwGA1UEChMVVGhlIFNoZWZm
-						aWVsZCBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEbMBkGA1UEAxMSaWRw
-						LnNoZWZmY29sLmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpSb2Jpbi5Db29rZUBzaGVm
-						ZmNvbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK42vD+O
-						5/NBZV9XPPzgFWaxthadM9TWqQ4FB/IkubIk4fTXehlHW05kkMH70Md15HCKA810
-						MfEowgPFZZIytOc1xREIeDf+d/9FTt1/+htgIuCFoeVviyNK/nNkPogYvoIDNaqW
-						GIMCGteHF29vzJI572/yTvKukMBUO4GpWmIDrLM7kdg6BdoyMaiH3m53BB6NAnXE
-						bPobrt4lcnOfBE3pqZ1wBmkXoBkDryO2ZEAPIsHQbzmbMjQlnzRfugzDE4N6RnH3
-						JWaKll+sLBo3sKIQ205v6jfYbS9txbGAtBbucunHcqXRuwkxK3MQPVF+/C1MSlXN
-						h1sNGRbKT81WHssCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAO+8MDZoiDNJY/Hvp
-						jdm8xGSAiGkTdE4rk09HEfYJ7jH8Uoa9Ka3Fiur9YqSBayw6qkkWgD5iO3NlKVqt
-						0ZEgxy5duc5JG3VjnkUX9M3jFZYRCd5Ow7qgK7Z+AXr1D8SDDWfFG9mSSYBAtkX4
-						jRYaWGlcGAcB3ATBE4jM+7GxP7cwyBqQIG3pZkCAYjEEUm11TLnEVgE8u/u2ioT0
-						qOqAFHs6u5F5SzOvpYSaYAwi2Z2z0YlAocZt2Gs6GWSydWpT39G/Jbyfm/1TSZqo
-						7iyFOrc1qevyiD5j7phHJ3th6ePeplPOwpUS/AejrJ8MeeQO4ZobKumOahHt2wkJ
-						x5QCzw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sheffcol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sheffcol.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.sheffcol.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sheffcol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sheffcol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sheffcol.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">sheffcol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID8DCCAtgCCQD+MvDrUqcVKDANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UEBhMC
-						R0IxGDAWBgNVBAgTD1NvdXRoIFlvcmtzaGlyZTESMBAGA1UEBxMJU2hlZmZpZWxk
-						MR4wHAYDVQQKExVUaGUgU2hlZmZpZWxkIENvbGxlZ2UxFDASBgNVBAsTC0lUIFNl
-						cnZpY2VzMRswGQYDVQQDExJpZHAuc2hlZmZjb2wuYWMudWsxKTAnBgkqhkiG9w0B
-						CQEWGlJvYmluLkNvb2tlQHNoZWZmY29sLmFjLnVrMB4XDTE0MDIyNDE1NDAyOVoX
-						DTI0MDIyMjE1NDAyOVowgbkxCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Tb3V0aCBZ
-						b3Jrc2hpcmUxEjAQBgNVBAcTCVNoZWZmaWVsZDEeMBwGA1UEChMVVGhlIFNoZWZm
-						aWVsZCBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEbMBkGA1UEAxMSaWRw
-						LnNoZWZmY29sLmFjLnVrMSkwJwYJKoZIhvcNAQkBFhpSb2Jpbi5Db29rZUBzaGVm
-						ZmNvbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK42vD+O
-						5/NBZV9XPPzgFWaxthadM9TWqQ4FB/IkubIk4fTXehlHW05kkMH70Md15HCKA810
-						MfEowgPFZZIytOc1xREIeDf+d/9FTt1/+htgIuCFoeVviyNK/nNkPogYvoIDNaqW
-						GIMCGteHF29vzJI572/yTvKukMBUO4GpWmIDrLM7kdg6BdoyMaiH3m53BB6NAnXE
-						bPobrt4lcnOfBE3pqZ1wBmkXoBkDryO2ZEAPIsHQbzmbMjQlnzRfugzDE4N6RnH3
-						JWaKll+sLBo3sKIQ205v6jfYbS9txbGAtBbucunHcqXRuwkxK3MQPVF+/C1MSlXN
-						h1sNGRbKT81WHssCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAO+8MDZoiDNJY/Hvp
-						jdm8xGSAiGkTdE4rk09HEfYJ7jH8Uoa9Ka3Fiur9YqSBayw6qkkWgD5iO3NlKVqt
-						0ZEgxy5duc5JG3VjnkUX9M3jFZYRCd5Ow7qgK7Z+AXr1D8SDDWfFG9mSSYBAtkX4
-						jRYaWGlcGAcB3ATBE4jM+7GxP7cwyBqQIG3pZkCAYjEEUm11TLnEVgE8u/u2ioT0
-						qOqAFHs6u5F5SzOvpYSaYAwi2Z2z0YlAocZt2Gs6GWSydWpT39G/Jbyfm/1TSZqo
-						7iyFOrc1qevyiD5j7phHJ3th6ePeplPOwpUS/AejrJ8MeeQO4ZobKumOahHt2wkJ
-						x5QCzw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sheffcol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sheffcol.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 Sheffield College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Sheffield College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sheffcol.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Humphrey</SurName>
-    <EmailAddress>mailto:michael.humphrey@sheffcol.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Humphrey</SurName>
-    <EmailAddress>mailto:michael.humphrey@sheffcol.ac.uk</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 d41b14a5..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 handelshogskolan</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Hanken School of Economics</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Hanken Svenska handelshogskolan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Hanken Svenska handelshogskolan</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Hanken School of Economics</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Hanken Svenska handelshogskolan</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.shi.com.xml b/swamid-interfederations-2.0/idp.shi.com.xml
deleted file mode 100644
index 761e8d7e..00000000
--- a/swamid-interfederations-2.0/idp.shi.com.xml
+++ /dev/null
@@ -1,98 +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://idp.shi.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://sp.shi.com/notice/invalidrequest" 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">shi.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SHI International Corporation</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Development IdP for SHI</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>
-MIIDLDCCAhSgAwIBAgIVAMj1ttF2FaMwn9EUKVTXpmbK6XOXMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGludGVybmFsLnNoaS5jb20wHhcNMTQwMzExMTYxNjM3
-WhcNMzQwMzExMTcxNjM3WjAbMRkwFwYDVQQDExBpbnRlcm5hbC5zaGkuY29tMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhCIFqHThSlljeSpG58W9P6QX
-peiotBTDA7GbamhEdzit2hHTPcYrUfJzG0tLRwfoSBFrlVBM9kldVzBCGb/DQOmG
-mddxdDK5yRufyGGWLlYmuMbXaxlVSihIAahSFt+7S97BmOuxgg7wurFCQtFX1p+h
-Nn1pSGSus//fJb7CLZ1JCam5f02eKVPs61/hj6M50CFYmZGPHQzPk0cKVtt9Op9Q
-CU4o3dc7tbLSaEQ+PFwh0/HNOyPSuOcoNOV/54L4B9J86ZdrWg1TK43akH8f7HJ0
-nUAtWVHN98E7fsoluH+rayZcEZ2MAaIBh08YrEEk+LUT9J1ljCBC3mmtbcXN0wID
-AQABo2cwZTBEBgNVHREEPTA7ghBpbnRlcm5hbC5zaGkuY29thidodHRwczovL2lu
-dGVybmFsLnNoaS5jb20vaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFE4ujVKY+ni9
-RyvyYXnkMLe1CIULMA0GCSqGSIb3DQEBBQUAA4IBAQAJQEu02KceVREvLD+dLAQ3
-qQaKKDj1zVT5uPgs2AZY3c3+P2EXhHRamcmSneGB60t78ifIqT3ieVW2BO0LWORz
-TfW4yXIiSQkVTDg7JWm4pLQIKsD1HtbKTdzGVS32oNLh3u8VIufIMYsUF3rqmaqK
-WCVrkk3V9kytghLysWaiQGIVmBent6ecy/si6q0vjgblabG8+468gaFcLHROarat
-d62gDKCcpQsPbjFSbMLSTwsk2OyxG9MSxlOQESMpCFP0VwvbMBtBBMc4w/ky+ZrT
-w6F+iNsK/mzhVXrfr4xtUW0NEDTEEu+DMbTyQGKfRtVZAi/nxfZrik7hBBxKih3W
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://internal.shi.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://internal.shi.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://internal.shi.com/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://internal.shi.com/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://internal.shi.com:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://internal.shi.com/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://internal.shi.com/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://internal.shi.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://internal.shi.com/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shi.com</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAMj1ttF2FaMwn9EUKVTXpmbK6XOXMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGludGVybmFsLnNoaS5jb20wHhcNMTQwMzExMTYxNjM3
-WhcNMzQwMzExMTcxNjM3WjAbMRkwFwYDVQQDExBpbnRlcm5hbC5zaGkuY29tMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhCIFqHThSlljeSpG58W9P6QX
-peiotBTDA7GbamhEdzit2hHTPcYrUfJzG0tLRwfoSBFrlVBM9kldVzBCGb/DQOmG
-mddxdDK5yRufyGGWLlYmuMbXaxlVSihIAahSFt+7S97BmOuxgg7wurFCQtFX1p+h
-Nn1pSGSus//fJb7CLZ1JCam5f02eKVPs61/hj6M50CFYmZGPHQzPk0cKVtt9Op9Q
-CU4o3dc7tbLSaEQ+PFwh0/HNOyPSuOcoNOV/54L4B9J86ZdrWg1TK43akH8f7HJ0
-nUAtWVHN98E7fsoluH+rayZcEZ2MAaIBh08YrEEk+LUT9J1ljCBC3mmtbcXN0wID
-AQABo2cwZTBEBgNVHREEPTA7ghBpbnRlcm5hbC5zaGkuY29thidodHRwczovL2lu
-dGVybmFsLnNoaS5jb20vaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFE4ujVKY+ni9
-RyvyYXnkMLe1CIULMA0GCSqGSIb3DQEBBQUAA4IBAQAJQEu02KceVREvLD+dLAQ3
-qQaKKDj1zVT5uPgs2AZY3c3+P2EXhHRamcmSneGB60t78ifIqT3ieVW2BO0LWORz
-TfW4yXIiSQkVTDg7JWm4pLQIKsD1HtbKTdzGVS32oNLh3u8VIufIMYsUF3rqmaqK
-WCVrkk3V9kytghLysWaiQGIVmBent6ecy/si6q0vjgblabG8+468gaFcLHROarat
-d62gDKCcpQsPbjFSbMLSTwsk2OyxG9MSxlOQESMpCFP0VwvbMBtBBMc4w/ky+ZrT
-w6F+iNsK/mzhVXrfr4xtUW0NEDTEEu+DMbTyQGKfRtVZAi/nxfZrik7hBBxKih3W
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://internal.shi.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SHI International Corporation</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SHI International Corporation</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://shi.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ken Kapes</md:GivenName>
-    <md:EmailAddress>ken_kapes@shi.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kurt Schreckengost</md:GivenName>
-    <md:EmailAddress>Kurt_Schreckengost@shi.com</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.shibboleth.qmul.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 6a17d509..00000000
--- a/swamid-interfederations-2.0/idp.shibboleth.qmul.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.shibboleth.qmul.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Queen Mary and Westfield College, University of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-13T20:40: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">qmul.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Queen Mary, University of London</mdui:DisplayName>
-        <mdui:Logo height="53" width="200">https://idcheck.qmul.ac.uk/data/qmul_black.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIHnTCCBoWgAwIBAgIQYq4ht/OC7BIxhYZg2e2WcDANBgkqhkiG9w0BAQsFADCB
-						kjELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxODA2BgNV
-						BAMTL0NPTU9ETyBSU0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVy
-						IENBMB4XDTE1MDIxMzAwMDAwMFoXDTE3MDIxMjIzNTk1OVowggEoMREwDwYDVQQF
-						EwhSQzAwMDcxMDETMBEGCysGAQQBgjc8AgEDEwJHQjEdMBsGA1UEDxMUUHJpdmF0
-						ZSBPcmdhbml6YXRpb24xCzAJBgNVBAYTAkdCMQ8wDQYDVQQREwZFMSA0TlMxDzAN
-						BgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRYwFAYDVQQJEw1NaWxlIEVu
-						ZCBSb2FkMSgwJgYDVQQKEx9RdWVlbiBNYXJ5IFVuaXZlcnNpdHkgT2YgTG9uZG9u
-						MRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEjMCEGA1UECxMaQ09NT0RPIEVWIE11bHRp
-						LURvbWFpbiBTU0wxIjAgBgNVBAMTGWlkcC5zaGliYm9sZXRoLnFtdWwuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDh5MiNTEObfWslVrafeqmP
-						1UD+0U4uUYuDMpX2OFiWRvPVdoIhNJK8InLjRGzM16rArF1VHTvw9L2hg+Mjksql
-						1yaG0FuECmTUk9Jn1rgMo1RVmc036lp5eLAZAxOzj5T3pyiRKqs+QSMHWgwfg6HD
-						U8YaldlqQM9bWtluzSQmx6df1m8DyolCnOBUTR35YwaVuQp9gnafy7i9smvSWhMM
-						9j46BEEYGYJjm0REghRO/3WNRiKaIwiFn4utCGT9/oCu3Nl7yab8HQsAId39UuG9
-						RE2FRJBTe7MuiQ13XllUwJGjCNrqgNldE4UrXHy0hjmFMlhYjY7cH2lCafYfuYTb
-						AgMBAAGjggNUMIIDUDAfBgNVHSMEGDAWgBQ52v/KKBSKqHQTCLnkDqnS+n6daTAd
-						BgNVHQ4EFgQUAlQbTUGQ8qFvPEcR9GoS6dzwfXswDgYDVR0PAQH/BAQDAgWgMAwG
-						A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEYGA1Ud
-						IAQ/MD0wOwYMKwYBBAGyMQECAQUBMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2Vj
-						dXJlLmNvbW9kby5jb20vQ1BTMFYGA1UdHwRPME0wS6BJoEeGRWh0dHA6Ly9jcmwu
-						Y29tb2RvY2EuY29tL0NPTU9ET1JTQUV4dGVuZGVkVmFsaWRhdGlvblNlY3VyZVNl
-						cnZlckNBLmNybDCBhwYIKwYBBQUHAQEEezB5MFEGCCsGAQUFBzAChkVodHRwOi8v
-						Y3J0LmNvbW9kb2NhLmNvbS9DT01PRE9SU0FFeHRlbmRlZFZhbGlkYXRpb25TZWN1
-						cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2Nh
-						LmNvbTAkBgNVHREEHTAbghlpZHAuc2hpYmJvbGV0aC5xbXVsLmFjLnVrMIIBfwYK
-						KwYBBAHWeQIEAgSCAW8EggFrAWkAdgBo9pj4H2SCvjqM7rkoHUz8cVFdZ5PURNEK
-						Z6y7T0/7xAAAAUuDfKLAAAAEAwBHMEUCIAagnCAKc1skTr2wfGwSOzezQJViqYmn
-						gN5+n6ek/kftAiEAhtqDNmjQM9DZWAxkkOpgHjX4vsM8Cah1O26zwqLbXNQAdwCk
-						uQmQtBhYFIe7E6LMZ3AKPDWYBPkb37jjd80OyA3cEAAAAUuDfKLHAAAEAwBIMEYC
-						IQCJANeMiBQF69/wczNISERwZ/4FVTHON1fD4BKgv/AGEwIhAI7zhnDGVs8p1Ccu
-						Ocq8ovoSLnF5KdVJ2n+Jf1PtTLrOAHYAVhQGmi/XwuzT9eG9RLI+x0Z2ubyZEVzA
-						75SYVdaJ0N0AAAFLg3yhXgAABAMARzBFAiA66Y6PGzOrXZfGz56TSNaANr7yO/c7
-						3r778k2gFOtwAAIhAJqdTx8fzxsbvpUvriFZCGVksMhdcIE8XqmoYz9dzTVSMA0G
-						CSqGSIb3DQEBCwUAA4IBAQBAMXgE6G4STF5JNF+hZi/aDHNDR0BSCGiAJ17wyOQI
-						rP2n5QmYU7q63eWAL4nM6IFjm9lekq9iPZxhC5K3XVgtDz4uEh4CVsPKLnkJlthm
-						6uJcAWlpx6XO/JxcgvLkGLVxt3Ew6YASY9kp1lAps+r4Roy4JbpPY2PQ+G6gmdBN
-						XbXYbayAgPnevhUWxVo4/DgWX9xv3UzF7RWbEEgiS5vRr4hb7pLxlbPHfoQI5KUP
-						xXV2KDU0rxMp4uv0an+P+O7ePMr9j6d5+heLkBoM+InoJAoh62GJnZXjr6H2bpJR
-						fvD/ZPNVxn4N4iHxZDaxWwINXVwOgDHod2aU6e61XAve
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.qmul.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.qmul.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.shibboleth.qmul.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shibboleth.qmul.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shibboleth.qmul.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shibboleth.qmul.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">qmul.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIHnTCCBoWgAwIBAgIQYq4ht/OC7BIxhYZg2e2WcDANBgkqhkiG9w0BAQsFADCB
-						kjELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxODA2BgNV
-						BAMTL0NPTU9ETyBSU0EgRXh0ZW5kZWQgVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVy
-						IENBMB4XDTE1MDIxMzAwMDAwMFoXDTE3MDIxMjIzNTk1OVowggEoMREwDwYDVQQF
-						EwhSQzAwMDcxMDETMBEGCysGAQQBgjc8AgEDEwJHQjEdMBsGA1UEDxMUUHJpdmF0
-						ZSBPcmdhbml6YXRpb24xCzAJBgNVBAYTAkdCMQ8wDQYDVQQREwZFMSA0TlMxDzAN
-						BgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRYwFAYDVQQJEw1NaWxlIEVu
-						ZCBSb2FkMSgwJgYDVQQKEx9RdWVlbiBNYXJ5IFVuaXZlcnNpdHkgT2YgTG9uZG9u
-						MRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEjMCEGA1UECxMaQ09NT0RPIEVWIE11bHRp
-						LURvbWFpbiBTU0wxIjAgBgNVBAMTGWlkcC5zaGliYm9sZXRoLnFtdWwuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDh5MiNTEObfWslVrafeqmP
-						1UD+0U4uUYuDMpX2OFiWRvPVdoIhNJK8InLjRGzM16rArF1VHTvw9L2hg+Mjksql
-						1yaG0FuECmTUk9Jn1rgMo1RVmc036lp5eLAZAxOzj5T3pyiRKqs+QSMHWgwfg6HD
-						U8YaldlqQM9bWtluzSQmx6df1m8DyolCnOBUTR35YwaVuQp9gnafy7i9smvSWhMM
-						9j46BEEYGYJjm0REghRO/3WNRiKaIwiFn4utCGT9/oCu3Nl7yab8HQsAId39UuG9
-						RE2FRJBTe7MuiQ13XllUwJGjCNrqgNldE4UrXHy0hjmFMlhYjY7cH2lCafYfuYTb
-						AgMBAAGjggNUMIIDUDAfBgNVHSMEGDAWgBQ52v/KKBSKqHQTCLnkDqnS+n6daTAd
-						BgNVHQ4EFgQUAlQbTUGQ8qFvPEcR9GoS6dzwfXswDgYDVR0PAQH/BAQDAgWgMAwG
-						A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEYGA1Ud
-						IAQ/MD0wOwYMKwYBBAGyMQECAQUBMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2Vj
-						dXJlLmNvbW9kby5jb20vQ1BTMFYGA1UdHwRPME0wS6BJoEeGRWh0dHA6Ly9jcmwu
-						Y29tb2RvY2EuY29tL0NPTU9ET1JTQUV4dGVuZGVkVmFsaWRhdGlvblNlY3VyZVNl
-						cnZlckNBLmNybDCBhwYIKwYBBQUHAQEEezB5MFEGCCsGAQUFBzAChkVodHRwOi8v
-						Y3J0LmNvbW9kb2NhLmNvbS9DT01PRE9SU0FFeHRlbmRlZFZhbGlkYXRpb25TZWN1
-						cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2Nh
-						LmNvbTAkBgNVHREEHTAbghlpZHAuc2hpYmJvbGV0aC5xbXVsLmFjLnVrMIIBfwYK
-						KwYBBAHWeQIEAgSCAW8EggFrAWkAdgBo9pj4H2SCvjqM7rkoHUz8cVFdZ5PURNEK
-						Z6y7T0/7xAAAAUuDfKLAAAAEAwBHMEUCIAagnCAKc1skTr2wfGwSOzezQJViqYmn
-						gN5+n6ek/kftAiEAhtqDNmjQM9DZWAxkkOpgHjX4vsM8Cah1O26zwqLbXNQAdwCk
-						uQmQtBhYFIe7E6LMZ3AKPDWYBPkb37jjd80OyA3cEAAAAUuDfKLHAAAEAwBIMEYC
-						IQCJANeMiBQF69/wczNISERwZ/4FVTHON1fD4BKgv/AGEwIhAI7zhnDGVs8p1Ccu
-						Ocq8ovoSLnF5KdVJ2n+Jf1PtTLrOAHYAVhQGmi/XwuzT9eG9RLI+x0Z2ubyZEVzA
-						75SYVdaJ0N0AAAFLg3yhXgAABAMARzBFAiA66Y6PGzOrXZfGz56TSNaANr7yO/c7
-						3r778k2gFOtwAAIhAJqdTx8fzxsbvpUvriFZCGVksMhdcIE8XqmoYz9dzTVSMA0G
-						CSqGSIb3DQEBCwUAA4IBAQBAMXgE6G4STF5JNF+hZi/aDHNDR0BSCGiAJ17wyOQI
-						rP2n5QmYU7q63eWAL4nM6IFjm9lekq9iPZxhC5K3XVgtDz4uEh4CVsPKLnkJlthm
-						6uJcAWlpx6XO/JxcgvLkGLVxt3Ew6YASY9kp1lAps+r4Roy4JbpPY2PQ+G6gmdBN
-						XbXYbayAgPnevhUWxVo4/DgWX9xv3UzF7RWbEEgiS5vRr4hb7pLxlbPHfoQI5KUP
-						xXV2KDU0rxMp4uv0an+P+O7ePMr9j6d5+heLkBoM+InoJAoh62GJnZXjr6H2bpJR
-						fvD/ZPNVxn4N4iHxZDaxWwINXVwOgDHod2aU6e61XAve
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.qmul.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.qmul.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">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary, University of London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Evans</SurName>
-    <EmailAddress>mailto:m.d.t.evans@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Jordaan</SurName>
-    <EmailAddress>mailto:steven.t.s.jordaan@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-shibboleth.xml
deleted file mode 100644
index 2fb1a259..00000000
--- a/swamid-interfederations-2.0/idp.shibboleth.stir.ac.uk-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" entityID="https://idp.shibboleth.stir.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Stirling.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">stir.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFdzCCBF+gAwIBAgIQQvec2MkxvhhLg7rQH2/vRTANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDQxNjAwMDAwMFoXDTE2MDQxNTIzNTk1OVowQzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliYm9sZXRo
-						LnN0aXIuYWMudWswggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGn6g9
-						4n1tC+fn1Hd3a/88lcMS4WDp7DJFjT5U6EFBqMXf1PGnVs4CvOButyXIIU/TXnkG
-						nRAEFhoWqDxf2c1bJRbg2rykmfqTvXIFECU8irz8aNigh8mB/YCmm3LBc+8NNbXC
-						NCfsEfZAtBqAhdhuDVzJzIrQItuCWTsBj/L/RSNF5FQGYwQoMlpzVK43X58aGkdS
-						iSdwMCzEkzwI0ungdTu4mKk+JAyEcJ/QYAaF+sBVAPe/6uTQjbfg/Vmu2nqYBgiS
-						gmrZezi38Z8phcQSzGcVFIFlnUvYo+dQd3WsKG66D1HfWsXJjB5b/aOzC//SS3VA
-						sz5XjTVQFXPzUubmg6Zr6uOI4VxEsTPT8+THD3XRfiKFx8wT//HavMu6Q+V4qu1T
-						OelMe+iQtD4I6qOiG5u4Q/mJKBXL2jaPRubgwmCLvBcUPy9qcMhj3cNhq3L2MdbV
-						pxNC7n6U+1H1VuJwkEgrHo0LMN2TJ1bWw7Ka+Gx5opAIbzxU1781HSOQomEyjZ7l
-						A+5QZakT5oCK/T7s6tOiyyeHFfynzjLt12vX5QAjcg4+DfV8tIBMPzhcsXdNhYXO
-						0NrwwaPobyc3n8GK6kWo6/JFIbNug3QsHh2B2UFaSKTFB+BAyFp/X3CHqvqkBomR
-						klrTWhvJO20Ua+1FihxLRnaRM9hw1Ytm5eKwowIDAQABo4IBcjCCAW4wHwYDVR0j
-						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFF8S3EXPgDW49jHO
-						kJ7QbDlNY5gHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
-						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgId
-						MAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-						bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-						MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-						CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
-						ghVzaGliYm9sZXRoLnN0aXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAKoUdUXu
-						KipklEzb71oC7zQLTxrAT73eYsG841zn/uCBKAjDDnBgtpXXAKphRZD+CMyBlbAB
-						ZtY6orxoLMObKr3Lwhd6+dxOjyQplF70/dOQalkoErVp3iuz2ahgs4PKAgWm/8lW
-						mvIYFXIEVznxDSF9WTuZjiXB+tRYv9K7MftLKgHkD9jtdrzTwL7ZeTilJalN5KZR
-						OvGyZ76NXtrh/uMBaCIg45uxWQsXFSPwNz8H8emPeH1nT0wguRZh+S/ofr53xUlJ
-						U+wjeuZgmnQ2RAp9+zNrV0h7wagFs+L7XIcOuYu2HWi8Rl24BXT3j3WIdBe1IP79
-						4jGYQXK/vvWeCfE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stir.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://shibboleth.stir.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.stir.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.stir.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.stir.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">stir.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFdzCCBF+gAwIBAgIQQvec2MkxvhhLg7rQH2/vRTANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDQxNjAwMDAwMFoXDTE2MDQxNTIzNTk1OVowQzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVzaGliYm9sZXRo
-						LnN0aXIuYWMudWswggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGn6g9
-						4n1tC+fn1Hd3a/88lcMS4WDp7DJFjT5U6EFBqMXf1PGnVs4CvOButyXIIU/TXnkG
-						nRAEFhoWqDxf2c1bJRbg2rykmfqTvXIFECU8irz8aNigh8mB/YCmm3LBc+8NNbXC
-						NCfsEfZAtBqAhdhuDVzJzIrQItuCWTsBj/L/RSNF5FQGYwQoMlpzVK43X58aGkdS
-						iSdwMCzEkzwI0ungdTu4mKk+JAyEcJ/QYAaF+sBVAPe/6uTQjbfg/Vmu2nqYBgiS
-						gmrZezi38Z8phcQSzGcVFIFlnUvYo+dQd3WsKG66D1HfWsXJjB5b/aOzC//SS3VA
-						sz5XjTVQFXPzUubmg6Zr6uOI4VxEsTPT8+THD3XRfiKFx8wT//HavMu6Q+V4qu1T
-						OelMe+iQtD4I6qOiG5u4Q/mJKBXL2jaPRubgwmCLvBcUPy9qcMhj3cNhq3L2MdbV
-						pxNC7n6U+1H1VuJwkEgrHo0LMN2TJ1bWw7Ka+Gx5opAIbzxU1781HSOQomEyjZ7l
-						A+5QZakT5oCK/T7s6tOiyyeHFfynzjLt12vX5QAjcg4+DfV8tIBMPzhcsXdNhYXO
-						0NrwwaPobyc3n8GK6kWo6/JFIbNug3QsHh2B2UFaSKTFB+BAyFp/X3CHqvqkBomR
-						klrTWhvJO20Ua+1FihxLRnaRM9hw1Ytm5eKwowIDAQABo4IBcjCCAW4wHwYDVR0j
-						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFF8S3EXPgDW49jHO
-						kJ7QbDlNY5gHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
-						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgId
-						MAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-						bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-						MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-						CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
-						ghVzaGliYm9sZXRoLnN0aXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAKoUdUXu
-						KipklEzb71oC7zQLTxrAT73eYsG841zn/uCBKAjDDnBgtpXXAKphRZD+CMyBlbAB
-						ZtY6orxoLMObKr3Lwhd6+dxOjyQplF70/dOQalkoErVp3iuz2ahgs4PKAgWm/8lW
-						mvIYFXIEVznxDSF9WTuZjiXB+tRYv9K7MftLKgHkD9jtdrzTwL7ZeTilJalN5KZR
-						OvGyZ76NXtrh/uMBaCIg45uxWQsXFSPwNz8H8emPeH1nT0wguRZh+S/ofr53xUlJ
-						U+wjeuZgmnQ2RAp9+zNrV0h7wagFs+L7XIcOuYu2HWi8Rl24BXT3j3WIdBe1IP79
-						4jGYQXK/vvWeCfE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stir.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stir.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 Stirling</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Stirling</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stir.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Information Centre</GivenName>
-    <EmailAddress>mailto:infocentre@stir.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>White</SurName>
-    <EmailAddress>mailto:michael.white@stir.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.ttu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.shibboleth.ttu.edu-idp-shibboleth.xml
deleted file mode 100644
index 7c75ab54..00000000
--- a/swamid-interfederations-2.0/idp.shibboleth.ttu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://idp.shibboleth.ttu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">ttu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Texas Tech University</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>
-MIIDRDCCAiygAwIBAgIVAPD3XAIRckWiM8m7Oiu6nDm4mM/QMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMMFmlkcC5zaGliYm9sZXRoLnR0dS5lZHUwHhcNMTUwNDAx
-MTQyOTU0WhcNMzUwNDAxMTQyOTU0WjAhMR8wHQYDVQQDDBZpZHAuc2hpYmJvbGV0
-aC50dHUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmFA9i78E
-Oy4fx44dGkzvx19T9RvdgKNFOX6JqLiHWPjXtWF8kfH/9vfjjO7eoAMWpZS0N2o3
-dDJeCaWsdKXJZ+xZ6c/OW7J/qByN62kH84PDaGWOURPy1FXNBjwvXhB0rnWVcdie
-mdgH/LLBP1+zwiq/FKglLHB+ltPxe6kNVCsMNb2A7BOtavkl8W89a/6jQXVeVA2h
-younKcOKBuB2KndkAEcvUS584JfJaNmDUCnwk2EJszJAvXYLZoi30sa0kDVBKDbI
-kX7i3zVz5+fgG9TdxeFE98ueG7z67xfQ5Rvik2P2tGXSAn1VttoLmFZwB4hoxdBN
-vImc/CBHUTPoUQIDAQABo3MwcTAdBgNVHQ4EFgQUGt0EVRSJ/mOA7ASHmOzyC5nR
-bE4wUAYDVR0RBEkwR4IWaWRwLnNoaWJib2xldGgudHR1LmVkdYYtaHR0cHM6Ly9p
-ZHAuc2hpYmJvbGV0aC50dHUuZWR1L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-BQUAA4IBAQAZQAkMw1LQhEroAOaurZEjaOwACJ0sAUQ7aM1jDEoy5DvJ6A9thRi5
-+GuveN3l6xh9W0srXCAQoqaImONOlMFF5w+qL83iGozfNBwrK5UEPnVQZnewZPDd
-/pB02ehS2nhwZOf4GHHR+SXsGhJ+w7qu10qFNE2p2BtqQPdWW4Wt76+J7bCqHhGb
-oQb5rHmWTJWcROONosbFNaGMIv204ljvkxN4JPAtpGSyVcDYUElbZcUgWmAZ7Y4c
-vVObMDl/Nb5UoB1tj4zq8Gf1WpDj1iOpv9QkH9+X1jZWlrnTNqc5pTgXu9Jd4WtM
-p/PLUr+DuI3pWSnU6Qfj7IpU/pTFoIOR
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.ttu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.ttu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.shibboleth.ttu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shibboleth.ttu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shibboleth.ttu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAPD3XAIRckWiM8m7Oiu6nDm4mM/QMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMMFmlkcC5zaGliYm9sZXRoLnR0dS5lZHUwHhcNMTUwNDAx
-MTQyOTU0WhcNMzUwNDAxMTQyOTU0WjAhMR8wHQYDVQQDDBZpZHAuc2hpYmJvbGV0
-aC50dHUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmFA9i78E
-Oy4fx44dGkzvx19T9RvdgKNFOX6JqLiHWPjXtWF8kfH/9vfjjO7eoAMWpZS0N2o3
-dDJeCaWsdKXJZ+xZ6c/OW7J/qByN62kH84PDaGWOURPy1FXNBjwvXhB0rnWVcdie
-mdgH/LLBP1+zwiq/FKglLHB+ltPxe6kNVCsMNb2A7BOtavkl8W89a/6jQXVeVA2h
-younKcOKBuB2KndkAEcvUS584JfJaNmDUCnwk2EJszJAvXYLZoi30sa0kDVBKDbI
-kX7i3zVz5+fgG9TdxeFE98ueG7z67xfQ5Rvik2P2tGXSAn1VttoLmFZwB4hoxdBN
-vImc/CBHUTPoUQIDAQABo3MwcTAdBgNVHQ4EFgQUGt0EVRSJ/mOA7ASHmOzyC5nR
-bE4wUAYDVR0RBEkwR4IWaWRwLnNoaWJib2xldGgudHR1LmVkdYYtaHR0cHM6Ly9p
-ZHAuc2hpYmJvbGV0aC50dHUuZWR1L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-BQUAA4IBAQAZQAkMw1LQhEroAOaurZEjaOwACJ0sAUQ7aM1jDEoy5DvJ6A9thRi5
-+GuveN3l6xh9W0srXCAQoqaImONOlMFF5w+qL83iGozfNBwrK5UEPnVQZnewZPDd
-/pB02ehS2nhwZOf4GHHR+SXsGhJ+w7qu10qFNE2p2BtqQPdWW4Wt76+J7bCqHhGb
-oQb5rHmWTJWcROONosbFNaGMIv204ljvkxN4JPAtpGSyVcDYUElbZcUgWmAZ7Y4c
-vVObMDl/Nb5UoB1tj4zq8Gf1WpDj1iOpv9QkH9+X1jZWlrnTNqc5pTgXu9Jd4WtM
-p/PLUr+DuI3pWSnU6Qfj7IpU/pTFoIOR
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.ttu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Texas Tech University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Texas Tech University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ttu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Telecommunications Network Systems</md:GivenName>
-    <md:EmailAddress>nis@ttu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Telecommunications Network Systems</md:GivenName>
-    <md:EmailAddress>nis@ttu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Telecommunications Network Systems</md:GivenName>
-    <md:EmailAddress>nis@ttu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ship.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ship.edu-idp-shibboleth.xml
deleted file mode 100644
index 909bb04a..00000000
--- a/swamid-interfederations-2.0/idp.ship.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,127 +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://idp.ship.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.ship.edu/idp/error.jsp" 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">ship.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Shippensburg University of Pennsylvania</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Shippensburg, Pennsylvania</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ship.edu/technology</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.ship.edu/Technology/Policies/Computing_and_Information_Network_Usage_Policy/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="900" width="1200" xml:lang="en">https://idp.ship.edu/ShipLogo.jpg</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>
-MIIFgDCCBGigAwIBAgIQIIqv7avkn41Rrf4h3IiBujANBgkqhkiG9w0BAQsFADB2
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjES
-MBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMW
-SW5Db21tb24gUlNBIFNlcnZlciBDQTAeFw0xNDEyMDkwMDAwMDBaFw0xNzEyMDgy
-MzU5NTlaMIG9MQswCQYDVQQGEwJVUzEOMAwGA1UEERMFMTcyNTcxCzAJBgNVBAgT
-AlBBMRUwEwYDVQQHEwxTaGlwcGVuc2J1cmcxGTAXBgNVBAkTEDE4NzEgT2xkIE1h
-aW4gRHIxIDAeBgNVBAoTF1NoaXBwZW5zYnVyZyBVbml2ZXJzaXR5MSYwJAYDVQQL
-Ex1Db21wdXRpbmcgVGVjaG5vbG9naWVzIENlbnRlcjEVMBMGA1UEAxMMaWRwLnNo
-aXAuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7DSYzTNKxc/G
-TK8e+bCrtl/1BncZVNu4BOigHFeL3zWwgBjvVppVJtza/ipj33Yb3Svxw3E7y7Ql
-4ZBnnahQcAKaBZogfvfefDIhkllVz8vhtaa4BLcl1241BrDBi86kV0/T1J8WHuYc
-pCOFiSmzHdpZA67eMX2nIgZfOiNayNty1w8LNJadOZsy670SaV878UM4PU2I7Rnj
-ThKBEl0symd5n8gEUZA9BpcyhLTmIeDAvX7y+ho0LzrujYTbWF8l9e5l0f1ytd/D
-zO2i6JnAmRAmuwb9j26myFo1S/f2PhnITI+6N/leZt1Tzy0Zqbva1OY3IR6hrDHm
-bHj10cl30wIDAQABo4IBwDCCAbwwHwYDVR0jBBgwFoAUHgWjd49sluJbh0umtIas
-cQAM5zgwHQYDVR0OBBYEFMwl/1ZxqnDlJeQc5D40kklquGpZMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjBnBgNVHSAEYDBeMFIGDCsGAQQBriMBBAMBATBCMEAGCCsGAQUFBwIBFjRodHRw
-czovL3d3dy5pbmNvbW1vbi5vcmcvY2VydC9yZXBvc2l0b3J5L2Nwc19zc2wucGRm
-MAgGBmeBDAECAjBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vY3JsLmluY29tbW9u
-LXJzYS5vcmcvSW5Db21tb25SU0FTZXJ2ZXJDQS5jcmwwdQYIKwYBBQUHAQEEaTBn
-MD4GCCsGAQUFBzAChjJodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20vSW5Db21tb25S
-U0FTZXJ2ZXJDQV8yLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRy
-dXN0LmNvbTAXBgNVHREEEDAOggxpZHAuc2hpcC5lZHUwDQYJKoZIhvcNAQELBQAD
-ggEBAAECWt1wp9jnH/7TlHwg9xJzaRO8UawTQiiTp8oHqLKiOxzFcCPzJEatUfwF
-QuTuAEdvv5jvlwLPtZqkaiVdTAxKjVgxCBKlSRqdRiHkXHeeKlN6/dE9SSKpS/3n
-/nnKpgwK0kfXkOTFbcFOaEEehY/oIHlEPONUn5dNDB5EMaNRKh9ATwLe6G2V1KT8
-wPwL6yo+Dk5PsGngpwy+ujQOhSJoCCbzoBFlDzpTHp8gl2hpScUQOLziW8M1BpRP
-LJQxOR1AvCp9E0gAFMTuOWaDR1Ybwllg3C7YizSUcK669Z4zjx/0+hcgDFbNpBov
-IvnQF4KSwZqAOukHhzVkzkfPjiI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ship.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ship.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ship.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ship.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ship.edu/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ship.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFgDCCBGigAwIBAgIQIIqv7avkn41Rrf4h3IiBujANBgkqhkiG9w0BAQsFADB2
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjES
-MBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMW
-SW5Db21tb24gUlNBIFNlcnZlciBDQTAeFw0xNDEyMDkwMDAwMDBaFw0xNzEyMDgy
-MzU5NTlaMIG9MQswCQYDVQQGEwJVUzEOMAwGA1UEERMFMTcyNTcxCzAJBgNVBAgT
-AlBBMRUwEwYDVQQHEwxTaGlwcGVuc2J1cmcxGTAXBgNVBAkTEDE4NzEgT2xkIE1h
-aW4gRHIxIDAeBgNVBAoTF1NoaXBwZW5zYnVyZyBVbml2ZXJzaXR5MSYwJAYDVQQL
-Ex1Db21wdXRpbmcgVGVjaG5vbG9naWVzIENlbnRlcjEVMBMGA1UEAxMMaWRwLnNo
-aXAuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7DSYzTNKxc/G
-TK8e+bCrtl/1BncZVNu4BOigHFeL3zWwgBjvVppVJtza/ipj33Yb3Svxw3E7y7Ql
-4ZBnnahQcAKaBZogfvfefDIhkllVz8vhtaa4BLcl1241BrDBi86kV0/T1J8WHuYc
-pCOFiSmzHdpZA67eMX2nIgZfOiNayNty1w8LNJadOZsy670SaV878UM4PU2I7Rnj
-ThKBEl0symd5n8gEUZA9BpcyhLTmIeDAvX7y+ho0LzrujYTbWF8l9e5l0f1ytd/D
-zO2i6JnAmRAmuwb9j26myFo1S/f2PhnITI+6N/leZt1Tzy0Zqbva1OY3IR6hrDHm
-bHj10cl30wIDAQABo4IBwDCCAbwwHwYDVR0jBBgwFoAUHgWjd49sluJbh0umtIas
-cQAM5zgwHQYDVR0OBBYEFMwl/1ZxqnDlJeQc5D40kklquGpZMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjBnBgNVHSAEYDBeMFIGDCsGAQQBriMBBAMBATBCMEAGCCsGAQUFBwIBFjRodHRw
-czovL3d3dy5pbmNvbW1vbi5vcmcvY2VydC9yZXBvc2l0b3J5L2Nwc19zc2wucGRm
-MAgGBmeBDAECAjBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vY3JsLmluY29tbW9u
-LXJzYS5vcmcvSW5Db21tb25SU0FTZXJ2ZXJDQS5jcmwwdQYIKwYBBQUHAQEEaTBn
-MD4GCCsGAQUFBzAChjJodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20vSW5Db21tb25S
-U0FTZXJ2ZXJDQV8yLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRy
-dXN0LmNvbTAXBgNVHREEEDAOggxpZHAuc2hpcC5lZHUwDQYJKoZIhvcNAQELBQAD
-ggEBAAECWt1wp9jnH/7TlHwg9xJzaRO8UawTQiiTp8oHqLKiOxzFcCPzJEatUfwF
-QuTuAEdvv5jvlwLPtZqkaiVdTAxKjVgxCBKlSRqdRiHkXHeeKlN6/dE9SSKpS/3n
-/nnKpgwK0kfXkOTFbcFOaEEehY/oIHlEPONUn5dNDB5EMaNRKh9ATwLe6G2V1KT8
-wPwL6yo+Dk5PsGngpwy+ujQOhSJoCCbzoBFlDzpTHp8gl2hpScUQOLziW8M1BpRP
-LJQxOR1AvCp9E0gAFMTuOWaDR1Ybwllg3C7YizSUcK669Z4zjx/0+hcgDFbNpBov
-IvnQF4KSwZqAOukHhzVkzkfPjiI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ship.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Shippensburg University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Shippensburg University of Pennsylvania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://ship.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shippensburg University Computing Technologies Center</md:GivenName>
-    <md:EmailAddress>idp@ship.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Shippensburg University Computing Technologies Center</md:GivenName>
-    <md:EmailAddress>idp@ship.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Shippensburg University Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@ship.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.shu.ac.uk-shibboleth.xml
deleted file mode 100644
index 4f63eb54..00000000
--- a/swamid-interfederations-2.0/idp.shu.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.shu.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth Identity Provider for Sheffield Hallam University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">shu.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sheffield Hallam University</mdui:DisplayName>
-        <mdui:Logo height="43" width="80">https://extra.shu.ac.uk/ukfed/shu-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>
-						MIIEPjCCAyagAwIBAgIJANXnLNjnFdG5MA0GCSqGSIb3DQEBBQUAMIGfMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECBMPU291dGggWW9ya3NoaXJlMRIwEAYDVQQHEwlTaGVm
-						ZmllbGQxJDAiBgNVBAoTG1NoZWZmaWVsZCBIYWxsYW0gVW5pdmVyc2l0eTEkMCIG
-						A1UECxQbU3R1ZGVudCAmIExlYXJuaW5nIFNlcnZpY2VzMRYwFAYDVQQDEw1pZHAu
-						c2h1LmFjLnVrMB4XDTEzMDQxNzEyMjgyMloXDTIzMDQxNTEyMjgyMlowgZ8xCzAJ
-						BgNVBAYTAkdCMRgwFgYDVQQIEw9Tb3V0aCBZb3Jrc2hpcmUxEjAQBgNVBAcTCVNo
-						ZWZmaWVsZDEkMCIGA1UEChMbU2hlZmZpZWxkIEhhbGxhbSBVbml2ZXJzaXR5MSQw
-						IgYDVQQLFBtTdHVkZW50ICYgTGVhcm5pbmcgU2VydmljZXMxFjAUBgNVBAMTDWlk
-						cC5zaHUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuW416
-						Pl4npHeAmyrW3n2vFClbxTr9V2U78FNTSG3ZcI5L4Yq/6RiiU90o8gzgHKWljfio
-						Ekx361zSrch84AuE5WFDc+tjXY7LfcrnVS4Vq/uk1UBAip/rvnSjkvG7eQxwo+uw
-						Hbl1nsZd1g2+e3EIWOenVk+/1F4CaQi7oyx9lmVU1OqX1P8FjS9YE0KWh0cppzll
-						aYN67fm1ahVHL0DSAiW0/tsZqUTcMK6SuaiGyijYC1RSH/sJxlaR5wNvoKSfowr+
-						YMKcD/IpYxDpyqXldPuNjZNkWEjffAPnphRZc27G0THOtdIxmQ75uveBUJHILivY
-						Av2nZK57RHe5kLF3AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
-						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQ8AKwYB1Wj
-						Ww1YwE0CmgD64hNpaTAfBgNVHSMEGDAWgBQ8AKwYB1WjWw1YwE0CmgD64hNpaTAN
-						BgkqhkiG9w0BAQUFAAOCAQEAROO+SyHXrArH+14peCMWvIi2rf6FrKhbATmMNh3z
-						ff1pCCCdhCAAjDPgyLJkJRye4qwUZ0UswSfolowqbT1b6qyV3eka2y3inmVrWR65
-						o0B12LDsD2Xw1dlepsB87a/2AaXoMlWPr9ka3fH3bL//BiCleUbP9C+RMIlKmfw+
-						HyCSmwmzwOGUe5LsfT9DNJ+0XnYmGIjsTVvhngrhUVwnqC6r7KaQYXbYnaeG05Zv
-						eW2XrAsGKATf6ILhGnVWK2tGOekfyb5qaa3rAlTiAxeXYvO7GVo1KDKIt7T/4RiD
-						WFFlehGW+U5vzTOD62jQeVmq/gcPZqB5TkizAcYdMnzoWw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shu.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.shu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shu.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">shu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEPjCCAyagAwIBAgIJANXnLNjnFdG5MA0GCSqGSIb3DQEBBQUAMIGfMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECBMPU291dGggWW9ya3NoaXJlMRIwEAYDVQQHEwlTaGVm
-						ZmllbGQxJDAiBgNVBAoTG1NoZWZmaWVsZCBIYWxsYW0gVW5pdmVyc2l0eTEkMCIG
-						A1UECxQbU3R1ZGVudCAmIExlYXJuaW5nIFNlcnZpY2VzMRYwFAYDVQQDEw1pZHAu
-						c2h1LmFjLnVrMB4XDTEzMDQxNzEyMjgyMloXDTIzMDQxNTEyMjgyMlowgZ8xCzAJ
-						BgNVBAYTAkdCMRgwFgYDVQQIEw9Tb3V0aCBZb3Jrc2hpcmUxEjAQBgNVBAcTCVNo
-						ZWZmaWVsZDEkMCIGA1UEChMbU2hlZmZpZWxkIEhhbGxhbSBVbml2ZXJzaXR5MSQw
-						IgYDVQQLFBtTdHVkZW50ICYgTGVhcm5pbmcgU2VydmljZXMxFjAUBgNVBAMTDWlk
-						cC5zaHUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuW416
-						Pl4npHeAmyrW3n2vFClbxTr9V2U78FNTSG3ZcI5L4Yq/6RiiU90o8gzgHKWljfio
-						Ekx361zSrch84AuE5WFDc+tjXY7LfcrnVS4Vq/uk1UBAip/rvnSjkvG7eQxwo+uw
-						Hbl1nsZd1g2+e3EIWOenVk+/1F4CaQi7oyx9lmVU1OqX1P8FjS9YE0KWh0cppzll
-						aYN67fm1ahVHL0DSAiW0/tsZqUTcMK6SuaiGyijYC1RSH/sJxlaR5wNvoKSfowr+
-						YMKcD/IpYxDpyqXldPuNjZNkWEjffAPnphRZc27G0THOtdIxmQ75uveBUJHILivY
-						Av2nZK57RHe5kLF3AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
-						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQ8AKwYB1Wj
-						Ww1YwE0CmgD64hNpaTAfBgNVHSMEGDAWgBQ8AKwYB1WjWw1YwE0CmgD64hNpaTAN
-						BgkqhkiG9w0BAQUFAAOCAQEAROO+SyHXrArH+14peCMWvIi2rf6FrKhbATmMNh3z
-						ff1pCCCdhCAAjDPgyLJkJRye4qwUZ0UswSfolowqbT1b6qyV3eka2y3inmVrWR65
-						o0B12LDsD2Xw1dlepsB87a/2AaXoMlWPr9ka3fH3bL//BiCleUbP9C+RMIlKmfw+
-						HyCSmwmzwOGUe5LsfT9DNJ+0XnYmGIjsTVvhngrhUVwnqC6r7KaQYXbYnaeG05Zv
-						eW2XrAsGKATf6ILhGnVWK2tGOekfyb5qaa3rAlTiAxeXYvO7GVo1KDKIt7T/4RiD
-						WFFlehGW+U5vzTOD62jQeVmq/gcPZqB5TkizAcYdMnzoWw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shu.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">Sheffield Hallam University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sheffield Hallam University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.shu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Help</GivenName>
-    <EmailAddress>mailto:ithelp@shu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Turner</SurName>
-    <EmailAddress>mailto:a.p.turner@shu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gavin</GivenName>
-    <SurName>Moore</SurName>
-    <EmailAddress>mailto:g.r.moore@shu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.si.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.si.edu-idp-shibboleth.xml
deleted file mode 100644
index 91e1bf7f..00000000
--- a/swamid-interfederations-2.0/idp.si.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,72 +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://idp.si.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">si.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Smithsonian Institution</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>
-MIIDEzCCAfugAwIBAgIURicbi+W5DJNnSH6V80PzY0w8bqowDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLnNpLmVkdTAeFw0xMTA4MTYxMzE4NDRaFw0zMTA4
-MTYxMzE4NDRaMBUxEzARBgNVBAMTCmlkcC5zaS5lZHUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCsLSjr8Hs24ca3oKpOoRUVpnbgx1ixdBcVGXywde+Z
-24zgm9rvRDucxCwQH1LYSCGXSfDChVmutdPZkAsSdt/j6eUp3VvRLIy8zA2lb/+Z
-4rIzRX/+07+Ti65FjgZ7rE4SiNQua0fsvkTtZuvJqJcfS7itrGQnzJ9vSq42Rbrp
-KjXUZHTWxSi2FEcfdiQqifo8rmV/uvCaTma4n4WzMxQOuN9Jfpz2FvobSZuW/dcd
-kCfsvoNBYW4zBQ/6bKMINlcWxVWVhrQe2ycZzp0q/E/8wr1SPfKiKWjaRylmA3Td
-8sGfDuIegpc8C+m8yYbs4AUQ38FGP9lCSHoEAgfBX503AgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5zaS5lZHWGIWh0dHBzOi8vaWRwLnNpLmVkdS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUH7eODleiY1FnkHhARn6bhlXc5yswDQYJKoZIhvcNAQEF
-BQADggEBABTIKmvq4Pu9qZiRYRSpCX2WcLbHqbZ651mdIXcmz3QB9xIeyWDCWRzp
-lH+Zg2Zt4SBareU5m1UTnJxzyQRAFqopbxFqxhwDtd7Q/s23TH8C0XEvOu4RYOMG
-uMpOhcoMM2RulU/8MY4ga7wmOUkNcDpmorurVUT44puSi3jxUegUSwsVhHIJeIBL
-vcfm468S++LCzuKnkKiOYXSxaQlAjZDD5zOH8CBADP/A/CEzdf3mPBCMx/Hhtcsk
-BOetPLICbnq+Qh8VieTSm1b2EcS/c2NqtwbBv0RSsjN/LwIMmyTyUTagP360Nhvb
-RfYItwvvswQ2wtebkQpbdpNcuE7Ng8g=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.si.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.si.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.si.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.si.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Smithsonian Institution</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Smithsonian Institution</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.si.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jeffrey McAvoy</md:GivenName>
-    <md:EmailAddress>mcavoyj@si.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Weber Wung</md:GivenName>
-    <md:EmailAddress>wungw@si.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alex Aveta</md:GivenName>
-    <md:EmailAddress>AvetaA@si.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jas Jamwal</md:GivenName>
-    <md:EmailAddress>JamwalJ@si.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml
deleted file mode 100644
index e02aaf61..00000000
--- a/swamid-interfederations-2.0/idp.sics.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sics.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">sics.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SICS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">SICS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for SICS</mdui:Description>
-        <mdui:Description xml:lang="sv">Identity Provider för SICS</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.sics.se</mdui:InformationURL>
-        <mdui:Logo height="95" width="328">https://www.sics.se/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>sics.se</mdui:DomainHint>
-        <mdui:DomainHint>tii.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.64.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.135.0/24</mdui:IPHint>
-        <mdui:IPHint>192.71.100.0/25</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFKzCCBBOgAwIBAgIQDFPDqRLGthue9PVUlHMf7DANBgkqhkiG9w0BAQUFADBm
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBDQS0zMB4XDTEzMDExMDAwMDAwMFoXDTE2MDMxNTEyMDAwMFowaDELMAkGA1UE
-BhMCU0UxFzAVBgNVBAgTDlN0b2NraG9sbXMgTGFuMQ4wDAYDVQQHEwVLaXN0YTEc
-MBoGA1UEChMTU0lDUyBTd2VkaXNoIElDVCBBQjESMBAGA1UEAwwJKi5zaWNzLnNl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsbJY78glP+QcpN/1pTDl
-x658C3OYBSAKMDPy9CeHcFtvhoGa+s+vS49L4a2LPPqQkEJINRI+OhFUeLu034dA
-9TKZ6ptsOEJkjYjJ+BcCkCw/zi0crOJWgXWWc+Rdqg9nasHWMFO0Js67JnACv2OJ
-mrnj3BBN5hMaeOTu7YTs4T7qwz5LSpttenGUicLiot2m/ZekEgCHYgLaPhNV3waX
-5WYkUlQIWCR7PFlrZDxedmS4R6NGeQdtihcM2IvzlfB2MajrGf/+62jEoYqZrcb8
-zYEDuFJjQl/BM2Os6HelcRZxi+OD+ZOHDsM1C9taeG7wQp0opvNdZQrf4DO53reY
-TQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUUOpzidsp+xCPnuUBINTeeZlIg/cw
-HQYDVR0OBBYEFBJBAFefeNXl1kFec1rnaA62ttNhMCoGA1UdEQQjMCGCCSouc2lj
-cy5zZYIHc2ljcy5zZYILaWRwLnNpY3Muc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBhBgNVHR8EWjBYMCqgKKAmhiRodHRw
-Oi8vY3JsMy5kaWdpY2VydC5jb20vY2EzLWcyOC5jcmwwKqAooCaGJGh0dHA6Ly9j
-cmw0LmRpZ2ljZXJ0LmNvbS9jYTMtZzI4LmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG
-/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
-MHsGCCsGAQUFBwEBBG8wbTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNl
-cnQuY29tMEUGCCsGAQUFBzAChjlodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20v
-RGlnaUNlcnRIaWdoQXNzdXJhbmNlQ0EtMy5jcnQwDAYDVR0TAQH/BAIwADANBgkq
-hkiG9w0BAQUFAAOCAQEAPwtD1Bv5RBu9+KMT/JyVrTrAH66jS1pFqDHQAYoFDvdV
-ebxTYVH/HQjRhKlykH+EUGpfYXWOhzlI0mqhCkfcqZK2CFxOf+lWxQ2V5vBFM8kF
-lhRU+z3mEG8SvZ4tmybjutbmBhjcOo22cqpNsqL0hIOqt+zoxMI/nZTeClQj3SlT
-/bgk9BXnvISi5P+zHMXuVYFmzWeKlr8oKFbIzAPTaJkm0c40+zBar/siKNOmHgio
-XnX1bzCBFJxjpRM6ZDPIos7p3UMsWRKu5BJndINmR5oxYVMOxX+BV3zR04p4WR1N
-SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sics.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sics.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sics.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sics.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sics.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">sics.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFKzCCBBOgAwIBAgIQDFPDqRLGthue9PVUlHMf7DANBgkqhkiG9w0BAQUFADBm
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBDQS0zMB4XDTEzMDExMDAwMDAwMFoXDTE2MDMxNTEyMDAwMFowaDELMAkGA1UE
-BhMCU0UxFzAVBgNVBAgTDlN0b2NraG9sbXMgTGFuMQ4wDAYDVQQHEwVLaXN0YTEc
-MBoGA1UEChMTU0lDUyBTd2VkaXNoIElDVCBBQjESMBAGA1UEAwwJKi5zaWNzLnNl
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsbJY78glP+QcpN/1pTDl
-x658C3OYBSAKMDPy9CeHcFtvhoGa+s+vS49L4a2LPPqQkEJINRI+OhFUeLu034dA
-9TKZ6ptsOEJkjYjJ+BcCkCw/zi0crOJWgXWWc+Rdqg9nasHWMFO0Js67JnACv2OJ
-mrnj3BBN5hMaeOTu7YTs4T7qwz5LSpttenGUicLiot2m/ZekEgCHYgLaPhNV3waX
-5WYkUlQIWCR7PFlrZDxedmS4R6NGeQdtihcM2IvzlfB2MajrGf/+62jEoYqZrcb8
-zYEDuFJjQl/BM2Os6HelcRZxi+OD+ZOHDsM1C9taeG7wQp0opvNdZQrf4DO53reY
-TQIDAQABo4IB0TCCAc0wHwYDVR0jBBgwFoAUUOpzidsp+xCPnuUBINTeeZlIg/cw
-HQYDVR0OBBYEFBJBAFefeNXl1kFec1rnaA62ttNhMCoGA1UdEQQjMCGCCSouc2lj
-cy5zZYIHc2ljcy5zZYILaWRwLnNpY3Muc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBhBgNVHR8EWjBYMCqgKKAmhiRodHRw
-Oi8vY3JsMy5kaWdpY2VydC5jb20vY2EzLWcyOC5jcmwwKqAooCaGJGh0dHA6Ly9j
-cmw0LmRpZ2ljZXJ0LmNvbS9jYTMtZzI4LmNybDBCBgNVHSAEOzA5MDcGCWCGSAGG
-/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
-MHsGCCsGAQUFBwEBBG8wbTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNl
-cnQuY29tMEUGCCsGAQUFBzAChjlodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20v
-RGlnaUNlcnRIaWdoQXNzdXJhbmNlQ0EtMy5jcnQwDAYDVR0TAQH/BAIwADANBgkq
-hkiG9w0BAQUFAAOCAQEAPwtD1Bv5RBu9+KMT/JyVrTrAH66jS1pFqDHQAYoFDvdV
-ebxTYVH/HQjRhKlykH+EUGpfYXWOhzlI0mqhCkfcqZK2CFxOf+lWxQ2V5vBFM8kF
-lhRU+z3mEG8SvZ4tmybjutbmBhjcOo22cqpNsqL0hIOqt+zoxMI/nZTeClQj3SlT
-/bgk9BXnvISi5P+zHMXuVYFmzWeKlr8oKFbIzAPTaJkm0c40+zBar/siKNOmHgio
-XnX1bzCBFJxjpRM6ZDPIos7p3UMsWRKu5BJndINmR5oxYVMOxX+BV3zR04p4WR1N
-SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SICS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SICS</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">SICS</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.sics.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>SICS</md:Company>
-    <md:SurName>CRIT</md:SurName>
-    <md:EmailAddress>mailto:crit@sics.se</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 5b50dd41..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sissa.it/idp/shibboleth">
-  <md: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>
-  </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">sissa.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sissa.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sissa.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sissa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sissa.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sissa.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SISSA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">SISSA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sissa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.sissa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Massimiliano</md:GivenName>
-    <md:SurName>Ritossa</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@sissa.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:helpdesk@sissa.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0e46da2b..00000000
--- a/swamid-interfederations-2.0/idp.sissa.it.xml
+++ /dev/null
@@ -1,82 +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: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.sissa.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-09-09T11:40:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope 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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>
-                urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-            </md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sissa.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sissa.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sissa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sissa.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">sissa.it</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>
-                urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-            </md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SISSA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">SISSA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sissa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.sissa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Massimiliano</md:GivenName>
-    <md:SurName>Ritossa</md:SurName>
-    <md:EmailAddress>helpdesk@sissa.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>helpdesk@sissa.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.slcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.slcollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index aafe6a23..00000000
--- a/swamid-interfederations-2.0/idp.slcollege.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.slcollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for South Leicestershire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-30T12:06:34Z">
-      <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">slcollege.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">South Leicestershire College (Shibboleth)</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://www.slcollege.ac.uk/images/logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.slcollege.ac.uk/images/logo-icon.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAL6tdh1Q1lgaE74wTineZn7NGaKtMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE2lkcC5zbGNvbGxlZ2UuYWMudWswHhcNMTQwNDAxMTA1
-						NDIxWhcNMzQwNDAxMTA1NDIxWjAeMRwwGgYDVQQDExNpZHAuc2xjb2xsZWdlLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz5xw2zn0ZCNoGTF0
-						IzSScZwrds6DeeibqHIPU/zOo4RCc1xz60BHSDsHyWCE5PNjnzB15yZXN0cqRTbN
-						5i8xRWgC0RJj6IguR5ntRhqMA8i+j0rU8J3w8wagV8bueDdp8o2iEBUgw8+VQA+Q
-						k7JP4sWi9yhU6ekSLeGeEl8dWLOS9Jn2siB9KTg8pqp1PwXKR+KVW+gsInoFms+L
-						ODiNsZ+HKEV2OVM0OarV2cND2gxH5VKxlA/KD9YQi0jc7oYWebMuwi0St6YzlgTL
-						872Y071YoUdZorsiIq9SFA/YpJIom8jz011y8xxzxR19IaOQoP8sGX12m+WP5gZn
-						ASNciwIDAQABo20wazBKBgNVHREEQzBBghNpZHAuc2xjb2xsZWdlLmFjLnVrhipo
-						dHRwczovL2lkcC5zbGNvbGxlZ2UuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFPoignDUHhoa37ZM0Tx243itVTW2MA0GCSqGSIb3DQEBBQUAA4IBAQBxj1L0
-						HCYdoJo/fjTVOkUck2y9g9RfKryJOIPt3is6CfBzonqVFIOTsMeMMrtr1axl5E0h
-						Te3ZIOmDvb63wEOBziqsvemzVwFSOsuTiT9dniNZ4Udg5DhORFPhLrxmdYBI2sl1
-						GDpEUrr3RKPnj7zfgBZxwIE9BxeZnDFxl/O7582Lis1ClEmFnb9TxrtzcLIH7TCY
-						Q0IhONFmkgClsAB/Wn35x/yNcLxGhiWd/G3gzbLxjmWdc0e8GAVMzRHD6NjHvLKc
-						q3+sje0KNER0ehuD6eKVixp6SOf6RXLVLtB7m+eI3V/gRRjnckVd2mRXj7bLuQru
-						yaqmpEaqpQzn1fUy
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.slcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.slcollege.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.slcollege.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.slcollege.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.slcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.slcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.slcollege.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">slcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAL6tdh1Q1lgaE74wTineZn7NGaKtMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE2lkcC5zbGNvbGxlZ2UuYWMudWswHhcNMTQwNDAxMTA1
-						NDIxWhcNMzQwNDAxMTA1NDIxWjAeMRwwGgYDVQQDExNpZHAuc2xjb2xsZWdlLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz5xw2zn0ZCNoGTF0
-						IzSScZwrds6DeeibqHIPU/zOo4RCc1xz60BHSDsHyWCE5PNjnzB15yZXN0cqRTbN
-						5i8xRWgC0RJj6IguR5ntRhqMA8i+j0rU8J3w8wagV8bueDdp8o2iEBUgw8+VQA+Q
-						k7JP4sWi9yhU6ekSLeGeEl8dWLOS9Jn2siB9KTg8pqp1PwXKR+KVW+gsInoFms+L
-						ODiNsZ+HKEV2OVM0OarV2cND2gxH5VKxlA/KD9YQi0jc7oYWebMuwi0St6YzlgTL
-						872Y071YoUdZorsiIq9SFA/YpJIom8jz011y8xxzxR19IaOQoP8sGX12m+WP5gZn
-						ASNciwIDAQABo20wazBKBgNVHREEQzBBghNpZHAuc2xjb2xsZWdlLmFjLnVrhipo
-						dHRwczovL2lkcC5zbGNvbGxlZ2UuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFPoignDUHhoa37ZM0Tx243itVTW2MA0GCSqGSIb3DQEBBQUAA4IBAQBxj1L0
-						HCYdoJo/fjTVOkUck2y9g9RfKryJOIPt3is6CfBzonqVFIOTsMeMMrtr1axl5E0h
-						Te3ZIOmDvb63wEOBziqsvemzVwFSOsuTiT9dniNZ4Udg5DhORFPhLrxmdYBI2sl1
-						GDpEUrr3RKPnj7zfgBZxwIE9BxeZnDFxl/O7582Lis1ClEmFnb9TxrtzcLIH7TCY
-						Q0IhONFmkgClsAB/Wn35x/yNcLxGhiWd/G3gzbLxjmWdc0e8GAVMzRHD6NjHvLKc
-						q3+sje0KNER0ehuD6eKVixp6SOf6RXLVLtB7m+eI3V/gRRjnckVd2mRXj7bLuQru
-						yaqmpEaqpQzn1fUy
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.slcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.slcollege.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">South Leicestershire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South Leicestershire College (Shibboleth)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.slcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Austen</GivenName>
-    <SurName>Lowe</SurName>
-    <EmailAddress>mailto:austen.lowe@slcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Austen</GivenName>
-    <SurName>Lowe</SurName>
-    <EmailAddress>mailto:austen.lowe@slcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml
deleted file mode 100644
index eb1290e2..00000000
--- a/swamid-interfederations-2.0/idp.smith.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://idp.smith.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.smith.edu/idp/error.jsp" 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">smith.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Smith College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Smith College Shibboleth users</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.smith.edu/its/about_its/cis_program.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="88" width="504" xml:lang="en">https://idp.smith.edu/idp/images/logolargest.gif</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>
-MIIDIDCCAgigAwIBAgIVAOXTUWYc/vuvnb2nW8QaBdLG+Y+1MA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5zbWl0aC5lZHUwHhcNMTEwMzE3MjA1NzE5WhcN
-MzEwMzE3MjA1NzE5WjAYMRYwFAYDVQQDEw1pZHAuc21pdGguZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAibMyR65Zf/rn5rDxxIzv1Gt5CayKblSG
-a0n/ti8IFG8kwByWr+iXnf5YRUFaSNPsY78PxtfFSvy9Nz58nx4CPC8tGiuDxwKC
-lUo792rKnEB/XxZU3YdpZotGGYi02S5V2eJ1js3lzPFCKZojtJqzU2BhXD55ptE2
-1eAnpqDOpsetLOTYRRKIPF/GMx2W23VyVLM8OjTLQOtK///3o6xjemUa1a7tsjFb
-SaMXo1CaAhO1SMOwFEODamdUMsZYwkbuRTMZw7lB0z+jcxeOlJ+geGYc1RG06VNT
-wW0Yu5k7FqbDvWaRZHpaNfGh42BDJGbAk5/OllWMzHhSTDatai92nwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuc21pdGguZWR1hiRodHRwczovL2lkcC5zbWl0aC5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNc1trjeTE3ROprI6Gu7Pw8cjSaX
-MA0GCSqGSIb3DQEBBQUAA4IBAQA65xzv6pbVuyNB7DknRnLDC62C9RSde+suUO2H
-C3CNlxV81yyM7/RNl/Liq7MwiOHYQN34kTm4O9+tR6tgjM+v6FabJDofEQtx6SeX
-08RSFBAQrx8JZwUP2nBAaanGR+JfXG7L9fn79IjvgCmOQzSowaaYhNQs0yzav4dX
-QPjTTIMWFDJstNfSebNGuqEwep3n0edtntxVmEsmpBL91CvldRpur+98khDuVOFR
-vQtYab9MmbvB63JGIVkxNVE8yIk9QGCSCSPVQ7fMWld8BF4u80GlkQhKRkcJG8wE
-W/ZThBpy7D55O139vCdRdOYStyJZaLKjPue6nhVkPePVOuQg
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smith.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.smith.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.smith.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.smith.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.smith.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smith.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAOXTUWYc/vuvnb2nW8QaBdLG+Y+1MA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC5zbWl0aC5lZHUwHhcNMTEwMzE3MjA1NzE5WhcN
-MzEwMzE3MjA1NzE5WjAYMRYwFAYDVQQDEw1pZHAuc21pdGguZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAibMyR65Zf/rn5rDxxIzv1Gt5CayKblSG
-a0n/ti8IFG8kwByWr+iXnf5YRUFaSNPsY78PxtfFSvy9Nz58nx4CPC8tGiuDxwKC
-lUo792rKnEB/XxZU3YdpZotGGYi02S5V2eJ1js3lzPFCKZojtJqzU2BhXD55ptE2
-1eAnpqDOpsetLOTYRRKIPF/GMx2W23VyVLM8OjTLQOtK///3o6xjemUa1a7tsjFb
-SaMXo1CaAhO1SMOwFEODamdUMsZYwkbuRTMZw7lB0z+jcxeOlJ+geGYc1RG06VNT
-wW0Yu5k7FqbDvWaRZHpaNfGh42BDJGbAk5/OllWMzHhSTDatai92nwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAuc21pdGguZWR1hiRodHRwczovL2lkcC5zbWl0aC5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNc1trjeTE3ROprI6Gu7Pw8cjSaX
-MA0GCSqGSIb3DQEBBQUAA4IBAQA65xzv6pbVuyNB7DknRnLDC62C9RSde+suUO2H
-C3CNlxV81yyM7/RNl/Liq7MwiOHYQN34kTm4O9+tR6tgjM+v6FabJDofEQtx6SeX
-08RSFBAQrx8JZwUP2nBAaanGR+JfXG7L9fn79IjvgCmOQzSowaaYhNQs0yzav4dX
-QPjTTIMWFDJstNfSebNGuqEwep3n0edtntxVmEsmpBL91CvldRpur+98khDuVOFR
-vQtYab9MmbvB63JGIVkxNVE8yIk9QGCSCSPVQ7fMWld8BF4u80GlkQhKRkcJG8wE
-W/ZThBpy7D55O139vCdRdOYStyJZaLKjPue6nhVkPePVOuQg
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smith.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Smith College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Smith College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.smith.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Karla Borecky</md:GivenName>
-    <md:EmailAddress>kborecky@smith.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Crowley</md:GivenName>
-    <md:EmailAddress>jcrowley@smith.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Eric Brewer</md:GivenName>
-    <md:EmailAddress>ebrewer@smith.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.smu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.smu.edu-idp-shibboleth.xml
deleted file mode 100644
index 73f360f3..00000000
--- a/swamid-interfederations-2.0/idp.smu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://idp.smu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">smu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Southern Methodist University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Logon service for Southern Methodist University</mdui:Description>
-        <mdui:Logo height="80" width="260" xml:lang="en">https://idp.smu.edu/SMU-logo-1.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>
-MIIDFzCCAf+gAwIBAgIUMOoO5C0NUcKkug58h0G2G7wcwLswDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnNtdS5lZHUwHhcNMTIwNTMwMDUyNDE2WhcNMzIw
-NTMwMDUyNDE2WjAWMRQwEgYDVQQDEwtpZHAuc211LmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALAqpkRq0LXHJ02/f2JBuFjLq4nC9q5OFaQB/iE3
-CPJJ1+C3JNp+i49vQZFlMq5baLE6h4w7kJ/3w7VH1VEsQqT5jcgmI+RdfJxGkb+n
-IJAOBdHQJKakZBnMbqwEnCj+E2UJrY65NkE42obLDr5ztJLC5G/4l+EEuGH2Haa1
-tshIn5eVxspiBSYgQvvbdCTNNpWiTtQj368OZU8dEHXUH7igKCtjFolnf0pp+hZY
-3QqCDDLVnnRLtu8e1/R/v8TXrmAPnzXtmG7oji3h7Ng9qmUi2z8wuhi6XjLmsL85
-biPj8FWOpENBngX2/lYgiHJ/XAco62jg9r/vfbKpwvuF/UkCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnNtdS5lZHWGImh0dHBzOi8vaWRwLnNtdS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFMqNi96ilJQDUjUXfzSFk6czjb5QMA0GCSqGSIb3
-DQEBBQUAA4IBAQAXNoWs60LcNsPtwO2QwdA3Hw/QbA09MUD43bUjyF9xBNfXH2G/
-CGnzcOGVgtACKAkLJwFLK4iHf9/GiXFGqVMtjaaft+B9SFh2kwK7cuE0GbhiUN/u
-HC1/dvaXVBzHTm9+CMsKPNbuv4W6tB45wK4d1DoYBq3rH+COwv/6xn+v320SbF79
-zq6H/1+gZBLHh4L/sUJLWXksJA+3axQt0YthytYVp2sDK4yx9LnPIkUt1nE7CxY7
-mRJSSLjES5YYMYZG1NFfLbBgSoJo5jv+aTCmFTFApialLSb7DgOij0DUH+HwYeD4
-Ir3OTZqI0Gdw9VqbNRO6qHpf+GgkmMJN1mVW
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.smu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.smu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.smu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.smu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUMOoO5C0NUcKkug58h0G2G7wcwLswDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnNtdS5lZHUwHhcNMTIwNTMwMDUyNDE2WhcNMzIw
-NTMwMDUyNDE2WjAWMRQwEgYDVQQDEwtpZHAuc211LmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALAqpkRq0LXHJ02/f2JBuFjLq4nC9q5OFaQB/iE3
-CPJJ1+C3JNp+i49vQZFlMq5baLE6h4w7kJ/3w7VH1VEsQqT5jcgmI+RdfJxGkb+n
-IJAOBdHQJKakZBnMbqwEnCj+E2UJrY65NkE42obLDr5ztJLC5G/4l+EEuGH2Haa1
-tshIn5eVxspiBSYgQvvbdCTNNpWiTtQj368OZU8dEHXUH7igKCtjFolnf0pp+hZY
-3QqCDDLVnnRLtu8e1/R/v8TXrmAPnzXtmG7oji3h7Ng9qmUi2z8wuhi6XjLmsL85
-biPj8FWOpENBngX2/lYgiHJ/XAco62jg9r/vfbKpwvuF/UkCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnNtdS5lZHWGImh0dHBzOi8vaWRwLnNtdS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFMqNi96ilJQDUjUXfzSFk6czjb5QMA0GCSqGSIb3
-DQEBBQUAA4IBAQAXNoWs60LcNsPtwO2QwdA3Hw/QbA09MUD43bUjyF9xBNfXH2G/
-CGnzcOGVgtACKAkLJwFLK4iHf9/GiXFGqVMtjaaft+B9SFh2kwK7cuE0GbhiUN/u
-HC1/dvaXVBzHTm9+CMsKPNbuv4W6tB45wK4d1DoYBq3rH+COwv/6xn+v320SbF79
-zq6H/1+gZBLHh4L/sUJLWXksJA+3axQt0YthytYVp2sDK4yx9LnPIkUt1nE7CxY7
-mRJSSLjES5YYMYZG1NFfLbBgSoJo5jv+aTCmFTFApialLSb7DgOij0DUH+HwYeD4
-Ir3OTZqI0Gdw9VqbNRO6qHpf+GgkmMJN1mVW
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.smu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Southern Methodist University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Southern Methodist University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.smu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tommy Doan</md:GivenName>
-    <md:EmailAddress>tdoan@smu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.snc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 8d002066..00000000
--- a/swamid-interfederations-2.0/idp.snc.ac.uk-idp-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://idp.snc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Central College Nottingham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-17T13:55:33Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">snc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAILTn2HBBdNo1ahq8UPWTUXgGC1eMA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMTDWlkcC5zbmMuYWMudWswHhcNMTIwMjEwMTE0NDQzWhcN
-						MzIwMjEwMTE0NDQzWjAYMRYwFAYDVQQDEw1pZHAuc25jLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqey/f0AHmuYflfyRldet5x7ft9mN5GU5
-						MAFLmVDlTKAVAlAZgD+knrt7Vr+NE8YhNL7t5N7rMMxLsoJ7gW5qo4Fl4ihZSdC8
-						0c8lPPjAzG4ol2P60vmL4bsON1NPFFnEDTfPWmSdIGnZ1Yu4LdsPbxupm7iRU3qQ
-						+NZBrCXjdTNkApY7VqhNW693ulLSS/ERjYrbwuhe4R1EQN8UJByWokocpEZg+PHr
-						/f32B2mAd5M40kifSxzeq7Yh/473ZqyYiMRMJ2S/rYcXOJjJXIJggG/0o8RzW3iz
-						NckUMLLlIn6czkGR7goW9/PFrH+npAnqCtvpY02361Y00JIspKiegwIDAQABo2Ew
-						XzA+BgNVHREENzA1gg1pZHAuc25jLmFjLnVrhiRodHRwczovL2lkcC5zbmMuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHYJ9wHah0MigR+hhOovfPwsk+J2
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCBlYR/bb8P28PLzbfeDHF6LmK+wllNCUaMsbRq
-						8cMzNDh9qf/86HEZf2RnkpjR87u9q22m2aI5DufDpB9G8fowVZff4aY9eiu8XcH+
-						oLp7qxk/TNFJEP/OvzmTGJgNKxiWmYqYawe/6K3TTk3j1XSUpT5do5LAxjAIrZHq
-						z+6OMn63/26rIyKDi3yMgiaagge7tBzzPgGBHAwmijQNybso009X0Tv0g29oyq9Z
-						uWqgokIPrf+ZsLcolDoA0Bc/toNjwVNsA3Kcx8Umq/A2bbS68WxUymINL90Dd4rl
-						/MOmOshdOUiRjf0TvUvtbBqWQ2YfQdTu4yXa1EifVkd7tzIg
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.snc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.snc.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.snc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.snc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.snc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.snc.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">snc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAILTn2HBBdNo1ahq8UPWTUXgGC1eMA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMTDWlkcC5zbmMuYWMudWswHhcNMTIwMjEwMTE0NDQzWhcN
-						MzIwMjEwMTE0NDQzWjAYMRYwFAYDVQQDEw1pZHAuc25jLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqey/f0AHmuYflfyRldet5x7ft9mN5GU5
-						MAFLmVDlTKAVAlAZgD+knrt7Vr+NE8YhNL7t5N7rMMxLsoJ7gW5qo4Fl4ihZSdC8
-						0c8lPPjAzG4ol2P60vmL4bsON1NPFFnEDTfPWmSdIGnZ1Yu4LdsPbxupm7iRU3qQ
-						+NZBrCXjdTNkApY7VqhNW693ulLSS/ERjYrbwuhe4R1EQN8UJByWokocpEZg+PHr
-						/f32B2mAd5M40kifSxzeq7Yh/473ZqyYiMRMJ2S/rYcXOJjJXIJggG/0o8RzW3iz
-						NckUMLLlIn6czkGR7goW9/PFrH+npAnqCtvpY02361Y00JIspKiegwIDAQABo2Ew
-						XzA+BgNVHREENzA1gg1pZHAuc25jLmFjLnVrhiRodHRwczovL2lkcC5zbmMuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHYJ9wHah0MigR+hhOovfPwsk+J2
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCBlYR/bb8P28PLzbfeDHF6LmK+wllNCUaMsbRq
-						8cMzNDh9qf/86HEZf2RnkpjR87u9q22m2aI5DufDpB9G8fowVZff4aY9eiu8XcH+
-						oLp7qxk/TNFJEP/OvzmTGJgNKxiWmYqYawe/6K3TTk3j1XSUpT5do5LAxjAIrZHq
-						z+6OMn63/26rIyKDi3yMgiaagge7tBzzPgGBHAwmijQNybso009X0Tv0g29oyq9Z
-						uWqgokIPrf+ZsLcolDoA0Bc/toNjwVNsA3Kcx8Umq/A2bbS68WxUymINL90Dd4rl
-						/MOmOshdOUiRjf0TvUvtbBqWQ2YfQdTu4yXa1EifVkd7tzIg
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.snc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.snc.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">Central College Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Central College Nottingham</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://idp.snc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Gareth</GivenName>
-    <SurName>Hall</SurName>
-    <EmailAddress>mailto:webmaster@centralnottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gareth</GivenName>
-    <SurName>Hall</SurName>
-    <EmailAddress>mailto:webmaster@centralnottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.soas.ac.uk-entity.xml
deleted file mode 100644
index 5a06d67c..00000000
--- a/swamid-interfederations-2.0/idp.soas.ac.uk-entity.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.soas.ac.uk/entity">
-  <!--
-		This is a "SOAS, University of London" Shibboleth IdP for the School of Oriental and African Studies.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-06-13T17:38: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">soas.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SOAS, University of London</mdui:DisplayName>
-        <mdui:Logo height="64" width="204">https://inet.soas.ac.uk/images/soas204-64.gif</mdui:Logo>
-        <mdui:Logo height="110" width="350">https://inet.soas.ac.uk/images/soas350-110.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIzCCAgugAwIBAgIUHu+w7DSrNlupuFhKVEzWgnZN6howDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOaWRwLnNvYXMuYWMudWswHhcNMTQwNDA4MjIxNzAxWhcN
-						MzQwNDA4MjIxNzAxWjAZMRcwFQYDVQQDEw5pZHAuc29hcy5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIuU7ElZ1vCWXXzk6p8OeidLIuxiuTLS
-						QCok7JQ12DsN0sMkR3nB6Fc/p8JtF5Wi2AYYdiiLSnG9aL1X4IC/c13oLjpnaROF
-						AmoUvphSM3KOxJbHRcgDyLPgUom3lrz06eVu+CaGd9ZcuTyLWDhcEb2OMM9/uYEX
-						k7aEIGvz6srSf3mMMt0dfqtSgMNzz7TFnWa87slCC/9r+ZpWUkL/sBvmzx5O72qm
-						7Z8mpi6REZpm40wqMUAxHjjjW8aJXmXiyVCOc7egpZ2AYMnotBVp+90YmQBUhJAb
-						1FOChrciUjQkCyfK9tjTtCg6QSjJY8BwDGkt8KiCBZ1Ek+aXylC5FN0CAwEAAaNj
-						MGEwQAYDVR0RBDkwN4IOaWRwLnNvYXMuYWMudWuGJWh0dHBzOi8vaWRwLnNvYXMu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMVRZjXXKBbdahgAxd9112xb
-						VrldMA0GCSqGSIb3DQEBBQUAA4IBAQB9WO18k3FgZfqXpeQ5VpEagA6GjUAQ1L5h
-						dHX9qWZuhdUWmYfsZ76E7E48PMok6wikWGo52T5DAINMmoHeSI7I4TPncoKkhF/t
-						xjBcdyV4aIv2vRyVJzhk8Nlhxa49OVcyx197cF7wZ6VTYfatmCgXz4SIY8+DJ0PN
-						G/lX9hVVrfFS/vu88SbBTFUwTDEDsW42OjQjHxMgX1fq2Crxwo0xmthQLXju5o24
-						4/6sLo9MlO7/xwhDBD783cYX2jYNmMjS7w01L5JUbVxyB2AOv+vlZbtBZqTtCIXN
-						Z5pa5LX39aBuc/C0sjpUNCe4fkjCXfFXP+74dO/rCiGkXkAT2b/5
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soas.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soas.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://idp.soas.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soas.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.soas.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.soas.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">soas.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIzCCAgugAwIBAgIUHu+w7DSrNlupuFhKVEzWgnZN6howDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOaWRwLnNvYXMuYWMudWswHhcNMTQwNDA4MjIxNzAxWhcN
-						MzQwNDA4MjIxNzAxWjAZMRcwFQYDVQQDEw5pZHAuc29hcy5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIuU7ElZ1vCWXXzk6p8OeidLIuxiuTLS
-						QCok7JQ12DsN0sMkR3nB6Fc/p8JtF5Wi2AYYdiiLSnG9aL1X4IC/c13oLjpnaROF
-						AmoUvphSM3KOxJbHRcgDyLPgUom3lrz06eVu+CaGd9ZcuTyLWDhcEb2OMM9/uYEX
-						k7aEIGvz6srSf3mMMt0dfqtSgMNzz7TFnWa87slCC/9r+ZpWUkL/sBvmzx5O72qm
-						7Z8mpi6REZpm40wqMUAxHjjjW8aJXmXiyVCOc7egpZ2AYMnotBVp+90YmQBUhJAb
-						1FOChrciUjQkCyfK9tjTtCg6QSjJY8BwDGkt8KiCBZ1Ek+aXylC5FN0CAwEAAaNj
-						MGEwQAYDVR0RBDkwN4IOaWRwLnNvYXMuYWMudWuGJWh0dHBzOi8vaWRwLnNvYXMu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMVRZjXXKBbdahgAxd9112xb
-						VrldMA0GCSqGSIb3DQEBBQUAA4IBAQB9WO18k3FgZfqXpeQ5VpEagA6GjUAQ1L5h
-						dHX9qWZuhdUWmYfsZ76E7E48PMok6wikWGo52T5DAINMmoHeSI7I4TPncoKkhF/t
-						xjBcdyV4aIv2vRyVJzhk8Nlhxa49OVcyx197cF7wZ6VTYfatmCgXz4SIY8+DJ0PN
-						G/lX9hVVrfFS/vu88SbBTFUwTDEDsW42OjQjHxMgX1fq2Crxwo0xmthQLXju5o24
-						4/6sLo9MlO7/xwhDBD783cYX2jYNmMjS7w01L5JUbVxyB2AOv+vlZbtBZqTtCIXN
-						Z5pa5LX39aBuc/C0sjpUNCe4fkjCXfFXP+74dO/rCiGkXkAT2b/5
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soas.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soas.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">School of Oriental and African Studies</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SOAS, University of London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.soas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>SOAS IT helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@soas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Douglas</SurName>
-    <EmailAddress>mailto:Md11@soas.ac.uk</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 490ae240..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.soc.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.soc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.cas.cz: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.soc.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.soc.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.soc.cas.cz/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">soc.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.soc.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Sociology of the Academy of Sciences of the Czech Republic</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Sociologický ústav AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Sociology, Public Research Institution</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Sociologický ústav AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.soc.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.soc.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.solihull.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.solihull.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 410f25a6..00000000
--- a/swamid-interfederations-2.0/idp.solihull.ac.uk-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.solihull.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Solihull College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-26T11:41: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">solihull.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID3jCCAsagAwIBAgIJAM+AyetIYqR6MA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIEw1XZXN0IE1pZGxhbmRzMREwDwYDVQQHEwhTb2xpaHVs
-						bDEZMBcGA1UEChMQU29saWh1bGwgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLnNvbGlo
-						dWxsLmFjLnVrMB4XDTEzMTAxNjA5MTQwMVoXDTIzMTAxNDA5MTQwMVowcDELMAkG
-						A1UEBhMCR0IxFjAUBgNVBAgTDVdlc3QgTWlkbGFuZHMxETAPBgNVBAcTCFNvbGlo
-						dWxsMRkwFwYDVQQKExBTb2xpaHVsbCBDb2xsZWdlMRswGQYDVQQDExJpZHAuc29s
-						aWh1bGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC47smk
-						B99t094xtfCf+qH4QtyW2PcThLbj+Kco0Fb/beVYidk/dunhQEO1I59uVfIlXOb6
-						Pcx6HmlV6kSN73xn0sruLBNOpQta1C5dpqaKkgJViezo7O6QbbJUgl1u2HJk9kiw
-						tkOXh5pZKCgQqEI/Q3K9OKbv5RZHxatWouqGKAUeu8wPGnNeh9KkVbFqqc8DA1sl
-						aC4o4x4+3bgy9Jznbcbo7/jbnhLEvQgdZG0B1RdYL/R+B9cxPnz4ZcBPBkK81RG4
-						9niQvrcaN5iUPk1DPxRj7qzaVl6OfWhyoh8coEH0JWgXiuEei0Pkm/Fm2oNp/Yea
-						czrgbLyA3GaRtPsxAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
-						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQe665e7YLT
-						F8ETkmhxSKGabAUIIzAfBgNVHSMEGDAWgBQe665e7YLTF8ETkmhxSKGabAUIIzAN
-						BgkqhkiG9w0BAQUFAAOCAQEAFOHMzUyPPADOrALVV5CAnIOpb0W02YMl8ZwLaftH
-						7aUtbL4aYSek3lO55aR6+QcEiBl9wSXHl0uPLaiC8Dmq1KJmlf5LUEj965bUE/Cu
-						s5R6g3El1/SV3J8NUMsMJMq3H/6uDeZBAEXicFSKGwvt9MCv9PohWNB1JRzuGlIA
-						Y5878PvOuNY886Yz6McIIlAlYLtSh8nDPv0ULf/U/P5H3R3vYD8hn9sYFO8h5OrA
-						mvdU+n4JipEfEVM2GgPtgov6Fj5D5+qVj6UzJa6FF8PEXcGrFoSmUO0TSGee0qXm
-						KHpoixwcL60Mgq6hMlXKmT7Vs0IMQzx/FImSMNwaJDmy8Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.solihull.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.solihull.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.solihull.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.solihull.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.solihull.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.solihull.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">solihull.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID3jCCAsagAwIBAgIJAM+AyetIYqR6MA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIEw1XZXN0IE1pZGxhbmRzMREwDwYDVQQHEwhTb2xpaHVs
-						bDEZMBcGA1UEChMQU29saWh1bGwgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLnNvbGlo
-						dWxsLmFjLnVrMB4XDTEzMTAxNjA5MTQwMVoXDTIzMTAxNDA5MTQwMVowcDELMAkG
-						A1UEBhMCR0IxFjAUBgNVBAgTDVdlc3QgTWlkbGFuZHMxETAPBgNVBAcTCFNvbGlo
-						dWxsMRkwFwYDVQQKExBTb2xpaHVsbCBDb2xsZWdlMRswGQYDVQQDExJpZHAuc29s
-						aWh1bGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC47smk
-						B99t094xtfCf+qH4QtyW2PcThLbj+Kco0Fb/beVYidk/dunhQEO1I59uVfIlXOb6
-						Pcx6HmlV6kSN73xn0sruLBNOpQta1C5dpqaKkgJViezo7O6QbbJUgl1u2HJk9kiw
-						tkOXh5pZKCgQqEI/Q3K9OKbv5RZHxatWouqGKAUeu8wPGnNeh9KkVbFqqc8DA1sl
-						aC4o4x4+3bgy9Jznbcbo7/jbnhLEvQgdZG0B1RdYL/R+B9cxPnz4ZcBPBkK81RG4
-						9niQvrcaN5iUPk1DPxRj7qzaVl6OfWhyoh8coEH0JWgXiuEei0Pkm/Fm2oNp/Yea
-						czrgbLyA3GaRtPsxAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
-						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQe665e7YLT
-						F8ETkmhxSKGabAUIIzAfBgNVHSMEGDAWgBQe665e7YLTF8ETkmhxSKGabAUIIzAN
-						BgkqhkiG9w0BAQUFAAOCAQEAFOHMzUyPPADOrALVV5CAnIOpb0W02YMl8ZwLaftH
-						7aUtbL4aYSek3lO55aR6+QcEiBl9wSXHl0uPLaiC8Dmq1KJmlf5LUEj965bUE/Cu
-						s5R6g3El1/SV3J8NUMsMJMq3H/6uDeZBAEXicFSKGwvt9MCv9PohWNB1JRzuGlIA
-						Y5878PvOuNY886Yz6McIIlAlYLtSh8nDPv0ULf/U/P5H3R3vYD8hn9sYFO8h5OrA
-						mvdU+n4JipEfEVM2GgPtgov6Fj5D5+qVj6UzJa6FF8PEXcGrFoSmUO0TSGee0qXm
-						KHpoixwcL60Mgq6hMlXKmT7Vs0IMQzx/FImSMNwaJDmy8Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.solihull.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.solihull.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">Solihull College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Solihull College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.solihull.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Stebbens</SurName>
-    <EmailAddress>mailto:ian.stebbens@solihull.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Gartside</SurName>
-    <EmailAddress>mailto:dave.gartside@solihull.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.solihullsfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.solihullsfc.ac.uk-shibboleth.xml
deleted file mode 100644
index cd1c8bc1..00000000
--- a/swamid-interfederations-2.0/idp.solihullsfc.ac.uk-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.solihullsfc.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for The Sixth Form College, Solihull.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">solihullsfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/solihullsfc.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/solihullsfc.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sixth Form College, Solihull</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.solihullsfc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sorbonne-universites.fr-idp-shibboleth.xml
deleted file mode 100644
index afed4b73..00000000
--- a/swamid-interfederations-2.0/idp.sorbonne-universites.fr-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.sorbonne-universites.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-26T18:20:19Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sorbonne-universites.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sorbonne University</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/vnd.microsoft.icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAD////////////////s5d//uZ2H/41eOv92PhP/bDEC/2wwAv91PRL/jmA9/76jj//x6+f////////////////////////////VxLf/iFgy/2swA/9oKgD/ay8C/3A2Cf9wNgj/ai4B/2gqAP9tMgT/kGNA/+DUyv/////////////////czsP/e0Yd/2gqAP93PxX/onxf/7+mkf+8oYz/up6J/7ichf+VaUj/bjMH/2grAP+HVjH/6eHa///////59/X/mXBR/2cqAP+GVjD/283B/+ng2v+feFn/ekQZ/3lCGP+acVH/4tbN/7yhi/9xNwv/aSwA/62Mc/////7/4NPJ/3dAFv9xNwr/08K0//79/f+ifWD/aCsA/2ouAP9qLgD/aCoA/6yKcf/8+vn/on1f/2gqAP+FUy3/8Onl/8q0pP9tMgT/eUMY/+fd1v/h1Mv/eEEY/2ouAP9rLwD/ay8A/2grAP+feFv//////825qf9sMQL/dj4T/9/SyP/ErZr/bTED/2wxA/+MXTn/hVMt/2svAP9rLwD/ay8A/2otAP9xNwz/zbio///////UwrX/bjMF/3M6Dv/azMD/xK2a/20yA/9rLwD/aSwA/2otAP9rLwD/ai4A/2ksAP97Rh3/waiV//z6+f//////up6I/2otAP9zOw7/2szA/8Stmv9tMgP/ay8A/2svAP9rLgD/aSwA/3U+E/+ng2f/5NnR//7+/v//////5tzU/4NRKv9pLAD/czsO/9rMwP/ErZr/bTID/2svAP9qLgD/bzQI/5tzU//czcL//Pv6///////+/f3/3M3C/4xdOf9qLQD/ay4A/3M7Dv/azMD/xK2a/20yA/9qLgD/czoO/7+kkP/59/X///////7+/v/n3tf/ro1z/3hBF/9pLQD/ay8A/2suAP9zOw7/2szA/8Stmv9tMgP/ai0A/6uJbv/9/Pz//////+7n4v+1l4D/fUkg/2otAP9qLgD/ay8A/2svAP9rLgD/czsO/9rMwP/ErZr/bTED/240Bv/UwrX//////9nJvf+IVzH/ai4B/2otAP9rLwD/ay8A/281CP9vNAb/ai4A/3M7Dv/azMD/xK2a/20xA/9vNQf/1sa5//n39f+OYT7/aCsA/2svAP9rLwD/ay8A/2ktAP+XbU3/hVMt/2ksAP9zOw7/2szA/8Ssmv9rMAP/aCsA/7CReP/18u7/i105/2ksAP9rLwD/ay8A/2ouAP9yOQ3/x7Cf/4ZVMP9nKgD/cjkO/9rLwP/TwbT/kWVC/49iPv+feFr/7ufi/8q0o/93QBX/ai4A/2svAP9wNgn/r492//Dq5v+jfWD/j2E9/5ZsS//k2ND/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.sorbonne-universites.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Sorbonne Universités</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels de la ComUE</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>
-					      MIIDWDCCAkCgAwIBAgIVAMCWhvwrPX40LIYm8wCIRHvjylE5MA0GCSqGSIb3DQEB
-BQUAMCYxJDAiBgNVBAMMG2lkcC5zb3Jib25uZS11bml2ZXJzaXRlcy5mcjAeFw0x
-NTAyMjQwOTA1MjdaFw0zNTAyMjQwOTA1MjdaMCYxJDAiBgNVBAMMG2lkcC5zb3Ji
-b25uZS11bml2ZXJzaXRlcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALXkB2N4y/BvTla6Bq02bXK4dukN3TS7VC8g1pq79/Qm//oZbnRyBvBX0hAu
-RT9WnhQbbmqim9WI7rPdIweimFVQHqt7TPrl5iKp9dUOHpIVyrTn2MfgnrCEw+HD
-Sf6bkT7f1zJwpMfEMCWMUFPGjrKn5GPOX/4huPuqBoCIVcB9Vfjos0PVIZAo1dcf
-QIlNdFXbcjpgQJ0G1lm16s5E/UmynBZWrFG1GtJUGZV5llR0EaEs+dLBbn7fnKtV
-4AZwx8glqi3FlRE1wrnS4EiOXUVyIg8S4Xt8RLkcui1OTpAtRyI7vhjxZSJ/2nyC
-awzE28HmLvKSRp2O6QGdpUedyNECAwEAAaN9MHswHQYDVR0OBBYEFGlrmfd6XBiN
-MjCuZxXfFTexlSYCMFoGA1UdEQRTMFGCG2lkcC5zb3Jib25uZS11bml2ZXJzaXRl
-cy5mcoYyaHR0cHM6Ly9pZHAuc29yYm9ubmUtdW5pdmVyc2l0ZXMuZnIvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAHudu9e/kWMz3CbcksQqQv0p8pfJ
-1uEzDGY1PFMPq87ss4h1B+oo6caPN5n9vESbR7AsndT9O+XimO4C36fTJnZ1yao0
-NeqGnYiwYcv0be6zZI3gmQx1C+RIPnBsR1lXQLva9DKE1tPqxS9b7bVFOrpiDTPv
-9GjPKX7P+Tso/dJr4VX2tSjLt+OLKTv42s44wO880DzIGvTkCmff7FEsp2A3TI/M
-TkxTBptc5wAcDYEjc2QYww0sYsc9PpgLKVULmyDMLvxpdk57oxffe+bQnehP52oJ
-+vcJHLp21oBmTlJ5IztBiQLEzPgbLC1AZNFEt7XIdmfAYeupF++ocnD7M5w=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sorbonne-universites.fr/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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sorbonne-universites.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sorbonne-universites.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Sorbonne Universités</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sorbonne Universités</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sorbonne-universites.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Frédérick Bigrat</md:SurName>
-    <md:EmailAddress>frederick.bigrat@sorbonne-universites.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Christophe Fillot</md:SurName>
-    <md:EmailAddress>cf@utc.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.south-thames.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.south-thames.ac.uk-entity.xml
deleted file mode 100644
index e8265b6b..00000000
--- a/swamid-interfederations-2.0/idp.south-thames.ac.uk-entity.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.south-thames.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for South Thames College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">south-thames.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEtjCCA56gAwIBAgIJAMdBpEKv0PKbMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
-						VQQGEwJHQjEXMBUGA1UECBMOR3JlYXRlciBMb25kb24xEzARBgNVBAcTCldhbmRz
-						d29ydGgxHTAbBgNVBAoTFFNvdXRoIFRoYW1lcyBDb2xsZWdlMQwwCgYDVQQLEwNJ
-						VFMxHzAdBgNVBAMTFmlkcC5zb3V0aC10aGFtZXMuYWMudWswHhcNMTQwMTE2MTgx
-						MTQ1WhcNMjQwMTE0MTgxMTQ1WjCBiTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkdy
-						ZWF0ZXIgTG9uZG9uMRMwEQYDVQQHEwpXYW5kc3dvcnRoMR0wGwYDVQQKExRTb3V0
-						aCBUaGFtZXMgQ29sbGVnZTEMMAoGA1UECxMDSVRTMR8wHQYDVQQDExZpZHAuc291
-						dGgtdGhhbWVzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						wq/O1hQdWI9i9SbWCJarlpp8SEsa6xWPVHwzvJjnA20KpboQPWoaHotOuC5fKoNV
-						VbVrvk83iPwVdhjvzkFZaLcxDzRl/SixB7C2JUeKOJCybUJWQ/l+IUIR3n7zTfft
-						l82eBGSEi1o7rOmASq+4CEVvdzwwiJc11VqNPdKIladwD/AASXOb/VDejaVgq6nX
-						O8JxN9Ni6bFRBb9cKO24wscABi69mjGVNf974Qpdi4pg6SKcAUhdUzznDVFvNTLv
-						vpV5kFGbEAvqZIiI6hwSMA/dJDvnPZbyI2SvKD52VwASDo5q4l7SbM+F9TOVpi+m
-						Nv44QddqL489EZ846JFX9QIDAQABo4IBHTCCARkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FMzvNh0ltK1kt/W3x7+poY8vbU33MIG+BgNVHSMEgbYwgbOAFMzvNh0ltK1kt/W3
-						x7+poY8vbU33oYGPpIGMMIGJMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOR3JlYXRl
-						ciBMb25kb24xEzARBgNVBAcTCldhbmRzd29ydGgxHTAbBgNVBAoTFFNvdXRoIFRo
-						YW1lcyBDb2xsZWdlMQwwCgYDVQQLEwNJVFMxHzAdBgNVBAMTFmlkcC5zb3V0aC10
-						aGFtZXMuYWMudWuCCQDHQaRCr9DymzANBgkqhkiG9w0BAQUFAAOCAQEAUBaKuDYR
-						+AHJ4K+XzyiPqXcags3AbKn5rMVbMbHAOqpUqDnP6CfTSu50RKRi9OroLxFfDrgB
-						GP64mKsC76Rs8f7Wyf62q97HnKdDGTUxZaxGco5Md+nRhn3pbskLyy4gTGxYsqLP
-						qbWlDlezpp2AkMlLBOWmL7Avmc2Oa9hg4VisM8LV70vEq3lCh88UxrqxXY/WAgOI
-						ElV9rxoEqBY6S/ceOC8FGgTjgqC+BLAIbPKvGB2LQzvHEiunyZKadWlcyoJqS6U4
-						KSbNeuimMuY8lzN58ApFP/KrMKBqsasswF49RT+59AfkkB+tPd+rbVTy+0w8RzR7
-						l9bf6g+JAxTWng==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.south-thames.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.south-thames.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.south-thames.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.south-thames.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.south-thames.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.south-thames.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">south-thames.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEtjCCA56gAwIBAgIJAMdBpEKv0PKbMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
-						VQQGEwJHQjEXMBUGA1UECBMOR3JlYXRlciBMb25kb24xEzARBgNVBAcTCldhbmRz
-						d29ydGgxHTAbBgNVBAoTFFNvdXRoIFRoYW1lcyBDb2xsZWdlMQwwCgYDVQQLEwNJ
-						VFMxHzAdBgNVBAMTFmlkcC5zb3V0aC10aGFtZXMuYWMudWswHhcNMTQwMTE2MTgx
-						MTQ1WhcNMjQwMTE0MTgxMTQ1WjCBiTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkdy
-						ZWF0ZXIgTG9uZG9uMRMwEQYDVQQHEwpXYW5kc3dvcnRoMR0wGwYDVQQKExRTb3V0
-						aCBUaGFtZXMgQ29sbGVnZTEMMAoGA1UECxMDSVRTMR8wHQYDVQQDExZpZHAuc291
-						dGgtdGhhbWVzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						wq/O1hQdWI9i9SbWCJarlpp8SEsa6xWPVHwzvJjnA20KpboQPWoaHotOuC5fKoNV
-						VbVrvk83iPwVdhjvzkFZaLcxDzRl/SixB7C2JUeKOJCybUJWQ/l+IUIR3n7zTfft
-						l82eBGSEi1o7rOmASq+4CEVvdzwwiJc11VqNPdKIladwD/AASXOb/VDejaVgq6nX
-						O8JxN9Ni6bFRBb9cKO24wscABi69mjGVNf974Qpdi4pg6SKcAUhdUzznDVFvNTLv
-						vpV5kFGbEAvqZIiI6hwSMA/dJDvnPZbyI2SvKD52VwASDo5q4l7SbM+F9TOVpi+m
-						Nv44QddqL489EZ846JFX9QIDAQABo4IBHTCCARkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FMzvNh0ltK1kt/W3x7+poY8vbU33MIG+BgNVHSMEgbYwgbOAFMzvNh0ltK1kt/W3
-						x7+poY8vbU33oYGPpIGMMIGJMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOR3JlYXRl
-						ciBMb25kb24xEzARBgNVBAcTCldhbmRzd29ydGgxHTAbBgNVBAoTFFNvdXRoIFRo
-						YW1lcyBDb2xsZWdlMQwwCgYDVQQLEwNJVFMxHzAdBgNVBAMTFmlkcC5zb3V0aC10
-						aGFtZXMuYWMudWuCCQDHQaRCr9DymzANBgkqhkiG9w0BAQUFAAOCAQEAUBaKuDYR
-						+AHJ4K+XzyiPqXcags3AbKn5rMVbMbHAOqpUqDnP6CfTSu50RKRi9OroLxFfDrgB
-						GP64mKsC76Rs8f7Wyf62q97HnKdDGTUxZaxGco5Md+nRhn3pbskLyy4gTGxYsqLP
-						qbWlDlezpp2AkMlLBOWmL7Avmc2Oa9hg4VisM8LV70vEq3lCh88UxrqxXY/WAgOI
-						ElV9rxoEqBY6S/ceOC8FGgTjgqC+BLAIbPKvGB2LQzvHEiunyZKadWlcyoJqS6U4
-						KSbNeuimMuY8lzN58ApFP/KrMKBqsasswF49RT+59AfkkB+tPd+rbVTy+0w8RzR7
-						l9bf6g+JAxTWng==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.south-thames.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.south-thames.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">South Thames College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South Thames College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.south-thames.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ewa</GivenName>
-    <SurName>Wraga</SurName>
-    <EmailAddress>mailto:Ewa.wraga@south-thames.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Raymond</GivenName>
-    <SurName>Oliver</SurName>
-    <EmailAddress>mailto:Raymond.Oliver@south-thames.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southampton-city.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.southampton-city.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 2ffec4b0..00000000
--- a/swamid-interfederations-2.0/idp.southampton-city.ac.uk-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.southampton-city.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Southampton City College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">southampton-city.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDejCCAmICCQCGmA+P9dNGWjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
-						QjESMBAGA1UECBMJSGFtcHNoaXJlMRQwEgYDVQQHEwtTb3V0aGFtcHRvbjEhMB8G
-						A1UEChMYU291dGhhbXB0b24gQ2l0eSBDb2xsZWdlMSMwIQYDVQQDExppZHAuc291
-						dGhhbXB0b24tY2l0eS5hYy51azAeFw0xMzA3MDExMDQ4MTRaFw0zMzA2MjYxMDQ4
-						MTRaMH8xCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlIYW1wc2hpcmUxFDASBgNVBAcT
-						C1NvdXRoYW1wdG9uMSEwHwYDVQQKExhTb3V0aGFtcHRvbiBDaXR5IENvbGxlZ2Ux
-						IzAhBgNVBAMTGmlkcC5zb3V0aGFtcHRvbi1jaXR5LmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyP/VZGZNQxIfAoNeX890YmxgzThAbmq9dRYw
-						s6jBy1zXA5ZLnltasPSvtJer8Ipm+iScCXOW0Bf5owG0bGkQ+qTr3f7vT1qCdBPD
-						U60eBnEYg4wU3L9W9zQyUztb/4XzKhw3LbLAcPj3VRfvyJA3C2U58jQwSv1L7n9R
-						ultsPrN8sqT6ull84lPH9RSuTAXcI/8JK79saF7h4tBkH4FZq3VTr78gaqV8Qg0e
-						jaE+p1osgaHm1ZHOuKndihiEqv+4SIGthPN0iaO2wiZfz1DtyNOA1kynx7pkuuoG
-						72irLIM42aa4NbcmrWs9slrg1IIEPbO/K7ZJd+ErlIFWem6dgQIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQBgrMGWhGWaPpAIsEgQ8LOAPRtPMuW1ZCqIBzKZjNdjUYgf
-						KZnHiL6h7/jvtHFa5NG9ocKOjuY6fy2KRepr73gqH5SUa5IjAERc3WpcXR7D64uw
-						H7uTQHK0pAg25xpujlYtzOOMrbJebarUl3daydmMenw8Cn474txJNtlUd29EhinD
-						QBJbjJrqOBzq4mGuwHyIIGQkPKQQnYWQzAca0OLPYckJmqpx0eanZ1Owlf9DPP72
-						n3hwtOex8KPZr1hGB0gtwm115YUmedoe/o5/jR5isTEep84Bs9qNVZrEi2MWPgij
-						UwJvvyH8Sng7jzbRp8AbC5r0Wv8EsWjv4iC7bb9b
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southampton-city.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southampton-city.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.southampton-city.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southampton-city.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southampton-city.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southampton-city.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">southampton-city.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDejCCAmICCQCGmA+P9dNGWjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJH
-						QjESMBAGA1UECBMJSGFtcHNoaXJlMRQwEgYDVQQHEwtTb3V0aGFtcHRvbjEhMB8G
-						A1UEChMYU291dGhhbXB0b24gQ2l0eSBDb2xsZWdlMSMwIQYDVQQDExppZHAuc291
-						dGhhbXB0b24tY2l0eS5hYy51azAeFw0xMzA3MDExMDQ4MTRaFw0zMzA2MjYxMDQ4
-						MTRaMH8xCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlIYW1wc2hpcmUxFDASBgNVBAcT
-						C1NvdXRoYW1wdG9uMSEwHwYDVQQKExhTb3V0aGFtcHRvbiBDaXR5IENvbGxlZ2Ux
-						IzAhBgNVBAMTGmlkcC5zb3V0aGFtcHRvbi1jaXR5LmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyP/VZGZNQxIfAoNeX890YmxgzThAbmq9dRYw
-						s6jBy1zXA5ZLnltasPSvtJer8Ipm+iScCXOW0Bf5owG0bGkQ+qTr3f7vT1qCdBPD
-						U60eBnEYg4wU3L9W9zQyUztb/4XzKhw3LbLAcPj3VRfvyJA3C2U58jQwSv1L7n9R
-						ultsPrN8sqT6ull84lPH9RSuTAXcI/8JK79saF7h4tBkH4FZq3VTr78gaqV8Qg0e
-						jaE+p1osgaHm1ZHOuKndihiEqv+4SIGthPN0iaO2wiZfz1DtyNOA1kynx7pkuuoG
-						72irLIM42aa4NbcmrWs9slrg1IIEPbO/K7ZJd+ErlIFWem6dgQIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQBgrMGWhGWaPpAIsEgQ8LOAPRtPMuW1ZCqIBzKZjNdjUYgf
-						KZnHiL6h7/jvtHFa5NG9ocKOjuY6fy2KRepr73gqH5SUa5IjAERc3WpcXR7D64uw
-						H7uTQHK0pAg25xpujlYtzOOMrbJebarUl3daydmMenw8Cn474txJNtlUd29EhinD
-						QBJbjJrqOBzq4mGuwHyIIGQkPKQQnYWQzAca0OLPYckJmqpx0eanZ1Owlf9DPP72
-						n3hwtOex8KPZr1hGB0gtwm115YUmedoe/o5/jR5isTEep84Bs9qNVZrEi2MWPgij
-						UwJvvyH8Sng7jzbRp8AbC5r0Wv8EsWjv4iC7bb9b
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southampton-city.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southampton-city.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">Southampton City College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Southampton City College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.southampton-city.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@southampton-city.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Soanes</SurName>
-    <EmailAddress>mailto:martin.soanes@southampton-city.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.southdevon.ac.uk-shibboleth.xml
deleted file mode 100644
index 99bcf5eb..00000000
--- a/swamid-interfederations-2.0/idp.southdevon.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.southdevon.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for South Devon College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">southdevon.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE5DCCA8ygAwIBAgIRANGrqwrzcv/wwtm5h/u2MFkwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA1MTYwMDAwMDBaFw0xNjA1MTUyMzU5NTlaMIGvMQswCQYD
-						VQQGEwJHQjEQMA4GA1UEERMHVFE0IDdFSjEOMAwGA1UECBMFRGV2b24xETAPBgNV
-						BAcTCFBBSUdOVE9OMRIwEAYDVQQJEwlMb25nIFJvYWQxHDAaBgNVBAoTE1NvdXRo
-						IERldm9uIENvbGxlZ2UxGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMR0wGwYD
-						VQQDExRpZHAuc291dGhkZXZvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAM7bII/xHAr1oS3qU/Y+fjfA5zzvRSgLS1pEveCyck9Z1w30Tt8v
-						C0NTuLUw6KnjrytWVjWdQJJoRCMI3sjpwFqDC+6js4azlee2AABynMdGzOuJ6GqA
-						A8pzDxes/BSio8CxHG/Sp2rglvpDphQLKgzTACTUeooWQ2qhEm9liS5HercXHZnx
-						AIZCGpw9ChqhiXAofAENjdBl3kuqHl1gn80j4uN7jtTXKb7Rz6DwsXlc3tl/rT7c
-						Ar8z0mTllMy09m21rLXae4CaQB/3x7j6HFWeSEcHh6o5iBjWnlmQmQnsXsybIeuz
-						xqdLKwDhOIqz2hW3MiQX8wCqE5YwGaZtEaMCAwEAAaOCAXEwggFtMB8GA1UdIwQY
-						MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRxOiCSLnFHA2VGV1OX
-						hbf81QvVgTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-						BggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAI
-						BgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
-						Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
-						hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
-						BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIU
-						aWRwLnNvdXRoZGV2b24uYWMudWswDQYJKoZIhvcNAQEFBQADggEBAKjRYUyCVxuA
-						VlPnjOLvXIby4ohy2rqZKc7Co2U6TNDkPMlC+7j48hBsDjGQzpW7l3B6Qktq9Iox
-						0i3cS5NQVXL0aeL+4ixSnlX62EeqdAElo7mvUP/VdALPI7FUi0fKXW6JmK+5FH2b
-						+5o3pw18AjHX+TylwE0rIwofwNb+TwAPXyv/Iu4fqYL4ZEfwAfIHh9sqmmZdTQfL
-						AfbAiyFUkePPuF5fo05C70iZR6GIkmt09g2V8MmQZPwWyl+ar+UK0Xg8uqB5uBC0
-						/+1GTST3DkvMiNpzOdE9ryueHBpQ7W5S+JuRbQ7BZUgFxBrbSPmFsCiPCKFmJ3KA
-						9a0UDu0T7vU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdevon.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southdevon.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.southdevon.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southdevon.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southdevon.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southdevon.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">southdevon.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE5DCCA8ygAwIBAgIRANGrqwrzcv/wwtm5h/u2MFkwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA1MTYwMDAwMDBaFw0xNjA1MTUyMzU5NTlaMIGvMQswCQYD
-						VQQGEwJHQjEQMA4GA1UEERMHVFE0IDdFSjEOMAwGA1UECBMFRGV2b24xETAPBgNV
-						BAcTCFBBSUdOVE9OMRIwEAYDVQQJEwlMb25nIFJvYWQxHDAaBgNVBAoTE1NvdXRo
-						IERldm9uIENvbGxlZ2UxGjAYBgNVBAsTEUNvbXB1dGVyIFNlcnZpY2VzMR0wGwYD
-						VQQDExRpZHAuc291dGhkZXZvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAM7bII/xHAr1oS3qU/Y+fjfA5zzvRSgLS1pEveCyck9Z1w30Tt8v
-						C0NTuLUw6KnjrytWVjWdQJJoRCMI3sjpwFqDC+6js4azlee2AABynMdGzOuJ6GqA
-						A8pzDxes/BSio8CxHG/Sp2rglvpDphQLKgzTACTUeooWQ2qhEm9liS5HercXHZnx
-						AIZCGpw9ChqhiXAofAENjdBl3kuqHl1gn80j4uN7jtTXKb7Rz6DwsXlc3tl/rT7c
-						Ar8z0mTllMy09m21rLXae4CaQB/3x7j6HFWeSEcHh6o5iBjWnlmQmQnsXsybIeuz
-						xqdLKwDhOIqz2hW3MiQX8wCqE5YwGaZtEaMCAwEAAaOCAXEwggFtMB8GA1UdIwQY
-						MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRxOiCSLnFHA2VGV1OX
-						hbf81QvVgTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-						BggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAI
-						BgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
-						Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
-						hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
-						BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIU
-						aWRwLnNvdXRoZGV2b24uYWMudWswDQYJKoZIhvcNAQEFBQADggEBAKjRYUyCVxuA
-						VlPnjOLvXIby4ohy2rqZKc7Co2U6TNDkPMlC+7j48hBsDjGQzpW7l3B6Qktq9Iox
-						0i3cS5NQVXL0aeL+4ixSnlX62EeqdAElo7mvUP/VdALPI7FUi0fKXW6JmK+5FH2b
-						+5o3pw18AjHX+TylwE0rIwofwNb+TwAPXyv/Iu4fqYL4ZEfwAfIHh9sqmmZdTQfL
-						AfbAiyFUkePPuF5fo05C70iZR6GIkmt09g2V8MmQZPwWyl+ar+UK0Xg8uqB5uBC0
-						/+1GTST3DkvMiNpzOdE9ryueHBpQ7W5S+JuRbQ7BZUgFxBrbSPmFsCiPCKFmJ3KA
-						9a0UDu0T7vU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdevon.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southdevon.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">South Devon College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South Devon College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.southdevon.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kelly</GivenName>
-    <SurName>Cassidy</SurName>
-    <EmailAddress>mailto:helpdesk@southdevon.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Turner</SurName>
-    <EmailAddress>mailto:dturner@southdevon.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 764aab2e..00000000
--- a/swamid-interfederations-2.0/idp.southdowns.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.southdowns.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for South Downs College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-13T13:31:27Z">
-      <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 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">southdowns.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUYHmDs/az55KjV5rkUaoUYXIIy5owDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMuYWMudWswHhcNMTUwOTAyMTMx
-						MTIzWhcNMzUwOTAyMTMxMTIzWjAfMR0wGwYDVQQDDBRpZHAuc291dGhkb3ducy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJD2qQHKuCscG5oq
-						aOy3Fk3iOe6VlPoPYZfYzhIAZmNR5ZBkU4Ivn7nmV8GcrD1Swh8Y5vdC/IeUPefA
-						eexh0zp0sjEmK36ozU8z7dcvflkr9P4tCBzD8zDyYq26W0FCM7iDl7RTwWGga+k3
-						YVPuDV7c7hL7yA3d+MR1SFtFK1MH6/0tvadbek+m/Qk+GkD8mPjH+jK1O9tUNXz2
-						cf46+FyorWljKa1zy4jQI+J2adR2lPbNf0msKOQIlXEtpodYfCFEs2O5xFZWKuHS
-						t2z9yrYU8APNFD+hjH1sfup8aIXcDVWlvJ928/y5KFi3M6uk/0jVmTwuATeSst4l
-						KWNTS00CAwEAAaNvMG0wHQYDVR0OBBYEFPh/uaK4fAtwKtAOrt+RDl7ZghQgMEwG
-						A1UdEQRFMEOCFGlkcC5zb3V0aGRvd25zLmFjLnVrhitodHRwczovL2lkcC5zb3V0
-						aGRvd25zLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCA
-						dpBM3g3j7BgrhWzrMN22MStrlD4k19CS0axy4gIhdkfnyM3KJ0gofW8OxVVDYrnJ
-						K7723AtHhcuyXxCOFqfO151phc+6p9YLC2GkxUmatndDCsTnEXkF3/CDQZs/PzcS
-						NGwhfIh7t3Htdj6kAHsWirJKjBST+TJ458UrAIPr3QvbnUZqoUH/J245LuzmAPpj
-						Cf/SgnqzGpDvH+LlNRYGtz6gg3iCy3+CL0NONVGPoNAbmqFs6/f1zKiJ+spWNFqF
-						HqIoomwHimq/YI3YLG1lctf7bmH/fyvG/pZkVBA8FVr3Ex8HKiiRep67LUeei/uw
-						sgqZQgD6qpDN/0gCtjl6
-					</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>
-						MIIDPDCCAiSgAwIBAgIVAMFezK1HZGgJj+eQYT5V8m5r7asnMA0GCSqGSIb3DQEB
-						CwUAMB8xHTAbBgNVBAMMFGlkcC5zb3V0aGRvd25zLmFjLnVrMB4XDTE1MDkwMjEz
-						MTEyMloXDTM1MDkwMjEzMTEyMlowHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCP9UwG634cR5mg
-						xsLoemlVj6EEBrJLaUhvp0nn/HgiuqMwptBFaFk1qMHsVspY3Prbd+pv40af5r8+
-						pkzQWedbqwI96/J39qqk7/k37z+YflUM/t9iRhQR7NuxDnLr9JyWb5/qLY39SJ8G
-						gEvf5Seu4A15Yqn12CAOcFY/OW58p5tzPg5uUhcGV3TyvOAMgubWmdilCTz27ktR
-						PchfZJ2CAfOCSGom3j15K65dzDtj7yARIhSW1SGGkXtaPmBuM22Xlh7IIYHTYRVS
-						5YT1heEV6kKvbMpE6Yrn5LXid5enO1lwQkfD6C4juvIZkoNipWhcI22KpLfC3MRM
-						A6bB1O2dAgMBAAGjbzBtMB0GA1UdDgQWBBTlWgwMVgaFSkCJJ8Bgs25O7/1uljBM
-						BgNVHREERTBDghRpZHAuc291dGhkb3ducy5hYy51a4YraHR0cHM6Ly9pZHAuc291
-						dGhkb3ducy5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-						QB0ChtEoGxbnbeuyALNd6XoTaATMDUq87IXWiX0vJhu+ZNB23AEMFrH3kNQJw++l
-						xwiYi3xzq4Dc6W/0s0d2S20TFoMXrkewqMmj1fqODX92iN/KbwMWdl9zFxar8Qvv
-						DRRV6e+Hvc3ZHlIWekv5RRE0R798yg37kQPFEc40NaiQadOx0twWDZIiY9mRhlXz
-						oNtXMYVjozF3Eg6QvJxuhrji5m7CnbT+j7yVxaOnJveRb2BShp7luHy8RbFW3Noj
-						sbbLV0dPkIADL7SSkQIOD1fBgIVeYQf60AF1FQwWi0rXxZNvZevsji8k+gjZ7YCK
-						wibNrb/diFicd5nzUvOpQQ==
-					</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>
-						MIIDOzCCAiOgAwIBAgIUfNUZc3yh6hhcTZJFXiiWY/Nf9IMwDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMuYWMudWswHhcNMTUwOTAyMTMx
-						MTIzWhcNMzUwOTAyMTMxMTIzWjAfMR0wGwYDVQQDDBRpZHAuc291dGhkb3ducy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK19/5+rAkwXqY+x
-						MIrlRAzMtFYBMc9Xm6VZ683oVtzxh79oBrzordKVo05mvVk3aTci7wcypyZE5f14
-						xGK9dVEtFU+h0VgnmjuuSNxlX0SNi+bTc1UV2yEcMg+PpeAjzrr30Z4cao8+eCo7
-						gjBEqMxNN4bM5hugVl45BmsVAL/0EggVde6cei6ReJ+rn1DzAQhuQWpY3ifXhl+y
-						IL+t0qBmfV35bt1rYSSENR5uXYQsfwFv5euXD4h2OXXUp4ZLWh8/xHfdsLsA4+LP
-						wCpL/xEwOWBGmf/fId6D3rFQAVjZZT8N1GbsN8ttJQ/QRu1+UaZt0CAUEZkvO1FX
-						Xeehx/ECAwEAAaNvMG0wHQYDVR0OBBYEFORpT+vDj6KPgxh99vtPQ6pzPbwqMEwG
-						A1UdEQRFMEOCFGlkcC5zb3V0aGRvd25zLmFjLnVrhitodHRwczovL2lkcC5zb3V0
-						aGRvd25zLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAZ
-						JvxI37cM9qB7mOZ4wO8EHCOpkH23rAjaWT9SpswvOT4KlYzbiQ8l1Y9Fo/qozxjl
-						q23B+tT1S5awryrUJlFs0nWrXcbYLFsBv6v9jNEWCHjByoXkpxR08NrqSNAsRrDT
-						xFwcXNb85gHPgyCYysXm3lEAn3pUCNZv9mReE5fiIJE1OBswzpoR5DsehwLMcwX0
-						v+ptmvLy2QxF10v791+/GnHAzXThcvDLGCVkqcQdhDzF8+bcqSxyvWWKUoL91R1O
-						HyQKxKQl7wh7guZ9VrDhYt+LZvhNMy2yXVeyBDEJ/EbVTDGC9oCqS/g2JDDTaIVm
-						1U1lZKF34YlBgsYQnovH
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdowns.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southdowns.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.southdowns.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southdowns.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southdowns.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southdowns.ac.uk/idp/profile/SAML2/Redirect/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">southdowns.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUYHmDs/az55KjV5rkUaoUYXIIy5owDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMuYWMudWswHhcNMTUwOTAyMTMx
-						MTIzWhcNMzUwOTAyMTMxMTIzWjAfMR0wGwYDVQQDDBRpZHAuc291dGhkb3ducy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJD2qQHKuCscG5oq
-						aOy3Fk3iOe6VlPoPYZfYzhIAZmNR5ZBkU4Ivn7nmV8GcrD1Swh8Y5vdC/IeUPefA
-						eexh0zp0sjEmK36ozU8z7dcvflkr9P4tCBzD8zDyYq26W0FCM7iDl7RTwWGga+k3
-						YVPuDV7c7hL7yA3d+MR1SFtFK1MH6/0tvadbek+m/Qk+GkD8mPjH+jK1O9tUNXz2
-						cf46+FyorWljKa1zy4jQI+J2adR2lPbNf0msKOQIlXEtpodYfCFEs2O5xFZWKuHS
-						t2z9yrYU8APNFD+hjH1sfup8aIXcDVWlvJ928/y5KFi3M6uk/0jVmTwuATeSst4l
-						KWNTS00CAwEAAaNvMG0wHQYDVR0OBBYEFPh/uaK4fAtwKtAOrt+RDl7ZghQgMEwG
-						A1UdEQRFMEOCFGlkcC5zb3V0aGRvd25zLmFjLnVrhitodHRwczovL2lkcC5zb3V0
-						aGRvd25zLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCA
-						dpBM3g3j7BgrhWzrMN22MStrlD4k19CS0axy4gIhdkfnyM3KJ0gofW8OxVVDYrnJ
-						K7723AtHhcuyXxCOFqfO151phc+6p9YLC2GkxUmatndDCsTnEXkF3/CDQZs/PzcS
-						NGwhfIh7t3Htdj6kAHsWirJKjBST+TJ458UrAIPr3QvbnUZqoUH/J245LuzmAPpj
-						Cf/SgnqzGpDvH+LlNRYGtz6gg3iCy3+CL0NONVGPoNAbmqFs6/f1zKiJ+spWNFqF
-						HqIoomwHimq/YI3YLG1lctf7bmH/fyvG/pZkVBA8FVr3Ex8HKiiRep67LUeei/uw
-						sgqZQgD6qpDN/0gCtjl6
-					</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>
-						MIIDPDCCAiSgAwIBAgIVAMFezK1HZGgJj+eQYT5V8m5r7asnMA0GCSqGSIb3DQEB
-						CwUAMB8xHTAbBgNVBAMMFGlkcC5zb3V0aGRvd25zLmFjLnVrMB4XDTE1MDkwMjEz
-						MTEyMloXDTM1MDkwMjEzMTEyMlowHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCP9UwG634cR5mg
-						xsLoemlVj6EEBrJLaUhvp0nn/HgiuqMwptBFaFk1qMHsVspY3Prbd+pv40af5r8+
-						pkzQWedbqwI96/J39qqk7/k37z+YflUM/t9iRhQR7NuxDnLr9JyWb5/qLY39SJ8G
-						gEvf5Seu4A15Yqn12CAOcFY/OW58p5tzPg5uUhcGV3TyvOAMgubWmdilCTz27ktR
-						PchfZJ2CAfOCSGom3j15K65dzDtj7yARIhSW1SGGkXtaPmBuM22Xlh7IIYHTYRVS
-						5YT1heEV6kKvbMpE6Yrn5LXid5enO1lwQkfD6C4juvIZkoNipWhcI22KpLfC3MRM
-						A6bB1O2dAgMBAAGjbzBtMB0GA1UdDgQWBBTlWgwMVgaFSkCJJ8Bgs25O7/1uljBM
-						BgNVHREERTBDghRpZHAuc291dGhkb3ducy5hYy51a4YraHR0cHM6Ly9pZHAuc291
-						dGhkb3ducy5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA
-						QB0ChtEoGxbnbeuyALNd6XoTaATMDUq87IXWiX0vJhu+ZNB23AEMFrH3kNQJw++l
-						xwiYi3xzq4Dc6W/0s0d2S20TFoMXrkewqMmj1fqODX92iN/KbwMWdl9zFxar8Qvv
-						DRRV6e+Hvc3ZHlIWekv5RRE0R798yg37kQPFEc40NaiQadOx0twWDZIiY9mRhlXz
-						oNtXMYVjozF3Eg6QvJxuhrji5m7CnbT+j7yVxaOnJveRb2BShp7luHy8RbFW3Noj
-						sbbLV0dPkIADL7SSkQIOD1fBgIVeYQf60AF1FQwWi0rXxZNvZevsji8k+gjZ7YCK
-						wibNrb/diFicd5nzUvOpQQ==
-					</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>
-						MIIDOzCCAiOgAwIBAgIUfNUZc3yh6hhcTZJFXiiWY/Nf9IMwDQYJKoZIhvcNAQEL
-						BQAwHzEdMBsGA1UEAwwUaWRwLnNvdXRoZG93bnMuYWMudWswHhcNMTUwOTAyMTMx
-						MTIzWhcNMzUwOTAyMTMxMTIzWjAfMR0wGwYDVQQDDBRpZHAuc291dGhkb3ducy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK19/5+rAkwXqY+x
-						MIrlRAzMtFYBMc9Xm6VZ683oVtzxh79oBrzordKVo05mvVk3aTci7wcypyZE5f14
-						xGK9dVEtFU+h0VgnmjuuSNxlX0SNi+bTc1UV2yEcMg+PpeAjzrr30Z4cao8+eCo7
-						gjBEqMxNN4bM5hugVl45BmsVAL/0EggVde6cei6ReJ+rn1DzAQhuQWpY3ifXhl+y
-						IL+t0qBmfV35bt1rYSSENR5uXYQsfwFv5euXD4h2OXXUp4ZLWh8/xHfdsLsA4+LP
-						wCpL/xEwOWBGmf/fId6D3rFQAVjZZT8N1GbsN8ttJQ/QRu1+UaZt0CAUEZkvO1FX
-						Xeehx/ECAwEAAaNvMG0wHQYDVR0OBBYEFORpT+vDj6KPgxh99vtPQ6pzPbwqMEwG
-						A1UdEQRFMEOCFGlkcC5zb3V0aGRvd25zLmFjLnVrhitodHRwczovL2lkcC5zb3V0
-						aGRvd25zLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAZ
-						JvxI37cM9qB7mOZ4wO8EHCOpkH23rAjaWT9SpswvOT4KlYzbiQ8l1Y9Fo/qozxjl
-						q23B+tT1S5awryrUJlFs0nWrXcbYLFsBv6v9jNEWCHjByoXkpxR08NrqSNAsRrDT
-						xFwcXNb85gHPgyCYysXm3lEAn3pUCNZv9mReE5fiIJE1OBswzpoR5DsehwLMcwX0
-						v+ptmvLy2QxF10v791+/GnHAzXThcvDLGCVkqcQdhDzF8+bcqSxyvWWKUoL91R1O
-						HyQKxKQl7wh7guZ9VrDhYt+LZvhNMy2yXVeyBDEJ/EbVTDGC9oCqS/g2JDDTaIVm
-						1U1lZKF34YlBgsYQnovH
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southdowns.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">South Downs College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South Downs College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.southdowns.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adam</GivenName>
-    <SurName>Ward</SurName>
-    <EmailAddress>mailto:adam.ward@migliori.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Allison</SurName>
-    <EmailAddress>mailto:spallison@southdowns.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Allison</SurName>
-    <EmailAddress>mailto:spallison@southdowns.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Neil</GivenName>
-    <SurName>Mcqueen</SurName>
-    <EmailAddress>mailto:nmcqueen@southdowns.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southend.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.southend.ac.uk-shibboleth.xml
deleted file mode 100644
index 16a4070f..00000000
--- a/swamid-interfederations-2.0/idp.southend.ac.uk-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.southend.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for South Essex College of Further and Higher Education.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">southend.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/southend.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/southend.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South Essex College of Further and Higher Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.southessex.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southport-college.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.southport-college.ac.uk-shibboleth.xml
deleted file mode 100644
index 6dbb7ac4..00000000
--- a/swamid-interfederations-2.0/idp.southport-college.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.southport-college.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Southport College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-03-07T10:31: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">southport-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEsTCCA5mgAwIBAgIRAM4+u1j8tHGyZ3CJGu2RVKAwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMjAzMDgwMDAwMDBaFw0xNTAzMDgyMzU5NTlaMIGGMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTWVyc2V5c2lkZTESMBAGA1UEBxMJU291dGhwb3J0
-						MRowGAYDVQQKExFTb3V0aHBvcnQgQ29sbGVnZTETMBEGA1UECxMKSVQgU3VwcG9y
-						dDEdMBsGA1UEAxMUaWRwMi5zb3V0aHBvcnQuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCjVvXeYyW/r8x7GC684h0RWFm+98keDBHHCP8zWLEr
-						Rv9B0694XtcK0Cp9BPxbyuRRujsH3/udNCMrDjWLiWlMXQfXAGqhxsRbuyau84Mv
-						W3imOw7Z/Xr4pBuJYSXMeLMt0uwxR4g4Bibwz9iJ9Oha3GiZrHw8Xi3HdGZQhycb
-						s78EHvf1Hc/8K3rIaRHDqafEU6Qsr7cZYFVZcg+eJeMk/UFxVjud1Mcg7IvUbd3A
-						kplU7Vy04toa8qG4CBzDXKL3BLyP9aCaYqKMmv3w7gcl/OiRl54b6XvW06RgHBR9
-						7eEdHuLu9l390Drxbvs9gDreUpp+6Zh/+mwntjKe6K3lAgMBAAGjggFnMIIBYzAf
-						BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUYg8eec5X
-						YEoXxBLSSDAqd7IzU90wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-						VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-						MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRw
-						Mi5zb3V0aHBvcnQuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAL7KMOZXF9gAu2S/
-						KTVwDfY/JJz6JO/Cn1KbK3kjvSXvhx0sajtUnurIPFMudOZC22EDxhMAHuoSDSiS
-						d+pIKVVDaoIt49DWr5jqd511o/f0NV531TIelMJ4mk1pvdysP89rShanZTbJxiwt
-						oYSYpO5GuAcx/1oG0AvuSdAN+0T8ypMKu1JmVIapiyEFn/JW3mDhlK/huEiPMZ+V
-						K4rJBIWPgMbIQMH/7Xau2XOAjpPp3iPJJtz8y13Kdbd3QRqDVEefLsJ0UlHI5tpz
-						50+UYVHEgeODj4CfHLA5JCobZ60OtcOW/ROAPOrU80RM378D05Yyx48DecUZLmRM
-						RYYdy9o=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.southport.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.southport.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://idp2.southport.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.southport.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.southport.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.southport.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">southport-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEsTCCA5mgAwIBAgIRAM4+u1j8tHGyZ3CJGu2RVKAwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMjAzMDgwMDAwMDBaFw0xNTAzMDgyMzU5NTlaMIGGMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTWVyc2V5c2lkZTESMBAGA1UEBxMJU291dGhwb3J0
-						MRowGAYDVQQKExFTb3V0aHBvcnQgQ29sbGVnZTETMBEGA1UECxMKSVQgU3VwcG9y
-						dDEdMBsGA1UEAxMUaWRwMi5zb3V0aHBvcnQuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCjVvXeYyW/r8x7GC684h0RWFm+98keDBHHCP8zWLEr
-						Rv9B0694XtcK0Cp9BPxbyuRRujsH3/udNCMrDjWLiWlMXQfXAGqhxsRbuyau84Mv
-						W3imOw7Z/Xr4pBuJYSXMeLMt0uwxR4g4Bibwz9iJ9Oha3GiZrHw8Xi3HdGZQhycb
-						s78EHvf1Hc/8K3rIaRHDqafEU6Qsr7cZYFVZcg+eJeMk/UFxVjud1Mcg7IvUbd3A
-						kplU7Vy04toa8qG4CBzDXKL3BLyP9aCaYqKMmv3w7gcl/OiRl54b6XvW06RgHBR9
-						7eEdHuLu9l390Drxbvs9gDreUpp+6Zh/+mwntjKe6K3lAgMBAAGjggFnMIIBYzAf
-						BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUYg8eec5X
-						YEoXxBLSSDAqd7IzU90wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-						VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-						MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRw
-						Mi5zb3V0aHBvcnQuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAL7KMOZXF9gAu2S/
-						KTVwDfY/JJz6JO/Cn1KbK3kjvSXvhx0sajtUnurIPFMudOZC22EDxhMAHuoSDSiS
-						d+pIKVVDaoIt49DWr5jqd511o/f0NV531TIelMJ4mk1pvdysP89rShanZTbJxiwt
-						oYSYpO5GuAcx/1oG0AvuSdAN+0T8ypMKu1JmVIapiyEFn/JW3mDhlK/huEiPMZ+V
-						K4rJBIWPgMbIQMH/7Xau2XOAjpPp3iPJJtz8y13Kdbd3QRqDVEefLsJ0UlHI5tpz
-						50+UYVHEgeODj4CfHLA5JCobZ60OtcOW/ROAPOrU80RM378D05Yyx48DecUZLmRM
-						RYYdy9o=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.southport.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.southport.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">Southport College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Southport College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.southport-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Arun</GivenName>
-    <SurName>Gambhir</SurName>
-    <EmailAddress>mailto:helpdesk@southport.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Benson</SurName>
-    <EmailAddress>mailto:james@southport.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.southstaffs.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 8ebfcf86..00000000
--- a/swamid-interfederations-2.0/idp.southstaffs.ac.uk-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.southstaffs.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for South Staffordshire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">southstaffs.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEADCCAugCCQDq7fzogZjavTANBgkqhkiG9w0BAQUFADCBwTELMAkGA1UEBhMC
-						R0IxFjAUBgNVBAgTDVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcTCFRhbXdvcnRoMSQw
-						IgYDVQQKExtTb3V0aCBTdGFmZm9yZHNoaXJlIENvbGxlZ2UxFDASBgNVBAsTC0lU
-						IFNlcnZpY2VzMR4wHAYDVQQDExVpZHAuc291dGhzdGFmZnMuYWMudWsxKzApBgkq
-						hkiG9w0BCQEWHGdhcnkuYm9vdGhAc291dGhzdGFmZnMuYWMudWswHhcNMTUxMDAx
-						MDgzMzQwWhcNMjUwOTI4MDgzMzQwWjCBwTELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
-						DVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcTCFRhbXdvcnRoMSQwIgYDVQQKExtTb3V0
-						aCBTdGFmZm9yZHNoaXJlIENvbGxlZ2UxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR4w
-						HAYDVQQDExVpZHAuc291dGhzdGFmZnMuYWMudWsxKzApBgkqhkiG9w0BCQEWHGdh
-						cnkuYm9vdGhAc291dGhzdGFmZnMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQDpAtyHcloEmBjnBzQxRdtiwfRNrvh+ByEyU/ztDHg4dLD8IbqX
-						AInffLFXEZu7WPLaHwzxx/qcbQY0CvTXSt5+ggzfgJAxw2GjzgC9GQ3ExCBFcA+n
-						gfQ7hmpizd21ik6NLAlG84fqGWgJuL/tRbfuIVQxTdImd/h4ryi0B1GjmF6/VFQI
-						SXNWPGVgiAgjLZTozAHkO/WjDXXhLQZYcqlKNHm89SJlfi+VF4TgYW2a98B89fET
-						dfWLkidV4KUUwDkv6FMHnqv7mfjJ9MoRU8mpfX8JDK0/lUozn0QLFQ3AO8OxrZoA
-						6sewDKvIMhl56nqegL/l+kLSbYkaJ/bKGS4LAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggEBAAbies8SwJ46Nnck7OY9OAWV1WQqrVzgHFBjahn7Izt2keXy+VEW86mBA4Kg
-						a6QevrGHRbGgcKpZAXrnDj2z0UCQXqIUQbLEUubPYEVbbhf3QSHOWaJnYCwGnAhD
-						+XkBqp0BnwFsF51vO8SegX8S9YCsfA681W0fy7z3zkIwCQCfZHzpw7n1c4Q6KV4o
-						BRNn2y+oMFH3d+zhShhQAa+wS+byfkw7/7D+FpZqg/PViTgmhYSkJH0S+xZWqn/R
-						HGMSdGf19+/k58X3xxk+amHzW1QWkXJzWmjds5vuG/ni8EQyAnkV3Jx0+XblP4f6
-						fwNx1H4ChYP4eEBqGjsRQKkDWr0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southstaffs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southstaffs.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.southstaffs.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.southstaffs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.southstaffs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.southstaffs.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">southstaffs.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEADCCAugCCQDq7fzogZjavTANBgkqhkiG9w0BAQUFADCBwTELMAkGA1UEBhMC
-						R0IxFjAUBgNVBAgTDVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcTCFRhbXdvcnRoMSQw
-						IgYDVQQKExtTb3V0aCBTdGFmZm9yZHNoaXJlIENvbGxlZ2UxFDASBgNVBAsTC0lU
-						IFNlcnZpY2VzMR4wHAYDVQQDExVpZHAuc291dGhzdGFmZnMuYWMudWsxKzApBgkq
-						hkiG9w0BCQEWHGdhcnkuYm9vdGhAc291dGhzdGFmZnMuYWMudWswHhcNMTUxMDAx
-						MDgzMzQwWhcNMjUwOTI4MDgzMzQwWjCBwTELMAkGA1UEBhMCR0IxFjAUBgNVBAgT
-						DVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcTCFRhbXdvcnRoMSQwIgYDVQQKExtTb3V0
-						aCBTdGFmZm9yZHNoaXJlIENvbGxlZ2UxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR4w
-						HAYDVQQDExVpZHAuc291dGhzdGFmZnMuYWMudWsxKzApBgkqhkiG9w0BCQEWHGdh
-						cnkuYm9vdGhAc291dGhzdGFmZnMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQDpAtyHcloEmBjnBzQxRdtiwfRNrvh+ByEyU/ztDHg4dLD8IbqX
-						AInffLFXEZu7WPLaHwzxx/qcbQY0CvTXSt5+ggzfgJAxw2GjzgC9GQ3ExCBFcA+n
-						gfQ7hmpizd21ik6NLAlG84fqGWgJuL/tRbfuIVQxTdImd/h4ryi0B1GjmF6/VFQI
-						SXNWPGVgiAgjLZTozAHkO/WjDXXhLQZYcqlKNHm89SJlfi+VF4TgYW2a98B89fET
-						dfWLkidV4KUUwDkv6FMHnqv7mfjJ9MoRU8mpfX8JDK0/lUozn0QLFQ3AO8OxrZoA
-						6sewDKvIMhl56nqegL/l+kLSbYkaJ/bKGS4LAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggEBAAbies8SwJ46Nnck7OY9OAWV1WQqrVzgHFBjahn7Izt2keXy+VEW86mBA4Kg
-						a6QevrGHRbGgcKpZAXrnDj2z0UCQXqIUQbLEUubPYEVbbhf3QSHOWaJnYCwGnAhD
-						+XkBqp0BnwFsF51vO8SegX8S9YCsfA681W0fy7z3zkIwCQCfZHzpw7n1c4Q6KV4o
-						BRNn2y+oMFH3d+zhShhQAa+wS+byfkw7/7D+FpZqg/PViTgmhYSkJH0S+xZWqn/R
-						HGMSdGf19+/k58X3xxk+amHzW1QWkXJzWmjds5vuG/ni8EQyAnkV3Jx0+XblP4f6
-						fwNx1H4ChYP4eEBqGjsRQKkDWr0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.southstaffs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.southstaffs.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">South Staffordshire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South Staffordshire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.southstaffs.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Gary</GivenName>
-    <SurName>Booth</SurName>
-    <EmailAddress>mailto:gary.booth@southstaffs.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gary</GivenName>
-    <SurName>Booth</SurName>
-    <EmailAddress>mailto:gary.booth@southstaffs.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.src.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.src.ac.uk-shibboleth.xml
deleted file mode 100644
index 58399de2..00000000
--- a/swamid-interfederations-2.0/idp.src.ac.uk-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://idp.src.ac.uk/shibboleth">
-  <!--
-	This is a Shibboleth IdP for Southern Regional College.
--->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-11T11:20: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">src.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbDCCAlQCCQCKPT5imLa/BjANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
-						QjEZMBcGA1UECBMQTm9ydGhlcm4gSXJlbGFuZDESMBAGA1UEBxMJUG9ydGFkb3du
-						MSIwIAYDVQQKExlTb3V0aGVybiBSZWdpb25hbCBDb2xsZWdlMRYwFAYDVQQDEw1p
-						ZHAuc3JjLmFjLnVrMB4XDTE0MDkxMDExMDIzMFoXDTM0MDkwNTExMDIzMFoweDEL
-						MAkGA1UEBhMCR0IxGTAXBgNVBAgTEE5vcnRoZXJuIElyZWxhbmQxEjAQBgNVBAcT
-						CVBvcnRhZG93bjEiMCAGA1UEChMZU291dGhlcm4gUmVnaW9uYWwgQ29sbGVnZTEW
-						MBQGA1UEAxMNaWRwLnNyYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAOTHbpykc5COQnnxrJLFexezdUga4EoB8mdakirFuwIG97l3AjMJBuAP
-						Biu1FU8HbINhprwJvpWFBsmN+x4GCkLVdBGqSa0jiPopvKfOH3cgHZISxpsrAzan
-						AXK1jTwRl7OpqnaN4u2lxltlfxyMy9UJnoroxF1VUDN87ewRVC6dxC+plOM8oC/A
-						7U9KFySYKKXbZJlKjwPzWImWe8kueRotr0H4k23DChphMXkzSu+m96F7VYzQu2tB
-						N+OHNfIs1ZwOxqLByFE2TZDLyaTCHV3MxrmNF9sLlmKz7ZAq0XlD8+swnBglYJ3F
-						vit11nDDCtOZNINOSCTFZrGWoy1qkkcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						hz9L58a6+yQg4CInU/6LwccJ19vAZAej0oKyqguO6aU5dWICo4fhMKvExFrOVFPt
-						wnwH/K/SAEbxfy/uDA/Tb13mAtYKHKYaCxujRrhQB/5mEoXQKN0Iqg4bBMXyjhyv
-						HoFmqjXdk7l5ATbJwd4fZBX4/eXnpp2MJkgC4xw2WxwTewRnKTNfUPvF7t0WIUZj
-						oivnlWGoK16H0kyZhnf+2MOtUV1FjEsDV8knoOrG20XyHUJiaThAnZibnWj+3eqz
-						bKQM8n3dmoAEec+lEpstACCdtI6QGLtrNhTau3o+iLlvMHU6DCoduw/oYp06jkkP
-						AumZKaDE5XZJXS0yDbD+PQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.src.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.src.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.src.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.src.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.src.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.src.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">src.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbDCCAlQCCQCKPT5imLa/BjANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
-						QjEZMBcGA1UECBMQTm9ydGhlcm4gSXJlbGFuZDESMBAGA1UEBxMJUG9ydGFkb3du
-						MSIwIAYDVQQKExlTb3V0aGVybiBSZWdpb25hbCBDb2xsZWdlMRYwFAYDVQQDEw1p
-						ZHAuc3JjLmFjLnVrMB4XDTE0MDkxMDExMDIzMFoXDTM0MDkwNTExMDIzMFoweDEL
-						MAkGA1UEBhMCR0IxGTAXBgNVBAgTEE5vcnRoZXJuIElyZWxhbmQxEjAQBgNVBAcT
-						CVBvcnRhZG93bjEiMCAGA1UEChMZU291dGhlcm4gUmVnaW9uYWwgQ29sbGVnZTEW
-						MBQGA1UEAxMNaWRwLnNyYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAOTHbpykc5COQnnxrJLFexezdUga4EoB8mdakirFuwIG97l3AjMJBuAP
-						Biu1FU8HbINhprwJvpWFBsmN+x4GCkLVdBGqSa0jiPopvKfOH3cgHZISxpsrAzan
-						AXK1jTwRl7OpqnaN4u2lxltlfxyMy9UJnoroxF1VUDN87ewRVC6dxC+plOM8oC/A
-						7U9KFySYKKXbZJlKjwPzWImWe8kueRotr0H4k23DChphMXkzSu+m96F7VYzQu2tB
-						N+OHNfIs1ZwOxqLByFE2TZDLyaTCHV3MxrmNF9sLlmKz7ZAq0XlD8+swnBglYJ3F
-						vit11nDDCtOZNINOSCTFZrGWoy1qkkcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						hz9L58a6+yQg4CInU/6LwccJ19vAZAej0oKyqguO6aU5dWICo4fhMKvExFrOVFPt
-						wnwH/K/SAEbxfy/uDA/Tb13mAtYKHKYaCxujRrhQB/5mEoXQKN0Iqg4bBMXyjhyv
-						HoFmqjXdk7l5ATbJwd4fZBX4/eXnpp2MJkgC4xw2WxwTewRnKTNfUPvF7t0WIUZj
-						oivnlWGoK16H0kyZhnf+2MOtUV1FjEsDV8knoOrG20XyHUJiaThAnZibnWj+3eqz
-						bKQM8n3dmoAEec+lEpstACCdtI6QGLtrNhTau3o+iLlvMHU6DCoduw/oYp06jkkP
-						AumZKaDE5XZJXS0yDbD+PQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.src.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.src.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">Southern Regional College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Southern Regional College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.src.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Purcell</SurName>
-    <EmailAddress>mailto:purcellm@src.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Thomas</GivenName>
-    <SurName>Shirley</SurName>
-    <EmailAddress>mailto:shirleyt@src.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Purcell</SurName>
-    <EmailAddress>mailto:purcellm@src.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Shirley</SurName>
-    <EmailAddress>mailto:shirleyt@src.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sru.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sru.edu-idp-shibboleth.xml
deleted file mode 100644
index 5e62d56f..00000000
--- a/swamid-interfederations-2.0/idp.sru.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://idp.sru.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.sru.edu/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">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sru.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Slippery Rock University of Pennsylvania</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Slippery Rock University of Pennsylvania</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>
-MIIDUjCCAjoCCQC4QuY3Kem21zANBgkqhkiG9w0BAQUFADBrMRQwEgYDVQQDDAtp
-ZHAuc3J1LmVkdTEhMB8GA1UECgwYU2xpcHBlcnkgUm9jayBVbml2ZXJzaXR5MQsw
-CQYDVQQGEwJVUzELMAkGA1UECAwCUEExFjAUBgNVBAcMDVNsaXBwZXJ5IFJvY2sw
-HhcNMTMwNTExMTYyMjI2WhcNMTQwNTExMTYyMjI2WjBrMRQwEgYDVQQDDAtpZHAu
-c3J1LmVkdTEhMB8GA1UECgwYU2xpcHBlcnkgUm9jayBVbml2ZXJzaXR5MQswCQYD
-VQQGEwJVUzELMAkGA1UECAwCUEExFjAUBgNVBAcMDVNsaXBwZXJ5IFJvY2swggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD3fFM/uu4LyqEZLgqHRAtVSfxK
-Mdzmk5oQymQ+3wDlfZhZ4U37eJKxrUIQpJrYMpPaGavLqllWfT+YpAqai1L28W32
-Wdhb3t4soeMZ0SqpDdwOjwhpi5BumTgxxehR0wTbnM1mce7Dcm97chv7S+6g00G+
-JracU4eavR5HYAe1VBCyL4pikCUAumgMTXClY/uUoIRQ8i53Apx3gAm1Yt5K+eiu
-gY78ImJS67uprvTsBn7jb3pUFhjMRVxhMhmZuYjapGraZn1TRtmDOjM6gJd5B7IS
-O/5e8sK6Pl1E2+z+R0ti7I/hsR0eZ4He4yMoCdFqqybaHHvANEfl6NFb97fZAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBALgr/gAqImcBgGUln30vP7I7uCU9iyw/wZBr
-w4Kr5hszYbfoKk/UCpc84eyF2HOk4yfv5GJX7rcKbsz0frWSMt21LDLAytWrLktN
-lgJNjFcB0Sq5hCpIZ/nDbEveFJGw820KK4T1429H1WAzahf/Nu52kZOZC2nVahe4
-5lstrvfFwyPEE49TSKPh3wipsW0UTL262Smps/9tbPImBgVNEYfNHuwujNLuefAY
-FNTCh5GCTEEwP+oWWYizGWNo/1pJmSZZlvj/3d/JoNWbc+q2b3ig6FSTXkonXgdA
-+FrbfgLPw5cs4D4ECPBvlgj6hTbyG7HWRgT9XH6S67PDWvpvpWM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sru.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sru.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sru.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sru.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sru.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sru.edu/idp/profile/SAML2/POST-SimpleSign/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">sru.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDUjCCAjoCCQC4QuY3Kem21zANBgkqhkiG9w0BAQUFADBrMRQwEgYDVQQDDAtp
-ZHAuc3J1LmVkdTEhMB8GA1UECgwYU2xpcHBlcnkgUm9jayBVbml2ZXJzaXR5MQsw
-CQYDVQQGEwJVUzELMAkGA1UECAwCUEExFjAUBgNVBAcMDVNsaXBwZXJ5IFJvY2sw
-HhcNMTMwNTExMTYyMjI2WhcNMTQwNTExMTYyMjI2WjBrMRQwEgYDVQQDDAtpZHAu
-c3J1LmVkdTEhMB8GA1UECgwYU2xpcHBlcnkgUm9jayBVbml2ZXJzaXR5MQswCQYD
-VQQGEwJVUzELMAkGA1UECAwCUEExFjAUBgNVBAcMDVNsaXBwZXJ5IFJvY2swggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD3fFM/uu4LyqEZLgqHRAtVSfxK
-Mdzmk5oQymQ+3wDlfZhZ4U37eJKxrUIQpJrYMpPaGavLqllWfT+YpAqai1L28W32
-Wdhb3t4soeMZ0SqpDdwOjwhpi5BumTgxxehR0wTbnM1mce7Dcm97chv7S+6g00G+
-JracU4eavR5HYAe1VBCyL4pikCUAumgMTXClY/uUoIRQ8i53Apx3gAm1Yt5K+eiu
-gY78ImJS67uprvTsBn7jb3pUFhjMRVxhMhmZuYjapGraZn1TRtmDOjM6gJd5B7IS
-O/5e8sK6Pl1E2+z+R0ti7I/hsR0eZ4He4yMoCdFqqybaHHvANEfl6NFb97fZAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBALgr/gAqImcBgGUln30vP7I7uCU9iyw/wZBr
-w4Kr5hszYbfoKk/UCpc84eyF2HOk4yfv5GJX7rcKbsz0frWSMt21LDLAytWrLktN
-lgJNjFcB0Sq5hCpIZ/nDbEveFJGw820KK4T1429H1WAzahf/Nu52kZOZC2nVahe4
-5lstrvfFwyPEE49TSKPh3wipsW0UTL262Smps/9tbPImBgVNEYfNHuwujNLuefAY
-FNTCh5GCTEEwP+oWWYizGWNo/1pJmSZZlvj/3d/JoNWbc+q2b3ig6FSTXkonXgdA
-+FrbfgLPw5cs4D4ECPBvlgj6hTbyG7HWRgT9XH6S67PDWvpvpWM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sru.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sru.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Slippery Rock University of Pennsylvania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Slippery Rock University of Pennsylvania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sru.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Henry Magusiak</md:GivenName>
-    <md:EmailAddress>henry.magusiak@sru.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sruc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sruc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index df4f7396..00000000
--- a/swamid-interfederations-2.0/idp.sruc.ac.uk-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.sruc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for SRUC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-09T16:10:42Z">
-      <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">sruc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAgygAwIBAgIVAMisBG8/pYaTN/dKjE96UJTj0pHnMA0GCSqGSIb3DQEB
-						BQUAMBkxFzAVBgNVBAMTDmlkcC5zcnVjLmFjLnVrMB4XDTEzMDgxNTE4MzUyMVoX
-						DTMzMDgxNTE4MzUyMVowGTEXMBUGA1UEAxMOaWRwLnNydWMuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChYhV93CUW69tAVZOYdhzRX14Gtm8l
-						Ca8W4/EWAEqeVvoMT70fMMwCTPxHbSCkoEpk8RAwChzwGSTGJt8/dtyZWr6vmrHs
-						8TzCIKRPo1wJymIPtONtojdZnERwbEr0brAzIw82QIOidzYueWHpbrYSaxwmaQNR
-						LKwDIjf/0M7Zkm6t50vxu2XRttrxJ92x31U0P/mQa22DLlQs6gmJFoxO7jPc0gUj
-						svDsMTZXS6J4oXmnpqLHfGpGtiyGocunHRykIGX1cyxyJngRXVb6VCfnIb06nELH
-						9s27b9t6/IhWgmH9rCxS522xTuQDe0DKD0YpmMIQK3fHAhF8RaMGcT+PAgMBAAGj
-						YzBhMEAGA1UdEQQ5MDeCDmlkcC5zcnVjLmFjLnVrhiVodHRwczovL2lkcC5zcnVj
-						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTj1x9pT421ZN33j8y2qyC2
-						z7tEnDANBgkqhkiG9w0BAQUFAAOCAQEAbRG6KPM1cS83t1nTr68n4o+SAawN6IBS
-						yt0oSw7jL2eWsFZA3xgR3pePSiKdHXYLW3YEpJ+O3nS1Hs6Hz1lM3zwguJRSnJBk
-						tS/2Mvk/LiS3TecJqawwvZ5M+MHPckzKP/2cZwJum6dZps9U3KuuLEwU3aDt6Ri+
-						74AWwDm1DVM0AfuSOk+Gjjkh0mgoMCfMS1jFTRwJXxfH13/jq2ODCD7HlvlJ5eGD
-						Fknd4XDnhT0wz9uDxT1gTsXCRe/DP/Ql8iviaG1f9fENTz7MrcvKawLMqaRQpL6Z
-						9rbQkno5Y20gWQLAD3AF1pceBNBCO/6G/GCzRkdsGCtVNNXfnnsc3Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sruc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sruc.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.sruc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sruc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sruc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sruc.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">sruc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAgygAwIBAgIVAMisBG8/pYaTN/dKjE96UJTj0pHnMA0GCSqGSIb3DQEB
-						BQUAMBkxFzAVBgNVBAMTDmlkcC5zcnVjLmFjLnVrMB4XDTEzMDgxNTE4MzUyMVoX
-						DTMzMDgxNTE4MzUyMVowGTEXMBUGA1UEAxMOaWRwLnNydWMuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChYhV93CUW69tAVZOYdhzRX14Gtm8l
-						Ca8W4/EWAEqeVvoMT70fMMwCTPxHbSCkoEpk8RAwChzwGSTGJt8/dtyZWr6vmrHs
-						8TzCIKRPo1wJymIPtONtojdZnERwbEr0brAzIw82QIOidzYueWHpbrYSaxwmaQNR
-						LKwDIjf/0M7Zkm6t50vxu2XRttrxJ92x31U0P/mQa22DLlQs6gmJFoxO7jPc0gUj
-						svDsMTZXS6J4oXmnpqLHfGpGtiyGocunHRykIGX1cyxyJngRXVb6VCfnIb06nELH
-						9s27b9t6/IhWgmH9rCxS522xTuQDe0DKD0YpmMIQK3fHAhF8RaMGcT+PAgMBAAGj
-						YzBhMEAGA1UdEQQ5MDeCDmlkcC5zcnVjLmFjLnVrhiVodHRwczovL2lkcC5zcnVj
-						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTj1x9pT421ZN33j8y2qyC2
-						z7tEnDANBgkqhkiG9w0BAQUFAAOCAQEAbRG6KPM1cS83t1nTr68n4o+SAawN6IBS
-						yt0oSw7jL2eWsFZA3xgR3pePSiKdHXYLW3YEpJ+O3nS1Hs6Hz1lM3zwguJRSnJBk
-						tS/2Mvk/LiS3TecJqawwvZ5M+MHPckzKP/2cZwJum6dZps9U3KuuLEwU3aDt6Ri+
-						74AWwDm1DVM0AfuSOk+Gjjkh0mgoMCfMS1jFTRwJXxfH13/jq2ODCD7HlvlJ5eGD
-						Fknd4XDnhT0wz9uDxT1gTsXCRe/DP/Ql8iviaG1f9fENTz7MrcvKawLMqaRQpL6Z
-						9rbQkno5Y20gWQLAD3AF1pceBNBCO/6G/GCzRkdsGCtVNNXfnnsc3Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sruc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sruc.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">SRUC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SRUC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sruc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:SidIS@sruc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Gowler</SurName>
-    <EmailAddress>mailto:Peter.Gowler@sruc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Edinburgh Library</GivenName>
-    <EmailAddress>mailto:edinburghlibrary@sruc.ac.uk</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 35b58632..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ssc.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ssc.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ssc.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ssc.cas.cz/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">ssc.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ssc.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ssc.cas.cz: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">Centre of Administration and Operations of ASCR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Středisko společných činností AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Centre of Administration and Operations of ASCR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Středisko společných činností AV ČR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ssc.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ssc.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0b3cf47b..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sssup.it/idp/shibboleth">
-  <md: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>
-  </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">sssup.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sssup.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sssup.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sssup.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sssup.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sssup.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sssup.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sssup.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sssup.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Scuola Superiore Sant'Anna di Studi Universitari e di Perfezionamento</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Scuola Superiore Sant'Anna di Studi Universitari e di Perfezionamento</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Scuola Superiore Sant'Anna</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Scuola Superiore Sant'Anna</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.santannaschool.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.sssup.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:helpdesk@sssup.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.st-andrews.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.st-andrews.ac.uk-shibboleth.xml
deleted file mode 100644
index 32819630..00000000
--- a/swamid-interfederations-2.0/idp.st-andrews.ac.uk-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" entityID="https://idp.st-andrews.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of St Andrews.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-01-16T14:59: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">st-andrews.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFTDCCBDSgAwIBAgICEKgwDQYJKoZIhvcNAQEFBQAwgbsxCzAJBgNVBAYTAlVL
-						MQ0wCwYDVQQIEwRGaWZlMRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhV
-						bml2ZXJzaXR5IG9mIFN0IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMx
-						IzAhBgNVBAMTGk1hc3RlciBTaWduaW5nIENlcnRpZmljYXRlMSgwJgYJKoZIhvcN
-						AQkBFhloZWxwZGVza0BzdC1hbmRyZXdzLmFjLnVrMB4XDTE0MDUyODEwMjI0OVoX
-						DTM0MDUyMzEwMjI0OVowgYsxCzAJBgNVBAYTAkdCMQ0wCwYDVQQIEwRGaWZlMRMw
-						EQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFN0IEFu
-						ZHJld3MxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR8wHQYDVQQDExZsb2dpbi5zdC1h
-						bmRyZXdzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtrVW
-						AoC2c9E11GatKp3M8sFYhgsnPX1rdZ8bToP6y9uzQlKn7CSbzgY/MFTT1ol/dIpw
-						QFXqGBdNomQtaE3S2v81k30E2/nR294xEeT/PjP9GcPxYJjBq/ngoTzmBC6TJtsj
-						DWYWQEPUoMhgQ1Rqlhm2+rEJWY/AbdzZWjZiCS1P6W6uxw9/lPLLSAkSQSLGiavu
-						uyRmogqgH/HOzVFlF/DwKFZJDZ/bWGv1WHc6rii8nl8K9I1zZoM0sIPBnfrdWZzN
-						SAhX9zMSv1EXTJ0VFD3nrElU/Xx8WO4ZosnDwL7R+w6TZ1b+yOmc/A4ZsKQECxd/
-						LYcLPfbhgK2hhrApPQIDAQABo4IBhjCCAYIwCQYDVR0TBAIwADAsBglghkgBhvhC
-						AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFIKd
-						mF6wLnFmysL7I3lf1Z5UI+KIMIHwBgNVHSMEgegwgeWAFEVZKa2Kkeq6fIItSmOm
-						9juqqJOToYHBpIG+MIG7MQswCQYDVQQGEwJVSzENMAsGA1UECBMERmlmZTETMBEG
-						A1UEBxMKU3QgQW5kcmV3czEhMB8GA1UEChMYVW5pdmVyc2l0eSBvZiBTdCBBbmRy
-						ZXdzMRYwFAYDVQQLEw1JLlQuIFNlcnZpY2VzMSMwIQYDVQQDExpNYXN0ZXIgU2ln
-						bmluZyBDZXJ0aWZpY2F0ZTEoMCYGCSqGSIb3DQEJARYZaGVscGRlc2tAc3QtYW5k
-						cmV3cy5hYy51a4IJALjpP8s3OebbMDUGCWCGSAGG+EIBBAQoFiZodHRwOi8vd3d3
-						LnN0LWFuZHJld3MuYWMudWsvY2EtY3JsLnBlbTANBgkqhkiG9w0BAQUFAAOCAQEA
-						j9HmQMvf9ZWP0RSRvxvPG9esUh/D3QpsVw4Q0NmH0iH3CO+KEAuskwRi4Oy0P7kG
-						gYIdgRp9upn2lqn70mNU6B040YG7gB8cCckNFcTguwBjgiwahzXuF8xbpHCbDQRh
-						/Npkb4niRx8bk0HrR4qH0E9xNNcts0mIwwvPZeSyfgh28y2b5lE1O7pr417xevjN
-						px1V63hOos/k1jZwLjGX7mf4uNqY2X27muoWxncx5bdljRrI+7KueS6vIaGvvy+O
-						ahQL5K+/ebdMh89ffv7SK9aDp/RPJu77ggTRXK0+fKkoy9JJYX/mh99r5cClGhGs
-						3nwOT+n5Ge0J+NSey+6Otg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.st-andrews.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.st-andrews.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://login.st-andrews.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.st-andrews.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.st-andrews.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.st-andrews.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">st-andrews.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFTDCCBDSgAwIBAgICEKgwDQYJKoZIhvcNAQEFBQAwgbsxCzAJBgNVBAYTAlVL
-						MQ0wCwYDVQQIEwRGaWZlMRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhV
-						bml2ZXJzaXR5IG9mIFN0IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMx
-						IzAhBgNVBAMTGk1hc3RlciBTaWduaW5nIENlcnRpZmljYXRlMSgwJgYJKoZIhvcN
-						AQkBFhloZWxwZGVza0BzdC1hbmRyZXdzLmFjLnVrMB4XDTE0MDUyODEwMjI0OVoX
-						DTM0MDUyMzEwMjI0OVowgYsxCzAJBgNVBAYTAkdCMQ0wCwYDVQQIEwRGaWZlMRMw
-						EQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFN0IEFu
-						ZHJld3MxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR8wHQYDVQQDExZsb2dpbi5zdC1h
-						bmRyZXdzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtrVW
-						AoC2c9E11GatKp3M8sFYhgsnPX1rdZ8bToP6y9uzQlKn7CSbzgY/MFTT1ol/dIpw
-						QFXqGBdNomQtaE3S2v81k30E2/nR294xEeT/PjP9GcPxYJjBq/ngoTzmBC6TJtsj
-						DWYWQEPUoMhgQ1Rqlhm2+rEJWY/AbdzZWjZiCS1P6W6uxw9/lPLLSAkSQSLGiavu
-						uyRmogqgH/HOzVFlF/DwKFZJDZ/bWGv1WHc6rii8nl8K9I1zZoM0sIPBnfrdWZzN
-						SAhX9zMSv1EXTJ0VFD3nrElU/Xx8WO4ZosnDwL7R+w6TZ1b+yOmc/A4ZsKQECxd/
-						LYcLPfbhgK2hhrApPQIDAQABo4IBhjCCAYIwCQYDVR0TBAIwADAsBglghkgBhvhC
-						AQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFIKd
-						mF6wLnFmysL7I3lf1Z5UI+KIMIHwBgNVHSMEgegwgeWAFEVZKa2Kkeq6fIItSmOm
-						9juqqJOToYHBpIG+MIG7MQswCQYDVQQGEwJVSzENMAsGA1UECBMERmlmZTETMBEG
-						A1UEBxMKU3QgQW5kcmV3czEhMB8GA1UEChMYVW5pdmVyc2l0eSBvZiBTdCBBbmRy
-						ZXdzMRYwFAYDVQQLEw1JLlQuIFNlcnZpY2VzMSMwIQYDVQQDExpNYXN0ZXIgU2ln
-						bmluZyBDZXJ0aWZpY2F0ZTEoMCYGCSqGSIb3DQEJARYZaGVscGRlc2tAc3QtYW5k
-						cmV3cy5hYy51a4IJALjpP8s3OebbMDUGCWCGSAGG+EIBBAQoFiZodHRwOi8vd3d3
-						LnN0LWFuZHJld3MuYWMudWsvY2EtY3JsLnBlbTANBgkqhkiG9w0BAQUFAAOCAQEA
-						j9HmQMvf9ZWP0RSRvxvPG9esUh/D3QpsVw4Q0NmH0iH3CO+KEAuskwRi4Oy0P7kG
-						gYIdgRp9upn2lqn70mNU6B040YG7gB8cCckNFcTguwBjgiwahzXuF8xbpHCbDQRh
-						/Npkb4niRx8bk0HrR4qH0E9xNNcts0mIwwvPZeSyfgh28y2b5lE1O7pr417xevjN
-						px1V63hOos/k1jZwLjGX7mf4uNqY2X27muoWxncx5bdljRrI+7KueS6vIaGvvy+O
-						ahQL5K+/ebdMh89ffv7SK9aDp/RPJu77ggTRXK0+fKkoy9JJYX/mh99r5cClGhGs
-						3nwOT+n5Ge0J+NSey+6Otg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.st-andrews.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.st-andrews.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 St Andrews</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of St Andrews</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.st-andrews.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Duncan</GivenName>
-    <SurName>Brannen</SurName>
-    <EmailAddress>mailto:dbb@st-andrews.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Duncan</GivenName>
-    <SurName>Brannen</SurName>
-    <EmailAddress>mailto:dbb@st-andrews.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 845db5aa..00000000
--- a/swamid-interfederations-2.0/idp.st-davids-coll.ac.uk-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://idp.st-davids-coll.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for St David's Catholic College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">st-davids-coll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlICCQCTJJAxaWzfAzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJH
-						QjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxIzAhBgNVBAoTGlN0
-						IERhdmlkcyBDYXRob2xpYyBDb2xsZWdlMSEwHwYDVQQDExhpZHAuc3QtZGF2aWRz
-						LWNvbGwuYWMudWswHhcNMTIwMzIzMTY0NzEwWhcNMzIwMzE4MTY0NzEwWjB3MQsw
-						CQYDVQQGEwJHQjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxIzAh
-						BgNVBAoTGlN0IERhdmlkcyBDYXRob2xpYyBDb2xsZWdlMSEwHwYDVQQDExhpZHAu
-						c3QtZGF2aWRzLWNvbGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQDhWg9tcwBj95jVLLEgOP8z6tGRNbmSExldo8+hA740TNTFkJPrNlYBgSCa
-						Du+eyeADmK9qSNDcTUEvU0WA9pVkywALqeW1+DVCPY7MhhD1duv1zcQIeqdQ9luY
-						V7pQq0cFLuN3vgzuh+MLWOcmz45jcSbIa4EGhgQn0nWKzMzi1HG4kDWAeGzpdG0q
-						e1UV3a/IqvwYR3+OLSJYHMcGXmhpi5AEadpJtE/w7fZymmIHaWsn7WrBxhXE7xXy
-						olIr7FEx9af1nR5fEXWnUdW/QSn8o9GNijLq8ZIpr1dh33QiFy+lB4OicTZdC8fj
-						Un8ySwdIscH7kQM63URZxSsB7YNjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACDS
-						MdkGKQhJ1E0Wmz7ZdUmJugpBoxKEGzr4GpvRc5TZVUf7BkzGNCC2NxvaILuxK26e
-						deR03Q8QOpw10Wk09PFH59EsZyKWR+RgWPNaeTYsCUnPptMgrcYEOjuf8yt95XLL
-						OAoOa6VzuvG5z2cFuiY5jgqCr1WtiQeJ5HW2YN8I/3aFuw+tV55C321lYby5RuUc
-						BVI9kTZqCOvCiF32WBLlyf0dD6NqFAYwe1/sXgF2MS7E+toNUqh+j7LEeDBZhraV
-						4Os8vJ7kUY0JJ2pGbN+1FwEU6e2hKEWwrX7Iet4mBkC9L2qnDRxsFzyNir1bAJLx
-						mxjEbDBSMeoSEI5WYOQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.st-davids-coll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.st-davids-coll.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.st-davids-coll.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.st-davids-coll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.st-davids-coll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.st-davids-coll.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">st-davids-coll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlICCQCTJJAxaWzfAzANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJH
-						QjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxIzAhBgNVBAoTGlN0
-						IERhdmlkcyBDYXRob2xpYyBDb2xsZWdlMSEwHwYDVQQDExhpZHAuc3QtZGF2aWRz
-						LWNvbGwuYWMudWswHhcNMTIwMzIzMTY0NzEwWhcNMzIwMzE4MTY0NzEwWjB3MQsw
-						CQYDVQQGEwJHQjEOMAwGA1UECBMFV2FsZXMxEDAOBgNVBAcTB0NhcmRpZmYxIzAh
-						BgNVBAoTGlN0IERhdmlkcyBDYXRob2xpYyBDb2xsZWdlMSEwHwYDVQQDExhpZHAu
-						c3QtZGF2aWRzLWNvbGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQDhWg9tcwBj95jVLLEgOP8z6tGRNbmSExldo8+hA740TNTFkJPrNlYBgSCa
-						Du+eyeADmK9qSNDcTUEvU0WA9pVkywALqeW1+DVCPY7MhhD1duv1zcQIeqdQ9luY
-						V7pQq0cFLuN3vgzuh+MLWOcmz45jcSbIa4EGhgQn0nWKzMzi1HG4kDWAeGzpdG0q
-						e1UV3a/IqvwYR3+OLSJYHMcGXmhpi5AEadpJtE/w7fZymmIHaWsn7WrBxhXE7xXy
-						olIr7FEx9af1nR5fEXWnUdW/QSn8o9GNijLq8ZIpr1dh33QiFy+lB4OicTZdC8fj
-						Un8ySwdIscH7kQM63URZxSsB7YNjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACDS
-						MdkGKQhJ1E0Wmz7ZdUmJugpBoxKEGzr4GpvRc5TZVUf7BkzGNCC2NxvaILuxK26e
-						deR03Q8QOpw10Wk09PFH59EsZyKWR+RgWPNaeTYsCUnPptMgrcYEOjuf8yt95XLL
-						OAoOa6VzuvG5z2cFuiY5jgqCr1WtiQeJ5HW2YN8I/3aFuw+tV55C321lYby5RuUc
-						BVI9kTZqCOvCiF32WBLlyf0dD6NqFAYwe1/sXgF2MS7E+toNUqh+j7LEeDBZhraV
-						4Os8vJ7kUY0JJ2pGbN+1FwEU6e2hKEWwrX7Iet4mBkC9L2qnDRxsFzyNir1bAJLx
-						mxjEbDBSMeoSEI5WYOQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.st-davids-coll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.st-davids-coll.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">St David's Catholic College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St David's Catholic College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.st-davids-coll.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Vinall</SurName>
-    <EmailAddress>mailto:jvinall@st-davids-coll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Vinall</SurName>
-    <EmailAddress>mailto:jvinall@st-davids-coll.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.staffordcoll.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.staffordcoll.ac.uk-shibboleth.xml
deleted file mode 100644
index 9c3897da..00000000
--- a/swamid-interfederations-2.0/idp.staffordcoll.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.staffordcoll.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Stafford College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-27T12:38: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">staffordcoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID3jCCAsYCCQDD9aF4VF27mzANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
-						R0IxFjAUBgNVBAgMDVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcMCFN0YWZmb3JkMRkw
-						FwYDVQQKDBBTdGFmZm9yZCBDb2xsZWdlMQwwCgYDVQQLDANJVFUxHzAdBgNVBAMM
-						FmlkcC5zdGFmZm9yZGNvbGwuYWMudWsxLDAqBgkqhkiG9w0BCQEWHXIubmljaG9s
-						bHNAc3RhZmZvcmRjb2xsLmFjLnVrMB4XDTE0MDQxNDE2MDQzM1oXDTI0MDQxMTE2
-						MDQzM1owgbAxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1TdGFmZm9yZHNoaXJlMREw
-						DwYDVQQHDAhTdGFmZm9yZDEZMBcGA1UECgwQU3RhZmZvcmQgQ29sbGVnZTEMMAoG
-						A1UECwwDSVRVMR8wHQYDVQQDDBZpZHAuc3RhZmZvcmRjb2xsLmFjLnVrMSwwKgYJ
-						KoZIhvcNAQkBFh1yLm5pY2hvbGxzQHN0YWZmb3JkY29sbC5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALACtr71g3kiPdLfVC9EDCkmWrwkFgpq
-						jY3tJSFR4+HFp1uSTI4selAUoa2JkDCXXV6Raqdl5rPb70NxpkpgUqnEJB2NfihV
-						rLaLiX03o95ZrO7KDVMbAvoa34arqipgZZPu7jxgNmlWpdM1FBmY7yRq2CvGHvRa
-						VikoFqmEojYFWGmmnqArYx4QibTuNjxwmfVU0BTOVS7Nos9K5l4USKDrBxIuE9Qm
-						8noW74ZtZzCCq2PSdZ/tj9K9EA6kEc+pI+UG7DcIFyEpmaDOXFDcOOKlAYT3MfL3
-						wSqg8/YPGPF9vkzk0lBv2M5YyLS9kZIaTzqkK6KLfMIR6QMYRCOrCIMCAwEAATAN
-						BgkqhkiG9w0BAQUFAAOCAQEACU0fU6QuYxlfW6hh6iekYfgMiVgS6oCORQR/L/to
-						FJpQk0I7TDG6Gktlc5aEpsqMYQOwC99Lb8fGFQAt1g6wRyzZA8DIXnG6dQO5cTGW
-						UJqX4GZUga3OsPIO+09Kso9SEmW4J3zRucsmUYFVZcJ34tCeeBt3bC1pIClbEtUZ
-						1M4nHnsucufmaoO4P3k/M1pOadX8XRmpeXKILebjJx/TqzORkDeS6FFZhllv13Qw
-						G/i+xOpFajMPA7nOiFBF5YXT2X5yAFGw6TSkNn1zP6vIXiPAj1nG5lpDzWp2yLvO
-						86nKIfSGai7d0vsFvkCSlcRe8G5bO4rC4ajsJXg5kd46xA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.staffordcoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.staffordcoll.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.staffordcoll.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.staffordcoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.staffordcoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.staffordcoll.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">staffordcoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID3jCCAsYCCQDD9aF4VF27mzANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
-						R0IxFjAUBgNVBAgMDVN0YWZmb3Jkc2hpcmUxETAPBgNVBAcMCFN0YWZmb3JkMRkw
-						FwYDVQQKDBBTdGFmZm9yZCBDb2xsZWdlMQwwCgYDVQQLDANJVFUxHzAdBgNVBAMM
-						FmlkcC5zdGFmZm9yZGNvbGwuYWMudWsxLDAqBgkqhkiG9w0BCQEWHXIubmljaG9s
-						bHNAc3RhZmZvcmRjb2xsLmFjLnVrMB4XDTE0MDQxNDE2MDQzM1oXDTI0MDQxMTE2
-						MDQzM1owgbAxCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1TdGFmZm9yZHNoaXJlMREw
-						DwYDVQQHDAhTdGFmZm9yZDEZMBcGA1UECgwQU3RhZmZvcmQgQ29sbGVnZTEMMAoG
-						A1UECwwDSVRVMR8wHQYDVQQDDBZpZHAuc3RhZmZvcmRjb2xsLmFjLnVrMSwwKgYJ
-						KoZIhvcNAQkBFh1yLm5pY2hvbGxzQHN0YWZmb3JkY29sbC5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALACtr71g3kiPdLfVC9EDCkmWrwkFgpq
-						jY3tJSFR4+HFp1uSTI4selAUoa2JkDCXXV6Raqdl5rPb70NxpkpgUqnEJB2NfihV
-						rLaLiX03o95ZrO7KDVMbAvoa34arqipgZZPu7jxgNmlWpdM1FBmY7yRq2CvGHvRa
-						VikoFqmEojYFWGmmnqArYx4QibTuNjxwmfVU0BTOVS7Nos9K5l4USKDrBxIuE9Qm
-						8noW74ZtZzCCq2PSdZ/tj9K9EA6kEc+pI+UG7DcIFyEpmaDOXFDcOOKlAYT3MfL3
-						wSqg8/YPGPF9vkzk0lBv2M5YyLS9kZIaTzqkK6KLfMIR6QMYRCOrCIMCAwEAATAN
-						BgkqhkiG9w0BAQUFAAOCAQEACU0fU6QuYxlfW6hh6iekYfgMiVgS6oCORQR/L/to
-						FJpQk0I7TDG6Gktlc5aEpsqMYQOwC99Lb8fGFQAt1g6wRyzZA8DIXnG6dQO5cTGW
-						UJqX4GZUga3OsPIO+09Kso9SEmW4J3zRucsmUYFVZcJ34tCeeBt3bC1pIClbEtUZ
-						1M4nHnsucufmaoO4P3k/M1pOadX8XRmpeXKILebjJx/TqzORkDeS6FFZhllv13Qw
-						G/i+xOpFajMPA7nOiFBF5YXT2X5yAFGw6TSkNn1zP6vIXiPAj1nG5lpDzWp2yLvO
-						86nKIfSGai7d0vsFvkCSlcRe8G5bO4rC4ajsJXg5kd46xA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.staffordcoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.staffordcoll.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">Stafford College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stafford College (Shibboleth)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.staffordcoll.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Robert</GivenName>
-    <SurName>Nicholls</SurName>
-    <EmailAddress>mailto:r.nicholls@staffordcoll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Dunning</SurName>
-    <EmailAddress>mailto:m.dunning@staffordcoll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Nicholls</SurName>
-    <EmailAddress>mailto:r.nicholls@staffordcoll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Dunning</SurName>
-    <EmailAddress>mailto:m.dunning@staffordcoll.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stanmore.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.stanmore.ac.uk-shibboleth.xml
deleted file mode 100644
index ba07f37d..00000000
--- a/swamid-interfederations-2.0/idp.stanmore.ac.uk-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.stanmore.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Stanmore College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">stanmore.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/stanmore.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/stanmore.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stanmore College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stanmore.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stbrn.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stbrn.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index ba790176..00000000
--- a/swamid-interfederations-2.0/idp.stbrn.ac.uk-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.stbrn.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for St Brendan's Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-13T10:51:30Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">stbrn.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="80" width="60">https://moodle.stbrn.ac.uk/shibicons/shibbolethlogo.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://moodle.stbrn.ac.uk/shibicons/shibbolethicon.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://moodle.stbrn.ac.uk/shibicons/shibbolethicontrans.gif</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">St Brendan's Sixth Form College</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUDq8zPYO8IuaH20QyJWXiNuoDZnEwDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPaWRwLnN0YnJuLmFjLnVrMB4XDTEzMDYxMjA5MDM1MFoX
-						DTMzMDYxMjA5MDM1MFowGjEYMBYGA1UEAxMPaWRwLnN0YnJuLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0hG758FNWggGZXQrGW5K46J6ZgRJ
-						4M/qJrJAgzkgLgzw8IYJtd3BIphYJEh2zTIYfvvn0fHMbsVGi6CwEg/SR+HrPAFy
-						gYoi0HuRCMLVyMMzTG6RkgJVKJUBynRfTA5RR+qxz4pW16GEYFZRiSslvDCcRYyl
-						+QHr7sYEF8ALdJARRjXX2gfBLK63HGcgFLLx9e6yrbG/tlsbpRe15fuQUGmDJv42
-						WQTf/ywp8bfjbrYdVZ/eMh6XxDz3TiY5PVlsR5E+PwNDTpCmkyqCx4F/+UbbNFmQ
-						geUfl2Bv5yUzfvxJr93EmgCtt7uSEGX7LnzsFjtEKoEYjPwdv88nhubqxQIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg9pZHAuc3Ricm4uYWMudWuGJmh0dHBzOi8vaWRwLnN0
-						YnJuLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTiWJQKJJ+0NSnfKVDm
-						tnhph6lIeTANBgkqhkiG9w0BAQUFAAOCAQEABPdfTtlHNNjckC+lOsdXSbgNNr3Y
-						vTS+WgPEmB9q2//RIymZTfkO6t7BumGB9XAilvcDbJ23ZJwlYHsnTUAVIchVwpE5
-						N8HzRagcBQDAApSmQqIg28dUiYmAyGyjgXWYt6OcFcrV+YWQ9dZp/1cg2nf7fnXI
-						SGMjH/+TJeXNjFpx6iOdsom/9xYwkS31kXm4httjWtNyf/WlNbhcodP4/eLmW0Wr
-						ONoVLg0LGIEx//rH3NTNu9HF5h6Uq5f2LpjC8w982y8b7oZfoz/kPGOTdQTS2QyU
-						aj2gY1UTsZ4o65PCDdoLrjSXFShP6dDCjo/d8lFyD87+KbWJtwiT0cORaQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stbrn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stbrn.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.stbrn.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stbrn.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stbrn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stbrn.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">stbrn.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUDq8zPYO8IuaH20QyJWXiNuoDZnEwDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPaWRwLnN0YnJuLmFjLnVrMB4XDTEzMDYxMjA5MDM1MFoX
-						DTMzMDYxMjA5MDM1MFowGjEYMBYGA1UEAxMPaWRwLnN0YnJuLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0hG758FNWggGZXQrGW5K46J6ZgRJ
-						4M/qJrJAgzkgLgzw8IYJtd3BIphYJEh2zTIYfvvn0fHMbsVGi6CwEg/SR+HrPAFy
-						gYoi0HuRCMLVyMMzTG6RkgJVKJUBynRfTA5RR+qxz4pW16GEYFZRiSslvDCcRYyl
-						+QHr7sYEF8ALdJARRjXX2gfBLK63HGcgFLLx9e6yrbG/tlsbpRe15fuQUGmDJv42
-						WQTf/ywp8bfjbrYdVZ/eMh6XxDz3TiY5PVlsR5E+PwNDTpCmkyqCx4F/+UbbNFmQ
-						geUfl2Bv5yUzfvxJr93EmgCtt7uSEGX7LnzsFjtEKoEYjPwdv88nhubqxQIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg9pZHAuc3Ricm4uYWMudWuGJmh0dHBzOi8vaWRwLnN0
-						YnJuLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTiWJQKJJ+0NSnfKVDm
-						tnhph6lIeTANBgkqhkiG9w0BAQUFAAOCAQEABPdfTtlHNNjckC+lOsdXSbgNNr3Y
-						vTS+WgPEmB9q2//RIymZTfkO6t7BumGB9XAilvcDbJ23ZJwlYHsnTUAVIchVwpE5
-						N8HzRagcBQDAApSmQqIg28dUiYmAyGyjgXWYt6OcFcrV+YWQ9dZp/1cg2nf7fnXI
-						SGMjH/+TJeXNjFpx6iOdsom/9xYwkS31kXm4httjWtNyf/WlNbhcodP4/eLmW0Wr
-						ONoVLg0LGIEx//rH3NTNu9HF5h6Uq5f2LpjC8w982y8b7oZfoz/kPGOTdQTS2QyU
-						aj2gY1UTsZ4o65PCDdoLrjSXFShP6dDCjo/d8lFyD87+KbWJtwiT0cORaQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stbrn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stbrn.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">St Brendan's Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St Brendan's Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stbrn.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matthew</GivenName>
-    <SurName>Wiles</SurName>
-    <EmailAddress>mailto:maw@stbrn.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonny</GivenName>
-    <SurName>Howse</SurName>
-    <EmailAddress>mailto:jonny@stbrn.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 486ee69e..00000000
--- a/swamid-interfederations-2.0/idp.stc.ac.uk-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://idp.stc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for South Tyneside College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-28T12:33: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">stc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEVDCCAzygAwIBAgIJALDkB+x72chfMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEWMBQGA1UEBwwNU291dGggU2hpZWxk
-						czEfMB0GA1UECgwWU291dGggVHluZXNpZGUgQ29sbGVnZTEVMBMGA1UECwwMSUNU
-						IFNlcnZpY2VzMRYwFAYDVQQDDA1pZHAuc3RjLmFjLnVrMSEwHwYJKoZIhvcNAQkB
-						FhJoZWxwZGVza0BzdGMuYWMudWswHhcNMTUwNzI5MDkxMzQ4WhcNMjUwNzI2MDkx
-						MzQ4WjCBqjELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xhbmQxFjAUBgNVBAcM
-						DVNvdXRoIFNoaWVsZHMxHzAdBgNVBAoMFlNvdXRoIFR5bmVzaWRlIENvbGxlZ2Ux
-						FTATBgNVBAsMDElDVCBTZXJ2aWNlczEWMBQGA1UEAwwNaWRwLnN0Yy5hYy51azEh
-						MB8GCSqGSIb3DQEJARYSaGVscGRlc2tAc3RjLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEApEZ0XWtW2m/iOq10H+uBFrLZTuAHM9KnTUMP0ox5
-						e+4WgZrg5u+k1yJewbnlqyibexk+wWNPrKzIO5NSdAGhl2uOIq3wDOvoxx972UXL
-						7dDSyFZeTYzsRaCrqjcBfr/d9MpoZyXqGL9wQ/gbetNvOvNNaD3L0U9r4bDBYox5
-						d1X1fNvuoDc/eHo8ZeRvJZ27gWKJ42zB9DlD9g1aDYmkUkwVjm0fBcLZMxB4pyqw
-						TptwzLgVzCG/haLzW9TD3QU33++CQKL9WUJzwUHJAC2OPQIupYWusrnu0lDHoFma
-						33uv9tHbm60fCkZkrh7oi4rWIyaE6vC50S2wX701gpsPLQIDAQABo3sweTAJBgNV
-						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
-						Y2F0ZTAdBgNVHQ4EFgQUpywsb6c9Gnj9ZkZ53piQHFyHgvQwHwYDVR0jBBgwFoAU
-						pywsb6c9Gnj9ZkZ53piQHFyHgvQwDQYJKoZIhvcNAQELBQADggEBADfNyBuwa/Gy
-						U95f4+Ko6FX2vFMAFVsXqk4Ab1vPIAf2D/dBwRqXUZo3V5ySOmMog1CB1GkeFWNq
-						xPXS1wFlQ65RGGk867oerHcHpRMWdwTYM0RQzA3Hx43iwVavVneLBNdKyYKR9Zzk
-						Hk4shGwqX2F1nntw7kdVdq1YqZ3bh3Vebq5qQIQkweRSkbERFO9aXGFN/kWutbcz
-						UhpUBEUi/UtOqkZuM+TRALVZ607weHpGyBGI7jwDcmWXVO9YmeDc8emteYxs8dAm
-						jDL05U1aL0Z0PSzm6d/gNgs7vlx4GHz1Nh5B6j+WRQkItxJ/5JN+jS8rfehMm6df
-						nO1NevMrfrw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stc.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.stc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stc.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">stc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEVDCCAzygAwIBAgIJALDkB+x72chfMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEWMBQGA1UEBwwNU291dGggU2hpZWxk
-						czEfMB0GA1UECgwWU291dGggVHluZXNpZGUgQ29sbGVnZTEVMBMGA1UECwwMSUNU
-						IFNlcnZpY2VzMRYwFAYDVQQDDA1pZHAuc3RjLmFjLnVrMSEwHwYJKoZIhvcNAQkB
-						FhJoZWxwZGVza0BzdGMuYWMudWswHhcNMTUwNzI5MDkxMzQ4WhcNMjUwNzI2MDkx
-						MzQ4WjCBqjELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xhbmQxFjAUBgNVBAcM
-						DVNvdXRoIFNoaWVsZHMxHzAdBgNVBAoMFlNvdXRoIFR5bmVzaWRlIENvbGxlZ2Ux
-						FTATBgNVBAsMDElDVCBTZXJ2aWNlczEWMBQGA1UEAwwNaWRwLnN0Yy5hYy51azEh
-						MB8GCSqGSIb3DQEJARYSaGVscGRlc2tAc3RjLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEApEZ0XWtW2m/iOq10H+uBFrLZTuAHM9KnTUMP0ox5
-						e+4WgZrg5u+k1yJewbnlqyibexk+wWNPrKzIO5NSdAGhl2uOIq3wDOvoxx972UXL
-						7dDSyFZeTYzsRaCrqjcBfr/d9MpoZyXqGL9wQ/gbetNvOvNNaD3L0U9r4bDBYox5
-						d1X1fNvuoDc/eHo8ZeRvJZ27gWKJ42zB9DlD9g1aDYmkUkwVjm0fBcLZMxB4pyqw
-						TptwzLgVzCG/haLzW9TD3QU33++CQKL9WUJzwUHJAC2OPQIupYWusrnu0lDHoFma
-						33uv9tHbm60fCkZkrh7oi4rWIyaE6vC50S2wX701gpsPLQIDAQABo3sweTAJBgNV
-						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
-						Y2F0ZTAdBgNVHQ4EFgQUpywsb6c9Gnj9ZkZ53piQHFyHgvQwHwYDVR0jBBgwFoAU
-						pywsb6c9Gnj9ZkZ53piQHFyHgvQwDQYJKoZIhvcNAQELBQADggEBADfNyBuwa/Gy
-						U95f4+Ko6FX2vFMAFVsXqk4Ab1vPIAf2D/dBwRqXUZo3V5ySOmMog1CB1GkeFWNq
-						xPXS1wFlQ65RGGk867oerHcHpRMWdwTYM0RQzA3Hx43iwVavVneLBNdKyYKR9Zzk
-						Hk4shGwqX2F1nntw7kdVdq1YqZ3bh3Vebq5qQIQkweRSkbERFO9aXGFN/kWutbcz
-						UhpUBEUi/UtOqkZuM+TRALVZ607weHpGyBGI7jwDcmWXVO9YmeDc8emteYxs8dAm
-						jDL05U1aL0Z0PSzm6d/gNgs7vlx4GHz1Nh5B6j+WRQkItxJ/5JN+jS8rfehMm6df
-						nO1NevMrfrw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stc.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">South Tyneside College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South Tyneside College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@stc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Scott</SurName>
-    <EmailAddress>mailto:craig.scott@stc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stcharles.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.stcharles.ac.uk-shibboleth.xml
deleted file mode 100644
index faf7ac75..00000000
--- a/swamid-interfederations-2.0/idp.stcharles.ac.uk-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.stcharles.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for St Charles Catholic Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">stcharles.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/stcharles.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/stcharles.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St Charles Catholic Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stcharles.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stephensoncoll.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.stephensoncoll.ac.uk-oala-metadata.xml
deleted file mode 100644
index 4fc67a53..00000000
--- a/swamid-interfederations-2.0/idp.stephensoncoll.ac.uk-oala-metadata.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.stephensoncoll.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens IdP for Stephenson College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-02T14:19:16Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">stephensoncoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUjCCAjqgAwIBAgIIfT3WdIwbJEkwDQYJKoZIhvcNAQEFBQAwQDEbMBkGA1UE
-						CgwSU3RlcGhlbnNvbiBDb2xsZWdlMSEwHwYDVQQDDBhpZHAuc3RlcGhlbnNvbmNv
-						bGwuYWMudWswHhcNMTMxMTA1MTcyMzMyWhcNMjMxMTA1MTcyMzMyWjBAMRswGQYD
-						VQQKDBJTdGVwaGVuc29uIENvbGxlZ2UxITAfBgNVBAMMGGlkcC5zdGVwaGVuc29u
-						Y29sbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIO4Ktpx
-						Xh8JZ+nQ7NjRa9l1aJgmixDwwEeQXfYU8TGDFIy6L96RmVSzyZ8OHYooPknpwFYU
-						OEgMBEy9NE4y5zhwmpEKIQpaRMMUw82nkv4jwzcyoCk0wbfuyv7UliX0+42xxsYm
-						STxBS5Td24F6piq4Sk7kD4uj2h/5GS8uskJ3tC7D67dNQrn0+xGtYZbT7h6bwqwO
-						6dKaYUzsvxJpzqrHD+eI3xQOrD+QvFOGidUFhFLfoboyAtt5JEmAeMqgXeIYcfgg
-						ZnpoT/kh0erowh9DEJyNYmHtiTaJGLRqnEzIAV6bkfIF9k9xe6CjlCKG3qWSkZ3n
-						xhtd3Y6wME1NcJUCAwEAAaNQME4wHQYDVR0OBBYEFObgAHIlxiAG3In5EQoUwdKV
-						txojMB8GA1UdIwQYMBaAFObgAHIlxiAG3In5EQoUwdKVtxojMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBADuhtxyErNqg72q0VFUOjLuzTQB9uvIR3KSJ
-						s3C53FojjVc09TT4uWwZb2fr8IZ/1WmgynPcR2rivRuVpOTs6uRkwDScLR8I7Rdd
-						7lrbO1jvQHAU0s9kTy0AP434DOv3jTiLe8doYnX+pKZgqVoQJ+Ey58Ew+DRdVY90
-						QNu1y4EsCQWEUFETwdAideLi1B6xq3xVbyX+UVe23Y2r4tdKnzeZpEgrrldHTy24
-						f0ULIm3qzXRm+c5J53XwQunZ8M8bdXu0kWoObJX95hqxbT5yRe8v3JQz7pogI6cj
-						PBmeqvbMw2skz8O3eiRr/9AI2YZBzaRMpZ4QwgfHF/Owg5NONWo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stephensoncoll.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stephensoncoll.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Stephenson College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stephenson College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stephensoncoll.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:itsupport@stephensoncoll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jason</GivenName>
-    <SurName>Spencer</SurName>
-    <EmailAddress>mailto:jspencer@stephensoncoll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Calcutt</SurName>
-    <EmailAddress>mailto:scalcutt@stephensoncoll.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b42eb795..00000000
--- a/swamid-interfederations-2.0/idp.sthelens.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sthelens.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for St Helens College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-23T09:19:50Z">
-      <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 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">sthelens.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUefeWPtobMsRj91ZcJr632XXNAJQwDQYJKoZIhvcNAQEL
-						BQAwHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVrMB4XDTE1MDcxMzA5MTc1
-						MloXDTM1MDcxMzA5MTc1MlowHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs6UhCjiogNIMFgyXluRJ
-						LKskxjAUDlx7sUCweHPsYPxlz64zGSM8S7nRAG1yQzW0JA+RTyg//BOIASoX0T51
-						XT7slINVEGGJPFZVrs8ovl8czb1BSZn+vEbL4UkOQIs3VAszc6sjufq9dVbFJs/Q
-						zoESK85IN3k/IsCMnkwEe/q2pSU/UFcLxB+q0Ltjx0Eo2DyLb8gktYya8ITt4U6i
-						QD1ZCBr9AFUBIrM1AgZwWEsWr5u69h391Jz6AsT7hyjkwoDsXVdEXx/kCJ7gMmT8
-						Y478h8teBSXHzjifPClzoRok7jaoqIykU7IooAl0Lgs+MlYeIJyGu+8a4Vj9Q3Ww
-						FQIDAQABo2swaTAdBgNVHQ4EFgQU3tu/fpLFu35DC6bbe+H742hS/rQwSAYDVR0R
-						BEEwP4ISaWRwLnN0aGVsZW5zLmFjLnVrhilodHRwczovL2lkcC5zdGhlbGVucy5h
-						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAfzGPK9GKQA75
-						cYh1YziFi6MZ1FhB7YGVpkKfKXQuvFnIZqHMXvrdYrWmIIARmolte2WCWGSCWh56
-						2QXQONMn0AUATCeCoEZJ0JdxGv6OkEzjztQJYAuXqX2h6rpc8TQtb+kRXR6dMI6Z
-						70cZXzTy6HEzg+ILvissEpqK3doTjFTaoYyTkF2gVsJL1uaQvSKfzJMzsmVbxc3l
-						SZF3c6J+ZVrldkCCLB33LtcpjeQ6wa7pwab7+B8Anp811A9ph7cZJf+CPh7nguem
-						Z6++KzCFtBpmip6fxXOxq+T9DCtObKuu/Zwj7ALaV2Anx3+1eV9xUXvPyKKowtio
-						xGWZquR2PA==
-					</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>
-						MIIDMzCCAhugAwIBAgIUSnhx1xX6LnWWTI0VWAtszPKeSlQwDQYJKoZIhvcNAQEL
-						BQAwHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVrMB4XDTE1MDcxMzA5MTc0
-						OVoXDTM1MDcxMzA5MTc0OVowHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVjoha+zFXc2AXRgz7AA
-						sm0b/jLeMcR0wIDjQJmYsa4sAtZHw++Kv5vnvFhsEMm5STxez54J66X9he0ahy/n
-						4HUun4xOziqD32zxbE4FuJxU36zlxvsL/UTRLtNbI6iRy/+8zYBEVRP4Vxk8Vh4o
-						gGMJ+05Z7GtKZ+qaG8UCs8kBgl+Z9VrmvnXrS9ne+SpY4o6k6cevG4/QzjWgDV8L
-						F4g2Hh8WBeLRYwe5l5XGMKW2wGDkuYV0Wx8dAwxEm8koWkaxHPfk2aFLaLu40e0K
-						c0IfWaiRnZ0YGdHLA3MkhUZf/fH2i1AZM4eXrXZEpN3lWC0Pptgc/MyLm6mV+/gm
-						iQIDAQABo2swaTAdBgNVHQ4EFgQUy6N7cUuaZkXCHZUw5uNI8XFCrVkwSAYDVR0R
-						BEEwP4ISaWRwLnN0aGVsZW5zLmFjLnVrhilodHRwczovL2lkcC5zdGhlbGVucy5h
-						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAmLvRi3/9nXFJ
-						rxiU7R4oZSEeCaWGAwmhvSkwJnXXcOnapmHA8NVwYxagpaAAUDkXclyVeWgXMEW7
-						7fuLAhhvEH4M3fpzvkQpju9sumcFha9x+lGe88EP9DEC6qmjgrs+bnM25/WLisy4
-						5GR1oUfqpoadlq3nhKZqwpDgI0xqGQPYvqIdeg4tBUC90zWMtbnB2RAebDq8G2jr
-						uyAVx30gTcaiBFmYnoijzUSR7erf4+EQrPh2Dv59Rm1MvuSMUwB/YSew/B4KTXBr
-						EKZxmfNDR/osPrE+Imy1pWidTkSoe23dKlk+nqKWedsYEr+HKMS5NSTUY9X4+ul1
-						XEMB4j98UA==
-					</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>
-						MIIDNDCCAhygAwIBAgIVANqZjdgjQDinPjHK15o/evwkJ47nMA0GCSqGSIb3DQEB
-						CwUAMB0xGzAZBgNVBAMMEmlkcC5zdGhlbGVucy5hYy51azAeFw0xNTA3MTMwOTE3
-						NTBaFw0zNTA3MTMwOTE3NTBaMB0xGzAZBgNVBAMMEmlkcC5zdGhlbGVucy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIY0GyGm5/AZrki7cc+i
-						qDdg48NDv/ofknRve/WD177ZyQMl5ROYQT/jxtidivl2LyQ4cUf4/eDr/VXq7ln2
-						cEssI+idPbdY8oySivcwNyx/+HbOOUM9y1Z4Y1qzUXPVIw0ekksXcRW+zWR2hltg
-						wWfuflEZPMNeuI3hcLUsS8QxqTtgYxyiIYzZJj4hPz8eS/D0NA4UEyWGf4YbknJv
-						n2UwchnNOY09vvzo2+nM4qIGTcGeqazwH4tHRdBYhBWCCIsT5jjuqESSUgnX/Wws
-						L5xoGMNJ30g+hjd2zZOs4uBPPCpPvd+YT3o5CZO4usj8gZYXg5RY13ooN6ri6VEi
-						SV8CAwEAAaNrMGkwHQYDVR0OBBYEFOgfhUabmVfWGgzFcIxIqNM4dYBdMEgGA1Ud
-						EQRBMD+CEmlkcC5zdGhlbGVucy5hYy51a4YpaHR0cHM6Ly9pZHAuc3RoZWxlbnMu
-						YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAE+zg+HRMTto
-						oT4fq9cU7M+3evZeVlIdY3YMFhB9ltXmN6qjbjSucL+sZBssmTorx2RK+wjEyRmM
-						mXiOCXb3KezzLUyLxTSIjzOtDkF6epvzq1ObsIKcpLf+wx6+yWA/RyjyIvbDcDcZ
-						upZ9JDCBvv0U9Ml1JBCfEyIjW/7ssIaVh2PzxQs0uIAuCKL4IdwDwVd/2+/j1rgH
-						4GESmz925rqMM5ZippAileHB6LMvDaX939Cx89mOpBy1GCE8Sf7RbQgdH46S3DID
-						gQv8K/szMt60cSeU+yWCjRT3tGsEOe+Upn041k4KHZUvg4pXtNe0ssienaJjd2bv
-						PIGItBCgWGc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sthelens.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sthelens.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.sthelens.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sthelens.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sthelens.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sthelens.ac.uk/idp/profile/SAML2/Redirect/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">sthelens.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUefeWPtobMsRj91ZcJr632XXNAJQwDQYJKoZIhvcNAQEL
-						BQAwHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVrMB4XDTE1MDcxMzA5MTc1
-						MloXDTM1MDcxMzA5MTc1MlowHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs6UhCjiogNIMFgyXluRJ
-						LKskxjAUDlx7sUCweHPsYPxlz64zGSM8S7nRAG1yQzW0JA+RTyg//BOIASoX0T51
-						XT7slINVEGGJPFZVrs8ovl8czb1BSZn+vEbL4UkOQIs3VAszc6sjufq9dVbFJs/Q
-						zoESK85IN3k/IsCMnkwEe/q2pSU/UFcLxB+q0Ltjx0Eo2DyLb8gktYya8ITt4U6i
-						QD1ZCBr9AFUBIrM1AgZwWEsWr5u69h391Jz6AsT7hyjkwoDsXVdEXx/kCJ7gMmT8
-						Y478h8teBSXHzjifPClzoRok7jaoqIykU7IooAl0Lgs+MlYeIJyGu+8a4Vj9Q3Ww
-						FQIDAQABo2swaTAdBgNVHQ4EFgQU3tu/fpLFu35DC6bbe+H742hS/rQwSAYDVR0R
-						BEEwP4ISaWRwLnN0aGVsZW5zLmFjLnVrhilodHRwczovL2lkcC5zdGhlbGVucy5h
-						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAfzGPK9GKQA75
-						cYh1YziFi6MZ1FhB7YGVpkKfKXQuvFnIZqHMXvrdYrWmIIARmolte2WCWGSCWh56
-						2QXQONMn0AUATCeCoEZJ0JdxGv6OkEzjztQJYAuXqX2h6rpc8TQtb+kRXR6dMI6Z
-						70cZXzTy6HEzg+ILvissEpqK3doTjFTaoYyTkF2gVsJL1uaQvSKfzJMzsmVbxc3l
-						SZF3c6J+ZVrldkCCLB33LtcpjeQ6wa7pwab7+B8Anp811A9ph7cZJf+CPh7nguem
-						Z6++KzCFtBpmip6fxXOxq+T9DCtObKuu/Zwj7ALaV2Anx3+1eV9xUXvPyKKowtio
-						xGWZquR2PA==
-					</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>
-						MIIDMzCCAhugAwIBAgIUSnhx1xX6LnWWTI0VWAtszPKeSlQwDQYJKoZIhvcNAQEL
-						BQAwHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVrMB4XDTE1MDcxMzA5MTc0
-						OVoXDTM1MDcxMzA5MTc0OVowHTEbMBkGA1UEAwwSaWRwLnN0aGVsZW5zLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVjoha+zFXc2AXRgz7AA
-						sm0b/jLeMcR0wIDjQJmYsa4sAtZHw++Kv5vnvFhsEMm5STxez54J66X9he0ahy/n
-						4HUun4xOziqD32zxbE4FuJxU36zlxvsL/UTRLtNbI6iRy/+8zYBEVRP4Vxk8Vh4o
-						gGMJ+05Z7GtKZ+qaG8UCs8kBgl+Z9VrmvnXrS9ne+SpY4o6k6cevG4/QzjWgDV8L
-						F4g2Hh8WBeLRYwe5l5XGMKW2wGDkuYV0Wx8dAwxEm8koWkaxHPfk2aFLaLu40e0K
-						c0IfWaiRnZ0YGdHLA3MkhUZf/fH2i1AZM4eXrXZEpN3lWC0Pptgc/MyLm6mV+/gm
-						iQIDAQABo2swaTAdBgNVHQ4EFgQUy6N7cUuaZkXCHZUw5uNI8XFCrVkwSAYDVR0R
-						BEEwP4ISaWRwLnN0aGVsZW5zLmFjLnVrhilodHRwczovL2lkcC5zdGhlbGVucy5h
-						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAmLvRi3/9nXFJ
-						rxiU7R4oZSEeCaWGAwmhvSkwJnXXcOnapmHA8NVwYxagpaAAUDkXclyVeWgXMEW7
-						7fuLAhhvEH4M3fpzvkQpju9sumcFha9x+lGe88EP9DEC6qmjgrs+bnM25/WLisy4
-						5GR1oUfqpoadlq3nhKZqwpDgI0xqGQPYvqIdeg4tBUC90zWMtbnB2RAebDq8G2jr
-						uyAVx30gTcaiBFmYnoijzUSR7erf4+EQrPh2Dv59Rm1MvuSMUwB/YSew/B4KTXBr
-						EKZxmfNDR/osPrE+Imy1pWidTkSoe23dKlk+nqKWedsYEr+HKMS5NSTUY9X4+ul1
-						XEMB4j98UA==
-					</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>
-						MIIDNDCCAhygAwIBAgIVANqZjdgjQDinPjHK15o/evwkJ47nMA0GCSqGSIb3DQEB
-						CwUAMB0xGzAZBgNVBAMMEmlkcC5zdGhlbGVucy5hYy51azAeFw0xNTA3MTMwOTE3
-						NTBaFw0zNTA3MTMwOTE3NTBaMB0xGzAZBgNVBAMMEmlkcC5zdGhlbGVucy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIY0GyGm5/AZrki7cc+i
-						qDdg48NDv/ofknRve/WD177ZyQMl5ROYQT/jxtidivl2LyQ4cUf4/eDr/VXq7ln2
-						cEssI+idPbdY8oySivcwNyx/+HbOOUM9y1Z4Y1qzUXPVIw0ekksXcRW+zWR2hltg
-						wWfuflEZPMNeuI3hcLUsS8QxqTtgYxyiIYzZJj4hPz8eS/D0NA4UEyWGf4YbknJv
-						n2UwchnNOY09vvzo2+nM4qIGTcGeqazwH4tHRdBYhBWCCIsT5jjuqESSUgnX/Wws
-						L5xoGMNJ30g+hjd2zZOs4uBPPCpPvd+YT3o5CZO4usj8gZYXg5RY13ooN6ri6VEi
-						SV8CAwEAAaNrMGkwHQYDVR0OBBYEFOgfhUabmVfWGgzFcIxIqNM4dYBdMEgGA1Ud
-						EQRBMD+CEmlkcC5zdGhlbGVucy5hYy51a4YpaHR0cHM6Ly9pZHAuc3RoZWxlbnMu
-						YWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAE+zg+HRMTto
-						oT4fq9cU7M+3evZeVlIdY3YMFhB9ltXmN6qjbjSucL+sZBssmTorx2RK+wjEyRmM
-						mXiOCXb3KezzLUyLxTSIjzOtDkF6epvzq1ObsIKcpLf+wx6+yWA/RyjyIvbDcDcZ
-						upZ9JDCBvv0U9Ml1JBCfEyIjW/7ssIaVh2PzxQs0uIAuCKL4IdwDwVd/2+/j1rgH
-						4GESmz925rqMM5ZippAileHB6LMvDaX939Cx89mOpBy1GCE8Sf7RbQgdH46S3DID
-						gQv8K/szMt60cSeU+yWCjRT3tGsEOe+Upn041k4KHZUvg4pXtNe0ssienaJjd2bv
-						PIGItBCgWGc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sthelens.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">St Helens College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St Helens College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sthelens.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Karl</GivenName>
-    <SurName>Brooker</SurName>
-    <EmailAddress>mailto:kbrooker@sthelens.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Karl</GivenName>
-    <SurName>Brooker</SurName>
-    <EmailAddress>mailto:kbrooker@sthelens.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stmarysblackburn.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stmarysblackburn.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 2da3ad9a..00000000
--- a/swamid-interfederations-2.0/idp.stmarysblackburn.ac.uk-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" entityID="https://idp.stmarysblackburn.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for St Mary's College, Blackburn.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-09T09:00:58Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">stmarysblackburn.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">St Mary's Blackburn College</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://moodle.stmarysblackburn.ac.uk/images/logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://moodle.stmarysblackburn.ac.uk/images/logo-icon.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDgDCCAmgCCQC1ZXdEMSkHoTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgMCkxhbmNhc2hpcmUxEjAQBgNVBAcMCUJsYWNrYnVybjEkMCIG
-						A1UECgwbU3QgTWFyeSdzIENvbGxlZ2UgQmxhY2tidXJuMSMwIQYDVQQDDBppZHAu
-						c3RtYXJ5c2JsYWNrYnVybi5hYy51azAeFw0xMzAzMjAxNDEyNDVaFw0zMzAzMTUx
-						NDEyNDVaMIGBMQswCQYDVQQGEwJHQjETMBEGA1UECAwKTGFuY2FzaGlyZTESMBAG
-						A1UEBwwJQmxhY2tidXJuMSQwIgYDVQQKDBtTdCBNYXJ5J3MgQ29sbGVnZSBCbGFj
-						a2J1cm4xIzAhBgNVBAMMGmlkcC5zdG1hcnlzYmxhY2tidXJuLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso24AO1L+cxS493DDBKKkNoyjm+I
-						1W022qP63HDSRvGa+QvKObXH9aj0jxwklj/wG4dr46Ok3cLciXZdBpzOUFlkBWkN
-						36T3WWkkNrpmWU4lB+t3MB3qU+VPzzBLOJ7pHEb4bOOG8ymxLayA9TaCFeR0XXFg
-						QqmCIdG/vPHAMxDZGbbDE5pUy2SupofDKDYdgNMfM1Z/REokXFVYHpIbzSf4jHKj
-						30Gl/Cjdt54Yy7HVhHNBIZDOxP6FPDoYt3hfzzUQKSwas0g6DIZY/IoZaakcZe0D
-						UXNqoqF4sPOH1lGI47lLYSsmuJCIp6cpfQzweH7vkQ0XgECTSTvc4HMPKwIDAQAB
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBBW2P4fTo8YMSzw4BJUjVmuEVYwz8r25BxvuX9
-						E43c436ZG2P3PlC3GrVFk7aF8saYheAG83CbY/zzD0qXHEHaVMTCOa26v6Ogs2Yo
-						dM1TAz4fPra46Tt00NqvOD/HemosWu/XfvHgdsNNhNmiFkHYljNLL1ZKUJliZykW
-						PY1+RYcg69jvR/QkbapO0QYSktgZLl81pZsnC1pfGewDtk3a8fQ8Iye1LBJhXGSo
-						qhcvXbr3A6zI+vTJxGGyGo4Lt8mD0aQBg43Oxv+lOlKo4uayr4spvv1ZqUfwkkYP
-						LKRxyHZph1dvVcdhDGXoTYr9SGxFP3969/Fei+O6fD6GP2xT
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stmarysblackburn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stmarysblackburn.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.stmarysblackburn.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stmarysblackburn.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stmarysblackburn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stmarysblackburn.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">stmarysblackburn.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDgDCCAmgCCQC1ZXdEMSkHoTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgMCkxhbmNhc2hpcmUxEjAQBgNVBAcMCUJsYWNrYnVybjEkMCIG
-						A1UECgwbU3QgTWFyeSdzIENvbGxlZ2UgQmxhY2tidXJuMSMwIQYDVQQDDBppZHAu
-						c3RtYXJ5c2JsYWNrYnVybi5hYy51azAeFw0xMzAzMjAxNDEyNDVaFw0zMzAzMTUx
-						NDEyNDVaMIGBMQswCQYDVQQGEwJHQjETMBEGA1UECAwKTGFuY2FzaGlyZTESMBAG
-						A1UEBwwJQmxhY2tidXJuMSQwIgYDVQQKDBtTdCBNYXJ5J3MgQ29sbGVnZSBCbGFj
-						a2J1cm4xIzAhBgNVBAMMGmlkcC5zdG1hcnlzYmxhY2tidXJuLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso24AO1L+cxS493DDBKKkNoyjm+I
-						1W022qP63HDSRvGa+QvKObXH9aj0jxwklj/wG4dr46Ok3cLciXZdBpzOUFlkBWkN
-						36T3WWkkNrpmWU4lB+t3MB3qU+VPzzBLOJ7pHEb4bOOG8ymxLayA9TaCFeR0XXFg
-						QqmCIdG/vPHAMxDZGbbDE5pUy2SupofDKDYdgNMfM1Z/REokXFVYHpIbzSf4jHKj
-						30Gl/Cjdt54Yy7HVhHNBIZDOxP6FPDoYt3hfzzUQKSwas0g6DIZY/IoZaakcZe0D
-						UXNqoqF4sPOH1lGI47lLYSsmuJCIp6cpfQzweH7vkQ0XgECTSTvc4HMPKwIDAQAB
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBBW2P4fTo8YMSzw4BJUjVmuEVYwz8r25BxvuX9
-						E43c436ZG2P3PlC3GrVFk7aF8saYheAG83CbY/zzD0qXHEHaVMTCOa26v6Ogs2Yo
-						dM1TAz4fPra46Tt00NqvOD/HemosWu/XfvHgdsNNhNmiFkHYljNLL1ZKUJliZykW
-						PY1+RYcg69jvR/QkbapO0QYSktgZLl81pZsnC1pfGewDtk3a8fQ8Iye1LBJhXGSo
-						qhcvXbr3A6zI+vTJxGGyGo4Lt8mD0aQBg43Oxv+lOlKo4uayr4spvv1ZqUfwkkYP
-						LKRxyHZph1dvVcdhDGXoTYr9SGxFP3969/Fei+O6fD6GP2xT
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stmarysblackburn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stmarysblackburn.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">St Mary's College, Blackburn</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St Mary's Blackburn College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stmarysblackburn.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Holmes</SurName>
-    <EmailAddress>mailto:p.holmes@stmarysblackburn.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Holmes</SurName>
-    <EmailAddress>mailto:p.holmes@stmarysblackburn.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stockton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.stockton.ac.uk-shibboleth.xml
deleted file mode 100644
index f60a17d0..00000000
--- a/swamid-interfederations-2.0/idp.stockton.ac.uk-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.stockton.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Stockton Riverside College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">stockton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/stockton.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/stockton.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockton Riverside College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stockton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 12f7a3c8..00000000
--- a/swamid-interfederations-2.0/idp.stokecoll.ac.uk-idp-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://idp.stokecoll.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Stoke-on-Trent College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">stokecoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAOCqTm8BSRjHD01zcVqQKEU41GmFMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMME2lkcC5zdG9rZWNvbGwuYWMudWswHhcNMTUxMTAyMTQz
-						MzQxWhcNMzUxMTAyMTQzMzQxWjAeMRwwGgYDVQQDDBNpZHAuc3Rva2Vjb2xsLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoDVAaU0SopZtZfOk
-						ezqhgxVvoNXc8/sHwoXudaFpMuqDks8JwmeUIdYmEJMTDVe5dblO4bAl0w5XeIOB
-						9mMpBeFBNuSICGQIzODFjl0iFua0tZ/Tj5rqhcnhixHze1imu6QR1msdqobnq9e5
-						m43/nGDrjTZ0XXt9LHo8AJKlgZwbzWC08UNTFoqezdKwo1LqD0hW8RP7V3FoZ7XU
-						y2bToftaFPlPiwYK0B91WidS1lLvo1ll21bMqqJOvkU78oCoachHt0U6colmje2t
-						81Coi5E/1mVEKCHFYWwlD029Dx2PCGzXaDvD1lpY/yrny4VkACZIEz9ZnJdWRdzW
-						BibIYQIDAQABo20wazAdBgNVHQ4EFgQUcIQ4XgCf+qz/ulow1O31zDs9Mv4wSgYD
-						VR0RBEMwQYITaWRwLnN0b2tlY29sbC5hYy51a4YqaHR0cHM6Ly9pZHAuc3Rva2Vj
-						b2xsLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQAyAEw9
-						ukmynMc4xXxu44hcVBF6qgNxC14XKLBbou9Tn64ll47OJh+uKyluSgLfR7Q1WD1J
-						o1A6GltLT2FJoCZMKUhKogJ2m+Lntc5WH0hkTwAfNRxzCEtXuNR1q0DjH90MIn7G
-						X40/IaxIoqB9ykjRkzK0HAIuO1+Fwx5xDorY6OsHPWQHevIFNN7LMLwkFaQDGecE
-						JXPWN2dGcIHx9en8OVPkDYdx99gt1+6n+s7ghk8qSlazZCCFYoJryMAApnPj3FbY
-						KJyA0eEShvBL36YxCvQD5YPmoDI7hlQ4Erj+Ge8AR1ImHFCHh8h4hif1E7dXG0rS
-						codng9Xuyk8xt0/m
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stokecoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stokecoll.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.stokecoll.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stokecoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stokecoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stokecoll.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">stokecoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAOCqTm8BSRjHD01zcVqQKEU41GmFMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMME2lkcC5zdG9rZWNvbGwuYWMudWswHhcNMTUxMTAyMTQz
-						MzQxWhcNMzUxMTAyMTQzMzQxWjAeMRwwGgYDVQQDDBNpZHAuc3Rva2Vjb2xsLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoDVAaU0SopZtZfOk
-						ezqhgxVvoNXc8/sHwoXudaFpMuqDks8JwmeUIdYmEJMTDVe5dblO4bAl0w5XeIOB
-						9mMpBeFBNuSICGQIzODFjl0iFua0tZ/Tj5rqhcnhixHze1imu6QR1msdqobnq9e5
-						m43/nGDrjTZ0XXt9LHo8AJKlgZwbzWC08UNTFoqezdKwo1LqD0hW8RP7V3FoZ7XU
-						y2bToftaFPlPiwYK0B91WidS1lLvo1ll21bMqqJOvkU78oCoachHt0U6colmje2t
-						81Coi5E/1mVEKCHFYWwlD029Dx2PCGzXaDvD1lpY/yrny4VkACZIEz9ZnJdWRdzW
-						BibIYQIDAQABo20wazAdBgNVHQ4EFgQUcIQ4XgCf+qz/ulow1O31zDs9Mv4wSgYD
-						VR0RBEMwQYITaWRwLnN0b2tlY29sbC5hYy51a4YqaHR0cHM6Ly9pZHAuc3Rva2Vj
-						b2xsLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQAyAEw9
-						ukmynMc4xXxu44hcVBF6qgNxC14XKLBbou9Tn64ll47OJh+uKyluSgLfR7Q1WD1J
-						o1A6GltLT2FJoCZMKUhKogJ2m+Lntc5WH0hkTwAfNRxzCEtXuNR1q0DjH90MIn7G
-						X40/IaxIoqB9ykjRkzK0HAIuO1+Fwx5xDorY6OsHPWQHevIFNN7LMLwkFaQDGecE
-						JXPWN2dGcIHx9en8OVPkDYdx99gt1+6n+s7ghk8qSlazZCCFYoJryMAApnPj3FbY
-						KJyA0eEShvBL36YxCvQD5YPmoDI7hlQ4Erj+Ge8AR1ImHFCHh8h4hif1E7dXG0rS
-						codng9Xuyk8xt0/m
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stokecoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stokecoll.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">Stoke-on-Trent College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stoke-on-Trent College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stokecoll.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@stokecoll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Guy</GivenName>
-    <SurName>Hodson</SurName>
-    <EmailAddress>mailto:guy.hodson@stokecoll.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stokesfc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stokesfc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 8bc940fd..00000000
--- a/swamid-interfederations-2.0/idp.stokesfc.ac.uk-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.stokesfc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for City of Stoke-on-Trent Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">stokesfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEHDCCAwQCCQCpm5jjooFexjANBgkqhkiG9w0BAQUFADCBzzELMAkGA1UEBhMC
-						R0IxFjAUBgNVBAgTDVN0YWZmb3Jkc2hpcmUxFzAVBgNVBAcTDlN0b2tlLW9uLVRy
-						ZW50MTIwMAYDVQQKEylDaXR5IG9mIFN0b2tlLW9uLVRyZW50IFNpeHRoIEZvcm0g
-						Q29sbGVnZTEUMBIGA1UECxMLSVQgU2VydmljZXMxGzAZBgNVBAMTEmlkcC5zdG9r
-						ZXNmYy5hYy51azEoMCYGCSqGSIb3DQEJARYZaXRzZXJ2aWNlc0BzdG9rZXNmYy5h
-						Yy51azAeFw0xMzA4MDYwODU0MjZaFw0yMzA4MDQwODU0MjZaMIHPMQswCQYDVQQG
-						EwJHQjEWMBQGA1UECBMNU3RhZmZvcmRzaGlyZTEXMBUGA1UEBxMOU3Rva2Utb24t
-						VHJlbnQxMjAwBgNVBAoTKUNpdHkgb2YgU3Rva2Utb24tVHJlbnQgU2l4dGggRm9y
-						bSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEbMBkGA1UEAxMSaWRwLnN0
-						b2tlc2ZjLmFjLnVrMSgwJgYJKoZIhvcNAQkBFhlpdHNlcnZpY2VzQHN0b2tlc2Zj
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlMxh8mLoF9Y8
-						6Ar6UWgf/kxtn3/mnVldeGWXcEm6RhYz7gjJIiISV/+/Dv73Ru1PUpFxpxsmr5XT
-						W6sRm6XV75NEW434wWTMhJI0nOMHhu1+GBR8IR8B26J92ogB0CQHohoXJmDcDH6J
-						i2aVeupW6DF1v2m9xneNMDdri5y5uSGbWUfgJbQzcjk3/SYQbgltCywvEIyaJkK1
-						xCpCwV+PQp52BNXhYKrEzL95zHmqhYxfLbS4aUF+vVpnooA4JXxMH8M0LvUBtzEb
-						S6n/zUciZ/cqBdnKV4N/eyDcH7k+Y7dXZlglo6lQGW53A/s29T76iRORHrAlHG81
-						AvtLXrGiLwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB/D2Mtb31QkqnYfJS3xFaQ
-						FkcRJrYfMtx7pe5633OV/IUcc2iAZLIc9GJ4Si+dg+sFOakZmqVaMEvS9GJS3p2s
-						rlrxqw03jqJq7OnkUd4C3rUJpR09UVLfwRkHl6Kv4gG+MxWnYRKd+ajeQIhEDHNs
-						H9f1fFPRqcEHKIL/PLIva+VmF7hdewX5G5/k2+wdOe2S8ekOqhxH6yBFf4G2R65L
-						A0AaAacEjqmWd/WUYVMUZE9hdM5VNzB2CftZSLGfrtxTlMmxDSdluqScwcqgIEnH
-						oByp0h8HreFUu0YUaExOhUEQPmCEQpRuWK9GtOeARWbC1mSOaIGMMrPYKiN7XKYa
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stokesfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stokesfc.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.stokesfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stokesfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stokesfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stokesfc.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">stokesfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEHDCCAwQCCQCpm5jjooFexjANBgkqhkiG9w0BAQUFADCBzzELMAkGA1UEBhMC
-						R0IxFjAUBgNVBAgTDVN0YWZmb3Jkc2hpcmUxFzAVBgNVBAcTDlN0b2tlLW9uLVRy
-						ZW50MTIwMAYDVQQKEylDaXR5IG9mIFN0b2tlLW9uLVRyZW50IFNpeHRoIEZvcm0g
-						Q29sbGVnZTEUMBIGA1UECxMLSVQgU2VydmljZXMxGzAZBgNVBAMTEmlkcC5zdG9r
-						ZXNmYy5hYy51azEoMCYGCSqGSIb3DQEJARYZaXRzZXJ2aWNlc0BzdG9rZXNmYy5h
-						Yy51azAeFw0xMzA4MDYwODU0MjZaFw0yMzA4MDQwODU0MjZaMIHPMQswCQYDVQQG
-						EwJHQjEWMBQGA1UECBMNU3RhZmZvcmRzaGlyZTEXMBUGA1UEBxMOU3Rva2Utb24t
-						VHJlbnQxMjAwBgNVBAoTKUNpdHkgb2YgU3Rva2Utb24tVHJlbnQgU2l4dGggRm9y
-						bSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEbMBkGA1UEAxMSaWRwLnN0
-						b2tlc2ZjLmFjLnVrMSgwJgYJKoZIhvcNAQkBFhlpdHNlcnZpY2VzQHN0b2tlc2Zj
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlMxh8mLoF9Y8
-						6Ar6UWgf/kxtn3/mnVldeGWXcEm6RhYz7gjJIiISV/+/Dv73Ru1PUpFxpxsmr5XT
-						W6sRm6XV75NEW434wWTMhJI0nOMHhu1+GBR8IR8B26J92ogB0CQHohoXJmDcDH6J
-						i2aVeupW6DF1v2m9xneNMDdri5y5uSGbWUfgJbQzcjk3/SYQbgltCywvEIyaJkK1
-						xCpCwV+PQp52BNXhYKrEzL95zHmqhYxfLbS4aUF+vVpnooA4JXxMH8M0LvUBtzEb
-						S6n/zUciZ/cqBdnKV4N/eyDcH7k+Y7dXZlglo6lQGW53A/s29T76iRORHrAlHG81
-						AvtLXrGiLwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB/D2Mtb31QkqnYfJS3xFaQ
-						FkcRJrYfMtx7pe5633OV/IUcc2iAZLIc9GJ4Si+dg+sFOakZmqVaMEvS9GJS3p2s
-						rlrxqw03jqJq7OnkUd4C3rUJpR09UVLfwRkHl6Kv4gG+MxWnYRKd+ajeQIhEDHNs
-						H9f1fFPRqcEHKIL/PLIva+VmF7hdewX5G5/k2+wdOe2S8ekOqhxH6yBFf4G2R65L
-						A0AaAacEjqmWd/WUYVMUZE9hdM5VNzB2CftZSLGfrtxTlMmxDSdluqScwcqgIEnH
-						oByp0h8HreFUu0YUaExOhUEQPmCEQpRuWK9GtOeARWbC1mSOaIGMMrPYKiN7XKYa
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stokesfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stokesfc.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">City of Stoke-on-Trent Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stoke Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stokesfc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lee</GivenName>
-    <SurName>Thacker</SurName>
-    <EmailAddress>mailto:Lee.Thacker@stokesfc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Will</GivenName>
-    <SurName>Mason</SurName>
-    <EmailAddress>mailto:will.mason@stokesfc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stourbridge.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stourbridge.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 5c8ea937..00000000
--- a/swamid-interfederations-2.0/idp.stourbridge.ac.uk-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" entityID="https://idp.stourbridge.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Stourbridge College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-01-10T15:29: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">stourbridge.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Stourbridge College</mdui:DisplayName>
-        <mdui:Logo height="36" width="114">https://idp.stourbridge.ac.uk/sc-logo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEuzCCA6OgAwIBAgIRAJM3bbt+OVuVVDiHzCVYDr8wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMjAxMDkwMDAwMDBaFw0xNTAxMDgyMzU5NTlaMIGPMQswCQYD
-						VQQGEwJHQjEWMBQGA1UECBMNV2VzdCBNaWRsYW5kczEUMBIGA1UEBxMLU3RvdXJi
-						cmlkZ2UxHDAaBgNVBAoTE1N0b3VyYnJpZGdlIENvbGxlZ2UxFDASBgNVBAsTC0lU
-						IFNlcnZpY2VzMR4wHAYDVQQDExVpZHAuc3RvdXJicmlkZ2UuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDwKog/r/r0zrlFPGe5cVQxkJp0fsHV
-						0j1YfoQj/RsI29T9Cb66tz/iTUC/2digSpi+udzSNQuDD7vmGOmwTyFpvC9ROeYm
-						oryi9kY4ZQi9R3/0yajs0b9W6tIIKpmdiHUTft6aj6f4cWPykybt7jL2zMW0B8Vc
-						+q8ATF4XA3SWl0vLE9qd/R+UULaVThFW4UMPjNhnR8oi0LdjnIcvvoaJSEurxC7t
-						UKFZybfde7pyLxzolXmbiqZKbbLI7bFI4q7GIGHBGinSyNyQAJUs3yQkiwX0xWS6
-						HwDruqJ3KX+Hj310y29KCpp/HtWzb5AJ8m1/pFXED3s5qItf5DcHI2jZAgMBAAGj
-						ggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-						FgQUFnIQa/OS7s2P4xXSjuoKNlickZUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-						/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-						DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-						AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-						dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0R
-						BBkwF4IVaWRwLnN0b3VyYnJpZGdlLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB2
-						rk4ke+j5hauBaX86S0JU4wFbjjX+Q84OqWxFkHCF4TucpT3y5oA2gyKgZ3jKmCr3
-						u5eWmRDeGPD1Bjdchb3EDe7pEZuJn7caxYkZyuClNHb4fZKCqJsM2hLeeFZh/lig
-						+uoOphs+6d5GBBUGLzQSo2ekgmsXnfJG1KQ0bN+a0qFtdkomB+w4ZubJLcRI698o
-						BWpjcuFMGrDskjx8n1WDyQ5mUNp7nYzpEHFodQXo4d9XziyMdyp8vTqfiwImZ+gg
-						BhOxxXd7otU19GIBeyuODYEorcvrmJ3tWAnZC1ZSFmblkg8M4ZcmmeRJsD1Ni7iz
-						Gm5ypqt+ahzVPgRU51on
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stourbridge.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stourbridge.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.stourbridge.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stourbridge.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stourbridge.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stourbridge.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">stourbridge.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEuzCCA6OgAwIBAgIRAJM3bbt+OVuVVDiHzCVYDr8wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMjAxMDkwMDAwMDBaFw0xNTAxMDgyMzU5NTlaMIGPMQswCQYD
-						VQQGEwJHQjEWMBQGA1UECBMNV2VzdCBNaWRsYW5kczEUMBIGA1UEBxMLU3RvdXJi
-						cmlkZ2UxHDAaBgNVBAoTE1N0b3VyYnJpZGdlIENvbGxlZ2UxFDASBgNVBAsTC0lU
-						IFNlcnZpY2VzMR4wHAYDVQQDExVpZHAuc3RvdXJicmlkZ2UuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDwKog/r/r0zrlFPGe5cVQxkJp0fsHV
-						0j1YfoQj/RsI29T9Cb66tz/iTUC/2digSpi+udzSNQuDD7vmGOmwTyFpvC9ROeYm
-						oryi9kY4ZQi9R3/0yajs0b9W6tIIKpmdiHUTft6aj6f4cWPykybt7jL2zMW0B8Vc
-						+q8ATF4XA3SWl0vLE9qd/R+UULaVThFW4UMPjNhnR8oi0LdjnIcvvoaJSEurxC7t
-						UKFZybfde7pyLxzolXmbiqZKbbLI7bFI4q7GIGHBGinSyNyQAJUs3yQkiwX0xWS6
-						HwDruqJ3KX+Hj310y29KCpp/HtWzb5AJ8m1/pFXED3s5qItf5DcHI2jZAgMBAAGj
-						ggFoMIIBZDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-						FgQUFnIQa/OS7s2P4xXSjuoKNlickZUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-						/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-						DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-						AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-						dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIAYDVR0R
-						BBkwF4IVaWRwLnN0b3VyYnJpZGdlLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB2
-						rk4ke+j5hauBaX86S0JU4wFbjjX+Q84OqWxFkHCF4TucpT3y5oA2gyKgZ3jKmCr3
-						u5eWmRDeGPD1Bjdchb3EDe7pEZuJn7caxYkZyuClNHb4fZKCqJsM2hLeeFZh/lig
-						+uoOphs+6d5GBBUGLzQSo2ekgmsXnfJG1KQ0bN+a0qFtdkomB+w4ZubJLcRI698o
-						BWpjcuFMGrDskjx8n1WDyQ5mUNp7nYzpEHFodQXo4d9XziyMdyp8vTqfiwImZ+gg
-						BhOxxXd7otU19GIBeyuODYEorcvrmJ3tWAnZC1ZSFmblkg8M4ZcmmeRJsD1Ni7iz
-						Gm5ypqt+ahzVPgRU51on
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stourbridge.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stourbridge.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">Stourbridge College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stourbridge College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stourbridge.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Graham</GivenName>
-    <SurName>Cropley</SurName>
-    <EmailAddress>mailto:graham@expresscommerce.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Graham</GivenName>
-    <SurName>Cropley</SurName>
-    <EmailAddress>mailto:graham@expresscommerce.co.uk</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 38b4d36c..00000000
--- a/swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-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://idp.strasbourg.archi.fr/idp/shibboleth">
-  <md: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>
-  </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">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:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAHQSAAB0EgAAAAAAAAAAAAD///8A////AKmf7gCEd+cAo5rtAI6B6Rt+ceZLkYXpAX5x5gC8tfIAnZLrAIR35wD///8A////AP///wD///8A////AP///wC3r/EAkofqAIJ05zNBLdrlRzPcynNl5QBwYeQA08/2AJiN6gCEd+cA////AP///wD///8A////AP///wD///8AnpPsJ0Yy28MmD9X/DwDR/0g03LlqWeIAs6vwAP///wCQhOkAgnXmAP///wD///8A////AP///wD///8A////AFRD3pcRANL/KxTW/yQN1f9LONy5cmPkAMO88wDW0/Ygh3rnLJGG6QD///8A////AP///wD///8A////AP///wBZSN+UIgrV/y8Z1/8jC9X/SzjcuXhp5QCpoe4AqaHuNj8q2u1/cuYw////AP///wD///8A////AP///wD///8AW0rgkyIK1P8vGdf/IwvV/0s43Ll2Z+UAr6fvAL+58iAjDNX/QCzaqf///wD///8A////AP///wD///8A////AFtK4JMiCtT/LxnX/yML1f9MOd25dGXkAK6l7wC+uPIgLhjX/z4p2a3///8A////AP///wD///8A////AP///wBbSuCTIgrU/y8Z1/8jDNX/Szfct3Rk5AC2r/AAwLryIC0X1/9CLdqq////AP///wD///8A////AP///wD///8AW0rgkyIK1P8vGdf/HQbU/0473b3EvfMAysT0ALmx8R8uGNf/QS3aqv///wD///8A////AP///wD///8A////AFtK4JMiCtT/LxnX/ysU1v8wGtf/ZFThwoF05iyime0TOiXZ/0Es2qv///8A////AP///wD///8A////AP///wBbSuCTIgrU/y8Z1/8xG9f/LBXW/xYB0v8gC9T/Qi3a3C8Z1/9JNtyf////AP///wD///8A////AP///wD///8AW0rgkyIK1P8vGdf/LxnX/y8Z1/8wGtf/LRbX/yIK1P8jC9X/TjvcnP///wD///8A////AP///wD///8A////AFtK4JMiCtT/LxnX/y8Z1/8vGdf/LxnX/y8Z1/8vGdf/Jg/V/0w53Jz///8A////AP///wD///8A////AP///wBbSuCTIgrU/y8Z1/8vGdf/LxnX/y8Z1/8vGdf/LxnX/yYP1f9MOdyc////AP///wD///8A////AP///wD///8AUT/emiUO1f8vGdf/LxnX/y8Z1/8vGdf/LxnX/y8Z1/8mD9X/TDnco////wD///8A////AP///wD///8A////AG5f41ocBNO9LxnXoi8Z16IvGdeiLxnXoi8Z16IvGdeiJg/VvUw53GD///8A////AP///wD///8A+P8AAPH/AADB/wAAwZ8AAMGPAADBjwAAwY8AAMGPAADBjwAAwA8AAMAPAADADwAAwA8AAMAPAADADwAAwA8AAA==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.strasbourg.archi.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDRzCCAi+gAwIBAgIUXRRxYrjEVT64C9zybFH9tlnZ/5wwDQYJKoZIhvcNAQEF
-BQAwIjEgMB4GA1UEAxMXaWRwLnN0cmFzYm91cmcuYXJjaGkuZnIwHhcNMTQwNDE3
-MDk1OTQ1WhcNMzQwNDE3MDk1OTQ1WjAiMSAwHgYDVQQDExdpZHAuc3RyYXNib3Vy
-Zy5hcmNoaS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI3xKVOB
-+X93VcOG42g8BWvY1oGgIYKmz8YwXVN3I2+mr2u4ahYEU95LpHVKKlAU1uDhcH8I
-99sRaSzY+Z2kz3SLcAut6dMHPeB1Rc4Jcp4CTkZYmhiVzVIyg+R7OqkbHCJIbj5H
-q6nho7r2Mx2iyTUg1z9R3dWFwFJN2nP31dJiSkW1nuz7Jv6P1zH642aV/IkaCgF0
-FlAnrZsdn3gWkw2uOaf6TDEddVxg1u9UwCJDS3IIP7uOAE0UErosp4cDXVCqtOjh
-YacOoGbH3qzu9DPpqgaPflbyoLcbQ4ngyUL/Uvh7UEEYIEVtnnXUNjrvw71kfHI7
-T0OaVGiNQtFSrD0CAwEAAaN1MHMwUgYDVR0RBEswSYIXaWRwLnN0cmFzYm91cmcu
-YXJjaGkuZnKGLmh0dHBzOi8vaWRwLnN0cmFzYm91cmcuYXJjaGkuZnIvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFNdbgXFZ9tQW5IBHY2TKpAJpxYXPMA0GCSqGSIb3
-DQEBBQUAA4IBAQAyI1QQ9zGC5oABzuuM7OkyjjABsIN2JktmH9KpeykkLWRvNEAY
-Nco1T5fGqAEmvA46F0KmbwO/B7wZB9TILJtXXE/CK9FU2Ti19+3GDdFrPY1JeIR9
-GleK7iSCQTb+vRmb+2rPr4LKczGICnEoGjAQF0ixMBpOnFX5Wzr+gMerm+DETZup
-biEhRmJIckZgK3axgHcpzrrv6TJME0JsZNbh9nNjWu5ahjhxzGXzw7W1MzSWzaqk
-5YjDMooSN+djy/xITu54R3DfPFnXp7nGCqEq7mIO6kQQHVUK//ViMGcJ0hQSh54v
-rtnbjNGSrgbwkVabvcN+Gtc2+uEO8c/ozrhm
-					    </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>
-					      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>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.strasbourg.archi.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.strasbourg.archi.fr/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Nationale Supérieure d'Architecture de Strasbourg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure d'Architecture de Strasbourg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.strasbourg.archi.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>informatique@strasbourg.archi.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.stratford.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.stratford.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 37cd0c0e..00000000
--- a/swamid-interfederations-2.0/idp.stratford.ac.uk-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://idp.stratford.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Stratford-upon-Avon College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-08T17:41: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">stratford.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUHUDFCEinVS2/oqpWRjzbVISrlKIwDQYJKoZIhvcNAQEF
-						BQAwHjEcMBoGA1UEAwwTaWRwLnN0cmF0Zm9yZC5hYy51azAeFw0xNDA4MTkxNDM2
-						MzFaFw0zNDA4MTkxNDM2MzFaMB4xHDAaBgNVBAMME2lkcC5zdHJhdGZvcmQuYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv6gdMgmB2bhP5Tqbp
-						3XC7EkL7NXTsg+bMwg8G7GjNfNsVPv7MO773+zRXrvUYdBvPSQLOcKw9JvpYvrAh
-						zOuZLME8rxoTD6ejNRC9IFsOI02eQ87qJ1jCOqFjPjn9N7V1QDKjRfx/6F1XNuZ8
-						v8L0hwc4/6moj4mIr7RhxgUt4fj/KHZbaxnGw1ix3GTUpa1UNZvF5HsbXVknogyQ
-						SFeWYPEMhUaSmUcD5KLCuovvXU1s5JB79V4+BRJIsxRt+tD6BcM6cQnLux+N3rXQ
-						Rx4IFUKRWv3KRzXEo6s8LapGk8Pr4/lTgFSjd+oIzOpqZSHgNmnhHvAKl/HG+jsD
-						v/KPAgMBAAGjbTBrMB0GA1UdDgQWBBSTmgz2ydW2bFqPFjRPfX/MeU0kcDBKBgNV
-						HREEQzBBghNpZHAuc3RyYXRmb3JkLmFjLnVrhipodHRwczovL2lkcC5zdHJhdGZv
-						cmQuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBABDOMGaU
-						4H1UYggkzWnhqlIk1gd/wWWS86W6uzPKmaXfhym7bAZf8Y6aL6n0XrM3zp+zclCR
-						M9qG8+Kzg7InCs8WEH3xlCsIi1HAjjfCUN29RsJ9yCnRpV5h2b0pIYEUT02Kw8N2
-						kH/FMfEgOmKsUmKmYamCu5lBHU2inYFEJXkiisCoLQjXnws3wpCJLfKMN567rJlu
-						OjJYfYtmKTXwc/VqRkUFGQWu5GP9hgGPC0wcWHr6Vspqa8eMZDF4CY5EAD9kTWB7
-						FWoWYXavsqXe6P6DUNnqnBUhicJtx+YalauPcXILOZEuGU7fY0qk1fDwRQemMEDJ
-						TOavKjmM2o9UJkU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stratford.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stratford.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.stratford.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stratford.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stratford.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stratford.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">stratford.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUHUDFCEinVS2/oqpWRjzbVISrlKIwDQYJKoZIhvcNAQEF
-						BQAwHjEcMBoGA1UEAwwTaWRwLnN0cmF0Zm9yZC5hYy51azAeFw0xNDA4MTkxNDM2
-						MzFaFw0zNDA4MTkxNDM2MzFaMB4xHDAaBgNVBAMME2lkcC5zdHJhdGZvcmQuYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv6gdMgmB2bhP5Tqbp
-						3XC7EkL7NXTsg+bMwg8G7GjNfNsVPv7MO773+zRXrvUYdBvPSQLOcKw9JvpYvrAh
-						zOuZLME8rxoTD6ejNRC9IFsOI02eQ87qJ1jCOqFjPjn9N7V1QDKjRfx/6F1XNuZ8
-						v8L0hwc4/6moj4mIr7RhxgUt4fj/KHZbaxnGw1ix3GTUpa1UNZvF5HsbXVknogyQ
-						SFeWYPEMhUaSmUcD5KLCuovvXU1s5JB79V4+BRJIsxRt+tD6BcM6cQnLux+N3rXQ
-						Rx4IFUKRWv3KRzXEo6s8LapGk8Pr4/lTgFSjd+oIzOpqZSHgNmnhHvAKl/HG+jsD
-						v/KPAgMBAAGjbTBrMB0GA1UdDgQWBBSTmgz2ydW2bFqPFjRPfX/MeU0kcDBKBgNV
-						HREEQzBBghNpZHAuc3RyYXRmb3JkLmFjLnVrhipodHRwczovL2lkcC5zdHJhdGZv
-						cmQuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBABDOMGaU
-						4H1UYggkzWnhqlIk1gd/wWWS86W6uzPKmaXfhym7bAZf8Y6aL6n0XrM3zp+zclCR
-						M9qG8+Kzg7InCs8WEH3xlCsIi1HAjjfCUN29RsJ9yCnRpV5h2b0pIYEUT02Kw8N2
-						kH/FMfEgOmKsUmKmYamCu5lBHU2inYFEJXkiisCoLQjXnws3wpCJLfKMN567rJlu
-						OjJYfYtmKTXwc/VqRkUFGQWu5GP9hgGPC0wcWHr6Vspqa8eMZDF4CY5EAD9kTWB7
-						FWoWYXavsqXe6P6DUNnqnBUhicJtx+YalauPcXILOZEuGU7fY0qk1fDwRQemMEDJ
-						TOavKjmM2o9UJkU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stratford.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stratford.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">Stratford-upon-Avon College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stratford-upon-Avon College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stratford.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nicola</GivenName>
-    <SurName>Sparkes</SurName>
-    <EmailAddress>mailto:nicolasparkes@stratford.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Morris</SurName>
-    <EmailAddress>mailto:richardmorris@stratford.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.strodes.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.strodes.ac.uk-shibboleth.xml
deleted file mode 100644
index 4fa4b4a8..00000000
--- a/swamid-interfederations-2.0/idp.strodes.ac.uk-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://idp.strodes.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Strode's College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-22T16: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">strodes.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiwCCQDcWa6x9ZbwJjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGU3VycmV5MQ4wDAYDVQQHEwVFZ2hhbTEYMBYGA1UEChMPU3Ry
-						b2RlcyBDb2xsZWdlMRowGAYDVQQDExFpZHAuc3Ryb2Rlcy5hYy51azAeFw0xMzEw
-						MzExNTE2MzVaFw0zMzEwMjYxNTE2MzVaMGQxCzAJBgNVBAYTAkdCMQ8wDQYDVQQI
-						EwZTdXJyZXkxDjAMBgNVBAcTBUVnaGFtMRgwFgYDVQQKEw9TdHJvZGVzIENvbGxl
-						Z2UxGjAYBgNVBAMTEWlkcC5zdHJvZGVzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEA3jJkDFSXCd1vT7ockIBT/j/ZNcRgrdhdstZVN7cycLDg
-						zUijTZgqHZYmq7/PgDKRuH4/zgiFAZt4LZKxaro0fLK0CpZBal0pVpheqaCGtuCr
-						FNtsP826Ks1dk2pMPSqqFrYdTO/UMofeUuxrNr836CL7x5ATCdVU9F/pljTeRr/V
-						qCs1IQhdiE1o5mHYXJutpwnabHN/eYQB/xgM8awyr93lHOge2uu6ioKcfDASmL9+
-						VKNak/4mYQEA3UW4BjhC6QHzXvRu2KbhVjcrH9qBgCJM73u+hkSEWPazXAcvmgFS
-						QoCDgqelecT4Y0iCPTytn/ffIHKZR/lpWfbgmGTERQIDAQABMA0GCSqGSIb3DQEB
-						BQUAA4IBAQBXSwhT6WnbbLhQ432uwqOgM8xAH27q4ARxNLzTj7D9XNSbh1qxwc0o
-						2z1pgHA05H/r6JFVoOd1hP03k34wv3Mt9B/kEiEP7x2iGukw5sQ8xk9JFIVNdjC0
-						yiJFl9znjtl/UZZkYG6WgvOFr+HzK42Tvf3cBwcjn3amZbjTsIU7VbH0GvCqnB5B
-						Ec9fbn6h3RN9awbrMC6BqbRflyA4k8rAuZ4yxKUm/GTkhjaGoM8yNVJbmxOGonkV
-						x5WyEEVfjbFIBjxXKUXp1zHdcCxDuL/GE0wKHpCffnk3e11MzT7KO1YaGQyXQEQ/
-						fAFKolTZXDqFqiudmlPOb4sxvpmQ7jUs
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.strodes.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.strodes.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.strodes.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.strodes.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.strodes.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.strodes.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">strodes.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiwCCQDcWa6x9ZbwJjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGU3VycmV5MQ4wDAYDVQQHEwVFZ2hhbTEYMBYGA1UEChMPU3Ry
-						b2RlcyBDb2xsZWdlMRowGAYDVQQDExFpZHAuc3Ryb2Rlcy5hYy51azAeFw0xMzEw
-						MzExNTE2MzVaFw0zMzEwMjYxNTE2MzVaMGQxCzAJBgNVBAYTAkdCMQ8wDQYDVQQI
-						EwZTdXJyZXkxDjAMBgNVBAcTBUVnaGFtMRgwFgYDVQQKEw9TdHJvZGVzIENvbGxl
-						Z2UxGjAYBgNVBAMTEWlkcC5zdHJvZGVzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEA3jJkDFSXCd1vT7ockIBT/j/ZNcRgrdhdstZVN7cycLDg
-						zUijTZgqHZYmq7/PgDKRuH4/zgiFAZt4LZKxaro0fLK0CpZBal0pVpheqaCGtuCr
-						FNtsP826Ks1dk2pMPSqqFrYdTO/UMofeUuxrNr836CL7x5ATCdVU9F/pljTeRr/V
-						qCs1IQhdiE1o5mHYXJutpwnabHN/eYQB/xgM8awyr93lHOge2uu6ioKcfDASmL9+
-						VKNak/4mYQEA3UW4BjhC6QHzXvRu2KbhVjcrH9qBgCJM73u+hkSEWPazXAcvmgFS
-						QoCDgqelecT4Y0iCPTytn/ffIHKZR/lpWfbgmGTERQIDAQABMA0GCSqGSIb3DQEB
-						BQUAA4IBAQBXSwhT6WnbbLhQ432uwqOgM8xAH27q4ARxNLzTj7D9XNSbh1qxwc0o
-						2z1pgHA05H/r6JFVoOd1hP03k34wv3Mt9B/kEiEP7x2iGukw5sQ8xk9JFIVNdjC0
-						yiJFl9znjtl/UZZkYG6WgvOFr+HzK42Tvf3cBwcjn3amZbjTsIU7VbH0GvCqnB5B
-						Ec9fbn6h3RN9awbrMC6BqbRflyA4k8rAuZ4yxKUm/GTkhjaGoM8yNVJbmxOGonkV
-						x5WyEEVfjbFIBjxXKUXp1zHdcCxDuL/GE0wKHpCffnk3e11MzT7KO1YaGQyXQEQ/
-						fAFKolTZXDqFqiudmlPOb4sxvpmQ7jUs
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.strodes.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.strodes.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">Strode's College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Strode's College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.strodes.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Roberts</GivenName>
-    <SurName>Disbury</SurName>
-    <EmailAddress>mailto:rdisbury@strodes.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Roberts</GivenName>
-    <SurName>Disbury</SurName>
-    <EmailAddress>mailto:rdisbury@strodes.ac.uk</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 c5b263c2..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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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.student.bth.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.student.bth.se/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.student.bth.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">bth.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.student.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.student.bth.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">STUDENTS-BTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola - Studenter</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology - Students</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Blekinge Institute of Technology - Students</md:Company>
-    <md:SurName>IT Help Desk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Blekinge Institute of Technology - Students</md:Company>
-    <md:SurName>IT Help Desk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Blekinge Institute of Technology - Students</md:Company>
-    <md:SurName>IT Help Desk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md: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 51f14e45..00000000
--- a/swamid-interfederations-2.0/idp.student.bth.se.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>
-    </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="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Martinsson</SurName>
-    <EmailAddress>tom.martinsson@bth.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml b/swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml
deleted file mode 100644
index b39a35af..00000000
--- a/swamid-interfederations-2.0/idp.suni.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.suni.se/adfs/services/trust">
-  <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>
-    <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suni.se</shibmd:Scope>
-  </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">suni.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQZHPOuyVURJge5wdOa1kfEzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDMxMTAwMDAwMFoXDTE3MDQzMDIzNTk1OVowOTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMB0RS/jwsLGyG8DB8mIqgzTcEwb5P/7y9beizxgvlJc3dbauQogUIwZtsUn2q7qbV5h66c68bl8fi+JhtJYWXXu/rA9d6i4cQSdKXJPTMAss2ZobcRmnVSDrj0ZTJ5+JBe+fuYI3cDaLy5rGz9PcgxqINcjM4wW01pKjnZzrVqbJ1dsSfWzU5AkMwVS+10UjQYLSeHg/2PAgfDRovqTqTfMpF16DXwx+OcqnJY2yN0JcpVggQNOE9a4y9L6qe0SYbbTlqbrlrz/X+0e4gQ8sjif4PdB4AXVb0dP9D3pjfLXim8leVarNN2knOPZmmFYWKEBNS5KHlkSnHFIyNFof3UCAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT3yAYidugFyhjhPMuNGIu6pA6hfzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILaWRwLnN1bmkuc2UwDQYJKoZIhvcNAQEFBQADggEBAAdzCLw9BLbfTeYy0fLEWT4nrH5oBJ7G1Si/vdf8dvQlUF8gbtizKI/c7871smaPHge5DdwUwY9vqRkRrzeiM/mGUSgUCkN56Y17eTzmbvRQ6EPjpiZ/dlTBycedq2TmnxLM1VbO9Xx3rK07YdSdDn+y+n4GNJlL4NCED/rVDdsEBoy+nmztLLolGztRZPv8xLbCdE2vompEA7sbDsBv4hNCjsuVSCt8FlX3rz3uqaaNcG3r5tQ8VHtrQ7xCCRScSfoYoI0sgwE5BtThwDAi1arLp/tHN5Ow500zq4m8LZEdmGBZ56M3kIHEn1n8UOUlCMWYtYw1rIhX9FYyT8Dn2bY=</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>MIIEYzCCA0ugAwIBAgIQZHPOuyVURJge5wdOa1kfEzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDMxMTAwMDAwMFoXDTE3MDQzMDIzNTk1OVowOTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMB0RS/jwsLGyG8DB8mIqgzTcEwb5P/7y9beizxgvlJc3dbauQogUIwZtsUn2q7qbV5h66c68bl8fi+JhtJYWXXu/rA9d6i4cQSdKXJPTMAss2ZobcRmnVSDrj0ZTJ5+JBe+fuYI3cDaLy5rGz9PcgxqINcjM4wW01pKjnZzrVqbJ1dsSfWzU5AkMwVS+10UjQYLSeHg/2PAgfDRovqTqTfMpF16DXwx+OcqnJY2yN0JcpVggQNOE9a4y9L6qe0SYbbTlqbrlrz/X+0e4gQ8sjif4PdB4AXVb0dP9D3pjfLXim8leVarNN2knOPZmmFYWKEBNS5KHlkSnHFIyNFof3UCAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT3yAYidugFyhjhPMuNGIu6pA6hfzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILaWRwLnN1bmkuc2UwDQYJKoZIhvcNAQEFBQADggEBAAdzCLw9BLbfTeYy0fLEWT4nrH5oBJ7G1Si/vdf8dvQlUF8gbtizKI/c7871smaPHge5DdwUwY9vqRkRrzeiM/mGUSgUCkN56Y17eTzmbvRQ6EPjpiZ/dlTBycedq2TmnxLM1VbO9Xx3rK07YdSdDn+y+n4GNJlL4NCED/rVDdsEBoy+nmztLLolGztRZPv8xLbCdE2vompEA7sbDsBv4hNCjsuVSCt8FlX3rz3uqaaNcG3r5tQ8VHtrQ7xCCRScSfoYoI0sgwE5BtThwDAi1arLp/tHN5Ow500zq4m8LZEdmGBZ56M3kIHEn1n8UOUlCMWYtYw1rIhX9FYyT8Dn2bY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.suni.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.suni.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.suni.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.suni.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.suni.se/adfs/ls/"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="E-Mail Address" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Given Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="UPN" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Common Name" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x E-Mail Address" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x UPN" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Role" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Surname" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="PPID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name ID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication time stamp" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication method" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only group SID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Windows account name" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="eduPersonScopedAffiliation" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="cn" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/cn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="eduPersonEntitlement" Name="http://schemas.xmlsoap.org/claims/eduPersonEntitlement" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Display Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Initials" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/initials" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="norEduPersonNIN" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="socialSecurityNumber" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/socialSecurityNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="socialSecurityNumberNotOld" Name="http://schemas.xmlsoap.org/claims/socialSecurityNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv-SE">Södertörns högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv-SE">Södertörns högskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv-SE">http://www.sh.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tomas</md:GivenName>
-    <md:SurName>Legat</md:SurName>
-    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)86084000</md:TelephoneNumber>
-  </md: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 0a65f8b2..00000000
--- a/swamid-interfederations-2.0/idp.surfnet.nl.xml
+++ /dev/null
@@ -1,49 +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.surfnet.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/logos/idp/surfnet.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">HAAS SURFnet bv SURF konijn surf surfnet powered by</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">HAAS SURFnet bv SURF konijn powered by</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md: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 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/idp.sussex.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.sussex.ac.uk-shibboleth.xml
deleted file mode 100644
index b53194a6..00000000
--- a/swamid-interfederations-2.0/idp.sussex.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.sussex.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth Identity Provider for the University of Sussex.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <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">University of Sussex</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Sussex</mdui:Description>
-        <mdui:Logo height="60" width="147">https://www.sussex.ac.uk/includes/images/external/logo.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.sussex.ac.uk/includes/images/external/favicon.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sussex.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIVAL/cBrEESZ0ZPT7d+5iLH4sqVPESMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC5zdXNzZXguYWMudWswHhcNMTMwODAxMTQ0NzE2
-						WhcNMzMwODAxMTQ0NzE2WjAbMRkwFwYDVQQDExBpZHAuc3Vzc2V4LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAofHugvoV3CedXGuTc3l8gbwJ
-						MU0hCP2TetJq7VXqKOXfedqQ5wDagYUvHhi+PqzakJhVridhguoywOiQQHSuGRhc
-						4YhYo0kZe6w9PU4NGJztKwIoc90pMGfP9F0MlnyFL4UFEtdMVKhMWl0uPJJec3EH
-						MnzTAeakGSENoVAasX3m+vaDoldAeIy7agcQ38K/MaVAskiF4QzP2k+uVFfjC91w
-						rVKDi6xyDGbFiBkgIlkpXhnjkoIyWSdaKKxAR+3V39pMFkrhznptHBk+Nm6lc5Rs
-						IsQFxeoWp8YpFDWjatkTJAid6GCVxIMn7iA04fe7WNknFERgTcVe76mFa5895QID
-						AQABo2MwYTBABgNVHREEOTA3ghBpZHAuc3Vzc2V4LmFjLnVrhiNodHRwczovL2lk
-						cC5zdXNzZXguYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUW2CGoKuq5ytmpRKk
-						vK0UKWA0PZIwDQYJKoZIhvcNAQEFBQADggEBABYQwDDUPodVsJLXP1+4RYXzcALB
-						GD+URWmXudUbkmvVyPBFlG61W7aritNYPswnsMkeTsWGceygRZDduiDhImMk3psM
-						tfjPPZsCNYNPj+E5kXrxj5S4y0wBPCUA5li9avuUwyiv7Cj41x0R/MBsTOzZymM1
-						WAdfk2BWiiO76mGt0T5JtkEvyMR2oOguM3rHyQvSprZwixI5iC51Jgz8hi9/g6uB
-						hXl7a/FvOINuTcakieicxaKoY8SLwlPSohC5MY7JrRYuoGc72ROnYh41NN7DKmcl
-						9i3j/XWPg4DPCgnybKfTsjUDXFGJsKprFqXkTm2t9sAytMmdCHUYvCGzbMk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussex.ac.uk: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.sussex.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sussex.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sussex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sussex.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">sussex.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIVAL/cBrEESZ0ZPT7d+5iLH4sqVPESMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC5zdXNzZXguYWMudWswHhcNMTMwODAxMTQ0NzE2
-						WhcNMzMwODAxMTQ0NzE2WjAbMRkwFwYDVQQDExBpZHAuc3Vzc2V4LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAofHugvoV3CedXGuTc3l8gbwJ
-						MU0hCP2TetJq7VXqKOXfedqQ5wDagYUvHhi+PqzakJhVridhguoywOiQQHSuGRhc
-						4YhYo0kZe6w9PU4NGJztKwIoc90pMGfP9F0MlnyFL4UFEtdMVKhMWl0uPJJec3EH
-						MnzTAeakGSENoVAasX3m+vaDoldAeIy7agcQ38K/MaVAskiF4QzP2k+uVFfjC91w
-						rVKDi6xyDGbFiBkgIlkpXhnjkoIyWSdaKKxAR+3V39pMFkrhznptHBk+Nm6lc5Rs
-						IsQFxeoWp8YpFDWjatkTJAid6GCVxIMn7iA04fe7WNknFERgTcVe76mFa5895QID
-						AQABo2MwYTBABgNVHREEOTA3ghBpZHAuc3Vzc2V4LmFjLnVrhiNodHRwczovL2lk
-						cC5zdXNzZXguYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUW2CGoKuq5ytmpRKk
-						vK0UKWA0PZIwDQYJKoZIhvcNAQEFBQADggEBABYQwDDUPodVsJLXP1+4RYXzcALB
-						GD+URWmXudUbkmvVyPBFlG61W7aritNYPswnsMkeTsWGceygRZDduiDhImMk3psM
-						tfjPPZsCNYNPj+E5kXrxj5S4y0wBPCUA5li9avuUwyiv7Cj41x0R/MBsTOzZymM1
-						WAdfk2BWiiO76mGt0T5JtkEvyMR2oOguM3rHyQvSprZwixI5iC51Jgz8hi9/g6uB
-						hXl7a/FvOINuTcakieicxaKoY8SLwlPSohC5MY7JrRYuoGc72ROnYh41NN7DKmcl
-						9i3j/XWPg4DPCgnybKfTsjUDXFGJsKprFqXkTm2t9sAytMmdCHUYvCGzbMk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussex.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">University of Sussex</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Sussex</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sussex.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dave</GivenName>
-    <SurName>Lewney</SurName>
-    <EmailAddress>mailto:d.m.lewney@sussex.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dave</GivenName>
-    <SurName>Lewney</SurName>
-    <EmailAddress>mailto:d.m.lewney@sussex.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sussexcoast.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sussexcoast.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index f92fbc97..00000000
--- a/swamid-interfederations-2.0/idp.sussexcoast.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.sussexcoast.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Sussex Coast College Hastings.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-22T13:54:19Z">
-      <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">sussexcoast.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVAPawddu40r8UEYXiRI2PCN7NZhVUMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFWlkcC5zdXNzZXhjb2FzdC5hYy51azAeFw0xMzA4MTUx
-						NTM2MjRaFw0zMzA4MTUxNTM2MjRaMCAxHjAcBgNVBAMTFWlkcC5zdXNzZXhjb2Fz
-						dC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJUCHJLmCjKw
-						9qA1Ih2Dxlv6egks+noCR51m17eZiGvFX0yMgwAxaKtR3YifvbB+Is6OUmajhBpI
-						CzLnXvl+JGLRdfUnfI6UkKJzbWqA6YHvJ+wpUNi/3zKsVtWKQJkNwfutETZ0lRac
-						Nqg4GV+LYZTrSMpYCeWYElRGl6FXqO/RGDTlGFsyz3zW1aQ0glcGXAXMjUEaqllx
-						HJh1CTPqpvBSyjszE1cqOb1SOa5mjRNWpjvHqZG9MiFNkdK42o59DDutkKDrzy23
-						W+LfLXpTf34Azg6OiBMUoiR8/L9sMJzQgBNpAqf8jmudVfI99dbRiE5IETXLic6D
-						wXEWpY9QHisCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLnN1c3NleGNvYXN0LmFj
-						LnVrhixodHRwczovL2lkcC5zdXNzZXhjb2FzdC5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUGOChlS1FUiNl0WdWrVoquoZlZN0wDQYJKoZIhvcNAQEFBQAD
-						ggEBAH/g5HazCvM36U9zfkj3FrlSRVhg3f1czmqx1qE6SfnhF3R6X68u9WRtpJ+D
-						Tvwv05UhhnSzAk+ijxQL2/1bwkWpS2d+a6d6+kjRABUVjx1mQOAuJLfFcGqBnXEs
-						tRj+Gc4eqYQm/BxxCwakyRo4jy13a4Mn3GOArZmiObKaBbWEgqqdLUEASBJJzjiE
-						VZpoq6DGegpSPiff212TQiVNZ63eITPS927MhNkZ8bCI5yK/iqbn4BKwM8Lg7rRX
-						77Z19XW7izNdrg9EIjkLKsMdqukXpi/UkMc3QXOvBnppPp03GFVZERTUCB6WrCnR
-						PKGUsR8JV4C/b+aw7Qy977lXij4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussexcoast.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexcoast.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.sussexcoast.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexcoast.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.sussexcoast.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sussexcoast.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sussexcoast.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">sussexcoast.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVAPawddu40r8UEYXiRI2PCN7NZhVUMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFWlkcC5zdXNzZXhjb2FzdC5hYy51azAeFw0xMzA4MTUx
-						NTM2MjRaFw0zMzA4MTUxNTM2MjRaMCAxHjAcBgNVBAMTFWlkcC5zdXNzZXhjb2Fz
-						dC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJUCHJLmCjKw
-						9qA1Ih2Dxlv6egks+noCR51m17eZiGvFX0yMgwAxaKtR3YifvbB+Is6OUmajhBpI
-						CzLnXvl+JGLRdfUnfI6UkKJzbWqA6YHvJ+wpUNi/3zKsVtWKQJkNwfutETZ0lRac
-						Nqg4GV+LYZTrSMpYCeWYElRGl6FXqO/RGDTlGFsyz3zW1aQ0glcGXAXMjUEaqllx
-						HJh1CTPqpvBSyjszE1cqOb1SOa5mjRNWpjvHqZG9MiFNkdK42o59DDutkKDrzy23
-						W+LfLXpTf34Azg6OiBMUoiR8/L9sMJzQgBNpAqf8jmudVfI99dbRiE5IETXLic6D
-						wXEWpY9QHisCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLnN1c3NleGNvYXN0LmFj
-						LnVrhixodHRwczovL2lkcC5zdXNzZXhjb2FzdC5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUGOChlS1FUiNl0WdWrVoquoZlZN0wDQYJKoZIhvcNAQEFBQAD
-						ggEBAH/g5HazCvM36U9zfkj3FrlSRVhg3f1czmqx1qE6SfnhF3R6X68u9WRtpJ+D
-						Tvwv05UhhnSzAk+ijxQL2/1bwkWpS2d+a6d6+kjRABUVjx1mQOAuJLfFcGqBnXEs
-						tRj+Gc4eqYQm/BxxCwakyRo4jy13a4Mn3GOArZmiObKaBbWEgqqdLUEASBJJzjiE
-						VZpoq6DGegpSPiff212TQiVNZ63eITPS927MhNkZ8bCI5yK/iqbn4BKwM8Lg7rRX
-						77Z19XW7izNdrg9EIjkLKsMdqukXpi/UkMc3QXOvBnppPp03GFVZERTUCB6WrCnR
-						PKGUsR8JV4C/b+aw7Qy977lXij4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussexcoast.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexcoast.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">Sussex Coast College Hastings</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sussex Coast College Hastings</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sussexcoast.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Henderson</SurName>
-    <EmailAddress>mailto:phenderson@sussexcoast.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Falla</SurName>
-    <EmailAddress>mailto:MFalla@sussexcoast.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sussexdowns.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sussexdowns.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 58fa4498..00000000
--- a/swamid-interfederations-2.0/idp.sussexdowns.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sussexdowns.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Sussex Downs College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-02T14:30: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">sussexdowns.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIURAFiqUwkPEeqc96JttxXGAE26L4wDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25zLmFjLnVrMB4XDTE1MTIxNzEx
-						MTkzN1oXDTM1MTIxNzExMTkzN1owIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25z
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjlGQ/46Zz8XS
-						ITjMuhfDCzm5/oD4jbdpqXDIhZ1wYs2RGgv76L4qDT6DFM9ZayZ5j/pMyA+Nu66Y
-						rsO4gfhrVsaZvM16QX8+/jNdYMbBkPdIu/6VaZWXrGFyaX1G0gDR+eeUbsfhTjPA
-						O/UlHeaT+veqE7qea/HcDmE4IyuPg+VihxiWbUJr7AWM3PsHY3vxGF56F660CJB6
-						+3x/dITHpaLzTDjx4+EJHQx15YA3JFy/oVmzlFXiGv7bFeaGFkwXRbGITy3i9qrQ
-						TkPH0d0vVoliQUy/WA6kYg3zvEo1AuvFPOBikoyuvG/S0/MdYdYtQ88XNN/JD71g
-						e49Rhe7PAQIDAQABo3EwbzAdBgNVHQ4EFgQU+P2pTqq/YUXsA6I/zNvITmp9m/Qw
-						TgYDVR0RBEcwRYIVaWRwLnN1c3NleGRvd25zLmFjLnVrhixodHRwczovL2lkcC5z
-						dXNzZXhkb3ducy5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAOU6r12uD595fLRVZ/MZDYZ1ZeyJpGvLzQdb9UizHt8V1hdVGPcNY+GfL4bp7
-						QrGPnWr+e64PvswEXA25ELy3ecpsNAdbL5u2iGpYgDLnqqX3+wmaGwSyTkT9bQ8H
-						DIyt0PGnv9OjLm8Cv+UEYyneTP/sha3QRUdXrgqlAaWu489ZbSiaPoNd9gRg7E6i
-						Z9HN/Yt9NiPHit56211YR/a/SZY7bX/ML3G9mOhTPy0lnYh/dFJjLLKNJnK0BXDq
-						qRGS+ddJ2d88CbPTgU0IIAKzNK3OnmEX/PJ/WJOgKV1ThFXs2d3EWeL46AKrgHMW
-						t52x/Ffb6//Lld/tcohp/7D89g==
-					</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>
-						MIIDQDCCAiigAwIBAgIVAOIaZM3vDoHKS6s49KFRowGWMrhoMA0GCSqGSIb3DQEB
-						CwUAMCAxHjAcBgNVBAMMFWlkcC5zdXNzZXhkb3ducy5hYy51azAeFw0xNTEyMTcx
-						MTE5MzVaFw0zNTEyMTcxMTE5MzVaMCAxHjAcBgNVBAMMFWlkcC5zdXNzZXhkb3du
-						cy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIpvgW9+B595
-						D0WgHoZOS4cBeQc9GfA9kSPW1EyyfManq4uJ/DTqlaFTVwKUyfq4TAxrDDTR5Oty
-						cEdZQVzlrWxXXCf1x1MbvGmx3XsLj3VG/CSDEoFVlUlP2Fyhf9x4WWiFETbmeDTy
-						SXbI5/7i1R4sFIdatgJzEsTmVxVshtfVZca3Th0JuWUGd4bRpfFC7w32uwa/aUSx
-						JRQpN6pP3Wgp0cl9LBHWvq7vvnwYFxW2WwnW15SsFXMOp8wYYxvuJd60U+tndpFL
-						k5drnW33mF12so1k8MlJDu04tSMENE0U02YjF1ZElImKvtgEfLwbJzFTJFnFNJn2
-						JPS/P42KlKECAwEAAaNxMG8wHQYDVR0OBBYEFG3Rqg36hQNcgq33iUo4KK4Zdy7n
-						ME4GA1UdEQRHMEWCFWlkcC5zdXNzZXhkb3ducy5hYy51a4YsaHR0cHM6Ly9pZHAu
-						c3Vzc2V4ZG93bnMuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-						ggEBAIRIojOcGmCWa9k1bPDPYIoaNf/ZVXQokPMBIV6szhP1+/pYQYf3JY/0hAXv
-						TcZRDFdd708Y3IByyH/WckVzQFuQq1WSN90DPIgKKXf3SLGXhnv9eVC9MnUlB7s2
-						83YCmBNctkQQ4ZEu2ZvchQaxzp0Gx+Emu7lyDM20XdqCZfR2ovuLq9LlOdtlGxgO
-						GRr0Do1F9M6GFLCZg/t4D7+cjOP0+v7HB/dmLItt9zAaRWDIrnQqoP940PwaBqCh
-						NYbRkFbjPKQhDvO4kI4QqLYBCvVWEsba+Z+/scBMWwHU4fHONpP4s/54gYifgH/e
-						APhr3gWeqRKI8ywdO1Rm4eziOxE=
-					</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>
-						MIIDPzCCAiegAwIBAgIUa5OG5i1Wpluu9P44ecwPAnoEUWowDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25zLmFjLnVrMB4XDTE1MTIxNzEx
-						MTkzNloXDTM1MTIxNzExMTkzNlowIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25z
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkGUkJb5iXiLp
-						6RtG+A0Clx5j9lrmAmvU/PKUFCCv/UCuFeIVsXAeBzz0mdGOdPw+17p1xQssyro5
-						mD80ikQV3eCnSqJt3N9opH+itpeZWLnvqIbv7DnCg1iqT4GbYQF2b6OlrIrdyYtO
-						DR+15R2WRTz2wqhv4buLe0fhTXDFKD15SE8CEl/hRxXq8ccG1syhb/LjcG3uXgPz
-						wEtP4iKPCCJG2I9tX85+Darae5JIs2qHebiiuFUyUv+u2x2a9uK4VsmfWVGPdttm
-						OzOrGmxQ89aP8Bjf32sxuJ6WnLpC9hmAtN0oIMRknTOckjD5c1Kyvk77yxJ2dnk5
-						JHaEaUCaUQIDAQABo3EwbzAdBgNVHQ4EFgQUfHVM1sqRpbYALTwazKjUJmqyS6ow
-						TgYDVR0RBEcwRYIVaWRwLnN1c3NleGRvd25zLmFjLnVrhixodHRwczovL2lkcC5z
-						dXNzZXhkb3ducy5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAWDD1JH+p8VZRUKTNOvcMIHK58/fgYudN+Ce205BdFeAk+5lQFNmbGlQ1089U
-						1zCDqTkDOZOL6BuLocAPRqAK+IAyTFpHXA3XeZWU/AtEPxyaETtXiWn0CONd8oBV
-						4sXKlWCUpv8PEdG8HG00ssDDDjnJwGSS0kX7pSzVfbLoKFC5CJgLAIiyBt7xk3X8
-						IwccljGvtByHXsPyhiKcNwIhrCwArOqG96rmCTZh7oX6WvSMFEs+w8oBb0PMZp/3
-						Q16I9/JE3NKX6hVlO19PFwBeJ9ZlVh53zBDSfIuZPlGYK5KFlC3PE/HowDnPa3Xv
-						cd/dBsqyzhYBk6a6l0Gi7CukFQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussexdowns.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sussexdowns.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.sussexdowns.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sussexdowns.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sussexdowns.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sussexdowns.ac.uk/idp/profile/SAML2/Redirect/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">sussexdowns.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIURAFiqUwkPEeqc96JttxXGAE26L4wDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25zLmFjLnVrMB4XDTE1MTIxNzEx
-						MTkzN1oXDTM1MTIxNzExMTkzN1owIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25z
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjlGQ/46Zz8XS
-						ITjMuhfDCzm5/oD4jbdpqXDIhZ1wYs2RGgv76L4qDT6DFM9ZayZ5j/pMyA+Nu66Y
-						rsO4gfhrVsaZvM16QX8+/jNdYMbBkPdIu/6VaZWXrGFyaX1G0gDR+eeUbsfhTjPA
-						O/UlHeaT+veqE7qea/HcDmE4IyuPg+VihxiWbUJr7AWM3PsHY3vxGF56F660CJB6
-						+3x/dITHpaLzTDjx4+EJHQx15YA3JFy/oVmzlFXiGv7bFeaGFkwXRbGITy3i9qrQ
-						TkPH0d0vVoliQUy/WA6kYg3zvEo1AuvFPOBikoyuvG/S0/MdYdYtQ88XNN/JD71g
-						e49Rhe7PAQIDAQABo3EwbzAdBgNVHQ4EFgQU+P2pTqq/YUXsA6I/zNvITmp9m/Qw
-						TgYDVR0RBEcwRYIVaWRwLnN1c3NleGRvd25zLmFjLnVrhixodHRwczovL2lkcC5z
-						dXNzZXhkb3ducy5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAOU6r12uD595fLRVZ/MZDYZ1ZeyJpGvLzQdb9UizHt8V1hdVGPcNY+GfL4bp7
-						QrGPnWr+e64PvswEXA25ELy3ecpsNAdbL5u2iGpYgDLnqqX3+wmaGwSyTkT9bQ8H
-						DIyt0PGnv9OjLm8Cv+UEYyneTP/sha3QRUdXrgqlAaWu489ZbSiaPoNd9gRg7E6i
-						Z9HN/Yt9NiPHit56211YR/a/SZY7bX/ML3G9mOhTPy0lnYh/dFJjLLKNJnK0BXDq
-						qRGS+ddJ2d88CbPTgU0IIAKzNK3OnmEX/PJ/WJOgKV1ThFXs2d3EWeL46AKrgHMW
-						t52x/Ffb6//Lld/tcohp/7D89g==
-					</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>
-						MIIDQDCCAiigAwIBAgIVAOIaZM3vDoHKS6s49KFRowGWMrhoMA0GCSqGSIb3DQEB
-						CwUAMCAxHjAcBgNVBAMMFWlkcC5zdXNzZXhkb3ducy5hYy51azAeFw0xNTEyMTcx
-						MTE5MzVaFw0zNTEyMTcxMTE5MzVaMCAxHjAcBgNVBAMMFWlkcC5zdXNzZXhkb3du
-						cy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIpvgW9+B595
-						D0WgHoZOS4cBeQc9GfA9kSPW1EyyfManq4uJ/DTqlaFTVwKUyfq4TAxrDDTR5Oty
-						cEdZQVzlrWxXXCf1x1MbvGmx3XsLj3VG/CSDEoFVlUlP2Fyhf9x4WWiFETbmeDTy
-						SXbI5/7i1R4sFIdatgJzEsTmVxVshtfVZca3Th0JuWUGd4bRpfFC7w32uwa/aUSx
-						JRQpN6pP3Wgp0cl9LBHWvq7vvnwYFxW2WwnW15SsFXMOp8wYYxvuJd60U+tndpFL
-						k5drnW33mF12so1k8MlJDu04tSMENE0U02YjF1ZElImKvtgEfLwbJzFTJFnFNJn2
-						JPS/P42KlKECAwEAAaNxMG8wHQYDVR0OBBYEFG3Rqg36hQNcgq33iUo4KK4Zdy7n
-						ME4GA1UdEQRHMEWCFWlkcC5zdXNzZXhkb3ducy5hYy51a4YsaHR0cHM6Ly9pZHAu
-						c3Vzc2V4ZG93bnMuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-						ggEBAIRIojOcGmCWa9k1bPDPYIoaNf/ZVXQokPMBIV6szhP1+/pYQYf3JY/0hAXv
-						TcZRDFdd708Y3IByyH/WckVzQFuQq1WSN90DPIgKKXf3SLGXhnv9eVC9MnUlB7s2
-						83YCmBNctkQQ4ZEu2ZvchQaxzp0Gx+Emu7lyDM20XdqCZfR2ovuLq9LlOdtlGxgO
-						GRr0Do1F9M6GFLCZg/t4D7+cjOP0+v7HB/dmLItt9zAaRWDIrnQqoP940PwaBqCh
-						NYbRkFbjPKQhDvO4kI4QqLYBCvVWEsba+Z+/scBMWwHU4fHONpP4s/54gYifgH/e
-						APhr3gWeqRKI8ywdO1Rm4eziOxE=
-					</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>
-						MIIDPzCCAiegAwIBAgIUa5OG5i1Wpluu9P44ecwPAnoEUWowDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25zLmFjLnVrMB4XDTE1MTIxNzEx
-						MTkzNloXDTM1MTIxNzExMTkzNlowIDEeMBwGA1UEAwwVaWRwLnN1c3NleGRvd25z
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkGUkJb5iXiLp
-						6RtG+A0Clx5j9lrmAmvU/PKUFCCv/UCuFeIVsXAeBzz0mdGOdPw+17p1xQssyro5
-						mD80ikQV3eCnSqJt3N9opH+itpeZWLnvqIbv7DnCg1iqT4GbYQF2b6OlrIrdyYtO
-						DR+15R2WRTz2wqhv4buLe0fhTXDFKD15SE8CEl/hRxXq8ccG1syhb/LjcG3uXgPz
-						wEtP4iKPCCJG2I9tX85+Darae5JIs2qHebiiuFUyUv+u2x2a9uK4VsmfWVGPdttm
-						OzOrGmxQ89aP8Bjf32sxuJ6WnLpC9hmAtN0oIMRknTOckjD5c1Kyvk77yxJ2dnk5
-						JHaEaUCaUQIDAQABo3EwbzAdBgNVHQ4EFgQUfHVM1sqRpbYALTwazKjUJmqyS6ow
-						TgYDVR0RBEcwRYIVaWRwLnN1c3NleGRvd25zLmFjLnVrhixodHRwczovL2lkcC5z
-						dXNzZXhkb3ducy5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAWDD1JH+p8VZRUKTNOvcMIHK58/fgYudN+Ce205BdFeAk+5lQFNmbGlQ1089U
-						1zCDqTkDOZOL6BuLocAPRqAK+IAyTFpHXA3XeZWU/AtEPxyaETtXiWn0CONd8oBV
-						4sXKlWCUpv8PEdG8HG00ssDDDjnJwGSS0kX7pSzVfbLoKFC5CJgLAIiyBt7xk3X8
-						IwccljGvtByHXsPyhiKcNwIhrCwArOqG96rmCTZh7oX6WvSMFEs+w8oBb0PMZp/3
-						Q16I9/JE3NKX6hVlO19PFwBeJ9ZlVh53zBDSfIuZPlGYK5KFlC3PE/HowDnPa3Xv
-						cd/dBsqyzhYBk6a6l0Gi7CukFQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sussexdowns.ac.uk: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">Sussex Downs College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sussex Downs College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sussexdowns.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Gavin</GivenName>
-    <SurName>Counahan</SurName>
-    <EmailAddress>mailto:gavin.counahan@sussexdowns.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gavin</GivenName>
-    <SurName>Counahan</SurName>
-    <EmailAddress>mailto:gavin.counahan@sussexdowns.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.swc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.swc.ac.uk-shibboleth.xml
deleted file mode 100644
index 7d6db534..00000000
--- a/swamid-interfederations-2.0/idp.swc.ac.uk-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://idp.swc.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for South West College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-08T11:18: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">swc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAigCCQCSYynTzFCVFjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJH
-						QjEOMAwGA1UECBMFT21hZ2gxDjAMBgNVBAcTBU9tYWdoMRswGQYDVQQKExJTb3V0
-						aCBXZXN0IENvbGxlZ2UxFjAUBgNVBAMTDWlkcC5zd2MuYWMudWswHhcNMTQwODI5
-						MTMwNjE4WhcNMzQwODI0MTMwNjE4WjBiMQswCQYDVQQGEwJHQjEOMAwGA1UECBMF
-						T21hZ2gxDjAMBgNVBAcTBU9tYWdoMRswGQYDVQQKExJTb3V0aCBXZXN0IENvbGxl
-						Z2UxFjAUBgNVBAMTDWlkcC5zd2MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQDfRdI+1tvJLEucskwIxU8aZ4GpSgS12PHYyaA6YKI6PI+BzyF9
-						zxDzTHC4pEmgbDy4OsuuWBKXutpqYP//R7BQVTDUwy+rqScHutNscaDModHdBqZG
-						WIn5U3WoXnbJRIVdf3nGqYg/Tde7aZtXijEzVIEncY4tzpZcNoLmNxxUJ5sqjYgD
-						ThU+yrm7yCD7WAPzY5BG5rPbqQKTNqokUpMQO0Bp90afq4YuYTlL34cepME+9JZb
-						By8HIWbLTPnVlV+Iy5eYRwE46towR+7CJWqAHUQlfouD5BkRypZ/dcsAJQjV2uaN
-						HCskJknk1jEbvQCN+k01ZaK+sWkr3V0/jFoTAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggEBAMSwbpk+Q7HKvS5IsvFyU+zycSRCwfLcSLxheCd+ECXLXyrR/sXgI6FzdQ8G
-						nPYnR7Yhn4VzPGeB2lXRjeDYEu4hTFg5uMLoYaEBrDnZPqhJc7VInEjxVjuA1iGw
-						9agSL/K94P1FEC1xaLq2Jws+PyDnbsJuMzktVB2vRrh2/VV16vaKwl+7xH0gddHq
-						yrovo5mL2GAWed6UO8W0Yb3KKGJHkXRYMPHOSxE5DJ9cttZBVmwqhu242EDPQq+X
-						CWSnvr24qUPXRs7RVa43Ndvt0ADtrepiClWUq/cMEQLVmfsX4tcLoHA8XxlQCdxE
-						n6mX/l4jcIebGBXQCe6F5fRd01U=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.swc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.swc.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.swc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.swc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.swc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.swc.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">swc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAigCCQCSYynTzFCVFjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJH
-						QjEOMAwGA1UECBMFT21hZ2gxDjAMBgNVBAcTBU9tYWdoMRswGQYDVQQKExJTb3V0
-						aCBXZXN0IENvbGxlZ2UxFjAUBgNVBAMTDWlkcC5zd2MuYWMudWswHhcNMTQwODI5
-						MTMwNjE4WhcNMzQwODI0MTMwNjE4WjBiMQswCQYDVQQGEwJHQjEOMAwGA1UECBMF
-						T21hZ2gxDjAMBgNVBAcTBU9tYWdoMRswGQYDVQQKExJTb3V0aCBXZXN0IENvbGxl
-						Z2UxFjAUBgNVBAMTDWlkcC5zd2MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQDfRdI+1tvJLEucskwIxU8aZ4GpSgS12PHYyaA6YKI6PI+BzyF9
-						zxDzTHC4pEmgbDy4OsuuWBKXutpqYP//R7BQVTDUwy+rqScHutNscaDModHdBqZG
-						WIn5U3WoXnbJRIVdf3nGqYg/Tde7aZtXijEzVIEncY4tzpZcNoLmNxxUJ5sqjYgD
-						ThU+yrm7yCD7WAPzY5BG5rPbqQKTNqokUpMQO0Bp90afq4YuYTlL34cepME+9JZb
-						By8HIWbLTPnVlV+Iy5eYRwE46towR+7CJWqAHUQlfouD5BkRypZ/dcsAJQjV2uaN
-						HCskJknk1jEbvQCN+k01ZaK+sWkr3V0/jFoTAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggEBAMSwbpk+Q7HKvS5IsvFyU+zycSRCwfLcSLxheCd+ECXLXyrR/sXgI6FzdQ8G
-						nPYnR7Yhn4VzPGeB2lXRjeDYEu4hTFg5uMLoYaEBrDnZPqhJc7VInEjxVjuA1iGw
-						9agSL/K94P1FEC1xaLq2Jws+PyDnbsJuMzktVB2vRrh2/VV16vaKwl+7xH0gddHq
-						yrovo5mL2GAWed6UO8W0Yb3KKGJHkXRYMPHOSxE5DJ9cttZBVmwqhu242EDPQq+X
-						CWSnvr24qUPXRs7RVa43Ndvt0ADtrepiClWUq/cMEQLVmfsX4tcLoHA8XxlQCdxE
-						n6mX/l4jcIebGBXQCe6F5fRd01U=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.swc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.swc.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">South West College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South West College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.swc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ciara</GivenName>
-    <SurName>Duffy</SurName>
-    <EmailAddress>mailto:ciara.duffy@swc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ciara</GivenName>
-    <SurName>Duffy</SurName>
-    <EmailAddress>mailto:ciara.duffy@swc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index c0e0a45f..00000000
--- a/swamid-interfederations-2.0/idp.swindon-college.ac.uk-idp-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://idp.swindon-college.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Swindon College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-25T16:02:25Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">swindon-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVALJupNJrLD9f0qZUHM/Xl8rlpql8MA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGWlkcC5zd2luZG9uLWNvbGxlZ2UuYWMudWswHhcNMTIw
-						MzEzMDk0NTM3WhcNMzIwMzEzMDk0NTM3WjAkMSIwIAYDVQQDExlpZHAuc3dpbmRv
-						bi1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						pLADxySQUYQAqTPNDee8t0Nxr4LUjG89PJO/3z22vTT+LW9P2Q1RvA31GVuYYcDz
-						VXwhHP/u7ySSASfZ1HyohubyJnx0VNriEh9gCZUXndCCUifFLqGng3Zs4KtITHSx
-						NpWv1JQ5GCLRXorN5qkVsnB5hXZ4RMLVA8bPierzzYZxHXtMEieDxIfWyUDGjVbA
-						qrfZg05SWFagA/+NvMrozUXj5q3IUbxi3NdVMSuaAkMmkLK5gXDdsDY0lTpTL7P0
-						xtbO4pYKrfMavPfnj/yS9KQ30XZFoZeKvWnzUEZb9nFw1oiUN9UrHBiBVU4s0mgu
-						GNjAf7RB20658r7cKRVITwIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuc3dpbmRv
-						bi1jb2xsZWdlLmFjLnVrhjBodHRwczovL2lkcC5zd2luZG9uLWNvbGxlZ2UuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFP6Yp/0hH7uIYFCI3vZIoxKQpgxe
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBxK5J1DbN+OFP49i1Bhh6iLe/Lipa/UMv8BRI2
-						lQ7AGzUjI/7FR4CYz7m/jcO9GsZyFeTgtoUmtsCj6YQohEgm4lgYFD5MhGOuAOLp
-						FRgsbEMl5mzNd9TIPaAxUy+2prml7bKc/gMMAxxLBswPpvEkZa0FOLsRW4a/cdEm
-						ao5hW+LPBpQlLQZgyzYytj/jB6ljfLV7QXbeGACBJKeZL7Ang/yl6ZCtQW1EbofU
-						L5TwUarch4qcWhlgoOXHypMC4SlzWT6yLOzOC2hg+e/0PLMENqU8Z2SrERRKYVlv
-						EVsYTrzNM4kJzpBen+xuMmmnajrIEneDpaX9x1neqDj7QEfr
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.swindon-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.swindon-college.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.swindon-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.swindon-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.swindon-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.swindon-college.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">swindon-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVALJupNJrLD9f0qZUHM/Xl8rlpql8MA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGWlkcC5zd2luZG9uLWNvbGxlZ2UuYWMudWswHhcNMTIw
-						MzEzMDk0NTM3WhcNMzIwMzEzMDk0NTM3WjAkMSIwIAYDVQQDExlpZHAuc3dpbmRv
-						bi1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						pLADxySQUYQAqTPNDee8t0Nxr4LUjG89PJO/3z22vTT+LW9P2Q1RvA31GVuYYcDz
-						VXwhHP/u7ySSASfZ1HyohubyJnx0VNriEh9gCZUXndCCUifFLqGng3Zs4KtITHSx
-						NpWv1JQ5GCLRXorN5qkVsnB5hXZ4RMLVA8bPierzzYZxHXtMEieDxIfWyUDGjVbA
-						qrfZg05SWFagA/+NvMrozUXj5q3IUbxi3NdVMSuaAkMmkLK5gXDdsDY0lTpTL7P0
-						xtbO4pYKrfMavPfnj/yS9KQ30XZFoZeKvWnzUEZb9nFw1oiUN9UrHBiBVU4s0mgu
-						GNjAf7RB20658r7cKRVITwIDAQABo3kwdzBWBgNVHREETzBNghlpZHAuc3dpbmRv
-						bi1jb2xsZWdlLmFjLnVrhjBodHRwczovL2lkcC5zd2luZG9uLWNvbGxlZ2UuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFP6Yp/0hH7uIYFCI3vZIoxKQpgxe
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBxK5J1DbN+OFP49i1Bhh6iLe/Lipa/UMv8BRI2
-						lQ7AGzUjI/7FR4CYz7m/jcO9GsZyFeTgtoUmtsCj6YQohEgm4lgYFD5MhGOuAOLp
-						FRgsbEMl5mzNd9TIPaAxUy+2prml7bKc/gMMAxxLBswPpvEkZa0FOLsRW4a/cdEm
-						ao5hW+LPBpQlLQZgyzYytj/jB6ljfLV7QXbeGACBJKeZL7Ang/yl6ZCtQW1EbofU
-						L5TwUarch4qcWhlgoOXHypMC4SlzWT6yLOzOC2hg+e/0PLMENqU8Z2SrERRKYVlv
-						EVsYTrzNM4kJzpBen+xuMmmnajrIEneDpaX9x1neqDj7QEfr
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.swindon-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.swindon-college.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">Swindon College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Swindon College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.swindon-college.ac.uk/campus-info/computer-services/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Computer Services Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@swindon-college.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IDP Admins</GivenName>
-    <EmailAddress>mailto:support@swindon.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sworcs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sworcs.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 891988e5..00000000
--- a/swamid-interfederations-2.0/idp.sworcs.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sworcs.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for South Worcestershire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-10T14:56:25Z">
-      <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 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">evesham.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">South Worcestershire College</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://internal.evesham.ac.uk/intranet/img/icons/swc80x60pix.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAMBmzKWXYajA+5lcrW5Mg1lfTNGuMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswHhcNMTUwMjA1MDkzNDEz
-						WhcNMzUwMjA1MDkzNDEzWjAbMRkwFwYDVQQDDBBpZHAuc3dvcmNzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArEvWNYJ7gVZpZmulfiZv/Jnr
-						m/4Oqh2+JEWW0mw4wvw9GbgVVgOL2ppzt22QdCiF9Ry6BRoYTVGeuW2Poncp5jHT
-						qvmHXl6d0m6c+w/oTX8C5zwOs2c8kYHPDLwnqMoleuZTR7kK7GMs+DQoAn6+FXoH
-						9qanFHx1pL3BYvFGUDmwNh91XLvDuBLFsdN0LPDNA6fcE8TKkV8KGf049pyqDi55
-						pOo7IC1AcwZtm+HCH4s2lgFlQfRAmAK8u7+sBFzzHKb9Ey+DWlQSUKRbMhgeNXpZ
-						QfhX8+kn0ytuUojYjGtlkFCWOan/Sr1s8n0tVzWGwJIYN+mNnjZt/NHdcnGVvwID
-						AQABo2cwZTAdBgNVHQ4EFgQUHLtdodDvur7nmtVtQmi4QX51nQYwRAYDVR0RBD0w
-						O4IQaWRwLnN3b3Jjcy5hYy51a4YnaHR0cHM6Ly9pZHAuc3dvcmNzLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCbQ+3/saWmn1SDsIuL+Lj+
-						QaZd0iJDzC9h2Itgcfj3IU9rqQTU9mOiSJb9dJokLWJBRc9zCQgMXtlK7Qx9PVJM
-						CkR0VXU7+0JbNhcROY0dXVam6MZbI/zkmDjtALLayWk7XbTwCrli75BnqANPdMB4
-						NNP+l0tyYjoJB5BZ1jpUVOJjDliQ2iDJIBHo+TeklaLDTyTqep5zXD8gYtmbGxeF
-						TAgbjues+fafbNzKe6g96t8NRA5c+BegBm0cApLTI/zzDjba2uPSRCLbyED4QI2T
-						ps+pb/QgzksAN5Wj7M+takiz36hRSUYMH5AJTm/MeTKZ3DDpmHs9TZRf+4rIRbif
-					</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>
-						MIIDLDCCAhSgAwIBAgIVALRHbvHVOp59HaRxJ3BO3VYBu6htMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswHhcNMTUwMjA1MDkzMzU0
-						WhcNMzUwMjA1MDkzMzU0WjAbMRkwFwYDVQQDDBBpZHAuc3dvcmNzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmKOzw9xaYI3e4NtFEc8L+xls
-						zHjKwKLMEIDi84hDgIbChj80niWrgiYde2qJB+YlvsOKMMahmhTty88FaQQd8jAL
-						tBC/kp1Ki/uyD0bEdAZ2H6bC0ybfslf5JjwYZM3v6/Ycp2juSvi4FEbqSsjO3s6y
-						9X6mE8uINSHnVIcmrOMfHXmQZVega2KO/COQrn6WjYSoPrkRYqGieX0Se+LEHfrA
-						6TgG/k8l2tz6ldb64LOJX62ydGhPL4k+SjlrNX6CdEvKz6CPYKDm/HGL8g7hrjO3
-						bafMnOZCRYOaV/OaOtH0+Ia0ZgtZVhlu+DreODcrKIUBy1Z5PWX2YcHVDrIj4QID
-						AQABo2cwZTAdBgNVHQ4EFgQUDHIUiGmDeB+koqGpa3wsSGlmRi8wRAYDVR0RBD0w
-						O4IQaWRwLnN3b3Jjcy5hYy51a4YnaHR0cHM6Ly9pZHAuc3dvcmNzLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB3bZTeetJmBbRWFXk7zfyI
-						t2zvL4k9V6aaH0SgUj4m1YbToGAedIsGXhCkbYAsgFFpylnQbG6u02RJTDHJ7lyN
-						VhAhv/1FCLW/MVINSL93ciejFPOjBbZiU1iYNaI/5Cmk7yNytIJAVYn+HLWKc2GJ
-						FvS3dsCkf7Td+Gnri398qnSObI3WOQhWwj1o/SIUJ5NqoJk9XHJj/6pkvkbQzzdU
-						NpCaqWu34Y3xLq3zkalUWImULao/4fZtz4OVuvm+mZVGFjJWC3FwKOj46uDTv+1X
-						mm72OxqpBVn6xiBTGOPANTruUzKvuFa7Ohbznc2gQXvGGUeUw6T3CaBCAei3pfKC
-					</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>
-						MIIDKzCCAhOgAwIBAgIUR2mkXU3i/AK0KOIvY/W7Q557Ig8wDQYJKoZIhvcNAQEL
-						BQAwGzEZMBcGA1UEAwwQaWRwLnN3b3Jjcy5hYy51azAeFw0xNTAyMDUwOTM0MTJa
-						Fw0zNTAyMDUwOTM0MTJaMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqKUhOBtt5q7ETDkUjbD/KENaE
-						rKtUaexbH5DzSolqsIOC4Ca1t6NVA92jDrl7iSy3CxoOS6KtOAfvjrlQ9oMOjQgS
-						vwsvIeeFzyRnVwaQgR410Zoe/xDI6kS13dLKnKjgaz6j8bCtLvT1VKb27X8wtocF
-						ZqIasmQLh5kpEP9h5NpXrPIPeE/VfG5h5b6KcaNXjxI0x9lhkQY+t+R9+CM+Pxho
-						RIOZ5yzGVYxpd8iwSTg+VEI/nQ09pdvGRNC/EcFocLMT/VT8+CPVwWuoUhXopl6s
-						IpTuiVJk3+oi0DGKqoK7NxSFcxmeBSWFa4oUbP/j/Cqa6rG5rz9jOetJsWklAgMB
-						AAGjZzBlMB0GA1UdDgQWBBQMt9lBmt9Tpm4HNoBLsmj7oYIoXDBEBgNVHREEPTA7
-						ghBpZHAuc3dvcmNzLmFjLnVrhidodHRwczovL2lkcC5zd29yY3MuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGTTeBRCg+PawgdgFHEe46VQ
-						rBXhVm+h5LfaNXTlhKf3MD7AKTddVDOyNfhWX67aAQKO6C4r5sEKrCbzIi8w7y8H
-						i3bSt17awmx58GPcSPICWGdlty8gkvaB+85QCLl3rURn9BwHyBs83mus3qiF1XfR
-						0I1Sf1iOiBIn6YxOq6CpNLkPBVoo6kCZEgSs6pCAHRY51uZkiGrO9oGcGdS8W8Ql
-						tMukNkGXjxDlGU7yN4Bb7bZI0bWLfQYIKMlDSnHP0utWX9CF6P31kBhDg4KdQ9sA
-						4fMj1TQAMC8N11H7WA2qUpQtO09IQwfdyawo1LZS1+/lfV1QXz3hFOh5J/sSB64=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sworcs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sworcs.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.sworcs.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sworcs.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.sworcs.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sworcs.ac.uk/idp/profile/SAML2/Redirect/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">evesham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAMBmzKWXYajA+5lcrW5Mg1lfTNGuMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswHhcNMTUwMjA1MDkzNDEz
-						WhcNMzUwMjA1MDkzNDEzWjAbMRkwFwYDVQQDDBBpZHAuc3dvcmNzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArEvWNYJ7gVZpZmulfiZv/Jnr
-						m/4Oqh2+JEWW0mw4wvw9GbgVVgOL2ppzt22QdCiF9Ry6BRoYTVGeuW2Poncp5jHT
-						qvmHXl6d0m6c+w/oTX8C5zwOs2c8kYHPDLwnqMoleuZTR7kK7GMs+DQoAn6+FXoH
-						9qanFHx1pL3BYvFGUDmwNh91XLvDuBLFsdN0LPDNA6fcE8TKkV8KGf049pyqDi55
-						pOo7IC1AcwZtm+HCH4s2lgFlQfRAmAK8u7+sBFzzHKb9Ey+DWlQSUKRbMhgeNXpZ
-						QfhX8+kn0ytuUojYjGtlkFCWOan/Sr1s8n0tVzWGwJIYN+mNnjZt/NHdcnGVvwID
-						AQABo2cwZTAdBgNVHQ4EFgQUHLtdodDvur7nmtVtQmi4QX51nQYwRAYDVR0RBD0w
-						O4IQaWRwLnN3b3Jjcy5hYy51a4YnaHR0cHM6Ly9pZHAuc3dvcmNzLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCbQ+3/saWmn1SDsIuL+Lj+
-						QaZd0iJDzC9h2Itgcfj3IU9rqQTU9mOiSJb9dJokLWJBRc9zCQgMXtlK7Qx9PVJM
-						CkR0VXU7+0JbNhcROY0dXVam6MZbI/zkmDjtALLayWk7XbTwCrli75BnqANPdMB4
-						NNP+l0tyYjoJB5BZ1jpUVOJjDliQ2iDJIBHo+TeklaLDTyTqep5zXD8gYtmbGxeF
-						TAgbjues+fafbNzKe6g96t8NRA5c+BegBm0cApLTI/zzDjba2uPSRCLbyED4QI2T
-						ps+pb/QgzksAN5Wj7M+takiz36hRSUYMH5AJTm/MeTKZ3DDpmHs9TZRf+4rIRbif
-					</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>
-						MIIDLDCCAhSgAwIBAgIVALRHbvHVOp59HaRxJ3BO3VYBu6htMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswHhcNMTUwMjA1MDkzMzU0
-						WhcNMzUwMjA1MDkzMzU0WjAbMRkwFwYDVQQDDBBpZHAuc3dvcmNzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmKOzw9xaYI3e4NtFEc8L+xls
-						zHjKwKLMEIDi84hDgIbChj80niWrgiYde2qJB+YlvsOKMMahmhTty88FaQQd8jAL
-						tBC/kp1Ki/uyD0bEdAZ2H6bC0ybfslf5JjwYZM3v6/Ycp2juSvi4FEbqSsjO3s6y
-						9X6mE8uINSHnVIcmrOMfHXmQZVega2KO/COQrn6WjYSoPrkRYqGieX0Se+LEHfrA
-						6TgG/k8l2tz6ldb64LOJX62ydGhPL4k+SjlrNX6CdEvKz6CPYKDm/HGL8g7hrjO3
-						bafMnOZCRYOaV/OaOtH0+Ia0ZgtZVhlu+DreODcrKIUBy1Z5PWX2YcHVDrIj4QID
-						AQABo2cwZTAdBgNVHQ4EFgQUDHIUiGmDeB+koqGpa3wsSGlmRi8wRAYDVR0RBD0w
-						O4IQaWRwLnN3b3Jjcy5hYy51a4YnaHR0cHM6Ly9pZHAuc3dvcmNzLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB3bZTeetJmBbRWFXk7zfyI
-						t2zvL4k9V6aaH0SgUj4m1YbToGAedIsGXhCkbYAsgFFpylnQbG6u02RJTDHJ7lyN
-						VhAhv/1FCLW/MVINSL93ciejFPOjBbZiU1iYNaI/5Cmk7yNytIJAVYn+HLWKc2GJ
-						FvS3dsCkf7Td+Gnri398qnSObI3WOQhWwj1o/SIUJ5NqoJk9XHJj/6pkvkbQzzdU
-						NpCaqWu34Y3xLq3zkalUWImULao/4fZtz4OVuvm+mZVGFjJWC3FwKOj46uDTv+1X
-						mm72OxqpBVn6xiBTGOPANTruUzKvuFa7Ohbznc2gQXvGGUeUw6T3CaBCAei3pfKC
-					</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>
-						MIIDKzCCAhOgAwIBAgIUR2mkXU3i/AK0KOIvY/W7Q557Ig8wDQYJKoZIhvcNAQEL
-						BQAwGzEZMBcGA1UEAwwQaWRwLnN3b3Jjcy5hYy51azAeFw0xNTAyMDUwOTM0MTJa
-						Fw0zNTAyMDUwOTM0MTJaMBsxGTAXBgNVBAMMEGlkcC5zd29yY3MuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqKUhOBtt5q7ETDkUjbD/KENaE
-						rKtUaexbH5DzSolqsIOC4Ca1t6NVA92jDrl7iSy3CxoOS6KtOAfvjrlQ9oMOjQgS
-						vwsvIeeFzyRnVwaQgR410Zoe/xDI6kS13dLKnKjgaz6j8bCtLvT1VKb27X8wtocF
-						ZqIasmQLh5kpEP9h5NpXrPIPeE/VfG5h5b6KcaNXjxI0x9lhkQY+t+R9+CM+Pxho
-						RIOZ5yzGVYxpd8iwSTg+VEI/nQ09pdvGRNC/EcFocLMT/VT8+CPVwWuoUhXopl6s
-						IpTuiVJk3+oi0DGKqoK7NxSFcxmeBSWFa4oUbP/j/Cqa6rG5rz9jOetJsWklAgMB
-						AAGjZzBlMB0GA1UdDgQWBBQMt9lBmt9Tpm4HNoBLsmj7oYIoXDBEBgNVHREEPTA7
-						ghBpZHAuc3dvcmNzLmFjLnVrhidodHRwczovL2lkcC5zd29yY3MuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGTTeBRCg+PawgdgFHEe46VQ
-						rBXhVm+h5LfaNXTlhKf3MD7AKTddVDOyNfhWX67aAQKO6C4r5sEKrCbzIi8w7y8H
-						i3bSt17awmx58GPcSPICWGdlty8gkvaB+85QCLl3rURn9BwHyBs83mus3qiF1XfR
-						0I1Sf1iOiBIn6YxOq6CpNLkPBVoo6kCZEgSs6pCAHRY51uZkiGrO9oGcGdS8W8Ql
-						tMukNkGXjxDlGU7yN4Bb7bZI0bWLfQYIKMlDSnHP0utWX9CF6P31kBhDg4KdQ9sA
-						4fMj1TQAMC8N11H7WA2qUpQtO09IQwfdyawo1LZS1+/lfV1QXz3hFOh5J/sSB64=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sworcs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">South Worcestershire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South Worcestershire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sworcs.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:ithelpdesk@sworcs.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tony</GivenName>
-    <SurName>Neath</SurName>
-    <EmailAddress>mailto:tneath@sworcs.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.symplicity.com-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.symplicity.com-idp-shibboleth.xml
deleted file mode 100644
index ec14e8f6..00000000
--- a/swamid-interfederations-2.0/idp.symplicity.com-idp-shibboleth.xml
+++ /dev/null
@@ -1,91 +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://idp.symplicity.com/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">symplicity.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Symplicity Corporation</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>
-MIIDMzCCAhugAwIBAgIUOfQaXCnZp3MxcogT32JCn+X8E3gwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAwwSaWRwLnN5bXBsaWNpdHkuY29tMB4XDTE0MDkxMTExNTQx
-MloXDTE3MDkxMTExNTQxMlowHTEbMBkGA1UEAwwSaWRwLnN5bXBsaWNpdHkuY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAltgoKsjeOCbzh06byjLj
-J3I3JI3gOunCQ5arKNwowk6t9nAn787JaRDz9TpyMDNt+TNKTKIydc3G3OCzRjiI
-M1IpGhKcBjK27si2x+rNAj5iV1aoCRYDDP9UPDh/1aQdZ6A2/dUgKLq2elkEzqQA
-LA66qfgxQ2SyGjbtQzI+osxLuWVExwF7uSEN3kixxu4I1kovcq+9nPhQVAE0Ym5X
-uAsJzfXRVG7Tt5aK9qgOcol65cox6mG/SRuQAvArsDT0IXa7PdrQKecGCPEIuoLr
-s/G9qJ6jodR1PaaTVPGr34sDzZ1a/CYq1cKrbw4NL5enniA9S/84QLg4yOuBZtCU
-jwIDAQABo2swaTAdBgNVHQ4EFgQUqoHh1qZEMsW0UP356xibFMVcuCswSAYDVR0R
-BEEwP4ISaWRwLnN5bXBsaWNpdHkuY29thilodHRwczovL2lkcC5zeW1wbGljaXR5
-LmNvbS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAh865bn692oV7
-QEx/V8w6PLCmDDIQj8SQeVSsl21weXhrgOhEjClARWSEZK2NSqyeVztcxnyi7GuA
-Fmwy6I8ANFPrhsHhwU4U9V7h4NC1pFeMZj6NAMpaSH3XnwTHez45b7Nqjs6CTMGz
-1THl4xUVqT5VJKInWcyh3fBWRG7MppngLZ/JWUGanaqXWnv/5jdNr+dlrUOT+3+L
-Fy6QTkjoS5QSPQbYxi5SheX67dXNoaCCSWFTf+je1KNo5e9ju/Hlxsidy9wYeqiL
-tCgoORm4fTJOpIXoEmbWitHVX1wIDgxQoeKrAcA9hFtzuQHutF7FVHWtUFE9LwWy
-yH/KgXL8Rg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.symplicity.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.symplicity.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.symplicity.com/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.symplicity.com/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.symplicity.com/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">symplicity.com</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUeeI0i2k070NGLhN7XvLms1eA/AMwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnN5bXBsaWNpdHkuY29tMB4XDTE0MDcxNDIwMjcw
-NFoXDTM0MDcxNDIwMjcwNFowHTEbMBkGA1UEAxMSaWRwLnN5bXBsaWNpdHkuY29t
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjE42eGM0ls48N3e0oBG9
-oXxwwOD4p7dmiO5fJsgPPED20dlVUdHwuWPgNcOF0iRuu0mW9CVXs7MqHN0kTSBA
-BT5SCCN+NfHjRujGedY8ZRffjF8hUfB9681Z+o2E0R6Yqj6ZEi3T9Yt/UUgEBn+S
-ZcMsCXhz/7OKmBwgfNC0jumD91ZA7HLUoJWf7ZTzkwennF9+j0su21j0C2rYXU3L
-72cI10FmTbKACylleqiMo2XXLTxQtFWvMKIqdHO4n4l+DcwjEN6pdcg+mX05hMUR
-NmNGrDSRdsy/pG2q6F/xo4EsaYiP7owqu6s+cSAEfGYh1IFS1arfhWJ4kVqO9167
-DQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuc3ltcGxpY2l0eS5jb22GKWh0dHBz
-Oi8vaWRwLnN5bXBsaWNpdHkuY29tL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ5
-Aos8TwzuOCW/4Rlh1siFVTfHtzANBgkqhkiG9w0BAQUFAAOCAQEAgNTW1+wtGxgG
-qfrdZsI1OB9cx/AVjZoV+GMB8A8OtCgkA9jqdtPg2QFal7npjSy0S+XvtV5uxiwE
-3bg55fhhZ88KyaABn/Qh5lU93tYwGC3OM9wtvxfWLcuabjSt21Ob/0x3S0KFOm+k
-L7437D6m6sbkpUy6oQRnh0rTX+p2R+g/KCF1e+gSLmCoiPNiZ80CThR5TpDbNRa5
-1AAbJoSibH+Idn1Vt/DMwviha/uoZ62KAA5t2Qe7gI4eut/VdpHjTS9I3ohMYFS/
-/zv2vpZCvvCBm3OBsv3vPOSpSYFVu+WulI9sRxtFqeWbFHIHBzNDFe+tjft/SU66
-Ql9RAWG4Dg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.symplicity.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Symplicity Corporation</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Symplicity Corporation</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.symplicity.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>shib@symplicity.com</md:GivenName>
-    <md:EmailAddress>shib@symplicity.com</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 e4cfadb6..00000000
--- a/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sze.hu/idp/shibboleth">
-  <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="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-test</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>sze</saml:AttributeValue>
-        <saml:AttributeValue>href-idps</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sze.hu</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sze.hu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sze.hu/idp/profile/SAML2/POST/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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sze.hu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sze.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sze.hu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor 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>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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu: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="hu">Széchenyi István Egyetem</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Széchenyi István Egyetem</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">Széchenyi István Egyetem</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Széchenyi István Egyetem</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://sze.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://sze.hu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Csábi Béla</md:SurName>
-    <md:EmailAddress>mailto:csabi@sze.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Csábi Béla</md:SurName>
-    <md:EmailAddress>mailto:csabi@sze.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Csábi Béla</md:SurName>
-    <md:EmailAddress>mailto:csabi@sze.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 55298267..00000000
--- a/swamid-interfederations-2.0/idp.szie.hu-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.szie.hu/idp/shibboleth">
-  <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="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:university</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-test</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>szie</saml:AttributeValue>
-        <saml:AttributeValue>href-idps</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:47.59387252831956,19.361040115356445</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="hu">Szent István Egyetem</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Szent István Egyetem SSO szolgáltatás</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">http://ifo.szie.hu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://ifo.szie.hu</mdui:PrivacyStatementURL>
-        <mdui:Logo height="78" width="111">https://idp.szie.hu/szie-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szie.hu</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/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.szie.hu/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.szie.hu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.szie.hu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">Szent István Egyetem</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Szent István University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">Szent István Egyetem</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Szent István University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.szie.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.szie.hu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Cseh Vendel</md:SurName>
-    <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Cseh Vendel</md:SurName>
-    <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Cseh Vendel</md:SurName>
-    <md:EmailAddress>mailto:cseh.vendel@ih.szie.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 92dca71d..00000000
--- a/swamid-interfederations-2.0/idp.szie.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.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: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.ta.belnet.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ta.belnet.be-idp-shibboleth.xml
deleted file mode 100644
index ffe2a48e..00000000
--- a/swamid-interfederations-2.0/idp.ta.belnet.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +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://idp.ta.belnet.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">ta.belnet.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Belnet Technical Advisors</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Technical Advisors test infra for customers workshops</mdui:Description>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.191.128.64/26</mdui:IPHint>
-        <mdui:IPHint>2001:6a8:e80:0::/48</mdui:IPHint>
-        <mdui:DomainHint>ta.belnet.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:50.825312,4.365471</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDKzCCAhOgAwIBAgIUEUEZDGqjNfKukFfppYWY6Nuvmd0wDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRwLnRhLmJlbG5ldC5iZTAeFw0xNTAyMTYxNTA5NDBa
-Fw0zNTAyMTYxNTA5NDBaMBsxGTAXBgNVBAMTEGlkcC50YS5iZWxuZXQuYmUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe+K+stoVDx1upw+KpAeFMGvmh
-427wXk1etEQ4Aym2abP42RypkE4oMy9MJ6EVLP4+hwj9YvLL0CWLi0v+9Jg9ixbR
-1RH5RY3aJoUWHASoV0iyoFs2MB+5XkRt/VA7EGRNFbT1BLuWKjWKZS8knE5GcJw0
-3ER7PGdaP+FFhXyfNoA88xybjI7Xq/N/4f1Dg5bJ0yFZV6nW3hXRx7h5hD2sbz6J
-Olh5XaepbWrI93+TQ5dZJ/EQWPz+Gv5evRA42ZrZMB6d1FZwii4eZUPPreOOGrhI
-1+ANwmXCX6bnzu34c4hH/bsXOzc99aSLXQoYsX4vr0UnI21ZOJVUGRAg0rVzAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC50YS5iZWxuZXQuYmWGJ2h0dHBzOi8vaWRw
-LnRhLmJlbG5ldC5iZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjfpKnrtzekXc
-imJB5lS/NNpSshUwDQYJKoZIhvcNAQEFBQADggEBAB2PAXlLZNK/lWTytZb+A0RR
-0PvjSRtRMGyhv7A6w+3wthMk2eEyvPGSBDS9VPKCHgy4bSGcToM+MdNGuk5wO7Ve
-2+3Z3gDTTyHbVeXHTFNTbCJ567oRnXdJtEPTUwgmLgcXzp2TeU9jhklAmLLMfVYt
-vEapHf2YT2sTLfMVLSpWu8khcTvcEGY7MueTmJ2xLOKo34eIAntiJhoZZb9Z4kx2
-kfgaqkCPwGS+CTeTjyPx79d40qT4CnyWjBeQlZbXheU5Edt/dWU/Z0GPfR2gweej
-/twrx9GPlAFErvOmqrUdsAldbeIkJXb0rVvyjvp8kpw7ZURp5XQNPpFaDJElRn8=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ta.belnet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ta.belnet.be: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.ta.belnet.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ta.belnet.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ta.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ta.belnet.be/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">ta.belnet.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDKzCCAhOgAwIBAgIUEUEZDGqjNfKukFfppYWY6Nuvmd0wDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRwLnRhLmJlbG5ldC5iZTAeFw0xNTAyMTYxNTA5NDBa
-Fw0zNTAyMTYxNTA5NDBaMBsxGTAXBgNVBAMTEGlkcC50YS5iZWxuZXQuYmUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe+K+stoVDx1upw+KpAeFMGvmh
-427wXk1etEQ4Aym2abP42RypkE4oMy9MJ6EVLP4+hwj9YvLL0CWLi0v+9Jg9ixbR
-1RH5RY3aJoUWHASoV0iyoFs2MB+5XkRt/VA7EGRNFbT1BLuWKjWKZS8knE5GcJw0
-3ER7PGdaP+FFhXyfNoA88xybjI7Xq/N/4f1Dg5bJ0yFZV6nW3hXRx7h5hD2sbz6J
-Olh5XaepbWrI93+TQ5dZJ/EQWPz+Gv5evRA42ZrZMB6d1FZwii4eZUPPreOOGrhI
-1+ANwmXCX6bnzu34c4hH/bsXOzc99aSLXQoYsX4vr0UnI21ZOJVUGRAg0rVzAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC50YS5iZWxuZXQuYmWGJ2h0dHBzOi8vaWRw
-LnRhLmJlbG5ldC5iZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjfpKnrtzekXc
-imJB5lS/NNpSshUwDQYJKoZIhvcNAQEFBQADggEBAB2PAXlLZNK/lWTytZb+A0RR
-0PvjSRtRMGyhv7A6w+3wthMk2eEyvPGSBDS9VPKCHgy4bSGcToM+MdNGuk5wO7Ve
-2+3Z3gDTTyHbVeXHTFNTbCJ567oRnXdJtEPTUwgmLgcXzp2TeU9jhklAmLLMfVYt
-vEapHf2YT2sTLfMVLSpWu8khcTvcEGY7MueTmJ2xLOKo34eIAntiJhoZZb9Z4kx2
-kfgaqkCPwGS+CTeTjyPx79d40qT4CnyWjBeQlZbXheU5Edt/dWU/Z0GPfR2gweej
-/twrx9GPlAFErvOmqrUdsAldbeIkJXb0rVvyjvp8kpw7ZURp5XQNPpFaDJElRn8=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ta.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ta.belnet.be: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">
-		Belnet TA Lab
-	</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">
-		Belnet TA Lab
-	</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">
-		http://www.ta.belnet.be/drupal
-	</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Nicolas Loriau</md:GivenName>
-    <md:SurName>Nicolas Loriau</md:SurName>
-    <md:EmailAddress>nicolas@belnet.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tamucc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tamucc.edu-idp-shibboleth.xml
deleted file mode 100644
index 408b97ee..00000000
--- a/swamid-interfederations-2.0/idp.tamucc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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://idp.tamucc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">tamucc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Texas A&amp;M University-Corpus Christi</mdui:DisplayName>
-        <mdui:Description xml:lang="en">TAMU-CC Federated Identification Services</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.tamucc.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://it.tamucc.edu/informationsecurity/securitypolicies/index.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="446" width="254" xml:lang="en">https://falcon.tamucc.edu/maint/idp/tamucc-logo.jpg</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>
-MIIDJDCCAgygAwIBAgIVAOYKntKjtqsjK3XCDvOROln3UFB7MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC50YW11Y2MuZWR1MB4XDTA5MDIyNjE1MjcwNVoX
-DTI5MDIyNjE1MjcwNVowGTEXMBUGA1UEAxMOaWRwLnRhbXVjYy5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwST7lWouvG/O9UvsbOVn7RgXRuyil
-C6YNqNIwmSrVzt3nR7pu8K8A4aSCHzyM6nsIIvq27ga4zatdMm+B/dNcrJSVDk5z
-Bp6CCVG0POW6MI8fhsPTfXmy97RdALIpjrLVpiJVL27ydRFnQ453yQSiWGG4fj7g
-mhbMuKaY6D1dY/IwDIbgyr/HXZETehIpo+1GduKy4FqD+uHObqN4bGs7rZF1EX/U
-EiQkk1nYsZ+D2xwt/H3F2YAjBh4ja8BtN5VQMA61+8A2rl90teMcqUOTQ83KNlIF
-YRE2791RmIt8nWo4cjPnsrJbwQkcWKtAZ2DUIrYMqd+7stvskuhL2PxrAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC50YW11Y2MuZWR1hiVodHRwczovL2lkcC50YW11
-Y2MuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBShMYoUS4SWFsMeAdQRWjTl
-nciIDjANBgkqhkiG9w0BAQUFAAOCAQEABDsRUn3L/8U6B8HBhwQPmOcvcvMHHihq
-Ly3oTnJs3Z4q+nbv6EYozRIWxvZRlBtvzl6uAY4SqOlUgsvyo2ZmZMVwTwxphjqs
-s+rfqQwLmW5SFJDgLuw37Ad0QGDaIDPtkdZD23Va92uriNKAeCCCUFN1bt+cz36Y
-LMyX/IpxQDw5neIfiBge51m49GRFDQvvRdSurNf4uGF9ubBHwk+rqmwle/ypQWNg
-7LtWxJUTw7xMC8A+g7TQNRYxQVQetW8BeuiTLAD3wVEDTag2Jt4Wb2jEXHYkbnTo
-9pLuQGFhtWiswggmYR7TqvrVdoMuskIxwZmVPFx5EplQOQSW+fHYSw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tamucc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tamucc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tamucc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tamucc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tamucc.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tamucc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAOYKntKjtqsjK3XCDvOROln3UFB7MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC50YW11Y2MuZWR1MB4XDTA5MDIyNjE1MjcwNVoX
-DTI5MDIyNjE1MjcwNVowGTEXMBUGA1UEAxMOaWRwLnRhbXVjYy5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwST7lWouvG/O9UvsbOVn7RgXRuyil
-C6YNqNIwmSrVzt3nR7pu8K8A4aSCHzyM6nsIIvq27ga4zatdMm+B/dNcrJSVDk5z
-Bp6CCVG0POW6MI8fhsPTfXmy97RdALIpjrLVpiJVL27ydRFnQ453yQSiWGG4fj7g
-mhbMuKaY6D1dY/IwDIbgyr/HXZETehIpo+1GduKy4FqD+uHObqN4bGs7rZF1EX/U
-EiQkk1nYsZ+D2xwt/H3F2YAjBh4ja8BtN5VQMA61+8A2rl90teMcqUOTQ83KNlIF
-YRE2791RmIt8nWo4cjPnsrJbwQkcWKtAZ2DUIrYMqd+7stvskuhL2PxrAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC50YW11Y2MuZWR1hiVodHRwczovL2lkcC50YW11
-Y2MuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBShMYoUS4SWFsMeAdQRWjTl
-nciIDjANBgkqhkiG9w0BAQUFAAOCAQEABDsRUn3L/8U6B8HBhwQPmOcvcvMHHihq
-Ly3oTnJs3Z4q+nbv6EYozRIWxvZRlBtvzl6uAY4SqOlUgsvyo2ZmZMVwTwxphjqs
-s+rfqQwLmW5SFJDgLuw37Ad0QGDaIDPtkdZD23Va92uriNKAeCCCUFN1bt+cz36Y
-LMyX/IpxQDw5neIfiBge51m49GRFDQvvRdSurNf4uGF9ubBHwk+rqmwle/ypQWNg
-7LtWxJUTw7xMC8A+g7TQNRYxQVQetW8BeuiTLAD3wVEDTag2Jt4Wb2jEXHYkbnTo
-9pLuQGFhtWiswggmYR7TqvrVdoMuskIxwZmVPFx5EplQOQSW+fHYSw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tamucc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Texas A&amp;M University-Corpus Christi</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Texas A&amp;M University-Corpus Christi</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.tamucc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Phil Hale</md:GivenName>
-    <md:EmailAddress>Phil.Hale@tamucc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Edward Evans</md:GivenName>
-    <md:EmailAddress>Edward.Evans@tamucc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Office of Information Security</md:GivenName>
-    <md:EmailAddress>OIS@tamucc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>ithelp@tamucc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.task.gda.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.task.gda.pl-idp-shibboleth.xml
deleted file mode 100644
index d8fc9f7f..00000000
--- a/swamid-interfederations-2.0/idp.task.gda.pl-idp-shibboleth.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.task.gda.pl/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-06-22T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">task.gda.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">TASK Gdansk</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pl">TASK Gdańsk</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Academic Computer Center TASK Identity Provider</mdui:Description>
-        <mdui:Description xml:lang="pl">Dostawca Tożsamości Centrum Informatycznego TASK</mdui:Description>
-        <mdui:Logo height="45" width="109" xml:lang="en">https://idp.task.gda.pl/idp/images/logo_citask.png</mdui:Logo>
-        <mdui:Logo height="45" width="109" xml:lang="pl">https://idp.task.gda.pl/idp/images/logo_citask.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>153.19.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>task.gda.pl</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:54.371860,18.612700</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>
-MIIDJzCCAg+gAwIBAgIURF5LPwZ/QXjVB9iJ7Kz0mzeHll0wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMB4XDTE1MDQwMzA4Mzk1OFoX
-DTM1MDQwMzA4Mzk1OFowGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoDhbNawOVOWO4A/VWUKiNnP6CmGj
-DW6Q3eJH35bIM15MOUm4bsPgZlv2GJ83TV4MPU+m9lvZs7PwawaaJtIslzIiq1TF
-fcolHmrjzw+EqPnv/2/HH9yUJKSusXFNadqC/yPayv0UNMUgkGl1/Rz7EFZRuClM
-3rE4a7CgrhcGue5D8LnW0lPo8gYdrPY0YntT/lVLS3JSooeuEAZCbdfj6mJ0anUR
-Agl8Iy5gTrZ6p1mf6Wc2SqKW60aNWqBUpMAI7LwzkwJPtDAPZ4jITN/gc30iEzfS
-8yw0aoQJ1VuB1AecpQj/d1Jy54q76UV2IC4ELo0heaFDPX0Zkn6klvCqzwIDAQAB
-o2UwYzAdBgNVHQ4EFgQUcUVjQ8rdgeB+mQz7Xa54TmYYkRYwQgYDVR0RBDswOYIP
-aWRwLnRhc2suZ2RhLnBshiZodHRwczovL2lkcC50YXNrLmdkYS5wbC9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlPyHV9yROpDobbr+AtdQPRPnEiDl
-/AVORvbh1kizmapzK5DS8ROmi/tEKWoGv1S85dg5MREosL4BbfQDzZIpmbWNPCBi
-4LfRWsAXmzxExEslW5NpVfYvz5/+hv/V7sML86m7eVpWULSsTH0JC4QYfN+m33Ba
-XbsFGH7eCthi2IwQls+B93v4EUkWtTM6P/nZlqZi8Y3asX9i5EHrMsdcl2nwzdol
-EY/syGwYwfajAEI1c7RcNujuQty1fraXpRDF/kzhy6oiBCecqpSowKy/QEBlV9wh
-Bp0cQldS1u/LcLeFWQq32HbT9OpVBMoqx7VsL8PEkE+592rLCCTvwDXFng==
-                        </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>
-MIIDKDCCAhCgAwIBAgIVANy+gCUM8Wyxo9utTnW0xq8dzG5ZMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2lkcC50YXNrLmdkYS5wbDAeFw0xNTA0MDMwODM5NTZa
-Fw0zNTA0MDMwODM5NTZaMBoxGDAWBgNVBAMMD2lkcC50YXNrLmdkYS5wbDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAISQv8+20Dt+F22y+/0LwXlrH5Ld
-3ZU0E5L8nY1W3nkdnRJkc8VRAj+EgeGnEHHQeb/xhpYiSFWYwjDbM9nkE6a2OLpU
-1tsSax3clNpYGXlRsbqg/XdVZg38j19C45JQOXAdDskLMyWhzhKqPFniUGHsd0Wn
-yq32uC8uohlgAD69fgSs9KxEl6kyDlZBg8fv5w28HianLp0EiTv6gwZ2ZQThIkqi
-nIYK3yZccjzauhGW6yRtvEoRIY3HZuiSGcgVcoBcqKSepSjCA3PYzCWX1MrZyLYw
-wq1utQb3PAcXiHyFd6mm3bkoKCLYByyPgV1GXzRsyHp33FCAJpGuix78bRECAwEA
-AaNlMGMwHQYDVR0OBBYEFHwRZRLbErBc55nrd4dcRSwKY4x6MEIGA1UdEQQ7MDmC
-D2lkcC50YXNrLmdkYS5wbIYmaHR0cHM6Ly9pZHAudGFzay5nZGEucGwvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAE5rcoiYYQN8cSqmRXD6q301rqnB
-PPmwTS9auHQkqTGMezpPV+UK5PLR8MxGKOs5XHxo+klixekYti0VgqBKpO+c9Jsh
-5TM62+mePv9SJL0YapvgzQcXSdfTuR0QTDKLoS/aUSwO5yR8PDf5JOdTspygfrzx
-R5rWGWSCMoq/sl687jlylzovRLzQn6opFKoeXlBIBwWdZCG/CNwq3DQeMCWrkgt9
-rUkBt8hYMPOjHcJx2nl+2Ue6vcevZkudqxBpV5tpioX6Q2F/XsQCiCYpGue9aWcQ
-g12oVQa4JuIHhKSmvZfVZIu1QfcMadj27vchQXWqttvarQO7NWRRimE9OII=
-                        </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>
-MIIDJzCCAg+gAwIBAgIUH/PXFUwlqT8+OMaMthWJ3kkOYJ0wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMB4XDTE1MDQwMzA4Mzk1N1oX
-DTM1MDQwMzA4Mzk1N1owGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnxLDEWcL+qc///wbesB7tizhsqMi
-Ub8s8+dbJkFvWl4htkzfiHi76L+M7L4eXfv1gsgdNXk0mm1kZWa/6XafDPy80zkL
-4ro4UH46LXOu8wMeoy6eLeJDlurX+CzFbPiGdx1FqQF1QIU8jf1bBS7OhpYJ7Ex6
-q7iM/VU2j5i8momKTk4Ktsc+GaVXeO9CWjOb2+U2QNoVxXYX+8NJNcQXyIIxir00
-3e4pl8W7WPxPBz0Ex/+xJPzb75qrSjx9YfadzfE3uoyGomOzODRodOszSSUXnd4J
-cdRZKdA+R8xUZnctuUncLaMUopg3SoBE3VIyl99mvQkmk/Skue4o0PJqoQIDAQAB
-o2UwYzAdBgNVHQ4EFgQUeUfa/bgMdBy0o6JP0hLwgNSuXNowQgYDVR0RBDswOYIP
-aWRwLnRhc2suZ2RhLnBshiZodHRwczovL2lkcC50YXNrLmdkYS5wbC9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAaXFnZPlBAehUrHnfb3TU61b2J+y3
-8ng8l1tzFa/3g7aDTlYxVV9RHrz48mLt23n1LPz90wAixCQKgSqt3jaCqeH59Uaj
-xNUZwqDJJqRZB5a/7z6OEBSeQiKnc3H1PjgdrtgWPgEdvoC+ggGYsbitLdZ+455t
-Dg/6nZ/C6vt40XtJyBMXB8HA4na6IXAFRzr++6QmG4ib8umoPS20cCT2sSUtpz7S
-h1QrFPZQWQRe67fPZlX2aOyu8h5OrEhGoyS95BW/2Hw+nWJFvkn5H12/YYW65qTJ
-/TMpaKEsJ2bRiqVKhW5kntRDcca3KqqIiZ+g4102DKmk44R/y8Yjk9BIxg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.task.gda.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.task.gda.pl: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.task.gda.pl/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.task.gda.pl/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.task.gda.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.task.gda.pl/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">task.gda.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">TASK Gdansk</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pl">TASK Gdańsk</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Academic Computer Center TASK Identity Provider</mdui:Description>
-        <mdui:Description xml:lang="pl">Dostawca Tożsamości Centrum Informatycznego TASK</mdui:Description>
-        <mdui:Logo height="45" width="109" xml:lang="en">https://idp.task.gda.pl/idp/images/logo_citask.png</mdui:Logo>
-        <mdui:Logo height="45" width="109" xml:lang="pl">https://idp.task.gda.pl/idp/images/logo_citask.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>153.19.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>task.gda.pl</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:54.371860,18.612700</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>
-MIIDJzCCAg+gAwIBAgIURF5LPwZ/QXjVB9iJ7Kz0mzeHll0wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMB4XDTE1MDQwMzA4Mzk1OFoX
-DTM1MDQwMzA4Mzk1OFowGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoDhbNawOVOWO4A/VWUKiNnP6CmGj
-DW6Q3eJH35bIM15MOUm4bsPgZlv2GJ83TV4MPU+m9lvZs7PwawaaJtIslzIiq1TF
-fcolHmrjzw+EqPnv/2/HH9yUJKSusXFNadqC/yPayv0UNMUgkGl1/Rz7EFZRuClM
-3rE4a7CgrhcGue5D8LnW0lPo8gYdrPY0YntT/lVLS3JSooeuEAZCbdfj6mJ0anUR
-Agl8Iy5gTrZ6p1mf6Wc2SqKW60aNWqBUpMAI7LwzkwJPtDAPZ4jITN/gc30iEzfS
-8yw0aoQJ1VuB1AecpQj/d1Jy54q76UV2IC4ELo0heaFDPX0Zkn6klvCqzwIDAQAB
-o2UwYzAdBgNVHQ4EFgQUcUVjQ8rdgeB+mQz7Xa54TmYYkRYwQgYDVR0RBDswOYIP
-aWRwLnRhc2suZ2RhLnBshiZodHRwczovL2lkcC50YXNrLmdkYS5wbC9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlPyHV9yROpDobbr+AtdQPRPnEiDl
-/AVORvbh1kizmapzK5DS8ROmi/tEKWoGv1S85dg5MREosL4BbfQDzZIpmbWNPCBi
-4LfRWsAXmzxExEslW5NpVfYvz5/+hv/V7sML86m7eVpWULSsTH0JC4QYfN+m33Ba
-XbsFGH7eCthi2IwQls+B93v4EUkWtTM6P/nZlqZi8Y3asX9i5EHrMsdcl2nwzdol
-EY/syGwYwfajAEI1c7RcNujuQty1fraXpRDF/kzhy6oiBCecqpSowKy/QEBlV9wh
-Bp0cQldS1u/LcLeFWQq32HbT9OpVBMoqx7VsL8PEkE+592rLCCTvwDXFng==
-                        </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>
-MIIDKDCCAhCgAwIBAgIVANy+gCUM8Wyxo9utTnW0xq8dzG5ZMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2lkcC50YXNrLmdkYS5wbDAeFw0xNTA0MDMwODM5NTZa
-Fw0zNTA0MDMwODM5NTZaMBoxGDAWBgNVBAMMD2lkcC50YXNrLmdkYS5wbDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAISQv8+20Dt+F22y+/0LwXlrH5Ld
-3ZU0E5L8nY1W3nkdnRJkc8VRAj+EgeGnEHHQeb/xhpYiSFWYwjDbM9nkE6a2OLpU
-1tsSax3clNpYGXlRsbqg/XdVZg38j19C45JQOXAdDskLMyWhzhKqPFniUGHsd0Wn
-yq32uC8uohlgAD69fgSs9KxEl6kyDlZBg8fv5w28HianLp0EiTv6gwZ2ZQThIkqi
-nIYK3yZccjzauhGW6yRtvEoRIY3HZuiSGcgVcoBcqKSepSjCA3PYzCWX1MrZyLYw
-wq1utQb3PAcXiHyFd6mm3bkoKCLYByyPgV1GXzRsyHp33FCAJpGuix78bRECAwEA
-AaNlMGMwHQYDVR0OBBYEFHwRZRLbErBc55nrd4dcRSwKY4x6MEIGA1UdEQQ7MDmC
-D2lkcC50YXNrLmdkYS5wbIYmaHR0cHM6Ly9pZHAudGFzay5nZGEucGwvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAE5rcoiYYQN8cSqmRXD6q301rqnB
-PPmwTS9auHQkqTGMezpPV+UK5PLR8MxGKOs5XHxo+klixekYti0VgqBKpO+c9Jsh
-5TM62+mePv9SJL0YapvgzQcXSdfTuR0QTDKLoS/aUSwO5yR8PDf5JOdTspygfrzx
-R5rWGWSCMoq/sl687jlylzovRLzQn6opFKoeXlBIBwWdZCG/CNwq3DQeMCWrkgt9
-rUkBt8hYMPOjHcJx2nl+2Ue6vcevZkudqxBpV5tpioX6Q2F/XsQCiCYpGue9aWcQ
-g12oVQa4JuIHhKSmvZfVZIu1QfcMadj27vchQXWqttvarQO7NWRRimE9OII=
-                        </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>
-MIIDJzCCAg+gAwIBAgIUH/PXFUwlqT8+OMaMthWJ3kkOYJ0wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMB4XDTE1MDQwMzA4Mzk1N1oX
-DTM1MDQwMzA4Mzk1N1owGjEYMBYGA1UEAwwPaWRwLnRhc2suZ2RhLnBsMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnxLDEWcL+qc///wbesB7tizhsqMi
-Ub8s8+dbJkFvWl4htkzfiHi76L+M7L4eXfv1gsgdNXk0mm1kZWa/6XafDPy80zkL
-4ro4UH46LXOu8wMeoy6eLeJDlurX+CzFbPiGdx1FqQF1QIU8jf1bBS7OhpYJ7Ex6
-q7iM/VU2j5i8momKTk4Ktsc+GaVXeO9CWjOb2+U2QNoVxXYX+8NJNcQXyIIxir00
-3e4pl8W7WPxPBz0Ex/+xJPzb75qrSjx9YfadzfE3uoyGomOzODRodOszSSUXnd4J
-cdRZKdA+R8xUZnctuUncLaMUopg3SoBE3VIyl99mvQkmk/Skue4o0PJqoQIDAQAB
-o2UwYzAdBgNVHQ4EFgQUeUfa/bgMdBy0o6JP0hLwgNSuXNowQgYDVR0RBDswOYIP
-aWRwLnRhc2suZ2RhLnBshiZodHRwczovL2lkcC50YXNrLmdkYS5wbC9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAaXFnZPlBAehUrHnfb3TU61b2J+y3
-8ng8l1tzFa/3g7aDTlYxVV9RHrz48mLt23n1LPz90wAixCQKgSqt3jaCqeH59Uaj
-xNUZwqDJJqRZB5a/7z6OEBSeQiKnc3H1PjgdrtgWPgEdvoC+ggGYsbitLdZ+455t
-Dg/6nZ/C6vt40XtJyBMXB8HA4na6IXAFRzr++6QmG4ib8umoPS20cCT2sSUtpz7S
-h1QrFPZQWQRe67fPZlX2aOyu8h5OrEhGoyS95BW/2Hw+nWJFvkn5H12/YYW65qTJ
-/TMpaKEsJ2bRiqVKhW5kntRDcca3KqqIiZ+g4102DKmk44R/y8Yjk9BIxg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.task.gda.pl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Academic Computer Center TASK in Gdansk</md:OrganizationName>
-    <md:OrganizationName xml:lang="pl">Centrum Informatyczne TASK w Gdańsku</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Academic Computer Center TASK in Gdansk</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">Centrum Informatyczne TASK w Gdańsku</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.task.gda.pl</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AAI</md:GivenName>
-    <md:SurName>TASK</md:SurName>
-    <md:EmailAddress>mailto:aai@task.gda.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tavistockandportman.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tavistockandportman.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 6bafe1c2..00000000
--- a/swamid-interfederations-2.0/idp.tavistockandportman.ac.uk-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.tavistockandportman.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Tavistock and Portman NHS Foundation Trust.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">tavistockandportman.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDljCCAn4CCQC25DQCsFybpjANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMTMwMQYDVQQKDCpU
-						YXZpc3RvY2sgYW5kIFBvcnRtYW4gTkhTIEZvdW5kYXRpb24gVHJ1c3QxJjAkBgNV
-						BAMMHWlkcC50YXZpc3RvY2thbmRwb3J0bWFuLmFjLnVrMB4XDTEyMDYyMjA4NDcw
-						MFoXDTMyMDYxNzA4NDcwMFowgYwxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIDAZMb25k
-						b24xDzANBgNVBAcMBkxvbmRvbjEzMDEGA1UECgwqVGF2aXN0b2NrIGFuZCBQb3J0
-						bWFuIE5IUyBGb3VuZGF0aW9uIFRydXN0MSYwJAYDVQQDDB1pZHAudGF2aXN0b2Nr
-						YW5kcG9ydG1hbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ALaORMj2PIj4Nccnr5Qtz0aeSgHMOff3ExVO/4gX+hDpGampkME22nOfYB6uFT7V
-						koU5pQn1kEenWPdFx6pyDimK9iK7i7Vl5di7L8DYZbPtnRfO7J1ZQI/NpR7ivZdW
-						78EkIvx+mweAg0DTSNKbP6FVrTI7b95qwmfaabPECorDwUq8urP5keITNIo+Amcm
-						xwVECLUYUYtivommlQsY8zfUpuKWRnBnINKL29IWWbRdNLOsR0MMTneOtGlRBOgl
-						HeVsd6NRnMNayUrYrVGcxCZCA+G4KLEY7RUy23Xw0zfgGgBg5q9lWuB4eOboHd9b
-						LoVSYHQP9syEzbhyV/CXZgsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAi8ISBQ1z
-						HpD7czu+OrPV3379rSOWTAeASEcgY2ugJW1oEOq6sQlH1wD2vpWRp5TY8XvLhmwD
-						md7iBNR+X2wY5VPQsyWbp8DJsG9mKwAkM6XBY2/E56wvo6eobIXmCFtPPEgERyRf
-						jILYvxnwb5yNkzabPrBM287pWMt40EZV+HZBNqf95M863bgRl7SDoMzO+SFkkIwJ
-						RcJykK333j5BFRLgRgwAUuISKxxKbgvMg8T4nh4jIM+YlYahegLF/GHCw3ZWG2Dk
-						U3WmqCxuVXB1U2JfCO/egPOZr1R7tq1+3VMlPmpZMb8pMiLwXqJxU+niwzX8L6Gw
-						ZmOU0wEwiWOMxw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tavistockandportman.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tavistockandportman.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.tavistockandportman.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tavistockandportman.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tavistockandportman.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tavistockandportman.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">tavistockandportman.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDljCCAn4CCQC25DQCsFybpjANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMTMwMQYDVQQKDCpU
-						YXZpc3RvY2sgYW5kIFBvcnRtYW4gTkhTIEZvdW5kYXRpb24gVHJ1c3QxJjAkBgNV
-						BAMMHWlkcC50YXZpc3RvY2thbmRwb3J0bWFuLmFjLnVrMB4XDTEyMDYyMjA4NDcw
-						MFoXDTMyMDYxNzA4NDcwMFowgYwxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIDAZMb25k
-						b24xDzANBgNVBAcMBkxvbmRvbjEzMDEGA1UECgwqVGF2aXN0b2NrIGFuZCBQb3J0
-						bWFuIE5IUyBGb3VuZGF0aW9uIFRydXN0MSYwJAYDVQQDDB1pZHAudGF2aXN0b2Nr
-						YW5kcG9ydG1hbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ALaORMj2PIj4Nccnr5Qtz0aeSgHMOff3ExVO/4gX+hDpGampkME22nOfYB6uFT7V
-						koU5pQn1kEenWPdFx6pyDimK9iK7i7Vl5di7L8DYZbPtnRfO7J1ZQI/NpR7ivZdW
-						78EkIvx+mweAg0DTSNKbP6FVrTI7b95qwmfaabPECorDwUq8urP5keITNIo+Amcm
-						xwVECLUYUYtivommlQsY8zfUpuKWRnBnINKL29IWWbRdNLOsR0MMTneOtGlRBOgl
-						HeVsd6NRnMNayUrYrVGcxCZCA+G4KLEY7RUy23Xw0zfgGgBg5q9lWuB4eOboHd9b
-						LoVSYHQP9syEzbhyV/CXZgsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAi8ISBQ1z
-						HpD7czu+OrPV3379rSOWTAeASEcgY2ugJW1oEOq6sQlH1wD2vpWRp5TY8XvLhmwD
-						md7iBNR+X2wY5VPQsyWbp8DJsG9mKwAkM6XBY2/E56wvo6eobIXmCFtPPEgERyRf
-						jILYvxnwb5yNkzabPrBM287pWMt40EZV+HZBNqf95M863bgRl7SDoMzO+SFkkIwJ
-						RcJykK333j5BFRLgRgwAUuISKxxKbgvMg8T4nh4jIM+YlYahegLF/GHCw3ZWG2Dk
-						U3WmqCxuVXB1U2JfCO/egPOZr1R7tq1+3VMlPmpZMb8pMiLwXqJxU+niwzX8L6Gw
-						ZmOU0wEwiWOMxw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tavistockandportman.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tavistockandportman.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">Tavistock and Portman NHS Foundation Trust</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Tavistock and Portman NHS Foundation Trust</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tavistockandportman.nhs.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:library@tavi-port.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Andre</SurName>
-    <EmailAddress>mailto:candre@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tcat.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.tcat.ac.uk-oala-metadata.xml
deleted file mode 100644
index fa460b70..00000000
--- a/swamid-interfederations-2.0/idp.tcat.ac.uk-oala-metadata.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.tcat.ac.uk/oala/metadata">
-  <!--
-		This is an IdP for Telford College of Arts and Technology.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:19:55Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">tcat.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaDCCAlCgAwIBAgIIWpJECkilqdowDQYJKoZIhvcNAQEFBQAwSzEvMC0GA1UE
-						CgwmVGVsZm9yZCBDb2xsZWdlIG9mIEFydHMgYW5kIFRlY2hub2xvZ3kxGDAWBgNV
-						BAMMD2lkcDIudGNhdC5hYy51azAeFw0xMzA4MjAxMTI0MzBaFw0yMzA4MjAxMTI0
-						MzBaMEsxLzAtBgNVBAoMJlRlbGZvcmQgQ29sbGVnZSBvZiBBcnRzIGFuZCBUZWNo
-						bm9sb2d5MRgwFgYDVQQDDA9pZHAyLnRjYXQuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCM6yXyJFdoHtZY/JvyoKUBBRpn6+9ciHnrgfSRvxk1
-						IrR2yEI/2uKOQXj7XPbRooV5zDSmVNgi5PCqX2mGrsK7TvGm7ErDiPzTo3wZ+d6M
-						gK6eFyPF+zCFdN+bq6EUnJbNVxJx03m7bmEa9tj732wCQiRnFYYvY0SCgmCcQE4p
-						/Pv/fWn2lsht+grH+bYQapvhHZKM47LH9CwGnNsIoEiWN5Xe7WExePoWauYjZPHI
-						3bNh7TKAnUEqDU5bTslo8+TSGXAV4PbjV3pMrpHWX4Q6PyqVL0QqbnyPdhnw5CQO
-						3rSunhabwfrvmonKqm75ncxgR8hj4T4V+7ThOv6TPiJTAgMBAAGjUDBOMB0GA1Ud
-						DgQWBBTsqWb0IynqtvhffnZEQcX9kyo0tzAfBgNVHSMEGDAWgBTsqWb0Iynqtvhf
-						fnZEQcX9kyo0tzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAbBH4t
-						ioCdwNeszwXFNJmALyEM/yNt1hcz7QB0uJ8vNKSIMAUnj9mbVNSeQ8Xinud7ddfV
-						rZIsmGroOQU1mCJOTz0bILevkqcuKF3UVlORGDebwmhZLYFeTJoF398MjmPbEHDI
-						hc8rggLnfS++ynld8+UleByLNsoBd0wJf/SChKVMIcVFwp9t+HU2RPi+teT6J5Jy
-						AHwJeql0aDMWoj/8OoSWqgLmHpKa2WxxPAeHvfRUu6rx5Dz6zC6BY1tKtOLhkNDK
-						9DANze22JZYifGoRdEMDk7ImP2+5xovLwLFGUsGbphwEPqHUImBaaqRdsFMf/XU/
-						d5E8PskK9e0xXhXv
-					</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>
-						MIIDaDCCAlCgAwIBAgIIWpJECkilqdowDQYJKoZIhvcNAQEFBQAwSzEvMC0GA1UE
-						CgwmVGVsZm9yZCBDb2xsZWdlIG9mIEFydHMgYW5kIFRlY2hub2xvZ3kxGDAWBgNV
-						BAMMD2lkcDIudGNhdC5hYy51azAeFw0xMzA4MjAxMTI0MzBaFw0yMzA4MjAxMTI0
-						MzBaMEsxLzAtBgNVBAoMJlRlbGZvcmQgQ29sbGVnZSBvZiBBcnRzIGFuZCBUZWNo
-						bm9sb2d5MRgwFgYDVQQDDA9pZHAyLnRjYXQuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCM6yXyJFdoHtZY/JvyoKUBBRpn6+9ciHnrgfSRvxk1
-						IrR2yEI/2uKOQXj7XPbRooV5zDSmVNgi5PCqX2mGrsK7TvGm7ErDiPzTo3wZ+d6M
-						gK6eFyPF+zCFdN+bq6EUnJbNVxJx03m7bmEa9tj732wCQiRnFYYvY0SCgmCcQE4p
-						/Pv/fWn2lsht+grH+bYQapvhHZKM47LH9CwGnNsIoEiWN5Xe7WExePoWauYjZPHI
-						3bNh7TKAnUEqDU5bTslo8+TSGXAV4PbjV3pMrpHWX4Q6PyqVL0QqbnyPdhnw5CQO
-						3rSunhabwfrvmonKqm75ncxgR8hj4T4V+7ThOv6TPiJTAgMBAAGjUDBOMB0GA1Ud
-						DgQWBBTsqWb0IynqtvhffnZEQcX9kyo0tzAfBgNVHSMEGDAWgBTsqWb0Iynqtvhf
-						fnZEQcX9kyo0tzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAbBH4t
-						ioCdwNeszwXFNJmALyEM/yNt1hcz7QB0uJ8vNKSIMAUnj9mbVNSeQ8Xinud7ddfV
-						rZIsmGroOQU1mCJOTz0bILevkqcuKF3UVlORGDebwmhZLYFeTJoF398MjmPbEHDI
-						hc8rggLnfS++ynld8+UleByLNsoBd0wJf/SChKVMIcVFwp9t+HU2RPi+teT6J5Jy
-						AHwJeql0aDMWoj/8OoSWqgLmHpKa2WxxPAeHvfRUu6rx5Dz6zC6BY1tKtOLhkNDK
-						9DANze22JZYifGoRdEMDk7ImP2+5xovLwLFGUsGbphwEPqHUImBaaqRdsFMf/XU/
-						d5E8PskK9e0xXhXv
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.tcat.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.tcat.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Telford College of Arts and Technology</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Telford College of Arts &amp; Technology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tcat.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Anne</GivenName>
-    <SurName>Jackson</SurName>
-    <EmailAddress>mailto:anne.jackson@tcat.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jon</GivenName>
-    <SurName>Jebb</SurName>
-    <EmailAddress>mailto:jon.jebb@tcat.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tcat.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.tcat.ac.uk-shibboleth.xml
deleted file mode 100644
index a98bf095..00000000
--- a/swamid-interfederations-2.0/idp.tcat.ac.uk-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" entityID="https://idp.tcat.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Telford College of Arts and Technology.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-05T15:44: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">tcat.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEADCCAugCCQCwjoaBYKCfJzANBgkqhkiG9w0BAQUFADCBwTELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgTClNocm9wc2hpcmUxEDAOBgNVBAcTB1RlbGZvcmQxLTArBgNV
-						BAoMJFRlbGZvcmQgQ29sbGVnZSBvZiBBcnRzICYgVGVjaG5vbG9neTEaMBgGA1UE
-						CxMRQ29tcHV0ZXIgU2VydmljZXMxFzAVBgNVBAMTDmlkcC50Y2F0LmFjLnVrMScw
-						JQYJKoZIhvcNAQkBFhhwYXVsLmZsYW5kZXJzQHRjYXQuYWMudWswHhcNMTQwNzE1
-						MTUxMzE1WhcNMjQwNzEyMTUxMzE1WjCBwTELMAkGA1UEBhMCR0IxEzARBgNVBAgT
-						ClNocm9wc2hpcmUxEDAOBgNVBAcTB1RlbGZvcmQxLTArBgNVBAoMJFRlbGZvcmQg
-						Q29sbGVnZSBvZiBBcnRzICYgVGVjaG5vbG9neTEaMBgGA1UECxMRQ29tcHV0ZXIg
-						U2VydmljZXMxFzAVBgNVBAMTDmlkcC50Y2F0LmFjLnVrMScwJQYJKoZIhvcNAQkB
-						FhhwYXVsLmZsYW5kZXJzQHRjYXQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQDwEPad4kYnJdollfR+J9PakClAmKbQKKHQt5gTIotM/5YWnQKv
-						MuNgZmBlgP4u5j7HcI2x3GHt6SD8PDrhACRnHUlVAOsH7AtkHpzX0k5Lawes8DBV
-						JmCMwUOSoboO3Kf4Niu0fzMJ2ou+Cwz7JXrV6KjJP4GgkakZIgG6ntpRsY7X3zPU
-						b5GaSsC2boxY3snewwnFQ/yg5EleBo3hvAr0WzN+pu2UsG0kRd1GdMIPf32XWl8o
-						V9+ZzDqxVjzJNHGfaelo6+1oOVubEg4TFUVLC0QyMhMx94tz2Yi7sKItonzrzrVq
-						HcHtKA41ZpCYlgV5wxXJ7QVVgGene/ietIbVAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggEBAAHHT1eun1pip4eal05s9EaRBXrSAhE9+qrUNpw26FwTqMdVuwHzadYD1OAy
-						NIj9Kvzb0Beg5cDbvKZwVZGJq2ggEN2OBe8jEfOpDdAySaPFPGqtjpK+prpN5Tos
-						y5FK+4RzszXAi4gw4Nt/q90FN3tjWOkCzqGohCY2MSfSoLWig6kpJg0Hew7OAIKP
-						ncwOyF72tR6YpC2b0ME1yCVQfZ8u/lYtK+CiYQJmtVews1EVylbh6tAJukMyaaCv
-						SmmiXVquChnW/ZIR4PTlFYkt+rJ7DklXcka6iAj9JimdVhvtejcsnLufxA3tcvwN
-						SpAzJUepxnhluW2OGgk/PxNhR+c=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tcat.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tcat.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.tcat.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tcat.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tcat.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tcat.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">tcat.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEADCCAugCCQCwjoaBYKCfJzANBgkqhkiG9w0BAQUFADCBwTELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgTClNocm9wc2hpcmUxEDAOBgNVBAcTB1RlbGZvcmQxLTArBgNV
-						BAoMJFRlbGZvcmQgQ29sbGVnZSBvZiBBcnRzICYgVGVjaG5vbG9neTEaMBgGA1UE
-						CxMRQ29tcHV0ZXIgU2VydmljZXMxFzAVBgNVBAMTDmlkcC50Y2F0LmFjLnVrMScw
-						JQYJKoZIhvcNAQkBFhhwYXVsLmZsYW5kZXJzQHRjYXQuYWMudWswHhcNMTQwNzE1
-						MTUxMzE1WhcNMjQwNzEyMTUxMzE1WjCBwTELMAkGA1UEBhMCR0IxEzARBgNVBAgT
-						ClNocm9wc2hpcmUxEDAOBgNVBAcTB1RlbGZvcmQxLTArBgNVBAoMJFRlbGZvcmQg
-						Q29sbGVnZSBvZiBBcnRzICYgVGVjaG5vbG9neTEaMBgGA1UECxMRQ29tcHV0ZXIg
-						U2VydmljZXMxFzAVBgNVBAMTDmlkcC50Y2F0LmFjLnVrMScwJQYJKoZIhvcNAQkB
-						FhhwYXVsLmZsYW5kZXJzQHRjYXQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQDwEPad4kYnJdollfR+J9PakClAmKbQKKHQt5gTIotM/5YWnQKv
-						MuNgZmBlgP4u5j7HcI2x3GHt6SD8PDrhACRnHUlVAOsH7AtkHpzX0k5Lawes8DBV
-						JmCMwUOSoboO3Kf4Niu0fzMJ2ou+Cwz7JXrV6KjJP4GgkakZIgG6ntpRsY7X3zPU
-						b5GaSsC2boxY3snewwnFQ/yg5EleBo3hvAr0WzN+pu2UsG0kRd1GdMIPf32XWl8o
-						V9+ZzDqxVjzJNHGfaelo6+1oOVubEg4TFUVLC0QyMhMx94tz2Yi7sKItonzrzrVq
-						HcHtKA41ZpCYlgV5wxXJ7QVVgGene/ietIbVAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggEBAAHHT1eun1pip4eal05s9EaRBXrSAhE9+qrUNpw26FwTqMdVuwHzadYD1OAy
-						NIj9Kvzb0Beg5cDbvKZwVZGJq2ggEN2OBe8jEfOpDdAySaPFPGqtjpK+prpN5Tos
-						y5FK+4RzszXAi4gw4Nt/q90FN3tjWOkCzqGohCY2MSfSoLWig6kpJg0Hew7OAIKP
-						ncwOyF72tR6YpC2b0ME1yCVQfZ8u/lYtK+CiYQJmtVews1EVylbh6tAJukMyaaCv
-						SmmiXVquChnW/ZIR4PTlFYkt+rJ7DklXcka6iAj9JimdVhvtejcsnLufxA3tcvwN
-						SpAzJUepxnhluW2OGgk/PxNhR+c=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tcat.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tcat.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">Telford College of Arts and Technology</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Telford College of Arts &amp; Technology (old)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tcat.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Flanders</SurName>
-    <EmailAddress>mailto:Paul.Flanders@tcat.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Flanders</SurName>
-    <EmailAddress>mailto:Paul.Flanders@tcat.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teiath.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teiath.gr-idp-shibboleth.xml
deleted file mode 100644
index 7efd378b..00000000
--- a/swamid-interfederations-2.0/idp.teiath.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teiath.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">career.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ee.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ga.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gd.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">da.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fo.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lb.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ba.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ma.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">te.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hc.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xr.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hv.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ot.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ae.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ml.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">he.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nub.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nua.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">na.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mi.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">op.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dt.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sw.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gms.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ft.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cw.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tg.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">et.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bme.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mat.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pcm.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rdtl.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ca.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tk.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">survey.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">library.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">study.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.teiath.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Technological Educational Institute of Athens</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Αθήνας</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.teiath.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.teiath.gr/</mdui:InformationURL>
-        <mdui:Logo height="111" width="113">https://idp.teiath.gr/logos/mdui_teiath_logo_111_113.png</mdui:Logo>
-        <mdui:Logo height="65" width="66">https://idp.teiath.gr/logos/mdui_teiath_logo_65_66.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>teiath.gr</mdui:DomainHint>
-        <mdui:IPHint>195.130.96.0/20</mdui:IPHint>
-        <mdui:IPHint>2001:648:2330::/48</mdui:IPHint>
-        <mdui:IPHint>83.212.64.0/22</mdui:IPHint>
-        <mdui:GeolocationHint>geo:38.004213, 23.676573</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDIDCCAgigAwIBAgIVANDknRDhjuiWDcvevty921p7NnzwMA0GCSqGSIb3DQEB
-                            BQUAMBgxFjAUBgNVBAMTDWlkcC50ZWlhdGguZ3IwHhcNMTEwNjI3MTAxNTQ5WhcN
-                            MTQwNjI3MTAxNTQ5WjAYMRYwFAYDVQQDEw1pZHAudGVpYXRoLmdyMIIBIjANBgkq
-                            hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijWRc+kII+oq2WEAUGbGq659IdqOTOTN
-                            aGHqmcEUdyhwNUuW2WtwAfmy2TQN/RWtCdASDr6MV/nndjE8WXnMfVGMLYj15VYW
-                            /3hzH94z2oDA11F60pnq6uFhCOZzs/dySWhnTsdWg4cREv/pXloKj+vbZzLvxs1M
-                            aW5OkePgZGe874bqyxxeNNwhUHsrfGpfqPlYdmmq/zDg2ieZrdGO3Ne5m9q2KpGE
-                            R3y2IfJ8adZPicTTAgnO4E93HyooCkmLphFqDmKWuuHxA0ENmEbkJDkwWHq5SbhM
-                            sgpnCOCwQEEm2ekQ8P7MlkPIBd2OoZewxsgN/0z78hmL/k6QvVjhIwIDAQABo2Ew
-                            XzA+BgNVHREENzA1gg1pZHAudGVpYXRoLmdyhiRodHRwczovL2lkcC50ZWlhdGgu
-                            Z3IvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEZG8lJARxk7jKPc3ss+/dODzVwK
-                            MA0GCSqGSIb3DQEBBQUAA4IBAQAwB33HB1tj71ainPocK3g+EAgP4rgiqSi8rCbK
-                            DB5HuoGzzCSA1kiclqSX+QRMvczm96jE7BCo6vUE2MHkn3RoMmkwqcfgSBS+2iJk
-                            SD1RStiMt3skImM7Bi7YFij57hoQwFPFP8N28IQWQu+a/03lejJYOnyGY835UAky
-                            NhdPfnZs7aPdpvxTOlrIOA9hbYbSP9Ekn4rnz9elh4arBK8J1MI2noWUETwuql2L
-                            srQ1qv7RvWlqqd+U8R1yBKmfMwFAlbhkeSWR0bNMMcmrQD27CsfeNpwPvq8dXxj7
-                            MPub/eEjjeLkVO3S+81GhuhW+xOnL7iTOO/A6L09KSbpCZMD
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teiath.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teiath.gr: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.teiath.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teiath.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teiath.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teiath.gr/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">teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">career.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ee.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ga.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gd.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">da.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fo.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lb.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ba.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ma.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">te.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hc.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xr.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hv.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ot.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ae.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ml.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">he.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nub.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nua.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">na.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mi.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">op.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dt.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sw.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gms.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ft.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cw.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tg.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">et.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bme.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mat.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pcm.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rdtl.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ca.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tk.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">survey.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">library.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">study.teiath.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.teiath.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDIDCCAgigAwIBAgIVANDknRDhjuiWDcvevty921p7NnzwMA0GCSqGSIb3DQEB
-                            BQUAMBgxFjAUBgNVBAMTDWlkcC50ZWlhdGguZ3IwHhcNMTEwNjI3MTAxNTQ5WhcN
-                            MTQwNjI3MTAxNTQ5WjAYMRYwFAYDVQQDEw1pZHAudGVpYXRoLmdyMIIBIjANBgkq
-                            hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijWRc+kII+oq2WEAUGbGq659IdqOTOTN
-                            aGHqmcEUdyhwNUuW2WtwAfmy2TQN/RWtCdASDr6MV/nndjE8WXnMfVGMLYj15VYW
-                            /3hzH94z2oDA11F60pnq6uFhCOZzs/dySWhnTsdWg4cREv/pXloKj+vbZzLvxs1M
-                            aW5OkePgZGe874bqyxxeNNwhUHsrfGpfqPlYdmmq/zDg2ieZrdGO3Ne5m9q2KpGE
-                            R3y2IfJ8adZPicTTAgnO4E93HyooCkmLphFqDmKWuuHxA0ENmEbkJDkwWHq5SbhM
-                            sgpnCOCwQEEm2ekQ8P7MlkPIBd2OoZewxsgN/0z78hmL/k6QvVjhIwIDAQABo2Ew
-                            XzA+BgNVHREENzA1gg1pZHAudGVpYXRoLmdyhiRodHRwczovL2lkcC50ZWlhdGgu
-                            Z3IvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEZG8lJARxk7jKPc3ss+/dODzVwK
-                            MA0GCSqGSIb3DQEBBQUAA4IBAQAwB33HB1tj71ainPocK3g+EAgP4rgiqSi8rCbK
-                            DB5HuoGzzCSA1kiclqSX+QRMvczm96jE7BCo6vUE2MHkn3RoMmkwqcfgSBS+2iJk
-                            SD1RStiMt3skImM7Bi7YFij57hoQwFPFP8N28IQWQu+a/03lejJYOnyGY835UAky
-                            NhdPfnZs7aPdpvxTOlrIOA9hbYbSP9Ekn4rnz9elh4arBK8J1MI2noWUETwuql2L
-                            srQ1qv7RvWlqqd+U8R1yBKmfMwFAlbhkeSWR0bNMMcmrQD27CsfeNpwPvq8dXxj7
-                            MPub/eEjjeLkVO3S+81GhuhW+xOnL7iTOO/A6L09KSbpCZMD
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teiath.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teiath.gr: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">Technological Educational Institute of Athens</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Αθήνας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Athens</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Αθήνας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.teiath.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.teiath.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Technological Educational Institute of Athens NOC</md:Company>
-    <md:EmailAddress>noc@teiath.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Technological Educational Institute of Athens Helpdesk</md:Company>
-    <md:EmailAddress>helpdesk@teiath.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-210-5385149</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teicrete.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teicrete.gr-idp-shibboleth.xml
deleted file mode 100644
index a8a9a7b2..00000000
--- a/swamid-interfederations-2.0/idp.teicrete.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teicrete.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">teicrete.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.teicrete.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chania.teicrete.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staff.teicrete.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmc.teicrete.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epp.teicrete.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.teicrete.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDHDCCAgSgAwIBAgIJAIL7nMA9vRODMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-                            BAMTD2lkcC50ZWljcmV0ZS5ncjAeFw0xNDA0MTAxNTQ2NDlaFw0xOTEwMDExNTQ2
-                            NDlaMBoxGDAWBgNVBAMTD2lkcC50ZWljcmV0ZS5ncjCCASIwDQYJKoZIhvcNAQEB
-                            BQADggEPADCCAQoCggEBAL+XJx6luxBMILP1Fhne5BNBkBDtRCXKbWMbZ23Y9RQU
-                            AiaKYudm0Iv1BYLhl/S+tNQzqNJuMhgrQohsA60y2zfZ1yfsIUQkzynZ5PicyY9J
-                            f24GbIXQbzzM7axr/485VoMsQ4CXoMHdl6/1k/96ZmmHkd7iihjL7tAP7Dr7Ir8z
-                            IIUdkJbCcDPBwC/Vt+s6r6ut9f5Tt/ZvzByoJlmt5JFW/NQ8qlLx3JTalf5aQQIX
-                            ARIf+c78WSqYrLga+4V7g9oiwojOsl8p3fmPqnIvWn8erCQFnd1ygscaiPbkTzYl
-                            n/haRW3/ALiF/uy8PHwbdYCkRww9tidlb/jZ2e23sqcCAwEAAaNlMGMwQgYDVR0R
-                            BDswOYIPaWRwLnRlaWNyZXRlLmdyhiZodHRwczovL2lkcC50ZWljcmV0ZS5nci9p
-                            ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUH4T1XBWWqDwvXJkpM1ocnGJJp+QwDQYJ
-                            KoZIhvcNAQEFBQADggEBAIsKG1Zto879oq2g0+QhUGuPi2JeB6CesyI+Ey/yxflm
-                            WvLndZVTd7NGzLBskyIZhaHcxGlWsxWzqMRGUzKctqHfjp0q16gBs8svuGlrpy2l
-                            FIZ+prAhPR9R0xLRGevFOd9WbaSXX41u1o8KWCsUVKLWfR8bc+Mz61Ujd+8X6meg
-                            LVMCOFMBp7YVze8y53lYYDhwh4iGNAOZ1KNgdFxbB4vLDCdCvdmRDnlg0uzAsAv5
-                            wWXCU5mHjk5tflcoFeQb6t9U97O62wXqfngJhbLoC8slL5btHwywdds9azTnYir1
-                            5cjli40qHZcQIA/zp9rcWC4ZgUJefHCQM62M6DuQpWU=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teicrete.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teicrete.gr: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.teicrete.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teicrete.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teicrete.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teicrete.gr/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">teicrete.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.teicrete.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chania.teicrete.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staff.teicrete.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmc.teicrete.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">epp.teicrete.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.teicrete.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDHDCCAgSgAwIBAgIJAIL7nMA9vRODMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-                            BAMTD2lkcC50ZWljcmV0ZS5ncjAeFw0xNDA0MTAxNTQ2NDlaFw0xOTEwMDExNTQ2
-                            NDlaMBoxGDAWBgNVBAMTD2lkcC50ZWljcmV0ZS5ncjCCASIwDQYJKoZIhvcNAQEB
-                            BQADggEPADCCAQoCggEBAL+XJx6luxBMILP1Fhne5BNBkBDtRCXKbWMbZ23Y9RQU
-                            AiaKYudm0Iv1BYLhl/S+tNQzqNJuMhgrQohsA60y2zfZ1yfsIUQkzynZ5PicyY9J
-                            f24GbIXQbzzM7axr/485VoMsQ4CXoMHdl6/1k/96ZmmHkd7iihjL7tAP7Dr7Ir8z
-                            IIUdkJbCcDPBwC/Vt+s6r6ut9f5Tt/ZvzByoJlmt5JFW/NQ8qlLx3JTalf5aQQIX
-                            ARIf+c78WSqYrLga+4V7g9oiwojOsl8p3fmPqnIvWn8erCQFnd1ygscaiPbkTzYl
-                            n/haRW3/ALiF/uy8PHwbdYCkRww9tidlb/jZ2e23sqcCAwEAAaNlMGMwQgYDVR0R
-                            BDswOYIPaWRwLnRlaWNyZXRlLmdyhiZodHRwczovL2lkcC50ZWljcmV0ZS5nci9p
-                            ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUH4T1XBWWqDwvXJkpM1ocnGJJp+QwDQYJ
-                            KoZIhvcNAQEFBQADggEBAIsKG1Zto879oq2g0+QhUGuPi2JeB6CesyI+Ey/yxflm
-                            WvLndZVTd7NGzLBskyIZhaHcxGlWsxWzqMRGUzKctqHfjp0q16gBs8svuGlrpy2l
-                            FIZ+prAhPR9R0xLRGevFOd9WbaSXX41u1o8KWCsUVKLWfR8bc+Mz61Ujd+8X6meg
-                            LVMCOFMBp7YVze8y53lYYDhwh4iGNAOZ1KNgdFxbB4vLDCdCvdmRDnlg0uzAsAv5
-                            wWXCU5mHjk5tflcoFeQb6t9U97O62wXqfngJhbLoC8slL5btHwywdds9azTnYir1
-                            5cjli40qHZcQIA/zp9rcWC4ZgUJefHCQM62M6DuQpWU=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teicrete.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teicrete.gr: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="en">Technological Educational Institute of Crete</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Κρήτης</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Crete</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Κρήτης</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.teicrete.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.teicrete.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>TEI of Crete Network Management Center</md:SurName>
-    <md:EmailAddress>noc@teicrete.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml
deleted file mode 100644
index 4c565f6c..00000000
--- a/swamid-interfederations-2.0/idp.teikav.edu.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teikav.edu.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">teikav.edu.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Technological Educational Institute of Eastern Macedonia and Thrace</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.teiemt.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.teiemt.gr/</mdui:InformationURL>
-        <mdui:Logo width="83" height="83">https://idp.teikav.edu.gr/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.130.92.0/23</mdui:IPHint>
-        <mdui:IPHint>195.130.94.0/24</mdui:IPHint>
-        <mdui:IPHint>83.212.92.0/23</mdui:IPHint>
-        <mdui:IPHint>83.212.94.0/24</mdui:IPHint>
-        <mdui:DomainHint>noc.teiemt.gr</mdui:DomainHint>
-        <mdui:DomainHint>teiemt.gr</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:40.9286958,24.3794714,137</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>
-                            MIIEbzCCA1egAwIBAgIQFNuyHJki9S+B7LCfm+TiGDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDYyNjAwMDAwMFoXDTE2MDYyNTIzNTk1OVowPzEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAudGVpa2F2
-                            LmVkdS5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+MrpJsmJnM
-                            T063+RAOnzCcXQ9r5wHym1ZtKoB3FKp2tod++p7YTPk9MoySyffsV0ongHfluMVA
-                            GD2V+TbsbO177yM4t1WIpiuxKT5WlEN+kDkkM5qkYSN+FxD8GH1V2mA/oDf//bDv
-                            EEhRM1Qz3OjMe+Tjt023IETpHQieB3uSiE4vRRro2togvwglTahkNg7Bl4ND7kwu
-                            BXkSsEkshJhZ7hu9zYOX1/fmVA3HCY5MQVm/A8hPoi0vPPU0M75Nrr/gcjayUHCI
-                            bXG2Ihx2dNt6bHIH24JQJQ8NXHJ753oGSX/3/R/umw1fC82cU09ZyXCUh7qU58aQ
-                            AEtoy3zTmUMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-                            R+qQ47ntMB0GA1UdDgQWBBTdMGbpA6aMekTpX31WvVX+SYiogzAOBgNVHQ8BAf8E
-                            BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-                            AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-                            MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-                            cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-                            ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-                            c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLnRlaWthdi5lZHUuZ3Iw
-                            DQYJKoZIhvcNAQEFBQADggEBADMm0AmxzrM7mkGHavjT+huoHYy+y+eyOb9/WZ+M
-                            vVoolVQZsbh0AhYBAtDXUg+jJzTIQDZeNg63HqmXJ8uK8If9pjsb6iFUsRYvSGAF
-                            IzcnI11OfTlsEuFGpO1MxBAIlGq2/CtJPy/1Zi2LnK3Ci2kdjCyv5dTbICxa7iuW
-                            XVFBPXrWGtod3YGSwe0qBRCGxAhFX0ea6zM/r6rA4yPFlQkC9UUaN1ITZJyTbXAB
-                            9Gd9S8+S7i0jUNHK6iGX9EvV5VmjpzMY6/vdhoGpc+xuC0bX1Gjsml4HmcIrq25p
-                            VkLGD8nhv01wEmNMTmDawlDlIxUq3l/cK/GuJL/8lVGLOjk=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikav.edu.gr: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.teikav.edu.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teikav.edu.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teikav.edu.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teikav.edu.gr/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">teikav.edu.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEbzCCA1egAwIBAgIQFNuyHJki9S+B7LCfm+TiGDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDYyNjAwMDAwMFoXDTE2MDYyNTIzNTk1OVowPzEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAudGVpa2F2
-                            LmVkdS5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+MrpJsmJnM
-                            T063+RAOnzCcXQ9r5wHym1ZtKoB3FKp2tod++p7YTPk9MoySyffsV0ongHfluMVA
-                            GD2V+TbsbO177yM4t1WIpiuxKT5WlEN+kDkkM5qkYSN+FxD8GH1V2mA/oDf//bDv
-                            EEhRM1Qz3OjMe+Tjt023IETpHQieB3uSiE4vRRro2togvwglTahkNg7Bl4ND7kwu
-                            BXkSsEkshJhZ7hu9zYOX1/fmVA3HCY5MQVm/A8hPoi0vPPU0M75Nrr/gcjayUHCI
-                            bXG2Ihx2dNt6bHIH24JQJQ8NXHJ753oGSX/3/R/umw1fC82cU09ZyXCUh7qU58aQ
-                            AEtoy3zTmUMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-                            R+qQ47ntMB0GA1UdDgQWBBTdMGbpA6aMekTpX31WvVX+SYiogzAOBgNVHQ8BAf8E
-                            BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-                            AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-                            MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-                            cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-                            ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-                            c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLnRlaWthdi5lZHUuZ3Iw
-                            DQYJKoZIhvcNAQEFBQADggEBADMm0AmxzrM7mkGHavjT+huoHYy+y+eyOb9/WZ+M
-                            vVoolVQZsbh0AhYBAtDXUg+jJzTIQDZeNg63HqmXJ8uK8If9pjsb6iFUsRYvSGAF
-                            IzcnI11OfTlsEuFGpO1MxBAIlGq2/CtJPy/1Zi2LnK3Ci2kdjCyv5dTbICxa7iuW
-                            XVFBPXrWGtod3YGSwe0qBRCGxAhFX0ea6zM/r6rA4yPFlQkC9UUaN1ITZJyTbXAB
-                            9Gd9S8+S7i0jUNHK6iGX9EvV5VmjpzMY6/vdhoGpc+xuC0bX1Gjsml4HmcIrq25p
-                            VkLGD8nhv01wEmNMTmDawlDlIxUq3l/cK/GuJL/8lVGLOjk=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikav.edu.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikav.edu.gr: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">Eastern Macedonia and Thrace Institute of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Eastern Macedonia and Thrace Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Ανατολικής Μακεδονίας και Θράκης</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.teikav.edu.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.teikav.edu.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kalliopi</md:GivenName>
-    <md:SurName>Sotiropoulou</md:SurName>
-    <md:EmailAddress>lsotir@teikav.edu.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teikoz.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teikoz.gr-idp-shibboleth.xml
deleted file mode 100644
index 7612782f..00000000
--- a/swamid-interfederations-2.0/idp.teikoz.gr-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://idp.teikoz.gr/idp/shibboleth">
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">teikoz.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEvjCCA6agAwIBAgIQSZIpUYIhvsE2nmtnqM1U4zANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEwMDkwNzAwMDAwMFoXDTEzMDkwNjIzNTk1OVowgYoxCzAJBgNV
-                            BAYTAkdSMQ8wDQYDVQQIEwZLb3phbmkxDzANBgNVBAcTBktvemFuaTFBMD8GA1UE
-                            ChM4VGVjaG5vbG9naWNhbCBFZHVjYXRpb25hbCBJbnN0aXR1dGUgb2YgV2VzdGVy
-                            biBNYWNlZG9uaWExFjAUBgNVBAMTDWlkcC50ZWlrb3ouZ3IwggEiMA0GCSqGSIb3
-                            DQEBAQUAA4IBDwAwggEKAoIBAQD+qeR1bQidtysnFQPYWjlW+UYDzJ/V2m60cbvv
-                            w+YHf5GRbeGYyEwcc6UITLufPOXMQh8jqQBRvaTZHDx5HeZJ4+p02Rkvy31p4LVP
-                            UV15wwyz+OBpkChlcvaJn97mdp3YGgUMjGfuK4wYUZO6xRbljRwkR6InGkYjvlCV
-                            iUlrRkJdS+bIr6UVAYz1bDRNiwWZuyQU5f0rEmSvFH84lddPt9SmmKK7FQ2mnk45
-                            T2gVd09m2eYKdp0Ud0VIMCjb4bMXXD4ljpNV4adMGNRjq7uih6KPla++7o5EGDOm
-                            PDyS2060CUWtHp8/nHiaqRNn8zEIihw5sVeGrI/koPRl0D8RAgMBAAGjggFxMIIB
-                            bTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUK0Bh
-                            Sb2qDZw1mNHJVoLaeNzsnDQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAw
-                            HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYB
-                            BAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
-                            Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
-                            hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
-                            BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKQYDVR0RBCIwIIIN
-                            aWRwLnRlaWtvei5ncoIPbG9naW4udGVpa296LmdyMA0GCSqGSIb3DQEBBQUAA4IB
-                            AQBl209LrprvBgZr47DE7hD4datAQBdlAhOKvQvS5Xb0QQSsmEVxVeiXGF4E+F71
-                            nGPkgY5qKKwp2H1HN3Y+8DBWJlD7hqTYzN8KVIAafQ2UURbYta0BkxqhVn5mkmI9
-                            m/XrdQqldL69Bkc90HF3luAPkhH1kMA8iaZTctUb5oUBSLJ/MV8PqIdo0R5uZgoc
-                            12Bl3bfVt6iremcGfbh2h8gp0XYGrjVnI66oD5pAyXN+MwEMDJU/VsMXE7BGz8L5
-                            Jw1tFiMPZxGygx7LwN5NP6z2d85J19w8mB87I0HA4C2dk9NeR02KWkHEQkiX6nQs
-                            MxqUW2tYH/WvrKHC2snqJzMW
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikoz.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikoz.gr: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.teikoz.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teikoz.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teikoz.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teikoz.gr/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">teikoz.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEvjCCA6agAwIBAgIQSZIpUYIhvsE2nmtnqM1U4zANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEwMDkwNzAwMDAwMFoXDTEzMDkwNjIzNTk1OVowgYoxCzAJBgNV
-                            BAYTAkdSMQ8wDQYDVQQIEwZLb3phbmkxDzANBgNVBAcTBktvemFuaTFBMD8GA1UE
-                            ChM4VGVjaG5vbG9naWNhbCBFZHVjYXRpb25hbCBJbnN0aXR1dGUgb2YgV2VzdGVy
-                            biBNYWNlZG9uaWExFjAUBgNVBAMTDWlkcC50ZWlrb3ouZ3IwggEiMA0GCSqGSIb3
-                            DQEBAQUAA4IBDwAwggEKAoIBAQD+qeR1bQidtysnFQPYWjlW+UYDzJ/V2m60cbvv
-                            w+YHf5GRbeGYyEwcc6UITLufPOXMQh8jqQBRvaTZHDx5HeZJ4+p02Rkvy31p4LVP
-                            UV15wwyz+OBpkChlcvaJn97mdp3YGgUMjGfuK4wYUZO6xRbljRwkR6InGkYjvlCV
-                            iUlrRkJdS+bIr6UVAYz1bDRNiwWZuyQU5f0rEmSvFH84lddPt9SmmKK7FQ2mnk45
-                            T2gVd09m2eYKdp0Ud0VIMCjb4bMXXD4ljpNV4adMGNRjq7uih6KPla++7o5EGDOm
-                            PDyS2060CUWtHp8/nHiaqRNn8zEIihw5sVeGrI/koPRl0D8RAgMBAAGjggFxMIIB
-                            bTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUK0Bh
-                            Sb2qDZw1mNHJVoLaeNzsnDQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAw
-                            HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYB
-                            BAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
-                            Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
-                            hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
-                            BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKQYDVR0RBCIwIIIN
-                            aWRwLnRlaWtvei5ncoIPbG9naW4udGVpa296LmdyMA0GCSqGSIb3DQEBBQUAA4IB
-                            AQBl209LrprvBgZr47DE7hD4datAQBdlAhOKvQvS5Xb0QQSsmEVxVeiXGF4E+F71
-                            nGPkgY5qKKwp2H1HN3Y+8DBWJlD7hqTYzN8KVIAafQ2UURbYta0BkxqhVn5mkmI9
-                            m/XrdQqldL69Bkc90HF3luAPkhH1kMA8iaZTctUb5oUBSLJ/MV8PqIdo0R5uZgoc
-                            12Bl3bfVt6iremcGfbh2h8gp0XYGrjVnI66oD5pAyXN+MwEMDJU/VsMXE7BGz8L5
-                            Jw1tFiMPZxGygx7LwN5NP6z2d85J19w8mB87I0HA4C2dk9NeR02KWkHEQkiX6nQs
-                            MxqUW2tYH/WvrKHC2snqJzMW
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teikoz.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teikoz.gr: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">Technological Educational Institute of Western Macedonia</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Δυτικής Μακεδονίας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Western Macedonia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Δυτικής Μακεδονίας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.teikoz.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.teikoz.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Technological Educational Institute of Western Macedonia</md:Company>
-    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Technological Educational Institute of Western Macedonia</md:Company>
-    <md:EmailAddress>helpdesk@grnet.gr</md:EmailAddress>
-    <md:TelephoneNumber>800-11-47638</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teilam.gr-idp-shibboleth.xml
deleted file mode 100644
index 13ee7cf7..00000000
--- a/swamid-interfederations-2.0/idp.teilam.gr-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://idp.teilam.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">teilam.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Technological Educational Institute of Sterea Ellada</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.teiste.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.teiste.gr/</mdui:InformationURL>
-        <mdui:Logo width="83" height="81">https://idp.teilam.gr/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.130.78.0/23</mdui:IPHint>
-        <mdui:IPHint>195.251.56.0/23</mdui:IPHint>
-        <mdui:IPHint>2001:648:2570::/48</mdui:IPHint>
-        <mdui:DomainHint>teiste.gr</mdui:DomainHint>
-        <mdui:DomainHint>teilam.gr</mdui:DomainHint>
-        <mdui:GeolocationHint>38.875331,22.437969</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>
-                            MIIEaDCCA1CgAwIBAgIRAM3kgGW3woyn1JTbV2Kj1uAwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwLnRlaWxh
-                            bS5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZFyBpYTsWDkUUQ
-                            Kuqp9ESv5FZYQ+aXXwddYURdyUARFbtXz8U8BZ1Bxcu+q1Vkn/A8lmawcf0hcnZ1
-                            nG2asfAqPxz43aupumdRbSZk+uRqX4/em8CYYv8bXFptyh1DFAjREMKqMIa5e0Kn
-                            yWVN3i1NUkKb8Q4BBAIbxHsSn80Sdx34FWoIH7OA3CvXYFHASwj1F1/5Bi+Ecsuy
-                            bww1azBHhyw6NvKp8YuD4WRuVBv7BUOTFpCknxSqGZSl7onl5oAayaTKtH+d53fH
-                            7tOen/+46nIdqOIfzCRDOVrL+th6pzzYj0vVXwfaQOzSEB77HipXxFTl1zDPL81a
-                            pVbXHTsCAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-                            47ntMB0GA1UdDgQWBBSBsjPtVPWhSZDYuX2kInyu0VMwJzAOBgNVHQ8BAf8EBAMC
-                            BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-                            IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
-                            oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-                            bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-                            dGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwLnRlaWxhbS5ncjANBgkqhkiG
-                            9w0BAQUFAAOCAQEAEPn8HHF3R/o0k+FjUYwCrOf50iJEydvl9yYI/zgF6eSJiBmy
-                            J0sEhm7ke1c8fbDSJrF4lQgAyIKFbl06LfzNy3vuJmbnx2xdXgApjQGRwVqKLi0E
-                            /Z1Dvpk4ALukbqb1b9VopNUOSObyKYxfxuMWBhNman0gYYMvAr5D9Xt/FoWQDLho
-                            QreibK7c9mYgSjC7LS1yTbk/6z1XNk3KE37NlxxZWLHUTUI3Ta2GXLWKnhSCXTcf
-                            h2BHO2FTwpCucZsAUoUqGjDZ68PnCCaBghHeF5BfI/gAZI9lXpv7Ge0C8JZc8HSV
-                            TviBthB5PYt5hjK8thpyYqZSKFUJF8iCqZqO2g==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teilam.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teilam.gr: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.teilam.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teilam.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teilam.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teilam.gr/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">teilam.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEaDCCA1CgAwIBAgIRAM3kgGW3woyn1JTbV2Kj1uAwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDsxITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEWMBQGA1UEAxMNaWRwLnRlaWxh
-                            bS5ncjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZFyBpYTsWDkUUQ
-                            Kuqp9ESv5FZYQ+aXXwddYURdyUARFbtXz8U8BZ1Bxcu+q1Vkn/A8lmawcf0hcnZ1
-                            nG2asfAqPxz43aupumdRbSZk+uRqX4/em8CYYv8bXFptyh1DFAjREMKqMIa5e0Kn
-                            yWVN3i1NUkKb8Q4BBAIbxHsSn80Sdx34FWoIH7OA3CvXYFHASwj1F1/5Bi+Ecsuy
-                            bww1azBHhyw6NvKp8YuD4WRuVBv7BUOTFpCknxSqGZSl7onl5oAayaTKtH+d53fH
-                            7tOen/+46nIdqOIfzCRDOVrL+th6pzzYj0vVXwfaQOzSEB77HipXxFTl1zDPL81a
-                            pVbXHTsCAwEAAaOCAWowggFmMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-                            47ntMB0GA1UdDgQWBBSBsjPtVPWhSZDYuX2kInyu0VMwJzAOBgNVHQ8BAf8EBAMC
-                            BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-                            IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
-                            oC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmww
-                            bQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3Au
-                            dGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INaWRwLnRlaWxhbS5ncjANBgkqhkiG
-                            9w0BAQUFAAOCAQEAEPn8HHF3R/o0k+FjUYwCrOf50iJEydvl9yYI/zgF6eSJiBmy
-                            J0sEhm7ke1c8fbDSJrF4lQgAyIKFbl06LfzNy3vuJmbnx2xdXgApjQGRwVqKLi0E
-                            /Z1Dvpk4ALukbqb1b9VopNUOSObyKYxfxuMWBhNman0gYYMvAr5D9Xt/FoWQDLho
-                            QreibK7c9mYgSjC7LS1yTbk/6z1XNk3KE37NlxxZWLHUTUI3Ta2GXLWKnhSCXTcf
-                            h2BHO2FTwpCucZsAUoUqGjDZ68PnCCaBghHeF5BfI/gAZI9lXpv7Ge0C8JZc8HSV
-                            TviBthB5PYt5hjK8thpyYqZSKFUJF8iCqZqO2g==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teilam.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teilam.gr: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">Technological Educational Institute of Sterea Ellada</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Sterea Ellada</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Στερεάς Ελλάδας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.teilam.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.teilam.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Achilleas</md:GivenName>
-    <md:SurName>Likotseas</md:SurName>
-    <md:EmailAddress>aliko@teilam.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Technological Educational Insitute of Lamia</md:Company>
-    <md:GivenName>Achilleas</md:GivenName>
-    <md:SurName>Likotseas</md:SurName>
-    <md:EmailAddress>aliko@teilam.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teimes.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teimes.gr-idp-shibboleth.xml
deleted file mode 100644
index c19fa861..00000000
--- a/swamid-interfederations-2.0/idp.teimes.gr-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.teimes.gr/idp/shibboleth">
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">teimes.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEZzCCA0+gAwIBAgIQVdiu+LQ1e98NKDokhhkKcDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDUzMTAwMDAwMFoXDTE2MDUzMDIzNTk1OVowOzEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1pZHAudGVpbWVz
-                            LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzbE8l+xoFqVZuFeG
-                            7k7A0STEWr356z4LEypiCZgtnXYAEsPdJgtUfLVoBJUJgka3SNAdrsBOITiIpbhx
-                            MyUwiVyEDgAgFN6Wp+SL6Rf6oomdkdy2uQ6COyJ3z+9zhiLEo+HsZe+TyMwnaoJr
-                            iXgRGaar3x57WLg4ljlZgMeRaS59w9J4BSq8v+pF9uhJmRuMf2QoMUhqaw9y9x9/
-                            v8lbTk/xNizMwTkf83MXqeAR2goT8wrNjtrBJguPwL/vEsKeXTilIdP3kAvWaVda
-                            mfQzhT9hXX4cXuUOzyKq/z57c6dAXDQAOZELuqYw8OsTsheKAnEZA3skCFqDPQmU
-                            4r/oMQIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-                            ue0wHQYDVR0OBBYEFHTMEzcFNJFW+wMBl0baf+KkwVPuMA4GA1UdDwEB/wQEAwIF
-                            oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-                            BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-                            LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-                            BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-                            YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-                            Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1pZHAudGVpbWVzLmdyMA0GCSqGSIb3
-                            DQEBBQUAA4IBAQB6jKDy+7FTyLyqJj4KdyK4bmi2Apfw0EQS5n94kBGUdX3btuSb
-                            w9R4O17L4KPGHcBw+gXUTbFpKhU0vcxyfXBR7W1G80vWXK/c74ceiAsnsvgXK+h8
-                            Cq/NtoyRfAs4Tp/TeuDqz7Cokg15694T8TY3YZr2IdPmmYjajJUZlC0VmGZ8xpy8
-                            Stb0JnndVME7qsHMG+3JFnGDJ/hTQho9mXqrpGf/DhqYDIHvjAIgjSYUT59oz1Vr
-                            l2JbcEBafD9Vw3PvU7npUD0zCKoGxXOIS/euILZpRZpPpl0/P4eeGoF0mPn9yAjk
-                            oM+F3tyjZKVbapPixpkTOQrfv21F08UOTAVV
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teimes.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teimes.gr: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.teimes.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teimes.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teimes.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teimes.gr/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">teimes.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEZzCCA0+gAwIBAgIQVdiu+LQ1e98NKDokhhkKcDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDUzMTAwMDAwMFoXDTE2MDUzMDIzNTk1OVowOzEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1pZHAudGVpbWVz
-                            LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzbE8l+xoFqVZuFeG
-                            7k7A0STEWr356z4LEypiCZgtnXYAEsPdJgtUfLVoBJUJgka3SNAdrsBOITiIpbhx
-                            MyUwiVyEDgAgFN6Wp+SL6Rf6oomdkdy2uQ6COyJ3z+9zhiLEo+HsZe+TyMwnaoJr
-                            iXgRGaar3x57WLg4ljlZgMeRaS59w9J4BSq8v+pF9uhJmRuMf2QoMUhqaw9y9x9/
-                            v8lbTk/xNizMwTkf83MXqeAR2goT8wrNjtrBJguPwL/vEsKeXTilIdP3kAvWaVda
-                            mfQzhT9hXX4cXuUOzyKq/z57c6dAXDQAOZELuqYw8OsTsheKAnEZA3skCFqDPQmU
-                            4r/oMQIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-                            ue0wHQYDVR0OBBYEFHTMEzcFNJFW+wMBl0baf+KkwVPuMA4GA1UdDwEB/wQEAwIF
-                            oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-                            BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-                            LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-                            BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-                            YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-                            Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1pZHAudGVpbWVzLmdyMA0GCSqGSIb3
-                            DQEBBQUAA4IBAQB6jKDy+7FTyLyqJj4KdyK4bmi2Apfw0EQS5n94kBGUdX3btuSb
-                            w9R4O17L4KPGHcBw+gXUTbFpKhU0vcxyfXBR7W1G80vWXK/c74ceiAsnsvgXK+h8
-                            Cq/NtoyRfAs4Tp/TeuDqz7Cokg15694T8TY3YZr2IdPmmYjajJUZlC0VmGZ8xpy8
-                            Stb0JnndVME7qsHMG+3JFnGDJ/hTQho9mXqrpGf/DhqYDIHvjAIgjSYUT59oz1Vr
-                            l2JbcEBafD9Vw3PvU7npUD0zCKoGxXOIS/euILZpRZpPpl0/P4eeGoF0mPn9yAjk
-                            oM+F3tyjZKVbapPixpkTOQrfv21F08UOTAVV
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teimes.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teimes.gr: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">Technological Educational Institute of Western Greece</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Δυτικής Ελλάδας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Western Greece</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Δυτικής Ελλάδας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.teimes.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.teimes.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Panagiotis</md:GivenName>
-    <md:SurName>Ilaridis</md:SurName>
-    <md:EmailAddress>noc@teimes.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Technological Educational Institute of Messolonghi Helpdesk</md:Company>
-    <md:EmailAddress>helpdesk@teimes.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.teipir.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.teipir.gr-idp-shibboleth.xml
deleted file mode 100644
index 03aba043..00000000
--- a/swamid-interfederations-2.0/idp.teipir.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.teipir.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">teipir.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Piraeus University of Applied Sciences</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Ανώτατο Εκπαιδευτικό Ίδρυμα Πειραιά Τεχνολογικού Τομέα</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.teipir.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.teipir.gr/</mdui:InformationURL>
-        <mdui:Logo height="83" width="81">https://idp.teipir.gr/idp/images/dummylogo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>noc.teipir.gr</mdui:DomainHint>
-        <mdui:IPHint>195.251.64.0/19</mdui:IPHint>
-        <mdui:GeolocationHint>geo:37.978971,23.674666</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>
-                            MIIEZzCCA0+gAwIBAgIQeIOp00euUnoH7TSY6j9/TDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDYwNTAwMDAwMFoXDTE2MDYwNDIzNTk1OVowOzEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1pZHAudGVpcGly
-                            LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoCSBB7C9YPdEv5VP
-                            BAzm/uJNbkQbumXzbT40r/tw/vQC+lKwLeuCTthH093OmzmuiWqrfguGGDAuEdbK
-                            qS93u63Zm4eLhaMRvQBU3TgrZlwpdWEmPQmrM8YeBf5i2Oa8HuIVr2UHHRze2TXn
-                            CsRE8c9HQl6J1J/E6PX8/jA6bzCuP5VXifKFSuTIw0f9J8dRfKh5i90qGPMPTThW
-                            bbJXDKkLm0a+kwAjtpzccJ3P9XPciWv53855jK/wl7PrnYl376W6xJozuEmYGTRD
-                            Iun9muqhz89dWO4W9SMnRXXg5Cl6G5Ay17SEmX16DF9CiOJ4We/ij2PM6kKY/nst
-                            uvAsgwIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-                            ue0wHQYDVR0OBBYEFOqFlGOIjhxOGDe4fLw8Wsf5BfqbMA4GA1UdDwEB/wQEAwIF
-                            oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-                            BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-                            LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-                            BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-                            YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-                            Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1pZHAudGVpcGlyLmdyMA0GCSqGSIb3
-                            DQEBBQUAA4IBAQC5/sKffeIG/38kVzhSpa6eA84z9mibqMx/ZPmXi7COKd7qKIrS
-                            ztJEuuWSnPbbyQWrPTtURP0A3b/KgyXRXyKKPeBNUCQzGpMZaCn6zH8uaRutgwoi
-                            OcnGOrGUHZDM8Nh20syhOeJVtldCFBnBklPU0ZKj1yW3I6MitgNLegHw0mkTfVV3
-                            hHbRO/Eq0A8zB3SPFJdZwIr9hXmUDZ0au5wphyMHr8PsIromdng9iK98BhPLRtXD
-                            VN8zaPiZhqYc5v5inUcXsY66dHRQVmo8WeBf47tWka6FeKnxvdPJA8euG0ZmNEtt
-                            o75PCMgbJ2on+1RDqRfAB1iHjM+BSVS2+Hlz
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teipir.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teipir.gr: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.teipir.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.teipir.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.teipir.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.teipir.gr/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">teipir.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEZzCCA0+gAwIBAgIQeIOp00euUnoH7TSY6j9/TDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDYwNTAwMDAwMFoXDTE2MDYwNDIzNTk1OVowOzEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1pZHAudGVpcGly
-                            LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoCSBB7C9YPdEv5VP
-                            BAzm/uJNbkQbumXzbT40r/tw/vQC+lKwLeuCTthH093OmzmuiWqrfguGGDAuEdbK
-                            qS93u63Zm4eLhaMRvQBU3TgrZlwpdWEmPQmrM8YeBf5i2Oa8HuIVr2UHHRze2TXn
-                            CsRE8c9HQl6J1J/E6PX8/jA6bzCuP5VXifKFSuTIw0f9J8dRfKh5i90qGPMPTThW
-                            bbJXDKkLm0a+kwAjtpzccJ3P9XPciWv53855jK/wl7PrnYl376W6xJozuEmYGTRD
-                            Iun9muqhz89dWO4W9SMnRXXg5Cl6G5Ay17SEmX16DF9CiOJ4We/ij2PM6kKY/nst
-                            uvAsgwIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-                            ue0wHQYDVR0OBBYEFOqFlGOIjhxOGDe4fLw8Wsf5BfqbMA4GA1UdDwEB/wQEAwIF
-                            oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-                            BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-                            LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-                            BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-                            YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-                            Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1pZHAudGVpcGlyLmdyMA0GCSqGSIb3
-                            DQEBBQUAA4IBAQC5/sKffeIG/38kVzhSpa6eA84z9mibqMx/ZPmXi7COKd7qKIrS
-                            ztJEuuWSnPbbyQWrPTtURP0A3b/KgyXRXyKKPeBNUCQzGpMZaCn6zH8uaRutgwoi
-                            OcnGOrGUHZDM8Nh20syhOeJVtldCFBnBklPU0ZKj1yW3I6MitgNLegHw0mkTfVV3
-                            hHbRO/Eq0A8zB3SPFJdZwIr9hXmUDZ0au5wphyMHr8PsIromdng9iK98BhPLRtXD
-                            VN8zaPiZhqYc5v5inUcXsY66dHRQVmo8WeBf47tWka6FeKnxvdPJA8euG0ZmNEtt
-                            o75PCMgbJ2on+1RDqRfAB1iHjM+BSVS2+Hlz
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.teipir.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.teipir.gr: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">Technological Educational Institute of Piraeus</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Πειραιά</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technological Educational Institute of Piraeus</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Τεχνολογικό Εκπαιδευτικό Ίδρυμα Πειραιά</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.teipir.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.teipir.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Christina</md:GivenName>
-    <md:SurName>Avgerinou</md:SurName>
-    <md:EmailAddress>xristina@teipir.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Technological Educational Institute of Piraeus Helpdesk</md:Company>
-    <md:EmailAddress>helpdesk@teipir.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 686cf3d9..00000000
--- a/swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.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" entityID="https://idp.telecom-bretagne.eu/idp/shibboleth">
-  <md: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>
-  </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 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="en">Télécom Bretagne</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB2UlEQVQ4y8WSy2qTQRiGn5nMn/+UNAdJTUqhWkUQMW4kKAgWvIPsvRMvIrhz5Q24yUZXBXHl0o20QlB7SENTIglJ/mPmHxcxIDaLduW7mnmH5/m+xQhjTG9/f3/Tsd2UaySMQmtv7/lQdbvdSrvdLhb9IiCuLJhMx3Q6nVSpnMJ3C7iuhxBXFyRpQt6ykcup4lowSwIACbBi10mE+EcuBAixZIRBARizfDOrw1+51P25r2p5rb3X5P8LlNaaKApRSnL5HwjArAWjKCJNU1St1uDZ0xc4roNBo02ClDYSgTEaKXJkJsUIgRAWxiRgJME8ZGd7F6HN0ej7j25VWR62tUW10mI8+UwQnZO3qoTxCb57C4lkMu9Rq7ZY6Iw4GdKo3/mlkvQr/Yu3eO5tHKdOEB9yOniH62+z4T3iqP+arfpLZuExs/kBP8/eUC42GYze88R5hYyzKePpIafnHxhNviClw0LPmM37eN4uBkk+V8HJNyj4d9koPqDo32ehp2AkKssygjhECjBaUyo0KZceE8QDpvNvSDxy0iaKzsjQ3Ci18J0dsoVgoWOENge94fjTpq2s1LVvkrN2yBYDdJbh5msEyTFu/iFan5DogJwU2OoeF+OPVq3cHP4Gre7EahqxpVsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDIrMDI6MDDH7d3lAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQyKzAyOjAwtrBlWQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.telecom-bretagne.eu/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Télécom Bretagne</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>
-					      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>
-    </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-POST" Location="https://idp.telecom-bretagne.eu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-bretagne.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-bretagne.eu/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-bretagne.eu</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-bretagne.eu/idp/profile/SAML1/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">Télécom Bretagne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Télécom Bretagne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.telecom-bretagne.eu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>idp-contact@telecom-bretagne.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 79725acf..00000000
--- a/swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.telecom-lille1.eu/idp/shibboleth">
-  <md: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>
-  </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 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="en">Telecom Lille1</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABFklEQVQ4y82Su0oDYRCFv/k3m0WJMRcDATWQRovghViIjdpaWlhZmpfwJWziEwg2PoIvIDZiZZpgkVJkgxEWdS9jscHddLJr4cA0c5gPZs4B0Az9AfQBCmQrBzgDPmVKzFpeXkBociwD8HeA/TrsVgWAxQKcdwynrYS/XhL6XcNl19CeSwA/LpysWrwHyv1Y2asJvU3Dy6tyPQLbgosNw1FLEGDZEY7vwllA0Yq9AajYsKDC11TtlISVsuD74IXQLEPNBtdPAQYTxQtiQ54mysM4YuTG2uObcvUc0VszgHIzjHD95AwFdMlBq8UkbTsV0fb8bAIPG6IHDUnPgv+RAy8PwALqwBZgZ9hXC7gFmsB2+qm/7OAb/y9ptHSlOm8AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDArMDI6MDBQcszMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQwKzAyOjAwIS90cAAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.telecom-lille.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Telecom Lille1</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>
-					      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>
-    </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-POST" Location="https://idp.telecom-lille1.eu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-lille1.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-lille1.eu/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-lille1.eu</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-lille1.eu/idp/profile/SAML1/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">Telecom Lille1</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Telecom Lille1</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.telecom-lille.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Landru</md:SurName>
-    <md:EmailAddress>jacques.landru@telecom-lille1.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sion</md:SurName>
-    <md:EmailAddress>martine.sion@telecom-lille1.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d1310796..00000000
--- a/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.telecom-paristech.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Télécom ParisTech</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAClUlEQVQoz4XLXU9SYRwA8P/zclBAQJ04DUMXIlijCdnWXZlZF3Zh6ypqtfVyWZfd1mprq5u+Qptld7VydVWtGjNz6UxJRbQxjxxOAqLAgXM4z3mePoK/+x/aSG/M/ZyjlMJBmMVisRhNJpPxa3EXuA8MFShPvZqihFI7ODv9nQcG2AJKKAWAOmh6TQcEhBKEEMbY0A0qSZZlEYLNhkkpJYRUoAwAlFvW9as3PB63YRjFQlHTaoqiTFyeWF9L9fb1ybIcOR5Jp9ZzOTU6PMQ5pwDAOaeSNBAKffn0+cRwrPK1Eg6HmyTb6uqa3+9f+LVw687NYnHXbm9mjJH4lfiH6Y+GYXR3dwmAXr+/2d7c3t6eyymhcNg0zWgsmslkJl9M6oY+EBqgCOPEbMLn9RXyhUB///t30/md/PLv5UbD7PDKwWAw8T2hqurYhbFsNgsAFADs4JAkye1xb8tyoD/g6+kpl/cD/YG90h5GaGR0RKtWS6W90XOj3OJUCF4HjTG2mlw1TTO7nWWMMWYtLS5xi2OCKaWcc0mSqpXqs+dPaYvLNTZ+0elwCM65YSIbRRgD54hSbjJEMMLY0g3AuF6vu9takZFRtfkUooS0OFxno7WZFXO/InW1acm/rkiw8W+3Jitdl0YbalFwwQQjd8+My49f1lOKvpHTt1T54WtTqwlLrN9+YOv1F6a+7b6dzT56U1OU9L0nzacGsQCur+X2fyxVl9KkvaWxWSjP/3Ec7SPQ0uTroD1tredjtkiH8+QABiciBHOTNeoZs7RjKVXnsSOd98ebOrzaWgaBTXBh5PLCEp7TQ56RIQGGYAxpm/L+wgoimNod9t5DdVklmNoOe6vJTU90UMsqQmtgm+Qc7CvNLLoiwf/9YlMHLNeSiwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0MiswMjowMMft3eUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDIrMDI6MDC2sGVZAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.telecom-paristech.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Télécom ParisTech</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>
-					      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>
-    </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-POST" Location="https://idp.telecom-paristech.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.telecom-paristech.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.telecom-paristech.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.telecom-paristech.fr/idp/profile/SAML1/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">Télécom ParisTech</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Télécom ParisTech</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.telecom-paristech.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>shibboleth@enst.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.test.semantico.net-shibboleth2.xml b/swamid-interfederations-2.0/idp.test.semantico.net-shibboleth2.xml
deleted file mode 100644
index 07edf2fe..00000000
--- a/swamid-interfederations-2.0/idp.test.semantico.net-shibboleth2.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.test.semantico.net/shibboleth2">
-  <!--
-		This is a Test IdP for Semantico Limited.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">semantico.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIVAIyYxXXjcwpmMCFZpfaDBhgqPRVKMA0GCSqGSIb3DQEB
-						BQUAMCExHzAdBgNVBAMTFmlkcC50ZXN0LnNlbWFudGljby5uZXQwHhcNMTIxMjE3
-						MTIxMzA0WhcNMzIxMjE3MTIxMzA0WjAhMR8wHQYDVQQDExZpZHAudGVzdC5zZW1h
-						bnRpY28ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApqXUhIix
-						l94UCWt56LwlvrqQBi2qQhOaEjxRYnbqg9SNBlaeCVNN2vxKqHpgxLKdLMtmCQmJ
-						novNH9qwFfJTzmRPgsLElsJzlObP9fHlh9u21+ZToIuI5ghGXG52Fhf1gdIeN7cH
-						PzFN1E4Pb0Dh3DOxnzLMXDimOwmwRKOAWa2E7UgD42vLRPzz4IeFx0w+EPkNmv/C
-						bTpTDR0kJGNBxoQVS6KQlU95b9dl+as7swAGIQhU7R7Tn9jVXzJJLdZ84I/dl9ju
-						ZNpNaki0f9egOEHraJp731AHzgFoVKfS11OXVx2FiM1MTgU7tv7XjhALnZf3tbAr
-						YEgIe6ww/hFDLQIDAQABo3MwcTBQBgNVHREESTBHghZpZHAudGVzdC5zZW1hbnRp
-						Y28ubmV0hi1odHRwczovL2lkcC50ZXN0LnNlbWFudGljby5uZXQvaWRwL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFBtPXbpEivzVVqYPddt3JNbHfq/gMA0GCSqGSIb3DQEB
-						BQUAA4IBAQB8/Fu1WxCyj/zaqWfJe1fjU/qwyG8YcECR/F6h55EbvlrKFAauD5mA
-						1N/ssSvcnC73mtFhgjYkaUf+ztpGAzI8pT7o/h/YSER3My6xfNssJPRtl3lDnByq
-						QhoY+/pYb9AE5TOcSFE/tiW8cjf+HEOLj6ggwpwACbgdIZhB6tkPPEYwGLM7iztZ
-						RZ5dyGsxLqMUNkAQe31ODYum1CmZSvca3dQ36v3Uh9JPY7NpPKtPajTWa3EOnolD
-						Vs90fU3mVYcbKg96GRsKinrEORtN8bFhXVTTV385hPcoU+HA7FrAz+EnEWVSTISm
-						jZeiXwxR2EOo28vKTTG7Ytp8H4ueb9NI
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.semantico.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.semantico.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.test.semantico.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.test.semantico.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.test.semantico.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.test.semantico.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">semantico.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIVAIyYxXXjcwpmMCFZpfaDBhgqPRVKMA0GCSqGSIb3DQEB
-						BQUAMCExHzAdBgNVBAMTFmlkcC50ZXN0LnNlbWFudGljby5uZXQwHhcNMTIxMjE3
-						MTIxMzA0WhcNMzIxMjE3MTIxMzA0WjAhMR8wHQYDVQQDExZpZHAudGVzdC5zZW1h
-						bnRpY28ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApqXUhIix
-						l94UCWt56LwlvrqQBi2qQhOaEjxRYnbqg9SNBlaeCVNN2vxKqHpgxLKdLMtmCQmJ
-						novNH9qwFfJTzmRPgsLElsJzlObP9fHlh9u21+ZToIuI5ghGXG52Fhf1gdIeN7cH
-						PzFN1E4Pb0Dh3DOxnzLMXDimOwmwRKOAWa2E7UgD42vLRPzz4IeFx0w+EPkNmv/C
-						bTpTDR0kJGNBxoQVS6KQlU95b9dl+as7swAGIQhU7R7Tn9jVXzJJLdZ84I/dl9ju
-						ZNpNaki0f9egOEHraJp731AHzgFoVKfS11OXVx2FiM1MTgU7tv7XjhALnZf3tbAr
-						YEgIe6ww/hFDLQIDAQABo3MwcTBQBgNVHREESTBHghZpZHAudGVzdC5zZW1hbnRp
-						Y28ubmV0hi1odHRwczovL2lkcC50ZXN0LnNlbWFudGljby5uZXQvaWRwL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFBtPXbpEivzVVqYPddt3JNbHfq/gMA0GCSqGSIb3DQEB
-						BQUAA4IBAQB8/Fu1WxCyj/zaqWfJe1fjU/qwyG8YcECR/F6h55EbvlrKFAauD5mA
-						1N/ssSvcnC73mtFhgjYkaUf+ztpGAzI8pT7o/h/YSER3My6xfNssJPRtl3lDnByq
-						QhoY+/pYb9AE5TOcSFE/tiW8cjf+HEOLj6ggwpwACbgdIZhB6tkPPEYwGLM7iztZ
-						RZ5dyGsxLqMUNkAQe31ODYum1CmZSvca3dQ36v3Uh9JPY7NpPKtPajTWa3EOnolD
-						Vs90fU3mVYcbKg96GRsKinrEORtN8bFhXVTTV385hPcoU+HA7FrAz+EnEWVSTISm
-						jZeiXwxR2EOo28vKTTG7Ytp8H4ueb9NI
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.test.semantico.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.test.semantico.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">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Semantico Federation Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.semantico.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:test-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:test-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ths.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ths.se-idp-shibboleth.xml
deleted file mode 100644
index e1a2b05e..00000000
--- a/swamid-interfederations-2.0/idp.ths.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ths.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:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ths.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Teologiska högskolan Stockholm</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Stockholm School of Theology</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Teologiska högskolan Stockholm</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Stockholm School of Theology</mdui:Description>
-        <mdui:Logo height="100" width="100">https://idp.ths.se/idp/images/ths.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>
-MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
-MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgneCxYbvQuIbSwkBuEHEAGJrWOe5usqevjBxnRIY
-IB3uR0AvVvJokrTWosSuzqRpbEUsgpG0sXH+D/BuvCCciLkzXOr6cog0q68ymz4d
-QegUSEAuU0CBzGK7qzb5UgQYuo7gopIAAfk+870o4FlaiZtkP9Ap/EjqvnrULL8p
-VJi69skI5gz/ua/boDXOpbsmWuzCAqD9Kzz9sYnwz14mfJX5hb1M5M2H5kDFaYiM
-zKT1dClICSlBUO59ijtBHKTGZKqR+VNn5Ik4LheDRUgTeiEmW+nrW3VNVR0ejayP
-iqSoKvumaAaCVh1dwXNAKTYigMVQj5RN1xxrey6JHDtKTQIDAQABo1swWTAdBgNV
-HQ4EFgQUcqxMRNMBh6u+I+kuztUyzRv031AwOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQANq+u3kuueZ3Lrcy9fjpyvIQznBuINMD6nQmb3NEDOLu8klJewV5QF
-S2pMebzvzTmsEpe9Ru9JprMcAp7i3izSLYjOqJ9tVzGsGNBmtPQe5uUwrIlbNZue
-GtNimkNWHvS+uUcx2ACLcR3jt/bZ0DSU3YE5+zGFZKPZlO+5f9/YCa4xEhTl7OT/
-wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
-r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
-GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
-MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAs+wFy6Bii4RxuP5xBGLV2ODTADmnAYjWdQ/SAaSF
-GkM1tHf/dH5+9nyIpz23PXSeO4X59arZC4eK71duqU7ajm2+LLKiLBguofbwlaK7
-Ia46ReI9WkIQBSyRnCLC8dDEC/1G1gsh9up4jvSgJO/BwtchvO23iFnoWGa5BwxT
-HrieHSBIqixP8/Zd4v3eVoPTmetyRQVstC7tc8AK6AB47zha1nxd+sRqmsVbsaef
-DW8v5rBm++Dn+m8Im2cF9AAytz8PM7vSQSx6sTixTTHBddD16vBMnaTKHpEdrYb4
-aK8sDS8ku2SXmsEGMmNSXo6CNFR8OZVpO4DHjZO94GwnFQIDAQABo1swWTAdBgNV
-HQ4EFgQUDd8LOI1MHYCc/x2uQ+F6edwmMJswOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA5lFkOXXGkKwmKuAzA6ETKdvGfp8TloxdKrzQ9/2wwCZdLz/OVLhUe
-f00ILSO9SyDrkxTsnlUUkFqFR7zw/PwD/ZbRCH1zDPqz2fY8yg3uC9LM++r8ookt
-Yx2kwRAnwS6N1fRC3/oiCoWuY7HS+7MYTrTqOHoWlzoLJW/0MXdfN1tFJdMrluWq
-WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
-0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
-58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
-MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtUDQ13J3qxlTQ/bzLet+Y4xcjRkHeIWvQfUXIDDY
-Tl2PAFdvfTE63A77c/EGE/fE3x3Gqd/pLoOXF9xxrYt1CEUWSgLuMP6JYK2q3ByI
-ztL4AQRw6t313KRzsDH+qSnrA8m4o6w2ORx9Q8V6LSUfBXcqiUH8IdSJ2nkK4AEF
-/GDHtvYR0t3vxnARqa5bUtlBXc3lW8i4yet4lMnVVoDtvWQfVJ5i1AE3Uzys+RDK
-goRoKfHlayqiDYyuVmgP1wEB5b3yb5htTIvlrVAv3IBStRlmeDHPqc1ovrldOZFW
-mfhH9PB0qPVf6dsRRBBKO1yJJc7A4gRXjHJdQ8wMcvAYcwIDAQABo1swWTAdBgNV
-HQ4EFgQUeHLwS/y7FmX87CIT3IpanavrYW8wOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCpSdEgMGI8XdHrUGfAAIqcYACudfOp80/rqpyOGPtO45qkBuYKrp3D
-yTts4EtDi3k5XCowH0TS9ODjgBCe/lOmDg05Ew/1dDc6pyxNUqMp1zRnmZ5DdzP8
-UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
-2SevIVPNCfKl9VGaxbkX9CGRLlB1YK3GBWUp4TvbsGC8+iM/+dXIQQy4Hh25vAzv
-SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
-xAdB19mh1plahNrAaEfu6Ldetyz9iulY
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ths.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ths.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ths.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ths.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ths.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAOoBGXpQZ8B+9yfZGw0M8PEB20fJMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxOTA0WhcNMzUx
-MTExMDkxOTA0WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgneCxYbvQuIbSwkBuEHEAGJrWOe5usqevjBxnRIY
-IB3uR0AvVvJokrTWosSuzqRpbEUsgpG0sXH+D/BuvCCciLkzXOr6cog0q68ymz4d
-QegUSEAuU0CBzGK7qzb5UgQYuo7gopIAAfk+870o4FlaiZtkP9Ap/EjqvnrULL8p
-VJi69skI5gz/ua/boDXOpbsmWuzCAqD9Kzz9sYnwz14mfJX5hb1M5M2H5kDFaYiM
-zKT1dClICSlBUO59ijtBHKTGZKqR+VNn5Ik4LheDRUgTeiEmW+nrW3VNVR0ejayP
-iqSoKvumaAaCVh1dwXNAKTYigMVQj5RN1xxrey6JHDtKTQIDAQABo1swWTAdBgNV
-HQ4EFgQUcqxMRNMBh6u+I+kuztUyzRv031AwOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQANq+u3kuueZ3Lrcy9fjpyvIQznBuINMD6nQmb3NEDOLu8klJewV5QF
-S2pMebzvzTmsEpe9Ru9JprMcAp7i3izSLYjOqJ9tVzGsGNBmtPQe5uUwrIlbNZue
-GtNimkNWHvS+uUcx2ACLcR3jt/bZ0DSU3YE5+zGFZKPZlO+5f9/YCa4xEhTl7OT/
-wO/kQ//XXJcoiwGR2aq5ap97qHaABMck78c+ABw4GCyovCmvlhPDoy8W4qILu1nh
-r8XPB8eZnOjSSAwbmJaLPThPRCbFVWtlPXpsUknV3QJccDKJe8+P/u+J2qDSziy/
-GPrwUbfYjDaDH2pZjUisQoVv15w0sWPt
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAIwLUJoKnkoTdYnnhVC1hx97HazRMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODUyWhcNMzUx
-MTExMDkxODUyWjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAs+wFy6Bii4RxuP5xBGLV2ODTADmnAYjWdQ/SAaSF
-GkM1tHf/dH5+9nyIpz23PXSeO4X59arZC4eK71duqU7ajm2+LLKiLBguofbwlaK7
-Ia46ReI9WkIQBSyRnCLC8dDEC/1G1gsh9up4jvSgJO/BwtchvO23iFnoWGa5BwxT
-HrieHSBIqixP8/Zd4v3eVoPTmetyRQVstC7tc8AK6AB47zha1nxd+sRqmsVbsaef
-DW8v5rBm++Dn+m8Im2cF9AAytz8PM7vSQSx6sTixTTHBddD16vBMnaTKHpEdrYb4
-aK8sDS8ku2SXmsEGMmNSXo6CNFR8OZVpO4DHjZO94GwnFQIDAQABo1swWTAdBgNV
-HQ4EFgQUDd8LOI1MHYCc/x2uQ+F6edwmMJswOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA5lFkOXXGkKwmKuAzA6ETKdvGfp8TloxdKrzQ9/2wwCZdLz/OVLhUe
-f00ILSO9SyDrkxTsnlUUkFqFR7zw/PwD/ZbRCH1zDPqz2fY8yg3uC9LM++r8ookt
-Yx2kwRAnwS6N1fRC3/oiCoWuY7HS+7MYTrTqOHoWlzoLJW/0MXdfN1tFJdMrluWq
-WvXwtq5B+PQLjb42BmhBA59C06dCNyiJdYcGt6eqPFaGizjdLH/QTQkeD5v8ik2k
-0so3ocZPpR4cZKhTDoiQxDywpnP+ZJ/3UfwtzK4T9WTiip7alSqaOrs0aV2VHK54
-58VA8eiHnY+wTtxtm1m81aaHWm/CRe0g
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVALtpImI1/O45aUeC6eV2R+MYH/uvMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC50aHMuc2UwHhcNMTUxMTExMDkxODU4WhcNMzUx
-MTExMDkxODU4WjAVMRMwEQYDVQQDDAppZHAudGhzLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtUDQ13J3qxlTQ/bzLet+Y4xcjRkHeIWvQfUXIDDY
-Tl2PAFdvfTE63A77c/EGE/fE3x3Gqd/pLoOXF9xxrYt1CEUWSgLuMP6JYK2q3ByI
-ztL4AQRw6t313KRzsDH+qSnrA8m4o6w2ORx9Q8V6LSUfBXcqiUH8IdSJ2nkK4AEF
-/GDHtvYR0t3vxnARqa5bUtlBXc3lW8i4yet4lMnVVoDtvWQfVJ5i1AE3Uzys+RDK
-goRoKfHlayqiDYyuVmgP1wEB5b3yb5htTIvlrVAv3IBStRlmeDHPqc1ovrldOZFW
-mfhH9PB0qPVf6dsRRBBKO1yJJc7A4gRXjHJdQ8wMcvAYcwIDAQABo1swWTAdBgNV
-HQ4EFgQUeHLwS/y7FmX87CIT3IpanavrYW8wOAYDVR0RBDEwL4IKaWRwLnRocy5z
-ZYYhaHR0cHM6Ly9pZHAudGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCpSdEgMGI8XdHrUGfAAIqcYACudfOp80/rqpyOGPtO45qkBuYKrp3D
-yTts4EtDi3k5XCowH0TS9ODjgBCe/lOmDg05Ew/1dDc6pyxNUqMp1zRnmZ5DdzP8
-UxW2KAoh9mS3/6cbko76KQhxugnk0GDJa3OLGal3IKLg2aKh6iGQbdPgqPSqKeBV
-2SevIVPNCfKl9VGaxbkX9CGRLlB1YK3GBWUp4TvbsGC8+iM/+dXIQQy4Hh25vAzv
-SzSV1msy19QgIe/+OhBeq1VnedxuAXSKqpF+W7kTHhmq6f6bMUtlbkqJeeHiNQK6
-xAdB19mh1plahNrAaEfu6Ldetyz9iulY
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.totton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.totton.ac.uk-shibboleth.xml
deleted file mode 100644
index ecdb4db1..00000000
--- a/swamid-interfederations-2.0/idp.totton.ac.uk-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.totton.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Totton College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-07-04T18:55: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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">totton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						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
-						xw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.totton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.totton.ac.uk: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.totton.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.totton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.totton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.totton.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">totton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						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
-						xw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.totton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.totton.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">Totton College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Totton College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.totton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Dawson</SurName>
-    <EmailAddress>mailto:mdawson@totton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Dawson</SurName>
-    <EmailAddress>mailto:mdawson@totton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.treloar.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.treloar.org.uk-idp-shibboleth.xml
deleted file mode 100644
index 4a8dbe01..00000000
--- a/swamid-interfederations-2.0/idp.treloar.org.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.treloar.org.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Treloar Trust.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-13T12:44: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">treloar.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjACCQCcvr4PTH7CrzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
-						QjESMBAGA1UECAwJSGFtcHNoaXJlMQ4wDAYDVQQHDAVBbHRvbjEWMBQGA1UECgwN
-						VHJlbG9hciBUcnVzdDEbMBkGA1UEAwwSaWRwLnRyZWxvYXIub3JnLnVrMB4XDTEz
-						MDIxMjA4MzcyNFoXDTMzMDIwNzA4MzcyNFowZjELMAkGA1UEBhMCR0IxEjAQBgNV
-						BAgMCUhhbXBzaGlyZTEOMAwGA1UEBwwFQWx0b24xFjAUBgNVBAoMDVRyZWxvYXIg
-						VHJ1c3QxGzAZBgNVBAMMEmlkcC50cmVsb2FyLm9yZy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBALqJjfQAve2KE7DDgIOPkvSo8sNdrb3njZx1K2pk
-						NQCoeo9rWaLMQMpzXBCUiSb3De5bDTgob5PL8HlNWNg3bDoD1s27MTaX7PVuy7gi
-						uqrybbLftyaQSnCWuR7WNBQ4LuTMQ8ZaeS3bF1T5Gm3Pi969w2cmEhZOtxVzFELV
-						NauQggXYZnZ8o15XvG0xCsim9S7U6wt9/1sndhATdkZ+H4KXfYsrWnYtiluMVO9T
-						mzJUh7ZjLJqwaaWFaKJZE35tCgDEuNWdfOlw+2QbxCyGHBxH9mxEN1hEQej3ik/X
-						mP0j9a1q0OZQCwaB5FpNp4wbOV48s7dOzRDVAU1uHLvxvh8CAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEATC0F3HDRn0eYLwJHJfJIx7nU6VM7Ve+kkffRYR4LTB9JAZBb
-						fMPjWhI2sHJRfgkLHthcO8rcfe3p5Zd3xIg6DZtQHm97rr5+iBAakzvhkQHD9s+A
-						lUboeBwa9eEKu9UnpW4MAouDBy7XggaXNDj8n43s8RNW2awutCD57x8uyXlh+QnM
-						wr0C6lZjSkH22zeM1qgnYwxojYmFhuTyDDjTk9ue6wtp6pQO0M7/fRZyLAqD1JYY
-						UqFi0xw+GHyhgvqkcJ+dCRyi3BBD12URWsVCL4Yeyl6BeD7prS6Lh+nVzWX812yY
-						0zSsNXVMidAIgjgaNV0kJgK3D9QF2IVjRA0Atw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.treloar.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.treloar.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://idp.treloar.org.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.treloar.org.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.treloar.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.treloar.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">treloar.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjACCQCcvr4PTH7CrzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
-						QjESMBAGA1UECAwJSGFtcHNoaXJlMQ4wDAYDVQQHDAVBbHRvbjEWMBQGA1UECgwN
-						VHJlbG9hciBUcnVzdDEbMBkGA1UEAwwSaWRwLnRyZWxvYXIub3JnLnVrMB4XDTEz
-						MDIxMjA4MzcyNFoXDTMzMDIwNzA4MzcyNFowZjELMAkGA1UEBhMCR0IxEjAQBgNV
-						BAgMCUhhbXBzaGlyZTEOMAwGA1UEBwwFQWx0b24xFjAUBgNVBAoMDVRyZWxvYXIg
-						VHJ1c3QxGzAZBgNVBAMMEmlkcC50cmVsb2FyLm9yZy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBALqJjfQAve2KE7DDgIOPkvSo8sNdrb3njZx1K2pk
-						NQCoeo9rWaLMQMpzXBCUiSb3De5bDTgob5PL8HlNWNg3bDoD1s27MTaX7PVuy7gi
-						uqrybbLftyaQSnCWuR7WNBQ4LuTMQ8ZaeS3bF1T5Gm3Pi969w2cmEhZOtxVzFELV
-						NauQggXYZnZ8o15XvG0xCsim9S7U6wt9/1sndhATdkZ+H4KXfYsrWnYtiluMVO9T
-						mzJUh7ZjLJqwaaWFaKJZE35tCgDEuNWdfOlw+2QbxCyGHBxH9mxEN1hEQej3ik/X
-						mP0j9a1q0OZQCwaB5FpNp4wbOV48s7dOzRDVAU1uHLvxvh8CAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEATC0F3HDRn0eYLwJHJfJIx7nU6VM7Ve+kkffRYR4LTB9JAZBb
-						fMPjWhI2sHJRfgkLHthcO8rcfe3p5Zd3xIg6DZtQHm97rr5+iBAakzvhkQHD9s+A
-						lUboeBwa9eEKu9UnpW4MAouDBy7XggaXNDj8n43s8RNW2awutCD57x8uyXlh+QnM
-						wr0C6lZjSkH22zeM1qgnYwxojYmFhuTyDDjTk9ue6wtp6pQO0M7/fRZyLAqD1JYY
-						UqFi0xw+GHyhgvqkcJ+dCRyi3BBD12URWsVCL4Yeyl6BeD7prS6Lh+nVzWX812yY
-						0zSsNXVMidAIgjgaNV0kJgK3D9QF2IVjRA0Atw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.treloar.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.treloar.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">Treloar Trust</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Treloar's</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.treloar.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Overt Software</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Overt Software</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tresham.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tresham.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 1b1a645f..00000000
--- a/swamid-interfederations-2.0/idp.tresham.ac.uk-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" entityID="https://idp.tresham.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Tresham College of Further and Higher Education.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-22T08:15:19Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">tresham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDojCCAooCCQC38OS+e7lEUzANBgkqhkiG9w0BAQUFADCBkjELMAkGA1UEBhMC
-						R0IxGTAXBgNVBAgMEE5vcnRoYW1wdG9uc2hpcmUxEjAQBgNVBAcMCUtldHRlcmlu
-						ZzE4MDYGA1UECgwvVHJlc2hhbSBDb2xsZWdlIG9mIEZ1cnRoZXIgYW5kIEhpZ2hl
-						ciBFZHVjYXRpb24xGjAYBgNVBAMMEWlkcC50cmVzaGFtLmFjLnVrMB4XDTEzMDUx
-						NzA3NDIxOVoXDTMzMDUxMjA3NDIxOVowgZIxCzAJBgNVBAYTAkdCMRkwFwYDVQQI
-						DBBOb3J0aGFtcHRvbnNoaXJlMRIwEAYDVQQHDAlLZXR0ZXJpbmcxODA2BgNVBAoM
-						L1RyZXNoYW0gQ29sbGVnZSBvZiBGdXJ0aGVyIGFuZCBIaWdoZXIgRWR1Y2F0aW9u
-						MRowGAYDVQQDDBFpZHAudHJlc2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAMDNPjJPLfGBvb57Jln2kd2w6QLzt//vhZudjZZrKhQirlVD
-						8GAgVU7XYrZeHQLzLXQF1j2fZnLrzkRPFL15Ru9qkFeftSabMn1TeegKibLbUrFk
-						pMcUfFCs4j6ybNFt6ZCfIk426xTRFXVuLKSegPoQYj+dsTvlPIGt8SsRC/ydqP9C
-						IzwGwE6CjZPIiAa7Q9MyNs8G5tqZ9C7YPWy8ArG+SZ9Xt1iyXV4lerwmf2D147oR
-						Y03saO6fNSCknSBjAA6UP3xAE5HimHKwjvl5MXF1H0puVG5P3b+xfCT2yCMhbsRj
-						YJK4HSzYdCnRR91cxB8EISYRcbtVo2lKrsLw+LcCAwEAATANBgkqhkiG9w0BAQUF
-						AAOCAQEALJNw1SaVhAsHqu2ENnh9KNWDuaUA/b9k2M9nNSx4LWa9Lpkw1+qdjZQ+
-						tfVRIb2E2AJp9+7RuWKN9Xa6l0VenbumDeOpwhp8LooiZR+Qt9pIg28Be9bYics7
-						4qnQDA2b0HiLEMcM+xW0HCp5j0q9+RZPF7rtqdu/Yw6qtIkmWe/L6OqRUfVfTy70
-						ekbD3d5N/xvhGGKETyV3Yp0Ayw8aGjG1a4WCUn+r/IY3JuKjOq+QOMb5lkl0I4ol
-						6T7XDYHlahNcl1lrv1oMxKfQDO8ISaLr/BREEmKQBKOpZpxfrJ0ISW5f60ndYkRr
-						Zta8/DXmlXmxEaTCt9czo3528Y0HQQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tresham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tresham.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.tresham.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tresham.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.tresham.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tresham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tresham.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">tresham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDojCCAooCCQC38OS+e7lEUzANBgkqhkiG9w0BAQUFADCBkjELMAkGA1UEBhMC
-						R0IxGTAXBgNVBAgMEE5vcnRoYW1wdG9uc2hpcmUxEjAQBgNVBAcMCUtldHRlcmlu
-						ZzE4MDYGA1UECgwvVHJlc2hhbSBDb2xsZWdlIG9mIEZ1cnRoZXIgYW5kIEhpZ2hl
-						ciBFZHVjYXRpb24xGjAYBgNVBAMMEWlkcC50cmVzaGFtLmFjLnVrMB4XDTEzMDUx
-						NzA3NDIxOVoXDTMzMDUxMjA3NDIxOVowgZIxCzAJBgNVBAYTAkdCMRkwFwYDVQQI
-						DBBOb3J0aGFtcHRvbnNoaXJlMRIwEAYDVQQHDAlLZXR0ZXJpbmcxODA2BgNVBAoM
-						L1RyZXNoYW0gQ29sbGVnZSBvZiBGdXJ0aGVyIGFuZCBIaWdoZXIgRWR1Y2F0aW9u
-						MRowGAYDVQQDDBFpZHAudHJlc2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAMDNPjJPLfGBvb57Jln2kd2w6QLzt//vhZudjZZrKhQirlVD
-						8GAgVU7XYrZeHQLzLXQF1j2fZnLrzkRPFL15Ru9qkFeftSabMn1TeegKibLbUrFk
-						pMcUfFCs4j6ybNFt6ZCfIk426xTRFXVuLKSegPoQYj+dsTvlPIGt8SsRC/ydqP9C
-						IzwGwE6CjZPIiAa7Q9MyNs8G5tqZ9C7YPWy8ArG+SZ9Xt1iyXV4lerwmf2D147oR
-						Y03saO6fNSCknSBjAA6UP3xAE5HimHKwjvl5MXF1H0puVG5P3b+xfCT2yCMhbsRj
-						YJK4HSzYdCnRR91cxB8EISYRcbtVo2lKrsLw+LcCAwEAATANBgkqhkiG9w0BAQUF
-						AAOCAQEALJNw1SaVhAsHqu2ENnh9KNWDuaUA/b9k2M9nNSx4LWa9Lpkw1+qdjZQ+
-						tfVRIb2E2AJp9+7RuWKN9Xa6l0VenbumDeOpwhp8LooiZR+Qt9pIg28Be9bYics7
-						4qnQDA2b0HiLEMcM+xW0HCp5j0q9+RZPF7rtqdu/Yw6qtIkmWe/L6OqRUfVfTy70
-						ekbD3d5N/xvhGGKETyV3Yp0Ayw8aGjG1a4WCUn+r/IY3JuKjOq+QOMb5lkl0I4ol
-						6T7XDYHlahNcl1lrv1oMxKfQDO8ISaLr/BREEmKQBKOpZpxfrJ0ISW5f60ndYkRr
-						Zta8/DXmlXmxEaTCt9czo3528Y0HQQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tresham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tresham.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">Tresham College of Further and Higher Education</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Tresham College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tresham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stuart</GivenName>
-    <SurName>Mewes</SurName>
-    <EmailAddress>mailto:smewes@tresham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Foster</SurName>
-    <EmailAddress>mailto:mfoster@tresham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ttk.mta.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ttk.mta.hu-idp-shibboleth.xml
deleted file mode 100644
index 6ae7cab6..00000000
--- a/swamid-interfederations-2.0/idp.ttk.mta.hu-idp-shibboleth.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ttk.mta.hu/idp/shibboleth">
-  <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="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-test</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>href-idps</saml:AttributeValue>
-        <saml:AttributeValue>ttkmta</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">MTA Természettudományi Kutatóközpont</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">MTA Research Centre for  Natural Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">MTA Természettudományi Kutatóközpont</mdui:Description>
-        <mdui:Description xml:lang="en">MTA Research Centre for  Natural Sciences</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">http://www.ttk.mta.hu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://www.ttk.mta.hu/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="71" width="64">http://www.ttk.mta.hu/wp-content/themes/mtattk/images/mta-ttk-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttk.mta.hu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVAPuZvgXHs4goqCUIgI0GlxMmT88RMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNVBAMTDmlkcC50dGsubXRhLmh1MB4XDTEyMDQxMzEzMDkzOVoXDTMyMDQxMzEzMDkzOVowGTEXMBUGA1UEAxMOaWRwLnR0ay5tdGEuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvyY+F3sZWJ0RhGrCoIL2lCRIEEXJHzuoOHmemvyK5D9dtY5+38dwEIhIjgtOXGIVhKlAzxHyeZMWwBj8nH20qRK/da/JIl9P2eQMxf4BK40N/vA9VsT3KvA6mGKlUkqfPsDC1yYcaQkYZugVAmWcPL4gOMOaTfxpJGRYh5qknX0+bJsh8/aKLqTh6XbrqZv/Q9gWefamh5aGt1iornQy2JbtuFB3zTDa8X0q6UBZ41G/0h39IP08YY2wV49HwjQi//eHOPY2yuDrgo3o1iMiAxT1ffzOw4V1kxhPCsocojthf+PYirkkBc62x587fTtdDsX+zFx58VQCCroVyQtHJAgMBAAGjYzBhMEAGA1UdEQQ5MDeCDmlkcC50dGsubXRhLmh1hiVodHRwczovL2lkcC50dGsubXRhLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTz4rTZcnlkrQGjs5CRN+3b4GUNnzANBgkqhkiG9w0BAQUFAAOCAQEAiePPbghl172ENP6zQfA4Wxk1vm0ePemu3tZf7H7B2TDXC6c7KSigHwm96SLclqR6jgQi8htDpeYlC/YIWvO9CU7sb9Xk/JGnSUHvboV4TJqCDBuJPMIdTbyPwN6Tfh0QlPFydMgaJbjmOpyfKBNJG6p/d10tDVBDLCf7+ru9yrKR/OtpV9GkWoxZlzLKGJGNRiYtrrqDFtH/vz5tywE3X4jXS0Oaa6Q4vEGvybhfMQNhBanLwNrdkoQu3uaAhXhmQAx2RUksK1o9Brq6NzBILhRAzra0amCAhOXlrbEjYjYScbZ2gH6B5Nf0TQb+GwKVvEFBBGtzwRDzdyOb3Q7BVA==</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.ttk.mta.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ttk.mta.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ttk.mta.hu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor 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>MIIDJDCCAgygAwIBAgIVAPuZvgXHs4goqCUIgI0GlxMmT88RMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNVBAMTDmlkcC50dGsubXRhLmh1MB4XDTEyMDQxMzEzMDkzOVoXDTMyMDQxMzEzMDkzOVowGTEXMBUGA1UEAxMOaWRwLnR0ay5tdGEuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvyY+F3sZWJ0RhGrCoIL2lCRIEEXJHzuoOHmemvyK5D9dtY5+38dwEIhIjgtOXGIVhKlAzxHyeZMWwBj8nH20qRK/da/JIl9P2eQMxf4BK40N/vA9VsT3KvA6mGKlUkqfPsDC1yYcaQkYZugVAmWcPL4gOMOaTfxpJGRYh5qknX0+bJsh8/aKLqTh6XbrqZv/Q9gWefamh5aGt1iornQy2JbtuFB3zTDa8X0q6UBZ41G/0h39IP08YY2wV49HwjQi//eHOPY2yuDrgo3o1iMiAxT1ffzOw4V1kxhPCsocojthf+PYirkkBc62x587fTtdDsX+zFx58VQCCroVyQtHJAgMBAAGjYzBhMEAGA1UdEQQ5MDeCDmlkcC50dGsubXRhLmh1hiVodHRwczovL2lkcC50dGsubXRhLmh1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTz4rTZcnlkrQGjs5CRN+3b4GUNnzANBgkqhkiG9w0BAQUFAAOCAQEAiePPbghl172ENP6zQfA4Wxk1vm0ePemu3tZf7H7B2TDXC6c7KSigHwm96SLclqR6jgQi8htDpeYlC/YIWvO9CU7sb9Xk/JGnSUHvboV4TJqCDBuJPMIdTbyPwN6Tfh0QlPFydMgaJbjmOpyfKBNJG6p/d10tDVBDLCf7+ru9yrKR/OtpV9GkWoxZlzLKGJGNRiYtrrqDFtH/vz5tywE3X4jXS0Oaa6Q4vEGvybhfMQNhBanLwNrdkoQu3uaAhXhmQAx2RUksK1o9Brq6NzBILhRAzra0amCAhOXlrbEjYjYScbZ2gH6B5Nf0TQb+GwKVvEFBBGtzwRDzdyOb3Q7BVA==</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>idp.ttk.mta.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ttk.mta.hu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">MTA Természettudományi Kutatóközpont</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">MTA Research Centre for  Natural Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">MTA Természettudományi Kutatóközpont</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">MTA Research Centre for  Natural Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">www.ttk.mta.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">www.ttk.mta.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>MTA TTK AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@ttk.mta.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>MTA TTK AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@ttk.mta.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>MTA TTK AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@mta.ttk.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tu-clausthal.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tu-clausthal.de-idp-shibboleth.xml
deleted file mode 100644
index 06690610..00000000
--- a/swamid-interfederations-2.0/idp.tu-clausthal.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tu-clausthal.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-01-23T11:26: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-support" 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: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">tu-clausthal.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Technische Universität Clausthal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Technische Universität Clausthal</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider fuer TU Clausthal</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider fuer TU Clausthal</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp.tu-clausthal.de/idp/images/tu-clausthal-klein.gif</mdui:Logo>
-        <mdui:Logo height="64" width="344">https://idp.tu-clausthal.de/idp/images/tu-clausthal.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.tu-clausthal.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.tu-clausthal.de/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.tu-clausthal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.tu-clausthal.de,OU=Rechenzentrum,O=Technische Universitaet Clausthal,L=Clausthal,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGFjCCBP6gAwIBAgIHGYPBFL1P5DANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
-BhMCREUxKjAoBgNVBAoTIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhh
-bDEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVVFUgQ2xhdXN0aGFs
-IENBIC0gRzAyMSUwIwYJKoZIhvcNAQkBFhZwa2lAcnoudHUtY2xhdXN0aGFsLmRl
-MB4XDTE1MDUyNjA5NTcyNFoXDTE4MDgyMjA5NTcyNFowgZsxCzAJBgNVBAYTAkRF
-MRYwFAYDVQQIDA1OaWVkZXJzYWNoc2VuMRIwEAYDVQQHDAlDbGF1c3RoYWwxKjAo
-BgNVBAoMIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhhbDEWMBQGA1UE
-CwwNUmVjaGVuemVudHJ1bTEcMBoGA1UEAwwTaWRwLnR1LWNsYXVzdGhhbC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8dQ1yD1h3p7WqDYEqr9Tyq
-HuIlieENlKdBpliRhuKx+7jcjLqxwK/kEo47/kIPyU5IJahAPvr/jrENRgtOvFZP
-3+K8gyuG58aNwRvypn96mHw0CLuI6in+0zGVVjFka39QoGtZl6zqz6eQO0pj6UIg
-jp0Ed92uMFVNtQDx5D+e9XLgoDPlTaluq3WZbF8Idb6rmx4JLhwq8RHFXm0FsXOI
-IOaHsqLPrpULZeEoPYH8WDWga6VSPzs/KzchDIckwddiC4ucdoCW1cSkyE1P2fH7
-LQG6qkn6Ozvu8lrh/n7Y+CGq+gt8pxKUPExLdTxcoTLPQW/9BLjoizPpeEIVLdcC
-AwEAAaOCAl4wggJaME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMDMBEGDysG
-AQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
-BQcDATAdBgNVHQ4EFgQUxfRahHKtgk/Jjh8Px60jbWcLJ+8wHwYDVR0jBBgwFoAU
-YvySt+ft8x81VVvJQ99Qs170ECUwHgYDVR0RBBcwFYITaWRwLnR1LWNsYXVzdGhh
-bC5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3R1LWNsYXVzdGhhbC1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMECgPqA8hjpodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3R1LWNsYXVzdGhhbC1jYS9wdWIvY3JsL2dfY2Fj
-cmwuY3JsMIHdBggrBgEFBQcBAQSB0DCBzTAzBggrBgEFBQcwAYYnaHR0cDovL29j
-c3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWNsYXVzdGhhbC1jYS9wdWIvY2FjZXJ0L2df
-Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
-dS1jbGF1c3RoYWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQELBQADggEBAIwyYNeTslcAsDJiqK56lJLlFUUKHRoZWnRWob7cOrFmvRcL8DRV
-IyMWvmUNbb+/msH3QqQPh1BbnZNQKE4p+nNcYXNrvsudLcUD2LF/4VXEM4qa7ggM
-VwCm5pDPXFsMiW3hR6fSIG0LsD3iGndqpPUsOu3TNQz07eREcFYeRb0R5jbPNDIn
-QdDf7Xyhyu/vmDAwaCd2ltaKfk/cxieJPdIFjGowQZfXJ93W62e2yOi/vNthBfTh
-yOLfr414njnVFq83qB9rXvRkyllzFCMiFipjedH8NBlr/H9eLMTxhOrTyVrDUZtA
-+A9Tm6pmSCWUc89MfO/PCoexbG5rxNoaedI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tu-clausthal.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tu-clausthal.de/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">tu-clausthal.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.tu-clausthal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.tu-clausthal.de,OU=Rechenzentrum,O=Technische Universitaet Clausthal,L=Clausthal,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGFjCCBP6gAwIBAgIHGYPBFL1P5DANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
-BhMCREUxKjAoBgNVBAoTIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhh
-bDEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVVFUgQ2xhdXN0aGFs
-IENBIC0gRzAyMSUwIwYJKoZIhvcNAQkBFhZwa2lAcnoudHUtY2xhdXN0aGFsLmRl
-MB4XDTE1MDUyNjA5NTcyNFoXDTE4MDgyMjA5NTcyNFowgZsxCzAJBgNVBAYTAkRF
-MRYwFAYDVQQIDA1OaWVkZXJzYWNoc2VuMRIwEAYDVQQHDAlDbGF1c3RoYWwxKjAo
-BgNVBAoMIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhhbDEWMBQGA1UE
-CwwNUmVjaGVuemVudHJ1bTEcMBoGA1UEAwwTaWRwLnR1LWNsYXVzdGhhbC5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8dQ1yD1h3p7WqDYEqr9Tyq
-HuIlieENlKdBpliRhuKx+7jcjLqxwK/kEo47/kIPyU5IJahAPvr/jrENRgtOvFZP
-3+K8gyuG58aNwRvypn96mHw0CLuI6in+0zGVVjFka39QoGtZl6zqz6eQO0pj6UIg
-jp0Ed92uMFVNtQDx5D+e9XLgoDPlTaluq3WZbF8Idb6rmx4JLhwq8RHFXm0FsXOI
-IOaHsqLPrpULZeEoPYH8WDWga6VSPzs/KzchDIckwddiC4ucdoCW1cSkyE1P2fH7
-LQG6qkn6Ozvu8lrh/n7Y+CGq+gt8pxKUPExLdTxcoTLPQW/9BLjoizPpeEIVLdcC
-AwEAAaOCAl4wggJaME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMDMBEGDysG
-AQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
-BQcDATAdBgNVHQ4EFgQUxfRahHKtgk/Jjh8Px60jbWcLJ+8wHwYDVR0jBBgwFoAU
-YvySt+ft8x81VVvJQ99Qs170ECUwHgYDVR0RBBcwFYITaWRwLnR1LWNsYXVzdGhh
-bC5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3R1LWNsYXVzdGhhbC1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMECgPqA8hjpodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3R1LWNsYXVzdGhhbC1jYS9wdWIvY3JsL2dfY2Fj
-cmwuY3JsMIHdBggrBgEFBQcBAQSB0DCBzTAzBggrBgEFBQcwAYYnaHR0cDovL29j
-c3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3R1LWNsYXVzdGhhbC1jYS9wdWIvY2FjZXJ0L2df
-Y2FjZXJ0LmNydDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS90
-dS1jbGF1c3RoYWwtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcN
-AQELBQADggEBAIwyYNeTslcAsDJiqK56lJLlFUUKHRoZWnRWob7cOrFmvRcL8DRV
-IyMWvmUNbb+/msH3QqQPh1BbnZNQKE4p+nNcYXNrvsudLcUD2LF/4VXEM4qa7ggM
-VwCm5pDPXFsMiW3hR6fSIG0LsD3iGndqpPUsOu3TNQz07eREcFYeRb0R5jbPNDIn
-QdDf7Xyhyu/vmDAwaCd2ltaKfk/cxieJPdIFjGowQZfXJ93W62e2yOi/vNthBfTh
-yOLfr414njnVFq83qB9rXvRkyllzFCMiFipjedH8NBlr/H9eLMTxhOrTyVrDUZtA
-+A9Tm6pmSCWUc89MfO/PCoexbG5rxNoaedI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de: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">e291</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e291</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Technische Universität Clausthal</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Technische Universität Clausthal</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.tu-clausthal.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tu-clausthal.de/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alexander</md:GivenName>
-    <md:SurName>Hasenfuß</md:SurName>
-    <md:EmailAddress>mailto:hasenfuss@rz.tu-clausthal.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Alexander</md:GivenName>
-    <md:SurName>Hasenfuß</md:SurName>
-    <md:EmailAddress>mailto:hasenfuss@rz.tu-clausthal.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tu-clausthal.de.xml b/swamid-interfederations-2.0/idp.tu-clausthal.de.xml
deleted file mode 100644
index 5882bc73..00000000
--- a/swamid-interfederations-2.0/idp.tu-clausthal.de.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tu-clausthal.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-clausthal.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.tu-clausthal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.tu-clausthal.de,OU=Rechenzentrum,O=Technische Universitaet Clausthal,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFajCCBFKgAwIBAgIHEzeWYlp+0DANBgkqhkiG9w0BAQUFADCBmDELMAkGA1UE
-BhMCREUxKjAoBgNVBAoTIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhh
-bDEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVVFUgQ2xhdXN0aGFs
-IENBIC0gRzAyMSUwIwYJKoZIhvcNAQkBFhZwa2lAcnoudHUtY2xhdXN0aGFsLmRl
-MB4XDTEyMDExOTEzMjEyMloXDTE3MDExNzEzMjEyMlowbzELMAkGA1UEBhMCREUx
-KjAoBgNVBAoTIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhhbDEWMBQG
-A1UECxMNUmVjaGVuemVudHJ1bTEcMBoGA1UEAxMTaWRwLnR1LWNsYXVzdGhhbC5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOTXMm5lk1dD5aFAodbn
-3Hb1BO6e91Z4lMKSnYeWErJhs91SvbeKPRIF9Hsp6jJJWcxhN7yX8LsQlFyxf6Y6
-T9RGtJYdaalamdVc+E9hfojRC3ZMcmiR9Mw29JZuHOQenRRzOqkKWBwtphZqdwMw
-iFQ1dI/c4ZvIs0a2iTfXOENY+b3R/MLX3TEKvGL0dDiLqfP086Brp2D3ZYT64/yn
-QFvRHQOJ92HVZUJ+rzTtFcwycU3ylFzLnxMml/6gRYzO1Q10EtGB7TnNo0sNXY9d
-Nk/ypCNfxP9nYVpFjTQzhUx9hPJUL9ONjbRqPuDN6wmZZORwMfNppa0nqIIZ+a79
-micCAwEAAaOCAd8wggHbMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUMzoVo6zpqDLp6HBsV7Kv
-rcDrXMswHwYDVR0jBBgwFoAUYvySt+ft8x81VVvJQ99Qs170ECUwJQYDVR0RBB4w
-HIEac3VwcG9ydEByei50dS1jbGF1c3RoYWwuZGUwgY8GA1UdHwSBhzCBhDBAoD6g
-PIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS90dS1jbGF1c3RoYWwtY2EvcHViL2Ny
-bC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1j
-bGF1c3RoYWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZsw
-gZgwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2xhdXN0
-aGFsLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3R1LWNsYXVzdGhhbC1jYS9wdWIvY2FjZXJ0L2df
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARsQhmJny/CMVM0+iHo/bchZa
-6crTTbKyEcBexnQlTcKxid6DK+gquIM4U9eCE+1cxgY0kZ9Q/aph1kV0OwGMFGQM
-k5NSRVBlI9Ih/5pWm1lLXEs7tQLF4+L63Z/N15mjzVrnxXZDuQI9YV4V8MnWyRb9
-hEw2ifP/jHV+6yqCe6Nl09DZK4miW5KGEQxVpM975zfCRIOf2INo1//b7wFD7aMR
-mOApGzt7PRZFHR0in3DGFTN5ILSyavrNvHbBXGtaEV2NAtTCqmFBOnlDpGrVz8L8
-yozMpjXfBly8IwiZNQ8GiI4m4oGiv4973ZOwk1njfaI8s82Uq45yjKxs/xhK8g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tu-clausthal.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tu-clausthal.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-clausthal.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.tu-clausthal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.tu-clausthal.de,OU=Rechenzentrum,O=Technische Universitaet Clausthal,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFajCCBFKgAwIBAgIHEzeWYlp+0DANBgkqhkiG9w0BAQUFADCBmDELMAkGA1UE
-BhMCREUxKjAoBgNVBAoTIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhh
-bDEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTEeMBwGA1UEAxMVVFUgQ2xhdXN0aGFs
-IENBIC0gRzAyMSUwIwYJKoZIhvcNAQkBFhZwa2lAcnoudHUtY2xhdXN0aGFsLmRl
-MB4XDTEyMDExOTEzMjEyMloXDTE3MDExNzEzMjEyMlowbzELMAkGA1UEBhMCREUx
-KjAoBgNVBAoTIVRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENsYXVzdGhhbDEWMBQG
-A1UECxMNUmVjaGVuemVudHJ1bTEcMBoGA1UEAxMTaWRwLnR1LWNsYXVzdGhhbC5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOTXMm5lk1dD5aFAodbn
-3Hb1BO6e91Z4lMKSnYeWErJhs91SvbeKPRIF9Hsp6jJJWcxhN7yX8LsQlFyxf6Y6
-T9RGtJYdaalamdVc+E9hfojRC3ZMcmiR9Mw29JZuHOQenRRzOqkKWBwtphZqdwMw
-iFQ1dI/c4ZvIs0a2iTfXOENY+b3R/MLX3TEKvGL0dDiLqfP086Brp2D3ZYT64/yn
-QFvRHQOJ92HVZUJ+rzTtFcwycU3ylFzLnxMml/6gRYzO1Q10EtGB7TnNo0sNXY9d
-Nk/ypCNfxP9nYVpFjTQzhUx9hPJUL9ONjbRqPuDN6wmZZORwMfNppa0nqIIZ+a79
-micCAwEAAaOCAd8wggHbMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUMzoVo6zpqDLp6HBsV7Kv
-rcDrXMswHwYDVR0jBBgwFoAUYvySt+ft8x81VVvJQ99Qs170ECUwJQYDVR0RBB4w
-HIEac3VwcG9ydEByei50dS1jbGF1c3RoYWwuZGUwgY8GA1UdHwSBhzCBhDBAoD6g
-PIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS90dS1jbGF1c3RoYWwtY2EvcHViL2Ny
-bC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1j
-bGF1c3RoYWwtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZsw
-gZgwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2xhdXN0
-aGFsLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3R1LWNsYXVzdGhhbC1jYS9wdWIvY2FjZXJ0L2df
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEARsQhmJny/CMVM0+iHo/bchZa
-6crTTbKyEcBexnQlTcKxid6DK+gquIM4U9eCE+1cxgY0kZ9Q/aph1kV0OwGMFGQM
-k5NSRVBlI9Ih/5pWm1lLXEs7tQLF4+L63Z/N15mjzVrnxXZDuQI9YV4V8MnWyRb9
-hEw2ifP/jHV+6yqCe6Nl09DZK4miW5KGEQxVpM975zfCRIOf2INo1//b7wFD7aMR
-mOApGzt7PRZFHR0in3DGFTN5ILSyavrNvHbBXGtaEV2NAtTCqmFBOnlDpGrVz8L8
-yozMpjXfBly8IwiZNQ8GiI4m4oGiv4973ZOwk1njfaI8s82Uq45yjKxs/xhK8g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-clausthal.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Technische Universitaet Claustha</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Technische Universität Clausthal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-clausthal.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Alexander</GivenName>
-    <SurName>Hasenfuß</SurName>
-    <EmailAddress>hasenfuss@rz.tu-clausthal.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tu-ilmenau.de.xml b/swamid-interfederations-2.0/idp.tu-ilmenau.de.xml
deleted file mode 100644
index 038d4caf..00000000
--- a/swamid-interfederations-2.0/idp.tu-ilmenau.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tu-ilmenau.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-ilmenau.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.tu-ilmenau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.tu-ilmenau.de,O=Technische Universitaet Ilmenau,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE6jCCA9KgAwIBAgIEDy9EHDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJE
-RTEoMCYGA1UEChMfVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgSWxtZW5hdTEWMBQG
-A1UEAxMNVFUgSWxtZW5hdSBDQTEgMB4GCSqGSIb3DQEJARYRcGtpQHR1LWlsbWVu
-YXUuZGUwHhcNMDkxMTI3MTIzMTA5WhcNMTQxMTI2MTIzMTA5WjBTMQswCQYDVQQG
-EwJERTEoMCYGA1UEChMfVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgSWxtZW5hdTEa
-MBgGA1UEAxMRaWRwLnR1LWlsbWVuYXUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDGHzz+8LX3FKDhBfG0cR57P7CSxTH+HMlETF9aBVLCjz94Xmbj
-8cdbqUaNmnXett+gpSpv1GqeoRRJV6eJX28O1W/L6GWq7bjKpIlqAX4JFrl3rzDM
-gGdGfZTHeVXE9ZOTdqzChK56t7g0ESMcKvR6qSLi/khPdQVK/0wmVaok7rQkNk1P
-MdyVDIvSqIT+7PpzRSMYOJgyc9jq1w1ZegnesWbfPG6oDwX9RNyhpFbOPy+PJZUV
-3nlst3uUIIFjQ72T6tJt8F/e/iRLc2JJHdNvu7P3wTzP3L9nvP1V2QW5VpZjFRpa
-NUwdjS3tCC/6iQjjRGj5ug8EMzyANLNOoOf/AgMBAAGjggGmMIIBojAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFPmo0qBBDnJPpqs+B2LxkPepL1s9MB8GA1UdIwQYMBaAFNTDRRKK
-qetNpcpWf2nRwmh0Y/0BMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3R1LWlsbWVuYXUtY2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiG
-Nmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtaWxtZW5hdS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdHUtaWxtZW5hdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtaWxtZW5h
-dS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABdc
-mXTLe/TlwLaKdKZTLZO5TjTH3zSWocQ0O6+kBJ2EVfYfmeL+ZS/J5v17tVMsQWBg
-rB1dtLSwuqbKYmuQBSQCIN8HdGC4iudCd93hGkSKxr11fByjvIb4fWUUcKObFmcI
-/1LpS/MSqxlOk3FRIMKs7fL7EFs59iyI3zjJixsQTx8AlU+7OHACGuC7VCfKJk7B
-1ChawQJNn6R1vMguYFXbGGhSQiUfeLVBDan7Px5eVgAIo2GLFKhNifPcG4lMHnfv
-0gOxyxgL/mnHXNkM+W47BpE1HO4fgoJiluR60Q0O+yjPCTjES3pjJtYb2ZOcXjNb
-s/NTn9EiARtxg0zkLNo=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-ilmenau.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-ilmenau.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tu-ilmenau.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tu-ilmenau.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tu-ilmenau.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tu-ilmenau.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-ilmenau.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.tu-ilmenau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.tu-ilmenau.de,O=Technische Universitaet Ilmenau,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE6jCCA9KgAwIBAgIEDy9EHDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJE
-RTEoMCYGA1UEChMfVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgSWxtZW5hdTEWMBQG
-A1UEAxMNVFUgSWxtZW5hdSBDQTEgMB4GCSqGSIb3DQEJARYRcGtpQHR1LWlsbWVu
-YXUuZGUwHhcNMDkxMTI3MTIzMTA5WhcNMTQxMTI2MTIzMTA5WjBTMQswCQYDVQQG
-EwJERTEoMCYGA1UEChMfVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgSWxtZW5hdTEa
-MBgGA1UEAxMRaWRwLnR1LWlsbWVuYXUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDGHzz+8LX3FKDhBfG0cR57P7CSxTH+HMlETF9aBVLCjz94Xmbj
-8cdbqUaNmnXett+gpSpv1GqeoRRJV6eJX28O1W/L6GWq7bjKpIlqAX4JFrl3rzDM
-gGdGfZTHeVXE9ZOTdqzChK56t7g0ESMcKvR6qSLi/khPdQVK/0wmVaok7rQkNk1P
-MdyVDIvSqIT+7PpzRSMYOJgyc9jq1w1ZegnesWbfPG6oDwX9RNyhpFbOPy+PJZUV
-3nlst3uUIIFjQ72T6tJt8F/e/iRLc2JJHdNvu7P3wTzP3L9nvP1V2QW5VpZjFRpa
-NUwdjS3tCC/6iQjjRGj5ug8EMzyANLNOoOf/AgMBAAGjggGmMIIBojAJBgNVHRME
-AjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-HQYDVR0OBBYEFPmo0qBBDnJPpqs+B2LxkPepL1s9MB8GA1UdIwQYMBaAFNTDRRKK
-qetNpcpWf2nRwmh0Y/0BMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3R1LWlsbWVuYXUtY2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiG
-Nmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtaWxtZW5hdS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdHUtaWxtZW5hdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHUtaWxtZW5h
-dS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABdc
-mXTLe/TlwLaKdKZTLZO5TjTH3zSWocQ0O6+kBJ2EVfYfmeL+ZS/J5v17tVMsQWBg
-rB1dtLSwuqbKYmuQBSQCIN8HdGC4iudCd93hGkSKxr11fByjvIb4fWUUcKObFmcI
-/1LpS/MSqxlOk3FRIMKs7fL7EFs59iyI3zjJixsQTx8AlU+7OHACGuC7VCfKJk7B
-1ChawQJNn6R1vMguYFXbGGhSQiUfeLVBDan7Px5eVgAIo2GLFKhNifPcG4lMHnfv
-0gOxyxgL/mnHXNkM+W47BpE1HO4fgoJiluR60Q0O+yjPCTjES3pjJtYb2ZOcXjNb
-s/NTn9EiARtxg0zkLNo=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tu-ilmenau.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tu-ilmenau.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Technische Universitaet Ilmenau</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Technische Universität Ilmenau</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-ilmenau.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jörg</GivenName>
-    <SurName>Deutschmann</SurName>
-    <EmailAddress>joerg.deutschmann@tu-ilmenau.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tuc.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tuc.gr-idp-shibboleth.xml
deleted file mode 100644
index 45af8732..00000000
--- a/swamid-interfederations-2.0/idp.tuc.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tuc.gr/idp/shibboleth">
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">tuc.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEjjCCA3agAwIBAgIQMYf7ZsbgCWkt+2p569I1YTANBgkqhkiG9w0BAQsFADBk
-                            MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-                            QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-                            Q0EgMjAeFw0xNDEyMjQwMDAwMDBaFw0xNzEyMjMyMzU5NTlaMDgxITAfBgNVBAsT
-                            GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLnR1Yy5ncjCC
-                            ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPl2jl70fzGzbBppRRY30YhH
-                            gDRoib4kn2S2qYMPs2bw8OWtm9PLZS6xk3HztxRFqtrL8jJxpsC2npqwJywPHj28
-                            sKsV61+KsQKMWZiFnZ1SLqBR3r2wdbOjfo/lK13T1qIBIV9CmVXqttcbTPIsw6nR
-                            1PWu10s/knrZDee7AhGOOvgmUavfVUtlulGIYPMdi7C9kb3FEJMXR61V7Cgb56ml
-                            0NFSsGI9jaXSIvpblbFywy6R3Kw5gZ1JE1Y/yxVVEjt0v7IbcTUa/AKfrv7j2J0y
-                            sYHeI9BczBKFbpripSR7DU3KLi2hjqPqYZ/URZWfhLpH4o563hLQwefiw50IoQkC
-                            AwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvhhiiw/ba9MB0G
-                            A1UdDgQWBBTI0dADAIKpcMiJtBqezPWf58NJpTAOBgNVHQ8BAf8EBAMCBaAwDAYD
-                            VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0g
-                            BBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4Yp
-                            aHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcmwwbAYIKwYB
-                            BQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20v
-                            VEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRy
-                            dXN0LmNvbTAVBgNVHREEDjAMggppZHAudHVjLmdyMA0GCSqGSIb3DQEBCwUAA4IB
-                            AQBezECQPXNNhC5lCMqO7cMk6QfefuppTl3KwQVZiEsdVEoasgKBRUhq/wQXRDTZ
-                            9VB0o+k27N0sk+Dc5v2BJ6vKAHZSG08F9J7SWgw4Olor3LWYNkrTQvyGxRWD+1GC
-                            XGmwxXrBLrW0zF9+4hMaMEzuP+6WPr0Sv0kUwBPQXtWkM12JD5mYIdS7M1gmAbSZ
-                            MbN6EYpTfPrb7JqYY0t3gZexBRyKDpP82YcswojuoSKq0OOarg9jh1syyS6cCMGR
-                            ytOGEeeF3NGmU7xV32pp/sxeXWoTwIxjDKZpjX73cDccJ66JdKWRJ+S5v29171Ai
-                            jNeA3T/IKJba0h3PXstHdm6R
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tuc.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tuc.gr: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.tuc.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tuc.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tuc.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tuc.gr/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">tuc.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEjjCCA3agAwIBAgIQMYf7ZsbgCWkt+2p569I1YTANBgkqhkiG9w0BAQsFADBk
-                            MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-                            QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-                            Q0EgMjAeFw0xNDEyMjQwMDAwMDBaFw0xNzEyMjMyMzU5NTlaMDgxITAfBgNVBAsT
-                            GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLnR1Yy5ncjCC
-                            ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPl2jl70fzGzbBppRRY30YhH
-                            gDRoib4kn2S2qYMPs2bw8OWtm9PLZS6xk3HztxRFqtrL8jJxpsC2npqwJywPHj28
-                            sKsV61+KsQKMWZiFnZ1SLqBR3r2wdbOjfo/lK13T1qIBIV9CmVXqttcbTPIsw6nR
-                            1PWu10s/knrZDee7AhGOOvgmUavfVUtlulGIYPMdi7C9kb3FEJMXR61V7Cgb56ml
-                            0NFSsGI9jaXSIvpblbFywy6R3Kw5gZ1JE1Y/yxVVEjt0v7IbcTUa/AKfrv7j2J0y
-                            sYHeI9BczBKFbpripSR7DU3KLi2hjqPqYZ/URZWfhLpH4o563hLQwefiw50IoQkC
-                            AwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvhhiiw/ba9MB0G
-                            A1UdDgQWBBTI0dADAIKpcMiJtBqezPWf58NJpTAOBgNVHQ8BAf8EBAMCBaAwDAYD
-                            VR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0g
-                            BBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4Yp
-                            aHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcmwwbAYIKwYB
-                            BQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20v
-                            VEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRy
-                            dXN0LmNvbTAVBgNVHREEDjAMggppZHAudHVjLmdyMA0GCSqGSIb3DQEBCwUAA4IB
-                            AQBezECQPXNNhC5lCMqO7cMk6QfefuppTl3KwQVZiEsdVEoasgKBRUhq/wQXRDTZ
-                            9VB0o+k27N0sk+Dc5v2BJ6vKAHZSG08F9J7SWgw4Olor3LWYNkrTQvyGxRWD+1GC
-                            XGmwxXrBLrW0zF9+4hMaMEzuP+6WPr0Sv0kUwBPQXtWkM12JD5mYIdS7M1gmAbSZ
-                            MbN6EYpTfPrb7JqYY0t3gZexBRyKDpP82YcswojuoSKq0OOarg9jh1syyS6cCMGR
-                            ytOGEeeF3NGmU7xV32pp/sxeXWoTwIxjDKZpjX73cDccJ66JdKWRJ+S5v29171Ai
-                            jNeA3T/IKJba0h3PXstHdm6R
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tuc.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tuc.gr: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">Technical University of Crete</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Πολυτεχνείο Κρήτης</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technical University of Crete</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Πολυτεχνείο Κρήτης</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.tuc.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.tuc.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Vasilis</md:GivenName>
-    <md:SurName>Papadakis</md:SurName>
-    <md:EmailAddress>idpHelp@lists.tuc.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-28210-37512</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Technical University of Crete Support</md:Company>
-    <md:EmailAddress>idpHelp@lists.tuc.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-28210-37512</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tulane.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.tulane.edu-idp-shibboleth.xml
deleted file mode 100644
index 970ab9b0..00000000
--- a/swamid-interfederations-2.0/idp.tulane.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://idp.tulane.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.tulane.edu/idp/error.jsp" 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">tulane.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Tulane University</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>
-MIIDJDCCAgygAwIBAgIVAOM4RMfBQji0Gpr8ZAah2qVCyrRqMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC50dWxhbmUuZWR1MB4XDTExMDMwNTAyMDgwNFoX
-DTMxMDMwNTAyMDgwNFowGTEXMBUGA1UEAxMOaWRwLnR1bGFuZS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNglzmRkmm9GnUzXj+aMGQP6FG1QRc
-caZbNP5Iirb/xI/9BdibwieQ/u27EcY6RtHsXxo/Og6leBF8ZIDDujxg9YHF6j7y
-6o0kDTZsNpe+s1XrUNFbKIiO2KXSR+kECHNdhmLosn2RkPs0xPCKHAvj2y5f2Res
-PAW3/OunoxApGl8FzojvN1dcyy7vvG8ku+G0TsOgYXTbV/ge0MhO9zUqcdNGmX6v
-RMQkVfiweeTrVTD7O85xMUWqgCnmp5o5DZkMpuqJQE3fZ3V7Uqyih0yhkCapYz54
-Q7MD36fGfc8J6CnFdaI9yvZT9K8wyDdJQOODL+n8MoilChD65joySlZ9AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC50dWxhbmUuZWR1hiVodHRwczovL2lkcC50dWxh
-bmUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQmI5B3stl/tQTgiYPmiNZ5
-hGM+tTANBgkqhkiG9w0BAQUFAAOCAQEAaN5G4XNfkdlwUlUEWtdYg5fdDe4R7z36
-DiE6oB7fgeYGqRWtPtaw3gcZChzGhxd36rW9z5PEVSybnruxZDhhpMljeIBcw+Z2
-7C0awG6iQU8NsuSmnCqzLUlYctgqRq66KGUM3bkYDfBDdCvAPbkkNfAPweZ9jp4U
-qsndPfh/4A4j9Zyj9X3XPRUYTvpcQ2XveBiKyA70ZF6WGbqLALw7/g07NH6wW9js
-0dlMhOhrgRu07YFATFwg4RidRkvfUsbjGXgGJ+BxlZzIbrB9hacSRQdNxddtIWO+
-7m01Z344mGsZ1ZDR8bdPepRQi3B8efL6qJXsw3pzQE/xruoBU+jCJg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tulane.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tulane.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tulane.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tulane.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tulane.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.tulane.edu/idp/profile/SAML2/POST-SimpleSign/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">tulane.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAOM4RMfBQji0Gpr8ZAah2qVCyrRqMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC50dWxhbmUuZWR1MB4XDTExMDMwNTAyMDgwNFoX
-DTMxMDMwNTAyMDgwNFowGTEXMBUGA1UEAxMOaWRwLnR1bGFuZS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNglzmRkmm9GnUzXj+aMGQP6FG1QRc
-caZbNP5Iirb/xI/9BdibwieQ/u27EcY6RtHsXxo/Og6leBF8ZIDDujxg9YHF6j7y
-6o0kDTZsNpe+s1XrUNFbKIiO2KXSR+kECHNdhmLosn2RkPs0xPCKHAvj2y5f2Res
-PAW3/OunoxApGl8FzojvN1dcyy7vvG8ku+G0TsOgYXTbV/ge0MhO9zUqcdNGmX6v
-RMQkVfiweeTrVTD7O85xMUWqgCnmp5o5DZkMpuqJQE3fZ3V7Uqyih0yhkCapYz54
-Q7MD36fGfc8J6CnFdaI9yvZT9K8wyDdJQOODL+n8MoilChD65joySlZ9AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC50dWxhbmUuZWR1hiVodHRwczovL2lkcC50dWxh
-bmUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQmI5B3stl/tQTgiYPmiNZ5
-hGM+tTANBgkqhkiG9w0BAQUFAAOCAQEAaN5G4XNfkdlwUlUEWtdYg5fdDe4R7z36
-DiE6oB7fgeYGqRWtPtaw3gcZChzGhxd36rW9z5PEVSybnruxZDhhpMljeIBcw+Z2
-7C0awG6iQU8NsuSmnCqzLUlYctgqRq66KGUM3bkYDfBDdCvAPbkkNfAPweZ9jp4U
-qsndPfh/4A4j9Zyj9X3XPRUYTvpcQ2XveBiKyA70ZF6WGbqLALw7/g07NH6wW9js
-0dlMhOhrgRu07YFATFwg4RidRkvfUsbjGXgGJ+BxlZzIbrB9hacSRQdNxddtIWO+
-7m01Z344mGsZ1ZDR8bdPepRQi3B8efL6qJXsw3pzQE/xruoBU+jCJg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tulane.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tulane.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Tulane University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Tulane University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.tulane.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Leo Tran</md:GivenName>
-    <md:EmailAddress>ldtran@tulane.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Carlos Le</md:GivenName>
-    <md:EmailAddress>cle3@tulane.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tim Riley</md:GivenName>
-    <md:EmailAddress>riley@tulane.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml b/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
index d2b25736..24b3bce5 100644
--- a/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
+++ b/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.tut.fi/shibboleth2">
-  <md: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-support" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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.tut.fi/shibboleth2">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tut.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Tampereen teknillinen yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Tampere University of Technology</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Tammerfors tekniska universitet</mdui:DisplayName>
@@ -25,7 +15,7 @@
         <mdui:Keywords xml:lang="en">TUT</mdui:Keywords>
         <mdui:Keywords xml:lang="fi">TTY TTKK</mdui:Keywords>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:IPHint>2001:708:310::/48</mdui:IPHint>
         <mdui:IPHint>130.230.0.0/16</mdui:IPHint>
         <mdui:IPHint>193.166.164.0/22</mdui:IPHint>
@@ -33,9 +23,13 @@
         <mdui:DomainHint>tut.fi</mdui:DomainHint>
         <mdui:GeolocationHint>geo:61.450227,23.861063</mdui:GeolocationHint>
       </mdui:DiscoHints>
+      <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>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -71,10 +65,10 @@ ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
   </md:IDPSSODescriptor>
   <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tut.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
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 50eacd26..00000000
--- a/swamid-interfederations-2.0/idp.tut.fi.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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>MIIEfjCCA2agAwIBAgIQWIB+VOhffDPHGuGeMVopmDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTIwMTAwMDAwMFoXDTE0MTExODIzNTk1OVowXzELMAkGA1UE
-BhMCRkkxEDAOBgNVBAcTB1RhbXBlcmUxKTAnBgNVBAoTIFRhbXBlcmUgVW5pdmVy
-c2l0eSBvZiBUZWNobm9sb2d5MRMwEQYDVQQDEwppZHAudHV0LmZpMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAstTbaAoJW/l2/SKvotrG1LClmBc18T11
-UdssfGkl8uc2DbiOhjiRtq8LQr2GrGrAOi3EQHSV6DK4CQecTKwXggdnFf79daBv
-BuCHTphd9096vo/pTi/DhFvY0bME1wO7SB0L8IzABCsnTkl/wGcQMxpBi4x49+7i
-/MkARsi8BbWhpdKhGEOVJTCmG1qGf6I+JDm8F99kWvFJXm81fx2NkFvSuSFrn2QL
-996U5WucBSLxsg8Se3Dbel6tP8egaXZSnbgxZoI3V9fT47YIXa2eA0cXKCc52I3T
-xQj4lx8EMpcdRMZkbs7Hmo1Wpnz6t0Js/nSOWWX1IfIOty7EKhQCcQIDAQABo4IB
-XTCCAVkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
-FLu8aVDgy1EMaH1Nqow2ZuJML2bsMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
-AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
-CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
-BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
-JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBUGA1UdEQQO
-MAyCCmlkcC50dXQuZmkwDQYJKoZIhvcNAQEFBQADggEBAJ8TRQUIymqyAB63Zv9f
-ZBESdccwCknUEkv42cV9SKSuWaSWzVEfZgbr1dvBWEv/C7jRZJ9JIpcvP3Ow2e6b
-aZPGFii79Dzxsi1wvt9pATsXeJI6uqgt4kcIh0kKOzwXs0k//R/Q4Q9gjhQbgbz6
-VJS/b8TpL1JFNTSSAaY3lBMRitQoI5bJaQ+g8lzztHVlp2i03doy51u3MIrRgMeR
-Luh8iZo7fcSQCO57okd/cCEl/dZ4UfDk6FGyd1069r6mCnOXIvGfSaFL3zHZMjsx
-A53q7i0tenMvCIqhv/Ti7MWJ4CTrV5BAfjQrlJF8eAUnr+98iqxEsRNiZ5pd+fqw
-FZ4=</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>MIIEfjCCA2agAwIBAgIQWIB+VOhffDPHGuGeMVopmDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTIwMTAwMDAwMFoXDTE0MTExODIzNTk1OVowXzELMAkGA1UE
-BhMCRkkxEDAOBgNVBAcTB1RhbXBlcmUxKTAnBgNVBAoTIFRhbXBlcmUgVW5pdmVy
-c2l0eSBvZiBUZWNobm9sb2d5MRMwEQYDVQQDEwppZHAudHV0LmZpMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAstTbaAoJW/l2/SKvotrG1LClmBc18T11
-UdssfGkl8uc2DbiOhjiRtq8LQr2GrGrAOi3EQHSV6DK4CQecTKwXggdnFf79daBv
-BuCHTphd9096vo/pTi/DhFvY0bME1wO7SB0L8IzABCsnTkl/wGcQMxpBi4x49+7i
-/MkARsi8BbWhpdKhGEOVJTCmG1qGf6I+JDm8F99kWvFJXm81fx2NkFvSuSFrn2QL
-996U5WucBSLxsg8Se3Dbel6tP8egaXZSnbgxZoI3V9fT47YIXa2eA0cXKCc52I3T
-xQj4lx8EMpcdRMZkbs7Hmo1Wpnz6t0Js/nSOWWX1IfIOty7EKhQCcQIDAQABo4IB
-XTCCAVkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
-FLu8aVDgy1EMaH1Nqow2ZuJML2bsMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
-AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
-CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
-BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
-JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBUGA1UdEQQO
-MAyCCmlkcC50dXQuZmkwDQYJKoZIhvcNAQEFBQADggEBAJ8TRQUIymqyAB63Zv9f
-ZBESdccwCknUEkv42cV9SKSuWaSWzVEfZgbr1dvBWEv/C7jRZJ9JIpcvP3Ow2e6b
-aZPGFii79Dzxsi1wvt9pATsXeJI6uqgt4kcIh0kKOzwXs0k//R/Q4Q9gjhQbgbz6
-VJS/b8TpL1JFNTSSAaY3lBMRitQoI5bJaQ+g8lzztHVlp2i03doy51u3MIrRgMeR
-Luh8iZo7fcSQCO57okd/cCEl/dZ4UfDk6FGyd1069r6mCnOXIvGfSaFL3zHZMjsx
-A53q7i0tenMvCIqhv/Ti7MWJ4CTrV5BAfjQrlJF8eAUnr+98iqxEsRNiZ5pd+fqw
-FZ4=</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>Teemu</md:GivenName>
-    <md:SurName>Turpeinen</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 2aedd2f9..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-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.u-bordeaux-montaigne.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université Bordeaux Montaigne</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA/ElEQVQoz7WS0ZGDIBCG8QqggUjec6aA2ICmgNOUE6jD6LvYwJkChAKkAbEBaGDvgdyay2QmyUxuhxd+/o9d/iECAPJKfbzkfhPgvX8W8N4fDoUxJmyF4Ot1vN1+dp1cTPBbzrn9PmNsNQwDAEjZMrYKK0k2aFs6CMHxbkKI1vrukBeg77+xr9aKEDLPFk1xzG4BIQRK53N/89A8z/8AXSfn2VJKg2SMUUpl2WLCowvQNDWltKpqVJumLooSfWFI771Silg7YTKcH0MmzjkAGMcxSTYhqDTdpenO2olI2UrZXicbYFROp6osvzg/WjsBQOScux7xYUX//lt/AC2qo0VPVdydAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjQ0KzAyOjAwpD3o3wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo0NCswMjowMNVgUGMAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.u-bordeaux-montaigne.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux-montaigne.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université Bordeaux Montaigne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Bordeaux Montaigne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.u-bordeaux-montaigne.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>reseau@u-bordeaux-montaigne.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 576a3e2d..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux.fr/idp_ubx/shibboleth">
-  <md: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>
-  </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 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="en">Université de Bordeaux</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACNUlEQVQoz2VSS2sTYRQ99/tmJpOZpM1EQSou2tRmCroQdFXxgbhSdKfu/AGCP8Bf4KK+SE0jInQjuNKdEmybRBEUN7Uraxdqi0LTlkb6TKbz3esiSVW8m7u459xz7oPwogEADIiACABEoAl7QQRhEoibylWKFgAIDnoqbWE1EkdRysLiNrcYbTKxAZF4mdxUIV8rKQJAMCKX++zVi73lEX+/owCADdzUwIenpx5d1Sbur5aGpwuxm1ICKEJ9k599jwCeX4/f/4xiAQEg5W6spFa+Dk0+CKvFyA8gUG3P0MSaANUCweqMAoCIFk5cyf6YFVICAkS1nUKrja2tx/duvy6/QsJlZlEWRTv1wZG5C7dEWwAIAuwpKN1sNieelN69rSGRABt4mXz5Tnpt0bhptdtEd23qz/aUCoKs73tgw15mYHosrBUNKQh3u/9LgIgxxgiQtAenCmHlYeRlQF3A/wqAkDCED1UmwurDyMtAQBx3i51sddjCQrqVzDibjSOfRiM/C0CbVuQF4FiZ3c4TdBQEEOGE/+Xczdlrd5cPn7S3fyU2V+tDZ5aOXQoWZtz1JbYciLQVhCDipgfKo/u+fVw+en7m+nj28xsIN4ZP69ZWfvI+SfvP2pd5viZeb26qkK+Ng2j9QDh/9sZa/3EBBYszYXW8pz4XOz4Jd4d/GeUqxbAyFnkBiHS0ozhueQEAZ7shShs7uYcGoHN92XytFCd7SEDCrG22HB23lNk1dlK0/TcawG/PIwVYE5CYvQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMCswMjowMOmjNjwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDArMDI6MDCY/o6AAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">https://www.u-bordeaux.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux.fr/idp_ubx/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Bordeaux</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Bordeaux</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.u-bordeaux.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>noc@univ-bordeaux.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 30b2df64..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux1.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Bordeaux 1</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAADBUlEQVQozwXBa2hTVxwA8P859517c5PePBqTNNq1dnHNaltLrVWHWu02i7MTJ24OsbhvG0NQRD8pVUFERJB96EQRFAaK+PgkbKBOWNvQio+hRbvNmBZs3s+b3Nx7zt3vh9p3ni0aTcAagCgibF+3l9BCe18SKblEKmGbsEwObmxbP7Jmh4Y02yaMFt1VolqDwYTyLp6Jda5wMKonlONVuyZmU2QhjbPx5Oy92fuDHQMewYWRzQJCAFA2cWc04pUsn8AqnCgCt0rt4nQnRRhppKx++OXBeQIsznOEAhKoAZax87NgNlNFbJ1ysocPalJA432MTTnCytg9lX9ZhByWbDCBNmx5YzuobjXk5St1kHnO4RTzpXx3pNdg6gxhKaICERhgsUAIZqBSqv+wt396Zq7v02hZN/wOReLEdHqp/+MBbGCGMoSSmH+1Ci5sAaoZek8YDw32TD99Gwp4rIahCA4wLb/STBv20LLtpmXWS42xrQcRYKyzLFSrx3/e/PrFfDjoBovwDAiyVMtXeyJrpl5N7usZK5LCt+u/73TFwARcJoVtK7Xd61ov33329ebYf7lUoElrFpWl4sKqlq74wrTXqR1oG7vyZOLo3cM6V8W1rH7u5I7Finnz4fymtbF/kjmfpniVpkV90SW5w1rLn6//+G5w33Lpo8nCoxvxG/inr/q7lyu/3prataEj4GQS8ymf1yVwcsbIUGoNf7Lt9rObIlYODRwxcf3J+0d4/PD2PIVTF6fGdvcSgH+TxYDfzbNSA6Cg59a1DqQKS/H3M1tWDg2Ft9arOnYjcvXOU38QPu9fka+bM4m0v1lUsOgWPMnMuxAb/KJr5HJ8woDKsS0nwmYbLpnoyPi98R+HOYDFTDWrlzVV4kEIyP43qTkANNI7+io7N5l47APf6YOn8IVrf2ke594vV1Ow488/9Eb8TW4JKLQ0R2ZzzytQa5Uje6LfXPz9UtkqysiBf7t+a+LMqMoApujvyfiGaMgJAAg6tfb0u7RZKkqA9w/uGe4YBWApoP8BcTJFfBiMjwwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDArMDI6MDDpozY8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAwKzAyOjAwmP6OgAAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.u-bordeaux1.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux 1</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>
-					      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>
-    </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-POST" Location="https://idp.u-bordeaux1.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux1.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux1.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux1.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.u-bordeaux1.fr/idp/profile/SAML1/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">Université de Bordeaux 1</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Bordeaux 1</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.u-bordeaux1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>RAYNAL Karen</md:SurName>
-    <md:EmailAddress>karen.raynal@u-bordeaux1.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>BONNET Pascal</md:SurName>
-    <md:EmailAddress>pascal.bonnet@u-bordeaux1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 09d4e870..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux2.fr/idp/shibboleth">
-  <md: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>
-  </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 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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.u-bordeaux2.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux2.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Bordeaux 2 - Victor Segalen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Bordeaux 2 - Victor Segalen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Laurent LAVAUD</md:SurName>
-    <md:EmailAddress>laurent.lavaud@u-bordeaux2.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Doris CHAUVET</md:SurName>
-    <md:EmailAddress>doris.chauvet@u-bordeaux2.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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-bordeaux4.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml
deleted file mode 100644
index b4315060..00000000
--- a/swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-bordeaux4.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Bordeaux IV - Montesquieu</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACNUlEQVQoz2VSS2sTYRQ99/tmJpOZpM1EQSou2tRmCroQdFXxgbhSdKfu/AGCP8Bf4KK+SE0jInQjuNKdEmybRBEUN7Uraxdqi0LTlkb6TKbz3esiSVW8m7u459xz7oPwogEADIiACABEoAl7QQRhEoibylWKFgAIDnoqbWE1EkdRysLiNrcYbTKxAZF4mdxUIV8rKQJAMCKX++zVi73lEX+/owCADdzUwIenpx5d1Sbur5aGpwuxm1ICKEJ9k599jwCeX4/f/4xiAQEg5W6spFa+Dk0+CKvFyA8gUG3P0MSaANUCweqMAoCIFk5cyf6YFVICAkS1nUKrja2tx/duvy6/QsJlZlEWRTv1wZG5C7dEWwAIAuwpKN1sNieelN69rSGRABt4mXz5Tnpt0bhptdtEd23qz/aUCoKs73tgw15mYHosrBUNKQh3u/9LgIgxxgiQtAenCmHlYeRlQF3A/wqAkDCED1UmwurDyMtAQBx3i51sddjCQrqVzDibjSOfRiM/C0CbVuQF4FiZ3c4TdBQEEOGE/+Xczdlrd5cPn7S3fyU2V+tDZ5aOXQoWZtz1JbYciLQVhCDipgfKo/u+fVw+en7m+nj28xsIN4ZP69ZWfvI+SfvP2pd5viZeb26qkK+Ng2j9QDh/9sZa/3EBBYszYXW8pz4XOz4Jd4d/GeUqxbAyFnkBiHS0ozhueQEAZ7shShs7uYcGoHN92XytFCd7SEDCrG22HB23lNk1dlK0/TcawG/PIwVYE5CYvQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMSswMjowME/UPYgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDErMDI6MDA+iYU0AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.u-bordeaux4.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Bordeaux IV - Montesquieu</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://idp.u-bordeaux4.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-bordeaux4.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-bordeaux4.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux4.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.u-bordeaux4.fr/idp/AA"/>
-    <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">Université de Bordeaux IV - Montesquieu</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Bordeaux IV - Montesquieu</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.u-bordeaux4.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Coussy</md:SurName>
-    <md:EmailAddress>helene.coussy@u-bordeaux4.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 83da75ee..00000000
--- a/swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-cergy.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Cergy Pontoise</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABAElEQVQ4y2NgwAH+S98t+y99N5WBXLBGaOqmCt6M/3ADJe/KYlPHhMN25TO/L/sKMwncOyS6Yl4Fb8b/+i8TrmFTy4hFs2Hlp+5zENOZfv9j+Mfqym6z2PlNTBxBZ/+XvltxSHTFvP/Sdx0reDP+VfFm/fovfZeXJL//l77LWMGb8b+Pv/o6MeqZsYh9EGUSulv4sUWb5JDfLjx/eQNv/nuSNUKdLl3Bm/H/v/RdRrIMgAaYJqn6mBgYGBj+S96VV2CWPsv4VJmogMMAZ8Q2TiPX6Uz/Je9yXfp9Q4fxqfJ/cgxg+C99N+a/5F1LsjRDDXAjWzMDAwMTwz+Gc5QYAAAS1l+1Qbx69wAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMH48JxUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDAPYZ+pAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.u-cergy.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Cergy Pontoise</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>
-					      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>
-    </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-POST" Location="https://idp.u-cergy.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-cergy.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-cergy.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Cergy Pontoise</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Cergy Pontoise</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.u-cergy.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>disi-infra-systeme@ml.u-cergy.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 75fc949f..00000000
--- a/swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.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" entityID="https://idp.u-clermont1.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Clermont Ferrand 1 - Auvergne</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZElEQVQoz1WSzUvUYRDHv/P8Vm19IbXAYitfKssoLCt6I0GSIOmSHioiOnToXF2DDtG1P6BzURAURBDUKQgiqA1DFnuxjMh19ae1tfr8nt/zzEyH3YS+h2FmmDnMdz506dmLN8USAGMiUTFkqhGACAMgMgCIiEPYn1tn8qXYmAj/JCoruTERkSEiIhIVMpQvxRkOgQypKEsgETWGDA2sW9vburqlvk6h5SSdiBcm5hcBsIQMibTX1XuScuIUMMDNwUPHuzfhf90vfLz1Os8sxifJvdGR60f2iw/s/eltPcNdm94WS2cfPJmMFyfjxQuPnk7Gi2d29A5tyLH3hp2rIwIgqYMPw92dP629/Ph5YabIIqo6/n3mypPny96PbOnUNDXiAwAV9UlKPuSaGifn4oXfv00QAMpMPkyX4umFnx0tzSH1GU5czZ80VREA3ntOnAUkcGTIO0ciLNoAcOIy4pyKSPCSOK5jVRWRYBNjCICysE1YRZk1ULBJxtsEAFi8tRHX10xJUwGUWaLIWwuAoggAO2dQWa4krq0xK86rS4mIAnvrMixrmhorlSVvnbcupCkASVITmPNT03u6Np7Ytd0tW1XlwOKSc4f25dpb332ZFufE1e701kbZvoFPP4pjRw+eOjDQ35nbvL6jaVXDsV1954cOz/4qX719t/xnSQIrS/7z1/Gpb7Rm7CKA/u7Oa+dG9/b2tGRXsUh5yb4qfLhx5+FUcdYYEtGVl1PryfNVGAloa2luzjaIyB/rflWWqv3qnGptJ3Okb+vL94VqNTcfzwEAoigDgDkYU+W8hvDg7p1/AYJ6hvrED4yHAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-bpclermont.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Clermont Ferrand 1 - Auvergne</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>
-					      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>
-    </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-POST" Location="https://idp.u-clermont1.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-clermont1.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-clermont1.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-clermont1.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.u-clermont1.fr/idp/AA"/>
-    <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">Université de Clermont Ferrand 1 - Auvergne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Clermont Ferrand 1 - Auvergne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-bpclermont.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>Fed-Admin@u-clermont1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 dcfc58e5..00000000
--- a/swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.u-paris2.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Paris 2 - Panthéon Assas</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACU0lEQVQoz02NPWtTYRiG7+fk5CQn1pPmw0QDqSa1tbSmQ6fopoOdBPEXuDkrtH9D6R/oJDg5uGhRdFG3ToXSQAzYFJIWqpIoOTnv+7y3Q/261uuCC/wf50hSlc4xSfj8Oe/f55MnHI2oepbA/UXVkRrHjtSdHbu2plFkMxl99NiROp060jkH/YMjbRwrqc+emUrFAgawgC0W9elTnUx0OlXn/h00SVRVX72yi4sW0CCwmYyGofF9ffDAkfbs8LsmrTHOJPbuXQtoJqOAnh0Au7qqmxv67r0zxgdAUpyjMeh05PDQBYEUCgxDKZfl2jW0Wsjl4InM1eH7PgARISlhyM89fjmUJOH586zVcOWKd/myy+W8bBZRRGOk0/EBUBWpFLa2+OYtr857tRqaTeTzks9DVQCUy7h4SYxBNivOOWeMFwRuYYHdrty5I7Oz8DzEE6TTEA/FIlst8X3cuCHLyz4A8TwC0m4jjuX0Kz9+QrOByQSVC3K9xZ8/EUXodqXZRCrlA6AxnohrNOin4KU4HnsPHyIIUCrJvXt4/Vrm5tjvc39f6nUfgIQhAJlMUCji+Fh+jHF0hG/fOBjgwwe8eOGShIOB9/Il1tfFJQm/f0cqhc1N7u7KcIjhkDMzkk4jDNlsSrXKUklWV2V+Hv2+z3Sa29s4dw7TKfb2KIJGA0tLvHXLW1/H8rL4vgC0ltYiCMT1etzY4MmJHBxgPObNm9JuS6PBKBIScQxrkc0iDJEkmJkR3r6NXg+npygUUK+jWMRohFIJKyuoVlGpIAh+K1VE0S8h13XkdmDuVAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMB3sEi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDBssaqTAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.u-paris2.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Paris 2 - Panthéon Assas</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>
-					      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>
-    </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-POST" Location="https://idp.u-paris2.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-paris2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-paris2.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Paris 2 - Panthéon Assas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Paris 2 - Panthéon Assas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.u-paris2.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>ssri@u-paris2.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b75d4a8e..00000000
--- a/swamid-interfederations-2.0/idp.u-picardie.fr-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://idp.u-picardie.fr/shibboleth">
-  <md: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>
-  </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 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="en">Université de Picardie Jules Verne</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB1UlEQVQoz42QzU8TYRCH53333YW6Bdtm0xaIpi0YG4VQY8CDwRASDtw4Eb2REC5wJeFiot49SPwDNF6MNxM9EL1gPCkkVAOVBMJHs6Wl3bW73b7b7X562FAMMWaf08xknl8mgz7nS3w3W67rfdEQNRzCIJZgUaJ90VCdmolIiCNYlCjHMo7r1VSD7JcbI9ejoqw3dEtv290c8+B2cu1DYXq0f6+kZgeusgQDgNayUvFwRWmhJ2+3CUa26wEAQuB54IMRwhhs57w/h7z/Vhy/Ifw8qV8T+GiYOyhrEZ7TWiYAupOJHZQbn/Kn1LAvBFlrf9+XFGpKDUNrWUJvl6qbrus1DVvW2oblOI6XiocB4LjaBAAiylSUaSegqhqXbsilY/mj350WTw4n/YB/koqH/eALYWOn0hk9fZi7JBxXmwo1/RohCHEMA9nZCM8tzWQziZ7BZM/ErcSX3Yr/q/mpoeWZLADM3U8XJfpy8d7dQYEAgGm7CjVPanR9uzQ2JHTiN3YqNdXYK6lfC2eTw0mVWqtvthDMvoJgPJ8f+yUqOJeORXguiLDyevPRRIb8/bL/wzJ4t6jggNsA8HhudO1jIahwpYvc7O89PNOCCi8Wxp+9+wEAfwAs3cph7PutegAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMLubGZsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDUrMDI6MDDKxqEnAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.u-picardie.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Picardie Jules Verne</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://idp.u-picardie.fr/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-picardie.fr/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-picardie.fr/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Picardie Jules Verne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Picardie Jules Verne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.u-picardie.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean Charles Delépine</md:SurName>
-    <md:EmailAddress>delepine@u-picardie.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Julien Marignale</md:SurName>
-    <md:EmailAddress>Julien.Marignale@u-picardie.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-psud.fr-idp.xml b/swamid-interfederations-2.0/idp.u-psud.fr-idp.xml
deleted file mode 100644
index dffefd08..00000000
--- a/swamid-interfederations-2.0/idp.u-psud.fr-idp.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.u-psud.fr/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-17T10:03:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 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="en">Paris-Sud University</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB7UlEQVQ4y2NkwAGO3J+gvv/OnPw//39yMDAy/WdkYGD4/eczp75UyKIw/Uk7YOoYsWlefDY77MG3LSsZ/rIwMLEyMDAyMDEwMv1n+POF80+t6yVWZG0s2Ay493Z3EhMbK8P/3+xPxTj0El99v/OP8T8js6yg5l10OzEMCC28ocvLkXj/G9NzBtZ/QhdSLZbvRsiewrCMCV3gxa8dbUV2xzJZ/jKf/s/5yrtjr9U8Bob/DESD4rnbbQSDm/4zmM3LOfNfwqv1gNyt5oOK/zv2W07Cph5rIDoWTck88vj9tL+/GP7++8A35f6Bd4uW7Juz7s9fbo5Gt5sSyNoYcTiE4e6X/yL2qS2bnvxhsmT4/YeB4Y5pxMSZdZGfv/96X+NyKRFnGMCAMg/jmyfLa63yXU0NBVn+/WNQP7fiRvPpRBFe6fvEBwgUaMa1XWQIbvqvltzdiy6HEY2WKV3rmBgZJP8zMP5jZmL4//zrb57rX3/rMfxnZDCVFzt/i5ABx99+NmJgZpFnYGRiYGBkYmD495+Bk4mRQUuQc8nSuvglBF3AyMj49z8jE0OisYr1/E3HXk6vTfqb4Wn4AGdoYxgQVHeXIaT5/9v//8WJUY8RC/8ZGJgZGJkYXn1g4CTLAAlW5lNOsiJhmoKMD4gxAACHPK71KifLaQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0OSswMjowMMXqiR8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDkrMDI6MDC0tzGjAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.u-psud.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">staff, students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université Paris-Sud</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">personnels, étudiants</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>
-					      MIIDHzCCAgegAwIBAgIUEQSMail62qHLjxXRxQKl6EGDTg0wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAwwNaWRwLnUtcHN1ZC5mcjAeFw0xNDExMjExNDE1MzJaFw0z
-NDExMjExNDE1MzJaMBgxFjAUBgNVBAMMDWlkcC51LXBzdWQuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbhNREXZe3xC/XLkzwaj4c2ezFQFfK20BF
-HiK3MNX5Lk9Z/g596q/Ehaa/eJqNHUJOT+Fk3PW667BxsSzHWX9L0HwKC8FR/Zqf
-Iq8r4SZu+JPY3DGDfONsEKHxH9JA2kgQJo3Xi05IOy6x61zmPVEfDyizpKDdKgup
-08dH5ZSfayJwy5tBhULmr9lzFaNHRIPkwq1+mPu/F4UZp/jgmceuWM1a3RuPoJNd
-xAJ5/Y0AnRJcUDYlkIiqT1uB15kzupv/54lJIMRGubEFq3DhvS5C2H1XdxvwSg+Y
-b6d3+6i7AEvnwbfMMAtHC37ZliSqYl6RQ3+JbkADrK1HYyJxB20zAgMBAAGjYTBf
-MB0GA1UdDgQWBBQbAbl3tovFK/edPOK97uBQRnhKPzA+BgNVHREENzA1gg1pZHAu
-dS1wc3VkLmZyhiRodHRwczovL2lkcC51LXBzdWQuZnIvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQEFBQADggEBAHi9F3kzIyShgaeVsMeMZbiPA8HXxdeBMBi6YiuN
-DsIFB0AEMBLkB3RHlIgm1ja9FO66k8XJ1MUkjPMFHE19aKw08NiHyHPLnKXqPbiM
-dNAnGOsPEGSGra3yZ/gdn0MBqnM+nvEfZTo396OkA0VlbZL4OxxvTEcDof7eObgw
-zcwlSu5ayTUYGX46+Q+bYM94GtwGmL4mbwQoR95HWBR2t+gSxEpre3CUi5JaLJ0m
-H3d4Ee1uIvDWFLtriFMupxcWmlW4N6KvmjZYadBXK7OgsmslEsQegRn9GvT2Iu2d
-EcAYpY0Ax0DDYuMw4VUWS4MncOQtAhRXEBvT3iWffG5otBc=
-					    </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-POST" Location="https://idp.u-psud.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u-psud.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u-psud.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université Paris-Sud</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Paris-Sud</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.u-psud.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Laubenberger Stéphane</md:SurName>
-    <md:EmailAddress>stephane.laubenberger@u-psud.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Lambert Dominique</md:SurName>
-    <md:EmailAddress>dominique.lambert@u-psud.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ua.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ua.edu-idp-shibboleth.xml
deleted file mode 100644
index cad97fa8..00000000
--- a/swamid-interfederations-2.0/idp.ua.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://idp.ua.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">ua.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Alabama, The</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>
-MIIDEzCCAfugAwIBAgIUNKqQ00OfQ884NNxZ/Wqg64utm9owDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLnVhLmVkdTAeFw0xMjA3MDIxNTMyMTJaFw0zMjA3
-MDIxNTMyMTJaMBUxEzARBgNVBAMTCmlkcC51YS5lZHUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCgoODiUmYmlR2YZDWPOQKKuhgrc5oBzLINbtQJ7M1P
-LJBCjRaXVkKKgWpSGkHyQesv9V0IVJ8lUxviekpcKdlQ2FRlHyVPO4F94QOIdpIV
-BCKQkZRIL/Z4uup+YRBK/0ZsuEivRTnfW+xQKE+VUs2El8u63G735l7tYWgn2Ve2
-TWPWPzUEdZrxkDQsms1pPf40q8qTRPMz9AlsiIJ7Jkpmc9mKu+lsjHDk5xrCQ2Ix
-ZNpxFtfCCvh2QmUvG6RQDQ9OIpQTpL4Mkr2desYwLq5YXP3RGaCOR78jN/zw2hW/
-4lh3OuYyhK1BhwZzkVFrmrDqT2pqklaQiumzKZA/DPKTAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC51YS5lZHWGIWh0dHBzOi8vaWRwLnVhLmVkdS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU5PpJtXNlAssOyOO4UTVGluFuAhUwDQYJKoZIhvcNAQEF
-BQADggEBABPzuZZunphE/zVhwqafhEQui2yK/liaJF8RgmEYoKHbXDLsSweQ6gpb
-aoJ4sJqOppySR8tSTojuGVleRis8138xTtRzYsCsUVeQ7EZ79DJ9W9xep3aAXy6G
-EX6VVWfCSj2KSS4vR8/YtSzclUkOQwK1A/poO2na6PMpOaFzPHEHpT73OLjj+f40
-ettjvwSjTCvHNQWQawfSg8q0w+CnTxZ3hfAGR77zOFwzBbrxIBY9g16VOUSbP464
-6izLFjrXdfUARACZIkv+rigqMZou8Fj7VvBp8Wu1f0pzVQYwkgU+nl8INuYKYELW
-3NhJFAodlwbRHKZc0vyCH8RmluU4KoE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ua.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ua.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ua.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ua.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ua.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ua.edu/idp/profile/SAML2/POST-SimpleSign/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">ua.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUNKqQ00OfQ884NNxZ/Wqg64utm9owDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLnVhLmVkdTAeFw0xMjA3MDIxNTMyMTJaFw0zMjA3
-MDIxNTMyMTJaMBUxEzARBgNVBAMTCmlkcC51YS5lZHUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCgoODiUmYmlR2YZDWPOQKKuhgrc5oBzLINbtQJ7M1P
-LJBCjRaXVkKKgWpSGkHyQesv9V0IVJ8lUxviekpcKdlQ2FRlHyVPO4F94QOIdpIV
-BCKQkZRIL/Z4uup+YRBK/0ZsuEivRTnfW+xQKE+VUs2El8u63G735l7tYWgn2Ve2
-TWPWPzUEdZrxkDQsms1pPf40q8qTRPMz9AlsiIJ7Jkpmc9mKu+lsjHDk5xrCQ2Ix
-ZNpxFtfCCvh2QmUvG6RQDQ9OIpQTpL4Mkr2desYwLq5YXP3RGaCOR78jN/zw2hW/
-4lh3OuYyhK1BhwZzkVFrmrDqT2pqklaQiumzKZA/DPKTAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC51YS5lZHWGIWh0dHBzOi8vaWRwLnVhLmVkdS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU5PpJtXNlAssOyOO4UTVGluFuAhUwDQYJKoZIhvcNAQEF
-BQADggEBABPzuZZunphE/zVhwqafhEQui2yK/liaJF8RgmEYoKHbXDLsSweQ6gpb
-aoJ4sJqOppySR8tSTojuGVleRis8138xTtRzYsCsUVeQ7EZ79DJ9W9xep3aAXy6G
-EX6VVWfCSj2KSS4vR8/YtSzclUkOQwK1A/poO2na6PMpOaFzPHEHpT73OLjj+f40
-ettjvwSjTCvHNQWQawfSg8q0w+CnTxZ3hfAGR77zOFwzBbrxIBY9g16VOUSbP464
-6izLFjrXdfUARACZIkv+rigqMZou8Fj7VvBp8Wu1f0pzVQYwkgU+nl8INuYKYELW
-3NhJFAodlwbRHKZc0vyCH8RmluU4KoE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ua.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ua.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Alabama, The</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Alabama, The</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ua.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Scott Montgomery</md:GivenName>
-    <md:EmailAddress>smontgomery@ua.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Deborah Crocker</md:GivenName>
-    <md:EmailAddress>deborah.crocker@ua.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Service Desk</md:GivenName>
-    <md:EmailAddress>itsd@ua.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uaex.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uaex.edu-idp-shibboleth.xml
deleted file mode 100644
index b2e6f29c..00000000
--- a/swamid-interfederations-2.0/idp.uaex.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,164 +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://idp.uaex.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uaex.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Arkansas, Cooperative Extension Service</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.uaex.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.uaex.edu/privacy.aspx</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="523" xml:lang="en">https://idpinfo.uaex.edu/ua-color-left-small.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>
-MIIDljCCAn4CCQC8udJteSrF3zANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-VVMxETAPBgNVBAgMCEFya2Fuc2FzMRMwEQYDVQQHDApMaXR0bGVSb2NrMQ0wCwYD
-VQQKDARVQUVYMQswCQYDVQQLDAJJVDEVMBMGA1UEAwwMaWRwLnVhZXguZWR1MSIw
-IAYJKoZIhvcNAQkBFhNwb3N0bWFzdGVyQHVhZXguZWR1MB4XDTE0MDExMzE0NDUy
-N1oXDTI0MDExMzE0NDUyN1owgYwxCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhBcmth
-bnNhczETMBEGA1UEBwwKTGl0dGxlUm9jazENMAsGA1UECgwEVUFFWDELMAkGA1UE
-CwwCSVQxFTATBgNVBAMMDGlkcC51YWV4LmVkdTEiMCAGCSqGSIb3DQEJARYTcG9z
-dG1hc3RlckB1YWV4LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANcpxZ+fqFclD7PS/qbL+Hg7OO920hCJJa/QL3ILd1VHJKD3lsxnbDzLrLyYIXx5
-XkkKchUspp6SpVjuioKopbGI9lDwTvcJrzeVo5UOHGexatS/p+NhjH9plJY3P55a
-3VEaNy2A5/6wgeo0c/wJ1X199gR2NXXLqGmjXZvtUa3uEr+SDZrZxh42oHdlBco/
-nQZNXiCwcXmdfBkyTftK/U5ecLKew0lIB+vRdv2TarbJji5shq1YlZGSpaXcTZY+
-qNW8NXZNDsZsgswpsyXv2YN/89kWFWXy+KV6LanfUgEIjAP4NB0svsp79k9X3RAb
-GRUjdtEhyF1QLGPnvQnEQ5sCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAG0CBdR3k
-p/qo8XYFV74/TXULUXKzTlm6Lo39RmuxP9EjaU5pphFtANajx2P0WA/l6UswLxXY
-6KrdvIdnd1UqFI6elczul4p1qPFwsTwmXogHtsE8qztPKqCUUB3b3LHWhCX+jpee
-7oESnzVd8xPP/4OIaswbP+KbHOvdWozf4CIxUh/t38xbv6xYl1qNvdnLJSFEd5iF
-HLlFXy3Tl8O0A2Z3Q4mv0tMoOlNxQEL+HNdqzdbFCaYR1DoglFC7VS/FczqBJiGC
-6w2Y1QbpgJKwx9UaookWEZvtvJa58pbr+syDJmvqekSW130Hlrjik/Nc6DaTFOrz
-VYI9KJ2BtKlBZA==
-          </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>
-MIIDmDCCAoACCQCtel/2JmOm9DANBgkqhkiG9w0BAQUFADCBjTEVMBMGA1UEAwwM
-aWRwLnVhZXguZWR1MT4wPAYDVQQKDDVVbml2ZXJzaXR5IG9mIEFya2Fuc2FzIENv
-b3BlcmF0aXZlIEV4dGVuc2lvbiBTZXJ2aWNlczELMAkGA1UEBhMCVVMxETAPBgNV
-BAgMCEFya2Fuc2FzMRQwEgYDVQQHDAtMaXR0bGUgUm9jazAeFw0xMzAyMDgxMjIx
-MzVaFw0xNDAyMDgxMjIxMzVaMIGNMRUwEwYDVQQDDAxpZHAudWFleC5lZHUxPjA8
-BgNVBAoMNVVuaXZlcnNpdHkgb2YgQXJrYW5zYXMgQ29vcGVyYXRpdmUgRXh0ZW5z
-aW9uIFNlcnZpY2VzMQswCQYDVQQGEwJVUzERMA8GA1UECAwIQXJrYW5zYXMxFDAS
-BgNVBAcMC0xpdHRsZSBSb2NrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAlB7zHuv2H77sOPGMfeJvgVKBrt538jGex0+8wAzAahZxmrjxo5HnMcgovUE/
-dmfItLIsFC3s94j+WWnfMbzVQm02TVoam267F5GKem0as/Pm/ry1btFTD9Jnj2OX
-JV0cBuVizfTy9qRu8ydQI2OyQGPD3HPGpxYz4wNCKMsMU6GugJu3wTElaQEA2WGX
-AJV1y0z+0lWMNPP9ZLFgFXn2qOC3far84Z9mEhkNENZcf8mPf8vJvgNjtDrpcVLK
-Okfncq2CsX7quv3MailV++MgvTNdZLljRLqnT8OMYRwuKZMNzMXvr8AvuzHS4TVG
-QA0e+1WsMVCpA8cO798Jmub+wQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB6og+d
-lbbGwfBs98M/zvO09OoFHoJ+WQ+9EvArGLuNJyrG/4icLhb7RY+8kJUU7qghF2Jq
-pCsfL8WfKaFuDhct/BiC+MRRX3xhM7wp4+Lpjzv2hBnpvo2WtJzi0xcbX79DTUOu
-vG0NGJ4KcOAK0aykrMrTSowGSnGdeuGlF0U+4EcAmnYh0JFtYstA8YCh6m6W+Eib
-H5ogY8LVOjvv1c6hEO8khIxKTXUFJ7gKjnT1RxyG0kvqS4P55ZPjTbwkDWDBBNYk
-tqAERtGoSohbErFyMATqZBPqTyb8oKeqIfmzNLfMBVE5aOc7Babyde8hTFShQ5GB
-YL3Kl6VCSUFqg93Q
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uaex.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uaex.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uaex.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uaex.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uaex.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uaex.edu/idp/profile/SAML2/POST-SimpleSign/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">uaex.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDljCCAn4CCQC8udJteSrF3zANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-VVMxETAPBgNVBAgMCEFya2Fuc2FzMRMwEQYDVQQHDApMaXR0bGVSb2NrMQ0wCwYD
-VQQKDARVQUVYMQswCQYDVQQLDAJJVDEVMBMGA1UEAwwMaWRwLnVhZXguZWR1MSIw
-IAYJKoZIhvcNAQkBFhNwb3N0bWFzdGVyQHVhZXguZWR1MB4XDTE0MDExMzE0NDUy
-N1oXDTI0MDExMzE0NDUyN1owgYwxCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhBcmth
-bnNhczETMBEGA1UEBwwKTGl0dGxlUm9jazENMAsGA1UECgwEVUFFWDELMAkGA1UE
-CwwCSVQxFTATBgNVBAMMDGlkcC51YWV4LmVkdTEiMCAGCSqGSIb3DQEJARYTcG9z
-dG1hc3RlckB1YWV4LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANcpxZ+fqFclD7PS/qbL+Hg7OO920hCJJa/QL3ILd1VHJKD3lsxnbDzLrLyYIXx5
-XkkKchUspp6SpVjuioKopbGI9lDwTvcJrzeVo5UOHGexatS/p+NhjH9plJY3P55a
-3VEaNy2A5/6wgeo0c/wJ1X199gR2NXXLqGmjXZvtUa3uEr+SDZrZxh42oHdlBco/
-nQZNXiCwcXmdfBkyTftK/U5ecLKew0lIB+vRdv2TarbJji5shq1YlZGSpaXcTZY+
-qNW8NXZNDsZsgswpsyXv2YN/89kWFWXy+KV6LanfUgEIjAP4NB0svsp79k9X3RAb
-GRUjdtEhyF1QLGPnvQnEQ5sCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAG0CBdR3k
-p/qo8XYFV74/TXULUXKzTlm6Lo39RmuxP9EjaU5pphFtANajx2P0WA/l6UswLxXY
-6KrdvIdnd1UqFI6elczul4p1qPFwsTwmXogHtsE8qztPKqCUUB3b3LHWhCX+jpee
-7oESnzVd8xPP/4OIaswbP+KbHOvdWozf4CIxUh/t38xbv6xYl1qNvdnLJSFEd5iF
-HLlFXy3Tl8O0A2Z3Q4mv0tMoOlNxQEL+HNdqzdbFCaYR1DoglFC7VS/FczqBJiGC
-6w2Y1QbpgJKwx9UaookWEZvtvJa58pbr+syDJmvqekSW130Hlrjik/Nc6DaTFOrz
-VYI9KJ2BtKlBZA==
-          </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>
-MIIDmDCCAoACCQCtel/2JmOm9DANBgkqhkiG9w0BAQUFADCBjTEVMBMGA1UEAwwM
-aWRwLnVhZXguZWR1MT4wPAYDVQQKDDVVbml2ZXJzaXR5IG9mIEFya2Fuc2FzIENv
-b3BlcmF0aXZlIEV4dGVuc2lvbiBTZXJ2aWNlczELMAkGA1UEBhMCVVMxETAPBgNV
-BAgMCEFya2Fuc2FzMRQwEgYDVQQHDAtMaXR0bGUgUm9jazAeFw0xMzAyMDgxMjIx
-MzVaFw0xNDAyMDgxMjIxMzVaMIGNMRUwEwYDVQQDDAxpZHAudWFleC5lZHUxPjA8
-BgNVBAoMNVVuaXZlcnNpdHkgb2YgQXJrYW5zYXMgQ29vcGVyYXRpdmUgRXh0ZW5z
-aW9uIFNlcnZpY2VzMQswCQYDVQQGEwJVUzERMA8GA1UECAwIQXJrYW5zYXMxFDAS
-BgNVBAcMC0xpdHRsZSBSb2NrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAlB7zHuv2H77sOPGMfeJvgVKBrt538jGex0+8wAzAahZxmrjxo5HnMcgovUE/
-dmfItLIsFC3s94j+WWnfMbzVQm02TVoam267F5GKem0as/Pm/ry1btFTD9Jnj2OX
-JV0cBuVizfTy9qRu8ydQI2OyQGPD3HPGpxYz4wNCKMsMU6GugJu3wTElaQEA2WGX
-AJV1y0z+0lWMNPP9ZLFgFXn2qOC3far84Z9mEhkNENZcf8mPf8vJvgNjtDrpcVLK
-Okfncq2CsX7quv3MailV++MgvTNdZLljRLqnT8OMYRwuKZMNzMXvr8AvuzHS4TVG
-QA0e+1WsMVCpA8cO798Jmub+wQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQB6og+d
-lbbGwfBs98M/zvO09OoFHoJ+WQ+9EvArGLuNJyrG/4icLhb7RY+8kJUU7qghF2Jq
-pCsfL8WfKaFuDhct/BiC+MRRX3xhM7wp4+Lpjzv2hBnpvo2WtJzi0xcbX79DTUOu
-vG0NGJ4KcOAK0aykrMrTSowGSnGdeuGlF0U+4EcAmnYh0JFtYstA8YCh6m6W+Eib
-H5ogY8LVOjvv1c6hEO8khIxKTXUFJ7gKjnT1RxyG0kvqS4P55ZPjTbwkDWDBBNYk
-tqAERtGoSohbErFyMATqZBPqTyb8oKeqIfmzNLfMBVE5aOc7Babyde8hTFShQ5GB
-YL3Kl6VCSUFqg93Q
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uaex.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uaex.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Arkansas, Cooperative Extension Service</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Arkansas, Cooperative Extension Service</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uaex.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sam Boyster</md:GivenName>
-    <md:EmailAddress>sboyster@uaex.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Diana Morian</md:GivenName>
-    <md:EmailAddress>dmorian@uaex.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Russell Wilson</md:GivenName>
-    <md:EmailAddress>crwilson@uaex.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uark.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uark.edu-idp-shibboleth.xml
deleted file mode 100644
index 7f83ef5e..00000000
--- a/swamid-interfederations-2.0/idp.uark.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://idp.uark.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.uark.edu/idp/error.jsp" 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">uark.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Arkansas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Arkansas, Fayetteville</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uark.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://its.uark.edu/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="72" width="300" xml:lang="en">https://its.uark.edu/personal/uark-central-login/ualogo.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>
-MIIDHDCCAgSgAwIBAgIVAPt1Tv1bYP4+r/4oWy1Mih/6SWp3MA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51YXJrLmVkdTAeFw0xMTEwMTQyMDU3NTJaFw0z
-MTEwMTQyMDU3NTJaMBcxFTATBgNVBAMTDGlkcC51YXJrLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJaaUOTHkbmeB+65zFM9TvW1GJIjta5iMHFM
-Z48+iSMvvzEEipS3PAOHlv0S9kjC5tltNp0MLK53u2RM2x35fzLBTw6cJX++AeSF
-R0huFlnlSO1mn+UBcyTUQ8sPc0Um7DHhXykVo92a/vrPWiEOcaNVYj5YYgpBgTky
-nZpH5cxjFv5NvsClXEOis7iS+deCKFmpbwg3Ahxque+jZ2mWEHZOrOKujrdMI7fo
-FeozmcPSfIAyWMM+FdBQNcU0sWazWNWryRKSCwv8BEUb+4JUS++pue+LNb6Ad+El
-hvHQJhM0CvJb6ohL9eCVIue54x8/P3GONugW/u88zwes3P2F4EkCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVhcmsuZWR1hiNodHRwczovL2lkcC51YXJrLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUnvF+6HJDc36mcLNHeby0AZVjPU8wDQYJ
-KoZIhvcNAQEFBQADggEBAAjNGo4LedfEkQFyUtXllN5PZHVw24/GMIjZhXfuk+wJ
-RrVheFjV7PmJLps5gM0h+dH0wBo9ZDeER7T+jqWcsig1zuvi2jOPMzlZi6Cgus8M
-dW8C9uy9PKEPCI9HFidVkrU4E8nbF2LNsDlYoclyliMb1wALKFpsOIvxYE4DR10F
-Drl/RShq++Sd9n5AQT3X66WvXuoaeLsA0Et4gh+fUtY4vu2/hRO10yiCCaiyMSEE
-VWXbuzfaz3iJqNG1rs/lOMzysDqAxzZHZKYYtnwvQYyhfSkpBKlTCRjr2vDG1k4M
-JkNZiOnZ+OBZcqrcpzW0N93Twh4aoOHdO7qTCafVe0M=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uark.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uark.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uark.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uark.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uark.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uark.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAPt1Tv1bYP4+r/4oWy1Mih/6SWp3MA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51YXJrLmVkdTAeFw0xMTEwMTQyMDU3NTJaFw0z
-MTEwMTQyMDU3NTJaMBcxFTATBgNVBAMTDGlkcC51YXJrLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJaaUOTHkbmeB+65zFM9TvW1GJIjta5iMHFM
-Z48+iSMvvzEEipS3PAOHlv0S9kjC5tltNp0MLK53u2RM2x35fzLBTw6cJX++AeSF
-R0huFlnlSO1mn+UBcyTUQ8sPc0Um7DHhXykVo92a/vrPWiEOcaNVYj5YYgpBgTky
-nZpH5cxjFv5NvsClXEOis7iS+deCKFmpbwg3Ahxque+jZ2mWEHZOrOKujrdMI7fo
-FeozmcPSfIAyWMM+FdBQNcU0sWazWNWryRKSCwv8BEUb+4JUS++pue+LNb6Ad+El
-hvHQJhM0CvJb6ohL9eCVIue54x8/P3GONugW/u88zwes3P2F4EkCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVhcmsuZWR1hiNodHRwczovL2lkcC51YXJrLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUnvF+6HJDc36mcLNHeby0AZVjPU8wDQYJ
-KoZIhvcNAQEFBQADggEBAAjNGo4LedfEkQFyUtXllN5PZHVw24/GMIjZhXfuk+wJ
-RrVheFjV7PmJLps5gM0h+dH0wBo9ZDeER7T+jqWcsig1zuvi2jOPMzlZi6Cgus8M
-dW8C9uy9PKEPCI9HFidVkrU4E8nbF2LNsDlYoclyliMb1wALKFpsOIvxYE4DR10F
-Drl/RShq++Sd9n5AQT3X66WvXuoaeLsA0Et4gh+fUtY4vu2/hRO10yiCCaiyMSEE
-VWXbuzfaz3iJqNG1rs/lOMzysDqAxzZHZKYYtnwvQYyhfSkpBKlTCRjr2vDG1k4M
-JkNZiOnZ+OBZcqrcpzW0N93Twh4aoOHdO7qTCafVe0M=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uark.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Arkansas Main Campus</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Arkansas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uark.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>System Administrator</md:GivenName>
-    <md:EmailAddress>root@uark.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Security</md:GivenName>
-    <md:EmailAddress>security@uark.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ub.hsu-hh.de.xml b/swamid-interfederations-2.0/idp.ub.hsu-hh.de.xml
deleted file mode 100644
index 97c6a5b1..00000000
--- a/swamid-interfederations-2.0/idp.ub.hsu-hh.de.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ub.hsu-hh.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hsu-hh.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ub.hsu-hh.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ub.hsu-hh.de,O=Helmut-Schmidt-Universitaet Universitaet der Bundeswehr Hamburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmTCCBIGgAwIBAgIEDtrvHzANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
-REUxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVuaXZlcnNpdGFldCBVbml2ZXJz
-aXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEVMBMGA1UEAxMMSFNVIENBIC0g
-RzAxMRswGQYJKoZIhvcNAQkBFgxjYUBoc3UtaGguZGUwHhcNMDkwOTI0MTMxODA4
-WhcNMTQwOTIzMTMxODA4WjCBljELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1
-cmcxEDAOBgNVBAcTB0hhbWJ1cmcxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVu
-aXZlcnNpdGFldCBVbml2ZXJzaXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEZ
-MBcGA1UEAxMQaWRwLnViLmhzdS1oaC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJozfQt8GxD1AKQPEqsTcJipCihzU0Gc2gw+qkWWOLEN6K63wICQ
-CjnV2+n4I0uz1cAzzaauAkdFVCjxXrhgq8K/kYGiyLJvl+wHazN6SqSzrEskgCSR
-QrOrn8YzQTtWe7kZR9aVOJFY8p2MqL4UWwUNYqIe4+2InIn3qaimG1mP0CGJT8Ck
-Lya8gg7LUWltXvVcWQmsJjBUGPR9TyNxBXTGn/tw0crt18w7TjiwwTacMAsaQEby
-o2rHoEFe+c7gQF7ZMYc0yia1+oylmBLHuqy5Pxo3mxyG6fYflVwPMCye3BFEm6fI
-NJQvKZ04sKbk/8+wXsLUWsNhO62zajHYDY0CAwEAAaOCAfYwggHyMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
-BgNVHQ4EFgQUzCawY/z2k64WBdr0a5agbjeydZMwHwYDVR0jBBgwFoAU0OF/Hccy
-vOKQu1gUgBTGX53swaowIAYDVR0RBBkwF4EVaWRwQGhzdS1iaWJsaW90aGVrLmRl
-MIGdBgNVHR8EgZUwgZIwR6BFoEOGQWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVs
-bXV0LXNjaG1pZHQtdW5pLWhoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEegRaBDhkFo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hlbG11dC1zY2htaWR0LXVuaS1oaC1jYS9w
-dWIvY3JsL2NhY3JsLmNybDCBtgYIKwYBBQUHAQEEgakwgaYwUQYIKwYBBQUHMAKG
-RWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVsbXV0LXNjaG1pZHQtdW5pLWhoLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9oZWxtdXQtc2NobWlkdC11bmktaGgtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAVuAzmub19Uck2UxkTRAfgQ5Yz
-oO3H9crRrXfAfi2EeS/2nd+pn/S9xwaeMcBE02SE6H2ujjWpb4T6zoe8oWeCihHt
-bByDVICPRMvPU0IkLgAlQmUgGTi7SMlFuv/inoEA0Cvjv6EGSC7L8JmzrUzB0Fgi
-s70BXg+QladY3A2Odwt3xgAeCZo8pXrrSqqEjgsToD/dSKi9hAdlah5feBRw8fGw
-g0sqqQB13BJSbmspSm/UTPv1ZQP7VrAIOpP2p9OLGARi9fLxpSfsczPS62BW69Xf
-md5/h8e4VJDeQ8uU102FbhB7brNCg3SuWZsJivRwy1aaMDvL1zVDP7xULLCG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ub.hsu-hh.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ub.hsu-hh.de,O=Helmut-Schmidt-Universitaet Universitaet der Bundeswehr Hamburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmTCCBIGgAwIBAgIEDtrvHzANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
-REUxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVuaXZlcnNpdGFldCBVbml2ZXJz
-aXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEVMBMGA1UEAxMMSFNVIENBIC0g
-RzAxMRswGQYJKoZIhvcNAQkBFgxjYUBoc3UtaGguZGUwHhcNMDkwOTI0MTMxODA4
-WhcNMTQwOTIzMTMxODA4WjCBljELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1
-cmcxEDAOBgNVBAcTB0hhbWJ1cmcxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVu
-aXZlcnNpdGFldCBVbml2ZXJzaXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEZ
-MBcGA1UEAxMQaWRwLnViLmhzdS1oaC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJozfQt8GxD1AKQPEqsTcJipCihzU0Gc2gw+qkWWOLEN6K63wICQ
-CjnV2+n4I0uz1cAzzaauAkdFVCjxXrhgq8K/kYGiyLJvl+wHazN6SqSzrEskgCSR
-QrOrn8YzQTtWe7kZR9aVOJFY8p2MqL4UWwUNYqIe4+2InIn3qaimG1mP0CGJT8Ck
-Lya8gg7LUWltXvVcWQmsJjBUGPR9TyNxBXTGn/tw0crt18w7TjiwwTacMAsaQEby
-o2rHoEFe+c7gQF7ZMYc0yia1+oylmBLHuqy5Pxo3mxyG6fYflVwPMCye3BFEm6fI
-NJQvKZ04sKbk/8+wXsLUWsNhO62zajHYDY0CAwEAAaOCAfYwggHyMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
-BgNVHQ4EFgQUzCawY/z2k64WBdr0a5agbjeydZMwHwYDVR0jBBgwFoAU0OF/Hccy
-vOKQu1gUgBTGX53swaowIAYDVR0RBBkwF4EVaWRwQGhzdS1iaWJsaW90aGVrLmRl
-MIGdBgNVHR8EgZUwgZIwR6BFoEOGQWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVs
-bXV0LXNjaG1pZHQtdW5pLWhoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEegRaBDhkFo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hlbG11dC1zY2htaWR0LXVuaS1oaC1jYS9w
-dWIvY3JsL2NhY3JsLmNybDCBtgYIKwYBBQUHAQEEgakwgaYwUQYIKwYBBQUHMAKG
-RWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVsbXV0LXNjaG1pZHQtdW5pLWhoLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9oZWxtdXQtc2NobWlkdC11bmktaGgtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAVuAzmub19Uck2UxkTRAfgQ5Yz
-oO3H9crRrXfAfi2EeS/2nd+pn/S9xwaeMcBE02SE6H2ujjWpb4T6zoe8oWeCihHt
-bByDVICPRMvPU0IkLgAlQmUgGTi7SMlFuv/inoEA0Cvjv6EGSC7L8JmzrUzB0Fgi
-s70BXg+QladY3A2Odwt3xgAeCZo8pXrrSqqEjgsToD/dSKi9hAdlah5feBRw8fGw
-g0sqqQB13BJSbmspSm/UTPv1ZQP7VrAIOpP2p9OLGARi9fLxpSfsczPS62BW69Xf
-md5/h8e4VJDeQ8uU102FbhB7brNCg3SuWZsJivRwy1aaMDvL1zVDP7xULLCG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.hsu-hh.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.hsu-hh.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ub.hsu-hh.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ub.hsu-hh.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ub.hsu-hh.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ub.hsu-hh.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hsu-hh.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ub.hsu-hh.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ub.hsu-hh.de,O=Helmut-Schmidt-Universitaet Universitaet der Bundeswehr Hamburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmTCCBIGgAwIBAgIEDtrvHzANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
-REUxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVuaXZlcnNpdGFldCBVbml2ZXJz
-aXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEVMBMGA1UEAxMMSFNVIENBIC0g
-RzAxMRswGQYJKoZIhvcNAQkBFgxjYUBoc3UtaGguZGUwHhcNMDkwOTI0MTMxODA4
-WhcNMTQwOTIzMTMxODA4WjCBljELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1
-cmcxEDAOBgNVBAcTB0hhbWJ1cmcxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVu
-aXZlcnNpdGFldCBVbml2ZXJzaXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEZ
-MBcGA1UEAxMQaWRwLnViLmhzdS1oaC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJozfQt8GxD1AKQPEqsTcJipCihzU0Gc2gw+qkWWOLEN6K63wICQ
-CjnV2+n4I0uz1cAzzaauAkdFVCjxXrhgq8K/kYGiyLJvl+wHazN6SqSzrEskgCSR
-QrOrn8YzQTtWe7kZR9aVOJFY8p2MqL4UWwUNYqIe4+2InIn3qaimG1mP0CGJT8Ck
-Lya8gg7LUWltXvVcWQmsJjBUGPR9TyNxBXTGn/tw0crt18w7TjiwwTacMAsaQEby
-o2rHoEFe+c7gQF7ZMYc0yia1+oylmBLHuqy5Pxo3mxyG6fYflVwPMCye3BFEm6fI
-NJQvKZ04sKbk/8+wXsLUWsNhO62zajHYDY0CAwEAAaOCAfYwggHyMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
-BgNVHQ4EFgQUzCawY/z2k64WBdr0a5agbjeydZMwHwYDVR0jBBgwFoAU0OF/Hccy
-vOKQu1gUgBTGX53swaowIAYDVR0RBBkwF4EVaWRwQGhzdS1iaWJsaW90aGVrLmRl
-MIGdBgNVHR8EgZUwgZIwR6BFoEOGQWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVs
-bXV0LXNjaG1pZHQtdW5pLWhoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEegRaBDhkFo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hlbG11dC1zY2htaWR0LXVuaS1oaC1jYS9w
-dWIvY3JsL2NhY3JsLmNybDCBtgYIKwYBBQUHAQEEgakwgaYwUQYIKwYBBQUHMAKG
-RWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVsbXV0LXNjaG1pZHQtdW5pLWhoLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9oZWxtdXQtc2NobWlkdC11bmktaGgtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAVuAzmub19Uck2UxkTRAfgQ5Yz
-oO3H9crRrXfAfi2EeS/2nd+pn/S9xwaeMcBE02SE6H2ujjWpb4T6zoe8oWeCihHt
-bByDVICPRMvPU0IkLgAlQmUgGTi7SMlFuv/inoEA0Cvjv6EGSC7L8JmzrUzB0Fgi
-s70BXg+QladY3A2Odwt3xgAeCZo8pXrrSqqEjgsToD/dSKi9hAdlah5feBRw8fGw
-g0sqqQB13BJSbmspSm/UTPv1ZQP7VrAIOpP2p9OLGARi9fLxpSfsczPS62BW69Xf
-md5/h8e4VJDeQ8uU102FbhB7brNCg3SuWZsJivRwy1aaMDvL1zVDP7xULLCG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.ub.hsu-hh.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.ub.hsu-hh.de,O=Helmut-Schmidt-Universitaet Universitaet der Bundeswehr Hamburg,L=Hamburg,ST=Hamburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmTCCBIGgAwIBAgIEDtrvHzANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
-REUxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVuaXZlcnNpdGFldCBVbml2ZXJz
-aXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEVMBMGA1UEAxMMSFNVIENBIC0g
-RzAxMRswGQYJKoZIhvcNAQkBFgxjYUBoc3UtaGguZGUwHhcNMDkwOTI0MTMxODA4
-WhcNMTQwOTIzMTMxODA4WjCBljELMAkGA1UEBhMCREUxEDAOBgNVBAgTB0hhbWJ1
-cmcxEDAOBgNVBAcTB0hhbWJ1cmcxSDBGBgNVBAoTP0hlbG11dC1TY2htaWR0LVVu
-aXZlcnNpdGFldCBVbml2ZXJzaXRhZXQgZGVyIEJ1bmRlc3dlaHIgSGFtYnVyZzEZ
-MBcGA1UEAxMQaWRwLnViLmhzdS1oaC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJozfQt8GxD1AKQPEqsTcJipCihzU0Gc2gw+qkWWOLEN6K63wICQ
-CjnV2+n4I0uz1cAzzaauAkdFVCjxXrhgq8K/kYGiyLJvl+wHazN6SqSzrEskgCSR
-QrOrn8YzQTtWe7kZR9aVOJFY8p2MqL4UWwUNYqIe4+2InIn3qaimG1mP0CGJT8Ck
-Lya8gg7LUWltXvVcWQmsJjBUGPR9TyNxBXTGn/tw0crt18w7TjiwwTacMAsaQEby
-o2rHoEFe+c7gQF7ZMYc0yia1+oylmBLHuqy5Pxo3mxyG6fYflVwPMCye3BFEm6fI
-NJQvKZ04sKbk/8+wXsLUWsNhO62zajHYDY0CAwEAAaOCAfYwggHyMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAd
-BgNVHQ4EFgQUzCawY/z2k64WBdr0a5agbjeydZMwHwYDVR0jBBgwFoAU0OF/Hccy
-vOKQu1gUgBTGX53swaowIAYDVR0RBBkwF4EVaWRwQGhzdS1iaWJsaW90aGVrLmRl
-MIGdBgNVHR8EgZUwgZIwR6BFoEOGQWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVs
-bXV0LXNjaG1pZHQtdW5pLWhoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEegRaBDhkFo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hlbG11dC1zY2htaWR0LXVuaS1oaC1jYS9w
-dWIvY3JsL2NhY3JsLmNybDCBtgYIKwYBBQUHAQEEgakwgaYwUQYIKwYBBQUHMAKG
-RWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaGVsbXV0LXNjaG1pZHQtdW5pLWhoLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBRBggrBgEFBQcwAoZFaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9oZWxtdXQtc2NobWlkdC11bmktaGgtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAVuAzmub19Uck2UxkTRAfgQ5Yz
-oO3H9crRrXfAfi2EeS/2nd+pn/S9xwaeMcBE02SE6H2ujjWpb4T6zoe8oWeCihHt
-bByDVICPRMvPU0IkLgAlQmUgGTi7SMlFuv/inoEA0Cvjv6EGSC7L8JmzrUzB0Fgi
-s70BXg+QladY3A2Odwt3xgAeCZo8pXrrSqqEjgsToD/dSKi9hAdlah5feBRw8fGw
-g0sqqQB13BJSbmspSm/UTPv1ZQP7VrAIOpP2p9OLGARi9fLxpSfsczPS62BW69Xf
-md5/h8e4VJDeQ8uU102FbhB7brNCg3SuWZsJivRwy1aaMDvL1zVDP7xULLCG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ub.hsu-hh.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ub.hsu-hh.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Helmut-Schmidt-Universität</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">HSU Hamburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://ub.hsu-hh.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ulrich</GivenName>
-    <SurName>Hahn</SurName>
-    <EmailAddress>idp@hsu-bibliothek.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ulrich</GivenName>
-    <SurName>Hahn</SurName>
-    <EmailAddress>uhahn@hsu-bibliothek.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ub.uni-heidelberg.de.xml b/swamid-interfederations-2.0/idp.ub.uni-heidelberg.de.xml
deleted file mode 100644
index 41ebfe7b..00000000
--- a/swamid-interfederations-2.0/idp.ub.uni-heidelberg.de.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ub.uni-heidelberg.de">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-heidelberg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>heidi.ub.uni-heidelberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=heidi.ub.uni-heidelberg.de,OU=Universitaetsbibliothek,O=Universitaet Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtDCCBJygAwIBAgIEDu6iLTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
-YmVyZzEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IEhlaWRlbGJlcmcxDDAKBgNVBAsT
-A3VuaTETMBEGA1UEAxMKVW5pLUhEMi1DQTEoMCYGCSqGSIb3DQEJARYZcGtpQHVy
-ei51bmktaGVpZGVsYmVyZy5kZTAeFw0wOTEwMDkxMTU1MTBaFw0xNDEwMDgxMTU1
-MTBaMIGoMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJn
-MRMwEQYDVQQHEwpIZWlkZWxiZXJnMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgSGVp
-ZGVsYmVyZzEgMB4GA1UECxMXVW5pdmVyc2l0YWV0c2JpYmxpb3RoZWsxIzAhBgNV
-BAMTGmhlaWRpLnViLnVuaS1oZWlkZWxiZXJnLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx18+8eiehW3uqqi3DVCpyZCb/yfv6nIsUhzS5rkOaC5m
-GAcYkC9klb9D4eU55+yefmMWOgwmGhqqMS2YxJPpFGl2ma1WnLSPWEVl9Md4y5MO
-F7wpLAik8BJrAvVIpVw8BZrGZD1GKH0wBULDnFSQquMAGSnzrm0hSMH+wPh4Smk3
-ISdLsNS5SaWZuKUImRY2OhZySa5Te3UYaojSU5944wznkyGYxg6fmoR4t7/wdCmZ
-c4ZGth1+p/5aP2P/6KHiV8jdWCx9K7vQxorPqT0CJYbacQRL3wyZ4YZroyZBkjV1
-WWO55YdejoatTaHtSe18cGfhlZZXL4lRu5UOG7cOiwIDAQABo4IB3DCCAdgwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBSfQB+xoURswNkqQVuSmcWpwSPenjAfBgNVHSMEGDAWgBS7
-oDus+PBgjLTQ1fm4kOCskhVXGzAiBgNVHREEGzAZgRd1YkB1Yi51bmktaGVpZGVs
-YmVyZy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktaGVpZGVsYmVyZy1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCZMM7xe7b74nld6iapgXp7mQNOwYkwiqd5NO78ncL4+1UGCMnGLFKv
-C/9SydLt5jGMNjVSZguXSsVYSSKiXZP4tRkVBnxVEPLVy+Xvw2VvK6poWsh2xm6L
-We9RmiuMrnyTLMB8uI1nvJg9hx0Mn08HKXCrzeH2isZ/QkqZiDP3T56SWbuukwxx
-vteCwQ/xA1wJx5vmPRrfNsYFH9PQosb0MPx/w+rZHUnH672Wp2EjetVFEbdLnCSp
-jX0bq4hSidhpBt4gJcU6vyolJVNBtxFfdiE/bV3eKzuLk36AqiNURn4TEvavuJZx
-w6zpBM0Jo1/D0wZemrmT5P03n6rX1fCP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>heidi.ub.uni-heidelberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=heidi.ub.uni-heidelberg.de,OU=Universitaetsbibliothek,O=Universitaet Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtDCCBJygAwIBAgIEDu6iLTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
-YmVyZzEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IEhlaWRlbGJlcmcxDDAKBgNVBAsT
-A3VuaTETMBEGA1UEAxMKVW5pLUhEMi1DQTEoMCYGCSqGSIb3DQEJARYZcGtpQHVy
-ei51bmktaGVpZGVsYmVyZy5kZTAeFw0wOTEwMDkxMTU1MTBaFw0xNDEwMDgxMTU1
-MTBaMIGoMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJn
-MRMwEQYDVQQHEwpIZWlkZWxiZXJnMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgSGVp
-ZGVsYmVyZzEgMB4GA1UECxMXVW5pdmVyc2l0YWV0c2JpYmxpb3RoZWsxIzAhBgNV
-BAMTGmhlaWRpLnViLnVuaS1oZWlkZWxiZXJnLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx18+8eiehW3uqqi3DVCpyZCb/yfv6nIsUhzS5rkOaC5m
-GAcYkC9klb9D4eU55+yefmMWOgwmGhqqMS2YxJPpFGl2ma1WnLSPWEVl9Md4y5MO
-F7wpLAik8BJrAvVIpVw8BZrGZD1GKH0wBULDnFSQquMAGSnzrm0hSMH+wPh4Smk3
-ISdLsNS5SaWZuKUImRY2OhZySa5Te3UYaojSU5944wznkyGYxg6fmoR4t7/wdCmZ
-c4ZGth1+p/5aP2P/6KHiV8jdWCx9K7vQxorPqT0CJYbacQRL3wyZ4YZroyZBkjV1
-WWO55YdejoatTaHtSe18cGfhlZZXL4lRu5UOG7cOiwIDAQABo4IB3DCCAdgwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBSfQB+xoURswNkqQVuSmcWpwSPenjAfBgNVHSMEGDAWgBS7
-oDus+PBgjLTQ1fm4kOCskhVXGzAiBgNVHREEGzAZgRd1YkB1Yi51bmktaGVpZGVs
-YmVyZy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktaGVpZGVsYmVyZy1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCZMM7xe7b74nld6iapgXp7mQNOwYkwiqd5NO78ncL4+1UGCMnGLFKv
-C/9SydLt5jGMNjVSZguXSsVYSSKiXZP4tRkVBnxVEPLVy+Xvw2VvK6poWsh2xm6L
-We9RmiuMrnyTLMB8uI1nvJg9hx0Mn08HKXCrzeH2isZ/QkqZiDP3T56SWbuukwxx
-vteCwQ/xA1wJx5vmPRrfNsYFH9PQosb0MPx/w+rZHUnH672Wp2EjetVFEbdLnCSp
-jX0bq4hSidhpBt4gJcU6vyolJVNBtxFfdiE/bV3eKzuLk36AqiNURn4TEvavuJZx
-w6zpBM0Jo1/D0wZemrmT5P03n6rX1fCP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://heidi.ub.uni-heidelberg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://heidi.ub.uni-heidelberg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://heidi.ub.uni-heidelberg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://heidi.ub.uni-heidelberg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://heidi.ub.uni-heidelberg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://heidi.ub.uni-heidelberg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-heidelberg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>heidi.ub.uni-heidelberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=heidi.ub.uni-heidelberg.de,OU=Universitaetsbibliothek,O=Universitaet Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtDCCBJygAwIBAgIEDu6iLTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
-YmVyZzEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IEhlaWRlbGJlcmcxDDAKBgNVBAsT
-A3VuaTETMBEGA1UEAxMKVW5pLUhEMi1DQTEoMCYGCSqGSIb3DQEJARYZcGtpQHVy
-ei51bmktaGVpZGVsYmVyZy5kZTAeFw0wOTEwMDkxMTU1MTBaFw0xNDEwMDgxMTU1
-MTBaMIGoMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJn
-MRMwEQYDVQQHEwpIZWlkZWxiZXJnMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgSGVp
-ZGVsYmVyZzEgMB4GA1UECxMXVW5pdmVyc2l0YWV0c2JpYmxpb3RoZWsxIzAhBgNV
-BAMTGmhlaWRpLnViLnVuaS1oZWlkZWxiZXJnLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx18+8eiehW3uqqi3DVCpyZCb/yfv6nIsUhzS5rkOaC5m
-GAcYkC9klb9D4eU55+yefmMWOgwmGhqqMS2YxJPpFGl2ma1WnLSPWEVl9Md4y5MO
-F7wpLAik8BJrAvVIpVw8BZrGZD1GKH0wBULDnFSQquMAGSnzrm0hSMH+wPh4Smk3
-ISdLsNS5SaWZuKUImRY2OhZySa5Te3UYaojSU5944wznkyGYxg6fmoR4t7/wdCmZ
-c4ZGth1+p/5aP2P/6KHiV8jdWCx9K7vQxorPqT0CJYbacQRL3wyZ4YZroyZBkjV1
-WWO55YdejoatTaHtSe18cGfhlZZXL4lRu5UOG7cOiwIDAQABo4IB3DCCAdgwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBSfQB+xoURswNkqQVuSmcWpwSPenjAfBgNVHSMEGDAWgBS7
-oDus+PBgjLTQ1fm4kOCskhVXGzAiBgNVHREEGzAZgRd1YkB1Yi51bmktaGVpZGVs
-YmVyZy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktaGVpZGVsYmVyZy1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCZMM7xe7b74nld6iapgXp7mQNOwYkwiqd5NO78ncL4+1UGCMnGLFKv
-C/9SydLt5jGMNjVSZguXSsVYSSKiXZP4tRkVBnxVEPLVy+Xvw2VvK6poWsh2xm6L
-We9RmiuMrnyTLMB8uI1nvJg9hx0Mn08HKXCrzeH2isZ/QkqZiDP3T56SWbuukwxx
-vteCwQ/xA1wJx5vmPRrfNsYFH9PQosb0MPx/w+rZHUnH672Wp2EjetVFEbdLnCSp
-jX0bq4hSidhpBt4gJcU6vyolJVNBtxFfdiE/bV3eKzuLk36AqiNURn4TEvavuJZx
-w6zpBM0Jo1/D0wZemrmT5P03n6rX1fCP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>heidi.ub.uni-heidelberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=heidi.ub.uni-heidelberg.de,OU=Universitaetsbibliothek,O=Universitaet Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFtDCCBJygAwIBAgIEDu6iLTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
-YmVyZzEgMB4GA1UEChMXVW5pdmVyc2l0YWV0IEhlaWRlbGJlcmcxDDAKBgNVBAsT
-A3VuaTETMBEGA1UEAxMKVW5pLUhEMi1DQTEoMCYGCSqGSIb3DQEJARYZcGtpQHVy
-ei51bmktaGVpZGVsYmVyZy5kZTAeFw0wOTEwMDkxMTU1MTBaFw0xNDEwMDgxMTU1
-MTBaMIGoMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJn
-MRMwEQYDVQQHEwpIZWlkZWxiZXJnMSAwHgYDVQQKExdVbml2ZXJzaXRhZXQgSGVp
-ZGVsYmVyZzEgMB4GA1UECxMXVW5pdmVyc2l0YWV0c2JpYmxpb3RoZWsxIzAhBgNV
-BAMTGmhlaWRpLnViLnVuaS1oZWlkZWxiZXJnLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx18+8eiehW3uqqi3DVCpyZCb/yfv6nIsUhzS5rkOaC5m
-GAcYkC9klb9D4eU55+yefmMWOgwmGhqqMS2YxJPpFGl2ma1WnLSPWEVl9Md4y5MO
-F7wpLAik8BJrAvVIpVw8BZrGZD1GKH0wBULDnFSQquMAGSnzrm0hSMH+wPh4Smk3
-ISdLsNS5SaWZuKUImRY2OhZySa5Te3UYaojSU5944wznkyGYxg6fmoR4t7/wdCmZ
-c4ZGth1+p/5aP2P/6KHiV8jdWCx9K7vQxorPqT0CJYbacQRL3wyZ4YZroyZBkjV1
-WWO55YdejoatTaHtSe18cGfhlZZXL4lRu5UOG7cOiwIDAQABo4IB3DCCAdgwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBSfQB+xoURswNkqQVuSmcWpwSPenjAfBgNVHSMEGDAWgBS7
-oDus+PBgjLTQ1fm4kOCskhVXGzAiBgNVHREEGzAZgRd1YkB1Yi51bmktaGVpZGVs
-YmVyZy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oZWlkZWxiZXJnLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktaGVpZGVsYmVyZy1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5p
-LWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQCZMM7xe7b74nld6iapgXp7mQNOwYkwiqd5NO78ncL4+1UGCMnGLFKv
-C/9SydLt5jGMNjVSZguXSsVYSSKiXZP4tRkVBnxVEPLVy+Xvw2VvK6poWsh2xm6L
-We9RmiuMrnyTLMB8uI1nvJg9hx0Mn08HKXCrzeH2isZ/QkqZiDP3T56SWbuukwxx
-vteCwQ/xA1wJx5vmPRrfNsYFH9PQosb0MPx/w+rZHUnH672Wp2EjetVFEbdLnCSp
-jX0bq4hSidhpBt4gJcU6vyolJVNBtxFfdiE/bV3eKzuLk36AqiNURn4TEvavuJZx
-w6zpBM0Jo1/D0wZemrmT5P03n6rX1fCP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://heidi.ub.uni-heidelberg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://heidi.ub.uni-heidelberg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Heidelberg (Ruprecht-Karls-Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Heidelberg - Universitätsbibliothek</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-heidelberg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Leonhard</GivenName>
-    <SurName>Maylein</SurName>
-    <EmailAddress>maylein@ub.uni-heidelberg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Leonhard</GivenName>
-    <SurName>Maylein</SurName>
-    <EmailAddress>maylein@ub.uni-heidelberg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ubalt.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ubalt.edu-idp-shibboleth.xml
deleted file mode 100644
index d390b026..00000000
--- a/swamid-interfederations-2.0/idp.ubalt.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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://idp.ubalt.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">ubalt.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Baltimore</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ubalt.edu</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>
-MIIDIDCCAgigAwIBAgIVALNBED/cJIrxyBgo57wvukY6HoaMMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC51YmFsdC5lZHUwHhcNMTAwNDE0MTQxMDE0WhcN
-MzAwNDE0MTQxMDE0WjAYMRYwFAYDVQQDEw1pZHAudWJhbHQuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkQQUyShLGEpGTZP5yXSVrvzSqb12zVFl
-i8lgmI3B11Djae9CB2MYvCxVPR45UbECwABRglgg0J3DbqF7sHJdx8e6wlQKtL3x
-j4lCNaQ3RuQTqiDFQjPN/pB9ZmCGNe0Xg/IGsdQMSyaAByvg704svGFGNV4w2+jX
-AZjn5uT0Ie2nzH7Ld5viKuuAg69qL3tCeViLGdLi968lyP88cDsoY3XVmhaWwvKa
-QEo4Ux4cps8T8AMSrM4WjL6utDB54QW2GO33c6UZdWRV1emGzko98wWM44Vdi2BW
-y+RioI1CeHK1N14WaoAbU3NNbNn3QmZIW/Wh25H94Q5svbpMmUm5oQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAudWJhbHQuZWR1hiRodHRwczovL2lkcC51YmFsdC5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNvNBX8NadYpqWmsgeMXG0GQNHo7
-MA0GCSqGSIb3DQEBBQUAA4IBAQAIbKuLg8lZhoSRwTj28WIdnGMK0rEJrt1LXAiO
-YNGxXgeMjZx0p6ztoOFFdjo9TVgEuxXx2ycmKz5eJ7SBAXRkt3NwX1YizRcyLRsC
-TnYa0K8gnnk14AGIqfVd0VaCfXLa7RE7+uVngWgHqkZrwkwGlesvAysdDG9RrXM4
-5aw9kh43lKx0nuGSCygLpWJJYtm9GW9XmRaNcnAOPiIHsICAeHFYbW+ZpBsd70BZ
-UW70RjR8T0DfLVxDaVoxG38lSnjyhJvNsFoapErardKKtSfjgAPEB9VJ01s73u3w
-8jympr7hYBlzGEVpM1EYCsSsULuEXTgFVg4RZnbigygJHpKA
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ubalt.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ubalt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ubalt.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ubalt.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ubalt.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ubalt.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVALNBED/cJIrxyBgo57wvukY6HoaMMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC51YmFsdC5lZHUwHhcNMTAwNDE0MTQxMDE0WhcN
-MzAwNDE0MTQxMDE0WjAYMRYwFAYDVQQDEw1pZHAudWJhbHQuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkQQUyShLGEpGTZP5yXSVrvzSqb12zVFl
-i8lgmI3B11Djae9CB2MYvCxVPR45UbECwABRglgg0J3DbqF7sHJdx8e6wlQKtL3x
-j4lCNaQ3RuQTqiDFQjPN/pB9ZmCGNe0Xg/IGsdQMSyaAByvg704svGFGNV4w2+jX
-AZjn5uT0Ie2nzH7Ld5viKuuAg69qL3tCeViLGdLi968lyP88cDsoY3XVmhaWwvKa
-QEo4Ux4cps8T8AMSrM4WjL6utDB54QW2GO33c6UZdWRV1emGzko98wWM44Vdi2BW
-y+RioI1CeHK1N14WaoAbU3NNbNn3QmZIW/Wh25H94Q5svbpMmUm5oQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAudWJhbHQuZWR1hiRodHRwczovL2lkcC51YmFsdC5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNvNBX8NadYpqWmsgeMXG0GQNHo7
-MA0GCSqGSIb3DQEBBQUAA4IBAQAIbKuLg8lZhoSRwTj28WIdnGMK0rEJrt1LXAiO
-YNGxXgeMjZx0p6ztoOFFdjo9TVgEuxXx2ycmKz5eJ7SBAXRkt3NwX1YizRcyLRsC
-TnYa0K8gnnk14AGIqfVd0VaCfXLa7RE7+uVngWgHqkZrwkwGlesvAysdDG9RrXM4
-5aw9kh43lKx0nuGSCygLpWJJYtm9GW9XmRaNcnAOPiIHsICAeHFYbW+ZpBsd70BZ
-UW70RjR8T0DfLVxDaVoxG38lSnjyhJvNsFoapErardKKtSfjgAPEB9VJ01s73u3w
-8jympr7hYBlzGEVpM1EYCsSsULuEXTgFVg4RZnbigygJHpKA
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ubalt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Baltimore</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Baltimore</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ubalt.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>George Weitzel</md:GivenName>
-    <md:EmailAddress>gweitzel@ubalt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>George Weitzel</md:GivenName>
-    <md:EmailAddress>gweitzel@ubalt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>George Weitzel</md:GivenName>
-    <md:EmailAddress>gweitzel@ubalt.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml
deleted file mode 100644
index fa952ba2..00000000
--- a/swamid-interfederations-2.0/idp.uclouvain.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uclouvain.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uclouvain.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">Universite Catholique de Louvain</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Catholic University of Louvain</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">L'Universite Catholique de Louvain est une universite pluridisciplinaire au coeur de l'Europe (Belgique).</mdui:Description>
-        <mdui:Description xml:lang="en">The Catholic University of Louvain is an pluridisciplinary university at the heart of Europe (Belgium)</mdui:Description>
-        <mdui:InformationURL xml:lang="fr">https://www.uclouvain.be/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.uclouvain.be/en-index.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="fr">https://www.uclouvain.be/10547.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16">https://idp.uclouvain.be/favicon.ico</mdui:Logo>
-        <mdui:Logo height="100" width="540">https://idp.uclouvain.be/idp/images/UCL-bandeau.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>130.104.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:6a8:3080::/44</mdui:IPHint>
-        <mdui:DomainHint>uclouvain.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:50.669920,4.615240</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>
-MIIDKzCCAhOgAwIBAgIULsoRND5rnR86uR/01PHcK0n+pmkwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaWRwLnVjbG91dmFpbi5iZTAeFw0xNTA2MjMxMjQzNDla
-Fw0zNTA2MjMxMjQzNDlaMBsxGTAXBgNVBAMMEGlkcC51Y2xvdXZhaW4uYmUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTMboR5U7bjJx+kyifcb531Z/f
-QdgE8RTc3x4RlKe48OpVnBnmqmWsWQLLa42a+DvnKfZv7gqYo/51x6Zc4YsQHL/w
-ueOUAabNgNbXkyrEnD7yoHuS9jTCvGV+HK+J3sNf6HVx5MZnxk6mui0r8IhzRfDl
-Pq9kM+W2OPKkbYCoIBjBH1S3BsPifz0D2pFpiQ1Fjc19u4818xvP4r12ALcWcDxP
-8eI+rKH8dxAld+DeQAwkwvtzDh+6fgvv8ktBEVfMd793mCIjoP4HS+WJqgLX4ttD
-j63/cQ3oYSN20CFLuhbd3d6yfHx8c9Ea6F/beNloGGDatZYJ4mk2NBATXbhdAgMB
-AAGjZzBlMB0GA1UdDgQWBBQc/p554yCIxGlazuaJK8sT3Jv6JzBEBgNVHREEPTA7
-ghBpZHAudWNsb3V2YWluLmJlhidodHRwczovL2lkcC51Y2xvdXZhaW4uYmUvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAAQJmepDebdFihTF+DoqBM2n
-CMG5Qrdw5RIh4syzeFhzJBJPzsRvGCPQUP78exFjYD9D5eg0SqXFzN2ip507QeVu
-bvZj2W0Sg69XRSAljXiE9iqK5i3+4lV+lYgjT34A5pDmwr22M8C/QUSfPNqc5TJS
-61Ua0VOxuhRRljSIufX/lZd4PHL1/IQ6TnoHRvTJ/O3EomN75JNczHD+GCFxfrZk
-BIyJrdYr392Pi2qT9hndEWKEGsJFyhcTicd3lf0EShcXm2KbpEvNz8k+S4Twn8q4
-goNAmKsfT41JZjV09SqBnNHg/0fYtAHaNH0QOyRhS4kVhUkmdrdnbhuzWwLL+Y4=
-                        </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>
-MIIDKzCCAhOgAwIBAgIUL59ORSvxP+AJwSsPyJpZlpDdWjowDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaWRwLnVjbG91dmFpbi5iZTAeFw0xNTA2MjMxMjQzNDda
-Fw0zNTA2MjMxMjQzNDdaMBsxGTAXBgNVBAMMEGlkcC51Y2xvdXZhaW4uYmUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCRNp3NBgCosZPYfQLAKigckH5a
-yTybh/Nw2jRUo2WuBk4DYzsiVbjdfylcj/vt6ZO7TDk3oTRkUwlSwMqujRnSpOv7
-NSJdqemJPfKG77JIomnSXLhlF3Ti1l1MEAM3rm+BhFUiCLOyzpgCejEo5jRc7ioJ
-brOWBBU6ixxlreyHN8HJv6oNfGbF+0+RfEzntGzhVRW/TWIbXOjJikDxH9GTKqo/
-OBtcPW4r13EiE0SaPibr4IDGkZ31e9k1thWfQf8oVQlloqX8TqW4Qfa2fIbBCihP
-HwivY0x6R7u7OAZYa9rbZutwD4K4ANYHl246f9LKGIDj1fT3sx7mNd8qymTpAgMB
-AAGjZzBlMB0GA1UdDgQWBBQbRFM5+fd31sppff2cCm3rNXwDpDBEBgNVHREEPTA7
-ghBpZHAudWNsb3V2YWluLmJlhidodHRwczovL2lkcC51Y2xvdXZhaW4uYmUvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGO0F2vutWO9OSP6/RIE7a8Y
-kboJpQaIQSafbr201WeLNvrOVvbVZg317Z9bx7TvURdHVhGYhCfQpDyDLBRISC1R
-ugHbCmBDf72I5mF9XXNgoZcclOEprcxrFo8HHb4Y3LCzx+tny1NnBiQ7qOmOp69R
-oPCTgFYIFRUgpQX//LI3O3Mvri5VTyBEuZi3xNb3nfOgO7Nm1j5WafWkY/Ez7SLc
-+Eq9MovDNNSNM+tHunfAL+gpMXqnNqgoX/rdf1zCh4iFADNcVIlIWm08teLueerC
-zw6rVzahF34aPaCK0oBPRTHGG43EyKpYvq6WVoVGKPO02ZnUC0znXfiQft47ImE=
-                        </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>
-MIIDKzCCAhOgAwIBAgIUW9CW/lDKLYeNR9Qf3Shw0wzP7/8wDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaWRwLnVjbG91dmFpbi5iZTAeFw0xNTA2MjMxMjQzNDha
-Fw0zNTA2MjMxMjQzNDhaMBsxGTAXBgNVBAMMEGlkcC51Y2xvdXZhaW4uYmUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ6bNbNeyP/geUyaLvd0FWwDia
-EhIpYSWs7MoG7f4eQxuY1d3rwCzrIXNYZqNsjUsR7owKkLGCFXMi9UC/gVoTKNcf
-8bba6d/2LXajX0mjww+0CnsbWlEMBMYu3I/jxnyOf4XVhdYxmgk7Yf/J/r1weOI6
-p8a/FNHp1tYwhwdUZGPJPKPnH5cFd1qdLtRVadk6uDYzk3N6R/rAMNBszsWnP3jK
-N7Q6ydzsyelEcIzEjkrs65ONW5wpVj2XTjNPdzGOief6OmaRUBA+3dBc6IamSRNO
-y6/I183KsrWOn4nycVI/YzjzOF1zpC8il4C4QdlXz/auqfFyyaBdMftBiK6/AgMB
-AAGjZzBlMB0GA1UdDgQWBBR866jbr+1nZyWWyqTmX1a02AEHwTBEBgNVHREEPTA7
-ghBpZHAudWNsb3V2YWluLmJlhidodHRwczovL2lkcC51Y2xvdXZhaW4uYmUvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBABmis53jaA3iQihgzcnFaJL1
-0kUrsuXhZ9AsCdVHtszqkh7aKSag81jGFUmxKPGRM9/gP+wW8T4R62gEhcgdfkaB
-m1JNt0AQKzr64b3nehsxVEHGWyJxgQdV+sWAYv8p7BQmx2dGy9Gf9d7r0f2BVxLh
-XDBjy1GOfQe9Y8f918KdHX9ekfVZzVJu4Ukoz66rOWlDenbOZb///Ih1kE20Yh+L
-jB2eA8lGhLRdfBI2Z7gkLxL6eDCa9QzxZnrX8Pd8a5yGlSe51IyfRFeY5B8inl0p
-RQ04bxgiI77gAJH7GDHsFbX71Gmfurj7pJ3R5F25y6KUWELAmhAPm4Kb0WyV0Us=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uclouvain.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uclouvain.be: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.uclouvain.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uclouvain.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uclouvain.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uclouvain.be/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">uclouvain.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIULsoRND5rnR86uR/01PHcK0n+pmkwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaWRwLnVjbG91dmFpbi5iZTAeFw0xNTA2MjMxMjQzNDla
-Fw0zNTA2MjMxMjQzNDlaMBsxGTAXBgNVBAMMEGlkcC51Y2xvdXZhaW4uYmUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTMboR5U7bjJx+kyifcb531Z/f
-QdgE8RTc3x4RlKe48OpVnBnmqmWsWQLLa42a+DvnKfZv7gqYo/51x6Zc4YsQHL/w
-ueOUAabNgNbXkyrEnD7yoHuS9jTCvGV+HK+J3sNf6HVx5MZnxk6mui0r8IhzRfDl
-Pq9kM+W2OPKkbYCoIBjBH1S3BsPifz0D2pFpiQ1Fjc19u4818xvP4r12ALcWcDxP
-8eI+rKH8dxAld+DeQAwkwvtzDh+6fgvv8ktBEVfMd793mCIjoP4HS+WJqgLX4ttD
-j63/cQ3oYSN20CFLuhbd3d6yfHx8c9Ea6F/beNloGGDatZYJ4mk2NBATXbhdAgMB
-AAGjZzBlMB0GA1UdDgQWBBQc/p554yCIxGlazuaJK8sT3Jv6JzBEBgNVHREEPTA7
-ghBpZHAudWNsb3V2YWluLmJlhidodHRwczovL2lkcC51Y2xvdXZhaW4uYmUvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAAQJmepDebdFihTF+DoqBM2n
-CMG5Qrdw5RIh4syzeFhzJBJPzsRvGCPQUP78exFjYD9D5eg0SqXFzN2ip507QeVu
-bvZj2W0Sg69XRSAljXiE9iqK5i3+4lV+lYgjT34A5pDmwr22M8C/QUSfPNqc5TJS
-61Ua0VOxuhRRljSIufX/lZd4PHL1/IQ6TnoHRvTJ/O3EomN75JNczHD+GCFxfrZk
-BIyJrdYr392Pi2qT9hndEWKEGsJFyhcTicd3lf0EShcXm2KbpEvNz8k+S4Twn8q4
-goNAmKsfT41JZjV09SqBnNHg/0fYtAHaNH0QOyRhS4kVhUkmdrdnbhuzWwLL+Y4=
-                        </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>
-MIIDKzCCAhOgAwIBAgIUL59ORSvxP+AJwSsPyJpZlpDdWjowDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaWRwLnVjbG91dmFpbi5iZTAeFw0xNTA2MjMxMjQzNDda
-Fw0zNTA2MjMxMjQzNDdaMBsxGTAXBgNVBAMMEGlkcC51Y2xvdXZhaW4uYmUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCRNp3NBgCosZPYfQLAKigckH5a
-yTybh/Nw2jRUo2WuBk4DYzsiVbjdfylcj/vt6ZO7TDk3oTRkUwlSwMqujRnSpOv7
-NSJdqemJPfKG77JIomnSXLhlF3Ti1l1MEAM3rm+BhFUiCLOyzpgCejEo5jRc7ioJ
-brOWBBU6ixxlreyHN8HJv6oNfGbF+0+RfEzntGzhVRW/TWIbXOjJikDxH9GTKqo/
-OBtcPW4r13EiE0SaPibr4IDGkZ31e9k1thWfQf8oVQlloqX8TqW4Qfa2fIbBCihP
-HwivY0x6R7u7OAZYa9rbZutwD4K4ANYHl246f9LKGIDj1fT3sx7mNd8qymTpAgMB
-AAGjZzBlMB0GA1UdDgQWBBQbRFM5+fd31sppff2cCm3rNXwDpDBEBgNVHREEPTA7
-ghBpZHAudWNsb3V2YWluLmJlhidodHRwczovL2lkcC51Y2xvdXZhaW4uYmUvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGO0F2vutWO9OSP6/RIE7a8Y
-kboJpQaIQSafbr201WeLNvrOVvbVZg317Z9bx7TvURdHVhGYhCfQpDyDLBRISC1R
-ugHbCmBDf72I5mF9XXNgoZcclOEprcxrFo8HHb4Y3LCzx+tny1NnBiQ7qOmOp69R
-oPCTgFYIFRUgpQX//LI3O3Mvri5VTyBEuZi3xNb3nfOgO7Nm1j5WafWkY/Ez7SLc
-+Eq9MovDNNSNM+tHunfAL+gpMXqnNqgoX/rdf1zCh4iFADNcVIlIWm08teLueerC
-zw6rVzahF34aPaCK0oBPRTHGG43EyKpYvq6WVoVGKPO02ZnUC0znXfiQft47ImE=
-                        </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>
-MIIDKzCCAhOgAwIBAgIUW9CW/lDKLYeNR9Qf3Shw0wzP7/8wDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQaWRwLnVjbG91dmFpbi5iZTAeFw0xNTA2MjMxMjQzNDha
-Fw0zNTA2MjMxMjQzNDhaMBsxGTAXBgNVBAMMEGlkcC51Y2xvdXZhaW4uYmUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ6bNbNeyP/geUyaLvd0FWwDia
-EhIpYSWs7MoG7f4eQxuY1d3rwCzrIXNYZqNsjUsR7owKkLGCFXMi9UC/gVoTKNcf
-8bba6d/2LXajX0mjww+0CnsbWlEMBMYu3I/jxnyOf4XVhdYxmgk7Yf/J/r1weOI6
-p8a/FNHp1tYwhwdUZGPJPKPnH5cFd1qdLtRVadk6uDYzk3N6R/rAMNBszsWnP3jK
-N7Q6ydzsyelEcIzEjkrs65ONW5wpVj2XTjNPdzGOief6OmaRUBA+3dBc6IamSRNO
-y6/I183KsrWOn4nycVI/YzjzOF1zpC8il4C4QdlXz/auqfFyyaBdMftBiK6/AgMB
-AAGjZzBlMB0GA1UdDgQWBBR866jbr+1nZyWWyqTmX1a02AEHwTBEBgNVHREEPTA7
-ghBpZHAudWNsb3V2YWluLmJlhidodHRwczovL2lkcC51Y2xvdXZhaW4uYmUvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBABmis53jaA3iQihgzcnFaJL1
-0kUrsuXhZ9AsCdVHtszqkh7aKSag81jGFUmxKPGRM9/gP+wW8T4R62gEhcgdfkaB
-m1JNt0AQKzr64b3nehsxVEHGWyJxgQdV+sWAYv8p7BQmx2dGy9Gf9d7r0f2BVxLh
-XDBjy1GOfQe9Y8f918KdHX9ekfVZzVJu4Ukoz66rOWlDenbOZb///Ih1kE20Yh+L
-jB2eA8lGhLRdfBI2Z7gkLxL6eDCa9QzxZnrX8Pd8a5yGlSe51IyfRFeY5B8inl0p
-RQ04bxgiI77gAJH7GDHsFbX71Gmfurj7pJ3R5F25y6KUWELAmhAPm4Kb0WyV0Us=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uclouvain.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uclouvain.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Universite Catholique de Louvain</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universite Catholique de Louvain</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uclouvain.be/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Olivier</md:GivenName>
-    <md:SurName>Delcourt</md:SurName>
-    <md:EmailAddress>olivier.delcourt@uclouvain.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.xml
deleted file mode 100644
index cb4388b2..00000000
--- a/swamid-interfederations-2.0/idp.ucreative.ac.uk-oala-metadata.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.ucreative.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens IdP for the University for the Creative Arts.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-23T10:43:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">ucreative.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYjCCAkqgAwIBAgIIJo1biNwPrSgwDQYJKoZIhvcNAQEFBQAwSDEoMCYGA1UE
-						CgwfVW5pdmVyc2l0eSBvZiB0aGUgQ3JlYXRpdmUgQXJ0czEcMBoGA1UEAwwTaWRw
-						LnVjcmVhdGl2ZS5hYy51azAeFw0xNDA2MTgwOTU4MDRaFw0yNDA2MTgwOTU4MDRa
-						MEgxKDAmBgNVBAoMH1VuaXZlcnNpdHkgb2YgdGhlIENyZWF0aXZlIEFydHMxHDAa
-						BgNVBAMME2lkcC51Y3JlYXRpdmUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQDDWJ5V75TP17ft7xWNE1OLty4PKX6Ntd+4HurvVjZ8UU9T3zII
-						YgYbccWNaakLxM8cbrJFJuyTPKryfT/KQQlXaMj1f3dKYEWHZwoMrcNL+RRyoSFJ
-						rOuMFvC7xH7RF/ZoXZM1IQrHuYmlHW8YzQ7Gq/266/lDLCLEAt5zw2icTBeeSXzX
-						PSvywT6WnSPBKACLvJ/n2HbDDj6wi+pPHvkDeBVPVt7jH0KaDNpQtcoVbXBeRv3S
-						wwOfr7lDWB5ydebEDgZjCfB+7P0EOQyGmylT4+TxGKyEOZMNaZ6X4sgSCUOHq//4
-						nrZw23XxPrPgbJ4anXKKjI4CuJQv8oH1eV5VAgMBAAGjUDBOMB0GA1UdDgQWBBQF
-						0udRgqvg95A7Qo+xph4DcxCsnzAfBgNVHSMEGDAWgBQF0udRgqvg95A7Qo+xph4D
-						cxCsnzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPT/cxiwyp9PeO
-						8Y9oo/VlxzvwwElBDfs7Z0t+jLIB9xnybKv/6+SBlaHLJjekuF2Or1M0GODTZM6E
-						BhlKYkPnR458hEVH4Tvfxvxz8szkM10f2qttwW1fJ521SrUDpjkbzAhvQWWDHuKG
-						T6/P5OqeESsgRHQxP15jOBIR9dUrw23fKdRqCQKnFrv5th67uiOTzQohI8j5Tm96
-						zbQVayzUvXTkXa+WFk69R/wu5UJqvsSV/5aMvGFxtS0PHTvJvbbw7ZGllRiaTVP8
-						wzgmWpHQcWolIchFx3IdrXQA5DjbSGerGgvcqpi6aAo1Q8mJNUAAsMT8y2qhYp1z
-						XcWw+FBE
-					</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>
-						MIIDYjCCAkqgAwIBAgIIJo1biNwPrSgwDQYJKoZIhvcNAQEFBQAwSDEoMCYGA1UE
-						CgwfVW5pdmVyc2l0eSBvZiB0aGUgQ3JlYXRpdmUgQXJ0czEcMBoGA1UEAwwTaWRw
-						LnVjcmVhdGl2ZS5hYy51azAeFw0xNDA2MTgwOTU4MDRaFw0yNDA2MTgwOTU4MDRa
-						MEgxKDAmBgNVBAoMH1VuaXZlcnNpdHkgb2YgdGhlIENyZWF0aXZlIEFydHMxHDAa
-						BgNVBAMME2lkcC51Y3JlYXRpdmUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQDDWJ5V75TP17ft7xWNE1OLty4PKX6Ntd+4HurvVjZ8UU9T3zII
-						YgYbccWNaakLxM8cbrJFJuyTPKryfT/KQQlXaMj1f3dKYEWHZwoMrcNL+RRyoSFJ
-						rOuMFvC7xH7RF/ZoXZM1IQrHuYmlHW8YzQ7Gq/266/lDLCLEAt5zw2icTBeeSXzX
-						PSvywT6WnSPBKACLvJ/n2HbDDj6wi+pPHvkDeBVPVt7jH0KaDNpQtcoVbXBeRv3S
-						wwOfr7lDWB5ydebEDgZjCfB+7P0EOQyGmylT4+TxGKyEOZMNaZ6X4sgSCUOHq//4
-						nrZw23XxPrPgbJ4anXKKjI4CuJQv8oH1eV5VAgMBAAGjUDBOMB0GA1UdDgQWBBQF
-						0udRgqvg95A7Qo+xph4DcxCsnzAfBgNVHSMEGDAWgBQF0udRgqvg95A7Qo+xph4D
-						cxCsnzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPT/cxiwyp9PeO
-						8Y9oo/VlxzvwwElBDfs7Z0t+jLIB9xnybKv/6+SBlaHLJjekuF2Or1M0GODTZM6E
-						BhlKYkPnR458hEVH4Tvfxvxz8szkM10f2qttwW1fJ521SrUDpjkbzAhvQWWDHuKG
-						T6/P5OqeESsgRHQxP15jOBIR9dUrw23fKdRqCQKnFrv5th67uiOTzQohI8j5Tm96
-						zbQVayzUvXTkXa+WFk69R/wu5UJqvsSV/5aMvGFxtS0PHTvJvbbw7ZGllRiaTVP8
-						wzgmWpHQcWolIchFx3IdrXQA5DjbSGerGgvcqpi6aAo1Q8mJNUAAsMT8y2qhYp1z
-						XcWw+FBE
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ucreative.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucreative.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University for the Creative Arts</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University for the Creative Arts (Testing)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ucreative.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jill</GivenName>
-    <SurName>Gravestock</SurName>
-    <EmailAddress>mailto:JGravestock@ucreative.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jill</GivenName>
-    <SurName>Gravestock</SurName>
-    <EmailAddress>mailto:JGravestock@ucreative.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ucs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ucs.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 33b98395..00000000
--- a/swamid-interfederations-2.0/idp.ucs.ac.uk-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://idp.ucs.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for University Campus Suffolk.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-12T14:33:22Z">
-      <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">ucs.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University Campus Suffolk</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUHNOHSlpAfJGT9rl3zRDmwa3SDhMwDQYJKoZIhvcNAQEF
-						BQAwGDEWMBQGA1UEAxMNaWRwLnVjcy5hYy51azAeFw0xNDA0MTYxNDI4MDNaFw0z
-						NDA0MTYxNDI4MDNaMBgxFjAUBgNVBAMTDWlkcC51Y3MuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCxdBx+Yitont8++RjBk3LRjqNAvHMPUdy
-						J6hSQFmQ5EPN3YQDzJ/2m9tGH+TO8uKCiiOd0zMzA4zzkOtGTyNNqjk0+ENR4PJa
-						0XOOk7PXJTuXbo5frqZ7a3wi1oVtm+SuOi7cg35ya0+w70xQ6iVE449cdGi6zi7p
-						O5/BXVQGDPusH13EswEC2JeTX7dGDCvM9wYbJvIbVvrCX4R4YB+fJg5h7/JyveXc
-						VtZbmGaQ0Xuu6fAXn0G2Y9/72NGpvOcM3LUPyHy1iBUzaClV9TRoBCJIvdojPQ8k
-						4O+/dz3Qq2NkpSSOUsTOldzeZuRXhzrJVCmDJH0RxawJ1czDLtgxAgMBAAGjYTBf
-						MD4GA1UdEQQ3MDWCDWlkcC51Y3MuYWMudWuGJGh0dHBzOi8vaWRwLnVjcy5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOU13V/q7ER53eftMiDzdpx/ur6Mw
-						DQYJKoZIhvcNAQEFBQADggEBAGrR1rz3rBUkNLDk0a7KMP+AKRP+ei+YOy1DkTt1
-						nF0/QrIVulgk5/82uw5rtp07xPJLveTM71/cjC/NXhV0lDPtGe+7jDwBjsaSKf8d
-						k8sRow8dIcViLwcyvS8yaC5PLdc6aTALKNYrhzKuLq9zbKXpxB6ZW3x/S16/cH+U
-						jGFtEu7tGSF9K8Y8pNu7cCuDylk3iz8v7spPeAembJyNAX8x6Stwseq4L5HJuHsm
-						xZgo69TfUXl/v3znLYArSkQl1hRgMalzCx0xXy3BCpTQB8/TvYFy+HHCk3sLSLzE
-						oazcpzNwlhXSgUNXMBFi+ghU9o77fKnWXJN8L3mv8lbbf6g=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucs.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.ucs.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ucs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucs.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">ucs.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHzCCAgegAwIBAgIUHNOHSlpAfJGT9rl3zRDmwa3SDhMwDQYJKoZIhvcNAQEF
-						BQAwGDEWMBQGA1UEAxMNaWRwLnVjcy5hYy51azAeFw0xNDA0MTYxNDI4MDNaFw0z
-						NDA0MTYxNDI4MDNaMBgxFjAUBgNVBAMTDWlkcC51Y3MuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCxdBx+Yitont8++RjBk3LRjqNAvHMPUdy
-						J6hSQFmQ5EPN3YQDzJ/2m9tGH+TO8uKCiiOd0zMzA4zzkOtGTyNNqjk0+ENR4PJa
-						0XOOk7PXJTuXbo5frqZ7a3wi1oVtm+SuOi7cg35ya0+w70xQ6iVE449cdGi6zi7p
-						O5/BXVQGDPusH13EswEC2JeTX7dGDCvM9wYbJvIbVvrCX4R4YB+fJg5h7/JyveXc
-						VtZbmGaQ0Xuu6fAXn0G2Y9/72NGpvOcM3LUPyHy1iBUzaClV9TRoBCJIvdojPQ8k
-						4O+/dz3Qq2NkpSSOUsTOldzeZuRXhzrJVCmDJH0RxawJ1czDLtgxAgMBAAGjYTBf
-						MD4GA1UdEQQ3MDWCDWlkcC51Y3MuYWMudWuGJGh0dHBzOi8vaWRwLnVjcy5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUOU13V/q7ER53eftMiDzdpx/ur6Mw
-						DQYJKoZIhvcNAQEFBQADggEBAGrR1rz3rBUkNLDk0a7KMP+AKRP+ei+YOy1DkTt1
-						nF0/QrIVulgk5/82uw5rtp07xPJLveTM71/cjC/NXhV0lDPtGe+7jDwBjsaSKf8d
-						k8sRow8dIcViLwcyvS8yaC5PLdc6aTALKNYrhzKuLq9zbKXpxB6ZW3x/S16/cH+U
-						jGFtEu7tGSF9K8Y8pNu7cCuDylk3iz8v7spPeAembJyNAX8x6Stwseq4L5HJuHsm
-						xZgo69TfUXl/v3znLYArSkQl1hRgMalzCx0xXy3BCpTQB8/TvYFy+HHCk3sLSLzE
-						oazcpzNwlhXSgUNXMBFi+ghU9o77fKnWXJN8L3mv8lbbf6g=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucs.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 Campus Suffolk</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University Campus Suffolk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ucs.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:ithelpdesk@ucs.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Will</GivenName>
-    <SurName>Liebow</SurName>
-    <EmailAddress>mailto:w.liebow@ucs.ac.uk</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 35e1d142..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ucuenca.edu.ec/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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">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>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec: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.ucuenca.edu.ec/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucuenca.edu.ec/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">edu.ec</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec: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">UCUENCA - Universidad de Cuenca</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ucuenca - Universidad de Cuenca</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucuenca.edu.ec.ec/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Claudio Chacon A</md:SurName>
-    <md:EmailAddress>noc@ucuenca.edu.ec</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.udc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.udc.edu-idp-shibboleth.xml
deleted file mode 100644
index 6ae034e2..00000000
--- a/swamid-interfederations-2.0/idp.udc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,123 +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://idp.udc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.udc.edu/mail" 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">udc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of the District of Columbia</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>
-MIID6DCCAtACCQDW6/6+LgD4VTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCldhc2hpbmd0b24xCzAJBgNVBAcTAkRDMTMwMQYDVQQKEypU
-aGUgVW5pdmVyc2l0eSBvZiB0aGUgRGlzdHJpY3Qgb2YgQ29sdW1iaWExGTAXBgNV
-BAsTEElkZW50aXR5IFNlcnZpY2UxFDASBgNVBAMTC2lkcC51ZGMuZWR1MR4wHAYJ
-KoZIhvcNAQkBFg9zdXBwb3J0QHVkYy5lZHUwHhcNMTEwMTE1MTgzNzAzWhcNMTIw
-NTI5MTgzNzAzWjCBtTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24x
-CzAJBgNVBAcTAkRDMTMwMQYDVQQKEypUaGUgVW5pdmVyc2l0eSBvZiB0aGUgRGlz
-dHJpY3Qgb2YgQ29sdW1iaWExGTAXBgNVBAsTEElkZW50aXR5IFNlcnZpY2UxFDAS
-BgNVBAMTC2lkcC51ZGMuZWR1MR4wHAYJKoZIhvcNAQkBFg9zdXBwb3J0QHVkYy5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGOyFd6M7tIYRy8n3L
-ROkLmYOIV4QUiuguVZvUILG30v0GgqLEV7NwEUaNh2mPz5g4xlCIVmht48M3dRlQ
-ZsSFTMlepQlFq3vvpGJBWCgR6zrfkX70liHcPcofxwbTQ8kn/X/YOniieZq+NMNJ
-j5tLbooDqnvXdPYw/79rchQrgBY9U96Dlc16stxTbUQ68/AQi0K3xPtudWhWf6Cm
-81jpIkR/BBrKm5c8DQI4AgqgFdWs6iScdfYxVt2//yuMDOLbtyMjxSsberrq6HFa
-TUfdtAnf9iZ2eKCxrQpnDJ4nu9A2YsPuFFBB0p2XpE9VWT+stMUi1sonEjji0v39
-lAtvAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAAc0KXe2iM0UATqfAsulaSSQv2WN
-IcANbC4Sv1ShEIiqV4vGRS9rLi9OeFmzJGzthpx2zYmexL+JwD6PAlSbKzLvUt6K
-GWW8uQUlQ5YqWnmKp7stbXL5y4eNIVfNllc9m2zbuoeYqrR8UwWTJnMBlwLZFidf
-2dlXXDrnwXUPROFtSvCdd4jPjupD3RLq6hxTUZ3uAMx5Lv+mC9SIgHxjsh0Kjgl1
-/fonk0+iK+kWJq6zMscCDEtTXMv/9wQv181y6TZ57Twy56/chsQPKO+kcMEC78qn
-ZinR7MQoxDrrq20AG0ehnfsFE3m50C4gNCLVtEZkRXi6/XPSPVSm5P9/njs=
-          </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>
-MIIDIjCCAgoCCQCoznUOdQ6C4jANBgkqhkiG9w0BAQUFADBTMRQwEgYDVQQDEwtp
-ZHAudWRjLmVkdTEMMAoGA1UEChMDVURDMQswCQYDVQQGEwJVUzELMAkGA1UECBMC
-REMxEzARBgNVBAcTCldhc2hpbmd0b24wHhcNMTIwNTA0MTIxMTA4WhcNMTMwNTA0
-MTIxMTA4WjBTMRQwEgYDVQQDEwtpZHAudWRjLmVkdTEMMAoGA1UEChMDVURDMQsw
-CQYDVQQGEwJVUzELMAkGA1UECBMCREMxEzARBgNVBAcTCldhc2hpbmd0b24wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7TyLWXxbL3RNYMfrmp8fMF785
-wazS4kAfaERuY2pi+3LwSte3OQDRC/RV1CYAzBeDCUPRbCpo6lrBT1pta9vbrrHl
-xwnmTXEINHd6c8SfqdiEBf8qkKZUTWOVn+0hNo7Eso71VnJtVPZFMOFoNohfwUJg
-zvkIVe/54pP6l0p18mCT77UDpL8cx89zixCwGC3k2n4s6+zZGHjSbi4KMnMhrD9G
-yh+d7Eh6mmV2zUyITtvmZZ0hYKzj7IjTR4u3yM+QZY7/8paLd6O6l9dN9/qJTNmr
-n+dwr2nQ8Av+N/TGVeEMZ6XaWweZ1Z8BCUove0VOzyvEIAvaPP9dNg95fKlXAgMB
-AAEwDQYJKoZIhvcNAQEFBQADggEBADeA4wAx/dfOqdqVnXnzI3rq7vHR4yNJpzAE
-ySgnCB0yAuazB/J5RlMUI1shi3opNcryf9FU854YX+VQh9hcJWaGv2qCWEo7CYQN
-XQBZ2r4Ttu+C2KIgmXT4pxhc5cNGr3qWd3Bb8icAuO+cU7K9sw8TIaSbCgPhNSic
-g1v/KjAwuzl92m6BjAsbekUGy+eKOFomdak5+TKhHYxCQVb5AMYdnJ4S8LQSYMjT
-7BhoxrpEaBs497Rj85x4ZrZnlR1MjzJrmtz8KW4PPJrlgc5TvLzU1092mHztFK02
-HhXBlbm6h347Gmqauqbwh2b+T0USsvsFH3aW1FM3KHxD72BNpI4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udc.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udc.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.udc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.udc.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.udc.edu/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">udc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID6DCCAtACCQDW6/6+LgD4VTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCldhc2hpbmd0b24xCzAJBgNVBAcTAkRDMTMwMQYDVQQKEypU
-aGUgVW5pdmVyc2l0eSBvZiB0aGUgRGlzdHJpY3Qgb2YgQ29sdW1iaWExGTAXBgNV
-BAsTEElkZW50aXR5IFNlcnZpY2UxFDASBgNVBAMTC2lkcC51ZGMuZWR1MR4wHAYJ
-KoZIhvcNAQkBFg9zdXBwb3J0QHVkYy5lZHUwHhcNMTEwMTE1MTgzNzAzWhcNMTIw
-NTI5MTgzNzAzWjCBtTELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24x
-CzAJBgNVBAcTAkRDMTMwMQYDVQQKEypUaGUgVW5pdmVyc2l0eSBvZiB0aGUgRGlz
-dHJpY3Qgb2YgQ29sdW1iaWExGTAXBgNVBAsTEElkZW50aXR5IFNlcnZpY2UxFDAS
-BgNVBAMTC2lkcC51ZGMuZWR1MR4wHAYJKoZIhvcNAQkBFg9zdXBwb3J0QHVkYy5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGOyFd6M7tIYRy8n3L
-ROkLmYOIV4QUiuguVZvUILG30v0GgqLEV7NwEUaNh2mPz5g4xlCIVmht48M3dRlQ
-ZsSFTMlepQlFq3vvpGJBWCgR6zrfkX70liHcPcofxwbTQ8kn/X/YOniieZq+NMNJ
-j5tLbooDqnvXdPYw/79rchQrgBY9U96Dlc16stxTbUQ68/AQi0K3xPtudWhWf6Cm
-81jpIkR/BBrKm5c8DQI4AgqgFdWs6iScdfYxVt2//yuMDOLbtyMjxSsberrq6HFa
-TUfdtAnf9iZ2eKCxrQpnDJ4nu9A2YsPuFFBB0p2XpE9VWT+stMUi1sonEjji0v39
-lAtvAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAAc0KXe2iM0UATqfAsulaSSQv2WN
-IcANbC4Sv1ShEIiqV4vGRS9rLi9OeFmzJGzthpx2zYmexL+JwD6PAlSbKzLvUt6K
-GWW8uQUlQ5YqWnmKp7stbXL5y4eNIVfNllc9m2zbuoeYqrR8UwWTJnMBlwLZFidf
-2dlXXDrnwXUPROFtSvCdd4jPjupD3RLq6hxTUZ3uAMx5Lv+mC9SIgHxjsh0Kjgl1
-/fonk0+iK+kWJq6zMscCDEtTXMv/9wQv181y6TZ57Twy56/chsQPKO+kcMEC78qn
-ZinR7MQoxDrrq20AG0ehnfsFE3m50C4gNCLVtEZkRXi6/XPSPVSm5P9/njs=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.udc.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.udc.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of the District of Columbia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of the District of Columbia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.udc.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Hakeem Fahm</md:GivenName>
-    <md:EmailAddress>hfahm@udc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8ff2905c..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ueb.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.cas.cz: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.ueb.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ueb.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ueb.cas.cz/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">ueb.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ueb.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Experimental Botany AS CR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav experimentální botaniky AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Experimental Botany AS CR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav experimentální botaniky AV ČR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ueb.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ueb.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
index 82cfa21f..ef381a32 100644
--- a/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uef.fi/idp/shibboleth">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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.uef.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uef.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">uef.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">University of Eastern Finland</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Östra Finlands universitet</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Itä-Suomen yliopisto</mdui:DisplayName>
@@ -17,9 +12,13 @@
         <mdui:InformationURL xml:lang="fi">http://www.uef.fi/fi/etusivu</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.uef.fi/en/etusivu</mdui:InformationURL>
       </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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIDjDCCAnSgAwIBAgICBA8wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAkZJ
 MQ8wDQYDVQQHDAZLdW9waW8xJjAkBgNVBAoMHVVuaXZlcnNpdHkgb2YgRWFzdGVy
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 9959564e..00000000
--- a/swamid-interfederations-2.0/idp.uef.fi.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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>MIIE2jCCA8KgAwIBAgIQEwZS9+yyLhQJHXj3VGMnRTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTEyOTAwMDAwMFoXDTE1MTEyOTIzNTk1OVowgaMxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwU3MDIxMTEVMBMGA1UECBMMUG9oam9pcy1TYXZvMQ8w
-DQYDVQQHEwZLdW9waW8xEDAOBgNVBAkTB1BMIDE2NzIxJjAkBgNVBAoTHVVuaXZl
-cnNpdHkgb2YgRWFzdGVybiBGaW5sYW5kMQ0wCwYDVQQLEwRUaWtlMRMwEQYDVQQD
-EwppZHAudWVmLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyOYR
-QjCXQAW4O56AXiQPEP0tu7hzGD1POb6SEg+3VtR36/UgjlODL8mmPuoKw39Wgq6K
-bMO/ufvYYazZDO8xOjOkATKe7K3MKQyXv1/TvzCyAXW0yKHLmPPBS4fTcDmrgNZq
-zaB29iwyZY5WVdDW9cLDsKHAs/5M82Ahz3HwHPdE2sYKJZneLttzGrCzyLHS60bK
-qGA0x1nna+L/5MUap3i2UtM9jUNAeXLQ5157GnSlFYcSFV6gz1TuKwOzD6VzWCd2
-w7hCbuYD31jEo53rndn2JnBst2KdDqurFpPi2WvtesaB89rAZRj6aLapo7KtDuRq
-Y1LmDJ0i9g1UYjfRLwIDAQABo4IBdDCCAXAwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFFAmPG22nHvByetax+pL4prQaQC7MA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECAjA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAiBgNVHREEGzAZggppZHAudWVmLmZpggtp
-ZHAyLnVlZi5maTANBgkqhkiG9w0BAQUFAAOCAQEAHy0P7RofsLTxYsBCRXj1sW60
-GT/QOl0tBZ13v3Ib+PnNuw0k0uLxXaUhTk05VThZ63Jgyn8hzSoijZz1lmXmryAq
-XtQQE1ddg9mNCOr6l30n+BCVH72qpVRtHP2g7tNvnUw0M2Qa92YIxvUkciQMnd2B
-9aK3fBt9ok7HXy9ICP0Fm18hEowZnwJWYzXMO6KT8gh9dE6PTIhPyXfxOl77cw+1
-sjdK67Ds535iiK+DnIwmwr/t5eDvuYHQP+T6909NE8YECihS9v5C+cmmjSkUQhDY
-Xs7Fn8iKoetCWKYaBARcvaWBra++UuKuvaQUb8DWdr4pDTnvygIlg6eF/arPAg==</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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uef.fi/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uef.fi/idp/profile/Shibboleth/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">uef.fi</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE2jCCA8KgAwIBAgIQEwZS9+yyLhQJHXj3VGMnRTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTEyOTAwMDAwMFoXDTE1MTEyOTIzNTk1OVowgaMxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwU3MDIxMTEVMBMGA1UECBMMUG9oam9pcy1TYXZvMQ8w
-DQYDVQQHEwZLdW9waW8xEDAOBgNVBAkTB1BMIDE2NzIxJjAkBgNVBAoTHVVuaXZl
-cnNpdHkgb2YgRWFzdGVybiBGaW5sYW5kMQ0wCwYDVQQLEwRUaWtlMRMwEQYDVQQD
-EwppZHAudWVmLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyOYR
-QjCXQAW4O56AXiQPEP0tu7hzGD1POb6SEg+3VtR36/UgjlODL8mmPuoKw39Wgq6K
-bMO/ufvYYazZDO8xOjOkATKe7K3MKQyXv1/TvzCyAXW0yKHLmPPBS4fTcDmrgNZq
-zaB29iwyZY5WVdDW9cLDsKHAs/5M82Ahz3HwHPdE2sYKJZneLttzGrCzyLHS60bK
-qGA0x1nna+L/5MUap3i2UtM9jUNAeXLQ5157GnSlFYcSFV6gz1TuKwOzD6VzWCd2
-w7hCbuYD31jEo53rndn2JnBst2KdDqurFpPi2WvtesaB89rAZRj6aLapo7KtDuRq
-Y1LmDJ0i9g1UYjfRLwIDAQABo4IBdDCCAXAwHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFFAmPG22nHvByetax+pL4prQaQC7MA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECAjA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAiBgNVHREEGzAZggppZHAudWVmLmZpggtp
-ZHAyLnVlZi5maTANBgkqhkiG9w0BAQUFAAOCAQEAHy0P7RofsLTxYsBCRXj1sW60
-GT/QOl0tBZ13v3Ib+PnNuw0k0uLxXaUhTk05VThZ63Jgyn8hzSoijZz1lmXmryAq
-XtQQE1ddg9mNCOr6l30n+BCVH72qpVRtHP2g7tNvnUw0M2Qa92YIxvUkciQMnd2B
-9aK3fBt9ok7HXy9ICP0Fm18hEowZnwJWYzXMO6KT8gh9dE6PTIhPyXfxOl77cw+1
-sjdK67Ds535iiK+DnIwmwr/t5eDvuYHQP+T6909NE8YECihS9v5C+cmmjSkUQhDY
-Xs7Fn8iKoetCWKYaBARcvaWBra++UuKuvaQUb8DWdr4pDTnvygIlg6eF/arPAg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uef.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uef.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">Ita-Suomen yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Eastern Finland</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Ostra Finlands universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Ita-Suomen yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Eastern Finland</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Ostra 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 4ad91e83..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ufe.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.cas.cz: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.ufe.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufe.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufe.cas.cz/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">ufe.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufe.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Photonics and Electronics of the AS CR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Photonics and Electronics of the AS CR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav fotoniky a elektroniky, Akademie věd ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufe.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ufe.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d6035c84..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ufgd.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.ufgd.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufgd.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufgd.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufgd.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufgd.edu.br:8443/idp/profile/SAML1/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">UFGD - Universidade Federal da Grande Dourados</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFGD - Universidade Federal da Grande Dourados </md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFGD - Universidade Federal da Grande Dourados </md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufgd.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufgd.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Service Desk</md:SurName>
-    <md:EmailAddress>sd@ufgd.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 847db204..00000000
--- a/swamid-interfederations-2.0/idp.ufgd.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://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>
-    MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxMDAuBgNVBAoTJ1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UECxMEQ09JTjEd
-MBsGCSqGSIb3DQEJARYOc2RAdWZnZC5lZHUuYnIxETAPBgNVBAcTCERvdXJhZG9z
-MRswGQYDVQQIExJNYXRvIEdyb3NzbyBkbyBTdWwxCzAJBgNVBAYTAkJSMRgwFgYD
-VQQDEw9pZHAudWZnZC5lZHUuYnIwHhcNMTIxMDExMjAyNTE1WhcNMTUxMDExMjAy
-NTE1WjCBtzEwMC4GA1UEChMnVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGEgR3JhbmRl
-IERvdXJhZG9zMQ0wCwYDVQQLEwRDT0lOMR0wGwYJKoZIhvcNAQkBFg5zZEB1Zmdk
-LmVkdS5icjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
-IGRvIFN1bDELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC51ZmdkLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqNLCdmjAeN7pKaJ68gXkdj
-NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
-5EGoRjl5Zj4UiOLqNYjzKOgUg3BtO2+W+8xEQ6S//zUNeqnEEyDllLy1JoSPbID1
-68sAiypFqQ/DN4MNdTQ8Tv8O5X1QDp5NWrqcCjYyMmmUk+dQyPaTXTzBpB5uO7EZ
-MMMXsfl8FUmo/iO0GZa/VrvTKd/92SZh7TQGttv6ju2DVQbo2CWofRavs8kesRKR
-HGwhBlVX+Q4XD07cyh1+RZVy5Wn895vVmstyPgA91AHBiOKFK2jg0+Cut7VKDPEC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAApkqwksZgfgPkcDkrvMDJgPor2BsSDxE
-YnvqiU2v+NxC7hJyERBt/vVjYspUb4Q6jHuF6j1XrRnKzjz2sp/TB7sVOA5ZwLui
-68YT/TNuTUFRb80Ygb2NjYvY+d7P2FJcXartTFNM1tTY3CRadjFCWBwo9O4z6wND
-gwgL6gmKuHY0yNKldmpd2ARd3VDm6PVtxOd6z/tbH1thCoXvrUuN/vJfG3BoRZ3M
-AUqUWyzMl4TLdPRg8epC6ZjSpR6yEjrwRiMphOSTXcovTa5bpKgPD2/ujOIlz3O5
-zKyawoo4mIfHqoCO7kraPupkGVwg9GUVBpN7f81Kfv8/o1LT7Es8ZQ==
-            </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>
-      
-MIID5DCCAswCAQAwDQYJKoZIhvcNAQEFBQAwgbcxMDAuBgNVBAoTJ1VuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRhIEdyYW5kZSBEb3VyYWRvczENMAsGA1UECxMEQ09JTjEd
-MBsGCSqGSIb3DQEJARYOc2RAdWZnZC5lZHUuYnIxETAPBgNVBAcTCERvdXJhZG9z
-MRswGQYDVQQIExJNYXRvIEdyb3NzbyBkbyBTdWwxCzAJBgNVBAYTAkJSMRgwFgYD
-VQQDEw9pZHAudWZnZC5lZHUuYnIwHhcNMTIxMDExMjAyNTE1WhcNMTUxMDExMjAy
-NTE1WjCBtzEwMC4GA1UEChMnVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGEgR3JhbmRl
-IERvdXJhZG9zMQ0wCwYDVQQLEwRDT0lOMR0wGwYJKoZIhvcNAQkBFg5zZEB1Zmdk
-LmVkdS5icjERMA8GA1UEBxMIRG91cmFkb3MxGzAZBgNVBAgTEk1hdG8gR3Jvc3Nv
-IGRvIFN1bDELMAkGA1UEBhMCQlIxGDAWBgNVBAMTD2lkcC51ZmdkLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqNLCdmjAeN7pKaJ68gXkdj
-NE/hAudGd/f5o1omQTsYsBtpBs5M8awzqVkWonX2HZt+OrozxYfueACKECmzuA78
-5EGoRjl5Zj4UiOLqNYjzKOgUg3BtO2+W+8xEQ6S//zUNeqnEEyDllLy1JoSPbID1
-68sAiypFqQ/DN4MNdTQ8Tv8O5X1QDp5NWrqcCjYyMmmUk+dQyPaTXTzBpB5uO7EZ
-MMMXsfl8FUmo/iO0GZa/VrvTKd/92SZh7TQGttv6ju2DVQbo2CWofRavs8kesRKR
-HGwhBlVX+Q4XD07cyh1+RZVy5Wn895vVmstyPgA91AHBiOKFK2jg0+Cut7VKDPEC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAApkqwksZgfgPkcDkrvMDJgPor2BsSDxE
-YnvqiU2v+NxC7hJyERBt/vVjYspUb4Q6jHuF6j1XrRnKzjz2sp/TB7sVOA5ZwLui
-68YT/TNuTUFRb80Ygb2NjYvY+d7P2FJcXartTFNM1tTY3CRadjFCWBwo9O4z6wND
-gwgL6gmKuHY0yNKldmpd2ARd3VDm6PVtxOd6z/tbH1thCoXvrUuN/vJfG3BoRZ3M
-AUqUWyzMl4TLdPRg8epC6ZjSpR6yEjrwRiMphOSTXcovTa5bpKgPD2/ujOIlz3O5
-zKyawoo4mIfHqoCO7kraPupkGVwg9GUVBpN7f81Kfv8/o1LT7Es8ZQ==
-
-                    
-            </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 76db90f9..00000000
--- a/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://idp.ufmg.br/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.ufmg.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.ufmg.br/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://sistemas.ufmg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sistemas.ufmg.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sistemas.ufmg.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sistemas.ufmg.br/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">ufmg.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.ufmg.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.ufmg.br/idp/profile/SAML1/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">UFMG - Universidade Federal de Minas Gerais</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFMG - Universidade Federal de Minas Gerais</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFMG - Universidade Federal de Minas Gerais</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufmg.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufmg.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Renato Veneroso</md:SurName>
-    <md:EmailAddress>rveneroso@lcc.ufmg.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 98be4cc8..00000000
--- a/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://idp.ufpr.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC1jCCAb4CAQAwDQYJKoZIhvcNAQEFBQAwMTEMMAoGA1UECxMDQ0NFMQswCQYD
-VQQGEwJCUjEUMBIGA1UEAxMLaWRwLnVmcHIuYnIwHhcNMTUwMzEwMTcyMjA5WhcN
-MjAwMzA4MTcyMjA5WjAxMQwwCgYDVQQLEwNDQ0UxCzAJBgNVBAYTAkJSMRQwEgYD
-VQQDEwtpZHAudWZwci5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AOFIgUDLLgOWy8WFpJ3WvcKJSOn/+STEWV95ma2PmAsa6lOT59AXXyPvUagrg7C8
-vzZQj8pgTkx7a2W54Qm8ETF3v1vLh8EwTpIAN0dz1K7XDWVy2fizoySj27GP1Zxu
-sF+dxt2PzRPpbzwQMf5XviiIIQSXEEt8E55ckK4yNz25JpqxsgxYwr7sTFWXPt3y
-WXu6a/kBfzi2mrxYORz7t9w/36nkYy1xOt08q8vYK9IWaufP558pvpw05PQHTnwP
-64c9vQ9qwDr7Eek7dXelJtJ1x/wiqW8kq+grx1yHipDq5kP5HPyu7Fo+kEdwl1mT
-qGTSBz7trGMRaj/z0Ilq4nMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcMCPPhKd
-hmAOGj9QRCYyF1pAImTtH/UyJv5wlgnJ+V2AOysRbac7eyISNZVPUSnXjHXGvQ7X
-VUvMBdH6xPoCn/3irC2d6+3poHiqfyuHsS5EnysRp+BdjDCDQ1+ZuJUZzPUTek1D
-t9yL1cQhxctQuSl6EiHmGBR1BMY7jyAbhFGoVI3uyhDw2SWPbZHPhcAcuQZm15z0
-Wwp77PxzLvmp1vfitkhd+WxJBrjqN07J6e5UC8sfW3vLrZANxj5OLs4dVbV2JK5L
-P/B3aKMyKpyAUfaY9Hqh3tWcQj+4LTlL5TdvPMRPlYu0P4cx92BIXXKqPeE3isNI
-djSyCxyE2TdK8Q==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.ufpr.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufpr.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufpr.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufpr.br/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">ufpr.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC1jCCAb4CAQAwDQYJKoZIhvcNAQEFBQAwMTEMMAoGA1UECxMDQ0NFMQswCQYD
-VQQGEwJCUjEUMBIGA1UEAxMLaWRwLnVmcHIuYnIwHhcNMTUwMzEwMTcyMjA5WhcN
-MjAwMzA4MTcyMjA5WjAxMQwwCgYDVQQLEwNDQ0UxCzAJBgNVBAYTAkJSMRQwEgYD
-VQQDEwtpZHAudWZwci5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AOFIgUDLLgOWy8WFpJ3WvcKJSOn/+STEWV95ma2PmAsa6lOT59AXXyPvUagrg7C8
-vzZQj8pgTkx7a2W54Qm8ETF3v1vLh8EwTpIAN0dz1K7XDWVy2fizoySj27GP1Zxu
-sF+dxt2PzRPpbzwQMf5XviiIIQSXEEt8E55ckK4yNz25JpqxsgxYwr7sTFWXPt3y
-WXu6a/kBfzi2mrxYORz7t9w/36nkYy1xOt08q8vYK9IWaufP558pvpw05PQHTnwP
-64c9vQ9qwDr7Eek7dXelJtJ1x/wiqW8kq+grx1yHipDq5kP5HPyu7Fo+kEdwl1mT
-qGTSBz7trGMRaj/z0Ilq4nMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcMCPPhKd
-hmAOGj9QRCYyF1pAImTtH/UyJv5wlgnJ+V2AOysRbac7eyISNZVPUSnXjHXGvQ7X
-VUvMBdH6xPoCn/3irC2d6+3poHiqfyuHsS5EnysRp+BdjDCDQ1+ZuJUZzPUTek1D
-t9yL1cQhxctQuSl6EiHmGBR1BMY7jyAbhFGoVI3uyhDw2SWPbZHPhcAcuQZm15z0
-Wwp77PxzLvmp1vfitkhd+WxJBrjqN07J6e5UC8sfW3vLrZANxj5OLs4dVbV2JK5L
-P/B3aKMyKpyAUfaY9Hqh3tWcQj+4LTlL5TdvPMRPlYu0P4cx92BIXXKqPeE3isNI
-djSyCxyE2TdK8Q==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufpr.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufpr.br:8443/idp/profile/SAML1/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">UFPR - Universidade Federal do Parana</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFPR - Universidade Federal do Parana</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFPR - Universidade Federal do Parana</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFPR - Universidade Federal do Parana</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufpr.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufpr.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Antonio Rodrigues Barros</md:SurName>
-    <md:EmailAddress>antonio@ufpr.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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.ufrb.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ufrb.edu.br-idp-shibboleth.xml
deleted file mode 100644
index b3fccac6..00000000
--- a/swamid-interfederations-2.0/idp.ufrb.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://idp.ufrb.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFRB - Universidade Federal do Reconcavo da Bahia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFRB - Universidade Federal do Reconcavo da Bahia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFRB - Universidade Federal do Reconcavo da Bahia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFRB - Universidade Federal do Reconcavo da Bahia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufrb.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufrb.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxOjA4BgNVBAoTMVVGUkIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSZWNvbmNhdm8gZGEgQmFoaWExDjAMBgNV
-BAsTBUNPVEVDMSgwJgYJKoZIhvcNAQkBFhljb3RlY0Bwcm9wbGFuLnVmcmIuZWR1
-LmJyMRcwFQYDVQQHEw5DcnV6IGRhcyBBbG1hczEOMAwGA1UECBMFQmFoaWExCzAJ
-BgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAudWZyYi5lZHUuYnIwHhcNMTQxMjEzMDU0
-NzA3WhcNMTcxMjEyMDU0NzA3WjCBxjE6MDgGA1UEChMxVUZSQiAtIFVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIFJlY29uY2F2byBkYSBCYWhpYTEOMAwGA1UECxMFQ09U
-RUMxKDAmBgkqhkiG9w0BCQEWGWNvdGVjQHByb3BsYW4udWZyYi5lZHUuYnIxFzAV
-BgNVBAcTDkNydXogZGFzIEFsbWFzMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMC
-QlIxGDAWBgNVBAMTD2lkcC51ZnJiLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALV2LAx8VdH5wtvvjaYjhD3Mz41PVxj2XpKSetDPlMktll17
-2cdu0tghyOWXCsfWoE3j0G1uKcxw3c6s07RsV0IQNb5pcZ8RIftRz6FEJ+WLc/vc
-wv7O189b2B8gj7Q4ciTAQ2IX28eV0kIfRUzDRGd6LAe4LkQbNZjIC+RJJh3mJpZO
-qOxR43SX82ub7cfCxIdriBnkrADgbpbqmSGci79FPWqCxN7gFpStc6xsSruyJGyq
-nq557NsaXVaAEVEdW/5nDMipTKFmMSjroyYGzuNQQ8Ob8G6EOxlVub/b2abw0hUI
-ZzpEU8ap8a4qWNUmgAakXbbDIY4mb+F6pp7eUTUCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAAmgaLH2G1dzR7vJ+FwYJyB4wg6USlFD6iPaF5F0LpabpUGNw5Twlu66v
-1jutrGMM3/rB0cy/vqCYKtdzwk2OqXT5xCAitgtVr3/iJtUq7FfQkdi7ck3Bm/4p
-cdCuK6i9mF0TGQzIRHK5SliZSt/vrmF6e44psIgdV6ZY6bjqY40d5lk0biXk4gei
-NUQS7h3jSQc8/tEZ8ri/ZYvL1H51ifaIF3UgsxkaygobrrjWMMHqd+BpLFI25dhT
-kkWUdTXk30J1kWyts6YUVmzxOd3b40Pvv5sQQw2XX0gkDK/INOQbCbIWCyB3W/QG
-IZlmLPTqQz7twruX1Dqbaf/ocy9s4g==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufrb.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufrb.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://idp.ufrb.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufrb.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufrb.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufrb.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEAjCCAuoCAQAwDQYJKoZIhvcNAQEFBQAwgcYxOjA4BgNVBAoTMVVGUkIgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBSZWNvbmNhdm8gZGEgQmFoaWExDjAMBgNV
-BAsTBUNPVEVDMSgwJgYJKoZIhvcNAQkBFhljb3RlY0Bwcm9wbGFuLnVmcmIuZWR1
-LmJyMRcwFQYDVQQHEw5DcnV6IGRhcyBBbG1hczEOMAwGA1UECBMFQmFoaWExCzAJ
-BgNVBAYTAkJSMRgwFgYDVQQDEw9pZHAudWZyYi5lZHUuYnIwHhcNMTQxMjEzMDU0
-NzA3WhcNMTcxMjEyMDU0NzA3WjCBxjE6MDgGA1UEChMxVUZSQiAtIFVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRvIFJlY29uY2F2byBkYSBCYWhpYTEOMAwGA1UECxMFQ09U
-RUMxKDAmBgkqhkiG9w0BCQEWGWNvdGVjQHByb3BsYW4udWZyYi5lZHUuYnIxFzAV
-BgNVBAcTDkNydXogZGFzIEFsbWFzMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMC
-QlIxGDAWBgNVBAMTD2lkcC51ZnJiLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALV2LAx8VdH5wtvvjaYjhD3Mz41PVxj2XpKSetDPlMktll17
-2cdu0tghyOWXCsfWoE3j0G1uKcxw3c6s07RsV0IQNb5pcZ8RIftRz6FEJ+WLc/vc
-wv7O189b2B8gj7Q4ciTAQ2IX28eV0kIfRUzDRGd6LAe4LkQbNZjIC+RJJh3mJpZO
-qOxR43SX82ub7cfCxIdriBnkrADgbpbqmSGci79FPWqCxN7gFpStc6xsSruyJGyq
-nq557NsaXVaAEVEdW/5nDMipTKFmMSjroyYGzuNQQ8Ob8G6EOxlVub/b2abw0hUI
-ZzpEU8ap8a4qWNUmgAakXbbDIY4mb+F6pp7eUTUCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAAmgaLH2G1dzR7vJ+FwYJyB4wg6USlFD6iPaF5F0LpabpUGNw5Twlu66v
-1jutrGMM3/rB0cy/vqCYKtdzwk2OqXT5xCAitgtVr3/iJtUq7FfQkdi7ck3Bm/4p
-cdCuK6i9mF0TGQzIRHK5SliZSt/vrmF6e44psIgdV6ZY6bjqY40d5lk0biXk4gei
-NUQS7h3jSQc8/tEZ8ri/ZYvL1H51ifaIF3UgsxkaygobrrjWMMHqd+BpLFI25dhT
-kkWUdTXk30J1kWyts6YUVmzxOd3b40Pvv5sQQw2XX0gkDK/INOQbCbIWCyB3W/QG
-IZlmLPTqQz7twruX1Dqbaf/ocy9s4g==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufrb.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufrb.edu.br:8443/idp/profile/SAML1/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">UFRB - Universidade Federal do Reconcavo da Bahia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFRB - Universidade Federal do Reconcavo da Bahia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFRB - Universidade Federal do Reconcavo da Bahia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFRB - Universidade Federal do Reconcavo da Bahia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufrb.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufrb.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Anderson Lago Gomes</md:SurName>
-    <md:EmailAddress>cotec@proplan.ufrb.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0076912d..00000000
--- a/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://idp.ufsm.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC1jCCAb4CAQAwDQYJKoZIhvcNAQEFBQAwMTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwHhcNMTUwOTMwMTc1MzQyWhcN
-MjAwOTI4MTc1MzQyWjAxMQwwCgYDVQQLEwNDUEQxCzAJBgNVBAYTAkJSMRQwEgYD
-VQQDEwtpZHAudWZzbS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANYEnXM5gy3yhEcg3F+AcLP9gBbFJva9LF467nQl2v4TMpBgyPjl55eEI1gaVa2o
-8j6sxmPiLenw/7Ftor5HNclq8QXSDK/epxqYlYF3kax7I79DmB27gOknmWkDk/XO
-bZDrjqnWzA0CUQ2NLvnpTHkx9YU99Fhze7Thj1bwQN8ow8xhKzYf5sWLRRyfgNoS
-RSINzaegm4kwzTybc2XkZNQTBlJEkCVX05Pa1RtcB96p1fK15LhVoXNzi+3QqpTA
-BO/GEjKA6pf70jueK0GDfB9dseyZgGjXgBSw/Em9UVRXZstR3iV3/GvvVzGWQUeT
-ibNF7kLaQMthy9hoiq/+PKMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAntsWbq6g
-AWldIQe1L0kTYEjVZ+q8oSkqmAEVTJIy7imd5smU6+UBOQyu82F0xXTl6H3iFZmL
-vw24ytxvPIz2FLUrpLlgfiEF2XQjVNcZLbA191R6UCWaVM5N76MmUS89xHyxs4Ck
-UtGRgGG+qKRuvzlKseuAnalIXiWvWYOGnZuGM1cdurhd+ppIw/bBufdfhi+uztgU
-LMfKRDHJeh/Um4kwOImAoLLNBVtvnixKcCrXFMTgpTPRtU0sFCEjWpsKOf2C4I2t
-0L2l2kUdC2yEXOjyPeVCCqWJSNfEmDQ/mYH5s1A4aRpfWWop3PTGssj1BEMSAEy8
-9YfkoyeLdgTKHg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufsm.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.ufsm.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ufsm.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ufsm.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ufsm.br/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">ufsm.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC1jCCAb4CAQAwDQYJKoZIhvcNAQEFBQAwMTEMMAoGA1UECxMDQ1BEMQswCQYD
-VQQGEwJCUjEUMBIGA1UEAxMLaWRwLnVmc20uYnIwHhcNMTUwOTMwMTc1MzQyWhcN
-MjAwOTI4MTc1MzQyWjAxMQwwCgYDVQQLEwNDUEQxCzAJBgNVBAYTAkJSMRQwEgYD
-VQQDEwtpZHAudWZzbS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANYEnXM5gy3yhEcg3F+AcLP9gBbFJva9LF467nQl2v4TMpBgyPjl55eEI1gaVa2o
-8j6sxmPiLenw/7Ftor5HNclq8QXSDK/epxqYlYF3kax7I79DmB27gOknmWkDk/XO
-bZDrjqnWzA0CUQ2NLvnpTHkx9YU99Fhze7Thj1bwQN8ow8xhKzYf5sWLRRyfgNoS
-RSINzaegm4kwzTybc2XkZNQTBlJEkCVX05Pa1RtcB96p1fK15LhVoXNzi+3QqpTA
-BO/GEjKA6pf70jueK0GDfB9dseyZgGjXgBSw/Em9UVRXZstR3iV3/GvvVzGWQUeT
-ibNF7kLaQMthy9hoiq/+PKMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAntsWbq6g
-AWldIQe1L0kTYEjVZ+q8oSkqmAEVTJIy7imd5smU6+UBOQyu82F0xXTl6H3iFZmL
-vw24ytxvPIz2FLUrpLlgfiEF2XQjVNcZLbA191R6UCWaVM5N76MmUS89xHyxs4Ck
-UtGRgGG+qKRuvzlKseuAnalIXiWvWYOGnZuGM1cdurhd+ppIw/bBufdfhi+uztgU
-LMfKRDHJeh/Um4kwOImAoLLNBVtvnixKcCrXFMTgpTPRtU0sFCEjWpsKOf2C4I2t
-0L2l2kUdC2yEXOjyPeVCCqWJSNfEmDQ/mYH5s1A4aRpfWWop3PTGssj1BEMSAEy8
-9YfkoyeLdgTKHg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ufsm.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ufsm.br:8443/idp/profile/SAML1/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">UFSM - Universidade Federal de Santa Maria</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFSM - Universidade Federal de Santa Maria</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFSM - Universidade Federal de Santa Maria</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufsm.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufsm.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Fabiano B. Franco</md:SurName>
-    <md:EmailAddress>fabiano@cpd.ufsm.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uft.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uft.edu.br-idp-shibboleth.xml
deleted file mode 100644
index bf13dc81..00000000
--- a/swamid-interfederations-2.0/idp.uft.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://idp.uft.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFT - Universidade Federal do Tocantins</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFT - Universidade Federal do Tocantins</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFT - Universidade Federal do Tocantins</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFT - Universidade Federal do Tocantins</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uft.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uft.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExMDAuBgNVBAoTJ1VGVCAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRvIFRvY2FudGluczEwMC4GA1UECxQnQ29vcmRl
-bmHDp2FvIGRlIEluZnJhZXN0cnV0dXJhIGRlIFJlZGVzMSAwHgYJKoZIhvcNAQkB
-FhFhaXNsYW5AdWZ0LmVkdS5icjEPMA0GA1UEBxMGUGFsbWFzMRIwEAYDVQQIEwlU
-b2NhbnRpbnMxCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5pZHAudWZ0LmVkdS5icjAe
-Fw0xNTAzMDQxNDIxMjJaFw0xODAzMDMxNDIxMjJaMIHRMTAwLgYDVQQKEydVRlQg
-LSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBUb2NhbnRpbnMxMDAuBgNVBAsUJ0Nv
-b3JkZW5hw6dhbyBkZSBJbmZyYWVzdHJ1dHVyYSBkZSBSZWRlczEgMB4GCSqGSIb3
-DQEJARYRYWlzbGFuQHVmdC5lZHUuYnIxDzANBgNVBAcTBlBhbG1hczESMBAGA1UE
-CBMJVG9jYW50aW5zMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOaWRwLnVmdC5lZHUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwvnD65HTKtzlxr5YB
-I6trOGdwdDFDwOIU5eH8ms406mvOt9nx24IjNWGgj3o1o3Xk4Ks1OQXH5Z0nvz/j
-TGubVu84+2lBeUXkEXTnZ7W2iwBZZcot0N9bTtbtrz0yxhkBSp9p0zlU5kP7UR11
-GQQcEYhALrwwjm9zQs5kDWc6wkZaejpAXgxHYcecPLyAP8Ns3XJJohGsHpk3HfXb
-3skRwmHQb/dcPwxUlTCb7V3fp0Ig6E0MJT8cO0s0SygqxYUsZND4n9mg+8r+HazW
-LEnBH9MqapAAWqiExL0AMkdTJ1pQwf3plUWQ3un/wFrKtjMvrT2sfTAKqyKjx2Ji
-yLENAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC7x+56cgVOKb6pM86T9nOWjjoyw
-ZrLAJaVxDe3bwazzBTszmvp2VeP6yYNqpB9VaGbhu4v8MqsXYY+QhWdi9HcuFM+V
-Oo0/gS4n7lLOa/UklWufNGEU/Zd/uhDUfORtQ0WrzZso80vcsTkt91eJ5N0EYA6A
-5AvcUXn48ZO5afcPLdUaEtc6z9Not0+/nAHC0UWNEB0QQBv8Rsu7X9QBel23KTtw
-fIkZ6lzIx0eeLooB34cz+W/WRXj0ksz3NJAvgwpEF0i0UVB3jr3d5rTVvOu0GKAC
-q8DJhtp8LlMPiundMfhCy1Z1B6M65fkdhPKrg1NcjEXSO26OaQ19UywP0h8=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uft.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uft.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://idp.uft.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uft.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uft.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uft.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEGDCCAwACAQAwDQYJKoZIhvcNAQEFBQAwgdExMDAuBgNVBAoTJ1VGVCAtIFVu
-aXZlcnNpZGFkZSBGZWRlcmFsIGRvIFRvY2FudGluczEwMC4GA1UECxQnQ29vcmRl
-bmHDp2FvIGRlIEluZnJhZXN0cnV0dXJhIGRlIFJlZGVzMSAwHgYJKoZIhvcNAQkB
-FhFhaXNsYW5AdWZ0LmVkdS5icjEPMA0GA1UEBxMGUGFsbWFzMRIwEAYDVQQIEwlU
-b2NhbnRpbnMxCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5pZHAudWZ0LmVkdS5icjAe
-Fw0xNTAzMDQxNDIxMjJaFw0xODAzMDMxNDIxMjJaMIHRMTAwLgYDVQQKEydVRlQg
-LSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBUb2NhbnRpbnMxMDAuBgNVBAsUJ0Nv
-b3JkZW5hw6dhbyBkZSBJbmZyYWVzdHJ1dHVyYSBkZSBSZWRlczEgMB4GCSqGSIb3
-DQEJARYRYWlzbGFuQHVmdC5lZHUuYnIxDzANBgNVBAcTBlBhbG1hczESMBAGA1UE
-CBMJVG9jYW50aW5zMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOaWRwLnVmdC5lZHUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwvnD65HTKtzlxr5YB
-I6trOGdwdDFDwOIU5eH8ms406mvOt9nx24IjNWGgj3o1o3Xk4Ks1OQXH5Z0nvz/j
-TGubVu84+2lBeUXkEXTnZ7W2iwBZZcot0N9bTtbtrz0yxhkBSp9p0zlU5kP7UR11
-GQQcEYhALrwwjm9zQs5kDWc6wkZaejpAXgxHYcecPLyAP8Ns3XJJohGsHpk3HfXb
-3skRwmHQb/dcPwxUlTCb7V3fp0Ig6E0MJT8cO0s0SygqxYUsZND4n9mg+8r+HazW
-LEnBH9MqapAAWqiExL0AMkdTJ1pQwf3plUWQ3un/wFrKtjMvrT2sfTAKqyKjx2Ji
-yLENAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAC7x+56cgVOKb6pM86T9nOWjjoyw
-ZrLAJaVxDe3bwazzBTszmvp2VeP6yYNqpB9VaGbhu4v8MqsXYY+QhWdi9HcuFM+V
-Oo0/gS4n7lLOa/UklWufNGEU/Zd/uhDUfORtQ0WrzZso80vcsTkt91eJ5N0EYA6A
-5AvcUXn48ZO5afcPLdUaEtc6z9Not0+/nAHC0UWNEB0QQBv8Rsu7X9QBel23KTtw
-fIkZ6lzIx0eeLooB34cz+W/WRXj0ksz3NJAvgwpEF0i0UVB3jr3d5rTVvOu0GKAC
-q8DJhtp8LlMPiundMfhCy1Z1B6M65fkdhPKrg1NcjEXSO26OaQ19UywP0h8=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uft.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uft.edu.br:8443/idp/profile/SAML1/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">UFT - Universidade Federal do Tocantins</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFT - Universidade Federal do Tocantins</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFT - Universidade Federal do Tocantins</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFT - Universidade Federal do Tocantins</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uft.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.uft.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Aislan Max Gomes Coelho</md:SurName>
-    <md:EmailAddress>aislan@uft.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ugn.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ugn.cas.cz-idp-shibboleth.xml
deleted file mode 100644
index 8deedcf8..00000000
--- a/swamid-interfederations-2.0/idp.ugn.cas.cz-idp-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://idp.ugn.cas.cz/idp/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="2016-01-18T11:28: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>
-  </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">ugn.cas.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Geonics of the CAS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Ústav geoniky AV ČR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider IGN AV CR employees.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚGN AV ČR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ugn.cas.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.ugn.cas.cz/</mdui:InformationURL>
-        <mdui:Logo height="44" width="74">https://jiftach.cas.cz/loga/logo-ugn-44.png</mdui:Logo>
-        <mdui:Logo height="67" width="113">https://jiftach.cas.cz/loga/logo-ugn-67.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUanMT4HV96dPVlvHmmJ0S4CVXRlQwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnVnbi5jYXMuY3owHhcNMTYwMTEyMTI0ODQ1WhcN
-MzYwMTEyMTI0ODQ1WjAZMRcwFQYDVQQDEw5pZHAudWduLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXMLIFCj0bmP3exddG/Jqa7XXfrcog4
-0PeZIBoDSTU24SCnokHfe03eSNnTI7GU+ee42T3eGMJ4TAk8tmFSdiXt3zOZNbQf
-NYmBtBMKkgvNn40enM496MHZsx8Un8mtvgN1VLmSRZ73BKYWw1pHZuywlijLBaXY
-Xkyn29L92UuYp46PZeg1Hn8yUIxQVIeiOUkApJbwoHEM6POgZVSs+3WndnApq63c
-aIOCHKyQi24ThmlcAhH/4CRQzSG7Q6qG42ElyzZLXZo/efPPk6ro338RJptRnVMK
-io1ngQD2zYoD7EJu33urYhhm+b3VigQsmanAXJmvVIP+5Ie4XySxLY0CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnVnbi5jYXMuY3qGJWh0dHBzOi8vaWRwLnVnbi5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFkZTWC0aDTGy5oIATShyof5
-IXZDMA0GCSqGSIb3DQEBBQUAA4IBAQCZVotlNBDXcFPwny31mgxLlID8VcqBFyX8
-AP5CZpGLFVxSN8sPjEa4SA589rCM2Q2HHJP52X4o2KEFhO7xTFPteomul0GZUio9
-QjOjbzunCxLm8p0skzSRWN7C5dHPSwptjVF4DGW84WkSCsQel81xva+Ws/ewvNFO
-dqwJGlvrkLWYMKMBzPN+nocOwLOHbxpFLlM1nJo+TQVgvTDdgwvMwujQJQxLC90G
-e/VSttUAOrFWfuz3n6+oOm7dfjcSxQs1OkA74OpOBoYX77P886WQqsOknyd3mz9Q
-H+4Bj5MUAtb4u4czl/MB7Qe52hUlAke+T+5t70GDjSwLnh691Lcv
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ugn.cas.cz: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.ugn.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ugn.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ugn.cas.cz/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">ugn.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUanMT4HV96dPVlvHmmJ0S4CVXRlQwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnVnbi5jYXMuY3owHhcNMTYwMTEyMTI0ODQ1WhcN
-MzYwMTEyMTI0ODQ1WjAZMRcwFQYDVQQDEw5pZHAudWduLmNhcy5jejCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXMLIFCj0bmP3exddG/Jqa7XXfrcog4
-0PeZIBoDSTU24SCnokHfe03eSNnTI7GU+ee42T3eGMJ4TAk8tmFSdiXt3zOZNbQf
-NYmBtBMKkgvNn40enM496MHZsx8Un8mtvgN1VLmSRZ73BKYWw1pHZuywlijLBaXY
-Xkyn29L92UuYp46PZeg1Hn8yUIxQVIeiOUkApJbwoHEM6POgZVSs+3WndnApq63c
-aIOCHKyQi24ThmlcAhH/4CRQzSG7Q6qG42ElyzZLXZo/efPPk6ro338RJptRnVMK
-io1ngQD2zYoD7EJu33urYhhm+b3VigQsmanAXJmvVIP+5Ie4XySxLY0CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnVnbi5jYXMuY3qGJWh0dHBzOi8vaWRwLnVnbi5j
-YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFkZTWC0aDTGy5oIATShyof5
-IXZDMA0GCSqGSIb3DQEBBQUAA4IBAQCZVotlNBDXcFPwny31mgxLlID8VcqBFyX8
-AP5CZpGLFVxSN8sPjEa4SA589rCM2Q2HHJP52X4o2KEFhO7xTFPteomul0GZUio9
-QjOjbzunCxLm8p0skzSRWN7C5dHPSwptjVF4DGW84WkSCsQel81xva+Ws/ewvNFO
-dqwJGlvrkLWYMKMBzPN+nocOwLOHbxpFLlM1nJo+TQVgvTDdgwvMwujQJQxLC90G
-e/VSttUAOrFWfuz3n6+oOm7dfjcSxQs1OkA74OpOBoYX77P886WQqsOknyd3mz9Q
-H+4Bj5MUAtb4u4czl/MB7Qe52hUlAke+T+5t70GDjSwLnh691Lcv
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ugn.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Geonics of the CAS</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav geoniky AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Geonics of the CAS, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav geoniky AV ČR, v. v. i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ugn.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ugn.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 598f8328..00000000
--- a/swamid-interfederations-2.0/idp.uha.fr-idp-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://idp.uha.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Haute Alsace</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABYElEQVQ4y8WSu0oDQRSGv8yOu+tGQXwAwcrKG0QLQRCEVClEsPABRCsbQd9BCJJCxCbkBbQQBFcU7KwtrVNKRNG9zc7uWiQRk3VtPdXMnDn/nPPPB/8dpaJE/fI2669d1+X2vP7rXVlUWFueY1QKAp2yPj8DkAE5ITlcvLWygG3bGEJ0D30fsDg+3McLFUD2U0QMd1B2HEYtk8nxMqdX97TuHjGl0c3ZZm4EMfw6wIgQvH54WNYIAAYZ0pCESnO0t0N19+Dbn4ERkp6ncZri+T7bqxVs2+bk4gYdazZWl/42UekEz/fBcSg7DgDtl85AQajiYoEgigCrZxycXT8AUKvMYpgmSZoWe3CwWS3dPz0TRBGvXkC7846ONTrWICWB0rx9hjSarYGvzHHghQpDCIJIsbY4y8SYjdIpSaKJU53rIEdXH6SF6SmyLAEgilMazRa/gfQnyq7rfu+LUP7/+AIl6JNsXCNDFQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMH48JxUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDAPYZ+pAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.uha.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Haute Alsace</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>
-					      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>
-    </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-POST" Location="https://idp.uha.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uha.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uha.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uha.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uha.fr/idp/profile/SAML1/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">Université de Haute Alsace</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Haute Alsace</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uha.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>contact.di@uha.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uhd.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uhd.edu-idp-shibboleth.xml
deleted file mode 100644
index 03ebd19e..00000000
--- a/swamid-interfederations-2.0/idp.uhd.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,179 +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://idp.uhd.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.uhd.edu/idp/error.jsp" 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">uhd.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Houston-Downtown</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>
-MIIEyzCCA7OgAwIBAgIQclomJbKZ1qKYftgv8fmsVzANBgkqhkiG9w0BAQUFADA8
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-aGF3dGUgU1NMIENBMB4XDTE0MDkyMjAwMDAwMFoXDTE2MDkyMjIzNTk1OVowgZEx
-CzAJBgNVBAYTAlVTMQ4wDAYDVQQIEwVUZXhhczEQMA4GA1UEBxQHSG91c3RvbjEp
-MCcGA1UEChQgVW5pdmVyc2l0eSBvZiBIb3VzdG9uIC0gRG93bnRvd24xHzAdBgNV
-BAsUFkluZm9ybWF0aW9uIFRlY2hub2xvZ3kxFDASBgNVBAMUC2lkcC51aGQuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgEuGggSabtOSh+ZPqXNf
-zHL7yWGitI4Tbrq/Z5LD58UVt27J0jucsUGPyfMNkmjj6ue/w02TRf9B+1pOe1mM
-96aNfh6CqhHMX361AtELGntBxgnuIIL3542+K5qgANeDlTeTFizubTKQHvNImyF+
-GkFNYPVUCiakQHcl01+2yPV+auhXldyUoS3PsDCPP1iw/SDue/DDZJ3+X1/LYilQ
-lEgoL3qbdaArbRQl0UqdqCH0XEjABw4/EJUdm0n3TlUxMD7H2ud8lRcrvhZ2NI20
-eLVp81SAJv3281yGcH+fdhE5EoGRq0c5tf/J7cs5ANczOqS1EOyGcuDo9JvES9Qg
-LwIDAQABo4IBcTCCAW0wFgYDVR0RBA8wDYILaWRwLnVoZC5lZHUwCQYDVR0TBAIw
-ADByBgNVHSAEazBpMGcGCmCGSAGG+EUBBzYwWTAmBggrBgEFBQcCARYaaHR0cHM6
-Ly93d3cudGhhd3RlLmNvbS9jcHMwLwYIKwYBBQUHAgIwIwwhaHR0cHM6Ly93d3cu
-dGhhd3RlLmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAW
-gBSnooO7NEVAPfzVME8SuT6hAZ/22zArBgNVHR8EJDAiMCCgHqAchhpodHRwOi8v
-dGIuc3ltY2IuY29tL3RiLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwVwYIKwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNodHRwOi8vdGIuc3ltY2Qu
-Y29tMCYGCCsGAQUFBzAChhpodHRwOi8vdGIuc3ltY2IuY29tL3RiLmNydDANBgkq
-hkiG9w0BAQUFAAOCAQEABXVcSROHlKrhoMWYzVVy5KmZA6R5FkVfdefxM3Rom/Ew
-+BvpLq1tRGqCt0PwM191ZS0/io89kAfFGgyQAh15y9pih6cVPCPMrvC/ffg8WwNr
-QFrLGz1wnpmWI5V5EPzeErAR8VsrTlNyJWGMfqoAFjd+elEM8rjpS+o7unJ0ns77
-iKK58ricV65clSdE9mANGaUyVQJPaUJEL3g50XDI7cmEZqT/rmi8SGAKHnPDvtIu
-fGX+jzPtswJArLcGHYp0zP6UCGOiMLr5wOQpIw2iHCZ6gqk8gRRnqG+NmUKsuFSP
-nbykyDpkmQj056Oa1BaHtq82JqXJzdZI2VSs9bwR7Q==
-          </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>
-MIIEzDCCA7SgAwIBAgIQJ/hWn0/Y2YHYTNSVANVt1jANBgkqhkiG9w0BAQsFADBB
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMRswGQYDVQQDExJ0
-aGF3dGUgU1NMIENBIC0gRzIwHhcNMTUxMjIxMDAwMDAwWhcNMTYwOTIyMjM1OTU5
-WjCBkTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3Vz
-dG9uMSkwJwYDVQQKDCBVbml2ZXJzaXR5IG9mIEhvdXN0b24gLSBEb3dudG93bjEf
-MB0GA1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEUMBIGA1UEAwwLaWRwLnVo
-ZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCXsv0XTneLSCMY
-TRPxxYWU094gJZxmqIyDB/ELEBHjTW2m8TyEIxdDunUgpPAVpLz+U794Lyv+t4lY
-UWUsL29Il83LgzbmQYxWNvbHWEOhwDBA1BwoEYsuI+206kYiOy6VJvRJgEuj94Tv
-TOqQNHywxjlW2w8dRiwNK8YZu/NMOyouxL2iKArQ58t45O5W9k0bTBly5OX+F26e
-aq/hmLWm6ymnZa4BVMWYjHA1JzHp+OtL6QZfK+7lSvYduY5UsMjSYAK3I4EMAvXP
-+8kd2pnWmD0p2Rdat7gUEv/q1xyiCgQcacP6jbK1d+LBIsKJKRG2l4H7A3EPSy0A
-L3VX+v/LAgMBAAGjggFtMIIBaTAWBgNVHREEDzANggtpZHAudWhkLmVkdTAJBgNV
-HRMEAjAAMG4GA1UdIARnMGUwYwYGZ4EMAQICMFkwJgYIKwYBBQUHAgEWGmh0dHBz
-Oi8vd3d3LnRoYXd0ZS5jb20vY3BzMC8GCCsGAQUFBwICMCMMIWh0dHBzOi8vd3d3
-LnRoYXd0ZS5jb20vcmVwb3NpdG9yeTAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgw
-FoAUwk9IV/zRT5rAXTh9DgXb2S61UmAwKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDov
-L3RqLnN5bWNiLmNvbS90ai5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMFcGCCsGAQUFBwEBBEswSTAfBggrBgEFBQcwAYYTaHR0cDovL3RqLnN5bWNk
-LmNvbTAmBggrBgEFBQcwAoYaaHR0cDovL3RqLnN5bWNiLmNvbS90ai5jcnQwDQYJ
-KoZIhvcNAQELBQADggEBAEeQ1/qj4V92RKBD47oJOzo92rQ1RMFbrgajELzF3Pvv
-MNHC2Z4X9JpLDws/8jpOjb85qhMAp/9L8mkI6Kk9agdgYuYldiUlMmuEmzbLbjfB
-Iv7b8zSFKkCqtt8waKKmfggiSdw9SJmc6c/3MwlfFO64dPTgtJeqsDQK5E6f3xj4
-16VZpivg9zZLjuachfzO2fLCb57gNL9RXgK3aNcaGSDJ64GyErSWFCHrf/BB0SM7
-FTMCFvuVdtHZRBH6ZrG3RKsJ8QUStlMWAt9lxEJ7z1HGtCEC6yiOuaFByzcCj6Sc
-8OP3TRd4Wc84cSXxkQolQZo8W5zm7nSTDV3Dgkb+M+I=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhd.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uhd.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uhd.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhd.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhd.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhd.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEyzCCA7OgAwIBAgIQclomJbKZ1qKYftgv8fmsVzANBgkqhkiG9w0BAQUFADA8
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-aGF3dGUgU1NMIENBMB4XDTE0MDkyMjAwMDAwMFoXDTE2MDkyMjIzNTk1OVowgZEx
-CzAJBgNVBAYTAlVTMQ4wDAYDVQQIEwVUZXhhczEQMA4GA1UEBxQHSG91c3RvbjEp
-MCcGA1UEChQgVW5pdmVyc2l0eSBvZiBIb3VzdG9uIC0gRG93bnRvd24xHzAdBgNV
-BAsUFkluZm9ybWF0aW9uIFRlY2hub2xvZ3kxFDASBgNVBAMUC2lkcC51aGQuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgEuGggSabtOSh+ZPqXNf
-zHL7yWGitI4Tbrq/Z5LD58UVt27J0jucsUGPyfMNkmjj6ue/w02TRf9B+1pOe1mM
-96aNfh6CqhHMX361AtELGntBxgnuIIL3542+K5qgANeDlTeTFizubTKQHvNImyF+
-GkFNYPVUCiakQHcl01+2yPV+auhXldyUoS3PsDCPP1iw/SDue/DDZJ3+X1/LYilQ
-lEgoL3qbdaArbRQl0UqdqCH0XEjABw4/EJUdm0n3TlUxMD7H2ud8lRcrvhZ2NI20
-eLVp81SAJv3281yGcH+fdhE5EoGRq0c5tf/J7cs5ANczOqS1EOyGcuDo9JvES9Qg
-LwIDAQABo4IBcTCCAW0wFgYDVR0RBA8wDYILaWRwLnVoZC5lZHUwCQYDVR0TBAIw
-ADByBgNVHSAEazBpMGcGCmCGSAGG+EUBBzYwWTAmBggrBgEFBQcCARYaaHR0cHM6
-Ly93d3cudGhhd3RlLmNvbS9jcHMwLwYIKwYBBQUHAgIwIwwhaHR0cHM6Ly93d3cu
-dGhhd3RlLmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB/wQEAwIFoDAfBgNVHSMEGDAW
-gBSnooO7NEVAPfzVME8SuT6hAZ/22zArBgNVHR8EJDAiMCCgHqAchhpodHRwOi8v
-dGIuc3ltY2IuY29tL3RiLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwVwYIKwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNodHRwOi8vdGIuc3ltY2Qu
-Y29tMCYGCCsGAQUFBzAChhpodHRwOi8vdGIuc3ltY2IuY29tL3RiLmNydDANBgkq
-hkiG9w0BAQUFAAOCAQEABXVcSROHlKrhoMWYzVVy5KmZA6R5FkVfdefxM3Rom/Ew
-+BvpLq1tRGqCt0PwM191ZS0/io89kAfFGgyQAh15y9pih6cVPCPMrvC/ffg8WwNr
-QFrLGz1wnpmWI5V5EPzeErAR8VsrTlNyJWGMfqoAFjd+elEM8rjpS+o7unJ0ns77
-iKK58ricV65clSdE9mANGaUyVQJPaUJEL3g50XDI7cmEZqT/rmi8SGAKHnPDvtIu
-fGX+jzPtswJArLcGHYp0zP6UCGOiMLr5wOQpIw2iHCZ6gqk8gRRnqG+NmUKsuFSP
-nbykyDpkmQj056Oa1BaHtq82JqXJzdZI2VSs9bwR7Q==
-          </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>
-MIIEzDCCA7SgAwIBAgIQJ/hWn0/Y2YHYTNSVANVt1jANBgkqhkiG9w0BAQsFADBB
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3RlLCBJbmMuMRswGQYDVQQDExJ0
-aGF3dGUgU1NMIENBIC0gRzIwHhcNMTUxMjIxMDAwMDAwWhcNMTYwOTIyMjM1OTU5
-WjCBkTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3Vz
-dG9uMSkwJwYDVQQKDCBVbml2ZXJzaXR5IG9mIEhvdXN0b24gLSBEb3dudG93bjEf
-MB0GA1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEUMBIGA1UEAwwLaWRwLnVo
-ZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCXsv0XTneLSCMY
-TRPxxYWU094gJZxmqIyDB/ELEBHjTW2m8TyEIxdDunUgpPAVpLz+U794Lyv+t4lY
-UWUsL29Il83LgzbmQYxWNvbHWEOhwDBA1BwoEYsuI+206kYiOy6VJvRJgEuj94Tv
-TOqQNHywxjlW2w8dRiwNK8YZu/NMOyouxL2iKArQ58t45O5W9k0bTBly5OX+F26e
-aq/hmLWm6ymnZa4BVMWYjHA1JzHp+OtL6QZfK+7lSvYduY5UsMjSYAK3I4EMAvXP
-+8kd2pnWmD0p2Rdat7gUEv/q1xyiCgQcacP6jbK1d+LBIsKJKRG2l4H7A3EPSy0A
-L3VX+v/LAgMBAAGjggFtMIIBaTAWBgNVHREEDzANggtpZHAudWhkLmVkdTAJBgNV
-HRMEAjAAMG4GA1UdIARnMGUwYwYGZ4EMAQICMFkwJgYIKwYBBQUHAgEWGmh0dHBz
-Oi8vd3d3LnRoYXd0ZS5jb20vY3BzMC8GCCsGAQUFBwICMCMMIWh0dHBzOi8vd3d3
-LnRoYXd0ZS5jb20vcmVwb3NpdG9yeTAOBgNVHQ8BAf8EBAMCBaAwHwYDVR0jBBgw
-FoAUwk9IV/zRT5rAXTh9DgXb2S61UmAwKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDov
-L3RqLnN5bWNiLmNvbS90ai5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMFcGCCsGAQUFBwEBBEswSTAfBggrBgEFBQcwAYYTaHR0cDovL3RqLnN5bWNk
-LmNvbTAmBggrBgEFBQcwAoYaaHR0cDovL3RqLnN5bWNiLmNvbS90ai5jcnQwDQYJ
-KoZIhvcNAQELBQADggEBAEeQ1/qj4V92RKBD47oJOzo92rQ1RMFbrgajELzF3Pvv
-MNHC2Z4X9JpLDws/8jpOjb85qhMAp/9L8mkI6Kk9agdgYuYldiUlMmuEmzbLbjfB
-Iv7b8zSFKkCqtt8waKKmfggiSdw9SJmc6c/3MwlfFO64dPTgtJeqsDQK5E6f3xj4
-16VZpivg9zZLjuachfzO2fLCb57gNL9RXgK3aNcaGSDJ64GyErSWFCHrf/BB0SM7
-FTMCFvuVdtHZRBH6ZrG3RKsJ8QUStlMWAt9lxEJ7z1HGtCEC6yiOuaFByzcCj6Sc
-8OP3TRd4Wc84cSXxkQolQZo8W5zm7nSTDV3Dgkb+M+I=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhd.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Houston-Downtown</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Houston-Downtown</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhd.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Vince Esquivel</md:GivenName>
-    <md:EmailAddress>esquivelv@uhd.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Grace Davila</md:GivenName>
-    <md:EmailAddress>davilag@uhd.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 226fd69b..00000000
--- a/swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uhk.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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">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-GB</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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEqTCCA5GgAwIBAgIRAMhhInHN01xDenxdyI/PyagwDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTUwNjI5MDAwMDAwWhcNMTgwNjI4MjM1OTU5WjA4MSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxEzARBgNVBAMTCmlkcC51aGsuY3ow
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6ggF1vdF4Y+q9iIbJzmVe
-F8rIZMwe3bo2yUt+NkR1A//NTdCUDtTxXPEsarIYHrTaKw3LoPoCd7foATcgiVb3
-OjlckmUN1ol+oRssr8/HxLLXc8t9Rri1WNwrslPML/XMRwqLIyZrikRx8/+4ta7X
-3VUw2PtPgJIE1LLDAHbXBpzgu3k2TSB1+iLE/qv0jhUePGSg1HD/uPKQbZdvCRRk
-wQf8+W321HNiVzSqXCa+5byXlpRRMJm91Yru81kIul53v3UlJM1VaBQeFZwOMUU6
-FCY96YrOZse9cVLAcnugkEd43yKL984G/KEkDOA6oNYgcMrUZnLUaUBNC+5QpZJt
-AgMBAAGjggGAMIIBfDAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYosP22vTAd
-BgNVHQ4EFgQUHYD4zUVXUPQXoYwcSLISWqjpn38wDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuG
-KWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3JsMGwGCCsG
-AQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1c3QuY29t
-L1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVzZXJ0
-cnVzdC5jb20wLwYDVR0RBCgwJoIKaWRwLnVoay5jeoILaWRwMS51aGsuY3qCC2lk
-cDIudWhrLmN6MA0GCSqGSIb3DQEBCwUAA4IBAQBoice84CrPK6YD844Jl+4Nb2Pf
-hqUKZfFvwbdi0u2mTzINRwhJPECBQaBgE24qoKeNsTRXbH7RokB6wbqyUoe2WLP0
-rk7uqK6yM830efSS13sR1Ho8dG2M+rsFtgomh6Xx6LJiAPxAC5gQj/TGZJYRB5kV
-HjXEbptVJiyOlp9sNkX99RTvSEzyYEjbr7B4W3Z7XZAL954cHrpAVOY5tytBtYMB
-NZy+iTOBfRygx8Y6jkYrmgE4ScCiJC4765lDY0nMOPXHhFCLVktlzCThhi2TbTZU
-RxJkWHrjw5t/tTXPerUVJNoKvG5+w64vJ5gyXjKGdhUxf2kLHdme+x7V/FMN
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhk.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://idp.uhk.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhk.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uhk.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhk.cz/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">uhk.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEqTCCA5GgAwIBAgIRAMhhInHN01xDenxdyI/PyagwDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTUwNjI5MDAwMDAwWhcNMTgwNjI4MjM1OTU5WjA4MSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxEzARBgNVBAMTCmlkcC51aGsuY3ow
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6ggF1vdF4Y+q9iIbJzmVe
-F8rIZMwe3bo2yUt+NkR1A//NTdCUDtTxXPEsarIYHrTaKw3LoPoCd7foATcgiVb3
-OjlckmUN1ol+oRssr8/HxLLXc8t9Rri1WNwrslPML/XMRwqLIyZrikRx8/+4ta7X
-3VUw2PtPgJIE1LLDAHbXBpzgu3k2TSB1+iLE/qv0jhUePGSg1HD/uPKQbZdvCRRk
-wQf8+W321HNiVzSqXCa+5byXlpRRMJm91Yru81kIul53v3UlJM1VaBQeFZwOMUU6
-FCY96YrOZse9cVLAcnugkEd43yKL984G/KEkDOA6oNYgcMrUZnLUaUBNC+5QpZJt
-AgMBAAGjggGAMIIBfDAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYosP22vTAd
-BgNVHQ4EFgQUHYD4zUVXUPQXoYwcSLISWqjpn38wDgYDVR0PAQH/BAQDAgWgMAwG
-A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuG
-KWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3JsMGwGCCsG
-AQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1c3QuY29t
-L1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVzZXJ0
-cnVzdC5jb20wLwYDVR0RBCgwJoIKaWRwLnVoay5jeoILaWRwMS51aGsuY3qCC2lk
-cDIudWhrLmN6MA0GCSqGSIb3DQEBCwUAA4IBAQBoice84CrPK6YD844Jl+4Nb2Pf
-hqUKZfFvwbdi0u2mTzINRwhJPECBQaBgE24qoKeNsTRXbH7RokB6wbqyUoe2WLP0
-rk7uqK6yM830efSS13sR1Ho8dG2M+rsFtgomh6Xx6LJiAPxAC5gQj/TGZJYRB5kV
-HjXEbptVJiyOlp9sNkX99RTvSEzyYEjbr7B4W3Z7XZAL954cHrpAVOY5tytBtYMB
-NZy+iTOBfRygx8Y6jkYrmgE4ScCiJC4765lDY0nMOPXHhFCLVktlzCThhi2TbTZU
-RxJkWHrjw5t/tTXPerUVJNoKvG5+w64vJ5gyXjKGdhUxf2kLHdme+x7V/FMN
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhk.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhk.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="en">University of Hradec Kralove</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Univerzita Hradec Králové</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Hradec Kralove</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Univerzita Hradec Králové</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhk.cz/en-GB</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.uhk.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Lukas</md:GivenName>
-    <md:SurName>Kummer</md:SurName>
-    <md:EmailAddress>lukas.kummer@uhk.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Flek</md:SurName>
-    <md:EmailAddress>jan.flek@uhk.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uibk.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uibk.ac.at-idp-shibboleth.xml
deleted file mode 100644
index 46e243d8..00000000
--- a/swamid-interfederations-2.0/idp.uibk.ac.at-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uibk.ac.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-09-10T14:16:23Z">
-      <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">uibk.ac.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Innsbruck</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of 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>
-MIIDJDCCAgygAwIBAgIVAKPXC0xL8CC3lPXuHb8IXl0TkWbIMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51aWJrLmFjLmF0MB4XDTA4MDkwOTA3NDkyN1oX
-DTI4MDkwOTA3NDkyN1owGTEXMBUGA1UEAxMOaWRwLnVpYmsuYWMuYXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZeU5zvz1e6lRu0eimAxjcuBUXJuKY
-mCw2TeMaEmzJCi5U0l1TnNondXURanmxzPDpgFzHFDknW0dSENJFEv5QVMwq/waX
-6+otXcL8q9zPfuHu7I23ykPPBKWXKgG+kdfq8kvtuXGxS9Xy1VGMFjufM8myH2bP
-xPTo4Drx9bLLfb+M6S6exSy8JG5PTneo62VeO2GF9KQev/x/iKSnPWxPj6HdXOwj
-nDUpTiKGVTd0zS22jVVtrJybMTLmIiynhQRAWHlcDk06dXzmZyxg6pixvL6Wkqua
-0ySOIqvDgxIusXnyls2VcPLmNjW1fNYQ4vSduxbj4Z0C994DEMm0pduHAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51aWJrLmFjLmF0hiVodHRwczovL2lkcC51aWJr
-LmFjLmF0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQeRcsefJI7EPSmjbGFWej1
-OPmcEjANBgkqhkiG9w0BAQUFAAOCAQEAaHZPqUT5AVi7MAzl591PrLZOdDzND3Jj
-6+CSk73rorB0tyE0ng5KDqS607zSDyaM/M2iTsCLH63+a7Ku5fVnx7Vnc7YvtCWF
-hCbCPQXs8bnNX3MzsxH8l3jEJWmgiTKMK9OMafS0zU/t15PhGBl5WwG0ZTokGJYF
-fW9oqrK1fafq6xwjjH34md+tEEGUADopOwtw669f64go3d1vQ1lemF3F5xp6Mwv/
-HpQvY9OrdfUdQ/lYbHMFnZTi4mm6912J3HNd1Cngjj2kvLhbH7Ki74G3sCNhYu2i
-sUbbplFi52tSH+D6jCVIQTMb3X8MG7lAf62Cm0BocKwL/0M6jMQWJQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uibk.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.uibk.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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uibk.ac.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uibk.ac.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uibk.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uibk.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">uibk.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>
-MIIDJDCCAgygAwIBAgIVAKPXC0xL8CC3lPXuHb8IXl0TkWbIMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51aWJrLmFjLmF0MB4XDTA4MDkwOTA3NDkyN1oX
-DTI4MDkwOTA3NDkyN1owGTEXMBUGA1UEAxMOaWRwLnVpYmsuYWMuYXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZeU5zvz1e6lRu0eimAxjcuBUXJuKY
-mCw2TeMaEmzJCi5U0l1TnNondXURanmxzPDpgFzHFDknW0dSENJFEv5QVMwq/waX
-6+otXcL8q9zPfuHu7I23ykPPBKWXKgG+kdfq8kvtuXGxS9Xy1VGMFjufM8myH2bP
-xPTo4Drx9bLLfb+M6S6exSy8JG5PTneo62VeO2GF9KQev/x/iKSnPWxPj6HdXOwj
-nDUpTiKGVTd0zS22jVVtrJybMTLmIiynhQRAWHlcDk06dXzmZyxg6pixvL6Wkqua
-0ySOIqvDgxIusXnyls2VcPLmNjW1fNYQ4vSduxbj4Z0C994DEMm0pduHAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51aWJrLmFjLmF0hiVodHRwczovL2lkcC51aWJr
-LmFjLmF0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQeRcsefJI7EPSmjbGFWej1
-OPmcEjANBgkqhkiG9w0BAQUFAAOCAQEAaHZPqUT5AVi7MAzl591PrLZOdDzND3Jj
-6+CSk73rorB0tyE0ng5KDqS607zSDyaM/M2iTsCLH63+a7Ku5fVnx7Vnc7YvtCWF
-hCbCPQXs8bnNX3MzsxH8l3jEJWmgiTKMK9OMafS0zU/t15PhGBl5WwG0ZTokGJYF
-fW9oqrK1fafq6xwjjH34md+tEEGUADopOwtw669f64go3d1vQ1lemF3F5xp6Mwv/
-HpQvY9OrdfUdQ/lYbHMFnZTi4mm6912J3HNd1Cngjj2kvLhbH7Ki74G3sCNhYu2i
-sUbbplFi52tSH+D6jCVIQTMb3X8MG7lAf62Cm0BocKwL/0M6jMQWJQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uibk.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uibk.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">Universität Innsbruck</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Innsbruck</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Innsbruck</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Innsbruck</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uibk.ac.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uibk.ac.at/index.html.en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Walter</md:GivenName>
-    <md:SurName>Mueller</md:SurName>
-    <md:EmailAddress>mailto:innet-admin@uibk.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d9301019..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ujep.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujep.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://idp.ujep.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujep.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ujep.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujep.cz/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">ujep.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujep.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujep.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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Jan Evangelista Purkyne University in Usti nad Labem</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Univerzita Jana Evangelisty Purkyně v Ústí nad Labem</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ujep.cz/en/welcome.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ujep.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Pavel</md:GivenName>
-    <md:SurName>Polacek</md:SurName>
-    <md:EmailAddress>pavel.polacek@ujep.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b04b8e82..00000000
--- a/swamid-interfederations-2.0/idp.ujep.cz.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ujep.cz/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope 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>
-MIIE6zCCA9OgAwIBAgIEQrOHrDANBgkqhkiG9w0BAQUFADBDMRIwEAYKCZImiZPy
-LGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNuZXQtY2ExEjAQBgNVBAMTCUNF
-U05FVCBDQTAeFw0xMDAyMDUwNjA5MjJaFw0xMTAzMDUwNjM5MjJaMGsxEjAQBgoJ
-kiaJk/IsZAEZFgJjejEZMBcGCgmSJomT8ixkARkWCWNlc25ldC1jYTEkMCIGA1UE
-ChMbVW5pdmVyc2l0eSBvZiBKLiBFLiBQdXJreW5lMRQwEgYDVQQDEwtpZHAudWpl
-cC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDXBB0IPCgSo2Jw
-Fwo96bXHg5dB0ebhdbk5VeNIpGuitrdyb7+Y6sQL2jn5rLUuy0koyFtKnsi5CCIv
-3PoaJ0cUDGVx90m4yYK8E1rOHG4qc1SOWl5X0IHM5CwAGPXzWzBL0xQgq8qQs1nd
-IdYg8iMmC5bNwaV2XFtp03feERQmh2H/wAZJupWhPWrb1QzNDE1ndoZIbUlkn6MK
-yjlPZmXz9HapN5p6wypWL8M/0ILx5TC5KqDgTPbj3hlkxX4VpxoHCLI1qQyIJ6FM
-psiJF7XbKfuHTccwfLG4lEzVcf8V1hz5DeXyzr5syq+Lzf91XSRL/v3jQQ4AUmGI
-GSvDh2sCAwEAAaOCAb0wggG5MA4GA1UdDwEB/wQEAwIFoDAZBgNVHSAEEjAQMA4G
-DCsGAQQBvnkBAgICADA9BgNVHREENjA0gRVwYXZlbC5wb2xhY2VrQHVqZXAuY3qC
-C2lkcC51amVwLmN6gg5zaGliYWwudWplcC5jejCCAQsGA1UdHwSCAQIwgf8wWqBY
-oFakVDBSMRIwEAYKCZImiZPyLGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNu
-ZXQtY2ExEjAQBgNVBAMTCUNFU05FVCBDQTENMAsGA1UEAxMEQ1JMNTCBoKCBnaCB
-moZCaHR0cDovL3d3dy5jZXNuZXQuY3ovcGtpL2NybC9jbj1DRVNORVQlMjBDQSxk
-Yz1jZXNuZXQtY2EsZGM9Y3ouY3JshlRsZGFwOi8vbGRhcC5jZXNuZXQtY2EuY3ov
-Y249Q0VTTkVUJTIwQ0EsZGM9Y2VzbmV0LWNhLGRjPWN6P2NlcnRpZmljYXRlUmV2
-b2NhdGlvbkxpc3QwHwYDVR0jBBgwFoAUL2wFw1EmrK85nD44Nd1SKSeAxfUwHQYD
-VR0OBBYEFEvU9hiShsbDbtbv8Bg8RyDqOCyCMA0GCSqGSIb3DQEBBQUAA4IBAQDI
-oR3OpYnhdXm4Ay0pZAemLcMySvsKwgTrw/F0pT7Sn2MPUcc+LwkCwiXAecyPaLEl
-bivcNmN7cZF7R2ef/BMeDNhWEZLYnYHE/xRmu0b6Mx/vhKxqZRh5s82EePASB5Xf
-MPOU2JcpDXIEJKQjIyVPQPs6Y3fVL8nJX7aLlkLZ+UVlTnbpdLv09RNjtRgVxh1/
-2dor6/RyEsQP1/Ekz482iFqL+61pjXzrQssdTFKlTMxRKM2h5i2B0MmPrne1zGSh
-+q3x181uOgv1cCJATcU9PZiAd/Eua7SUs0ItvX1y5HUPKKknExJ+9cxssQxBU7SH
-idTONNLnAFV37h16DlOV
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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>
-MIIE6zCCA9OgAwIBAgIEQrOHrDANBgkqhkiG9w0BAQUFADBDMRIwEAYKCZImiZPy
-LGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNuZXQtY2ExEjAQBgNVBAMTCUNF
-U05FVCBDQTAeFw0xMDAyMDUwNjA5MjJaFw0xMTAzMDUwNjM5MjJaMGsxEjAQBgoJ
-kiaJk/IsZAEZFgJjejEZMBcGCgmSJomT8ixkARkWCWNlc25ldC1jYTEkMCIGA1UE
-ChMbVW5pdmVyc2l0eSBvZiBKLiBFLiBQdXJreW5lMRQwEgYDVQQDEwtpZHAudWpl
-cC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDXBB0IPCgSo2Jw
-Fwo96bXHg5dB0ebhdbk5VeNIpGuitrdyb7+Y6sQL2jn5rLUuy0koyFtKnsi5CCIv
-3PoaJ0cUDGVx90m4yYK8E1rOHG4qc1SOWl5X0IHM5CwAGPXzWzBL0xQgq8qQs1nd
-IdYg8iMmC5bNwaV2XFtp03feERQmh2H/wAZJupWhPWrb1QzNDE1ndoZIbUlkn6MK
-yjlPZmXz9HapN5p6wypWL8M/0ILx5TC5KqDgTPbj3hlkxX4VpxoHCLI1qQyIJ6FM
-psiJF7XbKfuHTccwfLG4lEzVcf8V1hz5DeXyzr5syq+Lzf91XSRL/v3jQQ4AUmGI
-GSvDh2sCAwEAAaOCAb0wggG5MA4GA1UdDwEB/wQEAwIFoDAZBgNVHSAEEjAQMA4G
-DCsGAQQBvnkBAgICADA9BgNVHREENjA0gRVwYXZlbC5wb2xhY2VrQHVqZXAuY3qC
-C2lkcC51amVwLmN6gg5zaGliYWwudWplcC5jejCCAQsGA1UdHwSCAQIwgf8wWqBY
-oFakVDBSMRIwEAYKCZImiZPyLGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNu
-ZXQtY2ExEjAQBgNVBAMTCUNFU05FVCBDQTENMAsGA1UEAxMEQ1JMNTCBoKCBnaCB
-moZCaHR0cDovL3d3dy5jZXNuZXQuY3ovcGtpL2NybC9jbj1DRVNORVQlMjBDQSxk
-Yz1jZXNuZXQtY2EsZGM9Y3ouY3JshlRsZGFwOi8vbGRhcC5jZXNuZXQtY2EuY3ov
-Y249Q0VTTkVUJTIwQ0EsZGM9Y2VzbmV0LWNhLGRjPWN6P2NlcnRpZmljYXRlUmV2
-b2NhdGlvbkxpc3QwHwYDVR0jBBgwFoAUL2wFw1EmrK85nD44Nd1SKSeAxfUwHQYD
-VR0OBBYEFEvU9hiShsbDbtbv8Bg8RyDqOCyCMA0GCSqGSIb3DQEBBQUAA4IBAQDI
-oR3OpYnhdXm4Ay0pZAemLcMySvsKwgTrw/F0pT7Sn2MPUcc+LwkCwiXAecyPaLEl
-bivcNmN7cZF7R2ef/BMeDNhWEZLYnYHE/xRmu0b6Mx/vhKxqZRh5s82EePASB5Xf
-MPOU2JcpDXIEJKQjIyVPQPs6Y3fVL8nJX7aLlkLZ+UVlTnbpdLv09RNjtRgVxh1/
-2dor6/RyEsQP1/Ekz482iFqL+61pjXzrQssdTFKlTMxRKM2h5i2B0MmPrne1zGSh
-+q3x181uOgv1cCJATcU9PZiAd/Eua7SUs0ItvX1y5HUPKKknExJ+9cxssQxBU7SH
-idTONNLnAFV37h16DlOV
-                     </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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 6c44b88e..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ujf.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.cas.cz: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.ujf.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ujf.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ujf.cas.cz/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">ujf.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ujf.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Nuclear Physics Institute of the ASCR</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav jaderné fyziky AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Nuclear Physics Institute of the ASCR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav jaderné fyziky AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ujf.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.ujf.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2cf15c66..00000000
--- a/swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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-21T23:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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:DomainHint>ul.ie</mdui:DomainHint>
-        <mdui:IPHint>193.1.96.0/20</mdui:IPHint>
-      </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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ul.ie/idp/profile/Shibboleth/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>mailto:brian.sexton@ul.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Eugene Murnane</md:SurName>
-    <md:EmailAddress>mailto:eugene.murnane@ul.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Eugene Murnane</md:SurName>
-    <md:EmailAddress>mailto:eugene.murnane@ul.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml
deleted file mode 100644
index 57a1dfd6..00000000
--- a/swamid-interfederations-2.0/idp.ulb.ac.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,113 +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://idp.ulb.ac.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">ulb.ac.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ULB - Universite Libre de Bruxelles</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Universite Libre de Bruxelles</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp.ulb.ac.be/logo/ulb-small.jpg</mdui:Logo>
-        <mdui:Logo height="110" width="331">https://idp.ulb.ac.be/logo/ulb-large.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>164.15.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:06a8:11a0::/64</mdui:IPHint>
-        <mdui:DomainHint>ulb.ac.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:50.8119483,4.38261690</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAI/VDrWwVO0DRbxqyo/DcM/tAz8TMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC51bGIuYWMuYmUwHhcNMTMxMjE3MTQzOTM2WhcN
-MzMxMjE3MTQzOTM2WjAYMRYwFAYDVQQDEw1pZHAudWxiLmFjLmJlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkvAV355Iuf7R4zjTBDO4ZoUfuPvepv91
-XGbqq4S22w/qoTxg7WIL7/5oKszyWhFCwNJM8+zhvYaR+1KytsdO408AlJzfvJSv
-R+0ONmWjqjmBapTQ8mQauRBlGCVdSMAzc/NlVkrjuN+5aTJP2BM631PRdN4k0kne
-H4nEwMA2imVFGrEbQIj7CwVtooeLoZyYx3vhpWmBLELLjbY/P/BEUxwaGVAowQyh
-P1ZV3j5wZjv48toqU9985oPfNhJfUfCioYmpzde6Ad+YQHHZ1YSdcNRazO/Rr+zh
-ikUxfLgY4mzrwUGaJS5dLa8nyG8f6zsM8u+iU/JkTVWXm7i2Y3MnPQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAudWxiLmFjLmJlhiRodHRwczovL2lkcC51bGIuYWMu
-YmUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDV5wlniFNcMC9tbYdZtvRtQxvjL
-MA0GCSqGSIb3DQEBBQUAA4IBAQAFAYq5SIwtwZMtKzlZlZ+HxQQ+SXzFwsKgeouT
-W0wuOb2n+x7zrrp1AeSC5xYYAHBvX/7FYD5mzqVygllzqUelXuSEIs1v2giCSpDd
-fYuDlOe5u1Tim0k6qFFKrS813YPqI1f8y1BN4dP1phjhbYbr1adtGuRL2C0A8273
-H4voU2rFE3snkvUFazOhaU/ckeFgn16JKBAIX/n5CUD65qq0nihV1fe3jSYONlUT
-L4vi1i4VLJAvnvSp3nMLoqQkeDB1HTX5tG35t4q2Plv8tSMWvxdCMsoiN6gWBVfY
-P67aJTsrDaN9W2NHFiwumJUE4QnedbfiOJaI25iZWnEyDLBK
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ulb.ac.be/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ulb.ac.be/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ulb.ac.be: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.ulb.ac.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ulb.ac.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ulb.ac.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ulb.ac.be/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">ulb.ac.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAI/VDrWwVO0DRbxqyo/DcM/tAz8TMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC51bGIuYWMuYmUwHhcNMTMxMjE3MTQzOTM2WhcN
-MzMxMjE3MTQzOTM2WjAYMRYwFAYDVQQDEw1pZHAudWxiLmFjLmJlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkvAV355Iuf7R4zjTBDO4ZoUfuPvepv91
-XGbqq4S22w/qoTxg7WIL7/5oKszyWhFCwNJM8+zhvYaR+1KytsdO408AlJzfvJSv
-R+0ONmWjqjmBapTQ8mQauRBlGCVdSMAzc/NlVkrjuN+5aTJP2BM631PRdN4k0kne
-H4nEwMA2imVFGrEbQIj7CwVtooeLoZyYx3vhpWmBLELLjbY/P/BEUxwaGVAowQyh
-P1ZV3j5wZjv48toqU9985oPfNhJfUfCioYmpzde6Ad+YQHHZ1YSdcNRazO/Rr+zh
-ikUxfLgY4mzrwUGaJS5dLa8nyG8f6zsM8u+iU/JkTVWXm7i2Y3MnPQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAudWxiLmFjLmJlhiRodHRwczovL2lkcC51bGIuYWMu
-YmUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDV5wlniFNcMC9tbYdZtvRtQxvjL
-MA0GCSqGSIb3DQEBBQUAA4IBAQAFAYq5SIwtwZMtKzlZlZ+HxQQ+SXzFwsKgeouT
-W0wuOb2n+x7zrrp1AeSC5xYYAHBvX/7FYD5mzqVygllzqUelXuSEIs1v2giCSpDd
-fYuDlOe5u1Tim0k6qFFKrS813YPqI1f8y1BN4dP1phjhbYbr1adtGuRL2C0A8273
-H4voU2rFE3snkvUFazOhaU/ckeFgn16JKBAIX/n5CUD65qq0nihV1fe3jSYONlUT
-L4vi1i4VLJAvnvSp3nMLoqQkeDB1HTX5tG35t4q2Plv8tSMWvxdCMsoiN6gWBVfY
-P67aJTsrDaN9W2NHFiwumJUE4QnedbfiOJaI25iZWnEyDLBK
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ulb.ac.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ulb.ac.be: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">
-                Universite Libre de Bruxelles
-        </md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">
-                ULB - Universite Libre de Bruxelles
-        </md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">
-                http://www.ulb.ac.be
-        </md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>support@ulb.ac.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umassd.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.umassd.edu-idp-shibboleth.xml
deleted file mode 100644
index a58cef45..00000000
--- a/swamid-interfederations-2.0/idp.umassd.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,57 +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://idp.umassd.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">umassd.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Massachusetts - Dartmouth</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.umassd.edu</mdui:InformationURL>
-        <mdui:Logo height="55" width="350" xml:lang="en">https://idp.umassd.edu/idp/images/umassd.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>
-MIIDJDCCAgygAwIBAgIVAJcM3MOQxZ8si0E5BGYr72Fa/81LMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDmlkcC51bWFzc2QuZWR1MB4XDTE1MTExMDE2MjUzMFoX
-DTM1MTExMDE2MjUzMFowGTEXMBUGA1UEAwwOaWRwLnVtYXNzZC5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMlE4wxaYgi/u5MybqncY2X4DOieFH
-z7IoDlAm5OpV8C2CPMW+BjiQ6TBjGxgmJVpBdPyG1/cnuLuS8irtIWjvGXE16TqN
-oZv5zMI1wo4ns4mvHWSyS4HMpELQCrhDF1gYl5WpAZTSiOTnzeFTmrJcj519MJIm
-FQcEahb9k4eSKoTbP7bqRbD66b2NUvOXvpsU/cDS1iEWvP8T5nuSs0IV2MNmeTjU
-M4Te9ue8elUyQTZLeAIaYh9LbDnExGu7LgOr9C3OwVNRyXF0+TeATS6Xk7OkNyV2
-IylGeNisJE7PsiAnO9kLaMdciiLZlUSsFCrvw62FI/4T31Aq+yWvWsyXAgMBAAGj
-YzBhMB0GA1UdDgQWBBR1WiFVOyvGgIOqYiG2mBm6Bvm0TDBABgNVHREEOTA3gg5p
-ZHAudW1hc3NkLmVkdYYlaHR0cHM6Ly9pZHAudW1hc3NkLmVkdS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAEJyy9dkQrYBgzRkVlthKAoVZYFx7owV1
-gHN9w50xzBevvmeGg5JzT9ASEmG8oJnIc7Bp1+MCzAcQfHym1J6m1zuLO4IP92nj
-LbLQxeRtTGasIPxs5NsMwKJw15+Kvw+NRDS0Q04cNz/VKEe2FZ9Ejbh3bAG0OOdi
-hHAQYEb+nF5icqLWRcM3Dy2O7B+DraQaVAxPl1zLH8hESJCTxUPZw2Ztpgpycz+u
-vd40Lau00JitxcFWd5OainenB/QIhYlcQtsEqBgubyiTXzlBSq+ndxwwsCUucyxW
-jRlpHHp503ULaAZOVJz+t/3mK0Il1DaWIueXOHYeWFC3t5NE+Mzajg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.umassd.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umassd.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Massachusetts - Dartmouth</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Massachusetts - Dartmouth</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umassd.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Craig R. Oliveira</md:GivenName>
-    <md:EmailAddress>coliveira@umassd.edu</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 71049dff..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: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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umk.pl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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 (old IdP)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-            Nicolaus Copernicus University Identity Provider (old)
-         </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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 (old IdP)</md:OrganizationName>
-    <md:OrganizationName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu (wycofywany IdP)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Nicolaus Copernicus University in Torun (old IdP)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu (wycofywany IdP)</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>mailto: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 4ff0fa3a..00000000
--- a/swamid-interfederations-2.0/idp.umk.pl.xml
+++ /dev/null
@@ -1,50 +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="2014-02-22T14:05: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/logoumk.png</mdui:Logo>
-      </mdui:UIInfo>
-    </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.umoncton.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.umoncton.ca-idp-shibboleth.xml
deleted file mode 100644
index 6926a676..00000000
--- a/swamid-interfederations-2.0/idp.umoncton.ca-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://idp.umoncton.ca/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-10-15T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.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">umoncton.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Moncton</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Université de Moncton</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Université de Moncton</mdui:Description>
-        <mdui:Description xml:lang="fr">Université de Moncton</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.umoncton.ca/english/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.umoncton.ca/enbref/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUJw5q6RUUySGVia72uCU3k51FT4YwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLnVtb25jdG9uLmNhMB4XDTE0MTAwNjE3MjYyM1oX
-DTM0MTAwNjE3MjYyM1owGjEYMBYGA1UEAxMPaWRwLnVtb25jdG9uLmNhMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtEx8AYq9pL9QNSqYrHYBdzPjrBcZ
-NSAdvnzLj2hycfApJeXVF5zQ0GPTS37e9NLRTJfHTKhfaMF+GDWyQ3cMQ191KU/j
-H6rhHwrGOy0uO9vRbVVX8c3Qz97tTiXapeR0FNKKQLQC6DENKDl8OjmUZxtBt3vk
-CFHCpwRWFrybLaIk/W1PFKSgTY1EzZOrj9o/0rfWVE8U9xwrk4aQzLG/BloRxeDV
-3ITJnZDIt+CRjCqq0J1LnEWTgeGGnQ5jW9TbCHTj9WG8oyIJEFxfJPBeOdTtM7Jq
-VIJmu620iQDpbPEHj6PZC+xTd662tZV/PVUaIxBrxSUh590JGTf/eQeZzQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAudW1vbmN0b24uY2GGJmh0dHBzOi8vaWRwLnVt
-b25jdG9uLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQEg6svj3OqPSk1xYIl
-nbaR8yXuBTANBgkqhkiG9w0BAQUFAAOCAQEAolFcf9OngcDkDp56/iS3SEEls17U
-cRe4t6KeTbcTbKosFmWcJz5Wu7A7juSNDYoqlIzNmnGomTntIe5eLnma5Jo9kBTd
-kOktBSXQjkzpyAmrKMlp8hM/pbHdFJv5W/aavPjq22n/bd5WxXXUCzJ0NZweoqIE
-Vg2ZEA7l0W+vY0rAUR18/Yz1sAg9mg1eULgaFK5vhz06cGhPACjkOfZYyohfNGEN
-qcZWJ7Ktw690e5FRDhPRkmfRz0/puYKVXn7UquIU0kyTn5XEBGb9BTkMaDx8xck1
-WsKC/lb05YSOThSKdky/5vApohqpmoLkqcwDONPRKbRjguzTlMJ3z+U/4A==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.umoncton.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umoncton.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umoncton.ca/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.umoncton.ca/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umoncton.ca: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.umoncton.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.umoncton.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.umoncton.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umoncton.ca/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">umoncton.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUJw5q6RUUySGVia72uCU3k51FT4YwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLnVtb25jdG9uLmNhMB4XDTE0MTAwNjE3MjYyM1oX
-DTM0MTAwNjE3MjYyM1owGjEYMBYGA1UEAxMPaWRwLnVtb25jdG9uLmNhMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtEx8AYq9pL9QNSqYrHYBdzPjrBcZ
-NSAdvnzLj2hycfApJeXVF5zQ0GPTS37e9NLRTJfHTKhfaMF+GDWyQ3cMQ191KU/j
-H6rhHwrGOy0uO9vRbVVX8c3Qz97tTiXapeR0FNKKQLQC6DENKDl8OjmUZxtBt3vk
-CFHCpwRWFrybLaIk/W1PFKSgTY1EzZOrj9o/0rfWVE8U9xwrk4aQzLG/BloRxeDV
-3ITJnZDIt+CRjCqq0J1LnEWTgeGGnQ5jW9TbCHTj9WG8oyIJEFxfJPBeOdTtM7Jq
-VIJmu620iQDpbPEHj6PZC+xTd662tZV/PVUaIxBrxSUh590JGTf/eQeZzQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAudW1vbmN0b24uY2GGJmh0dHBzOi8vaWRwLnVt
-b25jdG9uLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQEg6svj3OqPSk1xYIl
-nbaR8yXuBTANBgkqhkiG9w0BAQUFAAOCAQEAolFcf9OngcDkDp56/iS3SEEls17U
-cRe4t6KeTbcTbKosFmWcJz5Wu7A7juSNDYoqlIzNmnGomTntIe5eLnma5Jo9kBTd
-kOktBSXQjkzpyAmrKMlp8hM/pbHdFJv5W/aavPjq22n/bd5WxXXUCzJ0NZweoqIE
-Vg2ZEA7l0W+vY0rAUR18/Yz1sAg9mg1eULgaFK5vhz06cGhPACjkOfZYyohfNGEN
-qcZWJ7Ktw690e5FRDhPRkmfRz0/puYKVXn7UquIU0kyTn5XEBGb9BTkMaDx8xck1
-WsKC/lb05YSOThSKdky/5vApohqpmoLkqcwDONPRKbRjguzTlMJ3z+U/4A==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.umoncton.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umoncton.ca: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="fr">Université de Moncton</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Université de Moncton</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fr">Université de Moncton</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Moncton</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fr">http://www.umoncton.ca/enbref/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.umoncton.ca/english/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Service à la clientèle Université de Moncton</md:SurName>
-    <md:EmailAddress>dgt@umoncton.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.xml
deleted file mode 100644
index f92330b3..00000000
--- a/swamid-interfederations-2.0/idp.umu.se-saml2-idp-metadata.php.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" entityID="https://idp.umu.se/saml2/idp/metadata.php">
-  <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="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">umu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Umeå universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Umeå University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.umu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.umu.se/english/</mdui:InformationURL>
-        <mdui:Logo height="63" width="358">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
-        <mdui:Logo height="63" width="358" xml:lang="sv">https://www.umu.se/static/images/umu_logo.jpg</mdui:Logo>
-        <mdui:Logo height="63" width="350" xml:lang="en">https://www.umu.se/static/images/umu_logo_eng.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">umu umea+universitet umea+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">umu umea+universitet umea+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>umu.se</mdui:DomainHint>
-        <mdui:IPHint>130.239.0.0/16</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</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>MIIDhzCCAm+gAwIBAgIJAI1+B/ykYMKxMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAlNFMQ0wCwYDVQQHDARVbWVhMRkwFwYDVQQKDBBVbWVhIHVuaXZlcnNpdGV0MQwwCgYDVQQLDANJVFMxEzARBgNVBAMMCmlkcC51bXUuc2UwHhcNMTIwMTE3MDkwNzAyWhcNMjIwMTE0MDkwNzAyWjBaMQswCQYDVQQGEwJTRTENMAsGA1UEBwwEVW1lYTEZMBcGA1UECgwQVW1lYSB1bml2ZXJzaXRldDEMMAoGA1UECwwDSVRTMRMwEQYDVQQDDAppZHAudW11LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxi4TpxJad+Voksq5ArQ1D5yYx0u9Tq6kaNJDFGUQOSb6rzfiiau3p/Uy02Hy5Y/iPAZblYffrTpQOC6dcrYRdoKI20ZWyc7dwc24yuo8mfsnNt5xoAHZbmAO6jw98tvYz0WWXYYcBbkiAwELfSdLd1n8V6mCpx3oLji/xzhBw+B+sLkLUXVaG3p3lTDicRmpuZPnaOKVDexYHWrJ98JZw45k8aw/SpwBZJzcJ4HtaUIrtrjasdbPmfL92nr8XM3mFMQRBjMwZNnt8MIpBnnmZVk9HlzgFooL1OkaujpLMxzhAi2Ft8rHxZYsboGZytlPgPGnfANQ4+bFb67bKFfUXwIDAQABo1AwTjAdBgNVHQ4EFgQUWGMuElpC3shsrqn7K+chLwAGFMAwHwYDVR0jBBgwFoAUWGMuElpC3shsrqn7K+chLwAGFMAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAM0k3m+271OHet+AWgHhApuy3TcnobVixJSAdOjiPhX8sIbA62m9NDEFrPBew1HUh2XYaO87rSxZXS2NsXQmkkcOpavAqVISckEX9jpjgBEC/8Kz2uFzf9uf/7eYA1tnJTRVpfy1XLd9D7B3R8B/vjnYBJVgKtlz2qJrDr7RvZ8+twMYcDnqiVcjbvhDN0ItOdW9Wn5arzMQddUUI4Ok9KBPJxO3NP9crHJ7o63gLvB6YjEK+zcKagIHc8y+8xmuXzbg2zaQAY9GKxdyVjbmMQtEm8R99vmrmXgz0qfng8ET8WPkRl7ugPTYCo+H2Bq/rN31pRLF+MVBq/kHc7lPk3w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.umu.se/saml2/idp/ArtifactResolutionService.php" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umu.se/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.umu.se/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">UmU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.umu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Umeå University</md:Company>
-    <md:SurName>ITS datordrift</md:SurName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Umeå University</md:Company>
-    <md:SurName>ITS datordrift</md:SurName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Umeå University</md:Company>
-    <md:SurName>Servicedesk Umeå universitet</md:SurName>
-    <md:EmailAddress>mailto:support@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml
deleted file mode 100644
index d7b5267c..00000000
--- a/swamid-interfederations-2.0/idp.unb.ca-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unb.ca/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-01-23T20:50:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unb.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of New Brunswick</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of New Brunswick</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unb.ca</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIURLDfhqryV9GxVrS3QEZfziUWRGAwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLnVuYi5jYTAeFw0xMTA4MjUxNjM1MjdaFw0zMTA4
-MjUxNjM1MjdaMBUxEzARBgNVBAMTCmlkcC51bmIuY2EwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCXvPrW/Udu8RmKI/7vI3LsayG3yJhEMgcZ9KswHZ3x
-dE7avwIwE20brD2fEMmt46SKCRUF9shpZslaahGTq0jor5dvLUY2lG3B7R5fsTAe
-s69wNRrsx1QSw7ACTbv9rfURSzIn0iUeDCOVIcCp9Ol5Cr3uN5POmaQ2F+xVfVOT
-TbZ8dQcrFHq19Fs3la3izkYCq1490VwQqA6QEsCpDXMRUEfe4MZNl+OLms1MMJr+
-gTvL6SPYJb03sygLnVQJ+1xVuEAS2zfe0/mvo1ef1Vnn+52nxup96CJXdYKX5QjT
-6XQKKQNXq1VomchuJs/HgUB3+StIoahHVWZhh6Zh1/NDAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC51bmIuY2GGIWh0dHBzOi8vaWRwLnVuYi5jYS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUfdegQvD/Wf4gdypoSF5P5uf7wgMwDQYJKoZIhvcNAQEF
-BQADggEBAAf9zd3zkHwTKRx4diCWjHjDqZ4cmekaxJbUItp3E/ZfYbvcT0oKITo/
-CKYAvXcvDL9XiWiwGz9MVAkRCr0OLb2WALMaCOiyZ3FkirikLpQX8h9CmDDkuNve
-Lf3ZA4GUkzJmNHpkFLemP36ydh5pGX15KGZTcGFG+Nhz+MkIzsX/Pz19vZrwBWTM
-+05mnaEgn6qX0gkJw56+5xFNz9plDLGkVpSCv//0zHuLfzS6RfVwFptXIQx31G1E
-ogRrXrUfW1k3AD9hY0/YNIIZ8JO3rSRyGr1MEnIIeQ0abZEmF5Nrhje/G1n/scq9
-NGM3l0dquBRhq0MP6DY4/L0lLn87h2M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unb.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unb.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unb.ca/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unb.ca/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unb.ca/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.unb.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unb.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unb.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unb.ca/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unb.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIURLDfhqryV9GxVrS3QEZfziUWRGAwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLnVuYi5jYTAeFw0xMTA4MjUxNjM1MjdaFw0zMTA4
-MjUxNjM1MjdaMBUxEzARBgNVBAMTCmlkcC51bmIuY2EwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCXvPrW/Udu8RmKI/7vI3LsayG3yJhEMgcZ9KswHZ3x
-dE7avwIwE20brD2fEMmt46SKCRUF9shpZslaahGTq0jor5dvLUY2lG3B7R5fsTAe
-s69wNRrsx1QSw7ACTbv9rfURSzIn0iUeDCOVIcCp9Ol5Cr3uN5POmaQ2F+xVfVOT
-TbZ8dQcrFHq19Fs3la3izkYCq1490VwQqA6QEsCpDXMRUEfe4MZNl+OLms1MMJr+
-gTvL6SPYJb03sygLnVQJ+1xVuEAS2zfe0/mvo1ef1Vnn+52nxup96CJXdYKX5QjT
-6XQKKQNXq1VomchuJs/HgUB3+StIoahHVWZhh6Zh1/NDAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC51bmIuY2GGIWh0dHBzOi8vaWRwLnVuYi5jYS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUfdegQvD/Wf4gdypoSF5P5uf7wgMwDQYJKoZIhvcNAQEF
-BQADggEBAAf9zd3zkHwTKRx4diCWjHjDqZ4cmekaxJbUItp3E/ZfYbvcT0oKITo/
-CKYAvXcvDL9XiWiwGz9MVAkRCr0OLb2WALMaCOiyZ3FkirikLpQX8h9CmDDkuNve
-Lf3ZA4GUkzJmNHpkFLemP36ydh5pGX15KGZTcGFG+Nhz+MkIzsX/Pz19vZrwBWTM
-+05mnaEgn6qX0gkJw56+5xFNz9plDLGkVpSCv//0zHuLfzS6RfVwFptXIQx31G1E
-ogRrXrUfW1k3AD9hY0/YNIIZ8JO3rSRyGr1MEnIIeQ0abZEmF5Nrhje/G1n/scq9
-NGM3l0dquBRhq0MP6DY4/L0lLn87h2M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unb.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unb.ca/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of New Brunswick</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of New Brunswick</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unb.ca</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>UNB Information Technology Services Help Desk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@unb.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml b/swamid-interfederations-2.0/idp.ung.si-idp-20111102.xml
deleted file mode 100644
index f564017d..00000000
--- a/swamid-interfederations-2.0/idp.ung.si-idp-20111102.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.ung.si/idp/20111102">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2015-10-22T11:10:11Z">
-      <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">ung.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Nova Gorica</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Univerza v Novi Gorici</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization University of Nova Gorica</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Novi Gorici</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization University of Nova Gorica</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Novi Gorici</mdui:Keywords>
-        <mdui:Logo height="261" width="258">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.ung.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.ung.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>MIIEAzCCAesCCQCtysqpxJq6zjANBgkqhkiG9w0BAQUFADAsMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMQ8wDQYDVQQDEwZVTkcgQ0EwHhcNMTExMTA0MDc1MDEzWhcNMTYxMTA0MDc1MDEzWjBbMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMT4wPAYDVQQDEzVVbml2ZXJ6YSB2IE5vdmkgR29yaWNpLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK1b/loWRHNHNP50OwxJc+M9cAprnU6R1/ewOdTmR+GbBTWKrfNrQEkDeb7YZjCPtuiziFm0oijk6wkZfoKg5tCHGCIG6dQydXKl0Y+CkGlAOFxag1NFjG4Oliu0sM5kh+7mYkQtCNb2G98GMJe+DDJYZ5LYLpp6X+7IYY188OwDqfgfDSTDMX6Zf+NofXb4bndjcQp3Eh0jHakxwCPmPDO99Xbek/rtq4kdVh7vh45Ffd78PNtIqZ4428AExcRHftGyDCHQu494R69s3CJ4QDudPgoBW12PTZTyJCPgdLHZOqvrtCwfEXbe3/XU7G4GI3tmrqt3gti1Rln2rF9lWTkCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAiiqcb/g6zHTY8Chb27AToSoarKz7I6CHp2T8izqcQAg5cvaCyT3PrJqxPnjPeoZFtzhdrECgMGlxjvRx5VkHMQWH+xamnG+K+8epF9KBozNURzDMt+fM2/ocXNFDV3paAHamIXB6XQl/trcXb22RTn1AqbSr9bPMk/rnOmHG8x9tajDiipUklYNxFBkJ5ya+Iy0aEx2edHB3xBjir3ftdi4x7exxJ4V721Qq6lr5l/ez6Wd5ve7id/VJGLaFhK92UQeKc3gCvLwmDfNKnpkpzOc+CWk3dzK6/6yqgxpgh6d/NAJbXWDjsIWXYx6BlKaKUKEBV5qpy2SZuhDm7GzSXbCOPeEXcLV5S+BfFB4rAObU9RSUavcY8SK/F+Jy3CgiLr4r7AV3ryjgL0r9VBW3ohD68HbPVevOdw00N+p11rWDGs4+JtHKUUhPvaMkKlIZ/9VoseAbCE5CMPyx5WJptK9RZXvukYQQ8c4F0aM/zW4Ask31PPmrbleY0FCU41NmWGMMTPuNIOisw4zF9fSYVRP2HuiRh1kcNWWruSceL/FE1c9SC5AsgrnTmpYEiF71BiJ+UhezVsyxFuOezLQn/HP/xRKhH6d2DAgd6k0EiCkKPhxbaqgeDWj4FMcSGeANdW+LFswewbiGg3eNMx9a7AXkhWjSqfVPUva1pIN34TQ=</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>MIIEAzCCAesCCQCtysqpxJq6zjANBgkqhkiG9w0BAQUFADAsMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMQ8wDQYDVQQDEwZVTkcgQ0EwHhcNMTExMTA0MDc1MDEzWhcNMTYxMTA0MDc1MDEzWjBbMQswCQYDVQQGEwJTSTEMMAoGA1UEChMDVU5HMT4wPAYDVQQDEzVVbml2ZXJ6YSB2IE5vdmkgR29yaWNpLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK1b/loWRHNHNP50OwxJc+M9cAprnU6R1/ewOdTmR+GbBTWKrfNrQEkDeb7YZjCPtuiziFm0oijk6wkZfoKg5tCHGCIG6dQydXKl0Y+CkGlAOFxag1NFjG4Oliu0sM5kh+7mYkQtCNb2G98GMJe+DDJYZ5LYLpp6X+7IYY188OwDqfgfDSTDMX6Zf+NofXb4bndjcQp3Eh0jHakxwCPmPDO99Xbek/rtq4kdVh7vh45Ffd78PNtIqZ4428AExcRHftGyDCHQu494R69s3CJ4QDudPgoBW12PTZTyJCPgdLHZOqvrtCwfEXbe3/XU7G4GI3tmrqt3gti1Rln2rF9lWTkCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAiiqcb/g6zHTY8Chb27AToSoarKz7I6CHp2T8izqcQAg5cvaCyT3PrJqxPnjPeoZFtzhdrECgMGlxjvRx5VkHMQWH+xamnG+K+8epF9KBozNURzDMt+fM2/ocXNFDV3paAHamIXB6XQl/trcXb22RTn1AqbSr9bPMk/rnOmHG8x9tajDiipUklYNxFBkJ5ya+Iy0aEx2edHB3xBjir3ftdi4x7exxJ4V721Qq6lr5l/ez6Wd5ve7id/VJGLaFhK92UQeKc3gCvLwmDfNKnpkpzOc+CWk3dzK6/6yqgxpgh6d/NAJbXWDjsIWXYx6BlKaKUKEBV5qpy2SZuhDm7GzSXbCOPeEXcLV5S+BfFB4rAObU9RSUavcY8SK/F+Jy3CgiLr4r7AV3ryjgL0r9VBW3ohD68HbPVevOdw00N+p11rWDGs4+JtHKUUhPvaMkKlIZ/9VoseAbCE5CMPyx5WJptK9RZXvukYQQ8c4F0aM/zW4Ask31PPmrbleY0FCU41NmWGMMTPuNIOisw4zF9fSYVRP2HuiRh1kcNWWruSceL/FE1c9SC5AsgrnTmpYEiF71BiJ+UhezVsyxFuOezLQn/HP/xRKhH6d2DAgd6k0EiCkKPhxbaqgeDWj4FMcSGeANdW+LFswewbiGg3eNMx9a7AXkhWjSqfVPUva1pIN34TQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ung.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.ung.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Univerza v Novi Gorici</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Univerza v Novi Gorici</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Univerza v Novi Gorici</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Univerza v Novi Gorici</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ung.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.ung.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Danilo</md:GivenName>
-    <md:SurName>Zavrtanik</md:SurName>
-    <md:EmailAddress>mailto:danilo.zavrtanik@ung.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:bojan.korecic@ung.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bojan</md:GivenName>
-    <md:SurName>Korečič</md:SurName>
-    <md:EmailAddress>mailto:bojan.korecic@ung.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-bremen.de.xml b/swamid-interfederations-2.0/idp.uni-bremen.de.xml
deleted file mode 100644
index f2971319..00000000
--- a/swamid-interfederations-2.0/idp.uni-bremen.de.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-bremen.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-bremen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-bremen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-bremen.de,OU=Zentrum fuer Netze,O=Universitaet Bremen,L=Bremen,ST=Bremen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIEEeC7EjANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQnJlbWVuMQ8wDQYDVQQHEwZCcmVtZW4xHDAaBgNVBAoTE1Vu
-aXZlcnNpdGFldCBCcmVtZW4xHzAdBgNVBAMTFlVuaXZlcnNpdGFldCBCcmVtZW4g
-Q0EwHhcNMTEwNTA0MTE1MDI2WhcNMTYwNDA3MTE1MDI2WjCBhjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJyZW1lbjEPMA0GA1UEBxMGQnJlbWVuMRwwGgYDVQQKExNV
-bml2ZXJzaXRhZXQgQnJlbWVuMRswGQYDVQQLExJaZW50cnVtIGZ1ZXIgTmV0emUx
-GjAYBgNVBAMTEWlkcC51bmktYnJlbWVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEApaY06TS1aw15pSqeKBc5LicSB5al2zEGFe8Ag6htRduRvhKQ
-e/UeX5NbLUBy4dfzJHOGN3nC+9sY1d2+KVQhSy5PMdMwFp5uw9l5tbdp1skmAzT3
-u/JhZm4w6AtJrNg/XNsia85zmYb7MEwupApg1LHWv22GUeEaVKUifizsIMJJcmht
-FEkdZoGRhnrxa9VMk4bc9yczp94HWKkNEDSMrs1GF6tkbuYBcUuMlSbfTaokyBRf
-5VFWIcyBNH/UBMYEJwvY3E8yGwCyaazNvqz88vKk+XciVLQBQrO4R5jqH3GOfbMO
-8/llxsEpANKAQvw14CpF0mMCeEb2SuSDYNsi/wIDAQABo4ICMjCCAi4wCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBTk6oB1ISuGvHfp94oq2VEvftpafDAfBgNVHSMEGDAWgBTky8Ts
-edDfrm6skomunUkvxeWYQTCBiQYDVR0RBIGBMH+CEWlkcC51bmktYnJlbWVuLmRl
-ghJpZHAxLnVuaS1icmVtZW4uZGWCEmlkcDIudW5pLWJyZW1lbi5kZYISaWRwMy51
-bmktYnJlbWVuLmRlhwSGZhQZhihodHRwczovL2lkcC51bmktYnJlbWVuLmRlL2lk
-cC9zaGliYm9sZXRoMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1icmVtZW4tY2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiGNmh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-RgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALNUmLvk
-7NLulNhseHToJtgNE5TiXz6UqIWDtcukfBOrE9ThbdsnrP/93tfAM9S1MFDTNdlX
-dtrMhi7qbI8CyrN6r634hHu4GVCvFWCJvAhRPP+sGnhHeRKFm7z8N7suQ/qXzBPF
-oGAKYaQ0KNtILHt+tv6P3/NhLm3J9U/fpw/MG1E0hPbscJw87fT++MXjHO5FjzTw
-K+Ye1zxNgxBGY50+z5zS3BaNMztSjVgIZEzKg3VtPJwoKcbmKlkgkB/L7yn4xfxk
-YZZqgqqd8RkVkuWNPitwW6SDFD1Lcz4Wsqb1aslOVfwzLD6JLaVM+8GNqlsTWfJv
-WrtCKL4uiSA/ovg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-bremen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-bremen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-bremen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-bremen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-bremen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-bremen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-bremen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-bremen.de,OU=Zentrum fuer Netze,O=Universitaet Bremen,L=Bremen,ST=Bremen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFpzCCBI+gAwIBAgIEEeC7EjANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQnJlbWVuMQ8wDQYDVQQHEwZCcmVtZW4xHDAaBgNVBAoTE1Vu
-aXZlcnNpdGFldCBCcmVtZW4xHzAdBgNVBAMTFlVuaXZlcnNpdGFldCBCcmVtZW4g
-Q0EwHhcNMTEwNTA0MTE1MDI2WhcNMTYwNDA3MTE1MDI2WjCBhjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJyZW1lbjEPMA0GA1UEBxMGQnJlbWVuMRwwGgYDVQQKExNV
-bml2ZXJzaXRhZXQgQnJlbWVuMRswGQYDVQQLExJaZW50cnVtIGZ1ZXIgTmV0emUx
-GjAYBgNVBAMTEWlkcC51bmktYnJlbWVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEApaY06TS1aw15pSqeKBc5LicSB5al2zEGFe8Ag6htRduRvhKQ
-e/UeX5NbLUBy4dfzJHOGN3nC+9sY1d2+KVQhSy5PMdMwFp5uw9l5tbdp1skmAzT3
-u/JhZm4w6AtJrNg/XNsia85zmYb7MEwupApg1LHWv22GUeEaVKUifizsIMJJcmht
-FEkdZoGRhnrxa9VMk4bc9yczp94HWKkNEDSMrs1GF6tkbuYBcUuMlSbfTaokyBRf
-5VFWIcyBNH/UBMYEJwvY3E8yGwCyaazNvqz88vKk+XciVLQBQrO4R5jqH3GOfbMO
-8/llxsEpANKAQvw14CpF0mMCeEb2SuSDYNsi/wIDAQABo4ICMjCCAi4wCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBTk6oB1ISuGvHfp94oq2VEvftpafDAfBgNVHSMEGDAWgBTky8Ts
-edDfrm6skomunUkvxeWYQTCBiQYDVR0RBIGBMH+CEWlkcC51bmktYnJlbWVuLmRl
-ghJpZHAxLnVuaS1icmVtZW4uZGWCEmlkcDIudW5pLWJyZW1lbi5kZYISaWRwMy51
-bmktYnJlbWVuLmRlhwSGZhQZhihodHRwczovL2lkcC51bmktYnJlbWVuLmRlL2lk
-cC9zaGliYm9sZXRoMIGFBgNVHR8EfjB8MDygOqA4hjZodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3VuaS1icmVtZW4tY2EvcHViL2NybC9jYWNybC5jcmwwPKA6oDiGNmh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-RgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWJyZW1lbi1j
-YS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALNUmLvk
-7NLulNhseHToJtgNE5TiXz6UqIWDtcukfBOrE9ThbdsnrP/93tfAM9S1MFDTNdlX
-dtrMhi7qbI8CyrN6r634hHu4GVCvFWCJvAhRPP+sGnhHeRKFm7z8N7suQ/qXzBPF
-oGAKYaQ0KNtILHt+tv6P3/NhLm3J9U/fpw/MG1E0hPbscJw87fT++MXjHO5FjzTw
-K+Ye1zxNgxBGY50+z5zS3BaNMztSjVgIZEzKg3VtPJwoKcbmKlkgkB/L7yn4xfxk
-YZZqgqqd8RkVkuWNPitwW6SDFD1Lcz4Wsqb1aslOVfwzLD6JLaVM+8GNqlsTWfJv
-WrtCKL4uiSA/ovg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-bremen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-bremen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Bremen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Bremen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-bremen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Christian</GivenName>
-    <SurName>Schlittchen</SurName>
-    <EmailAddress>schlittchen@uni-bremen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Christian</GivenName>
-    <SurName>Schlittchen</SurName>
-    <EmailAddress>schlittchen@uni-bremen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-duesseldorf.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uni-duesseldorf.de-idp-shibboleth.xml
deleted file mode 100644
index 1d6ec2db..00000000
--- a/swamid-interfederations-2.0/idp.uni-duesseldorf.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-duesseldorf.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-09-18T07:49:55Z">
-      <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>
-  </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-duesseldorf.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhu.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Heinrich-Heine-Universität Düsseldorf</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Heinrich Heine University Duesseldorf</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identitätsprovider der Heinrich-Heine-Universität Düsseldorf</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider of Heinrich Heine University Duesseldorf</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp.uni-duesseldorf.de/idp/images/hhu_small.jpg</mdui:Logo>
-        <mdui:Logo height="85" width="170">https://idp.uni-duesseldorf.de/idp/images/hhu_large.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.zim.hhu.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.zim.hhu.de/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-duesseldorf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=idm@uni-duesseldorf.de,CN=idp.uni-duesseldorf.de,OU=ZIM,O=Heinrich-Heine-Universitaet Duesseldorf,L=Duesseldorf,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGeTCCBWGgAwIBAgIHGHBqep37LTANBgkqhkiG9w0BAQsFADCBujELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xFDASBgNVBAcTC0R1
-ZXNzZWxkb3JmMTAwLgYDVQQKEydIZWlucmljaC1IZWluZS1Vbml2ZXJzaXRhZXQg
-RHVlc3NlbGRvcmYxHzAdBgNVBAMTFlVuaSBEdWVzc2VsZG9yZiBDQS1HMDExJDAi
-BgkqhkiG9w0BCQEWFWNhQHVuaS1kdWVzc2VsZG9yZi5kZTAeFw0xNDEwMjkxMzM0
-MzRaFw0xOTA3MDkyMzU5MDBaMIHJMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEUMBIGA1UEBxMLRHVlc3NlbGRvcmYxMDAuBgNVBAoT
-J0hlaW5yaWNoLUhlaW5lLVVuaXZlcnNpdGFldCBEdWVzc2VsZG9yZjEMMAoGA1UE
-CxMDWklNMR8wHQYDVQQDExZpZHAudW5pLWR1ZXNzZWxkb3JmLmRlMSUwIwYJKoZI
-hvcNAQkBFhZpZG1AdW5pLWR1ZXNzZWxkb3JmLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA02o/RtOmMfJ9oYeKeWnVen4dpeC9Z/Xw+OuS5U/AG96L
-J5LsDeawFqaa2uxFk54b6I1T4UfkqQhQwDfRbs9skxvRedZ9QvIR8h5kN52n2uCR
-+2suaJlIvm0CFW3H3BJzhL16c5FlcW2zv33yQ7lk102SVdbT9kstIAbDqIx5V9ZL
-YFkzp0vWY9IZtCuDyn1oIGbpa/dTht6bnEXzVzunHAShG7awIavyQVwkffUY8ANm
-n9eC0sPNSS/Mo+0SqTXpF9m8wLQolzWWR2ayf3erIjdSUoksFz51RoBiZEXWfc6V
-wcy04jcevtzxEVhwkGtBrGGs/b/Xbag5CulKq0dYNQIDAQABo4ICcTCCAm0wTwYD
-VR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwIwEQYPKwYBBAGBrSGCLAIBBAMBMA8G
-DSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTs
-qjYjqu7ME4scVV7DzqCZ+O4cqjAfBgNVHSMEGDAWgBRiJDGEoq+HMAJ+zY9xW/aE
-tUrsNjAtBgNVHREEJjAkggppZHAuaGh1LmRlghZpZHAudW5pLWR1ZXNzZWxkb3Jm
-LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-dW5pLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9hjtodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCB3wYIKwYBBQUHAQEEgdIwgc8wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9v
-Y3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBLBggrBgEFBQcwAoY/aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktZHVlc3NlbGRvcmYtY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1kdWVzc2VsZG9yZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQELBQADggEBAGyu507qz3NE4TOA0CaOWYcIDtTZln41LKKp8xDLGc6S/nxO
-67Gyb/5SX0+0YwNS1m9x/5kgm7PMMJdwoFXbHSFUtA+zRVssZi8+BXWWZ85yxsbe
-xaFVlONzNoh+96g4OuBcqF6GeucvbEGq4iK2ykrwtbMDGGa3hmdpJHOc4oMDekd6
-7VO+rxyCKR+jhvpqF+Q0HnyGcli8SA9daLKfiy3Kp9OL8CzUvqR3AIuhIN7czdTA
-t6iqz+gCv/iBNnJ32dJNew2DWXZ103juUzHzg8KQ5TzDjJ5XmgVoV3WN9BXuHE3Q
-N/n/b6C9FbOgHlMhI2gC2I3nmP5ruJ5JTH+SS8o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duesseldorf.de: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.uni-duesseldorf.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-duesseldorf.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duesseldorf.de/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-duesseldorf.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhu.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-duesseldorf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=idm@uni-duesseldorf.de,CN=idp.uni-duesseldorf.de,OU=ZIM,O=Heinrich-Heine-Universitaet Duesseldorf,L=Duesseldorf,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGeTCCBWGgAwIBAgIHGHBqep37LTANBgkqhkiG9w0BAQsFADCBujELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xFDASBgNVBAcTC0R1
-ZXNzZWxkb3JmMTAwLgYDVQQKEydIZWlucmljaC1IZWluZS1Vbml2ZXJzaXRhZXQg
-RHVlc3NlbGRvcmYxHzAdBgNVBAMTFlVuaSBEdWVzc2VsZG9yZiBDQS1HMDExJDAi
-BgkqhkiG9w0BCQEWFWNhQHVuaS1kdWVzc2VsZG9yZi5kZTAeFw0xNDEwMjkxMzM0
-MzRaFw0xOTA3MDkyMzU5MDBaMIHJMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEUMBIGA1UEBxMLRHVlc3NlbGRvcmYxMDAuBgNVBAoT
-J0hlaW5yaWNoLUhlaW5lLVVuaXZlcnNpdGFldCBEdWVzc2VsZG9yZjEMMAoGA1UE
-CxMDWklNMR8wHQYDVQQDExZpZHAudW5pLWR1ZXNzZWxkb3JmLmRlMSUwIwYJKoZI
-hvcNAQkBFhZpZG1AdW5pLWR1ZXNzZWxkb3JmLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA02o/RtOmMfJ9oYeKeWnVen4dpeC9Z/Xw+OuS5U/AG96L
-J5LsDeawFqaa2uxFk54b6I1T4UfkqQhQwDfRbs9skxvRedZ9QvIR8h5kN52n2uCR
-+2suaJlIvm0CFW3H3BJzhL16c5FlcW2zv33yQ7lk102SVdbT9kstIAbDqIx5V9ZL
-YFkzp0vWY9IZtCuDyn1oIGbpa/dTht6bnEXzVzunHAShG7awIavyQVwkffUY8ANm
-n9eC0sPNSS/Mo+0SqTXpF9m8wLQolzWWR2ayf3erIjdSUoksFz51RoBiZEXWfc6V
-wcy04jcevtzxEVhwkGtBrGGs/b/Xbag5CulKq0dYNQIDAQABo4ICcTCCAm0wTwYD
-VR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwIwEQYPKwYBBAGBrSGCLAIBBAMBMA8G
-DSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTs
-qjYjqu7ME4scVV7DzqCZ+O4cqjAfBgNVHSMEGDAWgBRiJDGEoq+HMAJ+zY9xW/aE
-tUrsNjAtBgNVHREEJjAkggppZHAuaGh1LmRlghZpZHAudW5pLWR1ZXNzZWxkb3Jm
-LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-dW5pLWR1ZXNzZWxkb3JmLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9hjtodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWVzc2VsZG9yZi1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCB3wYIKwYBBQUHAQEEgdIwgc8wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9v
-Y3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBLBggrBgEFBQcwAoY/aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktZHVlc3NlbGRvcmYtY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1kdWVzc2VsZG9yZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQELBQADggEBAGyu507qz3NE4TOA0CaOWYcIDtTZln41LKKp8xDLGc6S/nxO
-67Gyb/5SX0+0YwNS1m9x/5kgm7PMMJdwoFXbHSFUtA+zRVssZi8+BXWWZ85yxsbe
-xaFVlONzNoh+96g4OuBcqF6GeucvbEGq4iK2ykrwtbMDGGa3hmdpJHOc4oMDekd6
-7VO+rxyCKR+jhvpqF+Q0HnyGcli8SA9daLKfiy3Kp9OL8CzUvqR3AIuhIN7czdTA
-t6iqz+gCv/iBNnJ32dJNew2DWXZ103juUzHzg8KQ5TzDjJ5XmgVoV3WN9BXuHE3Q
-N/n/b6C9FbOgHlMhI2gC2I3nmP5ruJ5JTH+SS8o=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duesseldorf.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duesseldorf.de: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">e399</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e399</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Heinrich-Heine-Universität Düsseldorf</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Heinrich Heine University Duesseldorf</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-duesseldorf.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-duesseldorf.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Heide</md:GivenName>
-    <md:SurName>Unteregge</md:SurName>
-    <md:EmailAddress>mailto:unteregge@uni-duesseldorf.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Heide</md:GivenName>
-    <md:SurName>Unteregge</md:SurName>
-    <md:EmailAddress>mailto:unteregge@uni-duesseldorf.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Heide</md:GivenName>
-    <md:SurName>Unteregge</md:SurName>
-    <md:EmailAddress>mailto:unteregge@uni-duesseldorf.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml
deleted file mode 100644
index eaabd1d0..00000000
--- a/swamid-interfederations-2.0/idp.uni-duisburg-essen.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-duisburg-essen.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35: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>
-  </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-duisburg-essen.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Duisburg-Essen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Duisburg-Essen</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider fuer Studenten und Mitarbeiter der Universität Duisburg-Essen</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider fuer Studenten und Mitarbeiter der Universität Duisburg-Essen</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.uni-duisburg-essen.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uni-duisburg-essen.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
-BhMCREUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMG
-A1UECxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5z
-dGUxLDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAx
-MSwwKgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAe
-Fw0xNTA4MTMwOTQ4MjBaFw0xODExMDkwOTQ4MjBaMIGFMQswCQYDVQQGEwJERTEc
-MBoGA1UECAwTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBwwFRXNzZW4xJDAi
-BgNVBAoMG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjEiMCAGA1UEAwwZaWRw
-LnVuaS1kdWlzYnVyZy1lc3Nlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAPYxdTta36EMhfGe9g5snaPVXrg7VUXj0KohGzj2PQGcmreDwb3pqMwd
-YpCTD0jmKi2Il+df0uIW6lPYzKQvVy2GoJLnIJrLz+UuBWGlj7lZtxLDllKFvLUv
-ZB58fc7EZrvnHODaAY2/mXX1zFbwtTbAq91uErIooWPZEtCMXt0oHhjFRVz6gaqF
-VvcWlasEcnveHjPD5ZilWCMWUhalcuLURt+6gcMzpKpHM2poH6QymtQHjXQmUFLT
-6ikiUtk5C/MfNviX0e+nuZXiNAxAGscnO+kDznLr4iutD9IvMCZY68USNQ+yPZSf
-twW6PI5MAZDv8phHZcFkHpiBl5kdhyMCAwEAAaOCApQwggKQME8GA1UdIARIMEYw
-EQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGt
-IYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUC3achFOfoF8m
-qnA/AMvi9mTK0iUwHwYDVR0jBBgwFoAUZma8lptITejdvCKnplvVqEGfle4wRAYD
-VR0RBD0wO4IeaWRwLXRlc3QudW5pLWR1aXNidXJnLWVzc2VuLmRlghlpZHAudW5p
-LWR1aXNidXJnLWVzc2VuLmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMESgQqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVy
-Zy1lc3Nlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB5QYIKwYBBQUHAQEEgdgwgdUw
-MwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIv
-T0NTUDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZHVp
-c2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0ME4GCCsGAQUFBzAC
-hkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAGqv6YwBfi0t
-l+xU4j5lSytDXmBnAwvqjKLCaVaNKXOpkW97XcmDBBa+XB3cHVjvicgf8we9A8B4
-MnlA6o3+2mcoDtFk6j3E0z9EvTf9FaAa+M8u28JE/RE+VwT21veOF/b4aLE/XSwQ
-qIDyfPdvY+kYATFv/XuUoyGmtUvpINaJezXlHfDKsk+pRwDvlF2F33Be/jbh5mch
-kUClngQ+XJSgGU0rc/et5DmyplFDub8Kgl0dURKLy1tJbKj7/21ko/T4chk55W6E
-gsctyyyIuoNRxHENi9rRHT7Imnpn57z5upnrmeim2LGxwd+7qOdMGeM8XqbjFN0H
-BkqqyY3eD4M=
-</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>idp.uni-duisburg-essen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
-BhMCREUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMG
-A1UECxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5z
-dGUxLDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAx
-MSwwKgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAe
-Fw0xNTA4MTMwOTQ4MjBaFw0xODExMDkwOTQ4MjBaMIGFMQswCQYDVQQGEwJERTEc
-MBoGA1UECAwTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBwwFRXNzZW4xJDAi
-BgNVBAoMG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjEiMCAGA1UEAwwZaWRw
-LnVuaS1kdWlzYnVyZy1lc3Nlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAPYxdTta36EMhfGe9g5snaPVXrg7VUXj0KohGzj2PQGcmreDwb3pqMwd
-YpCTD0jmKi2Il+df0uIW6lPYzKQvVy2GoJLnIJrLz+UuBWGlj7lZtxLDllKFvLUv
-ZB58fc7EZrvnHODaAY2/mXX1zFbwtTbAq91uErIooWPZEtCMXt0oHhjFRVz6gaqF
-VvcWlasEcnveHjPD5ZilWCMWUhalcuLURt+6gcMzpKpHM2poH6QymtQHjXQmUFLT
-6ikiUtk5C/MfNviX0e+nuZXiNAxAGscnO+kDznLr4iutD9IvMCZY68USNQ+yPZSf
-twW6PI5MAZDv8phHZcFkHpiBl5kdhyMCAwEAAaOCApQwggKQME8GA1UdIARIMEYw
-EQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGt
-IYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUC3achFOfoF8m
-qnA/AMvi9mTK0iUwHwYDVR0jBBgwFoAUZma8lptITejdvCKnplvVqEGfle4wRAYD
-VR0RBD0wO4IeaWRwLXRlc3QudW5pLWR1aXNidXJnLWVzc2VuLmRlghlpZHAudW5p
-LWR1aXNidXJnLWVzc2VuLmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMESgQqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVy
-Zy1lc3Nlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB5QYIKwYBBQUHAQEEgdgwgdUw
-MwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIv
-T0NTUDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZHVp
-c2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0ME4GCCsGAQUFBzAC
-hkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAGqv6YwBfi0t
-l+xU4j5lSytDXmBnAwvqjKLCaVaNKXOpkW97XcmDBBa+XB3cHVjvicgf8we9A8B4
-MnlA6o3+2mcoDtFk6j3E0z9EvTf9FaAa+M8u28JE/RE+VwT21veOF/b4aLE/XSwQ
-qIDyfPdvY+kYATFv/XuUoyGmtUvpINaJezXlHfDKsk+pRwDvlF2F33Be/jbh5mch
-kUClngQ+XJSgGU0rc/et5DmyplFDub8Kgl0dURKLy1tJbKj7/21ko/T4chk55W6E
-gsctyyyIuoNRxHENi9rRHT7Imnpn57z5upnrmeim2LGxwd+7qOdMGeM8XqbjFN0H
-BkqqyY3eD4M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-duisburg-essen.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duisburg-essen.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duisburg-essen.de/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-duisburg-essen.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
-BhMCREUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMG
-A1UECxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5z
-dGUxLDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAx
-MSwwKgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAe
-Fw0xNTA4MTMwOTQ4MjBaFw0xODExMDkwOTQ4MjBaMIGFMQswCQYDVQQGEwJERTEc
-MBoGA1UECAwTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBwwFRXNzZW4xJDAi
-BgNVBAoMG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjEiMCAGA1UEAwwZaWRw
-LnVuaS1kdWlzYnVyZy1lc3Nlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAPYxdTta36EMhfGe9g5snaPVXrg7VUXj0KohGzj2PQGcmreDwb3pqMwd
-YpCTD0jmKi2Il+df0uIW6lPYzKQvVy2GoJLnIJrLz+UuBWGlj7lZtxLDllKFvLUv
-ZB58fc7EZrvnHODaAY2/mXX1zFbwtTbAq91uErIooWPZEtCMXt0oHhjFRVz6gaqF
-VvcWlasEcnveHjPD5ZilWCMWUhalcuLURt+6gcMzpKpHM2poH6QymtQHjXQmUFLT
-6ikiUtk5C/MfNviX0e+nuZXiNAxAGscnO+kDznLr4iutD9IvMCZY68USNQ+yPZSf
-twW6PI5MAZDv8phHZcFkHpiBl5kdhyMCAwEAAaOCApQwggKQME8GA1UdIARIMEYw
-EQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGt
-IYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUC3achFOfoF8m
-qnA/AMvi9mTK0iUwHwYDVR0jBBgwFoAUZma8lptITejdvCKnplvVqEGfle4wRAYD
-VR0RBD0wO4IeaWRwLXRlc3QudW5pLWR1aXNidXJnLWVzc2VuLmRlghlpZHAudW5p
-LWR1aXNidXJnLWVzc2VuLmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMESgQqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVy
-Zy1lc3Nlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB5QYIKwYBBQUHAQEEgdgwgdUw
-MwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIv
-T0NTUDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZHVp
-c2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0ME4GCCsGAQUFBzAC
-hkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAGqv6YwBfi0t
-l+xU4j5lSytDXmBnAwvqjKLCaVaNKXOpkW97XcmDBBa+XB3cHVjvicgf8we9A8B4
-MnlA6o3+2mcoDtFk6j3E0z9EvTf9FaAa+M8u28JE/RE+VwT21veOF/b4aLE/XSwQ
-qIDyfPdvY+kYATFv/XuUoyGmtUvpINaJezXlHfDKsk+pRwDvlF2F33Be/jbh5mch
-kUClngQ+XJSgGU0rc/et5DmyplFDub8Kgl0dURKLy1tJbKj7/21ko/T4chk55W6E
-gsctyyyIuoNRxHENi9rRHT7Imnpn57z5upnrmeim2LGxwd+7qOdMGeM8XqbjFN0H
-BkqqyY3eD4M=
-</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>idp.uni-duisburg-essen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,L=Essen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGZDCCBUygAwIBAgIHGevldPoM5DANBgkqhkiG9w0BAQsFADCBxjELMAkGA1UE
-BhMCREUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMG
-A1UECxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5z
-dGUxLDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAx
-MSwwKgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAe
-Fw0xNTA4MTMwOTQ4MjBaFw0xODExMDkwOTQ4MjBaMIGFMQswCQYDVQQGEwJERTEc
-MBoGA1UECAwTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBwwFRXNzZW4xJDAi
-BgNVBAoMG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjEiMCAGA1UEAwwZaWRw
-LnVuaS1kdWlzYnVyZy1lc3Nlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAPYxdTta36EMhfGe9g5snaPVXrg7VUXj0KohGzj2PQGcmreDwb3pqMwd
-YpCTD0jmKi2Il+df0uIW6lPYzKQvVy2GoJLnIJrLz+UuBWGlj7lZtxLDllKFvLUv
-ZB58fc7EZrvnHODaAY2/mXX1zFbwtTbAq91uErIooWPZEtCMXt0oHhjFRVz6gaqF
-VvcWlasEcnveHjPD5ZilWCMWUhalcuLURt+6gcMzpKpHM2poH6QymtQHjXQmUFLT
-6ikiUtk5C/MfNviX0e+nuZXiNAxAGscnO+kDznLr4iutD9IvMCZY68USNQ+yPZSf
-twW6PI5MAZDv8phHZcFkHpiBl5kdhyMCAwEAAaOCApQwggKQME8GA1UdIARIMEYw
-EQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGt
-IYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUC3achFOfoF8m
-qnA/AMvi9mTK0iUwHwYDVR0jBBgwFoAUZma8lptITejdvCKnplvVqEGfle4wRAYD
-VR0RBD0wO4IeaWRwLXRlc3QudW5pLWR1aXNidXJnLWVzc2VuLmRlghlpZHAudW5p
-LWR1aXNidXJnLWVzc2VuLmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMESgQqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVy
-Zy1lc3Nlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB5QYIKwYBBQUHAQEEgdgwgdUw
-MwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIv
-T0NTUDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZHVp
-c2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0ME4GCCsGAQUFBzAC
-hkJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAGqv6YwBfi0t
-l+xU4j5lSytDXmBnAwvqjKLCaVaNKXOpkW97XcmDBBa+XB3cHVjvicgf8we9A8B4
-MnlA6o3+2mcoDtFk6j3E0z9EvTf9FaAa+M8u28JE/RE+VwT21veOF/b4aLE/XSwQ
-qIDyfPdvY+kYATFv/XuUoyGmtUvpINaJezXlHfDKsk+pRwDvlF2F33Be/jbh5mch
-kUClngQ+XJSgGU0rc/et5DmyplFDub8Kgl0dURKLy1tJbKj7/21ko/T4chk55W6E
-gsctyyyIuoNRxHENi9rRHT7Imnpn57z5upnrmeim2LGxwd+7qOdMGeM8XqbjFN0H
-BkqqyY3eD4M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de: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:persistent</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">e105</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e105</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Duisburg-Essen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Universität Duisburg-Essen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-duisburg-essen.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Harald</md:GivenName>
-    <md:SurName>Schüler</md:SurName>
-    <md:EmailAddress>mailto:harald.schueler@uni-duisburg-essen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Harald</md:GivenName>
-    <md:SurName>Schüler</md:SurName>
-    <md:EmailAddress>mailto:harald.schueler@uni-duisburg-essen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Burkhard</md:GivenName>
-    <md:SurName>Wald</md:SurName>
-    <md:EmailAddress>mailto:burkhard.wald@uni-duisburg-essen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Burkhard</md:GivenName>
-    <md:SurName>Wald</md:SurName>
-    <md:EmailAddress>mailto:burkhard.wald@uni-due.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-duisburg-essen.de.xml b/swamid-interfederations-2.0/idp.uni-duisburg-essen.de.xml
deleted file mode 100644
index 53d8d618..00000000
--- a/swamid-interfederations-2.0/idp.uni-duisburg-essen.de.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-duisburg-essen.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duisburg-essen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEDGNY9DANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
-ODA2MDIxMTM3MDhaFw0xMzA2MDExMTM3MDhaMFcxCzAJBgNVBAYTAkRFMSQwIgYD
-VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIjAgBgNVBAMTGWlkcC51
-bmktZHVpc2J1cmctZXNzZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQChOcaxnYqvwpY6qyN2FHLpIXuQkGwCag+soergRbfXthsoVIyXioxi8SiR
-54WydD7V+S/boc7dpsefcdo8vJ33BJPe9AKa4ENtGurimGdhaFzDVhEhVRxNjpJD
-Jby4Zab+6laoo/WG8clUoVRioKtTpcpogtHZkmQoQCjsvZLnZcEgmBirERPlXhh0
-F4Lgkg+AOUHQXDlOjlyN2H6JswHTSkBgUDLSBrT1zxta2u5fBnqrFINnGi6NeY5j
-2O0nMHQIIcA1RjTdp5oNiUAN9uLY0P7FSXpsY31+/eKdHZyP/ABBYBOkwMinp9Q9
-nnB8xPCEPifNhniWsTDb0GbgqUIfAgMBAAGjggHIMIIBxDAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFMZkLLkMWvN1pjZzM8a/egoj/Eq+MB8GA1UdIwQYMBaAFGZmvJabSE3o3bwi
-p6Zb1ahBn5XuMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESg
-QqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUH
-MAKGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeXnJnn++sAt/eGO7sQprZ7LJsc0Mt
-VbSJELiMwus1s9rWgQNTV35W7jzf3PX4HPb+rWaEoalw7zh6jeiPH1XbAG5hq+g4
-JXEofdIdZUUqFU1mbIQGRvnp3JIc6hslFLRUnjwZIXWn1B1Cem4Sz036R8tX8VYJ
-oIlQMMx2Rl5xPZnf3c5ctGtDV87zzzjqEs152oFYYnD5CLWMqb8C/otFToxCXXQ4
-RW7BFSBOLqQHJBOUI9xmQkCcUiOo9V43TKRwM5G0RqBAO46ZEWH+e1sHe5vmigK7
-/83ZA0k9/S7S27VSQp7Nr8CdOgAyuaoVCLS4UNy3xG/YrN/HaXRxk5x5
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEDGNY9DANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
-ODA2MDIxMTM3MDhaFw0xMzA2MDExMTM3MDhaMFcxCzAJBgNVBAYTAkRFMSQwIgYD
-VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIjAgBgNVBAMTGWlkcC51
-bmktZHVpc2J1cmctZXNzZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQChOcaxnYqvwpY6qyN2FHLpIXuQkGwCag+soergRbfXthsoVIyXioxi8SiR
-54WydD7V+S/boc7dpsefcdo8vJ33BJPe9AKa4ENtGurimGdhaFzDVhEhVRxNjpJD
-Jby4Zab+6laoo/WG8clUoVRioKtTpcpogtHZkmQoQCjsvZLnZcEgmBirERPlXhh0
-F4Lgkg+AOUHQXDlOjlyN2H6JswHTSkBgUDLSBrT1zxta2u5fBnqrFINnGi6NeY5j
-2O0nMHQIIcA1RjTdp5oNiUAN9uLY0P7FSXpsY31+/eKdHZyP/ABBYBOkwMinp9Q9
-nnB8xPCEPifNhniWsTDb0GbgqUIfAgMBAAGjggHIMIIBxDAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFMZkLLkMWvN1pjZzM8a/egoj/Eq+MB8GA1UdIwQYMBaAFGZmvJabSE3o3bwi
-p6Zb1ahBn5XuMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESg
-QqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUH
-MAKGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeXnJnn++sAt/eGO7sQprZ7LJsc0Mt
-VbSJELiMwus1s9rWgQNTV35W7jzf3PX4HPb+rWaEoalw7zh6jeiPH1XbAG5hq+g4
-JXEofdIdZUUqFU1mbIQGRvnp3JIc6hslFLRUnjwZIXWn1B1Cem4Sz036R8tX8VYJ
-oIlQMMx2Rl5xPZnf3c5ctGtDV87zzzjqEs152oFYYnD5CLWMqb8C/otFToxCXXQ4
-RW7BFSBOLqQHJBOUI9xmQkCcUiOo9V43TKRwM5G0RqBAO46ZEWH+e1sHe5vmigK7
-/83ZA0k9/S7S27VSQp7Nr8CdOgAyuaoVCLS4UNy3xG/YrN/HaXRxk5x5
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-duisburg-essen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-duisburg-essen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-duisburg-essen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-duisburg-essen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEDGNY9DANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
-ODA2MDIxMTM3MDhaFw0xMzA2MDExMTM3MDhaMFcxCzAJBgNVBAYTAkRFMSQwIgYD
-VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIjAgBgNVBAMTGWlkcC51
-bmktZHVpc2J1cmctZXNzZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQChOcaxnYqvwpY6qyN2FHLpIXuQkGwCag+soergRbfXthsoVIyXioxi8SiR
-54WydD7V+S/boc7dpsefcdo8vJ33BJPe9AKa4ENtGurimGdhaFzDVhEhVRxNjpJD
-Jby4Zab+6laoo/WG8clUoVRioKtTpcpogtHZkmQoQCjsvZLnZcEgmBirERPlXhh0
-F4Lgkg+AOUHQXDlOjlyN2H6JswHTSkBgUDLSBrT1zxta2u5fBnqrFINnGi6NeY5j
-2O0nMHQIIcA1RjTdp5oNiUAN9uLY0P7FSXpsY31+/eKdHZyP/ABBYBOkwMinp9Q9
-nnB8xPCEPifNhniWsTDb0GbgqUIfAgMBAAGjggHIMIIBxDAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFMZkLLkMWvN1pjZzM8a/egoj/Eq+MB8GA1UdIwQYMBaAFGZmvJabSE3o3bwi
-p6Zb1ahBn5XuMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESg
-QqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUH
-MAKGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeXnJnn++sAt/eGO7sQprZ7LJsc0Mt
-VbSJELiMwus1s9rWgQNTV35W7jzf3PX4HPb+rWaEoalw7zh6jeiPH1XbAG5hq+g4
-JXEofdIdZUUqFU1mbIQGRvnp3JIc6hslFLRUnjwZIXWn1B1Cem4Sz036R8tX8VYJ
-oIlQMMx2Rl5xPZnf3c5ctGtDV87zzzjqEs152oFYYnD5CLWMqb8C/otFToxCXXQ4
-RW7BFSBOLqQHJBOUI9xmQkCcUiOo9V43TKRwM5G0RqBAO46ZEWH+e1sHe5vmigK7
-/83ZA0k9/S7S27VSQp7Nr8CdOgAyuaoVCLS4UNy3xG/YrN/HaXRxk5x5
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-duisburg-essen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-duisburg-essen.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEDGNY9DANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
-ODA2MDIxMTM3MDhaFw0xMzA2MDExMTM3MDhaMFcxCzAJBgNVBAYTAkRFMSQwIgYD
-VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIjAgBgNVBAMTGWlkcC51
-bmktZHVpc2J1cmctZXNzZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQChOcaxnYqvwpY6qyN2FHLpIXuQkGwCag+soergRbfXthsoVIyXioxi8SiR
-54WydD7V+S/boc7dpsefcdo8vJ33BJPe9AKa4ENtGurimGdhaFzDVhEhVRxNjpJD
-Jby4Zab+6laoo/WG8clUoVRioKtTpcpogtHZkmQoQCjsvZLnZcEgmBirERPlXhh0
-F4Lgkg+AOUHQXDlOjlyN2H6JswHTSkBgUDLSBrT1zxta2u5fBnqrFINnGi6NeY5j
-2O0nMHQIIcA1RjTdp5oNiUAN9uLY0P7FSXpsY31+/eKdHZyP/ABBYBOkwMinp9Q9
-nnB8xPCEPifNhniWsTDb0GbgqUIfAgMBAAGjggHIMIIBxDAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFMZkLLkMWvN1pjZzM8a/egoj/Eq+MB8GA1UdIwQYMBaAFGZmvJabSE3o3bwi
-p6Zb1ahBn5XuMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESg
-QqBAhj5odHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUH
-MAKGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBeXnJnn++sAt/eGO7sQprZ7LJsc0Mt
-VbSJELiMwus1s9rWgQNTV35W7jzf3PX4HPb+rWaEoalw7zh6jeiPH1XbAG5hq+g4
-JXEofdIdZUUqFU1mbIQGRvnp3JIc6hslFLRUnjwZIXWn1B1Cem4Sz036R8tX8VYJ
-oIlQMMx2Rl5xPZnf3c5ctGtDV87zzzjqEs152oFYYnD5CLWMqb8C/otFToxCXXQ4
-RW7BFSBOLqQHJBOUI9xmQkCcUiOo9V43TKRwM5G0RqBAO46ZEWH+e1sHe5vmigK7
-/83ZA0k9/S7S27VSQp7Nr8CdOgAyuaoVCLS4UNy3xG/YrN/HaXRxk5x5
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-duisburg-essen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Duisburg-Essen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Duisburg-Essen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Harald</GivenName>
-    <SurName>Schüler</SurName>
-    <EmailAddress>harald.schueler@uni-duisburg-essen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Harald</GivenName>
-    <SurName>Schüler</SurName>
-    <EmailAddress>harald.schueler@uni-duisburg-essen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-konstanz.de.xml b/swamid-interfederations-2.0/idp.uni-konstanz.de.xml
deleted file mode 100644
index 40787d37..00000000
--- a/swamid-interfederations-2.0/idp.uni-konstanz.de.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-konstanz.de/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-konstanz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-konstanz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-konstanz.de,O=Universitaet Konstanz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIED95asDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE
-RTEVMBMGA1UEChMMVW5pLUtvbnN0YW56MR0wGwYDVQQDExRVbmktS29uc3Rhbnog
-Q0EtUzAwMTEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLWtvbnN0YW56LmRlMB4XDTEw
-MDQwOTA3NTQwOFoXDTEzMDQwODA3NTQwOFowSzELMAkGA1UEBhMCREUxHjAcBgNV
-BAoTFVVuaXZlcnNpdGFldCBLb25zdGFuejEcMBoGA1UEAxMTaWRwLnVuaS1rb25z
-dGFuei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPqFIvSxymhr
-6lz2hJL9NRwGwiAwnEPh6W5F3CvK2wChW0FQlbpmyrFJam4JVMN9qdNSnpLYxV3L
-8vzd1VAJPBmzUipZJCrzkxl3G7O1/UChkUqSvSqNy9WJzWLQuFG3ZmWWhLMDriqw
-JFO8iyUJFYtmLw8w/BjBTacfjrahhmMLzT9FfjoZs78cUXYHtGLcuZFVDbwIhsLE
-4dnUpM9Jtgp0aGMeZIB137z3BGerQ1dEOHyWZuvsk+Urn7fb//EFSg6SgvY1WAsv
-I6A9S4R4jHZAniKGdEFLCOKNUh9294MXsaKDYHVULDGPDUso1VKdTmk7QejbcmqQ
-psSrVTkHWdUCAwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUpaZrW4q/wc3I
-IHauUt5yoAqIIg4wHwYDVR0jBBgwFoAU2WJ0iheLXBYiYrwnDuPvGpyctUMwgZkG
-A1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29u
-c3Rhbnotc2VydmVyLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEWgQ6BBhj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NybC9j
-YWNybC5jcmwwgbIGCCsGAQUFBwEBBIGlMIGiME8GCCsGAQUFBzAChkNodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0ME8GCCsGAQUFBzAChkNodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQBG5TeDrVl0Gm+7jf0ZZ3p/wyQRbfNZXBpWkKBQUDCo
-zmtIOhZIJZa8WznJ4nTcnqFzUyqRPVBLtMFVe0Zq2gHp4fGcU0+PYJII3rSsEVPR
-MLEX8kzALplDSX1q0vaaO55AtCo620r+6z/8st9mWdOqz+YzxqFy0gbokvBZYxlE
-NVPb+UhExGi85wMybojQl/qmfZVApUg7M4NHCnml31zsYoxMXsQQ/vl/GqzPAvjg
-DGYLr4ptr/HrVJ7XgFM4Fvxov7VfoVyOzGIElj1nf8/8QwsxoLsPa0n8g6Ur2t+b
-vi0EXU9HPo7vQ7B+MtWy6TYv0Rf+10zc3CbvIT9ijl4W
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-konstanz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-konstanz.de,O=Universitaet Konstanz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIED95asDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE
-RTEVMBMGA1UEChMMVW5pLUtvbnN0YW56MR0wGwYDVQQDExRVbmktS29uc3Rhbnog
-Q0EtUzAwMTEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLWtvbnN0YW56LmRlMB4XDTEw
-MDQwOTA3NTQwOFoXDTEzMDQwODA3NTQwOFowSzELMAkGA1UEBhMCREUxHjAcBgNV
-BAoTFVVuaXZlcnNpdGFldCBLb25zdGFuejEcMBoGA1UEAxMTaWRwLnVuaS1rb25z
-dGFuei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPqFIvSxymhr
-6lz2hJL9NRwGwiAwnEPh6W5F3CvK2wChW0FQlbpmyrFJam4JVMN9qdNSnpLYxV3L
-8vzd1VAJPBmzUipZJCrzkxl3G7O1/UChkUqSvSqNy9WJzWLQuFG3ZmWWhLMDriqw
-JFO8iyUJFYtmLw8w/BjBTacfjrahhmMLzT9FfjoZs78cUXYHtGLcuZFVDbwIhsLE
-4dnUpM9Jtgp0aGMeZIB137z3BGerQ1dEOHyWZuvsk+Urn7fb//EFSg6SgvY1WAsv
-I6A9S4R4jHZAniKGdEFLCOKNUh9294MXsaKDYHVULDGPDUso1VKdTmk7QejbcmqQ
-psSrVTkHWdUCAwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUpaZrW4q/wc3I
-IHauUt5yoAqIIg4wHwYDVR0jBBgwFoAU2WJ0iheLXBYiYrwnDuPvGpyctUMwgZkG
-A1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29u
-c3Rhbnotc2VydmVyLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEWgQ6BBhj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NybC9j
-YWNybC5jcmwwgbIGCCsGAQUFBwEBBIGlMIGiME8GCCsGAQUFBzAChkNodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0ME8GCCsGAQUFBzAChkNodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQBG5TeDrVl0Gm+7jf0ZZ3p/wyQRbfNZXBpWkKBQUDCo
-zmtIOhZIJZa8WznJ4nTcnqFzUyqRPVBLtMFVe0Zq2gHp4fGcU0+PYJII3rSsEVPR
-MLEX8kzALplDSX1q0vaaO55AtCo620r+6z/8st9mWdOqz+YzxqFy0gbokvBZYxlE
-NVPb+UhExGi85wMybojQl/qmfZVApUg7M4NHCnml31zsYoxMXsQQ/vl/GqzPAvjg
-DGYLr4ptr/HrVJ7XgFM4Fvxov7VfoVyOzGIElj1nf8/8QwsxoLsPa0n8g6Ur2t+b
-vi0EXU9HPo7vQ7B+MtWy6TYv0Rf+10zc3CbvIT9ijl4W
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-konstanz.de/idp2/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-konstanz.de/idp2/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-konstanz.de/idp2/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-konstanz.de/idp2/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-konstanz.de/idp2/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-konstanz.de/idp2/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-konstanz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-konstanz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-konstanz.de,O=Universitaet Konstanz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIED95asDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE
-RTEVMBMGA1UEChMMVW5pLUtvbnN0YW56MR0wGwYDVQQDExRVbmktS29uc3Rhbnog
-Q0EtUzAwMTEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLWtvbnN0YW56LmRlMB4XDTEw
-MDQwOTA3NTQwOFoXDTEzMDQwODA3NTQwOFowSzELMAkGA1UEBhMCREUxHjAcBgNV
-BAoTFVVuaXZlcnNpdGFldCBLb25zdGFuejEcMBoGA1UEAxMTaWRwLnVuaS1rb25z
-dGFuei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPqFIvSxymhr
-6lz2hJL9NRwGwiAwnEPh6W5F3CvK2wChW0FQlbpmyrFJam4JVMN9qdNSnpLYxV3L
-8vzd1VAJPBmzUipZJCrzkxl3G7O1/UChkUqSvSqNy9WJzWLQuFG3ZmWWhLMDriqw
-JFO8iyUJFYtmLw8w/BjBTacfjrahhmMLzT9FfjoZs78cUXYHtGLcuZFVDbwIhsLE
-4dnUpM9Jtgp0aGMeZIB137z3BGerQ1dEOHyWZuvsk+Urn7fb//EFSg6SgvY1WAsv
-I6A9S4R4jHZAniKGdEFLCOKNUh9294MXsaKDYHVULDGPDUso1VKdTmk7QejbcmqQ
-psSrVTkHWdUCAwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUpaZrW4q/wc3I
-IHauUt5yoAqIIg4wHwYDVR0jBBgwFoAU2WJ0iheLXBYiYrwnDuPvGpyctUMwgZkG
-A1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29u
-c3Rhbnotc2VydmVyLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEWgQ6BBhj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NybC9j
-YWNybC5jcmwwgbIGCCsGAQUFBwEBBIGlMIGiME8GCCsGAQUFBzAChkNodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0ME8GCCsGAQUFBzAChkNodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQBG5TeDrVl0Gm+7jf0ZZ3p/wyQRbfNZXBpWkKBQUDCo
-zmtIOhZIJZa8WznJ4nTcnqFzUyqRPVBLtMFVe0Zq2gHp4fGcU0+PYJII3rSsEVPR
-MLEX8kzALplDSX1q0vaaO55AtCo620r+6z/8st9mWdOqz+YzxqFy0gbokvBZYxlE
-NVPb+UhExGi85wMybojQl/qmfZVApUg7M4NHCnml31zsYoxMXsQQ/vl/GqzPAvjg
-DGYLr4ptr/HrVJ7XgFM4Fvxov7VfoVyOzGIElj1nf8/8QwsxoLsPa0n8g6Ur2t+b
-vi0EXU9HPo7vQ7B+MtWy6TYv0Rf+10zc3CbvIT9ijl4W
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-konstanz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-konstanz.de,O=Universitaet Konstanz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIED95asDANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJE
-RTEVMBMGA1UEChMMVW5pLUtvbnN0YW56MR0wGwYDVQQDExRVbmktS29uc3Rhbnog
-Q0EtUzAwMTEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLWtvbnN0YW56LmRlMB4XDTEw
-MDQwOTA3NTQwOFoXDTEzMDQwODA3NTQwOFowSzELMAkGA1UEBhMCREUxHjAcBgNV
-BAoTFVVuaXZlcnNpdGFldCBLb25zdGFuejEcMBoGA1UEAxMTaWRwLnVuaS1rb25z
-dGFuei5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPqFIvSxymhr
-6lz2hJL9NRwGwiAwnEPh6W5F3CvK2wChW0FQlbpmyrFJam4JVMN9qdNSnpLYxV3L
-8vzd1VAJPBmzUipZJCrzkxl3G7O1/UChkUqSvSqNy9WJzWLQuFG3ZmWWhLMDriqw
-JFO8iyUJFYtmLw8w/BjBTacfjrahhmMLzT9FfjoZs78cUXYHtGLcuZFVDbwIhsLE
-4dnUpM9Jtgp0aGMeZIB137z3BGerQ1dEOHyWZuvsk+Urn7fb//EFSg6SgvY1WAsv
-I6A9S4R4jHZAniKGdEFLCOKNUh9294MXsaKDYHVULDGPDUso1VKdTmk7QejbcmqQ
-psSrVTkHWdUCAwEAAaOCAcwwggHIMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUpaZrW4q/wc3I
-IHauUt5yoAqIIg4wHwYDVR0jBBgwFoAU2WJ0iheLXBYiYrwnDuPvGpyctUMwgZkG
-A1UdHwSBkTCBjjBFoEOgQYY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkta29u
-c3Rhbnotc2VydmVyLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEWgQ6BBhj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NybC9j
-YWNybC5jcmwwgbIGCCsGAQUFBwEBBIGlMIGiME8GCCsGAQUFBzAChkNodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0ME8GCCsGAQUFBzAChkNodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L3VuaS1rb25zdGFuei1zZXJ2ZXItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQBG5TeDrVl0Gm+7jf0ZZ3p/wyQRbfNZXBpWkKBQUDCo
-zmtIOhZIJZa8WznJ4nTcnqFzUyqRPVBLtMFVe0Zq2gHp4fGcU0+PYJII3rSsEVPR
-MLEX8kzALplDSX1q0vaaO55AtCo620r+6z/8st9mWdOqz+YzxqFy0gbokvBZYxlE
-NVPb+UhExGi85wMybojQl/qmfZVApUg7M4NHCnml31zsYoxMXsQQ/vl/GqzPAvjg
-DGYLr4ptr/HrVJ7XgFM4Fvxov7VfoVyOzGIElj1nf8/8QwsxoLsPa0n8g6Ur2t+b
-vi0EXU9HPo7vQ7B+MtWy6TYv0Rf+10zc3CbvIT9ijl4W
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-konstanz.de/idp2/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-konstanz.de/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Konstanz</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Konstanz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-konstanz.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Michael</GivenName>
-    <SurName>Längle</SurName>
-    <EmailAddress>michael.laengle@uni-konstanz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Markus</GivenName>
-    <SurName>Grandpre</SurName>
-    <EmailAddress>idp@uni-konstanz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Doreen</GivenName>
-    <SurName>Liebenau</SurName>
-    <EmailAddress>idp@uni-konstanz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-lj.si-idp-20100525.xml b/swamid-interfederations-2.0/idp.uni-lj.si-idp-20100525.xml
deleted file mode 100644
index 9374d084..00000000
--- a/swamid-interfederations-2.0/idp.uni-lj.si-idp-20100525.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.uni-lj.si/idp/20100525">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-06T18:11:09Z">
-      <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 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">uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ctk.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ag.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agrft.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aluo.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bf1.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ef1.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fa.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fdv.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fe1.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ff.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffa.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fgg.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkkt1.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmf.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsp.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fri1.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fs1.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsd.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsp.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fu.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mef.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ntf.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pef.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pf.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">teof.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vf.uni-lj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zf.uni-lj.si</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Ljubljana</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Univerza v Ljubljani</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for organization University of Ljubljana</mdui:Description>
-        <mdui:Description xml:lang="sl">Ponudnik identitet organizacije Univerza v Ljubljani</mdui:Description>
-        <mdui:Keywords xml:lang="en">Identity provider for organization University of Ljubljana</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">Ponudnik identitet organizacije Univerza v Ljubljani</mdui:Keywords>
-        <mdui:Logo height="239" width="240">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPAAAADvCAYAAADM1VncAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAABXUSURBVHhe7Z3dkRS5toWLeZo3GAPOASwALAAsoLEAsAB4Ow8nArBgwIIBD8CCgbhxnwcsGLBgmvcb0Te/JBezW0hZmVWZ1b171hchulKp3y0tKaVUFZdOOjbGJOL+/fub4+PjzcePH/u/L1++3Dx+/Hi42+br1699WHj79m0fn7/37t3r/TJy6fXr1yefP38eLk9z7dq1zYMHD4arv3nx4sXw6TTPnj0bPu0ORr5582afN8a9fPnycMecBa22hjt37mxu3749XP3Ily9fNl3/2jx58mTRdvz06VPfN54/f95f03+vXr3afx5D5ZF4gQGgVrZXr171ffC8ils2oEInnSFOusIyE/euE1Dvx70a3Osa5eTKlSt9eD53I9twdz9IR+V4//794GvOCtqD9lWb4B4+fNj3gU4EQ6g66lOEXRr6JmnTV+ei+hwdHQ0+p1HauPOKtPe9hIhFhZ4qHAzRjcLD1TLQKSgDBexG1sHXnCXdLPW9byDeqShOayLYB8RH2vTBuWhgGZuguE+48wi6kG1/6v7ZGR51l+bGjRsMKpu//vpr0mORWZ/+UW2gE87waTusN3G1Zdi+qEzdgNL/nQqPnloysgSoQR07EZ+q93kCXWDXbgDqJDywywxMuKVn4Cx0jZvuCWHbI28LZl36BU9F5wFsT3l2mSG1RNvl0XsKaGJXO+/CXjNwC0a5uPnx5s2bfufw7t27m0ePHm0+fPgw3KnDRhbh9JnwNRchz/I+ccW7d+/6MlEG3NOnT3u/GsTjvqD8xI15do9uvSvzLF0JaZMe9aMc2IUNk1jWXSGdW7du9emWUB+emFp1HkMz0dTZlzxa5cAm1Pn69evNOhP/l19+6cPVUHniDMoGFTYlXxy2qNHPWh21mVtpULZtduK+2pDwlJVrykS/KIlpl2XDDvgpLcK1oO+csu0g5MVmYNYVjNT4MxIx0pHm90X34FrrD9JUHGD9xZpEfjg+lxsjpMd6iPvkxX3ikh4jNeVh5AZmTq1z8CeciPnjH/PFETfOANrQkdPaDFfahvsqG+ngFL4MOwfKSXyt7XAl3Md/7ppRdcW12iyi2VouQvx4r9XPlEarrOpLak/1OdoqtpfuC+yke+UsyXXso7RRDfUnwjKbq+/EupVxy7RjW3NP/Sj2ndI25FOz7WICJoPYgWIlRVmI8hFUnUwuQlj5tzqSGkiNI6OSZw0MHe9HA+KoA+XXYxf1UR1wfC5RGoSNnUT1Lhs32n0XKAOdlrqqvpS7REJs2aKFBkVcrb4R2UVxKJegbFzHdizbH8hDnb0UIGBTxQfSJXwMq34UhQIt+0hEMe1a3uovqkck1iu2O/5KW/FVLuUb9aY0Sg2SJ7Yt01hMwKDOrXQwWA0Kzf2yM4PEgiuROGLHiJCeOqgMKtHViHVWg8T8Y/kwttJp2SfGjXVXx6mVJZZhFygj+QJ2IZ2aXQG7t+61UFth+zEQrWyvdtIMqk5M3WWLVhtGW9XQ4EAehCVcFAxQR8LgImW5IApsrC3Uryl3rT8pT9KKEF7lU/6ElXhj2TXIlnWPtlUbq80XFTC0ChEhDmFqnWnMiEobVzYakKfKLoOTF37RUXnyVufEKR6M5dGCsIonYws6Go1XS498FW8XlGZMR4NRCfd2rZM6TAvNWHRuxVFe1F+f1Ylb6alNShsKdWA6dU280BKw/GJbYyulEQeHSBxUavlRZ+4RphwciCti/qV4QbYp616zrdp4cQErndI/IgPPFTC0GhhDxTwVjgYnn20udvqx/Gtg2JhfbYRuQUeem18NDVhl5xPYlTLOAbuobK1BoWRsAK91wEi0Rez4gji6j1PHLpEtYn8YK5dQG8a8yVPibA06Eh6uVSblTx6EL9OKtmnpTwNJbMd0AlZcjBqFQqViuZVGrSNsYyz/GrEBayN0DdlOnWZOfiWx8cc6dc3eY2i24+9UJJ5ygAUJtJYedZBQcLFtRRR4nOlKlE4MM1YuiINDzFttG0UTkTBxY4OD8idMTRuqWysfUFlivdIJOHZWiRMjlhVXmLmdFhR3CrFTlaNqDcpKB8Y+1HVbfaewrfEZVLhXE0WL2KHn2FDiqQ0kGhBqdqJzqoPytwY24z55tOqiWQoXB1OVqzWgy4ZxcIk2qMXjPnZVuVqDAyh/HPFKxmwjFD/Way8BU6lDCxg0mqnDkldpYBkkNshUtuUvMKTCtjqdoMNRTsoc7TulvtsgTeK3hIYNWjNzi5YQxoj2KIliKDsw5WZWKTsxNlPeceAeG1Bki9gesVwSflmGmoDUT2M8wTVxsJPyVB8s047518oe7ytumYZmegYCQZiqgEsxtJDhI4cQcAxDGhJyhHIpDOHnoHhj0IBqOP6WDQyyYwxbNsyU+o5Ra/wIg93YzNBCs2HNtoI2jraVzWuDWW2GA2yEX98Zi3qQnmwoO43NvsqfMNEWZbnoM1GopKe8NWAA9cOv7MuEp8ykWw4OlLMMH8tVK3tZPqUfw2rSUlsSB9uc6jWa5qc0OInTuOXILkOvKWCgggpXe+ygAVUfylnr3AJjxPtT8lcHx8VGF9hHaajz1mwS09mFljCAdiw7whRUdhy2qaF2imlrkKpNABJDbHPKrvL1nbG7r3pwHe2l/GqDAyg+bV62h/oKYUiHcsZyK245WKnMsRzEI70oJIUh31r+skutv0O0m9Lnc0Rh0Bv3ZKdTvUYVwdVEIejssRKRljEixCNMLX4UcDRyifJpjWoQ60M4rmNYjFHWg7opTkv0Eg2uZSfVETRg4TTgkTadUZ1E90gPG0xFaatBgToq7TEbtoj1KwdowI7YM+a5zW4xPdUdp/LJXqRJnfgby85n7tf6jMpLn6sNpsqb/Gph8Od+OVipbagr5abexI9loJyE4a/6WGSbXeJ91XssDcoa+/wPwz4Fldr5S6VIWE4J8DmCUQjLPWWGAWIHJ201lBzX+FMg0lTeOD6X+QjC18pRohE35ilHfJVvLH8ZC6IxcdSxdNEGoJE5xot5E0f+fI75bYO0FZfGVyfdZpcaxI1lUZqqFy7WI7atRET4GoqDi3UXMV/KUbMBHZv7xKVd6TcqE32vZTeli11qAledSC/CteLiCFfaNd4r44PsQp1qxPbDleKFOKlh31iH5k/q8OWALuD3r16JLoH+wHb5KwYcyCZ8SVex/iuCwIHuMj3oDNt/Rap2+B9av/rAgfJaWWoQNpaPPDujnoo7Jf9WPWuUde8ap/9c5k2a3KMuCj8Hyt01cv+5Vq+ptOrfItqFA/bYpevg1V9mkf1b5VMdsMGUX/kQrf4Y0ZcHusnih3CUi/LQVnyFtUTl5j7hyq+4jqUN6i+Us1VG0ugGnz6N1ldo+TINZSjz8W9imb2hk9K5gM66yyB0VvDNHwYEhPHbb78NvnlY5euE5p9F9+jY/2V2zSRe0JMLs2tGLGCzNxIwj8+Z0K9zMPBk/WVKC9jMgjUhXybnr2AWY423xk/nLAlfuo8/EqC19Mvhp2ZTwhrYmKmwC0u36da8/Y48u7/sjPL5PNOtzb/v5FIHrqlDJ+IhRE68iWVmwWMnj8rsmgJrx9YO7HmDndy4W0+5x3a8M2ABG5MYr4GNSYwFbExiLGBjEmMBG5MYC9iYxFjAxiTGAjYmMRawMYmxgI1JjAVsTGIsYGMSYwEbkxgL2JjEWMDGJMYCNiYxFrAxibGAjUmMBWxMYixgYxJjARuTGAvYmMRYwMYkxgI2JjEWsDGJsYCNSYwFbExiLGBjEmMBG5MYC9iYxFjAxiTGAjYmMRawMYmxgI1JjAVsTGIsYGMSYwEbkxgL2JjEWMDGJMYCNiYxFrAxibGAjUmMBWxMYixgYxJjARuTGAvYmMRYwMYkxgI2JjEWsDGJsYCNSYwFbExiLGBjEmMB/wO4e/fu8MlcNCxgYxJjARuTGAvYmMRYwMYkxgI2JjEWsDGJsYCNSYwFbExiLGBjEmMBG5MYC9iYxFjAxiTGAjYmMZdOOobP5oLy6dOnzY0bN4Yrc5HwDHzBefHixebJkyeb69ev90I2FwsL+ALz9evXzZ07dza///57L+LXr18Pd8xFwQJeEQR0lnz+/Hnz8ePHfhY+Pj7eXLlyZfPly5fh7uE5a3tcRCzgFXn+/Pnw6Wxg3fv48ePNw4cP+5mYGRhRnwU8vr99+3a4MkthAa8IojkPXL16dXP79u3NtWvXBp/D4020dbCAV4TH17N8ZD1vYA+zLBbwity8efNcPTbyKH2WszB4J3xZ/B54JfglyPfv3/ci/uOPPwbfw/Lhw4d+80oznza1GFR4rD4kly5d6v+yL/Ds2bP+s9kfC3glmGkQMLPe5cuXB9+z582bN/0rJUTMuvhQvHv3rv977969/q9ZBj9CrwSvbIBH1vP0+uTBgwf9wHJ0dLR59erV4Lsu1F/LiUePHg2+Zgk8A68Mj9I8Nh5ytpsCouJxGmEd6gmBPBnY3OWWwwJemUMJmEd21rsCccbriO6xJuYR/5BrUtbC7nLLYQGvzHmYgVl/8k66nGnxf/nyZX/U8lBYwMviNfA/GETNetjkxQJeGdaY2tA6bzAjUz5eNx2K83I67aLgR+iV4YsEa1KuX8vHZTaO2P1lvRvD8jqJHemnT5/2Awz3tLE1Bunsep6awcKvkZbFAl4IjkyWhyMQE+Jho2gtyrU1s2n0o1x8iYHXWQhWKNxa62DyjULnM3sBf/755+DzLQyDx3l6T54OBGz2p5u5Trr15HD1jU64J13HHa7qdJ365OjoaLj6m5b/NihHJ9jh6uTk+Pi4L0c3kAw+3yAMZeP+1G7QCb1aJtLuBojhqg1hoo3IuyyXmYfXwAvBt22YbSPMOtuOLPLoWnvd0/IXzJw1OGWlmY8wzHo4Ho3v37/fz3q8cmJWxq9cB7fSBb6aWCsTj8VTzlhzeIR8BXmXNjPzsIAXRMIBRDL10bkVbiw+4mPNWsKjMPG0tv311197kSAexM1fdp4Jp/Vo3I2mDrV0xS5lFYQpBTs2SJntWMALQmdkhgOJpkXc+dXaFNHjBP6IKfoJZs3a7EVYxI1wmRXZROOvhCt369atIcZpASP6Mt1YrnIdLWIdWgMATymUpZzla/UzExkepc0edJ2/X0fitP5kvdiCtSdr3BLidOIZrr5B2mVY5deJcvCpw3pYdIPL9zWo4gvucd1Kt1Yu4nQz+g9rfMLGfEu0jlZeuJotzDQs4AWgM0sYdGgcn1twn04cN5uAON0MOFx9AzEgvDFRTAWh4CSeqdTKRZ1JqxQ7Qqe8Lag7ectGOD6b3fAj9ALoNUjXob9v0owdnWRji0fgruMOPt8gTieM4eobeuyM/jxy8q0ejmkuCemy0VWmWysXdebRu/RnXV3WK0Ldu37X/+VxPdrMzMcCXgg6uU4Zbdt53hdEPWXTaC6ky0bXoSA/2czshgX8D4JXU/E0lsmPBXxGtMTE42UJr3zGHslbsEvMLrQcxyfZJSetWj5j1MKTTu0E19y0ze5YwElh/cg6uga/tIFgCaOBAsdamjUna1y97ioZS9ecP3wWekEkirXXwGMgXtbHY+eL2aw6Ojrqz0Aj2AgiP2T5z4PNMmMBL0z5jR52aeN1C3Zux3ZvBeKMhylKyH9MvILH6/fD4Q39hTJ9BBbLFcPWoK7lzvQYDCJsZpndsIAXQl/PWxsEiqCmdnoNKMy0U+IgbB6zl/52kigHOMqF8wy8G14DL8Sh3mXS+ae+6kEszHDMmjwycz76rOHpgM0vOY5t+j3w7ljAK6Gd33KziJka/3iOGOb6C0TayguxaAMLIdce5bel37rPeWb8uR9p+RO/5m/2wwJeCUTDzFeua/WYXa4l5/oLibSWV6TcrBLb0m/d58QVhzDK2bPlz2xb8zf7YQEbkxgL2JjEWMDGZIbXSGZ/uvXd8GldurXoqnmtnX4JX0nEmd3wDGxMYizgC45e33DEkldO5mJhAa8Ewqn9952cQ66Jaa5/hHevtfervBfm3S+HOHh9UzsAQhgE3kqf/Gv3W/HkX76Tbvmb/bCAV4L3rpwyqh2Q4J1q7X3oXH9BXhx/LPPieCI/BcsRSg5ytNLg7DL3W/B+uXW/5V8bLFROsxwW8Eq0fm0Cf76uVx74n+sf4ZAE3yLaBUTODN2C/GtpE69WP/mX5cWfeowdNjHzsYCNSYwFbExiLGBjMjO8DzZ78rHyu83deq///eQS/HElU/xJr5YXfrW8BPc4pFGDe0qfv6+L36uO+UdivEirjDV/H+TYD3+h35wpvFoCvlFl5mMBLwzvRbtZZrj6Btfd7DNcteF10Tb0kze8T+1mv96Pv/pcY0q6Qunz/ldlHkufMGV9p8IrKOXBTrqZjwW8EPzS41o/QxNhgEBMvN5ZgjgQgL43vET6tcEsEl9P8ZrJ7AACNvtzqC8AsI6dk1cnzup/TtZibvr74jXwfngXeiU4FcX/M8SjaIRr/l+j8ujjXH/BLEdetSOK+HH6Sieg4n8pKki/dlpMjJWL9Wv5O1stf8pS8zf7YQGvBGs61nfl2lcnm8o15Vx/gTB5TOWUUyliHkvZHGJNy7FOwkWxcoYaP449toQ1Vi5OXJWPyC1/ndAq/c1+WMDJ4T/y5rwzm09j56URUFxzAr9fJXGPnYU25xcL+IKgzacxSgELbyDlxQJeEWbFmmh4lMSVzPU/FK38qRt1LJnrb3bHAl4RHk9rsxvr49p7z7n+h6KVP3WjjiVz/c3uWMDGJMYCNiYxFvBK8N70+vXrP7xj5ZpTWzoDLOb6H4pW/no/zL1Iy59XXDV/sx8W8Eqw1qttYLGWrG0IzfU/FK38ed9b25Bq+bP+9QbW8ljAxiTGAl4RZhy/Rvobv0ZaHn8baSFY7x6icyIkHmvLNanyHjuNxbFK1rTl1wsRFo/8rNv5XEt/LSgLdfL3gXfDM/BCeGbZjdbsbqbhGdiYxFjAC/F///s/wyczl5/+fXXz07/+PVyZOVjAC3F85efhk5nLz//5b+/MfLwGNiYxFrAxibGAjUmMBWxMYixgYxJjARuTGAvYmMRYwMYkxgI2JjEWsDGJsYCNSYwFbExiLGBjEmMBG5MYC9iYxFjAxiTGAjYmMRawMYmxgI1JjAVsTGIsYGMSYwEbkxgL2JjEWMDGJMYCNiYxFrAxibGAjUmMBWxMYixgYxJjARuTGAvYmMRYwMYkxgI2JjEWsDGJsYCNSYwFbExiLGBjEmMBG5MYC9iYxFjAxiTGAjYmMRawMYmxgI1JjAVsTGIsYGMSYwEbkxgL2JjEWMDGJMYCNiYxFrAxibGAjUmMBWxMYixgYxJjARuTGAvYmMRYwMYkxgI2JjEWsDGJsYCNSYwFbExiLGBjEmMBG5MYC9iYxFjAxiTGAjYmMRawMYmxgI1JjAVsTGIsYGMSYwEbkxgL2JjEWMDGJMYCNiYxFrAxibGAjUmMBWxMYixgYxJjARuTls3m/wEXGCSIc8PVHgAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.uni-lj.si/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.uni-lj.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>MIIFjjCCA3agAwIBAgIGElFxoJQNMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExPDA6BgNVBAMMM1VuaXZlcnphIHYgTGp1YmxqYW5pLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEwMDgxMjEyMjRaFw0zNDA2MjUxMjEyMjRaMF8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExPDA6BgNVBAMMM1VuaXZlcnphIHYgTGp1YmxqYW5pLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALf+bKLghf3EDDJu6LXbgiDcIYH/Tvtv6S6Qh5UJHyWjqXpVtp43CQCndE/Fgbfsp44iCLgHOWg1eQuRwol0ixzPyA+qNFfNQcsCjwff5Obzqt5+//ma2XT8nQrePsMa8XL6v+HIOPqnk9ce6K2YRgBhTJn//5rlaLAm6Gy1V8NK35T20sKXSLGOL6/btXOTc4uHRedHRJlk61swYu80wbxO/jsN89olxaC07A8iyrxfYrBlL/As7TDOe7trBanLrY+f+wNKsdoUH2nArYnR3HSUQRV4u2SkuLixTvfkub24PKO4nLw6o4XkhgURnGbYFLYtVR/6mVvizBS4JFO2IJxp5RESDXzJ7xSCMrsKN5ifU0dnH32NIJ16F1bCdszrZzEwVaVETTyxkc+maNhyRDcwvOJh+gKoOf0lOkHFZOXLPYWeYEo45NlQA86cntVkm8GQYhTFNTV8uUO2zHUogvQN3qJZfeOH0W+UaIunJApOablhpUrof5M+qXkRxAMV14l67hsCNxvlSSbQ2jWl7NThTT0hRr4UxB1WYYiFKzW0B00yty65I1C/coXqXwSr9+a2pqKuALk4gD9/aAr478Ws9ikL1Le5sDRapUhm9VOSudOqu4ZLzvzLtj8HPyJXBLYn6QXdHeqNncUeqt7Ri+PBr+XIHKYCrXKbWJo2c9MnAgMBAAGjUDBOMB0GA1UdDgQWBBTeIrkTkzpqNc3Sw0FeK+yJQDnSSDAfBgNVHSMEGDAWgBTeIrkTkzpqNc3Sw0FeK+yJQDnSSDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQCaPqA0g1dOV0EfJgsB8y0eHPqljGjDTBHoi1jGKAoD1R35vWHfCOV9GhW/O8pxJJF8u3p7c/PXURQ4aoonC+TKuY/aY/kvZuk6UPOVM1wbDD94LvAUsqhW9Ih2Vv9gPLmhEvRTC5tJZ182BFs/Y871YocOO6Asd0ZOj10X/pI2F69x1I/bWRMC+uU9uT4YOlaFY5eClGHGONUfXD7BqDuMMvYTv/4M7/KNXxS6pDj+9vSLnmbECuBrPXkrz3jprDz6kvMk/lKKrqCRIJxEvnJ4Zlz1zrr0gCTSK2f2C5J68Yz+y6VgGLrquLFTJlG+Sp816E7ajpSzod5l5t++QUpkzMyvytMM10PglpE5E42dhbVryYOfQkd/J32okay187TgQDOh7yQlaF6mHW/3Y39ucsF7N4DeBdxTLc0YVjCkn5l+JZoViVowwvEKslOMFElSXz/1LRh5xO39ZPcqDjh2WFJzJlxyn6HeR9M7t22PMie/XzZn6Px6874BGx7pFfFMWn0xRWAnMgg8xRK9ugPJSv04sUckiYtazplemYhd5XJi4xWHbn+k+DKKHs7DGwXlJWv9NJnnafw0AB0h5UsXwWI+vrQ1NMM7OMJSGzud+SSdxZXulhZxgZqG4FnR9C2w7REyCoRTgqN5PEd30h/Ieo/G6rYjnHishET4UnOOlQ==</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>MIIFjjCCA3agAwIBAgIGElFxoJQNMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExPDA6BgNVBAMMM1VuaXZlcnphIHYgTGp1YmxqYW5pLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTAeFw0xNDEwMDgxMjEyMjRaFw0zNDA2MjUxMjEyMjRaMF8xCzAJBgNVBAYTAlNJMRIwEAYDVQQHDAlManVibGphbmExPDA6BgNVBAMMM1VuaXZlcnphIHYgTGp1YmxqYW5pLCBwcmlqYXZuaSBzdHJlem5payB6YSBBcm5lc0FBSTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALf+bKLghf3EDDJu6LXbgiDcIYH/Tvtv6S6Qh5UJHyWjqXpVtp43CQCndE/Fgbfsp44iCLgHOWg1eQuRwol0ixzPyA+qNFfNQcsCjwff5Obzqt5+//ma2XT8nQrePsMa8XL6v+HIOPqnk9ce6K2YRgBhTJn//5rlaLAm6Gy1V8NK35T20sKXSLGOL6/btXOTc4uHRedHRJlk61swYu80wbxO/jsN89olxaC07A8iyrxfYrBlL/As7TDOe7trBanLrY+f+wNKsdoUH2nArYnR3HSUQRV4u2SkuLixTvfkub24PKO4nLw6o4XkhgURnGbYFLYtVR/6mVvizBS4JFO2IJxp5RESDXzJ7xSCMrsKN5ifU0dnH32NIJ16F1bCdszrZzEwVaVETTyxkc+maNhyRDcwvOJh+gKoOf0lOkHFZOXLPYWeYEo45NlQA86cntVkm8GQYhTFNTV8uUO2zHUogvQN3qJZfeOH0W+UaIunJApOablhpUrof5M+qXkRxAMV14l67hsCNxvlSSbQ2jWl7NThTT0hRr4UxB1WYYiFKzW0B00yty65I1C/coXqXwSr9+a2pqKuALk4gD9/aAr478Ws9ikL1Le5sDRapUhm9VOSudOqu4ZLzvzLtj8HPyJXBLYn6QXdHeqNncUeqt7Ri+PBr+XIHKYCrXKbWJo2c9MnAgMBAAGjUDBOMB0GA1UdDgQWBBTeIrkTkzpqNc3Sw0FeK+yJQDnSSDAfBgNVHSMEGDAWgBTeIrkTkzpqNc3Sw0FeK+yJQDnSSDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQCaPqA0g1dOV0EfJgsB8y0eHPqljGjDTBHoi1jGKAoD1R35vWHfCOV9GhW/O8pxJJF8u3p7c/PXURQ4aoonC+TKuY/aY/kvZuk6UPOVM1wbDD94LvAUsqhW9Ih2Vv9gPLmhEvRTC5tJZ182BFs/Y871YocOO6Asd0ZOj10X/pI2F69x1I/bWRMC+uU9uT4YOlaFY5eClGHGONUfXD7BqDuMMvYTv/4M7/KNXxS6pDj+9vSLnmbECuBrPXkrz3jprDz6kvMk/lKKrqCRIJxEvnJ4Zlz1zrr0gCTSK2f2C5J68Yz+y6VgGLrquLFTJlG+Sp816E7ajpSzod5l5t++QUpkzMyvytMM10PglpE5E42dhbVryYOfQkd/J32okay187TgQDOh7yQlaF6mHW/3Y39ucsF7N4DeBdxTLc0YVjCkn5l+JZoViVowwvEKslOMFElSXz/1LRh5xO39ZPcqDjh2WFJzJlxyn6HeR9M7t22PMie/XzZn6Px6874BGx7pFfFMWn0xRWAnMgg8xRK9ugPJSv04sUckiYtazplemYhd5XJi4xWHbn+k+DKKHs7DGwXlJWv9NJnnafw0AB0h5UsXwWI+vrQ1NMM7OMJSGzud+SSdxZXulhZxgZqG4FnR9C2w7REyCoRTgqN5PEd30h/Ieo/G6rYjnHishET4UnOOlQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-lj.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.uni-lj.si/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Ljubljana</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Univerza v Ljubljani</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Ljubljana</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Univerza v Ljubljani</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uni-lj.si/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.uni-lj.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Radovan Stanislav</md:GivenName>
-    <md:SurName>Pejovnik</md:SurName>
-    <md:EmailAddress>mailto:rektor@uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Anton</md:GivenName>
-    <md:SurName>Jagodic</md:SurName>
-    <md:EmailAddress>mailto:anton.jagodic@uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Anton</md:GivenName>
-    <md:SurName>Jagodic</md:SurName>
-    <md:EmailAddress>mailto:anton.jagodic@uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Anton</md:GivenName>
-    <md:SurName>Jagodic</md:SurName>
-    <md:EmailAddress>mailto:anton.jagodic@uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jure</md:GivenName>
-    <md:SurName>Lenče</md:SurName>
-    <md:EmailAddress>mailto:jure.lence@uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-mannheim.de.xml b/swamid-interfederations-2.0/idp.uni-mannheim.de.xml
deleted file mode 100644
index b2f799fb..00000000
--- a/swamid-interfederations-2.0/idp.uni-mannheim.de.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-mannheim.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mannheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-mannheim.de,OU=Universitaetsbibliothek,O=Universitaet Mannheim,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmDCCBICgAwIBAgIEDSelTTANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFubmhl
-aW0xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNYW5uaGVpbTEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEoMCYGA1UEAxMfUlVNLUNBLUcgWmVydGlmaXppZXJ1bmdzaW5z
-dGFuejEoMCYGCSqGSIb3DQEJARYZcnVtLWNhQHJ6LnVuaS1tYW5uaGVpbS5kZTAe
-Fw0wODEwMjkwOTA3MDlaFw0xMzEwMjgwOTA3MDlaMIGdMQswCQYDVQQGEwJERTEb
-MBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEe
-MBwGA1UEChMVVW5pdmVyc2l0YWV0IE1hbm5oZWltMSAwHgYDVQQLExdVbml2ZXJz
-aXRhZXRzYmlibGlvdGhlazEcMBoGA1UEAxMTaWRwLnVuaS1tYW5uaGVpbS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcrMB3W3dTiznmFFwhebZnu
-FmX2GKdnDkkfev4mvD48woR094pWj2t5+GN5itx+Lxg14nOphVPJfdN8gH75RJxD
-E3Li0VVUS9H0i+3M+GIJHXcVGFqpYLfekaW/011pMarXrB2dAvSObjv37KhAElFe
-DcRqotYkDnVdfD06QtoS9Ydq17CXhVwDt7IAE1zXRBCNwtpZRKtKq8lJUd9rIXDi
-6YWsB6kYOeoD+grmXA7t8Zzlrmure7ooZvDF+C877d68JanwyD9IOIOtpQwz209Y
-05a8G8PkN2BVHORYmZ5B+stcpmGu0TBEj67bfx2Qwf3iSRwFB8YtiTIM7WQHgIcC
-AwEAAaOCAbAwggGsMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUl87e83s+oyFm3MLA6tnag/8v
-PBEwHwYDVR0jBBgwFoAUWSApQELW/o4HLro9h08yrWR2jgwwgYsGA1UdHwSBgzCB
-gDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFubmhlaW0tY2Ev
-cHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLW1hbm5oZWltLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSB
-lzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFu
-bmhlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYW5uaGVpbS1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGqhKZoukDYFxZIS6B2CLZpmtsGW
-azgSPZdpIVxCxtEg18JgAr0TboeTNH9F95H4PGlCKw4EgqRWD4QFhmB9135wYJ73
-nzIKlpzMdOvsp5/n3HyYMBd8kmq5HCsUnWPQ6fwoEys48y6Y2M6/dwyybvRsaDnk
-+/UOkiHTDn8TKlcYevjA0Ns7UeCcVdBiBqQthMgE6HL9p9V63W4wdROBpy8Zj5B7
-lUJXFa454x/o2wV3IG/xkjdPCXxwEnmC6oQ+s5xMtmVfeC9xq0B2/N/zok0Mlw2I
-NXZdhSMGikKePJO9dxCew0F5OOk4eYOy9V1OPmjGN1yo4Anj5QrYZwyZJDM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-mannheim.de,OU=Universitaetsbibliothek,O=Universitaet Mannheim,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmDCCBICgAwIBAgIEDSelTTANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFubmhl
-aW0xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNYW5uaGVpbTEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEoMCYGA1UEAxMfUlVNLUNBLUcgWmVydGlmaXppZXJ1bmdzaW5z
-dGFuejEoMCYGCSqGSIb3DQEJARYZcnVtLWNhQHJ6LnVuaS1tYW5uaGVpbS5kZTAe
-Fw0wODEwMjkwOTA3MDlaFw0xMzEwMjgwOTA3MDlaMIGdMQswCQYDVQQGEwJERTEb
-MBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEe
-MBwGA1UEChMVVW5pdmVyc2l0YWV0IE1hbm5oZWltMSAwHgYDVQQLExdVbml2ZXJz
-aXRhZXRzYmlibGlvdGhlazEcMBoGA1UEAxMTaWRwLnVuaS1tYW5uaGVpbS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcrMB3W3dTiznmFFwhebZnu
-FmX2GKdnDkkfev4mvD48woR094pWj2t5+GN5itx+Lxg14nOphVPJfdN8gH75RJxD
-E3Li0VVUS9H0i+3M+GIJHXcVGFqpYLfekaW/011pMarXrB2dAvSObjv37KhAElFe
-DcRqotYkDnVdfD06QtoS9Ydq17CXhVwDt7IAE1zXRBCNwtpZRKtKq8lJUd9rIXDi
-6YWsB6kYOeoD+grmXA7t8Zzlrmure7ooZvDF+C877d68JanwyD9IOIOtpQwz209Y
-05a8G8PkN2BVHORYmZ5B+stcpmGu0TBEj67bfx2Qwf3iSRwFB8YtiTIM7WQHgIcC
-AwEAAaOCAbAwggGsMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUl87e83s+oyFm3MLA6tnag/8v
-PBEwHwYDVR0jBBgwFoAUWSApQELW/o4HLro9h08yrWR2jgwwgYsGA1UdHwSBgzCB
-gDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFubmhlaW0tY2Ev
-cHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLW1hbm5oZWltLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSB
-lzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFu
-bmhlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYW5uaGVpbS1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGqhKZoukDYFxZIS6B2CLZpmtsGW
-azgSPZdpIVxCxtEg18JgAr0TboeTNH9F95H4PGlCKw4EgqRWD4QFhmB9135wYJ73
-nzIKlpzMdOvsp5/n3HyYMBd8kmq5HCsUnWPQ6fwoEys48y6Y2M6/dwyybvRsaDnk
-+/UOkiHTDn8TKlcYevjA0Ns7UeCcVdBiBqQthMgE6HL9p9V63W4wdROBpy8Zj5B7
-lUJXFa454x/o2wV3IG/xkjdPCXxwEnmC6oQ+s5xMtmVfeC9xq0B2/N/zok0Mlw2I
-NXZdhSMGikKePJO9dxCew0F5OOk4eYOy9V1OPmjGN1yo4Anj5QrYZwyZJDM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-mannheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-mannheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-mannheim.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-mannheim.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-mannheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-mannheim.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mannheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-mannheim.de,OU=Universitaetsbibliothek,O=Universitaet Mannheim,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmDCCBICgAwIBAgIEDSelTTANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFubmhl
-aW0xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNYW5uaGVpbTEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEoMCYGA1UEAxMfUlVNLUNBLUcgWmVydGlmaXppZXJ1bmdzaW5z
-dGFuejEoMCYGCSqGSIb3DQEJARYZcnVtLWNhQHJ6LnVuaS1tYW5uaGVpbS5kZTAe
-Fw0wODEwMjkwOTA3MDlaFw0xMzEwMjgwOTA3MDlaMIGdMQswCQYDVQQGEwJERTEb
-MBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEe
-MBwGA1UEChMVVW5pdmVyc2l0YWV0IE1hbm5oZWltMSAwHgYDVQQLExdVbml2ZXJz
-aXRhZXRzYmlibGlvdGhlazEcMBoGA1UEAxMTaWRwLnVuaS1tYW5uaGVpbS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcrMB3W3dTiznmFFwhebZnu
-FmX2GKdnDkkfev4mvD48woR094pWj2t5+GN5itx+Lxg14nOphVPJfdN8gH75RJxD
-E3Li0VVUS9H0i+3M+GIJHXcVGFqpYLfekaW/011pMarXrB2dAvSObjv37KhAElFe
-DcRqotYkDnVdfD06QtoS9Ydq17CXhVwDt7IAE1zXRBCNwtpZRKtKq8lJUd9rIXDi
-6YWsB6kYOeoD+grmXA7t8Zzlrmure7ooZvDF+C877d68JanwyD9IOIOtpQwz209Y
-05a8G8PkN2BVHORYmZ5B+stcpmGu0TBEj67bfx2Qwf3iSRwFB8YtiTIM7WQHgIcC
-AwEAAaOCAbAwggGsMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUl87e83s+oyFm3MLA6tnag/8v
-PBEwHwYDVR0jBBgwFoAUWSApQELW/o4HLro9h08yrWR2jgwwgYsGA1UdHwSBgzCB
-gDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFubmhlaW0tY2Ev
-cHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLW1hbm5oZWltLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSB
-lzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFu
-bmhlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYW5uaGVpbS1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGqhKZoukDYFxZIS6B2CLZpmtsGW
-azgSPZdpIVxCxtEg18JgAr0TboeTNH9F95H4PGlCKw4EgqRWD4QFhmB9135wYJ73
-nzIKlpzMdOvsp5/n3HyYMBd8kmq5HCsUnWPQ6fwoEys48y6Y2M6/dwyybvRsaDnk
-+/UOkiHTDn8TKlcYevjA0Ns7UeCcVdBiBqQthMgE6HL9p9V63W4wdROBpy8Zj5B7
-lUJXFa454x/o2wV3IG/xkjdPCXxwEnmC6oQ+s5xMtmVfeC9xq0B2/N/zok0Mlw2I
-NXZdhSMGikKePJO9dxCew0F5OOk4eYOy9V1OPmjGN1yo4Anj5QrYZwyZJDM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-mannheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-mannheim.de,OU=Universitaetsbibliothek,O=Universitaet Mannheim,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFmDCCBICgAwIBAgIEDSelTTANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFubmhl
-aW0xHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNYW5uaGVpbTEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEoMCYGA1UEAxMfUlVNLUNBLUcgWmVydGlmaXppZXJ1bmdzaW5z
-dGFuejEoMCYGCSqGSIb3DQEJARYZcnVtLWNhQHJ6LnVuaS1tYW5uaGVpbS5kZTAe
-Fw0wODEwMjkwOTA3MDlaFw0xMzEwMjgwOTA3MDlaMIGdMQswCQYDVQQGEwJERTEb
-MBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMREwDwYDVQQHEwhNYW5uaGVpbTEe
-MBwGA1UEChMVVW5pdmVyc2l0YWV0IE1hbm5oZWltMSAwHgYDVQQLExdVbml2ZXJz
-aXRhZXRzYmlibGlvdGhlazEcMBoGA1UEAxMTaWRwLnVuaS1tYW5uaGVpbS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOcrMB3W3dTiznmFFwhebZnu
-FmX2GKdnDkkfev4mvD48woR094pWj2t5+GN5itx+Lxg14nOphVPJfdN8gH75RJxD
-E3Li0VVUS9H0i+3M+GIJHXcVGFqpYLfekaW/011pMarXrB2dAvSObjv37KhAElFe
-DcRqotYkDnVdfD06QtoS9Ydq17CXhVwDt7IAE1zXRBCNwtpZRKtKq8lJUd9rIXDi
-6YWsB6kYOeoD+grmXA7t8Zzlrmure7ooZvDF+C877d68JanwyD9IOIOtpQwz209Y
-05a8G8PkN2BVHORYmZ5B+stcpmGu0TBEj67bfx2Qwf3iSRwFB8YtiTIM7WQHgIcC
-AwEAAaOCAbAwggGsMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUl87e83s+oyFm3MLA6tnag/8v
-PBEwHwYDVR0jBBgwFoAUWSApQELW/o4HLro9h08yrWR2jgwwgYsGA1UdHwSBgzCB
-gDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFubmhlaW0tY2Ev
-cHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLW1hbm5oZWltLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSB
-lzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktbWFu
-bmhlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYW5uaGVpbS1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGqhKZoukDYFxZIS6B2CLZpmtsGW
-azgSPZdpIVxCxtEg18JgAr0TboeTNH9F95H4PGlCKw4EgqRWD4QFhmB9135wYJ73
-nzIKlpzMdOvsp5/n3HyYMBd8kmq5HCsUnWPQ6fwoEys48y6Y2M6/dwyybvRsaDnk
-+/UOkiHTDn8TKlcYevjA0Ns7UeCcVdBiBqQthMgE6HL9p9V63W4wdROBpy8Zj5B7
-lUJXFa454x/o2wV3IG/xkjdPCXxwEnmC6oQ+s5xMtmVfeC9xq0B2/N/zok0Mlw2I
-NXZdhSMGikKePJO9dxCew0F5OOk4eYOy9V1OPmjGN1yo4Anj5QrYZwyZJDM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-mannheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-mannheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Mannheim</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Mannheim</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-mannheim.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Magnus</GivenName>
-    <SurName>Pfeffer</SurName>
-    <EmailAddress>pfeffer@bib.uni-mannheim.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Magnus</GivenName>
-    <SurName>Pfeffer</SurName>
-    <EmailAddress>pfeffer@bib.uni-mannheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-oldenburg.de.xml b/swamid-interfederations-2.0/idp.uni-oldenburg.de.xml
deleted file mode 100644
index 125341fe..00000000
--- a/swamid-interfederations-2.0/idp.uni-oldenburg.de.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-oldenburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-oldenburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-oldenburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-oldenburg.de,OU=IT-Dienste,O=Universitaet Oldenburg,L=Oldenburg,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHDjCCBfagAwIBAgIHEplo8IxnyjANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEjAQBgNVBAcTCU9sZGVuYnVy
-ZzEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IE9sZGVuYnVyZzETMBEGA1UECxMKSVQt
-RGllbnN0ZTEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0IE9sZGVuYnVyZyBQS0kxIzAh
-BgkqhkiG9w0BCQEWFHBraUB1bmktb2xkZW5idXJnLmRlMB4XDTExMDkyMTEzNDky
-MFoXDTE2MDkxOTEzNDkyMFowgY4xCzAJBgNVBAYTAkRFMRYwFAYDVQQIEw1OaWVk
-ZXJzYWNoc2VuMRIwEAYDVQQHEwlPbGRlbmJ1cmcxHzAdBgNVBAoTFlVuaXZlcnNp
-dGFldCBPbGRlbmJ1cmcxEzARBgNVBAsTCklULURpZW5zdGUxHTAbBgNVBAMTFGlk
-cC51bmktb2xkZW5idXJnLmRlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEAs15u8dUfaE1ArfvQSc/wvoOcfl3OsdFfkipWDyPm/2JtuHw4FKd6gfYgXHKL
-JHBwolaxPynjp807RKFEjGyIKhjoBZjUQvb6jsl14cSlPEIByHA4fdKpDpMzhEEV
-9QtsI0OmqOdx6bQoXwiF3j0Ns/g/8W62iW077LJgMjygWjXAsIZRwU1qA9R9N/3/
-+oyIiKIrqNuYZJzYqg3DBlNOei32OA5nJ9lIQcWHP1pTFNACHoPBzoES2v1yLhnk
-em00291hy20+NV5s9zyq+EKaCcKaBkyM8GhLYSuXN7j0o5t8n8C2FMj0E9p+CDVn
-/FcjEYCKmWiVCYTEItnx0LMj8z5JlpnuuJvucR/FZiSH1upRNeBjuFLhazaY2buv
-SzmCK9SbaAssFfoq4Weu03IlFbJ8i+581D4jH+oez5DwYvR1ujfCehie9DpoFqVs
-6hyMaiYuFYS6P4Tk8OREROZPjESYmb9Qi+Z3S95lczKKr54pWpufRKH0pZ+WoW7A
-BvZ6bf0xDT2dV78wyv75aDKG6fTKbNanB/SFIAftJHiFAW76eO6KDhPuLQ+mKHOw
-D7XOvaY5wlU5t93y+kSJSkrrdU0Nq0qPWVKDFHhtAJcB0VNRvSV0RQQs60F0ba4a
-lNqmb3taz9hxJQWSgleMUYOyYeKYQE8iRWFbIgG8ruPpLtkCAwEAAaOCAkIwggI+
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0G
-A1UdDgQWBBQ9StoW4Czg2vvQHoUD5tJkV8evAzAfBgNVHSMEGDAWgBQYj0Rh3N14
-cjfS9bkFeN5/PSnO6DCBlQYDVR0RBIGNMIGKghRpZHAudW5pLW9sZGVuYnVyZy5k
-ZYIbaWRwMDEudmlydC51bmktb2xkZW5idXJnLmRlghtpZHAwMi52aXJ0LnVuaS1v
-bGRlbmJ1cmcuZGWCG2lkcDAzLnZpcnQudW5pLW9sZGVuYnVyZy5kZYIbaWRwMDQu
-dmlydC51bmktb2xkZW5idXJnLmRlMIGNBgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW9sZGVuYnVyZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktb2xkZW5idXJn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGmBggrBgEFBQcBAQSBmTCBljBJBggrBgEF
-BQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktb2xkZW5idXJnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS91bmktb2xkZW5idXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAS6dV/3BmpPKBykvxbhYSX7uZOoV0BJBkLdJ8PthY
-dD+xvEC7lCGBtS0KiRVws4QHIzaSnFTUYZd2WqvcOu5iUR0RXyqS30FqvHwME5V4
-FI81Etb0lGu5PHA2Cg/M8uz+bYGav6322rVFte2xvdbVmGsHcnwbP5L3ZqxXehJD
-wRHKvp9JtANDDLPRtyqYCRFo5+6kUNkdR7OcpidBpZPZETtj1mAxFiLfeGoCI62l
-Q+LoQjURLUiwcqlUKQSMVYzCA67HAgsE8P8XWbDvkCpCKD8Vv0hBnB/237i+7Aeh
-q9IDXljT9qGCmnSi3z5W0Y+2x9RI3nuNIHeFbz25j8+Hrg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-oldenburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-oldenburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-oldenburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-oldenburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-oldenburg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-oldenburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-oldenburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-oldenburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-oldenburg.de,OU=IT-Dienste,O=Universitaet Oldenburg,L=Oldenburg,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHDjCCBfagAwIBAgIHEplo8IxnyjANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEjAQBgNVBAcTCU9sZGVuYnVy
-ZzEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IE9sZGVuYnVyZzETMBEGA1UECxMKSVQt
-RGllbnN0ZTEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0IE9sZGVuYnVyZyBQS0kxIzAh
-BgkqhkiG9w0BCQEWFHBraUB1bmktb2xkZW5idXJnLmRlMB4XDTExMDkyMTEzNDky
-MFoXDTE2MDkxOTEzNDkyMFowgY4xCzAJBgNVBAYTAkRFMRYwFAYDVQQIEw1OaWVk
-ZXJzYWNoc2VuMRIwEAYDVQQHEwlPbGRlbmJ1cmcxHzAdBgNVBAoTFlVuaXZlcnNp
-dGFldCBPbGRlbmJ1cmcxEzARBgNVBAsTCklULURpZW5zdGUxHTAbBgNVBAMTFGlk
-cC51bmktb2xkZW5idXJnLmRlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEAs15u8dUfaE1ArfvQSc/wvoOcfl3OsdFfkipWDyPm/2JtuHw4FKd6gfYgXHKL
-JHBwolaxPynjp807RKFEjGyIKhjoBZjUQvb6jsl14cSlPEIByHA4fdKpDpMzhEEV
-9QtsI0OmqOdx6bQoXwiF3j0Ns/g/8W62iW077LJgMjygWjXAsIZRwU1qA9R9N/3/
-+oyIiKIrqNuYZJzYqg3DBlNOei32OA5nJ9lIQcWHP1pTFNACHoPBzoES2v1yLhnk
-em00291hy20+NV5s9zyq+EKaCcKaBkyM8GhLYSuXN7j0o5t8n8C2FMj0E9p+CDVn
-/FcjEYCKmWiVCYTEItnx0LMj8z5JlpnuuJvucR/FZiSH1upRNeBjuFLhazaY2buv
-SzmCK9SbaAssFfoq4Weu03IlFbJ8i+581D4jH+oez5DwYvR1ujfCehie9DpoFqVs
-6hyMaiYuFYS6P4Tk8OREROZPjESYmb9Qi+Z3S95lczKKr54pWpufRKH0pZ+WoW7A
-BvZ6bf0xDT2dV78wyv75aDKG6fTKbNanB/SFIAftJHiFAW76eO6KDhPuLQ+mKHOw
-D7XOvaY5wlU5t93y+kSJSkrrdU0Nq0qPWVKDFHhtAJcB0VNRvSV0RQQs60F0ba4a
-lNqmb3taz9hxJQWSgleMUYOyYeKYQE8iRWFbIgG8ruPpLtkCAwEAAaOCAkIwggI+
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0G
-A1UdDgQWBBQ9StoW4Czg2vvQHoUD5tJkV8evAzAfBgNVHSMEGDAWgBQYj0Rh3N14
-cjfS9bkFeN5/PSnO6DCBlQYDVR0RBIGNMIGKghRpZHAudW5pLW9sZGVuYnVyZy5k
-ZYIbaWRwMDEudmlydC51bmktb2xkZW5idXJnLmRlghtpZHAwMi52aXJ0LnVuaS1v
-bGRlbmJ1cmcuZGWCG2lkcDAzLnZpcnQudW5pLW9sZGVuYnVyZy5kZYIbaWRwMDQu
-dmlydC51bmktb2xkZW5idXJnLmRlMIGNBgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW9sZGVuYnVyZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktb2xkZW5idXJn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGmBggrBgEFBQcBAQSBmTCBljBJBggrBgEF
-BQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktb2xkZW5idXJnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS91bmktb2xkZW5idXJnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAS6dV/3BmpPKBykvxbhYSX7uZOoV0BJBkLdJ8PthY
-dD+xvEC7lCGBtS0KiRVws4QHIzaSnFTUYZd2WqvcOu5iUR0RXyqS30FqvHwME5V4
-FI81Etb0lGu5PHA2Cg/M8uz+bYGav6322rVFte2xvdbVmGsHcnwbP5L3ZqxXehJD
-wRHKvp9JtANDDLPRtyqYCRFo5+6kUNkdR7OcpidBpZPZETtj1mAxFiLfeGoCI62l
-Q+LoQjURLUiwcqlUKQSMVYzCA67HAgsE8P8XWbDvkCpCKD8Vv0hBnB/237i+7Aeh
-q9IDXljT9qGCmnSi3z5W0Y+2x9RI3nuNIHeFbz25j8+Hrg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-oldenburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-oldenburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Oldenburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Oldenburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-oldenburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Timm</GivenName>
-    <SurName>Stamer</SurName>
-    <EmailAddress>idm@uni-oldenburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ulrich</GivenName>
-    <SurName>Czernik</SurName>
-    <EmailAddress>ulrich.czernik@uni-oldenburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-stuttgart.de.xml b/swamid-interfederations-2.0/idp.uni-stuttgart.de.xml
deleted file mode 100644
index 69c8eada..00000000
--- a/swamid-interfederations-2.0/idp.uni-stuttgart.de.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-stuttgart.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-stuttgart.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-stuttgart.de,OU=Rechenzentrum,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0gFJTANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
-dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
-MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDkx
-MjE2MDcwOTA5WhcNMTQxMjE1MDcwOTA5WjCBljELMAkGA1UEBhMCREUxGzAZBgNV
-BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
-VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MRYwFAYDVQQLEw1SZWNoZW56ZW50
-cnVtMR0wGwYDVQQDExRpZHAudW5pLXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN2LIN7P7vxpHcOFVHiIuHnbAtypgBuWHZxpH/HE
-qVurt5EKYCEyYhJ8j2XeNWC2LiDWiwGkiF+4S2kyI+hHuWjtp+Wvbh5SWMRUyzHw
-mUAEHgUN3HoDDmc7cw6EgrV9CQkAqfD8HzsRkVlDh4BBOljEe/y+Fwf6CpUNa5NV
-ezF8IomI7gnLiMQbdRaaw/C2vdjc3crroetOuqVs+d/mFT6uMVIow/hEGDv9Lihq
-uef94FuUHZCT7fpDmtimNTuxFMUxE4URHVFM8N9rXsf9VKRKDK5Ol2f0j51Egq8b
-6+K1ZfrjB4vd0N1fTzFthXgbPBctoFATnJOMLrtmZ5lpEhMCAwEAAaOCAbQwggGw
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUP33YNiKZ52ePaOv5ty/WL2jZ+RIwHwYDVR0jBBgw
-FoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdh
-cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsG
-AQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQAN2cq28+4I2lqZJJTLhpeVkpZkBPoKkV+Fx2sD
-qZTdZP+EWOxdeVdVSndwcJcyvd9zMrawL6uZK3OvJangHinP+5vWhYJ0OPyAfsLR
-YxlfbKjORcmJAEfbAZaPfx6Q/+atZ7270xa1F47j9CmlzjgF85Jskrp4zKzBHwna
-kxXE69JXhOAMlLe7Yp4oAjDUx98qtifZgowynE/MUSoVpdYnWl+lrYmUgBaaLYfd
-7xgmJR2j0UXX8271RCbFyIquyHiJp1FGxgRrsoAA6Pa+2gadWou0gUU03Nq59leX
-yhVe5vbl+PFJxN80ZeaOQQz05V+Ez3eDVCU3InYCwnl6Xotw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-stuttgart.de,OU=Rechenzentrum,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0gFJTANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
-dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
-MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDkx
-MjE2MDcwOTA5WhcNMTQxMjE1MDcwOTA5WjCBljELMAkGA1UEBhMCREUxGzAZBgNV
-BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
-VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MRYwFAYDVQQLEw1SZWNoZW56ZW50
-cnVtMR0wGwYDVQQDExRpZHAudW5pLXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN2LIN7P7vxpHcOFVHiIuHnbAtypgBuWHZxpH/HE
-qVurt5EKYCEyYhJ8j2XeNWC2LiDWiwGkiF+4S2kyI+hHuWjtp+Wvbh5SWMRUyzHw
-mUAEHgUN3HoDDmc7cw6EgrV9CQkAqfD8HzsRkVlDh4BBOljEe/y+Fwf6CpUNa5NV
-ezF8IomI7gnLiMQbdRaaw/C2vdjc3crroetOuqVs+d/mFT6uMVIow/hEGDv9Lihq
-uef94FuUHZCT7fpDmtimNTuxFMUxE4URHVFM8N9rXsf9VKRKDK5Ol2f0j51Egq8b
-6+K1ZfrjB4vd0N1fTzFthXgbPBctoFATnJOMLrtmZ5lpEhMCAwEAAaOCAbQwggGw
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUP33YNiKZ52ePaOv5ty/WL2jZ+RIwHwYDVR0jBBgw
-FoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdh
-cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsG
-AQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQAN2cq28+4I2lqZJJTLhpeVkpZkBPoKkV+Fx2sD
-qZTdZP+EWOxdeVdVSndwcJcyvd9zMrawL6uZK3OvJangHinP+5vWhYJ0OPyAfsLR
-YxlfbKjORcmJAEfbAZaPfx6Q/+atZ7270xa1F47j9CmlzjgF85Jskrp4zKzBHwna
-kxXE69JXhOAMlLe7Yp4oAjDUx98qtifZgowynE/MUSoVpdYnWl+lrYmUgBaaLYfd
-7xgmJR2j0UXX8271RCbFyIquyHiJp1FGxgRrsoAA6Pa+2gadWou0gUU03Nq59leX
-yhVe5vbl+PFJxN80ZeaOQQz05V+Ez3eDVCU3InYCwnl6Xotw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-stuttgart.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-stuttgart.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-stuttgart.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-stuttgart.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-stuttgart.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-stuttgart.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ub.uni-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-stuttgart.de,OU=Rechenzentrum,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0gFJTANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
-dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
-MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDkx
-MjE2MDcwOTA5WhcNMTQxMjE1MDcwOTA5WjCBljELMAkGA1UEBhMCREUxGzAZBgNV
-BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
-VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MRYwFAYDVQQLEw1SZWNoZW56ZW50
-cnVtMR0wGwYDVQQDExRpZHAudW5pLXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN2LIN7P7vxpHcOFVHiIuHnbAtypgBuWHZxpH/HE
-qVurt5EKYCEyYhJ8j2XeNWC2LiDWiwGkiF+4S2kyI+hHuWjtp+Wvbh5SWMRUyzHw
-mUAEHgUN3HoDDmc7cw6EgrV9CQkAqfD8HzsRkVlDh4BBOljEe/y+Fwf6CpUNa5NV
-ezF8IomI7gnLiMQbdRaaw/C2vdjc3crroetOuqVs+d/mFT6uMVIow/hEGDv9Lihq
-uef94FuUHZCT7fpDmtimNTuxFMUxE4URHVFM8N9rXsf9VKRKDK5Ol2f0j51Egq8b
-6+K1ZfrjB4vd0N1fTzFthXgbPBctoFATnJOMLrtmZ5lpEhMCAwEAAaOCAbQwggGw
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUP33YNiKZ52ePaOv5ty/WL2jZ+RIwHwYDVR0jBBgw
-FoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdh
-cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsG
-AQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQAN2cq28+4I2lqZJJTLhpeVkpZkBPoKkV+Fx2sD
-qZTdZP+EWOxdeVdVSndwcJcyvd9zMrawL6uZK3OvJangHinP+5vWhYJ0OPyAfsLR
-YxlfbKjORcmJAEfbAZaPfx6Q/+atZ7270xa1F47j9CmlzjgF85Jskrp4zKzBHwna
-kxXE69JXhOAMlLe7Yp4oAjDUx98qtifZgowynE/MUSoVpdYnWl+lrYmUgBaaLYfd
-7xgmJR2j0UXX8271RCbFyIquyHiJp1FGxgRrsoAA6Pa+2gadWou0gUU03Nq59leX
-yhVe5vbl+PFJxN80ZeaOQQz05V+Ez3eDVCU3InYCwnl6Xotw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-stuttgart.de,OU=Rechenzentrum,O=Universitaet Stuttgart,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIED0gFJTANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-REUxEjAQBgNVBAcTCVN0dXR0Z2FydDEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFN0
-dXR0Z2FydDEoMCYGA1UEAxMfVW5pdmVyc2l0YWV0IFN0dXR0Z2FydCBDQSAtIEcw
-MTEmMCQGCSqGSIb3DQEJARYXY2EtZzAxQHVuaS1zdHV0dGdhcnQuZGUwHhcNMDkx
-MjE2MDcwOTA5WhcNMTQxMjE1MDcwOTA5WjCBljELMAkGA1UEBhMCREUxGzAZBgNV
-BAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJU3R1dHRnYXJ0MR8wHQYD
-VQQKExZVbml2ZXJzaXRhZXQgU3R1dHRnYXJ0MRYwFAYDVQQLEw1SZWNoZW56ZW50
-cnVtMR0wGwYDVQQDExRpZHAudW5pLXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAN2LIN7P7vxpHcOFVHiIuHnbAtypgBuWHZxpH/HE
-qVurt5EKYCEyYhJ8j2XeNWC2LiDWiwGkiF+4S2kyI+hHuWjtp+Wvbh5SWMRUyzHw
-mUAEHgUN3HoDDmc7cw6EgrV9CQkAqfD8HzsRkVlDh4BBOljEe/y+Fwf6CpUNa5NV
-ezF8IomI7gnLiMQbdRaaw/C2vdjc3crroetOuqVs+d/mFT6uMVIow/hEGDv9Lihq
-uef94FuUHZCT7fpDmtimNTuxFMUxE4URHVFM8N9rXsf9VKRKDK5Ol2f0j51Egq8b
-6+K1ZfrjB4vd0N1fTzFthXgbPBctoFATnJOMLrtmZ5lpEhMCAwEAAaOCAbQwggGw
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUP33YNiKZ52ePaOv5ty/WL2jZ+RIwHwYDVR0jBBgw
-FoAUva0nWiw3zw1EH3Iaqrc3mREuAgQwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1zdHV0dGdh
-cnQtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsG
-AQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQAN2cq28+4I2lqZJJTLhpeVkpZkBPoKkV+Fx2sD
-qZTdZP+EWOxdeVdVSndwcJcyvd9zMrawL6uZK3OvJangHinP+5vWhYJ0OPyAfsLR
-YxlfbKjORcmJAEfbAZaPfx6Q/+atZ7270xa1F47j9CmlzjgF85Jskrp4zKzBHwna
-kxXE69JXhOAMlLe7Yp4oAjDUx98qtifZgowynE/MUSoVpdYnWl+lrYmUgBaaLYfd
-7xgmJR2j0UXX8271RCbFyIquyHiJp1FGxgRrsoAA6Pa+2gadWou0gUU03Nq59leX
-yhVe5vbl+PFJxN80ZeaOQQz05V+Ez3eDVCU3InYCwnl6Xotw
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-stuttgart.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-stuttgart.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Stuttgart</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Stuttgart</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-stuttgart.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Lutz</SurName>
-    <EmailAddress>lutz@rus.uni-stuttgart.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>David</GivenName>
-    <SurName>Lutz</SurName>
-    <EmailAddress>lutz@rus.uni-stuttgart.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-tuebingen.de-shibboleth.xml b/swamid-interfederations-2.0/idp.uni-tuebingen.de-shibboleth.xml
deleted file mode 100644
index cffed4c7..00000000
--- a/swamid-interfederations-2.0/idp.uni-tuebingen.de-shibboleth.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-tuebingen.de/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:29Z">
-      <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>
-  </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-tuebingen.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Tübingen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Tübingen</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Shibboleth IdP Universität Tübingen</mdui:Description>
-        <mdui:Description xml:lang="en">Shibboleth IdP Universität Tübingen</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp.uni-tuebingen.de/ut_small.png</mdui:Logo>
-        <mdui:Logo height="100" width="260">https://idp.uni-tuebingen.de/ut_big.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.uni-tuebingen.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uni-tuebingen.de/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">https://idp.uni-tuebingen.de/terms.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-tuebingen.de,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIHFQ0FpCF5EDANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMT
-R2xvYmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVu
-aS10dWViaW5nZW4uZGUwHhcNMTMwMTA5MTUwOTA5WhcNMTgwMTA4MTUwOTA5WjB+
-MQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMRIwEAYD
-VQQHEwlUdWViaW5nZW4xHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4x
-HTAbBgNVBAMTFGlkcC51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA6cc5pGCCT/PkGZMAw3XxaBzz+IwJx0rE4+ZwmlysL7Su
-hTn7+Gr5STOul/WWs3cf8Kz98kjJFcAV431M0yH8xVc2D55RgbXRQv8dcvg3OXHq
-vpHcTJKwXCj7glv/bIipBhRxe8eiab5ABkKm5AGecuSS95Ycx8Bhoa8lHOCPzKfD
-pNZB9ce1wZFHJCfmqzs5DAUPz9t52HrFH2Eu9J6AZN9IXLx57lmOrZHmkbo4HpIQ
-L9EY2xTwUSD4jEyZZlUdj3sZsvyhE4KLK2mVkS1KeR2HLdeW4HffaMRtsVaGwKqT
-rOYE//nQOp3fD0vaAxvhoL7uzWMubFHxPmEUuDhrVQIDAQABo4ICUTCCAk0wOQYD
-VR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgG
-BmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFDQDujAQPR1cvf9jLwyjr8QOzhs9MB8G
-A1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOoMB8GA1UdEQQYMBaCFGlkcC51
-bmktdHVlYmluZ2VuLmRlMIGTBgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNy
-bDBCoECgPoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1j
-YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHhBggrBgEFBQcBAQSB1DCB0TAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEwG
-CCsGAQUFBzAChkBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVl
-LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEwGCCsGAQUFBzAChkBodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVlLWNhL3B1Yi9jYWNlcnQvZ19j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBARQEW3sNGmben/sYA08UDKq0p
-dH4RGpgUWTZ5c2J5vRAVMlzPgmX+8AgJZBYUHorZdE8YfL9mONw+tsXwmodagQyo
-x+KXZucfOCY7M4KH8CBhKjq8/PEN9QOtVKr/a8UcsWAA14Rn001rDvLy9SBPByWl
-sbUiekroRVs7wpRe/cK5CxxCajdxxC6z0Sa7N+WAqsx5UamlyvSvyk+O5BKAh4jh
-kKrtjD0n2ZbNLvPx3e9xowmTpQ+9R2rvaLM1owJE7ZOKmjy+x3gIxw0hDPVbvdY+
-1kKswAopSj+1y7y8b+Z/StEZJI/c3b8CveLBBOaPXljEfyE/tpAjw867Ga1v
-</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.uni-tuebingen.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-tuebingen.de/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">uni-tuebingen.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-tuebingen.de,O=Universitaet Tuebingen,L=Tuebingen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIHFQ0FpCF5EDANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQG
-EwJERTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMT
-R2xvYmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVu
-aS10dWViaW5nZW4uZGUwHhcNMTMwMTA5MTUwOTA5WhcNMTgwMTA4MTUwOTA5WjB+
-MQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0ZW1iZXJnMRIwEAYD
-VQQHEwlUdWViaW5nZW4xHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4x
-HTAbBgNVBAMTFGlkcC51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA6cc5pGCCT/PkGZMAw3XxaBzz+IwJx0rE4+ZwmlysL7Su
-hTn7+Gr5STOul/WWs3cf8Kz98kjJFcAV431M0yH8xVc2D55RgbXRQv8dcvg3OXHq
-vpHcTJKwXCj7glv/bIipBhRxe8eiab5ABkKm5AGecuSS95Ycx8Bhoa8lHOCPzKfD
-pNZB9ce1wZFHJCfmqzs5DAUPz9t52HrFH2Eu9J6AZN9IXLx57lmOrZHmkbo4HpIQ
-L9EY2xTwUSD4jEyZZlUdj3sZsvyhE4KLK2mVkS1KeR2HLdeW4HffaMRtsVaGwKqT
-rOYE//nQOp3fD0vaAxvhoL7uzWMubFHxPmEUuDhrVQIDAQABo4ICUTCCAk0wOQYD
-VR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwAwEQYPKwYBBAGBrSGCLAIBBAMAMAgG
-BmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFDQDujAQPR1cvf9jLwyjr8QOzhs9MB8G
-A1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOoMB8GA1UdEQQYMBaCFGlkcC51
-bmktdHVlYmluZ2VuLmRlMIGTBgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvY2xhc3NpYy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNy
-bDBCoECgPoY8aHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1j
-YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHhBggrBgEFBQcBAQSB1DCB0TAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEwG
-CCsGAQUFBzAChkBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVl
-LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEwGCCsGAQUFBzAChkBodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2NsYXNzaWMtdW5pdHVlLWNhL3B1Yi9jYWNlcnQvZ19j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBARQEW3sNGmben/sYA08UDKq0p
-dH4RGpgUWTZ5c2J5vRAVMlzPgmX+8AgJZBYUHorZdE8YfL9mONw+tsXwmodagQyo
-x+KXZucfOCY7M4KH8CBhKjq8/PEN9QOtVKr/a8UcsWAA14Rn001rDvLy9SBPByWl
-sbUiekroRVs7wpRe/cK5CxxCajdxxC6z0Sa7N+WAqsx5UamlyvSvyk+O5BKAh4jh
-kKrtjD0n2ZbNLvPx3e9xowmTpQ+9R2rvaLM1owJE7ZOKmjy+x3gIxw0hDPVbvdY+
-1kKswAopSj+1y7y8b+Z/StEZJI/c3b8CveLBBOaPXljEfyE/tpAjw867Ga1v
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-tuebingen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-tuebingen.de: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">e60</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e60</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Tübingen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Tuebingen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-tuebingen.de/en/landingpage.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kurt</md:GivenName>
-    <md:SurName>Spanier</md:SurName>
-    <md:EmailAddress>mailto:kurt.spanier@uni-tuebingen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth</md:GivenName>
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>mailto:idp-technical@uni-tuebingen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Shibboleth</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:idp-support@uni-tuebingen.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-tuebingen.de.xml b/swamid-interfederations-2.0/idp.uni-tuebingen.de.xml
deleted file mode 100644
index 18fe7cc6..00000000
--- a/swamid-interfederations-2.0/idp.uni-tuebingen.de.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-tuebingen.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-tuebingen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ina.mueller@zdv.uni-tuebingen.de,CN=idp.uni-tuebingen.de,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFgjCCBGqgAwIBAgIEC8jyVTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMDgwMjA2MDg1MDE0WhcNMTMwMjA0MDg1MDE0WjCBpzEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
-BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEdMBsGA1UEAxMU
-aWRwLnVuaS10dWViaW5nZW4uZGUxLzAtBgkqhkiG9w0BCQEWIGluYS5tdWVsbGVy
-QHpkdi51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAwvF3YDWFOemsNj9NDUkoQpRQgsx+aeeQCZ1y35/uSgla4I+yfYnDTl6s
-9JMJYmOj2eV/cA2VV4HOXfdoNa60eXbkUlZtP01TPAXwXo9GkbvU+p0DkGtqRIBL
-l15iICfyCvirTJxx+PWGx4xNx9q81CYnFQCIFUHyY9I0k50KcGrwCVryZeML1QKq
-9WfLglLFhmXI6TsqvR3lezSIqXSuFYsI3MjuZK2OIvWLt/+axtkacivrUk/l1V2H
-kfGiWc0Y9VWSakZsQx5IP/cMYqXTjHQJ/qW+OayQNz41Ypc4S/rUDIceCHXD1nG3
-eCfDVzAMHBzk8IbAMmzEl07kLhHW1wIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO1rAGT4
-4J3qQtBFt4LU/4MFq8BMMB8GA1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOo
-MCsGA1UdEQQkMCKBIGluYS5tdWVsbGVyQHpkdi51bmktdHVlYmluZ2VuLmRlMIGT
-BgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3Np
-Yy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDBCoECgPoY8aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2lj
-LXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
-AAOCAQEABA2WUBNLmvmOUWIXgC1LmkPnqG1P0wJSEKQJagxkEA33OmH2W4pZfiYH
-FCoX8P+LhVOkm7/YSn8Lj+YiSDqPaLj68xVALxI/gEwlqCSjetrduZXaBtfBRiZQ
-0ivesrF4VtSoc4wt4/dwyalGsPmIcfq0kKo8JeBOJn5wQx8ZIpY75yTxNGFtS3L8
-Ed/KcQ8+F/LmSYssK4c0ixTbAV5q6Qq9iZIfaxmS3+LNYPLvT1OFIanKDLB9/dpN
-wWZ8hcZQHdyQBl2j8ETzzg5kpQESFsfmrfJiOfY/BqWQ0ojH5jBe5RC9Tj3yCmqc
-9j5tf0lrT5puXhlRkHACNHL8oRPU7A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ina.mueller@zdv.uni-tuebingen.de,CN=idp.uni-tuebingen.de,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFgjCCBGqgAwIBAgIEC8jyVTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMDgwMjA2MDg1MDE0WhcNMTMwMjA0MDg1MDE0WjCBpzEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
-BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEdMBsGA1UEAxMU
-aWRwLnVuaS10dWViaW5nZW4uZGUxLzAtBgkqhkiG9w0BCQEWIGluYS5tdWVsbGVy
-QHpkdi51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAwvF3YDWFOemsNj9NDUkoQpRQgsx+aeeQCZ1y35/uSgla4I+yfYnDTl6s
-9JMJYmOj2eV/cA2VV4HOXfdoNa60eXbkUlZtP01TPAXwXo9GkbvU+p0DkGtqRIBL
-l15iICfyCvirTJxx+PWGx4xNx9q81CYnFQCIFUHyY9I0k50KcGrwCVryZeML1QKq
-9WfLglLFhmXI6TsqvR3lezSIqXSuFYsI3MjuZK2OIvWLt/+axtkacivrUk/l1V2H
-kfGiWc0Y9VWSakZsQx5IP/cMYqXTjHQJ/qW+OayQNz41Ypc4S/rUDIceCHXD1nG3
-eCfDVzAMHBzk8IbAMmzEl07kLhHW1wIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO1rAGT4
-4J3qQtBFt4LU/4MFq8BMMB8GA1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOo
-MCsGA1UdEQQkMCKBIGluYS5tdWVsbGVyQHpkdi51bmktdHVlYmluZ2VuLmRlMIGT
-BgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3Np
-Yy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDBCoECgPoY8aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2lj
-LXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
-AAOCAQEABA2WUBNLmvmOUWIXgC1LmkPnqG1P0wJSEKQJagxkEA33OmH2W4pZfiYH
-FCoX8P+LhVOkm7/YSn8Lj+YiSDqPaLj68xVALxI/gEwlqCSjetrduZXaBtfBRiZQ
-0ivesrF4VtSoc4wt4/dwyalGsPmIcfq0kKo8JeBOJn5wQx8ZIpY75yTxNGFtS3L8
-Ed/KcQ8+F/LmSYssK4c0ixTbAV5q6Qq9iZIfaxmS3+LNYPLvT1OFIanKDLB9/dpN
-wWZ8hcZQHdyQBl2j8ETzzg5kpQESFsfmrfJiOfY/BqWQ0ojH5jBe5RC9Tj3yCmqc
-9j5tf0lrT5puXhlRkHACNHL8oRPU7A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-tuebingen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-tuebingen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-tuebingen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ina.mueller@zdv.uni-tuebingen.de,CN=idp.uni-tuebingen.de,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFgjCCBGqgAwIBAgIEC8jyVTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMDgwMjA2MDg1MDE0WhcNMTMwMjA0MDg1MDE0WjCBpzEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
-BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEdMBsGA1UEAxMU
-aWRwLnVuaS10dWViaW5nZW4uZGUxLzAtBgkqhkiG9w0BCQEWIGluYS5tdWVsbGVy
-QHpkdi51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAwvF3YDWFOemsNj9NDUkoQpRQgsx+aeeQCZ1y35/uSgla4I+yfYnDTl6s
-9JMJYmOj2eV/cA2VV4HOXfdoNa60eXbkUlZtP01TPAXwXo9GkbvU+p0DkGtqRIBL
-l15iICfyCvirTJxx+PWGx4xNx9q81CYnFQCIFUHyY9I0k50KcGrwCVryZeML1QKq
-9WfLglLFhmXI6TsqvR3lezSIqXSuFYsI3MjuZK2OIvWLt/+axtkacivrUk/l1V2H
-kfGiWc0Y9VWSakZsQx5IP/cMYqXTjHQJ/qW+OayQNz41Ypc4S/rUDIceCHXD1nG3
-eCfDVzAMHBzk8IbAMmzEl07kLhHW1wIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO1rAGT4
-4J3qQtBFt4LU/4MFq8BMMB8GA1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOo
-MCsGA1UdEQQkMCKBIGluYS5tdWVsbGVyQHpkdi51bmktdHVlYmluZ2VuLmRlMIGT
-BgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3Np
-Yy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDBCoECgPoY8aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2lj
-LXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
-AAOCAQEABA2WUBNLmvmOUWIXgC1LmkPnqG1P0wJSEKQJagxkEA33OmH2W4pZfiYH
-FCoX8P+LhVOkm7/YSn8Lj+YiSDqPaLj68xVALxI/gEwlqCSjetrduZXaBtfBRiZQ
-0ivesrF4VtSoc4wt4/dwyalGsPmIcfq0kKo8JeBOJn5wQx8ZIpY75yTxNGFtS3L8
-Ed/KcQ8+F/LmSYssK4c0ixTbAV5q6Qq9iZIfaxmS3+LNYPLvT1OFIanKDLB9/dpN
-wWZ8hcZQHdyQBl2j8ETzzg5kpQESFsfmrfJiOfY/BqWQ0ojH5jBe5RC9Tj3yCmqc
-9j5tf0lrT5puXhlRkHACNHL8oRPU7A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-tuebingen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ina.mueller@zdv.uni-tuebingen.de,CN=idp.uni-tuebingen.de,OU=Zentrum fuer Datenverarbeitung,O=Universitaet Tuebingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFgjCCBGqgAwIBAgIEC8jyVTANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFR1ZWJpbmdlbjEcMBoGA1UEAxMTR2xv
-YmFsLVVOSVRVRS1DQSAwMTEpMCcGCSqGSIb3DQEJARYadW5pdHVlLWNhQHVuaS10
-dWViaW5nZW4uZGUwHhcNMDgwMjA2MDg1MDE0WhcNMTMwMjA0MDg1MDE0WjCBpzEL
-MAkGA1UEBhMCREUxHzAdBgNVBAoTFlVuaXZlcnNpdGFldCBUdWViaW5nZW4xJzAl
-BgNVBAsTHlplbnRydW0gZnVlciBEYXRlbnZlcmFyYmVpdHVuZzEdMBsGA1UEAxMU
-aWRwLnVuaS10dWViaW5nZW4uZGUxLzAtBgkqhkiG9w0BCQEWIGluYS5tdWVsbGVy
-QHpkdi51bmktdHVlYmluZ2VuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAwvF3YDWFOemsNj9NDUkoQpRQgsx+aeeQCZ1y35/uSgla4I+yfYnDTl6s
-9JMJYmOj2eV/cA2VV4HOXfdoNa60eXbkUlZtP01TPAXwXo9GkbvU+p0DkGtqRIBL
-l15iICfyCvirTJxx+PWGx4xNx9q81CYnFQCIFUHyY9I0k50KcGrwCVryZeML1QKq
-9WfLglLFhmXI6TsqvR3lezSIqXSuFYsI3MjuZK2OIvWLt/+axtkacivrUk/l1V2H
-kfGiWc0Y9VWSakZsQx5IP/cMYqXTjHQJ/qW+OayQNz41Ypc4S/rUDIceCHXD1nG3
-eCfDVzAMHBzk8IbAMmzEl07kLhHW1wIDAQABo4IB4zCCAd8wCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFO1rAGT4
-4J3qQtBFt4LU/4MFq8BMMB8GA1UdIwQYMBaAFLDBu2g1f+LWQZwaca/g/EE0zcOo
-MCsGA1UdEQQkMCKBIGluYS5tdWVsbGVyQHpkdi51bmktdHVlYmluZ2VuLmRlMIGT
-BgNVHR8EgYswgYgwQqBAoD6GPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvY2xhc3Np
-Yy11bml0dWUtY2EvcHViL2NybC9nX2NhY3JsLmNybDBCoECgPoY8aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGsBggrBgEFBQcBAQSBnzCBnDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9jbGFzc2ljLXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0
-LmNydDBMBggrBgEFBQcwAoZAaHR0cDovL2NkcDIucGNhLmRmbi5kZS9jbGFzc2lj
-LXVuaXR1ZS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUF
-AAOCAQEABA2WUBNLmvmOUWIXgC1LmkPnqG1P0wJSEKQJagxkEA33OmH2W4pZfiYH
-FCoX8P+LhVOkm7/YSn8Lj+YiSDqPaLj68xVALxI/gEwlqCSjetrduZXaBtfBRiZQ
-0ivesrF4VtSoc4wt4/dwyalGsPmIcfq0kKo8JeBOJn5wQx8ZIpY75yTxNGFtS3L8
-Ed/KcQ8+F/LmSYssK4c0ixTbAV5q6Qq9iZIfaxmS3+LNYPLvT1OFIanKDLB9/dpN
-wWZ8hcZQHdyQBl2j8ETzzg5kpQESFsfmrfJiOfY/BqWQ0ojH5jBe5RC9Tj3yCmqc
-9j5tf0lrT5puXhlRkHACNHL8oRPU7A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-tuebingen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-tuebingen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Tübingen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Tübingen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-tuebingen.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Dr. Abele</SurName>
-    <EmailAddress>heinrich.abele@uni-tuebingen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ina</GivenName>
-    <SurName>Müller</SurName>
-    <EmailAddress>ina.mueller@uni-tuebingen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-ulm.de.xml b/swamid-interfederations-2.0/idp.uni-ulm.de.xml
deleted file mode 100644
index 2bbb7205..00000000
--- a/swamid-interfederations-2.0/idp.uni-ulm.de.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-ulm.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-ulm.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-ulm.de,O=Universitaet Ulm,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEvDCCA6SgAwIBAgIED0oPFzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJE
-RTEZMBcGA1UEChMQVW5pdmVyc2l0YWV0IFVsbTEaMBgGA1UEAxMRR2xvYmFsLVVu
-aS1VbG0tQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQHVuaS11bG0uZGUwHhcNMDkxMjE3
-MjAxNjA3WhcNMTQxMjE2MjAxNjA3WjBBMQswCQYDVQQGEwJERTEZMBcGA1UEChMQ
-VW5pdmVyc2l0YWV0IFVsbTEXMBUGA1UEAxMOaWRwLnVuaS11bG0uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa1uAhzXYlrfbnqAJvy7G4VaHcx/QQ
-TqCcQ21kuCgRkeZGl/42uclLIKrNr14heO8WhSz+h0gN+M4uXw17+x9Mw0UbFZG9
-noBSsIT8hH1vtuQZEhk6Dro1mR/ivBMAjn/Lb38C6tGqcF2+d7sHHLLxwXaLTHsK
-+PWzwXK9PV8uaA7W8eD+Ay0uckt1kbMI62MnzVPgYSeAvRV/ZACduJFxg234Qkax
-qE/U4aMf5OvL1YDsNZhEoxcFpOohcSkeUawd1b84mx4x6kipq3ND/LvKKC0Q3pJB
-+j+14FaOPOeQwOzNs+6/6STcm0wWi1y42f+NOdTX2MvOGPGzzZ8d++A5AgMBAAGj
-ggGZMIIBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM9hLeiCB5+pV62kKk0BvuykNVkCMB8G
-A1UdIwQYMBaAFLN7Dz2jh7bPZO3Cdl3C2paXyaDfMH8GA1UdHwR4MHYwOaA3oDWG
-M2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXVsbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA5oDegNYYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMIGaBggrBgEFBQcBAQSBjTCBijBDBggrBgEFBQcwAoY3
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBDBggrBgEFBQcwAoY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
-dWxtLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-s2YjhHnGAGBE7o3eSFGDSnCe+yGyICqHnYwyixCLjTIefHcWJU9BHxW1/gtdQvmF
-da6e9tCgasecljD95RzwMosmwih5XG3qyt4BjZfohyhttNuXag18lAc+LzUD+BTG
-KbZ9DL1NRVB6RYyLJrTxw13RfEEL8+gs5wdYPq/h83QWOkphkd1TP9DHaqzz9bRO
-AO5TixVh/i4LmgcjWDbH9Y74Jm/kI4IWgr8pTngVM4qlTbxXplZFvvFU7Nhp1SSW
-NypMHoJG/p0BErQIyXM+WznR5GG5GU0T0wkBSwps7A2ZM/qgP+xtYLdw8vxFSdfP
-jrSXV8bqE4onz+nFV6gyew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-ulm.de,O=Universitaet Ulm,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEvDCCA6SgAwIBAgIED0oPFzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJE
-RTEZMBcGA1UEChMQVW5pdmVyc2l0YWV0IFVsbTEaMBgGA1UEAxMRR2xvYmFsLVVu
-aS1VbG0tQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQHVuaS11bG0uZGUwHhcNMDkxMjE3
-MjAxNjA3WhcNMTQxMjE2MjAxNjA3WjBBMQswCQYDVQQGEwJERTEZMBcGA1UEChMQ
-VW5pdmVyc2l0YWV0IFVsbTEXMBUGA1UEAxMOaWRwLnVuaS11bG0uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa1uAhzXYlrfbnqAJvy7G4VaHcx/QQ
-TqCcQ21kuCgRkeZGl/42uclLIKrNr14heO8WhSz+h0gN+M4uXw17+x9Mw0UbFZG9
-noBSsIT8hH1vtuQZEhk6Dro1mR/ivBMAjn/Lb38C6tGqcF2+d7sHHLLxwXaLTHsK
-+PWzwXK9PV8uaA7W8eD+Ay0uckt1kbMI62MnzVPgYSeAvRV/ZACduJFxg234Qkax
-qE/U4aMf5OvL1YDsNZhEoxcFpOohcSkeUawd1b84mx4x6kipq3ND/LvKKC0Q3pJB
-+j+14FaOPOeQwOzNs+6/6STcm0wWi1y42f+NOdTX2MvOGPGzzZ8d++A5AgMBAAGj
-ggGZMIIBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM9hLeiCB5+pV62kKk0BvuykNVkCMB8G
-A1UdIwQYMBaAFLN7Dz2jh7bPZO3Cdl3C2paXyaDfMH8GA1UdHwR4MHYwOaA3oDWG
-M2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXVsbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA5oDegNYYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMIGaBggrBgEFBQcBAQSBjTCBijBDBggrBgEFBQcwAoY3
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBDBggrBgEFBQcwAoY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
-dWxtLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-s2YjhHnGAGBE7o3eSFGDSnCe+yGyICqHnYwyixCLjTIefHcWJU9BHxW1/gtdQvmF
-da6e9tCgasecljD95RzwMosmwih5XG3qyt4BjZfohyhttNuXag18lAc+LzUD+BTG
-KbZ9DL1NRVB6RYyLJrTxw13RfEEL8+gs5wdYPq/h83QWOkphkd1TP9DHaqzz9bRO
-AO5TixVh/i4LmgcjWDbH9Y74Jm/kI4IWgr8pTngVM4qlTbxXplZFvvFU7Nhp1SSW
-NypMHoJG/p0BErQIyXM+WznR5GG5GU0T0wkBSwps7A2ZM/qgP+xtYLdw8vxFSdfP
-jrSXV8bqE4onz+nFV6gyew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-ulm.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-ulm.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-ulm.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-ulm.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-ulm.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-ulm.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-ulm.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-ulm.de,O=Universitaet Ulm,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEvDCCA6SgAwIBAgIED0oPFzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJE
-RTEZMBcGA1UEChMQVW5pdmVyc2l0YWV0IFVsbTEaMBgGA1UEAxMRR2xvYmFsLVVu
-aS1VbG0tQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQHVuaS11bG0uZGUwHhcNMDkxMjE3
-MjAxNjA3WhcNMTQxMjE2MjAxNjA3WjBBMQswCQYDVQQGEwJERTEZMBcGA1UEChMQ
-VW5pdmVyc2l0YWV0IFVsbTEXMBUGA1UEAxMOaWRwLnVuaS11bG0uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa1uAhzXYlrfbnqAJvy7G4VaHcx/QQ
-TqCcQ21kuCgRkeZGl/42uclLIKrNr14heO8WhSz+h0gN+M4uXw17+x9Mw0UbFZG9
-noBSsIT8hH1vtuQZEhk6Dro1mR/ivBMAjn/Lb38C6tGqcF2+d7sHHLLxwXaLTHsK
-+PWzwXK9PV8uaA7W8eD+Ay0uckt1kbMI62MnzVPgYSeAvRV/ZACduJFxg234Qkax
-qE/U4aMf5OvL1YDsNZhEoxcFpOohcSkeUawd1b84mx4x6kipq3ND/LvKKC0Q3pJB
-+j+14FaOPOeQwOzNs+6/6STcm0wWi1y42f+NOdTX2MvOGPGzzZ8d++A5AgMBAAGj
-ggGZMIIBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM9hLeiCB5+pV62kKk0BvuykNVkCMB8G
-A1UdIwQYMBaAFLN7Dz2jh7bPZO3Cdl3C2paXyaDfMH8GA1UdHwR4MHYwOaA3oDWG
-M2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXVsbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA5oDegNYYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMIGaBggrBgEFBQcBAQSBjTCBijBDBggrBgEFBQcwAoY3
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBDBggrBgEFBQcwAoY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
-dWxtLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-s2YjhHnGAGBE7o3eSFGDSnCe+yGyICqHnYwyixCLjTIefHcWJU9BHxW1/gtdQvmF
-da6e9tCgasecljD95RzwMosmwih5XG3qyt4BjZfohyhttNuXag18lAc+LzUD+BTG
-KbZ9DL1NRVB6RYyLJrTxw13RfEEL8+gs5wdYPq/h83QWOkphkd1TP9DHaqzz9bRO
-AO5TixVh/i4LmgcjWDbH9Y74Jm/kI4IWgr8pTngVM4qlTbxXplZFvvFU7Nhp1SSW
-NypMHoJG/p0BErQIyXM+WznR5GG5GU0T0wkBSwps7A2ZM/qgP+xtYLdw8vxFSdfP
-jrSXV8bqE4onz+nFV6gyew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-ulm.de,O=Universitaet Ulm,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEvDCCA6SgAwIBAgIED0oPFzANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJE
-RTEZMBcGA1UEChMQVW5pdmVyc2l0YWV0IFVsbTEaMBgGA1UEAxMRR2xvYmFsLVVu
-aS1VbG0tQ0ExHDAaBgkqhkiG9w0BCQEWDWNhQHVuaS11bG0uZGUwHhcNMDkxMjE3
-MjAxNjA3WhcNMTQxMjE2MjAxNjA3WjBBMQswCQYDVQQGEwJERTEZMBcGA1UEChMQ
-VW5pdmVyc2l0YWV0IFVsbTEXMBUGA1UEAxMOaWRwLnVuaS11bG0uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa1uAhzXYlrfbnqAJvy7G4VaHcx/QQ
-TqCcQ21kuCgRkeZGl/42uclLIKrNr14heO8WhSz+h0gN+M4uXw17+x9Mw0UbFZG9
-noBSsIT8hH1vtuQZEhk6Dro1mR/ivBMAjn/Lb38C6tGqcF2+d7sHHLLxwXaLTHsK
-+PWzwXK9PV8uaA7W8eD+Ay0uckt1kbMI62MnzVPgYSeAvRV/ZACduJFxg234Qkax
-qE/U4aMf5OvL1YDsNZhEoxcFpOohcSkeUawd1b84mx4x6kipq3ND/LvKKC0Q3pJB
-+j+14FaOPOeQwOzNs+6/6STcm0wWi1y42f+NOdTX2MvOGPGzzZ8d++A5AgMBAAGj
-ggGZMIIBlTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFM9hLeiCB5+pV62kKk0BvuykNVkCMB8G
-A1UdIwQYMBaAFLN7Dz2jh7bPZO3Cdl3C2paXyaDfMH8GA1UdHwR4MHYwOaA3oDWG
-M2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXVsbS1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA5oDegNYYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMIGaBggrBgEFBQcBAQSBjTCBijBDBggrBgEFBQcwAoY3
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktdWxtLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBDBggrBgEFBQcwAoY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
-dWxtLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEA
-s2YjhHnGAGBE7o3eSFGDSnCe+yGyICqHnYwyixCLjTIefHcWJU9BHxW1/gtdQvmF
-da6e9tCgasecljD95RzwMosmwih5XG3qyt4BjZfohyhttNuXag18lAc+LzUD+BTG
-KbZ9DL1NRVB6RYyLJrTxw13RfEEL8+gs5wdYPq/h83QWOkphkd1TP9DHaqzz9bRO
-AO5TixVh/i4LmgcjWDbH9Y74Jm/kI4IWgr8pTngVM4qlTbxXplZFvvFU7Nhp1SSW
-NypMHoJG/p0BErQIyXM+WznR5GG5GU0T0wkBSwps7A2ZM/qgP+xtYLdw8vxFSdfP
-jrSXV8bqE4onz+nFV6gyew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-ulm.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-ulm.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Ulm</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Ulm</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-ulm.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Harald</GivenName>
-    <SurName>Däubler</SurName>
-    <EmailAddress>harald.daeubler@uni-ulm.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml
deleted file mode 100644
index a3d545fe..00000000
--- a/swamid-interfederations-2.0/idp.uni-wuppertal.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-wuppertal.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-05T14:09: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>
-  </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-wuppertal.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Bergische Universität Wuppertal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Wuppertal</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Mitglieder der Bergischen Universität Wuppertal</mdui:Description>
-        <mdui:Description xml:lang="en">Members at University of Wuppertal</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp.uni-wuppertal.de/idp/images/buw-mini.png</mdui:Logo>
-        <mdui:Logo height="70" width="200">https://idp.uni-wuppertal.de/idp/images/buw_log.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1
-cHBlcnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0
-YWwxDDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEG
-CSqGSIb3DQEJARYUcGtpQHVuaS13dXBwZXJ0YWwuZGUwHhcNMTUwMzE4MTIyNjEz
-WhcNMTkwNzA5MjM1OTAwWjCBiTELMAkGA1UEBhMCREUxHDAaBgNVBAgME05vcmRy
-aGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcMCVd1cHBlcnRhbDEpMCcGA1UECgwgQmVy
-Z2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwxHTAbBgNVBAMMFGlkcC51bmkt
-d3VwcGVydGFsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncKY
-nT23i7mXryQsRo9hoc0c5MLAA8Tffh8xJtLrdHZgt5NwyjXeFxTgFa6EAGfbJVOq
-RzPzTvrRKmfbv6rftqMNs2m3qoNePiESt77Nw14G1mPOEA2nY5nxz59qHQOCkOuO
-j3hB3CV43WGMrn8uxWcIPb7eQQGPE/DNX2NyEKpbkgVM3rSYHY8wbwtvRcqlhnQf
-EsNWMykBo3GjbTMvuK+nN/xbES8T623N6MVPlCDgNCTOAI3+VGAz2NOMNA4J1hrA
-+xj3TQ76uwm85E6nDcVITe1uDCW7aSW5/0zLXuX0WL+YQTdm721Mcy4RraZ5Nht3
-5fM7Yd/AYs1g6BfAXQIDAQABo4ICWzCCAlcwTwYDVR0gBEgwRjARBg8rBgEEAYGt
-IYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYL
-KwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQHaE47CvxpJd6L83/B5MjuYAX6
-czAfBgNVHSMEGDAWgBQLpNtTFRSiYzkI4dRpouy3IHkMGjAfBgNVHREEGDAWghRp
-ZHAudW5pLXd1cHBlcnRhbC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS13dXBwZXJ0YWwtY2EvcHViL2NybC9jYWNybC5j
-cmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXd1cHBlcnRhbC1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYBBQUHAQEEgc4wgcswMwYIKwYBBQUH
-MAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBJBggr
-BgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAFUjGgPg4NuNIoi7FRNSrv1a6qy3k0wWUaJJH
-mWsoQI5OT42Z9l6ifkInmyMPtvD1ldedlVxuM858gDIo/0CLa0H5cfq72hKZ+sW2
-LOohAAXb1b7hHq2a9Wf+ENal79LcQvd3sVW3bdgIXt/HKBPOC0LwMKjkylwaqwzm
-Q5M214/3Pn24DCLPo1lsfBNX5ObHtSf1ganwEc7sml/pb1ja/W/JDhwrPOuyZUs2
-/m3eQbz+tfpT6b28oogqyQL0US+Mu/zSTJzIGD6DiK4cwmstjmlPGJ1LhK3ZaAKy
-kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
-</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>idp.uni-wuppertal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1
-cHBlcnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0
-YWwxDDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEG
-CSqGSIb3DQEJARYUcGtpQHVuaS13dXBwZXJ0YWwuZGUwHhcNMTUwMzE4MTIyNjEz
-WhcNMTkwNzA5MjM1OTAwWjCBiTELMAkGA1UEBhMCREUxHDAaBgNVBAgME05vcmRy
-aGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcMCVd1cHBlcnRhbDEpMCcGA1UECgwgQmVy
-Z2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwxHTAbBgNVBAMMFGlkcC51bmkt
-d3VwcGVydGFsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncKY
-nT23i7mXryQsRo9hoc0c5MLAA8Tffh8xJtLrdHZgt5NwyjXeFxTgFa6EAGfbJVOq
-RzPzTvrRKmfbv6rftqMNs2m3qoNePiESt77Nw14G1mPOEA2nY5nxz59qHQOCkOuO
-j3hB3CV43WGMrn8uxWcIPb7eQQGPE/DNX2NyEKpbkgVM3rSYHY8wbwtvRcqlhnQf
-EsNWMykBo3GjbTMvuK+nN/xbES8T623N6MVPlCDgNCTOAI3+VGAz2NOMNA4J1hrA
-+xj3TQ76uwm85E6nDcVITe1uDCW7aSW5/0zLXuX0WL+YQTdm721Mcy4RraZ5Nht3
-5fM7Yd/AYs1g6BfAXQIDAQABo4ICWzCCAlcwTwYDVR0gBEgwRjARBg8rBgEEAYGt
-IYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYL
-KwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQHaE47CvxpJd6L83/B5MjuYAX6
-czAfBgNVHSMEGDAWgBQLpNtTFRSiYzkI4dRpouy3IHkMGjAfBgNVHREEGDAWghRp
-ZHAudW5pLXd1cHBlcnRhbC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS13dXBwZXJ0YWwtY2EvcHViL2NybC9jYWNybC5j
-cmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXd1cHBlcnRhbC1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYBBQUHAQEEgc4wgcswMwYIKwYBBQUH
-MAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBJBggr
-BgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAFUjGgPg4NuNIoi7FRNSrv1a6qy3k0wWUaJJH
-mWsoQI5OT42Z9l6ifkInmyMPtvD1ldedlVxuM858gDIo/0CLa0H5cfq72hKZ+sW2
-LOohAAXb1b7hHq2a9Wf+ENal79LcQvd3sVW3bdgIXt/HKBPOC0LwMKjkylwaqwzm
-Q5M214/3Pn24DCLPo1lsfBNX5ObHtSf1ganwEc7sml/pb1ja/W/JDhwrPOuyZUs2
-/m3eQbz+tfpT6b28oogqyQL0US+Mu/zSTJzIGD6DiK4cwmstjmlPGJ1LhK3ZaAKy
-kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <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.uni-wuppertal.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-wuppertal.de/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-wuppertal.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1
-cHBlcnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0
-YWwxDDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEG
-CSqGSIb3DQEJARYUcGtpQHVuaS13dXBwZXJ0YWwuZGUwHhcNMTUwMzE4MTIyNjEz
-WhcNMTkwNzA5MjM1OTAwWjCBiTELMAkGA1UEBhMCREUxHDAaBgNVBAgME05vcmRy
-aGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcMCVd1cHBlcnRhbDEpMCcGA1UECgwgQmVy
-Z2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwxHTAbBgNVBAMMFGlkcC51bmkt
-d3VwcGVydGFsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncKY
-nT23i7mXryQsRo9hoc0c5MLAA8Tffh8xJtLrdHZgt5NwyjXeFxTgFa6EAGfbJVOq
-RzPzTvrRKmfbv6rftqMNs2m3qoNePiESt77Nw14G1mPOEA2nY5nxz59qHQOCkOuO
-j3hB3CV43WGMrn8uxWcIPb7eQQGPE/DNX2NyEKpbkgVM3rSYHY8wbwtvRcqlhnQf
-EsNWMykBo3GjbTMvuK+nN/xbES8T623N6MVPlCDgNCTOAI3+VGAz2NOMNA4J1hrA
-+xj3TQ76uwm85E6nDcVITe1uDCW7aSW5/0zLXuX0WL+YQTdm721Mcy4RraZ5Nht3
-5fM7Yd/AYs1g6BfAXQIDAQABo4ICWzCCAlcwTwYDVR0gBEgwRjARBg8rBgEEAYGt
-IYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYL
-KwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQHaE47CvxpJd6L83/B5MjuYAX6
-czAfBgNVHSMEGDAWgBQLpNtTFRSiYzkI4dRpouy3IHkMGjAfBgNVHREEGDAWghRp
-ZHAudW5pLXd1cHBlcnRhbC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS13dXBwZXJ0YWwtY2EvcHViL2NybC9jYWNybC5j
-cmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXd1cHBlcnRhbC1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYBBQUHAQEEgc4wgcswMwYIKwYBBQUH
-MAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBJBggr
-BgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAFUjGgPg4NuNIoi7FRNSrv1a6qy3k0wWUaJJH
-mWsoQI5OT42Z9l6ifkInmyMPtvD1ldedlVxuM858gDIo/0CLa0H5cfq72hKZ+sW2
-LOohAAXb1b7hHq2a9Wf+ENal79LcQvd3sVW3bdgIXt/HKBPOC0LwMKjkylwaqwzm
-Q5M214/3Pn24DCLPo1lsfBNX5ObHtSf1ganwEc7sml/pb1ja/W/JDhwrPOuyZUs2
-/m3eQbz+tfpT6b28oogqyQL0US+Mu/zSTJzIGD6DiK4cwmstjmlPGJ1LhK3ZaAKy
-kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
-</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>idp.uni-wuppertal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,L=Wuppertal,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGITCCBQmgAwIBAgIHGSjsdOuLTjANBgkqhkiG9w0BAQsFADCBuDELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1
-cHBlcnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0
-YWwxDDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEG
-CSqGSIb3DQEJARYUcGtpQHVuaS13dXBwZXJ0YWwuZGUwHhcNMTUwMzE4MTIyNjEz
-WhcNMTkwNzA5MjM1OTAwWjCBiTELMAkGA1UEBhMCREUxHDAaBgNVBAgME05vcmRy
-aGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcMCVd1cHBlcnRhbDEpMCcGA1UECgwgQmVy
-Z2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwxHTAbBgNVBAMMFGlkcC51bmkt
-d3VwcGVydGFsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncKY
-nT23i7mXryQsRo9hoc0c5MLAA8Tffh8xJtLrdHZgt5NwyjXeFxTgFa6EAGfbJVOq
-RzPzTvrRKmfbv6rftqMNs2m3qoNePiESt77Nw14G1mPOEA2nY5nxz59qHQOCkOuO
-j3hB3CV43WGMrn8uxWcIPb7eQQGPE/DNX2NyEKpbkgVM3rSYHY8wbwtvRcqlhnQf
-EsNWMykBo3GjbTMvuK+nN/xbES8T623N6MVPlCDgNCTOAI3+VGAz2NOMNA4J1hrA
-+xj3TQ76uwm85E6nDcVITe1uDCW7aSW5/0zLXuX0WL+YQTdm721Mcy4RraZ5Nht3
-5fM7Yd/AYs1g6BfAXQIDAQABo4ICWzCCAlcwTwYDVR0gBEgwRjARBg8rBgEEAYGt
-IYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYL
-KwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQHaE47CvxpJd6L83/B5MjuYAX6
-czAfBgNVHSMEGDAWgBQLpNtTFRSiYzkI4dRpouy3IHkMGjAfBgNVHREEGDAWghRp
-ZHAudW5pLXd1cHBlcnRhbC5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS13dXBwZXJ0YWwtY2EvcHViL2NybC9jYWNybC5j
-cmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXd1cHBlcnRhbC1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYBBQUHAQEEgc4wgcswMwYIKwYBBQUH
-MAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBJBggr
-BgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQsFAAOCAQEAFUjGgPg4NuNIoi7FRNSrv1a6qy3k0wWUaJJH
-mWsoQI5OT42Z9l6ifkInmyMPtvD1ldedlVxuM858gDIo/0CLa0H5cfq72hKZ+sW2
-LOohAAXb1b7hHq2a9Wf+ENal79LcQvd3sVW3bdgIXt/HKBPOC0LwMKjkylwaqwzm
-Q5M214/3Pn24DCLPo1lsfBNX5ObHtSf1ganwEc7sml/pb1ja/W/JDhwrPOuyZUs2
-/m3eQbz+tfpT6b28oogqyQL0US+Mu/zSTJzIGD6DiK4cwmstjmlPGJ1LhK3ZaAKy
-kJ3/tUy85gUFTbHNPD8TBNxW57v6A2RTc+MXQbWhInEOGxuKdg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de: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">e168</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e168</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Bergische Universität Wuppertal</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wuppertal</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-wuppertal.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-wuppertal.de/en/home.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rene</md:GivenName>
-    <md:SurName>Zeipelt</md:SurName>
-    <md:EmailAddress>mailto:zeipelt@uni-wuppertal.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Rene</md:GivenName>
-    <md:SurName>Zeipelt</md:SurName>
-    <md:EmailAddress>mailto:zeipelt@uni-wuppertal.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uni-wuppertal.de.xml b/swamid-interfederations-2.0/idp.uni-wuppertal.de.xml
deleted file mode 100644
index 92786a21..00000000
--- a/swamid-interfederations-2.0/idp.uni-wuppertal.de.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uni-wuppertal.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuppertal.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFaTCCBFGgAwIBAgIED/eV6DANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
-REUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1cHBl
-cnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwx
-DDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEGCSqG
-SIb3DQEJARYUcGtpQHVuaS13dXBwZXJ0YWwuZGUwHhcNMTAwNDI4MTExMzI4WhcN
-MTUwNDI3MTExMzI4WjBXMQswCQYDVQQGEwJERTEpMCcGA1UEChMgQmVyZ2lzY2hl
-IFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwxHTAbBgNVBAMTFGlkcC51bmktd3VwcGVy
-dGFsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncKYnT23i7mX
-ryQsRo9hoc0c5MLAA8Tffh8xJtLrdHZgt5NwyjXeFxTgFa6EAGfbJVOqRzPzTvrR
-Kmfbv6rftqMNs2m3qoNePiESt77Nw14G1mPOEA2nY5nxz59qHQOCkOuOj3hB3CV4
-3WGMrn8uxWcIPb7eQQGPE/DNX2NyEKpbkgVM3rSYHY8wbwtvRcqlhnQfEsNWMykB
-o3GjbTMvuK+nN/xbES8T623N6MVPlCDgNCTOAI3+VGAz2NOMNA4J1hrA+xj3TQ76
-uwm85E6nDcVITe1uDCW7aSW5/0zLXuX0WL+YQTdm721Mcy4RraZ5Nht35fM7Yd/A
-Ys1g6BfAXQIDAQABo4IB2TCCAdUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQHaE47CvxpJd6L
-83/B5MjuYAX6czAfBgNVHSMEGDAWgBQLpNtTFRSiYzkI4dRpouy3IHkMGjAjBgNV
-HREEHDAagRh6ZWlwZWx0QHVuaS13dXBwZXJ0YWwuZGUwgY0GA1UdHwSBhTCBgjA/
-oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
-aS13dXBwZXJ0YWwtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZ
-MIGWMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS13dXBw
-ZXJ0YWwtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS13dXBwZXJ0YWwtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBDVsvT8z+AmPlmk/MEKY5Nt5vP
-w3B3oUunFn+sbe2EKFVHr72cArNYSMGifmfTEMEpq3BStFG/o+oC0r6UEV58sLOk
-Xm3YiD9H82ZAtoHwn73b/bCXftUugPAj/cHXp1VuEA74Gsh+EoeTk2lgD++AdgCN
-7owrEXrDgtZ8howA/wRhEg8QQxrUVviY1wyfxfU4F6RGS7RpQpqrmvx5ER/dkuIs
-dSxphgBVgx8fkgALpLoD+UhRa3rqTA+0ZKRdKQpxBpGU5/3aN6btgI3pbaSbjtYl
-WVERos0F4cDzSzGONgdQWlLLndqyEZwW33kGpnxHgtDXQf9QtbY3JgawBNAV
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uni-wuppertal.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uni-wuppertal.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuppertal.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.uni-wuppertal.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.uni-wuppertal.de,O=Bergische Universitaet Wuppertal,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFaTCCBFGgAwIBAgIED/eV6DANBgkqhkiG9w0BAQUFADCBuDELMAkGA1UEBhMC
-REUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xEjAQBgNVBAcTCVd1cHBl
-cnRhbDEpMCcGA1UEChMgQmVyZ2lzY2hlIFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwx
-DDAKBgNVBAsTA1pJTTEZMBcGA1UEAxMQVW5pLVd1cHBlcnRhbCBDQTEjMCEGCSqG
-SIb3DQEJARYUcGtpQHVuaS13dXBwZXJ0YWwuZGUwHhcNMTAwNDI4MTExMzI4WhcN
-MTUwNDI3MTExMzI4WjBXMQswCQYDVQQGEwJERTEpMCcGA1UEChMgQmVyZ2lzY2hl
-IFVuaXZlcnNpdGFldCBXdXBwZXJ0YWwxHTAbBgNVBAMTFGlkcC51bmktd3VwcGVy
-dGFsLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncKYnT23i7mX
-ryQsRo9hoc0c5MLAA8Tffh8xJtLrdHZgt5NwyjXeFxTgFa6EAGfbJVOqRzPzTvrR
-Kmfbv6rftqMNs2m3qoNePiESt77Nw14G1mPOEA2nY5nxz59qHQOCkOuOj3hB3CV4
-3WGMrn8uxWcIPb7eQQGPE/DNX2NyEKpbkgVM3rSYHY8wbwtvRcqlhnQfEsNWMykB
-o3GjbTMvuK+nN/xbES8T623N6MVPlCDgNCTOAI3+VGAz2NOMNA4J1hrA+xj3TQ76
-uwm85E6nDcVITe1uDCW7aSW5/0zLXuX0WL+YQTdm721Mcy4RraZ5Nht35fM7Yd/A
-Ys1g6BfAXQIDAQABo4IB2TCCAdUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQHaE47CvxpJd6L
-83/B5MjuYAX6czAfBgNVHSMEGDAWgBQLpNtTFRSiYzkI4dRpouy3IHkMGjAjBgNV
-HREEHDAagRh6ZWlwZWx0QHVuaS13dXBwZXJ0YWwuZGUwgY0GA1UdHwSBhTCBgjA/
-oD2gO4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktd3VwcGVydGFsLWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3Vu
-aS13dXBwZXJ0YWwtY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZ
-MIGWMEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS13dXBw
-ZXJ0YWwtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS13dXBwZXJ0YWwtY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBDVsvT8z+AmPlmk/MEKY5Nt5vP
-w3B3oUunFn+sbe2EKFVHr72cArNYSMGifmfTEMEpq3BStFG/o+oC0r6UEV58sLOk
-Xm3YiD9H82ZAtoHwn73b/bCXftUugPAj/cHXp1VuEA74Gsh+EoeTk2lgD++AdgCN
-7owrEXrDgtZ8howA/wRhEg8QQxrUVviY1wyfxfU4F6RGS7RpQpqrmvx5ER/dkuIs
-dSxphgBVgx8fkgALpLoD+UhRa3rqTA+0ZKRdKQpxBpGU5/3aN6btgI3pbaSbjtYl
-WVERos0F4cDzSzGONgdQWlLLndqyEZwW33kGpnxHgtDXQf9QtbY3JgawBNAV
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uni-wuppertal.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bergische Universität Wuppertal</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bergische Universität Wuppertal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-wuppertal.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Rene</GivenName>
-    <SurName>Zeipelt</SurName>
-    <EmailAddress>zeipelt@uni-wuppertal.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rene</GivenName>
-    <SurName>Zeipelt</SurName>
-    <EmailAddress>zeipelt@uni-wuppertal.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 59da3ac0..00000000
--- a/swamid-interfederations-2.0/idp.unibg.it-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,97 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unibg.it/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-11-27T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibg.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Bergamo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Bergamo users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Universita' degli studi di Bergamo</mdui:Description>
-        <mdui:DisplayName xml:lang="it">Università degli studi di Bergamo</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="it">http://www.unibg.it/idem</mdui:InformationURL>
-        <mdui:Logo height="55" width="153">https://idp.unibg.it/logo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>unibg.it</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:45.69548,9.66664</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>
-MIIDZzCCAk+gAwIBAgIJAO63/giuk/ngMA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNV
-BAYTAklUMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQKDAZDSU5FQ0ExFTAT
-BgNVBAMMDGlkcC51bmliZy5pdDAeFw0xNDA0MTQxMzA1MTRaFw0yNDA0MTMxMzA1
-MTRaMEoxCzAJBgNVBAYTAklUMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQK
-DAZDSU5FQ0ExFTATBgNVBAMMDGlkcC51bmliZy5pdDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKpOSuOvQeVjjWlpxbpDz+35Ag9lt4TxUk2ljeTggV2C
-jSrp9HfDwdn3i5+LvFhFeXN+U/iDY9q1ljUsyuG6sPEgkTOUunJOjWXUMQPfNUZ9
-AP6Rn6/AXhpaTv5e6t3tZxac3zhRe+ptPASsabv/GtMkK+Oyfn39+1FP/mnWRM+p
-vIR4MTkOIiNoN4xT/AqshNkMN5zJMrEGiq9oQT4wObjHPjOYanihde0auFMLAXGR
-xYpiq+vsiezitnc2JXNbWVfwieK5FIFGGh94EV4mrui/YGVj+mjF25fqTU7B5YBW
-WENnNtbfiT4qfOGRX2JvV70y5zPbilypbS+nYnn8m8sCAwEAAaNQME4wHQYDVR0O
-BBYEFN2Dnm5ywy81VJkNqIDC/URi/BOkMB8GA1UdIwQYMBaAFN2Dnm5ywy81VJkN
-qIDC/URi/BOkMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADc2os6T
-j9GRr+YXVWu4mP3sYgynhVEMq+7akx22HEmOLbQkhlJc2igNolmQiknG6Dm6KUlY
-MbHTAx1YMF5iW2GFrjXBQa+Ro5aALKf7Q7YW9qsNLlTjNj7ZB4GSPh/J+DR4vZUR
-797WlcR3uIg+696zSTaY5xJVcKdTNOCZ/BLmyo/g1OC/EwQFxU1jCqH+J3FMd0G6
-e9/ZJFUYBBD+yvrOxMnVCRSnh98phe5P3ZdJVZ/LEMVZvv/HghnVKsDUQZDQc6MQ
-wEH76GwmZQFrC65dac+I+viPLUSDmj2lnXVcCpeG85C5Utg4ulhGWISYK2RVbG/P
-MNMgaClKqsoAXo8=
-</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>
-MIIDZzCCAk+gAwIBAgIJAO63/giuk/ngMA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNV
-BAYTAklUMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQKDAZDSU5FQ0ExFTAT
-BgNVBAMMDGlkcC51bmliZy5pdDAeFw0xNDA0MTQxMzA1MTRaFw0yNDA0MTMxMzA1
-MTRaMEoxCzAJBgNVBAYTAklUMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQK
-DAZDSU5FQ0ExFTATBgNVBAMMDGlkcC51bmliZy5pdDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKpOSuOvQeVjjWlpxbpDz+35Ag9lt4TxUk2ljeTggV2C
-jSrp9HfDwdn3i5+LvFhFeXN+U/iDY9q1ljUsyuG6sPEgkTOUunJOjWXUMQPfNUZ9
-AP6Rn6/AXhpaTv5e6t3tZxac3zhRe+ptPASsabv/GtMkK+Oyfn39+1FP/mnWRM+p
-vIR4MTkOIiNoN4xT/AqshNkMN5zJMrEGiq9oQT4wObjHPjOYanihde0auFMLAXGR
-xYpiq+vsiezitnc2JXNbWVfwieK5FIFGGh94EV4mrui/YGVj+mjF25fqTU7B5YBW
-WENnNtbfiT4qfOGRX2JvV70y5zPbilypbS+nYnn8m8sCAwEAAaNQME4wHQYDVR0O
-BBYEFN2Dnm5ywy81VJkNqIDC/URi/BOkMB8GA1UdIwQYMBaAFN2Dnm5ywy81VJkN
-qIDC/URi/BOkMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADc2os6T
-j9GRr+YXVWu4mP3sYgynhVEMq+7akx22HEmOLbQkhlJc2igNolmQiknG6Dm6KUlY
-MbHTAx1YMF5iW2GFrjXBQa+Ro5aALKf7Q7YW9qsNLlTjNj7ZB4GSPh/J+DR4vZUR
-797WlcR3uIg+696zSTaY5xJVcKdTNOCZ/BLmyo/g1OC/EwQFxU1jCqH+J3FMd0G6
-e9/ZJFUYBBD+yvrOxMnVCRSnh98phe5P3ZdJVZ/LEMVZvv/HghnVKsDUQZDQc6MQ
-wEH76GwmZQFrC65dac+I+viPLUSDmj2lnXVcCpeG85C5Utg4ulhGWISYK2RVbG/P
-MNMgaClKqsoAXo8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibg.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibg.it/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unibg.it/simplesaml/shib13/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli studi di Bergamo</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Bergamo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Bergamo</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Bergamo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unibg.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unibg.it/en_index.asp</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IDP</md:GivenName>
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:postmaster@unibg.it</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 40ae6d95..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unibocconi-prod.it/idp/shibboleth">
-  <md: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>
-  </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">unibocconi.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/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.unibocconi.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibocconi.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibocconi.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/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="en">Bocconi University</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Universita' Bocconi</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Bocconi University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Universita' Bocconi</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unibocconi.eu/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unibocconi.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idem@unibocconi.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 105051dc..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unica.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unica.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>unica.it</mdui:DomainHint>
-        <mdui:DomainHint>www.unica.it</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:39.2238411,9.1216613</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unica.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unica.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unica.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unica.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unica.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unica.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unica.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università di Cagliari</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Cagliari State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Cagliari</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Cagliari State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://idp.unica.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unica.it/pub/english/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Assistenza Tecnica</md:SurName>
-    <md:EmailAddress>mailto:idem-help@unica.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 4322dd13..00000000
--- a/swamid-interfederations-2.0/idp.unica.it.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://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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unica.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cagliari State University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Cagliari</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Cagliari State University users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Cagliari</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://people.unica.it/idem/english-info</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://people.unica.it/idem/info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://people.unica.it/idem/rules/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://people.unica.it/idem/regole/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0yOTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17COKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItinGub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0wPAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJKoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJp6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrBbcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/
-                            hie88l1nMwTMMKjmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE=
-                        </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unica.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0yOTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17COKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItinGub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0wPAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJKoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJp6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrBbcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/
-                            hie88l1nMwTMMKjmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE= 
-                        </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 69b7be2e..00000000
--- a/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.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://idp.unicaen.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">University of Caen Normandie</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAV0lEQVQY03XPMQrAMAxD0d7/WOFPxkvAS8YsGUIW36BTS2WoxgcW8tVKrh9g7OwfsLPD4AX2RE7ioB1zlFKjwIwKq3R4ugCM7CBLI89ymY6H6XO0pvDkBhHbxZqnkacaAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.unicaen.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Caen Normandie</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>
-					      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>
-    </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-POST" Location="https://idp.unicaen.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unicaen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unicaen.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Caen Normandie</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Caen Normandie</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unicaen.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Nicolas HEURTEL</md:SurName>
-    <md:EmailAddress>nicolas.heurtel@unicaen.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>David SURVILLE</md:SurName>
-    <md:EmailAddress>david.surville@unicaen.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml
deleted file mode 100644
index e55ef8ef..00000000
--- a/swamid-interfederations-2.0/idp.unical.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unical.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-08-18T09:50:49Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unical.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Calabria</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università della Calabria</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for University of Calabria users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università della Calabria</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.unical.it/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://www.unical.it/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.unical.it/idem/privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://www.unical.it/idem/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>160.97.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>unical.it</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:39.357911,16.225530</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAL8L6FVmAKzC+THRIlDhT8LSevXmMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMMDWlkcC51bmljYWwuaXQwHhcNMTQxMjMxMDkwOTMxWhcN
-MzQxMjMxMDkwOTMxWjAYMRYwFAYDVQQDDA1pZHAudW5pY2FsLml0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlDcrPcuEiQa4Xfj2fqWYz2U2yZ9A3jeL
-Ay9TTfnjvUnCIsxn91nZ/oKOqguDIHfCMgIHuqh2j8SBhgK9XRH99Pw2Rkyxh3mP
-BXODvlX8p1R1irOKEEd5oqNwEgE778vkznyRDvozQ2jDfb0Wu9f3/tbArNZf/H1z
-2xNUyygHQ5b+GmAkcBWlG9hvdbYNmUtHgfrbDZZS9tFGuz/38vPGW7kK2Ix4cuT7
-pc7Toc8c6kz4n5v7OgraCilnZ/G/gKltTVrkpFVuGiKbaOXnSjD39p2vkDtMGGJt
-Db3wIJDDYnbmIqm8Kb2N8+e8PzA1UVicNKh62VO5FCoJuS69avG4+QIDAQABo2Ew
-XzAdBgNVHQ4EFgQUKnbFFsMucKsmi72fGJ8YytDd0GwwPgYDVR0RBDcwNYINaWRw
-LnVuaWNhbC5pdIYkaHR0cHM6Ly9pZHAudW5pY2FsLml0L2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBBQUAA4IBAQAOgtL4MsqXajq8MSDAZ8gx6DC/OdEhinRciYNj
-sMNiDkJhdHp/hgU1PqKBsiw0L4NZYnUweSvkoARzl90LOc7gnTaMF/vF1tcvYFF4
-4lSnQsGeDn09CeJ24N/mAjjiiARoGI0N7ouqtDs8piWEXv/wUFwTCLxc/CHkvRsx
-4GAPwKs+UXU2PcW6sP2qqYPFS+cv2ZXb4gf8mVS0IFbbtLpUxM8M4BoBa5jxnMUX
-+BtpYUkJLCO302UkQygIJBPbnPWRdAJWdQmqpi326apWLQl3XgUWkLpeGPrguo9J
-Z1yQ0FMZWZ/qgnNEvOC4oDUkACRrs4AMyPBb64WlSs4w2O7O
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unical.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unical.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unical.it/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unical.it/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unical.it: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.unical.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unical.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unical.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unical.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unical.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAL8L6FVmAKzC+THRIlDhT8LSevXmMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMMDWlkcC51bmljYWwuaXQwHhcNMTQxMjMxMDkwOTMxWhcN
-MzQxMjMxMDkwOTMxWjAYMRYwFAYDVQQDDA1pZHAudW5pY2FsLml0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlDcrPcuEiQa4Xfj2fqWYz2U2yZ9A3jeL
-Ay9TTfnjvUnCIsxn91nZ/oKOqguDIHfCMgIHuqh2j8SBhgK9XRH99Pw2Rkyxh3mP
-BXODvlX8p1R1irOKEEd5oqNwEgE778vkznyRDvozQ2jDfb0Wu9f3/tbArNZf/H1z
-2xNUyygHQ5b+GmAkcBWlG9hvdbYNmUtHgfrbDZZS9tFGuz/38vPGW7kK2Ix4cuT7
-pc7Toc8c6kz4n5v7OgraCilnZ/G/gKltTVrkpFVuGiKbaOXnSjD39p2vkDtMGGJt
-Db3wIJDDYnbmIqm8Kb2N8+e8PzA1UVicNKh62VO5FCoJuS69avG4+QIDAQABo2Ew
-XzAdBgNVHQ4EFgQUKnbFFsMucKsmi72fGJ8YytDd0GwwPgYDVR0RBDcwNYINaWRw
-LnVuaWNhbC5pdIYkaHR0cHM6Ly9pZHAudW5pY2FsLml0L2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBBQUAA4IBAQAOgtL4MsqXajq8MSDAZ8gx6DC/OdEhinRciYNj
-sMNiDkJhdHp/hgU1PqKBsiw0L4NZYnUweSvkoARzl90LOc7gnTaMF/vF1tcvYFF4
-4lSnQsGeDn09CeJ24N/mAjjiiARoGI0N7ouqtDs8piWEXv/wUFwTCLxc/CHkvRsx
-4GAPwKs+UXU2PcW6sP2qqYPFS+cv2ZXb4gf8mVS0IFbbtLpUxM8M4BoBa5jxnMUX
-+BtpYUkJLCO302UkQygIJBPbnPWRdAJWdQmqpi326apWLQl3XgUWkLpeGPrguo9J
-Z1yQ0FMZWZ/qgnNEvOC4oDUkACRrs4AMyPBb64WlSs4w2O7O
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unical.it/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unical.it/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="it">Università della Calabria</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Calabria</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">UNICAL - Università della Calabria</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">UNICAL - University of Calabria</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unical.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unical.it/portale/international/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ferdinando</md:GivenName>
-    <md:SurName>Arcuri</md:SurName>
-    <md:EmailAddress>mailto:idem-support@unical.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Walter</md:GivenName>
-    <md:SurName>Curci</md:SurName>
-    <md:EmailAddress>mailto:idem-support@unical.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unicon.net-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unicon.net-idp-shibboleth.xml
deleted file mode 100644
index 48f3f215..00000000
--- a/swamid-interfederations-2.0/idp.unicon.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,96 +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://idp.unicon.net/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">unicon.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Unicon, Inc.</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Login service for Unicon Employees</mdui:Description>
-        <mdui:Logo height="88" width="600" xml:lang="en">https://www.unicon.net/files/Image/unicon_logo_600_high.jpg</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>
-MIIDIzCCAgugAwIBAgIUIEHTfbStY0ckKZzxIgqd5p1O2K0wDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnVuaWNvbi5uZXQwHhcNMTEwOTEzMDMyMzE2WhcN
-MzEwOTEzMDMyMzE2WjAZMRcwFQYDVQQDEw5pZHAudW5pY29uLm5ldDCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBANtUsFXxlhvD3bWT5Y7TqKkf5rxa+dPA
-z7vpbJ6bWhDPSMXb/9MiJe/ciY5ZKKrB1rdRC04s7blrzem3YtjGihfGd4ld+NRt
-Pi0xoAT2YIp83CvEe5BHAKwqD7KTonN1unbN84mVo65itbme9d8lZKc0PfLM+BQp
-fhXKUBfYeBCkYU4YWxmgL4Vs7XBaKjEjpTN4ncar4YSrarWTTPyO5RzmVPLAcv88
-1OBqewTyN41+JRXt0Jopi4ZQ8JjKkm73vhoYDBPHr/VMqk1lFfrDcDwJa2ygyWCm
-qTlq6zyLE9Fr6sYz6CbgA2lAqu/b1rYCqVCnRpoHZKahAQ9uGQSfHD8CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnVuaWNvbi5uZXSGJWh0dHBzOi8vaWRwLnVuaWNv
-bi5uZXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFK6yUrpGjvY3B09ke0kVl4wA
-CMAnMA0GCSqGSIb3DQEBBQUAA4IBAQDG/gMpr3N+nAMuo7RhtDBsckiJV2+BwT/r
-JmpxlHAV1Zgc3eeuOdyxm5/jA78tspLldL0+6W/LzZWov/je36IqVT1wSGy1n0Sc
-Pjw8DHgyEJLCij2vVScV+j/Y4Eg0bVy6pZTeQW+e3ygb6WgiVT/ARM8QBp6GjAUC
-qIlJCads9Rcx3vAih72I4exUUD4qMuBMeLIdY5XReHy5YHqxbkPjQhDIEORAFlzJ
-jLqO/Ldzn4waEa5snDZyeYjsl6pi+8CVGfXLSDVsDuk5s47B9OD+gOSJ1wEc7O/N
-nU9d/WCcM1V4IGZGL8TXUdfJoVXYZUFF08jUGSL2mj30WS1orIWo
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unicon.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unicon.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unicon.net/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unicon.net/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unicon.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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicon.net</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUIEHTfbStY0ckKZzxIgqd5p1O2K0wDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnVuaWNvbi5uZXQwHhcNMTEwOTEzMDMyMzE2WhcN
-MzEwOTEzMDMyMzE2WjAZMRcwFQYDVQQDEw5pZHAudW5pY29uLm5ldDCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBANtUsFXxlhvD3bWT5Y7TqKkf5rxa+dPA
-z7vpbJ6bWhDPSMXb/9MiJe/ciY5ZKKrB1rdRC04s7blrzem3YtjGihfGd4ld+NRt
-Pi0xoAT2YIp83CvEe5BHAKwqD7KTonN1unbN84mVo65itbme9d8lZKc0PfLM+BQp
-fhXKUBfYeBCkYU4YWxmgL4Vs7XBaKjEjpTN4ncar4YSrarWTTPyO5RzmVPLAcv88
-1OBqewTyN41+JRXt0Jopi4ZQ8JjKkm73vhoYDBPHr/VMqk1lFfrDcDwJa2ygyWCm
-qTlq6zyLE9Fr6sYz6CbgA2lAqu/b1rYCqVCnRpoHZKahAQ9uGQSfHD8CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnVuaWNvbi5uZXSGJWh0dHBzOi8vaWRwLnVuaWNv
-bi5uZXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFK6yUrpGjvY3B09ke0kVl4wA
-CMAnMA0GCSqGSIb3DQEBBQUAA4IBAQDG/gMpr3N+nAMuo7RhtDBsckiJV2+BwT/r
-JmpxlHAV1Zgc3eeuOdyxm5/jA78tspLldL0+6W/LzZWov/je36IqVT1wSGy1n0Sc
-Pjw8DHgyEJLCij2vVScV+j/Y4Eg0bVy6pZTeQW+e3ygb6WgiVT/ARM8QBp6GjAUC
-qIlJCads9Rcx3vAih72I4exUUD4qMuBMeLIdY5XReHy5YHqxbkPjQhDIEORAFlzJ
-jLqO/Ldzn4waEa5snDZyeYjsl6pi+8CVGfXLSDVsDuk5s47B9OD+gOSJ1wEc7O/N
-nU9d/WCcM1V4IGZGL8TXUdfJoVXYZUFF08jUGSL2mj30WS1orIWo
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unicon.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unicon.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Unicon, Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Unicon, Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unicon.net/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>John Lewis</md:GivenName>
-    <md:EmailAddress>jlewis@unicon.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IdP Administrator</md:GivenName>
-    <md:EmailAddress>idp-admin@unicon.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
deleted file mode 100644
index 75356c9d..00000000
--- a/swamid-interfederations-2.0/idp.unige.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unige.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-10-27T18:08:47Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.unige.ch/stic/cad.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Genf</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Geneva</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Université de Genève</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Ginevra</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universität Genf</mdui:Description>
-        <mdui:Description xml:lang="en">University of Geneva</mdui:Description>
-        <mdui:Description xml:lang="fr">Université de Genève</mdui:Description>
-        <mdui:Description xml:lang="it">Università di Ginevra</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAjVJREFUeJx0U+1P8VEY/v3nPrS14YONSAwVCjEvIea1KGWUeUt8aGsz02isGSNd7bpb9jx5ng9nfs4593VfL/dRACi/12KxQK/XQyAQQDKZxPPzM7i3Wq3w++4/i1utFux2OxwOhyy3241Op4Plcvl/gPV6jUajgVQqJd0tFgtisRj8fj9sNpvshUIhAfr8/MRfAES+vLxENBrF8fGxfLPw9PQUXq8XmUwGNzc3ODw8RDqdRi6X28gRgJ/OwWAQ4XAYVqtVGHCv3+/j9vYW2WxWlkajwfn5Odrt9jfAeDxGuVwW3byg0+mk89HREYxGI+bzuXR3Op24vr7G2dkZHh4eBHQ4HEJhIQ+Jyl+9Xr/5f3BwgNlsJoUmk0kkUt7V1RX29/cFSCFl6ry4uBB0Oq5Wq7G7uwuDwSAMisWisKJ+Ft3d3QlgPp+HwrhoSrValdwZGw+5dnZ2MJlMJA0W/xjHu2azWfaVeDwuepvNJkajkaDSTJ/PB5VKJZRp3N7eHh4fHwWADMioVCpBYSH1EI1mEcDj8UgKWq12M0Q8I8OPjw9EIhHxh+kpb29vwoBFdJ1ATINGUh4Z0gMuul6pVOSMnr2+vn5PE12m9lqthpeXF3S73c0sDAYDGSp6UK/XpRGbEHAzSHSaXXmR6Pf390KTU8kZYeacQrJh50KhIFK2HtOPBzSRBS6XS8aYsZ6cnIhUGvnno9p6je/v7zKmpJhIJCRzfj89PWE6nW69xi8AAAD//wMAKn0rRUh0CAQAAAAASUVORK5CYII=</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+hkAAAvrSURBVHic7JgJcFT1HcdXBAta7UxHR2urYzvWqnVQ69iWdqxabbWOglcbCIIJl4rE1FgghBLRSLiEgAlyhNwksAkkJBASEsi1STbX7r6977f3Zs9k782e6fdlYwghOtOOx3Td32Qy//3ve//3Pv/f9f0vbfx7ZrTv+gW+bUsAx7slgOPdEsDxbgngeLcEcLxbAjjeLQEc75YAjndLAF9t0WjU7x8LhULj0W/nfb5Wi477ZSb1hlI/aZma+ypgoErE0q6unu5uptE4HA6Hv/l3/DoNPpItOaB9rzzk8E5Nzg5sNlsIDrel5XJHe5dMppBIpBcamxldPSKRxOVyfdkDRhvY9ur+2NjNVFiOtUeDYWspw1xwKTIWoiZ75daiTurKevZI7ZCHqzXtawq7/JO3NxK2k31+pWV4b+PwJw3Gj2tdDFnI5Rve3WjYXD2c2+DhaGJXYl6XUaleX+KXmoImp2l/s19jN33WYtrRYN7bNPxJvfnw5YDFZT7Yot9EN+0+by3siEaiswN7PB7WEKe3t0+vN2i1OgajV6FQws+dHYzRUYdAIOrt7ReLpZFI5Fpg5Ut5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</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.unige.ch/apropos/index.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.unige.ch/apropos/index.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.unige.ch/apropos/index.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unige.ch/apropos/index.html</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>192.33.222.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.224.0/21</mdui:IPHint>
-        <mdui:IPHint>192.33.217.0/24</mdui:IPHint>
-        <mdui:IPHint>192.33.218.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.220.0/24</mdui:IPHint>
-        <mdui:IPHint>195.176.0.144/28</mdui:IPHint>
-        <mdui:IPHint>192.33.214.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.216.0/22</mdui:IPHint>
-        <mdui:IPHint>2001:620:600::/48</mdui:IPHint>
-        <mdui:IPHint>192.80.31.0/24</mdui:IPHint>
-        <mdui:IPHint>192.80.32.0/21</mdui:IPHint>
-        <mdui:IPHint>192.80.40.0/23</mdui:IPHint>
-        <mdui:IPHint>192.80.31.0/24</mdui:IPHint>
-        <mdui:IPHint>192.80.32.0/21</mdui:IPHint>
-        <mdui:IPHint>192.80.40.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.220.0/24</mdui:IPHint>
-        <mdui:IPHint>192.80.42.0/24</mdui:IPHint>
-        <mdui:IPHint>129.194.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.33.222.0/23</mdui:IPHint>
-        <mdui:IPHint>192.33.212.0/24</mdui:IPHint>
-        <mdui:IPHint>192.33.212.0/22</mdui:IPHint>
-        <mdui:IPHint>192.33.216.0/24</mdui:IPHint>
-        <mdui:DomainHint>unige.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:46.194936,6.139927</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>
-MIIDEDCCAfigAwIBAgIJAIleT3fCBgaqMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC51bmlnZS5jaDAeFw0xMzA0MjUxNDIyMDRaFw0xNjA0MjQxNDIyMDRa
-MBcxFTATBgNVBAMTDGlkcC51bmlnZS5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAPF7M0J8B+gcEDuQO7A2ceuPTkOOZwQnaITnXSQaobxUOflcTPxX
-MgPmrZNr7zvIcF2j0iUWZwj4WfnmytIrETtRV5I9wdM/bg4v95NHwVBHu3pZQFX8
-12ChY2BP2DOGLLuPFRrwNaYZg7p5d9yAx53TseeVj1akcLGlkVq8ObMfUg1Sol/U
-PmbBQiY7cWEB212MtJ16FyDnIZQQ4Fs0TuIjXqOUZITxM+dhWyj7/BSaPLvpvZx7
-+FrrOJndseydTcOj0+gOvydO/w1T6L1l2WNb0l3o8bVxvllb/HNtF6N5kBrTRxt1
-mhQ4Rl6ZZnHUlkeOh6L9tFCQ2bcePq72dHsCAwEAAaNfMF0wPAYDVR0RBDUwM4IM
-aWRwLnVuaWdlLmNohiNodHRwczovL2lkcC51bmlnZS5jaC9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUuEqhSlGiqI+C/MrmoLrlgjYXgOkwDQYJKoZIhvcNAQEFBQAD
-ggEBAKTjMAC0B6u/ltE3IEeEV2/8v25yLXZWG1HR6kIB4xN9RmxSJgALX81FTrd5
-joRvCbQRxXjhcRklOKCp8cSVvC4fSRhHkxm02b6h3wrHZmpyXPdZnBz5Kra4/nOI
-lk/ZGTrUATT9uPAwDL+VNdY3n40g8sGy5Re2h+unfXQkyXpL6OST7I6ZAZq1vQOz
-dmHxLQ4YVBXYJUgfxn8/C0XnAIzy/Dqzp9FCHNwCKBZtDD5+gC4bCcP7Ykh6tXUY
-u83NsDjdL0oW1ov9rsQH4iQsQs7TOkf1KEwbmc2Kv8M2D3RhR5A7pcDf3EbG1U47
-mvLUHB+HLHvU53517kDxazwQx2g=
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unige.ch/idp/Artifact" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unige.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unige.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unige.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unige.ch/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unige.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEDCCAfigAwIBAgIJAIleT3fCBgaqMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDGlkcC51bmlnZS5jaDAeFw0xMzA0MjUxNDIyMDRaFw0xNjA0MjQxNDIyMDRa
-MBcxFTATBgNVBAMTDGlkcC51bmlnZS5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAPF7M0J8B+gcEDuQO7A2ceuPTkOOZwQnaITnXSQaobxUOflcTPxX
-MgPmrZNr7zvIcF2j0iUWZwj4WfnmytIrETtRV5I9wdM/bg4v95NHwVBHu3pZQFX8
-12ChY2BP2DOGLLuPFRrwNaYZg7p5d9yAx53TseeVj1akcLGlkVq8ObMfUg1Sol/U
-PmbBQiY7cWEB212MtJ16FyDnIZQQ4Fs0TuIjXqOUZITxM+dhWyj7/BSaPLvpvZx7
-+FrrOJndseydTcOj0+gOvydO/w1T6L1l2WNb0l3o8bVxvllb/HNtF6N5kBrTRxt1
-mhQ4Rl6ZZnHUlkeOh6L9tFCQ2bcePq72dHsCAwEAAaNfMF0wPAYDVR0RBDUwM4IM
-aWRwLnVuaWdlLmNohiNodHRwczovL2lkcC51bmlnZS5jaC9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUuEqhSlGiqI+C/MrmoLrlgjYXgOkwDQYJKoZIhvcNAQEFBQAD
-ggEBAKTjMAC0B6u/ltE3IEeEV2/8v25yLXZWG1HR6kIB4xN9RmxSJgALX81FTrd5
-joRvCbQRxXjhcRklOKCp8cSVvC4fSRhHkxm02b6h3wrHZmpyXPdZnBz5Kra4/nOI
-lk/ZGTrUATT9uPAwDL+VNdY3n40g8sGy5Re2h+unfXQkyXpL6OST7I6ZAZq1vQOz
-dmHxLQ4YVBXYJUgfxn8/C0XnAIzy/Dqzp9FCHNwCKBZtDD5+gC4bCcP7Ykh6tXUY
-u83NsDjdL0oW1ov9rsQH4iQsQs7TOkf1KEwbmc2Kv8M2D3RhR5A7pcDf3EbG1U47
-mvLUHB+HLHvU53517kDxazwQx2g=
-						</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>
-MIIFJzCCBA+gAwIBAgIUCcPzyiPVq7P+xeWBdn7n0zsZXoQwDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE0MDMyNjEyMzAx
-MFoXDTE2MDMyNjEyMzAwN1owgasxEzARBgsrBgEEAYI3PAIBAxMCQ0gxGjAYBgNV
-BA8TEUdvdmVybm1lbnQgRW50aXR5MRMwEQYDVQQFEwoxODcyLTEwLTE5MQswCQYD
-VQQGEwJDSDEPMA0GA1UECBMGR2VuZXZlMQ8wDQYDVQQHEwZHZW5ldmUxHTAbBgNV
-BAoTFFVuaXZlcnNpdGUgZGUgR2VuZXZlMRUwEwYDVQQDEwxpZHAudW5pZ2UuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBOFQzYSeY/CFS17FiCq2v
-Hq/bDd+LwRWKEAM3V7Q+TAeOrWfpHJrrmubvM4bEtbeBjg5jDUv44RNs0dPv1YNp
-bKOqlL7yFeUm/ppH16g/0NTre7+XGNFhiUpV+6qjBWIItlmaJjhvN68cNey4tEHS
-L6DXTd1YW09L12Gmi+c6vtpoXUCMGJ71xAcqbas6PRLL/Ouj92huqSkEzmEflkyk
-OsMf2gkXv0xdT3mcr/5o3CXopnv7vlCf1ss8uMNEtgiMqDCZMOmhxHop++Qw8Llq
-tZSIciQBvjpjQj5b89r7Z7QpaXNQN7dGTnus18Sps4Fu0aBpV6Va5x8flSAJcjUZ
-AgMBAAGjggGeMIIBmjBzBggrBgEFBQcBAQRnMGUwKgYIKwYBBQUHMAGGHmh0dHA6
-Ly9vY3NwLnF1b3ZhZGlzZ2xvYmFsLmNvbTA3BggrBgEFBQcwAoYraHR0cDovL3Ry
-dXN0LnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNydDBRBgNVHSAESjBIMEYG
-DCsGAQQBvlgAAmQBAjA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3ZhZGlz
-Z2xvYmFsLmNvbS9yZXBvc2l0b3J5MCgGA1UdEQQhMB+CDGlkcC51bmlnZS5jaIIP
-aWRwLWFhLnVuaWdlLmNoMAsGA1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsXpzD78N45JbG9jLm4UScwOgYD
-VR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZz
-c2xnMi5jcmwwHQYDVR0OBBYEFJbgIfaj++dmflc/IuxWc453fKs0MA0GCSqGSIb3
-DQEBCwUAA4IBAQDfGMD7sKSmKspDqfYkJ5peWICICMpGQ49Rir8PqYzHkZiF07dQ
-g/Yd90bjfoLguQcOuXyfBGlz6oG5heeek4qTTQ3H0MM5GAsWFbKWqEy4+1L2f//c
-ibHwTBWA+HrPIyGcFAD2VTBl3jxFz9/0kRYZpEbtabk9mWftAjTiv25voOUioget
-hhLP6b/dsRMdj/0XcHCKZN1Lfhk9fPXBnxNrvmHkdp2efCnyNYleKYPSqCJeX5eK
-kUkeKDUBGt0wUMVDLmp19ypRxXtDJzU2DEaJ4BDEgtQ05ZJEVjhAz9ZzRZIfWSzd
-M4BZ2IY2Ts91B58Noy+uhlISbxOaSeV1iuJu
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unige.ch/idp/AA"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unige.ch/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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">unige.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Genf</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Geneva</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">Université de Genève</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Ginevra</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.unige.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unige.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.unige.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unige.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Help</md:GivenName>
-    <md:SurName>Desk for the University of Geneva</md:SurName>
-    <md:EmailAddress>mailto:cad@unige.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UNIGE</md:GivenName>
-    <md:SurName>IdP Administrators</md:SurName>
-    <md:EmailAddress>mailto:aai@unige.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 7e915d57..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unijui.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.unijui.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unijui.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unijui.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unijui.edu.br/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">unijui.edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unijui.edu.br:8443/idp/profile/SAML1/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">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNIJUI - Universidade Regional do Noroeste do Estado do Rio Grande do Sul</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unijui.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unijui.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Nucleo de Redes e Banco de Dados</md:SurName>
-    <md:EmailAddress>redes@unijui.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ea633a17..00000000
--- a/swamid-interfederations-2.0/idp.unijui.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.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>
-    MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxDzANBgNVBAoTBlVOSUpVSTEO
-MAwGA1UECxMFQ09JTkYxIjAgBgkqhkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5lZHUu
-YnIxDTALBgNVBAcTBElqdWkxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQsw
-CQYDVQQGEwJCUjEaMBgGA1UEAxMRaWRwLnVuaWp1aS5lZHUuYnIwHhcNMTEwODEw
-MTg1ODEyWhcNMTQwODA5MTg1ODEyWjCBmTEPMA0GA1UEChMGVU5JSlVJMQ4wDAYD
-VQQLEwVDT0lORjEiMCAGCSqGSIb3DQEJARYTcmVkZXNAdW5panVpLmVkdS5icjEN
-MAsGA1UEBxMESWp1aTEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNV
-BAYTAkJSMRowGAYDVQQDExFpZHAudW5panVpLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL4ZMwDcJtiwQ7aE51xnBt0MsU5qRdilo2y1RLfR
-Ej67K2O9adt2T4Z+MLCPDljJazzS/X5iFiL0sm2iFrHovkkXVVRR+7T61WdKfFhB
-giWqBuLJNBscHPRrXLSEm+ZTG/RhOA028PHWilFXjKpYoNJYifsL1NOK9n+lS43+
-I7lam9d6xKQtqkZjsgeY4E07/bHBBjwYwvqC+HdVZQ6oJhz3iFNf3yMHDttT45Hy
-R9pA8ZWggyM7MektA+4fliQZd0vEUKVJyUkhOKnLK+BJPG1U77tfgm7J7FaKNCMJ
-g5MeEDN7H61pFKV4SKsLpkN+Dv4EA7JRlr5gex8HE3uMqgUCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEANYL2y1QNhq4JNs6jsyhHsLy2yFH9PAQuIxPw5uYo33O5oES/
-ACWvOoVEX+wz1Gyh29ODdb/osO0r+9/L9jhBaJCq1hhhzPn7kUuMry9qdDhMINN+
-5q0e1F7UKhdBEcXASpSB4zXFJkPkBU7Rh7lHi1cpyuTSk4cP8YYkUVUSVgAkDlOz
-1JuQIeCUlbCK8B5ArWEesVD5ts3MydnMsx1Qp7x85N/Q2LBGhsg+6T36KlzgLyar
-C6T5NDFKSyUeDSJ4XclC77MUAVqlE9K4aSbs1ui38aeDEeRrt3D4s0RNkN6XlBPC
-skHhy4NszUPhb3+BwKn/tExBYB5UE5fjWY7rOA==
-            </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>
-      
-MIIDqDCCApACAQAwDQYJKoZIhvcNAQEFBQAwgZkxDzANBgNVBAoTBlVOSUpVSTEO
-MAwGA1UECxMFQ09JTkYxIjAgBgkqhkiG9w0BCQEWE3JlZGVzQHVuaWp1aS5lZHUu
-YnIxDTALBgNVBAcTBElqdWkxGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQsw
-CQYDVQQGEwJCUjEaMBgGA1UEAxMRaWRwLnVuaWp1aS5lZHUuYnIwHhcNMTEwODEw
-MTg1ODEyWhcNMTQwODA5MTg1ODEyWjCBmTEPMA0GA1UEChMGVU5JSlVJMQ4wDAYD
-VQQLEwVDT0lORjEiMCAGCSqGSIb3DQEJARYTcmVkZXNAdW5panVpLmVkdS5icjEN
-MAsGA1UEBxMESWp1aTEaMBgGA1UECBMRUmlvIEdyYW5kZSBkbyBTdWwxCzAJBgNV
-BAYTAkJSMRowGAYDVQQDExFpZHAudW5panVpLmVkdS5icjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL4ZMwDcJtiwQ7aE51xnBt0MsU5qRdilo2y1RLfR
-Ej67K2O9adt2T4Z+MLCPDljJazzS/X5iFiL0sm2iFrHovkkXVVRR+7T61WdKfFhB
-giWqBuLJNBscHPRrXLSEm+ZTG/RhOA028PHWilFXjKpYoNJYifsL1NOK9n+lS43+
-I7lam9d6xKQtqkZjsgeY4E07/bHBBjwYwvqC+HdVZQ6oJhz3iFNf3yMHDttT45Hy
-R9pA8ZWggyM7MektA+4fliQZd0vEUKVJyUkhOKnLK+BJPG1U77tfgm7J7FaKNCMJ
-g5MeEDN7H61pFKV4SKsLpkN+Dv4EA7JRlr5gex8HE3uMqgUCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEANYL2y1QNhq4JNs6jsyhHsLy2yFH9PAQuIxPw5uYo33O5oES/
-ACWvOoVEX+wz1Gyh29ODdb/osO0r+9/L9jhBaJCq1hhhzPn7kUuMry9qdDhMINN+
-5q0e1F7UKhdBEcXASpSB4zXFJkPkBU7Rh7lHi1cpyuTSk4cP8YYkUVUSVgAkDlOz
-1JuQIeCUlbCK8B5ArWEesVD5ts3MydnMsx1Qp7x85N/Q2LBGhsg+6T36KlzgLyar
-C6T5NDFKSyUeDSJ4XclC77MUAVqlE9K4aSbs1ui38aeDEeRrt3D4s0RNkN6XlBPC
-skHhy4NszUPhb3+BwKn/tExBYB5UE5fjWY7rOA==
-                    
-            </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 2dad989f..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimc.it/idp/shibboleth">
-  <md: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>
-  </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">unimc.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimc.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unimc.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimc.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimc.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimc.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimc.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimc.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimc.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Macerata</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Macerata</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Macerata</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Macerata</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unimc.it/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unimc.it/it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Massimo</md:GivenName>
-    <md:SurName>Reda</md:SurName>
-    <md:EmailAddress>mailto:csia.sistemi@unimc.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Principi</md:SurName>
-    <md:EmailAddress>mailto:csia.sistemi@unimc.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ec032ee7..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimedizin-mainz.de/idp/shibboleth">
-  <md: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>
-  </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">unimedizin-mainz.de</shibmd: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de: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.unimedizin-mainz.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimedizin-mainz.de/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">unimedizin-mainz.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de: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">e417</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e417</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universitätsmedizin der Johannes Gutenberg-Universität Mainz</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University Medical Center of the Johannes Gutenberg University Mainz Germany</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.unimedizin-mainz.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unimedizin-mainz.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ataollah</md:GivenName>
-    <md:SurName>Khoddam-Zadeh</md:SurName>
-    <md:EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ataollah</md:GivenName>
-    <md:SurName>Khoddam-Zadeh</md:SurName>
-    <md:EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Ataollah</md:GivenName>
-    <md:SurName>Khoddam-Zadeh</md:SurName>
-    <md:EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml
deleted file mode 100644
index f821a300..00000000
--- a/swamid-interfederations-2.0/idp.unimib.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,85 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimib.it/idp/shibboleth">
-  <md: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>
-  </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">unimib.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Milano-Bicocca</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Milano-Bicocca</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Milano-Bicocca users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università di Milano-Bicocca</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.si.unimib.it/idem-en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.si.unimib.it/idem/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.si.unimib.it/idem-en/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.si.unimib.it/idem/</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="it">unimib università bicocca milano</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">unimib university bicocca milan</mdui:Keywords>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.unimib.it/unimib_16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.unimib.it/unimib_16x16.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="en">https://idp.unimib.it/unimib_50x50.png</mdui:Logo>
-        <mdui:Logo height="50" width="50" xml:lang="it">https://idp.unimib.it/unimib_50x50.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.unimib.it/unimib_80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.unimib.it/unimib_80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>unimib.it</mdui:DomainHint>
-        <mdui:IPHint>149.132.0.0/16</mdui:IPHint>
-        <mdui:GeolocationHint>geo:45.518965,9.214319</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:45.602745,9.254773</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:46.160489,9.910843</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:45.558355,9.214384</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:45.528174,9.243695</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID8jCCAtoCCQDRtfiml6XVzDANBgkqhkiG9w0BAQUFADCBujELMAkGA1UEBhMC
-SVQxDzANBgNVBAgMBk1pbGFubzEPMA0GA1UEBwwGTWlsYW5vMTQwMgYDVQQKDCtV
-bml2ZXJzaXTDg8KgIGRlZ2xpIFN0dWRpIGRpIE1pbGFuby1CaWNvY2NhMRwwGgYD
-VQQLDBNTaXN0ZW1pIEluZm9ybWF0aXZpMRYwFAYDVQQDDA1pZHAudW5pbWliLml0
-MR0wGwYJKoZIhvcNAQkBFg5pZGVtQHVuaW1pYi5pdDAeFw0xMzA4MjgxMzA0Mjla
-Fw0yMzA4MjYxMzA0MjlaMIG6MQswCQYDVQQGEwJJVDEPMA0GA1UECAwGTWlsYW5v
-MQ8wDQYDVQQHDAZNaWxhbm8xNDAyBgNVBAoMK1VuaXZlcnNpdMODwqAgZGVnbGkg
-U3R1ZGkgZGkgTWlsYW5vLUJpY29jY2ExHDAaBgNVBAsME1Npc3RlbWkgSW5mb3Jt
-YXRpdmkxFjAUBgNVBAMMDWlkcC51bmltaWIuaXQxHTAbBgkqhkiG9w0BCQEWDmlk
-ZW1AdW5pbWliLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzb96
-/j8SpXJ/QCu3HVZcdcSPUZTXkc3YJniHnPEm+J+R0YJaUui3sq3m7rG7HeOr0QMe
-+dSJQcAiUNWDLXlOq91rZvTmiXYreS3TqEpsEpNJOLbLdzfbD7NLwy9YNYqYXx+t
-ITIhEhccMzGcYEBNuxKPRasvOC7QOKJWaed2IPP8ptBdFQ9XyggBL0Q+9ADDzGHl
-m+HYAocXZjQvN8demGDXALBx2SANliVftQQvouv/93q34u8gOJCCCfMA/PacrvtX
-gn29U3q5izvMmwLZmMNyJ5Lckpl/LcgStCT488bJJbLZrpGxMDSPTQamy/j3hQs/
-mz114w1omnc0OfmaqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAQIxQMg9qVYHGu
-fapH4AiFzwnqSNpjqewrdr/kOQv1RsnzNY5Xu8iyioe3jMIH2Nc1YYcUzfKYr9mV
-7S0DUhpu2GBSC3z9mhRlULkOmJvU+4GAaFCr4jt5fjRMl440toXDJLgGYpoWQmG8
-cvvl3Ysg9sYGbzmWXLFjZyrImJ6F5ZboiGZoTkG3HcXOAUExZA5gRzFk5Gdy65SQ
-CmLcMEs2lw9ZDHDbMwNHqvXrqiljRNowHzZ5v800zjMvoyVHmsVmRzyfqdbmLCnX
-SI8F0ix2bVu35o8sDuqmPkq/l2DwNvPr26l94ohEE6Fh1ZsnGG8ehJ9MuGbSUwf7
-fjKYky96
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimib.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimib.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimib.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Milano-Bicocca</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università di Milano-Bicocca</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Milano-Bicocca</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Milano-Bicocca</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unimib.it/go/102/Home/English</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unimib.it/go/101/Home/Italiano</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idem@unimib.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml
deleted file mode 100644
index a462d70e..00000000
--- a/swamid-interfederations-2.0/idp.unimore.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimore.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimore.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Modena e Reggio Emilia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Modena e Reggio Emilia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Modena e Reggio Emilia users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Modena e Reggio Emilia</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.unimore.it/idem.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.unimore.it/international/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unimore.it/idem.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.unimore.it/unimore_80_60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.unimore.it/unimore_80_60.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>155.185.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>unimore.it</mdui:DomainHint>
-        <mdui:DomainHint>unimo.it</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJBITnJoX92EsdoWjSdjb3G2d4VwMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51bmltb3JlLml0MB4XDTEwMDEyNjEzMzg0MloX
-DTMwMDEyNjEzMzg0MlowGTEXMBUGA1UEAxMOaWRwLnVuaW1vcmUuaXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAKvIYSyrl0QfPfFE+SlhVJ5RW7nJ7
-sDkRzEZS2q2W3Nm3PtzidHNNxH3yzely2oyOXd6PVsx/ky5KndOY9GfSm1jFdmAX
-7fwFhXwFdlPLrvSL4iFMPR966z6R7OF+Oa/kpUdGPXuAVau61KOX7wqPsuZ7f7PX
-DaGRdqKyHEBNm9XehmYukjmwmLJSfd9R1+HUfP88khxYZD7CYHX4wU2Qp5KE7OIb
-g6ZGsqRYaCkGSYqQnsJjXGvyAU1BgPBFPdsn2X/Gxz2U06JvhnvCJv1JlzIrWlsj
-3M8/HF+celfuG7+qr1vTALoNeXypHFq+y4xypu+r7lWflcadx8KSPlfzAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51bmltb3JlLml0hiVodHRwczovL2lkcC51bmlt
-b3JlLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT/4cn1m4OFDg3Iv8CDfULK
-1s8JljANBgkqhkiG9w0BAQUFAAOCAQEAq37LOUh+3GFcqxwZKBiHbbudxRFRb7Hr
-uvXTpGuuV+eb/5lE7gCzNsXGV07OM6s+of45Hd2c9rVD8+xnSZvPkUGy30USVn/s
-D/mWS08gIL09LHfrgvM3kRGxuE6kyVdTuwTdtkcSXjYtm+RZztp95w9LV8n3Jve1
-p8TJi7Tjt4LZfVL5h+sDSA+FT/jLLYhLN0uy3YOBhIbdVgsDBESeM3jyOTiHxbxm
-O590yv35UKIENt7Ov87uykF3frwjIjMEBffRGYsgmrbl3HdbA5yUDs+9VQS/CXKg
-ApsMFkXxazWEsSuKY+zrMAimGDVPmAjswYuG9Jl3PICYIciqz2Ll+g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimore.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimore.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unimore.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimore.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimore.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimore.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimore.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJBITnJoX92EsdoWjSdjb3G2d4VwMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51bmltb3JlLml0MB4XDTEwMDEyNjEzMzg0MloX
-DTMwMDEyNjEzMzg0MlowGTEXMBUGA1UEAxMOaWRwLnVuaW1vcmUuaXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAKvIYSyrl0QfPfFE+SlhVJ5RW7nJ7
-sDkRzEZS2q2W3Nm3PtzidHNNxH3yzely2oyOXd6PVsx/ky5KndOY9GfSm1jFdmAX
-7fwFhXwFdlPLrvSL4iFMPR966z6R7OF+Oa/kpUdGPXuAVau61KOX7wqPsuZ7f7PX
-DaGRdqKyHEBNm9XehmYukjmwmLJSfd9R1+HUfP88khxYZD7CYHX4wU2Qp5KE7OIb
-g6ZGsqRYaCkGSYqQnsJjXGvyAU1BgPBFPdsn2X/Gxz2U06JvhnvCJv1JlzIrWlsj
-3M8/HF+celfuG7+qr1vTALoNeXypHFq+y4xypu+r7lWflcadx8KSPlfzAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51bmltb3JlLml0hiVodHRwczovL2lkcC51bmlt
-b3JlLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT/4cn1m4OFDg3Iv8CDfULK
-1s8JljANBgkqhkiG9w0BAQUFAAOCAQEAq37LOUh+3GFcqxwZKBiHbbudxRFRb7Hr
-uvXTpGuuV+eb/5lE7gCzNsXGV07OM6s+of45Hd2c9rVD8+xnSZvPkUGy30USVn/s
-D/mWS08gIL09LHfrgvM3kRGxuE6kyVdTuwTdtkcSXjYtm+RZztp95w9LV8n3Jve1
-p8TJi7Tjt4LZfVL5h+sDSA+FT/jLLYhLN0uy3YOBhIbdVgsDBESeM3jyOTiHxbxm
-O590yv35UKIENt7Ov87uykF3frwjIjMEBffRGYsgmrbl3HdbA5yUDs+9VQS/CXKg
-ApsMFkXxazWEsSuKY+zrMAimGDVPmAjswYuG9Jl3PICYIciqz2Ll+g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimore.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimore.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università di Modena e Reggio Emilia</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Modena e Reggio Emilia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Modena e Reggio Emilia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Modena e Reggio Emilia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unimore.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unimore.it/international/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:supporto.identity@unimore.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml
deleted file mode 100644
index 4196746a..00000000
--- a/swamid-interfederations-2.0/idp.unipa.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipa.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-16T12:25:43Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipa.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Palermo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Palermo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for the users of University of Palermo</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Palermo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://portale.unipa.it/amministrazione/area7/ssp09/set49/uob72/en/idem/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://portale.unipa.it/amministrazione/area7/ssp09/set49/uob72/idem/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://portale.unipa.it/amministrazione/area7/ssp09/set49/uob72/en/idem/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="78" width="192">https://skin.unipa.it/img/logo_unipa_title.jpg</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>
-MIIDHDCCAgSgAwIBAgIVAJbsMbEZBInRgijJc7/Hgow8W9aSMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwYS5pdDAeFw0xMzA2MDQxMzE5MTVaFw0x
-NjA2MDQxMzE5MTVaMBcxFTATBgNVBAMTDGlkcC51bmlwYS5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAICtvYrANCS0BU0KB5frRETwLi5R/tVwnIvp
-ynl79CAd0jdq6iWNCpmXSDqlaF9AwxP6UtrhkGB26XeDKzckBiSY05cSlvnqMi28
-aFpd2OXf/vhjEsVQjMK8wp+0qUPU5EbHs9dGKc11FHK+q44uZ3v70nF8oBU7L32T
-Ac+/Yybr7pwAQ+NzRgiwfpubdUNCMic4TSnfkBv5zCpmUJFG42Ea1gEsdQWujHg/
-Wua+nXSw3/a4Z03gJaWS97aAMVHfacZXreanqL9cyXfj6NkTDE3KT855ulVo+VjW
-z9GvqjBz+16eEMBiLvtF/5ISBVMvQJoU0l5B5/TbT70z/DkOO0sCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaXBhLml0hiNodHRwczovL2lkcC51bmlwYS5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUDbRcvvy9sUEoe72DxrviYkk7NpUwDQYJ
-KoZIhvcNAQEFBQADggEBABiKzyN69m5uduiYHrs+Ev6jg30TdU0iGcXhPI4gJivR
-T/ttPWH7S5hn8/HRKGAiDc9D+dXTqmjeRD9TIzRb/9GlqD2DutPZIQCmbepX7A4m
-aZwyzzrbUcazqXdkv8Q+nQFoItzenxRNm52WNAlYKC82Lfrd15qrGw2RbQkxJBPQ
-bbEIk2a+SXsa+bjEJgFerDbdKVS21Ct5dU13iCObhzdxlXdmCSQiWUrjBvSLZJnb
-ljNhr2Khy1bJz90c4T+i/Bk1mb+zB9ylzn/osseY1+1H0UFr9cH0kNp3CMroJlf9
-IjdH/J9P4kLHeAqbi9fTD2jaLUo+79uMXP3ftfsvj74=
-</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>
-MIIDHDCCAgSgAwIBAgIVAJbsMbEZBInRgijJc7/Hgow8W9aSMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwYS5pdDAeFw0xMzA2MDQxMzE5MTVaFw0x
-NjA2MDQxMzE5MTVaMBcxFTATBgNVBAMTDGlkcC51bmlwYS5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAICtvYrANCS0BU0KB5frRETwLi5R/tVwnIvp
-ynl79CAd0jdq6iWNCpmXSDqlaF9AwxP6UtrhkGB26XeDKzckBiSY05cSlvnqMi28
-aFpd2OXf/vhjEsVQjMK8wp+0qUPU5EbHs9dGKc11FHK+q44uZ3v70nF8oBU7L32T
-Ac+/Yybr7pwAQ+NzRgiwfpubdUNCMic4TSnfkBv5zCpmUJFG42Ea1gEsdQWujHg/
-Wua+nXSw3/a4Z03gJaWS97aAMVHfacZXreanqL9cyXfj6NkTDE3KT855ulVo+VjW
-z9GvqjBz+16eEMBiLvtF/5ISBVMvQJoU0l5B5/TbT70z/DkOO0sCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaXBhLml0hiNodHRwczovL2lkcC51bmlwYS5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUDbRcvvy9sUEoe72DxrviYkk7NpUwDQYJ
-KoZIhvcNAQEFBQADggEBABiKzyN69m5uduiYHrs+Ev6jg30TdU0iGcXhPI4gJivR
-T/ttPWH7S5hn8/HRKGAiDc9D+dXTqmjeRD9TIzRb/9GlqD2DutPZIQCmbepX7A4m
-aZwyzzrbUcazqXdkv8Q+nQFoItzenxRNm52WNAlYKC82Lfrd15qrGw2RbQkxJBPQ
-bbEIk2a+SXsa+bjEJgFerDbdKVS21Ct5dU13iCObhzdxlXdmCSQiWUrjBvSLZJnb
-ljNhr2Khy1bJz90c4T+i/Bk1mb+zB9ylzn/osseY1+1H0UFr9cH0kNp3CMroJlf9
-IjdH/J9P4kLHeAqbi9fTD2jaLUo+79uMXP3ftfsvj74=
-</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-POST" Location="https://idp.unipa.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipa.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Palermo</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Palermo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Palermo</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Palermo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unipa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unipa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Pietro</md:GivenName>
-    <md:SurName>Brignola</md:SurName>
-    <md:EmailAddress>mailto:pietro.brignola@unipa.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idem-support@unipa.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 382c5338..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uniparthenope.it/idp/shibboleth">
-  <md: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>
-  </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">uniparthenope.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniparthenope.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniparthenope.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniparthenope.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università di Napoli Parthenope</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Università di Napoli Parthenope</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Napoli Parthenope</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Università di Napoli Parthenope</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.uniparthenope.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uniparthenope.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>N.Napolitano-A.Cioffi</md:SurName>
-    <md:EmailAddress>mailto:idem@uniparthenope.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 267d4e4b..00000000
--- a/swamid-interfederations-2.0/idp.uniparthenope.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: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.uniparthenope.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-02-15T12: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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UniPARTHENOPE IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">UniPARTHENOPE IdP</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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UniPARTHENOPE AA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">UniPARTHENOPE AA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Attribute Autority for PARTHENOPE University member</mdui:Description>
-        <mdui:Description xml:lang="it">Attribute Autority 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>
-    <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 186a730e..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipg.it/idp/shibboleth">
-  <md: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>
-  </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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipg.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipg.it/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipg.it/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it: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.unipg.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipg.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipg.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipg.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipg.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipg.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli studi di Perugia</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Perugia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università degli studi di Perugia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Perugia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unipg.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unipg.it/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Supporto IDEM</md:GivenName>
-    <md:EmailAddress>mailto:servizio.idem@unipg.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipi.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipi.gr-idp-shibboleth.xml
deleted file mode 100644
index 76fb2dd3..00000000
--- a/swamid-interfederations-2.0/idp.unipi.gr-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.unipi.gr/idp/shibboleth">
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">unipi.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEZjCCA06gAwIBAgIRAIo9PfLIpcxScL7s/HwtDqYwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDoxITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEVMBMGA1UEAxMMaWRwLnVuaXBp
-                            LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2RRKBgMguSIc82gv
-                            GEtnoiJDzwvk48Xc8QAEN1GWe8kUCR16aFHkCEH1CD5Zs23qzdq7O7x6Dh0Bgfqp
-                            XDL+12Qj/OzV6h9AjvDXZOJ93kW0OAKf3nX2ew8e1Vn17pe7jonlOYHasR3LRdBx
-                            UClIqfWXtVfYuNV0ULtx5OL8o9gVvsIRHXg99eVdRlzISp5l+yvVFllE8aZOoRaX
-                            fGEHR9S0l4n9tLNEDpGa1sHbeH+cI+GUpbMavc0OoNtXaLVR1V+edMHsszchF/2Q
-                            ZIHtVXj0gR//mIPl8sfzaT9HPJKhgBOTgkcCR1LvNeRXw3p/AyIEPiCsXliUvIpH
-                            sC6v1QIDAQABo4IBaTCCAWUwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-                            ue0wHQYDVR0OBBYEFLIWRJWXCeyP6IwGeGcES/Har0hZMA4GA1UdDwEB/wQEAwIF
-                            oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-                            BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-                            LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-                            BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-                            YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-                            Y3MudGVyZW5hLm9yZzAXBgNVHREEEDAOggxpZHAudW5pcGkuZ3IwDQYJKoZIhvcN
-                            AQEFBQADggEBAD4DeOCwaQ5/a/woSH8UlW/dlSmkbcCYKScjzx8Xq6EG8Sc5X0zd
-                            FlkN847W4zwrJ2N6WZq4PYFcO6JoR0mVfUwE9A/B8Hi1IvEQGkKtR62CSBDmZIMC
-                            qS1+8+CTEK8+Y6Mw0JC8nNzIfyyVA4lhnSaxitGmrw9LQYQ/ZdunDZFv17KidpB0
-                            2lOu89ACMkFnbZX8HupjgSGKptozrw+cNtpYJIOosJ0OLb6x5bB1IAUvdz7NCDLf
-                            8gxesMwGkGUu1rajPOV0Q77M09CGb94+/N9KndnCEHPnqi6L2DSi0Al/4zXgrv+Q
-                            PbUa3MIF7HIzuiNXpv6/9O0asdXCOmyaUkY=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.gr: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.unipi.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipi.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipi.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipi.gr/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">unipi.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEZjCCA06gAwIBAgIRAIo9PfLIpcxScL7s/HwtDqYwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzA2MTcwMDAwMDBaFw0xNjA2MTYyMzU5NTlaMDoxITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEVMBMGA1UEAxMMaWRwLnVuaXBp
-                            LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2RRKBgMguSIc82gv
-                            GEtnoiJDzwvk48Xc8QAEN1GWe8kUCR16aFHkCEH1CD5Zs23qzdq7O7x6Dh0Bgfqp
-                            XDL+12Qj/OzV6h9AjvDXZOJ93kW0OAKf3nX2ew8e1Vn17pe7jonlOYHasR3LRdBx
-                            UClIqfWXtVfYuNV0ULtx5OL8o9gVvsIRHXg99eVdRlzISp5l+yvVFllE8aZOoRaX
-                            fGEHR9S0l4n9tLNEDpGa1sHbeH+cI+GUpbMavc0OoNtXaLVR1V+edMHsszchF/2Q
-                            ZIHtVXj0gR//mIPl8sfzaT9HPJKhgBOTgkcCR1LvNeRXw3p/AyIEPiCsXliUvIpH
-                            sC6v1QIDAQABo4IBaTCCAWUwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-                            ue0wHQYDVR0OBBYEFLIWRJWXCeyP6IwGeGcES/Har0hZMA4GA1UdDwEB/wQEAwIF
-                            oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-                            BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-                            LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-                            BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-                            YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-                            Y3MudGVyZW5hLm9yZzAXBgNVHREEEDAOggxpZHAudW5pcGkuZ3IwDQYJKoZIhvcN
-                            AQEFBQADggEBAD4DeOCwaQ5/a/woSH8UlW/dlSmkbcCYKScjzx8Xq6EG8Sc5X0zd
-                            FlkN847W4zwrJ2N6WZq4PYFcO6JoR0mVfUwE9A/B8Hi1IvEQGkKtR62CSBDmZIMC
-                            qS1+8+CTEK8+Y6Mw0JC8nNzIfyyVA4lhnSaxitGmrw9LQYQ/ZdunDZFv17KidpB0
-                            2lOu89ACMkFnbZX8HupjgSGKptozrw+cNtpYJIOosJ0OLb6x5bB1IAUvdz7NCDLf
-                            8gxesMwGkGUu1rajPOV0Q77M09CGb94+/N9KndnCEHPnqi6L2DSi0Al/4zXgrv+Q
-                            PbUa3MIF7HIzuiNXpv6/9O0asdXCOmyaUkY=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Piraeus</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Πειραιά</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Piraeus</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Πειραιά</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unipi.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.unipi.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rosa</md:GivenName>
-    <md:SurName>Mavropodi</md:SurName>
-    <md:EmailAddress>rosa@unipi.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Piraeus NOC</md:Company>
-    <md:EmailAddress>noc@unipi.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 af4f3e6d..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipi.it/idp/shibboleth">
-  <md: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>
-  </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">unipi.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unipi.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipi.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipi.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Pisa</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Pisa</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Pisa</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Pisa</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unipi.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unipi.it/english</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>mailto:idem@unipi.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Samuele</md:GivenName>
-    <md:SurName>Tognini</md:SurName>
-    <md:EmailAddress>mailto:samuele.tognini@unipi.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Davide</md:GivenName>
-    <md:SurName>Vaghetti</md:SurName>
-    <md:EmailAddress>mailto:davide.vaghetti@unipi.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml
deleted file mode 100644
index 2eef538a..00000000
--- a/swamid-interfederations-2.0/idp.unipv.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,121 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipv.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-04-28T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipv.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Pavia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Pavia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider of the University of Pavia</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università di Pavia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unipv.it/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unipv.it/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unipv.eu/site/en/home/international-students/study-at-the-university-of-pavia/enroll-at-the-university-of-pavia/articolo4157.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipv.eu/site/home/matricole2013.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.unipv.it/LOGO16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.unipv.it/LOGO16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.unipv.it/LOGO_80.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.unipv.it/LOGO_80.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEkzCCA3ugAwIBAgIQNvPCzFi8IyzAo2pvCeu9pzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExMDAwMDAwMFoXDTE2MDEyNDIzNTk1OVowcjELMAkGA1UE
-BhMCSVQxKTAnBgNVBAoMIFVuaXZlcnNpdMOgIGRlZ2xpIFN0dWRpIGRpIFBhdmlh
-MSEwHwYDVQQLExhBcmVhIFNpc3RlbWkgSW5mb3JtYXRpdmkxFTATBgNVBAMTDGlk
-cC51bmlwdi5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqVD8w8
-39tNXsgx1Dc0x+z2rzeOj82rY9DtWNoagNxjXq2R8sqyA+vOEe2JWxL+9/ivZItP
-JeHJ+1Fike3XiSIrXb4z1XEuNyUeFKKKR3XtPREs6i04OT8HdNb3wPYStfoaXX+J
-nR8Xb+OJq9L0TaHd7s/ZoRyTJwjAggNR2AfubnTUuNC27i6OWf9NausitdKsLwTx
-JSgbbU4USEARO0LHWkSmnFYSQFkD/KVPO5FjxsX7d6xCA1MtRMKV8Ymm3GE8diEH
-cg0fMqF3a5vgwUBAtu2jKkkTmkqIreJYNGfGy3Viq5tFkMLPR/cojz8G3hkr/DWz
-YxfJRhiuUAOIfvUCAwEAAaOCAV8wggFbMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-KzdXR+qQ47ntMB0GA1UdDgQWBBSeFx/Z+x1pQeagD84hECdg7SSFnzAOBgNVHQ8B
-Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaAr
-hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-dGVyZW5hLm9yZzAXBgNVHREEEDAOggxpZHAudW5pcHYuaXQwDQYJKoZIhvcNAQEF
-BQADggEBABY2r3TyyLLVUJgZQqAhjTHzJtoUS/bB26syOEATM6EcxL0W9N99QmcG
-6i+0+RwxWEiQhlarGDmCzcvLXKEVAeVLDaieS62v0fikXIFsg0FnYy706ZFSrIa1
-38yo4580o9KzdhBaww6VPrfiJtnW4nnkA56rLn2z0Ik1fYhh0Gii6JL7OXIosYQo
-lH7BOJURy0HD1PRxzG2TYILMelupUQcBGD9bSKOyCQZJyQUvxzzBVxL5LUFFoDvT
-j1F/HmOxSbqOCroLpPLh62GRM+IqOKmfzt7vWuwiz1hlO7vxMgUvU1xaqazPoOn7
-gT5hXQtlyBN8Kt8GOtqwkY9tP6sGe1I=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipv.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipv.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unipv.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipv.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipv.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipv.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipv.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEkzCCA3ugAwIBAgIQNvPCzFi8IyzAo2pvCeu9pzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExMDAwMDAwMFoXDTE2MDEyNDIzNTk1OVowcjELMAkGA1UE
-BhMCSVQxKTAnBgNVBAoMIFVuaXZlcnNpdMOgIGRlZ2xpIFN0dWRpIGRpIFBhdmlh
-MSEwHwYDVQQLExhBcmVhIFNpc3RlbWkgSW5mb3JtYXRpdmkxFTATBgNVBAMTDGlk
-cC51bmlwdi5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqVD8w8
-39tNXsgx1Dc0x+z2rzeOj82rY9DtWNoagNxjXq2R8sqyA+vOEe2JWxL+9/ivZItP
-JeHJ+1Fike3XiSIrXb4z1XEuNyUeFKKKR3XtPREs6i04OT8HdNb3wPYStfoaXX+J
-nR8Xb+OJq9L0TaHd7s/ZoRyTJwjAggNR2AfubnTUuNC27i6OWf9NausitdKsLwTx
-JSgbbU4USEARO0LHWkSmnFYSQFkD/KVPO5FjxsX7d6xCA1MtRMKV8Ymm3GE8diEH
-cg0fMqF3a5vgwUBAtu2jKkkTmkqIreJYNGfGy3Viq5tFkMLPR/cojz8G3hkr/DWz
-YxfJRhiuUAOIfvUCAwEAAaOCAV8wggFbMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-KzdXR+qQ47ntMB0GA1UdDgQWBBSeFx/Z+x1pQeagD84hECdg7SSFnzAOBgNVHQ8B
-Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaAr
-hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-dGVyZW5hLm9yZzAXBgNVHREEEDAOggxpZHAudW5pcHYuaXQwDQYJKoZIhvcNAQEF
-BQADggEBABY2r3TyyLLVUJgZQqAhjTHzJtoUS/bB26syOEATM6EcxL0W9N99QmcG
-6i+0+RwxWEiQhlarGDmCzcvLXKEVAeVLDaieS62v0fikXIFsg0FnYy706ZFSrIa1
-38yo4580o9KzdhBaww6VPrfiJtnW4nnkA56rLn2z0Ik1fYhh0Gii6JL7OXIosYQo
-lH7BOJURy0HD1PRxzG2TYILMelupUQcBGD9bSKOyCQZJyQUvxzzBVxL5LUFFoDvT
-j1F/HmOxSbqOCroLpPLh62GRM+IqOKmfzt7vWuwiz1hlO7vxMgUvU1xaqazPoOn7
-gT5hXQtlyBN8Kt8GOtqwkY9tP6sGe1I=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipv.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipv.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Pavia</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Pavia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Pavia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Pavia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unipv.eu/site/en/home.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unipv.eu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idem@unipv.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9112effe..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uniroma3.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniroma3.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniroma3.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniroma3.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniroma3.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Roma TRE</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università di Roma TRE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Roma TRE</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Roma TRE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uniroma3.it/en2/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.uniroma3.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>mailto:idem@uniroma3.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 39be6e63..00000000
--- a/swamid-interfederations-2.0/idp.uniroma3.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: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.uniroma3.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-09-07T14: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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University Roma TRE</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Roma Tre</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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Roma TRE AA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">AA Università di Roma TRE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Attribute Authority for Roma TRE members</mdui:Description>
-        <mdui:Description xml:lang="it">Attribute Authority per gli utenti di Roma TRE</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://idem.uniroma3.it/EN</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://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>
-    <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à 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 7ec6b325..00000000
--- a/swamid-interfederations-2.0/idp.unistra.fr-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.unistra.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Strasbourg</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABT0lEQVQ4y8WRMUsCYRjHfy9UQ2meh4IueiCtIW0NcUcQTZGb0KQfIe4DWB9AImhpytUlLnBqykmafFucTxESAj0QQ224hjslCD2FoGd54Xn//z/P83vgv0uspS67CmAAWUBiCmtjRaMGlJDVwryXzVeAFQLKbo5W7YHpSAFga8dh7/gFqAevUHY1WrUm05FCOGGT0a8xReWnJGgCg+S+JBRz2NwuYgrnF8STo9PCbiji9D7eNYDxZKzkzy6sp+dHIxFP2jE17twf3Ck+OADpvxrgbPSdvtbtddMAakR9UxXVfm02tOFomB5Pxopv0IE2kAbOARh0NKIpuZiBR96jboqrRbJlDLyzhRM2sEZA2dX4+rxBVnMAZPTbZZSFb8oCOQYdnXbDmP9m8xVMUVwWMJsgh6yW5l3v5peYwiKgZgEW6UOdaKoOWJhCBhn/rL4BsgJm3JnI3FEAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDcrMDI6MDAsBAiyAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA3KzAyOjAwXVmwDgAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.unistra.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Strasbourg</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>
-					      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>
-    </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-POST" Location="https://idp.unistra.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unistra.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unistra.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Strasbourg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Strasbourg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unistra.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean Benoit</md:SurName>
-    <md:EmailAddress>jean@unistra.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Eric Decornod</md:SurName>
-    <md:EmailAddress>decornod@unistra.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml
deleted file mode 100644
index b3ad4802..00000000
--- a/swamid-interfederations-2.0/idp.unitedid.org-idp-shibboleth.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unitedid.org/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for United ID.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-02T11:25:48Z">
-      <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-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: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">unitedid.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">United ID</mdui:DisplayName>
-        <mdui:Description xml:lang="en">United ID is a secure, public and privacy-respecting identity provider - sign up for free at https://unitedid.org!</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://unitedid.org/</mdui:InformationURL>
-        <mdui:Logo height="75" width="255">https://unitedid.org/wp-content/themes/unitedid/_inc/images/logo_net_globe_255.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE9zCCAt+gAwIBAgIJAIRpedgPtmouMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGlkcC51bml0ZWRpZC5vcmcwHhcNMTQwMzEzMTExNzUzWhcNMjQwMzEwMTEx
-						NzUzWjAbMRkwFwYDVQQDExBpZHAudW5pdGVkaWQub3JnMIICIjANBgkqhkiG9w0B
-						AQEFAAOCAg8AMIICCgKCAgEA06bntaEaQvlAYuAQB8YWyPVhCEpiBVWZ4xU3DlzW
-						ZEiqlBe4PxYJMPxWOgG4+jfBl5+BMTXfs8E7EuDimwllK6toZNJCxd4hStIqUwdO
-						942YWlzePTlpvZRcsnZRCnGN02lgnQuILaiHdfFrzD8nrxS+TrHJpJT5HqaR//fG
-						s5ym/7swTvEdW2wmMcwcTNr+cyU1ojucYPvifQleGO0253fowddkVBTJ+xihCJ8B
-						QSJP+ReDQ2jL3UxxGV60i77flk4Xj8lLoEDlKZr7Rzv6+Dn1aKLg4wouEL359YhQ
-						iK90DuPiuN+TkXcNt8jzAZT6hDbojVem9Jd1GTMV6KQni/UnF+M3DzmlYFUdI3ey
-						0qosQgy+lyaLrZXlqzqwrpzUsf8fQgVOoZUH3Tftrp08GmGEJWDjRsk73nNPwc5p
-						NyJwPrZstYxFVnOHSXGlz915FxF1z914JEVL6qiT3c2MCB1kGwyOl0INUaeTa/Jr
-						/KVKNB+DMXMmcHqGav3m25H+MAYhwvRCiaUIKCn4d66J9UNBwnOK3qpcNa0J7HIU
-						mmvbqpdmWrxIpUD9PJb6KPCikfYCN3mmriA+s495NmedXAK3v0vu3If39EesZWxJ
-						zOYTmF/F80lT9ekWWp/pLwDCj3JtrBIeAE4SQUnxP/V5Guun5l1vHsL7SjQLjjI1
-						7/kCAwEAAaM+MDwwGwYDVR0RBBQwEoIQaWRwLnVuaXRlZGlkLm9yZzAdBgNVHQ4E
-						FgQUzGdk542+Ic0pLn8yjrGQEEhuU0kwDQYJKoZIhvcNAQEFBQADggIBAI3Ie5om
-						G5l7kkN0nZqzDbDfmNcfCDq0G4yj/gkGGWnFbVqEAzrUyc/mjQKGbWhpPAVXhW+6
-						B+F1KDgDLg+Y3k4oeoCXolcLBfD65tpw9v/SWnE+RBlt+WVV0Mh9+m+PoW4bg+hd
-						bygjWO62tHwb5aiLdc7xjboTgjFy2vnnThKBahTr3FwppLhNBtyW/kF6JublrAcI
-						HhZac2br9+jkoCsdBq/2eP2ucYF1Ntjw4SfeX6C8RsHLrA+j8io1F49CKymnCfG3
-						7dvkJN1+rexjVwCaSzwKMgwkXYy6/FjE9tJ7uUOWqoSDAHzb5lkQBbOYvL0JGfSB
-						Pt6r3Et44VlQH/XUNRKVa8RHaOtzod0fKFVa4rqAnUc0HmMkbp/zbdfgW2TX5iEE
-						fcOeA9aP4laV75vjA2s8p0lHIhUsFYT4sAPInYvtxlQMRC7+You3cQiobjoiiyXE
-						Ph1Jkqsxvt8z/YXgEjKGdddUrx3OSk4Qwhvj929qLOEPEwNd1S25QENyBYjXgOYL
-						31J9LwGMVlDhBUitW5UFluzpcTshxZJkPJ3k8lbng+9MdPwTY59bmM5dhzWVYNqS
-						wZHUAPn5y2BFPiIc2c1v00i5it6uNp6iIY6OMTXw2zFE0rhlMdzRr1MjJWffb15O
-						gxLJbnzfithSY6IfD2mJgSR6iNnUAIdCD0md
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitedid.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitedid.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitedid.org/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitedid.org/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitedid.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unitedid.org/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitedid.org/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unitedid.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitedid.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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitedid.org</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE9zCCAt+gAwIBAgIJAIRpedgPtmouMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGlkcC51bml0ZWRpZC5vcmcwHhcNMTQwMzEzMTExNzUzWhcNMjQwMzEwMTEx
-						NzUzWjAbMRkwFwYDVQQDExBpZHAudW5pdGVkaWQub3JnMIICIjANBgkqhkiG9w0B
-						AQEFAAOCAg8AMIICCgKCAgEA06bntaEaQvlAYuAQB8YWyPVhCEpiBVWZ4xU3DlzW
-						ZEiqlBe4PxYJMPxWOgG4+jfBl5+BMTXfs8E7EuDimwllK6toZNJCxd4hStIqUwdO
-						942YWlzePTlpvZRcsnZRCnGN02lgnQuILaiHdfFrzD8nrxS+TrHJpJT5HqaR//fG
-						s5ym/7swTvEdW2wmMcwcTNr+cyU1ojucYPvifQleGO0253fowddkVBTJ+xihCJ8B
-						QSJP+ReDQ2jL3UxxGV60i77flk4Xj8lLoEDlKZr7Rzv6+Dn1aKLg4wouEL359YhQ
-						iK90DuPiuN+TkXcNt8jzAZT6hDbojVem9Jd1GTMV6KQni/UnF+M3DzmlYFUdI3ey
-						0qosQgy+lyaLrZXlqzqwrpzUsf8fQgVOoZUH3Tftrp08GmGEJWDjRsk73nNPwc5p
-						NyJwPrZstYxFVnOHSXGlz915FxF1z914JEVL6qiT3c2MCB1kGwyOl0INUaeTa/Jr
-						/KVKNB+DMXMmcHqGav3m25H+MAYhwvRCiaUIKCn4d66J9UNBwnOK3qpcNa0J7HIU
-						mmvbqpdmWrxIpUD9PJb6KPCikfYCN3mmriA+s495NmedXAK3v0vu3If39EesZWxJ
-						zOYTmF/F80lT9ekWWp/pLwDCj3JtrBIeAE4SQUnxP/V5Guun5l1vHsL7SjQLjjI1
-						7/kCAwEAAaM+MDwwGwYDVR0RBBQwEoIQaWRwLnVuaXRlZGlkLm9yZzAdBgNVHQ4E
-						FgQUzGdk542+Ic0pLn8yjrGQEEhuU0kwDQYJKoZIhvcNAQEFBQADggIBAI3Ie5om
-						G5l7kkN0nZqzDbDfmNcfCDq0G4yj/gkGGWnFbVqEAzrUyc/mjQKGbWhpPAVXhW+6
-						B+F1KDgDLg+Y3k4oeoCXolcLBfD65tpw9v/SWnE+RBlt+WVV0Mh9+m+PoW4bg+hd
-						bygjWO62tHwb5aiLdc7xjboTgjFy2vnnThKBahTr3FwppLhNBtyW/kF6JublrAcI
-						HhZac2br9+jkoCsdBq/2eP2ucYF1Ntjw4SfeX6C8RsHLrA+j8io1F49CKymnCfG3
-						7dvkJN1+rexjVwCaSzwKMgwkXYy6/FjE9tJ7uUOWqoSDAHzb5lkQBbOYvL0JGfSB
-						Pt6r3Et44VlQH/XUNRKVa8RHaOtzod0fKFVa4rqAnUc0HmMkbp/zbdfgW2TX5iEE
-						fcOeA9aP4laV75vjA2s8p0lHIhUsFYT4sAPInYvtxlQMRC7+You3cQiobjoiiyXE
-						Ph1Jkqsxvt8z/YXgEjKGdddUrx3OSk4Qwhvj929qLOEPEwNd1S25QENyBYjXgOYL
-						31J9LwGMVlDhBUitW5UFluzpcTshxZJkPJ3k8lbng+9MdPwTY59bmM5dhzWVYNqS
-						wZHUAPn5y2BFPiIc2c1v00i5it6uNp6iIY6OMTXw2zFE0rhlMdzRr1MjJWffb15O
-						gxLJbnzfithSY6IfD2mJgSR6iNnUAIdCD0md
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitedid.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitedid.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">United ID</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">United ID</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unitedid.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@unitedid.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Leif</GivenName>
-    <SurName>Johansson</SurName>
-    <EmailAddress>mailto:leifj@unitedid.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml
deleted file mode 100644
index 3999db91..00000000
--- a/swamid-interfederations-2.0/idp.unitn.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unitn.it/idp/shibboleth">
-  <md: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>
-  </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">unitn.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Trento</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Trento</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Trento users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università degli Studi di Trento</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.unitn.it/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.unitn.it/en</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAIG9TtUKx11xGhvJVWJiQdJGaFAlMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bml0bi5pdDAeFw0wOTA1MTkxMDM1MDJaFw0y
-OTA1MTkxMDM1MDJaMBcxFTATBgNVBAMTDGlkcC51bml0bi5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAISBCBJSMVJi1WHKET8aBYZIrlhp8ikT4hz5
-rbPXRLX1l2TPwzLlHq8K4b2XcBbmhT8nOO8XCDQSwzdPPDWXjzSq3/8NWvZjDhEA
-O8AB03VG+WVQrD6VeGhG0byfxpJghdO/y4lr188Ejb2ynPVduTVc7UcvuneVhKPP
-nn07Mzw0W09yG3Y7ygPJrv7t+Xitxp0skQZ0k/XaTEGxCp9uJgg8ngrPByclb2jY
-EGxuw2fNXM/psB6abxyeK+v/sCp/6RDXMC6oUk2DlKY7opjihhAhtW8wAivqZd9g
-YWFXgPa95SfGLORYKp3c9kEoU+eY/v4ZZGI4SVaPiMvSSDko7DcCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaXRuLml0hiNodHRwczovL2lkcC51bml0bi5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTb1c/d9fvaXr1BBjRQhoMLCywfgwDQYJ
-KoZIhvcNAQEFBQADggEBAA3ZvXWRl+dnlwRAPkoBGjmJHzjwkjRAszHzd1fOr/2y
-vN+8d2gLjnF7F6Ge/z3xrmZAUuiI6iN7RWP6bXc4dce8cUhXE+U2yKJxEnlDIuMd
-u82HYWJ/uM4fVnenQaf1L9g7Y5TMTK/LGhapxZVReL6JROYWhntXgkEw6ccBQvge
-IX86tgYD6FJe9mD1p/1vKQ1tyGcE92D45T2uXa7XEJ54NaZk7vtuIRBB50VRDcbX
-7L4+1kAfwLJIJdzrpqckYW0FCUKCj/4pTfk33N+kKm22AhWMSixW4pjAGWPPPdOz
-PD4N74JoeDBjTnh5SkomQrcf0FeYr/nXWuUh7P1510Y=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitn.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitn.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unitn.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unitn.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unitn.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unitn.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unitn.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAIG9TtUKx11xGhvJVWJiQdJGaFAlMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51bml0bi5pdDAeFw0wOTA1MTkxMDM1MDJaFw0y
-OTA1MTkxMDM1MDJaMBcxFTATBgNVBAMTDGlkcC51bml0bi5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAISBCBJSMVJi1WHKET8aBYZIrlhp8ikT4hz5
-rbPXRLX1l2TPwzLlHq8K4b2XcBbmhT8nOO8XCDQSwzdPPDWXjzSq3/8NWvZjDhEA
-O8AB03VG+WVQrD6VeGhG0byfxpJghdO/y4lr188Ejb2ynPVduTVc7UcvuneVhKPP
-nn07Mzw0W09yG3Y7ygPJrv7t+Xitxp0skQZ0k/XaTEGxCp9uJgg8ngrPByclb2jY
-EGxuw2fNXM/psB6abxyeK+v/sCp/6RDXMC6oUk2DlKY7opjihhAhtW8wAivqZd9g
-YWFXgPa95SfGLORYKp3c9kEoU+eY/v4ZZGI4SVaPiMvSSDko7DcCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVuaXRuLml0hiNodHRwczovL2lkcC51bml0bi5pdC9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTb1c/d9fvaXr1BBjRQhoMLCywfgwDQYJ
-KoZIhvcNAQEFBQADggEBAA3ZvXWRl+dnlwRAPkoBGjmJHzjwkjRAszHzd1fOr/2y
-vN+8d2gLjnF7F6Ge/z3xrmZAUuiI6iN7RWP6bXc4dce8cUhXE+U2yKJxEnlDIuMd
-u82HYWJ/uM4fVnenQaf1L9g7Y5TMTK/LGhapxZVReL6JROYWhntXgkEw6ccBQvge
-IX86tgYD6FJe9mD1p/1vKQ1tyGcE92D45T2uXa7XEJ54NaZk7vtuIRBB50VRDcbX
-7L4+1kAfwLJIJdzrpqckYW0FCUKCj/4pTfk33N+kKm22AhWMSixW4pjAGWPPPdOz
-PD4N74JoeDBjTnh5SkomQrcf0FeYr/nXWuUh7P1510Y=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unitn.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unitn.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Trento</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Trento</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Trento</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Trento</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unitn.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unitn.it/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Filippo</md:GivenName>
-    <md:SurName>Moser</md:SurName>
-    <md:EmailAddress>mailto:filippo.moser@unitn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:comunicazioni.aai@unitn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml
deleted file mode 100644
index 8ddf1327..00000000
--- a/swamid-interfederations-2.0/idp.uniurb.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uniurb.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-02-23T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniurb.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Urbino University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Urbino</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Urbino University users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Urbino</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.uniurb.it/idem/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uniurb.it/it/portale/index.php?mist_id=12000&amp;lang=ENG&amp;tipo=ENG&amp;page=1069</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.uniurb.it/idem/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAPfr8HNJ+ZnHsOZPOHT6/ExkMj/TMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC51bml1cmIuaXQwHhcNMDkxMTA0MTIwNjM4WhcN
-MjkxMTA0MTIwNjM4WjAYMRYwFAYDVQQDEw1pZHAudW5pdXJiLml0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArCLO1a/dUZ8kXUwmWnFFQIZhqooWQS9E
-jL+MBLChM79Rjh0Ucga+iWKfrldYst6GyUsucTc409cd0k1WuSrcWhqbGsNUklux
-TF2RJOWdtc9o748/eybGFrymycmXnnGOinwmqvaRDQGQQ0oxi1CxhhJ/kkZRBiyH
-kJ0w5NjY+8KUPlTiPU6X71HGPhrrOgBteGcegt5gIycMdWAZhl/30yLNxIo8XdRH
-VmuHzifQqLxmsYRlHTQKVeKkQ39NcoKYpmmq84SQNximYDFy1l0QJErZ9din7q0T
-9tJG56/1C7Cd3cswdA7E7rg8/E1SEQTq63WUuIssA9cgvVYy0zEJ1QIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAudW5pdXJiLml0hiRodHRwczovL2lkcC51bml1cmIu
-aXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEdlfuYSnAcQl8FMtl+bhsdev9SS
-MA0GCSqGSIb3DQEBBQUAA4IBAQBYopjNhRz1N1QjNZDClXH0UgTBHIyzYs1kkfid
-kySla/EpsunfgdhYyxewc0RmFkRbZsMbji5Sbu7ezVuTt+JO1DJvWvqGMUsvz3rP
-Fj/hx4kxR+D2fM+27LoyK3L7jvAq8FcBR7b/vV+6vEF2vI4cKNXQ8GEv0Aem0Ow2
-5l6w4DgJLa0/3BpfaktCHHtV9YMB8OdcmGi1LZLE89uDlBrh2wS7myGMU+3h6/GL
-40cg0YNou/KoAV5DM0cvNRef+K/IjlEILdppfjfmk4jD9Eqom1m6i8dffH7fK2ee
-T68a+KBYk1QOH0KR1wV5hojnDngV3n9JvzTHSBvVpbkOxvDi
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniurb.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniurb.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniurb.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniurb.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniurb.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniurb.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniurb.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAPfr8HNJ+ZnHsOZPOHT6/ExkMj/TMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC51bml1cmIuaXQwHhcNMDkxMTA0MTIwNjM4WhcN
-MjkxMTA0MTIwNjM4WjAYMRYwFAYDVQQDEw1pZHAudW5pdXJiLml0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArCLO1a/dUZ8kXUwmWnFFQIZhqooWQS9E
-jL+MBLChM79Rjh0Ucga+iWKfrldYst6GyUsucTc409cd0k1WuSrcWhqbGsNUklux
-TF2RJOWdtc9o748/eybGFrymycmXnnGOinwmqvaRDQGQQ0oxi1CxhhJ/kkZRBiyH
-kJ0w5NjY+8KUPlTiPU6X71HGPhrrOgBteGcegt5gIycMdWAZhl/30yLNxIo8XdRH
-VmuHzifQqLxmsYRlHTQKVeKkQ39NcoKYpmmq84SQNximYDFy1l0QJErZ9din7q0T
-9tJG56/1C7Cd3cswdA7E7rg8/E1SEQTq63WUuIssA9cgvVYy0zEJ1QIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAudW5pdXJiLml0hiRodHRwczovL2lkcC51bml1cmIu
-aXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEdlfuYSnAcQl8FMtl+bhsdev9SS
-MA0GCSqGSIb3DQEBBQUAA4IBAQBYopjNhRz1N1QjNZDClXH0UgTBHIyzYs1kkfid
-kySla/EpsunfgdhYyxewc0RmFkRbZsMbji5Sbu7ezVuTt+JO1DJvWvqGMUsvz3rP
-Fj/hx4kxR+D2fM+27LoyK3L7jvAq8FcBR7b/vV+6vEF2vI4cKNXQ8GEv0Aem0Ow2
-5l6w4DgJLa0/3BpfaktCHHtV9YMB8OdcmGi1LZLE89uDlBrh2wS7myGMU+3h6/GL
-40cg0YNou/KoAV5DM0cvNRef+K/IjlEILdppfjfmk4jD9Eqom1m6i8dffH7fK2ee
-T68a+KBYk1QOH0KR1wV5hojnDngV3n9JvzTHSBvVpbkOxvDi
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniurb.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniurb.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università di Urbino</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Urbino University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Urbino</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Urbino University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.uniurb.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uniurb.it/it/portale/index.php?mist_id=12000&amp;lang=ENG&amp;tipo=ENG&amp;page=1069</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>mailto:paolo.cecchini@uniurb.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9d147f38..00000000
--- a/swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.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://idp.univ-ag.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université des Antilles et de la Guyane</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABsklEQVQoz32SP2hTURTGf+fc9/KiDU2oRvTRMUXUgkWhahHpYgeXDk7qICjo5NBBsVDExUFwFgUFp9pFdwVBB3GwRLQ6qNSCVeoftE2aIK/Ju9fhJTXoi3c53HO+75zvOxzhyE0Aq6jlP69h8GIEBfJix8IlGl5XdORfGCnnxAJKJTdz/O6DyUsbgzpICtrqga1frp66fvngc6KMAjY2/CIjDlzqABFYJbIKKAnKdcECjqxaTOujSQoFASepFN/E7X6iJMK79gcnWT9en/ZHUjv868B5yHolIQgGC+lbAjUxBkQQp/jN76ubEIYKtXRhDW+guELMwo88xirB2syLQYST+8tUe/5WJY7qhvE9T2hy63UJr6kY+/DNwPxieHrkXrj5J1EGcS2DOKo9x/bNDW+fu18+TK23tSUKtbEbFxEWps6N9i/xtUAlR6WXb/mzwy+nz1xZXubo7RMUqoC0jm8tszO/8nhioljk/afw7cdBo/FQ6dG2Lbx6V9p9bZIgRl0HAbBKJXt+dHZ879Owb96K+fB5x51nh6Znd9FXa+vsJCQWo4B6gAMnGEeujh93XsBv/7OZ53mGvVkAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDB8O3PvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA5KzAyOjAwDWbLUwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-ag.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université des Antilles et de la Guyane</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>
-					      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>
-    </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-POST" Location="https://idp.univ-ag.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-ag.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-ag.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université des Antilles et de la Guyane</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université des Antilles et de la Guyane</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-ag.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Robert BOLIN</md:SurName>
-    <md:EmailAddress>robert.bolin@martinique.univ-ag.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Patrick PLACIDE</md:SurName>
-    <md:EmailAddress>patrick.placide@martinique.univ-ag.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 698e78ac..00000000
--- a/swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.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://idp.univ-amu.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université d'Aix-Marseille</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABfklEQVQ4y71Sv0tCYRQ9n+8pBqI9l0Tph0TQFiVvycAhpCGCtrbW/oLamoKG3AJdgob+ApfGhEALkYYGMagwy+cQor4Qn/h87zZkhX0funXG8517v3PPvcAIWHqJLL1EozTyqEf7PYNxcIxV/HsDu6OR3dO5ue2eTnZH43gug/5TEtTMoq+liTraF6elybzdAlPWOAdMZKuvpcl6OBzipMUjyKFtTi/MwKGoYEoMZNZAZg1MicGhqMIMuI7mywXZzwkwJQbI3oGlD1DzGo75fTjndodquAyY0wt5+RySX2XmY5IAwLlwzKxGgcjQOAdcA9GcACD5VSGPVLZKLcMUnuuoU24ZJqWyVWIbp3fUaHYRjwSwszKFpaBH/NMA97U2nd1oyBfr8CtusJZh0snVKy5zX/O53BKmgx6oYd9QYaGs463WRq9rAQA2oyEcrM/8bqHS6FIiU0G+WP8R/YXLLSEeCWBvNYRZv5sJ1/htUzf6yJVbAIBoeBK+CVk43ic1Y6EX/xTzkAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo1OSswMjowMAlAiYEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NTkrMDI6MDB4HTE9AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-amu.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université d'Aix-Marseille</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>
-					      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>
-    </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-POST" Location="https://idp.univ-amu.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-amu.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-amu.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université d'Aix-Marseille</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université d'Aix-Marseille</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-amu.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>LALOT Dominique</md:SurName>
-    <md:EmailAddress>dominique.lalot@univ-amu.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>AIMAR Michel</md:SurName>
-    <md:EmailAddress>michel.aimar@univ-amu.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 30682c70..00000000
--- a/swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-artois.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université d'Artois</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACQ0lEQVQoz32SS0hUcRTGv//c6yttvGMJ42OaxhkSJY0UwYWUlUQStsmFQmWrwARz16IgsoWzKXqAPUBFXAy06UFENOWiCBPJV2nNqOg4kzqmd7TxOo/7OC2uDBLo2X3n4zsczvkxIsKuJcmb48HxAf/gCVv1UfMR0A4VldWHvW7Xu2EianzVxD/OxrMsIuIBqIHhNWd5UlGNscWtT40pmuNMe8ATIv8DAIWCQ1jaU5BhBcAD4PLLSIUy/yGxxo17LwJDS909F3X53PdSJuVK4eWtgDw7AIJhX4lur0vxu3fc4HD6WCkAj+idDHvBWIWlYiugzI2DkFJ5TQ+43gwgK+lkTWHe/r0A3NMfBS7Tkp5bmn0YgAFA9PMtaEgtO6sHmjveIiTfbqnVZfdUH8cMjbbzuuS1NZ8SCPJ5JpZhBtA/6MWYeOF6VVWZHcDE6s+R9R9gVGurm/NvBMUNXvZ9Z0DKcac+4FRbb3lDUZ+zSZefZr5k8UIql2yS7UZBO2gx8+riDAA+7xCAsbFfrzsa6qpLZEXz/f6rRJNvjrZz4NqKr1qtyVsXjE+6ly9hpRXRfieRGotrE1OrntlQJKLOh+fQmYbOTI/oTTwURKSKMyQFNxSamA4trUgJr+tbj/AkP6fLsZ0AHoBqLPD/iRjTYsV2YTtFX5eHGFi95Vyis6lEDGFJlqSY1Zxmykz5DzuecQxMjIkANNKejnaFY+Ed4SOikcVR3AceodJV3fy+VYyEiIjtjveCtDC/FjggWHLTc/TOP6xlTK4bHFRuAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjU5KzAyOjAwCUCJgQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo1OSswMjowMHgdMT0AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-artois.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université d'Artois</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://idp.univ-artois.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-artois.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-artois.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-artois.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-artois.fr/idp/profile/SAML1/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">Université d'Artois</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université d'Artois</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-artois.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@univ-artois.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 c05b6c56..00000000
--- a/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-avignon.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université d'Avignon et des Pays de Vaucluse</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAADF0lEQVQ4ywXBuY/UZRzA4c/3vX7HzM6xF7AGSRZBZCWYoImJ2kirf4CNlbWS2NBbGVtjqZWdCYWtjVoYEytN1LCAuyDsgrszw87O/K738Hnk9lc/j7+b1h/HqGqa6uTmi+PBbwezc5Ng64X3Rjuz6FuTldZOhDRMonasktjX/PrTrbc+l+uf/fBeVfS+b0LkNEQyJTgF7ugBvmvRksjPX6OnFZlW5CKIwHEbKFP8wohV72w4jU+aaeeJwVPe+4XMOUKCYjmlpwLhzCV0f4QSYWw1IsKs7T5SrXbXrAilFjadYTh7hM1KfLlKqJ6TXbgGXUU62iMBGhARtBK0koEJMfSTCCtG0cSEnD5Fxlss9/9g1UL+/DF2uEbwLc3yhHnWxyihC4kQ08K8vTVa/DmpqZSwCBF19JA4OyTMjvgvBFzvBJXuYqxlGnL85kWsUoSUqLq4NFfPDDZ3Zy2Plg1P6o5Btk5Kiawn1KsvMDp5QiYWU2hEGTasQSvBROhb0arp4vXzPYdRinOFY3M0ZmQNWX9IUQxY6ILjbMDeqacTQ6EgpUQQmLbx1BzO2/trhbv8htZMGs9UKWzu8E0LvkW3NZI8ziq0cyBCroS5j3Sdf2gO5/WksIbSakZJU2lBpUhbT8nHGzRG6LRFKyHGwLz1gEFS4lLftmY7n/4YpMr/XZ5Vj9s4ntXdeTD0emsol7HS7/MsaEay5GnXoKE7brwutPx9aS2/ZT7c+WYv+aPXuugeGO1275wWK4dTP3ppXdMfPuKfsMfB0wU7V7ZY29z//eWL9V+nVX51tbe8//x4cGxeyd7/etl+e6WJ8VWfl/fOlvHd7f6M8cpFylJx4cZ1JpNnjNc2yOTB+pZeXm5GPjTI6yb3O8Y3d26k6f4nLoGb79/MZxWiEtPDXapc0DpxMveUC83qWG2tF/kWCcQWlS5HV1UKw7lfSowddBEOprCsFTYXWi8czSEEAyFRVaBMJFRCrOsiJXdsbNnVOh99GVP9Zm/Y8ekH2UFKso2SMjTsCulu9HEkRp3RLj4mtEbcSpViWHW9uvwf4uN/Mjd4KBEAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDArMDI6MDDpozY8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAwKzAyOjAwmP6OgAAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-avignon.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université d'Avignon et des Pays de Vaucluse</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>
-					      MIIDNzCCAh+gAwIBAgIUZBH1ZmHI1RRRvGe5/kKYyMcO2w8wDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAwwTaWRwLnVuaXYtYXZpZ25vbi5mcjAeFw0xNTA5MTUxMDA3
-MTNaFw0zNTA5MTUxMDA3MTNaMB4xHDAaBgNVBAMME2lkcC51bml2LWF2aWdub24u
-ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqOR3uzcmrMGtGCXQc
-6k0A1GkLsIz6VNYYuMbNEcY9SAu5zLlkCK6PEce8tkBEGQimsUmyxyznb3N36O+a
-lr4YydGD3RcyeHzV20YVwTk+U8UnjkTNfMIH+Ng5v7J/0i+4ZhIltBf1+uKpPrDr
-7FPztpKm14rhx4tsvVxZKhxTm3MznZhQJ1RjqF8rMr/TXqMupTO+BE0V+M/CAzmH
-V5M4USd2iQ23LJe2ONeLe8lfRt2J49YZwfpbCUPgefG3LzAowEDmZIUBdkmAEh58
-4dyOgGlJzUMTpQW6AGbWsg7aoDh54uh+VSot/xy6viSYQ1aKQj5a6rtCLpqT2pTu
-v675AgMBAAGjbTBrMB0GA1UdDgQWBBRX2tuI/GxYv4xoLqgvCNWxqhmGgzBKBgNV
-HREEQzBBghNpZHAudW5pdi1hdmlnbm9uLmZyhipodHRwczovL2lkcC51bml2LWF2
-aWdub24uZnIvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAIX3Y3qc
-b/mDu6p+L9xPHPJcnwurKjocRInR8yl5LmqLFj9LDd+W5vZakUQc0F22CcA0xQZ7
-CGgTxO1jQHcGN0rpxlEeXiJWL5dw0aW8IGNc3BUsL8peRyDc8dywkD1/nYjHJJEW
-I411E5B9MpME7bkMHsLP+pNFa9LFCS1qodUuhn0Uh/k/khBNXQ9StiVGmXcq/SGK
-9I1S4BMsHYQzZZvxJ0dV0YHxyvpW8Z2BcegIqT0NrjT4Hvx+Qt9pypfBZB+cl+7c
-e0lkWPNsuL4wxXCVh11OFAUF0fB7pVza2jKTj6t6ydW51tDmiaYSI8nqXyF3X7wy
-27nzwk0AdRYbU40=
-					    </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>
-					      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>
-    </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-POST" Location="https://idp.univ-avignon.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-avignon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-avignon.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université d'Avignon et des Pays de Vaucluse</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université d'Avignon et des Pays de Vaucluse</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-avignon.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>idpmaster@univ-avignon.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2816e2dd..00000000
--- a/swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.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" entityID="https://idp.univ-bpclermont.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Clermont-Ferrand 2 - Blaise Pascal</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACb0lEQVQozzXBvYtdZRAH4PnNzHvOveds1j1Zswm4LhG9iBHBlGonISIINgp2FmKlhdb2/gXBxsJUqRSxCWIRSERRwQ8SUSTZfOySJeh+JDeXPV/zzqTyeXDzzlaVtIs0Ji7dIljJTFOEg4I8IthZQmmCwR72qrV8e4sub+5ZoZmLJL1BIztHTwyEg51b8dy+OmteO1Fwa+nyzfvd0eWoFIBqOGvTH5Q2iAEomZPVyR5vrtw4WOSCYSySyrGt5pmzRxQx8uunjq+v5JJaRiah8nAoYo5STIUxmglFsFdUaBCG9cJemj32xnpDi9ZzSJdtCrY0hlTWc526w7QsmbzTaHN5P86ePLKiODVbe3YtNZgruw7IIwdLiKt5cWRYhNnbLx47fTw19UQpPHxK9OGZ5/rc7x/mb64/+PPufidLTsxDZZdu7H3541/vnvv63sOs3HskIcoQjahUt3cX1/6ZD7QKnhTo8fut7dMffEbTJUI0R9d++/SdJ5oSJKAwwvkfNi9c2+uqZevt9u2dS++9oEQEMAEBenCw+/e8e7Kp2cyEGPzTL39c+f4qcQIFujHXMyYQURARBcHi5RONk1+8vntnv9WQZ06uigkwgRQOKrqp0v8AWtl4+tedfz/54uLPV7fL6fL7b77y/GzDMUKyMyCR4UrCom45sQzz/+6e+fhziFBR9fnw3FffFZMqypoAHdgIhQVT7nIWRh+cx9yi1kgRmkGJUAytITQ4uxhlGXjUY9PpR2+d3d7ZJOacBYSgICJXJ1C4AxCG9L6x8dTqUo17W1vORZpmG1RlDNIgYuQYFREUDqKuSBOzdgJd9I8A5fBM5ldwG3gAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDB+PCcVAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwD2GfqQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-bpclermont.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Clermont-Ferrand 2 - Blaise Pascal</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>
-					      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>
-    </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-POST" Location="https://idp.univ-bpclermont.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-bpclermont.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-bpclermont.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-bpclermont.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-bpclermont.fr/idp/AA"/>
-    <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">Université de Clermont-Ferrand 2 - Blaise Pascal</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Clermont-Ferrand 2 - Blaise Pascal</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-bpclermont.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>Fed-Admin@univ-bpclermont.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9d458c92..00000000
--- a/swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-fcomte.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">University of Franche-Comte</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABPklEQVQoz9VSu04CURSc+3JheW2IwQSIGLGhMzTS2Fjb2PoN1iZ+gT9gY2NvLCz9AQsTEhIfhSbEsIobCWJgeezC6r0WC0IUTCg91WTOnXPuTA45L+5gnuIACmsH0WDmrX1XqhwtxfK51C6A12bx3joFwJm+kd0XPOwOGlflQw4gHEjpWiLkJQFowjD0VQAd1/JHUkLj4RyjwhXx4YZaq9Tt15q9MgClpP9OqY8RgFR9BiHlYCi4fT75/iIB+dsDncvxPxEQMgpHjiip1Lj1UyCl5wPOdB8s8AijGoBxrJNlOyagAJKIrS8vbnXcl2xim1EBoO1Upwqequ+X6fgmp4H8yt5ERz3WL6YIAFybx95nN2kUNGH4TNutPlhndfsGAJl1rdFgJhJMCxbqe61mr+wMGkNvs+KzHdN2zN/8FyutcXADWeY6AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://univ-fcomte.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Franche-Comté</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>
-					      MIIECTCCAvGgAwIBAgIJAMpmbKzqwZS/MA0GCSqGSIb3DQEBCwUAMIGaMQswCQYD
-VQQGEwJGUjEWMBQGA1UECAwNRlJBTkNIRSBDT01URTERMA8GA1UEBwwIQmVzYW5j
-b24xDDAKBgNVBAoMA1VGQzEMMAoGA1UECwwDQ1JJMRswGQYDVQQDDBJpZHAudW5p
-di1mY29tdGUuZnIxJzAlBgkqhkiG9w0BCQEWGGlkcG1hc3RlckB1bml2LWZjb210
-ZS5mcjAeFw0xNTA3MTAwNzQ2MzNaFw0yNTA3MDcwNzQ2MzNaMIGaMQswCQYDVQQG
-EwJGUjEWMBQGA1UECAwNRlJBTkNIRSBDT01URTERMA8GA1UEBwwIQmVzYW5jb24x
-DDAKBgNVBAoMA1VGQzEMMAoGA1UECwwDQ1JJMRswGQYDVQQDDBJpZHAudW5pdi1m
-Y29tdGUuZnIxJzAlBgkqhkiG9w0BCQEWGGlkcG1hc3RlckB1bml2LWZjb210ZS5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJaIDFDxx9tCnqjzRE4g
-2v49CrDURG3Ve2tOnGkgj7t+5AkH+B7DHnbHC+cEde7OiJYo3GWB2qXA1+4C2CeN
-InC5i6R7Un+PjM3qnZ6C+jwUf9QgWV77G27ao50uIj/XB84Cf4jSSWMtJBrfzcgw
-oFFVMUgVoAel6l8okarDEZdK+IoukX/TbFNj+X0+8wa/lv1LEzDTXAYFJH1KHunX
-GRCwl2ObiG8VSVkbUruQkY5IZjY9AudoFCPdTtjuLo1j1k49kYHggE2SBGqVyoAv
-CoChbNvHkryMXL5W+wQReIulWR28L2qqX+l43lIpCC+VSR1WDJ/j/FVOqleK950K
-1NkCAwEAAaNQME4wHQYDVR0OBBYEFCer9hrE+IBVKwn4FDhH6E3aW33CMB8GA1Ud
-IwQYMBaAFCer9hrE+IBVKwn4FDhH6E3aW33CMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBACXU4gUJOWe43QXQSApU/JtcTgAgKF6NcOVs/jZ++8KiGWgZ
-46qhDQbnjYSXl4/QsjlIqJliAmWGp89aJIlUs1oXZ7Ro4cIgfSoKTlbXQc+3L2QL
-pa56dTmER/5Z4oamgeP9YPJd2teIMuh42lCD3GBDFE120F7zTSy5N7E0mwPOCWXN
-pFXlNA+vzp+WEEWPO6TV29w1Hz66NFf7PeexEr4DDBg0vnvsEBAdiGA1x1CQbFit
-Iif5onYKtZVZW68sY7wLOim3mCWb/QayOXJIycv0zc5EyziPGy+dIZT2LePsQPU3
-kL3y4I3hH+GeK5iK/w7esz+6VG04gBFYYeamic8=
-					    </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>
-					      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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univ-fcomte.fr/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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-fcomte.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-fcomte.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-fcomte.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIECTCCAvGgAwIBAgIJAMpmbKzqwZS/MA0GCSqGSIb3DQEBCwUAMIGaMQswCQYD
-VQQGEwJGUjEWMBQGA1UECAwNRlJBTkNIRSBDT01URTERMA8GA1UEBwwIQmVzYW5j
-b24xDDAKBgNVBAoMA1VGQzEMMAoGA1UECwwDQ1JJMRswGQYDVQQDDBJpZHAudW5p
-di1mY29tdGUuZnIxJzAlBgkqhkiG9w0BCQEWGGlkcG1hc3RlckB1bml2LWZjb210
-ZS5mcjAeFw0xNTA3MTAwNzQ2MzNaFw0yNTA3MDcwNzQ2MzNaMIGaMQswCQYDVQQG
-EwJGUjEWMBQGA1UECAwNRlJBTkNIRSBDT01URTERMA8GA1UEBwwIQmVzYW5jb24x
-DDAKBgNVBAoMA1VGQzEMMAoGA1UECwwDQ1JJMRswGQYDVQQDDBJpZHAudW5pdi1m
-Y29tdGUuZnIxJzAlBgkqhkiG9w0BCQEWGGlkcG1hc3RlckB1bml2LWZjb210ZS5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJaIDFDxx9tCnqjzRE4g
-2v49CrDURG3Ve2tOnGkgj7t+5AkH+B7DHnbHC+cEde7OiJYo3GWB2qXA1+4C2CeN
-InC5i6R7Un+PjM3qnZ6C+jwUf9QgWV77G27ao50uIj/XB84Cf4jSSWMtJBrfzcgw
-oFFVMUgVoAel6l8okarDEZdK+IoukX/TbFNj+X0+8wa/lv1LEzDTXAYFJH1KHunX
-GRCwl2ObiG8VSVkbUruQkY5IZjY9AudoFCPdTtjuLo1j1k49kYHggE2SBGqVyoAv
-CoChbNvHkryMXL5W+wQReIulWR28L2qqX+l43lIpCC+VSR1WDJ/j/FVOqleK950K
-1NkCAwEAAaNQME4wHQYDVR0OBBYEFCer9hrE+IBVKwn4FDhH6E3aW33CMB8GA1Ud
-IwQYMBaAFCer9hrE+IBVKwn4FDhH6E3aW33CMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBACXU4gUJOWe43QXQSApU/JtcTgAgKF6NcOVs/jZ++8KiGWgZ
-46qhDQbnjYSXl4/QsjlIqJliAmWGp89aJIlUs1oXZ7Ro4cIgfSoKTlbXQc+3L2QL
-pa56dTmER/5Z4oamgeP9YPJd2teIMuh42lCD3GBDFE120F7zTSy5N7E0mwPOCWXN
-pFXlNA+vzp+WEEWPO6TV29w1Hz66NFf7PeexEr4DDBg0vnvsEBAdiGA1x1CQbFit
-Iif5onYKtZVZW68sY7wLOim3mCWb/QayOXJIycv0zc5EyziPGy+dIZT2LePsQPU3
-kL3y4I3hH+GeK5iK/w7esz+6VG04gBFYYeamic8=
-					    </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>
-					      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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-fcomte.fr/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">Université de Franche-Comté</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Franche-Comté</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://univ-fcomte.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>bernard.voisin@univ-fcomte.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0d52cbf0..00000000
--- a/swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-lehavre.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université du Havre</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAACeSURBVCjPvdGhaoJhFMbx36ffitrF5BXYBgYtM1tssxgMFtd2F3onK7sAk2VpMwgGMZmGimCyyWsQYexVm/7Tw+Hhz+EcHkpJLx5m/uQf1biQaCkIgqy1raJPT3j2fTZsTC0tzHXUBSkYe4ltewM1AQT9uDBMVmZGGr4Eb+cd/tOU8+HVTsVeOfa0TXDQvX2TX++nkF4p1OXv8oxLHAFqfh/MOjimWwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOSswMjowMHw7c+8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDANZstTAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-lehavre.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université du Havre</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>
-					      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>
-    </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-POST" Location="https://idp.univ-lehavre.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lehavre.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lehavre.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lehavre.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lehavre.fr/idp/profile/SAML1/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">Université du Havre</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université du Havre</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-lehavre.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>LEMAISTRE Eric</md:SurName>
-    <md:EmailAddress>eric.lemaistre@univ-lehavre.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>COIRRE Mickaël</md:SurName>
-    <md:EmailAddress>mickael.coirre@univ-lehavre.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6f448a9e..00000000
--- a/swamid-interfederations-2.0/idp.univ-lille3.fr-idp.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" entityID="https://idp.univ-lille3.fr/idp">
-  <md: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>
-  </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 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="en">Université de Lille 3</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABwElEQVQ4y6WSP2tTYRTGf+fcN6bcFCXVEKONCsXKdelQnURcdKiTozhJhw4O0sVFBEFw1sUP4OJkUURwaL9Ah071Hw5iab0SsKmFtGlyk/c49JprQ5BKz/AO7znPc57nnCMmTwB5+InarQDtso/o4oOI8hxm9136V/lGfbxXYZZVS+/ZExHlE2C4/oQIaJhHVDAzfLONeRtIgrqMQAAzwxULnH92k3CsxE68ycc7L2jFmwPxqOH6M5oLODxRZTiq0Fyto/kcYMgghq6hYBwk9EB48+hAb/+lYL/NzDDz7LUsaLpz/w8ohpGvHKF4ZRw55LI7UUMRBVjPbBk+6f7BEhTynLl7lYsLs4w9uI64v8Zm2rOw5NA2AsnGFp/vzfHj5RLt9QZDo0WqM5dpfIj5+vgdvpkgkg1OTJ4CHKuz/XqRlUtgYIYO5QjPlknqW+RGCmx/qeFbCalipoieA7dTBfZzhPBRieFYEEQUv9OhsbxGK/5FY3kN3+ogov3jQcVmSa9x/gLV6UlGFwO0I7JLJAiI4iTonKP0foro1VHCWrqOzMyuFQPkJHADuLbKxmkDTlFcARaAt+C/g04Cx4E3vwFlCJ7zAdaaQwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-lille3.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Lille 3</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>
-					      MIIDMzCCAhugAwIBAgIUaI3sGoGDqxSkkKP8neZP2ayfQGswDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUzLmZyMB4XDTEwMDEyNzA5NDI0
-MloXDTMwMDEyNzA5NDI0MlowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhK0OBRmXzCdohEH0oLX6
-BwU47DqR8Ui+LPhE+2AxFY5pXC7rbF94YYoL5WJ2oJdVUjLhsiZZT43YbxvkNfqZ
-u7PK5s5TbvPxpx5khG5ezh0zwu6HmIPL9/TktRTMRZsnUO4BN0wA7YYbjWAwz0FB
-/uA1sbzBquo0+0LP0UXFa2Qr8HLH1qn8B80furUiWAqmPJ/PR4HlqG5p02DD6xl6
-mBsKZ+LCOAlpQg+Mpj8XwTEoSKIJQWECzrWvJ27N537n/4jci1h6Q6d4XPGrxE/R
-S/OYFQb9DSITJQ3XiQxG7FEmoR46eYvabngonp+LtlOsg44eOU4jCZ9xUl6NCe1d
-lQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1saWxsZTMuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtbGlsbGUzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS/
-SXbo4Ptin4k8pT8SxemNo3o5CzANBgkqhkiG9w0BAQUFAAOCAQEAB0/3gtFmXex0
-Slx5kV0oJBz0y1RFN+uRTic8C2uJodV7Jo72scJu7H2ZgTdnt6QqMUyM0plh1njw
-J/+YsNpGt53iZ/8N7uf6gxqr58a76Zxln26V/VjVPsGzcDztp9FpNuoMfTwv0c66
-/dpOhb9GefyQEi+X7aAKBPtYmR8B/fE9cdpTaOg6CZA48RKb58CvT/zDI3cdjq70
-Ga4ev2RgDwKOZdcApBozTd1OteRkamdHqjsGGUMOjpa5nDbKBHnuLsszJgxhIIxM
-Zo56PsDM63rAF3vZF0uNsoql0sThageHMHnHIFoAUSpONzzEsQ991uG/bjioCY3T
-TVs+0tBLJA==
-					    </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-POST" Location="https://idp.univ-lille3.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lille3.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille3.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUaI3sGoGDqxSkkKP8neZP2ayfQGswDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUzLmZyMB4XDTEwMDEyNzA5NDI0
-MloXDTMwMDEyNzA5NDI0MlowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhK0OBRmXzCdohEH0oLX6
-BwU47DqR8Ui+LPhE+2AxFY5pXC7rbF94YYoL5WJ2oJdVUjLhsiZZT43YbxvkNfqZ
-u7PK5s5TbvPxpx5khG5ezh0zwu6HmIPL9/TktRTMRZsnUO4BN0wA7YYbjWAwz0FB
-/uA1sbzBquo0+0LP0UXFa2Qr8HLH1qn8B80furUiWAqmPJ/PR4HlqG5p02DD6xl6
-mBsKZ+LCOAlpQg+Mpj8XwTEoSKIJQWECzrWvJ27N537n/4jci1h6Q6d4XPGrxE/R
-S/OYFQb9DSITJQ3XiQxG7FEmoR46eYvabngonp+LtlOsg44eOU4jCZ9xUl6NCe1d
-lQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1saWxsZTMuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtbGlsbGUzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBS/
-SXbo4Ptin4k8pT8SxemNo3o5CzANBgkqhkiG9w0BAQUFAAOCAQEAB0/3gtFmXex0
-Slx5kV0oJBz0y1RFN+uRTic8C2uJodV7Jo72scJu7H2ZgTdnt6QqMUyM0plh1njw
-J/+YsNpGt53iZ/8N7uf6gxqr58a76Zxln26V/VjVPsGzcDztp9FpNuoMfTwv0c66
-/dpOhb9GefyQEi+X7aAKBPtYmR8B/fE9cdpTaOg6CZA48RKb58CvT/zDI3cdjq70
-Ga4ev2RgDwKOZdcApBozTd1OteRkamdHqjsGGUMOjpa5nDbKBHnuLsszJgxhIIxM
-Zo56PsDM63rAF3vZF0uNsoql0sThageHMHnHIFoAUSpONzzEsQ991uG/bjioCY3T
-TVs+0tBLJA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lille3.fr/idp/profile/SAML1/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">Université de Lille 3</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Lille 3</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-lille3.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi.shibboleth@univ-lille3.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 080fdf24..00000000
--- a/swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.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" entityID="https://idp.univ-lorraine.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Lorraine</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACaUlEQVQ4y5VTS09TURD+zrl90EJsS++9UNryMIEYQ1JJqIlbdUH0BxgTw4qFO1cu1AUbjTt2JuqOhy/QkCjR4MIaFurCsCImGiDSphAwYHn0cVvu+VxcWiuBhV8yOcnMmW9mznwHOIRkInmmI9Y12d3VU9SDOsMBnb2nelW8reNlf6K/D8chxRRikfY3RsikHjAYDujUgwb1oMHmE2HqAYNGyGQsEp+Z5GQtTwAAmUKbee27ZZV6lFIQENBcGgBAKceEADTHBbfHvbi2nu2GEA5BrDU+UygULmtSgyYlIASssgUhNEgJuIRTyqr8JfH5GmYza5kB9CcSZ42gSQAcHxtnFQAINHP0QYTcj1FtxgjoDAecsYyQyWRf8pzMbeeHFRUAwLbtg7ZVbUbbBrBPVGwCDqtzksiurt6UJM5XLxPH4IgASXi93gGZy+UahBD4XwghsLO945P1ydJ5U7CuZDVM1q2tjkS2tJql6sybv7cAAJrUAHgAbGFnzwYE4G100je3ActyRmgOh/dkoVCcEkLArzVh+tV0jT2TWcbH1BzGJzYAFwEFpBc8+DTrRu9piXIZyO/uTmHo6lCLETKpBw0C4PNnL1iPkZFHnHgI0o6SpSjJGC9daGGjx+Tg4GBUm1+Yz+thw6yUK0m/rxFjT0ax+GMJShHplTR+bWRx/cZ7LH3zgxawvkK8fqeQL/oef/4y97TWcjwSf1vVvoD7QEiOOT6DgE5Apx5qn/3nL1TRGe+8m98r3KaiwOHNEpCaoL+p6f7P9PKdIwmcdX3Fyc4rt/bL5YvFYil6oPusy+X5sJxevHdYM38As6AfdxYzj+0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDDYSyyhAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAwqRaUHQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-lorraine.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Lorraine</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>
-					      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>
-    </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-POST" Location="https://idp.univ-lorraine.fr/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lorraine.fr/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lorraine.fr/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lorraine.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lorraine.fr:8443/profile/SAML1/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">Université de Lorraine</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Lorraine</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-lorraine.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>shibboleth-contact@univ-lorraine.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 05de4f5b..00000000
--- a/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-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://idp.univ-lyon2.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Lyon 2 - Lumière</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA70lEQVQ4y2NkYGBg+Pnz538GMgA7OzsjI7maYYCJEs1wA158PcSw4DI7VgWPPm1mWHNTjWHBZXaGBZfZGXbcc2V49+Mi8S5gY+ZnMJPsZYjSesUQonGb4dffjwynnpXA5VkIGSDBbYdimBy/H8OFl83kh8GXXw8ZhDj0iXcBMnjx9RDDnfeLGJzk15Dugnc/LjLsexjKoCIYxyDH50uaAe9+XGTYcc+NQY7Pj8FGZjaKHEED8GnGCIMd91xRJD2UdsOjjIdVDiX0VYTiGXhY5SAG8LApMBiI12J1gYpgHMOX3w9xunDg8wIjAwNl2RkAfglTUwuNT8YAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDDYSyyhAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAwqRaUHQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-lyon2.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Lyon 2 - Lumière</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>
-					      MIIDfzCCAmegAwIBAgIUEMeIVUaZhvRDqDGddKXxpUkeNa0wDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVaWRwLWx5Mi51bml2LWx5b24yLmZyMB4XDTE1MDkxNjEz
-MjE0N1oXDTM1MDkxNjEzMjE0N1owIDEeMBwGA1UEAxMVaWRwLWx5Mi51bml2LWx5
-b24yLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArsK+D1//XUqq
-snuVjgQS4YH675eaMxeZrJIMm401xs/R5eKKVR7o6i9hNHAKPcYOoYN4oBJlT5ey
-LeNqPY2eY/VgwrM+kHsoRUGHrs6nVZCfQmJwjuxIa9x+Pkz/hP8uirZIHErRVTVc
-wmFh0txqOuaUPeP8deo3QU5Ef3DaNPDVKAtxpNJ8KnBDo+3FfKZtgy34acTK0gV4
-gjkPVyLKSFDTS/qX3tqw85Gq8P5E5RtkZxgNH6gzomULzQNgq5X069Z9ylHT9NcD
-Bx/bdfKReRYUPCVcmeMLYaH9v4oThGp/4xx+SjVC9orWIt7gCp78WeYWFEtFHvgJ
-i4XrqkM2RwIDAQABo4GwMIGtMIGLBgNVHREEgYMwgYCCFWlkcC1seTIudW5pdi1s
-eW9uMi5mcoIRaWRwLnVuaXYtbHlvbjIuZnKCEmlkcDEudW5pdi1seW9uMi5mcoIS
-aWRwMi51bml2LWx5b24yLmZyhixodHRwczovL2lkcC1seTIudW5pdi1seW9uMi5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUR8350noOu1DupabV/mWW6otQBmsw
-DQYJKoZIhvcNAQEFBQADggEBAEZlQ6vhYC0mrYGtWdF6nsjkW7lNQIqLOP37VPrl
-UJKbkNjJpaq7KmUGFrO7Bsvz5Gahdqx63YfxJYX8xy3717cOyVyv+8pulFARdG47
-sIKBKF9mVywrqhWgCZBuD2rdXfrkHdAdF1INv5pB6HWWnsbYkjEezyNUyY2+k5lg
-+aMB5M9u1F9R2l3pAh24DejNBxYg68daERxiAb1ij5pT2KGE66RTiY4AcQRhuLkf
-Xs49dq8zUWOi07M/Fc+NvtTGH4kkGfjmP0s4MXMRqQq5I045YsD6u2pHYDXPq8gC
-gV4nyX84VcokhCvuxaG6tdMYaciJdHsnrbBoprT3cHjJNgk=
-					    </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>
-					      MIIDMzCCAhugAwIBAgIUBpfnmhLCkTwSlxzmAuiYTFCGCo4wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwMS51bml2LWx5b24yLmZyMB4XDTEyMDkxODA3NDIy
-OVoXDTMyMDkxODA3NDIyOVowHTEbMBkGA1UEAxMSaWRwMS51bml2LWx5b24yLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmgbC3Sv9JHXp6oEVeFF6
-gkUgJlmY9wiqJFOHhupE4KkON5wRCfdclIY6nkX32DedUNYYI2KrHzIwPqo0c8cr
-Tc+kjdBATVMH+vddBcqqM3HZt3/DqxDcvMfGng0P8MS5+GQbiE5ckFf7bdYpa+Go
-1tyu3jLM9b0iz6b28Ud0Tv/sqk7EiHmJBCwRdlFR7ZXeIHdRk1HsUeJ9yU92g2x0
-DybXec4Qp4/7R4Viprckjt5Dfu2Ty3J4JWhYx0h1lfRC0m91kujzVYSCxPqMQeuN
-Vz4CnBa9lks9NCLmi2KE8I7USRD0OjWn27ODE1u068rMVWOzdWsB8cUnVOC31TX/
-1QIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAxLnVuaXYtbHlvbjIuZnKGKWh0dHBz
-Oi8vaWRwMS51bml2LWx5b24yLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQZ
-zmfPgsRblkHBPIH6NAT0Kspo6jANBgkqhkiG9w0BAQUFAAOCAQEAkxejAtB1LWTx
-TRMAgO2esGj3rIjYvpr0fGCC2PY5HOx7Gj0OEqaBn5OFx1VnyQ3YuJdPfI3dYoe/
-FeZtaE6yw8RR3OwdWYYayQ31sOxXydRV4UEImZARqunPEMYlsp+fqwPK7+AVFc4i
-KvPjw588YvBYRTHafz6zXLZ3nEPHr8dCqAyZfhGavm82RTZg7am4D1So8t9M+tDk
-ULjeWoNajiut41GjeVsS637G/DwDBxES4VRpbzQORblOKFqd0JM12osIi569QRkq
-v/ETWbTTTBP29pqVXRoqx9uG1JUODCguG3ugS8oqoXtSpPArLwKfW658Iw0dfAc4
-j/QOF0eZVg==
-					    </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-POST" Location="https://idp.univ-lyon2.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon2.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Lyon 2 - Lumière</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Lyon 2 - Lumière</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-lyon2.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Nicolas Berne</md:SurName>
-    <md:EmailAddress>Nicolas.Berne@univ-lyon2.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Daniel Dao-Castellana</md:SurName>
-    <md:EmailAddress>daniel.dao-castellana@univ-lyon2.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d925f2c5..00000000
--- a/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.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://idp.univ-lyon3.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Lyon 3 - Jean Moulin</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABKUlEQVQ4y+2SvUoDYRREZ3aDoKCbuIVYmA2bzQMIlhaWPoTYiqKNCMHK2tLGFJY2NgpG8hKSJzDJmk8liRYuCViYn2+sIiGthSCeboq5XA4D/PNjOJ0L+eDUWnQBfZLOQOzfNBqt5yjMFQFxMMKVMaY5LriT7TAMPQe6BkGSEck9yF31F7x7Odh1yB2HWEtn5qtJ0nsDAGfygMvREcgZSbcW9tjKlkhsyEUFRMlanZFcd+hWCtls+P1BPgg2fT99QnJfUjXV+zistzrNJOlWFjPeK8ktWdQaj6boZzxDclsO5t6T7h0BIApzjyRyksoW/YM4bj9NeonCoElgWItNAYCNwuABwGw9NispAJB0KeplOGLZmHZnSqwAngt2aSyd1IWE5d9ewJ/hC8sKeQc2gDq1AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAw2EssoQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMKkWlB0AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-lyon3.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Lyon 3 - Jean Moulin</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>
-					      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>
-    </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-POST" Location="https://idp.univ-lyon3.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon3.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Lyon 3 - Jean Moulin</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Lyon 3 - Jean Moulin</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-lyon3.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>contact-shibboleth@univ-lyon3.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 bb279e64..00000000
--- a/swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.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://idp.univ-orleans.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université d'Orléans</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABIElEQVQ4y+WSvUoDQRRGz8xONpEl6CNoJeQl1lTpFBESRJFNZeErWEnQJ7CxCNNYJFWsLRILC1/ATgjYWgTyI5vdvWOxikZE7ET86u8cPrgX/nzUj1o2bILeoGwOGM8fQN+CrBDdbH0vsBt7QIuit0rmIBXwNXgantMhuBP1oXxENDh/hc5QboZv1kkExOVgQcMsa4OUcBiglAtstU7ZdJjM7/FNhURyqTjQCpY8mGYNon7380iNrdYJvA7jBJSuEGc5KA6KHogbMkm2ifpdbNjEhleLAuSUWMDoHHpLYCCWBtFgDcUuvZojKLQp+5vY8OldoLgjlUdSd4HR+eTALE5WLDOK95lmh+xcKxytr8/YqzlG8RA4Jhpc/s5n/cO8AOugaYEtH1CQAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAwKzAyOjAw6aM2PAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMCswMjowMJj+joAAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-orleans.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université d'Orléans</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>
-					      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>
-    </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-POST" Location="https://idp.univ-orleans.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-orleans.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-orleans.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université d'Orléans</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université d'Orléans</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-orleans.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>equipe.reseau@univ-orleans.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 56765d91..00000000
--- a/swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.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://idp.univ-paris3.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABfUlEQVQoz2P8//8/AymA6fH9uyRpYJbhY3t8/66MgjIHJycxGhh7a0sgLEMLG0tHN2Rtf18e+Pflwf+vD/6+PMDAwPD/ywNmcQcWuPT5E0euXTjj6myowHnp78sD/14eRDeclZ/NZAJUw7+Pt/99uvPr0511p38qSTK4mDCws6GrZzOZwMgmwOyl9ePngy3/Plz9/+M1w/+/DAwM778w3HrCIC3KwM2BFDji9uwmExgYGJiXZj7/8/fvy3cohv36zXDlPgMfF4OoANQxHE47GNkEGBgYGL8sZmBgYHj9gWHPGYY3H5FCg1uWiVtWS0/DIySWgVWAWcgAKg7RAAFH7shffCLMxKfKxCMLF9QyMPEICkcYBNHAohTPopzALO5w5/qVnetX/vzxA9mFohJSoYkZkBBn/HmxnlWjAOI+CHj1/Omm5Qs/fXiPVQ8j1rT04/v31fNnvH7xDC4io6CkbWiibWjKiCvx/fj+HaJBVEIKOfoZSU6tJKlmYGAAAJBvj53VXvxUAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-paris3.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.univ-paris3.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris3.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Paris 3 - Sorbonne Nouvelle</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Paris 3 - Sorbonne Nouvelle</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-paris3.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@univ-paris3.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 515fa001..00000000
--- a/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-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://idp.univ-paris4.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Paris IV - Sorbonne</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACF0lEQVQoz3WSTWtTURCGZ+ac3CbN9y3RoFBBW6ViUVRw60YXoquCv8G14Fb/gPhP6kqhoiBWUYRqFWsrWFODaWzaeJs0H/fm3HNmXAQlCnlXs3gemBdeFBH4kwE7LYgQMZANa8nkcUdOQGvCvwzBSDwGsi4ihfvVxM7KQBmKE0LxKPOPECtjPTtpouDrg16wrgRFWxQaKySsipw2tUeZ7KwunoBwJybSIz//L/RA0geNTusTxFZi45bvwI+HEcNYIUUYZ0q51DT652HvNZy6poqXGNz4DnG7vXGP/XkONniyLFYfBI9VPxgr0Pv7aWsTzYqF/UR+Dnde5ro6Xr07ymhmBgBEFBGXP0oucClSXp9dnXQ97m9C54u1hoiGjEbE4YWI1c+vnj7T08fW+jQrXnuiy41ucOXs1IzSIiICiITMPKRFJPz2hM2L73Cb+r0wlS1BvZRas+9upRdaShEzAyANp9HpdIwx4c+3STzs5126nMvE3TgkLE2FmXPGmGYzQCQA0CKWWT6ubHueMtXow1L94uW9SnVw9fr8m+er27WtQnZhfbmSyWOxUBQcYHO355zbbbSSSa/X+lUolPeCwPdLjXbtiH/IhhUeRNnyhYNOK5fLTyQVOucAECBkwcXFatBszJ/xCTxKJLc2t0/PzWxt1m/cPImgABQAITvLjkBFhBMgVsABawAHpEScoAIhTSggwigivwG84y1HTZzIHgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMB3sEi8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDQrMDI6MDBssaqTAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.paris-sorbonne.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Paris IV - Sorbonne</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>
-					      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>
-    </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-POST" Location="https://idp.univ-paris4.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris4.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris4.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-paris4.fr/idp/profile/SAML1/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">Université de Paris IV - Sorbonne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Paris IV - Sorbonne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.paris-sorbonne.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>MARIR Brahim</md:SurName>
-    <md:EmailAddress>brahim.marir@paris-sorbonne.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 3500a01f..00000000
--- a/swamid-interfederations-2.0/idp.univ-paris8.fr-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.univ-paris8.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Paris 8 - Vincennes</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACXklEQVQ4y6VTTWgTYRB9822yu0mM+kmo4MGfVtJsJYgb0VYrrQcVETwIHjyUomAFUQ/iQRCvepPipRcFD95EQcQf6MFSREFsFQNNa1p6qVAqTbRtsrvZ7DcemoSWVi99x2HmzbzHG2CDoEQiccf3/R6l1EI0Gv06Ozt7hYgaDWzZAKirGFTPaURqs9BeAjxEuVEAgAiCYHupVGrVNG26UCj0GYbBmUymuz7ss5rM++6Qq1TfYjW4mvfd9wo8sUwMkJTyoeM4F13XjTMzpJQffi/86eCDRzUslr87rLZGSNtJuZHaRRmUOJiJCfETig6LuhQAICIUi8VOGAaj7NzKV7x0BFpnfRgAKDeCGLSOfMU7BMEQa0whAjSRm3CcTAAGiJvXOsdWwAwACK3n7BYtrKemxircZj/74bmDbNntINQ0oHui4r5J6eZTKGoQNGxnZsTj8SQE+sFiIKmb37Ke82WTEGUGqKRUpEU3pgH00PhIg4CZGclk8piU8vWSUjN8oGMAZe9J1nP2p83IOzA+QSGKMHaNec75NiMyyfsye0MAAgAxKaUHQA+Hw8MonuiCNXVp3Hd700bkLI2NvlopkS37wrTvlfaEjeeQUvabpslNTU03uWYMAHzc3fqCLXv4XwnkNvtGttlSoqbfnZube7Aqgcv18n9S7DBAq3KwEkeisc/jFfcUW3bLmu2pDApB9V7aMAdDAAQAbZ03uZ/SzdNZz5lky34M8FsQlcA4PlP1rikg2KaFTlIikbjLzGfm5+fb19sEwbeXAnX9V1DdAQCKGS268QjA5fpDbQh/Af+zC6c7Nz0LAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-paris8.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Paris 8 - Vincennes</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>
-					      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>
-    </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-POST" Location="https://idp.univ-paris8.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris8.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris8.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Paris 8 - Vincennes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Paris 8 - Vincennes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-paris8.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>reseau@univ-paris8.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-psl.fr-idp-saml2-metadata.xml b/swamid-interfederations-2.0/idp.univ-psl.fr-idp-saml2-metadata.xml
deleted file mode 100644
index c4e23a3c..00000000
--- a/swamid-interfederations-2.0/idp.univ-psl.fr-idp-saml2-metadata.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://idp.univ-psl.fr/idp/saml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-03-19T10:06:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</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">univ-psl.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PSL Research University</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQAAAAA3iMLMAAAAAmJLR0QAAd2KE6QAAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAAAOSURBVAjXY/j/n4EUBAD9Th/hc4umrAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMLubGZsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDUrMDI6MDDKxqEnAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-psl.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">The populations covered are students, teachers and staff of the universities</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Recherche Paris Sciences &amp; Lettres</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Les populations couvertes sont les étudiants, les enseignants et les personnels de l'universités</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>
-					      MIIC+TCCAeGgAwIBAgIJANcuXKnq7Ew5MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-BAMMCHdob2NhcmVzMB4XDTE1MDMxMTE2NDAxMFoXDTI1MDMwODE2NDAxMFowEzER
-MA8GA1UEAwwId2hvY2FyZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDQ7HX5jtzHtkKu0RUvTlnxG04v8dfmnkMr0PVb6bFZpBSxG+E5ORXqMKQ9qXiq
-o+W5XYkZ8M2Njn7ndHqovFoEfFjTqTi0hL2LXmYOPJbWIw6Xhs6GLUZ2USnoHPbg
-IHiMFKqHFEi7EejOzlmskDwCOc6gcsiL9UqShi/QsZO8JQtc/G6ZkEuQ8eFlZZ4M
-n8Oxi5P8ivDPv1U9kq4dMfYRNEnQoZWPwsrRxpVYCyvBo4V3sfhTb1tA41Wycqs4
-O8nTH/pZkFxXLBPrKmzFHxN/y9vik7OAMczGQs1m0+j7e9084Xh6tLPvJMrOhVAO
-Mtoc333WbfR9Rceaq5fXC1UXAgMBAAGjUDBOMB0GA1UdDgQWBBRLEg3XwdkF74fg
-pGhKRxpShFKrjTAfBgNVHSMEGDAWgBRLEg3XwdkF74fgpGhKRxpShFKrjTAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB//rAaAaEoP0tlnuXyiV3nDvXo
-/D4eaLS84BPm9kmdicjVg2+BniDd2P05ecY8OJpd4usXmbaeVH/gHBZ+9QmA9p3F
-O02qh3wA/FykOaZ8wWG4x9bTiFn2gR2+tet5DxWECWtVim4KJXTPP76k0S1anf9v
-TR+9MZ+wgSmw6FzzmLb/rLPqGDTjJty/3j4A3/dpoYoDsthfzPHF0IVSWZ6AOXq7
-4NVa4plDX3kopSpDWpn0AR9JL6d76t1TZqXPACtoO3JOLvWujgNmZxmOwBdFcMe6
-m4NQPTEkvbbry7PxzsLnEPJZu80pEM8viNvuNNKAnyJZLIH17t8JkEW5Nr/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-POST" Location="https://idp.univ-psl.fr/idp/saml2/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-psl.fr/idp/saml2/sso"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Recherche Paris Sciences &amp; Lettres</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Recherche Paris Sciences &amp; Lettres</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-psl.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>support.informatique@univ-psl.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 cb348b65..00000000
--- a/swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.univ-tours.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Tours</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACGElEQVQoz5VRzWpTYRCd7+f+myaNbWpNMYIRC0WzEFxYXXThwr6A4FbfwRfwFXTThWuXii4EF1IXgkUsUqVQpdbYtClpcnPTfPfe729cRANiNp7V4cycOcwMQUT4H9B/JSH1/SfvMmUmGviYxUI+er291Yy7uXr/o3d+9ku1FF6tlZeqRUbpBMOH78cvN/cbtfLy4tztK9XVy2dPMv1qq9VOsltL8+M2Mt4hVSaTOvKctfWdlcUz9Uqhn6oXm00LcO9mfYJhhI3dzt3Hbxu1sufz437WODf9YHWpHHmTDRZxbf2rw+nyhdmfPbHXGd65Vos8DgCISAiBEUNEazEW+bOPzYfPPyltRmJnkL3ZPmzFQki9c5hYaxHxd0KubSsWLqPzpYCOJv3JPOhn/VQulMKpwAEAkqSSEpJp43OWa4uIocu7Ii8GTizUlO9YRAQQUruMtpOMfzsapNIoa7sn8nTBA0QEst8dXr9Yebqxd6M+k2tLgWhj54rB51bMq9NhO0nni0E7ySLPCV02zHXR56HLVi5VFspRPMxDlxNCTvk8M4YLaXpCSY3S2FzbowEC4kzBdznLtd3viSRTBd+pFPzdzhAt8OnQBUAEQAQhTchI4DCHUc5IZcpnlIQu913GKClHLgBwRBwKMzoMAYw853CQ5soog9pitRQc9FNlLAIAQuQxYi3av5+tjJXGokUgwBl1GR3XCYFfkCk3eQ/1whgAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDDaTHhbAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA4KzAyOjAwqxHA5wAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-tours.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Tours</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>
-					      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>
-    </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-POST" Location="https://idp.univ-tours.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-tours.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-tours.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tours.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-tours.fr/idp/profile/SAML1/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">Université de Tours</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Tours</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-tours.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Patrice Garnier</md:SurName>
-    <md:EmailAddress>patrice.garnier@univ-tours.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml
deleted file mode 100644
index cfd37311..00000000
--- a/swamid-interfederations-2.0/idp.unive.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unive.it/idp/shibboleth">
-  <md: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>
-  </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">unive.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ca' Foscari University of Venice</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università Ca Foscari di Venezia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Ca' Foscari University of Venice users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Università Ca Foscari di Venezia</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://www.unive.it/nqcontent.cfm?a_id=77958</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.unive.it/nqcontent.cfm?a_id=10497</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://www.unive.it/nqcontent.cfm?a_id=77958</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUYUFQBvFR3QHBbGwgFllRXJ3//CowDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXZlLml0MB4XDTEwMDcwNTA4MzU0NloXDTMw
-MDcwNTA4MzU0NlowFzEVMBMGA1UEAxMMaWRwLnVuaXZlLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj58HXAaf1REMuIBm1+jfWiePJsBOs7IirZpI
-PSy98vHRKgDYiFEogp8+b5kF3tfF64dp+Fml5wXJEXsSwuN6wX0H6+1JHmvm80qp
-VyNhkwa/4baLuw4lmvxhs7+0kK+OXEAl0MJUUt01fS5zwZWEH+UxZocYeEU3H7Bb
-nvop27mdMybeWAkrdDfkMYEKXEkMLXmsKZpVwg5MvHV7PxzXRUvSAEHb9D3+lWDV
-hjClbSk6D820qVHJ9ub6myh3tU9npPu0xVVCi8j7+L78GsvB8if4wFmHD/gUK8Pg
-E2O59pjOqkct1Cc2EdrEBCYhaDsGFIEjAqVcUgVoJ7mtTROCzQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAudW5pdmUuaXSGI2h0dHBzOi8vaWRwLnVuaXZlLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSoLXPmrgrjGbVeAfR/XskwyDlmfzANBgkq
-hkiG9w0BAQUFAAOCAQEACGZHx1OQPjJWmafRP9kV4Z85ewvQdvPkD7rZTZLn+J4k
-PDVO28Mef7TL2AOfN9VUWurQPqCPU7+IUcR42vKH7eQPIEshwyYft5uD3CMrPNHi
-nJet2s+yXFCBS3jR+HbYpveq5uS3cRcgNCiIawe9dFfUfGALZ4wZ54xu2W0J6jPa
-dHRyg+dniGnc4A611sNQAQfQjMH8mG2ddSR3QUy+pHOgKc+bBYlxXARDWG3sRdfW
-kLS5sOnteGUA6cE6QlqrPoLXBzpWMNX/deaHjVGA55ohGiB26Nq8UnXLT60U/Eng
-L7SbcgeJ5rjT1w9MYHAeq0GHQFVsubgSvnzLJhF9HQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unive.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unive.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unive.it/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://idp.unive.it/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unive.it/idp/profile/SAML2/POST/SLO" ResponseLocation="https://idp.unive.it/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unive.it: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.unive.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unive.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unive.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unive.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unive.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUYUFQBvFR3QHBbGwgFllRXJ3//CowDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXZlLml0MB4XDTEwMDcwNTA4MzU0NloXDTMw
-MDcwNTA4MzU0NlowFzEVMBMGA1UEAxMMaWRwLnVuaXZlLml0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj58HXAaf1REMuIBm1+jfWiePJsBOs7IirZpI
-PSy98vHRKgDYiFEogp8+b5kF3tfF64dp+Fml5wXJEXsSwuN6wX0H6+1JHmvm80qp
-VyNhkwa/4baLuw4lmvxhs7+0kK+OXEAl0MJUUt01fS5zwZWEH+UxZocYeEU3H7Bb
-nvop27mdMybeWAkrdDfkMYEKXEkMLXmsKZpVwg5MvHV7PxzXRUvSAEHb9D3+lWDV
-hjClbSk6D820qVHJ9ub6myh3tU9npPu0xVVCi8j7+L78GsvB8if4wFmHD/gUK8Pg
-E2O59pjOqkct1Cc2EdrEBCYhaDsGFIEjAqVcUgVoJ7mtTROCzQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAudW5pdmUuaXSGI2h0dHBzOi8vaWRwLnVuaXZlLml0L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSoLXPmrgrjGbVeAfR/XskwyDlmfzANBgkq
-hkiG9w0BAQUFAAOCAQEACGZHx1OQPjJWmafRP9kV4Z85ewvQdvPkD7rZTZLn+J4k
-PDVO28Mef7TL2AOfN9VUWurQPqCPU7+IUcR42vKH7eQPIEshwyYft5uD3CMrPNHi
-nJet2s+yXFCBS3jR+HbYpveq5uS3cRcgNCiIawe9dFfUfGALZ4wZ54xu2W0J6jPa
-dHRyg+dniGnc4A611sNQAQfQjMH8mG2ddSR3QUy+pHOgKc+bBYlxXARDWG3sRdfW
-kLS5sOnteGUA6cE6QlqrPoLXBzpWMNX/deaHjVGA55ohGiB26Nq8UnXLT60U/Eng
-L7SbcgeJ5rjT1w9MYHAeq0GHQFVsubgSvnzLJhF9HQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unive.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unive.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università Ca Foscari di Venezia</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Ca' Foscari University of Venice</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università Ca Foscari di Venezia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Ca' Foscari University of Venice</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://unive.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unive.it/nqcontent.cfm?a_id=10497</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>giacomini</md:SurName>
-    <md:EmailAddress>mailto:gigiacom@unive.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9fd7878f..00000000
--- a/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.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://idp.universite-lyon.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Lyon</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABvUlEQVQoz2O4d/xOv2bzg1N3/8PA3YfvS1p2CdnMqGjf+x8DMCBzrtx4GVOwkUFvsmXYkp0H7vzHBqAaTp5/EpixlkFvknPs8oPH7//HDaAaAtLWeCSsPHHuMbLc3sffjVe/+PL7H7Ig4////xkYGH78/MPBzsLAwMDAwPD6578V177knf/M8PEvgzDLFR9RbSFWBhiAaoCAoy9+dp39tOnudwYmxjRNrkwDXgNhNgY0ALdr1e2vDG33GBY9nX/l87c/aC7/iyWUfv39f/DpDxRVH299PTf59VyGT0dq4IIscKtYmRjspNgZGBj+frr98+7O71dy/7xiYGRnYFcOZVdwwe6Hf98ev1su9/cjAyMbA7tyOKd2ApucKwMDM3Y/QMCHbYE/72/5//83qvC/n78/oQQrVvDp+5NXn64/+XDkxecTCkI+Fkq56E5iYGD49+/3o3fHn308/eLzqW+/XrEz84rwGMoIWEvw6/JySGLR8P//32Wn7UV5zGQEbCT4dYW4VdGsxeKkf/9+MTGhx9fvlxeZuESYeaWx+eH/v3/f3vz9+Pj3y9u/Hp//9XDL7xfX/n5kEAzt57UvAAAt9qnhdvXP4QAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.universite-lyon.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Lyon</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>
-					      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>
-    </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-POST" Location="https://idp.universite-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.universite-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.universite-lyon.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Lyon</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Lyon</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.universite-lyon.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>sysadmin@universite-lyon.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml
deleted file mode 100644
index 6c99fa94..00000000
--- a/swamid-interfederations-2.0/idp.univille.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://idp.univille.br/idp/shibboleth">
-  <md: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>
-  </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">univille.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.univille.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.univille.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxNjA0BgNVBAoULVVOSVZJTExF
-IC0gVW5pdmVyc2lkYWRlIGRhIFJlZ2nDo2RlIEpvaW52aWxsZTEUMBIGA1UECxML
-VEktVW5pdmlsbGUxIjAgBgkqhkiG9w0BCQEWE3Bzc2lsdmFAdW5pdmlsbGUuYnIx
-EjAQBgNVBAcTCUpvaW52aWxsZTEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJ
-BgNVBAYTAkJSMSQwIgYDVQQDExtpZHAudW5pdmlsbGUuYnIudW5pdmlsbGUuYnIw
-HhcNMTUxMDE5MTkwNzI3WhcNMTgxMDE4MTkwNzI3WjCB0jE2MDQGA1UEChQtVU5J
-VklMTEUgLSBVbml2ZXJzaWRhZGUgZGEgUmVnacOjZGUgSm9pbnZpbGxlMRQwEgYD
-VQQLEwtUSS1Vbml2aWxsZTEiMCAGCSqGSIb3DQEJARYTcHNzaWx2YUB1bml2aWxs
-ZS5icjESMBAGA1UEBxMJSm9pbnZpbGxlMRcwFQYDVQQIEw5TYW50YSBDYXRhcmlu
-YTELMAkGA1UEBhMCQlIxJDAiBgNVBAMTG2lkcC51bml2aWxsZS5ici51bml2aWxs
-ZS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOBHDxFbBxBna9+g
-XPHHpa7vb+tJQKfisMcCdz0wFQEq0N8izKfYmns8fkrmL2qnDkMSqGsGCPe5pNar
-4+gCfeDMK+S57NvS/z6ccryjN6UpA3yUzm7mNf9K1z9EoBd+aA+wBNGNZKaiaSfo
-yL5w8k7Kny/LbYtybJWDSigS3lrMLmgItFhG1d/CYOiVkn49IrBfdfRI0QfhAZli
-3OE+SjQ5uUUw2HkjCYY1Ju/5euCCD0WaYLT5cZ+iA8I1Cg8ctE+vIRjf3W6zmk48
-8rCr56VX4ZaWWFitME7Y0Zv8N7DfI9znUR6LzWJt7O2AyRjE6i99RTE8bPo93Txk
-e1SiXK8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAhiiZnxvBvcBTS0R7QO1h5ilf
-32hCyZRPjvtqmQpRBG/7Gvex5ONBztABL0yrckkVtalZyntg4w5CdbrkRKC7k8tK
-7/HYVzo49ZQ6FzpAQdLEAhCLA0hY65anEFlifUmClYNtex8gL8dzF8o9yp/Hu0Wm
-K9avfqWDLuk4tC6BxBdgFlIMBv1B4maEGmac3NNGIk6OU1Iboq1TDPA8OkfRFYEf
-qp8r8NBaC+0BzpVtqUu3g8AFM6PJD46g35EzlP8K1hMAqrlsqEZ7IlD2n91XW5J7
-nP4wY1kEldpD1CfHvNSzk1HuF/Q2VHTjUN2sDaQr1y/qhqBEkNiEhDd78YmPVA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univille.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univille.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://idp.univille.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univille.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univille.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univille.br/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">univille.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEGjCCAwICAQAwDQYJKoZIhvcNAQEFBQAwgdIxNjA0BgNVBAoULVVOSVZJTExF
-IC0gVW5pdmVyc2lkYWRlIGRhIFJlZ2nDo2RlIEpvaW52aWxsZTEUMBIGA1UECxML
-VEktVW5pdmlsbGUxIjAgBgkqhkiG9w0BCQEWE3Bzc2lsdmFAdW5pdmlsbGUuYnIx
-EjAQBgNVBAcTCUpvaW52aWxsZTEXMBUGA1UECBMOU2FudGEgQ2F0YXJpbmExCzAJ
-BgNVBAYTAkJSMSQwIgYDVQQDExtpZHAudW5pdmlsbGUuYnIudW5pdmlsbGUuYnIw
-HhcNMTUxMDE5MTkwNzI3WhcNMTgxMDE4MTkwNzI3WjCB0jE2MDQGA1UEChQtVU5J
-VklMTEUgLSBVbml2ZXJzaWRhZGUgZGEgUmVnacOjZGUgSm9pbnZpbGxlMRQwEgYD
-VQQLEwtUSS1Vbml2aWxsZTEiMCAGCSqGSIb3DQEJARYTcHNzaWx2YUB1bml2aWxs
-ZS5icjESMBAGA1UEBxMJSm9pbnZpbGxlMRcwFQYDVQQIEw5TYW50YSBDYXRhcmlu
-YTELMAkGA1UEBhMCQlIxJDAiBgNVBAMTG2lkcC51bml2aWxsZS5ici51bml2aWxs
-ZS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOBHDxFbBxBna9+g
-XPHHpa7vb+tJQKfisMcCdz0wFQEq0N8izKfYmns8fkrmL2qnDkMSqGsGCPe5pNar
-4+gCfeDMK+S57NvS/z6ccryjN6UpA3yUzm7mNf9K1z9EoBd+aA+wBNGNZKaiaSfo
-yL5w8k7Kny/LbYtybJWDSigS3lrMLmgItFhG1d/CYOiVkn49IrBfdfRI0QfhAZli
-3OE+SjQ5uUUw2HkjCYY1Ju/5euCCD0WaYLT5cZ+iA8I1Cg8ctE+vIRjf3W6zmk48
-8rCr56VX4ZaWWFitME7Y0Zv8N7DfI9znUR6LzWJt7O2AyRjE6i99RTE8bPo93Txk
-e1SiXK8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAhiiZnxvBvcBTS0R7QO1h5ilf
-32hCyZRPjvtqmQpRBG/7Gvex5ONBztABL0yrckkVtalZyntg4w5CdbrkRKC7k8tK
-7/HYVzo49ZQ6FzpAQdLEAhCLA0hY65anEFlifUmClYNtex8gL8dzF8o9yp/Hu0Wm
-K9avfqWDLuk4tC6BxBdgFlIMBv1B4maEGmac3NNGIk6OU1Iboq1TDPA8OkfRFYEf
-qp8r8NBaC+0BzpVtqUu3g8AFM6PJD46g35EzlP8K1hMAqrlsqEZ7IlD2n91XW5J7
-nP4wY1kEldpD1CfHvNSzk1HuF/Q2VHTjUN2sDaQr1y/qhqBEkNiEhDd78YmPVA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univille.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univille.br:8443/idp/profile/SAML1/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">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNIVILLE - Universidade da Regiao de Joinville</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univille.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.univille.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Paulo Sergio da Silva</md:SurName>
-    <md:EmailAddress>pssilva@univille.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unmc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unmc.edu-idp-shibboleth.xml
deleted file mode 100644
index 68def3ac..00000000
--- a/swamid-interfederations-2.0/idp.unmc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://idp.unmc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
-      </saml: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>
-      <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://id.incommon.org/category/registered-by-incommon</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">unmc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Nebraska Medical Center</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of Nebraska Medical Center IdP enables standards-based federation for the UNMC community.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.unmc.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unmc.edu/its/privacystatement.htm</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="171" xml:lang="en">https://net.unmc.edu/standards/assets/unmcicon.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>
-MIIDGzCCAgOgAwIBAgIUbN18eVJXDqBOyNPdN7TXDGBcPlQwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnVubWMuZWR1MB4XDTEyMTAwNTE2NDIzOVoXDTMy
-MTAwNTE2NDIzOVowFzEVMBMGA1UEAxMMaWRwLnVubWMuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsEhWme7SDrh3YstHdYhXSi7rrnXyZUV5j3a9
-5qDqetFS6/3V1mLAvQXDtegryo+F7dO2KTj8e3WDued9bDQOLwde8K8oc2CI1d3w
-tL1e//IODz+mrIOVrKvs36/dZxYvGDsZhx37prj30aiH+SkfTJ/Q0wMMX/CS+fw1
-JfK3vhr/1w26gMRxsIyEqUtr5QC13nW09Ykkl6E7Z4Wn6JacNiM4kA4uT8MtAE3+
-mDn7Z3RSvsrh6+KXU/Wpfxwfl6brAVwdp/tW9aGXUxikYcOChfyAltbNChaxTGiZ
-PdJu1gw3cyOGUXXouvhgcVjbC4cpZjfzj+RDsz2xrK+TYhENxwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAudW5tYy5lZHWGI2h0dHBzOi8vaWRwLnVubWMuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpJp3uhInvxqYjNltL7NbVkusJyjANBgkq
-hkiG9w0BAQUFAAOCAQEAbUrXe0hFkFVlADXlupQhW2YjdY5mcVBiVNAUTub+sZpL
-Ew2QXSIcQEW+iGamt95vaC2pjY1VkU+DYnxkrfz2JWcCvzFiMMwPoFljATwyEB6O
-mDLBXNfg09v8WIBhXEaumT5mfdZ5o1MNa3TUtgf2dEEdHmd46Y/JaF3sU0GiTHt5
-FLc13nOcn8B4oa7KsqlIQabF7wn3jLKCmZV22VSSNTU2TfraOnobKf+dU3WdyArT
-qldJfiveQ3S4tzsv9PykD/AUf2DsYKUolzcS/HEPYp0NrIvlIKMRVZMrNoHmJo4B
-fdpZQ2TIsfzV+ci/L9l5y9IOnEqQTn66a9yUVWxNaQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unmc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unmc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unmc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unmc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unmc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unmc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unmc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUbN18eVJXDqBOyNPdN7TXDGBcPlQwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwLnVubWMuZWR1MB4XDTEyMTAwNTE2NDIzOVoXDTMy
-MTAwNTE2NDIzOVowFzEVMBMGA1UEAxMMaWRwLnVubWMuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsEhWme7SDrh3YstHdYhXSi7rrnXyZUV5j3a9
-5qDqetFS6/3V1mLAvQXDtegryo+F7dO2KTj8e3WDued9bDQOLwde8K8oc2CI1d3w
-tL1e//IODz+mrIOVrKvs36/dZxYvGDsZhx37prj30aiH+SkfTJ/Q0wMMX/CS+fw1
-JfK3vhr/1w26gMRxsIyEqUtr5QC13nW09Ykkl6E7Z4Wn6JacNiM4kA4uT8MtAE3+
-mDn7Z3RSvsrh6+KXU/Wpfxwfl6brAVwdp/tW9aGXUxikYcOChfyAltbNChaxTGiZ
-PdJu1gw3cyOGUXXouvhgcVjbC4cpZjfzj+RDsz2xrK+TYhENxwIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAudW5tYy5lZHWGI2h0dHBzOi8vaWRwLnVubWMuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpJp3uhInvxqYjNltL7NbVkusJyjANBgkq
-hkiG9w0BAQUFAAOCAQEAbUrXe0hFkFVlADXlupQhW2YjdY5mcVBiVNAUTub+sZpL
-Ew2QXSIcQEW+iGamt95vaC2pjY1VkU+DYnxkrfz2JWcCvzFiMMwPoFljATwyEB6O
-mDLBXNfg09v8WIBhXEaumT5mfdZ5o1MNa3TUtgf2dEEdHmd46Y/JaF3sU0GiTHt5
-FLc13nOcn8B4oa7KsqlIQabF7wn3jLKCmZV22VSSNTU2TfraOnobKf+dU3WdyArT
-qldJfiveQ3S4tzsv9PykD/AUf2DsYKUolzcS/HEPYp0NrIvlIKMRVZMrNoHmJo4B
-fdpZQ2TIsfzV+ci/L9l5y9IOnEqQTn66a9yUVWxNaQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unmc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Nebraska Medical Center</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Nebraska Medical Center</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unmc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Lee Trant</md:GivenName>
-    <md:EmailAddress>ltrant@unmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Matt Callaway</md:GivenName>
-    <md:EmailAddress>mscallaway@unmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Geoff Gloeb</md:GivenName>
-    <md:EmailAddress>ggloeb@unmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 7d913911..00000000
--- a/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +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://idp.unoesc.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxOTA3BgNVBAoTMFVOT0VTQyAt
-IFVuaXZlcnNpZGFkZSBkbyBPZXN0ZSBkZSBTYW50YSBDYXRhcmluYTENMAsGA1UE
-CxMEQ1RJQzEtMCsGCSqGSIb3DQEJARYeZmVybmFuZG8uY2VjY2F0b0B1bm9lc2Mu
-ZWR1LmJyMREwDwYDVQQHFAhKb2HDp2FiYTEXMBUGA1UECBMOU2FudGEgQ2F0YXJp
-bmExCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhqYmEtYXBsLTE0LnVub2VzYy5lZHUu
-YnIwHhcNMTUwNzIyMjE0ODAzWhcNMTgwNzIxMjE0ODAzWjCB1TE5MDcGA1UEChMw
-VU5PRVNDIC0gVW5pdmVyc2lkYWRlIGRvIE9lc3RlIGRlIFNhbnRhIENhdGFyaW5h
-MQ0wCwYDVQQLEwRDVElDMS0wKwYJKoZIhvcNAQkBFh5mZXJuYW5kby5jZWNjYXRv
-QHVub2VzYy5lZHUuYnIxETAPBgNVBAcUCEpvYcOnYWJhMRcwFQYDVQQIEw5TYW50
-YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxITAfBgNVBAMTGGpiYS1hcGwtMTQudW5v
-ZXNjLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOET6cQJ
-E1Z3RWIovqllyeg+dtN5R8IzBOxaiBqiHpcGGnUK1ae6tHtFWcsFkWE+bX4tWhwu
-QNebt+JNA1kUFyWrq6UrVLXV+7rH8yguLkhmj564cQTunQf66ybzKKJ+fLAKq48q
-BXQ+YGHsynPqyru/LTw9LLweuMX9Cdd56i8oybdK64lUaUOMJMuqwC1XgqCeuW5B
-70UBO4Y2PxSYENTfW6NKYUmut5R83oMTvEhZRYj2Gc/yMMfW41uQpx5yyw062v4X
-dyi4V2ltFIb0BAvDR0JuEjHuJ8C+yva+Gzsjt91lj7RWKI7FAl5DUnMZInyuaiDG
-O4jsyeYXAhYdmOECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAZAkWFZcajV4djOJ5
-SLZrTh2uS0lXPyQvFB5SHlnPqM2PzsCQhy0zEeu9zKg8quZ8m9kKtuZstSx4T/YI
-I82zgITW+fyFcJMT9aRbPCo9XaODY3qNNK3F2TQv4E7wJnreSoMHIk7ExdrcjR9a
-sYL4uwYNKWcNkTmCrHo2Fmbguin5G8/eIz47LNz8rVPG69jdCIJ5Ia4GMwmc87Uj
-5MNzmJm7UI0NfT0qm/pJTpQXJVt3Nqk0Aq5jepAW17mTKcLUGGN3uamUB1VvuCYK
-9GnuDjQAiKaENGURN1wqr343nhVyd5RteY8piQqqZaXbp+pB2HgvgnUpwbKksuFM
-AKS7wA==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.unoesc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unoesc.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unoesc.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unoesc.edu.br/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">unoesc.lan</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEIDCCAwgCAQAwDQYJKoZIhvcNAQEFBQAwgdUxOTA3BgNVBAoTMFVOT0VTQyAt
-IFVuaXZlcnNpZGFkZSBkbyBPZXN0ZSBkZSBTYW50YSBDYXRhcmluYTENMAsGA1UE
-CxMEQ1RJQzEtMCsGCSqGSIb3DQEJARYeZmVybmFuZG8uY2VjY2F0b0B1bm9lc2Mu
-ZWR1LmJyMREwDwYDVQQHFAhKb2HDp2FiYTEXMBUGA1UECBMOU2FudGEgQ2F0YXJp
-bmExCzAJBgNVBAYTAkJSMSEwHwYDVQQDExhqYmEtYXBsLTE0LnVub2VzYy5lZHUu
-YnIwHhcNMTUwNzIyMjE0ODAzWhcNMTgwNzIxMjE0ODAzWjCB1TE5MDcGA1UEChMw
-VU5PRVNDIC0gVW5pdmVyc2lkYWRlIGRvIE9lc3RlIGRlIFNhbnRhIENhdGFyaW5h
-MQ0wCwYDVQQLEwRDVElDMS0wKwYJKoZIhvcNAQkBFh5mZXJuYW5kby5jZWNjYXRv
-QHVub2VzYy5lZHUuYnIxETAPBgNVBAcUCEpvYcOnYWJhMRcwFQYDVQQIEw5TYW50
-YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxITAfBgNVBAMTGGpiYS1hcGwtMTQudW5v
-ZXNjLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOET6cQJ
-E1Z3RWIovqllyeg+dtN5R8IzBOxaiBqiHpcGGnUK1ae6tHtFWcsFkWE+bX4tWhwu
-QNebt+JNA1kUFyWrq6UrVLXV+7rH8yguLkhmj564cQTunQf66ybzKKJ+fLAKq48q
-BXQ+YGHsynPqyru/LTw9LLweuMX9Cdd56i8oybdK64lUaUOMJMuqwC1XgqCeuW5B
-70UBO4Y2PxSYENTfW6NKYUmut5R83oMTvEhZRYj2Gc/yMMfW41uQpx5yyw062v4X
-dyi4V2ltFIb0BAvDR0JuEjHuJ8C+yva+Gzsjt91lj7RWKI7FAl5DUnMZInyuaiDG
-O4jsyeYXAhYdmOECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAZAkWFZcajV4djOJ5
-SLZrTh2uS0lXPyQvFB5SHlnPqM2PzsCQhy0zEeu9zKg8quZ8m9kKtuZstSx4T/YI
-I82zgITW+fyFcJMT9aRbPCo9XaODY3qNNK3F2TQv4E7wJnreSoMHIk7ExdrcjR9a
-sYL4uwYNKWcNkTmCrHo2Fmbguin5G8/eIz47LNz8rVPG69jdCIJ5Ia4GMwmc87Uj
-5MNzmJm7UI0NfT0qm/pJTpQXJVt3Nqk0Aq5jepAW17mTKcLUGGN3uamUB1VvuCYK
-9GnuDjQAiKaENGURN1wqr343nhVyd5RteY8piQqqZaXbp+pB2HgvgnUpwbKksuFM
-AKS7wA==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unoesc.edu.br:443/idp/profile/SAML1/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">Unoesc - Universidade do Oeste de Santa Catarina</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">Unoesc - Universidade do Oeste de Santa Catarina</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNOESC - Universidade do Oeste de Santa Catarina</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNOESC - Universidade do Oeste de Santa Catarina</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unoesc.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unoesc.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Adalberto Freiberger</md:SurName>
-    <md:EmailAddress>ctic.jba@unoesc.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 54e37d41..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uoa.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">uoa.gr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uoa.gr: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.uoa.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uoa.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uoa.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uoa.gr/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">uoa.gr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uoa.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uoa.gr: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="en">National and Kapodistrian University of Athens</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National and Kapodistrian University of Athens</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Εθνικό Καποδιστριακό Πανεπιστήμιο Αθηνών</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uoa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.uoa.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>University of Athens Helpdesk</md:SurName>
-    <md:EmailAddress>helpdesk.idp@noc.uoa.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>University of Athens Helpdesk</md:SurName>
-    <md:EmailAddress>helpdesk.idp@noc.uoa.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uolia.london.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.uolia.london.ac.uk-shibboleth.xml
deleted file mode 100644
index 39fabe96..00000000
--- a/swamid-interfederations-2.0/idp.uolia.london.ac.uk-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://idp.uolia.london.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">londonexternal.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEYTCCA0mgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBgTELMAkGA1UEBhMCR0Ix
-						DzANBgNVBAcTBkxvbmRvbjEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBMb25kb24x
-						ITAfBgNVBAsTGEludGVybmF0aW9uYWwgUHJvZ3JhbW1lczEfMB0GA1UEAxMWaWRw
-						LnVvbGlhLmxvbmRvbi5hYy51azAeFw0xMjAyMTYxNDQ4MDhaFw0yMjAyMTUxNDQ4
-						MDhaMIGBMQswCQYDVQQGEwJHQjEPMA0GA1UEBxMGTG9uZG9uMR0wGwYDVQQKExRV
-						bml2ZXJzaXR5IG9mIExvbmRvbjEhMB8GA1UECxMYSW50ZXJuYXRpb25hbCBQcm9n
-						cmFtbWVzMR8wHQYDVQQDExZpZHAudW9saWEubG9uZG9uLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn5qfRa40+d5zS+HjcdhMRsk2upuvwyZE
-						lycpoQCDzoZDuibi4gqhG4BK2eiHlBJcGjKSnwXatm0PGQcqao4NaE+mq0amh9yp
-						+MdVAgXiZx0VgofBF5oexfd73YAEDUS71uja4n39CfQHBZZldy7afj+ycKntEaw5
-						8J8e+zrIpEXIxssVf5Mn8zdM1N6YmL7OpR3obQ/CacdsL9OVS2zVT4zYdFEuLiTo
-						cz8deEoeA4MoHbS0QbEqcY8J8efkasIGxJ4hlrQr3dvKNIa+VB+I61jxTxyP0SsD
-						q06VhHShAlNVwv7GAeTkMFSO7qnLFTQ4kGhqOZVH1NdUQf2NMfrnYwIDAQABo4Hh
-						MIHeMB0GA1UdDgQWBBQsPgm9wW+1E/XPmWY90pp4oU6cqjCBrgYDVR0jBIGmMIGj
-						gBQsPgm9wW+1E/XPmWY90pp4oU6cqqGBh6SBhDCBgTELMAkGA1UEBhMCR0IxDzAN
-						BgNVBAcTBkxvbmRvbjEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBMb25kb24xITAf
-						BgNVBAsTGEludGVybmF0aW9uYWwgUHJvZ3JhbW1lczEfMB0GA1UEAxMWaWRwLnVv
-						bGlhLmxvbmRvbi5hYy51a4IBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUA
-						A4IBAQBToW390/2NKxG7JN+6aW6BMxSLTZOYtF1GwRA3Sc0I0i2mpYx9rpHOBm0K
-						Dlc1gH9+u1uTS/ZaSDCjXZXW30P4qAWL0cIkcLLbcmxCVlahIPQ2ooM5UPMARy63
-						hIAoYKJKzpKz9gDboaw2kGiDCaWyObwApygAtfchYjQ5FPrMoRADdXf4ePUfCPBY
-						Gk5gc/76YD31gApIdoI0RprtU2rOv85PrkyFLmJzirv7RUuG4b55e7RC9bGBMqU5
-						cvEAR//kD0TVMXReoDar12mz+r9lCgEcnonTTmzrdEUPR/L0fBPgE/a6FAfbM3Wq
-						+KvBFfLg8j/G26W22Ne/6XFgucDY
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uolia.london.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uolia.london.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.uolia.london.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uolia.london.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uolia.london.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uolia.london.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">londonexternal.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEYTCCA0mgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBgTELMAkGA1UEBhMCR0Ix
-						DzANBgNVBAcTBkxvbmRvbjEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBMb25kb24x
-						ITAfBgNVBAsTGEludGVybmF0aW9uYWwgUHJvZ3JhbW1lczEfMB0GA1UEAxMWaWRw
-						LnVvbGlhLmxvbmRvbi5hYy51azAeFw0xMjAyMTYxNDQ4MDhaFw0yMjAyMTUxNDQ4
-						MDhaMIGBMQswCQYDVQQGEwJHQjEPMA0GA1UEBxMGTG9uZG9uMR0wGwYDVQQKExRV
-						bml2ZXJzaXR5IG9mIExvbmRvbjEhMB8GA1UECxMYSW50ZXJuYXRpb25hbCBQcm9n
-						cmFtbWVzMR8wHQYDVQQDExZpZHAudW9saWEubG9uZG9uLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn5qfRa40+d5zS+HjcdhMRsk2upuvwyZE
-						lycpoQCDzoZDuibi4gqhG4BK2eiHlBJcGjKSnwXatm0PGQcqao4NaE+mq0amh9yp
-						+MdVAgXiZx0VgofBF5oexfd73YAEDUS71uja4n39CfQHBZZldy7afj+ycKntEaw5
-						8J8e+zrIpEXIxssVf5Mn8zdM1N6YmL7OpR3obQ/CacdsL9OVS2zVT4zYdFEuLiTo
-						cz8deEoeA4MoHbS0QbEqcY8J8efkasIGxJ4hlrQr3dvKNIa+VB+I61jxTxyP0SsD
-						q06VhHShAlNVwv7GAeTkMFSO7qnLFTQ4kGhqOZVH1NdUQf2NMfrnYwIDAQABo4Hh
-						MIHeMB0GA1UdDgQWBBQsPgm9wW+1E/XPmWY90pp4oU6cqjCBrgYDVR0jBIGmMIGj
-						gBQsPgm9wW+1E/XPmWY90pp4oU6cqqGBh6SBhDCBgTELMAkGA1UEBhMCR0IxDzAN
-						BgNVBAcTBkxvbmRvbjEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBMb25kb24xITAf
-						BgNVBAsTGEludGVybmF0aW9uYWwgUHJvZ3JhbW1lczEfMB0GA1UEAxMWaWRwLnVv
-						bGlhLmxvbmRvbi5hYy51a4IBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUA
-						A4IBAQBToW390/2NKxG7JN+6aW6BMxSLTZOYtF1GwRA3Sc0I0i2mpYx9rpHOBm0K
-						Dlc1gH9+u1uTS/ZaSDCjXZXW30P4qAWL0cIkcLLbcmxCVlahIPQ2ooM5UPMARy63
-						hIAoYKJKzpKz9gDboaw2kGiDCaWyObwApygAtfchYjQ5FPrMoRADdXf4ePUfCPBY
-						Gk5gc/76YD31gApIdoI0RprtU2rOv85PrkyFLmJzirv7RUuG4b55e7RC9bGBMqU5
-						cvEAR//kD0TVMXReoDar12mz+r9lCgEcnonTTmzrdEUPR/L0fBPgE/a6FAfbM3Wq
-						+KvBFfLg8j/G26W22Ne/6XFgucDY
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uolia.london.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uolia.london.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 London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of London: Online Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.londoninternational.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathon</GivenName>
-    <SurName>Thomas</SurName>
-    <EmailAddress>mailto:Jonathon.Thomas@london.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonathon</GivenName>
-    <SurName>Thomas</SurName>
-    <EmailAddress>mailto:Jonathon.Thomas@london.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uom.gr-idp-shibboleth.xml
deleted file mode 100644
index 99a2f94f..00000000
--- a/swamid-interfederations-2.0/idp.uom.gr-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.uom.gr/idp/shibboleth">
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">uom.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEYTCCA0mgAwIBAgIQC/tCFL3CTrbZoTlo1VwxfTANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDYyNTAwMDAwMFoXDTE2MDYyNDIzNTk1OVowODEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudW9tLmdy
-                            MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyH5v2JCiY11y+JirdXYz
-                            dJZkF64CowAV/V4H/bOv8MMsUs+wMZ9pPyhkLy3N/ljwMKLnlv1LFRla7UiSD8ap
-                            5oho76dSb0lbF7vSbygHn+qu7VZ+jkdxJ7AuOROeV8rw1DF7HdR4DcRV3eTTSYh/
-                            U2hrfSONOFg8gGp4BzZABbNRuyURHga5nBzewcwysGHZ51/bkMhjpbELRNct0aOP
-                            uYDSRL/JBfVVdzy5+NvG2Kn0w+aNF0PPbEUfg0DST4penlBWjw1qovZkg3ngYCva
-                            /BnhFiuPat9OkztTwJuJobRs4tVFsIaFVUCGKR0bn6TGjQK7dHo4bkpPepj5DBK4
-                            HQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-                            HQYDVR0OBBYEFBjSV9NjXnP/58dSjdtwTtmSBMZoMA4GA1UdDwEB/wQEAwIFoDAM
-                            BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-                            HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-                            hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-                            BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-                            cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-                            dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudW9tLmdyMA0GCSqGSIb3DQEBBQUA
-                            A4IBAQBOGyswia2sol7gb0lITR9Gzzl3xA7yO5cgDF8epjphTcrJnZeg1k9vINwQ
-                            m2DJTS8rOgINEz5T9NJt5v00HylSmgWV6MuGJ0INdPrzZi5tEfJx4d+UenXTmYey
-                            20ISTUUbW4DDswkWUrV1i7v7fNb2lmdMgXfmeqYdm66OqtmICF+an4gvSxyAxJm/
-                            eLBuMGQtAWZ9iFE/KgXrPuAjNqrF9rBoEEgF4nPiu+dyP3eA9NS54RqRBQsrKTBj
-                            +u6JbdZYW2zUWzUzRyyK1eCgXYNIswNFuTQ7ANWxIf/q8kk8SLv7Vdq/P1i+3PVk
-                            sEP9QjFH5i9IJ+q4yVNeiQgEPT2+
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uom.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uom.gr: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.uom.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uom.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uom.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uom.gr/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">uom.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEYTCCA0mgAwIBAgIQC/tCFL3CTrbZoTlo1VwxfTANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDYyNTAwMDAwMFoXDTE2MDYyNDIzNTk1OVowODEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudW9tLmdy
-                            MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyH5v2JCiY11y+JirdXYz
-                            dJZkF64CowAV/V4H/bOv8MMsUs+wMZ9pPyhkLy3N/ljwMKLnlv1LFRla7UiSD8ap
-                            5oho76dSb0lbF7vSbygHn+qu7VZ+jkdxJ7AuOROeV8rw1DF7HdR4DcRV3eTTSYh/
-                            U2hrfSONOFg8gGp4BzZABbNRuyURHga5nBzewcwysGHZ51/bkMhjpbELRNct0aOP
-                            uYDSRL/JBfVVdzy5+NvG2Kn0w+aNF0PPbEUfg0DST4penlBWjw1qovZkg3ngYCva
-                            /BnhFiuPat9OkztTwJuJobRs4tVFsIaFVUCGKR0bn6TGjQK7dHo4bkpPepj5DBK4
-                            HQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
-                            HQYDVR0OBBYEFBjSV9NjXnP/58dSjdtwTtmSBMZoMA4GA1UdDwEB/wQEAwIFoDAM
-                            BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-                            HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-                            hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
-                            BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
-                            cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
-                            dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudW9tLmdyMA0GCSqGSIb3DQEBBQUA
-                            A4IBAQBOGyswia2sol7gb0lITR9Gzzl3xA7yO5cgDF8epjphTcrJnZeg1k9vINwQ
-                            m2DJTS8rOgINEz5T9NJt5v00HylSmgWV6MuGJ0INdPrzZi5tEfJx4d+UenXTmYey
-                            20ISTUUbW4DDswkWUrV1i7v7fNb2lmdMgXfmeqYdm66OqtmICF+an4gvSxyAxJm/
-                            eLBuMGQtAWZ9iFE/KgXrPuAjNqrF9rBoEEgF4nPiu+dyP3eA9NS54RqRBQsrKTBj
-                            +u6JbdZYW2zUWzUzRyyK1eCgXYNIswNFuTQ7ANWxIf/q8kk8SLv7Vdq/P1i+3PVk
-                            sEP9QjFH5i9IJ+q4yVNeiQgEPT2+
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uom.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uom.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Macedonia</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Μακεδονίας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Macedonia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Μακεδονίας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uom.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.uom.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Aspa</md:GivenName>
-    <md:SurName>Tsakiridou</md:SurName>
-    <md:EmailAddress>aspa@uom.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Macedonia NOC</md:Company>
-    <md:EmailAddress>noc@noc.uom.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uowm.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uowm.gr-idp-shibboleth.xml
deleted file mode 100644
index c480b2a5..00000000
--- a/swamid-interfederations-2.0/idp.uowm.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uowm.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">uowm.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balkan.uowm.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eetf.uowm.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eled.uowm.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icte.uowm.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mech.uowm.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nured.uowm.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Western Macedonia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Δυτικής Μακεδονίας</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.uowm.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.uowm.gr/</mdui:InformationURL>
-        <mdui:Logo height="200" width="195">https://web.uowm.gr/_images/uowm-logo-big.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>noc.uowm.gr</mdui:DomainHint>
-        <mdui:IPHint>83.212.16.0/21</mdui:IPHint>
-        <mdui:IPHint>83.212.24.0/23</mdui:IPHint>
-        <mdui:IPHint>2001:648:2820::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:40.30285563,21.79324174</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>
-                            MIIEYzCCA0ugAwIBAgIQf2UcbnRe+pHMY01RLNKQbDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDUzMTAwMDAwMFoXDTE2MDUzMDIzNTk1OVowOTEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAudW93bS5n
-                            cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRSvHDVDGnD30KLqfBr
-                            9Dd6a/GcKDLqF7HM6lM6tyF9jtYPV++8HtKx4oz8Fcrz2OE/P6Iltz7253Iyr6Qq
-                            1SpBhrUOPfgdIWRynRe70S2HIZfJWcfM/KGZQJwLxppgOHo+MCUNlSClLeWG0wE5
-                            CXGW7rHPljaQmBaCx5ZF06WHPpR2p14P5msqGGrRoba2y99nhico3/8dAxmSNUbW
-                            Jm/dGBr8f0qXNyQsO9KuxIp+PZHAApPvhBxvFDoOd4YlgcNs3FczuOyVohwpgABp
-                            uvQH7dTZfGjiLZo3aFdsns/lfMjNnvYWYTb/6qGzuaSgFUg5ObtyQyBxAtkZEYUS
-                            K/cCAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-                            MB0GA1UdDgQWBBRqpRiaJIGIom8z8OOh7GS/rkU7dDAOBgNVHQ8BAf8EBAMCBaAw
-                            DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
-                            VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
-                            K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-                            KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-                            b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-                            LnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILaWRwLnVvd20uZ3IwDQYJKoZIhvcNAQEF
-                            BQADggEBALwLjl0iYMD1aYLZly3biu3k/i6FrygMdlnWFFoW8s/DmnFUDN/OqruW
-                            Haj4jWkQVrPoW3cxZCHnc8FDcWaYRrwhzA+4sciiu5IwayspaTlbbjH2zzM8U7gb
-                            GlzeoUPCd3QAlYY8RTvkmbkg7OOojVy7XlhYpwze0Sgpw0xjUCKaTFVyI45E9Jlq
-                            B0xMdV/VkO0eEKQ+LKkydOW+qAK2ATECpqyzfh+AgOWxiHfalyexB5UWTz91wcU8
-                            Iw2czrj7RCv/CseOgIeOs1UWMOgWCJFa1Lbu7graPiaSToYqWxFeQAR4zmqWvNNS
-                            4/vOIp8XLxY5EaSUlBOy3jeTEcnCYiA=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uowm.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uowm.gr: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.uowm.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uowm.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uowm.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uowm.gr/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">uowm.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">balkan.uowm.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eetf.uowm.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eled.uowm.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icte.uowm.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mech.uowm.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nured.uowm.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEYzCCA0ugAwIBAgIQf2UcbnRe+pHMY01RLNKQbDANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEzMDUzMTAwMDAwMFoXDTE2MDUzMDIzNTk1OVowOTEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAudW93bS5n
-                            cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRSvHDVDGnD30KLqfBr
-                            9Dd6a/GcKDLqF7HM6lM6tyF9jtYPV++8HtKx4oz8Fcrz2OE/P6Iltz7253Iyr6Qq
-                            1SpBhrUOPfgdIWRynRe70S2HIZfJWcfM/KGZQJwLxppgOHo+MCUNlSClLeWG0wE5
-                            CXGW7rHPljaQmBaCx5ZF06WHPpR2p14P5msqGGrRoba2y99nhico3/8dAxmSNUbW
-                            Jm/dGBr8f0qXNyQsO9KuxIp+PZHAApPvhBxvFDoOd4YlgcNs3FczuOyVohwpgABp
-                            uvQH7dTZfGjiLZo3aFdsns/lfMjNnvYWYTb/6qGzuaSgFUg5ObtyQyBxAtkZEYUS
-                            K/cCAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
-                            MB0GA1UdDgQWBBRqpRiaJIGIom8z8OOh7GS/rkU7dDAOBgNVHQ8BAf8EBAMCBaAw
-                            DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
-                            VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
-                            K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-                            KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-                            b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-                            LnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILaWRwLnVvd20uZ3IwDQYJKoZIhvcNAQEF
-                            BQADggEBALwLjl0iYMD1aYLZly3biu3k/i6FrygMdlnWFFoW8s/DmnFUDN/OqruW
-                            Haj4jWkQVrPoW3cxZCHnc8FDcWaYRrwhzA+4sciiu5IwayspaTlbbjH2zzM8U7gb
-                            GlzeoUPCd3QAlYY8RTvkmbkg7OOojVy7XlhYpwze0Sgpw0xjUCKaTFVyI45E9Jlq
-                            B0xMdV/VkO0eEKQ+LKkydOW+qAK2ATECpqyzfh+AgOWxiHfalyexB5UWTz91wcU8
-                            Iw2czrj7RCv/CseOgIeOs1UWMOgWCJFa1Lbu7graPiaSToYqWxFeQAR4zmqWvNNS
-                            4/vOIp8XLxY5EaSUlBOy3jeTEcnCYiA=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uowm.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uowm.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Western Macedonia</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Δυτικής Μακεδονίας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Western Macedonia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Δυτικής Μακεδονίας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uowm.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.uowm.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Panagiotis</md:GivenName>
-    <md:SurName>Voutskidis</md:SurName>
-    <md:EmailAddress>pvoutskidis@uowm.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Western Macedonia</md:Company>
-    <md:EmailAddress>noc@uowm.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.upatras.gr-shibboleth-idp-.xml b/swamid-interfederations-2.0/idp.upatras.gr-shibboleth-idp-.xml
deleted file mode 100644
index 6373b8cb..00000000
--- a/swamid-interfederations-2.0/idp.upatras.gr-shibboleth-idp-.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.upatras.gr/shibboleth-idp/">
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">upatras.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIGUTCCBbqgAwIBAgIDEyAFMA0GCSqGSIb3DQEBBQUAMIIBEjELMAkGA1UEBhMC
-                            RVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UEBxMJQmFyY2Vsb25hMSkwJwYD
-                            VQQKEyBJUFMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgcy5sLjEuMCwGA1UEChQl
-                            Z2VuZXJhbEBpcHNjYS5jb20gQy5JLkYuICBCLUI2MjIxMDY5NTEuMCwGA1UECxMl
-                            aXBzQ0EgQ0xBU0VBMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMl
-                            aXBzQ0EgQ0xBU0VBMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEgMB4GCSqGSIb3
-                            DQEJARYRZ2VuZXJhbEBpcHNjYS5jb20wHhcNMDkwOTIzMTIwMjUzWhcNMTEwOTIz
-                            MTIwMjUzWjCBjDELMAkGA1UEBhMCR1IxDzANBgNVBAgTBkFjaGFpYTEPMA0GA1UE
-                            BxMGUGF0cmFzMQ4wDAYDVQQKEwVVcG5ldDEQMA4GA1UECxMHVXBhdHJhczEVMBMG
-                            A1UEAxMMaWRwLnVwbmV0LmdyMSIwIAYJKoZIhvcNAQkBFhNob3N0bWFzdGVyQHVw
-                            bmV0LmdyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcF0nSwccAhSaiw6uK
-                            VdwSeROrjuy9TcmAA6U9dDZpK6gBNa0O9+T+ZnqjMliqeAAIlh552PGIvIy7rr8C
-                            vCKABjkiLBNVQbXDx7T7S6WCV5cNpMgNhKgrEkxaEcbtpZWkyG3bmnUxfKLVxAxf
-                            aHj0gVQzCFIQKekWpi3zEL6ogQIDAQABo4IDNjCCAzIwCQYDVR0TBAIwADARBglg
-                            hkgBhvhCAQEEBAMCBkAwCwYDVR0PBAQDAgP4MBMGA1UdJQQMMAoGCCsGAQUFBwMB
-                            MB0GA1UdDgQWBBSCuyH0W6XiqEAXs9WuxFiwM/0vKjAfBgNVHSMEGDAWgBQOB2DU
-                            OckbW12QeyPI0jSdSppGOTAeBgNVHREEFzAVgRNob3N0bWFzdGVyQHVwbmV0Lmdy
-                            MBwGA1UdEgQVMBOBEWdlbmVyYWxAaXBzY2EuY29tMHIGCWCGSAGG+EIBDQRlFmNP
-                            cmdhbml6YXRpb24gSW5mb3JtYXRpb24gTk9UIFZBTElEQVRFRC4gQ0xBU0VBMSBT
-                            ZXJ2ZXIgQ2VydGlmaWNhdGUgaXNzdWVkIGJ5IGh0dHBzOi8vd3d3Lmlwc2NhLmNv
-                            bS8wLwYJYIZIAYb4QgECBCIWIGh0dHBzOi8vd3d3Lmlwc2NhLmNvbS9pcHNjYTIw
-                            MDIvMEMGCWCGSAGG+EIBBAQ2FjRodHRwczovL3d3dy5pcHNjYS5jb20vaXBzY2Ey
-                            MDAyL2lwc2NhMjAwMkNMQVNFQTEuY3JsMEYGCWCGSAGG+EIBAwQ5FjdodHRwczov
-                            L3d3dy5pcHNjYS5jb20vaXBzY2EyMDAyL3Jldm9jYXRpb25DTEFTRUExLmh0bWw/
-                            MEMGCWCGSAGG+EIBBwQ2FjRodHRwczovL3d3dy5pcHNjYS5jb20vaXBzY2EyMDAy
-                            L3JlbmV3YWxDTEFTRUExLmh0bWw/MEEGCWCGSAGG+EIBCAQ0FjJodHRwczovL3d3
-                            dy5pcHNjYS5jb20vaXBzY2EyMDAyL3BvbGljeUNMQVNFQTEuaHRtbDCBgwYDVR0f
-                            BHwwejA5oDegNYYzaHR0cDovL3d3dy5pcHNjYS5jb20vaXBzY2EyMDAyL2lwc2Nh
-                            MjAwMkNMQVNFQTEuY3JsMD2gO6A5hjdodHRwOi8vd3d3YmFjay5pcHNjYS5jb20v
-                            aXBzY2EyMDAyL2lwc2NhMjAwMkNMQVNFQTEuY3JsMDIGCCsGAQUFBwEBBCYwJDAi
-                            BggrBgEFBQcwAYYWaHR0cDovL29jc3AuaXBzY2EuY29tLzANBgkqhkiG9w0BAQUF
-                            AAOBgQB7m5FR2tW+N/Iskdwfm18UsEPPowadokIKZrc4ml5d2q1hXAp2rBXs8Sv/
-                            NmnkmRIH/+c0gm0Ya7Ydomx9mEJZImb6rf1OlwZ6lnTw0U/5jPxcN8nA1TFipZGu
-                            +8nkhyWprjhjKQ0fRTEAgF8aDolvFrF3wcS10jiaXnBO3JP2TQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upnet.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.upnet.gr: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.upnet.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.upnet.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.upnet.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.upnet.gr/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">upatras.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIGUTCCBbqgAwIBAgIDEyAFMA0GCSqGSIb3DQEBBQUAMIIBEjELMAkGA1UEBhMC
-                            RVMxEjAQBgNVBAgTCUJhcmNlbG9uYTESMBAGA1UEBxMJQmFyY2Vsb25hMSkwJwYD
-                            VQQKEyBJUFMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgcy5sLjEuMCwGA1UEChQl
-                            Z2VuZXJhbEBpcHNjYS5jb20gQy5JLkYuICBCLUI2MjIxMDY5NTEuMCwGA1UECxMl
-                            aXBzQ0EgQ0xBU0VBMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMl
-                            aXBzQ0EgQ0xBU0VBMSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEgMB4GCSqGSIb3
-                            DQEJARYRZ2VuZXJhbEBpcHNjYS5jb20wHhcNMDkwOTIzMTIwMjUzWhcNMTEwOTIz
-                            MTIwMjUzWjCBjDELMAkGA1UEBhMCR1IxDzANBgNVBAgTBkFjaGFpYTEPMA0GA1UE
-                            BxMGUGF0cmFzMQ4wDAYDVQQKEwVVcG5ldDEQMA4GA1UECxMHVXBhdHJhczEVMBMG
-                            A1UEAxMMaWRwLnVwbmV0LmdyMSIwIAYJKoZIhvcNAQkBFhNob3N0bWFzdGVyQHVw
-                            bmV0LmdyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcF0nSwccAhSaiw6uK
-                            VdwSeROrjuy9TcmAA6U9dDZpK6gBNa0O9+T+ZnqjMliqeAAIlh552PGIvIy7rr8C
-                            vCKABjkiLBNVQbXDx7T7S6WCV5cNpMgNhKgrEkxaEcbtpZWkyG3bmnUxfKLVxAxf
-                            aHj0gVQzCFIQKekWpi3zEL6ogQIDAQABo4IDNjCCAzIwCQYDVR0TBAIwADARBglg
-                            hkgBhvhCAQEEBAMCBkAwCwYDVR0PBAQDAgP4MBMGA1UdJQQMMAoGCCsGAQUFBwMB
-                            MB0GA1UdDgQWBBSCuyH0W6XiqEAXs9WuxFiwM/0vKjAfBgNVHSMEGDAWgBQOB2DU
-                            OckbW12QeyPI0jSdSppGOTAeBgNVHREEFzAVgRNob3N0bWFzdGVyQHVwbmV0Lmdy
-                            MBwGA1UdEgQVMBOBEWdlbmVyYWxAaXBzY2EuY29tMHIGCWCGSAGG+EIBDQRlFmNP
-                            cmdhbml6YXRpb24gSW5mb3JtYXRpb24gTk9UIFZBTElEQVRFRC4gQ0xBU0VBMSBT
-                            ZXJ2ZXIgQ2VydGlmaWNhdGUgaXNzdWVkIGJ5IGh0dHBzOi8vd3d3Lmlwc2NhLmNv
-                            bS8wLwYJYIZIAYb4QgECBCIWIGh0dHBzOi8vd3d3Lmlwc2NhLmNvbS9pcHNjYTIw
-                            MDIvMEMGCWCGSAGG+EIBBAQ2FjRodHRwczovL3d3dy5pcHNjYS5jb20vaXBzY2Ey
-                            MDAyL2lwc2NhMjAwMkNMQVNFQTEuY3JsMEYGCWCGSAGG+EIBAwQ5FjdodHRwczov
-                            L3d3dy5pcHNjYS5jb20vaXBzY2EyMDAyL3Jldm9jYXRpb25DTEFTRUExLmh0bWw/
-                            MEMGCWCGSAGG+EIBBwQ2FjRodHRwczovL3d3dy5pcHNjYS5jb20vaXBzY2EyMDAy
-                            L3JlbmV3YWxDTEFTRUExLmh0bWw/MEEGCWCGSAGG+EIBCAQ0FjJodHRwczovL3d3
-                            dy5pcHNjYS5jb20vaXBzY2EyMDAyL3BvbGljeUNMQVNFQTEuaHRtbDCBgwYDVR0f
-                            BHwwejA5oDegNYYzaHR0cDovL3d3dy5pcHNjYS5jb20vaXBzY2EyMDAyL2lwc2Nh
-                            MjAwMkNMQVNFQTEuY3JsMD2gO6A5hjdodHRwOi8vd3d3YmFjay5pcHNjYS5jb20v
-                            aXBzY2EyMDAyL2lwc2NhMjAwMkNMQVNFQTEuY3JsMDIGCCsGAQUFBwEBBCYwJDAi
-                            BggrBgEFBQcwAYYWaHR0cDovL29jc3AuaXBzY2EuY29tLzANBgkqhkiG9w0BAQUF
-                            AAOBgQB7m5FR2tW+N/Iskdwfm18UsEPPowadokIKZrc4ml5d2q1hXAp2rBXs8Sv/
-                            NmnkmRIH/+c0gm0Ya7Ydomx9mEJZImb6rf1OlwZ6lnTw0U/5jPxcN8nA1TFipZGu
-                            +8nkhyWprjhjKQ0fRTEAgF8aDolvFrF3wcS10jiaXnBO3JP2TQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upnet.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.upnet.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Patras</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Πάτρας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Patras</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Πάτρας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.upatras.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.upatras.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>University of Patras NOC</md:SurName>
-    <md:EmailAddress>noc@upatras.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>University of Patras Helpdesk</md:SurName>
-    <md:EmailAddress>helpdesk@upatras.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.upce.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.upce.cz-idp-shibboleth.xml
deleted file mode 100644
index 3ce7e60d..00000000
--- a/swamid-interfederations-2.0/idp.upce.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.upce.cz/idp/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-22T11:28: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/idp-group/university</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">upce.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Pardubice</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Univerzita Pardubice</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Pardubice.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro Univerzitu Pardubice.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.upce.cz/english/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.upce.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="37">https://idp.upce.cz/images/logo-40.png</mdui:Logo>
-        <mdui:Logo height="487" width="745" xml:lang="en">https://idp.upce.cz/images/logo-487-en.png</mdui:Logo>
-        <mdui:Logo height="487" width="792" xml:lang="cs">https://idp.upce.cz/images/logo-487-cs.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEfzCCA2egAwIBAgIRANdGQbGBCwgib2T1mhEqCcMwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMDkxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UEAxMLY2FzLnVwY2Uu
-Y3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCldaLlEiSu8v6fIKmO
-w77MSNAC5Dbdy+rOcn1aNIqacXNOMOy+Nrky4mW8lm99WSd32JS4NuKVzRz6CFdJ
-1Xw5S8zw7wx0v2Shs6TkLdaj+vtiW4L3VEzrjv7EbpBGeVTwZ2QoqAkb6FxVPo66
-IItHvMJhL9FvzcSAlVNHBY4wwRkVRNr3e+sF++dbDG0n0IfwhV1BKxZkrS+tDcsu
-ye0Q3nFyRegRXJL5DKOtyvn8m2m3FLr4j2YwfIyV3jP010i5LmfiH94h7luOi4iw
-NekD8S6ypSXW8Unbb6mF+s82d6ekiuRExmoyNA1JLhiZnkvgB9IRQNIxetAoOJhi
-3yxNAgMBAAGjggGDMIIBfzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
-7TAdBgNVHQ4EFgQUg+mGzfsymEgLzFJxq0ZNXjNrCggwDgYDVR0PAQH/BAQDAgWg
-MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
-A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
-oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
-CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
-cy50ZXJlbmEub3JnMDEGA1UdEQQqMCiCC2Nhcy51cGNlLmN6ggtpZHAudXBjZS5j
-eoIMaWRwMi51cGNlLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQB0ON3JmGudQFnSxWvu
-HkRy7kq6+sV/WaV3TGYyRc6K7qpmjSP2OeT9fn86P28+jFpkA3GyXjjonBM8tn18
-hUc5UWW+8kYIrOmrZBvC4vemPLJX1azn8MYk29szd2BP+lpuzbDoDXVKf4g0pBZd
-KIGZ73yLT+O2bHOlpJGR+igW0nrpFAqPmlDyjsusiiXo1ynEkskpIMQyGFRkUfEz
-kobD7FV0OT6tgq+WtZEocauC5RF7ahIaMtvB5116857eV1L+dkwkcmXd6HEXch7r
-G5y8pHiwmqc1pqxprE0T8bp8kn8fTZ6VK6NI7nnWfcjeHCqegZcT48mMO47JpKPs
-wKnA
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upce.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.upce.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://idp.upce.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.upce.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.upce.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.upce.cz/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">upce.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEfzCCA2egAwIBAgIRANdGQbGBCwgib2T1mhEqCcMwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMDkxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UEAxMLY2FzLnVwY2Uu
-Y3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCldaLlEiSu8v6fIKmO
-w77MSNAC5Dbdy+rOcn1aNIqacXNOMOy+Nrky4mW8lm99WSd32JS4NuKVzRz6CFdJ
-1Xw5S8zw7wx0v2Shs6TkLdaj+vtiW4L3VEzrjv7EbpBGeVTwZ2QoqAkb6FxVPo66
-IItHvMJhL9FvzcSAlVNHBY4wwRkVRNr3e+sF++dbDG0n0IfwhV1BKxZkrS+tDcsu
-ye0Q3nFyRegRXJL5DKOtyvn8m2m3FLr4j2YwfIyV3jP010i5LmfiH94h7luOi4iw
-NekD8S6ypSXW8Unbb6mF+s82d6ekiuRExmoyNA1JLhiZnkvgB9IRQNIxetAoOJhi
-3yxNAgMBAAGjggGDMIIBfzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
-7TAdBgNVHQ4EFgQUg+mGzfsymEgLzFJxq0ZNXjNrCggwDgYDVR0PAQH/BAQDAgWg
-MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
-A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
-oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
-CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
-cy50ZXJlbmEub3JnMDEGA1UdEQQqMCiCC2Nhcy51cGNlLmN6ggtpZHAudXBjZS5j
-eoIMaWRwMi51cGNlLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQB0ON3JmGudQFnSxWvu
-HkRy7kq6+sV/WaV3TGYyRc6K7qpmjSP2OeT9fn86P28+jFpkA3GyXjjonBM8tn18
-hUc5UWW+8kYIrOmrZBvC4vemPLJX1azn8MYk29szd2BP+lpuzbDoDXVKf4g0pBZd
-KIGZ73yLT+O2bHOlpJGR+igW0nrpFAqPmlDyjsusiiXo1ynEkskpIMQyGFRkUfEz
-kobD7FV0OT6tgq+WtZEocauC5RF7ahIaMtvB5116857eV1L+dkwkcmXd6HEXch7r
-G5y8pHiwmqc1pqxprE0T8bp8kn8fTZ6VK6NI7nnWfcjeHCqegZcT48mMO47JpKPs
-wKnA
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upce.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.upce.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="en">University of Pardubice</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Univerzita Pardubice</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Pardubice</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Univerzita Pardubice</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.upce.cz/english/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.upce.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Lukáš</md:GivenName>
-    <md:SurName>Slánský</md:SurName>
-    <md:EmailAddress>lukas.slansky@upce.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josef</md:GivenName>
-    <md:SurName>Krupička</md:SurName>
-    <md:EmailAddress>josef.krupicka@upce.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Pavel</md:GivenName>
-    <md:SurName>Přikryl</md:SurName>
-    <md:EmailAddress>pavel.prikryl@upce.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2b8cd93a..00000000
--- a/swamid-interfederations-2.0/idp.upmc.fr-idp-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://idp.upmc.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Paris 6 - Pierre et Marie Curie</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZ0lEQVQoz5XST0iTcRzH8e/P5/k927Jnzv1DnzndM2azaSqp6SEZyUgxJCSIkIIKgg4VQfcO3YOoWx3qEBFhQkQGJpZJYm4Xe/xbc1ubz5xbzxgT5/Z7/nWqQ3Txc/7c3i+kaRoAIIQUWd76sbwemUvHVmVSAQDMGDhvoKW7v6G5jcZY13UAQJqmIYR2C9LHV08yiQ2Xr817rMfp8gBAVkzEhLAYXa7z+E+dv8ZabLquI13XdwvS60d3zTau/+yYw8XLhKiKDAAUjTHD5MT43JsXRSl97uY91mJDMiGTT+8rinrm8m0KM+n4xurXmXwmBQDWOnegd4Dj/apM3j17QNPU8JU71NULo0ufJwcv3Thkrl2cmpgdf1zIbsukQsql/HZqI/JJ08B9pM3pbop8mHA08NRQb+Cwxd4ZHE5FVyNT441Hu4zVZlLeoyja4fY5G5sTKxG7i+d4f+bnZj6zRQ10NLWfHLI46hfevzSxtYNj143VbDq2RtG4OzR6PDiUTkR/iTFPoEvX9bXFmSqZVJwuj6rIUiaJDSaaMWKjSVWIqhBsNNGMERtMUiapKrLT5ZFJhYY/Q4BIeY+U99kaq9vfCQBsjZWU90l5DwH6e6MxY8iKCZ+9zsY15VLx5HfB136iJzQKAGarPfptsbCz5XDzFI2zYgIzhirOG4gJYcwwrX2hUlES5qc3hTBCgBBsCmFhfrpUlFr7QphhYkKY8wbolu7+qecPc2Kc4/0dwZGl2bdfpB3W6gSA3Xy2VJQ6giMc78+JcTG6fPrirf+EW1mYlraTAGCrb2ztC/0T7uA0DozvoLx/A51vYzkXFljhAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.upmc.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Paris 6 - Pierre et Marie Curie</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>
-					      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>
-    </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-POST" Location="https://idp.upmc.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.upmc.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.upmc.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upmc.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.upmc.fr/idp/profile/SAML1/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">Université de Paris 6 - Pierre et Marie Curie</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Paris 6 - Pierre et Marie Curie</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.upmc.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>exploitationdsi@upmc.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e10d066c..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uqam.ca/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.ca: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.uqam.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uqam.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uqam.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uqam.ca/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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uqam.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uqam.ca: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">Université du Québec à Montréal</md:OrganizationName>
-    <md:OrganizationName xml:lang="fr">Université du Québec à Montréal</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">Université du Québec à Montréal</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt">Université du Québec à Montréal</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Université du Québec à Montréal</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">UQAM | Université du Québec à Montréal</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uqam.ca/en/about/presentation_en.htm</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.uqam.ca</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="es">http://www.uqam.ca/es/aproposito/presentacion.htm</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt">http://www.uqam.ca/pt/sobrea/apresentacao.htm</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>shibboleth@uqam.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md: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.uran.ua-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uran.ua-idp-shibboleth.xml
deleted file mode 100644
index 27db3064..00000000
--- a/swamid-interfederations-2.0/idp.uran.ua-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.uran.ua/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-02-17T19:48:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uran.ua</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">URAN Association IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ru">Ассоциация УРАН IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Association URAN</mdui:Description>
-        <mdui:Description xml:lang="ru">Поставщик Удостоверений для Ассоциации УРАН</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idp.uran.ua/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="ru">https://idp.uran.ua/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://peano.uran.ua/~eng/policy.htm</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="ru">http://peano.uran.ua/~rus/policy.htm</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>uran.ua</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVANtB8T4bbAsN9mAy57P+mGwmZ7uEMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC51cmFuLnVhMB4XDTE0MDMyNzEwMzYwMVoXDTE3
-MDMyNzA5MzYwMVowFjEUMBIGA1UEAxMLaWRwLnVyYW4udWEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCIE/V0bPksB44D2YgFanl1vk2lpON4DaY9ixlk
-ctosy/nqrgy6FVewlJCa7Nw5VrDecS+C6mYQukKwGzN1hjd5JGSOuA1yHOwp3d8j
-MRn4YAbPExuIwBIzdHL+ghgEXU20aeEe5Soa0HbGTF+1gfoGdWRTh+ej9HIx7J4m
-BAwmbbNJNYzAR3BOD5s/SwmyAOix7oRUia4srns9VUjGk7LLbgg9ulzOOYqD7coD
-uWGC5FHdBBsa/lP3844UMTS9n1l5ALHSacQzoMhXX7alK/jdZzG0Suv3+KgutjZl
-EFhSxLaEgsyu3mtUa3sriOgux6yM4M4720Dqr6BzjFw3jqwHAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC51cmFuLnVhhiJodHRwczovL2lkcC51cmFuLnVhL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQG4rX5cAeawjWay+XskGK3tC/woTANBgkqhkiG
-9w0BAQUFAAOCAQEAFJNxAxsvZVx01M1/Ky15nt/Gb0dnU4V4AlPovKpUOePLnZIV
-hAqllLH+wt/1240KKiavEHAJ9KsjKDzgE++fwKL8Swbq+XT62QM0T3cm+vxPP+SR
-Tke+RDktDDWFNPDrE9Ci4nCn6MbDQJEQgVGovAfN1q0zFnt/SlpUSMf3Kx60isUS
-1xASj1BZQAzH//iVv54KGY2gg4StD0HNMru8syyKF3JRRYr1eYT5fBKa2drPWjxQ
-CJ98UPGXiE2iiBpJUNpkhoF+z70jkWKqLy13fd94CRSTrHePdchNqjGusfpz5Y6V
-x0gyhw6tCPraBiFB5+EBMY/L7s3AEdlFxvXTkA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uran.ua:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uran.ua:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uran.ua/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uran.ua/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uran.ua: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.uran.ua/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uran.ua/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uran.ua/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uran.ua/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uran.ua</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVANtB8T4bbAsN9mAy57P+mGwmZ7uEMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC51cmFuLnVhMB4XDTE0MDMyNzEwMzYwMVoXDTE3
-MDMyNzA5MzYwMVowFjEUMBIGA1UEAxMLaWRwLnVyYW4udWEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCIE/V0bPksB44D2YgFanl1vk2lpON4DaY9ixlk
-ctosy/nqrgy6FVewlJCa7Nw5VrDecS+C6mYQukKwGzN1hjd5JGSOuA1yHOwp3d8j
-MRn4YAbPExuIwBIzdHL+ghgEXU20aeEe5Soa0HbGTF+1gfoGdWRTh+ej9HIx7J4m
-BAwmbbNJNYzAR3BOD5s/SwmyAOix7oRUia4srns9VUjGk7LLbgg9ulzOOYqD7coD
-uWGC5FHdBBsa/lP3844UMTS9n1l5ALHSacQzoMhXX7alK/jdZzG0Suv3+KgutjZl
-EFhSxLaEgsyu3mtUa3sriOgux6yM4M4720Dqr6BzjFw3jqwHAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC51cmFuLnVhhiJodHRwczovL2lkcC51cmFuLnVhL2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQG4rX5cAeawjWay+XskGK3tC/woTANBgkqhkiG
-9w0BAQUFAAOCAQEAFJNxAxsvZVx01M1/Ky15nt/Gb0dnU4V4AlPovKpUOePLnZIV
-hAqllLH+wt/1240KKiavEHAJ9KsjKDzgE++fwKL8Swbq+XT62QM0T3cm+vxPP+SR
-Tke+RDktDDWFNPDrE9Ci4nCn6MbDQJEQgVGovAfN1q0zFnt/SlpUSMf3Kx60isUS
-1xASj1BZQAzH//iVv54KGY2gg4StD0HNMru8syyKF3JRRYr1eYT5fBKa2drPWjxQ
-CJ98UPGXiE2iiBpJUNpkhoF+z70jkWKqLy13fd94CRSTrHePdchNqjGusfpz5Y6V
-x0gyhw6tCPraBiFB5+EBMY/L7s3AEdlFxvXTkA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uran.ua:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uran.ua: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="ru">Ассоциация УРАН</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Association URAN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="ru">УРАН</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">URAN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="ru">http://www.uran.ua</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uran.ua</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mikhail</md:GivenName>
-    <md:SurName>Dombrougov</md:SurName>
-    <md:EmailAddress>mailto:dopomoga@uran.ua</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Yevhenii</md:GivenName>
-    <md:SurName>Preobrazhenskyi</md:SurName>
-    <md:EmailAddress>mailto:dopomoga@uran.ua</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d6fbea33..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.urca.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.urca.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idp.urca.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.urca.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.urca.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.urca.br/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">urca.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.urca.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.urca.br:8443/idp/profile/SAML1/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">URCA - Universidade Regional do Cariri</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">URCA - Universidade Regional do Cariri</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">URCA - Universidade Regional do Cariri </md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">URCA - Universidade Regional do Cariri </md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.urca.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.urca.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Herbert Novais</md:SurName>
-    <md:EmailAddress>herbert.novais@urca.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.usask.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.usask.ca-idp-shibboleth.xml
deleted file mode 100644
index 518c721d..00000000
--- a/swamid-interfederations-2.0/idp.usask.ca-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.usask.ca/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-08-21T16:46:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usask.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:InformationURL xml:lang="en">http://www.usask.ca/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAMXVGogsmqnkwPUYCdxTPbev9l3ZMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51c2Fzay5jYTAeFw0xMDEwMjUyMDU2NTBaFw0z
-MDEwMjUyMDU2NTBaMBcxFTATBgNVBAMTDGlkcC51c2Fzay5jYTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALMSOFuhTJKiB3amc9licNeAGA3vbw/qksAZ
-I90sBiS5F6fmRcqeO4yZRvNqmCPp/By1iTJOf0ryd50P7szRXSBPiwgnCTox4m5k
-TyBciLbqIj4rtLu9ThuADreCV225cilhwwFIPW93ksJYn2gIuPlBV3zNqT27pQIo
-NhVhFNy/RHRKctAWIaH66RForxVkofJ2f3sY3RfEpl7PjZSj35RJaiICNDBcL/9P
-miYmecit+pl8F64qmMZSr36Lond54RthIey3ai4Q5WMPKgkB/A0kk9hJN366GX/X
-JclXGMKimP4ymqmsyVIGUcu+8vBFHTsNu8Y8Sf/PSExfFzufus8CAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVzYXNrLmNhhiNodHRwczovL2lkcC51c2Fzay5jYS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUES778RCyfLDRWvsQSEz4R0JUHUwwDQYJ
-KoZIhvcNAQEFBQADggEBAHs1pJu8e1vHei30xNOnsO+RMx9Ye4AMR9dBmh2QkV5Q
-7UzS1YlA2wr4x3YSnm4IPfOjrQW0brXZjytZWdU9EBfinn4OUUG5RMD/1d/Nu5Zu
-kDm+qt2mCaYoxhdinuUcb6aiJBucpxulZLzByGxTAHXqXqOlh6Y5cJUwlweFHLka
-D0NZ6TrcXo/7QHXhypSrNOAyXrN+ngQ8j6KJXmtjXj601I71upEVWOGaor172aNo
-4OJ1yrQ6k4U6yjjuwrQEAjDCL3WYhrhGCwuu/l/AVw28RWHK5qKgMovdwIeukJfL
-B9WRkjxzB4gF0SyVYl64MQB5UICwuA6q6WLxlmMyWIY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.usask.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.usask.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.usask.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.usask.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.usask.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.usask.ca/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usask.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAMXVGogsmqnkwPUYCdxTPbev9l3ZMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDGlkcC51c2Fzay5jYTAeFw0xMDEwMjUyMDU2NTBaFw0z
-MDEwMjUyMDU2NTBaMBcxFTATBgNVBAMTDGlkcC51c2Fzay5jYTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALMSOFuhTJKiB3amc9licNeAGA3vbw/qksAZ
-I90sBiS5F6fmRcqeO4yZRvNqmCPp/By1iTJOf0ryd50P7szRXSBPiwgnCTox4m5k
-TyBciLbqIj4rtLu9ThuADreCV225cilhwwFIPW93ksJYn2gIuPlBV3zNqT27pQIo
-NhVhFNy/RHRKctAWIaH66RForxVkofJ2f3sY3RfEpl7PjZSj35RJaiICNDBcL/9P
-miYmecit+pl8F64qmMZSr36Lond54RthIey3ai4Q5WMPKgkB/A0kk9hJN366GX/X
-JclXGMKimP4ymqmsyVIGUcu+8vBFHTsNu8Y8Sf/PSExfFzufus8CAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMaWRwLnVzYXNrLmNhhiNodHRwczovL2lkcC51c2Fzay5jYS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUES778RCyfLDRWvsQSEz4R0JUHUwwDQYJ
-KoZIhvcNAQEFBQADggEBAHs1pJu8e1vHei30xNOnsO+RMx9Ye4AMR9dBmh2QkV5Q
-7UzS1YlA2wr4x3YSnm4IPfOjrQW0brXZjytZWdU9EBfinn4OUUG5RMD/1d/Nu5Zu
-kDm+qt2mCaYoxhdinuUcb6aiJBucpxulZLzByGxTAHXqXqOlh6Y5cJUwlweFHLka
-D0NZ6TrcXo/7QHXhypSrNOAyXrN+ngQ8j6KJXmtjXj601I71upEVWOGaor172aNo
-4OJ1yrQ6k4U6yjjuwrQEAjDCL3WYhrhGCwuu/l/AVw28RWHK5qKgMovdwIeukJfL
-B9WRkjxzB4gF0SyVYl64MQB5UICwuA6q6WLxlmMyWIY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.usask.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.usask.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Saskatchewan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Saskatchewan</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.usask.ca/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jennifer</md:GivenName>
-    <md:SurName>Hadley</md:SurName>
-    <md:EmailAddress>mailto:edupass_support@usask.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f53d9646..00000000
--- a/swamid-interfederations-2.0/idp.ut-capitole.fr-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.ut-capitole.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Toulouse 1 Capitole</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACsUlEQVQoz03S62sTWRzG8XN+5zIzJ5mZpE3S1JQ2rddualtWEWFXRWUXREGof4Pv/KuWfbOwvqqIZRcUKtStUKHgZYPai802zcbcJpc5M3PO8UVRfN498Hn5xb9PLaCvM1rrKKJCcN9FGEySyHZXJzHhHGF8bOg3raLI8v389Sve3IwKpU4SoBQYa77abm2/Pr4IIbLiFRBCSsrM2dNTv16njm2UVqMRcE4YM8ZYvju+fD7Y/ZSMRhgAEEJKRt6puenbvyBkgFKWFnHQ71bfJ2GIAcC2ktGofPcWdWyjNSBjWEoUf7rU3Npm6XTY/Lzz5+rwqDG+WNlbfbL/aM3ECQaSDEcnblzVUQxKRmNLFaAsdWKyv3+w83BVlCYrD+67c2UdxcOjxt6jNWLzqNt18jmnmCd3mZf94Sx1bOLYh+sv4qAvJifERL5T/eCfnCXc6u3sWRnPzuUwRkYpOrtyJz09JdudsNkKm01MgAnhlmdUKJ1iwSjV+7jb36+NLS4Ma4eFSxeAZ3wqHO57GGNkEEIIGMtfXHbLM/Xn/9SerstuFxkEBMJmi9o2ufJvjXkuTQngfHBQS4KBKE3KTocKp/b3s+DjLjIme+60U5wQE/n6xiZgQlQojTYYIPfjUiIl993O2yowmpk/QzinQninZmWrraN4WDsk9zLFqBfkFis6ip3cuJXxjUqsbLb95l3UDXQcl25etcayGOGw1W5sbgEGkM1W4+UWc1P7j/+K+4NUqdStvu+8rRqtSzev1ddfNDZe0rSor28AELLiFYDSwUGNcJ6ZP/P/5lbnXXV8qTK2MG9nM9Xf/nAKufyF5YO1p4P6ETCGv9WqpHTL08WfL6tRGA+G3EvrRLGUiHrBf8+ex70AOEcI4e/z1nGCkHEKeWJbCGGjVNzvy1YHOMMAx+YLtBpGsTIWf64AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDDaTHhbAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA4KzAyOjAwqxHA5wAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-tlse1.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Toulouse 1 Capitole</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>
-					      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>
-    </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-POST" Location="https://idp.ut-capitole.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ut-capitole.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ut-capitole.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Toulouse 1 Capitole</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Toulouse 1 Capitole</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-tlse1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>systeme@ut-capitole.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uta.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uta.edu-idp-shibboleth.xml
deleted file mode 100644
index c2bac177..00000000
--- a/swamid-interfederations-2.0/idp.uta.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,67 +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://idp.uta.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.uta.edu/error" 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">uta.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas at Arlington</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.uta.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.uta.edu/oit/policy/Internet-privacy.php</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>
-MIIDFzCCAf+gAwIBAgIUC7oT6rb9pNSoCFZr77ngoXR+YG8wDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnV0YS5lZHUwHhcNMTAwMTIwMTYxMTAyWhcNMzAw
-MTIwMTYxMTAyWjAWMRQwEgYDVQQDEwtpZHAudXRhLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJU8jgMoNNy0Wyvrp4oZRJRXPYeoWfTQV5svLHkz
-YCldQcgDkSHzT2M4PYt7gCAHUUu8FNWjdBlwsFvdnxp+0IOcXyKrNo9cIFavSaJZ
-FKBuHoYZC4t1BGoFMexS1TWj1Il0SIya/N0Z4J5aJocfPdu+JBSTMlI6OEBzNlW0
-Ql231Rc4G1c17QBA4dXI0eCHP9jKutKU3NM+SCoubqwPjCnJYO2cXR4/CrBEmB7z
-qW+wKfBoPugFHkmKPZ14AOAb6pvt+ry/qppJwNQtPi27pu3M/wmIE5Ce1mhVB6vB
-ZEwceCSslLIH669NNRKS/FgWY2cqVAHqE3wYSn5jqMDio1sCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnV0YS5lZHWGImh0dHBzOi8vaWRwLnV0YS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFMj8dZUqAfFFMWV+9FjbtpOTg6xCMA0GCSqGSIb3
-DQEBBQUAA4IBAQBYOtZIVgRc/oCxwQ8+BMCnHNkfJ1zOfP62mjsRzoNlIBrj9cG+
-YhbEBG/OAYL4vlBRJTLUnZipi9Lz4QbB+nA2gS6D19vrxQv2tfg/I0Hr2crmPsD7
-F8a0cgjHXlUIPW6E/gtOLowuueFDEs5jpunYa2dVMyHhWhzveSANkrhqXjoiVFvX
-k7TvCpFqKCBxLTfs7tqZ7UfbliMLALsrHfa2IIuDy0JfFd74TSj9KbtNAL4hyTPB
-ZPCie/YOLYcIFe7kKPlvkHB9DKXTlq2dPomPA3doG4aIjGK+GspD2OTsHs40W+Nj
-DhuK7YWFCjC6UIAyL63IXO/wa3uFVz2naO/3
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uta.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uta.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uta.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uta.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas at Arlington</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas at Arlington</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uta.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UTA Shibboleth Administrators</md:GivenName>
-    <md:EmailAddress>shibboleth-admin@uta.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jason Hardy</md:GivenName>
-    <md:EmailAddress>hardy@uta.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UTA Shibboleth</md:GivenName>
-    <md:EmailAddress>shibboleth-admin@uta.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utdallas.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utdallas.edu-idp-shibboleth.xml
deleted file mode 100644
index 40e5614d..00000000
--- a/swamid-interfederations-2.0/idp.utdallas.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +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://idp.utdallas.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">utdallas.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas at Dallas</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>
-MIIDLDCCAhSgAwIBAgIVAKxr332EVudjRIrBOrqMFIPg2iBHMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcC51dGRhbGxhcy5lZHUwHhcNMTAwNjA3MjA1NDQ1
-WhcNMzAwNjA3MjA1NDQ1WjAbMRkwFwYDVQQDExBpZHAudXRkYWxsYXMuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoN7NLFiI35At7nZDk5hSXOYP
-I3PU8mlFpsOY4xeSr97ZoIEs2T8eyUIHJEN+XmWrpFeyBRWp5sYoSCUJcqMUTyXI
-DjwriDKvpYumdqk1tDTTXCA7jdC9uaMpXERXMuknOJrBSeMr+sN+R1YSD+YR/Dww
-KcOxOkulTgNLHv0wTspMrfDIobvlSEnWi0dRh3mnDWCCohoTeMs5MhsDuYlpLDYH
-YUlPmIw/79/tSkd3dV68y42FZKbKHorKUtKgv3zXzOzrIczp9MW9GHDRohpmamVm
-YgpaAsGDM3d4EmgZAThFNQAVeP+BDo+UASEEzbuBjnMn99x67Ka7heEQgiscpQID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAudXRkYWxsYXMuZWR1hidodHRwczovL2lk
-cC51dGRhbGxhcy5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFF37bNekZX/P
-dczWcPYmwzFuT7w+MA0GCSqGSIb3DQEBBQUAA4IBAQBfVAtcXTBICrXjODHo00mx
-hMhZV4uK3QGwRhYWf0PhClq/8I4lipnVDKRmzgC4U8wLLh3msJxR4VqVLwycCSL8
-QxKYqkJJfnRlzEzhg/w8m7iYuiSdYSu4i62c3jGT0i3TGg3yCBk2cdgorf2tbAwD
-imYF2TFcPInUp7XGaxDf9nxw4z7NNsNVkUZBjl8WmmUwMtPNUDFDaw8HmVn0J2Wc
-BneDgHFOfFS2aYPeytiEEM7pLc6HaAunOLXymg6VBSKYkC+wUZdIl7otJrccXzqE
-RisCn91uRsbkcD1U5ziboM4m9h4sYC/RP7yrFAUt9XM/aAl5JCBD8A+hnx+R50IW
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utdallas.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utdallas.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utdallas.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utdallas.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utdallas.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utdallas.edu/idp/profile/SAML2/POST-SimpleSign/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">utdallas.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAKxr332EVudjRIrBOrqMFIPg2iBHMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcC51dGRhbGxhcy5lZHUwHhcNMTAwNjA3MjA1NDQ1
-WhcNMzAwNjA3MjA1NDQ1WjAbMRkwFwYDVQQDExBpZHAudXRkYWxsYXMuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoN7NLFiI35At7nZDk5hSXOYP
-I3PU8mlFpsOY4xeSr97ZoIEs2T8eyUIHJEN+XmWrpFeyBRWp5sYoSCUJcqMUTyXI
-DjwriDKvpYumdqk1tDTTXCA7jdC9uaMpXERXMuknOJrBSeMr+sN+R1YSD+YR/Dww
-KcOxOkulTgNLHv0wTspMrfDIobvlSEnWi0dRh3mnDWCCohoTeMs5MhsDuYlpLDYH
-YUlPmIw/79/tSkd3dV68y42FZKbKHorKUtKgv3zXzOzrIczp9MW9GHDRohpmamVm
-YgpaAsGDM3d4EmgZAThFNQAVeP+BDo+UASEEzbuBjnMn99x67Ka7heEQgiscpQID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAudXRkYWxsYXMuZWR1hidodHRwczovL2lk
-cC51dGRhbGxhcy5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFF37bNekZX/P
-dczWcPYmwzFuT7w+MA0GCSqGSIb3DQEBBQUAA4IBAQBfVAtcXTBICrXjODHo00mx
-hMhZV4uK3QGwRhYWf0PhClq/8I4lipnVDKRmzgC4U8wLLh3msJxR4VqVLwycCSL8
-QxKYqkJJfnRlzEzhg/w8m7iYuiSdYSu4i62c3jGT0i3TGg3yCBk2cdgorf2tbAwD
-imYF2TFcPInUp7XGaxDf9nxw4z7NNsNVkUZBjl8WmmUwMtPNUDFDaw8HmVn0J2Wc
-BneDgHFOfFS2aYPeytiEEM7pLc6HaAunOLXymg6VBSKYkC+wUZdIl7otJrccXzqE
-RisCn91uRsbkcD1U5ziboM4m9h4sYC/RP7yrFAUt9XM/aAl5JCBD8A+hnx+R50IW
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utdallas.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utdallas.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas at Dallas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas at Dallas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utdallas.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UT Dallas Info Security</md:GivenName>
-    <md:EmailAddress>infosecurity@utdallas.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UT Dallas Info Security</md:GivenName>
-    <md:EmailAddress>infosecurity@utdallas.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uth.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uth.gr-idp-shibboleth.xml
deleted file mode 100644
index 7132d312..00000000
--- a/swamid-interfederations-2.0/idp.uth.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.uth.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">uth.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Thessaly</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Θεσσαλίας</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.uth.gr/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.uth.gr/</mdui:InformationURL>
-        <mdui:Logo height="87" width="87">https://aai.uth.gr/idp/images/uth_logo_87x87.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDCDCCAfCgAwIBAgIJAPbE4JqrFTBTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-                            BAMTCmFhaS51dGguZ3IwHhcNMTUwMTIwMDkzNTQwWhcNMTgwMTE5MDkzNTQwWjAV
-                            MRMwEQYDVQQDEwphYWkudXRoLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-                            CgKCAQEAuXbp6/MQmvg+nE34bdjQ1VE0Bx8bzobfj6Eh4yFBmJhfHr8fWEaAP+jx
-                            o9hodJl6FeByG8ejPkAm9m9K/SGphLEQQFlSKsg1BaRfaa6pmKWONaolqPuS35gb
-                            E/SypucbCNX8ZMapxLyZY8IzjZO5gf9WAP+XcZj3LrpXYKMBOhG6XGWvPZUaqlU8
-                            5Qt5ZoceksS8otlnaJ6OC4tiCKpCO7qcTrB7RMaQt3/tlA1eBYz9yDBaEbfpaLvs
-                            WloGeQuWy4tuDhqjB7P/iTioGCPG9RTj5jFKfkj+M6VEpHBFAZetIFqXtuMisSGo
-                            e/MYcN/xVte6Wr4ZNzfr09D+oMP2SwIDAQABo1swWTA4BgNVHREEMTAvggphYWku
-                            dXRoLmdyhiFodHRwczovL2lkcC51dGguZ3IvaWRwL3NoaWJib2xldGgwHQYDVR0O
-                            BBYEFF6MV6RBvR2vKtPxO+t6S3oWOPYwMA0GCSqGSIb3DQEBBQUAA4IBAQBMX4wH
-                            U4VnJitYpBJ/9QQakfl+t9kGdP6lxwKPU8NigHCqZ7eFf3Ab39rp1tmF7wLp5V7P
-                            mYDfeP1fY3P//p3bEh8JRGR/xVQhsjSUj3u0o8vND/95CmjH6OygHBTCWxAG4+NT
-                            mMT63CBmj000B+4M3tCSi6dw26MYkR6YzqqExK7TzZkhAcqzq+cX12UerWRU9+4N
-                            gFgnxt7wCTDgr5vLE7l2gPZsW6fARMepI1Hi1R4HtWfvsUWuqdi/+UWAOrP3GEfk
-                            0S9jSEGt7/vFOwbLNDFHydht9HP6Vvf9ELgW+wP9r0ebCWow/++ye7/QPqJ0hyel
-                            v6N4PY24wsBai7PU
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.uth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.uth.gr: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://aai.uth.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.uth.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.uth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.uth.gr/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">uth.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDCDCCAfCgAwIBAgIJAPbE4JqrFTBTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-                            BAMTCmFhaS51dGguZ3IwHhcNMTUwMTIwMDkzNTQwWhcNMTgwMTE5MDkzNTQwWjAV
-                            MRMwEQYDVQQDEwphYWkudXRoLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-                            CgKCAQEAuXbp6/MQmvg+nE34bdjQ1VE0Bx8bzobfj6Eh4yFBmJhfHr8fWEaAP+jx
-                            o9hodJl6FeByG8ejPkAm9m9K/SGphLEQQFlSKsg1BaRfaa6pmKWONaolqPuS35gb
-                            E/SypucbCNX8ZMapxLyZY8IzjZO5gf9WAP+XcZj3LrpXYKMBOhG6XGWvPZUaqlU8
-                            5Qt5ZoceksS8otlnaJ6OC4tiCKpCO7qcTrB7RMaQt3/tlA1eBYz9yDBaEbfpaLvs
-                            WloGeQuWy4tuDhqjB7P/iTioGCPG9RTj5jFKfkj+M6VEpHBFAZetIFqXtuMisSGo
-                            e/MYcN/xVte6Wr4ZNzfr09D+oMP2SwIDAQABo1swWTA4BgNVHREEMTAvggphYWku
-                            dXRoLmdyhiFodHRwczovL2lkcC51dGguZ3IvaWRwL3NoaWJib2xldGgwHQYDVR0O
-                            BBYEFF6MV6RBvR2vKtPxO+t6S3oWOPYwMA0GCSqGSIb3DQEBBQUAA4IBAQBMX4wH
-                            U4VnJitYpBJ/9QQakfl+t9kGdP6lxwKPU8NigHCqZ7eFf3Ab39rp1tmF7wLp5V7P
-                            mYDfeP1fY3P//p3bEh8JRGR/xVQhsjSUj3u0o8vND/95CmjH6OygHBTCWxAG4+NT
-                            mMT63CBmj000B+4M3tCSi6dw26MYkR6YzqqExK7TzZkhAcqzq+cX12UerWRU9+4N
-                            gFgnxt7wCTDgr5vLE7l2gPZsW6fARMepI1Hi1R4HtWfvsUWuqdi/+UWAOrP3GEfk
-                            0S9jSEGt7/vFOwbLNDFHydht9HP6Vvf9ELgW+wP9r0ebCWow/++ye7/QPqJ0hyel
-                            v6N4PY24wsBai7PU
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.uth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.uth.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Thessaly</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Θεσσαλίας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Thessaly</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Θεσσαλίας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uth.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.uth.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Thessaly NOC</md:Company>
-    <md:EmailAddress>noc@uth.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Thessaly NOC</md:Company>
-    <md:EmailAddress>noc@uth.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 73596151..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.utia.cas.cz/idp/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="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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utia.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utia.cas.cz: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.utia.cas.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utia.cas.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utia.cas.cz/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">utia.cas.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utia.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institute of Information Theory and Automation</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Ústav teorie informace a automatizace AV ČR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Information Theory and Automation, Public Research Institution</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Ústav teorie informace a automatizace AV ČR, v.v.i.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utia.cas.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.utia.cas.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Vaníček</md:SurName>
-    <md:EmailAddress>vanicekp@utia.cas.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utk.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utk.edu-idp-shibboleth.xml
deleted file mode 100644
index ff74f487..00000000
--- a/swamid-interfederations-2.0/idp.utk.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,113 +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://idp.utk.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">utk.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tennessee.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utc.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthsc.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utm.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsi.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Tennessee</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>
-MIIDFzCCAf+gAwIBAgIUE53nkabtCMcB00ovnd3bBOKR9LIwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnV0ay5lZHUwHhcNMTMwNDE4MTIyNDM2WhcNMzMw
-NDE4MTIyNDM2WjAWMRQwEgYDVQQDEwtpZHAudXRrLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIKg2r7kNSs4hb1FIGO0/zXbek+JqR+F6iK0AtIP
-HhIu7wD6lVDfEX9dicU9zA/kqdsWmx5NmuVNioCV+GrwQd41DtlNA0pYQdOkKMBG
-maXkkIxVRGVHAPe/dc0Tawq8tIFLvP9IAZOq3upR0avQLWdmsfofsshK8XL/7m8w
-D75egZjIpyOv2PVgymIvjk7zHjIQQWXxd8/fMJEB4d6wNZ+gcb8IRFmManbl132T
-03TAb6OP2NJ8IkY+0+olws4Fxb758y/3I+EGM5b3MvyEYfdgqiyQqdTfZzImiX5D
-g/lIUK58bbpXF9sHveaoA0FWORaQmnK0uW6FKq+B/xpf6Y8CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnV0ay5lZHWGImh0dHBzOi8vaWRwLnV0ay5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFH2TZYyhflhNjmsmMJRXRg5TnqEoMA0GCSqGSIb3
-DQEBBQUAA4IBAQAXeTdPOrG9mSKJRjsx7aLgG5XWFTre5i9wHNnFauutTI8X3w/n
-OiX+BFRpiNwya+KkpvrfSOyHjYQHKUxFtxMN55qSfOsNW+SpLEEXTtP953uIqcG9
-Ti1Z0mWRii0RZhLNEgTsvPglpgAGByY8JThfp2nRoenWkIr1FHYhd2UKT/5BtaoB
-iRjzxMh8KXVJD/ta5c50xFKBbuk+r8ESt1jgqvvGSpcGksODPkDs7If2nC2PKGbt
-5jY6V06RqUzDhEKICpvEkj5lt5/Ep3Azl8PXLqWhQJOl6xwWqXhgSo1Qh4Dsz+tJ
-Dsn4YYK4EonuqncWQnyCDypPX/rFk/WakCyE
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utk.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utk.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utk.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utk.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utk.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utk.edu/idp/profile/SAML2/POST-SimpleSign/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">utk.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tennessee.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utc.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthsc.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utm.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsi.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUE53nkabtCMcB00ovnd3bBOKR9LIwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnV0ay5lZHUwHhcNMTMwNDE4MTIyNDM2WhcNMzMw
-NDE4MTIyNDM2WjAWMRQwEgYDVQQDEwtpZHAudXRrLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIKg2r7kNSs4hb1FIGO0/zXbek+JqR+F6iK0AtIP
-HhIu7wD6lVDfEX9dicU9zA/kqdsWmx5NmuVNioCV+GrwQd41DtlNA0pYQdOkKMBG
-maXkkIxVRGVHAPe/dc0Tawq8tIFLvP9IAZOq3upR0avQLWdmsfofsshK8XL/7m8w
-D75egZjIpyOv2PVgymIvjk7zHjIQQWXxd8/fMJEB4d6wNZ+gcb8IRFmManbl132T
-03TAb6OP2NJ8IkY+0+olws4Fxb758y/3I+EGM5b3MvyEYfdgqiyQqdTfZzImiX5D
-g/lIUK58bbpXF9sHveaoA0FWORaQmnK0uW6FKq+B/xpf6Y8CAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnV0ay5lZHWGImh0dHBzOi8vaWRwLnV0ay5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFH2TZYyhflhNjmsmMJRXRg5TnqEoMA0GCSqGSIb3
-DQEBBQUAA4IBAQAXeTdPOrG9mSKJRjsx7aLgG5XWFTre5i9wHNnFauutTI8X3w/n
-OiX+BFRpiNwya+KkpvrfSOyHjYQHKUxFtxMN55qSfOsNW+SpLEEXTtP953uIqcG9
-Ti1Z0mWRii0RZhLNEgTsvPglpgAGByY8JThfp2nRoenWkIr1FHYhd2UKT/5BtaoB
-iRjzxMh8KXVJD/ta5c50xFKBbuk+r8ESt1jgqvvGSpcGksODPkDs7If2nC2PKGbt
-5jY6V06RqUzDhEKICpvEkj5lt5/Ep3Azl8PXLqWhQJOl6xwWqXhgSo1Qh4Dsz+tJ
-Dsn4YYK4EonuqncWQnyCDypPX/rFk/WakCyE
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utk.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utk.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Tennessee</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Tennessee</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utk.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Will Richardson</md:GivenName>
-    <md:EmailAddress>wkrich@utk.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Melissa Wauford</md:GivenName>
-    <md:EmailAddress>mwauford@utk.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>OIT HelpDesk</md:GivenName>
-    <md:EmailAddress>tcshd@utk.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>OIT UTK Security Office</md:GivenName>
-    <md:EmailAddress>security@utk.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utmb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utmb.edu-idp-shibboleth.xml
deleted file mode 100644
index 08b2172a..00000000
--- a/swamid-interfederations-2.0/idp.utmb.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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://idp.utmb.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">utmb.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas Medical Branch At Galveston</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>
-MIIEgzCCA2ugAwIBAgIJANpT3JDpg2sAMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
-VQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxEjAQBgNVBAcTCUdhbHZlc3RvbjENMAsG
-A1UEChMEVVRNQjELMAkGA1UECxMCSVMxFTATBgNVBAMTDGlkcC51dG1iLmVkdTEh
-MB8GCSqGSIb3DQEJARYSaXN0cy50ZWFtQFVUTUIuRURVMB4XDTEwMDYyMzE1MDAw
-MVoXDTIwMDYyMDE1MDAwMVowgYcxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIEwVUZXhh
-czESMBAGA1UEBxMJR2FsdmVzdG9uMQ0wCwYDVQQKEwRVVE1CMQswCQYDVQQLEwJJ
-UzEVMBMGA1UEAxMMaWRwLnV0bWIuZWR1MSEwHwYJKoZIhvcNAQkBFhJpc3RzLnRl
-YW1AVVRNQi5FRFUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDqcGqy
-Z96WU7De+R//87dPy0Hi58fX941yuNiaJqGibauz/TO8OcUjnv/tHqtk7gIrZGhS
-tmTh/nY1dTz3X3kwU1GBmWq1m/3cZCzOSLMkbjylwnLm2LixdAUD0aYi149If0VX
-+meAnUK9h7SdK7Vu3BQnHIlm1rlIpfqe1vhQeevHaEe7bAid960EZt88ZCN4nM9O
-/M9PDBy8nGHW0gm0w0WR5d8jPIxgfTTy+3RkmLnSIo6zJiPrMN3YLtdgnUlUs56+
-UuUNdQzyxzq50DA2WqwLerIMK3EkE3jOeluZtLu9ZxrI+66u0dx4BXwcB9+9Yngt
-yAoih4XKOyWCQSA7AgMBAAGjge8wgewwHQYDVR0OBBYEFApCLsGavPXicBMUCBGG
-qLpni1LHMIG8BgNVHSMEgbQwgbGAFApCLsGavPXicBMUCBGGqLpni1LHoYGNpIGK
-MIGHMQswCQYDVQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxEjAQBgNVBAcTCUdhbHZl
-c3RvbjENMAsGA1UEChMEVVRNQjELMAkGA1UECxMCSVMxFTATBgNVBAMTDGlkcC51
-dG1iLmVkdTEhMB8GCSqGSIb3DQEJARYSaXN0cy50ZWFtQFVUTUIuRURVggkA2lPc
-kOmDawAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAuTW0eEyS4sFr
-rF05MDv7a+OEbg2qG2LHdUIk7riOrQoDf8q9YdPidMqiKHh3f0sL4LW8W6dnUl+e
-fTWSrFTxw4eBbn2gkTxZzfJUV76l29cBtX2cuGIgUVfSMy+LmIzhYO/3G01mhdyG
-LPVw5PsWGtk7WnYnyClxiiXbEbX2fxxI6A1h3tlVrjk7VjQUwvAfq1Y2RmH+AjSW
-cTAu7jzTetIhQnFiIw76j0SgkpfWg6+Fl9I1VWWWL9ixp7cGsq/pAFbhPZDjEOS0
-wn0reWGZiHVNBL8acZaN2MDu9gf+HtJDqJzI/lrQ/KurWaxd4u5L07hPrKQI5y/w
-gTP3jZ4g8Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utmb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utmb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utmb.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utmb.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utmb.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utmb.edu/idp/profile/SAML2/POST-SimpleSign/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">utmb.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEgzCCA2ugAwIBAgIJANpT3JDpg2sAMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
-VQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxEjAQBgNVBAcTCUdhbHZlc3RvbjENMAsG
-A1UEChMEVVRNQjELMAkGA1UECxMCSVMxFTATBgNVBAMTDGlkcC51dG1iLmVkdTEh
-MB8GCSqGSIb3DQEJARYSaXN0cy50ZWFtQFVUTUIuRURVMB4XDTEwMDYyMzE1MDAw
-MVoXDTIwMDYyMDE1MDAwMVowgYcxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIEwVUZXhh
-czESMBAGA1UEBxMJR2FsdmVzdG9uMQ0wCwYDVQQKEwRVVE1CMQswCQYDVQQLEwJJ
-UzEVMBMGA1UEAxMMaWRwLnV0bWIuZWR1MSEwHwYJKoZIhvcNAQkBFhJpc3RzLnRl
-YW1AVVRNQi5FRFUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDqcGqy
-Z96WU7De+R//87dPy0Hi58fX941yuNiaJqGibauz/TO8OcUjnv/tHqtk7gIrZGhS
-tmTh/nY1dTz3X3kwU1GBmWq1m/3cZCzOSLMkbjylwnLm2LixdAUD0aYi149If0VX
-+meAnUK9h7SdK7Vu3BQnHIlm1rlIpfqe1vhQeevHaEe7bAid960EZt88ZCN4nM9O
-/M9PDBy8nGHW0gm0w0WR5d8jPIxgfTTy+3RkmLnSIo6zJiPrMN3YLtdgnUlUs56+
-UuUNdQzyxzq50DA2WqwLerIMK3EkE3jOeluZtLu9ZxrI+66u0dx4BXwcB9+9Yngt
-yAoih4XKOyWCQSA7AgMBAAGjge8wgewwHQYDVR0OBBYEFApCLsGavPXicBMUCBGG
-qLpni1LHMIG8BgNVHSMEgbQwgbGAFApCLsGavPXicBMUCBGGqLpni1LHoYGNpIGK
-MIGHMQswCQYDVQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxEjAQBgNVBAcTCUdhbHZl
-c3RvbjENMAsGA1UEChMEVVRNQjELMAkGA1UECxMCSVMxFTATBgNVBAMTDGlkcC51
-dG1iLmVkdTEhMB8GCSqGSIb3DQEJARYSaXN0cy50ZWFtQFVUTUIuRURVggkA2lPc
-kOmDawAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAuTW0eEyS4sFr
-rF05MDv7a+OEbg2qG2LHdUIk7riOrQoDf8q9YdPidMqiKHh3f0sL4LW8W6dnUl+e
-fTWSrFTxw4eBbn2gkTxZzfJUV76l29cBtX2cuGIgUVfSMy+LmIzhYO/3G01mhdyG
-LPVw5PsWGtk7WnYnyClxiiXbEbX2fxxI6A1h3tlVrjk7VjQUwvAfq1Y2RmH+AjSW
-cTAu7jzTetIhQnFiIw76j0SgkpfWg6+Fl9I1VWWWL9ixp7cGsq/pAFbhPZDjEOS0
-wn0reWGZiHVNBL8acZaN2MDu9gf+HtJDqJzI/lrQ/KurWaxd4u5L07hPrKQI5y/w
-gTP3jZ4g8Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utmb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utmb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas Medical Branch At Galveston</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas Medical Branch At Galveston</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utmb.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rich Thomas</md:GivenName>
-    <md:EmailAddress>rcthomas@utmb.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 bb8afb71..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.utorauth.utoronto.ca/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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.utorauth.utoronto.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utorauth.utoronto.ca/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utorauth.utoronto.ca/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">utoronto.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utorauth.utoronto.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Toronto</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Toronto</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utoronto.ca/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mike</md:GivenName>
-    <md:SurName>Wiseman</md:SurName>
-    <md:EmailAddress>mike.wiseman@utoronto.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md: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.utrgv.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utrgv.edu-idp-shibboleth.xml
deleted file mode 100644
index 0624ea87..00000000
--- a/swamid-interfederations-2.0/idp.utrgv.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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://idp.utrgv.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idm.utsystem.edu/error.html" 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">utrgv.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas Rio Grande Valley</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Logon service for The University of Texas Rio Grande Valley</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.utrgv.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.utsystem.edu/privacy.htm</mdui:PrivacyStatementURL>
-        <mdui:Logo height="75" width="75" xml:lang="en">https://idm.utsystem.edu/images/UTRGV_Logo_Sm.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>
-MIIDHzCCAgegAwIBAgIUV4KRu3uQlT3F0LReyxy3ECMvQWYwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLnV0cmd2LmVkdTAeFw0xNDA3MTAyMTU5MTZaFw0z
-NDA3MTAyMTU5MTZaMBgxFjAUBgNVBAMTDWlkcC51dHJndi5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCN7bZ2wGlD9gnX01EDwAXF/a3pNiecceYz
-CAHeEpcHVquCGdqf1FolWVp6rtH00FfqERRG3BvXy0O+zWBTr9qhzH1X6mh+PS4b
-L4koUrmWmGD3+YG5+H8aZkNo85dt37OgeY/wq656/CzvXBEX4ddLtogpa0/vrHIN
-cdaTWJVseYvZ2inOpXZGFIeTgg6Q5UMYowRLl1HmSb6pMxR7+sYjveBCftsIsWIe
-ZQl7JgDQif6QZz5HzRXq9LvqbR81t86p7674ayw+rQiRY+/2BFCxmIFsbuH3e/AG
-wmNvGmMfNUG9BUFyHYNOnVcqVYuyfCAYYMZo4Vr9tqnmYlYYDnvbAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC51dHJndi5lZHWGJGh0dHBzOi8vaWRwLnV0cmd2LmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUyyIIKGaqKdswBvRHs96YHu7eRq8w
-DQYJKoZIhvcNAQEFBQADggEBAGxgsydvkHEzhuGwayU9+AaqGNOZV8NZtrtjp9it
-xeXXfyJC5jrQeu+gJLHKDAlSFpCaJ7z9VAlrygjMBVdmTqUsX58G5W95emcSSi05
-pToy3vi7jaQHKDqIK0GyNwXkq2eVnbZsVUowHdxufN84y/89nO3e88eVrSqLDRqC
-fHYMEJ4zy83IB6ZTAp6tsETguG89BU2souTVtoft4lRprMqJljbkTmwW7GzACTuQ
-HwyOSUKc+ksNbpf4860E7NQrb4Rhm5GLsJIcrRO/Q0VoWZrsJmevbmoKsBzENjvn
-0BBEHvl2WwlajXWGBvNV45lHVqRi+ugWOxMCrqjvQcijAiI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utrgv.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utrgv.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utrgv.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utrgv.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utrgv.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utrgv.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utrgv.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utrgv.edu/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">utrgv.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUV4KRu3uQlT3F0LReyxy3ECMvQWYwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLnV0cmd2LmVkdTAeFw0xNDA3MTAyMTU5MTZaFw0z
-NDA3MTAyMTU5MTZaMBgxFjAUBgNVBAMTDWlkcC51dHJndi5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCN7bZ2wGlD9gnX01EDwAXF/a3pNiecceYz
-CAHeEpcHVquCGdqf1FolWVp6rtH00FfqERRG3BvXy0O+zWBTr9qhzH1X6mh+PS4b
-L4koUrmWmGD3+YG5+H8aZkNo85dt37OgeY/wq656/CzvXBEX4ddLtogpa0/vrHIN
-cdaTWJVseYvZ2inOpXZGFIeTgg6Q5UMYowRLl1HmSb6pMxR7+sYjveBCftsIsWIe
-ZQl7JgDQif6QZz5HzRXq9LvqbR81t86p7674ayw+rQiRY+/2BFCxmIFsbuH3e/AG
-wmNvGmMfNUG9BUFyHYNOnVcqVYuyfCAYYMZo4Vr9tqnmYlYYDnvbAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC51dHJndi5lZHWGJGh0dHBzOi8vaWRwLnV0cmd2LmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUyyIIKGaqKdswBvRHs96YHu7eRq8w
-DQYJKoZIhvcNAQEFBQADggEBAGxgsydvkHEzhuGwayU9+AaqGNOZV8NZtrtjp9it
-xeXXfyJC5jrQeu+gJLHKDAlSFpCaJ7z9VAlrygjMBVdmTqUsX58G5W95emcSSi05
-pToy3vi7jaQHKDqIK0GyNwXkq2eVnbZsVUowHdxufN84y/89nO3e88eVrSqLDRqC
-fHYMEJ4zy83IB6ZTAp6tsETguG89BU2souTVtoft4lRprMqJljbkTmwW7GzACTuQ
-HwyOSUKc+ksNbpf4860E7NQrb4Rhm5GLsJIcrRO/Q0VoWZrsJmevbmoKsBzENjvn
-0BBEHvl2WwlajXWGBvNV45lHVqRi+ugWOxMCrqjvQcijAiI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utrgv.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utrgv.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas Rio Grande Valley</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas Rio Grande Valley</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utrgv.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>William Ewing</md:GivenName>
-    <md:EmailAddress>bewing@utsystem.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>William Ewing</md:GivenName>
-    <md:EmailAddress>bewing@utsystem.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>William Ewing</md:GivenName>
-    <md:EmailAddress>bewing@utsystem.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utsystem.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utsystem.edu-idp-shibboleth.xml
deleted file mode 100644
index a5d28c7c..00000000
--- a/swamid-interfederations-2.0/idp.utsystem.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://idp.utsystem.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idm.utsystem.edu/error.html" 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">utsystem.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas System</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Logon service for The University of Texas System Administration</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.utsystem.edu/privacy.htm</mdui:PrivacyStatementURL>
-        <mdui:Logo height="75" width="75" xml:lang="en">https://idm.utsystem.edu/images/UTSystemSeal-Small.jpg</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>
-MIIDLDCCAhSgAwIBAgIVANsuFgw2Z5XryWlzufSAgriNo5pDMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcC51dHN5c3RlbS5lZHUwHhcNMDkwNjIwMjEyNzIy
-WhcNMjkwNjIwMjEyNzIyWjAbMRkwFwYDVQQDExBpZHAudXRzeXN0ZW0uZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiUJ9hGEJw0EIBIL2InLhCsZZ
-7maurudIUPt9NVQxPFHI7DwhTXwEjhYbTCnNYHS1JjEdnqzYLZitKfLYMkxPapVu
-fEDVBoLCnabRjKuOjLgIraYX5/rdvzgJPGAn7chL76ut5S3EuQNQ7LDD0KWR71qH
-y3TjZD3RXImFCRXvjLOlZR9+jVA1bKLzcafWUyHTv9wW8s/EyN+33ghOwRNzuH9W
-4ZUvUU2/22MYDlHwbCmwfvF8cYoHfk9WK+fgN+5BGGk+YJvjTAdek6tqeLPsFcR5
-cxvDwjyq00sZPb/xDRCTEgtx3StEYSEXqU1Z62/uHmlZ/oeFW21j59ls/CRp3wID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAudXRzeXN0ZW0uZWR1hidodHRwczovL2lk
-cC51dHN5c3RlbS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFErG8hS4tDz7
-5KwTs0pGvgb1DeR7MA0GCSqGSIb3DQEBBQUAA4IBAQAO4uo9SuOK3/uLJozn+W0L
-MymzQ6OLLZHuOX2lr/+2+I4YXzp8uqdwp8M7+GVlKDU+7JVEfFl+d7mtPrtThdYz
-aSjip2XjOQdaE/+vY/oD/G750YAZsxOsWQQKPZIC4LClHjLz2H36Wc8nuTKxZzV+
-FLOa1rOT3iYnL2rY+Mzqet3mwz/yoPq8M1/0J/HtvEWyhRkt7SBPnoNZbMt0y33H
-DbzkGdzI4NTA/flqEuAXBrjkg64qktKR7YTkFRWvy1pl44MqiVmP5nvZgVZZmRYg
-BaqXA+v1pIIo2tL8IuUiQxH1KsnDCXE/F74PcEu2CDCVKEgaVEB1v6tGFZwYr2V7
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utsystem.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utsystem.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utsystem.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utsystem.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.utsystem.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utsystem.edu/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">utsystem.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVANsuFgw2Z5XryWlzufSAgriNo5pDMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGlkcC51dHN5c3RlbS5lZHUwHhcNMDkwNjIwMjEyNzIy
-WhcNMjkwNjIwMjEyNzIyWjAbMRkwFwYDVQQDExBpZHAudXRzeXN0ZW0uZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiUJ9hGEJw0EIBIL2InLhCsZZ
-7maurudIUPt9NVQxPFHI7DwhTXwEjhYbTCnNYHS1JjEdnqzYLZitKfLYMkxPapVu
-fEDVBoLCnabRjKuOjLgIraYX5/rdvzgJPGAn7chL76ut5S3EuQNQ7LDD0KWR71qH
-y3TjZD3RXImFCRXvjLOlZR9+jVA1bKLzcafWUyHTv9wW8s/EyN+33ghOwRNzuH9W
-4ZUvUU2/22MYDlHwbCmwfvF8cYoHfk9WK+fgN+5BGGk+YJvjTAdek6tqeLPsFcR5
-cxvDwjyq00sZPb/xDRCTEgtx3StEYSEXqU1Z62/uHmlZ/oeFW21j59ls/CRp3wID
-AQABo2cwZTBEBgNVHREEPTA7ghBpZHAudXRzeXN0ZW0uZWR1hidodHRwczovL2lk
-cC51dHN5c3RlbS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFErG8hS4tDz7
-5KwTs0pGvgb1DeR7MA0GCSqGSIb3DQEBBQUAA4IBAQAO4uo9SuOK3/uLJozn+W0L
-MymzQ6OLLZHuOX2lr/+2+I4YXzp8uqdwp8M7+GVlKDU+7JVEfFl+d7mtPrtThdYz
-aSjip2XjOQdaE/+vY/oD/G750YAZsxOsWQQKPZIC4LClHjLz2H36Wc8nuTKxZzV+
-FLOa1rOT3iYnL2rY+Mzqet3mwz/yoPq8M1/0J/HtvEWyhRkt7SBPnoNZbMt0y33H
-DbzkGdzI4NTA/flqEuAXBrjkg64qktKR7YTkFRWvy1pl44MqiVmP5nvZgVZZmRYg
-BaqXA+v1pIIo2tL8IuUiQxH1KsnDCXE/F74PcEu2CDCVKEgaVEB1v6tGFZwYr2V7
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utsystem.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utsystem.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas System</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas System</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utsystem.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Network Admin</md:GivenName>
-    <md:EmailAddress>netadmin@utsystem.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Paul Caskey</md:GivenName>
-    <md:EmailAddress>pcaskey@utsystem.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Help Desk</md:GivenName>
-    <md:EmailAddress>help@utsystem.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uttyler.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uttyler.edu-idp-shibboleth.xml
deleted file mode 100644
index 704a867f..00000000
--- a/swamid-interfederations-2.0/idp.uttyler.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://idp.uttyler.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uttyler.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas At Tyler</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Single Signon Service at The University of Texas at Tyler</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.uttyler.edu/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="45" width="63" xml:lang="en">https://idp.uttyler.edu/images/utt-logo.gif</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>
-MIIDKDCCAhCgAwIBAgIVAOpfnxqWfUWwtPv2ziaZ442AjjmsMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC51dHR5bGVyLmVkdTAeFw0xMDA0MTUyMDU3NDNa
-Fw0zMDA0MTUyMDU3NDNaMBoxGDAWBgNVBAMTD2lkcC51dHR5bGVyLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMomvGbLSrG+K7edLO8f6J4DvHd9
-Nov48swblPvF62GATn1735now81aMjk3r5un0xUGSy8leUsoZfdf5n6mUC9FUeri
-nvPpQk1IKNWQFNtp1ytsyGdNU9OMi8zmA64deVp47lxpgPUZkReFT9wq4LX3bSni
-Mb7x15NhaEnFfdAlJsnhfzNBdtz+RN72s5+ZySy8ICC4KHgFGrr7QKMREVMaWsaZ
-28Thb6UeOY+GBcMqY9WyAwfWAc1+19rNJyCZT9GuQr0YUOxv3bpR302Zxm2w+7bA
-Q70r2yA0uiFxLwO8tt+4ynkKXajdAtEPTADnScYGCizU34Y3PoaO1gGzky8CAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLnV0dHlsZXIuZWR1hiZodHRwczovL2lkcC51
-dHR5bGVyLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVWPBUi9jdIsM9VXZ
-cWzcPTz+dAEwDQYJKoZIhvcNAQEFBQADggEBAK7mAKIlWZQGGQTNV1UHXkeIarKc
-nSI6gQf9jmJEuHR+w9SHG5Z0HvAflzNlDTS374P/pZc2qcdz1hvx6TIb2h86GNCd
-WtF29eqrNieq3HTwM5N+zL4pIeVNR34zPNfo7+C/fYzSgPv5FeYNfu/CGZhOsH+g
-6NQ1opMz0ZiUVMQsrjjoxSntFuTrFvFyEuyGEI0uOJMzd27PtZUldp5FZAgN9IF8
-WEZoQCmdWaTQAmqzpHBokozccqLcD2+Hsa94Pa3+nYVeaCBGmXz3MK5ZHZnz8M7s
-RB4HWzgZih8IU3YLXsJ8IC6GU+UbJ3kj4kUG15mhFlI7j8b/VjZnp6akccM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uttyler.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uttyler.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uttyler.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uttyler.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uttyler.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uttyler.edu/idp/profile/SAML2/POST-SimpleSign/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">uttyler.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAOpfnxqWfUWwtPv2ziaZ442AjjmsMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC51dHR5bGVyLmVkdTAeFw0xMDA0MTUyMDU3NDNa
-Fw0zMDA0MTUyMDU3NDNaMBoxGDAWBgNVBAMTD2lkcC51dHR5bGVyLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMomvGbLSrG+K7edLO8f6J4DvHd9
-Nov48swblPvF62GATn1735now81aMjk3r5un0xUGSy8leUsoZfdf5n6mUC9FUeri
-nvPpQk1IKNWQFNtp1ytsyGdNU9OMi8zmA64deVp47lxpgPUZkReFT9wq4LX3bSni
-Mb7x15NhaEnFfdAlJsnhfzNBdtz+RN72s5+ZySy8ICC4KHgFGrr7QKMREVMaWsaZ
-28Thb6UeOY+GBcMqY9WyAwfWAc1+19rNJyCZT9GuQr0YUOxv3bpR302Zxm2w+7bA
-Q70r2yA0uiFxLwO8tt+4ynkKXajdAtEPTADnScYGCizU34Y3PoaO1gGzky8CAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLnV0dHlsZXIuZWR1hiZodHRwczovL2lkcC51
-dHR5bGVyLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVWPBUi9jdIsM9VXZ
-cWzcPTz+dAEwDQYJKoZIhvcNAQEFBQADggEBAK7mAKIlWZQGGQTNV1UHXkeIarKc
-nSI6gQf9jmJEuHR+w9SHG5Z0HvAflzNlDTS374P/pZc2qcdz1hvx6TIb2h86GNCd
-WtF29eqrNieq3HTwM5N+zL4pIeVNR34zPNfo7+C/fYzSgPv5FeYNfu/CGZhOsH+g
-6NQ1opMz0ZiUVMQsrjjoxSntFuTrFvFyEuyGEI0uOJMzd27PtZUldp5FZAgN9IF8
-WEZoQCmdWaTQAmqzpHBokozccqLcD2+Hsa94Pa3+nYVeaCBGmXz3MK5ZHZnz8M7s
-RB4HWzgZih8IU3YLXsJ8IC6GU+UbJ3kj4kUG15mhFlI7j8b/VjZnp6akccM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uttyler.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uttyler.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas At Tyler</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas At Tyler</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uttyler.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UT Tyler IT Support</md:GivenName>
-    <md:EmailAddress>itsupport@uttyler.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.utulsa.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.utulsa.edu-idp-shibboleth.xml
deleted file mode 100644
index a6c1d5a4..00000000
--- a/swamid-interfederations-2.0/idp.utulsa.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +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://idp.utulsa.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://errror.utulsa.edu/shiberror.php" 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">utulsa.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Tulsa</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>
-MIIDJDCCAgygAwIBAgIVAPETSHdVBddiUfH4XU1QHq66RnYFMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51dHVsc2EuZWR1MB4XDTA4MDQyNTE5NDczMFoX
-DTI4MDQyNTE5NDczMFowGTEXMBUGA1UEAxMOaWRwLnV0dWxzYS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUKjm3UOGqb/XN68VPJAgmkFWnWf9h
-pnzoPXXySxCz35RMglLM75CVW1ywVZ3jXSP8bWJZszs98U5Bux/a2qGvT3ed/8BC
-863nqHBqLNwiheQypWv0x5R4J+PCdyrkFtsRn2KZgoQDlKn5m2YfYyTXM6X/HlIK
-RUW+MITzcI5BcyUhzP35A6Qn1aDzJlkG/V9Pt+5XQD1dY2H8Yk7OR4W62yOzZM8j
-nBWmXJI9kgtRgL2QAt8TY67JdFU7BkA7YIJyeqUK7fHZiiBIZhIUUZD6XMK8T4og
-3L7DCscJ+u6gHf3OHToDNVV6T/TBqRMvKp8fz3vEyB9D++VyIXJWABZRAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51dHVsc2EuZWR1hiVodHRwczovL2lkcC51dHVs
-c2EuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQrgw0aUl7dUN/9uPPa2VTR
-KRkgyjANBgkqhkiG9w0BAQUFAAOCAQEABmI+tK+7rjabbHX6t/YKKnLA8+foVBZ+
-lxBuA6zVOEncm++U+uSp8eBV9DtYD6ijOS/Z57hF4BVzSKOepUr8oQumfIgYdrYf
-RlEwY+arGnZwHyJRijXw7SfHHPxOVpWW97erlfWiHCqbzVmKFMcGZuojsiJLM/pf
-u1Bbjw70nFF2AT5X6TBSNgfKNPUkI9qoNeSKin8YdAfcVIGLaj2MXHcyUub3nwJh
-UPH7vTDTXUCgoSAnXDXgEw/2ty4gN/l29qwVl4XqZ9idbFdcH4i70LJQjdekC3CY
-hiXKVILgWJYPDUw4K1gedb5r17APna++AIb37J+mtSJ1KesPn3K45g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utulsa.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utulsa.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utulsa.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utulsa.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utulsa.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utulsa.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAPETSHdVBddiUfH4XU1QHq66RnYFMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC51dHVsc2EuZWR1MB4XDTA4MDQyNTE5NDczMFoX
-DTI4MDQyNTE5NDczMFowGTEXMBUGA1UEAxMOaWRwLnV0dWxzYS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUKjm3UOGqb/XN68VPJAgmkFWnWf9h
-pnzoPXXySxCz35RMglLM75CVW1ywVZ3jXSP8bWJZszs98U5Bux/a2qGvT3ed/8BC
-863nqHBqLNwiheQypWv0x5R4J+PCdyrkFtsRn2KZgoQDlKn5m2YfYyTXM6X/HlIK
-RUW+MITzcI5BcyUhzP35A6Qn1aDzJlkG/V9Pt+5XQD1dY2H8Yk7OR4W62yOzZM8j
-nBWmXJI9kgtRgL2QAt8TY67JdFU7BkA7YIJyeqUK7fHZiiBIZhIUUZD6XMK8T4og
-3L7DCscJ+u6gHf3OHToDNVV6T/TBqRMvKp8fz3vEyB9D++VyIXJWABZRAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC51dHVsc2EuZWR1hiVodHRwczovL2lkcC51dHVs
-c2EuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQrgw0aUl7dUN/9uPPa2VTR
-KRkgyjANBgkqhkiG9w0BAQUFAAOCAQEABmI+tK+7rjabbHX6t/YKKnLA8+foVBZ+
-lxBuA6zVOEncm++U+uSp8eBV9DtYD6ijOS/Z57hF4BVzSKOepUr8oQumfIgYdrYf
-RlEwY+arGnZwHyJRijXw7SfHHPxOVpWW97erlfWiHCqbzVmKFMcGZuojsiJLM/pf
-u1Bbjw70nFF2AT5X6TBSNgfKNPUkI9qoNeSKin8YdAfcVIGLaj2MXHcyUub3nwJh
-UPH7vTDTXUCgoSAnXDXgEw/2ty4gN/l29qwVl4XqZ9idbFdcH4i70LJQjdekC3CY
-hiXKVILgWJYPDUw4K1gedb5r17APna++AIb37J+mtSJ1KesPn3K45g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.utulsa.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Tulsa</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Tulsa</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utulsa.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>University of Tulsa Web Services</md:GivenName>
-    <md:EmailAddress>cloud-services@utulsa.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uvm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uvm.edu-idp-shibboleth.xml
deleted file mode 100644
index 366dcc3d..00000000
--- a/swamid-interfederations-2.0/idp.uvm.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,192 +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://idp.uvm.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.uvm.edu/idp/error.jsp" 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">uvm.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Vermont</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Vermont Identity Provider</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.uvm.edu/it/account/?Page=sso.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp.uvm.edu/idp/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="31" width="290" xml:lang="en">https://www.uvm.edu/www/images/templates/uvmlogo-words.gif</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>
-MIIFUjCCBDqgAwIBAgIRAJpLcZsSJzmf55NyB+1EceUwDQYJKoZIhvcNAQEFBQAw
-UTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5D
-b21tb24xGzAZBgNVBAMTEkluQ29tbW9uIFNlcnZlciBDQTAeFw0xMzExMjUwMDAw
-MDBaFw0xNTExMjUyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEOMAwGA1UEERMFMDU0
-MDUxCzAJBgNVBAgTAlZUMRMwEQYDVQQHEwpCdXJsaW5ndG9uMSEwHwYDVQQJExg4
-NSBTb3V0aCBQcm9zcGVjdCBTdHJlZXQxHjAcBgNVBAoTFVVuaXZlcnNpdHkgb2Yg
-VmVybW9udDEnMCUGA1UECxMeRW50ZXJwcmlzZSBUZWNobm9sb2d5IFNlcnZpY2Vz
-MRQwEgYDVQQDEwtpZHAudXZtLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAO02BTdgJYJ1umJvRaLGVmBBa3nOV9uSyKov+zeZZfH1IqfhOgqT+mDk
-AVKfbTNh0qF/S0IweZIBiGkPue1+YPz0DnV3g95RzV5rrJ/p6Poc+LGnobWn4vvC
-PQr73mfhNZowPwAM9VJP1290ALpi3ln4ASCarIZag5ovkn8mAB8/8K6yNK+7X3Pu
-WHkchTVFEXzmZp2DTVgCEcJFyZf9kiGeHt1+Sn1KcgpkhXT6crYklFQC/nvjA3oo
-Ju6O+GoAQF9lt4zaZONm55SUUlS/avuxfZSJt83FWf0NILiuq4pKaNDAf/9o7sgB
-8anDRO29C0goFSQJmSVhhtU3bG35qA8CAwEAAaOCAbIwggGuMB8GA1UdIwQYMBaA
-FEhPWvovSppe4FDza3tVpd71vjRdMB0GA1UdDgQWBBTKmnxvf209+AM7+jdbzdzR
-eSv3IDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEwQjBA
-BggrBgEFBQcCARY0aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVwb3Np
-dG9yeS9jcHNfc3NsLnBkZjAIBgZngQwBAgIwPQYDVR0fBDYwNDAyoDCgLoYsaHR0
-cDovL2NybC5pbmNvbW1vbi5vcmcvSW5Db21tb25TZXJ2ZXJDQS5jcmwwbwYIKwYB
-BQUHAQEEYzBhMDkGCCsGAQUFBzAChi1odHRwOi8vY2VydC5pbmNvbW1vbi5vcmcv
-SW5Db21tb25TZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmlu
-Y29tbW9uLm9yZzAWBgNVHREEDzANggtpZHAudXZtLmVkdTANBgkqhkiG9w0BAQUF
-AAOCAQEAIDDbRJaVlbIHelz9+g25LuMR4c88NkEU+AU7lOSwqQOQV3YwMMJBYJLg
-7eXYlB9NFDnwG0V69HAwopAwWt5TdJt4PJSo+xLeiviiAispFySDranhfI94qDC8
-Jf8l1gUVUDL+B3cEWnQklx68H1lfSLN94GB5bD7xt+39EecYwFnzs+RpO4M1oO7L
-HxjbXfPhY5K37DkkhMHiK9+jCRTYbj/eADvpVU4ejP3xSYInk0066P9msJ3gRkkH
-kk33CouamgWP4Pee76HO+VGW0xIz/yMZJXiTeKosuKskZCUBvJwToIm1iuIOG2jP
-qjXzgEnZ8+QfHnA0xxrbXh07lwGqag==
-          </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>
-MIIEMzCCAxugAwIBAgIJAOuLhHtr2WBAMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-VQQGEwJVUzEQMA4GA1UECAwHVmVybW9udDETMBEGA1UEBwwKQnVybGluZ3RvbjEe
-MBwGA1UECgwVVW5pdmVyc2l0eSBvZiBWZXJtb250MScwJQYDVQQLDB5FbnRlcnBy
-aXNlIFRlY2hub2xvZ3kgU2VydmljZXMxFDASBgNVBAMMC2lkcC51dm0uZWR1MRow
-GAYJKoZIhvcNAQkBFgtzYWFAdXZtLmVkdTAeFw0xNDA0MDgxNzEzMjJaFw0yNjA0
-MDUxNzEzMjJaMIGvMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHVmVybW9udDETMBEG
-A1UEBwwKQnVybGluZ3RvbjEeMBwGA1UECgwVVW5pdmVyc2l0eSBvZiBWZXJtb250
-MScwJQYDVQQLDB5FbnRlcnByaXNlIFRlY2hub2xvZ3kgU2VydmljZXMxFDASBgNV
-BAMMC2lkcC51dm0uZWR1MRowGAYJKoZIhvcNAQkBFgtzYWFAdXZtLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJt7xhhCKcVL2j8XvJXe33vkuSji
-dZVzviuW2c7TAHWaHNe9fxc5N6ssYj+ROUJSlWlOgfofOTxQRu4sJGZKDty0Dbik
-XtcjNChZd3pIt8AVhNjWadgIfx7gP8IoA9N7X5QkWS7iZuuyGVR0yTnNdCb4FJL3
-QUU+ajrZMQ+27BXnHYun+GkWuu3+tajU36bMAnqjTdj7NFwmsfWeIzshgraSwkwJ
-jhfel2HtdfpeLK6qHSQvU6FeRzbSPx2xedU2VSUq49vZigyEw2Fa9Zw8SCJfhlo5
-nzJuPVTNE0XMkk5dnoqadRsCn0KCpBwHHGi35nGITyYBGCEQWo/ve0lY1qcCAwEA
-AaNQME4wHQYDVR0OBBYEFPVdAz1F17jrlRRBzlL80HN4XVXsMB8GA1UdIwQYMBaA
-FPVdAz1F17jrlRRBzlL80HN4XVXsMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-BQADggEBADhXfpByGRv/2I2BjVm2pIPthi38K7oeZ26cr76wDkFVxcJMqJwX5hbo
-eAeFD33dg+O2fQREMDifBnjzhXyLywRAVZUpuw1eKG3UVpPTW28nHFcz0gPBbwSv
-J2zmELg+J411jdPmewl/FHvHJ2tktWAA25i6uX3g0Nxh58o3EcYZZXiSE5Y6695k
-BC/BRuiGNnpU9qPLNakDDngWHtT9n3Vik5yU8hIdjqFr54D/+Cuu7igmZ3Rw+SJ2
-vjh8uRVZP56GSzxu2j+8GR5XnCegIroPqrHp+E57CW5BcJf4EGXoDWX8P6DD8Nys
-D82TCdiNkm20wl1h/lwK1Vs+qR1fbEc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uvm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uvm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uvm.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uvm.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uvm.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uvm.edu/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">uvm.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFUjCCBDqgAwIBAgIRAJpLcZsSJzmf55NyB+1EceUwDQYJKoZIhvcNAQEFBQAw
-UTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5D
-b21tb24xGzAZBgNVBAMTEkluQ29tbW9uIFNlcnZlciBDQTAeFw0xMzExMjUwMDAw
-MDBaFw0xNTExMjUyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEOMAwGA1UEERMFMDU0
-MDUxCzAJBgNVBAgTAlZUMRMwEQYDVQQHEwpCdXJsaW5ndG9uMSEwHwYDVQQJExg4
-NSBTb3V0aCBQcm9zcGVjdCBTdHJlZXQxHjAcBgNVBAoTFVVuaXZlcnNpdHkgb2Yg
-VmVybW9udDEnMCUGA1UECxMeRW50ZXJwcmlzZSBUZWNobm9sb2d5IFNlcnZpY2Vz
-MRQwEgYDVQQDEwtpZHAudXZtLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAO02BTdgJYJ1umJvRaLGVmBBa3nOV9uSyKov+zeZZfH1IqfhOgqT+mDk
-AVKfbTNh0qF/S0IweZIBiGkPue1+YPz0DnV3g95RzV5rrJ/p6Poc+LGnobWn4vvC
-PQr73mfhNZowPwAM9VJP1290ALpi3ln4ASCarIZag5ovkn8mAB8/8K6yNK+7X3Pu
-WHkchTVFEXzmZp2DTVgCEcJFyZf9kiGeHt1+Sn1KcgpkhXT6crYklFQC/nvjA3oo
-Ju6O+GoAQF9lt4zaZONm55SUUlS/avuxfZSJt83FWf0NILiuq4pKaNDAf/9o7sgB
-8anDRO29C0goFSQJmSVhhtU3bG35qA8CAwEAAaOCAbIwggGuMB8GA1UdIwQYMBaA
-FEhPWvovSppe4FDza3tVpd71vjRdMB0GA1UdDgQWBBTKmnxvf209+AM7+jdbzdzR
-eSv3IDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEwQjBA
-BggrBgEFBQcCARY0aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVwb3Np
-dG9yeS9jcHNfc3NsLnBkZjAIBgZngQwBAgIwPQYDVR0fBDYwNDAyoDCgLoYsaHR0
-cDovL2NybC5pbmNvbW1vbi5vcmcvSW5Db21tb25TZXJ2ZXJDQS5jcmwwbwYIKwYB
-BQUHAQEEYzBhMDkGCCsGAQUFBzAChi1odHRwOi8vY2VydC5pbmNvbW1vbi5vcmcv
-SW5Db21tb25TZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmlu
-Y29tbW9uLm9yZzAWBgNVHREEDzANggtpZHAudXZtLmVkdTANBgkqhkiG9w0BAQUF
-AAOCAQEAIDDbRJaVlbIHelz9+g25LuMR4c88NkEU+AU7lOSwqQOQV3YwMMJBYJLg
-7eXYlB9NFDnwG0V69HAwopAwWt5TdJt4PJSo+xLeiviiAispFySDranhfI94qDC8
-Jf8l1gUVUDL+B3cEWnQklx68H1lfSLN94GB5bD7xt+39EecYwFnzs+RpO4M1oO7L
-HxjbXfPhY5K37DkkhMHiK9+jCRTYbj/eADvpVU4ejP3xSYInk0066P9msJ3gRkkH
-kk33CouamgWP4Pee76HO+VGW0xIz/yMZJXiTeKosuKskZCUBvJwToIm1iuIOG2jP
-qjXzgEnZ8+QfHnA0xxrbXh07lwGqag==
-          </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>
-MIIEMzCCAxugAwIBAgIJAOuLhHtr2WBAMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-VQQGEwJVUzEQMA4GA1UECAwHVmVybW9udDETMBEGA1UEBwwKQnVybGluZ3RvbjEe
-MBwGA1UECgwVVW5pdmVyc2l0eSBvZiBWZXJtb250MScwJQYDVQQLDB5FbnRlcnBy
-aXNlIFRlY2hub2xvZ3kgU2VydmljZXMxFDASBgNVBAMMC2lkcC51dm0uZWR1MRow
-GAYJKoZIhvcNAQkBFgtzYWFAdXZtLmVkdTAeFw0xNDA0MDgxNzEzMjJaFw0yNjA0
-MDUxNzEzMjJaMIGvMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHVmVybW9udDETMBEG
-A1UEBwwKQnVybGluZ3RvbjEeMBwGA1UECgwVVW5pdmVyc2l0eSBvZiBWZXJtb250
-MScwJQYDVQQLDB5FbnRlcnByaXNlIFRlY2hub2xvZ3kgU2VydmljZXMxFDASBgNV
-BAMMC2lkcC51dm0uZWR1MRowGAYJKoZIhvcNAQkBFgtzYWFAdXZtLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJt7xhhCKcVL2j8XvJXe33vkuSji
-dZVzviuW2c7TAHWaHNe9fxc5N6ssYj+ROUJSlWlOgfofOTxQRu4sJGZKDty0Dbik
-XtcjNChZd3pIt8AVhNjWadgIfx7gP8IoA9N7X5QkWS7iZuuyGVR0yTnNdCb4FJL3
-QUU+ajrZMQ+27BXnHYun+GkWuu3+tajU36bMAnqjTdj7NFwmsfWeIzshgraSwkwJ
-jhfel2HtdfpeLK6qHSQvU6FeRzbSPx2xedU2VSUq49vZigyEw2Fa9Zw8SCJfhlo5
-nzJuPVTNE0XMkk5dnoqadRsCn0KCpBwHHGi35nGITyYBGCEQWo/ve0lY1qcCAwEA
-AaNQME4wHQYDVR0OBBYEFPVdAz1F17jrlRRBzlL80HN4XVXsMB8GA1UdIwQYMBaA
-FPVdAz1F17jrlRRBzlL80HN4XVXsMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-BQADggEBADhXfpByGRv/2I2BjVm2pIPthi38K7oeZ26cr76wDkFVxcJMqJwX5hbo
-eAeFD33dg+O2fQREMDifBnjzhXyLywRAVZUpuw1eKG3UVpPTW28nHFcz0gPBbwSv
-J2zmELg+J411jdPmewl/FHvHJ2tktWAA25i6uX3g0Nxh58o3EcYZZXiSE5Y6695k
-BC/BRuiGNnpU9qPLNakDDngWHtT9n3Vik5yU8hIdjqFr54D/+Cuu7igmZ3Rw+SJ2
-vjh8uRVZP56GSzxu2j+8GR5XnCegIroPqrHp+E57CW5BcJf4EGXoDWX8P6DD8Nys
-D82TCdiNkm20wl1h/lwK1Vs+qR1fbEc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uvm.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uvm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Vermont</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Vermont</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uvm.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Systems Architecture and Administration</md:GivenName>
-    <md:EmailAddress>saa@uvm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Security Officer</md:GivenName>
-    <md:EmailAddress>security@uvm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpline</md:GivenName>
-    <md:EmailAddress>helpline@uvm.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uwex.uwc.edu-idp.xml b/swamid-interfederations-2.0/idp.uwex.uwc.edu-idp.xml
deleted file mode 100644
index 6ec3afa8..00000000
--- a/swamid-interfederations-2.0/idp.uwex.uwc.edu-idp.xml
+++ /dev/null
@@ -1,63 +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://idp.uwex.uwc.edu/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">uwc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Wisconsin Colleges and Extension</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://cits.uwex.uwc.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://cits.uwex.uwc.edu/sites/default/files/PDF/incommonpop_agreement.pdf</mdui:PrivacyStatementURL>
-        <mdui:Logo height="159" width="242" xml:lang="en">https://idp.uwex.uwc.edu/idp/images/logo.gif</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>
-MIIDKzCCAhOgAwIBAgIUaSTC1u9MCHlT0+UC6qbFziz5GmwwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQaWRwLnV3ZXgudXdjLmVkdTAeFw0xMzAxMjIxODE4NTVa
-Fw0zMzAxMjIxODE4NTVaMBsxGTAXBgNVBAMTEGlkcC51d2V4LnV3Yy5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSXizqGE5pxjyDl8ah+6F8FvmK
-SjHTYc0CjuFUB7+/wWjrRw1JlXMoBJUhu0Rb67xPxQ/Paqdt9F9zR2PG88GThoEC
-N2DMHEfiT7AhkiwgUOscuS7fclIDxVkwzXGDrB2/bpSe6DQFW38gf1LKmIJwo8Tu
-enhB7yzdUn+dJ91Q1ChBrWvaZFtQ0kPxykFMpJfLNEza7b0b1HvH1AwtItAfvnrm
-CD950mrgaemN07jVeKo67wC7goqsvDRq9dTTjE3PDNWFk5FhMHcKZ1MBgQ/AiGYi
-QA3XEXjlTXjknbsQORygLCOFe/m2ypts5w9dAcelvQiA6W8/N6zI3fmj+kSFAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEGlkcC51d2V4LnV3Yy5lZHWGJ2h0dHBzOi8vaWRw
-LnV3ZXgudXdjLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUdsoCKXq3hPJ9
-lYLVyJpAtahpxTAwDQYJKoZIhvcNAQEFBQADggEBAGpaE2/6cE/mCNdXWa6DTm7F
-1eX0BZ4zK6eaXjtTPoAstTsgPPB8SmaMVBMp+ZIdY7/mWY6zqgI9uPQl0FfguayE
-NsSrQsyq0+BwVl0GGZxDJ+pC96i6XV0s/ZUSFoS8v/zMGfmafyOK9D7+qIvGizfL
-iG8Yh/bzG1MBkzctsrpcSoBF5WxMyTSCzWaI05Fmo0Ddx1w0OOQu1dAQHG6si9rV
-rotmP2+77xWdS+MWt3CQZ/br9EsSlQ3kduNN0s9Ltr96ZVnV/PnJ21PV5ZAw4prH
-9eNuPFDEg9TriQI17DLjIceNb0IO12okvNGZ/wjr1nuW75LEX6xE2rOAXn6v3kE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwex.uwc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uwex.uwc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwex.uwc.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wisconsin Colleges and Extension</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin Colleges and Extension</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwex.uwc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jeff Matthias</md:GivenName>
-    <md:EmailAddress>Jeff.Matthias@uwex.uwc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jeff Harrison</md:GivenName>
-    <md:EmailAddress>Jeff.Harrison@uwex.uwc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uwf.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uwf.edu-idp-shibboleth.xml
deleted file mode 100644
index 454a160f..00000000
--- a/swamid-interfederations-2.0/idp.uwf.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,72 +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://idp.uwf.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">uwf.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of West Florida</mdui:DisplayName>
-        <mdui:PrivacyStatementURL xml:lang="en">http://uwf.edu/offices/general-counsel/uwf-policies-procedures-notices-regulations/privacy-statement</mdui:PrivacyStatementURL>
-        <mdui:Logo height="68" width="260" xml:lang="en">https://idp.uwf.edu/idp/images/logo_west_florida.jpg</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>
-MIIDGDCCAgCgAwIBAgIVAPWEoMIc9MgjL3fLMSOKivnmI4soMA0GCSqGSIb3DQEB
-CwUAMBYxFDASBgNVBAMMC2lkcC51d2YuZWR1MB4XDTE1MTAwODEyMzc1OVoXDTM1
-MTAwODEyMzc1OVowFjEUMBIGA1UEAwwLaWRwLnV3Zi5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCIBUPbpiv3h2s2JEUUxdfxMFYvu5lvoPdggHb9
-BhWT53BgJVV7cH1XcrtWn/7/NwMGOYGLzMzvpMJOCXUatVpJybhtM9sffy6hjjKS
-3+vAKFEAI38vfTdoZoM17UEM+22Y1Bim4AkdyCdSLMLDNH2edt7WocgB1gnandJI
-aKWP/ZI3Fu+4KA5GTbGsd3DJsJIV3NeHuGIUhRCaDPbR08Hc7u7RopgmmohV0tOp
-4NvWhbqy5c2M50cg4h+PAhesyk3id3P/ZZ+5e2PLxBB2kGuHK2qrs1+OI6rzwNE6
-8R0Ij9BUiDSeY6L0ST5p1kA//t22UZOFlE4DwNFi9mz3E85/AgMBAAGjXTBbMB0G
-A1UdDgQWBBScj7YiheZwUBxNvWg6KUtfw37yGTA6BgNVHREEMzAxggtpZHAudXdm
-LmVkdYYiaHR0cHM6Ly9pZHAudXdmLmVkdS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEAQWq+qgyNF5aIMd72d4l2EFvVo0MS0y60OhqbFFMh1zAodjgG
-j2S1bDSkagWZnkReopf5vt+7/oUeaav0b1bR5/C/cn3y4j2VgMMVNolCVMDuGhJu
-KMDFH3A9LmFUxiI/EBehP2miYOGxo8cg3cfxR4LvveJPuwl0lEzpOHa7ITNcuY4i
-NkrSXk8BPkxKbOfkPY/03cxGCVAbDDtAFbrpc+Dl7oWzZyWEPGBOPO1+FwOnouhg
-gwO2WaSZ5oSRh89lFWWjxnXcLM0qysDrlr7ZypdE4sa0l49XmWSHIUqmlB4N6v1R
-Qn1Arbqr1KlWplK7ZKwCVb3qIEuvCtarRGT3ow==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwf.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwf.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of West Florida</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of West Florida</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://uwf.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Melanie Haveard</md:GivenName>
-    <md:EmailAddress>mhaveard@uwf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Geissler Golding</md:GivenName>
-    <md:EmailAddress>ggolding@uwf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Justin Andrews</md:GivenName>
-    <md:EmailAddress>jandrews@uwf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UWF ITS Helpdesk</md:GivenName>
-    <md:EmailAddress>helpdesk@uwf.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uwic.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uwic.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 5b330cdc..00000000
--- a/swamid-interfederations-2.0/idp.uwic.ac.uk-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.uwic.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Cardiff Metropolitan University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">uwic.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cardiff Metropolitan University - Legacy</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://idplogos.uwic.ac.uk/uwic-logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idplogos.uwic.ac.uk/icon1.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIETjCCAzagAwIBAgIJAOKMQIaI+YwZMA0GCSqGSIb3DQEBBQUAMIGnMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECBMPU291dGggR2xhbW9yZ2FuMRAwDgYDVQQHEwdDYXJk
-						aWZmMSgwJgYDVQQKEx9DYXJkaWZmIE1ldHJvcG9saXRhbiBVbml2ZXJzaXR5MSkw
-						JwYDVQQLEyBMaWJyYXJ5IGFuZCBJbmZvcm1hdGlvbiBTZXJ2aWNlczEXMBUGA1UE
-						AxMOaWRwLnV3aWMuYWMudWswHhcNMTMwMzEzMTEzMjMxWhcNMjMwMzExMTEzMjMx
-						WjCBpzELMAkGA1UEBhMCR0IxGDAWBgNVBAgTD1NvdXRoIEdsYW1vcmdhbjEQMA4G
-						A1UEBxMHQ2FyZGlmZjEoMCYGA1UEChMfQ2FyZGlmZiBNZXRyb3BvbGl0YW4gVW5p
-						dmVyc2l0eTEpMCcGA1UECxMgTGlicmFyeSBhbmQgSW5mb3JtYXRpb24gU2Vydmlj
-						ZXMxFzAVBgNVBAMTDmlkcC51d2ljLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA0lIdNY81HsvrJSjLbnbyFJFGZ++JKTC4Xowt0lsxRTRcjo7u
-						Jm06LkkZdVMpbU/ILkfup83H+P+uBXLQCLE7QyYrE5r6HC4B4cVRi8NdCbA/IzAn
-						djlvtu9jQ8y/zvLZ7ipsRT4yluN8taxdQ6YfPjJ7xFFcIpecjWaEjJTpACxUg0wp
-						b73CykEmgrJ9KEYmp5CndF1WxlEBBoH+ZakmQaG7EtD+0jMOc0oMn1z001aTcLe0
-						ArWKnv+ig/b3r24EVA8qecW6lEDwM5HDiWl4DrwCCeOeg0UvSZPuySkRerI6QAYP
-						6E7DXmoc9obOfu6/iA5Q5Wdbk4Mjne9uaPf1pwIDAQABo3sweTAJBgNVHRMEAjAA
-						MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
-						BgNVHQ4EFgQUBc6fEv98zv3jMeehNHHh5UhAriQwHwYDVR0jBBgwFoAUBc6fEv98
-						zv3jMeehNHHh5UhAriQwDQYJKoZIhvcNAQEFBQADggEBAAmdsLMlPUMY6QFglDkG
-						1wzwf6Be9vuY90/CR4JK2CfnXVOVxEEuAGS2plhvCe/+yq4IGOpLUo2Jf9ev4H5p
-						zT0hbTjM5WJVOWr9i0WSRdc3hLAF0ObrSPG7bk6toXDdyRa+KqVefW14cuuqbphd
-						YgsYLEshlegwM91bwEl9MVFeRU/ofGbEznPAyKuEeLdevIr4pPMwsUZ8PEwj2VhG
-						+8CsO5d/kwKQy/A31pr4fEO/gCXQ45kHnxajkh2+kA8e1n0iJ90vrS/PCM5UgmtT
-						zvZdBEn8RzielQU2UWjysX1qqiXpbkUnY1ji/piMZMRYCQFLcV7G0yPV6/7GF+EU
-						FWI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwic.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwic.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.uwic.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwic.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uwic.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwic.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">uwic.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIETjCCAzagAwIBAgIJAOKMQIaI+YwZMA0GCSqGSIb3DQEBBQUAMIGnMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECBMPU291dGggR2xhbW9yZ2FuMRAwDgYDVQQHEwdDYXJk
-						aWZmMSgwJgYDVQQKEx9DYXJkaWZmIE1ldHJvcG9saXRhbiBVbml2ZXJzaXR5MSkw
-						JwYDVQQLEyBMaWJyYXJ5IGFuZCBJbmZvcm1hdGlvbiBTZXJ2aWNlczEXMBUGA1UE
-						AxMOaWRwLnV3aWMuYWMudWswHhcNMTMwMzEzMTEzMjMxWhcNMjMwMzExMTEzMjMx
-						WjCBpzELMAkGA1UEBhMCR0IxGDAWBgNVBAgTD1NvdXRoIEdsYW1vcmdhbjEQMA4G
-						A1UEBxMHQ2FyZGlmZjEoMCYGA1UEChMfQ2FyZGlmZiBNZXRyb3BvbGl0YW4gVW5p
-						dmVyc2l0eTEpMCcGA1UECxMgTGlicmFyeSBhbmQgSW5mb3JtYXRpb24gU2Vydmlj
-						ZXMxFzAVBgNVBAMTDmlkcC51d2ljLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA0lIdNY81HsvrJSjLbnbyFJFGZ++JKTC4Xowt0lsxRTRcjo7u
-						Jm06LkkZdVMpbU/ILkfup83H+P+uBXLQCLE7QyYrE5r6HC4B4cVRi8NdCbA/IzAn
-						djlvtu9jQ8y/zvLZ7ipsRT4yluN8taxdQ6YfPjJ7xFFcIpecjWaEjJTpACxUg0wp
-						b73CykEmgrJ9KEYmp5CndF1WxlEBBoH+ZakmQaG7EtD+0jMOc0oMn1z001aTcLe0
-						ArWKnv+ig/b3r24EVA8qecW6lEDwM5HDiWl4DrwCCeOeg0UvSZPuySkRerI6QAYP
-						6E7DXmoc9obOfu6/iA5Q5Wdbk4Mjne9uaPf1pwIDAQABo3sweTAJBgNVHRMEAjAA
-						MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
-						BgNVHQ4EFgQUBc6fEv98zv3jMeehNHHh5UhAriQwHwYDVR0jBBgwFoAUBc6fEv98
-						zv3jMeehNHHh5UhAriQwDQYJKoZIhvcNAQEFBQADggEBAAmdsLMlPUMY6QFglDkG
-						1wzwf6Be9vuY90/CR4JK2CfnXVOVxEEuAGS2plhvCe/+yq4IGOpLUo2Jf9ev4H5p
-						zT0hbTjM5WJVOWr9i0WSRdc3hLAF0ObrSPG7bk6toXDdyRa+KqVefW14cuuqbphd
-						YgsYLEshlegwM91bwEl9MVFeRU/ofGbEznPAyKuEeLdevIr4pPMwsUZ8PEwj2VhG
-						+8CsO5d/kwKQy/A31pr4fEO/gCXQ45kHnxajkh2+kA8e1n0iJ90vrS/PCM5UgmtT
-						zvZdBEn8RzielQU2UWjysX1qqiXpbkUnY1ji/piMZMRYCQFLcV7G0yPV6/7GF+EU
-						FWI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwic.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwic.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 Metropolitan University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff Metropolitan University - Legacy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uwic.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:ithelpdesk@cardiffmet.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andi</GivenName>
-    <SurName>Morris</SurName>
-    <EmailAddress>mailto:amorris@cardiffmet.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uwl.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uwl.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 5a83f33d..00000000
--- a/swamid-interfederations-2.0/idp.uwl.ac.uk-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://idp.uwl.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The University of West London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T11:11:56Z">
-      <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">uwl.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAJusaLWH0l8DLgcyT2qPjzTl3AF9MA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMTDWlkcC51d2wuYWMudWswHhcNMTQwNTE0MDg1MjM1WhcN
-						MzQwNTE0MDg1MjM1WjAYMRYwFAYDVQQDEw1pZHAudXdsLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkFVbsCDSQPh7lQRG/+MSvuXLRmP0fouZ
-						EHLD6q6WT/9/5VA0dGeBP0/jdQWUOgtRVsWszgKkQL9k7MQERK6qkJJFXxrTEvXZ
-						Thk4ATeCkx/X865yr4oA/149sVkL7g0ll3soccxPn64yyLg/RKzDBjurt6TogqRh
-						5ig9V5Xi4R1eGIyVDBQpsmRO5i3n8wy84iMXfFc1vZ1/4ghA/gDD9zA959OGMxTL
-						XXXo3HUMINWCbZm5uJC7sxDd2tDnCRm/zk+euO69RO9s7bwNSlJnqxQah7Ii3g3Y
-						4YuDeCTfHMBDmXelvQw1aPoDq3j/u/FCER2ZlSHSnPs2UNadXV5IGQIDAQABo2Ew
-						XzA+BgNVHREENzA1gg1pZHAudXdsLmFjLnVrhiRodHRwczovL2lkcC51d2wuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHXq/u7Qc+QH1JehKu4iPcxj3WkD
-						MA0GCSqGSIb3DQEBBQUAA4IBAQA/eNXfq/Qk9kWzb/40xD2rOUneppySpdgbt0Wr
-						jL6OsJTRASxbWFZl2WYthnDCN9SV7tkDlZNp+k1JXdyYL/UzDZu3q2vo0JissFKY
-						3adVBMZ351y/CcONpX9khXqosN+txwkGvTX30x/nZ4Qg3vP18NrVbcXW8+Q4c5iz
-						mJxz70gW6HwoHf0M+Ee1H+HJywnUUfy1Yf6urYmvHXXbCzeeHeBf83a6rdSteY+Y
-						UCxV0WZTRU0DqR8PUBQhU75iDmYiIYwirhPaS45HpdC2MKwfkSECjL/tpNGMqwBv
-						VVadKoLbwPTFg6BuJaKzgxeQIJtbr6T4l/LWosU4iAY2aPng
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwl.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.uwl.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwl.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.uwl.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uwl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwl.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">uwl.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAJusaLWH0l8DLgcyT2qPjzTl3AF9MA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMTDWlkcC51d2wuYWMudWswHhcNMTQwNTE0MDg1MjM1WhcN
-						MzQwNTE0MDg1MjM1WjAYMRYwFAYDVQQDEw1pZHAudXdsLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkFVbsCDSQPh7lQRG/+MSvuXLRmP0fouZ
-						EHLD6q6WT/9/5VA0dGeBP0/jdQWUOgtRVsWszgKkQL9k7MQERK6qkJJFXxrTEvXZ
-						Thk4ATeCkx/X865yr4oA/149sVkL7g0ll3soccxPn64yyLg/RKzDBjurt6TogqRh
-						5ig9V5Xi4R1eGIyVDBQpsmRO5i3n8wy84iMXfFc1vZ1/4ghA/gDD9zA959OGMxTL
-						XXXo3HUMINWCbZm5uJC7sxDd2tDnCRm/zk+euO69RO9s7bwNSlJnqxQah7Ii3g3Y
-						4YuDeCTfHMBDmXelvQw1aPoDq3j/u/FCER2ZlSHSnPs2UNadXV5IGQIDAQABo2Ew
-						XzA+BgNVHREENzA1gg1pZHAudXdsLmFjLnVrhiRodHRwczovL2lkcC51d2wuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHXq/u7Qc+QH1JehKu4iPcxj3WkD
-						MA0GCSqGSIb3DQEBBQUAA4IBAQA/eNXfq/Qk9kWzb/40xD2rOUneppySpdgbt0Wr
-						jL6OsJTRASxbWFZl2WYthnDCN9SV7tkDlZNp+k1JXdyYL/UzDZu3q2vo0JissFKY
-						3adVBMZ351y/CcONpX9khXqosN+txwkGvTX30x/nZ4Qg3vP18NrVbcXW8+Q4c5iz
-						mJxz70gW6HwoHf0M+Ee1H+HJywnUUfy1Yf6urYmvHXXbCzeeHeBf83a6rdSteY+Y
-						UCxV0WZTRU0DqR8PUBQhU75iDmYiIYwirhPaS45HpdC2MKwfkSECjL/tpNGMqwBv
-						VVadKoLbwPTFg6BuJaKzgxeQIJtbr6T4l/LWosU4iAY2aPng
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwl.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 University of West London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of West London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uwl.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Data and Voice Team</GivenName>
-    <EmailAddress>mailto:it.convergednetworkteam@uwl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Rumun</SurName>
-    <EmailAddress>mailto:Richard.rumun@uwl.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uwm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uwm.edu-idp-shibboleth.xml
deleted file mode 100644
index 1c342d9e..00000000
--- a/swamid-interfederations-2.0/idp.uwm.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://idp.uwm.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.uwm.edu/idp/error.jsp" 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">uwm.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Wisconsin-Milwaukee</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Primary Identity Provider for UW-Milwaukee</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://iam.uwm.edu/services/uwm_saml.cfm</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://iam.uwm.edu/guide/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="81" width="276" xml:lang="en">https://wayf.uwm.edu/files/uwm_preferred_logo.gif</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>
-MIIDFzCCAf+gAwIBAgIUbFErp3WyjGb0Y8Vx0lm64o2ZtiYwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnV3bS5lZHUwHhcNMTAxMTAzMjEzMjI5WhcNMzAx
-MTAzMjIzMjI5WjAWMRQwEgYDVQQDEwtpZHAudXdtLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAM4wiD9O2YU8lIGa5Hb/N4XQ+5TJUJUZBE0wtEj/
-u1RyQ6/dY7CFWUMO8OfU7QtY6xl7fhcT4HtciShNw/Mszal+w6sqVZsm2fhYBUcD
-AWpnKjNsUPvjG/8w/x0FQzkDmaDdjEOpkF1S1iy83+wuNfCIcEcM23Pp19uKI2h5
-rhrX/8Z5+J9jng4EkNhih09C62pIdRcsHO0kw/ULp1CiBz3/JbVu4XlqNVkrPGZP
-dSVMgzczcIIrL9IujIXRjCZaGeKKRTGFodSjsJ/LJN8pApu7px3BVlp757I1oXDj
-NZ180QRbD9G67CqDoCRH11SZcsFRkimHC51blVGWFGPxSJsCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnV3bS5lZHWGImh0dHBzOi8vaWRwLnV3bS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFCgSWfxHyw4HdubVct5qtlHyFsFbMA0GCSqGSIb3
-DQEBBQUAA4IBAQBEW3tnceYvOy9GO8xUEDURm9EEwSy6L0CaUI9BxKoubp2X1aIj
-FPTN38ceTFKy8t6ADePJcBshrY0V79ToH/SFaeJKOS+P/a0jvnNcadzJue8Q6LFY
-UgPpcDnwfqtggevzmVden+w7tcsJQe8imUF1bwuIR+brh17+anlnu7jeNTRRuaE5
-YERpQU8pBA4fGhBaGWY9Zp6W8vyS1n7iNlY/SxVkhtgi1pU2ymkWh63VRhZk988b
-CJ76BgmY1M5uR6Dc/sWtr5KtD7ZAFaym1dadFlH09Qo9YjKi23R4lzaJs7iC6ZY6
-dOu3CjcCE/AhGeGCaig/VkiBvstxMe4R5uVW
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uwm.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uwm.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uwm.edu/idp/profile/SAML2/POST/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">uwm.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUbFErp3WyjGb0Y8Vx0lm64o2ZtiYwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnV3bS5lZHUwHhcNMTAxMTAzMjEzMjI5WhcNMzAx
-MTAzMjIzMjI5WjAWMRQwEgYDVQQDEwtpZHAudXdtLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAM4wiD9O2YU8lIGa5Hb/N4XQ+5TJUJUZBE0wtEj/
-u1RyQ6/dY7CFWUMO8OfU7QtY6xl7fhcT4HtciShNw/Mszal+w6sqVZsm2fhYBUcD
-AWpnKjNsUPvjG/8w/x0FQzkDmaDdjEOpkF1S1iy83+wuNfCIcEcM23Pp19uKI2h5
-rhrX/8Z5+J9jng4EkNhih09C62pIdRcsHO0kw/ULp1CiBz3/JbVu4XlqNVkrPGZP
-dSVMgzczcIIrL9IujIXRjCZaGeKKRTGFodSjsJ/LJN8pApu7px3BVlp757I1oXDj
-NZ180QRbD9G67CqDoCRH11SZcsFRkimHC51blVGWFGPxSJsCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnV3bS5lZHWGImh0dHBzOi8vaWRwLnV3bS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFCgSWfxHyw4HdubVct5qtlHyFsFbMA0GCSqGSIb3
-DQEBBQUAA4IBAQBEW3tnceYvOy9GO8xUEDURm9EEwSy6L0CaUI9BxKoubp2X1aIj
-FPTN38ceTFKy8t6ADePJcBshrY0V79ToH/SFaeJKOS+P/a0jvnNcadzJue8Q6LFY
-UgPpcDnwfqtggevzmVden+w7tcsJQe8imUF1bwuIR+brh17+anlnu7jeNTRRuaE5
-YERpQU8pBA4fGhBaGWY9Zp6W8vyS1n7iNlY/SxVkhtgi1pU2ymkWh63VRhZk988b
-CJ76BgmY1M5uR6Dc/sWtr5KtD7ZAFaym1dadFlH09Qo9YjKi23R4lzaJs7iC6ZY6
-dOu3CjcCE/AhGeGCaig/VkiBvstxMe4R5uVW
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uwm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uwm.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwm.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mat Houser</md:GivenName>
-    <md:EmailAddress>mhouser@uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UW-Milwaukee IAM Team</md:GivenName>
-    <md:EmailAddress>iam-support@uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Chris Spadanuda</md:GivenName>
-    <md:EmailAddress>cspada@uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.xml
deleted file mode 100644
index 625f2e87..00000000
--- a/swamid-interfederations-2.0/idp.uws.ac.uk-oala-metadata.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.uws.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the University of the West of Scotland.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-28T12:55:00Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">uws.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="16" width="16">https://logos.uws.ac.uk/UWS-logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://logos.uws.ac.uk/UWS-logo-80x60.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">University of the West of Scotland (UWS)</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaDCCAlCgAwIBAgIIYbFoeRooWYAwDQYJKoZIhvcNAQEFBQAwSzExMC8GA1UE
-						CgwoVW5pdmVyc2l0eSBvZiB0aGUgV2VzdCBvZiBTY290bGFuZCAoVVdTKTEWMBQG
-						A1UEAwwNaWRwLnV3cy5hYy51azAeFw0xMzAyMTUxNDEyNTlaFw0yMzAyMTUxNDEy
-						NTlaMEsxMTAvBgNVBAoMKFVuaXZlcnNpdHkgb2YgdGhlIFdlc3Qgb2YgU2NvdGxh
-						bmQgKFVXUykxFjAUBgNVBAMMDWlkcC51d3MuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCwkKLmB8Bmhsi8GGv6r72hYbHGkMbgQ/J3AwxM7B6B
-						lc4QcGTRY8ziyZ1zcP9tmcSnVb5yWrYdPt49TEaH0qWJ7Uw6UDy5xSMVIAmSowYK
-						uXkuIJVX+zIOAeQ6VfTF/jAfU7W3fTHGL8fyeFXScQXnDWltAmBDO59cnFwb6eur
-						GRPeoixry+rtPyJTSXPEespZr/DTA35a3ydb0FNOR6aAgIQsYxiLLRGDFhy8lF+Y
-						7PwC4y9uVf8gA2f3CTAFpxr78M68WDQNkN2XOgZyrdVf1/3iWhCtsfg2W16nyfAy
-						1RWCPsgb9IOgsazZMK4SctNZFcBg0kgnj79cvQuKMRXdAgMBAAGjUDBOMB0GA1Ud
-						DgQWBBTxj3GMfJYQ+SHcCJ/NPmkVh7WNvzAfBgNVHSMEGDAWgBTxj3GMfJYQ+SHc
-						CJ/NPmkVh7WNvzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBB1boI
-						lcTo5EIRUKvFbYlmiXSEGJmh26lsUT3kUzJZm3EKH9kr4+jUciG2SJGnF2Z278f+
-						Cfl495RuGRxuBZcnMOsF7DxiPUPexD5tgUc1R/mY0qIADopPt5xHAro8DtLsk0Ha
-						ThBZmY5mpajnMiP8uPhjMLImy4nmq9PizV6YRo6z989ZrimkXWcTaMlM0zws0Qvm
-						aiDs9JdN9vWNYv0E003ekVuKYCuyItCQgNbxY6kY5H6gDybnUUY8lhS4tFwnYRph
-						NeRvuatSXDhWfBk/lBSAF4VNSL4LfKsFPQP34DxZdtLT7EI95sGSzKno/2S18uXS
-						6swfWRDPUe/Evz3k
-					</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>
-						MIIDaDCCAlCgAwIBAgIIYbFoeRooWYAwDQYJKoZIhvcNAQEFBQAwSzExMC8GA1UE
-						CgwoVW5pdmVyc2l0eSBvZiB0aGUgV2VzdCBvZiBTY290bGFuZCAoVVdTKTEWMBQG
-						A1UEAwwNaWRwLnV3cy5hYy51azAeFw0xMzAyMTUxNDEyNTlaFw0yMzAyMTUxNDEy
-						NTlaMEsxMTAvBgNVBAoMKFVuaXZlcnNpdHkgb2YgdGhlIFdlc3Qgb2YgU2NvdGxh
-						bmQgKFVXUykxFjAUBgNVBAMMDWlkcC51d3MuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCwkKLmB8Bmhsi8GGv6r72hYbHGkMbgQ/J3AwxM7B6B
-						lc4QcGTRY8ziyZ1zcP9tmcSnVb5yWrYdPt49TEaH0qWJ7Uw6UDy5xSMVIAmSowYK
-						uXkuIJVX+zIOAeQ6VfTF/jAfU7W3fTHGL8fyeFXScQXnDWltAmBDO59cnFwb6eur
-						GRPeoixry+rtPyJTSXPEespZr/DTA35a3ydb0FNOR6aAgIQsYxiLLRGDFhy8lF+Y
-						7PwC4y9uVf8gA2f3CTAFpxr78M68WDQNkN2XOgZyrdVf1/3iWhCtsfg2W16nyfAy
-						1RWCPsgb9IOgsazZMK4SctNZFcBg0kgnj79cvQuKMRXdAgMBAAGjUDBOMB0GA1Ud
-						DgQWBBTxj3GMfJYQ+SHcCJ/NPmkVh7WNvzAfBgNVHSMEGDAWgBTxj3GMfJYQ+SHc
-						CJ/NPmkVh7WNvzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBB1boI
-						lcTo5EIRUKvFbYlmiXSEGJmh26lsUT3kUzJZm3EKH9kr4+jUciG2SJGnF2Z278f+
-						Cfl495RuGRxuBZcnMOsF7DxiPUPexD5tgUc1R/mY0qIADopPt5xHAro8DtLsk0Ha
-						ThBZmY5mpajnMiP8uPhjMLImy4nmq9PizV6YRo6z989ZrimkXWcTaMlM0zws0Qvm
-						aiDs9JdN9vWNYv0E003ekVuKYCuyItCQgNbxY6kY5H6gDybnUUY8lhS4tFwnYRph
-						NeRvuatSXDhWfBk/lBSAF4VNSL4LfKsFPQP34DxZdtLT7EI95sGSzKno/2S18uXS
-						6swfWRDPUe/Evz3k
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uws.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uws.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of the West of Scotland</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of the West of Scotland (UWS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uws.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sally</GivenName>
-    <SurName>McIntosh</SurName>
-    <EmailAddress>mailto:sally.mcintosh@uws.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Julie</GivenName>
-    <SurName>Sword</SurName>
-    <EmailAddress>mailto:julie.sword@uws.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uxbridge.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uxbridge.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 970510b8..00000000
--- a/swamid-interfederations-2.0/idp.uxbridge.ac.uk-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.uxbridge.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Uxbridge College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-15T15:33: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">uxbridge.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUZwOkMlPz3cSvnZG/flZHZc+acwkwDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAwwSaWRwLnV4YnJpZGdlLmFjLnVrMB4XDTE1MDEyNjA5MTYw
-						OVoXDTM1MDEyNjA5MTYwOVowHTEbMBkGA1UEAwwSaWRwLnV4YnJpZGdlLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnsE3nHinfWPqK7JfCUdq
-						q4o5aiqFt6lXkXVsFQLbSHfIz3Cf2kgndwqULQnSyBlyELbUVktdFQuHfve+qKJb
-						hnYGFMbOpIqAHnlvc2LfhsZ1+H/C/B9gnzhjRVdgSEsG71R6GtidFmuRQeFvqTkg
-						x+rtlgva2Iz2ZFE2n3dN9Fw+gNaqHfL3GEFewIECHuTdhbn/dJTXnogBZR+RQ/u1
-						xTyuOM2IYyULmwiDb5X6koX0O/5yC/Pgj/vQ+7A4ZSKmpFYtF1d3PXLJ5x5pPlm1
-						tw6MNivuAe8V+6IZeEOdZsM3NosiBLFiA0YsFdqXzPNFqVt7hFURH3KbqciMur5T
-						+QIDAQABo2swaTAdBgNVHQ4EFgQUiUoY92tgFoq4JqVfu9gSJmdlXS4wSAYDVR0R
-						BEEwP4ISaWRwLnV4YnJpZGdlLmFjLnVrhilodHRwczovL2lkcC51eGJyaWRnZS5h
-						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAA7+wTS76kWJq
-						XgjsoyeCqrxQrSIwx6eL4QKQvgAVv8QuvXbAf4LeX+70pMY5iZ67ZEN8U/Hukq/J
-						gya6DSiAFPViTJnACZMXFRogS1EkC+kLG1dcPPmqY2tweg6SDsMTwHOB9WbaAt+Q
-						iNwQfBjlaEFHfPE6lo+C3rWEScABiHn0V6FWODuUxTqPaFwPIvM2insjUAWGM62U
-						Aa488QsFI+qKCnntrvZcoEAyWmG/d5i/jK8MohytrC1khQ56VlYVFlXG2/05m3Bq
-						aZniFfgK4PHqWDyOTMlF9wG5JNuzVb4CP04ptQZXiKBtMgnfpmlTyfimiGM/Jn2E
-						ldckhs6TCQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uxbridge.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uxbridge.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.uxbridge.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uxbridge.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uxbridge.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uxbridge.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">uxbridge.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUZwOkMlPz3cSvnZG/flZHZc+acwkwDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAwwSaWRwLnV4YnJpZGdlLmFjLnVrMB4XDTE1MDEyNjA5MTYw
-						OVoXDTM1MDEyNjA5MTYwOVowHTEbMBkGA1UEAwwSaWRwLnV4YnJpZGdlLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnsE3nHinfWPqK7JfCUdq
-						q4o5aiqFt6lXkXVsFQLbSHfIz3Cf2kgndwqULQnSyBlyELbUVktdFQuHfve+qKJb
-						hnYGFMbOpIqAHnlvc2LfhsZ1+H/C/B9gnzhjRVdgSEsG71R6GtidFmuRQeFvqTkg
-						x+rtlgva2Iz2ZFE2n3dN9Fw+gNaqHfL3GEFewIECHuTdhbn/dJTXnogBZR+RQ/u1
-						xTyuOM2IYyULmwiDb5X6koX0O/5yC/Pgj/vQ+7A4ZSKmpFYtF1d3PXLJ5x5pPlm1
-						tw6MNivuAe8V+6IZeEOdZsM3NosiBLFiA0YsFdqXzPNFqVt7hFURH3KbqciMur5T
-						+QIDAQABo2swaTAdBgNVHQ4EFgQUiUoY92tgFoq4JqVfu9gSJmdlXS4wSAYDVR0R
-						BEEwP4ISaWRwLnV4YnJpZGdlLmFjLnVrhilodHRwczovL2lkcC51eGJyaWRnZS5h
-						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAA7+wTS76kWJq
-						XgjsoyeCqrxQrSIwx6eL4QKQvgAVv8QuvXbAf4LeX+70pMY5iZ67ZEN8U/Hukq/J
-						gya6DSiAFPViTJnACZMXFRogS1EkC+kLG1dcPPmqY2tweg6SDsMTwHOB9WbaAt+Q
-						iNwQfBjlaEFHfPE6lo+C3rWEScABiHn0V6FWODuUxTqPaFwPIvM2insjUAWGM62U
-						Aa488QsFI+qKCnntrvZcoEAyWmG/d5i/jK8MohytrC1khQ56VlYVFlXG2/05m3Bq
-						aZniFfgK4PHqWDyOTMlF9wG5JNuzVb4CP04ptQZXiKBtMgnfpmlTyfimiGM/Jn2E
-						ldckhs6TCQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uxbridge.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uxbridge.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">Uxbridge College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Uxbridge College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uxbridge.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mohammed</GivenName>
-    <SurName>Abdulaziz</SurName>
-    <EmailAddress>mailto:MAbdulaz@uxbridgecollege.ac.uk</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 1880e13a..00000000
--- a/swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vet-alfort.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACSUlEQVQ4y32Tz0sUYRzGP7POOu5u7cgou9qqaKl4ULxIhywUvITd+gvsFh0ST+IpvJSniqQQo0MYCIEeNYgl0qCQRQmFFgXXH7jRCKuz7jo7u7NuB5nXUazn9L4P7/s83/f5fl+JC1ieXBgq5O3hQsYKu3mfFtiVvfKbzge3xty85Cy+jc29UOu0jpIk9UoSZQB2ziarp88ZlAeUpJXJbdwZ6e8VAr/eL1VV36yfqW6r6XEfNnZSrE0vcRlqW6+Fb9zv1GWAo6PMWq2/vAbAMkwyeppizj53QVa8KKpPVGSk0itARFqeXBg6TmWfB0JBAALhq2T/HJHV08iKF9sqICtemu+1cyUUJDbxVYiqddoTT+nk5LHjrDZoKEEfAPXdzeKgovqIz66QiMZRGzTBF4vFAdk8NBsBtNYQTX1tGDupU/UGjaJlk4xtYRkmLf0dACRj20Ig89tokp1NqD0iLrpdkrEtbKvAxtzqpWEKAX1tT7g7sNLmOTEH7vaeCazuibQBbKsgKvofZEX1b1rG8XV3YAC2XhCz8C8EwsF1WSqVXgKvHLKprw1ADFD38F2cLpVVyMiKVwyYVOKd3PWod/zHeHTYzuYjlzlm9TSJaFzwoY4IWksInxbYHRyZOJ3EUiZ/G4mEE5yTA0AiGidnmFS1nP6t1LrOweb+8dvpzwOS5Jlxfab5A6Dy4ju7HvaQM8yzBhyaHxenFgOvP3zqkSQqhcD3Z/ONNjT61Yq6E8kz6g4WwFfp2/L4vU/Xf27vT81+GcyYeQD+AhIl+Jg1VavDAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjU3KzAyOjAwtr2Z4gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo1NyswMjowMMfgIV4AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.vet-alfort.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idp.vet-alfort.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vet-alfort.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vet-alfort.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Nationale Vétérinaire d'ALFORT</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Vétérinaire d'ALFORT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vet-alfort.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Hervé Battaglia</md:SurName>
-    <md:EmailAddress>herve.battaglia@vet-alfort.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml
deleted file mode 100644
index 34f59338..00000000
--- a/swamid-interfederations-2.0/idp.vfu.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vfu.cz/idp/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="2015-12-17T11:13: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>
-    <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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vfu.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Veterinary and Pharmaceutical Sciences Brno</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Veterinární a farmaceutická univerzita Brno</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students of University of Veterinary and Pharmaceutical Sciences Brno.</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Veterinární a farmaceutické univerzity Brno.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.vfu.cz/index_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.vfu.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="40">https://idp.vfu.cz/vfu_logo_40x40.jpg</mdui:Logo>
-        <mdui:Logo height="50" width="50">https://idp.vfu.cz/vfu_logo_50x50.jpg</mdui:Logo>
-        <mdui:Logo height="101" width="100">https://idp.vfu.cz/vfu_logo_100x101.jpg</mdui:Logo>
-        <mdui:Logo height="203" width="200">https://idp.vfu.cz/vfu_logo_200x203.jpg</mdui:Logo>
-        <mdui:Logo height="407" width="400">https://idp.vfu.cz/vfu_logo_400x407.jpg</mdui:Logo>
-        <mdui:Logo height="814" width="800">https://idp.vfu.cz/vfu_logo_800x814.jpg</mdui:Logo>
-        <mdui:Logo height="3238" width="3182">https://idp.vfu.cz/vfu_logo_3182x3238.jpg</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>
-MIIDFDCCAfygAwIBAgIVANp/jeTWFQlkALd2zvuQM0NNal7QMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owHhcNMTUxMTExMTQzMTM5WhcNMzUx
-MTExMTQzMTM5WjAVMRMwEQYDVQQDDAppZHAudmZ1LmN6MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAj+iqNpJyp61VIUE+Uiuf70mpL3M+abjmqVPR8/XD
-OvsRiGwVCJTdYSjAKzEofzo7x8St/RB9yLqQJiPQ+ooTnJ661FjrCNrq714DYZh8
-pjEz0ybzWR0ATIUz4WYBEeFHgVX2KZjUrCsw5x51xTppIHSKtlH1aUt8Xy/TbMV/
-CVuouE5oSMJrjgwQOU+4AnGT3XV5EH1u9WlSbGtG/DRzGo61emww8GXu4srsPetx
-i8wEgeWbCxQ4Gwe7EZmpEPa1cCBSFFh6DJ6pH8HO0wcDs38YxhLBMtdDEkscilBK
-XEsIYkn/7lfLxgx7ixr+iCxc04DiZxHacWi+KaGThblWQQIDAQABo1swWTAdBgNV
-HQ4EFgQUZsHdPToEdg76yRcx9wzG0GW/nVYwOAYDVR0RBDEwL4IKaWRwLnZmdS5j
-eoYhaHR0cHM6Ly9pZHAudmZ1LmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCNVAy1JdEkvnY9bJetr9ZXFxRaiuQoLrlkGAxGt3OibQJQ4zZvHibr
-YlUhbTEHXNjlThfwL90Rd65ikw3rPa3l/6zV5+Z9SqKykuKHfn+SjCW4XRF0Qhr9
-B6S7XyKMQK+QnZmN44IS+5ZtGpydEwduCv8uWuQI5vaq3NDJ0dUiBWPDh0SKIEH9
-SGRzwuLfThykPFAGd/HjzGGvkeYmhY0J3XmtvlXBgMNVgWO3eJun6lVDwFLLX/fT
-4zcd0uNIaHCPalZni/fJJZZ1OnpqGCcojEkbSZuSNj63zJpRIbX8+2Suwit2C8pR
-OCIUB28HPQitwXyHjHKbbja76a/IB8id
-                        </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>
-MIIDEzCCAfugAwIBAgIUZ9X/+ig6ipqz5tuTFlWeaseDk1gwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnZmdS5jejAeFw0xNTExMTExNDMxMzhaFw0zNTEx
-MTExNDMxMzhaMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCd944PWmJDHy0+mNrQ9kH/cd6dJCNzHDWngw4WPmPf
-gzpJJobllCpvfMi0aW7ZdwbVun4otm70w8WhXBITYDcagXPdZX32CTx+5uCBmzPL
-WWp/W/AA9jIYvpygPUB1torPYt+WGP2kt5MNFkN8yN+XWr520jiPaZ5Aqqomkezl
-SwFbHD4pCYKxN11A/JFkNRlZjFIe9mdMOEecvRCSdPewfYkEEyEzVgX2ID2j22KD
-OSIaEIdqoAjoqye9YNIPtS5+Q4Ut7pQBRdc6l8rPBOlb66okxotf8McbPW6NV0tX
-U/kESRZxlr1vtBAirs9aFP0S9YkRx5Gbf8h0SiiK88QVAgMBAAGjWzBZMB0GA1Ud
-DgQWBBSBB7uc02LKj3kiKpQj57O25TZOWTA4BgNVHREEMTAvggppZHAudmZ1LmN6
-hiFodHRwczovL2lkcC52ZnUuY3ovaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBABrhb7FN/oWizvVpDZRqTdW87x/I2A4AQhDDMT2Xh4VEBveP3H4agIs1
-PmPQW8cAgr+SyvXpgN4hpC9xm5dE1GE+dT/2EK4QnAGogldwn5m9BjXc3okEyg46
-Of1COpKLZexcbN4i2JC6sUq3w96yNX0/WZCRbiye5+zVquovphOqL0t7PkOPMMqK
-fDtx0zOl6SCJB7cSVQd9BqvzWfT+/hUZiLlvrE88tIWLQatUC+Frjw9c+z9EcZ+B
-4VMcjUyqivNpcfjuHHAgimF0xW5eazK4lB9f76dgJNvhm0r4VcmuluOhzDDc8HV7
-11vR6XmJ2seiNk9k1bKJnEqIqWW7y9Y=
-                        </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>
-MIIDFDCCAfygAwIBAgIVALawx1psOeuNB/Q2nKO0A/D3JVB/MA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owHhcNMTUxMTExMTQzMTM5WhcNMzUx
-MTExMTQzMTM5WjAVMRMwEQYDVQQDDAppZHAudmZ1LmN6MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtwMyNgUHQbL2qrspcFBtqMyqYn9A2hGR5RB/vzX0
-i4TdZqE23R5IPgi8OCVrI/PDZBqF0pNA/Y7GY0YlLbw/0g/lnVYuUq1W+E8i1v9C
-+/DsD8G3K1xMerC/q3JVt7ukPDN+SJJp6DP/lAoKWYATUDq8ERm1BKIw2PBhiDCg
-13AfaVymOdbfWMZqtQp53fVCRnNiD5zHdmzK4z65zj1e4EOLrJaGqe3O2XUzJxrv
-8NNGNF2dZdHZ5tS5lyY0n65wPIPOyE8CI+uryYy26LxE8HxX4blcyoQwR9SWxG1B
-eRroPi1gtqJwAfEjheI45uCHUEWDwq3Sh6z6VlYxukotDwIDAQABo1swWTAdBgNV
-HQ4EFgQUTqnt/OEAflr2PGNfD7bji3eG54EwOAYDVR0RBDEwL4IKaWRwLnZmdS5j
-eoYhaHR0cHM6Ly9pZHAudmZ1LmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQAIs7X2dSUVS8wc+UsDNYrXtiAouHGoqdaZDJgig9GVK4HPZLlIZbz4
-JJZ/82N9ySsUMv/yt6fG/NtamnaSBWw8wd+3ICdCALEgH05OoJyqIX9GJPqcxPKX
-0v2J4xtzNVACyxxy7fbu0fxxU9EqgMehL0tRaZAjZBYubZZoT/2CXSPIJ3PCk7RZ
-Ms37IJpACqCJ0i8oQ1KTYqoUZFOigzdFv3O3pa7EjcHUI4KBtSlUADvG7x9G+EQS
-QzbFdRvuJ9SzN5kZ8Cv2hZUdLhp8/GsBO7mWqv5AlYT92fk3aSxXI86nzbAYkPNX
-2VD3vAL+nYSRZTKDTCV0dFKXgixuQNQX
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vfu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vfu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vfu.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vfu.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vfu.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vfu.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vfu.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vfu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vfu.cz/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">vfu.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVANp/jeTWFQlkALd2zvuQM0NNal7QMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owHhcNMTUxMTExMTQzMTM5WhcNMzUx
-MTExMTQzMTM5WjAVMRMwEQYDVQQDDAppZHAudmZ1LmN6MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAj+iqNpJyp61VIUE+Uiuf70mpL3M+abjmqVPR8/XD
-OvsRiGwVCJTdYSjAKzEofzo7x8St/RB9yLqQJiPQ+ooTnJ661FjrCNrq714DYZh8
-pjEz0ybzWR0ATIUz4WYBEeFHgVX2KZjUrCsw5x51xTppIHSKtlH1aUt8Xy/TbMV/
-CVuouE5oSMJrjgwQOU+4AnGT3XV5EH1u9WlSbGtG/DRzGo61emww8GXu4srsPetx
-i8wEgeWbCxQ4Gwe7EZmpEPa1cCBSFFh6DJ6pH8HO0wcDs38YxhLBMtdDEkscilBK
-XEsIYkn/7lfLxgx7ixr+iCxc04DiZxHacWi+KaGThblWQQIDAQABo1swWTAdBgNV
-HQ4EFgQUZsHdPToEdg76yRcx9wzG0GW/nVYwOAYDVR0RBDEwL4IKaWRwLnZmdS5j
-eoYhaHR0cHM6Ly9pZHAudmZ1LmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCNVAy1JdEkvnY9bJetr9ZXFxRaiuQoLrlkGAxGt3OibQJQ4zZvHibr
-YlUhbTEHXNjlThfwL90Rd65ikw3rPa3l/6zV5+Z9SqKykuKHfn+SjCW4XRF0Qhr9
-B6S7XyKMQK+QnZmN44IS+5ZtGpydEwduCv8uWuQI5vaq3NDJ0dUiBWPDh0SKIEH9
-SGRzwuLfThykPFAGd/HjzGGvkeYmhY0J3XmtvlXBgMNVgWO3eJun6lVDwFLLX/fT
-4zcd0uNIaHCPalZni/fJJZZ1OnpqGCcojEkbSZuSNj63zJpRIbX8+2Suwit2C8pR
-OCIUB28HPQitwXyHjHKbbja76a/IB8id
-                        </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>
-MIIDEzCCAfugAwIBAgIUZ9X/+ig6ipqz5tuTFlWeaseDk1gwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnZmdS5jejAeFw0xNTExMTExNDMxMzhaFw0zNTEx
-MTExNDMxMzhaMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCd944PWmJDHy0+mNrQ9kH/cd6dJCNzHDWngw4WPmPf
-gzpJJobllCpvfMi0aW7ZdwbVun4otm70w8WhXBITYDcagXPdZX32CTx+5uCBmzPL
-WWp/W/AA9jIYvpygPUB1torPYt+WGP2kt5MNFkN8yN+XWr520jiPaZ5Aqqomkezl
-SwFbHD4pCYKxN11A/JFkNRlZjFIe9mdMOEecvRCSdPewfYkEEyEzVgX2ID2j22KD
-OSIaEIdqoAjoqye9YNIPtS5+Q4Ut7pQBRdc6l8rPBOlb66okxotf8McbPW6NV0tX
-U/kESRZxlr1vtBAirs9aFP0S9YkRx5Gbf8h0SiiK88QVAgMBAAGjWzBZMB0GA1Ud
-DgQWBBSBB7uc02LKj3kiKpQj57O25TZOWTA4BgNVHREEMTAvggppZHAudmZ1LmN6
-hiFodHRwczovL2lkcC52ZnUuY3ovaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBABrhb7FN/oWizvVpDZRqTdW87x/I2A4AQhDDMT2Xh4VEBveP3H4agIs1
-PmPQW8cAgr+SyvXpgN4hpC9xm5dE1GE+dT/2EK4QnAGogldwn5m9BjXc3okEyg46
-Of1COpKLZexcbN4i2JC6sUq3w96yNX0/WZCRbiye5+zVquovphOqL0t7PkOPMMqK
-fDtx0zOl6SCJB7cSVQd9BqvzWfT+/hUZiLlvrE88tIWLQatUC+Frjw9c+z9EcZ+B
-4VMcjUyqivNpcfjuHHAgimF0xW5eazK4lB9f76dgJNvhm0r4VcmuluOhzDDc8HV7
-11vR6XmJ2seiNk9k1bKJnEqIqWW7y9Y=
-                        </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>
-MIIDFDCCAfygAwIBAgIVALawx1psOeuNB/Q2nKO0A/D3JVB/MA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC52ZnUuY3owHhcNMTUxMTExMTQzMTM5WhcNMzUx
-MTExMTQzMTM5WjAVMRMwEQYDVQQDDAppZHAudmZ1LmN6MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtwMyNgUHQbL2qrspcFBtqMyqYn9A2hGR5RB/vzX0
-i4TdZqE23R5IPgi8OCVrI/PDZBqF0pNA/Y7GY0YlLbw/0g/lnVYuUq1W+E8i1v9C
-+/DsD8G3K1xMerC/q3JVt7ukPDN+SJJp6DP/lAoKWYATUDq8ERm1BKIw2PBhiDCg
-13AfaVymOdbfWMZqtQp53fVCRnNiD5zHdmzK4z65zj1e4EOLrJaGqe3O2XUzJxrv
-8NNGNF2dZdHZ5tS5lyY0n65wPIPOyE8CI+uryYy26LxE8HxX4blcyoQwR9SWxG1B
-eRroPi1gtqJwAfEjheI45uCHUEWDwq3Sh6z6VlYxukotDwIDAQABo1swWTAdBgNV
-HQ4EFgQUTqnt/OEAflr2PGNfD7bji3eG54EwOAYDVR0RBDEwL4IKaWRwLnZmdS5j
-eoYhaHR0cHM6Ly9pZHAudmZ1LmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQAIs7X2dSUVS8wc+UsDNYrXtiAouHGoqdaZDJgig9GVK4HPZLlIZbz4
-JJZ/82N9ySsUMv/yt6fG/NtamnaSBWw8wd+3ICdCALEgH05OoJyqIX9GJPqcxPKX
-0v2J4xtzNVACyxxy7fbu0fxxU9EqgMehL0tRaZAjZBYubZZoT/2CXSPIJ3PCk7RZ
-Ms37IJpACqCJ0i8oQ1KTYqoUZFOigzdFv3O3pa7EjcHUI4KBtSlUADvG7x9G+EQS
-QzbFdRvuJ9SzN5kZ8Cv2hZUdLhp8/GsBO7mWqv5AlYT92fk3aSxXI86nzbAYkPNX
-2VD3vAL+nYSRZTKDTCV0dFKXgixuQNQX
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vfu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vfu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Veterinary and Pharmaceutical Sciences Brno</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Veterinární a farmaceutická univerzita Brno</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Veterinary and Pharmaceutical Sciences Brno</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Veterinární a farmaceutická univerzita Brno</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vfu.cz/index_en.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.vfu.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ladislav</md:GivenName>
-    <md:SurName>Žůrek</md:SurName>
-    <md:EmailAddress>zurekl@vfu.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Čejka</md:SurName>
-    <md:EmailAddress>cejkap@vfu.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ondřej</md:GivenName>
-    <md:SurName>Doležal</md:SurName>
-    <md:EmailAddress>dolezalo@vfu.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 da7afd8c..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vib.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">belnet.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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,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AAAAUGdQc2VudW0AAAAAUGdQcwAAAABQZ1BDAAAAAExlZnRVbnRGI1JsdAAAAAAAAAAAAAAAAFRvcCBVbnRGI1JsdAAAAAAAAAAAAAAAAFNjbCBVbnRGI1ByY0BZAAAAAAAAAAAAEGNyb3BXaGVuUHJpbnRpbmdib29sAAAAAA5jcm9wUmVjdEJvdHRvbWxvbmcAAAAAAAAADGNyb3BSZWN0TGVmdGxvbmcAAAAAAAAADWNyb3BSZWN0UmlnaHRsb25nAAAAAAAAAAtjcm9wUmVjdFRvcGxvbmcAAAAAADhCSU0D7QAAAAAAEAEsAAAAAQACASwAAAABAAI4QklNBCYAAAAAAA4AAAAAAAAAAAAAP4AAADhCSU0EDQAAAAAABAAAAB44QklNBBkAAAAAAAQAAAAeOEJJTQPzAAAAAAAJAAAAAAAAAAABADhCSU0ECgAAAAAAAQAAOEJJTScQAAAAAAAKAAEAAAAAAAAAAjhCSU0D9QAAAAAASAAvZmYAAQBsZmYABgAAAAAAAQAvZmYAAQChmZoABgAAAAAAAQAyAAAAAQBaAAAABgAAAAAAAQA1AAAAAQAtAAAABgAAAAAAAThCSU0D+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,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////////////A+gAAAAA/////////////////////////////wPoAAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAADhCSU0ECAAAAAAAEAAAAAEAAAJAAAACQAAAAAA4QklNBB4AAAAAAAQAAAAAOEJJTQQaAAAAAANLAAAABgAAAAAAAAAAAAAAmAAAAJgAAAALAFYASQBCAF8AcgBnAGIAXwBwAG8AcwAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAmAAAAJgAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAQAAAAAAAG51bGwAAAACAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAAAABCdG9tbG9uZwAAAJgAAAAAUmdodGxvbmcAAACYAAAABnNsaWNlc1ZsTHMAAAABT2JqYwAAAAEAAAAAAAVzbGljZQAAABIAAAAHc2xpY2VJRGxvbmcAAAAAAAAAB2dyb3VwSURsb25nAAAAAAAAAAZvcmlnaW5lbnVtAAAADEVTbGljZU9yaWdpbgAAAA1hdXRvR2VuZXJhdGVkAAAAAFR5cGVlbnVtAAAACkVTbGljZVR5cGUAAAAASW1nIAAAAAZib3VuZHNPYmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRvbWxvbmcAAACYAAAAAFJnaHRsb25nAAAAmAAAAAN1cmxURVhUAAAAAQAAAAAAAG51bGxURVhUAAAAAQAAAAAAAE1zZ2VURVhUAAAAAQAAAAAABmFsdFRhZ1RFWFQAAAABAAAAAAAOY2VsbFRleHRJc0hUTUxib29sAQAAAAhjZWxsVGV4dFRFWFQAAAABAAAAAAAJaG9yekFsaWduZW51bQAAAA9FU2xpY2VIb3J6QWxpZ24AAAAHZGVmYXVsdAAAAAl2ZXJ0QWxpZ25lbnVtAAAAD0VTbGljZVZlcnRBbGlnbgAAAAdkZWZhdWx0AAAAC2JnQ29sb3JUeXBlZW51bQAAABFFU2xpY2VCR0NvbG9yVHlwZQAA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eGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIiB4bWxuczp4bXBSaWdodHM9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9yaWdodHMvIiBwaG90b3Nob3A6TGVnYWN5SVBUQ0RpZ2VzdD0iNDYwQ0YyODkyNkI4NTZEQUIwOUMwMUExQjBBNzkwNzciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTIE1hY2ludG9zaCIgeG1wOkNyZWF0ZURhdGU9IjIwMDctMDItMjhUMTY6MzQ6MTcrMDE6MDAiIHhtcDpNb2RpZnlEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXA6TWV0YWRhdGFEYXRlPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiB4bXBNTTpEb2N1bWVudElEPSJ1dWlkOjU4N0M3RTRFQzhENDExREI5NkUzQTBCNjkwN0NCQzAwIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiB4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ9InV1aWQ6NTg3QzdFNEVDOEQ0MTFEQjk2RTNBMEI2OTA3Q0JDMDAiIGRjOmZvcm1hdD0iaW1hZ2UvanBlZyIgeG1wUmlnaHRzOk1hcmtlZD0iRmFsc2UiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0idXVpZDo1ODdDN0U0REM4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIgc3RSZWY6ZG9jdW1lbnRJRD0idXVpZDo1ODdDN0U0Q0M4RDQxMURCOTZFM0EwQjY5MDdDQkMwMCIvPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJzYXZlZCIgc3RFdnQ6aW5zdGFuY2VJRD0ieG1wLmlpZDo3QkQwOEQ0NTVGREZFMzExOTI2ODk1NDE2RTczMkM3NSIgc3RFdnQ6d2hlbj0iMjAxNC0wNS0xOVQxNjoxMDowMyswMjowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPHJkZjpsaSBzdEV2dDphY3Rpb249InNhdmVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOjdDRDA4RDQ1NUZERkUzMTE5MjY4OTU0MTZFNzMyQzc1IiBzdEV2dDp3aGVuPSIyMDE0LTA1LTE5VDE2OjEwOjAzKzAyOjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSIgc3RFdnQ6Y2hhbmdlZD0iLyIvPiA8L3JkZjpTZXE+IDwveG1wTU06SGlzdG9yeT4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPD94cGFja2V0IGVuZD0idyI/Pv/uAA5BZG9iZQBkQAAAAAH/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQECAgICAgICAgICAgMDAwMDAwMDAwMBAQEBAQEBAQEBAQICAQICAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMD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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vib.be: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.vib.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vib.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vib.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vib.be/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">vib.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vib.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vib.be: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">
-VIB
-</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">
-VIB - Vlaams Instituut voor Biotechnologie
-</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">
-http://www.vib.be
-</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jasper</md:GivenName>
-    <md:SurName>Minnaert</md:SurName>
-    <md:EmailAddress>jasper.minnaert@vib.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vito.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vito.be-idp-shibboleth.xml
deleted file mode 100644
index fc88ba88..00000000
--- a/swamid-interfederations-2.0/idp.vito.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,206 +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://idp.vito.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">vito.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">VITO</mdui:DisplayName>
-        <mdui:Description xml:lang="en">[SMALL DESCRIPTION OF YOUR INSTITUTION]</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAC4jAAAuIwF4pT92AAAB
-b0lEQVR4nJVSTUsCURR97zk5zmikOCNl9LFwISFEUIsgolxHi35BhLRr17ba+gsKImjRolWLwkW5
-CUzd1KIvMrAQQi2RmXB0Gp1x3m2hiBCmnuXhnHu551wMAKgfkL7UvRqgVkYIejMAmJmk+XzRznSG
-rhqJA+1whf7ILY5BhoYYFuG2VUBBV7X3ZPru6kMqofmdYcXmt9BBK0EI4Xrq0szEMS9gh4gwBlUq
-yNJpaTyKApLF3RrCMXh5zB4KuDAABVUyn87N16hRfDtjl45c6yrheZJzkDRHsiyWLUgjxOr3BCfc
-i7jVQ7mq7yXy8YIiMjGP5WZyiJvxLviEaYEfYQhT0ZVPJePkxKZBrprbsS9i3iNtX+DY1anQ7GjQ
-ytj+xoYBQNFp+La45mMjj1vcgH1jble0ezsGbZj05OVb1uoP+Xj4elOpyp1CbgBly7pmUAo0kjou
-VnL/qwGgeQMgUGslB+vsUnzjhq6idvT9rb+cgAcUH/saGQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo height="75" width="153">data:image/png;base64,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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.190.188.0/22</mdui:IPHint>
-        <mdui:IPHint>2001:06a8:0a50:8000::0/49</mdui:IPHint>
-        <mdui:DomainHint>vito.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:51.218543,5.090905</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>
-
-MIIDGDCCAgCgAwIBAgIVAPcAbjxvbituoR/pksHB50TO8mgGMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMMC2lkcC52aXRvLmJlMB4XDTE0MTIwODE0NTk1N1oXDTM0
-MTIwODE0NTk1N1owFjEUMBIGA1UEAwwLaWRwLnZpdG8uYmUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCQObxHOp9/8uv8w1qlzft0+5Au35eGrkWoBqBi
-bCkDevAEqZmpBhJVsZnPzQcPuPHoqQV90qWEPBdbXLsnyJ/F73lJQMiErAhHDyhT
-RcsULne84KUZVBLOJ8jxzkJ8FEqyhsjKpZFbRsIWohTr7BW4x8OUdTbU4FiuHWox
-m2sPOqIxaDGtw+lvTufZgdEKTbPFMMRRGN4GrJQudyb+tZx0bhDQump3KIGD3tCH
-Eggm6GRupwp0OYzmWnrR6PWe8t9PmLAVWtmaCz0C4hrZk4pyez5PBy0iQvL3sE36
-qCQmN74ClYzHZF3vAYXMzSXFxyVrWZFaCOCK+nQbiii5viZdAgMBAAGjXTBbMB0G
-A1UdDgQWBBRzyZHzj//7B4eoVyUGHCF8MpaA+TA6BgNVHREEMzAxggtpZHAudml0
-by5iZYYiaHR0cHM6Ly9pZHAudml0by5iZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQUFAAOCAQEAbEKs6CR4WwPzGrs/dgkdzo/r0L7XucXbo6GmwpbMqJjaADBL
-sNDIDugYHFfrtW4pSIC54YUyjfG9+stWNfkkGMgQMKAkcFmomXsnoDysmuA+odOi
-jt6gdBUMg40vy2R60qE8gsmL2mRvKMrMoSkkX2wUBJY8xnFtiuBNtZmSaFrAwk6b
-aA+QK09yxepTufp8rmQtaxuxpKRM0mgwDr9yXO3VG5UH/iT8rHzmHI1v4TY87sIF
-IFatdC4+iVVunMDubg5tra85zZo0fq+mOBS1N5/6BosdFOsSLF9abBgcTMSs5z8Y
-j2r+snJdC6uPHnJrUv6zauFWOCVUn0sFylcnOw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vito.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vito.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vito.be/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vito.be/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vito.be: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.vito.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vito.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vito.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vito.be/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">vito.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDGDCCAgCgAwIBAgIVAPcAbjxvbituoR/pksHB50TO8mgGMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMMC2lkcC52aXRvLmJlMB4XDTE0MTIwODE0NTk1N1oXDTM0
-MTIwODE0NTk1N1owFjEUMBIGA1UEAwwLaWRwLnZpdG8uYmUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCQObxHOp9/8uv8w1qlzft0+5Au35eGrkWoBqBi
-bCkDevAEqZmpBhJVsZnPzQcPuPHoqQV90qWEPBdbXLsnyJ/F73lJQMiErAhHDyhT
-RcsULne84KUZVBLOJ8jxzkJ8FEqyhsjKpZFbRsIWohTr7BW4x8OUdTbU4FiuHWox
-m2sPOqIxaDGtw+lvTufZgdEKTbPFMMRRGN4GrJQudyb+tZx0bhDQump3KIGD3tCH
-Eggm6GRupwp0OYzmWnrR6PWe8t9PmLAVWtmaCz0C4hrZk4pyez5PBy0iQvL3sE36
-qCQmN74ClYzHZF3vAYXMzSXFxyVrWZFaCOCK+nQbiii5viZdAgMBAAGjXTBbMB0G
-A1UdDgQWBBRzyZHzj//7B4eoVyUGHCF8MpaA+TA6BgNVHREEMzAxggtpZHAudml0
-by5iZYYiaHR0cHM6Ly9pZHAudml0by5iZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQUFAAOCAQEAbEKs6CR4WwPzGrs/dgkdzo/r0L7XucXbo6GmwpbMqJjaADBL
-sNDIDugYHFfrtW4pSIC54YUyjfG9+stWNfkkGMgQMKAkcFmomXsnoDysmuA+odOi
-jt6gdBUMg40vy2R60qE8gsmL2mRvKMrMoSkkX2wUBJY8xnFtiuBNtZmSaFrAwk6b
-aA+QK09yxepTufp8rmQtaxuxpKRM0mgwDr9yXO3VG5UH/iT8rHzmHI1v4TY87sIF
-IFatdC4+iVVunMDubg5tra85zZo0fq+mOBS1N5/6BosdFOsSLF9abBgcTMSs5z8Y
-j2r+snJdC6uPHnJrUv6zauFWOCVUn0sFylcnOw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vito.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vito.be: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">Vlaamse Instelling voor Technologisch Onderzoek</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">VITO</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vito.be</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gert</md:GivenName>
-    <md:SurName>Vankrunkelsven</md:SurName>
-    <md:EmailAddress>gert.vankrunkelsven@vito.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 3257771d..00000000
--- a/swamid-interfederations-2.0/idp.vle.ase.md-saml-saml2-idp-metadata.php.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://idp.vle.ase.md/saml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federations.renam.md/" registrationInstant="2015-08-10T06:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://idp.vle.ase.md/index.php/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:Logo height="81" width="272">https://idp.vle.ase.md/resources/asem-sso-en.png</mdui:Logo>
-        <mdui:Logo height="81" width="272" xml:lang="ro">https://idp.vle.ase.md/resources/asem-sso-ro.png</mdui:Logo>
-        <mdui:Logo height="81" width="272" xml:lang="ru">https://idp.vle.ase.md/resources/asem-sso-ru.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:47.030450,28.836156</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>
-MIIFZTCCA02gAwIBAgIDEVG6MA0GCSqGSIb3DQEBDQUAMHkxEDAOBgNVBAoTB1Jv
-b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ
-Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y
-dEBjYWNlcnQub3JnMB4XDTE1MTAyMzA4MTAwNloXDTE2MDQyMDA4MTAwNlowGTEX
-MBUGA1UEAxMOaWRwLnZsZS5hc2UubWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCWd2hT7YtAEVO5grRRC9k+j+xC74pLHqwZhcTnAUT+iWRzEsHnkomf
-zV4MZkOCo7nhe/bxmdSMqMCFHCCdzbV9POoI2HIaw1qxzQS092XkLnkDU7gx8va0
-r06qgV84K0tmXZmncahg/moO5hyFDv033cNnJbhA1TK0dDqmi0lqmJx5pwTlPiKQ
-QB1MU7CjCo7yNUGHigO7434CxCneSd5vCzs/AdflZOe2RtRMpCSStjvUbNPElFIp
-5uWJU5OB6R0WjSMxHSNIYNE3/Ip+XoroVKTGlUkCtbgUgvch8SL5wp6Aij73tV2S
-zs7GHlaXfTIwZGdeTs6oaAFgnGbhvA/BAgMBAAGjggFUMIIBUDAMBgNVHRMBAf8E
-AjAAMA4GA1UdDwEB/wQEAwIDqDA0BgNVHSUELTArBggrBgEFBQcDAgYIKwYBBQUH
-AwEGCWCGSAGG+EIEAQYKKwYBBAGCNwoDAzAzBggrBgEFBQcBAQQnMCUwIwYIKwYB
-BQUHMAGGF2h0dHA6Ly9vY3NwLmNhY2VydC5vcmcvMDEGA1UdHwQqMCgwJqAkoCKG
-IGh0dHA6Ly9jcmwuY2FjZXJ0Lm9yZy9yZXZva2UuY3JsMIGRBgNVHREEgYkwgYaC
-DmlkcC52bGUuYXNlLm1koBwGCCsGAQUFBwgFoBAMDmlkcC52bGUuYXNlLm1kgg1k
-cy52bGUuYXNlLm1koBsGCCsGAQUFBwgFoA8MDWRzLnZsZS5hc2UubWSCDXNwLnZs
-ZS5hc2UubWSgGwYIKwYBBQUHCAWgDwwNc3AudmxlLmFzZS5tZDANBgkqhkiG9w0B
-AQ0FAAOCAgEAjEVbq97cWlXvWcXQ35scGZBokCJsC2wUWRfsNNNiMdaf0JRY4yy1
-K/0QeldTHpOxtuSKKXFsD3zxEIqcpunjy+S89447jhOiVVIiKCDAFgLZ4WDGC5J4
-MJRQ3x++1cTTQcanqQhvRiVK2+ArKLSQECRg36Yvj33WB4bW+kTGP3GhPhsNjV5k
-WfR6pSl76PizTSlV8NTUsbuwjYndr0l/IKiP6MhlEM1Yn2c5B/33uSb6z2biZnrj
-qn8yL/Xp9rHvE6EDDhDQqFunf851/PS+x09hYXBxLJs5v0UM1hOt0iMpSSnzRik/
-1HEsjqyaHDd0RB40HsymK/dpOPVcXDxN2hxZJ/uJH5oI8//vI3/w1I7JoZAWyzOw
-pZgXva0Th/zXH38FAiYVYDRg6zlo/2xTmR8WtVePSI0kc7KdwPSiVJsmHtfdwneX
-2FufXU/BZ3hSkZiz5REqzDOatIJAnGDheGtBm7Q9Pg7NvIVxY30M9Z05ipYH6K17
-QnPy+dhmQa7N0+cQxp11ZAWkXlQLiSmXw6Gl0D0EyPRqVNgMdczxGdh788HeEkZ8
-yFVIbkHIGG5XzYr+WWSruiL2nTBSUUxlJ1KcnNi9cXB+C8x035liGAHum4r/9mWX
-FgwNRRDAxUA5evPsUY0hEzSgPKTBuTJcIMnWBGFyok/4uNeG1seO/ks=
-</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>
-MIIFZTCCA02gAwIBAgIDEVG6MA0GCSqGSIb3DQEBDQUAMHkxEDAOBgNVBAoTB1Jv
-b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ
-Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y
-dEBjYWNlcnQub3JnMB4XDTE1MTAyMzA4MTAwNloXDTE2MDQyMDA4MTAwNlowGTEX
-MBUGA1UEAxMOaWRwLnZsZS5hc2UubWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCWd2hT7YtAEVO5grRRC9k+j+xC74pLHqwZhcTnAUT+iWRzEsHnkomf
-zV4MZkOCo7nhe/bxmdSMqMCFHCCdzbV9POoI2HIaw1qxzQS092XkLnkDU7gx8va0
-r06qgV84K0tmXZmncahg/moO5hyFDv033cNnJbhA1TK0dDqmi0lqmJx5pwTlPiKQ
-QB1MU7CjCo7yNUGHigO7434CxCneSd5vCzs/AdflZOe2RtRMpCSStjvUbNPElFIp
-5uWJU5OB6R0WjSMxHSNIYNE3/Ip+XoroVKTGlUkCtbgUgvch8SL5wp6Aij73tV2S
-zs7GHlaXfTIwZGdeTs6oaAFgnGbhvA/BAgMBAAGjggFUMIIBUDAMBgNVHRMBAf8E
-AjAAMA4GA1UdDwEB/wQEAwIDqDA0BgNVHSUELTArBggrBgEFBQcDAgYIKwYBBQUH
-AwEGCWCGSAGG+EIEAQYKKwYBBAGCNwoDAzAzBggrBgEFBQcBAQQnMCUwIwYIKwYB
-BQUHMAGGF2h0dHA6Ly9vY3NwLmNhY2VydC5vcmcvMDEGA1UdHwQqMCgwJqAkoCKG
-IGh0dHA6Ly9jcmwuY2FjZXJ0Lm9yZy9yZXZva2UuY3JsMIGRBgNVHREEgYkwgYaC
-DmlkcC52bGUuYXNlLm1koBwGCCsGAQUFBwgFoBAMDmlkcC52bGUuYXNlLm1kgg1k
-cy52bGUuYXNlLm1koBsGCCsGAQUFBwgFoA8MDWRzLnZsZS5hc2UubWSCDXNwLnZs
-ZS5hc2UubWSgGwYIKwYBBQUHCAWgDwwNc3AudmxlLmFzZS5tZDANBgkqhkiG9w0B
-AQ0FAAOCAgEAjEVbq97cWlXvWcXQ35scGZBokCJsC2wUWRfsNNNiMdaf0JRY4yy1
-K/0QeldTHpOxtuSKKXFsD3zxEIqcpunjy+S89447jhOiVVIiKCDAFgLZ4WDGC5J4
-MJRQ3x++1cTTQcanqQhvRiVK2+ArKLSQECRg36Yvj33WB4bW+kTGP3GhPhsNjV5k
-WfR6pSl76PizTSlV8NTUsbuwjYndr0l/IKiP6MhlEM1Yn2c5B/33uSb6z2biZnrj
-qn8yL/Xp9rHvE6EDDhDQqFunf851/PS+x09hYXBxLJs5v0UM1hOt0iMpSSnzRik/
-1HEsjqyaHDd0RB40HsymK/dpOPVcXDxN2hxZJ/uJH5oI8//vI3/w1I7JoZAWyzOw
-pZgXva0Th/zXH38FAiYVYDRg6zlo/2xTmR8WtVePSI0kc7KdwPSiVJsmHtfdwneX
-2FufXU/BZ3hSkZiz5REqzDOatIJAnGDheGtBm7Q9Pg7NvIVxY30M9Z05ipYH6K17
-QnPy+dhmQa7N0+cQxp11ZAWkXlQLiSmXw6Gl0D0EyPRqVNgMdczxGdh788HeEkZ8
-yFVIbkHIGG5XzYr+WWSruiL2nTBSUUxlJ1KcnNi9cXB+C8x035liGAHum4r/9mWX
-FgwNRRDAxUA5evPsUY0hEzSgPKTBuTJcIMnWBGFyok/4uNeG1seO/ks=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vle.ase.md/saml/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.vle.ase.md/saml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="ro">Academia de Studii Economice din Moldova</md:OrganizationName>
-    <md:OrganizationName xml:lang="ru">Молдавская Экономическая Академия</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Academy of Economic Studies of Moldova</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="ro">ASEM</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="ru">МЭА</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">AESM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="ro">http://ase.md</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://ase.md</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Constantin</md:GivenName>
-    <md:SurName>Sclifos</md:SurName>
-    <md:EmailAddress>mailto:sclifcon@vle.ase.md</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vsb.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vsb.cz-idp-shibboleth.xml
deleted file mode 100644
index 025615a0..00000000
--- a/swamid-interfederations-2.0/idp.vsb.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.vsb.cz/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T11:42:11Z">
-      <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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsb.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">VŠB-Technical University of Ostrava</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Vysoká škola báňská - Technická univerzita Ostrava</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students of the VŠB-Technical University of Ostrava</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty VŠB-TUO</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.vsb.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.vsb.cz/</mdui:InformationURL>
-        <mdui:Logo height="244" width="207">https://www2.eduid.cz/idp-loga/vsb.jpeg</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>
-MIIDFDCCAfygAwIBAgIVAKuWvd4iPNRnRXukyKOp+sqpReNLMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC52c2IuY3owHhcNMTYwMjEyMTAxOTE5WhcNMzYw
-MjEyMTAxOTE5WjAVMRMwEQYDVQQDDAppZHAudnNiLmN6MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAyJIW3WNHkYH7Hi6y/oSjjsyTFSMoMwGeQfpAjhp1
-+iXSTxI/X+Se3zqgQn5EJ2SeqZKxlsmx+qbl1Wf+0SSeLQ6JrxDMC4HQQ0mDor5x
-UrqerSHEcXyvoh2Sspzd/ZMaN7VCRv/Ax6uPVv16WeML/I2euB3IboPZo6FndVT+
-LEukL8U+2g0CXp3wuJW+ORv6HwaeJSgN9JgLagr69FJ2NY+Yw8GwmeHEeq/m9jww
-DcmSwzdibOVnsqXMZOXQ/X5WDNVe78b9OsC/5m0MtJSdnkX2FgKS5M3QXtMSpXLP
-9lHoBkYmAFb3p1EnRXEafhwsZrk4Z6vvHvQaLvKsCvlNGQIDAQABo1swWTAdBgNV
-HQ4EFgQUhDzLExAhPepv1Symwbvj3E2q65QwOAYDVR0RBDEwL4IKaWRwLnZzYi5j
-eoYhaHR0cHM6Ly9pZHAudnNiLmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQAeAvQXibD29dK99tJj0QtYMOcNyih7Ru/LXl+XkbXhCs0HuP2qhDMk
-TXGOpukRw5xi1VqznvnIFOusnwKU5gG/7DSsE/hU/KBWhVfb3uQrjX6jMUwP9/Is
-vsJAm9UDf0/iyGA2pjGOpWlYB5N1dJau6iAMjDP5xaBtnwbPZCQJl6q0vI1jroPs
-qENqBYkiuUrkE2sQtYTbqvJi/0aSjgQwD6qVZtRNalavRIInGqPOpG3663t9vSCK
-ZY58F6tPf6hRCqY0YM246W9jj6IZ0QH/gDbMDQxQYiuLhQ03uDHlTwB32/G27Tkb
-CSX2Yqgu+nMLaqtZ5IZORr9jyxd0h0hM
-                        </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>
-MIIDFDCCAfygAwIBAgIVAMu0ePB4xgh9EIK+qEugr/6czSz9MA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC52c2IuY3owHhcNMTYwMjEyMTAxOTE5WhcNMzYw
-MjEyMTAxOTE5WjAVMRMwEQYDVQQDDAppZHAudnNiLmN6MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAp9ddBjiE6E+aXfEUOc6oKurTK1dsoqZ+ACLUQgVF
-oGaBc3yToQMgnD6tQ4xGS4zgUPn02fe/0hh9Tz2hD+aNHvf7j24I1RUYBd5p/geG
-wMvReGp9H5lDmSrABic6kLB121GoMMIBqZO+2VadiSIMziItI2V6KuGs90t/UDOO
-ncnjjPmzpJIdACk1JOWDGZtE4AIQhz9q5tAiev6ETJG77WAwLbH1eAv2DsYCSVdk
-1NXbgaMV0SNBhgD9oqga1SQNyK+R/Q2boc22pXQMdbdgB95zrMGoFuSBK/yMXIGH
-fNLYRWemKT8N6fF+y6X3glL5VHwe9e4vxdUOeprUurqn3QIDAQABo1swWTAdBgNV
-HQ4EFgQUrx36LTaKgVLjioqCfZdQOA5wLL4wOAYDVR0RBDEwL4IKaWRwLnZzYi5j
-eoYhaHR0cHM6Ly9pZHAudnNiLmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA7OHbMVdAJTFfeM2yUXG5Sb6LMrZzMBgJvE2kM6X2+ONggB8c5relu
-TD6+BoA4q/ZiTYabXZUVtglz/ksMWPwFcW+EdZnLQeCAS9DSJRjR1/ZOFU73awfE
-UbDUopTknDLZ06+LW045Qgg7Q7LNqVs5SUDYy/EAmEYNgHJVL4T6Lrk/f2ToLpXb
-e+84As5I60v+3ywJlBKOZsjZ17Nw+y6fcbpeEIuWXd/YvuyT/qN6fzNqLkjU+F1I
-wBFnh3xvCTPaFTFgT++wDCqDvtq9GMD1w6SEiZiq7xSh1SVoJYxIu6Zq5C3YyOVS
-8aQKeBPJ3f6ZH0CSSD1nGI+/joVQegLg
-                        </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>
-MIIDFDCCAfygAwIBAgIVAMmUzXW7GcBvS+GdXawthrAEM9CfMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC52c2IuY3owHhcNMTYwMjEyMTAxOTE5WhcNMzYw
-MjEyMTAxOTE5WjAVMRMwEQYDVQQDDAppZHAudnNiLmN6MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEApzklpC0+jz80eDzf+wfHgDYTS5xTFLCzoXVfZt5m
-l2T9de/TQW2eVYyJ0vqvkhL+dfSkzH2GCdb+f0F5GxFfhT4rR4AAk4kXw7hJEh/L
-6CrNy/JaOYNe1TilEDJAliHsoZf57JlAoIx7jyKCq5+sOFxvnQuh72Kt19GDTD3w
-N/o314GrDweeQOvRu4e8mpuLYDLuG98DqzmnTvb7xc1aDRtk5ofYUA9A2+EKYyyo
-/1BhgTO/jajWVuM65sVDa9Rl84ilmUbLMOVKUlwoT4gwQG/8owgNXu895AkALAm0
-ExeCPEjg67cCktIWXlp4p1wH0zfbEYE9VIiM4lcgcD6OGwIDAQABo1swWTAdBgNV
-HQ4EFgQUs/PYqEYGUoKa+2UEe9GoUXKmw6swOAYDVR0RBDEwL4IKaWRwLnZzYi5j
-eoYhaHR0cHM6Ly9pZHAudnNiLmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCTjBqHy13Fd9m9yMBkh0ATYWdFUwjtm9O+QnLFBM00Gwm8evy14ytv
-AIVK+ljiLdEiFrtF7Szx17An2wFHC/7fZZ/lGfy3d+qwKUF8P/AY6zL8zZfwYpJr
-OQy/9x15/f50pyF7eDEm3XRuwUV+HQLqqZz4NUtJI88A7/wy60bhNxGFYzxLO5dJ
-fc8cOb2/uYOBc2W08BOf2Q6nBywhojlq1TBVigHFb5jdakQ6JJ1WbaKBtMbsXzGW
-7d23IK/AF0SEWknFsrqnhapeDFc2Jh7XZkz8Zf0LMg3d/fCQtTVdi6iS4u1pfzRv
-JYH5NKeeBBdGOunN7KfPzfd86tveJ6kn
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEhDCCA2ygAwIBAgIQMsrmzp+34gaErwPAEEHDaTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDEwNzAwMDAwMFoXDTE2MDEwNzIzNTk1OVowZTELMAkGA1UE
-BhMCQ1oxQTA/BgNVBAoMOFZ5c29rw6EgxaFrb2xhIGLDocWIc2vDoSAtIFRlY2hu
-aWNrw6EgdW5pdmVyeml0YSBPc3RyYXZhMRMwEQYDVQQDEwppZHAudnNiLmN6MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyn69Pwg4S/psf0nUhaz0lst9
-XC677alnuLNJBXFn/nNb+zZK/EVQBA4S6puSWBA9VVKrXmDWiUVuqAizzWNgaEKq
-/ssklSA5/gAsxULsvO3MB6lCBU9fpT9mVnJe7NZ6NOd9H4F+ImIGB/jQrqzeI5HZ
-39ceuuSx/rSkknu31BiE1fsHswtFqjUDa70IGHrvY+5LT0X0Q6CyOnO5VEZm3YWQ
-bYifE0xk0ntJAwyDVAV9bVPQxtisai/uvhNmMTsiDCnjK1PIM5nFnLpGEZij8iBJ
-QU5QFStykiFV/58M0xsprC/J23TOodP8mv7D4EYlTCfJ4EQ5uXwl3d1ATA0hBwID
-AQABo4IBXTCCAVkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYD
-VR0OBBYEFD8TNImBkVfIIWRwMN6X08cgCD+SMA4GA1UdDwEB/wQEAwIFoDAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAE
-ETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1
-BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBUG
-A1UdEQQOMAyCCmlkcC52c2IuY3owDQYJKoZIhvcNAQEFBQADggEBAHSOi94CDBd4
-KEw9Xv/DYSTNLin25EBU3BB752KG+JWBkeSSK+4/BaxaUFG44zUqcRheebYkovVE
-opyKs7cTdEC6E+/1R6PSlKmkMTRqAllVUxnnXOa1k84jaG3bPWPjYWWIk9iRX0sG
-nFXjhATWbi7bRx15x36jP2vR/yxigWhN73cxZNhhAC76zcH/Fj8/qUhTITiV5hyq
-8ARxGHOMVSrlwkwBECg71sdijCPAg76WjNrTuFN6c3L2NQcLYszy4N/MFBpEl0ws
-uGEHDQJdr6KAGF8iO78FoR66sQNIvHTSpJCUyS5tRkHn59BfUlapw4Y6eQ6bxJDN
-h15jC+yc8m8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vsb.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vsb.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:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.vsb.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vsb.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vsb.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vsb.cz/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsb.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAKuWvd4iPNRnRXukyKOp+sqpReNLMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC52c2IuY3owHhcNMTYwMjEyMTAxOTE5WhcNMzYw
-MjEyMTAxOTE5WjAVMRMwEQYDVQQDDAppZHAudnNiLmN6MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAyJIW3WNHkYH7Hi6y/oSjjsyTFSMoMwGeQfpAjhp1
-+iXSTxI/X+Se3zqgQn5EJ2SeqZKxlsmx+qbl1Wf+0SSeLQ6JrxDMC4HQQ0mDor5x
-UrqerSHEcXyvoh2Sspzd/ZMaN7VCRv/Ax6uPVv16WeML/I2euB3IboPZo6FndVT+
-LEukL8U+2g0CXp3wuJW+ORv6HwaeJSgN9JgLagr69FJ2NY+Yw8GwmeHEeq/m9jww
-DcmSwzdibOVnsqXMZOXQ/X5WDNVe78b9OsC/5m0MtJSdnkX2FgKS5M3QXtMSpXLP
-9lHoBkYmAFb3p1EnRXEafhwsZrk4Z6vvHvQaLvKsCvlNGQIDAQABo1swWTAdBgNV
-HQ4EFgQUhDzLExAhPepv1Symwbvj3E2q65QwOAYDVR0RBDEwL4IKaWRwLnZzYi5j
-eoYhaHR0cHM6Ly9pZHAudnNiLmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQAeAvQXibD29dK99tJj0QtYMOcNyih7Ru/LXl+XkbXhCs0HuP2qhDMk
-TXGOpukRw5xi1VqznvnIFOusnwKU5gG/7DSsE/hU/KBWhVfb3uQrjX6jMUwP9/Is
-vsJAm9UDf0/iyGA2pjGOpWlYB5N1dJau6iAMjDP5xaBtnwbPZCQJl6q0vI1jroPs
-qENqBYkiuUrkE2sQtYTbqvJi/0aSjgQwD6qVZtRNalavRIInGqPOpG3663t9vSCK
-ZY58F6tPf6hRCqY0YM246W9jj6IZ0QH/gDbMDQxQYiuLhQ03uDHlTwB32/G27Tkb
-CSX2Yqgu+nMLaqtZ5IZORr9jyxd0h0hM
-                        </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>
-MIIDFDCCAfygAwIBAgIVAMu0ePB4xgh9EIK+qEugr/6czSz9MA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC52c2IuY3owHhcNMTYwMjEyMTAxOTE5WhcNMzYw
-MjEyMTAxOTE5WjAVMRMwEQYDVQQDDAppZHAudnNiLmN6MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAp9ddBjiE6E+aXfEUOc6oKurTK1dsoqZ+ACLUQgVF
-oGaBc3yToQMgnD6tQ4xGS4zgUPn02fe/0hh9Tz2hD+aNHvf7j24I1RUYBd5p/geG
-wMvReGp9H5lDmSrABic6kLB121GoMMIBqZO+2VadiSIMziItI2V6KuGs90t/UDOO
-ncnjjPmzpJIdACk1JOWDGZtE4AIQhz9q5tAiev6ETJG77WAwLbH1eAv2DsYCSVdk
-1NXbgaMV0SNBhgD9oqga1SQNyK+R/Q2boc22pXQMdbdgB95zrMGoFuSBK/yMXIGH
-fNLYRWemKT8N6fF+y6X3glL5VHwe9e4vxdUOeprUurqn3QIDAQABo1swWTAdBgNV
-HQ4EFgQUrx36LTaKgVLjioqCfZdQOA5wLL4wOAYDVR0RBDEwL4IKaWRwLnZzYi5j
-eoYhaHR0cHM6Ly9pZHAudnNiLmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA7OHbMVdAJTFfeM2yUXG5Sb6LMrZzMBgJvE2kM6X2+ONggB8c5relu
-TD6+BoA4q/ZiTYabXZUVtglz/ksMWPwFcW+EdZnLQeCAS9DSJRjR1/ZOFU73awfE
-UbDUopTknDLZ06+LW045Qgg7Q7LNqVs5SUDYy/EAmEYNgHJVL4T6Lrk/f2ToLpXb
-e+84As5I60v+3ywJlBKOZsjZ17Nw+y6fcbpeEIuWXd/YvuyT/qN6fzNqLkjU+F1I
-wBFnh3xvCTPaFTFgT++wDCqDvtq9GMD1w6SEiZiq7xSh1SVoJYxIu6Zq5C3YyOVS
-8aQKeBPJ3f6ZH0CSSD1nGI+/joVQegLg
-                        </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>
-MIIDFDCCAfygAwIBAgIVAMmUzXW7GcBvS+GdXawthrAEM9CfMA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCmlkcC52c2IuY3owHhcNMTYwMjEyMTAxOTE5WhcNMzYw
-MjEyMTAxOTE5WjAVMRMwEQYDVQQDDAppZHAudnNiLmN6MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEApzklpC0+jz80eDzf+wfHgDYTS5xTFLCzoXVfZt5m
-l2T9de/TQW2eVYyJ0vqvkhL+dfSkzH2GCdb+f0F5GxFfhT4rR4AAk4kXw7hJEh/L
-6CrNy/JaOYNe1TilEDJAliHsoZf57JlAoIx7jyKCq5+sOFxvnQuh72Kt19GDTD3w
-N/o314GrDweeQOvRu4e8mpuLYDLuG98DqzmnTvb7xc1aDRtk5ofYUA9A2+EKYyyo
-/1BhgTO/jajWVuM65sVDa9Rl84ilmUbLMOVKUlwoT4gwQG/8owgNXu895AkALAm0
-ExeCPEjg67cCktIWXlp4p1wH0zfbEYE9VIiM4lcgcD6OGwIDAQABo1swWTAdBgNV
-HQ4EFgQUs/PYqEYGUoKa+2UEe9GoUXKmw6swOAYDVR0RBDEwL4IKaWRwLnZzYi5j
-eoYhaHR0cHM6Ly9pZHAudnNiLmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCTjBqHy13Fd9m9yMBkh0ATYWdFUwjtm9O+QnLFBM00Gwm8evy14ytv
-AIVK+ljiLdEiFrtF7Szx17An2wFHC/7fZZ/lGfy3d+qwKUF8P/AY6zL8zZfwYpJr
-OQy/9x15/f50pyF7eDEm3XRuwUV+HQLqqZz4NUtJI88A7/wy60bhNxGFYzxLO5dJ
-fc8cOb2/uYOBc2W08BOf2Q6nBywhojlq1TBVigHFb5jdakQ6JJ1WbaKBtMbsXzGW
-7d23IK/AF0SEWknFsrqnhapeDFc2Jh7XZkz8Zf0LMg3d/fCQtTVdi6iS4u1pfzRv
-JYH5NKeeBBdGOunN7KfPzfd86tveJ6kn
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEhDCCA2ygAwIBAgIQMsrmzp+34gaErwPAEEHDaTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDEwNzAwMDAwMFoXDTE2MDEwNzIzNTk1OVowZTELMAkGA1UE
-BhMCQ1oxQTA/BgNVBAoMOFZ5c29rw6EgxaFrb2xhIGLDocWIc2vDoSAtIFRlY2hu
-aWNrw6EgdW5pdmVyeml0YSBPc3RyYXZhMRMwEQYDVQQDEwppZHAudnNiLmN6MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyn69Pwg4S/psf0nUhaz0lst9
-XC677alnuLNJBXFn/nNb+zZK/EVQBA4S6puSWBA9VVKrXmDWiUVuqAizzWNgaEKq
-/ssklSA5/gAsxULsvO3MB6lCBU9fpT9mVnJe7NZ6NOd9H4F+ImIGB/jQrqzeI5HZ
-39ceuuSx/rSkknu31BiE1fsHswtFqjUDa70IGHrvY+5LT0X0Q6CyOnO5VEZm3YWQ
-bYifE0xk0ntJAwyDVAV9bVPQxtisai/uvhNmMTsiDCnjK1PIM5nFnLpGEZij8iBJ
-QU5QFStykiFV/58M0xsprC/J23TOodP8mv7D4EYlTCfJ4EQ5uXwl3d1ATA0hBwID
-AQABo4IBXTCCAVkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYD
-VR0OBBYEFD8TNImBkVfIIWRwMN6X08cgCD+SMA4GA1UdDwEB/wQEAwIFoDAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAE
-ETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1
-BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBUG
-A1UdEQQOMAyCCmlkcC52c2IuY3owDQYJKoZIhvcNAQEFBQADggEBAHSOi94CDBd4
-KEw9Xv/DYSTNLin25EBU3BB752KG+JWBkeSSK+4/BaxaUFG44zUqcRheebYkovVE
-opyKs7cTdEC6E+/1R6PSlKmkMTRqAllVUxnnXOa1k84jaG3bPWPjYWWIk9iRX0sG
-nFXjhATWbi7bRx15x36jP2vR/yxigWhN73cxZNhhAC76zcH/Fj8/qUhTITiV5hyq
-8ARxGHOMVSrlwkwBECg71sdijCPAg76WjNrTuFN6c3L2NQcLYszy4N/MFBpEl0ws
-uGEHDQJdr6KAGF8iO78FoR66sQNIvHTSpJCUyS5tRkHn59BfUlapw4Y6eQ6bxJDN
-h15jC+yc8m8=
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vsb.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">VSB - Technical University of Ostrava</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Vysoká škola báňská - Technická univerzita Ostrava</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">VSB - Technical University of Ostrava</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">VŠB - Technická univerzita Ostrava</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vsb.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://en.vsb.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Radomir</md:GivenName>
-    <md:SurName>Orkac</md:SurName>
-    <md:EmailAddress>radomir.orkac@vsb.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Lason</md:SurName>
-    <md:EmailAddress>martin.lason@vsb.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vu-wien.ac.at-idp-shibboleth.xml
deleted file mode 100644
index 3625e334..00000000
--- a/swamid-interfederations-2.0/idp.vu-wien.ac.at-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.vu-wien.ac.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-11-27T16:13:02Z">
-      <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://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
-      </saml: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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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">vetmeduni.ac.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Veterinärmedizinische Universität Wien</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Veterinary Medicine, Vienna</mdui:DisplayName>
-        <mdui:Logo width="16" height="16">https://www.vetmeduni.ac.at/favicon.ico</mdui:Logo>
-        <mdui:Logo width="231" height="69">https://www.vetmeduni.ac.at/fileadmin/vetmed/img/logo.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.vetmeduni.ac.at/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.vetmeduni.ac.at/en/</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>
-MIIDLzCCAhegAwIBAgIUArxd4kLebWsQSo73wqw//qDah+UwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLnZ1LXdpZW4uYWMuYXQwHhcNMDgxMTIxMDkyNzQy
-WhcNMjgxMTIxMDkyNzQyWjAcMRowGAYDVQQDExFpZHAudnUtd2llbi5hYy5hdDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJP9YiA5hoGWj3EQVMD/FzTa
-GxKmYW7yrE2IEcytXZs80z7g00WDfkvgXxPW8p8/djs2EW6Qb0Mjt3Q3U0pXSWkb
-xSsYXZyBzRpyFxeJEIMKgqAkYG2Ka9War/XJTzOZ9VjEspxgm4ROD1L8tA/6rS5o
-MwmwgKW/xowmNC+M+jnCxjZ664XqhoqZowxOSMSGJJQ8RFizmoI1Zn7XIcXQXxjF
-hsMyvpid0uYbyh5kKF+f/DyyPisvsSgeDXZgkaooCcuR70y1lOSQe9XIGsg8LRBE
-niumfn3H7CbzDfAyPar1SkuSGOR79io5ZBSSNLw05rYLWLZED0BkMl5vCQOlAeEC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnZ1LXdpZW4uYWMuYXSGKGh0dHBzOi8v
-aWRwLnZ1LXdpZW4uYWMuYXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFO0XxOhl
-z8mFCvsOavIhT5M47VckMA0GCSqGSIb3DQEBBQUAA4IBAQBAbvWWzPpHX9WvPdH/
-kxg72syav82qGs94YvRugz7xQrKe9+qn/0hT8/ln0ROstr3q/1Ah9b5XDQr3cb37
-DQOuMjSu8BW0RrvZbuoHWzS3J4Ay2iAIA54fo/g9sq8xlhkDN/N+ySnhWjcJi1ag
-tnd5Kz76fXuLhdnT1jjV6e3YnvBKD7F2sKUJdm8KErwfa3IR2XpTiiCnu+5VogJZ
-1QE5FJMTgKAzci109QuYqSDgqMbBs38nU95tsSN7M8B43FtEOw4dnrz9im+Sc4yK
-IfN31Zc1iB2M7lKMIc7i9VqM+5TXp4mrJwTyl0u20ITLhxu1SNgyZyeQXMHLD8Bl
-1Tdv</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vu-wien.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.vu-wien.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://idp.vu-wien.ac.at/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vu-wien.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://idp.vu-wien.ac.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vu-wien.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vu-wien.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">vetmeduni.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>
-MIIDLzCCAhegAwIBAgIUArxd4kLebWsQSo73wqw//qDah+UwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLnZ1LXdpZW4uYWMuYXQwHhcNMDgxMTIxMDkyNzQy
-WhcNMjgxMTIxMDkyNzQyWjAcMRowGAYDVQQDExFpZHAudnUtd2llbi5hYy5hdDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJP9YiA5hoGWj3EQVMD/FzTa
-GxKmYW7yrE2IEcytXZs80z7g00WDfkvgXxPW8p8/djs2EW6Qb0Mjt3Q3U0pXSWkb
-xSsYXZyBzRpyFxeJEIMKgqAkYG2Ka9War/XJTzOZ9VjEspxgm4ROD1L8tA/6rS5o
-MwmwgKW/xowmNC+M+jnCxjZ664XqhoqZowxOSMSGJJQ8RFizmoI1Zn7XIcXQXxjF
-hsMyvpid0uYbyh5kKF+f/DyyPisvsSgeDXZgkaooCcuR70y1lOSQe9XIGsg8LRBE
-niumfn3H7CbzDfAyPar1SkuSGOR79io5ZBSSNLw05rYLWLZED0BkMl5vCQOlAeEC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnZ1LXdpZW4uYWMuYXSGKGh0dHBzOi8v
-aWRwLnZ1LXdpZW4uYWMuYXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFO0XxOhl
-z8mFCvsOavIhT5M47VckMA0GCSqGSIb3DQEBBQUAA4IBAQBAbvWWzPpHX9WvPdH/
-kxg72syav82qGs94YvRugz7xQrKe9+qn/0hT8/ln0ROstr3q/1Ah9b5XDQr3cb37
-DQOuMjSu8BW0RrvZbuoHWzS3J4Ay2iAIA54fo/g9sq8xlhkDN/N+ySnhWjcJi1ag
-tnd5Kz76fXuLhdnT1jjV6e3YnvBKD7F2sKUJdm8KErwfa3IR2XpTiiCnu+5VogJZ
-1QE5FJMTgKAzci109QuYqSDgqMbBs38nU95tsSN7M8B43FtEOw4dnrz9im+Sc4yK
-IfN31Zc1iB2M7lKMIc7i9VqM+5TXp4mrJwTyl0u20ITLhxu1SNgyZyeQXMHLD8Bl
-1Tdv</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vu-wien.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vu-wien.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">Veterinärmedizinische Universität Wien</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Veterinärmedizinische Universität Wien</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.vetmeduni.ac.at/de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.vetmeduni.ac.at/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Wolfgang</md:GivenName>
-    <md:SurName>Cernohorsky</md:SurName>
-    <md:EmailAddress>mailto:Wolfgang.Cernohorsky@vu-wien.ac.at</md:EmailAddress>
-    <md:TelephoneNumber>+43 1 25077 1602</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml
deleted file mode 100644
index c7175ccd..00000000
--- a/swamid-interfederations-2.0/idp.vub.ac.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,113 +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://idp.vub.ac.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">vub.ac.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">VUB - Vrije Universiteit Brussel</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Vrije Universiteit Brussel</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp.vub.ac.be/logo/vub-small.jpg</mdui:Logo>
-        <mdui:Logo height="110" width="347">https://idp.vub.ac.be/logo/vub-large.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>134.184.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:06a8:1190::/64</mdui:IPHint>
-        <mdui:DomainHint>vub.ac.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:50.8213690,4.3957100</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUUfJ0sMk1r7U/7VeOC4dUi0tFk+4wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLnZ1Yi5hYy5iZTAeFw0xMzEyMTcwODQ5NDRaFw0z
-MzEyMTcwODQ5NDRaMBgxFjAUBgNVBAMTDWlkcC52dWIuYWMuYmUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgAg+ICRsB+l1EPx8pRtbp/W/s0DruoIHO
-wlHgtvhVToh/GDdAqDNHdhGGTSTVc77JO1j1yV3sQgczH+4Hz/bczwUCbna3ItgN
-SvnhzzFcpzdJ7MKJJaIc4CszrZG4TBA3hHaAIOsjlOz8QwG7DIhx7pF/wZktYJkQ
-RE6vC6Y579QcFqxBF8nNi+jKELWgwean36+lqIDYLhsWDye/lJ/h5dgp0W1bfYM+
-CNXNbBF5IiLY9RgypiGBtm+717vig8GVpHOsiFsN7+CPboRr0BFVwg2NEpnvlZSa
-plqYBHOlmqLDJv8l7Du6ss1Vp1eLgp/cdb0pbeBme/+NCMZIGOJvAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC52dWIuYWMuYmWGJGh0dHBzOi8vaWRwLnZ1Yi5hYy5i
-ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb3yOJUsB5SdaKAXaXW+Xxlub4Dgw
-DQYJKoZIhvcNAQEFBQADggEBAArzqWvBazHyT82L/HbNUH+KbrbOtgj2eiLRmWDT
-GCB1/qXuuh+WLejyvN7EJ+SBGGdWEdytBvZyAmIq4Kv4EDDupu/ynYCxP03v6oW5
-ucpeNa/q3lA9oAXPNp4z5DXJYTTMlRXOojmJnokizp4pxKM9hKVPBN7QB7n6KjPy
-2F+EAkHGF5c4LKgMsOK4Gsjux1vi/PbAO0qiMOfsHdKM1ZUJQP+skNYkhjMCVV4d
-/h/4Ex6XuS8nqlpwIti+gqTmnULy0Aa3fBluoLmvB38uDPdlC3QkBiFbQtX+GUDG
-dnwz715sBlh9o1XpY8ZJk6VAdG4njwd/RBj9cZcya3tIaMw=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vub.ac.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vub.ac.be/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be: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.vub.ac.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.vub.ac.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.vub.ac.be/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">vub.ac.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUUfJ0sMk1r7U/7VeOC4dUi0tFk+4wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLnZ1Yi5hYy5iZTAeFw0xMzEyMTcwODQ5NDRaFw0z
-MzEyMTcwODQ5NDRaMBgxFjAUBgNVBAMTDWlkcC52dWIuYWMuYmUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgAg+ICRsB+l1EPx8pRtbp/W/s0DruoIHO
-wlHgtvhVToh/GDdAqDNHdhGGTSTVc77JO1j1yV3sQgczH+4Hz/bczwUCbna3ItgN
-SvnhzzFcpzdJ7MKJJaIc4CszrZG4TBA3hHaAIOsjlOz8QwG7DIhx7pF/wZktYJkQ
-RE6vC6Y579QcFqxBF8nNi+jKELWgwean36+lqIDYLhsWDye/lJ/h5dgp0W1bfYM+
-CNXNbBF5IiLY9RgypiGBtm+717vig8GVpHOsiFsN7+CPboRr0BFVwg2NEpnvlZSa
-plqYBHOlmqLDJv8l7Du6ss1Vp1eLgp/cdb0pbeBme/+NCMZIGOJvAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC52dWIuYWMuYmWGJGh0dHBzOi8vaWRwLnZ1Yi5hYy5i
-ZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb3yOJUsB5SdaKAXaXW+Xxlub4Dgw
-DQYJKoZIhvcNAQEFBQADggEBAArzqWvBazHyT82L/HbNUH+KbrbOtgj2eiLRmWDT
-GCB1/qXuuh+WLejyvN7EJ+SBGGdWEdytBvZyAmIq4Kv4EDDupu/ynYCxP03v6oW5
-ucpeNa/q3lA9oAXPNp4z5DXJYTTMlRXOojmJnokizp4pxKM9hKVPBN7QB7n6KjPy
-2F+EAkHGF5c4LKgMsOK4Gsjux1vi/PbAO0qiMOfsHdKM1ZUJQP+skNYkhjMCVV4d
-/h/4Ex6XuS8nqlpwIti+gqTmnULy0Aa3fBluoLmvB38uDPdlC3QkBiFbQtX+GUDG
-dnwz715sBlh9o1XpY8ZJk6VAdG4njwd/RBj9cZcya3tIaMw=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.vub.ac.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.vub.ac.be: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">
-                Vrije Universiteit Brussel
-        </md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">
-                VUB - Vrije Universiteit Brussel
-        </md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">
-                http://www.vub.ac.be
-        </md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>support@vub.ac.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.waltham.ac.uk-openathens.xml b/swamid-interfederations-2.0/idp.waltham.ac.uk-openathens.xml
deleted file mode 100644
index 730578f0..00000000
--- a/swamid-interfederations-2.0/idp.waltham.ac.uk-openathens.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.waltham.ac.uk/openathens">
-  <!--
-		This is an IdP (owned by Eduserv) for Waltham Forest College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">waltham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/waltham.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/waltham.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Waltham Forest College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.waltham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.warkscol.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.warkscol.ac.uk-shibboleth.xml
deleted file mode 100644
index c72ca7b7..00000000
--- a/swamid-interfederations-2.0/idp.warkscol.ac.uk-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.warkscol.ac.uk/shibboleth">
-  <!--
-		This is a "Warwickshire College" Shibboleth IdP for Warwickshire College, Royal Leamington Spa, Rugby and Moreton Morrell.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-04-27T17:45: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">warkscol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQD/4wYFNpyojzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
-						QjEVMBMGA1UECBMMV2Fyd2lja3NoaXJlMRAwDgYDVQQHEwdXYXJ3aWNrMR0wGwYD
-						VQQKExRXYXJ3aWNrc2hpcmUgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLndhcmtzY29s
-						LmFjLnVrMB4XDTE0MDUwMTEzMTMxMFoXDTM0MDQyNjEzMTMxMFowcjELMAkGA1UE
-						BhMCR0IxFTATBgNVBAgTDFdhcndpY2tzaGlyZTEQMA4GA1UEBxMHV2Fyd2ljazEd
-						MBsGA1UEChMUV2Fyd2lja3NoaXJlIENvbGxlZ2UxGzAZBgNVBAMTEmlkcC53YXJr
-						c2NvbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhK7iVu
-						A691GNEVeV8hM4gdlUNDpZzGQUgUsekgjc+75zkpUMrkCPuSlJeIoegK524HMDGl
-						/J4tHGS8NtQwnaG/bigbWu3BOXR7bKwHOHpMhIek1V8BXOhBadfnp7IS234e4h/L
-						yreSdxsJdaPKiT8+Orxlu5nmOUN8cLhR7FWZm6TZjN8uEObKTd/QxW0y9PiZFuyY
-						VO/P2yv5QmHTuC81eKI3bRIQeLo/Lb/ixKdsihsJ/AqfjCpTUo0OdV9yawIPfEpu
-						cOoWvaWGWAi2P8sM/0VfyIM1Hv2OReMef8sCS/MmSxV7LbEGk2GWSWXl2XwiJXov
-						Kcr/t3HI+s1OGi0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEArSIfclS/osh3HZT8
-						Y9pU4rTBpY+5xmYdLZjGaTk4DYJJFOU79IF/CdRMVwjSkspNiQT5lBvps9zB7/NQ
-						w2gZHlixBj9dKRNUwYEjSCX03LXb4lBF4T81DSL9PcdbGfvgDVfk9TcZNX9KA0Bd
-						2GhMub8+MRrSsrvX4wLyUeNqlA4Hb7RT4Y584iO58+hOL9qwDPskqUPSp1wXeBsJ
-						oPn7U2TcWMwsP66fOo2fO7Xdt8iyeeZyDLBvFul2e3NXMjNlr5v3nyUze3iLer1m
-						ufX7okaOmCXfK/slbpd8nhkch7kFhWd2BF3RRRsihBB6VKvKYldfNmUZ7QT3sCNv
-						pouvTA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warkscol.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warkscol.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://shib-login.warkscol.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-login.warkscol.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-login.warkscol.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-login.warkscol.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">warkscol.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQD/4wYFNpyojzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
-						QjEVMBMGA1UECBMMV2Fyd2lja3NoaXJlMRAwDgYDVQQHEwdXYXJ3aWNrMR0wGwYD
-						VQQKExRXYXJ3aWNrc2hpcmUgQ29sbGVnZTEbMBkGA1UEAxMSaWRwLndhcmtzY29s
-						LmFjLnVrMB4XDTE0MDUwMTEzMTMxMFoXDTM0MDQyNjEzMTMxMFowcjELMAkGA1UE
-						BhMCR0IxFTATBgNVBAgTDFdhcndpY2tzaGlyZTEQMA4GA1UEBxMHV2Fyd2ljazEd
-						MBsGA1UEChMUV2Fyd2lja3NoaXJlIENvbGxlZ2UxGzAZBgNVBAMTEmlkcC53YXJr
-						c2NvbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALhK7iVu
-						A691GNEVeV8hM4gdlUNDpZzGQUgUsekgjc+75zkpUMrkCPuSlJeIoegK524HMDGl
-						/J4tHGS8NtQwnaG/bigbWu3BOXR7bKwHOHpMhIek1V8BXOhBadfnp7IS234e4h/L
-						yreSdxsJdaPKiT8+Orxlu5nmOUN8cLhR7FWZm6TZjN8uEObKTd/QxW0y9PiZFuyY
-						VO/P2yv5QmHTuC81eKI3bRIQeLo/Lb/ixKdsihsJ/AqfjCpTUo0OdV9yawIPfEpu
-						cOoWvaWGWAi2P8sM/0VfyIM1Hv2OReMef8sCS/MmSxV7LbEGk2GWSWXl2XwiJXov
-						Kcr/t3HI+s1OGi0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEArSIfclS/osh3HZT8
-						Y9pU4rTBpY+5xmYdLZjGaTk4DYJJFOU79IF/CdRMVwjSkspNiQT5lBvps9zB7/NQ
-						w2gZHlixBj9dKRNUwYEjSCX03LXb4lBF4T81DSL9PcdbGfvgDVfk9TcZNX9KA0Bd
-						2GhMub8+MRrSsrvX4wLyUeNqlA4Hb7RT4Y584iO58+hOL9qwDPskqUPSp1wXeBsJ
-						oPn7U2TcWMwsP66fOo2fO7Xdt8iyeeZyDLBvFul2e3NXMjNlr5v3nyUze3iLer1m
-						ufX7okaOmCXfK/slbpd8nhkch7kFhWd2BF3RRRsihBB6VKvKYldfNmUZ7QT3sCNv
-						pouvTA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warkscol.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warkscol.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">Warwickshire College, Royal Leamington Spa, Rugby and Moreton Morrell</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Warwickshire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.warkscol.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rob</GivenName>
-    <SurName>Mitchell</SurName>
-    <EmailAddress>mailto:rmitchell@warkscol.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Mitchell</SurName>
-    <EmailAddress>mailto:rmitchell@warkscol.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.warrington.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.warrington.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 98bd591e..00000000
--- a/swamid-interfederations-2.0/idp.warrington.ac.uk-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.warrington.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Warrington Collegiate Institute.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-25T15:09: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">warrington.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFFzCCA/+gAwIBAgIQMjinXVJxXZDuVUOslVHWJzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMTEwNjAwMDAwMFoXDTE2MTEwNTIzNTk1OVowgeMxCzAJBgNV
-						BAYTAkdCMRAwDgYDVQQREwdXQTIgOFFBMREwDwYDVQQIEwhDaGVzaGlyZTETMBEG
-						A1UEBxMKV0FSUklOR1RPTjEQMA4GA1UECRMHV2lud2ljazEVMBMGA1UECRMMV2lu
-						d2ljayBSb2FkMRwwGgYDVQQJExNXaW53aWNrIFJvYWQgQ2FtcHVzMR4wHAYDVQQK
-						ExVXYXJyaW5ndG9uIENvbGxlZ2lhdGUxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR0w
-						GwYDVQQDExRpZHAud2FycmluZ3Rvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAKyqFQr4F107oAM805XCaRDWpXFlGkT2l6HRRxn/cGht/Wgn
-						Bu3wgxxdH+DZnqEUNs2fkrIvRRPxN1QcJ2Bg9dyi1aqM2ZPKUgVLSBoJo1YT29gv
-						Rp95RtHccpRHjeKNCN7Y0fDYQaGzOhfQ1MJ1arguQBvKgDpiRoQ/SQR3QWicWYqJ
-						N+vltT+IPOmvT4PuyWIVvWs3Us4ESRFvGn3V8u7Sm+A4tjSOZq3ZJjZVI0ixWVPa
-						SBcb418sxQNnMaydJokgoM+UnL21H70YnKHmgvHJu4L4HzX3AHWf4CZLVmS1AT7j
-						OfSqvh20bBwVfwaDiIAzUHeWAeLPjfmb64RZbRcCAwEAAaOCAXEwggFtMB8GA1Ud
-						IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTLdHJeiw7kogwc
-						sVR6BNc9JC0urzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
-						FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
-						HTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
-						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
-						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
-						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgw
-						FoIUaWRwLndhcnJpbmd0b24uYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAGRcCuf
-						CXbp7sAivclytw0cMO1xrGmMEi4wVjpjkyPtttmkngZRYa21gLeExdxr+fs1P/5G
-						LAaFhLCtosj7W6iUtehMDwMNQPs1Lin5MDqhOQLSnEtT8WVDWjf25cRxdbpxf1ti
-						dAmU9mX4HT93FMWn/RGgfEoi6wc0VPW37j1kRruqHTU9Wxyujjyw6RZQ9CWx8y8g
-						ntmhLWOveV9P5ID6Sh3QWzMcE005NKjiHdO8RfBrhg5FfTj9dOsee9Kbx6GH6gVj
-						OBbEtsqTq+EVBcim7XZmEbVslQwu0iH1nM/HWebqfo4Acugy7Isy6oc43HVnD/W7
-						JzDQd9U2/1ntIS0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warrington.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warrington.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.warrington.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.warrington.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.warrington.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.warrington.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">warrington.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFFzCCA/+gAwIBAgIQMjinXVJxXZDuVUOslVHWJzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMTEwNjAwMDAwMFoXDTE2MTEwNTIzNTk1OVowgeMxCzAJBgNV
-						BAYTAkdCMRAwDgYDVQQREwdXQTIgOFFBMREwDwYDVQQIEwhDaGVzaGlyZTETMBEG
-						A1UEBxMKV0FSUklOR1RPTjEQMA4GA1UECRMHV2lud2ljazEVMBMGA1UECRMMV2lu
-						d2ljayBSb2FkMRwwGgYDVQQJExNXaW53aWNrIFJvYWQgQ2FtcHVzMR4wHAYDVQQK
-						ExVXYXJyaW5ndG9uIENvbGxlZ2lhdGUxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR0w
-						GwYDVQQDExRpZHAud2FycmluZ3Rvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAKyqFQr4F107oAM805XCaRDWpXFlGkT2l6HRRxn/cGht/Wgn
-						Bu3wgxxdH+DZnqEUNs2fkrIvRRPxN1QcJ2Bg9dyi1aqM2ZPKUgVLSBoJo1YT29gv
-						Rp95RtHccpRHjeKNCN7Y0fDYQaGzOhfQ1MJ1arguQBvKgDpiRoQ/SQR3QWicWYqJ
-						N+vltT+IPOmvT4PuyWIVvWs3Us4ESRFvGn3V8u7Sm+A4tjSOZq3ZJjZVI0ixWVPa
-						SBcb418sxQNnMaydJokgoM+UnL21H70YnKHmgvHJu4L4HzX3AHWf4CZLVmS1AT7j
-						OfSqvh20bBwVfwaDiIAzUHeWAeLPjfmb64RZbRcCAwEAAaOCAXEwggFtMB8GA1Ud
-						IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTLdHJeiw7kogwc
-						sVR6BNc9JC0urzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
-						FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
-						HTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
-						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
-						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
-						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgw
-						FoIUaWRwLndhcnJpbmd0b24uYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAGRcCuf
-						CXbp7sAivclytw0cMO1xrGmMEi4wVjpjkyPtttmkngZRYa21gLeExdxr+fs1P/5G
-						LAaFhLCtosj7W6iUtehMDwMNQPs1Lin5MDqhOQLSnEtT8WVDWjf25cRxdbpxf1ti
-						dAmU9mX4HT93FMWn/RGgfEoi6wc0VPW37j1kRruqHTU9Wxyujjyw6RZQ9CWx8y8g
-						ntmhLWOveV9P5ID6Sh3QWzMcE005NKjiHdO8RfBrhg5FfTj9dOsee9Kbx6GH6gVj
-						OBbEtsqTq+EVBcim7XZmEbVslQwu0iH1nM/HWebqfo4Acugy7Isy6oc43HVnD/W7
-						JzDQd9U2/1ntIS0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warrington.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warrington.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">Warrington Collegiate Institute</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Warrington Collegiate (via IdP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.warrington.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Help Desk</GivenName>
-    <EmailAddress>mailto:Helpdesk@Warrington.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Graham</GivenName>
-    <SurName>Robinson</SurName>
-    <EmailAddress>mailto:GRobinson@Warrington.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.warwick.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index fc16db6b..00000000
--- a/swamid-interfederations-2.0/idp.warwick.ac.uk-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" entityID="https://idp.warwick.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Warwick.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-27T20:54: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">University of Warwick</mdui:DisplayName>
-        <mdui:Logo height="26" width="90">https://idp.warwick.ac.uk/origin/static/images/idp-logo-90x26.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp.warwick.ac.uk/origin/static/images/idp-logo-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>137.205.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>warwick.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:52.381991,-1.562032</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:52.286432,-1.551475</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">warwick.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAMUgGil9ReUGOng/Gws9DutReU1TMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEWlkcC53YXJ3aWNrLmFjLnVrMB4XDTE0MDcwOTE0MDk0
-						OFoXDTM0MDcwOTE0MDk0OFowHDEaMBgGA1UEAxMRaWRwLndhcndpY2suYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCebNiWX5f4B7Xgg1ukG04P
-						GvuNRynjJnrGzFqrqpOhFSvljVhU8QBkkVj6+QNh4llB3wSSlNTBiPze9zd45/1l
-						rcPwzXQ5GsB2a//2Z8pS7B5s1qJKZH/zjLp+UIKCqXGjftYHHwPstAO8pMMSuk4M
-						ERYCWLKt892PmrgjOnvXS0VWY9ltqAvAAl/d9Mae0UXkIYKk3VJNfClAk8U3zOej
-						Ni25fAyEYwaGEfGcbBUHbxvMJlI1WaneOaoAPk20IjqrOfhK5OH9lRbR7vxR2/w5
-						gya37LLhDRqADpp/dc8Qa35AzlOmgvzE3teQFwnpSHKL1BRIAotp4KTbu8xLDJEN
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC53YXJ3aWNrLmFjLnVrhihodHRwczov
-						L2lkcC53YXJ3aWNrLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ8q27h
-						eoQoKE9yxN7Jt/YS7RIYOjANBgkqhkiG9w0BAQUFAAOCAQEAUCzlCcG5TVL1P+IR
-						523VOgKUq8YRzwCqERqXNRD4x0WQy8EYCYCKbYWhl5FrJNpG992nlRS2fXfGe0el
-						td7Npy8vfBaroIgrOclREjYO+YBRC72ubIZKWGcU+Nq9C+RJZ2QjK+yMb76C1yUc
-						TQEfw/lF/hSUofqgUSRketoCj80AOGrrG0wGV7oWuqW2MnvTIxnlosclSJgIpxW/
-						RWShrJhBzCBHU5Nbz7+JEhFX3mSuBUMtSV1qsZbtwtdHVm977pOYrm5Nd35KBKNf
-						+YK5ljnepO58isd09Xn1XGEqM7kySM4H55OhvBKzeIMSaKmNFJY3e8CJJmMl9u+j
-						vOGPdg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warwick.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.warwick.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.warwick.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.warwick.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">warwick.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAMUgGil9ReUGOng/Gws9DutReU1TMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEWlkcC53YXJ3aWNrLmFjLnVrMB4XDTE0MDcwOTE0MDk0
-						OFoXDTM0MDcwOTE0MDk0OFowHDEaMBgGA1UEAxMRaWRwLndhcndpY2suYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCebNiWX5f4B7Xgg1ukG04P
-						GvuNRynjJnrGzFqrqpOhFSvljVhU8QBkkVj6+QNh4llB3wSSlNTBiPze9zd45/1l
-						rcPwzXQ5GsB2a//2Z8pS7B5s1qJKZH/zjLp+UIKCqXGjftYHHwPstAO8pMMSuk4M
-						ERYCWLKt892PmrgjOnvXS0VWY9ltqAvAAl/d9Mae0UXkIYKk3VJNfClAk8U3zOej
-						Ni25fAyEYwaGEfGcbBUHbxvMJlI1WaneOaoAPk20IjqrOfhK5OH9lRbR7vxR2/w5
-						gya37LLhDRqADpp/dc8Qa35AzlOmgvzE3teQFwnpSHKL1BRIAotp4KTbu8xLDJEN
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC53YXJ3aWNrLmFjLnVrhihodHRwczov
-						L2lkcC53YXJ3aWNrLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ8q27h
-						eoQoKE9yxN7Jt/YS7RIYOjANBgkqhkiG9w0BAQUFAAOCAQEAUCzlCcG5TVL1P+IR
-						523VOgKUq8YRzwCqERqXNRD4x0WQy8EYCYCKbYWhl5FrJNpG992nlRS2fXfGe0el
-						td7Npy8vfBaroIgrOclREjYO+YBRC72ubIZKWGcU+Nq9C+RJZ2QjK+yMb76C1yUc
-						TQEfw/lF/hSUofqgUSRketoCj80AOGrrG0wGV7oWuqW2MnvTIxnlosclSJgIpxW/
-						RWShrJhBzCBHU5Nbz7+JEhFX3mSuBUMtSV1qsZbtwtdHVm977pOYrm5Nd35KBKNf
-						+YK5ljnepO58isd09Xn1XGEqM7kySM4H55OhvBKzeIMSaKmNFJY3e8CJJmMl9u+j
-						vOGPdg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.warwick.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Warwick</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Warwick</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.warwick.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nick</GivenName>
-    <SurName>Howes</SurName>
-    <EmailAddress>mailto:n.howes@warwick.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Howes</SurName>
-    <EmailAddress>mailto:n.howes@warwick.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.we-learn.com-shibboleth.xml b/swamid-interfederations-2.0/idp.we-learn.com-shibboleth.xml
deleted file mode 100644
index 0e71f8d7..00000000
--- a/swamid-interfederations-2.0/idp.we-learn.com-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://idp.we-learn.com/shibboleth">
-  <!--
-		This is a "Warwickshire e-Learning Community" Shibboleth IdP for Warwickshire County Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-12T16:34: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">we-learn.com</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEmzCCA4OgAwIBAgIRALIgeKCSmCSkkGB68w8tkDgwDQYJKoZIhvcNAQELBQAw
-						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-						IENBIDIwHhcNMTUwNDI0MDAwMDAwWhcNMTgwNDIzMjM1OTU5WjA+MSEwHwYDVQQL
-						ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGTAXBgNVBAMTEGlkcC53ZS1sZWFy
-						bi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTaeY2M76584Kc
-						5EAHUHOoPtNRe7OBh6HnDIkznaEuimIg/fYsEtIzUWYa12dtHCTiMGSw2mwfspcm
-						fPQ+2+BxtpU9UsuPCgELVvDP66ilEKncIZqoR2DyE3KkXCBxFhoeQuW3aB6tJs8J
-						Smm6WqbgtHoeMJ3BLihRJEN7Rv/LTh4YdznGR+jMlarsNjKRNDxNLtE5lLC+KC6H
-						zT4vG1DfMXKSpFabPpoQGNFDTpN6g1T0SvlrPoVdzTr9nudNp1Tvx/A2qdrKhPu8
-						Oai9fv0BEhr/TypfhGpgLTv81WNFhCurKt6pdwg3/vMWNNrrCCVzWqBnAJ1DMmgY
-						sobdNRw7AgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYo
-						sP22vTAdBgNVHQ4EFgQUKq1u1QgwyxHQzgUGESXLq75oumMwDgYDVR0PAQH/BAQD
-						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-						L6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3Js
-						MGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1
-						c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3Nw
-						LnVzZXJ0cnVzdC5jb20wGwYDVR0RBBQwEoIQaWRwLndlLWxlYXJuLmNvbTANBgkq
-						hkiG9w0BAQsFAAOCAQEAL8acYPWalG9ngwLOpkjaQApU2E+Pi6CAoYqO3M0W8oRS
-						eysjGaswZ4g+9VZwyRI0N1iptjxK9JMCZZibN0w1Cnfg7iqcENywtKvK+cEW+/hL
-						41bw1jfeRcPHFQCSlod7b5JZ0bSbb0qMN54NsuTjitwd6vFVSFU8sRSvG/eNkbnp
-						7wa8IX7Hr/ZGTiR8Zrjb0EX/aAUPRz6YX5W0AxW9zYIgZ8ygmO0ri1uhspHh6sPF
-						o1cIOol/iyvTszEztbv5fqSUVrFre+EhFqZmstbD6oWJG29X5lnrgnokiRzlH307
-						jFH1UhDrKPT2FKWjapS+ttqC6T3U8f2u0f/tvxC+hQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.we-learn.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.we-learn.com: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.we-learn.com/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.we-learn.com/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.we-learn.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.we-learn.com/idp/profile/SAML2/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">we-learn.com</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEmzCCA4OgAwIBAgIRALIgeKCSmCSkkGB68w8tkDgwDQYJKoZIhvcNAQELBQAw
-						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-						IENBIDIwHhcNMTUwNDI0MDAwMDAwWhcNMTgwNDIzMjM1OTU5WjA+MSEwHwYDVQQL
-						ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGTAXBgNVBAMTEGlkcC53ZS1sZWFy
-						bi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTaeY2M76584Kc
-						5EAHUHOoPtNRe7OBh6HnDIkznaEuimIg/fYsEtIzUWYa12dtHCTiMGSw2mwfspcm
-						fPQ+2+BxtpU9UsuPCgELVvDP66ilEKncIZqoR2DyE3KkXCBxFhoeQuW3aB6tJs8J
-						Smm6WqbgtHoeMJ3BLihRJEN7Rv/LTh4YdznGR+jMlarsNjKRNDxNLtE5lLC+KC6H
-						zT4vG1DfMXKSpFabPpoQGNFDTpN6g1T0SvlrPoVdzTr9nudNp1Tvx/A2qdrKhPu8
-						Oai9fv0BEhr/TypfhGpgLTv81WNFhCurKt6pdwg3/vMWNNrrCCVzWqBnAJ1DMmgY
-						sobdNRw7AgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYo
-						sP22vTAdBgNVHQ4EFgQUKq1u1QgwyxHQzgUGESXLq75oumMwDgYDVR0PAQH/BAQD
-						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-						L6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3Js
-						MGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1
-						c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3Nw
-						LnVzZXJ0cnVzdC5jb20wGwYDVR0RBBQwEoIQaWRwLndlLWxlYXJuLmNvbTANBgkq
-						hkiG9w0BAQsFAAOCAQEAL8acYPWalG9ngwLOpkjaQApU2E+Pi6CAoYqO3M0W8oRS
-						eysjGaswZ4g+9VZwyRI0N1iptjxK9JMCZZibN0w1Cnfg7iqcENywtKvK+cEW+/hL
-						41bw1jfeRcPHFQCSlod7b5JZ0bSbb0qMN54NsuTjitwd6vFVSFU8sRSvG/eNkbnp
-						7wa8IX7Hr/ZGTiR8Zrjb0EX/aAUPRz6YX5W0AxW9zYIgZ8ygmO0ri1uhspHh6sPF
-						o1cIOol/iyvTszEztbv5fqSUVrFre+EhFqZmstbD6oWJG29X5lnrgnokiRzlH307
-						jFH1UhDrKPT2FKWjapS+ttqC6T3U8f2u0f/tvxC+hQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.we-learn.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.we-learn.com:8443/idp/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">Warwickshire County Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Warwickshire e-Learning Community</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.warwickshire.gov.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sam</GivenName>
-    <SurName>Leach</SurName>
-    <EmailAddress>mailto:leach.s@welearn365.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Leach</SurName>
-    <EmailAddress>mailto:leach.s@welearn365.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.weber.edu-idp.xml b/swamid-interfederations-2.0/idp.weber.edu-idp.xml
deleted file mode 100644
index 53fdcc27..00000000
--- a/swamid-interfederations-2.0/idp.weber.edu-idp.xml
+++ /dev/null
@@ -1,78 +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://idp.weber.edu/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">weber.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Weber State University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://weber.edu</mdui:InformationURL>
-        <mdui:Logo height="122" width="238" xml:lang="en">https://www.weber.edu/images/WSU_Logo.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>
-MIIDyTCCArGgAwIBAgIJAKivSalalUbnMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
-BAYTAlVTMQ0wCwYDVQQIDARVdGFoMQ4wDAYDVQQHDAVPZ2RlbjEfMB0GA1UECgwW
-V2ViZXIgU3RhdGUgVW5pdmVyc2l0eTELMAkGA1UECwwCSVQxHzAdBgNVBAMMFldl
-YmVyIFN0YXRlIFVuaXZlcnNpdHkwHhcNMTIwNjE4MTc0MjQxWhcNMjIwNjE4MTc0
-MjQxWjB7MQswCQYDVQQGEwJVUzENMAsGA1UECAwEVXRhaDEOMAwGA1UEBwwFT2dk
-ZW4xHzAdBgNVBAoMFldlYmVyIFN0YXRlIFVuaXZlcnNpdHkxCzAJBgNVBAsMAklU
-MR8wHQYDVQQDDBZXZWJlciBTdGF0ZSBVbml2ZXJzaXR5MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA2IopzhBf7c7xCkBOC+JyEq3RmLDtqGJstrUjhsuw
-szaejXvo5wpU3HnO5hIIiHGCB5eLxO9DPZyrCwwn8TeJdyWBw5Zt44DqXzSTXTcf
-BCfxW05QFd1Js3ptREmybgWOmGQgHasUxkyydiPdIdc7ShJJQKY9vgPhTl2p2jrQ
-hpCuie/d9W5sOIPIZAbMfsbW37/AJ7+kCplXwiqxvf+Z/LOCWOB4umT+iHoJYcr9
-5xfi6U0ROzQcaSA0j6a4sGXvS7EgjvaV9jBlBOH0f1/Vmxwq0T/EcDhI67bpT7FN
-dB0tBkonbzUyaQ1eUqW8MD05orP522dzSajXOrSffzItyQIDAQABo1AwTjAdBgNV
-HQ4EFgQUPYFzS5aVRNPzrwImKoJtAeZSQuowHwYDVR0jBBgwFoAUPYFzS5aVRNPz
-rwImKoJtAeZSQuowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAhaM8
-sGQpkRJj++aFyDimwh5wgmUEtG4wNSiYW+p2Ze+11/k5zefB/Cg9J2n66R9OCJ99
-/yOBsW/bUGGYudv9xAkFoS5Mlm6kVufsjf+/WdogNPv/e+7s4sDK3MS1vu+Mem1W
-m2CwXIRO/y2sqscc84jUV1ESDjjdPsbDYkZTIn0dIEv8QnMFd+DS1Kl/GbH7pF6w
-RTysR81FEkGE/ftL3niiQere3dkZrwTHIBd5wZuLC8dPunxJxGLM6MGytRdThHnD
-S1S10oATr9bZgNj8WEiw7DWG5sHb79+04Sg6gwheKEoHGHupShONIm+JAGHx6sxP
-EeS6iOJIgvPUd0c4sA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.weber.edu/simplesaml/saml2/idp/SingleLogoutService.php?ReturnTo=https%3A%2F%2Fcas.weber.edu%2Flogout"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.weber.edu/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.weber.edu/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Weber State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Weber State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.weber.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jonathan Karras</md:GivenName>
-    <md:EmailAddress>jonathankarras@weber.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Systems Admin Services</md:GivenName>
-    <md:EmailAddress>sysadmin@weber.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Information Security Office</md:GivenName>
-    <md:EmailAddress>security@weber.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Service Desk</md:GivenName>
-    <md:EmailAddress>csupport@weber.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Nate Henne</md:GivenName>
-    <md:EmailAddress>natehenne@weber.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wellcome.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wellcome.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 7541e5ca..00000000
--- a/swamid-interfederations-2.0/idp.wellcome.ac.uk-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://idp.wellcome.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the Wellcome Trust.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">wellcome.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDjDCCAnQCCQDSxQ0pkFszHTANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEbMBkGA1UEChMS
-						VGhlIFdlbGxjb21lIFRydXN0MRswGQYDVQQLExJTaGliYm9sZXRoIFByb2plY3Qx
-						GzAZBgNVBAMTEmlkcC53ZWxsY29tZS5hYy51azAeFw0xMzA2MTkwODQ1MzVaFw0z
-						MzA2MTQwODQ1MzVaMIGHMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEP
-						MA0GA1UEBxMGTG9uZG9uMRswGQYDVQQKExJUaGUgV2VsbGNvbWUgVHJ1c3QxGzAZ
-						BgNVBAsTElNoaWJib2xldGggUHJvamVjdDEbMBkGA1UEAxMSaWRwLndlbGxjb21l
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6MfUt+kgNykR
-						8E2o8xQg67Td9sUz3Xh/4q8jDZTlbblsWn0xCHnpoglT0+dMX2roLWoU1wj2WhyR
-						0aV/gIc1HsFePGvg0/AzKhAFniWUygPTU8lRICZYr6L09gjk1cioiG/b6JQbkhup
-						q68Os3mAWcmndLw64TuY90BdxjCSd+lgAFpPmHhhtQSrhTCWwQFmzGkERTLMRchY
-						WZRGNc66TuCzYfGoiaEfdZzxxm+/VDVJked1vUH4x91fcVEFAuEl2nEpu5pq3gjT
-						u2TVkVZ4tvokZdcGQ4rXjU6Sam/o7Xbj+nz8UsjyyrlYjB8YokgPR87pONi+KmFk
-						0vu6NLuOCwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBX91XErSfqgmH8RVxMtZQu
-						0KWQZB/US90cJhlUa/1CyrCaMVOLDD5tphz588Gkq12cDaoZ9gBSAf92XsDuQqlM
-						DsU2p1OwqAiQ/Qt7eRUnealBsG/FT+ZDPd0Ieec0l42cltp45FaqpZqniaqMNhW6
-						jeZBsl3D8nPC0YLFMdnT81GX+BKxoX4h5BcJzYzpYB/GtcSSbUTZBEfb46K216wo
-						l4tAQPXq7W/jhQ2fGiSDIAPDxUnMaCak1DXL5T/3nyA6F9RbC8z9FPvP7sAjgfdE
-						QTLzavN+fHNlz6ykEglkseHbRs19a1x/EP7tNR8juq3QBCnIpLDFzPt7OQE7mrre
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wellcome.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wellcome.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.wellcome.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wellcome.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wellcome.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wellcome.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">wellcome.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDjDCCAnQCCQDSxQ0pkFszHTANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEbMBkGA1UEChMS
-						VGhlIFdlbGxjb21lIFRydXN0MRswGQYDVQQLExJTaGliYm9sZXRoIFByb2plY3Qx
-						GzAZBgNVBAMTEmlkcC53ZWxsY29tZS5hYy51azAeFw0xMzA2MTkwODQ1MzVaFw0z
-						MzA2MTQwODQ1MzVaMIGHMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEP
-						MA0GA1UEBxMGTG9uZG9uMRswGQYDVQQKExJUaGUgV2VsbGNvbWUgVHJ1c3QxGzAZ
-						BgNVBAsTElNoaWJib2xldGggUHJvamVjdDEbMBkGA1UEAxMSaWRwLndlbGxjb21l
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6MfUt+kgNykR
-						8E2o8xQg67Td9sUz3Xh/4q8jDZTlbblsWn0xCHnpoglT0+dMX2roLWoU1wj2WhyR
-						0aV/gIc1HsFePGvg0/AzKhAFniWUygPTU8lRICZYr6L09gjk1cioiG/b6JQbkhup
-						q68Os3mAWcmndLw64TuY90BdxjCSd+lgAFpPmHhhtQSrhTCWwQFmzGkERTLMRchY
-						WZRGNc66TuCzYfGoiaEfdZzxxm+/VDVJked1vUH4x91fcVEFAuEl2nEpu5pq3gjT
-						u2TVkVZ4tvokZdcGQ4rXjU6Sam/o7Xbj+nz8UsjyyrlYjB8YokgPR87pONi+KmFk
-						0vu6NLuOCwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBX91XErSfqgmH8RVxMtZQu
-						0KWQZB/US90cJhlUa/1CyrCaMVOLDD5tphz588Gkq12cDaoZ9gBSAf92XsDuQqlM
-						DsU2p1OwqAiQ/Qt7eRUnealBsG/FT+ZDPd0Ieec0l42cltp45FaqpZqniaqMNhW6
-						jeZBsl3D8nPC0YLFMdnT81GX+BKxoX4h5BcJzYzpYB/GtcSSbUTZBEfb46K216wo
-						l4tAQPXq7W/jhQ2fGiSDIAPDxUnMaCak1DXL5T/3nyA6F9RbC8z9FPvP7sAjgfdE
-						QTLzavN+fHNlz6ykEglkseHbRs19a1x/EP7tNR8juq3QBCnIpLDFzPt7OQE7mrre
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wellcome.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wellcome.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">Wellcome Trust</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Wellcome Trust</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wellcome.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Niraj</GivenName>
-    <SurName>Mitchell</SurName>
-    <EmailAddress>mailto:n.mitchell@wellcome.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Niraj</GivenName>
-    <SurName>Mitchell</SurName>
-    <EmailAddress>mailto:n.mitchell@wellcome.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.west-lothian.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.west-lothian.ac.uk-shibboleth.xml
deleted file mode 100644
index 45a80ff3..00000000
--- a/swamid-interfederations-2.0/idp.west-lothian.ac.uk-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.west-lothian.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for West Lothian College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">west-lothian.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/west-lothian.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/west-lothian.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">West Lothian College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.west-lothian.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.westherts.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.westherts.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 717709e4..00000000
--- a/swamid-interfederations-2.0/idp.westherts.ac.uk-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.westherts.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for West Herts College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-12T16:24: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">westherts.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAJ9cooaHnMILJdvfcwbpOMFGaY3KMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFGlkcDIud2VzdGhlcnRzLmFjLnVrMB4XDTE0MDUwNjE0
-						NTc0MVoXDTM0MDUwNjE0NTc0MVowHzEdMBsGA1UEAxMUaWRwMi53ZXN0aGVydHMu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw1GVlx3OHs9vz
-						PNI4XgpqaTckETUbvNuYzSHHO8Cd42rWqbW38ukmWmZn6a0emWQ/AcoQvISc8SK4
-						W+U6XM43w+FsCioKesE+JFmUZEs4vbiQw/F5MiAOwaDwjDtGuXy36aCR2MlUleAC
-						a1nFUolcsJmd3J1FsRMcs07naGZYwPVGnwNMABTjQWMHgkoWhKgaCO/YuJR1/dkC
-						rFt5tTw+a2NBjaL26Yo/+3Aw3SoE+7CmIAmh1vP48m8rCdCbahPWmhbzESBdb52c
-						7Aui1S4Z4QuagudLGFt7QwR7sEUQ2+qvrpb+oluMnDUq5UiYyh2hCzH6a6ssg4rM
-						1fXp6SN/AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcDIud2VzdGhlcnRzLmFjLnVr
-						hitodHRwczovL2lkcDIud2VzdGhlcnRzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBQWp8mzB9AC+Od9M1CfhkXVEbhP9DANBgkqhkiG9w0BAQUFAAOCAQEA
-						GvX+Jixu4yzpXQysV3BrHkLaU6QiwYgoDnVh1269NfiGpCp2J3dz5+1uU4WGwwXY
-						aqr1679DjW9w8EujJHQRibwODnXM8kAJNd7GlJvrVXz1ZM4CXHpR/gAiI58MG4Vr
-						tQ7sB0fyZzWlwcjNxbRqrX00v8Xz467YtYtJb4eDpZq2WHP/1lL1U9gm3FyqYxzn
-						mrBVgIjdvI7Z/Y8DR/vRAwWS/qAiTzu+3tTbn8FalwF0ybn7Do9yVPP7DTm+B2rJ
-						lYoHgVIrTV4juJFqx+tJsPceOgQyIqU86/CFyH6rymiSCOoUa4x3uUtI6fBdffuR
-						QvZDzAP5C4j6b/8pYlItCA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.westherts.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.westherts.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://idp2.westherts.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.westherts.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.westherts.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.westherts.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">westherts.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVAJ9cooaHnMILJdvfcwbpOMFGaY3KMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFGlkcDIud2VzdGhlcnRzLmFjLnVrMB4XDTE0MDUwNjE0
-						NTc0MVoXDTM0MDUwNjE0NTc0MVowHzEdMBsGA1UEAxMUaWRwMi53ZXN0aGVydHMu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw1GVlx3OHs9vz
-						PNI4XgpqaTckETUbvNuYzSHHO8Cd42rWqbW38ukmWmZn6a0emWQ/AcoQvISc8SK4
-						W+U6XM43w+FsCioKesE+JFmUZEs4vbiQw/F5MiAOwaDwjDtGuXy36aCR2MlUleAC
-						a1nFUolcsJmd3J1FsRMcs07naGZYwPVGnwNMABTjQWMHgkoWhKgaCO/YuJR1/dkC
-						rFt5tTw+a2NBjaL26Yo/+3Aw3SoE+7CmIAmh1vP48m8rCdCbahPWmhbzESBdb52c
-						7Aui1S4Z4QuagudLGFt7QwR7sEUQ2+qvrpb+oluMnDUq5UiYyh2hCzH6a6ssg4rM
-						1fXp6SN/AgMBAAGjbzBtMEwGA1UdEQRFMEOCFGlkcDIud2VzdGhlcnRzLmFjLnVr
-						hitodHRwczovL2lkcDIud2VzdGhlcnRzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBQWp8mzB9AC+Od9M1CfhkXVEbhP9DANBgkqhkiG9w0BAQUFAAOCAQEA
-						GvX+Jixu4yzpXQysV3BrHkLaU6QiwYgoDnVh1269NfiGpCp2J3dz5+1uU4WGwwXY
-						aqr1679DjW9w8EujJHQRibwODnXM8kAJNd7GlJvrVXz1ZM4CXHpR/gAiI58MG4Vr
-						tQ7sB0fyZzWlwcjNxbRqrX00v8Xz467YtYtJb4eDpZq2WHP/1lL1U9gm3FyqYxzn
-						mrBVgIjdvI7Z/Y8DR/vRAwWS/qAiTzu+3tTbn8FalwF0ybn7Do9yVPP7DTm+B2rJ
-						lYoHgVIrTV4juJFqx+tJsPceOgQyIqU86/CFyH6rymiSCOoUa4x3uUtI6fBdffuR
-						QvZDzAP5C4j6b/8pYlItCA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.westherts.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.westherts.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">West Herts College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">West Herts College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.westherts.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@westherts.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lawrence</GivenName>
-    <SurName>Cleaver</SurName>
-    <EmailAddress>mailto:Lawrence.cleaver@westherts.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.weston.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.weston.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 207855cc..00000000
--- a/swamid-interfederations-2.0/idp.weston.ac.uk-idp-shibboleth.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://idp.weston.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Weston College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-30T13:30:39Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">weston.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAPcnzcVGLzEqHB1pMsO1kGPh7IV9MA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC53ZXN0b24uYWMudWswHhcNMTMwMTE2MTcxMzUy
-						WhcNMzMwMTE2MTcxMzUyWjAbMRkwFwYDVQQDExBpZHAud2VzdG9uLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqznc6D9m1YX+EyNAeRfFBVD9
-						Ayf15/t1kpP4A05WfmENLz+FdM1Kk2bnCrRsjcsO3n++ua/vKouHThHYa8IdFady
-						nyC9M/PYDA5hkEwtWG+D32U0+NCwq0ZfDx3sd/BdfBkJHTyebM/yqy4EJRn764Wi
-						D9ORI4V6e2q5WbS/u+ujwkfDGOuThsKAAxlnW/fUk+EXjCDoYs8N+ar4GYhKD+w0
-						h6FVl7NPQ1T1loxstFB47wVCxNloTmBZc8w/6zPPiIaFKVA+/ROQAmDcWbvbA5u6
-						4iZhTieGXw8DRim+iqKlrrWpq7CE3IbtC14YXPRQsg8EdT912QOVCkoI+ETd+wID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAud2VzdG9uLmFjLnVrhidodHRwczovL2lk
-						cC53ZXN0b24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOCbusYezUEQ
-						N+uyvBFAD7q+sQtKMA0GCSqGSIb3DQEBBQUAA4IBAQBRLQicI1ilCyx9sQODb0nj
-						sd3Za1CHPTweNw1iIWflTEZl3s6qP1caJqmWu38gSqSsJFG9pdGhOOxjPTX9qp/H
-						5oqjKIzGmvow5e8rIGUkH1Wy9Xku4U0fcIl8jCH41SumJiBskxNBwrGOQ7ek/pqQ
-						7zi0xyckQPto/EzHVKNgLjtOMCzoQTCSc6VuydsvpseiS8PhVz7mE1wObvoXmYzI
-						VUPiI5aeGWruZIRk4zgGQEuX9xCofV/Wf0k6yKkV1t5si9aXs66rsGgZLcj5PVD8
-						s0O78Bd48FWN4zeRq+RXI1eqpkYlnD07i0S4ICliPBBe0CmFxplfScWzMKVyUip9
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.weston.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.weston.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.weston.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.weston.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.weston.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.weston.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">weston.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAPcnzcVGLzEqHB1pMsO1kGPh7IV9MA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEGlkcC53ZXN0b24uYWMudWswHhcNMTMwMTE2MTcxMzUy
-						WhcNMzMwMTE2MTcxMzUyWjAbMRkwFwYDVQQDExBpZHAud2VzdG9uLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqznc6D9m1YX+EyNAeRfFBVD9
-						Ayf15/t1kpP4A05WfmENLz+FdM1Kk2bnCrRsjcsO3n++ua/vKouHThHYa8IdFady
-						nyC9M/PYDA5hkEwtWG+D32U0+NCwq0ZfDx3sd/BdfBkJHTyebM/yqy4EJRn764Wi
-						D9ORI4V6e2q5WbS/u+ujwkfDGOuThsKAAxlnW/fUk+EXjCDoYs8N+ar4GYhKD+w0
-						h6FVl7NPQ1T1loxstFB47wVCxNloTmBZc8w/6zPPiIaFKVA+/ROQAmDcWbvbA5u6
-						4iZhTieGXw8DRim+iqKlrrWpq7CE3IbtC14YXPRQsg8EdT912QOVCkoI+ETd+wID
-						AQABo2cwZTBEBgNVHREEPTA7ghBpZHAud2VzdG9uLmFjLnVrhidodHRwczovL2lk
-						cC53ZXN0b24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOCbusYezUEQ
-						N+uyvBFAD7q+sQtKMA0GCSqGSIb3DQEBBQUAA4IBAQBRLQicI1ilCyx9sQODb0nj
-						sd3Za1CHPTweNw1iIWflTEZl3s6qP1caJqmWu38gSqSsJFG9pdGhOOxjPTX9qp/H
-						5oqjKIzGmvow5e8rIGUkH1Wy9Xku4U0fcIl8jCH41SumJiBskxNBwrGOQ7ek/pqQ
-						7zi0xyckQPto/EzHVKNgLjtOMCzoQTCSc6VuydsvpseiS8PhVz7mE1wObvoXmYzI
-						VUPiI5aeGWruZIRk4zgGQEuX9xCofV/Wf0k6yKkV1t5si9aXs66rsGgZLcj5PVD8
-						s0O78Bd48FWN4zeRq+RXI1eqpkYlnD07i0S4ICliPBBe0CmFxplfScWzMKVyUip9
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.weston.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.weston.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">Weston College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Weston College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.weston.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>I.T. Helpdesk</GivenName>
-    <EmailAddress>mailto:it.helpdesk@weston.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jon</GivenName>
-    <SurName>Hofgartner</SurName>
-    <EmailAddress>mailto:Jon.Hofgartner@weston.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.weymouth.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.weymouth.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 69f05655..00000000
--- a/swamid-interfederations-2.0/idp.weymouth.ac.uk-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://idp.weymouth.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Weymouth College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-09T11:53: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">weymouth.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUZFz+kRz+YW7p9f/N9n5Of8fT2j0wDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAwwSaWRwLndleW1vdXRoLmFjLnVrMB4XDTE1MDUxNDE1MDE0
-						OFoXDTM1MDUxNDE1MDE0OFowHTEbMBkGA1UEAwwSaWRwLndleW1vdXRoLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkUna4sDGdpwE4oEaTO34
-						u65rTxJM6IL7WQYrUVqrqxedUClwy7hLk49DQFXB1AH4xOKolxDkapobo2hMVU3d
-						Q0yGD998OQf8C6xLEl4Yco9uN0fN83ZqVuEKDkQ272kuL/kdfKx0ZRUBWgRVcnKB
-						yV4tRhnfhl8ajYgBsLtTSWyNIjGjtiqYGuwhuHTcGG7Oi0I9y2j/NLHx1jdB8xUY
-						z7ohgAlcoDyP8BPjS1j0fEt97AxdmNIQ29xe/xsweJ/KnSIvhBm++TJ+bHSGTYyA
-						wN5NIlGWR/CJLuFEuOFi1z1b3KL6ThdQMnAODxXX3mX0urdQ9Pt+4EqmopjB4ouo
-						HwIDAQABo2swaTAdBgNVHQ4EFgQUQyIHvBA0HQf/jmuE1vFqZ0WYal0wSAYDVR0R
-						BEEwP4ISaWRwLndleW1vdXRoLmFjLnVrhilodHRwczovL2lkcC53ZXltb3V0aC5h
-						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAQh5Rj41IABCV
-						OmRnYHiV9Jcoo8xm4YK964n/K9Bz3stiTFGghIIyvysliIn54jlUYifHMVbgNdMD
-						OR6Pu27JF7VMhx/9j9KCTCXse2mOxxtBfFF2agH1713rGNHxnDt7pof5j3hAJPQl
-						mYDZzDfuRlVRQy1LIFXykqO9qQlLz8ee8nlF4szS3DhG1s7p8UZG+tormNOG9/Iy
-						mlfxKAyZAGpZSw+SG9B5J1hp7iBcull1xzHm1RkMKgO6y8ZepIcKuHqcgg8J588H
-						ZhW5ckHO38W5sam0GEuPfinLTDrEk7u+PvLSKtyZHaW8iNegbWtTgKL/Zspe1vBw
-						ijX+yImKyg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.weymouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.weymouth.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.weymouth.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.weymouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.weymouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.weymouth.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">weymouth.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUZFz+kRz+YW7p9f/N9n5Of8fT2j0wDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAwwSaWRwLndleW1vdXRoLmFjLnVrMB4XDTE1MDUxNDE1MDE0
-						OFoXDTM1MDUxNDE1MDE0OFowHTEbMBkGA1UEAwwSaWRwLndleW1vdXRoLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkUna4sDGdpwE4oEaTO34
-						u65rTxJM6IL7WQYrUVqrqxedUClwy7hLk49DQFXB1AH4xOKolxDkapobo2hMVU3d
-						Q0yGD998OQf8C6xLEl4Yco9uN0fN83ZqVuEKDkQ272kuL/kdfKx0ZRUBWgRVcnKB
-						yV4tRhnfhl8ajYgBsLtTSWyNIjGjtiqYGuwhuHTcGG7Oi0I9y2j/NLHx1jdB8xUY
-						z7ohgAlcoDyP8BPjS1j0fEt97AxdmNIQ29xe/xsweJ/KnSIvhBm++TJ+bHSGTYyA
-						wN5NIlGWR/CJLuFEuOFi1z1b3KL6ThdQMnAODxXX3mX0urdQ9Pt+4EqmopjB4ouo
-						HwIDAQABo2swaTAdBgNVHQ4EFgQUQyIHvBA0HQf/jmuE1vFqZ0WYal0wSAYDVR0R
-						BEEwP4ISaWRwLndleW1vdXRoLmFjLnVrhilodHRwczovL2lkcC53ZXltb3V0aC5h
-						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAQh5Rj41IABCV
-						OmRnYHiV9Jcoo8xm4YK964n/K9Bz3stiTFGghIIyvysliIn54jlUYifHMVbgNdMD
-						OR6Pu27JF7VMhx/9j9KCTCXse2mOxxtBfFF2agH1713rGNHxnDt7pof5j3hAJPQl
-						mYDZzDfuRlVRQy1LIFXykqO9qQlLz8ee8nlF4szS3DhG1s7p8UZG+tormNOG9/Iy
-						mlfxKAyZAGpZSw+SG9B5J1hp7iBcull1xzHm1RkMKgO6y8ZepIcKuHqcgg8J588H
-						ZhW5ckHO38W5sam0GEuPfinLTDrEk7u+PvLSKtyZHaW8iNegbWtTgKL/Zspe1vBw
-						ijX+yImKyg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.weymouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.weymouth.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">Weymouth College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Weymouth College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.weymouth.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Phil</GivenName>
-    <SurName>Templeton</SurName>
-    <EmailAddress>mailto:Phil_Templeton@weymouth.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Phil</GivenName>
-    <SurName>Templeton</SurName>
-    <EmailAddress>mailto:Phil_Templeton@weymouth.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wiltshire.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index cc80f613..00000000
--- a/swamid-interfederations-2.0/idp.wiltshire.ac.uk-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" entityID="https://idp.wiltshire.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Wiltshire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-05T16:44: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">wiltshire.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEoTCCA4mgAwIBAgIRAOiGbysj0iOdFzhBHusteqMwDQYJKoZIhvcNAQELBQAw
-						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-						IENBIDIwHhcNMTUwMjI0MDAwMDAwWhcNMTgwMjIzMjM1OTU5WjBBMSEwHwYDVQQL
-						ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC53aWx0c2hp
-						cmUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8WXQAsa7l
-						jeJ86YSF0jAyrqyaSeIjwQgFnUXFCPw/k/H9vzNDF/cZM8faRfx+14b9HMlXLdLD
-						bKcl/4dPQY6oxqt+3IGTLPATva2aMbssTbICswVz7VOVjHMPnssha9HYDFgoUVTV
-						7C0f8nKGzzQiT6FIspIjWALBU7DAOonvz0MernDWpVQ5vpW/TSMbd1wBHgMmdTmu
-						h/XgffOYolhgBS5asilC3O6BCqxbYdH76MEeZcVcXCf0y4lQ41pUNagAtLdCNOZu
-						A5IUbqrao6BACiKFzv/mpguYNXEtZHSGyCLrC2qu2nnQ2udqfnmBYtgsX8FWAUQt
-						z2LNvW0OSrwHAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb
-						4YYosP22vTAdBgNVHQ4EFgQUWT26a/YMEDwjsLN+InUujXgi+PEwDgYDVR0PAQH/
-						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIu
-						Y3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2Vy
-						dHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9v
-						Y3NwLnVzZXJ0cnVzdC5jb20wHgYDVR0RBBcwFYITaWRwLndpbHRzaGlyZS5hYy51
-						azANBgkqhkiG9w0BAQsFAAOCAQEAjrPlaXZ/IvJnllBGlHgfkiCtEDgmT5X9vWhK
-						MkCs5n1N22WAiP232Yk1TffU+jTBhoKgP8uxb9LPu7c2AwVXiuJ1EJGJpYkvwQvm
-						agbyy/B/4O36SwjhG+arqD6B3sDWB4tAQJuoFQ3OP/eOccZ6yG8HGVbqCf39kjpK
-						hv8PqQ8vCp/jLuK4LX1zPdB0NoESOm9KmW4CsQA/4QJCaJrnRI/Lm0/9T/1yT62d
-						0ME9TV8PlhWKNsAHrbaqyii4dqlSpsrP6rCad4pqlp5m1bRIZC7Met5RQ6qyIUjC
-						qwqpVTvyqjl0xrmHHCWfxY8GEVajGv7HzlQwukJFT2uSFdJl/g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wiltshire.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.wiltshire.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wiltshire.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wiltshire.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wiltshire.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">wiltshire.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEoTCCA4mgAwIBAgIRAOiGbysj0iOdFzhBHusteqMwDQYJKoZIhvcNAQELBQAw
-						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-						IENBIDIwHhcNMTUwMjI0MDAwMDAwWhcNMTgwMjIzMjM1OTU5WjBBMSEwHwYDVQQL
-						ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHDAaBgNVBAMTE2lkcC53aWx0c2hp
-						cmUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8WXQAsa7l
-						jeJ86YSF0jAyrqyaSeIjwQgFnUXFCPw/k/H9vzNDF/cZM8faRfx+14b9HMlXLdLD
-						bKcl/4dPQY6oxqt+3IGTLPATva2aMbssTbICswVz7VOVjHMPnssha9HYDFgoUVTV
-						7C0f8nKGzzQiT6FIspIjWALBU7DAOonvz0MernDWpVQ5vpW/TSMbd1wBHgMmdTmu
-						h/XgffOYolhgBS5asilC3O6BCqxbYdH76MEeZcVcXCf0y4lQ41pUNagAtLdCNOZu
-						A5IUbqrao6BACiKFzv/mpguYNXEtZHSGyCLrC2qu2nnQ2udqfnmBYtgsX8FWAUQt
-						z2LNvW0OSrwHAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb
-						4YYosP22vTAdBgNVHQ4EFgQUWT26a/YMEDwjsLN+InUujXgi+PEwDgYDVR0PAQH/
-						BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-						BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIu
-						Y3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2Vy
-						dHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9v
-						Y3NwLnVzZXJ0cnVzdC5jb20wHgYDVR0RBBcwFYITaWRwLndpbHRzaGlyZS5hYy51
-						azANBgkqhkiG9w0BAQsFAAOCAQEAjrPlaXZ/IvJnllBGlHgfkiCtEDgmT5X9vWhK
-						MkCs5n1N22WAiP232Yk1TffU+jTBhoKgP8uxb9LPu7c2AwVXiuJ1EJGJpYkvwQvm
-						agbyy/B/4O36SwjhG+arqD6B3sDWB4tAQJuoFQ3OP/eOccZ6yG8HGVbqCf39kjpK
-						hv8PqQ8vCp/jLuK4LX1zPdB0NoESOm9KmW4CsQA/4QJCaJrnRI/Lm0/9T/1yT62d
-						0ME9TV8PlhWKNsAHrbaqyii4dqlSpsrP6rCad4pqlp5m1bRIZC7Met5RQ6qyIUjC
-						qwqpVTvyqjl0xrmHHCWfxY8GEVajGv7HzlQwukJFT2uSFdJl/g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wiltshire.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wiltshire.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">Wiltshire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Wiltshire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wiltshire.ac.uk/external/about_us/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:itsupport@wiltshire.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Grenfell</SurName>
-    <EmailAddress>mailto:john.grenfell@wiltshire.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wit.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wit.ie-idp-shibboleth.xml
deleted file mode 100644
index 7888397e..00000000
--- a/swamid-interfederations-2.0/idp.wit.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.wit.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-22T00:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wit.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Waterford Institute of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Port Láirge</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.wit.ie/about_wit</mdui:InformationURL>
-        <mdui:Logo height="101" width="150">https://edugate.heanet.ie/rr3/logos/wit.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:52.24602,-7.13992</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAP8av6UsfKq9co3H42qLy3deHv3LMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC53aXQuaWUwHhcNMDkxMDE0MTQwMTA1WhcNMjkx
-MDE0MTQwMTA1WjAVMRMwEQYDVQQDEwppZHAud2l0LmllMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAhrE9L82QkOHB6nfZb2LNn/olkgLX6EordeY6V9BC
-2CnVf18N0WxD+br+w5yX+q7BQLxOC7+FaB3huqFCyDL9kP66Y4sxH+6oRjaxtOv3
-nkC/4QZhitR6Ol2RcdwdB5GZzo+FrQF/OfTbSf2XZ0K0CAza4Bc1BTJiSvWbtymA
-tkB5c4FKGxFjzRHVZd73vyUd66Qxai79ifbIa+ujxhbaZz5TKtR6cZv1DoeB1/ol
-6zBFHFB7s3XHZq+kn3TGrEXHP1zQonigaT7BxPCogO4X5+t4TI2m+T67ZWNAf82J
-XzK/sUmyUO7iQ2dlTjuUL/jEAtuXYNcF35e7Z20jpu+PEQIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAud2l0LmllhiFodHRwczovL2lkcC53aXQuaWUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFKbxKrmJg2gV90gpwMIhjKT4587hMA0GCSqGSIb3DQEB
-BQUAA4IBAQAf8thi+05KHldde/0cPmQObTTfhTq1blAMlrgRVCCF3fYVJkCcmoF8
-B+2PZKzilES9rWOEFBgvKM0f+zWZEjdQ8+yUtOmMcBDr2UMpcez5dJQnXKsE5R2W
-h70L7iMmMVY7SiXpj0EbdH5DDikG0PfTozDCFE1/Ej2jHtfpkx550/ndhbAhhdOG
-xNsj+b7mIOWYzHeBZaNA4RMlPOb+e6AVp486SM7Un99Q01M0YKKCywrSCfhgxc9l
-ayulS2yPVLivhbaHyblQHkuxzZHevAs/NRztnJDJJ/V+puOejSvO+0WyvA1YUzTJ
-ect1+KwnR20CjNdGxfXwubzEODFApQ2J
-</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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wit.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wit.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wit.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Waterford Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Waterford Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wit.ie/about_wit</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Aidan</md:GivenName>
-    <md:SurName>Mc Grath</md:SurName>
-    <md:EmailAddress>mailto:amcgrath@wit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="other">
-    <md:GivenName>Pat</md:GivenName>
-    <md:SurName>Cluney</md:SurName>
-    <md:EmailAddress>mailto:pcluney@wit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Dowling</md:SurName>
-    <md:EmailAddress>mailto:tdowling@wit.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>WIT Computer Services</md:SurName>
-    <md:EmailAddress>mailto:computerservices@wit.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wlb-stuttgart.de.xml b/swamid-interfederations-2.0/idp.wlb-stuttgart.de.xml
deleted file mode 100644
index 0bc2821c..00000000
--- a/swamid-interfederations-2.0/idp.wlb-stuttgart.de.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.wlb-stuttgart.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">wlb-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.wlb-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.wlb-stuttgart.de,OU=EDV,O=Wuerttembergische Landesbibliothek,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVTCCBD2gAwIBAgIEELqHxTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
-RTE2MDQGA1UEChMtQmlibGlvdGhla3NzZXJ2aWNlLVplbnRydW0gQmFkZW4tV3Vl
-cnR0ZW1iZXJnMRgwFgYDVQQDEw9CU1otQlcgQ0EgLSBHMDIxHDAaBgkqhkiG9w0B
-CQEWDXBraUBic3otYncuZGUwHhcNMTAwOTIzMDgwNTA5WhcNMTQwOTIyMjM1OTU5
-WjCBmDELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzES
-MBAGA1UEBxMJU3R1dHRnYXJ0MSswKQYDVQQKEyJXdWVydHRlbWJlcmdpc2NoZSBM
-YW5kZXNiaWJsaW90aGVrMQwwCgYDVQQLEwNFRFYxHTAbBgNVBAMTFGlkcC53bGIt
-c3R1dHRnYXJ0LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwIE9
-X0v4R32KFOFYzeredu/vS4wxmuk4HEYdidHEXmsVnfckcHOM323e4+mUh2RV9syU
-PCmZSrvCrqARQVpmvypvPY3eR8lTje1KyeY1J7UUb7JdHTNoO4ri0RJ/Z2FxUUgo
-pEI5Mo/XfiV89j2kPui8Jenck5Mahc3YdMcHzVRR2BEDAvEzLIS9Zygs0lgCW5HU
-ua/1dE4fVYk0VDhuc9ECpB8fe5xMnprpZMXveEHaAD1ZG0rgstQ3hpj2uVqJumbm
-IOdce2rIGDUGHk9SajCXq2NDaj4heQYYTwVymkQJ0jUmu2HBkkBse/EUwOlUmj0k
-jlUGtEbs8pV1PVUjMwIDAQABo4IBvzCCAbswCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBT43X+Z
-KgiAHC6kQ8SivTZ83GAq1TAfBgNVHSMEGDAWgBQprQDey2blH96qjW3snLRC/vub
-ITAfBgNVHREEGDAWgRRlZHZAd2xiLXN0dXR0Z2FydC5kZTCBgQYDVR0fBHoweDA6
-oDigNoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ic3otYnctY2EvcHViL2NybC9n
-X2NhY3JsLmNybDA6oDigNoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ic3otYnct
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBnAYIKwYBBQUHAQEEgY8wgYwwRAYIKwYB
-BQUHMAKGOGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYnN6LWJ3LWNhL3B1Yi9jYWNl
-cnQvZ19jYWNlcnQuY3J0MEQGCCsGAQUFBzAChjhodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2Jzei1idy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQUFAAOCAQEAhOsm/wAynp2EwfUnAZyIM9QHGMPqBhGQX8GAAXVmMe8N/gSzEKs/
-QIkoFOplyMxDYduUnBOeKr5zV5TWhgmlqZs3AM9RQq/xWJA/XAk/XIlYd1ABpdAZ
-N0cYZj2B6mR3gw1y8h9OqN5xxizTyq37rJe2a5GBvqO+W1g/0+My8oxFGen1Ui10
-lNs5EXO4DnqsOJmG1vM+zsEbc/PyJaau/v3DVw5XS7+gx8PanN24P1rtLwUA7iCf
-K+99+9nuT00B0SO1kd2bQOOZth98ennBqB+cXYxM8q3eO9/rzMNWyGb3AtDMIX0Y
-vkncr5R65ffZnIyA5Ey1/VBh8NY99H+/ew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wlb-stuttgart.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlb-stuttgart.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wlb-stuttgart.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wlb-stuttgart.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wlb-stuttgart.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wlb-stuttgart.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">wlb-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.wlb-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp.wlb-stuttgart.de,OU=EDV,O=Wuerttembergische Landesbibliothek,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVTCCBD2gAwIBAgIEELqHxTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
-RTE2MDQGA1UEChMtQmlibGlvdGhla3NzZXJ2aWNlLVplbnRydW0gQmFkZW4tV3Vl
-cnR0ZW1iZXJnMRgwFgYDVQQDEw9CU1otQlcgQ0EgLSBHMDIxHDAaBgkqhkiG9w0B
-CQEWDXBraUBic3otYncuZGUwHhcNMTAwOTIzMDgwNTA5WhcNMTQwOTIyMjM1OTU5
-WjCBmDELMAkGA1UEBhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzES
-MBAGA1UEBxMJU3R1dHRnYXJ0MSswKQYDVQQKEyJXdWVydHRlbWJlcmdpc2NoZSBM
-YW5kZXNiaWJsaW90aGVrMQwwCgYDVQQLEwNFRFYxHTAbBgNVBAMTFGlkcC53bGIt
-c3R1dHRnYXJ0LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwIE9
-X0v4R32KFOFYzeredu/vS4wxmuk4HEYdidHEXmsVnfckcHOM323e4+mUh2RV9syU
-PCmZSrvCrqARQVpmvypvPY3eR8lTje1KyeY1J7UUb7JdHTNoO4ri0RJ/Z2FxUUgo
-pEI5Mo/XfiV89j2kPui8Jenck5Mahc3YdMcHzVRR2BEDAvEzLIS9Zygs0lgCW5HU
-ua/1dE4fVYk0VDhuc9ECpB8fe5xMnprpZMXveEHaAD1ZG0rgstQ3hpj2uVqJumbm
-IOdce2rIGDUGHk9SajCXq2NDaj4heQYYTwVymkQJ0jUmu2HBkkBse/EUwOlUmj0k
-jlUGtEbs8pV1PVUjMwIDAQABo4IBvzCCAbswCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBT43X+Z
-KgiAHC6kQ8SivTZ83GAq1TAfBgNVHSMEGDAWgBQprQDey2blH96qjW3snLRC/vub
-ITAfBgNVHREEGDAWgRRlZHZAd2xiLXN0dXR0Z2FydC5kZTCBgQYDVR0fBHoweDA6
-oDigNoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ic3otYnctY2EvcHViL2NybC9n
-X2NhY3JsLmNybDA6oDigNoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ic3otYnct
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDCBnAYIKwYBBQUHAQEEgY8wgYwwRAYIKwYB
-BQUHMAKGOGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYnN6LWJ3LWNhL3B1Yi9jYWNl
-cnQvZ19jYWNlcnQuY3J0MEQGCCsGAQUFBzAChjhodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2Jzei1idy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQUFAAOCAQEAhOsm/wAynp2EwfUnAZyIM9QHGMPqBhGQX8GAAXVmMe8N/gSzEKs/
-QIkoFOplyMxDYduUnBOeKr5zV5TWhgmlqZs3AM9RQq/xWJA/XAk/XIlYd1ABpdAZ
-N0cYZj2B6mR3gw1y8h9OqN5xxizTyq37rJe2a5GBvqO+W1g/0+My8oxFGen1Ui10
-lNs5EXO4DnqsOJmG1vM+zsEbc/PyJaau/v3DVw5XS7+gx8PanN24P1rtLwUA7iCf
-K+99+9nuT00B0SO1kd2bQOOZth98ennBqB+cXYxM8q3eO9/rzMNWyGb3AtDMIX0Y
-vkncr5R65ffZnIyA5Ey1/VBh8NY99H+/ew==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wlb-stuttgart.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlb-stuttgart.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Württembergische Landesbibliothek Stuttgart</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Württembergische Landesbibliothek Stuttgart</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.wlb-stuttgart.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Jörg</GivenName>
-    <SurName>Oberfell</SurName>
-    <EmailAddress>shibboleth-admin@wlb-stuttgart.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Jörg</GivenName>
-    <SurName>Oberfell</SurName>
-    <EmailAddress>shibboleth-admin@wlb-stuttgart.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml
deleted file mode 100644
index e6f9e396..00000000
--- a/swamid-interfederations-2.0/idp.wlu.ca-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://idp.wlu.ca/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-02-02T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-            http://www.canarie.ca/templates/services/docs/CAF_join_en.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">wlu.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Wilfrid Laurier University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Wilfrid Laurier University</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.wlu.ca</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-   MIIDFDCCAfygAwIBAgIVAIo8nwS0vH0WHPEf+uRwLXdgoY/+MA0GCSqGSIb3DQEB
-   BQUAMBUxEzARBgNVBAMTCmlkcC53bHUuY2EwHhcNMTMxMDA0MTU0MTIyWhcNMzMx
-   MDA0MTU0MTIyWjAVMRMwEQYDVQQDEwppZHAud2x1LmNhMIIBIjANBgkqhkiG9w0B
-   AQEFAAOCAQ8AMIIBCgKCAQEAtQgjJxxRj9IwzB9hd4f11LC4bcKuNeqM5pl4q5b4
-   L/E/7kCBsdq6h9mver17epTKT93X+/YxZcpOvRAmi9hDtsT8DDNwHNkskhU6e6CT
-   X9guZxgHOoT9/Dzaad69KhtBkotNoti2T3vISg67DnCu75AJXq5rS4LWGEob92/e
-   ivsG/7inGyb6JIyA07+Xoegp6HJvscK6N3jibNT19RN3qZrGYvF8DMnnUzoo/opu
-   MES11AyzjvzaarzHYjJzRyPBluWjaIJg79TmP5qo/4Ddn0jLcA/p7JDMVyfVyXvy
-   2Wm9hZWcgawtos8qcb6nCKLaPxwWf5B/xErGT/RYyP6N5wIDAQABo1swWTA4BgNV
-   HREEMTAvggppZHAud2x1LmNhhiFodHRwczovL2lkcC53bHUuY2EvaWRwL3NoaWJi
-   b2xldGgwHQYDVR0OBBYEFN76fX1Yg1tR5jjpQb+koIhPkjLCMA0GCSqGSIb3DQEB
-   BQUAA4IBAQAl7cQxxj90eUlbmh/OtN+cLc7vqaATJ5cpeOKBOSlf/NoLoYEpkb/F
-   fxS8n/0rJ1H3+qwb3Pr3DUV6hatCckUcv0uFTHtB5AJveWPM5oaiTrb9FeyQ7ruT
-   2G5iv5YCZnQMPfsYr9XA5ZwSkYMCgGQVf7rVF5UJgEN1zL1PYGIeKuIoCFJ0KIkk
-   MZmsvkl88HHkSRk9ezwBwDuDwAs86mWdncjp75suLliXsSNc2ZKLDkZ6eI61txBa
-   AY0HfabbLN/eDvrYsVf/iG2Iq6g8/iNLDh22ObwWqO4nBKm0lDRb5u1t3XFh5+fk
-   r/qIQoaq7ukmKoJSwCKlNblw+JK0yy5j
-               </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wlu.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlu.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wlu.ca/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wlu.ca/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlu.ca/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.wlu.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wlu.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wlu.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wlu.ca/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">wlu.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-   MIIDFDCCAfygAwIBAgIVAIo8nwS0vH0WHPEf+uRwLXdgoY/+MA0GCSqGSIb3DQEB
-   BQUAMBUxEzARBgNVBAMTCmlkcC53bHUuY2EwHhcNMTMxMDA0MTU0MTIyWhcNMzMx
-   MDA0MTU0MTIyWjAVMRMwEQYDVQQDEwppZHAud2x1LmNhMIIBIjANBgkqhkiG9w0B
-   AQEFAAOCAQ8AMIIBCgKCAQEAtQgjJxxRj9IwzB9hd4f11LC4bcKuNeqM5pl4q5b4
-   L/E/7kCBsdq6h9mver17epTKT93X+/YxZcpOvRAmi9hDtsT8DDNwHNkskhU6e6CT
-   X9guZxgHOoT9/Dzaad69KhtBkotNoti2T3vISg67DnCu75AJXq5rS4LWGEob92/e
-   ivsG/7inGyb6JIyA07+Xoegp6HJvscK6N3jibNT19RN3qZrGYvF8DMnnUzoo/opu
-   MES11AyzjvzaarzHYjJzRyPBluWjaIJg79TmP5qo/4Ddn0jLcA/p7JDMVyfVyXvy
-   2Wm9hZWcgawtos8qcb6nCKLaPxwWf5B/xErGT/RYyP6N5wIDAQABo1swWTA4BgNV
-   HREEMTAvggppZHAud2x1LmNhhiFodHRwczovL2lkcC53bHUuY2EvaWRwL3NoaWJi
-   b2xldGgwHQYDVR0OBBYEFN76fX1Yg1tR5jjpQb+koIhPkjLCMA0GCSqGSIb3DQEB
-   BQUAA4IBAQAl7cQxxj90eUlbmh/OtN+cLc7vqaATJ5cpeOKBOSlf/NoLoYEpkb/F
-   fxS8n/0rJ1H3+qwb3Pr3DUV6hatCckUcv0uFTHtB5AJveWPM5oaiTrb9FeyQ7ruT
-   2G5iv5YCZnQMPfsYr9XA5ZwSkYMCgGQVf7rVF5UJgEN1zL1PYGIeKuIoCFJ0KIkk
-   MZmsvkl88HHkSRk9ezwBwDuDwAs86mWdncjp75suLliXsSNc2ZKLDkZ6eI61txBa
-   AY0HfabbLN/eDvrYsVf/iG2Iq6g8/iNLDh22ObwWqO4nBKm0lDRb5u1t3XFh5+fk
-   r/qIQoaq7ukmKoJSwCKlNblw+JK0yy5j
-               </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wlu.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wlu.ca/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">Wilfrid Laurier University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Wilfrid Laurier University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wlu.ca/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>IDM</md:SurName>
-    <md:EmailAddress>wizards@wlu.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wm.edu-idp-shibboleth.xml
deleted file mode 100644
index 54e03c62..00000000
--- a/swamid-interfederations-2.0/idp.wm.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://idp.wm.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">wm.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">College of William and Mary</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>
-MIIDFDCCAfygAwIBAgIVAMp2BzquGFXmISEolT3i+yenY4MrMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC53bS5lZHUwHhcNMTAwMzMwMTM0MTM5WhcNMzAw
-MzMwMTM0MTM5WjAVMRMwEQYDVQQDEwppZHAud20uZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgHTuDpXR5FygeQhXnlQGd39kAgOSs+DCT7twJ39T
-7kuKNd0XAlChg3LSPUMFIPwGWg7xfS9s/bodGuHgLpfpL/m7NW++rDwjoPnhfCYc
-0lXUBNHahowMENdbdQGFpDwX/fS80UHenIiwLnG9z5DpjiiSZTlvRPpZ5wZF8ixj
-eIKuCbSIz8Z9Bi0AOXRwV5L5OPLqiphPN65PFy0HYC/cOL6mxvbGkzUVjxFQXACC
-tQ//C7vkO9ftqP+jolPE/tZsQBcIVsAL7FRJHAOfmpN3/09mpFVu6en/9bqd20nK
-DYsK2FAu97mrGWpfYFk/nWMMIwdL2KinVhzLNcwr5g8DvwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAud20uZWR1hiFodHRwczovL2lkcC53bS5lZHUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFOxc2i6eoVNj767TtoVMNQlnIjXbMA0GCSqGSIb3DQEB
-BQUAA4IBAQAvfO9Y0q3AQ7+Zf74Oq7okfZOuWPH8Pnrdnia+U8KiG7HSPkes7g1/
-iv0tmzMTJWxc1OVq727xBV6IxNdFz0I25MEwPWYbOEAAc+MfLR13h7lvZ60QSJQc
-MRNuRN37kDjfWkWxSHVGLodEU/Y5i72C03aH6bUDNEurVk63lqWm2hxAAvegTyoH
-EeZaazkU17D9zucq5RlcsDxCpPCD8nnB+59J8cpyX0GHOdiwWptZQvXx/VQpqlJT
-DX2ljKn2p2dgvW3kdPGTKp09DtjpRc8nLRqbwakIsa/Q9Ufr1emzm1RLun0hKIS8
-306VYkYFpdyAxtQI164I/aiuurKKJQxG
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wm.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wm.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wm.edu/idp/profile/Shibboleth/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">wm.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAMp2BzquGFXmISEolT3i+yenY4MrMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMTCmlkcC53bS5lZHUwHhcNMTAwMzMwMTM0MTM5WhcNMzAw
-MzMwMTM0MTM5WjAVMRMwEQYDVQQDEwppZHAud20uZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAgHTuDpXR5FygeQhXnlQGd39kAgOSs+DCT7twJ39T
-7kuKNd0XAlChg3LSPUMFIPwGWg7xfS9s/bodGuHgLpfpL/m7NW++rDwjoPnhfCYc
-0lXUBNHahowMENdbdQGFpDwX/fS80UHenIiwLnG9z5DpjiiSZTlvRPpZ5wZF8ixj
-eIKuCbSIz8Z9Bi0AOXRwV5L5OPLqiphPN65PFy0HYC/cOL6mxvbGkzUVjxFQXACC
-tQ//C7vkO9ftqP+jolPE/tZsQBcIVsAL7FRJHAOfmpN3/09mpFVu6en/9bqd20nK
-DYsK2FAu97mrGWpfYFk/nWMMIwdL2KinVhzLNcwr5g8DvwIDAQABo1swWTA4BgNV
-HREEMTAvggppZHAud20uZWR1hiFodHRwczovL2lkcC53bS5lZHUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFOxc2i6eoVNj767TtoVMNQlnIjXbMA0GCSqGSIb3DQEB
-BQUAA4IBAQAvfO9Y0q3AQ7+Zf74Oq7okfZOuWPH8Pnrdnia+U8KiG7HSPkes7g1/
-iv0tmzMTJWxc1OVq727xBV6IxNdFz0I25MEwPWYbOEAAc+MfLR13h7lvZ60QSJQc
-MRNuRN37kDjfWkWxSHVGLodEU/Y5i72C03aH6bUDNEurVk63lqWm2hxAAvegTyoH
-EeZaazkU17D9zucq5RlcsDxCpPCD8nnB+59J8cpyX0GHOdiwWptZQvXx/VQpqlJT
-DX2ljKn2p2dgvW3kdPGTKp09DtjpRc8nLRqbwakIsa/Q9Ufr1emzm1RLun0hKIS8
-306VYkYFpdyAxtQI164I/aiuurKKJQxG
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wm.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">College of William and Mary</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">College of William and Mary</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wm.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Eric Myers</md:GivenName>
-    <md:EmailAddress>emmyer@wm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Chris Peck</md:GivenName>
-    <md:EmailAddress>chris@wm.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wmich.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wmich.edu-idp-shibboleth.xml
deleted file mode 100644
index 416af310..00000000
--- a/swamid-interfederations-2.0/idp.wmich.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://idp.wmich.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.wmich.edu/idp/error.jsp" 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">wmich.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Western Michigan University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Western Michigan University</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.wmich.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.wmich.edu/it/policies/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="172" xml:lang="en">https://idp.wmich.edu/idp/images/w_logo.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>
-MIIDHzCCAgegAwIBAgIUa4EI2jTt6ViDq1EIcA/j+LW97W4wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLndtaWNoLmVkdTAeFw0xMjA4MDExOTI0NTFaFw0z
-MjA4MDExOTI0NTFaMBgxFjAUBgNVBAMTDWlkcC53bWljaC5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7nBw1E5fmU+Nd+wyb1/YCO3pKUw+C+6Uw
-Kk0SF5daJWbZDI3UWKdQjl0aVp53yml3oEzQFbsRl9KXSC43Wy1zAWNYF2MSUxOQ
-2//8K1omFvWDaa1teaOVn+o8ID56FN3WCj0H1JGXsS/Ub6xgArLvQP4qwIbWAkw8
-gG2OxOwve5xWdyhI2kgALR57vWjx4IXPGcbrqcH5mQmh5G0T08b6yVd/QAm+eUqG
-iu2U0E2u5nYaGBUrbJhESwi1BUG5skVohdM7pywwkI89EX8kC55zo9f3PkTkI81+
-BW/4GYNq3jZdnOkQikwBD+BpZNYHwiIC0x7H6dVzxd/etmTJQ5enAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC53bWljaC5lZHWGJGh0dHBzOi8vaWRwLndtaWNoLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUr3+xm4m0gO5W3F0sK6Hbfy0tQeAw
-DQYJKoZIhvcNAQEFBQADggEBAIXq7tJZSGV+V6fTXpk31EIKEXqI4dpw/r2lb1cx
-Ph6pAyQ9SYBxOrdS1CDo0+OC5WvtgRYArnhgdajCwhtvbfMCufT4w3bCTU6/P6SE
-nhjIGWdZIfTvEEv9m3R6Q6tyTfW143IsSHA++aowZ4Vup5fBwOKqzclrWRWyIlr+
-RchDpIDX4nMpzZpWXmOuqXNbUjb5nejgUmF8jELzsNIsnouAOqYg8n9+cgYd+2w+
-p57il9Y4UDMnswbxscZKwp32B+e5o6Mc6YrFVeVuR6zWR6+FQaDG8YFesmTDBvTv
-8Pbk+Hx1N2rqKvwenWT850/va3DwTJBeKdJGwCN2d4QNqMM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmich.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wmich.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wmich.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wmich.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wmich.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wmich.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUa4EI2jTt6ViDq1EIcA/j+LW97W4wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwLndtaWNoLmVkdTAeFw0xMjA4MDExOTI0NTFaFw0z
-MjA4MDExOTI0NTFaMBgxFjAUBgNVBAMTDWlkcC53bWljaC5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7nBw1E5fmU+Nd+wyb1/YCO3pKUw+C+6Uw
-Kk0SF5daJWbZDI3UWKdQjl0aVp53yml3oEzQFbsRl9KXSC43Wy1zAWNYF2MSUxOQ
-2//8K1omFvWDaa1teaOVn+o8ID56FN3WCj0H1JGXsS/Ub6xgArLvQP4qwIbWAkw8
-gG2OxOwve5xWdyhI2kgALR57vWjx4IXPGcbrqcH5mQmh5G0T08b6yVd/QAm+eUqG
-iu2U0E2u5nYaGBUrbJhESwi1BUG5skVohdM7pywwkI89EX8kC55zo9f3PkTkI81+
-BW/4GYNq3jZdnOkQikwBD+BpZNYHwiIC0x7H6dVzxd/etmTJQ5enAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcC53bWljaC5lZHWGJGh0dHBzOi8vaWRwLndtaWNoLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUr3+xm4m0gO5W3F0sK6Hbfy0tQeAw
-DQYJKoZIhvcNAQEFBQADggEBAIXq7tJZSGV+V6fTXpk31EIKEXqI4dpw/r2lb1cx
-Ph6pAyQ9SYBxOrdS1CDo0+OC5WvtgRYArnhgdajCwhtvbfMCufT4w3bCTU6/P6SE
-nhjIGWdZIfTvEEv9m3R6Q6tyTfW143IsSHA++aowZ4Vup5fBwOKqzclrWRWyIlr+
-RchDpIDX4nMpzZpWXmOuqXNbUjb5nejgUmF8jELzsNIsnouAOqYg8n9+cgYd+2w+
-p57il9Y4UDMnswbxscZKwp32B+e5o6Mc6YrFVeVuR6zWR6+FQaDG8YFesmTDBvTv
-8Pbk+Hx1N2rqKvwenWT850/va3DwTJBeKdJGwCN2d4QNqMM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmich.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Western Michigan University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Western Michigan University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wmich.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>WMU OIT Shibboleth Authentication Support</md:GivenName>
-    <md:EmailAddress>oit-shibadmin@wmich.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>WMU OIT Shibboleth Authentication Support</md:GivenName>
-    <md:EmailAddress>oit-shibadmin@wmich.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>WMU Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@wmich.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wmin.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.wmin.ac.uk-entity.xml
deleted file mode 100644
index 5cfd21f3..00000000
--- a/swamid-interfederations-2.0/idp.wmin.ac.uk-entity.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://idp.wmin.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for the University of Westminster.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-09T15:50: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">wmin.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDxTCCAq2gAwIBAgIJAKJTZR5Gg4aEMA0GCSqGSIb3DQEBCwUAMHkxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEiMCAGA1UE
-						CgwZVW5pdmVyc2l0eSBvZiBXZXN0bWluc3RlcjELMAkGA1UECwwCSVMxFzAVBgNV
-						BAMMDmlkcC53bWluLmFjLnVrMB4XDTE1MDEwODE2MDUwOVoXDTI1MDEwNTE2MDUw
-						OVoweTELMAkGA1UEBhMCR0IxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9u
-						ZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IG9mIFdlc3RtaW5zdGVyMQswCQYDVQQL
-						DAJJUzEXMBUGA1UEAwwOaWRwLndtaW4uYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQCYvgnD7J51erwpxIAgeDt1L0WAQ3V9Mft1HCB8ebimah+M
-						ET2RsgJtMWLvUCs+TOnl9ESgyR/jgh4Nui1mCUloooNnTKmiVagj+o+xHObPmA3j
-						6Dk1Zhun/kcCgXPZq0gxdr+PtA0zfh0NeU7hiUWIFu/XXRrdCTlOrOXYmGTHx+bv
-						aJllG5632hhJAMVB6saH2OQp70AapusaXsYnY+eYInmIlEs9VKcdLlYVXdS9iMmQ
-						QgxgMTzKsb5uaZxTpzR6ZhGCIpE9gkfqD0TT1juH6adT5JFQ8K/xqjT4TonA6sXs
-						WoeWSjLLg/J/81B2fyrtz4M5bVmtCKH9pdXywKNpAgMBAAGjUDBOMB0GA1UdDgQW
-						BBSpJvZ2yI13jz9K7Bje0+nKQFinvTAfBgNVHSMEGDAWgBSpJvZ2yI13jz9K7Bje
-						0+nKQFinvTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB807x92SUY
-						E+BToJCZrf3rvKFvczshq+sVXurkPA/pIo9p0MQVEmHnnRugW5ybhkmdb38PP7xH
-						w9FbjppTttAwJVKszX/0ZHyFLZmlE/6Zp90BuK7ikvJFpWrLXQv4tvcEjKzpqUjA
-						AIsT3BGhF33rMGp8cA915264YwmjkHMhUo/+hCPRaQ8PfHVDvLHC8FXQB9+kt2bI
-						bF++uJUXXusfXJ6WSDLE8bTPftQpgTu/lSDnQi3tV4xmdI0Wgvr4nl4SaVHat8wY
-						plQT+YQoWyrQDZMfk+B9dJHcBAr7Sb57l799Hilx3PqrmUkb0JI4K+TxLLlwoGh0
-						f1W0FLEz3Y37
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmin.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wmin.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://shib-login.wmin.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-login.wmin.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-login.wmin.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-login.wmin.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">wmin.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDxTCCAq2gAwIBAgIJAKJTZR5Gg4aEMA0GCSqGSIb3DQEBCwUAMHkxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEiMCAGA1UE
-						CgwZVW5pdmVyc2l0eSBvZiBXZXN0bWluc3RlcjELMAkGA1UECwwCSVMxFzAVBgNV
-						BAMMDmlkcC53bWluLmFjLnVrMB4XDTE1MDEwODE2MDUwOVoXDTI1MDEwNTE2MDUw
-						OVoweTELMAkGA1UEBhMCR0IxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwGTG9u
-						ZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IG9mIFdlc3RtaW5zdGVyMQswCQYDVQQL
-						DAJJUzEXMBUGA1UEAwwOaWRwLndtaW4uYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQCYvgnD7J51erwpxIAgeDt1L0WAQ3V9Mft1HCB8ebimah+M
-						ET2RsgJtMWLvUCs+TOnl9ESgyR/jgh4Nui1mCUloooNnTKmiVagj+o+xHObPmA3j
-						6Dk1Zhun/kcCgXPZq0gxdr+PtA0zfh0NeU7hiUWIFu/XXRrdCTlOrOXYmGTHx+bv
-						aJllG5632hhJAMVB6saH2OQp70AapusaXsYnY+eYInmIlEs9VKcdLlYVXdS9iMmQ
-						QgxgMTzKsb5uaZxTpzR6ZhGCIpE9gkfqD0TT1juH6adT5JFQ8K/xqjT4TonA6sXs
-						WoeWSjLLg/J/81B2fyrtz4M5bVmtCKH9pdXywKNpAgMBAAGjUDBOMB0GA1UdDgQW
-						BBSpJvZ2yI13jz9K7Bje0+nKQFinvTAfBgNVHSMEGDAWgBSpJvZ2yI13jz9K7Bje
-						0+nKQFinvTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB807x92SUY
-						E+BToJCZrf3rvKFvczshq+sVXurkPA/pIo9p0MQVEmHnnRugW5ybhkmdb38PP7xH
-						w9FbjppTttAwJVKszX/0ZHyFLZmlE/6Zp90BuK7ikvJFpWrLXQv4tvcEjKzpqUjA
-						AIsT3BGhF33rMGp8cA915264YwmjkHMhUo/+hCPRaQ8PfHVDvLHC8FXQB9+kt2bI
-						bF++uJUXXusfXJ6WSDLE8bTPftQpgTu/lSDnQi3tV4xmdI0Wgvr4nl4SaVHat8wY
-						plQT+YQoWyrQDZMfk+B9dJHcBAr7Sb57l799Hilx3PqrmUkb0JI4K+TxLLlwoGh0
-						f1W0FLEz3Y37
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wmin.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wmin.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 Westminster</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Westminster</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wmin.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Cavendish IT Service</GivenName>
-    <EmailAddress>mailto:cav-its@westminster.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Marriott</SurName>
-    <EmailAddress>mailto:d.marriott@westminster.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index fb718dea..00000000
--- a/swamid-interfederations-2.0/idp.wnsc.ac.uk-idp-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://idp.wnsc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Walford and North Shropshire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-04-16T17:43: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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wnsc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAgygAwIBAgIVAIMpdh+Ow4gohZ3+1Dc6yZ7rSiohMA0GCSqGSIb3DQEB
-						BQUAMBkxFzAVBgNVBAMMDmlkcC53bnNjLmFjLnVrMB4XDTE0MTIwMzE0NTc0OFoX
-						DTE3MTIwMzE0NTc0OFowGTEXMBUGA1UEAwwOaWRwLnduc2MuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnzh2UdAXkRxXPxRbyeMOVyqE5nXWU
-						1NUltK+mPi0lx9ph/GbDXVBeX7QgjV5VucVWsTaOCoFr3pQbBM9LdEugxRAbz3TF
-						B2wI2qyiQZ/u/4PnnGtto3/w4JgqdCQhK5kl2e4eEcRSAH5mlb8hLnbzNnhmXve6
-						n60UF+ex6kM6geZLRVH2fgv9BvHGnxBxtxgwaOuiE2GWKEWC7wEdmMwmgR3lh4Mk
-						K/CxnvESe5+ta7MX2Pp4CQqoqXDQNLEyk005Eil+Kol+eiYv+DPrlETakpn0TP2u
-						6IjzY+I/Nh58WWoR077pvMB6ZyfrXu8+FPWjzFZfnnmRhGsZ+3FsODmrAgMBAAGj
-						YzBhMB0GA1UdDgQWBBShbynC+ykKQkGKp6aQyyC/P3vm3TBABgNVHREEOTA3gg5p
-						ZHAud25zYy5hYy51a4YlaHR0cHM6Ly9pZHAud25zYy5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDANBgkqhkiG9w0BAQUFAAOCAQEABCQXO1KpDZgPC6yfN879Ah6hHtRu0RTn
-						iEjPuEJMIYXd0SXcSmfOZIsVausP2tTE/22X7HMfd3GDET5YZ1DArJ5gsgn315dT
-						/moP05m5FX7ce9rpFKDseJhBfz8dFIC2IGoMVqwHeGvF/GskedV67wTPKG2s2Uhx
-						fH1R60XUqd0IRdSqrB9XDiMQMlV4zFZSH2VWX2jPZHjLlYGn4OCWOskKATCexTWv
-						OC0qxwHUoAnGzeOz9hT6CiCwsUEYRiTh670haNyDqdu9/5yM3a8pP1IGExh5oIB/
-						m8099KSrhD81Eb8wDHAg815UhD2LoUVwNc0zec2/HISnI2fn2osGEw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wnsc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wnsc.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.wnsc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wnsc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.wnsc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wnsc.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">wnsc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAgygAwIBAgIVAIMpdh+Ow4gohZ3+1Dc6yZ7rSiohMA0GCSqGSIb3DQEB
-						BQUAMBkxFzAVBgNVBAMMDmlkcC53bnNjLmFjLnVrMB4XDTE0MTIwMzE0NTc0OFoX
-						DTE3MTIwMzE0NTc0OFowGTEXMBUGA1UEAwwOaWRwLnduc2MuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnzh2UdAXkRxXPxRbyeMOVyqE5nXWU
-						1NUltK+mPi0lx9ph/GbDXVBeX7QgjV5VucVWsTaOCoFr3pQbBM9LdEugxRAbz3TF
-						B2wI2qyiQZ/u/4PnnGtto3/w4JgqdCQhK5kl2e4eEcRSAH5mlb8hLnbzNnhmXve6
-						n60UF+ex6kM6geZLRVH2fgv9BvHGnxBxtxgwaOuiE2GWKEWC7wEdmMwmgR3lh4Mk
-						K/CxnvESe5+ta7MX2Pp4CQqoqXDQNLEyk005Eil+Kol+eiYv+DPrlETakpn0TP2u
-						6IjzY+I/Nh58WWoR077pvMB6ZyfrXu8+FPWjzFZfnnmRhGsZ+3FsODmrAgMBAAGj
-						YzBhMB0GA1UdDgQWBBShbynC+ykKQkGKp6aQyyC/P3vm3TBABgNVHREEOTA3gg5p
-						ZHAud25zYy5hYy51a4YlaHR0cHM6Ly9pZHAud25zYy5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDANBgkqhkiG9w0BAQUFAAOCAQEABCQXO1KpDZgPC6yfN879Ah6hHtRu0RTn
-						iEjPuEJMIYXd0SXcSmfOZIsVausP2tTE/22X7HMfd3GDET5YZ1DArJ5gsgn315dT
-						/moP05m5FX7ce9rpFKDseJhBfz8dFIC2IGoMVqwHeGvF/GskedV67wTPKG2s2Uhx
-						fH1R60XUqd0IRdSqrB9XDiMQMlV4zFZSH2VWX2jPZHjLlYGn4OCWOskKATCexTWv
-						OC0qxwHUoAnGzeOz9hT6CiCwsUEYRiTh670haNyDqdu9/5yM3a8pP1IGExh5oIB/
-						m8099KSrhD81Eb8wDHAg815UhD2LoUVwNc0zec2/HISnI2fn2osGEw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wnsc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wnsc.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">Walford and North Shropshire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Walford and North Shropshire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wnsc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ICT Helpdesk</GivenName>
-    <EmailAddress>mailto:ICTHelpdesk@wnsc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Henry</GivenName>
-    <SurName>Nurdin</SurName>
-    <EmailAddress>mailto:h.nurdin@wnsc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.woking.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.woking.ac.uk-shibboleth.xml
deleted file mode 100644
index 88ad899f..00000000
--- a/swamid-interfederations-2.0/idp.woking.ac.uk-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.woking.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Woking College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-06-26T13:59: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">woking.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQjCCAioCCQDzQLFc3l5fVDANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGU3VycmV5MQ8wDQYDVQQHEwZXb2tpbmcxFzAVBgNVBAoTDldv
-						a2luZyBDb2xsZWdlMRkwFwYDVQQDExBpZHAud29raW5nLmFjLnVrMB4XDTEzMTEw
-						NTE0MTQxMVoXDTMzMTAzMTE0MTQxMVowYzELMAkGA1UEBhMCR0IxDzANBgNVBAgT
-						BlN1cnJleTEPMA0GA1UEBxMGV29raW5nMRcwFQYDVQQKEw5Xb2tpbmcgQ29sbGVn
-						ZTEZMBcGA1UEAxMQaWRwLndva2luZy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAL4LR5bglyzayUHgWbAeGXwr7o2bav61X7rLiopGKRe23KwK
-						IPnXkFx5XQ7AL9+2ZuINUXx6qMYAJg0bLMINokYH0Qlm6LsK1M8rT58+f4s8U5Mk
-						6CHidaGhHHelH6dmRBkdqbIJ3/f201fMfprNxVJfovkFSwsByBTo7BEpKQmSajSG
-						Wdq+KSRgZhzzNp9s5dEaBZQFRqejGqj1jSZdz34bRtRZ8Vy17GALIoFtZE2P+zaa
-						rogI7MlPmDyoDUouQ9RsSVgj1+8zGDWmnjJcnQQIR8jvAaZeavcQfmnRXAtkPKiJ
-						ppwVjtxAlEuuSnWL+ROlXRqIun3uUEsKSr6PQ3kCAwEAATANBgkqhkiG9w0BAQUF
-						AAOCAQEAvH9FxNrQp5F+GBC1D4PyiubJmA4e1CalqE7ra9m7pgBUhd8mvDJl2vfo
-						xAe5IVVfeSYpbJQ4cg9zd3Vnh3tRVW4lsjDzvHjBAnRHAO1yzjFfUwulBl+YCCjX
-						N6cY7UMBPEWZ3mvwHc6B4pDDWPXx0Cq/p4da6KAT6ztlrjSUkcFVjtDexXbNmS04
-						B/Q3pZUzdQs3EzTOrQiFQMNw56Kpy/sMEPEwXJ+xeaSNttiM5TgqIjENwFZbLSmt
-						ibTP5VM86O2mOIf1QfhPQMUqud7HZfa7b7oRPSwt73xFVvbnjvSvsE5uHw2hiNAz
-						Z0EMXT53Z2x+2Euy0Y8Um48NtjrU3w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.woking.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.woking.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.woking.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.woking.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.woking.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.woking.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">woking.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQjCCAioCCQDzQLFc3l5fVDANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGU3VycmV5MQ8wDQYDVQQHEwZXb2tpbmcxFzAVBgNVBAoTDldv
-						a2luZyBDb2xsZWdlMRkwFwYDVQQDExBpZHAud29raW5nLmFjLnVrMB4XDTEzMTEw
-						NTE0MTQxMVoXDTMzMTAzMTE0MTQxMVowYzELMAkGA1UEBhMCR0IxDzANBgNVBAgT
-						BlN1cnJleTEPMA0GA1UEBxMGV29raW5nMRcwFQYDVQQKEw5Xb2tpbmcgQ29sbGVn
-						ZTEZMBcGA1UEAxMQaWRwLndva2luZy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAL4LR5bglyzayUHgWbAeGXwr7o2bav61X7rLiopGKRe23KwK
-						IPnXkFx5XQ7AL9+2ZuINUXx6qMYAJg0bLMINokYH0Qlm6LsK1M8rT58+f4s8U5Mk
-						6CHidaGhHHelH6dmRBkdqbIJ3/f201fMfprNxVJfovkFSwsByBTo7BEpKQmSajSG
-						Wdq+KSRgZhzzNp9s5dEaBZQFRqejGqj1jSZdz34bRtRZ8Vy17GALIoFtZE2P+zaa
-						rogI7MlPmDyoDUouQ9RsSVgj1+8zGDWmnjJcnQQIR8jvAaZeavcQfmnRXAtkPKiJ
-						ppwVjtxAlEuuSnWL+ROlXRqIun3uUEsKSr6PQ3kCAwEAATANBgkqhkiG9w0BAQUF
-						AAOCAQEAvH9FxNrQp5F+GBC1D4PyiubJmA4e1CalqE7ra9m7pgBUhd8mvDJl2vfo
-						xAe5IVVfeSYpbJQ4cg9zd3Vnh3tRVW4lsjDzvHjBAnRHAO1yzjFfUwulBl+YCCjX
-						N6cY7UMBPEWZ3mvwHc6B4pDDWPXx0Cq/p4da6KAT6ztlrjSUkcFVjtDexXbNmS04
-						B/Q3pZUzdQs3EzTOrQiFQMNw56Kpy/sMEPEwXJ+xeaSNttiM5TgqIjENwFZbLSmt
-						ibTP5VM86O2mOIf1QfhPQMUqud7HZfa7b7oRPSwt73xFVvbnjvSvsE5uHw2hiNAz
-						Z0EMXT53Z2x+2Euy0Y8Um48NtjrU3w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.woking.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.woking.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">Woking College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Woking College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.woking.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:itsupport@woking.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mohammed</GivenName>
-    <SurName>Akram</SurName>
-    <EmailAddress>mailto:mak@woking.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wooster.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wooster.edu-idp-shibboleth.xml
deleted file mode 100644
index 08006288..00000000
--- a/swamid-interfederations-2.0/idp.wooster.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://idp.wooster.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">wooster.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The College of Wooster</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>
-MIIDKDCCAhCgAwIBAgIVAI2Lui1vSO8MHNMubyKBhAnnj/14MA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC53b29zdGVyLmVkdTAeFw0xMTExMDMxODM4NTFa
-Fw0zMTExMDMxOTM4NTFaMBoxGDAWBgNVBAMTD2lkcC53b29zdGVyLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnu2Gw6Irx4NZldkeGBLetETpCy
-uVS8wUHPhzodyjLhksa5NeT6SBG4BBt2JSnuI4dRwY7k1igxe8km1qXgUnn/j1Ho
-5W6zAwzHASsuIyYFyYrQ0sdnLes6sEeZDPADU5LDQT7vvWJm3WgvZJmM45NcsXr4
-6mN+wYKpgQbiUfBytkbYjTV1tYHPTYFNz8HDlBuYDwifx0pdZ3MhxT3tt30RMZ5Y
-F3Jo8VlMiLMIdS0wYKGOdXMSykKyi0+Gix1kv+DmLRpuMcid0CBBfh7uPnUO7MUy
-sJHoC397p2F4bidrnAEV1CFmetxaZB3irPGhUnL81ud8BapgOfhPp4OWbx8CAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLndvb3N0ZXIuZWR1hiZodHRwczovL2lkcC53
-b29zdGVyLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU2clCh8A4cBYUuLvs
-qGX5zdpFUc4wDQYJKoZIhvcNAQEFBQADggEBAJ2Eap2ziunllauY/qhBEWrhSnVH
-SUGBCLvyylg5kbpoNdcl1CPXW/pfWNn4UEy8AtNwHiQZG4CPy89ik0ZcIf146Tn2
-YQcoJn0XAszpvKzYDVxlEE0T1UrtlKDy0V9jFDnVw9UFw+5w3Ix3vBDT/TZwjyAj
-+ksknyRMcGWCi5ia9U0ZgHKvOE/B/QgF3vT8Dzzb5G772LWytudXutQJmQC9Ch8K
-W5aggtvAOm9Z5a398jL21emZAgI3HBKcByqHpKB6Ci5rUmTQklhZ6szqU1+IM9+a
-ruOBR00Y3KW+OWjgg06N026JaWDbMENv4J8oyrehK5NqlLF/mZKGEk0UwRI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wooster.edu:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wooster.edu:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wooster.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wooster.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wooster.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wooster.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAI2Lui1vSO8MHNMubyKBhAnnj/14MA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2lkcC53b29zdGVyLmVkdTAeFw0xMTExMDMxODM4NTFa
-Fw0zMTExMDMxOTM4NTFaMBoxGDAWBgNVBAMTD2lkcC53b29zdGVyLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnu2Gw6Irx4NZldkeGBLetETpCy
-uVS8wUHPhzodyjLhksa5NeT6SBG4BBt2JSnuI4dRwY7k1igxe8km1qXgUnn/j1Ho
-5W6zAwzHASsuIyYFyYrQ0sdnLes6sEeZDPADU5LDQT7vvWJm3WgvZJmM45NcsXr4
-6mN+wYKpgQbiUfBytkbYjTV1tYHPTYFNz8HDlBuYDwifx0pdZ3MhxT3tt30RMZ5Y
-F3Jo8VlMiLMIdS0wYKGOdXMSykKyi0+Gix1kv+DmLRpuMcid0CBBfh7uPnUO7MUy
-sJHoC397p2F4bidrnAEV1CFmetxaZB3irPGhUnL81ud8BapgOfhPp4OWbx8CAwEA
-AaNlMGMwQgYDVR0RBDswOYIPaWRwLndvb3N0ZXIuZWR1hiZodHRwczovL2lkcC53
-b29zdGVyLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU2clCh8A4cBYUuLvs
-qGX5zdpFUc4wDQYJKoZIhvcNAQEFBQADggEBAJ2Eap2ziunllauY/qhBEWrhSnVH
-SUGBCLvyylg5kbpoNdcl1CPXW/pfWNn4UEy8AtNwHiQZG4CPy89ik0ZcIf146Tn2
-YQcoJn0XAszpvKzYDVxlEE0T1UrtlKDy0V9jFDnVw9UFw+5w3Ix3vBDT/TZwjyAj
-+ksknyRMcGWCi5ia9U0ZgHKvOE/B/QgF3vT8Dzzb5G772LWytudXutQJmQC9Ch8K
-W5aggtvAOm9Z5a398jL21emZAgI3HBKcByqHpKB6Ci5rUmTQklhZ6szqU1+IM9+a
-ruOBR00Y3KW+OWjgg06N026JaWDbMENv4J8oyrehK5NqlLF/mZKGEk0UwRI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wooster.edu:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The College of Wooster</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The College of Wooster</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wooster.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Vince DiScipio</md:GivenName>
-    <md:EmailAddress>vdiscipio@wooster.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Roger Dills</md:GivenName>
-    <md:EmailAddress>rdills@wooster.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michael Naylor</md:GivenName>
-    <md:EmailAddress>mnaylor@wooster.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.worc.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.worc.ac.uk-oala-metadata.xml
deleted file mode 100644
index 97b04cfc..00000000
--- a/swamid-interfederations-2.0/idp.worc.ac.uk-oala-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.worc.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the University of Worcester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-07-14T17:53:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">worc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDlzCCAn+gAwIBAgIJAM9gbhSqyROWMA0GCSqGSIb3DQEBBQUAMDsxIDAeBgNV
-						BAoTF1VuaXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5h
-						Yy51azAeFw0xMTA3MDYxMDQ4MTdaFw0yMTA3MDMxMDQ4MTdaMDsxIDAeBgNVBAoT
-						F1VuaXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZDA7qffg7TU6jYsSUq
-						3rdyqGyXqCvENST8ytpZeo5GXpZwu+BB3d5s8+mjD055tl60AGvJ14DYix2hzJ/d
-						HrcGTSeeqfl4aXGZZ3BAUAPy9kiRQqG72EeY1t4QgzOoJlHD/rnWKrHDGZgo2/S2
-						OKUudCkz/Ep0Z4sUg9N0KdoIlcbMc7b1vUE/ACsasQCsSjU63rb/fyYxW/UQZWXh
-						xmGvGmmk9G0cNUwipv+s04Rqh6gq3s7ukbCtSd64FrSKG/RkwNTRRg1+S2N+9Vbm
-						+feCYnJvGEkNN+m+9Lcq77vu3+uiQRKZFkBkR/rU42/WsqXDQAspiOwoO6GVibAD
-						BcsCAwEAAaOBnTCBmjAdBgNVHQ4EFgQUC/NgmG4G9V4HMA3TWbPetEyLnL0wawYD
-						VR0jBGQwYoAUC/NgmG4G9V4HMA3TWbPetEyLnL2hP6Q9MDsxIDAeBgNVBAoTF1Vu
-						aXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5hYy51a4IJ
-						AM9gbhSqyROWMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIBKZ9GG
-						REabLBEsXHsBrvSZhYA+tUv+NI7dzgy7ZpDlu11hY7ZvW0fUxhdOKjgBi8d4JULT
-						trMafGP1PuYNCD4Mq9crfXCX9nqM+QBAPiWHQmHeWqVB+ibSKRHd1LoCgNqnyb9z
-						/f1CC2RGHNdXANO4DGeYqf2dxEVHtlxo2mTlQj6OtrJ02T4auqztM7QBbxKfesxe
-						odciW+HA2B/fA+G23KSazb74AIKrXT5YZSDgWvcyMS25shYbuwbj1KIqU7IsBQQw
-						JPIj5C1aB1XqXb/f875iu38rBNg0ZEsqKP4SnX5e5nlpQk4KCdkj34RGeCctzEGF
-						FqqTiJna2FaWzV0=
-					</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>
-						MIIDlzCCAn+gAwIBAgIJAM9gbhSqyROWMA0GCSqGSIb3DQEBBQUAMDsxIDAeBgNV
-						BAoTF1VuaXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5h
-						Yy51azAeFw0xMTA3MDYxMDQ4MTdaFw0yMTA3MDMxMDQ4MTdaMDsxIDAeBgNVBAoT
-						F1VuaXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZDA7qffg7TU6jYsSUq
-						3rdyqGyXqCvENST8ytpZeo5GXpZwu+BB3d5s8+mjD055tl60AGvJ14DYix2hzJ/d
-						HrcGTSeeqfl4aXGZZ3BAUAPy9kiRQqG72EeY1t4QgzOoJlHD/rnWKrHDGZgo2/S2
-						OKUudCkz/Ep0Z4sUg9N0KdoIlcbMc7b1vUE/ACsasQCsSjU63rb/fyYxW/UQZWXh
-						xmGvGmmk9G0cNUwipv+s04Rqh6gq3s7ukbCtSd64FrSKG/RkwNTRRg1+S2N+9Vbm
-						+feCYnJvGEkNN+m+9Lcq77vu3+uiQRKZFkBkR/rU42/WsqXDQAspiOwoO6GVibAD
-						BcsCAwEAAaOBnTCBmjAdBgNVHQ4EFgQUC/NgmG4G9V4HMA3TWbPetEyLnL0wawYD
-						VR0jBGQwYoAUC/NgmG4G9V4HMA3TWbPetEyLnL2hP6Q9MDsxIDAeBgNVBAoTF1Vu
-						aXZlcnNpdHkgb2YgV29yY2VzdGVyMRcwFQYDVQQDEw5pZHAud29yYy5hYy51a4IJ
-						AM9gbhSqyROWMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIBKZ9GG
-						REabLBEsXHsBrvSZhYA+tUv+NI7dzgy7ZpDlu11hY7ZvW0fUxhdOKjgBi8d4JULT
-						trMafGP1PuYNCD4Mq9crfXCX9nqM+QBAPiWHQmHeWqVB+ibSKRHd1LoCgNqnyb9z
-						/f1CC2RGHNdXANO4DGeYqf2dxEVHtlxo2mTlQj6OtrJ02T4auqztM7QBbxKfesxe
-						odciW+HA2B/fA+G23KSazb74AIKrXT5YZSDgWvcyMS25shYbuwbj1KIqU7IsBQQw
-						JPIj5C1aB1XqXb/f875iu38rBNg0ZEsqKP4SnX5e5nlpQk4KCdkj34RGeCctzEGF
-						FqqTiJna2FaWzV0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.worc.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.worc.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Worcester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Worcester</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.worcester.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Judy</GivenName>
-    <SurName>Reed</SurName>
-    <EmailAddress>mailto:j.reed@worc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ged</GivenName>
-    <SurName>Attwood</SurName>
-    <EmailAddress>mailto:g.attwood@worc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wortech.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.wortech.ac.uk-shibboleth.xml
deleted file mode 100644
index 3b69697d..00000000
--- a/swamid-interfederations-2.0/idp.wortech.ac.uk-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://idp.wortech.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Heart of Worcestershire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-26T15:44:57Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">wortech.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUVyuETbzgv93czUmf4A085Hv5gp0wDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSaWRwMi53b3J0ZWNoLmFjLnVrMB4XDTEyMDMyMzE0NDU1
-						M1oXDTMyMDMyMzE0NDU1M1owHTEbMBkGA1UEAxMSaWRwMi53b3J0ZWNoLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAunWkrcL+hnjQ09UdnKBA
-						BAw7lRBB3QYvOggtNnok7DzwWGpHcrXhx4KfzOfEJ3maUJYBdzRsT1dgt8F2vBkv
-						2D7z8ysuV28CB3WTOYescJS67mZ3JuvIIWOOs20wpTwrKQxqA0Jl17by6VBrD0mg
-						+h2Uo+DN18KFfOPchT7r8MrIzvGBZKyy5PSsHDteW2FcVeMKA01HGgtcKOhqAWGS
-						2eAmRH4JpTAHW5GtuBpQucXBGF//+WWVCoJ9tR05IhuPZTYYvPE+wYN6m6530ZVt
-						VjuQWq8bbK1vk4xLyTjkHv1ZB+8cU/h8zZjGyQYxYdEf2FvoujXBDZE0FezZ1y56
-						FQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAyLndvcnRlY2guYWMudWuGKWh0dHBz
-						Oi8vaWRwMi53b3J0ZWNoLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQr
-						3EpVDeHCnuNCrrLjnA2+sOs8NjANBgkqhkiG9w0BAQUFAAOCAQEACM1zfxfzXQ07
-						xIkBUtBRtzZGelYWvraMP1DHPt56zR0PSmqjIlA6dSZX48YQzSBBDbj3FvKxRp9F
-						C7KrFook4NezTl5qifHGecDQoUF3i12YQJLpwWIfFoTeQWwgWlRkk5elSYuiqkTv
-						JE5UzTJbRQP19dxNcOPFFNOdq2LRPgAYumiUf5jNggjT4EQWOxhcaeA+TE8mcAuo
-						eKDV+Q789bIiGbvRHpVekbME32dIf4PUuGeLSpTmMDPNkGUYK1xaIOe5lcjRNZeS
-						vMgWcHDE/JL/TU1/E8l0OtwcrU4pNPVvcm5ibuX3ADUHT+ZO10elrc8pCMJCFuME
-						cu2/4uSuxQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.wortech.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.wortech.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://idp2.wortech.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.wortech.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.wortech.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.wortech.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">wortech.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUVyuETbzgv93czUmf4A085Hv5gp0wDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSaWRwMi53b3J0ZWNoLmFjLnVrMB4XDTEyMDMyMzE0NDU1
-						M1oXDTMyMDMyMzE0NDU1M1owHTEbMBkGA1UEAxMSaWRwMi53b3J0ZWNoLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAunWkrcL+hnjQ09UdnKBA
-						BAw7lRBB3QYvOggtNnok7DzwWGpHcrXhx4KfzOfEJ3maUJYBdzRsT1dgt8F2vBkv
-						2D7z8ysuV28CB3WTOYescJS67mZ3JuvIIWOOs20wpTwrKQxqA0Jl17by6VBrD0mg
-						+h2Uo+DN18KFfOPchT7r8MrIzvGBZKyy5PSsHDteW2FcVeMKA01HGgtcKOhqAWGS
-						2eAmRH4JpTAHW5GtuBpQucXBGF//+WWVCoJ9tR05IhuPZTYYvPE+wYN6m6530ZVt
-						VjuQWq8bbK1vk4xLyTjkHv1ZB+8cU/h8zZjGyQYxYdEf2FvoujXBDZE0FezZ1y56
-						FQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAyLndvcnRlY2guYWMudWuGKWh0dHBz
-						Oi8vaWRwMi53b3J0ZWNoLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQr
-						3EpVDeHCnuNCrrLjnA2+sOs8NjANBgkqhkiG9w0BAQUFAAOCAQEACM1zfxfzXQ07
-						xIkBUtBRtzZGelYWvraMP1DHPt56zR0PSmqjIlA6dSZX48YQzSBBDbj3FvKxRp9F
-						C7KrFook4NezTl5qifHGecDQoUF3i12YQJLpwWIfFoTeQWwgWlRkk5elSYuiqkTv
-						JE5UzTJbRQP19dxNcOPFFNOdq2LRPgAYumiUf5jNggjT4EQWOxhcaeA+TE8mcAuo
-						eKDV+Q789bIiGbvRHpVekbME32dIf4PUuGeLSpTmMDPNkGUYK1xaIOe5lcjRNZeS
-						vMgWcHDE/JL/TU1/E8l0OtwcrU4pNPVvcm5ibuX3ADUHT+ZO10elrc8pCMJCFuME
-						cu2/4uSuxQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.wortech.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.wortech.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">Heart of Worcestershire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Worcester College of Technology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wortech.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:itservices@wortech.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:itservices@wortech.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wpi.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wpi.edu-idp-shibboleth.xml
deleted file mode 100644
index 0d9efb42..00000000
--- a/swamid-interfederations-2.0/idp.wpi.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://idp.wpi.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">wpi.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Worcester Polytechnic Institute</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.wpi.edu</mdui:InformationURL>
-        <mdui:Logo height="60" width="489" xml:lang="en">https://www.wpi.edu/Images/template/wpilogo.gif</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>
-MIIDFzCCAf+gAwIBAgIUZcDEUesMNCAxqzW1X3lCXV3BW40wDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLndwaS5lZHUwHhcNMTEwMzA0MTgyOTIwWhcNMzEw
-MzA0MTgyOTIwWjAWMRQwEgYDVQQDEwtpZHAud3BpLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIAeq3YyX5BKUHSpXBIrHDlzrk2KnU9+rGTHX0yR
-t5qTDBYtMGZDwGEDW9iTTRVKpEUQRCLUdmYQGe10Tp4Wwwy8e3uBNP6CBUUO+uZ9
-v558CIpO8vknk+vRu3Rdxqryp34HWscbZZb8uAQjOwnFZ3eBJVTIEugeSSZVpor/
-xzI+tWYO2IurI3LyyN+aqZi+z2AlRxq7YR4nVDKfR2sTRe6SXYPrcpXrYYXMcKGY
-4gRXhhI5at0/FLT38DA6zxYE2PRLJsT0ViPdoacmfMrST7d5XVxSSuaqjPi0I7eX
-C67mjYNOL8Cd4HQNoodb4TM7iIYrtpZKGyroNeJ3i+MzM+ECAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLndwaS5lZHWGImh0dHBzOi8vaWRwLndwaS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFOBwGRx8eH0sfoAq2pCao9AhQ66cMA0GCSqGSIb3
-DQEBBQUAA4IBAQAoQ/w1GrFkPfr0WPPk29OnXWRDFz1Y6V2mqn4EtOX7IniBWlwA
-ZlQ75SrRTmx6rRSO/1kaf//5YIRC4QmWbyXwGUwvQL+OlM1BxUohtQ/12U/fAtSH
-1Dz1U7cIrnd+iLXq0GgXlMie0m6i570WJXWWDK1JYnCCa36JxfMdC8xMNwglNoSM
-WxgWsGCPSXCPTg+lGT7Hd8FID6VpnOWMrKQkdPga8xDre2YUmiIVMS9FEaSZL+Tj
-oE+cFFxg0TXajhapymP2fMY1bGHiM0wThqXsaeB2MctDByiX1Cl3qPwMtBUEEI1w
-JJHUiO7JFs58BFW6Cbx0vbt8hmKGvdpkMBea
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wpi.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wpi.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wpi.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wpi.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wpi.edu/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">wpi.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUZcDEUesMNCAxqzW1X3lCXV3BW40wDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLndwaS5lZHUwHhcNMTEwMzA0MTgyOTIwWhcNMzEw
-MzA0MTgyOTIwWjAWMRQwEgYDVQQDEwtpZHAud3BpLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIAeq3YyX5BKUHSpXBIrHDlzrk2KnU9+rGTHX0yR
-t5qTDBYtMGZDwGEDW9iTTRVKpEUQRCLUdmYQGe10Tp4Wwwy8e3uBNP6CBUUO+uZ9
-v558CIpO8vknk+vRu3Rdxqryp34HWscbZZb8uAQjOwnFZ3eBJVTIEugeSSZVpor/
-xzI+tWYO2IurI3LyyN+aqZi+z2AlRxq7YR4nVDKfR2sTRe6SXYPrcpXrYYXMcKGY
-4gRXhhI5at0/FLT38DA6zxYE2PRLJsT0ViPdoacmfMrST7d5XVxSSuaqjPi0I7eX
-C67mjYNOL8Cd4HQNoodb4TM7iIYrtpZKGyroNeJ3i+MzM+ECAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLndwaS5lZHWGImh0dHBzOi8vaWRwLndwaS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFOBwGRx8eH0sfoAq2pCao9AhQ66cMA0GCSqGSIb3
-DQEBBQUAA4IBAQAoQ/w1GrFkPfr0WPPk29OnXWRDFz1Y6V2mqn4EtOX7IniBWlwA
-ZlQ75SrRTmx6rRSO/1kaf//5YIRC4QmWbyXwGUwvQL+OlM1BxUohtQ/12U/fAtSH
-1Dz1U7cIrnd+iLXq0GgXlMie0m6i570WJXWWDK1JYnCCa36JxfMdC8xMNwglNoSM
-WxgWsGCPSXCPTg+lGT7Hd8FID6VpnOWMrKQkdPga8xDre2YUmiIVMS9FEaSZL+Tj
-oE+cFFxg0TXajhapymP2fMY1bGHiM0wThqXsaeB2MctDByiX1Cl3qPwMtBUEEI1w
-JJHUiO7JFs58BFW6Cbx0vbt8hmKGvdpkMBea
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wpi.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wpi.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Worcester Polytechnic Institute</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Worcester Polytechnic Institute</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wpi.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jesse Banning</md:GivenName>
-    <md:EmailAddress>jbanning@wpi.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Allan E. Johannesen</md:GivenName>
-    <md:EmailAddress>aej@wpi.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>WPI Computer Helpdesk</md:GivenName>
-    <md:EmailAddress>helpdesk@wpi.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wpunj.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wpunj.edu-idp-shibboleth.xml
deleted file mode 100644
index a9baa86e..00000000
--- a/swamid-interfederations-2.0/idp.wpunj.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://idp.wpunj.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">wpunj.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">William Paterson University</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>
-MIIDBTCCAe2gAwIBAgIJAI4YC5Npo9L0MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMMDmlkcDAud3B1bmouZWR1MB4XDTEzMDYxMjEyMzgzNVoXDTMzMDYwNzEyMzgz
-NVowGTEXMBUGA1UEAwwOaWRwMC53cHVuai5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDo7XjTdyxVbr0MBuEEBSJhgYNUBwSPI65Fzsq4EB3ojHgm
-tGpOR+E3tafl+1wjDe86+IFbQzrfbuXKhxblhzrM1kDvhOcBJgvLNZyyKnPcwWxS
-2gyMI4EpF1CpcCMAXs0zewKigpSH2ZTXSWtAV0ZXkT5xD+M9aWkjgmErgenNUqRY
-Wicd6CxfEFVcYhTx/5gapMhq1XOg0IjgZRV1sA4V283CzVzOS3az2STTVkX5WUV9
-bJgFTAHEXEDPPcbWrorVy7bMz5PvT3eqqX1JJNg3F8jNrNa8ldjgJiXJjjzOZlEn
-KQC4+BvF8j6gckBrsvsHwxDL1S4RUF2sdYDypDoRAgMBAAGjUDBOMB0GA1UdDgQW
-BBSGw9sPSDIQsPNpVDnRQgimrIhTDTAfBgNVHSMEGDAWgBSGw9sPSDIQsPNpVDnR
-QgimrIhTDTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDmERlLZPBJ
-B6WWlMpOu3FS1kSn57Bqat9Hax+JtT+wNhIJq5hkevdbjNwqsT1VgQCzAsGpz28O
-4rWsEWZWsCq6/VgaXqh49xLDk/HyribBT4yzzsoOFlQoQK5HPdo+saHNE3VCIuaa
-OufYAOvQl+su5vJiGxMLCi9zD5Vzk003JwfUW5ZBcCfkUWc1bH1Y4vO0fwfvgXFK
-VW8P1xkXWl3TgwOQtxQ3ek17NFG63fRTeBddS2K3m9fK5tVF+ivD6Juu2Li/Oqx5
-dzSXh+7VKhTHWQ0+Oax0YOEOtSCceQ3A+/cR+2MRKIKaTekRMVq3lOvgdaVlBtg0
-KZbNrgCaX2SV
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp0.wpunj.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp0.wpunj.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp0.wpunj.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp0.wpunj.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp0.wpunj.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wpunj.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDBTCCAe2gAwIBAgIJAI4YC5Npo9L0MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMMDmlkcDAud3B1bmouZWR1MB4XDTEzMDYxMjEyMzgzNVoXDTMzMDYwNzEyMzgz
-NVowGTEXMBUGA1UEAwwOaWRwMC53cHVuai5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDo7XjTdyxVbr0MBuEEBSJhgYNUBwSPI65Fzsq4EB3ojHgm
-tGpOR+E3tafl+1wjDe86+IFbQzrfbuXKhxblhzrM1kDvhOcBJgvLNZyyKnPcwWxS
-2gyMI4EpF1CpcCMAXs0zewKigpSH2ZTXSWtAV0ZXkT5xD+M9aWkjgmErgenNUqRY
-Wicd6CxfEFVcYhTx/5gapMhq1XOg0IjgZRV1sA4V283CzVzOS3az2STTVkX5WUV9
-bJgFTAHEXEDPPcbWrorVy7bMz5PvT3eqqX1JJNg3F8jNrNa8ldjgJiXJjjzOZlEn
-KQC4+BvF8j6gckBrsvsHwxDL1S4RUF2sdYDypDoRAgMBAAGjUDBOMB0GA1UdDgQW
-BBSGw9sPSDIQsPNpVDnRQgimrIhTDTAfBgNVHSMEGDAWgBSGw9sPSDIQsPNpVDnR
-QgimrIhTDTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDmERlLZPBJ
-B6WWlMpOu3FS1kSn57Bqat9Hax+JtT+wNhIJq5hkevdbjNwqsT1VgQCzAsGpz28O
-4rWsEWZWsCq6/VgaXqh49xLDk/HyribBT4yzzsoOFlQoQK5HPdo+saHNE3VCIuaa
-OufYAOvQl+su5vJiGxMLCi9zD5Vzk003JwfUW5ZBcCfkUWc1bH1Y4vO0fwfvgXFK
-VW8P1xkXWl3TgwOQtxQ3ek17NFG63fRTeBddS2K3m9fK5tVF+ivD6Juu2Li/Oqx5
-dzSXh+7VKhTHWQ0+Oax0YOEOtSCceQ3A+/cR+2MRKIKaTekRMVq3lOvgdaVlBtg0
-KZbNrgCaX2SV
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp0.wpunj.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">William Paterson University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">William Paterson University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wpunj.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Administrative Support</md:GivenName>
-    <md:EmailAddress>shibb_admin@wpunj.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:EmailAddress>shibb_tech@wpunj.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Help Desk</md:GivenName>
-    <md:EmailAddress>shibb_help@wpunj.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wsc.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/idp.wsc.ac.uk-oala-metadata.xml
deleted file mode 100644
index 056cf037..00000000
--- a/swamid-interfederations-2.0/idp.wsc.ac.uk-oala-metadata.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.wsc.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens IdP for West Suffolk College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-03T13:42:15Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">wsc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIIT/U/+SViUwMwDQYJKoZIhvcNAQEFBQAwNzEdMBsGA1UE
-						CgwUV2VzdCBTdWZmb2xrIENvbGxlZ2UxFjAUBgNVBAMMDWlkcC53c2MuYWMudWsw
-						HhcNMTQwNjAzMTA1NzU5WhcNMjQwNjAzMTA1NzU5WjA3MR0wGwYDVQQKDBRXZXN0
-						IFN1ZmZvbGsgQ29sbGVnZTEWMBQGA1UEAwwNaWRwLndzYy5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgKTfW/toD3mWZjcD65VNniLA4NV1Du
-						wE3c5iOiuyw6fXGXbRCEO3w3IADsy+9RfXIivtonMFmrdcUMCZH6VQUfpXT4gRZN
-						zGlaoMFsQJKIgicbor0MNpAKFnoTKmkHmOZHfvxb/ftDTlouGKAwJDRstJahdkLa
-						WlTb1cOLSVInUb6llF6D/EwJCiRmZbxPiHczxF/YFPzfbC+mzp3O1U1gf+OJAjaY
-						JGQCoAl07PeKuJVfzO6YzYWjdqyipqeXfgAbXvz7bvBQE16dYpLoKcntRvrZ+fur
-						ymvb6SVJMoFhkDSB4dxVhlVv5Qm7aKzhq4CF64XB46Q0Cz3OkuMJlHUCAwEAAaNQ
-						ME4wHQYDVR0OBBYEFInyiMvSbiRrYcNBGP9m3lpVzpHdMB8GA1UdIwQYMBaAFIny
-						iMvSbiRrYcNBGP9m3lpVzpHdMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAKGDepCXE7pK/LPMFm74rfVd7GVLMY7ATtzImUlSHx5WUnAE1R8tac5M5UCG
-						nS78tv9JmEmNANkfKoE+/k7ZJxRMegFynBzcCCsOIrjrraY4bo9lbBPT/TAQ3Z9k
-						rTtwg5O447D0H7Wd66voWyf4tYRL+YKmN8HZ7weiYvE5jYwlznl58yaVcXJWjJEE
-						OLqpZRu2UqHfNwwo4j2xjdulfVAwWUY38cqXYUAlb/DZ1x7xjbhOlZIaTlCoxB0d
-						CxXg/y0uia+nbOUPSjtUga9eBCtbxYTOqOGEDufxghpzG+C9DdNVEcOq0bN55wNO
-						HCB9qJyYG8vRlb91n4dVL0q3muQ=
-					</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>
-						MIIDQDCCAiigAwIBAgIIT/U/+SViUwMwDQYJKoZIhvcNAQEFBQAwNzEdMBsGA1UE
-						CgwUV2VzdCBTdWZmb2xrIENvbGxlZ2UxFjAUBgNVBAMMDWlkcC53c2MuYWMudWsw
-						HhcNMTQwNjAzMTA1NzU5WhcNMjQwNjAzMTA1NzU5WjA3MR0wGwYDVQQKDBRXZXN0
-						IFN1ZmZvbGsgQ29sbGVnZTEWMBQGA1UEAwwNaWRwLndzYy5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgKTfW/toD3mWZjcD65VNniLA4NV1Du
-						wE3c5iOiuyw6fXGXbRCEO3w3IADsy+9RfXIivtonMFmrdcUMCZH6VQUfpXT4gRZN
-						zGlaoMFsQJKIgicbor0MNpAKFnoTKmkHmOZHfvxb/ftDTlouGKAwJDRstJahdkLa
-						WlTb1cOLSVInUb6llF6D/EwJCiRmZbxPiHczxF/YFPzfbC+mzp3O1U1gf+OJAjaY
-						JGQCoAl07PeKuJVfzO6YzYWjdqyipqeXfgAbXvz7bvBQE16dYpLoKcntRvrZ+fur
-						ymvb6SVJMoFhkDSB4dxVhlVv5Qm7aKzhq4CF64XB46Q0Cz3OkuMJlHUCAwEAAaNQ
-						ME4wHQYDVR0OBBYEFInyiMvSbiRrYcNBGP9m3lpVzpHdMB8GA1UdIwQYMBaAFIny
-						iMvSbiRrYcNBGP9m3lpVzpHdMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAKGDepCXE7pK/LPMFm74rfVd7GVLMY7ATtzImUlSHx5WUnAE1R8tac5M5UCG
-						nS78tv9JmEmNANkfKoE+/k7ZJxRMegFynBzcCCsOIrjrraY4bo9lbBPT/TAQ3Z9k
-						rTtwg5O447D0H7Wd66voWyf4tYRL+YKmN8HZ7weiYvE5jYwlznl58yaVcXJWjJEE
-						OLqpZRu2UqHfNwwo4j2xjdulfVAwWUY38cqXYUAlb/DZ1x7xjbhOlZIaTlCoxB0d
-						CxXg/y0uia+nbOUPSjtUga9eBCtbxYTOqOGEDufxghpzG+C9DdNVEcOq0bN55wNO
-						HCB9qJyYG8vRlb91n4dVL0q3muQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wsc.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wsc.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">West Suffolk College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">West Suffolk College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wsc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library Helpdesk</GivenName>
-    <EmailAddress>mailto:library.helpdesk@wsc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>White</SurName>
-    <EmailAddress>mailto:softwarereg@wsc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.wvu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.wvu.edu-idp-shibboleth.xml
deleted file mode 100644
index a975877f..00000000
--- a/swamid-interfederations-2.0/idp.wvu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +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://idp.wvu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://myid.wvu.edu/shibboleth.html" 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">wvu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">West Virginia University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">WVU MyID credential system.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://myid.wvu.edu/shibboleth.html</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>
-MIIDFzCCAf+gAwIBAgIUHaTaH4T8uSERh/L40p5usF6rssEwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnd2dS5lZHUwHhcNMTQwMjI4MTYzODQwWhcNMzQw
-MjI4MTYzODQwWjAWMRQwEgYDVQQDEwtpZHAud3Z1LmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKXONB5USawNbIvnoyiZJfkmMjgbzcnCETway6PJ
-BGcwreadTuG7IQayVn1oQ33eu9pgE6MaASz3FGIXkKzyojJPQAGTlZjU4Ek1hKAr
-8OInCciRTSeKC9PsvnncQcjAFM6KchwbH6tukrkoUC0YrpMfKWxvMX3hoU3il4lz
-rhm+iPGdTVUHSDXgZx0TVHigMvElziwRyYWL7B4rLmD40w7hJpdkpYNFzHsu+UO+
-Xm5SOc6TlD0UaC6Du5dIyCMppvoPmHK3ftOhnysnbCfEKsbysi3QmyepMeFg1Iy7
-qubResCO0qJ97bdCUeEf7wth1pym9c+Qxyvatu5wj8p4BRcCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnd2dS5lZHWGImh0dHBzOi8vaWRwLnd2dS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFJupoRWEmqhm1W/JEthtqRwfaStqMA0GCSqGSIb3
-DQEBBQUAA4IBAQB60BmxCPRhRA02j2VRKL09WO4orDJoOLjFQ+AjQor4lYv3A46e
-iTmVmm0KERO0PRgurHFidc0O7r7tQ9aYoiErbrfpawl3TbfUnQryQhWTxQabu3uz
-cqWpsClvZ6FryowP4RB+fHWsjWURCYMZtPDFDxXDWwkyGHc9SfxNa+bwoWF2M1lK
-1fikte20R5JYzJgfq9jhLF/uhYuWiOQXrNklRVW2QhQoFVYzHWGElpcWjRGOrQ2Y
-NylxsKvHGHIUZMFlicTTxWpQCXT1AnyXP/YXQd0/mT0jN+ctYadWX4kz3B1t5/yW
-xBGKb4ax75uO0493e/TJEz4dq2uU4+HXaijS
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wvu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.wvu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.wvu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.wvu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.wvu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wvu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUHaTaH4T8uSERh/L40p5usF6rssEwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwLnd2dS5lZHUwHhcNMTQwMjI4MTYzODQwWhcNMzQw
-MjI4MTYzODQwWjAWMRQwEgYDVQQDEwtpZHAud3Z1LmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKXONB5USawNbIvnoyiZJfkmMjgbzcnCETway6PJ
-BGcwreadTuG7IQayVn1oQ33eu9pgE6MaASz3FGIXkKzyojJPQAGTlZjU4Ek1hKAr
-8OInCciRTSeKC9PsvnncQcjAFM6KchwbH6tukrkoUC0YrpMfKWxvMX3hoU3il4lz
-rhm+iPGdTVUHSDXgZx0TVHigMvElziwRyYWL7B4rLmD40w7hJpdkpYNFzHsu+UO+
-Xm5SOc6TlD0UaC6Du5dIyCMppvoPmHK3ftOhnysnbCfEKsbysi3QmyepMeFg1Iy7
-qubResCO0qJ97bdCUeEf7wth1pym9c+Qxyvatu5wj8p4BRcCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwLnd2dS5lZHWGImh0dHBzOi8vaWRwLnd2dS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFJupoRWEmqhm1W/JEthtqRwfaStqMA0GCSqGSIb3
-DQEBBQUAA4IBAQB60BmxCPRhRA02j2VRKL09WO4orDJoOLjFQ+AjQor4lYv3A46e
-iTmVmm0KERO0PRgurHFidc0O7r7tQ9aYoiErbrfpawl3TbfUnQryQhWTxQabu3uz
-cqWpsClvZ6FryowP4RB+fHWsjWURCYMZtPDFDxXDWwkyGHc9SfxNa+bwoWF2M1lK
-1fikte20R5JYzJgfq9jhLF/uhYuWiOQXrNklRVW2QhQoFVYzHWGElpcWjRGOrQ2Y
-NylxsKvHGHIUZMFlicTTxWpQCXT1AnyXP/YXQd0/mT0jN+ctYadWX4kz3B1t5/yW
-xBGKb4ax75uO0493e/TJEz4dq2uU4+HXaijS
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.wvu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">West Virginia University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">West Virginia University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wvu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Christopher Boyer</md:GivenName>
-    <md:EmailAddress>ckboyer@mail.wvu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sara Bishop</md:GivenName>
-    <md:EmailAddress>sabishop@mail.wvu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Christopher Boyer</md:GivenName>
-    <md:EmailAddress>ckboyer@mail.wvu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Alex Jalso</md:GivenName>
-    <md:EmailAddress>acjalso@mail.wvu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.xaverian.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp.xaverian.ac.uk-shibboleth.xml
deleted file mode 100644
index 0c8353e5..00000000
--- a/swamid-interfederations-2.0/idp.xaverian.ac.uk-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.xaverian.ac.uk/shibboleth">
-  <!--
-		This is an IdP (owned by Eduserv) for Xaverian College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">xaverian.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIEVOxCIjANBgkqhkiG9w0BAQsFADCBoDEoMCYGCSqGSIb3
-						DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0IxETAP
-						BgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVzZXJ2
-						MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVuc2Ft
-						cy5uZXQwHhcNMTUwMjI0MDkyMDA2WhcNMjUwMjI0MDkyMDA2WjCBoDEoMCYGCSqG
-						SIb3DQEJARYZYXRoZW5zaGVscEBlZHVzZXJ2Lm9yZy51azELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgMCFNvbWVyc2V0MQ0wCwYDVQQHDARCYXRoMRAwDgYDVQQKDAdFZHVz
-						ZXJ2MRMwEQYDVQQLDApPcGVuQXRoZW5zMR4wHAYDVQQDDBVnYXRld2F5LmF0aGVu
-						c2Ftcy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCandpa4o0N
-						jtw1DqbrrNTfOVe1PqyXIIVmDrJ6VUR/mokXXu+m5Gm+1f+3lyN5IA2YMn9Z8Yo3
-						7JQjIHs+xVS3q4nT1ewS7S3en1pdXKsH1WnUnVWUmpl9WJZrUwi5i8X80LNyr7Pm
-						udhuKNEATGUXkA/xWCkk2d8jf91hy7Qu+HA8LOKtdbbNigErh2IY/YuNWUVUqgGb
-						MH5BGr7ZEhPrz+Vwcf9lhPW+tKpKpZEzJfQiq8EoPaeMXEpKWBEErm67gkWFCA5V
-						hfcJLqFjQEC3pWOxt5rZVS8gl/Z33VSJZVzY5jWcQzmGaLXPHXyiKPmixl6+DjGl
-						UM0ylNF7GvtDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAFhmhujLZueiJ6F7mQCp
-						fB0Hj4Y8FyFUUc8NMAt5Set7H4DKSSl4shcqisZBa5yTdyenYwkmBszvCWs6Yeep
-						+zJmCR62cb/f1M32oMzLm02OlznWMkE8/IajGmdxTnB6Z/XcdMMIiCeok4kqe5KM
-						d5oRAyNskHYZ+8kzhs2zTveR+rqCtYxa/AYpwf7n0VQR9clBSNCIT4BCRi10aPE5
-						31VIxl4ljY3CwNoZ4lQTU/0aj8O4j68V2neiQb8lewAii0b2xoyOGYP4okd7T2tl
-						4gl2noVbCvYNjd6GYze/w4lgwiemkby7wu5sN1lEudgKDV+H54wU29ZIyDEFM6DD
-						NE4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.openathens.net/saml/2/sso/xaverian.ac.uk/c/ukfed"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.openathens.net/saml/1/sso/xaverian.ac.uk/c/ukfed"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Xaverian College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.xaverian.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.yeovil.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.yeovil.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 7e222127..00000000
--- a/swamid-interfederations-2.0/idp.yeovil.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.yeovil.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Yeovil College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-05T11:25:44Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">yeovil.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUc+MFJHCvsiXTJD9AbAGFOho/nyQwDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAxMRaWRwMi55ZW92aWwuYWMudWswHhcNMTIxMDA0MTYxNTQy
-						WhcNMzIxMDA0MTYxNTQyWjAcMRowGAYDVQQDExFpZHAyLnllb3ZpbC5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxEEpNwNxfUmo9qh7EXLPAw
-						RgYA86Ml4ZxwB2l2NnDL0VE/dts87f3wKPuECWDH1cZz/z8CSKZTktU0ANDGrNnC
-						yZz15BN51mSFiwKR0xOrpRe5EJrEGrzUyjxmMwEhEup0eiRH1c8VAbjyB3/2BPrI
-						s/eq9/bCa9K3WRPK+DihZqPEaH7DbWUDGCmyMNLY3hR7lXuhnWgQYUS42YYuPZsb
-						uKf1fzMdC2zRA3Z00fHfUBxPqCcWMdLsCGoJUh8zc+IYSEax8hdu1zf85LZqhXi4
-						/gsTGcWeAT3cq42Zb6hzIDgLHEanG/MWLxgDB0JBf2GZMPy13WrXQT0/Vc1iHqEC
-						AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi55ZW92aWwuYWMudWuGKGh0dHBzOi8v
-						aWRwMi55ZW92aWwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJ2w10W1
-						abGXJEftfLDwfLzYWieSMA0GCSqGSIb3DQEBBQUAA4IBAQCq8ksSrdQPwyg9QfzK
-						pUdTOoRRaGlY4zDVD1LBKWntpL+O1KGCn61ePiyoMQeONgtFBJDOP2rAiZXWZ6qN
-						seHfry/67Ssd2C4DbiG5QunQ19EzoZAGBUZD7yK7wcaJpBM7AWnwDnovEElNklyV
-						EkO9UVdYiFrq2gSN/p0K2OjW1FyNkvScbSoesI0AgUk0Wc7oaqWuz8IYmoFMQbkN
-						mDkeTy+Rlhf60bYRaLyxcHryq47BInhFWsuQ5S1MaxmS9m4bnYpUeo+ejqOkvIIX
-						SctLza4RkP6ubwWg7hVn8Qy7IEaDcvgpq1vVeRcOdo/TxQeWnASMZGbpVa9ik5Nn
-						KFgn
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.yeovil.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.yeovil.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://idp2.yeovil.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.yeovil.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.yeovil.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.yeovil.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">yeovil.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUc+MFJHCvsiXTJD9AbAGFOho/nyQwDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAxMRaWRwMi55ZW92aWwuYWMudWswHhcNMTIxMDA0MTYxNTQy
-						WhcNMzIxMDA0MTYxNTQyWjAcMRowGAYDVQQDExFpZHAyLnllb3ZpbC5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxEEpNwNxfUmo9qh7EXLPAw
-						RgYA86Ml4ZxwB2l2NnDL0VE/dts87f3wKPuECWDH1cZz/z8CSKZTktU0ANDGrNnC
-						yZz15BN51mSFiwKR0xOrpRe5EJrEGrzUyjxmMwEhEup0eiRH1c8VAbjyB3/2BPrI
-						s/eq9/bCa9K3WRPK+DihZqPEaH7DbWUDGCmyMNLY3hR7lXuhnWgQYUS42YYuPZsb
-						uKf1fzMdC2zRA3Z00fHfUBxPqCcWMdLsCGoJUh8zc+IYSEax8hdu1zf85LZqhXi4
-						/gsTGcWeAT3cq42Zb6hzIDgLHEanG/MWLxgDB0JBf2GZMPy13WrXQT0/Vc1iHqEC
-						AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi55ZW92aWwuYWMudWuGKGh0dHBzOi8v
-						aWRwMi55ZW92aWwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJ2w10W1
-						abGXJEftfLDwfLzYWieSMA0GCSqGSIb3DQEBBQUAA4IBAQCq8ksSrdQPwyg9QfzK
-						pUdTOoRRaGlY4zDVD1LBKWntpL+O1KGCn61ePiyoMQeONgtFBJDOP2rAiZXWZ6qN
-						seHfry/67Ssd2C4DbiG5QunQ19EzoZAGBUZD7yK7wcaJpBM7AWnwDnovEElNklyV
-						EkO9UVdYiFrq2gSN/p0K2OjW1FyNkvScbSoesI0AgUk0Wc7oaqWuz8IYmoFMQbkN
-						mDkeTy+Rlhf60bYRaLyxcHryq47BInhFWsuQ5S1MaxmS9m4bnYpUeo+ejqOkvIIX
-						SctLza4RkP6ubwWg7hVn8Qy7IEaDcvgpq1vVeRcOdo/TxQeWnASMZGbpVa9ik5Nn
-						KFgn
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.yeovil.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.yeovil.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">Yeovil College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Yeovil College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.yeovil.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Craig</GivenName>
-    <SurName>Cullen</SurName>
-    <EmailAddress>mailto:Craig.Cullen@yeovil.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Cullen</SurName>
-    <EmailAddress>mailto:Craig.Cullen@yeovil.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.yorkcollege.ac.uk-entity.xml b/swamid-interfederations-2.0/idp.yorkcollege.ac.uk-entity.xml
deleted file mode 100644
index 526c5c46..00000000
--- a/swamid-interfederations-2.0/idp.yorkcollege.ac.uk-entity.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.yorkcollege.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for York College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-12T16:32: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">yorkcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANXRdn2uq2aNgUyIN3af5+JhI22qMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFWlkcC55b3JrY29sbGVnZS5hYy51azAeFw0xNDA3MjIx
-						MjU3MDVaFw0zNDA3MjIxMjU3MDVaMCAxHjAcBgNVBAMTFWlkcC55b3JrY29sbGVn
-						ZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKyCyLcm8cm/
-						4wDpVwulDJF1aG3tUj6h/vsHjLGDrzvgYByEPa1vBMUwQYJKTWcgk+Ap/YUCMPIv
-						ByctJI3zW6I8P5KjgppkkTA5YuRNEFRApoa8XGufuX/LdZ8pZtD0NvlWgiXooazy
-						u/nKaQC5A1KKKG23dXVojX4SOEbOJBk3BeS5STd0BTBGBEyBQbGIAn9KspvkyFFm
-						Bn5EqnNE2l0H1d6IpEDiwSQ4PxtR3zZ3vjzrxToSAKKAsu/uQGZ30xQq/Qpcgpu5
-						D2vk71cvhTqaJgYNhnjNfcMhLgkwkdFbvS+E2jVBHiIt5uKq5YydUP7NvCItKdI0
-						IDiO9Qoc3AsCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLnlvcmtjb2xsZWdlLmFj
-						LnVrhixodHRwczovL2lkcC55b3JrY29sbGVnZS5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUxrFZaYCOWnFDHol052uaf+yiXrswDQYJKoZIhvcNAQEFBQAD
-						ggEBAKOWPrRWqDYsTi7VQ+AKih6nUV7iNeD8f5WFNuc2xCII9ggSgvTVAzkaYDqH
-						X4M/2Z2vhHRpiVcNKpsW+v6Fzhgy7yhDv3PrDfxgvDm2bQ3X4KH0X1hrWmxaUgxg
-						ProTJFt6kDIaesBYHt93RhZv/gCBCyVxDfXMvgqq7/4+Lr2Q0Be8+RQ69asVA5S/
-						0PZS97qMeLD5HveS6DkV1D1K7YWVXiPEawLkKN9fywU6GA9QrUyUxI2z+YngAskU
-						U+QmvDADLGZ7a7dJ8UUavfaxPiYA8eOdir52Q+eFdMEdL4CsWxjmQF+ubm0YPKQF
-						PL5wY3K8+WVnAlA7MY/oR6rJJQo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.yorkcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.yorkcollege.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.yorkcollege.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.yorkcollege.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.yorkcollege.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://shiblogin.yorkcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.yorkcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shiblogin.yorkcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.yorkcollege.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">yorkcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANXRdn2uq2aNgUyIN3af5+JhI22qMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFWlkcC55b3JrY29sbGVnZS5hYy51azAeFw0xNDA3MjIx
-						MjU3MDVaFw0zNDA3MjIxMjU3MDVaMCAxHjAcBgNVBAMTFWlkcC55b3JrY29sbGVn
-						ZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKyCyLcm8cm/
-						4wDpVwulDJF1aG3tUj6h/vsHjLGDrzvgYByEPa1vBMUwQYJKTWcgk+Ap/YUCMPIv
-						ByctJI3zW6I8P5KjgppkkTA5YuRNEFRApoa8XGufuX/LdZ8pZtD0NvlWgiXooazy
-						u/nKaQC5A1KKKG23dXVojX4SOEbOJBk3BeS5STd0BTBGBEyBQbGIAn9KspvkyFFm
-						Bn5EqnNE2l0H1d6IpEDiwSQ4PxtR3zZ3vjzrxToSAKKAsu/uQGZ30xQq/Qpcgpu5
-						D2vk71cvhTqaJgYNhnjNfcMhLgkwkdFbvS+E2jVBHiIt5uKq5YydUP7NvCItKdI0
-						IDiO9Qoc3AsCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLnlvcmtjb2xsZWdlLmFj
-						LnVrhixodHRwczovL2lkcC55b3JrY29sbGVnZS5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUxrFZaYCOWnFDHol052uaf+yiXrswDQYJKoZIhvcNAQEFBQAD
-						ggEBAKOWPrRWqDYsTi7VQ+AKih6nUV7iNeD8f5WFNuc2xCII9ggSgvTVAzkaYDqH
-						X4M/2Z2vhHRpiVcNKpsW+v6Fzhgy7yhDv3PrDfxgvDm2bQ3X4KH0X1hrWmxaUgxg
-						ProTJFt6kDIaesBYHt93RhZv/gCBCyVxDfXMvgqq7/4+Lr2Q0Be8+RQ69asVA5S/
-						0PZS97qMeLD5HveS6DkV1D1K7YWVXiPEawLkKN9fywU6GA9QrUyUxI2z+YngAskU
-						U+QmvDADLGZ7a7dJ8UUavfaxPiYA8eOdir52Q+eFdMEdL4CsWxjmQF+ubm0YPKQF
-						PL5wY3K8+WVnAlA7MY/oR6rJJQo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.yorkcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.yorkcollege.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">York College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">York College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.yorkcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Azhar</GivenName>
-    <SurName>Iqbal</SurName>
-    <EmailAddress>mailto:aiqbal@yorkcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Azhar</GivenName>
-    <SurName>Iqbal</SurName>
-    <EmailAddress>mailto:aiqbal@yorkcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.xml b/swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.xml
deleted file mode 100644
index 6c65e2ac..00000000
--- a/swamid-interfederations-2.0/idp.yorksj.ac.uk-oala.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://idp.yorksj.ac.uk/oala">
-  <!--
-		This is an OpenAthens LA IdP for York St John University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-16T09:00:37Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">yorksj.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIIC/BGdv33SfYwDQYJKoZIhvcNAQEFBQAwPTEgMB4GA1UE
-						CgwXWW9yayBTdCBKb2huIFVuaXZlcnNpdHkxGTAXBgNVBAMMEGlkcC55b3Jrc2ou
-						YWMudWswHhcNMTQwNTA3MTEyMzUyWhcNMjQwNTA3MTEyMzUyWjA9MSAwHgYDVQQK
-						DBdZb3JrIFN0IEpvaG4gVW5pdmVyc2l0eTEZMBcGA1UEAwwQaWRwLnlvcmtzai5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI9vhp37rXZQ6N3J
-						jMVnA5XL4e8R6BpZf8y9xKCDoxI2xBB5YlwLuXe0jDLQtLHkcQk1sOcQPlz5Ssi2
-						5BaYCFnifo2yaf/TzqmaG6/+IODNySYbGT6AHTeRjagYLmv9ZEzfuoA1rDQ/AvLO
-						zckx0qyR4UVwrlxo9QAXILlCzKiE/+2KN7FSzRW/pPm4iWcwpCR+MMtS6CGdb/cZ
-						L8Eo91uQ1ErGKfD30PDCnDybCayqk6v8I+AHOoxHqcowGoUu4k8mcXS9wClrg9At
-						U7jLzIpQCcq4Jjfne+vjy9uoUduD+X9IUTpWEU8XdSWHSRXyk4ujXLfcXkfIuat5
-						DswQWfECAwEAAaNQME4wHQYDVR0OBBYEFLIOF+KbcmkO27fWS5ZicSri4/O7MB8G
-						A1UdIwQYMBaAFLIOF+KbcmkO27fWS5ZicSri4/O7MAwGA1UdEwQFMAMBAf8wDQYJ
-						KoZIhvcNAQEFBQADggEBAHEWHwnlsn47Vb8rfNZokD5DHDCiqWN5vx1A0Ed90bMJ
-						P5rScA9fuhldvLSq1wxCMwStcLcm6ymUdRHmb0wvtG1j0vphDsiFKLJtlTZzEz42
-						pG2u4LOQPW6TElrAQ+9xFaloFiNAsKNhEWz7YuQHm5zV8wi/7m5L1G9IlrBoIfjX
-						x98jpfQS4yKUF7Koof9h8iWYz/T4Ma3pCfHzHGxstfMOcix+gPxuXaR6qtdxMtNg
-						qFesPgoUZjD0AHqvtwrs2SlC6Etkfz3O/42U4C0rb0NXEP11Hkrlvlk7GVXY/4w3
-						m8Ur8u4zqlfwsQpCaQSXMb3xNMZKyXm5bdoMQZWg5eI=
-					</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>
-						MIIDTDCCAjSgAwIBAgIIC/BGdv33SfYwDQYJKoZIhvcNAQEFBQAwPTEgMB4GA1UE
-						CgwXWW9yayBTdCBKb2huIFVuaXZlcnNpdHkxGTAXBgNVBAMMEGlkcC55b3Jrc2ou
-						YWMudWswHhcNMTQwNTA3MTEyMzUyWhcNMjQwNTA3MTEyMzUyWjA9MSAwHgYDVQQK
-						DBdZb3JrIFN0IEpvaG4gVW5pdmVyc2l0eTEZMBcGA1UEAwwQaWRwLnlvcmtzai5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI9vhp37rXZQ6N3J
-						jMVnA5XL4e8R6BpZf8y9xKCDoxI2xBB5YlwLuXe0jDLQtLHkcQk1sOcQPlz5Ssi2
-						5BaYCFnifo2yaf/TzqmaG6/+IODNySYbGT6AHTeRjagYLmv9ZEzfuoA1rDQ/AvLO
-						zckx0qyR4UVwrlxo9QAXILlCzKiE/+2KN7FSzRW/pPm4iWcwpCR+MMtS6CGdb/cZ
-						L8Eo91uQ1ErGKfD30PDCnDybCayqk6v8I+AHOoxHqcowGoUu4k8mcXS9wClrg9At
-						U7jLzIpQCcq4Jjfne+vjy9uoUduD+X9IUTpWEU8XdSWHSRXyk4ujXLfcXkfIuat5
-						DswQWfECAwEAAaNQME4wHQYDVR0OBBYEFLIOF+KbcmkO27fWS5ZicSri4/O7MB8G
-						A1UdIwQYMBaAFLIOF+KbcmkO27fWS5ZicSri4/O7MAwGA1UdEwQFMAMBAf8wDQYJ
-						KoZIhvcNAQEFBQADggEBAHEWHwnlsn47Vb8rfNZokD5DHDCiqWN5vx1A0Ed90bMJ
-						P5rScA9fuhldvLSq1wxCMwStcLcm6ymUdRHmb0wvtG1j0vphDsiFKLJtlTZzEz42
-						pG2u4LOQPW6TElrAQ+9xFaloFiNAsKNhEWz7YuQHm5zV8wi/7m5L1G9IlrBoIfjX
-						x98jpfQS4yKUF7Koof9h8iWYz/T4Ma3pCfHzHGxstfMOcix+gPxuXaR6qtdxMtNg
-						qFesPgoUZjD0AHqvtwrs2SlC6Etkfz3O/42U4C0rb0NXEP11Hkrlvlk7GVXY/4w3
-						m8Ur8u4zqlfwsQpCaQSXMb3xNMZKyXm5bdoMQZWg5eI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.yorksj.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.yorksj.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">York St John University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">York St John University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.yorksj.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Marcus</GivenName>
-    <SurName>Green</SurName>
-    <EmailAddress>mailto:m.green1@yorksj.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Patterson</SurName>
-    <EmailAddress>mailto:s.patterson@yorksj.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.youngepilepsy.org.uk-idp-shibboleth.xml
deleted file mode 100644
index 9cd82424..00000000
--- a/swamid-interfederations-2.0/idp.youngepilepsy.org.uk-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" entityID="https://idp.youngepilepsy.org.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The National Centre for Young People with Epilepsy.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-18T10:56:17Z">
-      <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">youngepilepsy.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE1zCCA7+gAwIBAgIRAIrwNxflMTquvXfq6pK7gn8wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMjA2MTIwMDAwMDBaFw0xNTA2MTIyMzU5NTlaMIGoMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlMaW5nZmllbGQxOzA5
-						BgNVBAoTMlRoZSBOYXRpb25hbCBDZW50cmUgZm9yIFlvdW5nIFBlb3BsZSB3aXRo
-						IEVwaWxlcHN5MRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEhMB8GA1UEAxMYaWRwLnlv
-						dW5nZXBpbGVwc3kub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAvplNMCWV3HnGWGuAt/VF0SMVmyE5fJCix71f0PUsdUMx7UiBTVAY6YPk+xfd
-						ikArI5zcLUOxuf3WMol5cpb34xrBsPzyyQF/+MbCTHBhm/Z6BWqZzZLtR8HSCF7Y
-						nEOB7QhDrgMs2hGD/F4NZdVbgF9veblDYEsChfLYWssNe1/dNAEh3EF5XBO633tF
-						94A9o+Av2JEzRH3R1Vq81rhVBI2pPRFsyfrLug6AcN9ONMpkByLRy0n+JR+npQ0n
-						d2vMo6x3L+hUEpVOgzjftKyeB53I2daXDQABRhBn/WC/RrkaBlaXJ108/FUkOHAG
-						WT4Sb4/Wt/tdn8yL0SuVsf+b3QIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2T
-						aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFPNOHJ0GourmWopHAyS1yeYTt2mT
-						MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-						BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
-						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-						Y3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC55b3VuZ2VwaWxlcHN5
-						Lm9yZy51azANBgkqhkiG9w0BAQUFAAOCAQEAH86tOvqiEgvcXJ8xtCdYjJQIcH76
-						jHZeUG34kBK4CUxRKApPv+y5EA6qO/HtStQBWfTqngFhQfDUMD8FV/UABwFBvC19
-						7WJ6NW7U8zhnz1pM0v46oDRFMhlQnLT0kvVqauGibZ6fma6ZkRyKsejCwfStnzxq
-						HZhOcaFLT7t6D5jV1e2BykrjUObZ+8bRBSvBnWAnZ+AMYLpTV+1lnjMXdhqBJmli
-						hZvJeOeLHgAgM7E8YrTBmrIMRPpZ5+wsn/vx1zLPTB1Rj5LL6AHRiplTxUNrtXWv
-						d+xYnzbHJUA9ufb2nG1b+EqbvE/XBCq0l6EuQ6QxOukQcrYB/cEK4yuNKg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.youngepilepsy.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.youngepilepsy.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://idp.youngepilepsy.org.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.youngepilepsy.org.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.youngepilepsy.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.youngepilepsy.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">youngepilepsy.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE1zCCA7+gAwIBAgIRAIrwNxflMTquvXfq6pK7gn8wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMjA2MTIwMDAwMDBaFw0xNTA2MTIyMzU5NTlaMIGoMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGU3VycmV5MRIwEAYDVQQHEwlMaW5nZmllbGQxOzA5
-						BgNVBAoTMlRoZSBOYXRpb25hbCBDZW50cmUgZm9yIFlvdW5nIFBlb3BsZSB3aXRo
-						IEVwaWxlcHN5MRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEhMB8GA1UEAxMYaWRwLnlv
-						dW5nZXBpbGVwc3kub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAvplNMCWV3HnGWGuAt/VF0SMVmyE5fJCix71f0PUsdUMx7UiBTVAY6YPk+xfd
-						ikArI5zcLUOxuf3WMol5cpb34xrBsPzyyQF/+MbCTHBhm/Z6BWqZzZLtR8HSCF7Y
-						nEOB7QhDrgMs2hGD/F4NZdVbgF9veblDYEsChfLYWssNe1/dNAEh3EF5XBO633tF
-						94A9o+Av2JEzRH3R1Vq81rhVBI2pPRFsyfrLug6AcN9ONMpkByLRy0n+JR+npQ0n
-						d2vMo6x3L+hUEpVOgzjftKyeB53I2daXDQABRhBn/WC/RrkaBlaXJ108/FUkOHAG
-						WT4Sb4/Wt/tdn8yL0SuVsf+b3QIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2T
-						aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFPNOHJ0GourmWopHAyS1yeYTt2mT
-						MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-						BwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQz
-						MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-						Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-						dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-						Y3NwLnRjcy50ZXJlbmEub3JnMCMGA1UdEQQcMBqCGGlkcC55b3VuZ2VwaWxlcHN5
-						Lm9yZy51azANBgkqhkiG9w0BAQUFAAOCAQEAH86tOvqiEgvcXJ8xtCdYjJQIcH76
-						jHZeUG34kBK4CUxRKApPv+y5EA6qO/HtStQBWfTqngFhQfDUMD8FV/UABwFBvC19
-						7WJ6NW7U8zhnz1pM0v46oDRFMhlQnLT0kvVqauGibZ6fma6ZkRyKsejCwfStnzxq
-						HZhOcaFLT7t6D5jV1e2BykrjUObZ+8bRBSvBnWAnZ+AMYLpTV+1lnjMXdhqBJmli
-						hZvJeOeLHgAgM7E8YrTBmrIMRPpZ5+wsn/vx1zLPTB1Rj5LL6AHRiplTxUNrtXWv
-						d+xYnzbHJUA9ufb2nG1b+EqbvE/XBCq0l6EuQ6QxOukQcrYB/cEK4yuNKg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.youngepilepsy.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.youngepilepsy.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">The National Centre for Young People with Epilepsy</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Young Epilepsy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://youngepilepsy.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tyrone</GivenName>
-    <SurName>da Silva</SurName>
-    <EmailAddress>mailto:tdasilva@youngepilepsy.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Seager</SurName>
-    <EmailAddress>mailto:cseager@youngepilepsy.org.uk</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 ede41428..00000000
--- a/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.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://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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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 width="95" height="92">https://idp.zid.tuwien.ac.at/fileadmin/zid/images/zid/TU-Logo09.gif</mdui:Logo>
-        <mdui:Logo width="16" height="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/idp0.abertay.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp0.abertay.ac.uk-shibboleth.xml
deleted file mode 100644
index c2af4ea0..00000000
--- a/swamid-interfederations-2.0/idp0.abertay.ac.uk-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" entityID="https://idp0.abertay.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Abertay Dundee.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-31T11: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">uad.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Abertay University</mdui:DisplayName>
-        <mdui:Logo height="23" width="80">https://idp1.abertay.ac.uk/icons/colour-abertay-uni-logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idp1.abertay.ac.uk/icons/small/shield_16x16.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUc7OjIBg0Vhfh00MlmEXTDJVaD5kwDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSaWRwMS5hYmVydGF5LmFjLnVrMB4XDTE0MDYyNzEwNTQz
-						M1oXDTM0MDYyNzEwNTQzM1owHTEbMBkGA1UEAxMSaWRwMS5hYmVydGF5LmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhy85D7Rk1W5IrIatuD01
-						bZaUq5/6fagpzqXeprRh8NafBqASLj9+Rzda5lJfMrFmvV9Q5JcyXKXdvnL9vaQi
-						o61t2sAwKTHrmOT8nIHCVLJGIx8wclEUQZifdDzQNIj9MiLL40nN6tD0WQIXcO/e
-						4nmBA4havm437GGuFOdP7ZkY2Xuex1AufaJq144mqNHhk4rYplbkpVS+M+NLbRLX
-						vooF2zl+CxGwHF1pYiKdbb8+Kf+v9uFX5wMGNZMfpymMprLf6m7dBLxVur2g1pcF
-						vvzRddBlKCshg6a3zh6RXgRf8ZmfU//HpBCPQdQ1d09gqUt0hJ8Mf89S65+fTB+Y
-						wQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAxLmFiZXJ0YXkuYWMudWuGKWh0dHBz
-						Oi8vaWRwMS5hYmVydGF5LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRe
-						nf9RmkNw8n4n58D1CDsey26VnTANBgkqhkiG9w0BAQUFAAOCAQEAIG2zPbZsoZxE
-						aj2ZH6TxNRkR+l8N86WXWn0AdITwU1PX2+5w38sSOuNb0FNA1MesY643dZOUM0TK
-						/JpPlGT8GPFAq+Pq3XKCMyLnPJd3WXqEzpbjRUsFmn9Pylsc3uQ27+kuYQ+SCPnS
-						tcU8ObI0Zcdk/ZfAn0P3R0DjmzypCt7qC/vqQbskGtniDGPlo9uqYTKxKZW5Xj5z
-						QaP8CP68+ECeTyyJs2E9IyjwU3r8e1ruNmLgXlIrZvLcyoc5TcnKgmuj+VhDho9s
-						DZWQqoz3Cs2kX3tT0BeVdPiHLZ+Vwc8Bi+WWqioz6oGI16NJYTrhWuMCG3rB7lXZ
-						kYaFXYT6DQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.abertay.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://idp1.abertay.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.abertay.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.abertay.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">uad.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUc7OjIBg0Vhfh00MlmEXTDJVaD5kwDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSaWRwMS5hYmVydGF5LmFjLnVrMB4XDTE0MDYyNzEwNTQz
-						M1oXDTM0MDYyNzEwNTQzM1owHTEbMBkGA1UEAxMSaWRwMS5hYmVydGF5LmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhy85D7Rk1W5IrIatuD01
-						bZaUq5/6fagpzqXeprRh8NafBqASLj9+Rzda5lJfMrFmvV9Q5JcyXKXdvnL9vaQi
-						o61t2sAwKTHrmOT8nIHCVLJGIx8wclEUQZifdDzQNIj9MiLL40nN6tD0WQIXcO/e
-						4nmBA4havm437GGuFOdP7ZkY2Xuex1AufaJq144mqNHhk4rYplbkpVS+M+NLbRLX
-						vooF2zl+CxGwHF1pYiKdbb8+Kf+v9uFX5wMGNZMfpymMprLf6m7dBLxVur2g1pcF
-						vvzRddBlKCshg6a3zh6RXgRf8ZmfU//HpBCPQdQ1d09gqUt0hJ8Mf89S65+fTB+Y
-						wQIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAxLmFiZXJ0YXkuYWMudWuGKWh0dHBz
-						Oi8vaWRwMS5hYmVydGF5LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRe
-						nf9RmkNw8n4n58D1CDsey26VnTANBgkqhkiG9w0BAQUFAAOCAQEAIG2zPbZsoZxE
-						aj2ZH6TxNRkR+l8N86WXWn0AdITwU1PX2+5w38sSOuNb0FNA1MesY643dZOUM0TK
-						/JpPlGT8GPFAq+Pq3XKCMyLnPJd3WXqEzpbjRUsFmn9Pylsc3uQ27+kuYQ+SCPnS
-						tcU8ObI0Zcdk/ZfAn0P3R0DjmzypCt7qC/vqQbskGtniDGPlo9uqYTKxKZW5Xj5z
-						QaP8CP68+ECeTyyJs2E9IyjwU3r8e1ruNmLgXlIrZvLcyoc5TcnKgmuj+VhDho9s
-						DZWQqoz3Cs2kX3tT0BeVdPiHLZ+Vwc8Bi+WWqioz6oGI16NJYTrhWuMCG3rB7lXZ
-						kYaFXYT6DQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.abertay.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.abertay.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 Abertay Dundee</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Abertay University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.abertay.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Service Desk</GivenName>
-    <EmailAddress>mailto:isservicedesk@abertay.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Brian</GivenName>
-    <SurName>Christie</SurName>
-    <EmailAddress>mailto:ISSADTeam@abertay.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp0.essex.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp0.essex.ac.uk-shibboleth.xml
deleted file mode 100644
index 45d087cf..00000000
--- a/swamid-interfederations-2.0/idp0.essex.ac.uk-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" entityID="https://idp0.essex.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Essex.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">essex.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEZjCCA06gAwIBAgIJAITsUwOrZ0UiMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
-						VQQGEwJHQjEOMAwGA1UECBMFRXNzZXgxEzARBgNVBAcTCkNvbGNoZXN0ZXIxHDAa
-						BgNVBAoTE1VuaXZlcnNpdHkgb2YgRXNzZXgxJTAjBgNVBAsTHEluZm9ybWF0aW9u
-						IFN5c3RlbXMgU2VydmljZXMxGTAXBgNVBAMTEGlkcDEuZXNzZXguYWMudWsxHzAd
-						BgkqhkiG9w0BCQEWEHNhbWlAZXNzZXguYWMudWswHhcNMTMwNjA2MTMwODM0WhcN
-						MjMwNjA0MTMwODM0WjCBszELMAkGA1UEBhMCR0IxDjAMBgNVBAgTBUVzc2V4MRMw
-						EQYDVQQHEwpDb2xjaGVzdGVyMRwwGgYDVQQKExNVbml2ZXJzaXR5IG9mIEVzc2V4
-						MSUwIwYDVQQLExxJbmZvcm1hdGlvbiBTeXN0ZW1zIFNlcnZpY2VzMRkwFwYDVQQD
-						ExBpZHAxLmVzc2V4LmFjLnVrMR8wHQYJKoZIhvcNAQkBFhBzYW1pQGVzc2V4LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtkqXuVUogstt2A/6
-						cQ2hQxac8XIUhMRtWF7Rp8hoYawRFsD1QD/ppyutOHQTmdTes1THp9RFOxv/frFX
-						loVZSCgnk74wY98h9dJVT/aZGtbGBEi8CDeJOyMgopt8xhmt8GGuzLXZz65vdb1z
-						vXyYD5YjB94ECCLOkBXovkln4qSLOaDeOpwGADjQ+hEtsEYQ8Cob04cbZNhRJYBT
-						lTeGTcQhSQToPiiVHG1jupDkawkAg0wJyqjxGjdcFWAn5jdK5Qixc1EOhrwcVnEp
-						FEBJT8JFOS/Mek9YWc29//8BpVByeubbd/hv9fr9N2M9Z+AEJsIkNNYkrp2KybIW
-						rB7jhwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQURnWjhBTuD3SjqSu9ob68
-						DpVgGOIwHwYDVR0jBBgwFoAURnWjhBTuD3SjqSu9ob68DpVgGOIwDQYJKoZIhvcN
-						AQEFBQADggEBAAkvvTQ6RacwMk6ru/Kjd7tS8O+pCnXkJeAc+Q5/ELEfqwct5hE/
-						N6FhudmH/SrISQmJdWsJvUh5bkpT0tby/V2+9vKB+Bz/q8MaYdAB6p8wrrCl3qL6
-						I9pX1wL0QeuDemObq7DDySo59A/UD/4hv/hiM6XbORFyAPjCkvHmmgr9VkoUPcwv
-						EKqT60bX7dI9Nxr9/pAYexrSBSwyuk92JNJTpKqRmaBcV9AqPSA28JNJlZZJ4PRd
-						rDfLmgn2f37l6f6mhHyPGIcmzCSsjV0MYBq9awtuqAV746ZN28lWPKx39LkiO74f
-						kwWCZNtxVk+q/aU+Vrpk7mXhvFD3JBQn07Q=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.essex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.essex.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://idp1.essex.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.essex.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.essex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.essex.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">essex.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEZjCCA06gAwIBAgIJAITsUwOrZ0UiMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
-						VQQGEwJHQjEOMAwGA1UECBMFRXNzZXgxEzARBgNVBAcTCkNvbGNoZXN0ZXIxHDAa
-						BgNVBAoTE1VuaXZlcnNpdHkgb2YgRXNzZXgxJTAjBgNVBAsTHEluZm9ybWF0aW9u
-						IFN5c3RlbXMgU2VydmljZXMxGTAXBgNVBAMTEGlkcDEuZXNzZXguYWMudWsxHzAd
-						BgkqhkiG9w0BCQEWEHNhbWlAZXNzZXguYWMudWswHhcNMTMwNjA2MTMwODM0WhcN
-						MjMwNjA0MTMwODM0WjCBszELMAkGA1UEBhMCR0IxDjAMBgNVBAgTBUVzc2V4MRMw
-						EQYDVQQHEwpDb2xjaGVzdGVyMRwwGgYDVQQKExNVbml2ZXJzaXR5IG9mIEVzc2V4
-						MSUwIwYDVQQLExxJbmZvcm1hdGlvbiBTeXN0ZW1zIFNlcnZpY2VzMRkwFwYDVQQD
-						ExBpZHAxLmVzc2V4LmFjLnVrMR8wHQYJKoZIhvcNAQkBFhBzYW1pQGVzc2V4LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtkqXuVUogstt2A/6
-						cQ2hQxac8XIUhMRtWF7Rp8hoYawRFsD1QD/ppyutOHQTmdTes1THp9RFOxv/frFX
-						loVZSCgnk74wY98h9dJVT/aZGtbGBEi8CDeJOyMgopt8xhmt8GGuzLXZz65vdb1z
-						vXyYD5YjB94ECCLOkBXovkln4qSLOaDeOpwGADjQ+hEtsEYQ8Cob04cbZNhRJYBT
-						lTeGTcQhSQToPiiVHG1jupDkawkAg0wJyqjxGjdcFWAn5jdK5Qixc1EOhrwcVnEp
-						FEBJT8JFOS/Mek9YWc29//8BpVByeubbd/hv9fr9N2M9Z+AEJsIkNNYkrp2KybIW
-						rB7jhwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQURnWjhBTuD3SjqSu9ob68
-						DpVgGOIwHwYDVR0jBBgwFoAURnWjhBTuD3SjqSu9ob68DpVgGOIwDQYJKoZIhvcN
-						AQEFBQADggEBAAkvvTQ6RacwMk6ru/Kjd7tS8O+pCnXkJeAc+Q5/ELEfqwct5hE/
-						N6FhudmH/SrISQmJdWsJvUh5bkpT0tby/V2+9vKB+Bz/q8MaYdAB6p8wrrCl3qL6
-						I9pX1wL0QeuDemObq7DDySo59A/UD/4hv/hiM6XbORFyAPjCkvHmmgr9VkoUPcwv
-						EKqT60bX7dI9Nxr9/pAYexrSBSwyuk92JNJTpKqRmaBcV9AqPSA28JNJlZZJ4PRd
-						rDfLmgn2f37l6f6mhHyPGIcmzCSsjV0MYBq9awtuqAV746ZN28lWPKx39LkiO74f
-						kwWCZNtxVk+q/aU+Vrpk7mXhvFD3JBQn07Q=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.essex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.essex.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 Essex</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Essex</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.essex.ac.uk/iss/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Support</GivenName>
-    <EmailAddress>mailto:shibadmin@essex.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alexis</GivenName>
-    <SurName>Wolton</SurName>
-    <EmailAddress>mailto:awolton@essex.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml
deleted file mode 100644
index 96ac26c0..00000000
--- a/swamid-interfederations-2.0/idp01.ogs.trieste.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp01.ogs.trieste.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-11-19T18:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ogs.trieste.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Institute of Oceanography and Experimental Geophysics</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">OGS (Istituto Nazionale di Oceanografia e di Geofisica Sperimentale)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for National Institute of Oceanography and Experimental Geophysics's users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per utenti dell'Istituto Nazionale di Oceanografia e di Geofisica Sperimentale</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://cesit.inogs.it/node/100</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://cesit.inogs.it/node/98</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp01.ogs.trieste.it/idp/images/logo-32x32.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp01.ogs.trieste.it/idp/images/logo-32x32.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp01.ogs.trieste.it/idp/images/logo-160x120.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp01.ogs.trieste.it/idp/images/logo-160x120.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://cesit.inogs.it/node/99</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://cesit.inogs.it/node/97</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUWOUmLa4FhkqSqR1HxQX3JeEdVy4wDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwMDEub2dzLnRyaWVzdGUuaXQwHhcNMTQwNjI0MTE0
-MDA2WhcNMzQwNjI0MTE0MDA2WjAfMR0wGwYDVQQDExRpZHAwMS5vZ3MudHJpZXN0
-ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMgIgZhhFV7QPbWz
-1duF55NhnNoUPiSKzWYC+aj/MA9vg3Nyi+iy3hiSN4c2AVHTwS2vBUjovE85ac2c
-KODrPJTSaKrk0HgQFtp/D2SMvx1eO15gjiMHbf3KQ8TTSzx4VMtbzIX6w3wd3Utv
-oznA+XqD5bWJhS0zXDAa1st+LrjQbjKShDIbwOpvQVe93A95EuwP258rxs9GSjVD
-mq0T4jKn7IIgTk0P32ak/4xCRHhHQRvJ2ZLERRR1cEdhcI65wsW6csXZ+4SpNR9E
-vo1GvdoIRnufsFvat+WTkYQFSmIpfUffm5Ijxr4EsjOy4fHeA2AjauVV9TASqj3h
-t8SMyy8CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwMDEub2dzLnRyaWVzdGUuaXSG
-K2h0dHBzOi8vaWRwMDEub2dzLnRyaWVzdGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFAEcqKk0bzXfdE72LQ+3BUcv5CHDMA0GCSqGSIb3DQEBBQUAA4IBAQCC
-T6c9VpgBD5GeM1tsXYkG+n047bAv4g9G9+E/80HdqwpU314Nw697I/wN7pqiOE7j
-WkTTH+4bGK5ErGKOHuJCWCILHDQG8qk94Ni9rgXkhUM4ChfZ6nROLQsD9+r2X7/8
-naPDewMZqE3c/dn3yG8gkP6oSrmY0a49pQVKaP8/aHHVE89s9hEGKuf6AeX7CUuA
-dKeDceJjeS5urGQn65bc7Mzsk16rI5W7o0itlt/+Xpka1Dp+7U+eT/FyiLGGWdQ0
-1xesztEexwtTIxCSBsGrIM9Sy0NJ0CcGgQ8osR4cARCu+qVyouKPb0yWeRK6r0Z9
-orEGOduQPPy+HJjILGav
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.ogs.trieste.it: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://idp01.ogs.trieste.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp01.ogs.trieste.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ogs.trieste.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUWOUmLa4FhkqSqR1HxQX3JeEdVy4wDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUaWRwMDEub2dzLnRyaWVzdGUuaXQwHhcNMTQwNjI0MTE0
-MDA2WhcNMzQwNjI0MTE0MDA2WjAfMR0wGwYDVQQDExRpZHAwMS5vZ3MudHJpZXN0
-ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMgIgZhhFV7QPbWz
-1duF55NhnNoUPiSKzWYC+aj/MA9vg3Nyi+iy3hiSN4c2AVHTwS2vBUjovE85ac2c
-KODrPJTSaKrk0HgQFtp/D2SMvx1eO15gjiMHbf3KQ8TTSzx4VMtbzIX6w3wd3Utv
-oznA+XqD5bWJhS0zXDAa1st+LrjQbjKShDIbwOpvQVe93A95EuwP258rxs9GSjVD
-mq0T4jKn7IIgTk0P32ak/4xCRHhHQRvJ2ZLERRR1cEdhcI65wsW6csXZ+4SpNR9E
-vo1GvdoIRnufsFvat+WTkYQFSmIpfUffm5Ijxr4EsjOy4fHeA2AjauVV9TASqj3h
-t8SMyy8CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwMDEub2dzLnRyaWVzdGUuaXSG
-K2h0dHBzOi8vaWRwMDEub2dzLnRyaWVzdGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFAEcqKk0bzXfdE72LQ+3BUcv5CHDMA0GCSqGSIb3DQEBBQUAA4IBAQCC
-T6c9VpgBD5GeM1tsXYkG+n047bAv4g9G9+E/80HdqwpU314Nw697I/wN7pqiOE7j
-WkTTH+4bGK5ErGKOHuJCWCILHDQG8qk94Ni9rgXkhUM4ChfZ6nROLQsD9+r2X7/8
-naPDewMZqE3c/dn3yG8gkP6oSrmY0a49pQVKaP8/aHHVE89s9hEGKuf6AeX7CUuA
-dKeDceJjeS5urGQn65bc7Mzsk16rI5W7o0itlt/+Xpka1Dp+7U+eT/FyiLGGWdQ0
-1xesztEexwtTIxCSBsGrIM9Sy0NJ0CcGgQ8osR4cARCu+qVyouKPb0yWeRK6r0Z9
-orEGOduQPPy+HJjILGav
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.ogs.trieste.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Institute of Oceanography and Experimental Geophysics</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">OGS (Istituto Nazionale di Oceanografia e di Geofisica Sperimentale)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Institute of Oceanography and Experimental Geophysics</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">OGS - Istituto Nazionale di Oceanografia e di Geofisica Sperimentale)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ogs.trieste.it/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ogs.trieste.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idem@ogs.trieste.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp01.sjsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp01.sjsu.edu-idp-shibboleth.xml
deleted file mode 100644
index e1754e80..00000000
--- a/swamid-interfederations-2.0/idp01.sjsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +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://idp01.sjsu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">sjsu.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.sjsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">San Jose State University</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>
-MIIDJDCCAgygAwIBAgIVAMn9JCLBoBmGCMcPMiQh214qaACSMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcDAxLnNqc3UuZWR1MB4XDTEwMDEyOTIzNTU1OVoX
-DTMwMDEyOTIzNTU1OVowGTEXMBUGA1UEAxMOaWRwMDEuc2pzdS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZqash2iGpYAoRusNEwfpM723akgZV
-q/3WVHlLOzY3SkL41HZYkT35LbdmAEpSUKpjcQXwsMxrSY4O51jXYINDj4vEiMV4
-NkjCne6IpAUQxmj1qaXyz/DpTfE2ufPls9kHRChcBiVWKikmu0k7lr7Sp8+fSj6T
-z2XWPHtGfjfm4oOKEQTzd0fuTJK9KTtRg38JYBcffyZVtIzBI2hkXJZZ0bYgxDHM
-pudyHQCzsZzCLRa1L78qZl7JC02IERuPa2xlhjrA8BUY0c/S2qMLgvnRpRIG3u9S
-+sUJj5hPdXEVdmHjdHjOkQk4XzwBpTxCm+amdq9yoEM/NsQhFXnPxI4bAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcDAxLnNqc3UuZWR1hiVodHRwczovL2lkcDAxLnNq
-c3UuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR9udFAQ1LxMc3z2J98LoAb
-adve8zANBgkqhkiG9w0BAQUFAAOCAQEAD0/rgpSTUTkATD6J7P7F9hytDUZfwPBQ
-RTFilo3kLd6kZMzL48v8Ju5Vz8xXoFUi1ESaWFsdJgMcmhd189kjDtS4WzUsvPJj
-PFJZclPr/oJFR/RdKY6gytdINg43UivBqvPATLXKfZ1mjITNdfv+NEvBXzU5038t
-cpFlgJM0Uad00A88037gPo13fDh6kpydA2VwQbiE9JFfGOno3UlrdO9vMBiEgSCc
-hnbUY3LRoqUIGm6wfs3K6qNvpaF7cQ6WcZv3o4OlV2M/Eu8l9/Mv1EGwSOgfB1jG
-4g4nIYbPZdoTb/jPsSNwoNhTR9O/vGMzDFIUaU+zKQpFtlcylov+kA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.sjsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.sjsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp01.sjsu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp01.sjsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp01.sjsu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp01.sjsu.edu/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">sjsu.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">students.sjsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAMn9JCLBoBmGCMcPMiQh214qaACSMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcDAxLnNqc3UuZWR1MB4XDTEwMDEyOTIzNTU1OVoX
-DTMwMDEyOTIzNTU1OVowGTEXMBUGA1UEAxMOaWRwMDEuc2pzdS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZqash2iGpYAoRusNEwfpM723akgZV
-q/3WVHlLOzY3SkL41HZYkT35LbdmAEpSUKpjcQXwsMxrSY4O51jXYINDj4vEiMV4
-NkjCne6IpAUQxmj1qaXyz/DpTfE2ufPls9kHRChcBiVWKikmu0k7lr7Sp8+fSj6T
-z2XWPHtGfjfm4oOKEQTzd0fuTJK9KTtRg38JYBcffyZVtIzBI2hkXJZZ0bYgxDHM
-pudyHQCzsZzCLRa1L78qZl7JC02IERuPa2xlhjrA8BUY0c/S2qMLgvnRpRIG3u9S
-+sUJj5hPdXEVdmHjdHjOkQk4XzwBpTxCm+amdq9yoEM/NsQhFXnPxI4bAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcDAxLnNqc3UuZWR1hiVodHRwczovL2lkcDAxLnNq
-c3UuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR9udFAQ1LxMc3z2J98LoAb
-adve8zANBgkqhkiG9w0BAQUFAAOCAQEAD0/rgpSTUTkATD6J7P7F9hytDUZfwPBQ
-RTFilo3kLd6kZMzL48v8Ju5Vz8xXoFUi1ESaWFsdJgMcmhd189kjDtS4WzUsvPJj
-PFJZclPr/oJFR/RdKY6gytdINg43UivBqvPATLXKfZ1mjITNdfv+NEvBXzU5038t
-cpFlgJM0Uad00A88037gPo13fDh6kpydA2VwQbiE9JFfGOno3UlrdO9vMBiEgSCc
-hnbUY3LRoqUIGm6wfs3K6qNvpaF7cQ6WcZv3o4OlV2M/Eu8l9/Mv1EGwSOgfB1jG
-4g4nIYbPZdoTb/jPsSNwoNhTR9O/vGMzDFIUaU+zKQpFtlcylov+kA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.sjsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp01.sjsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">San Jose State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">San Jose State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sjsu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Atul Pala</md:GivenName>
-    <md:EmailAddress>atul.pala@sjsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp01.stfc.ac.uk-shibboleth.xml
deleted file mode 100644
index 37b1ae3c..00000000
--- a/swamid-interfederations-2.0/idp01.stfc.ac.uk-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://idp01.stfc.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the Science and Technology Facilities Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-08-07T13:24: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">stfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIRAMB2hFT3mLr5ROiokXWKNqowDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MjYwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMEUxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXc2hpYmJvbGV0
-						aDAxLnN0ZmMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr
-						800yIcKiJ5DIXV867iBoSkIB2Yu1cKDG64+1vjIQDmrpQLk3S78OPrWyoIoxra+9
-						dFoXz3oQQFgzQK61oPzJKjaL+p7dAmQkcofanxlmYMOABxe8zJZQ/u7rYScY+8qS
-						fy5HL5qGxBLbggpgWCGBwCaBnyscBLXpS2zB/TYRlPeRgAG/BJVVuuOgsZ0daBix
-						r7nydWrg11+HTIIH5BWV3rRN77a0idEi8AKLilfnEu4v0gM8ZkyOVLDEnTmfQnwh
-						7FltTCdwIxufO/mrZ1mlikNPuK7wmux0Esq2nbS7WBzm2KSOC4sxZGQPDrTzW3bo
-						O/XX9wxwx/YKo2n/xROJAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
-						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUs17bYNl/kS6pde+m388Jbcdy4jwwDgYD
-						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF3NoaWJib2xldGgw
-						MS5zdGZjLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBpkunQq6a1o3faoVYa3zlU
-						dviUnxQ0XmF3iaB7emPGWxhMKvTJlWBixo89J/k4aRhVVh1aSJ9I6EUiR/Uxyuri
-						a9J41yWKm9YqvCG/aiikWWckZI1kDb1Ocmk8++e4ZOtRsL6zf4tO6J/Ae89HTzIk
-						k3E5p5OSTaobJJfj3FuX1KGi31d3OLV95pN5oI9ekqZE6B4vhRhVffvkaZBP18XA
-						TE3/kQQWR6ps+9Jb28ntbBvjkk0ilVHjCNSHGWp4tY3gPNIsYm/TZbrLLV1k5aOd
-						SFqspItD7lnFbcVq/j/WsY5g9hN1Dq8+B9KFZeuYn06qFbtOPnQ5qwTmfWvoN2/8
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth01.stfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth01.stfc.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://shibboleth01.stfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth01.stfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth01.stfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth01.stfc.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">stfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIRAMB2hFT3mLr5ROiokXWKNqowDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MjYwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMEUxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXc2hpYmJvbGV0
-						aDAxLnN0ZmMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr
-						800yIcKiJ5DIXV867iBoSkIB2Yu1cKDG64+1vjIQDmrpQLk3S78OPrWyoIoxra+9
-						dFoXz3oQQFgzQK61oPzJKjaL+p7dAmQkcofanxlmYMOABxe8zJZQ/u7rYScY+8qS
-						fy5HL5qGxBLbggpgWCGBwCaBnyscBLXpS2zB/TYRlPeRgAG/BJVVuuOgsZ0daBix
-						r7nydWrg11+HTIIH5BWV3rRN77a0idEi8AKLilfnEu4v0gM8ZkyOVLDEnTmfQnwh
-						7FltTCdwIxufO/mrZ1mlikNPuK7wmux0Esq2nbS7WBzm2KSOC4sxZGQPDrTzW3bo
-						O/XX9wxwx/YKo2n/xROJAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
-						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUs17bYNl/kS6pde+m388Jbcdy4jwwDgYD
-						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF3NoaWJib2xldGgw
-						MS5zdGZjLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBpkunQq6a1o3faoVYa3zlU
-						dviUnxQ0XmF3iaB7emPGWxhMKvTJlWBixo89J/k4aRhVVh1aSJ9I6EUiR/Uxyuri
-						a9J41yWKm9YqvCG/aiikWWckZI1kDb1Ocmk8++e4ZOtRsL6zf4tO6J/Ae89HTzIk
-						k3E5p5OSTaobJJfj3FuX1KGi31d3OLV95pN5oI9ekqZE6B4vhRhVffvkaZBP18XA
-						TE3/kQQWR6ps+9Jb28ntbBvjkk0ilVHjCNSHGWp4tY3gPNIsYm/TZbrLLV1k5aOd
-						SFqspItD7lnFbcVq/j/WsY5g9hN1Dq8+B9KFZeuYn06qFbtOPnQ5qwTmfWvoN2/8
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth01.stfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth01.stfc.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">Science and Technology Facilities Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Science and Technology Facilities Council</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.scitech.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>OBU Service Desk</GivenName>
-    <EmailAddress>mailto:obuservicedesk@rl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ali</GivenName>
-    <SurName>Akkas</SurName>
-    <EmailAddress>mailto:ali.akkas@stfc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml
deleted file mode 100644
index e00c33af..00000000
--- a/swamid-interfederations-2.0/idp02.ifc.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,113 +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://idp02.ifc.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxLDAqBgNVBAoTI0lGQyAtIElu
-c3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQwwCgYDVQQLEwNEVEkxHjAcBgkq
-hkiG9w0BCQEWD2NpcnRAaWZjLmVkdS5icjERMA8GA1UEBxMIQmx1bWVuYXUxFzAV
-BgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQaWRw
-MDIuaWZjLmVkdS5icjAeFw0xNTA5MDQxMjQyNTdaFw0xODA5MDMxMjQyNTdaMIGw
-MSwwKgYDVQQKEyNJRkMgLSBJbnN0aXR1dG8gRmVkZXJhbCBDYXRhcmluZW5zZTEM
-MAoGA1UECxMDRFRJMR4wHAYJKoZIhvcNAQkBFg9jaXJ0QGlmYy5lZHUuYnIxETAP
-BgNVBAcTCEJsdW1lbmF1MRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UE
-BhMCQlIxGTAXBgNVBAMTEGlkcDAyLmlmYy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC8FP6O2mSRACAJf66lHBAuk29vYyrwlFR4ixQLS8tn
-bSm+f2U1156R9wwUEV3gpSGvECuWpHAKoGxW18FgtkOYVducNXVipT29kKHXngj3
-Zuij8MJ6byNSQsrM9noxQVVKHaLHzE9OlS/GfHCa0ZUz0L1mVZtpKEWn1v6Krq4M
-jxoyY9Yb8ftHCWNx1Ahya8hrt/WexX9/dfK2wRkqPTUsGdU8Ey0lD6/3aXVDFYjQ
-wMATh5VeHKMdICj7z3+2qR11Syz4xEuIB5tvEdweVUzWrfl36WGGOu/hZGAS3pbg
-QRjdbl7aFc3ZoKJj8yA9hzVIg66OsCUC6Nw8CA5btSjXAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAAJ9GCV4KUP+lD25i/aqkqCPZ1fax3+KxExMGW/OVgl+50CVu80w
-sp2+PpQm9IBTO0gGq2kmqPMsYn9DSGRVYcjmAwBLR9mgN3l5pJ5Jq0dQnzQiAEeJ
-7ZLlejVj/jRVzinyAyrZPivzA8lJ4liPdkID6qtgVuaBW9Xr4YR7z2Jr9d1ppt+1
-zguX/6l7wtLQBVd/WJghECX7cLt1JzhmiKDLn/ib4/44BRf5TfVGHNmdikee7xYZ
-yywikHxhzaAW7q+tPCGAMCJWIjPX3fGDSGQIsGXSF87WTdg5S8+Eudlsh1Q/NQN3
-MbzxH0b+Clvd+lg7zzt4d6FadoYsR3FYh0A=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://idp02.ifc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp02.ifc.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp02.ifc.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp02.ifc.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxLDAqBgNVBAoTI0lGQyAtIElu
-c3RpdHV0byBGZWRlcmFsIENhdGFyaW5lbnNlMQwwCgYDVQQLEwNEVEkxHjAcBgkq
-hkiG9w0BCQEWD2NpcnRAaWZjLmVkdS5icjERMA8GA1UEBxMIQmx1bWVuYXUxFzAV
-BgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEZMBcGA1UEAxMQaWRw
-MDIuaWZjLmVkdS5icjAeFw0xNTA5MDQxMjQyNTdaFw0xODA5MDMxMjQyNTdaMIGw
-MSwwKgYDVQQKEyNJRkMgLSBJbnN0aXR1dG8gRmVkZXJhbCBDYXRhcmluZW5zZTEM
-MAoGA1UECxMDRFRJMR4wHAYJKoZIhvcNAQkBFg9jaXJ0QGlmYy5lZHUuYnIxETAP
-BgNVBAcTCEJsdW1lbmF1MRcwFQYDVQQIEw5TYW50YSBDYXRhcmluYTELMAkGA1UE
-BhMCQlIxGTAXBgNVBAMTEGlkcDAyLmlmYy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC8FP6O2mSRACAJf66lHBAuk29vYyrwlFR4ixQLS8tn
-bSm+f2U1156R9wwUEV3gpSGvECuWpHAKoGxW18FgtkOYVducNXVipT29kKHXngj3
-Zuij8MJ6byNSQsrM9noxQVVKHaLHzE9OlS/GfHCa0ZUz0L1mVZtpKEWn1v6Krq4M
-jxoyY9Yb8ftHCWNx1Ahya8hrt/WexX9/dfK2wRkqPTUsGdU8Ey0lD6/3aXVDFYjQ
-wMATh5VeHKMdICj7z3+2qR11Syz4xEuIB5tvEdweVUzWrfl36WGGOu/hZGAS3pbg
-QRjdbl7aFc3ZoKJj8yA9hzVIg66OsCUC6Nw8CA5btSjXAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAAJ9GCV4KUP+lD25i/aqkqCPZ1fax3+KxExMGW/OVgl+50CVu80w
-sp2+PpQm9IBTO0gGq2kmqPMsYn9DSGRVYcjmAwBLR9mgN3l5pJ5Jq0dQnzQiAEeJ
-7ZLlejVj/jRVzinyAyrZPivzA8lJ4liPdkID6qtgVuaBW9Xr4YR7z2Jr9d1ppt+1
-zguX/6l7wtLQBVd/WJghECX7cLt1JzhmiKDLn/ib4/44BRf5TfVGHNmdikee7xYZ
-yywikHxhzaAW7q+tPCGAMCJWIjPX3fGDSGQIsGXSF87WTdg5S8+Eudlsh1Q/NQN3
-MbzxH0b+Clvd+lg7zzt4d6FadoYsR3FYh0A=
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.ifc.edu.br:8443/idp/profile/SAML1/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">IFC - Instituto Federal Catarinense</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFC - Instituto Federal Catarinense</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFC - Instituto Federal Catarinense</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFC - Instituto Federal Catarinense</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifc.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifc.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Marcos Malfatti</md:SurName>
-    <md:EmailAddress>cirt@ifc.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp02.stfc.ac.uk-shibboleth.xml
deleted file mode 100644
index 7aea853a..00000000
--- a/swamid-interfederations-2.0/idp02.stfc.ac.uk-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://idp02.stfc.ac.uk/shibboleth">
-  <!--
-		This is a "2nd" Shibboleth IdP for the Science and Technology Facilities Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-16T17: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">stfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIRAN6xh7bD0R7q1gDhMLxcIlYwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MjUwMDAwMDBaFw0xNjA0MjQyMzU5NTlaMEUxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXc2hpYmJvbGV0
-						aDAyLnN0ZmMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDT
-						WeVBatPe3EDc7RRhp3BVzhFBNYnHBAvE2ljHzw/D4Hz2I3sYk5Hlfh+VXqLf5Hkc
-						WzmxSnmAynFZwLyrrPXRfjnwBkRF3aJuM0SwnvqNWdmcgmfbd5xEVN+tH5bBQOxu
-						SY5Auz9dJzbguRBrRFFdwIPJTlAM1PHz51i65Tdm/dNLD00fOdkTw1iMl4L1Vwsi
-						e9D+aF4yHniyNIASvNaJoiJ1xe984QhtzDvupeJvzds9wSLordSugKDAB68rd8/E
-						BcIjW/ytel6/d5pGbMzit+i1V5IbZBvTomZnyQ1htHTfS/OIOYkAzr59Jx4gACOY
-						FV4EiKxApiUd4S7GVZYVAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
-						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQU8GrcLM9v5v84R07FK/hJrRcI+qYwDgYD
-						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF3NoaWJib2xldGgw
-						Mi5zdGZjLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQCZc15apbPz3pUGZ3oZSCm4
-						kD6wPjti31jgf3PrM2ivcFxZpblCoMWKPkUaKLZKDisijqgLe+M/E4wJdrQrZqPs
-						O8BdV3zvlJwjNXq5+PQ9lNxDb+TnCAXqaO2scXIvzDrNgsj1em02KbpCer3yaEdk
-						8U5MuTiT2/vG+51EGncgOU7jPaRVGol3mEjb+6NYT6EYF7m91Lm6I3TOFCljXQsO
-						12IuSq7E+X8aiweCuMNoT2pUGkTHAEIOybgnRBq0ZkEEC7PgwCjJdFFzZc0uynnu
-						gLABpiHA/T1LSEnntS51pxSjVFt2tn18LeFrLJMV3ZPNOC41kUPN+wb2MPZFfsET
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth02.stfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth02.stfc.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://shibboleth02.stfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth02.stfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth02.stfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth02.stfc.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">stfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIRAN6xh7bD0R7q1gDhMLxcIlYwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MjUwMDAwMDBaFw0xNjA0MjQyMzU5NTlaMEUxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXc2hpYmJvbGV0
-						aDAyLnN0ZmMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDT
-						WeVBatPe3EDc7RRhp3BVzhFBNYnHBAvE2ljHzw/D4Hz2I3sYk5Hlfh+VXqLf5Hkc
-						WzmxSnmAynFZwLyrrPXRfjnwBkRF3aJuM0SwnvqNWdmcgmfbd5xEVN+tH5bBQOxu
-						SY5Auz9dJzbguRBrRFFdwIPJTlAM1PHz51i65Tdm/dNLD00fOdkTw1iMl4L1Vwsi
-						e9D+aF4yHniyNIASvNaJoiJ1xe984QhtzDvupeJvzds9wSLordSugKDAB68rd8/E
-						BcIjW/ytel6/d5pGbMzit+i1V5IbZBvTomZnyQ1htHTfS/OIOYkAzr59Jx4gACOY
-						FV4EiKxApiUd4S7GVZYVAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
-						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQU8GrcLM9v5v84R07FK/hJrRcI+qYwDgYD
-						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF3NoaWJib2xldGgw
-						Mi5zdGZjLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQCZc15apbPz3pUGZ3oZSCm4
-						kD6wPjti31jgf3PrM2ivcFxZpblCoMWKPkUaKLZKDisijqgLe+M/E4wJdrQrZqPs
-						O8BdV3zvlJwjNXq5+PQ9lNxDb+TnCAXqaO2scXIvzDrNgsj1em02KbpCer3yaEdk
-						8U5MuTiT2/vG+51EGncgOU7jPaRVGol3mEjb+6NYT6EYF7m91Lm6I3TOFCljXQsO
-						12IuSq7E+X8aiweCuMNoT2pUGkTHAEIOybgnRBq0ZkEEC7PgwCjJdFFzZc0uynnu
-						gLABpiHA/T1LSEnntS51pxSjVFt2tn18LeFrLJMV3ZPNOC41kUPN+wb2MPZFfsET
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth02.stfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth02.stfc.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">Science and Technology Facilities Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Science and Technology Facilities Council (2nd IdP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.scitech.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>OBU Service Desk</GivenName>
-    <EmailAddress>mailto:obuservicedesk@rl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ali</GivenName>
-    <SurName>Akkas</SurName>
-    <EmailAddress>mailto:ali.akkas@stfc.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 d8342b0e..00000000
--- a/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.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://idp1.agroparistech.fr/shibboleth">
-  <md: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>
-  </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 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="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.agroparistech.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</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>
-					      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>
-    </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-POST" Location="https://idp1.agroparistech.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.agroparistech.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.agroparistech.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">AgroParisTech Institut des sciences et des industries du vivant et de l'environnement</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.agroparistech.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Hamid Aichoune</md:SurName>
-    <md:EmailAddress>hamid.aichoune@agroparistech.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e8c4aa57..00000000
--- a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.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" entityID="https://idp1.crous-aix-marseille.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Aix Marseille</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAACKElEQVR42k1STWsUQRCtqp6P3ZlNNCuKCSRuNkeFaNQ9RkxQcE+KqAiCiAavQkTUgwQhguLXvzAegl5EDxH/gejBUzY3D0aISNaZ2dmd7rKmJ5ukDg1V/erVq+6HYIMADEAFYFGFF8k3/eKySR/qKAJAALZFhH5yFt37KqijItgJ6Vxj/UTHn7lXwFABaIA7VHqgAkGkUkLcbmDmksW90MkzkwgXCfoMuoLuAMQWzbtCUtEjV/MqmAZHBtIQYM6NaJgdQRdCJSifI6ljr0T3ghPKkvhahefJR7uiEELOStwVaRpLYSFbigZYAS7pFH+6VWM5C8mCNr2OMzpKA4PdH9+2ePKTDGQamIxAizXzuWiyrho5GFy7QvVhf+Z0uXkuuHzJa5x0TxwtN5t7b92kHMcFN4I2YHpABFpzp+Mdn1LjY/7sKX92unL7hjd5JJy7biXJDEA2Bish+p7Z2PCmjklbttoCw6pey1bX1Miw/rUOtTF8pcIL5BMhdxO/0XAnD3e/fnfGD7EIThI6sN+027JY9O6DYngLbXqs4xbrEqAuto4TZ6LGaYoO6T9/46Xl9NOX6ONK2fNaLi2Q3XYG3TfuYMdoqA65ewZoX5V7GUcRb/7T6781EjGXSV3NNnODFLa7R+V5J4BelnCG+Ttai6Fi1y1x/pkvdfLUWmPHfDLnkRNMoMNbXspfT3wighd1vLJtvt32lvO5/XjXFnsA7016V0emD5D4DxLK/P0UpMMMAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-aix-marseille.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Aix Marseille</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>
-					      MIIDWDCCAkCgAwIBAgIVANHV3Yljs9HRX1MPesiB1HSIAd3wMA0GCSqGSIb3DQEB
-BQUAMCYxJDAiBgNVBAMMG2lkcDEuY3JvdXMtYWl4LW1hcnNlaWxsZS5mcjAeFw0x
-NjAxMTUxMDI3MDlaFw0zNjAxMTUxMDI3MDlaMCYxJDAiBgNVBAMMG2lkcDEuY3Jv
-dXMtYWl4LW1hcnNlaWxsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAKT/jV+9II85CSgoeyzsVKFYRy2+Z8FbLpCPTqwoTUYL+Nb2g03GSlEQdWTf
-/zA7rKNhejehIRw2XoMwCz9ZCgCvq8KEg3y9tggjDWDbOsUj41bh+KS3FJyXXRK6
-IenGlZBOYGMV7L/WzJFAdw06PIZy7LB5zlhDXnhiUbUuCyp4zAN0bzulx50DVWew
-1l/tdq65sgBDU2PN574fN2eBIj7oMoEInRl29o8EvFVhUjZFzZ8yPge3LGTtFPzj
-iljx5uEpZovjNge/uz1RVJIw9pA6kwUjo0RHbnn/tHo2I4ejkZL2O7AduUmyHG1A
-e+bZFVq0PkMeMIToV8OZOQfFZgECAwEAAaN9MHswHQYDVR0OBBYEFBHxGorsBnH7
-no0HgruWpaHa1jBSMFoGA1UdEQRTMFGCG2lkcDEuY3JvdXMtYWl4LW1hcnNlaWxs
-ZS5mcoYyaHR0cHM6Ly9pZHAxLmNyb3VzLWFpeC1tYXJzZWlsbGUuZnIvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBADnQeEw81CWJhXDTz0n+OYBxLmPy
-ICbCv8gvOCQdSKz5wEFqxevgYCa0JrOvxUZoiOPEf7va3V03bIHUQnSDeXZmwGGl
-Oo8JmEtmsFYz+iuHb1+24/YetxiqUt5vueo+rs6FOoHkbhuh2xxvqapB8wemEZVw
-g8WYulOyRJOhgs9LoMHQUiW1yn4yrOzu6ZDkjQbkUPvT/wkpyp/AOSdt5ROL3rNm
-iwzInVxg/z31WUgChDtRdAbqK/1eslt/HIgzAt2Bxw8wt8pOAD3nzBLtukAHAzGz
-81f3T9u6PZoh7qU++8NWgS7BuwSgpuCh3zAO9dEW011SnMeGu5RS9/OmP2I=
-					    </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>
-					      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>
-    </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-POST" Location="https://idp1.crous-aix-marseille.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.crous-aix-marseille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.crous-aix-marseille.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Aix Marseille</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Aix Marseille</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-aix-marseille.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi.applis@crous-aix-marseille.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 bdee2070..00000000
--- a/swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.crous-toulouse.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Toulouse - Etudiants</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABuElEQVQoz3WST2sTURTFz3kzTVuaZjRpUxOrSNXQoiAIQsG14MqdfgfBD+DSlSh+Eb+Bol0UpJiFuHShklhjm3TSziQZXOTPvONikjrjn7t7l/u759x7H3f36piFAAJmMoydeU4TAIlUmPSDAgTP/7j17gkogcoU/wXAAMRqY6fcfO0Of4qCEpX/AdLioFVuvrUmN84tGQAwRsoCSRdJEG18tf7C2FGndm9qnbJ/zEACoEhaW3v/dLHfjFavNW4+dATBTAdLhWtnqeWTT2Hl1uHm/YXa7cueJyAMg5OwBwL4LcLdvTpEURRgcONCceHNszieLD14rsJax/c/f91Pq7iJ0aTL+co579VjfHiJzTtDv3HYmxx1u6BNj+2m/ZW8M3ZjO9h+1HZKYbcvHHB6OgKQRDIDkPqyfrdzHJJ9CASB2NKc7l5S5g6j8aRSqRoSgggwFsyc45z1vFOdDNA+8gvL+Ssbl2BICTC5Off6Vo2pU2QsBYOoddC+uF4t5PPHQTify62sFAeDKAhD/RMwYnO/1Y+i6lq5VCqOR6Nv33+0Oz5mEpIyACgJQdALgh4gkFLyRQgo2dIvHcfGvrPn81kAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDC1da7rAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMwKzAyOjAwxCgWVwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-toulouse.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Toulouse - Etudiants</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://idp1.crous-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.crous-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.crous-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Toulouse - Etudiants</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Toulouse - Etudiants</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-toulouse.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>crous-reseau@crous-toulouse.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.ens-cachan.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.ens-cachan.fr-idp-shibboleth.xml
deleted file mode 100644
index aacd84eb..00000000
--- a/swamid-interfederations-2.0/idp1.ens-cachan.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.ens-cachan.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-21T16:09:12Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 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="en">ENS Cachan</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAARVBMVEUQMIyMmsbO0+dKZaWtutZzhr2cqtbv7/cxUZz///+Uos5jdbW9x96Elsb39/8YPJR7jr2lstbv8/c5VZycps5jebXGy+cL1jGdAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAXElEQVQY05VOSRKAMAiLrY7ErSrV/z9VaE96qgzbJCED+Am0AMP0BhAyNsIYrOjgS06MCTzg+sIUoY9sHWN1Au5iYVDszYNI5HyVizM4tXjblRAVsVKpqU2f/gUedDgInhEIAG4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzUrMDI6MDDnTYFMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM1KzAyOjAwlhA58AAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ens-cachan.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">All ENSC members.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ENS Cachan</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">L'ensemble des membres de l'ENSC</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>
-					      MIIEsTCCA5mgAwIBAgIQNTxRAJU4zPU+440yj8e5sjANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDExMTAwMDAwMDBaFw0xNzExMDkyMzU5NTlaMEAxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSaWRwMS5lbnMtY2Fj
-aGFuLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvmhCphNDH1MG
-c8rZR5n4SjB/91cjSBrgwNNpU9bSggVJlSX5U0cWqrNCmeRdr7l1CTDi0Kg0CW/i
-zc4uVtrSp0LGxL5BYajg+EmdIV4WfnMtqXGddAYmSTxOg94Q7QZgG8RNnigoKhLC
-qMtHvZWegalCYzrm0j7n/d7bfDykhVYSlDrsBby5hOWWuWnqBw/FaaXqyOtAVLYB
-o55wi8pbaVMFoVax8NTSyCg2TpT/wv6iGG8UCQ8CxiJXKEx9Os5pbg9BN9P2XUB/
-tYfTpaFKJDANqaMrvtobF4Ke18+cVkEEoSiaiCLuPy5fwUPsM+BjgDFQHSZuKR6W
-wtMEo+0ZCQIDAQABo4IBgTCCAX0wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GG
-KLD9tr0wHQYDVR0OBBYEFGe/fR0FHypFMVv9qNaq+7nZQ0SIMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNy
-bDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRy
-dXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2Nz
-cC51c2VydHJ1c3QuY29tMDAGA1UdEQQpMCeCEmlkcDEuZW5zLWNhY2hhbi5mcoIR
-aWRwLmVucy1jYWNoYW4uZnIwDQYJKoZIhvcNAQELBQADggEBAE6ELUQpNOyQ1tX6
-1ZA3BaJTBk1G0X4hRUCzDdda77l/AA92aCkKB/GuEshOxJy+iN1vDbpwppcP0/Hb
-3kNobrbmWzf0EJPTulVuiSb61rCkpLGNEZVATMVA1FXDFYlSfikzcBPWAfg3h6zy
-Ginp7PrBbTm7WKPnh1yumqksDelkDBmPaAbxYwOYAm5+qRoYLywIpjrAtVUwp9vg
-6VebdVAyhQ9QT2RZwrWa9jKyXqhhy38a0EcmJuvS17FFPQOJXtTjvyHS/zPWogAP
-BIlA71I9k6f+UzAIGZ/QvDamXq3dM4/sMZ94U9GPtnVntVnlrK891QxjwuBKi4HB
-LBtNF88=
-					    </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>
-					      MIIEsjCCA5qgAwIBAgIRAMT2IqUsyYtK9vnPpZsCD/MwDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTQxMTEwMDAwMDAwWhcNMTcxMTA5MjM1OTU5WjBAMSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGzAZBgNVBAMTEmlkcDEuZW5zLWNh
-Y2hhbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJhoUFdfl8vc
-VHaOjiXs89V1D+wV8exvuGuMp7xkB0e1zPxvnU3ZV1zbXsdjSLoWb1+zpcJzDt4M
-73VfIBtgLR9I0m7rIR67kHapozr4kSTThLE+aOjBBYjzsCcOiuOq7RgiH0ueV1DJ
-WM8NF5RRX20RxyrzvHWDkSdgXb0xL9Bn/IOUKKYXIdP4WgvS/LZKo5ZC1/9k+S98
-1cnTiq+IJBtKW9IgSo5ToKNMkSjCYdrGEynspxz2RZuBX2y0ospyJmH7FV0q2K3w
-ipyODxoZTolmIF9e6Tf9atM3/4owl7LLHKHZiSePilWNDvRuMMG+pcSjNHIwcHfr
-3BxCWx0CEb0CAwEAAaOCAYEwggF9MB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvh
-hiiw/ba9MB0GA1UdDgQWBBQO9YeMqTUduvvc7MIAaxhgw2ImNjAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5j
-cmwwbAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0
-cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29j
-c3AudXNlcnRydXN0LmNvbTAwBgNVHREEKTAnghJpZHAxLmVucy1jYWNoYW4uZnKC
-EWlkcC5lbnMtY2FjaGFuLmZyMA0GCSqGSIb3DQEBCwUAA4IBAQB0w3eC+MfK1D95
-Ie+CbwiJQXugCOnqeNlbBC8rNRRTU2+179IGdBEZ21D1/ltljNv4fLEDQYeFsCqW
-pdJQVg0SFYbMMpzhhEXSaLHEcK9PztItH/t/xTRJH38z2PaztyN4yj6oNuDM8Own
-tJwMlX9KuE4Zmiaqc2IrgB3jAFmUOlHa3gOu6lNMliM0CU8s6XlH+0wDVan9ZNX/
-JsLNVMc7uTXkR85Ql/OVIvVIDNp3e2XI2mKralpB6oFqhd3wd3/+zc3UylwDDUKz
-dodlVr72BC7b/f10yHR7+ePzzwpE7+fzvqkZkkzmw5UwrS0/VojxtYao1g89mXmO
-QhLL/wj5
-					    </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-POST" Location="https://idp1.ens-cachan.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.ens-cachan.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.ens-cachan.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENS Cachan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENS Cachan</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ens-cachan.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>reseau@ens-cachan.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.glos.ac.uk-entity.xml b/swamid-interfederations-2.0/idp1.glos.ac.uk-entity.xml
deleted file mode 100644
index 28bfd4a8..00000000
--- a/swamid-interfederations-2.0/idp1.glos.ac.uk-entity.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://idp1.glos.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for the University of Gloucestershire.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-08T10:27: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">glos.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUCsJYB48Mz3bcb/dTeJJEcFS9NPQwDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPaWRwMS5nbG9zLmFjLnVrMB4XDTE0MDUyNzE1NDkxMVoX
-						DTM0MDUyNzE1NDkxMVowGjEYMBYGA1UEAxMPaWRwMS5nbG9zLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhlNvzpLXrExyTGgdo924dAhh+8T+
-						DDyFnfMBX74lgFvk9/Os73dq7ooAudnJW21c8vpD+24bMcgI8NPZchHvTKZNEciI
-						3xkwyWvR0zV3pdQimojUmiX1fPfa7IOhZZ6qGFHGrucXs883wUoc/rLK3Xm7blV2
-						jeHM7GiKYHs/WO2a3ITWkJqgeh7gXL/kRNNHGrLbgFloNOCT74KT01SNBgzWxiq9
-						QBjqZR+tnaiu6dzeCMbB+wWmLLP3VOUDFxS9uNQGb8ZgOv3/n7Az7umt9xE5FfLu
-						vOwEqpkoOxTsEootS2b6+tzbX0ZVaPAVjaKMWyXuPBU2wlPPbVU5r8cxEQIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg9pZHAxLmdsb3MuYWMudWuGJmh0dHBzOi8vaWRwMS5n
-						bG9zLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR+Xmt33O3jaMudgIUV
-						OLYp7RYNIzANBgkqhkiG9w0BAQUFAAOCAQEAZhozuufgK2Jm2NDfyWti7ANRfe3I
-						Bo++sDx8LwdL7obTwDKn4+Yco3vOrigILfoawl2heoG16mhfUWFZgwu21Surt6uL
-						c7V7f3v4ZzEIkb/DYFmk8wPx22htqAcO9sj0duHVP45pFW4Orchc6umt+ZCFgwWB
-						WByMENe+1csz9xMqRT1QlkBleOjo3/nEcv24kzpOCmCVe2CMSnxekGc8Jp38GBEi
-						FSs+x2SKYUI4dR4wz7nKIybUCxR5aQ0tsryYKVf7hSw6oatKD6TGmFNJYiy0Ifq3
-						kOm6roKl1gcoqKYmFZfJVnU0H1rtoJ7XQMWtxX3rVtYhwHghbhfB03i6FA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.glos.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glos.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://shiblogin.glos.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.glos.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shiblogin.glos.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.glos.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">glos.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUCsJYB48Mz3bcb/dTeJJEcFS9NPQwDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPaWRwMS5nbG9zLmFjLnVrMB4XDTE0MDUyNzE1NDkxMVoX
-						DTM0MDUyNzE1NDkxMVowGjEYMBYGA1UEAxMPaWRwMS5nbG9zLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhlNvzpLXrExyTGgdo924dAhh+8T+
-						DDyFnfMBX74lgFvk9/Os73dq7ooAudnJW21c8vpD+24bMcgI8NPZchHvTKZNEciI
-						3xkwyWvR0zV3pdQimojUmiX1fPfa7IOhZZ6qGFHGrucXs883wUoc/rLK3Xm7blV2
-						jeHM7GiKYHs/WO2a3ITWkJqgeh7gXL/kRNNHGrLbgFloNOCT74KT01SNBgzWxiq9
-						QBjqZR+tnaiu6dzeCMbB+wWmLLP3VOUDFxS9uNQGb8ZgOv3/n7Az7umt9xE5FfLu
-						vOwEqpkoOxTsEootS2b6+tzbX0ZVaPAVjaKMWyXuPBU2wlPPbVU5r8cxEQIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg9pZHAxLmdsb3MuYWMudWuGJmh0dHBzOi8vaWRwMS5n
-						bG9zLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR+Xmt33O3jaMudgIUV
-						OLYp7RYNIzANBgkqhkiG9w0BAQUFAAOCAQEAZhozuufgK2Jm2NDfyWti7ANRfe3I
-						Bo++sDx8LwdL7obTwDKn4+Yco3vOrigILfoawl2heoG16mhfUWFZgwu21Surt6uL
-						c7V7f3v4ZzEIkb/DYFmk8wPx22htqAcO9sj0duHVP45pFW4Orchc6umt+ZCFgwWB
-						WByMENe+1csz9xMqRT1QlkBleOjo3/nEcv24kzpOCmCVe2CMSnxekGc8Jp38GBEi
-						FSs+x2SKYUI4dR4wz7nKIybUCxR5aQ0tsryYKVf7hSw6oatKD6TGmFNJYiy0Ifq3
-						kOm6roKl1gcoqKYmFZfJVnU0H1rtoJ7XQMWtxX3rVtYhwHghbhfB03i6FA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.glos.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glos.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 Gloucestershire</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Gloucestershire</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.glos.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Pete</GivenName>
-    <SurName>Maller</SurName>
-    <EmailAddress>mailto:pmaller@glos.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Pete</GivenName>
-    <SurName>Maller</SurName>
-    <EmailAddress>mailto:pmaller@glos.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.glyndwr.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.glyndwr.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index db7225c4..00000000
--- a/swamid-interfederations-2.0/idp1.glyndwr.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://idp1.glyndwr.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Glyndwr University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-06T12:40:49Z">
-      <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">glyndwr.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUW2tXeH8370JdIqiuEuyPXsvnn1IwDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAwwSaWRwMS5nbHluZHdyLmFjLnVrMB4XDTE0MTEwMzExNDUy
-						NVoXDTM0MTEwMzExNDUyNVowHTEbMBkGA1UEAwwSaWRwMS5nbHluZHdyLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs107XEU+w72wOCggvYWv
-						HnvIjLwochbb1TQEjD76H+OXZQFFE5if39WkfeIgM+NumYc1SCZhHO7ssT2ArxpT
-						x3pwNYoj3mMtarXj5uF8In5nybRtNKFcug2nLaBsa+Svj77n73681Gx/VVx+tTkF
-						ySeQ4AHxkDncG4gUp0GKXWuCVSsQdXGOoljxp/aWkTlaZKJQfvDiURD8ysLBc8XF
-						4s0YE4GtrWMM/SbSysad1Wk0sI7afL+1iCf+UdiuRa8HrRI0kuc/Z7ajCBBaWn4w
-						11zac9qrLztQ4bKTp+5z025F9HGM9iXAe39AxeGHdurTPr8Voz8/rGlelNnYh7JR
-						rwIDAQABo2swaTAdBgNVHQ4EFgQU1g7hguqPgn9Za9hlSXqXv3TVbpkwSAYDVR0R
-						BEEwP4ISaWRwMS5nbHluZHdyLmFjLnVrhilodHRwczovL2lkcDEuZ2x5bmR3ci5h
-						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAKl23zJe5fEkR
-						3wCSeBWSWXeSLNxB6nTL3I89uJ+1M3RNyR2t56Zqhx5g/7Iac4tbJs50FaUnGQ7x
-						I0WXrKJ8jit0gKWMjDY36SlfXkIWtH2VtW4WvxChLxCVur7y4zcKDtXxCDJvYAVl
-						W5Pe2l+xXc9nl2Pn17OA+idxL+asZ5tGuI3egcxNEfp4AuPYGnt9RhrhrOCo8Wv1
-						lg4GojfVyaGPZ9bi0dTsCl5PyU5tmUMsUOpi8/SxrD+KMB4gU+4fottmPKnowz/o
-						zKbCkLq1ncgsZ9wbFNI20qOQIXZ13Z6bfnslalxhqc+QNsIhnUSwep11XICn+YzV
-						pBqIGwWXLw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glyndwr.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://idp1.glyndwr.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.glyndwr.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.glyndwr.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">glyndwr.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUW2tXeH8370JdIqiuEuyPXsvnn1IwDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAwwSaWRwMS5nbHluZHdyLmFjLnVrMB4XDTE0MTEwMzExNDUy
-						NVoXDTM0MTEwMzExNDUyNVowHTEbMBkGA1UEAwwSaWRwMS5nbHluZHdyLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs107XEU+w72wOCggvYWv
-						HnvIjLwochbb1TQEjD76H+OXZQFFE5if39WkfeIgM+NumYc1SCZhHO7ssT2ArxpT
-						x3pwNYoj3mMtarXj5uF8In5nybRtNKFcug2nLaBsa+Svj77n73681Gx/VVx+tTkF
-						ySeQ4AHxkDncG4gUp0GKXWuCVSsQdXGOoljxp/aWkTlaZKJQfvDiURD8ysLBc8XF
-						4s0YE4GtrWMM/SbSysad1Wk0sI7afL+1iCf+UdiuRa8HrRI0kuc/Z7ajCBBaWn4w
-						11zac9qrLztQ4bKTp+5z025F9HGM9iXAe39AxeGHdurTPr8Voz8/rGlelNnYh7JR
-						rwIDAQABo2swaTAdBgNVHQ4EFgQU1g7hguqPgn9Za9hlSXqXv3TVbpkwSAYDVR0R
-						BEEwP4ISaWRwMS5nbHluZHdyLmFjLnVrhilodHRwczovL2lkcDEuZ2x5bmR3ci5h
-						Yy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAKl23zJe5fEkR
-						3wCSeBWSWXeSLNxB6nTL3I89uJ+1M3RNyR2t56Zqhx5g/7Iac4tbJs50FaUnGQ7x
-						I0WXrKJ8jit0gKWMjDY36SlfXkIWtH2VtW4WvxChLxCVur7y4zcKDtXxCDJvYAVl
-						W5Pe2l+xXc9nl2Pn17OA+idxL+asZ5tGuI3egcxNEfp4AuPYGnt9RhrhrOCo8Wv1
-						lg4GojfVyaGPZ9bi0dTsCl5PyU5tmUMsUOpi8/SxrD+KMB4gU+4fottmPKnowz/o
-						zKbCkLq1ncgsZ9wbFNI20qOQIXZ13Z6bfnslalxhqc+QNsIhnUSwep11XICn+YzV
-						pBqIGwWXLw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.glyndwr.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.glyndwr.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">Glyndwr University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Glyndwr University (Test Do not use)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.glyndwr.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alwyn</GivenName>
-    <SurName>Williams</SurName>
-    <EmailAddress>mailto:a.d.williams@glyndwr.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alwyn</GivenName>
-    <SurName>Williams</SurName>
-    <EmailAddress>mailto:a.d.williams@glyndwr.ac.uk</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 4b81a4ad..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.hogent.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">hogent.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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,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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be: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://idp1.hogent.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.hogent.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/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">hogent.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be: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">
-    Hogeschool Gent
-    </md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">
-    Hogeschool Gent
-    </md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">
-    http://www.hogent.be
-    </md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>helpdesk@hogent.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.hs-augsburg.de.xml b/swamid-interfederations-2.0/idp1.hs-augsburg.de.xml
deleted file mode 100644
index 449a1082..00000000
--- a/swamid-interfederations-2.0/idp1.hs-augsburg.de.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.hs-augsburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-augsburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp1.hs-augsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp1.hs-augsburg.de,OU=Rechenzentrum,O=Fachhochschule Augsburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDWb0jzANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF0ZhY2hob2Noc2NodWxlIEF1Z3NidXJnMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMR0wGwYDVQQDExRGSCBBdWdzYnVyZyBDQSAtIEcwMjEgMB4G
-CSqGSIb3DQEJARYRY2FAZmgtYXVnc2J1cmcuZGUwHhcNMDgxMjE2MDkzODA3WhcN
-MTMxMjE1MDkzODA3WjBlMQswCQYDVQQGEwJERTEgMB4GA1UEChMXRmFjaGhvY2hz
-Y2h1bGUgQXVnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNVBAMT
-E2lkcDEuaHMtYXVnc2J1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8gWpAiIyVdxXsA68rHTJ5LvlxZfhDEjnEFUvayvT/0Y2iXRZSnb+79jzI
-kz+HCgSQwHh9TG9ypJZn8RB9vkxUTMgU5f/pIvOdI4DV6KlAQX7RGdIPRxBaWXjo
-VcqoayxntkfMU61jRA9p2bk0EA3uT/pxnzve0gAn3wF4DH1V+1AO/Rmb/d0m15my
-42JzGOUKcs6RyaF5VqjGVQLLD72n18YD5zbQBylxn0r+WbrJ8ASKvKiRu/T86oF3
-ToQmWPjEqMnB2XIyYu7uz8Y5RCHgcM/DMXLjXxOr7pqdU7yQvbpcHhHr4QTTdzGR
-aMAj/Oqio6QPuOKy1L61dXSBceytAgMBAAGjggHSMIIBzjAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKUAUSuvuh5EWFNPXRYWICHovPa8MB8GA1UdIwQYMBaAFNVwF+PewZf0CD7p
-OhGz6IjxkEfkMBwGA1UdEQQVMBOBEWNhQGZoLWF1Z3NidXJnLmRlMIGNBgNVHR8E
-gYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtYXVnc2J1cmct
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGmBggrBgEF
-BQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1hdWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggrBgEFBQcw
-AoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPHeiCv3u24AxLffg
-iUTaEQq/+w8f2IgigO26Oq3Z2L5jLH9OeFXjKHOj2L1SzrW5cvuKijmMhSvlcCsI
-dSbt5uzza86ypR9wQARcVBEO1o2HIGEkIcy4IoLF/fQddMs5g5/12YJjtUt5vyJY
-f8IMl0N3Qq5SSIqh0QUfeFxFxArwJjLnMxA9bvg9Vy9jdftZoAJ5F5Ulf3Ofnpqf
-OEKCBtjuDDCfT2ZXClPIavsE8cXoGDo6xgP5zV8o0IvzDTM3DhlD6lMvVj4IFhjj
-AymMd/bc0s9QWtg6cTNyjd4QbIaSAMZXApNYRDkYyB2v5Tmi1YAlDXUS/DmWmb4Z
-cln+zg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp1.hs-augsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp1.hs-augsburg.de,OU=Rechenzentrum,O=Fachhochschule Augsburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDWb0jzANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF0ZhY2hob2Noc2NodWxlIEF1Z3NidXJnMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMR0wGwYDVQQDExRGSCBBdWdzYnVyZyBDQSAtIEcwMjEgMB4G
-CSqGSIb3DQEJARYRY2FAZmgtYXVnc2J1cmcuZGUwHhcNMDgxMjE2MDkzODA3WhcN
-MTMxMjE1MDkzODA3WjBlMQswCQYDVQQGEwJERTEgMB4GA1UEChMXRmFjaGhvY2hz
-Y2h1bGUgQXVnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNVBAMT
-E2lkcDEuaHMtYXVnc2J1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8gWpAiIyVdxXsA68rHTJ5LvlxZfhDEjnEFUvayvT/0Y2iXRZSnb+79jzI
-kz+HCgSQwHh9TG9ypJZn8RB9vkxUTMgU5f/pIvOdI4DV6KlAQX7RGdIPRxBaWXjo
-VcqoayxntkfMU61jRA9p2bk0EA3uT/pxnzve0gAn3wF4DH1V+1AO/Rmb/d0m15my
-42JzGOUKcs6RyaF5VqjGVQLLD72n18YD5zbQBylxn0r+WbrJ8ASKvKiRu/T86oF3
-ToQmWPjEqMnB2XIyYu7uz8Y5RCHgcM/DMXLjXxOr7pqdU7yQvbpcHhHr4QTTdzGR
-aMAj/Oqio6QPuOKy1L61dXSBceytAgMBAAGjggHSMIIBzjAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKUAUSuvuh5EWFNPXRYWICHovPa8MB8GA1UdIwQYMBaAFNVwF+PewZf0CD7p
-OhGz6IjxkEfkMBwGA1UdEQQVMBOBEWNhQGZoLWF1Z3NidXJnLmRlMIGNBgNVHR8E
-gYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtYXVnc2J1cmct
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGmBggrBgEF
-BQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1hdWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggrBgEFBQcw
-AoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPHeiCv3u24AxLffg
-iUTaEQq/+w8f2IgigO26Oq3Z2L5jLH9OeFXjKHOj2L1SzrW5cvuKijmMhSvlcCsI
-dSbt5uzza86ypR9wQARcVBEO1o2HIGEkIcy4IoLF/fQddMs5g5/12YJjtUt5vyJY
-f8IMl0N3Qq5SSIqh0QUfeFxFxArwJjLnMxA9bvg9Vy9jdftZoAJ5F5Ulf3Ofnpqf
-OEKCBtjuDDCfT2ZXClPIavsE8cXoGDo6xgP5zV8o0IvzDTM3DhlD6lMvVj4IFhjj
-AymMd/bc0s9QWtg6cTNyjd4QbIaSAMZXApNYRDkYyB2v5Tmi1YAlDXUS/DmWmb4Z
-cln+zg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hs-augsburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hs-augsburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.hs-augsburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hs-augsburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-augsburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp1.hs-augsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp1.hs-augsburg.de,OU=Rechenzentrum,O=Fachhochschule Augsburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDWb0jzANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF0ZhY2hob2Noc2NodWxlIEF1Z3NidXJnMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMR0wGwYDVQQDExRGSCBBdWdzYnVyZyBDQSAtIEcwMjEgMB4G
-CSqGSIb3DQEJARYRY2FAZmgtYXVnc2J1cmcuZGUwHhcNMDgxMjE2MDkzODA3WhcN
-MTMxMjE1MDkzODA3WjBlMQswCQYDVQQGEwJERTEgMB4GA1UEChMXRmFjaGhvY2hz
-Y2h1bGUgQXVnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNVBAMT
-E2lkcDEuaHMtYXVnc2J1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8gWpAiIyVdxXsA68rHTJ5LvlxZfhDEjnEFUvayvT/0Y2iXRZSnb+79jzI
-kz+HCgSQwHh9TG9ypJZn8RB9vkxUTMgU5f/pIvOdI4DV6KlAQX7RGdIPRxBaWXjo
-VcqoayxntkfMU61jRA9p2bk0EA3uT/pxnzve0gAn3wF4DH1V+1AO/Rmb/d0m15my
-42JzGOUKcs6RyaF5VqjGVQLLD72n18YD5zbQBylxn0r+WbrJ8ASKvKiRu/T86oF3
-ToQmWPjEqMnB2XIyYu7uz8Y5RCHgcM/DMXLjXxOr7pqdU7yQvbpcHhHr4QTTdzGR
-aMAj/Oqio6QPuOKy1L61dXSBceytAgMBAAGjggHSMIIBzjAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKUAUSuvuh5EWFNPXRYWICHovPa8MB8GA1UdIwQYMBaAFNVwF+PewZf0CD7p
-OhGz6IjxkEfkMBwGA1UdEQQVMBOBEWNhQGZoLWF1Z3NidXJnLmRlMIGNBgNVHR8E
-gYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtYXVnc2J1cmct
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGmBggrBgEF
-BQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1hdWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggrBgEFBQcw
-AoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPHeiCv3u24AxLffg
-iUTaEQq/+w8f2IgigO26Oq3Z2L5jLH9OeFXjKHOj2L1SzrW5cvuKijmMhSvlcCsI
-dSbt5uzza86ypR9wQARcVBEO1o2HIGEkIcy4IoLF/fQddMs5g5/12YJjtUt5vyJY
-f8IMl0N3Qq5SSIqh0QUfeFxFxArwJjLnMxA9bvg9Vy9jdftZoAJ5F5Ulf3Ofnpqf
-OEKCBtjuDDCfT2ZXClPIavsE8cXoGDo6xgP5zV8o0IvzDTM3DhlD6lMvVj4IFhjj
-AymMd/bc0s9QWtg6cTNyjd4QbIaSAMZXApNYRDkYyB2v5Tmi1YAlDXUS/DmWmb4Z
-cln+zg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp1.hs-augsburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp1.hs-augsburg.de,OU=Rechenzentrum,O=Fachhochschule Augsburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDWb0jzANBgkqhkiG9w0BAQUFADCBiDELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF0ZhY2hob2Noc2NodWxlIEF1Z3NidXJnMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMR0wGwYDVQQDExRGSCBBdWdzYnVyZyBDQSAtIEcwMjEgMB4G
-CSqGSIb3DQEJARYRY2FAZmgtYXVnc2J1cmcuZGUwHhcNMDgxMjE2MDkzODA3WhcN
-MTMxMjE1MDkzODA3WjBlMQswCQYDVQQGEwJERTEgMB4GA1UEChMXRmFjaGhvY2hz
-Y2h1bGUgQXVnc2J1cmcxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xHDAaBgNVBAMT
-E2lkcDEuaHMtYXVnc2J1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC8gWpAiIyVdxXsA68rHTJ5LvlxZfhDEjnEFUvayvT/0Y2iXRZSnb+79jzI
-kz+HCgSQwHh9TG9ypJZn8RB9vkxUTMgU5f/pIvOdI4DV6KlAQX7RGdIPRxBaWXjo
-VcqoayxntkfMU61jRA9p2bk0EA3uT/pxnzve0gAn3wF4DH1V+1AO/Rmb/d0m15my
-42JzGOUKcs6RyaF5VqjGVQLLD72n18YD5zbQBylxn0r+WbrJ8ASKvKiRu/T86oF3
-ToQmWPjEqMnB2XIyYu7uz8Y5RCHgcM/DMXLjXxOr7pqdU7yQvbpcHhHr4QTTdzGR
-aMAj/Oqio6QPuOKy1L61dXSBceytAgMBAAGjggHSMIIBzjAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFKUAUSuvuh5EWFNPXRYWICHovPa8MB8GA1UdIwQYMBaAFNVwF+PewZf0CD7p
-OhGz6IjxkEfkMBwGA1UdEQQVMBOBEWNhQGZoLWF1Z3NidXJnLmRlMIGNBgNVHR8E
-gYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZmgtYXVnc2J1cmct
-Y2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGmBggrBgEF
-BQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9m
-aC1hdWdzYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggrBgEFBQcw
-AoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS9maC1hdWdzYnVyZy1jYS9wdWIvY2Fj
-ZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPHeiCv3u24AxLffg
-iUTaEQq/+w8f2IgigO26Oq3Z2L5jLH9OeFXjKHOj2L1SzrW5cvuKijmMhSvlcCsI
-dSbt5uzza86ypR9wQARcVBEO1o2HIGEkIcy4IoLF/fQddMs5g5/12YJjtUt5vyJY
-f8IMl0N3Qq5SSIqh0QUfeFxFxArwJjLnMxA9bvg9Vy9jdftZoAJ5F5Ulf3Ofnpqf
-OEKCBtjuDDCfT2ZXClPIavsE8cXoGDo6xgP5zV8o0IvzDTM3DhlD6lMvVj4IFhjj
-AymMd/bc0s9QWtg6cTNyjd4QbIaSAMZXApNYRDkYyB2v5Tmi1YAlDXUS/DmWmb4Z
-cln+zg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hs-augsburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hs-augsburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Augsburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Augsburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-augsburg.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Arno</GivenName>
-    <SurName>Schneider</SurName>
-    <EmailAddress>arno.schneider@hs-augsburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Arno</GivenName>
-    <SurName>Schneider</SurName>
-    <EmailAddress>arno.schneider@hs-augsburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml
deleted file mode 100644
index 89d77a77..00000000
--- a/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.inria.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">INRIA - Institut National de Recherche en Informatique et Automatique</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABb0lEQVQoz2N8pKLOQApgIkk1Pg2cRvbSJ0/IXLrAJq9DWAObvI7wgol/Hjx+buXx6+EVZClGTD+wyevwpsb+efzs48yJhJ3EaWQvtnkJp5/7n3sPsVrOgqZaeMFERk6Od1kVX3dvIOBpuOpPPdNxqUZoYOaREOxtYOTk+DJ7KdzpbPI6zDwSELMgDAYGBoZHKuqPVNR/nr30////H4dOQLiPVNR/37zz////n2cv/fv2/f///79v3oGIMzEwMHC7BrAZ6f579+FtXjnEFLF5C1nUlBkYGJh4uP4+fsrAwPDr/BWEDX8eP/v////bzPJHKuovnIMhZv/79v3zrCUfu6dBbH5qYP91xYZHKuosDAwMzDKSDAwMTIICYvMWspnoM3Jy/P/+421C/vdzB2UuXWBgYPj3+YvksR0/9h+Fevrn4ZMMDAx8xRkMDAz/3r7/++Q5RDUDA8P/7z/+f//BLCH2vrjhTX429pjGD0hOrQCfz6gvIcTqJQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowMyswMjowMOXQ2KsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDMrMDI6MDCUjWAXAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.inria.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">INRIA - Institut National de Recherche en Informatique et Automatique</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://idp.inria.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.inria.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.inria.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INRIA - Institut National de Recherche en Informatique et Automatique</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INRIA - Institut National de Recherche en Informatique et Automatique</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.inria.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Denis Joiret</md:SurName>
-    <md:EmailAddress>denis.joiret@inria.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.ioe.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp1.ioe.ac.uk-shibboleth.xml
deleted file mode 100644
index 626c73c2..00000000
--- a/swamid-interfederations-2.0/idp1.ioe.ac.uk-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://idp1.ioe.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for University College London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-20T14:43:42Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">ioe.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIzCCAgugAwIBAgIUMNyG7wrtkwxFGRAstVzy1ROpxGgwDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOaWRwMi5pb2UuYWMudWswHhcNMTIwMjA4MTUzMjM3WhcN
-						MzIwMjA4MTUzMjM3WjAZMRcwFQYDVQQDEw5pZHAyLmlvZS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN37KVPn30CW2BIleDIha2CleSXGY0a6
-						1OA/eOLI+lsBvug487BAw/Rcf9Y7ooF3D8JIOxixwX1USXFyNCl0sf7/718UVpe0
-						GxtcPYw/NwhtyVpQH+OqE/vh56pKw1o3WPnrFSHmj6/vSg0Pj1R0OFdvn+hoV+JC
-						5POvdSBVkhS8KrRqse9Cr/CdYSmoQ55J1YCgiWngimPtes1zY4s2omZS9kEIi2Px
-						Shhgne1ZG3zR/4b6OXoEOr8K0LfAaPqsKYhwOzXXez6mYKak0rImeVqTdpk0Slyh
-						NNYx7OsA++h2CmAgPOnevOjFNy7sbJ1GT1dAeRE3O+uDcURIgdZokf8CAwEAAaNj
-						MGEwQAYDVR0RBDkwN4IOaWRwMi5pb2UuYWMudWuGJWh0dHBzOi8vaWRwMi5pb2Uu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOLtRIRYnBMYIo5SxgAJChkg
-						ZhbtMA0GCSqGSIb3DQEBBQUAA4IBAQCze9F7kn4uxmMTTyIel3fByZZNSmFj/blC
-						UIOvCuuKWes5c7gMXCWP0INVj1ndi02zhdFxu6SoCDESy0kpGsYupcWNXMdUuNSA
-						WnqbU+OfQ8byNGcnFf0p8TuHwANOaPWCK3Irthu2JXvm9mBe35Ghzf1uNOKkKP2i
-						skDYHKQbL5LBKXJoDqtQeFtZSUHR1pwrcN8o25QPQzfRpgWhqA9pp9DscbLhzgSu
-						nireWPUNaiihBLtqAQGIGauhQ1iznkN4BAolAnxC6encTbpdeF6zb+v22vm0JXfd
-						w9lCORwIgQvhUPvXxS9oiA3XIwEAkid4j/wOQLE9plZLQx5+z78n
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ioe.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ioe.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://idp2.ioe.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.ioe.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.ioe.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.ioe.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">ioe.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIzCCAgugAwIBAgIUMNyG7wrtkwxFGRAstVzy1ROpxGgwDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOaWRwMi5pb2UuYWMudWswHhcNMTIwMjA4MTUzMjM3WhcN
-						MzIwMjA4MTUzMjM3WjAZMRcwFQYDVQQDEw5pZHAyLmlvZS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN37KVPn30CW2BIleDIha2CleSXGY0a6
-						1OA/eOLI+lsBvug487BAw/Rcf9Y7ooF3D8JIOxixwX1USXFyNCl0sf7/718UVpe0
-						GxtcPYw/NwhtyVpQH+OqE/vh56pKw1o3WPnrFSHmj6/vSg0Pj1R0OFdvn+hoV+JC
-						5POvdSBVkhS8KrRqse9Cr/CdYSmoQ55J1YCgiWngimPtes1zY4s2omZS9kEIi2Px
-						Shhgne1ZG3zR/4b6OXoEOr8K0LfAaPqsKYhwOzXXez6mYKak0rImeVqTdpk0Slyh
-						NNYx7OsA++h2CmAgPOnevOjFNy7sbJ1GT1dAeRE3O+uDcURIgdZokf8CAwEAAaNj
-						MGEwQAYDVR0RBDkwN4IOaWRwMi5pb2UuYWMudWuGJWh0dHBzOi8vaWRwMi5pb2Uu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOLtRIRYnBMYIo5SxgAJChkg
-						ZhbtMA0GCSqGSIb3DQEBBQUAA4IBAQCze9F7kn4uxmMTTyIel3fByZZNSmFj/blC
-						UIOvCuuKWes5c7gMXCWP0INVj1ndi02zhdFxu6SoCDESy0kpGsYupcWNXMdUuNSA
-						WnqbU+OfQ8byNGcnFf0p8TuHwANOaPWCK3Irthu2JXvm9mBe35Ghzf1uNOKkKP2i
-						skDYHKQbL5LBKXJoDqtQeFtZSUHR1pwrcN8o25QPQzfRpgWhqA9pp9DscbLhzgSu
-						nireWPUNaiihBLtqAQGIGauhQ1iznkN4BAolAnxC6encTbpdeF6zb+v22vm0JXfd
-						w9lCORwIgQvhUPvXxS9oiA3XIwEAkid4j/wOQLE9plZLQx5+z78n
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ioe.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ioe.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 College London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Education, University of London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ioe.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Yu-king</GivenName>
-    <SurName>Lau</SurName>
-    <EmailAddress>mailto:y.lau@ioe.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Yu-king</GivenName>
-    <SurName>Lau</SurName>
-    <EmailAddress>mailto:y.lau@ioe.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.proofidcloud.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.proofidcloud.co.uk-idp-shibboleth.xml
deleted file mode 100644
index 8021ff10..00000000
--- a/swamid-interfederations-2.0/idp1.proofidcloud.co.uk-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://idp1.proofidcloud.co.uk/idp/shibboleth">
-  <!--
-		This is a "Testing" Shibboleth IdP for ProofID Limited.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-29T13:42:12Z">
-      <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">proofidcloud.co.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ProofID test Shibboleth identity provider</mdui:DisplayName>
-        <mdui:Logo height="60" width="60">https://idp1.proofidcloud.co.uk/images/proofid-60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIVAO42NKVQT3aOFGBFVBQbZ5n2yNhCMA0GCSqGSIb3DQEB
-						BQUAMCIxIDAeBgNVBAMTF2lkcDEucHJvb2ZpZGNsb3VkLmNvLnVrMB4XDTE0MDcy
-						OTA5MjU0MVoXDTM0MDcyOTA5MjU0MVowIjEgMB4GA1UEAxMXaWRwMS5wcm9vZmlk
-						Y2xvdWQuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCygPFc
-						+Y88TUGNchadaZmOW1iHZdenETJvkgYAbAa3jKaKkUXzN36EAmwTw2xMZEhjRofI
-						vfxdK8L1Pq12ohcDErK26/tTXPLeECsKXv1L4DOClQYCmi3pSHSoXuznWwKQdifq
-						hbU0Qu2+Sf/fGaEt3h2+/hwgwKuS+IRv39/XwHab6i+VfU76BpkKfL8z1YBftha7
-						gguvXYYMq+OcNR5Js4V4vZNsNTLdrWg2SrWG9aoyChHeQBE0D0piBbKH7qftAkN9
-						98ABxnZMYbRQK7jXBybRlRl/fKjdXXZOl2pP3J6yco8+LAzAokWB/vCCh5W2FKW4
-						1h0aej05wepq/5KRAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcDEucHJvb2ZpZGNs
-						b3VkLmNvLnVrhi5odHRwczovL2lkcDEucHJvb2ZpZGNsb3VkLmNvLnVrL2lkcC9z
-						aGliYm9sZXRoMB0GA1UdDgQWBBTpX6QnFh6Olp5+tHJlBUytNeIhezANBgkqhkiG
-						9w0BAQUFAAOCAQEAJ8sa6jPg5IZ/00j/G1IJl15hCgMumyef27HNBA1yMpQhYwxE
-						vNiHPXenv98nPYe9y7YcC52E2ZmmTF91sAPKomfg029/iO6oJiSVVmVb9z8qu2Df
-						AtJxixzs++rAvosd/0lV3EXUgrwdmq3Gp3HnbRuwodu59oPtOlOb3yqa8x1BHYD3
-						kHvJhFKX+LrKTZiw6kNl9wQyNSaQ/MpFNcweLU+Se40qchjKpUDZtYKg/UxZToux
-						Lrh0v65OPRCnaVWpnkouhVW341rvY1cSGGOrGeG8QoQWAI/UbdZtjYicrIV7Wt3G
-						9C6qgxQNg/yFFt3Z1jhEgxkVlpktnahzL/cKSA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.proofidcloud.co.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://idp1.proofidcloud.co.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.proofidcloud.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.proofidcloud.co.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">proofidcloud.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIVAO42NKVQT3aOFGBFVBQbZ5n2yNhCMA0GCSqGSIb3DQEB
-						BQUAMCIxIDAeBgNVBAMTF2lkcDEucHJvb2ZpZGNsb3VkLmNvLnVrMB4XDTE0MDcy
-						OTA5MjU0MVoXDTM0MDcyOTA5MjU0MVowIjEgMB4GA1UEAxMXaWRwMS5wcm9vZmlk
-						Y2xvdWQuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCygPFc
-						+Y88TUGNchadaZmOW1iHZdenETJvkgYAbAa3jKaKkUXzN36EAmwTw2xMZEhjRofI
-						vfxdK8L1Pq12ohcDErK26/tTXPLeECsKXv1L4DOClQYCmi3pSHSoXuznWwKQdifq
-						hbU0Qu2+Sf/fGaEt3h2+/hwgwKuS+IRv39/XwHab6i+VfU76BpkKfL8z1YBftha7
-						gguvXYYMq+OcNR5Js4V4vZNsNTLdrWg2SrWG9aoyChHeQBE0D0piBbKH7qftAkN9
-						98ABxnZMYbRQK7jXBybRlRl/fKjdXXZOl2pP3J6yco8+LAzAokWB/vCCh5W2FKW4
-						1h0aej05wepq/5KRAgMBAAGjdTBzMFIGA1UdEQRLMEmCF2lkcDEucHJvb2ZpZGNs
-						b3VkLmNvLnVrhi5odHRwczovL2lkcDEucHJvb2ZpZGNsb3VkLmNvLnVrL2lkcC9z
-						aGliYm9sZXRoMB0GA1UdDgQWBBTpX6QnFh6Olp5+tHJlBUytNeIhezANBgkqhkiG
-						9w0BAQUFAAOCAQEAJ8sa6jPg5IZ/00j/G1IJl15hCgMumyef27HNBA1yMpQhYwxE
-						vNiHPXenv98nPYe9y7YcC52E2ZmmTF91sAPKomfg029/iO6oJiSVVmVb9z8qu2Df
-						AtJxixzs++rAvosd/0lV3EXUgrwdmq3Gp3HnbRuwodu59oPtOlOb3yqa8x1BHYD3
-						kHvJhFKX+LrKTZiw6kNl9wQyNSaQ/MpFNcweLU+Se40qchjKpUDZtYKg/UxZToux
-						Lrh0v65OPRCnaVWpnkouhVW341rvY1cSGGOrGeG8QoQWAI/UbdZtjYicrIV7Wt3G
-						9C6qgxQNg/yFFt3Z1jhEgxkVlpktnahzL/cKSA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.proofidcloud.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.proofidcloud.co.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">ProofID Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ProofID test Shibboleth identity provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.proofid.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@proofid.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Heaney</SurName>
-    <EmailAddress>mailto:ukfed@proofid.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.smuc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.smuc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index fd4dbc29..00000000
--- a/swamid-interfederations-2.0/idp1.smuc.ac.uk-idp-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://idp1.smuc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for St Mary's University, Twickenham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-04T12:31: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">smuc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIVAJqsp1MrlVMLhxJsVG6wDFuqgiFCMA0GCSqGSIb3DQEB
-						BQUAMBoxGDAWBgNVBAMMD2lkcDEuc211Yy5hYy51azAeFw0xNTA0MDExMjUxMjJa
-						Fw0zNTA0MDExMjUxMjJaMBoxGDAWBgNVBAMMD2lkcDEuc211Yy5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIQS0FpypUm4vKfAntg4JOuEnmrp
-						3s2D0f24UO/wuPZliJ93v6gXghf+uv1Bt+cvxKe8a3TfcJgnS2f9U1l/+GWNqizr
-						nZUzXc7Z/f6s7GagSkQMNPyTGFuc7mvTkSZSm8Q9rIfdW31Wz4uc+Q+c1qv62hBI
-						7DLn7j5rfhGNkoWFzuYQTY3E6Yk6z2epzrg9FWkoELPU9hxPjA+qmPQs3aRU3Jlt
-						xwVXaUIZkmWKjsNlsDkIISjGwHUUizwk9nRYe3mmuYJp44zqisymGCif7Xc4ZRXF
-						8O3iq/eSzwVEaKDb4ECsyCqVo4uHfV+p2Huo7W254Lq/Ng8up1wXD++16VsCAwEA
-						AaNlMGMwHQYDVR0OBBYEFPYocrNnQYlCGYCe7wXZ5aBU2O6yMEIGA1UdEQQ7MDmC
-						D2lkcDEuc211Yy5hYy51a4YmaHR0cHM6Ly9pZHAxLnNtdWMuYWMudWsvaWRwL3No
-						aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAAQjefMnvf1Qqnq3mFGs7+KV8OzG
-						BvvbXb58zOxdyHqAoQNJnAEXGKzzu5sIbtGeJ2RpTXpDu3kG+xOIcj/MtKDZZ9WC
-						ds20z3giUlhOKndnPmEJa1otVQHaLoqMCPmciEdo49lB/mB8Bhx/ywPn323/S65t
-						HLP30zjRlKHZ99AiB7FWU2oz813BfHUyfHaqMmjXAW1fIABsrbqcrRdgW1/HebRq
-						PEAIy1vRsmhe4GhNYWRSsTFZCUlKR4z/1QCdPNjK5Jwgej1Sm9RKT5XCwGc84f5v
-						cwicfDDt9zpSAegFE90VEroJRjtx8LMAW3HZxFXdnMmgIl7aRh9gk0SAaEM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.smuc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.smuc.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://idp1.smuc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.smuc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.smuc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.smuc.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">smuc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIVAJqsp1MrlVMLhxJsVG6wDFuqgiFCMA0GCSqGSIb3DQEB
-						BQUAMBoxGDAWBgNVBAMMD2lkcDEuc211Yy5hYy51azAeFw0xNTA0MDExMjUxMjJa
-						Fw0zNTA0MDExMjUxMjJaMBoxGDAWBgNVBAMMD2lkcDEuc211Yy5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIQS0FpypUm4vKfAntg4JOuEnmrp
-						3s2D0f24UO/wuPZliJ93v6gXghf+uv1Bt+cvxKe8a3TfcJgnS2f9U1l/+GWNqizr
-						nZUzXc7Z/f6s7GagSkQMNPyTGFuc7mvTkSZSm8Q9rIfdW31Wz4uc+Q+c1qv62hBI
-						7DLn7j5rfhGNkoWFzuYQTY3E6Yk6z2epzrg9FWkoELPU9hxPjA+qmPQs3aRU3Jlt
-						xwVXaUIZkmWKjsNlsDkIISjGwHUUizwk9nRYe3mmuYJp44zqisymGCif7Xc4ZRXF
-						8O3iq/eSzwVEaKDb4ECsyCqVo4uHfV+p2Huo7W254Lq/Ng8up1wXD++16VsCAwEA
-						AaNlMGMwHQYDVR0OBBYEFPYocrNnQYlCGYCe7wXZ5aBU2O6yMEIGA1UdEQQ7MDmC
-						D2lkcDEuc211Yy5hYy51a4YmaHR0cHM6Ly9pZHAxLnNtdWMuYWMudWsvaWRwL3No
-						aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAAQjefMnvf1Qqnq3mFGs7+KV8OzG
-						BvvbXb58zOxdyHqAoQNJnAEXGKzzu5sIbtGeJ2RpTXpDu3kG+xOIcj/MtKDZZ9WC
-						ds20z3giUlhOKndnPmEJa1otVQHaLoqMCPmciEdo49lB/mB8Bhx/ywPn323/S65t
-						HLP30zjRlKHZ99AiB7FWU2oz813BfHUyfHaqMmjXAW1fIABsrbqcrRdgW1/HebRq
-						PEAIy1vRsmhe4GhNYWRSsTFZCUlKR4z/1QCdPNjK5Jwgej1Sm9RKT5XCwGc84f5v
-						cwicfDDt9zpSAegFE90VEroJRjtx8LMAW3HZxFXdnMmgIl7aRh9gk0SAaEM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.smuc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.smuc.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">St Mary's University, Twickenham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St Mary's University Twickenham</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.smuc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT HelpDesk</GivenName>
-    <EmailAddress>mailto:helpdesk@stmarys.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Johnson</SurName>
-    <EmailAddress>mailto:chris.johnson@stmarys.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.solent.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 3410180e..00000000
--- a/swamid-interfederations-2.0/idp1.solent.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://idp1.solent.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Southampton Solent University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-22T14:40: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">solent.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAMEcRei0mVIxnctKElMp/O387gtBMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEWlkcDEuc29sZW50LmFjLnVrMB4XDTE1MDIxNzEwMzQx
-						NFoXDTI1MDIxNzEwMzQxNFowHDEaMBgGA1UEAxMRaWRwMS5zb2xlbnQuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCF1dDGPEUijwsKsLzmVVbu
-						W4amy2HYiaCRRM9HOs1NIn4sYjG0aj5tnH1HUvbF8x2MfEGvsGidm1NLZoxIEjv8
-						/gxR5aswHfQjZp8ju1bffeCNzEftrFRMCvUiWxf7ThxQDsrDY9WcocOlr7BHEtVn
-						4NDqlaxjBKhRxgqZUrE+S2dvZfFYsR23AzwohJ2HLR+/3bxBhCBs+A/kQrgLMNvw
-						7Z7fPiu7OiUuS2Qjqz+4HHPm6k6RtqOtayKWfToHXS/b+Yxv8DEF3xQW+if6zZA0
-						zdjYIZ0hVa2ew2882rqRIlBKZpUcl6kdIWH7XjXvbzu8xkXG0ZRdXyVaRIPaY7fb
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcDEuc29sZW50LmFjLnVrhihodHRwczov
-						L2lkcDEuc29sZW50LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSPY2tD
-						4c7/NhioEVdldj0S9Y2EADANBgkqhkiG9w0BAQUFAAOCAQEABI2dIOAflt1WkYEJ
-						YUo+pk9+3xYoh6EPU8HF0a4aruul5jBLWpyZfrXWffjZtbGj1dYb5UNj/x7zzWOm
-						fIn7Tig2UjjkWL/81TSPLIPHG5QpR+UxRB8eUpsr8NslOwqP0brIRqgIyzNNQz82
-						IRtFzpE5SdI5Ds1lhhV5gQqSBSfuDimqrrmMMD2BQ/aAZgtnt6HfzCzDTv9o9K1a
-						ruMAOxdwGzOWgas6VmibPb/m2j/tibs37OMzpBtwUldqDjB2/WYmIhu4zXHrMj+6
-						/RF0wtwrM2dWdDlIQtm+f7yQfxrP74fx4fDWA2uetDa1RkQX7U54/Sfxx9d4UpIU
-						dBTl/A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.solent.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://idp1.solent.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.solent.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.solent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.solent.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">solent.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAMEcRei0mVIxnctKElMp/O387gtBMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEWlkcDEuc29sZW50LmFjLnVrMB4XDTE1MDIxNzEwMzQx
-						NFoXDTI1MDIxNzEwMzQxNFowHDEaMBgGA1UEAxMRaWRwMS5zb2xlbnQuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCF1dDGPEUijwsKsLzmVVbu
-						W4amy2HYiaCRRM9HOs1NIn4sYjG0aj5tnH1HUvbF8x2MfEGvsGidm1NLZoxIEjv8
-						/gxR5aswHfQjZp8ju1bffeCNzEftrFRMCvUiWxf7ThxQDsrDY9WcocOlr7BHEtVn
-						4NDqlaxjBKhRxgqZUrE+S2dvZfFYsR23AzwohJ2HLR+/3bxBhCBs+A/kQrgLMNvw
-						7Z7fPiu7OiUuS2Qjqz+4HHPm6k6RtqOtayKWfToHXS/b+Yxv8DEF3xQW+if6zZA0
-						zdjYIZ0hVa2ew2882rqRIlBKZpUcl6kdIWH7XjXvbzu8xkXG0ZRdXyVaRIPaY7fb
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcDEuc29sZW50LmFjLnVrhihodHRwczov
-						L2lkcDEuc29sZW50LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSPY2tD
-						4c7/NhioEVdldj0S9Y2EADANBgkqhkiG9w0BAQUFAAOCAQEABI2dIOAflt1WkYEJ
-						YUo+pk9+3xYoh6EPU8HF0a4aruul5jBLWpyZfrXWffjZtbGj1dYb5UNj/x7zzWOm
-						fIn7Tig2UjjkWL/81TSPLIPHG5QpR+UxRB8eUpsr8NslOwqP0brIRqgIyzNNQz82
-						IRtFzpE5SdI5Ds1lhhV5gQqSBSfuDimqrrmMMD2BQ/aAZgtnt6HfzCzDTv9o9K1a
-						ruMAOxdwGzOWgas6VmibPb/m2j/tibs37OMzpBtwUldqDjB2/WYmIhu4zXHrMj+6
-						/RF0wtwrM2dWdDlIQtm+f7yQfxrP74fx4fDWA2uetDa1RkQX7U54/Sfxx9d4UpIU
-						dBTl/A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.solent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.solent.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">Southampton Solent University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Southampton Solent University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.solent.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Help Desk</GivenName>
-    <EmailAddress>mailto:federation.support@solent.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:federation.tech@solent.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.tees.ac.uk-entity.xml b/swamid-interfederations-2.0/idp1.tees.ac.uk-entity.xml
deleted file mode 100644
index 4741fc94..00000000
--- a/swamid-interfederations-2.0/idp1.tees.ac.uk-entity.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://idp1.tees.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for Teesside University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-24T16:04: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">tees.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQD+KLySSf4wXDANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJH
-						QjEUMBIGA1UECBMLVGVlcyBWYWxsZXkxFjAUBgNVBAcTDU1pZGRsZXNicm91Z2gx
-						GzAZBgNVBAoTElRlZXNpZGUgVW5pdmVyc2l0eTEYMBYGA1UEAxMPaWRwMS50ZWVz
-						LmFjLnVrMB4XDTE0MTEwNzE0NDcyNFoXDTM0MTEwMjE0NDcyNFowcjELMAkGA1UE
-						BhMCR0IxFDASBgNVBAgTC1RlZXMgVmFsbGV5MRYwFAYDVQQHEw1NaWRkbGVzYnJv
-						dWdoMRswGQYDVQQKExJUZWVzaWRlIFVuaXZlcnNpdHkxGDAWBgNVBAMTD2lkcDEu
-						dGVlcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALYtu8Hd
-						0ebl2wTZoJD4DXAbzS9tsaInJFSen0GNIBmkf86Prolu2ZBL4q7hh2EGWNCeRn0l
-						O/rJY3jHEheh7Eqf3dIAxxQfYmqXF7Y7bFF4XBiX78MVFOQWG8L3SnZmo+oPehUM
-						RvPoO7/O70IEi//VSwuTXabOc9rCOYJh76eKCADG2NwqBC8GCXFaDUd/yFKwvsbn
-						VuuQM5dxldPS3GxSstYOtboBXOZjq3KUnq/xWUBec9CGmpl+pjh0cNiBeUrCl4ZD
-						uEU2tVMtYvLsw3HCH+bA2iySc8TsG9coGALPXdgK+YrLn/uT1qOR/4jU+0juysC6
-						e0ZFQv09zEbjvh8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAFmHTe0SznUBkYIpX
-						S8mKPbXQdzlwkh5xwA4PUvw8l8jBMUbB1V+BKY8Jj3yooYeRq9WMNSS6OaumMNHB
-						3/5snnFilOObbg2K4DgIaLFqTsfPX8qgJs7+YdYKSUpqfEYlQPBhS2rGQTcXCwZz
-						axeyFlce6yekzUlFQu5UUPP9/xb0S/p/UeULdiJ1gMHd3AlMUsIZ5elakM8IrQcs
-						59K1dFHJj/qUvkz7VGfKuDkHoW8hmDadDuTH9nl7Rlb1psKGeQTge0CDCMSTQlw5
-						xwwl1ip9UaWdWQC461MmnLmrd9bx+DcVHX5q5zbx4YJ3leQpV1P9HHr8fx2Qffll
-						1b2cbw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.tees.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.tees.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://idp1.tees.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.tees.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.tees.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.tees.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">tees.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQD+KLySSf4wXDANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJH
-						QjEUMBIGA1UECBMLVGVlcyBWYWxsZXkxFjAUBgNVBAcTDU1pZGRsZXNicm91Z2gx
-						GzAZBgNVBAoTElRlZXNpZGUgVW5pdmVyc2l0eTEYMBYGA1UEAxMPaWRwMS50ZWVz
-						LmFjLnVrMB4XDTE0MTEwNzE0NDcyNFoXDTM0MTEwMjE0NDcyNFowcjELMAkGA1UE
-						BhMCR0IxFDASBgNVBAgTC1RlZXMgVmFsbGV5MRYwFAYDVQQHEw1NaWRkbGVzYnJv
-						dWdoMRswGQYDVQQKExJUZWVzaWRlIFVuaXZlcnNpdHkxGDAWBgNVBAMTD2lkcDEu
-						dGVlcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALYtu8Hd
-						0ebl2wTZoJD4DXAbzS9tsaInJFSen0GNIBmkf86Prolu2ZBL4q7hh2EGWNCeRn0l
-						O/rJY3jHEheh7Eqf3dIAxxQfYmqXF7Y7bFF4XBiX78MVFOQWG8L3SnZmo+oPehUM
-						RvPoO7/O70IEi//VSwuTXabOc9rCOYJh76eKCADG2NwqBC8GCXFaDUd/yFKwvsbn
-						VuuQM5dxldPS3GxSstYOtboBXOZjq3KUnq/xWUBec9CGmpl+pjh0cNiBeUrCl4ZD
-						uEU2tVMtYvLsw3HCH+bA2iySc8TsG9coGALPXdgK+YrLn/uT1qOR/4jU+0juysC6
-						e0ZFQv09zEbjvh8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAFmHTe0SznUBkYIpX
-						S8mKPbXQdzlwkh5xwA4PUvw8l8jBMUbB1V+BKY8Jj3yooYeRq9WMNSS6OaumMNHB
-						3/5snnFilOObbg2K4DgIaLFqTsfPX8qgJs7+YdYKSUpqfEYlQPBhS2rGQTcXCwZz
-						axeyFlce6yekzUlFQu5UUPP9/xb0S/p/UeULdiJ1gMHd3AlMUsIZ5elakM8IrQcs
-						59K1dFHJj/qUvkz7VGfKuDkHoW8hmDadDuTH9nl7Rlb1psKGeQTge0CDCMSTQlw5
-						xwwl1ip9UaWdWQC461MmnLmrd9bx+DcVHX5q5zbx4YJ3leQpV1P9HHr8fx2Qffll
-						1b2cbw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.tees.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.tees.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">Teesside University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Teesside University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tees.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tom</GivenName>
-    <SurName>Hyland</SurName>
-    <EmailAddress>mailto:T.Hyland@tees.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Maxwell</SurName>
-    <EmailAddress>mailto:a.maxwell@tees.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.themanchestercollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.themanchestercollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 0db71b37..00000000
--- a/swamid-interfederations-2.0/idp1.themanchestercollege.ac.uk-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://idp1.themanchestercollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The Manchester College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-24T14:49:32Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">themanchestercollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlKgAwIBAgIVANqzJLQBsPCEFgsQ4b4IALk9qGiiMA0GCSqGSIb3DQEB
-						BQUAMCoxKDAmBgNVBAMTH2lkcDEudGhlbWFuY2hlc3RlcmNvbGxlZ2UuYWMudWsw
-						HhcNMTMwMTIyMTUzNjE5WhcNMzMwMTIyMTUzNjE5WjAqMSgwJgYDVQQDEx9pZHAx
-						LnRoZW1hbmNoZXN0ZXJjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAzVU6xLjziCjRY0eLzVtrjsHcpLtQdh8UJGyje3+Gm+bibxDW
-						z+NZm3VDSinORPUXIpZyXqPC8r7jHl5zpXCeCCONABfT2biKYraqXe6zj9UYEOfq
-						H3avpzgUvVx/+t9sUfqZq6IP2a+rPbN3ifc7zydBWkaKyymPm922EABECik1onEp
-						59gcFf+PkozaAE51Jid8Lp9YXjQq+OVp9NjfqSXUGYjSRnxH23zws98180CDCBj4
-						nWlLaFDlpPcs9AcVo30WDm2qIC93BOCThmSh/az2+80fpxVPGf3wpcPuZ11XflST
-						FcvbRhADY05pwLXOgztbYNOhtS3qZkIFEce32QIDAQABo4GGMIGDMGIGA1UdEQRb
-						MFmCH2lkcDEudGhlbWFuY2hlc3RlcmNvbGxlZ2UuYWMudWuGNmh0dHBzOi8vaWRw
-						MS50aGVtYW5jaGVzdGVyY29sbGVnZS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNV
-						HQ4EFgQUWXjSvL0zVIJ4O/L6c+kNL3oyemgwDQYJKoZIhvcNAQEFBQADggEBAJGR
-						wXOT7JS6jYsWFDbUgEOUKu8qHBafTZMb3lHKqEF+i9VOxSSyquc5Z3pzJjBjlpaY
-						514MqXswU4oZvCrKJDqfj47ApBSbLvZm4A0cjx7xQqwRSYfmszi0B/W46Xrt32Sc
-						wxcVAoj3upfUigH4SfeixJvOOuk0XibWWz27Gu+B1YCRRfenE/mpGwwaRn5ccOKe
-						uV+M/JapELbKFiAzi/qTuUHV08+i/2Teqv9+0el+zTyT7dXPhtBRZR3iN/yiunX4
-						hawEgZ1qMsy+ujLpe3fDd0HSaUCLhV3df0xhPwuuzgoBLvnTEGkmtolNVokJ/UbL
-						J9Sk+YSY/yW1ywDO6pU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.themanchestercollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.themanchestercollege.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://idp1.themanchestercollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.themanchestercollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.themanchestercollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.themanchestercollege.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">themanchestercollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlKgAwIBAgIVANqzJLQBsPCEFgsQ4b4IALk9qGiiMA0GCSqGSIb3DQEB
-						BQUAMCoxKDAmBgNVBAMTH2lkcDEudGhlbWFuY2hlc3RlcmNvbGxlZ2UuYWMudWsw
-						HhcNMTMwMTIyMTUzNjE5WhcNMzMwMTIyMTUzNjE5WjAqMSgwJgYDVQQDEx9pZHAx
-						LnRoZW1hbmNoZXN0ZXJjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAzVU6xLjziCjRY0eLzVtrjsHcpLtQdh8UJGyje3+Gm+bibxDW
-						z+NZm3VDSinORPUXIpZyXqPC8r7jHl5zpXCeCCONABfT2biKYraqXe6zj9UYEOfq
-						H3avpzgUvVx/+t9sUfqZq6IP2a+rPbN3ifc7zydBWkaKyymPm922EABECik1onEp
-						59gcFf+PkozaAE51Jid8Lp9YXjQq+OVp9NjfqSXUGYjSRnxH23zws98180CDCBj4
-						nWlLaFDlpPcs9AcVo30WDm2qIC93BOCThmSh/az2+80fpxVPGf3wpcPuZ11XflST
-						FcvbRhADY05pwLXOgztbYNOhtS3qZkIFEce32QIDAQABo4GGMIGDMGIGA1UdEQRb
-						MFmCH2lkcDEudGhlbWFuY2hlc3RlcmNvbGxlZ2UuYWMudWuGNmh0dHBzOi8vaWRw
-						MS50aGVtYW5jaGVzdGVyY29sbGVnZS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNV
-						HQ4EFgQUWXjSvL0zVIJ4O/L6c+kNL3oyemgwDQYJKoZIhvcNAQEFBQADggEBAJGR
-						wXOT7JS6jYsWFDbUgEOUKu8qHBafTZMb3lHKqEF+i9VOxSSyquc5Z3pzJjBjlpaY
-						514MqXswU4oZvCrKJDqfj47ApBSbLvZm4A0cjx7xQqwRSYfmszi0B/W46Xrt32Sc
-						wxcVAoj3upfUigH4SfeixJvOOuk0XibWWz27Gu+B1YCRRfenE/mpGwwaRn5ccOKe
-						uV+M/JapELbKFiAzi/qTuUHV08+i/2Teqv9+0el+zTyT7dXPhtBRZR3iN/yiunX4
-						hawEgZ1qMsy+ujLpe3fDd0HSaUCLhV3df0xhPwuuzgoBLvnTEGkmtolNVokJ/UbL
-						J9Sk+YSY/yW1ywDO6pU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.themanchestercollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.themanchestercollege.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 Manchester College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Manchester College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://themanchestercollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>McInnes</SurName>
-    <EmailAddress>mailto:AMcInnes@themanchestercollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Waseem</GivenName>
-    <SurName>Afzal</SurName>
-    <EmailAddress>mailto:WAfzal@themanchestercollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.turkuamk.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.turkuamk.fi-idp-shibboleth.xml
deleted file mode 100644
index 5d8d1f75..00000000
--- a/swamid-interfederations-2.0/idp1.turkuamk.fi-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://idp1.turkuamk.fi/idp/shibboleth">
-  <md: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>
-  </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">turkuamk.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Åbo yrkeshögskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Turku University of Applied Sciences</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">Turun ammattikorkeakoulu</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.tuas.fi/en/about-us/tuas/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fi">http://www.turkuamk.fi/fi/turun-amk/esittely/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEmzCCA4OgAwIBAgIRANZqNXD6/wnELqTUo3xZV5kwDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTQxMTA2MDAwMDAwWhcNMTcxMTIxMjM1OTU5WjA+MSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGTAXBgNVBAMTEGlkcDEudHVya3Vh
-bWsuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtHVA4t7YZJsPU
-sSQf0eRQ8S4HTSZ+UpwQVdHRHzfU5CncoP2LKft4/LmZXXasfzLZJLTr4NPWDuyY
-aEdTr6fJe/36FuboIKfbwRhb8LAQ0hC29rqCWPoJKDGsaoCICJKm8ORou5n5UM5G
-7x+YBiMPo8a+PF884Nr8hST465JeEkxD9naGjYkAzjd1tJF1FOfZY4de4OAHrK5w
-RC6hRbXEtZRJSigtJyl2Ql6uHWdQuyZjd8Lnz1mTnNLcPENs0fwOsF5TCRAW+h07
-OE785+2plIc7TUo9azFtS1e4T+VFhbBZ1Jq79r8b6XR/mgMmtYknb3nJJHgianYO
-vMClrOCLAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYo
-sP22vTAdBgNVHQ4EFgQU9CSDbdlhk4vBYwWYtzQUY1PuEVUwDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3Js
-MGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1
-c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3Nw
-LnVzZXJ0cnVzdC5jb20wGwYDVR0RBBQwEoIQaWRwMS50dXJrdWFtay5maTANBgkq
-hkiG9w0BAQsFAAOCAQEAfuOGiRjCC9BUPBYMn1xZQnFwv+C0KuIhdCQJ2hXCXT/3
-hLN5n7SoFKenPUIQ3jyuzF0SgXZlZyPoOPUtvW+TtK4ztIIK246IWUb5BQUvzUj3
-Rt/QNZAJyFYDl+CrTnYxBxF/y6IkNHQvIZGb82wuKLSZdiXq1qzqLMAq499UUBwk
-F7Mg1CgcZSQqvGWAdluOtJ+9XoLVotsK/5euhvQcsYo1AO6CWI+d+eexVIRrYkKv
-Rk0r8pW68ywkt5FlYtZ3l5FKymPri7dpJYO0Wq2gcE8IbOl4W/XENLvgS0EPuxpa
-aIV/r1hKpwPEjw86BQw8hLueNYlwlJ5GAmA+Xb8zOg==</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://idp1.turkuamk.fi/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Turun ammattikorkeakoulu</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Turku University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Åbo yrkeshögskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Turun ammattikorkeakoulu</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Turku University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Åbo yrkeshögskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.turkuamk.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.turkuamk.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.turkuamk.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Miina</md:GivenName>
-    <md:SurName>Vina</md:SurName>
-    <md:EmailAddress>mailto:miina.vina@turkuamk.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Help</md:GivenName>
-    <md:SurName>Desk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@turkuamk.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.utpa.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.utpa.edu-idp-shibboleth.xml
deleted file mode 100644
index 1c23387f..00000000
--- a/swamid-interfederations-2.0/idp1.utpa.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +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://idp1.utpa.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">utpa.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas-Pan American</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.utpa.edu/dit</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.utpa.edu/policies/privacy</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>
-MIIDHzCCAgegAwIBAgIUdKkzW01lvdyal9wyJMIhLH5ZWwQwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwMS51dHBhLmVkdTAeFw0xMDA3MjEyMTI1MTlaFw0z
-MDA3MjEyMTI1MTlaMBgxFjAUBgNVBAMTDWlkcDEudXRwYS5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNr/xhq+UAztUMJytS7SVqGJx2gaxW0xNU
-OfT5OPFA12tLUPYXnf3WA/fHv8WD3jgPNgGSQPgYX0WZaOYr19o6/+iQtuLCPaXD
-LuDBjY3TmflArRS7uRzUy5nl98QJcIhlssp60sDWhz/uPI8BCnKLvo35KisJ+aLH
-YGB1tzenVmR6kjuZA1VNC3lmsPjTBqAc8yPm7w9jk+ZmHbmW5fDWetnMmxpHzjQf
-UlP55ddm30sxZxAGC9/N253RVKuPy8NvYuVzvCYk86AS2mVmvneJ1S2KT77GCAmr
-x1ags31zP4B/VJIsWQ9znlfAgpcrVVt1jcYFd0EVBiIoBmK6DkFPAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcDEudXRwYS5lZHWGJGh0dHBzOi8vaWRwMS51dHBhLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQURat8zqRPL/gEEcB95AU0ZGwRBu0w
-DQYJKoZIhvcNAQEFBQADggEBAIP6l5tAs2w6Otty6UaPb1MghRRx/75GLW7lYmvV
-1W/Yfz6cNuhqwimY3p84NvHbwFnQFFlVIrzImDoYPuLoQwrUAahDZGsdgMZ51apV
-LsI6TJr7WmTxJEGZSQq7iRC6Kf+XyV7/Qa/1wPR0iy90O0/4yNkzlQIoRoIPUK7+
-MMxVRpFaUpwJwIpNA3WID0JTeDaJ2YT9OFLgUeS/N0B2lIp5ClPktl71LJkwpv4C
-oie3XK/NlMnqzjcF/dvCwDhsSHE1a6eSOJTHeP8y49js+sV4i4wcl0Inbf+8+EOh
-DzZqtIw6JsdQP1xYSJp98NUDw6qHGVfuUGUNLW1KeKmwsio=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.utpa.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.utpa.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.utpa.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.utpa.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.utpa.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.utpa.edu/idp/profile/SAML2/POST-SimpleSign/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">utpa.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUdKkzW01lvdyal9wyJMIhLH5ZWwQwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNaWRwMS51dHBhLmVkdTAeFw0xMDA3MjEyMTI1MTlaFw0z
-MDA3MjEyMTI1MTlaMBgxFjAUBgNVBAMTDWlkcDEudXRwYS5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNr/xhq+UAztUMJytS7SVqGJx2gaxW0xNU
-OfT5OPFA12tLUPYXnf3WA/fHv8WD3jgPNgGSQPgYX0WZaOYr19o6/+iQtuLCPaXD
-LuDBjY3TmflArRS7uRzUy5nl98QJcIhlssp60sDWhz/uPI8BCnKLvo35KisJ+aLH
-YGB1tzenVmR6kjuZA1VNC3lmsPjTBqAc8yPm7w9jk+ZmHbmW5fDWetnMmxpHzjQf
-UlP55ddm30sxZxAGC9/N253RVKuPy8NvYuVzvCYk86AS2mVmvneJ1S2KT77GCAmr
-x1ags31zP4B/VJIsWQ9znlfAgpcrVVt1jcYFd0EVBiIoBmK6DkFPAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWlkcDEudXRwYS5lZHWGJGh0dHBzOi8vaWRwMS51dHBhLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQURat8zqRPL/gEEcB95AU0ZGwRBu0w
-DQYJKoZIhvcNAQEFBQADggEBAIP6l5tAs2w6Otty6UaPb1MghRRx/75GLW7lYmvV
-1W/Yfz6cNuhqwimY3p84NvHbwFnQFFlVIrzImDoYPuLoQwrUAahDZGsdgMZ51apV
-LsI6TJr7WmTxJEGZSQq7iRC6Kf+XyV7/Qa/1wPR0iy90O0/4yNkzlQIoRoIPUK7+
-MMxVRpFaUpwJwIpNA3WID0JTeDaJ2YT9OFLgUeS/N0B2lIp5ClPktl71LJkwpv4C
-oie3XK/NlMnqzjcF/dvCwDhsSHE1a6eSOJTHeP8y49js+sV4i4wcl0Inbf+8+EOh
-DzZqtIw6JsdQP1xYSJp98NUDw6qHGVfuUGUNLW1KeKmwsio=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.utpa.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.utpa.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas-Pan American</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas-Pan American</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utpa.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Frank Zecca</md:GivenName>
-    <md:EmailAddress>zecca@utpa.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jaime Nunez</md:GivenName>
-    <md:EmailAddress>jnunez@utpa.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Helpdesk</md:GivenName>
-    <md:EmailAddress>helpdesk@utpa.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f44197a2..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp1.uwaterloo.ca/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">uwaterloo.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.uwaterloo.ca/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.uwaterloo.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.uwaterloo.ca/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">uwaterloo.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.uwaterloo.ca/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.uwaterloo.ca/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">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 contactType="technical">
-    <md:GivenName>Sean</md:GivenName>
-    <md:SurName>Mason</md:SurName>
-    <md:EmailAddress>watiam@uwaterloo.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f9a28057..00000000
--- a/swamid-interfederations-2.0/idp2-1.slu.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://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>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-1.slu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2-1.slu.se/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2-1.slu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slu.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2-1.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2-1.slu.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">Swedish University of Agricultural Science</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.slu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Swedish University of Agricultural Science</md:Company>
-    <md:SurName>Bengt Norman</md:SurName>
-    <md:EmailAddress>saml-admins@slu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 81 22</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Swedish University of Agricultural Science</md:Company>
-    <md:SurName>Ivan Clegg</md:SurName>
-    <md:EmailAddress>saml-admins@slu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 70 2413737</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Swedish University of Agricultural Science</md:Company>
-    <md:SurName>IT-stöd</md:SurName>
-    <md:EmailAddress>mailto:IT-stod@slu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 18 67 66 00</md:TelephoneNumber>
-  </md: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 cae876bb..00000000
--- a/swamid-interfederations-2.0/idp2.civ.cvut.cz-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://idp2.civ.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-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>
-  <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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFSDCCBDCgAwIBAgIQBXyYdVS7UxZI1dayu2ZXbDANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTExMTMwMDAwMDBaFw0xODExMjExMjAwMDBaMIGOMQswCQYDVQQG
-EwJDWjEdMBsGA1UECAwUSGxhdm7DrSBtxJtzdG8gUHJhaGExEDAOBgNVBAcTB1By
-YWhhIDYxMzAxBgNVBAoMKsSMZXNrw6kgdnlzb2vDqSB1xI1lbsOtIHRlY2huaWNr
-w6kgdiBQcmF6ZTEZMBcGA1UEAxMQaWRwMi5jaXYuY3Z1dC5jejCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKFi5O/MIGOQ7k41iOHwDzkOIJL/0F5TZyR6
-sTBSLWTOlTo5JIeaWj4vcL6Vww6kbnV9uQci/8eEOSrnI9DHrfA59vjgcH67PE1E
-zEhgCaCfrcNT1RnLBsb0OgyXay9sfr/Ylq0UORDTyPNSp8zDOPpwzvcz5dmfQ4uO
-OP1R6H5h1BPJ0MlRaTtnuIaNQ71nUHmy0UWQc2dJTqf0xEXUSzbr28LD9TlaJjm9
-oPdnwPxPGUvc5YjxAe5ElH179C/rIkxaz0313LwOrYWEdNn0KNJ6mRkD4Xcj0MiJ
-VD201Gjw6nSWnXLvfqOPxpv+vfKpnGnAUzBaMySV0spSVkU/iUECAwEAAaOCAckw
-ggHFMB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBQ5
-zJX+DRBUzFYzzJTV7wxCcFZTOTAbBgNVHREEFDASghBpZHAyLmNpdi5jdnV0LmN6
-MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-awYDVR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVO
-QVNTTENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJF
-TkFTU0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUH
-AgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsG
-AQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29t
-MDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5B
-U1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAEdk6P
-HL6Vy1eHvc76Rvsdf1eeZYgQhC83Mu3Jl7YdJ3Gn0e9/Ae2uFUI3ojr0OUEqyLNy
-QyeDENJQ0bmn8N10sXxSSx4kTXe+FXjpCk/voBuAwIkm1e00/xmgfWLq40FVmZTe
-A4+h8NYs+ZVSDvLlBnsSj9urq61ARMT3jGlNeTzC0V+6CE9SizLKMJ1c5/jNzGM0
-V9zEp+fa293vqzGiIWE+Jk982d31nGCZR1WdrPcjGd2s3oEPc09v+pn5TTdHEeo+
-ANYmEJCunBeqEsRfmPxWNVpqZB+YKKqbDRGVQpSJUN8ck7lFolqJBnncLaNXBJP3
-EL3PvAXtdbMpcuHB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://idp2.civ.cvut.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.civ.cvut.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.civ.cvut.cz/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">cvut.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFSDCCBDCgAwIBAgIQBXyYdVS7UxZI1dayu2ZXbDANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTExMTMwMDAwMDBaFw0xODExMjExMjAwMDBaMIGOMQswCQYDVQQG
-EwJDWjEdMBsGA1UECAwUSGxhdm7DrSBtxJtzdG8gUHJhaGExEDAOBgNVBAcTB1By
-YWhhIDYxMzAxBgNVBAoMKsSMZXNrw6kgdnlzb2vDqSB1xI1lbsOtIHRlY2huaWNr
-w6kgdiBQcmF6ZTEZMBcGA1UEAxMQaWRwMi5jaXYuY3Z1dC5jejCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKFi5O/MIGOQ7k41iOHwDzkOIJL/0F5TZyR6
-sTBSLWTOlTo5JIeaWj4vcL6Vww6kbnV9uQci/8eEOSrnI9DHrfA59vjgcH67PE1E
-zEhgCaCfrcNT1RnLBsb0OgyXay9sfr/Ylq0UORDTyPNSp8zDOPpwzvcz5dmfQ4uO
-OP1R6H5h1BPJ0MlRaTtnuIaNQ71nUHmy0UWQc2dJTqf0xEXUSzbr28LD9TlaJjm9
-oPdnwPxPGUvc5YjxAe5ElH179C/rIkxaz0313LwOrYWEdNn0KNJ6mRkD4Xcj0MiJ
-VD201Gjw6nSWnXLvfqOPxpv+vfKpnGnAUzBaMySV0spSVkU/iUECAwEAAaOCAckw
-ggHFMB8GA1UdIwQYMBaAFGf9iCAUJ5jHCdIlGbvpURFjdVBiMB0GA1UdDgQWBBQ5
-zJX+DRBUzFYzzJTV7wxCcFZTOTAbBgNVHREEFDASghBpZHAyLmNpdi5jdnV0LmN6
-MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-awYDVR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVO
-QVNTTENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJF
-TkFTU0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUH
-AgEWHGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsG
-AQUFBwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29t
-MDgGCCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5B
-U1NMQ0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQAEdk6P
-HL6Vy1eHvc76Rvsdf1eeZYgQhC83Mu3Jl7YdJ3Gn0e9/Ae2uFUI3ojr0OUEqyLNy
-QyeDENJQ0bmn8N10sXxSSx4kTXe+FXjpCk/voBuAwIkm1e00/xmgfWLq40FVmZTe
-A4+h8NYs+ZVSDvLlBnsSj9urq61ARMT3jGlNeTzC0V+6CE9SizLKMJ1c5/jNzGM0
-V9zEp+fa293vqzGiIWE+Jk982d31nGCZR1WdrPcjGd2s3oEPc09v+pn5TTdHEeo+
-ANYmEJCunBeqEsRfmPxWNVpqZB+YKKqbDRGVQpSJUN8ck7lFolqJBnncLaNXBJP3
-EL3PvAXtdbMpcuHB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.civ.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.civ.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: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</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>Petr</md:GivenName>
-    <md:SurName>Strupl</md:SurName>
-    <md:EmailAddress>strupl@vc.cvut.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e92089e7..00000000
--- a/swamid-interfederations-2.0/idp2.civ.cvut.cz.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:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp2.civ.cvut.cz/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">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 071411d4..00000000
--- a/swamid-interfederations-2.0/idp2.crous-toulouse.fr-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://idp2.crous-toulouse.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Toulouse - Personnels</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABuElEQVQoz3WST2sTURTFz3kzTVuaZjRpUxOrSNXQoiAIQsG14MqdfgfBD+DSlSh+Eb+Bol0UpJiFuHShklhjm3TSziQZXOTPvONikjrjn7t7l/u759x7H3f36piFAAJmMoydeU4TAIlUmPSDAgTP/7j17gkogcoU/wXAAMRqY6fcfO0Of4qCEpX/AdLioFVuvrUmN84tGQAwRsoCSRdJEG18tf7C2FGndm9qnbJ/zEACoEhaW3v/dLHfjFavNW4+dATBTAdLhWtnqeWTT2Hl1uHm/YXa7cueJyAMg5OwBwL4LcLdvTpEURRgcONCceHNszieLD14rsJax/c/f91Pq7iJ0aTL+co579VjfHiJzTtDv3HYmxx1u6BNj+2m/ZW8M3ZjO9h+1HZKYbcvHHB6OgKQRDIDkPqyfrdzHJJ9CASB2NKc7l5S5g6j8aRSqRoSgggwFsyc45z1vFOdDNA+8gvL+Ssbl2BICTC5Off6Vo2pU2QsBYOoddC+uF4t5PPHQTify62sFAeDKAhD/RMwYnO/1Y+i6lq5VCqOR6Nv33+0Oz5mEpIyACgJQdALgh4gkFLyRQgo2dIvHcfGvrPn81kAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDC1da7rAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjMwKzAyOjAwxCgWVwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-toulouse.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Toulouse - Personnels</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>
-					      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>
-    </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-POST" Location="https://idp2.crous-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.crous-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.crous-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Toulouse - Personnels</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Toulouse - Personnels</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-toulouse.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>systeme.reseau@crous-toulouse.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml b/swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.xml
deleted file mode 100644
index d73c06b7..00000000
--- a/swamid-interfederations-2.0/idp2.dcu.ie-idp-profile-Metadata-SAML.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://idp2.dcu.ie/idp/profile/Metadata/SAML">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-06T21:00:00Z"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dcu.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dublin City University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.dcu.ie</mdui:InformationURL>
-        <mdui:Logo height="102" width="150">https://edugate.heanet.ie/rr3/logos/dcu.png</mdui:Logo>
-        <mdui:Logo height="102" width="150" xml:lang="en">data:image/png;base64,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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.385325,-6.257143</mdui:GeolocationHint>
-        <mdui:DomainHint>dcu.ie</mdui:DomainHint>
-        <mdui:IPHint>136.206.0.0/16</mdui:IPHint>
-        <mdui:IPHint>193.1.192.0/25</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUOQ3lfJ+Ec4wFEuvh3raF7kmMtUQwDQYJKoZIhvcNAQEF
-BQAwFTETMBEGA1UEAxMKaWRwLmRjdS5pZTAeFw0wOTA3MTcxMTQwNDZaFw0yOTA3
-MTcxMTQwNDZaMBUxEzARBgNVBAMTCmlkcC5kY3UuaWUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCADZFUTMBENyEv2jwnRDh9gSOYZfHUfndWcFHasU3S
-DqH5j/jA6jL4hqJNnzokDcMRr6veGwKLQ93fXbOHfHvNYGM/6b3V/wpZUqH4OPUY
-zmjJdP2EgJ2bq6Tx0uLQ/trbKqweGgXkzTcRNBtC3qItUddv8eXi1IrXHsAOFX+8
-b3IXXh1VrcHvrt8+WaAwnGDMmTGxUkOPYnmPef3rKA5gYQglVH8f8fKuPIDsKAUS
-XXTqniiU4TUcguCTQ/RrGvJgFyjtNK8loL8LcpLq9FoCjaQ/5iEt0xHPc2fHzJmc
-9VOEcH+RVazhCy9yx3uCI8ID4ZB3mQsce5F75POyVzGhAgMBAAGjWzBZMDgGA1Ud
-EQQxMC+CCmlkcC5kY3UuaWWGIWh0dHBzOi8vaWRwLmRjdS5pZS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU++/qpuKky0Mag89lImDpPqFodkgwDQYJKoZIhvcNAQEF
-BQADggEBAG9D2HEMKqoKl/g+i0TrATEGkTf0bJuy1oWUxSNzFdzWqeGkZrZS9bmg
-fDsBhb5ETAnYfxwDHMGytK1a25wKL0nLHcQkGY/Rq3Epi/4FO2j8HzfavhkL4e81
-sbH1fWkpuYR0gxIcNQ4O8MCRT8KOd1RlEfPfGaG3aUuuG/6CmTT6kP32a6Wo4wQA
-gDMveZoQEcHqkqVGocb2Mu4fKzSzXH9hAbrUC3RPB7EaJtGhAiQ7dNHR50i1B26n
-1Ig0IsXth908GfvXb4d6qmavTSjAQKLHl64ujQTxSF8oz2wbFcGMsgXu9yb/s+KF
-3JP0HYE1idr7BJ2F14eWlzQIorChnzE=
-</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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dcu.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dcu.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.dcu.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Dublin City University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Dublin City University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dcu.ie/iss/contact.shtml</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>DCU ISS</md:GivenName>
-    <md:SurName>Systems Group</md:SurName>
-    <md:EmailAddress>mailto:sysops@dcu.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Fergus</md:GivenName>
-    <md:SurName>Donohue</md:SurName>
-    <md:EmailAddress>mailto:fergus.donohue@dcu.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>John</md:GivenName>
-    <md:SurName>Doyle</md:SurName>
-    <md:EmailAddress>mailto:john.l.doyle@dcu.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.gru.edu-8443-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/idp2.gru.edu-8443-nidp-saml2-metadata.xml
deleted file mode 100644
index 3b858e99..00000000
--- a/swamid-interfederations-2.0/idp2.gru.edu-8443-nidp-saml2-metadata.xml
+++ /dev/null
@@ -1,107 +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://idp2.gru.edu:8443/nidp/saml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">gru.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Georgia Regents University</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>
-MIIFKDCCBBCgAwIBAgIkAhwR/6b9LHsJhchf/U62SIos3yjxeaQepg3W+ThWAgIWC6J5MA0GCSqG
-SIb3DQEBBQUAMDQxGjAYBgNVBAsTEU9yZ2FuaXphdGlvbmFsIENBMRYwFAYDVQQKFA1uYW1faWRz
-M190cmVlMB4XDTE0MDcyMDE0NDg1MFoXDTI0MDcyMDE0NDg1MFowQDEVMBMGA1UEAxMMdGVzdC1z
-aWduaW5nMRYwFAYDVQQLEw1hY2Nlc3NNYW5hZ2VyMQ8wDQYDVQQKEwZub3ZlbGwwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHCv4366UBN985Gd6N8kvQYAcGudsyIU028OQi4snM+LCS
-ZHY6TqW/OYxDQ05zBpJR1EIxBWHV7FDV/PKPpGbc/pb4j/L88dU8T7b7o0+aTIjdormnnCkIz/jM
-hpazu/GD21RtEL7/DY1t/DKholPOTLMJ8eVQsjFuHFwJWWsuu7pt2e3/NwBcz4wrZVDz/7ugCd0g
-D7U+ogTiI9SSEfNGNYip9oTRDQmL/dEPDLuUgPTq0cRCluIOXI/JwEm0GC7h9KdhEEvn+5EXRkv8
-Ygn2Hk71S8TsVW+VXJPUtZEj+gOd+GaEpA7tItl08Y9I96H11qqHdLKl5aPDnwp/3sf1AgMBAAGj
-ggIUMIICEDAdBgNVHQ4EFgQU1upj1Ecop5UfpwsitEW/C8wK8HowHwYDVR0jBBgwFoAUzcbO+8jk
-GKaWpNswReA8nDxE07owggHMBgtghkgBhvg3AQkEAQSCAbswggG3BAIBAAEB/xMdTm92ZWxsIFNl
-Y3VyaXR5IEF0dHJpYnV0ZSh0bSkWQ2h0dHA6Ly9kZXZlbG9wZXIubm92ZWxsLmNvbS9yZXBvc2l0
-b3J5L2F0dHJpYnV0ZXMvY2VydGF0dHJzX3YxMC5odG0wggFIoBoBAQAwCDAGAgEBAgFGMAgwBgIB
-AQIBCgIBaaEaAQEAMAgwBgIBAQIBADAIMAYCAQECAQACAQCiBgIBFwEB/6OCAQSgWAIBAgICAP8C
-AQADDQCAAAAAAAAAAAAAAAADCQCAAAAAAAAAADAYMBACAQACCH//////////AQEAAgQG8N9IMBgw
-EAIBAAIIf/////////8BAQACBAbw30ihWAIBAgICAP8CAQADDQBAAAAAAAAAAAAAAAADCQBAAAAA
-AAAAADAYMBACAQACCH//////////AQEAAgQR/6b9MBgwEAIBAAIIf/////////8BAQACBBH/pv2i
-TjBMAgECAgEAAgIA/wMNAIAAAAAAAAAAAAAAAAMJAIAAAAAAAAAAMBIwEAIBAAIIf/////////8B
-AQAwEjAQAgEAAgh//////////wEBADANBgkqhkiG9w0BAQUFAAOCAQEAdHQUFXUQmzNThUMHD4la
-egh/h3pVHZtzOTVBZTf3AveGTiQknXhJBcipXR3CMZeP2PtTSVMl3/khKuASCJ8usFN9l/AOYOHl
-QDrouIzAFHrZodzzDS0ON4BXoh4guQgDvMCM+8dsBpcs37dnVzNRiRlkvomHjX5PyBFTGGN6beRc
-oJwXy2BWfVrnVxbKi0TwLFy50Dl9yZZiXBwPTS69p3eEFHr+/06bdOce9Udvr7wszrppZ6TKYZ5c
-pDORgv1sOCLPJx9QBBpvZGcqkgCgr7aOmUhDGQKjkY0nZccr/KZKNCsvK365gVXzm1U0rhBXYgfH
-/HVKXx18VMnABE/LWQ==
-          </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>
-MIIGpDCCBYygAwIBAgIQDnlMzdtA7AtWaWmu4CUqHzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSUw
-IwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBDQS0zMB4XDTEzMDUxMzAwMDAwMFoXDTE2
-MDcyMDEyMDAwMFowajELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0dlb3JnaWExEDAOBgNVBAcTB0F1
-Z3VzdGExIzAhBgNVBAoTGkdlb3JnaWEgUmVnZW50cyBVbml2ZXJzaXR5MRIwEAYDVQQDDAkqLmdy
-dS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3Yunp0tVlsV8n7WMWTBDCg6aO
-1agwORANswHC3nc7/FOHgwG5+Hn9zr269ajfMf9TXMSeSngTt/T7Kh2OGRBRL4H/eIXIcaGihebi
-dbKh4jSroLEXVKxjejJWoFMEAWVtXFyGavjPK7BDSL6vY/0R1Z3ROInw83KdCOOJQdb8/4fukplK
-VmXiLoo80b7/IfoAyxjQnJU5PO8e1AbY2+uaH9pG3aCfiJ58pj4N83n4+e9zVKsJS+zThHvy5u/X
-xQhHWM03E4Hpb3Gd6B87tFRmr1s4xPMiKA6NoJcd4xMQg4h+Te9nWLzgGVRJoY8Nc9IEAt5H1FmY
-gvxSBNpj3dEHAgMBAAGjggNIMIIDRDAfBgNVHSMEGDAWgBRQ6nOJ2yn7EI+e5QEg1N55mUiD9zAd
-BgNVHQ4EFgQUwpiqildtS28FceLoilJIO3kqgwIwHQYDVR0RBBYwFIIJKi5ncnUuZWR1ggdncnUu
-ZWR1MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwYQYDVR0f
-BFowWDAqoCigJoYkaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL2NhMy1nMjEuY3JsMCqgKKAmhiRo
-dHRwOi8vY3JsNC5kaWdpY2VydC5jb20vY2EzLWcyMS5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMG
-CWCGSAGG/WwBATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1j
-cHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABv
-AGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQA
-ZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0
-ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQA
-eQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBp
-AGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUA
-cgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wewYIKwYBBQUHAQEEbzBtMCQGCCsG
-AQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRQYIKwYBBQUHMAKGOWh0dHA6Ly9jYWNl
-cnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VDQS0zLmNydDAMBgNVHRMBAf8E
-AjAAMA0GCSqGSIb3DQEBBQUAA4IBAQAfcjd/VVUMbEAj/yVXeVJ0ViRUam/VXLvJCLBhWIsQJyc5
-F8YuZojGGIM+YNDsBLWkAbchpm+7rr54cvGm1kg5Ti/rlAR04CY3mDpaVUXnk8ZysLMOqfZFoTFF
-wdF6J1Z4VTQRICXOrBHQjQ2ZrOsT5ZxZzX6lu+MuJwGgB7TphYasMCCN7/DAz/rtfvwUbNM2YphJ
-3BTrEEj8AYx3srpJRPNmfIkDoaGQ/QoLi9dfk2V48JmGgvjYadhqUFIPJ1CSCecwg4G4qpUzaQxN
-q+CoJC6DRoD3IPR6qFsCf1O/G4voSVmiFrxyw38A/vWnmpeo7+GlTqrLjGejplL1AgIw
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.gru.edu:8443/nidp/saml2/spsoap" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.gru.edu:8443/nidp/saml2/slo"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.gru.edu:8443/nidp/saml2/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.gru.edu:8443/nidp/saml2/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.gru.edu:8443/nidp/saml2/soap"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Georgia Regents University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Georgia Regents University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gru.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Doogie Howser</md:GivenName>
-    <md:EmailAddress>dhowser@gru.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Danny Blair</md:GivenName>
-    <md:EmailAddress>dblair@gru.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hig.se-idp-shibboleth.xml
deleted file mode 100644
index 0219febc..00000000
--- a/swamid-interfederations-2.0/idp2.hig.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.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>
-  <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">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 (Alumni)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Gävle (Alumni)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för alumni vid Högskolan i Gävle.</mdui:Description>
-        <mdui:Description xml:lang="en">The University of Gävle Identity Provider is used by alumni 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:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUaqsj1o+jLwRHcAiw/jp5mMglxLUwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwMi5oaWcuc2UwHhcNMTEwMjA4MTUxOTIyWhcNMzEw
-MjA4MTUxOTIyWjAWMRQwEgYDVQQDEwtpZHAyLmhpZy5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJ4NMnKvGahwhiZDXxwLfT0oeF/rB72jAVBF9Um9
-ExFcSJ/8yb6o0knwpY/uQgFppiUgAvcDKeKN9rBZRq+//jL+8CowII7eOFuR5h+s
-yzAn6YIcPcSx8QBK3lDb+dIwJ7aEnXlgt5tEZneTL0IILXu2zquGRm3rH7YhCHIM
-9v51sjnjd8MXujpG0yIFre3DovnBs4i68ZhoDg7QtvxUz3w/2GTZN+AUB3BA0u12
-FNtJ1n2f/fZwxnJnBCPm2sENAYYKB7/43TJtZazf5ZYA80J9wdQWrdWyve5S+FSZ
-AdLdcdrMZB5c8g6lwPWBRluFjEAbMZMj3AlYpLf2Ybn9yKUCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwMi5oaWcuc2WGImh0dHBzOi8vaWRwMi5oaWcuc2UvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFCrv7yyvoIy+UhKGYDIB1kTI5T1eMA0GCSqGSIb3
-DQEBBQUAA4IBAQBEXm+ozOM0JC9Fx2QLbYwFbZ5gsBUm2liprjQ1cj65Z+z3w2fs
-hxouOOEyTGuP61J5O29nDDChcWNXMlUyv+HG1nndJ4vsPmhUEYsMNAZwZZ+JoD5g
-oEekdgF8avmF0KNfZc+qMOGUz4qrrmMZ6w4F21xba2fFdfSQrubk1F2D/U0ZKw6A
-NYTerCYAEcAVG7c8Eh/5fQXjpf1pZDV1mtPQPnIlF/R6jXgINXDmFOMd0Ei4/C2H
-FC8se9RzTAIwV0P7WorYzwt95Xa9K8DDeLxjheJ3inQR07CD2unOV67Sp5YEfM61
-aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hig.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hig.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.hig.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.hig.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.hig.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.hig.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">hig.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUaqsj1o+jLwRHcAiw/jp5mMglxLUwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLaWRwMi5oaWcuc2UwHhcNMTEwMjA4MTUxOTIyWhcNMzEw
-MjA4MTUxOTIyWjAWMRQwEgYDVQQDEwtpZHAyLmhpZy5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJ4NMnKvGahwhiZDXxwLfT0oeF/rB72jAVBF9Um9
-ExFcSJ/8yb6o0knwpY/uQgFppiUgAvcDKeKN9rBZRq+//jL+8CowII7eOFuR5h+s
-yzAn6YIcPcSx8QBK3lDb+dIwJ7aEnXlgt5tEZneTL0IILXu2zquGRm3rH7YhCHIM
-9v51sjnjd8MXujpG0yIFre3DovnBs4i68ZhoDg7QtvxUz3w/2GTZN+AUB3BA0u12
-FNtJ1n2f/fZwxnJnBCPm2sENAYYKB7/43TJtZazf5ZYA80J9wdQWrdWyve5S+FSZ
-AdLdcdrMZB5c8g6lwPWBRluFjEAbMZMj3AlYpLf2Ybn9yKUCAwEAAaNdMFswOgYD
-VR0RBDMwMYILaWRwMi5oaWcuc2WGImh0dHBzOi8vaWRwMi5oaWcuc2UvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFCrv7yyvoIy+UhKGYDIB1kTI5T1eMA0GCSqGSIb3
-DQEBBQUAA4IBAQBEXm+ozOM0JC9Fx2QLbYwFbZ5gsBUm2liprjQ1cj65Z+z3w2fs
-hxouOOEyTGuP61J5O29nDDChcWNXMlUyv+HG1nndJ4vsPmhUEYsMNAZwZZ+JoD5g
-oEekdgF8avmF0KNfZc+qMOGUz4qrrmMZ6w4F21xba2fFdfSQrubk1F2D/U0ZKw6A
-NYTerCYAEcAVG7c8Eh/5fQXjpf1pZDV1mtPQPnIlF/R6jXgINXDmFOMd0Ei4/C2H
-FC8se9RzTAIwV0P7WorYzwt95Xa9K8DDeLxjheJ3inQR07CD2unOV67Sp5YEfM61
-aaB0gTNGMOhF/MSYfiM8SNzVxiYnaE8rwQZK
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hig.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hig.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">HIGALUMNI</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Gävle (Alumni)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gävle (Alumni)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hig.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Gävle (Alumni)</md:Company>
-    <md:SurName>Network Operations</md:SurName>
-    <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Gävle (Alumni)</md:Company>
-    <md:SurName>Network Operations</md:SurName>
-    <md:EmailAddress>mailto:nat@hig.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Gävle (Alumni)</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@hig.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 26 648500</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.hs-furtwangen.de.xml b/swamid-interfederations-2.0/idp2.hs-furtwangen.de.xml
deleted file mode 100644
index ae8cc492..00000000
--- a/swamid-interfederations-2.0/idp2.hs-furtwangen.de.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.hs-furtwangen.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-furtwangen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp1.hs-furtwangen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp1.hs-furtwangen.de,OU=IMZ Online Services,O=Hochschule Furtwangen,L=Furtwangen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEEQ2cbjANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgRnVydHdhbmdlbjEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEVMBMGA1UEAxMMSEZVIENBIC0gRzAxMSYwJAYJKoZIhvcNAQkB
-Fhdwa2ktY2FAaHMtZnVydHdhbmdlbi5kZTAeFw0xMDExMjUwODMxMjZaFw0xNTEx
-MjQwODMxMjZaMIGdMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0
-ZW1iZXJnMRMwEQYDVQQHEwpGdXJ0d2FuZ2VuMR4wHAYDVQQKExVIb2Noc2NodWxl
-IEZ1cnR3YW5nZW4xHDAaBgNVBAsTE0lNWiBPbmxpbmUgU2VydmljZXMxHjAcBgNV
-BAMTFWlkcDEuaHMtZnVydHdhbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAN/DtMWE2NZ28wx5D5a7VWQt93uqOLxGna3La/S6bRaH4Pb5mXp9
-KZ3zhOPgEDu6rJOTdozxf1QIqbbEza1/KTOlTGEYaQdWv+79T5mGdphWTeK4ZVwo
-OaGa2oW281S+308w8od3i1usLOKOta8CK4Nf6LOg0Fm9j6Ao8im5H57a2qWH39F0
-CTVI0C4CqSs3E6S7IL6Igw2ALqHNaNNMrG/qhBzuog8NxtP5fQ3HyqMkUOXp41vC
-I2fRsLdgmSK9TcicnHVwSTzl27M+vdJWa9I8UU3BmF7THFPf6s6xUAoUSct90i50
-+t3tC/jSxAP5Rz3K4MNF4O92Vfmxpe0Kb7cCAwEAAaOCAaowggGmMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRy
-xqH1eqbqPFzkq5yMNTcceRDqbTAfBgNVHSMEGDAWgBRocBANyS1zBvmIGD6fi4zt
-KQAWxzCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2hzLWZ1cnR3YW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdh
-bmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-ALfPtsm64YKIILAqIrXPIKHdH/ZtJbX9KACLfDd+QxFMl1v5uPmJezZAFF5pNdZB
-9zq0oLMYJxRKdCOieBeWOqxwGRKn9VcUI3xADWL/C8f4ixa4F55Ub2mmXkZsmHTj
-OCGXyOXBOAB2dWQrki760/v5hqn1gdwqfYg/Eg0ZvH2PXZ+iJdTWKWEsxDi9umVq
-DZqDtavE4cJ4iZxjwCwrXVk5ggRX3bGLH36z6bZomjimO517aTqdmb5x+dikUGN6
-6542rAsxL8h3HwCUM9IHGOfjr1o3t812E7E5lDTNE067YSdHJCdbQRM4efmnjSJW
-VcZhsLWUIB6RV8IBFSlHz50=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hs-furtwangen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hs-furtwangen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.hs-furtwangen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hs-furtwangen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.hs-furtwangen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hs-furtwangen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-furtwangen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp1.hs-furtwangen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp1.hs-furtwangen.de,OU=IMZ Online Services,O=Hochschule Furtwangen,L=Furtwangen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEEQ2cbjANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgRnVydHdhbmdlbjEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEVMBMGA1UEAxMMSEZVIENBIC0gRzAxMSYwJAYJKoZIhvcNAQkB
-Fhdwa2ktY2FAaHMtZnVydHdhbmdlbi5kZTAeFw0xMDExMjUwODMxMjZaFw0xNTEx
-MjQwODMxMjZaMIGdMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0
-ZW1iZXJnMRMwEQYDVQQHEwpGdXJ0d2FuZ2VuMR4wHAYDVQQKExVIb2Noc2NodWxl
-IEZ1cnR3YW5nZW4xHDAaBgNVBAsTE0lNWiBPbmxpbmUgU2VydmljZXMxHjAcBgNV
-BAMTFWlkcDEuaHMtZnVydHdhbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAN/DtMWE2NZ28wx5D5a7VWQt93uqOLxGna3La/S6bRaH4Pb5mXp9
-KZ3zhOPgEDu6rJOTdozxf1QIqbbEza1/KTOlTGEYaQdWv+79T5mGdphWTeK4ZVwo
-OaGa2oW281S+308w8od3i1usLOKOta8CK4Nf6LOg0Fm9j6Ao8im5H57a2qWH39F0
-CTVI0C4CqSs3E6S7IL6Igw2ALqHNaNNMrG/qhBzuog8NxtP5fQ3HyqMkUOXp41vC
-I2fRsLdgmSK9TcicnHVwSTzl27M+vdJWa9I8UU3BmF7THFPf6s6xUAoUSct90i50
-+t3tC/jSxAP5Rz3K4MNF4O92Vfmxpe0Kb7cCAwEAAaOCAaowggGmMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRy
-xqH1eqbqPFzkq5yMNTcceRDqbTAfBgNVHSMEGDAWgBRocBANyS1zBvmIGD6fi4zt
-KQAWxzCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2hzLWZ1cnR3YW5nZW4tY2EvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5j
-cnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdh
-bmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-ALfPtsm64YKIILAqIrXPIKHdH/ZtJbX9KACLfDd+QxFMl1v5uPmJezZAFF5pNdZB
-9zq0oLMYJxRKdCOieBeWOqxwGRKn9VcUI3xADWL/C8f4ixa4F55Ub2mmXkZsmHTj
-OCGXyOXBOAB2dWQrki760/v5hqn1gdwqfYg/Eg0ZvH2PXZ+iJdTWKWEsxDi9umVq
-DZqDtavE4cJ4iZxjwCwrXVk5ggRX3bGLH36z6bZomjimO517aTqdmb5x+dikUGN6
-6542rAsxL8h3HwCUM9IHGOfjr1o3t812E7E5lDTNE067YSdHJCdbQRM4efmnjSJW
-VcZhsLWUIB6RV8IBFSlHz50=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hs-furtwangen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hs-furtwangen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Furtwangen University -IdP 1</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Furtwangen University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-furtwangen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Hendrik</GivenName>
-    <SurName>Kuijs</SurName>
-    <EmailAddress>kuijs@hs-furtwangen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Bernhard</GivenName>
-    <SurName>Czmiel</SurName>
-    <EmailAddress>czmiel@hs-furtwangen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml
deleted file mode 100644
index 2a575de4..00000000
--- a/swamid-interfederations-2.0/idp2.hua.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.hua.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">hua.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Harokopio University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.hua.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.hua.gr/</mdui:InformationURL>
-        <mdui:Logo width="83" height="81">https://idp.hua.gr/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>195.130.90.0/23</mdui:IPHint>
-        <mdui:IPHint>195.251.30.0/23</mdui:IPHint>
-        <mdui:IPHint>83.212.240.0/23</mdui:IPHint>
-        <mdui:IPHint>83.212.242.0/24</mdui:IPHint>
-        <mdui:DomainHint>hua.gr</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:37.96118327,23.70823603</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>
-                            MIIEmzCCA4OgAwIBAgIRANQlWe4RJ07BgbSF+F+w/jEwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMTA1MzEwMDAwMDBaFw0xNDA1MzAyMzU5NTlaMG0xCzAJBgNV
-                            BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEnMCUGA1UE
-                            ChMeSGFyb2tvcGlvIFVuaXZlcnNpdHkgb2YgQXRoZW5zMRMwEQYDVQQDEwppZHAu
-                            aHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAruot1FGyNNP7
-                            VdnQMt3didkog3AguzGJ/9oB4MDnWeskNIIPW/X4FKDHhICwO7nKD/jPoYS2xrBp
-                            74VOXW8u3RL7H554E3fFXJMi00MN294Ba3vi02nuCNFwdY7HTxFaCOzZaAhG5kYa
-                            TWypaQw0W87HIaVVgvjnhvf1PPJCMi+YBMvnmXNasSs57N40BfJBLDgto/UBWK/2
-                            Pgx/zvUvL7Hln/a79ehlsaH+aT5ewllpO+yVde2rC9R1sJMFAStOLhtOL7JlKkEJ
-                            AQPtjEqBiJZlYgbGNNe9F1ikfCcdmzt33y2T8gyUTxbPRve1PEEjcPYLNnmAkK13
-                            TPvft0w/lQIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-                            6pDjue0wHQYDVR0OBBYEFBJc0q0dwVcOZFxUxHnpldmmeM88MA4GA1UdDwEB/wQE
-                            AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-                            AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
-                            dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
-                            BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
-                            RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
-                            bmEub3JnMCMGA1UdEQQcMBqCCmlkcC5odWEuZ3KCDGxvZ2luLmh1YS5ncjANBgkq
-                            hkiG9w0BAQUFAAOCAQEAbfA5ENIlPCsvxmQuMVGL/mnwO1MDKYpij/1DywTO+JBS
-                            I65ViCF0Irv4Vpuc9bVIL/nC/9zlUpcWFC1Rvq4BdSTZwnYVJsq71r8g78ZbFY6u
-                            nsogzG6sspPj77HYXbUcUnz+DwmgPPHTNKikhPXenQSMIgTGkZRKaEj6CbhTWxpU
-                            9y43i3EObg6zxcqwyIaawldvSwKTBbUuiepWzDASHeGBW4r2uLPHnNc6gwPwdei5
-                            mBFTKd3S15BA5RiJ2Z+u1X5fzgGuyyEI5VnAdC7SBqhh7bm90mVoHLoWjTS378xQ
-                            Oy3Soy1kO0DpSfaKXP7Ss8TN2ndbGpO1UhaBeVwMTg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hua.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hua.gr: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.hua.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hua.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hua.gr/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">hua.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEmzCCA4OgAwIBAgIRANQlWe4RJ07BgbSF+F+w/jEwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMTA1MzEwMDAwMDBaFw0xNDA1MzAyMzU5NTlaMG0xCzAJBgNV
-                            BAYTAkdSMQ8wDQYDVQQIEwZBdHRpa2kxDzANBgNVBAcTBkF0aGVuczEnMCUGA1UE
-                            ChMeSGFyb2tvcGlvIFVuaXZlcnNpdHkgb2YgQXRoZW5zMRMwEQYDVQQDEwppZHAu
-                            aHVhLmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAruot1FGyNNP7
-                            VdnQMt3didkog3AguzGJ/9oB4MDnWeskNIIPW/X4FKDHhICwO7nKD/jPoYS2xrBp
-                            74VOXW8u3RL7H554E3fFXJMi00MN294Ba3vi02nuCNFwdY7HTxFaCOzZaAhG5kYa
-                            TWypaQw0W87HIaVVgvjnhvf1PPJCMi+YBMvnmXNasSs57N40BfJBLDgto/UBWK/2
-                            Pgx/zvUvL7Hln/a79ehlsaH+aT5ewllpO+yVde2rC9R1sJMFAStOLhtOL7JlKkEJ
-                            AQPtjEqBiJZlYgbGNNe9F1ikfCcdmzt33y2T8gyUTxbPRve1PEEjcPYLNnmAkK13
-                            TPvft0w/lQIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-                            6pDjue0wHQYDVR0OBBYEFBJc0q0dwVcOZFxUxHnpldmmeM88MA4GA1UdDwEB/wQE
-                            AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-                            AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
-                            dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
-                            BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
-                            RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
-                            bmEub3JnMCMGA1UdEQQcMBqCCmlkcC5odWEuZ3KCDGxvZ2luLmh1YS5ncjANBgkq
-                            hkiG9w0BAQUFAAOCAQEAbfA5ENIlPCsvxmQuMVGL/mnwO1MDKYpij/1DywTO+JBS
-                            I65ViCF0Irv4Vpuc9bVIL/nC/9zlUpcWFC1Rvq4BdSTZwnYVJsq71r8g78ZbFY6u
-                            nsogzG6sspPj77HYXbUcUnz+DwmgPPHTNKikhPXenQSMIgTGkZRKaEj6CbhTWxpU
-                            9y43i3EObg6zxcqwyIaawldvSwKTBbUuiepWzDASHeGBW4r2uLPHnNc6gwPwdei5
-                            mBFTKd3S15BA5RiJ2Z+u1X5fzgGuyyEI5VnAdC7SBqhh7bm90mVoHLoWjTS378xQ
-                            Oy3Soy1kO0DpSfaKXP7Ss8TN2ndbGpO1UhaBeVwMTg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hua.gr: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">Harokopio University</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Harokopio University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Χαροκόπειο Πανεπιστήμιο</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hua.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.hua.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Konstantinos</md:GivenName>
-    <md:SurName>Piperidis</md:SurName>
-    <md:EmailAddress>kpiperidhs@hua.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Konstantinos</md:GivenName>
-    <md:SurName>Piperidis</md:SurName>
-    <md:EmailAddress>kpiperidhs@hua.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml
deleted file mode 100644
index 9a00b2af..00000000
--- a/swamid-interfederations-2.0/idp2.hv.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.hv.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">hv.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan Väst</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University West</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Högskolan Väst</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for University West</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.hv.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.hv.se/en</mdui:InformationURL>
-        <mdui:Logo height="103" width="200" xml:lang="sv">http://www.hv.se/Media/Get/17595/svensk-logotyp-200x103</mdui:Logo>
-        <mdui:Logo height="103" width="200" xml:lang="en">http://www.hv.se/Media/Get/17597/3.-engelsk-logga.jpg</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">hv högskolan+väst university+west</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hv högskolan+väst university+west</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hv.se</mdui:DomainHint>
-        <mdui:IPHint>193.10.188.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.192.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.234.0/22</mdui:IPHint>
-        <mdui:IPHint>212.25.132.0/23</mdui:IPHint>
-        <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVALAAqmf9+n0EkV7vMRq5ZDh3UVEHMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDMuc2VydmVyLmh2LnNlMB4XDTEyMTEyNjA5
-NTgyNloXDTMyMTEyNjA5NTgyNlowHzEdMBsGA1UEAxMUbHNhbWwwMy5zZXJ2ZXIu
-aHYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAwm0DgWJkMIvo
-ooXb2NlHLLPl59NDgh5MXYPBCETWU20T2voM+g2M7d5c/Jb1iMVC/kP3FYuK8Nmy
-l6o3VLSaRIENTcZTOLEjHPO301NCu6dRIgM+iwkZnZ0luUgfxEf9aBnmwA0V7vKp
-RliOzNDYmZ7FL6z6ZDh6ULjnPV6KeGd4bQIrW2ywTOirz+BGGn0UXChuOanDnEvo
-fv3Vrr1wh1bbGmr0G6w5JlSLPPKtoKG5DGRjzkq3mfiP97N6ZgI4F0e815Sbb3B7
-VLCZ/JZMRxOj9bP5Q7LhpDn0+LpmK/DS/YAs8rivg1WgKkuJgiYTOAlewyZTZT6v
-1m9x3LexAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGxzYW1sMDMuc2VydmVyLmh2LnNl
-hitodHRwczovL2xzYW1sMDMuc2VydmVyLmh2LnNlL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBR9Gm8Z5H9QjIJK2yvAM0y2i1hkpzANBgkqhkiG9w0BAQUFAAOCAQEA
-KXF5jmIhYbIVM425IZMSH9vb6Gm5R3rk0s6h4BGyeMPpLQ/ECjnwitsQFTZG2dci
-vvi4JbU8mryOVDt9NlNUtdgzbiaP3VcrkWHq7at+DsW+ipD5ioMIWZa6/hIqMU7U
-eQLX7YM4sjy3b4aa6rdTh+r2yp2GcFmpbJNhSncXA3lgH5I+BBKUgKIrLHdsdkGj
-IebD+y3AIEczoLLKVQ7W5d81Ifrh1JLJ8IVOt4S+9LUsgGJmu04NQaeQyaQcodTs
-dqEra6A3S5DN0BAWsLH3aBkA3fL/f6f3HUQwmd7dG+OUOtP+5DaB1YdeeXYMz5Wj
-aRQKNbVQdPN5ht6TrINjDQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hv.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hv.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.hv.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.hv.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.hv.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.hv.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">hv.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVALAAqmf9+n0EkV7vMRq5ZDh3UVEHMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFGxzYW1sMDMuc2VydmVyLmh2LnNlMB4XDTEyMTEyNjA5
-NTgyNloXDTMyMTEyNjA5NTgyNlowHzEdMBsGA1UEAxMUbHNhbWwwMy5zZXJ2ZXIu
-aHYuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAwm0DgWJkMIvo
-ooXb2NlHLLPl59NDgh5MXYPBCETWU20T2voM+g2M7d5c/Jb1iMVC/kP3FYuK8Nmy
-l6o3VLSaRIENTcZTOLEjHPO301NCu6dRIgM+iwkZnZ0luUgfxEf9aBnmwA0V7vKp
-RliOzNDYmZ7FL6z6ZDh6ULjnPV6KeGd4bQIrW2ywTOirz+BGGn0UXChuOanDnEvo
-fv3Vrr1wh1bbGmr0G6w5JlSLPPKtoKG5DGRjzkq3mfiP97N6ZgI4F0e815Sbb3B7
-VLCZ/JZMRxOj9bP5Q7LhpDn0+LpmK/DS/YAs8rivg1WgKkuJgiYTOAlewyZTZT6v
-1m9x3LexAgMBAAGjbzBtMEwGA1UdEQRFMEOCFGxzYW1sMDMuc2VydmVyLmh2LnNl
-hitodHRwczovL2xzYW1sMDMuc2VydmVyLmh2LnNlL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBR9Gm8Z5H9QjIJK2yvAM0y2i1hkpzANBgkqhkiG9w0BAQUFAAOCAQEA
-KXF5jmIhYbIVM425IZMSH9vb6Gm5R3rk0s6h4BGyeMPpLQ/ECjnwitsQFTZG2dci
-vvi4JbU8mryOVDt9NlNUtdgzbiaP3VcrkWHq7at+DsW+ipD5ioMIWZa6/hIqMU7U
-eQLX7YM4sjy3b4aa6rdTh+r2yp2GcFmpbJNhSncXA3lgH5I+BBKUgKIrLHdsdkGj
-IebD+y3AIEczoLLKVQ7W5d81Ifrh1JLJ8IVOt4S+9LUsgGJmu04NQaeQyaQcodTs
-dqEra6A3S5DN0BAWsLH3aBkA3fL/f6f3HUQwmd7dG+OUOtP+5DaB1YdeeXYMz5Wj
-aRQKNbVQdPN5ht6TrINjDQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.hv.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.hv.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">HV</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">HV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Väst</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.hv.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hv.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University West</md:Company>
-    <md:SurName>Magnus Andersson</md:SurName>
-    <md:EmailAddress>mailto:Magnus.Andersson@hv.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 520 223193</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University West</md:Company>
-    <md:SurName>Christian Jiresjö</md:SurName>
-    <md:EmailAddress>mailto:Christian.Jiresjo@hv.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 520 223189</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University West</md:Company>
-    <md:SurName>Servicedesk Högkoslan Väst</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@hv.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 520 223300</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 fa2cc9e6..00000000
--- a/swamid-interfederations-2.0/idp2.iay.org.uk-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://idp2.iay.org.uk/idp/shibboleth">
-  <!--
-		This is an "Ian A. Young" IdP 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>
-    <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: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">Ian A. Young</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">Ian A. Young</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 b0cea5b1..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@iay.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:ukfed@iay.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
deleted file mode 100644
index cc4ca424..00000000
--- a/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.ics.muni.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDuTCCAqGgAwIBAgIJAIcuS9ZS4u6JMA0GCSqGSIb3DQEBCwUAMHMxCzAJBgNV
-BAYTAkNaMRcwFQYDVQQIDA5DemVjaCBSZXB1YmxpYzETMBEGA1UEBwwKQnJuby1z
-dHJlZDEbMBkGA1UECgwSTWFzYXJ5ayBVbml2ZXJzaXR5MRkwFwYDVQQDDBBpZHAy
-Lmljcy5tdW5pLmN6MB4XDTE1MTEwMjE0NDAyOVoXDTI1MTAzMDE0NDAyOVowczEL
-MAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMRMwEQYDVQQHDApC
-cm5vLXN0cmVkMRswGQYDVQQKDBJNYXNhcnlrIFVuaXZlcnNpdHkxGTAXBgNVBAMM
-EGlkcDIuaWNzLm11bmkuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDeIqLYgsuIux8BsdTIhgYGkiYoIw38/DcC+ewVW4/433rYh0ouinyE9Reb3yNj
-eIjmD1jJQR80M+SFmiRlt8ebn21aD6gPPygf3CbKjVtkWLof29XdQPUWQsn+Kill
-15KwgtDTSL5/jmLUpWF1eJvWTMwisIWQFJuXe0Nm4CsIMvJV7xI17xf7a9WmR86s
-/tMGVKZGNXoGEzbKVj4QGdRIQfrj8REBmrkQjLuFyKqqjMotEYNb+WlLOi9uccl8
-kLI2ImRmoDzFqNQhQJzAPkrFd1W9Fpd6uF0iwObZuz9RrJbuG6KomTu7CGpWvqdF
-N/Ttrun8FfiEBF5puRbsbGMdAgMBAAGjUDBOMB0GA1UdDgQWBBTGPc2XZWR+uMNb
-wMP5Zf4xPz50aDAfBgNVHSMEGDAWgBTGPc2XZWR+uMNbwMP5Zf4xPz50aDAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCnwQtxjbkbEkZmLZU8Q61gcsXS
-tqUx5syEANSeutZKtElKlzDaXHGeKyzeIXnlzLH7xIP77rUDKwbJOMpCwAJgnqoN
-be5BkJpg7j4tjCjsMtftW7A2DIOuHnpdBw8CIK9VKxjVpalhjA3kOIZgbf8444ct
-UmZpPnApmRS6ar+8RKwCFo5cf/CoaPEoj0sTMtXLMfKLF2ZFdaaeooR2Uy68Sieu
-LulLpiqPzaI83atwCQLaqKgRHyRil4TplDgI47HQNUEp031rB4a+IEPvpqtcPVnW
-dregv7/EXm4k8mSJTVblFjww5QjaLV+D9vMqwslgUzmGhA5yBoBZn5OY/qYv
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://idp2.ics.muni.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.ics.muni.cz/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.ics.muni.cz/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">muni.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDuTCCAqGgAwIBAgIJAIcuS9ZS4u6JMA0GCSqGSIb3DQEBCwUAMHMxCzAJBgNV
-BAYTAkNaMRcwFQYDVQQIDA5DemVjaCBSZXB1YmxpYzETMBEGA1UEBwwKQnJuby1z
-dHJlZDEbMBkGA1UECgwSTWFzYXJ5ayBVbml2ZXJzaXR5MRkwFwYDVQQDDBBpZHAy
-Lmljcy5tdW5pLmN6MB4XDTE1MTEwMjE0NDAyOVoXDTI1MTAzMDE0NDAyOVowczEL
-MAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6ZWNoIFJlcHVibGljMRMwEQYDVQQHDApC
-cm5vLXN0cmVkMRswGQYDVQQKDBJNYXNhcnlrIFVuaXZlcnNpdHkxGTAXBgNVBAMM
-EGlkcDIuaWNzLm11bmkuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDeIqLYgsuIux8BsdTIhgYGkiYoIw38/DcC+ewVW4/433rYh0ouinyE9Reb3yNj
-eIjmD1jJQR80M+SFmiRlt8ebn21aD6gPPygf3CbKjVtkWLof29XdQPUWQsn+Kill
-15KwgtDTSL5/jmLUpWF1eJvWTMwisIWQFJuXe0Nm4CsIMvJV7xI17xf7a9WmR86s
-/tMGVKZGNXoGEzbKVj4QGdRIQfrj8REBmrkQjLuFyKqqjMotEYNb+WlLOi9uccl8
-kLI2ImRmoDzFqNQhQJzAPkrFd1W9Fpd6uF0iwObZuz9RrJbuG6KomTu7CGpWvqdF
-N/Ttrun8FfiEBF5puRbsbGMdAgMBAAGjUDBOMB0GA1UdDgQWBBTGPc2XZWR+uMNb
-wMP5Zf4xPz50aDAfBgNVHSMEGDAWgBTGPc2XZWR+uMNbwMP5Zf4xPz50aDAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCnwQtxjbkbEkZmLZU8Q61gcsXS
-tqUx5syEANSeutZKtElKlzDaXHGeKyzeIXnlzLH7xIP77rUDKwbJOMpCwAJgnqoN
-be5BkJpg7j4tjCjsMtftW7A2DIOuHnpdBw8CIK9VKxjVpalhjA3kOIZgbf8444ct
-UmZpPnApmRS6ar+8RKwCFo5cf/CoaPEoj0sTMtXLMfKLF2ZFdaaeooR2Uy68Sieu
-LulLpiqPzaI83atwCQLaqKgRHyRil4TplDgI47HQNUEp031rB4a+IEPvpqtcPVnW
-dregv7/EXm4k8mSJTVblFjww5QjaLV+D9vMqwslgUzmGhA5yBoBZn5OY/qYv
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.ics.muni.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.ics.muni.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">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>Radim</md:GivenName>
-    <md:SurName>Pesa</md:SurName>
-    <md:EmailAddress>pesa@ics.muni.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tomas</md:GivenName>
-    <md:SurName>Sapak</md:SurName>
-    <md:EmailAddress>sapakt@ics.muni.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 95c34d84..00000000
--- a/swamid-interfederations-2.0/idp2.ics.muni.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" entityID="https://idp2.ics.muni.cz/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope 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 5ea56e51..00000000
--- a/swamid-interfederations-2.0/idp2.idem.garr.it.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://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>MIIDLzCCAhegAwIBAgIUGfIPvZIB9nBxDg54E03n7mjGIg8wDQYJKoZIhvcNAQEFBQAwHDEaMBgGA1UEAxMRaWRwMi5pZGVtLmdhcnIuaXQwHhcNMTAwNzE2MDg1NjI4WhcNMTMwNzE2MDg1NjI4WjAcMRowGAYDVQQDExFpZHAyLmlkZW0uZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANnNn42PX5oef6950FuQdMkNjvhZJ2VpDqAadw85P0vmDDVOR7KVomzqCknj5ssCKKblhDL+MdJjz/rv2HHNz1bbAaVjMCa08eXa4e+ywjg5Rtq0DyN6UaS5uHQ+NFrQX1QTusmPbHGpLHXLMZSMsdvOq3vSojc8WZfhn/uolvh/MunTmAUmJ0Xw2JoTtTTuHBmgJddt/wKEfaWICPm8p7GQx/UJZyqPiZmROT9IdJSSBKwKN4G9afn4TLW3vaj7BOvJDtLTMJmUWUMd+iGTvJQNCqp93d7VWpJH3LtChnc+pIn23vv4PkSddz0PsDIuz2ZkuEHLFgB2FCoLgMiFuHcCAwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi5pZGVtLmdhcnIuaXSGKGh0dHBzOi8vaWRwMi5pZGVtLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNtsYApKCvWauBEDlSwnVpH/0lyRMA0GCSqGSIb3DQEBBQUAA4IBAQB5o17LC3liNiqkZUJiUlIqsTGfHbi/jIhQHLCpkKfiHpNOCpb5YlOOH/29fYQj2rrU8E6Ohb8fWsFfT5sXQjaCOQyvY8lZTcZe3usUayYAIyGT/NuhKlPcK6f3fiDNhLtf8nzBzDc/Ms/r9y83P2AlUwFn8/vINYBk/cvxS7EzfPxA9xRiovjnx5f5Q65mYExzulY2Mjy84k67uQtqN0da+xGxphD0dPsxjyGCvCJa1B059z+t9/8pmdPCz84YMed6prKxA1TqEiL9iN3ezmSf6e7tsHf8BqLKORgT/7j3eDzPt2ThbKCHsVvJXon75ah+1zKcCj6SxkaSg6Z8B/oy </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>MIIDLzCCAhegAwIBAgIUGfIPvZIB9nBxDg54E03n7mjGIg8wDQYJKoZIhvcNAQEFBQAwHDEaMBgGA1UEAxMRaWRwMi5pZGVtLmdhcnIuaXQwHhcNMTAwNzE2MDg1NjI4WhcNMTMwNzE2MDg1NjI4WjAcMRowGAYDVQQDExFpZHAyLmlkZW0uZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANnNn42PX5oef6950FuQdMkNjvhZJ2VpDqAadw85P0vmDDVOR7KVomzqCknj5ssCKKblhDL+MdJjz/rv2HHNz1bbAaVjMCa08eXa4e+ywjg5Rtq0DyN6UaS5uHQ+NFrQX1QTusmPbHGpLHXLMZSMsdvOq3vSojc8WZfhn/uolvh/MunTmAUmJ0Xw2JoTtTTuHBmgJddt/wKEfaWICPm8p7GQx/UJZyqPiZmROT9IdJSSBKwKN4G9afn4TLW3vaj7BOvJDtLTMJmUWUMd+iGTvJQNCqp93d7VWpJH3LtChnc+pIn23vv4PkSddz0PsDIuz2ZkuEHLFgB2FCoLgMiFuHcCAwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi5pZGVtLmdhcnIuaXSGKGh0dHBzOi8vaWRwMi5pZGVtLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNtsYApKCvWauBEDlSwnVpH/0lyRMA0GCSqGSIb3DQEBBQUAA4IBAQB5o17LC3liNiqkZUJiUlIqsTGfHbi/jIhQHLCpkKfiHpNOCpb5YlOOH/29fYQj2rrU8E6Ohb8fWsFfT5sXQjaCOQyvY8lZTcZe3usUayYAIyGT/NuhKlPcK6f3fiDNhLtf8nzBzDc/Ms/r9y83P2AlUwFn8/vINYBk/cvxS7EzfPxA9xRiovjnx5f5Q65mYExzulY2Mjy84k67uQtqN0da+xGxphD0dPsxjyGCvCJa1B059z+t9/8pmdPCz84YMed6prKxA1TqEiL9iN3ezmSf6e7tsHf8BqLKORgT/7j3eDzPt2ThbKCHsVvJXon75ah+1zKcCj6SxkaSg6Z8B/oy </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.jacobs-university.de.xml b/swamid-interfederations-2.0/idp2.jacobs-university.de.xml
deleted file mode 100644
index 8dc0d9f9..00000000
--- a/swamid-interfederations-2.0/idp2.jacobs-university.de.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.jacobs-university.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">jacobs-university.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp2.jacobs-university.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp2.jacobs-university.de,O=Jacobs University Bremen gGmbH,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFKzCCBBOgAwIBAgIEEgMQTjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEnMCUGA1UEChMeSmFjb2JzIFVuaXZlcnNpdHkgQnJlbWVuIGdHbWJIMQ8wDQYD
-VQQLEwZJUkMtSVQxIzAhBgNVBAMTGkphY29icyBVbml2ZXJzaXR5IENBIC0gRzAx
-MB4XDTExMDUzMDEyNTExMFoXDTE2MDUyODEyNTExMFowWjELMAkGA1UEBhMCREUx
-JzAlBgNVBAoTHkphY29icyBVbml2ZXJzaXR5IEJyZW1lbiBnR21iSDEiMCAGA1UE
-AxMZaWRwMi5qYWNvYnMtdW5pdmVyc2l0eS5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALBn+nYoa8EkdT59Kn5iyaouvhAZTZsuAB2hqg2Ldo/8J4Pc
-SU6y0ck/a2xgK45CDK+bE12fGM1A828Z+Zkx615PyXRve3Z3uhKLwWh+aVh9Czsn
-O5a4GGPLY/fVeeJyAWk95Vgco2h7hGxOrCGynMCx+wa89SIA1q4DYo4stDPu5zaC
-kZn2+m2eH6Ht6UjIqA4GEhh9/lXNoLJruq/kFgUA0TC5KelRWO2M40zACljgUXjZ
-3ISZXtFqI+1kHTxUd6h/mlsKVk4iFjYLK5HZwl+8/pueO3spiNISLZ8KBewyehVv
-cGsYLGermgavGpNfuHXQn5eZ9nBveWd6zWkGZz0CAwEAAaOCAeUwggHhMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTismVGIRouSFz019/hsKvjP4k35TAfBgNVHSMEGDAWgBQcq0Ha1JXUnR6CzU19
-EyU37B+IpzApBgNVHREEIjAggR5pdHN1cHBvcnRAamFjb2JzLXVuaXZlcnNpdHku
-ZGUwgZUGA1UdHwSBjTCBijBDoEGgP4Y9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9q
-YWNvYnMtdW5pdmVyc2l0eS1jYS9wdWIvY3JsL2NhY3JsLmNybDBDoEGgP4Y9aHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9qYWNvYnMtdW5pdmVyc2l0eS1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBrgYIKwYBBQUHAQEEgaEwgZ4wTQYIKwYBBQUHMAKGQWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvamFjb2JzLXVuaXZlcnNpdHktY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0ME0GCCsGAQUFBzAChkFodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2phY29icy11bml2ZXJzaXR5LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkq
-hkiG9w0BAQUFAAOCAQEAdpCxa/1qVbMWIpJaOkAvhMC6U329LELs5yQLETHvmlPN
-r3t1ULEQnssVDVtD7QfoKpUnRTmcSdOj13e+lTf2KEH46jVowVG9R4xZ4pf9huB6
-Iq8CkpOUYTdhzbf3XP/YQRzSWNRe4TJQXqVgvmuG810yKbDRiA2gMnHnE1vbz4u+
-+dL9AEycWmnXgWu5K9QlyAKQxs35VZU1J+2x8PRO8of/csD1C4EcoEwq986tpjRd
-IabwcBEXXxXY0P6/0zC5UrnPCkzyZmL67m/gGNmGhJ3tDnb9mxdrp6t+5JmtG4Qf
-UlOc3b1APPVI3weamhzR+rrUr45b/yLBbFTLwXsTWw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.jacobs-university.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.jacobs-university.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.jacobs-university.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.jacobs-university.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.jacobs-university.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.jacobs-university.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">jacobs-university.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp2.jacobs-university.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp2.jacobs-university.de,O=Jacobs University Bremen gGmbH,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFKzCCBBOgAwIBAgIEEgMQTjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEnMCUGA1UEChMeSmFjb2JzIFVuaXZlcnNpdHkgQnJlbWVuIGdHbWJIMQ8wDQYD
-VQQLEwZJUkMtSVQxIzAhBgNVBAMTGkphY29icyBVbml2ZXJzaXR5IENBIC0gRzAx
-MB4XDTExMDUzMDEyNTExMFoXDTE2MDUyODEyNTExMFowWjELMAkGA1UEBhMCREUx
-JzAlBgNVBAoTHkphY29icyBVbml2ZXJzaXR5IEJyZW1lbiBnR21iSDEiMCAGA1UE
-AxMZaWRwMi5qYWNvYnMtdW5pdmVyc2l0eS5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALBn+nYoa8EkdT59Kn5iyaouvhAZTZsuAB2hqg2Ldo/8J4Pc
-SU6y0ck/a2xgK45CDK+bE12fGM1A828Z+Zkx615PyXRve3Z3uhKLwWh+aVh9Czsn
-O5a4GGPLY/fVeeJyAWk95Vgco2h7hGxOrCGynMCx+wa89SIA1q4DYo4stDPu5zaC
-kZn2+m2eH6Ht6UjIqA4GEhh9/lXNoLJruq/kFgUA0TC5KelRWO2M40zACljgUXjZ
-3ISZXtFqI+1kHTxUd6h/mlsKVk4iFjYLK5HZwl+8/pueO3spiNISLZ8KBewyehVv
-cGsYLGermgavGpNfuHXQn5eZ9nBveWd6zWkGZz0CAwEAAaOCAeUwggHhMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTismVGIRouSFz019/hsKvjP4k35TAfBgNVHSMEGDAWgBQcq0Ha1JXUnR6CzU19
-EyU37B+IpzApBgNVHREEIjAggR5pdHN1cHBvcnRAamFjb2JzLXVuaXZlcnNpdHku
-ZGUwgZUGA1UdHwSBjTCBijBDoEGgP4Y9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9q
-YWNvYnMtdW5pdmVyc2l0eS1jYS9wdWIvY3JsL2NhY3JsLmNybDBDoEGgP4Y9aHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9qYWNvYnMtdW5pdmVyc2l0eS1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBrgYIKwYBBQUHAQEEgaEwgZ4wTQYIKwYBBQUHMAKGQWh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvamFjb2JzLXVuaXZlcnNpdHktY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0ME0GCCsGAQUFBzAChkFodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2phY29icy11bml2ZXJzaXR5LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkq
-hkiG9w0BAQUFAAOCAQEAdpCxa/1qVbMWIpJaOkAvhMC6U329LELs5yQLETHvmlPN
-r3t1ULEQnssVDVtD7QfoKpUnRTmcSdOj13e+lTf2KEH46jVowVG9R4xZ4pf9huB6
-Iq8CkpOUYTdhzbf3XP/YQRzSWNRe4TJQXqVgvmuG810yKbDRiA2gMnHnE1vbz4u+
-+dL9AEycWmnXgWu5K9QlyAKQxs35VZU1J+2x8PRO8of/csD1C4EcoEwq986tpjRd
-IabwcBEXXxXY0P6/0zC5UrnPCkzyZmL67m/gGNmGhJ3tDnb9mxdrp6t+5JmtG4Qf
-UlOc3b1APPVI3weamhzR+rrUr45b/yLBbFTLwXsTWw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.jacobs-university.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.jacobs-university.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Jacobs University Bremen gGmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Jacobs University Bremen gGmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.jacobs-university.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Mario</GivenName>
-    <SurName>Kaiser</SurName>
-    <EmailAddress>itsupport@jacobs-university.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Torge</GivenName>
-    <SurName>Schmidt</SurName>
-    <EmailAddress>t.schmidt@jacobs-university.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
deleted file mode 100644
index d9651401..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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kau.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.kau.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.kau.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.kau.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.kau.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">kau.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kau.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">KAU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karlstads universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karlstad University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kau.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Karlstad University</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 54 700 2200</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Karlstad University</md:Company>
-    <md:SurName>Paul Scott</md:SurName>
-    <md:EmailAddress>mailto:paul.scott@kau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 54 700 2307</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Karlstad University</md:Company>
-    <md:SurName>IT-avdelningen Karlstads universitet</md:SurName>
-    <md:EmailAddress>mailto:datasupport@kau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 54 700 2200</md:TelephoneNumber>
-  </md: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 9e3a3ffd..00000000
--- a/swamid-interfederations-2.0/idp2.kau.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://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:Logo height="112" width="112">https://www.kau.se/sites/all/themes/kau/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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:DomainHint>kau.se</mdui:DomainHint>
-        <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="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Scott</SurName>
-    <EmailAddress>paul.scott@kau.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Magnus</GivenName>
-    <SurName>Olsson</SurName>
-    <EmailAddress>magnus.olsson@kau.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.kingston.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idp2.kingston.ac.uk-shibboleth.xml
deleted file mode 100644
index cebd48d1..00000000
--- a/swamid-interfederations-2.0/idp2.kingston.ac.uk-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" entityID="https://idp2.kingston.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Kingston University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-19T09:52:26Z">
-      <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">kingston.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Kingston University London (Temporary)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University based in Kingston upon Thames, Greater London</mdui:Description>
-        <mdui:Logo height="140" width="140">https://staffnet.kingston.ac.uk/includes/img/static/kulogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAMevtLbVmUP/KFFW/3IcXK9nAywnMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE2lkcDIua2luZ3N0b24uYWMudWswHhcNMTMxMDA0MTM0
-						OTM3WhcNMzMxMDA0MTM0OTM3WjAeMRwwGgYDVQQDExNpZHAyLmtpbmdzdG9uLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs8keaoCHkhFKCrkW
-						43asq9uFNsO9WW15Q4sMFYmAcFnD0VPJbSHrLLxWndapJeGrZhAYl9902GcV0X6Z
-						s8pChhLQOf+k4B9YgJHb7xDi0n8h2aXoy5L9wu/ZdRbVgSIbeHIXfxLqJWDLEZGS
-						9cIlvO3DYPaTo73GuINf+QVodRSgBSQez/hHJkVyJJWPNgMwHIwKOtNQygEdI/Pu
-						PIxNfVwr4HNzb6GU9VlTqGaECeThjTINj189xj/kpEU1ehAl3zYa7jkBOp6FTerP
-						KxJm0DLfmLWubtxDNpmQZt0b55riH6GfLHuoXbeJ4x7CriLEZPPNgyCRoKks4pxw
-						ck9PTQIDAQABo20wazBKBgNVHREEQzBBghNpZHAyLmtpbmdzdG9uLmFjLnVrhipo
-						dHRwczovL2lkcDIua2luZ3N0b24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFDV+wl3i5Jhj1v3GOPpUHyBivPkpMA0GCSqGSIb3DQEBBQUAA4IBAQB5S/6O
-						fH0pqKhL80xc8eVdW2uo40WZVb8Za7tkM/DDsHsfgNGk/Xl/cGLzmo2uaURLic3T
-						X7FRDCBVWMKZQTyX6VkwFcOGz/emg/xCRGF45i2fRIgRixyrVhPgjT8Ku4Qk8vrE
-						vgBQCV5+6dJgZ3oEGT8QFMyEEakKdXEAfAjPrFHpkfox72nvCX4yiuZfGhYHFts1
-						J48JAKw3tFfsTlSBXKsN50tyJSSWEb2JYOKXCiVuPLHF0h5sYEO12dWQIP9dOsJn
-						oHzU4LOVbqHbO9nk6pB/LsLmpWrpgcx4fjUJQZbLGdEqjMk0Y+LuCoFaTBgGbd5o
-						s5LbIFHuwJhAyQv5
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.kingston.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.kingston.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kingston.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://shib2-login.kingston.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2-login.kingston.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2-login.kingston.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2-login.kingston.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">kingston.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAMevtLbVmUP/KFFW/3IcXK9nAywnMA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE2lkcDIua2luZ3N0b24uYWMudWswHhcNMTMxMDA0MTM0
-						OTM3WhcNMzMxMDA0MTM0OTM3WjAeMRwwGgYDVQQDExNpZHAyLmtpbmdzdG9uLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs8keaoCHkhFKCrkW
-						43asq9uFNsO9WW15Q4sMFYmAcFnD0VPJbSHrLLxWndapJeGrZhAYl9902GcV0X6Z
-						s8pChhLQOf+k4B9YgJHb7xDi0n8h2aXoy5L9wu/ZdRbVgSIbeHIXfxLqJWDLEZGS
-						9cIlvO3DYPaTo73GuINf+QVodRSgBSQez/hHJkVyJJWPNgMwHIwKOtNQygEdI/Pu
-						PIxNfVwr4HNzb6GU9VlTqGaECeThjTINj189xj/kpEU1ehAl3zYa7jkBOp6FTerP
-						KxJm0DLfmLWubtxDNpmQZt0b55riH6GfLHuoXbeJ4x7CriLEZPPNgyCRoKks4pxw
-						ck9PTQIDAQABo20wazBKBgNVHREEQzBBghNpZHAyLmtpbmdzdG9uLmFjLnVrhipo
-						dHRwczovL2lkcDIua2luZ3N0b24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFDV+wl3i5Jhj1v3GOPpUHyBivPkpMA0GCSqGSIb3DQEBBQUAA4IBAQB5S/6O
-						fH0pqKhL80xc8eVdW2uo40WZVb8Za7tkM/DDsHsfgNGk/Xl/cGLzmo2uaURLic3T
-						X7FRDCBVWMKZQTyX6VkwFcOGz/emg/xCRGF45i2fRIgRixyrVhPgjT8Ku4Qk8vrE
-						vgBQCV5+6dJgZ3oEGT8QFMyEEakKdXEAfAjPrFHpkfox72nvCX4yiuZfGhYHFts1
-						J48JAKw3tFfsTlSBXKsN50tyJSSWEb2JYOKXCiVuPLHF0h5sYEO12dWQIP9dOsJn
-						oHzU4LOVbqHbO9nk6pB/LsLmpWrpgcx4fjUJQZbLGdEqjMk0Y+LuCoFaTBgGbd5o
-						s5LbIFHuwJhAyQv5
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.kingston.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kingston.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">Kingston University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Kingston University London (Temporary)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kingston.ac.uk/support/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matthew</GivenName>
-    <SurName>Grove</SurName>
-    <EmailAddress>mailto:m.grove@kingston.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Murray</SurName>
-    <EmailAddress>mailto:k.murray@kingston.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.londonlibrary.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.londonlibrary.co.uk-idp-shibboleth.xml
deleted file mode 100644
index c1bd03bd..00000000
--- a/swamid-interfederations-2.0/idp2.londonlibrary.co.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://idp2.londonlibrary.co.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the London Library.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">londonlibrary.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDyzCCArOgAwIBAgIJAI6fjypmCFKGMA0GCSqGSIb3DQEBCwUAMHwxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEbMBkGA1UE
-						CgwSVGhlIExvbmRvbiBMaWJyYXJ5MQswCQYDVQQLDAJJVDEhMB8GA1UEAwwYaWRw
-						Mi5sb25kb25saWJyYXJ5LmNvLnVrMB4XDTE1MDUwNjEwMzIwNloXDTMwMDUwMjEw
-						MzIwNlowfDELMAkGA1UEBhMCR0IxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwG
-						TG9uZG9uMRswGQYDVQQKDBJUaGUgTG9uZG9uIExpYnJhcnkxCzAJBgNVBAsMAklU
-						MSEwHwYDVQQDDBhpZHAyLmxvbmRvbmxpYnJhcnkuY28udWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDLz0/zZAm2NbldxNTiJDzGZXSnYd4+ChVfhyhr
-						0TmjysjE63tDfjc9bvMYkAORU6MSKGFeS3Zn+TwXgS2VmTUWSC48sf2e/ovYdlti
-						OkoSy1ygfqWMGUVKB9zxiNxZOhkTKk3AA/wiMVH8vKTnXMKVVUVIje5e6O/71y1C
-						bazwSjMf5mckzVFnZCNVEAob0Kw7Ms1D8rmWkRDrdECxauvyH4jnQ0TxL3qtmL3E
-						QMuGZGn2J3obf4zGZvgkOGcQ17th+Ta6qoKTrMPHjTbNKvjHo/g0W7aVkUA5hTM5
-						NXkGOoihx2D7blZeidPFXNpTmqvzXEB1V0V4JzCfPdNVnqONAgMBAAGjUDBOMB0G
-						A1UdDgQWBBTPD5ppgnEREA7j25Qk5VcNYAX0aDAfBgNVHSMEGDAWgBTPD5ppgnER
-						EA7j25Qk5VcNYAX0aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB1
-						mRcwuzPYKiMM0BbGTTtCn9ZzOzU/pUa6anWT4wl6eJjGgNLJhU9tGS7VKw2dCXHi
-						ZcwxqxPu2/3rM3SlMGo9YIelVwsT7O096dr7f/10S7Lozp4wKM+tZorBpH3Mbx8K
-						gPqP2JhsFBU2T3RXTVEhLSCvaal/G/XWRiPIu1lFRTNzCkVHAM4HMy+MRjZPrbfy
-						9IgGK+kNxGv0/l3y2cqh8ws6XrM3oXMtxTWwP8tbNCcmHgbHD+i7UdTXL0vkwwQj
-						zOqx8FszNU4vcFPbk+rTBKmgWqMmmv+JjC6HRYKslyhaQrUN5BHjYDCJKGGMex7Y
-						s39/czGWTVmmJjeLXzur
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.londonlibrary.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.londonlibrary.co.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.londonlibrary.co.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.londonlibrary.co.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.londonlibrary.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.londonlibrary.co.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">londonlibrary.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDyzCCArOgAwIBAgIJAI6fjypmCFKGMA0GCSqGSIb3DQEBCwUAMHwxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEbMBkGA1UE
-						CgwSVGhlIExvbmRvbiBMaWJyYXJ5MQswCQYDVQQLDAJJVDEhMB8GA1UEAwwYaWRw
-						Mi5sb25kb25saWJyYXJ5LmNvLnVrMB4XDTE1MDUwNjEwMzIwNloXDTMwMDUwMjEw
-						MzIwNlowfDELMAkGA1UEBhMCR0IxDzANBgNVBAgMBkxvbmRvbjEPMA0GA1UEBwwG
-						TG9uZG9uMRswGQYDVQQKDBJUaGUgTG9uZG9uIExpYnJhcnkxCzAJBgNVBAsMAklU
-						MSEwHwYDVQQDDBhpZHAyLmxvbmRvbmxpYnJhcnkuY28udWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDLz0/zZAm2NbldxNTiJDzGZXSnYd4+ChVfhyhr
-						0TmjysjE63tDfjc9bvMYkAORU6MSKGFeS3Zn+TwXgS2VmTUWSC48sf2e/ovYdlti
-						OkoSy1ygfqWMGUVKB9zxiNxZOhkTKk3AA/wiMVH8vKTnXMKVVUVIje5e6O/71y1C
-						bazwSjMf5mckzVFnZCNVEAob0Kw7Ms1D8rmWkRDrdECxauvyH4jnQ0TxL3qtmL3E
-						QMuGZGn2J3obf4zGZvgkOGcQ17th+Ta6qoKTrMPHjTbNKvjHo/g0W7aVkUA5hTM5
-						NXkGOoihx2D7blZeidPFXNpTmqvzXEB1V0V4JzCfPdNVnqONAgMBAAGjUDBOMB0G
-						A1UdDgQWBBTPD5ppgnEREA7j25Qk5VcNYAX0aDAfBgNVHSMEGDAWgBTPD5ppgnER
-						EA7j25Qk5VcNYAX0aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB1
-						mRcwuzPYKiMM0BbGTTtCn9ZzOzU/pUa6anWT4wl6eJjGgNLJhU9tGS7VKw2dCXHi
-						ZcwxqxPu2/3rM3SlMGo9YIelVwsT7O096dr7f/10S7Lozp4wKM+tZorBpH3Mbx8K
-						gPqP2JhsFBU2T3RXTVEhLSCvaal/G/XWRiPIu1lFRTNzCkVHAM4HMy+MRjZPrbfy
-						9IgGK+kNxGv0/l3y2cqh8ws6XrM3oXMtxTWwP8tbNCcmHgbHD+i7UdTXL0vkwwQj
-						zOqx8FszNU4vcFPbk+rTBKmgWqMmmv+JjC6HRYKslyhaQrUN5BHjYDCJKGGMex7Y
-						s39/czGWTVmmJjeLXzur
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.londonlibrary.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.londonlibrary.co.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">London Library</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.londonlibrary.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Will</GivenName>
-    <SurName>David</SurName>
-    <EmailAddress>mailto:will.david@londonlibrary.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Will</GivenName>
-    <SurName>David</SurName>
-    <EmailAddress>mailto:will.david@londonlibrary.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.port.ac.uk-entity.xml b/swamid-interfederations-2.0/idp2.port.ac.uk-entity.xml
deleted file mode 100644
index f3ce3fde..00000000
--- a/swamid-interfederations-2.0/idp2.port.ac.uk-entity.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://idp2.port.ac.uk/entity">
-  <!--
-		This is an OpenAthens LA IdP for the University of Portsmouth.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-19T15:19:11Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">port.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTjCCAjagAwIBAgIIftqCJVvJwqUwDQYJKoZIhvcNAQEFBQAwPjEhMB8GA1UE
-						CgwYVW5pdmVyc2l0eSBvZiBQb3J0c21vdXRoMRkwFwYDVQQDDBBsb2dpbi5wb3J0
-						LmFjLnVrMB4XDTE0MTAyODExNTcxMloXDTI0MTAyODExNTcxMlowPjEhMB8GA1UE
-						CgwYVW5pdmVyc2l0eSBvZiBQb3J0c21vdXRoMRkwFwYDVQQDDBBsb2dpbi5wb3J0
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk31FOVIiRM7z
-						dB5k57jOpNV8XtPX9xHkG7QGfIgeQ1GXwmh6rRrvV9efqFHIpYJakQmN7D1txhj2
-						KWgDCMF3tI47U/gcHs4q72V2ZMfxeAbcFdlsAuElScHENzgIRPqaNh2vg69Q3OOz
-						HcFJ9jm0kHk0OMXmg2m9a8+Hm/3Vg4IxamOPgwdFarSYPq1jkSG7TatF/RaniQzw
-						bBx7R0qc7DzPypf7PxqN+PHJ2NT7Fsva/NX5xpjzdbgrA+WaMdxLo3RM+nOhf/ZR
-						k9sYARRU3lMdaZJFXkkzXbFoEysyjH0qntyFAgDNF1UOdQCKRhUZCdwJCZ/txg0A
-						Vf1L6Q41YQIDAQABo1AwTjAdBgNVHQ4EFgQUGwjLRWjwjSNmYX7Q0R4d83V+Hu0w
-						HwYDVR0jBBgwFoAUGwjLRWjwjSNmYX7Q0R4d83V+Hu0wDAYDVR0TBAUwAwEB/zAN
-						BgkqhkiG9w0BAQUFAAOCAQEAXHzPNejZlDRxS6S9WqhPYMA5j7WHyHnRmBfSerO4
-						rnHRqJrXiHdGdp5ARuX54UxvNFjkVgMyCeE1Esyun6eUtqedqwzq+BEHr4m6t3ex
-						g/VroisodnXdOzgM13bwkiNsVJGRF9d4aDYLC6y+tyxY98k20vSyELEgHtiderYE
-						G2GsiaSRvDIVRyXcESOkQl1NEgE6v/i/qZk/C/Fp87abpjiEHqVSGTt46E7g2QvW
-						bEAQDQvzIRLwc0KO1ZzMvic8OtGthOT7Hc42JEscCf0ZYrE0tSfF0EM5LIImyAve
-						rFsygr8Oy/HFI1289KnDVG2bO0e6qtPveZKsOHtKVwbwAA==
-					</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>
-						MIIDTjCCAjagAwIBAgIIftqCJVvJwqUwDQYJKoZIhvcNAQEFBQAwPjEhMB8GA1UE
-						CgwYVW5pdmVyc2l0eSBvZiBQb3J0c21vdXRoMRkwFwYDVQQDDBBsb2dpbi5wb3J0
-						LmFjLnVrMB4XDTE0MTAyODExNTcxMloXDTI0MTAyODExNTcxMlowPjEhMB8GA1UE
-						CgwYVW5pdmVyc2l0eSBvZiBQb3J0c21vdXRoMRkwFwYDVQQDDBBsb2dpbi5wb3J0
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk31FOVIiRM7z
-						dB5k57jOpNV8XtPX9xHkG7QGfIgeQ1GXwmh6rRrvV9efqFHIpYJakQmN7D1txhj2
-						KWgDCMF3tI47U/gcHs4q72V2ZMfxeAbcFdlsAuElScHENzgIRPqaNh2vg69Q3OOz
-						HcFJ9jm0kHk0OMXmg2m9a8+Hm/3Vg4IxamOPgwdFarSYPq1jkSG7TatF/RaniQzw
-						bBx7R0qc7DzPypf7PxqN+PHJ2NT7Fsva/NX5xpjzdbgrA+WaMdxLo3RM+nOhf/ZR
-						k9sYARRU3lMdaZJFXkkzXbFoEysyjH0qntyFAgDNF1UOdQCKRhUZCdwJCZ/txg0A
-						Vf1L6Q41YQIDAQABo1AwTjAdBgNVHQ4EFgQUGwjLRWjwjSNmYX7Q0R4d83V+Hu0w
-						HwYDVR0jBBgwFoAUGwjLRWjwjSNmYX7Q0R4d83V+Hu0wDAYDVR0TBAUwAwEB/zAN
-						BgkqhkiG9w0BAQUFAAOCAQEAXHzPNejZlDRxS6S9WqhPYMA5j7WHyHnRmBfSerO4
-						rnHRqJrXiHdGdp5ARuX54UxvNFjkVgMyCeE1Esyun6eUtqedqwzq+BEHr4m6t3ex
-						g/VroisodnXdOzgM13bwkiNsVJGRF9d4aDYLC6y+tyxY98k20vSyELEgHtiderYE
-						G2GsiaSRvDIVRyXcESOkQl1NEgE6v/i/qZk/C/Fp87abpjiEHqVSGTt46E7g2QvW
-						bEAQDQvzIRLwc0KO1ZzMvic8OtGthOT7Hc42JEscCf0ZYrE0tSfF0EM5LIImyAve
-						rFsygr8Oy/HFI1289KnDVG2bO0e6qtPveZKsOHtKVwbwAA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.port.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.port.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Portsmouth</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Portsmouth</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.port.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>University IT Helpdesk</GivenName>
-    <EmailAddress>mailto:servicedesk@port.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Phil</GivenName>
-    <SurName>Burland</SurName>
-    <EmailAddress>mailto:phil.burland@port.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 d8927164..00000000
--- a/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,117 +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://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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
-MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
-bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
-cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
-RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
-l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
-/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
-UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
-amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
-AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
-G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
-ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
-dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
-cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
-KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
-BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
-bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
-ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
-DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
-8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
-MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
-I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
-yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
-s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
-MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
-bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
-cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
-RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
-l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
-/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
-UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
-amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
-AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
-G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
-ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
-dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
-cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
-KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
-BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
-bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
-ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
-DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
-8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
-MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
-I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
-yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
-s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.redclara.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.redclara.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">RedCLARA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RedCLARA - Cooperacion Latino Americana de Redes Avanzadas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">www.redclara.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:EmailAddress>seg@redclara.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml
deleted file mode 100644
index 70a7140e..00000000
--- a/swamid-interfederations-2.0/idp2.rfh-koeln.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.rfh-koeln.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-26T13:51: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>
-  </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">rfh-koeln.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Rheinische Fachhochschule Köln gGmbH</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Rheinische Fachhochschule Köln gGmbH</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der RFH Köln</mdui:Description>
-        <mdui:Description xml:lang="en">Rheinische Fachhochschule Köln gGmbH, University of Applied Sciences, Sibboleth-Identity Provider</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idp2.rfh-koeln.de/rfh-logo_shib_klein.gif</mdui:Logo>
-        <mdui:Logo height="64" width="350">https://idp2.rfh-koeln.de/logo-64x150px.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.rfh-koeln.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.rfh-koeln.de/index_eng.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">http://www.rfh-koeln.de/impressum/index_ger.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.rfh-koeln.de/imprint/index_eng.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp2.rfh-koeln.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp2.rfh-koeln.de,OU=Rechenzentrum,O=Rheinische Fachhochschule Koeln gGmbH,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHJTCCBg2gAwIBAgIHGaorpPBPojANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDjAMBgNVBAcTBUtv
-ZWxuMS4wLAYDVQQKEyVSaGVpbmlzY2hlIEZhY2hob2Noc2NodWxlIEtvZWxuIGdH
-bWJIMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRUwEwYDVQQDEwxSRkggS29lbG4g
-Q0ExHzAdBgkqhkiG9w0BCQEWEHBraUByZmgta29lbG4uZGUwHhcNMTUwNjI0MTMx
-ODEzWhcNMTgwOTIwMTMxODEzWjCBnzELMAkGA1UEBhMCREUxHDAaBgNVBAgME05v
-cmRyaGVpbi1XZXN0ZmFsZW4xDjAMBgNVBAcMBUtvZWxuMS4wLAYDVQQKDCVSaGVp
-bmlzY2hlIEZhY2hob2Noc2NodWxlIEtvZWxuIGdHbWJIMRYwFAYDVQQLDA1SZWNo
-ZW56ZW50cnVtMRowGAYDVQQDDBFpZHAyLnJmaC1rb2Vsbi5kZTCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAMd4FiJgA3//s13pX0vq13lLd+t91MCueeUI
-5Z+TAB7EaZK6DrQXqdeFKULkXcPjnIU1y+DEyUHYujIdUJgbq/xgWAUEIK3uHO3e
-gDd6psc08hIg7TkXB9OPL1F1hChURaxuYPgexuxcsBr3Ou+U4/tLI4vgmjHM8nzY
-TcPHksJbQSqfCuBX1IRJzdc7iX+kaud2GWqxg2a0LZpZxMf3hasYGX1zDNkxMkr8
-cBf2hwu9oVSImH/gU6bfBHCIlLSRONi1A/K2TGQe8EYyEDL1GtCM7MUj7o7OIEqq
-pH2IibPXHQjFt/bh6iFpseZjS8HwUGZE04m5FZ+G3/ECFdq6DPkTxCV0rNasCLqM
-dKVQPsJl/M8pWrOrVoWpMiKErOVjZH+bH/XecJP/CtcrmEL7L4F6ZQaqoOxwOeBc
-pXsEfdaMBauoQpRsRxCHYcfebprR30bpOfxOlebbN7K8p/Pv/5SASY6ocuNtJElz
-cDQ/pxT7R6iEE+BbNH4h5CAEk4oc1AsXoBWdUUdY0hc5NHrnfuUDtzJDJfocG06B
-t46IXppa3QWGC8cJK8JWTjKr1xHrfGnrYPfg1f9DlqWPCro5HsClVvJfP3BIT+oz
-MeOVjaEeimJBpDBO7BR+52Ax1iqllPz8pSsX+Bik4ZLjBGVd2Dfp049m1QUEyHA4
-zaz+xs+bAgMBAAGjggJGMIICQjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQD
-AzARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGt
-IYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
-AgYIKwYBBQUHAwEwHQYDVR0OBBYEFFPwyjZagygVUiGYVVxy3+QI3TfSMB8GA1Ud
-IwQYMBaAFDEjMbZNNf9hivJNXA+Jny9LdmtGMBwGA1UdEQQVMBOCEWlkcDIucmZo
-LWtvZWxuLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL3JmaC1rb2Vsbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS9yZmgta29lbG4tY2EvcHViL2NybC9jYWNybC5jcmww
-gdMGCCsGAQUFBwEBBIHGMIHDMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvcmZoLWtvZWxuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBF
-BggrBgEFBQcwAoY5aHR0cDovL2NkcDIucGNhLmRmbi5kZS9yZmgta29lbG4tY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCjnjXKGnVP
-hd3Do1HsnPZTwRQ+SmrYoZOjT8rDtmCl1XWgcMMxkZrL7GZoBniBT0/D53LZj8l5
-/4DEH8BRDDEFk8lJxeW7STGC62Wq5KCzCDHzh/Tg3uapyn8+Spa/ozZ2tHVQNL5m
-W1hmLJHYykwITjVpUQRrQHMIterNiWVLPUiJW6lZaEmUPHlIM4hbb5b/4rxySrCk
-RSyaXcHkY/vFUfPyc77H5RnGnKi+PCoFzTEOMWPqfs5IrSe2qLYXmoY1xgFaZa8u
-WfCA0DKwsEbCD5XXjPzmUaAUSUf1iAEh16iZ8+QNLhyDq4dqjVaLYkFu1JlhKiU3
-mZ/qmmwB8wRz
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rfh-koeln.de: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://idp2.rfh-koeln.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.rfh-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.rfh-koeln.de/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">rfh-koeln.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp2.rfh-koeln.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=idp2.rfh-koeln.de,OU=Rechenzentrum,O=Rheinische Fachhochschule Koeln gGmbH,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHJTCCBg2gAwIBAgIHGaorpPBPojANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDjAMBgNVBAcTBUtv
-ZWxuMS4wLAYDVQQKEyVSaGVpbmlzY2hlIEZhY2hob2Noc2NodWxlIEtvZWxuIGdH
-bWJIMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMRUwEwYDVQQDEwxSRkggS29lbG4g
-Q0ExHzAdBgkqhkiG9w0BCQEWEHBraUByZmgta29lbG4uZGUwHhcNMTUwNjI0MTMx
-ODEzWhcNMTgwOTIwMTMxODEzWjCBnzELMAkGA1UEBhMCREUxHDAaBgNVBAgME05v
-cmRyaGVpbi1XZXN0ZmFsZW4xDjAMBgNVBAcMBUtvZWxuMS4wLAYDVQQKDCVSaGVp
-bmlzY2hlIEZhY2hob2Noc2NodWxlIEtvZWxuIGdHbWJIMRYwFAYDVQQLDA1SZWNo
-ZW56ZW50cnVtMRowGAYDVQQDDBFpZHAyLnJmaC1rb2Vsbi5kZTCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAMd4FiJgA3//s13pX0vq13lLd+t91MCueeUI
-5Z+TAB7EaZK6DrQXqdeFKULkXcPjnIU1y+DEyUHYujIdUJgbq/xgWAUEIK3uHO3e
-gDd6psc08hIg7TkXB9OPL1F1hChURaxuYPgexuxcsBr3Ou+U4/tLI4vgmjHM8nzY
-TcPHksJbQSqfCuBX1IRJzdc7iX+kaud2GWqxg2a0LZpZxMf3hasYGX1zDNkxMkr8
-cBf2hwu9oVSImH/gU6bfBHCIlLSRONi1A/K2TGQe8EYyEDL1GtCM7MUj7o7OIEqq
-pH2IibPXHQjFt/bh6iFpseZjS8HwUGZE04m5FZ+G3/ECFdq6DPkTxCV0rNasCLqM
-dKVQPsJl/M8pWrOrVoWpMiKErOVjZH+bH/XecJP/CtcrmEL7L4F6ZQaqoOxwOeBc
-pXsEfdaMBauoQpRsRxCHYcfebprR30bpOfxOlebbN7K8p/Pv/5SASY6ocuNtJElz
-cDQ/pxT7R6iEE+BbNH4h5CAEk4oc1AsXoBWdUUdY0hc5NHrnfuUDtzJDJfocG06B
-t46IXppa3QWGC8cJK8JWTjKr1xHrfGnrYPfg1f9DlqWPCro5HsClVvJfP3BIT+oz
-MeOVjaEeimJBpDBO7BR+52Ax1iqllPz8pSsX+Bik4ZLjBGVd2Dfp049m1QUEyHA4
-zaz+xs+bAgMBAAGjggJGMIICQjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQD
-AzARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGt
-IYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
-AgYIKwYBBQUHAwEwHQYDVR0OBBYEFFPwyjZagygVUiGYVVxy3+QI3TfSMB8GA1Ud
-IwQYMBaAFDEjMbZNNf9hivJNXA+Jny9LdmtGMBwGA1UdEQQVMBOCEWlkcDIucmZo
-LWtvZWxuLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL3JmaC1rb2Vsbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS9yZmgta29lbG4tY2EvcHViL2NybC9jYWNybC5jcmww
-gdMGCCsGAQUFBwEBBIHGMIHDMDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
-ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvcmZoLWtvZWxuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBF
-BggrBgEFBQcwAoY5aHR0cDovL2NkcDIucGNhLmRmbi5kZS9yZmgta29lbG4tY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCjnjXKGnVP
-hd3Do1HsnPZTwRQ+SmrYoZOjT8rDtmCl1XWgcMMxkZrL7GZoBniBT0/D53LZj8l5
-/4DEH8BRDDEFk8lJxeW7STGC62Wq5KCzCDHzh/Tg3uapyn8+Spa/ozZ2tHVQNL5m
-W1hmLJHYykwITjVpUQRrQHMIterNiWVLPUiJW6lZaEmUPHlIM4hbb5b/4rxySrCk
-RSyaXcHkY/vFUfPyc77H5RnGnKi+PCoFzTEOMWPqfs5IrSe2qLYXmoY1xgFaZa8u
-WfCA0DKwsEbCD5XXjPzmUaAUSUf1iAEh16iZ8+QNLhyDq4dqjVaLYkFu1JlhKiU3
-mZ/qmmwB8wRz
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.rfh-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.rfh-koeln.de: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">e336</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e336</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Rheinische Fachhochschule Köln gGmbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Rheinische Fachhochschule Köln gGmbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.rfh-koeln.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.rfh-koeln.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Volker</md:GivenName>
-    <md:SurName>Beckhausen</md:SurName>
-    <md:EmailAddress>mailto:beckhausen@rfh-koeln.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>RZSERVICE</md:GivenName>
-    <md:SurName>RZSERVICE</md:SurName>
-    <md:EmailAddress>mailto:rzservice@rfh-koeln.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.unr.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.unr.edu-idp-shibboleth.xml
deleted file mode 100644
index 77ea4752..00000000
--- a/swamid-interfederations-2.0/idp2.unr.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://idp2.unr.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp2.unr.edu/idp/error.jsp" 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">unr.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Nevada, Reno</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Founded in 1874 as the Silver State's first university, Nevada is a top-caliber, land-grant research university.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unr.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unr.edu/general-information/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="134" width="400" xml:lang="en">https://idp2.unr.edu/idp/images/unr-n-400.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>
-MIIDGzCCAgOgAwIBAgIUZomFfy8uFN6CwFWctxZCqJsnTOMwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwMi51bnIuZWR1MB4XDTEyMDgwNzIwMjIwMloXDTMy
-MDgwNzIwMjIwMlowFzEVMBMGA1UEAxMMaWRwMi51bnIuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlmErn3kjyaTMwkLdG3GWkOfWViznKyQxsjgJ
-Z1fJzKv14wkoqIx5n5V6jJRDfc0sPb4lPos+tG/mkL4cvG2HX9Kmhpx6PnaQEaye
-BYx46pVdrC2vh5j76kjkqXLeMxVFUYqN/JLZ0rYuxpZIu7S+IezQlvMqWoBBfFKx
-z9W2iguf6+56rWBy4ANyH8vIprdfFduqjWShbepkAlIlM7yGhK7IrTXlOJa6ze6T
-GXQt7Gj5H7trRp1Q/lEwi8SrRs+FJdvetg+yjDdudd5W2qpcC6mmGol+s1QfE10l
-JZ0jcpb29xol5F0DraVU/xG/jHO36aYlaAQ2be2a/6Ex3WWpFQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAyLnVuci5lZHWGI2h0dHBzOi8vaWRwMi51bnIuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBS85y3csRWrHW4YpqpK+zaxrwOUJzANBgkq
-hkiG9w0BAQUFAAOCAQEACAwu+lFf2Z2JxArjTrDUJSbdCNcUY+4wFusrGR6IhZ3W
-PRe5k/rkH8b0AaFoJ03X2r2tomrUd5Z5sP7U0D3nFZ7RdmQ5c4QQepoSk99sZwCT
-auKFbgU6Ck+nrc62ddGfmp6RZklpvmSslFMntBiNp/7HnKvnp3OX/ToXWsdUvhZf
-Uzg3mamGpm5ZLIPMryydAMbYJLvwV8XIbP9fZJAn0d0LflznI5FwecrK5Kz3jAbe
-X9jQS0IfHMVsLIV5TQJbluxByKvrBHFQWXAQVuv1r2QsZD6hx4nQo/SFSz5xGhR+
-85F/oeNtrAXqZplexfbC3eBZMWCs2AEhhC9fLI4w3A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.unr.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.unr.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.unr.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.unr.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.unr.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.unr.edu/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">unr.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUZomFfy8uFN6CwFWctxZCqJsnTOMwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMaWRwMi51bnIuZWR1MB4XDTEyMDgwNzIwMjIwMloXDTMy
-MDgwNzIwMjIwMlowFzEVMBMGA1UEAxMMaWRwMi51bnIuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlmErn3kjyaTMwkLdG3GWkOfWViznKyQxsjgJ
-Z1fJzKv14wkoqIx5n5V6jJRDfc0sPb4lPos+tG/mkL4cvG2HX9Kmhpx6PnaQEaye
-BYx46pVdrC2vh5j76kjkqXLeMxVFUYqN/JLZ0rYuxpZIu7S+IezQlvMqWoBBfFKx
-z9W2iguf6+56rWBy4ANyH8vIprdfFduqjWShbepkAlIlM7yGhK7IrTXlOJa6ze6T
-GXQt7Gj5H7trRp1Q/lEwi8SrRs+FJdvetg+yjDdudd5W2qpcC6mmGol+s1QfE10l
-JZ0jcpb29xol5F0DraVU/xG/jHO36aYlaAQ2be2a/6Ex3WWpFQIDAQABo18wXTA8
-BgNVHREENTAzggxpZHAyLnVuci5lZHWGI2h0dHBzOi8vaWRwMi51bnIuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBS85y3csRWrHW4YpqpK+zaxrwOUJzANBgkq
-hkiG9w0BAQUFAAOCAQEACAwu+lFf2Z2JxArjTrDUJSbdCNcUY+4wFusrGR6IhZ3W
-PRe5k/rkH8b0AaFoJ03X2r2tomrUd5Z5sP7U0D3nFZ7RdmQ5c4QQepoSk99sZwCT
-auKFbgU6Ck+nrc62ddGfmp6RZklpvmSslFMntBiNp/7HnKvnp3OX/ToXWsdUvhZf
-Uzg3mamGpm5ZLIPMryydAMbYJLvwV8XIbP9fZJAn0d0LflznI5FwecrK5Kz3jAbe
-X9jQS0IfHMVsLIV5TQJbluxByKvrBHFQWXAQVuv1r2QsZD6hx4nQo/SFSz5xGhR+
-85F/oeNtrAXqZplexfbC3eBZMWCs2AEhhC9fLI4w3A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.unr.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.unr.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Nevada, Reno</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Nevada, Reno</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unr.edu/content/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jeff Springer</md:GivenName>
-    <md:EmailAddress>jeffs@unr.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Joshua Hegie</md:GivenName>
-    <md:EmailAddress>jhegie@unr.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>University of Nevada, Reno Help Desk</md:GivenName>
-    <md:EmailAddress>help@unr.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml
deleted file mode 100644
index f9da53b6..00000000
--- a/swamid-interfederations-2.0/idp2.uop.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.uop.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">uop.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of the Peloponnese</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Πανεπιστήμιο Πελοποννήσου</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.uop.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.uop.gr/</mdui:InformationURL>
-        <mdui:Logo height="64" width="64">http://www.uop.gr/images/stories/uop-logo-64px.png</mdui:Logo>
-        <mdui:Logo height="128" width="128">http://www.uop.gr/images/stories/uop-logo-128px.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>uop.gr</mdui:DomainHint>
-        <mdui:IPHint>195.251.113.0/24</mdui:IPHint>
-        <mdui:IPHint>195.251.46.0/24</mdui:IPHint>
-        <mdui:IPHint>195.251.47.0/24</mdui:IPHint>
-        <mdui:IPHint>195.251.112.0/24</mdui:IPHint>
-        <mdui:IPHint>195.251.38.0/24</mdui:IPHint>
-        <mdui:IPHint>195.251.39.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:648:2320::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:37.512646, 22.368098</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>
-                            MIIEmDCCA4CgAwIBAgIRAJ4WjeBWjXCLsEtthbCLLdIwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMTA1MjYwMDAwMDBaFw0xNDA1MjUyMzU5NTlaMGoxCzAJBgNV
-                            BAYTAkdSMRAwDgYDVQQIEwdBcmthZGlhMRAwDgYDVQQHEwdUcmlwb2xpMSIwIAYD
-                            VQQKExlVbml2ZXJzaXR5IG9mIFBlbG9wb25uZXNlMRMwEQYDVQQDEwppZHAudW9w
-                            LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA24nVbTx2mus18a+a
-                            SD/0JD+ot3o0G9ciu7LMhC0zb5kj4eulMqANjlOZ9Z0Rt5rOxoJZoz2pihcV5Xrq
-                            C1o7s2p154qXQ8Z+Hxb77uCJ2KxhtU94/4T3GmCOmmNizcpwTdf4ukZY2WximUXK
-                            nY6WsLLHzrxeVxHFmF8zLS39ADahYDKUOs4T2Jny/DErMdX96mDDTo0r9//6MwMn
-                            F0uo7rqbaUhjWP6JVJmd1i9sRpLaAIZ3+FgGb/UBwxA/1wh0qXOlEGsQiPBYzxnM
-                            z5H6ai7oxo6hcCoBapNFr907Og6Ivn6xfkPXeGxQ34tsbDjZSmZbpUa9ZE4u9XQw
-                            A+Bw8wIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-                            ue0wHQYDVR0OBBYEFHN+S9NJDGWmziYbiwgWUR22S2xhMA4GA1UdDwEB/wQEAwIF
-                            oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
-                            BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
-                            Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
-                            BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
-                            TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
-                            b3JnMCMGA1UdEQQcMBqCCmlkcC51b3AuZ3KCDGxvZ2luLnVvcC5ncjANBgkqhkiG
-                            9w0BAQUFAAOCAQEAuQGsiWrJ1NvPjLEsVQp3ZdMu7BIMNSpqKBFfyEOXCkazPGob
-                            BLkLt+SIlz081FNKV+ceBsKruPA/Nic6ION3dNQe7jKyVyilCYZOGw35lYfjPsdL
-                            GHEKIogktne7RNbp7TOw/Ne1CLIVsihlvCION1McfytXdtUoPZv2OO2WoF84Yu/l
-                            PqTI+4Iz9up5IgVPIXj0G7XmqVpqRzADjW6Qk5IGEIGPoQYc873EVU1a/aweEx9p
-                            nxSUIOPwdtiBGQ9uZAEvyq4Tph5oyT+LKD74O9lOzI5pkKkN1qPFR62/mbO4LPLB
-                            9+3n1uZOewlkWpTDFl/dYoRwb0MHO7NF/JEiSA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uop.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uop.gr: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.uop.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uop.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uop.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uop.gr/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">uop.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEmDCCA4CgAwIBAgIRAJ4WjeBWjXCLsEtthbCLLdIwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMTA1MjYwMDAwMDBaFw0xNDA1MjUyMzU5NTlaMGoxCzAJBgNV
-                            BAYTAkdSMRAwDgYDVQQIEwdBcmthZGlhMRAwDgYDVQQHEwdUcmlwb2xpMSIwIAYD
-                            VQQKExlVbml2ZXJzaXR5IG9mIFBlbG9wb25uZXNlMRMwEQYDVQQDEwppZHAudW9w
-                            LmdyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA24nVbTx2mus18a+a
-                            SD/0JD+ot3o0G9ciu7LMhC0zb5kj4eulMqANjlOZ9Z0Rt5rOxoJZoz2pihcV5Xrq
-                            C1o7s2p154qXQ8Z+Hxb77uCJ2KxhtU94/4T3GmCOmmNizcpwTdf4ukZY2WximUXK
-                            nY6WsLLHzrxeVxHFmF8zLS39ADahYDKUOs4T2Jny/DErMdX96mDDTo0r9//6MwMn
-                            F0uo7rqbaUhjWP6JVJmd1i9sRpLaAIZ3+FgGb/UBwxA/1wh0qXOlEGsQiPBYzxnM
-                            z5H6ai7oxo6hcCoBapNFr907Og6Ivn6xfkPXeGxQ34tsbDjZSmZbpUa9ZE4u9XQw
-                            A+Bw8wIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-                            ue0wHQYDVR0OBBYEFHN+S9NJDGWmziYbiwgWUR22S2xhMA4GA1UdDwEB/wQEAwIF
-                            oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
-                            BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
-                            Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
-                            BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
-                            TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
-                            b3JnMCMGA1UdEQQcMBqCCmlkcC51b3AuZ3KCDGxvZ2luLnVvcC5ncjANBgkqhkiG
-                            9w0BAQUFAAOCAQEAuQGsiWrJ1NvPjLEsVQp3ZdMu7BIMNSpqKBFfyEOXCkazPGob
-                            BLkLt+SIlz081FNKV+ceBsKruPA/Nic6ION3dNQe7jKyVyilCYZOGw35lYfjPsdL
-                            GHEKIogktne7RNbp7TOw/Ne1CLIVsihlvCION1McfytXdtUoPZv2OO2WoF84Yu/l
-                            PqTI+4Iz9up5IgVPIXj0G7XmqVpqRzADjW6Qk5IGEIGPoQYc873EVU1a/aweEx9p
-                            nxSUIOPwdtiBGQ9uZAEvyq4Tph5oyT+LKD74O9lOzI5pkKkN1qPFR62/mbO4LPLB
-                            9+3n1uZOewlkWpTDFl/dYoRwb0MHO7NF/JEiSA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uop.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uop.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Peloponnese</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Πελοποννήσου</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Peloponnese</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Πελοποννήσου</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uop.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.uop.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kostas</md:GivenName>
-    <md:SurName>Mpalasis</md:SurName>
-    <md:EmailAddress>mpalasis@uop.gr</md:EmailAddress>
-    <md:TelephoneNumber>2710372278</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Peloponnese Helpdesk</md:Company>
-    <md:EmailAddress>helpdesk@uop.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 07635d77..00000000
--- a/swamid-interfederations-2.0/idp3.bucks.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3.bucks.ac.uk/idp/shibboleth">
-  <!--
-		This is a test Shibboleth IdP for Buckinghamshire New University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T11:14:51Z">
-      <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 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">bucks.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Buckinghamshire New University (Test Only)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">BNU Shib 3 test facilty</mdui:Description>
-        <mdui:Logo height="70" width="208">https://idp3.bucks.ac.uk/idp/buckslogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIUcF2+rhqg1Bkw5f32M83xfEhRa8EwDQYJKoZIhvcNAQEL
-						BQAwGzEZMBcGA1UEAwwQaWRwMy5idWNrcy5hYy51azAeFw0xNTExMTIxNDE3NTha
-						Fw0zNTExMTIxNDE3NThaMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCGC9v51zaMhkIeSAgJp7/cSZ0H
-						lUkTjWqvzqQX6wQ2Xh4faUzoS0evAdclm35MNMDJVgm5FlbVHgCQJru6wEXV/N+T
-						zRA6n4bkCR89hFUt4QIboTXnnmf9ct42HwNsZlG6NC+PhTTYzX1bxsoOBctTz/yK
-						Td3ISnePjxPWXGtrKhuQPbJBWNlMmcUsXFo5vSgJV32t1SPoQ+1r+J6dHyB2Ln8G
-						ICM3ueoYAYfjM5MMUrQLPrdei/NJ+jotQZcnYZw2QmqfTIAOWeSjBOJV17pAGEMV
-						EfQ1hvBZcPMsUo3MDlsak816X+h7TrNAeGBdIoCzYoMh6IfmcUC1+nUpaVP9AgMB
-						AAGjZzBlMB0GA1UdDgQWBBQciq33YUsxfPT8gJ7N7wb8/2Co2TBEBgNVHREEPTA7
-						ghBpZHAzLmJ1Y2tzLmFjLnVrhidodHRwczovL2lkcDMuYnVja3MuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAAP6MPMq6ELrqC9cADE9GS9G
-						1gyGw9tfQtKUKCJJCSiiPdOsknb5wveSfsX4VmE5mB6hLDAxUlmN46aXhvyIf0ue
-						Y6thbi4ZHYD0NS9KODF+3XSCgS5Dq9pezxjAj1Ar32UQkMBNYyOOQg81Yp+N9rOV
-						2zeHnHgVxjf+5O/Bl2wZ9YoYE0qp6TwPLPvmkSeeXapOgbHZZ4Qw4Zq8Zo9toWBL
-						MerL+bqLgF8ha1zmFCDQYst25i4+p4i5OFYEG9v/70WZaG+CKx0rZbA1z2sfCZl8
-						syWhQSP5tdqQepmqMo8f8TVdHAU4IXlBL9qROtr5BlTAVNpUB98cX12KJwl4OjE=
-					</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>
-						MIIDLDCCAhSgAwIBAgIVAOzsg1/QvG6GlxDD0oixe7saqY58MA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswHhcNMTUxMTEyMTQxNzU2
-						WhcNMzUxMTEyMTQxNzU2WjAbMRkwFwYDVQQDDBBpZHAzLmJ1Y2tzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncjTXXULy1jZ0DQn0AdP745N
-						AqZQhnf2kw4qg/p+QdCKX9AXS9NoE067k6UEQ21rljSHNKBmZLq6AoO1wTOvxI4m
-						GsOz4NJaBOvCuMgFEww93p0tsyncKyo7DawvDj2NFS/Lfop/FixhFTxTIzq58bJi
-						u1s0CYzXoWVhXZmbPPz6fc6JwnSe/b0qE9cFf5tLdYFGhKN3a8pXn/pRuNVlouVD
-						Cf4j2jUyXoniYOulPeyZg2WhG7X8kj6bgdaVLY0MGR/F6UerVbqpEEU41/szjw0p
-						4Xf1QihYueaGMZjxrxw1fEHmsf5CqSL06yh8R3+MMwgfBqqq/CtCb65Si2N8/wID
-						AQABo2cwZTAdBgNVHQ4EFgQUMF/aF1hr/K1zjWgo+33U2JhMoDMwRAYDVR0RBD0w
-						O4IQaWRwMy5idWNrcy5hYy51a4YnaHR0cHM6Ly9pZHAzLmJ1Y2tzLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA+ktUiMDNcGNSgUPZbYpsc
-						eLVLDOnjZr3gtLQxp3icZ9tJSg8rgvl+rPsGj6PU70fT+xwpbIPVPvQdKfc6RrFw
-						t3zNtTHnsC+BXeQq/Q/vI5668Edg9MYSNQkGXArMNIleDmp8k8vImQUcXKo0cvJz
-						5YC28RXv+o0ps/vUETv1uw+bq7qOixZWidd9/JfLJJeK5o4w2hc788sn2/SWgZll
-						IsskCLVsmeAnKVlvqOhPOWzw15NcK0RQZxuxUFqGxFIGwDRm8bhhsXZql6NSqZWS
-						TQZq49Nrw0CYAAaMBdh38rSxAbF/RkpQjh265fw0s0GXrCbacEhONcqNl3PIL09L
-					</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>
-						MIIDLDCCAhSgAwIBAgIVAJJgU10aDKjkSRc9fnYGv63VALGeMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswHhcNMTUxMTEyMTQxNzU3
-						WhcNMzUxMTEyMTQxNzU3WjAbMRkwFwYDVQQDDBBpZHAzLmJ1Y2tzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvS5TCq2OYLfSoO+q8Q5E+oo6
-						Xea/x47rL37fvRtT39FYYgiRDSa0mcHFtnvULQI45Yh/U9MjeE5Ol9/G3I5p9o0R
-						RZMoKVVnaegwSE7vygJd8rEzJXcXouoWQ3ePIUoTSoCjLjL1MATXPU3Z8f7H5/rU
-						6UgzcJ4dDs/xkIkIL+it3sENBm6jnddj1keNg5yIVf8I+EckJaGfqvY+AUhsN/bC
-						mvf6o3tIMrqw41u5Wt2XG3jhxRt2F9ei4FCIM/XppBHvzA8NR4qZqGGMrSp19fAE
-						VLpWJlivpaoSv/XheYV4NXL5CKOocCThxwt9NoicmabOQdq6hRbas/x6mW6nHQID
-						AQABo2cwZTAdBgNVHQ4EFgQUV1ip+SftPrM1Ib+LMfvMzjYmFKMwRAYDVR0RBD0w
-						O4IQaWRwMy5idWNrcy5hYy51a4YnaHR0cHM6Ly9pZHAzLmJ1Y2tzLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCuTOFng8ZyGpXTwt91yGT9
-						QJ9uf0/hIxzFSvoK9fnM8sv7MOalZfQV+ENjQ70LABFuD5429dDq1Rm6JGTDEywG
-						I5spspkqWlq0YIjXlbWqZZpk8S/SazbSrm1GkaIqKXqyd1tJystzgOeUojAUMsE6
-						VQtC2IuRe/ES9DHmTVZVxA7Nl8+KVzI5llJv6uOnf3zMdweH0WH+GWUixJxeMKGL
-						9dMTFSDNYzvy8DXVVhOJQ1QSzeWfszC11PxjNmLnt4wQ7iJ6mgiZ2eCTg8tJnhlj
-						IkB9rjmfh3VWJXkX4+k73yaY7QsyGPCJ4FeNj8S1uhMBMm2h7wZr65aGQvaMVfLP
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.bucks.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://idp3.bucks.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.bucks.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.bucks.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.bucks.ac.uk/idp/profile/SAML2/Redirect/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">bucks.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIUcF2+rhqg1Bkw5f32M83xfEhRa8EwDQYJKoZIhvcNAQEL
-						BQAwGzEZMBcGA1UEAwwQaWRwMy5idWNrcy5hYy51azAeFw0xNTExMTIxNDE3NTha
-						Fw0zNTExMTIxNDE3NThaMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCGC9v51zaMhkIeSAgJp7/cSZ0H
-						lUkTjWqvzqQX6wQ2Xh4faUzoS0evAdclm35MNMDJVgm5FlbVHgCQJru6wEXV/N+T
-						zRA6n4bkCR89hFUt4QIboTXnnmf9ct42HwNsZlG6NC+PhTTYzX1bxsoOBctTz/yK
-						Td3ISnePjxPWXGtrKhuQPbJBWNlMmcUsXFo5vSgJV32t1SPoQ+1r+J6dHyB2Ln8G
-						ICM3ueoYAYfjM5MMUrQLPrdei/NJ+jotQZcnYZw2QmqfTIAOWeSjBOJV17pAGEMV
-						EfQ1hvBZcPMsUo3MDlsak816X+h7TrNAeGBdIoCzYoMh6IfmcUC1+nUpaVP9AgMB
-						AAGjZzBlMB0GA1UdDgQWBBQciq33YUsxfPT8gJ7N7wb8/2Co2TBEBgNVHREEPTA7
-						ghBpZHAzLmJ1Y2tzLmFjLnVrhidodHRwczovL2lkcDMuYnVja3MuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAAP6MPMq6ELrqC9cADE9GS9G
-						1gyGw9tfQtKUKCJJCSiiPdOsknb5wveSfsX4VmE5mB6hLDAxUlmN46aXhvyIf0ue
-						Y6thbi4ZHYD0NS9KODF+3XSCgS5Dq9pezxjAj1Ar32UQkMBNYyOOQg81Yp+N9rOV
-						2zeHnHgVxjf+5O/Bl2wZ9YoYE0qp6TwPLPvmkSeeXapOgbHZZ4Qw4Zq8Zo9toWBL
-						MerL+bqLgF8ha1zmFCDQYst25i4+p4i5OFYEG9v/70WZaG+CKx0rZbA1z2sfCZl8
-						syWhQSP5tdqQepmqMo8f8TVdHAU4IXlBL9qROtr5BlTAVNpUB98cX12KJwl4OjE=
-					</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>
-						MIIDLDCCAhSgAwIBAgIVAOzsg1/QvG6GlxDD0oixe7saqY58MA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswHhcNMTUxMTEyMTQxNzU2
-						WhcNMzUxMTEyMTQxNzU2WjAbMRkwFwYDVQQDDBBpZHAzLmJ1Y2tzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAncjTXXULy1jZ0DQn0AdP745N
-						AqZQhnf2kw4qg/p+QdCKX9AXS9NoE067k6UEQ21rljSHNKBmZLq6AoO1wTOvxI4m
-						GsOz4NJaBOvCuMgFEww93p0tsyncKyo7DawvDj2NFS/Lfop/FixhFTxTIzq58bJi
-						u1s0CYzXoWVhXZmbPPz6fc6JwnSe/b0qE9cFf5tLdYFGhKN3a8pXn/pRuNVlouVD
-						Cf4j2jUyXoniYOulPeyZg2WhG7X8kj6bgdaVLY0MGR/F6UerVbqpEEU41/szjw0p
-						4Xf1QihYueaGMZjxrxw1fEHmsf5CqSL06yh8R3+MMwgfBqqq/CtCb65Si2N8/wID
-						AQABo2cwZTAdBgNVHQ4EFgQUMF/aF1hr/K1zjWgo+33U2JhMoDMwRAYDVR0RBD0w
-						O4IQaWRwMy5idWNrcy5hYy51a4YnaHR0cHM6Ly9pZHAzLmJ1Y2tzLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQA+ktUiMDNcGNSgUPZbYpsc
-						eLVLDOnjZr3gtLQxp3icZ9tJSg8rgvl+rPsGj6PU70fT+xwpbIPVPvQdKfc6RrFw
-						t3zNtTHnsC+BXeQq/Q/vI5668Edg9MYSNQkGXArMNIleDmp8k8vImQUcXKo0cvJz
-						5YC28RXv+o0ps/vUETv1uw+bq7qOixZWidd9/JfLJJeK5o4w2hc788sn2/SWgZll
-						IsskCLVsmeAnKVlvqOhPOWzw15NcK0RQZxuxUFqGxFIGwDRm8bhhsXZql6NSqZWS
-						TQZq49Nrw0CYAAaMBdh38rSxAbF/RkpQjh265fw0s0GXrCbacEhONcqNl3PIL09L
-					</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>
-						MIIDLDCCAhSgAwIBAgIVAJJgU10aDKjkSRc9fnYGv63VALGeMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcDMuYnVja3MuYWMudWswHhcNMTUxMTEyMTQxNzU3
-						WhcNMzUxMTEyMTQxNzU3WjAbMRkwFwYDVQQDDBBpZHAzLmJ1Y2tzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvS5TCq2OYLfSoO+q8Q5E+oo6
-						Xea/x47rL37fvRtT39FYYgiRDSa0mcHFtnvULQI45Yh/U9MjeE5Ol9/G3I5p9o0R
-						RZMoKVVnaegwSE7vygJd8rEzJXcXouoWQ3ePIUoTSoCjLjL1MATXPU3Z8f7H5/rU
-						6UgzcJ4dDs/xkIkIL+it3sENBm6jnddj1keNg5yIVf8I+EckJaGfqvY+AUhsN/bC
-						mvf6o3tIMrqw41u5Wt2XG3jhxRt2F9ei4FCIM/XppBHvzA8NR4qZqGGMrSp19fAE
-						VLpWJlivpaoSv/XheYV4NXL5CKOocCThxwt9NoicmabOQdq6hRbas/x6mW6nHQID
-						AQABo2cwZTAdBgNVHQ4EFgQUV1ip+SftPrM1Ib+LMfvMzjYmFKMwRAYDVR0RBD0w
-						O4IQaWRwMy5idWNrcy5hYy51a4YnaHR0cHM6Ly9pZHAzLmJ1Y2tzLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCuTOFng8ZyGpXTwt91yGT9
-						QJ9uf0/hIxzFSvoK9fnM8sv7MOalZfQV+ENjQ70LABFuD5429dDq1Rm6JGTDEywG
-						I5spspkqWlq0YIjXlbWqZZpk8S/SazbSrm1GkaIqKXqyd1tJystzgOeUojAUMsE6
-						VQtC2IuRe/ES9DHmTVZVxA7Nl8+KVzI5llJv6uOnf3zMdweH0WH+GWUixJxeMKGL
-						9dMTFSDNYzvy8DXVVhOJQ1QSzeWfszC11PxjNmLnt4wQ7iJ6mgiZ2eCTg8tJnhlj
-						IkB9rjmfh3VWJXkX4+k73yaY7QsyGPCJ4FeNj8S1uhMBMm2h7wZr65aGQvaMVfLP
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.bucks.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Buckinghamshire New University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Buckinghamshire New University (Test Only)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bucks.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Core Systems</GivenName>
-    <EmailAddress>mailto:coresystems@bucks.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Oliver</GivenName>
-    <SurName>Facey</SurName>
-    <EmailAddress>mailto:oliver.facey@bucks.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp3.cereq.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.cereq.fr-idp-shibboleth.xml
deleted file mode 100644
index eff022bc..00000000
--- a/swamid-interfederations-2.0/idp3.cereq.fr-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://idp3.cereq.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-01-08T16:06:31Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 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="en">CEREQ - Centre d'Etudes et de Recherches sur les Qualifications</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.cereq.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Etablissement Cereq</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CEREQ - Centre d'Etudes et de Recherches sur les Qualifications</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etablissement Cereq</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>
-					      MIIDIDCCAgigAwIBAgIVAO96+MdOaQe5EMJnglGjZfU46nrSMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcDMuY2VyZXEuZnIwHhcNMTYwMTA3MTQzNzAxWhcN
-MzYwMTA3MTQzNzAxWjAYMRYwFAYDVQQDDA1pZHAzLmNlcmVxLmZyMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtsjtGuK9REW0YMw+dmgHzfs18sgUlU3y
-sv2GZ9Mow+cd0RSPKXA/Vrz8gaCORwJqxbCUcMb1PEI4Y8y8E/5jS4pTZxl5pnAH
-cATfSVP5NMxbvGBeXr3tKZi/ShFAsLr+CPlxheFzxiM42mgiKkl7Cpe7pM1wla87
-px+pNQ5MOopxFaBekHw6VKJBBKrnlj52UUZRxsQPkZ7h5GY4wilE1Kby0jE/2lV2
-f99AfBy3tqSVwhougtxvDRGkFPuLpn1R3OKd3MVsYz+RJCTVgnJt0mA+NZukDJKx
-76Gcy7OM61D+ZGFhIZwXKcBS4eGcRGcDU1B24ZZ4kIoEp2dHfiuLuQIDAQABo2Ew
-XzAdBgNVHQ4EFgQUOsLeI6L1a5ezQG33N5Eg5n7/pPAwPgYDVR0RBDcwNYINaWRw
-My5jZXJlcS5mcoYkaHR0cHM6Ly9pZHAzLmNlcmVxLmZyL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQBO114KwhKUISVyAHNOAJAgNNphlMh5zeWIV11y
-uORkrowon95LHS8i4rUSJiYWwPD6ptADw2AbXq6FivNe20oU8+7MgNEGdLeh3+Nn
-x+pdn4yGF7VeCsNahGxc3eI3NsfivG93UxFOtx85REtdbe6BF9a9SBjLVox/QQBl
-AeeGhn6Mqu7/QBY9T2fFIHk4S+pK3mRRaBktJqM1ILlUVw0A87VlOhB8ZA+QyVR4
-AMIInfjfMnhKe6k3H8rKxHl1VlIjQAoEG8SgagYkb01ybrYuOeAns7FIwItd5Wib
-vuXR32cEGvWpoYBL2Q2J/C4FQjIW5bxWi45SC7V39d6G64Ok
-					    </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-POST" Location="https://idp3.cereq.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.cereq.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.cereq.fr/idp/profile/Shibbboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CEREQ - Centre d'Etudes et de Recherches sur les Qualifications</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CEREQ - Centre d'Etudes et de Recherches sur les Qualifications</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cereq.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Pelé jean</md:SurName>
-    <md:EmailAddress>pele@cereq.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Silvère Chieusse</md:SurName>
-    <md:EmailAddress>silvere.chieusse@cereq.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.xml
deleted file mode 100644
index 9fded05e..00000000
--- a/swamid-interfederations-2.0/idp3.cyceron.fr-idp-shibboleth.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://idp3.cyceron.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-02T15:40:57Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 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:Logo height="16" width="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wwCDwEr/r6u7AAAAhVJREFUOMttk02IjWEYhq/7mzlNI8k0zaTs2Ig6RzaSGspPyopS0qREsqbQec8CnfeEDVvC0kKEskBk/JXC4vs0iUyWZmxmLGRM47stvEdf0zyrt6f7uZ7fVyQL9UgsAqEej0oatn1J0k+gF7hg+y7wCrgu6ZDt/bEIt7IuIAUH4ApwDnjXzpsAe4DjwO35+XkBBwEBkUQHoNXoZMAo4CRY02p0hsqyfJBl2RNJ92q12glgFlgi6TFJSAVyB9gLYBtgCJiWZNvfgUHgs6R9c3NzH2q1mrNQj/8Btjen55gkgAlJU7YngGWSkDRcluX4xY9nHItAr6T1rUbnGdBnu9d2TyxCGepxi6QxAEmDtr/aXi5pQFIN+AOgUI8fgHX6l/IbsLKdN50241QJwJt23tyUWp0B+oDYC6xOwbY9FIvgUI+Hga2SfgH9aR7nK60iqQ84mUm6bBvbktRuNTprJV2TNGq7HzglaSQW4X5l3q9ty/bNrJ03m8AuSdvbefMscLq6Gdt5O2++XHBwu4GhWIRjajU6pIPpCnZKelRhNIBPwO+qrmvVQ1ple6Okq7Zn0/omgRyYiUUYYBFTCh4BnqdBSlKjnTeLVqMzBQynIe6IRXiyEJClPo9UgcB08o9XtG8Xq6D7md6lLKS9d/0HbO+TtCEW4cdigJ50yu+BpZJmgBtlWT4cWbGtD8gkTQJfXkw99WKAvw6F+iqRRKrtAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.cyceron.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Idp cyceron</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Cyceron</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Idp cyceron</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>
-					      MIIDJzCCAg+gAwIBAgIUd4yV7VyJaaQKxD07SGw7Mn368dkwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwMy5jeWNlcm9uLmZyMB4XDTE1MTIwMjEzMzQyM1oX
-DTM1MTIwMjEzMzQyM1owGjEYMBYGA1UEAwwPaWRwMy5jeWNlcm9uLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnCJRC+vTSzgV9lVg0zUR5VzPmUbi
-MXVIGNtfg9ZRukOtdksNmbXUunvrJ+gG6rU2mdFNwnYc7SoYM2IzLqDZRWNTDESg
-E3whqTQ/mIfq3GHGNowlDBUIEeNtOOrAnrLnUX1ajLUESWpeNw/dFv46xr9Be93n
-gnP4z6gxLYnwaj2t52QJl60m4iqFqsSFfQbtBoQJo0x6DR44gB8ZQ5J+f2ylDnlD
-QsZJur2u53nH9Ja00gHtVBB9DV1gPRWQ8RzhcA1S47BzieDEtNtxppyYoW25I+tR
-2uw5CNq2xJMMTcJFHIXrnv/7+HEJAW6GZylB7/R6z0SYEZGZI6ff+6U9fQIDAQAB
-o2UwYzAdBgNVHQ4EFgQUHUzKe91PU4ztZ5XWpwejI2zQ+CIwQgYDVR0RBDswOYIP
-aWRwMy5jeWNlcm9uLmZyhiZodHRwczovL2lkcDMuY3ljZXJvbi5mci9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEADDyuxvPXK3/OP9vZ6QCakxTzLDhP
-Sz5vsenCwGRlELfqBLUT/wU2FqgaVM6Z6YyeBWcXjVZ9u1jqovn8B+9saeCoJMN/
-fqnqIzjWt84UXNmCiVdQ/zhGF4KRkXxDR0lyW7MkTI0L3tZ/TY21Dcgbm7ACaHV0
-3jVbpwNVin0fd+b0R45UlIMcVjSG44fNpctROgRstPgmnQHu+HFAl5QnYKl+12AW
-33nMIlovQpwCdCGTKk0WUUutJcCbrFFYZUHEzi4v3rqcLzaQ4xxK6tJTvGvAaQPA
-oHzPlWtlZWRz8eUkil/RDUfqu2/GSUhl0CIvH7Ib10F4sZlZP00xsWd4yA==
-					    </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-POST" Location="https://idp3.cyceron.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.cyceron.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.cyceron.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cyceron</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cyceron</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cyceron.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Antoine NOURRY</md:SurName>
-    <md:EmailAddress>nourry@cyceron.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 1697785b..00000000
--- a/swamid-interfederations-2.0/idp3.leeds.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp3.leeds.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Test" Shibboleth IdP for the University of Leeds.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-25T11:01:40Z">
-      <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 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">leeds.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Leeds Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test IdP for University of Leeds</mdui:Description>
-        <mdui:Logo height="64" width="64">https://strategy.leeds.ac.uk/logo/uol64px.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIUYURZnINS9EeqJg0pAXf/MdmQ54gwDQYJKoZIhvcNAQEL
-						BQAwGzEZMBcGA1UEAwwQaWRwMy5sZWVkcy5hYy51azAeFw0xNTA4MTgxMDAyMjVa
-						Fw0zNTA4MTgxMDAyMjVaMBsxGTAXBgNVBAMMEGlkcDMubGVlZHMuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCruBWfogh3dxD2RdBKI3/F4Fmb
-						vvJBYCBgbiofz49DRT6qFNMWibY/EZczXWMBdCego16JYu3MVOouHSWTYgwk4V+q
-						GTojKkCk8ScDbMtx04PNPAFHL7ungi0MhxkXt5/MpwDFrJlGzGZrccV/u3zb9qCL
-						Unjv0GuvgvmYvSnJ4WdVCrc0v2d9H625pT92uEsV1adFmC3OJ8Jk5R9k/LE2AByL
-						iZqD5UZFf9Y8WZKUTFzkjYJRFJXZqMNv75jOMa867f+nSYOpBAghj575/N30yC5r
-						dLRMwTal8cvs+wF/R9lVbLYSCvsJ5QNnL+BQiPOGsJob0/0TvewSl8nUaLsFAgMB
-						AAGjZzBlMB0GA1UdDgQWBBSRdNZCmAme05qVft4XFWv4VbNkeTBEBgNVHREEPTA7
-						ghBpZHAzLmxlZWRzLmFjLnVrhidodHRwczovL2lkcDMubGVlZHMuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAEqN4qG5ILyxJ4wuiubbDqFR
-						5o708PBQRxMvBHn+oIliu1B7SJnvDZOlKGYAZGJf78aqMAPb7ECIAeAJ0AYgxhWW
-						jIsqrC41zNRWj1OtBJ+H8hPqw/4a8nVpSZuvdbilCwPBBYMng50vaM95POgMnod4
-						HOw/xVyhphAwgNR8BgACE8IlPSnLtravHFB1ZBhQ/uWJnNECbkdMvUCkDsds4By1
-						wDSxOl7VTLDNRwSyhXrYozc8reRh0prFGigUqguyp/KTojHZG/M2aU9M7YzMh+U7
-						uEIXZi3EMZmm5CTTQtCTIVJC/VfROS3pgnC+ur3qQfmWPXsHH8l155E6jogL1Jc=
-					</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>
-						MIIDLDCCAhSgAwIBAgIVALRts/OJ9FYIac96GkaAZZXUS5IZMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcDMubGVlZHMuYWMudWswHhcNMTUwODE4MTAwMjIz
-						WhcNMzUwODE4MTAwMjIzWjAbMRkwFwYDVQQDDBBpZHAzLmxlZWRzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh2OwSxoyvPCB74HzqJhDeHie
-						crlPJGRqWFrciKDnfstpAE/NaEjmceuI1Lu/1AITg+a9euKWuhSyPYSA3zPbdSBb
-						Lw9AEuw7Wt416KukY/RRvSPdDPHr1L3DAx2iDLj0zbq48Tc1shx3szin/HjgUrfe
-						YHwZkDrkP/z8x4hE3/mTzj+Lp4SKDqJ4TET1aLY5C8PdCRrnfiPMkkWRacVDPk52
-						64/ylNFdxvln31pR/POsDCfU5YvFyyIprMOV+dujRaLFnhHrtEUJNj+8efMXAyjp
-						u+kXkBwgBlhkjztFzKYlmvnn+cZR44REIbgTvOM+9sAA9yeCxxnncp1BRGjBAwID
-						AQABo2cwZTAdBgNVHQ4EFgQUcOb6y7ZYG4QsQhyd+hPo+5/rrigwRAYDVR0RBD0w
-						O4IQaWRwMy5sZWVkcy5hYy51a4YnaHR0cHM6Ly9pZHAzLmxlZWRzLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAIBTExL0Jxyg+nZiH5RrpW
-						TA/i7GiJ6sNbwvwKz2FHd5Uw2E8RCcsBWjJMfPEl8YDXHLHkvW8kv+AqbPDGeMHX
-						Dwz+2UuS0Qj4dACEZ1HuZLRzfKdtBBcY6I58suWppBDNuR0Mp+QXMPtgQUsbcLDq
-						N++zgEOkLj64nmPrr7os2toELnDS2OzbBQknQqJKQASrdMGMocfgjAlQJ3zZ1zTS
-						A0cvGu36rI4udLJQcopfcIwkXSdoUf61rWhHC4flU5k94R1MIOZcPNGioPWUgopB
-						kal0cnkoz2TNoT4WXv/Ob5J91TLyToRkod6npSNk+hSaCy554OiimCnyrqUPyKrW
-					</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>
-						MIIDKzCCAhOgAwIBAgIUKhTirYyDRSrB8gvM2sn66nNngqQwDQYJKoZIhvcNAQEL
-						BQAwGzEZMBcGA1UEAwwQaWRwMy5sZWVkcy5hYy51azAeFw0xNTA4MTgxMDAyMjRa
-						Fw0zNTA4MTgxMDAyMjRaMBsxGTAXBgNVBAMMEGlkcDMubGVlZHMuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdkM29DJqAD9YmOgFummgJNCUJ
-						titEUqaTnSLpwWzGJXNpRFA9T7uVbOF03GCU6SeTg/mpfm1J3E2WtpIb5OBxPb4N
-						4FITd2s+gMH3FcfQ5zLMsWeEJtx0lt4OvZjPqs/e73S09h03WTK8ExumPpsyccG7
-						hFqYwJggsJZqHEYvqSH4NZFCG5GIkXRUi0qISC2JgxsP4aAVez8+oChVq26qMcBw
-						V/tVoUf5hoFWX9Kp0tI9HcWjcgv3HyQSKDueFx2fADoMfy1vVsHYkYP2BZMONwsf
-						BuZW/hu7NmVMfiNJAqJlPbZJ6OEWmwKJDbtiCrNv5lg0WMgh/pZpzMDjJAn9AgMB
-						AAGjZzBlMB0GA1UdDgQWBBTAXntceiuy/zgkze2/eUi6QvuSjTBEBgNVHREEPTA7
-						ghBpZHAzLmxlZWRzLmFjLnVrhidodHRwczovL2lkcDMubGVlZHMuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACMWrgv/5Qv9HpEsmPHo0IlV
-						2oKtEZLU+hSJ81bejv9+QyabxXobKtc7mOhsaqUE0uXbMsMQvDXdjiaO1yca4r0p
-						iKY9MLVlFmWvGztsgto5MCzv1DIYrFQt1dhoXJQdurJF8Q58jNEizvjBR+lyUoIA
-						/zxOmg1dwK54FWFr9zRecsYaGTZGDZM0cIeApcQARtV6fpdoqwGFj1Nezcf8nwZ3
-						roJ5ROffd5RGxn9XQzbuPN7iovAhN4rgzxaAb2seIX70IlHk7D13AUKJYV+8gW7S
-						b1/t3dWvVAtKbFtDuK6uceoSakimTq266X2PvA+HjRhZS0adgH4dYDtEkiG3Vg0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.leeds.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.leeds.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://idp3.leeds.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.leeds.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp3.leeds.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.leeds.ac.uk/idp/profile/SAML2/Redirect/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">leeds.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIUYURZnINS9EeqJg0pAXf/MdmQ54gwDQYJKoZIhvcNAQEL
-						BQAwGzEZMBcGA1UEAwwQaWRwMy5sZWVkcy5hYy51azAeFw0xNTA4MTgxMDAyMjVa
-						Fw0zNTA4MTgxMDAyMjVaMBsxGTAXBgNVBAMMEGlkcDMubGVlZHMuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCruBWfogh3dxD2RdBKI3/F4Fmb
-						vvJBYCBgbiofz49DRT6qFNMWibY/EZczXWMBdCego16JYu3MVOouHSWTYgwk4V+q
-						GTojKkCk8ScDbMtx04PNPAFHL7ungi0MhxkXt5/MpwDFrJlGzGZrccV/u3zb9qCL
-						Unjv0GuvgvmYvSnJ4WdVCrc0v2d9H625pT92uEsV1adFmC3OJ8Jk5R9k/LE2AByL
-						iZqD5UZFf9Y8WZKUTFzkjYJRFJXZqMNv75jOMa867f+nSYOpBAghj575/N30yC5r
-						dLRMwTal8cvs+wF/R9lVbLYSCvsJ5QNnL+BQiPOGsJob0/0TvewSl8nUaLsFAgMB
-						AAGjZzBlMB0GA1UdDgQWBBSRdNZCmAme05qVft4XFWv4VbNkeTBEBgNVHREEPTA7
-						ghBpZHAzLmxlZWRzLmFjLnVrhidodHRwczovL2lkcDMubGVlZHMuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAEqN4qG5ILyxJ4wuiubbDqFR
-						5o708PBQRxMvBHn+oIliu1B7SJnvDZOlKGYAZGJf78aqMAPb7ECIAeAJ0AYgxhWW
-						jIsqrC41zNRWj1OtBJ+H8hPqw/4a8nVpSZuvdbilCwPBBYMng50vaM95POgMnod4
-						HOw/xVyhphAwgNR8BgACE8IlPSnLtravHFB1ZBhQ/uWJnNECbkdMvUCkDsds4By1
-						wDSxOl7VTLDNRwSyhXrYozc8reRh0prFGigUqguyp/KTojHZG/M2aU9M7YzMh+U7
-						uEIXZi3EMZmm5CTTQtCTIVJC/VfROS3pgnC+ur3qQfmWPXsHH8l155E6jogL1Jc=
-					</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>
-						MIIDLDCCAhSgAwIBAgIVALRts/OJ9FYIac96GkaAZZXUS5IZMA0GCSqGSIb3DQEB
-						CwUAMBsxGTAXBgNVBAMMEGlkcDMubGVlZHMuYWMudWswHhcNMTUwODE4MTAwMjIz
-						WhcNMzUwODE4MTAwMjIzWjAbMRkwFwYDVQQDDBBpZHAzLmxlZWRzLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh2OwSxoyvPCB74HzqJhDeHie
-						crlPJGRqWFrciKDnfstpAE/NaEjmceuI1Lu/1AITg+a9euKWuhSyPYSA3zPbdSBb
-						Lw9AEuw7Wt416KukY/RRvSPdDPHr1L3DAx2iDLj0zbq48Tc1shx3szin/HjgUrfe
-						YHwZkDrkP/z8x4hE3/mTzj+Lp4SKDqJ4TET1aLY5C8PdCRrnfiPMkkWRacVDPk52
-						64/ylNFdxvln31pR/POsDCfU5YvFyyIprMOV+dujRaLFnhHrtEUJNj+8efMXAyjp
-						u+kXkBwgBlhkjztFzKYlmvnn+cZR44REIbgTvOM+9sAA9yeCxxnncp1BRGjBAwID
-						AQABo2cwZTAdBgNVHQ4EFgQUcOb6y7ZYG4QsQhyd+hPo+5/rrigwRAYDVR0RBD0w
-						O4IQaWRwMy5sZWVkcy5hYy51a4YnaHR0cHM6Ly9pZHAzLmxlZWRzLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAIBTExL0Jxyg+nZiH5RrpW
-						TA/i7GiJ6sNbwvwKz2FHd5Uw2E8RCcsBWjJMfPEl8YDXHLHkvW8kv+AqbPDGeMHX
-						Dwz+2UuS0Qj4dACEZ1HuZLRzfKdtBBcY6I58suWppBDNuR0Mp+QXMPtgQUsbcLDq
-						N++zgEOkLj64nmPrr7os2toELnDS2OzbBQknQqJKQASrdMGMocfgjAlQJ3zZ1zTS
-						A0cvGu36rI4udLJQcopfcIwkXSdoUf61rWhHC4flU5k94R1MIOZcPNGioPWUgopB
-						kal0cnkoz2TNoT4WXv/Ob5J91TLyToRkod6npSNk+hSaCy554OiimCnyrqUPyKrW
-					</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>
-						MIIDKzCCAhOgAwIBAgIUKhTirYyDRSrB8gvM2sn66nNngqQwDQYJKoZIhvcNAQEL
-						BQAwGzEZMBcGA1UEAwwQaWRwMy5sZWVkcy5hYy51azAeFw0xNTA4MTgxMDAyMjRa
-						Fw0zNTA4MTgxMDAyMjRaMBsxGTAXBgNVBAMMEGlkcDMubGVlZHMuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdkM29DJqAD9YmOgFummgJNCUJ
-						titEUqaTnSLpwWzGJXNpRFA9T7uVbOF03GCU6SeTg/mpfm1J3E2WtpIb5OBxPb4N
-						4FITd2s+gMH3FcfQ5zLMsWeEJtx0lt4OvZjPqs/e73S09h03WTK8ExumPpsyccG7
-						hFqYwJggsJZqHEYvqSH4NZFCG5GIkXRUi0qISC2JgxsP4aAVez8+oChVq26qMcBw
-						V/tVoUf5hoFWX9Kp0tI9HcWjcgv3HyQSKDueFx2fADoMfy1vVsHYkYP2BZMONwsf
-						BuZW/hu7NmVMfiNJAqJlPbZJ6OEWmwKJDbtiCrNv5lg0WMgh/pZpzMDjJAn9AgMB
-						AAGjZzBlMB0GA1UdDgQWBBTAXntceiuy/zgkze2/eUi6QvuSjTBEBgNVHREEPTA7
-						ghBpZHAzLmxlZWRzLmFjLnVrhidodHRwczovL2lkcDMubGVlZHMuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACMWrgv/5Qv9HpEsmPHo0IlV
-						2oKtEZLU+hSJ81bejv9+QyabxXobKtc7mOhsaqUE0uXbMsMQvDXdjiaO1yca4r0p
-						iKY9MLVlFmWvGztsgto5MCzv1DIYrFQt1dhoXJQdurJF8Q58jNEizvjBR+lyUoIA
-						/zxOmg1dwK54FWFr9zRecsYaGTZGDZM0cIeApcQARtV6fpdoqwGFj1Nezcf8nwZ3
-						roJ5ROffd5RGxn9XQzbuPN7iovAhN4rgzxaAb2seIX70IlHk7D13AUKJYV+8gW7S
-						b1/t3dWvVAtKbFtDuK6uceoSakimTq266X2PvA+HjRhZS0adgH4dYDtEkiG3Vg0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.leeds.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Leeds</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Leeds Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.leeds.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:itservicedesk@leeds.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ray</GivenName>
-    <SurName>Powell</SurName>
-    <EmailAddress>mailto:r.g.powell@leeds.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp4.halesowen.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idp4.halesowen.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 892f8934..00000000
--- a/swamid-interfederations-2.0/idp4.halesowen.ac.uk-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://idp4.halesowen.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Halesowen College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-07T09:48:34Z">
-      <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">halesowen.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUK9oe82/zsqUqklJuya/xb+7Fj7swDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUaWRwNC5oYWxlc293ZW4uYWMudWswHhcNMTIwNjA2MDky
-						NjQ4WhcNMzIwNjA2MDkyNjQ4WjAfMR0wGwYDVQQDExRpZHA0LmhhbGVzb3dlbi5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2STl9SssEcCIdJ
-						TOOLkqRtw7yeG3rQMdqUS7cKflWKfxoXwxLlSs0RJTPO2HubTUuzENfE2XF96gE+
-						VfZSDN+R2hKJvTUFlt49YN7Wfu8bUDeVAiLbv1eVs9syHtMQEa7CtFXssrXuQxJ6
-						iGA7eeL9llbnN4WoGsDNUIYrkKrKo25hPkiFgkxXGFr4IcnJAO4Ftjvu0m/v0YQL
-						JGbHeCSwOL3/giBUHQsTQLxzPibc1rfVZv7r3ZdF4QMivb93nxKjO1WNtAH/9YRZ
-						BbGknDfG5QeFCNFqIRPSeO98U0/WSwK/+Rz05xSEdHp8rWIEpwNuUpPQjUYg+QDm
-						CrlEAPUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwNC5oYWxlc293ZW4uYWMudWuG
-						K2h0dHBzOi8vaWRwNC5oYWxlc293ZW4uYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFHJgh1AYz5+Z2R0MUD13TjbR55T1MA0GCSqGSIb3DQEBBQUAA4IBAQAz
-						+5Fks4TIm7jqC4pEP7rjaugHhh6eZfvpcpOcyu3W0LdSrJIKCEn+3qRJZ+g/7OFX
-						HLwytVyzttZlLqkErt0YqD/T721wn6Jl2DNzzX/v0a9ZOsoc31VyF5/QSX7uemK7
-						nMNDB9tIa5f8vFQfhm1NV+ylIklSs2grP7V4bwggOQLiHfHIYW+E+Jza8QonqLjO
-						fUPwUBv6HaTHNbY7emeX8d6vb9mURX5kiPlel75zRuSDe3j2XaBNdzJ6djtWPMqa
-						5nzipbC1Y36S60xTelCkQz/bkQxdhGpeXAyGcjmVKESSPY5ZhIhQ5wIsD/HJhSCx
-						qdnuw21SDaBFMMFsh10J
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp4.halesowen.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp4.halesowen.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://idp4.halesowen.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp4.halesowen.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp4.halesowen.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp4.halesowen.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">halesowen.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUK9oe82/zsqUqklJuya/xb+7Fj7swDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUaWRwNC5oYWxlc293ZW4uYWMudWswHhcNMTIwNjA2MDky
-						NjQ4WhcNMzIwNjA2MDkyNjQ4WjAfMR0wGwYDVQQDExRpZHA0LmhhbGVzb3dlbi5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2STl9SssEcCIdJ
-						TOOLkqRtw7yeG3rQMdqUS7cKflWKfxoXwxLlSs0RJTPO2HubTUuzENfE2XF96gE+
-						VfZSDN+R2hKJvTUFlt49YN7Wfu8bUDeVAiLbv1eVs9syHtMQEa7CtFXssrXuQxJ6
-						iGA7eeL9llbnN4WoGsDNUIYrkKrKo25hPkiFgkxXGFr4IcnJAO4Ftjvu0m/v0YQL
-						JGbHeCSwOL3/giBUHQsTQLxzPibc1rfVZv7r3ZdF4QMivb93nxKjO1WNtAH/9YRZ
-						BbGknDfG5QeFCNFqIRPSeO98U0/WSwK/+Rz05xSEdHp8rWIEpwNuUpPQjUYg+QDm
-						CrlEAPUCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwNC5oYWxlc293ZW4uYWMudWuG
-						K2h0dHBzOi8vaWRwNC5oYWxlc293ZW4uYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFHJgh1AYz5+Z2R0MUD13TjbR55T1MA0GCSqGSIb3DQEBBQUAA4IBAQAz
-						+5Fks4TIm7jqC4pEP7rjaugHhh6eZfvpcpOcyu3W0LdSrJIKCEn+3qRJZ+g/7OFX
-						HLwytVyzttZlLqkErt0YqD/T721wn6Jl2DNzzX/v0a9ZOsoc31VyF5/QSX7uemK7
-						nMNDB9tIa5f8vFQfhm1NV+ylIklSs2grP7V4bwggOQLiHfHIYW+E+Jza8QonqLjO
-						fUPwUBv6HaTHNbY7emeX8d6vb9mURX5kiPlel75zRuSDe3j2XaBNdzJ6djtWPMqa
-						5nzipbC1Y36S60xTelCkQz/bkQxdhGpeXAyGcjmVKESSPY5ZhIhQ5wIsD/HJhSCx
-						qdnuw21SDaBFMMFsh10J
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp4.halesowen.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp4.halesowen.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">Halesowen College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Halesowen College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.halesowen.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tim</GivenName>
-    <SurName>Crees</SurName>
-    <EmailAddress>mailto:tcrees@halesowen.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Priest</SurName>
-    <EmailAddress>mailto:jpriest@halesowen.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpStaging.miamioh.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/idpStaging.miamioh.edu-idp-shibboleth.xml
deleted file mode 100644
index 41f725b2..00000000
--- a/swamid-interfederations-2.0/idpStaging.miamioh.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +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://idpStaging.miamioh.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idptest.miamioh.edu/shibboleth/error.html" 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">miamioh.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">zTEST_MUOhioIdP</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>
-MIIDPjCCAiagAwIBAgIJAPI7S0Hg1hxlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2lkcHRlc3QubWlhbWlvaC5lZHUwHhcNMTQwMjE3MTY0NzMzWhcNMjQwMjE1
-MTY0NzMzWjAeMRwwGgYDVQQDExNpZHB0ZXN0Lm1pYW1pb2guZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAurUC6sPE/TX0G3nQlkcgd/ibtwJMyi6u
-SMMFUeUYUmjl4Q4d+5QKQhaUJyqcTWpXX+htpp4F1OCtfhlwxGTz2F/LWZq8JkPX
-FD4uxvzn9lmzT6BI4+B6TN2Ww7ILaZ1wR1HcMu6M8wJ7/AreoNy9MGUaxc8uhKGy
-+KhoB+19VObZCjCBRqBV11vTL2h+Y8nQnJcplhdKPkNlGwIWn90SzJbHc/F95QFC
-na2Wbl5l3v4cYcReY4W5iE2TftlTDTDBdSBqwf+iHLNGjhkL8EsktYC3/p/dHBK3
-ev8EaXqfPod3HVC+l87fPkNuA3W3XGoHGtDPHrCHR8VMMNZlUklpOwIDAQABo38w
-fTAdBgNVHQ4EFgQUfrLFYCDW7K1ZnO1QkHQYp0YawxswTgYDVR0jBEcwRYAUfrLF
-YCDW7K1ZnO1QkHQYp0YawxuhIqQgMB4xHDAaBgNVBAMTE2lkcHRlc3QubWlhbWlv
-aC5lZHWCCQDyO0tB4NYcZTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQA5k3SlFffFRq81u1uy3sjkpgp19S9L7KCoc63IVXN1aREJ9kQHRGbQbjcnzT05
-r/7vBO87OQMH0+Ojbn1xPSfIsUR91TgkGOAQc2yM/dkdFODgi+83guR1jilHRuFD
-DgA7rRiuqkPnVcrnatRdlSAYfNL8YtMkf9eQ63B1D6YfnQ23Giwytw3ZTaplD7He
-eoKLu82UwkCAPtbKR5oqAyr+0FUDuLv8pwIrfeA/TaGGm9KwG2ddk/QnxTf5Io3R
-nD4EJJtThpP8l6iMoV9RRnOlrqfK+xuogzBC1lzJDDIM0KTSCMlN8G2qqAsswnrw
-5Cj8SlfNPom7OhnCL7HOCbzC
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.miamioh.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.miamioh.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptest.miamioh.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.miamioh.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.miamioh.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miamioh.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPjCCAiagAwIBAgIJAPI7S0Hg1hxlMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE2lkcHRlc3QubWlhbWlvaC5lZHUwHhcNMTQwMjE3MTY0NzMzWhcNMjQwMjE1
-MTY0NzMzWjAeMRwwGgYDVQQDExNpZHB0ZXN0Lm1pYW1pb2guZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAurUC6sPE/TX0G3nQlkcgd/ibtwJMyi6u
-SMMFUeUYUmjl4Q4d+5QKQhaUJyqcTWpXX+htpp4F1OCtfhlwxGTz2F/LWZq8JkPX
-FD4uxvzn9lmzT6BI4+B6TN2Ww7ILaZ1wR1HcMu6M8wJ7/AreoNy9MGUaxc8uhKGy
-+KhoB+19VObZCjCBRqBV11vTL2h+Y8nQnJcplhdKPkNlGwIWn90SzJbHc/F95QFC
-na2Wbl5l3v4cYcReY4W5iE2TftlTDTDBdSBqwf+iHLNGjhkL8EsktYC3/p/dHBK3
-ev8EaXqfPod3HVC+l87fPkNuA3W3XGoHGtDPHrCHR8VMMNZlUklpOwIDAQABo38w
-fTAdBgNVHQ4EFgQUfrLFYCDW7K1ZnO1QkHQYp0YawxswTgYDVR0jBEcwRYAUfrLF
-YCDW7K1ZnO1QkHQYp0YawxuhIqQgMB4xHDAaBgNVBAMTE2lkcHRlc3QubWlhbWlv
-aC5lZHWCCQDyO0tB4NYcZTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQA5k3SlFffFRq81u1uy3sjkpgp19S9L7KCoc63IVXN1aREJ9kQHRGbQbjcnzT05
-r/7vBO87OQMH0+Ojbn1xPSfIsUR91TgkGOAQc2yM/dkdFODgi+83guR1jilHRuFD
-DgA7rRiuqkPnVcrnatRdlSAYfNL8YtMkf9eQ63B1D6YfnQ23Giwytw3ZTaplD7He
-eoKLu82UwkCAPtbKR5oqAyr+0FUDuLv8pwIrfeA/TaGGm9KwG2ddk/QnxTf5Io3R
-nD4EJJtThpP8l6iMoV9RRnOlrqfK+xuogzBC1lzJDDIM0KTSCMlN8G2qqAsswnrw
-5Cj8SlfNPom7OhnCL7HOCbzC
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.miamioh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Miami University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">zTEST_MUOhioIdP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.muohio.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Don Kidd</md:GivenName>
-    <md:EmailAddress>dkidd@miamioh.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mike Beck</md:GivenName>
-    <md:EmailAddress>beckmd@miamioh.edu</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 fa954951..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpcafe.ifsc.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ifsc.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ifsc.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ifsc.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ifsc.edu.br:8443/idp/profile/SAML1/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">IFSC - Instituto Federal de Santa Catarina</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFSC - Instituto Federal de Santa Catarina</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFSC - Instituto Federal de Santa Catarina</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifsc.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifsc.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Diretoria de TIC - IFSC</md:SurName>
-    <md:EmailAddress>suporte.reitoria@ifsc.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 918fa685..00000000
--- a/swamid-interfederations-2.0/idpcafe.ifsc.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://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>
-    MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xQTA/BgNVBAoTOEluc3RpdHV0
-byBGZWRlcmFsIGRlIEVkdWNhY2FvIENpZW5jaWEgZSBUZWNub2xvZ2lhIGRlIFND
-MQ0wCwYDVQQLEwREVElDMR8wHQYJKoZIhvcNAQkBFhBkdGljQGlmc2MuZWR1LmJy
-MRYwFAYDVQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmlu
-YTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcN
-MTMxMDEwMTM0NjAzWhcNMTYxMDA5MTM0NjAzWjCBzzFBMD8GA1UEChM4SW5zdGl0
-dXRvIEZlZGVyYWwgZGUgRWR1Y2FjYW8gQ2llbmNpYSBlIFRlY25vbG9naWEgZGUg
-U0MxDTALBgNVBAsTBERUSUMxHzAdBgkqhkiG9w0BCQEWEGR0aWNAaWZzYy5lZHUu
-YnIxFjAUBgNVBAcTDUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFy
-aW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8de
-KLY8l4j2LLmbN/PEDDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFx
-zAgTFyB8GKJU3E4L7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIP
-EakOzSOMWfvsl54EVgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed
-7xqj4AHA49SljpbrTOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4Y
-I9HkE599xiNjK19qXrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEADl6dRbiBovMwfbnOON9x5RMFWOaSvo3j
-KiRS9eHIH//FqS21Mqepm4QWskW+cFXqWwHdJYYq2XiZJfEqd3TezjTthnNTavxZ
-hVHif/6Sfn16I4XfRQ6aVRcIjtNJKI34t7gbLhtyqnVlIe2OqDoZl+ibbbOQBR7K
-BmFZqTQtixfYfLtvbQAPhBVzdUAStBKlzfYgwmvQDehzAlQX4C9aA6rKgH8RVUB9
-TuvmGGw96Boogf2JJ/fJVONTc0td5H23h09kn4wQsolCGHhsb4iRPXDW1yE99AGN
-Pal6a5saoI4UZ9QKbpYyCxOU/jzZGkGuD4qE5O1x5+3IpIfKs1E1Lg==
-            </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>
-      
-MIIEFDCCAvwCAQAwDQYJKoZIhvcNAQEFBQAwgc8xQTA/BgNVBAoTOEluc3RpdHV0
-byBGZWRlcmFsIGRlIEVkdWNhY2FvIENpZW5jaWEgZSBUZWNub2xvZ2lhIGRlIFND
-MQ0wCwYDVQQLEwREVElDMR8wHQYJKoZIhvcNAQkBFhBkdGljQGlmc2MuZWR1LmJy
-MRYwFAYDVQQHEw1GbG9yaWFub3BvbGlzMRcwFQYDVQQIEw5TYW50YSBDYXRhcmlu
-YTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2lkcGNhZmUuaWZzYy5lZHUuYnIwHhcN
-MTMxMDEwMTM0NjAzWhcNMTYxMDA5MTM0NjAzWjCBzzFBMD8GA1UEChM4SW5zdGl0
-dXRvIEZlZGVyYWwgZGUgRWR1Y2FjYW8gQ2llbmNpYSBlIFRlY25vbG9naWEgZGUg
-U0MxDTALBgNVBAsTBERUSUMxHzAdBgkqhkiG9w0BCQEWEGR0aWNAaWZzYy5lZHUu
-YnIxFjAUBgNVBAcTDUZsb3JpYW5vcG9saXMxFzAVBgNVBAgTDlNhbnRhIENhdGFy
-aW5hMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTaWRwY2FmZS5pZnNjLmVkdS5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN9zndckjBha7MXIXo7pc8de
-KLY8l4j2LLmbN/PEDDirotT2nuxdk0zGBKCpB3ZxHTN83MjBSGLQ205com7jbuFx
-zAgTFyB8GKJU3E4L7htHjpbNhbI7j9VLjbHcEZJeilEj+jViGUjgH1G7QO1GIpIP
-EakOzSOMWfvsl54EVgjK0PEBB4CUqGKHl1Rxu8D9jKLzD3TiciAWqSdwRFpyhfed
-7xqj4AHA49SljpbrTOttEQ7RxmNEXApvMzTTyVJSeBae9+jcNKypp7VTB5YZcI4Y
-I9HkE599xiNjK19qXrHrTu9RAg/21yTrmGOJRPdJtjRbc6skG1+cDMhbSezCInkC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEADl6dRbiBovMwfbnOON9x5RMFWOaSvo3j
-KiRS9eHIH//FqS21Mqepm4QWskW+cFXqWwHdJYYq2XiZJfEqd3TezjTthnNTavxZ
-hVHif/6Sfn16I4XfRQ6aVRcIjtNJKI34t7gbLhtyqnVlIe2OqDoZl+ibbbOQBR7K
-BmFZqTQtixfYfLtvbQAPhBVzdUAStBKlzfYgwmvQDehzAlQX4C9aA6rKgH8RVUB9
-TuvmGGw96Boogf2JJ/fJVONTc0td5H23h09kn4wQsolCGHhsb4iRPXDW1yE99AGN
-Pal6a5saoI4UZ9QKbpYyCxOU/jzZGkGuD4qE5O1x5+3IpIfKs1E1Lg==
-	    
-            </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 d34ff7ab..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpcafe.ufjf.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idpcafe.ufjf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.ufjf.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.ufjf.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.ufjf.br/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">ufjf.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.ufjf.br:8443/idp/profile/SAML1/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">UFJF - Universidade Federal de Juiz de Fora</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFJF - Universidade Federal de Juiz de Fora</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFJF - Universidade Federal de Juiz de Fora</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufjf.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufjf.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jose Luiz Ribeiro de Souza Filho</md:SurName>
-    <md:EmailAddress>engenharia.redes@ufjf.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b19d0dca..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpcafe.usp.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEADCCAugCAQAwDQYJKoZIhvcNAQELBQAwgcUxIjAgBgNVBAoTGVVOSVZFUlNJ
-REFERSBERSBTQU8gUEFVTE8xNTAzBgNVBAsTLFNVUEVSSU5URU5ERU5DSUEgREUg
-VEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRowGAYJKoZIhvcNAQkBFgtzY252QHVz
-cC5icjESMBAGA1UEBxMJU0FPIFBBVUxPMRIwEAYDVQQIEwlTQU8gUEFVTE8xCzAJ
-BgNVBAYTAkJSMRcwFQYDVQQDEw5pZHBjYWZlLnVzcC5icjAeFw0xNDExMDQyMzU5
-MDNaFw0xOTExMDMyMzU5MDNaMIHFMSIwIAYDVQQKExlVTklWRVJTSURBREUgREUg
-U0FPIFBBVUxPMTUwMwYDVQQLEyxTVVBFUklOVEVOREVOQ0lBIERFIFRFQ05PTE9H
-SUEgREEgSU5GT1JNQUNBTzEaMBgGCSqGSIb3DQEJARYLc2NudkB1c3AuYnIxEjAQ
-BgNVBAcTCVNBTyBQQVVMTzESMBAGA1UECBMJU0FPIFBBVUxPMQswCQYDVQQGEwJC
-UjEXMBUGA1UEAxMOaWRwY2FmZS51c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC2k4nQeMwb/eT3VPbza4lVzks+rAnc9t5rc2YmWOYYk+wMBEU7
-itfeBxaXpetPRMubgW3SrQO7DLwBEfoQQ0nj0gy9zusJdeYZU/BlKwyCgs2ScGqn
-Mki+TJOieVhOumPSOULNOE+xEzAqjS1V55H6DkXklte8F6UjNyIyd9x5id58prJK
-ZpClqQMorVrhxF3A99jQK4Pupcqhy+mQOoA51Cge4ZubdlXIrzk0SFwwS9XB8//S
-xeHyN3dTiXLafJ+WfDx6uBKYQbzRKT2QC/KWbL03Rxd2wmoldNHJXDlseq++UFYY
-kRA9vE92sg40zwjqnO/5V7AdpJ38CNKAEZ41AgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggEBAAAd8mF0jClrCZ46eYceZ95KA+XfkY0ViAyHW/13wc07M7gGgurLQgYHdMNZ
-MYJoyB1HrwdliS/ZpfEspWhtvnmMRNLYOnghDlFE5pSRo53/qtQ2VqwvZv6xtcnx
-uMdDVtbXn8txZi6T3n6nNn/JwYA3ANUJKHfo0eE+E5E+Xdl7APBeOZLYdjhQykzM
-utKY4CRyqBVaJhpmf1A8QzmAR+iXoI2Zh4U2xO8sWUUuxOEP1fsv1rs2VorQHrBw
-mWthxf1cxDLaWMV6/uWFy+iKPiHKDB4X1NFOEXU7teIz8LgzsGiF/PPoMeNRCfn1
-XmViErkqVYyvS+Fpeslb5K1Zlyk=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://idpcafe.usp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.usp.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.usp.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.usp.br/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">usp.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEADCCAugCAQAwDQYJKoZIhvcNAQELBQAwgcUxIjAgBgNVBAoTGVVOSVZFUlNJ
-REFERSBERSBTQU8gUEFVTE8xNTAzBgNVBAsTLFNVUEVSSU5URU5ERU5DSUEgREUg
-VEVDTk9MT0dJQSBEQSBJTkZPUk1BQ0FPMRowGAYJKoZIhvcNAQkBFgtzY252QHVz
-cC5icjESMBAGA1UEBxMJU0FPIFBBVUxPMRIwEAYDVQQIEwlTQU8gUEFVTE8xCzAJ
-BgNVBAYTAkJSMRcwFQYDVQQDEw5pZHBjYWZlLnVzcC5icjAeFw0xNDExMDQyMzU5
-MDNaFw0xOTExMDMyMzU5MDNaMIHFMSIwIAYDVQQKExlVTklWRVJTSURBREUgREUg
-U0FPIFBBVUxPMTUwMwYDVQQLEyxTVVBFUklOVEVOREVOQ0lBIERFIFRFQ05PTE9H
-SUEgREEgSU5GT1JNQUNBTzEaMBgGCSqGSIb3DQEJARYLc2NudkB1c3AuYnIxEjAQ
-BgNVBAcTCVNBTyBQQVVMTzESMBAGA1UECBMJU0FPIFBBVUxPMQswCQYDVQQGEwJC
-UjEXMBUGA1UEAxMOaWRwY2FmZS51c3AuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC2k4nQeMwb/eT3VPbza4lVzks+rAnc9t5rc2YmWOYYk+wMBEU7
-itfeBxaXpetPRMubgW3SrQO7DLwBEfoQQ0nj0gy9zusJdeYZU/BlKwyCgs2ScGqn
-Mki+TJOieVhOumPSOULNOE+xEzAqjS1V55H6DkXklte8F6UjNyIyd9x5id58prJK
-ZpClqQMorVrhxF3A99jQK4Pupcqhy+mQOoA51Cge4ZubdlXIrzk0SFwwS9XB8//S
-xeHyN3dTiXLafJ+WfDx6uBKYQbzRKT2QC/KWbL03Rxd2wmoldNHJXDlseq++UFYY
-kRA9vE92sg40zwjqnO/5V7AdpJ38CNKAEZ41AgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggEBAAAd8mF0jClrCZ46eYceZ95KA+XfkY0ViAyHW/13wc07M7gGgurLQgYHdMNZ
-MYJoyB1HrwdliS/ZpfEspWhtvnmMRNLYOnghDlFE5pSRo53/qtQ2VqwvZv6xtcnx
-uMdDVtbXn8txZi6T3n6nNn/JwYA3ANUJKHfo0eE+E5E+Xdl7APBeOZLYdjhQykzM
-utKY4CRyqBVaJhpmf1A8QzmAR+iXoI2Zh4U2xO8sWUUuxOEP1fsv1rs2VorQHrBw
-mWthxf1cxDLaWMV6/uWFy+iKPiHKDB4X1NFOEXU7teIz8LgzsGiF/PPoMeNRCfn1
-XmViErkqVYyvS+Fpeslb5K1Zlyk=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.usp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.usp.br:8443/idp/profile/SAML1/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">USP - Universidade de Sao Paulo</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">USP - Universidade de Sao Paulo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">USP - Universidade de Sao Paulo</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">USP - Universidade de Sao Paulo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.usp.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.usp.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>DTI - Departamento de Tecnologia da Informacao</md:SurName>
-    <md:EmailAddress>consulta@usp.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 afbb49e6..00000000
--- a/swamid-interfederations-2.0/idpcnous.cnous.fr-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://idpcnous.cnous.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CNOUS Personnels</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMJSAnKwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTYrMDI6MDDl3SQQAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.cnous.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CNOUS Personnels</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>
-					      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>
-    </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-POST" Location="https://idpcnous.cnous.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcnous.cnous.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcnous.cnous.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CNOUS Personnels</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CNOUS Personnels</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cnous.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>equipe.systeme@cnous.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpcove.trafford.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/idpcove.trafford.ac.uk-shibboleth.xml
deleted file mode 100644
index 1a15aea8..00000000
--- a/swamid-interfederations-2.0/idpcove.trafford.ac.uk-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://idpcove.trafford.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Trafford College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-23T17:18: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">trafford.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlICCQCVc3XLOQv9+zANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJH
-						QjETMBEGA1UECAwKQWx0cmluY2hhbTEXMBUGA1UEBwwOV2VzdCBUaW1wZXJsZXkx
-						GTAXBgNVBAoMEFRyYWZmb3JkIENvbGxlZ2UxHzAdBgNVBAMMFmlkcGNvdmUudHJh
-						ZmZvcmQuYWMudWswHhcNMTQxMjA5MTU1NTM0WhcNMzQxMjA0MTU1NTM0WjB3MQsw
-						CQYDVQQGEwJHQjETMBEGA1UECAwKQWx0cmluY2hhbTEXMBUGA1UEBwwOV2VzdCBU
-						aW1wZXJsZXkxGTAXBgNVBAoMEFRyYWZmb3JkIENvbGxlZ2UxHzAdBgNVBAMMFmlk
-						cGNvdmUudHJhZmZvcmQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQD7sJfsHDjKt7dMslxllHKBiHTHBeOBLs1KDY5Kg25Sjkp02ait4oq4sQCX
-						3UDiaxMBhhmJEgw+W7wBuwClB3WCZi6aP2sat/tW9szyitzPyFC/2LZOjlNMiahF
-						8xRGXyA7tjTuZXCoY1wYhMUu4Hg6qtqHK2ttkGZ8+3zotGx43x+d3LvO5iPfJb9b
-						XPVqaEqNbwhlUoM8L9CP4o+QQGNgVfLZb24L2st0m40RJEkOZ/Z3gx7/CofZMwWX
-						B9rm2Qe7zqmXTgXvU9HJzVNHm9+TIpgWx70ShlvW23QNMhh7eVB7RCzkV8kdIzbg
-						GnIICbv71ZQCo0TlsWX2kMamS3IhAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAp+
-						Jmdx1q13B+nUfMjhccBOK4+AVqCn9+HIa7cJhaMn1sOjSzlA1DlXYPc5yUMWqybC
-						97zM0rdpEWs3Agd0N48tpRWW3g2qXksRCqIqt7c+pYzWwTzhVSx4cLqNxSkvQzye
-						nkh6J5FNsJLtf3vSLSpJMoCtA5RX2XmtzfiXT3qCX2MREhp0QsOsuJs+wrEGk5lI
-						qmdaNl77S0srnYHly4ARx00938Uh3aaj2B7/sVO9DL+4A+jrp3MPkvU4V+0kRRGM
-						zyHmhmFL4JdeMZVKlYOBfa5BaRelpB0b43d6BJj7U3DYWaloLk+5Ybf1rXm+DN6f
-						T8iifVdbRcCwOj+bpI8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcove.trafford.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcove.trafford.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://idpcove.trafford.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcove.trafford.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpcove.trafford.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcove.trafford.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">trafford.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlICCQCVc3XLOQv9+zANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJH
-						QjETMBEGA1UECAwKQWx0cmluY2hhbTEXMBUGA1UEBwwOV2VzdCBUaW1wZXJsZXkx
-						GTAXBgNVBAoMEFRyYWZmb3JkIENvbGxlZ2UxHzAdBgNVBAMMFmlkcGNvdmUudHJh
-						ZmZvcmQuYWMudWswHhcNMTQxMjA5MTU1NTM0WhcNMzQxMjA0MTU1NTM0WjB3MQsw
-						CQYDVQQGEwJHQjETMBEGA1UECAwKQWx0cmluY2hhbTEXMBUGA1UEBwwOV2VzdCBU
-						aW1wZXJsZXkxGTAXBgNVBAoMEFRyYWZmb3JkIENvbGxlZ2UxHzAdBgNVBAMMFmlk
-						cGNvdmUudHJhZmZvcmQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQD7sJfsHDjKt7dMslxllHKBiHTHBeOBLs1KDY5Kg25Sjkp02ait4oq4sQCX
-						3UDiaxMBhhmJEgw+W7wBuwClB3WCZi6aP2sat/tW9szyitzPyFC/2LZOjlNMiahF
-						8xRGXyA7tjTuZXCoY1wYhMUu4Hg6qtqHK2ttkGZ8+3zotGx43x+d3LvO5iPfJb9b
-						XPVqaEqNbwhlUoM8L9CP4o+QQGNgVfLZb24L2st0m40RJEkOZ/Z3gx7/CofZMwWX
-						B9rm2Qe7zqmXTgXvU9HJzVNHm9+TIpgWx70ShlvW23QNMhh7eVB7RCzkV8kdIzbg
-						GnIICbv71ZQCo0TlsWX2kMamS3IhAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAAp+
-						Jmdx1q13B+nUfMjhccBOK4+AVqCn9+HIa7cJhaMn1sOjSzlA1DlXYPc5yUMWqybC
-						97zM0rdpEWs3Agd0N48tpRWW3g2qXksRCqIqt7c+pYzWwTzhVSx4cLqNxSkvQzye
-						nkh6J5FNsJLtf3vSLSpJMoCtA5RX2XmtzfiXT3qCX2MREhp0QsOsuJs+wrEGk5lI
-						qmdaNl77S0srnYHly4ARx00938Uh3aaj2B7/sVO9DL+4A+jrp3MPkvU4V+0kRRGM
-						zyHmhmFL4JdeMZVKlYOBfa5BaRelpB0b43d6BJj7U3DYWaloLk+5Ybf1rXm+DN6f
-						T8iifVdbRcCwOj+bpI8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcove.trafford.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcove.trafford.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">Trafford College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Trafford College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.trafford.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Fitton</SurName>
-    <EmailAddress>mailto:Dave.Fitton@trafford.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Fitton</SurName>
-    <EmailAddress>mailto:Dave.Fitton@trafford.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index ba73e43e..00000000
--- a/swamid-interfederations-2.0/idpdev.bham.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpdev.bham.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Development IdP" Shibboleth IdP for the University of Birmingham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-30T12:57:07Z">
-      <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 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">bham.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Birmingham (Development IdP)</mdui:DisplayName>
-        <mdui:Logo height="34" width="141">https://idpdev.bham.ac.uk/idp/images/University-of-Birmingham-logo.gif</mdui:Logo>
-        <mdui:Logo height="48" width="39">https://idpdev.bham.ac.uk/idp/images/University-of-Birmingham-crest.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUIVfgOu5tTWi4eR0vOLjm8kVDIzgwDQYJKoZIhvcNAQEL
-						BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA4
-						WhcNMzUxMTE5MDg0NzA4WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALG3IP3QvX9BKJDA94oGiquA
-						Mz15vKyq/OtUkLmiC19jzJg6VtznAL6yp4qFPv4t/19pj+2reQWT7zs5nkTEKkkj
-						ap4FOOpyGRuwPQQG48Gc2jYEY00BJM+TPa8LnotOR6znW333Ep3k1/pSr6dDpwHE
-						08mnqnmJDCUVyAzqmApkNPYTlepo9oW94RvQ0WpXj0Z5KwhoE4yuxq7+mdHwInjI
-						XRQt6iHCOOapTcai47EC50z10WevvjqGBoPtWO/kaApC/H1sjw/8FmoV0Bn+BD0n
-						423NXJnQ2kUm43vZuuHEjuw1ByNvbW4lx33ghTIT0yX7sGQwtoJDYbTGDzRdG08C
-						AwEAAaNpMGcwHQYDVR0OBBYEFKct1G1nTMcO8eIOvkAnHOgeJFmpMEYGA1UdEQQ/
-						MD2CEWlkcGRldi5iaGFtLmFjLnVrhihodHRwczovL2lkcGRldi5iaGFtLmFjLnVr
-						L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBvofZpFqz8kPrEPSVY
-						zPeClJi1VajT0HznS94/ZDYJMu/xP+fjaXSgGNKYpo37Uc079s/tteWxA9y5hJ0G
-						64sGBXm2041w3FhbK/IJo4WGQf5utrF0aNhPAT4x4NAWRwZRA2JqHNV/Geawmht3
-						p6y9IYZNOrv4M2YHzVmeY25Nb3c4AEsG47chKwFsReLvcuucqbMWC7yJUZoqCOT7
-						fgbE9mA7sxBJ8warsZ6DVZmljLnF92j/X/lXDGjURpapxtSY0+UYg0FAwq4YlA4w
-						sZsmv/TzR9q8jnIN9nRfOVaA/uIzGPuI7hlMbTfkx0gAXOxFF2uiwX0H/SXGmYkk
-						tHKz
-					</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>
-						MIIDMDCCAhigAwIBAgIVAJ+rTweaxT3S5IdRTlFMWNcLNE1IMA0GCSqGSIb3DQEB
-						CwUAMBwxGjAYBgNVBAMMEWlkcGRldi5iaGFtLmFjLnVrMB4XDTE1MTExOTA4NDcw
-						N1oXDTM1MTExOTA4NDcwN1owHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUaNT+DQalsoK/PJotX5oh
-						seeMwxjnMpFJNljC/l4tet23SMyk2596lp9Y8sE3yKh2FtnznsF4S+TI+x/bx+gt
-						Euu5MAgwZMb2ZZFaYTp6O0d0fE588PJE47b7gWczkxPrXu1aGIBy3cffMyhdqL1e
-						bG6/mSc15t0RQear14o2oELmubPR+ZjrH88WOqzAtz2oSN5VYE0hutqV6PdUC8AS
-						q8gcIzJ2u14oxr0P3zfV93qhxiD9P6kSKdF2kqKAcht4+0uMchWbWLbqLpumuS69
-						CnuV1iglJGJopDbEMK6bYr8XMVcU5fbhdFGBUNSnOKUd/89GbKvBTX+mjdRmzv4H
-						AgMBAAGjaTBnMB0GA1UdDgQWBBTWrGSLIekxRAms8ycd1foNhIMB5TBGBgNVHREE
-						PzA9ghFpZHBkZXYuYmhhbS5hYy51a4YoaHR0cHM6Ly9pZHBkZXYuYmhhbS5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEALNUtZ95OSpqYy4HL
-						bcLDeFsVwfWAwg7kOrezxRWWVdz6noGhr891sAQ4m1bIkNMHtwkJd9t5bJqw3kk1
-						f/37P1gfNJG73EbyarZU6QzyzEOljRYPxFiagDe/pom4uoSumr2cpu56PW5gq5RD
-						BIK1y6p5gu/NbDwqTPGkltVzRTCjVm44G5m8OtLvvAjtKhoNw/Dex4yxofdhdCrs
-						3S+sgmkLrNrjUHcCBefyLbrX+T6KbVKjhNZHDlNNqkKiw8MbWo9eQwcwjNV4Ln8z
-						OvMRf3TuK2qF9eWHTcGhip5YVOeps3YnuVE3iFzvSeW7sFuydHpiLxeDAV3Zz/fX
-						1eJP3Q==
-					</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>
-						MIIDLzCCAhegAwIBAgIUUI3OcSf1ugfmUml1jp6Uz6UPFf0wDQYJKoZIhvcNAQEL
-						BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA3
-						WhcNMzUxMTE5MDg0NzA3WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKv0OMi7eSvWLrc7jc4jfBsk
-						r+3mD8o38/LuKJkxpfzgAuz91XbX/1+5sx24gpb4f94RVYbVA8i/hEbvR3lneiiN
-						9A3yApH3NNmvEhQH7Qzol2ZXhWdBHmNf57h7L4RHgyPtcSxPjPkL387haB3iGoU1
-						Nz6Wr/RwSaYks4VXVh8/EJH2908H+PTk3PM2WlTqMLdllzZTimq1y9PZeZZNDDTM
-						9+RTZIZW+B/VRwlmist3L46I+ftHyJzQpDleCq/WeajFMQriTYVi8NFYw+ym2Drl
-						wmThyH4g99kK0Ofrv5gigDLpMdn5oQ7CA4AdAHcNMN7wU6DCgzyuUstOHCKRJlEC
-						AwEAAaNpMGcwHQYDVR0OBBYEFO9JKvKCIsh+vUHamkucUrIv+beQMEYGA1UdEQQ/
-						MD2CEWlkcGRldi5iaGFtLmFjLnVrhihodHRwczovL2lkcGRldi5iaGFtLmFjLnVr
-						L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAE4MCBT5XbidZy6cyy
-						E939H/RzH8OVX+zqaERhPPRHFue6155e20KgBorDtr8ACbur33e4gQotJYFvjtt8
-						HCFZbSQwvW3OBtQPzqG5yZZ47EH0aasrqIA3PY8hVis9fSwjStFSR7cAygUUFRuB
-						imk4LuZAq2W54mkl+xazBjpcZN4cK118cyL/TMxNXPJ82qGAfy8mdIsIGKEfhBdI
-						rMvl4K04hEvzQblh3Lghb1GtF8GMjIIQAjQIoUiRPCWUd37tRW17rE1RLLjVCLlz
-						SnivPWw0ouKAaF/GJbfDfu2SAhuJ2Fw6RC7bU7pyMbFZ3NrCAQHA4l0tJAHME7EA
-						2T4z
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpdev.bham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpdev.bham.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://idpdev.bham.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpdev.bham.ac.uk/idp/profile/SAML2/Redirect/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">bham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUIVfgOu5tTWi4eR0vOLjm8kVDIzgwDQYJKoZIhvcNAQEL
-						BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA4
-						WhcNMzUxMTE5MDg0NzA4WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALG3IP3QvX9BKJDA94oGiquA
-						Mz15vKyq/OtUkLmiC19jzJg6VtznAL6yp4qFPv4t/19pj+2reQWT7zs5nkTEKkkj
-						ap4FOOpyGRuwPQQG48Gc2jYEY00BJM+TPa8LnotOR6znW333Ep3k1/pSr6dDpwHE
-						08mnqnmJDCUVyAzqmApkNPYTlepo9oW94RvQ0WpXj0Z5KwhoE4yuxq7+mdHwInjI
-						XRQt6iHCOOapTcai47EC50z10WevvjqGBoPtWO/kaApC/H1sjw/8FmoV0Bn+BD0n
-						423NXJnQ2kUm43vZuuHEjuw1ByNvbW4lx33ghTIT0yX7sGQwtoJDYbTGDzRdG08C
-						AwEAAaNpMGcwHQYDVR0OBBYEFKct1G1nTMcO8eIOvkAnHOgeJFmpMEYGA1UdEQQ/
-						MD2CEWlkcGRldi5iaGFtLmFjLnVrhihodHRwczovL2lkcGRldi5iaGFtLmFjLnVr
-						L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBvofZpFqz8kPrEPSVY
-						zPeClJi1VajT0HznS94/ZDYJMu/xP+fjaXSgGNKYpo37Uc079s/tteWxA9y5hJ0G
-						64sGBXm2041w3FhbK/IJo4WGQf5utrF0aNhPAT4x4NAWRwZRA2JqHNV/Geawmht3
-						p6y9IYZNOrv4M2YHzVmeY25Nb3c4AEsG47chKwFsReLvcuucqbMWC7yJUZoqCOT7
-						fgbE9mA7sxBJ8warsZ6DVZmljLnF92j/X/lXDGjURpapxtSY0+UYg0FAwq4YlA4w
-						sZsmv/TzR9q8jnIN9nRfOVaA/uIzGPuI7hlMbTfkx0gAXOxFF2uiwX0H/SXGmYkk
-						tHKz
-					</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>
-						MIIDMDCCAhigAwIBAgIVAJ+rTweaxT3S5IdRTlFMWNcLNE1IMA0GCSqGSIb3DQEB
-						CwUAMBwxGjAYBgNVBAMMEWlkcGRldi5iaGFtLmFjLnVrMB4XDTE1MTExOTA4NDcw
-						N1oXDTM1MTExOTA4NDcwN1owHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUaNT+DQalsoK/PJotX5oh
-						seeMwxjnMpFJNljC/l4tet23SMyk2596lp9Y8sE3yKh2FtnznsF4S+TI+x/bx+gt
-						Euu5MAgwZMb2ZZFaYTp6O0d0fE588PJE47b7gWczkxPrXu1aGIBy3cffMyhdqL1e
-						bG6/mSc15t0RQear14o2oELmubPR+ZjrH88WOqzAtz2oSN5VYE0hutqV6PdUC8AS
-						q8gcIzJ2u14oxr0P3zfV93qhxiD9P6kSKdF2kqKAcht4+0uMchWbWLbqLpumuS69
-						CnuV1iglJGJopDbEMK6bYr8XMVcU5fbhdFGBUNSnOKUd/89GbKvBTX+mjdRmzv4H
-						AgMBAAGjaTBnMB0GA1UdDgQWBBTWrGSLIekxRAms8ycd1foNhIMB5TBGBgNVHREE
-						PzA9ghFpZHBkZXYuYmhhbS5hYy51a4YoaHR0cHM6Ly9pZHBkZXYuYmhhbS5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEALNUtZ95OSpqYy4HL
-						bcLDeFsVwfWAwg7kOrezxRWWVdz6noGhr891sAQ4m1bIkNMHtwkJd9t5bJqw3kk1
-						f/37P1gfNJG73EbyarZU6QzyzEOljRYPxFiagDe/pom4uoSumr2cpu56PW5gq5RD
-						BIK1y6p5gu/NbDwqTPGkltVzRTCjVm44G5m8OtLvvAjtKhoNw/Dex4yxofdhdCrs
-						3S+sgmkLrNrjUHcCBefyLbrX+T6KbVKjhNZHDlNNqkKiw8MbWo9eQwcwjNV4Ln8z
-						OvMRf3TuK2qF9eWHTcGhip5YVOeps3YnuVE3iFzvSeW7sFuydHpiLxeDAV3Zz/fX
-						1eJP3Q==
-					</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>
-						MIIDLzCCAhegAwIBAgIUUI3OcSf1ugfmUml1jp6Uz6UPFf0wDQYJKoZIhvcNAQEL
-						BQAwHDEaMBgGA1UEAwwRaWRwZGV2LmJoYW0uYWMudWswHhcNMTUxMTE5MDg0NzA3
-						WhcNMzUxMTE5MDg0NzA3WjAcMRowGAYDVQQDDBFpZHBkZXYuYmhhbS5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKv0OMi7eSvWLrc7jc4jfBsk
-						r+3mD8o38/LuKJkxpfzgAuz91XbX/1+5sx24gpb4f94RVYbVA8i/hEbvR3lneiiN
-						9A3yApH3NNmvEhQH7Qzol2ZXhWdBHmNf57h7L4RHgyPtcSxPjPkL387haB3iGoU1
-						Nz6Wr/RwSaYks4VXVh8/EJH2908H+PTk3PM2WlTqMLdllzZTimq1y9PZeZZNDDTM
-						9+RTZIZW+B/VRwlmist3L46I+ftHyJzQpDleCq/WeajFMQriTYVi8NFYw+ym2Drl
-						wmThyH4g99kK0Ofrv5gigDLpMdn5oQ7CA4AdAHcNMN7wU6DCgzyuUstOHCKRJlEC
-						AwEAAaNpMGcwHQYDVR0OBBYEFO9JKvKCIsh+vUHamkucUrIv+beQMEYGA1UdEQQ/
-						MD2CEWlkcGRldi5iaGFtLmFjLnVrhihodHRwczovL2lkcGRldi5iaGFtLmFjLnVr
-						L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAE4MCBT5XbidZy6cyy
-						E939H/RzH8OVX+zqaERhPPRHFue6155e20KgBorDtr8ACbur33e4gQotJYFvjtt8
-						HCFZbSQwvW3OBtQPzqG5yZZ47EH0aasrqIA3PY8hVis9fSwjStFSR7cAygUUFRuB
-						imk4LuZAq2W54mkl+xazBjpcZN4cK118cyL/TMxNXPJ82qGAfy8mdIsIGKEfhBdI
-						rMvl4K04hEvzQblh3Lghb1GtF8GMjIIQAjQIoUiRPCWUd37tRW17rE1RLLjVCLlz
-						SnivPWw0ouKAaF/GJbfDfu2SAhuJ2Fw6RC7bU7pyMbFZ3NrCAQHA4l0tJAHME7EA
-						2T4z
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpdev.bham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Birmingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Birmingham (Development IdP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:ServiceDesk@contacts.bham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Graham</GivenName>
-    <SurName>Bryan</SurName>
-    <EmailAddress>mailto:J.G.Bryan@bham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpext.test.ek.sll.se.xml b/swamid-interfederations-2.0/idpext.test.ek.sll.se.xml
deleted file mode 100644
index 72ec8eee..00000000
--- a/swamid-interfederations-2.0/idpext.test.ek.sll.se.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://idpext.test.ek.sll.se/neas">
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEZTCCA02gAwIBAgIJAJp4wLfm2XW/MA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlNFMRIw
-EAYDVQQIEwlTdG9ja2hvbG0xEjAQBgNVBAcTCVN0b2NraG9sbTEVMBMGA1UEChMMMTYyMzIxMDAw
-MDE2MRAwDgYDVQQLEwdTTEx0ZXN0MR4wHAYDVQQDExVpZHBleHQudGVzdC5lay5zbGwuc2UwHhcN
-MTIxMjA2MDk0MDU4WhcNMTQxMjA2MDk0MDU4WjB+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3Rv
-Y2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDDE2MjMyMTAwMDAxNjEQMA4GA1UE
-CxMHU0xMdGVzdDEeMBwGA1UEAxMVaWRwZXh0LnRlc3QuZWsuc2xsLnNlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA4ibxWfMWcVv/5cdFNS5FZxTrZBJu61myC+SiW0Nkrws3J/2uve4b
-eRig27f7hhr2+tGQeWW2uifmco2ajkqcutXtSfxqtVWRvUuq7GIog1aeNH17Qtq4+QEIxVXfmRJm
-/jVT0ihz6JsN/S6St8Pt937oeDetryvpGvV4tJ54/vUYos0i1shcoDr6jUujQ/aHoN48MkymvDD6
-m4v5FJgAUCaeRVFzKwaXsd172ZoA2NFSLPxkCOrm2Nm1SvZfPtFdfLCmgsElwXWnbtfVD8LdUsTs
-DWGcOkEWA14qbeVcK81xUW/xsvT36p0Wdy8zd1CqIabSc5F3S4ney1+yDQPNiwIDAQABo4HlMIHi
-MB0GA1UdDgQWBBTBxmnEBJq8D6hVP9U6fhESjbtsPzCBsgYDVR0jBIGqMIGngBTBxmnEBJq8D6hV
-P9U6fhESjbtsP6GBg6SBgDB+MQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYD
-VQQHEwlTdG9ja2hvbG0xFTATBgNVBAoTDDE2MjMyMTAwMDAxNjEQMA4GA1UECxMHU0xMdGVzdDEe
-MBwGA1UEAxMVaWRwZXh0LnRlc3QuZWsuc2xsLnNlggkAmnjAt+bZdb8wDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQUFAAOCAQEAjr8rhk0FxZwSxZAGh916cwVEp9SDUcQcoPbY9TYbQe2XVMXBImNo
-PTkkbgFlxILxdq6ZOeKwsjTV4ON/jLVX/TJ9OzolKBfMpfLNf5DiBvG7BfSlbuTA/jEwC7qLHDmk
-3vC3gLSkWbE++2E2aOmKjDD7Rp7CSpHSM11FkF9CWdqAYV0f3YcCHQMEadOGNDeXRWhJH9e/ejT1
-BKtI7OLnXC7ceugbqIjbZANpiNT9YHtZcCtKU9C4iV6G4OEK0+Y9Pr5RS2gULAyDDYR3BzUOcZTI
-yaELvrGIDisdW7WILf3THNVuigw03ZuLjxql/Wo59WtttVngV+LrAs+UeQq9JA==</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>5abdb300f7ff38ef47e4966bd82dd209c7eef117</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpext.test.ek.sll.se/neas/SAMLConsumer" index="2"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpext.test.ek.sll.se/neas/SSOService"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpext.test.ek.sll.se/neas/SSOService"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SLL</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SLL</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sll.se/</md:OrganizationURL>
-  </md:Organization>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml
deleted file mode 100644
index 0cba31f1..00000000
--- a/swamid-interfederations-2.0/idpi.unirc.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,113 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpi.unirc.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-06-12T06:22:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unirc.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Mediterranea University of Reggio Calabria</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli Studi Mediterranea di Reggio Calabria</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Mediterranea University of Reggio Calabria users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi Mediterranea di Reggio Calabria</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idpi.unirc.it</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idpi.unirc.it</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idpi.unirc.it</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idpi.unirc.it</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="102" xml:lang="en">https://idpi.unirc.it/logo-unirc.o.png</mdui:Logo>
-        <mdui:Logo height="100" width="102" xml:lang="it">https://idpi.unirc.it/logo-unirc.o.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAP9rufN0eSE9pab/uPB5F3qtxR/sMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMMDWlkcGkudW5pcmMuaXQwHhcNMTQxMDI1MDk0ODQ0WhcN
-MzQxMDI1MDk0ODQ0WjAYMRYwFAYDVQQDDA1pZHBpLnVuaXJjLml0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk83Mpumzttl33VB1xKebw85bcVMiTmZq
-GLr+TlkFt7Ox/i0U412pNl6PAM5jxijmQ9gTb9BpwO2Sx+Njl22Qi43GWwanwAq/
-Xun1Jefg6TqeUgbSAwAEwVq/p6BOEQCci0x9vGCgMy+PuqY0apyaSvmd1WkhHio1
-dDu2LNvZVPXMhlZFzUlVekl+XdZmHuocNz/VSaZ0jKe3pBAFGI1VZCrxrwwIitSk
-4qSMeE1OOMx6R00gA9EvQP+UVJrxaUxog0QMT7XbjWrYIE7/bBiDXKAx5iNDHwX/
-8aTe/kB0KaqTOnFDdyA5QgbXmwPXnKsoT5qqM+lVh8BtH0pe6WGsBwIDAQABo2Ew
-XzAdBgNVHQ4EFgQU0IsMAIY+8UMbL444i46Bcg8lfxgwPgYDVR0RBDcwNYINaWRw
-aS51bmlyYy5pdIYkaHR0cHM6Ly9pZHBpLnVuaXJjLml0L2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBBQUAA4IBAQBSr7n+XKyqX4hftLppaX6X22VB1wlMIqx2mdbI
-uS478n6EAXziXOPII2RqIQY1UvXHuTXdx2wY0q7VXEwMa3um179X1df2NvrAHwgn
-Su7qkWDBUkdm+JA9XRu05A8Sttnnd9WifufDMw1nPSyu9CpwUt7VgcYAYbFiQZY9
-+IMYBdEzt2c/evCVh/WHb/iHZ9ocajte1QBoEB4cTLEnEgi4kOrb/TcFHWc49E8R
-joCMIlANlK9KJhAHSoChOUD4v1fFQhJNhTL/BBzB/EzD5TP08OO90RqImZshz3lq
-dXTRcbayBsGx/v0QyGOZOQgifSDQ3RXX0KuWo4rFbAiaeUuG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpi.unirc.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpi.unirc.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpi.unirc.it/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpi.unirc.it/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpi.unirc.it: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://idpi.unirc.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpi.unirc.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpi.unirc.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpi.unirc.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unirc.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAP9rufN0eSE9pab/uPB5F3qtxR/sMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMMDWlkcGkudW5pcmMuaXQwHhcNMTQxMDI1MDk0ODQ0WhcN
-MzQxMDI1MDk0ODQ0WjAYMRYwFAYDVQQDDA1pZHBpLnVuaXJjLml0MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk83Mpumzttl33VB1xKebw85bcVMiTmZq
-GLr+TlkFt7Ox/i0U412pNl6PAM5jxijmQ9gTb9BpwO2Sx+Njl22Qi43GWwanwAq/
-Xun1Jefg6TqeUgbSAwAEwVq/p6BOEQCci0x9vGCgMy+PuqY0apyaSvmd1WkhHio1
-dDu2LNvZVPXMhlZFzUlVekl+XdZmHuocNz/VSaZ0jKe3pBAFGI1VZCrxrwwIitSk
-4qSMeE1OOMx6R00gA9EvQP+UVJrxaUxog0QMT7XbjWrYIE7/bBiDXKAx5iNDHwX/
-8aTe/kB0KaqTOnFDdyA5QgbXmwPXnKsoT5qqM+lVh8BtH0pe6WGsBwIDAQABo2Ew
-XzAdBgNVHQ4EFgQU0IsMAIY+8UMbL444i46Bcg8lfxgwPgYDVR0RBDcwNYINaWRw
-aS51bmlyYy5pdIYkaHR0cHM6Ly9pZHBpLnVuaXJjLml0L2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBBQUAA4IBAQBSr7n+XKyqX4hftLppaX6X22VB1wlMIqx2mdbI
-uS478n6EAXziXOPII2RqIQY1UvXHuTXdx2wY0q7VXEwMa3um179X1df2NvrAHwgn
-Su7qkWDBUkdm+JA9XRu05A8Sttnnd9WifufDMw1nPSyu9CpwUt7VgcYAYbFiQZY9
-+IMYBdEzt2c/evCVh/WHb/iHZ9ocajte1QBoEB4cTLEnEgi4kOrb/TcFHWc49E8R
-joCMIlANlK9KJhAHSoChOUD4v1fFQhJNhTL/BBzB/EzD5TP08OO90RqImZshz3lq
-dXTRcbayBsGx/v0QyGOZOQgifSDQ3RXX0KuWo4rFbAiaeUuG
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpi.unirc.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpi.unirc.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi Mediterranea di Reggio Calabria</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Mediterranea University of Reggio Calabria</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università degli Studi Mediterranea di Reggio Calabria</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Mediterranea University of Reggio Calabria</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unirc.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unirc.it/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Idem Technical</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:idem.tech.support@unirc.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Idem</md:GivenName>
-    <md:SurName>Help</md:SurName>
-    <md:EmailAddress>mailto:idem-help@unirc.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 58dcbd87..00000000
--- a/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-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://idpr.tem-tsp.eu/idp/shibboleth">
-  <md: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>
-  </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 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:InformationURL xml:lang="fr">http://www.tem-tsp.eu</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://idpr.tem-tsp.eu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpr.tem-tsp.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpr.tem-tsp.eu/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpr.tem-tsp.eu/idp/profile/SAML1/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">Telecom SudParis et Telecom Management</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Telecom SudParis et Telecom Management</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.tem-tsp.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>infomatique@tem-tsp.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 08d83ffe..00000000
--- a/swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpshib01.ifma.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABhUlEQVQoz2P8//8/Aww8zKn6c/fNv5c/Vc8tZMAF/sPAy5nzIYxbNom3NGP/4wBQDd/v3kEWvWUYh0sDE8QeDiVlFHu5me8ap2N1ERMDA8Pfb1/RhRkZ/v3/gVUDI7KniQEsDAwMt22TVA/PQ5iRsRYRJDOCIYwP334LcLEyZqxluOdYessw7rZzyv///xnS17z78uP7rz/QAElfg8x49uE7Q/oaJsV9XQw//qvsmQ0xSah4y4rTjxYcu8/AwHCsxA7ZQqnyrVBP///x/7Z5AtwBCVaK4SJ/HHoPWqqIOvQd/D8juN5bU6BwI0rE3TKMg9j77eefV/OXwp1h3LBHoHDj////M5aehQhCNfy48ZAhfQ1D+ppnXZMgItFzT8I9gOwZkoMVGtMzD9+TLNsK8Z9J417Nhl0Q7ybMP3ng2jOH3oMMDAw/fv8VKNxIgg1//v5jYWZigXCMG/acbXApXH3RSVE0d+35aCP5qcfuOqqJuWuLrzj10ENH8vzjjy8/fjtQ4ggAN8oz0EB0uF4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDIrMDI6MDBDp9MfAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAyKzAyOjAwMvprowAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ifma.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</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>
-					      MIIC4DCCAkmgAwIBAgIJAMWigPxuLL5RMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
-VQQGEwJGUjERMA8GA1UECAwIQXV2ZXJnbmUxEDAOBgNVBAcMB0FVQklFUkUxDTAL
-BgNVBAoMBElGTUExDDAKBgNVBAsMA0NSSTEaMBgGA1UEAwwRaWRwc2hpYjAxLmlm
-bWEuZnIxGjAYBgkqhkiG9w0BCQEWC2NyaUBpZm1hLmZyMCAXDTE1MDUxOTEwMTYy
-MVoYDzIwNTUwNTA5MTAxNjIxWjCBhzELMAkGA1UEBhMCRlIxETAPBgNVBAgMCEF1
-dmVyZ25lMRAwDgYDVQQHDAdBVUJJRVJFMQ0wCwYDVQQKDARJRk1BMQwwCgYDVQQL
-DANDUkkxGjAYBgNVBAMMEWlkcHNoaWIwMS5pZm1hLmZyMRowGAYJKoZIhvcNAQkB
-FgtjcmlAaWZtYS5mcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs17WhzJT
-sQF4vCk1dEkDqWrgzuSXce32mqY31tSu2L6xlGaIn2XpxxUQMSiKdJY4tGOmTqks
-07dvNnDfrNo71wJcJqSGHULr1LDagyggWP0iq9MCABFr0q1hbPGO9xLvR7A8gJa7
-wLci0nzgD7p47LitEO8HTILOHGeOsJUSWQUCAwEAAaNQME4wHQYDVR0OBBYEFIkZ
-o+plAQVTkGYW+5u15h5uIIiZMB8GA1UdIwQYMBaAFIkZo+plAQVTkGYW+5u15h5u
-IIiZMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEApkkmKWKEOj7oKVhi
-d4yuQHjMIVdzNOOmIaEBhiD6DJtUd3PzRkLygxXCgEjsqsXKPvI/SAaEHm3v3YTK
-j1sOHmXiHYkOuZiqSkP+Foyrenc96ZRSq1T4y8HdwRwvMnG6Y9sJ5P87XmeupUyL
-U60eCzyytFHcDjlnz1S/qeEMni0=
-					    </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>
-					      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>
-    </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-POST" Location="https://idpshib01.ifma.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpshib01.ifma.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpshib01.ifma.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFMA Clermont-Ferrand - Institut Francais de Mecanique Avancee</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifma.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Christophe DUMONET</md:SurName>
-    <md:EmailAddress>christophe.dumonet@ifma.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Frédéric DEDIEU</md:SurName>
-    <md:EmailAddress>frederic.dedieu@ifma.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml
deleted file mode 100644
index 1dd16a52..00000000
--- a/swamid-interfederations-2.0/idpstaff-ha.belnet.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpstaff-ha.belnet.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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">https://federation.belnet.be/images/smallbelnetlogo.png</mdui:Logo>
-        <mdui:Logo height="75" width="153">https://federation.belnet.be/images/belnetlogo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhTCCBG2gAwIBAgIQAbu/mz6B3uQHzR3sVYBohTANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTEwMTUwMDAwMDBaFw0xODEwMTkxMjAwMDBaMIGcMQswCQYDVQQG
-EwJCRTERMA8GA1UECBMIQnJ1c3NlbHMxETAPBgNVBAcTCEJydXNzZWxzMTQwMgYD
-VQQKEytMZSByZXNlYXUgdGVsZW1hdGlxdWUgYmVsZ2UgZGUgbGEgcmVjaGVyY2hl
-MREwDwYDVQQLEwhTZXJ2aWNlczEeMBwGA1UEAxMVaWRwc3RhZmYtaGEuYmVsbmV0
-LmJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzKNVDc6TiZnNP0tF
-f0IBNV3yHm8geck6z7iB18+nXY0t9hjE3PNC0v4gA8kJjFj1Ys5rqE0ldQNhAu8g
-KzWQeaaYfOJoGKyu85Gnc4qAhVAhvl1X7dzNNl+Db1Z5suhm8Jxi8MX2ohwxSjZJ
-/ldnwRaOAa3zO4rgu0BpGPJzQDoP2ksY21gQpePpD5xvMnK+t8oPYDU74R+mYESa
-+t9bdNLXMZzQXaHjUDpdmZrkO9+eIn4KWtY8ofk0p0wNMRqOwqYoPG72nVX7+Pjj
-SkoCqFW2iNcBtaQF/0mB0Jr3xB8A6p4qCz7slAloRcnDrWWzlrtzEnkBIBifalwT
-6K+V0wIDAQABo4IB+DCCAfQwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1
-UGIwHQYDVR0OBBYEFIOvPcmgxVMJApesOV1Rzw+i5au9MEoGA1UdEQRDMEGCFWlk
-cHN0YWZmLWhhLmJlbG5ldC5iZYITaWRwc3RhZmYxLmJlbG5ldC5iZYITaWRwc3Rh
-ZmYyLmJlbG5ldC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2lj
-ZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdp
-Y2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwB
-ATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgG
-BmeBDAECAjBuBggrBgEFBQcBAQRiMGAwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
-LmRpZ2ljZXJ0LmNvbTA4BggrBgEFBQcwAoYsaHR0cDovL2NhY2VydHMuZGlnaWNl
-cnQuY29tL1RFUkVOQVNTTENBMy5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0B
-AQsFAAOCAQEAa9DOAi4UzgtnmAyHCgbKtcVDkxTSom/2w4W2Kn5yLQvo6kEH0UEQ
-2Vwo7dPhAqhN7iAPS2hMKAT88cQNBbC/QIoeP9EFDSeCudXvTx5RpDaAcT4R+syM
-tXqnOCD00HuvXGQVizAhyqbM8sWTAm/7oBtAIHluKy7MWUuIRQvjlsfMTGXJ6Kw1
-Na+iw1Vgtc8JHrdTnpMUuqMoIQj3P4r05Udx66T/cWTneDZIO02s3nmiPnOUlk5Z
-LPAq+dQEmHEHrN6uQyM6zCVLcrYt9T44SlwUFnddBpB9zblq1iveB96mSvpPlnsX
-/zsUJwYbMt+gLa9vzGSwaDg0dP+4TrQNSw==
-                  </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff-ha.belnet.be: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://idpstaff-ha.belnet.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff-ha.belnet.be/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belnet.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhTCCBG2gAwIBAgIQAbu/mz6B3uQHzR3sVYBohTANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNTEwMTUwMDAwMDBaFw0xODEwMTkxMjAwMDBaMIGcMQswCQYDVQQG
-EwJCRTERMA8GA1UECBMIQnJ1c3NlbHMxETAPBgNVBAcTCEJydXNzZWxzMTQwMgYD
-VQQKEytMZSByZXNlYXUgdGVsZW1hdGlxdWUgYmVsZ2UgZGUgbGEgcmVjaGVyY2hl
-MREwDwYDVQQLEwhTZXJ2aWNlczEeMBwGA1UEAxMVaWRwc3RhZmYtaGEuYmVsbmV0
-LmJlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzKNVDc6TiZnNP0tF
-f0IBNV3yHm8geck6z7iB18+nXY0t9hjE3PNC0v4gA8kJjFj1Ys5rqE0ldQNhAu8g
-KzWQeaaYfOJoGKyu85Gnc4qAhVAhvl1X7dzNNl+Db1Z5suhm8Jxi8MX2ohwxSjZJ
-/ldnwRaOAa3zO4rgu0BpGPJzQDoP2ksY21gQpePpD5xvMnK+t8oPYDU74R+mYESa
-+t9bdNLXMZzQXaHjUDpdmZrkO9+eIn4KWtY8ofk0p0wNMRqOwqYoPG72nVX7+Pjj
-SkoCqFW2iNcBtaQF/0mB0Jr3xB8A6p4qCz7slAloRcnDrWWzlrtzEnkBIBifalwT
-6K+V0wIDAQABo4IB+DCCAfQwHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1
-UGIwHQYDVR0OBBYEFIOvPcmgxVMJApesOV1Rzw+i5au9MEoGA1UdEQRDMEGCFWlk
-cHN0YWZmLWhhLmJlbG5ldC5iZYITaWRwc3RhZmYxLmJlbG5ldC5iZYITaWRwc3Rh
-ZmYyLmJlbG5ldC5iZTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0dHA6Ly9jcmwzLmRpZ2lj
-ZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilodHRwOi8vY3JsNC5kaWdp
-Y2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG/WwB
-ATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMAgG
-BmeBDAECAjBuBggrBgEFBQcBAQRiMGAwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3Nw
-LmRpZ2ljZXJ0LmNvbTA4BggrBgEFBQcwAoYsaHR0cDovL2NhY2VydHMuZGlnaWNl
-cnQuY29tL1RFUkVOQVNTTENBMy5jcnQwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0B
-AQsFAAOCAQEAa9DOAi4UzgtnmAyHCgbKtcVDkxTSom/2w4W2Kn5yLQvo6kEH0UEQ
-2Vwo7dPhAqhN7iAPS2hMKAT88cQNBbC/QIoeP9EFDSeCudXvTx5RpDaAcT4R+syM
-tXqnOCD00HuvXGQVizAhyqbM8sWTAm/7oBtAIHluKy7MWUuIRQvjlsfMTGXJ6Kw1
-Na+iw1Vgtc8JHrdTnpMUuqMoIQj3P4r05Udx66T/cWTneDZIO02s3nmiPnOUlk5Z
-LPAq+dQEmHEHrN6uQyM6zCVLcrYt9T44SlwUFnddBpB9zblq1iveB96mSvpPlnsX
-/zsUJwYbMt+gLa9vzGSwaDg0dP+4TrQNSw==
-
-                 </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff-ha.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Belnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Belnet staff HA IdP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.belnet.be/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Belnet Federation Technical Staff</md:GivenName>
-    <md:SurName>Belnet Federation</md:SurName>
-    <md:EmailAddress>mailto:federation@belnet.be</md:EmailAddress>
-    <md:TelephoneNumber>+32-2-7903333</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 2d2d58c2..00000000
--- a/swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,145 +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://idpstaff.belnet.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">belnet.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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">https://federation.belnet.be/images/smallbelnetlogo.png</mdui:Logo>
-        <mdui:Logo height="75" width="153">https://federation.belnet.be/images/belnetlogo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHBjCCBO6gAwIBAgIJAKNh2zINnSimMA0GCSqGSIb3DQEBCwUAMIGyMQswCQYD
-VQQGEwJCRTERMA8GA1UECBMIQnJ1c3NlbHMxETAPBgNVBAcTCEJydXNzZWxzMTQw
-MgYDVQQKEytMZSByZXNlYXUgdGVsZW1hdGlxdWUgYmVsZ2UgZGUgbGEgcmVjaGVy
-Y2hlMREwDwYDVQQLEwhTZXJ2aWNlczERMA8GA1UEAxMIU2VydmljZXMxITAfBgkq
-hkiG9w0BCQEWEnNlcnZpY2VzQGJlbG5ldC5iZTAeFw0xNTAyMDIxNTQ2MDhaFw0y
-NTAxMzAxNTQ2MDhaMIGyMQswCQYDVQQGEwJCRTERMA8GA1UECBMIQnJ1c3NlbHMx
-ETAPBgNVBAcTCEJydXNzZWxzMTQwMgYDVQQKEytMZSByZXNlYXUgdGVsZW1hdGlx
-dWUgYmVsZ2UgZGUgbGEgcmVjaGVyY2hlMREwDwYDVQQLEwhTZXJ2aWNlczERMA8G
-A1UEAxMIU2VydmljZXMxITAfBgkqhkiG9w0BCQEWEnNlcnZpY2VzQGJlbG5ldC5i
-ZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALjN9PlIt8fAtCMYG8/3
-zZBNy1g15mjP/pBuROg+5IMOf9zo9f9e12v2tHKk8x21rIm1kzxtvBUI/YAP7Mbi
-2Ovlw3zjGruQeSAJ21u87zg3lvdZzhM/yfUP5GNmx+hKUbKfT+JpbDy6mVhzgNEr
-4HJVRv6TO9NeopMzRNQfW4a2S6348HrYM1lubU0zv9Vx7CLVdWpxhyfZ6Uwvnxsh
-RF/lhJWyIHaC75mwthwhIZjwdX24NGVhPvniZEgPSTYERGYgtKCHyJhM5kJdg8rt
-J5ndB4RJ68/hGjgvkoFaIMk9rQNBQXaFjR1qeQ34Gue/QHar/S2GT4/AwRblF4l/
-GwHWyPKJv3vPvifZkx1RaEC3CxouunLhSCpziZ+unAE+ivbMFayvIsqaBRb5yZUJ
-5u9OQkLE6wAiYg1bniqc2rlOC0KT6naZDqA3IvjOKMSWA7nWKsiRRhoeeAXdUhj8
-X3AYEcwvgNJzvnlEPEVkfaHOJW22TNLPFSh4AEdb92bOQnpNoy63dafgZ0IVLWjw
-3fHMc8TsLKv2B/Fy+/PktllsOCggm3tMugabQqs239zqaXKFRcYoVRvrl3j6+pjD
-k6ligbXcQTOBBoaQjFtCswPoAKQdj61CflFu8/rgS1Kfg37tB79tt42XEQ9im9xT
-CdYmn73qg1OBhkOwR3RQAS5vAgMBAAGjggEbMIIBFzAdBgNVHQ4EFgQUAPUNEqb0
-FDonKiLZLEgIxSMUmjUwgecGA1UdIwSB3zCB3IAUAPUNEqb0FDonKiLZLEgIxSMU
-mjWhgbikgbUwgbIxCzAJBgNVBAYTAkJFMREwDwYDVQQIEwhCcnVzc2VsczERMA8G
-A1UEBxMIQnJ1c3NlbHMxNDAyBgNVBAoTK0xlIHJlc2VhdSB0ZWxlbWF0aXF1ZSBi
-ZWxnZSBkZSBsYSByZWNoZXJjaGUxETAPBgNVBAsTCFNlcnZpY2VzMREwDwYDVQQD
-EwhTZXJ2aWNlczEhMB8GCSqGSIb3DQEJARYSc2VydmljZXNAYmVsbmV0LmJlggkA
-o2HbMg2dKKYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAYMg+7mF0
-WX03EOmcHMmK7ZAeIVtMQ1nl/H9OmF0EroeSNO2rC0QrC/OTl6PpVBRLDs4B5Q62
-S3P9FpuPUi8ZIP2xh2AdDy8c3ZvmwTRy64S3cRuE5nTRMV4FoVgyCWENEzOEGuOc
-mmy0wLPQvmNCDDfGC1kzidZuInKgzXjDkepagcKf0LSOtB2OS9WAvWy6N3joK3Tx
-yXt1Xc+GNRX1eIUYAbruh9YGDeC0gcucbNpkCuDZ+ngX3/oeHvYsvEka2vn/bNcf
-VEd5MrozkqfvBpynxveXheHKbEZLEUZ85/ANqIKBwQwiKCHHJL+lGHBuK2MH5oDz
-7zX0L70JiSWvOBH9Vh15f13SpWCZnV7xLgB0Z8lh3v9KtKUsucv+54KxjqW4uShg
-TNyqBqZguGYPIdBjyTfiXiflTov3ppbe0Xk9msj1qo+6JTlGLPWy3WSLtRYfoM1q
-RQzoz1wqXX6OcU6uqu2yUZoZzUmPc4u2gCE2bxNeEWqHmz5k33LicM3KcaDn3QjS
-wTsM3P1mxKzK7lAzy6SA76BSuYstnOQxQQxmJTwhUnticjkyMB3Z6iuR9fyuDaJX
-RZH2wUb6jtZi83IXvN4KOxY4B0P3aRFH73Q4apG3hs8q+LQHTrWJ7ZbIikX9Nqmo
-tE/exBceOZoTFnIs53BmWCHYW6Vf8DWxkds=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff.belnet.be: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://idpstaff.belnet.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpstaff.belnet.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpstaff.belnet.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpstaff.belnet.be/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">belnet.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHBjCCBO6gAwIBAgIJAKNh2zINnSimMA0GCSqGSIb3DQEBCwUAMIGyMQswCQYD
-VQQGEwJCRTERMA8GA1UECBMIQnJ1c3NlbHMxETAPBgNVBAcTCEJydXNzZWxzMTQw
-MgYDVQQKEytMZSByZXNlYXUgdGVsZW1hdGlxdWUgYmVsZ2UgZGUgbGEgcmVjaGVy
-Y2hlMREwDwYDVQQLEwhTZXJ2aWNlczERMA8GA1UEAxMIU2VydmljZXMxITAfBgkq
-hkiG9w0BCQEWEnNlcnZpY2VzQGJlbG5ldC5iZTAeFw0xNTAyMDIxNTQ2MDhaFw0y
-NTAxMzAxNTQ2MDhaMIGyMQswCQYDVQQGEwJCRTERMA8GA1UECBMIQnJ1c3NlbHMx
-ETAPBgNVBAcTCEJydXNzZWxzMTQwMgYDVQQKEytMZSByZXNlYXUgdGVsZW1hdGlx
-dWUgYmVsZ2UgZGUgbGEgcmVjaGVyY2hlMREwDwYDVQQLEwhTZXJ2aWNlczERMA8G
-A1UEAxMIU2VydmljZXMxITAfBgkqhkiG9w0BCQEWEnNlcnZpY2VzQGJlbG5ldC5i
-ZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALjN9PlIt8fAtCMYG8/3
-zZBNy1g15mjP/pBuROg+5IMOf9zo9f9e12v2tHKk8x21rIm1kzxtvBUI/YAP7Mbi
-2Ovlw3zjGruQeSAJ21u87zg3lvdZzhM/yfUP5GNmx+hKUbKfT+JpbDy6mVhzgNEr
-4HJVRv6TO9NeopMzRNQfW4a2S6348HrYM1lubU0zv9Vx7CLVdWpxhyfZ6Uwvnxsh
-RF/lhJWyIHaC75mwthwhIZjwdX24NGVhPvniZEgPSTYERGYgtKCHyJhM5kJdg8rt
-J5ndB4RJ68/hGjgvkoFaIMk9rQNBQXaFjR1qeQ34Gue/QHar/S2GT4/AwRblF4l/
-GwHWyPKJv3vPvifZkx1RaEC3CxouunLhSCpziZ+unAE+ivbMFayvIsqaBRb5yZUJ
-5u9OQkLE6wAiYg1bniqc2rlOC0KT6naZDqA3IvjOKMSWA7nWKsiRRhoeeAXdUhj8
-X3AYEcwvgNJzvnlEPEVkfaHOJW22TNLPFSh4AEdb92bOQnpNoy63dafgZ0IVLWjw
-3fHMc8TsLKv2B/Fy+/PktllsOCggm3tMugabQqs239zqaXKFRcYoVRvrl3j6+pjD
-k6ligbXcQTOBBoaQjFtCswPoAKQdj61CflFu8/rgS1Kfg37tB79tt42XEQ9im9xT
-CdYmn73qg1OBhkOwR3RQAS5vAgMBAAGjggEbMIIBFzAdBgNVHQ4EFgQUAPUNEqb0
-FDonKiLZLEgIxSMUmjUwgecGA1UdIwSB3zCB3IAUAPUNEqb0FDonKiLZLEgIxSMU
-mjWhgbikgbUwgbIxCzAJBgNVBAYTAkJFMREwDwYDVQQIEwhCcnVzc2VsczERMA8G
-A1UEBxMIQnJ1c3NlbHMxNDAyBgNVBAoTK0xlIHJlc2VhdSB0ZWxlbWF0aXF1ZSBi
-ZWxnZSBkZSBsYSByZWNoZXJjaGUxETAPBgNVBAsTCFNlcnZpY2VzMREwDwYDVQQD
-EwhTZXJ2aWNlczEhMB8GCSqGSIb3DQEJARYSc2VydmljZXNAYmVsbmV0LmJlggkA
-o2HbMg2dKKYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAYMg+7mF0
-WX03EOmcHMmK7ZAeIVtMQ1nl/H9OmF0EroeSNO2rC0QrC/OTl6PpVBRLDs4B5Q62
-S3P9FpuPUi8ZIP2xh2AdDy8c3ZvmwTRy64S3cRuE5nTRMV4FoVgyCWENEzOEGuOc
-mmy0wLPQvmNCDDfGC1kzidZuInKgzXjDkepagcKf0LSOtB2OS9WAvWy6N3joK3Tx
-yXt1Xc+GNRX1eIUYAbruh9YGDeC0gcucbNpkCuDZ+ngX3/oeHvYsvEka2vn/bNcf
-VEd5MrozkqfvBpynxveXheHKbEZLEUZ85/ANqIKBwQwiKCHHJL+lGHBuK2MH5oDz
-7zX0L70JiSWvOBH9Vh15f13SpWCZnV7xLgB0Z8lh3v9KtKUsucv+54KxjqW4uShg
-TNyqBqZguGYPIdBjyTfiXiflTov3ppbe0Xk9msj1qo+6JTlGLPWy3WSLtRYfoM1q
-RQzoz1wqXX6OcU6uqu2yUZoZzUmPc4u2gCE2bxNeEWqHmz5k33LicM3KcaDn3QjS
-wTsM3P1mxKzK7lAzy6SA76BSuYstnOQxQQxmJTwhUnticjkyMB3Z6iuR9fyuDaJX
-RZH2wUb6jtZi83IXvN4KOxY4B0P3aRFH73Q4apG3hs8q+LQHTrWJ7ZbIikX9Nqmo
-tE/exBceOZoTFnIs53BmWCHYW6Vf8DWxkds=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpstaff.belnet.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpstaff.belnet.be: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="en">Belnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Belnet staff</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.belnet.be/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Belnet Federation Technical Staff</md:GivenName>
-    <md:SurName>Belnet Federation</md:SurName>
-    <md:EmailAddress>mailto:federation@belnet.be</md:EmailAddress>
-    <md:TelephoneNumber>+32-2-7903333</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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,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MDEyLTAzLTI5VDEwOjM2OjEwKzAyOjAwkWix2gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wMy0yOVQxMDozNjoxMCswMjowMOA1CWYAAAAUdEVYdGRjOmZvcm1hdABpbWFnZS9qcGVn22DkxQAAACB0RVh0aWxsdXN0cmF0b3I6U3RhcnR1cFByb2ZpbGUAUHJpbnRNbINqAAAAEXRFWHRqcGVnOmNvbG9yc3BhY2UAMix1VZ8AAAAgdEVYdGpwZWc6c2FtcGxpbmctZmFjdG9yADF4MSwxeDEsMXgx6ZX8cAAAACN0RVh0cGRmOlByb2R1Y2VyAEFkb2JlIFBERiBsaWJyYXJ5IDkuMDDiS+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/idptest.arts.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idptest.arts.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b7c2a1e1..00000000
--- a/swamid-interfederations-2.0/idptest.arts.ac.uk-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://idptest.arts.ac.uk/idp/shibboleth">
-  <!--
-		This is a "London Test" Shibboleth IdP for University of the Arts London.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-24T11:56:04Z">
-      <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">arts.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEQzCCAyugAwIBAgIJAPSUoUxlNXOCMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
-						VQQGEwJHQjEXMBUGA1UECAwOR3JlYXRlciBMb25kb24xDzANBgNVBAcMBkxvbmRv
-						bjEnMCUGA1UECgweVW5pdmVyc2l0eSBvZiB0aGUgQXJ0cywgTG9uZG9uMRQwEgYD
-						VQQLDAtJVCBTZXJ2aWNlczEbMBkGA1UEAwwSaWRwdGVzdC5hcnRzLmFjLnVrMSIw
-						IAYJKoZIhvcNAQkBFhNzc2xhZG1pbkBhcnRzLmFjLnVrMB4XDTE0MDUyMzEzNTAx
-						NFoXDTM0MDYwNzEzNTAxNFowgbcxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5HcmVh
-						dGVyIExvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMScwJQYDVQQKDB5Vbml2ZXJzaXR5
-						IG9mIHRoZSBBcnRzLCBMb25kb24xFDASBgNVBAsMC0lUIFNlcnZpY2VzMRswGQYD
-						VQQDDBJpZHB0ZXN0LmFydHMuYWMudWsxIjAgBgkqhkiG9w0BCQEWE3NzbGFkbWlu
-						QGFydHMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTpA1p
-						ywFyL2PyQc3aBiEha1Ie3hBkNUwOmmptUPLT0+g/MrJXlkx0QXgLtbaEp97YGzO6
-						wEbY27djJwzGaq0VDocqt6yZ1aRzg2xN3haSUHQDI3cNhGtjd/K/g9+ZUcI6nXfs
-						g+sE43dBal5lRiziNDjKV8SaEjKwe39+alnbFRdR6GD3ROMP+SiY4CNCq42ivNOJ
-						yaW2x83qdhNo0Bn8JTm6wU9l7ann1/76LtKO8Z3l5cKcxpVr7b0vdAf81IetQM8S
-						sDZ0kTWpYRF3sOpxXiO43D10GdYA7gywPhBlpEWZy67qowQatD6M4Za0/WK7r6sk
-						CB//HU/HqpuQRgp5AgMBAAGjUDBOMB0GA1UdDgQWBBRU0koaCOcSqDZ5OK9mbTVe
-						y0nIHDAfBgNVHSMEGDAWgBRU0koaCOcSqDZ5OK9mbTVey0nIHDAMBgNVHRMEBTAD
-						AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCDAZRXEf7m2IFQfeKiDvjDnW39uCuTRbVS
-						V9gb+sww+fKJMY0p9uVXgtt5xEJG3MKlW6ytxSRMtS5eM6pD0/R0/knDRoWdQYwi
-						OfFvToZUcu9LEmdFnYV99WxquCVjCD0rnl9nVOPRJ7HW3IwZqDO3fleawh2xHrc+
-						NbeWEv2yfDRDehYtTsI/fMBX8tp9u/80mYt8JRvVpmgMs5AaE88/MYZihnFEe31o
-						cSv7+YOHKs3p5aBYeuvvTsv1hZMwtD7ehNNzSGwv9S+nfIGQ16B1JRcmXSN14V1+
-						BKVZVakKzX6WCxengZ2A8lbx/oQPp5rbxtWkiv9dYMUY2nyQsjGF
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.arts.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://idptest.arts.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.arts.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.arts.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">arts.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEQzCCAyugAwIBAgIJAPSUoUxlNXOCMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
-						VQQGEwJHQjEXMBUGA1UECAwOR3JlYXRlciBMb25kb24xDzANBgNVBAcMBkxvbmRv
-						bjEnMCUGA1UECgweVW5pdmVyc2l0eSBvZiB0aGUgQXJ0cywgTG9uZG9uMRQwEgYD
-						VQQLDAtJVCBTZXJ2aWNlczEbMBkGA1UEAwwSaWRwdGVzdC5hcnRzLmFjLnVrMSIw
-						IAYJKoZIhvcNAQkBFhNzc2xhZG1pbkBhcnRzLmFjLnVrMB4XDTE0MDUyMzEzNTAx
-						NFoXDTM0MDYwNzEzNTAxNFowgbcxCzAJBgNVBAYTAkdCMRcwFQYDVQQIDA5HcmVh
-						dGVyIExvbmRvbjEPMA0GA1UEBwwGTG9uZG9uMScwJQYDVQQKDB5Vbml2ZXJzaXR5
-						IG9mIHRoZSBBcnRzLCBMb25kb24xFDASBgNVBAsMC0lUIFNlcnZpY2VzMRswGQYD
-						VQQDDBJpZHB0ZXN0LmFydHMuYWMudWsxIjAgBgkqhkiG9w0BCQEWE3NzbGFkbWlu
-						QGFydHMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTpA1p
-						ywFyL2PyQc3aBiEha1Ie3hBkNUwOmmptUPLT0+g/MrJXlkx0QXgLtbaEp97YGzO6
-						wEbY27djJwzGaq0VDocqt6yZ1aRzg2xN3haSUHQDI3cNhGtjd/K/g9+ZUcI6nXfs
-						g+sE43dBal5lRiziNDjKV8SaEjKwe39+alnbFRdR6GD3ROMP+SiY4CNCq42ivNOJ
-						yaW2x83qdhNo0Bn8JTm6wU9l7ann1/76LtKO8Z3l5cKcxpVr7b0vdAf81IetQM8S
-						sDZ0kTWpYRF3sOpxXiO43D10GdYA7gywPhBlpEWZy67qowQatD6M4Za0/WK7r6sk
-						CB//HU/HqpuQRgp5AgMBAAGjUDBOMB0GA1UdDgQWBBRU0koaCOcSqDZ5OK9mbTVe
-						y0nIHDAfBgNVHSMEGDAWgBRU0koaCOcSqDZ5OK9mbTVey0nIHDAMBgNVHRMEBTAD
-						AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCDAZRXEf7m2IFQfeKiDvjDnW39uCuTRbVS
-						V9gb+sww+fKJMY0p9uVXgtt5xEJG3MKlW6ytxSRMtS5eM6pD0/R0/knDRoWdQYwi
-						OfFvToZUcu9LEmdFnYV99WxquCVjCD0rnl9nVOPRJ7HW3IwZqDO3fleawh2xHrc+
-						NbeWEv2yfDRDehYtTsI/fMBX8tp9u/80mYt8JRvVpmgMs5AaE88/MYZihnFEe31o
-						cSv7+YOHKs3p5aBYeuvvTsv1hZMwtD7ehNNzSGwv9S+nfIGQ16B1JRcmXSN14V1+
-						BKVZVakKzX6WCxengZ2A8lbx/oQPp5rbxtWkiv9dYMUY2nyQsjGF
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.arts.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.arts.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 the Arts London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of the Arts London Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.arts.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UAL Helpdesk</GivenName>
-    <EmailAddress>mailto:shib-support@arts.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Justin</GivenName>
-    <SurName>Birt</SurName>
-    <EmailAddress>mailto:j.birt@arts.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptest.brunel.ac.uk-entity.xml b/swamid-interfederations-2.0/idptest.brunel.ac.uk-entity.xml
deleted file mode 100644
index f3c2d4c9..00000000
--- a/swamid-interfederations-2.0/idptest.brunel.ac.uk-entity.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://idptest.brunel.ac.uk/entity">
-  <!--
-		This is a test Shibboleth IdP for Brunel University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T13:14:14Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">brunel.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Brunel University (Test)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Brunel University test identity provider</mdui:Description>
-        <mdui:Logo height="60" width="80">https://idptest.brunel.ac.uk/logo/80x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://idptest.brunel.ac.uk/logo/16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVANgJSDgjyA0miJmS6WdosLWR8bo3MA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFGlkcHRlc3QuYnJ1bmVsLmFjLnVrMB4XDTEzMDUxMzA4
-						NDEyM1oXDTMzMDUxMzA4NDEyM1owHzEdMBsGA1UEAxMUaWRwdGVzdC5icnVuZWwu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9CGamVclmceIU
-						IoWVlbz5FN6NBXoVLscwFQBBKH4E3vm6RLOtD7YP6yteWiPM0N7olXtHNg9OdpS5
-						wiRbDIH7W+sbQ4hw7uvwOZooL0XGyOhMtbUKwtJ/N2ziXDgRAW+r08o5fiiMzcxO
-						YOvSggeea3relXuwRLMPhccKiUAcYX7fx7wdlFG2py5XJc4sQqnGgv6/7TsUhL1I
-						WwqE/WX+gjF6Jj5Biwft2NAIdQXaC67NkhOO8tL2WtAfCWe6qYRQXSTPExj6QffB
-						E57VQbcWcTPtTdI+eSAj5Ow1OO6HwRsTOR5Ur/zdxheMxe4FWlkX/TxawU95t+rC
-						7My4IferAgMBAAGjZzBlMEQGA1UdEQQ9MDuCFGlkcHRlc3QuYnJ1bmVsLmFjLnVr
-						hiNodHRwczovL2lkcHRlc3QuYnJ1bmVsLmFjLnVrL2VudGl0eTAdBgNVHQ4EFgQU
-						iLv8778GItQ8Ac1IH0WDtGQk3VswDQYJKoZIhvcNAQEFBQADggEBAE6S3UPN9N+e
-						sp3BUOsJZ0wGXJak9UTAStjeVOOSPYjPGGrwHxhOWFXNtQfTWrNaPXtTnxxSl2QZ
-						1LfgeGVhsEDKvL4x4cSqi+PkyLTiDf+BoTxThoFhA0FSdL4R06/L8qBdZGjUQyQy
-						Mkv6tJmG+JKLnS92lsz85icowAjvZYj3auwqTWlVIy+4GnNG83eaC64GZoR5ivj2
-						h+VvNQOmjY+C94nTzu1K+rlVIWPphqWSA93s3a10ryKWUngnIPDuxv1i/CHyerbu
-						bmvYeuDZtLYLGxK6LdrBY2JUf4diIibARVq+AbGCakqOmEB6A00OU1kNWnHZ1s2F
-						ZxYoLjTTweY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.brunel.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://idptest.brunel.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.brunel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.brunel.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">brunel.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVANgJSDgjyA0miJmS6WdosLWR8bo3MA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFGlkcHRlc3QuYnJ1bmVsLmFjLnVrMB4XDTEzMDUxMzA4
-						NDEyM1oXDTMzMDUxMzA4NDEyM1owHzEdMBsGA1UEAxMUaWRwdGVzdC5icnVuZWwu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9CGamVclmceIU
-						IoWVlbz5FN6NBXoVLscwFQBBKH4E3vm6RLOtD7YP6yteWiPM0N7olXtHNg9OdpS5
-						wiRbDIH7W+sbQ4hw7uvwOZooL0XGyOhMtbUKwtJ/N2ziXDgRAW+r08o5fiiMzcxO
-						YOvSggeea3relXuwRLMPhccKiUAcYX7fx7wdlFG2py5XJc4sQqnGgv6/7TsUhL1I
-						WwqE/WX+gjF6Jj5Biwft2NAIdQXaC67NkhOO8tL2WtAfCWe6qYRQXSTPExj6QffB
-						E57VQbcWcTPtTdI+eSAj5Ow1OO6HwRsTOR5Ur/zdxheMxe4FWlkX/TxawU95t+rC
-						7My4IferAgMBAAGjZzBlMEQGA1UdEQQ9MDuCFGlkcHRlc3QuYnJ1bmVsLmFjLnVr
-						hiNodHRwczovL2lkcHRlc3QuYnJ1bmVsLmFjLnVrL2VudGl0eTAdBgNVHQ4EFgQU
-						iLv8778GItQ8Ac1IH0WDtGQk3VswDQYJKoZIhvcNAQEFBQADggEBAE6S3UPN9N+e
-						sp3BUOsJZ0wGXJak9UTAStjeVOOSPYjPGGrwHxhOWFXNtQfTWrNaPXtTnxxSl2QZ
-						1LfgeGVhsEDKvL4x4cSqi+PkyLTiDf+BoTxThoFhA0FSdL4R06/L8qBdZGjUQyQy
-						Mkv6tJmG+JKLnS92lsz85icowAjvZYj3auwqTWlVIy+4GnNG83eaC64GZoR5ivj2
-						h+VvNQOmjY+C94nTzu1K+rlVIWPphqWSA93s3a10ryKWUngnIPDuxv1i/CHyerbu
-						bmvYeuDZtLYLGxK6LdrBY2JUf4diIibARVq+AbGCakqOmEB6A00OU1kNWnHZ1s2F
-						ZxYoLjTTweY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.brunel.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">Brunel University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brunel University (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brunel.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Web</GivenName>
-    <EmailAddress>mailto:sysweb@brunel.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Web</GivenName>
-    <EmailAddress>mailto:sysweb@brunel.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptest.coventry.ac.uk-idp.xml b/swamid-interfederations-2.0/idptest.coventry.ac.uk-idp.xml
deleted file mode 100644
index 42b91d92..00000000
--- a/swamid-interfederations-2.0/idptest.coventry.ac.uk-idp.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://idptest.coventry.ac.uk/idp">
-  <!--
-		This is a "Test" Shibboleth IdP for Coventry University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-04-12T17:10: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">coventry.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUQz1y+3PpqxFtSJF1dmrHYsxzNNcwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWaWRwdGVzdC5jb3ZlbnRyeS5hYy51azAeFw0xMzA1MTMw
-						ODA1NTJaFw0zMzA1MTMwODA1NTJaMCExHzAdBgNVBAMTFmlkcHRlc3QuY292ZW50
-						cnkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc5dKjYAYy
-						ngY0n46F3l2pFpNquvp0DER9p7M9MEE8bWq9BYTMnKzZCsGcjg2DV4BaY3rlTnjK
-						QU/KUCz1UY7gBSPcsttNVEXv015kvH0AICZt1n/2XEGGcBkf4lytwC/o/qkbOSSY
-						7ttIAyt1gFds79eyPR7PS1/eIAuRt9EfzG6l2XIq2juzoKt7uEEdZ0SBPzRCgFv1
-						G3QgUBiBEKexd5b2rCaamdnTkJJwCKpqOW2RfPjScOA/X6aERg5pXujPe2Gf39Ge
-						V2ZjtTfB9EHFR7LQQUQX0R8Z+3vrwxWJHYFc3sKGziHyfvbTmhlzV2yP64SsXdud
-						qUE3dFY2xePhAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcHRlc3QuY292ZW50cnku
-						YWMudWuGLWh0dHBzOi8vaWRwdGVzdC5jb3ZlbnRyeS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQU3teQB8jn8bLf5zQNsivLJ6bZ8vQwDQYJKoZIhvcNAQEF
-						BQADggEBAEF/bieO50sJY8xJ2hcTXDU9F4rTzNGVpkc7Sowt0cQGJRAjB8/fjcMS
-						h6NKHvwFrrocVK93HSE5NLBDb++dn1Rk1l8iTkze2MkguAmHn2/JdCJVcDj7ajts
-						VUFFq/GrE2yVB8OtmUM2MCaX0WPNangBP7Ebdi8FXnAZmMbZZiaNYfJKKb5zXuNQ
-						7Bn8mht2zWHrebMAzs68nlVlslo1w5BY3N2rMnyghREhgNpRBG52oEskY71w3D5I
-						+/Ma6jjJQqwMn6waLPwWgaFF4D1dDYNiBycXZFUdxq7QGfMLNM/3087BXZmx1cwA
-						ShCd45aNLiB4OnAyl5fHO3EMmgcw2n8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.coventry.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.coventry.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://idptest.coventry.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.coventry.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.coventry.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.coventry.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">coventry.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUQz1y+3PpqxFtSJF1dmrHYsxzNNcwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWaWRwdGVzdC5jb3ZlbnRyeS5hYy51azAeFw0xMzA1MTMw
-						ODA1NTJaFw0zMzA1MTMwODA1NTJaMCExHzAdBgNVBAMTFmlkcHRlc3QuY292ZW50
-						cnkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCc5dKjYAYy
-						ngY0n46F3l2pFpNquvp0DER9p7M9MEE8bWq9BYTMnKzZCsGcjg2DV4BaY3rlTnjK
-						QU/KUCz1UY7gBSPcsttNVEXv015kvH0AICZt1n/2XEGGcBkf4lytwC/o/qkbOSSY
-						7ttIAyt1gFds79eyPR7PS1/eIAuRt9EfzG6l2XIq2juzoKt7uEEdZ0SBPzRCgFv1
-						G3QgUBiBEKexd5b2rCaamdnTkJJwCKpqOW2RfPjScOA/X6aERg5pXujPe2Gf39Ge
-						V2ZjtTfB9EHFR7LQQUQX0R8Z+3vrwxWJHYFc3sKGziHyfvbTmhlzV2yP64SsXdud
-						qUE3dFY2xePhAgMBAAGjczBxMFAGA1UdEQRJMEeCFmlkcHRlc3QuY292ZW50cnku
-						YWMudWuGLWh0dHBzOi8vaWRwdGVzdC5jb3ZlbnRyeS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQU3teQB8jn8bLf5zQNsivLJ6bZ8vQwDQYJKoZIhvcNAQEF
-						BQADggEBAEF/bieO50sJY8xJ2hcTXDU9F4rTzNGVpkc7Sowt0cQGJRAjB8/fjcMS
-						h6NKHvwFrrocVK93HSE5NLBDb++dn1Rk1l8iTkze2MkguAmHn2/JdCJVcDj7ajts
-						VUFFq/GrE2yVB8OtmUM2MCaX0WPNangBP7Ebdi8FXnAZmMbZZiaNYfJKKb5zXuNQ
-						7Bn8mht2zWHrebMAzs68nlVlslo1w5BY3N2rMnyghREhgNpRBG52oEskY71w3D5I
-						+/Ma6jjJQqwMn6waLPwWgaFF4D1dDYNiBycXZFUdxq7QGfMLNM/3087BXZmx1cwA
-						ShCd45aNLiB4OnAyl5fHO3EMmgcw2n8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.coventry.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.coventry.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">Coventry University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Coventry University (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.coventry.ac.uk/cu/its/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Gary</GivenName>
-    <SurName>Walton</SurName>
-    <EmailAddress>mailto:g.walton@coventry.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gary</GivenName>
-    <SurName>Walton</SurName>
-    <EmailAddress>mailto:g.walton@coventry.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptest.dundee.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idptest.dundee.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 96255a9e..00000000
--- a/swamid-interfederations-2.0/idptest.dundee.ac.uk-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://idptest.dundee.ac.uk/idp/shibboleth">
-  <!--
-		This is a test Shibboleth IdP for the University of Dundee.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-23T14:52:51Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">dundee.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdjCCA16gAwIBAgIRALhrcSNiz3jY22Uy2UdbVDQwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA1MTQwMDAwMDBaFw0xNjA1MTMyMzU5NTlaMEIxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwdGVzdC5k
-						dW5kZWUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd5C/u
-						oV8EOVQXJjWhRzvtmXVjQrxCZLuSWvCOQhugZMmWW6gQvNI+GhjEs0bqfF5nklzl
-						KLDOAz9MskmL6v+jgkdUaUXoudrXWm7vuOEv7njEmf7Un5OKgUQHK2KGyOX7f+7r
-						lnd1HoBec52R5bj/b3EvI/Cm7nBcS5AC89929xGkuHOgCboCYXeeki0OGH4+K3hH
-						CToqFLiF9pkp5PW9LUVdywGaYgRDuUP0Fl4C4tclgA5PpDSikrDrBB6s0D7KfWYf
-						29fr2rR7jtFmPwtyZhWn3Tv0Uwe1hQMu/XnRmylmqfzgzlpYUqkh1UQcgZ3RIv7R
-						BPYhkHgBi/aA+l7/AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-						ays3V0fqkOO57TAdBgNVHQ4EFgQUAf5DUFJR2d0dGXQRxP9CdFzHNXgwDgYDVR0P
-						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcHRlc3QuZHVuZGVl
-						LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBX2vouq3+oxWufgfglYteEL9rr5oap
-						TAobkNaYqSrg4kToRP6enrfDgQ0nzVGib1pUd1WBZVij3b9/tmy3akQvp12Onx0B
-						RxyTsKpTsz2mZSKyMQohdrNHeexT9LDvUOZg+geaCWeTmnyXbJfPDK+JZ9Fafes6
-						Dz/VhBjgTSfzVrWcZbhINxJ/MFf7KxW8LO57gNd3BH0eky4XnS8y2YE9rAH+vwOi
-						4mRlAi9j6dLf6h8MDqNkxRi/EOMXU5zpoMWniSSUuqpkUnjmYVttGCdo5hSVYlOK
-						OKpIjPVYOu9sGvFLTmnQTOHk3UVSj+5NQpEpCMbSPoElsd4ZZQAneHdB
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.dundee.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://idptest.dundee.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.dundee.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.dundee.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">dundee.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdjCCA16gAwIBAgIRALhrcSNiz3jY22Uy2UdbVDQwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA1MTQwMDAwMDBaFw0xNjA1MTMyMzU5NTlaMEIxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUaWRwdGVzdC5k
-						dW5kZWUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd5C/u
-						oV8EOVQXJjWhRzvtmXVjQrxCZLuSWvCOQhugZMmWW6gQvNI+GhjEs0bqfF5nklzl
-						KLDOAz9MskmL6v+jgkdUaUXoudrXWm7vuOEv7njEmf7Un5OKgUQHK2KGyOX7f+7r
-						lnd1HoBec52R5bj/b3EvI/Cm7nBcS5AC89929xGkuHOgCboCYXeeki0OGH4+K3hH
-						CToqFLiF9pkp5PW9LUVdywGaYgRDuUP0Fl4C4tclgA5PpDSikrDrBB6s0D7KfWYf
-						29fr2rR7jtFmPwtyZhWn3Tv0Uwe1hQMu/XnRmylmqfzgzlpYUqkh1UQcgZ3RIv7R
-						BPYhkHgBi/aA+l7/AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-						ays3V0fqkOO57TAdBgNVHQ4EFgQUAf5DUFJR2d0dGXQRxP9CdFzHNXgwDgYDVR0P
-						AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
-						HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
-						Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
-						Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
-						Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFGlkcHRlc3QuZHVuZGVl
-						LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBX2vouq3+oxWufgfglYteEL9rr5oap
-						TAobkNaYqSrg4kToRP6enrfDgQ0nzVGib1pUd1WBZVij3b9/tmy3akQvp12Onx0B
-						RxyTsKpTsz2mZSKyMQohdrNHeexT9LDvUOZg+geaCWeTmnyXbJfPDK+JZ9Fafes6
-						Dz/VhBjgTSfzVrWcZbhINxJ/MFf7KxW8LO57gNd3BH0eky4XnS8y2YE9rAH+vwOi
-						4mRlAi9j6dLf6h8MDqNkxRi/EOMXU5zpoMWniSSUuqpkUnjmYVttGCdo5hSVYlOK
-						OKpIjPVYOu9sGvFLTmnQTOHk3UVSj+5NQpEpCMbSPoElsd4ZZQAneHdB
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.dundee.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.dundee.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 Dundee</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Dundee test 2.4 IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dundee.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Swiffin</SurName>
-    <EmailAddress>mailto:a.l.swiffin@dundee.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Swiffin</SurName>
-    <EmailAddress>mailto:a.l.swiffin@dundee.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptest.gla.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idptest.gla.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 543a8478..00000000
--- a/swamid-interfederations-2.0/idptest.gla.ac.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://idptest.gla.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Glasgow.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">gla.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Glasgow (test idp)</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://milngavie.cent.gla.ac.uk/UoG_colour_80x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://milngavie.cent.gla.ac.uk/UoG_colour_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>130.209.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>gla.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:55.8719,4.2875</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIJAMpwaiffXLvnMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDmlkcDIuZ2xhLmFjLnVrMB4XDTEzMDczMTA5NTIxM1oXDTIzMDcyOTA5NTIx
-						M1owGTEXMBUGA1UEAxMOaWRwMi5nbGEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQD0RzBDqhDBJzPa0J3/n4WBPOpdr2/czEvRbJnQyNKoM2zz
-						xNwB2Rig51I5rLNE+7m6vd19UyJg39w88POF7rTqiXCtaVEjOdkpDZEXxFyUXqau
-						7qGFKctcCuNYzkQ9GzmMpOXHV6Dlx3Kzy7JlnnSHSaj05g6PfUjXUblYcbvRZsdB
-						bgPQ9arnSBt0hvzBockIzxW6ZmOXkt0EZJxqAO94m2Uz1ii+NrB3IO1+HurVA087
-						vXzsHNbmscT25LPsexVXf8k9AwgQOVN3Qv2mZHE/ZHl17bIFjC6LR73PrwmXJ3Xq
-						pq88E5WrdvfTOvq8zfDnXMrMAre0AWqdBE90U5KHAgMBAAGjezB5MAkGA1UdEwQC
-						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
-						MB0GA1UdDgQWBBSARlmmJllZl4mMWFsE5OuyOq0NNzAfBgNVHSMEGDAWgBSARlmm
-						JllZl4mMWFsE5OuyOq0NNzANBgkqhkiG9w0BAQUFAAOCAQEAq4QZ28h4xbnGneQA
-						3o5uqmiYIPI5Zl6duDh6Ybv6EuugRAnhyOvMBi/Ws2ZUSUCysUbBNvnbVOFhnJPI
-						GnAlT0B5a0lxUo+P2eCKWBlz7Mgjr/pRC9zaBPYIuT8z4K1OFUgxO3priwo7UdfP
-						Db4rm84ukg7HfBl42JhgnrJWz7R9HBEhZlZUK0v6UfORdlvuUxSqcyOgg6/LKMHz
-						LRpUlQOq3+XNwKzN7/SBVWwGhIplHLSNiq1hxw/gUIAd9egQXbbqZJwVO6klqLc8
-						Y+WN9I8MHc2fP7w2koKhHc5bM0yKnmIQ9qlZfoliAWKLaCaoDkFJ0mQiYjtieiXf
-						qP4p1g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.gla.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.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://idp2.gla.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.gla.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.gla.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.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">gla.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIJAMpwaiffXLvnMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDmlkcDIuZ2xhLmFjLnVrMB4XDTEzMDczMTA5NTIxM1oXDTIzMDcyOTA5NTIx
-						M1owGTEXMBUGA1UEAxMOaWRwMi5nbGEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQD0RzBDqhDBJzPa0J3/n4WBPOpdr2/czEvRbJnQyNKoM2zz
-						xNwB2Rig51I5rLNE+7m6vd19UyJg39w88POF7rTqiXCtaVEjOdkpDZEXxFyUXqau
-						7qGFKctcCuNYzkQ9GzmMpOXHV6Dlx3Kzy7JlnnSHSaj05g6PfUjXUblYcbvRZsdB
-						bgPQ9arnSBt0hvzBockIzxW6ZmOXkt0EZJxqAO94m2Uz1ii+NrB3IO1+HurVA087
-						vXzsHNbmscT25LPsexVXf8k9AwgQOVN3Qv2mZHE/ZHl17bIFjC6LR73PrwmXJ3Xq
-						pq88E5WrdvfTOvq8zfDnXMrMAre0AWqdBE90U5KHAgMBAAGjezB5MAkGA1UdEwQC
-						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
-						MB0GA1UdDgQWBBSARlmmJllZl4mMWFsE5OuyOq0NNzAfBgNVHSMEGDAWgBSARlmm
-						JllZl4mMWFsE5OuyOq0NNzANBgkqhkiG9w0BAQUFAAOCAQEAq4QZ28h4xbnGneQA
-						3o5uqmiYIPI5Zl6duDh6Ybv6EuugRAnhyOvMBi/Ws2ZUSUCysUbBNvnbVOFhnJPI
-						GnAlT0B5a0lxUo+P2eCKWBlz7Mgjr/pRC9zaBPYIuT8z4K1OFUgxO3priwo7UdfP
-						Db4rm84ukg7HfBl42JhgnrJWz7R9HBEhZlZUK0v6UfORdlvuUxSqcyOgg6/LKMHz
-						LRpUlQOq3+XNwKzN7/SBVWwGhIplHLSNiq1hxw/gUIAd9egQXbbqZJwVO6klqLc8
-						Y+WN9I8MHc2fP7w2koKhHc5bM0yKnmIQ9qlZfoliAWKLaCaoDkFJ0mQiYjtieiXf
-						qP4p1g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.gla.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.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">University of Glasgow (test idp)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gla.ac.uk/services/it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>User Support</GivenName>
-    <EmailAddress>mailto:helpdesk@it.gla.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:d.anderson@compserv.gla.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idptest.northumbria.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idptest.northumbria.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index c3ec8429..00000000
--- a/swamid-interfederations-2.0/idptest.northumbria.ac.uk-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://idptest.northumbria.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP for Northumbria University IT Services.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">northumbria.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEXDCCA0SgAwIBAgIJAN+n/8ddfvukMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-						VQQGEwJHQjEWMBQGA1UECAwNVHluZSBhbmQgV2VhcjEcMBoGA1UEBwwTTmV3Y2Fz
-						dGxlIHVwb24gVHluZTEvMC0GA1UECgwmVW5pdmVyc2l0eSBvZiBOb3J0aHVtYnJp
-						YSBhdCBOZXdjYXN0bGUxFDASBgNVBAsMC0lUIFNlcnZpY2VzMSIwIAYDVQQDDBlp
-						ZHB0ZXN0Lm5vcnRodW1icmlhLmFjLnVrMB4XDTEzMDMxMzEyMzM0MFoXDTIzMDMx
-						MTEyMzM0MFowga4xCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1UeW5lIGFuZCBXZWFy
-						MRwwGgYDVQQHDBNOZXdjYXN0bGUgdXBvbiBUeW5lMS8wLQYDVQQKDCZVbml2ZXJz
-						aXR5IG9mIE5vcnRodW1icmlhIGF0IE5ld2Nhc3RsZTEUMBIGA1UECwwLSVQgU2Vy
-						dmljZXMxIjAgBgNVBAMMGWlkcHRlc3Qubm9ydGh1bWJyaWEuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFR74+CbRx31V0Yx5wSzjdW9oUreHg
-						HqwCOTU7yp0N6urfRvihThZ/P4IObudxC6O95AcbGiZQ0c5y8qsdQMiCyZQMe78j
-						75ab5yZ4QMhI+/4pJDl1NpQ8XwK8zqzAR3Vc2iX4ZmJ4PYJdp/V4+tMv2X9+gDWF
-						xBB4IAG/1KcZx2q9im7JMDeXGGLdTsWMyZc/Ox3XVKJd35BgDUlJeSRrb8p8FO//
-						kBOEGI9tKV5GVdX/ro7JC+d4u5qQg4EA8Da+H1uH6cjZcGxNX1djBUdH6g5rXNm/
-						ItDZkFPVRVnhB0bwdqhalMkLsfsBic7eh6H3J1piU4PuLYE9ldn1gMx3AgMBAAGj
-						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
-						IENlcnRpZmljYXRlMB0GA1UdDgQWBBSNdQP3eDz1Sq3/s5X52TwxLGIAsTAfBgNV
-						HSMEGDAWgBSNdQP3eDz1Sq3/s5X52TwxLGIAsTANBgkqhkiG9w0BAQUFAAOCAQEA
-						T/yHhsWLV9NO5ek8j/eOo0kNyJKnY1m3Gm2Jh36PO+2tjvoD774URs/a9bTR8lOY
-						ADlZ6BFET9AqAR7F2Ddd2A4MsJA29Kwl/v2BZoFnkNkMoA5j9vH4zcaSbpdxXkLa
-						4lDOIvLzhBlZ4CuTvBLMmPhyyecERwlZ/du7RgNBRwFrnRIJfb7/CqyHWFfBGu9m
-						5XTCI2K7lhb9ngUNDpifqRUJAWlRv1zcIeIul7Q4YZ/FUkfWxQaxSZwln+Oh9jcl
-						KzbaZ7XJsXv5KSqZ+N9KNAOKB2OtibZ4JRaqLDFnEjpNUbMou6hds2bq5qSLu0y4
-						0SCI9EzS1OHjuqq4XJ2vLg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.northumbria.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.northumbria.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://idptest.northumbria.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.northumbria.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idptest.northumbria.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.northumbria.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">northumbria.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEXDCCA0SgAwIBAgIJAN+n/8ddfvukMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-						VQQGEwJHQjEWMBQGA1UECAwNVHluZSBhbmQgV2VhcjEcMBoGA1UEBwwTTmV3Y2Fz
-						dGxlIHVwb24gVHluZTEvMC0GA1UECgwmVW5pdmVyc2l0eSBvZiBOb3J0aHVtYnJp
-						YSBhdCBOZXdjYXN0bGUxFDASBgNVBAsMC0lUIFNlcnZpY2VzMSIwIAYDVQQDDBlp
-						ZHB0ZXN0Lm5vcnRodW1icmlhLmFjLnVrMB4XDTEzMDMxMzEyMzM0MFoXDTIzMDMx
-						MTEyMzM0MFowga4xCzAJBgNVBAYTAkdCMRYwFAYDVQQIDA1UeW5lIGFuZCBXZWFy
-						MRwwGgYDVQQHDBNOZXdjYXN0bGUgdXBvbiBUeW5lMS8wLQYDVQQKDCZVbml2ZXJz
-						aXR5IG9mIE5vcnRodW1icmlhIGF0IE5ld2Nhc3RsZTEUMBIGA1UECwwLSVQgU2Vy
-						dmljZXMxIjAgBgNVBAMMGWlkcHRlc3Qubm9ydGh1bWJyaWEuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFR74+CbRx31V0Yx5wSzjdW9oUreHg
-						HqwCOTU7yp0N6urfRvihThZ/P4IObudxC6O95AcbGiZQ0c5y8qsdQMiCyZQMe78j
-						75ab5yZ4QMhI+/4pJDl1NpQ8XwK8zqzAR3Vc2iX4ZmJ4PYJdp/V4+tMv2X9+gDWF
-						xBB4IAG/1KcZx2q9im7JMDeXGGLdTsWMyZc/Ox3XVKJd35BgDUlJeSRrb8p8FO//
-						kBOEGI9tKV5GVdX/ro7JC+d4u5qQg4EA8Da+H1uH6cjZcGxNX1djBUdH6g5rXNm/
-						ItDZkFPVRVnhB0bwdqhalMkLsfsBic7eh6H3J1piU4PuLYE9ldn1gMx3AgMBAAGj
-						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
-						IENlcnRpZmljYXRlMB0GA1UdDgQWBBSNdQP3eDz1Sq3/s5X52TwxLGIAsTAfBgNV
-						HSMEGDAWgBSNdQP3eDz1Sq3/s5X52TwxLGIAsTANBgkqhkiG9w0BAQUFAAOCAQEA
-						T/yHhsWLV9NO5ek8j/eOo0kNyJKnY1m3Gm2Jh36PO+2tjvoD774URs/a9bTR8lOY
-						ADlZ6BFET9AqAR7F2Ddd2A4MsJA29Kwl/v2BZoFnkNkMoA5j9vH4zcaSbpdxXkLa
-						4lDOIvLzhBlZ4CuTvBLMmPhyyecERwlZ/du7RgNBRwFrnRIJfb7/CqyHWFfBGu9m
-						5XTCI2K7lhb9ngUNDpifqRUJAWlRv1zcIeIul7Q4YZ/FUkfWxQaxSZwln+Oh9jcl
-						KzbaZ7XJsXv5KSqZ+N9KNAOKB2OtibZ4JRaqLDFnEjpNUbMou6hds2bq5qSLu0y4
-						0SCI9EzS1OHjuqq4XJ2vLg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idptest.northumbria.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idptest.northumbria.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 Northumbria at Newcastle</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Northumbria University: IT Services Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.northumbria.ac.uk/sd/central/its/dept_structure_etc/?view=Standard</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Neil</GivenName>
-    <SurName>Graham</SurName>
-    <EmailAddress>mailto:neil.graham@northumbria.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Neil</GivenName>
-    <SurName>Graham</SurName>
-    <EmailAddress>mailto:neil.graham@northumbria.ac.uk</EmailAddress>
-  </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 fdd8994f..00000000
--- a/swamid-interfederations-2.0/idptl.telecom-lille.fr-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://idptl.telecom-lille.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABFklEQVQ4y82Su0oDYRCFv/k3m0WJMRcDATWQRovghViIjdpaWlhZmpfwJWziEwg2PoIvIDZiZZpgkVJkgxEWdS9jscHddLJr4cA0c5gPZs4B0Az9AfQBCmQrBzgDPmVKzFpeXkBociwD8HeA/TrsVgWAxQKcdwynrYS/XhL6XcNl19CeSwA/LpysWrwHyv1Y2asJvU3Dy6tyPQLbgosNw1FLEGDZEY7vwllA0Yq9AajYsKDC11TtlISVsuD74IXQLEPNBtdPAQYTxQtiQ54mysM4YuTG2uObcvUc0VszgHIzjHD95AwFdMlBq8UkbTsV0fb8bAIPG6IHDUnPgv+RAy8PwALqwBZgZ9hXC7gFmsB2+qm/7OAb/y9ptHSlOm8AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDIrMDI6MDDH7d3lAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQyKzAyOjAwtrBlWQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.telecom-lille.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://idptl.telecom-lille.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptl.telecom-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idptl.telecom-lille.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Télécom Lille</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Télécom Lille</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.telecom-lille.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Tovo Rakotonavalona</md:SurName>
-    <md:EmailAddress>tovo.rakotonavalona@telecom-lille.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Martine Sion</md:SurName>
-    <md:EmailAddress>martine.sion@telecom-lille.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 41e50988..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: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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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 0773a9b8..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpuniba.uniba.it/simplesaml/saml2/idp/metadata.php">
-  <md: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>
-  </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">uniba.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpuniba.uniba.it/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://idpuniba.uniba.it/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Bari Aldo Moro</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Bari Aldo Moro</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Bari Aldo Moro</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Bari Aldo Moro</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.uniba.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uniba.it/english-version</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:staff@uniba.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml
deleted file mode 100644
index 50fea100..00000000
--- a/swamid-interfederations-2.0/idpunict.unict.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpunict.unict.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-01-27T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unict.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Catania</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Catania</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for University of Catania users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Catania</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unict.it/content/descrizione-del-servizio-idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unict.it/content/descrizione-del-servizio-idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unict.it/content/descrizione-del-servizio-idem</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unict.it/content/descrizione-del-servizio-idem</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAN3muNVpnUKhVVYLS4LTiTLhtjaeMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcHVuaWN0LnVuaWN0Lml0MB4XDTEzMDYxMjA4Mzgx
-MFoXDTMzMDYxMjA4MzgxMFowHDEaMBgGA1UEAxMRaWRwdW5pY3QudW5pY3QuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRcO4zsz2CKoLSYLkq2aNx
-L/jolby6jN7FfDfNZ0W/tfMot029Hnz7Euj73+4+4i5XzuVwIFBEDA9VYGYbI0mr
-E0NhPWnE1AQa90Vr2P2mFql30I3Dcl7J6S8saLuhOzD74hKXI5IbS6FqziiQwyXj
-ieeySXDlbpuAX4Tcfw7onVam5MN9RKpROi9AVT37UPZLMKX7SEK3DJ7/4ERoQp3q
-f2FEQyoy/Q92ssUQgbQ96/7d91qw36wEu9Y8hSP8FRchVTCRHGnEv4IBhU+PnAPz
-w3k2ragDFtwACmgoWliOi0HpI0rSHkxX8jIboWuSHdUQNMEEi1cywPMvfNrEe5Cd
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcHVuaWN0LnVuaWN0Lml0hihodHRwczov
-L2lkcHVuaWN0LnVuaWN0Lml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQGpdyP
-so1uajvYMo3tDLyvhbL3kDANBgkqhkiG9w0BAQUFAAOCAQEAq4v0tIwHi/N5dGVt
-ew6eRGofDAdj6F8QEwQsMwBruYO3lnteVBFNTeZ5igR6PuHTzOnOIM7v98/9T0oS
-aoCED1LzHKCQaRu0WCpHGjOceJ5YtmCg9R8WCoBG5A2ND3vMllJvEGQTLLcTS7ve
-gI+pG7Fb79xuhASYkARXZ7nU5Xep2dc+a+rtSX5MTvRwczx7HdqxERQUDn7+qKWv
-V5i2qJtpsBkgwbQjpfjs5ReIMxl4QhEbnshqKNJVUf8IsTGGmYLuj2Sn/t29K6sC
-8rUp8lyUvZ8nyy/IRvMb+fFmx4/KUicxeUfqmbbwCZXdMtciGfSHVXLyhhs0xAAH
-/xmo2Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpunict.unict.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpunict.unict.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpunict.unict.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpunict.unict.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpunict.unict.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpunict.unict.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unict.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAN3muNVpnUKhVVYLS4LTiTLhtjaeMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcHVuaWN0LnVuaWN0Lml0MB4XDTEzMDYxMjA4Mzgx
-MFoXDTMzMDYxMjA4MzgxMFowHDEaMBgGA1UEAxMRaWRwdW5pY3QudW5pY3QuaXQw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRcO4zsz2CKoLSYLkq2aNx
-L/jolby6jN7FfDfNZ0W/tfMot029Hnz7Euj73+4+4i5XzuVwIFBEDA9VYGYbI0mr
-E0NhPWnE1AQa90Vr2P2mFql30I3Dcl7J6S8saLuhOzD74hKXI5IbS6FqziiQwyXj
-ieeySXDlbpuAX4Tcfw7onVam5MN9RKpROi9AVT37UPZLMKX7SEK3DJ7/4ERoQp3q
-f2FEQyoy/Q92ssUQgbQ96/7d91qw36wEu9Y8hSP8FRchVTCRHGnEv4IBhU+PnAPz
-w3k2ragDFtwACmgoWliOi0HpI0rSHkxX8jIboWuSHdUQNMEEi1cywPMvfNrEe5Cd
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcHVuaWN0LnVuaWN0Lml0hihodHRwczov
-L2lkcHVuaWN0LnVuaWN0Lml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQGpdyP
-so1uajvYMo3tDLyvhbL3kDANBgkqhkiG9w0BAQUFAAOCAQEAq4v0tIwHi/N5dGVt
-ew6eRGofDAdj6F8QEwQsMwBruYO3lnteVBFNTeZ5igR6PuHTzOnOIM7v98/9T0oS
-aoCED1LzHKCQaRu0WCpHGjOceJ5YtmCg9R8WCoBG5A2ND3vMllJvEGQTLLcTS7ve
-gI+pG7Fb79xuhASYkARXZ7nU5Xep2dc+a+rtSX5MTvRwczx7HdqxERQUDn7+qKWv
-V5i2qJtpsBkgwbQjpfjs5ReIMxl4QhEbnshqKNJVUf8IsTGGmYLuj2Sn/t29K6sC
-8rUp8lyUvZ8nyy/IRvMb+fFmx4/KUicxeUfqmbbwCZXdMtciGfSHVXLyhhs0xAAH
-/xmo2Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpunict.unict.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpunict.unict.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Catania</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unict.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unict.it/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:support-idem@unict.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml
deleted file mode 100644
index 53cc180b..00000000
--- a/swamid-interfederations-2.0/idpv3.essingtoncc.co.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idpv3.essingtoncc.co.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Essington Computer Consultancy Limited.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-06T12:07:22Z">
-      <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 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">essingtoncc.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIVANxdvblrHmOwk0K/rl10Sda/mMrFMA0GCSqGSIb3DQEB
-						CwUAMCIxIDAeBgNVBAMMF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrMB4XDTE1MTAx
-						NDE1NTYxNFoXDTM1MTAxNDE1NTYxNFowIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5n
-						dG9uY2MuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcprpG
-						G0NVw74J4JKdvg7fGAdrBVniHTIkljKuTl9h8JnseVsrTdBq+8QVH+g9eoF6HgYq
-						LgS3ejgk4lX6OmTS8welpfyvX6Rml3vU4fvFb8JPiSB6zzzlp6KmGrWBt0vNRrQ2
-						jG0TeByBHTX+4TXI9/hC+WCHv5urgC3m+i8KcLzGRhj+ULq66wzqlkiFgCTgCpfz
-						vV6cu4CFkTW+8TR8vjcjqU16f/jzafqJKOWYY4nzutoudmytSatAHym8Doosxv3d
-						ieCCGxb6O9FNHbbAY7ycB5Mm2jTmqlNU2iJsYBDqixXyIfOAscJ21RCxTjpZt9Ce
-						5UCicxpLDLvF5rr/AgMBAAGjdTBzMB0GA1UdDgQWBBT6YZEW8mN2VfFAMqscacoG
-						ui/n5DBSBgNVHREESzBJghdpZHB2My5lc3Npbmd0b25jYy5jby51a4YuaHR0cHM6
-						Ly9pZHB2My5lc3Npbmd0b25jYy5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEAOsSFIttIYMwgmXQD22mKCFobO4SMXYRn+1yjGc5nEP/Mz+8s
-						W23exjfS80yiLnn435T/Iq+UMd4zkITo45tiNO01G/FnN+cGpHl8RB/P2NgQcZRP
-						QID3rle+Ufzr7APC1+ACZzxVk2GtT9QuWf7JYRLUQCeQOfIptgntDeIhX4uOTfdt
-						dl0Kmt0J9yOXgBoxvFQsNT+RCKScdTO+frwyKKpjBlR7sOngO8R8JJ/YHSYzJOXc
-						DshYuafoNMzlhChAmEjZgwbU+bMtjQv6A0J49uebhyyIbd5k3UGtuafv1XQXERL+
-						LmiAYOW7xsIlMcU3oGuPig1k5E9I4mtPxgqfQw==
-					</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>
-						MIIDRzCCAi+gAwIBAgIUQ+2SQEeM841I+Pr+e1Rf1G2mWtYwDQYJKoZIhvcNAQEL
-						BQAwIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5ndG9uY2MuY28udWswHhcNMTUxMDE0
-						MTU1NjA5WhcNMzUxMDE0MTU1NjA5WjAiMSAwHgYDVQQDDBdpZHB2My5lc3Npbmd0
-						b25jYy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALQaBR9n
-						APsTg0QtFRtSAn/vnJ8EWRVpml3/4BdsrNtZslJ9WMX2wRiVCKqyVAUzVvB+fZW6
-						c0G4Om9OLcMHn9NqYOVNktxmApNj5yjAe1on1Jb9vpzzfz042brEQahSMH8dP2WK
-						BNl0zsEl6B+O5LGv9R6zWRpjcWpP/Hhdv1Mt2UCubk1j0YB0yigDCSJsKtlt4ADW
-						0zcI8e+yltSWf2m5PJ2lOVfsE9lGMw2K9HnCo4wto2cMboXgZwTUbPz/opcZ6PWr
-						zN6OgX0MteSUrjoMkzKsLUKv3cs0Xn/+JRNEAtyWQvm6/DH2Z+EV0rDSQVbXPEmw
-						G7n3UM8PrSm5HVkCAwEAAaN1MHMwHQYDVR0OBBYEFIRy38M9ievXUaGPVTs7o70A
-						nYPBMFIGA1UdEQRLMEmCF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrhi5odHRwczov
-						L2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-						DQEBCwUAA4IBAQCy6r+ejtGEvl96u4RndrDZLZ9OYtga+axs3/4YjQV0tRIKa8En
-						TJnPdRGhxp1hskOmPtmYZQ3dLH3feLjb+ux8L2QDRYa0q4ghNIiHD75DYwnme1bc
-						3VeO0rMIvOfjZnyQVfFTdVQmhcpYdeqrnZZOXBiuTXWVFvwChaCfEmHdUV93j7Gg
-						wuv77Rq2ZfASy8bfsYvCkkOlYV4lEAcZJLg+UgYzbdUf3lg9YUGsp0IdrFozQnL5
-						Sc5v7jqZOGcVPtR9xiewWBb5p9LjWLezZPYyM2nz6bJktSea75YDiJpFYIsGX1EA
-						gtlBzrAHoC/fd8GGCq5HZ0mQyNzrF70sEXN7
-					</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>
-						MIIDSDCCAjCgAwIBAgIVAPzpG2xrtqp1K0RSsJJUezfEZvB1MA0GCSqGSIb3DQEB
-						CwUAMCIxIDAeBgNVBAMMF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrMB4XDTE1MTAx
-						NDE1NTYxM1oXDTM1MTAxNDE1NTYxM1owIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5n
-						dG9uY2MuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj9KaC
-						pr5xfua5HRef7zqgmclBmTQMwduUp4KEO91NB+YGlmyyfgNm9K8xZ+72dHbLMqyJ
-						K9YqQTuJLHBi4mVH2fmqYUGhTnOfLMP1cvSGdQyhl3Yp6YpyHa0L4ZIx1YRhVP7m
-						+uh0o6XTL8KGZQf5E+O6tP5CEqyTRLPPqFJCZZyGk5g/P848zmS5y//SgWs9irSz
-						TKf1xsgiaCa1j4BKOuk/0cYwc5Vr8UJw3iQVQNyY22IkbXcwgqoAejXl1a50k1ca
-						Zdv1sJbfMMxNRaJvSgJQazE4rhluCNmmPrd5pFizMZD8Rdci1325eKs9WPR8Q2UE
-						3Q1BcAYk/UwrhU/HAgMBAAGjdTBzMB0GA1UdDgQWBBTpb8nD6p3duvAL1ovP5W1D
-						KtOVOTBSBgNVHREESzBJghdpZHB2My5lc3Npbmd0b25jYy5jby51a4YuaHR0cHM6
-						Ly9pZHB2My5lc3Npbmd0b25jYy5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEAdgEszQ9bhu0UXACuvCpFkIsc0+2IyhlqYYO2sNRPiM+YgLIA
-						1YrwPxlcmHomTf+VU7q+/s4ZNfYITbRcfNP4CFiiZR5AbkWDnMLQ281guKHLN6bq
-						5VVqsyS4YBF0nv0NFf6Jk/BuqGJJV2zmWxUKIKxRnyiWnIzEMIn4nIOFAx9M7Gse
-						/AzjpZWOIrHPQVtCWLpq8+5bzXP66/9iuzgYv517JUjZo+AfBFInuqUCHXgazl4N
-						q1Jv3WZ9N9b7LT17+KzD30WQMYlRRO++T+j7McCQB2I32ymF8xo8NkpUjKA43m+z
-						1oHqE+W7b2W2PL9JJ7zQEP5c4qax7abevAa5yw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpv3.essingtoncc.co.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://idpv3.essingtoncc.co.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.essingtoncc.co.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpv3.essingtoncc.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.essingtoncc.co.uk/idp/profile/SAML2/Redirect/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">essingtoncc.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIVANxdvblrHmOwk0K/rl10Sda/mMrFMA0GCSqGSIb3DQEB
-						CwUAMCIxIDAeBgNVBAMMF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrMB4XDTE1MTAx
-						NDE1NTYxNFoXDTM1MTAxNDE1NTYxNFowIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5n
-						dG9uY2MuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcprpG
-						G0NVw74J4JKdvg7fGAdrBVniHTIkljKuTl9h8JnseVsrTdBq+8QVH+g9eoF6HgYq
-						LgS3ejgk4lX6OmTS8welpfyvX6Rml3vU4fvFb8JPiSB6zzzlp6KmGrWBt0vNRrQ2
-						jG0TeByBHTX+4TXI9/hC+WCHv5urgC3m+i8KcLzGRhj+ULq66wzqlkiFgCTgCpfz
-						vV6cu4CFkTW+8TR8vjcjqU16f/jzafqJKOWYY4nzutoudmytSatAHym8Doosxv3d
-						ieCCGxb6O9FNHbbAY7ycB5Mm2jTmqlNU2iJsYBDqixXyIfOAscJ21RCxTjpZt9Ce
-						5UCicxpLDLvF5rr/AgMBAAGjdTBzMB0GA1UdDgQWBBT6YZEW8mN2VfFAMqscacoG
-						ui/n5DBSBgNVHREESzBJghdpZHB2My5lc3Npbmd0b25jYy5jby51a4YuaHR0cHM6
-						Ly9pZHB2My5lc3Npbmd0b25jYy5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEAOsSFIttIYMwgmXQD22mKCFobO4SMXYRn+1yjGc5nEP/Mz+8s
-						W23exjfS80yiLnn435T/Iq+UMd4zkITo45tiNO01G/FnN+cGpHl8RB/P2NgQcZRP
-						QID3rle+Ufzr7APC1+ACZzxVk2GtT9QuWf7JYRLUQCeQOfIptgntDeIhX4uOTfdt
-						dl0Kmt0J9yOXgBoxvFQsNT+RCKScdTO+frwyKKpjBlR7sOngO8R8JJ/YHSYzJOXc
-						DshYuafoNMzlhChAmEjZgwbU+bMtjQv6A0J49uebhyyIbd5k3UGtuafv1XQXERL+
-						LmiAYOW7xsIlMcU3oGuPig1k5E9I4mtPxgqfQw==
-					</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>
-						MIIDRzCCAi+gAwIBAgIUQ+2SQEeM841I+Pr+e1Rf1G2mWtYwDQYJKoZIhvcNAQEL
-						BQAwIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5ndG9uY2MuY28udWswHhcNMTUxMDE0
-						MTU1NjA5WhcNMzUxMDE0MTU1NjA5WjAiMSAwHgYDVQQDDBdpZHB2My5lc3Npbmd0
-						b25jYy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALQaBR9n
-						APsTg0QtFRtSAn/vnJ8EWRVpml3/4BdsrNtZslJ9WMX2wRiVCKqyVAUzVvB+fZW6
-						c0G4Om9OLcMHn9NqYOVNktxmApNj5yjAe1on1Jb9vpzzfz042brEQahSMH8dP2WK
-						BNl0zsEl6B+O5LGv9R6zWRpjcWpP/Hhdv1Mt2UCubk1j0YB0yigDCSJsKtlt4ADW
-						0zcI8e+yltSWf2m5PJ2lOVfsE9lGMw2K9HnCo4wto2cMboXgZwTUbPz/opcZ6PWr
-						zN6OgX0MteSUrjoMkzKsLUKv3cs0Xn/+JRNEAtyWQvm6/DH2Z+EV0rDSQVbXPEmw
-						G7n3UM8PrSm5HVkCAwEAAaN1MHMwHQYDVR0OBBYEFIRy38M9ievXUaGPVTs7o70A
-						nYPBMFIGA1UdEQRLMEmCF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrhi5odHRwczov
-						L2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-						DQEBCwUAA4IBAQCy6r+ejtGEvl96u4RndrDZLZ9OYtga+axs3/4YjQV0tRIKa8En
-						TJnPdRGhxp1hskOmPtmYZQ3dLH3feLjb+ux8L2QDRYa0q4ghNIiHD75DYwnme1bc
-						3VeO0rMIvOfjZnyQVfFTdVQmhcpYdeqrnZZOXBiuTXWVFvwChaCfEmHdUV93j7Gg
-						wuv77Rq2ZfASy8bfsYvCkkOlYV4lEAcZJLg+UgYzbdUf3lg9YUGsp0IdrFozQnL5
-						Sc5v7jqZOGcVPtR9xiewWBb5p9LjWLezZPYyM2nz6bJktSea75YDiJpFYIsGX1EA
-						gtlBzrAHoC/fd8GGCq5HZ0mQyNzrF70sEXN7
-					</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>
-						MIIDSDCCAjCgAwIBAgIVAPzpG2xrtqp1K0RSsJJUezfEZvB1MA0GCSqGSIb3DQEB
-						CwUAMCIxIDAeBgNVBAMMF2lkcHYzLmVzc2luZ3RvbmNjLmNvLnVrMB4XDTE1MTAx
-						NDE1NTYxM1oXDTM1MTAxNDE1NTYxM1owIjEgMB4GA1UEAwwXaWRwdjMuZXNzaW5n
-						dG9uY2MuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj9KaC
-						pr5xfua5HRef7zqgmclBmTQMwduUp4KEO91NB+YGlmyyfgNm9K8xZ+72dHbLMqyJ
-						K9YqQTuJLHBi4mVH2fmqYUGhTnOfLMP1cvSGdQyhl3Yp6YpyHa0L4ZIx1YRhVP7m
-						+uh0o6XTL8KGZQf5E+O6tP5CEqyTRLPPqFJCZZyGk5g/P848zmS5y//SgWs9irSz
-						TKf1xsgiaCa1j4BKOuk/0cYwc5Vr8UJw3iQVQNyY22IkbXcwgqoAejXl1a50k1ca
-						Zdv1sJbfMMxNRaJvSgJQazE4rhluCNmmPrd5pFizMZD8Rdci1325eKs9WPR8Q2UE
-						3Q1BcAYk/UwrhU/HAgMBAAGjdTBzMB0GA1UdDgQWBBTpb8nD6p3duvAL1ovP5W1D
-						KtOVOTBSBgNVHREESzBJghdpZHB2My5lc3Npbmd0b25jYy5jby51a4YuaHR0cHM6
-						Ly9pZHB2My5lc3Npbmd0b25jYy5jby51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEAdgEszQ9bhu0UXACuvCpFkIsc0+2IyhlqYYO2sNRPiM+YgLIA
-						1YrwPxlcmHomTf+VU7q+/s4ZNfYITbRcfNP4CFiiZR5AbkWDnMLQ281guKHLN6bq
-						5VVqsyS4YBF0nv0NFf6Jk/BuqGJJV2zmWxUKIKxRnyiWnIzEMIn4nIOFAx9M7Gse
-						/AzjpZWOIrHPQVtCWLpq8+5bzXP66/9iuzgYv517JUjZo+AfBFInuqUCHXgazl4N
-						q1Jv3WZ9N9b7LT17+KzD30WQMYlRRO++T+j7McCQB2I32ymF8xo8NkpUjKA43m+z
-						1oHqE+W7b2W2PL9JJ7zQEP5c4qax7abevAa5yw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpv3.essingtoncc.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Essington Computer Consultancy Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Essington Computer Consultancy Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.essingtoncc.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Morris</SurName>
-    <EmailAddress>mailto:andy@essingtoncc.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Morris</SurName>
-    <EmailAddress>mailto:andy@essingtoncc.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idpx.ua.ac.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idpx.ua.ac.be-idp-shibboleth.xml
deleted file mode 100644
index ca71b1ae..00000000
--- a/swamid-interfederations-2.0/idpx.ua.ac.be-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://idpx.ua.ac.be/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">ua.ac.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Universiteit Antwerpen</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of Antwerp is a young, dynamic and forward-thinking university. It integrates the assets of its historic roots with its ambition to contribute positively to society.</mdui:Description>
-        <mdui:Logo height="16" width="16">https://idpx.ua.ac.be/ua_small.png</mdui:Logo>
-        <mdui:Logo height="75" width="153">https://idpx.ua.ac.be/ua_big.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>143.169.0.0/16</mdui:IPHint>
-        <mdui:IPHint>143.129.0.0/16</mdui:IPHint>
-        <mdui:IPHint>146.175.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>idpx.ua.ac.be</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAN35bNDF/CV2nOx1eMcNH1z01yvsMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcHgudWEuYWMuYmUwHhcNMTMwMzIxMDgxNzMwWhcN
-MzMwMzIxMDgxNzMwWjAYMRYwFAYDVQQDEw1pZHB4LnVhLmFjLmJlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApyXIh2Np1E1Qki0uEcCUhHjmAPRCxhxg
-CWv6AQkR7jbs0o4PYTE9wXRtOze9811RyQtPgj9zUjEibD1CCv76XpBO/mN6y1No
-QtfS8Nbn4djWRgJWZfIHiXNs9ffL4BnbzpBDuUr/PHO8gBIwKfdpWklFjvnO9Vrs
-gS1qDHh7rJ+Zk0rRi3ZrRRGg0JdTSUYJx7EgVo9C9Ajwv1RpRWG8ZJAct90AxQ5+
-D4EeVuuouSOj5WsqUgA4htmjEYTiPNCF7k1RfZlzJVMFTawgo7jjMkjX23zUK56s
-+rc7EAlUhLtq8Pqj0+uJDQfxGDaTfVY0dIaHq/5IFDn7BRRUB9+dQQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHB4LnVhLmFjLmJlhiRodHRwczovL2lkcHgudWEuYWMu
-YmUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEeqIRV/QsxJ3bc7RrO2RABUu1Lf
-MA0GCSqGSIb3DQEBBQUAA4IBAQCVGsA3oBYrhjRaJiwlSNBrP+Peaq0823RWnGXc
-/jv17Sl99jbd3DyhIsuQ0zt2WpcG8kRt8L3DvNDeWnKu1xxFZ8Ntzqpz4oFAnMBq
-fMFfZf4s0xt8L+RrmeH6MM8q/eOcmGl1E/lmDA2eoqm5vvDAXhaCLfWuYHXfNpMj
-p5U39b+mNsQXGPTpuahnCbuctNW7Mc3chwFsbxjXPyinY4yxcBzqh1e97himRJaY
-5vK/rwetVB79srpcogHy2H1BBrZk+9w0Vwi+ygZehm5pPE+33TouniaRO/CRhAFh
-NpiD0CuosCt4MZj94vQ6z/XALYvkr3baOjCB3pek0xXnftOd
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpx.ua.ac.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpx.ua.ac.be: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://idpx.ua.ac.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpx.ua.ac.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idpx.ua.ac.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpx.ua.ac.be/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">ac.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAN35bNDF/CV2nOx1eMcNH1z01yvsMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcHgudWEuYWMuYmUwHhcNMTMwMzIxMDgxNzMwWhcN
-MzMwMzIxMDgxNzMwWjAYMRYwFAYDVQQDEw1pZHB4LnVhLmFjLmJlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApyXIh2Np1E1Qki0uEcCUhHjmAPRCxhxg
-CWv6AQkR7jbs0o4PYTE9wXRtOze9811RyQtPgj9zUjEibD1CCv76XpBO/mN6y1No
-QtfS8Nbn4djWRgJWZfIHiXNs9ffL4BnbzpBDuUr/PHO8gBIwKfdpWklFjvnO9Vrs
-gS1qDHh7rJ+Zk0rRi3ZrRRGg0JdTSUYJx7EgVo9C9Ajwv1RpRWG8ZJAct90AxQ5+
-D4EeVuuouSOj5WsqUgA4htmjEYTiPNCF7k1RfZlzJVMFTawgo7jjMkjX23zUK56s
-+rc7EAlUhLtq8Pqj0+uJDQfxGDaTfVY0dIaHq/5IFDn7BRRUB9+dQQIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHB4LnVhLmFjLmJlhiRodHRwczovL2lkcHgudWEuYWMu
-YmUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEeqIRV/QsxJ3bc7RrO2RABUu1Lf
-MA0GCSqGSIb3DQEBBQUAA4IBAQCVGsA3oBYrhjRaJiwlSNBrP+Peaq0823RWnGXc
-/jv17Sl99jbd3DyhIsuQ0zt2WpcG8kRt8L3DvNDeWnKu1xxFZ8Ntzqpz4oFAnMBq
-fMFfZf4s0xt8L+RrmeH6MM8q/eOcmGl1E/lmDA2eoqm5vvDAXhaCLfWuYHXfNpMj
-p5U39b+mNsQXGPTpuahnCbuctNW7Mc3chwFsbxjXPyinY4yxcBzqh1e97himRJaY
-5vK/rwetVB79srpcogHy2H1BBrZk+9w0Vwi+ygZehm5pPE+33TouniaRO/CRhAFh
-NpiD0CuosCt4MZj94vQ6z/XALYvkr3baOjCB3pek0xXnftOd
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpx.ua.ac.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpx.ua.ac.be: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">Universiteit Antwerpen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universiteit Antwerpen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uantwerpen.be/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Vincent</md:GivenName>
-    <md:SurName>Feyaerts</md:SurName>
-    <md:EmailAddress>vincent.feyaerts@uantwerpen.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.xml
deleted file mode 100644
index 5848fe0f..00000000
--- a/swamid-interfederations-2.0/idservice.zuyd.nl-nidp-saml2-metadata.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://idservice.zuyd.nl/nidp/saml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-03T14:07:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Zuyd Hogeschool</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Zuyd University</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Zuyd Hogeschool</mdui:Description>
-        <mdui:Description xml:lang="en">Zuyd University</mdui:Description>
-        <mdui:Logo height="48" width="45">https://static.surfconext.nl/logos/idp/hszuyd.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Zuyd University Hogeschool HBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Zuyd University Hogeschool HBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/9b25cfa7cbe15117b1eca6b7f04fcf5d"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Zuyd Hogeschool</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Zuyd University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Zuyd Hogeschool</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Zuyd University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.zuyd.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.zuyd.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/ieeexplore.ieee.org-shibboleth-sp.xml b/swamid-interfederations-2.0/ieeexplore.ieee.org-shibboleth-sp.xml
deleted file mode 100644
index 532da8d0..00000000
--- a/swamid-interfederations-2.0/ieeexplore.ieee.org-shibboleth-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ieeexplore.ieee.org/shibboleth-sp">
-  <!--
-		This is a RightAccess 4.5.2.1 XploreDigital Library SP for The Institute of Electrical And Electronics Engineers, Incorporated.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIICuDCCAaCgAwIBAgIEUdwYxzANBgkqhkiG9w0BAQUFADAeMRwwGgYDVQQDExNpZWVleHBsb3Jl
-						LmllZWUub3JnMB4XDTEzMDcwOTE0MDU1OVoXDTE2MDcwODE0MDU1OVowHjEcMBoGA1UEAxMTaWVl
-						ZXhwbG9yZS5pZWVlLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOA75zEbFib1
-						oKwcgYsUgZh/RGIYQKeVLG96sghJd0VvxeMKq0hgF7/jWjXPUqcHCTjNg50joOH4nAjlvRZ81Iw0
-						cKyMmnaucv8scBnBfUwQjfkVOyUW3IxizoH66RLVXJvq8knRbB+d25kLDcA0Wsby/RIMGkF5TJK5
-						Py6GBXF5VqH+E41ZvJNagkd2LiOc+oW9m/1df8MhcS02m1foWeJeax8GA4lyeGGTXCk3G3KO1PCz
-						wc3UZqsaM3l2golNWx3eRqWKVjEj59+IkChkHm7MHnerKoWq+1EG/VbNnkTNn1AzRmqtcmMuSte6
-						6aEyGsZ6UTPjOKNIDnBnKT1PRmUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAD1f85Q5nzBzUOUIl
-						nftTsixhHhQOm6KNUxP6O2VGfbnkjikn972e3ypMtBxkloQTOyEti/qWw3tIvnadgKpQazkDGSMh
-						1RR6yJc2MWkuaah4rMET34XshUg7oQBRFThYrtX9g0yU3Sbriy2mRayz5+C51XF5U/lUKvepeBAQ
-						8T/5jnXGN2Acfi2r/QYSK8uPnnzuwPYlhTicyN2khwhBjokYXy/HEW1OjFe2VPmcKROPEwMkeNHD
-						ite5CXfTutjiX6Wlmy2iiCp09SzEy2Zfan4iMf8hgdD/8994EkEQSYluvKKl+tc0BwdpKxxuoNke
-						xhXvRxt/N3hR1GDsAZjQow==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML/POST" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Institute of Electrical And Electronics Engineers, Incorporated</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IEEE XploreDigital Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ieee.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Don</GivenName>
-    <SurName>Caldwell</SurName>
-    <EmailAddress>mailto:d.caldwell@ieee.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mehul</GivenName>
-    <SurName>Trivedi</SurName>
-    <EmailAddress>mailto:mh.trivedi@ieee.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ieeexplore.ieee.org.xml b/swamid-interfederations-2.0/ieeexplore.ieee.org.xml
deleted file mode 100644
index b39c7c6d..00000000
--- a/swamid-interfederations-2.0/ieeexplore.ieee.org.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ieeexplore.ieee.org/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.ieeexplore.ieee.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.ieeexplore.ieee.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIICzjCCAbagAwIBAgIETGv6kTANBgkqhkiG9w0BAQUFADApMScwJQYDVQQDEx5z
-aGliYm9sZXRoLmllZWV4cGxvcmUuaWVlZS5vcmcwHhcNMTAwODE4MTUyMTUzWhcN
-MTMwODE3MTUyMTUzWjApMScwJQYDVQQDEx5zaGliYm9sZXRoLmllZWV4cGxvcmUu
-aWVlZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEZrWYL9uv
-82FE1/gdMiMAddL0u5QamV7JFESacdtR0djeNMeQp39ImWRWN+Asi35T2LQ6qNnV
-0qC8ITjl6LsxTKwhQdn00vpZI+QY6UCMyi6v/AzaU3pJ5SeKwEJUONAk/99n1eqq
-Ohqu+Xgu3a+gvEIKs7k9wDYdPdIqgx7X5d4HnOs5qMqX/o3ocHOL6wHxabETu6ud
-Drr0MBlLDJ3plqbTm/Kh0aWLg9OdRTMjCs4OhjjTe6VYCIZalDUQaHrQbYHANpBe
-YKk6oOf1sG9o+UGnGPzPYejjgpqgEKfQJqaZD+79Vbx3d8bgaLNQyiEGplnlBJeF
-/eHxmsIkTqHhAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAEaT5SZ8+5dBiaC5bwHW
-qZCySknJOJuZLGfwz7CvHI+WoVzoncsbbv5XFDFxBzWncqZSynpvRcpeFYJ3HFa9
-xXdlL3i1BGC5ujOMF9+adI8QBxQdeKHZ3crUt0GluwxWrzs5o7DlkQyo/Au+VP1r
-noXgNNEyZuEWOUYPa2k2wOHt68EVkjdNHD4SGZwioWZ7RQGgCKF/fH6Q1iSAjGbK
-FOFPwx2bdRXfj+vpOPg+EkAJuPArNxQU+b5T9Utxn4QGmsgcgfwwaJJghKs8vXXY
-a0cuv2eotR3FGr2Dlp2GuqI9GPF2ux/KHpTscEDCK+qidpOrFsW7PIE+ct3mDa76
-BIY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ieeexplore.ieee.org/Shibboleth/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">IEEE</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">IEEEXplore SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://ieeexplore.ieee.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Bruno</SurName>
-    <EmailAddress>tbruno@atypon.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ifg-srv-cafe.ifg.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/ifg-srv-cafe.ifg.edu.br-idp-shibboleth.xml
deleted file mode 100644
index a01e495e..00000000
--- a/swamid-interfederations-2.0/ifg-srv-cafe.ifg.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +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://ifg-srv-cafe.ifg.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDvDCCAqQCAQAwDQYJKoZIhvcNAQEFBQAwgaMxIzAhBgNVBAoTGkluc3RpdHV0
-byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNEVEkxHTAbBgkqhkiG9w0BCQEW
-DmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lh
-czELMAkGA1UEBhMCQlIxIDAeBgNVBAMTF2lmZy1zcnYtY2FmZS5pZmcuZWR1LmJy
-MB4XDTE1MDUyMTEzMzAzM1oXDTE4MDUyMDEzMzAzM1owgaMxIzAhBgNVBAoTGklu
-c3RpdHV0byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNEVEkxHTAbBgkqhkiG
-9w0BCQEWDmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQI
-EwVHb2lhczELMAkGA1UEBhMCQlIxIDAeBgNVBAMTF2lmZy1zcnYtY2FmZS5pZmcu
-ZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyCymZfUeAa/S
-SEbbSYRCgcdQoJPPlkgiAc/lXZeTIYhO3qDppq4fL8dXQgyg35iGR8TXUd4LdGkv
-VCmcpx5GS8tiJIYLZCLBcGBieA1fIVyyuwl3sV44/Ye/TP/y6zZEKw9UQTawgw1K
-FezVTW+qwBtHCQDqkMxDbX5eW97Gft7oPo6TgT9E3hCBaA8fpnEXYHoSOYQ1STeb
-jvdAU649hKF6bOBhLVMfAJ7qBwbjm4J5Zl1c1RX1uKWurhepDG94u7zS05orNPVL
-h3xljF16iVsPRj23emEmTS7cwjk4tiZg46SByMC1Iol1yHHlBJoNjgDejMjpeaKz
-p2Q7zOroZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAB0lp4DGQswNz/ooH8V2W+
-4RYUc3ATZHGxAOPuPRWdSEnOIINDMAKJQgwxlrjm/yotHd61ooPMAosHh/JK5OJc
-2Kmasd3PPDwzmayM/+1ZZbrJsPiBu1KrpXaPfeij9jXZMrNjWXF3VRORXYwxHS4W
-YTHjkyT7rPewJERdNu18ClDr3Srbeo2wOpw8xoct3hWA80CuXdAqEaEi5XzR9AiG
-qZHDzBemsNLwR7IBmZngXvnrysVf9nUIXTOct1KgJhqpBAQ+ySB0sGpGUjMow7S1
-nivla3ZHx3NkSg0K+ctKO7/L6VXK5w42gzTzOt/+Q1w05HVTY48caTgiXY3Dg6mP
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifg-srv-cafe.ifg.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifg-srv-cafe.ifg.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://ifg-srv-cafe.ifg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ifg-srv-cafe.ifg.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ifg-srv-cafe.ifg.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ifg-srv-cafe.ifg.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDvDCCAqQCAQAwDQYJKoZIhvcNAQEFBQAwgaMxIzAhBgNVBAoTGkluc3RpdHV0
-byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNEVEkxHTAbBgkqhkiG9w0BCQEW
-DmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQIEwVHb2lh
-czELMAkGA1UEBhMCQlIxIDAeBgNVBAMTF2lmZy1zcnYtY2FmZS5pZmcuZWR1LmJy
-MB4XDTE1MDUyMTEzMzAzM1oXDTE4MDUyMDEzMzAzM1owgaMxIzAhBgNVBAoTGklu
-c3RpdHV0byBGZWRlcmFsIGRlIEdvaWFzMQwwCgYDVQQLEwNEVEkxHTAbBgkqhkiG
-9w0BCQEWDmR0aUBpZmcuZWR1LmJyMRAwDgYDVQQHEwdHb2lhbmlhMQ4wDAYDVQQI
-EwVHb2lhczELMAkGA1UEBhMCQlIxIDAeBgNVBAMTF2lmZy1zcnYtY2FmZS5pZmcu
-ZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyCymZfUeAa/S
-SEbbSYRCgcdQoJPPlkgiAc/lXZeTIYhO3qDppq4fL8dXQgyg35iGR8TXUd4LdGkv
-VCmcpx5GS8tiJIYLZCLBcGBieA1fIVyyuwl3sV44/Ye/TP/y6zZEKw9UQTawgw1K
-FezVTW+qwBtHCQDqkMxDbX5eW97Gft7oPo6TgT9E3hCBaA8fpnEXYHoSOYQ1STeb
-jvdAU649hKF6bOBhLVMfAJ7qBwbjm4J5Zl1c1RX1uKWurhepDG94u7zS05orNPVL
-h3xljF16iVsPRj23emEmTS7cwjk4tiZg46SByMC1Iol1yHHlBJoNjgDejMjpeaKz
-p2Q7zOroZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAB0lp4DGQswNz/ooH8V2W+
-4RYUc3ATZHGxAOPuPRWdSEnOIINDMAKJQgwxlrjm/yotHd61ooPMAosHh/JK5OJc
-2Kmasd3PPDwzmayM/+1ZZbrJsPiBu1KrpXaPfeij9jXZMrNjWXF3VRORXYwxHS4W
-YTHjkyT7rPewJERdNu18ClDr3Srbeo2wOpw8xoct3hWA80CuXdAqEaEi5XzR9AiG
-qZHDzBemsNLwR7IBmZngXvnrysVf9nUIXTOct1KgJhqpBAQ+ySB0sGpGUjMow7S1
-nivla3ZHx3NkSg0K+ctKO7/L6VXK5w42gzTzOt/+Q1w05HVTY48caTgiXY3Dg6mP
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifg-srv-cafe.ifg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifg-srv-cafe.ifg.edu.br:8443/idp/profile/SAML1/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">IFG - Instituto Federal de Goias</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFG - Instituto Federal de Goias</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFG - Instituto Federal de Goias</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFG - Instituto Federal de Goias</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifg.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifg.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Roberval Lustosa de Aguiar Filho</md:SurName>
-    <md:EmailAddress>roberval.filho@ifg.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 3736eaa8..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ifs00sv056.ifsul.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ifs00sv056.ifsul.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ifs00sv056.ifsul.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ifs00sv056.ifsul.edu.br:8443/idp/profile/SAML1/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">IFSul - Instituto Federal Sul-rio-grandense</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFSul - Instituto Federal Sul-rio-grandense</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFSul - Instituto Federal Sul-rio-grandense</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifsul.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifsul.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Maicon Anca dos Santos</md:SurName>
-    <md:EmailAddress>dtic@ifsul.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index fc67778e..00000000
--- a/swamid-interfederations-2.0/iif.iucc.ac.il-idp-module.php-saml-sp-metadata.php-default-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://iif.iucc.ac.il/idp/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://iif.iucc.ac.il" registrationInstant="2014-11-20T10:35:34Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://iif.iucc.ac.il/wordpress/wp-content/uploads/2014/06/IIF-Policy.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">Inter University Computation Center</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>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</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>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iif.iucc.ac.il/idp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://iif.iucc.ac.il/idp/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://iif.iucc.ac.il/idp/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://iif.iucc.ac.il/idp/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://iif.iucc.ac.il/idp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">IUCC</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Inter University Computational Center</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" 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" FriendlyName="mail" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="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" FriendlyName="eduPersonPrincipalName" 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" FriendlyName="displayName" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IUCC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IUCC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iucc.ac.il</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>support@iif.iucc.ac.il</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>info@iif.iucc.ac.il</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml
deleted file mode 100644
index d0559a55..00000000
--- a/swamid-interfederations-2.0/iif.iucc.ac.il-idp-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://iif.iucc.ac.il/idp/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://iif.iucc.ac.il" registrationInstant="2008-01-17T11:28:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://iif.iucc.ac.il/wordpress/wp-content/uploads/2014/06/IIF-Policy.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">Inter University Computation Center</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>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</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>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iif.iucc.ac.il/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://iif.iucc.ac.il/idp/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IUCC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IUCC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iucc.ac.il</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>support@iif.iucc.ac.il</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iif.iucc.ac.il-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/iif.iucc.ac.il-sp-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index eb560dcd..00000000
--- a/swamid-interfederations-2.0/iif.iucc.ac.il-sp-module.php-saml-sp-metadata.php-default-sp.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://iif.iucc.ac.il/sp/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://iif.iucc.ac.il" registrationInstant="2014-11-20T10:35:34Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://iif.iucc.ac.il/wordpress/wp-content/uploads/2014/06/IIF-Policy.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>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</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>MIIDxzCCAq+gAwIBAgIJALplhlT1F6hoMA0GCSqGSIb3DQEBCwUAMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDAeFw0xNDExMTYwNzU4NDJaFw0yNDExMTUwNzU4NDJaMHoxCzAJBgNVBAYTAklMMREwDwYDVQQHDAhUZWwtQXZpdjENMAsGA1UECgwESVVDQzEMMAoGA1UECwwDSUlGMRcwFQYDVQQDDA5paWYuaXVjYy5hYy5pbDEiMCAGCSqGSIb3DQEJARYTaW5mb0BpaWYuaXVjYy5hYy5pbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqKMytlFVF9tvp5lmHpQI12K7E9hueyqe8IpN8C+H4A7WC772FeO7DX3vLq8cCHzLVJ4BIyYZaTlaJcFsTllP4pZZ5Xxd91JBDCllXSaisBCyDnqW+LpCDk4IvTkOhisPbznTeIneT/AVONtePErG1HiN+6t0EjZfMKm8hwMvSnFB+YW4u0tCorLV6g8wy0RMquzSvaoy7Ta0ONoKHZURB0C1CWxC66hOWI3WOUMX3LtVVUPzCyKfYUEDSAjIGGJrjBQIUF2fJRJb8JNYRjw67iEU/bu9wvs/CX1e0Du/O0iggEy6/UeBNLWf8AuvKFSeJ9rBitIK1iEagpw6f43FsCAwEAAaNQME4wHQYDVR0OBBYEFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MB8GA1UdIwQYMBaAFFiJ9KSjksf4YVNCWAdbVY6Vrlc0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAJVZpHn5xgbRbvALb16j4S2uh3vU0Z4XAxXjQAXr+IkkCP85sGRpQZ0zATIakdVc/h20LRpNEfTR3lpI0o/LqDmSX6WyXJz7M2UDV/L1k90nCnS9WgMPUWD8nW6L52PXra0iSNZ0oIL5uGJXuWFc+C5JEFjShWNPYYU/S64Jaqo6fkaHFmRt6ho7CD82utf8sSVUegrxeqJHcXRUgWA5hvRROWqf8Pk5N/NWRXYoCAR/F0dnxxq6yxLJDQqAy0a/aNM0Kx0tEAKBlf0D025cHl0MOqGIabvxwdb2dSL7ZTcfsqrOHP+CErTqzkbmBSswXLgMPXazjzYqqPTbo8Wkq1M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iif.iucc.ac.il/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://iif.iucc.ac.il/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://iif.iucc.ac.il/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://iif.iucc.ac.il/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://iif.iucc.ac.il/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Inter University Computational Center</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Inter University Computational Center</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iucc.ac.il</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>support@iif.iucc.ac.il</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>info@iif.iucc.ac.il</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.xml
deleted file mode 100644
index 762af551..00000000
--- a/swamid-interfederations-2.0/ilearn.totton.ac.uk-shibboleth.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://ilearn.totton.ac.uk/shibboleth">
-  <!--
-		This is a "Totton College VLE" Shibboleth SP for Totton College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-01T17:28: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://ilearn.totton.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJAKZfsG5cBfubMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3NoaWJzcC50b3R0b24uYWMudWswHhcNMTQwNjI0MTIyODU1WhcNMjQwNjIx
-						MTIyODU1WjAeMRwwGgYDVQQDExNzaGlic3AudG90dG9uLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4r2sMGbQOo1P+H+R+IRVJtyP81kg4jv2
-						4md08AELOr0UFsgzwQ0Ejod5MY70oz1XLiujGfvQ+1yk/OQ/Rz+o5Ar2/VmpWOS3
-						a/P05oZRH18yfqpCGxXTtvvN2aVbMnYwZcolRY0aSGqcqrhVLulIk9HTf8kqmOXk
-						4JSw8kabjRd5odtmv8Szo+eZWloqicmfRV/JBOPXdqOwSSuDxDC4ZjqkYNLJiWMh
-						zZClrfLIk0W0Rm/FEw9RmB8+7WjjsoYxzqYxn+77IepTz0lkmbpBmB5wv7Fp3RLz
-						Pows0/Wo0DEjS7kGy5pujzUfsoiNA6ejhQKqByn68s1vXIREkoejZwIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNzaGlic3AudG90dG9uLmFjLnVrMB0GA1UdDgQWBBTgyST3
-						tKkSHSntzkqR9Iign/WxOTANBgkqhkiG9w0BAQUFAAOCAQEAIoqUB14Nq9Hdw0pp
-						FK2l+iYeUaubP2+Bnm2EOSrwjPYZeHaM6bjyq2IRwLQwaO4i67udbYRx6uraZyDG
-						ulR+N9+l5as0z75gzpqjUkHxVEt+8iZzAkRhjfBOe0n88scgxi1do4N7EDeM+umZ
-						clbVLUcDZ6+cEaHyWYIm4ejvZ/Mc51gUoNxVwSBEz7uTkmzXTy3tg2E0HT+LGffK
-						SOPe3ZVNxH82t0GT9eVPwABja8T2aWcFkZufeD9skb4vu+7QsfSlGFfS95q/Pa3m
-						EulAkrbXTYFy8Xg91X4za6NQ7jydmP3aaPyE0GqqMcbHLq/Gm+qsjG/dHsviHPjQ
-						v2u+Ew==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ilearn.totton.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Totton College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Totton College VLE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.totton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Dawson</SurName>
-    <EmailAddress>mailto:mdawson@totton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Dawson</SurName>
-    <EmailAddress>mailto:mdawson@totton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/imodarugula.imodules.com-sp.xml b/swamid-interfederations-2.0/imodarugula.imodules.com-sp.xml
deleted file mode 100644
index 58fcec77..00000000
--- a/swamid-interfederations-2.0/imodarugula.imodules.com-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="http://imodarugula.imodules.com/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">iModules Preload: Arugula</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDBDCCAeygAwIBAgIQzEDukSw9R5BHpxVmr1UwFjANBgkqhkiG9w0BAQQFADAX
-MRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wHhcNMTQwNjEwMjExODU3WhcNMzQwNjEw
-MjExODU2WjAXMRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDC5hlDfEQ7RoqQgtcZjOxN2FdUOMu4MI8hIeydiFDy
-1fT1t1jJHmFF5V4JDGpITIapK2caenljBcGl7CGC+Z6EXID8i0lxc7lLWOOrYkJb
-8PeuVOpbxTZfOxfkC3jf4IfLZPtBfDvWjYtVUPwDCpwLLE/GQzz6HySoMIcWAkQ9
-bPoAIITTRnDpo1f4J6nO81DKx0XjBVIbz6aTsF60pcXQzLJ69KGI5Jkh3DjmNbeq
-EXH6ENtq823q4JGXRrKvCPrTlt+79EI1p+ECSaRUx006raAYHktUTT2KY1oUlsuk
-qVA+LMmhX/+jF1fgOehHEurOiKQp2aGmeV4PnJ8pXKM9AgMBAAGjTDBKMEgGA1Ud
-AQRBMD+AEG94Y5yfOU4e+OzhpzVt1UyhGTAXMRUwEwYDVQQDEwxpbW9kdWxlcy5j
-b22CEMxA7pEsPUeQR6cVZq9VMBYwDQYJKoZIhvcNAQEEBQADggEBAFDDvIjK8eJO
-YjDqnY9DfzUEN6Vp80w3ZLhT/K49/McNbbGkt0bgg45MeJ78IxLdclTIhOEeHACN
-F71+XLb9PjRfISiB37V157w0nKF5MsMYU1dathFrVOzCIxvhERgoD4lMNtwZiKKH
-J/xYeczpnHz5iFpoiCvsvPTP5sZqAKvf5ovpermVcLyqEPJJHvLHe+TbwdwTuGMS
-pF2w1WQGpSgdbcxWWwmwpbeiF5ADI6UTS5txOfG0p8L2RTxgRJ6Nb7lNrelIEcup
-6nWHUla/60ENe+AN9qsqYh1vnknLi7kSMHwvtyzFQDHnXhwhLa9mkpsZVkeLEGsR
-MJlfQnuceWY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://imodarugula.imodules.com/controls/login/AssertionConsumerService.aspx" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josh Wicoff</md:GivenName>
-    <md:EmailAddress>jwicoff@imodules.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/imodrhubarb.imodules.com-sp.xml b/swamid-interfederations-2.0/imodrhubarb.imodules.com-sp.xml
deleted file mode 100644
index ae583198..00000000
--- a/swamid-interfederations-2.0/imodrhubarb.imodules.com-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="http://imodrhubarb.imodules.com/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">iModules Preload: rhubarb</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDBDCCAeygAwIBAgIQzEDukSw9R5BHpxVmr1UwFjANBgkqhkiG9w0BAQQFADAX
-MRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wHhcNMTQwNjEwMjExODU3WhcNMzQwNjEw
-MjExODU2WjAXMRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDC5hlDfEQ7RoqQgtcZjOxN2FdUOMu4MI8hIeydiFDy
-1fT1t1jJHmFF5V4JDGpITIapK2caenljBcGl7CGC+Z6EXID8i0lxc7lLWOOrYkJb
-8PeuVOpbxTZfOxfkC3jf4IfLZPtBfDvWjYtVUPwDCpwLLE/GQzz6HySoMIcWAkQ9
-bPoAIITTRnDpo1f4J6nO81DKx0XjBVIbz6aTsF60pcXQzLJ69KGI5Jkh3DjmNbeq
-EXH6ENtq823q4JGXRrKvCPrTlt+79EI1p+ECSaRUx006raAYHktUTT2KY1oUlsuk
-qVA+LMmhX/+jF1fgOehHEurOiKQp2aGmeV4PnJ8pXKM9AgMBAAGjTDBKMEgGA1Ud
-AQRBMD+AEG94Y5yfOU4e+OzhpzVt1UyhGTAXMRUwEwYDVQQDEwxpbW9kdWxlcy5j
-b22CEMxA7pEsPUeQR6cVZq9VMBYwDQYJKoZIhvcNAQEEBQADggEBAFDDvIjK8eJO
-YjDqnY9DfzUEN6Vp80w3ZLhT/K49/McNbbGkt0bgg45MeJ78IxLdclTIhOEeHACN
-F71+XLb9PjRfISiB37V157w0nKF5MsMYU1dathFrVOzCIxvhERgoD4lMNtwZiKKH
-J/xYeczpnHz5iFpoiCvsvPTP5sZqAKvf5ovpermVcLyqEPJJHvLHe+TbwdwTuGMS
-pF2w1WQGpSgdbcxWWwmwpbeiF5ADI6UTS5txOfG0p8L2RTxgRJ6Nb7lNrelIEcup
-6nWHUla/60ENe+AN9qsqYh1vnknLi7kSMHwvtyzFQDHnXhwhLa9mkpsZVkeLEGsR
-MJlfQnuceWY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure4.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1232&amp;gid=1" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure4.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1232&amp;gid=2" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure4.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1232&amp;gid=3" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josh Wicoff</md:GivenName>
-    <md:EmailAddress>jwicoff@imodules.com</md:EmailAddress>
-  </md:ContactPerson>
-</md: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/imperial.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index 06ebb4c1..00000000
--- a/swamid-interfederations-2.0/imperial.sisoshibboleth.co.uk-entity.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://imperial.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Imperial Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2015-09-23T10:28:47Z">
-      <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://imperial.siso.co/sso/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://imperial.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Imperial Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Imperial Online Resource Booking</mdui:Description>
-        <mdui:Logo height="64" width="64">https://shibboleth.siso.co/siso-logo64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://imperial.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://imperial.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Imperial Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/in-one-ear.oucs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index f407ab0e..00000000
--- a/swamid-interfederations-2.0/in-one-ear.oucs.ox.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://in-one-ear.oucs.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJANo1yZ5Bvvm3MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51azAeFw0xMDA5MDMxMTI0NTlaFw0y
-						MDA4MzExMTI0NTlaMCMxITAfBgNVBAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOin6mg0I1WsGLAzgMac
-						htBUaH8QKtmnHgZfkrOmMl8bDBR40PnKcHNdP9szrUn2O5yk68JNbbgvGPT3+RFo
-						Y8Dy27MUIG/xuP1fDUUpvmOJkKq6GLs00tTWVeHgk3cMP6kwUF0C7isz6g/qF9l5
-						OkfUiOudCS3iw1SLKyAR+eR/ezVEvpgB3T1VSY6Smrl/0QR+aSXtXTKSJYmpk6q/
-						MoxVnKSzuo/B74GPhQnQeEx4fA2mUOsgwjMx6xh91Dr1jLZr8M22d+NYMp8LxnfV
-						slfUB75xPHxuk2JOVdDeBUPjM4DFt6SH6Mmw0g11z9tuhd7/bfLks1j5wjwQ37hM
-						gJcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYaW4tb25lLWVhci5vdWNzLm94LmFjLnVr
-						MB0GA1UdDgQWBBSw/IthEiVYSu2UxqhN5IB8p5dceDANBgkqhkiG9w0BAQUFAAOC
-						AQEA48hDABp6eyTjqkvKroQCAQ+UEc5mHweQN1sLLoZijgRm8SZ14qJGa7KS8Rxm
-						QMPaUC6n/WN7IOPju1p7RxH1MWnLiPo4Um8LUeIBhl6PQV+4MshBCfhyD7iFdVXm
-						3jOhIhjv1R1wOhgUOrhK0iljF0CWZy8moceNSeHIOSOqx1UYTMCy42lwE7vYRWJJ
-						PDdzNqfTI/HcsTQjSS2oktg9NL4Rqv9i5GDeX8zlm8vY1HBdO8Fl7wpJi3cu83US
-						YW2Gm7mZZRExf4FI4TtiBtXKr3C64ZAWCIcF0Gjp0ckOM6zoU/KWlhRN43wFHmpz
-						RWKs9nPy5aZ19wn+/+Qpx//xnA==
-					</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>
-						MIIDDzCCAfegAwIBAgIJANo1yZ5Bvvm3MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51azAeFw0xMDA5MDMxMTI0NTlaFw0y
-						MDA4MzExMTI0NTlaMCMxITAfBgNVBAMTGGluLW9uZS1lYXIub3Vjcy5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOin6mg0I1WsGLAzgMac
-						htBUaH8QKtmnHgZfkrOmMl8bDBR40PnKcHNdP9szrUn2O5yk68JNbbgvGPT3+RFo
-						Y8Dy27MUIG/xuP1fDUUpvmOJkKq6GLs00tTWVeHgk3cMP6kwUF0C7isz6g/qF9l5
-						OkfUiOudCS3iw1SLKyAR+eR/ezVEvpgB3T1VSY6Smrl/0QR+aSXtXTKSJYmpk6q/
-						MoxVnKSzuo/B74GPhQnQeEx4fA2mUOsgwjMx6xh91Dr1jLZr8M22d+NYMp8LxnfV
-						slfUB75xPHxuk2JOVdDeBUPjM4DFt6SH6Mmw0g11z9tuhd7/bfLks1j5wjwQ37hM
-						gJcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYaW4tb25lLWVhci5vdWNzLm94LmFjLnVr
-						MB0GA1UdDgQWBBSw/IthEiVYSu2UxqhN5IB8p5dceDANBgkqhkiG9w0BAQUFAAOC
-						AQEA48hDABp6eyTjqkvKroQCAQ+UEc5mHweQN1sLLoZijgRm8SZ14qJGa7KS8Rxm
-						QMPaUC6n/WN7IOPju1p7RxH1MWnLiPo4Um8LUeIBhl6PQV+4MshBCfhyD7iFdVXm
-						3jOhIhjv1R1wOhgUOrhK0iljF0CWZy8moceNSeHIOSOqx1UYTMCy42lwE7vYRWJJ
-						PDdzNqfTI/HcsTQjSS2oktg9NL4Rqv9i5GDeX8zlm8vY1HBdO8Fl7wpJi3cu83US
-						YW2Gm7mZZRExf4FI4TtiBtXKr3C64ZAWCIcF0Gjp0ckOM6zoU/KWlhRN43wFHmpz
-						RWKs9nPy5aZ19wn+/+Qpx//xnA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://in-one-ear.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Trying out Windows</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nigel</GivenName>
-    <SurName>Brown</SurName>
-    <EmailAddress>mailto:nigel.brown@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nigel</GivenName>
-    <SurName>Brown</SurName>
-    <EmailAddress>mailto:nigel.brown@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/incommon.sunycnse.com-idp-shibboleth.xml b/swamid-interfederations-2.0/incommon.sunycnse.com-idp-shibboleth.xml
deleted file mode 100644
index a4a02fc5..00000000
--- a/swamid-interfederations-2.0/incommon.sunycnse.com-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://incommon.sunycnse.com/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">sunycnse.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SUNY Polytechnic Institute</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>
-MIIDUzCCAjugAwIBAgIUNlPRT/wyMz9vjHRYl0MkLeoK0zwwDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAwwaaW5jb21tb24udW5pdi5zdW55Y25zZS5jb20wHhcNMTQw
-OTI5MTczNDQzWhcNMzQwOTI5MTczNDQzWjAlMSMwIQYDVQQDDBppbmNvbW1vbi51
-bml2LnN1bnljbnNlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIT0Usp7YH9IFLQL5xKeRxHTpej08j6tuqXCCpj8RarjFbcrDraC09npHqWeutTz
-UyvMNea69E+UAn28uzg2ftsMX15Nrb+LCYPEGnqtsrabwgGXHewr7nf8WyPdjcWC
-DBhFcDAqhLjUHGhBGx4NhD/a6BYWKXHjAolgopZOwWvSR1FYgQUQjT7R83g407c/
-6L26FDAqxEufkg4x4TwihBRoC3j8kV6dyuz7tlzMAyAlRXnq3JuYTvEeNlDY5FxJ
-cxWPuNB4WSJKTiAzB9qavI6qUQUABgPHD0d6qYZg07UCIUm8k3bJU0J3M9fAsbXG
-0i0KS6iLN3gzsoGCrc7sRT0CAwEAAaN7MHkwHQYDVR0OBBYEFGcvUxpFLbbgtsle
-s4lFedorhKjAMFgGA1UdEQRRME+CGmluY29tbW9uLnVuaXYuc3VueWNuc2UuY29t
-hjFodHRwczovL2luY29tbW9uLnVuaXYuc3VueWNuc2UuY29tL2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQByJw4667jgC8l27quq1YCeukkkMuMj/46n
-l688gKpD4PL6nDKQzeHlUXUC8js7dmDrfuK+F/eRlPo4QOadf0wO2h4PdzxPJzV6
-cdwQaLf7ZdiHNlG+WIgfSbzurEEESk35DVsNxtriHyeHU+7tcpfqjEMAP2K7sZHv
-Cghk6dXYhVpYc5fakaOcDNM7tIsG9AfPL37Piisn1eg5BNuHb6TzthxbJW8gq9Q5
-X/5/NVPkxIZlwfd1UUjHO0T0OrkWTgIsesPGvBkRIJO6hUmSUI6YZHA5FmSEVYB1
-BvvZMKZ3B0ygTK7PIe0RRTPUMFgtZNMUNNgqywHDyDbt+y+REp9K
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon.sunycnse.com:443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon.sunycnse.com:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://incommon.sunycnse.com/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://incommon.sunycnse.com/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://incommon.sunycnse.com/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sunycnse.com</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDUzCCAjugAwIBAgIUNlPRT/wyMz9vjHRYl0MkLeoK0zwwDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAwwaaW5jb21tb24udW5pdi5zdW55Y25zZS5jb20wHhcNMTQw
-OTI5MTczNDQzWhcNMzQwOTI5MTczNDQzWjAlMSMwIQYDVQQDDBppbmNvbW1vbi51
-bml2LnN1bnljbnNlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIT0Usp7YH9IFLQL5xKeRxHTpej08j6tuqXCCpj8RarjFbcrDraC09npHqWeutTz
-UyvMNea69E+UAn28uzg2ftsMX15Nrb+LCYPEGnqtsrabwgGXHewr7nf8WyPdjcWC
-DBhFcDAqhLjUHGhBGx4NhD/a6BYWKXHjAolgopZOwWvSR1FYgQUQjT7R83g407c/
-6L26FDAqxEufkg4x4TwihBRoC3j8kV6dyuz7tlzMAyAlRXnq3JuYTvEeNlDY5FxJ
-cxWPuNB4WSJKTiAzB9qavI6qUQUABgPHD0d6qYZg07UCIUm8k3bJU0J3M9fAsbXG
-0i0KS6iLN3gzsoGCrc7sRT0CAwEAAaN7MHkwHQYDVR0OBBYEFGcvUxpFLbbgtsle
-s4lFedorhKjAMFgGA1UdEQRRME+CGmluY29tbW9uLnVuaXYuc3VueWNuc2UuY29t
-hjFodHRwczovL2luY29tbW9uLnVuaXYuc3VueWNuc2UuY29tL2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQByJw4667jgC8l27quq1YCeukkkMuMj/46n
-l688gKpD4PL6nDKQzeHlUXUC8js7dmDrfuK+F/eRlPo4QOadf0wO2h4PdzxPJzV6
-cdwQaLf7ZdiHNlG+WIgfSbzurEEESk35DVsNxtriHyeHU+7tcpfqjEMAP2K7sZHv
-Cghk6dXYhVpYc5fakaOcDNM7tIsG9AfPL37Piisn1eg5BNuHb6TzthxbJW8gq9Q5
-X/5/NVPkxIZlwfd1UUjHO0T0OrkWTgIsesPGvBkRIJO6hUmSUI6YZHA5FmSEVYB1
-BvvZMKZ3B0ygTK7PIe0RRTPUMFgtZNMUNNgqywHDyDbt+y+REp9K
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon.sunycnse.com:443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SUNY Polytechnic Institute</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SUNY Polytechnic Institute</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sunyit.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kyle Rosher</md:GivenName>
-    <md:EmailAddress>krosher@sunycnse.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ralph Gartner</md:GivenName>
-    <md:EmailAddress>rgartner@sunycnse.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Kyle Rosher</md:GivenName>
-    <md:EmailAddress>krosher@sunycnse.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Kyle Rosher</md:GivenName>
-    <md:EmailAddress>krosher@sunycnse.com</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 226079b1..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://indicate-gw.consorzio-cometa.it/shibboleth">
-  <md: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>
-  </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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">INDICATE e-Culture Science Gateway</md:ServiceName>
-      <md: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.
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 dc6abb96..00000000
--- a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
+++ /dev/null
@@ -1,139 +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://indicate-gw.consorzio-cometa.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-22T10:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-      <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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://indicate-gw.consorzio-cometa.it/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://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
-        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
-        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
-        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
-        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
-        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
-        <ds:KeyName>www.chain-project.eu</ds:KeyName>
-        <ds:KeyName>www.special-project.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
-                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
-                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
-                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
-                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
-                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
-                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
-                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
-                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
-                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
-                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
-                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
-                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
-                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
-                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
-                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
-                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
-                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
-                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
-                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
-                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
-                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
-                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
-                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">INDICATE e-Culture Science Gateway</md:ServiceName>
-      <md: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.
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INDICATE e-Culture Science Gateway provided by COMETA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">INDICATE e-Culture Science Gateway erogato da COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/indiid.net-idp-shibboleth.xml b/swamid-interfederations-2.0/indiid.net-idp-shibboleth.xml
deleted file mode 100644
index f4f8b86a..00000000
--- a/swamid-interfederations-2.0/indiid.net-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://indiid.net/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Digital Identity Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-07T16:35:40Z">
-      <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">indiid.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Indiid</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://indiid.net/assets/images/logo-compact-tiny.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://indiid.net/assets/images/logo-compact-medium.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEzCCAfugAwIBAgIUT6jU1lE/HRPejPdsm8epM0vUa7EwDQYJKoZIhvcNAQEF
-						BQAwFTETMBEGA1UEAxMKaW5kaWlkLm5ldDAeFw0xNDExMTAxMjM3MzVaFw0zNDEx
-						MTAxMjM3MzVaMBUxEzARBgNVBAMTCmluZGlpZC5uZXQwggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCoEvnN/TSYW1WcwzIT0VDek73vOEF+P/ruM3VXsn50
-						u1yGJO/I2u7mj4uB6z4/c2GlnG/bk1lPm2udxgQvsfQLefSudhUXE6I1+5z2BeKh
-						ItywlU7axKJ3yDkttnF91zoLdcWlb1G25bQG1KCeU5MOEJIwEi6AgNemEWcGyUDN
-						JhL5mu6deaMchpHpZcg/ANi8xoqcTAIMhZUQwwLWeocz7Wcp63dO6fXy0lY05udD
-						lldxFpPgnZFJC2Ip1PETDch3peze6UJPDypsnSMuq4d05OU8Ys2bXe5nnTxUFUMf
-						uUPWDSFLn0kIpYO4n710AUJ/IXYBp7ilWnNRu8MlOLfTAgMBAAGjWzBZMDgGA1Ud
-						EQQxMC+CCmluZGlpZC5uZXSGIWh0dHBzOi8vaW5kaWlkLm5ldC9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUVeUalccl0Ln3ZVxeQvuTCxr5v8swDQYJKoZIhvcNAQEF
-						BQADggEBAE4Ge6J/gCDnFxv32olly4khj+O4ubmdWHggfwIhQmlizGzTgVhN/0hD
-						/KttRlKIcJRvt/aGg/r3Ykyv4P9x34t5cxztPutjiQefe8QC7Lnxo+OW1Tu+1xKq
-						pbsZDh1R/gdDjSzpAtEoXZWUFM4hrYAzGuRc/8AelXVRS1kFfyi61ZsfduaimShu
-						KWGyy5xzC8UqFyDtOLUnJicnPOfmZWzGEjnWYZWCYseTmdxPAZRDIlB+z+ZXQu41
-						+pwjmhLlMoHc/E1WZD8jEIzp0tVhjA9xS85X1UyJxLPnBcWnf0f24DNnPPCywlcz
-						7PimycEKJ5Gu+L53LzzM6aMlPyWhm8Y=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://indiid.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indiid.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://indiid.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indiid.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://indiid.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indiid.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">indiid.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEzCCAfugAwIBAgIUT6jU1lE/HRPejPdsm8epM0vUa7EwDQYJKoZIhvcNAQEF
-						BQAwFTETMBEGA1UEAxMKaW5kaWlkLm5ldDAeFw0xNDExMTAxMjM3MzVaFw0zNDEx
-						MTAxMjM3MzVaMBUxEzARBgNVBAMTCmluZGlpZC5uZXQwggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCoEvnN/TSYW1WcwzIT0VDek73vOEF+P/ruM3VXsn50
-						u1yGJO/I2u7mj4uB6z4/c2GlnG/bk1lPm2udxgQvsfQLefSudhUXE6I1+5z2BeKh
-						ItywlU7axKJ3yDkttnF91zoLdcWlb1G25bQG1KCeU5MOEJIwEi6AgNemEWcGyUDN
-						JhL5mu6deaMchpHpZcg/ANi8xoqcTAIMhZUQwwLWeocz7Wcp63dO6fXy0lY05udD
-						lldxFpPgnZFJC2Ip1PETDch3peze6UJPDypsnSMuq4d05OU8Ys2bXe5nnTxUFUMf
-						uUPWDSFLn0kIpYO4n710AUJ/IXYBp7ilWnNRu8MlOLfTAgMBAAGjWzBZMDgGA1Ud
-						EQQxMC+CCmluZGlpZC5uZXSGIWh0dHBzOi8vaW5kaWlkLm5ldC9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUVeUalccl0Ln3ZVxeQvuTCxr5v8swDQYJKoZIhvcNAQEF
-						BQADggEBAE4Ge6J/gCDnFxv32olly4khj+O4ubmdWHggfwIhQmlizGzTgVhN/0hD
-						/KttRlKIcJRvt/aGg/r3Ykyv4P9x34t5cxztPutjiQefe8QC7Lnxo+OW1Tu+1xKq
-						pbsZDh1R/gdDjSzpAtEoXZWUFM4hrYAzGuRc/8AelXVRS1kFfyi61ZsfduaimShu
-						KWGyy5xzC8UqFyDtOLUnJicnPOfmZWzGEjnWYZWCYseTmdxPAZRDIlB+z+ZXQu41
-						+pwjmhLlMoHc/E1WZD8jEIzp0tVhjA9xS85X1UyJxLPnBcWnf0f24DNnPPCywlcz
-						7PimycEKJ5Gu+L53LzzM6aMlPyWhm8Y=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://indiid.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indiid.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">Digital Identity Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Indiid</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://indiid.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@digitalidentitylabs.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@digitalidentitylabs.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index adef02f5..00000000
--- a/swamid-interfederations-2.0/infodev-d7-dev.nsms.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://infodev-d7-dev.nsms.ox.ac.uk/shibboleth">
-  <!--
-		This is an "infodev-d7-dev.nsms.ox.ac.uk" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-09T15:11:50Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGzCCAgOgAwIBAgIJAMLR/aNeyl8BMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-						BAMTHGluZm9kZXYtZDctZGV2Lm5zbXMub3guYWMudWswHhcNMTQxMjA0MTUxNDMz
-						WhcNMjQxMjAxMTUxNDMzWjAnMSUwIwYDVQQDExxpbmZvZGV2LWQ3LWRldi5uc21z
-						Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtrcUBiNR
-						en0REq0ls1dy4X7FFXjopOi88A/uLA7Dw6neTkl+HZ88gSgg5L3qsv+qZnqrzzLm
-						ju8a5kfJPz9zvwAQFLA+ArD4wwrw8LLZf8hMbfF+pZEhCQMIGKC+cUbD+6YzQqvu
-						geSFjhdl5X723IibxRPhmx14C4j+ERAW2tUQE09XQcZ6paIksRayzTObThK6GXf4
-						BK9vtnXNDMvOOteHikyB8RqjZ0YezDlz8zIYQJeVP0d3tgp+cEHTyZmt1VgH2pe4
-						jSA+PNX+uudU1z1AnZ/Asa0o0paRLmv6bnG2/XF2sRSkhEurddTq7QSN6xqIYWk7
-						qZpH/reIrBSZRwIDAQABo0owSDAnBgNVHREEIDAeghxpbmZvZGV2LWQ3LWRldi5u
-						c21zLm94LmFjLnVrMB0GA1UdDgQWBBS1Xk+0N4mnps4yNcemQMTTVWhw5TANBgkq
-						hkiG9w0BAQUFAAOCAQEAHyhijXXcuc0YFMF0FmC5W4839/pyBORBU0/Nt/oX9/5v
-						6vByLWOaljvc/Vsf3+jhPK5FLassvHVKSZ2v4gJEjvkGMWlZTcpLlj0+yOHEvGlW
-						t5HWAaypypQa9L6h2MsWIPO5mKuHMlLLgR4zXEL35MWQk6iuvsJKaCM6Uv8jyuQz
-						LQVEEIK0Cf4SIHRPF7Vj8wLcGyN2pBOIevRjBeGGhfciBWWbsz+9h3eq610Cv/iU
-						b/IynFccjjF7bx5iJyggB45pEIJQdhLOAuqR96crdrcVYtXYspErn+3gIvDi7sR5
-						UbkffR0RAFrPzKRqjcDLdTTrTzzZ2gUqAfSNu/zXZg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infodev-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infodev-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infodev-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infodev-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blav-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blav-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blav-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blav-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blueflame-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blueflame-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blueflame-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blueflame-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cih-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cih-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cih-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cih-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cns-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cns-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cns-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cns-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cns-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cns-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cns-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cns-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crhb-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crhb-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crhb-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="31"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crhb-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="32"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ctmet-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="33"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ctmet-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ctmet-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="35"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ctmet-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="36"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dandy-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="37"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dandy-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dandy-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="39"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dandy-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="40"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dhox-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="41"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dhox-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="42"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dhox-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="43"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dhox-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="44"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dolly-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="45"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dolly-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="46"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dolly-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="47"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dolly-d7-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="48"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eship-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="49"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eship-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eship-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="51"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eship-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="52"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://geg-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="53"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://geg-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="54"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://geg-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="55"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://geg-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="56"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://horizon2020-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="57"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://horizon2020-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="58"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://horizon2020-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="59"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://horizon2020-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="60"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://humresgrp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="61"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://humresgrp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="62"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://humresgrp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="63"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://humresgrp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="64"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ictforum-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="65"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ictforum-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="66"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ictforum-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="67"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ictforum-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="68"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ithelp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="69"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ithelp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="70"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ithelp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="71"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ithelp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="72"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mansfield-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="73"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mansfield-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="74"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mansfield-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="75"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mansfield-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="76"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdex-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="77"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mdex-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="78"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mdex-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="79"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mdex-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="80"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mmp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="81"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mmp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="82"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mmp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="83"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mmp-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="84"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mpls-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="85"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mpls-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mpls-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="87"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mpls-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="88"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://museumswifi-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="89"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://museumswifi-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="90"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://museumswifi-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="91"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://museumswifi-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="92"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myanmar-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="93"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myanmar-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="94"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myanmar-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="95"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myanmar-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="96"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openspires-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="97"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openspires-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openspires-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="99"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openspires-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="100"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxsparks-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="101"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxsparks-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="102"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxsparks-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="103"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxsparks-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="104"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sias-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="105"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sias-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="106"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sias-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="107"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sias-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="108"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://socsci-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="109"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://socsci-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://socsci-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="111"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://socsci-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="112"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://torch-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="113"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://torch-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="114"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://torch-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="115"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://torch-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="116"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://woodlab-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="117"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://woodlab-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="118"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://woodlab-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="119"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://woodlab-dev.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="120"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - infodev-d7-dev.nsms.ox.ac.uk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://infodev-d7-dev.nsms.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 8dcfc8e8..00000000
--- a/swamid-interfederations-2.0/infodev-d7-live.nsms.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://infodev-d7-live.nsms.ox.ac.uk/shibboleth">
-  <!--
-		This is an "infodev-d7-live.nsms.ox.ac.uk" Shibboleth SP for the University of Oxford. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-21T11:16:59Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHjCCAgagAwIBAgIJAPb4uUizKWAPMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHWluZm9kZXYtZDctbGl2ZS5uc21zLm94LmFjLnVrMB4XDTE1MDExNjE2MjUw
-						MFoXDTI1MDExMzE2MjUwMFowKDEmMCQGA1UEAxMdaW5mb2Rldi1kNy1saXZlLm5z
-						bXMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoyqIt
-						i62chxgBpyHpAYgQPbFS6iKvOfv+5sgs+vWfc1VvKk1Bb3OqYXytZJw17y/IYyXS
-						0jG+M5CeS4MxxXW8j98pESvL1eYZH27FJhzOJLpITmoosQLT0nCQqJvGip1/6hhA
-						yCpUaLkmvLJZOdanv6YDx1xc+89xUR5LqmV4Z+7xsLX8haEhlIHDhjVhOI7CDlkD
-						JLUYEdix8VLZS9FPnrybrrHxYyfCSweBtxDHi8QEjxAoRU04q4BF4kLmQkH+vWN2
-						Jr4akJz/fmIu00RdhyytFuED4S8lGHs/McYoRArdaWutaRj5t+xsppbcKjpCp6ru
-						UPUqUjC9SQSBmDBLAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWluZm9kZXYtZDctbGl2
-						ZS5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBT2sRRg0Yfg28xAo5KMPC0EUeGUljAN
-						BgkqhkiG9w0BAQUFAAOCAQEAY+NeJ6VjX51Oq+0YAArzeOxNEVm1vn2TIlzPC5sV
-						V7/bCTixWP6q1dJNTpW0Lb39NfUwalzedpnVvP/+6DIPRZGVC2pGqO4WlY1ogh89
-						hZuJIK4ATPVR9sXw+eKut5ZhtJgSQwrIs42FubQLKM4y4HJnh2mGRLoUYeBSNnla
-						NrD2GHtfAwbxycQ1OqCY1qO6Sj2zV//ITElPv7Z3yLe9cFkEx7bt09fJ6JURo3cr
-						jucD7A2vE9jV+4NdX4CgIWFyNbmRWP3dlBo3pUYtrKleXb7EUun6XxUz+cbK3LQl
-						jfsceKH2qEFeCSuP5iMel4HC/c7ZnMeQnKSRmWnnQNwUmQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infodev-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infodev-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infodev-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infodev-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://africanstudies-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://africanstudies-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://africanstudies-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://africanstudies-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.oxfordsparks.co.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.oxfordsparks.co.uk/Shibboleth.sso/SAML/POST" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.oxfordsparks.com/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.oxfordsparks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.oxfordsparks.com/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.oxfordsparks.com/Shibboleth.sso/SAML/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.oxfordsparks.net/Shibboleth.sso/SAML2/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.oxfordsparks.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.oxfordsparks.net/Shibboleth.sso/SAML2/ECP" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.oxfordsparks.net/Shibboleth.sso/SAML/POST" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blogs.oxfordsparks.org/Shibboleth.sso/SAML2/POST" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blogs.oxfordsparks.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blogs.oxfordsparks.org/Shibboleth.sso/SAML2/ECP" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blogs.oxfordsparks.org/Shibboleth.sso/SAML/POST" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blueflame-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blueflame-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blueflame-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blueflame-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bsg.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bsg.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bsg.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="31"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bsg.ox.ac.uk/Shibboleth.sso/SAML/POST" index="32"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://chinacentre-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="33"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://chinacentre-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://chinacentre-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="35"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://chinacentre-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="36"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cih-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="37"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cih-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cih-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="39"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cih-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="40"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="41"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="42"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="43"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="44"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cns-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="45"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cns-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="46"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cns-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="47"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cns-d7-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="48"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crhb-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="49"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crhb-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crhb-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="51"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crhb-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="52"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ctmet-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="53"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ctmet-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="54"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ctmet-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="55"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ctmet-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="56"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ctmet.theology.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="57"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ctmet.theology.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="58"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ctmet.theology.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="59"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ctmet.theology.ox.ac.uk/Shibboleth.sso/SAML/POST" index="60"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dhox-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="61"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dhox-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="62"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dhox-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="63"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dhox-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="64"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://digital.humanities.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="65"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://digital.humanities.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="66"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://digital.humanities.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="67"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://digital.humanities.ox.ac.uk/Shibboleth.sso/SAML/POST" index="68"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eship.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="69"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eship.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="70"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eship.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="71"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eship.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="72"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://globaleconomicgovernance.org/Shibboleth.sso/SAML2/POST" index="73"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://globaleconomicgovernance.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="74"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://globaleconomicgovernance.org/Shibboleth.sso/SAML2/ECP" index="75"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://globaleconomicgovernance.org/Shibboleth.sso/SAML/POST" index="76"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://horizon2020.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="77"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://horizon2020.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="78"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://horizon2020.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="79"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://horizon2020.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="80"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lac-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="81"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lac-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="82"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lac-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="83"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lac-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="84"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mansfield-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="85"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mansfield-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mansfield-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="87"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mansfield-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="88"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mes-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="89"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mes-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="90"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mes-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="91"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mes-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="92"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mmp-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="93"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mmp-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="94"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mmp-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="95"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mmp-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="96"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myanmar-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="97"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myanmar-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myanmar-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="99"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myanmar-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="100"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nissan-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="101"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nissan-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="102"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nissan-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="103"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nissan-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="104"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openspires-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="105"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openspires-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="106"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openspires-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="107"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openspires-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="108"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST" index="109"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxfordsparks.co.uk/Shibboleth.sso/SAML2/ECP" index="111"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxfordsparks.co.uk/Shibboleth.sso/SAML/POST" index="112"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordsparks.com/Shibboleth.sso/SAML2/POST" index="113"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxfordsparks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="114"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxfordsparks.com/Shibboleth.sso/SAML2/ECP" index="115"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxfordsparks.com/Shibboleth.sso/SAML/POST" index="116"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordsparks.net/Shibboleth.sso/SAML2/POST" index="117"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxfordsparks.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="118"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxfordsparks.net/Shibboleth.sso/SAML2/ECP" index="119"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxfordsparks.net/Shibboleth.sso/SAML/POST" index="120"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxfordsparks.org/Shibboleth.sso/SAML2/POST" index="121"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxfordsparks.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="122"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxfordsparks.org/Shibboleth.sso/SAML2/ECP" index="123"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxfordsparks.org/Shibboleth.sso/SAML/POST" index="124"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxsparks-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="125"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxsparks-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="126"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxsparks-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="127"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxsparks-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="128"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portfolio.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="129"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portfolio.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="130"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portfolio.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="131"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portfolio.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="132"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rees-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="133"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rees-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="134"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rees-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="135"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rees-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="136"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sias-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="137"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sias-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="138"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sias-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="139"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sias-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="140"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="141"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="142"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="143"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML/POST" index="144"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://southasia-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="145"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://southasia-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="146"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://southasia-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="147"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://southasia-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="148"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://torch.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="149"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://torch.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="150"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://torch.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="151"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://torch.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="152"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://torch.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="153"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://torch.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="154"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://torch.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="155"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://torch.ox.ac.uk/Shibboleth.sso/SAML/POST" index="156"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://woodlab-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="157"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://woodlab-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="158"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://woodlab-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="159"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://woodlab-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="160"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.africanstudies.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="161"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.africanstudies.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="162"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.africanstudies.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="163"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.africanstudies.ox.ac.uk/Shibboleth.sso/SAML/POST" index="164"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.area-studies.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="165"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.area-studies.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="166"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.area-studies.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="167"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.area-studies.ox.ac.uk/Shibboleth.sso/SAML/POST" index="168"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.brazil.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="169"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.brazil.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="170"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.brazil.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="171"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.brazil.ox.ac.uk/Shibboleth.sso/SAML/POST" index="172"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bsg.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="173"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bsg.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="174"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bsg.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="175"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bsg.ox.ac.uk/Shibboleth.sso/SAML/POST" index="176"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ccsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="177"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ccsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="178"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ccsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="179"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ccsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="180"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.china-studies.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="181"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.china-studies.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="182"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.china-studies.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="183"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.china-studies.ox.ac.uk/Shibboleth.sso/SAML/POST" index="184"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.chinacentre.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="185"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.chinacentre.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="186"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.chinacentre.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="187"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.chinacentre.ox.ac.uk/Shibboleth.sso/SAML/POST" index="188"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ertegun.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="189"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ertegun.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="190"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ertegun.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="191"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ertegun.ox.ac.uk/Shibboleth.sso/SAML/POST" index="192"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.europegateway.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="193"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.europegateway.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="194"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.europegateway.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="195"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.europegateway.ox.ac.uk/Shibboleth.sso/SAML/POST" index="196"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.globaleconomicgovernance.org/Shibboleth.sso/SAML2/POST" index="197"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.globaleconomicgovernance.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="198"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.globaleconomicgovernance.org/Shibboleth.sso/SAML2/ECP" index="199"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.globaleconomicgovernance.org/Shibboleth.sso/SAML/POST" index="200"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lac.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="201"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lac.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="202"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lac.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="203"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lac.ox.ac.uk/Shibboleth.sso/SAML/POST" index="204"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mes.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="205"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mes.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="206"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mes.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="207"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mes.ox.ac.uk/Shibboleth.sso/SAML/POST" index="208"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nissan.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="209"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nissan.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="210"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nissan.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="211"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nissan.ox.ac.uk/Shibboleth.sso/SAML/POST" index="212"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST" index="213"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordsparks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="214"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordsparks.co.uk/Shibboleth.sso/SAML2/ECP" index="215"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordsparks.co.uk/Shibboleth.sso/SAML/POST" index="216"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordsparks.com/Shibboleth.sso/SAML2/POST" index="217"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordsparks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="218"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordsparks.com/Shibboleth.sso/SAML2/ECP" index="219"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordsparks.com/Shibboleth.sso/SAML/POST" index="220"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordsparks.net/Shibboleth.sso/SAML2/POST" index="221"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordsparks.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="222"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordsparks.net/Shibboleth.sso/SAML2/ECP" index="223"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordsparks.net/Shibboleth.sso/SAML/POST" index="224"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordsparks.org/Shibboleth.sso/SAML2/POST" index="225"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordsparks.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="226"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordsparks.org/Shibboleth.sso/SAML2/ECP" index="227"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordsparks.org/Shibboleth.sso/SAML/POST" index="228"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.photonics.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="229"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.photonics.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="230"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.photonics.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="231"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.photonics.ox.ac.uk/Shibboleth.sso/SAML/POST" index="232"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rees.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="233"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rees.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="234"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rees.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="235"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rees.ox.ac.uk/Shibboleth.sso/SAML/POST" index="236"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="237"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="238"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="239"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.skillstoolkit.ox.ac.uk/Shibboleth.sso/SAML/POST" index="240"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.southasia.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="241"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.southasia.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="242"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.southasia.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="243"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.southasia.ox.ac.uk/Shibboleth.sso/SAML/POST" index="244"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.torch.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="245"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.torch.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="246"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.torch.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="247"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.torch.ox.ac.uk/Shibboleth.sso/SAML/POST" index="248"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - infodev-d7-live.nsms.ox.ac.uk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://infodev-d7-live.nsms.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c492e87d..00000000
--- a/swamid-interfederations-2.0/infodev-d7-test.nsms.ox.ac.uk-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://infodev-d7-test.nsms.ox.ac.uk/shibboleth">
-  <!--
-		This is an "infodev-d7-test.nsms.ox.ac.uk" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-30T14:20:54Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHjCCAgagAwIBAgIJAL9xsW9eJb1AMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHWluZm9kZXYtZDctdGVzdC5uc21zLm94LmFjLnVrMB4XDTE0MDYyNTEzMTcy
-						NFoXDTI0MDYyMjEzMTcyNFowKDEmMCQGA1UEAxMdaW5mb2Rldi1kNy10ZXN0Lm5z
-						bXMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuXn49
-						I6qel9fSQqlzjbRwgaJxfu/JY6GsfuZkKZntJpdFsV9KOg1iNPA2uRwCUKZvCSBC
-						4zCErXIYJa6n0RLiupn5jAD/4e9SRUS3PpDIx2HngXOUTFV8pargq4hxJ0HCf04b
-						+7qfyBqqzk6R090JX8BDCgqptBfCYAb0+IwV1nbCOT+ZUHdN6k9bXm9dqwLsoOMC
-						aqezQMox0rdu703VEgQKBA9a0fvs/FXdxO1L6aGhPDeLo/Im+yhlWMNCu4Zd1JkH
-						I6lmhRptDGEE1kZuJI/+yGhgK3RcObmljwZg47dS582V4zjkDdm9muvHWyL+YQVt
-						CqZ2np34rhUkR6yLAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWluZm9kZXYtZDctdGVz
-						dC5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBS3TF9lwkGPgc/inGvcBU9lnhCfIDAN
-						BgkqhkiG9w0BAQUFAAOCAQEAKvnTMZAof5tq+3Tm12XoiXAreXZ47HmZu0PdgFXX
-						3peHdYS6BfbsJFzYafpfzUzOegFavYDHMag0zZGaFjpeiWZEI7qO9quKMnIqO5Yc
-						i5QfviShmcdtEp89zidPZi7UepHuG21GulbkX55jKu3rvbcvPXTdmP3gYRaR/xX2
-						faifNN5e97ItMwkIH0ke5DiWsvQ/zXActH/BVBIku8R2gitOV/TG9eLUZtrmK7h1
-						UNVfwntu6NfNjGx/LbCPVgVAJmhuH1YgTJbhDFfE9Ocu9CpxSlmhJXZu08kiPloJ
-						xea684iW5WHGZB3KGh4Yslx4LE5VuYerU1NXuEUbzyPLlA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infodev-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infodev-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infodev-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infodev-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://africanstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://africanstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://africanstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://africanstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blav-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blav-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blav-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blav-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://blueflame-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://blueflame-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://blueflame-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://blueflame-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://brazil-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://brazil-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://brazil-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://brazil-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccsp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ccsp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ccsp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ccsp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://chinacentre-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://chinacentre-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://chinacentre-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://chinacentre-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cih-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cih-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cih-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="31"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cih-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="32"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="33"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="34"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="35"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="36"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cns-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="37"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cns-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cns-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="39"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cns-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="40"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crhb-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="41"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://crhb-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="42"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crhb-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="43"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://crhb-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="44"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ctmet-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="45"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ctmet-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="46"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ctmet-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="47"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ctmet-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="48"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dandy-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="49"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dandy-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dandy-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="51"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dandy-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="52"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="53"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="54"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="55"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="56"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dhox-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="57"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dhox-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="58"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dhox-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="59"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dhox-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="60"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dolly-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="61"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dolly-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="62"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dolly-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="63"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dolly-d7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="64"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ertegun-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="65"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ertegun-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="66"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ertegun-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="67"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ertegun-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="68"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eship-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="69"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://eship-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="70"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://eship-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="71"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://eship-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="72"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://geg-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="73"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://geg-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="74"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://geg-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="75"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://geg-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="76"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://horizon2020-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="77"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://horizon2020-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="78"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://horizon2020-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="79"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://horizon2020-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="80"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://humresgrp.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="81"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://humresgrp.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="82"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://humresgrp.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="83"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://humresgrp.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="84"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ictforum-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="85"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ictforum-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ictforum-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="87"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ictforum-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="88"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infodev-d7-sandbox.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="89"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infodev-d7-sandbox.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="90"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infodev-d7-sandbox.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="91"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infodev-d7-sandbox.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="92"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://italianstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="93"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://italianstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="94"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://italianstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="95"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://italianstudies-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="96"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ithelp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="97"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ithelp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ithelp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="99"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ithelp-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="100"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itlpportfolio-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="101"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itlpportfolio-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="102"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://itlpportfolio-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="103"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://itlpportfolio-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="104"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itlptoolkit-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="105"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itlptoolkit-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="106"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://itlptoolkit-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="107"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://itlptoolkit-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="108"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lac-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="109"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lac-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lac-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="111"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lac-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="112"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mansfield-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="113"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mansfield-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="114"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mansfield-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="115"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mansfield-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="116"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdex-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="117"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mdex-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="118"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mdex-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="119"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mdex-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="120"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mes-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="121"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mes-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="122"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mes-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="123"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mes-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="124"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mpls-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="125"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mpls-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="126"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mpls-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="127"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mpls-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="128"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myanmar-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="129"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myanmar-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="130"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myanmar-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="131"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myanmar-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="132"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nissan-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="133"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nissan-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="134"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nissan-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="135"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nissan-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="136"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openspires-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="137"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://openspires-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="138"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openspires-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="139"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openspires-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="140"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxsparks-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="141"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxsparks-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="142"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxsparks-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="143"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxsparks-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="144"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://photonicsd7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="145"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://photonicsd7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="146"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://photonicsd7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="147"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://photonicsd7-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="148"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://poeticforms-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="149"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://poeticforms-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="150"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://poeticforms-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="151"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://poeticforms-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="152"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rees-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="153"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rees-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="154"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rees-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="155"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rees-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="156"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sias-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="157"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sias-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="158"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sias-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="159"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sias-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="160"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://socsci-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="161"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://socsci-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="162"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://socsci-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="163"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://socsci-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="164"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://southasia-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="165"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://southasia-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="166"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://southasia-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="167"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://southasia-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="168"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://torch-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="169"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://torch-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="170"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://torch-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="171"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://torch-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="172"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://woodlab-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="173"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://woodlab-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="174"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://woodlab-test.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="175"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://woodlab-test.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="176"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - infodev-d7-test.nsms.ox.ac.uk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://infodev-d7-test.nsms.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/informahealthcare.com-shibboleth.xml b/swamid-interfederations-2.0/informahealthcare.com-shibboleth.xml
deleted file mode 100644
index fea8ee85..00000000
--- a/swamid-interfederations-2.0/informahealthcare.com-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://informahealthcare.com/shibboleth">
-  <!--
-		This is an "Informa Healthcare" OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDrzCCApegAwIBAgIJAL1L+CnJYaryMA0GCSqGSIb3DQEBBQUAMIGWMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEeMBwGA1UEAxMVaW5mb3JtYWhlYWx0aGNhcmUuY29t
-						MB4XDTA5MTEwNDE4NDc1N1oXDTE5MTEwMjE4NDc1N1owgZYxCzAJBgNVBAYTAlVT
-						MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsG
-						A1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0
-						ZW1zLCBJbmMuMR4wHAYDVQQDExVpbmZvcm1haGVhbHRoY2FyZS5jb20wggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcCSOdjx4WPdtGyJjfck1tUZfO437x
-						1m+lPZ5OSstZ4+RCxLKUPD0O/nDJ3ifJH20WTEM5X+lyDjWu/+UsptpKXY24Pk/K
-						59k+snzu6c1Uhy1Lp2puq15HjRVceTGp3G+NV7HJr1jKxoSp2lsY9vmTvbU1JK+o
-						jYEZyNOuuNraw/UHCm66rrZOeFtKS3zYJry7bmT9I2e78macP7Dk7uAzCDxNLDbF
-						nYV34Im5cItQn3nE4cDNyWc2RpK7KIrhFBn3f7IOvzyOVYKvpu1tGmw5s1NCakT8
-						jM4PaB4tNuaTm5Qh+QplB930UU29XWD5eO8qm162WhtJLqH8hWvqSrApAgMBAAEw
-						DQYJKoZIhvcNAQEFBQADggEBAG3tBSpj5KTbQs8CJsJc5mMlD3IVgf45kPhShXMz
-						nww61zb1FJIv0C0IOKwjfBjCFTJMyfo96cDeEWNSHfEOIhkJcEGkiB04DhyKYptH
-						CquKWP97U55nqXOVDEbtMamu+z+9f7uQmc7VuB0rqZ07xbrSrASqhIbUZFtX9F68
-						Z070zJKi+gMdsiZ6b5LeUZu6xy/3hPCxmZrigqziTBELJ5QMLN/GEk1w2kieul6s
-						0TQo9eEOFz98F25hOf1rUmu63xykgZRZdxtNYfJ7yiSngyqdQniyRN731dZJVzH8
-						1zeV5IEFxJAFO/Pen4K7kRhv6MCgvFrf6ufTpCDojAeGU1E=                        
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://informahealthcare.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://informahealthcare.com/action/samlACS" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informahealthcare.com/action/samlACS" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: Informa Healthcare</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.informahealthcare.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/informationservice-test.idoxgroup.com-shibboleth.xml b/swamid-interfederations-2.0/informationservice-test.idoxgroup.com-shibboleth.xml
deleted file mode 100644
index b6928c40..00000000
--- a/swamid-interfederations-2.0/informationservice-test.idoxgroup.com-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://informationservice-test.idoxgroup.com/shibboleth">
-  <!--
-		This is a "PLANEX test" Shibboleth SP for IDOX Information Services Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-24T15:55: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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDljCCAn4CAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAkdCMREwDwYD
-						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzETMBEGA1UEChMKSURPWCBH
-						cm91cDEcMBoGA1UECxMTSW5mb3JtYXRpb24gU2VydmljZTEpMCcGA1UEAxMgaW5m
-						b3JtYXRpb25zZXJ2aWNlLmlkb3hncm91cC5jb20wHhcNMTAwMzE5MTM0MzAyWhcN
-						MjAwMzE2MTM0MzAyWjCBkDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5k
-						MRAwDgYDVQQHEwdHbGFzZ293MRMwEQYDVQQKEwpJRE9YIEdyb3VwMRwwGgYDVQQL
-						ExNJbmZvcm1hdGlvbiBTZXJ2aWNlMSkwJwYDVQQDEyBpbmZvcm1hdGlvbnNlcnZp
-						Y2UuaWRveGdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AJtxqpaLhnY5M+Op1rdKcu4Q+NKkG9xTyhrVyD3q6Ebd3F2z7Pq4Ul++dsMy+eWO
-						4KSwYjAFnIMS8uuuGCa9sagt9xHs/K2F5nGB+rAfkbW11LikdL9fuEmUc44/Qh1z
-						D85p0GLoMHVdfJJTK3atAbXY6MExGvYCrnB6GnmqU14HW2M6jR64pxopBRobpgHn
-						z3fH+ShiI57swZ3PQNSlpUjTM8oYNiBE8aiA9/4LdyBXK3MCZd2B8v6+OIcoJbB8
-						J5Xaqt/aUkMhAPZOgYTnvSwuj1vDnq5aKLJefw/ot2PvrVB60+v+ImP3OlMZ74qG
-						zCtl1ahe2V5j+d5uooOpZt0CAwEAATANBgkqhkiG9w0BAQQFAAOCAQEAYy1VOTwC
-						gb3FghRYG9j/2TXGBb1bBzZqjadF3xll1j9mRyKr9AajSSVWg+UrZGUVY3XRvBfB
-						JnNZwDWamqw0iFwv+leY3IazhRqSONOiJiRQSzwPbUBkRTiefjg2mUYQBXj3uZw+
-						OW5/UBFrqYN63pRYS7bK9fuAzda/3bVX+ySwp+GFoEatDd+3S8J07HaHWxUVcd3q
-						DYGFIWBoJhWGJbsYbjmnI+A4a1o356y+CnWR1Xz/EHtgkIt4ZRYtja1tUVh/F+wy
-						x9gf6TLgM8FeLWuNj4AIxVItjjDM76EyP63uGcJpkuRoyBY2IPoIv+h6lREA5DdN
-						S5PKEEUqwEK65g==
-					</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>
-						MIIDljCCAn4CAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAkdCMREwDwYD
-						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzETMBEGA1UEChMKSURPWCBH
-						cm91cDEcMBoGA1UECxMTSW5mb3JtYXRpb24gU2VydmljZTEpMCcGA1UEAxMgaW5m
-						b3JtYXRpb25zZXJ2aWNlLmlkb3hncm91cC5jb20wHhcNMTAwMzE5MTM0MzAyWhcN
-						MjAwMzE2MTM0MzAyWjCBkDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5k
-						MRAwDgYDVQQHEwdHbGFzZ293MRMwEQYDVQQKEwpJRE9YIEdyb3VwMRwwGgYDVQQL
-						ExNJbmZvcm1hdGlvbiBTZXJ2aWNlMSkwJwYDVQQDEyBpbmZvcm1hdGlvbnNlcnZp
-						Y2UuaWRveGdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AJtxqpaLhnY5M+Op1rdKcu4Q+NKkG9xTyhrVyD3q6Ebd3F2z7Pq4Ul++dsMy+eWO
-						4KSwYjAFnIMS8uuuGCa9sagt9xHs/K2F5nGB+rAfkbW11LikdL9fuEmUc44/Qh1z
-						D85p0GLoMHVdfJJTK3atAbXY6MExGvYCrnB6GnmqU14HW2M6jR64pxopBRobpgHn
-						z3fH+ShiI57swZ3PQNSlpUjTM8oYNiBE8aiA9/4LdyBXK3MCZd2B8v6+OIcoJbB8
-						J5Xaqt/aUkMhAPZOgYTnvSwuj1vDnq5aKLJefw/ot2PvrVB60+v+ImP3OlMZ74qG
-						zCtl1ahe2V5j+d5uooOpZt0CAwEAATANBgkqhkiG9w0BAQQFAAOCAQEAYy1VOTwC
-						gb3FghRYG9j/2TXGBb1bBzZqjadF3xll1j9mRyKr9AajSSVWg+UrZGUVY3XRvBfB
-						JnNZwDWamqw0iFwv+leY3IazhRqSONOiJiRQSzwPbUBkRTiefjg2mUYQBXj3uZw+
-						OW5/UBFrqYN63pRYS7bK9fuAzda/3bVX+ySwp+GFoEatDd+3S8J07HaHWxUVcd3q
-						DYGFIWBoJhWGJbsYbjmnI+A4a1o356y+CnWR1Xz/EHtgkIt4ZRYtja1tUVh/F+wy
-						x9gf6TLgM8FeLWuNj4AIxVItjjDM76EyP63uGcJpkuRoyBY2IPoIv+h6lREA5DdN
-						S5PKEEUqwEK65g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://informationservice-test.idoxgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IDOX Information Services Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IDOX Information Services Ltd: PLANEX Test site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://informationservice-test.idoxgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@idoxgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Helpdesk</GivenName>
-    <EmailAddress>mailto:ukfederation@idoxgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml b/swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml
deleted file mode 100644
index 23c24376..00000000
--- a/swamid-interfederations-2.0/informationservice.idoxgroup.com-shibboleth.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://informationservice.idoxgroup.com/shibboleth">
-  <!--
-		This is a "PLANEX" Shibboleth SP for IDOX Information Services Ltd.
-	-->
-  <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-03-19T15:37: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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PLANEX, The Idox Information Service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Online access to UK public policy bibliographic database, from the 1980s to today</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDljCCAn4CAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAkdCMREwDwYD
-						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzETMBEGA1UEChMKSURPWCBH
-						cm91cDEcMBoGA1UECxMTSW5mb3JtYXRpb24gU2VydmljZTEpMCcGA1UEAxMgaW5m
-						b3JtYXRpb25zZXJ2aWNlLmlkb3hncm91cC5jb20wHhcNMTAwMzE5MTM0MzAyWhcN
-						MjAwMzE2MTM0MzAyWjCBkDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5k
-						MRAwDgYDVQQHEwdHbGFzZ293MRMwEQYDVQQKEwpJRE9YIEdyb3VwMRwwGgYDVQQL
-						ExNJbmZvcm1hdGlvbiBTZXJ2aWNlMSkwJwYDVQQDEyBpbmZvcm1hdGlvbnNlcnZp
-						Y2UuaWRveGdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AJtxqpaLhnY5M+Op1rdKcu4Q+NKkG9xTyhrVyD3q6Ebd3F2z7Pq4Ul++dsMy+eWO
-						4KSwYjAFnIMS8uuuGCa9sagt9xHs/K2F5nGB+rAfkbW11LikdL9fuEmUc44/Qh1z
-						D85p0GLoMHVdfJJTK3atAbXY6MExGvYCrnB6GnmqU14HW2M6jR64pxopBRobpgHn
-						z3fH+ShiI57swZ3PQNSlpUjTM8oYNiBE8aiA9/4LdyBXK3MCZd2B8v6+OIcoJbB8
-						J5Xaqt/aUkMhAPZOgYTnvSwuj1vDnq5aKLJefw/ot2PvrVB60+v+ImP3OlMZ74qG
-						zCtl1ahe2V5j+d5uooOpZt0CAwEAATANBgkqhkiG9w0BAQQFAAOCAQEAYy1VOTwC
-						gb3FghRYG9j/2TXGBb1bBzZqjadF3xll1j9mRyKr9AajSSVWg+UrZGUVY3XRvBfB
-						JnNZwDWamqw0iFwv+leY3IazhRqSONOiJiRQSzwPbUBkRTiefjg2mUYQBXj3uZw+
-						OW5/UBFrqYN63pRYS7bK9fuAzda/3bVX+ySwp+GFoEatDd+3S8J07HaHWxUVcd3q
-						DYGFIWBoJhWGJbsYbjmnI+A4a1o356y+CnWR1Xz/EHtgkIt4ZRYtja1tUVh/F+wy
-						x9gf6TLgM8FeLWuNj4AIxVItjjDM76EyP63uGcJpkuRoyBY2IPoIv+h6lREA5DdN
-						S5PKEEUqwEK65g==
-					</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>
-						MIIDljCCAn4CAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAkdCMREwDwYD
-						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzETMBEGA1UEChMKSURPWCBH
-						cm91cDEcMBoGA1UECxMTSW5mb3JtYXRpb24gU2VydmljZTEpMCcGA1UEAxMgaW5m
-						b3JtYXRpb25zZXJ2aWNlLmlkb3hncm91cC5jb20wHhcNMTAwMzE5MTM0MzAyWhcN
-						MjAwMzE2MTM0MzAyWjCBkDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5k
-						MRAwDgYDVQQHEwdHbGFzZ293MRMwEQYDVQQKEwpJRE9YIEdyb3VwMRwwGgYDVQQL
-						ExNJbmZvcm1hdGlvbiBTZXJ2aWNlMSkwJwYDVQQDEyBpbmZvcm1hdGlvbnNlcnZp
-						Y2UuaWRveGdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AJtxqpaLhnY5M+Op1rdKcu4Q+NKkG9xTyhrVyD3q6Ebd3F2z7Pq4Ul++dsMy+eWO
-						4KSwYjAFnIMS8uuuGCa9sagt9xHs/K2F5nGB+rAfkbW11LikdL9fuEmUc44/Qh1z
-						D85p0GLoMHVdfJJTK3atAbXY6MExGvYCrnB6GnmqU14HW2M6jR64pxopBRobpgHn
-						z3fH+ShiI57swZ3PQNSlpUjTM8oYNiBE8aiA9/4LdyBXK3MCZd2B8v6+OIcoJbB8
-						J5Xaqt/aUkMhAPZOgYTnvSwuj1vDnq5aKLJefw/ot2PvrVB60+v+ImP3OlMZ74qG
-						zCtl1ahe2V5j+d5uooOpZt0CAwEAATANBgkqhkiG9w0BAQQFAAOCAQEAYy1VOTwC
-						gb3FghRYG9j/2TXGBb1bBzZqjadF3xll1j9mRyKr9AajSSVWg+UrZGUVY3XRvBfB
-						JnNZwDWamqw0iFwv+leY3IazhRqSONOiJiRQSzwPbUBkRTiefjg2mUYQBXj3uZw+
-						OW5/UBFrqYN63pRYS7bK9fuAzda/3bVX+ySwp+GFoEatDd+3S8J07HaHWxUVcd3q
-						DYGFIWBoJhWGJbsYbjmnI+A4a1o356y+CnWR1Xz/EHtgkIt4ZRYtja1tUVh/F+wy
-						x9gf6TLgM8FeLWuNj4AIxVItjjDM76EyP63uGcJpkuRoyBY2IPoIv+h6lREA5DdN
-						S5PKEEUqwEK65g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://informationservice.idoxgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://informationservice.idoxgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IDOX Information Services Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IDOX Information Services Ltd: PLANEX</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://iis.idoxgroup.com/infoservice/index.cfm</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@idoxgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Helpdesk</GivenName>
-    <EmailAddress>mailto:ukfederation@idoxgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/infp-shib-01.uthct.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/infp-shib-01.uthct.edu-idp-shibboleth.xml
deleted file mode 100644
index 900dbf0b..00000000
--- a/swamid-interfederations-2.0/infp-shib-01.uthct.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,91 +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://infp-shib-01.uthct.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.uthealth.org/about-us/contact-us/" 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">uthct.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas Health Science Center At Tyler</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>
-MIIDQzCCAiugAwIBAgIUPrqY2FoL3o+Is2MLqnRmpQ3pMKIwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWaW5mcC1zaGliLTAxLnV0aGN0LmVkdTAeFw0wOTEyMTYx
-NTE3MTdaFw0yOTEyMTYxNTE3MTdaMCExHzAdBgNVBAMTFmluZnAtc2hpYi0wMS51
-dGhjdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfz4vaWker
-HmA0h6ZXOHYCQt1TpyUyq3/36EmA6xvjfA4Sg+/AUEoIL6MWuuI/UDT+OfiZ1m13
-NvkCcml2zVmCGqChpkPlBDAwrUwIVk5npsmcFo1ma6iVKCTOoBTikjCW+bg1r1n8
-d6YpRQZEajJiha4bs1hHjI+JdKbEnUWLoJQHujp+VqyuxhZXLL3wHJiSladVtgYv
-z3ItkscuTgAF0qe4zcHltZ//WChn9xt32h9BMe1y26a/qRxdb8kjMASkdOgP/APZ
-U1eAZEzY0y+fEO8fvd9u9WGYX1PqljR2E68GNhlZuuFYyFDT90lm6Sd+YXNxNk3b
-2VwQ78LuJSGpAgMBAAGjczBxMFAGA1UdEQRJMEeCFmluZnAtc2hpYi0wMS51dGhj
-dC5lZHWGLWh0dHBzOi8vaW5mcC1zaGliLTAxLnV0aGN0LmVkdS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU7VtVhXMzkf2nd29ca6BBH+sMG1AwDQYJKoZIhvcNAQEF
-BQADggEBAEzUrhm5VQuj3y2uEA9Y2vkOSfMkBU7BB7loLpF9EKtHpLS9aKp1lQgv
-zQSXyDWBDGAry3h+RPCrVQAf+BTomagR4/nK6gd0Vche7iZWmYxmGJPUfHHsxa3I
-/HT6c7SkJCOeoF79ZVWoy8oV+2oMn8ZuAabw2+winVnT7/h1H/1DO4jkQDrltnG6
-8yGwEGriQZIKzvKRs/xxc0ERuzVxf+Hz1qy5NJO6QEg/upCFgq8QByU+VEBRKEJ2
-tjvTYXIPtDwkjXDvnGNiDGXwEEhieOBfGdW8gNJoaFG1JIn4gS4yT+9vs88ujUbs
-jOT4n2SYHIFJfAfYw8JnSJ7PWVKQ4F4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://infp-shib-01.uthct.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://infp-shib-01.uthct.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://infp-shib-01.uthct.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infp-shib-01.uthct.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://infp-shib-01.uthct.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uthct.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQzCCAiugAwIBAgIUPrqY2FoL3o+Is2MLqnRmpQ3pMKIwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWaW5mcC1zaGliLTAxLnV0aGN0LmVkdTAeFw0wOTEyMTYx
-NTE3MTdaFw0yOTEyMTYxNTE3MTdaMCExHzAdBgNVBAMTFmluZnAtc2hpYi0wMS51
-dGhjdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfz4vaWker
-HmA0h6ZXOHYCQt1TpyUyq3/36EmA6xvjfA4Sg+/AUEoIL6MWuuI/UDT+OfiZ1m13
-NvkCcml2zVmCGqChpkPlBDAwrUwIVk5npsmcFo1ma6iVKCTOoBTikjCW+bg1r1n8
-d6YpRQZEajJiha4bs1hHjI+JdKbEnUWLoJQHujp+VqyuxhZXLL3wHJiSladVtgYv
-z3ItkscuTgAF0qe4zcHltZ//WChn9xt32h9BMe1y26a/qRxdb8kjMASkdOgP/APZ
-U1eAZEzY0y+fEO8fvd9u9WGYX1PqljR2E68GNhlZuuFYyFDT90lm6Sd+YXNxNk3b
-2VwQ78LuJSGpAgMBAAGjczBxMFAGA1UdEQRJMEeCFmluZnAtc2hpYi0wMS51dGhj
-dC5lZHWGLWh0dHBzOi8vaW5mcC1zaGliLTAxLnV0aGN0LmVkdS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU7VtVhXMzkf2nd29ca6BBH+sMG1AwDQYJKoZIhvcNAQEF
-BQADggEBAEzUrhm5VQuj3y2uEA9Y2vkOSfMkBU7BB7loLpF9EKtHpLS9aKp1lQgv
-zQSXyDWBDGAry3h+RPCrVQAf+BTomagR4/nK6gd0Vche7iZWmYxmGJPUfHHsxa3I
-/HT6c7SkJCOeoF79ZVWoy8oV+2oMn8ZuAabw2+winVnT7/h1H/1DO4jkQDrltnG6
-8yGwEGriQZIKzvKRs/xxc0ERuzVxf+Hz1qy5NJO6QEg/upCFgq8QByU+VEBRKEJ2
-tjvTYXIPtDwkjXDvnGNiDGXwEEhieOBfGdW8gNJoaFG1JIn4gS4yT+9vs88ujUbs
-jOT4n2SYHIFJfAfYw8JnSJ7PWVKQ4F4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://infp-shib-01.uthct.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas Health Science Center At Tyler</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas Health Science Center At Tyler</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uthct.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>David Nettleton</md:GivenName>
-    <md:EmailAddress>david.nettleton@uthct.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml b/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml
index 8663bbd7..8a09f2af 100644
--- a/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml
+++ b/swamid-interfederations-2.0/infra.clarin.dk-shibboleth.xml
@@ -1,35 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://infra.clarin.dk/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-10T20:41:29Z">
-      <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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://infra.clarin.dk/shibboleth">
+  <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://infra.clarin.dk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CLARIN-DK-UCPH</mdui:DisplayName>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">CLARIN-DK-UCPH</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das CLARIN Zentrum an der Universität Kopenhagen und seine Dienstleistungen für sprachbasierte Materialien und Werkzeuge.</mdui:Description>
-        <mdui:Description xml:lang="en">This Service Provider enables access to the CLARIN center at University of Copenhagen and its services for language-based materials and tools.</mdui:Description>
-        <mdui:Logo height="53" width="250">https://clarin.dk/clarindk/img/clarin-dk.logo.jpg</mdui:Logo>
+        <mdui:DisplayName xml:lang="fi">CLARIN-DK-UCPH</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Enables access to The Clarin center at University of Copenhagen and its services for language-based materials and tools.</mdui:Description>
+        <mdui:Keywords xml:lang="en">CLARIN Copenhagen Humanities research language archive tools</mdui:Keywords>
         <mdui:InformationURL xml:lang="en">http://info.clarin.dk/en/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://info.clarin.dk/en/overview/privacypolicy/</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>infra.clarin.dk</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=infra.clarin.dk</ds:X509SubjectName>
           <ds:X509Certificate>MIIDMjCCAhqgAwIBAgIJAOTsxgZuTQFoMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
 BAMTD2luZnJhLmNsYXJpbi5kazAeFw0xNTAyMDQxMzUyMjJaFw0yNTAyMDExMzUy
 MjJaMBoxGDAWBgNVBAMTD2luZnJhLmNsYXJpbi5kazCCASIwDQYJKoZIhvcNAQEB
@@ -47,58 +36,48 @@ lJQ23OvirmG7uktfsvRSFlagZgz2CrYlj1mnwhrMBgQP6sY8+8839WPRlXZYfnDt
 UWS6MXXLxx0YNf34tYMAy87THE7+IVOWzjqJKZN7ES6rOsQkWhtG1LVvkLY0e1AT
 HUQ3NG7ubyG1oGFMYqHkJY83aZGgUxsKcS2TsAkY5iz42ZhnHTZUTiu9GXyYdKDj
 8Uh2QptwTDlncmuRJL64djt9iKmLL2dDm1K38WLjQn2NwbWtCD2jLX3CvF3z07qQ
-CnbRCoj2
-</ds:X509Certificate>
+CnbRCoj2</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://infra.clarin.dk/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://infra.clarin.dk/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://infra.clarin.dk/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infra.clarin.dk/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://infra.clarin.dk/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://infra.clarin.dk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://infra.clarin.dk/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://infra.clarin.dk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CLARIN-DK-UCPH</md:ServiceName>
-      <md:ServiceName xml:lang="en">CLARIN-DK-UCPH</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das CLARIN Zentrum an der Universität Kopenhagen und seine Dienstleistungen für sprachbasierte Materialien und Werkzeuge.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">This Service Provider enables access to the CLARIN center at University of Copenhagen and its services for language-based materials and tools.</md:ServiceDescription>
-      <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="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="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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://infra.clarin.dk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Koopenhaminan yliopiston kieliportaali</md:ServiceName>
+      <md:ServiceName xml:lang="en">University of Copenhagen Language Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Palvelu tarjoaa paasyn Koopenhaminan yliopiston kielentutkimuksen materiaaleihin ja tyokaluihin</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This Service Provider enables access to The Clarin center at University of Copenhagen and its services for language-based materials and tools.</md:ServiceDescription>
+      <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.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="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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="administrative">
+    <md:SurName>Administration</md:SurName>
+    <md:EmailAddress>mailto:admin@clarin.dk</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Mitchell</md:GivenName>
     <md:SurName>Seaton</md:SurName>
     <md:EmailAddress>mailto:seaton@hum.ku.dk</md:EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>CLARIN-DK</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:info@clarin.dk</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>CLARIN-DK</md:GivenName>
-    <md:SurName>Administration</md:SurName>
-    <md:EmailAddress>mailto:admin@clarin.dk</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml b/swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml
deleted file mode 100644
index 885f8fba..00000000
--- a/swamid-interfederations-2.0/inloggen.hogeschoolutrecht.nl-openaselect-profiles-saml2-.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://inloggen.hogeschoolutrecht.nl/openaselect/profiles/saml2/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-24T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Hogeschool Utrecht</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">HU University of Applied Sciences Utrecht</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hogeschool Utrecht</mdui:Description>
-        <mdui:Description xml:lang="en">Hogeschool Utrecht</mdui:Description>
-        <mdui:Logo height="39" width="108">https://static.surfconext.nl/logos/idp/hu.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">hu university of applied sciences utrecht hogeschool utrecht hbo</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">hu university of applied sciences utrecht  hogeschool utrecht hbo</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/265c1f948fe360d0755dfd7310985bc0"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Applied Sciences Utrecht</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Hogeschool Utrecht</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hu.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/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/intarch.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intarch.ac.uk-shibboleth.xml
deleted file mode 100644
index 9efd7ce8..00000000
--- a/swamid-interfederations-2.0/intarch.ac.uk-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://intarch.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "Internet Archaeology" SP for the University of York.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-17T17:37: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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIETDCCAzSgAwIBAgIJANeltYZYTpEfMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYD
-						VQQGEwJHQjENMAsGA1UECBMEWW9yazENMAsGA1UEBxMEWW9yazEdMBsGA1UEChMU
-						SW50ZXJuZXQgQXJjaGFlb2xvZ3kxGzAZBgNVBAsTElVuaXZlcnNpdHkgb2YgWW9y
-						azEWMBQGA1UEAxMNaW50YXJjaC5hYy51azElMCMGCSqGSIb3DQEJARYWdG9ueS5h
-						dXN0aW5AeW9yay5hYy51azAeFw0xMTExMjQxNTM1MjJaFw0yMTExMjExNTM1MjJa
-						MIGmMQswCQYDVQQGEwJHQjENMAsGA1UECBMEWW9yazENMAsGA1UEBxMEWW9yazEd
-						MBsGA1UEChMUSW50ZXJuZXQgQXJjaGFlb2xvZ3kxGzAZBgNVBAsTElVuaXZlcnNp
-						dHkgb2YgWW9yazEWMBQGA1UEAxMNaW50YXJjaC5hYy51azElMCMGCSqGSIb3DQEJ
-						ARYWdG9ueS5hdXN0aW5AeW9yay5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAKtlAiwlls16Jrvc8GkLnMAufqCuUJpWkmNeBDkr2oumVYGXSwSC
-						J0K53uu6vfS4cSSWw7V9sO+Bn7Y6DM5TlVnXmkdKY9nG1x5Qomyh6YXdph0hTjUK
-						MV3UF0LR6k5PdGgKANikaorx9anM20BmfgC+tie38hi6D0rIijzLfAWmusQuTO7y
-						obgkFfmxYU7TY9Wy5llocZ5f6xpbzPPmmdos+CR0b4ZJbvMprROzXH+SfiUDLVeO
-						sd1XT8C2uz0ObeAVOVVixAZPdsgBhrw4lWaqdUKV7y2KJKscPbWaSx7puCgac+bg
-						sfENrIhQOeqRx2YMFwu8i5OUyXrLPSM4HpUCAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFH+bs5MZtwpOLOsrRQ66dYcr7DknMB8GA1UdIwQYMBaAFH+bs5MZtwpO
-						LOsrRQ66dYcr7DknMA0GCSqGSIb3DQEBBQUAA4IBAQAXCPGBG6YiQvzDdrEfYfbq
-						xHN4bQTnUoXN8PDnC8lktGOqjbijIiV+Ql522TP7NSm74f59gEU0ADY7I/4BhduM
-						WlDV+W3on0VIoktMWzcpyNy5VVzrf8qfuP4r2l9LPlPnyoYSPOf7pyI08BtgMqQJ
-						gNQicUUX04v2A2Rr92YLwFqQGC43DICo0+IG6N9GD6czWOjEgxMSb+t/NMJkLvIZ
-						Sgu0JlMLK1MlmSL3Lxn1TZbD/dkwzz9/+ke751F9WDRBQqA98rEoFYHmJ/KuKv6i
-						7hpWJ/uLvdYiGqAODCPZ76XQXMCSclWolY4WyBgIefP3bIncqOfsYaSe4skzsy0g
-					</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>
-						MIIETDCCAzSgAwIBAgIJANeltYZYTpEfMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYD
-						VQQGEwJHQjENMAsGA1UECBMEWW9yazENMAsGA1UEBxMEWW9yazEdMBsGA1UEChMU
-						SW50ZXJuZXQgQXJjaGFlb2xvZ3kxGzAZBgNVBAsTElVuaXZlcnNpdHkgb2YgWW9y
-						azEWMBQGA1UEAxMNaW50YXJjaC5hYy51azElMCMGCSqGSIb3DQEJARYWdG9ueS5h
-						dXN0aW5AeW9yay5hYy51azAeFw0xMTExMjQxNTM1MjJaFw0yMTExMjExNTM1MjJa
-						MIGmMQswCQYDVQQGEwJHQjENMAsGA1UECBMEWW9yazENMAsGA1UEBxMEWW9yazEd
-						MBsGA1UEChMUSW50ZXJuZXQgQXJjaGFlb2xvZ3kxGzAZBgNVBAsTElVuaXZlcnNp
-						dHkgb2YgWW9yazEWMBQGA1UEAxMNaW50YXJjaC5hYy51azElMCMGCSqGSIb3DQEJ
-						ARYWdG9ueS5hdXN0aW5AeW9yay5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAKtlAiwlls16Jrvc8GkLnMAufqCuUJpWkmNeBDkr2oumVYGXSwSC
-						J0K53uu6vfS4cSSWw7V9sO+Bn7Y6DM5TlVnXmkdKY9nG1x5Qomyh6YXdph0hTjUK
-						MV3UF0LR6k5PdGgKANikaorx9anM20BmfgC+tie38hi6D0rIijzLfAWmusQuTO7y
-						obgkFfmxYU7TY9Wy5llocZ5f6xpbzPPmmdos+CR0b4ZJbvMprROzXH+SfiUDLVeO
-						sd1XT8C2uz0ObeAVOVVixAZPdsgBhrw4lWaqdUKV7y2KJKscPbWaSx7puCgac+bg
-						sfENrIhQOeqRx2YMFwu8i5OUyXrLPSM4HpUCAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFH+bs5MZtwpOLOsrRQ66dYcr7DknMB8GA1UdIwQYMBaAFH+bs5MZtwpO
-						LOsrRQ66dYcr7DknMA0GCSqGSIb3DQEBBQUAA4IBAQAXCPGBG6YiQvzDdrEfYfbq
-						xHN4bQTnUoXN8PDnC8lktGOqjbijIiV+Ql522TP7NSm74f59gEU0ADY7I/4BhduM
-						WlDV+W3on0VIoktMWzcpyNy5VVzrf8qfuP4r2l9LPlPnyoYSPOf7pyI08BtgMqQJ
-						gNQicUUX04v2A2Rr92YLwFqQGC43DICo0+IG6N9GD6czWOjEgxMSb+t/NMJkLvIZ
-						Sgu0JlMLK1MlmSL3Lxn1TZbD/dkwzz9/+ke751F9WDRBQqA98rEoFYHmJ/KuKv6i
-						7hpWJ/uLvdYiGqAODCPZ76XQXMCSclWolY4WyBgIefP3bIncqOfsYaSe4skzsy0g
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intarch.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intarch.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intarch.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intarch.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intarch.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intarch.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intarch.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intarch.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intarch.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intarch.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intarch.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intarch.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intarch.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intarch.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intarch.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of York</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of York: Internet Archaeology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://intarch.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Judith</GivenName>
-    <SurName>Winters</SurName>
-    <EmailAddress>mailto:judith.winters@york.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Charno</SurName>
-    <EmailAddress>mailto:michael.charno@york.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 156d0e2c..00000000
--- a/swamid-interfederations-2.0/integration.wcn.co.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://integration.wcn.co.uk/shibboleth-sp">
-  <!--
-		This is a "World Careers Network plc" Shibboleth SP for World Careers Network plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://integration.wcn.co.uk/Shibboleth.sso/DS" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/UKfederation" 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://shibboleth.wcn.co.uk/Shibboleth.sso/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://shibboleth.wcn.co.uk/Shibboleth.sso/BAML"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFjDCCA3QCCQDY/5lx43eOoTANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMSIwIAYDVQQKExlX
-						b3JsZCBDYXJlZXJzIE5ldHdvcmsgUExDMRIwEAYDVQQLEwl0ZWNobmljYWwxHjAc
-						BgNVBAMTFWludGVncmF0aW9uLndjbi5jby51azAeFw0wOTEyMTYxNTE2NDJaFw0x
-						OTEyMTcxNTE2NDJaMIGHMQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8w
-						DQYDVQQHEwZMb25kb24xIjAgBgNVBAoTGVdvcmxkIENhcmVlcnMgTmV0d29yayBQ
-						TEMxEjAQBgNVBAsTCXRlY2huaWNhbDEeMBwGA1UEAxMVaW50ZWdyYXRpb24ud2Nu
-						LmNvLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvrf1ETn8BhT8
-						s52CBJ9LyGmGnTtM/C083rx8h3es5OxrP28+dAL4aD5OBtocpJDWhbtDBjYJKF8P
-						ZJOCK6AkmsRb/NoLifWNDcguwkhETSGjoYdp3CqmeSbaPsCsCqb3vRfP5OH/BXTB
-						vVv6NwfotXYsp5zTyQawyG2C/bMZk3bBjOlwZ0kKK0RjvAivfODIIylDsbueBvrL
-						5Te328/fQt+cmKHdpCLDZk0x8WUuEpcZIVrysEAivAQbQjddBZULs0nVnmacAjl0
-						LzwGJSkVxu2JhECPHh5KXvauTqD66ZC6PToNXX1b6gmW9N4SZH5X8C1vbltLTiL2
-						OzNKHY4ZhPsQmaZTcIhxNSJcypK0HwXxbGqodIqdLub7buF4ZiqXsocG0QQiDMsF
-						aMjjS76MpUqSrIEXtt8HsGlJeYvvSiuoU+US1YHMK3iKOycErKTM2eHOBUlijZ4N
-						42YCaI01PJrs/M0fvtKxsS9xl7BMg69gLpChTYYOy9ieMSiinfqRY/f5EWW9SePE
-						vrXliik8CBjhz5CIwdLbUTP6MM12WSFPYmNQJ2k3SgETi2uxSkM8CoJp2WH/8YOd
-						9Z+tvDCvyzcgJwBITet8kNq/GeFrl00CtYMC+zojnllzD7FQjAogE5SB0ibgi1dW
-						PBKuRgYISMVS+4J2wp9qEkjWL6JETdsCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEA
-						Wl7cp7aSpDSfHW35edbOQdDnJwPBhb61DtP2ypyLr5TXtCGUy04le6Isqa0n0JC7
-						Wjvm3mW4WmEKJIdijAV0ILdKLxdIpX7qyEbIY39S7G6q7867DxW4J0ANvo3B2MkM
-						n91Hj0ZeDie1Oiha9Ul94seEqz5/oxIvzUI7uULfBDisVzlnYJS/seXDBq3D0h+s
-						D6tZ4DIr6HrGqkb47heg+mwLgQBEpmB4x+qhAnkrTGE1Fw2OSPt3p/ayddRzdKQX
-						tk0si7mWSfWo8W1rfBuy0EErIFByBxGhtNq4Wlxf5yzt0Ln/T1KBDHTgilYqhSgQ
-						XvvgTcBa1pmiaRdZ5T6LT5hVybhpoFAm6xQecURFvXhlFHjK+H/Ia7H5Ecr1vcQq
-						LbD07pGwTVUcJAJ5VM5g2jfGzYCHlBiUPiE3J3Aj506duKDJZRwuDQfnl4IGG1ca
-						b9KTU0KPPBNSynKb++GcCyUtoknrMDGMSnfDcs2SsqzuFQHHA87p2ookjrC5z8//
-						mIdiC4GxRRby9bddF2uF4kFjGYhHGP0ELHD+McESSUPqfG1Ooyw7XRhgl+DRl8Re
-						9ARQE6+zAMp2Rx7N8cOYipc2h+eZF+jjgoCByAJiOB81x+/diB5UmCLwLx0u2BQq
-						2KalbJoEekyZZ3ki7yfgLvyquDs9xGAqGbQ7pVnYKHM=
-					</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>
-						MIIFjDCCA3QCCQDY/5lx43eOoTANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMSIwIAYDVQQKExlX
-						b3JsZCBDYXJlZXJzIE5ldHdvcmsgUExDMRIwEAYDVQQLEwl0ZWNobmljYWwxHjAc
-						BgNVBAMTFWludGVncmF0aW9uLndjbi5jby51azAeFw0wOTEyMTYxNTE2NDJaFw0x
-						OTEyMTcxNTE2NDJaMIGHMQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8w
-						DQYDVQQHEwZMb25kb24xIjAgBgNVBAoTGVdvcmxkIENhcmVlcnMgTmV0d29yayBQ
-						TEMxEjAQBgNVBAsTCXRlY2huaWNhbDEeMBwGA1UEAxMVaW50ZWdyYXRpb24ud2Nu
-						LmNvLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvrf1ETn8BhT8
-						s52CBJ9LyGmGnTtM/C083rx8h3es5OxrP28+dAL4aD5OBtocpJDWhbtDBjYJKF8P
-						ZJOCK6AkmsRb/NoLifWNDcguwkhETSGjoYdp3CqmeSbaPsCsCqb3vRfP5OH/BXTB
-						vVv6NwfotXYsp5zTyQawyG2C/bMZk3bBjOlwZ0kKK0RjvAivfODIIylDsbueBvrL
-						5Te328/fQt+cmKHdpCLDZk0x8WUuEpcZIVrysEAivAQbQjddBZULs0nVnmacAjl0
-						LzwGJSkVxu2JhECPHh5KXvauTqD66ZC6PToNXX1b6gmW9N4SZH5X8C1vbltLTiL2
-						OzNKHY4ZhPsQmaZTcIhxNSJcypK0HwXxbGqodIqdLub7buF4ZiqXsocG0QQiDMsF
-						aMjjS76MpUqSrIEXtt8HsGlJeYvvSiuoU+US1YHMK3iKOycErKTM2eHOBUlijZ4N
-						42YCaI01PJrs/M0fvtKxsS9xl7BMg69gLpChTYYOy9ieMSiinfqRY/f5EWW9SePE
-						vrXliik8CBjhz5CIwdLbUTP6MM12WSFPYmNQJ2k3SgETi2uxSkM8CoJp2WH/8YOd
-						9Z+tvDCvyzcgJwBITet8kNq/GeFrl00CtYMC+zojnllzD7FQjAogE5SB0ibgi1dW
-						PBKuRgYISMVS+4J2wp9qEkjWL6JETdsCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEA
-						Wl7cp7aSpDSfHW35edbOQdDnJwPBhb61DtP2ypyLr5TXtCGUy04le6Isqa0n0JC7
-						Wjvm3mW4WmEKJIdijAV0ILdKLxdIpX7qyEbIY39S7G6q7867DxW4J0ANvo3B2MkM
-						n91Hj0ZeDie1Oiha9Ul94seEqz5/oxIvzUI7uULfBDisVzlnYJS/seXDBq3D0h+s
-						D6tZ4DIr6HrGqkb47heg+mwLgQBEpmB4x+qhAnkrTGE1Fw2OSPt3p/ayddRzdKQX
-						tk0si7mWSfWo8W1rfBuy0EErIFByBxGhtNq4Wlxf5yzt0Ln/T1KBDHTgilYqhSgQ
-						XvvgTcBa1pmiaRdZ5T6LT5hVybhpoFAm6xQecURFvXhlFHjK+H/Ia7H5Ecr1vcQq
-						LbD07pGwTVUcJAJ5VM5g2jfGzYCHlBiUPiE3J3Aj506duKDJZRwuDQfnl4IGG1ca
-						b9KTU0KPPBNSynKb++GcCyUtoknrMDGMSnfDcs2SsqzuFQHHA87p2ookjrC5z8//
-						mIdiC4GxRRby9bddF2uF4kFjGYhHGP0ELHD+McESSUPqfG1Ooyw7XRhgl+DRl8Re
-						9ARQE6+zAMp2Rx7N8cOYipc2h+eZF+jjgoCByAJiOB81x+/diB5UmCLwLx0u2BQq
-						2KalbJoEekyZZ3ki7yfgLvyquDs9xGAqGbQ7pVnYKHM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://integration.wcn.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://integration.wcn.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://integration.wcn.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://integration.wcn.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://integration.wcn.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://integration.wcn.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://integration.wcn.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://integration.wcn.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://integration.wcn.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.wcn.co.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">World Careers Network plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">World Careers Network plc</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wcn.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Duncan</GivenName>
-    <SurName>Forsyth</SurName>
-    <EmailAddress>mailto:duncan@wcn.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Duncan</GivenName>
-    <SurName>Forsyth</SurName>
-    <EmailAddress>mailto:duncan@wcn.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 74fd02e7..00000000
--- a/swamid-interfederations-2.0/intranet.balliol.ox.ac.uk-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://intranet.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth Balliol Intranet SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-20T10:53:04Z"/>
-  </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://intranet.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAOwRlblp/LXWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWludHJhbmV0LmJhbGxpb2wub3guYWMudWswHhcNMTIwNDE3MjA1NTA2WhcN
-						MjIwNDE1MjA1NTA2WjAkMSIwIAYDVQQDExlpbnRyYW5ldC5iYWxsaW9sLm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwL6S+yOh34IjmsZs
-						TrXKdS8/zYgSAvWJeY3UcN3rMyzWwQYuLdZUl05bWVgBW537kFwnIBcYhgOnKGt3
-						RAJZozV56f6CSgPoZ4o2L88xEpKkoG6/o6N0Jkg29Ljxlm50NOtCb1UsV0BNFOXi
-						y7zrVR2fF/MWTSySj0HulN8FhbhOFhlIV2FQOsSg/C2aZFtvNghQJfxSG69kDSXY
-						LOwlCjEGGjnExfMW/sXvZdDR9hRRALQ6J1RMqTGegciqIp7g7brzKWbB+S+ki4ys
-						rPQ/3SKoK7Iof9iK+MCyV7A2mNc/DbcdzvTsRSfBYb0jThNzmSpfhgcRq6BZCVPf
-						H6sCXwIDAQABo0cwRTAkBgNVHREEHTAbghlpbnRyYW5ldC5iYWxsaW9sLm94LmFj
-						LnVrMB0GA1UdDgQWBBQ9zyb5zExfVTLeIqsAs7Q5I2aZTTANBgkqhkiG9w0BAQUF
-						AAOCAQEAWjRkul6zFV8UhblhJk5sdrkODZb+vtp7UYQpn77tgDl8ELZxLdHqG3K0
-						Xflyy9KNxBOg79k1sSveHVKrQ4J0VxBfXyIBZaJV3sal3v2Ck8nm6g/0NwdZRhV8
-						yW+7rGDdzYDShpxhRnbHTZ/prlR1fT0pbUFgmqa7ea4DyoOOZndZI/glh0LLjH1W
-						MRo3TPdgGytJBLS1Ii8Kgujc8zYy82yBtytw/iw6aqRFMK1jaVdDsDNW0fZY84C6
-						6EroyluFZnuwVFP5KuAz1NWnBKBqkboQyDgYhvIVQ9qYV3pykcWIyXzSCoixNyIE
-						k4rhTMQ1dT+zT8nwSPUV6q5j1PQYPg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 9c05cd0c..00000000
--- a/swamid-interfederations-2.0/intranet.hmc.ox.ac.uk-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://intranet.hmc.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "HMC Intranet" SP for the University of Oxford.
-	-->
-  <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="2012-10-02T13:11:22Z"/>
-  </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://intranet.hmc.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAIU8QGcz0dW7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWludHJhbmV0LmhtYy5veC5hYy51azAeFw0xMjA5MjgxNDAxMjFaFw0yMjA5
-						MjYxNDAxMjFaMCAxHjAcBgNVBAMTFWludHJhbmV0LmhtYy5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALpxFuwu20NkTMGvbkdalfQmgkqK
-						OYWin+c2AjcyEvYwu+ltFotD3VU0dwQcIIvKzS4lWf8oFY1T096/Xya+ghriVkLO
-						/W1pS0D/a/m65zhqLL4Lxm6QQNXWrzXMqsbzCIX/PsCB289VH8U9o+veby1MwqeD
-						/IEWkOvnbMo7XdM1NYTjGCbjXj/V1MPsX5MCKCC1qpnKTpLlKCM4IMQ7uyR4gpZ9
-						uOYbisoTB6sM5IHhZ1iEPnoMRUc+XVV/2PTXKYvmHFK0nK69WgJTqhHq8JpLDReL
-						WMTu1IBX2HkkD4lusDGHbjsnXPMPk667selsm+sdKGS6VZK8rcQeVoHGGmcCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVaW50cmFuZXQuaG1jLm94LmFjLnVrMB0GA1UdDgQW
-						BBQrgF2zSfUhkXvNqRmMVewVsB8BDDANBgkqhkiG9w0BAQUFAAOCAQEANM4f7Js5
-						kWP9l88MlcZED8jKgnUU6xzk2/cucL3NWMQHRf3tX5Zx+TQNmCQPrQQuOVnZGBGy
-						t0BsjUWnm5EL8L8S2zPacTEXTPwIWZfMCGgfU6ukzf/qOvEEI4HmpwEb3Cyct+kW
-						L+md/et04WByDCOYBpI8miBmImtD0ivT52Z5mkqAcQ4kkjI4mmDKux1Z2LE6GjBl
-						pdBX86sXKhJFK+sd+W8tH5MhXx/QeQOm59E4lTEqycQzWU1bdSi2wSsfpTdn5QuP
-						MG4F8FSqKxqBRa2o7IBGKpQEM+oUTCVgDCGI+CPT56LdiS12JrjrSyPxyNJ1f+q3
-						nulyyQrBNsg/BA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://intranet.hmc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.hmc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - HMC Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hmc.ox.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Boucard</SurName>
-    <EmailAddress>mailto:it-support@hmc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Boucard</SurName>
-    <EmailAddress>mailto:it-support@hmc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.merton.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.merton.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 91f92f6e..00000000
--- a/swamid-interfederations-2.0/intranet.merton.ox.ac.uk-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://intranet.merton.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Merton College Intranet" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-26T15:23:58Z">
-      <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://intranet.merton.ox.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Oxford, Merton College Intranet</mdui:DisplayName>
-        <mdui:Logo height="111" width="263">https://intranet.merton.ox.ac.uk/sites/intranet.merton.ox.ac.uk/themes/intranet_merton/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIJAKQRJD1xnl84MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGludHJhbmV0Lm1lcnRvbi5veC5hYy51azAeFw0xMzA5MjMxMzIwMzlaFw0y
-						MzA5MjExMzIwMzlaMCMxITAfBgNVBAMTGGludHJhbmV0Lm1lcnRvbi5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJp0mSk8QaA3c+pVIhXH
-						OqeLTK1d8dfufGu0fXb6mk3NEHlfh9kYV6Nil1S52S0OPpCoQpN9WqZoNxENwBKB
-						izzkZAZkQsA1v64lX1uVbHK3wIF9JS0im1quoeeRO8RKuHhjpUKzeXlWnW3lMLnu
-						2ej8mmIkNfRKXuCSUUXJiz5KScTNyE/0PiPfcRxDWpacxwOfu9g85sKyFib1gx/5
-						kQTGjABsts3PeAyg7SljCzA/U6J9ViLL19HttvHC+5NBu99amLA71JlR4zLp7W1v
-						XzAJg0YiKDI6KtVVnEmQwcruWYK3+dGpbdzevqXPQl2rQIKep2MxQU7A5M4xNFbx
-						WY0CAwEAAaNzMHEwUAYDVR0RBEkwR4IYaW50cmFuZXQubWVydG9uLm94LmFjLnVr
-						hitodHRwczovL2ludHJhbmV0Lm1lcnRvbi5veC5hYy51ay9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBQPWqo8KVCpXpCs58z3yiZxZ7aEXDANBgkqhkiG9w0BAQUFAAOCAQEA
-						N6g+njK3z8Em26gSbBPkb4IEbyvTfThDXOaQdut6Z483Vz5zVL1K+4VWVNTfD2wG
-						n1s86viBwlcPJJpn5odC1qFKQ9vQUgG7d6ThYlkbD1HSMa3oHYcZ1InASsULyXjW
-						uIn0LrsIj0VWZuRR1cn4yMJ39sFy6a+cF8ja3UlZasePp//1wk+/wuzV4jawCBKz
-						/1hHqxpIN9q/vDF9YJV6Ymks3ZOEu7fhzg5UufviWDbAAUmnvGalqCKytCyWKD1i
-						b3NJBlsPeMT6yUB7hAJFAejood7dtZsCUPn2IDv6f2bPORb1Y/KTI647jYeWY8T9
-						U2c4+fv9MNj3M0Of+23vCw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.merton.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Merton College Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://intranet.merton.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Cope</SurName>
-    <EmailAddress>mailto:simon.cope@merton.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Bowdery</SurName>
-    <EmailAddress>mailto:steve.bowdery@merton.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 0ba1d254..00000000
--- a/swamid-interfederations-2.0/intranet.sbs.ox.ac.uk-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://intranet.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Said Business School Intranet" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T13:50:10Z"/>
-  </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://intranet.sbs.ox.ac.uk/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://intranet.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAIouVk51M2UYMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWludHJhbmV0LnNicy5veC5hYy51azAeFw0xMzAzMjAxMTI3MTlaFw0yMzAz
-						MTgxMTI3MTlaMCAxHjAcBgNVBAMTFWludHJhbmV0LnNicy5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJSaQFswjc93gqeaMWkdXqZIm/2A
-						6WEVgInFCFHUPWLsPs/iiVhmDIOVNVPlqI85DqshRuocfPkwV7m/22J7b7tC1NnL
-						ArnTdE3Btb+BqDwZaQfcXP/FzG5JaTef2ktLljY1tyue6cIRPsAkSE9lqkl1tTwe
-						nugT9tu5hI2pio7lmN9NBx6Chxr6BDCLoYD+cRPy9lEcCpUenoIGNNg22xieE6Y2
-						Nc+URn/J+sxhbyWwBxDgByrMcFsBPsMdOt5p2topnysc07+CgZdM7uiswYBz5Aj9
-						qUeZF2gC+BtzaR/tOHyN8L57gzWOthH/e6hcS9l2CSE74o98gI0uEvX+GY0CAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVaW50cmFuZXQuc2JzLm94LmFjLnVrMB0GA1UdDgQW
-						BBS6ncz+YNbGJqBNWLnmu8GRL482ljANBgkqhkiG9w0BAQUFAAOCAQEAK/wwGRID
-						V3WbBMsPSYWm9iH47V35BxxjTA45d6/lfbkFb4s5DD2FwD+wPubcri2s8cz289Kh
-						h9j9yj0Y4msbvYOzioA2xvayntydLgwNjky1EqpnIn6Fv/Atpuq+rt8+CLYZQPHD
-						vsmmQuZ7aORWFNPFIM1Ga51RurF2i83sKH5e6wYIWWx52d64DQfwa4rD9jrfurbW
-						sS3dlTasQa1eAmqc8L/WbrFA7NAV8W0lvldrz/n/iljP9P/C1E4isf14+nQaBUlb
-						PSLOQrLs+FvAmj0LpfNiX0FaipT5pKGuXV1Vmb7SKrEv9ecuOjMhpfcwfOoU2jWA
-						EknFc192G29Now==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Aaron</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index f2eabcfd..00000000
--- a/swamid-interfederations-2.0/intranet.wadham.ox.ac.uk-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://intranet.wadham.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Wadham College Intranet" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-11-22T11:59:50Z">
-      <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://intranet.wadham.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAJUJ+mlkoDXOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGludHJhbmV0LndhZGhhbS5veC5hYy51azAeFw0xMzExMTkxNjQ4MDdaFw0y
-						MzExMTcxNjQ4MDdaMCMxITAfBgNVBAMTGGludHJhbmV0LndhZGhhbS5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1hB/bg6UfaT/XuBowU
-						VPZMqkb8Po4FYgkF3hO52To/bqnCdsalOx/XLfZ4HA09I14q8f0D/cWCYEYtOnVr
-						VY2hXOFO6YaRKWzQI8F2zHnAgkl9ytbWNqqIMQ6TINe96RCNV22ZZR/uOMQAiXwg
-						yyxGiQNquo5+vMKhLITbnQTJ/h22K0/DzGH0YF0PvJc/nu/sZMww6FxcdwvEpfzT
-						cK1WkSeqs4mHmrL1pi8VJTETFFZ8WGJZ2q8ueDloMFKfCa6S2fL2QuzXWbOpRDoW
-						qC/GpTJDfY4Zi2sixl9dtPlzETR0eOcRtuocv9q+K3JcypWIuy7n4Kr7ZbHYSEn9
-						DbkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYaW50cmFuZXQud2FkaGFtLm94LmFjLnVr
-						MB0GA1UdDgQWBBRL8H7cVFCFP5rpqrBDxU4lUQ/0LDANBgkqhkiG9w0BAQUFAAOC
-						AQEAOW8FQM1uFKk7chAErvTO0wiXvoVubVL0nqvA38zW1QNGFsJ9DjylIE7ijVvu
-						ZhvN9mSMl5j3T1UM0wOBw+ChBCNhHMmCLtyZsTwGA2fnWR+HXCcZ98A45/+7JI84
-						gdxPXpQMcNcP5VTP2scCQ5k4I2R2985N7NVU0DiqeMFeLqgAuwnuouv+RDioh5HA
-						ZJlfdbEsApOe9P5VcHAMbIUIGMpLu369MEomRijiAf/R0VuF84TDX6UT3xzg18kx
-						94ZMLY2ekb/Sv1LxRNNJ/leILLJJxXJunf2rk1wYhUMoq2lRPSkrGVMMu/H5c9fe
-						NCo2Q3oQaG5ZPA9VV7LCeIfm+A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://intranet.wadham.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet.wadham.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Wadham College Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wadham.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lee</GivenName>
-    <SurName>Wootton</SurName>
-    <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Wootton</SurName>
-    <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 57f2c56f..00000000
--- a/swamid-interfederations-2.0/intranet1.balliol.ox.ac.uk-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://intranet1.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 Balliol Intranet 1 SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-23T16:59: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">
-    <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://intranet1.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJANtuMW21siCKMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGmludHJhbmV0MS5iYWxsaW9sLm94LmFjLnVrMB4XDTEyMDIyMzE1MzU1OVoX
-						DTIyMDIyMDE1MzU1OVowJTEjMCEGA1UEAxMaaW50cmFuZXQxLmJhbGxpb2wub3gu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXqpKnpB86sI2f
-						YyXP5xx7UOIuKbes/RrYkncKSmMWE8uXd1yvRlcFaV9WESLV60t1ikFCKtruLGGY
-						6RAF6DQ/r4r+hRKxuAFswxjRmC4OOR5xGJnbrnso2OZXoj9rAJlAmi/4wNo3DOEe
-						KSgBM3hARnv2JEVx4qL5cTypoWGMyD3WesCVG3KakHxDjs33/jBTeSe9NS+xpSSv
-						LPGOWNHwBeOeMQX1YKnZOd/TXx6cKa3V4KS9P6tkTrYCWPydGw7mQ8aF5Bc4zr8T
-						edj/6ZyIrKmGaKqlFev+tv/CdSRXVdSRGmNPVViffa3GbH1YKmyM1Xo305MlRYQD
-						DofCRc2VAgMBAAGjSDBGMCUGA1UdEQQeMByCGmludHJhbmV0MS5iYWxsaW9sLm94
-						LmFjLnVrMB0GA1UdDgQWBBSNpnZI8DCyHFQzH7BeHXu0mLJP4TANBgkqhkiG9w0B
-						AQUFAAOCAQEAbeUAlzJ0gH6h2pPy+Nr2/n4AHqSwKkwhbwBCuRcKPwy1krCfnYL9
-						Y5V49NjBhZeGAH/IHi07tR8u5c2dUQyRQw6T6uqJ427rWCtgXnL1QgHZXwXV+K7Q
-						pBhdnwxYgbRRyXo/WMSCH3NRFeAxOFrY9HhA2XHbUfBBrjzAnT8YhaNK5Aadw12X
-						3Zo9jNZl9JZafaY0MPE5nRJMZa5eKXpwkjZqh5oJsPfx5lVxS9GkeR9Z/Y5h3ejN
-						GtgjT6jUqydjKMm9CYdL/rijp53LywBZwuQwoABOwwG91MwjrbwXRaw9BcK05VaI
-						LAXaNqQTfqwaHXaDqprLhpetEiURD1WEyg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranet1.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Intranet 1</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index fa680a15..00000000
--- a/swamid-interfederations-2.0/intranetdev.balliol.ox.ac.uk-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://intranetdev.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Balliol Intranet Dev" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-04-15T12:10:41Z">
-      <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://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGzCCAgOgAwIBAgIJAI5vRYCws2FVMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-						BAMTHGludHJhbmV0ZGV2LmJhbGxpb2wub3guYWMudWswHhcNMTQwMjI3MTMzNDA5
-						WhcNMjQwMjI1MTMzNDA5WjAnMSUwIwYDVQQDExxpbnRyYW5ldGRldi5iYWxsaW9s
-						Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtMyp0j7Q
-						QH4qKNg/mYxxkTP5lRgV8pEl8vu9nl8LxE4faJpL8+QxAQoW7Yw88EFjBfcc5O/O
-						hV31cOb3FlhBt30NDeoE7ik7wSmduVmeS5TUo+izAzjcdM109FGFkQMZ78bkefFC
-						c3S5b6Axqd1JIzkm5n9z30q3h5LIWKCvWjlW5KXDeDyGXWxbzj3HnXexXJ9os8m2
-						eDqr9TlKpLWU9zesJ5rXh0GU/CE33ryqRCx52sxBsZas8qevzmE9vfKi7YbqMD1+
-						HUYZNK3PyNV4GQFa8avYHf7QNfATiAbz39QPY0JHIDOiPwgcmgiou+Jhxhcy7ZUX
-						4z0C4oJwUo3fdQIDAQABo0owSDAnBgNVHREEIDAeghxpbnRyYW5ldGRldi5iYWxs
-						aW9sLm94LmFjLnVrMB0GA1UdDgQWBBQOQYNUMVsP1jC9dexfFq+RNkXwqjANBgkq
-						hkiG9w0BAQUFAAOCAQEAkw8XWWT+TWzs62pcUR1uBmHFpJ0tf2WSwlnIo9Dr3Vj4
-						x3yjAV3L3PWjOOMQ2hTGeaMhiAdpcA72tgcrwcRkFcucDahpCAKo7BP452nem4sf
-						y64vJrMFgh0sRH5XAIKhygLhm/A5gDU7rUI/QKaxgKut3ODMoy55YTWQq5u6J/ul
-						JxlRyjtfdq0hjkIbKTMa5YSd8FBH8ymgQuVKdA3FuGfAjbrtCgmYDdb7HGFKxnQ7
-						hfD6/CA/f85GY7EYDdnji9q+RnLnkfGPqwh0p3kJXOA245d3zlLF1uOud8XK2vvR
-						fjCDcSlVMXyh2hrW1XKa208JjXg3T5XCg7kENrTk1w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://intranetdev.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Balliol Intranet Dev</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Balliol Computing</GivenName>
-    <EmailAddress>mailto:computing@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Balliol Computing</GivenName>
-    <EmailAddress>mailto:computing@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/involvio.com-saml.xml b/swamid-interfederations-2.0/involvio.com-saml.xml
deleted file mode 100644
index 630b38b0..00000000
--- a/swamid-interfederations-2.0/involvio.com-saml.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" entityID="https://involvio.com/saml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">Involvio</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Involvio is a student engagement platform</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://involvio.com</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://involvio.com/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="319" xml:lang="en">https://s3.amazonaws.com/involvio-production/involvio.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFUDCCBDigAwIBAgIQCC0M0Kc2/YNjE4dQDyg+EzANBgkqhkiG9w0BAQsFADCB
-kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
-BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
-QTAeFw0xNTExMTcwMDAwMDBaFw0xODAyMTQyMzU5NTlaMFoxITAfBgNVBAsTGERv
-bWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UECxMTQ09NT0RPIFNTTCBXaWxk
-Y2FyZDEXMBUGA1UEAwwOKi5pbnZvbHZpby5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDjzjTs8dOiIjzEvl98qBzWE/ppFyPDHV1SAmIkb9xitP0t
-xr6hsuZ+UM+m2Q+L2EdD/0dbombUDUtDuqK1Zq5jYDb+y6pk1A4w0JdaJQTBPjBu
-ojk0AECw+l/+0zC9LzXdBnTyEpd4gYtzYZyKNukIiDbySOEgN/vpi5M0Ssh23Iyd
-zz72P4JoWSTCF9Rdncp+iksGFzwYRknKCoiZZNjjMoPs8oW5p6IkSp9SwDCOM+7s
-sRPhPOxOgtXiq/6hlCIa1fpRKhUoS7qqiN58wCa3P9KQNZ7uLiZz+z946KrpnLbl
-kcqi+CXXVtH4zjxfPpCGlB+pNq3lX+0+DGmS8j1JAgMBAAGjggHZMIIB1TAfBgNV
-HSMEGDAWgBSQr2o6lFoL2JDqElZz30O0Oija5zAdBgNVHQ4EFgQUPyRkwXM3rarn
-YCqtwjuAjLZtNXgwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCME8GA1UdIARIMEYwOgYLKwYBBAGyMQEC
-AgcwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMw
-CAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2Eu
-Y29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmww
-gYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21vZG9j
-YS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNy
-dDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCcGA1UdEQQg
-MB6CDiouaW52b2x2aW8uY29tggxpbnZvbHZpby5jb20wDQYJKoZIhvcNAQELBQAD
-ggEBAAjlGQXfaBd54KeICKV1LTcsoMlC35yAyPPTaRFAQdGuOZKYjYjPzdY8wc84
-Pvi2Il8beElLRbj26mth9jxvMDSr4F7kGVoQJ1ZN8xOh+zzNUYBECXxIX7G9DdWm
-MY5fYqAf+oHuuIhbvnjdG0A1xrQIP3X1yk577aYjTYti9hD0reN3ZDrp4JzYe+YG
-jP/CprjIL/d7DaruZFiSmnfUa1FeOryhuKzbqcm6GpV0tzfsNT47kpngsTtTK1Cy
-4+OA7UVWic/3LCX+lQkFzRWGgvOikUp1phZ18NFpS3ak/c7H3teur2CFfpWTKdxz
-GF977KpzHlIAUY/y8JmOWhaTjR0=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://involvio.com/saml/logout"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://involvio.com/saml/acs" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Involvio</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Involvio is a student engagement platform</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"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Involvio</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Involvio</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://involvio.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ari Winkleman</md:GivenName>
-    <md:EmailAddress>ari@involvio.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ari Winkleman</md:GivenName>
-    <md:EmailAddress>ari@involvio.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Ari Winkleman</md:GivenName>
-    <md:EmailAddress>ari@involvio.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Ari Winkleman</md:GivenName>
-    <md:EmailAddress>ari@involvio.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 0c524d6d..00000000
--- a/swamid-interfederations-2.0/ioe-shib.hosted.exlibrisgroup.com-shib.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://ioe-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is an "Institute of Education University of London - Primo" Shibboleth SP for Ex Libris (UK) 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-16T14:50:58Z">
-      <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://ioe-shib.hosted.exlibrisgroup.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://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Education University of London - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Institute of Education University of London</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJANemOX300yXbMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMDEwHhcNMTQwNjE2MDgwNTMzWhcNMjQwNjEzMDgwNTMzWjASMRAw
-						DgYDVQQDEwdhaW8wMDAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						3COtFzBkSfK1KCO/jH0lzKjiIrHOlF+RFmElA6xvQiDv4chS5BXhekHcHw3Z1Gxv
-						KzRA4631UsQDghhrSItEzmrHEYQfequz/x/b9JGFZCCfbMIvsZkaUe+8Aj+s3LC5
-						H5VAtO93PEvuERxTv3p2xx3sz4CxY66u3WnWjPzMagfYZ8EcOekfLECoKXPiKVzo
-						X0qja/oBlCQczODQIbDJcB4wNCcphcQz2vMMN6ReFBVQLVVMqy9vnXE85/rUDl6w
-						57KBsTmIJVs9XRgpdALB97lYekbx0fT855/NiBNJJs+/UvL10DCrjvX463x6iDTy
-						M9l/Cfh4fVx/8YjlyOUHPwIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDAxMB0G
-						A1UdDgQWBBRGl7/0TzLGNLSOnXLqSZJ7CiZcxDANBgkqhkiG9w0BAQUFAAOCAQEA
-						Ak/tINf0uXC5Vuhd72Rk3l+LuSAzSU6dVjsI5HLtiP5kCbEJ1lwoI5OlTv/S2n1D
-						XlxhUeuRRJc8cQ8ThpUgMOJacWUT3CP49EgbtYlBth/FaOjoz6nFO7pku1ESIKaK
-						DDCOMIav5NNhcpg/0Hj1MRjkEirS06KvFmXxk9cCNX1RZCuiGJ2VzIgTzkJvlMD/
-						bfYdtTbiKqgJw24mmX8WL8qqpwc1lSmWXikUYB5smGzrg5XxxlGoJnK/iO/VP6x1
-						YvAe8GMbg+SIR/OH7OnK2mZAAmwA+Ec7OPJ3ryuqxLuV+qPNFBFqKYb3VNqn+/s1
-						JQxu5wsZ5HTxB1jpsbsKBw==
-					</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://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ioe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Institute of Education University of London - Primo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</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 f0e5d832..00000000
--- a/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.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://ir-lan-fid.images-et-reseaux.com/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACS0lEQVQ4y4WSzUtUURiHn3PuuffOlIx9oGmOxFAaipuiNhVtXLQQalHbJEN3QSSI/0CEIS5C+oCgVbQyoTZFH5DYIsJNZopNgSmKmlqmM+O9d+a+LWZUHAvP5ny9v+e87++8SlLLtE7E+mdtqmNlOfba1uLd3Y+7ofFtGFZiWYodhxrMrZ4+0ynUnxcSF2WoF8lI6Q3flx21WuaSyKqHNWlBqgb8BL8/xsiwbIfhzo8bKT+MJGZOjU7e+jTOARxWKPXSaZveV66VRbw0KL2pEMA4iFJorTDKS3M7UtW2+MEbiQbTxCur55vKhxv7k8d5n+VlNGYCxwUpVLOWxb5UOXbnBLUvMhkh79BALt3woCs68nMQPIeh1ueUNg901NyPd+u+DkKVgUIoOUNn/BtdD0cnVnKSMACVQeDXvFmIJt1avEAz1w9Os7fr3Nh3vgwfJBXdLOEXhl/vstCzElICBkCUInQVGAERdAQUSnJGoVxBjOCjSANYChcfzJoDBQCynmHxtylEFCk0TeEszQuvSaSWCADSPTcjsXWAWteqIoiAyu8zPyyO9i1Rf2FKYeJ4WYjYCr09g6LOk/VJ0AI5MweSFwNsuiNqewZFvPzS3nKmN27+1fIbPPlPQMGDWT+wsyg8FGAhgKC1L+ApRYAm2ABs7W8juTUefXWfjk+NX/5T4bAvE6A1lPA5eaXi5PSz+cmqxf0ux5jBB6BsKyDQLldjM8201+3BRAJCMRw6O7jgXX/ScqR/peVaXRuOExDU2jTcaw+kCqM3y/kLc/Hvm8C2SvYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MTMrMDI6MDApetg1AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjEzKzAyOjAwWCdgiQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.images-et-reseaux.com</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Images et Réseaux - Pôle de compétitivité</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Images et Réseaux - Pôle de compétitivité</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.images-et-reseaux.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sergio MORANT</md:SurName>
-    <md:EmailAddress>smorant@images-et-reseaux.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/isls-shibsp1.wmin.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/isls-shibsp1.wmin.ac.uk-shibboleth.xml
deleted file mode 100644
index b58d123c..00000000
--- a/swamid-interfederations-2.0/isls-shibsp1.wmin.ac.uk-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://isls-shibsp1.wmin.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for the University of Westminster.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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#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"/>
-  </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://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIRAKcKlpWKeiQ2JgZOpQd7r2EwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAzMDQwMDAwMDBaFw0xNjAzMDMyMzU5NTlaMEUxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXaXNscy1zaGli
-						c3AxLndtaW4uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq
-						Sxx+9Zm7n7ts0gcLBL/GQZP56I05X3MvQlwpUBuA9yklTUwj0pqHoFA52djvPQ0B
-						qQQHkIfn9oasbC5W9RoDWfLYgFKYTx3Hat8eXz+qBYBUBvjRSVbCvwcIuKPwkOYd
-						jLhbwhzBKQjJ2IRWFt7/+fapP5pD1GH0ONYi8CGGYl2GDq3PR5q0vY1138k929Qf
-						5/usrmB8gS+dWP3YDFtZHVSKAPJPRTAYdxrXu0oNljNoCe1qYzwjCQ8PaFiblrD5
-						XwdDgzpVTIsIcNvCqlzSQLdonuL/PNsyX1zp6ZVE0YK+MwHY2PHuLAvAelmJuev7
-						Rv6RvrK9/aqow00uvGjzAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
-						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUlraHm+YFRDr0FiNFsq5kX8EU4ZYwDgYD
-						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF2lzbHMtc2hpYnNw
-						MS53bWluLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQAlJVMwZfnCbDGZ6tRoWcv/
-						9SsLIpuq3Qqz0h0Yj0UdsIQ8PN9XSf1XIQj4pcNA1l1vktjPtPj6NKihliOIyZse
-						shUfTdaZW03i6lEGiluEUptYKDnIOx37EPJjzv/LqLNGK9Pc6RaPn3tsWF7SXMxw
-						7w749ND4CQlVRFyrH5eYy9RhrKWjr+dA/wvnx+Zd+6+KtsqrAA3nn+LHyrGKpx1o
-						8lNuCyzYaYjhVk66P94RHX24e+pNbKMB8rgrY3yDCduz+RTpfpei2zdyQ7ozhrsC
-						axbN6Uoxykqr5+rRKWbZi38xg9VP+mnAXiGvl5s+v2hjV6Gq2/orQwDLhV+b40U4
-					</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"/>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID2zCCAsOgAwIBAgIJAM1xo75otDN8MA0GCSqGSIb3DQEBCwUAMIGDMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMSIwIAYD
-						VQQKDBlVbml2ZXJzaXR5IG9mIFdlc3RtaW5zdGVyMQswCQYDVQQLDAJJUzEgMB4G
-						A1UEAwwXaXNscy1zaGlic3AxLndtaW4uYWMudWswHhcNMTYwMjA1MTYwNjIwWhcN
-						MjYwMjAyMTYwNjIwWjCBgzELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xhbmQx
-						DzANBgNVBAcMBkxvbmRvbjEiMCAGA1UECgwZVW5pdmVyc2l0eSBvZiBXZXN0bWlu
-						c3RlcjELMAkGA1UECwwCSVMxIDAeBgNVBAMMF2lzbHMtc2hpYnNwMS53bWluLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA87MPCioFFzb84Nwz
-						xLdrDIQ1Fg8yO0ebBhbCEypLTpVELYcgDH15l3laIfptUq9dAEmVJ3kBcQj1UKAD
-						s6rthHOZdYzvcGpUQadWJ7fc/yn2vdLVJ6iCokTdjghhUqNvCZLujKjW5pUwDDmT
-						YrEFbjdROyCdO7ax4t72J1lOHlPoBAHcVPfhqZsxdTBHuvDeFsibAgH3kySXHZw3
-						2llxzCbnlKhnzOfv16Jo6QIiYL+8ZHeJkjcMLIV0J5pq0blh9n4FwxHrQ5APw/qC
-						B8yq3spq9SRgRaddSmWFwyqBskjETs+z1/ehCGQg+uc2cAEK6UCU+Uku6KXK+AHR
-						CEz+TwIDAQABo1AwTjAdBgNVHQ4EFgQU21l/iq0bQE7MtZuEQ3oQ/LGTBUswHwYD
-						VR0jBBgwFoAU21l/iq0bQE7MtZuEQ3oQ/LGTBUswDAYDVR0TBAUwAwEB/zANBgkq
-						hkiG9w0BAQsFAAOCAQEAb8mdosnnFppdb9vvvz4bN4nUIv0F19FSu1gzVdWSSNin
-						n5FEoTPEGtSE0yivy2l56q2oMtsV0gLXJjNyqbyB4OYzH09jiR9p4A/myqhCis62
-						XF8y2KWL+FomfoOu8Z7MN/x+Hn/kuEmrsdlsqPuo2yODSb+hXKhVe4EiN+Wj5V90
-						4bJsQZdr4VVEoySQ0oQWobB/BWYQwJU3Hgsk8P7Snnt6afIcpaCXWHPcj9v3ks+y
-						OFzmfkNPF49EO97PUM/tItM11zTRWzZ/O1xOXiTQlGUVBC33PU1SGLvPy+sf80yc
-						4IPkBOq2AQG2oSGblk2hlDpCvRTYsSikik5D+3SlvQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://isls-shibsp1.wmin.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Westminster</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Westminster: Shibboleth Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wmin.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ann</GivenName>
-    <SurName>Munn</SurName>
-    <EmailAddress>mailto:a.e.munn@westminster.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dave</GivenName>
-    <SurName>Marriott</SurName>
-    <EmailAddress>mailto:d.marriott@westminster.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.xml
deleted file mode 100644
index c7090891..00000000
--- a/swamid-interfederations-2.0/iss-openathensla-runtime.swan.ac.uk-oala-metadata.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://iss-openathensla-runtime.swan.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Swansea University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-16T13:09:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">swan.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Swansea University</mdui:DisplayName>
-        <mdui:Logo height="25" width="80">https://iss-openathensla-runtime.swan.ac.uk/oala/images/uk-federation-branding.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://iss-openathensla-runtime.swan.ac.uk/oala/images/swansea-university-icon.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDxzCCAq+gAwIBAgIJAKaRp6YdpxbFMA0GCSqGSIb3DQEBBQUAMEsxGzAZBgNV
-						BAoTElN3YW5zZWEgVW5pdmVyc2l0eTEsMCoGA1UEAxMjaXNzLW9wZW5hdGhlbnNs
-						YS1ydW50aW1lLnN3YW4uYWMudWswHhcNMTQwMzIxMTAzMzI5WhcNMjQwMzE4MTAz
-						MzI5WjBLMRswGQYDVQQKExJTd2Fuc2VhIFVuaXZlcnNpdHkxLDAqBgNVBAMTI2lz
-						cy1vcGVuYXRoZW5zbGEtcnVudGltZS5zd2FuLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAxSGK+XQQj0yhGBm/ig/1JYcAKjOblBds1+DH85ub
-						1MasaxAq+Wxo8PkneHtsBZVagc+7mpUjH6LrQBVY2ltWNz8w1Lw3bEIFvkvHrYYb
-						+DzMI6vBpyRlGgwZUTQpSFsHUrkEJmS7Y2lGPRCOZGFduvQwa85BmTciympInFcL
-						467abYfL7YCjjvjrAL0A7T5v91UvfLkqkV0ZwLWCzs/vZH2z7zd24t4FqsX3DLnA
-						EWFaLSmgdP/EEaSL1XHRV7rBEpyNe9aPjYIeL8Y0X0Wm2KHUu/L4er7Rwd6BcVLg
-						74CDPps4QC3cfRALzllx/4UiBFpftJ7OTEU/h8A47kl/awIDAQABo4GtMIGqMB0G
-						A1UdDgQWBBRta2Fv0weameEGf4FV4KhhXCwFXzB7BgNVHSMEdDBygBRta2Fv0wea
-						meEGf4FV4KhhXCwFX6FPpE0wSzEbMBkGA1UEChMSU3dhbnNlYSBVbml2ZXJzaXR5
-						MSwwKgYDVQQDEyNpc3Mtb3BlbmF0aGVuc2xhLXJ1bnRpbWUuc3dhbi5hYy51a4IJ
-						AKaRp6YdpxbFMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIr4duye
-						2F9oXAkfotF0kQdAKR9a2xgbsx/qQiKPyuk2QGucPeY1Aw8XfkLcgfw7GzFU8EVf
-						3h8Bwu53/UinLh3xOjZxbzPA+Pj76PfkPV9aZNTpE8AZeHM+BTBj94/cNN3CYzWc
-						w6Yiz84MqktGMLyScDPi0bKaoLRd5hrzbbu2Uu9ohmVhP9MDMKAFOYuVel8xiat9
-						51jvG6uRFNoAE6W4So601BjZMsvOAzUjnTpkdwVBtCRhf8TOlO2JMZN1GaqbzQjC
-						hbOM1aMGtZOY6ba1luEWp7tuBHQGIdBHJaZyLUjiYpSDquuiYm9oZai2NIksjDq9
-						Yjbfp1B8p/YQJQw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://iss-openathensla-runtime.swan.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://iss-openathensla-runtime.swan.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Swansea University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Swansea University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.swan.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nina</GivenName>
-    <SurName>Whitcombe</SurName>
-    <EmailAddress>mailto:N.Whitcombe@swansea.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Brown</SurName>
-    <EmailAddress>mailto:A.T.Brown@swansea.ac.uk</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 165bc423..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://itacare.bahiana.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://itacare.bahiana.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itacare.bahiana.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://itacare.bahiana.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itacare.bahiana.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://itacare.bahiana.edu.br:8443/idp/profile/SAML1/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">EBMSP - Escola Bahiana de Medicina e Saude Publica</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">EBMSP - Escola Bahiana de Medicina e Saude Publica</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">EBMSP - Escola Bahiana de Medicina e Saude Publica</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bahiana.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.bahiana.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Claudio Santos</md:SurName>
-    <md:EmailAddress>nti-claudiosantos@bahiana.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ffaa5a2b..00000000
--- a/swamid-interfederations-2.0/itacare.bahiana.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://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>
-    MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxMzAxBgNVBAoTKkVzY29sYSBC
-YWhpYW5hIGRlIE1lZGljaW5hIGUgU2F1ZGUgUHVibGljYTEMMAoGA1UECxMDQ1BE
-MSEwHwYJKoZIhvcNAQkBFhJudGlAYmFoaWFuYS5lZHUuYnIxETAPBgNVBAcTCFNh
-bHZhZG9yMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMCQlIxEDAOBgNVBAMTB2l0
-YWNhcmUwHhcNMTExMDA2MTY0NjU2WhcNMTQxMDA1MTY0NjU2WjCBqDEzMDEGA1UE
-ChMqRXNjb2xhIEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYXVkZSBQdWJsaWNhMQww
-CgYDVQQLEwNDUEQxITAfBgkqhkiG9w0BCQEWEm50aUBiYWhpYW5hLmVkdS5icjER
-MA8GA1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEQ
-MA4GA1UEAxMHaXRhY2FyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AK36i3sMlMwST5eW2ecBJJBkUz7Yu+MGyp2gDy4M4S7Tw7aiAo4BFYrbpN2UmhIt
-0vc+l1Ci0t9szr9PlNmg9fiHn6hqxDhMgWxD0Ce/oK+GYmdd6h64zVieWvW+1FTU
-w/uq9B1g9Uj81vpVsxGkM7FeFsgVKNpeW+yJNoT1hp/lEUky3bgl9z2/VDk5sBop
-EzfroSosr4WDFZFVSNQFfG8kdJF426c2jrLNDIJXSwqmS/DQP8heF1CxqFCm+A5x
-+4tpY4At4p2stqDncERdVGISPpWGlqtG4Mbvmgz0W0Hj2f6jhJehYP6eiPZgjeW6
-EmpUdXNqWgFl40BSG9cs6KECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAE5n+Yf8x
-SMAk6Sj2la08iXsgUUTPvoWZub8ajJwoTdKxBQfuBt+HdGCMsGhjOgHFhtqHGIc4
-mhLzKeqBs3dpafCKAkhJrMlQeTuUfZRu4YhsC1+ZmYu6BT2/W08TnJrgZ82KwakQ
-f7LN7rf1E6WLMaoA7E/cOVthvrdhZh9kU42mRSZykKqT+x9hbEhqczoBzKITpBjX
-L1w1kIsitIT95av4pdJf9X0zQVpguSCYcR6yTb2qKwlLlwiWXDKqO4nw7rymGoDD
-95ABrbcH/Qx3S7t1vwXXA5s8W2J58dQwwq7B9LnSxqXjvczXv6oPwUxRtl3hxKTK
-f11XT7vSPYxSFQ==
-            </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>
-      
-MIIDxjCCAq4CAQAwDQYJKoZIhvcNAQEFBQAwgagxMzAxBgNVBAoTKkVzY29sYSBC
-YWhpYW5hIGRlIE1lZGljaW5hIGUgU2F1ZGUgUHVibGljYTEMMAoGA1UECxMDQ1BE
-MSEwHwYJKoZIhvcNAQkBFhJudGlAYmFoaWFuYS5lZHUuYnIxETAPBgNVBAcTCFNh
-bHZhZG9yMQ4wDAYDVQQIEwVCYWhpYTELMAkGA1UEBhMCQlIxEDAOBgNVBAMTB2l0
-YWNhcmUwHhcNMTExMDA2MTY0NjU2WhcNMTQxMDA1MTY0NjU2WjCBqDEzMDEGA1UE
-ChMqRXNjb2xhIEJhaGlhbmEgZGUgTWVkaWNpbmEgZSBTYXVkZSBQdWJsaWNhMQww
-CgYDVQQLEwNDUEQxITAfBgkqhkiG9w0BCQEWEm50aUBiYWhpYW5hLmVkdS5icjER
-MA8GA1UEBxMIU2FsdmFkb3IxDjAMBgNVBAgTBUJhaGlhMQswCQYDVQQGEwJCUjEQ
-MA4GA1UEAxMHaXRhY2FyZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AK36i3sMlMwST5eW2ecBJJBkUz7Yu+MGyp2gDy4M4S7Tw7aiAo4BFYrbpN2UmhIt
-0vc+l1Ci0t9szr9PlNmg9fiHn6hqxDhMgWxD0Ce/oK+GYmdd6h64zVieWvW+1FTU
-w/uq9B1g9Uj81vpVsxGkM7FeFsgVKNpeW+yJNoT1hp/lEUky3bgl9z2/VDk5sBop
-EzfroSosr4WDFZFVSNQFfG8kdJF426c2jrLNDIJXSwqmS/DQP8heF1CxqFCm+A5x
-+4tpY4At4p2stqDncERdVGISPpWGlqtG4Mbvmgz0W0Hj2f6jhJehYP6eiPZgjeW6
-EmpUdXNqWgFl40BSG9cs6KECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAE5n+Yf8x
-SMAk6Sj2la08iXsgUUTPvoWZub8ajJwoTdKxBQfuBt+HdGCMsGhjOgHFhtqHGIc4
-mhLzKeqBs3dpafCKAkhJrMlQeTuUfZRu4YhsC1+ZmYu6BT2/W08TnJrgZ82KwakQ
-f7LN7rf1E6WLMaoA7E/cOVthvrdhZh9kU42mRSZykKqT+x9hbEhqczoBzKITpBjX
-L1w1kIsitIT95av4pdJf9X0zQVpguSCYcR6yTb2qKwlLlwiWXDKqO4nw7rymGoDD
-95ABrbcH/Qx3S7t1vwXXA5s8W2J58dQwwq7B9LnSxqXjvczXv6oPwUxRtl3hxKTK
-f11XT7vSPYxSFQ==
-                    
-            </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/its-aai-logon.unibas.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml
deleted file mode 100644
index 626f858d..00000000
--- a/swamid-interfederations-2.0/its-aai-logon.unibas.ch-idp-shibboleth.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://its-aai-logon.unibas.ch/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-05-29T15:26:46Z">
-      <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Basel  [DO NOT USE YET]</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Basel  [DO NOT USE YET]</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Université de Bâle  [DO NOT USE YET]</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universität Basel</mdui:Description>
-        <mdui:Description xml:lang="en">University of Basel</mdui:Description>
-        <mdui:Description xml:lang="fr">Université de Bâle</mdui:Description>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAgklEQVQ4EbVRQQ6AMAib/o/X8kANi90KG3GJ0wu0tJTMUv74ROSKe2ecaU4IMwHmXFMtBly5tyXAvND1JpiJMv5Y2uoiOlDV6u/M08W0iAcDCJzOlXvTAcPT/gKILdVSOCliDtn/iFlaxvM17YFwPpuYcyYACAxzvzqHrta3BU78Fdzl9FuPpzdbqAAAAABJRU5ErkJggg==</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+hkAAAfHSURBVHic7JvZTxVJFIf9n3zz2QffTFzBLSoxikiURFkcFBUUInpBFgUVVHAB9QIuIJlxA69xQUSGxRVUXABFVBQVQXu+3IqVovt2D/FWDeNynrqq6zb1dZ0653e6mwnWL2YTTP+Bpqam9PT0sYzMycm5cOGC4emYB25sbNywYcNYRm7fvv3s2bOm5/NfAG/cuHEsI38Y4FevXj148MDtrAp89+7dt2/fqmc/fPjQ3t4ujr2BHz9+3NvbG/5sNQA/e/YsMjKyoaEh5FkVuKamZvHixQMDA6L56dOnmJiY8vJy0fQA5qZERER0dHSEP1s9Lt3Z2Tlr1qzr1687T9lc+vjx41FRUf39/e/fv1+xYsW+ffvkKTdgaLl4W1ublqlq28MPHz4MyezcwzAfPnz4xIkT+/fvV/tDAuultfQGrZDMTuChoaHW1tbbt2+zyGq/ExjOmTNnyk2uxTRHaSezDZgotXTp0tOnT1+8eHHRokVv3ryRp2zA0OpdW2H605JgvnbtmmiqwNBGR0cfPHhQNKuqqlRmFVjQ6l1bYUby8KNHjySzBLbRChPMIldJYBxeuydL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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.unibas.ch/de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="de">http://www.unibas.ch/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.unibas.ch</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>192.43.196.0/24</mdui:IPHint>
-        <mdui:IPHint>192.43.192.0/22</mdui:IPHint>
-        <mdui:IPHint>2001:620:200::/48</mdui:IPHint>
-        <mdui:IPHint>192.43.196.0/24</mdui:IPHint>
-        <mdui:IPHint>195.176.29.0/25</mdui:IPHint>
-        <mdui:IPHint>193.8.136.0/23</mdui:IPHint>
-        <mdui:IPHint>131.152.0.0/16</mdui:IPHint>
-        <mdui:IPHint>131.152.188.64/26</mdui:IPHint>
-        <mdui:IPHint>131.152.193.0/24</mdui:IPHint>
-        <mdui:IPHint>131.152.194.0/23</mdui:IPHint>
-        <mdui:IPHint>131.152.227.192/29</mdui:IPHint>
-        <mdui:IPHint>131.152.227.200/30</mdui:IPHint>
-        <mdui:IPHint>131.152.227.204/31</mdui:IPHint>
-        <mdui:IPHint>131.152.227.206/32</mdui:IPHint>
-        <mdui:DomainHint>unibas.ch</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:47.55898,7.58352</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>
-MIIDPDCCAiSgAwIBAgIJAKhSRQPaDjLiMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2l0cy1hYWktbG9nb24udW5pYmFzLmNoMB4XDTE1MDMwNTE1MjYzM1oXDTE4
-MDMwNDE1MjYzM1owIjEgMB4GA1UEAxMXaXRzLWFhaS1sb2dvbi51bmliYXMuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/Ew0TSF/LwcaHcLKqWygO
-LsQ8WqnH1fWhHjrO6uah9IlR5ReAblC3D6eF8I2E+oT36R6kO+hdUsTCwOXCdn86
-HgtD/b6bONReTSc3DJ3i50/hCZOAE9xkF7StvkEkTOEvKoQf8LF5phothcu2/4MJ
-uUqYiRm8TeYm8lfnWCjbSuCT7Na2P8s+EwLnbutkHwKFc03uCIWlCOQ5cw8soSXI
-ANd4xuL7t8LYTPWHB1dTv+VA/jWxddNgQ5cnJ5rkWRrLSTT3hgsUbgq7KAheF+8i
-WtPOlJr2cSqwK+C36LIg1c2BPs7rbUVlciBwOAhSXZ+VV75i2h939cUdiEVS4OzT
-AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2l0cy1hYWktbG9nb24udW5pYmFzLmNohi5o
-dHRwczovL2l0cy1hYWktbG9nb24udW5pYmFzLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRVRTA2rDViMaivqEgVn3TaybQJ8jANBgkqhkiG9w0BAQUFAAOCAQEA
-O8NZZx2cIVnL7crxy9znPUD6NbTfSF/J1pY2Rl0mSfQ3BTgA4u6Fu9ds8Ty9p8vH
-lpa1Sep/Iys6jsf578P6UXCZZxvYBbDXQehjIUJu4mRUBNIkKKMStbm6lSEWhHhv
-gqxkeAhQRXsCbbUiignEDLfAPJ7Oja+aMAVreBN0ojEDy+5Yapi5De5Mb9fbBPN8
-t7o0+SaKUJCeKAti9v18Sw7+gB8Ri2WoGKHTtfy75PYMlzPNcjXBKddSiDOhl/P0
-K1deBnSSDhXeFcAL/Dug74f6LwUYH0gE0hQ21MCU4h2mY69FTNjTnRtZA/ExQdQW
-xVM3RvYuoZFN8VKpoMHa6A==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://its-aai-logon.unibas.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-aai-logon.unibas.ch: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://its-aai-logon.unibas.ch/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-aai-logon.unibas.ch/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-aai-logon.unibas.ch/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://its-aai-logon.unibas.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibas.ch</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIJAKhSRQPaDjLiMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2l0cy1hYWktbG9nb24udW5pYmFzLmNoMB4XDTE1MDMwNTE1MjYzM1oXDTE4
-MDMwNDE1MjYzM1owIjEgMB4GA1UEAxMXaXRzLWFhaS1sb2dvbi51bmliYXMuY2gw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/Ew0TSF/LwcaHcLKqWygO
-LsQ8WqnH1fWhHjrO6uah9IlR5ReAblC3D6eF8I2E+oT36R6kO+hdUsTCwOXCdn86
-HgtD/b6bONReTSc3DJ3i50/hCZOAE9xkF7StvkEkTOEvKoQf8LF5phothcu2/4MJ
-uUqYiRm8TeYm8lfnWCjbSuCT7Na2P8s+EwLnbutkHwKFc03uCIWlCOQ5cw8soSXI
-ANd4xuL7t8LYTPWHB1dTv+VA/jWxddNgQ5cnJ5rkWRrLSTT3hgsUbgq7KAheF+8i
-WtPOlJr2cSqwK+C36LIg1c2BPs7rbUVlciBwOAhSXZ+VV75i2h939cUdiEVS4OzT
-AgMBAAGjdTBzMFIGA1UdEQRLMEmCF2l0cy1hYWktbG9nb24udW5pYmFzLmNohi5o
-dHRwczovL2l0cy1hYWktbG9nb24udW5pYmFzLmNoL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBRVRTA2rDViMaivqEgVn3TaybQJ8jANBgkqhkiG9w0BAQUFAAOCAQEA
-O8NZZx2cIVnL7crxy9znPUD6NbTfSF/J1pY2Rl0mSfQ3BTgA4u6Fu9ds8Ty9p8vH
-lpa1Sep/Iys6jsf578P6UXCZZxvYBbDXQehjIUJu4mRUBNIkKKMStbm6lSEWhHhv
-gqxkeAhQRXsCbbUiignEDLfAPJ7Oja+aMAVreBN0ojEDy+5Yapi5De5Mb9fbBPN8
-t7o0+SaKUJCeKAti9v18Sw7+gB8Ri2WoGKHTtfy75PYMlzPNcjXBKddSiDOhl/P0
-K1deBnSSDhXeFcAL/Dug74f6LwUYH0gE0hQ21MCU4h2mY69FTNjTnRtZA/ExQdQW
-xVM3RvYuoZFN8VKpoMHa6A==
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://its-aai-logon.unibas.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-aai-logon.unibas.ch: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:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">unibas.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Basel  [DO NOT USE YET]</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Basel  [DO NOT USE YET]</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">Université de Bâle  [DO NOT USE YET]</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.unibas.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unibas.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.unibas.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>URZ</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:support-urz@unibas.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Arsene</md:GivenName>
-    <md:SurName>Gschwind</md:SurName>
-    <md:EmailAddress>mailto:arsene.gschwind@unibas.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/its-shib.its.csulb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/its-shib.its.csulb.edu-idp-shibboleth.xml
deleted file mode 100644
index 33c6bd8b..00000000
--- a/swamid-interfederations-2.0/its-shib.its.csulb.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +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://its-shib.its.csulb.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">csulb.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Long Beach</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>
-MIIDRDCCAiygAwIBAgIVAJPL4jmebB2O17/3wHKhz8V1qEArMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFml0cy1zaGliLml0cy5jc3VsYi5lZHUwHhcNMTAwMjAz
-MTg1NzQ1WhcNMzAwMjAzMTg1NzQ1WjAhMR8wHQYDVQQDExZpdHMtc2hpYi5pdHMu
-Y3N1bGIuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArbViX4eh
-msE7HYLfwAeBnBVkAwrw526zOn9dki/7AVLOb7E+EmmSur0WJDI83UqPzmPqaF3r
-delLE4CMtRPt+qtZBfC6gSiOU85hwKdC6zCY9qMeeGA3mbcdpBUeRAQs5CBpVfIq
-9b6ONlMzDdcIgeLNFUhHTZk/TKgkXWYyWVgbsLQJjkjDJWgN+joWl2d2zNWkwHPL
-A2pn3eBxDN1ljxYI3Y7mD/KWMEkNDuhSZUckCRM1VBdyUKccmUXlGDbLJTZ9jJq9
-5Vrtcy+PgqTKzkt1V7PDyf3RbZBM+NgQKktrmWgjQYwWEonNpo1y6aSQCfDxQ8lQ
-25Oljv2lfTcfMQIDAQABo3MwcTBQBgNVHREESTBHghZpdHMtc2hpYi5pdHMuY3N1
-bGIuZWR1hi1odHRwczovL2l0cy1zaGliLml0cy5jc3VsYi5lZHUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFGcFT/yuYca/kcgGyIaK+VZ9Mqx1MA0GCSqGSIb3DQEB
-BQUAA4IBAQBkdTI5YljHX1yxnvXzKxrFNM5e+d44vy845vuZz3phQkLJbx0qE5I9
-HiPwt54umx+neXTuTkKW9nozjb6O1G7XcCk10574Ou1zXI3ndV6rxgfxygkw1TRR
-wvsQvjaT2Ap5ogqo95BVGVNX+vGlhPneoMfVbHUHwFjv6IIlRPUfIT6V2g5y6CKV
-BIFqM69GfneuKbZkLsDsZDL6CLXWz2BYE4Z/RGRRWwN2+IE//9vcDra+7q0bqfqf
-7eMgq13DOjl3gbhvE1Hq1pkmzrwv1ewjHCxd4ILQC05MYFPAJiq3hzhske1DU8xO
-BqRi7xc2j/DiFKyFbqwPCyGLSIlDG9Tu
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-shib.its.csulb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-shib.its.csulb.edu/idp/profile/Logout"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-shib.its.csulb.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://its-shib.its.csulb.edu/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">csulb.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAJPL4jmebB2O17/3wHKhz8V1qEArMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFml0cy1zaGliLml0cy5jc3VsYi5lZHUwHhcNMTAwMjAz
-MTg1NzQ1WhcNMzAwMjAzMTg1NzQ1WjAhMR8wHQYDVQQDExZpdHMtc2hpYi5pdHMu
-Y3N1bGIuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArbViX4eh
-msE7HYLfwAeBnBVkAwrw526zOn9dki/7AVLOb7E+EmmSur0WJDI83UqPzmPqaF3r
-delLE4CMtRPt+qtZBfC6gSiOU85hwKdC6zCY9qMeeGA3mbcdpBUeRAQs5CBpVfIq
-9b6ONlMzDdcIgeLNFUhHTZk/TKgkXWYyWVgbsLQJjkjDJWgN+joWl2d2zNWkwHPL
-A2pn3eBxDN1ljxYI3Y7mD/KWMEkNDuhSZUckCRM1VBdyUKccmUXlGDbLJTZ9jJq9
-5Vrtcy+PgqTKzkt1V7PDyf3RbZBM+NgQKktrmWgjQYwWEonNpo1y6aSQCfDxQ8lQ
-25Oljv2lfTcfMQIDAQABo3MwcTBQBgNVHREESTBHghZpdHMtc2hpYi5pdHMuY3N1
-bGIuZWR1hi1odHRwczovL2l0cy1zaGliLml0cy5jc3VsYi5lZHUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFGcFT/yuYca/kcgGyIaK+VZ9Mqx1MA0GCSqGSIb3DQEB
-BQUAA4IBAQBkdTI5YljHX1yxnvXzKxrFNM5e+d44vy845vuZz3phQkLJbx0qE5I9
-HiPwt54umx+neXTuTkKW9nozjb6O1G7XcCk10574Ou1zXI3ndV6rxgfxygkw1TRR
-wvsQvjaT2Ap5ogqo95BVGVNX+vGlhPneoMfVbHUHwFjv6IIlRPUfIT6V2g5y6CKV
-BIFqM69GfneuKbZkLsDsZDL6CLXWz2BYE4Z/RGRRWwN2+IE//9vcDra+7q0bqfqf
-7eMgq13DOjl3gbhvE1Hq1pkmzrwv1ewjHCxd4ILQC05MYFPAJiq3hzhske1DU8xO
-BqRi7xc2j/DiFKyFbqwPCyGLSIlDG9Tu
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://its-shib.its.csulb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://its-shib.its.csulb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Long Beach</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Long Beach</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.csulb.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jesse Santana</md:GivenName>
-    <md:EmailAddress>jsantana@csulb.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ryan Tapp</md:GivenName>
-    <md:EmailAddress>ryan.tapp@csulb.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b0f9052b..00000000
--- a/swamid-interfederations-2.0/janus.bordeaux.archi.fr-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://janus.bordeaux.archi.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/gif;base64,R0lGODlhEAAQAGAAACH5BAEAAGEALAAAAAAQABAAhwAAAAAAMwAAZgAAmQAAzAAA/wArAAArMwArZgArmQArzAAr/wBVAABVMwBVZgBVmQBVzABV/wCAAACAMwCAZgCAmQCAzACA/wCqAACqMwCqZgCqmQCqzACq/wDVAADVMwDVZgDVmQDVzADV/wD/AAD/MwD/ZgD/mQD/zAD//zMAADMAMzMAZjMAmTMAzDMA/zMrADMrMzMrZjMrmTMrzDMr/zNVADNVMzNVZjNVmTNVzDNV/zOAADOAMzOAZjOAmTOAzDOA/zOqADOqMzOqZjOqmTOqzDOq/zPVADPVMzPVZjPVmTPVzDPV/zP/ADP/MzP/ZjP/mTP/zDP//2YAAGYAM2YAZmYAmWYAzGYA/2YrAGYrM2YrZmYrmWYrzGYr/2ZVAGZVM2ZVZmZVmWZVzGZV/2aAAGaAM2aAZmaAmWaAzGaA/2aqAGaqM2aqZmaqmWaqzGaq/2bVAGbVM2bVZmbVmWbVzGbV/2b/AGb/M2b/Zmb/mWb/zGb//5kAAJkAM5kAZpkAmZkAzJkA/5krAJkrM5krZpkrmZkrzJkr/5lVAJlVM5lVZplVmZlVzJlV/5mAAJmAM5mAZpmAmZmAzJmA/5mqAJmqM5mqZpmqmZmqzJmq/5nVAJnVM5nVZpnVmZnVzJnV/5n/AJn/M5n/Zpn/mZn/zJn//8wAAMwAM8wAZswAmcwAzMwA/8wrAMwrM8wrZswrmcwrzMwr/8xVAMxVM8xVZsxVmcxVzMxV/8yAAMyAM8yAZsyAmcyAzMyA/8yqAMyqM8yqZsyqmcyqzMyq/8zVAMzVM8zVZszVmczVzMzV/8z/AMz/M8z/Zsz/mcz/zMz///8AAP8AM/8AZv8Amf8AzP8A//8rAP8rM/8rZv8rmf8rzP8r//9VAP9VM/9VZv9Vmf9VzP9V//+AAP+AM/+AZv+Amf+AzP+A//+qAP+qM/+qZv+qmf+qzP+q///VAP/VM//VZv/Vmf/VzP/V////AP//M///Zv//mf//zP///wAAAAAAAAAAAAAAAAiYAPcJHEiPnj6DAxMKbDcvIb2GCvc1TOaNVsV2+4bpSyhsHy12HL3twyiwoTeSDmlJFEhvGMiI+9gNE7hR5Ddh5YSx28Wulj6RBz1mPFiwHTuQKukp+7nQ3C6B0QQCFagy5q5y7aoKpSexXcd2Odl9EyisHUmTEB1y5bowmjdeCdmpTKYQY9aKtOxuVPgw4by0A6Oy1BdUYUAAOw==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.bordeaux.archi.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Etudiants en architecture et paysage</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etudiants en architecture et paysage</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>
-					      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>
-    </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-POST" Location="https://janus.bordeaux.archi.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://janus.bordeaux.archi.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://janus.bordeaux.archi.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENSAPBX - Ecole Nationale Supérieure d'Architecture et de Paysage de Bordeaux</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bordeaux.archi.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Dépinay</md:SurName>
-    <md:EmailAddress>guillaume.depinay@bordeaux.archi.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Dumas</md:SurName>
-    <md:EmailAddress>jean-louis.dumas@bordeaux.archi.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/janus.cnrs.fr-idp.xml b/swamid-interfederations-2.0/janus.cnrs.fr-idp.xml
deleted file mode 100644
index 3eb7c1d9..00000000
--- a/swamid-interfederations-2.0/janus.cnrs.fr-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://janus.cnrs.fr/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-02T14:55:56Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnrs.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CNRS</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC1klEQVQ4y4WTaUjTARjGf/+5NaduqzXLWK5a1+yge2W3SZeQMfpUEF2mFB1QBBFZUQRddNIlFEIRVtBh9MGi0o6PLpOif5uFdijZGrbSTf/b3j5YRgf0fHo/PM/z4eX3KPxDq3aXnKyofjmvLRYzO3vZ6hdNH3+1eMWCg/xPe85fP4UyWnDmCVNXCrOKhOmrhcFeITNPio5cuvNnRvl5OPI3qB/Kbw5l0gwwGUGvhyQ9GPSdtngCAu/hU5C3deX5TrvlFoAOYOPRC2c+3K0Yyrgp0PgJPgbhWwQlkaDb1zZo/AwJQZdph3FZOJ2Lyh+8eL0cABExYugrq/aXiki7SPtXYetZoSog3H8hFB4SaQmLiMiwktuiVKrCkesCbgFIqg2Zzqu+plHXLhTTI3Ua6Y7eZCzOw3/jHp5Xdbybl8uuXqnoczbT7J1J8o7jxPyvwGhj3c7tVl2N/+0Ie7ab2uo66GFl3Zq9ALhSjAxITgCg2tMwKVHMz/1oWwphRBbYTVTWBGbp0oz6b8HmEFazCcdYN47cbACaox1dnw4rCu29baRUPCTpWCmsXQoGAx1tEaNuxoTh1TTUMyV7DAD+s8UEQl+Ia/HOtBbHo+jRPgYJeuej5Xgg0gFaB067tUE3e+qYO7S2Mq1wF/V3S8jdd45HBbuxqWpnweUbFJ24AslG4r5axNkXdhwA3zu8c7Kv/uBgpOB2QWMIMtIh2cCQYS48bgcXL1WBzQw9LRCJQqgFUk1Q44fWJ4oOYPaKhfdRVXD1AasJknQQj3V2mwyQ1g2iUSAB3c3wxMem/esP/0YiZAiusWBJg5gwJKs/nuH9uFhWBelmfkADzwLgcsCzy0oXiQDhcIObNw+gJQwx7VdvJAKaBtF2eOwDa0pX+C+JiBtcAplimbhE3N6NwsB8wTJZYIAsKz5R+d9FAuw9VbZlYE7B03TP4qZBc4vUgm3HTouI9V/e77ShIdcL4sPwAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE2KzAyOjAwlICcrAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMOXdJBAAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.dsi.cnrs.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">CNRS IDP server</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CNRS</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Serveur IDP du CNRS</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>
-					      MIIDHzCCAgegAwIBAgIUcyCcvrPE6sFdJyVsCKfKmZg0/70wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNamFudXMuY25ycy5mcjAeFw0xNDA2MTYyMTA1MDZaFw0y
-NDA2MTYyMTA1MDZaMBgxFjAUBgNVBAMTDWphbnVzLmNucnMuZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAQ7NtsTYjE/tTo9LM8y7AUlqejU6lpiph
-dW2yR2Ii7Xcm+niy+F4sjy3OoSt83Osuu1SXb/Cp2BZ8Spw3EMzSAKI0T9sIq4/F
-ePspMLRThXW6cQLgUYekICh4H9ZQBU/luTS6ekTB3IgUPAFiiwFw8idC7KBc3OR8
-IDng0iOZSWejKahELmPWh6KeXj6SShPwdYiRMHZgCS2Sijzsv53tlQPm88nO0aQf
-6aEe5wXZqoAF1pkL6VhNo1R9pf7Wl4uiRvyiojflr09Pg3GsEOZg342J8PSIBQzJ
-+do/BNT7bWRsX2yEyX0PoieFpTMNz/Y6+IVMUrhZn2+n1X2iEtOxAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWphbnVzLmNucnMuZnKGJGh0dHBzOi8vamFudXMuY25ycy5m
-ci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUy/9dd6btq/teyttwa2YjbrSnQ/ow
-DQYJKoZIhvcNAQEFBQADggEBAGWm6W+fJ6dQ0cHFcg1S8haiBQnGTcdWF17YXyYG
-WuiFFBX4RXuhoRyu0aWxcw7THdHP19/K3+lAueFPBCG6K7qz9gtvf4ZWJWWLq0jQ
-z9uNdB09xLWTleRe7c4ptCaQ/nU07ZibFHVXIGT2zZOODBXIiWsiXchH56D4TN0Z
-bKQsdICU4/Q+thqPKtYHL5T3leyJKCoEQC0o7jZ2q7T2SF6j7d7kwoa58qopcMTz
-J9FdzyFEdepofr6Cj3sQu4nA28iAc91t0ZYvTbbrFu1KBby90rPH1p4+xLV42/Fy
-wPrS8Iosd99N9HZcyPWEuGXeoFyLRK8VArJPtD6f2ZHusXQ=
-					    </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-POST" Location="https://janus.cnrs.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://janus.cnrs.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://janus.cnrs.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CNRS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CNRS</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dsi.cnrs.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsichangement@dsi.cnrs.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml b/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.xml
deleted file mode 100644
index 668c0d8d..00000000
--- a/swamid-interfederations-2.0/javasp.test.openathens.net-hello-oa-metadata.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://javasp.test.openathens.net/hello/oa/metadata">
-  <!--
-		This is an OpenAthens test SP for Eduserv.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:54:26Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIETzp1STANBgkqhkiG9w0BAQUFADBIMSEwHwYDVQQKExhK
-						QVZBIFNQIHRlc3QgYXBwbGljYXRpb24xIzAhBgNVBAMTGmphdmFzcC50ZXN0Lm9w
-						ZW5hdGhlbnMubmV0MB4XDTEyMDIxNDE0NTI1N1oXDTIyMDIxMTE0NTI1N1owSDEh
-						MB8GA1UEChMYSkFWQSBTUCB0ZXN0IGFwcGxpY2F0aW9uMSMwIQYDVQQDExpqYXZh
-						c3AudGVzdC5vcGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBALUqBTnXevAE/4OvIH7iS72gHaJqRZulPN0BFVnkDvy5HdX1ShlnMlgt
-						h6lvRe7AmRgiMCrIGbGeDzV6DeeXXQKbruXrtamp3rKOkgZCFKsGbc/mTsOQsP1R
-						INm86m1lyZAh/+qxT3ipL1ln+KeVT9h3Ws65ZLRn2tiZJb0cuKdkOmH8NWZ6Ou7r
-						2GEWNyIVxjGyZLttO4ZIwghGLpUJCLgnghd4NnsqaDUV1xO4GYPg+NJxezJqy2Zf
-						ejLPGqhz8/Woj8yeWWPBExl7qyZty1shUknPARparzQK1JcuEHRHu9lyB9kZtPYz
-						Mi39XcXfVVEC4/Jo0/wIzMPC3m57qJcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						q95Lu8qgTLA2xmLlraZnUmR7PmKnIQbERbwHIstyz7tYfUat3n0q2EBULuwSK9Pa
-						uWq2x8zfanPNX4Uvn9GDsM7Nn35oblasq2xuonbwlB2FYxEOlrlmcRbT6hCZBx6P
-						SPOGSH8MH6li5/PEifq4nLgmm6PXjueGexndqv7q+ocLtHOPpBusbY2ISXZnow4T
-						4SiAK8aOQpY8PxOjKov3l9P94mzeagx9eIoVc6aDdGv+nGYGGG4zg8VI/yKR1tZR
-						jSU46LhuFHdIEYRnIpm/KtYCZBA6synnD/Ba0JF8JVqJ0O2UaWc25MSMbAo7II40
-						r4IsboH0bf7jMEFfq6CCew==
-					</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>
-						MIIDDDCCAfSgAwIBAgIETzp1STANBgkqhkiG9w0BAQUFADBIMSEwHwYDVQQKExhK
-						QVZBIFNQIHRlc3QgYXBwbGljYXRpb24xIzAhBgNVBAMTGmphdmFzcC50ZXN0Lm9w
-						ZW5hdGhlbnMubmV0MB4XDTEyMDIxNDE0NTI1N1oXDTIyMDIxMTE0NTI1N1owSDEh
-						MB8GA1UEChMYSkFWQSBTUCB0ZXN0IGFwcGxpY2F0aW9uMSMwIQYDVQQDExpqYXZh
-						c3AudGVzdC5vcGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBALUqBTnXevAE/4OvIH7iS72gHaJqRZulPN0BFVnkDvy5HdX1ShlnMlgt
-						h6lvRe7AmRgiMCrIGbGeDzV6DeeXXQKbruXrtamp3rKOkgZCFKsGbc/mTsOQsP1R
-						INm86m1lyZAh/+qxT3ipL1ln+KeVT9h3Ws65ZLRn2tiZJb0cuKdkOmH8NWZ6Ou7r
-						2GEWNyIVxjGyZLttO4ZIwghGLpUJCLgnghd4NnsqaDUV1xO4GYPg+NJxezJqy2Zf
-						ejLPGqhz8/Woj8yeWWPBExl7qyZty1shUknPARparzQK1JcuEHRHu9lyB9kZtPYz
-						Mi39XcXfVVEC4/Jo0/wIzMPC3m57qJcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						q95Lu8qgTLA2xmLlraZnUmR7PmKnIQbERbwHIstyz7tYfUat3n0q2EBULuwSK9Pa
-						uWq2x8zfanPNX4Uvn9GDsM7Nn35oblasq2xuonbwlB2FYxEOlrlmcRbT6hCZBx6P
-						SPOGSH8MH6li5/PEifq4nLgmm6PXjueGexndqv7q+ocLtHOPpBusbY2ISXZnow4T
-						4SiAK8aOQpY8PxOjKov3l9P94mzeagx9eIoVc6aDdGv+nGYGGG4zg8VI/yKR1tZR
-						jSU46LhuFHdIEYRnIpm/KtYCZBA6synnD/Ba0JF8JVqJ0O2UaWc25MSMbAo7II40
-						r4IsboH0bf7jMEFfq6CCew==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://javasp.test.openathens.net/hello/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv: Test Java SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcolls.mimas.ac.uk-shibboleth.xml
deleted file mode 100644
index 15ba3394..00000000
--- a/swamid-interfederations-2.0/jcolls.mimas.ac.uk-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://jcolls.mimas.ac.uk/shibboleth">
-  <!--
-		This is a 'JISC Collections Content' Shibboleth SP for the University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIEKzCCAxOgAwIBAgIJAP8Lcrq8+dIXMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
-						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
-						CxMFTWltYXMxGzAZBgNVBAMTEmpjb2xscy5taW1hcy5hYy51azAeFw0xMzA1MjAx
-						MzM2NDFaFw0yMzA1MTgxMzM2NDFaMIGLMQswCQYDVQQGEwJHQjETMBEGA1UECBMK
-						TWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3RlcjElMCMGA1UEChMcVGhlIFVu
-						aXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UECxMFTWltYXMxGzAZBgNVBAMT
-						Empjb2xscy5taW1hcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAJu5gU3fnvknoUtOKZ2D014hSlAGLXQuTe9ZDgXQ+tNjrRf5arfqGIsZlHWR
-						6AHBbDZaD8iljZAvsOWbAlC+gBQumWZEDAV0RJd+M8lBMnwDodXe6t0jYBTiH1Un
-						vWWMm8YKMpDWJq/qPVtW+fWyKhJkA1yaDRqvNVmSL9d6sCWpzr4gvIPjg7PgdJKt
-						Q3h3uJzBGJ5rXCg4zUGO6UejVKg5zy+skZQ8oEFahEH3abeWS/aQtCOesDlBh/JM
-						k3OBCI+sS1g15y7bvQwcHDN+o31yDDMQ5fvdfQyUyGdCG5FIdtMOAUsYiVCDNzGd
-						8h4QebK1hogewsHQYIQjTvtH7tsCAwEAAaOBjzCBjDAJBgNVHRMEAjAAMAsGA1Ud
-						DwQEAwIEsDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0RBBYw
-						FIISamNvbGxzLm1pbWFzLmFjLnVrMDQGA1UdEgQtMCuBKW1pbWFzLXNoaWItdGVj
-						aEBsaXN0c2Vydi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBZ
-						25RsQQiA5RuxYb+8GGPDd1N8dkLIU0nPyqlFhWQM43lSrqL54UYUlh2IBjE5KJob
-						TMwRNeX3CDRHkAskF1ZIziV9RNCdd2/92WI7ieYl/Q8H14vNVEhTv496l5wBPinN
-						NakZzsD1bcTod/MY/CwUeKhKDMTtRgNe+AJirONfQSY1yqjdjXG2dX2lgle7FDKX
-						TQ94Ks3wbgojEoHofaKoPKkBWUnwtDL8Wc0O99jQbIVx771gJ/KbmC2Qvq7oGYBW
-						3lvtbpwmo4D+SXsCeK/1HShRFHIAqLF2nSip/Usbg29FLN2tSe0E8D6zyHURdLn5
-						RlTNvtB/OM17VzVTJT0i
-					</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>
-						MIIEKzCCAxOgAwIBAgIJAP8Lcrq8+dIXMA0GCSqGSIb3DQEBBQUAMIGLMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
-						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
-						CxMFTWltYXMxGzAZBgNVBAMTEmpjb2xscy5taW1hcy5hYy51azAeFw0xMzA1MjAx
-						MzM2NDFaFw0yMzA1MTgxMzM2NDFaMIGLMQswCQYDVQQGEwJHQjETMBEGA1UECBMK
-						TWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3RlcjElMCMGA1UEChMcVGhlIFVu
-						aXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UECxMFTWltYXMxGzAZBgNVBAMT
-						Empjb2xscy5taW1hcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAJu5gU3fnvknoUtOKZ2D014hSlAGLXQuTe9ZDgXQ+tNjrRf5arfqGIsZlHWR
-						6AHBbDZaD8iljZAvsOWbAlC+gBQumWZEDAV0RJd+M8lBMnwDodXe6t0jYBTiH1Un
-						vWWMm8YKMpDWJq/qPVtW+fWyKhJkA1yaDRqvNVmSL9d6sCWpzr4gvIPjg7PgdJKt
-						Q3h3uJzBGJ5rXCg4zUGO6UejVKg5zy+skZQ8oEFahEH3abeWS/aQtCOesDlBh/JM
-						k3OBCI+sS1g15y7bvQwcHDN+o31yDDMQ5fvdfQyUyGdCG5FIdtMOAUsYiVCDNzGd
-						8h4QebK1hogewsHQYIQjTvtH7tsCAwEAAaOBjzCBjDAJBgNVHRMEAjAAMAsGA1Ud
-						DwQEAwIEsDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0RBBYw
-						FIISamNvbGxzLm1pbWFzLmFjLnVrMDQGA1UdEgQtMCuBKW1pbWFzLXNoaWItdGVj
-						aEBsaXN0c2Vydi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBZ
-						25RsQQiA5RuxYb+8GGPDd1N8dkLIU0nPyqlFhWQM43lSrqL54UYUlh2IBjE5KJob
-						TMwRNeX3CDRHkAskF1ZIziV9RNCdd2/92WI7ieYl/Q8H14vNVEhTv496l5wBPinN
-						NakZzsD1bcTod/MY/CwUeKhKDMTtRgNe+AJirONfQSY1yqjdjXG2dX2lgle7FDKX
-						TQ94Ks3wbgojEoHofaKoPKkBWUnwtDL8Wc0O99jQbIVx771gJ/KbmC2Qvq7oGYBW
-						3lvtbpwmo4D+SXsCeK/1HShRFHIAqLF2nSip/Usbg29FLN2tSe0E8D6zyHURdLn5
-						RlTNvtB/OM17VzVTJT0i
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcolls.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MIMAS: JISC Collections Content</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://mimas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mimas Helpdesk</GivenName>
-    <EmailAddress>mailto:info@mimas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcr.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index a3fd9cbf..00000000
--- a/swamid-interfederations-2.0/jcr.new.ox.ac.uk-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://jcr.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a 'New College JCR admin host' Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-11-06T14:29:24Z">
-      <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://jcr.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate> 
-						MIIDHDCCAgSgAwIBAgIJAI83ga/ABB6dMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGpjci5uZXcub3guYWMudWswHhcNMTMxMTAzMjA0MDUwWhcNMjMxMTAxMjA0
-						MDUwWjAbMRkwFwYDVQQDExBqY3IubmV3Lm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAvoS72hGDIl+GbpfaZL0UOlgGgFcuhaVeqX55D1qa
-						8iloWd33o/c52UZEezMCA8DDlUeD4tZhomLRyXX4ZEzKGtigDhJ+fZbo5JgP9lBh
-						pF6L9WoHRGlNO8VaiRM9Imu8sO5+btTfA1rMeVXCmG/NftOG8upXG6RNKB+ccakY
-						m5mbe2ecDBy6r58usRIFqZK/4/My3LWU288l33bOE6r6tUCpSyW81b1sEWpllY3Z
-						B82hAbOEXQD4ozVURP6QJoID+kOQFRIyzvg9FXfMCoPuUWdboJW1hv5BmZWt9MOa
-						UmE2UVqYYvvEmaOT65suW3OTyMiOnt48A3fFi98MNKebcQIDAQABo2MwYTBABgNV
-						HREEOTA3ghBqY3IubmV3Lm94LmFjLnVrhiNodHRwczovL2pjci5uZXcub3guYWMu
-						dWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUaMxyJ9eSM7u3SF3NXi1HGMaHYFowDQYJ
-						KoZIhvcNAQEFBQADggEBAEl38kBgp1fMgU18W6ChrzZm8EoQiBIOSdScErmZ6XCr
-						Va99wjy8bnI/7q5KhXvoJyemNbpIK3c80zFzAdHNkZ6uMhJfyU53Ur8PSzDCNFrO
-						7uGDj/N4AXqZWuHATG/lHXp7icK+LsgNhhCdqsKCTl9/JBiU9lNR1fR+hliLzEYW
-						R6X5dggs8sDIZPju4N0Y/Z8OuvlWwV60zbX9YJG5nr/CnccPblaYPmL5Don0DP8b
-						VUZfweYVy3ttIKxcB2s5AxK4AtXzsKxkiSjPJcaH5cKJQqGGe4tKvDBjw2tS1r+t
-						onpvIhg5z9yn4KlD1Bc4Zvi28xZZVC4yS0Js/3rxhHY=
-					</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://jcr.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcr.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford New College JCR admin host</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Officer</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Officer</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e9b4dec3..00000000
--- a/swamid-interfederations-2.0/jcrmail.new.ox.ac.uk-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://jcrmail.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a 'New College JCR Mail service' Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-11-05T16:23:42Z">
-      <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://jcrmail.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIJAML2ZGVSnH6fMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGpjcm1haWwubmV3Lm94LmFjLnVrMB4XDTEzMTEwMzIyMDMyM1oXDTIzMTEw
-						MTIyMDMyM1owHzEdMBsGA1UEAxMUamNybWFpbC5uZXcub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiH44HVc7zwdznUT53Ufb/uHtkUSKH
-						vhNV0gxzxtABgh2RTyiOj8nqvc7fAPvalplfGDCeIEM+GgibAb61Ue3Zg3uPp+Qo
-						1M2bc1aoEi9ox8M9xvvnCfOlJl8bnSOk/RaExmiu+5tVZHL7+BazhzrwQFWt2me9
-						V7iUJ95Q3mSU1sPGCu4LXL7lbruFwFgUr2H8mB9lIxb2DHa/gHN2V+0Kv7pzUsV5
-						iEZCwhhwVKUU5UEIRWoeUOyaOyp8rkk50aS34bLW36PzrEbsrYoXF4/PQMN5EP2S
-						Dy1ov1ixqp/k9Gg5PEamucgFxk/QBefkQ+mxPkqxTzgK+ISeKsCdE+sdAgMBAAGj
-						azBpMEgGA1UdEQRBMD+CFGpjcm1haWwubmV3Lm94LmFjLnVrhidodHRwczovL2pj
-						cm1haWwubmV3Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFHR95FV4l+sE
-						8+nH5oH2kTRP3/t7MA0GCSqGSIb3DQEBBQUAA4IBAQBHEM8J5uExzSroMin/n6oI
-						EsSttlp2u4TtBmpC3TAYtMA3owuRM9fv4FnLSrZB91SMep6t0oR6jlh6VrKkn2zA
-						/G0hmfyK/DZGfJ/NZTNFB6lF0PrwKDX2qmhQgnL5/i8maXS2vRt9GrLiu6UzQTAI
-						+KjNdtR5fYAgw6tW/Np+gCA4As0BzxTpkV588Y4xjm7GpJL2GI8YfOajVWP2TbJj
-						rWSav486oZmP/J9mHTY5hq1nBQg5BBvDfZfRUEc1bHmLUUnkWs/N/pQ7ZGTtDzBT
-						SdLjFqV63m+3naMFk5mGsDJ3Yq4gTPUfmPETdxdYN89CIxT7pJrqTDBXpqSZgMkc
-					</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://jcrmail.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrmail.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford New College JCR Mail service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Officer</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Officer</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcrold.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrold.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d26e1ab4..00000000
--- a/swamid-interfederations-2.0/jcrold.new.ox.ac.uk-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://jcrold.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a "New College JCR old website" Shibboleth SP for the University of Oxford
-	-->
-  <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="2015-01-28T11:49:51Z">
-      <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://jcrold.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIJAOCZ0GCvpLO7MA0GCSqGSIb3DQEBDQUAMB4xHDAaBgNV
-						BAMTE2pjcm9sZC5uZXcub3guYWMudWswHhcNMTUwMTIyMTU1NzE2WhcNMjUwMTE5
-						MTU1NzE2WjAeMRwwGgYDVQQDExNqY3JvbGQubmV3Lm94LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkz2ksPpFpDVR2F9qvKhey+uyifIUkf47
-						IkTpFript8sNAvVDxxaNnmqNRBOUQvVINbV6K7l/qPPf3pA8WzZRB5ZpRmvTIyay
-						O10XlLJQzqS/2xgXB4uXQA03GFTtqnA7rnFzYJmXPMyWj4qtvDe322azmZfCIXAf
-						H5gpekdH2tGeUPxG6d2ewyjqqVyI7wk8XF5GRThC0wf501BAQ6252A6RqoV7x6UW
-						OrEkxdCjoxmg6aZ2ArFvAEQrtq5NobfWs7UiFvH9U3/uWCXRKowE5it+u9uuiytS
-						nFIsuQod/sqOInFMgK2QJT+meBcKjlYWDn4zNuFAH55CLvPyeI7yOwIDAQABo2kw
-						ZzBGBgNVHREEPzA9ghNqY3JvbGQubmV3Lm94LmFjLnVrhiZodHRwczovL2pjcm9s
-						ZC5uZXcub3guYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUmD8DElMxF75BJXhy
-						epLcwStYFz4wDQYJKoZIhvcNAQENBQADggEBAGLKFMmZHsWvbeAtTPCF6gT0p+/I
-						Oa2Pl7MWsHLWMWHAnSzQAvPv8InACCX3m3W9v+30L5jmgW3tWMkdJjDvlUOv0Rvd
-						+oGWe/ixJzbmpxX1QZNi1HE1IEvu8s32aoBvmqFOJ1w1K2tIA8EzSWssi5NI5rvZ
-						A5XTIuUmVl/Uo83t//t+LferDHvcc2rHBhxvItHx4fTMFjVOHgbTZMB4mXD+SoBc
-						zXSvW3Gq5gD44CbBJWMOayTQthbG//wFxnVUbViJp5VSwfr5Lok+neOEwJvPTSO9
-						08W9A9x0ao2q/PABpXt+L60pvnWkWgjpmErt5XPyIKeq0XmaSX30YEMd4TE=
-					</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://jcrold.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrold.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford New College JCR old website</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://jcr.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>JCR IT Officer</GivenName>
-    <EmailAddress>mailto:it@jcr.new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>JCR IT Officer</GivenName>
-    <EmailAddress>mailto:it@jcr.new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index cd8491bb..00000000
--- a/swamid-interfederations-2.0/jcrtest.new.ox.ac.uk-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://jcrtest.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a 'New College JCR development systems' Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-11-06T10:25:46Z">
-      <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://jcrtest.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIJAOjOE9gl5zabMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGpjcnRlc3QubmV3Lm94LmFjLnVrMB4XDTEzMTEwMzIxNTk0N1oXDTIzMTEw
-						MTIxNTk0N1owHzEdMBsGA1UEAxMUamNydGVzdC5uZXcub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8UTciDnh59ywOKTwTmbkZNTYgI1Mz
-						NxF73zZDbKfujWGl1WHTH7xdajdPtYaIYmXSjGgn2nt7IUZqJLEbSgxkyXpivTUe
-						FZcmWWxOghoKHU68YjsgbxKaHldfav0c7LnjTtOzU1yxVX+v2TRNVULTHRBZwVKO
-						8R4GcshmpIW5fLr53UeofuMdOJgTe8Ra90SEUGONBCoeKqwf1gXCy4UFb8B2NoAn
-						NNaiFSOSIqxXva349XU8bYZZNT57kbIa+4tsAzGvQAY0ZvqUpVKezxKbvuP9r+qF
-						MM/x4Y1rx+YKLLebzFP3vwAtW0Jdw1Cgi0A2ov5XtHmHyHEHrGuIkDPpAgMBAAGj
-						azBpMEgGA1UdEQRBMD+CFGpjcnRlc3QubmV3Lm94LmFjLnVrhidodHRwczovL2pj
-						cnRlc3QubmV3Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFN7qW3yVIa1C
-						sZTAQ3GbBz/xAXn0MA0GCSqGSIb3DQEBBQUAA4IBAQCDldZnrvi53hsFku7A3STF
-						mdO+I9YZpwAsT1DvabRgXAakSrgU1KUGBQ0FZJ0/mk9AbSTkgksXAKdmfQs6mJ5+
-						bsC2Tlp773NigTWYvPjGeNtSyRa43SXBVMaaA+19f9CVCElBMpp+WXk9i/s4krK/
-						l4EtgbrADwp+fX56e6OJQHMdYEr5zLV9whvi6erQRIVjY6GfHOJgcG0xazSL94AJ
-						jg6rthw7nWMxfGy5g2m7bR5K9C9hks5la20hBYOduowvjuGDKEentOVJ04RdZ0Ju
-						A4sEXh+cYpGgb/I6uHjcoawS2Dzya/8X0VeiH6UcwvGot5WuSMDg/DSUEUK5b1KJ
-					</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://jcrtest.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrtest.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford New College JCR development systems</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Officer</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Officer</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 197cb772..00000000
--- a/swamid-interfederations-2.0/jcrweb.new.ox.ac.uk-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://jcrweb.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a "New College JCR" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-10-18T10:02:09Z">
-      <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://jcrweb.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIJAM+jRUVpcaogMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2pjcndlYi5uZXcub3guYWMudWswHhcNMTMxMDExMjEyMDIwWhcNMjMxMDA5
-						MjEyMDIwWjAeMRwwGgYDVQQDExNqY3J3ZWIubmV3Lm94LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3RatgWIQ0tgieur/TZdJMa+J7+Qm3D+y
-						1oev1jnx1mgLo/dzafOHFhoJZ3AqLUNJAIbJPNlIhJpGEViwpJnBIlukULWKtF9x
-						UxH/vQvkQhMWxox1bHO4heWt4QmHcBM0vVi84MoobVjHKHk4/IFBg4cD9P8URObR
-						uKhZ5a7UPlOk5+RYN7vP5PjazNzHW3IX68ta3BL2RG4Eni4TGFCuUg9tUVeNFUVN
-						y9JnYcLSRrNOF1ND9XX9p/SjFDV9WvjbWsgyUrTVPTvXSzgYZI58r01WSrE7tz9f
-						dvbOP6KMEgI6JONlYflpA0Cb+QyYqBA4ZFYNsqb2yhg4ZltCwOZDiwIDAQABo2kw
-						ZzBGBgNVHREEPzA9ghNqY3J3ZWIubmV3Lm94LmFjLnVrhiZodHRwczovL2pjcndl
-						Yi5uZXcub3guYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUq8M4jctknnDLTc81
-						iYJG2rgDVYQwDQYJKoZIhvcNAQEFBQADggEBAKmylrHk0WDPwoHAy1KXqQbySSyF
-						LYHyEAWxVceWoY5AozLFysUu0MpllDbZcUTBMs+TzLVpq8PUdrj3A87IVB7WhIzw
-						uwBi61ZmPvMiE43s/5HZJG0ibf48q0ZS7h1cVsUOFaJGYattJUvvfRu0GgtMyjJi
-						/msRlm6B8YkO95AZc9BsxfnuPYn0LRzQyt1T8pObH/oNUsCcvybXJTHG93oE7mRd
-						hryZmf6zRTaMrw9KT6SvQf2Let/RJHv8OK3juH8kw6iraOSc+cK0Ea2rCWJYNWS0
-						aHp4plsboCSy3YDvkk573vE1IbHvoT86Qg9cIOVoUOd1BE8uxQhXOVg/WDM=
-					</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://jcrweb.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jcrweb.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford New College JCR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://jcr.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jakub</GivenName>
-    <SurName>Warmuz</SurName>
-    <EmailAddress>mailto:jakub.warmuz@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml b/swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.xml
deleted file mode 100644
index 6d8b8cab..00000000
--- a/swamid-interfederations-2.0/jenkins.ukfederation.org.uk-entity.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://jenkins.ukfederation.org.uk/entity">
-  <!--
-		This is a "UK federation Jenkins CI server" Shibboleth SP.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-12T10:52:56Z"/>
-    <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 Jenkins CI server</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-					This continuous integration server is part of the UK federation infrastructure and is only
-					available to UK federation team members.
-				</mdui:Description>
-      </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://jenkins.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://jenkins.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://jenkins.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://jenkins.ukfederation.org.uk/Shibboleth.sso/EDS" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEPjCCAyagAwIBAgIJAOVnQ3eBaoIXMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEjAQBgNVBAcTCUVkaW5idXJnaDFD
-						MEEGA1UEChM6VUsgQWNjZXNzIE1hbmFnZW1lbnQgRmVkZXJhdGlvbiBmb3IgRWR1
-						Y2F0aW9uIGFuZCBSZXNlYXJjaDEkMCIGA1UEAxMbamVua2lucy51a2ZlZGVyYXRp
-						b24ub3JnLnVrMB4XDTEzMDcxMjEwMDQxOFoXDTIzMDcxMDEwMDQxOFowgZ8xCzAJ
-						BgNVBAYTAkdCMREwDwYDVQQIEwhTY290bGFuZDESMBAGA1UEBxMJRWRpbmJ1cmdo
-						MUMwQQYDVQQKEzpVSyBBY2Nlc3MgTWFuYWdlbWVudCBGZWRlcmF0aW9uIGZvciBF
-						ZHVjYXRpb24gYW5kIFJlc2VhcmNoMSQwIgYDVQQDExtqZW5raW5zLnVrZmVkZXJh
-						dGlvbi5vcmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCU/xHG
-						Dw0FRJUVC8evIBKqH77osYeVSYqeaHhjnCMDGURYfua8by5lYVWufRS6gVv/MaJU
-						FKbZY9XKPH6uDBJ/l5Lypx6H7V1tZn7BroXg9fNyLrC0WpUrBYw5S+MYFQgEuB+C
-						B2wvuvoKKa0GSPHvgfV/K8ymh08ARsgT83MMfW9rA0+gy2x1AvJt0VYO96rGjI1q
-						0SeDGMWwk58OFXA/4UbIsTg56hl9NfW2QLkSsi4cz/uJD2q1F44Ai/pOUHiT8lVH
-						XAl77Nefma9w5Djng2yVoMd9tQ9Sx5bWOZ6VxnbA0ARJBq/8QzRvkiiQ3Ceacu0G
-						V961M6U1X4ZcqSpRAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
-						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeM+/WeAoJ
-						DPll4Dh3TUT+dI3oPzAfBgNVHSMEGDAWgBSeM+/WeAoJDPll4Dh3TUT+dI3oPzAN
-						BgkqhkiG9w0BAQUFAAOCAQEAHUHH0JodQuv4B984Z8aESW04OJSDFIpYL30luVQr
-						AwFPZ3wopM5qfkO6CpJIa+IK9oQxppOi+Fs+dYEBUYHjXQbx/xbSuqzjr7GE/xS6
-						Kumhmn3Y1RP9/2l0Ema7DMryN7nxIsF+fxDr0LgaXboAMnITKvhf0k5cVDdAO/JT
-						y+lx0ZxwizlzdmjyfmmCIJkUXvPwnh8Le+9AqU2qjh14OPw4cHabf2mtEKAXFkJ/
-						HrX1GuA4GsXXdKYi1Deaj2JIATS/7YTYt4S2vyx+gEN/0+Rg70YC5P9xFWsibAIr
-						WXY859KC7gEzlErCQS2KPKYA4abXdTiut4yaeh+HZN1Ctw==
-					</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://jenkins.ukfederation.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jenkins.ukfederation.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">UK federation Jenkins CI server</ServiceName>
-      <ServiceDescription xml:lang="en">
-				This continuous integration server is part of the UK federation infrastructure and is only
-				available to UK federation team members.
-			</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 Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UK federation Jenkins CI server</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/jidp.jlab.org-idp-shibboleth.xml b/swamid-interfederations-2.0/jidp.jlab.org-idp-shibboleth.xml
deleted file mode 100644
index f445e4a9..00000000
--- a/swamid-interfederations-2.0/jidp.jlab.org-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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://jidp.jlab.org/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://jidp.jlab.org/error-main.html" 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">jlab.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Thomas Jefferson National Accelerator Facility</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Jeffrsson Lab Federation / Single Sign-On server.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://jidp.jlab.org/info.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://jidp.jlab.org/notices/PrivacyAndSecurityNotice.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="89" width="314" xml:lang="en">https://jidp.jlab.org/images/jlab-logo-2015.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>
-MIIDAzCCAeugAwIBAgIJALnZSc3W8jbPMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
-BAMMDWppZHAuamxhYi5vcmcwHhcNMTUxMDA2MTAxNjA4WhcNMjUxMDAzMTAxNjA4
-WjAYMRYwFAYDVQQDDA1qaWRwLmpsYWIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAq0QcBcQ0TE+q/ldmWYn002CTW2tTJyy8ZhGifuOsnUSpuGmv
-C2Fn0uiaOsmS5fWIY7ODJbDCi4lbQaG/rcjVM/ZQV4LhKLzuiZaH/RPtEZaQkfbM
-cWYAWqU2dawgnMe+hrAgnpci7e27HqFqRPnuug/NIl6YO7sdbTVkxCIgmLsvtayw
-9Phnh/hqapuhbQAg574QXndo1Rf1T9EEhXItpXVQi0qpXJpL8sbfy2KHemxME5wf
-3JKpSF6eaBUwZ+AjwOvP45UPHcS+PO9OkdYWCSwlr+ng1c9irdd2y945s5E/2Jrz
-6yMpN3lrXpB4m4S/Okj7x/wr2pDJgl4YsY61WQIDAQABo1AwTjAdBgNVHQ4EFgQU
-HkkTLqtEStiUx6pTaq/7Wm1YRaQwHwYDVR0jBBgwFoAUHkkTLqtEStiUx6pTaq/7
-Wm1YRaQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAWqcKe9R2eOrW
-A72CXwx1zNDRMZ7SA/HAc3jLi6bYFY9RP/XvtFLnPx+k7VyGyTWmo3D6HDDVffdL
-jgXg2k8PzZSND120m6FO4pCn3wHoE6bDXSWupvZ3MDQx548nD74cPV/PZHXM2CoK
-+YKuysd/yw70fs5F9NXc6KCRM3oWMDSyBF6bYpdANW6mXYYpUM1rGH3UAOr4DqgR
-zQ22wyEgR+wadv1F8mNMuy36OX2p1J+uAGcf5H369ILzrHnx+pLgfLwcI+g9ykGU
-1i9hmm8hl7nCznl7VjdmpM+K+o/3PLkJDUFDlh0rIdUkjd8/2RjU1xYipNlaRZv8
-5WBcTMLk6w==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jidp.jlab.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jidp.jlab.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://jidp.jlab.org/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jidp.jlab.org/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jidp.jlab.org/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jlab.org</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDAzCCAeugAwIBAgIJALnZSc3W8jbPMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
-BAMMDWppZHAuamxhYi5vcmcwHhcNMTUxMDA2MTAxNjA4WhcNMjUxMDAzMTAxNjA4
-WjAYMRYwFAYDVQQDDA1qaWRwLmpsYWIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAq0QcBcQ0TE+q/ldmWYn002CTW2tTJyy8ZhGifuOsnUSpuGmv
-C2Fn0uiaOsmS5fWIY7ODJbDCi4lbQaG/rcjVM/ZQV4LhKLzuiZaH/RPtEZaQkfbM
-cWYAWqU2dawgnMe+hrAgnpci7e27HqFqRPnuug/NIl6YO7sdbTVkxCIgmLsvtayw
-9Phnh/hqapuhbQAg574QXndo1Rf1T9EEhXItpXVQi0qpXJpL8sbfy2KHemxME5wf
-3JKpSF6eaBUwZ+AjwOvP45UPHcS+PO9OkdYWCSwlr+ng1c9irdd2y945s5E/2Jrz
-6yMpN3lrXpB4m4S/Okj7x/wr2pDJgl4YsY61WQIDAQABo1AwTjAdBgNVHQ4EFgQU
-HkkTLqtEStiUx6pTaq/7Wm1YRaQwHwYDVR0jBBgwFoAUHkkTLqtEStiUx6pTaq/7
-Wm1YRaQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAWqcKe9R2eOrW
-A72CXwx1zNDRMZ7SA/HAc3jLi6bYFY9RP/XvtFLnPx+k7VyGyTWmo3D6HDDVffdL
-jgXg2k8PzZSND120m6FO4pCn3wHoE6bDXSWupvZ3MDQx548nD74cPV/PZHXM2CoK
-+YKuysd/yw70fs5F9NXc6KCRM3oWMDSyBF6bYpdANW6mXYYpUM1rGH3UAOr4DqgR
-zQ22wyEgR+wadv1F8mNMuy36OX2p1J+uAGcf5H369ILzrHnx+pLgfLwcI+g9ykGU
-1i9hmm8hl7nCznl7VjdmpM+K+o/3PLkJDUFDlh0rIdUkjd8/2RjU1xYipNlaRZv8
-5WBcTMLk6w==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jidp.jlab.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Thomas Jefferson National Accelerator Facility</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Thomas Jefferson National Accelerator Facility</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://education.jlab.org/index.php</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marty Wise</md:GivenName>
-    <md:EmailAddress>wise@jlab.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Marty Wise</md:GivenName>
-    <md:EmailAddress>wise@jlab.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>JLab IT Helpdesk</md:GivenName>
-    <md:EmailAddress>helpdesk@jlab.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>JLab Cyber Security Operations</md:GivenName>
-    <md:EmailAddress>secops@jlab.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml b/swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.xml
deleted file mode 100644
index a65fc754..00000000
--- a/swamid-interfederations-2.0/jisrc.mercury.hosting.eduserv.org.uk-oa-metadata.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://jisrc.mercury.hosting.eduserv.org.uk/oa/metadata">
-  <!--
-		This is an OpenAthens 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"/>
-  </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>
-						MIIDqTCCApGgAwIBAgIJAPDI+Ol0Xn6oMA0GCSqGSIb3DQEBBQUAMEExEDAOBgNV
-						BAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGluZy5lZHVz
-						ZXJ2Lm9yZy51azAeFw0xMTA2MzAxMzI3MDBaFw0yMTA2MjcxMzI3MDBaMEExEDAO
-						BgNVBAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGluZy5l
-						ZHVzZXJ2Lm9yZy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOTA
-						ZTBha819J62QySsCGuEUyR5kEWxqLCJwR/mVGszwh02W/Mlze6MOInxzDj3vQmOi
-						3PGqqfrHq++uTxnT7N4U0TXDq4GpIw3yeFKjAry4s0fJVLlWm5Jsij7tcWEp1aus
-						DgRFvmDIMsR1UyRlfEeY1Ip3KfGsZ1sHhEnyiWImc+wZO6EewDTHl+i/5nMM82HQ
-						CfE53syeeLSyOkLlm5Mma4qbqb8rmX7ASva54Lgiy/zm0pRnUUxUPFVh4cKbPtJ7
-						ib+FMyge0fMzKJSozhQM4/RUzcdkPwoUobvl1hVNpvNvgBKavGY61uRIip1UK3dt
-						I8318jahHjlgOeFtwkECAwEAAaOBozCBoDAdBgNVHQ4EFgQUluqwb/9EM1UOnRTf
-						1CDLbbg3Do0wcQYDVR0jBGowaIAUluqwb/9EM1UOnRTf1CDLbbg3Do2hRaRDMEEx
-						EDAOBgNVBAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGlu
-						Zy5lZHVzZXJ2Lm9yZy51a4IJAPDI+Ol0Xn6oMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEFBQADggEBAOMyu0YB1WMyzkPXHLUX0AGeHsQXfuoaMHPQXRrCCRdtHZVG
-						boVz41c/jLt7oqOTxX26MA9PL2fwgjn4yDS+Jqkb0qwm2w/8m6jtIQQcbMoR+7f+
-						uZCmeEf7CgSss+yKcBeDmdeolCH0YjikLFNi+ID1i3qUOLqTRGxvTUI9aGR6n5GF
-						FgUlTlX3oZ6t06BaqHmj15GruaiRQzY20Y9HKmkto+GtbRiUSTz7Ro8QzuWowzZP
-						QN9mVYa8gEYLRvVkAz5ufqMmYkVorild4HsDy3/ZAAYp6f/vS30IYiOXiIRVyP0C
-						UaM4zFto2VO2ZYhxM7KHthHBUKzw3SRmx7MJSsQ=
-					</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>
-						MIIDqTCCApGgAwIBAgIJAPDI+Ol0Xn6oMA0GCSqGSIb3DQEBBQUAMEExEDAOBgNV
-						BAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGluZy5lZHVz
-						ZXJ2Lm9yZy51azAeFw0xMTA2MzAxMzI3MDBaFw0yMTA2MjcxMzI3MDBaMEExEDAO
-						BgNVBAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGluZy5l
-						ZHVzZXJ2Lm9yZy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOTA
-						ZTBha819J62QySsCGuEUyR5kEWxqLCJwR/mVGszwh02W/Mlze6MOInxzDj3vQmOi
-						3PGqqfrHq++uTxnT7N4U0TXDq4GpIw3yeFKjAry4s0fJVLlWm5Jsij7tcWEp1aus
-						DgRFvmDIMsR1UyRlfEeY1Ip3KfGsZ1sHhEnyiWImc+wZO6EewDTHl+i/5nMM82HQ
-						CfE53syeeLSyOkLlm5Mma4qbqb8rmX7ASva54Lgiy/zm0pRnUUxUPFVh4cKbPtJ7
-						ib+FMyge0fMzKJSozhQM4/RUzcdkPwoUobvl1hVNpvNvgBKavGY61uRIip1UK3dt
-						I8318jahHjlgOeFtwkECAwEAAaOBozCBoDAdBgNVHQ4EFgQUluqwb/9EM1UOnRTf
-						1CDLbbg3Do0wcQYDVR0jBGowaIAUluqwb/9EM1UOnRTf1CDLbbg3Do2hRaRDMEEx
-						EDAOBgNVBAoTB2ppc2Nyc2MxLTArBgNVBAMTJGppc3JjLm1lcmN1cnkuaG9zdGlu
-						Zy5lZHVzZXJ2Lm9yZy51a4IJAPDI+Ol0Xn6oMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEFBQADggEBAOMyu0YB1WMyzkPXHLUX0AGeHsQXfuoaMHPQXRrCCRdtHZVG
-						boVz41c/jLt7oqOTxX26MA9PL2fwgjn4yDS+Jqkb0qwm2w/8m6jtIQQcbMoR+7f+
-						uZCmeEf7CgSss+yKcBeDmdeolCH0YjikLFNi+ID1i3qUOLqTRGxvTUI9aGR6n5GF
-						FgUlTlX3oZ6t06BaqHmj15GruaiRQzY20Y9HKmkto+GtbRiUSTz7Ro8QzuWowzZP
-						QN9mVYa8gEYLRvVkAz5ufqMmYkVorild4HsDy3/ZAAYp6f/vS30IYiOXiIRVyP0C
-						UaM4zFto2VO2ZYhxM7KHthHBUKzw3SRmx7MJSsQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jisrc.mercury.hosting.eduserv.org.uk/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Services Management Company Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">JISC Services Management Company Ltd: JISC RSC CMS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jiscadvance.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Eduserve Service Desk</GivenName>
-    <EmailAddress>mailto:support@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Eduserve Service Desk</GivenName>
-    <EmailAddress>mailto:support@eduserv.org.uk</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 dffa288c..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://joaodebarro.iffarroupilha.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://joaodebarro.iffarroupilha.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://joaodebarro.iffarroupilha.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://joaodebarro.iffarroupilha.edu.br:8443/idp/profile/SAML1/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">IFFarroupilha - Instituto Federal Farroupilha</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFFarroupilha - Instituto Federal Farroupilha</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFFarroupilha - Instituto Federal Farroupilha</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iffarroupilha.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.iffarroupilha.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Everton Fava</md:SurName>
-    <md:EmailAddress>everton.fava@iffarroupilha.edub.r</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index 92213293..00000000
--- a/swamid-interfederations-2.0/jomectechnicaloffice.sisoshibboleth.co.uk-entity.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://jomectechnicaloffice.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Cardiff School of Journalism, Media and Cultural Studies Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2014-08-01T11:48:03Z">
-      <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://jomectechnicaloffice.siso.co/sso/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://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Cardiff School of Journalism, Media and Cultural Studies Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Cardiff School of Journalism, Media and Cultural Studies Online Resource Booking</mdui:Description>
-        <mdui:Logo height="60" width="60">https://jomectechnicaloffice.siso.co/images/layout/siso-logo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jomectechnicaloffice.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Cardiff School of Journalism, Media and Cultural Studies Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/journalarchives.jisc.ac.uk-shibboleth.xml
deleted file mode 100644
index 2833e3ce..00000000
--- a/swamid-interfederations-2.0/journalarchives.jisc.ac.uk-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://journalarchives.jisc.ac.uk/shibboleth">
-  <!--
-		This is a "Journal Archives" Shibboleth SP for Jisc.
-	-->
-  <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="2014-11-28T11:24:58Z">
-      <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://journalarchives.jisc.ac.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://journalarchives.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Journal Archives</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Journal archives from a range of publishers and societies</mdui:Description>
-        <mdui:Logo height="78" width="258">https://journalarchives.jisc.ac.uk/Login/journalarchives.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEETCCAvmgAwIBAgIJAKgxolJV/8T9MA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
-						BAYTAkdCMRMwEQYDVQQIEwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVy
-						MQ0wCwYDVQQKEwRKaXNjMQ4wDAYDVQQLEwVNaW1hczEjMCEGA1UEAxMaam91cm5h
-						bGFyY2hpdmVzLmppc2MuYWMudWswHhcNMTQxMTEwMTUzOTAyWhcNMjQxMTA3MTUz
-						OTAyWjB7MQswCQYDVQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UE
-						BxMKTWFuY2hlc3RlcjENMAsGA1UEChMESmlzYzEOMAwGA1UECxMFTWltYXMxIzAh
-						BgNVBAMTGmpvdXJuYWxhcmNoaXZlcy5qaXNjLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAsM9KyvNgUEVD6RBVV5FbcVgnkltHhgegfpVTJ8xR
-						bzpRTekHIp6FvTzX0uF7NK3hnG7q0reo15cqJldDRNjUKoLrTrjSPbu+8zL+Z3l+
-						JnaTiy6HowB30hHc/YydK+X8GA3r6LNRmtAdciS+lkZQHdn4JIUosYPfS2PcgMDD
-						l9ck/CxG58jWR/GhD/Tx9exu902PEr5sXsaOJkoPLWqXOvxLLd867HA5JbUN6qZe
-						ls1Mtvpvj2GC1kU8aU7bBjmX9Cz7lQYJijDK3BC6VbKdHI6p7OH3r6cIPUwWkYKJ
-						ytg40bQwHX3TatBgsS+43yQc7Lky3+XzYp5v2XekTjufnQIDAQABo4GXMIGUMAkG
-						A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-						BQcDAjAlBgNVHREEHjAcghpqb3VybmFsYXJjaGl2ZXMuamlzYy5hYy51azA0BgNV
-						HRIELTArgSltaW1hcy1zaGliLXRlY2hAbGlzdHNlcnYubWFuY2hlc3Rlci5hYy51
-						azANBgkqhkiG9w0BAQUFAAOCAQEAeHESBFlQcPHfRo7eU/SA2dAZpq0V0brrtF+D
-						Kq+A5/lbscUP6q5g5wA46JapB3NpKBgMK2WTa4Ms/OTv1y49YWqCDSPC+L5+rxZ6
-						iLypmPXb6tUNS6CuJV27Lm26mx2ecHTvwB1wXjoLZ27BJneN0hfA4hWhXIBGYjKh
-						Wz8zmrlfqu4WFQQojXIc5tVLSoqEnaUYcvo03OpXyq3pGDoN6+ipoZ03PyXHbDLS
-						9HoL2DVz9hb4oJf8j5nolo8C/Kcve9hdMeA84NgWZc0RJV19OBLr/2FNUPsb8csF
-						lUdHvWbKrO6c0VrEQ9nI9+A2GvR9SRsaUJRnEUBnw+ZwSjXlfQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://journalarchives.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://journalarchives.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Jisc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Journal Archives</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://mimas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Journal Archives Helpdesk</GivenName>
-    <EmailAddress>mailto:journalarchives@mimas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml b/swamid-interfederations-2.0/journals.bmj.com-shibboleth.xml
deleted file mode 100644
index 95d9758f..00000000
--- a/swamid-interfederations-2.0/journals.bmj.com-shibboleth.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://journals.bmj.com/shibboleth">
-  <!--
-		This is a "BMJ Journals" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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="2008-08-27T11:16: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: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://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">BMJ Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://journals.bmj.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/journals.bmj.com.xml b/swamid-interfederations-2.0/journals.bmj.com.xml
deleted file mode 100644
index 4c7ce4d9..00000000
--- a/swamid-interfederations-2.0/journals.bmj.com.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://journals.bmj.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/bmjjournals/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">BMJ Journals</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">BMJ Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://journals.bmj.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml
deleted file mode 100644
index 47195d85..00000000
--- a/swamid-interfederations-2.0/journals.heacademy.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://journals.heacademy.ac.uk/shibboleth">
-  <!--
-		This is a 'Higher Education Academy' OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-19T12:00:00Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIJAJOTTFp5kRupMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGpvdXJuYWxzLmhlYWNhZGVteS5hYy51azAeFw0xMzAzMjgwMDI0MDlaFw0x
-						NjAzMjcwMDI0MDlaMCMxITAfBgNVBAMTGGpvdXJuYWxzLmhlYWNhZGVteS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOQ1INQ2UjzPpKIERLZ
-						T4ImAal+OGN8XMHm54PSKVdl6oMmXOQW/oshCsm+Wd768BHhfSgajkKJQ9cGLdKG
-						rQcPg0NeGlebSQxEAU5EymIbgJdyA03NSAK9C1iPdGkJ5+PNE88eKtQP/cVwa/QC
-						RymCnLroxKfquAVvf/iLiTJtx0oIuLS3PaVoqSrBrRU6vJOtim7xaWBaJVmvd0I1
-						FT+wgIkHtRRCi6O7ku31n1CfXuBenov/NLxOW1HpLHYqX9H+Mxt5XPjzs7vf3cIy
-						hE6c5NVtN9S2qNsXhHvZMB5JQcOk6JFv/K5yxElR0/W53KQN8pstmmXQrSjAliPa
-						8UUCAwEAAaNzMHEwUAYDVR0RBEkwR4IYam91cm5hbHMuaGVhY2FkZW15LmFjLnVr
-						hitodHRwczovL2pvdXJuYWxzLmhlYWNhZGVteS5hYy51ay9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBRZYwKjd2FZxBTfe1YCf4Uciwsz9jANBgkqhkiG9w0BAQUFAAOCAQEA
-						bhkLgMPYt9MdLliyOC7frDpRExeYqYeGQ+LS5vnY9FwT3rAkIlutdaCbqZijh8Jl
-						9p8vRWcKJuGmYSHMxIrciHTmjSkNa/zYLsP3+QGLzre9MQfJZ5YiwMA9ym05xbon
-						hgCKylNLWd8lQIIf3joPFBOI5dgfey8dUxoIVk2e1x8YRv2OcNfpkGQkp1HyXs3T
-						lLhRoL+MLFM0aKaW18hNnV3Uuhj5OoBKJQCWbtJix2yrO2MUqUNORWsdExS69Hev
-						q88umX3v6Cwt6Ri/vzVQOj/4u5vQ6NY1evS6uEYxlnfneEICxZ1WRKqXdA1MWfO4
-						aaX1Y4N8Fbb80yxu7/QWIQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://journals.heacademy.ac.uk/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journals.heacademy.ac.uk/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journals.heacademy.ac.uk/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Higher Education Academy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://journals.heacademy.ac.uk/</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/journals.rcni.com-shibboleth.xml b/swamid-interfederations-2.0/journals.rcni.com-shibboleth.xml
deleted file mode 100644
index b4865990..00000000
--- a/swamid-interfederations-2.0/journals.rcni.com-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://journals.rcni.com/shibboleth">
-  <!--
-		This is a "Royal College of Nursing Publishing" OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-06T13:47:37Z">
-      <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">RCNi</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-					RCNi is the premier provider of innovative and creative information solutions 
-					for the whole nursing team and allied health professionals.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://journals.rcni.com/page/about-us</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIJAMqMZUiIsl4nMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEXJjbnB1Ymxpc2hpbmcuY29tMB4XDTEzMTAwMzIxMzU1OFoXDTIzMTAwMTIx
-						MzU1OFowHDEaMBgGA1UEAxMRcmNucHVibGlzaGluZy5jb20wggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDBlUJDDRaIIieWxx02H8sbXKNbUE6X+ZQbDeEk
-						ifb/0TqrolBjWGbwIB55jf4qL5aHy1Xb9lWiuItveLETbDsb6LGVRXjoBLMD/hq/
-						INQNKlId7sUyaDD1dKdWo8vZAORnLLJfiNfJBFSfwt8dnnQihsv8ip1sQonfdjWF
-						2JaPRwKHX864wn6x8CvqOgRNheowlhj6Hq69zX9mL9bKww6MC9c++11rwOYHVdGZ
-						vZqhU0CxzNTDJWDRYwu5//PpMDLMJGTpbuRnN0SRR0uOJ6H9hACTO4MLGzO/WF4X
-						cU1+I48q2gCdsZ2LaHWmNJqIy5IU24r2gu75uYAdUfE/n6UxAgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEXJjbnB1Ymxpc2hpbmcuY29thiRodHRwczovL3JjbnB1Ymxpc2hp
-						bmcuY29tL3NoaWJib2xldGgwHQYDVR0OBBYEFBME3+HToUv+o1RLhxpnUhzXeecR
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAiMV6SbpPn4cSK/tteSnvlGDu0kx0WrKHcq70j
-						/TQyKZYc/roD1Xsbusj6kNhtbyg2UDKZMtUDJUX49Gy6od4hMft/LaO0d+S0fBA5
-						pMGEl3rQpubIUem/SBAfN+Au+7j6yqi0vukGCqSWNAaQXt/XqkKys69b/CIbqkrm
-						ggWl3cXSrJx7GPKL1S9O5Oxd/cJO+g32L9qMH7LuKHLlnkEH8O5ZKjZjn+F6rBy7
-						BBfwdYT/FpEL/nu+CPZwOcochpjY1HNtmq8tYGHv85r3mZkaLLnd+t0HGTw8X/Rs
-						Ulakv64cRCvOJRV/8DpP8bRsMrlqMkCQ2N3nu3eWKuQsgp67
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://journals.rcni.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://journals.rcni.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://journals.rcni.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal College of Nursing Publishing</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://journals.rcni.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/judge.wcu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/judge.wcu.edu-idp-shibboleth.xml
deleted file mode 100644
index 99bbe2fa..00000000
--- a/swamid-interfederations-2.0/judge.wcu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,103 +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://judge.wcu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">wcu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Western Carolina University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.wcu.edu</mdui:InformationURL>
-        <mdui:Logo height="70" width="171" xml:lang="en">https://judge.wcu.edu/idp/images/wculogo.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>
-MIIDAzCCAeugAwIBAgIJAMwcokVuvUtTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMMDWp1ZGdlLndjdS5lZHUwHhcNMTMwMzAxMjAyMzA0WhcNMjMwMzAyMjAyMzA0
-WjAYMRYwFAYDVQQDDA1qdWRnZS53Y3UuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAsVhnO72sN9OTCnD4ZomHvGlMmZ/dzryb5eabvKvYanwuNfcy
-w39B8IuWyEbXZeR3OjDwlGkkmVb4slU7pzt5m/LificVrGEmYFsiM8IBTJMIn7h/
-2mS030ZCKS6YGgOMpSctaGUj+Ss/42Sdtgv/NW1bvXDLkB+3gpjJ7ypp+JFSt2c3
-kfhgP/vKqQhJfYWA7Hmiv1PJW0tIbWr3KfbLD8c93L3ogZLlRUvhj4NBwD4JlqDR
-0x3PhNfFqVZ96rCJnL+CA51y7c6SnXhQ0UV0ogIqmsUQXeoyLJBdXDuZRX1RBt00
-MfvprphVHYcEviANqDqc3QWp5Q9iCWAlxzTpuwIDAQABo1AwTjAdBgNVHQ4EFgQU
-9Q4zcYCEnOTK0NfRPbhlTNroUu0wHwYDVR0jBBgwFoAU9Q4zcYCEnOTK0NfRPbhl
-TNroUu0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAqoLlA+7iun5/
-oKIAoRa+7KsxhqOj+Tma0YGqUiE4c26Hrq5HQeIKth7Bdy7yYFFpihEZdRdL0R2z
-Vw15xUTHkzMRbXYzLTLCejM8PIXuBymAapKRTcOgc0hhIR3taMnzqrRr9yGI0q8I
-4tN4D5XLJOOWALcCyA4cZTFtcPRzMiPa7NN0gBdT0GovdtKzg+0L0VjkaQRgWj85
-nu9QYDv3QLT3bKbbVxlHgmcF375m4y6ztSn9NTVI9vbQ1DwP8kbOGyfHZ4mIr+jb
-xOXJMBYALX0MFAdPtoE+V5+8GhV4syXPQmL4HFrK/Ywdx+4ER+/Ld7ovoZCxI1eb
-u+Vt6r08yQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://judge.wcu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://judge.wcu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://judge.wcu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://judge.wcu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://judge.wcu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wcu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDAzCCAeugAwIBAgIJAMwcokVuvUtTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMMDWp1ZGdlLndjdS5lZHUwHhcNMTMwMzAxMjAyMzA0WhcNMjMwMzAyMjAyMzA0
-WjAYMRYwFAYDVQQDDA1qdWRnZS53Y3UuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAsVhnO72sN9OTCnD4ZomHvGlMmZ/dzryb5eabvKvYanwuNfcy
-w39B8IuWyEbXZeR3OjDwlGkkmVb4slU7pzt5m/LificVrGEmYFsiM8IBTJMIn7h/
-2mS030ZCKS6YGgOMpSctaGUj+Ss/42Sdtgv/NW1bvXDLkB+3gpjJ7ypp+JFSt2c3
-kfhgP/vKqQhJfYWA7Hmiv1PJW0tIbWr3KfbLD8c93L3ogZLlRUvhj4NBwD4JlqDR
-0x3PhNfFqVZ96rCJnL+CA51y7c6SnXhQ0UV0ogIqmsUQXeoyLJBdXDuZRX1RBt00
-MfvprphVHYcEviANqDqc3QWp5Q9iCWAlxzTpuwIDAQABo1AwTjAdBgNVHQ4EFgQU
-9Q4zcYCEnOTK0NfRPbhlTNroUu0wHwYDVR0jBBgwFoAU9Q4zcYCEnOTK0NfRPbhl
-TNroUu0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAqoLlA+7iun5/
-oKIAoRa+7KsxhqOj+Tma0YGqUiE4c26Hrq5HQeIKth7Bdy7yYFFpihEZdRdL0R2z
-Vw15xUTHkzMRbXYzLTLCejM8PIXuBymAapKRTcOgc0hhIR3taMnzqrRr9yGI0q8I
-4tN4D5XLJOOWALcCyA4cZTFtcPRzMiPa7NN0gBdT0GovdtKzg+0L0VjkaQRgWj85
-nu9QYDv3QLT3bKbbVxlHgmcF375m4y6ztSn9NTVI9vbQ1DwP8kbOGyfHZ4mIr+jb
-xOXJMBYALX0MFAdPtoE+V5+8GhV4syXPQmL4HFrK/Ywdx+4ER+/Ld7ovoZCxI1eb
-u+Vt6r08yQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://judge.wcu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Western Carolina University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Western Carolina University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wcu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Joshua Bright</md:GivenName>
-    <md:EmailAddress>jbright@wcu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Joshua Bright</md:GivenName>
-    <md:EmailAddress>jbright@wcu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Joel McKenzie</md:GivenName>
-    <md:EmailAddress>mckenzie@wcu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Stan Hammer</md:GivenName>
-    <md:EmailAddress>shammer@wcu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/junebug.mcc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/junebug.mcc.edu-idp-shibboleth.xml
deleted file mode 100644
index 8de74b8f..00000000
--- a/swamid-interfederations-2.0/junebug.mcc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +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://junebug.mcc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">mcc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Mott Community College</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>
-MIIDKDCCAhCgAwIBAgIVAPBoW9t0fielvd212h1N5MgEuZUVMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2p1bmVidWcubWNjLmVkdTAeFw0xMzA1MTYxNTE2MzRa
-Fw0zMzA1MTYxNTE2MzRaMBoxGDAWBgNVBAMTD2p1bmVidWcubWNjLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2vmGgtRF4UfZ30ySXHKJ0CMEKV
-2AZkaiXbkN3E08Xr+QvTL7mIzflvoXUN12IAMkCUHnbPzgKVePSxjY3OI/5e48vh
-qd9araq4pB4dII2kCDc5duZ4MoBeX2ZlAc5Bpg+Cn24wtpwqHu4U3fUEWzgNNnnc
-NeyDyC3cYISciggCA62a26wdE42tW6uEibhA5JeuVSgPjbE/fMUPJjY8mjUkGhk8
-WuxtL8P+kWixPk7FFaFMYIaij0J4/Ql6/zkkR95fPqLpSANHgJlzJXrDNxmXUh8E
-4jlnaOxNVs6IAvcEx5UPuI4/1zVGRb2hVX7uXbw/rQYAq3JVD2onFI99I9UCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPanVuZWJ1Zy5tY2MuZWR1hiZodHRwczovL2p1bmVi
-dWcubWNjLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUBclBgSQJE3DPmZEc
-GsnVOIDkzlkwDQYJKoZIhvcNAQEFBQADggEBAEc3/eqA6ogjGSn/+hd9aYmPShFO
-mED1osTk3Yns6oZ3A9TRMAco0I54SjPTkP6vy9urwHTJI6JV7b/wIk9s9DZlwFS9
-lxK6z0u9Q8863SHhdaIHgzmqfnZFO5aDm/L2z2rdAJi6RMmLgfHT/z9AqSOeEewK
-Xz2Xa12ODXqbT6o7v6IB6FPP30mM8pbeH5hONcXg1wubBDVBq06YNpWpLtBRP0uM
-6Als7GmwG6Kzt8d09co99CPLCwDmGPgS/LVCL0XixRn6tmlTmf8ljSFwYEqPBiIP
-TI96HuGWzFL4Q5mXqWBbH1c2guyGQH9+31AtSqhqEPSf+nUwZmK5nB2wbBA=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://junebug.mcc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://junebug.mcc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://junebug.mcc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://junebug.mcc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://junebug.mcc.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAPBoW9t0fielvd212h1N5MgEuZUVMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2p1bmVidWcubWNjLmVkdTAeFw0xMzA1MTYxNTE2MzRa
-Fw0zMzA1MTYxNTE2MzRaMBoxGDAWBgNVBAMTD2p1bmVidWcubWNjLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2vmGgtRF4UfZ30ySXHKJ0CMEKV
-2AZkaiXbkN3E08Xr+QvTL7mIzflvoXUN12IAMkCUHnbPzgKVePSxjY3OI/5e48vh
-qd9araq4pB4dII2kCDc5duZ4MoBeX2ZlAc5Bpg+Cn24wtpwqHu4U3fUEWzgNNnnc
-NeyDyC3cYISciggCA62a26wdE42tW6uEibhA5JeuVSgPjbE/fMUPJjY8mjUkGhk8
-WuxtL8P+kWixPk7FFaFMYIaij0J4/Ql6/zkkR95fPqLpSANHgJlzJXrDNxmXUh8E
-4jlnaOxNVs6IAvcEx5UPuI4/1zVGRb2hVX7uXbw/rQYAq3JVD2onFI99I9UCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPanVuZWJ1Zy5tY2MuZWR1hiZodHRwczovL2p1bmVi
-dWcubWNjLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUBclBgSQJE3DPmZEc
-GsnVOIDkzlkwDQYJKoZIhvcNAQEFBQADggEBAEc3/eqA6ogjGSn/+hd9aYmPShFO
-mED1osTk3Yns6oZ3A9TRMAco0I54SjPTkP6vy9urwHTJI6JV7b/wIk9s9DZlwFS9
-lxK6z0u9Q8863SHhdaIHgzmqfnZFO5aDm/L2z2rdAJi6RMmLgfHT/z9AqSOeEewK
-Xz2Xa12ODXqbT6o7v6IB6FPP30mM8pbeH5hONcXg1wubBDVBq06YNpWpLtBRP0uM
-6Als7GmwG6Kzt8d09co99CPLCwDmGPgS/LVCL0XixRn6tmlTmf8ljSFwYEqPBiIP
-TI96HuGWzFL4Q5mXqWBbH1c2guyGQH9+31AtSqhqEPSf+nUwZmK5nB2wbBA=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://junebug.mcc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Mott Community College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Mott Community College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mcc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marc Smith</md:GivenName>
-    <md:EmailAddress>marc.smith@mcc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6e7f0eda..00000000
--- a/swamid-interfederations-2.0/katalog.svkos.cz-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://katalog.svkos.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUOaQEEERrbashpZa05w//pJQCTE0wDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQa2F0YWxvZy5zdmtvcy5jejAeFw0xNTA4MTIyMTE4NTla
-Fw0yNTA4MTIyMTE4NTlaMBsxGTAXBgNVBAMMEGthdGFsb2cuc3Zrb3MuY3owggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClR0WK0cmbSWU8RArh2svrRpft
-S4nHdg41jsbx0uKJWmpjVpxzIO8t1fpvgQEdjSM2mIBBuSeCpBX+O1Hogk8H7d1Y
-h4LLEkGKiBLQNZRxKueDGc1Pc54+iYy6oMcl1fhaoqphSkW9CqJXGb8lGEnfa8+t
-+MO62kESeTV/9L1fHb0exJgqzCrml/Byev7uXdaqRWqRVeXxy6eXlWhlLGwkPXMf
-9CbIyE5DyXHUupoJu8aiNh11JuR1VgZLUoOOS3yHE53HK200pISag+PIqc2g6hAw
-GHOjKJRcUrZSaqKKRvv39TLwqq9gPL3pSUVJ+G7GYc+mBFpclz/g+H/cCt0vAgMB
-AAGjZzBlMB0GA1UdDgQWBBQx4EEeJ3tf34XxGVnEpsE1hXAfTjBEBgNVHREEPTA7
-ghBrYXRhbG9nLnN2a29zLmN6hidodHRwczovL2thdGFsb2cuc3Zrb3MuY3ovaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACPiFGXFPzxPH/eTQKbJT5lP
-yOcSE2rtal8W4QDrkE4hU220t/JjQVsRzKMnvsv/rgY6CzEYcMkPitPjJoJXmLWY
-JZaaTxx0LosXA0MU8wBj6JKTMSDJ/EEkJOQuak+2lxxwv6greAAe/Ye+6x1fqN1h
-JE6TMVker9+t4OjM0aTX5LeBvJs7ZKwbTDsnm9y9I8EPwtPnX96M3cd/D7H5h4mF
-UUObFs5lyLqvErUgn3FwKNMmi2FrTI0J1HQtLx87hfeUvriApTOW/apm+kqWE6P5
-iZxetNC82lCt7vGHOz5cXzYN2MEuqqCvAM2dTLO7rRhrSctONV0qrHlg1vZ4Vbw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://katalog.svkos.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://katalog.svkos.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://katalog.svkos.cz/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">svkos.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUOaQEEERrbashpZa05w//pJQCTE0wDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQa2F0YWxvZy5zdmtvcy5jejAeFw0xNTA4MTIyMTE4NTla
-Fw0yNTA4MTIyMTE4NTlaMBsxGTAXBgNVBAMMEGthdGFsb2cuc3Zrb3MuY3owggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClR0WK0cmbSWU8RArh2svrRpft
-S4nHdg41jsbx0uKJWmpjVpxzIO8t1fpvgQEdjSM2mIBBuSeCpBX+O1Hogk8H7d1Y
-h4LLEkGKiBLQNZRxKueDGc1Pc54+iYy6oMcl1fhaoqphSkW9CqJXGb8lGEnfa8+t
-+MO62kESeTV/9L1fHb0exJgqzCrml/Byev7uXdaqRWqRVeXxy6eXlWhlLGwkPXMf
-9CbIyE5DyXHUupoJu8aiNh11JuR1VgZLUoOOS3yHE53HK200pISag+PIqc2g6hAw
-GHOjKJRcUrZSaqKKRvv39TLwqq9gPL3pSUVJ+G7GYc+mBFpclz/g+H/cCt0vAgMB
-AAGjZzBlMB0GA1UdDgQWBBQx4EEeJ3tf34XxGVnEpsE1hXAfTjBEBgNVHREEPTA7
-ghBrYXRhbG9nLnN2a29zLmN6hidodHRwczovL2thdGFsb2cuc3Zrb3MuY3ovaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACPiFGXFPzxPH/eTQKbJT5lP
-yOcSE2rtal8W4QDrkE4hU220t/JjQVsRzKMnvsv/rgY6CzEYcMkPitPjJoJXmLWY
-JZaaTxx0LosXA0MU8wBj6JKTMSDJ/EEkJOQuak+2lxxwv6greAAe/Ye+6x1fqN1h
-JE6TMVker9+t4OjM0aTX5LeBvJs7ZKwbTDsnm9y9I8EPwtPnX96M3cd/D7H5h4mF
-UUObFs5lyLqvErUgn3FwKNMmi2FrTI0J1HQtLx87hfeUvriApTOW/apm+kqWE6P5
-iZxetNC82lCt7vGHOz5cXzYN2MEuqqCvAM2dTLO7rRhrSctONV0qrHlg1vZ4Vbw=
-                </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://katalog.svkos.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://katalog.svkos.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Moravian-Silesian Research Library in Ostrava</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">Moravskoslezská vědecká knihovna v Ostravě</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Moravian-Silesian Research Library in Ostrava</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.svkos.cz/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.svkos.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Magda</md:GivenName>
-    <md:SurName>Zavilová</md:SurName>
-    <md:EmailAddress>zavilova@svkos.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kbplus.k-int.com-shibboleth.xml b/swamid-interfederations-2.0/kbplus.k-int.com-shibboleth.xml
deleted file mode 100644
index b2d4fd66..00000000
--- a/swamid-interfederations-2.0/kbplus.k-int.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://kbplus.k-int.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Knowledge Integration Ltd.
-	-->
-  <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="2014-01-03T11:58: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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Knowledge Integration Ltd</mdui:DisplayName>
-      </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://kbplus.k-int.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://kbplus.k-int.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAPwTavbo3IrSMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGticGx1cy5rLWludC5jb20wHhcNMTMxMjIzMTgzMDA4WhcNMjMxMjIxMTgz
-						MDA4WjAbMRkwFwYDVQQDExBrYnBsdXMuay1pbnQuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA7fBPgC0AH+qt5xKCAoaKj+0ochHqjdqcTeArNf6/
-						u6h6WC7ycqyOiNlo0+zAL9hCl6TCItCVHc0XbWdR/jl0T9Xexwb2ldIqeQDmR6Zl
-						zrNz0T5Z6Zi8GrhfxM7D+7CnnDCxlehSSnDlv2v1KRVEvoZYp+e+tN1n81TnbNVZ
-						ejiVXbnS3zLdUyjFd6PZ4PlWyxucFVtuM94JUZ+OQeL9YVi2ZIMHfc90BDEqD5pI
-						wqMefY/gMaQdF9apRsrwNKT2eDNmempPVn09T3/IShNPibGwy1+u+NQO1zXIgqb/
-						x1d67ymh6vf4wRrzwO35J6jhoi3yECJCPYXhDcf09u5W4QIDAQABoz4wPDAbBgNV
-						HREEFDASghBrYnBsdXMuay1pbnQuY29tMB0GA1UdDgQWBBTOzLiM7iYZBRuZ455l
-						D2qUybc4IzANBgkqhkiG9w0BAQUFAAOCAQEAbB2APqTBcyl3cqddEabdHcgHwMkW
-						IpXH9vY4I5vN+QLYRNAMWzVqTLvSAterk8Zg08AVHhMVKOIGTToy/I3baknJN6dt
-						s+2zzA4DZ5PBNJZ1dZrcb3tQ+8KTXNzerY5RX1r9/6O8BenKsLSdZNelDWONQrbn
-						QAgM92q8JTWyEOe/xar1vmeALxxQ34ktaW3O0mIUzeMxQ8VYqU93utJYJffBHoR1
-						ONhG9WkWV4mhkNIePyzF8WLxiNrs74KC7h0evoTQwR+gNINC6yK6C5vLa+TOKrVR
-						zoDxn+7khuE9bs7vdei/u4oVG/BnncNtry895Df0G9S/S51tNfnRxNh18Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://kbplus.k-int.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kbplus.k-int.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kbplus.k-int.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kbplus.k-int.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kbplus.k-int.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kbplus.k-int.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Knowledge Integration Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Knowledge Integration Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.k-int.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@k-int.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Ibbotson</SurName>
-    <EmailAddress>mailto:ian.ibbotson@k-int.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kclidp.kcl.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/kclidp.kcl.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index a28f8912..00000000
--- a/swamid-interfederations-2.0/kclidp.kcl.ac.uk-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://kclidp.kcl.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for King's College London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">kcl.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">King's College London</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://kclidp.kcl.ac.uk/logo1.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://kclidp.kcl.ac.uk/logo2.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEZjCCA06gAwIBAgIBADANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJHQjEP
-						MA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHTAbBgNVBAoTFEtpbmdz
-						IENvbGxlZ2UgTG9uZG9uMQswCQYDVQQLEwJJVDEZMBcGA1UEAxMQa2NsaWRwLmtj
-						bC5hYy51azAeFw0xMzAxMDkxNjQyMTRaFw0yMzAxMDcxNjQyMTRaMHYxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEdMBsGA1UE
-						ChMUS2luZ3MgQ29sbGVnZSBMb25kb24xCzAJBgNVBAsTAklUMRkwFwYDVQQDExBr
-						Y2xpZHAua2NsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						yEpyzp6Y1kvj+GsPL1pQiQvDBLnNck72Bn7SVCrEAbhoYSSymjchXt7yI3dw1pMB
-						f9+0iA6s5ex0Mt7tnjggWV6wIGM3zw62X+cSINnWp4TRWHZ3LVEwcU9O2R1o0o3U
-						467XviRD/SrNsaRnZp/5XmddQjTt0nLqsGw/RVqlEwGNoxr3/ufUqyC9C2mbOtb7
-						DcrUqH7z4R+f6YokzqMhjuBtd7bHr4aKDeRKzmltpGlVFEz4wrVNi+79WfjLkX7l
-						dcxzXU9jnHOpgzbnUcmkwbxSl9DBSC9VxJBC83ncXRuRBgyqPpXYmZ6xdnUm+7e2
-						eCRUuVRGB09QC4yrvCXZZwIDAQABo4H+MIH7MAkGA1UdEwQCMAAwLAYJYIZIAYb4
-						QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSp
-						TH5kAuUTBts/2kYGhN6eOKOXzDCBoAYDVR0jBIGYMIGVgBSpTH5kAuUTBts/2kYG
-						hN6eOKOXzKF6pHgwdjELMAkGA1UEBhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0G
-						A1UEBxMGTG9uZG9uMR0wGwYDVQQKExRLaW5ncyBDb2xsZWdlIExvbmRvbjELMAkG
-						A1UECxMCSVQxGTAXBgNVBAMTEGtjbGlkcC5rY2wuYWMudWuCAQAwDQYJKoZIhvcN
-						AQEFBQADggEBAJ0zF1N2N5bQS/ZK08jAbsd1gDuk4u4D5o8vEW5Np3aUPrHE3fK1
-						59bl8mpz3q9/kDJuu2NGZRlNGpFOUSDZJBWz6g6gg6sYSgTVXSRnfsSBnQ103dzb
-						v0MG4GA9B+WAD/6/henwXa0cSB708MU9ezq8dufilyHzNo033tfKXiWZbbvgO+mk
-						hBFPNvEdfJ98vLKS6q+wmNlvmzhFr7aoH1tYENryGrJWTJ0PEjv+SYWiHRjZdrF4
-						hZEob0ux+XK8uPgMAepyHgBduBcJgDhABlkLSZ5qECgDRpQXzgZglrHzU8k0Y0PA
-						lTZdf+SSG52AWWaNmRD/L5fOY0EKkCphfrs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kclidp.kcl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kclidp.kcl.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://kclidp.kcl.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kclidp.kcl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kclidp.kcl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kclidp.kcl.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">kcl.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEZjCCA06gAwIBAgIBADANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJHQjEP
-						MA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHTAbBgNVBAoTFEtpbmdz
-						IENvbGxlZ2UgTG9uZG9uMQswCQYDVQQLEwJJVDEZMBcGA1UEAxMQa2NsaWRwLmtj
-						bC5hYy51azAeFw0xMzAxMDkxNjQyMTRaFw0yMzAxMDcxNjQyMTRaMHYxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEdMBsGA1UE
-						ChMUS2luZ3MgQ29sbGVnZSBMb25kb24xCzAJBgNVBAsTAklUMRkwFwYDVQQDExBr
-						Y2xpZHAua2NsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						yEpyzp6Y1kvj+GsPL1pQiQvDBLnNck72Bn7SVCrEAbhoYSSymjchXt7yI3dw1pMB
-						f9+0iA6s5ex0Mt7tnjggWV6wIGM3zw62X+cSINnWp4TRWHZ3LVEwcU9O2R1o0o3U
-						467XviRD/SrNsaRnZp/5XmddQjTt0nLqsGw/RVqlEwGNoxr3/ufUqyC9C2mbOtb7
-						DcrUqH7z4R+f6YokzqMhjuBtd7bHr4aKDeRKzmltpGlVFEz4wrVNi+79WfjLkX7l
-						dcxzXU9jnHOpgzbnUcmkwbxSl9DBSC9VxJBC83ncXRuRBgyqPpXYmZ6xdnUm+7e2
-						eCRUuVRGB09QC4yrvCXZZwIDAQABo4H+MIH7MAkGA1UdEwQCMAAwLAYJYIZIAYb4
-						QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSp
-						TH5kAuUTBts/2kYGhN6eOKOXzDCBoAYDVR0jBIGYMIGVgBSpTH5kAuUTBts/2kYG
-						hN6eOKOXzKF6pHgwdjELMAkGA1UEBhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0G
-						A1UEBxMGTG9uZG9uMR0wGwYDVQQKExRLaW5ncyBDb2xsZWdlIExvbmRvbjELMAkG
-						A1UECxMCSVQxGTAXBgNVBAMTEGtjbGlkcC5rY2wuYWMudWuCAQAwDQYJKoZIhvcN
-						AQEFBQADggEBAJ0zF1N2N5bQS/ZK08jAbsd1gDuk4u4D5o8vEW5Np3aUPrHE3fK1
-						59bl8mpz3q9/kDJuu2NGZRlNGpFOUSDZJBWz6g6gg6sYSgTVXSRnfsSBnQ103dzb
-						v0MG4GA9B+WAD/6/henwXa0cSB708MU9ezq8dufilyHzNo033tfKXiWZbbvgO+mk
-						hBFPNvEdfJ98vLKS6q+wmNlvmzhFr7aoH1tYENryGrJWTJ0PEjv+SYWiHRjZdrF4
-						hZEob0ux+XK8uPgMAepyHgBduBcJgDhABlkLSZ5qECgDRpQXzgZglrHzU8k0Y0PA
-						lTZdf+SSG52AWWaNmRD/L5fOY0EKkCphfrs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://kclidp.kcl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kclidp.kcl.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">King's College London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">King's College London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kcl.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ISS Servers and Data Storage Team</GivenName>
-    <EmailAddress>mailto:systemsteam@kcl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>ISS Servers and Data Storage Team</GivenName>
-    <EmailAddress>mailto:systemsteam@kcl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Fitzpatrick</SurName>
-    <EmailAddress>mailto:Mike.Fitzpatrick@kcl.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/keelesu.com-shibboleth.xml b/swamid-interfederations-2.0/keelesu.com-shibboleth.xml
deleted file mode 100644
index 9e4a7c32..00000000
--- a/swamid-interfederations-2.0/keelesu.com-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://keelesu.com/shibboleth">
-  <!--
-		This is a "Keele SU" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-19T10:52:06Z">
-      <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://keelesu.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://keelesu.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://keelesu.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keelesu.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://keelesu.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://keelesu.com/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://keelesu.com/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keelesu.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://keelesu.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://keelesu.com/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://keelesu.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://keelesu.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://keelesu.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://keelesu.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://keelesu.com/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://keelesu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Keele SU</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://keelesu.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kent.simitive.com.xml b/swamid-interfederations-2.0/kent.simitive.com.xml
deleted file mode 100644
index ec84fa1c..00000000
--- a/swamid-interfederations-2.0/kent.simitive.com.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kent.simitive.com">
-  <!--
-		This is a "Simitive" Shibboleth SP for Simitive 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="2016-01-13T14:10:29Z">
-      <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://kent.simitive.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://kent.simitive.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKjCCAhKgAwIBAgIJAKASu6FhhCKNMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNvbTAeFw0xNjAxMTExMzIxNDVaFw0y
-						NjAxMDgxMzIxNDVaMCMxITAfBgNVBAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsUZdEDLpWFrBNDxCMO
-						WWpKWHuDqZpw9WPDZlq9bhxbdTPdksL3Omf/e9UOXm+BX9BRtZvASTuDjg5PSOd0
-						xYWxIxjMduxstHgzdKLYLv0O+ZnlhbDtnyou7co03qOk2zxx79DaJoHZECLy+5M0
-						4rk9GW6Q6/FFP5pL2x44k/VqEuNNLnWisbEjW3PIKGhSuxeBBQWOIyRAmh1qTiyN
-						H3BTZchzQdW2aE47UOhWnA2AAV4MncAak+l9LEIRDLcvGepVSM4kVOfilVCGfe06
-						ZEyJ23XoMiq/W55zPbOevv8jNJrpJKOkK9zcaBvRiRQOKasKekLyp8190MM+D3Ea
-						vmUCAwEAAaNhMF8wPgYDVR0RBDcwNYIYbGl2ZS1ub2RlLTEuc2ltaXRpdmUuY29t
-						hhlodHRwczovL2tlbnQuc2ltaXRpdmUuY29tMB0GA1UdDgQWBBRzXVs0Ysuuio3J
-						dW6WZvknq/loaTANBgkqhkiG9w0BAQUFAAOCAQEAZQrpvyimRS7nKeAkmcdSyqdR
-						T3/mVyfkOshajVua25OpHBuBSVen6VDTeR+sUkwvcckRurS+N2T04twiggeAjsAm
-						n6OAUHTwiZG7b4ySisNjNjrQnnS5wCdO4gzqXJv9GCrU5jqtPafU+CVBcVedQ0sh
-						AmCO/naNO1VD7YFBpjEBMbzCwz9EhEhohZOwrc4GrCh4e7Nj9HFRe1C7mnq/v1dG
-						sHkhIdbrNOFUKPuD9FlcoPrSh27rp8k/pwVMD7sAupkTqzKTZ8SIS0HXFXkGZ/cX
-						Ay3Sgf//TmFLuD+hZ3pcLObCW6r+1w/0THCU2CkNgy7N+YK4Fw+BkPDUqLgdjQ==
-					</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://kent.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kent.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kent.simitive.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kent.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kent.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kent.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kent.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kent.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kent.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kent.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kent.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Simitive Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Simitive</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.simitive.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Dolby</SurName>
-    <EmailAddress>mailto:chris.dolby@simitive.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Dolby</SurName>
-    <EmailAddress>mailto:chris.dolby@simitive.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kentsso.simitive.com.xml b/swamid-interfederations-2.0/kentsso.simitive.com.xml
deleted file mode 100644
index 292886cc..00000000
--- a/swamid-interfederations-2.0/kentsso.simitive.com.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://kentsso.simitive.com">
-  <!--
-		This is a "Simitive" Shibboleth SP for Simitive 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="2015-10-22T15:17:04Z">
-      <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://kentsso.simitive.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://kentsso.simitive.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLTCCAhWgAwIBAgIJAPuc4ZrD2thhMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNvbTAeFw0xNTEwMDIxNDI3MDVaFw0y
-						NTA5MjkxNDI3MDVaMCMxITAfBgNVBAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOUpc8HAMCrL4BiGieJh
-						Y0kTPCmKa2dWuIZy0GjBtb3PIqRX9L90452/sjW9P5RaQYyEMfdSEdXZBw/DEYAm
-						a3WrZNkNj4vNEts/5g/mW16Y3ISY8V7Gk127liMANTcbFoLJMRvcNo5skyVz2nxp
-						J4kppKp5c9ocH+zV7cm5aWUYGwdrfDnGCy/zCX4P0IvmZzffBG57ygHG1MAbTZQG
-						cn46v65F8XAWa5xwu+ZfiYCGb5IjJTUYTNgO5+BMx4Mx1Ssd20iohgJ/hnhIlvbd
-						qtuAXjgLDULEma+6XhsNxIN7Khy3YEORw5ch8NqnllnbBhKPhTIFspbcIx247Wnu
-						IHECAwEAAaNkMGIwQQYDVR0RBDowOIIYbGl2ZS1ub2RlLTEuc2ltaXRpdmUuY29t
-						hhxodHRwczovL2tlbnRzc28uc2ltaXRpdmUuY29tMB0GA1UdDgQWBBQIVpk9cai3
-						Qu4eE+cdf+T67ttSKzANBgkqhkiG9w0BAQUFAAOCAQEAoZv+PznzhifNi0Ez9YPk
-						YNOBp9zEOIlDtQOE8bsmFdUYEnbJ1GkMcJsJwmU0bIjEV9/g56ygW4D7ZsycLHYu
-						Md/v4fyqAQM3xCmZQs92H96nm6Pkv99mRN0oMPIT3Oy2FTy5qWgX1qFBZ+C0TlNn
-						gSBq5F5D0I3BkB6oZMgXvUuWDLoU42SM1Ks8/1zL6xxy0QF+qapp6g27MenTgRYU
-						g9OevEy4MLX592kL7TWCJ3K/nbnrYF7lqPzHHkvtBFFVfTNleQzKLGdSlIifm/g2
-						NFIvl9x747DAi2Vm92ULH9Qgy4/k21c0P8sSJZD+P6nHAB5G2XecceewxYkH4s+z
-						cA==
-					</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://kentsso.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kentsso.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kentsso.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Simitive Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Simitive</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.simitive.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Dolby</SurName>
-    <EmailAddress>mailto:chris.dolby@simitive.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Dolby</SurName>
-    <EmailAddress>mailto:chris.dolby@simitive.com</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 148187b0..00000000
--- a/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>mailto:leifj@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 dcc955f2..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>mailto: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>mailto: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>mailto: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 ac9f44be..00000000
--- a/swamid-interfederations-2.0/kiidp.ki.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://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:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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:DomainHint>ki.se</mdui:DomainHint>
-        <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="technical">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>it-support@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kitcatalogue.alpha.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/kitcatalogue.alpha.jisc.ac.uk-shibboleth.xml
deleted file mode 100644
index 39d6555e..00000000
--- a/swamid-interfederations-2.0/kitcatalogue.alpha.jisc.ac.uk-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://kitcatalogue.alpha.jisc.ac.uk/shibboleth">
-  <!--
-		This is a "Jisc Kit-Catalogue Test Site" Shibboleth SP for Jisc.
-	-->
-  <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="2016-01-08T14:34: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 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://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Jisc Kit-Catalogue Test Site</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test site for Jisc Kit-Catalogue pilot</mdui:Description>
-        <mdui:Logo height="54" width="194">https://kitcatalogue.alpha.jisc.ac.uk/images/logo-kc.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAKMeseZKJGIoMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD2lwLTE3Mi0zMS01LTI1MzAeFw0xNTEyMTQxOTQ1NDlaFw0yNTEyMTExOTQ1
-						NDlaMBoxGDAWBgNVBAMTD2lwLTE3Mi0zMS01LTI1MzCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBALUnNJa3XZMlI4YgQu95YMzWuru+5cgqOzwxoRoQUvw4
-						ECYGxNEqHXv1JNqXt90WdZmsfRaUt1khkX/xVGnyJUdbcLaWBfJYBsGD/ECTDMHe
-						LAOQ9Z+VgkEQK+UsVy9nr55Pu8egTbmZWDrWolvHq++OcJpzxMV17j+tupChPKQ5
-						0oFJmb/Z0wk4G5h9sU21tNOO3CNKtE+2GF1moOXDmSkBwx1L6ysbIC0FPA/RIcwx
-						54wuHlOR77GujLY1vRUaftRZSGxtTJX19ivl5xuD4vRvToO5Aeii3ythFd72FfCn
-						xVb6F/d22iCX4fbBOLKNTO+pRyqghwMHCa4UmulrGPsCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPaXAtMTcyLTMxLTUtMjUzMB0GA1UdDgQWBBTnSpLUEXnd6lMdVr8pAp20
-						8yjgZjANBgkqhkiG9w0BAQUFAAOCAQEAadAOGIH8I3mNUshcPJoShOnV1bFVawd9
-						MJ89nBNOWQOTg/pnrCJnKqHfSN4rRNxhhd61tBYS8bJhoIcQw5ZsVETNJtWSxPIc
-						73TS4zdIvtWLV0RChU/jIzxP1zvoJbB7h7M47223J7QGeJ9TedHh0k06A//Owpe+
-						XHmUMZZiEPLxTk4hpTd5VbqqZAQs0aliLq00sPEMSB1uxvl/DENe2otIt8bBcjvy
-						oE077Tm5R1jVQ2zGmZWncGY13wiGAJOskAkQQN7MsdwWfjdnlywG/tH1pcSgXEiJ
-						VAt7x31QCs60bw6OBdviHmBM95dSxeJ6UECgCYv53RAqTOqBW1cG9g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kitcatalogue.alpha.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Jisc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Jisc Kit-Catalogue Test Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Hamilton</SurName>
-    <EmailAddress>mailto:martin.hamilton@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Hamilton</SurName>
-    <EmailAddress>mailto:martin.hamilton@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.xml b/swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.xml
deleted file mode 100644
index 951e6cbc..00000000
--- a/swamid-interfederations-2.0/knowledge.sagepub.com-oa-metadata.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://knowledge.sagepub.com/oa/metadata">
-  <!--
-		This is a "SAGE Knowledge" OpenAthens SP for SAGE Publications Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T10:12:27Z">
-      <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">SAGE Knowledge</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SAGE's ebook and reference platform</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIEUqnsnzANBgkqhkiG9w0BAQUFADA5MRcwFQYDVQQKEw5T
-						QUdFIEtub3dsZWRnZTEeMBwGA1UEAxMVa25vd2xlZGdlLnNhZ2VwdWIuY29tMB4X
-						DTEzMTIxMjE3MDQzMVoXDTIzMTIxMDE3MDQzMVowOTEXMBUGA1UEChMOU0FHRSBL
-						bm93bGVkZ2UxHjAcBgNVBAMTFWtub3dsZWRnZS5zYWdlcHViLmNvbTCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+8ZzgPSwEfb6WMoObF9tmbrlBloL2z
-						OL7vldcop8YDfeOthyRQqOEGVnc83uJoz0Ut8TexVpSiaGAwDNNuFS9cgwZif/N6
-						5mNhYRoxyqbBsm7WrIxT0zVjPKE2PWDtlaoNlcCvicnc4+1rdRlL19nz2EJIBcqb
-						vqoSOCNqkcJxMNVoSlMVEln4Wwt77gKCJxSaegWRcviWacFpJ71IReD6mRcyelc+
-						Ym6DJNyomPgGiySW0WOJ4MvBcduRf0qTfceeJkq30wgCfs5z39pKA5y3W/eAAzCS
-						Bi9gi+M6+JeK1KJFz0kLs9yW0emRiuBeihFCrvss26OE3MeUqTsb6pECAwEAATAN
-						BgkqhkiG9w0BAQUFAAOCAQEAgbKk/wRJddJm1KFDE+vE9DYSS9tcUO20suWWrsyW
-						Ega1Id7xOB5EmYyFLeoHwnwjndInkf8LwyPeevraFWdyAlNYjPnte87trpM6AETp
-						7ZFvAt6nVZuTzYLvqXRoLCOKCL8zyiYRRLSgPpbJzhdpb98cQWCe5Qr36/9EDRhc
-						wULr8Z8HJOgONxWQbNnZTPU8Z0lrisOhAbAu3QGk5Km4+6v9o8PQch1zECh7HEZa
-						r5NoRY3Ztd9AOTg48jCeyumPUOyk3ZBSt17RfnyCqCuRujbDVCi1WH9+rOW3nBb6
-						CgnionTlX4+VFoFbt4CJjGVxZuSczulc6XkpPlJnAvSuhQ==
-					</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>
-						MIIC7jCCAdagAwIBAgIEUqnsnzANBgkqhkiG9w0BAQUFADA5MRcwFQYDVQQKEw5T
-						QUdFIEtub3dsZWRnZTEeMBwGA1UEAxMVa25vd2xlZGdlLnNhZ2VwdWIuY29tMB4X
-						DTEzMTIxMjE3MDQzMVoXDTIzMTIxMDE3MDQzMVowOTEXMBUGA1UEChMOU0FHRSBL
-						bm93bGVkZ2UxHjAcBgNVBAMTFWtub3dsZWRnZS5zYWdlcHViLmNvbTCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+8ZzgPSwEfb6WMoObF9tmbrlBloL2z
-						OL7vldcop8YDfeOthyRQqOEGVnc83uJoz0Ut8TexVpSiaGAwDNNuFS9cgwZif/N6
-						5mNhYRoxyqbBsm7WrIxT0zVjPKE2PWDtlaoNlcCvicnc4+1rdRlL19nz2EJIBcqb
-						vqoSOCNqkcJxMNVoSlMVEln4Wwt77gKCJxSaegWRcviWacFpJ71IReD6mRcyelc+
-						Ym6DJNyomPgGiySW0WOJ4MvBcduRf0qTfceeJkq30wgCfs5z39pKA5y3W/eAAzCS
-						Bi9gi+M6+JeK1KJFz0kLs9yW0emRiuBeihFCrvss26OE3MeUqTsb6pECAwEAATAN
-						BgkqhkiG9w0BAQUFAAOCAQEAgbKk/wRJddJm1KFDE+vE9DYSS9tcUO20suWWrsyW
-						Ega1Id7xOB5EmYyFLeoHwnwjndInkf8LwyPeevraFWdyAlNYjPnte87trpM6AETp
-						7ZFvAt6nVZuTzYLvqXRoLCOKCL8zyiYRRLSgPpbJzhdpb98cQWCe5Qr36/9EDRhc
-						wULr8Z8HJOgONxWQbNnZTPU8Z0lrisOhAbAu3QGk5Km4+6v9o8PQch1zECh7HEZa
-						r5NoRY3Ztd9AOTg48jCeyumPUOyk3ZBSt17RfnyCqCuRujbDVCi1WH9+rOW3nBb6
-						CgnionTlX4+VFoFbt4CJjGVxZuSczulc6XkpPlJnAvSuhQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://knowledge.sagepub.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://knowledge.sagepub.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://knowledge.sagepub.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://knowledge.sagepub.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SAGE Publications Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SAGE Knowledge</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sagepublications.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>SAGE Online Support</GivenName>
-    <EmailAddress>mailto:onlinesupport@sagepub.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:rob.smith@sagepub.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/krad.cityplym.ac.uk-shibboleth.xml
deleted file mode 100644
index 573e0f79..00000000
--- a/swamid-interfederations-2.0/krad.cityplym.ac.uk-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://krad.cityplym.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for City College Plymouth.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">cityplym.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVAMOc1kqMl4mYFgYDAXyXKjoH9obQMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguY2l0eXBseW0uYWMudWswHhcNMTEw
-						NjE3MTEzNjUwWhcNMzEwNjE3MTEzNjUwWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-						LmNpdHlwbHltLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						nET5Mc3Z+5IC8b2KhU2EyWVau8c/sMwNos2wAWwQGJWVq70ZFnPAKWMjmVYx37TC
-						DJk0uMtZHBWqNcHRooNqHXy3yVVhve+Sc03YCQ6VwAfJJXFkjgCaL274mLLADIhF
-						/UV86AJ48yq7x/4LNtKZA1U86uJvTOT41TkJkPNix1H7IT0ssevZHOgV/jdKJw+T
-						FixUsccDdv5+RxRfM24gx7vQ2IGIpYRsISgAtejbtpO/PKNSunqgjjbWE8QB0+UE
-						AyGjAEXq1t6HJ6yjLrRR6YAMkfHHpjU1sNBICv5ambVVXX8iS9EzTat9O4cSCU6B
-						lklM7JQ0schSt+CQZd9iHwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-						LmNpdHlwbHltLmFjLnVrhjBodHRwczovL3NoaWJib2xldGguY2l0eXBseW0uYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLwDRVMVjMMG9ZF7cH13znMifPUP
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCXpJ+3D+ONPxEb/+WhbIHTFFZNYyWK01l4q4Jq
-						X3tDpd6vAFvcKr/wqj1UZ6YeXi1MvQpStlNrOnF7ASsQlKIQ167PrcZu6W3mlkiZ
-						8WZQ4AGsRuoCxywamNK0tXkdd9Dz1lDwzrkwE/g1GGHg6c/9YFQb2MUjm+6kqvQ8
-						iqFQFpdPj9VNUgXt5+3bPeaOluJnAOE9T3IQv8+0MQp+mJ9M+3dChHotIgiXqCuh
-						KZ8R8jX4oT44/g+blazA+IP5Jz7/i28JHHdwdq7YXZ13eLezyVV3UI+ldTRvPx8k
-						6kGOv0JdsjheocsdY7/KuT0E+oqGEMvnZbXRlF8UKvgxgUgE
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cityplym.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cityplym.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://shibboleth.cityplym.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cityplym.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cityplym.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cityplym.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">cityplym.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVAMOc1kqMl4mYFgYDAXyXKjoH9obQMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguY2l0eXBseW0uYWMudWswHhcNMTEw
-						NjE3MTEzNjUwWhcNMzEwNjE3MTEzNjUwWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-						LmNpdHlwbHltLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						nET5Mc3Z+5IC8b2KhU2EyWVau8c/sMwNos2wAWwQGJWVq70ZFnPAKWMjmVYx37TC
-						DJk0uMtZHBWqNcHRooNqHXy3yVVhve+Sc03YCQ6VwAfJJXFkjgCaL274mLLADIhF
-						/UV86AJ48yq7x/4LNtKZA1U86uJvTOT41TkJkPNix1H7IT0ssevZHOgV/jdKJw+T
-						FixUsccDdv5+RxRfM24gx7vQ2IGIpYRsISgAtejbtpO/PKNSunqgjjbWE8QB0+UE
-						AyGjAEXq1t6HJ6yjLrRR6YAMkfHHpjU1sNBICv5ambVVXX8iS9EzTat9O4cSCU6B
-						lklM7JQ0schSt+CQZd9iHwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-						LmNpdHlwbHltLmFjLnVrhjBodHRwczovL3NoaWJib2xldGguY2l0eXBseW0uYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLwDRVMVjMMG9ZF7cH13znMifPUP
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCXpJ+3D+ONPxEb/+WhbIHTFFZNYyWK01l4q4Jq
-						X3tDpd6vAFvcKr/wqj1UZ6YeXi1MvQpStlNrOnF7ASsQlKIQ167PrcZu6W3mlkiZ
-						8WZQ4AGsRuoCxywamNK0tXkdd9Dz1lDwzrkwE/g1GGHg6c/9YFQb2MUjm+6kqvQ8
-						iqFQFpdPj9VNUgXt5+3bPeaOluJnAOE9T3IQv8+0MQp+mJ9M+3dChHotIgiXqCuh
-						KZ8R8jX4oT44/g+blazA+IP5Jz7/i28JHHdwdq7YXZ13eLezyVV3UI+ldTRvPx8k
-						6kGOv0JdsjheocsdY7/KuT0E+oqGEMvnZbXRlF8UKvgxgUgE
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cityplym.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cityplym.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">City College Plymouth</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">City College Plymouth</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cityplym.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@cityplym.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:itservices@cityplym.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ku-primo-prod.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/ku-primo-prod.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 8f183244..00000000
--- a/swamid-interfederations-2.0/ku-primo-prod.hosted.exlibrisgroup.com-shib.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ku-primo-prod.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is an "Ex Libris: ASP Service on behalf of the Kingston University" Shibboleth SP for Ex Libris (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-07-04T11:22: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://ku-primo-prod.hosted.exlibrisgroup.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://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh6gAwIBAgIJAKw/r3u7k/vAMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-						BAMTJWRjMDF2ZzAwMzlldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTEw
-						NjI5MTM1NTE5WhcNMjEwNjI2MTM1NTE5WjAwMS4wLAYDVQQDEyVkYzAxdmcwMDM5
-						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA87/H7BfMefIzd78V/qDhPXBb2XQkICooMjJDekUKaKdykC2r
-						oPp20O/k3XdMvWjJe9bgCURkzcGLoAB8+8YJG5j6ACMfTpcV32q4gIfXk8PlNSBt
-						KjAjJW/EqaN1p8Q0BaMZfcWoNaOhhLWgBkiHIwuCkinsqy0RBy28NBVv9QWnC2PG
-						iJkRAZtXx8RmHDXu9EP/xnQI2a21i4VrbUbG0wvt/h2yYeQ3c1SGQUfdRxFXktTS
-						B5zkt1fKE4K0vJStL/anr6RJpFFiBfLxE9oy1B+HcINrZhwtv37OM9bsfOVL+UFm
-						zZYUjMnpEMzJXY7L8iyCPUElOzO+GafGuwqYNwIDAQABo1MwUTAwBgNVHREEKTAn
-						giVkYzAxdmcwMDM5ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
-						BBT5akq8gSoJTPqBY/a0JeGDONIu4TANBgkqhkiG9w0BAQUFAAOCAQEAEmFX5dmF
-						aHlpAY9j87joM+fWjqQVEwKiw2qYVaWYZmJwyGd6GTTS6zbiiqtxdUovv2lGEBoa
-						VL7D/Mbrp+uzy6eyJErd8k3JQ754BH2cSgklWKJcO4WRjnlGSGrC5BzlcdweLIwz
-						vjuFU3fkSBXs9nytRd4E/+NTht9U5cJTFFxs9A5OCdY4eXXqU0WleM2hDHgyAB46
-						77eCEE6qd9aFGsoeujg81dSL9J+yCorax8K6BVMi4xPOG5Jp1JXIM1oOJZHoXz0w
-						pauro8vi+P0JtAcliUP2Gs8Vg54ROeafsweovJoRVdgEpdGW1FOPlDk07IM0/4Cl
-						/f5ttpDEx/6kcw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ku-primo-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ex Libris: ASP Service on behalf of the Kingston University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Frank</GivenName>
-    <SurName>Bieber</SurName>
-    <EmailAddress>mailto:Frank.Bieber@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Frank</GivenName>
-    <SurName>Bieber</SurName>
-    <EmailAddress>mailto:Frank.Bieber@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index e4b6b5bf..00000000
--- a/swamid-interfederations-2.0/ku-primo.hosted.exlibrisgroup.com-shib.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://ku-primo.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "Primo Resource Discovery at Kingston University" Shibboleth SP for Ex Libris (UK) 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-03-28T14:43: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ku-primo.hosted.exlibrisgroup.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://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Kingston University - Primo Production</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Kingston University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh6gAwIBAgIJAOj3Zz/p9Vx7MA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-						BAMTJWRjMDNrZzAzNTFldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTQw
-						MjI2MDYwNDE0WhcNMjQwMjI0MDYwNDE0WjAwMS4wLAYDVQQDEyVkYzAza2cwMzUx
-						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAs22oyR6YHnUVlPNR5rrT+7OGLDqXqRlEiY421vfiWrK45xJU
-						9421fSc08tvnqwK+Wb3lrpreJKWVD45K+Z3+UNjdHph8NYPLhbJIbj7zSr+omGbG
-						iFeNesU2DhrQyT5LLMPl+qUQINUt4v7W1xyAVO0RF2PxAAvcyVS6vcDtIVUmLZNP
-						uN581JOJaccTqiU/iAByjPzTHJlL0OfKeGJb0BYYdOCqTyGZZxShWk/RoFyA4Sbt
-						kG7U/BD0rkeJ4ELkq2vLefxGDK23/AT5C3N4lhDvX1KFGZOzlYguLyNAIToxfjh4
-						kXcrGtVE/kUvGih0i+J7nBYI9ZzbnMqmSJ7XhQIDAQABo1MwUTAwBgNVHREEKTAn
-						giVkYzAza2cwMzUxZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
-						BBSTwa3ljw9niFjJ56VIlGAjNu3LYTANBgkqhkiG9w0BAQUFAAOCAQEAldmrNdUD
-						5+i8MC5tiz066ckM4SZQEY5H0nGHdZQQJ5Q4y3umW9574rssXH3hYURDl+694FXM
-						j69h6iPUdihT1zKvFB24hz23XDMRiEF5sorDXDJ/xzzxOqntc7XSuGPUTDjcdGS2
-						rDCC/Pu2G5iD9xJIE5OX95DV8fNx1MRYmDtrShM2Szi1i/IgwaAYPDpw5ueH5JGd
-						wvc45uy/tbhY1br1RKM0v9UTqSkpfOnkZ1fpgkLs28mopwsbTWZbVATkhnNcIZVd
-						APMzE/0MXO3jaiZ2cfUUB12yOjNZj8owMUBTx+2lv35IC/QuEZ3KLf7qyY2fDD5i
-						3SdruRngVtkFYA==
-					</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://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ku-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Primo Resource Discovery at Kingston University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/kurse.vhb.org.xml b/swamid-interfederations-2.0/kurse.vhb.org.xml
deleted file mode 100644
index 3d601be7..00000000
--- a/swamid-interfederations-2.0/kurse.vhb.org.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://kurse.vhb.org/sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://kurse.vhb.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kurse.vhb.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kurse.vhb.org,OU=vhb,O=Otto-Friedrich-Universitaet Bamberg,L=Bamberg,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFdjCCBF6gAwIBAgIED8lo5TANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC
-REUxLDAqBgNVBAoTI090dG8tRnJpZWRyaWNoLVVuaXZlcnNpdGFldCBCYW1iZXJn
-MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMR0wGwYDVQQDExRVbmkgQmFtYmVyZyBD
-QSAtIEcwMjElMCMGCSqGSIb3DQEJARYWcGtpQHVyei51bmktYmFtYmVyZy5kZTAe
-Fw0xMDAzMjQxMDM3MDlaFw0xNTAzMjMxMDM3MDlaMIGEMQswCQYDVQQGEwJERTEP
-MA0GA1UECBMGQmF5ZXJuMRAwDgYDVQQHEwdCYW1iZXJnMSwwKgYDVQQKEyNPdHRv
-LUZyaWVkcmljaC1Vbml2ZXJzaXRhZXQgQmFtYmVyZzEMMAoGA1UECxMDdmhiMRYw
-FAYDVQQDEw1rdXJzZS52aGIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAxcRMLSfk55dScy4NlMrjFrBZZAnc5jENsEwHVo5LixZfiSw74ltoyHRf
-XWcNnD5+VnnDuyVS8FKmZIO+qjAZmkQLkhfwnwVoUizmX7O57hVXiKACQ830bnze
-DtK57AoSmsHT4gWD+g7DcwV1n4KmcF7V4Rti6kRL63FyitEBDZcXWXeOoIJIHe1y
-aS4RbDkx7l3bZWpmPiUuc8jLyVdyXi2WGkSznEWJTVLEPcdDa4E2TlDl+e0U5T8i
-dusHJhRi/6NZI4aVqKn2bBBHBTMYXMkMME3ktQQBLsx41UsE8uMw+RNsAhBpFZv4
-3jqHVrjReD5AKW1JvEtqgkGnkDnZyQIDAQABo4IB1zCCAdMwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBTghKL8IOmYdHnOPcj/baM9PQeBLDAfBgNVHSMEGDAWgBQtzJgeSVse125h
-ByatU2VnmEOu5TAhBgNVHREEGjAYgRZzZXJ2ZXItbWVzc2FnZUB2aGIub3JnMIGN
-BgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWJh
-bWJlcmctY2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktYmFtYmVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGm
-BggrBgEFBQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRm
-bi5kZS91bmktYmFtYmVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggr
-BgEFBQcwAoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktYmFtYmVyZy1jYS9w
-dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAQZ3fTMG1
-GCMGfyVN9dhV6pJRF46hvMXImodMYKFhWj8RbaCgwAYK2T7Xz4YuwBQ4pj11QpbU
-qQXnU6GbQpulhZSfka/Kp6Q12gSRfHcbSSSaz6+lAa/NcVdpBuxtSDFr4ts6uGtO
-PjTNmgKZsG07gvtvyQYfWgDV3oGbuV1uSDGH+eiEjuZ/aEBqKyPESA3N1VrMQtpg
-Dj7nB336knc8QWt/7/cMBU01xmOcGoMiaz0EYjZggMxrB95NuKQCVQPn9UCAwh7b
-T3tX3XUhFdaAtIkDVtrff0MxpdfOwUVfWkrv0jgHzQtWdNtFTwcnNu1L+DHtvdLY
-FQPShrsE3e4cFw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>kurse.vhb.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=kurse.vhb.org,OU=vhb,O=Otto-Friedrich-Universitaet Bamberg,L=Bamberg,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFdjCCBF6gAwIBAgIED8lo5TANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMC
-REUxLDAqBgNVBAoTI090dG8tRnJpZWRyaWNoLVVuaXZlcnNpdGFldCBCYW1iZXJn
-MRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMR0wGwYDVQQDExRVbmkgQmFtYmVyZyBD
-QSAtIEcwMjElMCMGCSqGSIb3DQEJARYWcGtpQHVyei51bmktYmFtYmVyZy5kZTAe
-Fw0xMDAzMjQxMDM3MDlaFw0xNTAzMjMxMDM3MDlaMIGEMQswCQYDVQQGEwJERTEP
-MA0GA1UECBMGQmF5ZXJuMRAwDgYDVQQHEwdCYW1iZXJnMSwwKgYDVQQKEyNPdHRv
-LUZyaWVkcmljaC1Vbml2ZXJzaXRhZXQgQmFtYmVyZzEMMAoGA1UECxMDdmhiMRYw
-FAYDVQQDEw1rdXJzZS52aGIub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAxcRMLSfk55dScy4NlMrjFrBZZAnc5jENsEwHVo5LixZfiSw74ltoyHRf
-XWcNnD5+VnnDuyVS8FKmZIO+qjAZmkQLkhfwnwVoUizmX7O57hVXiKACQ830bnze
-DtK57AoSmsHT4gWD+g7DcwV1n4KmcF7V4Rti6kRL63FyitEBDZcXWXeOoIJIHe1y
-aS4RbDkx7l3bZWpmPiUuc8jLyVdyXi2WGkSznEWJTVLEPcdDa4E2TlDl+e0U5T8i
-dusHJhRi/6NZI4aVqKn2bBBHBTMYXMkMME3ktQQBLsx41UsE8uMw+RNsAhBpFZv4
-3jqHVrjReD5AKW1JvEtqgkGnkDnZyQIDAQABo4IB1zCCAdMwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBTghKL8IOmYdHnOPcj/baM9PQeBLDAfBgNVHSMEGDAWgBQtzJgeSVse125h
-ByatU2VnmEOu5TAhBgNVHREEGjAYgRZzZXJ2ZXItbWVzc2FnZUB2aGIub3JnMIGN
-BgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWJh
-bWJlcmctY2EvcHViL2NybC9nX2NhY3JsLmNybDA/oD2gO4Y5aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS91bmktYmFtYmVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGm
-BggrBgEFBQcBAQSBmTCBljBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRm
-bi5kZS91bmktYmFtYmVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBJBggr
-BgEFBQcwAoY9aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktYmFtYmVyZy1jYS9w
-dWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAQZ3fTMG1
-GCMGfyVN9dhV6pJRF46hvMXImodMYKFhWj8RbaCgwAYK2T7Xz4YuwBQ4pj11QpbU
-qQXnU6GbQpulhZSfka/Kp6Q12gSRfHcbSSSaz6+lAa/NcVdpBuxtSDFr4ts6uGtO
-PjTNmgKZsG07gvtvyQYfWgDV3oGbuV1uSDGH+eiEjuZ/aEBqKyPESA3N1VrMQtpg
-Dj7nB336knc8QWt/7/cMBU01xmOcGoMiaz0EYjZggMxrB95NuKQCVQPn9UCAwh7b
-T3tX3XUhFdaAtIkDVtrff0MxpdfOwUVfWkrv0jgHzQtWdNtFTwcnNu1L+DHtvdLY
-FQPShrsE3e4cFw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kurse.vhb.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kurse.vhb.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurse.vhb.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurse.vhb.org/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kurse.vhb.org/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kurse.vhb.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurse.vhb.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurse.vhb.org/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kurse.vhb.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kurse.vhb.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kurse.vhb.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kurse.vhb.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kurse.vhb.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kurse.vhb.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Virtuelle Hochschule Bayern</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Virtuelle Hochschule Bayern - Kursprogramm</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://kurse.vhb.org</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ingo</GivenName>
-    <SurName>Müller</SurName>
-    <EmailAddress>technik@vhb.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ingo</GivenName>
-    <SurName>Müller</SurName>
-    <EmailAddress>technik@vhb.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml b/swamid-interfederations-2.0/l-aai.sztaki.hu-idp.xml
deleted file mode 100644
index 591223cd..00000000
--- a/swamid-interfederations-2.0/l-aai.sztaki.hu-idp.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://l-aai.sztaki.hu/idp">
-  <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="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>sztaki</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">MTA Sztaki Munkatársak</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">MTA Sztaki staff</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</mdui:Description>
-        <mdui:Description xml:lang="en">Hungarian Academy of Sciences Institute for Computer Science and Control</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">http://www.sztaki.hu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://www.sztaki.hu</mdui:PrivacyStatementURL>
-        <mdui:Logo height="66" width="125">https://ujwiki.sztaki.hu/sztaki/resources/assets/Sztaki_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sztaki.hu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAOw27qeW2Vj/MA0GCSqGSIb3DQEBCwUAMIGRMQswCQYDVQQGEwJIVTENMAsGA1UECAwEUGVzdDERMA8GA1UEBwwIQnVkYXBlc3QxEzARBgNVBAoMCk1UQSBTenRha2kxDTALBgNVBAsMBEhCSVQxGDAWBgNVBAMMD2wtYWFpLnN6dGFraS5odTEiMCAGCSqGSIb3DQEJARYTdWd5ZWxldGVzQHN6dGFraS5odTAeFw0xNDExMjcwNzM1NTdaFw0yNDExMjYwNzM1NTdaMIGRMQswCQYDVQQGEwJIVTENMAsGA1UECAwEUGVzdDERMA8GA1UEBwwIQnVkYXBlc3QxEzARBgNVBAoMCk1UQSBTenRha2kxDTALBgNVBAsMBEhCSVQxGDAWBgNVBAMMD2wtYWFpLnN6dGFraS5odTEiMCAGCSqGSIb3DQEJARYTdWd5ZWxldGVzQHN6dGFraS5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqwZ3/JJWJ/+A6OGJqWkkS6ZQUoQ8dwc9nJL8wfCjJis3bLV8NW3hU1Ue0eFU+HgR39sljwpOYjbq/veMOtI2iRDq7h2ebi22L6La/XaEmGNHKOufDGUE9NyQkFSl+8dQqX3nHY58uiaY2JE0LRfkhwV64p7JAi6tWA8fnmn6e7DVt1F6b+sp44JK5Qq++HsC4MhQoj7RjJ13CY6qP6x8nyUesXjPe9+PwltPiMjoI2lYDdRF8UGH0oqCNguRRQTPVPY8VqMFvcNz9K7GCsuVIHBhbXRnU+GlstAUwsTzioMG/tnyBX/ZpF+k+kISPT/7lRwoa4esozxO+0341v1YECAwEAAaNQME4wHQYDVR0OBBYEFEX6oDj3ai1cb71F4i3yYwUSif9SMB8GA1UdIwQYMBaAFEX6oDj3ai1cb71F4i3yYwUSif9SMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHJSf1EkFt7mwh+dOb+jAFD3vidmli3wuqbwwTUfZSn0O1btPbb93C5epXMtcR6MBST8BQIjdoNJUPRohjayH6xKz7lXi7MP+uZ7kSwemucTopM6oMgiGmnp93hq4d6ubpw0CKKT5taPVpXXnELKtrA1MhCXGCt3hrWbVrtRhBNjzZLBj7QevGH86D3/cISyVjTnqzPv+Pv+hYa39VLfIfZ6yUd6aSTqysMnVbr0P4Ks+11HgXDqF68vs+YJu9n1VDAJ51yE9lDnzZ88juXPX7AtyEA/uo3jMga1yRBTD5LOvQr2GbJ2zOmCFvqeKv1PluxQ2a2q3SOwIb1bU42MYbw=</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>l-aai.sztaki.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://l-aai.sztaki.hu/idp/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://sztaki.hu/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://sztaki.hu/?en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Sztaki AAI team</md:SurName>
-    <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sztaki AAI team</md:SurName>
-    <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Sztaki AAI team</md:SurName>
-    <md:EmailAddress>mailto:aai@sztaki.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/l4l-sp-02.kent.ac.uk-entity.xml b/swamid-interfederations-2.0/l4l-sp-02.kent.ac.uk-entity.xml
deleted file mode 100644
index d0a4bd96..00000000
--- a/swamid-interfederations-2.0/l4l-sp-02.kent.ac.uk-entity.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://l4l-sp-02.kent.ac.uk/entity">
-  <!--
-		This is a simpleSAMLphp Logins for Life SP for the University of Kent.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEJjCCAw6gAwIBAgIJAKa9P2cE2HGrMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
-						VQQGEwJVSzENMAsGA1UECBMES2VudDETMBEGA1UEBxMKQ2FudGVyYnVyeTEbMBkG
-						A1UEChMSVW5pdmVyc2l0eSBvZiBLZW50MQ4wDAYDVQQLEwVpc3NyZzETMBEGA1UE
-						AxMKS3Jpc3R5IFNpdTEeMBwGCSqGSIb3DQEJARYPa3dzc0BrZW50LmFjLnVrMB4X
-						DTEyMDExMTE0MjE0M1oXDTIyMDEwODE0MjE0M1owgZMxCzAJBgNVBAYTAlVLMQ0w
-						CwYDVQQIEwRLZW50MRMwEQYDVQQHEwpDYW50ZXJidXJ5MRswGQYDVQQKExJVbml2
-						ZXJzaXR5IG9mIEtlbnQxDjAMBgNVBAsTBWlzc3JnMRMwEQYDVQQDEwpLcmlzdHkg
-						U2l1MR4wHAYJKoZIhvcNAQkBFg9rd3NzQGtlbnQuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQC2APnwJCFAJGZgARhHGG1q9EYwpVkWiVvScfbM
-						gSxgGhs4jhzYX3bLUqOFM1+FVqRQsQjka1pEt3sNsH1rTkQG0BCRNXfiUOAzH+ex
-						xNtyj6M3Rj2Jb7wUo/Dk9IJaEKrRWYRczFa4UoTLBfuh98T+ii3+nx9143zXz3fu
-						dUKSOm2VBGQx9BfucN55C90uBg3FzdaSgh3DUErnuVOtaR2ORKCgW8VanjkzrWv0
-						/mtdhNycFh9ECBy/Emgyw5zG2fxyEL3KftNJxogBDcEC6dU3PZPFo1p+TTIjOZa1
-						c0Z0cvzLeTqDJsYi07CWMotobZ5XMmM+T2oS3adB8hXb4DVLAgMBAAGjezB5MAkG
-						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
-						ZmljYXRlMB0GA1UdDgQWBBT2YT5wLzaLNBPtBUgm1xylI03WXDAfBgNVHSMEGDAW
-						gBT2YT5wLzaLNBPtBUgm1xylI03WXDANBgkqhkiG9w0BAQUFAAOCAQEAJIYNiO5b
-						Yzb3dZ2PqL3WdhMTg3vHXTBVKKnSegNwd/huTybPzs6oqNIxgDqsxT6/p5WZVz/f
-						6MT3bvUnGoy70gNVaSjHZg01QXKCzbEi1C/hcMO1cMdYVYZYAiQeFv7+4HuChkC6
-						ZIkwMmoSeX/Q13G3ZOltY+xV81E7Afc3+MTeowDYayfRHTpp4SHqRe098k/XJ6w9
-						3PMjGO33JAAAaNAJzsmzrtb86q5d9O4r4Y45vRypyBfu6Mr8TbufXsxUEKcdFaRv
-						DsKvkemCd+Dir273mcUN+zhGKUhjPAYJsFhb/wWkTmbdk1mBNjIhqavarm/OIyG8
-						c91vv7jVI/bPgA==
-					</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>
-						MIIEJjCCAw6gAwIBAgIJAKa9P2cE2HGrMA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
-						VQQGEwJVSzENMAsGA1UECBMES2VudDETMBEGA1UEBxMKQ2FudGVyYnVyeTEbMBkG
-						A1UEChMSVW5pdmVyc2l0eSBvZiBLZW50MQ4wDAYDVQQLEwVpc3NyZzETMBEGA1UE
-						AxMKS3Jpc3R5IFNpdTEeMBwGCSqGSIb3DQEJARYPa3dzc0BrZW50LmFjLnVrMB4X
-						DTEyMDExMTE0MjE0M1oXDTIyMDEwODE0MjE0M1owgZMxCzAJBgNVBAYTAlVLMQ0w
-						CwYDVQQIEwRLZW50MRMwEQYDVQQHEwpDYW50ZXJidXJ5MRswGQYDVQQKExJVbml2
-						ZXJzaXR5IG9mIEtlbnQxDjAMBgNVBAsTBWlzc3JnMRMwEQYDVQQDEwpLcmlzdHkg
-						U2l1MR4wHAYJKoZIhvcNAQkBFg9rd3NzQGtlbnQuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQC2APnwJCFAJGZgARhHGG1q9EYwpVkWiVvScfbM
-						gSxgGhs4jhzYX3bLUqOFM1+FVqRQsQjka1pEt3sNsH1rTkQG0BCRNXfiUOAzH+ex
-						xNtyj6M3Rj2Jb7wUo/Dk9IJaEKrRWYRczFa4UoTLBfuh98T+ii3+nx9143zXz3fu
-						dUKSOm2VBGQx9BfucN55C90uBg3FzdaSgh3DUErnuVOtaR2ORKCgW8VanjkzrWv0
-						/mtdhNycFh9ECBy/Emgyw5zG2fxyEL3KftNJxogBDcEC6dU3PZPFo1p+TTIjOZa1
-						c0Z0cvzLeTqDJsYi07CWMotobZ5XMmM+T2oS3adB8hXb4DVLAgMBAAGjezB5MAkG
-						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
-						ZmljYXRlMB0GA1UdDgQWBBT2YT5wLzaLNBPtBUgm1xylI03WXDAfBgNVHSMEGDAW
-						gBT2YT5wLzaLNBPtBUgm1xylI03WXDANBgkqhkiG9w0BAQUFAAOCAQEAJIYNiO5b
-						Yzb3dZ2PqL3WdhMTg3vHXTBVKKnSegNwd/huTybPzs6oqNIxgDqsxT6/p5WZVz/f
-						6MT3bvUnGoy70gNVaSjHZg01QXKCzbEi1C/hcMO1cMdYVYZYAiQeFv7+4HuChkC6
-						ZIkwMmoSeX/Q13G3ZOltY+xV81E7Afc3+MTeowDYayfRHTpp4SHqRe098k/XJ6w9
-						3PMjGO33JAAAaNAJzsmzrtb86q5d9O4r4Y45vRypyBfu6Mr8TbufXsxUEKcdFaRv
-						DsKvkemCd+Dir273mcUN+zhGKUhjPAYJsFhb/wWkTmbdk1mBNjIhqavarm/OIyG8
-						c91vv7jVI/bPgA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/UK-AMF"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/UK-AMF" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/UK-AMF" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/UK-AMF" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://l4l-idp-01.kent.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/UK-AMF/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Kent</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Kent: Logins for Life</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kent.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matthew</GivenName>
-    <SurName>Slowe</SurName>
-    <EmailAddress>mailto:M.Slowe@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kristy</GivenName>
-    <SurName>Siu</SurName>
-    <EmailAddress>mailto:K.W.S.Siu@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 b6a96411..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/">
-      <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/laketahoecc.instructure.com-saml2.xml b/swamid-interfederations-2.0/laketahoecc.instructure.com-saml2.xml
deleted file mode 100644
index 8dea6484..00000000
--- a/swamid-interfederations-2.0/laketahoecc.instructure.com-saml2.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="http://laketahoecc.instructure.com/saml2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">OEI - Lake Tahoe Community College - Canvas</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.canvaslms.com/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.canvaslms.com/policies/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="220" width="220" xml:lang="en">https://canvas.instructure.com/images/canvas/header_canvas_logo@2x.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE8TCCA9mgAwIBAgIJAOBms/PYWcPLMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-VQQGEwJVUzENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkx
-GTAXBgNVBAoTEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsTCk9wZXJhdGlvbnMx
-IDAeBgNVBAMTF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
-FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE1MDQxNTAxMDAwMFoXDTE3MDQyMjAx
-MDAwMFowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRVdGFoMRcwFQYDVQQHEw5T
-YWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
-CxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
-IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDckDPQGWedlVGC2Z9fn1wNFmN+0IPNi6OSE1nM
-voTWx2oZlQepaAu4zI5QqOfnV0rW2V1volpoJbu0WelH0DkGzdOEQdWJjAs3nRBf
-y0evxtpg0tK5kIvGsnN6YcD41YmkfWzvwbMf0cEq1Y0wCmymF6XzOUUE4zsi0nhP
-m2Z7WiuongDQdR01UsDN13YcpD/i1JXr3YtkNnJ/a1Kc9OXNycI8M5NVo5QQgdx/
-Q7zAmTk8p9E0ZRthdOQ/PBicWx39mNmBij5KpqCWlHu3NWdgcG8KXSv5atXU8Crd
-TRJ3aGIEN9vBYIHe8MHGCzs1QlRfJmXFMkeUSOTnJJx78rMDAgMBAAGjggEUMIIB
-EDAdBgNVHQ4EFgQUo0WWVlJ1SxZOs11L85ZAuZGyuzEwgeAGA1UdIwSB2DCB1YAU
-o0WWVlJ1SxZOs11L85ZAuZGyuzGhgbGkga4wgasxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIEwRVdGFoMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5z
-dHJ1Y3R1cmUsIEluYzETMBEGA1UECxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2Fu
-dmFzIFNBTUwgQ2VydGlmaWNhdGUxIjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVj
-dHVyZS5jb22CCQDgZrPz2FnDyzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
-A4IBAQBV3EmmnzYqYQ5fXNZymG2WaspEW0NeFMhDXa3p3AMIQJbnnU14lR7bqIvf
-/bLW1YE0fw1kSzsw8VrkQp7k1U+kaYA3i5/FQBy2WtqUCVq2GXZA2gs5YD4nvJB/
-F57E//0kEhbATZH9+wJqDkqyIgsrSIlJjiXDth1BppGK8weboPtr9sWV24Ui0+ls
-w16XTsGlnRRO19g+gXKOZp5ApXkDrB+HwZQvZxiCuSgvJlcBzMdxVvWSL+vPtg8Y
-shIKzobIhaQ2MzXHLcxrDhW10YFPwDXh8Tfn5iU9ONsaJivuvVhtDYZD1ZzSoPpm
-q4vYqxxY/6rFJhrCtnlLepSaxlXM
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laketahoecc.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laketahoecc.test.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laketahoecc.beta.instructure.com/login/saml/logout"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laketahoecc.instructure.com/saml_consume" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laketahoecc.instructure.com/login/saml" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laketahoecc.beta.instructure.com/saml_consume" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laketahoecc.beta.instructure.com/login/saml" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laketahoecc.test.instructure.com/saml_consume" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laketahoecc.test.instructure.com/login/saml" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">OEI - Lake Tahoe Community College - Canvas</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Instructure, Inc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Instructure, Inc</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.instructure.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lamlash.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/lamlash.edina.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 3e39fa93..00000000
--- a/swamid-interfederations-2.0/lamlash.edina.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://lamlash.edina.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Lamlash test IdP" 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="2013-01-04T15:19:50Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">lamlash.edina.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lamlash test IdP</mdui:DisplayName>
-        <mdui:Logo height="60" width="79">https://lamlash.edina.ac.uk/idp/images/pussycat-idp1.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://lamlash.edina.ac.uk/idp/images/pussycat-idp2.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAKvJ0PaKlvVefbTn1IBkeTbOYlJ+MA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE2xhbWxhc2guZWRpbmEuYWMudWswHhcNMTQwNDIxMTA1
-						MjUyWhcNMzQwNDIxMTA1MjUyWjAeMRwwGgYDVQQDExNsYW1sYXNoLmVkaW5hLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmbX35g2GJCus1uPx
-						/L6rbG7I7H1dItoif7TIgRBoSADOXfTYS2aPGTs8SBmBzbinLIKTz1caA1wftCjO
-						o3seUptoMqdH9yrCdik96FzvxtaPjH5EY/dy7PuuHeTbTtYSpekM7OBrgadsDTzn
-						paW3wt+C/Sea3vvn6N4QSud/iv4/m53K338ALMONvRoyZvlx1F7APuC9Rw35ieES
-						3kIVrFBmfgMZkBqvHkeJEmS+zanEppqKFN/Oj5qVn8aiy9ZpjLjXQ37m15/QQDbq
-						isflNTYdHrdMlMeR4HWHXVhDb3ww66V7dIDKPwG7XzKeJiz2bKhejOECcEqpRZlU
-						dIY+gQIDAQABo20wazBKBgNVHREEQzBBghNsYW1sYXNoLmVkaW5hLmFjLnVrhipo
-						dHRwczovL2xhbWxhc2guZWRpbmEuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFMeJ4HF17TJSXkZeWX/+yMLzCXNZMA0GCSqGSIb3DQEBBQUAA4IBAQAJIFrN
-						16nAtc4JrwqWXt0U0JVWc/68lGLcByu00uX4LNLzisvuhczutiIMaN1tD32YC4To
-						S4YkaJnCTnMhJCZCjcya5od8vKwa4RswGrzIzUwRvPTqIHYJQOdmsuzvYDDI65U8
-						tekHNhquu7nIzAAAjgtQFV07fcFVJ7JMI2FN4Xjp8qS43o/VsGC0LogiTVeRl57h
-						/Y7F/55wgk3R+DJx8utj3xG4fk+RzJLeWxjjrs885E/BZ/vn2FLIur2+rSa8rxB+
-						TKag3zAplAMLFW0+6HQrvFEg9GcDg6zesygdffRhG9He8X4oM6vwx490+BHHss9q
-						SfPXTTAZLsyW8T2q
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lamlash.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.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://lamlash.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lamlash.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lamlash.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lamlash.edina.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">lamlash.edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAKvJ0PaKlvVefbTn1IBkeTbOYlJ+MA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE2xhbWxhc2guZWRpbmEuYWMudWswHhcNMTQwNDIxMTA1
-						MjUyWhcNMzQwNDIxMTA1MjUyWjAeMRwwGgYDVQQDExNsYW1sYXNoLmVkaW5hLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmbX35g2GJCus1uPx
-						/L6rbG7I7H1dItoif7TIgRBoSADOXfTYS2aPGTs8SBmBzbinLIKTz1caA1wftCjO
-						o3seUptoMqdH9yrCdik96FzvxtaPjH5EY/dy7PuuHeTbTtYSpekM7OBrgadsDTzn
-						paW3wt+C/Sea3vvn6N4QSud/iv4/m53K338ALMONvRoyZvlx1F7APuC9Rw35ieES
-						3kIVrFBmfgMZkBqvHkeJEmS+zanEppqKFN/Oj5qVn8aiy9ZpjLjXQ37m15/QQDbq
-						isflNTYdHrdMlMeR4HWHXVhDb3ww66V7dIDKPwG7XzKeJiz2bKhejOECcEqpRZlU
-						dIY+gQIDAQABo20wazBKBgNVHREEQzBBghNsYW1sYXNoLmVkaW5hLmFjLnVrhipo
-						dHRwczovL2xhbWxhc2guZWRpbmEuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFMeJ4HF17TJSXkZeWX/+yMLzCXNZMA0GCSqGSIb3DQEBBQUAA4IBAQAJIFrN
-						16nAtc4JrwqWXt0U0JVWc/68lGLcByu00uX4LNLzisvuhczutiIMaN1tD32YC4To
-						S4YkaJnCTnMhJCZCjcya5od8vKwa4RswGrzIzUwRvPTqIHYJQOdmsuzvYDDI65U8
-						tekHNhquu7nIzAAAjgtQFV07fcFVJ7JMI2FN4Xjp8qS43o/VsGC0LogiTVeRl57h
-						/Y7F/55wgk3R+DJx8utj3xG4fk+RzJLeWxjjrs885E/BZ/vn2FLIur2+rSa8rxB+
-						TKag3zAplAMLFW0+6HQrvFEg9GcDg6zesygdffRhG9He8X4oM6vwx490+BHHss9q
-						SfPXTTAZLsyW8T2q
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lamlash.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.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">Lamlash test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ukfederation.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 92280e24..00000000
--- a/swamid-interfederations-2.0/lanet-idp.lanet.lv.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lanet-idp.lanet.lv">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">LANET</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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - LANET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">LANET - LANET IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lv">http://www.lanet.lv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml b/swamid-interfederations-2.0/lbr.csc.fi-shibboleth.xml
deleted file mode 100644
index 82b310c7..00000000
--- a/swamid-interfederations-2.0/lbr.csc.fi-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://lbr.csc.fi/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-09T19:28: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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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="de">Language Bank Rights</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Language Bank Rights</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</mdui:Description>
-        <mdui:Description xml:lang="en">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://lbr.csc.fi/home</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://lbr.csc.fi/en_GB/web/guest/privacy-policy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lbr.csc.fi</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lbr.csc.fi,OU=Domain Control Validated</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIQWBOOp78lJI42EYlJleUqwDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowODEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwpsYnIuY3NjLmZp
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqJDA0hb4cWa8XBfHbLrS
-QX1lRLMm9nFWH6n0Dv3KnTeyMKMuAewdAfmM+RfSqzehcOc6p4i8kfzf0akMGm1Q
-A/7JBCpjBFixlLE3L6+Fvxxha1To8RyHdUtaJI71jffmuBgHDucya8ypCAvmAJDT
-k3AW4RpnV8PEbf26KUsCkimMRdjvTkQyGz9R+yCM6rmyvs6DbdJz2oods7H43NJ6
-bZVKggLMeBY4n9pZuWIDUvgno6kJmXt971AeIBts3qO3yo3IxRLleZQibkxsCaK2
-Gi+8GIWUaJ2hzLdBNkvGYb4Ij7/WtuuP4fUNLILwEkM+8EeVUsmf0VA8HKfrmrF3
-iyPYTZFYYgzUptJZ+jNTkR/8XqMfnUj6VrM+GChmPEYslU9Dav1gkykob3phjgGm
-xkZY7sjTOLCfGoPivnUFywnJpcUs+FPV6/cbPsnxX9HA4n44w5B3JcwAgcHQ3IVb
-ZL/pinLNDQ7hsN81+7zoqa2TGNkXjMH7rHgtlFw15rhdX8pTAMzuqyDjapnt9i/s
-kAIj8+KkXjd1JtbniTRKTH+3U4Hc9WZuclwNA4lhQjoGcvtoj71Lsn0hFTycGxzQ
-BIEKTSqsTnmI0AZklPCVpu12aVzNw79C69Qkrk7hYbq+HL2JmyC475lnvKCcT9Ob
-QHhbAM3EykBvOXcEByX1UwcCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM
-896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSYeFleYFefS0VfWjy/GIzy3JUMYTAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFQYDVR0RBA4wDIIKbGJyLmNzYy5m
-aTANBgkqhkiG9w0BAQUFAAOCAQEADyIWRbAx7eFhuc6L/aaKZj7u8TPcq59YusJt
-MeHkFjj1AnSgzbdo/hd5AlHL01xFulXG8a5+xehfSWqTxGnQSFgcDXvdwNWx8JAV
-6JwDyq06ko2V4+6Y4OeR/vaW40J4hMhfuDO56/YITUxmMkSCo1Dk44hxtCPNDmTH
-qotUhjkJ+hNlRXZabFwp9LUSWiN0av0zpwMzxSHU1saTfgN0tB7KABKjYnriI7N+
-0k3tNgXiJfaZ3TCGNOPYWvv8Vqj9hqIzOvLFEPnPJ+TACiFBQUArI/2ges4bol7I
-InF/qlfqDoaoTI1ZSkpyr+97qTyFYFlbC5IFJCeCjcQAzscSUA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lbr.csc.fi/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://lbr.csc.fi/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Language Bank Rights</md:ServiceName>
-      <md:ServiceName xml:lang="en">Language Bank Rights</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Service for applying for and managing access rights to language resources in the Language Bank of Finland.</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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Matthiesen</md:SurName>
-    <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Timo</md:GivenName>
-    <md:SurName>Mustonen</md:SurName>
-    <md:EmailAddress>mailto:rems@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Matthiesen</md:SurName>
-    <md:EmailAddress>mailto:martin.matthiesen@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lc-idp.lincolncollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/lc-idp.lincolncollege.ac.uk-shibboleth.xml
deleted file mode 100644
index 4a886a81..00000000
--- a/swamid-interfederations-2.0/lc-idp.lincolncollege.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://lc-idp.lincolncollege.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Lincoln College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">lincolncollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaDCCAlACCQD46bmBVwfiXDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
-						QjEVMBMGA1UECBMMTGluY29sbnNoaXJlMRAwDgYDVQQHEwdMaW5jb2xuMRgwFgYD
-						VQQKEw9MaW5jb2xuIENvbGxlZ2UxJDAiBgNVBAMTG2xjLWlkcC5saW5jb2xuY29s
-						bGVnZS5hYy51azAeFw0xMjA3MjMwOTE3NTVaFw0zMjA3MTgwOTE3NTVaMHYxCzAJ
-						BgNVBAYTAkdCMRUwEwYDVQQIEwxMaW5jb2xuc2hpcmUxEDAOBgNVBAcTB0xpbmNv
-						bG4xGDAWBgNVBAoTD0xpbmNvbG4gQ29sbGVnZTEkMCIGA1UEAxMbbGMtaWRwLmxp
-						bmNvbG5jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAuHXeFxNwSynRVryyHfnvoz3yjpFR7OWEGJxkoJLeIHtFx1TLEyU5sW472CSw
-						ntzE7L2JdkblesYNlq7Wb7JoCs3og71B7wYJywd2yCxiDST7Pnxyjy9A1cwo7yeN
-						BxPP21b5UcNvd1KtFGe3CGOWhgWa0ai4Z3DA/pkOwmy42GmSrC3Z/U5pviUAaBOp
-						kidvrj6VnaV58qBcVgnqCRauWqr3M0jqSqwDzGQ5iCjfG4Bm/19dHsyQgQ8cXPJs
-						E+lviBx6UHpAMZqcu0RXl/Y5tvY3+MDpC9vLQKjoGkZH0PToO2mYakLDDgboK64C
-						vaQtg+qydns+za80qF4hLDEwrwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBTnrK6
-						5J0QLLwWgAre26KAspklobXnnNcKR1VySi6N5SgvHVmLBSRtvODgdrf0gr/vilvG
-						KXF3TBYnRMMfm61zPVFf1qfzmS7JTseVeO0jEH/vEgK46snDSinmyJSeTiWyNDsi
-						GwNh2Z+HS5CtvtBiGucmHx17liMvdyICIGTeTvfF4tSK0yb0lJYJdYOTSPHy3tp6
-						RQFsfuy0eglvAwYrJ1wHg3wQFXVkiYunGf1Mp3LOpY+lBmMlHEaRbomidxLXk1qv
-						WcqedLVOpjYFQ3I6Z4vQ/io3czPPfBmxlAKaGgItuNLFT97z66QJUM7yMLwjlP0j
-						gOEDoZmzZH+n3JY1
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lc-idp.lincolncollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lc-idp.lincolncollege.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://lc-idp.lincolncollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lc-idp.lincolncollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lc-idp.lincolncollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lc-idp.lincolncollege.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">lincolncollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaDCCAlACCQD46bmBVwfiXDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
-						QjEVMBMGA1UECBMMTGluY29sbnNoaXJlMRAwDgYDVQQHEwdMaW5jb2xuMRgwFgYD
-						VQQKEw9MaW5jb2xuIENvbGxlZ2UxJDAiBgNVBAMTG2xjLWlkcC5saW5jb2xuY29s
-						bGVnZS5hYy51azAeFw0xMjA3MjMwOTE3NTVaFw0zMjA3MTgwOTE3NTVaMHYxCzAJ
-						BgNVBAYTAkdCMRUwEwYDVQQIEwxMaW5jb2xuc2hpcmUxEDAOBgNVBAcTB0xpbmNv
-						bG4xGDAWBgNVBAoTD0xpbmNvbG4gQ29sbGVnZTEkMCIGA1UEAxMbbGMtaWRwLmxp
-						bmNvbG5jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAuHXeFxNwSynRVryyHfnvoz3yjpFR7OWEGJxkoJLeIHtFx1TLEyU5sW472CSw
-						ntzE7L2JdkblesYNlq7Wb7JoCs3og71B7wYJywd2yCxiDST7Pnxyjy9A1cwo7yeN
-						BxPP21b5UcNvd1KtFGe3CGOWhgWa0ai4Z3DA/pkOwmy42GmSrC3Z/U5pviUAaBOp
-						kidvrj6VnaV58qBcVgnqCRauWqr3M0jqSqwDzGQ5iCjfG4Bm/19dHsyQgQ8cXPJs
-						E+lviBx6UHpAMZqcu0RXl/Y5tvY3+MDpC9vLQKjoGkZH0PToO2mYakLDDgboK64C
-						vaQtg+qydns+za80qF4hLDEwrwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBTnrK6
-						5J0QLLwWgAre26KAspklobXnnNcKR1VySi6N5SgvHVmLBSRtvODgdrf0gr/vilvG
-						KXF3TBYnRMMfm61zPVFf1qfzmS7JTseVeO0jEH/vEgK46snDSinmyJSeTiWyNDsi
-						GwNh2Z+HS5CtvtBiGucmHx17liMvdyICIGTeTvfF4tSK0yb0lJYJdYOTSPHy3tp6
-						RQFsfuy0eglvAwYrJ1wHg3wQFXVkiYunGf1Mp3LOpY+lBmMlHEaRbomidxLXk1qv
-						WcqedLVOpjYFQ3I6Z4vQ/io3czPPfBmxlAKaGgItuNLFT97z66QJUM7yMLwjlP0j
-						gOEDoZmzZH+n3JY1
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lc-idp.lincolncollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lc-idp.lincolncollege.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">Lincoln College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lincoln College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lincolncollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT help desk</GivenName>
-    <EmailAddress>mailto:ithelpdesk@lincolncollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT help desk</GivenName>
-    <EmailAddress>mailto:ithelpdesk@lincolncollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lcm.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/lcm.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index 2503b1b4..00000000
--- a/swamid-interfederations-2.0/lcm.idm.oclc.org-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://lcm.idm.oclc.org/shibboleth">
-  <!--
-		This is a "Leeds College of Music Hosted" EZproxy SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-03T17:14:03Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID+DCCAuCgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBgMRswGQYDVQQDFBIqLmxj
-						bS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSUwIwYJ
-						KoZIhvcNAQkBFhZqdWxpYW4ubWNmYWxsQG9jbGMub3JnMB4XDTEzMTAxODE2MDMw
-						OFoXDTIzMTAxODE2MDMwOFowYDEbMBkGA1UEAxQSKi5sY20uaWRtLm9jbGMub3Jn
-						MQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzElMCMGCSqGSIb3DQEJARYWanVs
-						aWFuLm1jZmFsbEBvY2xjLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBALXw8P+ELg/oOkOBKaQEW84oW+Kp043lngkY/hZledNtKgLP37IYa3Ml/K5T
-						+sehBTRFrXeR/MzYM1dbsvzl92ty0f5yF1q97QAEK9BbKF2vCIItuteFw/Fe6/7Q
-						ApGDrC842s/EexAQPFuOn5o5G/F6kRghWiOk0U/tkdO0muilulCNA3O/5A1HYWnb
-						QwwDdrS/EOHM8y1DM1bn+66WZgdQaXuAn5RSQFm0KLj+v/fq6MlU34Zueg3YUAwV
-						o0U22FvtARo2Mc4kbfekM9dZQF22chbVSRh2DMrE8ySF96IMeW2gcwsK150D9uNR
-						CiIhxdaEXus73yNKjGgtAr8ww9ECAwEAAaOBvDCBuTAdBgNVHQ4EFgQUDoMxYApE
-						qa3KQU0dQ8E0V4c0C14wgYkGA1UdIwSBgTB/gBQOgzFgCkSprcpBTR1DwTRXhzQL
-						XqFkpGIwYDEbMBkGA1UEAxQSKi5sY20uaWRtLm9jbGMub3JnMQswCQYDVQQGEwJV
-						SzENMAsGA1UEChMET0NMQzElMCMGCSqGSIb3DQEJARYWanVsaWFuLm1jZmFsbEBv
-						Y2xjLm9yZ4IBAzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCaSvOu
-						ZiZdvyHNxoVgF9k34mfDKLanrgxcr2jf2Y4B4i/6hrL7jHDZyfh8RoZW4G0pX3Zo
-						CKJob6cqxEIzws+yRcVdjpseSrmZ4iRMdBxFuFLlrvV7f1OTpkOZGNg7vW+vWKsp
-						J7LF3OeilOJJkWrvYEHhJw0gHzLB69Td6A2JmlDm0x8M1OrJ16u942azdVIfiH8U
-						tu7Gx1GoWXiIjQU5JRhcXnxLhaWk8RCK8DnS+uxTD9Gi2auCgUwe/M1GPF5XQ2Co
-						m8VxEpX1XIKFFn3LbFNLFmAJqmz0w09hVS7XVQfViRbYnWHNf44l7xD75gTQ+qPS
-						RRihYOyFbxq/SI85
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lcm.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.lcm.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.lcm.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.lcm.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds College of Music Hosted EZproxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lcmshibboleth.lcm.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/lcmshibboleth.lcm.ac.uk-shibboleth.xml
deleted file mode 100644
index 85a6d50e..00000000
--- a/swamid-interfederations-2.0/lcmshibboleth.lcm.ac.uk-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://lcmshibboleth.lcm.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Leeds College of Music.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-09T15:13: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">lcm.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbjCCAlYCCQDlpTunux/L3jANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
-						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRzMR8wHQYD
-						VQQKExZMZWVkcyBDb2xsZWdlIG9mIE11c2ljMSAwHgYDVQQDExdsY21zaGliYm9s
-						ZXRoLmxjbS5hYy51azAeFw0xNDA3MjQwODU3MDFaFw0zNDA3MTkwODU3MDFaMHkx
-						CzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5XZXN0IFlvcmtzaGlyZTEOMAwGA1UEBxMF
-						TGVlZHMxHzAdBgNVBAoTFkxlZWRzIENvbGxlZ2Ugb2YgTXVzaWMxIDAeBgNVBAMT
-						F2xjbXNoaWJib2xldGgubGNtLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEApG4Esv3AxTUvvzukB4IfpYjGoaoxV9l97/vcdiR/9yOZFm1V1rcv
-						T96COV3X5pHyGX8di+R6FtVO2mHgOa1EJuqzS1SoI1z6Yz6q7hkLCFIM70DB0hvB
-						Du/a5GIFI/5BEqObekmVBD+8DkcaIKD7LfnzdtPOGc10dm4pPciT5ovf5t6zo1L7
-						Bk8OgjPKqE0NKJ8OQII3tpEZXe3EoS1axvDD4mnoP3ysqal7Yi0NlbwPOW3UNZRk
-						qgBg6preVFv5gOW8NewdBX6ko1oZGxss3ht769PKv48KMKsT7DDb6UFl3BFvlqAZ
-						ugGMA45B03xlXm40CjOAsfwsavrI/yOl+wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-						AQA2X+hPxLp7q5Pgv60O6A41PVWwqfAHcyb4wrndH4S9W9Dy7hCIQOZDHsYpmw6u
-						LcnbDBhZGGKWImvN0+g0PJMcvQirsCmvgIIO4/7MI7+/w1GadLwjgDyY6BvtocNv
-						FB0fIVmHXBE9NZLCorWDGKZUqUFrvB5zN/as0JdZEmFLtX9iVKqsqBwHc8tBUhr8
-						i/FmVnrfJragfycVs2oi5jXygB4KPhLtZc0m5/DAbE9KJP2G1VPKAFT/44NZ2bGQ
-						mdfOzS24Lu8OQK3ko8PU0fRIO3Sp12+sNv56axCEPipV+6ZE8cbEv35oS2IDrHYI
-						yj+gkgbi6alm4ubSsJj3Bkv6
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lcmshibboleth.lcm.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lcmshibboleth.lcm.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://lcmshibboleth.lcm.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lcmshibboleth.lcm.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lcmshibboleth.lcm.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lcmshibboleth.lcm.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">lcm.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbjCCAlYCCQDlpTunux/L3jANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
-						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRzMR8wHQYD
-						VQQKExZMZWVkcyBDb2xsZWdlIG9mIE11c2ljMSAwHgYDVQQDExdsY21zaGliYm9s
-						ZXRoLmxjbS5hYy51azAeFw0xNDA3MjQwODU3MDFaFw0zNDA3MTkwODU3MDFaMHkx
-						CzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5XZXN0IFlvcmtzaGlyZTEOMAwGA1UEBxMF
-						TGVlZHMxHzAdBgNVBAoTFkxlZWRzIENvbGxlZ2Ugb2YgTXVzaWMxIDAeBgNVBAMT
-						F2xjbXNoaWJib2xldGgubGNtLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEApG4Esv3AxTUvvzukB4IfpYjGoaoxV9l97/vcdiR/9yOZFm1V1rcv
-						T96COV3X5pHyGX8di+R6FtVO2mHgOa1EJuqzS1SoI1z6Yz6q7hkLCFIM70DB0hvB
-						Du/a5GIFI/5BEqObekmVBD+8DkcaIKD7LfnzdtPOGc10dm4pPciT5ovf5t6zo1L7
-						Bk8OgjPKqE0NKJ8OQII3tpEZXe3EoS1axvDD4mnoP3ysqal7Yi0NlbwPOW3UNZRk
-						qgBg6preVFv5gOW8NewdBX6ko1oZGxss3ht769PKv48KMKsT7DDb6UFl3BFvlqAZ
-						ugGMA45B03xlXm40CjOAsfwsavrI/yOl+wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-						AQA2X+hPxLp7q5Pgv60O6A41PVWwqfAHcyb4wrndH4S9W9Dy7hCIQOZDHsYpmw6u
-						LcnbDBhZGGKWImvN0+g0PJMcvQirsCmvgIIO4/7MI7+/w1GadLwjgDyY6BvtocNv
-						FB0fIVmHXBE9NZLCorWDGKZUqUFrvB5zN/as0JdZEmFLtX9iVKqsqBwHc8tBUhr8
-						i/FmVnrfJragfycVs2oi5jXygB4KPhLtZc0m5/DAbE9KJP2G1VPKAFT/44NZ2bGQ
-						mdfOzS24Lu8OQK3ko8PU0fRIO3Sp12+sNv56axCEPipV+6ZE8cbEv35oS2IDrHYI
-						yj+gkgbi6alm4ubSsJj3Bkv6
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lcmshibboleth.lcm.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lcmshibboleth.lcm.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">Leeds College of Music</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds College of Music</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lcm.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ruth</GivenName>
-    <SurName>Clark</SurName>
-    <EmailAddress>mailto:r.clark@lcm.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Yas</GivenName>
-    <SurName>Sharif</SurName>
-    <EmailAddress>mailto:y.sharif@lcm.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 3f60e51a..00000000
--- a/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-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://ldap-dariah.esc.rzg.mpg.de/idp/shibboleth">
-  <md: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>
-    <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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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">dariah.eu</shibmd: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://ldap-dariah.esc.rzg.mpg.de/idp/profile/Shibboleth/SSO"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de/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">dariah.eu</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Haase</md:SurName>
-    <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Gietz</md:SurName>
-    <md:EmailAddress>mailto:peter.gietz@daasi.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>DARIAH</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:info@de.dariah.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml b/swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml
deleted file mode 100644
index 5b8f6318..00000000
--- a/swamid-interfederations-2.0/ldf.data.kit.edu-sp.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ldf.data.kit.edu/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-03T14:28: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>
-  </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="de">LDF Data</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">LDF Data</mdui:DisplayName>
-        <mdui:Description xml:lang="de">LDF Data</mdui:Description>
-        <mdui:Description xml:lang="en">LDF Data</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ldf.data.kit.edu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ldf.data.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF6zCCBNOgAwIBAgIHGLIW1QWZrDANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
-bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
-Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
-A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTE0MTIx
-ODA5MDcxN1oXDTE3MTIxNzA5MDcxN1owgYUxCzAJBgNVBAYTAkRFMRswGQYDVQQI
-ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
-ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MRkwFwYDVQQDExBs
-ZGYuZGF0YS5raXQuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-w4Tlx9PXJ4wmH1qouc6BYZ7yj0k6Y63omGZt84db2VTEaBxZUb+1lZzzCxE3KS5t
-pmpky6uVRuxbaxc3nDef+IGRKy0gzrQLilFYWXkPNOp4KZ6lMPg9L1ezLIrZTIqh
-nR7px/HK7ZRYnKG9B6ljmwQYrK/phYMX5eJCItsHO9TToBpyn4v6MXCA/7lzbEFz
-mKxH1qDrV0K7gTavryYWR6N5100mlQK5n6Mz3HWIXpcX8708JGrkGH6AQO01/4RZ
-+vdjoz/J0Zhwn34+jTC4+yBMNDhvIVLtxZyUtij+CCpu74pvGokqKBB8NP9M6WFA
-zjwiV2Eh/EKI+iXAzT7WLwIDAQABo4ICIjCCAh4wTwYDVR0gBEgwRjARBg8rBgEE
-AYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQw
-DQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAww
-CgYIKwYBBQUHAwEwHQYDVR0OBBYEFHoFMKXIzPiHG76LnfVqmEJ7SJ1EMB8GA1Ud
-IwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJMBsGA1UdEQQUMBKCEGxkZi5kYXRh
-LmtpdC5lZHUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS9raXQtY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUva2l0LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHHBggrBgEFBQcBAQSB
-ujCBtzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNl
-cnZlci9PQ1NQMD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tp
-dC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkq
-hkiG9w0BAQsFAAOCAQEAjA1MbhMpdWsD9SUJ9uULTf+rbnsk6iBEFk+Soucq9szt
-i/KF4bq3qlK9nkuYbEZqrPR0dI0PuEgMIyLQgJrKiKp/NCkeg1FlW3tPgF4Kg4SQ
-Ige0yNKN093nxdVvRoiHpitpOHaue100CBjYBBN9loCpmTTYhnrX2x1r5IU02VXj
-DFVFWaeUjYZI98zuQ4yODFpkp5CzGsP3DBuuRwka+xZPUkB5Tsl3feXNKTRrAGPg
-ISJrWi9dzteo74ky9VlAWqA3QaTluyj/Ta51g1hi+v0iSL4pnbwHlbJa3Wow7MfY
-W2PUbu6ZE6ytGjWg3f7aijrOGqQaAnWJ/W7w7zywiw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldf.data.kit.edu/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ldf.data.kit.edu/Shibboleth.sso/SAML2/ECP" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">LDF Data</md:ServiceName>
-      <md:ServiceName xml:lang="en">LDF Data</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">LDF Data</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">LDF Data</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="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="de">e148</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e148</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.scc.kit.edu/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.scc.kit.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marcus</md:GivenName>
-    <md:SurName>Hardt</md:SurName>
-    <md:EmailAddress>mailto:hardt@kit.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Arsen</md:GivenName>
-    <md:SurName>Hayrapetyan</md:SurName>
-    <md:EmailAddress>mailto:arsen.hayrapetyan@kit.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ldp.esc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/ldp.esc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index e8843f45..00000000
--- a/swamid-interfederations-2.0/ldp.esc.ac.uk-idp-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://ldp.esc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for East Surrey College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">esc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjACCQCbDs0NVoukPTANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGU3VycmV5MRAwDgYDVQQHEwdSZWRoaWxsMRwwGgYDVQQKExNF
-						YXN0IFN1cnJleSBDb2xsZWdlMRYwFAYDVQQDEw1sZHAuZXNjLmFjLnVrMB4XDTEz
-						MDIxNTE1MDgyNloXDTMzMDIxMDE1MDgyNlowZjELMAkGA1UEBhMCR0IxDzANBgNV
-						BAgTBlN1cnJleTEQMA4GA1UEBxMHUmVkaGlsbDEcMBoGA1UEChMTRWFzdCBTdXJy
-						ZXkgQ29sbGVnZTEWMBQGA1UEAxMNbGRwLmVzYy5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAN4077Zl1Y8VXd7nsyZ2Y1yP+5iYqzjbBfy35BSI
-						bTdcPSuiPuYdlIij+ThG2KGSjxSJ+ErmKSqHzjF+IXfwoe4sjcESY1VGtn0Gu/ym
-						wyynWCnq5+ClJ+6SAT6EUzF9m5E6kT4nj2XZn7tLrW9PvT3IJpqNfzhruzzUwhqa
-						tahM/bg27nPtXzhdjVKiYcwDEtDggSlT2gxbI2ZCtwtCjlAavHE8uBWHJPwVSCBT
-						iLb20qdLR/hWGnBR9Dg20y8M3Yxl/rrTsllQTPqp1V+A1K7xRSauFsed3tkth0KQ
-						wPzI04I6Cdp3R33h/0y/OG2yJGBgX0NuvfSuc8L/nJ1d7+8CAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEAEYSEGne2kBrM0Nq2GbquH/XbjwFpMS6dLHChZyRmNNL18XVb
-						vrjkBvHxMYTtHJhXdM9odkb08pxFIToG/V0nd3zy7MUZFnZQ6RAyaVTXll9DCMFc
-						Pp4ufilnrQMlW3OqR/MsKHZx0xAMWMDyMbPp9OrDxVj0V62p7XvlNfk1fDDNnoQN
-						Rgd0Lv896JOa398XcorCNltyF5C47lvpS1iJPiMCq58ZOV9/wpYzf2yA3EctFgPz
-						fuxb+x4Agg1mqJiR5txLQfJjXDqnd6mbPRipuilvglK0cApdAl5rIPXJ5AzrguTq
-						EOa26/uzKHmeNsbTWjKpMo3U/1Nz0fW6hltQtQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldp.esc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldp.esc.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://ldp.esc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldp.esc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ldp.esc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldp.esc.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">esc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjACCQCbDs0NVoukPTANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGU3VycmV5MRAwDgYDVQQHEwdSZWRoaWxsMRwwGgYDVQQKExNF
-						YXN0IFN1cnJleSBDb2xsZWdlMRYwFAYDVQQDEw1sZHAuZXNjLmFjLnVrMB4XDTEz
-						MDIxNTE1MDgyNloXDTMzMDIxMDE1MDgyNlowZjELMAkGA1UEBhMCR0IxDzANBgNV
-						BAgTBlN1cnJleTEQMA4GA1UEBxMHUmVkaGlsbDEcMBoGA1UEChMTRWFzdCBTdXJy
-						ZXkgQ29sbGVnZTEWMBQGA1UEAxMNbGRwLmVzYy5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAN4077Zl1Y8VXd7nsyZ2Y1yP+5iYqzjbBfy35BSI
-						bTdcPSuiPuYdlIij+ThG2KGSjxSJ+ErmKSqHzjF+IXfwoe4sjcESY1VGtn0Gu/ym
-						wyynWCnq5+ClJ+6SAT6EUzF9m5E6kT4nj2XZn7tLrW9PvT3IJpqNfzhruzzUwhqa
-						tahM/bg27nPtXzhdjVKiYcwDEtDggSlT2gxbI2ZCtwtCjlAavHE8uBWHJPwVSCBT
-						iLb20qdLR/hWGnBR9Dg20y8M3Yxl/rrTsllQTPqp1V+A1K7xRSauFsed3tkth0KQ
-						wPzI04I6Cdp3R33h/0y/OG2yJGBgX0NuvfSuc8L/nJ1d7+8CAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEAEYSEGne2kBrM0Nq2GbquH/XbjwFpMS6dLHChZyRmNNL18XVb
-						vrjkBvHxMYTtHJhXdM9odkb08pxFIToG/V0nd3zy7MUZFnZQ6RAyaVTXll9DCMFc
-						Pp4ufilnrQMlW3OqR/MsKHZx0xAMWMDyMbPp9OrDxVj0V62p7XvlNfk1fDDNnoQN
-						Rgd0Lv896JOa398XcorCNltyF5C47lvpS1iJPiMCq58ZOV9/wpYzf2yA3EctFgPz
-						fuxb+x4Agg1mqJiR5txLQfJjXDqnd6mbPRipuilvglK0cApdAl5rIPXJ5AzrguTq
-						EOa26/uzKHmeNsbTWjKpMo3U/1Nz0fW6hltQtQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ldp.esc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldp.esc.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">East Surrey College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">East Surrey College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.esc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:support@esc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:support@esc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 4fe87fbd..00000000
--- a/swamid-interfederations-2.0/leeds.wadham.ox.ac.uk-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://leeds.wadham.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Wadham College NAC" Shibboleth SP for the University of Oxford.
-	-->
-  <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-09-04T14:59:30Z">
-      <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://leeds.wadham.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJALdAFtXAAI1PMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWxlZWRzLndhZGhhbS5veC5hYy51azAeFw0xMzA5MDQxMDIwNTBaFw0yMzA5
-						MDIxMDIwNTBaMCAxHjAcBgNVBAMTFWxlZWRzLndhZGhhbS5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcYhEqzgTzrAvZbgM5mFhntNkh7
-						gEh1HCO3ryI/YihGdH8ZblvfyuZU1mgaogarprLdOK0snmWos8DaX2yjFnh7Wtou
-						UjT0OWVzj9KeVUbWZzLMmTBYe89fdS6LVb8zMhW0/axUGzHnnc5cnlLqJqT+K/AA
-						2Gs0Etkn+SZRiKmevQ7O0oRBrz/Pmm5trvGnb709n751lPOmf/S0acJy2EbKch9b
-						fPGffhRLhQMuZ3fir5+Q6uWeQbfqrELFJjSFeo4HKKoETZNnECZCjtLfDirtfaE+
-						2p4vWnOAMQC5/veZ+zSJur3nMCpeNNTHgXriwbuwh5fUF1t544laEQdQTKMCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVbGVlZHMud2FkaGFtLm94LmFjLnVrMB0GA1UdDgQW
-						BBRcBV5eDW2Ctx+PdpiRbP/kukLo0jANBgkqhkiG9w0BAQUFAAOCAQEAwhOZbxZI
-						Z7AFmVFFVXZJ7ad9NOl0/QnSXyTgwhoPDx87MCNGkmKVy8s7wQqJ+YlJDMveVWgF
-						+youH53RrrEbXoNpDMfNchapK4Wek9jf85DxYZyGzJGngzG3LBhhEc/SVUoGr6vo
-						Rm6rMPmFL1ALyLXGZqRLsSDhdFAwuYhSMGKcQm/YIVDEu4dqmeQm7QIoM6dgzj2G
-						/z+frfonKNwjPK3btmrQsxsL8EcBcct9xXv2wdOL7opOcKewckJjt/JvA6LcMeNq
-						abMDiWvBUb2X096WTJgy3KGVjlDLOAYi2b7DnBiNdqK6aKsYxIYawphCfA4BRGeW
-						/7J4oftolmp18g==
-					</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://leeds.wadham.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leeds.wadham.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Wadham College NAC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wadham.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lee</GivenName>
-    <SurName>Wootton</SurName>
-    <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Wootton</SurName>
-    <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.xml
deleted file mode 100644
index 5d550df8..00000000
--- a/swamid-interfederations-2.0/leedstrinity.ac.uk-oala-metadata.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://leedstrinity.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Leeds Trinity University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">leedstrinity.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID0DCCArigAwIBAgIJAIjk4Kwl/h8pMA0GCSqGSIb3DQEBBQUAME4xKTAnBgNV
-						BAoTIExlZWRzIFRyaW5pdHkgVW5pdmVyc2l0eSBDb2xsZWdlMSEwHwYDVQQDExhs
-						YWlkcC5sZWVkc3RyaW5pdHkuYWMudWswHhcNMTEwNzExMTUyMzUzWhcNMjEwNzA4
-						MTUyMzUzWjBOMSkwJwYDVQQKEyBMZWVkcyBUcmluaXR5IFVuaXZlcnNpdHkgQ29s
-						bGVnZTEhMB8GA1UEAxMYbGFpZHAubGVlZHN0cmluaXR5LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw/9bLwTP7SZutO6X+sUMG7pv4yPNmLGO
-						thWm0PORm0ENtopolxC13bfCnMWLEzD01MkWLHLp3H1Mf9N+nMj7kJPbR+92180p
-						fQlXz7PSviGwjNChbVDJvRzC+z/qDf3skRo5qNSqmXpQzfHC3OG5jXb6pa/lDQzm
-						4iY6a13yCiSd1QlcT/4EzLpmgoyCnP0N0jw0EDmKtfQWtkyFsbAsJ8Gx65ykG7gY
-						kaYV/oyGNOhdYaxe02zcgGUZxxHCiSo3w9TV83wWFTufSdwMMoub3XHvC9kDfE/F
-						u9fz01ClQomVzuHY0m6KdCZA1iKY4/GT1d7mHgJOSLmLIzriFtFTPwIDAQABo4Gw
-						MIGtMB0GA1UdDgQWBBTGNjTJ1OSofwGC0/s7BsBo6eOOIDB+BgNVHSMEdzB1gBTG
-						NjTJ1OSofwGC0/s7BsBo6eOOIKFSpFAwTjEpMCcGA1UEChMgTGVlZHMgVHJpbml0
-						eSBVbml2ZXJzaXR5IENvbGxlZ2UxITAfBgNVBAMTGGxhaWRwLmxlZWRzdHJpbml0
-						eS5hYy51a4IJAIjk4Kwl/h8pMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAJtt39tCDzI46L55zb4hzRqWPio8/gmoW5oOhParyPu/VWrIHOeIbNxyKoBk
-						agUiOIYx5KoPgZxpMXDD0WiKaSYbes6EA0YoCX4U9WuZsBD+sexlbeIlLQM9axip
-						TomO9q/cQI97n3J7Bk/iR87guOU2fYEKwgg95PODcOguCAjqzRr+JtmGRU5JJ9RT
-						+wIvRjQcfi7iHgTfaRIWrdIUqGI565IW+zaL4dJjduR2tOkHmmMQM7XLiKy+1RV6
-						hiTw6O9ZgAbb1k6UlXJ58qZgeqwBEzDd9AvQRKIIsk7MD/7u7AiaLkpSD/FIKa3n
-						BDeKbG3KsdzVqHjcQxeUmsCbRe0=
-					</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>
-						MIID0DCCArigAwIBAgIJAIjk4Kwl/h8pMA0GCSqGSIb3DQEBBQUAME4xKTAnBgNV
-						BAoTIExlZWRzIFRyaW5pdHkgVW5pdmVyc2l0eSBDb2xsZWdlMSEwHwYDVQQDExhs
-						YWlkcC5sZWVkc3RyaW5pdHkuYWMudWswHhcNMTEwNzExMTUyMzUzWhcNMjEwNzA4
-						MTUyMzUzWjBOMSkwJwYDVQQKEyBMZWVkcyBUcmluaXR5IFVuaXZlcnNpdHkgQ29s
-						bGVnZTEhMB8GA1UEAxMYbGFpZHAubGVlZHN0cmluaXR5LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw/9bLwTP7SZutO6X+sUMG7pv4yPNmLGO
-						thWm0PORm0ENtopolxC13bfCnMWLEzD01MkWLHLp3H1Mf9N+nMj7kJPbR+92180p
-						fQlXz7PSviGwjNChbVDJvRzC+z/qDf3skRo5qNSqmXpQzfHC3OG5jXb6pa/lDQzm
-						4iY6a13yCiSd1QlcT/4EzLpmgoyCnP0N0jw0EDmKtfQWtkyFsbAsJ8Gx65ykG7gY
-						kaYV/oyGNOhdYaxe02zcgGUZxxHCiSo3w9TV83wWFTufSdwMMoub3XHvC9kDfE/F
-						u9fz01ClQomVzuHY0m6KdCZA1iKY4/GT1d7mHgJOSLmLIzriFtFTPwIDAQABo4Gw
-						MIGtMB0GA1UdDgQWBBTGNjTJ1OSofwGC0/s7BsBo6eOOIDB+BgNVHSMEdzB1gBTG
-						NjTJ1OSofwGC0/s7BsBo6eOOIKFSpFAwTjEpMCcGA1UEChMgTGVlZHMgVHJpbml0
-						eSBVbml2ZXJzaXR5IENvbGxlZ2UxITAfBgNVBAMTGGxhaWRwLmxlZWRzdHJpbml0
-						eS5hYy51a4IJAIjk4Kwl/h8pMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAJtt39tCDzI46L55zb4hzRqWPio8/gmoW5oOhParyPu/VWrIHOeIbNxyKoBk
-						agUiOIYx5KoPgZxpMXDD0WiKaSYbes6EA0YoCX4U9WuZsBD+sexlbeIlLQM9axip
-						TomO9q/cQI97n3J7Bk/iR87guOU2fYEKwgg95PODcOguCAjqzRr+JtmGRU5JJ9RT
-						+wIvRjQcfi7iHgTfaRIWrdIUqGI565IW+zaL4dJjduR2tOkHmmMQM7XLiKy+1RV6
-						hiTw6O9ZgAbb1k6UlXJ58qZgeqwBEzDd9AvQRKIIsk7MD/7u7AiaLkpSD/FIKa3n
-						BDeKbG3KsdzVqHjcQxeUmsCbRe0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laidp.leedstrinity.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Leeds Trinity University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds Trinity University OALA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.leedstrinity.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:Helpdesk@leedstrinity.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Dolan</SurName>
-    <EmailAddress>mailto:R.Dolan@leedstrinity.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Baron</SurName>
-    <EmailAddress>mailto:D.Baron@leedstrinity.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/libauth.com-saml-module.php-saml-sp-metadata.php-springy-sp.xml b/swamid-interfederations-2.0/libauth.com-saml-module.php-saml-sp-metadata.php-springy-sp.xml
deleted file mode 100644
index 0ca29d24..00000000
--- a/swamid-interfederations-2.0/libauth.com-saml-module.php-saml-sp-metadata.php-springy-sp.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://libauth.com/saml/module.php/saml/sp/metadata.php/springy-sp">
-  <!--
-		This is a "Springshare LibApps" simpleSAMLphp SP for Springshare LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-23T09:43:22Z">
-      <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">Springshare LibApps</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Springshare's LibApps helps libraries share knowledge, analyze services, and connect with users.</mdui:Description>
-        <mdui:Logo height="150" width="183" xml:lang="en">https://libauth.com/static/springshare-incommon.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE4TCCA8mgAwIBAgIQW9IQE6lOfxilMVYUD3eYQTANBgkqhkiG9w0BAQsFADBE
-						MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMU
-						R2VvVHJ1c3QgU1NMIENBIC0gRzMwHhcNMTQwOTMwMDAwMDAwWhcNMTYwOTI5MjM1
-						OTU5WjBfMQswCQYDVQQGEwJVUzEQMA4GA1UECBQHRmxvcmlkYTEOMAwGA1UEBxQF
-						TWlhbWkxFDASBgNVBAoUC1NwcmluZ3NoYXJlMRgwFgYDVQQDFA93d3cubGliYXV0
-						aC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeaK+45OlvZMCW
-						nhBlRi2vNUFNSdhppfyoLNGyQrDxDr5JSwSLwuWdSkJPkFkJsnScSxfXBki/BMz0
-						V3yY2CqkPYSMBYtG5OhD+4Bb8pcEcqtXrHzkj88Eo0eJP7iLOxWQsMIl1XZG6BW3
-						OWm2xxAJIqGdTGAyFWiE4Zq7sD+umMRacJWioY9Wu6X9AXZzJMT8qq5AnvK5qt6r
-						b4wJxBqwFp3ObUlRYG1TMHKaEd7VVgKcr4mEWQh7H44KcDDsI60322Rp0tzomPz9
-						FJ7htSSJ4K1imeWqOcImM1VmXHem3eruZlg+csslLGzsqVzsI8//Drf2RMWilu/U
-						PV5dtHwTAgMBAAGjggGyMIIBrjAnBgNVHREEIDAegg93d3cubGliYXV0aC5jb22C
-						C2xpYmF1dGguY29tMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsGA1UdHwQk
-						MCIwIKAeoByGGmh0dHA6Ly9nbi5zeW1jYi5jb20vZ24uY3JsMIGhBgNVHSAEgZkw
-						gZYwgZMGCmCGSAGG+EUBBzYwgYQwPwYIKwYBBQUHAgEWM2h0dHBzOi8vd3d3Lmdl
-						b3RydXN0LmNvbS9yZXNvdXJjZXMvcmVwb3NpdG9yeS9sZWdhbDBBBggrBgEFBQcC
-						AjA1DDNodHRwczovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL3JlcG9zaXRv
-						cnkvbGVnYWwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQY
-						MBaAFNJv95b0hT9yPDB9I9qFeJujfFp8MFcGCCsGAQUFBwEBBEswSTAfBggrBgEF
-						BQcwAYYTaHR0cDovL2duLnN5bWNkLmNvbTAmBggrBgEFBQcwAoYaaHR0cDovL2du
-						LnN5bWNiLmNvbS9nbi5jcnQwDQYJKoZIhvcNAQELBQADggEBAAE9UJj2EnSkAgJe
-						bexMA4e9x4YCrVDfBLF6nLLwBCT1ZWb7ganm2HeFwciO1ofcgBfvnUvIyKRtcNnM
-						7/XjJPfkdZWS9oja0IKCUPkFH85qHxkHzsquMqm/pNO3XTHnA11VpTQQekNeOTH8
-						H9mX1U06mPcQ5gb7FQ1pjFkGJf1KjPVcErbmcUPIi+0nyMYvHzO9s+4YkMNNKsk1
-						LTp+baR6oEsfyn58NIXjB1QVcwJKc9b+ImKE5MySsZi5ikqFq0DBAfGV6cacZY+K
-						AJv0x5aloVA/YBekndNFXDC+mtxo+pKrWyGsTcA33n+twUZ7Agz8Fzsh+3VIJooQ
-						qqVHvtY=
-					</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>
-						MIIE4TCCA8mgAwIBAgIQW9IQE6lOfxilMVYUD3eYQTANBgkqhkiG9w0BAQsFADBE
-						MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMU
-						R2VvVHJ1c3QgU1NMIENBIC0gRzMwHhcNMTQwOTMwMDAwMDAwWhcNMTYwOTI5MjM1
-						OTU5WjBfMQswCQYDVQQGEwJVUzEQMA4GA1UECBQHRmxvcmlkYTEOMAwGA1UEBxQF
-						TWlhbWkxFDASBgNVBAoUC1NwcmluZ3NoYXJlMRgwFgYDVQQDFA93d3cubGliYXV0
-						aC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeaK+45OlvZMCW
-						nhBlRi2vNUFNSdhppfyoLNGyQrDxDr5JSwSLwuWdSkJPkFkJsnScSxfXBki/BMz0
-						V3yY2CqkPYSMBYtG5OhD+4Bb8pcEcqtXrHzkj88Eo0eJP7iLOxWQsMIl1XZG6BW3
-						OWm2xxAJIqGdTGAyFWiE4Zq7sD+umMRacJWioY9Wu6X9AXZzJMT8qq5AnvK5qt6r
-						b4wJxBqwFp3ObUlRYG1TMHKaEd7VVgKcr4mEWQh7H44KcDDsI60322Rp0tzomPz9
-						FJ7htSSJ4K1imeWqOcImM1VmXHem3eruZlg+csslLGzsqVzsI8//Drf2RMWilu/U
-						PV5dtHwTAgMBAAGjggGyMIIBrjAnBgNVHREEIDAegg93d3cubGliYXV0aC5jb22C
-						C2xpYmF1dGguY29tMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsGA1UdHwQk
-						MCIwIKAeoByGGmh0dHA6Ly9nbi5zeW1jYi5jb20vZ24uY3JsMIGhBgNVHSAEgZkw
-						gZYwgZMGCmCGSAGG+EUBBzYwgYQwPwYIKwYBBQUHAgEWM2h0dHBzOi8vd3d3Lmdl
-						b3RydXN0LmNvbS9yZXNvdXJjZXMvcmVwb3NpdG9yeS9sZWdhbDBBBggrBgEFBQcC
-						AjA1DDNodHRwczovL3d3dy5nZW90cnVzdC5jb20vcmVzb3VyY2VzL3JlcG9zaXRv
-						cnkvbGVnYWwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQY
-						MBaAFNJv95b0hT9yPDB9I9qFeJujfFp8MFcGCCsGAQUFBwEBBEswSTAfBggrBgEF
-						BQcwAYYTaHR0cDovL2duLnN5bWNkLmNvbTAmBggrBgEFBQcwAoYaaHR0cDovL2du
-						LnN5bWNiLmNvbS9nbi5jcnQwDQYJKoZIhvcNAQELBQADggEBAAE9UJj2EnSkAgJe
-						bexMA4e9x4YCrVDfBLF6nLLwBCT1ZWb7ganm2HeFwciO1ofcgBfvnUvIyKRtcNnM
-						7/XjJPfkdZWS9oja0IKCUPkFH85qHxkHzsquMqm/pNO3XTHnA11VpTQQekNeOTH8
-						H9mX1U06mPcQ5gb7FQ1pjFkGJf1KjPVcErbmcUPIi+0nyMYvHzO9s+4YkMNNKsk1
-						LTp+baR6oEsfyn58NIXjB1QVcwJKc9b+ImKE5MySsZi5ikqFq0DBAfGV6cacZY+K
-						AJv0x5aloVA/YBekndNFXDC+mtxo+pKrWyGsTcA33n+twUZ7Agz8Fzsh+3VIJooQ
-						qqVHvtY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://libauth.com/saml/module.php/saml/sp/saml2-logout.php/springy-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://libauth.com/saml/module.php/saml/sp/saml2-acs.php/springy-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://libauth.com/saml/module.php/saml/sp/saml1-acs.php/springy-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://libauth.com/saml/module.php/saml/sp/saml2-acs.php/springy-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://libauth.com/saml/module.php/saml/sp/saml1-acs.php/springy-sp/artifact" index="3"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Springshare LibApps</ServiceName>
-      <ServiceDescription xml:lang="en">Springshare's LibApps helps libraries share knowledge, analyze services, and connect with users.</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: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">Springshare LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Springshare LibApps</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://springshare.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jing</GivenName>
-    <SurName>Xiao</SurName>
-    <EmailAddress>mailto:jing@springshare.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jing</GivenName>
-    <SurName>Xiao</SurName>
-    <EmailAddress>mailto:jing@springshare.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/library-test.lancs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/library-test.lancs.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 94c5b65a..00000000
--- a/swamid-interfederations-2.0/library-test.lancs.ac.uk-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" entityID="https://library-test.lancs.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Library (Test)" Shibboleth IdP for the University of Lancaster.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-28T09:21:19Z">
-      <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">lancaster.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lancaster University Library (Test)</mdui:DisplayName>
-        <mdui:Logo height="50" width="80">https://library.lancs.ac.uk/img/mdui-logo-test.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIVAO4MPYx98Q9Mfc6FlCYoAKZNQ3t+MA0GCSqGSIb3DQEB
-						BQUAMCMxITAfBgNVBAMTGGxpYnJhcnktdGVzdC5sYW5jcy5hYy51azAeFw0xNDEw
-						MjcxNzEwNDhaFw0zNDEwMjcxNjEwNDhaMCMxITAfBgNVBAMTGGxpYnJhcnktdGVz
-						dC5sYW5jcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI5A
-						00q7vUBZKo8h05RQSFnBvp5pvj8p8kR+ILgATspc+KfndJk3RiDjgIliQVO+tIj4
-						q0yfIvVP02t3f3oubmn91ANqysQ7hRW/JTSZKfy6RLs0Jbtno7vV5vMyOfx2PpwU
-						EUT61IaM3VSHWp3/2kBaaCWN3zXeGMjYyTebuyNw9A/Zt/nxpGx6/W1byC0NkJNx
-						DuX8cwfb9Rx99a78fo6fRiMrhPAyN2ugUzhbS+ern6s6bI/zesXR1X0Iq4gabSrN
-						HJPv1ISAq8EFMocqTEhObRObWJO9jtQeo9YGbrU18fkw4NWrfHzuh14OOFeU4H45
-						K+rSBU2BTWZx+KlDAyECAwEAAaN3MHUwVAYDVR0RBE0wS4IYbGlicmFyeS10ZXN0
-						LmxhbmNzLmFjLnVrhi9odHRwczovL2xpYnJhcnktdGVzdC5sYW5jcy5hYy51ay9p
-						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU3rT0JaaohNxRSvMvk3iSq1MsjGkwDQYJ
-						KoZIhvcNAQEFBQADggEBADEdnzRF8dya8o+OZ9lEILST2bmyDcjUZyMXwnIcaLUq
-						Y5yxyFigIi4eK7Kzm1AvyOZEWQ9lPecR1VTyIoOAw/xYtTXUSYRDEwOc7/w/A/86
-						qklOjDxnweuyswx/HpQ/rIH8TA65WYEiYgzA3o1HyJgqSdOvKdwTSHYMSs+GZpE3
-						rMEfC31HBuMFvn1nVJJD77CU7sP6OHLPlAjNc1vlnMHVvoGgw+4s6jCNBqtReKW7
-						js74IwmAPaxVM3IXz0laUEijn+KlMBnOn3z/G/RWrn97NBdbuNyq7zBI0DjWLQHj
-						w9J0l69gw9nG5FltJm4dXurNFt58piC0BtrCKTTdvS0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://library-test.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://library-test.lancs.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://library-test.lancs.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://library-test.lancs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://library-test.lancs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://library-test.lancs.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">lancaster.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIVAO4MPYx98Q9Mfc6FlCYoAKZNQ3t+MA0GCSqGSIb3DQEB
-						BQUAMCMxITAfBgNVBAMTGGxpYnJhcnktdGVzdC5sYW5jcy5hYy51azAeFw0xNDEw
-						MjcxNzEwNDhaFw0zNDEwMjcxNjEwNDhaMCMxITAfBgNVBAMTGGxpYnJhcnktdGVz
-						dC5sYW5jcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI5A
-						00q7vUBZKo8h05RQSFnBvp5pvj8p8kR+ILgATspc+KfndJk3RiDjgIliQVO+tIj4
-						q0yfIvVP02t3f3oubmn91ANqysQ7hRW/JTSZKfy6RLs0Jbtno7vV5vMyOfx2PpwU
-						EUT61IaM3VSHWp3/2kBaaCWN3zXeGMjYyTebuyNw9A/Zt/nxpGx6/W1byC0NkJNx
-						DuX8cwfb9Rx99a78fo6fRiMrhPAyN2ugUzhbS+ern6s6bI/zesXR1X0Iq4gabSrN
-						HJPv1ISAq8EFMocqTEhObRObWJO9jtQeo9YGbrU18fkw4NWrfHzuh14OOFeU4H45
-						K+rSBU2BTWZx+KlDAyECAwEAAaN3MHUwVAYDVR0RBE0wS4IYbGlicmFyeS10ZXN0
-						LmxhbmNzLmFjLnVrhi9odHRwczovL2xpYnJhcnktdGVzdC5sYW5jcy5hYy51ay9p
-						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU3rT0JaaohNxRSvMvk3iSq1MsjGkwDQYJ
-						KoZIhvcNAQEFBQADggEBADEdnzRF8dya8o+OZ9lEILST2bmyDcjUZyMXwnIcaLUq
-						Y5yxyFigIi4eK7Kzm1AvyOZEWQ9lPecR1VTyIoOAw/xYtTXUSYRDEwOc7/w/A/86
-						qklOjDxnweuyswx/HpQ/rIH8TA65WYEiYgzA3o1HyJgqSdOvKdwTSHYMSs+GZpE3
-						rMEfC31HBuMFvn1nVJJD77CU7sP6OHLPlAjNc1vlnMHVvoGgw+4s6jCNBqtReKW7
-						js74IwmAPaxVM3IXz0laUEijn+KlMBnOn3z/G/RWrn97NBdbuNyq7zBI0DjWLQHj
-						w9J0l69gw9nG5FltJm4dXurNFt58piC0BtrCKTTdvS0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://library-test.lancs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://library-test.lancs.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 Lancaster</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lancaster University Library (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lancaster.ac.uk/library/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Hartland</SurName>
-    <EmailAddress>mailto:a.hartland@lancaster.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Hartland</SurName>
-    <EmailAddress>mailto:a.hartland@lancaster.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 8ff6c2b3..00000000
--- a/swamid-interfederations-2.0/library.qub.ac.uk-shibboleth-metadata.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://library.qub.ac.uk/shibboleth/metadata">
-  <!--
-		This is a "Queen's University SP" Shibboleth SP for The Queen's University of Belfast.
-	-->
-  <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-05-31T09:25:24Z"/>
-  </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://raptor.qub.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Queen's University SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Queen's University SP for special access Library E-Resources</mdui:Description>
-        <mdui:Logo height="95" width="80">https://ezproxy1.qub.ac.uk:8443/icons/Q.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC2TCCAcGgAwIBAgIJANx6SVUginfkMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
-						BAMTBnJhcHRvcjAeFw0xMzA0MjQwODU0MTdaFw0yMzA0MjIwODU0MTdaMBExDzAN
-						BgNVBAMTBnJhcHRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKB3
-						k6ymJAJTxp7t77CFWoRJKYBCfNxiXaE5BcT76ZcWIohzpsiHyTpPlKU0uZe1rjNh
-						gOEVjcdNI3n6AAaIT3CvawtbczAIHi5XflQ//S9qdn+W1+kgcSFvgINSIhHIW66F
-						OXSa7oHCHNxmb3LYE7EZj1pEpFAgYvNG4V6UW8lgDmB4fS4DPdO+BPj6AIYVb6PF
-						50FzrMiDPdRkr/aXZ7evxWmD7ruojrJRLuFI7bZoNlaEGpKRQ/krZPZz1VddUy/d
-						tFznDa328ytxn9fGq5ZWPoiaA/1zaEJ9yVdAwKi/M5KQRTgZZ/Yae/zu8rTlTjZB
-						ob5AJgSgOW5RoAyKG+cCAwEAAaM0MDIwEQYDVR0RBAowCIIGcmFwdG9yMB0GA1Ud
-						DgQWBBTsdKLXymwLx7MoCSzQZgdEcVhc2zANBgkqhkiG9w0BAQUFAAOCAQEANfHO
-						1TeImBAPHOsgGuGedT9q45nkmtJDXSGI7a68chsPvaOzQfAlVeFFBDyQ7YfoHmLb
-						yuBjU5OCRfpJ3PyQAnVO8l/aEMUT1qe4HKbOWLV3jdM/HxumqkEDraZe3mAceelj
-						7Xs+Fpncf80Iie3I4LEvgjSkqryciRQFFESA8dLMkuKoMKMmiswVwKVErw/nMClb
-						ARNvuh8GT+MqNqACjO9Dstixdcr2A5WapXIs5G+is7RnGVtxwQBp4Q0ULqbqSJiD
-						7dODX4wncRad73U0SAmqFt9fpftB4rOuHloEKkkoGGKSvqlWUGkiT5GWw/BH0o1n
-						eZkMlsZjMmrX7Nk0/A==
-					</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://raptor.qub.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://raptor.qub.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Queen's University of Belfast</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen's University SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qub.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>E-Resouces Team</GivenName>
-    <EmailAddress>mailto:eresources@qub.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Goodall</SurName>
-    <EmailAddress>mailto:m.goodall@qub.ac.uk</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 68e11769..00000000
--- a/swamid-interfederations-2.0/liepu-idp.lanet.lv.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://liepu-idp.lanet.lv">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Liepaja University</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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - LIEPU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Liepaja University - LIEPU IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml b/swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.xml
deleted file mode 100644
index bac84a31..00000000
--- a/swamid-interfederations-2.0/ligo.org-ligovirgo-cbcnote-shibboleth-sp.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://ligo.org/ligovirgo/cbcnote/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">LIGO CBC Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Wiki for the LIGO/Virgo Compact Binary Coalescence Data Analysis Working Group</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89286</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89243</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://login.ligo.org/SAML2/metadata/ui/ligologo80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEbzCCA1egAwIBAgIBLDANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
-ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
-BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
-dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMTAxMDYyMzI0NTJaFw0yMTAx
-MDUyMzI0NTJaMHYxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
-FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxIzAh
-BgNVBAMTGnd3dy5sc2MtZ3JvdXAucGh5cy51d20uZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAuecfG1v+W0aaj7hPyPMuomjqJhV2cRndqwqckQlP
-V8CpGTEUZo1p1xX/Inx3lX7hUYkiGD+0pN120FSI79umMM5mgiRUPqqKYMiQZoS6
-q7P7gm8NNitjhlt3vwlMO2Spsfe84jjy+KkgJRV2ReRpxn6P+A4DkEUn88Ct+BmS
-F3YYh5hPlJJ/uGqVIG+XxgMyii2y1W11GZJuxls5u4aOnWGnZbgimmUJfQ3Ymjme
-1AM2JOp0B2xCJFVY4j0GsHCRKIy6lKisMTsXMhnPL8gL1y/OxqGSs0J2vMnNRqxO
-rNajrq/EPuyxAWp/53fptT8ZMDSKyXuFk7lG23vvKywIuQIDAQABo4H1MIHyMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAZBgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAw
-MC6gLKAqhihodHRwOi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3Js
-MB8GA1UdIwQYMBaAFFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDwGA1UdEQQ1MDOCMXd3
-dy5sc2MtZ3JvdXAucGh5cy51d20uZWR1OnNjb3R0LmtvcmFuZGFAbGlnby5vcmcw
-DQYJKoZIhvcNAQEFBQADggEBAC8RMkc5TrNWkNJ8yMVS6NFIKRSV7H6J2NToTu8h
-1X4zHC1o2tb2kh5Kcg1rhAKtUKpLHnsrZ+OYGY1kJ/NpfUQWHDoYq/2NGnIUAFod
-zJvIT/a/9ENSVVEe0TUwz6oI7EC0TYmggHL6kdkKXB237ah1NLQrSZ3xEJaoK0I3
-De6W4llFiV5Dls+j6EpHzuCET/e6s1cMclB7OMjcdNdecBX0xCGCm91u3OtEQGKM
-rzjVenErOkaR2hlPpssGfuLrGE8XT0qOvouycF+tC4MCElQnRQUjv5Gm7rnDnCFo
-abdn3KRVra6I57DBgGlc3hNW7pWrWcB+roy1O73/Cb/ZIpo=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lsc-group.phys.uwm.edu/ligovirgo/cbcnote/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">LIGO CBC Wiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Wiki for the LIGO/Virgo Compact Binary Coalescence Data Analysis Working Group</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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="givenName" Name="urn:mace:dir:attribute-def:givenName" 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="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Scott Koranda</md:GivenName>
-    <md:EmailAddress>scott.koranda@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Warren Anderson</md:GivenName>
-    <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LIGO Identity Management Help Desk</md:GivenName>
-    <md:EmailAddress>rt-auth@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LIGO Security Committee</md:GivenName>
-    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/list-manager.larpp.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/list-manager.larpp.internet2.edu-shibboleth.xml
deleted file mode 100644
index bd3fa7be..00000000
--- a/swamid-interfederations-2.0/list-manager.larpp.internet2.edu-shibboleth.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://list-manager.larpp.internet2.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://list-manager.larpp.internet2.edu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) List Manager</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP serves the project's list manager.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://list-manager.larpp.internet2.edu/spinfo.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/policies/privacy/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="275" xml:lang="en">https://list-manager.larpp.internet2.edu/img/larpp_logo_transparent_275wX150h.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTTCCAjWgAwIBAgIJAMl1ozU9T/x6MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-BAMTG2p1cGl0ZXIubGFycHAuaW50ZXJuZXQyLmVkdTAeFw0xNDA1MjIxMTM5MjFa
-Fw0zNDA1MTcxMTM5MjFaMCYxJDAiBgNVBAMTG2p1cGl0ZXIubGFycHAuaW50ZXJu
-ZXQyLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANip+uikaG0s
-TOjjJ1SYpSe1RJsKtHQkxccO8BsDmHyrjyEh5h1nfQP1Pu3zkM1hGTerJ+V4l393
-f8awbu5KUYBBVPsonHgX+34LB7lT0CG3i2m8oonP57+23m+8dNKOPGDVFAVMYWBG
-5UvAjJW6vB1E9kYf+yRaKIpu04ot2yVC6OqxMmtuGGzN9wBuosc6scTcJPAfo0nA
-j79F23CDjU2IF1RXvSKTrbuMmin5FYDmERMz0WVQ8b680r7TaRfp878ynixywkt4
-3d/a0PlJ4KyrU8HmTJOXLFerWi+kLGcsbsD2qxtLUEfjX/G5OWqxEw48pEDjpkzR
-Pglrm1VNuQMCAwEAAaN+MHwwWwYDVR0RBFQwUoIbanVwaXRlci5sYXJwcC5pbnRl
-cm5ldDIuZWR1hjNodHRwczovL2xpc3QtbWFuYWdlci5sYXJwcC5pbnRlcm5ldDIu
-ZWR1L3NoaWJib2xldGgwHQYDVR0OBBYEFCzkVNes/vMPGsxn9RrVJgawxviIMA0G
-CSqGSIb3DQEBBQUAA4IBAQAkY/FqXFfG3ZrdvbcjVgoNWoh5rbbgK5vvQqcqyJAv
-7A/RClzGoTQzr1VYzpmd2Ps5BW8511AiWoCsRYFG0PCP7mgeMsUvMbvIPH7y7nCN
-KGySFi/1FxCDdLnFoQp++ZViH291O0KmuGjvGpuqzbu/8VvoBPDk6wMwOf/T5YlB
-1y/esav2zAW/DdxY9jofTQ/SgcOZz56MRl18pwv3hLST9cei7VSmGhn6E/XBidSi
-KyGwcp4870RdzHe7cjkuIUh0H+X+AA+66j3ReQDlYJQ1iy6h745IsAACYiT03VI5
-mt7E5MgE8Qei4tnTbjhWxj4XwFfGCsMJqR5rVV3bbVCY
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://list-manager.larpp.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) List Manager</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP serves the project's list manager.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tracy Beth Mitrano</md:GivenName>
-    <md:EmailAddress>tmitrano@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>LARPP Technical Support</md:GivenName>
-    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LARPP Support</md:GivenName>
-    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LARPP Incident Response</md:GivenName>
-    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lists.eocoe.eu.xml b/swamid-interfederations-2.0/lists.eocoe.eu.xml
deleted file mode 100644
index 5ed9cb7d..00000000
--- a/swamid-interfederations-2.0/lists.eocoe.eu.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.eocoe.eu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2016-02-03T17:30:23Z">
-      <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:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EoCoE Mailing List Service</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://lists.eocoe.eu/sympa</mdui:InformationURL>
-        <mdui:Description xml:lang="en">EoCoE groupware service. This service offers mailing lsits along with other collaborative tools linked to these lists (wiki, surveys).</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Service de listes de l'EoCoE</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Service de groupware de l'EoCoE. 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.eocoe.eu/coco.html</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.eocoe.eu/Shibboleth.sso/SAML/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.eocoe.eu/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Service de listes de l'EoCoE</md:ServiceName>
-      <md:ServiceName xml:lang="en">EoCoE Mailing List Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Service de groupware de l'EoCoE. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">EoCoE groupware service. This service offers mailing lsits along with other collaborative tools linked to these lists (wiki, surveys).</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Pol Moal</md:SurName>
-    <md:EmailAddress>pol.moal@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>David Verdin</md:SurName>
-    <md:EmailAddress>david.verdin@renater.fr</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 8e6e9ef2..00000000
--- a/swamid-interfederations-2.0/lists.geant.net.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.geant.net">
-  <md: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:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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:InformationURL xml:lang="fr">https://lists.geant.net/sympa</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.geant.net/Shibboleth.sso/SAML/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.geant.net/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Service de listes de test de Geant</md:ServiceName>
-      <md:ServiceName xml:lang="en">Geant test mailing list service</md:ServiceName>
-      <md: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).</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Dante test groupware service. This service offers mailing lists along with other collaborative tools linked to these lists (wiki, surveys)</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Pol Moal</md:SurName>
-    <md:EmailAddress>pol.moal@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>David Verdin</md:SurName>
-    <md:EmailAddress>david.verdin@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lists.geant.org.xml b/swamid-interfederations-2.0/lists.geant.org.xml
deleted file mode 100644
index fd2524ff..00000000
--- a/swamid-interfederations-2.0/lists.geant.org.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.geant.org">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-04-29T09:35:00Z">
-      <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:AttributeValue>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Geant Groupware service</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://lists.geant.org/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">GN4 project collaborative tools (mailing lists and wikis).</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Geant Groupware service</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Ce service fournit des outils de travail collaboratif aux membres du projet GN4, notamment des lists de diffusion et des wikis</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://lists.geant.org/coc.html</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>
-					      MIIDCTCCAfGgAwIBAgIJAKXf1V/KCXwLMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnRlc3QtbGlzdHMwMS5nZWFudC5uZXQwHhcNMTUwNDAxMTM1MTQ1WhcNMjUw
-MzI5MTM1MTQ1WjAhMR8wHQYDVQQDExZ0ZXN0LWxpc3RzMDEuZ2VhbnQubmV0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7XdG9N0LSlfi87WDu0/fctSU
-h65Rm9tm+JzQxuK9NyfQeXKhBaQMK+uelrk66mgjxAiuuYDGkJ1Ity99SVYCjFsF
-ZCUk2QV68KDewsX8dQhS4mgx7YzQS0j7mKQ4gligmoYiZ8RmA01aOKgG3t0Pbfty
-hHYrNx72tgoONyuvGNXaDpJe7bvb3flEiPe6zBqcCxarYvviiPrUuGFN01BLiuJ/
-rOkeimuvS6uDgPcJjPHYIY08GOypiFBVPKD9BFzNMYNzLubKQhZlYxQ2DwZr9A6B
-4PgK/hr0KFtMv8dwQFiJeZlNkL1M0uCLZvwYdp7R1LcmhYtLfBw9LPyYavAwAwID
-AQABo0QwQjAhBgNVHREEGjAYghZ0ZXN0LWxpc3RzMDEuZ2VhbnQubmV0MB0GA1Ud
-DgQWBBQQF9uaxqwZHMPdBAUqwbbJKZ+azjANBgkqhkiG9w0BAQUFAAOCAQEA26hO
-SxEnEo0+dGefyelpepLK88yLUTCqLKkf/ueh/bRYTxYnvhuXnKG8SEnj31hsBlrg
-0rRBJk1dcEonIjxAx/SU6pwfJ5meocEUmr8JhTrC3GfJD+N2fSifaKmFXJ+eDG4H
-LtwhiMq61U4VkTW/vMIHNHoKm9gkDxStp1ci6MFdLtUaIiffYBOPtuqRwDz2IErX
-bkeBfYrxyNLXpg3EbMJ5c7lQ7UJxEcUk7RyqX7whVwIEChIlnSb1i1GSdw+eZafE
-cFHyCkGxqfrSPB381C4XX43hNs4gH/w0gXZ9k9bopeuBQc5lJG+isAotHjHQwQ5r
-lLRJvk9cfZmZAyHc8w==
-					    </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>
-					      MIIDCTCCAfGgAwIBAgIJAKXf1V/KCXwLMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFnRlc3QtbGlzdHMwMS5nZWFudC5uZXQwHhcNMTUwNDAxMTM1MTQ1WhcNMjUw
-MzI5MTM1MTQ1WjAhMR8wHQYDVQQDExZ0ZXN0LWxpc3RzMDEuZ2VhbnQubmV0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7XdG9N0LSlfi87WDu0/fctSU
-h65Rm9tm+JzQxuK9NyfQeXKhBaQMK+uelrk66mgjxAiuuYDGkJ1Ity99SVYCjFsF
-ZCUk2QV68KDewsX8dQhS4mgx7YzQS0j7mKQ4gligmoYiZ8RmA01aOKgG3t0Pbfty
-hHYrNx72tgoONyuvGNXaDpJe7bvb3flEiPe6zBqcCxarYvviiPrUuGFN01BLiuJ/
-rOkeimuvS6uDgPcJjPHYIY08GOypiFBVPKD9BFzNMYNzLubKQhZlYxQ2DwZr9A6B
-4PgK/hr0KFtMv8dwQFiJeZlNkL1M0uCLZvwYdp7R1LcmhYtLfBw9LPyYavAwAwID
-AQABo0QwQjAhBgNVHREEGjAYghZ0ZXN0LWxpc3RzMDEuZ2VhbnQubmV0MB0GA1Ud
-DgQWBBQQF9uaxqwZHMPdBAUqwbbJKZ+azjANBgkqhkiG9w0BAQUFAAOCAQEA26hO
-SxEnEo0+dGefyelpepLK88yLUTCqLKkf/ueh/bRYTxYnvhuXnKG8SEnj31hsBlrg
-0rRBJk1dcEonIjxAx/SU6pwfJ5meocEUmr8JhTrC3GfJD+N2fSifaKmFXJ+eDG4H
-LtwhiMq61U4VkTW/vMIHNHoKm9gkDxStp1ci6MFdLtUaIiffYBOPtuqRwDz2IErX
-bkeBfYrxyNLXpg3EbMJ5c7lQ7UJxEcUk7RyqX7whVwIEChIlnSb1i1GSdw+eZafE
-cFHyCkGxqfrSPB381C4XX43hNs4gH/w0gXZ9k9bopeuBQc5lJG+isAotHjHQwQ5r
-lLRJvk9cfZmZAyHc8w==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.geant.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.geant.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Geant Groupware service</md:ServiceName>
-      <md:ServiceName xml:lang="en">Geant Groupware service</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Ce service fournit des outils de travail collaboratif aux membres du projet GN4, notamment des lists de diffusion et des wikis</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">GN4 project collaborative tools (mailing lists and wikis).</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>David Verdin</md:SurName>
-    <md:EmailAddress>david.verdin@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Michael Haller</md:SurName>
-    <md:EmailAddress>michael.haller@dante.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/liverpool.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index c35e5a9b..00000000
--- a/swamid-interfederations-2.0/liverpool.idm.oclc.org-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://liverpool.idm.oclc.org/shibboleth">
-  <!--
-		This is a "University of Liverpool" EZproxy SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-10T09:48:41Z">
-      <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 ">
-    <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://login.liverpool.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIECzCCAvOgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBmMSEwHwYDVQQDFBgqLmxp
-						dmVycG9vbC5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xD
-						MSUwIwYJKoZIhvcNAQkBFhZjYXJsLnByZW50aWNlQG9jbGMub3JnMB4XDTE0MTEw
-						NzE1NDczOFoXDTI0MTEwNjE1NDczOFowZjEhMB8GA1UEAxQYKi5saXZlcnBvb2wu
-						aWRtLm9jbGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzElMCMGCSqG
-						SIb3DQEJARYWY2FybC5wcmVudGljZUBvY2xjLm9yZzCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAMR8ySKDcf3OT9U/DzD5phNed/00olgxko57IMTRvhek
-						ew/PJCROOTOWkgHi3jn5gdCJUmY52LA+R/1DS85h6jBvIHCfM9hPRzzJ+UhxaYx9
-						V3UFpPXdwQRCkPT7IJ4t5PUH4Ejoxk/7kNfXIMvtZKbP/2RBK37BNF+jtRCuCo75
-						OTlAuuiAmuuu87S11EBpGc2FAVg4dgFkP0kXkwB94+TH5xMhbaTAcj2EFvn0UYBX
-						FHyTBMkrPhjKzQBIwvKsxLVZpshshn5By4ehV4i/aNxn+vtN2i2wI8WUaNGsfx6R
-						lpA5mhFtgUzKoZdaP26TRcFNxMLwRcsz5H/Mn+UbNJkCAwEAAaOBwzCBwDAdBgNV
-						HQ4EFgQUFjxA60obD8QtsXc1NHdND3Ye//gwgZAGA1UdIwSBiDCBhYAUFjxA60ob
-						D8QtsXc1NHdND3Ye//ihaqRoMGYxITAfBgNVBAMUGCoubGl2ZXJwb29sLmlkbS5v
-						Y2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxJTAjBgkqhkiG9w0B
-						CQEWFmNhcmwucHJlbnRpY2VAb2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zANBgkq
-						hkiG9w0BAQUFAAOCAQEAC9bn5EoAcvFfD21a5RT/k9u4QS6FpLZGZiLiPx5w44eF
-						fZPIr8WpKD/MuSnW4zaXLQUsQGxNbPvnh5gIqSMtqFErnD0HAggq+4ameyhrmL9U
-						CKv4M31+DlYdYuryrrrVmKIEI3G/sNTsuChxYG3qh+frm8nI2tKqXYcoWyQAOO/e
-						Xx7jgG7X3RADR3aW9mxhwCslNWmlcXCg08Cb4xkpo1CnWp+gNSm1u3G0rIgqsqXR
-						KvELFtpZjI6wYAmWgr2ERYbKlOGXCLNOTTD3u+t2WvIQsk9iWrDUGJuXP6rjadr2
-						uGQq30Q0dqFgd1jyc5ZHakixPZMu9DniEhOkcW5oHA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.liverpool.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Liverpool Hosted EZProxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml b/swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
deleted file mode 100644
index d0a07866..00000000
--- a/swamid-interfederations-2.0/livesrv.ex.vr.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://livesrv.ex.vr.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">vr.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDLDCCAhSgAwIBAgIVAKrFALRGt/sXrJc+5j0adTu2M0/4MA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGxpdmVzcnYuZXgudnIuc2UwHhcNMTExMDExMDkwNjI1
-WhcNMzExMDExMDkwNjI1WjAbMRkwFwYDVQQDExBsaXZlc3J2LmV4LnZyLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnXd832CJ92pEWl9agbHgE+yc
-zLwonOox29ZXk9x68vd5+n+36bO1gkb4dg+8xgHR3WqXOUwVajMWtUkhH7YN1dq2
-h8JzOQ20oTTfJQi13uzL+uyfu3Z+X1mAnxfAz8wr1IjRLBfjgCiyii87/TcpEZBl
-lT8p6W3E8hiB8Qdbd7FJf52q6y4nRikMlYK0JMAg9v9SvQPZoSd0Fift5Mt92Tes
-73vmimu0FK/2AkvDw7ANTV1YfuyFYUgZ6koRe1gO3JUFIKYXMgovUh2Gy9VjxW0h
-/YeOxgGUb8sC33VHDUd03oB90XcSdih+KaSxkw6gWUyuQZ9GvnzfYPpj2nblCQID
-AQABo2cwZTBEBgNVHREEPTA7ghBsaXZlc3J2LmV4LnZyLnNlhidodHRwczovL2xp
-dmVzcnYuZXgudnIuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKHqhiJr9a82
-J7vvd4BcjZn84W0qMA0GCSqGSIb3DQEBBQUAA4IBAQBpzAB/oEEbx4Hnbd9H+B/U
-ZkIrKc9RNnz76jr0EHVGma3iy7EeueJLdgEBgmwvYrzl5dyWSLrdw/sXBsuer7wM
-FeegMJozSv56MrpSoAODBsCeyrmldFGqRzBu5KjF9/MVRpwBqXEZnDEPe4gDKP+b
-JdxMfnBNi8mPEIZK/cAPcdnNYatIvWFzrvcGfLwUlJvEPt3FVPxibY8rMqS0v4vl
-E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
-7yrPHZ1JX3HLDgrZHMW5EZ5df29H0UA1YU9mTvpo3CCy3fzJINtdT5JRBXtEqudj
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://livesrv.ex.vr.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://livesrv.ex.vr.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://livesrv.ex.vr.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://livesrv.ex.vr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://livesrv.ex.vr.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">vr.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-
-MIIDLDCCAhSgAwIBAgIVAKrFALRGt/sXrJc+5j0adTu2M0/4MA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEGxpdmVzcnYuZXgudnIuc2UwHhcNMTExMDExMDkwNjI1
-WhcNMzExMDExMDkwNjI1WjAbMRkwFwYDVQQDExBsaXZlc3J2LmV4LnZyLnNlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnXd832CJ92pEWl9agbHgE+yc
-zLwonOox29ZXk9x68vd5+n+36bO1gkb4dg+8xgHR3WqXOUwVajMWtUkhH7YN1dq2
-h8JzOQ20oTTfJQi13uzL+uyfu3Z+X1mAnxfAz8wr1IjRLBfjgCiyii87/TcpEZBl
-lT8p6W3E8hiB8Qdbd7FJf52q6y4nRikMlYK0JMAg9v9SvQPZoSd0Fift5Mt92Tes
-73vmimu0FK/2AkvDw7ANTV1YfuyFYUgZ6koRe1gO3JUFIKYXMgovUh2Gy9VjxW0h
-/YeOxgGUb8sC33VHDUd03oB90XcSdih+KaSxkw6gWUyuQZ9GvnzfYPpj2nblCQID
-AQABo2cwZTBEBgNVHREEPTA7ghBsaXZlc3J2LmV4LnZyLnNlhidodHRwczovL2xp
-dmVzcnYuZXgudnIuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKHqhiJr9a82
-J7vvd4BcjZn84W0qMA0GCSqGSIb3DQEBBQUAA4IBAQBpzAB/oEEbx4Hnbd9H+B/U
-ZkIrKc9RNnz76jr0EHVGma3iy7EeueJLdgEBgmwvYrzl5dyWSLrdw/sXBsuer7wM
-FeegMJozSv56MrpSoAODBsCeyrmldFGqRzBu5KjF9/MVRpwBqXEZnDEPe4gDKP+b
-JdxMfnBNi8mPEIZK/cAPcdnNYatIvWFzrvcGfLwUlJvEPt3FVPxibY8rMqS0v4vl
-E829C4X5CIQjd4L9PA+L4s+/jp4zrJsyouvLGs2IQqTQYQYPajUoql2GT7w+NUju
-7yrPHZ1JX3HLDgrZHMW5EZ5df29H0UA1YU9mTvpo3CCy3fzJINtdT5JRBXtEqudj
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://livesrv.ex.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://livesrv.ex.vr.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">VR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Vetenskapsrådet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vr.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Swedish Reasearch Council</md:Company>
-    <md:EmailAddress>mailto:kontors-it@vr.se</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 50590818..00000000
--- a/swamid-interfederations-2.0/lma-idp.lanet.lv.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lma-idp.lanet.lv">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Art Academy of Latvia</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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - LMA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Art Academy of Latvia - LMA IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lv">http://www.lma.lv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto:itserviss@lanet.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml b/swamid-interfederations-2.0/lmet.aiwip.com-shibboleth.xml
deleted file mode 100644
index 73cb67b2..00000000
--- a/swamid-interfederations-2.0/lmet.aiwip.com-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://lmet.aiwip.com/shibboleth">
-  <!--
-		This is an "Aiwip for London Metropolitan" Shibboleth SP for Aiwip Ltd.
-	-->
-  <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="2015-09-29T11:32: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">
-    <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://lmet.aiwip.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Aiwip for London Metropolitan</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Free printing for London Metropolitan students</mdui:Description>
-        <mdui:Logo height="135" width="90">https://lmet.aiwip.com/static/images/logo2-dark.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDlDCCAnygAwIBAgIJAN9ls5zbDz+1MA0GCSqGSIb3DQEBCwUAMEsxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xEjAQBgNVBAoMCUFpd2lwIEx0ZDEXMBUG
-						A1UEAwwObG1ldC5haXdpcC5jb20wHhcNMTUwOTE0MTExMTA3WhcNMjUwOTExMTEx
-						MTA3WjBLMQswCQYDVQQGEwJHQjEPMA0GA1UECAwGTG9uZG9uMRIwEAYDVQQKDAlB
-						aXdpcCBMdGQxFzAVBgNVBAMMDmxtZXQuYWl3aXAuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAv0/WfygzXE9eiyKLZZD0SuqJS6fI5oh/kkWXdqhN
-						/tyOkGz9DsjsZRt9lrVHwU0bEGRECaFqQyXgpmEGjHrhfhfzWo8ryJBrSORX4c9A
-						Ao+Oq2imyooxxzGUPgRmiAsjOmBVOWXLhiMGSzjg0SGN4b3ybU/EKBQFVOHNIPbK
-						WxXA4ZlvoS/3vcmkWDWs4LGML2XF/AE7K8Q3sQ+KoZf/NYlFLMTT+csiIxNmALcf
-						yxoY2lPisp/v1BiMi/qUlcmmRcY0XkODFmk/pwZ7sQnBWex5Br3BdC6MZ4sdB0N7
-						vbSz1OgqOrcsHiPqKuvzP6nOBODBudVMgNQ/vxzgo3EvVwIDAQABo3sweTAJBgNV
-						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
-						Y2F0ZTAdBgNVHQ4EFgQUV9pkYjyXATU71LnpAHCworPziswwHwYDVR0jBBgwFoAU
-						V9pkYjyXATU71LnpAHCworPziswwDQYJKoZIhvcNAQELBQADggEBAI48vWrZzALl
-						BIifkeifljOBBS/BYtPQenkkLpqiNQ6mIbSJrf/vzW6vifTup+1ppJax+htrsh1d
-						iUQieasACKFX5kGOcvG5uDp7cvAn23yeTwIRu8Kf2nMOL2zjn6hV8dDDj0M/cVnK
-						bm1yYeKAMAZmPNhw2C4xRIDJDqawapwxRvQh2b+rTBTJ9JCQNbzfN8cb4NPqaFCO
-						pjUM7Hl6CnKKiMUfRbMGzvxrxN7yZo1Jvf9+PL7Cly8DYvDczN22Y4UDEEtJ5Stf
-						cEduhkrPF1g42Vc36GGScFGwHwqUHWsp3a7i5ziGsBy0nnPOVDJ0jRJA6m903JDa
-						mFPqGq9ZnxI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://lmet.aiwip.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lmet.aiwip.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lmet.aiwip.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Aiwip Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aiwip for London Metropolitan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://lmet.aiwip.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ruslan</GivenName>
-    <SurName>Khazarchiev</SurName>
-    <EmailAddress>mailto:ruslan@aiwip.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ruslan</GivenName>
-    <SurName>Khazarchiev</SurName>
-    <EmailAddress>mailto:ruslan@aiwip.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmu.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/lmu.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index dcdcc95e..00000000
--- a/swamid-interfederations-2.0/lmu.idm.oclc.org-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://lmu.idm.oclc.org/shibboleth">
-  <!--
-		This is a London Metropolitan University hosted EZproxy SP for OCLC (UK) Limited. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-27T10:30:53Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID6DCCAtCgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBbMRswGQYDVQQDFBIqLmxt
-						dS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVTMQ0wCwYDVQQKEwRPQ0xDMSAwHgYJ
-						KoZIhvcNAQkBFhFha2tpbmVudkBvY2xjLm9yZzAeFw0xNDAxMTMxMzU5MTRaFw0y
-						NDAxMTMxMzU5MTRaMFsxGzAZBgNVBAMUEioubG11LmlkbS5vY2xjLm9yZzELMAkG
-						A1UEBhMCVVMxDTALBgNVBAoTBE9DTEMxIDAeBgkqhkiG9w0BCQEWEWFra2luZW52
-						QG9jbGMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1Nlr+UKo
-						6r624NJHmnxuc0LKf7ZOu25xgUUg4QKbRBMSEyjjHgRsmo9Ec1XehNAlHHVQgSQF
-						ptJr7514KyzcaXSJ31LdQDWqEMJ6sLM3K4HXrLaaC6DTzlLMG383a2wYfBuzw2Fz
-						6mdGD68qDZTNqZ83/mpwZ8+cMrfD6fwQeHYJa42Qhn6yU5/LTtN8fZtkIHtA9/76
-						OyU0Cq3feDgCp+c8h57aIj96kNWMHqTN1iQh1iHnW6iZvfDnd5fIexeTzRkzmyQq
-						DicctXN/Rc+lD7BQGhzTgf8TZOiARBDiNnZAKpJ4RIpDy+MrWWLKN846GfV4/806
-						FJvmmKDsBAzPRQIDAQABo4G2MIGzMB0GA1UdDgQWBBR7OLBpKOBjHmpVWgr2dMFZ
-						jyvTpTCBgwYDVR0jBHwweoAUeziwaSjgYx5qVVoK9nTBWY8r06WhX6RdMFsxGzAZ
-						BgNVBAMUEioubG11LmlkbS5vY2xjLm9yZzELMAkGA1UEBhMCVVMxDTALBgNVBAoT
-						BE9DTEMxIDAeBgkqhkiG9w0BCQEWEWFra2luZW52QG9jbGMub3JnggEDMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGFjalQl+9HTwqjPLYddpV4ZuyII
-						iqk8a5Hb2yC9cOdtjvJkN/0dr3a5kz9oht05zpfWb7AnMOZH82EbEaJ9uiGlkO+J
-						3I1hY/YncJcT2+n6hlTC190Zo9IxrxDk7inS6WMwUPhIq0mZILmMbvE4NdFQUzVz
-						lhGA2mVxM0WNLhBnyz4bboD18V69TnuRBbWEWyhPCQoc/h6MlUrPapg+23uPtEZV
-						njFDG99cbz/SNQZeuHImmpuxcnghxMtSC7W2GI4QLYoafZLuwMgtxrKsQxXXL5/E
-						uyJFO0rw4hghAQcMJxL7r0N5J3Nr0Yj6uXjI8TFrsJGICo8HcLhGHaxx82U=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lmu.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.lmu.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.lmu.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.lmu.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London Metropolitan University hosted EZproxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Vasu</GivenName>
-    <SurName>Akkineni</SurName>
-    <EmailAddress>mailto:ezproxy@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Vasu</GivenName>
-    <SurName>Akkineni</SurName>
-    <EmailAddress>mailto:ezproxy@oclc.org</EmailAddress>
-  </ContactPerson>
-</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 ae35d445..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuidp.lrz.de/idp/shibboleth">
-  <md: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>
-  </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">lmu.de</shibmd: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.de: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://lmuidp.lrz.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuidp.lrz.de/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">lmu.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.de: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">e29</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e29</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">https://lmuidp.lrz.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://lmuidp.lrz.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ralf</md:GivenName>
-    <md:SurName>Ebner</md:SurName>
-    <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LMU-Helpdesk</md:GivenName>
-    <md:SurName>LMU-Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@campus.lmu.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2bf32200..00000000
--- a/swamid-interfederations-2.0/lmuidp.lrz.de.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://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>
-  </Extensions>
-  <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>
-      <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,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTsgTANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMDI2MDk0MjEwWhcNMTQxMDI1MDk0MjEwWjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1sbXVpZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuhzrmmgBYwmHk0WZ2XN29+af
-5L/vgWpOT6qFmwzMJYPVSRHHPbQTi8JfQobiPa4Je9ALGG0UqhkFvF9UoSJgUVnu
-qkCZBtC7HpFE17lVba0esD187B5tQau3XAzWzEZ4LFLi78YBCrTVDF8PdwvONhA6
-D0Rxau0heMsHhwCREnZrk0Gh96QmEZ92AKyvoy1Ybnk0iS3HmB2LgfgKIiBGUlNm
-0a/8MHk3+tZ8+IHZ7VVxQqy9D0C/Urms1zykWLVpsx4Tjl3jcsByCfDA6e3azK+H
-Y1FZLMkH2yxSz9A5TH2+VMkj0Q+v14fs370XYOhvdqkJpQFmkmi/f6cxmYmcvwID
-AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQGh/UP98In37gZLuIuyRRjzlNX
-kjAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
-YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1sbXVpZHAubHJ6LmRlghZs
-bXVpZHAubHJ6LW11ZW5jaGVuLmRlgg5sbXVpZHAyLmxyei5kZYIXbG11aWRwMi5s
-cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
-BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
-cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAILHpnrVkK+wGrpMhJqdVXJplhe5HOVUzBHP/cG8jCff
-haKVePFGYsT4ltxjjW86UYlfPMB4s5iyYwl4MMyoukIxp/lePJ1lNk56Iq8p3ktt
-chpu6wzgph3Hr/88A01cy/hEgfl9l/xT5jK8WBbJnrsKD6rBZw/9V0GnlfhKbeOr
-qWC0iTUAYXXFtCi3kVcqFKHPDexLnVsw2qS5cUFpYXZGke5wrUCkYaq/uTvK2kzu
-KQlM32M46hDxPvig8RnwMCgX6lEsvXYvdKutj0RCDoimRV2o1vB48Jqmu1CW+wJs
-OBzmQ6Dm9pv8U0O159CUXtw4TeXiKNL0+E7LXkVRkH4=
-</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>
-    <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>
-      <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,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTsgTANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMDI2MDk0MjEwWhcNMTQxMDI1MDk0MjEwWjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1sbXVpZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuhzrmmgBYwmHk0WZ2XN29+af
-5L/vgWpOT6qFmwzMJYPVSRHHPbQTi8JfQobiPa4Je9ALGG0UqhkFvF9UoSJgUVnu
-qkCZBtC7HpFE17lVba0esD187B5tQau3XAzWzEZ4LFLi78YBCrTVDF8PdwvONhA6
-D0Rxau0heMsHhwCREnZrk0Gh96QmEZ92AKyvoy1Ybnk0iS3HmB2LgfgKIiBGUlNm
-0a/8MHk3+tZ8+IHZ7VVxQqy9D0C/Urms1zykWLVpsx4Tjl3jcsByCfDA6e3azK+H
-Y1FZLMkH2yxSz9A5TH2+VMkj0Q+v14fs370XYOhvdqkJpQFmkmi/f6cxmYmcvwID
-AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQGh/UP98In37gZLuIuyRRjzlNX
-kjAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
-YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1sbXVpZHAubHJ6LmRlghZs
-bXVpZHAubHJ6LW11ZW5jaGVuLmRlgg5sbXVpZHAyLmxyei5kZYIXbG11aWRwMi5s
-cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
-BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
-cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAILHpnrVkK+wGrpMhJqdVXJplhe5HOVUzBHP/cG8jCff
-haKVePFGYsT4ltxjjW86UYlfPMB4s5iyYwl4MMyoukIxp/lePJ1lNk56Iq8p3ktt
-chpu6wzgph3Hr/88A01cy/hEgfl9l/xT5jK8WBbJnrsKD6rBZw/9V0GnlfhKbeOr
-qWC0iTUAYXXFtCi3kVcqFKHPDexLnVsw2qS5cUFpYXZGke5wrUCkYaq/uTvK2kzu
-KQlM32M46hDxPvig8RnwMCgX6lEsvXYvdKutj0RCDoimRV2o1vB48Jqmu1CW+wJs
-OBzmQ6Dm9pv8U0O159CUXtw4TeXiKNL0+E7LXkVRkH4=
-</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>
-  </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 7f0485aa..00000000
--- a/swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuza-idp.lanet.lv">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Latvian Academy of Music</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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - LMUZA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Latvian Academy of Music - LMUZA IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lv">http://www.jvlma.lv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto: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 bab41c3f..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login-idp.auth.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-idp.auth.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-idp.auth.gr/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-idp.auth.gr/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">auth.gr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-idp.auth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-idp.auth.gr: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">Aristotle University of Thessaloniki</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Aristotle University of Thessaloniki</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Αριστοτέλειο Πανεπιστήμιο Θεσσαλονίκης</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.auth.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.auth.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>AUTH IT Center AAI Administrators</md:Company>
-    <md:EmailAddress>aaiadmin@it.auth.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-2310999000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>AUTH IT Center Helpdesk</md:Company>
-    <md:EmailAddress>support@auth.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-2310999000</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 286b18e6..00000000
--- a/swamid-interfederations-2.0/login-idp.auth.gr.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://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>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIGWzCCBUOgAwIBAgIIG1Z4EQnPdKAwDQYJKoZIhvcNAQEFBQAwgasxCzAJBgNV
-                            BAYTAkdSMS0wKwYDVQQKEyRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fs
-                            b25pa2kxKTAnBgNVBAsTIENlbnRyYWwgQ29tbXVuaWNhdGlvbiBGYWNpbGl0aWVz
-                            MUIwQAYDVQQDEzlBVVRIIE5ldHdvcmsgT3BlcmF0aW9ucyBDZW50ZXIgQ2VydGlm
-                            aWNhdGlvbiBBdXRob3JpdHkgUjQwHhcNMTMwNTE0MDAwMDAwWhcNMTUwNTE0MTQ1
-                            NTM5WjB8MQswCQYDVQQGEwJHUjEtMCsGA1UEChMkQXJpc3RvdGxlIFVuaXZlcnNp
-                            dHkgb2YgVGhlc3NhbG9uaWtpMSIwIAYDVQQLExlOZXR3b3JrIE9wZXJhdGlvbnMg
-                            Q2VudGVyMRowGAYDVQQDExFsb2dpbi1pZHAuYXV0aC5ncjCCASIwDQYJKoZIhvcN
-                            AQEBBQADggEPADCCAQoCggEBAM3esjLA2btvgrriZ5knveWBBG16a7JKPMrhKW96
-                            TlV2T7TaH9GgJa5Hdx4+sqQrpWNuW69LskLRS0gceGoLFr4XiJg3WmceHDi4JsSP
-                            ptxI6bDPul9gzd8SMAQNs0EevTl2OgD+Y2NQWwOeK5mWliLkpfsHIS8acpP4FRaP
-                            B4wXdic0cNAFXFDPo0uDk+Uho/HS9lYdWlj7SS9pU2/Csl6+s4jEkZZKQrMee36C
-                            UeVcZ/qaKnpc4KwmUt81k9jTALw+ussILGOyqHptWE+73cY8ZqZNjWa1W9yixC7i
-                            B5wbaPrksRIi12kQkpHawcy87qsguonNtwpUsOSCsNJIce0CAwEAAaOCAq8wggKr
-                            MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUF
-                            BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUDDR6RWu0zGViF0VSdJnnS6sRkc8wHwYD
-                            VR0jBBgwFoAUiUIEyKao9TzeZuew+Ol7zXJEKVUwMwYIKwYBBQUHAQEEJzAlMCMG
-                            CCsGAQUFBzABhhdodHRwOi8vb2NzcC5wa2kuYXV0aC5ncjBDBgNVHR8EPDA6MDig
-                            NqA0hjJodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aE5vY0NBUjQvY3JsdjEu
-                            ZGVyLmNybDCCASAGA1UdIASCARcwggETMIIBDwYLKwYBBAG8HQIAAwUwgf8wNAYI
-                            KwYBBQUHAgEWKGh0dHA6Ly93d3cucGtpLmF1dGguZ3IvZG9jdW1lbnRzL0NQUy5w
-                            aHAwgcYGCCsGAQUFBwICMIG5MCsWJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRo
-                            ZXNzYWxvbmlraTADAgEBGoGJVGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRv
-                            IEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuIFRoaXMgQ2VydGlmaWNhdGUgbXVzdCBv
-                            bmx5IGJlIHVzZWQgZm9yIGFjYWRlbWljLCByZXNlYXJjaCBvciBlZHVjYXRpb25h
-                            bCBwdXJwb3Nlcy4wgY0GA1UdEQSBhTCBgoIRbG9naW4taWRwLmF1dGguZ3KCFWxv
-                            Z2luLWlkcC5jY2YuYXV0aC5ncoIWbG9naW4taWRwMS5jY2YuYXV0aC5ncoISbG9n
-                            aW4taWRwMS5hdXRoLmdyghZsb2dpbi1pZHAyLmNjZi5hdXRoLmdyghJsb2dpbi1p
-                            ZHAyLmF1dGguZ3IwDQYJKoZIhvcNAQEFBQADggEBAMO/uLHG7tm+LB/+7s9hZtRU
-                            d+nFqCLgaR3J9K7D82lnUwNhdEQNdKcxbkpPHIGA+bVGzDtIXkCBND/YUk+QyDzA
-                            RJzSdxmGG0ijaB9q/XAYXAqBfyGzsoY52jV87oh0O0uDw8QSEDW0cklBSXW2+PJH
-                            hM6l8fpMmxm/DomC3lLNuvNJ87NVgUjhT8zcpfM53GG9Ea5ufYVvPricGAvroOiG
-                            o8n41D4gfgu0VRSKwk7eWYWWR8dlX5XOUAfNJ5HW1tlOiGJrrpGlw9+Y6IRZIV+/
-                            sVhv+fssysDyJDxMW084OuOl0MAZZY7+gIOmlLD5I8xzBf6Y6tfKGHyQevU7VHg=
-                        </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>
-                            MIIGWzCCBUOgAwIBAgIIG1Z4EQnPdKAwDQYJKoZIhvcNAQEFBQAwgasxCzAJBgNV
-                            BAYTAkdSMS0wKwYDVQQKEyRBcmlzdG90bGUgVW5pdmVyc2l0eSBvZiBUaGVzc2Fs
-                            b25pa2kxKTAnBgNVBAsTIENlbnRyYWwgQ29tbXVuaWNhdGlvbiBGYWNpbGl0aWVz
-                            MUIwQAYDVQQDEzlBVVRIIE5ldHdvcmsgT3BlcmF0aW9ucyBDZW50ZXIgQ2VydGlm
-                            aWNhdGlvbiBBdXRob3JpdHkgUjQwHhcNMTMwNTE0MDAwMDAwWhcNMTUwNTE0MTQ1
-                            NTM5WjB8MQswCQYDVQQGEwJHUjEtMCsGA1UEChMkQXJpc3RvdGxlIFVuaXZlcnNp
-                            dHkgb2YgVGhlc3NhbG9uaWtpMSIwIAYDVQQLExlOZXR3b3JrIE9wZXJhdGlvbnMg
-                            Q2VudGVyMRowGAYDVQQDExFsb2dpbi1pZHAuYXV0aC5ncjCCASIwDQYJKoZIhvcN
-                            AQEBBQADggEPADCCAQoCggEBAM3esjLA2btvgrriZ5knveWBBG16a7JKPMrhKW96
-                            TlV2T7TaH9GgJa5Hdx4+sqQrpWNuW69LskLRS0gceGoLFr4XiJg3WmceHDi4JsSP
-                            ptxI6bDPul9gzd8SMAQNs0EevTl2OgD+Y2NQWwOeK5mWliLkpfsHIS8acpP4FRaP
-                            B4wXdic0cNAFXFDPo0uDk+Uho/HS9lYdWlj7SS9pU2/Csl6+s4jEkZZKQrMee36C
-                            UeVcZ/qaKnpc4KwmUt81k9jTALw+ussILGOyqHptWE+73cY8ZqZNjWa1W9yixC7i
-                            B5wbaPrksRIi12kQkpHawcy87qsguonNtwpUsOSCsNJIce0CAwEAAaOCAq8wggKr
-                            MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUF
-                            BwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUDDR6RWu0zGViF0VSdJnnS6sRkc8wHwYD
-                            VR0jBBgwFoAUiUIEyKao9TzeZuew+Ol7zXJEKVUwMwYIKwYBBQUHAQEEJzAlMCMG
-                            CCsGAQUFBzABhhdodHRwOi8vb2NzcC5wa2kuYXV0aC5ncjBDBgNVHR8EPDA6MDig
-                            NqA0hjJodHRwOi8vY3JsdjEucGtpLmF1dGguZ3IvQXV0aE5vY0NBUjQvY3JsdjEu
-                            ZGVyLmNybDCCASAGA1UdIASCARcwggETMIIBDwYLKwYBBAG8HQIAAwUwgf8wNAYI
-                            KwYBBQUHAgEWKGh0dHA6Ly93d3cucGtpLmF1dGguZ3IvZG9jdW1lbnRzL0NQUy5w
-                            aHAwgcYGCCsGAQUFBwICMIG5MCsWJEFyaXN0b3RsZSBVbml2ZXJzaXR5IG9mIFRo
-                            ZXNzYWxvbmlraTADAgEBGoGJVGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRv
-                            IEdyZWVrIGxhd3MgYW5kIG91ciBDUFMuIFRoaXMgQ2VydGlmaWNhdGUgbXVzdCBv
-                            bmx5IGJlIHVzZWQgZm9yIGFjYWRlbWljLCByZXNlYXJjaCBvciBlZHVjYXRpb25h
-                            bCBwdXJwb3Nlcy4wgY0GA1UdEQSBhTCBgoIRbG9naW4taWRwLmF1dGguZ3KCFWxv
-                            Z2luLWlkcC5jY2YuYXV0aC5ncoIWbG9naW4taWRwMS5jY2YuYXV0aC5ncoISbG9n
-                            aW4taWRwMS5hdXRoLmdyghZsb2dpbi1pZHAyLmNjZi5hdXRoLmdyghJsb2dpbi1p
-                            ZHAyLmF1dGguZ3IwDQYJKoZIhvcNAQEFBQADggEBAMO/uLHG7tm+LB/+7s9hZtRU
-                            d+nFqCLgaR3J9K7D82lnUwNhdEQNdKcxbkpPHIGA+bVGzDtIXkCBND/YUk+QyDzA
-                            RJzSdxmGG0ijaB9q/XAYXAqBfyGzsoY52jV87oh0O0uDw8QSEDW0cklBSXW2+PJH
-                            hM6l8fpMmxm/DomC3lLNuvNJ87NVgUjhT8zcpfM53GG9Ea5ufYVvPricGAvroOiG
-                            o8n41D4gfgu0VRSKwk7eWYWWR8dlX5XOUAfNJ5HW1tlOiGJrrpGlw9+Y6IRZIV+/
-                            sVhv+fssysDyJDxMW084OuOl0MAZZY7+gIOmlLD5I8xzBf6Y6tfKGHyQevU7VHg=
-                        </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">
-    <GivenName>Helpdesk</GivenName>
-    <SurName>Network Operations Center</SurName>
-    <EmailAddress>support@auth.gr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <SurName>Network Operations Center</SurName>
-    <EmailAddress>support@auth.gr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login-test.st-andrews.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/login-test.st-andrews.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index c29f58d8..00000000
--- a/swamid-interfederations-2.0/login-test.st-andrews.ac.uk-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://login-test.st-andrews.ac.uk/idp/shibboleth">
-  <!--
-		This is a test Shibboleth identity provider for the University of St Andrews.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-12T18:25: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">st-andrews.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFUTCCBDmgAwIBAgICEKQwDQYJKoZIhvcNAQEFBQAwgbsxCzAJBgNVBAYTAlVL
-						MQ0wCwYDVQQIEwRGaWZlMRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhV
-						bml2ZXJzaXR5IG9mIFN0IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMx
-						IzAhBgNVBAMTGk1hc3RlciBTaWduaW5nIENlcnRpZmljYXRlMSgwJgYJKoZIhvcN
-						AQkBFhloZWxwZGVza0BzdC1hbmRyZXdzLmFjLnVrMB4XDTEzMTIwNjEwNTYyMFoX
-						DTMzMTIwMTEwNTYyMFowgZAxCzAJBgNVBAYTAkdCMQ0wCwYDVQQIEwRGaWZlMRMw
-						EQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFN0IEFu
-						ZHJld3MxFDASBgNVBAsTC0lUIFNlcnZpY2VzMSQwIgYDVQQDExtsb2dpbi10ZXN0
-						LnN0LWFuZHJld3MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC7cuS9mxZ5h3o5tZduDhluyOYa143mbMTZm1xzG/VZZmo56iqLsG9Rz4KNyV5i
-						ejnvsSIaOf9L6OAJIlmp/grdKDQc3CU53jJGvRzfTUWLbgbCyEzzWPWjxF7ReFUK
-						0Iy5ptAVa7JnxuBZSji1IXVROJUv+aaViIERDhlLp9QOtSHz3iW4IjQ5XJKEpJi/
-						cWEqwWbhLWYg4mCL0U4GJ3WtKeHsNMaQNNKrNdBwoJTZCBzB6/z91q5wZX8xfnlJ
-						BdU/msyzCWEg9khGD69v5H48Dm+JN8XevquX3M4Ymao9SdVr3zHIC/itEyvhGJ0g
-						DZEWpwIr6j51JgqhbuYgNzKBAgMBAAGjggGGMIIBgjAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQU7An8KIwCJZKUpSxs2PR8zEacU88wgfAGA1UdIwSB6DCB5YAURVkprYqR6rp8
-						gi1KY6b2O6qok5OhgcGkgb4wgbsxCzAJBgNVBAYTAlVLMQ0wCwYDVQQIEwRGaWZl
-						MRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFN0
-						IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMxIzAhBgNVBAMTGk1hc3Rl
-						ciBTaWduaW5nIENlcnRpZmljYXRlMSgwJgYJKoZIhvcNAQkBFhloZWxwZGVza0Bz
-						dC1hbmRyZXdzLmFjLnVrggkAuOk/yzc55tswNQYJYIZIAYb4QgEEBCgWJmh0dHA6
-						Ly93d3cuc3QtYW5kcmV3cy5hYy51ay9jYS1jcmwucGVtMA0GCSqGSIb3DQEBBQUA
-						A4IBAQBNFniAL5xV5qrTPNItZnmGBnzKxOsrs3mz/iczwz/R1Ev0i5XJ92/99Cwo
-						vxQYooCA3YgD5dWIevK4fuVR+3Yc8/qcTldvlRxBemhLDE7j2X6ENGqHTR8iSIuG
-						rTnutC9BjIt+zF1TXZE7arOLHEEO3qpzncl7Xi7LqlKHrU3qUUBQaDbVx+zbQHoM
-						CcPryKaouAbm9rbuwZYfUXUdsBr5DNn7uBM8O+AEZtWOF05/q0nAfR0cpUbNlaaU
-						J7VjokUiLsonrTB+iDya4u4bBuVPrBamOUEW56hK5mw9KolgJZJ0ZBdWdUKKZbAp
-						HJJWwiaz/8zD1c45FhMrVqCyySQs
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-test.st-andrews.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-test.st-andrews.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://login-test.st-andrews.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-test.st-andrews.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-test.st-andrews.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-test.st-andrews.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">st-andrews.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFUTCCBDmgAwIBAgICEKQwDQYJKoZIhvcNAQEFBQAwgbsxCzAJBgNVBAYTAlVL
-						MQ0wCwYDVQQIEwRGaWZlMRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhV
-						bml2ZXJzaXR5IG9mIFN0IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMx
-						IzAhBgNVBAMTGk1hc3RlciBTaWduaW5nIENlcnRpZmljYXRlMSgwJgYJKoZIhvcN
-						AQkBFhloZWxwZGVza0BzdC1hbmRyZXdzLmFjLnVrMB4XDTEzMTIwNjEwNTYyMFoX
-						DTMzMTIwMTEwNTYyMFowgZAxCzAJBgNVBAYTAkdCMQ0wCwYDVQQIEwRGaWZlMRMw
-						EQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFN0IEFu
-						ZHJld3MxFDASBgNVBAsTC0lUIFNlcnZpY2VzMSQwIgYDVQQDExtsb2dpbi10ZXN0
-						LnN0LWFuZHJld3MuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC7cuS9mxZ5h3o5tZduDhluyOYa143mbMTZm1xzG/VZZmo56iqLsG9Rz4KNyV5i
-						ejnvsSIaOf9L6OAJIlmp/grdKDQc3CU53jJGvRzfTUWLbgbCyEzzWPWjxF7ReFUK
-						0Iy5ptAVa7JnxuBZSji1IXVROJUv+aaViIERDhlLp9QOtSHz3iW4IjQ5XJKEpJi/
-						cWEqwWbhLWYg4mCL0U4GJ3WtKeHsNMaQNNKrNdBwoJTZCBzB6/z91q5wZX8xfnlJ
-						BdU/msyzCWEg9khGD69v5H48Dm+JN8XevquX3M4Ymao9SdVr3zHIC/itEyvhGJ0g
-						DZEWpwIr6j51JgqhbuYgNzKBAgMBAAGjggGGMIIBgjAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQU7An8KIwCJZKUpSxs2PR8zEacU88wgfAGA1UdIwSB6DCB5YAURVkprYqR6rp8
-						gi1KY6b2O6qok5OhgcGkgb4wgbsxCzAJBgNVBAYTAlVLMQ0wCwYDVQQIEwRGaWZl
-						MRMwEQYDVQQHEwpTdCBBbmRyZXdzMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIFN0
-						IEFuZHJld3MxFjAUBgNVBAsTDUkuVC4gU2VydmljZXMxIzAhBgNVBAMTGk1hc3Rl
-						ciBTaWduaW5nIENlcnRpZmljYXRlMSgwJgYJKoZIhvcNAQkBFhloZWxwZGVza0Bz
-						dC1hbmRyZXdzLmFjLnVrggkAuOk/yzc55tswNQYJYIZIAYb4QgEEBCgWJmh0dHA6
-						Ly93d3cuc3QtYW5kcmV3cy5hYy51ay9jYS1jcmwucGVtMA0GCSqGSIb3DQEBBQUA
-						A4IBAQBNFniAL5xV5qrTPNItZnmGBnzKxOsrs3mz/iczwz/R1Ev0i5XJ92/99Cwo
-						vxQYooCA3YgD5dWIevK4fuVR+3Yc8/qcTldvlRxBemhLDE7j2X6ENGqHTR8iSIuG
-						rTnutC9BjIt+zF1TXZE7arOLHEEO3qpzncl7Xi7LqlKHrU3qUUBQaDbVx+zbQHoM
-						CcPryKaouAbm9rbuwZYfUXUdsBr5DNn7uBM8O+AEZtWOF05/q0nAfR0cpUbNlaaU
-						J7VjokUiLsonrTB+iDya4u4bBuVPrBamOUEW56hK5mw9KolgJZJ0ZBdWdUKKZbAp
-						HJJWwiaz/8zD1c45FhMrVqCyySQs
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-test.st-andrews.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-test.st-andrews.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 St Andrews</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of St Andrews (2.2 test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.st-andrews.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Duncan</GivenName>
-    <SurName>Brannen</SurName>
-    <EmailAddress>mailto:dbb@st-andrews.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Duncan</GivenName>
-    <SurName>Brannen</SurName>
-    <EmailAddress>mailto:dbb@st-andrews.ac.uk</EmailAddress>
-  </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 8f4ba438..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: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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>mailto: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 d92188d7..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="2014-02-22T14:05: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 e64ce6b9..00000000
--- a/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,277 +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">epsz.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">fitnes-uciliste.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">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">hvu-morh.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">kdb.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">mato.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">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">tv-akademija.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">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.airhead.io-shibboleth.xml b/swamid-interfederations-2.0/login.airhead.io-shibboleth.xml
deleted file mode 100644
index b6e9086b..00000000
--- a/swamid-interfederations-2.0/login.airhead.io-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://login.airhead.io/shibboleth">
-  <!--
-		This is a Shibboleth SP for Airhead Education Ltd.
-	-->
-  <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="2015-03-16T14:06: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://login.airhead.io/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://login.airhead.io/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Airhead</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The award-winning platform for education.</mdui:Description>
-        <mdui:Logo height="122" width="137">https://cdn.airhead.io/public/img/airhead-logo-blue.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAhCgAwIBAgIQoOJCTVTKALBDuVQdpeQa8jAJBgUrDgMCHQUAMC0xKzAp
-						BgNVBAMTIkFpcmhlYWQgUHJvZHVjdGlvbiBJbnRlcm1lZGlhdGUgQ0EwHhcNMTQw
-						NjI0MTA1MTU3WhcNMzkxMjMxMjM1OTU5WjAmMSQwIgYDVQQDExtsb2dpbi5wcm9k
-						LmFpcmhlYWRjbG91ZC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCeNj30rE16NspRChDY3tFrRHA1CCu/+XoUy/xGVy4VbYwFM6tMEYmTBGnpzHnm
-						tJ9SyS77P9mSZY0ZD0KXC1CbQSdnMdGLKefheUrcO46W3napMNsY/BsJz3IKkxiP
-						g775TYBn1v0WyPPBCudrwQhk/99jXdUr9BF4hNkk2S9CbO7TMb3mZyEGiJlGgjWM
-						Yay1MA9yre6/OZfnSH4392qgg6MWNzB3eCftVKS1mKWgoyobeG5EIbaGBsV7hM5v
-						184OZ9+K3ZqZ5p+0vQ03yDsd61nMkZQ1o25SQkq8MDX759JoFc7DZVBxsFufgf8n
-						3rJvgD81ax0nmGV9V2Pt5Z43AgMBAAGjTzBNMEsGA1UdAQREMEKAEBI0ZRxUq6yh
-						psA7AvxlvrChHDAaMRgwFgYDVQQDEw9BaXJoZWFkIFJvb3QgQ0GCEHZ2tw2/6qyV
-						TVMUElpq4EUwCQYFKw4DAh0FAAOCAQEAdQ764oFVpsnxh2w16Cf+5tWErxjsxsJi
-						/F6h3IsP7X0pzIKhTDsQuue5odFBt7PllvWNZlWA/+M9mYLlv+zg3ZRGUMbYMI5k
-						+aGwjzRimvy5vKaszST5+mRhkMy2Bh5OByAgNkEdGePwK1oHj0tdclPblfwXYEjb
-						En36X/es6SaJTxIAE8qF4I8JT3ZYCoBtDxBBi62pbiMGtY5kEorUsgSMMnCD7qsl
-						/c70n+btqrMJbjz5N4CdW1S9tDrC40eEeVU2X8+bN5nP5J67glGc+i3Ypm8ojayS
-						+8QbhGAot/z38FpozABMxuPrPgQpzd7UzSpez59dlmrOyEOJUnkY3g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://login.airhead.io/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.airhead.io/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.airhead.io/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.airhead.io/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.airhead.io/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.airhead.io/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.airhead.io/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.airhead.io/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.airhead.io/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.airhead.io/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.airhead.io/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Airhead Education Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Airhead</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.airhead-education.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Anthony</GivenName>
-    <SurName>Gibbons</SurName>
-    <EmailAddress>mailto:anthony@airhead-education.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Fraser</GivenName>
-    <SurName>Davidson</SurName>
-    <EmailAddress>mailto:fraser@airhead-education.com</EmailAddress>
-  </ContactPerson>
-</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 fabc2644..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.athena-innovation.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.athena-innovation.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.athena-innovation.gr/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.athena-innovation.gr/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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.athena-innovation.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <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:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Athena - Research and Innovation Center in Information, Communication and Knowledge Technologies</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας στις Τεχνολογίες της Πληροφορίας, των Επικοινωνιών και της Γνώσης</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Athena - Research and Innovation Center</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Αθηνά - Ερευνητικό Κέντρο Καινοτομίας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.athena-innovation.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.athena-innovation.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Research Center Athena - Institute for the Management of Information Systems</md:Company>
-    <md:EmailAddress>staff@imis.athena-innovation.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Research Center Athena - Institute for the Management of Information Systems</md:Company>
-    <md:EmailAddress>staff@imis.athena-innovation.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6650ca1d..00000000
--- a/swamid-interfederations-2.0/login.athena-innovation.gr.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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">irnet.athena-innovation.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIFMzCCBBugAwIBAgIJAO+fpaSnfQp8MA0GCSqGSIb3DQEBBQUAMIHBMQswCQYD
-                            VQQGEwJHUjEfMB0GA1UEChMWUmVzZWFyY2ggQ2VudGVyIEFUSEVOQTE8MDoGA1UE
-                            CxMzSW5zdGl0dXRlIGZvciB0aGUgTWFuYWdlbWVudCBvZiBJbmZvcm1hdGlvbiBT
-                            eXN0ZW1zMSMwIQYDVQQDExpsb2dpbi5hdGhlbmEtaW5ub3ZhdGlvbi5ncjEuMCwG
-                            CSqGSIb3DQEJARYfc3RhZmZAaW1pcy5hdGhlbmEtaW5ub3ZhdGlvbi5ncjAeFw0x
-                            MDA3MTYwOTI3MTRaFw0xMzA3MTUwOTI3MTRaMIHBMQswCQYDVQQGEwJHUjEfMB0G
-                            A1UEChMWUmVzZWFyY2ggQ2VudGVyIEFUSEVOQTE8MDoGA1UECxMzSW5zdGl0dXRl
-                            IGZvciB0aGUgTWFuYWdlbWVudCBvZiBJbmZvcm1hdGlvbiBTeXN0ZW1zMSMwIQYD
-                            VQQDExpsb2dpbi5hdGhlbmEtaW5ub3ZhdGlvbi5ncjEuMCwGCSqGSIb3DQEJARYf
-                            c3RhZmZAaW1pcy5hdGhlbmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEB
-                            BQADggEPADCCAQoCggEBALFNUKx/dLKM8PwuRA0l1kswzIE2v4HcFOVbFPEKSFEA
-                            dCT0IHit5S0I6y2SCFnOm3taZlstp5OkvCsf/l0oHQ4lSW7mrMQs4SZN4cZWYgz6
-                            U5I7Vht3r0541sZwp7POJ43aQPShsZrgexXZn+2FH6OX84NxcGScDqL5tC/xXUfw
-                            uG7p50sZPZnQDEKK+eEZHVasYaYHBCthbXj9t8t8Ok02iR/54EM8mIJXmUzJniw1
-                            St+YdEIg0fHy7c8cMBe94bN3vmMqeF++bQi79tYKt7p+keVOUVl5JdWjzoCuS4qs
-                            n5Vnepp+kslANUsi0uX4qGZp0d0Ynh0W84ll4qzhHgMCAwEAAaOCASowggEmMB0G
-                            A1UdDgQWBBSWc+gN1j3YOAuAptSS913uHOWWPTCB9gYDVR0jBIHuMIHrgBSWc+gN
-                            1j3YOAuAptSS913uHOWWPaGBx6SBxDCBwTELMAkGA1UEBhMCR1IxHzAdBgNVBAoT
-                            FlJlc2VhcmNoIENlbnRlciBBVEhFTkExPDA6BgNVBAsTM0luc3RpdHV0ZSBmb3Ig
-                            dGhlIE1hbmFnZW1lbnQgb2YgSW5mb3JtYXRpb24gU3lzdGVtczEjMCEGA1UEAxMa
-                            bG9naW4uYXRoZW5hLWlubm92YXRpb24uZ3IxLjAsBgkqhkiG9w0BCQEWH3N0YWZm
-                            QGltaXMuYXRoZW5hLWlubm92YXRpb24uZ3KCCQDvn6Wkp30KfDAMBgNVHRMEBTAD
-                            AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQANR7VK2yxrJDkDWZKY2bfJkUNhPmNCFLjR
-                            kg24Uyi4DVHu9I8bT11mK0Cbk2t4GClOAJ6jVVUBcY3jQnWSpgFj7U20ojb759Te
-                            Nz3HIThvoosZyy4oApCcN4YcM1saiOMOYYQ7Ahu98Q54Sur2o4ltwgWoTvWZoIHe
-                            Y//gCd0L1J81+W8XcMKwfvn0Jn9pXeQ3tSvnSS4C3tep0JnZTeUaxDsilpU7GKmr
-                            8d2yiuD/jwzp2LtzzsOWB0mxNDvIHKv3/KCDlt/LHgSadNcLy75dEaxOHh3kOUc3
-                            mHIwZ8ky29JeOx3BkarQuyq9Y0mzqb0GNqTKp9jBbGaZjEZk9cWj
-                        </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: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://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">irnet.athena-innovation.gr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIFMzCCBBugAwIBAgIJAO+fpaSnfQp8MA0GCSqGSIb3DQEBBQUAMIHBMQswCQYD
-                            VQQGEwJHUjEfMB0GA1UEChMWUmVzZWFyY2ggQ2VudGVyIEFUSEVOQTE8MDoGA1UE
-                            CxMzSW5zdGl0dXRlIGZvciB0aGUgTWFuYWdlbWVudCBvZiBJbmZvcm1hdGlvbiBT
-                            eXN0ZW1zMSMwIQYDVQQDExpsb2dpbi5hdGhlbmEtaW5ub3ZhdGlvbi5ncjEuMCwG
-                            CSqGSIb3DQEJARYfc3RhZmZAaW1pcy5hdGhlbmEtaW5ub3ZhdGlvbi5ncjAeFw0x
-                            MDA3MTYwOTI3MTRaFw0xMzA3MTUwOTI3MTRaMIHBMQswCQYDVQQGEwJHUjEfMB0G
-                            A1UEChMWUmVzZWFyY2ggQ2VudGVyIEFUSEVOQTE8MDoGA1UECxMzSW5zdGl0dXRl
-                            IGZvciB0aGUgTWFuYWdlbWVudCBvZiBJbmZvcm1hdGlvbiBTeXN0ZW1zMSMwIQYD
-                            VQQDExpsb2dpbi5hdGhlbmEtaW5ub3ZhdGlvbi5ncjEuMCwGCSqGSIb3DQEJARYf
-                            c3RhZmZAaW1pcy5hdGhlbmEtaW5ub3ZhdGlvbi5ncjCCASIwDQYJKoZIhvcNAQEB
-                            BQADggEPADCCAQoCggEBALFNUKx/dLKM8PwuRA0l1kswzIE2v4HcFOVbFPEKSFEA
-                            dCT0IHit5S0I6y2SCFnOm3taZlstp5OkvCsf/l0oHQ4lSW7mrMQs4SZN4cZWYgz6
-                            U5I7Vht3r0541sZwp7POJ43aQPShsZrgexXZn+2FH6OX84NxcGScDqL5tC/xXUfw
-                            uG7p50sZPZnQDEKK+eEZHVasYaYHBCthbXj9t8t8Ok02iR/54EM8mIJXmUzJniw1
-                            St+YdEIg0fHy7c8cMBe94bN3vmMqeF++bQi79tYKt7p+keVOUVl5JdWjzoCuS4qs
-                            n5Vnepp+kslANUsi0uX4qGZp0d0Ynh0W84ll4qzhHgMCAwEAAaOCASowggEmMB0G
-                            A1UdDgQWBBSWc+gN1j3YOAuAptSS913uHOWWPTCB9gYDVR0jBIHuMIHrgBSWc+gN
-                            1j3YOAuAptSS913uHOWWPaGBx6SBxDCBwTELMAkGA1UEBhMCR1IxHzAdBgNVBAoT
-                            FlJlc2VhcmNoIENlbnRlciBBVEhFTkExPDA6BgNVBAsTM0luc3RpdHV0ZSBmb3Ig
-                            dGhlIE1hbmFnZW1lbnQgb2YgSW5mb3JtYXRpb24gU3lzdGVtczEjMCEGA1UEAxMa
-                            bG9naW4uYXRoZW5hLWlubm92YXRpb24uZ3IxLjAsBgkqhkiG9w0BCQEWH3N0YWZm
-                            QGltaXMuYXRoZW5hLWlubm92YXRpb24uZ3KCCQDvn6Wkp30KfDAMBgNVHRMEBTAD
-                            AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQANR7VK2yxrJDkDWZKY2bfJkUNhPmNCFLjR
-                            kg24Uyi4DVHu9I8bT11mK0Cbk2t4GClOAJ6jVVUBcY3jQnWSpgFj7U20ojb759Te
-                            Nz3HIThvoosZyy4oApCcN4YcM1saiOMOYYQ7Ahu98Q54Sur2o4ltwgWoTvWZoIHe
-                            Y//gCd0L1J81+W8XcMKwfvn0Jn9pXeQ3tSvnSS4C3tep0JnZTeUaxDsilpU7GKmr
-                            8d2yiuD/jwzp2LtzzsOWB0mxNDvIHKv3/KCDlt/LHgSadNcLy75dEaxOHh3kOUc3
-                            mHIwZ8ky29JeOx3BkarQuyq9Y0mzqb0GNqTKp9jBbGaZjEZk9cWj
-                        </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: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">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.avans.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/login.avans.nl-nidp-saml2-metadata.xml
deleted file mode 100644
index 07842368..00000000
--- a/swamid-interfederations-2.0/login.avans.nl-nidp-saml2-metadata.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.avans.nl/nidp/saml2/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-08T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">avans.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">Avans Hogeschool</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Avans University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Avans Hogeschool</mdui:Description>
-        <mdui:Description xml:lang="en">Avans</mdui:Description>
-        <mdui:Logo height="49" width="108">https://static.surfconext.nl/logos/idp/avans.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">avans university of applied sciences avans hogeschool</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">avans hogeschool avans university of applied sciences</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/d67f6b2a3375ecdb6c53f27b210d3d0e"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Avans</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Avans Hogeschool</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://login.avans.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/login.bc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.bc.edu-idp-shibboleth.xml
deleted file mode 100644
index aecd1da9..00000000
--- a/swamid-interfederations-2.0/login.bc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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://login.bc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">bc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Boston College</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>
-MIIDGzCCAgOgAwIBAgIUNqVrGTZ1ObP8ynrLZeicH8ACC+swDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMbG9naW4uYmMuZWR1MB4XDTEyMDgyMjExNTMyMVoXDTMy
-MDgyMjExNTMyMVowFzEVMBMGA1UEAxMMbG9naW4uYmMuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAMQ7wrHNblsxSkc/+lWQA4xbX7lNpcvYJc6
-YDj75l39RNU568Qov9VEdYaCRb9j0OT8zCSv0sSe/eZRUBr35PkbJ0G5sXNbsQ+r
-g78NMxT8S9NPl3ZSDJ08KiXKApwXJd6ACj2ZNMhHXIpslsy2NA45IM/SflT8SXJd
-erQ6QofMx04tCWSp1xgnBYPpyLzlr4Uz7a0e+pHbUNI50I/eiCr0wTX4q4/dZbWh
-sBq4UBvxj4BDUmVYRZwsGTnVi9dUs1oWhkR3BFbZCKOSeKBeUGDyRAtxgFKZfBLu
-X6Yoju8BljzfPMRaYXRjnNeXTTVke74oIwEMmiqwO35GRz98FwIDAQABo18wXTA8
-BgNVHREENTAzggxsb2dpbi5iYy5lZHWGI2h0dHBzOi8vbG9naW4uYmMuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRCz5f/nmlQ2EPrLYo6xisoG2QkDTANBgkq
-hkiG9w0BAQUFAAOCAQEAjU6nj244b4x1iu3QQFlaVaa3iBwKg/vVQUe1lKHL7omv
-Fm79jVaLRJ3iRGb80N8oSVwmxeUloahCxvVYKKoRUxPXX46WgTQeGa4cmtyn0mhB
-KznMGkATfAZ9nT4v2dCi0fMj362pNM722y/7lv6K74X+BY1w0gFdFXVK2V/vQMWM
-m+E/1T7dPZ6uyTj2+FfsWM5sZ+zmhEwBngw2iNo7OXhGJs3Up2Z/Yb4zYdkQQMXP
-vsbOjVXxfv5WlNMfa2CCDgFEu8VeXUxXmj43/61cbg/OkthrwC449F4R7moFwj4h
-a8GpUOmIbYuu2Vka1/STY1+UXQT2C6bgR5DlEstXgA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.bc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.bc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.bc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUNqVrGTZ1ObP8ynrLZeicH8ACC+swDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMbG9naW4uYmMuZWR1MB4XDTEyMDgyMjExNTMyMVoXDTMy
-MDgyMjExNTMyMVowFzEVMBMGA1UEAxMMbG9naW4uYmMuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAMQ7wrHNblsxSkc/+lWQA4xbX7lNpcvYJc6
-YDj75l39RNU568Qov9VEdYaCRb9j0OT8zCSv0sSe/eZRUBr35PkbJ0G5sXNbsQ+r
-g78NMxT8S9NPl3ZSDJ08KiXKApwXJd6ACj2ZNMhHXIpslsy2NA45IM/SflT8SXJd
-erQ6QofMx04tCWSp1xgnBYPpyLzlr4Uz7a0e+pHbUNI50I/eiCr0wTX4q4/dZbWh
-sBq4UBvxj4BDUmVYRZwsGTnVi9dUs1oWhkR3BFbZCKOSeKBeUGDyRAtxgFKZfBLu
-X6Yoju8BljzfPMRaYXRjnNeXTTVke74oIwEMmiqwO35GRz98FwIDAQABo18wXTA8
-BgNVHREENTAzggxsb2dpbi5iYy5lZHWGI2h0dHBzOi8vbG9naW4uYmMuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRCz5f/nmlQ2EPrLYo6xisoG2QkDTANBgkq
-hkiG9w0BAQUFAAOCAQEAjU6nj244b4x1iu3QQFlaVaa3iBwKg/vVQUe1lKHL7omv
-Fm79jVaLRJ3iRGb80N8oSVwmxeUloahCxvVYKKoRUxPXX46WgTQeGa4cmtyn0mhB
-KznMGkATfAZ9nT4v2dCi0fMj362pNM722y/7lv6K74X+BY1w0gFdFXVK2V/vQMWM
-m+E/1T7dPZ6uyTj2+FfsWM5sZ+zmhEwBngw2iNo7OXhGJs3Up2Z/Yb4zYdkQQMXP
-vsbOjVXxfv5WlNMfa2CCDgFEu8VeXUxXmj43/61cbg/OkthrwC449F4R7moFwj4h
-a8GpUOmIbYuu2Vka1/STY1+UXQT2C6bgR5DlEstXgA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.bc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Boston College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Boston College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>BC IAM Technical Team</md:GivenName>
-    <md:EmailAddress>itsstaff.iam.technical@bc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>BC IAM Support Team</md:GivenName>
-    <md:EmailAddress>itsstaff.iam.support@bc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>BC IAM Administrative Team</md:GivenName>
-    <md:EmailAddress>itsstaff.iam.administrative@bc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9e3b3bc5..00000000
--- a/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.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" entityID="https://login.bme.hu/idp/shibboleth">
-  <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="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:other</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>bme</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>href-idps</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bme.hu</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bme.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bme.hu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bme.hu/idp/profile/SAML2/POST/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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bme.hu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.bme.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.bme.hu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor 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>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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.bme.hu: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="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Budapest University of Technology and Economics</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Budapest University of Technology and Economics</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://bme.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://bme.hu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Gyenes Tamás</md:SurName>
-    <md:EmailAddress>mailto:tom@impulzus.bme.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Gyenes Tamás</md:SurName>
-    <md:EmailAddress>mailto:tom@impulzus.bme.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Gyenes Tamás</md:SurName>
-    <md:EmailAddress>mailto:tom@impulzus.bme.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 586bc6ca..00000000
--- a/swamid-interfederations-2.0/login.bme.hu.xml
+++ /dev/null
@@ -1,52 +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"/>
-    </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.bufvc.ac.uk-saml-metadata.xml b/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.xml
deleted file mode 100644
index 56328043..00000000
--- a/swamid-interfederations-2.0/login.bufvc.ac.uk-saml-metadata.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://login.bufvc.ac.uk/saml/metadata">
-  <!--
-		This is an OpenAthens SP for the British Universities Film & Video Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-03T17:15:17Z">
-      <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:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID1zCCAr+gAwIBAgIJAM+d/l59FkocMA0GCSqGSIb3DQEBBQUAMFAxMjAwBgNV
-						BAoMKUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0gJiBWaWRlbyBDb3VuY2lsMRow
-						GAYDVQQDExFsb2dpbi5idWZ2Yy5hYy51azAeFw0xNTExMTEwOTQ5NThaFw0yNTEx
-						MDgwOTQ5NThaMFAxMjAwBgNVBAoMKUJyaXRpc2ggVW5pdmVyc2l0aWVzIEZpbG0g
-						JiBWaWRlbyBDb3VuY2lsMRowGAYDVQQDExFsb2dpbi5idWZ2Yy5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJwY8KMdcCNyfsz4ExfMpWVOyDzL
-						hMprH4+aTLxB1B7hRyo4drx7T7TzrRAAqj0a66vaGMJlBotesOntW07rHxm+8odV
-						3cLaTqO/xHqHEZCg1ykYfr2/9o0ODN1iJ8qZPo0DkHOYnj0IvxWB0SzXCU1hsIqn
-						fpogesglv5qnvlasl5hjNuAOyPVkkaz1oZ4czxernqubwZJRFIo9N8jIQ02wXy2B
-						jU38AdSPCnGEadWg8hRYYaBkRCnzpWJxPQjox4d37jMB7NfN+z/7oAP2Dl94l9Mo
-						pWYQYTRJUn9PE2jdyxCNse3dCf2Ay15LWpzbChjy8cyya9JQkaVI5hFAY40CAwEA
-						AaOBszCBsDAdBgNVHQ4EFgQUZe1GO9KeRN6sbAvL6jcwaWtnNb8wgYAGA1UdIwR5
-						MHeAFGXtRjvSnkTerGwLy+o3MGlrZzW/oVSkUjBQMTIwMAYDVQQKDClCcml0aXNo
-						IFVuaXZlcnNpdGllcyBGaWxtICYgVmlkZW8gQ291bmNpbDEaMBgGA1UEAxMRbG9n
-						aW4uYnVmdmMuYWMudWuCCQDPnf5efRZKHDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-						DQEBBQUAA4IBAQCL75HmsnvOATOdYEfLREjSEi+WseRYvMI7CKnkiTAJJsW135v6
-						943DxxYvM90Q9mkgVZP7znzatMtelYCRR52G+BQr3sm1ABdPKCmPGvQ60fS+LWIP
-						n9sdfrh2Pva30OAJrI4NXCJMYcJh2BmfJSIHkvqWGDsF9mJk6pkWOCQfXat2SfPJ
-						LfQ8qfh62IT01FoxNk85Y7Mc+5di8HOzw6G1F1eha6l6/WE55jxOYiPr/4XQrKwq
-						r+2/Ralwp6eyn60NKcP1MZlrne/KA9Sa/QKuYGZYoz36AlU5lU9tCxL99nqNe4qq
-						phTjYEg3bCrvDWUfGuj2BC1Uoo0OAO8Y7FLC
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.bufvc.ac.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.bufvc.ac.uk/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.bufvc.ac.uk/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.bufvc.ac.uk/oa/auth/rcv/saml2/art" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/shib/post" index="5" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/shib/art" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/saml2/post" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.bufvc.ac.uk/oa/auth/rcv/saml2/art" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">British Universities Film &amp; Video Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">British Universities Film &amp; Video Council</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://bufvc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lotfallah</GivenName>
-    <SurName>Bekhradi</SurName>
-    <EmailAddress>mailto:federation@bufvc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lotfallah</GivenName>
-    <SurName>Bekhradi</SurName>
-    <EmailAddress>mailto:federation@bufvc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.cedia.org.ec.xml b/swamid-interfederations-2.0/login.cedia.org.ec.xml
deleted file mode 100644
index 160af560..00000000
--- a/swamid-interfederations-2.0/login.cedia.org.ec.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://login.cedia.org.ec">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://minga.cedia.org.ec" registrationInstant="2014-11-27T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.cedia.org.ec/minga</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="es">https://www.cedia.org.ec/minga</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">redCEDIA - Ecuadorian National Research and Education Network</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">redCEDIA - Red nacional de Investigación y Educación del Ecuador</mdui:DisplayName>
-        <mdui:Description xml:lang="en">redCEDIA - Ecuadorian National Research and Education Network</mdui:Description>
-        <mdui:Description xml:lang="es">redCEDIA - Red nacional de Investigación y Educación del Ecuador</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.cedia.org.ec</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="es">https://www.cedia.org.ec</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.cedia.org.ec</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="es">https://www.cedia.org.ec</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="en">communication federated+session</mdui:Keywords>
-        <mdui:Keywords xml:lang="es">comunicación sesión+federada</mdui:Keywords>
-        <mdui:Logo height="200" width="400" xml:lang="en">https://www.cedia.org.ec/logocedia400x200.png</mdui:Logo>
-        <mdui:Logo height="103" width="376">https://www.cedia.org.ec/images/logoredcediaweb.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>MIID0TCCArmgAwIBAgIJAIAAdR6wFHTnMA0GCSqGSIb3DQEBCwUAMH8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIDAVBenVheTEPMA0GA1UEBwwGQ3VlbmNhMREwDwYDVQQKDAhyZWRDRURJQTEbMBkGA1UEAwwSbG9naW4uY2VkaWEub3JnLmVjMR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE1MTIxNDE3NDY1MVoXDTI1MTIxMzE3NDY1MVowfzELMAkGA1UEBhMCRUMxDjAMBgNVBAgMBUF6dWF5MQ8wDQYDVQQHDAZDdWVuY2ExETAPBgNVBAoMCHJlZENFRElBMRswGQYDVQQDDBJsb2dpbi5jZWRpYS5vcmcuZWMxHzAdBgkqhkiG9w0BCQEWEG5lZ0BjZWRpYS5vcmcuZWMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrPcmeyFIRHh4ty8K03U5y/BuJdhBXnrGcRbaziwcGHXIuprs0/4pqVa1325eiHfti1Bgm3Gw6w0FJTdNobyV/kLrU5+3LUmqbb8NQvo51pgGRLE9+5jUR1sRyCezDQeQdgws6CLdJok53HbHPqYS/zZXbySPkVjrIJs4vKW9XXwNj+W7N62iCCzVG/ZeiftiII25VqxtpFNK50oLUpsV1nN7g0NpRQLJcob2eYMqk304bzLnPbkZqhf1QWMc52oKmb4bdqhHSR9In9lbxW+96rxHPFUhsmyC7sbPFgzgy2UQQB1xKTAJtgK+0tsAkOLsoif2XY7oyr55G7QngBV4tAgMBAAGjUDBOMB0GA1UdDgQWBBThVhJUhlk6aFtqCJKqz3QI0DRERjAfBgNVHSMEGDAWgBThVhJUhlk6aFtqCJKqz3QI0DRERjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCI+URiLgDI+FfqyzpFmORms4fWDtkTbLLTe/qJl/vnBh6vZoPZLUr/JCCGJ9eiWDD1LljMCnc+UV3Bs08kPFFeeXzZxhDSblluznmDzPbHDKfPNoEthLzq+2jYDUP1kTHVEhNFjs/zwuFyFdJpw8bGMdWKJOtx9T+cgjdwpFSWBP6CjKzFQNbidjSy9G4g62htHyGnfElWSiYA29XHhsAra9navAk0S5/8mmMYHUl2pII3lSw+lh7Ra7Ds3/Ar/jn1oCW6opshbDu+CIgJ6q00AbIj6ZG09uSkDz6Ep5EW7b0QSnCJND7FXV3rW+9r1w4IcuUOyoMxto2XZODmiHL/</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>MIID0TCCArmgAwIBAgIJAIAAdR6wFHTnMA0GCSqGSIb3DQEBCwUAMH8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIDAVBenVheTEPMA0GA1UEBwwGQ3VlbmNhMREwDwYDVQQKDAhyZWRDRURJQTEbMBkGA1UEAwwSbG9naW4uY2VkaWEub3JnLmVjMR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE1MTIxNDE3NDY1MVoXDTI1MTIxMzE3NDY1MVowfzELMAkGA1UEBhMCRUMxDjAMBgNVBAgMBUF6dWF5MQ8wDQYDVQQHDAZDdWVuY2ExETAPBgNVBAoMCHJlZENFRElBMRswGQYDVQQDDBJsb2dpbi5jZWRpYS5vcmcuZWMxHzAdBgkqhkiG9w0BCQEWEG5lZ0BjZWRpYS5vcmcuZWMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrPcmeyFIRHh4ty8K03U5y/BuJdhBXnrGcRbaziwcGHXIuprs0/4pqVa1325eiHfti1Bgm3Gw6w0FJTdNobyV/kLrU5+3LUmqbb8NQvo51pgGRLE9+5jUR1sRyCezDQeQdgws6CLdJok53HbHPqYS/zZXbySPkVjrIJs4vKW9XXwNj+W7N62iCCzVG/ZeiftiII25VqxtpFNK50oLUpsV1nN7g0NpRQLJcob2eYMqk304bzLnPbkZqhf1QWMc52oKmb4bdqhHSR9In9lbxW+96rxHPFUhsmyC7sbPFgzgy2UQQB1xKTAJtgK+0tsAkOLsoif2XY7oyr55G7QngBV4tAgMBAAGjUDBOMB0GA1UdDgQWBBThVhJUhlk6aFtqCJKqz3QI0DRERjAfBgNVHSMEGDAWgBThVhJUhlk6aFtqCJKqz3QI0DRERjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCI+URiLgDI+FfqyzpFmORms4fWDtkTbLLTe/qJl/vnBh6vZoPZLUr/JCCGJ9eiWDD1LljMCnc+UV3Bs08kPFFeeXzZxhDSblluznmDzPbHDKfPNoEthLzq+2jYDUP1kTHVEhNFjs/zwuFyFdJpw8bGMdWKJOtx9T+cgjdwpFSWBP6CjKzFQNbidjSy9G4g62htHyGnfElWSiYA29XHhsAra9navAk0S5/8mmMYHUl2pII3lSw+lh7Ra7Ds3/Ar/jn1oCW6opshbDu+CIgJ6q00AbIj6ZG09uSkDz6Ep5EW7b0QSnCJND7FXV3rW+9r1w4IcuUOyoMxto2XZODmiHL/</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cedia.org.ec/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.cedia.org.ec/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">redCEDIA</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">redCEDIA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">redCEDIA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">redCEDIA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.cedia.org.ec</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Claudio</md:GivenName>
-    <md:SurName>Chacon</md:SurName>
-    <md:EmailAddress>neg@cedia.org.ec</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.cmu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.cmu.edu-idp-shibboleth.xml
deleted file mode 100644
index c1e2418c..00000000
--- a/swamid-interfederations-2.0/login.cmu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://login.cmu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login.cmu.edu/error" 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">andrew.cmu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Carnegie Mellon University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Carnegie Mellon University Identity Provider</mdui:Description>
-        <mdui:Logo height="125" width="181" xml:lang="en">https://identity.andrew.cmu.edu/incommon/cmu-181x125.gif</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>
-MIIDLDCCAhSgAwIBAgIJAO1Zt6Sg0xhmMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDWxvZ2luLmNtdS5lZHUwHhcNMTQwMTIyMTkzMDM2WhcNMzAwNjI5MTkzMDM2
-WjAYMRYwFAYDVQQDEw1sb2dpbi5jbXUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4yIV5lVs9/7jdmRTi23AINTzGQTrL+p8EXmV1iL48YAZ36T+
-xnDpTXt2RDaioI34/P9vHYpSKY6C5gDNyXGQZYTrgJQHQRgJAGTsXshYoDeBboZZ
-9ax+7m86rKqmHZAprHALONubY0UtPDEGQKdMeeetAUAOh8kIKpGvKp96I+4pIT6S
-/p5VtBB80veOK6woqbzU0Qr9q1FbcZfJ6AjG8as9lBa9Si6vc/fGvFrjsJL3+cpv
-ECuyG/yHp9obdwXLgxlQNPtXNeBgclgiaJJE8zWcZBUxWPboVeuC2Jfv7spIOcCy
-KPKTGUlobBoANGHqGMqbK+/7YzQ+J/s/4n0tvwIDAQABo3kwdzAdBgNVHQ4EFgQU
-oZye8kn1Hznd+tCaxJ3elowNIbYwSAYDVR0jBEEwP4AUoZye8kn1Hznd+tCaxJ3e
-lowNIbahHKQaMBgxFjAUBgNVBAMTDWxvZ2luLmNtdS5lZHWCCQDtWbekoNMYZjAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCp51hb/WPVfRtdQNZm6OQj
-8I6HwDGWmu5PzUycJAkD/VYd3wCM1zLwd32LMbxbA2ArKWBstErEsUog94zvMBWy
-AeT3Q5Gyghji0emF0nbZpNjPjE9bXavMbUppXF2/VHbuBtzEMBxIKV53X2et2MMc
-9mnNzZN1rofuIB//W9Fg9IWV5PLVbsvEYI98IkJ5t4JP92/V5p497O8jMj6oLhy7
-mI4FNx0pQnirAvrQxxgFTwVV5SEm87DBYRblUb4ba0yYVSBQg0EVbIb7QEDxHFWb
-zt4+NLolAQAMSQW+SJKf9V7+6+4uhMwpJxQwezzn41u9kGTIg9F8/s0IrgsTlAm3
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.cmu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.cmu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.cmu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.cmu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.cmu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.cmu.edu/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">andrew.cmu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAO1Zt6Sg0xhmMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDWxvZ2luLmNtdS5lZHUwHhcNMTQwMTIyMTkzMDM2WhcNMzAwNjI5MTkzMDM2
-WjAYMRYwFAYDVQQDEw1sb2dpbi5jbXUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4yIV5lVs9/7jdmRTi23AINTzGQTrL+p8EXmV1iL48YAZ36T+
-xnDpTXt2RDaioI34/P9vHYpSKY6C5gDNyXGQZYTrgJQHQRgJAGTsXshYoDeBboZZ
-9ax+7m86rKqmHZAprHALONubY0UtPDEGQKdMeeetAUAOh8kIKpGvKp96I+4pIT6S
-/p5VtBB80veOK6woqbzU0Qr9q1FbcZfJ6AjG8as9lBa9Si6vc/fGvFrjsJL3+cpv
-ECuyG/yHp9obdwXLgxlQNPtXNeBgclgiaJJE8zWcZBUxWPboVeuC2Jfv7spIOcCy
-KPKTGUlobBoANGHqGMqbK+/7YzQ+J/s/4n0tvwIDAQABo3kwdzAdBgNVHQ4EFgQU
-oZye8kn1Hznd+tCaxJ3elowNIbYwSAYDVR0jBEEwP4AUoZye8kn1Hznd+tCaxJ3e
-lowNIbahHKQaMBgxFjAUBgNVBAMTDWxvZ2luLmNtdS5lZHWCCQDtWbekoNMYZjAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCp51hb/WPVfRtdQNZm6OQj
-8I6HwDGWmu5PzUycJAkD/VYd3wCM1zLwd32LMbxbA2ArKWBstErEsUog94zvMBWy
-AeT3Q5Gyghji0emF0nbZpNjPjE9bXavMbUppXF2/VHbuBtzEMBxIKV53X2et2MMc
-9mnNzZN1rofuIB//W9Fg9IWV5PLVbsvEYI98IkJ5t4JP92/V5p497O8jMj6oLhy7
-mI4FNx0pQnirAvrQxxgFTwVV5SEm87DBYRblUb4ba0yYVSBQg0EVbIb7QEDxHFWb
-zt4+NLolAQAMSQW+SJKf9V7+6+4uhMwpJxQwezzn41u9kGTIg9F8/s0IrgsTlAm3
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.cmu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.cmu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Carnegie Mellon University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Carnegie Mellon University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cmu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth Support Team</md:GivenName>
-    <md:EmailAddress>shibboleth-team@andrew.cmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Computing Services Help Center</md:GivenName>
-    <md:EmailAddress>it-help@cmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jeffrey Eaton</md:GivenName>
-    <md:EmailAddress>jeaton@cmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Deborah Schill</md:GivenName>
-    <md:EmailAddress>dschill@cmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml b/swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml
deleted file mode 100644
index 6d2de2c8..00000000
--- a/swamid-interfederations-2.0/login.dhbw-heidenheim.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.dhbw-heidenheim.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-02-18T15:07: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>
-    <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>
-  </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">dhbw-heidenheim.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">DHBW Heidenheim</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">DHBW Heidenheim</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider für Angehörige der DHBW Heidenheim</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for members of DHBW Heidenheim</mdui:Description>
-        <mdui:Logo height="16" width="16">https://login.dhbw-heidenheim.de/idp/images/dhbw.ico</mdui:Logo>
-        <mdui:Logo height="71" width="426">https://login.dhbw-heidenheim.de/idp/images/dhbw-hdh-web.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.dhbw-heidenheim.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.dhbw-heidenheim.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.dhbw-heidenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.dhbw-heidenheim.de,OU=Heidenheim,O=Duale Hochschule Baden-Wuerttemberg,L=Heidenheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG0zCCBbugAwIBAgIHGJT3zZUAezANBgkqhkiG9w0BAQsFADByMQswCQYDVQQG
-EwJERTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJl
-cmcxFjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBk
-aGJ3LXZzLmRlMB4XDTE0MTEyNjA2NTkwOVoXDTE5MDcwOTIzNTkwMFowgaUxCzAJ
-BgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzARBgNVBAcT
-CkhlaWRlbmhlaW0xLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3Vl
-cnR0ZW1iZXJnMRMwEQYDVQQLEwpIZWlkZW5oZWltMSEwHwYDVQQDExhsb2dpbi5k
-aGJ3LWhlaWRlbmhlaW0uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQDCwc/atzYV/Sj3jA5xzl4gqrzP7SEqW/KYSCFJhO0jIHNcCpBkkKTVdH6JoXU7
-VZMMqNXHrBQ+c73OseyWoU/itJ6seRqr6hEpHUbJLcKTj7FwwJruJEqjtgyglbi9
-q2Zxwgfvek4tdHttdCV7BSh1UUf1fBzVn6htlkfIL/5pMbMSOHpi69DkhwT+Y2/f
-GlLNezXCSPKD9dP6z6FD5O5o7ncw4Xcw/s085DzXZg9fXZoQDcUVcqs67fyaAmUA
-pavEWrDdEZ7SdXMUkiiviGsMm5IufaNpjem63elbBNsQ7qUwSsOuhyKwH2Ty1A7l
-iPeMfg4ERlTNyWBJQaRWfzrXY+MmhsgCE2tW2paCRrqdV0dnHMRIDhqVQVtc7TDC
-kYdAiPAXTkOSX2dr4dk8Y/anvgIjMWhUyUvkE/0d1Ypsn6FJhVchPdrG0VKBXoFW
-zuJJ+1C6f6dP826jJ/KqFv3MyHONwb0aq0AFTROcsntgtI+MuojacDqiOjpJAWnl
-p1mWz13yLEwglZEAgoCULzxG9a3xdycxAmzrXI83V4QKpBNcBUDfe9jXaqHyWmrT
-NKD5+IpN8RpO/kbz6EPcjw2S0HPk/rSu1dKsmg8FdXiGeBDi/VHoMWjGZpn3ytV5
-YeiJkLMntXyT/8fY30h0PMjYtSB6GuQ+ty3nTT2cEBH8QQIDAQABo4ICODCCAjQw
-TwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMB
-MA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBRwrJthVohqgyXOMzVroasUyEf+gzAfBgNVHSMEGDAWgBSM6XBxYLhTn0TGl15C
-H+0ocr0OfjAjBgNVHREEHDAaghhsb2dpbi5kaGJ3LWhlaWRlbmhlaW0uZGUweQYD
-VR0fBHIwcDA2oDSgMoYwaHR0cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMDagNKAyhjBodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Ro
-YnctY2EvcHViL2NybC9jYWNybC5jcmwwgckGCCsGAQUFBwEBBIG8MIG5MDMGCCsG
-AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvZGhidy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
-BQADggEBAD3qyWejeqn9IpuYXSNxYdXL61QXB8nBv+fTqODGO3bljpTY9UvAOps7
-PenBPiNabqfXAeVbVwigdiIIjMNVf5l+L1UNU1fC6Uv3iACE6+ID3uO5LEnjy86q
-SiEqHjovbKrwbc3JuvepdoxFyi/pU7k4M5CGHl1kvfRW2E1wR528sEML4nENroB4
-u2/8NrN63/uyzQZqXezMuxZGtISRhjGwT+qAQpzdnkYCUNM3JefJ0CciUbli22k2
-Cd57KQ9gjr2ZVwRl4I2+uN+fViiVtpm2jIMRQhJBnBjY3yNH9LgScagqJ0jorzJB
-hRxCQz6wGPVqxk8HY4ChZNjrhu4EKpQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.dhbw-heidenheim.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dhbw-heidenheim.de/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de/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">dhbw-heidenheim.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.dhbw-heidenheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.dhbw-heidenheim.de,OU=Heidenheim,O=Duale Hochschule Baden-Wuerttemberg,L=Heidenheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG0zCCBbugAwIBAgIHGJT3zZUAezANBgkqhkiG9w0BAQsFADByMQswCQYDVQQG
-EwJERTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJl
-cmcxFjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBk
-aGJ3LXZzLmRlMB4XDTE0MTEyNjA2NTkwOVoXDTE5MDcwOTIzNTkwMFowgaUxCzAJ
-BgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzARBgNVBAcT
-CkhlaWRlbmhlaW0xLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3Vl
-cnR0ZW1iZXJnMRMwEQYDVQQLEwpIZWlkZW5oZWltMSEwHwYDVQQDExhsb2dpbi5k
-aGJ3LWhlaWRlbmhlaW0uZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQDCwc/atzYV/Sj3jA5xzl4gqrzP7SEqW/KYSCFJhO0jIHNcCpBkkKTVdH6JoXU7
-VZMMqNXHrBQ+c73OseyWoU/itJ6seRqr6hEpHUbJLcKTj7FwwJruJEqjtgyglbi9
-q2Zxwgfvek4tdHttdCV7BSh1UUf1fBzVn6htlkfIL/5pMbMSOHpi69DkhwT+Y2/f
-GlLNezXCSPKD9dP6z6FD5O5o7ncw4Xcw/s085DzXZg9fXZoQDcUVcqs67fyaAmUA
-pavEWrDdEZ7SdXMUkiiviGsMm5IufaNpjem63elbBNsQ7qUwSsOuhyKwH2Ty1A7l
-iPeMfg4ERlTNyWBJQaRWfzrXY+MmhsgCE2tW2paCRrqdV0dnHMRIDhqVQVtc7TDC
-kYdAiPAXTkOSX2dr4dk8Y/anvgIjMWhUyUvkE/0d1Ypsn6FJhVchPdrG0VKBXoFW
-zuJJ+1C6f6dP826jJ/KqFv3MyHONwb0aq0AFTROcsntgtI+MuojacDqiOjpJAWnl
-p1mWz13yLEwglZEAgoCULzxG9a3xdycxAmzrXI83V4QKpBNcBUDfe9jXaqHyWmrT
-NKD5+IpN8RpO/kbz6EPcjw2S0HPk/rSu1dKsmg8FdXiGeBDi/VHoMWjGZpn3ytV5
-YeiJkLMntXyT/8fY30h0PMjYtSB6GuQ+ty3nTT2cEBH8QQIDAQABo4ICODCCAjQw
-TwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMB
-MA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBRwrJthVohqgyXOMzVroasUyEf+gzAfBgNVHSMEGDAWgBSM6XBxYLhTn0TGl15C
-H+0ocr0OfjAjBgNVHREEHDAaghhsb2dpbi5kaGJ3LWhlaWRlbmhlaW0uZGUweQYD
-VR0fBHIwcDA2oDSgMoYwaHR0cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jcmwvY2FjcmwuY3JsMDagNKAyhjBodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2Ro
-YnctY2EvcHViL2NybC9jYWNybC5jcmwwgckGCCsGAQUFBwEBBIG8MIG5MDMGCCsG
-AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhidy1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvZGhidy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEL
-BQADggEBAD3qyWejeqn9IpuYXSNxYdXL61QXB8nBv+fTqODGO3bljpTY9UvAOps7
-PenBPiNabqfXAeVbVwigdiIIjMNVf5l+L1UNU1fC6Uv3iACE6+ID3uO5LEnjy86q
-SiEqHjovbKrwbc3JuvepdoxFyi/pU7k4M5CGHl1kvfRW2E1wR528sEML4nENroB4
-u2/8NrN63/uyzQZqXezMuxZGtISRhjGwT+qAQpzdnkYCUNM3JefJ0CciUbli22k2
-Cd57KQ9gjr2ZVwRl4I2+uN+fViiVtpm2jIMRQhJBnBjY3yNH9LgScagqJ0jorzJB
-hRxCQz6wGPVqxk8HY4ChZNjrhu4EKpQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.dhbw-heidenheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.dhbw-heidenheim.de: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">e340</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e340</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Duale Hochschule Baden-Württemberg Heidenheim</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Duale Hochschule Baden-Württemberg Heidenheim</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.dhbw-heidenheim.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.dhbw-heidenheim.de/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>DFN-AAI</md:GivenName>
-    <md:SurName>Hotline</md:SurName>
-    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>DFN-AAI</md:GivenName>
-    <md:SurName>Hotline</md:SurName>
-    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 7f6cbe48..00000000
--- a/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.du.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.du.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.du.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.du.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">du.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.du.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.du.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">DU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Dalarna University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.du.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Dalarna University</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778891</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Dalarna University</md:Company>
-    <md:SurName>IT-avdelningen</md:SurName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778891</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Dalarna University</md:Company>
-    <md:SurName>Högskolan Dalarna Support</md:SurName>
-    <md:EmailAddress>mailto:support@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778888</md:TelephoneNumber>
-  </md: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 3591e642..00000000
--- a/swamid-interfederations-2.0/login.du.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://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="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:Logo height="16" width="16">https://login.du.se/duse-logo-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>130.243.32.0/19</mdui:IPHint>
-        <mdui:DomainHint>du.se</mdui:DomainHint>
-        <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="technical">
-    <Company>Högskolan Dalarna</Company>
-    <EmailAddress>dempa@du.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml
deleted file mode 100644
index 21b7ee5b..00000000
--- a/swamid-interfederations-2.0/login.ecn.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://login.ecn.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-16T09:12:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Energieonderzoek Centrum Nederland</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Energieonderzoek Centrum Nederland</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Energieonderzoek Centrum Nederland</mdui:Description>
-        <mdui:Description xml:lang="en">Energieonderzoek Centrum Nederland</mdui:Description>
-        <mdui:Logo height="35" width="108">https://static.surfconext.nl/logos/idp/ecn.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Energieonderzoek Centrum Nederland ecn</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Energieonderzoek Centrum Nederland ecn</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/0b2fb22438aaa6a5e8b131f04a9f4607"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Energieonderzoek Centrum Nederland</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Energieonderzoek Centrum Nederland</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ecn.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/login.emerson.edu-idp.xml b/swamid-interfederations-2.0/login.emerson.edu-idp.xml
deleted file mode 100644
index 57d03338..00000000
--- a/swamid-interfederations-2.0/login.emerson.edu-idp.xml
+++ /dev/null
@@ -1,65 +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://login.emerson.edu/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">emerson.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Emerson College</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>
-MIIEMTCCAxmgAwIBAgIJAKN0/KN2I4U9MA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVzZXR0czEPMA0GA1UEBwwGQm9zdG9u
-MRgwFgYDVQQKDA9FbWVyc29uIENvbGxlZ2UxHzAdBgNVBAsMFkluZm9ybWF0aW9u
-IFRlY2hub2xvZ3kxGjAYBgNVBAMMEWxvZ2luLmVtZXJzb24uZWR1MR8wHQYJKoZI
-hvcNAQkBFhByb290QGVtZXJzb24uZWR1MB4XDTE0MDQwMjE5NDgwOVoXDTI0MDQw
-MTE5NDgwOVowga4xCzAJBgNVBAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRz
-MQ8wDQYDVQQHDAZCb3N0b24xGDAWBgNVBAoMD0VtZXJzb24gQ29sbGVnZTEfMB0G
-A1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEaMBgGA1UEAwwRbG9naW4uZW1l
-cnNvbi5lZHUxHzAdBgkqhkiG9w0BCQEWEHJvb3RAZW1lcnNvbi5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3qJbjTbnDdz4MlwuTXhmzog3R5p47
-5BL7eUX9Q6pj/tM807iaKpXlSgakVnDa38o1+Du/1DGEfZ9MhTE9E4yeztuNbFJV
-O9ScKdk6a6hZDIW1YUnWIZrW9v52usKS5Cqs8bmHUCCcFx8jZWnmaS6c6rWkGxSN
-9Kq6AmzClGXID2jubZcEmGPcFjR4Tg4W6Dche3CTZfLHDYRDXxUZ3qpcNVVhcFSx
-vCkDNr0U9ZGsw1V/kHd9dnGvonhezaJDTiDhUI1xyw/qnQdWsqnrFfMDMmdaRq/O
-nHXJ7X+H6eZ0wvluz4IBt4r07LcXBn7yvZTRlVBdDThol++6XFjWJVuxAgMBAAGj
-UDBOMB0GA1UdDgQWBBT6TymEH+rN7J/JGdpM7JeW+38OhDAfBgNVHSMEGDAWgBT6
-TymEH+rN7J/JGdpM7JeW+38OhDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4IBAQCMgG0EPvRcyDfcGnUYJmIgiYV8WVg3gILPUQ5T6tPcHJxgvfIcqFigAgWI
-6A/5rD3m5bVGcj+GfOZ4icDvj5Lftd6uAsu+JTXxGfxMJwoqIozx2hLL73usS21V
-rZRxatE0IT3F2oWz0eytE82OMCfvwBCBk71IkWN0orTTyrbYGZhvxJWVRtxUvfZ+
-LEa73Iu/Zg51/frqYYHoBjsX5rVT3H3rBhJqrlHjLS9Fw2Pay/TxAwp5FPC6zmCK
-XYfrkS9wsWKpmuK5J1Xlup8MqqwguX3zRaIFfYUW1c8bLkP7HCA1YTb7pImqBE8Y
-fRerJbNBdbk8AnS/5GdSLL1oSuHK
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.emerson.edu/saml2/idp/SingleLogoutService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.emerson.edu/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Emerson College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Emerson College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.emerson.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Francis Frain</md:GivenName>
-    <md:EmailAddress>Francis_Frain@emerson.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bryce Riner</md:GivenName>
-    <md:EmailAddress>bryce_riner@emerson.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.emory.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.emory.edu-idp-shibboleth.xml
deleted file mode 100644
index 3ae09ec4..00000000
--- a/swamid-interfederations-2.0/login.emory.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://login.emory.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login.emory.edu/" 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">emory.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Emory University</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>
-MIIDJzCCAg+gAwIBAgIUfGsUnIe4ehQbVOK7801PiWLKSX8wDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPbG9naW4uZW1vcnkuZWR1MB4XDTEwMDMyOTE2MjAwNVoX
-DTMwMDMyOTE2MjAwNVowGjEYMBYGA1UEAxMPbG9naW4uZW1vcnkuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0RQxoj9S3eD6vcGOB39jZiPBRx1f
-TJf6MV96bHNwD/M+fBCR7t+07VScdH0pffvN0x7g5co0jWJ4KT/16tPpA/14qzpK
-d3oHIFz5rgnG1qBSla+kqe9lzls72HMDA5vdaRpPib1ZsaB7JUyTTHMdvVcyaovL
-ILB/xt2cdy8CCJjIdNt+Uxl5gAwhKfU6DVYspFAWp4uVMJqO774Xn5Sa68ANjrRL
-TbMO7BnqgxCyAAN8ztGlsn+91Z5JnlMPI/q9uLh6xiUffiwo17S9KOQ+hqQx6XDQ
-GI/U7TOanuohkC29qt09tLYFXjAB3sfy66qsQfS/rXulScfJsSYNaziMaQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9sb2dpbi5lbW9yeS5lZHWGJmh0dHBzOi8vbG9naW4u
-ZW1vcnkuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSC4HCY5liG+oEdDcyx
-nHhEZt8cKjANBgkqhkiG9w0BAQUFAAOCAQEAFdOSL9HrkUxokD0zm07egEpnltaH
-susrsZvVhayfNqiRlgvhHBpJTa9xUaAyZ45VUsieP4olSdfyiMVMIRkVgo/gF4W/
-/ZlGxV28CnlalLR10NMzG6Kz03eRf6v5MQtVL+0EBTO7wiZAFIKYOv8nxpZoL7LV
-9l9x5SIDjsgmwV7wPubl0X3aoGq6+IHIk1TZAA/xWJm1Z1W9fFRWXSLVS1/eCjPY
-4rjIktauEsi8Tj6QlhYFuo5WiEaVtNluIP3MzpBSxCUyEov49a4rxpHNKPxpSZyF
-GTDS8Zsm6tV8cZfn0eCypcm3lqm/X3HSODuN6n5+cVrRig01srF/2D9B1A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.emory.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.emory.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.emory.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.emory.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.emory.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.emory.edu/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">emory.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUfGsUnIe4ehQbVOK7801PiWLKSX8wDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPbG9naW4uZW1vcnkuZWR1MB4XDTEwMDMyOTE2MjAwNVoX
-DTMwMDMyOTE2MjAwNVowGjEYMBYGA1UEAxMPbG9naW4uZW1vcnkuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0RQxoj9S3eD6vcGOB39jZiPBRx1f
-TJf6MV96bHNwD/M+fBCR7t+07VScdH0pffvN0x7g5co0jWJ4KT/16tPpA/14qzpK
-d3oHIFz5rgnG1qBSla+kqe9lzls72HMDA5vdaRpPib1ZsaB7JUyTTHMdvVcyaovL
-ILB/xt2cdy8CCJjIdNt+Uxl5gAwhKfU6DVYspFAWp4uVMJqO774Xn5Sa68ANjrRL
-TbMO7BnqgxCyAAN8ztGlsn+91Z5JnlMPI/q9uLh6xiUffiwo17S9KOQ+hqQx6XDQ
-GI/U7TOanuohkC29qt09tLYFXjAB3sfy66qsQfS/rXulScfJsSYNaziMaQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9sb2dpbi5lbW9yeS5lZHWGJmh0dHBzOi8vbG9naW4u
-ZW1vcnkuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSC4HCY5liG+oEdDcyx
-nHhEZt8cKjANBgkqhkiG9w0BAQUFAAOCAQEAFdOSL9HrkUxokD0zm07egEpnltaH
-susrsZvVhayfNqiRlgvhHBpJTa9xUaAyZ45VUsieP4olSdfyiMVMIRkVgo/gF4W/
-/ZlGxV28CnlalLR10NMzG6Kz03eRf6v5MQtVL+0EBTO7wiZAFIKYOv8nxpZoL7LV
-9l9x5SIDjsgmwV7wPubl0X3aoGq6+IHIk1TZAA/xWJm1Z1W9fFRWXSLVS1/eCjPY
-4rjIktauEsi8Tj6QlhYFuo5WiEaVtNluIP3MzpBSxCUyEov49a4rxpHNKPxpSZyF
-GTDS8Zsm6tV8cZfn0eCypcm3lqm/X3HSODuN6n5+cVrRig01srF/2D9B1A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.emory.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.emory.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Emory University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Emory University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.emory.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>John Ellis</md:GivenName>
-    <md:EmailAddress>john.ellis@emory.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Anne Marie Alexander</md:GivenName>
-    <md:EmailAddress>anne.marie.alexander@emory.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Peter Day</md:GivenName>
-    <md:EmailAddress>peter.day@emory.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ewu.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/login.ewu.edu-adfs-services-trust.xml
deleted file mode 100644
index 1ffa6687..00000000
--- a/swamid-interfederations-2.0/login.ewu.edu-adfs-services-trust.xml
+++ /dev/null
@@ -1,62 +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://login.ewu.edu/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">ewu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Eastern Washington University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://access.ewu.edu/OIT/Services/Accounts-Passwords.xml</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.ewu.edu/Privacy-Policy.xml</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="180" xml:lang="en">https://login.ewu.edu/adfs/ls/images/ewulogo.jpg</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>
-MIIC1jCCAb6gAwIBAgIQd9rja1Yw76hDOrEcTgUaqjANBgkqhkiG9w0BAQsFADAn
-MSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBsb2dpbi5ld3UuZWR1MB4XDTE1MDky
-NjA0Mjk1NFoXDTE4MDkyNTA0Mjk1NFowJzElMCMGA1UEAxMcQURGUyBTaWduaW5n
-IC0gbG9naW4uZXd1LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJlwoqZvoaDYYE126gexaaXDYzuCDgmEq2B7UcPkdqFj1+oyCi1cGEw0h5yGBMAH
-JrtVbEKeM0RdiqMN/AWllVv2T9BsgUpiUmtkUGmSXr2wwHHC8UgmOrImd8o9DVm8
-6dvIyHnP4o48XdrAO5BOKdJyQgImDrhoidnMUxc42M+FbqT9nE1NvkDsnU6YeikD
-f65YVGJJhNgfYFlQ4unuCVMULQZ98yULxg3oNcg4aCey7/8p2ERB2Xe3LjPY8d2F
-JN0k75y95uy8jdFKpXEQTHAoHiT9l7ehJ4KYofx+glZNAEwTSSamxJPUz0FTwbPo
-TrxiZVv2qrhJ2Cy3TdbZlokCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAeQ73+koV
-aq6FAWu+khGXjPSwRz7uNrEtfpQGNOY4t6D+paPBzi+IVGEN4oFR+3Xe3C4NIvyF
-wxk8ZhmHS9fxj1zoCNwfFwOU8rMimSxXswymyL04p7pvlXBeN/YFvj1RZTf6z0dW
-hMG8no7o/nkEiE3u2FeY9naUSUGFrnPXy8aI4BlPZqwj2lt6GRK2aEQX5QXDetyr
-sD++gFMNaUppLhyZE5sFBNYW0OuQLXTRsbY7b6o+7hhlNf+fJay3rEEiWCt80xKP
-XttampjZghUiB3nh4nQRLIIL8C/zUoCRJGKZGa7Um7hRBUH+NbeNMuRur7nLHqMC
-W9q2bbNngsgQ2w==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ewu.edu/adfs/services/trust/artifactresolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ewu.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ewu.edu/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Eastern Washington University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Eastern Washington University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ewu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Gasper</md:GivenName>
-    <md:EmailAddress>jgasper@ewu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>John Gasper</md:GivenName>
-    <md:EmailAddress>jgasper@ewu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 1b6fc022..00000000
--- a/swamid-interfederations-2.0/login.ezproxy.library.qmul.ac.uk-shibboleth-sp.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://login.ezproxy.library.qmul.ac.uk/shibboleth-sp">
-  <!--
-		This is an EZproxy SP for Queen Mary and Westfield College, University of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-02T16:50: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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFHzCCBAegAwIBAgIRANyZcMkOxifiYwLZXeooCQUwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xNDAyMTkwMDAwMDBaFw0xNzAyMjgyMzU5NTlaMIHiMQswCQYD
-						VQQGEwJHQjEPMA0GA1UEERMGRTEgNE5TMRcwFQYDVQQIEw5DZW50cmFsIExvbmRv
-						bjEPMA0GA1UEBxMGTE9ORE9OMRowGAYDVQQJExEzMjcgTWlsZSBFbmQgUm9hZDE/
-						MD0GA1UEChM2UXVlZW4gTWFyeSBhbmQgV2VzdGZpZWxkIENvbGxlZ2UsIFVuaXZl
-						cnNpdHkgb2YgTG9uZG9uMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczElMCMGA1UEAxQc
-						Ki5lenByb3h5LmxpYnJhcnkucW11bC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBALSqVecWKa3l+sxPyi/CtJeCEGF9I4KPcF8uF7ICXpeWqg+q
-						2FVP4drw1LLiChY2MWRxYOknYABhhMcF+FKPNu+NWDl3M5ic542GXcj2dSgMuc/M
-						GQ+iK860WmthtPkCZ4PTuFRD1BTuLpJBU/vAhCIrh5fr5+CjJDlH4vNERFy34WXO
-						+KZH1inY7sV5Pk/2ZO8HgMwVsf4YeSywGRH/LxViQ7UjhP1pq1oaL7CiwPGaJxTl
-						KYhvW1IM7ePCCcTiGWodhN7c6HAA9hpQYgExDcyUMgzxSM4tPsKbVp81Y51fekNT
-						kN5sY7rSxFaD/6WzWVa6wlbjfSAiNR9MsQJPfq8CAwEAAaOCAXkwggF1MB8GA1Ud
-						IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRy0dy6tqogk0Db
-						1AZcyxh7b+l5+DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
-						FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQIC
-						HTAIBgZngQwBAgIwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
-						ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
-						BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
-						BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJwYDVR0RBCAw
-						HoIcKi5lenByb3h5LmxpYnJhcnkucW11bC5hYy51azANBgkqhkiG9w0BAQUFAAOC
-						AQEAav8++MEPaToHmyfXb1sn+ofaMyjtJjsvao8SSpPNYGzaQZl/OiDshe5h3fJs
-						BadfZZrPkDvrmiMSAr2bUzEJ4jrL59sP7I0mCNFL+TzqJ4HulWFL01sshFheYg71
-						eBpXNBuP2/erRfdu1NHlYdURdYgWG9othpL+YmkEZy3S7t+ubmPoVMQuVc4YXGhC
-						E6qofr4r607yV971dq5p3CSGzk8Pa/dKDBM24e/q9F1XIEXoGi2tSKZqINYhll14
-						UZ2o8/8T3a5/nnOtrKtdKbqRTQovbmwX5GkAKwkej4VRwObcYRvAHsznE0yuILAT
-						Cn1oyuVnnArb5xKg2XoAllszmA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ezproxy.library.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.ezproxy.library.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary, University of London: EZProxy Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library Systems Team</GivenName>
-    <EmailAddress>mailto:lib-systems-team@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Evans</SurName>
-    <EmailAddress>mailto:m.d.t.evans@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jeremy</GivenName>
-    <SurName>Acland</SurName>
-    <EmailAddress>mailto:j.acland@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fandm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.fandm.edu-idp-shibboleth.xml
deleted file mode 100644
index 11fd6898..00000000
--- a/swamid-interfederations-2.0/login.fandm.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,160 +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://login.fandm.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">fandm.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Franklin &amp; Marshall College</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.fandm.edu/its/policies</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.fandm.edu/its/policies</mdui:PrivacyStatementURL>
-        <mdui:Logo height="77" width="265" xml:lang="en">https://secure.fandm.edu/images/fandmft.gif</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>
-MIIDWDCCAkACCQCgR54qxO43SDANBgkqhkiG9w0BAQUFADBuMRgwFgYDVQQDDA9s
-b2dpbi5mYW5kbS5lZHUxJDAiBgNVBAoMG0ZyYW5rbGluICYgTWFyc2hhbGwgQ29s
-bGVnZTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlBBMRIwEAYDVQQHDAlMYW5jYXN0
-ZXIwHhcNMTIwMjAzMjAzMDExWhcNMTMwMjAyMjAzMDExWjBuMRgwFgYDVQQDDA9s
-b2dpbi5mYW5kbS5lZHUxJDAiBgNVBAoMG0ZyYW5rbGluICYgTWFyc2hhbGwgQ29s
-bGVnZTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlBBMRIwEAYDVQQHDAlMYW5jYXN0
-ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIVrJ8OaD1iYdxU9a
-MfRmN6bKvRiv+oV4yHr9CXBb8sZL7uIWasZj45jmPPq3zhCLtEifDyl9oq8KzMtW
-HNGFqTPM6e5YrxmJClU4JofxE1MkIPpEpYM3CeIK39+BvkPlsqr8OWD+sCmZJcF+
-fm3seCY99LMCTZeQnFZ3WiJwdr2WBtHHiIEB9NXv/++eYX9JwWmD9mSftuLJGx4o
-2hIkC67Nr2RyFTofof9qTSLfcUefsvk2ftVrIWRLxp9FOjGqjhts5ETFjWIOxcMg
-SazmG5MqAgYrVMvLUYttK8rzN6nzjS4siYyXapnSbS+w9p6APCiNbISJggPRkLfY
-zXrPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAMxccWoHFHDZYhlS04qc2AeT8kK7
-rQnsQ0jMt8kplrdxf3kG+xdyJisZJ6AcpQ+ALZAOIIOYIfuqtmlO29Ygz68/MZQp
-1WPkDGlEmkbZky440kSB9Sk/yGx3hV8kMPICOij3NwD50AeJeEte8gBajMi4FQri
-PKzE57kTpjjW07EiRyJoX5ZJgEAahuqnHr6oiPte03+wTNsggU/GPXtdHoLbuMb9
-Zu6vJeprCmXU9SY6J15CXDaG0QVXnwBgmYJSE6DJyjDRm/DQx8f2d2zA0AUueVRL
-Tst5Vgudzgfdi5v2XmFJxVABbku9IJRRBBIDfChUtC2b8LJl7PA34qknhMg=
-          </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>
-MIIDvDCCAqQCCQDnGiNHgho1rjANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAlBBMRIwEAYDVQQHDAlMYW5jYXN0ZXIxJDAiBgNVBAoMG0Zy
-YW5rbGluICYgTWFyc2hhbGwgQ29sbGVnZTEMMAoGA1UECwwDSVRTMRgwFgYDVQQD
-DA9sb2dpbi5mYW5kbS5lZHUxITAfBgkqhkiG9w0BCQEWEnNzbGFkbWluQGZhbmRt
-LmVkdTAeFw0xMzAxMTQxNDAwMjJaFw0yMzAxMTIxNDAwMjJaMIGfMQswCQYDVQQG
-EwJVUzELMAkGA1UECAwCUEExEjAQBgNVBAcMCUxhbmNhc3RlcjEkMCIGA1UECgwb
-RnJhbmtsaW4gJiBNYXJzaGFsbCBDb2xsZWdlMQwwCgYDVQQLDANJVFMxGDAWBgNV
-BAMMD2xvZ2luLmZhbmRtLmVkdTEhMB8GCSqGSIb3DQEJARYSc3NsYWRtaW5AZmFu
-ZG0uZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwb099yvp3PyV
-X/eK1+Ga7FQijJIEXmCjWKGELCK218mRFaxfLC95UQGxF8WFrTJsLXEOV84vXufy
-1ZGzBRHx9+WSsiOcA6mCUgUkLLNMBQzj6XlTNxtZAypDPqBTwRqwQeSBMHzp+1L9
-9OnZ2cLYsi6YwrEEb8S7WLkSAQDsWpFEU9WbUHHkWarvHGs40Dz1a78cEId/4KZR
-YUV84cbOlfaz3/cob+BuN9c6HM64gmA36cDHbBWaMDussVvaHxa2JnzuCt0r7KQK
-aKfTxLTXX6gA0GvNgXuXLx/X2E/QM0QDOgzkY2a9d4ar1tXbl/HoMCN79uyAcAb8
-mb3nY/ot7wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBdjOu5c+kqe612POaok3a4
-hauXGAsvfu3uKb/KvyjupltdfjScaE570/6qEMR/xIJuSK4E0CLizSBFor9z0rwx
-qqmvk+iLSHTrgLSqFdxdY70Kpo2RytrBhJDKDMitnAZA9lzwmhTgqoMYhRVvJ7Iu
-OkLkJ88iMFpMBUxj4EuKNLP5XPj20ofG0H2yIiVUvOpAjU4lAqekKY16vnl7hJe4
-iwfMfHgdJvFXhnlv6keguRFmm3Kmdo9zVoHYI4QeMk7hhk2OYyoZMR1IFcMN16P9
-6y60fPr2Yyp6e9uyGPEZv4Qfum6VSa56tN9MXL3PQO0CHADwmM/PrucSPtYd6LR6
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fandm.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fandm.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fandm.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fandm.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fandm.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fandm.edu/idp/profile/SAML2/POST-SimpleSign/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">fandm.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDWDCCAkACCQCgR54qxO43SDANBgkqhkiG9w0BAQUFADBuMRgwFgYDVQQDDA9s
-b2dpbi5mYW5kbS5lZHUxJDAiBgNVBAoMG0ZyYW5rbGluICYgTWFyc2hhbGwgQ29s
-bGVnZTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlBBMRIwEAYDVQQHDAlMYW5jYXN0
-ZXIwHhcNMTIwMjAzMjAzMDExWhcNMTMwMjAyMjAzMDExWjBuMRgwFgYDVQQDDA9s
-b2dpbi5mYW5kbS5lZHUxJDAiBgNVBAoMG0ZyYW5rbGluICYgTWFyc2hhbGwgQ29s
-bGVnZTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlBBMRIwEAYDVQQHDAlMYW5jYXN0
-ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeIVrJ8OaD1iYdxU9a
-MfRmN6bKvRiv+oV4yHr9CXBb8sZL7uIWasZj45jmPPq3zhCLtEifDyl9oq8KzMtW
-HNGFqTPM6e5YrxmJClU4JofxE1MkIPpEpYM3CeIK39+BvkPlsqr8OWD+sCmZJcF+
-fm3seCY99LMCTZeQnFZ3WiJwdr2WBtHHiIEB9NXv/++eYX9JwWmD9mSftuLJGx4o
-2hIkC67Nr2RyFTofof9qTSLfcUefsvk2ftVrIWRLxp9FOjGqjhts5ETFjWIOxcMg
-SazmG5MqAgYrVMvLUYttK8rzN6nzjS4siYyXapnSbS+w9p6APCiNbISJggPRkLfY
-zXrPAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAMxccWoHFHDZYhlS04qc2AeT8kK7
-rQnsQ0jMt8kplrdxf3kG+xdyJisZJ6AcpQ+ALZAOIIOYIfuqtmlO29Ygz68/MZQp
-1WPkDGlEmkbZky440kSB9Sk/yGx3hV8kMPICOij3NwD50AeJeEte8gBajMi4FQri
-PKzE57kTpjjW07EiRyJoX5ZJgEAahuqnHr6oiPte03+wTNsggU/GPXtdHoLbuMb9
-Zu6vJeprCmXU9SY6J15CXDaG0QVXnwBgmYJSE6DJyjDRm/DQx8f2d2zA0AUueVRL
-Tst5Vgudzgfdi5v2XmFJxVABbku9IJRRBBIDfChUtC2b8LJl7PA34qknhMg=
-          </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>
-MIIDvDCCAqQCCQDnGiNHgho1rjANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAlBBMRIwEAYDVQQHDAlMYW5jYXN0ZXIxJDAiBgNVBAoMG0Zy
-YW5rbGluICYgTWFyc2hhbGwgQ29sbGVnZTEMMAoGA1UECwwDSVRTMRgwFgYDVQQD
-DA9sb2dpbi5mYW5kbS5lZHUxITAfBgkqhkiG9w0BCQEWEnNzbGFkbWluQGZhbmRt
-LmVkdTAeFw0xMzAxMTQxNDAwMjJaFw0yMzAxMTIxNDAwMjJaMIGfMQswCQYDVQQG
-EwJVUzELMAkGA1UECAwCUEExEjAQBgNVBAcMCUxhbmNhc3RlcjEkMCIGA1UECgwb
-RnJhbmtsaW4gJiBNYXJzaGFsbCBDb2xsZWdlMQwwCgYDVQQLDANJVFMxGDAWBgNV
-BAMMD2xvZ2luLmZhbmRtLmVkdTEhMB8GCSqGSIb3DQEJARYSc3NsYWRtaW5AZmFu
-ZG0uZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwb099yvp3PyV
-X/eK1+Ga7FQijJIEXmCjWKGELCK218mRFaxfLC95UQGxF8WFrTJsLXEOV84vXufy
-1ZGzBRHx9+WSsiOcA6mCUgUkLLNMBQzj6XlTNxtZAypDPqBTwRqwQeSBMHzp+1L9
-9OnZ2cLYsi6YwrEEb8S7WLkSAQDsWpFEU9WbUHHkWarvHGs40Dz1a78cEId/4KZR
-YUV84cbOlfaz3/cob+BuN9c6HM64gmA36cDHbBWaMDussVvaHxa2JnzuCt0r7KQK
-aKfTxLTXX6gA0GvNgXuXLx/X2E/QM0QDOgzkY2a9d4ar1tXbl/HoMCN79uyAcAb8
-mb3nY/ot7wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBdjOu5c+kqe612POaok3a4
-hauXGAsvfu3uKb/KvyjupltdfjScaE570/6qEMR/xIJuSK4E0CLizSBFor9z0rwx
-qqmvk+iLSHTrgLSqFdxdY70Kpo2RytrBhJDKDMitnAZA9lzwmhTgqoMYhRVvJ7Iu
-OkLkJ88iMFpMBUxj4EuKNLP5XPj20ofG0H2yIiVUvOpAjU4lAqekKY16vnl7hJe4
-iwfMfHgdJvFXhnlv6keguRFmm3Kmdo9zVoHYI4QeMk7hhk2OYyoZMR1IFcMN16P9
-6y60fPr2Yyp6e9uyGPEZv4Qfum6VSa56tN9MXL3PQO0CHADwmM/PrucSPtYd6LR6
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fandm.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fandm.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Franklin &amp; Marshall College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Franklin &amp; Marshall College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fandm.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Alan Sutter</md:GivenName>
-    <md:EmailAddress>alan.sutter@fandm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Todd Higgins</md:GivenName>
-    <md:EmailAddress>thiggins@fandm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josh Baron</md:GivenName>
-    <md:EmailAddress>jbaron1@fandm.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml
deleted file mode 100644
index 1a598857..00000000
--- a/swamid-interfederations-2.0/login.fanshawec.ca-idp-shibboleth.xml
+++ /dev/null
@@ -1,74 +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://login.fanshawec.ca/idp/shibboleth">
-  <md: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>
-  </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">fanshawec.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Fanshawe College</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Fanshawe College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Fanshawe College</mdui:Description>
-        <mdui:Description xml:lang="fr">Fanshawe College</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fanshawec.ca/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">http://www.fanshawec.ca/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIDMzCCAhugAwIBAgIUCXF2tM/DJVzBFEwQQH2q5KLdt3UwDQYJKoZIhvcNAQEF BQAwHTEbMBkGA1UEAxMSbG9naW4uZmFuc2hhd2VjLmNhMB4XDTEzMTEwODE4Mzc0 MloXDTMzMTEwODE4Mzc0MlowHTEbMBkGA1UEAxMSbG9naW4uZmFuc2hhd2VjLmNh MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiuS4iCDj0Nr7+o+sY+5N CZ1sx6RLgx00FlwQep1t8D8Aszrt+5dF2YzwhHYS80NtlB+aGjoK/Qfd2hPi7PXL CtZ7fCFJu2hEW3Nsit4zWeT6rwtivzXdVU8hzJ+IE71OzY0fhN+8TByzdxCzG2qp q77lxYvtk/HBQ7P3PnWSblEdiMD3x9hLGRpojPBtvMkFwBi28q+lkb8tIHHOPnNX 8dA3j455JUZw0Tt7GFDqi9/Ists7v5sGUT3u3A3+CB4TP8G8Y23XIdj085erMZHQ fOkxb0mMYSvXYRwZ8BAog9rp8EjiiOSr7/U3r4VLqWeMFtalNOAGm0DD9W0/g/Ym 9wIDAQABo2swaTBIBgNVHREEQTA/ghJsb2dpbi5mYW5zaGF3ZWMuY2GGKWh0dHBz Oi8vbG9naW4uZmFuc2hhd2VjLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQl f5iwDg4cIOa6dyG4kxa5k4QE0jANBgkqhkiG9w0BAQUFAAOCAQEAKudffW4nWF+/ 3GDt54Jbq5DWogflPP9KhZMYy3L/G241zXvqqu/OyM+dw8qx9p5YCgvhGYBJJ+b7 n63f9QhK0y0K+r7sgy+Mce3Ceo33e0sglP9orY/xSu7iryQnVnNtRI/UFdOvEPc8 JPvaf+yKHnAkpzyWYI8FZragWJXpa2MVzTTKqqEdYsMES5NQ5U7Zv5A/tY/D90Cx 3R5IaWcxDxVgOZziRniD8XD5EWmAMLhl4emeWQXyfI6LuhL4pTaaR1XUxaouCkj2 K2PKk+T/tJ7BHzT8hbdIlYt08yDPLB6nwvEMRNGoy5yn5zDFFMzxV0DS043+xfCJ 2oLUUamGDQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fanshawec.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fanshawec.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fanshawec.ca/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fanshawec.ca/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fanshawec.ca: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://login.fanshawec.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fanshawec.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fanshawec.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fanshawec.ca/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="true">(.*\.|)fanshawec.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                        MIIDMzCCAhugAwIBAgIUCXF2tM/DJVzBFEwQQH2q5KLdt3UwDQYJKoZIhvcNAQEF BQAwHTEbMBkGA1UEAxMSbG9naW4uZmFuc2hhd2VjLmNhMB4XDTEzMTEwODE4Mzc0 MloXDTMzMTEwODE4Mzc0MlowHTEbMBkGA1UEAxMSbG9naW4uZmFuc2hhd2VjLmNh MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiuS4iCDj0Nr7+o+sY+5N CZ1sx6RLgx00FlwQep1t8D8Aszrt+5dF2YzwhHYS80NtlB+aGjoK/Qfd2hPi7PXL CtZ7fCFJu2hEW3Nsit4zWeT6rwtivzXdVU8hzJ+IE71OzY0fhN+8TByzdxCzG2qp q77lxYvtk/HBQ7P3PnWSblEdiMD3x9hLGRpojPBtvMkFwBi28q+lkb8tIHHOPnNX 8dA3j455JUZw0Tt7GFDqi9/Ists7v5sGUT3u3A3+CB4TP8G8Y23XIdj085erMZHQ fOkxb0mMYSvXYRwZ8BAog9rp8EjiiOSr7/U3r4VLqWeMFtalNOAGm0DD9W0/g/Ym 9wIDAQABo2swaTBIBgNVHREEQTA/ghJsb2dpbi5mYW5zaGF3ZWMuY2GGKWh0dHBz Oi8vbG9naW4uZmFuc2hhd2VjLmNhL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQl f5iwDg4cIOa6dyG4kxa5k4QE0jANBgkqhkiG9w0BAQUFAAOCAQEAKudffW4nWF+/ 3GDt54Jbq5DWogflPP9KhZMYy3L/G241zXvqqu/OyM+dw8qx9p5YCgvhGYBJJ+b7 n63f9QhK0y0K+r7sgy+Mce3Ceo33e0sglP9orY/xSu7iryQnVnNtRI/UFdOvEPc8 JPvaf+yKHnAkpzyWYI8FZragWJXpa2MVzTTKqqEdYsMES5NQ5U7Zv5A/tY/D90Cx 3R5IaWcxDxVgOZziRniD8XD5EWmAMLhl4emeWQXyfI6LuhL4pTaaR1XUxaouCkj2 K2PKk+T/tJ7BHzT8hbdIlYt08yDPLB6nwvEMRNGoy5yn5zDFFMzxV0DS043+xfCJ 2oLUUamGDQ==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fanshawec.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fanshawec.ca: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">Fanshawe College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Fanshawe College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://fanshawec.ca</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Technical contact</md:SurName>
-    <md:EmailAddress>pgilbert@fanshawec.ca</md:EmailAddress>
-  </md: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 03ef9f34..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: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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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 250c27bc..00000000
--- a/swamid-interfederations-2.0/login.feld.cvut.cz.xml
+++ /dev/null
@@ -1,192 +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://login.feld.cvut.cz/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">fel.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, Faculty of Electrical Engineering</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</mdui:DisplayName>
-        <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: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.feld.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>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEkjCCA3qgAwIBAgIQCpc8Q9h2foS8MtbTcL2TMDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDEwMjAwMDAwMFoXDTE2MDEwMjIzNTk1OVowWDELMAkGA1UE
-BhMCQ1oxLTArBgNVBAoTJEN6ZWNoIFRlY2huaWNhbCBVbml2ZXJzaXR5IGluIFBy
-YWd1ZTEaMBgGA1UEAxMRbG9naW4uZmVsLmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDDuL8a7onZijGOC+JeP1z4yMbCtATlv2VP3u2+pn4U
-sK3mwHipcfjhMwLpSboTtId21HFDCD6RAogz5Zd0X9GSrI8pLWVT4cM/VzBWvw3c
-noSm9xswSvcOZ3uXmCd06HlpabZGZuWg5jXO4EdjqFtjVD9tONguyal8H5sBRRb9
-Z0ShL0/a27MMrdjKl5gOx43hhAbHyAH4fQ2gStBsn8WZ1g1zj0bLit32cvcnECbe
-7kzltbZa+gX2MrhiEAe0ZBuqcjg4BuZ00ZDfKf9be2MyisTXR5dIrG5f96xd0gJ4
-eqnSMGDchPeXRoMz584b+sFgfDRmmT1cKJbPfpoW6k8RAgMBAAGjggF4MIIBdDAf
-BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6YyoMBPg
-DqpgaarrFV36wd07sOUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9n
-aW4uZmVsLmN2dXQuY3qCEmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUF
-AAOCAQEApmlqVO5GPaYBHwWXEHs5jvGaqSfcJvN0HbKC7bbTR1O0WqNLTUVVK9k3
-z+sRpGzVc6xAq79odCI0cC+uBDzQ5hXKAh7kSRpG85MhX06MMbqDdZkx+qDXnVZg
-wpzFYPxdkeDb5eLm2anMYKMYuAMne+wbtKLy6TO4dtM8RL2FgtZy1j1Rf+u3UFtT
-Do+Wm6n0YwDPphP6mX6hhILlCPsJ50715kIsVKr6d6o8yyX7Lhn2eqOu8/QpNNUG
-UKrVFWduXxoAgSn9iHaBAN4WgfvmOGOxvxJgSaH8aZXv61N9jL1IgwrYPfdQb/lX
-dj+n3gr4xtn/PGM1C5O+OEFGmi+G9g==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIElDCCA3ygAwIBAgIRAMqRRTZJu2RDt+d/vvzzW68wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0wOTEyMjgwMDAwMDBaFw0xMjEyMjcyMzU5NTlaMFkxCzAJBgNV
-BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
-cmFndWUxGzAZBgNVBAMTEmxvZ2luLmZlbGQuY3Z1dC5jejCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMFmy3m3rFgI84okN8+0jx8V+cRfSqzga+i51UYO
-gJP0TD9fhct4I/b1vHsveBqBpsNH/4wZMJEF6U6xmzmb9RPzc765DnlcMa8syfQ5
-74X5+0qa7iVb8nlLX+uiEZ2cSQ5sZIaCnnU+hHyla6EtG6W3HwiJZhT2YZ9Y5d1/
-YwdM7+fE9e6pagx1xDIPWBDg1IucEyrZdSJlCDsjAKmHHL0th09AA93/OUendsh0
-oNRYImAJ6ZCawbiRYgS2gR+mGAoarro/7LEMbg/urwOpPyM9oMu7XGtEM2suUmoj
-KaDbv6s1dXP5sBsPxdaXLsfm814qYjePlJC46SaYoJa8Y30CAwEAAaOCAXgwggF0
-MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQ8JRmP
-ILte2LuZmgYFZlYlOgkZYzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAd
-BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEE
-AbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAwBgNVHREEKTAnghJs
-b2dpbi5mZWxkLmN2dXQuY3qCEWxvZ2luLmZlbC5jdnV0LmN6MA0GCSqGSIb3DQEB
-BQUAA4IBAQA9bxujyO9ypGL6XGHfGfxwO/PbfO6lFIwaRHuq7s7qzSO84MY4dm1b
-hrXdRpHh/ytWuFVjG8hkrGxWeXxTvmnT/7UZkiunIS1W0bv+UsjLEE2JxQliZH5b
-fvQo+TzGjSc+/G69aWsiGOBrMNIZo5G7je7jPqXT8dxYybA/H5kRPCHIWytTo2B8
-eV8VdpcVEiiwDUrdTOqx9ovdG71AF23oB3gEGurmjaO1KzON0afJX0jbdhPeHgZk
-w3yAAidVUbdnIKxRX7apmSjRR8WP6Wbt3Nc/O7QVUKQ8mbu5WgycixP9UoHhWJb1
-OD+lrV+pj5G00QitlYmP1PhegXcXmrxz
-             </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.feld.cvut.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.feld.cvut.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://login.feld.cvut.cz/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.feld.cvut.cz/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.feld.cvut.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.feld.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">fel.cvut.cz</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEkjCCA3qgAwIBAgIQCpc8Q9h2foS8MtbTcL2TMDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDEwMjAwMDAwMFoXDTE2MDEwMjIzNTk1OVowWDELMAkGA1UE
-BhMCQ1oxLTArBgNVBAoTJEN6ZWNoIFRlY2huaWNhbCBVbml2ZXJzaXR5IGluIFBy
-YWd1ZTEaMBgGA1UEAxMRbG9naW4uZmVsLmN2dXQuY3owggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDDuL8a7onZijGOC+JeP1z4yMbCtATlv2VP3u2+pn4U
-sK3mwHipcfjhMwLpSboTtId21HFDCD6RAogz5Zd0X9GSrI8pLWVT4cM/VzBWvw3c
-noSm9xswSvcOZ3uXmCd06HlpabZGZuWg5jXO4EdjqFtjVD9tONguyal8H5sBRRb9
-Z0ShL0/a27MMrdjKl5gOx43hhAbHyAH4fQ2gStBsn8WZ1g1zj0bLit32cvcnECbe
-7kzltbZa+gX2MrhiEAe0ZBuqcjg4BuZ00ZDfKf9be2MyisTXR5dIrG5f96xd0gJ4
-eqnSMGDchPeXRoMz584b+sFgfDRmmT1cKJbPfpoW6k8RAgMBAAGjggF4MIIBdDAf
-BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU6YyoMBPg
-DqpgaarrFV36wd07sOUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwMAYDVR0RBCkwJ4IRbG9n
-aW4uZmVsLmN2dXQuY3qCEmxvZ2luLmZlbGQuY3Z1dC5jejANBgkqhkiG9w0BAQUF
-AAOCAQEApmlqVO5GPaYBHwWXEHs5jvGaqSfcJvN0HbKC7bbTR1O0WqNLTUVVK9k3
-z+sRpGzVc6xAq79odCI0cC+uBDzQ5hXKAh7kSRpG85MhX06MMbqDdZkx+qDXnVZg
-wpzFYPxdkeDb5eLm2anMYKMYuAMne+wbtKLy6TO4dtM8RL2FgtZy1j1Rf+u3UFtT
-Do+Wm6n0YwDPphP6mX6hhILlCPsJ50715kIsVKr6d6o8yyX7Lhn2eqOu8/QpNNUG
-UKrVFWduXxoAgSn9iHaBAN4WgfvmOGOxvxJgSaH8aZXv61N9jL1IgwrYPfdQb/lX
-dj+n3gr4xtn/PGM1C5O+OEFGmi+G9g==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIElDCCA3ygAwIBAgIRAMqRRTZJu2RDt+d/vvzzW68wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0wOTEyMjgwMDAwMDBaFw0xMjEyMjcyMzU5NTlaMFkxCzAJBgNV
-BAYTAkNaMS0wKwYDVQQKEyRDemVjaCBUZWNobmljYWwgVW5pdmVyc2l0eSBpbiBQ
-cmFndWUxGzAZBgNVBAMTEmxvZ2luLmZlbGQuY3Z1dC5jejCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMFmy3m3rFgI84okN8+0jx8V+cRfSqzga+i51UYO
-gJP0TD9fhct4I/b1vHsveBqBpsNH/4wZMJEF6U6xmzmb9RPzc765DnlcMa8syfQ5
-74X5+0qa7iVb8nlLX+uiEZ2cSQ5sZIaCnnU+hHyla6EtG6W3HwiJZhT2YZ9Y5d1/
-YwdM7+fE9e6pagx1xDIPWBDg1IucEyrZdSJlCDsjAKmHHL0th09AA93/OUendsh0
-oNRYImAJ6ZCawbiRYgS2gR+mGAoarro/7LEMbg/urwOpPyM9oMu7XGtEM2suUmoj
-KaDbv6s1dXP5sBsPxdaXLsfm814qYjePlJC46SaYoJa8Y30CAwEAAaOCAXgwggF0
-MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQ8JRmP
-ILte2LuZmgYFZlYlOgkZYzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAd
-BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEE
-AbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAwBgNVHREEKTAnghJs
-b2dpbi5mZWxkLmN2dXQuY3qCEWxvZ2luLmZlbC5jdnV0LmN6MA0GCSqGSIb3DQEB
-BQUAA4IBAQA9bxujyO9ypGL6XGHfGfxwO/PbfO6lFIwaRHuq7s7qzSO84MY4dm1b
-hrXdRpHh/ytWuFVjG8hkrGxWeXxTvmnT/7UZkiunIS1W0bv+UsjLEE2JxQliZH5b
-fvQo+TzGjSc+/G69aWsiGOBrMNIZo5G7je7jPqXT8dxYybA/H5kRPCHIWytTo2B8
-eV8VdpcVEiiwDUrdTOqx9ovdG71AF23oB3gEGurmjaO1KzON0afJX0jbdhPeHgZk
-w3yAAidVUbdnIKxRX7apmSjRR8WP6Wbt3Nc/O7QVUKQ8mbu5WgycixP9UoHhWJb1
-OD+lrV+pj5G00QitlYmP1PhegXcXmrxz
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.feld.cvut.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.feld.cvut.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">CTU FEE</OrganizationName>
-    <OrganizationName xml:lang="cs">ČVUT FEL</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Czech Technical University in Prague, Faculty of Electrical Engineering</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cs">České vysoké učení technické v Praze, Fakulta elektrotechnická</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fel.cvut.cz/en/</OrganizationURL>
-    <OrganizationURL xml:lang="cs">http://www.fel.cvut.cz/cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ivan</GivenName>
-    <SurName>Novakov</SurName>
-    <EmailAddress>novakoi@fel.cvut.cz</EmailAddress>
-  </ContactPerson>
-</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 abcbd47d..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="de">Fachhochschule Vorarlberg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Vorarlberg University of Applied Sciences</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 0f7ebb70..00000000
--- a/swamid-interfederations-2.0/login.fhv.at.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.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-20131015</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">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>
-      <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.figsh.com-shibboleth.xml b/swamid-interfederations-2.0/login.figsh.com-shibboleth.xml
deleted file mode 100644
index 4dc07800..00000000
--- a/swamid-interfederations-2.0/login.figsh.com-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://login.figsh.com/shibboleth">
-  <!--
-		This is a "figshare - stage" Shibboleth SP for Figshare LLP.
-	-->
-  <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="2015-03-26T09:14: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">figshare - stage</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cloud based repository for citable and discoverable research outputs</mdui:Description>
-      </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://login.figsh.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://login.figsh.com/Shibboleth.sso/DS-Tuakiri"/>
-      <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://login.figsh.com/Shibboleth.sso/DS-Tuakiri" 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://login.figsh.com/Shibboleth.sso/DS-AAF"/>
-      <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://login.figsh.com/Shibboleth.sso/DS-AAF" 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://login.figsh.com/Shibboleth.sso/DS-UKF"/>
-      <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://login.figsh.com/Shibboleth.sso/DS-UKF" index="3"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAINH4QeRdG4MMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD2xvZ2luLmZpZ3NoLmNvbTAeFw0xNTAyMjIxNDU2NDBaFw0yNTAyMTkxNDU2
-						NDBaMBoxGDAWBgNVBAMTD2xvZ2luLmZpZ3NoLmNvbTCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAN4JujY6Et1TBjl+Gs1z+3BxD5cgVnAO/o6DtunEQOob
-						iPIjcjNPdh4zl6t1Z3J0aEFZBXGh9RJHXiGNzEFVFSldEqrczeRTKoC11yq4bFjl
-						f/j+XUSafGgeQ5QslogIWzJ9saMisxdjFA/BUdQuMjleP+1sSQuVtScRU8KuIMN3
-						j7RLgBLWqZjelCno33PBPeRGxShiPay7YbKrWXuYssqIvxQMlxqlFOlI/2sIdEWT
-						6Y3UsPJIDDg+SrdZU1x7QMqyMrFmcJVzpu5pjvYp9zm1ywsk0A6rwWhUaqMG7Rtu
-						oDoKrVHiGs5QbY0bA4nduceY46GPZt5QLhKKLgPrdNkCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPbG9naW4uZmlnc2guY29tMB0GA1UdDgQWBBTNUtGl6wNFgCRqbBJqQKeT
-						EA79fTANBgkqhkiG9w0BAQUFAAOCAQEAYTfYrBPburtuPTubqjRRtOGkDu1cvFbs
-						FtNK3COaBxomvaZOat/wpzKCvJYV1mZoANfjFsvudtrrwCRMxycO+qkB6B5iKk6i
-						eSuOrsAn4aOWw10NKrWn42t9sFg+MquYT0kE78U1nacmux8h+tcn+58Ng7oXZ5ZM
-						wkFx+mODdCJRsFtPTFcjMZsh9kKOKn39vmE+gir7H1Uq7sNKiyyOhJcseE6JmoHn
-						X1Qnl4KpMY0bpGcnwMCRsptHxx/+dRKnli92HoZu814RTjBDYocFLfig8+i6tN3h
-						j9He1kO/aRDrQ+eJ+ussgNgbgO1BeUoZURlifrW5ofHXTs3DIpNF9g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://login.figsh.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.figsh.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.figsh.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.figsh.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.figsh.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.figsh.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.figsh.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.figsh.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.figsh.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.figsh.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.figsh.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Figshare LLP</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">figshare stage SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://figshare.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Daniel</GivenName>
-    <SurName>Gavrila</SurName>
-    <EmailAddress>mailto:danielduduta@figshare.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Daniel</GivenName>
-    <SurName>Gavrila</SurName>
-    <EmailAddress>mailto:danielduduta@figshare.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.figshare.com-shibboleth.xml b/swamid-interfederations-2.0/login.figshare.com-shibboleth.xml
deleted file mode 100644
index dca4bb68..00000000
--- a/swamid-interfederations-2.0/login.figshare.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://login.figshare.com/shibboleth">
-  <!--
-		This is a "figshare" Shibboleth SP for Figshare LLP.
-	-->
-  <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="2015-03-26T09:27: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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">figshare</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Cloud based repository for citable and discoverable research outputs</mdui:Description>
-      </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://login.figshare.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://login.figshare.com/Shibboleth.sso/DS-Tuakiri"/>
-      <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://login.figshare.com/Shibboleth.sso/DS-Tuakiri" 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://login.figshare.com/Shibboleth.sso/DS-AAF"/>
-      <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://login.figshare.com/Shibboleth.sso/DS-AAF" 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://login.figshare.com/Shibboleth.sso/DS-UKF"/>
-      <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://login.figshare.com/Shibboleth.sso/DS-UKF" index="3"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAK4oUXPZlUI6MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEmxvZ2luLmZpZ3NoYXJlLmNvbTAeFw0xNTAyMjMxNzAxNTRaFw0yNTAyMjAx
-						NzAxNTRaMB0xGzAZBgNVBAMTEmxvZ2luLmZpZ3NoYXJlLmNvbTCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAPfl7JY916aYR+LDmqHdiO8qzoKe03BpfNV7
-						vhzvnoXJndevJd83KawCi+1YM7ZaWRBMRAmrhyf1X1S4p4hJgh6bfvErlrti/oi+
-						OiPS4xGQ1ZPctEKHrtaPgpk7377WY18b1UhQ5oRUeEE92SjbVbQCks3EN/FIb6ip
-						3Nc2yQ+qYQlp3qRtXB2Pd98YgrpapXe3CKJWg0KYJ7azVfwtdYAeweF/Y1D2QoLL
-						+5POdrTLqXSzkUGoYWlnKM7mnQQd6k2Pmh4cckMohOKT6hiV4aHfGQAjvwVeUJ7S
-						VWPaEhLFeACrvJw4QJ2t7RMu4hOItOvvN/WHKFKfaaTfmkAhU0cCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISbG9naW4uZmlnc2hhcmUuY29tMB0GA1UdDgQWBBS8OQF6shyu
-						jMxScHP8Lytou/hpSjANBgkqhkiG9w0BAQUFAAOCAQEAiv3VTRQZ5+XlhL1k0mNS
-						vwAJ04QTSrUZPx5BOIinr7Y8NzAu0H6WFIfN8Bx0bqlx+w0PUC7LCUFpq8eJs3d4
-						AqosDHZoBIXaDML5o42xY03jxM+Z1LuEVMVljtkMw7xfkx8FUr/3nPdZy2Iud4e1
-						YFmO+48vh9OdR0VYZD1Q+lFyrVui6vd2U9DRvVz6MuYxoHF/6+vcCOHfSDNcoz8U
-						Bep+TBej/kiQJjJ/tAkSaHpNHtuVI0zrziVVTHTVnC4YEcFmt1kfWwf7cpDeCrJ3
-						mwc0DpOT1TgWrS49lmpDkxkz5ofJhh6T6Wd1DAqpn+fuQKwvcPbLCIChPVNRh22s
-						LQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://login.figshare.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.figshare.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.figshare.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.figshare.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.figshare.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.figshare.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.figshare.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.figshare.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.figshare.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.figshare.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.figshare.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Figshare LLP</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">figshare</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://figshare.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Daniel</GivenName>
-    <SurName>Gavrila</SurName>
-    <EmailAddress>mailto:danielduduta@figshare.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Daniel</GivenName>
-    <SurName>Gavrila</SurName>
-    <EmailAddress>mailto:danielduduta@figshare.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml
deleted file mode 100644
index f905738b..00000000
--- a/swamid-interfederations-2.0/login.fmach.eu-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.fmach.eu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-01-03T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="it">Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Edmund Mach Foundation - Istituto Agrario di San Michele all'Adige</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige users</mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://www.fmach.it/idem</mdui:InformationURL>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmach.eu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAL7RygPVs9a1+rjGCPpUtPOFwEDPMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmxvZ2luLmZtYWNoLmV1MB4XDTExMDYxMDA3NDEzNloX
-DTMxMDYxMDA3NDEzNlowGTEXMBUGA1UEAxMObG9naW4uZm1hY2guZXUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgvLOdY/V7PGWb7V1/vNzCeZm+9TwO
-X1GsQmZY6D2Fga4FVcHbyhQNmZ2VrOi/JvC5SptjQZjQkKee4BUfgiieqhnwTfdI
-OV0ZMESh0YwXMkjRomZwjdnf6Z4i2LS4tbmZN1ajYkYqUprce5JwaslCw5UAIeUU
-FsimxhaLNnUdFgxbVpa1hWUEN2KHCfYZMCbXwumheaywWlSZqEWh1C5fBNgVb3Rs
-cyfaiz9t7N4GAf3EGP9MhR2pCRJXt619hUKV6mw6CDRfoTx2bYXuFPeIrLwWun/e
-9h73eWLnIAZlLkvcQ7sy6u+jYxOcNLKXSFhGyEE3zBF2/t3zuU3zA2oxAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmxvZ2luLmZtYWNoLmV1hiVodHRwczovL2xvZ2luLmZt
-YWNoLmV1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQY45TiPjkTzOErxnp12W9S
-CVH3ITANBgkqhkiG9w0BAQUFAAOCAQEAAoSAjAdcuIdCgDppnwVN9D7O12cTz8R2
-cYeudMepYKBaxKaskNMVp3FdfW/dc06JRBZm4fkf9wENsweDmhup0LoEkpbPkwsn
-RprHixFjI9xrgp4Zet8rYTv/o8/LojuPVm/fmJiw0GCJ0u0hw53ZlXXM60DvXXoQ
-2BlaYyHT1YTRi9t00RKB0s2poxPrleuS/VRSByhj9Ff2OFTkrpRhf09gy2NgjYbB
-TXqc4gocZlFG277Sgl/6aJfl0lfQPgPE/dxVNZlPDXsjIiSUcoZxxCn3OgL/BvnO
-uvwjEOFt6flbryZ1Zz0z3DZK6p8V+wwSgUEXsY09lhmVtD0h++crnQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fmach.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fmach.eu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.fmach.eu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.fmach.eu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.fmach.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.fmach.eu/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">fmach.eu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAL7RygPVs9a1+rjGCPpUtPOFwEDPMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmxvZ2luLmZtYWNoLmV1MB4XDTExMDYxMDA3NDEzNloX
-DTMxMDYxMDA3NDEzNlowGTEXMBUGA1UEAxMObG9naW4uZm1hY2guZXUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgvLOdY/V7PGWb7V1/vNzCeZm+9TwO
-X1GsQmZY6D2Fga4FVcHbyhQNmZ2VrOi/JvC5SptjQZjQkKee4BUfgiieqhnwTfdI
-OV0ZMESh0YwXMkjRomZwjdnf6Z4i2LS4tbmZN1ajYkYqUprce5JwaslCw5UAIeUU
-FsimxhaLNnUdFgxbVpa1hWUEN2KHCfYZMCbXwumheaywWlSZqEWh1C5fBNgVb3Rs
-cyfaiz9t7N4GAf3EGP9MhR2pCRJXt619hUKV6mw6CDRfoTx2bYXuFPeIrLwWun/e
-9h73eWLnIAZlLkvcQ7sy6u+jYxOcNLKXSFhGyEE3zBF2/t3zuU3zA2oxAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmxvZ2luLmZtYWNoLmV1hiVodHRwczovL2xvZ2luLmZt
-YWNoLmV1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQY45TiPjkTzOErxnp12W9S
-CVH3ITANBgkqhkiG9w0BAQUFAAOCAQEAAoSAjAdcuIdCgDppnwVN9D7O12cTz8R2
-cYeudMepYKBaxKaskNMVp3FdfW/dc06JRBZm4fkf9wENsweDmhup0LoEkpbPkwsn
-RprHixFjI9xrgp4Zet8rYTv/o8/LojuPVm/fmJiw0GCJ0u0hw53ZlXXM60DvXXoQ
-2BlaYyHT1YTRi9t00RKB0s2poxPrleuS/VRSByhj9Ff2OFTkrpRhf09gy2NgjYbB
-TXqc4gocZlFG277Sgl/6aJfl0lfQPgPE/dxVNZlPDXsjIiSUcoZxxCn3OgL/BvnO
-uvwjEOFt6flbryZ1Zz0z3DZK6p8V+wwSgUEXsY09lhmVtD0h++crnQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.fmach.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.fmach.eu: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="it">Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Edmund Mach Foundation - Istituto Agrario di San Michele all'Adige</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Fondazione Edmund Mach - Istituto Agrario di San Michele all'Adige</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Edmund Mach Foundation - Istituto Agrario di San Michele all'Adige</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.fmach.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.fmach.it/eng</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idem@fmach.it</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 5cf76618..3a11252e 100644
--- a/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
+++ b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.helsinki.fi/shibboleth">
-  <md: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-support" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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://login.helsinki.fi/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">helsinki.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">University of Helsinki</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Helsingin yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Helsingfors universitet</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIFnDCCBISgAwIBAgIQaa2rCkgYcvukeleEtUvyozANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
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 8b8bd63e..00000000
--- a/swamid-interfederations-2.0/login.helsinki.fi.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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>
-      <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
-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>
-    </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>Ville-Pekka</md:GivenName>
-    <md:SurName>Vainio</md:SurName>
-    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.hfwu.de.xml b/swamid-interfederations-2.0/login.hfwu.de.xml
deleted file mode 100644
index 7498ee15..00000000
--- a/swamid-interfederations-2.0/login.hfwu.de.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.hfwu.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hfwu.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hfwu.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hfwu.de,OU=IT,O=Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEDzRTyTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
-RTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRzY2hhZnQgdW5kIFVtd2Vs
-dCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xDTALBgNVBAMTBEhmV1UxGTAXBgkqhkiG
-9w0BCQEWCmNhQGhmd3UuZGUwHhcNMDkxMjAxMDgzOTIyWhcNMTQxMTMwMDgzOTIy
-WjB4MQswCQYDVQQGEwJERTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRz
-Y2hhZnQgdW5kIFVtd2VsdCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xCzAJBgNVBAsT
-AklUMRYwFAYDVQQDEw1sb2dpbi5oZnd1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtDeV1XPwscCjkEDeduizaJe1k74cfjxxUNO9ih26lhZimkx4
-nYl/vxOLezpGy4KTbb2Fx61hiDHbK73ULuInz4FmJjEhvjTS39upwkzST//KrApJ
-55EptHHDpAXEl0zL4MeuIlDOP6lf9A6Ltvvcn3G16vy91GUh5QBX/AwgDjNVk76l
-SWppIpsE+UYJD2OqGlBfdP2VJecRpmGMvWqfg6x+1YSeKZAa7f2RgDr+gecgh7ei
-dVGhhvRIAKHtFh+R3jtkzMYsMCPEItIPe+KE+K8mI8n2lbrXwCceBA02TELcat/e
-B0S2Id1Un9ns28qopPl2a8ZuOXa1PZIZRby4cQIDAQABo4ICBjCCAgIwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBSwWLMQHDrhe9zqUQ2jVkdIkZJfMjAfBgNVHSMEGDAWgBQ6lWlt
-GddajmmDrWZX2WqninO8azAcBgNVHREEFTATgRF3ZWJtYXN0ZXJAaGZ3dS5kZTCB
-pwYDVR0fBIGfMIGcMEygSqBIhkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmd3Ut
-bnVlcnRpbmdlbi1nZWlzbGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEygSqBI
-hkZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmd3UtbnVlcnRpbmdlbi1nZWlzbGlu
-Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHABggrBgEFBQcBAQSBszCBsDBWBggr
-BgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9oZnd1LW51ZXJ0aW5nZW4t
-Z2Vpc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVgYIKwYBBQUHMAKG
-Smh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGZ3dS1udWVydGluZ2VuLWdlaXNsaW5n
-ZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCz
-poESBwfG6xDGP55TCZGkLXhsO+cVo5DJaV60r9WIFbrRtakNoQOpDpnVwqbWyUIu
-Psse+qLB0G98xqYBuYG8pU0bwsACA5M7vJAKnADAglJIB9XmnukGmQWABa6bPWJ6
-oe8qIsfegRC7ntDx6gbi1Ob1G4k2Rc72X/qjKGXHwFrKiVLoJ1liaSkzIwf6ypgo
-qCHpZwipAkuXigFvcZ1YjJ1YH8gYhTW6ryG5/QC81uOIwmIGxGJP1Hdnv1FBcnKO
-PrJONtYxDe7f6iYW9HJNkwZu3Km9f15nRWo/4krTc2WYXkeVZ2nyKON+ltaPLVTE
-gpAuyo+UjGaG1AhdwVL3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hfwu.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hfwu.de,OU=IT,O=Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEDzRTyTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
-RTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRzY2hhZnQgdW5kIFVtd2Vs
-dCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xDTALBgNVBAMTBEhmV1UxGTAXBgkqhkiG
-9w0BCQEWCmNhQGhmd3UuZGUwHhcNMDkxMjAxMDgzOTIyWhcNMTQxMTMwMDgzOTIy
-WjB4MQswCQYDVQQGEwJERTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRz
-Y2hhZnQgdW5kIFVtd2VsdCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xCzAJBgNVBAsT
-AklUMRYwFAYDVQQDEw1sb2dpbi5oZnd1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtDeV1XPwscCjkEDeduizaJe1k74cfjxxUNO9ih26lhZimkx4
-nYl/vxOLezpGy4KTbb2Fx61hiDHbK73ULuInz4FmJjEhvjTS39upwkzST//KrApJ
-55EptHHDpAXEl0zL4MeuIlDOP6lf9A6Ltvvcn3G16vy91GUh5QBX/AwgDjNVk76l
-SWppIpsE+UYJD2OqGlBfdP2VJecRpmGMvWqfg6x+1YSeKZAa7f2RgDr+gecgh7ei
-dVGhhvRIAKHtFh+R3jtkzMYsMCPEItIPe+KE+K8mI8n2lbrXwCceBA02TELcat/e
-B0S2Id1Un9ns28qopPl2a8ZuOXa1PZIZRby4cQIDAQABo4ICBjCCAgIwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBSwWLMQHDrhe9zqUQ2jVkdIkZJfMjAfBgNVHSMEGDAWgBQ6lWlt
-GddajmmDrWZX2WqninO8azAcBgNVHREEFTATgRF3ZWJtYXN0ZXJAaGZ3dS5kZTCB
-pwYDVR0fBIGfMIGcMEygSqBIhkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmd3Ut
-bnVlcnRpbmdlbi1nZWlzbGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEygSqBI
-hkZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmd3UtbnVlcnRpbmdlbi1nZWlzbGlu
-Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHABggrBgEFBQcBAQSBszCBsDBWBggr
-BgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9oZnd1LW51ZXJ0aW5nZW4t
-Z2Vpc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVgYIKwYBBQUHMAKG
-Smh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGZ3dS1udWVydGluZ2VuLWdlaXNsaW5n
-ZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCz
-poESBwfG6xDGP55TCZGkLXhsO+cVo5DJaV60r9WIFbrRtakNoQOpDpnVwqbWyUIu
-Psse+qLB0G98xqYBuYG8pU0bwsACA5M7vJAKnADAglJIB9XmnukGmQWABa6bPWJ6
-oe8qIsfegRC7ntDx6gbi1Ob1G4k2Rc72X/qjKGXHwFrKiVLoJ1liaSkzIwf6ypgo
-qCHpZwipAkuXigFvcZ1YjJ1YH8gYhTW6ryG5/QC81uOIwmIGxGJP1Hdnv1FBcnKO
-PrJONtYxDe7f6iYW9HJNkwZu3Km9f15nRWo/4krTc2WYXkeVZ2nyKON+ltaPLVTE
-gpAuyo+UjGaG1AhdwVL3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.hfwu.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.hfwu.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.hfwu.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.hfwu.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.hfwu.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.hfwu.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hfwu.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hfwu.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hfwu.de,OU=IT,O=Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEDzRTyTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
-RTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRzY2hhZnQgdW5kIFVtd2Vs
-dCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xDTALBgNVBAMTBEhmV1UxGTAXBgkqhkiG
-9w0BCQEWCmNhQGhmd3UuZGUwHhcNMDkxMjAxMDgzOTIyWhcNMTQxMTMwMDgzOTIy
-WjB4MQswCQYDVQQGEwJERTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRz
-Y2hhZnQgdW5kIFVtd2VsdCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xCzAJBgNVBAsT
-AklUMRYwFAYDVQQDEw1sb2dpbi5oZnd1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtDeV1XPwscCjkEDeduizaJe1k74cfjxxUNO9ih26lhZimkx4
-nYl/vxOLezpGy4KTbb2Fx61hiDHbK73ULuInz4FmJjEhvjTS39upwkzST//KrApJ
-55EptHHDpAXEl0zL4MeuIlDOP6lf9A6Ltvvcn3G16vy91GUh5QBX/AwgDjNVk76l
-SWppIpsE+UYJD2OqGlBfdP2VJecRpmGMvWqfg6x+1YSeKZAa7f2RgDr+gecgh7ei
-dVGhhvRIAKHtFh+R3jtkzMYsMCPEItIPe+KE+K8mI8n2lbrXwCceBA02TELcat/e
-B0S2Id1Un9ns28qopPl2a8ZuOXa1PZIZRby4cQIDAQABo4ICBjCCAgIwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBSwWLMQHDrhe9zqUQ2jVkdIkZJfMjAfBgNVHSMEGDAWgBQ6lWlt
-GddajmmDrWZX2WqninO8azAcBgNVHREEFTATgRF3ZWJtYXN0ZXJAaGZ3dS5kZTCB
-pwYDVR0fBIGfMIGcMEygSqBIhkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmd3Ut
-bnVlcnRpbmdlbi1nZWlzbGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEygSqBI
-hkZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmd3UtbnVlcnRpbmdlbi1nZWlzbGlu
-Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHABggrBgEFBQcBAQSBszCBsDBWBggr
-BgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9oZnd1LW51ZXJ0aW5nZW4t
-Z2Vpc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVgYIKwYBBQUHMAKG
-Smh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGZ3dS1udWVydGluZ2VuLWdlaXNsaW5n
-ZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCz
-poESBwfG6xDGP55TCZGkLXhsO+cVo5DJaV60r9WIFbrRtakNoQOpDpnVwqbWyUIu
-Psse+qLB0G98xqYBuYG8pU0bwsACA5M7vJAKnADAglJIB9XmnukGmQWABa6bPWJ6
-oe8qIsfegRC7ntDx6gbi1Ob1G4k2Rc72X/qjKGXHwFrKiVLoJ1liaSkzIwf6ypgo
-qCHpZwipAkuXigFvcZ1YjJ1YH8gYhTW6ryG5/QC81uOIwmIGxGJP1Hdnv1FBcnKO
-PrJONtYxDe7f6iYW9HJNkwZu3Km9f15nRWo/4krTc2WYXkeVZ2nyKON+ltaPLVTE
-gpAuyo+UjGaG1AhdwVL3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hfwu.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hfwu.de,OU=IT,O=Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFezCCBGOgAwIBAgIEDzRTyTANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJE
-RTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRzY2hhZnQgdW5kIFVtd2Vs
-dCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xDTALBgNVBAMTBEhmV1UxGTAXBgkqhkiG
-9w0BCQEWCmNhQGhmd3UuZGUwHhcNMDkxMjAxMDgzOTIyWhcNMTQxMTMwMDgzOTIy
-WjB4MQswCQYDVQQGEwJERTFEMEIGA1UEChM7SG9jaHNjaHVsZSBmdWVyIFdpcnRz
-Y2hhZnQgdW5kIFVtd2VsdCBOdWVydGluZ2VuLUdlaXNsaW5nZW4xCzAJBgNVBAsT
-AklUMRYwFAYDVQQDEw1sb2dpbi5oZnd1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtDeV1XPwscCjkEDeduizaJe1k74cfjxxUNO9ih26lhZimkx4
-nYl/vxOLezpGy4KTbb2Fx61hiDHbK73ULuInz4FmJjEhvjTS39upwkzST//KrApJ
-55EptHHDpAXEl0zL4MeuIlDOP6lf9A6Ltvvcn3G16vy91GUh5QBX/AwgDjNVk76l
-SWppIpsE+UYJD2OqGlBfdP2VJecRpmGMvWqfg6x+1YSeKZAa7f2RgDr+gecgh7ei
-dVGhhvRIAKHtFh+R3jtkzMYsMCPEItIPe+KE+K8mI8n2lbrXwCceBA02TELcat/e
-B0S2Id1Un9ns28qopPl2a8ZuOXa1PZIZRby4cQIDAQABo4ICBjCCAgIwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MB0GA1UdDgQWBBSwWLMQHDrhe9zqUQ2jVkdIkZJfMjAfBgNVHSMEGDAWgBQ6lWlt
-GddajmmDrWZX2WqninO8azAcBgNVHREEFTATgRF3ZWJtYXN0ZXJAaGZ3dS5kZTCB
-pwYDVR0fBIGfMIGcMEygSqBIhkZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmd3Ut
-bnVlcnRpbmdlbi1nZWlzbGluZ2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEygSqBI
-hkZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmd3UtbnVlcnRpbmdlbi1nZWlzbGlu
-Z2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHABggrBgEFBQcBAQSBszCBsDBWBggr
-BgEFBQcwAoZKaHR0cDovL2NkcDEucGNhLmRmbi5kZS9oZnd1LW51ZXJ0aW5nZW4t
-Z2Vpc2xpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwVgYIKwYBBQUHMAKG
-Smh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaGZ3dS1udWVydGluZ2VuLWdlaXNsaW5n
-ZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCz
-poESBwfG6xDGP55TCZGkLXhsO+cVo5DJaV60r9WIFbrRtakNoQOpDpnVwqbWyUIu
-Psse+qLB0G98xqYBuYG8pU0bwsACA5M7vJAKnADAglJIB9XmnukGmQWABa6bPWJ6
-oe8qIsfegRC7ntDx6gbi1Ob1G4k2Rc72X/qjKGXHwFrKiVLoJ1liaSkzIwf6ypgo
-qCHpZwipAkuXigFvcZ1YjJ1YH8gYhTW6ryG5/QC81uOIwmIGxGJP1Hdnv1FBcnKO
-PrJONtYxDe7f6iYW9HJNkwZu3Km9f15nRWo/4krTc2WYXkeVZ2nyKON+ltaPLVTE
-gpAuyo+UjGaG1AhdwVL3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.hfwu.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.hfwu.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule fuer Wirtschaft und Umwelt Nuertingen-Geislingen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">HfWU Nuertingen-Geislingen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hfwu.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Clemens</GivenName>
-    <SurName>Sanwald</SurName>
-    <EmailAddress>clemens.sanwald@hfwu.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.hmc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.hmc.edu-idp-shibboleth.xml
deleted file mode 100644
index 3e0508dc..00000000
--- a/swamid-interfederations-2.0/login.hmc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,70 +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://login.hmc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login.hmc.edu/idp/shibboleth/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hmc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Harvey Mudd College</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.hmc.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.hmc.edu/cis/about-cis/policies/claremont-appropriate-use-policy/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="150" xml:lang="en">https://www.hmc.edu/communications/wp-content/uploads/sites/19/2013/11/HMC-BGW-RGB-150dpi-150x150.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>
-MIIDGjCCAgKgAwIBAgIUN47xMNeIGq+9fTb4aJR1KEWc7wswDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwMi5maXNjaGVyaWRlbnRpdHkuY29tMB4XDTExMTIx
-MjE2NTc0NFoXDTMxMTIxMjE2NTc0NFowIzEhMB8GA1UEAxMYaWRwMi5maXNjaGVy
-aWRlbnRpdHkuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm/SU
-7QC7q5ijdiZ1aq7/wwOYGWUkI5TvIGAZgOtVwteHfiwNjsQL1YcVtmxPj37Gts1z
-/+DbRaPGWaXxvMj0SzwsYiJEw/P5EKOC3ujhc10cs6RutdpNLno3CjbQazZrpDqk
-OPwGsGtc0r6Jn9MRsZDpfzaVS8E1wbBUQ1uU5PfUUvW+Q1pxDqzOSv8ZtqIgFQgS
-k1JpjqL45h5t+C5WnxidLjkB1L0fgVLi+DDjYYK+6sTlCd600Ixufr1Vb9Qj+90v
-//U5XkUNYwCAVASuVlXpWXfdfKyCuUyVa+3VZIWRKxye8abN/jJoE1uHmgbnVWul
-aPzrvNjbzVLo7nBo2QIDAQABo0YwRDAjBgNVHREEHDAaghhpZHAyLmZpc2NoZXJp
-ZGVudGl0eS5jb20wHQYDVR0OBBYEFN3LsRRIf64KoZtwrtGt1bfwnSX6MA0GCSqG
-SIb3DQEBBQUAA4IBAQAVSzbN7EtwyvMka3hIX/5KGKbavF7FtIGN4p7jg2UMeH89
-pAzjxIGOnibFIr5QF9RV0qtG/3SaQMyH18OV73SkcLYOifjJKEnceGi44TdBkfIG
-/6LY3n5lMd3UvC0qbR59qZ0qIkd2kmfo/b9mfPjwy3+6ypN6J9DeSQFxffu+o7UI
-pi+52yms2KD8klrC+Ptq76kKetJifRalHNK0cEMzNae6s+sQYxGVhqOHijEgXvTB
-abocdzekYdo3N1BoA3TNcqWvBcVEt6m9iW/cDKMr8xlkpII8A8p9piPozcFmCDll
-ip/lOg2kOdU7AB80pFPqQLvDSArQpzItz88dbws6
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.hmc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.hmc.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Harvey Mudd College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Harvey Mudd College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hmc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Cindy Abercrombie</md:GivenName>
-    <md:EmailAddress>cabercrombie@hmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mitch Shacklett</md:GivenName>
-    <md:EmailAddress>mshacklett@hmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Duke Vu</md:GivenName>
-    <md:EmailAddress>dvu@hmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andy Davenport</md:GivenName>
-    <md:EmailAddress>andy@hmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.hs-ulm.de.xml b/swamid-interfederations-2.0/login.hs-ulm.de.xml
deleted file mode 100644
index c5c3b2f0..00000000
--- a/swamid-interfederations-2.0/login.hs-ulm.de.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.hs-ulm.de/shibboleth-idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-ulm.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hs-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hs-ulm.de,OU=IMZ Basisdienste,O=Hochschule Ulm,L=Ulm,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDoU1qDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEMMAoGA1UEBxMDVWxtMRcw
-FQYDVQQKEw5Ib2Noc2NodWxlIFVsbTESMBAGA1UEAxMJSFMtVWxtLUNBMRwwGgYJ
-KoZIhvcNAQkBFg1wa2lAaHMtdWxtLmRlMB4XDTA5MDcyMTEyNDQwOFoXDTE0MDcy
-MDEyNDQwOFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRl
-bWJlcmcxDDAKBgNVBAcTA1VsbTEXMBUGA1UEChMOSG9jaHNjaHVsZSBVbG0xGTAX
-BgNVBAsTEElNWiBCYXNpc2RpZW5zdGUxGDAWBgNVBAMTD2xvZ2luLmhzLXVsbS5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJNagUx2/L3GVhnU5nJP
-RLnuRxtl18QoMX84C4/UOXzeWWNMPUMz6DmsiAYw+V/cv9W7+v1eLiKT6zaPfrX8
-0sybfpevzdqUSKAlR0ioVa1M7GxlX5BJup6O7mh95mwubXRf+F7CTNIc0M2iUgrp
-LwT7ToZQZ2BLq8pgp7H0gIXM3A6YjaGIyi3DAMVoIGzMZqwQIJyenGnUzt4GAO9m
-HMk09X5Uh6qJrIHl3YVSi/EOYoFMKz+Gj7yHt5+uNJdr6K9l+MpU0wcjcXAlfqVT
-NhVknljVHQM/F9qE+eiJoIaKRY+vXhjEN0Tt4D+QzIcnzeU3S3qOeDpjQZQ7xZQD
-DCMCAwEAAaOCAbUwggGxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZGE6kFyTIlqIuIX7Yj2w
-SVL/L4MwHwYDVR0jBBgwFoAUipDUKZ6ZmPnHrOTgHKQOsqU0x48wHgYDVR0RBBcw
-FYETZ2xvZWNrbGVyQGhzLXVsbS5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4oDag
-NIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy11bG0tY2EvcHViL2NybC9jYWNy
-bC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQgYI
-KwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtdWxtLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAe1m1ZLRkq2Fg5rud
-ZxyR2qYeWePf8R3u3wgaeT5KEXLyzkXG0+J8ux51sSMqQmcXQlIZA1HR34YojJBb
-NRb/GJbj1e9Tz4v4Bo09YW0KNNajoKxCoSbksgl8HsWT24RdRBukj6wJ5R6KiP2X
-8j0n/txs4n/Gcu5lxXm/KQlOUQk+0SBcBko2mco/GukqDhfDjPPZuRlJD/1e/JZG
-aIS6St6S0XcrQdDUu+rTLmOjHxAYCUsq0qhdZCRxZ0f526NKc6HBHUWEGckYJxUM
-vcw/dglKct7tC3T3RCJlCS2eQUjc7mGrB8gUc0hZkFZOkyj5tlm5mmWRdoMooann
-hGoTVw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hs-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hs-ulm.de,OU=IMZ Basisdienste,O=Hochschule Ulm,L=Ulm,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDoU1qDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEMMAoGA1UEBxMDVWxtMRcw
-FQYDVQQKEw5Ib2Noc2NodWxlIFVsbTESMBAGA1UEAxMJSFMtVWxtLUNBMRwwGgYJ
-KoZIhvcNAQkBFg1wa2lAaHMtdWxtLmRlMB4XDTA5MDcyMTEyNDQwOFoXDTE0MDcy
-MDEyNDQwOFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRl
-bWJlcmcxDDAKBgNVBAcTA1VsbTEXMBUGA1UEChMOSG9jaHNjaHVsZSBVbG0xGTAX
-BgNVBAsTEElNWiBCYXNpc2RpZW5zdGUxGDAWBgNVBAMTD2xvZ2luLmhzLXVsbS5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJNagUx2/L3GVhnU5nJP
-RLnuRxtl18QoMX84C4/UOXzeWWNMPUMz6DmsiAYw+V/cv9W7+v1eLiKT6zaPfrX8
-0sybfpevzdqUSKAlR0ioVa1M7GxlX5BJup6O7mh95mwubXRf+F7CTNIc0M2iUgrp
-LwT7ToZQZ2BLq8pgp7H0gIXM3A6YjaGIyi3DAMVoIGzMZqwQIJyenGnUzt4GAO9m
-HMk09X5Uh6qJrIHl3YVSi/EOYoFMKz+Gj7yHt5+uNJdr6K9l+MpU0wcjcXAlfqVT
-NhVknljVHQM/F9qE+eiJoIaKRY+vXhjEN0Tt4D+QzIcnzeU3S3qOeDpjQZQ7xZQD
-DCMCAwEAAaOCAbUwggGxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZGE6kFyTIlqIuIX7Yj2w
-SVL/L4MwHwYDVR0jBBgwFoAUipDUKZ6ZmPnHrOTgHKQOsqU0x48wHgYDVR0RBBcw
-FYETZ2xvZWNrbGVyQGhzLXVsbS5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4oDag
-NIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy11bG0tY2EvcHViL2NybC9jYWNy
-bC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQgYI
-KwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtdWxtLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAe1m1ZLRkq2Fg5rud
-ZxyR2qYeWePf8R3u3wgaeT5KEXLyzkXG0+J8ux51sSMqQmcXQlIZA1HR34YojJBb
-NRb/GJbj1e9Tz4v4Bo09YW0KNNajoKxCoSbksgl8HsWT24RdRBukj6wJ5R6KiP2X
-8j0n/txs4n/Gcu5lxXm/KQlOUQk+0SBcBko2mco/GukqDhfDjPPZuRlJD/1e/JZG
-aIS6St6S0XcrQdDUu+rTLmOjHxAYCUsq0qhdZCRxZ0f526NKc6HBHUWEGckYJxUM
-vcw/dglKct7tC3T3RCJlCS2eQUjc7mGrB8gUc0hZkFZOkyj5tlm5mmWRdoMooann
-hGoTVw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.hs-ulm.de/shibboleth-idp/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.hs-ulm.de:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.hs-ulm.de/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.hs-ulm.de/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.hs-ulm.de/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.hs-ulm.de/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-ulm.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hs-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hs-ulm.de,OU=IMZ Basisdienste,O=Hochschule Ulm,L=Ulm,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDoU1qDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEMMAoGA1UEBxMDVWxtMRcw
-FQYDVQQKEw5Ib2Noc2NodWxlIFVsbTESMBAGA1UEAxMJSFMtVWxtLUNBMRwwGgYJ
-KoZIhvcNAQkBFg1wa2lAaHMtdWxtLmRlMB4XDTA5MDcyMTEyNDQwOFoXDTE0MDcy
-MDEyNDQwOFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRl
-bWJlcmcxDDAKBgNVBAcTA1VsbTEXMBUGA1UEChMOSG9jaHNjaHVsZSBVbG0xGTAX
-BgNVBAsTEElNWiBCYXNpc2RpZW5zdGUxGDAWBgNVBAMTD2xvZ2luLmhzLXVsbS5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJNagUx2/L3GVhnU5nJP
-RLnuRxtl18QoMX84C4/UOXzeWWNMPUMz6DmsiAYw+V/cv9W7+v1eLiKT6zaPfrX8
-0sybfpevzdqUSKAlR0ioVa1M7GxlX5BJup6O7mh95mwubXRf+F7CTNIc0M2iUgrp
-LwT7ToZQZ2BLq8pgp7H0gIXM3A6YjaGIyi3DAMVoIGzMZqwQIJyenGnUzt4GAO9m
-HMk09X5Uh6qJrIHl3YVSi/EOYoFMKz+Gj7yHt5+uNJdr6K9l+MpU0wcjcXAlfqVT
-NhVknljVHQM/F9qE+eiJoIaKRY+vXhjEN0Tt4D+QzIcnzeU3S3qOeDpjQZQ7xZQD
-DCMCAwEAAaOCAbUwggGxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZGE6kFyTIlqIuIX7Yj2w
-SVL/L4MwHwYDVR0jBBgwFoAUipDUKZ6ZmPnHrOTgHKQOsqU0x48wHgYDVR0RBBcw
-FYETZ2xvZWNrbGVyQGhzLXVsbS5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4oDag
-NIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy11bG0tY2EvcHViL2NybC9jYWNy
-bC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQgYI
-KwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtdWxtLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAe1m1ZLRkq2Fg5rud
-ZxyR2qYeWePf8R3u3wgaeT5KEXLyzkXG0+J8ux51sSMqQmcXQlIZA1HR34YojJBb
-NRb/GJbj1e9Tz4v4Bo09YW0KNNajoKxCoSbksgl8HsWT24RdRBukj6wJ5R6KiP2X
-8j0n/txs4n/Gcu5lxXm/KQlOUQk+0SBcBko2mco/GukqDhfDjPPZuRlJD/1e/JZG
-aIS6St6S0XcrQdDUu+rTLmOjHxAYCUsq0qhdZCRxZ0f526NKc6HBHUWEGckYJxUM
-vcw/dglKct7tC3T3RCJlCS2eQUjc7mGrB8gUc0hZkFZOkyj5tlm5mmWRdoMooann
-hGoTVw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.hs-ulm.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.hs-ulm.de,OU=IMZ Basisdienste,O=Hochschule Ulm,L=Ulm,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFQDCCBCigAwIBAgIEDoU1qDANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzEMMAoGA1UEBxMDVWxtMRcw
-FQYDVQQKEw5Ib2Noc2NodWxlIFVsbTESMBAGA1UEAxMJSFMtVWxtLUNBMRwwGgYJ
-KoZIhvcNAQkBFg1wa2lAaHMtdWxtLmRlMB4XDTA5MDcyMTEyNDQwOFoXDTE0MDcy
-MDEyNDQwOFowgYYxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRl
-bWJlcmcxDDAKBgNVBAcTA1VsbTEXMBUGA1UEChMOSG9jaHNjaHVsZSBVbG0xGTAX
-BgNVBAsTEElNWiBCYXNpc2RpZW5zdGUxGDAWBgNVBAMTD2xvZ2luLmhzLXVsbS5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJNagUx2/L3GVhnU5nJP
-RLnuRxtl18QoMX84C4/UOXzeWWNMPUMz6DmsiAYw+V/cv9W7+v1eLiKT6zaPfrX8
-0sybfpevzdqUSKAlR0ioVa1M7GxlX5BJup6O7mh95mwubXRf+F7CTNIc0M2iUgrp
-LwT7ToZQZ2BLq8pgp7H0gIXM3A6YjaGIyi3DAMVoIGzMZqwQIJyenGnUzt4GAO9m
-HMk09X5Uh6qJrIHl3YVSi/EOYoFMKz+Gj7yHt5+uNJdr6K9l+MpU0wcjcXAlfqVT
-NhVknljVHQM/F9qE+eiJoIaKRY+vXhjEN0Tt4D+QzIcnzeU3S3qOeDpjQZQ7xZQD
-DCMCAwEAAaOCAbUwggGxMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZGE6kFyTIlqIuIX7Yj2w
-SVL/L4MwHwYDVR0jBBgwFoAUipDUKZ6ZmPnHrOTgHKQOsqU0x48wHgYDVR0RBBcw
-FYETZ2xvZWNrbGVyQGhzLXVsbS5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4oDag
-NIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy11bG0tY2EvcHViL2NybC9jYWNy
-bC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2hzLXVsbS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQgYI
-KwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtdWxtLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAe1m1ZLRkq2Fg5rud
-ZxyR2qYeWePf8R3u3wgaeT5KEXLyzkXG0+J8ux51sSMqQmcXQlIZA1HR34YojJBb
-NRb/GJbj1e9Tz4v4Bo09YW0KNNajoKxCoSbksgl8HsWT24RdRBukj6wJ5R6KiP2X
-8j0n/txs4n/Gcu5lxXm/KQlOUQk+0SBcBko2mco/GukqDhfDjPPZuRlJD/1e/JZG
-aIS6St6S0XcrQdDUu+rTLmOjHxAYCUsq0qhdZCRxZ0f526NKc6HBHUWEGckYJxUM
-vcw/dglKct7tC3T3RCJlCS2eQUjc7mGrB8gUc0hZkFZOkyj5tlm5mmWRdoMooann
-hGoTVw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.hs-ulm.de:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.hs-ulm.de:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Ulm (Hochschule für Technik)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Ulm</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-ulm.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Thomas</GivenName>
-    <SurName>Gloeckler</SurName>
-    <EmailAddress>gloeckler@hs-ulm.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Gloeckler</SurName>
-    <EmailAddress>gloeckler@hs-ulm.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.icermali.org-idp-shibboleth.xml b/swamid-interfederations-2.0/login.icermali.org-idp-shibboleth.xml
deleted file mode 100644
index b4d51a38..00000000
--- a/swamid-interfederations-2.0/login.icermali.org-idp-shibboleth.xml
+++ /dev/null
@@ -1,157 +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://login.icermali.org/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login.icermali.org/federation/error" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icermali.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ICER - Mali</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://login.icermali.org/federation/info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://login.icermali.org/federation/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://login.icermali.org/federation/ui/logo/icermalilogo80x60.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>
-MIIC/TCCAeWgAwIBAgIJAP/E5zTtSKQRMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
-BAMMEmxvZ2luLmljZXJtYWxpLm9yZzAeFw0xNTA1MDcyMDI3NDBaFw0yNTA1MDQy
-MDI3NDBaMB0xGzAZBgNVBAMMEmxvZ2luLmljZXJtYWxpLm9yZzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMmPB0HebXfTLmw98ZpK7/LWJ+mH+XJF/4x8
-woQyRPox4C6LCRRM9CsFzHz9qZ1tJpRAjfzS47fexijeB9ZObEKajP4URe5rpOOz
-8d7qdp3KqylKCxKw+bvqaJQ1ki4QRxJBkKx9jcMc99yUomEEA5imBW/Q419+TkH/
-stLPzZmVKlaLOM1uqsHuo6PRORIcWkJ6HB0H0CNhKzB5gKGjCXvwkJ3kPGYjjFwQ
-7SnwzDawZCPpxMwQupPpc8TH0287A5w5PeXLrtuPU+WhLk1DcEVj1lhRv5/zZ5Je
-JsY492CUPrtyXm34/KJZFs7be81lE0Neeb0714lVeFgkjqz0VAcCAwEAAaNAMD4w
-HQYDVR0OBBYEFBOih/OT84Yk6H1pTl0LqwzhJS8rMB0GA1UdEQQWMBSCEmxvZ2lu
-LmljZXJtYWxpLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAZjNezwo9xN9fHKzyzx9A
-QAGWEmW7Td/n//vAAinYrjvp2E/yw3JExB55W500cemxLGM2pErzF9w62GE52Ryx
-0+HI4/CMCpkv55NLDl3bMbmlGIpE5kjpMsSOZ+gfQ0dAlGbacfjBExWZ0HqkN/l2
-kvYEKN0LukZkGOV3FAx77qr/uoKJTn6lDpQ/W+Yslt4eDo9SqGPZf/hwDvG50bIb
-IQOJxWPA3xS0JvEmdZRpcZzjo8quu4BM4J/FpBxCfLuEuNlhost8CuuYSphn10DQ
-b8J09UEArwi0vrZHClp0AanLon5PFgAkiXyT892CPD+Syo1ZFFMpB6JClp4Qh5cJ
-sQ==
-          </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>
-MIIC/TCCAeWgAwIBAgIJAIEHUdC/eXeBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
-BAMMEmxvZ2luLmljZXJtYWxpLm9yZzAeFw0xNTA1MDcyMDI2MzBaFw0yNTA1MDQy
-MDI2MzBaMB0xGzAZBgNVBAMMEmxvZ2luLmljZXJtYWxpLm9yZzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAORvgT83hFUOb+C8kxgd3f5R3Q26QODxysFY
-85D8/feOde9hoyZ5nV6gOy4EIybFGCJhpI9XWsLDSNULYrzqK3PjH118zCoHc7Qz
-bskZTOWp+O/i3EZfYnY4EJSMeyGSHLjEQsxDXV1AZupk9zVqwFJFFDKBgNQzqMN9
-5tC0kCIyv8UTuogInzx1FYp2QptEai1a3HRrB3vF8n+uD6oFUWw1oPVpx3mNOnBJ
-e4FmEkQg8iq3PnbFYmljEeEzxK+1Wh+BbiX+2IoTmbDqvBc2KtSoS0xoMC3wL8uR
-1u12QnXQ9g6gOiebZ6b189HgNvtwQClzevYA8qc7yHc3oVKe9p8CAwEAAaNAMD4w
-HQYDVR0OBBYEFKo1xcaGTEzrtnFzsA/5sWSDcPx0MB0GA1UdEQQWMBSCEmxvZ2lu
-LmljZXJtYWxpLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAqybun7p6dZqscYKiuphs
-x8BNZlSrBBDvH4sooDsmd+lVseuvTRrea1Jqw9pE+qmJuhaV5xBUyGrk3Bq+T5qz
-h4cUbdUWNdUmGpf90Pzl2YmaaYWny81zNh/UtvnyR/kMJaGmAuInhA3jkoOQ5W1i
-qC8+CU4C7E3PNpBU8tx3U3ZKwojStWpiiz82uoxewYxy1xla3hfVV7d0isR8YJhD
-+jdOFJW2BEwPt1YKpmEp3OCkiXBJJ++p2/ptoYWDwm3or+TLCQi8FGjr4MTUBkDO
-O1GdrLusEqTXS0x86NfP8+J63P3Gd3iwpmHnFvuYu2OVDVeLas+nHQVkThNbnqN8
-cQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.icermali.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.icermali.org/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.icermali.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.icermali.org/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.icermali.org/idp/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icermali.org</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC/TCCAeWgAwIBAgIJAP/E5zTtSKQRMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
-BAMMEmxvZ2luLmljZXJtYWxpLm9yZzAeFw0xNTA1MDcyMDI3NDBaFw0yNTA1MDQy
-MDI3NDBaMB0xGzAZBgNVBAMMEmxvZ2luLmljZXJtYWxpLm9yZzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMmPB0HebXfTLmw98ZpK7/LWJ+mH+XJF/4x8
-woQyRPox4C6LCRRM9CsFzHz9qZ1tJpRAjfzS47fexijeB9ZObEKajP4URe5rpOOz
-8d7qdp3KqylKCxKw+bvqaJQ1ki4QRxJBkKx9jcMc99yUomEEA5imBW/Q419+TkH/
-stLPzZmVKlaLOM1uqsHuo6PRORIcWkJ6HB0H0CNhKzB5gKGjCXvwkJ3kPGYjjFwQ
-7SnwzDawZCPpxMwQupPpc8TH0287A5w5PeXLrtuPU+WhLk1DcEVj1lhRv5/zZ5Je
-JsY492CUPrtyXm34/KJZFs7be81lE0Neeb0714lVeFgkjqz0VAcCAwEAAaNAMD4w
-HQYDVR0OBBYEFBOih/OT84Yk6H1pTl0LqwzhJS8rMB0GA1UdEQQWMBSCEmxvZ2lu
-LmljZXJtYWxpLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAZjNezwo9xN9fHKzyzx9A
-QAGWEmW7Td/n//vAAinYrjvp2E/yw3JExB55W500cemxLGM2pErzF9w62GE52Ryx
-0+HI4/CMCpkv55NLDl3bMbmlGIpE5kjpMsSOZ+gfQ0dAlGbacfjBExWZ0HqkN/l2
-kvYEKN0LukZkGOV3FAx77qr/uoKJTn6lDpQ/W+Yslt4eDo9SqGPZf/hwDvG50bIb
-IQOJxWPA3xS0JvEmdZRpcZzjo8quu4BM4J/FpBxCfLuEuNlhost8CuuYSphn10DQ
-b8J09UEArwi0vrZHClp0AanLon5PFgAkiXyT892CPD+Syo1ZFFMpB6JClp4Qh5cJ
-sQ==
-          </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>
-MIIC/TCCAeWgAwIBAgIJAIEHUdC/eXeBMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
-BAMMEmxvZ2luLmljZXJtYWxpLm9yZzAeFw0xNTA1MDcyMDI2MzBaFw0yNTA1MDQy
-MDI2MzBaMB0xGzAZBgNVBAMMEmxvZ2luLmljZXJtYWxpLm9yZzCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAORvgT83hFUOb+C8kxgd3f5R3Q26QODxysFY
-85D8/feOde9hoyZ5nV6gOy4EIybFGCJhpI9XWsLDSNULYrzqK3PjH118zCoHc7Qz
-bskZTOWp+O/i3EZfYnY4EJSMeyGSHLjEQsxDXV1AZupk9zVqwFJFFDKBgNQzqMN9
-5tC0kCIyv8UTuogInzx1FYp2QptEai1a3HRrB3vF8n+uD6oFUWw1oPVpx3mNOnBJ
-e4FmEkQg8iq3PnbFYmljEeEzxK+1Wh+BbiX+2IoTmbDqvBc2KtSoS0xoMC3wL8uR
-1u12QnXQ9g6gOiebZ6b189HgNvtwQClzevYA8qc7yHc3oVKe9p8CAwEAAaNAMD4w
-HQYDVR0OBBYEFKo1xcaGTEzrtnFzsA/5sWSDcPx0MB0GA1UdEQQWMBSCEmxvZ2lu
-LmljZXJtYWxpLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAqybun7p6dZqscYKiuphs
-x8BNZlSrBBDvH4sooDsmd+lVseuvTRrea1Jqw9pE+qmJuhaV5xBUyGrk3Bq+T5qz
-h4cUbdUWNdUmGpf90Pzl2YmaaYWny81zNh/UtvnyR/kMJaGmAuInhA3jkoOQ5W1i
-qC8+CU4C7E3PNpBU8tx3U3ZKwojStWpiiz82uoxewYxy1xla3hfVV7d0isR8YJhD
-+jdOFJW2BEwPt1YKpmEp3OCkiXBJJ++p2/ptoYWDwm3or+TLCQi8FGjr4MTUBkDO
-O1GdrLusEqTXS0x86NfP8+J63P3Gd3iwpmHnFvuYu2OVDVeLas+nHQVkThNbnqN8
-cQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.icermali.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ICER - Mali</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
-    <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.iceruganda.org-idp-shibboleth.xml b/swamid-interfederations-2.0/login.iceruganda.org-idp-shibboleth.xml
deleted file mode 100644
index 660d50e6..00000000
--- a/swamid-interfederations-2.0/login.iceruganda.org-idp-shibboleth.xml
+++ /dev/null
@@ -1,157 +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://login.iceruganda.org/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login.iceruganda.org/federation/error" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iceruganda.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ICER - Uganda</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://login.iceruganda.org/federation/info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://login.iceruganda.org/federation/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://login.iceruganda.org/federation/ui/logo/icerugandalogo80x60.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>
-MIIDAzCCAeugAwIBAgIJAMx+qfsrxTy3MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMMFGxvZ2luLmljZXJ1Z2FuZGEub3JnMB4XDTE1MDUwNzIwMDYzN1oXDTI1MDUw
-NDIwMDYzN1owHzEdMBsGA1UEAwwUbG9naW4uaWNlcnVnYW5kYS5vcmcwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB5PvpRc9pdE99+SlCG07pmyLVUR9/
-DnCg7EJWDYvzC04NCZzGigRKlDU8BjX6eM227HaqsBpuFYT+WKHR58oqEnqhXlNB
-A4Tr9hfAvaaLLdoMGCR7qb7CLpwUAkcki7l+9difqEQ/wt7CN+B3QaqKpt3Q4JKM
-geK6ybH7borIFwQ5CjHbKJvcz8S8FTItTVgIGGufBSBHYLN899QafdNRMNklyaQc
-h+FY81sh1MecaSxf3LbLH0vEgWZgEI+1VDXpNBVLs1PeOXzF3XRXUl4TVFMIbwXj
-bqbk4luqC2mgOumhFjt5l8GlWd6qaHH9skdAtTBVyZYAZCWsAuwpxSaVAgMBAAGj
-QjBAMB0GA1UdDgQWBBQVxLfBPzQonEfKhhr/XpHlJl3sOjAfBgNVHREEGDAWghRs
-b2dpbi5pY2VydWdhbmRhLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAkWQiuIfo/w0C
-33m2GZZM5/KBO8ndkfHQsaVhxqw+BADemU0lzHKMDnsNsYcIjRbQ0vhpGw3ioe2U
-FYEUpw8cz+kgOi0mTxpngwWQEFmNV5JLXVfYLNu/ZY2bwiTJHkT2M1EFpz4x96ou
-cAeLUlcMF23bgwTF+u0mS+JVMUbpUmr7/YoRF32F0nU1NorSEffdMtJGvdiAoIue
-UA2aWOI0QLY0u9SzjDfLu/izfY31SBGFezTKoTJjFvp0ix4xhx0uDrkAhXOx/Ji7
-Btg/mqYjzfnR35ziLKAB7wcG7ldYEp7NOy2dMUk21w6x0HVVXbPtwO6Dl+9jf4tW
-nWg+uFqEKQ==
-          </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>
-MIIDAzCCAeugAwIBAgIJAOV+XCm7XZ1cMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMMFGxvZ2luLmljZXJ1Z2FuZGEub3JnMB4XDTE1MDUwNzIwMTM0MVoXDTI1MDUw
-NDIwMTM0MVowHzEdMBsGA1UEAwwUbG9naW4uaWNlcnVnYW5kYS5vcmcwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDV4UwuEyE4qPYvWH53bd3cYGZQrN63
-kaCSFrxio9rJfB6PFCJKmZv+JuXhMyGzDoxXrr5iew/jguZZU3XW/MXE4243YdrM
-UoPuhEWkZgIvPQq4Qf+Q2WJFeap5/lgoAwksi0uwz5otU8034LLhCWhGKTIwbJc7
-UvW9iZXZrzdv/c/iFBgY2NMEzvNP8gZUqhBSOj9KMKNpRJmUOY7QFicpGxfefPEy
-ehA3xJqUY34+5OQrUwAxuQdS4QQTPPHMCs/3lUBPKOSaxELSbfIQmPhLD4NwXLSw
-fNCYcWz8ZaqaZTEkyx4nGOOwyNCGhV/No9GZB7NbazcDbwFcR6BiHGSxAgMBAAGj
-QjBAMB0GA1UdDgQWBBTbgNwoTdyYFjL1vmL+8TOsz8a4TDAfBgNVHREEGDAWghRs
-b2dpbi5pY2VydWdhbmRhLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAhwlWcbzYH1Wv
-HkvT16CAk0XkB40tOGqRDIoiqNug2+xjn95uu7z+hj5Nu3lqLsdHmWzExSvz+ljF
-U4FHz2iKsJA2AfIBYweulrC6v87giPF/lpe7IliZh1xjzYwecfmG4Fy+uAqy3dOP
-KiQStmp3O75dFLttP1Ps8EvWpzeOybx7sM1Tbkq5B1OKvAkZzO6ZQ1Vk8pf2/AS/
-rv+/S1JWmYL0m2zX26MZIGzkdiEEQ+E979NF2tENKRFQ4/tVBWieMgwDXj8ueshs
-XFFuLjqh9cAsGDHv3B+Elm2QjpsbKtq4Pa8jG322UixM3w5Y3t1KhP73BiWjUCYf
-xX3P5EdlXw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.iceruganda.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.iceruganda.org/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.iceruganda.org/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.iceruganda.org/idp/profile/SAML2/SOAP/ECP"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.iceruganda.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iceruganda.org</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDAzCCAeugAwIBAgIJAMx+qfsrxTy3MA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMMFGxvZ2luLmljZXJ1Z2FuZGEub3JnMB4XDTE1MDUwNzIwMDYzN1oXDTI1MDUw
-NDIwMDYzN1owHzEdMBsGA1UEAwwUbG9naW4uaWNlcnVnYW5kYS5vcmcwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB5PvpRc9pdE99+SlCG07pmyLVUR9/
-DnCg7EJWDYvzC04NCZzGigRKlDU8BjX6eM227HaqsBpuFYT+WKHR58oqEnqhXlNB
-A4Tr9hfAvaaLLdoMGCR7qb7CLpwUAkcki7l+9difqEQ/wt7CN+B3QaqKpt3Q4JKM
-geK6ybH7borIFwQ5CjHbKJvcz8S8FTItTVgIGGufBSBHYLN899QafdNRMNklyaQc
-h+FY81sh1MecaSxf3LbLH0vEgWZgEI+1VDXpNBVLs1PeOXzF3XRXUl4TVFMIbwXj
-bqbk4luqC2mgOumhFjt5l8GlWd6qaHH9skdAtTBVyZYAZCWsAuwpxSaVAgMBAAGj
-QjBAMB0GA1UdDgQWBBQVxLfBPzQonEfKhhr/XpHlJl3sOjAfBgNVHREEGDAWghRs
-b2dpbi5pY2VydWdhbmRhLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAkWQiuIfo/w0C
-33m2GZZM5/KBO8ndkfHQsaVhxqw+BADemU0lzHKMDnsNsYcIjRbQ0vhpGw3ioe2U
-FYEUpw8cz+kgOi0mTxpngwWQEFmNV5JLXVfYLNu/ZY2bwiTJHkT2M1EFpz4x96ou
-cAeLUlcMF23bgwTF+u0mS+JVMUbpUmr7/YoRF32F0nU1NorSEffdMtJGvdiAoIue
-UA2aWOI0QLY0u9SzjDfLu/izfY31SBGFezTKoTJjFvp0ix4xhx0uDrkAhXOx/Ji7
-Btg/mqYjzfnR35ziLKAB7wcG7ldYEp7NOy2dMUk21w6x0HVVXbPtwO6Dl+9jf4tW
-nWg+uFqEKQ==
-          </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>
-MIIDAzCCAeugAwIBAgIJAOV+XCm7XZ1cMA0GCSqGSIb3DQEBCwUAMB8xHTAbBgNV
-BAMMFGxvZ2luLmljZXJ1Z2FuZGEub3JnMB4XDTE1MDUwNzIwMTM0MVoXDTI1MDUw
-NDIwMTM0MVowHzEdMBsGA1UEAwwUbG9naW4uaWNlcnVnYW5kYS5vcmcwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDV4UwuEyE4qPYvWH53bd3cYGZQrN63
-kaCSFrxio9rJfB6PFCJKmZv+JuXhMyGzDoxXrr5iew/jguZZU3XW/MXE4243YdrM
-UoPuhEWkZgIvPQq4Qf+Q2WJFeap5/lgoAwksi0uwz5otU8034LLhCWhGKTIwbJc7
-UvW9iZXZrzdv/c/iFBgY2NMEzvNP8gZUqhBSOj9KMKNpRJmUOY7QFicpGxfefPEy
-ehA3xJqUY34+5OQrUwAxuQdS4QQTPPHMCs/3lUBPKOSaxELSbfIQmPhLD4NwXLSw
-fNCYcWz8ZaqaZTEkyx4nGOOwyNCGhV/No9GZB7NbazcDbwFcR6BiHGSxAgMBAAGj
-QjBAMB0GA1UdDgQWBBTbgNwoTdyYFjL1vmL+8TOsz8a4TDAfBgNVHREEGDAWghRs
-b2dpbi5pY2VydWdhbmRhLm9yZzANBgkqhkiG9w0BAQsFAAOCAQEAhwlWcbzYH1Wv
-HkvT16CAk0XkB40tOGqRDIoiqNug2+xjn95uu7z+hj5Nu3lqLsdHmWzExSvz+ljF
-U4FHz2iKsJA2AfIBYweulrC6v87giPF/lpe7IliZh1xjzYwecfmG4Fy+uAqy3dOP
-KiQStmp3O75dFLttP1Ps8EvWpzeOybx7sM1Tbkq5B1OKvAkZzO6ZQ1Vk8pf2/AS/
-rv+/S1JWmYL0m2zX26MZIGzkdiEEQ+E979NF2tENKRFQ4/tVBWieMgwDXj8ueshs
-XFFuLjqh9cAsGDHv3B+Elm2QjpsbKtq4Pa8jG322UixM3w5Y3t1KhP73BiWjUCYf
-xX3P5EdlXw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.iceruganda.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ICER - Uganda</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
-    <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.xml
deleted file mode 100644
index 4139fce7..00000000
--- a/swamid-interfederations-2.0/login.idp.eduid.se-idp.xml.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://login.idp.eduid.se/idp.xml">
-  <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="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</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">eduid.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">eduID</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">eduID</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">eduID är en gemensam inloggning för din utbildning</mdui:Description>
-        <mdui:Description xml:lang="en">eduID gives you a common login for your education</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.eduid.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.eduid.se</mdui:InformationURL>
-        <mdui:Logo height="120" width="320" xml:lang="sv">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
-        <mdui:Logo height="120" width="320" xml:lang="en">https://eduid.se/static/img/ds-eduID-logo-black320x120px.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.eduid.se/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">eduID+studentIdP</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">eduID+studentIdP</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
-RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
-MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
-EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
-AAOCAT8AMIIBOgKCATEA2bUN2oo9TywdepzbH9HIDwajUBkfAJl2Map2uvW5zaRQ
-eTQrTRSNsxXOmdx4VP/Ex2enSv5h15ggbLkppAKNkgDiNTaad5BcABHmOXUud7Jq
-G6/miLbXnOY2r4hqJguCqSIeP3Zd+2XjGrFVS67bfRNxyrVN/dJ71X0emdA7Y6fR
-dBRbGkjDmCg+pok4+QFtVsrlyEpOlUvug61GllJ0QsayHV31qmXWyqVDsSYIonGU
-F/BcJVeUi90cQ6anbZvmcF2Mf/ZgLBH11yIDC2H0/4+iqX1MTpcgi82keNTPq6Tx
-JXEWB8Is7I2FXaDbelxTrzfuG9Ii/0amXye6KPTHtnXkLLaD+IT2vR2Z2kGBKcZa
-fEpI8bkTdXiLt36iXhYDTY68ybN31FgaxKEsnOjvvwIDAQABo0AwPjAMBgNVHRMB
-Af8EAjAAMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFHW/jDUAIDiwRGb4EMEV
-5h1IHrWNMA0GCSqGSIb3DQEBCwUAA4IBMQCcACcgnGmR78mSErbK8DZuAUcP58So
-ri5TnvBLHP1XiqkyBS085HG4nmBsa7kWvf9iULjnJztM/4Ws6+32vMZIYoQgg7P2
-cd48ZElpm2FqpTz6gtKw+kvEhY5Aip0RZY+GxUHgGoYMbF7ONMVebZtBN8K8XJgh
-q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
-eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
-FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
-iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDhjCCAj6gAwIBAgIEUyr2WTANBgkqhkiG9w0BAQsFADA0MQswCQYDVQQGEwJT
-RTEOMAwGA1UEChMFU1VORVQxFTATBgNVBAMTDGlkcC5lZHVpZC5zZTAeFw0xNDAz
-MjAxNDA4MjZaFw0yNDAzMTcxNDA4MzVaMDQxCzAJBgNVBAYTAlNFMQ4wDAYDVQQK
-EwVTVU5FVDEVMBMGA1UEAxMMaWRwLmVkdWlkLnNlMIIBUjANBgkqhkiG9w0BAQEF
-AAOCAT8AMIIBOgKCATEA2bUN2oo9TywdepzbH9HIDwajUBkfAJl2Map2uvW5zaRQ
-eTQrTRSNsxXOmdx4VP/Ex2enSv5h15ggbLkppAKNkgDiNTaad5BcABHmOXUud7Jq
-G6/miLbXnOY2r4hqJguCqSIeP3Zd+2XjGrFVS67bfRNxyrVN/dJ71X0emdA7Y6fR
-dBRbGkjDmCg+pok4+QFtVsrlyEpOlUvug61GllJ0QsayHV31qmXWyqVDsSYIonGU
-F/BcJVeUi90cQ6anbZvmcF2Mf/ZgLBH11yIDC2H0/4+iqX1MTpcgi82keNTPq6Tx
-JXEWB8Is7I2FXaDbelxTrzfuG9Ii/0amXye6KPTHtnXkLLaD+IT2vR2Z2kGBKcZa
-fEpI8bkTdXiLt36iXhYDTY68ybN31FgaxKEsnOjvvwIDAQABo0AwPjAMBgNVHRMB
-Af8EAjAAMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFHW/jDUAIDiwRGb4EMEV
-5h1IHrWNMA0GCSqGSIb3DQEBCwUAA4IBMQCcACcgnGmR78mSErbK8DZuAUcP58So
-ri5TnvBLHP1XiqkyBS085HG4nmBsa7kWvf9iULjnJztM/4Ws6+32vMZIYoQgg7P2
-cd48ZElpm2FqpTz6gtKw+kvEhY5Aip0RZY+GxUHgGoYMbF7ONMVebZtBN8K8XJgh
-q/vNNO18HxFYokk+moCvt4Xlb8VQd1GqKRFAMV3Rn1R6nSEQVJk+HwgHsIdi2jzu
-eAjhkXBwzFSlrxZa0Z7r7nUVIN4Qy6L6wJCLC6unM1kjnGqq0A8qw4G9LfutuWUK
-FqMGzujZEp0CP/EwJiAlJMy5FxJGyWsaUQduod0yFqYLHxLP72/Fuo+eTRyM3Ugh
-iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.eduid.se/slo/soap"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/slo/post"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/slo/redirect"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/sso/redirect"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/sso/post"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">eduID</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">eduID</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.eduid.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>eduID</md:Company>
-    <md:SurName>Valter Nordh</md:SurName>
-    <md:EmailAddress>mailto:valter@sunet.se</md:EmailAddress>
-    <md:TelephoneNumber>+46707884742</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>eduID</md:Company>
-    <md:SurName>SUNET eduID team</md:SurName>
-    <md:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>eduID</md:Company>
-    <md:SurName>eduID Support</md:SurName>
-    <md:EmailAddress>mailto:support@eduid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b43ae321..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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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://login.idp.hhs.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.idp.hhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.hhs.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhs.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.idp.hhs.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HHS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hhs.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Handelshögskolan i Stockholm</md:Company>
-    <md:EmailAddress>mailto:itsupport@hhs.se</md:EmailAddress>
-  </md: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 7158b130..00000000
--- a/swamid-interfederations-2.0/login.insa-lyon.fr-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://login.insa-lyon.fr/idp/shibboleth">
-  <md: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>
-  </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 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 Lyon</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABeUlEQVQoz93SzyuDcRwH8M/n63m2pzYPYonNEjOSdlguLjgpSSNFSTn4NQ7+A+VAjshJoUgc5ELGhYz8Kg6TWhqG8utgvx7PtmfPs+/XhT9gFwfv8/t1eNcbGWOQSUhG7b8BkRpbcnMj2tQQqS4FSsMiKjvbiaWFT8QQorLnAQB5fCxcYVaXFlxdXRx9fwZKWShE/U/pWz+VgL6+xAeHDWur2tWl1NyiZ0yZnUCLjXgPqhwOArwAiEAI2q2K14tGAF4HAMm5aZ2rrYAxSCRYBIR+t7yyXud0/m5IJvQDI6nlRTAY0Jid+xhkd76v+sZYd6d67QMAoaeXAYhnJ9wP0DQsNgMwIFz6PgBcVo7/LT41mZqfUcrK0ZwXqTRBkVidn0/gXWKqyj6CIMt69yh7i6IgyO0dX0N92uE+Flu13S1SZBEvAiwcM95cY3LXw9nt6eADsZQQk0k9PeUcDuT51PERCoK+1aXseUhhIe+sVc/PqBTD/3CNTME3BUSfUsHufLQAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDQrMDI6MDAgd+YlAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjA0KzAyOjAwUSpemQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.insa-lyon.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">everyone at INSA Lyon</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">INSA Lyon</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">toutes population (etudiants/personnels) de l'INSA Lyon</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>
-					      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>
-    </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-POST" Location="https://login.insa-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.insa-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.insa-lyon.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INSA Lyon</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INSA Lyon</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.insa-lyon.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Olivier FRANCO</md:SurName>
-    <md:EmailAddress>olivier.franco@insa-lyon.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Damien BERJOAN</md:SurName>
-    <md:EmailAddress>damien.berjoan@insa-lyon.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.justis.com.xml b/swamid-interfederations-2.0/login.justis.com.xml
deleted file mode 100644
index b5ad0216..00000000
--- a/swamid-interfederations-2.0/login.justis.com.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://login.justis.com">
-  <!--
-		This is an OpenAthens SP for Justis Publishing Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEADCCAuigAwIBAgIJAOUEkaPJ2Bd5MA0GCSqGSIb3DQEBBQUAMIGAMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECAwGTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xHjAcBgNV
-						BAoMFUp1c3RpcyBQdWJsaXNoaW5nIEx0ZDEUMBIGA1UECwwLRGV2ZWxvcG1lbnQx
-						GTAXBgNVBAMMEGxvZ2luLmp1c3Rpcy5jb20wHhcNMTEwNzE4MTQ1MTMzWhcNMjEw
-						NzE1MTQ1MTMzWjCBgDELMAkGA1UEBhMCR0IxDzANBgNVBAgMBkxvbmRvbjEPMA0G
-						A1UEBwwGTG9uZG9uMR4wHAYDVQQKDBVKdXN0aXMgUHVibGlzaGluZyBMdGQxFDAS
-						BgNVBAsMC0RldmVsb3BtZW50MRkwFwYDVQQDDBBsb2dpbi5qdXN0aXMuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3w8g9C9ESGQ0H2JeatthhPcG
-						Ev3dywh7L27cbXmFL5yB8trjZRo6BfREpv4FRSgWlboRh62N/CQLHP6eF3gngSjR
-						aO3ERVm8KNKHmXXrhn4jP4EZYIFjXkO3MYYML4zdzgLWi2s9xbjN+ehQz/Hnvr9d
-						w0n9pSMhWTyW4R0Hprgdf/KhssKKTIILXFgbzGrMTvATtCUbWhbY0eKOlrzVwgxZ
-						Ttt+1twitnAtG7L88X78NcwE49rKbMRFLcnLmXFF0nb71d2srGBwMDHJ4SagIRcR
-						ZZH/pjICbkuB0JzFUjnYYv7OGnHyxbSU6irjXB4Ci433KxArlBKtLS4w5agHKQID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU2ZuXN7VAgmrTrBEbRUT6AI3pPmsw
-						HwYDVR0jBBgwFoAU2ZuXN7VAgmrTrBEbRUT6AI3pPmswDQYJKoZIhvcNAQEFBQAD
-						ggEBAIyTpXAbDuMXIX49higmZ25epvKjkmgBcmMZnGayDUKwUD8PkzXt8g0BzywD
-						seFZvib6KXOGSV2vxvKnhvwMacmpwFEXX90xyBdCt+DuLlpL6BmT9LdAANsdQHuC
-						qOiB5SbfVRjDmDwXwLFaWMzu9UN+JP763GBPpMTkk+riHTNyC/n8FO5UWYUwuTyU
-						/bY2QdSNZKtnrbGDlwWELTISsdCOz0ki4XRd0/WquIqcjfVTW+zGiQQuSIAWDx9Q
-						NIvd6OcCOBRPMOvpQ4W5ZAMlO7++IzhzP7s2kHgb6yXBWvzJQx8aK8C1aE2eBBJK
-						+Y+kE//yTUdY4YMzolvRCyf44z8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.justis.com/shibboleth/post" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.justis.com/shibboleth/artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signin.justis.com/oa/auth/rcv/shib/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://signin.justis.com/oa/auth/rcv/shib/art" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.justis.com/oa/auth/rcv/saml2/post" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://signin.justis.com/oa/auth/rcv/saml2/art" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signin.justis.com/shibboleth/post" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://signin.justis.com/shibboleth/artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.justis.com/oa/auth/rcv/shib/post" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.justis.com/oa/auth/rcv/shib/art" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.justis.com/oa/auth/rcv/saml2/post" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.justis.com/oa/auth/rcv/saml2/art" index="12"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Justis Publishing</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"/>
-      <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">Justis Publishing Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Justis Publishing</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.justispublishing.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@justis.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ravi</GivenName>
-    <SurName>Ganapathi</SurName>
-    <EmailAddress>mailto:ravi.ganapathi@justis.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ki.se-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ki.se-idp-shibboleth.xml
deleted file mode 100644
index d25b1f60..00000000
--- a/swamid-interfederations-2.0/login.ki.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.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:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <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 (endast nya Ladok)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karolinska Institutet (only new Ladok)</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://login.ki.se/images/ki_logo_292x146.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
-      </mdui: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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUSr91KhOWgx1LLaoQAw69hE2zxN8wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
-MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJ+xNQGjVs6rbJym13yai5iPGLhcXcDFhs2dcckk
-9SnhS0oEhHEPdwn9iwtkXbDaQCdlPzKw1lAQ4PFeqeynh3bM/GNz5RLQp3Fiac1b
-n2MiUEK6Xj2T+5XZklJHwsXnAP5FrPfsXLJ8kbDU7cS7aQ9b+8xqs+YNjIzZzEAx
-OGQp7/zwHTFejWc0GfxrARc+L5xwlXyQGRFjGQAs8Ka+WlV5MhyZFnHV81+/O4Xu
-gztzKuC2i0QKt46S1hep2Za8KxmWfN1pzWG8hnJHFWYOtRuKmTs4tF6ln03c72zF
-0wZ0zv5VKsplRd7ZGozJ275i0gntt233X9RoBM9rGYVBkaMCAwEAAaNdMFswHQYD
-VR0OBBYEFBqgkKxTUPlSShbr1NxOyLvrWkljMDoGA1UdEQQzMDGCC2xvZ2luLmtp
-LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQAB7enC9iTTTfKZXUFtdXPEEJte/x3VembkSftwr+sK1EtDezIB
-R8LUsMqovpC771JmJbhkEVNtErfG9cwyKC3g0oWRY5U02jGxuxcq7yEh6/bTIZ0R
-nx88SX0+V9jMDfQKBFhljKCuozq70dGtApXm8bmuvBPe5gQ9+NaSKWkniOPv+zOS
-wOUUvi/8r6AE7PtCXn6uydqUcEo/oh8OMZOVx0siApLrG6NwZpGUz6l8mqH00zd5
-Lslkb6jUsVBP2o/ORnwRlgY0I4491wMALYaplSMa1LUZPyB7Iv5IuHkybBEYy+mY
-GzAYjGQSD2+4EUgB8f7vuxJSjRnfmVUmh6cB
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUQnJmXS4G/tbR42ca8QG480l3MMEwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
-MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJA5FGj3sWcneuNuMoqgT9nQ07FAXKdSnDtfASMq
-0ZyaxyLJbOlKyRRzy8okbWTAhuI98JvuvGsSjg2dXCvRFKI/fF5pXn70enux0Svk
-NUvZdnr38noCyEVpTUpSMjDrHF9V1FDAloJ65zbRepdHU4Sv9di5Vy9ppAo4VrLw
-iR2AXS7EFQ39aIm37xPIQz2M0HXBERVCQHOg51LrwNnMCVE1I70s28qYzI3wo/0p
-HfD9qWqnqIz8Fr1UHCDGArJN1YhQJZbWlN2KBndl3Ike4obeDxQFnS707l8B1Hnh
-ceV8ohgtK82bASKSVCJ1Z7w+CAGAhABqc8DCJ599mTDzm78CAwEAAaNdMFswHQYD
-VR0OBBYEFDrrD9A+XOKI8btkdBaO8hvc/vyMMDoGA1UdEQQzMDGCC2xvZ2luLmtp
-LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQBhpdosfvuPTuvAoK0jokVl7gqDW53KrRTD+BrJRoOGPBQ2DXVF
-TvQdmS/zymbrFghQr0XOzYLRa+fP6lfoNusBWKfL0Fyto8skicSNswYDG1zgF6HI
-03eHqhB5ma6u4rh3gAMwVcpyYCcrrJ2hbTI8BWXzZFaxXM9JaK7u2J8k5tGAccK1
-247NSR8LEai46HkZpovuKPjD9zwunV6mQeOXQeo3WtoPW0twB9h01sfqV0iMvaXg
-Tu4iUPkcwpIeauNAjJ4KXpl5OxehsBnz9rrb6smtz2bfWBBNiPHaHhT6XIqon5X1
-kEJEO2P16fM/dhzKIPEqH52zd3J8O6Hs1Cil
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUEEr81svYHmizs6DjzN0FCQ1IlLkwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
-MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMIJsWHFr/fc/26Dfv0WOBhspXfyRVGSHMu5IeRs
-reQGRKbrdW4KOOrKQkqZnyQVe8eZt/GZKSzy+9VnAJo3ypaUt2y0LsTqibcg7oNO
-RcC2yDKlEN8CCSX3OQrQ1kWRxHpMSaHx1TeWAPI9kB0CykeG6FmVYXG9arY9u9pn
-ZvdPCXg7SkFbTCa1zJdbxBCumq/nAKGiEct6GQHMeYOb9YBI+WYYByfseLdf5dNC
-i1fXuRYbxK9dcFIVlGuZRea99TklSZZR3BxFLHgcECjp1ZtoT0Byl2yxmm0nGJE2
-HKh+LsxAUz3ouG3qItUJPYzBS1RHQVWYz8N4T8z+w+1jEY0CAwEAAaNdMFswHQYD
-VR0OBBYEFKf0zzGixtPS531/l3z2Vc04g1seMDoGA1UdEQQzMDGCC2xvZ2luLmtp
-LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQA4PPWZd96F0l40muNxqPzVNzTq/D+ndRhEcPOxk8SraEXaFlkm
-xqELKuLnuj7MAx+y/SJssIs9acDm8CBxp60z9hSTkokVjVAfyWiTU+KuTGvwWWnP
-T25PheKwMPl+W45PhXfbK0F1nDXvNf2L59gxuBIJEcqojx6BHlLfz1tbQUCsezV4
-fv98gre6OoWeN5TSiWgtl7Gsb1cjFRcfiYNwDo9pWqNnLOioncMs4SOyEKrTxrU7
-rmABcIrDyPLSecdGrJBUBiYy1tTm72SEGK9npcZ8QPuXkkSf7zskTenf4tFszUnq
-BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ki.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ki.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ki.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ki.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUSr91KhOWgx1LLaoQAw69hE2zxN8wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
-MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJ+xNQGjVs6rbJym13yai5iPGLhcXcDFhs2dcckk
-9SnhS0oEhHEPdwn9iwtkXbDaQCdlPzKw1lAQ4PFeqeynh3bM/GNz5RLQp3Fiac1b
-n2MiUEK6Xj2T+5XZklJHwsXnAP5FrPfsXLJ8kbDU7cS7aQ9b+8xqs+YNjIzZzEAx
-OGQp7/zwHTFejWc0GfxrARc+L5xwlXyQGRFjGQAs8Ka+WlV5MhyZFnHV81+/O4Xu
-gztzKuC2i0QKt46S1hep2Za8KxmWfN1pzWG8hnJHFWYOtRuKmTs4tF6ln03c72zF
-0wZ0zv5VKsplRd7ZGozJ275i0gntt233X9RoBM9rGYVBkaMCAwEAAaNdMFswHQYD
-VR0OBBYEFBqgkKxTUPlSShbr1NxOyLvrWkljMDoGA1UdEQQzMDGCC2xvZ2luLmtp
-LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQAB7enC9iTTTfKZXUFtdXPEEJte/x3VembkSftwr+sK1EtDezIB
-R8LUsMqovpC771JmJbhkEVNtErfG9cwyKC3g0oWRY5U02jGxuxcq7yEh6/bTIZ0R
-nx88SX0+V9jMDfQKBFhljKCuozq70dGtApXm8bmuvBPe5gQ9+NaSKWkniOPv+zOS
-wOUUvi/8r6AE7PtCXn6uydqUcEo/oh8OMZOVx0siApLrG6NwZpGUz6l8mqH00zd5
-Lslkb6jUsVBP2o/ORnwRlgY0I4491wMALYaplSMa1LUZPyB7Iv5IuHkybBEYy+mY
-GzAYjGQSD2+4EUgB8f7vuxJSjRnfmVUmh6cB
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUQnJmXS4G/tbR42ca8QG480l3MMEwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
-MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJA5FGj3sWcneuNuMoqgT9nQ07FAXKdSnDtfASMq
-0ZyaxyLJbOlKyRRzy8okbWTAhuI98JvuvGsSjg2dXCvRFKI/fF5pXn70enux0Svk
-NUvZdnr38noCyEVpTUpSMjDrHF9V1FDAloJ65zbRepdHU4Sv9di5Vy9ppAo4VrLw
-iR2AXS7EFQ39aIm37xPIQz2M0HXBERVCQHOg51LrwNnMCVE1I70s28qYzI3wo/0p
-HfD9qWqnqIz8Fr1UHCDGArJN1YhQJZbWlN2KBndl3Ike4obeDxQFnS707l8B1Hnh
-ceV8ohgtK82bASKSVCJ1Z7w+CAGAhABqc8DCJ599mTDzm78CAwEAAaNdMFswHQYD
-VR0OBBYEFDrrD9A+XOKI8btkdBaO8hvc/vyMMDoGA1UdEQQzMDGCC2xvZ2luLmtp
-LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQBhpdosfvuPTuvAoK0jokVl7gqDW53KrRTD+BrJRoOGPBQ2DXVF
-TvQdmS/zymbrFghQr0XOzYLRa+fP6lfoNusBWKfL0Fyto8skicSNswYDG1zgF6HI
-03eHqhB5ma6u4rh3gAMwVcpyYCcrrJ2hbTI8BWXzZFaxXM9JaK7u2J8k5tGAccK1
-247NSR8LEai46HkZpovuKPjD9zwunV6mQeOXQeo3WtoPW0twB9h01sfqV0iMvaXg
-Tu4iUPkcwpIeauNAjJ4KXpl5OxehsBnz9rrb6smtz2bfWBBNiPHaHhT6XIqon5X1
-kEJEO2P16fM/dhzKIPEqH52zd3J8O6Hs1Cil
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUEEr81svYHmizs6DjzN0FCQ1IlLkwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLbG9naW4ua2kuc2UwHhcNMTUxMTEwMTMyNjU0WhcNMzUx
-MTEwMTMyNjU0WjAWMRQwEgYDVQQDDAtsb2dpbi5raS5zZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMIJsWHFr/fc/26Dfv0WOBhspXfyRVGSHMu5IeRs
-reQGRKbrdW4KOOrKQkqZnyQVe8eZt/GZKSzy+9VnAJo3ypaUt2y0LsTqibcg7oNO
-RcC2yDKlEN8CCSX3OQrQ1kWRxHpMSaHx1TeWAPI9kB0CykeG6FmVYXG9arY9u9pn
-ZvdPCXg7SkFbTCa1zJdbxBCumq/nAKGiEct6GQHMeYOb9YBI+WYYByfseLdf5dNC
-i1fXuRYbxK9dcFIVlGuZRea99TklSZZR3BxFLHgcECjp1ZtoT0Byl2yxmm0nGJE2
-HKh+LsxAUz3ouG3qItUJPYzBS1RHQVWYz8N4T8z+w+1jEY0CAwEAAaNdMFswHQYD
-VR0OBBYEFKf0zzGixtPS531/l3z2Vc04g1seMDoGA1UdEQQzMDGCC2xvZ2luLmtp
-LnNlhiJodHRwczovL2xvZ2luLmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQA4PPWZd96F0l40muNxqPzVNzTq/D+ndRhEcPOxk8SraEXaFlkm
-xqELKuLnuj7MAx+y/SJssIs9acDm8CBxp60z9hSTkokVjVAfyWiTU+KuTGvwWWnP
-T25PheKwMPl+W45PhXfbK0F1nDXvNf2L59gxuBIJEcqojx6BHlLfz1tbQUCsezV4
-fv98gre6OoWeN5TSiWgtl7Gsb1cjFRcfiYNwDo9pWqNnLOioncMs4SOyEKrTxrU7
-rmABcIrDyPLSecdGrJBUBiYy1tTm72SEGK9npcZ8QPuXkkSf7zskTenf4tFszUnq
-BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
-    <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="technical">
-    <md:EmailAddress>operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 68a3a4ad..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 width="80" height="88" xml:lang="en">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
-        <mdui:Logo width="80" height="88" xml:lang="lt">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
-        <mdui:Logo width="16" height="16" xml:lang="en">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
-        <mdui:Logo width="16" height="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.library.dmu.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/login.library.dmu.ac.uk-oala-metadata.xml
deleted file mode 100644
index 4a12dc67..00000000
--- a/swamid-interfederations-2.0/login.library.dmu.ac.uk-oala-metadata.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://login.library.dmu.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for De Montfort University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-12-06T16:42:09Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">dmu.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">De Montfort University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">De Montfort University (DMU) is a university situated in Leicester, UK.</mdui:Description>
-        <mdui:Logo height="60" width="141">https://www.dmu.ac.uk/SiteElements/Images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:52.631814,-1.139363</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID3DCCAsQCCQDPnZdVNsgAazANBgkqhkiG9w0BAQUFADCBrzELMAkGA1UEBhMC
-						R0IxFzAVBgNVBAgMDkxlaWNlc3RlcnNoaXJlMRIwEAYDVQQHDAlMZWljZXN0ZXIx
-						HzAdBgNVBAoMFkRlIE1vbnRmb3J0IFVuaXZlcnNpdHkxDTALBgNVBAsMBElUTVMx
-						IDAeBgNVBAMMF2xvZ2luLmxpYnJhcnkuZG11LmFjLnVrMSEwHwYJKoZIhvcNAQkB
-						FhJ3aWxsaWFtc0BkbXUuYWMudWswHhcNMTQwOTE2MTU0MzM3WhcNMjQwOTEzMTU0
-						MzM3WjCBrzELMAkGA1UEBhMCR0IxFzAVBgNVBAgMDkxlaWNlc3RlcnNoaXJlMRIw
-						EAYDVQQHDAlMZWljZXN0ZXIxHzAdBgNVBAoMFkRlIE1vbnRmb3J0IFVuaXZlcnNp
-						dHkxDTALBgNVBAsMBElUTVMxIDAeBgNVBAMMF2xvZ2luLmxpYnJhcnkuZG11LmFj
-						LnVrMSEwHwYJKoZIhvcNAQkBFhJ3aWxsaWFtc0BkbXUuYWMudWswggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLa9/jC6wzawogWidhy6b9gQSQKsTr03Q/
-						E2MRXhtd1dX0n6b0Ogf5Ikf4J38s1JOjbr56ysY6xiPGObvKb/jAh8Ugt3s2DYZh
-						umSNPuDnemyj8h521oFQ6Wd8bhnSKRZXY2oJsSKLA/d3nLbUKoe9w1pf4rDU2Cjm
-						RZMyY4cNt0gb0Tt3/gtiwJ/1WzWrEe8g5uvNbmFC3E96T2Cq5fqgqRKk6mHuA6+V
-						w+Ke96AbvsrVjCRRxYq47CRYlpPfeQJfiz50jN0F37CQxIf/joj7Vo1V+950bYm+
-						6KB6IWTjSVY9csmkz2B/vLDadU/Qo7XjvgsLYqYVmH3mmzo4dH5NAgMBAAEwDQYJ
-						KoZIhvcNAQEFBQADggEBAKNNaTkgvr2ied3nooS6i4rRWM7U9MC93AFJprJYHHKx
-						STDcHqNtX6f1e3UeZI6wsgpSiWFfBZgEd0hJ+cgE62a/G6DTUUPdnf0LClRZpXoE
-						Mu+6NWSoNNdr9hLtWBxZkU+FLIgDpw9+qnx3tYydEoxC0oGcyuvCMbJJbPGQwHML
-						bkOwLZxeNbAlpdb+tXylus+anQwqlrcukkxTVeI89O28QETfN1sIFL97/AwE2oD7
-						GtbxWSSs57GryS38E6qbW9LLuee85nPgPhByaVmlCc95J455XtsRL8qef0okzUy+
-						UDaOzvftwWw1y2kSzIahwIBl2o81tOQhgCreQg6CKSc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.library.dmu.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.library.dmu.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">De Montfort University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">De Montfort University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.library.dmu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Pete</GivenName>
-    <SurName>Warrington</SurName>
-    <EmailAddress>mailto:pwarrington@dmu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Phil</GivenName>
-    <SurName>Adams</SurName>
-    <EmailAddress>mailto:pka@dmu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ligo.org-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ligo.org-idp-shibboleth.xml
deleted file mode 100644
index 33a93521..00000000
--- a/swamid-interfederations-2.0/login.ligo.org-idp-shibboleth.xml
+++ /dev/null
@@ -1,188 +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://login.ligo.org/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login.ligo.org/support.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ligo.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">LIGO Scientific Collaboration</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Laser Interferometer Gravitational-Wave Observatory (LIGO)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89286</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89243</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://login.ligo.org/SAML2/metadata/ui/ligologo80x60.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>
-MIIEljCCA36gAwIBAgICAJwwDQYJKoZIhvcNAQEFBQAwgYcxEzARBgoJkiaJk/Is
-ZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZFgRsaWdvMQ0wCwYDVQQKEwRMSUdPMSAw
-HgYDVQQLExdDZXJ0aWZpY2F0ZSBBdXRob3JpdGllczEVMBMGA1UECxMMV2ViIFNl
-cnZpY2VzMRIwEAYDVQQDEwlMSUdPIENBIDEwHhcNMTMxMTEyMjEzNjI3WhcNMjMx
-MTEyMjEzNjI3WjBzMRMwEQYKCZImiZPyLGQBGRYDb3JnMRQwEgYKCZImiZPyLGQB
-GRYEbGlnbzENMAsGA1UEChMETElHTzEVMBMGA1UECxMMV2ViIFNlcnZpY2VzMSAw
-HgYDVQQDExdsaWdvLWxvZ2luLnBoeXMudXdtLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMQHAdPnOmQc9Wa++z1KJUY8wNdX+NsGa7VdFwBcgrnr
-U6qY0OrUpKKGP1q9+3rbdhw+26D3NtCeydn5MQEr2bwrFQOPZqhFNsgGRmXtJc7T
-4uJOJN9cllEZN1hqU0EqXD9Gi+SQ07BTLO1HG0t70DkydQxXI2M4OQ0sDP/7SSab
-nSvztjXeAj98pVyqLj44JTOETFQTceJ0KcMnaAjlZKTFvU1l2lW8uPyQEgQP5cLM
-QS7ZuYtkp6M2vwViQMMksKqSzx0MXjjWH5Hs8ozfHF84tyJUq/2BtmqHhWoWCq+3
-EYEbS4GULfWbyK4oOIl/F3pNgR8WixtUXPz6dy1+Q7ECAwEAAaOCAR0wggEZMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAZBgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAw
-MC6gLKAqhihodHRwOi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3Js
-MB8GA1UdIwQYMBaAFFJu3Xuqb4VcCCLTl5+tfyNWHmrRMGMGA1UdEQRcMFqCF2xp
-Z28tbG9naW4ucGh5cy51d20uZWR1gg5sb2dpbi5saWdvLm9yZ4IPbG9naW4xLmxp
-Z28ub3JnggxpZHAubGlnby5vcmeBEHJ0LWF1dGhAbGlnby5vcmcwDQYJKoZIhvcN
-AQEFBQADggEBAF5M6bIShQM33qnNK6/WmtzNP/+x/tW+OKKzdp6Aynl5fGm0QmdK
-0qeI2T3fYHqT7KTVJqA6NFcXbQUrHmJwEAtIlD8gklHMI3LVcy460SBfkRXwEIXt
-rQ+vktmJxzU725XT8VLzkt5i8c+xibVTJVrpYXYWXEDLP/tkMRqMtWO72aek2RV0
-pFApwEgu91iPFEL5DU31dbf+tUFQglt1lofm2EiLAq6auTphsTs6nu5b8k+eh26y
-4f7CtSOMPJoOvBC7ZZj5spPMYP1nWcDsQIF6LylwyNI2XxBIll/FuM9mSBAZ6fSL
-QSLgCeM9S63LSKOHx0cXPde6ccFKoDtcNiY=
-          </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>
-MIIEaTCCA1GgAwIBAgIBKTANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
-ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
-BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
-dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMDEyMjAxOTQzMjFaFw0yMDEy
-MTkxOTQzMjFaMHMxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
-FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxIDAe
-BgNVBAMTF2xpZ28tbG9naW4ucGh5cy51d20uZWR1MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA5aWnGpOBykQtq5ybHIORdGTB+2VZ/2btQDb28/c3ClCI
-XmDte4OSxxon33EVPZcdWWAts03dWvvR3EZCsIqUADwAsG97pyCPqJ5A44/Cp3XN
-Yc2sGnnn8/iKdjaTuiD0huf075a/QcqO6qhE6RQ0Zybw9UmV//iYCb1CqG0NbuTZ
-sBm+SK/9MkkLYaKYXP5dR1qxiHRDcH1WRn/lcTG3Ln6WOrwJn+e7dVRObGMAIDzi
-NJH/2B4PcgEW4Gc/FwghkcZ61Qj15NpuTg0Y9NwsCrpuXaTkuwVKU8w8rS7gOgdl
-OCa+aMeU6sKVvjDxmQC5FboZUwlGIAwAHkT2pVCv9wIDAQABo4HyMIHvMAwGA1Ud
-EwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAZBgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAwMC6g
-LKAqhihodHRwOi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3JsMB8G
-A1UdIwQYMBaAFFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDkGA1UdEQQyMDCCLmxpZ28t
-bG9naW4ucGh5cy51d20uZWR1OnNjb3R0LmtvcmFuZGFAbGlnby5vcmcwDQYJKoZI
-hvcNAQEFBQADggEBADd3Vkq5UNNf0q0Tm4tM19o8Zo5vSA9qA09qOHH270MKakVh
-NXeikHm4FMJKE731D8vwqUDFX0PqN9ndkWLqI9+vtPstqbl7xEbhXfFAjvAj6ieP
-AlKinu+VwG8lqcSRzrgDl40DGZbxYwcqaLqkY3DvJQphcL9+cMVNwixR+2ceACVU
-9nJhBjNdtVo5HiayNy1qIHoVnyxfRJcET5Z9fl9WoTGBkQgd2+XNBxe3ECLpe4gw
-GKBexp0LpbBvqRLMito7jIbPE5NzCjw69NpcIE+COkQc+ifV8FbD0OQOin06/qDi
-0+fCAYmI2uE8jfuGOhKWTsSUWe35LFWIOuaIPZo=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login1.ligo.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ligo.org/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ligo.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ligo.org/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ligo.org/idp/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ligo.org</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEljCCA36gAwIBAgICAJwwDQYJKoZIhvcNAQEFBQAwgYcxEzARBgoJkiaJk/Is
-ZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZFgRsaWdvMQ0wCwYDVQQKEwRMSUdPMSAw
-HgYDVQQLExdDZXJ0aWZpY2F0ZSBBdXRob3JpdGllczEVMBMGA1UECxMMV2ViIFNl
-cnZpY2VzMRIwEAYDVQQDEwlMSUdPIENBIDEwHhcNMTMxMTEyMjEzNjI3WhcNMjMx
-MTEyMjEzNjI3WjBzMRMwEQYKCZImiZPyLGQBGRYDb3JnMRQwEgYKCZImiZPyLGQB
-GRYEbGlnbzENMAsGA1UEChMETElHTzEVMBMGA1UECxMMV2ViIFNlcnZpY2VzMSAw
-HgYDVQQDExdsaWdvLWxvZ2luLnBoeXMudXdtLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMQHAdPnOmQc9Wa++z1KJUY8wNdX+NsGa7VdFwBcgrnr
-U6qY0OrUpKKGP1q9+3rbdhw+26D3NtCeydn5MQEr2bwrFQOPZqhFNsgGRmXtJc7T
-4uJOJN9cllEZN1hqU0EqXD9Gi+SQ07BTLO1HG0t70DkydQxXI2M4OQ0sDP/7SSab
-nSvztjXeAj98pVyqLj44JTOETFQTceJ0KcMnaAjlZKTFvU1l2lW8uPyQEgQP5cLM
-QS7ZuYtkp6M2vwViQMMksKqSzx0MXjjWH5Hs8ozfHF84tyJUq/2BtmqHhWoWCq+3
-EYEbS4GULfWbyK4oOIl/F3pNgR8WixtUXPz6dy1+Q7ECAwEAAaOCAR0wggEZMAwG
-A1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAZBgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAw
-MC6gLKAqhihodHRwOi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3Js
-MB8GA1UdIwQYMBaAFFJu3Xuqb4VcCCLTl5+tfyNWHmrRMGMGA1UdEQRcMFqCF2xp
-Z28tbG9naW4ucGh5cy51d20uZWR1gg5sb2dpbi5saWdvLm9yZ4IPbG9naW4xLmxp
-Z28ub3JnggxpZHAubGlnby5vcmeBEHJ0LWF1dGhAbGlnby5vcmcwDQYJKoZIhvcN
-AQEFBQADggEBAF5M6bIShQM33qnNK6/WmtzNP/+x/tW+OKKzdp6Aynl5fGm0QmdK
-0qeI2T3fYHqT7KTVJqA6NFcXbQUrHmJwEAtIlD8gklHMI3LVcy460SBfkRXwEIXt
-rQ+vktmJxzU725XT8VLzkt5i8c+xibVTJVrpYXYWXEDLP/tkMRqMtWO72aek2RV0
-pFApwEgu91iPFEL5DU31dbf+tUFQglt1lofm2EiLAq6auTphsTs6nu5b8k+eh26y
-4f7CtSOMPJoOvBC7ZZj5spPMYP1nWcDsQIF6LylwyNI2XxBIll/FuM9mSBAZ6fSL
-QSLgCeM9S63LSKOHx0cXPde6ccFKoDtcNiY=
-          </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>
-MIIEaTCCA1GgAwIBAgIBKTANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
-ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
-BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
-dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMDEyMjAxOTQzMjFaFw0yMDEy
-MTkxOTQzMjFaMHMxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
-FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxIDAe
-BgNVBAMTF2xpZ28tbG9naW4ucGh5cy51d20uZWR1MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA5aWnGpOBykQtq5ybHIORdGTB+2VZ/2btQDb28/c3ClCI
-XmDte4OSxxon33EVPZcdWWAts03dWvvR3EZCsIqUADwAsG97pyCPqJ5A44/Cp3XN
-Yc2sGnnn8/iKdjaTuiD0huf075a/QcqO6qhE6RQ0Zybw9UmV//iYCb1CqG0NbuTZ
-sBm+SK/9MkkLYaKYXP5dR1qxiHRDcH1WRn/lcTG3Ln6WOrwJn+e7dVRObGMAIDzi
-NJH/2B4PcgEW4Gc/FwghkcZ61Qj15NpuTg0Y9NwsCrpuXaTkuwVKU8w8rS7gOgdl
-OCa+aMeU6sKVvjDxmQC5FboZUwlGIAwAHkT2pVCv9wIDAQABo4HyMIHvMAwGA1Ud
-EwEB/wQCMAAwDgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAZBgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAwMC6g
-LKAqhihodHRwOi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3JsMB8G
-A1UdIwQYMBaAFFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDkGA1UdEQQyMDCCLmxpZ28t
-bG9naW4ucGh5cy51d20uZWR1OnNjb3R0LmtvcmFuZGFAbGlnby5vcmcwDQYJKoZI
-hvcNAQEFBQADggEBADd3Vkq5UNNf0q0Tm4tM19o8Zo5vSA9qA09qOHH270MKakVh
-NXeikHm4FMJKE731D8vwqUDFX0PqN9ndkWLqI9+vtPstqbl7xEbhXfFAjvAj6ieP
-AlKinu+VwG8lqcSRzrgDl40DGZbxYwcqaLqkY3DvJQphcL9+cMVNwixR+2ceACVU
-9nJhBjNdtVo5HiayNy1qIHoVnyxfRJcET5Z9fl9WoTGBkQgd2+XNBxe3ECLpe4gw
-GKBexp0LpbBvqRLMito7jIbPE5NzCjw69NpcIE+COkQc+ifV8FbD0OQOin06/qDi
-0+fCAYmI2uE8jfuGOhKWTsSUWe35LFWIOuaIPZo=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login1.ligo.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Scott Koranda</md:GivenName>
-    <md:EmailAddress>scott.koranda@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Warren Anderson</md:GivenName>
-    <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LIGO Identity Management Help Desk</md:GivenName>
-    <md:EmailAddress>rt-auth@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LIGO Security Committee</md:GivenName>
-    <md:EmailAddress>lsc-seccomm@ligo.org</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 fd98f37f..00000000
--- a/swamid-interfederations-2.0/login.liu.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://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>
-  <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">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">https://login.liu.se/idp/images/logo-350x68-sv.png</mdui:Logo>
-        <mdui:Logo height="68" width="350" xml:lang="sv">https://login.liu.se/idp/images/logo-350x68-sv.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: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.liu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.liu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.liu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.liu.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">liu.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">LiU</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">LiU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Linköpings Universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Linköping University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.liu.se?l=sv</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.liu.se?l=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Linköping University</md:Company>
-    <md:SurName>LiU-IT SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Linköping University</md:Company>
-    <md:SurName>LiU-IT SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Linköping University</md:Company>
-    <md:SurName>LiU-IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@liu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 13 282828</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 04758b00..00000000
--- a/swamid-interfederations-2.0/login.liu.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://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: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: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="support">
-    <Company>Linköping University</Company>
-    <SurName>LiU-IT Helpdesk</SurName>
-    <EmailAddress>helpdesk@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>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml b/swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.xml
deleted file mode 100644
index eb48ba5a..00000000
--- a/swamid-interfederations-2.0/login.lstonline.ac.uk-idp-pingfederate.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://login.lstonline.ac.uk/idp/pingfederate">
-  <!--
-		This is a "Test" PingFederate IdP for the London School of Theology.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-03T11:48:22Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lstonline.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFrTCCBJWgAwIBAgIDBoSbMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
-						MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
-						NTYgQ0EgLSBHMzAeFw0xNTA4MjUwNjUyMTlaFw0xNjA4MjcwMDQ2MzVaMIGZMRMw
-						EQYDVQQLEwpHVDk0OTY4OTI4MTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
-						bS9yZXNvdXJjZXMvY3BzIChjKTE1MS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
-						YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEeMBwGA1UEAxMVbG9naW4ubHN0b25saW5l
-						LmFjLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxrAkIUMp+9zE
-						F27/7ShFVhGxwJDiQuEQih/86q32F/x2exva/aaPq2kMkeEfsf9iCoHYRRHMB9rv
-						1GvUnvsyWKF1mcNXq79RgwrcJ0vQlN8DxODGS7ymo/Ki1m+TcF6e/j1Rao48LKHS
-						JpYMDEUKV7LZ+sIytwnuLPVSFR6u9QprbQ7BsdXxvZiC/dPTPJe8IOgwE/YUYgL3
-						NlnPCuAQSv/Eih3P4532cAfvSEy1TnS+KpOkPJVnRyRmsei0PbcOSgjlgdKyvTDp
-						zti+Clsr8roZty3YVJT1rfo9UnU3vo5GJxDkwIPAUK9jPBAzx7AqGaazQRNKdxUJ
-						lOl3sjEM+v4ruVMTM5EmExxc0XAqx/WAZ6GlYWaEP+Aezq5QgDBEORrBtGz8daOh
-						l/xTjL6ZKuoDq2zKeQsIuzhLr8IVhFfGBpuhhMces0JulQzF9Rc+TtjHt/m/t/9A
-						anSBWrFTM2EEeu6PaubGe70FIZaPbXjAceDtHTINSJUk+czok1lBFd5trz7wvn9/
-						MalHHGI5JSyJ0DzfwfIpqDDH5QxmihQ3vVrzHJq4SNF58MoSouGSUWkcr+Otfstl
-						N7Gt8l1LsV8on0Dkw99iRd17yN3Tz1j9l363k0IEMrB8enbqDqo4oYs1Zl4Gc3be
-						jtcz3oEmUjI42jxf8vJKRcPK7hNsaWUCAwEAAaOCAU0wggFJMB8GA1UdIwQYMBaA
-						FMOc8/zTRgg0u85Gf6B8W/PiCMtZMFcGCCsGAQUFBwEBBEswSTAfBggrBgEFBQcw
-						AYYTaHR0cDovL2d2LnN5bWNkLmNvbTAmBggrBgEFBQcwAoYaaHR0cDovL2d2LnN5
-						bWNiLmNvbS9ndi5jcnQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
-						BwMBBggrBgEFBQcDAjAgBgNVHREEGTAXghVsb2dpbi5sc3RvbmxpbmUuYWMudWsw
-						KwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL2d2LnN5bWNiLmNvbS9ndi5jcmwwDAYD
-						VR0TAQH/BAIwADBBBgNVHSAEOjA4MDYGBmeBDAECATAsMCoGCCsGAQUFBwIBFh5o
-						dHRwczovL3d3dy5yYXBpZHNzbC5jb20vbGVnYWwwDQYJKoZIhvcNAQELBQADggEB
-						AHFxca8STxtCYEtDWZvAFWBMmNG3DnqbpMN5lHHAWOSg+ofLkHlOkm47gDxzx6MT
-						e8lMuGdqenUFNiq2Y1GWhAZ2oI0VSmpOvirzO+oR3rZCzV5ekgSrf+8rD3FwODha
-						butguX/U1Iiwq+si7+0gyHFlrSL6OEdJFDnNgqyzqOQRM+Z55+n/7vmMfsNRhDLM
-						geFMYTUZyt61YKHICtyarPE6Bgw+Z8ByiLHq2pvgq1R42P7++IHpWQl2lRQ5pv9r
-						phaCPMAtesAXAd5ck0aKucQrgU+Oyag/hPpHaUBuz8Z5vYDCF7AkSTPQyK0zt4lR
-						qG9o247BAjLhNj6N/rlcE2w=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.lstonline.ac.uk:8443/idp/soap.ssaml1" index="0"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.lstonline.ac.uk/idp/SSO.saml2"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.lstonline.ac.uk/idp/isx.saml1"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="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">lstonline.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFrTCCBJWgAwIBAgIDBoSbMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNVBAYTAlVT
-						MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMSAwHgYDVQQDExdSYXBpZFNTTCBTSEEy
-						NTYgQ0EgLSBHMzAeFw0xNTA4MjUwNjUyMTlaFw0xNjA4MjcwMDQ2MzVaMIGZMRMw
-						EQYDVQQLEwpHVDk0OTY4OTI4MTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
-						bS9yZXNvdXJjZXMvY3BzIChjKTE1MS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
-						YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEeMBwGA1UEAxMVbG9naW4ubHN0b25saW5l
-						LmFjLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxrAkIUMp+9zE
-						F27/7ShFVhGxwJDiQuEQih/86q32F/x2exva/aaPq2kMkeEfsf9iCoHYRRHMB9rv
-						1GvUnvsyWKF1mcNXq79RgwrcJ0vQlN8DxODGS7ymo/Ki1m+TcF6e/j1Rao48LKHS
-						JpYMDEUKV7LZ+sIytwnuLPVSFR6u9QprbQ7BsdXxvZiC/dPTPJe8IOgwE/YUYgL3
-						NlnPCuAQSv/Eih3P4532cAfvSEy1TnS+KpOkPJVnRyRmsei0PbcOSgjlgdKyvTDp
-						zti+Clsr8roZty3YVJT1rfo9UnU3vo5GJxDkwIPAUK9jPBAzx7AqGaazQRNKdxUJ
-						lOl3sjEM+v4ruVMTM5EmExxc0XAqx/WAZ6GlYWaEP+Aezq5QgDBEORrBtGz8daOh
-						l/xTjL6ZKuoDq2zKeQsIuzhLr8IVhFfGBpuhhMces0JulQzF9Rc+TtjHt/m/t/9A
-						anSBWrFTM2EEeu6PaubGe70FIZaPbXjAceDtHTINSJUk+czok1lBFd5trz7wvn9/
-						MalHHGI5JSyJ0DzfwfIpqDDH5QxmihQ3vVrzHJq4SNF58MoSouGSUWkcr+Otfstl
-						N7Gt8l1LsV8on0Dkw99iRd17yN3Tz1j9l363k0IEMrB8enbqDqo4oYs1Zl4Gc3be
-						jtcz3oEmUjI42jxf8vJKRcPK7hNsaWUCAwEAAaOCAU0wggFJMB8GA1UdIwQYMBaA
-						FMOc8/zTRgg0u85Gf6B8W/PiCMtZMFcGCCsGAQUFBwEBBEswSTAfBggrBgEFBQcw
-						AYYTaHR0cDovL2d2LnN5bWNkLmNvbTAmBggrBgEFBQcwAoYaaHR0cDovL2d2LnN5
-						bWNiLmNvbS9ndi5jcnQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
-						BwMBBggrBgEFBQcDAjAgBgNVHREEGTAXghVsb2dpbi5sc3RvbmxpbmUuYWMudWsw
-						KwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL2d2LnN5bWNiLmNvbS9ndi5jcmwwDAYD
-						VR0TAQH/BAIwADBBBgNVHSAEOjA4MDYGBmeBDAECATAsMCoGCCsGAQUFBwIBFh5o
-						dHRwczovL3d3dy5yYXBpZHNzbC5jb20vbGVnYWwwDQYJKoZIhvcNAQELBQADggEB
-						AHFxca8STxtCYEtDWZvAFWBMmNG3DnqbpMN5lHHAWOSg+ofLkHlOkm47gDxzx6MT
-						e8lMuGdqenUFNiq2Y1GWhAZ2oI0VSmpOvirzO+oR3rZCzV5ekgSrf+8rD3FwODha
-						butguX/U1Iiwq+si7+0gyHFlrSL6OEdJFDnNgqyzqOQRM+Z55+n/7vmMfsNRhDLM
-						geFMYTUZyt61YKHICtyarPE6Bgw+Z8ByiLHq2pvgq1R42P7++IHpWQl2lRQ5pv9r
-						phaCPMAtesAXAd5ck0aKucQrgU+Oyag/hPpHaUBuz8Z5vYDCF7AkSTPQyK0zt4lR
-						qG9o247BAjLhNj6N/rlcE2w=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.lstonline.ac.uk:8443/idp/attrsvc.ssaml2"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.lstonline.ac.uk:8443/idp/soap.ssaml1"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">London School of Theology</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London School of Theology (PingFederate Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lst.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@lst.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@lst.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.mayo.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/login.mayo.edu-adfs-services-trust.xml
deleted file mode 100644
index e5f7634c..00000000
--- a/swamid-interfederations-2.0/login.mayo.edu-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://login.mayo.edu/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">mayo.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Mayo Clinic</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>
-MIIGYjCCBUqgAwIBAgIQSYTipRaDfa4yYbpeDlGgmzANBgkqhkiG9w0BAQUFADCB
-iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTEy
-MDEwNjAwMDAwMFoXDTE3MDEwNTIzNTk1OVowggF9MQswCQYDVQQGEwJVUzEOMAwG
-A1UEERMFNTU5MDUxEjAQBgNVBAgTCU1pbm5lc290YTESMBAGA1UEBxMJUm9jaGVz
-dGVyMR4wHAYDVQQJExUyMDAgRmlyc3QgU3RyZWV0IFMuVy4xFDASBgNVBAoTC01h
-eW8gQ2xpbmljMSUwIwYDVQQLExxHbG9iYWwgUHJvZHVjdHMgYW5kIFNlcnZpY2Vz
-MUkwRwYDVQQLE0BJTlRSQU5FVCBVU0UgT05MWSAtIE5PIFdBUlJBTlRZIEFUVEFD
-SEVEIC0gQ09NUEFOWSBOT1QgVkFMSURBVEVEMUkwRwYDVQQLE0BJc3N1ZWQgdGhy
-b3VnaCBNYXlvIEZvdW5kYXRpb24gZm9yIE1lZGljYWwgRWR1Y2F0aW9uIGFuZCBS
-ZXNlYXJjMRUwEwYDVQQLEwxJbnRyYW5ldCBTU0wxLDAqBgNVBAMTI21mYWQgYWRm
-cyB0b2tlbiBzaWduaW5nIGNlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAztBDJVcUC3x3fb1u5VacbMTA7fp3wMEj/lLnsd0tvL7fEQ2G
-8+5kutxvxwgWutHgPiF/ArDhfJFvB4IiYk2G42/sdQY5qctKCyCsNN4t9rXt0zsI
-RdlXs8JUCwuUlsqmuD4OvhFRyFC/T2vQ1+T6WrZNkOu95QjPVv/g+cJRx/uCZcLs
-9Z0PtWFahNcTxvRhuuVPvv4rk2/idwyhUnjK3Y8xTiNK3Gb/nkfZXi7HWfqdX1q4
-rr5IWueYHJTNouNrLyxZag8E7GEFUidyM+jNtUZz13qa3ivxcIYaFUhPWKCkO1+Q
-9opENzO9G9LtMw68eti8eeylWR2Be26PazFBawIDAQABo4IBzTCCAckwHwYDVR0j
-BBgwFoAUP9W10NZEeVBKF6ObjErcuLAiZGswHQYDVR0OBBYEFH8kQpCDOsaw/GKp
-PEyFtCnv4zoNMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
-MBQGCCsGAQUFBwMBBggrBgEFBQcDAjBGBgNVHSAEPzA9MDsGDCsGAQQBsjEBAgED
-BDArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5jb21vZG8uY29tL0NQUzBP
-BgNVHR8ESDBGMESgQqBAhj5odHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9I
-aWdoLUFzc3VyYW5jZVNlY3VyZVNlcnZlckNBLmNybDCBgAYIKwYBBQUHAQEEdDBy
-MEoGCCsGAQUFBzAChj5odHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9DT01PRE9IaWdo
-LUFzc3VyYW5jZVNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDov
-L29jc3AuY29tb2RvY2EuY29tMC4GA1UdEQQnMCWCI21mYWQgYWRmcyB0b2tlbiBz
-aWduaW5nIGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4IBAQA2h1DPtp4tuzuo
-cNpC0UPBcVm+xNfIU7iHPUDsJWgcWgiiuFScg/QWARCfpWiy+7Pyj9/UAObeRC3i
-qbSpMOpIFZCjBhU0urjpLrIThiyKmoVBjBqB9fvCJH7hJ5Q82PKF6ueXpoLQnCnw
-ej4QrTWGxIPnuFR+wOI6CI8IARqBQyYWTAwYnN6olUyjDPTdm+K1twuPfd9JpDoF
-5uVjA9JrhqKpK5daHT8r0xMDOaIJmyVJaQbLsqvSv1V94YpgxO+Ss1x243opSwfN
-D8G/mhghawndTf9Nf7K/h4ixhFTDFo/RIX6E9SmKrar8jbIGovc3XtZ0Y2TumYJZ
-NiV1gUes
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.mayo.edu/adfs/services/trust/artifactresolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.mayo.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.mayo.edu/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Mayo Clinic</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Mayo Clinic</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mayo.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shawn Brandt</md:GivenName>
-    <md:EmailAddress>brandt.shawn@mayo.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sandy Outcalt</md:GivenName>
-    <md:EmailAddress>Outcalt.Sandra@mayo.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Troy Wirth</md:GivenName>
-    <md:EmailAddress>wirth.troy@mayo.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.montana.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.montana.edu-idp-shibboleth.xml
deleted file mode 100644
index 06d37a91..00000000
--- a/swamid-interfederations-2.0/login.montana.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://login.montana.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">montana.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Montana State University - Bozeman</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Montana State University Bozeman's InCommon Identity provider.</mdui:Description>
-        <mdui:Logo height="163" width="648" xml:lang="en">https://login.montana.edu/cas/meta/img/MSU-horiz.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>
-MIIDMDCCAhigAwIBAgIVAOfP2IewNMJIbSjlEL1iQlgWdmoLMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWxvZ2luLm1vbnRhbmEuZWR1MB4XDTEyMTAyNTIxMjU0
-MVoXDTMyMTAyNTIxMjU0MVowHDEaMBgGA1UEAxMRbG9naW4ubW9udGFuYS5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJbeGVsOWY+Ii1zzNkJZMs
-uzZQQMpWobWgJAmfk7qy1qS+bBXNAKC+8U3ilHsRS/CCUZAKBf9aXXL1/BAuLwU3
-TBICswpfwJ0TKjjrvYuCEwoVI6nmnzc3oo17CacvjkuOKq2vAPw9t9/7mVNs7IxK
-TYK3Z02LD/KnrFM98HHy4jGYROsDRqPKb/znz3ZkwcV9AV4BoAxnaAmbr6xMS2di
-cRYqZnT38rsoAD9JXopPtC6ipWCVX6fhIVFVPA/nIULZ3z+PKwZVYxWlyy7pCsu5
-qLGP77EcE1FJvVrRasN+G9gLm6pJmehYxmn3WQWtXqHa6Wv91HdTCDQ7S4rnf5d9
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWxvZ2luLm1vbnRhbmEuZWR1hihodHRwczov
-L2xvZ2luLm1vbnRhbmEuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQCwE0i
-mErFyh6Mep7z5gF7aQWKqjANBgkqhkiG9w0BAQUFAAOCAQEATPtND9wTPCuh8iXW
-Y8/BkwHpRdqX6klfxIzIa8vj+SgX5/O0DBU232qUIrb11il274iCPRXIwjucjmaJ
-F/qx1G+9yvhx94kzymEYKqSTI9qrdGTgDigA8zAZ4LJY4O4Nyxzh6t7shD/buro5
-Zot2coe9Rhr6UaZ4uIp/m+DUI+4yzbVPdXKc7uXObkLQ3214DvhBMVvLnX5i9CC9
-Sq2w5CreEH+cZsLdMWuLWC/NFkRVK2AcQXnmJIwoZBpAhY4Kn1Teq0YdT7JjUZZY
-MNukIl90N4nc/ghjESnGMHNVPlUL6z+11zc/02Uy9It+hLlylZrWbwnaAxZgyTSz
-8my2pg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.montana.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.montana.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.montana.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.montana.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.montana.edu/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montana.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAOfP2IewNMJIbSjlEL1iQlgWdmoLMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWxvZ2luLm1vbnRhbmEuZWR1MB4XDTEyMTAyNTIxMjU0
-MVoXDTMyMTAyNTIxMjU0MVowHDEaMBgGA1UEAxMRbG9naW4ubW9udGFuYS5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJbeGVsOWY+Ii1zzNkJZMs
-uzZQQMpWobWgJAmfk7qy1qS+bBXNAKC+8U3ilHsRS/CCUZAKBf9aXXL1/BAuLwU3
-TBICswpfwJ0TKjjrvYuCEwoVI6nmnzc3oo17CacvjkuOKq2vAPw9t9/7mVNs7IxK
-TYK3Z02LD/KnrFM98HHy4jGYROsDRqPKb/znz3ZkwcV9AV4BoAxnaAmbr6xMS2di
-cRYqZnT38rsoAD9JXopPtC6ipWCVX6fhIVFVPA/nIULZ3z+PKwZVYxWlyy7pCsu5
-qLGP77EcE1FJvVrRasN+G9gLm6pJmehYxmn3WQWtXqHa6Wv91HdTCDQ7S4rnf5d9
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWxvZ2luLm1vbnRhbmEuZWR1hihodHRwczov
-L2xvZ2luLm1vbnRhbmEuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQCwE0i
-mErFyh6Mep7z5gF7aQWKqjANBgkqhkiG9w0BAQUFAAOCAQEATPtND9wTPCuh8iXW
-Y8/BkwHpRdqX6klfxIzIa8vj+SgX5/O0DBU232qUIrb11il274iCPRXIwjucjmaJ
-F/qx1G+9yvhx94kzymEYKqSTI9qrdGTgDigA8zAZ4LJY4O4Nyxzh6t7shD/buro5
-Zot2coe9Rhr6UaZ4uIp/m+DUI+4yzbVPdXKc7uXObkLQ3214DvhBMVvLnX5i9CC9
-Sq2w5CreEH+cZsLdMWuLWC/NFkRVK2AcQXnmJIwoZBpAhY4Kn1Teq0YdT7JjUZZY
-MNukIl90N4nc/ghjESnGMHNVPlUL6z+11zc/02Uy9It+hLlylZrWbwnaAxZgyTSz
-8my2pg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.montana.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Montana State University - Bozeman</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Montana State University - Bozeman</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.montana.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Mike Hall</md:GivenName>
-    <md:EmailAddress>mhall@montana.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Adam Edelman</md:GivenName>
-    <md:EmailAddress>aedelman@montana.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mike Hall</md:GivenName>
-    <md:EmailAddress>mhall@montana.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.nd.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.nd.edu-idp-shibboleth.xml
deleted file mode 100644
index 4e1943a0..00000000
--- a/swamid-interfederations-2.0/login.nd.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,62 +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://login.nd.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">nd.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Notre Dame</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>
-MIIDGzCCAgOgAwIBAgIUMLHjiLc33hXgOaCp5dmYfydyVWwwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMbG9naW4ubmQuZWR1MB4XDTExMDkyODE5MzYxMloXDTMx
-MDkyODE5MzYxMlowFzEVMBMGA1UEAxMMbG9naW4ubmQuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAznU2yVyVhGpnHAik/b5ee4t7FT0UyBHVf23B
-BqZ3ithQgUQkAPzUoSxAAm/gKrI+QKoxJ1JpWB7U/c1EfDB60I8RfLLbbrCNVdaQ
-vAO1qj1zn10AzuxLTwvw9Gaga5Cmea09Le0MW32EUp7CQBGu6Fy/AOhUQ2/sugaz
-kcR4rTPuWtCdPBJ/C6/vThDsCPKS9oHs3jaZjbyoGSrVuXmPrvEPEKNI2Ghgyqtl
-XR+KYbQ/Q7v3xH2XMTb7x1ZcqSz7nJIPmKBDTgGZNg0Iqbx0/c+Jrf1FY1I3bqNY
-cAW+hNEmmKEihlexIIKcB9K8r4d8qRIwU1cmF2PEmn00ntdZvwIDAQABo18wXTA8
-BgNVHREENTAzggxsb2dpbi5uZC5lZHWGI2h0dHBzOi8vbG9naW4ubmQuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRN5WeLYLCunozBnymgL5/nKfimCjANBgkq
-hkiG9w0BAQUFAAOCAQEAucOVj+U3YG4t5dISqjV4kIvIQJfgrXmOpd9NMEZosSYf
-Mx1Tnqj32jUsBeYzySOvcuLSo7VYeAb2aHchpemvL+FPCevH2/5yhzMcWww3taJB
-C0SP1yEjdWsTv21bxrk2xKAlgeIRvwUPqzpDF82/nVSIlCoBQ2LtoX7hGW2exeEx
-lHQMS6hV3X3Vph7DTRtgtEPJUiqYBDj19JzUNwYABPXr55jMwlvAJ2W7pO6wLrdR
-/PXobsAeIT1+agr/JnymgxVsv6I2Ge780x6V9qQ71553X1mG+vtV/tJ3Y81tXL2/
-xc/kwwyNOzorxPvN9w6vSeQk6qtTmTPmOaCNIZkj1A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.nd.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.nd.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.nd.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.nd.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.nd.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Notre Dame</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Notre Dame</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nd.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>OIT Identity Management</md:GivenName>
-    <md:EmailAddress>eds@nd.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>OIT Identity Management</md:GivenName>
-    <md:EmailAddress>eds@nd.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.xml
deleted file mode 100644
index 23d4ef57..00000000
--- a/swamid-interfederations-2.0/login.nki.nl-adfs-services-trust.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="http://login.nki.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-10-26T17:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Antoni van Leeuwenhoek - Nederlands Kanker Instituut</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Antoni van Leeuwenhoek - Nederlands Kanker Instituut</mdui:Description>
-        <mdui:Description xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</mdui:Description>
-        <mdui:Logo height="109" width="213">https://static.surfconext.nl/logos/idp/nki.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Netherlands Cancer Institute Antoni van Leeuwenhoek Huis nki avl</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Nederlands Kanker Instituut Antoni van Leeuwenhoek Huis nki avl</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/91bd4d327f9cc83bcac7882b9b69e26d"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Antoni van Leeuwenhoek – Nederlands Kanker Instituut</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Antoni van Leeuwenhoek – Nederlands Kanker Instituut</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Antoni van Leeuwenhoek – Netherlands Cancer Institute</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.nki.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.nki.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/login.noa.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.noa.gr-idp-shibboleth.xml
deleted file mode 100644
index 4418ef1c..00000000
--- a/swamid-interfederations-2.0/login.noa.gr-idp-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://login.noa.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noa.gr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Observatory Athens</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">Εθνικό Αστεροσκοπείο Αθηνών</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.noa.gr/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">http://www.noa.gr/</mdui:InformationURL>
-        <mdui:Logo height="121" width="125">https://vmail.noa.gr/files/NOA_125x121.png</mdui:Logo>
-        <mdui:Logo height="97" width="100">https://vmail.noa.gr/files/NOA_100x97.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>noa.gr</mdui:DomainHint>
-        <mdui:IPHint>195.251.202.0/23</mdui:IPHint>
-        <mdui:IPHint>195.251.204.0/24</mdui:IPHint>
-        <mdui:IPHint>194.177.194.0/23</mdui:IPHint>
-        <mdui:IPHint>2001:648:2011::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:37.9733880,23.7182430</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>
-                            MIIDGzCCAgOgAwIBAgIUDd6yDm+fYXdw42k4SkEg6Xy0NPkwDQYJKoZIhvcNAQEF
-                            BQAwFzEVMBMGA1UEAxMMbG9naW4ubm9hLmdyMB4XDTEwMDYxMDA2NTQ0M1oXDTMw
-                            MDYxMDA2NTQ0M1owFzEVMBMGA1UEAxMMbG9naW4ubm9hLmdyMIIBIjANBgkqhkiG
-                            9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr05MimJsewfa9IA5NFMLvlqG7+Xos2hhio7Y
-                            5PpONlIRmvkj9Bd+XAwFcicDT4xtC4M/P4iWVoK6qnpv0Q0219yiN6HBxPz+C3ba
-                            5YVBw/9/jsMbfPn7GHnIyqfJAtAtvIOKjkE46M6UCnNNS9oi2KS0fgFZ2fINxtRX
-                            rONj3CqrmP7uc7a0xe4DqWWaGzK45yYiW6787rH14inCTbPrU9C8g2z9lz8WA7nv
-                            blHtVLDHg+vBatJdhBt9DB8TMO6AmUGO4d3U4PgDVp4YRRVZvVpd+8bJnocaVlwN
-                            tSO9UiZDV2uDwt7VUH6QNUvYyNm6hRJOAs/xnXyLVXQ3tGYVlQIDAQABo18wXTA8
-                            BgNVHREENTAzggxsb2dpbi5ub2EuZ3KGI2h0dHBzOi8vbG9naW4ubm9hLmdyL2lk
-                            cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQsGeZvJAQVySer5wdXtgphdFAlvDANBgkq
-                            hkiG9w0BAQUFAAOCAQEAfsKkwcZ2rzCh7iDwrqVyNNbqk5KOXUZstyNse5l4yqwk
-                            qKjbbsD8eLjOx/2CBAbiWEsY0EKnQu5IC/2a5nEtVhrglnkaVBUjfKhPniQfMWR5
-                            Dxju7kyhGY65MUHaC6QWAw8UdhnfGYas1GzQCOZsjU5JqiGKWVZr0MnFh+V3gnPx
-                            ecvLDJ+B0Z0U+nKzxHI9t6J4Oz/Rw5n5Gfl8jD65HhYeEGiA5bCeTKXmiVadKmbU
-                            g5JeC0UzhLHmNIv9h4mVK0MQ2f1NBHJ1cliR/byQkFbs6x9iTKDW7c4yxVAyOW6J
-                            7bb9KnqoLhbaLs1VJcsgsrJTO0WjH4L0SMLICgCuqA==
-                            
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.noa.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.noa.gr: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://sso.noa.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.noa.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.noa.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.noa.gr/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noa.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDGzCCAgOgAwIBAgIUDd6yDm+fYXdw42k4SkEg6Xy0NPkwDQYJKoZIhvcNAQEF
-                            BQAwFzEVMBMGA1UEAxMMbG9naW4ubm9hLmdyMB4XDTEwMDYxMDA2NTQ0M1oXDTMw
-                            MDYxMDA2NTQ0M1owFzEVMBMGA1UEAxMMbG9naW4ubm9hLmdyMIIBIjANBgkqhkiG
-                            9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr05MimJsewfa9IA5NFMLvlqG7+Xos2hhio7Y
-                            5PpONlIRmvkj9Bd+XAwFcicDT4xtC4M/P4iWVoK6qnpv0Q0219yiN6HBxPz+C3ba
-                            5YVBw/9/jsMbfPn7GHnIyqfJAtAtvIOKjkE46M6UCnNNS9oi2KS0fgFZ2fINxtRX
-                            rONj3CqrmP7uc7a0xe4DqWWaGzK45yYiW6787rH14inCTbPrU9C8g2z9lz8WA7nv
-                            blHtVLDHg+vBatJdhBt9DB8TMO6AmUGO4d3U4PgDVp4YRRVZvVpd+8bJnocaVlwN
-                            tSO9UiZDV2uDwt7VUH6QNUvYyNm6hRJOAs/xnXyLVXQ3tGYVlQIDAQABo18wXTA8
-                            BgNVHREENTAzggxsb2dpbi5ub2EuZ3KGI2h0dHBzOi8vbG9naW4ubm9hLmdyL2lk
-                            cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQsGeZvJAQVySer5wdXtgphdFAlvDANBgkq
-                            hkiG9w0BAQUFAAOCAQEAfsKkwcZ2rzCh7iDwrqVyNNbqk5KOXUZstyNse5l4yqwk
-                            qKjbbsD8eLjOx/2CBAbiWEsY0EKnQu5IC/2a5nEtVhrglnkaVBUjfKhPniQfMWR5
-                            Dxju7kyhGY65MUHaC6QWAw8UdhnfGYas1GzQCOZsjU5JqiGKWVZr0MnFh+V3gnPx
-                            ecvLDJ+B0Z0U+nKzxHI9t6J4Oz/Rw5n5Gfl8jD65HhYeEGiA5bCeTKXmiVadKmbU
-                            g5JeC0UzhLHmNIv9h4mVK0MQ2f1NBHJ1cliR/byQkFbs6x9iTKDW7c4yxVAyOW6J
-                            7bb9KnqoLhbaLs1VJcsgsrJTO0WjH4L0SMLICgCuqA==
-                            
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.noa.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Observatory of Athens</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Εθνικό Αστεροσκοπείο Αθηνών</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Observatory of Athens</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Εθνικό Αστεροσκοπείο Αθηνών</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.noa.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.noa.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Nikolaos Milas</md:Company>
-    <md:EmailAddress>nmilas@admin.noa.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>National Observatory of Athens</md:Company>
-    <md:EmailAddress>helpdesk@admin.noa.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/login.northumbria.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 159cdc99..00000000
--- a/swamid-interfederations-2.0/login.northumbria.ac.uk-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" entityID="https://login.northumbria.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Northumbria at Newcastle.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-22T16: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">northumbria.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Northumbria University</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://login.northumbria.ac.uk/idp/images/favicon.gif</mdui:Logo>
-        <mdui:Logo height="58" width="110">https://login.northumbria.ac.uk/idp/images/northumbria-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEODCCAyCgAwIBAgIJAMiLIz7trK3/MA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD
-						VQQGEwJHQjEWMBQGA1UECAwNVHluZSBhbmQgV2VhcjEcMBoGA1UEBwwTTmV3Y2Fz
-						dGxlIHVwb24gVHluZTEfMB0GA1UECgwWTm9ydGh1bWJyaWEgVW5pdmVyc2l0eTEU
-						MBIGA1UECwwLSVQgU2VydmljZXMxIDAeBgNVBAMMF2xvZ2luLm5vcnRodW1icmlh
-						LmFjLnVrMB4XDTE1MDkyOTA5NDAzNFoXDTI1MDkyNjA5NDAzNFowgZwxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIDA1UeW5lIGFuZCBXZWFyMRwwGgYDVQQHDBNOZXdjYXN0
-						bGUgdXBvbiBUeW5lMR8wHQYDVQQKDBZOb3J0aHVtYnJpYSBVbml2ZXJzaXR5MRQw
-						EgYDVQQLDAtJVCBTZXJ2aWNlczEgMB4GA1UEAwwXbG9naW4ubm9ydGh1bWJyaWEu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDG5ycTOP3wR+Ev
-						NAiB2rQIB7DEKe8E06FJBU0Jdf0kZj6f/TzVSR8pFP69wTdKxIeOD0Rs3ouo1+Af
-						7FNjyikcS9J4mbewSJwI1jU/65JyI9qEPGj12sRKD4XHE7nxe8Ai+FnUG2wSQ3gw
-						BWqyvEQ2AXs9m8qSoJt8vND2paBS4DZXNxB4NbtRZfHH25fjZ4D5ZuGi2jbSpUKK
-						tHjTFmxxk4Nn3Gqg2I/tXRKLBNrwUH0aKU3kqVEdvYN1vcku/Khqfk9XIfK5paUZ
-						xho/5iOXkMtPU1YdE3FCLBwNfXSa8+n7luRrNrfpMPme3NrYT6r7lT8nERrS1XSq
-						X5BDmYDBAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRgrGADB79pGyCbdE2M
-						VnFszgMZGTAfBgNVHSMEGDAWgBRgrGADB79pGyCbdE2MVnFszgMZGTANBgkqhkiG
-						9w0BAQsFAAOCAQEAZVWBX7n4lZfwRAAzJP1HRHTvCfsXp8MkeVs0MgkExrpm2r4H
-						xWX27/U1ojsQLJzTfnUL0/pqXYpip/vSY1zvo7wmxfqtkEUK0no9fljPvIxbu7Nt
-						WdHo7Ss07rUqkYXGiTcD2NA/71+tL3PTBmc/xPnT46vhChoVVEkhf5alG9HGrJ3E
-						uoy+45CpSWH9AEPCec7dU5GT/N46Yx4Gjhz99SkAP5KhIuE9dxnoS+OlolTiC/O8
-						XfWC7iSUlskXezVj2v8H2lhUrDTra4v76z9Ssi+LX6ZdyMk3UqL9tWqjwTliLD4a
-						SoDqiIcSreJigbWSnrQkhl2xthJ3c+25U3G0QA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.northumbria.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.northumbria.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://login.northumbria.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.northumbria.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.northumbria.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.northumbria.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">northumbria.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEODCCAyCgAwIBAgIJAMiLIz7trK3/MA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD
-						VQQGEwJHQjEWMBQGA1UECAwNVHluZSBhbmQgV2VhcjEcMBoGA1UEBwwTTmV3Y2Fz
-						dGxlIHVwb24gVHluZTEfMB0GA1UECgwWTm9ydGh1bWJyaWEgVW5pdmVyc2l0eTEU
-						MBIGA1UECwwLSVQgU2VydmljZXMxIDAeBgNVBAMMF2xvZ2luLm5vcnRodW1icmlh
-						LmFjLnVrMB4XDTE1MDkyOTA5NDAzNFoXDTI1MDkyNjA5NDAzNFowgZwxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIDA1UeW5lIGFuZCBXZWFyMRwwGgYDVQQHDBNOZXdjYXN0
-						bGUgdXBvbiBUeW5lMR8wHQYDVQQKDBZOb3J0aHVtYnJpYSBVbml2ZXJzaXR5MRQw
-						EgYDVQQLDAtJVCBTZXJ2aWNlczEgMB4GA1UEAwwXbG9naW4ubm9ydGh1bWJyaWEu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDG5ycTOP3wR+Ev
-						NAiB2rQIB7DEKe8E06FJBU0Jdf0kZj6f/TzVSR8pFP69wTdKxIeOD0Rs3ouo1+Af
-						7FNjyikcS9J4mbewSJwI1jU/65JyI9qEPGj12sRKD4XHE7nxe8Ai+FnUG2wSQ3gw
-						BWqyvEQ2AXs9m8qSoJt8vND2paBS4DZXNxB4NbtRZfHH25fjZ4D5ZuGi2jbSpUKK
-						tHjTFmxxk4Nn3Gqg2I/tXRKLBNrwUH0aKU3kqVEdvYN1vcku/Khqfk9XIfK5paUZ
-						xho/5iOXkMtPU1YdE3FCLBwNfXSa8+n7luRrNrfpMPme3NrYT6r7lT8nERrS1XSq
-						X5BDmYDBAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRgrGADB79pGyCbdE2M
-						VnFszgMZGTAfBgNVHSMEGDAWgBRgrGADB79pGyCbdE2MVnFszgMZGTANBgkqhkiG
-						9w0BAQsFAAOCAQEAZVWBX7n4lZfwRAAzJP1HRHTvCfsXp8MkeVs0MgkExrpm2r4H
-						xWX27/U1ojsQLJzTfnUL0/pqXYpip/vSY1zvo7wmxfqtkEUK0no9fljPvIxbu7Nt
-						WdHo7Ss07rUqkYXGiTcD2NA/71+tL3PTBmc/xPnT46vhChoVVEkhf5alG9HGrJ3E
-						uoy+45CpSWH9AEPCec7dU5GT/N46Yx4Gjhz99SkAP5KhIuE9dxnoS+OlolTiC/O8
-						XfWC7iSUlskXezVj2v8H2lhUrDTra4v76z9Ssi+LX6ZdyMk3UqL9tWqjwTliLD4a
-						SoDqiIcSreJigbWSnrQkhl2xthJ3c+25U3G0QA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.northumbria.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.northumbria.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 Northumbria at Newcastle</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Northumbria University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.northumbria.ac.uk/sd/central/its/dept_structure_etc/?view=Standard</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpline</GivenName>
-    <EmailAddress>mailto:it.helpline@northumbria.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Neil</GivenName>
-    <SurName>Graham</SurName>
-    <EmailAddress>mailto:neil.graham@northumbria.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml b/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml
deleted file mode 100644
index bbaab7c9..00000000
--- a/swamid-interfederations-2.0/login.nrg.eu-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://login.nrg.eu/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-09-16T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Nuclear Research and Consultancy Group</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Nuclear Research and Consultancy Group</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Nuclear Research and Consultancy Group</mdui:Description>
-        <mdui:Description xml:lang="en">Nuclear Research and Consultancy Group</mdui:Description>
-        <mdui:Logo height="87" width="108">https://static.surfconext.nl/logos/idp/nrg.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Nuclear Research and Consultancy Group nrg</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Nuclear Research and Consultancy Group nrg</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/341307fa6d9114669c896af91f70bb61"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Nuclear Research and Consultancy Group</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Nuclear Research and Consultancy Group</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nrg.eu</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/login.ntua.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
deleted file mode 100644
index 8f478f02..00000000
--- a/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ntua.gr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">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:Description xml:lang="en">National Technical University of Athens Identity Provider</mdui:Description>
-        <mdui:Description xml:lang="el">Υπηρεσία Ταυτότητας του Εθνικού Μετσόβιου Πολυτεχνείου</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://login.ntua.gr</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">https://login.ntua.gr</mdui:InformationURL>
-        <mdui:Logo height="302" width="300">https://login.ntua.gr/images/pyrforos300.png</mdui:Logo>
-        <mdui:Logo height="151" width="150">https://login.ntua.gr/images/pyrforos150.png</mdui:Logo>
-        <mdui:Logo height="50" width="50">https://login.ntua.gr/images/pyrforos50.png</mdui:Logo>
-      </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:GeolocationHint>geo:37.977413,23.782694</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ntua.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ntua.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ntua.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ntua.gr/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">ntua.gr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ntua.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ntua.gr: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">NTUA</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">ΕΜΠ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Technical University of Athens</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Εθνικό Μετσόβιο Πολυτεχνείο</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ntua.gr</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.ntua.gr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>National Technical University of Athens</md:Company>
-    <md:EmailAddress>mailto:noc@ntua.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-210-772-1861</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>National Technical University of Athens</md:Company>
-    <md:GivenName>NOC Helpdesk</md:GivenName>
-    <md:EmailAddress>mailto:help-data@noc.ntua.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-210-772-1861</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ourania Lambrou</md:GivenName>
-    <md:EmailAddress>mailto:rania@noc.ntua.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 5b176203..00000000
--- a/swamid-interfederations-2.0/login.ntua.gr.xml
+++ /dev/null
@@ -1,179 +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.oregonstate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.oregonstate.edu-idp-shibboleth.xml
deleted file mode 100644
index 1db7b45c..00000000
--- a/swamid-interfederations-2.0/login.oregonstate.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,70 +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://login.oregonstate.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">oregonstate.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Oregon State University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://is.oregonstate.edu/it-infrastructure/iam/incommon-federation</mdui:InformationURL>
-        <mdui:Logo height="54" width="177" xml:lang="en">https://login.oregonstate.edu/images/osu-logo.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>
-MIIDPzCCAiegAwIBAgIUEfvjo0YbOpCuYoilEkORPgg2kOEwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVbG9naW4ub3JlZ29uc3RhdGUuZWR1MB4XDTEyMTAxMjE5
-NDk1NloXDTMyMTAxMjE5NDk1NlowIDEeMBwGA1UEAxMVbG9naW4ub3JlZ29uc3Rh
-dGUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg9NvfUSFgi3N
-s7kiPBjUgBB5WOezJo4yGOaOR5H1AiKdbcWz7xXbK47AG8ysj0C1BZV0x7g0G1GI
-SMBn6rWU5nMMOn0/yoICt1aAlgrcCY4FkKnWUBi4H4Qzt16QGFT8hz3/BdD+/G+N
-V59hGEOIdwr5RVV+2ELLobeMEGQ5fyffc0DYvxq55gN7FvtgYWjLzRrLOC+9nhAU
-YlCi8HHyNkSqLVEX/rKBsURQrGUG/D/1EXlRrpA29LxBrcg91iQoRSH/78rs43WH
-VOra3IONWJxClt0wGLvyiGh8/Ty5zZbV4UYwYNeqOhHtFAnyqQ0kSXOqfHNMsCZB
-wcvYFND2ywIDAQABo3EwbzBOBgNVHREERzBFghVsb2dpbi5vcmVnb25zdGF0ZS5l
-ZHWGLGh0dHBzOi8vbG9naW4ub3JlZ29uc3RhdGUuZWR1L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBSgIqH+urOXUrrM+yCzxSm8v5Jf4TANBgkqhkiG9w0BAQUFAAOC
-AQEANnnFrilv6DoifHhRTOZRtfuJFP/3x10kqrJqyGPd/GAiXiXfO6mEnmOiSlC3
-9K07KbOCt/qsoWoW0QQzZgB36CCyuKi7ZZ4zp5oUzQnqPTNPgdaBkj+mwngQ3hjr
-sxXJdu3UN4dUZ8OyDgTO1I3NsA7VYDewpA/DdfrAdisN0coEW7ppeU7BVHFNxBvS
-yfbBaXLdxVLWOh3nAAha2tXUr0FRbZU3rREOVBPKuamYWmGES7Q2WphbBwfOcghx
-CHcq133UmHyK8LQ6SbbyiTBBQuivbhPELucJzIeUoJ7U089J5huDBQendCNS534D
-HcsvwYzQX/yDdIlusEse97Zcnw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.oregonstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.oregonstate.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.oregonstate.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Oregon State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Oregon State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.oregonstate.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IAM Team</md:GivenName>
-    <md:EmailAddress>iamteam@oregonstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IAM Team</md:GivenName>
-    <md:EmailAddress>iamteam@oregonstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Office of Information Security</md:GivenName>
-    <md:EmailAddress>Information.SecurityOffice@oregonstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.otis.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.otis.edu-idp-shibboleth.xml
deleted file mode 100644
index 1fbc750a..00000000
--- a/swamid-interfederations-2.0/login.otis.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,63 +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://login.otis.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">otis.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Otis College of Art and Design</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>
-MIIDIzCCAgugAwIBAgIUVXqq0XY3jJ8grlfflVWQPG0Cc/MwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAwwObG9naW4ub3Rpcy5lZHUwHhcNMTUwNDA3MjE1MDAzWhcN
-MzUwNDA3MjE1MDAzWjAZMRcwFQYDVQQDDA5sb2dpbi5vdGlzLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8OGMNgIYUEqWww3KcWQgO7xOuTbxF/
-v3E6vp5i+rPNKXD5UR+akfBPu+nvbx6IDWlpqNgSAnN8Ut8mJihDAspNvCK3/FLN
-QhuzMCaMZZ3HUybfVeV74/ZZCwwJsH9RjIl8id+pWVeQw6JWF4gGQHOP4ebMQsgP
-TzLQbfKGntK0VbxxW+DSkN8haSzuW3PcrKzn+WPdQGxEwnJoYjbFAYFA9aRW2G6u
-KvflAx2RecB1zjHszjGAi5vfmyvStuQ56jYWTVoLmxn7GXY7yVMTsqLIyyZBloDs
-TYg0L05hOQiJeeHmcBTdxNbSzrk0as57t93jW2YMiLDrGbJQ6o+4xH8CAwEAAaNj
-MGEwHQYDVR0OBBYEFPXE16lp8/DGAhDRafIlYrCRKKZOMEAGA1UdEQQ5MDeCDmxv
-Z2luLm90aXMuZWR1hiVodHRwczovL2xvZ2luLm90aXMuZWR1L2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQB3OcxDShEUwm5c6f2+8tw9H9RR9CiZ0iiZ
-uWlLGYF3v6BmGttXoNLlx7hltlHSffFx32jV941GTqRCoo6Bh9usRZ5BaaRyITxP
-mjnOeVWWCLmDnSwcN63MrNBVcjndNWNgtMs50n7VjzV9ki7JOAG1Tq8invBQG6YP
-gPa8fFpVKv+RuAYme/2aKXvUCUFmS+uWGooyLOccEiNDnEg//EJVvf801ADphXQy
-hydbhC0HcRASYUtWo8iWcOKRPyOZBhEH/DUk+S1Qbfs1CaCO2pMotSOpYj+QRaYB
-M+XRD4iPNuUG2kP1xit9w/OQcemXfGBnGX505w+0MYUbA2Ppan9G
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.otis.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.otis.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Otis College of Art and Design</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Otis College of Art and Design</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.otis.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Otis Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@otis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Matthew Ballard</md:GivenName>
-    <md:EmailAddress>mballard@otis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Otis Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@otis.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ou.nl-oam-fed.xml b/swamid-interfederations-2.0/login.ou.nl-oam-fed.xml
deleted file mode 100644
index ed7c0733..00000000
--- a/swamid-interfederations-2.0/login.ou.nl-oam-fed.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ou.nl/oam/fed">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-22T15:41:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">enterprise.ou.nl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ou.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">Open Universiteit</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Open Universiteit</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Open Universiteit</mdui:Description>
-        <mdui:Description xml:lang="en">Open Universiteit in the Netherlands</mdui:Description>
-        <mdui:Logo height="48" width="24">https://static.surfconext.nl/logos/idp/ou.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Open Universiteit in the Netherlands OU Heerlen</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Open Universiteit in the Netherlands OU Heerlen</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/9723a8fadcf112812d430766e7cedbb5"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Open Universiteit</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Open Universiteit</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ou.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/login.portal.uni-muenchen.de.xml b/swamid-interfederations-2.0/login.portal.uni-muenchen.de.xml
deleted file mode 100644
index 38f69193..00000000
--- a/swamid-interfederations-2.0/login.portal.uni-muenchen.de.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.portal.uni-muenchen.de/ea">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.portal.uni-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.portal.uni-muenchen.de,OU=IIIA5,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFXTCCBEWgAwIBAgIED8MrKTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNVBAoT
-KEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzANBgNV
-BAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMDAzMTkx
-NzAwMDlaFw0xMjAzMTgxNzAwMDlaMIGbMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1heGlt
-aWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEOMAwGA1UECxMFSUlJQTUxJTAj
-BgNVBAMTHGxvZ2luLnBvcnRhbC51bmktbXVlbmNoZW4uZGUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC6G/m8HckgWny3DypWJeX2mahdGk0tYcVmMnt+
-EfmTLFmRLALeUvwtcr0jW2jnmItBoQWSMAQyQ8HAMgmt/prtFzcQ6eUgHUd1QLnd
-iZjGAIw6UqC97Vldh0Zqjq5ZvBKSqQdFrxiTiuOitPbTe6LdrjWkvZv9WN25X+GK
-4bXjIjMzbqLNjPiDGsUAOhHDDXrgWhZ7VL1bKp8nGE+Am5EKohjaDx0yy7mjZy9d
-EKjoWyP0behrgiiHb0QK/Klq1jNNZGgC2iet7dGBH7VIs26A/yLJJVZOc94xeemR
-cVUVxOoyyKyApxCZaIv7Dg5EFaCIRAez+ToamAiT+k2esuy1AgMBAAGjggGwMIIB
-rDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFMO2d9EQ+vSi5e5BiNNQHkSJLsLFMB8GA1UdIwQY
-MBaAFHmHeGov+pu8I0+UpqN3HR4OlIAPMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD6gPKA6hjhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hl
-bi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBpAYIKwYBBQUHAQEEgZcwgZQwSAYIKwYB
-BQUHMAKGPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS91bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQC2wKD26urVVbOle8lVzOkK8EaOndAxW5oRMikA0532
-QnDopq3GQpm+cq+nA3sjXTkWoWZ5OrrRlwJViDYlHFY7VTqXleq3pHQOKAmMdONL
-UXR3OuZTm0IzSZuzRXPViaZO82DdlzSs+lCTswm9/zhwOOujL2UU1K3wFFr2QHwv
-Hy6a0t+jw26IRnK18/SNgaMtH+fNQOxWZ2z9V3Mp6pLPEYp0k2jnqXLl0+wy6oO5
-U8IoRGe8oSW9FnmxOeF8Oshalh452Q4+C9sgybjvPahg6A/c+7DLoSiVzua2xKyr
-YGuXw/BwbiMxt3pERpJZk9GYLdpH4skDKj/rNeW78GzI
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.portal.uni-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.portal.uni-muenchen.de,OU=IIIA5,O=Ludwig-Maximilians-Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFXTCCBEWgAwIBAgIED8MrKTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xMTAvBgNVBAoT
-KEx1ZHdpZy1NYXhpbWlsaWFucy1Vbml2ZXJzaXRhZXQgTXVlbmNoZW4xDzANBgNV
-BAMTBkxNVS1DQTEZMBcGCSqGSIb3DQEJARYKcGtpQGxtdS5kZTAeFw0xMDAzMTkx
-NzAwMDlaFw0xMjAzMTgxNzAwMDlaMIGbMQswCQYDVQQGEwJERTEPMA0GA1UECBMG
-QmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjExMC8GA1UEChMoTHVkd2lnLU1heGlt
-aWxpYW5zLVVuaXZlcnNpdGFldCBNdWVuY2hlbjEOMAwGA1UECxMFSUlJQTUxJTAj
-BgNVBAMTHGxvZ2luLnBvcnRhbC51bmktbXVlbmNoZW4uZGUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC6G/m8HckgWny3DypWJeX2mahdGk0tYcVmMnt+
-EfmTLFmRLALeUvwtcr0jW2jnmItBoQWSMAQyQ8HAMgmt/prtFzcQ6eUgHUd1QLnd
-iZjGAIw6UqC97Vldh0Zqjq5ZvBKSqQdFrxiTiuOitPbTe6LdrjWkvZv9WN25X+GK
-4bXjIjMzbqLNjPiDGsUAOhHDDXrgWhZ7VL1bKp8nGE+Am5EKohjaDx0yy7mjZy9d
-EKjoWyP0behrgiiHb0QK/Klq1jNNZGgC2iet7dGBH7VIs26A/yLJJVZOc94xeemR
-cVUVxOoyyKyApxCZaIv7Dg5EFaCIRAez+ToamAiT+k2esuy1AgMBAAGjggGwMIIB
-rDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFMO2d9EQ+vSi5e5BiNNQHkSJLsLFMB8GA1UdIwQY
-MBaAFHmHeGov+pu8I0+UpqN3HR4OlIAPMIGLBgNVHR8EgYMwgYAwPqA8oDqGOGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD6gPKA6hjhodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tdWVuY2hl
-bi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBpAYIKwYBBQUHAQEEgZcwgZQwSAYIKwYB
-BQUHMAKGPGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW11ZW5jaGVuLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS91bmktbXVlbmNoZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQC2wKD26urVVbOle8lVzOkK8EaOndAxW5oRMikA0532
-QnDopq3GQpm+cq+nA3sjXTkWoWZ5OrrRlwJViDYlHFY7VTqXleq3pHQOKAmMdONL
-UXR3OuZTm0IzSZuzRXPViaZO82DdlzSs+lCTswm9/zhwOOujL2UU1K3wFFr2QHwv
-Hy6a0t+jw26IRnK18/SNgaMtH+fNQOxWZ2z9V3Mp6pLPEYp0k2jnqXLl0+wy6oO5
-U8IoRGe8oSW9FnmxOeF8Oshalh452Q4+C9sgybjvPahg6A/c+7DLoSiVzua2xKyr
-YGuXw/BwbiMxt3pERpJZk9GYLdpH4skDKj/rNeW78GzI
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.portal.uni-muenchen.de/sp/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.portal.uni-muenchen.de/sp/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.portal.uni-muenchen.de/sp/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.portal.uni-muenchen.de/sp/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.portal.uni-muenchen.de/sp/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.portal.uni-muenchen.de/sp/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.portal.uni-muenchen.de/sp/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.portal.uni-muenchen.de/sp/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.portal.uni-muenchen.de/sp/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.portal.uni-muenchen.de/sp/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">LMU Erstanmeldung</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">LMU Erstanmeldung</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://login.portal.uni-muenchen.de/ea</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrej</GivenName>
-    <SurName>Kolontai</SurName>
-    <EmailAddress>edv.security@verwaltung.uni-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.regis.edu.xml b/swamid-interfederations-2.0/login.regis.edu.xml
deleted file mode 100644
index 06aa8446..00000000
--- a/swamid-interfederations-2.0/login.regis.edu.xml
+++ /dev/null
@@ -1,94 +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://login.regis.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor 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">regis.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Regis University</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>
-MIIDWjCCAkKgAwIBAgIGASqgaBEhMA0GCSqGSIb3DQEBBQUAMG4xCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDbzEPMA0GA1UEBxMGRGVudmVyMRkwFwYDVQQKExBSZWdpcyBVbml2ZXJzaXR5MQwwCgYD
-VQQLEwNJVFMxGDAWBgNVBAMTD2xvZ2luLnJlZ2lzLmVkdTAeFw0xMDA4MjMxOTIzNDhaFw0xMjA4
-MjIxOTIzNDhaMG4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDbzEPMA0GA1UEBxMGRGVudmVyMRkw
-FwYDVQQKExBSZWdpcyBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxGDAWBgNVBAMTD2xvZ2luLnJl
-Z2lzLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ6QoQongAUGrHZ9eTcGf0bV
-sSEle3y522qHTF2+kBMZaxcCtD9s12rOPkhIbgnmKeQMOr9abSyu9aY1RKcjIzE6eozkvvmsjjfU
-aRBLXEMzW33CmFmEa2EP5RrNNmQkHJvjb2ZCoZJOjYSi+wnlSROkw3yxxj2ChV/FwhuMwXVZL/pL
-FCwO/XNNRjWaqyUbrHzbqVVlpch8NU0XyhaUlWfsxqqikWeEaPCT1VPWWLfzKiiuz9u9yqTcyuo8
-+g+gJ/ovzKOQ7ae6UGJL4rMzxK4fvYrMO0EWgfYRFnl8ShJ0AS5KIaSpwcufhBC2EhaV2gN7uI/E
-YkVnimyG/wvlNwMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAemW0ASJe3Z5LbvPjskXhCA8fxq5D
-vaUH4GQUceN6JfBlugrwd1ivzhe5ez5vIwQPNmQiwdQphr0nXehMCm1WXsM8/Q9/VUF0FHzxLCB+
-79OKVSlCIMCZW77q4HqcXfGzxPqJr55f8oYb325AcvgugLclm5nLX+/hwGJoaBhoLju4ZI5DbgUg
-zRYY89D7K/WkbnW7gFRPZ8NTP+U5m2e+NP/+Xm0og9O2YhilNZH3Mn+NSZwNdbXJ5RXv4Wrq0F4e
-rEHhvsmbrjPpcG8BJ46pYReen2ZTZ1uEVmHsaAFD6Fz0nsWj7BwKPptmnkMPgxJ57Wod96ysgGjn
-zwa3cLKnmg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.regis.edu/idp/soap.ssaml1" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.regis.edu/idp/ARS.ssaml2" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.regis.edu/idp/SSO.saml2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.regis.edu/idp/SSO.saml2"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">regis.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDWjCCAkKgAwIBAgIGASqgaBEhMA0GCSqGSIb3DQEBBQUAMG4xCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDbzEPMA0GA1UEBxMGRGVudmVyMRkwFwYDVQQKExBSZWdpcyBVbml2ZXJzaXR5MQwwCgYD
-VQQLEwNJVFMxGDAWBgNVBAMTD2xvZ2luLnJlZ2lzLmVkdTAeFw0xMDA4MjMxOTIzNDhaFw0xMjA4
-MjIxOTIzNDhaMG4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDbzEPMA0GA1UEBxMGRGVudmVyMRkw
-FwYDVQQKExBSZWdpcyBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxGDAWBgNVBAMTD2xvZ2luLnJl
-Z2lzLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ6QoQongAUGrHZ9eTcGf0bV
-sSEle3y522qHTF2+kBMZaxcCtD9s12rOPkhIbgnmKeQMOr9abSyu9aY1RKcjIzE6eozkvvmsjjfU
-aRBLXEMzW33CmFmEa2EP5RrNNmQkHJvjb2ZCoZJOjYSi+wnlSROkw3yxxj2ChV/FwhuMwXVZL/pL
-FCwO/XNNRjWaqyUbrHzbqVVlpch8NU0XyhaUlWfsxqqikWeEaPCT1VPWWLfzKiiuz9u9yqTcyuo8
-+g+gJ/ovzKOQ7ae6UGJL4rMzxK4fvYrMO0EWgfYRFnl8ShJ0AS5KIaSpwcufhBC2EhaV2gN7uI/E
-YkVnimyG/wvlNwMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAemW0ASJe3Z5LbvPjskXhCA8fxq5D
-vaUH4GQUceN6JfBlugrwd1ivzhe5ez5vIwQPNmQiwdQphr0nXehMCm1WXsM8/Q9/VUF0FHzxLCB+
-79OKVSlCIMCZW77q4HqcXfGzxPqJr55f8oYb325AcvgugLclm5nLX+/hwGJoaBhoLju4ZI5DbgUg
-zRYY89D7K/WkbnW7gFRPZ8NTP+U5m2e+NP/+Xm0og9O2YhilNZH3Mn+NSZwNdbXJ5RXv4Wrq0F4e
-rEHhvsmbrjPpcG8BJ46pYReen2ZTZ1uEVmHsaAFD6Fz0nsWj7BwKPptmnkMPgxJ57Wod96ysgGjn
-zwa3cLKnmg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.regis.edu/idp/attrsvc.ssaml2"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Regis University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Regis University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://regis.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jerry Perez</md:GivenName>
-    <md:EmailAddress>jperez@regis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Erich Delcamp</md:GivenName>
-    <md:EmailAddress>edelcamp@regis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Greg Hatayama</md:GivenName>
-    <md:EmailAddress>ghatayam@regis.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
deleted file mode 100644
index 7625e144..00000000
--- a/swamid-interfederations-2.0/login.restena.lu-simplesamlphp-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.restena.lu/simplesamlphp/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.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">RESTENA Users</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">RESTENA Utilisateurs</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">RESTENA Benutzer</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="lb">RESTENA Useren</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for end users with an account at RESTENA Foundation</mdui:Description>
-        <mdui:Description xml:lang="fr">Fournisseur d'Identité pour utilisateurs avec un compte de la Fondation RESTENA</mdui:Description>
-        <mdui:Description xml:lang="de">Identitätsprovider für Nutzer mit einem Benutzerkonto bei der Stiftung RESTENA</mdui:Description>
-        <mdui:Keywords xml:lang="en">RESTENA user users login education</mdui:Keywords>
-        <mdui:Logo width="78" height="100" xml:lang="en">http://login.restena.lu/restena.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:a18::0/32</mdui:IPHint>
-        <mdui:DomainHint>education.lu</mdui:DomainHint>
-        <mdui:DomainHint>lu</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:49.50,6.00</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>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</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>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.restena.lu/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://login.restena.lu/simplesamlphp/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">RESTENA Foundation</md:OrganizationName>
-    <md:OrganizationName xml:lang="fr">Fondation RESTENA</md:OrganizationName>
-    <md:OrganizationName xml:lang="de">Stiftung RESTENA</md:OrganizationName>
-    <md:OrganizationName xml:lang="lb">Steftung RESTENA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RESTENA Users</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.restena.lu/restena/en/EN-Presentation.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.restena.lu/restena/fr/FR-Presentation.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>RESTENA</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@restena.lu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.rz.rwth-aachen.de.xml b/swamid-interfederations-2.0/login.rz.rwth-aachen.de.xml
deleted file mode 100644
index 2a19dd08..00000000
--- a/swamid-interfederations-2.0/login.rz.rwth-aachen.de.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.rz.rwth-aachen.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rwth-aachen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEC1FmFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wNzExMDcxNjMy
-MDhaFw0xMjExMDUxNjMyMDhaMIGfMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-dW0xIDAeBgNVBAMTF2xvZ2luLnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2hVOkyelzF5UQylTADmmcHzrwzRjteUTx6b
-SCnQlTUiCsMGdICcOdP/kzBHDTJsd5AAlb5DMZ5M4O4Vl1NaJPLDT7nQj3oAF9pu
-CNv9XeguWwR1Bsy+KzJ+ixxVP0nt6665zY9FSRPJOVII6ziNUgedmtFV96jWQ49P
-R6duFD9CDyAlLj2DZSANeG50sX1Bcfc5F6UHSgkTzLnJqtl3ufQ/ltZyb3iEmOLS
-mcoOKaS/HUV4vp1y6zVCLbU/i8t82vr6zFB0zJuQiiFQtrp1j/V06XuXxzjpleUz
-jySyWf+4W1svGGWkQdZyPdht90i1NFCYQIhSY+U3iNNGl2SnOwIDAQABo4IBjTCC
-AYkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBSOzgsiaPAKHD8PTdDijBwTIGvetTAfBgNVHSME
-GDAWgBRu1T7AHC9xyTy/SU7valVI7NHyODB5BgNVHR8EcjBwMDagNKAyhjBodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0
-oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBlAYIKwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYB
-BQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGl5Pq3DyUfhi1G/TEB6/rlf
-fPG85RidFcLXm5BamuZithBT2F/pvFRnlnaogUU6ik9I73qdxFLKAX7c+K/BC89D
-jEosFBgD4zCHRTe3gnyBhG4+T40smabgvEBS1LOJPib14nLPOPouFnvdwaD+hCq0
-3XjbCwyEGgGnODTgFAkL+bWx/mgEZpbiCtzYuOVxojm0hQ5i42l9RIKsLrZ3ooT/
-T6qF9criC1jOHj11gJeZ11z/znefgOY+oK9vlc/41+JzhDWiiZ2KB05aiSfq+mTF
-sHc/L7HpK3d6tFerveNpu6HAAyALsqwKOS2CqmANj5EDFnY57yTDWJZcgsMlK+c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEC1FmFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wNzExMDcxNjMy
-MDhaFw0xMjExMDUxNjMyMDhaMIGfMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-dW0xIDAeBgNVBAMTF2xvZ2luLnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2hVOkyelzF5UQylTADmmcHzrwzRjteUTx6b
-SCnQlTUiCsMGdICcOdP/kzBHDTJsd5AAlb5DMZ5M4O4Vl1NaJPLDT7nQj3oAF9pu
-CNv9XeguWwR1Bsy+KzJ+ixxVP0nt6665zY9FSRPJOVII6ziNUgedmtFV96jWQ49P
-R6duFD9CDyAlLj2DZSANeG50sX1Bcfc5F6UHSgkTzLnJqtl3ufQ/ltZyb3iEmOLS
-mcoOKaS/HUV4vp1y6zVCLbU/i8t82vr6zFB0zJuQiiFQtrp1j/V06XuXxzjpleUz
-jySyWf+4W1svGGWkQdZyPdht90i1NFCYQIhSY+U3iNNGl2SnOwIDAQABo4IBjTCC
-AYkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBSOzgsiaPAKHD8PTdDijBwTIGvetTAfBgNVHSME
-GDAWgBRu1T7AHC9xyTy/SU7valVI7NHyODB5BgNVHR8EcjBwMDagNKAyhjBodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0
-oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBlAYIKwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYB
-BQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGl5Pq3DyUfhi1G/TEB6/rlf
-fPG85RidFcLXm5BamuZithBT2F/pvFRnlnaogUU6ik9I73qdxFLKAX7c+K/BC89D
-jEosFBgD4zCHRTe3gnyBhG4+T40smabgvEBS1LOJPib14nLPOPouFnvdwaD+hCq0
-3XjbCwyEGgGnODTgFAkL+bWx/mgEZpbiCtzYuOVxojm0hQ5i42l9RIKsLrZ3ooT/
-T6qF9criC1jOHj11gJeZ11z/znefgOY+oK9vlc/41+JzhDWiiZ2KB05aiSfq+mTF
-sHc/L7HpK3d6tFerveNpu6HAAyALsqwKOS2CqmANj5EDFnY57yTDWJZcgsMlK+c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.rz.rwth-aachen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.rz.rwth-aachen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.rz.rwth-aachen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.rz.rwth-aachen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.rz.rwth-aachen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">rwth-aachen.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEC1FmFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wNzExMDcxNjMy
-MDhaFw0xMjExMDUxNjMyMDhaMIGfMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-dW0xIDAeBgNVBAMTF2xvZ2luLnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2hVOkyelzF5UQylTADmmcHzrwzRjteUTx6b
-SCnQlTUiCsMGdICcOdP/kzBHDTJsd5AAlb5DMZ5M4O4Vl1NaJPLDT7nQj3oAF9pu
-CNv9XeguWwR1Bsy+KzJ+ixxVP0nt6665zY9FSRPJOVII6ziNUgedmtFV96jWQ49P
-R6duFD9CDyAlLj2DZSANeG50sX1Bcfc5F6UHSgkTzLnJqtl3ufQ/ltZyb3iEmOLS
-mcoOKaS/HUV4vp1y6zVCLbU/i8t82vr6zFB0zJuQiiFQtrp1j/V06XuXxzjpleUz
-jySyWf+4W1svGGWkQdZyPdht90i1NFCYQIhSY+U3iNNGl2SnOwIDAQABo4IBjTCC
-AYkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBSOzgsiaPAKHD8PTdDijBwTIGvetTAfBgNVHSME
-GDAWgBRu1T7AHC9xyTy/SU7valVI7NHyODB5BgNVHR8EcjBwMDagNKAyhjBodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0
-oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBlAYIKwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYB
-BQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGl5Pq3DyUfhi1G/TEB6/rlf
-fPG85RidFcLXm5BamuZithBT2F/pvFRnlnaogUU6ik9I73qdxFLKAX7c+K/BC89D
-jEosFBgD4zCHRTe3gnyBhG4+T40smabgvEBS1LOJPib14nLPOPouFnvdwaD+hCq0
-3XjbCwyEGgGnODTgFAkL+bWx/mgEZpbiCtzYuOVxojm0hQ5i42l9RIKsLrZ3ooT/
-T6qF9criC1jOHj11gJeZ11z/znefgOY+oK9vlc/41+JzhDWiiZ2KB05aiSfq+mTF
-sHc/L7HpK3d6tFerveNpu6HAAyALsqwKOS2CqmANj5EDFnY57yTDWJZcgsMlK+c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCzCCA/OgAwIBAgIEC1FmFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wNzExMDcxNjMy
-MDhaFw0xMjExMDUxNjMyMDhaMIGfMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-dW0xIDAeBgNVBAMTF2xvZ2luLnJ6LnJ3dGgtYWFjaGVuLmRlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs2hVOkyelzF5UQylTADmmcHzrwzRjteUTx6b
-SCnQlTUiCsMGdICcOdP/kzBHDTJsd5AAlb5DMZ5M4O4Vl1NaJPLDT7nQj3oAF9pu
-CNv9XeguWwR1Bsy+KzJ+ixxVP0nt6665zY9FSRPJOVII6ziNUgedmtFV96jWQ49P
-R6duFD9CDyAlLj2DZSANeG50sX1Bcfc5F6UHSgkTzLnJqtl3ufQ/ltZyb3iEmOLS
-mcoOKaS/HUV4vp1y6zVCLbU/i8t82vr6zFB0zJuQiiFQtrp1j/V06XuXxzjpleUz
-jySyWf+4W1svGGWkQdZyPdht90i1NFCYQIhSY+U3iNNGl2SnOwIDAQABo4IBjTCC
-AYkwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBSOzgsiaPAKHD8PTdDijBwTIGvetTAfBgNVHSME
-GDAWgBRu1T7AHC9xyTy/SU7valVI7NHyODB5BgNVHR8EcjBwMDagNKAyhjBodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0
-oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCBlAYIKwYBBQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAx
-LnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYB
-BQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcnd0aC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGl5Pq3DyUfhi1G/TEB6/rlf
-fPG85RidFcLXm5BamuZithBT2F/pvFRnlnaogUU6ik9I73qdxFLKAX7c+K/BC89D
-jEosFBgD4zCHRTe3gnyBhG4+T40smabgvEBS1LOJPib14nLPOPouFnvdwaD+hCq0
-3XjbCwyEGgGnODTgFAkL+bWx/mgEZpbiCtzYuOVxojm0hQ5i42l9RIKsLrZ3ooT/
-T6qF9criC1jOHj11gJeZ11z/znefgOY+oK9vlc/41+JzhDWiiZ2KB05aiSfq+mTF
-sHc/L7HpK3d6tFerveNpu6HAAyALsqwKOS2CqmANj5EDFnY57yTDWJZcgsMlK+c=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.rz.rwth-aachen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.rz.rwth-aachen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">RWTH Aachen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">RWTH Aachen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.rwth-aachen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Christian</GivenName>
-    <SurName>Bischof</SurName>
-    <EmailAddress>bischof@rz.rwth-aachen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Wilfred</GivenName>
-    <SurName>Gasper</SurName>
-    <EmailAddress>sso@rz.rwth-aachen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.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 80d0facf..00000000
--- a/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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.surfnet.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">soliscom.uu.nl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uu.nl</shibmd:Scope>
-      <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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md: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 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/login.slub-dresden.de.xml b/swamid-interfederations-2.0/login.slub-dresden.de.xml
deleted file mode 100644
index db1735c7..00000000
--- a/swamid-interfederations-2.0/login.slub-dresden.de.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.slub-dresden.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">slub-dresden.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.slub-dresden.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.slub-dresden.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFejCCBGKgAwIBAgIEER82YjANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
-BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTAxMjA4MTY1NjUxWhcNMTUx
-MjA3MTY1NjUxWjCBqTELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
-BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
-YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
-BAsTAklUMR4wHAYDVQQDExVsb2dpbi5zbHViLWRyZXNkZW4uZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWvW+lzOJGBUl2VquB2WwwWdNabWSjkTcH
-fnSq2NT7V6/hhYIA051JeThS5riLRyPxCk6bpQt7vOl+v7+sh4pQnumaTt3uYibo
-4JHrHUko2zaNJ+62/5hZKtpSbYbSxUjwwTHv9ENbBZOdj7lxjiTf/xv/DQYXfuAn
-fjFnzJ46UfPNRiMXjICFwOX9pBX6Pvi+47JlirhChb8D6D0rX+cu6Yle7sYGDnHR
-RbAAx0atENk+fAYonpetFTF0mjOvvKlb99CMkTMi8h8viE2tLD1z+ds6xyCAk34y
-BzUakng0+ZZ3xuEK5LhkDJ9CRXSiqAmc2PpzqIcj07HgthGaXd7HAgMBAAGjggHK
-MIIBxjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUyKpSOjY02z3nvcEr+Pq2R6An10swHwYDVR0jBBgwFoAUxStT
-kxeDyfVGQu1Dat+2gKZH8uAwIgYDVR0RBBswGYEXbmllZGVybEBzbHViLWRyZXNk
-ZW4uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS90dS1kcmVzZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwPqA8oDqGOGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS90dS1kcmVzZGVuLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRyZXNkZW4t
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI+A
-/aJshQD10aJl6Zmc7Kdo6DehIu8ev4v3AhTAnTlHdFDaM4Bn38DMzv2lTniRzxs4
-csaCLtCArLzhDimZ4Co4t8fD7zAvfxMPK9KLdS+oGkD3jSuCNWeGYJlXieOarwI5
-7YnQZj2aJj/q/h67IN9EhO5TmSE8E91BoZDb/D1HFOnDtNmBWRl2YIDRAPbdYILi
-tlvGffPyCHqGDVPGr4/udHHoPLlX5xJOeUPsTqJWvyJH0dZ1QhotnXsZLB+1Zlgi
-RjBDLVfeKIoVbNUYlEvIqADoSO32kE60Ria8L84XZ/PRUIMyV7+0OjgatpQxMxQj
-+IJTcEjcKl3hPdIic+E=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.slub-dresden.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.slub-dresden.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFejCCBGKgAwIBAgIEER82YjANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
-BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTAxMjA4MTY1NjUxWhcNMTUx
-MjA3MTY1NjUxWjCBqTELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
-BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
-YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
-BAsTAklUMR4wHAYDVQQDExVsb2dpbi5zbHViLWRyZXNkZW4uZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWvW+lzOJGBUl2VquB2WwwWdNabWSjkTcH
-fnSq2NT7V6/hhYIA051JeThS5riLRyPxCk6bpQt7vOl+v7+sh4pQnumaTt3uYibo
-4JHrHUko2zaNJ+62/5hZKtpSbYbSxUjwwTHv9ENbBZOdj7lxjiTf/xv/DQYXfuAn
-fjFnzJ46UfPNRiMXjICFwOX9pBX6Pvi+47JlirhChb8D6D0rX+cu6Yle7sYGDnHR
-RbAAx0atENk+fAYonpetFTF0mjOvvKlb99CMkTMi8h8viE2tLD1z+ds6xyCAk34y
-BzUakng0+ZZ3xuEK5LhkDJ9CRXSiqAmc2PpzqIcj07HgthGaXd7HAgMBAAGjggHK
-MIIBxjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUyKpSOjY02z3nvcEr+Pq2R6An10swHwYDVR0jBBgwFoAUxStT
-kxeDyfVGQu1Dat+2gKZH8uAwIgYDVR0RBBswGYEXbmllZGVybEBzbHViLWRyZXNk
-ZW4uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS90dS1kcmVzZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwPqA8oDqGOGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS90dS1kcmVzZGVuLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRyZXNkZW4t
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI+A
-/aJshQD10aJl6Zmc7Kdo6DehIu8ev4v3AhTAnTlHdFDaM4Bn38DMzv2lTniRzxs4
-csaCLtCArLzhDimZ4Co4t8fD7zAvfxMPK9KLdS+oGkD3jSuCNWeGYJlXieOarwI5
-7YnQZj2aJj/q/h67IN9EhO5TmSE8E91BoZDb/D1HFOnDtNmBWRl2YIDRAPbdYILi
-tlvGffPyCHqGDVPGr4/udHHoPLlX5xJOeUPsTqJWvyJH0dZ1QhotnXsZLB+1Zlgi
-RjBDLVfeKIoVbNUYlEvIqADoSO32kE60Ria8L84XZ/PRUIMyV7+0OjgatpQxMxQj
-+IJTcEjcKl3hPdIic+E=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.slub-dresden.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.slub-dresden.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.slub-dresden.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.slub-dresden.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.slub-dresden.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.slub-dresden.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">slub-dresden.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.slub-dresden.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.slub-dresden.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFejCCBGKgAwIBAgIEER82YjANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
-BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTAxMjA4MTY1NjUxWhcNMTUx
-MjA3MTY1NjUxWjCBqTELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
-BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
-YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
-BAsTAklUMR4wHAYDVQQDExVsb2dpbi5zbHViLWRyZXNkZW4uZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWvW+lzOJGBUl2VquB2WwwWdNabWSjkTcH
-fnSq2NT7V6/hhYIA051JeThS5riLRyPxCk6bpQt7vOl+v7+sh4pQnumaTt3uYibo
-4JHrHUko2zaNJ+62/5hZKtpSbYbSxUjwwTHv9ENbBZOdj7lxjiTf/xv/DQYXfuAn
-fjFnzJ46UfPNRiMXjICFwOX9pBX6Pvi+47JlirhChb8D6D0rX+cu6Yle7sYGDnHR
-RbAAx0atENk+fAYonpetFTF0mjOvvKlb99CMkTMi8h8viE2tLD1z+ds6xyCAk34y
-BzUakng0+ZZ3xuEK5LhkDJ9CRXSiqAmc2PpzqIcj07HgthGaXd7HAgMBAAGjggHK
-MIIBxjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUyKpSOjY02z3nvcEr+Pq2R6An10swHwYDVR0jBBgwFoAUxStT
-kxeDyfVGQu1Dat+2gKZH8uAwIgYDVR0RBBswGYEXbmllZGVybEBzbHViLWRyZXNk
-ZW4uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS90dS1kcmVzZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwPqA8oDqGOGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS90dS1kcmVzZGVuLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRyZXNkZW4t
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI+A
-/aJshQD10aJl6Zmc7Kdo6DehIu8ev4v3AhTAnTlHdFDaM4Bn38DMzv2lTniRzxs4
-csaCLtCArLzhDimZ4Co4t8fD7zAvfxMPK9KLdS+oGkD3jSuCNWeGYJlXieOarwI5
-7YnQZj2aJj/q/h67IN9EhO5TmSE8E91BoZDb/D1HFOnDtNmBWRl2YIDRAPbdYILi
-tlvGffPyCHqGDVPGr4/udHHoPLlX5xJOeUPsTqJWvyJH0dZ1QhotnXsZLB+1Zlgi
-RjBDLVfeKIoVbNUYlEvIqADoSO32kE60Ria8L84XZ/PRUIMyV7+0OjgatpQxMxQj
-+IJTcEjcKl3hPdIic+E=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.slub-dresden.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.slub-dresden.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFejCCBGKgAwIBAgIEER82YjANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
-BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTAxMjA4MTY1NjUxWhcNMTUx
-MjA3MTY1NjUxWjCBqTELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
-BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
-YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
-BAsTAklUMR4wHAYDVQQDExVsb2dpbi5zbHViLWRyZXNkZW4uZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWvW+lzOJGBUl2VquB2WwwWdNabWSjkTcH
-fnSq2NT7V6/hhYIA051JeThS5riLRyPxCk6bpQt7vOl+v7+sh4pQnumaTt3uYibo
-4JHrHUko2zaNJ+62/5hZKtpSbYbSxUjwwTHv9ENbBZOdj7lxjiTf/xv/DQYXfuAn
-fjFnzJ46UfPNRiMXjICFwOX9pBX6Pvi+47JlirhChb8D6D0rX+cu6Yle7sYGDnHR
-RbAAx0atENk+fAYonpetFTF0mjOvvKlb99CMkTMi8h8viE2tLD1z+ds6xyCAk34y
-BzUakng0+ZZ3xuEK5LhkDJ9CRXSiqAmc2PpzqIcj07HgthGaXd7HAgMBAAGjggHK
-MIIBxjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUyKpSOjY02z3nvcEr+Pq2R6An10swHwYDVR0jBBgwFoAUxStT
-kxeDyfVGQu1Dat+2gKZH8uAwIgYDVR0RBBswGYEXbmllZGVybEBzbHViLWRyZXNk
-ZW4uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS90dS1kcmVzZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwPqA8oDqGOGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS90dS1kcmVzZGVuLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0
-MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1LWRyZXNkZW4t
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI+A
-/aJshQD10aJl6Zmc7Kdo6DehIu8ev4v3AhTAnTlHdFDaM4Bn38DMzv2lTniRzxs4
-csaCLtCArLzhDimZ4Co4t8fD7zAvfxMPK9KLdS+oGkD3jSuCNWeGYJlXieOarwI5
-7YnQZj2aJj/q/h67IN9EhO5TmSE8E91BoZDb/D1HFOnDtNmBWRl2YIDRAPbdYILi
-tlvGffPyCHqGDVPGr4/udHHoPLlX5xJOeUPsTqJWvyJH0dZ1QhotnXsZLB+1Zlgi
-RjBDLVfeKIoVbNUYlEvIqADoSO32kE60Ria8L84XZ/PRUIMyV7+0OjgatpQxMxQj
-+IJTcEjcKl3hPdIic+E=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.slub-dresden.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.slub-dresden.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">SLUB Dresden</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">SLUB Dresden</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.slub-dresden.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Falk</GivenName>
-    <SurName>Niederlein</SurName>
-    <EmailAddress>niederl@slub-dresden.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml b/swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml
deleted file mode 100644
index d14c9a88..00000000
--- a/swamid-interfederations-2.0/login.sonoma.edu-shibboleth.xml
+++ /dev/null
@@ -1,118 +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://login.sonoma.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.sonoma.edu/it/helpdesk/" 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">sonoma.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sonoma State University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.sonoma.edu/about/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.sonoma.edu/ps/security/policies_standards.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="144" width="288" xml:lang="en">https://www.sonoma.edu/logos/web/primarybox-web143b87.jpg</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>
-MIIDZjCCAs+gAwIBAgICAW4wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAlVT
-MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRUwEwYDVQQHEwxSb2huZXJ0IFBhcmsxIDAe
-BgNVBAoTF1Nvbm9tYSBTdGF0ZSBVbml2ZXJzaXR5MR8wHQYDVQQLExZJbmZvcm1h
-dGlvbiBUZWNobm9sb2d5MRIwEAYDVQQDEwlTU1UgSVQgQ0EwHhcNMTIxMDIzMjAx
-NzE0WhcNMzIxMDIzMjAxNzE0WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
-bGlmb3JuaWExFTATBgNVBAcTDFJvaG5lcnQgUGFyazEgMB4GA1UEChMXU29ub21h
-IFN0YXRlIFVuaXZlcnNpdHkxCzAJBgNVBAsTAklUMRkwFwYDVQQDExBsb2dpbi5z
-b25vbWEuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxcawdP5T
-XGm/QPwvk/CUo8J8j3xzIGQk/iSUipR/YSU1v7n2lVkVmV1MPiQvNXFt/QpqDX7S
-5OB4q4OTeJAGpMvkJOJeyFTjDRifyOqa0zA9QjpYnpoFfEyjHucyPmhGpklSHICa
-z0zLF+BA6k8hJnm5aAWqY9SvDeLWiFQnOnKUoJhm+ZK629zjHiQkCP0qx5K0pmUq
-9GbE8hXt1P6bdUbHbVyf/bN+1Fjn0h8wlop8J6LLByqva/sRzdgwhJCIrNNeigZU
-Ss/FQhePRXht4yYIJ3YNGtYfPKmOpt4anT9ssdV9uAPi3r/DyGbKAS0AgO0VwJH8
-IPzjbEAQzUnRMwIDAQABo1YwVDBSBgNVHREESzBJgglsb2NhbGhvc3SCEGxvZ2lu
-LnNvbm9tYS5lZHWCFGxvZ2luLmRldi5zb25vbWEuZWR1ghRsb2dpbi50c3Quc29u
-b21hLmVkdTANBgkqhkiG9w0BAQUFAAOBgQCZ2KTynQZ44YnGTO6ARKc/P2+J0bto
-xP0nUWQ+N+yU6ylsHDmeRlxPvtJNKW5N+OvX45ZsGKKtBi9KzOXWH61dZ7vZreTq
-8x65mJ4/TVV3m5eTZzPV57n9dEsqXJx+4kGCVMVc9Y3h5Mqh2CiALUi78OhW3LC6
-xAsmDU5SmtNXeA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.sonoma.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.sonoma.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.sonoma.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.sonoma.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.sonoma.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.sonoma.edu/idp/profile/Shibboleth/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">sonoma.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDZjCCAs+gAwIBAgICAW4wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAlVT
-MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRUwEwYDVQQHEwxSb2huZXJ0IFBhcmsxIDAe
-BgNVBAoTF1Nvbm9tYSBTdGF0ZSBVbml2ZXJzaXR5MR8wHQYDVQQLExZJbmZvcm1h
-dGlvbiBUZWNobm9sb2d5MRIwEAYDVQQDEwlTU1UgSVQgQ0EwHhcNMTIxMDIzMjAx
-NzE0WhcNMzIxMDIzMjAxNzE0WjCBgzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh
-bGlmb3JuaWExFTATBgNVBAcTDFJvaG5lcnQgUGFyazEgMB4GA1UEChMXU29ub21h
-IFN0YXRlIFVuaXZlcnNpdHkxCzAJBgNVBAsTAklUMRkwFwYDVQQDExBsb2dpbi5z
-b25vbWEuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxcawdP5T
-XGm/QPwvk/CUo8J8j3xzIGQk/iSUipR/YSU1v7n2lVkVmV1MPiQvNXFt/QpqDX7S
-5OB4q4OTeJAGpMvkJOJeyFTjDRifyOqa0zA9QjpYnpoFfEyjHucyPmhGpklSHICa
-z0zLF+BA6k8hJnm5aAWqY9SvDeLWiFQnOnKUoJhm+ZK629zjHiQkCP0qx5K0pmUq
-9GbE8hXt1P6bdUbHbVyf/bN+1Fjn0h8wlop8J6LLByqva/sRzdgwhJCIrNNeigZU
-Ss/FQhePRXht4yYIJ3YNGtYfPKmOpt4anT9ssdV9uAPi3r/DyGbKAS0AgO0VwJH8
-IPzjbEAQzUnRMwIDAQABo1YwVDBSBgNVHREESzBJgglsb2NhbGhvc3SCEGxvZ2lu
-LnNvbm9tYS5lZHWCFGxvZ2luLmRldi5zb25vbWEuZWR1ghRsb2dpbi50c3Quc29u
-b21hLmVkdTANBgkqhkiG9w0BAQUFAAOBgQCZ2KTynQZ44YnGTO6ARKc/P2+J0bto
-xP0nUWQ+N+yU6ylsHDmeRlxPvtJNKW5N+OvX45ZsGKKtBi9KzOXWH61dZ7vZreTq
-8x65mJ4/TVV3m5eTZzPV57n9dEsqXJx+4kGCVMVc9Y3h5Mqh2CiALUi78OhW3LC6
-xAsmDU5SmtNXeA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.sonoma.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.sonoma.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Sonoma State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sonoma State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sonoma.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Eric Eisenhart</md:GivenName>
-    <md:EmailAddress>eric.eisenhart@sonoma.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brian Biggs</md:GivenName>
-    <md:EmailAddress>brian.biggs@sonoma.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Geoff Cirullo</md:GivenName>
-    <md:EmailAddress>cirullo@sonoma.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Andru Luvisi</md:GivenName>
-    <md:EmailAddress>andru.luvisi@sonoma.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Helpdesk</md:GivenName>
-    <md:EmailAddress>helpdesk@sonoma.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mike Nelson</md:GivenName>
-    <md:EmailAddress>mike.nelson@sonoma.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.stolaf.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.stolaf.edu-idp-shibboleth.xml
deleted file mode 100644
index 0a292a42..00000000
--- a/swamid-interfederations-2.0/login.stolaf.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://login.stolaf.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.stolaf.edu/services/iit/shibboleth/error.html" 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">stolaf.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">St. Olaf College</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>
-MIIEBTCCAu2gAwIBAgIJAIpCACOSmm5jMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-VQQGEwJVUzESMBAGA1UECAwJTWlubmVzb3RhMRMwEQYDVQQHDApOb3J0aGZpZWxk
-MRgwFgYDVQQKDA9TdCBPbGFmIENvbGxlZ2UxCzAJBgNVBAsMAklUMRkwFwYDVQQD
-DBBsb2dpbi5zdG9sYWYuZWR1MR4wHAYJKoZIhvcNAQkBFg9yb290QHN0b2xhZi5l
-ZHUwHhcNMTIwODA4MTUzODM4WhcNMzIwODA4MTUzODM4WjCBmDELMAkGA1UEBhMC
-VVMxEjAQBgNVBAgMCU1pbm5lc290YTETMBEGA1UEBwwKTm9ydGhmaWVsZDEYMBYG
-A1UECgwPU3QgT2xhZiBDb2xsZWdlMQswCQYDVQQLDAJJVDEZMBcGA1UEAwwQbG9n
-aW4uc3RvbGFmLmVkdTEeMBwGCSqGSIb3DQEJARYPcm9vdEBzdG9sYWYuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs6mj0mZ9xeLDbuGLO6ugsJWM
-5hN5Smi+MejkIv+Q95SVZP7tROG2kwMhMl8mPdV+xf8+vNG6GPLA58kyr5ShgLdf
-CAGYnoardWVvp9HVB4kcQA8CgizRmhupCKZqNqQOKg+7qejxHA863dWmPr4a62pS
-ddoMuhAOl9yZBpnGHusHy8+Cfbdan8NqUXBX33STQVqA3980oUxLxpo+ywF0prV2
-bCy/54dgIScVT66TDuGZAwdmToRE6Yi4FePI4FFRh7ohOajadkmG1Ni/uEbWXYwl
-l6ehDhTkm0lo0uZ8D1LtCe6ydKE6UAE1ACAZfrfyEh6LfnzoiFJCrJoOzTHlrQID
-AQABo1AwTjAdBgNVHQ4EFgQUt/02+LxZnPfKIg3hVKI774yeF9IwHwYDVR0jBBgw
-FoAUt/02+LxZnPfKIg3hVKI774yeF9IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAAq57xrup7Jtuy0u2GCcTyqF44T6wPPXwMTmy8R1104gT8AQh7VHh
-UqBU4OUHx3ZUaXNkGOVFQUftc9BSBxKBuyK+6m1yLQyY1zV/WI9UG7wjtUBcu2Vn
-PEKSb+LrqVee+0fm1kMLa7BBH2eDOF3L+7A88JhWnLmpXZIPv/iLoqqibZuw+nDU
-cYnf3BffmuLLX119fYL+023+7YDfXolEbyd0nYVeWV2e33xt6RJtmWuO1VbQsPQZ
-Gq8AofetoybsRS9b+CrRWiYzUvjZ0zkjDe9PMzvsXcS7xGD8/90X9damUttErlld
-Yj2frn/AgpSfFIR4btP5vc0jd8Qy85QoDg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.stolaf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.stolaf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.stolaf.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.stolaf.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.stolaf.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stolaf.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEBTCCAu2gAwIBAgIJAIpCACOSmm5jMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-VQQGEwJVUzESMBAGA1UECAwJTWlubmVzb3RhMRMwEQYDVQQHDApOb3J0aGZpZWxk
-MRgwFgYDVQQKDA9TdCBPbGFmIENvbGxlZ2UxCzAJBgNVBAsMAklUMRkwFwYDVQQD
-DBBsb2dpbi5zdG9sYWYuZWR1MR4wHAYJKoZIhvcNAQkBFg9yb290QHN0b2xhZi5l
-ZHUwHhcNMTIwODA4MTUzODM4WhcNMzIwODA4MTUzODM4WjCBmDELMAkGA1UEBhMC
-VVMxEjAQBgNVBAgMCU1pbm5lc290YTETMBEGA1UEBwwKTm9ydGhmaWVsZDEYMBYG
-A1UECgwPU3QgT2xhZiBDb2xsZWdlMQswCQYDVQQLDAJJVDEZMBcGA1UEAwwQbG9n
-aW4uc3RvbGFmLmVkdTEeMBwGCSqGSIb3DQEJARYPcm9vdEBzdG9sYWYuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs6mj0mZ9xeLDbuGLO6ugsJWM
-5hN5Smi+MejkIv+Q95SVZP7tROG2kwMhMl8mPdV+xf8+vNG6GPLA58kyr5ShgLdf
-CAGYnoardWVvp9HVB4kcQA8CgizRmhupCKZqNqQOKg+7qejxHA863dWmPr4a62pS
-ddoMuhAOl9yZBpnGHusHy8+Cfbdan8NqUXBX33STQVqA3980oUxLxpo+ywF0prV2
-bCy/54dgIScVT66TDuGZAwdmToRE6Yi4FePI4FFRh7ohOajadkmG1Ni/uEbWXYwl
-l6ehDhTkm0lo0uZ8D1LtCe6ydKE6UAE1ACAZfrfyEh6LfnzoiFJCrJoOzTHlrQID
-AQABo1AwTjAdBgNVHQ4EFgQUt/02+LxZnPfKIg3hVKI774yeF9IwHwYDVR0jBBgw
-FoAUt/02+LxZnPfKIg3hVKI774yeF9IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAAq57xrup7Jtuy0u2GCcTyqF44T6wPPXwMTmy8R1104gT8AQh7VHh
-UqBU4OUHx3ZUaXNkGOVFQUftc9BSBxKBuyK+6m1yLQyY1zV/WI9UG7wjtUBcu2Vn
-PEKSb+LrqVee+0fm1kMLa7BBH2eDOF3L+7A88JhWnLmpXZIPv/iLoqqibZuw+nDU
-cYnf3BffmuLLX119fYL+023+7YDfXolEbyd0nYVeWV2e33xt6RJtmWuO1VbQsPQZ
-Gq8AofetoybsRS9b+CrRWiYzUvjZ0zkjDe9PMzvsXcS7xGD8/90X9damUttErlld
-Yj2frn/AgpSfFIR4btP5vc0jd8Qy85QoDg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.stolaf.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">St. Olaf College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">St. Olaf College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://stolaf.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>St. Olaf Systems Team</md:GivenName>
-    <md:EmailAddress>root@stolaf.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.talisaspire.com-entity.xml b/swamid-interfederations-2.0/login.talisaspire.com-entity.xml
deleted file mode 100644
index e4b27390..00000000
--- a/swamid-interfederations-2.0/login.talisaspire.com-entity.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://login.talisaspire.com/entity">
-  <!--
-		This is an SP for Talis Group Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIESjCCAzKgAwIBAgIJAMtZwUsUp4zOMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
-						VQQGEwJVSzEWMBQGA1UECAwNV2VzdCBNaWRsYW5kczETMBEGA1UEBwwKQmlybWlu
-						Z2hhbTEYMBYGA1UECgwPVGFsaXMgRWR1Y2F0aW9uMQ4wDAYDVQQLDAVUYWxpczEY
-						MBYGA1UEAwwPdGFsaXNhc3BpcmUuY29tMSUwIwYJKoZIhvcNAQkBFhZjaHJpcy5j
-						bGFya2VAdGFsaXMuY29tMB4XDTExMDMwODA1MTM0MFoXDTIxMDMwNTA1MTM0MFow
-						gaUxCzAJBgNVBAYTAlVLMRYwFAYDVQQIDA1XZXN0IE1pZGxhbmRzMRMwEQYDVQQH
-						DApCaXJtaW5naGFtMRgwFgYDVQQKDA9UYWxpcyBFZHVjYXRpb24xDjAMBgNVBAsM
-						BVRhbGlzMRgwFgYDVQQDDA90YWxpc2FzcGlyZS5jb20xJTAjBgkqhkiG9w0BCQEW
-						FmNocmlzLmNsYXJrZUB0YWxpcy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQC2jZ0F13y/HTgY+8IeQup/7jpz3B92qJAKqwr0C/MyQfwYAmB1GjOF
-						KatEmOGFVfNtYRrALj7pbupnk8Ef9LuaQ4tIoKronwbdGhlgXkju4dkw29Mb4pQ/
-						+XUBeWfsw+P9B6TwWk8Ve12bPqrwdSgEUFXgke74HjJIzGDGGdd7p4uAUJM7zXzY
-						JeirO8hJps8SURuBKqlB5bIZM55NQ3l+HaoSP5MAFhzToBDTFS9XBalr6cz34pNm
-						7Tl2OZrF4Ze3icIWYuTDp/P+TKoyVbEVJXpAzvg4xve9/HCIBMD3TWoNJ4H78iR9
-						GIs8UMZFQL72G1PEX9x5u5FZDgEaJ59LAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJ
-						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
-						DgQWBBQLIjm7E2bjzlksRCqfC3wndwz54TAfBgNVHSMEGDAWgBQLIjm7E2bjzlks
-						RCqfC3wndwz54TANBgkqhkiG9w0BAQUFAAOCAQEAqBGZuPQkesleYXskpWTcmMSo
-						SOVN/fqGgwKKIizYn41iGJVnbJyy2v5c3I3mHd09zNhqCyHJysIy5EhwrA24BXHF
-						n6CbrPDIiDlg6gRx6rpBwxdXLnyihBHSSg5MSe5aGW5r/gEJ/2/LE9kavj/N8Ggu
-						sI5mcCc2NACB3QCr8/ZDZgUH0EadrQfTp1B3glB2fMCHm0dGsXnU9DWjXSHq5BTA
-						z1wvLSK2Ckd1wgZEUnFza58XZimpQq0KCyPMThwL/83iQ4V5qJilUpN+ogG9XGe4
-						g6HEwkRBtuhy/v1sVlpVJjib7O0duue06oed6ZCCXD0fem3zD8VZ8WORRE/rWA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.talisaspire.com/expire"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.talisaspire.com/expire"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.talisaspire.com/consume" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.talisaspire.com/consume" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.talisaspire.com/consume" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.talisaspire.com/consume" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Talis Group Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Talis Education Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.talisaspire.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Talis Aspire Support</GivenName>
-    <EmailAddress>mailto:support@talisaspire.zendesk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Clarke</SurName>
-    <EmailAddress>mailto:chris.clarke@talis.com</EmailAddress>
-  </ContactPerson>
-</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 f955333b..00000000
--- a/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.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://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.surfnet.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/logos/idp/terena.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">terena secretariat trans-european research and education networking association</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">terena secretariat trans-european research and education networking association</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md: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 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/login.terena.org.xml b/swamid-interfederations-2.0/login.terena.org.xml
deleted file mode 100644
index bd8fb45f..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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.terena.org/idp/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo 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>
-        <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 Secretariat</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>MIIDyzCCArOgAwIBAgIJAMzixtXMUH1NMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
-BAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYD
-VQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHTAbBgNVBAMM
-FGVuZ2luZS5zdXJmY29uZXh0Lm5sMB4XDTExMDEyNDEwMTg1N1oXDTIxMDEyMzEw
-MTg1N1owfDELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcM
-B1V0cmVjaHQxFTATBgNVBAoMDFNVUkZuZXQgQi5WLjETMBEGA1UECwwKU1VSRmNv
-bmV4dDEdMBsGA1UEAwwUZW5naW5lLnN1cmZjb25leHQubmwwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDMJ6v+f3owS3KR5IXSil+3XFwGvCVeYx3jDOFK
-AnwvXlDpTu+t730b8/spHtlopyJVAlb6qBIPN7R4TGTLqiu0zebYsYx/PtqCk5cb
-u9qs3h+p2BBoTXVwXA/ZYi0tqtxp04hcNrRj1TAgLyC0S+KASTF+zzccAcjTBid5
-EMioo+YllgSEobWJ4X33XVRqNrikAPDsNmDrdKUi257JSO2xhVIG5lbtmDaL5ORC
-D56oRmVdp7VQTEQ3Yass8J5Rn+Ub6WmRBYeG+KzFBvtyBput2o0/gvtJn9L+NWeD
-B0LyUPaUYG/X4GF14FcmFQfz7I5jBCNHtPcLJbPYbZKQNhz/AgMBAAGjUDBOMB0G
-A1UdDgQWBBS9QqP8gtMM6nm4oYzNbgqhEDP1aDAfBgNVHSMEGDAWgBS9QqP8gtMM
-6nm4oYzNbgqhEDP1aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBH
-2qyYwLwesIOxUTj+NJ0VXRBDH8VecNLiUUs9Np4x8A0pxLvlNnv5TdJAruEg1LSV
-mAqqPUdAB2m7CKDeUVM9cwOB7vqelV2GNgOfevXi+DZRMffyyE8qyIcnTqvDOgcR
-8qGTPSVT+SIsOkV9bYrjltrbnal7cJermsA8SC5w/pjLaOHI1xIZHquZzymWoN3Z
-fz2CQg2r5o+AURYd74GrHhHqVa9VrdWtcimB+vTQQihoLt8YciehpJjOMpx2D66e
-FfpC8ix31RRdjAVIo1y33h1yU3gEHePDbOthZE+lpXi2WJqO85H85LqJOtgn2WPI
-3P2Tx32Cq1WXCYkxLaPI
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md: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.tu.kielce.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/login.tu.kielce.pl-idp-shibboleth.xml
deleted file mode 100644
index 0380cba0..00000000
--- a/swamid-interfederations-2.0/login.tu.kielce.pl-idp-shibboleth.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.tu.kielce.pl/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-06-03T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tu.kielce.pl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.tu.kielce.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Kielce University of Technology</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pl">Politechnika Świętokrzyska w Kielcach</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Kielce University of Technology</mdui:Description>
-        <mdui:Description xml:lang="pl">Politechnika Świętokrzyska w Kielcach</mdui:Description>
-        <mdui:Logo height="148" width="320" xml:lang="pl">https://login.tu.kielce.pl/images/logo_psk.png</mdui:Logo>
-        <mdui:Logo height="148" width="320" xml:lang="en">https://login.tu.kielce.pl/images/logo_psk_en.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>tu.kielce.pl</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:50.87977018,20.64002469</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>
-MIIDMzCCAhugAwIBAgIUTnhw903+0k++Hg8EackOlKEfAxwwDQYJKoZIhvcNAQEL
-BQAwHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBsMB4XDTE1MDMxODA3NTUy
-MVoXDTM1MDMxODA3NTUyMVowHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBs
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9CoO3S5JSqXC+ySnfGSH
-4zr4TYxgIeYIgpGc5t6YCLoZGjcCEfn/75vXqyVSST2XsRBa8dzLdustWbqxJ9Nh
-KJ8SeeLGtDX+gs4Oism/WmkHWYsbFnVd1Pfbs7tO5lJvDiC6RiW8MotD9vfgDjSr
-RCou8oAedn/ToQmvT0mGzsHlv2LphqhQZyuigjgbPjj383PmvHd/v1Id5rk60NXM
-BQhYXZ+DHBUtBPhNmnuN4A7OXdWK5OS5vZhBGB8I3+GvEhtkHtSGruS27m8+KxsV
-cTylhoiohSsX8XYKO87NHi/K+GCEbGmssgGnVD1wLKjW68P86b2M59Px5jvPu8w9
-cQIDAQABo2swaTAdBgNVHQ4EFgQUiuiExnIh4xZwyCw3be3mOVERCy8wSAYDVR0R
-BEEwP4ISbG9naW4udHUua2llbGNlLnBshilodHRwczovL2xvZ2luLnR1LmtpZWxj
-ZS5wbC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA5MsG6EcdgMtH
-y0rdqBRDQ3xJTCPGHh+yljf8xGKFcgxys8D0tN3Rw7SBUPtqURmOrFLCADcqiZch
-/Ih6bHKcOtPfDCGdEF58RnhoL+L7DH8AwZJjvG1PASL93HtpmIxQaZezAAaP9FVP
-MGtjLCekKVpJEg83NCX4bkvw0//We1gzds2PC5XebUkWy5WKBtxxfSMGcW9cT/Yf
-AGSEf4Xdi84EO2e0FiQisCNrlUoLiL0oiVPjgkj+hwIsbTALPJep1rDw2BlrPM4d
-VlxKUGvRiA1AWI+DU1F+gFIJRydswFRpiyCmOT/oNwoLP9Riyc80Yl2HQQzDUFGQ
-QPpRH2L9Ng==
-                        </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>
-MIIDMzCCAhugAwIBAgIUQI1UT8yWaPEUeqnPogykaWscIWAwDQYJKoZIhvcNAQEL
-BQAwHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBsMB4XDTE1MDMxODA3NTUx
-OVoXDTM1MDMxODA3NTUxOVowHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBs
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg93OTsM9XSavx1b5qwjl
-warEf4+I6899r941THKZdnnZBEmR+qIQBcNJHjyqcSxsrddQ6BU3hibfW1cgu2vY
-x03A6GJQCIbz7Nb5gIBWluxfYnxrMNkpN+z91LgsTSzlW/eMklJ4HdCSzgRo4Grj
-LGqcf64cxNh7xAPSedlwrM3xcMLJj5Hm6QLlwzVZzWrrmebjMz24hD0suQz6p0lm
-7mL8RqJPv/rAZ1DQLw61FyD3cZGfjU4X4RI28rqlp0oPa/Y7qTPV0N2EpaNLL4BI
-6Bi/z8p/nZXGYtEpygHG9a9uZIOb0BBCwTrS0ELrPXhylWjvfSvpFkD+Tl6TJNe1
-cwIDAQABo2swaTAdBgNVHQ4EFgQUZoOr/TFbGOA6BZjg/hGB3BnVViswSAYDVR0R
-BEEwP4ISbG9naW4udHUua2llbGNlLnBshilodHRwczovL2xvZ2luLnR1LmtpZWxj
-ZS5wbC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEARH8fG46G8tTl
-TFSryzXGpsl+1CGfqTONx2OWXlyvho7WxDh2ZfoJmqdkKiARLMVFsCwI+TgKy6uH
-wNYmwYGUQ87kFMda1qP5NiGw2YqheB3HSJcBIiXb2HVEdZlrCDHToqJUV9jwjSFt
-MNDZ5JnLP9fGxuzaCuku9sTzz8lTmT6M9icE2tj1khFYDhUfRdMiI9MxNEvMdE06
-fieSwxhrohauXd2lBBeqsRMSKZ3P7g/cE3ysfjh2OXDwR6XaWtfs38nTJ9oHqLAl
-wqFLNr25soXe5wmt6fmNTO8dLdmYZc5+XSZ6Krj41W4HQcC/Hdt0WG121cbnFjA/
-TgC1gDMXgA==
-                        </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>
-MIIDNDCCAhygAwIBAgIVANLQD1ad89CG5sAEr5cGVT+qRS/PMA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEmxvZ2luLnR1LmtpZWxjZS5wbDAeFw0xNTAzMTgwNzU1
-MjBaFw0zNTAzMTgwNzU1MjBaMB0xGzAZBgNVBAMMEmxvZ2luLnR1LmtpZWxjZS5w
-bDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKoLZIifcEzlw0MlgYga
-sJbFTJPuq4NdhQkRyWZqeu2ZedRLoGMLJDmyqVzJiHWRtG5W9q/F4Euesayp7XV0
-ZliOpPNhtA60PrufPcELquB8QwXvKrs6aoDiROwtQM8P5ZMrdacpRu2UCubYtMtS
-pUDhR0Y3xPvNJwz4iTBVuBnHVk2ElO9au7OLN8TIeQYl2Run/UMzR+hdZf+RKLIt
-V6BSzYpu3k4xMPhRclEnpd0EZlAq1XOLLDODh+8OxgoHrCemC5qhwWN7t3HVaPRr
-UU7f2umFNXu/YwyI1r/AhciXVNoWj63hTO3CZNs7mWp9ZOK1T4E+Vc740XJduDkR
-OTECAwEAAaNrMGkwHQYDVR0OBBYEFNdzcY10k1Ct1xLIgGfjW85peBe2MEgGA1Ud
-EQRBMD+CEmxvZ2luLnR1LmtpZWxjZS5wbIYpaHR0cHM6Ly9sb2dpbi50dS5raWVs
-Y2UucGwvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAKl3AIoHpqBx
-UchgMac11QdliBETWgMfXhZf9EasbD4geWpQLBEIdjx2MOOYzcOWnVEV5vSwA8Z5
-QbgWsM7zAi8z1L3F3VmrDvkWblGBObuWMnvleyMV5000adqN5VEtr9chNVOZ7Bfd
-KKpB7avxX4099VYNysVBbmDFulswxHRqSpFNPMHuY5rIHvIVfzGABgsvRW2GfSRh
-tjXHqCHmep+cu4P3hW1iH8ZniMgkEIERXgK02wkhtUqWlGjbN95wt0Ne4OIWcvDA
-y9oVPwWqhUruhW3E4EveGvDcY6qgm8h2B4X4LPWh3ZD9JqEqcYP9SEnbZqLPGkjM
-uquJMZZ4oj8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tu.kielce.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tu.kielce.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.tu.kielce.pl/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.tu.kielce.pl/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.tu.kielce.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.tu.kielce.pl/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tu.kielce.pl</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUTnhw903+0k++Hg8EackOlKEfAxwwDQYJKoZIhvcNAQEL
-BQAwHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBsMB4XDTE1MDMxODA3NTUy
-MVoXDTM1MDMxODA3NTUyMVowHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBs
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9CoO3S5JSqXC+ySnfGSH
-4zr4TYxgIeYIgpGc5t6YCLoZGjcCEfn/75vXqyVSST2XsRBa8dzLdustWbqxJ9Nh
-KJ8SeeLGtDX+gs4Oism/WmkHWYsbFnVd1Pfbs7tO5lJvDiC6RiW8MotD9vfgDjSr
-RCou8oAedn/ToQmvT0mGzsHlv2LphqhQZyuigjgbPjj383PmvHd/v1Id5rk60NXM
-BQhYXZ+DHBUtBPhNmnuN4A7OXdWK5OS5vZhBGB8I3+GvEhtkHtSGruS27m8+KxsV
-cTylhoiohSsX8XYKO87NHi/K+GCEbGmssgGnVD1wLKjW68P86b2M59Px5jvPu8w9
-cQIDAQABo2swaTAdBgNVHQ4EFgQUiuiExnIh4xZwyCw3be3mOVERCy8wSAYDVR0R
-BEEwP4ISbG9naW4udHUua2llbGNlLnBshilodHRwczovL2xvZ2luLnR1LmtpZWxj
-ZS5wbC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEA5MsG6EcdgMtH
-y0rdqBRDQ3xJTCPGHh+yljf8xGKFcgxys8D0tN3Rw7SBUPtqURmOrFLCADcqiZch
-/Ih6bHKcOtPfDCGdEF58RnhoL+L7DH8AwZJjvG1PASL93HtpmIxQaZezAAaP9FVP
-MGtjLCekKVpJEg83NCX4bkvw0//We1gzds2PC5XebUkWy5WKBtxxfSMGcW9cT/Yf
-AGSEf4Xdi84EO2e0FiQisCNrlUoLiL0oiVPjgkj+hwIsbTALPJep1rDw2BlrPM4d
-VlxKUGvRiA1AWI+DU1F+gFIJRydswFRpiyCmOT/oNwoLP9Riyc80Yl2HQQzDUFGQ
-QPpRH2L9Ng==
-                        </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>
-MIIDMzCCAhugAwIBAgIUQI1UT8yWaPEUeqnPogykaWscIWAwDQYJKoZIhvcNAQEL
-BQAwHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBsMB4XDTE1MDMxODA3NTUx
-OVoXDTM1MDMxODA3NTUxOVowHTEbMBkGA1UEAwwSbG9naW4udHUua2llbGNlLnBs
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg93OTsM9XSavx1b5qwjl
-warEf4+I6899r941THKZdnnZBEmR+qIQBcNJHjyqcSxsrddQ6BU3hibfW1cgu2vY
-x03A6GJQCIbz7Nb5gIBWluxfYnxrMNkpN+z91LgsTSzlW/eMklJ4HdCSzgRo4Grj
-LGqcf64cxNh7xAPSedlwrM3xcMLJj5Hm6QLlwzVZzWrrmebjMz24hD0suQz6p0lm
-7mL8RqJPv/rAZ1DQLw61FyD3cZGfjU4X4RI28rqlp0oPa/Y7qTPV0N2EpaNLL4BI
-6Bi/z8p/nZXGYtEpygHG9a9uZIOb0BBCwTrS0ELrPXhylWjvfSvpFkD+Tl6TJNe1
-cwIDAQABo2swaTAdBgNVHQ4EFgQUZoOr/TFbGOA6BZjg/hGB3BnVViswSAYDVR0R
-BEEwP4ISbG9naW4udHUua2llbGNlLnBshilodHRwczovL2xvZ2luLnR1LmtpZWxj
-ZS5wbC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEARH8fG46G8tTl
-TFSryzXGpsl+1CGfqTONx2OWXlyvho7WxDh2ZfoJmqdkKiARLMVFsCwI+TgKy6uH
-wNYmwYGUQ87kFMda1qP5NiGw2YqheB3HSJcBIiXb2HVEdZlrCDHToqJUV9jwjSFt
-MNDZ5JnLP9fGxuzaCuku9sTzz8lTmT6M9icE2tj1khFYDhUfRdMiI9MxNEvMdE06
-fieSwxhrohauXd2lBBeqsRMSKZ3P7g/cE3ysfjh2OXDwR6XaWtfs38nTJ9oHqLAl
-wqFLNr25soXe5wmt6fmNTO8dLdmYZc5+XSZ6Krj41W4HQcC/Hdt0WG121cbnFjA/
-TgC1gDMXgA==
-                        </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>
-MIIDNDCCAhygAwIBAgIVANLQD1ad89CG5sAEr5cGVT+qRS/PMA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEmxvZ2luLnR1LmtpZWxjZS5wbDAeFw0xNTAzMTgwNzU1
-MjBaFw0zNTAzMTgwNzU1MjBaMB0xGzAZBgNVBAMMEmxvZ2luLnR1LmtpZWxjZS5w
-bDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKoLZIifcEzlw0MlgYga
-sJbFTJPuq4NdhQkRyWZqeu2ZedRLoGMLJDmyqVzJiHWRtG5W9q/F4Euesayp7XV0
-ZliOpPNhtA60PrufPcELquB8QwXvKrs6aoDiROwtQM8P5ZMrdacpRu2UCubYtMtS
-pUDhR0Y3xPvNJwz4iTBVuBnHVk2ElO9au7OLN8TIeQYl2Run/UMzR+hdZf+RKLIt
-V6BSzYpu3k4xMPhRclEnpd0EZlAq1XOLLDODh+8OxgoHrCemC5qhwWN7t3HVaPRr
-UU7f2umFNXu/YwyI1r/AhciXVNoWj63hTO3CZNs7mWp9ZOK1T4E+Vc740XJduDkR
-OTECAwEAAaNrMGkwHQYDVR0OBBYEFNdzcY10k1Ct1xLIgGfjW85peBe2MEgGA1Ud
-EQRBMD+CEmxvZ2luLnR1LmtpZWxjZS5wbIYpaHR0cHM6Ly9sb2dpbi50dS5raWVs
-Y2UucGwvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAKl3AIoHpqBx
-UchgMac11QdliBETWgMfXhZf9EasbD4geWpQLBEIdjx2MOOYzcOWnVEV5vSwA8Z5
-QbgWsM7zAi8z1L3F3VmrDvkWblGBObuWMnvleyMV5000adqN5VEtr9chNVOZ7Bfd
-KKpB7avxX4099VYNysVBbmDFulswxHRqSpFNPMHuY5rIHvIVfzGABgsvRW2GfSRh
-tjXHqCHmep+cu4P3hW1iH8ZniMgkEIERXgK02wkhtUqWlGjbN95wt0Ne4OIWcvDA
-y9oVPwWqhUruhW3E4EveGvDcY6qgm8h2B4X4LPWh3ZD9JqEqcYP9SEnbZqLPGkjM
-uquJMZZ4oj8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tu.kielce.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Kielce University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="pl">Politechnika Świętokrzyska w Kielcach</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Kielce University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">Politechnika Świętokrzyska w Kielcach</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.tu.kielce.pl</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>PSK IdP</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:administrator@tu.kielce.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.uat.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/login.uat.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index ffd06b61..00000000
--- a/swamid-interfederations-2.0/login.uat.ezproxy.library.qmul.ac.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.uat.ezproxy.library.qmul.ac.uk/shibboleth-sp">
-  <!--
-		This is a "UAT EZproxy Service" EZproxy SP for Queen Mary and Westfield College, University of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-07T08:33:29Z">
-      <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>
-      <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://login.uat.ezproxy.library.qmul.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFPTCCBCWgAwIBAgIRAI29zjKzu326VLd+tAYO77UwDQYJKoZIhvcNAQELBQAw
-						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-						IENBIDIwHhcNMTUwMzMwMDAwMDAwWhcNMTgwMzI5MjM1OTU5WjCBzzELMAkGA1UE
-						BhMCR0IxDzANBgNVBBETBkUxIDROUzEXMBUGA1UECBMOQ2VudHJhbCBMb25kb24x
-						DzANBgNVBAcTBkxPTkRPTjEaMBgGA1UECRMRMzI3IE1pbGUgRW5kIFJvYWQxKDAm
-						BgNVBAoTH1F1ZWVuIE1hcnkgVW5pdmVyc2l0eSBPZiBMb25kb24xFDASBgNVBAsT
-						C0lUIFNlcnZpY2VzMSkwJwYDVQQDFCAqLnVhdC5lenByb3h5LmxpYnJhcnkucW11
-						bC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNerg/8ZDXf
-						2E2uegLLE8Rup8oZieeFaYMJLFhtdnAtBZQ8+yLvsXCg3MNO9utYc9xdcRQT3SeI
-						C1SpMaLZEKr1vAngsgzMEZBaQzY+8SdAT+6lTYoUN9WpvkaCkghNjRkBMTLOhj67
-						8vTZFYh6kt4MhNmFru9U/3suRs8SQA7cpvfdq+MS8JryHRLpmGVBjFroI+o87NEK
-						1gMhJdkiAout8zryhIYvue4LPeALvkTzd07rFOPctIf4yAL7FaFZZH4QmB8jeKkg
-						flyLzU//w38gPRNhyNUduXdKDPIGEK0J6DZvSgt7f/J/v6GOYH6xdGI8ztRRX2kU
-						3aig7emsgC8CAwEAAaOCAXwwggF4MB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvh
-						hiiw/ba9MB0GA1UdDgQWBBQr62vcnCUzioq1WLaguy0tDZtdJjAOBgNVHQ8BAf8E
-						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgIwOgYDVR0fBDMw
-						MTAvoC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5j
-						cmwwbAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0
-						cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29j
-						c3AudXNlcnRydXN0LmNvbTArBgNVHREEJDAigiAqLnVhdC5lenByb3h5LmxpYnJh
-						cnkucW11bC5hYy51azANBgkqhkiG9w0BAQsFAAOCAQEAZJCnsTzsIUbT6bZCkwC6
-						Bcp/cDzfowiWCCjmOErNOwT+TZxrtA2AC5udcHFH0c0xGZFH08jrwAMdtppqCiRZ
-						Aq1oi7KS9+I6CLrDgFaOuOP4TNkbiQLVoGXZyAnFJK6JrErFJt42I/GhsVgP0U+B
-						XLxYdCES3EROnNLRWwu07kyWUO5aIOxJtbnOsrgZCeMBE/9ScMRfM/k5tgXjdtSq
-						/qh9bl3WMJx7NLoeH7PkqZdaX9IfoEhmpKkcfrc9F1yAomKd9Nq7TZ3tAgqnvf6J
-						hhhraoEgWp63qgLAS+jK7iUDzyY+dKS3pqTxsB0g7twOqb5QOJHGYnR2lg6qROOh
-						/g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.uat.ezproxy.library.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.uat.ezproxy.library.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary, University of London UAT EZproxy Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ITS Library Systems Team</GivenName>
-    <EmailAddress>mailto:lib-systems-team@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jez</GivenName>
-    <SurName>Clark</SurName>
-    <EmailAddress>mailto:j.p.clark@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.uc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.uc.edu-idp-shibboleth.xml
deleted file mode 100644
index 76f381df..00000000
--- a/swamid-interfederations-2.0/login.uc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,117 +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://login.uc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.uc.edu/ucit/helpdesk.html" 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">uc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Cincinnati Main Campus</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.uc.edu/kb/display/IDM/Federated+Central+Login+Service</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.uc.edu/content/dam/uc/trustees/docs/rules_10/10-43-11.pdf</mdui:PrivacyStatementURL>
-        <mdui:Logo height="153" width="270" xml:lang="en">https://login.uc.edu/idp/images/UC_logo-incommon-official.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>
-MIIEKjCCAxKgAwIBAgIJAJxtmyIj3xhRMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
-BAYTAlVTMQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpDaW5jaW5uYXRpMSEwHwYD
-VQQKExhVbml2ZXJzaXR5IG9mIENpbmNpbm5hdGkxFTATBgNVBAMTDGxvZ2luLnVj
-LmVkdTAeFw0xMTAzMDMxMzAxMTdaFw0yMTAyMjgxMzAxMTdaMGsxCzAJBgNVBAYT
-AlVTMQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpDaW5jaW5uYXRpMSEwHwYDVQQK
-ExhVbml2ZXJzaXR5IG9mIENpbmNpbm5hdGkxFTATBgNVBAMTDGxvZ2luLnVjLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKOeU/o2gXXhUB2/4s2O
-tvB/xqU8Fv+ZtEK/GwUF3hLesy2vjdxZsQEp3K8aX/kP1MaF9BdLxapKjx5f6Wgo
-GgRpAcWX5LK2uUTh0WU1a/T0rhlBWopo7Tkm6GjKbJTwmNaGpEd+gaq3de08TPY3
-895JP1yEUyh3IXec/HVrYu578FYyy3wgJeu7UzIEUdeV/AFCKKxqO/9rvbE+ZHs+
-VfLiCxS4t/0d4beJvESp6ulk65YVT4bO93LDAPtvX5gZyouGSl+y9DEQC/nGab7l
-ATzaeKcSZMS1Eh3FUk8u7nQgSe0XzoF6UbuS6e9IKAL+gcisesVYVe97JC6KR37Q
-Gb8CAwEAAaOB0DCBzTAdBgNVHQ4EFgQUJv5Rl+63hKD6wDuNUT/gMLyZ5vQwgZ0G
-A1UdIwSBlTCBkoAUJv5Rl+63hKD6wDuNUT/gMLyZ5vShb6RtMGsxCzAJBgNVBAYT
-AlVTMQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpDaW5jaW5uYXRpMSEwHwYDVQQK
-ExhVbml2ZXJzaXR5IG9mIENpbmNpbm5hdGkxFTATBgNVBAMTDGxvZ2luLnVjLmVk
-dYIJAJxtmyIj3xhRMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHTW
-wmpkE07WOCU5QJzgD4L8Dus7OS+zQBdDjLKWr/O58x7D1403jqO3Mkdbnl/UfOzC
-gNSDgI4RiPU3j+bno9SSItQOmP5l76EGP4AcgdRWrbRWiY1M2oo/oSNR86hMwU3e
-fXSiTxglybvsqv2EWthrRBuB+wXtWQZp3v8mWJoBdVV3G2aRV8dMF3NtKFGxix2V
-mNpv1J6ljYmNk1SPlcSItGCcOg2ylIvsOC+CnyTHWudNOudvXzB5jJSxX0ub8hso
-Sg4vYkZirCjQaD1elzGSCq8B6FsnILF3Y9Nx1ug9A8lwEySuE+JmE3bw/94jAoYS
-0UnF4sqtFZqr6SDxYQ4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.uc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.uc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.uc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.uc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.uc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.uc.edu/idp/profile/SAML2/POST-SimpleSign/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">uc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEKjCCAxKgAwIBAgIJAJxtmyIj3xhRMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
-BAYTAlVTMQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpDaW5jaW5uYXRpMSEwHwYD
-VQQKExhVbml2ZXJzaXR5IG9mIENpbmNpbm5hdGkxFTATBgNVBAMTDGxvZ2luLnVj
-LmVkdTAeFw0xMTAzMDMxMzAxMTdaFw0yMTAyMjgxMzAxMTdaMGsxCzAJBgNVBAYT
-AlVTMQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpDaW5jaW5uYXRpMSEwHwYDVQQK
-ExhVbml2ZXJzaXR5IG9mIENpbmNpbm5hdGkxFTATBgNVBAMTDGxvZ2luLnVjLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKOeU/o2gXXhUB2/4s2O
-tvB/xqU8Fv+ZtEK/GwUF3hLesy2vjdxZsQEp3K8aX/kP1MaF9BdLxapKjx5f6Wgo
-GgRpAcWX5LK2uUTh0WU1a/T0rhlBWopo7Tkm6GjKbJTwmNaGpEd+gaq3de08TPY3
-895JP1yEUyh3IXec/HVrYu578FYyy3wgJeu7UzIEUdeV/AFCKKxqO/9rvbE+ZHs+
-VfLiCxS4t/0d4beJvESp6ulk65YVT4bO93LDAPtvX5gZyouGSl+y9DEQC/nGab7l
-ATzaeKcSZMS1Eh3FUk8u7nQgSe0XzoF6UbuS6e9IKAL+gcisesVYVe97JC6KR37Q
-Gb8CAwEAAaOB0DCBzTAdBgNVHQ4EFgQUJv5Rl+63hKD6wDuNUT/gMLyZ5vQwgZ0G
-A1UdIwSBlTCBkoAUJv5Rl+63hKD6wDuNUT/gMLyZ5vShb6RtMGsxCzAJBgNVBAYT
-AlVTMQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpDaW5jaW5uYXRpMSEwHwYDVQQK
-ExhVbml2ZXJzaXR5IG9mIENpbmNpbm5hdGkxFTATBgNVBAMTDGxvZ2luLnVjLmVk
-dYIJAJxtmyIj3xhRMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHTW
-wmpkE07WOCU5QJzgD4L8Dus7OS+zQBdDjLKWr/O58x7D1403jqO3Mkdbnl/UfOzC
-gNSDgI4RiPU3j+bno9SSItQOmP5l76EGP4AcgdRWrbRWiY1M2oo/oSNR86hMwU3e
-fXSiTxglybvsqv2EWthrRBuB+wXtWQZp3v8mWJoBdVV3G2aRV8dMF3NtKFGxix2V
-mNpv1J6ljYmNk1SPlcSItGCcOg2ylIvsOC+CnyTHWudNOudvXzB5jJSxX0ub8hso
-Sg4vYkZirCjQaD1elzGSCq8B6FsnILF3Y9Nx1ug9A8lwEySuE+JmE3bw/94jAoYS
-0UnF4sqtFZqr6SDxYQ4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.uc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.uc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Cincinnati Main Campus</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Cincinnati Main Campus</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Matthew Hartman</md:GivenName>
-    <md:EmailAddress>eaigroup@ucmail.uc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Gary Grafe</md:GivenName>
-    <md:EmailAddress>grafegw@ucmail.uc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UCIT Help Desk</md:GivenName>
-    <md:EmailAddress>HelpDesk@uc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.xml
deleted file mode 100644
index 7dc2a0da..00000000
--- a/swamid-interfederations-2.0/login.ucs.ac.uk-saml2-idp-metadata.php.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://login.ucs.ac.uk/saml2/idp/metadata.php">
-  <!--
-		This is a "(Test)" SimpleSAMLphp IdP for University Campus Suffolk.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-06T09:23:15Z">
-      <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">ucs.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University Campus Suffolk (Test)</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMTCCAhmgAwIBAgIJAM1dFRKkRxYPMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
-						BAYTAlVLMQwwCgYDVQQKDANVU0MxEjAQBgNVBAMMCXVjcy5hYy51azAeFw0xNTA5
-						MDgxMTUwNDVaFw0yNTA5MDcxMTUwNDVaMC8xCzAJBgNVBAYTAlVLMQwwCgYDVQQK
-						DANVU0MxEjAQBgNVBAMMCXVjcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAODHsZgmS0t5w52jSee9vyzTrurdN1gqj9QEHkbOpj6r5c1yzy1m
-						W+XCGEft7OzEm9Y62UzceEFwkqYoqPyL7CbAGtC6jYqV7FzW8Oo1LgVYRMQhHMoE
-						J0Qu3s05uxhY5LKfNX0IYqTFYag9a6QQ3AQsR09EHfJ9Irv4ZYO3kDDblfKuvuhC
-						ObOeF3wu1xZFvj6hn17yPIw/RaVI9fqOm8JlE9pDl4GiAD4wrtmnTbVLASdtkr5A
-						WbmLhtdn7iBeWEbZb77ovAcZ4OALjlUknb2fVN9Pd5WU8QCADLMGhNFrEcQdOT3C
-						I8Ym/a5CZcmpDxR0ObM83CFqABrqKf5dI8cCAwEAAaNQME4wHQYDVR0OBBYEFG1T
-						KnfCPsTsa6qpP/P1em2nSYT8MB8GA1UdIwQYMBaAFG1TKnfCPsTsa6qpP/P1em2n
-						SYT8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAERHkWhKP0UdJl6r
-						MYSrrFmT9ZMF/Ypt1HYrqdv88HWW+doZIKwl/VMC0zHCavCQLYz51VH6nRm7Ybbg
-						gdZEPy/aUng1vJUE4ip8ElZz69c6oZF+qCl6CPskKOSNb986XkFUR3uC8sa9pBz1
-						fy59K2k98yz1dW4x1DPD8Q3v3F+uz1biNE47orYzjoFdY3WaDFQlliYuVf0MN2LP
-						YuRRHTgeuViKKrYxUr9FdFJs3mitDyxhmyPM/igJ5k+5MkHP1QLP9ImOklcsKkRn
-						fm75tfGWz9Tsg9nNILbKPkiZTW1XE+CMKunVcCR3UuICNX+YUK6dCEAmQZIH4YUk
-						GHQqIQc=
-					</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>
-						MIIDMTCCAhmgAwIBAgIJAM1dFRKkRxYPMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
-						BAYTAlVLMQwwCgYDVQQKDANVU0MxEjAQBgNVBAMMCXVjcy5hYy51azAeFw0xNTA5
-						MDgxMTUwNDVaFw0yNTA5MDcxMTUwNDVaMC8xCzAJBgNVBAYTAlVLMQwwCgYDVQQK
-						DANVU0MxEjAQBgNVBAMMCXVjcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAODHsZgmS0t5w52jSee9vyzTrurdN1gqj9QEHkbOpj6r5c1yzy1m
-						W+XCGEft7OzEm9Y62UzceEFwkqYoqPyL7CbAGtC6jYqV7FzW8Oo1LgVYRMQhHMoE
-						J0Qu3s05uxhY5LKfNX0IYqTFYag9a6QQ3AQsR09EHfJ9Irv4ZYO3kDDblfKuvuhC
-						ObOeF3wu1xZFvj6hn17yPIw/RaVI9fqOm8JlE9pDl4GiAD4wrtmnTbVLASdtkr5A
-						WbmLhtdn7iBeWEbZb77ovAcZ4OALjlUknb2fVN9Pd5WU8QCADLMGhNFrEcQdOT3C
-						I8Ym/a5CZcmpDxR0ObM83CFqABrqKf5dI8cCAwEAAaNQME4wHQYDVR0OBBYEFG1T
-						KnfCPsTsa6qpP/P1em2nSYT8MB8GA1UdIwQYMBaAFG1TKnfCPsTsa6qpP/P1em2n
-						SYT8MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAERHkWhKP0UdJl6r
-						MYSrrFmT9ZMF/Ypt1HYrqdv88HWW+doZIKwl/VMC0zHCavCQLYz51VH6nRm7Ybbg
-						gdZEPy/aUng1vJUE4ip8ElZz69c6oZF+qCl6CPskKOSNb986XkFUR3uC8sa9pBz1
-						fy59K2k98yz1dW4x1DPD8Q3v3F+uz1biNE47orYzjoFdY3WaDFQlliYuVf0MN2LP
-						YuRRHTgeuViKKrYxUr9FdFJs3mitDyxhmyPM/igJ5k+5MkHP1QLP9ImOklcsKkRn
-						fm75tfGWz9Tsg9nNILbKPkiZTW1XE+CMKunVcCR3UuICNX+YUK6dCEAmQZIH4YUk
-						GHQqIQc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ucs.ac.uk/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://login.ucs.ac.uk/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University Campus Suffolk</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University Campus Suffolk (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ucs.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:ithelpdesk@ucs.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Will</GivenName>
-    <SurName>Liebow</SurName>
-    <EmailAddress>mailto:w.liebow@ucs.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.uea.ac.uk-entity.xml b/swamid-interfederations-2.0/login.uea.ac.uk-entity.xml
deleted file mode 100644
index 1c342613..00000000
--- a/swamid-interfederations-2.0/login.uea.ac.uk-entity.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://login.uea.ac.uk/entity">
-  <!--
-		This is an OpenAthens IdP for the University of East Anglia.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-01T10:16:25Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">uea.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of East Anglia (UEA)</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://login.uea.ac.uk/oala/uea-uk-fed-logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://login.uea.ac.uk/oala/uea-uk-fed-icon-16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>139.222.0.0/16</mdui:IPHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDoDCCAoigAwIBAgIJAIuKNtoJUQjXMA0GCSqGSIb3DQEBBQUAMD4xIjAgBgNV
-						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
-						YS5hYy51azAeFw0xMDExMDkwNzU3NTJaFw0yMDExMDYwNzU3NTJaMD4xIjAgBgNV
-						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
-						YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM9oeuK7k5dK
-						bp97dCPSq7gqVrm3Rq2fyW62SFx1IVwFBtoW1CIQOkDJF8bVkKa2U+dMmwLHvfEP
-						qVnXXA59eDJeGRib2ME6o1q90McllqBVWhuBoR08GFEdXhbt1lpUpBNOF+V9lv+y
-						f37bDm2ii+iaCaOcaT5sO9g0krqw/mlWsSPUIhAG7TzndSECH4lHdqBEWPlk87gn
-						5LeuezjWpgQmdPD6PaB2fuTyQyP+BeNeIK8EiJvCpBzA92EKitTHxTa6ON3LEy0L
-						qzJCDWx7rq0R0ch7TmzGw8DLrKIWRHbfH2nMWMFMp7Hf1EhB/Z1+R7nhgIV6HxQi
-						d+DmuhrLJB8CAwEAAaOBoDCBnTAdBgNVHQ4EFgQUREAlXs64Gbcn4E+0R5mumL5k
-						+MwwbgYDVR0jBGcwZYAUREAlXs64Gbcn4E+0R5mumL5k+MyhQqRAMD4xIjAgBgNV
-						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
-						YS5hYy51a4IJAIuKNtoJUQjXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAKhau/vUIiWf7K2ILlfdK89NKLuvUwndns9sYEcIFAqTMWnGlpXogPzFUqvd
-						PTEjYSkffvr5xHPIasBpaouVmqsr245P1aX9qZh4f6K7FLS+hUHdJvaFrGl6oxEe
-						WPILAJimme/YZqVCmyyLeYAB+l9Yt81wd+xkaajOrbNalv2f1fxIwQpGp3oosR3b
-						WXVQwwCnZX7KrZHmIfiRvY9yYctOsXs1xlbZoR8m0F5Tq3xOZIoHjOoWyl4AARFM
-						NpCaUKSy/eK1MvlZph0VK6QY4P7xlZMvEnMQscrf/bEBblQ+dGyfM664mnPAvWgR
-						nIhXWvtGhtoIysHU01bNRSH11OA=
-					</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>
-						MIIDoDCCAoigAwIBAgIJAIuKNtoJUQjXMA0GCSqGSIb3DQEBBQUAMD4xIjAgBgNV
-						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
-						YS5hYy51azAeFw0xMDExMDkwNzU3NTJaFw0yMDExMDYwNzU3NTJaMD4xIjAgBgNV
-						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
-						YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM9oeuK7k5dK
-						bp97dCPSq7gqVrm3Rq2fyW62SFx1IVwFBtoW1CIQOkDJF8bVkKa2U+dMmwLHvfEP
-						qVnXXA59eDJeGRib2ME6o1q90McllqBVWhuBoR08GFEdXhbt1lpUpBNOF+V9lv+y
-						f37bDm2ii+iaCaOcaT5sO9g0krqw/mlWsSPUIhAG7TzndSECH4lHdqBEWPlk87gn
-						5LeuezjWpgQmdPD6PaB2fuTyQyP+BeNeIK8EiJvCpBzA92EKitTHxTa6ON3LEy0L
-						qzJCDWx7rq0R0ch7TmzGw8DLrKIWRHbfH2nMWMFMp7Hf1EhB/Z1+R7nhgIV6HxQi
-						d+DmuhrLJB8CAwEAAaOBoDCBnTAdBgNVHQ4EFgQUREAlXs64Gbcn4E+0R5mumL5k
-						+MwwbgYDVR0jBGcwZYAUREAlXs64Gbcn4E+0R5mumL5k+MyhQqRAMD4xIjAgBgNV
-						BAoTGVVuaXZlcnNpdHkgb2YgRWFzdCBBbmdsaWExGDAWBgNVBAMTD2xvZ2luLnVl
-						YS5hYy51a4IJAIuKNtoJUQjXMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAKhau/vUIiWf7K2ILlfdK89NKLuvUwndns9sYEcIFAqTMWnGlpXogPzFUqvd
-						PTEjYSkffvr5xHPIasBpaouVmqsr245P1aX9qZh4f6K7FLS+hUHdJvaFrGl6oxEe
-						WPILAJimme/YZqVCmyyLeYAB+l9Yt81wd+xkaajOrbNalv2f1fxIwQpGp3oosR3b
-						WXVQwwCnZX7KrZHmIfiRvY9yYctOsXs1xlbZoR8m0F5Tq3xOZIoHjOoWyl4AARFM
-						NpCaUKSy/eK1MvlZph0VK6QY4P7xlZMvEnMQscrf/bEBblQ+dGyfM664mnPAvWgR
-						nIhXWvtGhtoIysHU01bNRSH11OA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.uea.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.uea.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of East Anglia</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of East Anglia (UEA)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uea.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UEA Web Support</GivenName>
-    <EmailAddress>mailto:web@uea.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>UEA Web Support</GivenName>
-    <EmailAddress>mailto:web@uea.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.ufl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.ufl.edu-idp-shibboleth.xml
deleted file mode 100644
index eaadf34d..00000000
--- a/swamid-interfederations-2.0/login.ufl.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,109 +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://login.ufl.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login.ufl.edu/error.html" 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">ufl.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Florida</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Florida - GatorLink Credentials</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.it.ufl.edu/identity/shibboleth/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://privacy.ufl.edu/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="38" width="135" xml:lang="en">https://images.webadmin.ufl.edu/signatures/wordmark.gif</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>
-MIIDLDCCAhSgAwIBAgIJAM6XTJCGu1xXMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDWxvZ2luLnVmbC5lZHUwHhcNMTEwNjMwMTY1NDU5WhcNMjEwNjI3MTY1NDU5
-WjAYMRYwFAYDVQQDEw1sb2dpbi51ZmwuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA2Hnmxqt0Z+RxiAbs6TZxfJFOchZDwSr6t328myucayB/l4T6
-cujQyzG6TMlQP+isgvsQywqV+zbvRI5i+g7nCsivGelAeFyBzor+JT+rg94ypyug
-SWlPh/coPjkETQaGMR+bgBxGOEJfOOApFJxdBpl0StKbX2oPjwIEGSo3zjhmPTpx
-aVEr0lUBrgJmp5Of6dKPZ/32SF98Ed79lr8C9fOJHTfh4LYwZ/9fiYUG7HPfjR/m
-PDChsgXYJ5Ao3+bRNqf2q4+vndU27JCVwiWI+RmwlfmbPXKLufl2ZfDdLYqyrc5P
-JDsx4oHwbAkcH7cLNW67bTMmSEp+1rSBKa1v8QIDAQABo3kwdzAdBgNVHQ4EFgQU
-1hjdCt1pTU62iZ837vmDLpznn3IwSAYDVR0jBEEwP4AU1hjdCt1pTU62iZ837vmD
-Lpznn3KhHKQaMBgxFjAUBgNVBAMTDWxvZ2luLnVmbC5lZHWCCQDOl0yQhrtcVzAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBQJTcTLE95HTa5E/IMbMl6
-5e0fPWiSm7KfRtZSSTMe4mK+6Ub0x8YWTsAN1RoSIQtftK2DuyNtUbJ2+Y9PS7bs
-ftfegfOoVBTTOkOQ+CeKWEmwT+1Yw2IRts0vHXvgqzA5b8OYT81RrKcJtMFfyKMi
-pm+Rc95JoFHZz3tYflLU+3kOkEGHUCX08+BrQLc26BcdZokKySbKzXPUsBpmYUEY
-MStdDm/Po7ON4Shh1TpvMEFEofUNUIU5uY5oHLO8gFx+AWRG47URXfxgeyEf9+SB
-aFbDixFvCWbqDUiuKdivSWdqiPYSPiINYEAm3p46viJ4+6CBFELzDOTcZUrXZaSD
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufl.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufl.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ufl.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ufl.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ufl.edu/idp/profile/Shibboleth/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">ufl.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAM6XTJCGu1xXMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDWxvZ2luLnVmbC5lZHUwHhcNMTEwNjMwMTY1NDU5WhcNMjEwNjI3MTY1NDU5
-WjAYMRYwFAYDVQQDEw1sb2dpbi51ZmwuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA2Hnmxqt0Z+RxiAbs6TZxfJFOchZDwSr6t328myucayB/l4T6
-cujQyzG6TMlQP+isgvsQywqV+zbvRI5i+g7nCsivGelAeFyBzor+JT+rg94ypyug
-SWlPh/coPjkETQaGMR+bgBxGOEJfOOApFJxdBpl0StKbX2oPjwIEGSo3zjhmPTpx
-aVEr0lUBrgJmp5Of6dKPZ/32SF98Ed79lr8C9fOJHTfh4LYwZ/9fiYUG7HPfjR/m
-PDChsgXYJ5Ao3+bRNqf2q4+vndU27JCVwiWI+RmwlfmbPXKLufl2ZfDdLYqyrc5P
-JDsx4oHwbAkcH7cLNW67bTMmSEp+1rSBKa1v8QIDAQABo3kwdzAdBgNVHQ4EFgQU
-1hjdCt1pTU62iZ837vmDLpznn3IwSAYDVR0jBEEwP4AU1hjdCt1pTU62iZ837vmD
-Lpznn3KhHKQaMBgxFjAUBgNVBAMTDWxvZ2luLnVmbC5lZHWCCQDOl0yQhrtcVzAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBQJTcTLE95HTa5E/IMbMl6
-5e0fPWiSm7KfRtZSSTMe4mK+6Ub0x8YWTsAN1RoSIQtftK2DuyNtUbJ2+Y9PS7bs
-ftfegfOoVBTTOkOQ+CeKWEmwT+1Yw2IRts0vHXvgqzA5b8OYT81RrKcJtMFfyKMi
-pm+Rc95JoFHZz3tYflLU+3kOkEGHUCX08+BrQLc26BcdZokKySbKzXPUsBpmYUEY
-MStdDm/Po7ON4Shh1TpvMEFEofUNUIU5uY5oHLO8gFx+AWRG47URXfxgeyEf9+SB
-aFbDixFvCWbqDUiuKdivSWdqiPYSPiINYEAm3p46viJ4+6CBFELzDOTcZUrXZaSD
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufl.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Florida</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Florida</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufl.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Eli Ben-Shoshan</md:GivenName>
-    <md:EmailAddress>ebs@ufl.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Warren Curry</md:GivenName>
-    <md:EmailAddress>whcurry@ufl.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Rich Lowrey</md:GivenName>
-    <md:EmailAddress>ufrich@ufl.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Charles Tompkins</md:GivenName>
-    <md:EmailAddress>crt@ufl.edu</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 fed0293f..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ufrgs.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://login.ufrgs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ufrgs.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ufrgs.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ufrgs.br/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">ufrgs.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ufrgs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ufrgs.br:8443/idp/profile/SAML1/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">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFRGS - Universidade Federal do Rio Grande do Sul</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufrgs.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufrgs.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Everton Foscarini</md:SurName>
-    <md:EmailAddress>foscarini@cpd.ufrgs.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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.umcs.pl-9443-idp-shibboleth.xml b/swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml
deleted file mode 100644
index dde0154a..00000000
--- a/swamid-interfederations-2.0/login.umcs.pl-9443-idp-shibboleth.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.umcs.pl:9443/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-09-11T00: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 urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umcs.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Maria Curie-Sklodowska University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Maria Curie-Sklodowska University</mdui:Description>
-        <mdui:Description xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej w Lublinie</mdui:Description>
-        <mdui:Logo height="92" width="300" xml:lang="en">https://login.umcs.pl/static/images/logo.png</mdui:Logo>
-        <mdui:Logo height="92" width="300" xml:lang="pl">https://login.umcs.pl/static/images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>umcs.pl</mdui:DomainHint>
-        <mdui:IPHint>87.246.208.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:51.245915,22.541437</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>
-MIIDJTCCAg2gAwIBAgIVAMVDBap8O1TOuLbc37xKkG0zsNfgMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ4WhcN
-MzUwNTEzMTMxNDQ4WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmX0MTZmiGeXmt29aPBtAdHswTqup43Le
-4rb2rVzXYHoEUreRIqXFsVGSiYOYP/5CZbQlurLnGrjBNcaZeohNRff0Iv1piE6M
-5F7S9/ENTPthwq6r8O59Frf9d4mH+z8PsE81LAV1nbM4zKBVIoH9Jm22aNgNdjld
-WylRl3KJIft167CscuaBPdRG7nh/ABYXqU27FnBlDU1JISyzq6gxELsi0YX+Kvib
-p6bACc5mLkOi1jxVpHuGsW6xxd3T/HtbcIndakILykOly2lSGTCsS7uHqJZQBX7C
-pTYhpnHQCNvVP8lCgUM90z/NOux1/ZBzZSd4xrPZq6zSK+Leqh3HfwIDAQABo2Yw
-ZDAdBgNVHQ4EFgQUKRM8qhPrchrWnU7pyPN+QRvQ978wQwYDVR0RBDwwOoINbG9n
-aW4udW1jcy5wbIYpaHR0cHM6Ly9sb2dpbi51bWNzLnBsOjk0NDMvaWRwL3NoaWJi
-b2xldGgwDQYJKoZIhvcNAQELBQADggEBAH5mHd6wnywlretwZDell/qezGjTWfox
-Ktnzw2w+40blKVIWb0oarrDmae1piaK5nVsjdoFusAEMylwME1kvCBZIiVLegKmh
-Asrk+4Fequ+LiF+JOHWbYUs+Lyq2vkKkceqHPl08uuzhRYreVfoC6FbvdiRhQGmC
-ZKCWYB8ZTWT85JkDw94OoGqCesAzoCVf525n0b4E/+ohHEYIEZdApcyRs9VmdccU
-H+ZUJFqCXtvqZss+o6bMuBSLMV8xOIbgFex8Pgl8NA01FizfKF8jR1iTQ9IKXecJ
-DZ4SNNLpb4ZEM+5HySt2wDlDsfdJcZdYYNV/Wi3xcv74WJzxCdHYoSo=
-                        </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>
-MIIDJTCCAg2gAwIBAgIVAOKw8Okl/Qs8gxrRP+Kih0g5ZVyDMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ3WhcN
-MzUwNTEzMTMxNDQ3WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi+4EcjSB5ZG8o/2Jwen5/Kd/NeI2dyss
-rRpw403vjokLQQFI63WqQgGMr3NLeRnOsJloCIF+MsjZQKtZUizLUE1+kOeSB8W7
-QTDcbT6wIl3BpudTLW07ryu6/n7np7Pax9QYjUvSdcZSQ9OUNeYEBFbW3BKYj/E2
-HXj58AFBfMGzQ2SRWEilfvg9gO4LThm4zGhZcSb8YOiGOc1QXrnHfwYStzI/Sp33
-tvbHaioRPXYnwJMad1gKDjeLNiYsQol+MN3pzhLVPrj9BONAuqJTV1W43UXi0r0M
-vKvnyujFf9WS9fdiTtEtFAYVV1urS2S3pEr7neYgsCD8Bty1cVuMqwIDAQABo2Yw
-ZDAdBgNVHQ4EFgQU3zsy3P/ZT7W0unk4RR3k+ZWw6CcwQwYDVR0RBDwwOoINbG9n
-aW4udW1jcy5wbIYpaHR0cHM6Ly9sb2dpbi51bWNzLnBsOjk0NDMvaWRwL3NoaWJi
-b2xldGgwDQYJKoZIhvcNAQELBQADggEBAFOQVZU4doxAUjVjcxgDH6jqCPEz8Rpt
-nVd7GtN8J18yhctzQj3vf+Zit5JSD3DhMD+MHCzLzwPJskSFe/cHaDhNEhxgd3hk
-I0gxi3F9Ahn/H3NY4wm/J1WaM66F2LEv6M8+bbX70fMknUJInvWsejRNaULANIjm
-GdFdFcni64S3pY2CAWr9EVLajavDG70BEqnTk7JpdLeUb27cSDL4gLi04KiGEgr9
-DhuU+dHaoQHmSwsV7P/e21bXtaF9e2KSq3QH1Ar4sIIwanbzixYp6nqIhpEUgMqt
-FJK+09j1gXF3zoBqQBKiu6LPskGSdysF1HLImTOZKnqJWdagZBAzhPc=
-                        </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>
-MIIDJTCCAg2gAwIBAgIVAMov+qL27DY7b0GGhKB6cR5yAjjmMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ4WhcN
-MzUwNTEzMTMxNDQ4WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkQQ1fjvDeSEW33cYblgSUacmQQe4zjdG
-YjX9a2Sw44GpzMjSXQIwtQvtGQ1aiuD7GqDdp+NltlOFDQKAoqwRckMzSiGtP8S7
-Mrd/FGLfc5Nx8O8p3EL/m9WHvxSeFV7l5djTGALlWk8ppfT3SD5uUyaG8YCi3e2g
-rVV81LTduOzei4l/lBtyFXh4uMaOGEvDHTUCtq4b10w8HCX/hCzdj1lwaXlqdUnO
-mLbpTB2aVDaJTna/AZHextQ2F4MyigrZugYl0W5wtJA/zZJULPQCu1mgwG2mqhYW
-HLwbQqM0J3OQSOp1bGwT0r8Uf9D0Nc2JfQXt/zgIkCS/4rldhIFNYQIDAQABo2Yw
-ZDAdBgNVHQ4EFgQU5S97xnyCThAtWlWbb0AumEwsoxQwQwYDVR0RBDwwOoINbG9n
-aW4udW1jcy5wbIYpaHR0cHM6Ly9sb2dpbi51bWNzLnBsOjk0NDMvaWRwL3NoaWJi
-b2xldGgwDQYJKoZIhvcNAQELBQADggEBAB82Jxbep9eZZlmgX9ZrO8zOuL01VN8y
-0qBlN/4lkAToDJYfbaYr76HZLuBSDvWirkOh8R6HykK30k7WqF1HS9c+tnPSUTZb
-1UppQcYjkbnde6NGX9iN+wJo4V96QxEz8XJKHvmXVdE1CQ7pi+b912DpjxZrjdRg
-9zgUCm3bbFgYkmB1pFO0nxWT+AbKlVjerFYwJ5Wm02bE5Dwy6mksENN8/LhmvJaz
-4cAv8Lza2e17KmD/CYGncWc+L++kP40CW+kCierHubfe0BtCyq/e4NcONXGoLotB
-wM4RQ5jYrtF1hkeVKs5UhXdsWc0V+1SvBj23fjXaXHj1QadlFr9Hzcg=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umcs.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umcs.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.umcs.pl:9443/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umcs.pl: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://login.umcs.pl:9443/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.umcs.pl:9443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.umcs.pl:9443/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umcs.pl</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJTCCAg2gAwIBAgIVAMVDBap8O1TOuLbc37xKkG0zsNfgMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ4WhcN
-MzUwNTEzMTMxNDQ4WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmX0MTZmiGeXmt29aPBtAdHswTqup43Le
-4rb2rVzXYHoEUreRIqXFsVGSiYOYP/5CZbQlurLnGrjBNcaZeohNRff0Iv1piE6M
-5F7S9/ENTPthwq6r8O59Frf9d4mH+z8PsE81LAV1nbM4zKBVIoH9Jm22aNgNdjld
-WylRl3KJIft167CscuaBPdRG7nh/ABYXqU27FnBlDU1JISyzq6gxELsi0YX+Kvib
-p6bACc5mLkOi1jxVpHuGsW6xxd3T/HtbcIndakILykOly2lSGTCsS7uHqJZQBX7C
-pTYhpnHQCNvVP8lCgUM90z/NOux1/ZBzZSd4xrPZq6zSK+Leqh3HfwIDAQABo2Yw
-ZDAdBgNVHQ4EFgQUKRM8qhPrchrWnU7pyPN+QRvQ978wQwYDVR0RBDwwOoINbG9n
-aW4udW1jcy5wbIYpaHR0cHM6Ly9sb2dpbi51bWNzLnBsOjk0NDMvaWRwL3NoaWJi
-b2xldGgwDQYJKoZIhvcNAQELBQADggEBAH5mHd6wnywlretwZDell/qezGjTWfox
-Ktnzw2w+40blKVIWb0oarrDmae1piaK5nVsjdoFusAEMylwME1kvCBZIiVLegKmh
-Asrk+4Fequ+LiF+JOHWbYUs+Lyq2vkKkceqHPl08uuzhRYreVfoC6FbvdiRhQGmC
-ZKCWYB8ZTWT85JkDw94OoGqCesAzoCVf525n0b4E/+ohHEYIEZdApcyRs9VmdccU
-H+ZUJFqCXtvqZss+o6bMuBSLMV8xOIbgFex8Pgl8NA01FizfKF8jR1iTQ9IKXecJ
-DZ4SNNLpb4ZEM+5HySt2wDlDsfdJcZdYYNV/Wi3xcv74WJzxCdHYoSo=
-                        </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>
-MIIDJTCCAg2gAwIBAgIVAOKw8Okl/Qs8gxrRP+Kih0g5ZVyDMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ3WhcN
-MzUwNTEzMTMxNDQ3WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi+4EcjSB5ZG8o/2Jwen5/Kd/NeI2dyss
-rRpw403vjokLQQFI63WqQgGMr3NLeRnOsJloCIF+MsjZQKtZUizLUE1+kOeSB8W7
-QTDcbT6wIl3BpudTLW07ryu6/n7np7Pax9QYjUvSdcZSQ9OUNeYEBFbW3BKYj/E2
-HXj58AFBfMGzQ2SRWEilfvg9gO4LThm4zGhZcSb8YOiGOc1QXrnHfwYStzI/Sp33
-tvbHaioRPXYnwJMad1gKDjeLNiYsQol+MN3pzhLVPrj9BONAuqJTV1W43UXi0r0M
-vKvnyujFf9WS9fdiTtEtFAYVV1urS2S3pEr7neYgsCD8Bty1cVuMqwIDAQABo2Yw
-ZDAdBgNVHQ4EFgQU3zsy3P/ZT7W0unk4RR3k+ZWw6CcwQwYDVR0RBDwwOoINbG9n
-aW4udW1jcy5wbIYpaHR0cHM6Ly9sb2dpbi51bWNzLnBsOjk0NDMvaWRwL3NoaWJi
-b2xldGgwDQYJKoZIhvcNAQELBQADggEBAFOQVZU4doxAUjVjcxgDH6jqCPEz8Rpt
-nVd7GtN8J18yhctzQj3vf+Zit5JSD3DhMD+MHCzLzwPJskSFe/cHaDhNEhxgd3hk
-I0gxi3F9Ahn/H3NY4wm/J1WaM66F2LEv6M8+bbX70fMknUJInvWsejRNaULANIjm
-GdFdFcni64S3pY2CAWr9EVLajavDG70BEqnTk7JpdLeUb27cSDL4gLi04KiGEgr9
-DhuU+dHaoQHmSwsV7P/e21bXtaF9e2KSq3QH1Ar4sIIwanbzixYp6nqIhpEUgMqt
-FJK+09j1gXF3zoBqQBKiu6LPskGSdysF1HLImTOZKnqJWdagZBAzhPc=
-                        </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>
-MIIDJTCCAg2gAwIBAgIVAMov+qL27DY7b0GGhKB6cR5yAjjmMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWxvZ2luLnVtY3MucGwwHhcNMTUwNTEzMTMxNDQ4WhcN
-MzUwNTEzMTMxNDQ4WjAYMRYwFAYDVQQDDA1sb2dpbi51bWNzLnBsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkQQ1fjvDeSEW33cYblgSUacmQQe4zjdG
-YjX9a2Sw44GpzMjSXQIwtQvtGQ1aiuD7GqDdp+NltlOFDQKAoqwRckMzSiGtP8S7
-Mrd/FGLfc5Nx8O8p3EL/m9WHvxSeFV7l5djTGALlWk8ppfT3SD5uUyaG8YCi3e2g
-rVV81LTduOzei4l/lBtyFXh4uMaOGEvDHTUCtq4b10w8HCX/hCzdj1lwaXlqdUnO
-mLbpTB2aVDaJTna/AZHextQ2F4MyigrZugYl0W5wtJA/zZJULPQCu1mgwG2mqhYW
-HLwbQqM0J3OQSOp1bGwT0r8Uf9D0Nc2JfQXt/zgIkCS/4rldhIFNYQIDAQABo2Yw
-ZDAdBgNVHQ4EFgQU5S97xnyCThAtWlWbb0AumEwsoxQwQwYDVR0RBDwwOoINbG9n
-aW4udW1jcy5wbIYpaHR0cHM6Ly9sb2dpbi51bWNzLnBsOjk0NDMvaWRwL3NoaWJi
-b2xldGgwDQYJKoZIhvcNAQELBQADggEBAB82Jxbep9eZZlmgX9ZrO8zOuL01VN8y
-0qBlN/4lkAToDJYfbaYr76HZLuBSDvWirkOh8R6HykK30k7WqF1HS9c+tnPSUTZb
-1UppQcYjkbnde6NGX9iN+wJo4V96QxEz8XJKHvmXVdE1CQ7pi+b912DpjxZrjdRg
-9zgUCm3bbFgYkmB1pFO0nxWT+AbKlVjerFYwJ5Wm02bE5Dwy6mksENN8/LhmvJaz
-4cAv8Lza2e17KmD/CYGncWc+L++kP40CW+kCierHubfe0BtCyq/e4NcONXGoLotB
-wM4RQ5jYrtF1hkeVKs5UhXdsWc0V+1SvBj23fjXaXHj1QadlFr9Hzcg=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umcs.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umcs.pl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej w Lublinie</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Maria Curie-Sklodowska University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Maria Curie-Sklodowska University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Marii Curie-Skłodowskiej</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="pl">http://www.umcs.pl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.umcs.pl/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sekcja Obsługi Informatycznej</md:GivenName>
-    <md:SurName>UMCS</md:SurName>
-    <md:EmailAddress>mailto:usosweb@umcs.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.umt.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.umt.edu-idp-shibboleth.xml
deleted file mode 100644
index 4fb7be7b..00000000
--- a/swamid-interfederations-2.0/login.umt.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +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://login.umt.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">umt.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The University of Montana</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Montana federated identity provider via InCommon.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.umt.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.umt.edu/privacy/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="30" width="163" xml:lang="en">https://www.umt.edu/_common/assets/imx/um_logo.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>
-MIIDHzCCAgegAwIBAgIUNwdPADxM5zSBnh6CyfSZ8WK45hEwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNbG9naW4udW10LmVkdTAeFw0xNDA2MjMyMTE2MTFaFw0z
-NDA2MjMyMTE2MTFaMBgxFjAUBgNVBAMTDWxvZ2luLnVtdC5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDclm8XLCLGyEhkLCMZVRcWFKByiAd0Wje9
-9x344wMRYwGvtct2eWpUECe4yA07KsuZBUTS+KvncnZhRfrt7VjEnSSgUol1hQb1
-JDRAQYV9WqPGRAmQJiwrhPuAbpNW0Fx6h+DP2uvtlZMTnCDn+ImUaN3xTXtmystB
-kDdXuyD5iIA0V2f492jkW5MGBmZzR0A28cSsELdXRt+nqxy6aAeu7DM29sBA6/3P
-rVYHjHAclp0fY6tarwbSxx6CxBiME0JJZxgfGTjZN74i/SELA6nsYiV5yTrJBgQx
-/fhC6L9RzwwY4BzkaZ3z39pRT1qYLi51BLK1VmRqDUEfGQZPs0r/AgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWxvZ2luLnVtdC5lZHWGJGh0dHBzOi8vbG9naW4udW10LmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1WylNNK2pkCt65wRpcDRPvMrKuww
-DQYJKoZIhvcNAQEFBQADggEBAFZpW9MMW4BG8OxlxAUdUKpe0rD4CgH2G0d4xtUU
-f6m65GFQ50QjfJBrx0DP9OPU00aXd7U3+/NIoaiZqttVZ5342zbLpoUMoouh0X6k
-gIJwFO7csVymp/sLX49lzFbFHF3uMYjq827Z+P+MlkB4siFOQ+wp/VGivPN2+AyY
-gE5eqFpIj9joU0ElQotyVB4+3HSZnU9dHfTTQq4vrM0s92eLzyTNIiTic8htUc6L
-SEx2DQoFwQwLwdadb2CdhqB5mW/v4j9dO55gx5p7HgI6B2a2Zuh+imdyAWIvMw48
-A3X832P78ktaAO25Bspo0Oyk4aCo7Ge4xRrlgGhWll6rAL0=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umt.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.umt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.umt.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.umt.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.umt.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umt.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUNwdPADxM5zSBnh6CyfSZ8WK45hEwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNbG9naW4udW10LmVkdTAeFw0xNDA2MjMyMTE2MTFaFw0z
-NDA2MjMyMTE2MTFaMBgxFjAUBgNVBAMTDWxvZ2luLnVtdC5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDclm8XLCLGyEhkLCMZVRcWFKByiAd0Wje9
-9x344wMRYwGvtct2eWpUECe4yA07KsuZBUTS+KvncnZhRfrt7VjEnSSgUol1hQb1
-JDRAQYV9WqPGRAmQJiwrhPuAbpNW0Fx6h+DP2uvtlZMTnCDn+ImUaN3xTXtmystB
-kDdXuyD5iIA0V2f492jkW5MGBmZzR0A28cSsELdXRt+nqxy6aAeu7DM29sBA6/3P
-rVYHjHAclp0fY6tarwbSxx6CxBiME0JJZxgfGTjZN74i/SELA6nsYiV5yTrJBgQx
-/fhC6L9RzwwY4BzkaZ3z39pRT1qYLi51BLK1VmRqDUEfGQZPs0r/AgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWxvZ2luLnVtdC5lZHWGJGh0dHBzOi8vbG9naW4udW10LmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1WylNNK2pkCt65wRpcDRPvMrKuww
-DQYJKoZIhvcNAQEFBQADggEBAFZpW9MMW4BG8OxlxAUdUKpe0rD4CgH2G0d4xtUU
-f6m65GFQ50QjfJBrx0DP9OPU00aXd7U3+/NIoaiZqttVZ5342zbLpoUMoouh0X6k
-gIJwFO7csVymp/sLX49lzFbFHF3uMYjq827Z+P+MlkB4siFOQ+wp/VGivPN2+AyY
-gE5eqFpIj9joU0ElQotyVB4+3HSZnU9dHfTTQq4vrM0s92eLzyTNIiTic8htUc6L
-SEx2DQoFwQwLwdadb2CdhqB5mW/v4j9dO55gx5p7HgI6B2a2Zuh+imdyAWIvMw48
-A3X832P78ktaAO25Bspo0Oyk4aCo7Ge4xRrlgGhWll6rAL0=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.umt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The University of Montana</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The University of Montana</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umt.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josh O'Dowd</md:GivenName>
-    <md:EmailAddress>josh.odowd@umontana.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Gary Trethewey</md:GivenName>
-    <md:EmailAddress>gary.trethewey@umontana.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Adrian Irish</md:GivenName>
-    <md:EmailAddress>adrian.irish@umontana.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.unlv.edu-FIM-sps-MyShib-saml20.xml b/swamid-interfederations-2.0/login.unlv.edu-FIM-sps-MyShib-saml20.xml
deleted file mode 100644
index 2cb70ee4..00000000
--- a/swamid-interfederations-2.0/login.unlv.edu-FIM-sps-MyShib-saml20.xml
+++ /dev/null
@@ -1,97 +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://login.unlv.edu/FIM/sps/MyShib/saml20">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">unlv.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Nevada-Las Vegas</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://oit.unlv.edu/incommon/information</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>
-MIIDUjCCAjqgAwIBAgIEVD3EHjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCTlYxEjAQBgNVBAcTCUxhcyBWZWdhczENMAsGA1UEChMEVU5MVjEMMAoGA1UECxMDT0lUMR4w
-HAYDVQQDExVzc28tZmltLXNoaWIudW5sdi5lZHUwHhcNMTQxMDE1MDA0NzI2WhcNMjMwMTAxMDE0
-NzI2WjBrMQswCQYDVQQGEwJVUzELMAkGA1UECBMCTlYxEjAQBgNVBAcTCUxhcyBWZWdhczENMAsG
-A1UEChMEVU5MVjEMMAoGA1UECxMDT0lUMR4wHAYDVQQDExVzc28tZmltLXNoaWIudW5sdi5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbkmPqD2c1WXNNFPdSo8UPPJjb4n7HhKBn
-i8mvzzXMr/GQwsxaJM3pEek+aSQgwN59Oh3/odoQR2LAUMyhTZEWEtZXfksgNvEv5lpM3CbNdmnM
-xowDo+RZv7wxjr2HpswHJxGcCNAvKHeUJeFlW3BYq3stqY0Ix42DSgRXgXQpE9mAJzoRtdMXyhqL
-bN+rawZkV2/5+WU2batVV/u0TITD6RhdoylUqppmJSSsjXpoR7u16VRb6x9LZIU21eyPJjvdnPA6
-L33br9yQ0bCINUgjXugNrIs5YefKK2soBsU5AovnXRAnAiIaZhHuPlOxO1RELZn7UANA8DBRLhzH
-9j8NAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADGw+IvIW0Pm8Bqvf3WTmpszhNDyP4jD+K5Vt+zO
-uEpSKrxb+HN2vO2hQ9SSFi6gxmkVWg1eK7c/JPh36vmX6dlGuhUBPnsr4wgpfC/ZFOGEAo1Vwpu7
-7+p8JbHn1Y21QcSGPOdxzMRJOUzN7IeQtYwVOLnrXXLHlFqf0RjcB22vfyPANc6yAIWFBTC5pc/2
-HVfcwNXQRj8KQswTahjDFSbPulp97SLNa5aMw3f1PRtnGGvb8HB7CSjGfzHouNqxTEPf3A0nqpdx
-9ec1L21OjIC/MXHxLYUfFJOldQNNCr5jHELdJU2xsuv3t7G8dNw/dwIjL3ItJgEYFeQNDUTIl78=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/slo"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/soap"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/login"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/login"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unlv.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDUjCCAjqgAwIBAgIEVD3EHjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCTlYxEjAQBgNVBAcTCUxhcyBWZWdhczENMAsGA1UEChMEVU5MVjEMMAoGA1UECxMDT0lUMR4w
-HAYDVQQDExVzc28tZmltLXNoaWIudW5sdi5lZHUwHhcNMTQxMDE1MDA0NzI2WhcNMjMwMTAxMDE0
-NzI2WjBrMQswCQYDVQQGEwJVUzELMAkGA1UECBMCTlYxEjAQBgNVBAcTCUxhcyBWZWdhczENMAsG
-A1UEChMEVU5MVjEMMAoGA1UECxMDT0lUMR4wHAYDVQQDExVzc28tZmltLXNoaWIudW5sdi5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbkmPqD2c1WXNNFPdSo8UPPJjb4n7HhKBn
-i8mvzzXMr/GQwsxaJM3pEek+aSQgwN59Oh3/odoQR2LAUMyhTZEWEtZXfksgNvEv5lpM3CbNdmnM
-xowDo+RZv7wxjr2HpswHJxGcCNAvKHeUJeFlW3BYq3stqY0Ix42DSgRXgXQpE9mAJzoRtdMXyhqL
-bN+rawZkV2/5+WU2batVV/u0TITD6RhdoylUqppmJSSsjXpoR7u16VRb6x9LZIU21eyPJjvdnPA6
-L33br9yQ0bCINUgjXugNrIs5YefKK2soBsU5AovnXRAnAiIaZhHuPlOxO1RELZn7UANA8DBRLhzH
-9j8NAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADGw+IvIW0Pm8Bqvf3WTmpszhNDyP4jD+K5Vt+zO
-uEpSKrxb+HN2vO2hQ9SSFi6gxmkVWg1eK7c/JPh36vmX6dlGuhUBPnsr4wgpfC/ZFOGEAo1Vwpu7
-7+p8JbHn1Y21QcSGPOdxzMRJOUzN7IeQtYwVOLnrXXLHlFqf0RjcB22vfyPANc6yAIWFBTC5pc/2
-HVfcwNXQRj8KQswTahjDFSbPulp97SLNa5aMw3f1PRtnGGvb8HB7CSjGfzHouNqxTEPf3A0nqpdx
-9ec1L21OjIC/MXHxLYUfFJOldQNNCr5jHELdJU2xsuv3t7G8dNw/dwIjL3ItJgEYFeQNDUTIl78=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.unlv.edu/FIM/sps/MyShib/saml20/soap"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Nevada-Las Vegas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Nevada-Las Vegas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unlv.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Don Diener</md:GivenName>
-    <md:EmailAddress>don.diener@unlv.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bob Fournier</md:GivenName>
-    <md:EmailAddress>bob.fournier@unlv.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT  Help Desk</md:GivenName>
-    <md:EmailAddress>ithelp@unlv.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>IT Security Office</md:GivenName>
-    <md:EmailAddress>informationsecurityoffice@unlv.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.uoc.gr-idp-shibboleth.xml b/swamid-interfederations-2.0/login.uoc.gr-idp-shibboleth.xml
deleted file mode 100644
index d1006d19..00000000
--- a/swamid-interfederations-2.0/login.uoc.gr-idp-shibboleth.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.uoc.gr/idp/shibboleth">
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucnet.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rector.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cc.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csd.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">math.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">physics.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.physics.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chemistry.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.chemistry.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">biology.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.biology.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">med.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.med.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">materials.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.materials.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fks.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">philology.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ia.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edc.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pol.soc.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">econ.soc.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">social.soc.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psy.soc.uoc.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEfjCCA2agAwIBAgIQeedqjtyFxtg1J78DPtZYdjANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTE0MTAwODAwMDAwMFoXDTE2MTIzMTIzNTk1OVowOjEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwxsb2dpbi51b2Mu
-                            Z3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSPNsZbSb75mxMYpGZ
-                            MPR54b/57Ykg8BE7tNeiNzYMBVujhKw8QueFRD5CMMRLjxdlIGeky9kWB4l/g2VD
-                            RHhVQa54Yaxt5FIeRQCoN/lnsfkH1RTfecUI2f37Uj65sR+HmQL1ndhuxWLgONOh
-                            thJbzoCNET/3b7CP6U1W7TvM1rMPsD4ZYQPAQolKsYgWJm7OQNTT3NRE5ikXAKuu
-                            5WXkMJ4NHCbbXOog2xQ2JZjHhtykKm/8C8DyO1fWgN1m/BaGK3LVxpds43izyJoy
-                            GHMxuqeC60LX0cgd1m0ATDMBMDYyA7YGDvpomO1KDtlIK1XNwv+PBXAE96ljfv1R
-                            9nYRAgMBAAGjggGCMIIBfjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
-                            7TAdBgNVHQ4EFgQUWGJ3+RO/rKDCYQCyZEkfxGlgSf0wDgYDVR0PAQH/BAQDAgWg
-                            MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
-                            A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
-                            oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
-                            CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
-                            Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
-                            cy50ZXJlbmEub3JnMDAGA1UdEQQpMCeCDGxvZ2luLnVvYy5ncoIXc2hpYmJvbGV0
-                            aC51Y25ldC51b2MuZ3IwDQYJKoZIhvcNAQEFBQADggEBAGPlodTUK2wuwoT1HJSw
-                            v0oQMxwLwbjVcf5vDVI5CrAafC9TmdeZzxIkfP9BzywE2PeUdm9XYBuXZZ+0Vx1y
-                            YnIMwPTuXpyioIQ6slw8Wy9lTAAgKxtyhX2wNg75SVEBs9c5EfKI7pMmTol+MIQG
-                            hrBJa6lc6c2RmDS3tsZs6FcvgUVM53YzENawtpLTFKcBTWdATwT68/Ujku+5MwwK
-                            CtevmGUIIxA3GpOJUT7GRu0a6kKbX9iWnT/eRVSAXGkndlRL0VLQo17qkU3fb/tW
-                            tAOiVMATkXCl/nWUTGC1g/wlJBw5aL8k8wNkhuApDFIpXWh6LPvmlLYrnDNSarP8
-                            l+c=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.uoc.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.uoc.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.uoc.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.uoc.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.uoc.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.uoc.gr/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">uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucnet.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rector.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cc.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csd.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">math.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">physics.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.physics.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">chemistry.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.chemistry.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">biology.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.biology.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">med.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.med.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">materials.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.materials.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fks.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">philology.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ia.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edc.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pol.soc.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">econ.soc.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">social.soc.uoc.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">psy.soc.uoc.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEfjCCA2agAwIBAgIQeedqjtyFxtg1J78DPtZYdjANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTE0MTAwODAwMDAwMFoXDTE2MTIzMTIzNTk1OVowOjEhMB8GA1UE
-                            CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwxsb2dpbi51b2Mu
-                            Z3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSPNsZbSb75mxMYpGZ
-                            MPR54b/57Ykg8BE7tNeiNzYMBVujhKw8QueFRD5CMMRLjxdlIGeky9kWB4l/g2VD
-                            RHhVQa54Yaxt5FIeRQCoN/lnsfkH1RTfecUI2f37Uj65sR+HmQL1ndhuxWLgONOh
-                            thJbzoCNET/3b7CP6U1W7TvM1rMPsD4ZYQPAQolKsYgWJm7OQNTT3NRE5ikXAKuu
-                            5WXkMJ4NHCbbXOog2xQ2JZjHhtykKm/8C8DyO1fWgN1m/BaGK3LVxpds43izyJoy
-                            GHMxuqeC60LX0cgd1m0ATDMBMDYyA7YGDvpomO1KDtlIK1XNwv+PBXAE96ljfv1R
-                            9nYRAgMBAAGjggGCMIIBfjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
-                            7TAdBgNVHQ4EFgQUWGJ3+RO/rKDCYQCyZEkfxGlgSf0wDgYDVR0PAQH/BAQDAgWg
-                            MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
-                            A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
-                            oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
-                            CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
-                            Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
-                            cy50ZXJlbmEub3JnMDAGA1UdEQQpMCeCDGxvZ2luLnVvYy5ncoIXc2hpYmJvbGV0
-                            aC51Y25ldC51b2MuZ3IwDQYJKoZIhvcNAQEFBQADggEBAGPlodTUK2wuwoT1HJSw
-                            v0oQMxwLwbjVcf5vDVI5CrAafC9TmdeZzxIkfP9BzywE2PeUdm9XYBuXZZ+0Vx1y
-                            YnIMwPTuXpyioIQ6slw8Wy9lTAAgKxtyhX2wNg75SVEBs9c5EfKI7pMmTol+MIQG
-                            hrBJa6lc6c2RmDS3tsZs6FcvgUVM53YzENawtpLTFKcBTWdATwT68/Ujku+5MwwK
-                            CtevmGUIIxA3GpOJUT7GRu0a6kKbX9iWnT/eRVSAXGkndlRL0VLQo17qkU3fb/tW
-                            tAOiVMATkXCl/nWUTGC1g/wlJBw5aL8k8wNkhuApDFIpXWh6LPvmlLYrnDNSarP8
-                            l+c=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.uoc.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.uoc.gr:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Crete</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Πανεπιστήμιο Κρήτης</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Crete</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Πανεπιστήμιο Κρήτης</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uoc.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.uoc.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michalis</md:GivenName>
-    <md:SurName>Kalogirou</md:SurName>
-    <md:EmailAddress>kalogirou@uoc.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Crete</md:Company>
-    <md:EmailAddress>helpdesk@uoc.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 04ad98e5..00000000
--- a/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utenos-kolegija.lt</shibmd:Scope>
-      <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 width="100" height="100">https://login.utenos-kolegija.lt/static/logo_100.png</mdui:Logo>
-        <mdui:Logo width="256" height="256">https://login.utenos-kolegija.lt/static/logo_256.png</mdui:Logo>
-        <mdui:Logo width="512" height="512">https://login.utenos-kolegija.lt/static/logo_512.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.219.181.176/28</mdui:IPHint>
-        <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.499166,25.601316</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>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</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>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</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:persistent</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>sso@utenos-kolegija.lt</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.utp.edu.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/login.utp.edu.pl-idp-shibboleth.xml
deleted file mode 100644
index 24c6f190..00000000
--- a/swamid-interfederations-2.0/login.utp.edu.pl-idp-shibboleth.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.utp.edu.pl/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-06-23T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utp.edu.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Science and Technology in Bydgoszcz</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Science and Technology in Bydgoszcz</mdui:Description>
-        <mdui:DisplayName xml:lang="pl">Uniwersytet Technologiczno-Przyrodniczy w Bydgoszczy</mdui:DisplayName>
-        <mdui:Description xml:lang="pl">Uniwersytet Technologiczno-Przyrodniczy w Bydgoszczy</mdui:Description>
-        <mdui:Logo height="100" width="411">https://login.utp.edu.pl/idp/images/logo_org.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>
-MIIDLDCCAhSgAwIBAgIVANTZhzBBbVG3A5ID/bB5iH95qTPMMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGxvZ2luLnV0cC5lZHUucGwwHhcNMTUwNDE2MTA1OTI0
-WhcNMzUwNDE2MTA1OTI0WjAbMRkwFwYDVQQDDBBsb2dpbi51dHAuZWR1LnBsMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAllSGUwYP6GLhIubTO5S2jMWa
-S8CQNbYQYVI2m0LLnenwF7WY+171KBELuGHECSZ0Ccao2fnTViuJOpZi0dQXz9xa
-q132AqkRAJkwqoUrlfagSu2eoJytFLHTj3C4JmRSHME+93gDywIEdBqGf5wjNEI7
-NleZMlGMjyhWpfmpqjBX9XKDPsuWef85r/Y/son/RIfOZgO5SMhxzLZVZN39Ts1W
-Peaa2E9Mh3oj3ktCiHXjY4Eo7ghLrLLN3EpJl2QO8bEyhflR1A/bV47zlJbPlR7w
-hDlnY2k9X3PKdIERJPKlBhnOSuLCzkWBuvX0HxCV/UYhRxfWCzH5RgQA7wtWqQID
-AQABo2cwZTAdBgNVHQ4EFgQUsx7kER7PTMhmv74cnrOeZQTGl6wwRAYDVR0RBD0w
-O4IQbG9naW4udXRwLmVkdS5wbIYnaHR0cHM6Ly9sb2dpbi51dHAuZWR1LnBsL2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAyklTyfwRxWpkgryyseVBW
-xsRB6Cp8jcsdwv4mTjnSwopn9hlGzaIWOW/kzNte6ad4KNRt0h4z6HHtvKGZhNhu
-dE+csEjmINxTbWVQyyxKYA5JUMnNQKAH8pLKxFf/fwwdkVfZDrQlBmPEwFw/ItGr
-QST+t+jRw2fQIn/Dg54oXjZ1GcWc5/erSPO0CgtWgm20iJmeoDbinaosNg01pzLb
-/2Zkwu9baimGvvwuRioCWrv8eZwyeNDZTJht/KXlOdP3o46c6qqqO74unu4KjFmo
-M3XxZC+dPpFfVbMXN5To7yCoUzwi5rpQt6yjQJ17oa6ZsVMco6fNSBiAxum02hV8
-                        </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>
-MIIDKzCCAhOgAwIBAgIUfpqpOEPSJsl5JtwBlfItUOO3fCUwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQbG9naW4udXRwLmVkdS5wbDAeFw0xNTA0MTYxMDU5MjNa
-Fw0zNTA0MTYxMDU5MjNaMBsxGTAXBgNVBAMMEGxvZ2luLnV0cC5lZHUucGwwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe4jSHC7TIWPWaG3AN6q2qCb49
-tI3YzJoTMfFbsjMN5RBsYeYdzrBKyMRaG+Kx95hP5Bt7CqmoGAlsd0EpOa8SEI/Y
-6ObGfj8c5OhvTiilq82UIx/L5B/gEZGMJqS43KahUyCdew5AUk4PutObb3v246yL
-Cbdv3JjL5V0raOAtn4GCTeHFI+Qz2/FKHaoJe5AiXGLFa7jO/rC7s7ZvdFwMzReO
-i1FxLK3yWLYe15p2AjKkdAgZwH3WesXq5cD9C7qnG9u6RutAmNvZY70Nv0NKXyxf
-Kqt6LcKE6w5FIguvWxBuf24FDSdU+wnqGmbs3OyDKrfZluz7rfMnL3CTNih5AgMB
-AAGjZzBlMB0GA1UdDgQWBBT+xoMGWGXWuhpsXyKP/kMJkX1NmDBEBgNVHREEPTA7
-ghBsb2dpbi51dHAuZWR1LnBshidodHRwczovL2xvZ2luLnV0cC5lZHUucGwvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACsimFVv+lJaE8o+9hI/Tm/m
-xdFkJE+nnSXHB+kFTzsbwLy6+S7opofS61dIAxdh3vwja0a8fnQre/yHVTD3j7Pe
-+mFPUZAlP3CSKMWMbBB9QyAxzCae4X/2ycp+ZOqEHMGN2Z3W+Z68YJ5kiLehB5QW
-7ZozBo46U8/jqWJUaMxvL2VdJswxrHlvBIq5geOr9W6mySh+jTn1vyLwiVb6HYVY
-r5pBrBBCUKf4CkNizS2sz5W0ikv9W0f8fehSVr33mABcJewP4lUkcM5Zxs2Ktost
-iOsudRJYzu9b82Hc5lqvq6cG2xODy3YxKEAqMOQfUYZzpiyJsI6gj4iGEr+yI7o=
-                        </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>
-MIIDKzCCAhOgAwIBAgIUbBTB/3SY7nD+jXiZK9grzmv42cswDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQbG9naW4udXRwLmVkdS5wbDAeFw0xNTA0MTYxMDU5MjRa
-Fw0zNTA0MTYxMDU5MjRaMBsxGTAXBgNVBAMMEGxvZ2luLnV0cC5lZHUucGwwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAKyF1wxVIbrOsBldj73g+lRHz
-vs8aKX8J65jLV1TJ9MfKP3PQqRSiheI41/JkNdCYU6f4iQfiDZXThPPoRqVPOzX7
-XqI7eBq5s1/xoaCzE/Y4c6FnMrEewIvlcwN/+0Xik4QfFg7JR39DZ//rbKozutpI
-vfDrWr8Hs5e1xJbRuJ8gdqzTLWxLUPn3AlBPjIMfZxABDPpwywWkZ3c6yUlNgeue
-gC0GW60oHgcqCQqo1FTAUmr3/G1nru2DGB8seex6cSidC3xkncq0BCqbd7O4ungt
-STx8OjHSbI/es9Ogil0FhMR83sTzKrmHGJE+wr/MFIdK2RI3ipWHxYBN4PPhAgMB
-AAGjZzBlMB0GA1UdDgQWBBQatgrUHOXId+l8/6VMtBBEsFQ8GzBEBgNVHREEPTA7
-ghBsb2dpbi51dHAuZWR1LnBshidodHRwczovL2xvZ2luLnV0cC5lZHUucGwvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACUMR8r1YA36eNJ4MKR72MNt
-dszTKj0aKVyvNPu6qhseg04F0bzDoCNhBcQkHaWL1XFxmMjkQdrTSduOIARzJQ6t
-hLrWkTnzwwZucQdfECUlEwgZY2vaIGiCoWI1dGwdQR584zsTzLbjBna7VcTWtEid
-GT2KjwWOBkOKov1SWYU9Dio5ixbwqEj6Yk01avNO3H+ccIptZ1MNVX04uLnV0+J/
-Mo5hv2+kVOVeoXhmkJNo7867iIY9vU87JL5T1YS2l/LxlhsDU5gHQWNesfwgxHsY
-l8pnSfcxhoDEKU6WG6KnFdf+SfFtdg2ktYT8adwxpf31LacR/ZoNfem086a6kN0=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.utp.edu.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.utp.edu.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.utp.edu.pl/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.utp.edu.pl/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.utp.edu.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.utp.edu.pl/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utp.edu.pl</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVANTZhzBBbVG3A5ID/bB5iH95qTPMMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEGxvZ2luLnV0cC5lZHUucGwwHhcNMTUwNDE2MTA1OTI0
-WhcNMzUwNDE2MTA1OTI0WjAbMRkwFwYDVQQDDBBsb2dpbi51dHAuZWR1LnBsMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAllSGUwYP6GLhIubTO5S2jMWa
-S8CQNbYQYVI2m0LLnenwF7WY+171KBELuGHECSZ0Ccao2fnTViuJOpZi0dQXz9xa
-q132AqkRAJkwqoUrlfagSu2eoJytFLHTj3C4JmRSHME+93gDywIEdBqGf5wjNEI7
-NleZMlGMjyhWpfmpqjBX9XKDPsuWef85r/Y/son/RIfOZgO5SMhxzLZVZN39Ts1W
-Peaa2E9Mh3oj3ktCiHXjY4Eo7ghLrLLN3EpJl2QO8bEyhflR1A/bV47zlJbPlR7w
-hDlnY2k9X3PKdIERJPKlBhnOSuLCzkWBuvX0HxCV/UYhRxfWCzH5RgQA7wtWqQID
-AQABo2cwZTAdBgNVHQ4EFgQUsx7kER7PTMhmv74cnrOeZQTGl6wwRAYDVR0RBD0w
-O4IQbG9naW4udXRwLmVkdS5wbIYnaHR0cHM6Ly9sb2dpbi51dHAuZWR1LnBsL2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAyklTyfwRxWpkgryyseVBW
-xsRB6Cp8jcsdwv4mTjnSwopn9hlGzaIWOW/kzNte6ad4KNRt0h4z6HHtvKGZhNhu
-dE+csEjmINxTbWVQyyxKYA5JUMnNQKAH8pLKxFf/fwwdkVfZDrQlBmPEwFw/ItGr
-QST+t+jRw2fQIn/Dg54oXjZ1GcWc5/erSPO0CgtWgm20iJmeoDbinaosNg01pzLb
-/2Zkwu9baimGvvwuRioCWrv8eZwyeNDZTJht/KXlOdP3o46c6qqqO74unu4KjFmo
-M3XxZC+dPpFfVbMXN5To7yCoUzwi5rpQt6yjQJ17oa6ZsVMco6fNSBiAxum02hV8
-                        </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>
-MIIDKzCCAhOgAwIBAgIUfpqpOEPSJsl5JtwBlfItUOO3fCUwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQbG9naW4udXRwLmVkdS5wbDAeFw0xNTA0MTYxMDU5MjNa
-Fw0zNTA0MTYxMDU5MjNaMBsxGTAXBgNVBAMMEGxvZ2luLnV0cC5lZHUucGwwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCe4jSHC7TIWPWaG3AN6q2qCb49
-tI3YzJoTMfFbsjMN5RBsYeYdzrBKyMRaG+Kx95hP5Bt7CqmoGAlsd0EpOa8SEI/Y
-6ObGfj8c5OhvTiilq82UIx/L5B/gEZGMJqS43KahUyCdew5AUk4PutObb3v246yL
-Cbdv3JjL5V0raOAtn4GCTeHFI+Qz2/FKHaoJe5AiXGLFa7jO/rC7s7ZvdFwMzReO
-i1FxLK3yWLYe15p2AjKkdAgZwH3WesXq5cD9C7qnG9u6RutAmNvZY70Nv0NKXyxf
-Kqt6LcKE6w5FIguvWxBuf24FDSdU+wnqGmbs3OyDKrfZluz7rfMnL3CTNih5AgMB
-AAGjZzBlMB0GA1UdDgQWBBT+xoMGWGXWuhpsXyKP/kMJkX1NmDBEBgNVHREEPTA7
-ghBsb2dpbi51dHAuZWR1LnBshidodHRwczovL2xvZ2luLnV0cC5lZHUucGwvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACsimFVv+lJaE8o+9hI/Tm/m
-xdFkJE+nnSXHB+kFTzsbwLy6+S7opofS61dIAxdh3vwja0a8fnQre/yHVTD3j7Pe
-+mFPUZAlP3CSKMWMbBB9QyAxzCae4X/2ycp+ZOqEHMGN2Z3W+Z68YJ5kiLehB5QW
-7ZozBo46U8/jqWJUaMxvL2VdJswxrHlvBIq5geOr9W6mySh+jTn1vyLwiVb6HYVY
-r5pBrBBCUKf4CkNizS2sz5W0ikv9W0f8fehSVr33mABcJewP4lUkcM5Zxs2Ktost
-iOsudRJYzu9b82Hc5lqvq6cG2xODy3YxKEAqMOQfUYZzpiyJsI6gj4iGEr+yI7o=
-                        </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>
-MIIDKzCCAhOgAwIBAgIUbBTB/3SY7nD+jXiZK9grzmv42cswDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQbG9naW4udXRwLmVkdS5wbDAeFw0xNTA0MTYxMDU5MjRa
-Fw0zNTA0MTYxMDU5MjRaMBsxGTAXBgNVBAMMEGxvZ2luLnV0cC5lZHUucGwwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAKyF1wxVIbrOsBldj73g+lRHz
-vs8aKX8J65jLV1TJ9MfKP3PQqRSiheI41/JkNdCYU6f4iQfiDZXThPPoRqVPOzX7
-XqI7eBq5s1/xoaCzE/Y4c6FnMrEewIvlcwN/+0Xik4QfFg7JR39DZ//rbKozutpI
-vfDrWr8Hs5e1xJbRuJ8gdqzTLWxLUPn3AlBPjIMfZxABDPpwywWkZ3c6yUlNgeue
-gC0GW60oHgcqCQqo1FTAUmr3/G1nru2DGB8seex6cSidC3xkncq0BCqbd7O4ungt
-STx8OjHSbI/es9Ogil0FhMR83sTzKrmHGJE+wr/MFIdK2RI3ipWHxYBN4PPhAgMB
-AAGjZzBlMB0GA1UdDgQWBBQatgrUHOXId+l8/6VMtBBEsFQ8GzBEBgNVHREEPTA7
-ghBsb2dpbi51dHAuZWR1LnBshidodHRwczovL2xvZ2luLnV0cC5lZHUucGwvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACUMR8r1YA36eNJ4MKR72MNt
-dszTKj0aKVyvNPu6qhseg04F0bzDoCNhBcQkHaWL1XFxmMjkQdrTSduOIARzJQ6t
-hLrWkTnzwwZucQdfECUlEwgZY2vaIGiCoWI1dGwdQR584zsTzLbjBna7VcTWtEid
-GT2KjwWOBkOKov1SWYU9Dio5ixbwqEj6Yk01avNO3H+ccIptZ1MNVX04uLnV0+J/
-Mo5hv2+kVOVeoXhmkJNo7867iIY9vU87JL5T1YS2l/LxlhsDU5gHQWNesfwgxHsY
-l8pnSfcxhoDEKU6WG6KnFdf+SfFtdg2ktYT8adwxpf31LacR/ZoNfem086a6kN0=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.utp.edu.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="pl">Uniwersytet Technologiczno-Przyrodniczy w Bydgoszczy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Science and Technology in Bydgoszcz</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Science and Technology in Bydgoszcz</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Technologiczno-Przyrodniczy w Bydgoszczy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="pl">http://www.utp.edu.pl</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.utp.edu.pl/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>DMASK</md:GivenName>
-    <md:EmailAddress>admin@utp.edu.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.xml
deleted file mode 100644
index c4f824ce..00000000
--- a/swamid-interfederations-2.0/login.vu.lt-SSO-saml2-idp-metadata.php.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://login.vu.lt/SSO/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2010-09-07T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://fedi.litnet.lt/index.php/en/policy</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="lt">http://fedi.litnet.lt/index.php/lt/informacija/tvarka</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">Vilnius University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="lt">Vilniaus universitetas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">VU Single Sign On</mdui:Description>
-        <mdui:Description xml:lang="lt">VU Vieningo prisijungimo sistema</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.vu.lt</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="lt">http://www.vu.lt</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">Vilnius Vilnius+University</mdui:Keywords>
-        <mdui:Keywords xml:lang="lt">Vilnius Vilniaus+universitetas</mdui:Keywords>
-        <mdui:Logo width="66" height="73">https://www.ittc.vu.lt/images/vu_logo.jpg</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>MIID5zCCAs+gAwIBAgIJAOXB1LH43Dw1MA0GCSqGSIb3DQEBBQUAMIGJMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czEkMCIGA1UECgwbVmlsbml1cyBVbml2ZXJzaXR5IC8gTElUTkVUMRAwDgYDVQQDDAdBcm1pbmFzMR4wHAYJKoZIhvcNAQkBFg9zc28tYWRtaW5AdnUubHQwHhcNMTQwODI5MTE0NTAxWhcNMjQwODI4MTE0NTAxWjCBiTELMAkGA1UEBhMCTFQxEDAOBgNVBAgMB1ZpbG5pdXMxEDAOBgNVBAcMB1ZpbG5pdXMxJDAiBgNVBAoMG1ZpbG5pdXMgVW5pdmVyc2l0eSAvIExJVE5FVDEQMA4GA1UEAwwHQXJtaW5hczEeMBwGCSqGSIb3DQEJARYPc3NvLWFkbWluQHZ1Lmx0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1GmvMRKfSzqMuE+VmmkJswqKyFuALLRnYFeXUnkzK2W0ASATmp72hgphCg974bWsU/Vv9Mko1MEb9uvDLPhlnaNywClnQf/lwKAVcVz+fJALUjKVR5hhqQaeeUvikqXcklrgB1cLRtRxdXvHkhnbEwciR8QVqL/RdxfZ/U8QTeYnAQ1y5RsBYdhc5Sfk1PyVtylliDen0RJc1IOO98GxXZ2kHAeqyfNFj+69iC3DPFoqMOyS0ShJtMsZKonI25ieDPaCwnZsjotzu7S2umkhykJ1mH1PbCXJDnHuiO7cD/pD5XfpZMyDZHEcS/GGiEQm15vCUuyTV6z/RQZuhCxD2wIDAQABo1AwTjAdBgNVHQ4EFgQUkTQvHIDtX6Xr9zZgPFDvJ9OAAvwwHwYDVR0jBBgwFoAUkTQvHIDtX6Xr9zZgPFDvJ9OAAvwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEACiNtCh1swzMUbf6DG5DoTQuzvtwaUw8T/8lBfb2ncyiilFZ0pwfOh5W3FxQDHWQ+Be40WHWCO7Om8Mw0OVFyYN9DLfT4Wne/3BTt+8SGDEaWlMl7G5fYtNc++U7lCzg+8HPTo4lBwMP4f+mbf5uYxwQXCoLs0b46tiNv61wXfncCReykBfYk6xXu4Toh1BmUn5hrNq11DjsaIpbCtczINnuj0ojlJOz7+J41MHf7QuwLCUdx66rbegfSV7t1QaTvgtGTFnl2hInXtrRmgC/tkmo4hiLxypUW4JChUxDyAuRqBVkP2pGiL6cf3vru8eEPdS+3QTBqmmbEZ1uVqw8VjQ==</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>MIID5zCCAs+gAwIBAgIJAOXB1LH43Dw1MA0GCSqGSIb3DQEBBQUAMIGJMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czEkMCIGA1UECgwbVmlsbml1cyBVbml2ZXJzaXR5IC8gTElUTkVUMRAwDgYDVQQDDAdBcm1pbmFzMR4wHAYJKoZIhvcNAQkBFg9zc28tYWRtaW5AdnUubHQwHhcNMTQwODI5MTE0NTAxWhcNMjQwODI4MTE0NTAxWjCBiTELMAkGA1UEBhMCTFQxEDAOBgNVBAgMB1ZpbG5pdXMxEDAOBgNVBAcMB1ZpbG5pdXMxJDAiBgNVBAoMG1ZpbG5pdXMgVW5pdmVyc2l0eSAvIExJVE5FVDEQMA4GA1UEAwwHQXJtaW5hczEeMBwGCSqGSIb3DQEJARYPc3NvLWFkbWluQHZ1Lmx0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1GmvMRKfSzqMuE+VmmkJswqKyFuALLRnYFeXUnkzK2W0ASATmp72hgphCg974bWsU/Vv9Mko1MEb9uvDLPhlnaNywClnQf/lwKAVcVz+fJALUjKVR5hhqQaeeUvikqXcklrgB1cLRtRxdXvHkhnbEwciR8QVqL/RdxfZ/U8QTeYnAQ1y5RsBYdhc5Sfk1PyVtylliDen0RJc1IOO98GxXZ2kHAeqyfNFj+69iC3DPFoqMOyS0ShJtMsZKonI25ieDPaCwnZsjotzu7S2umkhykJ1mH1PbCXJDnHuiO7cD/pD5XfpZMyDZHEcS/GGiEQm15vCUuyTV6z/RQZuhCxD2wIDAQABo1AwTjAdBgNVHQ4EFgQUkTQvHIDtX6Xr9zZgPFDvJ9OAAvwwHwYDVR0jBBgwFoAUkTQvHIDtX6Xr9zZgPFDvJ9OAAvwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEACiNtCh1swzMUbf6DG5DoTQuzvtwaUw8T/8lBfb2ncyiilFZ0pwfOh5W3FxQDHWQ+Be40WHWCO7Om8Mw0OVFyYN9DLfT4Wne/3BTt+8SGDEaWlMl7G5fYtNc++U7lCzg+8HPTo4lBwMP4f+mbf5uYxwQXCoLs0b46tiNv61wXfncCReykBfYk6xXu4Toh1BmUn5hrNq11DjsaIpbCtczINnuj0ojlJOz7+J41MHf7QuwLCUdx66rbegfSV7t1QaTvgtGTFnl2hInXtrRmgC/tkmo4hiLxypUW4JChUxDyAuRqBVkP2pGiL6cf3vru8eEPdS+3QTBqmmbEZ1uVqw8VjQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.vu.lt/SSO/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.vu.lt/SSO/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Vilnius University</md:OrganizationName>
-    <md:OrganizationName xml:lang="lt">Vilniaus universitetas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Vilnius University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="lt">Vilniaus universitetas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vu.lt</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lt">http://www.vu.lt</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>VU</md:GivenName>
-    <md:SurName>SSO Admin</md:SurName>
-    <md:EmailAddress>sso-admin@vu.lt</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.w-hs.de-idp-shibboleth.xml b/swamid-interfederations-2.0/login.w-hs.de-idp-shibboleth.xml
deleted file mode 100644
index d9291041..00000000
--- a/swamid-interfederations-2.0/login.w-hs.de-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://login.w-hs.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-13T13:45:59Z">
-      <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>
-  </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">w-hs.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Westfälische Hochschule</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Westfälische Hochschule, University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Westfälische Hochschule Gelsenkirchen Bocholt Recklinghausen</mdui:Description>
-        <mdui:Description xml:lang="en">Westfälische Hochschule, University of Applied Sciences Gelsenkirchen Bocholt Recklinghausen</mdui:Description>
-        <mdui:Logo height="16" width="16">https://login.w-hs.de/idp/images/favicon.png</mdui:Logo>
-        <mdui:Logo height="103" width="393">https://login.w-hs.de/idp/images/logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.w-hs.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.en.w-hs.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.w-hs.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.w-hs.de,OU=ZIM-IT,O=Westfaelische Hochschule Gelsenkirchen\, Bocholt\, Recklinghausen,L=Gelsenkirchen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHCzCCBfOgAwIBAgIHGI6IZfmuSjANBgkqhkiG9w0BAQsFADCBozELMAkGA1UE
-BhMCREUxSDBGBgNVBAoTP1dlc3RmYWVsaXNjaGUgSG9jaHNjaHVsZSBHZWxzZW5r
-aXJjaGVuLCBCb2Nob2x0LCBSZWNrbGluZ2hhdXNlbjEvMC0GA1UEAxMmQ0EgZGVy
-IFdlc3RmYWVsaXNjaGVuIEhvY2hzY2h1bGUgLSBHMDExGTAXBgkqhkiG9w0BCQEW
-CmNhQHctaHMuZGUwHhcNMTQxMTIxMDk1MDE0WhcNMTkwNzA2MDAwMDAwWjCBtjEL
-MAkGA1UEBhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xFjAUBgNV
-BAcTDUdlbHNlbmtpcmNoZW4xSDBGBgNVBAoTP1dlc3RmYWVsaXNjaGUgSG9jaHNj
-aHVsZSBHZWxzZW5raXJjaGVuLCBCb2Nob2x0LCBSZWNrbGluZ2hhdXNlbjEPMA0G
-A1UECxMGWklNLUlUMRYwFAYDVQQDEw1sb2dpbi53LWhzLmRlMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAuxkxwqc536d5blbSQG6VrReP5UdEWuDNV6nZ
-Hv9EtQ4WobU6hSk/hi/vIX+2NMQ56AI1WCewc2IwqAAdn6y7QbB79qqz1E9GZa04
-odpEOJSe+C+rdA4t1KJlEuzRSAaredliMbNWWOQhaoVqx9IYcoddE6M1WQktMtAV
-3XFVpNeEdty1kK4/Agfg1qzAoBkUNG2uKVWrjqvzJU/vsdsDRwKY5aAJGy5xj2Pd
-SoQE31K8oyKJKT1suFPsbQ9yqlfrgAW8GzrblfHNV2ZNfXK54DVJIrsLq6nnMXnc
-6ie/v6FuAv9zA5isBBN6EKQ4gwOhv0662PlBqnnDJlFvhHm7eInTS0iC4Mq4/VD6
-r0phSVWevTqKf6rr9Ljm3MmGXIytB/0gHnmMYtzSiUhOHezX1pyrytzCtCh3WM4F
-U/EEUwFmYFZ7v80/ENTveAezhSC5Sg8ZKNxhiV1dcONTRDVQu4wwGvvgs8dOMe1M
-cW5R+Jqx2TTCVUzWQ58QHOKR+caRfy+nRUpM7wBPE1Ossy0/FS3VCxRGlDNWBc8c
-agSyXiwidDGJkOMd8nfsVEb/VbBHNEA3OXh3DKDTPYOw2Tey7/Uo2MVvNWy4e23A
-SY3l/nCrFZ2iapefeZfYQiESHWQ/71MpSn60VdeGt1L9CniNIsYsVW/JEbt0wvIo
-nD2kkAsCAwEAAaOCAi0wggIpMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlTAP3LoqZtwR/c5+
-VR6DYP4HzAAwHwYDVR0jBBgwFoAU/LMkKo3ThpDON7se1/by9MeqXygwGAYDVR0R
-BBEwD4INbG9naW4udy1ocy5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3ctaHMtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdy1ocy1jYS9wdWIvY3JsL2NhY3JsLmNybDCB
-yQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5k
-Zm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS93LWhzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBABggrBgEF
-BQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS93LWhzLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBPBgNVHSAESDBGMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
-rSGCLB4wEQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATANBgkq
-hkiG9w0BAQsFAAOCAQEAduqxgH88kkDpiIzH1QKaiGk+JoZbzcj9PcBPocpk1K3k
-LCzRSqNM+XUvQtmSzJA5Q4t5kZ9Xk0iU4NYxkXV3vhQOtHc3UT4ZAIImcRmoBZDw
-Pnk7L9ezrKfw4OIbw+a8y9w0KVrlMifHPahcc5Vp7k6B3l8sWS/A4NONCbTY0b9k
-ffKu8gIH14ELKwoqElGCcLTNjyUli6gJNGt283bQKQvaPBch/VjBSR0jsN6drwh/
-rG6E1/n5PC2dad/xREhU4fKhz4zPbdb6pq583GPz/pOTItpZ1iEcFJO43UIO8s7p
-1flnDftTm/jsXvc+lc5/qA60dRU52CfJhDfc0kVY6g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.w-hs.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.w-hs.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.w-hs.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.w-hs.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.w-hs.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.w-hs.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.w-hs.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.w-hs.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.w-hs.de/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.w-hs.de/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">w-hs.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login.w-hs.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login.w-hs.de,OU=ZIM-IT,O=Westfaelische Hochschule Gelsenkirchen\, Bocholt\, Recklinghausen,L=Gelsenkirchen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHCzCCBfOgAwIBAgIHGI6IZfmuSjANBgkqhkiG9w0BAQsFADCBozELMAkGA1UE
-BhMCREUxSDBGBgNVBAoTP1dlc3RmYWVsaXNjaGUgSG9jaHNjaHVsZSBHZWxzZW5r
-aXJjaGVuLCBCb2Nob2x0LCBSZWNrbGluZ2hhdXNlbjEvMC0GA1UEAxMmQ0EgZGVy
-IFdlc3RmYWVsaXNjaGVuIEhvY2hzY2h1bGUgLSBHMDExGTAXBgkqhkiG9w0BCQEW
-CmNhQHctaHMuZGUwHhcNMTQxMTIxMDk1MDE0WhcNMTkwNzA2MDAwMDAwWjCBtjEL
-MAkGA1UEBhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xFjAUBgNV
-BAcTDUdlbHNlbmtpcmNoZW4xSDBGBgNVBAoTP1dlc3RmYWVsaXNjaGUgSG9jaHNj
-aHVsZSBHZWxzZW5raXJjaGVuLCBCb2Nob2x0LCBSZWNrbGluZ2hhdXNlbjEPMA0G
-A1UECxMGWklNLUlUMRYwFAYDVQQDEw1sb2dpbi53LWhzLmRlMIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAuxkxwqc536d5blbSQG6VrReP5UdEWuDNV6nZ
-Hv9EtQ4WobU6hSk/hi/vIX+2NMQ56AI1WCewc2IwqAAdn6y7QbB79qqz1E9GZa04
-odpEOJSe+C+rdA4t1KJlEuzRSAaredliMbNWWOQhaoVqx9IYcoddE6M1WQktMtAV
-3XFVpNeEdty1kK4/Agfg1qzAoBkUNG2uKVWrjqvzJU/vsdsDRwKY5aAJGy5xj2Pd
-SoQE31K8oyKJKT1suFPsbQ9yqlfrgAW8GzrblfHNV2ZNfXK54DVJIrsLq6nnMXnc
-6ie/v6FuAv9zA5isBBN6EKQ4gwOhv0662PlBqnnDJlFvhHm7eInTS0iC4Mq4/VD6
-r0phSVWevTqKf6rr9Ljm3MmGXIytB/0gHnmMYtzSiUhOHezX1pyrytzCtCh3WM4F
-U/EEUwFmYFZ7v80/ENTveAezhSC5Sg8ZKNxhiV1dcONTRDVQu4wwGvvgs8dOMe1M
-cW5R+Jqx2TTCVUzWQ58QHOKR+caRfy+nRUpM7wBPE1Ossy0/FS3VCxRGlDNWBc8c
-agSyXiwidDGJkOMd8nfsVEb/VbBHNEA3OXh3DKDTPYOw2Tey7/Uo2MVvNWy4e23A
-SY3l/nCrFZ2iapefeZfYQiESHWQ/71MpSn60VdeGt1L9CniNIsYsVW/JEbt0wvIo
-nD2kkAsCAwEAAaOCAi0wggIpMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlTAP3LoqZtwR/c5+
-VR6DYP4HzAAwHwYDVR0jBBgwFoAU/LMkKo3ThpDON7se1/by9MeqXygwGAYDVR0R
-BBEwD4INbG9naW4udy1ocy5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL3ctaHMtY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdy1ocy1jYS9wdWIvY3JsL2NhY3JsLmNybDCB
-yQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5k
-Zm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS93LWhzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBABggrBgEF
-BQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS93LWhzLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDBPBgNVHSAESDBGMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGB
-rSGCLB4wEQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATANBgkq
-hkiG9w0BAQsFAAOCAQEAduqxgH88kkDpiIzH1QKaiGk+JoZbzcj9PcBPocpk1K3k
-LCzRSqNM+XUvQtmSzJA5Q4t5kZ9Xk0iU4NYxkXV3vhQOtHc3UT4ZAIImcRmoBZDw
-Pnk7L9ezrKfw4OIbw+a8y9w0KVrlMifHPahcc5Vp7k6B3l8sWS/A4NONCbTY0b9k
-ffKu8gIH14ELKwoqElGCcLTNjyUli6gJNGt283bQKQvaPBch/VjBSR0jsN6drwh/
-rG6E1/n5PC2dad/xREhU4fKhz4zPbdb6pq583GPz/pOTItpZ1iEcFJO43UIO8s7p
-1flnDftTm/jsXvc+lc5/qA60dRU52CfJhDfc0kVY6g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.w-hs.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.w-hs.de: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">e441</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e441</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Westfälische Hochschule</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Westfälische Hochschule, University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.w-hs.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.en.w-hs.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>DFN-AAI</md:GivenName>
-    <md:SurName>Hotline</md:SurName>
-    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>DFN-AAI</md:GivenName>
-    <md:SurName>Hotline</md:SurName>
-    <md:EmailAddress>mailto:hotline@aai.dfn.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.wisc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.wisc.edu-idp-shibboleth.xml
deleted file mode 100644
index a736c239..00000000
--- a/swamid-interfederations-2.0/login.wisc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,119 +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://login.wisc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login.wisc.edu/redirect/support" 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">wisc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Wisconsin-Madison</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://login.wisc.edu/docs</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.cio.wisc.edu/policies.aspx</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="224" xml:lang="en">https://login.wisc.edu/images/logo.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>
-MIIDIzCCAgugAwIBAgIUEaB9lRXzHbDuhaiZVdnMYbZJAPwwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMObG9naW4ud2lzYy5lZHUwHhcNMTAwMTE4MDIwNzQxWhcN
-MzAwMTE4MDIwNzQxWjAZMRcwFQYDVQQDEw5sb2dpbi53aXNjLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBANS6cCAMOW+9Zo0FWAbmYH0OXIEIh9OD
-dABBZNCMD90g5/Xtls/oE3/jJxpVdyXMogKg6KcM90t5w9sP2svSqOQ3FAXWlnEK
-dsINxvnIb0hf7Jt+KKNdsq4gxySy6c3xdGeWwiRQunsd3xB6B9Ulg2+n6dJ5VfC5
-Nlv3WERC+AcqvZ0/I0/FyWSJtRoNbIlrSP2avecaUYeyhKBHVD84h3H1afqF1b+E
-iyzS29PFnI2PRoWYXZ1PGRZhM5fjU51KF43KmgXsMzjWo3l2T/jLpZqb6BcBI1kh
-dqubb4pzfmolbyptIAUNWDlNNVfSwzIxEk5RAkD2MIZxj+G8/gvjAf8CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IObG9naW4ud2lzYy5lZHWGJWh0dHBzOi8vbG9naW4ud2lz
-Yy5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNKxQa0sDqRml8gWCQ7wdTTC
-wj8+MA0GCSqGSIb3DQEBBQUAA4IBAQB5mYeX11Pwrv+wDmBdcb22umAO3YJw4PtF
-ZpjYiFxaANu5ldpxRj3NZ3kI4sYEDPhD533hGQ6u/uuiTCf0uHqPWzsXoITZeb7W
-UWvIucWwbEOq3m5KAaYUr6DcC3g5T+q3BFlJyY6HjEdZVv/kh/G888Nio7e/KUSM
-Na165r+kVLYSZDAQYPkB0/e6STvqf7L+NBewj4X+vsQy7ABpZAZI0cdJV0xmHzru
-U3y0KYm2vqpBEqkASp0sQSsFxpw9ogQPY/EFAMN+Nui5kzvCWNRkuF6KEJm32iP9
-i5LcnTHCgUUFH7J7EyAEl002xfE9jD8pK/2vObhH81f39z6ANpYw
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.wisc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wisc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.wisc.edu/logout"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.wisc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.wisc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.wisc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.wisc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wisc.edu/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">wisc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUEaB9lRXzHbDuhaiZVdnMYbZJAPwwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMObG9naW4ud2lzYy5lZHUwHhcNMTAwMTE4MDIwNzQxWhcN
-MzAwMTE4MDIwNzQxWjAZMRcwFQYDVQQDEw5sb2dpbi53aXNjLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBANS6cCAMOW+9Zo0FWAbmYH0OXIEIh9OD
-dABBZNCMD90g5/Xtls/oE3/jJxpVdyXMogKg6KcM90t5w9sP2svSqOQ3FAXWlnEK
-dsINxvnIb0hf7Jt+KKNdsq4gxySy6c3xdGeWwiRQunsd3xB6B9Ulg2+n6dJ5VfC5
-Nlv3WERC+AcqvZ0/I0/FyWSJtRoNbIlrSP2avecaUYeyhKBHVD84h3H1afqF1b+E
-iyzS29PFnI2PRoWYXZ1PGRZhM5fjU51KF43KmgXsMzjWo3l2T/jLpZqb6BcBI1kh
-dqubb4pzfmolbyptIAUNWDlNNVfSwzIxEk5RAkD2MIZxj+G8/gvjAf8CAwEAAaNj
-MGEwQAYDVR0RBDkwN4IObG9naW4ud2lzYy5lZHWGJWh0dHBzOi8vbG9naW4ud2lz
-Yy5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFNKxQa0sDqRml8gWCQ7wdTTC
-wj8+MA0GCSqGSIb3DQEBBQUAA4IBAQB5mYeX11Pwrv+wDmBdcb22umAO3YJw4PtF
-ZpjYiFxaANu5ldpxRj3NZ3kI4sYEDPhD533hGQ6u/uuiTCf0uHqPWzsXoITZeb7W
-UWvIucWwbEOq3m5KAaYUr6DcC3g5T+q3BFlJyY6HjEdZVv/kh/G888Nio7e/KUSM
-Na165r+kVLYSZDAQYPkB0/e6STvqf7L+NBewj4X+vsQy7ABpZAZI0cdJV0xmHzru
-U3y0KYm2vqpBEqkASp0sQSsFxpw9ogQPY/EFAMN+Nui5kzvCWNRkuF6KEJm32iP9
-i5LcnTHCgUUFH7J7EyAEl002xfE9jD8pK/2vObhH81f39z6ANpYw
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.wisc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wisc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wisconsin-Madison</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin-Madison</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wisc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Chris Holsman</md:GivenName>
-    <md:EmailAddress>cholsman@doit.wisc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Keith Hazelton</md:GivenName>
-    <md:EmailAddress>hazelton@wisc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Access Management Team</md:GivenName>
-    <md:EmailAddress>am-support@lists.wisc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NetID Login Service</md:GivenName>
-    <md:EmailAddress>help@login.wisc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NetID Login Service</md:GivenName>
-    <md:EmailAddress>admin@login.wisc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>NetID Login Service</md:GivenName>
-    <md:EmailAddress>security@login.wisc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.wustl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/login.wustl.edu-idp-shibboleth.xml
deleted file mode 100644
index 43b98df6..00000000
--- a/swamid-interfederations-2.0/login.wustl.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://login.wustl.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://connect.wustl.edu/selfservice/" 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">wustl.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Washington University in St. Louis</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Enterprise SSO authentication system for WUSTLKey Connect services.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://wustlkey.wustl.edu/Pages/default.aspx</mdui:InformationURL>
-        <mdui:Logo height="70" width="330" xml:lang="en">https://connect.wustl.edu/selfservice/images/ConnectLogoTransparent.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>
-MIIEvTCCA6WgAwIBAgIJANIsbvIwqI2gMA0GCSqGSIb3DQEBBAUAMIGaMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMITWlzc291cmkxEjAQBgNVBAcTCVN0LiBMb3VpczEe
-MBwGA1UEChMVV2FzaGluZ3RvbiBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJU1QxGDAW
-BgNVBAMTD2xvZ2luLnd1c3RsLmVkdTEcMBoGCSqGSIb3DQEJARYNbm9jQHd1c3Rs
-LmVkdTAeFw0xMTA3MTIxODAzMzhaFw0xNzA3MTAxODAzMzhaMIGaMQswCQYDVQQG
-EwJVUzERMA8GA1UECBMITWlzc291cmkxEjAQBgNVBAcTCVN0LiBMb3VpczEeMBwG
-A1UEChMVV2FzaGluZ3RvbiBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJU1QxGDAWBgNV
-BAMTD2xvZ2luLnd1c3RsLmVkdTEcMBoGCSqGSIb3DQEJARYNbm9jQHd1c3RsLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKblc5wYcdKf1jILTVfF
-0U4PurtVRFGxv5rQBAPlOUi2a4tAyGZPjrkXA/jpGOr3/heiyYNYgiP+C3qn0F21
-QR7r/RSFk7U6GWfuX0kTdgLgVHK931jJVvDbgVYhnGVPYcIZQ26mxAbqaELgUIHC
-40wZ7nwxvmwcbHROn9VJsbSMYxGMJlrODc5aorzsqkeF+eIRGAFGzkq5+F62N6Hq
-sxxVHuOwsObSkAUZ/K0SFD2hM0w3bYcGWfgFynE2bvWCPX6qBqni4kn63qQ5Cg80
-nqU5+CL0ZoSMbdWXC01+jn96VIVxR5beBfsIAg98cGkkcaFTFz3jVPllYZZ55IiI
-pekCAwEAAaOCAQIwgf8wHQYDVR0OBBYEFCNc8Z2KcXEPvh6//Xi4Ls/jJYbZMIHP
-BgNVHSMEgccwgcSAFCNc8Z2KcXEPvh6//Xi4Ls/jJYbZoYGgpIGdMIGaMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMITWlzc291cmkxEjAQBgNVBAcTCVN0LiBMb3VpczEe
-MBwGA1UEChMVV2FzaGluZ3RvbiBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJU1QxGDAW
-BgNVBAMTD2xvZ2luLnd1c3RsLmVkdTEcMBoGCSqGSIb3DQEJARYNbm9jQHd1c3Rs
-LmVkdYIJANIsbvIwqI2gMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEB
-AGUWtG/beXWm/2MvB8JVurQ1EAkklFC0UD6bKGQHZK8N5KlEb2W2PbckcLC5dlGX
-kOKyozRXtPhOKHBctcp4memj4k0BRkygfdvyAPpjhs6qgewN5IQJk8uReeg6NGQ0
-1yvoYxQtbapUOfKDfphQu6StOhFPbBBUE6DvJHCGfaWIhe1nQAoHpzS6lHcWT4aU
-5M5WmJ41L1Z+5BE+AEC+O2QrfTOCBcw1tI0pUxKlstfMWzxjQK7KKoJTfUUmnQJH
-AmVxjqj/wlJcr+p9+kkvQMDxf/3SOfbwLe/Zcz1w27q380QvJ4EXxIIbqddRydK5
-+Nnat0cI4/1oOiINZSFUkdU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wustl.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.wustl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.wustl.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.wustl.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.wustl.edu/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">wustl.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEvTCCA6WgAwIBAgIJANIsbvIwqI2gMA0GCSqGSIb3DQEBBAUAMIGaMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMITWlzc291cmkxEjAQBgNVBAcTCVN0LiBMb3VpczEe
-MBwGA1UEChMVV2FzaGluZ3RvbiBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJU1QxGDAW
-BgNVBAMTD2xvZ2luLnd1c3RsLmVkdTEcMBoGCSqGSIb3DQEJARYNbm9jQHd1c3Rs
-LmVkdTAeFw0xMTA3MTIxODAzMzhaFw0xNzA3MTAxODAzMzhaMIGaMQswCQYDVQQG
-EwJVUzERMA8GA1UECBMITWlzc291cmkxEjAQBgNVBAcTCVN0LiBMb3VpczEeMBwG
-A1UEChMVV2FzaGluZ3RvbiBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJU1QxGDAWBgNV
-BAMTD2xvZ2luLnd1c3RsLmVkdTEcMBoGCSqGSIb3DQEJARYNbm9jQHd1c3RsLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKblc5wYcdKf1jILTVfF
-0U4PurtVRFGxv5rQBAPlOUi2a4tAyGZPjrkXA/jpGOr3/heiyYNYgiP+C3qn0F21
-QR7r/RSFk7U6GWfuX0kTdgLgVHK931jJVvDbgVYhnGVPYcIZQ26mxAbqaELgUIHC
-40wZ7nwxvmwcbHROn9VJsbSMYxGMJlrODc5aorzsqkeF+eIRGAFGzkq5+F62N6Hq
-sxxVHuOwsObSkAUZ/K0SFD2hM0w3bYcGWfgFynE2bvWCPX6qBqni4kn63qQ5Cg80
-nqU5+CL0ZoSMbdWXC01+jn96VIVxR5beBfsIAg98cGkkcaFTFz3jVPllYZZ55IiI
-pekCAwEAAaOCAQIwgf8wHQYDVR0OBBYEFCNc8Z2KcXEPvh6//Xi4Ls/jJYbZMIHP
-BgNVHSMEgccwgcSAFCNc8Z2KcXEPvh6//Xi4Ls/jJYbZoYGgpIGdMIGaMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMITWlzc291cmkxEjAQBgNVBAcTCVN0LiBMb3VpczEe
-MBwGA1UEChMVV2FzaGluZ3RvbiBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJU1QxGDAW
-BgNVBAMTD2xvZ2luLnd1c3RsLmVkdTEcMBoGCSqGSIb3DQEJARYNbm9jQHd1c3Rs
-LmVkdYIJANIsbvIwqI2gMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEB
-AGUWtG/beXWm/2MvB8JVurQ1EAkklFC0UD6bKGQHZK8N5KlEb2W2PbckcLC5dlGX
-kOKyozRXtPhOKHBctcp4memj4k0BRkygfdvyAPpjhs6qgewN5IQJk8uReeg6NGQ0
-1yvoYxQtbapUOfKDfphQu6StOhFPbBBUE6DvJHCGfaWIhe1nQAoHpzS6lHcWT4aU
-5M5WmJ41L1Z+5BE+AEC+O2QrfTOCBcw1tI0pUxKlstfMWzxjQK7KKoJTfUUmnQJH
-AmVxjqj/wlJcr+p9+kkvQMDxf/3SOfbwLe/Zcz1w27q380QvJ4EXxIIbqddRydK5
-+Nnat0cI4/1oOiINZSFUkdU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.wustl.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.wustl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Washington University in St. Louis</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Washington University in St. Louis</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wustl.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ken Koch</md:GivenName>
-    <md:EmailAddress>Ken.Koch@wustl.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Daniel Zweifel</md:GivenName>
-    <md:EmailAddress>danz@wustl.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login2.hs-mittweida.de.xml b/swamid-interfederations-2.0/login2.hs-mittweida.de.xml
deleted file mode 100644
index 03d13ef9..00000000
--- a/swamid-interfederations-2.0/login2.hs-mittweida.de.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login2.hs-mittweida.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-mittweida.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login2.hs-mittweida.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login2.hs-mittweida.de,O=Hochschule Mittweida (FH) - University of Applied Sciences,L=Mittweida,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiTCCBHGgAwIBAgIEDR0M3jANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
-REUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlkYTFDMEEGA1UE
-ChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNpdHkgb2YgQXBw
-bGllZCBTY2llbmNlczEQMA4GA1UEAxMHSFRXTSBDQTEaMBgGCSqGSIb3DQEJARYL
-cGtpQGh0d20uZGUwHhcNMDgxMDIxMDgxNDA3WhcNMTMxMDIwMDgxNDA3WjCBmTEL
-MAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlk
-YTFDMEEGA1UEChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNp
-dHkgb2YgQXBwbGllZCBTY2llbmNlczEfMB0GA1UEAxMWbG9naW4yLmhzLW1pdHR3
-ZWlkYS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYgPFWH0AnT
-Ch9RD41shYVlrsyiay80CEumGXqLkW+uGlRa5DaxJUmFCrOUoj2ond31l/PLSA3D
-/UuJo1mFGSX8T19xKTUZAaKgLE14dxwukbxjjX27y0nK7VfMxoLmTAgWS0AMdIue
-Sl7MRgqSXCg3wwuKQphHhcYPl2uDPQK/Yv8U6d0zlAnr/eiwFk4scz2/PgE8Ts+N
-Q4z6g83VNQKlSqGa+ExZ7Np0VjD51AXrNynVISaBoXtJfjFkwOvV3DaFooV5e4NC
-56Gx3GabqG89s85aDGzkB43WVTzScO5FGBMOQsYfO6kzyUwp1VUCj3DJtueTRWPU
-nlBcDFjN7NsCAwEAAaOCAcgwggHEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUirW4438b5lTj
-rX6ByfHLGB/jJzQwHwYDVR0jBBgwFoAUthDQcSc/RbN2Lii4Ib5AORnredgwFgYD
-VR0RBA8wDYELcGtpQGh0d20uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2NybC9jYWNybC5j
-cmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtbWl0dHdlaWRhLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcw
-AoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLW1pdHR3ZWlkYS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQEFBQADggEBAAGcArobqCHlzG8GO5wWaAS+mLqjWBLbROftIBz2xAj6FcyH
-YDixCT16/Zgt/H6+KUaHxnIQ5vPf9QSJTYMDqtr/WdS8FOPXovFT3mKQunAP+SgG
-qcadVUu9hZ6c9q8BsTIf+jY/G2WQX7LgNQ03JfAomdaQEhmGYqrHoQMCFCN3CLb/
-7t1/xH96cStRITB2nN9liEwTRLrGEc9XMAFM0lgjj+o7M/f9xfzagWw5HfYzjHte
-PAloYirtXrNJfNjAdtSpX6D8uq4TKtLwWVAuu3RsJwqMLjABQsyDJV2xXnYoJoy5
-+NSkVBR/TI4nZCwb990PUBiK5mAszI7kxISvEcg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login2.hs-mittweida.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login2.hs-mittweida.de,O=Hochschule Mittweida (FH) - University of Applied Sciences,L=Mittweida,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiTCCBHGgAwIBAgIEDR0M3jANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
-REUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlkYTFDMEEGA1UE
-ChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNpdHkgb2YgQXBw
-bGllZCBTY2llbmNlczEQMA4GA1UEAxMHSFRXTSBDQTEaMBgGCSqGSIb3DQEJARYL
-cGtpQGh0d20uZGUwHhcNMDgxMDIxMDgxNDA3WhcNMTMxMDIwMDgxNDA3WjCBmTEL
-MAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlk
-YTFDMEEGA1UEChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNp
-dHkgb2YgQXBwbGllZCBTY2llbmNlczEfMB0GA1UEAxMWbG9naW4yLmhzLW1pdHR3
-ZWlkYS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYgPFWH0AnT
-Ch9RD41shYVlrsyiay80CEumGXqLkW+uGlRa5DaxJUmFCrOUoj2ond31l/PLSA3D
-/UuJo1mFGSX8T19xKTUZAaKgLE14dxwukbxjjX27y0nK7VfMxoLmTAgWS0AMdIue
-Sl7MRgqSXCg3wwuKQphHhcYPl2uDPQK/Yv8U6d0zlAnr/eiwFk4scz2/PgE8Ts+N
-Q4z6g83VNQKlSqGa+ExZ7Np0VjD51AXrNynVISaBoXtJfjFkwOvV3DaFooV5e4NC
-56Gx3GabqG89s85aDGzkB43WVTzScO5FGBMOQsYfO6kzyUwp1VUCj3DJtueTRWPU
-nlBcDFjN7NsCAwEAAaOCAcgwggHEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUirW4438b5lTj
-rX6ByfHLGB/jJzQwHwYDVR0jBBgwFoAUthDQcSc/RbN2Lii4Ib5AORnredgwFgYD
-VR0RBA8wDYELcGtpQGh0d20uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2NybC9jYWNybC5j
-cmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtbWl0dHdlaWRhLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcw
-AoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLW1pdHR3ZWlkYS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQEFBQADggEBAAGcArobqCHlzG8GO5wWaAS+mLqjWBLbROftIBz2xAj6FcyH
-YDixCT16/Zgt/H6+KUaHxnIQ5vPf9QSJTYMDqtr/WdS8FOPXovFT3mKQunAP+SgG
-qcadVUu9hZ6c9q8BsTIf+jY/G2WQX7LgNQ03JfAomdaQEhmGYqrHoQMCFCN3CLb/
-7t1/xH96cStRITB2nN9liEwTRLrGEc9XMAFM0lgjj+o7M/f9xfzagWw5HfYzjHte
-PAloYirtXrNJfNjAdtSpX6D8uq4TKtLwWVAuu3RsJwqMLjABQsyDJV2xXnYoJoy5
-+NSkVBR/TI4nZCwb990PUBiK5mAszI7kxISvEcg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.hs-mittweida.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.hs-mittweida.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login2.hs-mittweida.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login2.hs-mittweida.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login2.hs-mittweida.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-mittweida.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login2.hs-mittweida.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login2.hs-mittweida.de,O=Hochschule Mittweida (FH) - University of Applied Sciences,L=Mittweida,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiTCCBHGgAwIBAgIEDR0M3jANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
-REUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlkYTFDMEEGA1UE
-ChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNpdHkgb2YgQXBw
-bGllZCBTY2llbmNlczEQMA4GA1UEAxMHSFRXTSBDQTEaMBgGCSqGSIb3DQEJARYL
-cGtpQGh0d20uZGUwHhcNMDgxMDIxMDgxNDA3WhcNMTMxMDIwMDgxNDA3WjCBmTEL
-MAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlk
-YTFDMEEGA1UEChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNp
-dHkgb2YgQXBwbGllZCBTY2llbmNlczEfMB0GA1UEAxMWbG9naW4yLmhzLW1pdHR3
-ZWlkYS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYgPFWH0AnT
-Ch9RD41shYVlrsyiay80CEumGXqLkW+uGlRa5DaxJUmFCrOUoj2ond31l/PLSA3D
-/UuJo1mFGSX8T19xKTUZAaKgLE14dxwukbxjjX27y0nK7VfMxoLmTAgWS0AMdIue
-Sl7MRgqSXCg3wwuKQphHhcYPl2uDPQK/Yv8U6d0zlAnr/eiwFk4scz2/PgE8Ts+N
-Q4z6g83VNQKlSqGa+ExZ7Np0VjD51AXrNynVISaBoXtJfjFkwOvV3DaFooV5e4NC
-56Gx3GabqG89s85aDGzkB43WVTzScO5FGBMOQsYfO6kzyUwp1VUCj3DJtueTRWPU
-nlBcDFjN7NsCAwEAAaOCAcgwggHEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUirW4438b5lTj
-rX6ByfHLGB/jJzQwHwYDVR0jBBgwFoAUthDQcSc/RbN2Lii4Ib5AORnredgwFgYD
-VR0RBA8wDYELcGtpQGh0d20uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2NybC9jYWNybC5j
-cmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtbWl0dHdlaWRhLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcw
-AoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLW1pdHR3ZWlkYS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQEFBQADggEBAAGcArobqCHlzG8GO5wWaAS+mLqjWBLbROftIBz2xAj6FcyH
-YDixCT16/Zgt/H6+KUaHxnIQ5vPf9QSJTYMDqtr/WdS8FOPXovFT3mKQunAP+SgG
-qcadVUu9hZ6c9q8BsTIf+jY/G2WQX7LgNQ03JfAomdaQEhmGYqrHoQMCFCN3CLb/
-7t1/xH96cStRITB2nN9liEwTRLrGEc9XMAFM0lgjj+o7M/f9xfzagWw5HfYzjHte
-PAloYirtXrNJfNjAdtSpX6D8uq4TKtLwWVAuu3RsJwqMLjABQsyDJV2xXnYoJoy5
-+NSkVBR/TI4nZCwb990PUBiK5mAszI7kxISvEcg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>login2.hs-mittweida.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=login2.hs-mittweida.de,O=Hochschule Mittweida (FH) - University of Applied Sciences,L=Mittweida,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiTCCBHGgAwIBAgIEDR0M3jANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
-REUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlkYTFDMEEGA1UE
-ChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNpdHkgb2YgQXBw
-bGllZCBTY2llbmNlczEQMA4GA1UEAxMHSFRXTSBDQTEaMBgGCSqGSIb3DQEJARYL
-cGtpQGh0d20uZGUwHhcNMDgxMDIxMDgxNDA3WhcNMTMxMDIwMDgxNDA3WjCBmTEL
-MAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEjAQBgNVBAcTCU1pdHR3ZWlk
-YTFDMEEGA1UEChM6SG9jaHNjaHVsZSBNaXR0d2VpZGEgKEZIKSAtIFVuaXZlcnNp
-dHkgb2YgQXBwbGllZCBTY2llbmNlczEfMB0GA1UEAxMWbG9naW4yLmhzLW1pdHR3
-ZWlkYS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKYgPFWH0AnT
-Ch9RD41shYVlrsyiay80CEumGXqLkW+uGlRa5DaxJUmFCrOUoj2ond31l/PLSA3D
-/UuJo1mFGSX8T19xKTUZAaKgLE14dxwukbxjjX27y0nK7VfMxoLmTAgWS0AMdIue
-Sl7MRgqSXCg3wwuKQphHhcYPl2uDPQK/Yv8U6d0zlAnr/eiwFk4scz2/PgE8Ts+N
-Q4z6g83VNQKlSqGa+ExZ7Np0VjD51AXrNynVISaBoXtJfjFkwOvV3DaFooV5e4NC
-56Gx3GabqG89s85aDGzkB43WVTzScO5FGBMOQsYfO6kzyUwp1VUCj3DJtueTRWPU
-nlBcDFjN7NsCAwEAAaOCAcgwggHEMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0G
-A1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUirW4438b5lTj
-rX6ByfHLGB/jJzQwHwYDVR0jBBgwFoAUthDQcSc/RbN2Lii4Ib5AORnredgwFgYD
-VR0RBA8wDYELcGtpQGh0d20uZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2NybC9jYWNybC5j
-cmwwPqA8oDqGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtbWl0dHdlaWRhLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcw
-AoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1taXR0d2VpZGEtY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2hzLW1pdHR3ZWlkYS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZI
-hvcNAQEFBQADggEBAAGcArobqCHlzG8GO5wWaAS+mLqjWBLbROftIBz2xAj6FcyH
-YDixCT16/Zgt/H6+KUaHxnIQ5vPf9QSJTYMDqtr/WdS8FOPXovFT3mKQunAP+SgG
-qcadVUu9hZ6c9q8BsTIf+jY/G2WQX7LgNQ03JfAomdaQEhmGYqrHoQMCFCN3CLb/
-7t1/xH96cStRITB2nN9liEwTRLrGEc9XMAFM0lgjj+o7M/f9xfzagWw5HfYzjHte
-PAloYirtXrNJfNjAdtSpX6D8uq4TKtLwWVAuu3RsJwqMLjABQsyDJV2xXnYoJoy5
-+NSkVBR/TI4nZCwb990PUBiK5mAszI7kxISvEcg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.hs-mittweida.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.hs-mittweida.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Mittweida - University of Applied Sciences</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Mittweida</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-mittweida.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Matthias</GivenName>
-    <SurName>Lühr</SurName>
-    <EmailAddress>luehr@hs-mittweida.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jens</GivenName>
-    <SurName>Rabe</SurName>
-    <EmailAddress>rabe@hs-mittweida.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/logintest.wustl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/logintest.wustl.edu-idp-shibboleth.xml
deleted file mode 100644
index 5284d9b4..00000000
--- a/swamid-interfederations-2.0/logintest.wustl.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,117 +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://logintest.wustl.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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/hide-from-discovery</saml:AttributeValue>
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</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">wustl.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">zTest_Washington University in St. Louis</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test environment IDP for Washington University</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>
-MIIE6DCCA9CgAwIBAgIJANEio5/rU1dtMA0GCSqGSIb3DQEBBAUAMIGoMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMITWlzc291cmkxEjAQBgNVBAcTCVN0LiBMb3VpczEe
-MBwGA1UEChMVV2FzaGluZ3RvbiBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJU1QxJjAk
-BgNVBAMTHWxvZ2ludGVzdC53dXN0bC5lZHUud3VzdGwuZWR1MRwwGgYJKoZIhvcN
-AQkBFg1ub2NAd3VzdGwuZWR1MB4XDTExMDcwNTE1MzM0OVoXDTE3MDcwMzE1MzM0
-OVowgagxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhNaXNzb3VyaTESMBAGA1UEBxMJ
-U3QuIExvdWlzMR4wHAYDVQQKExVXYXNoaW5ndG9uIFVuaXZlcnNpdHkxDDAKBgNV
-BAsTA0lTVDEmMCQGA1UEAxMdbG9naW50ZXN0Lnd1c3RsLmVkdS53dXN0bC5lZHUx
-HDAaBgkqhkiG9w0BCQEWDW5vY0B3dXN0bC5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCtXdvGETGMhnzQp/H5tQfVPhGvhIKyhKVWpOJV/N8zB+Ai
-cdm9Lrlc40ltXywQmfbxZWUE2GQxhzrLn1m00EIqCf7FFZBAsfx6DnL5onhdTBjz
-ETD04MleY/fuet7DL5Pi1pldsS2pLjX4Di19vnsawgroxOs5yOlwkTaM4LIP5B7W
-kqm/mmpeNYKwaLC+a9sp2xjotWyLf4SByzHOeoUWKyyLcOcGgsKUddL76OajUer9
-R+G4/1QNJ7MBwSr1DEhZpl1FJHwgD6aDFpfwzAhlv3wFe1lhJt8GeOGxsfZOva2H
-drHGsMytW1U0IxpR0k2XRsLMjBuyBVmscEv8M7MnAgMBAAGjggERMIIBDTAdBgNV
-HQ4EFgQUAIppxikUt+GX9fgxi4IFmWe4eXowgd0GA1UdIwSB1TCB0oAUAIppxikU
-t+GX9fgxi4IFmWe4eXqhga6kgaswgagxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhN
-aXNzb3VyaTESMBAGA1UEBxMJU3QuIExvdWlzMR4wHAYDVQQKExVXYXNoaW5ndG9u
-IFVuaXZlcnNpdHkxDDAKBgNVBAsTA0lTVDEmMCQGA1UEAxMdbG9naW50ZXN0Lnd1
-c3RsLmVkdS53dXN0bC5lZHUxHDAaBgkqhkiG9w0BCQEWDW5vY0B3dXN0bC5lZHWC
-CQDRIqOf61NXbTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBVeZM9
-8Xi/yA7I7Sa1qku1kL4GtdpKW1x8OCaXK81K1HghF80jjp2QphoaqQJ9mRhJvAlp
-fwFvz2BICFpGlV/sWkYk22ziToqMnqdjoYw9ndvLXTEuxyidDtdk0vz/yu9dqm/p
-zN7xvpfDfN9So1nt/n2WOCFJTI2dpJ3aCLf93y8VA0+WNgVcndhyk68iEiic5gEu
-MpS8JkB0Ya1fK+alfHdLIBVEYo4WrEJ5vEpdUwjS0WPTX6GlvFWGmjUh0eIEvik6
-S6hoVdGAhggRbs+PbFPZGqD9AtjzDruexxC1e1xFomynQrdZ+c1JnEwEk1x/sVhz
-giNZUjdTENUIEg/R
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logintest.wustl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logintest.wustl.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://logintest.wustl.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://logintest.wustl.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://logintest.wustl.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://logintest.wustl.edu/idp/profile/SAML2/POST-SimpleSign/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">wustl.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE6DCCA9CgAwIBAgIJANEio5/rU1dtMA0GCSqGSIb3DQEBBAUAMIGoMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMITWlzc291cmkxEjAQBgNVBAcTCVN0LiBMb3VpczEe
-MBwGA1UEChMVV2FzaGluZ3RvbiBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJU1QxJjAk
-BgNVBAMTHWxvZ2ludGVzdC53dXN0bC5lZHUud3VzdGwuZWR1MRwwGgYJKoZIhvcN
-AQkBFg1ub2NAd3VzdGwuZWR1MB4XDTExMDcwNTE1MzM0OVoXDTE3MDcwMzE1MzM0
-OVowgagxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhNaXNzb3VyaTESMBAGA1UEBxMJ
-U3QuIExvdWlzMR4wHAYDVQQKExVXYXNoaW5ndG9uIFVuaXZlcnNpdHkxDDAKBgNV
-BAsTA0lTVDEmMCQGA1UEAxMdbG9naW50ZXN0Lnd1c3RsLmVkdS53dXN0bC5lZHUx
-HDAaBgkqhkiG9w0BCQEWDW5vY0B3dXN0bC5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCtXdvGETGMhnzQp/H5tQfVPhGvhIKyhKVWpOJV/N8zB+Ai
-cdm9Lrlc40ltXywQmfbxZWUE2GQxhzrLn1m00EIqCf7FFZBAsfx6DnL5onhdTBjz
-ETD04MleY/fuet7DL5Pi1pldsS2pLjX4Di19vnsawgroxOs5yOlwkTaM4LIP5B7W
-kqm/mmpeNYKwaLC+a9sp2xjotWyLf4SByzHOeoUWKyyLcOcGgsKUddL76OajUer9
-R+G4/1QNJ7MBwSr1DEhZpl1FJHwgD6aDFpfwzAhlv3wFe1lhJt8GeOGxsfZOva2H
-drHGsMytW1U0IxpR0k2XRsLMjBuyBVmscEv8M7MnAgMBAAGjggERMIIBDTAdBgNV
-HQ4EFgQUAIppxikUt+GX9fgxi4IFmWe4eXowgd0GA1UdIwSB1TCB0oAUAIppxikU
-t+GX9fgxi4IFmWe4eXqhga6kgaswgagxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhN
-aXNzb3VyaTESMBAGA1UEBxMJU3QuIExvdWlzMR4wHAYDVQQKExVXYXNoaW5ndG9u
-IFVuaXZlcnNpdHkxDDAKBgNVBAsTA0lTVDEmMCQGA1UEAxMdbG9naW50ZXN0Lnd1
-c3RsLmVkdS53dXN0bC5lZHUxHDAaBgkqhkiG9w0BCQEWDW5vY0B3dXN0bC5lZHWC
-CQDRIqOf61NXbTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBVeZM9
-8Xi/yA7I7Sa1qku1kL4GtdpKW1x8OCaXK81K1HghF80jjp2QphoaqQJ9mRhJvAlp
-fwFvz2BICFpGlV/sWkYk22ziToqMnqdjoYw9ndvLXTEuxyidDtdk0vz/yu9dqm/p
-zN7xvpfDfN9So1nt/n2WOCFJTI2dpJ3aCLf93y8VA0+WNgVcndhyk68iEiic5gEu
-MpS8JkB0Ya1fK+alfHdLIBVEYo4WrEJ5vEpdUwjS0WPTX6GlvFWGmjUh0eIEvik6
-S6hoVdGAhggRbs+PbFPZGqD9AtjzDruexxC1e1xFomynQrdZ+c1JnEwEk1x/sVhz
-giNZUjdTENUIEg/R
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logintest.wustl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logintest.wustl.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Washington University in St. Louis</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">zTest_Washington University in St. Louis</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wustl.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ken Koch</md:GivenName>
-    <md:EmailAddress>ken.koch@wustl.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Daniel Zweifel</md:GivenName>
-    <md:EmailAddress>DanZ@wustl.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
index b456acd7..b8217741 100644
--- a/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
+++ b/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
@@ -1,30 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://logout.uwasa.fi/idp/shibboleth">
-  <md: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-support" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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://logout.uwasa.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.uwasa.fi</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwasa.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="fi">Vaasan yliopisto</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Vaasa</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Vasa Universitet</mdui:DisplayName>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:DomainHint>uwasa.fi</mdui:DomainHint>
       </mdui:DiscoHints>
+      <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>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
 MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
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 5c2b029d..00000000
--- a/swamid-interfederations-2.0/logout.uwasa.fi.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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: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: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/los.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/los.scran.ac.uk-shibboleth.xml
deleted file mode 100644
index ccb0184e..00000000
--- a/swamid-interfederations-2.0/los.scran.ac.uk-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" entityID="https://los.scran.ac.uk/shibboleth">
-  <!--
-		This is a "Languages On Screen" Shibboleth SP owned by 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:36:30Z"/>
-  </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">Languages on Screen</mdui:DisplayName>
-        <mdui:Description xml:lang="en">An educational resource that puts modern language short films online for free download and use in schools across Scotland.</mdui:Description>
-        <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-los.png</mdui:Logo>
-        <mdui:Logo height="100" width="138">https://shib.scran.ac.uk/images/logo-sos.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://languagesonscreen.org.uk/</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://www.scran.ac.uk/los/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/los/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://www.scran.ac.uk/los/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/los/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/los/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/los/Shibboleth.sso/DS/UKFederation" 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://shib.scran.ac.uk/los/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/los/Shibboleth.sso/glow"/>
-    </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/los/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/los/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/los/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/los/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/los/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/los/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/los/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Scran Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Languages On Screen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.languagesonscreen.org.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/lse-shibb.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/lse-shibb.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index cb99b1a8..00000000
--- a/swamid-interfederations-2.0/lse-shibb.hosted.exlibrisgroup.com-shib.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://lse-shibb.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "London School of Economics and Political Science - Primo" Shibboleth SP for Ex Libris (UK) 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="2015-07-01T10:49:27Z">
-      <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://lse-shibb.hosted.exlibrisgroup.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://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">London School of Economics and Political Science - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of London School of Economics and Political Science</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh6gAwIBAgIJANZWvgeNKZZGMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-						BAMTJWRjMDNrZzAzNTRldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTQw
-						MzMxMjIyODEzWhcNMjQwMzI4MjIyODEzWjAwMS4wLAYDVQQDEyVkYzAza2cwMzU0
-						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAqbFo/jIWdf/nvvOhJCl/0WBiC9YWh7dlYZ5P+v8oFq80N1fM
-						mTZZSIPdZ8mP04OC5Wv8rbCuep+Pi6X3mXl3xfMCyQ0jXR9OwPmgmxAJD8WQer+v
-						I/PhIPac3uerSxiY+HP8Nf2QChOFCIZkm99T7LYlsc2RSN+g/TGgTHab217cMdO4
-						ccRhtogijy+e/jZk1BTl90Kj8vh/wTYeZ/DsfvnXsfC+Oirdex/d9hhooybww9AV
-						yzRzLQ4HRevSvzan4jcfpYso4k3uVyZLTBDis55zXD77oM6/P/PsUjxrxDcB4pv9
-						BuXXKLb7a4USJgs6OfN57Z9rjNbNUJYnuistDwIDAQABo1MwUTAwBgNVHREEKTAn
-						giVkYzAza2cwMzU0ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
-						BBTNM1cpGmPecDtGLTYmc70ZS7YRZTANBgkqhkiG9w0BAQUFAAOCAQEAJVOcB2Hv
-						UM+83EwkQRCCqF3LuQr0F+4ZPc1BSOb6JFbvDlmE27QXK0rX9sVY5GkNZfRyayZi
-						f4zwzYzKhywAIJelprVNAdiUhLW0mouX8BDm4WOH/kGFvAlZRVIFME1EGQPqObA7
-						XVX+bsHkr8pfYtI4xfX7JvLrJkvp3Jck64gzaQDWF7Xsu58voyaJd6mjP7Kn9Ezq
-						HLqOzS0fcQEuoBqj8pyruvMWpCDxeDxA2SmV1Tb6wRmo/KD/akOge6xlhr6vlR7G
-						0centIzlPGZ0sekO+eA7oTDQ5UxH/NFqnRqV1YqvPc9wijh+Ql4F3NAxIAuTSJox
-						9SPk0adJyrhbZw==
-					</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://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lse-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for London School of Economics and Political Science</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lse.ac.uk-idp.xml b/swamid-interfederations-2.0/lse.ac.uk-idp.xml
deleted file mode 100644
index 3e33540e..00000000
--- a/swamid-interfederations-2.0/lse.ac.uk-idp.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://lse.ac.uk/idp">
-  <!--
-		This is a Shibbboleth IdP for the London School of Economics and Political Science.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2006-11-16T17:00: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">lse.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEGDCCAwCgAwIBAgIJAMSJ8KNJAsS2MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25k
-						b24xOTA3BgNVBAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xp
-						dGljYWwgU2NpZW5jZTEfMB0GA1UEAwwWZ2F0ZS5saWJyYXJ5LmxzZS5hYy51azAe
-						Fw0xNTA3MjgxNDAwMDhaFw0yOTA0MDUxNDAwMDhaMIGUMQswCQYDVQQGEwJHQjEQ
-						MA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25kb24xOTA3BgNV
-						BAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xpdGljYWwgU2Np
-						ZW5jZTEfMB0GA1UEAwwWZ2F0ZS5saWJyYXJ5LmxzZS5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBALTgyUuk/MYkOU7fRoZEhsP94EmmRVaf4xuk
-						unWtEP3uHxFISjOUGFMfym4Q9ZHN6NeFv6MS5GcKVy6oM+uXZM6ypMjh+VWLwWDM
-						RS28aDPKZzU/o0HPBzQ3kgXLW8R3rtrsrXHaU42x+SDj/JyzGtNmdqdjzzeWKZNZ
-						6GeWwOgma58EEDM2gQxABrUkGH1dHq+WTawksWwx7Zsfe8XbM/x7q4S1GrWM1rig
-						TR2DXSzFY+gc3n65iAosEBNCOjsoyo7L7XwYHiEkEtO+9+XzVv/xVuI3jgR2C2Hk
-						i937R5fBXVD0Hu0/Ht0dd8MU523bJhLBzjkmZWSMQ/B1iFWijFsCAwEAAaNrMGkw
-						CQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMDAGA1UdEQQpMCeCFmdhdGUubGlicmFyeS5sc2UuYWMudWuCDWlkcC5s
-						c2UuYWMudWswDQYJKoZIhvcNAQELBQADggEBACVXg7gRZZDbNhZPGVmaq3ESLYfn
-						6/cpKUeDjoONhmEHx2XVJdXYT/nQFElzKwdpVvqYnmcZ8QDyY1JfSoUgrgUDxr+6
-						FsUc9VSkyQtv3MpBjszbIP1221XhOz63riFOC5PUKvoYY5Qx4nIsBZ96QoqT173E
-						dQNJHLnkvuwajtK98k18TxObCbkpCXnndUb0rYtEg/YCVIpw57CPXE4/lQpp2cL5
-						4mEize79TCVVwME5wVdf/g4urEIRuJLtCHNbB5e031IdEiCAwR+zIYhkMB75GRWK
-						mXHo7ijvy+fciSoWf0zFgvSvic5tGFzTi17zHZbfVFNv+lb7DVSwnx68qjA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gate.library.lse.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gate.library.lse.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://gate.library.lse.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gate.library.lse.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gate.library.lse.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gate.library.lse.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">lse.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEGDCCAwCgAwIBAgIJAMSJ8KNJAsS2MA0GCSqGSIb3DQEBCwUAMIGUMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25k
-						b24xOTA3BgNVBAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xp
-						dGljYWwgU2NpZW5jZTEfMB0GA1UEAwwWZ2F0ZS5saWJyYXJ5LmxzZS5hYy51azAe
-						Fw0xNTA3MjgxNDAwMDhaFw0yOTA0MDUxNDAwMDhaMIGUMQswCQYDVQQGEwJHQjEQ
-						MA4GA1UECAwHRW5nbGFuZDEXMBUGA1UEBwwOR3JlYXRlciBMb25kb24xOTA3BgNV
-						BAoMMExvbmRvbiBTY2hvb2wgb2YgRWNvbm9taWNzIGFuZCBQb2xpdGljYWwgU2Np
-						ZW5jZTEfMB0GA1UEAwwWZ2F0ZS5saWJyYXJ5LmxzZS5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBALTgyUuk/MYkOU7fRoZEhsP94EmmRVaf4xuk
-						unWtEP3uHxFISjOUGFMfym4Q9ZHN6NeFv6MS5GcKVy6oM+uXZM6ypMjh+VWLwWDM
-						RS28aDPKZzU/o0HPBzQ3kgXLW8R3rtrsrXHaU42x+SDj/JyzGtNmdqdjzzeWKZNZ
-						6GeWwOgma58EEDM2gQxABrUkGH1dHq+WTawksWwx7Zsfe8XbM/x7q4S1GrWM1rig
-						TR2DXSzFY+gc3n65iAosEBNCOjsoyo7L7XwYHiEkEtO+9+XzVv/xVuI3jgR2C2Hk
-						i937R5fBXVD0Hu0/Ht0dd8MU523bJhLBzjkmZWSMQ/B1iFWijFsCAwEAAaNrMGkw
-						CQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMDAGA1UdEQQpMCeCFmdhdGUubGlicmFyeS5sc2UuYWMudWuCDWlkcC5s
-						c2UuYWMudWswDQYJKoZIhvcNAQELBQADggEBACVXg7gRZZDbNhZPGVmaq3ESLYfn
-						6/cpKUeDjoONhmEHx2XVJdXYT/nQFElzKwdpVvqYnmcZ8QDyY1JfSoUgrgUDxr+6
-						FsUc9VSkyQtv3MpBjszbIP1221XhOz63riFOC5PUKvoYY5Qx4nIsBZ96QoqT173E
-						dQNJHLnkvuwajtK98k18TxObCbkpCXnndUb0rYtEg/YCVIpw57CPXE4/lQpp2cL5
-						4mEize79TCVVwME5wVdf/g4urEIRuJLtCHNbB5e031IdEiCAwR+zIYhkMB75GRWK
-						mXHo7ijvy+fciSoWf0zFgvSvic5tGFzTi17zHZbfVFNv+lb7DVSwnx68qjA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://gate.library.lse.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gate.library.lse.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">London School of Economics and Political Science</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London School of Economics and Political Science</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lse.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>McFarlane</SurName>
-    <EmailAddress>mailto:m.d.mcfarlane@lse.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Neil</GivenName>
-    <SurName>Prockter</SurName>
-    <EmailAddress>mailto:n.prockter@lse.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 13632cc2..00000000
--- a/swamid-interfederations-2.0/lshtm-shib.hosted.exlibrisgroup.com-shib.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://lshtm-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "London School of Hygiene and Tropical Medicine - Primo" Shibboleth SP for Ex Libris (UK) 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="2015-08-05T10:01:54Z">
-      <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://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">London School of Hygiene and Tropical Medicine - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the London School of Hygiene and Tropical Medicine</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIJAJzvYQ51LpPDMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
-						BAMTI2xzaHRtLXNoaWIuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB4XDTE1MDYz
-						MDA4MTQzMFoXDTI1MDYyNzA4MTQzMFowLjEsMCoGA1UEAxMjbHNodG0tc2hpYi5o
-						b3N0ZWQuZXhsaWJyaXNncm91cC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQC32GeYKw8TF9cMM23p6fVihgQg8NjGIPKNLOOpcWzwSKQkJmSbroVF
-						WTEKuJElwjJE7X3XmqFcFzJdLSue7r03IoSKdIYFC14SUvpHXIWvVnwXp/QpPjgw
-						ifq44I9TlJkT/ivlVhBQ07ykOae/+bnzHzK2xNlgLjs2vzzWpHVUStjxTyaAgU/J
-						5awPu5JVtbPXitzt4hdd7Q96Ig0Xlaz+gn27ZMLRQR73jwAn3IiTKghScU7fB/w5
-						9OKpEW/1m8UnEyF9Dxk6zXOscCWz+0PeRQ92ca4zuDaAAFiIbCoO5FkzTnZbgAlH
-						lVoh/IC9Kf+o3I9JIdX6yb/NN6kX+Ha5AgMBAAGjUTBPMC4GA1UdEQQnMCWCI2xz
-						aHRtLXNoaWIuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQWBBTgnmqB
-						r5gxEx7iBUT8+9ZEH3s6hDANBgkqhkiG9w0BAQUFAAOCAQEApbLKd2sy7MFs5kE7
-						+ScntnbvXpKxGhV8wF2UDE+bzIRutPqunIE/vkw/S670dMu6aC4mHNTkZuYh5o2C
-						85bSlganpDzPM6+VHMQ1chozPJGi8jikXeD2Aexl0qQUk2ueZ99U1Y2e9iVbyZuy
-						zlaZz1ByzhVq107N8RdosrOR2xef4T2p72V5QZ90t7iRD8VjtsqkhJUsabzwIA8K
-						lkpee42ow4OY4FGUBQ4x1mMhwRk+hAy95SCgeI7KbCnNGPfleGDS7M+uLcXpM9u/
-						D6odUzgJfKEHsWMNdAdH6tlCC59+9aNixr+u3G6PkxJFHnboW6EQ1eTFnJnwmsXy
-						qrSsCw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lshtm-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at London School of Hygiene and Tropical Medicine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</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 b7e93eb5..00000000
--- a/swamid-interfederations-2.0/lu-idp.lu.lv.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lu-idp.lu.lv">
-  <md: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>
-  </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">lu.lv</shibmd:Scope>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Latvia</mdui:DisplayName>
-        <mdui:Logo height="64" width="64">https://lu-idp.lu.lv/icons/icon-lu.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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - LU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Latvia - LU IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lu-idp1.lu.lv.xml b/swamid-interfederations-2.0/lu-idp1.lu.lv.xml
deleted file mode 100644
index e7fe6407..00000000
--- a/swamid-interfederations-2.0/lu-idp1.lu.lv.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lu-idp1.lu.lv">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhgCAQAwDQYJKoZIhvcNAQEEBQAwXjELMAkGA1UEBhMCTFYxDzANBgNV
-BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxCzAJBgNVBAsT
-AkxVMRUwEwYDVQQDEwxsdS1pZHAubHUubHYwHhcNMTMwMzA1MTI0NjEzWhcNMjMw
-MzAzMTI0NjEzWjBeMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0dmlhMQ0wCwYD
-VQQHEwRSaWdhMQswCQYDVQQKEwJMVTELMAkGA1UECxMCTFUxFTATBgNVBAMTDGx1
-LWlkcC5sdS5sdjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVP1+R8
-ESt5pHCtzIWOiF+yw+IQMzYSWe4LB/tbyNzAnZ0q/nRaJe0XQpasWpobIGVXvzvh
-cWmMf/sxiM2OW8jzrNsQcEk+E69brgq9eE4lEbhHGbmBjangJLXI3cEwVickWXqQ
-qhe0cUPBMD1FZARwGlL8YWZRQ5+dfB933EO8dR4LSdLbNXjglCEwGG2e6XHzbl4w
-7JS+SLaTjLjRB0ITCp9HtvxciFakPX/gzGOJM54UuF68siLGyokP7s/T7XgOxnFL
-Z54FRLckXOkDzcyfMn+6VB5r7MAIE1E25zcllZbfvqKDtb4JmeP5o3UOfY2TUCIg
-QbiA+GZGz8xTcbkCAwEAATANBgkqhkiG9w0BAQQFAAOCAQEABN89j8izhz6LrVsr
-pTj6u8ZE4mlUkDsvXJSxiuz7VNsf3M/y63QAdMNot/HSjEhl+a4utrcXiv63qtsC
-/GJNoI2uu6cBvMR6QXLf2rsuPG8bhIRciXu05PiY3gbHiiPJWOQuPEBSSFBMskiU
-U3dxJNFd+EmUjigNrpObWNOjGypQE7v+WlZ6261kkCUbSEKixQ28Py4tqS6CJehn
-pdgKs1TNu4MoBxUjg8yo3b+1UaA96NmMbA3XUSd2K9qOV9NzJ64E9e7d04u+VVBv
-D2TcA6zOrv9jXb96N0u0D9Bz2K6rDsdV7T1N+3L3LcLzP7qj/jNlRU8tagDbXrwz
-jo0gpQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhgCAQAwDQYJKoZIhvcNAQEEBQAwXjELMAkGA1UEBhMCTFYxDzANBgNV
-BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxCzAJBgNVBAsT
-AkxVMRUwEwYDVQQDEwxsdS1pZHAubHUubHYwHhcNMTMwMzA1MTI0NjEzWhcNMjMw
-MzAzMTI0NjEzWjBeMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0dmlhMQ0wCwYD
-VQQHEwRSaWdhMQswCQYDVQQKEwJMVTELMAkGA1UECxMCTFUxFTATBgNVBAMTDGx1
-LWlkcC5sdS5sdjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALVP1+R8
-ESt5pHCtzIWOiF+yw+IQMzYSWe4LB/tbyNzAnZ0q/nRaJe0XQpasWpobIGVXvzvh
-cWmMf/sxiM2OW8jzrNsQcEk+E69brgq9eE4lEbhHGbmBjangJLXI3cEwVickWXqQ
-qhe0cUPBMD1FZARwGlL8YWZRQ5+dfB933EO8dR4LSdLbNXjglCEwGG2e6XHzbl4w
-7JS+SLaTjLjRB0ITCp9HtvxciFakPX/gzGOJM54UuF68siLGyokP7s/T7XgOxnFL
-Z54FRLckXOkDzcyfMn+6VB5r7MAIE1E25zcllZbfvqKDtb4JmeP5o3UOfY2TUCIg
-QbiA+GZGz8xTcbkCAwEAATANBgkqhkiG9w0BAQQFAAOCAQEABN89j8izhz6LrVsr
-pTj6u8ZE4mlUkDsvXJSxiuz7VNsf3M/y63QAdMNot/HSjEhl+a4utrcXiv63qtsC
-/GJNoI2uu6cBvMR6QXLf2rsuPG8bhIRciXu05PiY3gbHiiPJWOQuPEBSSFBMskiU
-U3dxJNFd+EmUjigNrpObWNOjGypQE7v+WlZ6261kkCUbSEKixQ28Py4tqS6CJehn
-pdgKs1TNu4MoBxUjg8yo3b+1UaA96NmMbA3XUSd2K9qOV9NzJ64E9e7d04u+VVBv
-D2TcA6zOrv9jXb96N0u0D9Bz2K6rDsdV7T1N+3L3LcLzP7qj/jNlRU8tagDbXrwz
-jo0gpQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp1.lu.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-idp1.lu.lv/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">LAIFE - LU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Latvian Identity Federation LAIFE - LU IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.lu.lv/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Administrator</SurName>
-    <EmailAddress>serviss@lanet.lv</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lumii-idp.lanet.lv.xml b/swamid-interfederations-2.0/lumii-idp.lanet.lv.xml
deleted file mode 100644
index 42224c6f..00000000
--- a/swamid-interfederations-2.0/lumii-idp.lanet.lv.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lumii-idp.lanet.lv">
-  <md: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>
-  </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">lumii.lv</shibmd:Scope>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Institute of Mathematics and Computer Science, University of Latvia</mdui:DisplayName>
-        <mdui:Logo height="64" width="64">https://lumii-idp.lanet.lv/icons/lumii-logo.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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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://lumii-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://lumii-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - LUMII</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of Mathematics and Computer Science, University of Latvia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lumii.lv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml
deleted file mode 100644
index 867b9cfe..00000000
--- a/swamid-interfederations-2.0/mahara.qmul.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mahara.qmul.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth Mahara SP for Queen Mary and Westfield College, University of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-23T11:16:13Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+jCCAeKgAwIBAgIJAOwYneQhzo5oMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEW1haGFyYS5xbXVsLmFjLnVrMB4XDTEyMDMwNzE0MjEwNloXDTIyMDMwNTE0
-						MjEwNlowHDEaMBgGA1UEAxMRbWFoYXJhLnFtdWwuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDC6euix10xI3odR6qK7o7F6N7YyLoO5c2th9Bo
-						/b35Wr/qBVSgOzn1KXGYbCLVi4eVAkT8xTj2THbq1u1C1q8dyl8YQfAXDpaqYZo3
-						nqXFgse4GhV4zjYyMsOUOgF0V7yWLxphFBjxyKhiTMejfW3Q8CDWWKKsDQeEhwgZ
-						W3GHMyrK8q5Gryup8167wMaK6r4wT1/VbVTuYbpLKzlbi0I1gpZOmHlqOSXX3e7n
-						AHWW3TkxQjWNb1eGhQrFUjHXncKpMwzHIM+PaminDt+SZo7y1StiNNP10TntE5A2
-						TBfzoe3IDAOn/zRo0uXqZqC4ebjI2yzR2kYzzqefNjQjuoXxAgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEW1haGFyYS5xbXVsLmFjLnVrMB0GA1UdDgQWBBS/AXRs2oVTF6D+
-						THVv7yl1bZJ2TTANBgkqhkiG9w0BAQUFAAOCAQEAKNPcq+ND9H2B61cPocxo7p4V
-						d82vTDJNgq4qOBhSLiO0kV6tRf7hL6Y7t+/mb3Wx/HwJmKWbZUrk0EUSQINmjOGQ
-						OAuR7O93J4SJIbV5ZYtjnVqmvXcQO2DSqISjxBRr3mr30urXxBOGO8uyRJg67jS5
-						os06ShMhV0fFhCUk8WRxWu5BifoMTzBFkOHa52+NwYtwQT4aONuY2i4oG9NHjWj0
-						9o3kCjJO6/SHCxcXe9hGTfApb21kyXQKcSfNYwTnIqkxmPXhGu0X2Fgpo3/g31P8
-						WiYD2aYtXd/zZbmDIrYXVHx4QlflHS9YB8RvA1ka/vrQL224R2jgl3vFARpqCQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mahara.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: Mahara</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services helpdesk</GivenName>
-    <EmailAddress>mailto:its-helpdesk@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Moodle Support</GivenName>
-    <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml b/swamid-interfederations-2.0/mail.secure.easymail.rm.com-shibboleth.xml
deleted file mode 100644
index 5432ee4d..00000000
--- a/swamid-interfederations-2.0/mail.secure.easymail.rm.com-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://mail.secure.easymail.rm.com/shibboleth">
-  <!--
-		This is an "RM Easymail Plus" Shibboleth SP for RM Education plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://mail.secure.easymail.rm.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID3jCCAsagAwIBAgIQCHWvfofj36Opnfb9g9MhATANBgkqhkiG9w0BAQUFADA8
-						MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-						aGF3dGUgU1NMIENBMB4XDTEwMTExNzAwMDAwMFoXDTEzMTExNjIzNTk1OVowdzEL
-						MAkGA1UEBhMCR0IxEDAOBgNVBAgTB0VuZ2xhbmQxETAPBgNVBAcUCEFiaW5nZG9u
-						MQ8wDQYDVQQKFAZSTSBQTEMxDDAKBgNVBAsUA0lIRzEkMCIGA1UEAxQbbWFpbC5z
-						ZWN1cmUuZWFzeW1haWwucm0uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAo8ztGMK/HAAJWHuz2zIWwm/vHROyyGhKi+Ad01lL1PM9sGBxsuYPlMHe
-						mN6tuPtq4+dqv/Z3EKZwBvRKUpLer51lBKpg8odCcHpEeRLFb2B/3dzIZvH/vAvm
-						kGda0BQ/9q/1gyZh4OwaNzfFZ4z5JKWIiZwzGIsAE/rxmgCPuXh2B0tBmgJ6gr11
-						Qw01aJcx2/f6CADUbRh1piNJdbquXz1MZRHJNhMwWkb/YYBVdsZT+U/CptXCIphv
-						9T5Woss8Fc7lYQFi3KV29m8u3StSPsvaXi4H/nktUWEbsUY+DpCGgORZuAcYKuc8
-						vhbdGYdl2wUJqtr+7t7xwYDoMzxSIQIDAQABo4GgMIGdMAwGA1UdEwEB/wQCMAAw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1vdi1jcmwudGhhd3RlLmNvbS9U
-						aGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGCCsG
-						AQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AudGhhd3RlLmNvbTAN
-						BgkqhkiG9w0BAQUFAAOCAQEAhYUzax2HMdcsuWBoeLG8pqsZk2O7kKCUTbmLFVPP
-						4ul98x6vYF1Afl3K2XHFfmloay/dImTIaAA/uIe8mZVPljT2rNBoWI++nzaiBb+F
-						nZVlgw8W0QsyI6K6UdINDd09s1vwN0iF56d5rnR5w1SB2N5i5ngTSajTORO1QjG5
-						wWPsVDAK1jMviPmJzaUTLnR1o51iZ5To9GXuwY1/ZtIjTB7XfYVdHDoM2p0VuqcH
-						a5sAMLunClU0MAevk4snV/XHaflhiqqo8d0TyVr1iTdnKeeMZ0fMrnkofgxgWZlZ
-						sgYiyxUXXQpFchCiEG4CZT/smudL3jtVErHuYySHJVlkdA==
-					</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>
-						MIID3jCCAsagAwIBAgIQCHWvfofj36Opnfb9g9MhATANBgkqhkiG9w0BAQUFADA8
-						MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-						aGF3dGUgU1NMIENBMB4XDTEwMTExNzAwMDAwMFoXDTEzMTExNjIzNTk1OVowdzEL
-						MAkGA1UEBhMCR0IxEDAOBgNVBAgTB0VuZ2xhbmQxETAPBgNVBAcUCEFiaW5nZG9u
-						MQ8wDQYDVQQKFAZSTSBQTEMxDDAKBgNVBAsUA0lIRzEkMCIGA1UEAxQbbWFpbC5z
-						ZWN1cmUuZWFzeW1haWwucm0uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAo8ztGMK/HAAJWHuz2zIWwm/vHROyyGhKi+Ad01lL1PM9sGBxsuYPlMHe
-						mN6tuPtq4+dqv/Z3EKZwBvRKUpLer51lBKpg8odCcHpEeRLFb2B/3dzIZvH/vAvm
-						kGda0BQ/9q/1gyZh4OwaNzfFZ4z5JKWIiZwzGIsAE/rxmgCPuXh2B0tBmgJ6gr11
-						Qw01aJcx2/f6CADUbRh1piNJdbquXz1MZRHJNhMwWkb/YYBVdsZT+U/CptXCIphv
-						9T5Woss8Fc7lYQFi3KV29m8u3StSPsvaXi4H/nktUWEbsUY+DpCGgORZuAcYKuc8
-						vhbdGYdl2wUJqtr+7t7xwYDoMzxSIQIDAQABo4GgMIGdMAwGA1UdEwEB/wQCMAAw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL3N2ci1vdi1jcmwudGhhd3RlLmNvbS9U
-						aGF3dGVPVi5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMDIGCCsG
-						AQUFBwEBBCYwJDAiBggrBgEFBQcwAYYWaHR0cDovL29jc3AudGhhd3RlLmNvbTAN
-						BgkqhkiG9w0BAQUFAAOCAQEAhYUzax2HMdcsuWBoeLG8pqsZk2O7kKCUTbmLFVPP
-						4ul98x6vYF1Afl3K2XHFfmloay/dImTIaAA/uIe8mZVPljT2rNBoWI++nzaiBb+F
-						nZVlgw8W0QsyI6K6UdINDd09s1vwN0iF56d5rnR5w1SB2N5i5ngTSajTORO1QjG5
-						wWPsVDAK1jMviPmJzaUTLnR1o51iZ5To9GXuwY1/ZtIjTB7XfYVdHDoM2p0VuqcH
-						a5sAMLunClU0MAevk4snV/XHaflhiqqo8d0TyVr1iTdnKeeMZ0fMrnkofgxgWZlZ
-						sgYiyxUXXQpFchCiEG4CZT/smudL3jtVErHuYySHJVlkdA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mail.secure.easymail.rm.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RM Education plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RM Education plc: RM Easymail Plus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rm.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Support Contact</GivenName>
-    <EmailAddress>mailto:shibsupport@ifl.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shibboleth Technical Contact</GivenName>
-    <EmailAddress>mailto:shibtechcontact@ifl.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 9676700b..00000000
--- a/swamid-interfederations-2.0/man-fe.hosted.exlibrisgroup.com-shib.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://man-fe.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is an "Ex Libris: Primo ASP Service on behalf of The University of Manchester" Shibboleth SP for Ex Libris (UK) 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-21T13:40: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://man-fe.hosted.exlibrisgroup.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://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/WAYF/UKFederation"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJAIbeMpWWYVSeMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCXByaW1vMDV2MTAeFw0xMTEyMjAxMzUyMzJaFw0yMTEyMTcxMzUyMzJaMBQx
-						EjAQBgNVBAMTCXByaW1vMDV2MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAKiRUXmFIRlhuxsJeh0+w5gfpNAdGrklnQCjra/ZKnDLTPUkNRfPV4anjMpj
-						PGgb74nMKHmC0w/JQnaNc1bujjkovT8kuUqtTakxiFx2YBYNt6g8Zf540iV87WwC
-						f4+EqBHAc9jb/BCxD+/27ena7P0sFijzKnqXSZwVCLjYTUniRSxqRoYj9zWbVVp/
-						Q/kgLM6dvx4oKkwr+LVOt8hrva24fkHcI2JkDpSuB8WQk9rqkF9pangmtwL70i47
-						nUc40roGM0Xm1joVEO4vMycHevYDVDCbfsQRY9GLmSC3MFkg7K1+t1CUPBaK1N2L
-						vxf/xyVEj3xzv+R35PSyVZowc+ECAwEAAaM3MDUwFAYDVR0RBA0wC4IJcHJpbW8w
-						NXYxMB0GA1UdDgQWBBS5QVANx9PFctiP1JyHti3S/g/xCDANBgkqhkiG9w0BAQUF
-						AAOCAQEAHiif6wam0p7c/7tdnRzgRsmJzEv57G0S4pHOA77fJvNdgGxwM3geVHAu
-						Rsiw17BFn4goleyfXxBFU2v9tFYxttKuAGtD0yKoi03Ow8zKkQmBmNCCxc0/1+CQ
-						0pdMDkNUcxBClO7CKruncD1pHT5ma5t7/pXLgg/RDPN5Gne4hGo0ATiG0sn0Md6D
-						/yqSdIsk+Q+YUG8vuYNuGMpsyZLO+oyjI6O/5TV2+hONQ4Gl4YkiNLflLOq9YArz
-						xu+sfXm5Vz/xJCu3Nv3uhHzNTFCBcy2GKUQtjMF0urKfflleQNKKAmD3mEi7msCS
-						/gNJ6QmwQgxVykU77MUZfn6sO6YmDg==
-					</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://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://man-fe.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ex Libris: Primo ASP Service on behalf of The University of Manchester</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alessandro</GivenName>
-    <SurName>Fasoli</SurName>
-    <EmailAddress>mailto:Alessandro.Fasoli@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alessandro</GivenName>
-    <SurName>Fasoli</SurName>
-    <EmailAddress>mailto:Alessandro.Fasoli@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/manage.federations.renam.md.xml b/swamid-interfederations-2.0/manage.federations.renam.md.xml
deleted file mode 100644
index ddbe696c..00000000
--- a/swamid-interfederations-2.0/manage.federations.renam.md.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://manage.federations.renam.md">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://federations.renam.md/" registrationInstant="2015-12-01T08:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://federations.renam.md</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Federation Management Board</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ro">Sistem de Management al Federatiei</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ru">Приложение для менеджмента Федерации</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Federation Management Board - used to manage federation entitites and generate metadata</mdui:Description>
-        <mdui:Description xml:lang="ro">Sistem de Management al Federatiei - necesara pentru managementul entitatilor federative si generarea metadatelor</mdui:Description>
-        <mdui:Description xml:lang="ru">Приложение для менеджмента Федерации - неодходимо для управления федеративными сервисами и генерации мата-данных</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://manage.federations.renam.md</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="ro">https://manage.federations.renam.md</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="ru">https://manage.federations.renam.md</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>
-MIIE6zCCA9OgAwIBAgICANMwDQYJKoZIhvcNAQELBQAwdDESMBAGCgmSJomT8ixk
-ARkTAk1EMRcwFQYKCZImiZPyLGQBGRMHTUQtR3JpZDEOMAwGA1UEChMFUkVOQU0x
-IDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQDEwpNRC1H
-cmlkIENBMB4XDTE1MTEyNTA4MzEyNFoXDTI1MTEyMjA4MzEyNFowYDESMBAGCgmS
-JomT8ixkARkWAk1EMRowGAYKCZImiZPyLGQBGRYKRmVkZXJhdGlvbjEOMAwGA1UE
-ChMFUkVOQU0xHjAcBgNVBAMTFU1hbmFnZVNlcnZpY2VNZXRhU2lnbjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0ctV8e4QOli52mhR6sc4MImsPDodie
-he/uqVoAfhsxumuf6vR5oHvgy4QQGC/zJxEfWbI2hKlCCkH9tRBerYgu90vMMCZe
-d+INTGvskp28hDXki1Luj5DnzcTjuF9M7M8PRfa/nmYp5e33+Kh87UX6Jo9ekWMr
-pEKMEgR2UeJt+2vzQGDCYrI2NhDX1u20eZfVBP+gJNkxFSLH+cXICMe2P3z8vy5g
-L22wdJC+ep7XCqPPpRn50qKJF2nT0aopMggY7cCBxo0QAkt9t3qCvwTnHasMU+Ov
-9I0+TLJ2exn8/vBA1nicToanXyZNlYjD1kJHsw0gWh+a+1wHG/kkfe8CAwEAAaOC
-AZkwggGVMB0GA1UdDgQWBBRgFwRz+fla6Dkajz7A+0RDKvolTjAfBgNVHSMEGDAW
-gBQHQ26bo1u5q+z02L86Gw2jKbg1YjA6BggrBgEFBQcBAQQuMCwwKgYIKwYBBQUH
-MAKGHmh0dHA6Ly9jYS5ncmlkLm1kL2ZpbGVzL2NhLmNydDAzBgNVHR8ELDAqMCig
-JqAkhiJodHRwOi8vY2EuZ3JpZC5tZC9maWxlcy9jcmwtdjIuY3JsMCkGA1UdEgQi
-MCCBC2NhQHJlbmFtLm1khhFodHRwOi8vY2EuZ3JpZC5tZDCBtgYDVR0gBIGuMIGr
-MA4GDCsGAQQBgfNaCgEBBDCBmAYKKoZIhvdMBQICATCBiTA2BggrBgEFBQcCARYq
-aHR0cDovL2NhLmdyaWQubWQvZmlsZXMvTUQtR3JpZC1DUC1DUFMucGRmME8GCCsG
-AQUFBwICMEMaQUxpbWl0ZWQgTGlhYmlsaXR5LCBzZWUgaHR0cDovL2NhLmdyaWQu
-bWQvZmlsZXMvTUQtR3JpZC1DUC1DUFMucGRmMA0GCSqGSIb3DQEBCwUAA4IBAQC6
-KJuZeroALfPd32ft7vDVrU2olrWlK83Xvgjy6BRbd9ksBxuFUCAYbZxYWhWiNCUG
-2xn7nKLWjs51sSeDqFPVzNsAaU/MGr3TvFcxH1gyaIZQNkXVZcRbi93SdVfmnl9Z
-1R86aJxShVN6wOTAWyMSkzh3VGVGK9IeA57WoDAGuxvDVgxURO+lpkY0QztOMK9m
-DOFfR5TiqEahO0z7zUInQbg7LEgwDazK7BuDbirKdQhncGYCVG1dg3Qq09vJdSS4
-UgVNSVjlMzKBjhjGa9KhyOQZozleonKnk1o/cblzPGClGgcZeqElC6YXDpJzlSqt
-QDG9g0AnMyza3V7kLiDz
-</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>
-MIIE6zCCA9OgAwIBAgICANMwDQYJKoZIhvcNAQELBQAwdDESMBAGCgmSJomT8ixk
-ARkTAk1EMRcwFQYKCZImiZPyLGQBGRMHTUQtR3JpZDEOMAwGA1UEChMFUkVOQU0x
-IDAeBgNVBAsTF0NlcnRpZmljYXRpb24gQXV0aG9yaXR5MRMwEQYDVQQDEwpNRC1H
-cmlkIENBMB4XDTE1MTEyNTA4MzEyNFoXDTI1MTEyMjA4MzEyNFowYDESMBAGCgmS
-JomT8ixkARkWAk1EMRowGAYKCZImiZPyLGQBGRYKRmVkZXJhdGlvbjEOMAwGA1UE
-ChMFUkVOQU0xHjAcBgNVBAMTFU1hbmFnZVNlcnZpY2VNZXRhU2lnbjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAN0ctV8e4QOli52mhR6sc4MImsPDodie
-he/uqVoAfhsxumuf6vR5oHvgy4QQGC/zJxEfWbI2hKlCCkH9tRBerYgu90vMMCZe
-d+INTGvskp28hDXki1Luj5DnzcTjuF9M7M8PRfa/nmYp5e33+Kh87UX6Jo9ekWMr
-pEKMEgR2UeJt+2vzQGDCYrI2NhDX1u20eZfVBP+gJNkxFSLH+cXICMe2P3z8vy5g
-L22wdJC+ep7XCqPPpRn50qKJF2nT0aopMggY7cCBxo0QAkt9t3qCvwTnHasMU+Ov
-9I0+TLJ2exn8/vBA1nicToanXyZNlYjD1kJHsw0gWh+a+1wHG/kkfe8CAwEAAaOC
-AZkwggGVMB0GA1UdDgQWBBRgFwRz+fla6Dkajz7A+0RDKvolTjAfBgNVHSMEGDAW
-gBQHQ26bo1u5q+z02L86Gw2jKbg1YjA6BggrBgEFBQcBAQQuMCwwKgYIKwYBBQUH
-MAKGHmh0dHA6Ly9jYS5ncmlkLm1kL2ZpbGVzL2NhLmNydDAzBgNVHR8ELDAqMCig
-JqAkhiJodHRwOi8vY2EuZ3JpZC5tZC9maWxlcy9jcmwtdjIuY3JsMCkGA1UdEgQi
-MCCBC2NhQHJlbmFtLm1khhFodHRwOi8vY2EuZ3JpZC5tZDCBtgYDVR0gBIGuMIGr
-MA4GDCsGAQQBgfNaCgEBBDCBmAYKKoZIhvdMBQICATCBiTA2BggrBgEFBQcCARYq
-aHR0cDovL2NhLmdyaWQubWQvZmlsZXMvTUQtR3JpZC1DUC1DUFMucGRmME8GCCsG
-AQUFBwICMEMaQUxpbWl0ZWQgTGlhYmlsaXR5LCBzZWUgaHR0cDovL2NhLmdyaWQu
-bWQvZmlsZXMvTUQtR3JpZC1DUC1DUFMucGRmMA0GCSqGSIb3DQEBCwUAA4IBAQC6
-KJuZeroALfPd32ft7vDVrU2olrWlK83Xvgjy6BRbd9ksBxuFUCAYbZxYWhWiNCUG
-2xn7nKLWjs51sSeDqFPVzNsAaU/MGr3TvFcxH1gyaIZQNkXVZcRbi93SdVfmnl9Z
-1R86aJxShVN6wOTAWyMSkzh3VGVGK9IeA57WoDAGuxvDVgxURO+lpkY0QztOMK9m
-DOFfR5TiqEahO0z7zUInQbg7LEgwDazK7BuDbirKdQhncGYCVG1dg3Qq09vJdSS4
-UgVNSVjlMzKBjhjGa9KhyOQZozleonKnk1o/cblzPGClGgcZeqElC6YXDpJzlSqt
-QDG9g0AnMyza3V7kLiDz
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://manage.federations.renam.md/ssphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://manage.federations.renam.md/ssphp/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://manage.federations.renam.md/ssphp/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://manage.federations.renam.md/ssphp/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://manage.federations.renam.md/ssphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Federation Management Board</md:ServiceName>
-      <md:ServiceName xml:lang="ro">Sistem de Management al Federatiei</md:ServiceName>
-      <md:ServiceName xml:lang="ru">Приложение для менеджмента Федерации</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Federation Management Board - used to manage federation entitites and generate metadata</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="ro">Sistem de Management al Federatiei - necesara pentru managementul entitatilor federative si generarea metadatelor</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="ru">Приложение для менеджмента Федерации - неодходимо для управления федеративными сервисами и генерации мата-данных</md:ServiceDescription>
-      <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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <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="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="ro">RENAM</md:OrganizationName>
-    <md:OrganizationName xml:lang="ru">RENAM</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">RENAM</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="ro">RENAM</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="ru">RENAM</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">RENAM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="ro">http://renam.md</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="ru">http://renam.md</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://renam.md</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Valentin</md:GivenName>
-    <md:SurName>Pocotilenco</md:SurName>
-    <md:EmailAddress>mailto:leaf@renam.md</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 b64064b1..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://marreco.ifsuldeminas.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://marreco.ifsuldeminas.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marreco.ifsuldeminas.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://marreco.ifsuldeminas.edu.br:8443/idp/profile/SAML1/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">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFSULDEMINAS - Instituto Federal de Educacao, Ciencia e Tecnologia Sul de Minas Gerais</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifsuldeminas.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifsuldeminas.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Marcio Prado</md:SurName>
-    <md:EmailAddress>redes@ifsuldeminas.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 52274e00..00000000
--- a/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://marte.ifsertao-pe.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEEDCCAvgCAQAwDQYJKoZIhvcNAQEFBQAwgc0xLTArBgNVBAoTJEludGl0dXRv
-IEZlZGVyYWwgU2VydGFvIFBlcm5hbWJ1Y2FubzENMAsGA1UECxMEREdUSTE0MDIG
-CSqGSIb3DQEJARYlZnJhbmNpc2NvLmhhbWlsdG9uQGlmc2VydGFvLXBlLmVkdS5i
-cjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYD
-VQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1LmJyMB4XDTE1
-MDQyNDEzNTU0MFoXDTE4MDQyMzEzNTU0MFowgc0xLTArBgNVBAoTJEludGl0dXRv
-IEZlZGVyYWwgU2VydGFvIFBlcm5hbWJ1Y2FubzENMAsGA1UECxMEREdUSTE0MDIG
-CSqGSIb3DQEJARYlZnJhbmNpc2NvLmhhbWlsdG9uQGlmc2VydGFvLXBlLmVkdS5i
-cjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYD
-VQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1LmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmFrZQ/JQhZepr5CpvzgDcdJ6ohlK
-FXSFFSUTQ8ijOch5l5wQR0+7x2U5NAjXo+iBnXeN9jU1z59agbfOljRPjixcR0LR
-KhiEQcBK5Agv/ZZOBMOoHeZUIrQo7efw3nXYZiUB/RWYRIx2VEWnCsrxY57ZmPRn
-XLpz2EPEOEH/MW7aCCdd9WbDgZ8MEN9IxPR2ackexC6FDGQU+WEEUl1flF+Sxrpw
-DFMnZOqLB2qihaqOsxUdWMRPgfrdy/OlA+KGIm8jlAnY+AWCc7fG2r/br9TPSBZu
-RWoRvDmVbT51Rl5+B+JDB93Q2OcxTHW5C/9sebTnZeXqV+spgUe3vj7N7wIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQB0SOB6zEvvGgYtlMhGZLBan0cRnW3C74kmyE+D
-qt/pJsfq/oMAswSCmA+/exBYH8Pv8vhlONcBPS4s+UalcF3825D6ktqTDxUchHgP
-rqVrF8jQOoSg/RD9q4csLNH9ihSDiLM00xXuZbu/2+aUp9FLBPBIEthFy8KrtBI8
-9ElYEBHCznmOeVu6keAXQMJkCrVod1uIAKyH3ZUvX4Wx4wvBPSS6Nn6Q6rToEG2S
-JeRAZFiNM4Ewj+LQygeVJAWRU91zx7y3XvfUxWK+kLMWMlLt+bVi7bsRxhrxXKgL
-5JYstueDHvUmZuFhvgjXAp8m07ul4W/BFt0DMU842+HOTOkH
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://marte.ifsertao-pe.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://marte.ifsertao-pe.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://marte.ifsertao-pe.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEEDCCAvgCAQAwDQYJKoZIhvcNAQEFBQAwgc0xLTArBgNVBAoTJEludGl0dXRv
-IEZlZGVyYWwgU2VydGFvIFBlcm5hbWJ1Y2FubzENMAsGA1UECxMEREdUSTE0MDIG
-CSqGSIb3DQEJARYlZnJhbmNpc2NvLmhhbWlsdG9uQGlmc2VydGFvLXBlLmVkdS5i
-cjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYD
-VQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1LmJyMB4XDTE1
-MDQyNDEzNTU0MFoXDTE4MDQyMzEzNTU0MFowgc0xLTArBgNVBAoTJEludGl0dXRv
-IEZlZGVyYWwgU2VydGFvIFBlcm5hbWJ1Y2FubzENMAsGA1UECxMEREdUSTE0MDIG
-CSqGSIb3DQEJARYlZnJhbmNpc2NvLmhhbWlsdG9uQGlmc2VydGFvLXBlLmVkdS5i
-cjESMBAGA1UEBxMJUGV0cm9saW5hMRMwEQYDVQQIEwpQZXJuYW1idWNvMQswCQYD
-VQQGEwJCUjEhMB8GA1UEAxMYbWFydGUuaWZzZXJ0YW8tcGUuZWR1LmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmFrZQ/JQhZepr5CpvzgDcdJ6ohlK
-FXSFFSUTQ8ijOch5l5wQR0+7x2U5NAjXo+iBnXeN9jU1z59agbfOljRPjixcR0LR
-KhiEQcBK5Agv/ZZOBMOoHeZUIrQo7efw3nXYZiUB/RWYRIx2VEWnCsrxY57ZmPRn
-XLpz2EPEOEH/MW7aCCdd9WbDgZ8MEN9IxPR2ackexC6FDGQU+WEEUl1flF+Sxrpw
-DFMnZOqLB2qihaqOsxUdWMRPgfrdy/OlA+KGIm8jlAnY+AWCc7fG2r/br9TPSBZu
-RWoRvDmVbT51Rl5+B+JDB93Q2OcxTHW5C/9sebTnZeXqV+spgUe3vj7N7wIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQB0SOB6zEvvGgYtlMhGZLBan0cRnW3C74kmyE+D
-qt/pJsfq/oMAswSCmA+/exBYH8Pv8vhlONcBPS4s+UalcF3825D6ktqTDxUchHgP
-rqVrF8jQOoSg/RD9q4csLNH9ihSDiLM00xXuZbu/2+aUp9FLBPBIEthFy8KrtBI8
-9ElYEBHCznmOeVu6keAXQMJkCrVod1uIAKyH3ZUvX4Wx4wvBPSS6Nn6Q6rToEG2S
-JeRAZFiNM4Ewj+LQygeVJAWRU91zx7y3XvfUxWK+kLMWMlLt+bVi7bsRxhrxXKgL
-5JYstueDHvUmZuFhvgjXAp8m07ul4W/BFt0DMU842+HOTOkH
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://marte.ifsertao-pe.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md: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"/>
-    <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">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFSERTAO-PE - Instituto Federal do Sertao Pernambucano</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifsertao-pe.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifsertao-pe.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Francisco Hamilton de Freitas Junior</md:SurName>
-    <md:EmailAddress>francisco.hamilton@ifsertao-pe.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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/masaq.oucs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index af5b6817..00000000
--- a/swamid-interfederations-2.0/masaq.oucs.ox.ac.uk-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://masaq.oucs.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for University of Oxford.
-	-->
-  <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="2013-10-10T10:47:49Z">
-      <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://masaq.oucs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJALjsZAqK6FUqMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE21hc2FxLm91Y3Mub3guYWMudWswHhcNMTMwOTIwMTExNjU2WhcNMjMwOTE4
-						MTExNjU2WjAeMRwwGgYDVQQDExNtYXNhcS5vdWNzLm94LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9ULFDudvq0bdTHSkYluO2b262utN9p1x
-						u7YY0T2GOemIWmw2SOngyFEh67o0VSWWcaWjnRMmzyLIXC+XK7ypriibmhZBVRHK
-						xAIgVhH8wbK3CEMP5+F8WQcdDwwGxnk6rhn0YmPJ8GFq6TNo+FnYwry3Ojgs/sUr
-						guGE27x+GdRcWmsTbQj5mlxoffaB93k/kyzAC2d9Gitq5fvypQMiakFVafCdksXn
-						PnYp5/jYKQGo/zcFvdO+SLUDd4u1cJvPQxIgZp8qkQzjU5p6u8eXC2+05pIQJBbg
-						vH/Al4iW258o4V873HyXehm5Y715gWoNR1Ewmyp/h2g6OZH7PfQnGQIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNtYXNhcS5vdWNzLm94LmFjLnVrMB0GA1UdDgQWBBTGZXOE
-						j1iBntwwxtXItqm0nW1J+DANBgkqhkiG9w0BAQUFAAOCAQEAdXM8ECCvAtZp/Jr2
-						zHKMycrGPZbt6y6Nk/+fMzRgAyP80WQV/Nci5jwwYan6he0TtjEVUP3zNWuElAfA
-						sgIvEY4VTrvJ2ARcw+bfp/BeXvzMAclzBzZSlcfHqXenXyw5N/PBtfkgyBUOORVA
-						/9aPp3RuJXVca95Y6JaHmGBYeZgYVFQkAWiz9PgRLKLFkcw9y7VwlMsZkylnk79F
-						2BAnVXYem+hQf+NT2FvT8TrUTef/Kwav9nPgM1Nat4v06xkugbPo8pd+0g22Wkzz
-						LZxdIwRUrC1nm1O2BiRECpUQO5gPwpupPhMET0F9cEaFH68MT9DLJtVI1N1P1ZIO
-						DkSyzg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://masaq.oucs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://masaq.oucs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Test Shibboleth SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</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 7ed7916c..00000000
--- a/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mayumba.msh-paris.fr/shibauth.php">
-  <md: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>
-    <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>https://federation.renater.fr/category/wifi</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EHESS - FMSH - Eduspot France site</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://mayumba.msh-paris.fr/shibauth.php</mdui:InformationURL>
-        <mdui:Description xml:lang="en">EHESS - FMSH - Eduspot site France</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">EHESS - FMSH - Eduspot site France</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">EHESS - FMSH - Eduspot site France</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mayumba.msh-paris.fr/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">EHESS - FMSH - Eduspot site France</md:ServiceName>
-      <md:ServiceName xml:lang="en">EHESS - FMSH - Eduspot France site</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">EHESS - FMSH - Eduspot site France</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">EHESS - FMSH - Eduspot site France</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="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="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole des Hautes Etudes en Sciences Sociales Paris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole des Hautes Etudes en Sciences Sociales Paris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ehess.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Laurent Henry</md:SurName>
-    <md:EmailAddress>laurent.henry@ehess.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mccall.henley-cov.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/mccall.henley-cov.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 8734c918..00000000
--- a/swamid-interfederations-2.0/mccall.henley-cov.ac.uk-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" entityID="https://mccall.henley-cov.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Henley College Coventry.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">henley-cov.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIRAMs1hpx5cLrrnqC1wRQthWwwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA5MTIwMDAwMDBaFw0xNjA5MTEyMzU5NTlaMEUxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXbWNjYWxsLmhl
-						bmxleS1jb3YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ
-						5xUydUjAY8iBFq35sgRsWpuqs1cKDHv5LkIL4N8qaVekHdBej6mWW6CXWc+OGXPm
-						e3M1JpIkEgT85GEckGTiQAEzGk6BviKhHTLbg6r1goWR891xbXkbdaPlY/MUtKpb
-						NGXR1CBMgGEiW22sy9omQRGQlSAMNaM9c4zsVBbWfKHSCSyZ5mxR5Q1AjQVvM2w0
-						PCxLRfWyYxp16QxXWCUYr+XB/S7BHERXETpaoH+sBcspjT70g4taoOzjRmL8IlN5
-						Rk9V4DZxybO+lun4IJ7hYsEm+1Hxd91pzB3MUDUuZ4W3+wiBxcTdGWWl6mbWIV+z
-						nnkpse1/4oHG+yihRBKHAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
-						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUdTMEcyrs2BVOrd+a9jLSinjcU8gwDgYD
-						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF21jY2FsbC5oZW5s
-						ZXktY292LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB4+WToqhio4ygMFQRaR7jx
-						GnN7OvUWOSdUUfzmwE54tXHoKqshC3xp1rqhZjdK77Vaoe5VdzuQv8lO0YyBdEfY
-						6DKG7nqsZdomYRoogxOPL8TPrkh+AGVmfZaJhJ/GZauEvJAXHO1zjP/1IMIxia+Y
-						4SkJBKVpsA4cUn7A082gFqfnGhHvl2JuDNszY/E+mDVxx3MXBT6aeq+gNF2Qx3kc
-						6GAWgZoqoIrF6FQX6E032WNWyzV4thdB93S9CK2bvsq+yQwWWCZHqAT3fY7Peyrj
-						fJtg6uLXHqJiAjTaAhXMEIB5Fk9lQIqXLXJg/2RCGMHw654O8j0K65JS1yQ4T4db
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mccall.henley-cov.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mccall.henley-cov.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://mccall.henley-cov.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mccall.henley-cov.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mccall.henley-cov.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mccall.henley-cov.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">henley-cov.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIRAMs1hpx5cLrrnqC1wRQthWwwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA5MTIwMDAwMDBaFw0xNjA5MTEyMzU5NTlaMEUxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXbWNjYWxsLmhl
-						bmxleS1jb3YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQ
-						5xUydUjAY8iBFq35sgRsWpuqs1cKDHv5LkIL4N8qaVekHdBej6mWW6CXWc+OGXPm
-						e3M1JpIkEgT85GEckGTiQAEzGk6BviKhHTLbg6r1goWR891xbXkbdaPlY/MUtKpb
-						NGXR1CBMgGEiW22sy9omQRGQlSAMNaM9c4zsVBbWfKHSCSyZ5mxR5Q1AjQVvM2w0
-						PCxLRfWyYxp16QxXWCUYr+XB/S7BHERXETpaoH+sBcspjT70g4taoOzjRmL8IlN5
-						Rk9V4DZxybO+lun4IJ7hYsEm+1Hxd91pzB3MUDUuZ4W3+wiBxcTdGWWl6mbWIV+z
-						nnkpse1/4oHG+yihRBKHAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
-						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUdTMEcyrs2BVOrd+a9jLSinjcU8gwDgYD
-						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF21jY2FsbC5oZW5s
-						ZXktY292LmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB4+WToqhio4ygMFQRaR7jx
-						GnN7OvUWOSdUUfzmwE54tXHoKqshC3xp1rqhZjdK77Vaoe5VdzuQv8lO0YyBdEfY
-						6DKG7nqsZdomYRoogxOPL8TPrkh+AGVmfZaJhJ/GZauEvJAXHO1zjP/1IMIxia+Y
-						4SkJBKVpsA4cUn7A082gFqfnGhHvl2JuDNszY/E+mDVxx3MXBT6aeq+gNF2Qx3kc
-						6GAWgZoqoIrF6FQX6E032WNWyzV4thdB93S9CK2bvsq+yQwWWCZHqAT3fY7Peyrj
-						fJtg6uLXHqJiAjTaAhXMEIB5Fk9lQIqXLXJg/2RCGMHw654O8j0K65JS1yQ4T4db
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mccall.henley-cov.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mccall.henley-cov.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">Henley College Coventry</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Henley College Coventry</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.henley-cov.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>McAll</SurName>
-    <EmailAddress>mailto:imcall@henley-cov.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>McAll</SurName>
-    <EmailAddress>mailto:imcall@henley-cov.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mckinley.csuci.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/mckinley.csuci.edu-idp-shibboleth.xml
deleted file mode 100644
index f0eed568..00000000
--- a/swamid-interfederations-2.0/mckinley.csuci.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,91 +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://mckinley.csuci.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">csuci.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Channel Islands</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>
-MIIDMzCCAhugAwIBAgIUHk9QotPMplSUhYpSvuYG29XyhAcwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSbWNraW5sZXkuY3N1Y2kuZWR1MB4XDTA5MTIxNTE0MzU0
-MloXDTI5MTIxNTE0MzU0MlowHTEbMBkGA1UEAxMSbWNraW5sZXkuY3N1Y2kuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiBu6KkNBzS5FBHcadtCH
-7YizwI5m5i1upU/0BfcGbRqX73vxWsel6faOKV2uTh4z0L5u4fWf5eLKRL+csuvd
-/KhJyLHpf4TF9Qb6YKjoM8zBWfsQ09U6Cm7/80BF0Vt6aFZ1MlnnA64PkJIto0IQ
-4C0gy1/X/4GIGOQKEKCHQcZ6q1PW7RxOSQgC063QTgsQi1PmvHeFrJ41wuLjmMhC
-PHAv28hPgpvPdQ3Tf0a/mGF0ICVD7UCgmqt62LfzcT6+5aeKxOGc1FqkNnGgiNS9
-KGyRVzU9KHf6nHvD6bb2yJEuwDDNn8qNBjm1A6b/3FK9C8uBWVecE0BMrK28Girr
-WQIDAQABo2swaTBIBgNVHREEQTA/ghJtY2tpbmxleS5jc3VjaS5lZHWGKWh0dHBz
-Oi8vbWNraW5sZXkuY3N1Y2kuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRH
-o1fMC9uSJXS0PCu+GX3vFk8vTDANBgkqhkiG9w0BAQUFAAOCAQEAcuQTlh1jKAQu
-Wh04QJ8nUrbUd/o/iuzmSlGFcc+jt2oQGKUUPrdVQ56m4nUrz6EZr5pSBJP6kCxM
-1dbdpSHMB3sOeIpIAIn6gv0KqVn+SVxdT9101//+5t85p0qnyqymO6hWNHIZWEbI
-xZOrsBrFc/3KHEyOBxXSyzLEri1mxvYNBN3lYxAfnXvL2TfFMfSDzi9SItwTnHFG
-ZVhecPvNBMDCBul++UU34rYeovvJQ29UDocwicHEn5n9f3G9rUs4xM9k3DucsZz9
-yvIPFDYPMKI9Z5ZyyInFao5y7ZRI0Odmn24AZkBPzTT2pczIP+JVC/k1e+1sDGbW
-mzdNnyU+tA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mckinley.csuci.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mckinley.csuci.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mckinley.csuci.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mckinley.csuci.edu/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">csuci.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUHk9QotPMplSUhYpSvuYG29XyhAcwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSbWNraW5sZXkuY3N1Y2kuZWR1MB4XDTA5MTIxNTE0MzU0
-MloXDTI5MTIxNTE0MzU0MlowHTEbMBkGA1UEAxMSbWNraW5sZXkuY3N1Y2kuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiBu6KkNBzS5FBHcadtCH
-7YizwI5m5i1upU/0BfcGbRqX73vxWsel6faOKV2uTh4z0L5u4fWf5eLKRL+csuvd
-/KhJyLHpf4TF9Qb6YKjoM8zBWfsQ09U6Cm7/80BF0Vt6aFZ1MlnnA64PkJIto0IQ
-4C0gy1/X/4GIGOQKEKCHQcZ6q1PW7RxOSQgC063QTgsQi1PmvHeFrJ41wuLjmMhC
-PHAv28hPgpvPdQ3Tf0a/mGF0ICVD7UCgmqt62LfzcT6+5aeKxOGc1FqkNnGgiNS9
-KGyRVzU9KHf6nHvD6bb2yJEuwDDNn8qNBjm1A6b/3FK9C8uBWVecE0BMrK28Girr
-WQIDAQABo2swaTBIBgNVHREEQTA/ghJtY2tpbmxleS5jc3VjaS5lZHWGKWh0dHBz
-Oi8vbWNraW5sZXkuY3N1Y2kuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRH
-o1fMC9uSJXS0PCu+GX3vFk8vTDANBgkqhkiG9w0BAQUFAAOCAQEAcuQTlh1jKAQu
-Wh04QJ8nUrbUd/o/iuzmSlGFcc+jt2oQGKUUPrdVQ56m4nUrz6EZr5pSBJP6kCxM
-1dbdpSHMB3sOeIpIAIn6gv0KqVn+SVxdT9101//+5t85p0qnyqymO6hWNHIZWEbI
-xZOrsBrFc/3KHEyOBxXSyzLEri1mxvYNBN3lYxAfnXvL2TfFMfSDzi9SItwTnHFG
-ZVhecPvNBMDCBul++UU34rYeovvJQ29UDocwicHEn5n9f3G9rUs4xM9k3DucsZz9
-yvIPFDYPMKI9Z5ZyyInFao5y7ZRI0Odmn24AZkBPzTT2pczIP+JVC/k1e+1sDGbW
-mzdNnyU+tA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mckinley.csuci.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mckinley.csuci.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Channel Islands</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Channel Islands</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.csuci.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Peter Scamardo</md:GivenName>
-    <md:EmailAddress>peter.scamardo@csuci.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml
deleted file mode 100644
index fcb57548..00000000
--- a/swamid-interfederations-2.0/mdb-vw-adfs.zebi.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://mdb-vw-adfs.zebi.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-24T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Zeeuwse Bibliotheek</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Zeeuwse Bibliotheek</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Zeeuwse Bibliotheek</mdui:Description>
-        <mdui:Description xml:lang="en">Zeeuwse Bibliotheek</mdui:Description>
-        <mdui:Logo height="48" width="76">https://static.surfconext.nl/logos/idp/zeeuwsebibliotheek.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Bibliotheek Zeeland Zeeuwse ZEBI</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Bibliotheek Zeeland Zeeuwse ZEBI</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/eb19a62f8228f1b9265d9166a9180a73"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Zeeuwse Bibliotheek</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Zeeuwse Bibliotheek</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.zeeuwsebibliotheek.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/meals.oriel.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/meals.oriel.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 4bd18ea9..00000000
--- a/swamid-interfederations-2.0/meals.oriel.ox.ac.uk-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://meals.oriel.ox.ac.uk/shibboleth">
-  <!--
-		This is an "Oriel College Meals" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-07-08T13:49:11Z">
-      <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://meals.oriel.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJALmb+DO/MaS5MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGG9jLXdlYi0wMS5vcmllbC5veC5hYy51azAeFw0xNDA2MzAwNzM3MjVaFw0y
-						NDA2MjcwNzM3MjVaMCMxITAfBgNVBAMTGG9jLXdlYi0wMS5vcmllbC5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgsApZRfnxtPZO5Hlo8
-						XOJOqeY06UUqgPmZHMPqf3qbfsJF9xhiZsa/0ibzVLgOnt260hbLx4rNSrJ/9wqz
-						CuZJo2m+fgH+ZmwSZ0ZKQEdBxijLdlCUzicGviHGISVa9pEU/9SR2MU14e+A2wZG
-						c579TbmbM6w8pHjDPAVIWCOTr97s6tb/XDKWenLEyFZbCELye5yxX1MW4g4tuqjb
-						s4UfPdqgpW9FMNchrrI1zPRGFhYABG1KfptlOl7szj3qXq5moEo5muv98oMtB9aZ
-						ZGHT85Mid0oz1BQNruFNwutLkWi8Gmah8mRXKqAfmF6Na5SME3rFH2PvQgeKxFVm
-						RGcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYb2Mtd2ViLTAxLm9yaWVsLm94LmFjLnVr
-						MB0GA1UdDgQWBBT4ryll+f6nterkgUsy+VKPBeg9ITANBgkqhkiG9w0BAQUFAAOC
-						AQEAMEq/A5WkFnihpXsWwBny88AIJzDHl5FmIJGoHbTQnfBNYvSOUa2fath1EAsO
-						Xk6AFo/lOmIFIT4TgLWU1i1hnnVJnCEDDCg4aB8pmj46xrdNEa7u76gk0nrBfHIx
-						LT5Mh2cquN+9Z/TGuLw2prcFXdRxbptp7HyB/SBgHYTEtR7sdX0haUv/PA+ZzUsI
-						r6MFmWXUYci0/1YgPys4wGRgAG+NHLE971WSvxx8IDW5T4gYF97hOMAMi/OPNPHZ
-						xAqkSqnwVVs56gUqm4F/yMP1Awjz5xbsrK1FldW05Srlls6dQ8+GzB5Z1VlxMHDz
-						odYX/MzKAdQHVZQ3URmqkhT1Iw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://meals.oriel.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meals.oriel.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Oriel College Meals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oriel.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dale</GivenName>
-    <SurName>Lloyd</SurName>
-    <EmailAddress>mailto:dale.lloyd@oriel.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dale</GivenName>
-    <SurName>Lloyd</SurName>
-    <EmailAddress>mailto:dale.lloyd@oriel.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 213c5f8d..00000000
--- a/swamid-interfederations-2.0/meals.queens.ox.ac.uk-shibboleth.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://meals.queens.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Queen's College Meals" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-10-25T15:23: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://meals.queens.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAMAjMajvPz0aMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFW1lYWxzLnF1ZWVucy5veC5hYy51azAeFw0xMTEwMjQxNDQwMDNaFw0yMTEw
-						MjExNDQwMDNaMCAxHjAcBgNVBAMTFW1lYWxzLnF1ZWVucy5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK0Ujc3SARKgpkUI63cpU+6PJvkB
-						3V8HXAhp3kgMuQwmnYPDoP841SKFgpdMmVhTjyUMBxi8OdoHMEWUQHIBlvZ09Y2Y
-						B3imiyyBTWyiQ1XYi8sMfdcBDIKAz6MAQnCaHvQLsFsIVcx/JmjcXYk+8opasie9
-						aWO/HJtZjuRbD8t5WYIEvr8r0AvP+xyIsgHqoUdPASJmASBh8m7nrQJxJCYGf4HF
-						f40KS6vRnHLqG7NtdeOvrtNsAj5PM2xS5mE8/yTRHShAw3Mfi/d2N+w3GimQ1Uz5
-						rEscoavvonA1PxyI5mJYN5Zbp6SO88Y2VkLTOuJtup8zS8KuxSy5R7zQS9sCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVbWVhbHMucXVlZW5zLm94LmFjLnVrMB0GA1UdDgQW
-						BBSwvlfO/FTSVbEK/jfZvVIKJj873zANBgkqhkiG9w0BAQUFAAOCAQEAp92sniTk
-						ZSASz65sXSEy+fJLa74U5i46qmZ/X34fsGLf0M0TeJvaSzIhFHaq5QKIY/g6E5mK
-						B8nWM5/BF63D24Zaan9TPlvDhzxGZjeShl/OTNfzXNglNQmjGaxbevVUslZjx0mN
-						V9YgkAEtf9UAsf3Go2FwHZK5JRy7QFe2SEjlHZ6EjepKE7pykfPSbCDYnKe17dQ+
-						aqKbidJ2A2qvk4Q1fJYXt6BKk3QZkXBDeFBUq57rsWgyBZQktwygfpRWBd3Xtd/g
-						3PB65hPlPbSG/nOvJYuygzVd27oDnjZqYq0chh9ii4ZBM94b8/aB5sUHUaVNGe5E
-						YBkjzBZwhE01Yw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meals.queens.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: The Queen's College Meals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.queens.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Queen's College IT Support</GivenName>
-    <EmailAddress>mailto:it-support@queens.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Queen's College IT Support</GivenName>
-    <EmailAddress>mailto:it-support@queens.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/meals.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/meals.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index e52425e1..00000000
--- a/swamid-interfederations-2.0/meals.some.ox.ac.uk-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://meals.some.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Somerville College MBS" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-04-02T09:50:01Z">
-      <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://meals.some.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJAKdoXXjdRuKBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE21lYWxzLnNvbWUub3guYWMudWswHhcNMTQwNTA3MTIxOTE1WhcNMjQwNTA0
-						MTIxOTE1WjAeMRwwGgYDVQQDExNtZWFscy5zb21lLm94LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3pZqASbklNp3OW65A/tnT53MAtVqLHpT
-						cFTZ4rNWM/IINC0ZvXP7BWL589NCpaHd/df4iA0wro+FcV2TN+t4cx1Rkbz2mAst
-						bKeRwGildmWxAoaR9d6bEKCcAx/2iEUoc/oLOixHn1sXekaSWWn3aHHPxyMJDIwZ
-						kAhqR0CVx07tysXDprs1+hN7QWQGntNOGVTczQ9lwsDGleMpJ72xhU8FcWN0u39F
-						bZQBXZH1tEixD1MAVKTpU5DwPw32LA7b99nROZe4w15HZTX9s/Xtj2le/vI4CquL
-						JwT/qceQYeSfiB+oZh34xHwU9e3mwVFcoJ0LZbcjdtDhTmFzpL7gzQIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNtZWFscy5zb21lLm94LmFjLnVrMB0GA1UdDgQWBBT3GkjK
-						BbnQcej4g/y3dazREgp4RTANBgkqhkiG9w0BAQUFAAOCAQEA0ZH/J9U3r6izhN4v
-						c+wdNsk1lay9K4FBFUa1c+DG/CKC8bt6lDl6aqG6kvgEYyoDQnJOTZGMvfxFnILV
-						M6wdVOp5xuPq5dKdaE/70m70+5prlGeHU/YNWzHberTqMECwh9oTwgwpkKozAphk
-						F8JKeM+VucOKir0JOHVcUDosUMxKE/7wEqC5tPUPhEfxNPZjU/EqKqK8VGWgvOmX
-						3lKemjnQyLllbHV4tHvOZ0haaI6p3eCvJIB7sHoe44icIgcffxJx7+vojZ6RJWSs
-						OeDLSoVBc18OSRpvQLpc4JSFrhflY9L3LUBJCxMEiDBjMWfd8NOpECzTJ5YW6Ua7
-						4GrqaA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://meals.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://meals.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Somerville College MBS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/megsvle.lboro.ac.uk-shibboleth.xml
deleted file mode 100644
index 3b76145c..00000000
--- a/swamid-interfederations-2.0/megsvle.lboro.ac.uk-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://megsvle.lboro.ac.uk/shibboleth">
-  <!--
-		This is a "MEGS VLE" Shibboleth SP for Loughborough University.
-	-->
-  <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-06-14T09:37:19Z">
-      <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://megsvle.lboro.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdDCCA1ygAwIBAgIRAM7NnU7tUSvZo89k8bNlDzkwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MTcwMDAwMDBaFw0xNjA0MTYyMzU5NTlaMEExITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbWVnc3ZsZS5s
-						Ym9yby5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKoGHlVk
-						O6QB+0tuyJzq0vsd7NExlR42u6aWFPCfvujwV3om3gMN9ZjGqev6sY3xIVlg+ZOs
-						I+1xKcIverLKiCbYtVnTxLBQI6zWybM8uK5AdTUC/BHpIA/fZqVkOajYzn002WFf
-						u4rrUr0NZZszGm+RPSjdalhSf+BuUjm6Edn3TYB2PsEdtsyPEgETasdlZFgcdet+
-						gYCkg6bTm7Hz7fUyj4q4iguswHzxj/p0N4STbtIJWPlFYJvgCLCHlcv+wrUXdl3u
-						/W1uo6IK4xFHA88KA5iC0/WRcP0AZBoIIYt0m0WAfS5ESFVA9knCz3exQ2QW56rM
-						w2JuyMdeIHaikQECAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
-						KzdXR+qQ47ntMB0GA1UdDgQWBBT7biuxyf6+GROU/N8IfMZmq4AQzDAOBgNVHQ8B
-						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-						BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-						QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-						cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-						L29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbWVnc3ZsZS5sYm9yby5h
-						Yy51azANBgkqhkiG9w0BAQUFAAOCAQEAeDFbLufu17MX88aTRPH2cLy2WRcPsvmS
-						1PGKkwJHRZXTg+MnviRJo9EhwPkjrolqCF6vmW//ksXqi/YO/3ot0zHW6EqrrAck
-						7RwNMtgBa/SP92iEYAzsEi76YeZupzlA5kRHwIVC9OJG/S/zSwSuxjHjDxPw4eGi
-						+R7xcUcH1tUFYvS1VOVDyc3avo/QMa4TQhlK4g6ovUUFhINq1iX6P3ecBj7Z2GUg
-						69s/LbNH0HnpjKJnuLt3L94iQIWcehXxzOZ8OhZ7SExniAb3cB+9v5q6/Bt7Powx
-						uIgZedCEHUiDOuVv71eq6ny67K+S91yR6wRAgV+vQo/hlnqZBHmccw==
-					</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://megsvle.lboro.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://megsvle.lboro.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Loughborough University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MEGS VLE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://megs.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>E-Learning Systems Team</GivenName>
-    <EmailAddress>mailto:learn@lboro.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>E-Learning Systems Team</GivenName>
-    <EmailAddress>mailto:learn@lboro.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/member.goodpractice.net-shibboleth.xml b/swamid-interfederations-2.0/member.goodpractice.net-shibboleth.xml
deleted file mode 100644
index 5ebbc20f..00000000
--- a/swamid-interfederations-2.0/member.goodpractice.net-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" entityID="https://member.goodpractice.net/shibboleth">
-  <!--
-		This is a Shibboleth SP for Good Practice Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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"/>
-  </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://member.goodpractice.net/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC2TCCAcGgAwIBAgIJANAQiZL85UcxMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
-						BAMTBmdwd2ViMTAeFw0wOTEwMjkwOTQyMDhaFw0xOTEwMjcwOTQyMDhaMBExDzAN
-						BgNVBAMTBmdwd2ViMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJo3
-						K9NuAfabszZBVr7jycgfy5gF5CuTKcE7E3NKECb80e5tBzNZMtVP9bysddyd6m51
-						BcUb6B/f/iE6Qjve9+RyIsGtXshJTfPKfNyt0m+hp5PS9JNxhwW1GQRYgAXMRAXI
-						1c4U1TT/ZVyriupfhjjmm4gNH7MFWlC73jPEImN3Azykz/9/SKAYSH5DQVcE30wC
-						I0q6Nl99CBcgBxPU4KT1eBxlWtXwCA/2brBBUnBkcB8MiHljAbHI3qDi3pAvPfNd
-						/88T0Gh76moQIzjYc34FInQ9bdbsnebyFvtFuXT819lo6dL+1i688wxUMJlklKWq
-						m+juOoKmeL6XoXRGZN8CAwEAAaM0MDIwEQYDVR0RBAowCIIGZ3B3ZWIxMB0GA1Ud
-						DgQWBBS+l+ek7zsiE7FuieyU4W19XwhfNzANBgkqhkiG9w0BAQUFAAOCAQEALofg
-						bvE4ztxhrWJMt5IDwYrc/c31N3+xSMsyLZjKSRY5jKN1sd5s7xDi3aXduMua1MKV
-						BFOuiXQqWS8wv/5GOrI1/K0yFxasQEOzPGhrj3ceMfut8iP7peeBWQrNOQyi+SkV
-						axuK3oO/KhVtGaPWpv+c/RzLMP7UXF7Zw4O/OsdYHPppr7UF0BgibN2jCiIPUBOd
-						4fobI74SpX1VIQa8pyC6NOR6lPU7Ozex4xzKCq6nnS4OxObTjylU/2d8YdGB/Zda
-						hgAqoNDf0vZ9o4I+/6GGvgcEbYv7mKbt3TUuccRc5lIFVpggzB037hyw4n055xO+
-						1GNLhUn46SUcF9uHqw==
-					</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>
-						MIIC2TCCAcGgAwIBAgIJANAQiZL85UcxMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
-						BAMTBmdwd2ViMTAeFw0wOTEwMjkwOTQyMDhaFw0xOTEwMjcwOTQyMDhaMBExDzAN
-						BgNVBAMTBmdwd2ViMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJo3
-						K9NuAfabszZBVr7jycgfy5gF5CuTKcE7E3NKECb80e5tBzNZMtVP9bysddyd6m51
-						BcUb6B/f/iE6Qjve9+RyIsGtXshJTfPKfNyt0m+hp5PS9JNxhwW1GQRYgAXMRAXI
-						1c4U1TT/ZVyriupfhjjmm4gNH7MFWlC73jPEImN3Azykz/9/SKAYSH5DQVcE30wC
-						I0q6Nl99CBcgBxPU4KT1eBxlWtXwCA/2brBBUnBkcB8MiHljAbHI3qDi3pAvPfNd
-						/88T0Gh76moQIzjYc34FInQ9bdbsnebyFvtFuXT819lo6dL+1i688wxUMJlklKWq
-						m+juOoKmeL6XoXRGZN8CAwEAAaM0MDIwEQYDVR0RBAowCIIGZ3B3ZWIxMB0GA1Ud
-						DgQWBBS+l+ek7zsiE7FuieyU4W19XwhfNzANBgkqhkiG9w0BAQUFAAOCAQEALofg
-						bvE4ztxhrWJMt5IDwYrc/c31N3+xSMsyLZjKSRY5jKN1sd5s7xDi3aXduMua1MKV
-						BFOuiXQqWS8wv/5GOrI1/K0yFxasQEOzPGhrj3ceMfut8iP7peeBWQrNOQyi+SkV
-						axuK3oO/KhVtGaPWpv+c/RzLMP7UXF7Zw4O/OsdYHPppr7UF0BgibN2jCiIPUBOd
-						4fobI74SpX1VIQa8pyC6NOR6lPU7Ozex4xzKCq6nnS4OxObTjylU/2d8YdGB/Zda
-						hgAqoNDf0vZ9o4I+/6GGvgcEbYv7mKbt3TUuccRc5lIFVpggzB037hyw4n055xO+
-						1GNLhUn46SUcF9uHqw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.goodpractice.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://member.goodpractice.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.goodpractice.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.goodpractice.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.goodpractice.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://member.goodpractice.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.goodpractice.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.goodpractice.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.goodpractice.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://member.goodpractice.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.goodpractice.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://member.goodpractice.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://member.goodpractice.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://member.goodpractice.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umentor.goodpractice.net/Shibboleth.sso/SAML/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Good Practice Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Good Practice</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.goodpractice.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Owen</GivenName>
-    <SurName>Ferguson</SurName>
-    <EmailAddress>mailto:oferguson@goodpractice.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonny</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:janderson@goodpractice.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/member.staging.goodpractice.net-shibboleth.xml b/swamid-interfederations-2.0/member.staging.goodpractice.net-shibboleth.xml
deleted file mode 100644
index 49adf8b5..00000000
--- a/swamid-interfederations-2.0/member.staging.goodpractice.net-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://member.staging.goodpractice.net/shibboleth">
-  <!--
-		This is a "Staging" Shibboleth SP for Good Practice 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="2012-07-17T16:43: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://member.staging.goodpractice.net/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://member.staging.goodpractice.net/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDITCCAgmgAwIBAgIJAJy/kkU0owaoMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-						BAMTHmphcnZpNzdyLmRjMS5pb21hcnRob3N0aW5nLmNvbTAeFw0xMjA2MjcxMzE2
-						MzVaFw0yMjA2MjUxMzE2MzVaMCkxJzAlBgNVBAMTHmphcnZpNzdyLmRjMS5pb21h
-						cnRob3N0aW5nLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8h
-						piEPuJVRNJZUS9daETwxWIBmvfmWA6hmVoCsx3ItOQFgodv0AiVBIxggDjl4CYMQ
-						aBj5YFh+eUmuawXNC1Wt2g+A5HzMPwaM7HjVPkV/noQKbiHPkxHTlRKc7fuROoSd
-						w7/iHnVpFLAbkqVetprKKW1ga8zzdpiBzj/kHDBQZhyBQiihLmWYGXumdrG7by+l
-						PRej1p0IITpDUVRf4TaV7GgemDNbAn5l1fBQ8Ta1w/JAYRmBFJ//oZUhhMVdD1kH
-						FYdIvon50qUfFQLKa5X8FUTw4Bj2pSnuhH8Mmyl2agg3Ks2cV93McohQAzEsOzaZ
-						vq+UgBCJYXIHltmj65MCAwEAAaNMMEowKQYDVR0RBCIwIIIeamFydmk3N3IuZGMx
-						LmlvbWFydGhvc3RpbmcuY29tMB0GA1UdDgQWBBQayJlZGTlhGT8rvz+s/wZJ2tAK
-						eDANBgkqhkiG9w0BAQUFAAOCAQEAJDg5g1FRnTnwP7BoAOnB2ossDfOboWbQcqSg
-						1YeTTY/mOAE3oEaM3BG83RRXFGXdSgIgtM/P8iPMebNWR2/gPMLeGAWC5+SDm5EY
-						ARWQsnfFKkTG3vsMK7OPmgA5zIi59QUYwAOF4aJOsuUQjgrXWMwXUT7zMatHtkrw
-						lL+0VBkOHGU5cAs2oqBAH/59U9QIqSwusvSoD6CdxzxZQj0p8gyx3q6Ijy69dVOA
-						KULkafBZ1w0flcIDYXPGZ5yUAZ5CqNvngRk2eXfCx0Sd1xmXOiGxZw/Tok1DjIm0
-						0qqTdaZlBtbfqT/WNg1eTd6gOUqbJuNDRUO+ozHfOSsoRzZ1Yw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://member.staging.goodpractice.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://member.staging.goodpractice.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://member.staging.goodpractice.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.staging.goodpractice.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.staging.goodpractice.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://member.staging.goodpractice.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML/POST" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML2/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umentor.staging.goodpractice.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Good Practice Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GoodPractice Staging</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.goodpractice.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Owen</GivenName>
-    <SurName>Ferguson</SurName>
-    <EmailAddress>mailto:oferguson@goodpractice.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonny</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:janderson@goodpractice.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml b/swamid-interfederations-2.0/members.myworks.co.uk-shibboleth.xml
deleted file mode 100644
index 66ee8d15..00000000
--- a/swamid-interfederations-2.0/members.myworks.co.uk-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://members.myworks.co.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for Boardworks Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDMDCCAhigAwIBAgIJAP1/7w+UzNYuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azAeFw0xMTA0MzAyMjU0MjNaFw0yMTA0
-						MjcyMjU0MjNaMCAxHjAcBgNVBAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeY74DchIYNTo/SCxAvbvWrqkft
-						batjLhAHZD4UOsbFVOdGHPno50QweYbOu36Uy7FzoZ1r+8/8CMUZc3zNpNaKyNWg
-						Xd7qeX9DRWVi0D4wJsRuBhzx2fTk1g2HnltqAg3ssVPyDQ70lRh019gVeBeMvm+P
-						lYWoRzoJTEl2z8hwMPGqf5oydmVCwTCRQX3CPMlY8YQKtTO//gMZcrQAen1Wn9ez
-						WMlRmouAsvnJdeaLNP32pLTWVdLJ55oHElLQTPnW/1bKY4xwsyE2DL3I0RWbksTx
-						q6onlTN92hJ05aX3o0n+8uIWaJO0UVyi8FxJ0gAIsdIDeyDt+809/Zd2XDkCAwEA
-						AaNtMGswSgYDVR0RBEMwQYIVbWVtYmVycy5teXdvcmtzLmNvLnVrhihodHRwczov
-						L21lbWJlcnMubXl3b3Jrcy5jby51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBSi9ltT
-						qVMqHPMmEyiFzvZ64nzIszANBgkqhkiG9w0BAQUFAAOCAQEATztbeTRrNLBSPyjC
-						PBKTYRD0vGmU+f6OKRucwQoZrx3Zq2NdMwguQxTyF/X+6JZDXLoUqiIrxJvurzQb
-						wabd2BU8NdmZMqmCF/IQxObeRi6gWtETddI3ZGVsIp53C/QImtO/NcnV7N1Yd9bu
-						nVLntJUV5K8vV/yJfYkCgtNvZZ4ZH+0qNzWZFtMOj+5R6fUJe9Yez4/T4Ot4pjUN
-						wWebWwcZxvNH1tnZQxeOTvlzmEpvUwfR54UeQyqJCF/w/2kxlQvMDgoueWCyUQqI
-						GLAzKLRI6HmGZU/JUFbJ9qhoBEQYy3BfAIUiC3z0Cm38kIFUUNl0TIsJJ4fFskdc
-						8rYfwQ==
-					</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>
-						MIIDMDCCAhigAwIBAgIJAP1/7w+UzNYuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azAeFw0xMTA0MzAyMjU0MjNaFw0yMTA0
-						MjcyMjU0MjNaMCAxHjAcBgNVBAMTFW1lbWJlcnMubXl3b3Jrcy5jby51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMeY74DchIYNTo/SCxAvbvWrqkft
-						batjLhAHZD4UOsbFVOdGHPno50QweYbOu36Uy7FzoZ1r+8/8CMUZc3zNpNaKyNWg
-						Xd7qeX9DRWVi0D4wJsRuBhzx2fTk1g2HnltqAg3ssVPyDQ70lRh019gVeBeMvm+P
-						lYWoRzoJTEl2z8hwMPGqf5oydmVCwTCRQX3CPMlY8YQKtTO//gMZcrQAen1Wn9ez
-						WMlRmouAsvnJdeaLNP32pLTWVdLJ55oHElLQTPnW/1bKY4xwsyE2DL3I0RWbksTx
-						q6onlTN92hJ05aX3o0n+8uIWaJO0UVyi8FxJ0gAIsdIDeyDt+809/Zd2XDkCAwEA
-						AaNtMGswSgYDVR0RBEMwQYIVbWVtYmVycy5teXdvcmtzLmNvLnVrhihodHRwczov
-						L21lbWJlcnMubXl3b3Jrcy5jby51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBSi9ltT
-						qVMqHPMmEyiFzvZ64nzIszANBgkqhkiG9w0BAQUFAAOCAQEATztbeTRrNLBSPyjC
-						PBKTYRD0vGmU+f6OKRucwQoZrx3Zq2NdMwguQxTyF/X+6JZDXLoUqiIrxJvurzQb
-						wabd2BU8NdmZMqmCF/IQxObeRi6gWtETddI3ZGVsIp53C/QImtO/NcnV7N1Yd9bu
-						nVLntJUV5K8vV/yJfYkCgtNvZZ4ZH+0qNzWZFtMOj+5R6fUJe9Yez4/T4Ot4pjUN
-						wWebWwcZxvNH1tnZQxeOTvlzmEpvUwfR54UeQyqJCF/w/2kxlQvMDgoueWCyUQqI
-						GLAzKLRI6HmGZU/JUFbJ9qhoBEQYy3BfAIUiC3z0Cm38kIFUUNl0TIsJJ4fFskdc
-						8rYfwQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://members.myworks.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://members.myworks.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://members.myworks.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://members.myworks.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Boardworks Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Boardworks Limited: MyWorks</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.myworks.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Catherine</GivenName>
-    <SurName>Marks</SurName>
-    <EmailAddress>mailto:catherine.marks@boardworks.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Catherine</GivenName>
-    <SurName>Marks</SurName>
-    <EmailAddress>mailto:catherine.marks@boardworks.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml b/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.xml
deleted file mode 100644
index 86deda1d..00000000
--- a/swamid-interfederations-2.0/memso.tannerritchie.com-shibboleth-sp.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://memso.tannerritchie.com/shibboleth-sp">
-  <!--
-		This is a "Medieval and Early Modern Sources Online" Shibboleth SP for TannerRitchie Publishing.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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"/>
-  </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://tannerritchie.com/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">TannerRitchie Publishing</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Medieval and Early Modern Sources Online (MEMSO) is an essential resource for the study of Britain and its place in the world during the medieval and early modern period (c. 1100-1800)</mdui:Description>
-        <mdui:Logo height="116" width="491">https://tannerritchie.com/img/logo-blackonwhite-master.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKTCCAhGgAwIBAgIJAJuTjrsyhFeQMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEXRhbm5lcnJpdGNoaWUuY29tMB4XDTExMDcyMjE4NDMxOFoXDTIxMDcxOTE4
-						NDMxOFowHDEaMBgGA1UEAxMRdGFubmVycml0Y2hpZS5jb20wggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCyqSLwWCSrAJFK+BTDF52BRSvMaAXNFn5KWtXc
-						pfeV3Zma0MI54MUqc0SPirRK/fmIsQkSPk7HVaXFYZ6nkvBL8Ke3rHBA3ViMlGsJ
-						UMLs8qhlSfQn9d+J3DJVRqdV9RRZY9G0iKoBi0lM32kuX9cGVq71EJdjm2Nwfz3Z
-						5UyDoVfVMqVPnlESlY/bomcDjqwyz15z7cIRCbmZPqHyPqdsFRiKWUuVa+uwvxoB
-						CpwKxbfviJaYu9j0oQGzwSHse+fEOTCwV96Kr28PSqisolHhVaIxHjfCj3fAZQHm
-						EX8klaku9AnNItvTY5BJsdt3+DIFf6N9XIpSUuNeso+e497LAgMBAAGjbjBsMEsG
-						A1UdEQREMEKCEXRhbm5lcnJpdGNoaWUuY29thi1odHRwczovL21lbXNvLnRhbm5l
-						cnJpdGNoaWUuY29tL3NoaWJib2xldGgtc3AwHQYDVR0OBBYEFLbIWzGGpN1GGb1c
-						G8hXwXpvUiF/MA0GCSqGSIb3DQEBBQUAA4IBAQAeB5k8DkVkBHTP2LD2M8A3K5SC
-						Oe8jL3An51jBa+r9B7UGVNiC20DOYOVAsauMHYMP+lqaOKHIhSEBlQXHx61fWQQ5
-						mhN+0GUVbfKmqiOQmSLYeyzMiT5sb6JqSVVcAErBcN3nKxIhWMi9NJd+UntPLRYt
-						lbpIp+I1zWkV9kzElE1CzAq9pOuQQlL+7f4nbYYwppTyXQ5Gl6hW24oje4WtiHl/
-						mXSnza8yA2NPDhefbmxqxbVeU+1Qu1PyHQaUX/mdzAXVOXgaM0F72BimTAXQ4Zxr
-						/1WxEAHX32o1DtTZC+Pspbm0oN2KG0dyUSoFR2R8XYShQowVVtr7glWJTcdo
-					</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>
-						MIIDKTCCAhGgAwIBAgIJAJuTjrsyhFeQMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEXRhbm5lcnJpdGNoaWUuY29tMB4XDTExMDcyMjE4NDMxOFoXDTIxMDcxOTE4
-						NDMxOFowHDEaMBgGA1UEAxMRdGFubmVycml0Y2hpZS5jb20wggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCyqSLwWCSrAJFK+BTDF52BRSvMaAXNFn5KWtXc
-						pfeV3Zma0MI54MUqc0SPirRK/fmIsQkSPk7HVaXFYZ6nkvBL8Ke3rHBA3ViMlGsJ
-						UMLs8qhlSfQn9d+J3DJVRqdV9RRZY9G0iKoBi0lM32kuX9cGVq71EJdjm2Nwfz3Z
-						5UyDoVfVMqVPnlESlY/bomcDjqwyz15z7cIRCbmZPqHyPqdsFRiKWUuVa+uwvxoB
-						CpwKxbfviJaYu9j0oQGzwSHse+fEOTCwV96Kr28PSqisolHhVaIxHjfCj3fAZQHm
-						EX8klaku9AnNItvTY5BJsdt3+DIFf6N9XIpSUuNeso+e497LAgMBAAGjbjBsMEsG
-						A1UdEQREMEKCEXRhbm5lcnJpdGNoaWUuY29thi1odHRwczovL21lbXNvLnRhbm5l
-						cnJpdGNoaWUuY29tL3NoaWJib2xldGgtc3AwHQYDVR0OBBYEFLbIWzGGpN1GGb1c
-						G8hXwXpvUiF/MA0GCSqGSIb3DQEBBQUAA4IBAQAeB5k8DkVkBHTP2LD2M8A3K5SC
-						Oe8jL3An51jBa+r9B7UGVNiC20DOYOVAsauMHYMP+lqaOKHIhSEBlQXHx61fWQQ5
-						mhN+0GUVbfKmqiOQmSLYeyzMiT5sb6JqSVVcAErBcN3nKxIhWMi9NJd+UntPLRYt
-						lbpIp+I1zWkV9kzElE1CzAq9pOuQQlL+7f4nbYYwppTyXQ5Gl6hW24oje4WtiHl/
-						mXSnza8yA2NPDhefbmxqxbVeU+1Qu1PyHQaUX/mdzAXVOXgaM0F72BimTAXQ4Zxr
-						/1WxEAHX32o1DtTZC+Pspbm0oN2KG0dyUSoFR2R8XYShQowVVtr7glWJTcdo
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://tannerritchie.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tannerritchie.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tannerritchie.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tannerritchie.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tannerritchie.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tannerritchie.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tannerritchie.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tannerritchie.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tannerritchie.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tannerritchie.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tannerritchie.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tannerritchie.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tannerritchie.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tannerritchie.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tannerritchie.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TannerRitchie Publishing</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">TannerRitchie Publishing: Medieval and Early Modern Sources Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tannerritchie.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Roland</GivenName>
-    <SurName>Tanner</SurName>
-    <EmailAddress>mailto:roland@tannerritchie.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Roland</GivenName>
-    <SurName>Tanner</SurName>
-    <EmailAddress>mailto:roland@tannerritchie.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml b/swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml
deleted file mode 100644
index 1b002d7b..00000000
--- a/swamid-interfederations-2.0/met.refeds.org-saml2-metadata-.xml
+++ /dev/null
@@ -1,126 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://met.refeds.org/saml2/metadata/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-04-30T13:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-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>
-  </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">Metadata Explorer Tool</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Metadata Explorer Tool</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Metadata Explorer Tool is a fast way to find federations, entities and his relations through entity/federation metadata file information.</mdui:Description>
-        <mdui:Description xml:lang="it">Il Metadata Explorer Tool permette rapidamente di trovare le federazioni, le entità e le relazioni tra di esse nei metadati che le descrivono.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://met.refeds.org/static/info_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://met.refeds.org/static/info_it.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://met.refeds.org/static/privacy_en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://met.refeds.org/static/privacy_it.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="120" width="160" xml:lang="en">https://met.refeds.org/static/logoMET_160x120.png</mdui:Logo>
-        <mdui:Logo height="120" width="160" xml:lang="it">https://met.refeds.org/static/logoMET_160x120.png</mdui:Logo>
-        <mdui:Logo height="12" width="16" xml:lang="en">https://met.refeds.org/static/logoMET_16x12.png</mdui:Logo>
-        <mdui:Logo height="12" width="16" xml:lang="it">https://met.refeds.org/static/logoMET_16x12.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDBTCCAe2gAwIBAgIJAJrz91xEwT1DMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
-BAMMDm1ldC5yZWZlZHMub3JnMB4XDTE1MDQyMDEwMDkzN1oXDTI1MDQxOTEwMDkz
-N1owGTEXMBUGA1UEAwwObWV0LnJlZmVkcy5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCxVA8KV2TUuTjmxoUZfq3tyJrMvP+pwbTpQFjpqN3Q3FbP
-RZKREdpp41GkTFhsHc7kGZ5RHa0NLjot8tl2XuSkd55LrOffsn/p3TSavAUXPUXo
-5CnJwGi6RecoW5+VAxTWcQCE9wgxEda4NNYKJ6PUH0GXA46tepNAKcbhjuCxupfh
-/fFO0XVdmM8h5J3GLZJEvzLF5s5LSUToE7yBd9M7XPDXxIl5DG0pZeZ3cDBmVEJm
-FJPxPgUJUxwXnc3A4qb/iCgPHXqq/M3lt2I/zM/QxMWRyhXWkvUm0K7cBxPhXD1I
-sRNx/Yiy66lvtNHfIFoAW+GTQAsGigsk3lgl0J/PAgMBAAGjUDBOMB0GA1UdDgQW
-BBS15ZRED2b8svkrJ/tFGSHUVhSzVTAfBgNVHSMEGDAWgBS15ZRED2b8svkrJ/tF
-GSHUVhSzVTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCnVwczF6Hb
-bxLzHjXs4P4hLvxiYob+Rlt6lmNmLHez6QIMF/88Jn0PFmfMzRTRg9f3sI3u6G7J
-kwkfbQIj3ZJ3lk4VTQpZfoilkLhNEeo2ljyYgeUP4fbBrsC5az5VoEsUH8+QAtZ3
-cI8PbCmulGbtEgtJzs3jiRt7AjpBhiGot9HcblyF5R8V75iovFapU1sBLWTi+uZv
-w53UzzO6s6cSqo2rzA7QKuEUvsUnrB7NYy818riZ0ufFcZfWz6ApPLffVJa3M7tw
-OKtWkwuFNtGa6miYdAng9t0snIrLFqMYSooFliWMpFMiapQecEHhu8lwF9Xlrh5p
-BAK+sbIfUHvh
-</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>
-MIIDBTCCAe2gAwIBAgIJAJrz91xEwT1DMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
-BAMMDm1ldC5yZWZlZHMub3JnMB4XDTE1MDQyMDEwMDkzN1oXDTI1MDQxOTEwMDkz
-N1owGTEXMBUGA1UEAwwObWV0LnJlZmVkcy5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCxVA8KV2TUuTjmxoUZfq3tyJrMvP+pwbTpQFjpqN3Q3FbP
-RZKREdpp41GkTFhsHc7kGZ5RHa0NLjot8tl2XuSkd55LrOffsn/p3TSavAUXPUXo
-5CnJwGi6RecoW5+VAxTWcQCE9wgxEda4NNYKJ6PUH0GXA46tepNAKcbhjuCxupfh
-/fFO0XVdmM8h5J3GLZJEvzLF5s5LSUToE7yBd9M7XPDXxIl5DG0pZeZ3cDBmVEJm
-FJPxPgUJUxwXnc3A4qb/iCgPHXqq/M3lt2I/zM/QxMWRyhXWkvUm0K7cBxPhXD1I
-sRNx/Yiy66lvtNHfIFoAW+GTQAsGigsk3lgl0J/PAgMBAAGjUDBOMB0GA1UdDgQW
-BBS15ZRED2b8svkrJ/tFGSHUVhSzVTAfBgNVHSMEGDAWgBS15ZRED2b8svkrJ/tF
-GSHUVhSzVTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCnVwczF6Hb
-bxLzHjXs4P4hLvxiYob+Rlt6lmNmLHez6QIMF/88Jn0PFmfMzRTRg9f3sI3u6G7J
-kwkfbQIj3ZJ3lk4VTQpZfoilkLhNEeo2ljyYgeUP4fbBrsC5az5VoEsUH8+QAtZ3
-cI8PbCmulGbtEgtJzs3jiRt7AjpBhiGot9HcblyF5R8V75iovFapU1sBLWTi+uZv
-w53UzzO6s6cSqo2rzA7QKuEUvsUnrB7NYy818riZ0ufFcZfWz6ApPLffVJa3M7tw
-OKtWkwuFNtGa6miYdAng9t0snIrLFqMYSooFliWMpFMiapQecEHhu8lwF9Xlrh5p
-BAK+sbIfUHvh
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://met.refeds.org/saml2/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://met.refeds.org/saml2/acs/" index="1"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Metadata Explorer Tool</md:ServiceName>
-      <md:ServiceName xml:lang="it">Metadata Explorer Tool</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Metadata Explorer Tool is a fast way to find federations, entities and his relations through entity/federation metadata file information.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Il Metadata Explorer Tool permette rapidamente di trovare le federazioni, le entità e le relazioni tra di esse nei metadati che le descrivono.</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="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: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="it">Géant Association</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Géant Association</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Metadata Explorer Tool erogato da Géant Association</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Metadata Explorer Tool provided by Géant Association</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.geant.net</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.geant.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andrea</md:GivenName>
-    <md:SurName>Biancini</md:SurName>
-    <md:EmailAddress>mailto:andrea.biancini@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Malavolti</md:SurName>
-    <md:EmailAddress>mailto:marco.malavolti@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Licia</md:GivenName>
-    <md:SurName>Florio</md:SurName>
-    <md:EmailAddress>mailto:licia.florio@geant.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Nicole</md:GivenName>
-    <md:SurName>Harris</md:SurName>
-    <md:EmailAddress>mailto:nicole.harris@geant.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IDEM</md:GivenName>
-    <md:SurName>Help</md:SurName>
-    <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 954b02f4..00000000
--- a/swamid-interfederations-2.0/meta.cesnet.cz-sp-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://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>
-    <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://eduid.cz/uri/sp-group/aa.cesnet.cz</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <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/metadata.pingdemo.com.xml b/swamid-interfederations-2.0/metadata.pingdemo.com.xml
deleted file mode 100644
index 017a4363..00000000
--- a/swamid-interfederations-2.0/metadata.pingdemo.com.xml
+++ /dev/null
@@ -1,63 +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://metadata.pingdemo.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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/hide-from-discovery</saml:AttributeValue>
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">pingdemo.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ping Identity Corporation</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.pingidentity.com</mdui:InformationURL>
-        <mdui:Logo height="99" width="99" xml:lang="en">https://www.pingidentity.com/etc/designs/pic/clientlibs-all/logos/PingIdentity_logo.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>
-MIIDFjCCAf6gAwIBAgIGAVCAYYkWMA0GCSqGSIb3DQEBCwUAMEwxCzAJBgNVBAYTAlVTMRYwFAYD
-VQQKEw1QaW5nIElkZW50aXR5MSUwIwYDVQQDExxQaW5nIElkZW50aXR5IE1ldGFkYXRhIFBpbG90
-MB4XDTE1MTAxOTEzNTQ0N1oXDTI1MTAxNjEzNTQ0N1owTDELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
-DVBpbmcgSWRlbnRpdHkxJTAjBgNVBAMTHFBpbmcgSWRlbnRpdHkgTWV0YWRhdGEgUGlsb3QwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHfKt218gkEH1yaYNBiVJoNrE15b6vlR0zFl5G
-D5LxlspO6tFJ7mBK+phN+YmMuqea0VJWWnpGqEKjEU3YoFUCfylfIUaXfeETKtB6yMMzsuYfkg42
-VulfsRs7gX243U8leMSNUFhAz6cWekh8rSWAP0hB+vpU1tnz/4N/kBHHbwazPXbIp5hOs+HTUh6S
-wHfIvJMefF3pMufaK7vXbpHAtJCzHkpApwWc4YqIqerY3TPlk+jVdSvKseWpquA6uZv0cM4lUOdm
-rJVQ3tADpMmlXMMZqZKaccAE4Fqpzi5ICeWfPCT+coiegCzYaPYMjXkI6GXyR2JXfT4Y9B/OFBqh
-AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGLJhBsarQotQdLGCM3egTQciJztzYaMlMFD01FkptTx
-bOZfQua+5A+SpKW6X/3xDxMak17cufStK6XI1wDwpX14w1yd/boyGfA6JwJm8yXVsH6BRka8BocT
-eYNazEwRpMQAZ10VxBToY0YylgegkPIEQSStqzfMzVcVL1fV/XOjpuadgNrOVkyBPJ5GUgqo6nWl
-G2k/kI222PlclPxNtmEmBze4XrOlYSWRlSbPUt/n/7NzOPjQiXnQ8/JpxGytVI4luNVr+UkU5cna
-KIiTffUkLMQHZLglzpvThH4G3l36TaVyJPEblSU1LINR9w0gc+y73yL0qDXGDeYdWTYbDuE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://metadata.pingdemo.com/idp/SSO.saml2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metadata.pingdemo.com/idp/SSO.saml2"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ping Identity Corporation</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ping Identity Corporation</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pingid.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Hans Zandbelt</md:GivenName>
-    <md:EmailAddress>hzandbelt@pingidentity.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Hans Zandbelt</md:GivenName>
-    <md:EmailAddress>hzandbelt@pingidentity.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>John Bradley</md:GivenName>
-    <md:EmailAddress>jbradley@pingidentity.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 09bcc95b..00000000
--- a/swamid-interfederations-2.0/metalib.library.qmul.ac.uk-shibboleth-sp.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://metalib.library.qmul.ac.uk/shibboleth-sp">
-  <!--
-		This is a "QMUL Metalib Service" Shibboleth SP for Queen Mary and Westfield College, University of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIFMDCCBBigAwIBAgIQCR4X+YYxugtmUqrjt8DPOjANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDcxNzAwMDAwMFoXDTE2MDcxNjIzNTk1OVowgdsxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQREwZFMSA0TlMxFzAVBgNVBAgTDkNlbnRyYWwgTG9uZG9u
-						MQ8wDQYDVQQHEwZMT05ET04xGjAYBgNVBAkTETMyNyBNaWxlIEVuZCBSb2FkMT8w
-						PQYDVQQKEzZRdWVlbiBNYXJ5IGFuZCBXZXN0ZmllbGQgQ29sbGVnZSwgVW5pdmVy
-						c2l0eSBvZiBMb25kb24xEDAOBgNVBAsTB0xpYnJhcnkxIjAgBgNVBAMTGWRyYXBl
-						ci5saWJyYXJ5LnFtdWwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQDFgBdbGL/GSo5oQqq88P2aZQsDZKGXcROQf+x9ooJAy7nZhbYjyohCyMPJ
-						Nfc541+v5+UqZgSU/GoN1s9RCPdvNkObiyEIzhBCTrTRE11H1MGJoUF0acx2jpWZ
-						0g8px6vi4mX2P/9hwVt6y9L++U6KdAoqDpG8vy1CNmyWV+b+39nn2hmGn8T/GDdJ
-						5Tg2bnA35B+H0n4M+0Ezcm/+fvexplwI31A90R7fWQryYyORlYC/mZRvDLgd7pDs
-						J8RXFNW3RAum7FHQxVsmMEYiKfobt1jLd+L7jsG+94W43dfv3s2x0Woin3douEBZ
-						tciHGAHATDTHzZcpkibQxNtROQLbAgMBAAGjggGSMIIBjjAfBgNVHSMEGDAWgBQM
-						vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU517jMU/gexoHTBO9dLm4x2eW
-						SmAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-						BQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EM
-						AQICMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-						VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-						cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-						MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMEAGA1UdEQQ5MDeCGWRyYXBl
-						ci5saWJyYXJ5LnFtdWwuYWMudWuCGm1ldGFsaWIubGlicmFyeS5xbXVsLmFjLnVr
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCK31/RCDY1vk7ZlYo2TsEMApl7BtMDHSSjBC8X
-						ynY3HufFVHn5MfOOWgd4lP8J2xkhWTrlNdN6HGWLHnyi1X83SWxeiFc8v24tIWDY
-						/l0lyk0vbTCl3WJqAlczmNCLHIIGLM6epn1zWgprydw6zh9tjKyTNTQGvpdxZm54
-						EyakhTXxRyQ8ZvhI7o0O5gdLR7G1O7TAi01VhlqYN2qZl2a1MKKMIh/in7W26lGw
-						qD1u5MIJDZI2AWzuWcbWVnG1eCS7OjS6L3VLGe42HdA/PcDTlP1Sa3fhtW0dicnN
-						lkd9ORqKnAn0Eu92u/K4wIU0zyHK7lXeeOVZsm/ErYmcGtTS
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://metalib.library.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: QMUL Metalib Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library Systems Team</GivenName>
-    <EmailAddress>mailto:lib-systems-team@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jeremy</GivenName>
-    <SurName>Acland</SurName>
-    <EmailAddress>mailto:j.acland@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jez</GivenName>
-    <SurName>Clark</SurName>
-    <EmailAddress>mailto:j.p.clark@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/metalib01vapp2.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/metalib01vapp2.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 76780226..00000000
--- a/swamid-interfederations-2.0/metalib01vapp2.hosted.exlibrisgroup.com-shib.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://metalib01vapp2.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "University of Glamorgan - Primo" Shibboleth SP for Ex Libris (UK) 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="2010-11-09T15:08:16Z">
-      <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://usw-shib.hosted.exlibrisgroup.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://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Glamorgan - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Glamorgan</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC8TCCAdmgAwIBAgIJAJPmUlsftXVuMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDm1ldGFsaWIwMXZhcHAyMB4XDTExMTAwNTEzNTc1N1oXDTIxMTAwMjEzNTc1
-						N1owGTEXMBUGA1UEAxMObWV0YWxpYjAxdmFwcDIwggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDdfV06FKaI8A9DfiUSJ+tN2ttYWY/n08jESSAsRma+m2bx
-						P+0+GGz5Sme+qeYFITXzVU3Wh/s1fNSjA7puiNC48YPWEUYwbwhbApkTU1ehIydr
-						xwYAXbgtG7oCVnapcmVFZ9JBRlBmpDFsZKMvavmVRUGuNT+clSR0SghwAT8jsvvk
-						F3P0UYniQmw5fcTzvgew9xAlI6h85CRi8VzcsByhsHzn9A5JxHBAsGSiv0xQEMMv
-						IxsuPaUyUt321O7BalJ0gJZw/8CWknc25BYwm7PNBs3GzmPum3bfIuAyFajHM1Dh
-						9TaXXra+yMnvChDvWChT3ZTdPBTqFqpn8hYogkOxAgMBAAGjPDA6MBkGA1UdEQQS
-						MBCCDm1ldGFsaWIwMXZhcHAyMB0GA1UdDgQWBBSG8M7BLbEa4/0WVcZF1lp/kPbe
-						EzANBgkqhkiG9w0BAQUFAAOCAQEAM/Ubls8cWPbwnN3//MJfiZvbRMcuBu+R9DjC
-						2l3pd0tSyUlz/uaXuJazAxpK9lcTY3aqyxIq7fF6GkfM6wU0Jb0X6YXlsiinpRDW
-						UV8FIc/S7YQVK6ELGJQOjcsvZcBbwi7rFer4ATFaScgaEn7OTvV0Zx+ShVH7sD96
-						IqCnSd6IoMcMdIapXRGwKuv2QKUDxZ+e/74CRXn5u/RSArYJs5SNEOjyRZHMU/LV
-						ea43LctyMF5lQyiiWorRb5x+uZNVl27vCwqJH/fLER4YVCe4t1Z9wjBIofK4o0Cu
-						aOUf5tN8OEv4dwRswRCl3hq7U1tERypMyPrXR1mrhlYfQutm+Q==
-					</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://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://usw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Glamorgan - Primo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Frank</GivenName>
-    <SurName>Bieber</SurName>
-    <EmailAddress>mailto:Frank.Bieber@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Frank</GivenName>
-    <SurName>Bieber</SurName>
-    <EmailAddress>mailto:Frank.Bieber@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 56ebc74a..00000000
--- a/swamid-interfederations-2.0/minosse.unime.it-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,108 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://minosse.unime.it/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-05-25T10:40:44Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unime.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">studenti.unime.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospiti.unime.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IDP University of Messina</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IDP Università degli Studi di Messina</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for University of Messina users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Messina</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unime.it/ciam_a_villari/_servizi/-27798.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unime.it/ciam_a_villari/_servizi/-27798.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unime.it/ciam_a_villari/_servizi/-27792.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unime.it/ciam_a_villari/_servizi/-27792.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="61" width="61" xml:lang="it">https://minosse.unime.it/logo2.png</mdui:Logo>
-        <mdui:Logo height="61" width="61" xml:lang="en">https://minosse.unime.it/logo2.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://minosse.unime.it/logo1.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://minosse.unime.it/logo1.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:36.597889,16.875000</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>
-MIIEETCCAvmgAwIBAgIJAJv/7OTrVdPFMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
-VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxEDAOBgNVBAcMB01lc3NpbmExHjAcBgNV
-BAoMFVVuaXZlcnNpdHkgb2YgTWVzc2luYTENMAsGA1UECwwEQ0lBTTEZMBcGA1UE
-AwwQbWlub3NzZS51bmltZS5pdDEjMCEGCSqGSIb3DQEJARYUaWRwQG1pbm9zc2Uu
-dW5pbWUuaXQwHhcNMTQxMDI4MTAzOTA2WhcNMjQxMDI3MTAzOTA2WjCBnjELMAkG
-A1UEBhMCSVQxDjAMBgNVBAgMBUl0YWx5MRAwDgYDVQQHDAdNZXNzaW5hMR4wHAYD
-VQQKDBVVbml2ZXJzaXR5IG9mIE1lc3NpbmExDTALBgNVBAsMBENJQU0xGTAXBgNV
-BAMMEG1pbm9zc2UudW5pbWUuaXQxIzAhBgkqhkiG9w0BCQEWFGlkcEBtaW5vc3Nl
-LnVuaW1lLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzE/VfNGT
-Vppi3fdQvRBuv7dK89X2U0tjm97tY+YsM9+1Rucp1jMAtQLhufi4/YV5INUqoee5
-VKNmPlpXreDv1avkzPyJ9JNaYrfp2R82zU0QNzedDmem1OIwNSrRWrBn6q+dX0az
-6ZrU0FIOqotpGEcR2duERg7oj2PTF3artDUWPDCrAEk8xiSlKNmrvgqub9v5i2pm
-ouh/In4tntRPLqctUoGFnX4A/7k3As7avQibRy5CLp0IosjKzKZXcGKPE+iJWL5M
-q5jY3C0cu4gSEXLunv3E+5/M/dx6M/D+89OMgP7YtIE/6KCMaAlv9fbWVE5A0fCK
-Q6NKLAiZKpRjhQIDAQABo1AwTjAdBgNVHQ4EFgQURgj0qpHyI0g/Z/uAs5TJhOOX
-cQgwHwYDVR0jBBgwFoAURgj0qpHyI0g/Z/uAs5TJhOOXcQgwDAYDVR0TBAUwAwEB
-/zANBgkqhkiG9w0BAQUFAAOCAQEAXTQPUKjVoqCXULCczpNyUFwq7k52toMIVsC5
-8bSb0SphuJpmBvI89L1BW8Qqd/etHn086ysTXT8cha9OV0qPatfEwUjxF7OFUmWA
-uJtL23h+6lFjJl+gg3W1LiBV722ssH/K86fBUijpGy9e6tDTb/gJKoVy3L3FGp1e
-wCu9/tEnLXz2Kf120i17a67NwuN19QH8+wFVJYNPAlzK7dMZcvzWXVK5jxNNdZ0U
-9Mr3Wb/FYQcDOucIrYdThh9//RbRTH0JMmbYhOiYXteJKOYreSwqGlZJLmfOExYx
-EXjRmsJ4xyedzAlUmmUj0WNkBA1fYmVhJ1JZqU+uRTgvL2QcPQ==
-</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>
-MIIEETCCAvmgAwIBAgIJAJv/7OTrVdPFMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
-VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxEDAOBgNVBAcMB01lc3NpbmExHjAcBgNV
-BAoMFVVuaXZlcnNpdHkgb2YgTWVzc2luYTENMAsGA1UECwwEQ0lBTTEZMBcGA1UE
-AwwQbWlub3NzZS51bmltZS5pdDEjMCEGCSqGSIb3DQEJARYUaWRwQG1pbm9zc2Uu
-dW5pbWUuaXQwHhcNMTQxMDI4MTAzOTA2WhcNMjQxMDI3MTAzOTA2WjCBnjELMAkG
-A1UEBhMCSVQxDjAMBgNVBAgMBUl0YWx5MRAwDgYDVQQHDAdNZXNzaW5hMR4wHAYD
-VQQKDBVVbml2ZXJzaXR5IG9mIE1lc3NpbmExDTALBgNVBAsMBENJQU0xGTAXBgNV
-BAMMEG1pbm9zc2UudW5pbWUuaXQxIzAhBgkqhkiG9w0BCQEWFGlkcEBtaW5vc3Nl
-LnVuaW1lLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzE/VfNGT
-Vppi3fdQvRBuv7dK89X2U0tjm97tY+YsM9+1Rucp1jMAtQLhufi4/YV5INUqoee5
-VKNmPlpXreDv1avkzPyJ9JNaYrfp2R82zU0QNzedDmem1OIwNSrRWrBn6q+dX0az
-6ZrU0FIOqotpGEcR2duERg7oj2PTF3artDUWPDCrAEk8xiSlKNmrvgqub9v5i2pm
-ouh/In4tntRPLqctUoGFnX4A/7k3As7avQibRy5CLp0IosjKzKZXcGKPE+iJWL5M
-q5jY3C0cu4gSEXLunv3E+5/M/dx6M/D+89OMgP7YtIE/6KCMaAlv9fbWVE5A0fCK
-Q6NKLAiZKpRjhQIDAQABo1AwTjAdBgNVHQ4EFgQURgj0qpHyI0g/Z/uAs5TJhOOX
-cQgwHwYDVR0jBBgwFoAURgj0qpHyI0g/Z/uAs5TJhOOXcQgwDAYDVR0TBAUwAwEB
-/zANBgkqhkiG9w0BAQUFAAOCAQEAXTQPUKjVoqCXULCczpNyUFwq7k52toMIVsC5
-8bSb0SphuJpmBvI89L1BW8Qqd/etHn086ysTXT8cha9OV0qPatfEwUjxF7OFUmWA
-uJtL23h+6lFjJl+gg3W1LiBV722ssH/K86fBUijpGy9e6tDTb/gJKoVy3L3FGp1e
-wCu9/tEnLXz2Kf120i17a67NwuN19QH8+wFVJYNPAlzK7dMZcvzWXVK5jxNNdZ0U
-9Mr3Wb/FYQcDOucIrYdThh9//RbRTH0JMmbYhOiYXteJKOYreSwqGlZJLmfOExYx
-EXjRmsJ4xyedzAlUmmUj0WNkBA1fYmVhJ1JZqU+uRTgvL2QcPQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://minosse.unime.it/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://minosse.unime.it/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Messina</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Messina</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università degli Studi di Messina</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Messina</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unime.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unime.it/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IDP</md:GivenName>
-    <md:SurName>Admin</md:SurName>
-    <md:EmailAddress>mailto:idp@unime.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mira.fapesp.br-idp-shibboleth.xml b/swamid-interfederations-2.0/mira.fapesp.br-idp-shibboleth.xml
deleted file mode 100644
index 9296c571..00000000
--- a/swamid-interfederations-2.0/mira.fapesp.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://mira.fapesp.br/idp/shibboleth">
-  <md: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>
-  </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">fapesp.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</mdui:Description>
-        <mdui:Description xml:lang="pt-br">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fapesp.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.fapesp.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID8DCCAtgCAQAwDQYJKoZIhvcNAQEFBQAwgb0xPjA8BgNVBAoTNTpGdW5kYWNh
-byBkZSBBbXBhcm8gYSBQZXNxdWlzYSBkbyBFc3RhZG8gZGUgU2FvIFBhdWxvMQww
-CgYDVQQLEwNDUEQxHzAdBgkqhkiG9w0BCQEWEGdlcmNwZEBmYXBlc3AuYnIxEjAQ
-BgNVBAcTCVNhbyBQYXVsbzESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJC
-UjEXMBUGA1UEAxMObWlyYS5mYXBlc3AuYnIwHhcNMTUwNTE5MTQxNjAzWhcNMTgw
-NTE4MTQxNjAzWjCBvTE+MDwGA1UEChM1OkZ1bmRhY2FvIGRlIEFtcGFybyBhIFBl
-c3F1aXNhIGRvIEVzdGFkbyBkZSBTYW8gUGF1bG8xDDAKBgNVBAsTA0NQRDEfMB0G
-CSqGSIb3DQEJARYQZ2VyY3BkQGZhcGVzcC5icjESMBAGA1UEBxMJU2FvIFBhdWxv
-MRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5taXJh
-LmZhcGVzcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyRIwZl
-VJ596aYBzw3ByebByIbEcGBILiLMuUADQr4sjC0NiHh5cna5wZfs7BH2bh8WTmZ/
-FYacuirW7KAz6NC6yuYlbLSQ7M6W1hoGXRQ0JzIYQRzikg0Jm/FpILXvPQgfSVSH
-gba+TsXF+tWzIJPDZzeDmeHBWr7u0HEzBFFwqLOopAxe7RP56KBCsN+fSKm8mBmb
-iXMfoZPOUOeAq+2WyqUdsUkq0FIu92zgTS6ZB3zC44u0FR2ohvUw/XLnB9UPYSnd
-UDnbG23yww4bF7Ah4mOnkP9zdx/IheTHs4BiC6yTx+XJnn6aPQeZuX51HjY+QKPJ
-mObc+xWBIW2FfrcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAYEqDA7tgO9G9yR+2
-CeKrNcS7Kmb4vzGeNKIgIINTh8uprSqtrsW3wbaqiwv6C43fbVDO+xxf7LekdO/y
-rQgP5FnL/hIN/y4cwPyFFEuAptGY1HZHFObb6h9LkjBuKaeADR3r7QiZ5kNK3S7e
-7tW9krrWIZatGePBZlrR7rkFrnQaWpz7PDyLXRqiDYt5XpfvYxthGkEGe0uXCvro
-anpkHfy+Gb5Z+cMWuI3zCoFMjorqwYPc8H1TqojQZUUhuG+mW9jeaFGS0Tnqe2gF
-CwBrpuADDIIcUgwCpkg1wrBcjFhGHSuUTCMoBOfnVky6LlFn1lSSw7cLiU9/hSlB
-W0oZpQ==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mira.fapesp.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mira.fapesp.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://mira.fapesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mira.fapesp.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mira.fapesp.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mira.fapesp.br/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">fapesp.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID8DCCAtgCAQAwDQYJKoZIhvcNAQEFBQAwgb0xPjA8BgNVBAoTNTpGdW5kYWNh
-byBkZSBBbXBhcm8gYSBQZXNxdWlzYSBkbyBFc3RhZG8gZGUgU2FvIFBhdWxvMQww
-CgYDVQQLEwNDUEQxHzAdBgkqhkiG9w0BCQEWEGdlcmNwZEBmYXBlc3AuYnIxEjAQ
-BgNVBAcTCVNhbyBQYXVsbzESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJC
-UjEXMBUGA1UEAxMObWlyYS5mYXBlc3AuYnIwHhcNMTUwNTE5MTQxNjAzWhcNMTgw
-NTE4MTQxNjAzWjCBvTE+MDwGA1UEChM1OkZ1bmRhY2FvIGRlIEFtcGFybyBhIFBl
-c3F1aXNhIGRvIEVzdGFkbyBkZSBTYW8gUGF1bG8xDDAKBgNVBAsTA0NQRDEfMB0G
-CSqGSIb3DQEJARYQZ2VyY3BkQGZhcGVzcC5icjESMBAGA1UEBxMJU2FvIFBhdWxv
-MRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5taXJh
-LmZhcGVzcC5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyRIwZl
-VJ596aYBzw3ByebByIbEcGBILiLMuUADQr4sjC0NiHh5cna5wZfs7BH2bh8WTmZ/
-FYacuirW7KAz6NC6yuYlbLSQ7M6W1hoGXRQ0JzIYQRzikg0Jm/FpILXvPQgfSVSH
-gba+TsXF+tWzIJPDZzeDmeHBWr7u0HEzBFFwqLOopAxe7RP56KBCsN+fSKm8mBmb
-iXMfoZPOUOeAq+2WyqUdsUkq0FIu92zgTS6ZB3zC44u0FR2ohvUw/XLnB9UPYSnd
-UDnbG23yww4bF7Ah4mOnkP9zdx/IheTHs4BiC6yTx+XJnn6aPQeZuX51HjY+QKPJ
-mObc+xWBIW2FfrcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAYEqDA7tgO9G9yR+2
-CeKrNcS7Kmb4vzGeNKIgIINTh8uprSqtrsW3wbaqiwv6C43fbVDO+xxf7LekdO/y
-rQgP5FnL/hIN/y4cwPyFFEuAptGY1HZHFObb6h9LkjBuKaeADR3r7QiZ5kNK3S7e
-7tW9krrWIZatGePBZlrR7rkFrnQaWpz7PDyLXRqiDYt5XpfvYxthGkEGe0uXCvro
-anpkHfy+Gb5Z+cMWuI3zCoFMjorqwYPc8H1TqojQZUUhuG+mW9jeaFGS0Tnqe2gF
-CwBrpuADDIIcUgwCpkg1wrBcjFhGHSuUTCMoBOfnVky6LlFn1lSSw7cLiU9/hSlB
-W0oZpQ==
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mira.fapesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mira.fapesp.br:8443/idp/profile/SAML1/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">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">FAPESP - Fundo de Amparo a Pesquisa do Estado de Sao Paulo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fapesp.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.fapesp.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Gerencia de Informatica</md:SurName>
-    <md:EmailAddress>gercpd@fapesp.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index 7d845e06..00000000
--- a/swamid-interfederations-2.0/mnementh.csi.cam.ac.uk-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://mnementh.csi.cam.ac.uk/shibboleth">
-  <!--
-		This is a "Test SP on mnementh.csi" Shibboleth SP for the University of Cambridge.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://mnementh.csi.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3zCCAcegAwIBAgIJAOVxp6HWm9xkMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCG1uZW1lbnRoMB4XDTA5MDIxODE3MjYzOFoXDTE5MDIxNjE3MjYzOFowEzER
-						MA8GA1UEAxMIbW5lbWVudGgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCWDFJMwCnDDlN4+JVj+jxbThz13wSWChP78LNPleUdjm1zbsQJOfcJ542EkyqM
-						7/O3TqgXES/VlkTccIfr/e86lO8AxFYeXsowEju+3AnyAXav3fL03diiRR+mWTlr
-						A0GjD6uQHlIZGce0IACh/GUc+nMxYjSZlnc/IKDF0lGrOhQdsdjasxc9daJ0HQOY
-						BXcJkFQO1m4uztNXPu/3JLYSzpLgKVY9W/24fyd9zpsPrG4xHl3D08jUovDvnENc
-						+q0gyt5TwRt28hifF9kdV+zdyTYQvKi4uOimqzt9wjSbv9xhvNa5VElt7GbiAZRE
-						OGUAj4gEbQbBhU4TLJN84h9jAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG1uZW1lbnRo
-						MB0GA1UdDgQWBBQjLNqsyE3DpyRHamNjGNFPfpd5qTANBgkqhkiG9w0BAQUFAAOC
-						AQEAGkihtfVr4oVSzPreJwViJnqosAxrnTg2rEwvTnp02Es6Vaam5M995JQkWS8x
-						vQAwCywoccsRuk02LOZ7bhP7IExPYSmzSJ3bIbXYxTJ5+36ELmxS0dETZq69c0QT
-						Xja0CXAviE3TjK3VLvemSaJWJlssPB3dGIHhJ1oulB7mG1F1gj6MY8FHtjgsjJ2k
-						jKWUyCTonkcj/j22UdaMzsBb0vOtRoDBlhtEyppm06VQFQpizV2XyH/de8R1mrNK
-						m2tWL3l+kX0MHJVAQ7i6iSXhiXCX1/ATGEPniV71u9gRMd/FQBJo9D5jTOHUpNzA
-						dvLRXByBJtURFonOb55G90gyqg==
-					</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>
-						MIIC3zCCAcegAwIBAgIJAOVxp6HWm9xkMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCG1uZW1lbnRoMB4XDTA5MDIxODE3MjYzOFoXDTE5MDIxNjE3MjYzOFowEzER
-						MA8GA1UEAxMIbW5lbWVudGgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCWDFJMwCnDDlN4+JVj+jxbThz13wSWChP78LNPleUdjm1zbsQJOfcJ542EkyqM
-						7/O3TqgXES/VlkTccIfr/e86lO8AxFYeXsowEju+3AnyAXav3fL03diiRR+mWTlr
-						A0GjD6uQHlIZGce0IACh/GUc+nMxYjSZlnc/IKDF0lGrOhQdsdjasxc9daJ0HQOY
-						BXcJkFQO1m4uztNXPu/3JLYSzpLgKVY9W/24fyd9zpsPrG4xHl3D08jUovDvnENc
-						+q0gyt5TwRt28hifF9kdV+zdyTYQvKi4uOimqzt9wjSbv9xhvNa5VElt7GbiAZRE
-						OGUAj4gEbQbBhU4TLJN84h9jAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG1uZW1lbnRo
-						MB0GA1UdDgQWBBQjLNqsyE3DpyRHamNjGNFPfpd5qTANBgkqhkiG9w0BAQUFAAOC
-						AQEAGkihtfVr4oVSzPreJwViJnqosAxrnTg2rEwvTnp02Es6Vaam5M995JQkWS8x
-						vQAwCywoccsRuk02LOZ7bhP7IExPYSmzSJ3bIbXYxTJ5+36ELmxS0dETZq69c0QT
-						Xja0CXAviE3TjK3VLvemSaJWJlssPB3dGIHhJ1oulB7mG1F1gj6MY8FHtjgsjJ2k
-						jKWUyCTonkcj/j22UdaMzsBb0vOtRoDBlhtEyppm06VQFQpizV2XyH/de8R1mrNK
-						m2tWL3l+kX0MHJVAQ7i6iSXhiXCX1/ATGEPniV71u9gRMd/FQBJo9D5jTOHUpNzA
-						dvLRXByBJtURFonOb55G90gyqg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mnementh.csi.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Test SP on mnementh.csi</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jon</GivenName>
-    <SurName>Warbrick</SurName>
-    <EmailAddress>mailto:jw35@cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jon</GivenName>
-    <SurName>Warbrick</SurName>
-    <EmailAddress>mailto:jw35@cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-shibboleth.xml
deleted file mode 100644
index 5393319d..00000000
--- a/swamid-interfederations-2.0/mobileauth.labs.jisc.ac.uk-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://mobileauth.labs.jisc.ac.uk/shibboleth">
-  <!--
-		This is a "Test Mobile Authentication Proxy" Shibboleth SP for Jisc. 
-	-->
-  <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-10-27T15:06:33Z">
-      <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://mobileauth.labs.jisc.ac.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://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAPBv1wp/OCGRMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGlwLTE3Mi0zMS0yMC0yMzAwHhcNMTQxMDA4MTcyNzQzWhcNMjQxMDA1MTcy
-						NzQzWjAbMRkwFwYDVQQDExBpcC0xNzItMzEtMjAtMjMwMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAt3TRLhrGfSXumBs5SmnJC+yfA3rqF/QD4fZw9v/d
-						SveQkvvyrExRLkxDCIM2k1zxyKsZcn4IS9teBOUYcPFi75NPSQUqpUkeBEoW15+g
-						1CKDgVtwMcCEDubppfov27Js9Dx1+AAtd6o/UWpZiGo+dmDNCIKZuABGZN1jGXRU
-						VcmsnV83kuxclC+lBBk6t+U9WXI1LJNo3VNBm5F57vH/gLlou+/Js9Vt6fyDcpOq
-						FTj1ge4O8kZZIB+YeIJXA4oEVgPKXrLpnMDQZp5xtued7cX2IWwartY78doRaurm
-						bCHlsHljJ226bteRxbr2e1P95sLDXAkhCPndoNbltAHpxQIDAQABoz4wPDAbBgNV
-						HREEFDASghBpcC0xNzItMzEtMjAtMjMwMB0GA1UdDgQWBBSZ7kmarCHOt+GFQsqa
-						F9DvVFNEmDANBgkqhkiG9w0BAQUFAAOCAQEAMXl2SEg4EN0e7qsLuBUiF3x/fP6w
-						jd1aW4RQEN5DOfgZ01AK80g1VXbIv1LTg1/Sm2x5q3BZX1oC+jsBGFUgx/F8RQVY
-						78G97m2m3DVY1D2fehCLYsDcgqVBo2LukhlBL6VbUdJhN+uJVklg5IBPI9ETxijK
-						gndnJMwOxMc+buHndoeVlAs/X55FdDs5zLMb0h4e9VbYCG1aCKWsF3ECJFhp87sv
-						0FZvRG6zm2EPpEqSV0oXoY+IPMPisIDSO5jm3Y49W50XW19KVc0oeoPpfsatzvq/
-						8J/wFQ9AjU02BhtkFOyzvJznUQqbPG+SpHHO9++dYfjF/Arkr9f8mZzLxA==
-					</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://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mobileauth.labs.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Jisc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Test Mobile Authentication Proxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Webb</SurName>
-    <EmailAddress>mailto:m.webb@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Webb</SurName>
-    <EmailAddress>mailto:m.webb@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 b61a0ee4..00000000
--- a/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://monitor.eduroam.org/sp/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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">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://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:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">eduroam supporting services</mdui:DisplayName>
-        <mdui:Description xml:lang="en">eduroam supporting services include: eduroam database, CAT, monitoring, F-Ticks</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://monitor.eduroam.org/sp/CoC/privacystatement_en.html</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>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 d57fb00f..00000000
--- a/swamid-interfederations-2.0/monitor.eduroam.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:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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 registrationAuthority="http://www.aaiedu.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>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEfDCCA2SgAwIBAgIQTdxQXYGAzoPdJJ3pR03JNjANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTExMDgyMzAwMDAwMFoXDTE0MDgyMjIzNTk1OVowVDELMAkGA1UEBhMCTkwxFTATBgNVBAoTDFNVUkZuZXQgQi5WLjEQMA4GA1UECxMHZWR1cm9hbTEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNtb25pdG9yLmVkdXJvYW0ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBEgy308qogrKuvyrPvpFOE7M1twTnJ+cxxkhnezYwDxQpwOOKzyEFazD93r8AYdUieFUqwkz8xtiPzXoQE3jwEajFZoqhIU+LXnXICqX9ZkHExlIwKqbq8bf0T2S8C60jRT52T+i3fcjDTAPi4nGQd/az21IUpHfgAl95D1Geg8LN2kijNkGVuH10dk6wUk0JStmMSrbkI+PC8uE+0ig1HvZ5E0pgo1JFfdo4s+daElwa5FpBYQ+z9uXC+DsdZd4ycRLV/yQJZSzIi69aeive5oIDwlijBDcAohZRfUU+Efv0ltr3/iYFUXnXmEXW8oruKFYLiaQ6Hd+ZqlgFdVIJQ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEfDCCA2SgAwIBAgIQTdxQXYGAzoPdJJ3pR03JNjANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTExMDgyMzAwMDAwMFoXDTE0MDgyMjIzNTk1OVowVDELMAkGA1UEBhMCTkwxFTATBgNVBAoTDFNVUkZuZXQgQi5WLjEQMA4GA1UECxMHZWR1cm9hbTEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNtb25pdG9yLmVkdXJvYW0ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBEgy308qogrKuvyrPvpFOE7M1twTnJ+cxxkhnezYwDxQpwOOKzyEFazD93r8AYdUieFUqwkz8xtiPzXoQE3jwEajFZoqhIU+LXnXICqX9ZkHExlIwKqbq8bf0T2S8C60jRT52T+i3fcjDTAPi4nGQd/az21IUpHfgAl95D1Geg8LN2kijNkGVuH10dk6wUk0JStmMSrbkI+PC8uE+0ig1HvZ5E0pgo1JFfdo4s+daElwa5FpBYQ+z9uXC+DsdZd4ycRLV/yQJZSzIi69aeive5oIDwlijBDcAohZRfUU+Efv0ltr3/iYFUXnXmEXW8oruKFYLiaQ6Hd+ZqlgFdVIJQ</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: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"/>
-      <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>monitor@eduroam.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/moodle.fsp.uni-lj.si-sp-201411192359.xml b/swamid-interfederations-2.0/moodle.fsp.uni-lj.si-sp-201411192359.xml
deleted file mode 100644
index 8b3aef67..00000000
--- a/swamid-interfederations-2.0/moodle.fsp.uni-lj.si-sp-201411192359.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:algsupport="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:req="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://moodle.fsp.uni-lj.si/sp/201411192359">
-  <md:Extensions>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <algsupport:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <algsupport:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://aai.arnes.si" registrationInstant="2014-11-21T15:11:09Z">
-      <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <req:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UL - Faculty of Sports</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sl">Univerza v Ljubljani Fakulteta za šport</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FSP Moodle</mdui:Description>
-        <mdui:Description xml:lang="sl">FSP Moodle</mdui:Description>
-        <mdui:Keywords xml:lang="en">FSP Moodle</mdui:Keywords>
-        <mdui:Keywords xml:lang="sl">FSP Moodle</mdui:Keywords>
-        <mdui:Logo height="300" width="300">data:image/png;base64,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</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.fsp.uni-lj.si</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sl">http://www.fsp.uni-lj.si</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>Fakulteta za sport, ponudnik storitve moodle</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=Fakulteta za sport\, ponudnik storitve moodle,L=Ljubljana,C=SI</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfzCCA2egAwIBAgIFLuUK5icwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCU0kxEjAQBgNVBAcMCUxqdWJsamFuYTE1MDMGA1UEAwwsRmFrdWx0ZXRhIHphIHNwb3J0LCBwb251ZG5payBzdG9yaXR2ZSBtb29kbGUwHhcNMTQxMTE5MDk1MzQ2WhcNMTYxMTA4MDk1MzQ2WjBYMQswCQYDVQQGEwJTSTESMBAGA1UEBwwJTGp1YmxqYW5hMTUwMwYDVQQDDCxGYWt1bHRldGEgemEgc3BvcnQsIHBvbnVkbmlrIHN0b3JpdHZlIG1vb2RsZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALK3QSuPOg4kuzt6vH1kcUEDI1Szreg9eMDIDlJ3JD4XJjJZFdgMl4HTp96zQh/AQrLF9Z2DCIqe1/eeG9aufBU7TKS1g2y7kUj53NF9d5xjgts/xlkRXb962CD3UugwcPsJScR3CiWlnFpRWw7vSBYBo/yaN6/TR7LG1195J360HuAx02E6HcqlteHc7n4QujHraB/arafCwIRDt9H3kmhiiRaW2QnlQxi7NVIOspGDtQhjMZs/+Hfb/RGiVEnFSVKl43lELHDa+hXMwnkWZfpWfnAaRku96FXLkxo4ycRKrdr5v5lSRbFQ47B3yhemt7R3deqmTHimTaUjsM6rztbXir12hDlk2OBqFXnrgl5kx/aRpgVLODOkmSOrpT8I7SkVHKXmDGUIY62RVRcYenlGixeH8JM2wuTba77mluaesea+OgDW0CDINXy4qVxxGg5rPXZvQNC9eRQzWPk9YAksk/tndSQPHM53AREm95ov5vQUP0mu+Z/J37pzCTwPrj4/luZka9Nkhqy9hDljnXyWqjagXJqhcJMm5PjinfCveoiwri1YPD1CJlRnLQiuaMoJVv6PRfwkqDMQp6pYbwohyRkiTJt9X/TYilmrjLenacBD90ByCdKd/1LUUcy1wlxKmzISPwCJZpQdCC1d0FwxI+jX0yYd/++vW3wa01fVAgMBAAGjUDBOMB0GA1UdDgQWBBTCOuEP6Bdx8zqqRkiGioMWbutLsDAfBgNVHSMEGDAWgBTCOuEP6Bdx8zqqRkiGioMWbutLsDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4ICAQARjG6usg8fOKQQCjEoV29JapGhXNnFT2UmbTUvZyyyjGUVonJ0kSd++gBm7JgO6C5xRrVkgWstRBopdNqeeu8INwzWQHuMIhD7+skvRGiCC6VDP+BEquS5zYOPcg9MZwDk4Nbt5jTaMOV/6wNUaArT32kHuc1X1tgVYFXvL4x0/qCtjaKEIi7PeWuwcTmr4ODvLhKPUi/5sKTrQioJWErETN3RGR5xCMdvu3ij6YnnY4o11xDlbsG+zTjzZotrbMEtMDpsZvFtLP7kocmbyJBVzIU+IwWmFxeKjJO80OCDY3lbvYiJ75uhl85HOyM8uauafnqTU4YQ2Eitf94+JsZI2d7faCLez4vaT/cBsdbtPpEeBcMkMh3eMdNIJ9HsFejeGesfllgivvbVzy+B0WFEPEQag1QnTmeu0CKVqlF9ShTziTO7ulowIbbbH9ZWw6IVl0APTMLjDBfTlMNfHea8xyC/kU5HiIPgZyg1G0yv5k2goaMzPCNs78/SIoKd6E91rsKVHnGEDF1xi1N8YqwzD5rG9SsPunioqOz0ISw83bV60yZtxv7tMO0htxZLMuZ+M/Im2CPbDhLB03r2a9CX6eILGGXjFvIEFKv2MbiXYr1Jopl/6ZvS2YuzzT8/8UfOYaqBG5uuSS7X1ZCa1rAMrEf6QbyDSoIMTwgeDel6Lg==</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://moodle.fsp.uni-lj.si/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodle.fsp.uni-lj.si/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">UL - Faculty of Sports</md:ServiceName>
-      <md:ServiceName xml:lang="sl">Univerza v Ljubljani Fakulteta za šport</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">FSP Moodle</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sl">FSP Moodle</md:ServiceDescription>
-      <md:RequestedAttribute Name="sn"/>
-      <md:RequestedAttribute Name="givenName"/>
-      <md:RequestedAttribute Name="mail"/>
-      <md:RequestedAttribute Name="eduPersonPrincipalName"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Univerza v Ljubljani Fakulteta za šport</md:OrganizationName>
-    <md:OrganizationName xml:lang="sl">Univerza v Ljubljani Fakulteta za šport</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Univerza v Ljubljani Fakulteta za šport</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sl">Univerza v Ljubljani Fakulteta za šport</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fsp.uni-lj.si</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sl">http://www.fsp.uni-lj.si</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Milan</md:GivenName>
-    <md:SurName>Žvan</md:SurName>
-    <md:EmailAddress>mailto:dekanat@fsp.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:rc@fsp.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Matej</md:GivenName>
-    <md:SurName>Lekše</md:SurName>
-    <md:EmailAddress>mailto:matej.lekse@fsp.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Matej</md:GivenName>
-    <md:SurName>Lekše</md:SurName>
-    <md:EmailAddress>mailto:milan.zvan@fsp.uni-lj.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Advant</md:GivenName>
-    <md:SurName>Advant</md:SurName>
-    <md:EmailAddress>mailto:metod.skufca@advant.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Matej</md:GivenName>
-    <md:SurName>Lekše</md:SurName>
-    <md:EmailAddress>mailto:matej.lekse@fsp.uni-lj.si</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 3a2261f4..00000000
--- a/swamid-interfederations-2.0/moodle.helsinki.fi.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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="fi">Helsingin yliopiston Moodle-oppimisalusta.</mdui:Description>
-        <mdui:Description xml:lang="en">University of Helsinki Moodle learning management system.</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>MIIEcTCCA1mgAwIBAgIQZ3qaJ5vyDQkY0Z0ySvjH7zANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQxNTAwMDAwMFoXDTE1MDUwNTIzNTk1OVowQDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJtb29kbGUuaGVs
-c2lua2kuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5hMbyr8sl
-2fWDeqpjpV9Sx01N6DH1MvfDtcGgC8CAcgXEc1a0JRTeGQf7NPPMEAsjiOdU8BFC
-1GTTClKDrgvCw48/PrdKU0YY9cQEu7k6lBJRykQbv2lt+avzMyu27yRX7nyna6qL
-IqP7oPveqZ0mbD4HDw5UvXGV+oI6i3sXI/+EYzcK2rXN1psKHwE8bByae1rBVi0j
-KXKiIIofW5gX9I+qMU3nHBTWzkYvZ3TFbiERg28QeyNQPFG5sEYnx73aHyfNMcbD
-wwKsLRrPJOr0/CfAmrB2JBoJglpC0Tut08TOmiO/HBmC/eWu9ig51u5/hWYPpJqL
-Oa9xgtQPfv2LAgMBAAGjggFvMIIBazAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
-V0fqkOO57TAdBgNVHQ4EFgQUt6ybzdJCLbK9B+0tJvjeMJw2EUwwDgYDVR0PAQH/
-BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
-BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
-MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
-Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
-Y3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEm1vb2RsZS5oZWxzaW5raS5m
-aTANBgkqhkiG9w0BAQUFAAOCAQEAl6bqKn4WN8Op1/X/a1OuI+cFgYp3Mw6TBAhe
-KFa417gI/DNmvXlqjLu3aVNPsuOtgUW6Pq4gS65SWYnK6OxIa/ldPuPDou/hXdu2
-8KsiVkhFhPLgHpXRBeW7id7bYgoxAG3tlQgOQkAwue3livCgLGIZaV/eOdLq475f
-Tgk6Mj/lAlmuNwY87Uch5V5JjsWe+sHl7dzcQIZfFFGEwS75dBSYv3+I+UJYV6H8
-Hc7YZ7u5G1zd6T43mdmC3EuLiV2tiGHWcflRnabUH4Q89dPRjKR57YmIBr0tQ42b
-xOnjwN+/aD6pbl0TUZiPIcYi0vo7nF+k2TGS+FvQ4VoWPdOWYQ==</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 969b9461..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">Abo 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">Abo 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/mp.uu.se-Shibboleth.sso.xml b/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.xml
deleted file mode 100644
index bcaec26a..00000000
--- a/swamid-interfederations-2.0/mp.uu.se-Shibboleth.sso.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://mp.uu.se/Shibboleth.sso">
-  <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.swamid.se/category/hei-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</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">
-    <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://mp.uu.se/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Medarbetarportalen vid Uppsala universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala university</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medarbetarportalen är ett intranät för anställda vid Uppsala universitet, men är även åtkomlig för studenter och externa användare</mdui:Description>
-        <mdui:Description xml:lang="en">The Staff Portal (Medarbetarportalen) is an intranet for employees at Uppsala University, but it's also available for students and external users</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/web/support/om-mp</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mp.uu.se/web/support/om-mp</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC3zCCAcegAwIBAgIJAKpDmQ/flLdVMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-BAMTCG1wLnV1LnNlMB4XDTEyMTAxMTE0NTAyOFoXDTIyMTAwOTE0NTAyOFowEzER
-MA8GA1UEAxMIbXAudXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCvr+kBJ2UuNB0YitaXHig2ksWqvlio4e3zfQpQUVM97ING6GwaLtHFBVuOyKgI
-UD5VbxE0f3ex33z1v4tOZrDzsHN+btVImK6hRs08jl1iWsvPgrxM5sT0l0HHdP11
-NnksCj3/P6FwApPMu/hPGsMiDUuzUGIsKer2gZkcuR5VudY6D3xjEzxqcNu77rjg
-oXLFr8Khl6W1qSC2/6DofcyAzdukK/Pj28xmZ9iWMVGAiDC1G5EMDa71CaOhAAlF
-pKBOeo85ctSHdWJxZcx37EdJ7YB7W0E5bMeHpUAMcgsCsaqrYhXopMqo2CySol9i
-wUqTzgHB0yM6ZrqyKoZ/O7SnAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG1wLnV1LnNl
-MB0GA1UdDgQWBBR3asu+pkmaby5q/Gu+oVaWIzRoWDANBgkqhkiG9w0BAQUFAAOC
-AQEAC7DqIlOLe7BHTLteri038WO0MqGgQ1RHXhginDAEx+UekwD1P5UIxZaqnkQf
-isCyOw10y5ZhSoc5FCNYA1EDRUKHAabivcRBbrL6GXi14KUTOORnUmMLzUgeuAlq
-w7f1NHlFokb1v7FvN/WKxf37z8Cy49Sfg9Hg6lv+jNobb5lSBjwnTICfCl+ffdFu
-xHXT67mQsDSoiBiExsGPjtqxbrVy2v9WV1Oup6UjXIgOacpaDNErD1XzAkQP6LD4
-t9uEzq8Qiu8ImRG9SyPDd76umF5tLtg53EHaK1o2LnSU4CyjsnUX5Np1l13rMKaR
-Ohr8KLKt6tC/JZ059e8ENxrN7g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mp.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mp.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mp.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Medarbetarportalen vid Uppsala universitet</md:ServiceName>
-      <md:ServiceName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala university</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:liferay-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/msjc.instructure.com-saml2.xml b/swamid-interfederations-2.0/msjc.instructure.com-saml2.xml
deleted file mode 100644
index 40c0a10b..00000000
--- a/swamid-interfederations-2.0/msjc.instructure.com-saml2.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="http://msjc.instructure.com/saml2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">OEI - Mt. San Jacinto College - Canvas</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.canvaslms.com/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.canvaslms.com/policies/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="220" width="220" xml:lang="en">https://canvas.instructure.com/images/canvas/header_canvas_logo@2x.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE8TCCA9mgAwIBAgIJAOBms/PYWcPLMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-VQQGEwJVUzENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkx
-GTAXBgNVBAoTEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsTCk9wZXJhdGlvbnMx
-IDAeBgNVBAMTF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
-FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE1MDQxNTAxMDAwMFoXDTE3MDQyMjAx
-MDAwMFowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRVdGFoMRcwFQYDVQQHEw5T
-YWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
-CxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
-IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDckDPQGWedlVGC2Z9fn1wNFmN+0IPNi6OSE1nM
-voTWx2oZlQepaAu4zI5QqOfnV0rW2V1volpoJbu0WelH0DkGzdOEQdWJjAs3nRBf
-y0evxtpg0tK5kIvGsnN6YcD41YmkfWzvwbMf0cEq1Y0wCmymF6XzOUUE4zsi0nhP
-m2Z7WiuongDQdR01UsDN13YcpD/i1JXr3YtkNnJ/a1Kc9OXNycI8M5NVo5QQgdx/
-Q7zAmTk8p9E0ZRthdOQ/PBicWx39mNmBij5KpqCWlHu3NWdgcG8KXSv5atXU8Crd
-TRJ3aGIEN9vBYIHe8MHGCzs1QlRfJmXFMkeUSOTnJJx78rMDAgMBAAGjggEUMIIB
-EDAdBgNVHQ4EFgQUo0WWVlJ1SxZOs11L85ZAuZGyuzEwgeAGA1UdIwSB2DCB1YAU
-o0WWVlJ1SxZOs11L85ZAuZGyuzGhgbGkga4wgasxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIEwRVdGFoMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5z
-dHJ1Y3R1cmUsIEluYzETMBEGA1UECxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2Fu
-dmFzIFNBTUwgQ2VydGlmaWNhdGUxIjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVj
-dHVyZS5jb22CCQDgZrPz2FnDyzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
-A4IBAQBV3EmmnzYqYQ5fXNZymG2WaspEW0NeFMhDXa3p3AMIQJbnnU14lR7bqIvf
-/bLW1YE0fw1kSzsw8VrkQp7k1U+kaYA3i5/FQBy2WtqUCVq2GXZA2gs5YD4nvJB/
-F57E//0kEhbATZH9+wJqDkqyIgsrSIlJjiXDth1BppGK8weboPtr9sWV24Ui0+ls
-w16XTsGlnRRO19g+gXKOZp5ApXkDrB+HwZQvZxiCuSgvJlcBzMdxVvWSL+vPtg8Y
-shIKzobIhaQ2MzXHLcxrDhW10YFPwDXh8Tfn5iU9ONsaJivuvVhtDYZD1ZzSoPpm
-q4vYqxxY/6rFJhrCtnlLepSaxlXM
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://msjc.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://msjc.beta.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://msjc.test.instructure.com/login/saml/logout"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://msjc.instructure.com/saml_consume" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://msjc.instructure.com/login/saml" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://msjc.beta.instructure.com/saml_consume" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://msjc.beta.instructure.com/login/saml" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://msjc.test.instructure.com/saml_consume" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://msjc.test.instructure.com/login/saml" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">OEI - Mt. San Jacinto College - Canvas</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Instructure, Inc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Instructure, Inc</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.instructure.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml b/swamid-interfederations-2.0/muse.jhu.edu-shibboleth.xml
deleted file mode 100644
index 8c97358d..00000000
--- a/swamid-interfederations-2.0/muse.jhu.edu-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://muse.jhu.edu/shibboleth">
-  <!--
-		This is a "Project MUSE" Shibboleth SP for Johns Hopkins University.
-	-->
-  <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="2012-02-24T14:57:13Z"/>
-  </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>
-						MIIDtTCCAp2gAwIBAgIJAJsinS4vDTq8MA0GCSqGSIb3DQEBCwUAMHExCzAJBgNV
-						BAYTAlVTMREwDwYDVQQIDAhNYXJ5bGFuZDESMBAGA1UEBwwJQmFsdGltb3JlMQ0w
-						CwYDVQQKDARKSFVQMRUwEwYDVQQLDAxQcm9qZWN0IE1VU0UxFTATBgNVBAMMDG11
-						c2Uuamh1LmVkdTAeFw0xNTA4MTgyMTA0MzRaFw0yMDA4MTYyMTA0MzRaMHExCzAJ
-						BgNVBAYTAlVTMREwDwYDVQQIDAhNYXJ5bGFuZDESMBAGA1UEBwwJQmFsdGltb3Jl
-						MQ0wCwYDVQQKDARKSFVQMRUwEwYDVQQLDAxQcm9qZWN0IE1VU0UxFTATBgNVBAMM
-						DG11c2Uuamh1LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJqS
-						/g/BqhsCoRpoq427pZFAq0MkP2VvDkUYmMlq3njNGMcvMxtxnra7hWAySwiodE2O
-						4H+puUlMjVvYHoDQr9/n2rysPQx9OiOP/8GKgV36GNIcy0WuUXO+JY/dAlLaV/ah
-						s+UILC7SJ40cMhj/+EcdaOYMDrdI+ZA+e6XM+oHfOWFkUaCpih+TKQheFQnnAnWY
-						EMzYtXtGbemPtJJ/0vevvqR9bFYJE+eTsJ9rBS/nnBBqbJ3V5krdRNUmsa0u/Mlj
-						t5fomwzCIAIVnKFXBuCjMLNEkSUYZK29hmHOEvts1pyxAWtgY0rxOp70CT9E3hhY
-						xRhOFjjp9dosBFO1Ee0CAwEAAaNQME4wHQYDVR0OBBYEFAvC4mzMXcwfdOwWLpah
-						8/peibBpMB8GA1UdIwQYMBaAFAvC4mzMXcwfdOwWLpah8/peibBpMAwGA1UdEwQF
-						MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAB7tTBcm1rYwJk8yosLkC4kBbeow8GCq
-						9Ap+ddnjEJPll7M44cx7yj7rW34/NFl9BTohmDkMtnLE+zWFErvJMOX5pQWLOGKt
-						P/fsfcHjpnd8H7UhmF5986mzB1HsZP+F2Nbvuv+WuDiIXdb4eM0zjliJ/Jvqbzkt
-						5yXSiJJfqpwnhMYNkVNJ/Igt88gxU4aggYla4Iw15R0K71Vqcvr++ukcM/ynRXU2
-						oHZUC5SuhcR2dJp7Ot3j1UHJB8ZQk3128v33S2ConZWqkw1WvXiav1kuocWsv0Lk
-						sDIRUBUgNv1n6knfP5PLUiQlE5tt4yG1ZbXdDhCJ4Qho8vNNZkTx00c=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://muse.jhu.edu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://muse.jhu.edu/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muse.jhu.edu/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://muse.jhu.edu/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://muse.jhu.edu/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://muse.jhu.edu/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://muse.jhu.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://muse.jhu.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://muse.jhu.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://muse.jhu.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://muse.jhu.edu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://muse.jhu.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Johns Hopkins University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Project MUSE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://muse.jhu.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Project MUSE</GivenName>
-    <EmailAddress>mailto:muse@press.jhu.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Malloy</SurName>
-    <EmailAddress>mailto:malloy@jhu.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/my.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/my.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index cf558882..00000000
--- a/swamid-interfederations-2.0/my.sbs.ox.ac.uk-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://my.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Said Business School Intranet" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-09T08:52:26Z"/>
-  </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://my.sbs.ox.ac.uk/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://my.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAJVRvogczC70MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD215LnNicy5veC5hYy51azAeFw0xMzA0MDUxODIxMzFaFw0yMzA0MDMxODIx
-						MzFaMBoxGDAWBgNVBAMTD215LnNicy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAOFMWOnq7etNEDgCmE/lKHlcRvPpQph0V4Zf2G9zNixO
-						ZeHhw5ZSSQVtMSj+3Yyfnl1RVFdlux0YHe/0uVk670Duqs+i3ulxTVWo4MXv5iq7
-						xbnBuiK4mez3+MDPE49LR5Txz+MiHUsbIVmcZcIksxPWgyZuD4d/d4MtpYqwpk99
-						WoD55Ng9GOae2bBZnS26qPAKp0aDG7pV6NvQ2dXuqpZMi/+8j+UiemP2aDyjIvF0
-						xu/8/1kIX2QsTn6+/A6qfJd+byEkUef1/Q8HHmTka3b10NbiGzJFXXyvWvyCyPVA
-						tDIMj/jOfziE0z9VFqpZkbrbJfpgshYpUEN2mf85tvsCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPbXkuc2JzLm94LmFjLnVrMB0GA1UdDgQWBBQ32HmqAoYtyy9Syo+ReOhH
-						Uh5bQzANBgkqhkiG9w0BAQUFAAOCAQEAhwjVQiw60XvGioiZEAtJn88u3X9lkkuQ
-						MTDQoZt1OIXu5gPJe/W5LmiWLjcTVrFLRwQQndTjki/HKkyU0U6HCIvRaqW4M/ac
-						KDIDFuCQugN5b7kHGdG5ak78bGzGvaZSuNcZqG+QtfA5rxhqtYcmyin9+S4xDaJk
-						nXlI0zEE1GXi6UVPNu6WQDYniwSK5EQ53ZrO/shYSX04+mbfkZCnIdOLpQZbQy/K
-						AYcgSvCKfLTGV/yTREOHBqv8AXsIk85z9io8dztQliPAu5qvUz+nNpjZuV4z5/HG
-						JAQyJQOynWStb4SGfCYSIs0ujtdolEQkpG3EPehVm2fslcYEveqUHQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://my.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Aaron</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-shibboleth.xml b/swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-shibboleth.xml
deleted file mode 100644
index 1b2f8f97..00000000
--- a/swamid-interfederations-2.0/myconcern.thinkiteducation.co.uk-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://myconcern.thinkiteducation.co.uk/shibboleth">
-  <!--
-		This is a "MyConcern ThinkIT Integrated Demo Site" Shibboleth SP for One Team Logic Ltd.
-	-->
-  <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="2014-12-12T09:37:03Z">
-      <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://myconcern.thinkiteducation.co.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">MyConcern ThinkIT Integrated Demo Site</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The MyConcern ThinkIT Integrated Demo Site is used for demonstrating the joined up ThinkIT solution</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAKF0PyvuaE7mMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHRoaW5rLW15Yy0wMS5zZXJlbi5sb2NhbDAeFw0xNDEyMDkxMTQwMTJaFw0y
-						NDEyMDYxMTQwMTJaMCMxITAfBgNVBAMTGHRoaW5rLW15Yy0wMS5zZXJlbi5sb2Nh
-						bDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAP5SUqhHh8zasv2aaTdf
-						jkchvuKO0YzniwI3PNBg9NpL+cNiDyzQ/Qk9X625jQBj7rMD+IIR2XVg4SLChTjK
-						S/+bkNDmq1eki/4pHQH/91fkOIscLpJvhp7OyGOKzWqors7REAWnJw1EeTurrV0B
-						RXpX5wQLBnV8zKfEyBG12Q5nIP7LDg/+YRDV2EKYeLVcYWzgDzdi2xnRwuUigeiF
-						00uMF+AWeen+0kjr9YNUnDbaECJ42m+DCjRGNuZ/Ty4hcCMXTlm1PoHQZf8B/CTj
-						QQFx1VbMKUwtfLSF52TGH76iu21oIIuyS8AmHPyacEH1hjOkRgsO6odLo98AoBxO
-						egkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYdGhpbmstbXljLTAxLnNlcmVuLmxvY2Fs
-						MB0GA1UdDgQWBBQ6KbEs1aIG7ZMKVkd2A/hR3MlT/zANBgkqhkiG9w0BAQUFAAOC
-						AQEAO9Oe6XOW3B2zdbT8ayBlxGcHiOorP7GcE5nf6WI1h4FpWub11HIm+N3Wn+lI
-						KlhihanbVe4My9QTwk67di82CDzjWSqVQe33rUiDyt9vG26XhPDM6znyzaJHD9V+
-						CZ0ucm1cXKLna5recIfbZC1ezYWvQqQIaAQQ1rCuvGr8vB8W21dPnEMKORKJTOOd
-						zXvof96kNX/JUr7jBRfw+XTgNZKgJGR3U8GlOKO1f6g/A9eLAoqzeb0s+Rtllczv
-						2RMdnVWWAjZaLLMOTVmBF8ndB3CUurWfisv2GBVTHsmgKVtbUdHIS6o8NlQdnPk3
-						9AfqjY3J5+HrbC8v/CbVhkudJw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://myconcern.thinkiteducation.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://myconcern.thinkiteducation.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">One Team Logic Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MyConcern ThinkIT Integrated Demo Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oneteamlogic.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nick</GivenName>
-    <SurName>Bennett</SurName>
-    <EmailAddress>mailto:nick.bennett@logicsoftware.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Tucker</SurName>
-    <EmailAddress>mailto:ian.tucker@logicsoftware.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/myid.vsc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/myid.vsc.edu-idp-shibboleth.xml
deleted file mode 100644
index 9e68f8d4..00000000
--- a/swamid-interfederations-2.0/myid.vsc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,61 +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://myid.vsc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">vsc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Vermont State Colleges</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>
-MIIDGzCCAgOgAwIBAgIUD6kNBlkvLeU+Ol2757c+7bZtM+owDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMbXlpZC52c2MuZWR1MB4XDTExMDMwODE4Mzk0NFoXDTMx
-MDMwODE4Mzk0NFowFzEVMBMGA1UEAxMMbXlpZC52c2MuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjh2UuMgWBZd1oChzFEAL9rnhrNGkCkFLfd/t
-oXVdsfB3/lDMohSlVQx03w5NU6bBVdp5r2/1g9lLt/HjV5iWmseBHcYDNKWwZJPH
-8wyQcVhdE5l+lK96WT6NhLja3IF80FnnSAS4W5HzJZ/oDbmzOptFQ44FpW3Cc1+D
-4+/amvGi/X2ZskbKEJps72w5kwwdX+nkmVNS8yHxl1piaH9EpCDOC1Q6dvpLKW+5
-bP+ma9VCknf4DczevKwl9D34VjEwqhgzUzj1XT9epFt5TwS7twZ4ah+KRLJY0+TS
-Lod76ZIBXYWYUBzIY8ApGxSQdwe39caDCvQPT5FC2hdG4wNSkQIDAQABo18wXTA8
-BgNVHREENTAzggxteWlkLnZzYy5lZHWGI2h0dHBzOi8vbXlpZC52c2MuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBS5IqaDTgcD2zkQ/40nLl8VXF949TANBgkq
-hkiG9w0BAQUFAAOCAQEAEge54ojY4avoyKVObeH4W4rz1WnaZCnJTQZBg5L+HDFm
-kvCp5ZpDMX0SvhxSfzImkP1EJuIlFszenvOpre5yzAmKLOCQKlaZYVxmMUVluB3c
-jC2Adkr9u5/y7vPDSH2padWGJP93Lk47t4/Wm0jHiBfEbzyx1F7UyLBaHm8Loqg9
-5dxdgKh8HQyuYqZNVlQezI5yIpQ+WLS1+Sa3eL8d34W1BM9pH+KNFwStDGTz61ns
-RyWSF4HaRliCJYEx5UlVZInGVkbyfqqZ0CSuABmOQ9qRwMnChkZEmIDZXqKk+N3f
-zaSlyhw6JsSB9BNAjScXmtSxUEZPmEmocxbfadzWAw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://myid.vsc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://myid.vsc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://myid.vsc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://myid.vsc.edu/idp/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Vermont State Colleges</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Vermont State Colleges</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vsc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Richard Blood</md:GivenName>
-    <md:EmailAddress>rick.blood@vsc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Schrader</md:GivenName>
-    <md:EmailAddress>john.schrader@vsc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml b/swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml
deleted file mode 100644
index 0e9e5be9..00000000
--- a/swamid-interfederations-2.0/mylogin.uni-freiburg.de-shibboleth.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mylogin.uni-freiburg.de/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:10Z">
-      <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>
-  </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-freiburg.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Albert-Ludwigs-Universität Freiburg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Albert-Ludwigs-Universität Freiburg</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Die Universität Freiburg bietet mit myLogin einen zentralen Authentifizierung- und Autorisierungsdienst an. Technische Basis ist ein Shibboleth Identity-Provider. &lt;a href="https://mylogin.uni-freiburg.de/" target="_blank"&gt;Weitere Informationen...&lt;/a&gt;</mdui:Description>
-        <mdui:Description xml:lang="en">Die Universität Freiburg bietet mit myLogin einen zentralen Authentifizierung- und Autorisierungsdienst an. Technische Basis ist ein Shibboleth Identity-Provider. &lt;a href="https://mylogin.uni-freiburg.de/" target="_blank"&gt;Weitere Informationen...&lt;/a&gt;</mdui:Description>
-        <mdui:Logo height="16" width="16">https://mylogin.ub.uni-freiburg.de/themes/freiburg/icons/unilogo-16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="42">https://mylogin.ub.uni-freiburg.de/themes/freiburg/icons/unilogo-42x60.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.uni-freiburg.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uni-freiburg.de/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGcTCCBVmgAwIBAgIHGHFzy9wsiTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMN
-UmVjaGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZI
-hvcNAQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTE0MTAzMDA4MjYzNVoX
-DTE5MDcwOTIzNTkwMFowgckxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1X
-dWVydHRlbWJlcmcxETAPBgNVBAcTCEZyZWlidXJnMR4wHAYDVQQKExVVbml2ZXJz
-aXRhZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVr
-MSAwHgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJ
-ARYXbXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC/4V8eOGGiBsPa7LGWLaZV7yWmlNpUEO+PBvGLCTDy2HtomaOj
-yg+feJIOV6GKbj0Bq0gdQdxjsajzArpQfdyLbVn4xrzTovg/AB8/AuWxgG9c8G2v
-c/px4b/gn4C0PSlftJ1YL+K9cvKHcVE17F/jSBs/3KAmXG7NhSASFBqlug2bsbTE
-MWyIjYWrKGbvOkJdFh7xNOiiCQLLOfFnzBHcnT7Y2w7gIQ9+5WtFymxXBioY+u95
-QhjxRlLPauAOgs2tpLBAU3How+aveQozCrOfCwbvdk3bvjogYLaxX/Haf7pQl0vq
-WBTb29b1XR+/4O/BNFWcrBXtIQI68LAK4fWfAgMBAAGjggKdMIICmTBPBgNVHSAE
-SDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYB
-BAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFCeoJkCh
-YyKHWqzcL2F6FcLnK+7xMB8GA1UdIwQYMBaAFDNnqdbxk1U2rKEyvcHkljn/THAx
-MF0GA1UdEQRWMFSCHW15bG9naW4tcWEudWIudW5pLWZyZWlidXJnLmRlghpteWxv
-Z2luLnViLnVuaS1mcmVpYnVyZy5kZYIXbXlsb2dpbi51bmktZnJlaWJ1cmcuZGUw
-gY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkt
-ZnJlaWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNy
-bDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBj
-YS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NhY2VydC9nX2NhY2Vy
-dC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZy
-ZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUA
-A4IBAQAqWNfHU8krriggd2mwdlKnKQE3N6IvFSC9uzXmYxRp4Q6z6livfsyRGOx8
-DJxxnc0fqnOr0gAXzROyKZ4g+7EFeoS98Fe5UErT5DgPn3KlHJtzv/8lky9jhhdk
-CYfwNJY59oC1n7fbwbUvMLF4U5y8GJm+U8vsM8cz7qwowWZZj3h8PQc3+uJ3x8Rt
-qXz4mnXddU62dCd7gK51BrBKiKybynvkPqHKpzsQuqJkvUor0akWs/sNC4JPTVge
-OiaMHLVeayf2tdRhxKcvVr7cAQpfwYM36BpAYn2bl7CXiyrHT79ZbYWu9UJnUE0j
-BvSLKfixDbm6WbObPgh+5qnIJT3Y
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mylogin.ub.uni-freiburg.de:8443/idp2/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mylogin.ub.uni-freiburg.de:8443/idp2/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://mylogin.ub.uni-freiburg.de/idp2/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://mylogin.ub.uni-freiburg.de/idp2/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mylogin.ub.uni-freiburg.de/idp2/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">uni-freiburg.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGcTCCBVmgAwIBAgIHGHFzy9wsiTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMN
-UmVjaGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZI
-hvcNAQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTE0MTAzMDA4MjYzNVoX
-DTE5MDcwOTIzNTkwMFowgckxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1X
-dWVydHRlbWJlcmcxETAPBgNVBAcTCEZyZWlidXJnMR4wHAYDVQQKExVVbml2ZXJz
-aXRhZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVr
-MSAwHgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJ
-ARYXbXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQC/4V8eOGGiBsPa7LGWLaZV7yWmlNpUEO+PBvGLCTDy2HtomaOj
-yg+feJIOV6GKbj0Bq0gdQdxjsajzArpQfdyLbVn4xrzTovg/AB8/AuWxgG9c8G2v
-c/px4b/gn4C0PSlftJ1YL+K9cvKHcVE17F/jSBs/3KAmXG7NhSASFBqlug2bsbTE
-MWyIjYWrKGbvOkJdFh7xNOiiCQLLOfFnzBHcnT7Y2w7gIQ9+5WtFymxXBioY+u95
-QhjxRlLPauAOgs2tpLBAU3How+aveQozCrOfCwbvdk3bvjogYLaxX/Haf7pQl0vq
-WBTb29b1XR+/4O/BNFWcrBXtIQI68LAK4fWfAgMBAAGjggKdMIICmTBPBgNVHSAE
-SDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYB
-BAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF
-4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFCeoJkCh
-YyKHWqzcL2F6FcLnK+7xMB8GA1UdIwQYMBaAFDNnqdbxk1U2rKEyvcHkljn/THAx
-MF0GA1UdEQRWMFSCHW15bG9naW4tcWEudWIudW5pLWZyZWlidXJnLmRlghpteWxv
-Z2luLnViLnVuaS1mcmVpYnVyZy5kZYIXbXlsb2dpbi51bmktZnJlaWJ1cmcuZGUw
-gY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmkt
-ZnJlaWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNy
-bDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBj
-YS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NhY2VydC9nX2NhY2Vy
-dC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZy
-ZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUA
-A4IBAQAqWNfHU8krriggd2mwdlKnKQE3N6IvFSC9uzXmYxRp4Q6z6livfsyRGOx8
-DJxxnc0fqnOr0gAXzROyKZ4g+7EFeoS98Fe5UErT5DgPn3KlHJtzv/8lky9jhhdk
-CYfwNJY59oC1n7fbwbUvMLF4U5y8GJm+U8vsM8cz7qwowWZZj3h8PQc3+uJ3x8Rt
-qXz4mnXddU62dCd7gK51BrBKiKybynvkPqHKpzsQuqJkvUor0akWs/sNC4JPTVge
-OiaMHLVeayf2tdRhxKcvVr7cAQpfwYM36BpAYn2bl7CXiyrHT79ZbYWu9UJnUE0j
-BvSLKfixDbm6WbObPgh+5qnIJT3Y
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mylogin.ub.uni-freiburg.de:8443/idp2/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://mylogin.ub.uni-freiburg.de:8443/idp2/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">e14</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e14</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Albert-Ludwigs-Universität Freiburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Albert-Ludwigs-Universität Freiburg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-freiburg.de/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>myLogin</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:mylogin@uni-freiburg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>myLogin</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>mailto:mylogin@uni-freiburg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Bernd</md:GivenName>
-    <md:SurName>Oberknapp</md:SurName>
-    <md:EmailAddress>mailto:bo@ub.uni-freiburg.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/mylogin.uni-freiburg.de.xml b/swamid-interfederations-2.0/mylogin.uni-freiburg.de.xml
deleted file mode 100644
index 00396ead..00000000
--- a/swamid-interfederations-2.0/mylogin.uni-freiburg.de.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://mylogin.uni-freiburg.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-freiburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfTCCBGWgAwIBAgIECwSA/TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MDkxMDA4NDIyM1oXDTEy
-MDkwODA4NDIyM1owgZkxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMSAw
-HgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJARYX
-bXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCcCCnqbYEm/MUqLZOZzOIldcuRsLQMxg+OTAbkzOffYjc+Nv8eZB2d
-C7Ir+tXAg8VLw25GeIwqEypfbZUmH+kL6DbvStjTlIfiacdVuiTCPjrBJjW0Cbkv
-PKjF7y6+zlC6DgcTtyspXz/wrqg65rj6CQnRBSUWJJr/Gr/hyQbsJNpQrcz+SvH5
-YovmcxceMTwQoOUmXRbwiZ4IHS2vORXHPLvXcPH1ok6m9BvcchCq/PTafZc+jb7h
-JDKtJcop/k3N/ThhjNG12vhrAqu/zflSUwN8cLK9XSpaWbwaWfd0WvmMjuccugAQ
-vqjnAM0lHNz8jNBfUK127YtBorrr1KXzAgMBAAGjggHcMIIB2DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFLPJRRSfL3EI+ZZzFtFMA4HUF7frMB8GA1UdIwQYMBaAFDNnqdbxk1U2
-rKEyvcHkljn/THAxMCIGA1UdEQQbMBmBF215bG9naW5AdW5pLWZyZWlidXJnLmRl
-MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
-LWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1
-cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AJpdZjWvvwjD2Gt+P48Ab9JfuIjar3uz37CbQc1+DInjVJgWGzjhRyjLsJKLuAy6
-QRsWZ8YGLZGv7KhLZyEGIhlJDoB1jDsf22mcIT9uDKhq+JC4XbFd59FuihSfWTKT
-i5Eeok6oLGqN229dPDjPEbLs06s+ecIy9UwTexsSmD0qjUCAJgQupI2pOWeNhpw+
-tWHYbQYYQMjSHXmip0+tARpl/nIe0usMFGAdkDXnw/OwyFanHdwWvLUmKJJHUB6G
-w/gKdispD1t7/n/INb8BdDuqHXn90ft6ymtGFL3ktyLU6FwdiexcVLw7mky+WG56
-2ERqngwPct4mRDp6O58BlZ4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfTCCBGWgAwIBAgIECwSA/TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MDkxMDA4NDIyM1oXDTEy
-MDkwODA4NDIyM1owgZkxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMSAw
-HgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJARYX
-bXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCcCCnqbYEm/MUqLZOZzOIldcuRsLQMxg+OTAbkzOffYjc+Nv8eZB2d
-C7Ir+tXAg8VLw25GeIwqEypfbZUmH+kL6DbvStjTlIfiacdVuiTCPjrBJjW0Cbkv
-PKjF7y6+zlC6DgcTtyspXz/wrqg65rj6CQnRBSUWJJr/Gr/hyQbsJNpQrcz+SvH5
-YovmcxceMTwQoOUmXRbwiZ4IHS2vORXHPLvXcPH1ok6m9BvcchCq/PTafZc+jb7h
-JDKtJcop/k3N/ThhjNG12vhrAqu/zflSUwN8cLK9XSpaWbwaWfd0WvmMjuccugAQ
-vqjnAM0lHNz8jNBfUK127YtBorrr1KXzAgMBAAGjggHcMIIB2DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFLPJRRSfL3EI+ZZzFtFMA4HUF7frMB8GA1UdIwQYMBaAFDNnqdbxk1U2
-rKEyvcHkljn/THAxMCIGA1UdEQQbMBmBF215bG9naW5AdW5pLWZyZWlidXJnLmRl
-MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
-LWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1
-cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AJpdZjWvvwjD2Gt+P48Ab9JfuIjar3uz37CbQc1+DInjVJgWGzjhRyjLsJKLuAy6
-QRsWZ8YGLZGv7KhLZyEGIhlJDoB1jDsf22mcIT9uDKhq+JC4XbFd59FuihSfWTKT
-i5Eeok6oLGqN229dPDjPEbLs06s+ecIy9UwTexsSmD0qjUCAJgQupI2pOWeNhpw+
-tWHYbQYYQMjSHXmip0+tARpl/nIe0usMFGAdkDXnw/OwyFanHdwWvLUmKJJHUB6G
-w/gKdispD1t7/n/INb8BdDuqHXn90ft6ymtGFL3ktyLU6FwdiexcVLw7mky+WG56
-2ERqngwPct4mRDp6O58BlZ4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mylogin.uni-freiburg.de:8443/idp/mylogin/Artifact" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://mylogin.uni-freiburg.de/idp/mylogin/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-freiburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfTCCBGWgAwIBAgIECwSA/TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MDkxMDA4NDIyM1oXDTEy
-MDkwODA4NDIyM1owgZkxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMSAw
-HgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJARYX
-bXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCcCCnqbYEm/MUqLZOZzOIldcuRsLQMxg+OTAbkzOffYjc+Nv8eZB2d
-C7Ir+tXAg8VLw25GeIwqEypfbZUmH+kL6DbvStjTlIfiacdVuiTCPjrBJjW0Cbkv
-PKjF7y6+zlC6DgcTtyspXz/wrqg65rj6CQnRBSUWJJr/Gr/hyQbsJNpQrcz+SvH5
-YovmcxceMTwQoOUmXRbwiZ4IHS2vORXHPLvXcPH1ok6m9BvcchCq/PTafZc+jb7h
-JDKtJcop/k3N/ThhjNG12vhrAqu/zflSUwN8cLK9XSpaWbwaWfd0WvmMjuccugAQ
-vqjnAM0lHNz8jNBfUK127YtBorrr1KXzAgMBAAGjggHcMIIB2DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFLPJRRSfL3EI+ZZzFtFMA4HUF7frMB8GA1UdIwQYMBaAFDNnqdbxk1U2
-rKEyvcHkljn/THAxMCIGA1UdEQQbMBmBF215bG9naW5AdW5pLWZyZWlidXJnLmRl
-MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
-LWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1
-cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AJpdZjWvvwjD2Gt+P48Ab9JfuIjar3uz37CbQc1+DInjVJgWGzjhRyjLsJKLuAy6
-QRsWZ8YGLZGv7KhLZyEGIhlJDoB1jDsf22mcIT9uDKhq+JC4XbFd59FuihSfWTKT
-i5Eeok6oLGqN229dPDjPEbLs06s+ecIy9UwTexsSmD0qjUCAJgQupI2pOWeNhpw+
-tWHYbQYYQMjSHXmip0+tARpl/nIe0usMFGAdkDXnw/OwyFanHdwWvLUmKJJHUB6G
-w/gKdispD1t7/n/INb8BdDuqHXn90ft6ymtGFL3ktyLU6FwdiexcVLw7mky+WG56
-2ERqngwPct4mRDp6O58BlZ4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>mylogin.uni-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=mylogin@uni-freiburg.de,CN=mylogin.uni-freiburg.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFfTCCBGWgAwIBAgIECwSA/TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MDkxMDA4NDIyM1oXDTEy
-MDkwODA4NDIyM1owgZkxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMSAw
-HgYDVQQDExdteWxvZ2luLnVuaS1mcmVpYnVyZy5kZTEmMCQGCSqGSIb3DQEJARYX
-bXlsb2dpbkB1bmktZnJlaWJ1cmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCcCCnqbYEm/MUqLZOZzOIldcuRsLQMxg+OTAbkzOffYjc+Nv8eZB2d
-C7Ir+tXAg8VLw25GeIwqEypfbZUmH+kL6DbvStjTlIfiacdVuiTCPjrBJjW0Cbkv
-PKjF7y6+zlC6DgcTtyspXz/wrqg65rj6CQnRBSUWJJr/Gr/hyQbsJNpQrcz+SvH5
-YovmcxceMTwQoOUmXRbwiZ4IHS2vORXHPLvXcPH1ok6m9BvcchCq/PTafZc+jb7h
-JDKtJcop/k3N/ThhjNG12vhrAqu/zflSUwN8cLK9XSpaWbwaWfd0WvmMjuccugAQ
-vqjnAM0lHNz8jNBfUK127YtBorrr1KXzAgMBAAGjggHcMIIB2DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFLPJRRSfL3EI+ZZzFtFMA4HUF7frMB8GA1UdIwQYMBaAFDNnqdbxk1U2
-rKEyvcHkljn/THAxMCIGA1UdEQQbMBmBF215bG9naW5AdW5pLWZyZWlidXJnLmRl
-MIGPBgNVHR8EgYcwgYQwQKA+oDyGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5p
-LWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwQKA+oDyGOmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwgagGCCsGAQUFBwEBBIGbMIGYMEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1
-cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AJpdZjWvvwjD2Gt+P48Ab9JfuIjar3uz37CbQc1+DInjVJgWGzjhRyjLsJKLuAy6
-QRsWZ8YGLZGv7KhLZyEGIhlJDoB1jDsf22mcIT9uDKhq+JC4XbFd59FuihSfWTKT
-i5Eeok6oLGqN229dPDjPEbLs06s+ecIy9UwTexsSmD0qjUCAJgQupI2pOWeNhpw+
-tWHYbQYYQMjSHXmip0+tARpl/nIe0usMFGAdkDXnw/OwyFanHdwWvLUmKJJHUB6G
-w/gKdispD1t7/n/INb8BdDuqHXn90ft6ymtGFL3ktyLU6FwdiexcVLw7mky+WG56
-2ERqngwPct4mRDp6O58BlZ4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://mylogin.uni-freiburg.de:8443/idp/mylogin/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Freiburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Freiburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Hans-Adolf</GivenName>
-    <SurName>Ruppert</SurName>
-    <EmailAddress>ruppert@ub.uni-freiburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>myLogin</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mylogin@uni-freiburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.xml
deleted file mode 100644
index 7d3c3d5d..00000000
--- a/swamid-interfederations-2.0/namidp.services.uu.nl-nidp-saml2-metadata.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://namidp.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.surfnet.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">soliscom.uu.nl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uu.nl</shibmd:Scope>
-      <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 (NetIQ)</mdui:Description>
-        <mdui:Logo height="36" width="108">https://static.surfconext.nl/logos/idp/uu.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">utrecht university uu</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">utrecht university uu</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/dd83d3078a00c0103c00102b7d61c479"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Universiteit Utrecht</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Universiteit Utrecht</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Universiteit Utrecht</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Universiteit Utrecht</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.uu.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.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/naming.ja.net-bcp-dns-shibboleth.xml b/swamid-interfederations-2.0/naming.ja.net-bcp-dns-shibboleth.xml
deleted file mode 100644
index f56fecf4..00000000
--- a/swamid-interfederations-2.0/naming.ja.net-bcp-dns-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://naming.ja.net/bcp-dns/shibboleth">
-  <!--
-		This is a "Janet Naming Service (BCP)" 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#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="2014-04-11T14:10:32Z">
-      <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://bcp-naming.ja.net/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://bcp-naming.ja.net/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://bcp-domainregistry.jisc.ac.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://bcp-naming.ja.net/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://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJAKvL1FR4I0BGMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCWJjcDAwNDI3OTAeFw0xMTEyMDcxMjE3MzBaFw0yMTEyMDQxMjE3MzBaMBQx
-						EjAQBgNVBAMTCWJjcDAwNDI3OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAON8mrdgSPpMs4dHJC6hBIE10lGEzsoS35vckVgFUoyhMfHZEJu2t9SVTC0T
-						GUGYIyArxQt0KSK1qHHGw+2l99xPLEH2rMAiR4JCyeer9EvQrN/mn+aERKMNX8Dd
-						mXIoM/8rqIvqA3ftE/c3H/+C3hKvTRbN7wpG9Vam/olfkujCljqd9Ve4y+uokGry
-						6rqi+5IKcb/FM8ARfZ1uFWOzUj1+THWEJgC2w8dkquMUUlYNylOvdBrY6PTeTGmh
-						EItXPsq/P1fx2hn23vahUDelahUDgE7vQY0h4DlF2iRJSV6+zfVw51cgxUZ67xko
-						jDYNPpKD1QA4x9NsIwZ7sTpVPqUCAwEAAaM3MDUwFAYDVR0RBA0wC4IJYmNwMDA0
-						Mjc5MB0GA1UdDgQWBBRasuhXna2QNf3yqFpBP2RC5kpfTDANBgkqhkiG9w0BAQUF
-						AAOCAQEA4Lepl7qoBfXJZ7t4zmd5ihlIuGEiFIlXBKiAtQYiPmK0ADxYHn87f1qq
-						5i1/Hmx9jLXSmtts1uCzotkRtvYrrJRMWfUKiyPbfhRjy7rvx57VVe568QYpRKia
-						xk86+ZRKnckWG/jo5EFFhGrjBEh+Puw+9a/RqHf7C371HF0QmQA7isNGE0n9o28p
-						Pvz4RA25T97WH7AHcdNy5uokObzKg8lI3FqM8YFDWk6RPyq5lZzhftcNfU148nyH
-						gvNqP58O7WCznLitHB+FV1vK1NNKTN5uCD1Uohm/vE3kGTb009KkzLMSnmArOiM8
-						61C72Um8LiBt1IJwhXSvB7eOST78dw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://bcp-naming.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-naming.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-naming.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcp-naming.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-naming.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bcp-naming.ja.net/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcp-domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bcp-naming.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Janet Naming Service (BCP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Janet Corporate Service Desk</GivenName>
-    <EmailAddress>mailto:corporate.servicedesk@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Janet Corporate Service Desk</GivenName>
-    <EmailAddress>mailto:corporate.servicedesk@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml b/swamid-interfederations-2.0/naming.ja.net-dns-shibboleth.xml
deleted file mode 100644
index a7e03d78..00000000
--- a/swamid-interfederations-2.0/naming.ja.net-dns-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://naming.ja.net/dns/shibboleth">
-  <!--
-		This is a "Janet Naming Service" 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#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="2011-12-16T16:13:54Z">
-      <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://naming.ja.net/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming.ja.net/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://domainregistry.jisc.ac.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://naming.ja.net/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://domainregistry.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Jisc Domain Registration Service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Jisc Domain Registration Service</mdui:Description>
-        <mdui:Logo height="72" width="350">https://domainregistry.jisc.ac.uk/dns/Images/federation-sp-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
-						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAKyGnAXQpTnriKaVLhBxB2V01KEV7JFljb6JyCUgmPzhjozQV78Lt6wnrlVE
-						PMJUFzx6MhVOOFdmoud9f4uEt3eLeNNBkXy6F1hLsK93MmEq7NycC9f+RTGkXuI9
-						ZZ6bHpCQg4cgLlo+e+oSmyFrqdwHkKXRxhx7sLDpmrBRt4WS1Yom/sf1roaj/HYJ
-						I09jwKfl5mlFhWqHoprT6zHYZ/q4HIgo8CYFzRPTBYP2WoakD87P3UPpVZj6uLAz
-						d8LCuv1ZX2HJTHYrUyEM4tbqA2cv/CN8W6cgTkm5puZAMvPmFeNnoQlkBnUpH/oc
-						oGDmT026FyBGQ6yXva1uZVOX0xMCAwEAAaM3MDUwFAYDVR0RBA0wC4IJaGFyMDAz
-						OTE4MB0GA1UdDgQWBBQST9Pog/haMAhYi8W9rY0cKz3XfjANBgkqhkiG9w0BAQUF
-						AAOCAQEAERDcKAB+oNKMF14ys3MjR7NgPZzAnxNjyDizDMsPug9ZqfXKTfU1NFZx
-						nx1ihIXHOBZgLU4RKLJSopHZ57V+HlOebXCckx/je1y4a30B0sIg3yk9ZZlMNcVI
-						JWEIEGc6kkIhgQBMAtTaae+Yd1gqk4MQBQG08iDy9M3E4jp3BmgZbJL2lBYwCoRc
-						U2soIdQNoQS5WDuqwDVXqOljUfijVZU9YRpjPDsXqDQDVO+7v/EbPxVtRThQChxY
-						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
-						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://naming.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming.ja.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming.ja.net/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://domainregistry.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://naming.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naming.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://naming.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://naming.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Janet Naming Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>JANET NAMING</GivenName>
-    <EmailAddress>mailto:naming@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>JANET NAMING</GivenName>
-    <EmailAddress>mailto:naming@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml b/swamid-interfederations-2.0/naming.ja.net-dns-test-shibboleth.xml
deleted file mode 100644
index 3c88621a..00000000
--- a/swamid-interfederations-2.0/naming.ja.net-dns-test-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://naming.ja.net/dns-test/shibboleth">
-  <!--
-		This is a "Janet Naming Service (test)" 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#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="2011-12-16T16:13:54Z">
-      <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:Logo height="72" width="350">https://domainregistry-test.jisc.ac.uk/dns-test/Images/federation-sp-logo.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">JISC Domain Registration Service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">JISC Domain Registration Service</mdui:Description>
-      </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://naming-test.ja.net/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://naming-test.ja.net/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://domainregistry-test.jisc.ac.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://naming-test.ja.net/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://domainregistry-test.jisc.ac.uk/Shibboleth.sso/Login" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
-						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAKyGnAXQpTnriKaVLhBxB2V01KEV7JFljb6JyCUgmPzhjozQV78Lt6wnrlVE
-						PMJUFzx6MhVOOFdmoud9f4uEt3eLeNNBkXy6F1hLsK93MmEq7NycC9f+RTGkXuI9
-						ZZ6bHpCQg4cgLlo+e+oSmyFrqdwHkKXRxhx7sLDpmrBRt4WS1Yom/sf1roaj/HYJ
-						I09jwKfl5mlFhWqHoprT6zHYZ/q4HIgo8CYFzRPTBYP2WoakD87P3UPpVZj6uLAz
-						d8LCuv1ZX2HJTHYrUyEM4tbqA2cv/CN8W6cgTkm5puZAMvPmFeNnoQlkBnUpH/oc
-						oGDmT026FyBGQ6yXva1uZVOX0xMCAwEAAaM3MDUwFAYDVR0RBA0wC4IJaGFyMDAz
-						OTE4MB0GA1UdDgQWBBQST9Pog/haMAhYi8W9rY0cKz3XfjANBgkqhkiG9w0BAQUF
-						AAOCAQEAERDcKAB+oNKMF14ys3MjR7NgPZzAnxNjyDizDMsPug9ZqfXKTfU1NFZx
-						nx1ihIXHOBZgLU4RKLJSopHZ57V+HlOebXCckx/je1y4a30B0sIg3yk9ZZlMNcVI
-						JWEIEGc6kkIhgQBMAtTaae+Yd1gqk4MQBQG08iDy9M3E4jp3BmgZbJL2lBYwCoRc
-						U2soIdQNoQS5WDuqwDVXqOljUfijVZU9YRpjPDsXqDQDVO+7v/EbPxVtRThQChxY
-						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
-						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://naming-test.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming-test.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naming-test.ja.net/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://domainregistry-test.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://naming-test.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naming-test.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://naming-test.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Janet Naming Service (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>JANET NAMING</GivenName>
-    <EmailAddress>mailto:naming@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>JANET NAMING</GivenName>
-    <EmailAddress>mailto:naming@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/napier-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/napier-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 0b2a53b0..00000000
--- a/swamid-interfederations-2.0/napier-shib.hosted.exlibrisgroup.com-shib.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://napier-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is an "Edinburgh Napier University - Primo" Shibboleth SP for Ex Libris (UK) 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-25T10:14:28Z">
-      <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://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Edinburgh Napier University - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Edinburgh Napier University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJALjiKNTZ3VmHMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMDIwHhcNMTQwNjI0MTcxNjM0WhcNMjQwNjIxMTcxNjM0WjASMRAw
-						DgYDVQQDEwdhaW8wMDAyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						0NHNpqzxRZEUmqRAPecaMNEk3LHrAoN6YR/8d+4JrHvkwY3PQYhFZUHjqcP02fwy
-						9UEoelEWltX0QAnLlKFu2uiHVcm+5lhJ4vZqUmoYhtuqfaYcCmYi59ejY72uUP9c
-						aqd8duyC5kh8vKio4zHfuGPtlvc/Uoyw8tcBoDq/u+3NBCrSjZKh8+nW7HWhdJ2l
-						g59HWZwLUo2iZUqicyQo57Ahut6YYl8guO3EBLg7pwtq/hdHydq5QGaAd0tbOOYt
-						V4Y32/BLWUuChN4n/BDLCEYaeJUQ1dyKuMu4uOKJtQ2C3cWgDBk6sA316QvHhfTY
-						vCrmCekrNXTVoRGy09icywIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDAyMB0G
-						A1UdDgQWBBRzYEI+CDBGccK525266LYvcGwuljANBgkqhkiG9w0BAQUFAAOCAQEA
-						a/j2gPQbZ7lzb8OthFIBt4ktulrb1rwBHpvv4BvtJ6VtM1uJMwGilVVba6mczihR
-						k3sLeicALw06cqkgzGjSv8gLHBD1c06sRiTPh4YHdJKGpKRrS4quCnv7/9Eu7Use
-						DT5R2cNjNfBIavipSX0HeP6I8ZUDvfZc2IeC1r/J6I29YD23siyMXkCE+cahWaj8
-						dhTPVvq/avtplWKyECD0Mnf3r/NmLbjyc1e3nXCsYE+kMCWWe4Q+g4yWxXmrOS3Q
-						rPegVeBmWMHONjT6JVorvLFa37FCt7QvpZFLX5D2uv46b118DT1WCVayN1MBBqb2
-						cIIz4hKEyHd/FjV5wSc0dw==
-					</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://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://napier-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Edinburgh Napier University - Primo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/naxos.queens.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 2b726150..00000000
--- a/swamid-interfederations-2.0/naxos.queens.ox.ac.uk-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://naxos.queens.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Naxos Music Site" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-22T15:10: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://naxos.queens.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAL977jDe7lTRMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGhvb3QucXVlZW5zLm94LmFjLnVrMB4XDTExMDkxOTE0MzgwNVoXDTIxMDkx
-						NjE0MzgwNVowHzEdMBsGA1UEAxMUaG9vdC5xdWVlbnMub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUf1Kw2V+k8E3SpgVw20dkkKaTgreb
-						cEaSH9iWBFQwX7kSmLRTgABVGVb80BK44pJ5ob0Fi0N5yC6ZftuAVst2p4CEVege
-						APdglPc5cY49vWQs6P12qaYUe9T/USrpJsWBC2h6Q4yfF4ZpKqZ+S6roCjx0RN+Z
-						Nt/E/v1YhBOWxzDS1XLFkIh7bmkZMXiwEQHIJ8eHvyAHaDPJ+FBEsQBgwFozHD5D
-						OBwCKfu9MC1XkzitnSK7VmKCTKQNMpCjKzHlvv/YAu3+Gpc1+IFZsmFvm3ClMUwO
-						bft0pv0h6LvlOpfsYHdK79DezjOFIC1ErI9GT3jtzq0XAAP7S6AtXwOXAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFGhvb3QucXVlZW5zLm94LmFjLnVrMB0GA1UdDgQWBBSB
-						1rkdpl832bWJL72XQwzSvahSpDANBgkqhkiG9w0BAQUFAAOCAQEAReq3JOhtVKTQ
-						mtSaPD5CCtKYphLumrMiGEc3ANhlnxqbi3sjcGKemaj7vKt1XvpGiIYioMLa5Vhh
-						+48n4V4dwaCPYmwORCo/sQMdyQ5bUEAONX0kqsdY23fOLfdm8EBdNYEVWoVHgWPb
-						meJXz3xzYE+vlimyl5qbv1nVYZo/y8U5cclOUJ2mnrUILpTqaKlm6D94xMVtvJ0d
-						wPg715M2n27ESKdvOZHoH25/GASFleHihcIxhKTq2AFHr+G1OjzuSBS0/SZbkvub
-						pce4A1Yh2scVlAkDZTwf4fSnjM5RVNvhl8LGJvgDzWwJOYXIRYnSmkY93lliTvSz
-						aAJiV4ZfqQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://naxos.queens.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: The Queen's College Naxos Music Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.queens.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Queen's College IT Support</GivenName>
-    <EmailAddress>mailto:it-support@queens.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Queen's College IT Support</GivenName>
-    <EmailAddress>mailto:it-support@queens.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml b/swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.xml
deleted file mode 100644
index b58c0dec..00000000
--- a/swamid-interfederations-2.0/ncidp.northamptoncollege.ac.uk-entity.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://ncidp.northamptoncollege.ac.uk/entity">
-  <!--
-		This is a Shibboleth IdP for Northampton College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-13T16:40:47Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">northamptoncollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEoDCCA4igAwIBAgIJAOT4d4eEJbV+MA0GCSqGSIb3DQEBCwUAMIHQMQswCQYD
-						VQQGEwJHQjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEUMBIGA1UEBxMLTm9y
-						dGhhbXB0b24xHDAaBgNVBAoTE05vcnRoYW1wdG9uIENvbGxlZ2UxFTATBgNVBAsT
-						DElDVCBTZXJ2aWNlczEnMCUGA1UEAxMebmNpZHAubm9ydGhhbXB0b25jb2xsZWdl
-						LmFjLnVrMTIwMAYJKoZIhvcNAQkBFiNqYW1lcy5wdXR0QG5vcnRoYW1wdG9uY29s
-						bGVnZS5hYy51azAeFw0xNTEwMTMxNDExNDVaFw0yNTEwMTAxNDExNDVaMIHQMQsw
-						CQYDVQQGEwJHQjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEUMBIGA1UEBxML
-						Tm9ydGhhbXB0b24xHDAaBgNVBAoTE05vcnRoYW1wdG9uIENvbGxlZ2UxFTATBgNV
-						BAsTDElDVCBTZXJ2aWNlczEnMCUGA1UEAxMebmNpZHAubm9ydGhhbXB0b25jb2xs
-						ZWdlLmFjLnVrMTIwMAYJKoZIhvcNAQkBFiNqYW1lcy5wdXR0QG5vcnRoYW1wdG9u
-						Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANbu
-						caFPJVOxagi79pEbQd3g1Sllcz/RkvQ0c9nNIo0q0ot/wJBuI7Saed3n8K9JN88p
-						IFUMDKm4ab6/Qew0jlLQ9z6sGaqS+5Xo/ygfhGLVHjz44u39/BdH32f7WdlK/xUY
-						XZ6VKyrKd9FkuCETN9lDjIL8WxP/S75SMDktV2CtBEduPeDUJHddGTZkLNv2Teap
-						+O77BNTc12ANm9tFUGhbcGfL1wy4sF6Vf8UB0zeVF+i0RW32+MzxwHyk2vlDucEm
-						SauXGf4T0AfxImX+vmGGPThYlNZ/AG4kQVOiam1mrfmul4jBHFzqM7yKYvNRB6qx
-						ODSfbhDMioJBY7NrD8UCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
-						HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFHZdedyK
-						6163lDdT27eFFX+Uh6LLMB8GA1UdIwQYMBaAFHZdedyK6163lDdT27eFFX+Uh6LL
-						MA0GCSqGSIb3DQEBCwUAA4IBAQALfGtb9Y7VF0SvOtzXEJgYCj7thHke6Gm/DUZg
-						rQZMpjapBfQR03gA6ZI97QyXSi3/oLbkHyZ0Am29FfEkhA413QyM7GUxSc686qPR
-						qzwnMfMSdHHYmD/qDBw1Q1PgqUAG9gopI3vVrmiziJb6C+DOfmQsBOSbiuYf0uQn
-						eX6JQkh13433cjVu8J1J/PWuAeiAOMs2rtQIYjmzG3loSdZQZydLjVccfXq6WNxG
-						vwbKJVEkvsYuI45d1pFmPe1x/UVFTl5EmqFEVkU8S+bpv3vM6WiY/UGkT+9IeFhV
-						hhpHWzv4wbV80Eh9ixIti4pfMo8IxIQReLGddhW/H9A7dwK5
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ncidp.northamptoncollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ncidp.northamptoncollege.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://ncidp.northamptoncollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ncidp.northamptoncollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ncidp.northamptoncollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ncidp.northamptoncollege.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">northamptoncollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEoDCCA4igAwIBAgIJAOT4d4eEJbV+MA0GCSqGSIb3DQEBCwUAMIHQMQswCQYD
-						VQQGEwJHQjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEUMBIGA1UEBxMLTm9y
-						dGhhbXB0b24xHDAaBgNVBAoTE05vcnRoYW1wdG9uIENvbGxlZ2UxFTATBgNVBAsT
-						DElDVCBTZXJ2aWNlczEnMCUGA1UEAxMebmNpZHAubm9ydGhhbXB0b25jb2xsZWdl
-						LmFjLnVrMTIwMAYJKoZIhvcNAQkBFiNqYW1lcy5wdXR0QG5vcnRoYW1wdG9uY29s
-						bGVnZS5hYy51azAeFw0xNTEwMTMxNDExNDVaFw0yNTEwMTAxNDExNDVaMIHQMQsw
-						CQYDVQQGEwJHQjEZMBcGA1UECBMQTm9ydGhhbXB0b25zaGlyZTEUMBIGA1UEBxML
-						Tm9ydGhhbXB0b24xHDAaBgNVBAoTE05vcnRoYW1wdG9uIENvbGxlZ2UxFTATBgNV
-						BAsTDElDVCBTZXJ2aWNlczEnMCUGA1UEAxMebmNpZHAubm9ydGhhbXB0b25jb2xs
-						ZWdlLmFjLnVrMTIwMAYJKoZIhvcNAQkBFiNqYW1lcy5wdXR0QG5vcnRoYW1wdG9u
-						Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANbu
-						caFPJVOxagi79pEbQd3g1Sllcz/RkvQ0c9nNIo0q0ot/wJBuI7Saed3n8K9JN88p
-						IFUMDKm4ab6/Qew0jlLQ9z6sGaqS+5Xo/ygfhGLVHjz44u39/BdH32f7WdlK/xUY
-						XZ6VKyrKd9FkuCETN9lDjIL8WxP/S75SMDktV2CtBEduPeDUJHddGTZkLNv2Teap
-						+O77BNTc12ANm9tFUGhbcGfL1wy4sF6Vf8UB0zeVF+i0RW32+MzxwHyk2vlDucEm
-						SauXGf4T0AfxImX+vmGGPThYlNZ/AG4kQVOiam1mrfmul4jBHFzqM7yKYvNRB6qx
-						ODSfbhDMioJBY7NrD8UCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
-						HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFHZdedyK
-						6163lDdT27eFFX+Uh6LLMB8GA1UdIwQYMBaAFHZdedyK6163lDdT27eFFX+Uh6LL
-						MA0GCSqGSIb3DQEBCwUAA4IBAQALfGtb9Y7VF0SvOtzXEJgYCj7thHke6Gm/DUZg
-						rQZMpjapBfQR03gA6ZI97QyXSi3/oLbkHyZ0Am29FfEkhA413QyM7GUxSc686qPR
-						qzwnMfMSdHHYmD/qDBw1Q1PgqUAG9gopI3vVrmiziJb6C+DOfmQsBOSbiuYf0uQn
-						eX6JQkh13433cjVu8J1J/PWuAeiAOMs2rtQIYjmzG3loSdZQZydLjVccfXq6WNxG
-						vwbKJVEkvsYuI45d1pFmPe1x/UVFTl5EmqFEVkU8S+bpv3vM6WiY/UGkT+9IeFhV
-						hhpHWzv4wbV80Eh9ixIti4pfMo8IxIQReLGddhW/H9A7dwK5
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ncidp.northamptoncollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ncidp.northamptoncollege.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">Northampton College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Northampton College IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.northamptoncollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Masniza</GivenName>
-    <SurName>Sore</SurName>
-    <EmailAddress>mailto:Masniza.Sore@northamptoncollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Putt</SurName>
-    <EmailAddress>mailto:James.Putt@northamptoncollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index bf9ffc0d..00000000
--- a/swamid-interfederations-2.0/ncnidp2.ncn.ac.uk-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://ncnidp2.ncn.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for New College Nottingham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-04T10:36:29Z">
-      <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">ncn.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVALRppuv8S4ANdlBHMhXkfMZDERBpMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEm5jYS1pZHAxLm5jbi5hYy51azAeFw0xMzEwMDgxMzIz
-						MDNaFw0zMzEwMDgxMzIzMDNaMB0xGzAZBgNVBAMTEm5jYS1pZHAxLm5jbi5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKCGTdXZNjFkxlbPHQZ+
-						AJcFLw+6FdBn+L2ryybG5i4X9Ft92AEKXbaIH/Q0nOwP3+Gq0yyFPgloiAk/r3KJ
-						uhIziuJ1di0tRxJcCJWH3E+Mv4LrDsV30xILVq3pNiQW96Y7jwPqquHJS6116cjh
-						xBIwMnMizXkAz6ZbUyayFO5KfQ5ShcJKCA/fUbNZ2jIT0imHwIWEzsF/uCrxMpVL
-						GGu+hnWZOz8Jd0zbI3+ZowJB9HB8mX7GpP6WsImuSay0JTGxcb80v6GIV/8iuMwk
-						BAYWskCARpIImOABiYzUN4t5be3frkdrmOVuvKDmFhKU362V6IaVpaYUifNK+7jk
-						IQMCAwEAAaNrMGkwSAYDVR0RBEEwP4ISbmNhLWlkcDEubmNuLmFjLnVrhilodHRw
-						czovL25jYS1pZHAxLm5jbi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						nZnTzYWrQVq2AEx7CHvOlze4oH4wDQYJKoZIhvcNAQEFBQADggEBAAPRO5cV0WBn
-						pJrW/poSP+Y0adkGgK3vIihqdp4blGWWwitUryfhoWJd6s5fDwAlCUzmUjrGuxlh
-						QIsgrUyYbBKAmrDoAwzlTiz6hs3Q3eN8ljN1jviJmStQoV4HugtrmKLP8A5bI6eI
-						VR/fx4TFwbsIgmZR+mM73zf0z2oOPp6WiIOZV0JIiEeT2Z5vIMTUzyGdIhGmr6FF
-						4cP+49glAVtsuTup9MRChUB6znydUVf9fVmi74FCsLaxEqMys8UMzXXMiCG1g6XG
-						pra6VEmKTwxJPyFY5D9627VwJmrePAUZsozY3mIE5oibbq3U92VpvsTb7EQFlKMj
-						Lh83rrpEo40=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nca-idp1.ncn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nca-idp1.ncn.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://nca-idp1.ncn.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nca-idp1.ncn.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nca-idp1.ncn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nca-idp1.ncn.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">ncn.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVALRppuv8S4ANdlBHMhXkfMZDERBpMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEm5jYS1pZHAxLm5jbi5hYy51azAeFw0xMzEwMDgxMzIz
-						MDNaFw0zMzEwMDgxMzIzMDNaMB0xGzAZBgNVBAMTEm5jYS1pZHAxLm5jbi5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKCGTdXZNjFkxlbPHQZ+
-						AJcFLw+6FdBn+L2ryybG5i4X9Ft92AEKXbaIH/Q0nOwP3+Gq0yyFPgloiAk/r3KJ
-						uhIziuJ1di0tRxJcCJWH3E+Mv4LrDsV30xILVq3pNiQW96Y7jwPqquHJS6116cjh
-						xBIwMnMizXkAz6ZbUyayFO5KfQ5ShcJKCA/fUbNZ2jIT0imHwIWEzsF/uCrxMpVL
-						GGu+hnWZOz8Jd0zbI3+ZowJB9HB8mX7GpP6WsImuSay0JTGxcb80v6GIV/8iuMwk
-						BAYWskCARpIImOABiYzUN4t5be3frkdrmOVuvKDmFhKU362V6IaVpaYUifNK+7jk
-						IQMCAwEAAaNrMGkwSAYDVR0RBEEwP4ISbmNhLWlkcDEubmNuLmFjLnVrhilodHRw
-						czovL25jYS1pZHAxLm5jbi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						nZnTzYWrQVq2AEx7CHvOlze4oH4wDQYJKoZIhvcNAQEFBQADggEBAAPRO5cV0WBn
-						pJrW/poSP+Y0adkGgK3vIihqdp4blGWWwitUryfhoWJd6s5fDwAlCUzmUjrGuxlh
-						QIsgrUyYbBKAmrDoAwzlTiz6hs3Q3eN8ljN1jviJmStQoV4HugtrmKLP8A5bI6eI
-						VR/fx4TFwbsIgmZR+mM73zf0z2oOPp6WiIOZV0JIiEeT2Z5vIMTUzyGdIhGmr6FF
-						4cP+49glAVtsuTup9MRChUB6znydUVf9fVmi74FCsLaxEqMys8UMzXXMiCG1g6XG
-						pra6VEmKTwxJPyFY5D9627VwJmrePAUZsozY3mIE5oibbq3U92VpvsTb7EQFlKMj
-						Lh83rrpEo40=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nca-idp1.ncn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nca-idp1.ncn.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">New College Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">New College Nottingham</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ncn.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matthew</GivenName>
-    <SurName>Cook</SurName>
-    <EmailAddress>mailto:matthew.cook@ncn.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Cook</SurName>
-    <EmailAddress>mailto:matthew.cook@ncn.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nd.onecampus.com.xml b/swamid-interfederations-2.0/nd.onecampus.com.xml
deleted file mode 100644
index e36b29dd..00000000
--- a/swamid-interfederations-2.0/nd.onecampus.com.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://nd.onecampus.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ND OneCampus</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.rsmart.com/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.rsmart.com/privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFKTCCBBGgAwIBAgIJAP2Ays74REYyMA0GCSqGSIb3DQEBCwUAMIG0MQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEa
-MBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0
-cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2Vj
-dXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTE1MDgyNjEzMTI0MloX
-DTE2MDkyNDE5MjAwNFowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRh
-dGVkMRgwFgYDVQQDDA8qLm9uZWNhbXB1cy5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDHSg0+JDljLYtiLp4SS2x2G1KijMtnDzZzZf/BmuIZjetA
-C95IVcSLpvCjxa1sHEf5e4ZGuc5kByWYMj0u6Zn5e7u1H8zSdVVZ+SdIiDmbL9IP
-VzxgB8qCiM8BDLm86zvp6JPDdmSyU5qmDX7CmPXI/3W/4raOZMORkxBCIeUTujYX
-I6w1E/JIlam7rGiXGv6HcMWabc0JN+FyGtY1qdDdQPl7oWESxwEMaXTCt80zL7Go
-DB2WMvr+HTi/cwL34/KJow//PPxVBIcMY0d5ij4rqruc7BnofAHJIbd+irrR27FE
-dIAAZ+L9C9NiK+7gYVAD7bxyuLMd4yZP6m4QuXK/AgMBAAGjggGyMIIBrjAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8B
-Af8EBAMCBaAwNwYDVR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5nb2RhZGR5LmNv
-bS9nZGlnMnMxLTExMy5jcmwwUwYDVR0gBEwwSjBIBgtghkgBhv1tAQcXATA5MDcG
-CCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9z
-aXRvcnkvMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au
-Z29kYWRkeS5jb20vMEAGCCsGAQUFBzAChjRodHRwOi8vY2VydGlmaWNhdGVzLmdv
-ZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RpZzIuY3J0MB8GA1UdIwQYMBaAFEDCvSeO
-zDSDMKIz1/tss/C0LIDOMCkGA1UdEQQiMCCCDyoub25lY2FtcHVzLmNvbYINb25l
-Y2FtcHVzLmNvbTAdBgNVHQ4EFgQUD42WHYmzkIt4bBTwOzAvZEroKRIwDQYJKoZI
-hvcNAQELBQADggEBAHmpPl8xZ7bMe7oBKwEV62VDuQZ1ToTZRvNfI36vjlYpdypI
-0yWf0ckHy0OIyEEW4Gx3PCmZZq3lptKmbnvsj+zBmFgM4Z+bYtMR60s4wlpQGoDU
-rhuszTLtIwWLLvQx+fbI9/K1rHS6pI3QV8g4OdMOznM82oEwpR+kPOUVsnw+gMmw
-bT/p8eVAUr3oWuhDp+qQo1LP9A0LaDNkH9UThAOQx1L0CP45RHlG7Ewd+LGS9S0X
-tTDiJ0v3T1w1Y4kZPLU7Z/fdeHHU1Yh4KeEfU43rF5kWQMSp1q0W6b49YrX9OvHJ
-/bKQ4YxUAr7Q4ohFqImnAEy2n4ZjivQ6z8kOPrY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nd.onecampus.com/saml/SSO/alias/nd" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nd.onecampus.com/saml/SSO/alias/nd" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nd.onecampus.com/saml/SSO/alias/nd" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nd.onecampus.com/saml/SSO/alias/nd" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Cloud Ops Support</md:GivenName>
-    <md:EmailAddress>cloud_ops_support@rsmart.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ndsandbox.onecampus.com.xml b/swamid-interfederations-2.0/ndsandbox.onecampus.com.xml
deleted file mode 100644
index a854ae51..00000000
--- a/swamid-interfederations-2.0/ndsandbox.onecampus.com.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://ndsandbox.onecampus.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ND OneCampus Sandbox</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.rsmart.com/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.rsmart.com/privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFKTCCBBGgAwIBAgIJAP2Ays74REYyMA0GCSqGSIb3DQEBCwUAMIG0MQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEa
-MBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0
-cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2Vj
-dXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTE1MDgyNjEzMTI0MloX
-DTE2MDkyNDE5MjAwNFowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRh
-dGVkMRgwFgYDVQQDDA8qLm9uZWNhbXB1cy5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDHSg0+JDljLYtiLp4SS2x2G1KijMtnDzZzZf/BmuIZjetA
-C95IVcSLpvCjxa1sHEf5e4ZGuc5kByWYMj0u6Zn5e7u1H8zSdVVZ+SdIiDmbL9IP
-VzxgB8qCiM8BDLm86zvp6JPDdmSyU5qmDX7CmPXI/3W/4raOZMORkxBCIeUTujYX
-I6w1E/JIlam7rGiXGv6HcMWabc0JN+FyGtY1qdDdQPl7oWESxwEMaXTCt80zL7Go
-DB2WMvr+HTi/cwL34/KJow//PPxVBIcMY0d5ij4rqruc7BnofAHJIbd+irrR27FE
-dIAAZ+L9C9NiK+7gYVAD7bxyuLMd4yZP6m4QuXK/AgMBAAGjggGyMIIBrjAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8B
-Af8EBAMCBaAwNwYDVR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5nb2RhZGR5LmNv
-bS9nZGlnMnMxLTExMy5jcmwwUwYDVR0gBEwwSjBIBgtghkgBhv1tAQcXATA5MDcG
-CCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9z
-aXRvcnkvMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au
-Z29kYWRkeS5jb20vMEAGCCsGAQUFBzAChjRodHRwOi8vY2VydGlmaWNhdGVzLmdv
-ZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RpZzIuY3J0MB8GA1UdIwQYMBaAFEDCvSeO
-zDSDMKIz1/tss/C0LIDOMCkGA1UdEQQiMCCCDyoub25lY2FtcHVzLmNvbYINb25l
-Y2FtcHVzLmNvbTAdBgNVHQ4EFgQUD42WHYmzkIt4bBTwOzAvZEroKRIwDQYJKoZI
-hvcNAQELBQADggEBAHmpPl8xZ7bMe7oBKwEV62VDuQZ1ToTZRvNfI36vjlYpdypI
-0yWf0ckHy0OIyEEW4Gx3PCmZZq3lptKmbnvsj+zBmFgM4Z+bYtMR60s4wlpQGoDU
-rhuszTLtIwWLLvQx+fbI9/K1rHS6pI3QV8g4OdMOznM82oEwpR+kPOUVsnw+gMmw
-bT/p8eVAUr3oWuhDp+qQo1LP9A0LaDNkH9UThAOQx1L0CP45RHlG7Ewd+LGS9S0X
-tTDiJ0v3T1w1Y4kZPLU7Z/fdeHHU1Yh4KeEfU43rF5kWQMSp1q0W6b49YrX9OvHJ
-/bKQ4YxUAr7Q4ohFqImnAEy2n4ZjivQ6z8kOPrY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ndsandbox.onecampus.com/saml/SSO/alias/ndsandbox" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ndsandbox.onecampus.com/saml/SSO/alias/ndsandbox" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ndsandbox.onecampus.com/saml/SSO/alias/ndsandbox" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ndsandbox.onecampus.com/saml/SSO/alias/ndsandbox" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Cloud Ops Support</md:GivenName>
-    <md:EmailAddress>cloud_ops_support@rsmart.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-shibboleth.xml
deleted file mode 100644
index 638488a7..00000000
--- a/swamid-interfederations-2.0/neiss.nesc.gla.ac.uk-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://neiss.nesc.gla.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2.2.3 SP 'NeISS Portal' for NeSC (Glasgow).
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://neiss.nesc.gla.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAP+u9FsUkGK4MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFG5laXNzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDcyMzEzNDkyNFoXDTE5MDcy
-						MTEzNDkyNFowHzEdMBsGA1UEAxMUbmVpc3MubmVzYy5nbGEuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnRKUYCtTm/YAA/xOx01gsbodauTrk
-						3UupsTSRFJMucsSFwl0oHTNFXjXacGxSEhq1nwRw3W+aKaaxOsbRqLRPd9TFCo1r
-						SZLU5N3+S3NSfesZnrKLxcDb5XJf4ToqBCwHwu8bSwMC9g3LOZvm31lxaBu7lRhO
-						2qPlxx8ESD6xJNU+c7ijTfBCwGnm7zH30oTsbspFTPfGHPp2DpmG42SWJZxgJYyv
-						hx4No30U+MssN9O3g9bcLm837aIEzVJDDBamQA83oBkBUYTgHYo21qfMezYDBXaU
-						IlRFNZt5eHu+nbW+wGuBQDa3P8ffDVGzXwNcIntYZXpjAww3DaC8JFjxAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFG5laXNzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBTb
-						Qzadk9TtnjjvYEry7dZ8XQ4MeDANBgkqhkiG9w0BAQUFAAOCAQEAWYIBYcDCXnr1
-						OTz0D8hx4aJRlPAouoAtc5+UUMIu9FCII/DqyMljxynRR7psCi8xk4bJ0Mk1cg7i
-						EhwKWmRxUaL92m1ebHb4eisdleGnnMeO89Gn1kGA1QplNvsJZP8UBqzf5pQshe8K
-						K9F6pn8/3FE3JpEeNlNBz597gxTM99FIUUvSR8bllqljPaSOEBgbNEHdrgd5qGBt
-						nzxUn0XdIcnfDxTTYkF7ht34kwNAVJ16q6bz5FFIaxLFy7ZkwbCvm23tN5KDYUjo
-						Re0suMUuwA9QTypNllFOEaKQvLOuxyE/vtnrNN/NV0jRqCCQ1ycWU6bRleT7xMpF
-						sLv7XXQhLg==
-					</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>
-						MIIDAzCCAeugAwIBAgIJAP+u9FsUkGK4MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFG5laXNzLm5lc2MuZ2xhLmFjLnVrMB4XDTA5MDcyMzEzNDkyNFoXDTE5MDcy
-						MTEzNDkyNFowHzEdMBsGA1UEAxMUbmVpc3MubmVzYy5nbGEuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnRKUYCtTm/YAA/xOx01gsbodauTrk
-						3UupsTSRFJMucsSFwl0oHTNFXjXacGxSEhq1nwRw3W+aKaaxOsbRqLRPd9TFCo1r
-						SZLU5N3+S3NSfesZnrKLxcDb5XJf4ToqBCwHwu8bSwMC9g3LOZvm31lxaBu7lRhO
-						2qPlxx8ESD6xJNU+c7ijTfBCwGnm7zH30oTsbspFTPfGHPp2DpmG42SWJZxgJYyv
-						hx4No30U+MssN9O3g9bcLm837aIEzVJDDBamQA83oBkBUYTgHYo21qfMezYDBXaU
-						IlRFNZt5eHu+nbW+wGuBQDa3P8ffDVGzXwNcIntYZXpjAww3DaC8JFjxAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFG5laXNzLm5lc2MuZ2xhLmFjLnVrMB0GA1UdDgQWBBTb
-						Qzadk9TtnjjvYEry7dZ8XQ4MeDANBgkqhkiG9w0BAQUFAAOCAQEAWYIBYcDCXnr1
-						OTz0D8hx4aJRlPAouoAtc5+UUMIu9FCII/DqyMljxynRR7psCi8xk4bJ0Mk1cg7i
-						EhwKWmRxUaL92m1ebHb4eisdleGnnMeO89Gn1kGA1QplNvsJZP8UBqzf5pQshe8K
-						K9F6pn8/3FE3JpEeNlNBz597gxTM99FIUUvSR8bllqljPaSOEBgbNEHdrgd5qGBt
-						nzxUn0XdIcnfDxTTYkF7ht34kwNAVJ16q6bz5FFIaxLFy7ZkwbCvm23tN5KDYUjo
-						Re0suMUuwA9QTypNllFOEaKQvLOuxyE/vtnrNN/NV0jRqCCQ1ycWU6bRleT7xMpF
-						sLv7XXQhLg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://neiss.nesc.gla.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Glasgow</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NeSC (Glasgow): NeISS Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.neiss.org.uk/</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/neo236.neocase-software.net-connexion_neocase.xml b/swamid-interfederations-2.0/neo236.neocase-software.net-connexion_neocase.xml
deleted file mode 100644
index 9c494dda..00000000
--- a/swamid-interfederations-2.0/neo236.neocase-software.net-connexion_neocase.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://neo236.neocase-software.net/connexion_neocase">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">PennStateBackoffice</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID2TCCAsGgAwIBAgIJAPfTg+MQTPE0MA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
-VQQGEwJVUzELMAkGA1UECAwCTUExDzANBgNVBAcMBk5ld3RvbjEZMBcGA1UECgwQ
-TmVvY2FzZSBTb2Z0d2FyZTEcMBoGA1UECwwTU2FhUyBBZG1pbmlzdHJhdGlvbjEc
-MBoGA1UEAwwTbmVvY2FzZXNvZnR3YXJlLmNvbTAeFw0xNjAxMDUyMTA1NDdaFw0y
-NjAxMDQyMTA1NDdaMIGCMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTUExDzANBgNV
-BAcMBk5ld3RvbjEZMBcGA1UECgwQTmVvY2FzZSBTb2Z0d2FyZTEcMBoGA1UECwwT
-U2FhUyBBZG1pbmlzdHJhdGlvbjEcMBoGA1UEAwwTbmVvY2FzZXNvZnR3YXJlLmNv
-bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7XdqdPd3gJj2ow3N9c
-rft+GPEnR9Ff8SNhGxeIug6778pnjCLK90Vs+wFNfKPchFDiKZkvBm/e/wnSFrCC
-RrWcBZXjkS4ejoKWumHE56CGRugJCxxyA3Ez2BhEfaYM9bwqLYDxbSVTAMTMywLl
-257CpOfc+ePTk3ph9+gBLhJ7nk8OuW0NPFK6Nbvn9ozX0eTAs60JTOW0lxnGyTx8
-w19Ni7TX51fUP5XPq0i2yxjBhqDL6lz3P6+kl4ciXVRCHZcB+D8HaJz5VtPSXIsF
-ehtjzo2WdaMnmq12kv8BtcrqUjjEby43XuXIg5ijNC/3YOqSC9JfkQJzLVon+rNJ
-QNcCAwEAAaNQME4wHQYDVR0OBBYEFPkmpy2nziy4mpCL9lITpwnlSATpMB8GA1Ud
-IwQYMBaAFPkmpy2nziy4mpCL9lITpwnlSATpMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBABE4tYVRpgv1GMTVPpVybTrmE6ltK+XOtzdgQxmB9yc2KKYK
-ufvstQy4S8IF/7/f8niQUOEt3XTjJyYJAYiM0feO/tk/9r3xhSLNBPoDlnPkL/ce
-GJr6Ol5ROoVI/m5YMXDKo3UrsdgcJ//R/Oiqe4vAQsyTdRtFB8BFZkfZlgjIT+OB
-PsyFdVd0AeqkvbUZkZhNlax0u0AJv2oircEYNiZllrvDOraTBJkfI8fEyEEdYe18
-ciAugVZ5HD8JlVy+ARFOaQiqh2UmipYv+T2sFWOaXilbIkL8aPPPsM18xL6/ZE3Y
-g5bEi3lvWxUKBMOgNB+BW/+09dAvBdLuR2JSlaU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neo236.neocase-software.net/connexion_neocase/SAML/AssertionConsumerService.aspx" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Neocase Software Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Neocase Software Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.neocasesoftware.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Eileen Szczesuil</md:GivenName>
-    <md:EmailAddress>eszczesuil@neocasesoftware.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Nicoleta Petcu</md:GivenName>
-    <md:EmailAddress>npetcu@neocasesoftware.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 1eb41b59..00000000
--- a/swamid-interfederations-2.0/nerckwshibba.nerc.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nerckwshibba.nerc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the Natural Environment Research Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-14T15:50:25Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">antarctic.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">birdisland.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cambridge.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ernestshackleton.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halley.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamesclark.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamesclarkross.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medicalunit.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">portlockroy.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rothera.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">signy.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southgeorgia.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belfast.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eskdalemuir.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exhibitionroad.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gilmerton.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hartland.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keyworth.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loanhead.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montserrat.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">murchisonhouse.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccms.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.ccms.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">banchory.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dorset.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merlewood.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">monkswood.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oxford.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polaris.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">windermere.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastkilbride.cs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dml.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oban.dml.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essc.essc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faam.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faam.faam.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ios.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.ios.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sscnorthstarhouse.ios.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ite.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">banchory.ite.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">monkswood.ite.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mba.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.mba.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.noc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsumariners.noc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsunationaloceanographycentre.noc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southamptonuniversity.noc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nocentre.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xx.nocentre.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nrcl.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nercradiocarbonlaboratory.nrcl.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pml.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.pml.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pol.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liverpool.pol.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcuk.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">researchcouncils.rcuk.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">saphos.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.saphos.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smru.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">standrews.smru.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cranfieldfaam.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastkilbridercl.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">herstmonceuxnsgf.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsskeyworth.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsspolarishouse.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsswallingford.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keyworth.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kidlingtonarsf.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">murchisonhouse.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oxfordgecafsipo.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polarishouse.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">universityofeastanglia.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.so.idp.nerc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEQDCCAyigAwIBAgIJAPRnCt9s8k0UMA0GCSqGSIb3DQEBBQUAMIGgMQswCQYD
-						VQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTETMBEGA1UEBwwKTm90dGluZ2hh
-						bTENMAsGA1UECgwETkVSQzEMMAoGA1UECwwDSVNUMSAwHgYDVQQDDBduZXJja3dz
-						aGliYmEubmVyYy5hYy51azEoMCYGCSqGSIb3DQEJARYZaXN0X2lkX3N1cHBvcnRA
-						bmVyYy5hYy51azAeFw0xMzAyMTMxMTI4NTJaFw0yMzAyMTExMTI4NTJaMIGgMQsw
-						CQYDVQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTETMBEGA1UEBwwKTm90dGlu
-						Z2hhbTENMAsGA1UECgwETkVSQzEMMAoGA1UECwwDSVNUMSAwHgYDVQQDDBduZXJj
-						a3dzaGliYmEubmVyYy5hYy51azEoMCYGCSqGSIb3DQEJARYZaXN0X2lkX3N1cHBv
-						cnRAbmVyYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBM
-						zJ+uj+q3UWvsNeEmNq3/OYAxNMCxLaZWZbDtt2gQDBpB2GJBZHIl4GEMTda6w2j6
-						34lhz0mZsOXSpE18Tdvp177L3k/h9b0sH2k43I3gq4+mFl6wxPQ8F/wR08dEaz6k
-						wMfv3ntfF1Y7bLedyw5M94qRUv7rcI/9iFOfyhnpnwCIo2usiIrjkKFUc/gRvkXH
-						A9PCkz0+PyPi5HrmrkMaRjxkx25PsKuxbxbplM0Z9wxsCpO6KM/kwxLroYLQh0oJ
-						HngCvCuNmVPH4YjCQXh5KVNRx/Wc/F0C9qvFd4aZzgC9Ms8Wmj2FIfTABtyr0u9D
-						Zhm3G9422dhg6EgZg+sCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
-						HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCGcQ2SN
-						NR/KKBotn3XrDl2OH91cMB8GA1UdIwQYMBaAFCGcQ2SNNR/KKBotn3XrDl2OH91c
-						MA0GCSqGSIb3DQEBBQUAA4IBAQArZkQSlvSTa9oSr1XJXdDrW3Inf0YlA6D6w9ZC
-						HY9vG4FylgXNq/VRKzugFa/esvTNN0xaEciidPqvpaF/JyxCNWFui5X+GWGDt7zi
-						vEP34+fzlmhMZu3Jjhu2O/YS9BOQWqCwD8J/KftAbPeSbwB1dWUOnwnlC8X2BfOA
-						UTWhDsoVipIEPLnhvSVzDJvSzygzN2BnHMFyaaqHAthaLoyn7BV/SFtk7VaFK7OQ
-						MNCj7q1pYJzzTNe0WDOQWGm2/4DpepjWguQSsSuxWieHjJGqkrEsM9HHjd+UtXed
-						bvci5wxhP0WyevQbQynrHliiIuFQdbG3GK+/VGF4S2r5wA3I
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nerckwshibba.nerc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nerckwshibba.nerc.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://nerckwshibba.nerc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nerckwshibba.nerc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nerckwshibba.nerc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nerckwshibba.nerc.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">nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">antarctic.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">birdisland.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cambridge.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ernestshackleton.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">halley.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamesclark.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jamesclarkross.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medicalunit.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">portlockroy.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rothera.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">signy.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southgeorgia.bas.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">belfast.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cardiff.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eskdalemuir.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exeter.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">exhibitionroad.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gilmerton.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hartland.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keyworth.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loanhead.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montserrat.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">murchisonhouse.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.bgs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccms.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.ccms.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">banchory.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bangor.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dorset.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lancaster.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">merlewood.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">monkswood.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oxford.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polaris.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">windermere.ceh.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastkilbride.cs.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dml.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oban.dml.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">essc.essc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faam.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">faam.faam.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ios.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.ios.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sscnorthstarhouse.ios.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ite.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">banchory.ite.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">monkswood.ite.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mba.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.mba.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">noc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.noc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsumariners.noc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rsunationaloceanographycentre.noc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">southamptonuniversity.noc.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nocentre.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">xx.nocentre.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nrcl.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nercradiocarbonlaboratory.nrcl.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pml.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.pml.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pol.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">liverpool.pol.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rcuk.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">researchcouncils.rcuk.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">saphos.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plymouth.saphos.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smru.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">standrews.smru.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cranfieldfaam.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eastkilbridercl.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edinburgh.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">herstmonceuxnsgf.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsskeyworth.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsspolarishouse.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsswallingford.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">keyworth.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kidlingtonarsf.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">murchisonhouse.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nationaloceanographycentre.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oxfordgecafsipo.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polarishouse.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">universityofeastanglia.so.idp.nerc.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wallingford.so.idp.nerc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEQDCCAyigAwIBAgIJAPRnCt9s8k0UMA0GCSqGSIb3DQEBBQUAMIGgMQswCQYD
-						VQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTETMBEGA1UEBwwKTm90dGluZ2hh
-						bTENMAsGA1UECgwETkVSQzEMMAoGA1UECwwDSVNUMSAwHgYDVQQDDBduZXJja3dz
-						aGliYmEubmVyYy5hYy51azEoMCYGCSqGSIb3DQEJARYZaXN0X2lkX3N1cHBvcnRA
-						bmVyYy5hYy51azAeFw0xMzAyMTMxMTI4NTJaFw0yMzAyMTExMTI4NTJaMIGgMQsw
-						CQYDVQQGEwJHQjETMBEGA1UECAwKU29tZS1TdGF0ZTETMBEGA1UEBwwKTm90dGlu
-						Z2hhbTENMAsGA1UECgwETkVSQzEMMAoGA1UECwwDSVNUMSAwHgYDVQQDDBduZXJj
-						a3dzaGliYmEubmVyYy5hYy51azEoMCYGCSqGSIb3DQEJARYZaXN0X2lkX3N1cHBv
-						cnRAbmVyYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALBM
-						zJ+uj+q3UWvsNeEmNq3/OYAxNMCxLaZWZbDtt2gQDBpB2GJBZHIl4GEMTda6w2j6
-						34lhz0mZsOXSpE18Tdvp177L3k/h9b0sH2k43I3gq4+mFl6wxPQ8F/wR08dEaz6k
-						wMfv3ntfF1Y7bLedyw5M94qRUv7rcI/9iFOfyhnpnwCIo2usiIrjkKFUc/gRvkXH
-						A9PCkz0+PyPi5HrmrkMaRjxkx25PsKuxbxbplM0Z9wxsCpO6KM/kwxLroYLQh0oJ
-						HngCvCuNmVPH4YjCQXh5KVNRx/Wc/F0C9qvFd4aZzgC9Ms8Wmj2FIfTABtyr0u9D
-						Zhm3G9422dhg6EgZg+sCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0E
-						HxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFCGcQ2SN
-						NR/KKBotn3XrDl2OH91cMB8GA1UdIwQYMBaAFCGcQ2SNNR/KKBotn3XrDl2OH91c
-						MA0GCSqGSIb3DQEBBQUAA4IBAQArZkQSlvSTa9oSr1XJXdDrW3Inf0YlA6D6w9ZC
-						HY9vG4FylgXNq/VRKzugFa/esvTNN0xaEciidPqvpaF/JyxCNWFui5X+GWGDt7zi
-						vEP34+fzlmhMZu3Jjhu2O/YS9BOQWqCwD8J/KftAbPeSbwB1dWUOnwnlC8X2BfOA
-						UTWhDsoVipIEPLnhvSVzDJvSzygzN2BnHMFyaaqHAthaLoyn7BV/SFtk7VaFK7OQ
-						MNCj7q1pYJzzTNe0WDOQWGm2/4DpepjWguQSsSuxWieHjJGqkrEsM9HHjd+UtXed
-						bvci5wxhP0WyevQbQynrHliiIuFQdbG3GK+/VGF4S2r5wA3I
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nerckwshibba.nerc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nerckwshibba.nerc.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">Natural Environment Research Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NERC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nerc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library</GivenName>
-    <EmailAddress>mailto:library@nerc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IST ID Support</GivenName>
-    <EmailAddress>mailto:IST_ID_Support@nerc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/netauth.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 20d69555..00000000
--- a/swamid-interfederations-2.0/netauth.new.ox.ac.uk-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://netauth.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a "New College NAC" Shibboleth SP for the University of Oxford.
-	-->
-  <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-10-02T13:03:24Z">
-      <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://netauth.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAKMSnZeSVHgEMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFG5ldGF1dGgubmV3Lm94LmFjLnVrMB4XDTEzMDkzMDE1MzQ0N1oXDTIzMDky
-						ODE1MzQ0N1owHzEdMBsGA1UEAxMUbmV0YXV0aC5uZXcub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC035v936htfmoVzstmJwIfPvfUB2qE
-						wey1wBMBuucw69i5g4yl8YZ17yklNQAXs3aLxiTUhLoLVZ8OK5vc4/z5PCrnIQbj
-						eO9ll6jwn6svf2NRiK5L6rDGgxjrbCjz7W7azQefCW9UF6HApFLY2GJOrZxYhnFW
-						RTiQIN5SrZxBqMNi780uPw88Qchm/8+B3E941F9Dh61Gp/DQHsORQWgEy5RF99Yk
-						MGc3wFWFNy0M0e3FHgjRxgNHvbIW5ny1TO1EAZnGfwzV30onyu/OgO/3V3jVb3Bk
-						0S48VDUFi2GTep9fOwmqJbKNy4r3VKBn5eIgVVlnveK/BbF7yIcMgwLrAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFG5ldGF1dGgubmV3Lm94LmFjLnVrMB0GA1UdDgQWBBQa
-						NkzluKeibaDUOYUKYis0I+BaDjANBgkqhkiG9w0BAQUFAAOCAQEAUabom1zsaMeN
-						Ah+SzTLFnBQAwHWSeJfWnEdtDFavwTenxjyxGMm9T85kvnQK16p0dI7yRxuHR26V
-						E6glnUU/XcO13yX2f0vPGtqLzVTK2lDK4BuSErJ+HQAuJxr0fGIHYP5s4U+Fe11l
-						wRU+KT7ijBH7IcHy7U/Kt6qKTSF9B3oMQJRvYTszduhik4fM2YCyWOscjvI+MCEd
-						4q3awKar8d4qiAqBFM627qTU+ozjYwV6O3mFPIfi8Kp3GM5+qbVBPgJhlPU6n6Fs
-						Fqnx77OlqMFgNDUgKpoXmT1+nh6Fb9/4orNFUp3gAJBvm80LmYl61O+UozUgtg1C
-						JBJczVcyrQ==
-					</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://netauth.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://netauth.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, New College NAC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Dore</SurName>
-    <EmailAddress>mailto:james.dore@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Dore</SurName>
-    <EmailAddress>mailto:james.dore@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/netid.uwosh.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/netid.uwosh.edu-idp-shibboleth.xml
deleted file mode 100644
index decd4445..00000000
--- a/swamid-interfederations-2.0/netid.uwosh.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +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://netid.uwosh.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uwosh.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Wisconsin Oshkosh</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>
-MIIDJzCCAg+gAwIBAgIULwlDAyJjd+iv5pE4sKwmYC6QFRowDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPbmV0aWQudXdvc2guZWR1MB4XDTEyMDcyNDE2MDcxNloX
-DTMyMDcyNDE2MDcxNlowGjEYMBYGA1UEAxMPbmV0aWQudXdvc2guZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlje4GeXFZ02ODcQIa5q7UJRaog6T
-dk5QASeCz8jVAKSHIX5d0ur8foVdQpzNjGoD4s+INqphGs6ofJ7XpkQIyV4FHLZf
-68e8D8EDKKLrjrii5rMmd03EkF3pUcC0IauP73Tqh+Ew7YWzPxjbVwt/KcDeToIs
-lbGPIFAb1jlgqnrtTElBGIwpuPnHG0AZ1qYpShZkPWb16KyH8v6xc6rVUqJCJl+7
-xud/wssAAXAtReQgHLGxohMThbKnU1EueUUU9lSUuLwUN0ElJO1IfWtbE8v8+7fV
-/KvjbC+VfLjIroRfX2iPrgEiadpjt02+i1WAwyq5BcDc2hXjR68ZVmZnKwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9uZXRpZC51d29zaC5lZHWGJmh0dHBzOi8vbmV0aWQu
-dXdvc2guZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRe50kdB/KwTgBIvHIp
-5PSePCrPwTANBgkqhkiG9w0BAQUFAAOCAQEAjcgmffNTMfcFSDrAzoFa0f3Hck6h
-B2PP/4hfLDLszk3UuNel4R1imKdpVOJzBC+XjJX34jytRRanZeU1I6I7GXpwoNNy
-40/vPvZMuGevH7Z5AT4LwugqYKeYPXdkyYPlLk7ejupfmknmWx85g13r5QDSkTP8
-gC0g3MzPK5R+HPqWcI6KGlpP1+duGlfNNQkIPJC6llGoYHfVRiqrQtHJrTO8yvUE
-M6rR70BZ0LFlKPcyYyn6ir0XzDTbfyewJMNmN/GOGLKYv4eW5ZLff8FP2gelndmP
-+PK5PPnwOFJqlAwQR+IYBwL1nWdsoRzCn/o7Da9j6fVvpHB7YjlOfM7Y5g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netid.uwosh.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netid.uwosh.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://netid.uwosh.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netid.uwosh.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netid.uwosh.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwosh.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIULwlDAyJjd+iv5pE4sKwmYC6QFRowDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPbmV0aWQudXdvc2guZWR1MB4XDTEyMDcyNDE2MDcxNloX
-DTMyMDcyNDE2MDcxNlowGjEYMBYGA1UEAxMPbmV0aWQudXdvc2guZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlje4GeXFZ02ODcQIa5q7UJRaog6T
-dk5QASeCz8jVAKSHIX5d0ur8foVdQpzNjGoD4s+INqphGs6ofJ7XpkQIyV4FHLZf
-68e8D8EDKKLrjrii5rMmd03EkF3pUcC0IauP73Tqh+Ew7YWzPxjbVwt/KcDeToIs
-lbGPIFAb1jlgqnrtTElBGIwpuPnHG0AZ1qYpShZkPWb16KyH8v6xc6rVUqJCJl+7
-xud/wssAAXAtReQgHLGxohMThbKnU1EueUUU9lSUuLwUN0ElJO1IfWtbE8v8+7fV
-/KvjbC+VfLjIroRfX2iPrgEiadpjt02+i1WAwyq5BcDc2hXjR68ZVmZnKwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9uZXRpZC51d29zaC5lZHWGJmh0dHBzOi8vbmV0aWQu
-dXdvc2guZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRe50kdB/KwTgBIvHIp
-5PSePCrPwTANBgkqhkiG9w0BAQUFAAOCAQEAjcgmffNTMfcFSDrAzoFa0f3Hck6h
-B2PP/4hfLDLszk3UuNel4R1imKdpVOJzBC+XjJX34jytRRanZeU1I6I7GXpwoNNy
-40/vPvZMuGevH7Z5AT4LwugqYKeYPXdkyYPlLk7ejupfmknmWx85g13r5QDSkTP8
-gC0g3MzPK5R+HPqWcI6KGlpP1+duGlfNNQkIPJC6llGoYHfVRiqrQtHJrTO8yvUE
-M6rR70BZ0LFlKPcyYyn6ir0XzDTbfyewJMNmN/GOGLKYv4eW5ZLff8FP2gelndmP
-+PK5PPnwOFJqlAwQR+IYBwL1nWdsoRzCn/o7Da9j6fVvpHB7YjlOfM7Y5g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netid.uwosh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wisconsin Oshkosh</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin Oshkosh</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwosh.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Academic Computing</md:GivenName>
-    <md:EmailAddress>acshelp@uwosh.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 3a094172..00000000
--- a/swamid-interfederations-2.0/netlogin-dev.strath.ac.uk-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://netlogin-dev.strath.ac.uk/idp/shibboleth">
-  <!--
-		This is a "(Dev IdP)" Shibboleth IdP for the University of Strathclyde.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-04T11:48:02Z">
-      <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">strath.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVALntfhDpdib1U8g0APCYQ0HzFX4HMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMMGW5ldGxvZ2luLWRldi5zdHJhdGguYWMudWswHhcNMTQx
-						MTA3MTQ1MDAzWhcNMzQxMTA3MTQ1MDAzWjAkMSIwIAYDVQQDDBluZXRsb2dpbi1k
-						ZXYuc3RyYXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						n5KFxtDXYrp4ChYev6BWlmqRZWRKiGVKqukVMC9qEkRiDWkwCUU5IgPkKH3IwJfW
-						AO1xGZ+s+kZ2hwjgCVXCYMmlwk5RlRKkcCTTjqHjSZ7ZNKA2hEWOaBJF3F9lFbwk
-						AyvMUi4qn7f+mDybZHr9pbl4phANo8Fs3gnPr+yAp+G6F0EyL3At5SKpnanQ/lRy
-						dTCuXMTukeI1TDtvptr7jV2HjpO4KmEILiCsqDvnjNMT2YEFlgxa8bX+YGXG/8cH
-						6LKIQOtvSsg0D3xZvmazOWo6xg9XMAgKh6J+tE0HUr6Js16g/GxXghxfQA/rXmh+
-						lK0bYueUgkjyXSclGQe9uwIDAQABo3kwdzAdBgNVHQ4EFgQUHCmyxQT1A5E7uqal
-						xfUiaDHwCgowVgYDVR0RBE8wTYIZbmV0bG9naW4tZGV2LnN0cmF0aC5hYy51a4Yw
-						aHR0cHM6Ly9uZXRsb2dpbi1kZXYuc3RyYXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCbAbHeCjRT5CzbWDX9I1VLo3Y0hEjlmiwCvAZX
-						yKPZ5FO5fJVCtI2aqOToFbF2BVOe3/mYV8sC6dsoS38Sarwhzbh6GRRE3FywuPbp
-						UkQGTeAmB7jZ7kXLRS/tgVJbWzChljeVqofhwXjW4PfPugSuslpC+elp9PoTj/BP
-						OrfOIm9jSMG2/HPbaVR9VynfXThx+mYa261FIVQuaha6K+s4Y3vGU3qgyTtnyNYv
-						pOIaOiV5+TEokiP5oOHdbyH5Ax5+w/Tx400X/jebeY6vTW6WTKDlYMnmP/Fbv8d6
-						AZTALOEzlYlDfuws2MF1Tc3K10VtbOMIL90R5JROBwVMKw0j
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.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://netlogin-dev.strath.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.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">strath.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVALntfhDpdib1U8g0APCYQ0HzFX4HMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMMGW5ldGxvZ2luLWRldi5zdHJhdGguYWMudWswHhcNMTQx
-						MTA3MTQ1MDAzWhcNMzQxMTA3MTQ1MDAzWjAkMSIwIAYDVQQDDBluZXRsb2dpbi1k
-						ZXYuc3RyYXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						n5KFxtDXYrp4ChYev6BWlmqRZWRKiGVKqukVMC9qEkRiDWkwCUU5IgPkKH3IwJfW
-						AO1xGZ+s+kZ2hwjgCVXCYMmlwk5RlRKkcCTTjqHjSZ7ZNKA2hEWOaBJF3F9lFbwk
-						AyvMUi4qn7f+mDybZHr9pbl4phANo8Fs3gnPr+yAp+G6F0EyL3At5SKpnanQ/lRy
-						dTCuXMTukeI1TDtvptr7jV2HjpO4KmEILiCsqDvnjNMT2YEFlgxa8bX+YGXG/8cH
-						6LKIQOtvSsg0D3xZvmazOWo6xg9XMAgKh6J+tE0HUr6Js16g/GxXghxfQA/rXmh+
-						lK0bYueUgkjyXSclGQe9uwIDAQABo3kwdzAdBgNVHQ4EFgQUHCmyxQT1A5E7uqal
-						xfUiaDHwCgowVgYDVR0RBE8wTYIZbmV0bG9naW4tZGV2LnN0cmF0aC5hYy51a4Yw
-						aHR0cHM6Ly9uZXRsb2dpbi1kZXYuc3RyYXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCbAbHeCjRT5CzbWDX9I1VLo3Y0hEjlmiwCvAZX
-						yKPZ5FO5fJVCtI2aqOToFbF2BVOe3/mYV8sC6dsoS38Sarwhzbh6GRRE3FywuPbp
-						UkQGTeAmB7jZ7kXLRS/tgVJbWzChljeVqofhwXjW4PfPugSuslpC+elp9PoTj/BP
-						OrfOIm9jSMG2/HPbaVR9VynfXThx+mYa261FIVQuaha6K+s4Y3vGU3qgyTtnyNYv
-						pOIaOiV5+TEokiP5oOHdbyH5Ax5+w/Tx400X/jebeY6vTW6WTKDlYMnmP/Fbv8d6
-						AZTALOEzlYlDfuws2MF1Tc3K10VtbOMIL90R5JROBwVMKw0j
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.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 Strathclyde</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Strathclyde (Dev IdP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.strath.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:ukfed-support@strath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical</GivenName>
-    <EmailAddress>mailto:ukfed-tech@strath.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/netlogin.strath.ac.uk-shibboleth.xml
deleted file mode 100644
index 3dcab200..00000000
--- a/swamid-interfederations-2.0/netlogin.strath.ac.uk-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" entityID="https://netlogin.strath.ac.uk/shibboleth">
-  <!--
-		This is an IdP for the University of Strathclyde.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-04T11:48:02Z">
-      <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">strath.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Strathclyde</mdui:DisplayName>
-        <mdui:Logo height="60" width="82">https://netlogin.strath.ac.uk/img/strath_logo_82x60.png</mdui:Logo>
-        <mdui:Logo height="12" width="16">https://netlogin.strath.ac.uk/img/strath_logo_16x12.png</mdui:Logo>
-        <mdui:Logo height="16" width="22">https://netlogin.strath.ac.uk/img/strath_logo_22x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVALntfhDpdib1U8g0APCYQ0HzFX4HMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMMGW5ldGxvZ2luLWRldi5zdHJhdGguYWMudWswHhcNMTQx
-						MTA3MTQ1MDAzWhcNMzQxMTA3MTQ1MDAzWjAkMSIwIAYDVQQDDBluZXRsb2dpbi1k
-						ZXYuc3RyYXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						n5KFxtDXYrp4ChYev6BWlmqRZWRKiGVKqukVMC9qEkRiDWkwCUU5IgPkKH3IwJfW
-						AO1xGZ+s+kZ2hwjgCVXCYMmlwk5RlRKkcCTTjqHjSZ7ZNKA2hEWOaBJF3F9lFbwk
-						AyvMUi4qn7f+mDybZHr9pbl4phANo8Fs3gnPr+yAp+G6F0EyL3At5SKpnanQ/lRy
-						dTCuXMTukeI1TDtvptr7jV2HjpO4KmEILiCsqDvnjNMT2YEFlgxa8bX+YGXG/8cH
-						6LKIQOtvSsg0D3xZvmazOWo6xg9XMAgKh6J+tE0HUr6Js16g/GxXghxfQA/rXmh+
-						lK0bYueUgkjyXSclGQe9uwIDAQABo3kwdzAdBgNVHQ4EFgQUHCmyxQT1A5E7uqal
-						xfUiaDHwCgowVgYDVR0RBE8wTYIZbmV0bG9naW4tZGV2LnN0cmF0aC5hYy51a4Yw
-						aHR0cHM6Ly9uZXRsb2dpbi1kZXYuc3RyYXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCbAbHeCjRT5CzbWDX9I1VLo3Y0hEjlmiwCvAZX
-						yKPZ5FO5fJVCtI2aqOToFbF2BVOe3/mYV8sC6dsoS38Sarwhzbh6GRRE3FywuPbp
-						UkQGTeAmB7jZ7kXLRS/tgVJbWzChljeVqofhwXjW4PfPugSuslpC+elp9PoTj/BP
-						OrfOIm9jSMG2/HPbaVR9VynfXThx+mYa261FIVQuaha6K+s4Y3vGU3qgyTtnyNYv
-						pOIaOiV5+TEokiP5oOHdbyH5Ax5+w/Tx400X/jebeY6vTW6WTKDlYMnmP/Fbv8d6
-						AZTALOEzlYlDfuws2MF1Tc3K10VtbOMIL90R5JROBwVMKw0j
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.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://netlogin-dev.strath.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://netlogin-dev.strath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://netlogin-dev.strath.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">strath.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVALntfhDpdib1U8g0APCYQ0HzFX4HMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMMGW5ldGxvZ2luLWRldi5zdHJhdGguYWMudWswHhcNMTQx
-						MTA3MTQ1MDAzWhcNMzQxMTA3MTQ1MDAzWjAkMSIwIAYDVQQDDBluZXRsb2dpbi1k
-						ZXYuc3RyYXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						n5KFxtDXYrp4ChYev6BWlmqRZWRKiGVKqukVMC9qEkRiDWkwCUU5IgPkKH3IwJfW
-						AO1xGZ+s+kZ2hwjgCVXCYMmlwk5RlRKkcCTTjqHjSZ7ZNKA2hEWOaBJF3F9lFbwk
-						AyvMUi4qn7f+mDybZHr9pbl4phANo8Fs3gnPr+yAp+G6F0EyL3At5SKpnanQ/lRy
-						dTCuXMTukeI1TDtvptr7jV2HjpO4KmEILiCsqDvnjNMT2YEFlgxa8bX+YGXG/8cH
-						6LKIQOtvSsg0D3xZvmazOWo6xg9XMAgKh6J+tE0HUr6Js16g/GxXghxfQA/rXmh+
-						lK0bYueUgkjyXSclGQe9uwIDAQABo3kwdzAdBgNVHQ4EFgQUHCmyxQT1A5E7uqal
-						xfUiaDHwCgowVgYDVR0RBE8wTYIZbmV0bG9naW4tZGV2LnN0cmF0aC5hYy51a4Yw
-						aHR0cHM6Ly9uZXRsb2dpbi1kZXYuc3RyYXRoLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCbAbHeCjRT5CzbWDX9I1VLo3Y0hEjlmiwCvAZX
-						yKPZ5FO5fJVCtI2aqOToFbF2BVOe3/mYV8sC6dsoS38Sarwhzbh6GRRE3FywuPbp
-						UkQGTeAmB7jZ7kXLRS/tgVJbWzChljeVqofhwXjW4PfPugSuslpC+elp9PoTj/BP
-						OrfOIm9jSMG2/HPbaVR9VynfXThx+mYa261FIVQuaha6K+s4Y3vGU3qgyTtnyNYv
-						pOIaOiV5+TEokiP5oOHdbyH5Ax5+w/Tx400X/jebeY6vTW6WTKDlYMnmP/Fbv8d6
-						AZTALOEzlYlDfuws2MF1Tc3K10VtbOMIL90R5JROBwVMKw0j
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://netlogin-dev.strath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://netlogin-dev.strath.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 Strathclyde</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Strathclyde</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.strath.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:ukfed-support@strath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical</GivenName>
-    <EmailAddress>mailto:ukfed-tech@strath.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 dcb11d3f..00000000
--- a/swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://neugrid4you.eu/saml/metadata.xml">
-  <md: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>
-    <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>https://federation.renater.fr/category/metier</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0: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">neuGRID for you</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://neugrid4you.eu/</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neugrid4you.eu/saml/assertion_consumer_service" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">neuGRID for you</md:ServiceName>
-      <md:ServiceName xml:lang="en">neuGRID for you</md:ServiceName>
-      <md: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.</md:ServiceDescription>
-      <md: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.</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">MAAT FRANCE GNUBILA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">MAAT FRANCE GNUBILA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gnubila.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>admin_france@lists.maatg.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/neugrid4you.eu.xml b/swamid-interfederations-2.0/neugrid4you.eu.xml
deleted file mode 100644
index 3b9cac46..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-12-05T14:46:12Z">
-      <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/neuidmsso.neu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/neuidmsso.neu.edu-idp-shibboleth.xml
deleted file mode 100644
index 1f619c54..00000000
--- a/swamid-interfederations-2.0/neuidmsso.neu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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://neuidmsso.neu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://neuidmsso.neu.edu/idp/error.jsp" 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">neu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Northeastern University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Founded in Boston, Massachusetts in 1898, Northeastern is a global, experiential research university. Grounded in its signature co-op program, Northeastern today provides unprecedented experiential learning opportunities around the world. The university’s rapidly growing research enterprise is strategically aligned with three national imperatives: health, security, and sustainability.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.northeastern.edu/securenu/?page_id=128</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>
-MIIDMDCCAhigAwIBAgIVANTzW0s51U8NUal56O40vpIuoFzIMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEW5ldWlkbXNzby5uZXUuZWR1MB4XDTEyMDYxNDEzNDIz
-NFoXDTMyMDYxNDEzNDIzNFowHDEaMBgGA1UEAxMRbmV1aWRtc3NvLm5ldS5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ5x/jLvylavHwrUJe32uF
-x+NJkVbRpCKC0KbMzl5s7eWhykeVcQ9XX6yD0LKkZh69VIBdK7M8Sa2uCvLnsroF
-eBj4p/zWnmVO0bNsMwob9kLFQ731fdymUfQe8hWsdAJEod+I2yaWiIVdkpO/1+Wo
-QTgY9GDBeaxR9sSYcEC+OZ1AztWYUzi+W9NZU5q15Bvj4KSMd8xHPt6X2pjXpdcn
-1dW6bMTf4zJykVKVqE9KOamzkzhwerFTIZRDihnNkMnIqdHCMMGt9EPl8ri369Qt
-5nRByZT5IqvMrsRoDfEcMqLNtYISrDOq0qIDc2akchbtY1L9wDwZH3dHTs/5sgNN
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEW5ldWlkbXNzby5uZXUuZWR1hihodHRwczov
-L25ldWlkbXNzby5uZXUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRLEwZY
-908D18eUbJX+rRObz91A+jANBgkqhkiG9w0BAQUFAAOCAQEAW+5UECiv34tZGrnv
-D45Q7MZOwSfINGdTDCQUkmIXpDvT6m6nhdyv3eCw/1gA7OsARQA6s8TXwjAHT9lH
-FNjGY94eOR7ccxFN2PdEHduQ4Y+hemBzG7IEPM5e+dM7celA/NVDGXSJvYdDcTYb
-c1IAYawjoFZNScgm3zhmk+w8ZVX/uM9K4CnRLbTd8nbsJL8wWAB4XBLpiB8RL+O3
-GGRfnaRfaP589L91N2+gvO264AzfuqSmkJTsbgqWbUsxSJQIz1rq0laA7NdciWds
-bUXwlCdjyQmlHbPyAQ0Ooc+zPZqDSEYbhYbaUEnp+fpZUlB/RwuOcKSUxoEm3Mre
-wFUo0A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://neuidmsso.neu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://neuidmsso.neu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://neuidmsso.neu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neuidmsso.neu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://neuidmsso.neu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">neu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVANTzW0s51U8NUal56O40vpIuoFzIMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEW5ldWlkbXNzby5uZXUuZWR1MB4XDTEyMDYxNDEzNDIz
-NFoXDTMyMDYxNDEzNDIzNFowHDEaMBgGA1UEAxMRbmV1aWRtc3NvLm5ldS5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQ5x/jLvylavHwrUJe32uF
-x+NJkVbRpCKC0KbMzl5s7eWhykeVcQ9XX6yD0LKkZh69VIBdK7M8Sa2uCvLnsroF
-eBj4p/zWnmVO0bNsMwob9kLFQ731fdymUfQe8hWsdAJEod+I2yaWiIVdkpO/1+Wo
-QTgY9GDBeaxR9sSYcEC+OZ1AztWYUzi+W9NZU5q15Bvj4KSMd8xHPt6X2pjXpdcn
-1dW6bMTf4zJykVKVqE9KOamzkzhwerFTIZRDihnNkMnIqdHCMMGt9EPl8ri369Qt
-5nRByZT5IqvMrsRoDfEcMqLNtYISrDOq0qIDc2akchbtY1L9wDwZH3dHTs/5sgNN
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEW5ldWlkbXNzby5uZXUuZWR1hihodHRwczov
-L25ldWlkbXNzby5uZXUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRLEwZY
-908D18eUbJX+rRObz91A+jANBgkqhkiG9w0BAQUFAAOCAQEAW+5UECiv34tZGrnv
-D45Q7MZOwSfINGdTDCQUkmIXpDvT6m6nhdyv3eCw/1gA7OsARQA6s8TXwjAHT9lH
-FNjGY94eOR7ccxFN2PdEHduQ4Y+hemBzG7IEPM5e+dM7celA/NVDGXSJvYdDcTYb
-c1IAYawjoFZNScgm3zhmk+w8ZVX/uM9K4CnRLbTd8nbsJL8wWAB4XBLpiB8RL+O3
-GGRfnaRfaP589L91N2+gvO264AzfuqSmkJTsbgqWbUsxSJQIz1rq0laA7NdciWds
-bUXwlCdjyQmlHbPyAQ0Ooc+zPZqDSEYbhYbaUEnp+fpZUlB/RwuOcKSUxoEm3Mre
-wFUo0A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://neuidmsso.neu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Northeastern University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Northeastern University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.northeastern.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Samuel Abromowitz</md:GivenName>
-    <md:EmailAddress>is-isos-idm@neu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kevin Legget</md:GivenName>
-    <md:EmailAddress>k.legget@neu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Samuel Abromowitz</md:GivenName>
-    <md:EmailAddress>is-isos-idm@neu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Kevin Legget</md:GivenName>
-    <md:EmailAddress>k.legget@neu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/neuresmail.sclintra.com-shibboleth.xml b/swamid-interfederations-2.0/neuresmail.sclintra.com-shibboleth.xml
deleted file mode 100644
index 2ddf2766..00000000
--- a/swamid-interfederations-2.0/neuresmail.sclintra.com-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://neuresmail.sclintra.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://neuresmail.sclintra.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Northeastern ResMail Student Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Northeastern Resident Mail Services Student Portal</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC5TCCAc2gAwIBAgIJAIR74j0ayvKFMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTClNoaWJib2xldGgwHhcNMTUwOTEwMTQzOTIwWhcNMjUwOTA3MTQzOTIwWjAV
-MRMwEQYDVQQDEwpTaGliYm9sZXRoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAtS4wsy53ARWdIt1zGL9FL+65xOPWlA23J6U2lwoWPqSCg6l1v6po8y21
-kxsMEkHb52Xa1i3ik69i9X/IRpp43dYvfJLGJjRqxjVl6JE0703diTlaxCEN0O5M
-e2sHHqSYjMLRNOsQcgWVIIbmuN3ddxjHlm7qPYGzMIeqqNPSFLIzmjoOtJqjQNrZ
-UX6bTeFslnWed71x+f8+I4bU30F+rEZAQWS8x/rKsCtQCCU3Q3AHxRtQDQH0ZFIr
-uuSfp4FHrfhjx4WvDX80v2DhtXjZE73CfH3k6upGDaFpkjTaOG8EK3Cp1SJ26EBj
-VSO4hHKugZFaMGqIf3Zv1R6wdzYEmwIDAQABozgwNjAVBgNVHREEDjAMggpTaGli
-Ym9sZXRoMB0GA1UdDgQWBBQl1wpM8ovMZB8f/SDNKbyA3k9SVTANBgkqhkiG9w0B
-AQUFAAOCAQEAXceagDJagtDgAzurO+zPaQgLn+4+B6rKwLecbE1e2YFN68iM2afd
-/jcNxxxTkVgNHr7PzBIl4ISRXMnZFwH9SMJhEAfBeryiIjVhoIMkLgTSAW+VmP8c
-AJ/rcomQRlYBxB7mLGbcyI64xU8tbV0azSg1RgKCuOVfm/lOD1NNonoA7+a+aHVN
-mDP3++DpOQcHpcGplHu75Ebr8freUMjzu2ut/fekP7sfrRe4uQhqJlC48lfm+f30
-qyCycAczHbvz3DXbqt4xsXtPAOfzdsTjDgI1uF4Vqo4Pgr0G05SnX8wg06A47A6t
-7LfGF7pjIcw52rCXI3f337AqLrkbL7Ft1Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://neuresmail.sclintra.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://neuresmail.sclintra.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://neuresmail.sclintra.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://neuresmail.sclintra.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Northeastern ResMail Student Portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Northeastern Resident Mail Services Student Portal</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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SCLogic</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SCLogic</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sclogic.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josh Sullivan</md:GivenName>
-    <md:EmailAddress>jsullivan@sclogic.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Warren Evans</md:GivenName>
-    <md:EmailAddress>wevans@sclogic.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml b/swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-shibboleth.xml
deleted file mode 100644
index a88b5ab1..00000000
--- a/swamid-interfederations-2.0/new-primo.hosted.exlibrisgroup.com-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://new-primo.hosted.exlibrisgroup.com/shibboleth">
-  <!--
-		This is a "Primo Resource Discovery at Newcastle University" Shibboleth SP for Ex Libris (UK) 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="2015-02-11T09:54:50Z">
-      <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://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Newcastle University - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Newcastle University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh6gAwIBAgIJAIdGru6Iz9m0MA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-						BAMTJWRjMDN2ZzAwMjJldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTEw
-						OTAxMTIyMTEzWhcNMjEwODI5MTIyMTEzWjAwMS4wLAYDVQQDEyVkYzAzdmcwMDIy
-						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAuZcRSbYJXYqvCMDcsN1NvvfB37VY156cSBF8FUKYdu1yco+G
-						534wiphhYFRsnkDnUuAP9yQED27E/rGfdWrQ3OhkDViuEkKxWhzqYSzopxe/5y6i
-						4oNFORY6HpbdrqF21IZc8bfspS7uz6oOET6V1hYIhd3V5nOTB5VyO1CdKd7o65wr
-						CTGj2rzKDXb4uj0HKST3aRLK26jlER5x9uR68RW4nUM45/vmHRgyqfKd+pVMPld2
-						TCGDh/jmFvjyHlzZf6jXMgVAgDUAvFXWgCxPo2fuOqlWpVJTalj3CK7uuEx6+SUk
-						I3g+FyUC5sJGMTEOwFgKjhOECeYU8+5a/zqnFwIDAQABo1MwUTAwBgNVHREEKTAn
-						giVkYzAzdmcwMDIyZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
-						BBQPC+IZUQn+WJezFAf2U7VnfAJiKjANBgkqhkiG9w0BAQUFAAOCAQEAbK7NgNnG
-						T3qgmYt+4otVR0DBCGlsj50HFvNb4C4uWOEWREUZ9Bb3Ju7E49zMRzf96HpWZneS
-						cfaUQrhYl1n8grNGdy8O0PXffSkqr0d9FfaT3IkuIQSqy6mi198brqgVeyNR5BjR
-						bi3OGv48vQdkPhzzTR5/H5/mi4U0i54sSI8GFkcRjytrqS1eqdHDRVFkdXbaKsaU
-						o+p64ZHxRlqxaFsieCz+5CdiqP9pJwHX3ghS40QMYAMP+P43YJmSlc9FnseWulik
-						1k3+idQuyryJBp0mPLCliosixjLmjXoRRDUJT8uu6J1kDnzQj3Hiub7Ag5Noo05F
-						IRUjVAaivivDPg==
-					</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://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://new-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at Newcastle University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/newcastle-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/newcastle-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 2f5070f6..00000000
--- a/swamid-interfederations-2.0/newcastle-shib.hosted.exlibrisgroup.com-shib.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://newcastle-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "Primo Resource Discovery at Newcastle University" Shibboleth SP for Ex Libris (UK) 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="2015-04-16T08:24: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Newcastle University - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Newcastle University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAM3G3V6n3/DyMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMjMwHhcNMTUwNDAyMTkxODQzWhcNMjUwMzMwMTkxODQzWjASMRAw
-						DgYDVQQDEwdhaW8wMDIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						10lVTkxpFfewuW8RJ+s4DI0pfnc7ivJJAknfWDyeMK7v+2IcHYIDPP8HceIsvMrT
-						s6isYSfxldstWHVLnryC28nHQqHYCJKD9fpvnI7kAx37RQkibZkQISSxoDSIU98R
-						KVJAi1FTktkUlzikf5+h1TSRLzQ4NNC3IteA2l2oa5xZyF82RG7+l6DL9YdAHn3p
-						tb7NuSyCFT42DByigjHpXMtftqwTbyDDXMM5pCOBjPxRb/MskClt34mtv54OZxL9
-						5bWvEu+/8aGJGL3f+xbaomKeNBiMn7OmpUxs7CUbbXMomEfUKCTdZWgd0SYWgmpP
-						sxJO//Oou3UBEcDNPYu3PQIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDIzMB0G
-						A1UdDgQWBBQpCfhRMq7ReeliuqEX197+QmeA1jANBgkqhkiG9w0BAQUFAAOCAQEA
-						KY0ioUfQCjmVFWXFNyO8s8ozsQ/lQAGwlWPYZ/2r36aGyOKaEpm6Sdze63qpKHY5
-						B70lfaqx7TDmdfMZZpf8RFYsj7wK8MdQwEsglYsaxyJcPykuntC1oOppT7W1BVKq
-						i/5547UPkU0PXP+UzFlKYUlEEWVaMgh5FHaGorWMNpoYxX4oUeVLIBLImOd6Cx4L
-						A8SOJxVv2SduRNQxDAvKVbZnU+mI+9VHMdrodzMrhxGPVyuITPXeih3fRg2fILjE
-						t3U+rPWHlfQEglmjad1ZKJfL5+Xn7BgKtbOyKXmVp+p5Nz9rqz67e232JHg1x/bx
-						yYEgCW+gFHaAf9GfC646YQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://newcastle-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at Newcastle University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml b/swamid-interfederations-2.0/newcastle.kit-catalogue.com-shibboleth.xml
deleted file mode 100644
index fb0c2706..00000000
--- a/swamid-interfederations-2.0/newcastle.kit-catalogue.com-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://newcastle.kit-catalogue.com/shibboleth">
-  <!--
-		This is a "Kit-Catalogue hosted service for Newcastle University" Shibboleth SP for Loughborough University.
-	-->
-  <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-10-18T16:26:27Z">
-      <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://newcastle.kit-catalogue.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIG4TCCBcmgAwIBAgIQHCGC1CK9V9XFPYeyU9ZeCTANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMTAwMjAwMDAwMFoXDTE2MTAwMTIzNTk1OVowPzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFueXNzYS5sYm9y
-						by5hYy51azCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOt+A9QV+8R4
-						NWqBkrIjTu9/xINfhF9fChi/eqVEwrBqXwmGc0/Sf+lzygHrj72BClpWtdIUFtTW
-						LWWVUfXqBn2mLfuygJO9kbFnJjFlDEShVIpJbIFsCUg43QBnb2UCI7vHzk9f7njW
-						/bMjMLDkfSxVNSH33cJ3CEp9/hKuUjgNj+ApX8AYn0YlVaiak15gTEH4gRFxfGNi
-						r6B8uuGX58fV7UUC/uOou6x8UAeoUk9Y1y4jwMvyZ7SRUqWvm0/RAnEgtbh3XcUO
-						TLWo3EJsMSmofvOwYvxO0Tew/avFAJPglXKaSKod0J7a0tMAhCuhmuzWoO1jvI8+
-						eW39w0p0MXvJGQiVxkYPyLi6eB9z9ljpOUx6X5hRHtyiro1ai1Xd11S8a2r+m3IB
-						WZByEraWqfdPc2l6eTAwQw+5uK1XRXzF4ek5FNE8qQQa8XhR0kV6Dz2saK2qG7P3
-						enTZZWpC6TKLypqqaep2ZvSd2uutFMBVTMwXBcRhWM8Ro0I1fhKGr6iMRLEgCwPW
-						eDC7AEfSOA8DuyCeHSZwgH4+jUfVxab5C+PeIhqKc6YTqhmQSp+6Hw9Zpn7risQq
-						eX4XrFAsoPvPcxscK9lARy74qxo5JOoE4OT6or/POCH7DTTxdBt61HaYZzlpFoo5
-						Dqk3ME/XtA2cSUf01Dqeeq0JpqxW0WHbAgMBAAGjggLgMIIC3DAfBgNVHSMEGDAW
-						gBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU7KQCFDuM+zl6I69tYQ+Q
-						BIIzneQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYI
-						KwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYG
-						Z4EMAQIBMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5v
-						cmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYp
-						aHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYB
-						BQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMIIBjAYDVR0RBIIBgzCC
-						AX+CEW55c3NhLmxib3JvLmFjLnVrghVhdHRlbmRhbnQubGJvcm8uYWMudWuCGGNv
-						LXR1dG9yLWRldi5sYm9yby5hYy51a4IUY28tdHV0b3IubGJvcm8uYWMudWuCFWRt
-						dS5raXQtY2F0YWxvZ3VlLmNvbYIVZXF1aXBtZW50Lmxib3JvLmFjLnVrghprYy1k
-						ZXZlbG9wbWVudC5sYm9yby5hYy51a4ISa2MtZG11Lmxib3JvLmFjLnVrghhrYy1u
-						ZXdjYXN0bGUubGJvcm8uYWMudWuCGmtjLW5vcnRodW1icmlhLmxib3JvLmFjLnVr
-						ghlrYy1wb3J0c21vdXRoLmxib3JvLmFjLnVrghtuZXdjYXN0bGUua2l0LWNhdGFs
-						b2d1ZS5jb22CFG5ld3dlYnBhLmxib3JvLmFjLnVrghdwcm9qZWN0bGlzdC5sYm9y
-						by5hYy51a4IRd2VicGEubGJvcm8uYWMudWuCFXd3dy5raXQtY2F0YWxvZ3VlLmNv
-						bTANBgkqhkiG9w0BAQUFAAOCAQEAphJCGIqShIxjiFA5nUWXF7HkHLajaEc0HBrJ
-						4MrJ6TtH2GJCBZsr6+p0j47saos465BXpC8UR5VmSwlCJ7E70DUyn2lhKCaJyFO9
-						S/nK5mQjfutwJvtonCIPWKUnDYibrXslgortvBhB8YAJrlrEzSvWDTf9FfeMzTNs
-						ZpQgLiW8vcEZ1hQrb+UrelMV2Z9tjAaFbCFbDFAm6FeEsaMHiG/s65TLHgy9HLdd
-						omplw+7n6grAbJxkfMhJUGL1ehSy1a2t3sR5vV6SF60Kamr6qKq0tjEdIJ6A3URM
-						lXYQBVAJVzJxMOn+iIg4UvQj9d5mJrhijCShO3MoY1gSyzA9Lg==
-					</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://newcastle.kit-catalogue.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://newcastle.kit-catalogue.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Loughborough University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Kit-Catalogue hosted service for Newcastle University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kit-catalogue.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kit-Catalogue</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:kit-catalogue@lboro.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kit-Catalogue</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>mailto:kit-catalogue@lboro.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nlw-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/nlw-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 1be90e36..00000000
--- a/swamid-interfederations-2.0/nlw-shib.hosted.exlibrisgroup.com-shib.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://nlw-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "National Library of Wales - Primo" Shibboleth SP for Ex Libris (UK) 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="2015-07-02T11:38:42Z">
-      <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://nlw-shib.hosted.exlibrisgroup.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://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Library of Wales - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of National Library of Wales</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAJtjN/Sjy8NPMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMjYwHhcNMTUwNDAyMTkyMDQ1WhcNMjUwMzMwMTkyMDQ1WjASMRAw
-						DgYDVQQDEwdhaW8wMDI2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						7Jt19IZw6ICRXtbeaAcFrr5D6aadKv+8DW6DCLU7COaPBgPhlQW3Y6yqh4T8XTpz
-						AU4I5HISgZlm9/C8aLQWWzxa432p6FcGrkY4EYGyT7Ez4qcwamisIN6Hsb6mtPaJ
-						a/ZpRWcEYhS3z0wiJiGHJa3z81DmZ8fBqZkGEj2PRYpdQdV80ILiJeAHUnAKL59E
-						IFFfbzJwqz0OImdHMS8BI8ewojta8Cnun/Ue8JOvp703Yt4/YmXQlb69lN29Rhet
-						bDEUL3rjQK+Omf/kCGUdQtXfuFl5zvL3JUz6ktwzj5rMtCAqNaZnEHsdh2YC6IWK
-						HeE3OR5THvu5+NLDuAkDywIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDI2MB0G
-						A1UdDgQWBBR8qDCK47IUQfSx79u36cex86OrXzANBgkqhkiG9w0BAQUFAAOCAQEA
-						6nVdsxI/Z3eSLnIjQt2xvpLHbA0xfhcNi5VvKOHSRxZryE+PIe+Lzu9ycj3d3t4O
-						OWIGLafxvNi52udtPa8uG4ZsUEe3UUm5SV0ezVWZK2H2LkX3E7rq6xWGuZxmZtGy
-						8yaLXKOQsecj+O111rCOSmVGPwho7+AKtBMl7qD+2kN7j3ZGc8Ze9MG/M1RuOhpB
-						4sefEKZCcWZJfjwmSQa8KKz7p3teflnKndl0yovrb1Yosy3C0GqGJz5OmyOxfO3I
-						vOdVbh1NvO7LYzioXPk7URk1vst4P9pQbmcUFNRrd+WjfzOUjiAJYGm43DNqQEqC
-						XfBl+0BWyo22ZUbTodVKFw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nlw-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for National Library of Wales</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/noec.aai.niif.hu-shibboleth.xml
deleted file mode 100644
index 3a67e249..00000000
--- a/swamid-interfederations-2.0/noec.aai.niif.hu-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://noec.aai.niif.hu/shibboleth">
-  <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="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>href-test</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">SP for eduGAIN attribute release checker - no encat</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SP for eduGAIN attribute release checker - no encat</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">SP for eduGAIN attribute release checker - no encat</mdui:Description>
-        <mdui:Description xml:lang="en">SP for eduGAIN attribute release checker - no encat</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">https://earc.eduid.hu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">https://earc.eduid.hu/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICwjCCAiugAwIBAgIJAPqTsvGnOWExMA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGTAXBgNVBAMTEG5vZWMuYWFpLm5paWYuaHUwHhcNMTUxMTAzMTkwODIwWhcNMjUxMDMxMTkwODIwWjBLMQswCQYDVQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxDjAMBgNVBAoTBU5JSUZJMRkwFwYDVQQDExBub2VjLmFhaS5uaWlmLmh1MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnlBput7ADIvXu+WzjxmkUKzi8fYXwkBY9pziZ0Ah+JG8sHhe31F8wd5NKPESARoW9SzNjaxttsLKnaWFZ5Ter8zD6eAzKDUWUOlEnADL2J+xvxXhfzdkY8Z/o/pFK8o64RJ5gcS25g0a/3GVlwFuo/YZRKm2yy0arjSWvZkI1swIDAQABo4GtMIGqMB0GA1UdDgQWBBT2E4QkQqkl8IyD5KnL3qSx1PPTjjB7BgNVHSMEdDBygBT2E4QkQqkl8IyD5KnL3qSx1PPTjqFPpE0wSzELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MQ4wDAYDVQQKEwVOSUlGSTEZMBcGA1UEAxMQbm9lYy5hYWkubmlpZi5odYIJAPqTsvGnOWExMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAiD3Gv7yUgsTLa87IAUT1XcvoSK2ez4FJ9C6jD57MZIeZx++SkpoRLrU2/zDYqlF+7Qp1wkO+6qssTOYI/sD8Njy75A4bAlbu79T4PzaoBJx0okhc7svi382hSv4Qyg+Na0wOOFKZ/rEfBK4T+Sgk3PI0ZjM5PlJwj8r6OaC4WRA=</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>noec.aai.niif.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://noec.aai.niif.hu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/ECP" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://noec.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="hu">SP for eduGAIN attribute release checker - no encat</md:ServiceName>
-      <md:ServiceName xml:lang="en">SP for eduGAIN attribute release checker - no encat</md:ServiceName>
-      <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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn: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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml
deleted file mode 100644
index d4b8156a..00000000
--- a/swamid-interfederations-2.0/nortcoll.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nortcoll.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Bath College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-28T10:54:50Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">nortcoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIIQ+s4Z37Tk+QwDQYJKoZIhvcNAQEFBQAwPzEgMB4GA1UE
-						CgwXTm9ydG9uIFJhZHN0b2NrIENvbGxlZ2UxGzAZBgNVBAMMEmlkcC5ub3J0Y29s
-						bC5hYy51azAeFw0xMzA2MjYwOTUyNTVaFw0yMzA2MjYwOTUyNTVaMD8xIDAeBgNV
-						BAoMF05vcnRvbiBSYWRzdG9jayBDb2xsZWdlMRswGQYDVQQDDBJpZHAubm9ydGNv
-						bGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH2GL7v3ab
-						MLFWgzBVzSj8VLSGJ9ATCAdxU9rfFTJm/9OWMo13AReVUclXxf56GQo0FJOc39hM
-						6XsyyeZTts2nDDUzg+t0Xibp2UKLSppkuSwVGTqHMaJp7DpUCEluUnhu3ZU/lBwo
-						ZiOb7IGtRvMlTgCkaIlAmvrrGvx09F9AopZdIY6a4kL6Oia8IpIP3pmeRqP7wrG1
-						28kjGbS/4nhAGKvwl+pzBGbnKXPLPXV6xrJB7S4KeS/RotDLgoI9/BOj9CCpjE2U
-						FtrQ3NEkfWhIVlZtJ+9M5YchdhsL1NwiO/ysgeLCOb+PJ0i1hkl7YxPf5oYgk37M
-						kPkontewA0prAgMBAAGjUDBOMB0GA1UdDgQWBBTEMkl+KBelULhBUBgqoQSs3Zk2
-						jzAfBgNVHSMEGDAWgBTEMkl+KBelULhBUBgqoQSs3Zk2jzAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCSYXa4gCKN3kYfrj3zI0qlVhdP0lqxbj3NvtbK
-						zt+XYGjOX9/cW51qe7islCZ4jQcBeiq0NKMHHvLSQm38xy0T18VOLplrnXBU+0Uo
-						NnE0ausV72tNdfOz4QjcAnB0IwZRQr4geoBva4pV92l3Ru9UyYzwu0dH1IHc6j6W
-						bHhSmZU3SkxAghaK0RKw+VdI0IEXmAjIXgYvKSp4ERZtQxQiHzDaC6TnINxbJYaL
-						CSul4tUiaGBvrD99sK5xjSXRyT76i+NqkzJme8EXyYH6C+s/pkoragQycIXRTAjo
-						J0oYK7cSzs2XI5pXVxiG7kNJsJQjVrM0wa9wTu+fWkXIg1Pq
-					</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>
-						MIIDUDCCAjigAwIBAgIIQ+s4Z37Tk+QwDQYJKoZIhvcNAQEFBQAwPzEgMB4GA1UE
-						CgwXTm9ydG9uIFJhZHN0b2NrIENvbGxlZ2UxGzAZBgNVBAMMEmlkcC5ub3J0Y29s
-						bC5hYy51azAeFw0xMzA2MjYwOTUyNTVaFw0yMzA2MjYwOTUyNTVaMD8xIDAeBgNV
-						BAoMF05vcnRvbiBSYWRzdG9jayBDb2xsZWdlMRswGQYDVQQDDBJpZHAubm9ydGNv
-						bGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH2GL7v3ab
-						MLFWgzBVzSj8VLSGJ9ATCAdxU9rfFTJm/9OWMo13AReVUclXxf56GQo0FJOc39hM
-						6XsyyeZTts2nDDUzg+t0Xibp2UKLSppkuSwVGTqHMaJp7DpUCEluUnhu3ZU/lBwo
-						ZiOb7IGtRvMlTgCkaIlAmvrrGvx09F9AopZdIY6a4kL6Oia8IpIP3pmeRqP7wrG1
-						28kjGbS/4nhAGKvwl+pzBGbnKXPLPXV6xrJB7S4KeS/RotDLgoI9/BOj9CCpjE2U
-						FtrQ3NEkfWhIVlZtJ+9M5YchdhsL1NwiO/ysgeLCOb+PJ0i1hkl7YxPf5oYgk37M
-						kPkontewA0prAgMBAAGjUDBOMB0GA1UdDgQWBBTEMkl+KBelULhBUBgqoQSs3Zk2
-						jzAfBgNVHSMEGDAWgBTEMkl+KBelULhBUBgqoQSs3Zk2jzAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCSYXa4gCKN3kYfrj3zI0qlVhdP0lqxbj3NvtbK
-						zt+XYGjOX9/cW51qe7islCZ4jQcBeiq0NKMHHvLSQm38xy0T18VOLplrnXBU+0Uo
-						NnE0ausV72tNdfOz4QjcAnB0IwZRQr4geoBva4pV92l3Ru9UyYzwu0dH1IHc6j6W
-						bHhSmZU3SkxAghaK0RKw+VdI0IEXmAjIXgYvKSp4ERZtQxQiHzDaC6TnINxbJYaL
-						CSul4tUiaGBvrD99sK5xjSXRyT76i+NqkzJme8EXyYH6C+s/pkoragQycIXRTAjo
-						J0oYK7cSzs2XI5pXVxiG7kNJsJQjVrM0wa9wTu+fWkXIg1Pq
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.nortcoll.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.nortcoll.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Bath College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Norton Radstock College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nortcoll.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kye</GivenName>
-    <SurName>Pearce-Rees</SurName>
-    <EmailAddress>mailto:kye.pearce-rees@nortcoll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kye</GivenName>
-    <SurName>Pearce-Rees</SurName>
-    <EmailAddress>mailto:kye.pearce-rees@nortcoll.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/notify.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/notify.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 8cef7766..00000000
--- a/swamid-interfederations-2.0/notify.ncl.ac.uk-shibboleth-metadata.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://notify.ncl.ac.uk/shibboleth/metadata">
-  <!--
-		This is a "Notification" Shibboleth SP for the University of Newcastle upon Tyne.
-	-->
-  <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="2016-01-05T11:05:54Z">
-      <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://notify.ncl.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAMJRPlnJoPNzMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2x0c2FsZXJ0MDEuY2FtcHVzLm5jbC5hYy51azAeFw0xNjAxMDQxMDA0MjJa
-						Fw0yNjAxMDExMDA0MjJaMCYxJDAiBgNVBAMTG2x0c2FsZXJ0MDEuY2FtcHVzLm5j
-						bC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKRHwhBL0wfZ
-						1yjQoNKnYDLyoCFDlwNGNjLMKwjWnMYQI9LUUzkMXKniU+8Ca4q169iIgttKsIXs
-						layTWSx7JjMuW3WjVS9ZJariLlNEwlMrLWjXBBgTG6sbTZaF8zhuFXdaJ8jSM3q6
-						njQWuZuacUWtT9zGkBdno+x4ZKUsr/PmpZiFCl83FmqyR4aFOrZWJf2mxaOwToL6
-						wtgyJeYcuB6270ITQmII3xWMlLT/bMfCFvtP77gbpcySglVHDkne8aNtlL1vs//k
-						mQcE5m98rkWQN3sHLv/+r6ALR3cKuBnHucyALx6Gv2aSu7HciGCZE/oaHHb/HPdK
-						O/pvBohDzQ8CAwEAAaNJMEcwJgYDVR0RBB8wHYIbbHRzYWxlcnQwMS5jYW1wdXMu
-						bmNsLmFjLnVrMB0GA1UdDgQWBBRb76oLxarnCkg04gf5vs7NKJL4PjANBgkqhkiG
-						9w0BAQUFAAOCAQEAFP+BtC7xocTjILUNlwUU+toDsaDs7BNjq6yvxsADHKV71RcL
-						PE2zzQKU3ULa4oVjU/yGCZydPw8RtCumnoWJlybduoml9XJamtsWma/9xZq7gmx0
-						cacCOtpx5QV1YZdJU3Lb71x+5+s90MaC1LecNfEyuqM+kQCXVcSwKD3XOw0qpSwB
-						Wlq4Soq4QUkxlYFXP0JNXJy62uRk8Zkkk/cdQzd4dobo3wmnng+Vj8NmPJo7L7pB
-						p8EpFlUZK2rYtwRforxMLa4QiMeeW9C7tFO9K5C7cRbUpDiZKUiDQlAUzBEWg8kR
-						hwibfza/3X5Qgg0cxnSxzS1NtJOl0ORjRjfMyA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://notify.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://notify.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newcastle University Notification SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Franks</SurName>
-    <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Franks</SurName>
-    <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml b/swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
deleted file mode 100644
index c13aafcf..00000000
--- a/swamid-interfederations-2.0/nrc-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.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://nrc-test.literatumonline.com/action/samlACS/shibboleth/testshib/sp">
-  <!--
-		This is a "NRC Research Press Test" 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-11-14T10:59:33Z">
-      <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">NRC Research Press Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">NRC Research Press Test SP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://nrc-test.literatumonline.com/page/about</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDtTCCAp2gAwIBAgIJALKKItp/j602MA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEhMB8GA1UEAxMYd3d3Lm5yY3Jlc2VhcmNocHJlc3Mu
-						Y29tMB4XDTExMDExODIyMTkyOFoXDTIxMDExNTIyMTkyOFowgZkxCzAJBgNVBAYT
-						AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEd
-						MBsGA1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBT
-						eXN0ZW1zLCBJbmMuMSEwHwYDVQQDExh3d3cubnJjcmVzZWFyY2hwcmVzcy5jb20w
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcz5rmUAuG5ucWJq6TAKiy
-						jdkO5jrOKk+rUFbtvHqCdEy0ndFUraE+sQO4zuRabXKzI6p7sF090VqDi9NZ4Zq0
-						uK2m6Wuwkzr5DRstBamZXzUZdFZ/NOQxFIQbhx+ZNVx02IlK89CZmzRzaczqgwtd
-						j0IPZY2SpWeZuRfFZ0H6IBI/I5rL+HaokTdZaYgRUasqu7HFdKquN369iP7Qqe7l
-						Yhm9XtVnEMLsHuPy1gNkyOddLdHKt9oKzKkql7IkhcGbE/f4YrKIqxC5SvdSE9cg
-						ih+IO/OAyHn+cS0LqNCECRbdnViUgUaSr5/s9FXTTMsEMtJtgZQyEzGW9B9omLhJ
-						AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADcSQSrkKZG/QL6LSKSG8rKB0BxWNFvO
-						3mEBndEEsioTZzPGzSfuMcEDdICWyILaXN7HraUkTCvSD1N9n/AS8uu+jCoe+f8z
-						cV3f15LjxYyZI9ZmO9eixGA2huK2LsRzAj93TWYK7Q0CuZrTq/3J/vJ+xvM2habG
-						PToSEnpA/ALGVSXSxGpLJYn84qX9ub0yX1yYNmleylRkHqFwYHvdU5Hk7UZdrCKZ
-						vMIejpaSZn0yf3ZFn8eebCpLnlVN0FLNCgel39FLMGqNbey0wpFbzocv4fvX6pmi
-						Bz9FTGLHvLqpoRV/zghBPM32BhT8U6PJfC56HlfNfbRtx9nHZK2GfJw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nrc-test.literatumonline.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nrc-test.literatumonline.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nrc-test.literatumonline.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NRC Research Press Test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://nrc-test.literatumonline.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/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 2970a327..00000000
--- a/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.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://nrenadmin.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">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>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5EaWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcNMTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRlbzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRlcyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJUvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEUamd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCCAdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFjG3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8UefMgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkGI6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEvyL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJGs5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</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>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5EaWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcNMTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRlbzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRlcyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJUvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEUamd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCCAdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFjG3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8BggrBgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8UefMgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkGI6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEvyL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJGs5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98</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/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nrenadmin.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://nrenadmin.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://nrenadmin.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://nrenadmin.redclara.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Nrenadmin - RedCLARA</md:ServiceName>
-      <md:ServiceName xml:lang="es">Nrenadmin - RedCLARA</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">RedCLARA Nrenadmin Service</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="es">Servicio Nrenadmin de RedCLARA</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.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.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.37" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </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-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/nsf236.neocase-software.net-connexion_neocase.xml b/swamid-interfederations-2.0/nsf236.neocase-software.net-connexion_neocase.xml
deleted file mode 100644
index 46140feb..00000000
--- a/swamid-interfederations-2.0/nsf236.neocase-software.net-connexion_neocase.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nsf236.neocase-software.net/connexion_neocase">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">PennStatePortal</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID2TCCAsGgAwIBAgIJAPfTg+MQTPE0MA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
-VQQGEwJVUzELMAkGA1UECAwCTUExDzANBgNVBAcMBk5ld3RvbjEZMBcGA1UECgwQ
-TmVvY2FzZSBTb2Z0d2FyZTEcMBoGA1UECwwTU2FhUyBBZG1pbmlzdHJhdGlvbjEc
-MBoGA1UEAwwTbmVvY2FzZXNvZnR3YXJlLmNvbTAeFw0xNjAxMDUyMTA1NDdaFw0y
-NjAxMDQyMTA1NDdaMIGCMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTUExDzANBgNV
-BAcMBk5ld3RvbjEZMBcGA1UECgwQTmVvY2FzZSBTb2Z0d2FyZTEcMBoGA1UECwwT
-U2FhUyBBZG1pbmlzdHJhdGlvbjEcMBoGA1UEAwwTbmVvY2FzZXNvZnR3YXJlLmNv
-bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7XdqdPd3gJj2ow3N9c
-rft+GPEnR9Ff8SNhGxeIug6778pnjCLK90Vs+wFNfKPchFDiKZkvBm/e/wnSFrCC
-RrWcBZXjkS4ejoKWumHE56CGRugJCxxyA3Ez2BhEfaYM9bwqLYDxbSVTAMTMywLl
-257CpOfc+ePTk3ph9+gBLhJ7nk8OuW0NPFK6Nbvn9ozX0eTAs60JTOW0lxnGyTx8
-w19Ni7TX51fUP5XPq0i2yxjBhqDL6lz3P6+kl4ciXVRCHZcB+D8HaJz5VtPSXIsF
-ehtjzo2WdaMnmq12kv8BtcrqUjjEby43XuXIg5ijNC/3YOqSC9JfkQJzLVon+rNJ
-QNcCAwEAAaNQME4wHQYDVR0OBBYEFPkmpy2nziy4mpCL9lITpwnlSATpMB8GA1Ud
-IwQYMBaAFPkmpy2nziy4mpCL9lITpwnlSATpMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBABE4tYVRpgv1GMTVPpVybTrmE6ltK+XOtzdgQxmB9yc2KKYK
-ufvstQy4S8IF/7/f8niQUOEt3XTjJyYJAYiM0feO/tk/9r3xhSLNBPoDlnPkL/ce
-GJr6Ol5ROoVI/m5YMXDKo3UrsdgcJ//R/Oiqe4vAQsyTdRtFB8BFZkfZlgjIT+OB
-PsyFdVd0AeqkvbUZkZhNlax0u0AJv2oircEYNiZllrvDOraTBJkfI8fEyEEdYe18
-ciAugVZ5HD8JlVy+ARFOaQiqh2UmipYv+T2sFWOaXilbIkL8aPPPsM18xL6/ZE3Y
-g5bEi3lvWxUKBMOgNB+BW/+09dAvBdLuR2JSlaU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nsf236.neocase-software.net/connexion_neocase/SAML/AssertionConsumerService.aspx" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Neocase Software Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Neocase Software Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.neocasesoftware.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Eileen Szczesuil</md:GivenName>
-    <md:EmailAddress>eszczesuil@neocasesoftware.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Nicoleta Petcu</md:GivenName>
-    <md:EmailAddress>npetcu@neocasesoftware.com</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 12454a55..00000000
--- a/swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://nte.gemtech.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Ecole des Mines de Nantes</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAYklEQVQ4y62QsQ2AMAwEzyj7UDMAHXPATgzhNaiZyFTpCCL+fGvrdP8gxgDm5YzWw33tBjTvk2rwCogIDWBmGqAn5c/Tsa3jDepOaUDPTt+gapQFFAB3H6OTruDu6QryBnIeqYcTIbO1P1EAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTgrMDI6MDBA9ekLAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU4KzAyOjAwMahRtwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.emn.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Ecole des Mines de Nantes</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>
-					      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>
-    </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-POST" Location="https://nte.gemtech.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nte.gemtech.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://nte.gemtech.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emn.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nte.gemtech.fr/idp/profile/SAML1/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">Ecole des Mines de Nantes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole des Mines de Nantes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.emn.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Christian Janin</md:SurName>
-    <md:EmailAddress>Christian.Janin@emn.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Alain  Bouyahyiaoui</md:SurName>
-    <md:EmailAddress>Alain.Bouyahyiaoui@emn.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nyu.reclaimhosting.com.xml b/swamid-interfederations-2.0/nyu.reclaimhosting.com.xml
deleted file mode 100644
index 696e05f5..00000000
--- a/swamid-interfederations-2.0/nyu.reclaimhosting.com.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://nyu.reclaimhosting.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">NYU Domains</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://hosting.nyu.edu</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDCTCCAfGgAwIBAgIJAJPEuYz0OXIoMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFm55dS5yZWNsYWltaG9zdGluZy5jb20wHhcNMTYwMTA0MTMyNDIyWhcNMjYw
-MTAxMTMyNDIyWjAhMR8wHQYDVQQDExZueXUucmVjbGFpbWhvc3RpbmcuY29tMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvtLGxzYHTwRPHUIsQgwPa1n0
-1dAzDytRw1a4Bk3a8Gz7p82Jxr/2Sux1+ZPLD1ziAKbwDFdcb4RENMZWXmMPp5Xp
-DsSzMtWdrE1ZolwtEynzJ7uiAc3Vl0ztVVZVAUySIfsjNNdpXM94xja+XrNYiEEF
-L0NftuIQuI3uc1NOl1YIwsem+JZeoZbEYdf0farUqeHtDaVM3wk1NDfLPb2iOVaG
-suAo334IZbPjp9GIy5dsmzNfSjXyesUvSHVGzI3gZzYJdde+V0LhXLjrRE8OWIjo
-GEDbLbaRllCTQBAc5zF2fRojNp43Yw5UJUNEgRXGwW95TV7MeSxt901L1d5kFQID
-AQABo0QwQjAhBgNVHREEGjAYghZueXUucmVjbGFpbWhvc3RpbmcuY29tMB0GA1Ud
-DgQWBBSRoHyH/9kV7fuCYCn2kHjXyW9lxjANBgkqhkiG9w0BAQUFAAOCAQEAd5Ge
-vHVXb8NCt4dp2m4Rny5PO3HCjWwS53b4/SC5Xp3D7Sxi35NKgJSVPasvrHfxiQjZ
-75NKFk97TyMrq4WzJfGKP6k316KZM5fxAUSV8Fyc5kRHCKjwJac6pf1LyX/SUu+n
-1AZeeKe/iM2dIZUMm+JeDsHq9QzER2fEiJILAaPYv0zfwMsybjpRSRNbAPjKDaHz
-TFZtretB5/VzPuQVXtW+vJFruW0d9E118qiALqOOzza6wSnRQaM0N3S2QJ0alEYC
-aZk9fzZpu0dOU8vlpWhAra6IebMahNUamuaNfjAVcTQ8OdaEmhQyeZrrjIyu3mzx
-22R32vEVA6N+Z5b/8g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://hosting.nyu.edu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hosting.nyu.edu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hosting.nyu.edu/Shibboleth.sso/SLO/POST"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hosting.nyu.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">NYU Domains</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Reclaim Hosting, LLC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Reclaim Hosting, LLC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://reclaimhosting.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tim Owens</md:GivenName>
-    <md:EmailAddress>tim@reclaimhosting.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jim Groom</md:GivenName>
-    <md:EmailAddress>jim@reclaimhosting.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nyusteinhardttickets.universitytickets.com-shibboleth-sp.xml b/swamid-interfederations-2.0/nyusteinhardttickets.universitytickets.com-shibboleth-sp.xml
deleted file mode 100644
index a88dabbe..00000000
--- a/swamid-interfederations-2.0/nyusteinhardttickets.universitytickets.com-shibboleth-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://nyusteinhardttickets.universitytickets.com/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">NYU Steinhardt Commencement Tickets</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEFzCCAv+gAwIBAgIJAOKNYZKTkGOxMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
-VQQGEwJVUzELMAkGA1UECAwCTlkxETAPBgNVBAcMCE5ldyBZb3JrMSAwHgYDVQQK
-DBdVbml2ZXJzaXR5VGlja2V0cywgSW5jLjEiMCAGA1UEAwwZVW5pdmVyc2l0eVRp
-Y2tldHMgU3VwcG9ydDEsMCoGCSqGSIb3DQEJARYdc3VwcG9ydEB1bml2ZXJzaXR5
-dGlja2V0cy5jb20wHhcNMTAwODI3MTQzNDMwWhcNMTMwODI2MTQzNDMwWjCBoTEL
-MAkGA1UEBhMCVVMxCzAJBgNVBAgMAk5ZMREwDwYDVQQHDAhOZXcgWW9yazEgMB4G
-A1UECgwXVW5pdmVyc2l0eVRpY2tldHMsIEluYy4xIjAgBgNVBAMMGVVuaXZlcnNp
-dHlUaWNrZXRzIFN1cHBvcnQxLDAqBgkqhkiG9w0BCQEWHXN1cHBvcnRAdW5pdmVy
-c2l0eXRpY2tldHMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-tuDuyswVfkWKroBS9oOpm2QqRJecNIyZ7DMf9m7jwFFaQiPN3NYTe9C35I3rsmqp
-UvSK075z34uNrBddsz29CnVurUv6geM+mBUZB11oFG6rGxuT3wfYTpA54kbVQps1
-GHL8HV95fB5xEagZd888i7CFmXZMJ3xF4R9h8UDe09ZlQ5sjY/E6Ff0bIaAP6phj
-l0IsIBYRPUeIGMYPqw7azmFy7XS4FPTrQmya1E7wxf/6CXot5EYhyYLr7RKdOjp5
-foIkedY1ZhjuWZFa6EPaIYqqz8v9nGJx3uW3dZeuXfNrSjvj0RasHNXU84y0FP1S
-ex6ywCFhLIVS5ewXXm6b9QIDAQABo1AwTjAdBgNVHQ4EFgQUDCeDghnKlaF2rAwJ
-rB0DSvAOpfwwHwYDVR0jBBgwFoAUDCeDghnKlaF2rAwJrB0DSvAOpfwwDAYDVR0T
-BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAEBt2aRlN01fZYYXwid/k/QaVlJUF
-RjFJouAFyC0N4sjZDEZxnOrLV8QxVABNGwJ78HDeQ7Z2xOeOEvKzORB9RJvsz4ac
-FuEmARQX8QDiSzeCvjiq0VBd46KVYlU0hSXRM99VEexB+V/S5/h4xRHaaRwcWD0k
-rcx+OJkf4WTNRm6t2+LOFcOZ1VV4C3DnPbd0nCJlJSzHYUKGfeoJJJ7ew4KZF4le
-2fdSm7mihM6r2O047IbPr9qkVRDXfaIkXfFvCBPKogZ0pv41ctocTbVvTKoAbe6i
-npy6/mAHObt21m69If4I8DgLUvCuVIIbt/4TZVqeiN7mHIPk2XtftnMpSw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nyusteinhardttickets.universitytickets.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">NYU Steinhardt Commencement Tickets</md:ServiceName>
-      <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="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UniversityTickets</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UniversityTickets</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://universitytickets.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>UniversityTickets Support</md:GivenName>
-    <md:EmailAddress>support@universitytickets.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/o-las.net-simplesaml.xml b/swamid-interfederations-2.0/o-las.net-simplesaml.xml
deleted file mode 100644
index 163fb55d..00000000
--- a/swamid-interfederations-2.0/o-las.net-simplesaml.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://o-las.net/simplesaml">
-  <!--
-		This is a simpleSAMLphp SP for RiskWize Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-15T15:01:20Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEjDCCA3SgAwIBAgIJAOlTCyllHsJlMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
-						VQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNV
-						BAoTEFJpc2tXaXplIExpbWl0ZWQxEjAQBgNVBAMTCW8tbGFzLm5ldDEqMCgGCSqG
-						SIb3DQEJARYbc3VwcG9ydEBlc3NlbnRpYWxza2lsbHouY29tMB4XDTEzMDIxNTEy
-						MTMzOVoXDTIzMDIxMzEyMTMzOVowgYoxCzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZH
-						YWx3YXkxDzANBgNVBAcTBkdhbHdheTEZMBcGA1UEChMQUmlza1dpemUgTGltaXRl
-						ZDESMBAGA1UEAxMJby1sYXMubmV0MSowKAYJKoZIhvcNAQkBFhtzdXBwb3J0QGVz
-						c2VudGlhbHNraWxsei5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCzBw8unrlJzrEx1ScoRXbGY38ubsh1jyFdOs1uvgiDNNG+KLc9Pjwre65KTnDY
-						hyu+EvFdD9AVoYPRttD9zqCeD19I1TIy22idIRriJGcX0SCs3Dq8w2N+FJoyy2p1
-						G+47j4CY85Qzf797shUA/eTapnFbuQruS2PiLrx1uSx3HEIXNSYj0HyxUP7Cx8Ru
-						MROnYnLtqceX2TzZDbA+1T+rhxIxsiSRG+UJRuHuOqsP0ysaIh9bYunTJRIp5eZB
-						UdlxKEn8/vHKO1Q7j3PG7semIP48HLI741F4xHwnb7juU/L5jBc/mDUUuYcJO7PO
-						dwJUBre6uvZCTsvQuH1nsVY9AgMBAAGjgfIwge8wHQYDVR0OBBYEFKzwDC8hO6M7
-						hPFSjiLQNoTwe8l3MIG/BgNVHSMEgbcwgbSAFKzwDC8hO6M7hPFSjiLQNoTwe8l3
-						oYGQpIGNMIGKMQswCQYDVQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQH
-						EwZHYWx3YXkxGTAXBgNVBAoTEFJpc2tXaXplIExpbWl0ZWQxEjAQBgNVBAMTCW8t
-						bGFzLm5ldDEqMCgGCSqGSIb3DQEJARYbc3VwcG9ydEBlc3NlbnRpYWxza2lsbHou
-						Y29tggkA6VMLKWUewmUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
-						PI2idOloyeT1CbmfwW8PYhiV2G/HfA2/y/vwQ4C8XP6fvhbY9g9YmRI3lC7CbJjS
-						fVYbyWr4Nxc7ZHrpJAfTN2ZvkF08wKldoB5fY72G50tLekoDobhwoW9LXPS9aqeG
-						xtl8wKCKoPT+59pMroQtEfdm656QOXGcoERNOzFpa6OwHX8x11TjQ3PiDCGNCpxU
-						kaa2zts1SP2Y2bsCzqpD78gA+QvpBnnjljTXqQtl9TVtY/0+5ht4Qh/Jg8VYSYYy
-						YbpAsVOhDShM+eAqbrq+C3FwyX8CUJOg98Nx5B9dKaywc5KWhvCjyeEr1sNF9YGk
-						3w5WoLhEjWbRMnhM//Ygow==
-					</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>
-						MIIEjDCCA3SgAwIBAgIJAOlTCyllHsJlMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
-						VQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNV
-						BAoTEFJpc2tXaXplIExpbWl0ZWQxEjAQBgNVBAMTCW8tbGFzLm5ldDEqMCgGCSqG
-						SIb3DQEJARYbc3VwcG9ydEBlc3NlbnRpYWxza2lsbHouY29tMB4XDTEzMDIxNTEy
-						MTMzOVoXDTIzMDIxMzEyMTMzOVowgYoxCzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZH
-						YWx3YXkxDzANBgNVBAcTBkdhbHdheTEZMBcGA1UEChMQUmlza1dpemUgTGltaXRl
-						ZDESMBAGA1UEAxMJby1sYXMubmV0MSowKAYJKoZIhvcNAQkBFhtzdXBwb3J0QGVz
-						c2VudGlhbHNraWxsei5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCzBw8unrlJzrEx1ScoRXbGY38ubsh1jyFdOs1uvgiDNNG+KLc9Pjwre65KTnDY
-						hyu+EvFdD9AVoYPRttD9zqCeD19I1TIy22idIRriJGcX0SCs3Dq8w2N+FJoyy2p1
-						G+47j4CY85Qzf797shUA/eTapnFbuQruS2PiLrx1uSx3HEIXNSYj0HyxUP7Cx8Ru
-						MROnYnLtqceX2TzZDbA+1T+rhxIxsiSRG+UJRuHuOqsP0ysaIh9bYunTJRIp5eZB
-						UdlxKEn8/vHKO1Q7j3PG7semIP48HLI741F4xHwnb7juU/L5jBc/mDUUuYcJO7PO
-						dwJUBre6uvZCTsvQuH1nsVY9AgMBAAGjgfIwge8wHQYDVR0OBBYEFKzwDC8hO6M7
-						hPFSjiLQNoTwe8l3MIG/BgNVHSMEgbcwgbSAFKzwDC8hO6M7hPFSjiLQNoTwe8l3
-						oYGQpIGNMIGKMQswCQYDVQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQH
-						EwZHYWx3YXkxGTAXBgNVBAoTEFJpc2tXaXplIExpbWl0ZWQxEjAQBgNVBAMTCW8t
-						bGFzLm5ldDEqMCgGCSqGSIb3DQEJARYbc3VwcG9ydEBlc3NlbnRpYWxza2lsbHou
-						Y29tggkA6VMLKWUewmUwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
-						PI2idOloyeT1CbmfwW8PYhiV2G/HfA2/y/vwQ4C8XP6fvhbY9g9YmRI3lC7CbJjS
-						fVYbyWr4Nxc7ZHrpJAfTN2ZvkF08wKldoB5fY72G50tLekoDobhwoW9LXPS9aqeG
-						xtl8wKCKoPT+59pMroQtEfdm656QOXGcoERNOzFpa6OwHX8x11TjQ3PiDCGNCpxU
-						kaa2zts1SP2Y2bsCzqpD78gA+QvpBnnjljTXqQtl9TVtY/0+5ht4Qh/Jg8VYSYYy
-						YbpAsVOhDShM+eAqbrq+C3FwyX8CUJOg98Nx5B9dKaywc5KWhvCjyeEr1sNF9YGk
-						3w5WoLhEjWbRMnhM//Ygow==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://o-las.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RiskWize Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">O-LAS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.essentialskillz.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Marek</GivenName>
-    <SurName>Zapach</SurName>
-    <EmailAddress>mailto:marek@essentialskillz.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Marek</GivenName>
-    <SurName>Zapach</SurName>
-    <EmailAddress>mailto:marek@essentialskillz.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.xml
deleted file mode 100644
index 7115f4b4..00000000
--- a/swamid-interfederations-2.0/oa-idp.wlv.ac.uk-oala-metadata.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://oa-idp.wlv.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the University of Wolverhampton.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Wolverhampton</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://oa-idp.wlv.ac.uk/oala/wlv_uni_logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://oa-idp.wlv.ac.uk/oala/wlv_uni_logo_icon.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://oa-idp.wlv.ac.uk/oala/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wlv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEbTCCA1WgAwIBAgIQRbWDhc0R8UaLGXPl9rxLvTANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDgwNTAwMDAwMFoXDTE2MDgwNDIzNTk1OVowPjEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBvYS1pZHAud2x2
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyqgaC0+Mj/Vo
-						DzjH2QdqKLTGXwb7yVTNoI13TXq5/l+QvC9euPlXgEs1QNCEOzB8s3CyzIiE0EHM
-						uD8HzuHBgke1+NgcVoMQItPR0VbvEFyfRZSETifGd6YQgIwsV8quVZqJyTDSGekR
-						7SMjfuP1GNhGalikQsl0zkjyvpMbmDfMJwIdy2JdBihO1qgxTl/HtXlEG6sWQ3ue
-						EY4xeGVjdX9Hfy8kYGT+wFNREWPqd1lD+NQ7vX2O+HLrSTW6XF7DTr33OCEgs4UK
-						cYvxQcyZWQCgAwOU4mt3M24AtYMDd/yXhUJCmR6WbnzQDHFQhEex/mJjXIspqU2d
-						pzupx+l2RQIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-						6pDjue0wHQYDVR0OBBYEFG1BhhHLGjmAtOUN6kJL0e0sZ3oJMA4GA1UdDwEB/wQE
-						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-						cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBvYS1pZHAud2x2LmFjLnVrMA0G
-						CSqGSIb3DQEBBQUAA4IBAQAuvgffeCZCPUXbXW93/kEnGLP+Lx3dcDPX+V7rspdR
-						axX0WtDbRGP2RtjQsHFS+41mti/J3A4virIpZ6ILPu0Fu0xOsT1IoDRb3eEg2Mqn
-						mI+jSRc7CdkaDYMA047pXL9bCTP9GiHfyVH0/2PyGFt8cdNDTPDUmfWT8df588HA
-						0tkCmdWAVq5OZPFMZ4sXFsmFrV2LXx11JP7xz3RbIc634pQsVo5bK7AG4JoUTiWm
-						mxe5u4LWv6BalcaFhiHO2DSnBdsWYvdF0ZsBSD/d2TYgEy+I2TeYC/fcV7q0SBCs
-						ViCbPGRw3GAmsUqKKMdmEIQnf6zW3//bxcIOUg7QSfTl
-					</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>
-						MIIEbTCCA1WgAwIBAgIQRbWDhc0R8UaLGXPl9rxLvTANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDgwNTAwMDAwMFoXDTE2MDgwNDIzNTk1OVowPjEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRkwFwYDVQQDExBvYS1pZHAud2x2
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyqgaC0+Mj/Vo
-						DzjH2QdqKLTGXwb7yVTNoI13TXq5/l+QvC9euPlXgEs1QNCEOzB8s3CyzIiE0EHM
-						uD8HzuHBgke1+NgcVoMQItPR0VbvEFyfRZSETifGd6YQgIwsV8quVZqJyTDSGekR
-						7SMjfuP1GNhGalikQsl0zkjyvpMbmDfMJwIdy2JdBihO1qgxTl/HtXlEG6sWQ3ue
-						EY4xeGVjdX9Hfy8kYGT+wFNREWPqd1lD+NQ7vX2O+HLrSTW6XF7DTr33OCEgs4UK
-						cYvxQcyZWQCgAwOU4mt3M24AtYMDd/yXhUJCmR6WbnzQDHFQhEex/mJjXIspqU2d
-						pzupx+l2RQIDAQABo4IBbTCCAWkwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-						6pDjue0wHQYDVR0OBBYEFG1BhhHLGjmAtOUN6kJL0e0sZ3oJMA4GA1UdDwEB/wQE
-						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-						cC50Y3MudGVyZW5hLm9yZzAbBgNVHREEFDASghBvYS1pZHAud2x2LmFjLnVrMA0G
-						CSqGSIb3DQEBBQUAA4IBAQAuvgffeCZCPUXbXW93/kEnGLP+Lx3dcDPX+V7rspdR
-						axX0WtDbRGP2RtjQsHFS+41mti/J3A4virIpZ6ILPu0Fu0xOsT1IoDRb3eEg2Mqn
-						mI+jSRc7CdkaDYMA047pXL9bCTP9GiHfyVH0/2PyGFt8cdNDTPDUmfWT8df588HA
-						0tkCmdWAVq5OZPFMZ4sXFsmFrV2LXx11JP7xz3RbIc634pQsVo5bK7AG4JoUTiWm
-						mxe5u4LWv6BalcaFhiHO2DSnBdsWYvdF0ZsBSD/d2TYgEy+I2TeYC/fcV7q0SBCs
-						ViCbPGRw3GAmsUqKKMdmEIQnf6zW3//bxcIOUg7QSfTl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oa-idp.wlv.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oa-idp.wlv.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Wolverhampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Wolverhampton</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wlv.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Henderson</SurName>
-    <EmailAddress>mailto:d.henderson@wlv.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Henderson</SurName>
-    <EmailAddress>mailto:d.henderson@wlv.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.xml
deleted file mode 100644
index 8c52980d..00000000
--- a/swamid-interfederations-2.0/oa-idp22.wlv.ac.uk-oala-metadata.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://oa-idp22.wlv.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA Test IdP for the University of Wolverhampton.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-23T16:25:35Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">wlv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWDCCAkCgAwIBAgIICo+mehMlNtowDQYJKoZIhvcNAQEFBQAwQzEkMCIGA1UE
-						CgwbVW5pdmVyc2l0eSBvZiBXb2x2ZXJoYW1wdG9uMRswGQYDVQQDDBJvYS1pZHAy
-						Mi53bHYuYWMudWswHhcNMTUwMTIwMTI1ODE5WhcNMjUwMTIwMTI1ODE5WjBDMSQw
-						IgYDVQQKDBtVbml2ZXJzaXR5IG9mIFdvbHZlcmhhbXB0b24xGzAZBgNVBAMMEm9h
-						LWlkcDIyLndsdi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AIm+DWXZjRBVNcSwWm76ONZ4PP97SOtfI9xLxSul1B6VGbaBj9psMTA83h9Thwyi
-						hnu4qql1o58dtH7u2Du2W9bIR0K3BT3Whn5N+oTB6dakZ5TIp27cHnZfedbQ3xfX
-						Ovg+eXl0hQieICaF5NW2zSJGKacp+cckbR6USlUMjVAmu8T+Q7afw2k3do5IyNF4
-						8FnuSL/S6PtwpbLMl5+DkQKS2pNXx76jqfGwoJBiXzxR43vyzIz6Lz6foh7B+sCH
-						PFB9w9nKQOSW0RTlUTSlNIRrFKYS8jBmGg0SYCTCqAOZQd/S2wDoNdxotnUh045c
-						PlS66duNqlV/BcMhGZriVocCAwEAAaNQME4wHQYDVR0OBBYEFCCaekjMQckGDHAs
-						uGTK2YWenmVqMB8GA1UdIwQYMBaAFCCaekjMQckGDHAsuGTK2YWenmVqMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGT5NNSjh5DLoY11NupSxaqm2kXx
-						Or1pIN4QgEPl5KKBxfnBGQSzzACg+pFzzhq7PS/1D1/ctmTAowDH7RNQLRNKMcq1
-						hD9bUfVfcItmYyR6RLFFX1TTvf94W2UbfVvblMbBY1+BLkPgRO7YFxGuhcdXTh9t
-						yBnW7SQuYB8OadqOhgnBxGohFnwIAxMzsQTBi0rd4ujeKiZxoMj27dzH0lIgKC7D
-						Yfu47aQJpYnVshufazOye5broAdudUUnilRdcrQpIRWOCBRVD4FhKP2c6RfQY3dl
-						xxc2jE/LIUkl6G9Kezhlig7zn3EuOjuClGhY1kfMQY48P2Cula64ZZ5Y9Vo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oa-idp22.wlv.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oa-idp22.wlv.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Wolverhampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Wolverhampton (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wlv.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Henderson</SurName>
-    <EmailAddress>mailto:d.henderson@wlv.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Henderson</SurName>
-    <EmailAddress>mailto:d.henderson@wlv.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oa.clinicalskills.net-oa-metadata.xml b/swamid-interfederations-2.0/oa.clinicalskills.net-oa-metadata.xml
deleted file mode 100644
index 61e4cd2c..00000000
--- a/swamid-interfederations-2.0/oa.clinicalskills.net-oa-metadata.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://oa.clinicalskills.net/oa/metadata">
-  <!--
-		This is an OpenAthens SP for Clinical Skills Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-29T11:41:47Z">
-      <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Clinical Skills Ltd</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Fully illustrated and regularly updated guide to clinical procedures, used by universities and NHS trusts.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDoDCCAoigAwIBAgIJANR0OG1+7XaCMA0GCSqGSIb3DQEBBQUAMD4xHDAaBgNV
-						BAoTE0NsaW5pY2FsIFNraWxscyBMdGQxHjAcBgNVBAMTFW9hLmNsaW5pY2Fsc2tp
-						bGxzLm5ldDAeFw0xNTA1MjUxNTE3MzdaFw0yNTA1MjIxNTE3MzdaMD4xHDAaBgNV
-						BAoTE0NsaW5pY2FsIFNraWxscyBMdGQxHjAcBgNVBAMTFW9hLmNsaW5pY2Fsc2tp
-						bGxzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAO+b/PC8oW
-						OUexWr4SbRfqJeTerhWmueZT6CBNVsq9jB73UyLl6SiTZsU2rDQu/aMvadLZJi0S
-						tqQQF3jOY0braffQ2j3cDLUgzWseL1mPbL1PaoLrTwOQfwgaQ0BZIN/YwZB/H6wc
-						/1TGKXOCxL02FZdoqcjsR3ybfLr3/RNes9Fj7SGugNKGdKt8DnOU7JlgK31FKTd+
-						rVHgrS0GllvKKPZUr38tDlgHeg4fK7c0m6ktlkhjSGaMpGE2nLHeZsc4rJO6x+VL
-						FjXyGaXNFb/OMg5pyaxLCMguIrGdkepsAt/AFFDdZQ+EfxQknyIleKTXgEhoBR8h
-						+Ob1yHnC3CsCAwEAAaOBoDCBnTAdBgNVHQ4EFgQUnqU0dQ0J/2YQIBHWrhWVAFqI
-						2cEwbgYDVR0jBGcwZYAUnqU0dQ0J/2YQIBHWrhWVAFqI2cGhQqRAMD4xHDAaBgNV
-						BAoTE0NsaW5pY2FsIFNraWxscyBMdGQxHjAcBgNVBAMTFW9hLmNsaW5pY2Fsc2tp
-						bGxzLm5ldIIJANR0OG1+7XaCMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBADwlScuhx7cv/IGcyczbMaQwsx5SbWmQqml28evGuOctW8klwHTxu2rrNu+N
-						RyzHzQSc4zika4W5mRIrPDnv8u6PEbJmazcF8DyLx23id86PEoCQX3utcTaEOo2u
-						T8PO8/J6ASAXcbt6SFG4VCK83F8xOVx0oWToYcCtENFspkEAE7AZKoE1e5Tm0bIP
-						aRYPIgur7lD+UWvH/hJgfFdvsYARfxU6bsjVRKlSt65EN+hWaOnT/CnHuAk+IY/f
-						DldGdQtfAKV/u3ofcij/HGRCXMuVbVJFyMsoVURxeDSWQaGVjdDAMaA6BfIjwM2n
-						JMNCuEwvCorkGhEWALTFdD+b9+4=
-					</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>
-						MIIDoDCCAoigAwIBAgIJANR0OG1+7XaCMA0GCSqGSIb3DQEBBQUAMD4xHDAaBgNV
-						BAoTE0NsaW5pY2FsIFNraWxscyBMdGQxHjAcBgNVBAMTFW9hLmNsaW5pY2Fsc2tp
-						bGxzLm5ldDAeFw0xNTA1MjUxNTE3MzdaFw0yNTA1MjIxNTE3MzdaMD4xHDAaBgNV
-						BAoTE0NsaW5pY2FsIFNraWxscyBMdGQxHjAcBgNVBAMTFW9hLmNsaW5pY2Fsc2tp
-						bGxzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAO+b/PC8oW
-						OUexWr4SbRfqJeTerhWmueZT6CBNVsq9jB73UyLl6SiTZsU2rDQu/aMvadLZJi0S
-						tqQQF3jOY0braffQ2j3cDLUgzWseL1mPbL1PaoLrTwOQfwgaQ0BZIN/YwZB/H6wc
-						/1TGKXOCxL02FZdoqcjsR3ybfLr3/RNes9Fj7SGugNKGdKt8DnOU7JlgK31FKTd+
-						rVHgrS0GllvKKPZUr38tDlgHeg4fK7c0m6ktlkhjSGaMpGE2nLHeZsc4rJO6x+VL
-						FjXyGaXNFb/OMg5pyaxLCMguIrGdkepsAt/AFFDdZQ+EfxQknyIleKTXgEhoBR8h
-						+Ob1yHnC3CsCAwEAAaOBoDCBnTAdBgNVHQ4EFgQUnqU0dQ0J/2YQIBHWrhWVAFqI
-						2cEwbgYDVR0jBGcwZYAUnqU0dQ0J/2YQIBHWrhWVAFqI2cGhQqRAMD4xHDAaBgNV
-						BAoTE0NsaW5pY2FsIFNraWxscyBMdGQxHjAcBgNVBAMTFW9hLmNsaW5pY2Fsc2tp
-						bGxzLm5ldIIJANR0OG1+7XaCMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBADwlScuhx7cv/IGcyczbMaQwsx5SbWmQqml28evGuOctW8klwHTxu2rrNu+N
-						RyzHzQSc4zika4W5mRIrPDnv8u6PEbJmazcF8DyLx23id86PEoCQX3utcTaEOo2u
-						T8PO8/J6ASAXcbt6SFG4VCK83F8xOVx0oWToYcCtENFspkEAE7AZKoE1e5Tm0bIP
-						aRYPIgur7lD+UWvH/hJgfFdvsYARfxU6bsjVRKlSt65EN+hWaOnT/CnHuAk+IY/f
-						DldGdQtfAKV/u3ofcij/HGRCXMuVbVJFyMsoVURxeDSWQaGVjdDAMaA6BfIjwM2n
-						JMNCuEwvCorkGhEWALTFdD+b9+4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oa.clinicalskills.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oa.clinicalskills.net/oa/auth/rcv/saml2/post" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Clinical Skills Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Clinical Skills Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.clinicalskills.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sharon</GivenName>
-    <SurName>Kingman</SurName>
-    <EmailAddress>mailto:sharonkingman@clinicalskills.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Allington</SurName>
-    <EmailAddress>mailto:paul@clinicalskills.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oa.pep-web.org-oa-metadata.xml b/swamid-interfederations-2.0/oa.pep-web.org-oa-metadata.xml
deleted file mode 100644
index 3fd35695..00000000
--- a/swamid-interfederations-2.0/oa.pep-web.org-oa-metadata.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://oa.pep-web.org/oa/metadata">
-  <!--
-		This is an OpenAthens SP for Psychoanalytic Electronic Publishing.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-18T14:56:21Z"/>
-  </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>
-						MIID0DCCArigAwIBAgIJAKHVd8LSwH+3MA0GCSqGSIb3DQEBBQUAME4xMzAxBgNV
-						BAoTKlBzeWNob2FuYWx5dGljIEVsZWN0cm9uaWMgUHVibGlzaGluZywgSW5jLjEX
-						MBUGA1UEAxMOb2EucGVwLXdlYi5vcmcwHhcNMTIxMjEwMTUwNjI5WhcNMjIxMjA4
-						MTUwNjI5WjBOMTMwMQYDVQQKEypQc3ljaG9hbmFseXRpYyBFbGVjdHJvbmljIFB1
-						Ymxpc2hpbmcsIEluYy4xFzAVBgNVBAMTDm9hLnBlcC13ZWIub3JnMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvxjOhHh3BRMA7mPHoLC5a5JrtjuFihOA
-						5419SfkRPVg6l5WaH6J2KSbRsMp27NEk7AAwGfwsqMh2FYgmrelQQ3e69++VPnUe
-						vD+/hyo5d97KueVlktu7T7qxewBJr31k6l//SZgKWhOvN8hvMGMtul2SUtob8x1w
-						wTv5bh6OCXE7AzJj7VXWLAVrzChuXo1r3xxC1GLi/NpCQLYwCsUVIfHByw2+omEF
-						nA6wLRxTezFdKnGmrl0Zutw/acf19nCZZLD6N84Qorko3sON8qwm1+cnuJyyKeW1
-						MtKbZuULd7MnePyCbH771qy33WZeOsRFi3QDrYJAfFpqAKFwM9W7MwIDAQABo4Gw
-						MIGtMB0GA1UdDgQWBBStEHOsouCRTUqh8vj2LJ+XIL9R3TB+BgNVHSMEdzB1gBSt
-						EHOsouCRTUqh8vj2LJ+XIL9R3aFSpFAwTjEzMDEGA1UEChMqUHN5Y2hvYW5hbHl0
-						aWMgRWxlY3Ryb25pYyBQdWJsaXNoaW5nLCBJbmMuMRcwFQYDVQQDEw5vYS5wZXAt
-						d2ViLm9yZ4IJAKHVd8LSwH+3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAEaj7/jzs4v2do/oClsw9dhcIDbFLFQW2AIxM7Fkfk2BaDN1mxQGFNE1sMk+
-						bi0B1Xqge7EZOEumtjpWDmJrxkZnIO0cyUDUAloo1vBnm4EcUlcJWptXbqh+Esgm
-						XNg7/3xZYmafTSCLqI/JPkgWAoBtQNtmJLjmFLr9ypn4D90HD6jH0pf5MEQbEIG0
-						3GPCgUTHBYi3HLtxWAZFhJU4hqNAik7h9/Ja4ekHPBymeb17XD9sR876/l1ofgUo
-						fanT1syz+jLydfNwAmqKcs/VNut1JcwYN70lwRGAcjBZHRj6rIzKOMuv9btlx+OB
-						sRYctPwxod3YO1J6Qb4Pac00EJE=
-					</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>
-						MIID0DCCArigAwIBAgIJAKHVd8LSwH+3MA0GCSqGSIb3DQEBBQUAME4xMzAxBgNV
-						BAoTKlBzeWNob2FuYWx5dGljIEVsZWN0cm9uaWMgUHVibGlzaGluZywgSW5jLjEX
-						MBUGA1UEAxMOb2EucGVwLXdlYi5vcmcwHhcNMTIxMjEwMTUwNjI5WhcNMjIxMjA4
-						MTUwNjI5WjBOMTMwMQYDVQQKEypQc3ljaG9hbmFseXRpYyBFbGVjdHJvbmljIFB1
-						Ymxpc2hpbmcsIEluYy4xFzAVBgNVBAMTDm9hLnBlcC13ZWIub3JnMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvxjOhHh3BRMA7mPHoLC5a5JrtjuFihOA
-						5419SfkRPVg6l5WaH6J2KSbRsMp27NEk7AAwGfwsqMh2FYgmrelQQ3e69++VPnUe
-						vD+/hyo5d97KueVlktu7T7qxewBJr31k6l//SZgKWhOvN8hvMGMtul2SUtob8x1w
-						wTv5bh6OCXE7AzJj7VXWLAVrzChuXo1r3xxC1GLi/NpCQLYwCsUVIfHByw2+omEF
-						nA6wLRxTezFdKnGmrl0Zutw/acf19nCZZLD6N84Qorko3sON8qwm1+cnuJyyKeW1
-						MtKbZuULd7MnePyCbH771qy33WZeOsRFi3QDrYJAfFpqAKFwM9W7MwIDAQABo4Gw
-						MIGtMB0GA1UdDgQWBBStEHOsouCRTUqh8vj2LJ+XIL9R3TB+BgNVHSMEdzB1gBSt
-						EHOsouCRTUqh8vj2LJ+XIL9R3aFSpFAwTjEzMDEGA1UEChMqUHN5Y2hvYW5hbHl0
-						aWMgRWxlY3Ryb25pYyBQdWJsaXNoaW5nLCBJbmMuMRcwFQYDVQQDEw5vYS5wZXAt
-						d2ViLm9yZ4IJAKHVd8LSwH+3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAEaj7/jzs4v2do/oClsw9dhcIDbFLFQW2AIxM7Fkfk2BaDN1mxQGFNE1sMk+
-						bi0B1Xqge7EZOEumtjpWDmJrxkZnIO0cyUDUAloo1vBnm4EcUlcJWptXbqh+Esgm
-						XNg7/3xZYmafTSCLqI/JPkgWAoBtQNtmJLjmFLr9ypn4D90HD6jH0pf5MEQbEIG0
-						3GPCgUTHBYi3HLtxWAZFhJU4hqNAik7h9/Ja4ekHPBymeb17XD9sR876/l1ofgUo
-						fanT1syz+jLydfNwAmqKcs/VNut1JcwYN70lwRGAcjBZHRj6rIzKOMuv9btlx+OB
-						sRYctPwxod3YO1J6Qb4Pac00EJE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oa.pep-web.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oa.pep-web.org/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oa.pep-web.org/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oa.pep-web.org/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Psychoanalytic Electronic Publishing</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PEP Web</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.p-e-p.org/about.htm</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rhiannon</GivenName>
-    <SurName>Pilkington</SurName>
-    <EmailAddress>mailto:r.pilkington@ucl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Neil</GivenName>
-    <SurName>Shapiro</SurName>
-    <EmailAddress>mailto:neil@scilab-inc.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml b/swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml
deleted file mode 100644
index 606294fb..00000000
--- a/swamid-interfederations-2.0/oa.sagepub.com-oa-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oa.sagepub.com/oa/metadata">
-  <!--
-		This is a "SAGE Knowledge" OpenAthens SP for SAGE Publications Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-19T14:51:30Z">
-      <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:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXjCCAkagAwIBAgIJAKTvdWWaACO4MA0GCSqGSIb3DQEBBQUAMCgxDTALBgNV
-						BAoTBFNBR0UxFzAVBgNVBAMTDm9hLnNhZ2VwdWIuY29tMB4XDTE1MDgwNTE0MTky
-						OFoXDTI1MDgwMjE0MTkyOFowKDENMAsGA1UEChMEU0FHRTEXMBUGA1UEAxMOb2Eu
-						c2FnZXB1Yi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbVQlz
-						0vtujcdfKUCpUDa68UXP8gvpUCxkTdSC3CTFRtXznb688AIJO7Mr5I9zRAfyVgDn
-						sA3GYHtgG4UU1P+77Gq8BXOdOaM98i9mYLQDiBBwCDnGoiHa7g84oQHqZdqmd37p
-						f7FnsTkXOSs12NYNA8NcVKlxT/ZtvY94/soo1HXyr2feo4G8LePdOBBdcnTr6yAP
-						nl/3/pxrCt+g5153NJZM5SSDvXKhLlNbhbuhLifwV4TiXnJI1L3LlUFx0sB4Navd
-						qEi/E0EoG++cZsBns94AH5Qgal2nnARyQ7f3KYKJpmkWsEyr6NKGwQ3R/5T3Lkzu
-						5eOcu3RAz/ubUkp9AgMBAAGjgYowgYcwHQYDVR0OBBYEFCoIY+lpdNqh4Edh6Nd7
-						9mHnXQtXMFgGA1UdIwRRME+AFCoIY+lpdNqh4Edh6Nd79mHnXQtXoSykKjAoMQ0w
-						CwYDVQQKEwRTQUdFMRcwFQYDVQQDEw5vYS5zYWdlcHViLmNvbYIJAKTvdWWaACO4
-						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAcHYxNo8SmZ5Ol4dkM/
-						T2aTqfzsNiIvN4cqDnLjgUQRkSqwbhlnj3gcJtLVErD7rvGR3x5XvcDuzwVYbVOZ
-						Tasz/nhZdc1MJCk66pkhWpLCefgXj5F9ZRt30Ta8fSGNoJgE8KvNGiRrcmrVdlas
-						TtSlKwsTD/KaZO6S+xywGAuEHRMdLRVzaKAUe6rl3bwy4HH5brRTB6DgDjwuFSF5
-						YgsuiijouGEgJ7FxRTjsUqs4Nzi3RekUtIwbUiIgHc0Tc/r05Ve15JSjCxh2S6eO
-						n7j4j4bQS1X8DYoCc9SbL/1ZC258jwnZ2LZir9DtEBNf4PjsvGQKpe2x5TZlv9Vx
-						dgc=
-					</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>
-						MIIDXjCCAkagAwIBAgIJAKTvdWWaACO4MA0GCSqGSIb3DQEBBQUAMCgxDTALBgNV
-						BAoTBFNBR0UxFzAVBgNVBAMTDm9hLnNhZ2VwdWIuY29tMB4XDTE1MDgwNTE0MTky
-						OFoXDTI1MDgwMjE0MTkyOFowKDENMAsGA1UEChMEU0FHRTEXMBUGA1UEAxMOb2Eu
-						c2FnZXB1Yi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbVQlz
-						0vtujcdfKUCpUDa68UXP8gvpUCxkTdSC3CTFRtXznb688AIJO7Mr5I9zRAfyVgDn
-						sA3GYHtgG4UU1P+77Gq8BXOdOaM98i9mYLQDiBBwCDnGoiHa7g84oQHqZdqmd37p
-						f7FnsTkXOSs12NYNA8NcVKlxT/ZtvY94/soo1HXyr2feo4G8LePdOBBdcnTr6yAP
-						nl/3/pxrCt+g5153NJZM5SSDvXKhLlNbhbuhLifwV4TiXnJI1L3LlUFx0sB4Navd
-						qEi/E0EoG++cZsBns94AH5Qgal2nnARyQ7f3KYKJpmkWsEyr6NKGwQ3R/5T3Lkzu
-						5eOcu3RAz/ubUkp9AgMBAAGjgYowgYcwHQYDVR0OBBYEFCoIY+lpdNqh4Edh6Nd7
-						9mHnXQtXMFgGA1UdIwRRME+AFCoIY+lpdNqh4Edh6Nd79mHnXQtXoSykKjAoMQ0w
-						CwYDVQQKEwRTQUdFMRcwFQYDVQQDEw5vYS5zYWdlcHViLmNvbYIJAKTvdWWaACO4
-						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAcHYxNo8SmZ5Ol4dkM/
-						T2aTqfzsNiIvN4cqDnLjgUQRkSqwbhlnj3gcJtLVErD7rvGR3x5XvcDuzwVYbVOZ
-						Tasz/nhZdc1MJCk66pkhWpLCefgXj5F9ZRt30Ta8fSGNoJgE8KvNGiRrcmrVdlas
-						TtSlKwsTD/KaZO6S+xywGAuEHRMdLRVzaKAUe6rl3bwy4HH5brRTB6DgDjwuFSF5
-						YgsuiijouGEgJ7FxRTjsUqs4Nzi3RekUtIwbUiIgHc0Tc/r05Ve15JSjCxh2S6eO
-						n7j4j4bQS1X8DYoCc9SbL/1ZC258jwnZ2LZir9DtEBNf4PjsvGQKpe2x5TZlv9Vx
-						dgc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oa.sagepub.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oa.sagepub.com/oa/auth/rcv/saml2/post" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SAGE Publications Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SAGE Knowledge</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sagepublications.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Online Support</GivenName>
-    <EmailAddress>mailto:onlinesupport@sagepub.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Sisolak</SurName>
-    <EmailAddress>mailto:msisolak@gvpi.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala-dev.leedsbeckett.ac.uk-oala.xml b/swamid-interfederations-2.0/oala-dev.leedsbeckett.ac.uk-oala.xml
deleted file mode 100644
index d977d101..00000000
--- a/swamid-interfederations-2.0/oala-dev.leedsbeckett.ac.uk-oala.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://oala-dev.leedsbeckett.ac.uk/oala">
-  <!--
-		This is an OpenAthens LA IdP for Leeds Beckett University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-17T09:27:56Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">leedsbeckett.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZDCCAkygAwIBAgIICY7brWx6wwgwDQYJKoZIhvcNAQEFBQAwSTEhMB8GA1UE
-						CgwYTGVlZHMgQmVja2V0dCBVbml2ZXJzaXR5MSQwIgYDVQQDDBtvYWxhLWRldi5s
-						ZWVkc2JlY2tldHQuYWMudWswHhcNMTUwNzEzMTcwODU1WhcNMjUwNzEzMTcwODU1
-						WjBJMSEwHwYDVQQKDBhMZWVkcyBCZWNrZXR0IFVuaXZlcnNpdHkxJDAiBgNVBAMM
-						G29hbGEtZGV2LmxlZWRzYmVja2V0dC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAJRvAT4MDeSjDJcqXiiMM8xYND6dAESfmu8rl5Glf0sCpkbn
-						9/cVtSlZBUj12rjSlz5MKjLVB9IlJVP6LDmXi+VhEYt6y5+cnSSPOGz8vcA+FKic
-						qyIMCsOqsOps/s/XvUHvMhn1DRrP9ABzJ7FMh07WJZmeAzdWFjwPa9pStLL5c+Tj
-						zX6MXtEb0CorkdO3AOfA7W/105xyNdjY1mpGVNYh8ghmUsUbknWv1IV5wvvm14OU
-						0FHxVlTOm/Gn9NE9kyZJ/0llfUzjklDwcdbPF97RYQkIPPXAGtSoQG4NKHXdfXOq
-						HdZkHrw8uXFAXCACxgm3ySahQaVxxEMumONUNd8CAwEAAaNQME4wHQYDVR0OBBYE
-						FAPEW0ahiwDvlwZaB+PIrnPRtdxPMB8GA1UdIwQYMBaAFAPEW0ahiwDvlwZaB+PI
-						rnPRtdxPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHjbalsxsvOh
-						l45Neg5IQrMmEZKkMYzCh7cMHVtQbMruF1KJQU70wB/aPh6qaGXdouvH4QqI4zAy
-						bN68NsZUbBOv5W8j9rnQ8m6XvCAYBdeYFrASqiS2i378/g8RtCFAIwkgerDyl6SZ
-						B7i1VPnDjQ77RigIZNsWgrYiT/nl7+v/67xLj6avdWuf9DadminHKxDsD1iwee3z
-						R1ye3k2HIsyY7Hjdip04Lo7aMibXMu7z/1jR5MpFC8uMxd24uNa+lEZspTkuKMgY
-						00OrkNXmwj/zp+J7ytw55N5v7ZImISb2jhaZ1r1iP7sH1dqcsjgWgVnajThtvRwN
-						11uM54JtSeI=
-					</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>
-						MIIDZDCCAkygAwIBAgIICY7brWx6wwgwDQYJKoZIhvcNAQEFBQAwSTEhMB8GA1UE
-						CgwYTGVlZHMgQmVja2V0dCBVbml2ZXJzaXR5MSQwIgYDVQQDDBtvYWxhLWRldi5s
-						ZWVkc2JlY2tldHQuYWMudWswHhcNMTUwNzEzMTcwODU1WhcNMjUwNzEzMTcwODU1
-						WjBJMSEwHwYDVQQKDBhMZWVkcyBCZWNrZXR0IFVuaXZlcnNpdHkxJDAiBgNVBAMM
-						G29hbGEtZGV2LmxlZWRzYmVja2V0dC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAJRvAT4MDeSjDJcqXiiMM8xYND6dAESfmu8rl5Glf0sCpkbn
-						9/cVtSlZBUj12rjSlz5MKjLVB9IlJVP6LDmXi+VhEYt6y5+cnSSPOGz8vcA+FKic
-						qyIMCsOqsOps/s/XvUHvMhn1DRrP9ABzJ7FMh07WJZmeAzdWFjwPa9pStLL5c+Tj
-						zX6MXtEb0CorkdO3AOfA7W/105xyNdjY1mpGVNYh8ghmUsUbknWv1IV5wvvm14OU
-						0FHxVlTOm/Gn9NE9kyZJ/0llfUzjklDwcdbPF97RYQkIPPXAGtSoQG4NKHXdfXOq
-						HdZkHrw8uXFAXCACxgm3ySahQaVxxEMumONUNd8CAwEAAaNQME4wHQYDVR0OBBYE
-						FAPEW0ahiwDvlwZaB+PIrnPRtdxPMB8GA1UdIwQYMBaAFAPEW0ahiwDvlwZaB+PI
-						rnPRtdxPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHjbalsxsvOh
-						l45Neg5IQrMmEZKkMYzCh7cMHVtQbMruF1KJQU70wB/aPh6qaGXdouvH4QqI4zAy
-						bN68NsZUbBOv5W8j9rnQ8m6XvCAYBdeYFrASqiS2i378/g8RtCFAIwkgerDyl6SZ
-						B7i1VPnDjQ77RigIZNsWgrYiT/nl7+v/67xLj6avdWuf9DadminHKxDsD1iwee3z
-						R1ye3k2HIsyY7Hjdip04Lo7aMibXMu7z/1jR5MpFC8uMxd24uNa+lEZspTkuKMgY
-						00OrkNXmwj/zp+J7ytw55N5v7ZImISb2jhaZ1r1iP7sH1dqcsjgWgVnajThtvRwN
-						11uM54JtSeI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala-dev.leedsbeckett.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala-dev.leedsbeckett.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Leeds Beckett University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds Beckett University (Development)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.leedsbeckett.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:ITServiceDesk@leedsbeckett.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:d.v.taylor@leedsbeckett.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala-runtime.eastleigh.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oala-runtime.eastleigh.ac.uk-oala-metadata.xml
deleted file mode 100644
index 91a4217c..00000000
--- a/swamid-interfederations-2.0/oala-runtime.eastleigh.ac.uk-oala-metadata.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://oala-runtime.eastleigh.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens IdP for Eastleigh College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-29T10:34:00Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">eastleigh.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWDCCAkCgAwIBAgIIFsnOesAaesswDQYJKoZIhvcNAQEFBQAwQzEaMBgGA1UE
-						CgwRRWFzdGxlaWdoIENvbGxlZ2UxJTAjBgNVBAMMHG9hbGEtcnVudGltZS5lYXN0
-						bGVpZ2guYWMudWswHhcNMTIwMjI0MTYxMzQ2WhcNMjIwMjI0MTYxMzQ2WjBDMRow
-						GAYDVQQKDBFFYXN0bGVpZ2ggQ29sbGVnZTElMCMGA1UEAwwcb2FsYS1ydW50aW1l
-						LmVhc3RsZWlnaC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AJbpGbVq+3W87P3LSE9yvoZPJWOQpvodKGXQvZpgCpw42A7z9w3DiW36ssWDOhbN
-						rS+E1Inklx6meSmLCuTYhRVNL8xBnaqL6zWfIHnO00ELD5ZhOMWzKQQ5RNm6HbF5
-						8SdPVqbwt4IVq2NhqvH7Om5AruMBXp/S8r4v8ajgnp85gZ7XgGNoCacSi6M5ykfr
-						w5LMOlE7vXHF9ysFyGLPcidUZvE4QDChNxX0FZWcqHwfAhuj1CEunry9STQHIXkr
-						ypcE3I5Xg4OA9qRC4J7wyHkG5uiJImjYHcmnM/3EzbL94wT9Gd8ddYrlN9E9tray
-						Odsf7pPpbVAmKNNxeQo3FocCAwEAAaNQME4wHQYDVR0OBBYEFJDbbznYPa+ALKbL
-						IigXdI0UE13lMB8GA1UdIwQYMBaAFJDbbznYPa+ALKbLIigXdI0UE13lMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGkxUw38I8xJdFvH3/j+GY1GulB5
-						vAN7o+JTPxXToGx9O6mQvv5ZKT/TmVmGHz7CdeToVW1JWICQGCm9pXCjIZoJs3cJ
-						+hdHncZrUPm0ZkibNNd2Ix4TSs7NAm0aaYlgTR37+8Gpl67/rjm7psuUZL5UBtST
-						SxWzN84a0Zpsx8lZvkt0aVCY3jJpbmYRaDalkG1DJAEH6AqdF18GmTS9c8CN75uB
-						LF7eq7Pbu0wySSUW9TyRqC5YHK1CFsrNr3+7Cwtj+A+UWPs0JmNoCyYUr41R+Xic
-						l43JJ3g6lAOr8U1MkvjzwnA93CFJC1S1PSxJq8j7OXwCunqqpFrME8sqrcw=
-					</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>
-						MIIDWDCCAkCgAwIBAgIIFsnOesAaesswDQYJKoZIhvcNAQEFBQAwQzEaMBgGA1UE
-						CgwRRWFzdGxlaWdoIENvbGxlZ2UxJTAjBgNVBAMMHG9hbGEtcnVudGltZS5lYXN0
-						bGVpZ2guYWMudWswHhcNMTIwMjI0MTYxMzQ2WhcNMjIwMjI0MTYxMzQ2WjBDMRow
-						GAYDVQQKDBFFYXN0bGVpZ2ggQ29sbGVnZTElMCMGA1UEAwwcb2FsYS1ydW50aW1l
-						LmVhc3RsZWlnaC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AJbpGbVq+3W87P3LSE9yvoZPJWOQpvodKGXQvZpgCpw42A7z9w3DiW36ssWDOhbN
-						rS+E1Inklx6meSmLCuTYhRVNL8xBnaqL6zWfIHnO00ELD5ZhOMWzKQQ5RNm6HbF5
-						8SdPVqbwt4IVq2NhqvH7Om5AruMBXp/S8r4v8ajgnp85gZ7XgGNoCacSi6M5ykfr
-						w5LMOlE7vXHF9ysFyGLPcidUZvE4QDChNxX0FZWcqHwfAhuj1CEunry9STQHIXkr
-						ypcE3I5Xg4OA9qRC4J7wyHkG5uiJImjYHcmnM/3EzbL94wT9Gd8ddYrlN9E9tray
-						Odsf7pPpbVAmKNNxeQo3FocCAwEAAaNQME4wHQYDVR0OBBYEFJDbbznYPa+ALKbL
-						IigXdI0UE13lMB8GA1UdIwQYMBaAFJDbbznYPa+ALKbLIigXdI0UE13lMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGkxUw38I8xJdFvH3/j+GY1GulB5
-						vAN7o+JTPxXToGx9O6mQvv5ZKT/TmVmGHz7CdeToVW1JWICQGCm9pXCjIZoJs3cJ
-						+hdHncZrUPm0ZkibNNd2Ix4TSs7NAm0aaYlgTR37+8Gpl67/rjm7psuUZL5UBtST
-						SxWzN84a0Zpsx8lZvkt0aVCY3jJpbmYRaDalkG1DJAEH6AqdF18GmTS9c8CN75uB
-						LF7eq7Pbu0wySSUW9TyRqC5YHK1CFsrNr3+7Cwtj+A+UWPs0JmNoCyYUr41R+Xic
-						l43JJ3g6lAOr8U1MkvjzwnA93CFJC1S1PSxJq8j7OXwCunqqpFrME8sqrcw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala-runtime.eastleigh.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala-runtime.eastleigh.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eastleigh College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eastleigh College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eastleigh.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Eastleigh College Learning Centre</GivenName>
-    <EmailAddress>mailto:lc@eastleigh.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Kennedy</SurName>
-    <EmailAddress>mailto:ikennedy@eastleigh.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.xml
deleted file mode 100644
index 1719dd00..00000000
--- a/swamid-interfederations-2.0/oala.aaschool.ac.uk-oala-metadata.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://oala.aaschool.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the Architectural Association (Incorporated).
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-19T11:56:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">aaschool.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVjCCAj6gAwIBAgIIU8+cSxqyjekwDQYJKoZIhvcNAQEFBQAwQjEiMCAGA1UE
-						CgwZQXJjaGl0ZWN0dXJhbCBBc3NvY2lhdGlvbjEcMBoGA1UEAwwTb2FsYS5hYXNj
-						aG9vbC5hYy51azAeFw0xNDAyMDUxMjU0MjFaFw0yNDAyMDUxMjU0MjFaMEIxIjAg
-						BgNVBAoMGUFyY2hpdGVjdHVyYWwgQXNzb2NpYXRpb24xHDAaBgNVBAMME29hbGEu
-						YWFzY2hvb2wuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCN
-						6u0fQexpAbYeL/juhqSYF3kRc6sf9w3ycYdDTx5r8k/3OwklSYshGn6qwJDS7aS4
-						QJy2dkFzAaSCycdoEPTRfkcpIQ9nfT9ABzngbDIjYIvCMT7xMyZZCelO6NDuK5F4
-						NFWN0vB357o3rce6gzmKY6tvIJ4C61yn2SArKo3VXTJSiLWtjVTTWWMuxK+DMmdD
-						wxgzB1tiQhGq2aNZHHSMuqri1wCegVB8awO8vn8sVrpd+OxubDS3Me5y4WlY4grs
-						XqfrpFtHuQon30WhFgLqXjm5M2Htth44J2aRWvNwQ9UbcUAPDu8zn1EEWjGoeT4U
-						KBo2hLbd5xckdJqLhBtvAgMBAAGjUDBOMB0GA1UdDgQWBBTfbelHaYpCBZW2wcu5
-						R3SX1LLrejAfBgNVHSMEGDAWgBTfbelHaYpCBZW2wcu5R3SX1LLrejAMBgNVHRME
-						BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBNPyhqpXFNU8s9HuXtFRXCraLXUYqW
-						Cg6Qq9ArXhdGBaPDLI33B5MFfxrK207ZszoC8NsBRU2TGhUs2TcYQYBnCEBjpVNs
-						T9Pl+HT+1RAqFDXJfz8vnva16QFyohJQcOXgwbKcasy3v4TFOBLlQSYUN6gJyPDz
-						RbuvCdEwIL74sLpZmHbGtF88nINKnPkRlQXIqCnnQg3nfL/qBd67lt6Ih4wyPCkX
-						N+Fr1zIKaChdHOdfBVIuG8o9SL5GeLuHOSUwKtYngivsmk73rRvQxJHYwuRstWlV
-						O6NtqBZn2l5WgFXs6cNoPTwZCFrlNTiQIVXgZnWaTdXzei52kRX/5v/X
-					</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>
-						MIIDVjCCAj6gAwIBAgIIU8+cSxqyjekwDQYJKoZIhvcNAQEFBQAwQjEiMCAGA1UE
-						CgwZQXJjaGl0ZWN0dXJhbCBBc3NvY2lhdGlvbjEcMBoGA1UEAwwTb2FsYS5hYXNj
-						aG9vbC5hYy51azAeFw0xNDAyMDUxMjU0MjFaFw0yNDAyMDUxMjU0MjFaMEIxIjAg
-						BgNVBAoMGUFyY2hpdGVjdHVyYWwgQXNzb2NpYXRpb24xHDAaBgNVBAMME29hbGEu
-						YWFzY2hvb2wuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCN
-						6u0fQexpAbYeL/juhqSYF3kRc6sf9w3ycYdDTx5r8k/3OwklSYshGn6qwJDS7aS4
-						QJy2dkFzAaSCycdoEPTRfkcpIQ9nfT9ABzngbDIjYIvCMT7xMyZZCelO6NDuK5F4
-						NFWN0vB357o3rce6gzmKY6tvIJ4C61yn2SArKo3VXTJSiLWtjVTTWWMuxK+DMmdD
-						wxgzB1tiQhGq2aNZHHSMuqri1wCegVB8awO8vn8sVrpd+OxubDS3Me5y4WlY4grs
-						XqfrpFtHuQon30WhFgLqXjm5M2Htth44J2aRWvNwQ9UbcUAPDu8zn1EEWjGoeT4U
-						KBo2hLbd5xckdJqLhBtvAgMBAAGjUDBOMB0GA1UdDgQWBBTfbelHaYpCBZW2wcu5
-						R3SX1LLrejAfBgNVHSMEGDAWgBTfbelHaYpCBZW2wcu5R3SX1LLrejAMBgNVHRME
-						BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBNPyhqpXFNU8s9HuXtFRXCraLXUYqW
-						Cg6Qq9ArXhdGBaPDLI33B5MFfxrK207ZszoC8NsBRU2TGhUs2TcYQYBnCEBjpVNs
-						T9Pl+HT+1RAqFDXJfz8vnva16QFyohJQcOXgwbKcasy3v4TFOBLlQSYUN6gJyPDz
-						RbuvCdEwIL74sLpZmHbGtF88nINKnPkRlQXIqCnnQg3nfL/qBd67lt6Ih4wyPCkX
-						N+Fr1zIKaChdHOdfBVIuG8o9SL5GeLuHOSUwKtYngivsmk73rRvQxJHYwuRstWlV
-						O6NtqBZn2l5WgFXs6cNoPTwZCFrlNTiQIVXgZnWaTdXzei52kRX/5v/X
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.aaschool.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.aaschool.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Architectural Association (Incorporated)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Architectural Association</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aaschool.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simine</GivenName>
-    <SurName>Marine</SurName>
-    <EmailAddress>mailto:simine.marine@aaschool.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:itdept@aaschool.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mathew</GivenName>
-    <SurName>Bielecki</SurName>
-    <EmailAddress>mailto:itdept@aaschool.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml b/swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.xml
deleted file mode 100644
index ee58946d..00000000
--- a/swamid-interfederations-2.0/oala.leedsbeckett.ac.uk-oala.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://oala.leedsbeckett.ac.uk/oala">
-  <!--
-		This is an OpenAthens LA IdP for Leeds Beckett University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-03T09:51:22Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">leedsbeckett.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXDCCAkSgAwIBAgIIY3NQ4sTPsKQwDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
-						CgwYTGVlZHMgQmVja2V0dCBVbml2ZXJzaXR5MSAwHgYDVQQDDBdvYWxhLmxlZWRz
-						YmVja2V0dC5hYy51azAeFw0xNTEwMjcxNzA1MzBaFw0yNTEwMjcxNzA1MzBaMEUx
-						ITAfBgNVBAoMGExlZWRzIEJlY2tldHQgVW5pdmVyc2l0eTEgMB4GA1UEAwwXb2Fs
-						YS5sZWVkc2JlY2tldHQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQCVFC46kUWSe1tcRlZUevYSOtQkNz9u3WMwwRE5tOtegpEQB8bVen1mLosc
-						vs9xuot9/VZlK6I9dTB0zSfM4KqIyEgcjEbsvprxXAKFRR6pPNVxOofjVSfbJlHD
-						PZwT2xPsm3tZNhhTxRaKmRYSSXAyg9YMHytFeR4RebgBrbbNsmLeOucvzOiyaRhQ
-						f3k9yRIhWsawlgbId47GHl0AyaxBLoHISijYpVeU6AztbKFeQue4IQLpnOL5wbfR
-						eP365fhVoCA52A+9Ad8RBJam51LvKBEtXQwT1N1aff//qN6Xt9ka1/gZItf2puJz
-						MijPqUOkiC/C43TzHM3o+GtOV/j/AgMBAAGjUDBOMB0GA1UdDgQWBBRslIEX55jy
-						2+BX3F7pC3w3QQmyZTAfBgNVHSMEGDAWgBRslIEX55jy2+BX3F7pC3w3QQmyZTAM
-						BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAVLJ7unff9MIjkJcDlLEax
-						+izPFMJvCic7VptKLhffLm4m6MZaG+U1vtjIfSlZ+mzFonOjugiyW41aP1/0CXBo
-						DIl64e4VgIDkpD7rBThmH2G1zNxJzQzmeUJ9TZJs9s7V8KhqfIBioBNVbht2ySOK
-						DzmRleXBM2MNuwPjWDtKoaaX7av404JdSBZ0wUAoP5j015F8EIqQuHkrV0z8c+ba
-						eYX1IgrdpIyr2KogrjxVzojw1sfFR+z4YTm2vt9G1wkQAaXb7GJIWbJDmEtmowWx
-						oJOY4tpZB0ZjsOTUNnvwopX3H3B8ZSvgjmh3YMVvVrUEi+hcmpa3pmK3ZyNcojea
-					</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>
-						MIIDXDCCAkSgAwIBAgIIY3NQ4sTPsKQwDQYJKoZIhvcNAQEFBQAwRTEhMB8GA1UE
-						CgwYTGVlZHMgQmVja2V0dCBVbml2ZXJzaXR5MSAwHgYDVQQDDBdvYWxhLmxlZWRz
-						YmVja2V0dC5hYy51azAeFw0xNTEwMjcxNzA1MzBaFw0yNTEwMjcxNzA1MzBaMEUx
-						ITAfBgNVBAoMGExlZWRzIEJlY2tldHQgVW5pdmVyc2l0eTEgMB4GA1UEAwwXb2Fs
-						YS5sZWVkc2JlY2tldHQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQCVFC46kUWSe1tcRlZUevYSOtQkNz9u3WMwwRE5tOtegpEQB8bVen1mLosc
-						vs9xuot9/VZlK6I9dTB0zSfM4KqIyEgcjEbsvprxXAKFRR6pPNVxOofjVSfbJlHD
-						PZwT2xPsm3tZNhhTxRaKmRYSSXAyg9YMHytFeR4RebgBrbbNsmLeOucvzOiyaRhQ
-						f3k9yRIhWsawlgbId47GHl0AyaxBLoHISijYpVeU6AztbKFeQue4IQLpnOL5wbfR
-						eP365fhVoCA52A+9Ad8RBJam51LvKBEtXQwT1N1aff//qN6Xt9ka1/gZItf2puJz
-						MijPqUOkiC/C43TzHM3o+GtOV/j/AgMBAAGjUDBOMB0GA1UdDgQWBBRslIEX55jy
-						2+BX3F7pC3w3QQmyZTAfBgNVHSMEGDAWgBRslIEX55jy2+BX3F7pC3w3QQmyZTAM
-						BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAVLJ7unff9MIjkJcDlLEax
-						+izPFMJvCic7VptKLhffLm4m6MZaG+U1vtjIfSlZ+mzFonOjugiyW41aP1/0CXBo
-						DIl64e4VgIDkpD7rBThmH2G1zNxJzQzmeUJ9TZJs9s7V8KhqfIBioBNVbht2ySOK
-						DzmRleXBM2MNuwPjWDtKoaaX7av404JdSBZ0wUAoP5j015F8EIqQuHkrV0z8c+ba
-						eYX1IgrdpIyr2KogrjxVzojw1sfFR+z4YTm2vt9G1wkQAaXb7GJIWbJDmEtmowWx
-						oJOY4tpZB0ZjsOTUNnvwopX3H3B8ZSvgjmh3YMVvVrUEi+hcmpa3pmK3ZyNcojea
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.leedsbeckett.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.leedsbeckett.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Leeds Beckett University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds Beckett University (New)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.leedsbeckett.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:ITServiceDesk@leedsbeckett.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:d.v.taylor@leedsbeckett.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml
deleted file mode 100644
index 3627c591..00000000
--- a/swamid-interfederations-2.0/oala.surrey.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oala.surrey.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the University of Surrey.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T14:53:23Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">surrey.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIITOCMDokwhbkwDQYJKoZIhvcNAQEFBQAwOzEdMBsGA1UE
-						CgwUVW5pdmVyc2l0eSBvZiBTdXJyZXkxGjAYBgNVBAMMEW9hbGEuc3VycmV5LmFj
-						LnVrMB4XDTEyMDMyOTExMjUyM1oXDTIyMDMyOTExMjUyM1owOzEdMBsGA1UECgwU
-						VW5pdmVyc2l0eSBvZiBTdXJyZXkxGjAYBgNVBAMMEW9hbGEuc3VycmV5LmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlQUcfoCNygSZkRb1rvMz
-						qIdbaZhcLek/W5QweKu1cWymyjBOFHK2Ioj3gFotYvLqp/CwaX9Ku++urHOtfW4C
-						FdYt2uZi34Frap5Q34QiDcIfSpm+tb8YmsuJczxTfJ7Azywd3uEFjPqcNKyRJPMC
-						j8aoMdcpjf8JwjO97ngErjEdjdlaehVTk1jhylDj40UOXdIuuKiHTo+rC9/fHN87
-						5Iz1xrANl4rb5JdV96iXZamGjXYMXhlJ70JIGkerWyW2fAggDTmrfL5vWiKD4SnJ
-						2yTz5N5OA7PARBZSmyiri9dWuiB0hled2Vjzee2FDKEfuBZ04PRku6ZsljETVDmO
-						nQIDAQABo1AwTjAdBgNVHQ4EFgQUsVamXCDZmaPx60a0iF4Ra5i4X0gwHwYDVR0j
-						BBgwFoAUsVamXCDZmaPx60a0iF4Ra5i4X0gwDAYDVR0TBAUwAwEB/zANBgkqhkiG
-						9w0BAQUFAAOCAQEAeOQBpi5xhTBE6nbSLMoxTWl04TFjyNx3efNdK9v6yJthudfJ
-						njM/yh51DlNLclhx1DG0mxSaqrLi3Z/ZccYsKtZJVLWD0BaNQyXegPG4eyOLH4sq
-						bmFhvrffVsmifynPezbM2QSDcz3nHZZQEUQg+j4THrqSka4oJEYlMtsgTRjbrFYf
-						CeUkTgB5mVNUfTS23sXp544zCo0W8kUF5ViUNuNL6p2XPRpXnrmVePgz1TU2egd2
-						pcWxqlhKnQawqVRhixnxUXrSAcFCW3t6PV1Y7abxl17ux5qZxRVPa0KTr4nZioQZ
-						7f8wd1sz16xoVOAfi93qMNDb+ha44YQFQKHoPg==
-					</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>
-						MIIDSDCCAjCgAwIBAgIITOCMDokwhbkwDQYJKoZIhvcNAQEFBQAwOzEdMBsGA1UE
-						CgwUVW5pdmVyc2l0eSBvZiBTdXJyZXkxGjAYBgNVBAMMEW9hbGEuc3VycmV5LmFj
-						LnVrMB4XDTEyMDMyOTExMjUyM1oXDTIyMDMyOTExMjUyM1owOzEdMBsGA1UECgwU
-						VW5pdmVyc2l0eSBvZiBTdXJyZXkxGjAYBgNVBAMMEW9hbGEuc3VycmV5LmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlQUcfoCNygSZkRb1rvMz
-						qIdbaZhcLek/W5QweKu1cWymyjBOFHK2Ioj3gFotYvLqp/CwaX9Ku++urHOtfW4C
-						FdYt2uZi34Frap5Q34QiDcIfSpm+tb8YmsuJczxTfJ7Azywd3uEFjPqcNKyRJPMC
-						j8aoMdcpjf8JwjO97ngErjEdjdlaehVTk1jhylDj40UOXdIuuKiHTo+rC9/fHN87
-						5Iz1xrANl4rb5JdV96iXZamGjXYMXhlJ70JIGkerWyW2fAggDTmrfL5vWiKD4SnJ
-						2yTz5N5OA7PARBZSmyiri9dWuiB0hled2Vjzee2FDKEfuBZ04PRku6ZsljETVDmO
-						nQIDAQABo1AwTjAdBgNVHQ4EFgQUsVamXCDZmaPx60a0iF4Ra5i4X0gwHwYDVR0j
-						BBgwFoAUsVamXCDZmaPx60a0iF4Ra5i4X0gwDAYDVR0TBAUwAwEB/zANBgkqhkiG
-						9w0BAQUFAAOCAQEAeOQBpi5xhTBE6nbSLMoxTWl04TFjyNx3efNdK9v6yJthudfJ
-						njM/yh51DlNLclhx1DG0mxSaqrLi3Z/ZccYsKtZJVLWD0BaNQyXegPG4eyOLH4sq
-						bmFhvrffVsmifynPezbM2QSDcz3nHZZQEUQg+j4THrqSka4oJEYlMtsgTRjbrFYf
-						CeUkTgB5mVNUfTS23sXp544zCo0W8kUF5ViUNuNL6p2XPRpXnrmVePgz1TU2egd2
-						pcWxqlhKnQawqVRhixnxUXrSAcFCW3t6PV1Y7abxl17ux5qZxRVPa0KTr4nZioQZ
-						7f8wd1sz16xoVOAfi93qMNDb+ha44YQFQKHoPg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.surrey.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.surrey.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Surrey</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Surrey (Institutional Login)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.surrey.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Claire</GivenName>
-    <SurName>Gill</SurName>
-    <EmailAddress>mailto:c.j.gill@surrey.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Abdul</GivenName>
-    <SurName>Minhas</SurName>
-    <EmailAddress>mailto:a.minhas@surrey.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala.trinitylaban.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oala.trinitylaban.ac.uk-oala-metadata.xml
deleted file mode 100644
index ec28f2e8..00000000
--- a/swamid-interfederations-2.0/oala.trinitylaban.ac.uk-oala-metadata.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://oala.trinitylaban.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Trinity Laban Conservatoire of Music and Dance Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-05T18:33:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">kcc.tcm.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Trinity Laban</mdui:DisplayName>
-        <mdui:Logo height="60" width="60">https://oala.trinitylaban.ac.uk/oala/images/tlsqtr60px.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://oala.trinitylaban.ac.uk/oala/images/tlfavicon.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIRAOP4a2rGltT7syLTMWMP0yMwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xNDAzMTEwMDAwMDBaFw0xNzAzMTAyMzU5NTlaMEUxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXb2FsYS50cmlu
-						aXR5bGFiYW4uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8
-						fS+Lxi6rqfi+4r69jVE3cZB4Xgi/URiCP2UbOHnoYjeRCy+ePHchk31oebEfF6kq
-						g/PcrAsmgNCgQ0XUesiZPGTZDPUrmsZAzX6ExMxTPiNXeQtnbbVRdIee/16duWoX
-						F2T6vfYvyisZgkI8FGVWcUY6HOnXEKCFTtzznX4pkv/FpnTlB9Z4DEuAHWnAJUfz
-						dzUO1941DE5MEi4/29Y1aoj0QdliLy5qTGB0AKO7OjYWjfx6XcwqYKhYVcDAwiBK
-						q5LoiH/P6CKwYs4iea0ZFT3F6CSOyN0nmiOH/WzT853wiAqLptO/oun8FeDXz5kr
-						bkBJX8ODB6ChlLd0FEJnAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
-						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQU2kzdewE+omvtXAoSGI0rZxkquW0wDgYD
-						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF29hbGEudHJpbml0
-						eWxhYmFuLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQAO0EL0yO9As2ommUEfYOiM
-						usV7rpBuxj8wQdETSk+MFeXC5DmGn5K31g6QSeKABgxl3f5mwugs/6oP0XN9356W
-						b8EQHmldHx+Rgba2RjSSW7BPhMMXWD0fWOt4wQmHvDk4KHazg/r/kmuHBlQJjHEQ
-						pqHqnF2Z/6dd8RF5gnVplUfuv4iAwHMNYanvOPzjKEBu5Ah6ONV0b6MqAKibPKbW
-						m7UM5Kv5sjA8xs+7duWvSyTsalpM5+GchHQhurcdqlagdHiN5zRpCGXKAs0nWuFc
-						pbL9oxrAy7Tm9MbUIs951lYcX+K93CT+CTeDBMeulw5d8x1buwmZS5Axsig7jO2g
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.trinitylaban.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.trinitylaban.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Trinity Laban Conservatoire Of Music And Dance Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Trinity Laban</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.trinitylaban.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Edith</GivenName>
-    <SurName>Speller</SurName>
-    <EmailAddress>mailto:e.speller@trinitylaban.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT</GivenName>
-    <SurName>Department</SurName>
-    <EmailAddress>mailto:it@trinitylaban.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oala.uws.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/oala.uws.ac.uk-oala-metadata.xml
deleted file mode 100644
index 7fcc1442..00000000
--- a/swamid-interfederations-2.0/oala.uws.ac.uk-oala-metadata.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://oala.uws.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the University of the West of Scotland.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-20T18:17:50Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">uws.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIIbQnNE5dUfa4wDQYJKoZIhvcNAQEFBQAwMzEYMBYGA1UE
-						CgwPVVdTX0RldmVsb3BtZW50MRcwFQYDVQQDDA5vYWxhLnV3cy5hYy51azAeFw0x
-						MjEyMTgxNTE5MDZaFw0yMjEyMTgxNTE5MDZaMDMxGDAWBgNVBAoMD1VXU19EZXZl
-						bG9wbWVudDEXMBUGA1UEAwwOb2FsYS51d3MuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDiqewakPZodoX19+9+qPMOcxYrTZqEt/ljYtVrSkFb
-						fo7QBQ8i7cI3gmLDR6OudWF7rc8Mg8Nhjdsv/qijBXWXK5pzmbczwKA2hYVg148M
-						+GyIlOcIUD/OJ2xixpkXiaa11Z9m4SdOh50AgXyfOvo1WFMgJqC5Xg9dQtNWrP7r
-						R91dVGaF4dY+PlEfgQ2HQp4N4YK8C2MhNppUyfgOrt8iczCNYBX1kqyOdny8/bDR
-						cvzqAg9oIf910rGS5RvetpLxnIiG9bLnUoiXCiGytNntKZjj/3qKb4x4iTvrCFe8
-						/2NRGe47rTzOKfyVDo0YnXDkEGhEuAjMu4FGQeo8muBLAgMBAAGjUDBOMB0GA1Ud
-						DgQWBBTY1w4Mn4Xy3KHsgxVO5XFrEFf1ezAfBgNVHSMEGDAWgBTY1w4Mn4Xy3KHs
-						gxVO5XFrEFf1ezAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDFaE6E
-						87PXIBb66PY1c75fSj1QItA8RkQLh/AqAbiV2+xonO44rxiNqMbUX8Cd3Sow0X/6
-						Uj59jtAhKHEslOaDIPNsig377yt9ppgGGgFeruK6yZ/TV86Jq6s2xxOYgJYjZv0f
-						FOgbdMm1EtUk72qmcDL4+MQbCJrC4QZYlRglm2X+0uuiaoyamkJC32Z6Nfy5iqot
-						Hd5rN37WdO15lqq/9oJ7ceZcIfGUr4mn0u73iT2AJ0YwTl85Ra6iu/IdiCvPbNE8
-						Sg4ZQsDNqOTbhHKbYdD2iJq03fcfH3AySZLSXrbgfpqlOEwTiX/nAQT7jJjVJ3Wk
-						khuKC+d+27DnjjLI
-					</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>
-						MIIDODCCAiCgAwIBAgIIbQnNE5dUfa4wDQYJKoZIhvcNAQEFBQAwMzEYMBYGA1UE
-						CgwPVVdTX0RldmVsb3BtZW50MRcwFQYDVQQDDA5vYWxhLnV3cy5hYy51azAeFw0x
-						MjEyMTgxNTE5MDZaFw0yMjEyMTgxNTE5MDZaMDMxGDAWBgNVBAoMD1VXU19EZXZl
-						bG9wbWVudDEXMBUGA1UEAwwOb2FsYS51d3MuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDiqewakPZodoX19+9+qPMOcxYrTZqEt/ljYtVrSkFb
-						fo7QBQ8i7cI3gmLDR6OudWF7rc8Mg8Nhjdsv/qijBXWXK5pzmbczwKA2hYVg148M
-						+GyIlOcIUD/OJ2xixpkXiaa11Z9m4SdOh50AgXyfOvo1WFMgJqC5Xg9dQtNWrP7r
-						R91dVGaF4dY+PlEfgQ2HQp4N4YK8C2MhNppUyfgOrt8iczCNYBX1kqyOdny8/bDR
-						cvzqAg9oIf910rGS5RvetpLxnIiG9bLnUoiXCiGytNntKZjj/3qKb4x4iTvrCFe8
-						/2NRGe47rTzOKfyVDo0YnXDkEGhEuAjMu4FGQeo8muBLAgMBAAGjUDBOMB0GA1Ud
-						DgQWBBTY1w4Mn4Xy3KHsgxVO5XFrEFf1ezAfBgNVHSMEGDAWgBTY1w4Mn4Xy3KHs
-						gxVO5XFrEFf1ezAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDFaE6E
-						87PXIBb66PY1c75fSj1QItA8RkQLh/AqAbiV2+xonO44rxiNqMbUX8Cd3Sow0X/6
-						Uj59jtAhKHEslOaDIPNsig377yt9ppgGGgFeruK6yZ/TV86Jq6s2xxOYgJYjZv0f
-						FOgbdMm1EtUk72qmcDL4+MQbCJrC4QZYlRglm2X+0uuiaoyamkJC32Z6Nfy5iqot
-						Hd5rN37WdO15lqq/9oJ7ceZcIfGUr4mn0u73iT2AJ0YwTl85Ra6iu/IdiCvPbNE8
-						Sg4ZQsDNqOTbhHKbYdD2iJq03fcfH3AySZLSXrbgfpqlOEwTiX/nAQT7jJjVJ3Wk
-						khuKC+d+27DnjjLI
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oala.uws.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oala.uws.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of the West of Scotland</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of the West of Scotland - ICT Development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uws.ac.uk/ictservices/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Pavel</GivenName>
-    <SurName>Jiracek</SurName>
-    <EmailAddress>mailto:pavel.jiracek@uws.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Pavel</GivenName>
-    <SurName>Jiracek</SurName>
-    <EmailAddress>mailto:pavel.jiracek@uws.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml b/swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml
deleted file mode 100644
index 211e4c10..00000000
--- a/swamid-interfederations-2.0/oar.sci-gaia.eu-shibboleth.xml
+++ /dev/null
@@ -1,121 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oar.sci-gaia.eu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2015-09-23T10:56:28Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-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://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://oar.sci-gaia.eu/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://oar.sci-gaia.eu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sci-GaIA project Open Access Repository</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Sci-GaIA project Open Access Repository</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Sci-GaIA project Open Access Repository</mdui:Description>
-        <mdui:Description xml:lang="it">Sci-GaIA project Open Access Repository</mdui:Description>
-        <mdui:Description xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://oar.sci-gaia.eu/?ln=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="fr">https://oar.sci-gaia.eu/ln=fr</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://oar.sci-gaia.eu/help/privacy-policy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFnjCCBIagAwIBAgIRAM3ckvEIEzZuZULXK4R98qkwDQYJKoZIhvcNAQELBQAw
-gZYxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTwwOgYD
-VQQDEzNDT01PRE8gUlNBIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIFNlY3VyZSBT
-ZXJ2ZXIgQ0EwHhcNMTUwOTE3MDAwMDAwWhcNMTgwOTE2MjM1OTU5WjCBoDELMAkG
-A1UEBhMCSVQxDjAMBgNVBBETBTk1MTIzMRAwDgYDVQQIEwdDYXRhbmlhMRAwDgYD
-VQQHEwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy4gU29maWEsIDY0MRIwEAYDVQQK
-EwlVTklDVC1EUEExFDASBgNVBAsTC1BsYXRpbnVtU1NMMRgwFgYDVQQDEw9vYXIu
-c2NpLWdhaWEuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmdNsc
-6ZOGij3jDmsiaQ01gKUT3F7QCxUn/LLsMZJO5Q+wr913AxwcIrN90KUdtFwcpofU
-KK6c3/kVjBPcqizubV3KyGP2GhgO9srj6sJv07lKPOSM3zujuQM0L00uI2Q0t4wd
-v126+qd1pt3z7yjt5fIIjST2vk6tZd/o0G4ouuXlTi/qNaOBMhYDmfmysZojtuZp
-2pxwBNNAJYJg0ubt/hpQt0eBgoPITbp8WrGDw9TAz2pc8stcOK+ibvDANsQBuOI8
-E/Hlm+GAAk86T13IUSo8HWdcFAy+Ou2xaQZCdpUg58hdUb58ffl2UAUhseINH+Eq
-7YoBGH2AzTc2+kZRAgMBAAGjggHZMIIB1TAfBgNVHSMEGDAWgBSa8yvaz61Pti+7
-KkhIKhK3G0LBJDAdBgNVHQ4EFgQUZrSR5oipbEqnS0ssSvdbpzExFOswDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMFAGA1UdIARJMEcwOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEW
-HWh0dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECAjBaBgNVHR8E
-UzBRME+gTaBLhklodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FPcmdh
-bml6YXRpb25WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGLBggrBgEFBQcB
-AQR/MH0wVQYIKwYBBQUHMAKGSWh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9E
-T1JTQU9yZ2FuaXphdGlvblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTAaBgNVHREEEzARgg9v
-YXIuc2NpLWdhaWEuZXUwDQYJKoZIhvcNAQELBQADggEBAFvYiOoqoFdN43X4PPUj
-Zs1dKveKKj2nUr9L8LgLl9ff2FkR9B6gF7kgTC8x1dq5JbG8s0bC3dgh8gh9kUXB
-1+PWZ9+WKoq2W/RfCBEoUSMrcQVGW0lkoHJjuEyh5lty43g5HhgTKLypwD1a/glL
-9l/sH/XOu1VEoAU0ocbrkwMB9t7LkNBEegEyx3d2TcarCywhJ43WFoCeORHKHKPk
-sKwrSiI3l4S1BlRq1GQJElZl9/oKpBYQ8UzjOXuTgDN6U6lwyj/uSj75BQ3jwbCF
-VDSqlLDi9y84jexFwiY+/ulPUc7WQPtD8QxeemcFbLvP/gnosW9YxY3/TZvQQ68y
-InI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <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#rsa-oaep-mgf1p"/>
-      <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/2009/xmlenc11#rsa-oaep"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oar.sci-gaia.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oar.sci-gaia.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Sci-GaIA project Open Access Repository</md:ServiceName>
-      <md:ServiceName xml:lang="it">Sci-GaIA project Open Access Repository</md:ServiceName>
-      <md:ServiceName xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Sci-GaIA project Open Access Repository</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Sci-GaIA project Open Access Repository</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA</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="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi Catania</md:OrganizationName>
-    <md:OrganizationName xml:lang="fr">Università degli Studi Catania</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Open Access Repository del progetto Sci-GaIA erogato dall'Università degli Studi di Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">Répertoire d'Accès Ouvert par le projet Sci-GaIA délivré par l'Università degli Studi di Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sci-GaIA Open Access Repository provided by the University of Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unict.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.unict.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unict.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:admin@sci-gaia.eu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:admin@sci-gaia.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml b/swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.xml
deleted file mode 100644
index 34c16dbc..00000000
--- a/swamid-interfederations-2.0/oasp-omicron.athensams.net-oa-metadata.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://oasp-omicron.athensams.net/oa/metadata">
-  <!--
-		This is an "Omicron Test" OpenAthens SP for Eduserv.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-13T13:21:33Z"/>
-  </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>
-						MIIDsjCCApqgAwIBAgIJALsMSAHJEd0ZMA0GCSqGSIb3DQEBBQUAMEQxHTAbBgNV
-						BAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpvYXNwLW9taWNyb24u
-						YXRoZW5zYW1zLm5ldDAeFw0xMzAzMTMxMjIyMDdaFw0yMzAzMTExMjIyMDdaMEQx
-						HTAbBgNVBAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpvYXNwLW9t
-						aWNyb24uYXRoZW5zYW1zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMaxRxvM95+hPSWZCcg/KX76tfQylQa05bLKMRJTbV5AkDb8EmpQVXVfzldY
-						5/MyU1KM++Uv6oTBme91dZSIy79B63l/Wy88yXUtGYFqo6hFsl7CbQ7/V6oh95oI
-						KeFlVgqfVb6cdq+2V/sbJqCTPHmDxxV1zmK4mvZ5on3SzJT51Ep5YQOZ+bEs7oP2
-						5WadgH2iaLRhTsL1bkdIRBfkJigrMFgEMruueGmjLs+JbNMLnOth3XGgu6I674M9
-						lkiSnxB25Hs/lf6f/K1dz4TGEeS+TSbjP1QFvOuesuUuI8uHxptez1Y+ORPoesD6
-						fRz5ix5wbhLTxxjIQRwZqEwqLBsCAwEAAaOBpjCBozAdBgNVHQ4EFgQUZw3RZM3w
-						E8/wsk30/ArzpIEl8ccwdAYDVR0jBG0wa4AUZw3RZM3wE8/wsk30/ArzpIEl8ceh
-						SKRGMEQxHTAbBgNVBAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpv
-						YXNwLW9taWNyb24uYXRoZW5zYW1zLm5ldIIJALsMSAHJEd0ZMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBAEi6C2myxUc6XLkaF8ZhrO/BefiJDx/FSKoN
-						y4mvsi+FiF1AtAoE5FFX/42Sf50wziL8sVWK+oaEu0W6EValylaE5wsUvzfM45bo
-						Pubt3AUWVcBMKNrw9hQZBB87sB5k0RSMaGF/f5lkW2NhqDtnKkd3rTp1rJa66WWy
-						DqbDrFhXtlqYibcYli8Vv6jXOCEl6H+G6lm7adMwBj+r/MmkORQFQXP5He9OoXtB
-						n/NLzmIyzzJsNc0+CG8ULhNdLnM1zshlivat03y/RtDu3fesGctpLgcXzmLUsc2I
-						LKPqIv8PhWTiwsTIa42GCb27MgMP3GWFFiIUqRxO2R3g2On+xb0=
-					</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>
-						MIIDsjCCApqgAwIBAgIJALsMSAHJEd0ZMA0GCSqGSIb3DQEBBQUAMEQxHTAbBgNV
-						BAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpvYXNwLW9taWNyb24u
-						YXRoZW5zYW1zLm5ldDAeFw0xMzAzMTMxMjIyMDdaFw0yMzAzMTExMjIyMDdaMEQx
-						HTAbBgNVBAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpvYXNwLW9t
-						aWNyb24uYXRoZW5zYW1zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMaxRxvM95+hPSWZCcg/KX76tfQylQa05bLKMRJTbV5AkDb8EmpQVXVfzldY
-						5/MyU1KM++Uv6oTBme91dZSIy79B63l/Wy88yXUtGYFqo6hFsl7CbQ7/V6oh95oI
-						KeFlVgqfVb6cdq+2V/sbJqCTPHmDxxV1zmK4mvZ5on3SzJT51Ep5YQOZ+bEs7oP2
-						5WadgH2iaLRhTsL1bkdIRBfkJigrMFgEMruueGmjLs+JbNMLnOth3XGgu6I674M9
-						lkiSnxB25Hs/lf6f/K1dz4TGEeS+TSbjP1QFvOuesuUuI8uHxptez1Y+ORPoesD6
-						fRz5ix5wbhLTxxjIQRwZqEwqLBsCAwEAAaOBpjCBozAdBgNVHQ4EFgQUZw3RZM3w
-						E8/wsk30/ArzpIEl8ccwdAYDVR0jBG0wa4AUZw3RZM3wE8/wsk30/ArzpIEl8ceh
-						SKRGMEQxHTAbBgNVBAoTFE9hc3AgT21pY3JvbiBUZXN0IFNQMSMwIQYDVQQDExpv
-						YXNwLW9taWNyb24uYXRoZW5zYW1zLm5ldIIJALsMSAHJEd0ZMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBAEi6C2myxUc6XLkaF8ZhrO/BefiJDx/FSKoN
-						y4mvsi+FiF1AtAoE5FFX/42Sf50wziL8sVWK+oaEu0W6EValylaE5wsUvzfM45bo
-						Pubt3AUWVcBMKNrw9hQZBB87sB5k0RSMaGF/f5lkW2NhqDtnKkd3rTp1rJa66WWy
-						DqbDrFhXtlqYibcYli8Vv6jXOCEl6H+G6lm7adMwBj+r/MmkORQFQXP5He9OoXtB
-						n/NLzmIyzzJsNc0+CG8ULhNdLnM1zshlivat03y/RtDu3fesGctpLgcXzmLUsc2I
-						LKPqIv8PhWTiwsTIa42GCb27MgMP3GWFFiIUqRxO2R3g2On+xb0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-omicron.athensams.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-omicron.athensams.net/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-omicron.athensams.net/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-omicron.athensams.net/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv Omicron Test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml b/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml
deleted file mode 100644
index bbd1e9a0..00000000
--- a/swamid-interfederations-2.0/oasp.beta.athensams.net-OaspMetadata.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://oasp.beta.athensams.net/OaspMetadata">
-  <!--
-		This is an Eduserv OpenAthens test combined SP/IdP.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEtTCCA52gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
-						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
-						bXMubmV0MScwJQYJKoZIhvcNAQkBFhhhdGhlbnNkc3BAZWR1c2Vydi5vcmcudWsw
-						HhcNMDgwMjE1MDk1ODM1WhcNMTgwMjEyMDk1ODM1WjCBnTELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
-						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
-						bXMubmV0MScwJQYJKoZIhvcNAQkBFhhhdGhlbnNkc3BAZWR1c2Vydi5vcmcudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLYAfycv0j9S88QfU4GCGU
-						Md16DqYLQpEDBvRPLuAjKypBoIZwnKbhh+p6GlafYsXk/oNpG5EZ4Wn/tYd8CM2w
-						2bpoifmGAiXKvWoh87vgotkZnrvStGj/Aw7eUM8nsfduMbiw6vCO7BQAfwGzkUL7
-						7obaMLA9Zbz5afGAvzq9k58+D6u9ox/DzAdN4iqbrFgvnxiN2uvusIkIeMoxUREd
-						qiFFoXlk97Sj7yeKggkA25AtOUO2LnI8Le7FT3dP2jlCB9onlIa0ZR0Fm/RjFu4t
-						zxB+jwvZ3VTqmxIzzCYxi6wK+xOaJPVwLvSGTwyquNUJSrMAOef43rIMCVAQDmKr
-						AgMBAAGjgf0wgfowHQYDVR0OBBYEFH7zEIp6CNN5LLMic1imrULmiSBgMIHKBgNV
-						HSMEgcIwgb+AFH7zEIp6CNN5LLMic1imrULmiSBgoYGjpIGgMIGdMQswCQYDVQQG
-						EwJHQjERMA8GA1UECBMIU29tZXJzZXQxDTALBgNVBAcTBEJhdGgxEDAOBgNVBAoT
-						B0VkdXNlcnYxDzANBgNVBAsTBkF0aGVuczEgMB4GA1UEAxMXb2FzcC5iZXRhLmF0
-						aGVuc2Ftcy5uZXQxJzAlBgkqhkiG9w0BCQEWGGF0aGVuc2RzcEBlZHVzZXJ2Lm9y
-						Zy51a4IBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBoIKKJtwn/
-						MUxqYHeOpCjgHxOFssQpALuuasCpx7Ojb/a1fkV2523hI09zDTy2m7s3C9szPhwx
-						Zv1LUshbMsZon2bYXZwDdFa8tkzOYlZpKhguv6r/5LFZI2s09uDaVrFl6cVxFAUz
-						FQiY8XQHME4m+hxqf8RMGMid+33QtIIlEAD4/OnvquHXBxiO8ESMxebV4mNLkn34
-						KEfS16BFBP3scX62GBHqg+dAZVJHHjbIdIQsPcFa/3UElFMxur1gOKclzjHa8GX3
-						0YGxOwt3hjmCenx6jVu/4RF5tN8GLvq5dcU1o0M6b8bDf70Htq2WS+4RIAsO+NHd
-						7HIXRm4dVYw+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oasp-beta.athensams.net/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oasp-beta.athensams.net/oala/sso"/>
-  </IDPSSODescriptor>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEtTCCA52gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
-						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
-						bXMubmV0MScwJQYJKoZIhvcNAQkBFhhhdGhlbnNkc3BAZWR1c2Vydi5vcmcudWsw
-						HhcNMDgwMjE1MDk1ODM1WhcNMTgwMjEyMDk1ODM1WjCBnTELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
-						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
-						bXMubmV0MScwJQYJKoZIhvcNAQkBFhhhdGhlbnNkc3BAZWR1c2Vydi5vcmcudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLYAfycv0j9S88QfU4GCGU
-						Md16DqYLQpEDBvRPLuAjKypBoIZwnKbhh+p6GlafYsXk/oNpG5EZ4Wn/tYd8CM2w
-						2bpoifmGAiXKvWoh87vgotkZnrvStGj/Aw7eUM8nsfduMbiw6vCO7BQAfwGzkUL7
-						7obaMLA9Zbz5afGAvzq9k58+D6u9ox/DzAdN4iqbrFgvnxiN2uvusIkIeMoxUREd
-						qiFFoXlk97Sj7yeKggkA25AtOUO2LnI8Le7FT3dP2jlCB9onlIa0ZR0Fm/RjFu4t
-						zxB+jwvZ3VTqmxIzzCYxi6wK+xOaJPVwLvSGTwyquNUJSrMAOef43rIMCVAQDmKr
-						AgMBAAGjgf0wgfowHQYDVR0OBBYEFH7zEIp6CNN5LLMic1imrULmiSBgMIHKBgNV
-						HSMEgcIwgb+AFH7zEIp6CNN5LLMic1imrULmiSBgoYGjpIGgMIGdMQswCQYDVQQG
-						EwJHQjERMA8GA1UECBMIU29tZXJzZXQxDTALBgNVBAcTBEJhdGgxEDAOBgNVBAoT
-						B0VkdXNlcnYxDzANBgNVBAsTBkF0aGVuczEgMB4GA1UEAxMXb2FzcC5iZXRhLmF0
-						aGVuc2Ftcy5uZXQxJzAlBgkqhkiG9w0BCQEWGGF0aGVuc2RzcEBlZHVzZXJ2Lm9y
-						Zy51a4IBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBoIKKJtwn/
-						MUxqYHeOpCjgHxOFssQpALuuasCpx7Ojb/a1fkV2523hI09zDTy2m7s3C9szPhwx
-						Zv1LUshbMsZon2bYXZwDdFa8tkzOYlZpKhguv6r/5LFZI2s09uDaVrFl6cVxFAUz
-						FQiY8XQHME4m+hxqf8RMGMid+33QtIIlEAD4/OnvquHXBxiO8ESMxebV4mNLkn34
-						KEfS16BFBP3scX62GBHqg+dAZVJHHjbIdIQsPcFa/3UElFMxur1gOKclzjHa8GX3
-						0YGxOwt3hjmCenx6jVu/4RF5tN8GLvq5dcU1o0M6b8bDf70Htq2WS+4RIAsO+NHd
-						7HIXRm4dVYw+
-					</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>
-						MIIEtTCCA52gAwIBAgIBADANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
-						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
-						bXMubmV0MScwJQYJKoZIhvcNAQkBFhhhdGhlbnNkc3BAZWR1c2Vydi5vcmcudWsw
-						HhcNMDgwMjE1MDk1ODM1WhcNMTgwMjEyMDk1ODM1WjCBnTELMAkGA1UEBhMCR0Ix
-						ETAPBgNVBAgTCFNvbWVyc2V0MQ0wCwYDVQQHEwRCYXRoMRAwDgYDVQQKEwdFZHVz
-						ZXJ2MQ8wDQYDVQQLEwZBdGhlbnMxIDAeBgNVBAMTF29hc3AuYmV0YS5hdGhlbnNh
-						bXMubmV0MScwJQYJKoZIhvcNAQkBFhhhdGhlbnNkc3BAZWR1c2Vydi5vcmcudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLYAfycv0j9S88QfU4GCGU
-						Md16DqYLQpEDBvRPLuAjKypBoIZwnKbhh+p6GlafYsXk/oNpG5EZ4Wn/tYd8CM2w
-						2bpoifmGAiXKvWoh87vgotkZnrvStGj/Aw7eUM8nsfduMbiw6vCO7BQAfwGzkUL7
-						7obaMLA9Zbz5afGAvzq9k58+D6u9ox/DzAdN4iqbrFgvnxiN2uvusIkIeMoxUREd
-						qiFFoXlk97Sj7yeKggkA25AtOUO2LnI8Le7FT3dP2jlCB9onlIa0ZR0Fm/RjFu4t
-						zxB+jwvZ3VTqmxIzzCYxi6wK+xOaJPVwLvSGTwyquNUJSrMAOef43rIMCVAQDmKr
-						AgMBAAGjgf0wgfowHQYDVR0OBBYEFH7zEIp6CNN5LLMic1imrULmiSBgMIHKBgNV
-						HSMEgcIwgb+AFH7zEIp6CNN5LLMic1imrULmiSBgoYGjpIGgMIGdMQswCQYDVQQG
-						EwJHQjERMA8GA1UECBMIU29tZXJzZXQxDTALBgNVBAcTBEJhdGgxEDAOBgNVBAoT
-						B0VkdXNlcnYxDzANBgNVBAsTBkF0aGVuczEgMB4GA1UEAxMXb2FzcC5iZXRhLmF0
-						aGVuc2Ftcy5uZXQxJzAlBgkqhkiG9w0BCQEWGGF0aGVuc2RzcEBlZHVzZXJ2Lm9y
-						Zy51a4IBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBoIKKJtwn/
-						MUxqYHeOpCjgHxOFssQpALuuasCpx7Ojb/a1fkV2523hI09zDTy2m7s3C9szPhwx
-						Zv1LUshbMsZon2bYXZwDdFa8tkzOYlZpKhguv6r/5LFZI2s09uDaVrFl6cVxFAUz
-						FQiY8XQHME4m+hxqf8RMGMid+33QtIIlEAD4/OnvquHXBxiO8ESMxebV4mNLkn34
-						KEfS16BFBP3scX62GBHqg+dAZVJHHjbIdIQsPcFa/3UElFMxur1gOKclzjHa8GX3
-						0YGxOwt3hjmCenx6jVu/4RF5tN8GLvq5dcU1o0M6b8bDf70Htq2WS+4RIAsO+NHd
-						7HIXRm4dVYw+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net/oa/auth/rcv/saml2/art" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/shib/post" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/shib/art" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/saml2/post" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv/saml2/art" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net/oa/auth/rcv" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp-beta.athensams.net:5070/oa/auth/rcv" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp-beta.athensams.net/authrev.aspx" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp-beta.athensams.net/authrev.aspx" index="18"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv Beta</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.athensams.net/dsp/openathens_sp</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Athens Helpdesk</GivenName>
-    <EmailAddress>mailto:athenshelp@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml b/swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.xml
deleted file mode 100644
index ead6de6c..00000000
--- a/swamid-interfederations-2.0/oasp.test.openathens.net-oa-metadata.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://oasp.test.openathens.net/oa/metadata">
-  <!--
-		This is an OpenAthens test SP for Eduserv.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:55:47Z"/>
-  </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>
-						MIIDqTCCApGgAwIBAgIJAIF6hHuafvj6MA0GCSqGSIb3DQEBBQUAMEExHDAaBgNV
-						BAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5vcGVu
-						YXRoZW5zLm5ldDAeFw0xMTExMjUxMzI5MjZaFw0yMTExMjIxMzI5MjZaMEExHDAa
-						BgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5v
-						cGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0g
-						7T/RWjQt10WSM05mXnFuOdcMCOIaLb2CaJrcafZXDsEPyZwuliy9dbtQj+NtKaJk
-						yHi4eXwZMCcHlIp1w9WK8qqkIMqZcQ1JS55e5f2JsvzD9IRkFXey8gHzMybeL/3E
-						jvqlsNSYRPP+WVAJAgWFuZcKkx3PdmaP0j1qrj2TknKKW1mUxN67JMEDk8Zow938
-						jqfCVyJMUqklfEmAsizu4Y9xCGd5wGhhBYCW8LV0JsdE1DcZlAVs5vhkhYX/W281
-						dmoNkcuRoIua7juEYIB4j3lt73+U12x7nNqBCOkm0lSUxpXS3GU9saGiTFKmuIYG
-						RwidXYL38UON0Sna3lECAwEAAaOBozCBoDAdBgNVHQ4EFgQUplgZXO9FGWF0QS0Y
-						mRnlYo+iX2AwcQYDVR0jBGowaIAUplgZXO9FGWF0QS0YmRnlYo+iX2ChRaRDMEEx
-						HDAaBgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVz
-						dC5vcGVuYXRoZW5zLm5ldIIJAIF6hHuafvj6MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEFBQADggEBAB7E38GQDT3TsUstX+fj7pbxn4mdttp31TquTa4t1tzN/InY
-						/yNMCzLwtu4jK1lFJj47VzZt8aAc7p9T6g623PLqz+xDtK+TPN4a8mqqIvDmzZPP
-						gcdA7Lj6OcnHqY14IBKytoserwXlZ2YdL7uRmzaAqwCi9CMGaMY95HzcyWCGVPgX
-						6N8bVcOOBA0SE+SUt3YercH/Hld/MZomRY4reZ2c6jnlSKcvwAYnodgLEYtvFEOJ
-						LkNq6dHtQ2tqCxYPDiW/zNOwr6vpVYvmXDxZuRF0VwPJzC2N2mSQOH7GOnWclgA+
-						GFyeNtcZ1d2CHmxNE+2pWsg9tOPp/m2Vtq7TRpg=
-					</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>
-						MIIDqTCCApGgAwIBAgIJAIF6hHuafvj6MA0GCSqGSIb3DQEBBQUAMEExHDAaBgNV
-						BAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5vcGVu
-						YXRoZW5zLm5ldDAeFw0xMTExMjUxMzI5MjZaFw0yMTExMjIxMzI5MjZaMEExHDAa
-						BgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVzdC5v
-						cGVuYXRoZW5zLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0g
-						7T/RWjQt10WSM05mXnFuOdcMCOIaLb2CaJrcafZXDsEPyZwuliy9dbtQj+NtKaJk
-						yHi4eXwZMCcHlIp1w9WK8qqkIMqZcQ1JS55e5f2JsvzD9IRkFXey8gHzMybeL/3E
-						jvqlsNSYRPP+WVAJAgWFuZcKkx3PdmaP0j1qrj2TknKKW1mUxN67JMEDk8Zow938
-						jqfCVyJMUqklfEmAsizu4Y9xCGd5wGhhBYCW8LV0JsdE1DcZlAVs5vhkhYX/W281
-						dmoNkcuRoIua7juEYIB4j3lt73+U12x7nNqBCOkm0lSUxpXS3GU9saGiTFKmuIYG
-						RwidXYL38UON0Sna3lECAwEAAaOBozCBoDAdBgNVHQ4EFgQUplgZXO9FGWF0QS0Y
-						mRnlYo+iX2AwcQYDVR0jBGowaIAUplgZXO9FGWF0QS0YmRnlYo+iX2ChRaRDMEEx
-						HDAaBgNVBAoTE0V4YW1wbGUgYXBwbGljYXRpb24xITAfBgNVBAMTGG9hc3AudGVz
-						dC5vcGVuYXRoZW5zLm5ldIIJAIF6hHuafvj6MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-						hvcNAQEFBQADggEBAB7E38GQDT3TsUstX+fj7pbxn4mdttp31TquTa4t1tzN/InY
-						/yNMCzLwtu4jK1lFJj47VzZt8aAc7p9T6g623PLqz+xDtK+TPN4a8mqqIvDmzZPP
-						gcdA7Lj6OcnHqY14IBKytoserwXlZ2YdL7uRmzaAqwCi9CMGaMY95HzcyWCGVPgX
-						6N8bVcOOBA0SE+SUt3YercH/Hld/MZomRY4reZ2c6jnlSKcvwAYnodgLEYtvFEOJ
-						LkNq6dHtQ2tqCxYPDiW/zNOwr6vpVYvmXDxZuRF0VwPJzC2N2mSQOH7GOnWclgA+
-						GFyeNtcZ1d2CHmxNE+2pWsg9tOPp/m2Vtq7TRpg=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oasp.test.openathens.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oasp.test.openathens.net/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oasp.test.openathens.net/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oasp.test.openathens.net/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv: Test C SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oba.coppin.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/oba.coppin.edu-idp-shibboleth.xml
deleted file mode 100644
index dcefbf5b..00000000
--- a/swamid-interfederations-2.0/oba.coppin.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +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://oba.coppin.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">coppin.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Coppin State University</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>
-MIIDIzCCAgugAwIBAgIUM+YnW+6Qcco4W7bnmL64pyaxlZMwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOb2JhLmNvcHBpbi5lZHUwHhcNMTQwMjA1MjE1NTI2WhcN
-MzQwMjA1MjE1NTI2WjAZMRcwFQYDVQQDEw5vYmEuY29wcGluLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALOtb2EvK7e1tp1r0pvDdNPvmfEniN7u
-IBj0XXxqS7TdTMTHl9SMxnMy14sVGZb4GmrG7mvxnnv+RSuBekMWHCLUGWu9W1O9
-7vYJR6TF6OgkXCu3iB73w0AzfzqJATi6m0NOzd5fby+BYLhZ1Sey0sk/ZxwOevNU
-hwRh2oXXQjlIwt+CFh5dd4hqqXsxJ0rmr/qUnapWbC9U3VnW/FVcmBeqo2yFryhj
-WNvWFLVDQnkSh0OnBXj8ThwUElGLeRD8ICIzGV78WB0MbbL7nTx8EY+W/xWNJLt8
-LD9v/fINAJ56v8xjLde8ivWmzLFlpBYu1eRW0HD+e30JBNs6UNkABbMCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOb2JhLmNvcHBpbi5lZHWGJWh0dHBzOi8vb2JhLmNvcHBp
-bi5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFkZQzl8FiFjuRzHjF8gumg9
-n+AkMA0GCSqGSIb3DQEBBQUAA4IBAQB84oObYgvvaz8mx5KnoDroIkyz85dK8lrJ
-5lNVlHMx0z7Mh8TipV60R/TF3a2JSUepdlUGFFMbDMULTD0fn54SaTBaAm2YHQo+
-+Ed2UnWT6epWTXmdwJBftOhE0Q5UL6XCaVfGjIcUbY5BElaxOUIfEM9BTL1gqe3/
-B/RK5gLO5wMAQNywsguqKxVWqqv+pSzN6X8NW7z0SwBP4SAcK0gD5LLcMIIV0eyS
-pbe3tUvx4hVxod9fgPO1iBs38OweAif/Y3/T0Vn3gCPhSs4hYwu0dtXeYthcdTwe
-PBpVV8y+Fk1DknVpIx9v4ZbVQptzbTL3tmH9D1JpaV7BrrtW7wHc
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://oba.coppin.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oba.coppin.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://oba.coppin.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oba.coppin.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oba.coppin.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">coppin.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUM+YnW+6Qcco4W7bnmL64pyaxlZMwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOb2JhLmNvcHBpbi5lZHUwHhcNMTQwMjA1MjE1NTI2WhcN
-MzQwMjA1MjE1NTI2WjAZMRcwFQYDVQQDEw5vYmEuY29wcGluLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALOtb2EvK7e1tp1r0pvDdNPvmfEniN7u
-IBj0XXxqS7TdTMTHl9SMxnMy14sVGZb4GmrG7mvxnnv+RSuBekMWHCLUGWu9W1O9
-7vYJR6TF6OgkXCu3iB73w0AzfzqJATi6m0NOzd5fby+BYLhZ1Sey0sk/ZxwOevNU
-hwRh2oXXQjlIwt+CFh5dd4hqqXsxJ0rmr/qUnapWbC9U3VnW/FVcmBeqo2yFryhj
-WNvWFLVDQnkSh0OnBXj8ThwUElGLeRD8ICIzGV78WB0MbbL7nTx8EY+W/xWNJLt8
-LD9v/fINAJ56v8xjLde8ivWmzLFlpBYu1eRW0HD+e30JBNs6UNkABbMCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOb2JhLmNvcHBpbi5lZHWGJWh0dHBzOi8vb2JhLmNvcHBp
-bi5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFkZQzl8FiFjuRzHjF8gumg9
-n+AkMA0GCSqGSIb3DQEBBQUAA4IBAQB84oObYgvvaz8mx5KnoDroIkyz85dK8lrJ
-5lNVlHMx0z7Mh8TipV60R/TF3a2JSUepdlUGFFMbDMULTD0fn54SaTBaAm2YHQo+
-+Ed2UnWT6epWTXmdwJBftOhE0Q5UL6XCaVfGjIcUbY5BElaxOUIfEM9BTL1gqe3/
-B/RK5gLO5wMAQNywsguqKxVWqqv+pSzN6X8NW7z0SwBP4SAcK0gD5LLcMIIV0eyS
-pbe3tUvx4hVxod9fgPO1iBs38OweAif/Y3/T0Vn3gCPhSs4hYwu0dtXeYthcdTwe
-PBpVV8y+Fk1DknVpIx9v4ZbVQptzbTL3tmH9D1JpaV7BrrtW7wHc
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://oba.coppin.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Coppin State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Coppin State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://coppin.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Thomas R. Smith, III</md:GivenName>
-    <md:EmailAddress>trsmith@coppin.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index e6e5dc26..00000000
--- a/swamid-interfederations-2.0/obu-shib.hosted.exlibrisgroup.com-shib.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://obu-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is an "Oxford Brookes University - Primo" Shibboleth SP for Ex Libris (UK) 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-07-22T11:25:14Z">
-      <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://obu-shib.hosted.exlibrisgroup.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://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Oxford Brookes University - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Oxford Brookes University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAPFOgb8PLs1hMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMDYwHhcNMTQwNzE4MDk0MTQ2WhcNMjQwNzE1MDk0MTQ2WjASMRAw
-						DgYDVQQDEwdhaW8wMDA2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						w5jThjFg2+mq3htgoZ/7sbvVBxxVAGqdT5NtVXSIUskbq4alYYsgryo70x+8DxN/
-						rS8D9mTTGXq+bLnY33u47D3KIuGpfLdkCZkzFMk6YfM4kSrSXbrrpbNSlcaFF1dv
-						3Vbz771m5M3+xUZNZIi0jZxUN8FvRefdjw0rqJTpOK4X6+JjkUNlFAYv70kCyLuB
-						l0vwRhA1S+Jbp0C2+gmNA8F2T5mLHAGnB4jFij7KMLufdpkRAO5h4yD5vu8s11yZ
-						9dwd60Cy3D+kRtT06xv57n9VpSl0GTCC0OHpYOfZ4Woy/z4A6HUD+yFNeASQXyDt
-						w190QC5KOwHl/3eQnPl0CwIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDA2MB0G
-						A1UdDgQWBBReo4WgGu2sffn17A9SeJ4Q1DObDjANBgkqhkiG9w0BAQUFAAOCAQEA
-						wegTw3Rlw+xt3urRqa2SyUNVf2F4jwDxajd/c0ww3yE/nK4hyMWXIXe7BlU4HTfz
-						EIi6Qhx8lU//bIgVqUP813TS9NbKfCdzRbibmq8QyL06JqGAI7Cs1tMqKCvnPTYo
-						U9vu+nqQ6gg1u2TJbjYTHm+gGNNFd42yGzLyEUMZk/2+bXmCWPxhnF7xo3rGmycH
-						bLxo3ecAAi972stBzrMH22htpDBOqkUlYW+SoEmjOV+w/LCF8my2hECuV77/yBOJ
-						IdXPA4yyw+Wx0924IrrLTUoa5TT/emmXyNZVo+3KMwWaJcNI1sxHEPVKqE3VFJ7h
-						zyozG62Vmd+kHrx8S35yvg==
-					</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://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://obu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oxford Brookes University - Primo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Frank</GivenName>
-    <SurName>Bieber</SurName>
-    <EmailAddress>mailto:frank.bieber@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Frank</GivenName>
-    <SurName>Bieber</SurName>
-    <EmailAddress>mailto:frank.bieber@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml b/swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.xml
deleted file mode 100644
index 4c00c5a3..00000000
--- a/swamid-interfederations-2.0/olasdev.e-skillz.com-simplesaml.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://olasdev.e-skillz.com/simplesaml">
-  <!--
-		This is a simpleSAMLphp SP for RiskWize Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-31T16:42:19Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEmDCCA4CgAwIBAgIJAMNMayaHMlLmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-						VQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNV
-						BAoTEFJpc2tXaXplIExpbWl0ZWQxHTAbBgNVBAMTFG9sYXNkZXYuZS1za2lsbHou
-						Y29tMSMwIQYJKoZIhvcNAQkBFhRvbGFzMmFkbWluQG8tbGFzLm5ldDAeFw0xMzAx
-						MzExNTIzMDhaFw0yMzAxMjkxNTIzMDhaMIGOMQswCQYDVQQGEwJJRTEPMA0GA1UE
-						CBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNVBAoTEFJpc2tXaXplIExp
-						bWl0ZWQxHTAbBgNVBAMTFG9sYXNkZXYuZS1za2lsbHouY29tMSMwIQYJKoZIhvcN
-						AQkBFhRvbGFzMmFkbWluQG8tbGFzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAMm1K4AqDnJdBA/pC+lRp8BzRuRCPcSL0XxST7xl6Fi9zsR1TZ+2
-						0lotJFA6XVcEWtdCUon+ajNJvbsuIYy5ATGOO0oGiewRdGr/3RVKlPQb0owFLqwA
-						v4rZVdKPNEACas538WBLGv168cH/GUxWtFo12gVBRbldok8SAVYqe6FW0jvsV+6K
-						u1c6lNtwxR+eAklRfI/83zG2FBJyEWfGVlvsigKhkDyHoHdgumMbgTQCBM/Bd9AW
-						lM7ViU5D/xnayCTLFbWaNq70ovy9NuGdxBFiNwpBTk9P7SVPuTHXZE0FIlTFZzf4
-						YPaeYchlb+RZRWTkNlqLenYVAv8kmhoaofkCAwEAAaOB9jCB8zAdBgNVHQ4EFgQU
-						QQs8XxfzBOfgW7ZgJd3VKVtthskwgcMGA1UdIwSBuzCBuIAUQQs8XxfzBOfgW7Zg
-						Jd3VKVtthsmhgZSkgZEwgY4xCzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZHYWx3YXkx
-						DzANBgNVBAcTBkdhbHdheTEZMBcGA1UEChMQUmlza1dpemUgTGltaXRlZDEdMBsG
-						A1UEAxMUb2xhc2Rldi5lLXNraWxsei5jb20xIzAhBgkqhkiG9w0BCQEWFG9sYXMy
-						YWRtaW5Aby1sYXMubmV0ggkAw0xrJocyUuYwDAYDVR0TBAUwAwEB/zANBgkqhkiG
-						9w0BAQUFAAOCAQEAmSflsmzJ+wmNyXI6Wyji+Yp1yKy/ac66sJX/dUdmJmiVu36t
-						dG8rVXi0EQpa5+i3o7YLoqkjyK5JcwHJVdFLFBp0kNauJc2LYMLQqVm+pzcP/ZCj
-						tI2XmsxxYYqhYlYgITP1Xw19ZcX5MDiY9D8QGNRzkZuoZ/QVR2wwss0nvmbpnEp2
-						5MkYlORfzYHGqotvku0d+oO2cmLNlLjbvU9v7VR76l+SelsJ+T7izVAkUSmfoSil
-						4Bjggok16kpBQTeLiIJ47y5Pewwb+j0S7JBOzOLChw/DTqOvDc4nGx8mM/5GhoK9
-						tSahXw+2MVUhFiDSlyV7CzHI0IJJWXRH98lXdA==
-					</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>
-						MIIEmDCCA4CgAwIBAgIJAMNMayaHMlLmMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-						VQQGEwJJRTEPMA0GA1UECBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNV
-						BAoTEFJpc2tXaXplIExpbWl0ZWQxHTAbBgNVBAMTFG9sYXNkZXYuZS1za2lsbHou
-						Y29tMSMwIQYJKoZIhvcNAQkBFhRvbGFzMmFkbWluQG8tbGFzLm5ldDAeFw0xMzAx
-						MzExNTIzMDhaFw0yMzAxMjkxNTIzMDhaMIGOMQswCQYDVQQGEwJJRTEPMA0GA1UE
-						CBMGR2Fsd2F5MQ8wDQYDVQQHEwZHYWx3YXkxGTAXBgNVBAoTEFJpc2tXaXplIExp
-						bWl0ZWQxHTAbBgNVBAMTFG9sYXNkZXYuZS1za2lsbHouY29tMSMwIQYJKoZIhvcN
-						AQkBFhRvbGFzMmFkbWluQG8tbGFzLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAMm1K4AqDnJdBA/pC+lRp8BzRuRCPcSL0XxST7xl6Fi9zsR1TZ+2
-						0lotJFA6XVcEWtdCUon+ajNJvbsuIYy5ATGOO0oGiewRdGr/3RVKlPQb0owFLqwA
-						v4rZVdKPNEACas538WBLGv168cH/GUxWtFo12gVBRbldok8SAVYqe6FW0jvsV+6K
-						u1c6lNtwxR+eAklRfI/83zG2FBJyEWfGVlvsigKhkDyHoHdgumMbgTQCBM/Bd9AW
-						lM7ViU5D/xnayCTLFbWaNq70ovy9NuGdxBFiNwpBTk9P7SVPuTHXZE0FIlTFZzf4
-						YPaeYchlb+RZRWTkNlqLenYVAv8kmhoaofkCAwEAAaOB9jCB8zAdBgNVHQ4EFgQU
-						QQs8XxfzBOfgW7ZgJd3VKVtthskwgcMGA1UdIwSBuzCBuIAUQQs8XxfzBOfgW7Zg
-						Jd3VKVtthsmhgZSkgZEwgY4xCzAJBgNVBAYTAklFMQ8wDQYDVQQIEwZHYWx3YXkx
-						DzANBgNVBAcTBkdhbHdheTEZMBcGA1UEChMQUmlza1dpemUgTGltaXRlZDEdMBsG
-						A1UEAxMUb2xhc2Rldi5lLXNraWxsei5jb20xIzAhBgkqhkiG9w0BCQEWFG9sYXMy
-						YWRtaW5Aby1sYXMubmV0ggkAw0xrJocyUuYwDAYDVR0TBAUwAwEB/zANBgkqhkiG
-						9w0BAQUFAAOCAQEAmSflsmzJ+wmNyXI6Wyji+Yp1yKy/ac66sJX/dUdmJmiVu36t
-						dG8rVXi0EQpa5+i3o7YLoqkjyK5JcwHJVdFLFBp0kNauJc2LYMLQqVm+pzcP/ZCj
-						tI2XmsxxYYqhYlYgITP1Xw19ZcX5MDiY9D8QGNRzkZuoZ/QVR2wwss0nvmbpnEp2
-						5MkYlORfzYHGqotvku0d+oO2cmLNlLjbvU9v7VR76l+SelsJ+T7izVAkUSmfoSil
-						4Bjggok16kpBQTeLiIJ47y5Pewwb+j0S7JBOzOLChw/DTqOvDc4nGx8mM/5GhoK9
-						tSahXw+2MVUhFiDSlyV7CzHI0IJJWXRH98lXdA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://olasdev.e-skillz.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RiskWize Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">O-LAS LMS (staging)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.essentialskillz.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Marek</GivenName>
-    <SurName>Zapach</SurName>
-    <EmailAddress>mailto:marek@essentialskillz.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Marek</GivenName>
-    <SurName>Zapach</SurName>
-    <EmailAddress>mailto:marek@essentialskillz.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/onepass.thomsonreuters.com-entity.xml b/swamid-interfederations-2.0/onepass.thomsonreuters.com-entity.xml
deleted file mode 100644
index 423faa2b..00000000
--- a/swamid-interfederations-2.0/onepass.thomsonreuters.com-entity.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://onepass.thomsonreuters.com/entity">
-  <!--
-		This is a OnePass SP for Thomson Reuters (Professional) UK Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-18T11:51:11Z">
-      <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">Thomson Reuters OnePass</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Thomson Reuters OnePass authenticates users into Westlaw, Practical Law, and more.</mdui:Description>
-        <mdui:Logo height="60" width="362">https://onepass.westlaw.com/Version2/images/onepass_header.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMjCCAh6gAwIBAgIQysj9nv1xAJxKptR/g2E8bjAJBgUrDgMCHQUAMCIxIDAe
-						BgNVBAMTF1Rob21zb24gUmV1dGVycyBPbmVQYXNzMB4XDTE2MDEwMTA2MDAwMFoX
-						DTI2MDEwMTA2MDAwMFowIjEgMB4GA1UEAxMXVGhvbXNvbiBSZXV0ZXJzIE9uZVBh
-						c3MwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKyoU0o/zXlDgdDhO8
-						zZ7g/2OIJMF80/3Glgmkg5T86Jov9LXrEGP7Vfs77y5J0GhGhgwoojNqLypRombt
-						RqT8umB0ymQQeT9LK2gn0U2aS2bEbPk3lks1TQJWpSxOBkrmZt8PZRoJCQS7nc3y
-						vez/A8SzZRw5gMaq3sHPjjvYcaDGCAF79HO5rIjXaKqA3J6BiDdma0nnl+dBQ128
-						PcBEWeIn2cr1Yetjxwaa3rkrbXVWMB3GKmFyiV+SHPXMlIMZK0dVfPuDw5ZGdeyb
-						UW5mJ97w88EVmj1q/7Z0S75Gao/lyeOPBjyFdsxDssuuYBZOsjNufJXHrHurDlDA
-						lGqRAgMBAAGjbDBqMBMGA1UdJQQMMAoGCCsGAQUFBwMDMFMGA1UdAQRMMEqAEKx1
-						zDNoO7cw4OhwtKXcaMOhJDAiMSAwHgYDVQQDExdUaG9tc29uIFJldXRlcnMgT25l
-						UGFzc4IQysj9nv1xAJxKptR/g2E8bjAJBgUrDgMCHQUAA4IBAQA+vYnCB4IZeFZs
-						mFs3RVRnQstNH3CGzX4UJyMVu+OaiPzVG3nrs8O4gCYxErdfZdyayTcK5GKjzTAJ
-						r1GxAcEGAVVdaBzgcObm1ZqoBo2DRFqftA1y5GjLiazG5lovfAJe3h6CIF3EgJDN
-						QcNCdiPgk/uoZvfgvQutlVW3QNqcUZAQfT4TD4G0I3H8xUnsSf/huW4kz8AK/r6N
-						OR142dAQoka1vlAkCTRgraHthP4ZI8m52uQWTcXoC39S0xevPjTG1g/mNSMdkGHY
-						3cTE4YMDvBysBlov5z35Nwk9iHO+9s7+DVFrtWXnlO2/lqWQl7J/yGLGusaga2rf
-						/coV7R+t
-					</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>
-						MIIDMjCCAh6gAwIBAgIQysj9nv1xAJxKptR/g2E8bjAJBgUrDgMCHQUAMCIxIDAe
-						BgNVBAMTF1Rob21zb24gUmV1dGVycyBPbmVQYXNzMB4XDTE2MDEwMTA2MDAwMFoX
-						DTI2MDEwMTA2MDAwMFowIjEgMB4GA1UEAxMXVGhvbXNvbiBSZXV0ZXJzIE9uZVBh
-						c3MwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKyoU0o/zXlDgdDhO8
-						zZ7g/2OIJMF80/3Glgmkg5T86Jov9LXrEGP7Vfs77y5J0GhGhgwoojNqLypRombt
-						RqT8umB0ymQQeT9LK2gn0U2aS2bEbPk3lks1TQJWpSxOBkrmZt8PZRoJCQS7nc3y
-						vez/A8SzZRw5gMaq3sHPjjvYcaDGCAF79HO5rIjXaKqA3J6BiDdma0nnl+dBQ128
-						PcBEWeIn2cr1Yetjxwaa3rkrbXVWMB3GKmFyiV+SHPXMlIMZK0dVfPuDw5ZGdeyb
-						UW5mJ97w88EVmj1q/7Z0S75Gao/lyeOPBjyFdsxDssuuYBZOsjNufJXHrHurDlDA
-						lGqRAgMBAAGjbDBqMBMGA1UdJQQMMAoGCCsGAQUFBwMDMFMGA1UdAQRMMEqAEKx1
-						zDNoO7cw4OhwtKXcaMOhJDAiMSAwHgYDVQQDExdUaG9tc29uIFJldXRlcnMgT25l
-						UGFzc4IQysj9nv1xAJxKptR/g2E8bjAJBgUrDgMCHQUAA4IBAQA+vYnCB4IZeFZs
-						mFs3RVRnQstNH3CGzX4UJyMVu+OaiPzVG3nrs8O4gCYxErdfZdyayTcK5GKjzTAJ
-						r1GxAcEGAVVdaBzgcObm1ZqoBo2DRFqftA1y5GjLiazG5lovfAJe3h6CIF3EgJDN
-						QcNCdiPgk/uoZvfgvQutlVW3QNqcUZAQfT4TD4G0I3H8xUnsSf/huW4kz8AK/r6N
-						OR142dAQoka1vlAkCTRgraHthP4ZI8m52uQWTcXoC39S0xevPjTG1g/mNSMdkGHY
-						3cTE4YMDvBysBlov5z35Nwk9iHO+9s7+DVFrtWXnlO2/lqWQl7J/yGLGusaga2rf
-						/coV7R+t
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.thomsonreuters.com/saml" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.qa.thomsonreuters.com/saml" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.test.thomsonreuters.com/saml" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.dev.thomsonreuters.com/saml" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signon.thomsonreuters.com/saml1" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signon.qa.thomsonreuters.com/saml1" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signon.test.thomsonreuters.com/saml1" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://signon.dev.thomsonreuters.com/saml1" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Thomson Reuters OnePass</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://thomsonreuters.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nicholas</GivenName>
-    <SurName>Remarke</SurName>
-    <EmailAddress>mailto:nicholas.remarke@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Madigan</SurName>
-    <EmailAddress>mailto:andrew.madigan@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nicholas</GivenName>
-    <SurName>Remarke</SurName>
-    <EmailAddress>mailto:nicholas.remarke@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Madigan</SurName>
-    <EmailAddress>mailto:andrew.madigan@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/online.learning.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d8024467..00000000
--- a/swamid-interfederations-2.0/online.learning.ox.ac.uk-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://online.learning.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Learning Institute" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-15T17:02:24Z"/>
-  </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://online.learning.ox.ac.uk/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://online.learning.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOXHb2XHLXDRMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGG9ubGluZS5sZWFybmluZy5veC5hYy51azAeFw0xMzAyMTQxMjM5MzJaFw0y
-						MzAyMTIxMjM5MzJaMCMxITAfBgNVBAMTGG9ubGluZS5sZWFybmluZy5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANiPgk2FpHiAr7rihXV6
-						Se87QZa1C0IvcZsWRo14htlX8pOGA0SS35HDw/XYohB+JiCsuRTw3G++/8MDRMrS
-						/PVsTEsPHwrbexlr3tpvwHGk2MGGRlrWDBIUnKsIMx/Fe4tTsBsTP/2TYj7MRS3m
-						bms6w0+ouJDJgF7d07LebLrpMZrYAYIZFT6FSB/KQP8VWytCawI/ZsyXG15aeC9B
-						502unJUCdG8RziUAzoqglLsaGddoEjCctXo9X3WFQS+P7aiKlGjITmPtsuqm1LD1
-						bUBkqhQVHvCFF7Siqurl8MbVFymDZy+YVta06jCtb7bwfDDzj8qlGlSUR/MaiIp1
-						eFECAwEAAaNGMEQwIwYDVR0RBBwwGoIYb25saW5lLmxlYXJuaW5nLm94LmFjLnVr
-						MB0GA1UdDgQWBBRk8+5NSCNEYCchqOa7djqpmDEBizANBgkqhkiG9w0BAQUFAAOC
-						AQEAG4qfEzoBRdcsDiwwUV/0j2+a6jyvvubrSTT0CN7uimYD4WvToZPzbF4Iplhl
-						HfhNea9qW3FZP7HL5WrPJ7BouC4fd1ANNLHkWP4d8SG791AsFmOYE6CuoQNtIgIk
-						gP7FCwLm32qfdKDTstNJD5M8xxnsaPEpJ3CzWdfj9W3+N9zHFN6Mmzx1lmN13caY
-						q1sEo+gMWL70f630KrLkv+mSCX7HOghX0MdfHiMfFF8pWMDcdK95shlMvgxopchA
-						SaTzWzW01k5T4ghk2Vu3wFC5Uhvf784/L5scPVgjdNOphSkNU8CjG6/BKcNB+Sj9
-						o5MI6HedqkvwS3+4RL381q0wMw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://online.learning.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Learning Institute</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.learing.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/online.sagepub.com-shibboleth.xml b/swamid-interfederations-2.0/online.sagepub.com-shibboleth.xml
deleted file mode 100644
index c9ff1983..00000000
--- a/swamid-interfederations-2.0/online.sagepub.com-shibboleth.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://online.sagepub.com/shibboleth">
-  <!--
-		This is a "SAGE Journals Online" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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="2008-07-29T12:36:57Z">
-      <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://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SAGE Journals Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://online.sagepub.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/online.sagepub.com.xml b/swamid-interfederations-2.0/online.sagepub.com.xml
deleted file mode 100644
index 4d2def1c..00000000
--- a/swamid-interfederations-2.0/online.sagepub.com.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://online.sagepub.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/sagepub/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">SAGE Journals Online</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">SAGE Journals Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://online.sagepub.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/online.statref.com-shibboleth.xml b/swamid-interfederations-2.0/online.statref.com-shibboleth.xml
deleted file mode 100644
index 0ac48204..00000000
--- a/swamid-interfederations-2.0/online.statref.com-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://online.statref.com/shibboleth">
-  <!--
-		This is a 'StatRef' Shibboleth service provider for Teton Data Systems.
-	-->
-  <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="2008-12-05T15:23: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://onlinebeta.statref.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://onlinebeta.statref.com/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://online.statref.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://online.statref.com/Shibboleth.sso/Login" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID+TCCAuGgAwIBAgIJAJwEXu6tonahMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYD
-						VQQGEwJVUzEQMA4GA1UECAwHV3lvbWluZzEQMA4GA1UEBwwHSmFja3NvbjEbMBkG
-						A1UECgwSVGV0b24gRGF0YSBTeXN0ZW1zMRswGQYDVQQDDBJvbmxpbmUuc3RhdHJl
-						Zi5jb20xJTAjBgkqhkiG9w0BCQEWFmptYXh3ZWxsQHRldG9uZGF0YS5jb20wHhcN
-						MTAxMjAyMTY1MzE1WhcNMjAxMjAxMTY1MzE1WjCBkjELMAkGA1UEBhMCVVMxEDAO
-						BgNVBAgMB1d5b21pbmcxEDAOBgNVBAcMB0phY2tzb24xGzAZBgNVBAoMElRldG9u
-						IERhdGEgU3lzdGVtczEbMBkGA1UEAwwSb25saW5lLnN0YXRyZWYuY29tMSUwIwYJ
-						KoZIhvcNAQkBFhZqbWF4d2VsbEB0ZXRvbmRhdGEuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAvxUW98iDiWy1rnYLXmrSut26X+wCpXsS+xit1uhr
-						oD83HOiE18fidOCPR2Reusw2PVS2Mv3Z2MouDxrbnxI1f40YTWmxWLJD9D+MeAbI
-						Dvt2uRctN82aVwL1Hy0GFsiS0RXztW0XiSZy6u/bqHVpSjYNw3AcnSadCPrt0ue0
-						eW1x+nvefeXxSgFfFxyjG+F/6br+CDvZk6oXNkDs8xRGiekM9mPo2DF1Qx3zxqPl
-						zW5homj1P2LlaeNvtXSj5EAfob0SPpx+gnNzXMbNzqwCLcY/amQkNjTPQC4nFYpc
-						JWiEOt4GKS8NuztVvrk1z6e0q4/2UUZJuiSUEB4Bk9BtEQIDAQABo1AwTjAdBgNV
-						HQ4EFgQU0mxo874bLxgMm12FGngVP4j3EnYwHwYDVR0jBBgwFoAU0mxo874bLxgM
-						m12FGngVP4j3EnYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAuN4c
-						d4KiRWdzWokz0NV0SRulD0yBRyMpR2LjVr9y7Btg+/IbKJdooR6+kStOvmZHctvI
-						KVZ5Kr9dUuOgQ2Kkyf4nXVPkwzpNj+N1+gNJ4/JlOzZEkshBf++ASMbQ8OEWkrl+
-						iimaLh3BSCDp/giL8/geH+5fFSgtXyCXx7pcP0GKxdOR7vLcZ9EK+qsutOW4006w
-						FaXTVDbgg006UGxD1VGW78cSfM5DGkwQvkG+52xLWNe3VhasnbqeirkuSHfmD6Ma
-						fV8vvSNyvTmWbK+/nHcVDJiqmb81XOuXy/NJDOZQpcK8Rx8vc6eAlgNTbLj6iTAJ
-						ZHzp7ICc2EW3RkJNUQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://onlinebeta.statref.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.statref.com/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onlinebeta.statref.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://onlinebeta.statref.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onlinebeta.statref.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onlinebeta.statref.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.statref.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://online.statref.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.statref.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.statref.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML2/ECP" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://onlinebeta.statref.com/Shibboleth.sso/SAML/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.statref.com/Shibboleth.sso/SAML2/POST" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://online.statref.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.statref.com/Shibboleth.sso/SAML2/Artifact" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://online.statref.com/Shibboleth.sso/SAML2/ECP" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.statref.com/Shibboleth.sso/SAML/POST" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://online.statref.com/Shibboleth.sso/SAML/Artifact" index="13"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Teton Data Systems</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stat!Ref</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.statref.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Pearce</SurName>
-    <EmailAddress>mailto:ppearce@tetondata.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Pearce</SurName>
-    <EmailAddress>mailto:ppearce@tetondata.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/online.wadham.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/online.wadham.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 9889e11b..00000000
--- a/swamid-interfederations-2.0/online.wadham.ox.ac.uk-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://online.wadham.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Wadham College Online Services" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-09-20T14:05:02Z">
-      <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://online.wadham.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJALC8N31Bxem1MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFm9ubGluZS53YWRoYW0ub3guYWMudWswHhcNMTMwOTE4MTUxMDAzWhcNMjMw
-						OTE2MTUxMDAzWjAhMR8wHQYDVQQDExZvbmxpbmUud2FkaGFtLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw6P1eqo6vGLQ8belmeC1OABP
-						Q+8rrHutPoi2tZqxTpTrJ487RzfXewuseL9ZnqiqrM1oGbtaLCeSMAscUhA+0pVG
-						3JQqyPVx4OTMD1fCpmHCoJhP84Hm0E1OGRIQrwsh9jkUaPfnyTT5CPVfhLvYeeof
-						/2QJyBTFto97tu/e3g1lryfl+G6DGz45QsxlT8Y8XWKTTEah5yV9kMf9NvsQcBQO
-						y1UoeC54+WxVbJOLmgwpJ21bf2BtR9HZJsOe3J37t7JUh4qf8UA5fBrUJ6mCFGL3
-						bWe3wpjlGcHXFDvbkLULbYAeKQvRXyAPL3fBjhi7dYRxAhZQ1/U2euya1tjvQwID
-						AQABo0QwQjAhBgNVHREEGjAYghZvbmxpbmUud2FkaGFtLm94LmFjLnVrMB0GA1Ud
-						DgQWBBR8Qf8m1RqCT3m33pxvjlTkhZATXTANBgkqhkiG9w0BAQUFAAOCAQEAi2NK
-						DPuahKflk5F15c2KvgsjN2HZlqyjArXAOkC/WEHxmALfcC7fKhxZ+ZswN/GaloMq
-						wkK9MMl61drhKc0Orc6tFmhGir/XYKkOVBKu/Pf2yCa6s3OG/qyE6qW4QIeX/0ST
-						Nh+S9H9eUwANjSvlEi90DqdAjBtptDiixL8vQv6xJOiDGHbhLEy9pNIqA+PuhxYq
-						ZBzrg7vmdb8KkovS484OUW581FTUg6swa1qCaUDGpx0qTlPS7az48E48M2MH2noU
-						rS7gR1zE0y5C6TsN4qrs1MIERdUghBanwGLvUx0cbHGEEeORDix59lF5UFrB/jID
-						tUQQdKZmNRJfFzNHXQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://online.wadham.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://online.wadham.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Wadham College Online Services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wadham.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lee</GivenName>
-    <SurName>Wootton</SurName>
-    <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Wootton</SurName>
-    <EmailAddress>mailto:itmanager@wadh.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/onlinepayments.gtc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/onlinepayments.gtc.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 675dca26..00000000
--- a/swamid-interfederations-2.0/onlinepayments.gtc.ox.ac.uk-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://onlinepayments.gtc.ox.ac.uk/shibboleth">
-  <!--
-		This is a "GTC Payment Portal" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-03-03T14:46:19Z">
-      <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://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Oxford GTC Payment Portal</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIJAIfUM6q/Gli+MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG29ubGluZXBheW1lbnRzLmd0Yy5veC5hYy51azAeFw0xNDAyMjAxMjEwNDBa
-						Fw0yNDAyMTgxMjEwNDBaMCYxJDAiBgNVBAMTG29ubGluZXBheW1lbnRzLmd0Yy5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAo0jNoAJ35
-						4RSXKscYK/u467z0iUzdWgYOjMHe5UpBsWfFlI/Ht7nWyh9K0/oUlmON6OJrzwKW
-						hZ6lUM3WB7aHcJU5rWDEUb79JVs0WvpHiyPdNc4HXw7qlBb+onytoul+/jUf7TmM
-						/EXbQLe1pCrIvuw4hl8PA72x1w7wHmu9qHd+g2YL5CG6Dbrfm4pWdV25gHjJeEsb
-						q8s0/tPXZaIf6pAi4xHKrNLPqN23gb45U2YQdQDNDyI12MXcnNtSjRNpf9pUFY5I
-						kotJPTd63SRqhDb28F5suj95eJyTsNWfbpKuSt7hgEtSyY7L2zSELszRN61yDimU
-						6GZTNxKQJPUCAwEAAaN5MHcwVgYDVR0RBE8wTYIbb25saW5lcGF5bWVudHMuZ3Rj
-						Lm94LmFjLnVrhi5odHRwczovL29ubGluZXBheW1lbnRzLmd0Yy5veC5hYy51ay9z
-						aGliYm9sZXRoMB0GA1UdDgQWBBSpFZP5B8uXTAyHaB/6loL+XXZwKDANBgkqhkiG
-						9w0BAQUFAAOCAQEAw7mINrL58vxvF80oRDCfNYC9GbVPdL3BkXfkGHuJSeDWnwKX
-						qKEu/eozVkqa5Ga/a+HLP2LOC1kron+345wrk/4YlJIil1Dzg1DtVaMJFP5cEeXu
-						FF5rOpaPWGNnGjpDsOG1r1qKZllb8wIdlNWmA7wyx6+1qPRCbxo1lLTyGbmfFM3p
-						ZLJDIjnSv6J3TRvdcAodbFFBBMpL+JY7nT+f4DzIKac74poPr5uTyVfm6aDbAF5h
-						WROHDG1OigdsV0lHfv8R//K1WuravjH7pc14IsuVxpCqscLS7gG3wsF6lwLk1hdF
-						oAOlTseHmkuBUL+dk7KV4h9GrQ/jeKO4EhVuYw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://onlinepayments.gtc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford GTC Payment Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gtc.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dominic</GivenName>
-    <SurName>Bown</SurName>
-    <EmailAddress>mailto:dominic.bown@gtc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Alex</GivenName>
-    <SurName>Clark</SurName>
-    <EmailAddress>mailto:it-support@gtc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dominic</GivenName>
-    <SurName>Bown</SurName>
-    <EmailAddress>mailto:dominic.bown@gtc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml b/swamid-interfederations-2.0/onurbantribe.com-shibboleth.xml
deleted file mode 100644
index ad4e9c8b..00000000
--- a/swamid-interfederations-2.0/onurbantribe.com-shibboleth.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://onurbantribe.com/shibboleth">
-  <!--
-		This is an Urban Tribe Shibboleth SP for Take Note Student Advertising Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-13T12:53:34Z"/>
-  </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">Urban Tribe</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Urban Tribe officially verifies your student identity online enabling you to unlock online discounts, deals in your city and tickets for clubs.</mdui:Description>
-        <mdui:Logo height="100" width="350">https://onurbantribe.com/static/images/shibboleth-sp/logo.jpg</mdui:Logo>
-        <mdui:Logo height="100" width="350">https://onurbantribe.com/static/images/shibboleth-sp/logo-transparent.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://onurbantribe.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://onurbantribe.com/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://onurbantribe.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC0zCCAbugAwIBAgIJAJMTWAj8iFJsMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-						BAMTBHN2NTYwHhcNMTIwNjExMjA0NTQyWhcNMjIwNjA5MjA0NTQyWjAPMQ0wCwYD
-						VQQDEwRzdjU2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0GLBi1CD
-						FHq3HmJgAWG0/YEmU+KwVuSo2CbyoBy8L5hxzkOkuvnBQCh48sIPDJ4iFstOF9Cm
-						nXlv7/V3O0Z5LCnAQpZfiMPL1A09QUFqe+LNAHjGluXmPMztYgPrt5rF95j1lkGU
-						KYOmIoy1F7HK2RdBnOS2/6KAmUs1954ACi8h0YEFBrMq2XG40UrMp6FMwfonb/57
-						9Bugk4pzeht7QxxOuZc/+nK1H1a+b25PJ2yVxwJ/ddVRPSmEbyLTr5v2yhJgtinr
-						veI3nor4gZaKZFaV/YpanhCrOFjWk15iD661Ovy1psOYo52RAi+x+SWsgxWix2Ft
-						S0l8SVNx9n/bLQIDAQABozIwMDAPBgNVHREECDAGggRzdjU2MB0GA1UdDgQWBBS7
-						Fz3DaNXlImw2RhvMkRZNeQW8IzANBgkqhkiG9w0BAQUFAAOCAQEAXoOTtO7bh2QH
-						CkAHtfRrF18lFcyUFQS4EEq+HHIBVYG0+W4NQ6TNeLqSGyBBRZTDfspRKQxEiEgk
-						8OoxTCPsMsYgBaHwLCoGmIpTYlH/I3DRm4kmhcEdCW8coLxCrhPuNd0IywZzO/o/
-						Z84Ls08JJEL0EufednzIztSLzMOsfUIDGKBXb9G6tsGcJkWYOx8LDI4T8c6NfNuK
-						WHwGUCdFlPpjpHE9D30V2nD9AuJIVynYXOpenY9dBST3j2Tn/vg+xvKKioQsZJg+
-						8akeor6orfFsXUIHWOFjGoCjDH9laFChiptGPA8oP0hffeCl6PI2PJGFyKWI/47f
-						nBvhT8cuYQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://onurbantribe.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://onurbantribe.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://onurbantribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://onurbantribe.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://onurbantribe.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://onurbantribe.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://onurbantribe.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Take Note Student Advertising Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Urban Tribe</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://onurbantribe.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nicolas</GivenName>
-    <SurName>Carey</SurName>
-    <EmailAddress>mailto:nicolas@takenoteadvertising.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Guerit</SurName>
-    <EmailAddress>mailto:ian@helastel.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml b/swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.xml
deleted file mode 100644
index ceea7325..00000000
--- a/swamid-interfederations-2.0/opac.hull-college.ac.uk-secure.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://opac.hull-college.ac.uk/secure">
-  <!--
-		This is a 'Group Libraries Catalogue' Shibboleth 2 SP for Hull College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://opac.hull-college.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJANOjhZD2KOnOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHdlYmJ5Lmh1bGwtY29sbGVnZS5hYy51azAeFw0xMDEyMjEwOTM2MTNaFw0y
-						MDEyMTgwOTM2MTNaMCMxITAfBgNVBAMTGHdlYmJ5Lmh1bGwtY29sbGVnZS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8IuxsLcsMEuxEORkW9
-						AnFMjw02hjqgUFDxdvxidErQcU28+mhiLL5E8IE9Rl74eLMQVz4wT1HFrCXuYQcw
-						Re3p38ZVz1jryJPdIrycInbSlofAnvCtou/C6Xoax+FN4N1WzMBQEQCH2JAx0phj
-						z8bg7ZiujJsI19ubQMogbyPgpxmyUPbU2w1RM7N12XUK8x54M7oMNIczSeKcA5AL
-						bw2hAcDiDjmhjwHDQmT6pUeB4pGbjj1XcQ1+OnQtTJaDqBGXJuiTvFr3jyNa2oPv
-						MiZBfOU8AQP7SMCBc/TL3rR9dMVViKIXTV1ypd0Vf2IM7dsckDchrEfuQ/R8vK97
-						ZyECAwEAAaNGMEQwIwYDVR0RBBwwGoIYd2ViYnkuaHVsbC1jb2xsZWdlLmFjLnVr
-						MB0GA1UdDgQWBBRJ3Rc19IVRl3z9Sk6sf/ZVgjBJ+jANBgkqhkiG9w0BAQUFAAOC
-						AQEAABVnWpRznLdi/6Qs0tZigAbHQTmkB+PQQMcn3wHFiRCN8XmjCQlDDwPwjOO0
-						RgXmDs1dsnOerNdxCoDAwKgcpKvwsTNt+BrseDpLgMVyKLlTOyABP/y+Py+dROtX
-						NT38ftWChZlPQlYrXk/sxsSmwSBTkShxD67Cw28xbHjoQs+zyVM/ulX4z76tsvzu
-						9TZI38v39ORLQaev1uXFtEsesP5Jac6jbfZ/K3mfmeV5Jrirz3qiTONz7x4h/GId
-						uC6cDuM71qVAazldO/xl5o70zE8taPprobQAtnQsNipmDtYx9dcrK69k2Mj8fONH
-						hreSCClyOnSq2fhxrYHcWSAqPw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://opac.hull-college.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Hull College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hull College: Group Libraries Catalogue</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://library.hull-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Perry</SurName>
-    <EmailAddress>mailto:dperry@hull-college.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Perry</SurName>
-    <EmailAddress>mailto:dperry@hull-college.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.adults.ccinform.co.uk-shibboleth.xml b/swamid-interfederations-2.0/openathens.adults.ccinform.co.uk-shibboleth.xml
deleted file mode 100644
index 192f9526..00000000
--- a/swamid-interfederations-2.0/openathens.adults.ccinform.co.uk-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://openathens.adults.ccinform.co.uk/shibboleth">
-  <!--
-		This is a "CCInform Adults (Shib Test)" OpenAthens SP for Reed Business Information Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-10T13:27:17Z">
-      <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: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">CCInform Adults (Shib Test)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Vital information for professionals working with disabled and older people.</mdui:Description>
-        <mdui:Logo height="82" width="300">https://s3-eu-west-1.amazonaws.com/rbi-cci/wp-content/uploads/sites/3/2014/07/Adults-logo300.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEFTCCAv2gAwIBAgIJAMneSf8qSaB3MA0GCSqGSIb3DQEBBQUAMGQxKDAmBgNV
-						BAoTH1JlZWQgQnVzaW5lc3MgSW5mbyAtIFZpcGVyIEJldGExODA2BgNVBAMTL3d3
-						dy5vYXNlcnZlci1zc28tYmV0YS5hd3N2aXBlci5yZWVkYnVzaW5lc3MubmV0MB4X
-						DTE1MTEyMzE0NTU0MloXDTI1MTEyMDE0NTU0MlowZDEoMCYGA1UEChMfUmVlZCBC
-						dXNpbmVzcyBJbmZvIC0gVmlwZXIgQmV0YTE4MDYGA1UEAxMvd3d3Lm9hc2VydmVy
-						LXNzby1iZXRhLmF3c3ZpcGVyLnJlZWRidXNpbmVzcy5uZXQwggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDGroeDl0uM+jhIVrqKJFn5okiOAbJw6julPlKK
-						pFeGLNyT70aOcsCG0+4utfzsriKAO9fGITmLwt+8ERJe3TPbbWBz6jo678+Avn92
-						Tzvqvj9KDUk2UHRkR/gzb1Y66smO/k1lxXMVlkW5e6KFn1Zs1NUnSbyGYANPmSjR
-						2XcLgxtmQxedpKFj2urFCdi+EpFaszs2cuuBsvZqx4DwcDBsayjePDu2GnKtVF24
-						rsWxHZMfBtr1KIDQuQDm8MWMzjIB4PHZ3K0dsqCNHg8zjGvu1/N2C3Es5SS5OTip
-						weXS7ejveKU2LZTGOelhDho2MTtx8mOMyVslq/PZ1hzplwltAgMBAAGjgckwgcYw
-						HQYDVR0OBBYEFMj6G2UwHf8kGxz74rhomi/C1cT4MIGWBgNVHSMEgY4wgYuAFMj6
-						G2UwHf8kGxz74rhomi/C1cT4oWikZjBkMSgwJgYDVQQKEx9SZWVkIEJ1c2luZXNz
-						IEluZm8gLSBWaXBlciBCZXRhMTgwNgYDVQQDEy93d3cub2FzZXJ2ZXItc3NvLWJl
-						dGEuYXdzdmlwZXIucmVlZGJ1c2luZXNzLm5ldIIJAMneSf8qSaB3MAwGA1UdEwQF
-						MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEGnnYllzfUQ483OyFbjm1PUyWCPlEX+
-						z82+hODcpmvt9mRuwBierbGgsByUUswK7wc4X50VSH/TCBbaGgav/FAWQZqMUsdG
-						iLtDT7xdbnnMVKCBJhBrmo//rfJ4QXscGkQ+gViY+wHJmCjaNAAxxvO25oAEhkFX
-						zGoPN2QAM7ue1XuAoG6uDXCJYMh507OXLh1IoF5+ubQOhyhr+yaiXkHp2cfYhxSg
-						Hs8TX8jAiK1K2BczXNKTKgevn6hpRZbX8AiJuoS49h7j2DgzY3KdW0l6FK8jbZ5G
-						PBrPCD2rrGz3T8vnZL3JjkQr2hrxD62QB00hozoykT0RXdAY1S5CbUI=
-					</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>
-						MIIEFTCCAv2gAwIBAgIJAMneSf8qSaB3MA0GCSqGSIb3DQEBBQUAMGQxKDAmBgNV
-						BAoTH1JlZWQgQnVzaW5lc3MgSW5mbyAtIFZpcGVyIEJldGExODA2BgNVBAMTL3d3
-						dy5vYXNlcnZlci1zc28tYmV0YS5hd3N2aXBlci5yZWVkYnVzaW5lc3MubmV0MB4X
-						DTE1MTEyMzE0NTU0MloXDTI1MTEyMDE0NTU0MlowZDEoMCYGA1UEChMfUmVlZCBC
-						dXNpbmVzcyBJbmZvIC0gVmlwZXIgQmV0YTE4MDYGA1UEAxMvd3d3Lm9hc2VydmVy
-						LXNzby1iZXRhLmF3c3ZpcGVyLnJlZWRidXNpbmVzcy5uZXQwggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDGroeDl0uM+jhIVrqKJFn5okiOAbJw6julPlKK
-						pFeGLNyT70aOcsCG0+4utfzsriKAO9fGITmLwt+8ERJe3TPbbWBz6jo678+Avn92
-						Tzvqvj9KDUk2UHRkR/gzb1Y66smO/k1lxXMVlkW5e6KFn1Zs1NUnSbyGYANPmSjR
-						2XcLgxtmQxedpKFj2urFCdi+EpFaszs2cuuBsvZqx4DwcDBsayjePDu2GnKtVF24
-						rsWxHZMfBtr1KIDQuQDm8MWMzjIB4PHZ3K0dsqCNHg8zjGvu1/N2C3Es5SS5OTip
-						weXS7ejveKU2LZTGOelhDho2MTtx8mOMyVslq/PZ1hzplwltAgMBAAGjgckwgcYw
-						HQYDVR0OBBYEFMj6G2UwHf8kGxz74rhomi/C1cT4MIGWBgNVHSMEgY4wgYuAFMj6
-						G2UwHf8kGxz74rhomi/C1cT4oWikZjBkMSgwJgYDVQQKEx9SZWVkIEJ1c2luZXNz
-						IEluZm8gLSBWaXBlciBCZXRhMTgwNgYDVQQDEy93d3cub2FzZXJ2ZXItc3NvLWJl
-						dGEuYXdzdmlwZXIucmVlZGJ1c2luZXNzLm5ldIIJAMneSf8qSaB3MAwGA1UdEwQF
-						MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEGnnYllzfUQ483OyFbjm1PUyWCPlEX+
-						z82+hODcpmvt9mRuwBierbGgsByUUswK7wc4X50VSH/TCBbaGgav/FAWQZqMUsdG
-						iLtDT7xdbnnMVKCBJhBrmo//rfJ4QXscGkQ+gViY+wHJmCjaNAAxxvO25oAEhkFX
-						zGoPN2QAM7ue1XuAoG6uDXCJYMh507OXLh1IoF5+ubQOhyhr+yaiXkHp2cfYhxSg
-						Hs8TX8jAiK1K2BczXNKTKgevn6hpRZbX8AiJuoS49h7j2DgzY3KdW0l6FK8jbZ5G
-						PBrPCD2rrGz3T8vnZL3JjkQr2hrxD62QB00hozoykT0RXdAY1S5CbUI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ccinformadults.sso2-beta.awsviper.reedbusiness.net/sites/ccinformadults/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ccinformadults.sso2-beta.awsviper.reedbusiness.net/sites/ccinformadults/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccinformadults.sso2-beta.awsviper.reedbusiness.net/sites/ccinformadults/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ccinformadults.sso2-beta.awsviper.reedbusiness.net/sites/ccinformadults/oa/auth/rcv/saml2/art" index="4"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">CCInform Adults (Shib Test)</ServiceName>
-      <ServiceDescription xml:lang="en">Vital information for professionals working with disabled and older people.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Reed Business Information Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CCInform Adults (Shib Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://adults.ccinform.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>CCInform Helpdesk</GivenName>
-    <EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Surya</GivenName>
-    <SurName>Radjendirane</SurName>
-    <EmailAddress>mailto:surya.radjendirane@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tracey</GivenName>
-    <SurName>Stobbs</SurName>
-    <EmailAddress>mailto:Tracey.Stobbs@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Katie</GivenName>
-    <SurName>Hodgkiss</SurName>
-    <EmailAddress>mailto:katie.hodgkiss@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sonya</GivenName>
-    <SurName>Chauhan</SurName>
-    <EmailAddress>mailto:Sonya.Chauhan@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.aston.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/openathens.aston.ac.uk-oala-metadata.xml
deleted file mode 100644
index bde20c7b..00000000
--- a/swamid-interfederations-2.0/openathens.aston.ac.uk-oala-metadata.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://openathens.aston.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens IdP for Aston University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-03T16:14:48Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">aston.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSjCCAjKgAwIBAgIIeTpa4BHO1jIwDQYJKoZIhvcNAQEFBQAwPDEZMBcGA1UE
-						CgwQQXN0b24gVW5pdmVyc2l0eTEfMB0GA1UEAwwWb3BlbmF0aGVucy5hc3Rvbi5h
-						Yy51azAeFw0xMjA2MjUxNTAxMzNaFw0yMjA2MjUxNTAxMzNaMDwxGTAXBgNVBAoM
-						EEFzdG9uIFVuaXZlcnNpdHkxHzAdBgNVBAMMFm9wZW5hdGhlbnMuYXN0b24uYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiynBTPNB1iYMl464O
-						8yQghrgRuIll2drDAQX4uoytwUsPYzlR1Vg//tu/lfk/nPZvt5P3cuxnoFRjKu30
-						jDp+D0BlrJGBVKxcWwcstBl95GPLzJk6iLN2XzkQk5CEOvE/hieTfaAVts/UWSpy
-						Xjmo6lW99KsOLd5bHrJUJ3glw8wYv3q5Uy769KbQmsVi3+kfwvKWBg6uWi4C0Ea9
-						PkGzykek7n2GvjHLvwFLPFW32F6Vc3RJlCiE+eJ3iDE3DWG76GG9rJdDQCeN8aYK
-						xe8wMZaSPve76I5X8EKBdgVtOnJb2IfG6wUNFiWpDR45fWox+6oE3IydEe6nV7dg
-						WE4xAgMBAAGjUDBOMB0GA1UdDgQWBBT+uPA5lqwqcWsIWFERADKcdDri+jAfBgNV
-						HSMEGDAWgBT+uPA5lqwqcWsIWFERADKcdDri+jAMBgNVHRMEBTADAQH/MA0GCSqG
-						SIb3DQEBBQUAA4IBAQAIe+0nlbX41IeZ/2YZOmGp9OQjj2vDoDg3YDRlkP7UoMQL
-						BVBXKb0m2sCCRQVvlfcIzDORdlkH+YO/QCJDwzgKB/Lb4CtMvUrE/EItN+ZO8EtZ
-						0hoEdCagdPCJa8QhNx5oy1T45OLidoTxWrafZsWN4Jw6Gpm1luyzLIU4HtwABhW9
-						yYFFhJjiOOrlQ8ANkt+gMTFL3hYwDGTJt4iFjH4zqAAxR9yn9gCu8ajniBrQNVO7
-						EEFJkraetkDgv0vtW68UBadRK51sYcS2m/WBe7jtynskjvRaqwX+Ui8kCFkbMcEC
-						Y2CHAtp5TNRdXvcrmNE/yyOdqVfCJk0D7WJjCp8w
-					</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>
-						MIIDSjCCAjKgAwIBAgIIeTpa4BHO1jIwDQYJKoZIhvcNAQEFBQAwPDEZMBcGA1UE
-						CgwQQXN0b24gVW5pdmVyc2l0eTEfMB0GA1UEAwwWb3BlbmF0aGVucy5hc3Rvbi5h
-						Yy51azAeFw0xMjA2MjUxNTAxMzNaFw0yMjA2MjUxNTAxMzNaMDwxGTAXBgNVBAoM
-						EEFzdG9uIFVuaXZlcnNpdHkxHzAdBgNVBAMMFm9wZW5hdGhlbnMuYXN0b24uYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiynBTPNB1iYMl464O
-						8yQghrgRuIll2drDAQX4uoytwUsPYzlR1Vg//tu/lfk/nPZvt5P3cuxnoFRjKu30
-						jDp+D0BlrJGBVKxcWwcstBl95GPLzJk6iLN2XzkQk5CEOvE/hieTfaAVts/UWSpy
-						Xjmo6lW99KsOLd5bHrJUJ3glw8wYv3q5Uy769KbQmsVi3+kfwvKWBg6uWi4C0Ea9
-						PkGzykek7n2GvjHLvwFLPFW32F6Vc3RJlCiE+eJ3iDE3DWG76GG9rJdDQCeN8aYK
-						xe8wMZaSPve76I5X8EKBdgVtOnJb2IfG6wUNFiWpDR45fWox+6oE3IydEe6nV7dg
-						WE4xAgMBAAGjUDBOMB0GA1UdDgQWBBT+uPA5lqwqcWsIWFERADKcdDri+jAfBgNV
-						HSMEGDAWgBT+uPA5lqwqcWsIWFERADKcdDri+jAMBgNVHRMEBTADAQH/MA0GCSqG
-						SIb3DQEBBQUAA4IBAQAIe+0nlbX41IeZ/2YZOmGp9OQjj2vDoDg3YDRlkP7UoMQL
-						BVBXKb0m2sCCRQVvlfcIzDORdlkH+YO/QCJDwzgKB/Lb4CtMvUrE/EItN+ZO8EtZ
-						0hoEdCagdPCJa8QhNx5oy1T45OLidoTxWrafZsWN4Jw6Gpm1luyzLIU4HtwABhW9
-						yYFFhJjiOOrlQ8ANkt+gMTFL3hYwDGTJt4iFjH4zqAAxR9yn9gCu8ajniBrQNVO7
-						EEFJkraetkDgv0vtW68UBadRK51sYcS2m/WBe7jtynskjvRaqwX+Ui8kCFkbMcEC
-						Y2CHAtp5TNRdXvcrmNE/yyOdqVfCJk0D7WJjCp8w
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.aston.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.aston.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Aston University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aston University OpenAthens</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aston.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Team Mailbox</GivenName>
-    <EmailAddress>mailto:isa_sysadm@aston.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Tom</GivenName>
-    <SurName>Hunt</SurName>
-    <EmailAddress>mailto:t.d.hunt@aston.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Team Mailbox</GivenName>
-    <EmailAddress>mailto:isa_sysadm@aston.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Hunt</SurName>
-    <EmailAddress>mailto:t.d.hunt@aston.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-metadata.xml
deleted file mode 100644
index 760fb70b..00000000
--- a/swamid-interfederations-2.0/openathens.blackpoolsixth.ac.uk-oala-metadata.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://openathens.blackpoolsixth.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens IdP for The Blackpool Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-03T09:47:16Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">openathens.blackpoolsixth.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Blackpool Sixth Form College</mdui:DisplayName>
-        <mdui:Logo height="138" width="138">https://drive.google.com/file/d/0B0EYs7-1W-QLS0FHamZQOVJsNjQ/view?usp=sharing</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDfDCCAmSgAwIBAgIIZ5b5ek0HMy0wDQYJKoZIhvcNAQEFBQAwVTEpMCcGA1UE
-						CgwgVGhlIEJsYWNrcG9vbCBTaXh0aCBGb3JtIENvbGxlZ2UxKDAmBgNVBAMMH29w
-						ZW5hdGhlbnMuYmxhY2twb29sc2l4dGguYWMudWswHhcNMTUwNzMwMDgwMDU3WhcN
-						MjUwNzMwMDgwMDU3WjBVMSkwJwYDVQQKDCBUaGUgQmxhY2twb29sIFNpeHRoIEZv
-						cm0gQ29sbGVnZTEoMCYGA1UEAwwfb3BlbmF0aGVucy5ibGFja3Bvb2xzaXh0aC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKIHctjmU3wcl6Yh
-						Ve4FgURR+YHKiJguGgjMZvNd9jtVa7tuqiHg3j/qsOyyCfYKABR8QhXM/+ZV0AWl
-						WpAZ22fqPjaHOa2oWAVCRLIlVG75J5t+p1g8AqlYdTUMRAGncyhzRrTEDai9cXTb
-						9iElCg6gtkorpvwgk5C/7yVU+GbqohIw+447tPG4hsmZfQV23wHaYUR4yF8aq0c6
-						qNI6MpE6SWbdl4+ePfohwlZPPKEHKh8NUdU7rlz2WMKoQafzc3zacTv1nziD/mdy
-						0Mt4nrbGfKq0la+0o6BWB7tOUlht1Z4mv68tRtZ/LXlasPNuz5b9FX0zuOR3qqrV
-						/vL6tIECAwEAAaNQME4wHQYDVR0OBBYEFANJG3eMfJFEMKu32tl77TsYvRnMMB8G
-						A1UdIwQYMBaAFANJG3eMfJFEMKu32tl77TsYvRnMMAwGA1UdEwQFMAMBAf8wDQYJ
-						KoZIhvcNAQEFBQADggEBAFd61jV1f534DyaS+2v57NSBArqSKsSDlOUIexOQbLJY
-						gxfAhrhiRH7UBkJRPS21QTRg8S7XhruKRZvOW6ANU/xteAKyxfkmmFSVwNhlgHdk
-						Yv8GvOPDn8CwiDr61aU1rDIG8F90Rqa9A0S7lGyeXGlXFnXjvrMsIPzbrQ49f2JZ
-						ysUA7zI/n7reC5dT8wyKtSWsydSyWIuY4W1v17IALxz7KsfnVTEj/uMr9Oqm0QgL
-						CU7f5enOAZT5n9W8CFI5xNcpbazKoUzjTt15yoEOsD7vYNhJnS1EFClDBmM/ERxP
-						2l6IdVWB/SVkgM6+P3kLtIZ/j4HLSsJ6GEIbJGI00UE=
-					</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>
-						MIIDfDCCAmSgAwIBAgIIZ5b5ek0HMy0wDQYJKoZIhvcNAQEFBQAwVTEpMCcGA1UE
-						CgwgVGhlIEJsYWNrcG9vbCBTaXh0aCBGb3JtIENvbGxlZ2UxKDAmBgNVBAMMH29w
-						ZW5hdGhlbnMuYmxhY2twb29sc2l4dGguYWMudWswHhcNMTUwNzMwMDgwMDU3WhcN
-						MjUwNzMwMDgwMDU3WjBVMSkwJwYDVQQKDCBUaGUgQmxhY2twb29sIFNpeHRoIEZv
-						cm0gQ29sbGVnZTEoMCYGA1UEAwwfb3BlbmF0aGVucy5ibGFja3Bvb2xzaXh0aC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKIHctjmU3wcl6Yh
-						Ve4FgURR+YHKiJguGgjMZvNd9jtVa7tuqiHg3j/qsOyyCfYKABR8QhXM/+ZV0AWl
-						WpAZ22fqPjaHOa2oWAVCRLIlVG75J5t+p1g8AqlYdTUMRAGncyhzRrTEDai9cXTb
-						9iElCg6gtkorpvwgk5C/7yVU+GbqohIw+447tPG4hsmZfQV23wHaYUR4yF8aq0c6
-						qNI6MpE6SWbdl4+ePfohwlZPPKEHKh8NUdU7rlz2WMKoQafzc3zacTv1nziD/mdy
-						0Mt4nrbGfKq0la+0o6BWB7tOUlht1Z4mv68tRtZ/LXlasPNuz5b9FX0zuOR3qqrV
-						/vL6tIECAwEAAaNQME4wHQYDVR0OBBYEFANJG3eMfJFEMKu32tl77TsYvRnMMB8G
-						A1UdIwQYMBaAFANJG3eMfJFEMKu32tl77TsYvRnMMAwGA1UdEwQFMAMBAf8wDQYJ
-						KoZIhvcNAQEFBQADggEBAFd61jV1f534DyaS+2v57NSBArqSKsSDlOUIexOQbLJY
-						gxfAhrhiRH7UBkJRPS21QTRg8S7XhruKRZvOW6ANU/xteAKyxfkmmFSVwNhlgHdk
-						Yv8GvOPDn8CwiDr61aU1rDIG8F90Rqa9A0S7lGyeXGlXFnXjvrMsIPzbrQ49f2JZ
-						ysUA7zI/n7reC5dT8wyKtSWsydSyWIuY4W1v17IALxz7KsfnVTEj/uMr9Oqm0QgL
-						CU7f5enOAZT5n9W8CFI5xNcpbazKoUzjTt15yoEOsD7vYNhJnS1EFClDBmM/ERxP
-						2l6IdVWB/SVkgM6+P3kLtIZ/j4HLSsJ6GEIbJGI00UE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.blackpoolsixth.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.blackpoolsixth.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Blackpool Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Blackpool Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.blackpoolsixth.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alison</GivenName>
-    <SurName>Miller</SurName>
-    <EmailAddress>mailto:alison.miller@blackpoolsixth.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Hopwood</SurName>
-    <EmailAddress>mailto:lee.hopwood@blackpoolsixth.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml b/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml
deleted file mode 100644
index 6d01bfed..00000000
--- a/swamid-interfederations-2.0/openathens.ccinform.co.uk-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathens.ccinform.co.uk/shibboleth">
-  <!--
-		This is a "CC Inform Test" OpenAthens SP for Reed Business Information Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-25T12:05:45Z">
-      <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: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">CCInform (Test)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Vital information for professionals working with disabled and older people.</mdui:Description>
-        <mdui:Logo height="72" width="300">https://s3-eu-west-1.amazonaws.com/rbi-cci/wp-content/uploads/2014/01/CHildren-logo300.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEFTCCAv2gAwIBAgIJAMneSf8qSaB3MA0GCSqGSIb3DQEBBQUAMGQxKDAmBgNV
-						BAoTH1JlZWQgQnVzaW5lc3MgSW5mbyAtIFZpcGVyIEJldGExODA2BgNVBAMTL3d3
-						dy5vYXNlcnZlci1zc28tYmV0YS5hd3N2aXBlci5yZWVkYnVzaW5lc3MubmV0MB4X
-						DTE1MTEyMzE0NTU0MloXDTI1MTEyMDE0NTU0MlowZDEoMCYGA1UEChMfUmVlZCBC
-						dXNpbmVzcyBJbmZvIC0gVmlwZXIgQmV0YTE4MDYGA1UEAxMvd3d3Lm9hc2VydmVy
-						LXNzby1iZXRhLmF3c3ZpcGVyLnJlZWRidXNpbmVzcy5uZXQwggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDGroeDl0uM+jhIVrqKJFn5okiOAbJw6julPlKK
-						pFeGLNyT70aOcsCG0+4utfzsriKAO9fGITmLwt+8ERJe3TPbbWBz6jo678+Avn92
-						Tzvqvj9KDUk2UHRkR/gzb1Y66smO/k1lxXMVlkW5e6KFn1Zs1NUnSbyGYANPmSjR
-						2XcLgxtmQxedpKFj2urFCdi+EpFaszs2cuuBsvZqx4DwcDBsayjePDu2GnKtVF24
-						rsWxHZMfBtr1KIDQuQDm8MWMzjIB4PHZ3K0dsqCNHg8zjGvu1/N2C3Es5SS5OTip
-						weXS7ejveKU2LZTGOelhDho2MTtx8mOMyVslq/PZ1hzplwltAgMBAAGjgckwgcYw
-						HQYDVR0OBBYEFMj6G2UwHf8kGxz74rhomi/C1cT4MIGWBgNVHSMEgY4wgYuAFMj6
-						G2UwHf8kGxz74rhomi/C1cT4oWikZjBkMSgwJgYDVQQKEx9SZWVkIEJ1c2luZXNz
-						IEluZm8gLSBWaXBlciBCZXRhMTgwNgYDVQQDEy93d3cub2FzZXJ2ZXItc3NvLWJl
-						dGEuYXdzdmlwZXIucmVlZGJ1c2luZXNzLm5ldIIJAMneSf8qSaB3MAwGA1UdEwQF
-						MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEGnnYllzfUQ483OyFbjm1PUyWCPlEX+
-						z82+hODcpmvt9mRuwBierbGgsByUUswK7wc4X50VSH/TCBbaGgav/FAWQZqMUsdG
-						iLtDT7xdbnnMVKCBJhBrmo//rfJ4QXscGkQ+gViY+wHJmCjaNAAxxvO25oAEhkFX
-						zGoPN2QAM7ue1XuAoG6uDXCJYMh507OXLh1IoF5+ubQOhyhr+yaiXkHp2cfYhxSg
-						Hs8TX8jAiK1K2BczXNKTKgevn6hpRZbX8AiJuoS49h7j2DgzY3KdW0l6FK8jbZ5G
-						PBrPCD2rrGz3T8vnZL3JjkQr2hrxD62QB00hozoykT0RXdAY1S5CbUI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ccinform.sso2-beta.awsviper.reedbusiness.net/sites/ccinform/oa/auth/rcv/saml2/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://singlesignonsystest.awsviper.reedbusiness.net/ccinform/shibboleth/samlhandler" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ccinform.sso2-beta.awsviper.reedbusiness.net/sites/ccinform/oa/auth/rcv/saml2/artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://singlesignonsystest.awsviper.reedbusiness.net/ccinform/shibboleth/samlhandler" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Reed Business Information Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CCInform (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ccinform.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>CCInform Helpdesk</GivenName>
-    <EmailAddress>mailto:CCInformHelpdesk@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Surya</GivenName>
-    <SurName>Radjendirane</SurName>
-    <EmailAddress>mailto:surya.radjendirane@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tracey</GivenName>
-    <SurName>Stobbs</SurName>
-    <EmailAddress>mailto:Tracey.Stobbs@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Katie</GivenName>
-    <SurName>Hodgkiss</SurName>
-    <EmailAddress>mailto:katie.hodgkiss@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sonya</GivenName>
-    <SurName>Chauhan</SurName>
-    <EmailAddress>mailto:Sonya.Chauhan@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.xml
deleted file mode 100644
index 9249a786..00000000
--- a/swamid-interfederations-2.0/openathens.keele.ac.uk-oala-metadata.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://openathens.keele.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for University of Keele.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-23T16:46:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">keele.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID5zCCAs+gAwIBAgIJAJYE6X8FdcoOMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
-						VQQGEwJHQjEWMBQGA1UECAwNU3RhZmZvcmRzaGlyZTEOMAwGA1UEBwwFS2VlbGUx
-						HDAaBgNVBAoME1VuaXZlcnNpdHkgb2YgS2VlbGUxEzARBgNVBAsMCm9wZW5hdGhl
-						bnMxHzAdBgNVBAMMFm9wZW5hdGhlbnMua2VlbGUuYWMudWswHhcNMTMxMjE2MTYy
-						MTMyWhcNMjMxMjE3MTYyMTMyWjCBiTELMAkGA1UEBhMCR0IxFjAUBgNVBAgMDVN0
-						YWZmb3Jkc2hpcmUxDjAMBgNVBAcMBUtlZWxlMRwwGgYDVQQKDBNVbml2ZXJzaXR5
-						IG9mIEtlZWxlMRMwEQYDVQQLDApvcGVuYXRoZW5zMR8wHQYDVQQDDBZvcGVuYXRo
-						ZW5zLmtlZWxlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						oJKbr6JC7sgMXeXfP7Sj721oLA9jhqan0QnG/5NTm6v/HgkgQnjezp/uBD9OirA+
-						pyCmYUhQWLBgiD8JxH5bhhmfTGUD3iLcUeo4yKPJPzyWhHjCru2iPSAbnvl6yzAQ
-						7pBZFJktxfO4Dx6iOQsiaCC93z04GPdqL0eNt2NZNNX/X5r3HdYkzonf6DvYTEfR
-						k/xkzj35q70jDKwIrIiMUFr+xzUeQUYzVE4gysoYoaIfDvcO3kPKUgTuIZvbDsBm
-						QIkjOb3MQcqXL3JXrhv6nwCahJOTvORHxEBzD4LAaowVbtJsfU/FRKQph98FGvdZ
-						9Sef14MLaj6OLM/0CTH8vQIDAQABo1AwTjAdBgNVHQ4EFgQUxaJLsEIgT0EQ9l/i
-						X0XT8xDk764wHwYDVR0jBBgwFoAUxaJLsEIgT0EQ9l/iX0XT8xDk764wDAYDVR0T
-						BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAExw2HRuHuKy63i3dBx7siDE333dA
-						Wote0EBhijBShMcGmfNl1I1n9clrfHlm/yBuOyZABwysuTsjmNVWnaYOPGX53sxP
-						Gz2ibT6mPhZKVu0XiMaeoMnW0KO/SBCdYlLP6Z0J9NWU5c5prP9Nwmz+lcDH2qB8
-						CIjUT62cW6wo0WKs4QuucTw5zDlZCqT62yWqhb5RAlB0yy0nHDZfi69RXl5y8vhx
-						hwcXwYvkeiw1BrLJj80Qw1LvBn1M6oqZ6TfYLrX8ub2JdhGudeFY8K2XZS2p0oEu
-						dfpSmtW4JDyR0X8mLpFU61SdoVKWIZ+1UOtRO1YbGVbeQntrmy3E5LGStw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.keele.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.keele.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Keele</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Keele University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.keele.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Neil</GivenName>
-    <SurName>Carter</SurName>
-    <EmailAddress>mailto:n.carter@keele.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Norman</GivenName>
-    <SurName>Bridges</SurName>
-    <EmailAddress>mailto:n.w.bridges@keele.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.rave.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/openathens.rave.ac.uk-oala-metadata.xml
deleted file mode 100644
index 97000051..00000000
--- a/swamid-interfederations-2.0/openathens.rave.ac.uk-oala-metadata.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://openathens.rave.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Ravensbourne.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-16T14:03:22Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">rave.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIIGb+QLd2Xcf4wDQYJKoZIhvcNAQEFBQAwNzEVMBMGA1UE
-						CgwMUmF2ZW5zYm91cm5lMR4wHAYDVQQDDBVvcGVuYXRoZW5zLnJhdmUuYWMudWsw
-						HhcNMTMwNzIyMTYxMzA5WhcNMjMwNzIyMTYxMzA5WjA3MRUwEwYDVQQKDAxSYXZl
-						bnNib3VybmUxHjAcBgNVBAMMFW9wZW5hdGhlbnMucmF2ZS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4X5KvF9EBh9l7DqAvG93KVmReRhEcW
-						G8I9i8Uv+b5lFLQs6bWQBXp9hpEC+/AmlkP5NoI7SaDBXvCxu2PT7h2Gb0sM0IpF
-						ZCsWKpcAsJV0RVEaoCGXX95xBko/lyS3CAIRIs1QkUwx1PS9SV5SHif8AKDOWCxT
-						ykDNxeF3Sk8iQXBTsJ/soYm6qK7r44h+wqCxyAfStJC7IHbtziL1/XGY2LeZ4GZw
-						0LeJmhnLdcZCnUrej/M6wQ6i9TlghMuLj+7XyW/wipOy+k7fr+vXvHwBItn3/Kii
-						8aZ8NQMF5D6azrfiKhgEXGWHMPaqkKNYr7QVZpazA2pxE4tE53WkPH8CAwEAAaNQ
-						ME4wHQYDVR0OBBYEFMmSda3XmZAaZrHLPwDl/UJh7lCRMB8GA1UdIwQYMBaAFMmS
-						da3XmZAaZrHLPwDl/UJh7lCRMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBACuMYIy6+tNV2P6o4SspyHtXfbml23xkuN/aFw2xNfCXI6I5vn/dU9PG9Geu
-						ECffsJck1qObzQXGXJX6B0vUFJxlF7c5qbF+CUyuxe243WVeAA9NSHo7XLqrHMUG
-						8czKxdEynFvBsUE+8cwQ7K4jJfZC18BY8sGLDJFpENNMHxZAJdbyKbnDE3EbPN4e
-						JeKhksTpDBV97dUf2Dd2AzFiJyOqTBDKKPM5Afl9SHD6+IDUEDxoclh3Jgyhc4wN
-						8e1dIz+XZxix7ez2AMOrvFWbbKWn2XHfcNxnML9J7yu65sjsNrlGahBitwhyrCNE
-						8Toby2o89ob4jbDqMjyd5yapsXs=
-					</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>
-						MIIDQDCCAiigAwIBAgIIGb+QLd2Xcf4wDQYJKoZIhvcNAQEFBQAwNzEVMBMGA1UE
-						CgwMUmF2ZW5zYm91cm5lMR4wHAYDVQQDDBVvcGVuYXRoZW5zLnJhdmUuYWMudWsw
-						HhcNMTMwNzIyMTYxMzA5WhcNMjMwNzIyMTYxMzA5WjA3MRUwEwYDVQQKDAxSYXZl
-						bnNib3VybmUxHjAcBgNVBAMMFW9wZW5hdGhlbnMucmF2ZS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4X5KvF9EBh9l7DqAvG93KVmReRhEcW
-						G8I9i8Uv+b5lFLQs6bWQBXp9hpEC+/AmlkP5NoI7SaDBXvCxu2PT7h2Gb0sM0IpF
-						ZCsWKpcAsJV0RVEaoCGXX95xBko/lyS3CAIRIs1QkUwx1PS9SV5SHif8AKDOWCxT
-						ykDNxeF3Sk8iQXBTsJ/soYm6qK7r44h+wqCxyAfStJC7IHbtziL1/XGY2LeZ4GZw
-						0LeJmhnLdcZCnUrej/M6wQ6i9TlghMuLj+7XyW/wipOy+k7fr+vXvHwBItn3/Kii
-						8aZ8NQMF5D6azrfiKhgEXGWHMPaqkKNYr7QVZpazA2pxE4tE53WkPH8CAwEAAaNQ
-						ME4wHQYDVR0OBBYEFMmSda3XmZAaZrHLPwDl/UJh7lCRMB8GA1UdIwQYMBaAFMmS
-						da3XmZAaZrHLPwDl/UJh7lCRMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBACuMYIy6+tNV2P6o4SspyHtXfbml23xkuN/aFw2xNfCXI6I5vn/dU9PG9Geu
-						ECffsJck1qObzQXGXJX6B0vUFJxlF7c5qbF+CUyuxe243WVeAA9NSHo7XLqrHMUG
-						8czKxdEynFvBsUE+8cwQ7K4jJfZC18BY8sGLDJFpENNMHxZAJdbyKbnDE3EbPN4e
-						JeKhksTpDBV97dUf2Dd2AzFiJyOqTBDKKPM5Afl9SHD6+IDUEDxoclh3Jgyhc4wN
-						8e1dIz+XZxix7ez2AMOrvFWbbKWn2XHfcNxnML9J7yu65sjsNrlGahBitwhyrCNE
-						8Toby2o89ob4jbDqMjyd5yapsXs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.rave.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.rave.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ravensbourne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ravensbourne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ravensbourne.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ann</GivenName>
-    <SurName>Pho</SurName>
-    <EmailAddress>mailto:a.pho@rave.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mario</GivenName>
-    <SurName>Ahmad</SurName>
-    <EmailAddress>mailto:m.ahmad@rave.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml b/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.xml
deleted file mode 100644
index 2284ec29..00000000
--- a/swamid-interfederations-2.0/openathens.warc.com-oa-metadata.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://openathens.warc.com/oa/metadata">
-  <!--
-		This is a "Warc.com" OpenAthens SP for WARC Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-28T09:05:09Z">
-      <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: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">Warc.com</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The largest single source of intelligence for marketing, advertising, media and research communities</mdui:Description>
-        <mdui:Logo height="128" width="237">https://www.warc.com/images/WarcSiteContent/WARCAthens.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-			MIIDeTCCAmGgAwIBAgIJALAX8VOBhTIkMA0GCSqGSIb3DQEBBQUAMDExETAPBgNV
-			BAoTCFdhcmMgTHRkMRwwGgYDVQQDExNvcGVuYXRoZW5zLndhcmMuY29tMB4XDTE1
-			MDUyMzEwNTAxN1oXDTI1MDUyMDEwNTAxN1owMTERMA8GA1UEChMIV2FyYyBMdGQx
-			HDAaBgNVBAMTE29wZW5hdGhlbnMud2FyYy5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-			A4IBDwAwggEKAoIBAQDS2LJWqjg+ht8ZbflL0GnfC4gok1NF1n0XgRfvjJUzX+KB
-			u7c9stOlsygoyZtgPE4uzbkO1TxKB0zx4BtUviLSddy5d2C4QkBQptrNm20FqkwU
-			uxEo5fenquFRy7gaPCoyV65O0yjGd91raN0Ds88tjVaKaaf1PNkhTXUXEFPSlc0k
-			S0aAFjx4IH7hfEP3M0jUP4FzbvnIG3c5yPwza/Y3C0Pki0dfs9rwywxBst9TdfXZ
-			o+E7fKpMUxGH+VvhPxsj6a6Qxpc+aVLKejvdg8s/iVyOWakeCtkDxfO0l1/DzWJd
-			gEetR65EkG204AycfzM+rGKb6j/gj5BfXONIoIkXAgMBAAGjgZMwgZAwHQYDVR0O
-			BBYEFE2bamIeuJQPBRGJSRwuVF3LKIFnMGEGA1UdIwRaMFiAFE2bamIeuJQPBRGJ
-			SRwuVF3LKIFnoTWkMzAxMREwDwYDVQQKEwhXYXJjIEx0ZDEcMBoGA1UEAxMTb3Bl
-			bmF0aGVucy53YXJjLmNvbYIJALAX8VOBhTIkMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-			hvcNAQEFBQADggEBABAHDhIjgQPg1Rng8yzqwAXkv9O9d4uMokdosYi/Q5MqPTzj
-			yAfa1PfhAQzaroG8RgnoSDzbEXDwNbWXuN/i2i9spticshmliuMB70zgfo7cNF5R
-			DJNZLvZZpdj/a89Km2e8K7I6tMSBAeNXtrcFKTsJF0WoXJC+Ps8xlRYrtR60WavC
-			aEP2TUJ7VVEBlauPN+o/oldF+gxycwFPOn9PvFrr0Xsv5lEyFvNVN/QHUj6yTxbR
-			0bupxzSmUCOeItj/V0hOlgT1SEnSviMB3rSQJU6luZ13VkPjL0N5h6C8RXnegngJ
-			G7IhNFU840UuC06AYA5AB6KHGl3ijvAla11Fk6E=
-		</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>
-			MIIDeTCCAmGgAwIBAgIJALAX8VOBhTIkMA0GCSqGSIb3DQEBBQUAMDExETAPBgNV
-			BAoTCFdhcmMgTHRkMRwwGgYDVQQDExNvcGVuYXRoZW5zLndhcmMuY29tMB4XDTE1
-			MDUyMzEwNTAxN1oXDTI1MDUyMDEwNTAxN1owMTERMA8GA1UEChMIV2FyYyBMdGQx
-			HDAaBgNVBAMTE29wZW5hdGhlbnMud2FyYy5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-			A4IBDwAwggEKAoIBAQDS2LJWqjg+ht8ZbflL0GnfC4gok1NF1n0XgRfvjJUzX+KB
-			u7c9stOlsygoyZtgPE4uzbkO1TxKB0zx4BtUviLSddy5d2C4QkBQptrNm20FqkwU
-			uxEo5fenquFRy7gaPCoyV65O0yjGd91raN0Ds88tjVaKaaf1PNkhTXUXEFPSlc0k
-			S0aAFjx4IH7hfEP3M0jUP4FzbvnIG3c5yPwza/Y3C0Pki0dfs9rwywxBst9TdfXZ
-			o+E7fKpMUxGH+VvhPxsj6a6Qxpc+aVLKejvdg8s/iVyOWakeCtkDxfO0l1/DzWJd
-			gEetR65EkG204AycfzM+rGKb6j/gj5BfXONIoIkXAgMBAAGjgZMwgZAwHQYDVR0O
-			BBYEFE2bamIeuJQPBRGJSRwuVF3LKIFnMGEGA1UdIwRaMFiAFE2bamIeuJQPBRGJ
-			SRwuVF3LKIFnoTWkMzAxMREwDwYDVQQKEwhXYXJjIEx0ZDEcMBoGA1UEAxMTb3Bl
-			bmF0aGVucy53YXJjLmNvbYIJALAX8VOBhTIkMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-			hvcNAQEFBQADggEBABAHDhIjgQPg1Rng8yzqwAXkv9O9d4uMokdosYi/Q5MqPTzj
-			yAfa1PfhAQzaroG8RgnoSDzbEXDwNbWXuN/i2i9spticshmliuMB70zgfo7cNF5R
-			DJNZLvZZpdj/a89Km2e8K7I6tMSBAeNXtrcFKTsJF0WoXJC+Ps8xlRYrtR60WavC
-			aEP2TUJ7VVEBlauPN+o/oldF+gxycwFPOn9PvFrr0Xsv5lEyFvNVN/QHUj6yTxbR
-			0bupxzSmUCOeItj/V0hOlgT1SEnSviMB3rSQJU6luZ13VkPjL0N5h6C8RXnegngJ
-			G7IhNFU840UuC06AYA5AB6KHGl3ijvAla11Fk6E=
-		</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathens.warc.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathens.warc.com/oa/auth/rcv/saml2/post" index="2"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Warc.com</ServiceName>
-      <ServiceDescription xml:lang="en">
-			The largest single source of intelligence for marketing, advertising, media and research communities
-		</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">WARC Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Warc.com</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.warc.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Denham</SurName>
-    <EmailAddress>mailto:andrew.denham@warc.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Denham</SurName>
-    <EmailAddress>mailto:andrew.denham@warc.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml b/swamid-interfederations-2.0/openathens.xperthr.co.uk-shibboleth.xml
deleted file mode 100644
index 4bdc9d09..00000000
--- a/swamid-interfederations-2.0/openathens.xperthr.co.uk-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://openathens.xperthr.co.uk/shibboleth">
-  <!--
-		This is an 'XpertHR - Online HR Intelligence' Test SP owned by Reed Business Information Limited.        
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="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>
-						MIID0zCCArugAwIBAgIJAKdy83q7VjjVMA0GCSqGSIb3DQEBBQUAME8xKjAoBgNV
-						BAoTIVJlZWQgQnVzaW5lc3MgSW5mb3JtYXRpb24gTGltaXRlZDEhMB8GA1UEAxMY
-						b3BlbmF0aGVucy54cGVydGhyLmNvLnVrMB4XDTEzMDIyMDA5MDM0MVoXDTIzMDIx
-						ODA5MDM0MVowTzEqMCgGA1UEChMhUmVlZCBCdXNpbmVzcyBJbmZvcm1hdGlvbiBM
-						aW1pdGVkMSEwHwYDVQQDExhvcGVuYXRoZW5zLnhwZXJ0aHIuY28udWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2162/mC0Gz3ROipcljMbf1GgybliO
-						KbFF3u/YkRjUsDtZEu0qmAjAG8SiyrdfVeFo0j3UJXaU7cxk4dlTObGCT8CyvcvH
-						Hx2mmv/neiSSxNtgO3MTR98HMM10BukTmElxzqCKZkv4HlP6HnNBcUPHLsjZI5O5
-						wuUQ3w+CVtpzDt5OrHMFuNa0zfMX4u+BGH45vOCdV/k6ATDwSM1owTPY/OFweXff
-						VqRfTWGEyuttfsdasLY4vHQEdvDzN6lr7IFjGWyTPE58kusOhP/L1SUIYb+0Ex//
-						GAbEDH9u1FCuMRghKbAiIALd1JwlqY8CNw7ge2MdUc3k6KlVo+UkIqj/AgMBAAGj
-						gbEwga4wHQYDVR0OBBYEFITidDHmP8InJnv6gxnO7KJJRR5eMH8GA1UdIwR4MHaA
-						FITidDHmP8InJnv6gxnO7KJJRR5eoVOkUTBPMSowKAYDVQQKEyFSZWVkIEJ1c2lu
-						ZXNzIEluZm9ybWF0aW9uIExpbWl0ZWQxITAfBgNVBAMTGG9wZW5hdGhlbnMueHBl
-						cnRoci5jby51a4IJAKdy83q7VjjVMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-						BQADggEBAIjjC5ksqfCLMGDnJ7eTTmcbulNT5obU/LywU8xt6A5quQk1GiQVzwtn
-						8oWIk5sQrnLAYKTbdJRKwb7LxzmachZjK7K7ynk417BgxLUFyZ23bp/KpvFSLbEf
-						UBlXqICTyVNICvIBdU3X5Q2mQM0vYS97458YZvKc0FvIrPCdtPLqNKl/tHVz8v0z
-						aGbG/lyqPs/EGFeGDglSIn6OznOg39M+CERTjbi6MWYdQjIfpHNpyfkaOHWDd3qJ
-						G00MtLi3tY1/2X6iice+w3Jc5sQ7pDpiK6XkjmDlHeVhzu9iP1cdF/r3tD06iFoj
-						jHeoqxMNf447T2ASpYbVkR+zuL9RA8I=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathens.xperthr.co.uk/openathens/shibauthassert.aspx" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openathens.xperthr.co.uk/openathens/shibauthassert.aspx" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Reed Business Information Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Reed Business Information Limited: XpertHR - Online HR Intelligence Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.xperthr.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Gale</SurName>
-    <EmailAddress>mailto:mark.gale@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Gale</SurName>
-    <EmailAddress>mailto:mark.gale@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Angie</GivenName>
-    <SurName>Wong</SurName>
-    <EmailAddress>mailto:Angie.Wong@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathensr.guildford.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/openathensr.guildford.ac.uk-oala-metadata.xml
deleted file mode 100644
index bb96691f..00000000
--- a/swamid-interfederations-2.0/openathensr.guildford.ac.uk-oala-metadata.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openathensr.guildford.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Guildford College of Further and Higher Education.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-22T11:30:09Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">guildford.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVjCCAj6gAwIBAgIIe3m5sSwnVj4wDQYJKoZIhvcNAQEFBQAwQjEaMBgGA1UE
-						CgwRR3VpbGRmb3JkIENvbGxlZ2UxJDAiBgNVBAMMG29wZW5hdGhlbnNyLmd1aWxk
-						Zm9yZC5hYy51azAeFw0xMjA2MTgwOTU0MDhaFw0yMjA2MTgwOTU0MDhaMEIxGjAY
-						BgNVBAoMEUd1aWxkZm9yZCBDb2xsZWdlMSQwIgYDVQQDDBtvcGVuYXRoZW5zci5n
-						dWlsZGZvcmQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa
-						jH7z+VqWeDSvhMnEFsD4sZsOfJhV3NX7HGVHCVqTFsymT0wEBvO0b8b7lZCKV9b/
-						H02a+SMOJ2LTvotBv8PZRAewXduxXJ6oE7WHzQhjuoEE+yKJD/QM1Si9KAABbwHg
-						Zue3CnUGhxxSM775UBtXiW9H6eKJTwl1IRJCVPw5HiLAjFhQxKCz0B+40a6oGxUt
-						S6UPfWHL+Crpyl8aax6W9XkIfscztQKwDBna4n6XSZTX9Kx3DZccj8hy03UW+GSv
-						ioBJjgokeECz6XO3gO5BH5JJyILascOCYBfabt4NlJ+cA53D96sUg8OLi5RkORnB
-						Vj1ksTMHxy/Qtgtna+JxAgMBAAGjUDBOMB0GA1UdDgQWBBRFFB5eZ8WhztAdakWm
-						cUfH9sR0bDAfBgNVHSMEGDAWgBRFFB5eZ8WhztAdakWmcUfH9sR0bDAMBgNVHRME
-						BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfA4k20dG3AmWR/ubqcyMTGk8cs4o6
-						FQ/E4wYSC5CuAlrE/8NC9r52FcQ6vhoVKGKeWMvT9k7/z7lz+GOoF3TjzEk2JKhC
-						iQpsPXCCCngMORcqAJVHow/Q3MEOLrr2G/Z6FMygD67bU6svpF5AZWY95xMQcVCD
-						fUmYMaQlV7g+KidGHADcvmK4xufY93k+depQ2OM4rgWwk4LrtZJ+GisQR/2LJPtD
-						MfNnu1LliAg8Qfmdm1sbMMrnouVuGHIbkDW3FqWMbicC7j7SGEiTjH96jhDEA/2u
-						DcpYU47hTFotoLC3G834xdmNGHL9v+rdRsnSVaZ0eGmXA+MS+2QQDO60
-					</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>
-						MIIDVjCCAj6gAwIBAgIIe3m5sSwnVj4wDQYJKoZIhvcNAQEFBQAwQjEaMBgGA1UE
-						CgwRR3VpbGRmb3JkIENvbGxlZ2UxJDAiBgNVBAMMG29wZW5hdGhlbnNyLmd1aWxk
-						Zm9yZC5hYy51azAeFw0xMjA2MTgwOTU0MDhaFw0yMjA2MTgwOTU0MDhaMEIxGjAY
-						BgNVBAoMEUd1aWxkZm9yZCBDb2xsZWdlMSQwIgYDVQQDDBtvcGVuYXRoZW5zci5n
-						dWlsZGZvcmQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa
-						jH7z+VqWeDSvhMnEFsD4sZsOfJhV3NX7HGVHCVqTFsymT0wEBvO0b8b7lZCKV9b/
-						H02a+SMOJ2LTvotBv8PZRAewXduxXJ6oE7WHzQhjuoEE+yKJD/QM1Si9KAABbwHg
-						Zue3CnUGhxxSM775UBtXiW9H6eKJTwl1IRJCVPw5HiLAjFhQxKCz0B+40a6oGxUt
-						S6UPfWHL+Crpyl8aax6W9XkIfscztQKwDBna4n6XSZTX9Kx3DZccj8hy03UW+GSv
-						ioBJjgokeECz6XO3gO5BH5JJyILascOCYBfabt4NlJ+cA53D96sUg8OLi5RkORnB
-						Vj1ksTMHxy/Qtgtna+JxAgMBAAGjUDBOMB0GA1UdDgQWBBRFFB5eZ8WhztAdakWm
-						cUfH9sR0bDAfBgNVHSMEGDAWgBRFFB5eZ8WhztAdakWmcUfH9sR0bDAMBgNVHRME
-						BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfA4k20dG3AmWR/ubqcyMTGk8cs4o6
-						FQ/E4wYSC5CuAlrE/8NC9r52FcQ6vhoVKGKeWMvT9k7/z7lz+GOoF3TjzEk2JKhC
-						iQpsPXCCCngMORcqAJVHow/Q3MEOLrr2G/Z6FMygD67bU6svpF5AZWY95xMQcVCD
-						fUmYMaQlV7g+KidGHADcvmK4xufY93k+depQ2OM4rgWwk4LrtZJ+GisQR/2LJPtD
-						MfNnu1LliAg8Qfmdm1sbMMrnouVuGHIbkDW3FqWMbicC7j7SGEiTjH96jhDEA/2u
-						DcpYU47hTFotoLC3G834xdmNGHL9v+rdRsnSVaZ0eGmXA+MS+2QQDO60
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathensr.guildford.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathensr.guildford.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Guildford College of Further and Higher Education</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Guildford College Open Athens Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.guildford.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Charlie</GivenName>
-    <SurName>Bennett</SurName>
-    <EmailAddress>mailto:cbennett@guildford.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Charlie</GivenName>
-    <SurName>Bennett</SurName>
-    <EmailAddress>mailto:cbennett@guildford.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml b/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.xml
deleted file mode 100644
index bd49a069..00000000
--- a/swamid-interfederations-2.0/openathenstest1.test.openathens.net-oa-metadata.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://openathenstest1.test.openathens.net/oa/metadata">
-  <!--
-		This is an OpenAthens Support Test SP for Eduserv.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T14:42:55Z"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDjTCCAnWgAwIBAgIJALTj9dSJGZ41MA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
-						BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMTEsMCoGA1UE
-						Awwjb3BlbmF0aGVuc3Rlc3QxLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
-						MDkyNTU2WhcNMjMwNzMxMDkyNTU2WjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
-						QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDExLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
-						MS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAsSxzVK27FBg2REsAgVGGmMEW5RPrxkiLh5NWeIpxyFeSG7x5Okp8W+zP
-						/555EqKqXgcDGLGsrdOEWEU/nZB0FvP90hBCNsbbpmj0vI6lYO0USh4JCfxB1RoW
-						A9+t2nflhOeQxoLKm+RHxa2HPGDfKoiGco0TZjVgS1dXNoIl197JCvCe5MnoVo+m
-						r5ziPm/QM9mj1zQf4Di4Pm0FuklnLRJoi/mAPB8Nz3r2/MeBCyLdTn64ZwxddvdD
-						tyNwTWmL1Xm7Xq4j32iIWoMU5Mft7NodXOQDIotMIC4z+4DanXdyVi9ly2ZO5NLa
-						zyf/Ejq+iZayUuwMOmmTsSUYDY3xNQIDAQABo1AwTjAdBgNVHQ4EFgQUMpM47pKS
-						2C+RkT90fWLYvsNZSJEwHwYDVR0jBBgwFoAUMpM47pKS2C+RkT90fWLYvsNZSJEw
-						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAT22VEuJbmNjFz1EnSRJF
-						GJaQg5onQPfPT0GgJQwdgNzR4Wyyff0kXy8VYfEDrJrAypSrDm73xxyQH6IMruQ4
-						mphdZbeO+48utZJcvg52PorqRI3UEP+CeScjsr7gsDAmleXmk7P6khxkibbjeNQJ
-						Zl03IQYnAQU8z0sfuM6iy3wT6bLaVmpg4O88P4Sl51wnZFwiBfAD//zmwRn57E1n
-						ZtdbHmRILcNxHFKmp7FmZ4pCd5ZcINRVGMA5XLO9aAzzTazT2YS/RSOiSoWcoGYG
-						FJRHW+mtZ5VBgzIP0OnTOQQDoLrnju/M9wplIKP5LyVnQ/b+i3eTpvbRI0fYQAh9
-						UQ==
-					</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>
-						MIIDjTCCAnWgAwIBAgIJALTj9dSJGZ41MA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
-						BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMTEsMCoGA1UE
-						Awwjb3BlbmF0aGVuc3Rlc3QxLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
-						MDkyNTU2WhcNMjMwNzMxMDkyNTU2WjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
-						QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDExLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
-						MS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAsSxzVK27FBg2REsAgVGGmMEW5RPrxkiLh5NWeIpxyFeSG7x5Okp8W+zP
-						/555EqKqXgcDGLGsrdOEWEU/nZB0FvP90hBCNsbbpmj0vI6lYO0USh4JCfxB1RoW
-						A9+t2nflhOeQxoLKm+RHxa2HPGDfKoiGco0TZjVgS1dXNoIl197JCvCe5MnoVo+m
-						r5ziPm/QM9mj1zQf4Di4Pm0FuklnLRJoi/mAPB8Nz3r2/MeBCyLdTn64ZwxddvdD
-						tyNwTWmL1Xm7Xq4j32iIWoMU5Mft7NodXOQDIotMIC4z+4DanXdyVi9ly2ZO5NLa
-						zyf/Ejq+iZayUuwMOmmTsSUYDY3xNQIDAQABo1AwTjAdBgNVHQ4EFgQUMpM47pKS
-						2C+RkT90fWLYvsNZSJEwHwYDVR0jBBgwFoAUMpM47pKS2C+RkT90fWLYvsNZSJEw
-						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAT22VEuJbmNjFz1EnSRJF
-						GJaQg5onQPfPT0GgJQwdgNzR4Wyyff0kXy8VYfEDrJrAypSrDm73xxyQH6IMruQ4
-						mphdZbeO+48utZJcvg52PorqRI3UEP+CeScjsr7gsDAmleXmk7P6khxkibbjeNQJ
-						Zl03IQYnAQU8z0sfuM6iy3wT6bLaVmpg4O88P4Sl51wnZFwiBfAD//zmwRn57E1n
-						ZtdbHmRILcNxHFKmp7FmZ4pCd5ZcINRVGMA5XLO9aAzzTazT2YS/RSOiSoWcoGYG
-						FJRHW+mtZ5VBgzIP0OnTOQQDoLrnju/M9wplIKP5LyVnQ/b+i3eTpvbRI0fYQAh9
-						UQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openathenstest1.test.openathens.net/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv Open Athens Support Test SP1</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/Identity-Access/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Westhoff</SurName>
-    <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Westhoff</SurName>
-    <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml b/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.xml
deleted file mode 100644
index e2f2bd8d..00000000
--- a/swamid-interfederations-2.0/openathenstest2.test.openathens.net-oa-metadata.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://openathenstest2.test.openathens.net/oa/metadata">
-  <!--
-		This is an OpenAthens Support Test SP for Eduserv.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-02T14:50:35Z"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDjTCCAnWgAwIBAgIJAPpeUfXoPz3SMA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
-						BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMjEsMCoGA1UE
-						Awwjb3BlbmF0aGVuc3Rlc3QyLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
-						MDkyNTMxWhcNMjMwNzMxMDkyNTMxWjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
-						QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDIxLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
-						Mi50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAwGzRtVjqQ/TSm4mrrT15rMui+ndGNsKg0xMYynVx1EvfBNLGEjMuujsG
-						eDRac1cRJ1rNDCR9MMM3UGlj4OAwDo5scgdXhcCbOmaCKHg7yzoHNAKmrNPnGSGr
-						ELONSoUw+92TqMjfoat2mHDOLIwQnUFsRE2BjLrfK8Nx+Vvnc6SlcTEWDT0Sk7Kb
-						zL0ZohL6fEMf48CphVookAdwAeeP8/3YjVUQxwld8FhRyhVa93nuG5hr7X54xyeO
-						tmo6orjd/EC8dkvj9zsMx/G6LiIn+pVEjy4OQFagIi6sC4u1OhreHHyBVe7GU15w
-						HeKQ5DFHJ0MNudzJbxt8FAYqDzk8FwIDAQABo1AwTjAdBgNVHQ4EFgQUM3B4Mjiy
-						V+nN1qlddtPfLMH+7I4wHwYDVR0jBBgwFoAUM3B4MjiyV+nN1qlddtPfLMH+7I4w
-						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYdrxZqo2dnOxGqIjpOWS
-						EYUyVXPWSuI0z2B+qJmFNqvmui9XY6ENtm/1xS/YsXfgfAzUmSi4SjxSZOHO+5Ck
-						dQ2GpyurAotAOYHNG6sDn2BJgNZwACbBZhuy3YaOuJi98P0UrrfJv25l6ozPO9kO
-						FEofXzBgWbozFdiM6n+eVf/KNg5a+JuWRmSoCWe0YODn3gHws7eUs97uKVKo8BCU
-						yrt2fpGoiLLnIbQcsxWn7wHsqBNguXCdOi4cxemzaXstcVxT03fwrOGmRTSuUkd/
-						ikEWkSYQ6y6rO/PIhSfgjkyaGizGDtYrG1vpjrlnWaIzHB7+hwqCHu6amKOsqJvJ
-						6g==
-					</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>
-						MIIDjTCCAnWgAwIBAgIJAPpeUfXoPz3SMA0GCSqGSIb3DQEBBQUAMF0xLTArBgNV
-						BAoMJEVkdXNlcnYgT3BlbiBBdGhlbnMgU3VwcG9ydCBUZXN0IFNQMjEsMCoGA1UE
-						Awwjb3BlbmF0aGVuc3Rlc3QyLnRlc3Qub3BlbmF0aGVucy5uZXQwHhcNMTMwODAy
-						MDkyNTMxWhcNMjMwNzMxMDkyNTMxWjBdMS0wKwYDVQQKDCRFZHVzZXJ2IE9wZW4g
-						QXRoZW5zIFN1cHBvcnQgVGVzdCBTUDIxLDAqBgNVBAMMI29wZW5hdGhlbnN0ZXN0
-						Mi50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAwGzRtVjqQ/TSm4mrrT15rMui+ndGNsKg0xMYynVx1EvfBNLGEjMuujsG
-						eDRac1cRJ1rNDCR9MMM3UGlj4OAwDo5scgdXhcCbOmaCKHg7yzoHNAKmrNPnGSGr
-						ELONSoUw+92TqMjfoat2mHDOLIwQnUFsRE2BjLrfK8Nx+Vvnc6SlcTEWDT0Sk7Kb
-						zL0ZohL6fEMf48CphVookAdwAeeP8/3YjVUQxwld8FhRyhVa93nuG5hr7X54xyeO
-						tmo6orjd/EC8dkvj9zsMx/G6LiIn+pVEjy4OQFagIi6sC4u1OhreHHyBVe7GU15w
-						HeKQ5DFHJ0MNudzJbxt8FAYqDzk8FwIDAQABo1AwTjAdBgNVHQ4EFgQUM3B4Mjiy
-						V+nN1qlddtPfLMH+7I4wHwYDVR0jBBgwFoAUM3B4MjiyV+nN1qlddtPfLMH+7I4w
-						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAYdrxZqo2dnOxGqIjpOWS
-						EYUyVXPWSuI0z2B+qJmFNqvmui9XY6ENtm/1xS/YsXfgfAzUmSi4SjxSZOHO+5Ck
-						dQ2GpyurAotAOYHNG6sDn2BJgNZwACbBZhuy3YaOuJi98P0UrrfJv25l6ozPO9kO
-						FEofXzBgWbozFdiM6n+eVf/KNg5a+JuWRmSoCWe0YODn3gHws7eUs97uKVKo8BCU
-						yrt2fpGoiLLnIbQcsxWn7wHsqBNguXCdOi4cxemzaXstcVxT03fwrOGmRTSuUkd/
-						ikEWkSYQ6y6rO/PIhSfgjkyaGizGDtYrG1vpjrlnWaIzHB7+hwqCHu6amKOsqJvJ
-						6g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openathenstest2.test.openathens.net/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv Open Athens Support Test SP2</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/Identity-Access/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Westhoff</SurName>
-    <EmailAddress>mailto:jw@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Westhoff</SurName>
-    <EmailAddress>mailto:jw@eduserv.org.uk</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
index a9abf442..41f391cb 100644
--- a/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
@@ -1,36 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openskos.meertens.knaw.nl/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:29: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:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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://openskos.meertens.knaw.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:Extensions>
       <idpdisc:DiscoveryResponse 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:UIInfo>
+        <mdui:DisplayName xml:lang="fi">OpenSKOS | Meertens</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">OpenSKOS | Meertens</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das Simple Knowledge Organisation System Repository des Meertens Instituts</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:Description xml:lang="fi">Tämä Palveluntarjoaja tarjoaa pääsyn Meertens instituutin Simple Knowledge Organization System Arkiston.</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="64" width="44">https://openskos.meertens.knaw.nl/assets/images/logo-open-skos.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Meertens research documentation language culture humanities CLAVAS CLARIN OpenSKOS Vocabulary Service</mdui:Keywords>
         <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:PrivacyStatementURL xml:lang="fi">https://www.meertens.knaw.nl/cms/collections/data-protection</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.meertens.knaw.nl/cms/collections/data-protection</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.meertens.knaw.nl/cms/collections/data-protection</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>twww11</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=twww11</ds:X509SubjectName>
           <ds:X509Certificate>MIIC2TCCAcGgAwIBAgIJAOJ/2Z9fcxVXMA0GCSqGSIb3DQEBBQUAMBExDzANBgNV
 BAMTBnR3d3cxMTAeFw0xMzA0MTYxNTA3MzhaFw0yMzA0MTQxNTA3MzhaMBExDzAN
 BgNVBAMTBnR3d3cxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAP4a
@@ -46,53 +38,48 @@ u6J75jXhfSisrzaVYvDTLymYV2qhob3hqlM39PGcyXWvnyT8HWQA6nhOGIIq2K2c
 M+dr9RBlPlv+0rJq07ZbkNJqfxu4tigKOP/+sJiMuORso9uk4Ak+0cX+yb/48zqE
 6qUUo3jx8o3Uv51YiYTaPeMacxDH4TcMEZOttUmY7SH7jkZCoRlpFnozCB6QwfA/
 5D7JsQ/vElBegBrNmdrIoZyI+ezREelVATJURfgJu+47mmhVWIK0St6S1y+pgPQ4
-1bxBV69YDJSB5BjVPA==
-</ds:X509Certificate>
+1bxBV69YDJSB5BjVPA==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</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://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://openskos.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">OpenSKOS | Meertens</md:ServiceName>
+    <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://openskos.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">OpenSKOS | Meertens</md:ServiceName>
       <md:ServiceName xml:lang="en">OpenSKOS | Meertens</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Dieser Service Provider ermöglicht den Zugriff auf das Simple Knowledge Organisation System Repository des Meertens Instituts</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="fi">Tama Palveluntarjoaja tarjoaa paasyn Meertens instituutin Simple Knowledge Organization System Arkiston.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">This Service Provider provides access to the Meertens Institute's Simple Knowledge Organization System Repository</md:ServiceDescription>
-      <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="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 Name="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.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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="support">
-    <md:GivenName>KNAW</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  <md:ContactPerson contactType="administrative">
     <md:GivenName>Marc</md:GivenName>
     <md:SurName>Kemps-Snijders</md:SurName>
     <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  <md:ContactPerson contactType="technical">
     <md:GivenName>Marc</md:GivenName>
     <md:SurName>Kemps-Snijders</md:SurName>
     <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>KNAW</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openstack.hbit.sztaki.hu-shibboleth.xml b/swamid-interfederations-2.0/openstack.hbit.sztaki.hu-shibboleth.xml
deleted file mode 100644
index 457df5e7..00000000
--- a/swamid-interfederations-2.0/openstack.hbit.sztaki.hu-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://openstack.hbit.sztaki.hu/shibboleth">
-  <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="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>sztaki</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>hexaa</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">Sztaki HBIT OpenStack</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sztaki HBIT OpenStack</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Sztaki HBIT OpenStack</mdui:Description>
-        <mdui:Description xml:lang="en">Sztaki HBIT OpenStack</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://openstack.hbit.sztaki.hu/policy/SztakiHBITOpenStackPolicyEN.pdf</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="hu">https://openstack.hbit.sztaki.hu/policy/SztakiHBITOpenStackPolicyHU.pdf</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://openstack.hbit.sztaki.hu/policy/SztakiHBITOpenStackPolicyEN.pdf</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">https://openstack.hbit.sztaki.hu/policy/SztakiHBITOpenStackPolicyHU.pdf</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEqjCCA5KgAwIBAgIQOoNAp28e/QT7WsMXO8WAQjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMjAeFw0xNTAyMTcwMDAwMDBaFw0xODAyMTYyMzU5NTlaMEYxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEhMB8GA1UEAxMYb3BlbnN0YWNrLmhiaXQuc3p0YWtpLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnjR3LGJnAdpidGeUAZiNeuByViXAI1WUW5zwYafogLT1ndujF4++tqcu2eJaT0GeD6Gkli3UViCrYU5jlEJqavGSrxkAwqTi0jmOHOMKCh2mE2Wx/RYQF2jPnaoNARqYP/8A7K7peVPAaXtPivYbGHYHRk+u1OQoTn61djsgOi4ltVn2q+zgtigJkDFVAosctTxTVr39cZ+3On2TjTMTYmkK/hZc9EUA8e2n/7gemL463e1YmVEkMCsZuUkX5TTfMEroS+scfl5cSiAJnpf+FfilrkMvxLQ1EvnPX74Gk5yI+uP38qHVxeL0UQW4OOB3YHWGZj1oGlzXvfUrS/cnXwIDAQABo4IBdDCCAXAwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFGAP6Chp954Jr4v5NsPyhWRy8AF5MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMCMGA1UdEQQcMBqCGG9wZW5zdGFjay5oYml0LnN6dGFraS5odTANBgkqhkiG9w0BAQsFAAOCAQEAG65QxzPckZ3a1fQIgUZ92KCeprkaWYEidRpc8QvmosJsChsN6Vg/Do7ZE7RhAjf/5igAOWQUVZY/nyhpYKX0DWvPd9FxxwaThobMtniYw2g77tq+37Z3+UsdcFjPQhtrtjL06W5phs9kgql8mf5IipULrcbS+JFT17OFXod1TrajLByouBe3NRE5+7u1tfBiRJEymtdYd38ZARVNGCF1EL7nE9gAiKm11EVKNJgWl0ERtCtkzhJ7OB+irsja9G12gBPL2BFlW/+d7PgrpnZXrhvAagULQj6KPE/Ti8n+L8bv2SOVhQ4zdJmFwiFo0FCVY/qIKJUVQXnah9j9e/HCdA==</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>openstack.hbit.sztaki.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SLO/Redirect"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openstack.hbit.sztaki.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="hu">Sztaki HBIT OpenStack</md:ServiceName>
-      <md:ServiceName xml:lang="en">Sztaki HBIT OpenStack</md:ServiceName>
-      <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="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://sztaki.hu/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://sztaki.hu/?en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Héder Mihály</md:SurName>
-    <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Héder Mihály</md:SurName>
-    <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Héder Mihály</md:SurName>
-    <md:EmailAddress>mailto:mihaly.heder@sztaki.mta.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/openwiki.feide.no.xml b/swamid-interfederations-2.0/openwiki.feide.no.xml
deleted file mode 100644
index a188bc9c..00000000
--- a/swamid-interfederations-2.0/openwiki.feide.no.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://openwiki.feide.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.feide.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.feide.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">OpenWiki Administration</md:ServiceName>
-      <md:ServiceName xml:lang="no">OpenWiki Administrasjon</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">OpenWiki Administration is the administration interface where users create new openwikis.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/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 ce97a6fe..c02611a9 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,17 @@
 <?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:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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://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:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2011-08-09T09:18:14Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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: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 +21,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: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:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid: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.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: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/opn-shibb.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/opn-shibb.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 9987074d..00000000
--- a/swamid-interfederations-2.0/opn-shibb.hosted.exlibrisgroup.com-shib.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://opn-shibb.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "Primo Resource Discovery at Open University" Shibboleth SP for Ex Libris (UK) 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-12-16T12:23:01Z">
-      <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://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Open University - Primo Production</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the Open University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAN/TZ90ziE5NMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMTEwHhcNMTQxMTAzMDg1NDE2WhcNMjQxMDMxMDg1NDE2WjASMRAw
-						DgYDVQQDEwdhaW8wMDExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						nQx6etOky8LDPvPoToHiJSBUUbPpQxiLjqkEvq+FDfpM4PFPMUJ2TjBh80tv2cXj
-						XiWLfQkTWtLlf+abgvENsiGaHlK2AZ5b8t60q+42VKpU59G3wz8MusZ36HWrKVQC
-						Zu9tTjVv/0ghCHEkOQpqd67HTi9aAu0YnrKO55qky/e/cYi9um5DnjLlF+crQ4yr
-						gZM/8LQctNdhogyBcAt6xBg8Jr2XHW1xsfkSkDIoYZXayCvAvcc0Mo7NNH+N5BYp
-						27LP0y2iwzLJW8Qed08YvSmW1r958jSVgbytxciA7Lq2qkYqHijj3vgThN50btxY
-						mVKrJb2kJ3eC9mZKfZGZnwIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDExMB0G
-						A1UdDgQWBBRi4CFW+JRCErw9kobNaWoBKMNngzANBgkqhkiG9w0BAQUFAAOCAQEA
-						Yki1ymUQA9dc6srKtRlQ+ve4SKgz/P52iL9nr4AUWa4nhXKcbFpSs1NSni11Cmyj
-						W9d2eOoamn2xBVY1DhsuHD2AMHggzmC9/OJoALwpK8Elan/Ax5ixWcphvv7b0dMT
-						aQHbE5PSPEPEy9zVle7EXtDsViu1D++1VaX0lXwZpbwT6c3nEmrnVjJRs+VWElQk
-						/QU/IhyoAsyU3z5FdHN7/4vnuL1JjOoPmo+ZVGNBpGYhGKty8wxHB8/dh5GlnkkJ
-						3uWpg4tWuMrZ4NMjURafjthODllX0DUfx6IoE/jm5zrASucS3YGtZwLUCz6/Tls3
-						P6vTQuQBvTVROWTP/epCTQ==
-					</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://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://opn-shibb.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is Shibboleth SP for Primo Resource Discovery at Open University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/orcid.org-saml2-sp-1.xml b/swamid-interfederations-2.0/orcid.org-saml2-sp-1.xml
deleted file mode 100644
index d03e3ca9..00000000
--- a/swamid-interfederations-2.0/orcid.org-saml2-sp-1.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://orcid.org/saml2/sp/1">
-  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2016-02-01T09:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://orcid.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://orcid.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ORCID</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ORCID provides a persistent digital identifier that distinguishes you from every other researcher and, through integration in key research workflows such as manuscript and grant submission, supports automated linkages between you and your professional activities ensuring that your work is recognized.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://orcid.org/content/about-orcid</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://orcid.org/content/orcid-privacy-policy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>web-6.orcid.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=web-6.orcid.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC9DCCAdygAwIBAgIJAO0CR1JgdYxIMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3dlYi02Lm9yY2lkLm9yZzAeFw0xNTA5MDkxNzMwNTBaFw0yNTA5MDYxNzMw
-NTBaMBoxGDAWBgNVBAMTD3dlYi02Lm9yY2lkLm9yZzCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALHNI6am/ncDdsQcdraUa6C5MSTCJ+xEmJqIv+LOssnZ
-ZHJNHvdpHlD1KPWslSCCJmH8CE3A7N3S2LPRX1rQs7pmKfxygdJ4j+/O8P5WNNpd
-UcZCNoC/o7nGattIahP2zad44wXLXmcvmrVSAiZsVzualIQ+zh5VY8IxJ48uzpMt
-/eEyKyxoJvVnTHclnWFXHUFzEy8N6rU3JTuvK1VSulH6I5tLdZb+HX8qr31vHzi0
-JvckkpbANzs2wgUcmBNXiTv/icGPDHXBGveOFuCQu2dMnPCtpplTIDdO/Or287oC
-aYgElUTExKd5Z1wi/JDmcUldD/mrjs22bdZD/BR+uHMCAwEAAaM9MDswGgYDVR0R
-BBMwEYIPd2ViLTYub3JjaWQub3JnMB0GA1UdDgQWBBQXWfZ6tkdPhKDBmppgASS8
-aACIJzANBgkqhkiG9w0BAQUFAAOCAQEAjdAUB4vWPvpTOt9zHA3Zdghh6EGSTnnC
-RtXVvgnTgGEbyyuMcJNh/Pq6BrIJrdpJ8zCQJOBN48vT7hs+3fgpO9zQjCV9wu7T
-ehKHEjPg7mSDTVU+zT4xncoh2YJ+CwXE4PG8bPNnYgdG7PvHR5Ia5/2lMs9BwVFk
-klQkGM9mMIOLWJMv7P6FJmMWooa3gyOwgTxAnOlmxgWCzS+mgjDDtLnpQhbnX+T3
-te/OkSSYJpEuzeIrdfyHcsf9dHj+wE1MORUFfbx0FsGx2majBhOeRBSM5bjT1yQe
-2FMwFHw/KlhkjPs28rCyeaAccxJSX3SaEh/RQYZJA3QVBkWiqkc6JA==
-</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://orcid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://orcid.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://orcid.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://orcid.org/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://orcid.org/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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://orcid.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://orcid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://orcid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://orcid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">ORCID</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">ORCID provides a persistent digital identifier that distinguishes you from every other researcher and, through integration in key research workflows such as manuscript and grant submission, supports automated linkages between you and your professional activities ensuring that your work is recognized.</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"/>
-      <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="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="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">ORCID, Inc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ORCID</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://orcid.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ORCID Support</md:GivenName>
-    <md:EmailAddress>support@orcid.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>ORCID Team</md:GivenName>
-    <md:EmailAddress>info@orcid.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ORCID Development Team</md:GivenName>
-    <md:EmailAddress>support@orcid.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/osms.maps-ict.com.xml b/swamid-interfederations-2.0/osms.maps-ict.com.xml
deleted file mode 100644
index 20bf8cd0..00000000
--- a/swamid-interfederations-2.0/osms.maps-ict.com.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://osms.maps-ict.com">
-  <!--
-		This is a "Sherston Subscription Service" Shibboleth SP for Sherston Software 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="2013-12-02T15:37:46Z">
-      <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">Sherston Subscription Service</mdui:DisplayName>
-        <mdui:Logo height="170" width="289">https://osms.maps-ict.com/sherston_logo.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://osms.maps-ict.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://osms.maps-ict.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAJyVBMODdwzEMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD2lwLTEwLTMyLTE5LTEwNjAeFw0xMzExMjgxNjQ3NDZaFw0yMzExMjYxNjQ3
-						NDZaMBoxGDAWBgNVBAMTD2lwLTEwLTMyLTE5LTEwNjCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBANTrpuu5ybIeAyxaWJnZxMplwrKL/mgJny/7/nSMJwsg
-						FJ3StMih3uGlOcpjAryS1LgwRZf8P/Y9zsUkT6OSsytGhBbJr9z8H4bMK3ADfDAm
-						/kM1A1t57z4aw6d/N8MHsJxyXTjVq+9xx9fpDuq3G+ypWotiOhhZ5N8MbMH6WOwN
-						cPYZv5/kXhuLwJvGgEH8rNjzGI0eIeNJg2OMtuZ3PQG7l+Lzy2b0T4d9Zhg22vJt
-						5k2ErBjDWW5Q2sdAjYv64lZJMEiaWlXmxi9TU/N4TaABd8FUKOAOng109uAkoDKX
-						J8dUJJI7qxQsp4hMlPzk6VFutijpVdK/YFu3BEa2Ot0CAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPaXAtMTAtMzItMTktMTA2MB0GA1UdDgQWBBR2v7XhnQu0Ul9J+aahR2Zw
-						GvD2ajANBgkqhkiG9w0BAQUFAAOCAQEAW3w9Vga1Y1e+dGRpO91PdxEPfbb46/XK
-						U3G9ljGdtXj1cC+TRnzFWJefIafn29U2ZMDzeofZeohOxyJhPgqo5Slq7c8DOamm
-						Hk4NjPmAf5g8UkuROx6qIYBkj7nlJY89bGibNgAUS0k77W8+i9sDnEA7+GiXCLyS
-						xWZrqNLhfdUH4yPJ+++IRfG7Ov4gg6lLjpHtah6YXmB30VFQl8rDc2XHr/O/q64w
-						B3tRPkqeEqxBP0OMhXB4BU8EohPtO02B6PDd632lslHonLb/NXlmSzMAprmsxToO
-						LdmvhFHg3oy+klnOhP9enbBVBy75/UO4+mJ0gfHhoQjjKw4/CmdTWQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://osms.maps-ict.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://osms.maps-ict.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://osms.maps-ict.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://osms.maps-ict.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://osms.maps-ict.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://osms.maps-ict.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Sherston Software Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sherston Subscription Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tagassessment.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Declan</GivenName>
-    <SurName>Lynch</SurName>
-    <EmailAddress>mailto:declan.lynch@sherston.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Declan</GivenName>
-    <SurName>Lynch</SurName>
-    <EmailAddress>mailto:declan.lynch@sherston.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c24c7628..00000000
--- a/swamid-interfederations-2.0/ossdev.bsp.ox.ac.uk-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://ossdev.bsp.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth Oracle Student Systems Development Environment SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-26T09:16:33Z"/>
-  </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://ossdev.bsp.ox.ac.uk/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://ossdev.bsp.ox.ac.uk/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ossdev.bsp.ox.ac.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://ossdev.bsp.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEljCCA36gAwIBAgIJAL60sh6RnutVMA0GCSqGSIb3DQEBBQUAMIHLMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
-						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsMHkJ1c2luZXNz
-						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEcMBoGA1UEAwwTb3NzZGV2LmJzcC5veC5h
-						Yy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxpc3QuYWRtaW4ub3gu
-						YWMudWswHhcNMTIwNDIwMDgwNzEyWhcNMjIwNDE4MDgwNzEyWjCByzELMAkGA1UE
-						BhMCR0IxFDASBgNVBAgMC094Zm9yZHNoaXJlMQ8wDQYDVQQHDAZPeGZvcmQxHTAb
-						BgNVBAoMFFVuaXZlcnNpdHkgb2YgT3hmb3JkMScwJQYDVQQLDB5CdXNpbmVzcyBT
-						ZXJ2aWNlcyBhbmQgUHJvamVjdHMxHDAaBgNVBAMME29zc2Rldi5ic3Aub3guYWMu
-						dWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4rRdHCcVuu6oz7AM
-						wQfDCXAm+0yoSqVpTShs2+uW2wr6VxCzgmLlwONGazhA3jZR/0ojRQJT35j35RSk
-						pL6RE8Jy9zZXD/GQ7HR5H/LcIo3AXKv9FHhRVk5bIgcp6/rS/chlJQ3TKIE1RMHn
-						lMrKCv6WyYyKIe6qJJt4DN/rtNWaIZVkzjAZD+8QJOBEMJi7iWnctQ3EF9nzcuS1
-						RJBTc2aJhyShlHEEsBLV20id8pkxKNfbZeMSFaQw33UYdtJh2JPmLCfcciQZApIK
-						i5B8IhBVpn2qpelM5Pq5jl9QhfASM0+5xD9oWfM36fLfJXIBRjz9M5CWYw8FxEi4
-						AvVT3wIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUtZDn+cXPWWmCgDu2phPc
-						jplSjIQwHwYDVR0jBBgwFoAUtZDn+cXPWWmCgDu2phPcjplSjIQwDQYJKoZIhvcN
-						AQEFBQADggEBALFrP69gFcbGc90D0HJlwzjnRo5hVAcxxXN89gCRsEZkqQ3O+yWO
-						XWMW7XJB0ELH9pooNovUpumlgmW6iuzZI0BksQ/8mbIZGicrHDqnyGp0KQYHWmPl
-						8hesAETEYDNJ6cUT5FKxzMgydHP9fDB9w/GMLlxYtbslM2vj4M1eL6xVC2q1j944
-						lQOR5Bc2Iy/6Btvksi+ow/omQFSObI38xadNJ728KJeHBhVOZ8YhZuV6D1byjuNz
-						UmbxIdIWDNzlHZ0uKB8tDHzZ5YbPQEKEOWLwH1Bk6ws+sbt96iZaPFIQ62VZnYoY
-						YxU030ZIxuip1Y4fwxQO9oIOpSCiB+C0W+U=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossdev.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Oracle Student Systems Development Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stephan</GivenName>
-    <SurName>Eckweiler</SurName>
-    <EmailAddress>mailto:stephan.eckweiler@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.xml b/swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-shibboleth.xml
deleted file mode 100644
index afdb74cd..00000000
--- a/swamid-interfederations-2.0/ossqa.uas.ox.ac.uk-test-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://ossqa.uas.ox.ac.uk/test/shibboleth">
-  <!--
-		This is an OSS Internal QA System Shibboleth 2.1 SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://ossqa.uas.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFeTCCBGGgAwIBAgIJAJnksbFAueL/MA0GCSqGSIb3DQEBBQUAMIHKMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
-						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEbMBkGA1UEAxMSb3NzcWEudWFzLm94LmFj
-						LnVrMS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5veC5h
-						Yy51azAeFw0xMjAzMDUxMzI0MDdaFw0yMjAzMDMxMzI0MDdaMIHKMQswCQYDVQQG
-						EwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsG
-						A1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNl
-						cnZpY2VzIGFuZCBQcm9qZWN0czEbMBkGA1UEAxMSb3NzcWEudWFzLm94LmFjLnVr
-						MS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/+g95ivEoWaKPygo1o
-						GiDFprts8tNb/Lb9UmG/ykZaMY+yB+66NOg7aJDfsBCEzGCuuZuxeXNF6sUhUmVE
-						cvIIdP/hXzUEiCPz5LcfU2GrVTlfDn+njnIS+n19wgu/R0GZTbMk+4u4S7UxMq4z
-						JCYLajpfKTTSLAsTKRdy6LM68W+5MphvgLNWCkqgD+9L9zYtrcLrVqh+t1KVSZ+0
-						kpCTESGzWGCMh1t9BoLt49Im//01nSAu8XyuOrL2w3oxxSO5/k7YJi6RPJ8nEQWj
-						+nUaroumpaC1UBnbvF4UyB6X4ebjCNkdh+Tiubkys/DLMz7CmHCg2oTE/HqY2+UR
-						WYcCAwEAAaOCAV4wggFaMAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTOuAowx121jbiBBs1/
-						FqbE4pNPaDCB/wYDVR0jBIH3MIH0gBTOuAowx121jbiBBs1/FqbE4pNPaKGB0KSB
-						zTCByjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQH
-						EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMScwJQYDVQQL
-						Ex5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgUHJvamVjdHMxGzAZBgNVBAMTEm9zc3Fh
-						LnVhcy5veC5hYy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxpc3Qu
-						YWRtaW4ub3guYWMudWuCCQCZ5LGxQLni/zANBgkqhkiG9w0BAQUFAAOCAQEAEf7S
-						+TzVC8Zq65a1hcRCmXGHkBTOchnPlqFrm4lqJkjItX6B+wE985dy/DV4z+LoypFs
-						mOpJZI2A44jznpTZj0gV4r1xcjXnpS/JiQtRyQ64NDQwmIJTPU1+oyqYaMu0Nh27
-						FRvT9F/sixwPpax4OcyOXqIecawLTTcUf6KemTRmc0zFmSLgCBfXzO0UST7s4nIW
-						zLcEiFKmS/2I3iGPJa+BVROcRn0XdwOQsjD5sJpvnrOd5vnMFgv5Ib6P21hNJtXj
-						X09UugykpbT5QYHsHArFhfBRDDSVYroBYZTQHn+pGpHugLzrZv+R6eNNN3UErThn
-						7a/D/ZX8zHELsULLOw==
-					</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>
-						MIIFeTCCBGGgAwIBAgIJAJnksbFAueL/MA0GCSqGSIb3DQEBBQUAMIHKMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
-						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEbMBkGA1UEAxMSb3NzcWEudWFzLm94LmFj
-						LnVrMS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5veC5h
-						Yy51azAeFw0xMjAzMDUxMzI0MDdaFw0yMjAzMDMxMzI0MDdaMIHKMQswCQYDVQQG
-						EwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsG
-						A1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNl
-						cnZpY2VzIGFuZCBQcm9qZWN0czEbMBkGA1UEAxMSb3NzcWEudWFzLm94LmFjLnVr
-						MS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/+g95ivEoWaKPygo1o
-						GiDFprts8tNb/Lb9UmG/ykZaMY+yB+66NOg7aJDfsBCEzGCuuZuxeXNF6sUhUmVE
-						cvIIdP/hXzUEiCPz5LcfU2GrVTlfDn+njnIS+n19wgu/R0GZTbMk+4u4S7UxMq4z
-						JCYLajpfKTTSLAsTKRdy6LM68W+5MphvgLNWCkqgD+9L9zYtrcLrVqh+t1KVSZ+0
-						kpCTESGzWGCMh1t9BoLt49Im//01nSAu8XyuOrL2w3oxxSO5/k7YJi6RPJ8nEQWj
-						+nUaroumpaC1UBnbvF4UyB6X4ebjCNkdh+Tiubkys/DLMz7CmHCg2oTE/HqY2+UR
-						WYcCAwEAAaOCAV4wggFaMAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-						U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBTOuAowx121jbiBBs1/
-						FqbE4pNPaDCB/wYDVR0jBIH3MIH0gBTOuAowx121jbiBBs1/FqbE4pNPaKGB0KSB
-						zTCByjELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQH
-						EwZPeGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMScwJQYDVQQL
-						Ex5CdXNpbmVzcyBTZXJ2aWNlcyBhbmQgUHJvamVjdHMxGzAZBgNVBAMTEm9zc3Fh
-						LnVhcy5veC5hYy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxpc3Qu
-						YWRtaW4ub3guYWMudWuCCQCZ5LGxQLni/zANBgkqhkiG9w0BAQUFAAOCAQEAEf7S
-						+TzVC8Zq65a1hcRCmXGHkBTOchnPlqFrm4lqJkjItX6B+wE985dy/DV4z+LoypFs
-						mOpJZI2A44jznpTZj0gV4r1xcjXnpS/JiQtRyQ64NDQwmIJTPU1+oyqYaMu0Nh27
-						FRvT9F/sixwPpax4OcyOXqIecawLTTcUf6KemTRmc0zFmSLgCBfXzO0UST7s4nIW
-						zLcEiFKmS/2I3iGPJa+BVROcRn0XdwOQsjD5sJpvnrOd5vnMFgv5Ib6P21hNJtXj
-						X09UugykpbT5QYHsHArFhfBRDDSVYroBYZTQHn+pGpHugLzrZv+R6eNNN3UErThn
-						7a/D/ZX8zHELsULLOw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossqa.uas.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: OSS Internal QA System</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ops</GivenName>
-    <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Livings</SurName>
-    <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml b/swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-shibboleth.xml
deleted file mode 100644
index ab6c425a..00000000
--- a/swamid-interfederations-2.0/ossqareg.bsp.ox.ac.uk-test-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://ossqareg.bsp.ox.ac.uk/test/shibboleth">
-  <!--
-		This is a Shibboleth 2 SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAMKLTuIl8HViMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFW9zc3FhcmVnLmJzcC5veC5hYy51azAeFw0xMzA2MDMxODMzMDFaFw0zMzA1
-						MjkxODMzMDFaMCAxHjAcBgNVBAMTFW9zc3FhcmVnLmJzcC5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZr7IJhB64g62Jt+7EgvSh0L8V4
-						m/2FVHXVo/FJoCU5PVVVNtfuEAnO7f/FMuF34bTtHVzqu6mIqfJqEiO1tyRuiJsy
-						VjXxm9MWyq/UQPiEoyV8QJ/qpWGpNUPGzcn1Gw0oFN0lYrSIyepJiEAYiaMYR+rY
-						S2PMc+iU6KpqIhLvsyv7ccs738tzCxM+aSnAoQ+vVoig30PZ1HzGywOs0Pis682+
-						eeWGBpmvutNjLk2cotxbizRADWFr/yx+rZ4HMXGLI1Sc1EFC9x6WtySmuiM5k3+n
-						Vg4+4VBsUVISUjYgOVsRvYvdeJqzVoDm3nP4s4LEqoxYqulVNDUGKlieHekCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVb3NzcWFyZWcuYnNwLm94LmFjLnVrMB0GA1UdDgQW
-						BBR7YBp6Sgd3qSoeZUtIn4qB1FFc1DANBgkqhkiG9w0BAQUFAAOCAQEAj+SAqGCM
-						vuaZE0dqcay6x2xY0sbT+d8DWreTan79N+q8WanXqs+clmS/w6rVhdYxMffDNEQv
-						v7zq3OQpOS3ReIRjz5Dm/qFZjyCZE4L3LkYNC+9RUbMvApvzYTD5CPYznlAdyXA8
-						FG9ZWeeQI0pEHHHRykEmz12uK0/zO16v78VKuhP09My7mJ1mxWIr0fS9kgwP0X3m
-						MkwFVKoU+Yy9f858uV0KW21E0q5IeebnXIUe7laEFgq3ZNDaukZBuIVNy2bRGJjz
-						5ZuRYtdAggGQrbnCncfBTvRdkt5NW1P+dd8GrqAak6nyIRovFxZ6uoRPnfDeJnx5
-						RLm2YLdhtPjigw==
-					</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>
-						MIIDBjCCAe6gAwIBAgIJAMKLTuIl8HViMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFW9zc3FhcmVnLmJzcC5veC5hYy51azAeFw0xMzA2MDMxODMzMDFaFw0zMzA1
-						MjkxODMzMDFaMCAxHjAcBgNVBAMTFW9zc3FhcmVnLmJzcC5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZr7IJhB64g62Jt+7EgvSh0L8V4
-						m/2FVHXVo/FJoCU5PVVVNtfuEAnO7f/FMuF34bTtHVzqu6mIqfJqEiO1tyRuiJsy
-						VjXxm9MWyq/UQPiEoyV8QJ/qpWGpNUPGzcn1Gw0oFN0lYrSIyepJiEAYiaMYR+rY
-						S2PMc+iU6KpqIhLvsyv7ccs738tzCxM+aSnAoQ+vVoig30PZ1HzGywOs0Pis682+
-						eeWGBpmvutNjLk2cotxbizRADWFr/yx+rZ4HMXGLI1Sc1EFC9x6WtySmuiM5k3+n
-						Vg4+4VBsUVISUjYgOVsRvYvdeJqzVoDm3nP4s4LEqoxYqulVNDUGKlieHekCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVb3NzcWFyZWcuYnNwLm94LmFjLnVrMB0GA1UdDgQW
-						BBR7YBp6Sgd3qSoeZUtIn4qB1FFc1DANBgkqhkiG9w0BAQUFAAOCAQEAj+SAqGCM
-						vuaZE0dqcay6x2xY0sbT+d8DWreTan79N+q8WanXqs+clmS/w6rVhdYxMffDNEQv
-						v7zq3OQpOS3ReIRjz5Dm/qFZjyCZE4L3LkYNC+9RUbMvApvzYTD5CPYznlAdyXA8
-						FG9ZWeeQI0pEHHHRykEmz12uK0/zO16v78VKuhP09My7mJ1mxWIr0fS9kgwP0X3m
-						MkwFVKoU+Yy9f858uV0KW21E0q5IeebnXIUe7laEFgq3ZNDaukZBuIVNy2bRGJjz
-						5ZuRYtdAggGQrbnCncfBTvRdkt5NW1P+dd8GrqAak6nyIRovFxZ6uoRPnfDeJnx5
-						RLm2YLdhtPjigw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ossqareg.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Oracle Student Systems (OSS QA REG)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Help OSS single sign on</GivenName>
-    <EmailAddress>mailto:help_oss_single_sign_on@admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical OSS single sign on</GivenName>
-    <EmailAddress>mailto:technical_oss_single_sign_on@admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ota.oerc.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index fe527ffe..00000000
--- a/swamid-interfederations-2.0/ota.oerc.ox.ac.uk-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://ota.oerc.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "Oxford Text Archive" SP owned by the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://ota.oerc.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+jCCAeKgAwIBAgIJAKV6Q72EmGfrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEW90YS5vZXJjLm94LmFjLnVrMB4XDTEwMDgwMzEzNTQ0M1oXDTIwMDczMTEz
-						NTQ0M1owHDEaMBgGA1UEAxMRb3RhLm9lcmMub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCeu6epLyuqiwf12AcNx4/KDUyNqPv/JlTyMkDH
-						UTazP/OhS5CwI5dShCMCCT/1t+nurzNvwizpiQpl/aD3iavbv0cQi36m8rIgfFxB
-						5MPAYC6VYFrftNHCQsQ76mxSRh5oByG8K6LQZZx9AnyDiPIfwYtEuzrzcbYi9Q4j
-						jqJf/TTEkDep2i5UW3FTSL0ew4sPkddBqV+eX+htMM0yn0ktLo5vyv4A64UBC3Ej
-						65QAES0boFfzJ80avZpcbrLWs8jLgT8z+exuRmwZFjuVn/Nl7iqe/r0NTOSBW7jN
-						TCO4VGX/8wKeNHGMLlAZW/Zo7SRmocmMxcOumIBMEti09RP/AgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEW90YS5vZXJjLm94LmFjLnVrMB0GA1UdDgQWBBR0KpHgTKXM6MFj
-						NqnkzMyWPfdEvDANBgkqhkiG9w0BAQUFAAOCAQEAC6mZHBr0ba7FcLrDdQ+/i8+m
-						Yg7jLKYDI+fnVbd3PQyteeLpuup9s9UEAv7x55Hp9m6xhhlZe2dOjlhssfndpRqM
-						LhmIZ5TRLxUu5j4Jfgb4KjpPiFhWDGLmxfH6EfK1+XWGD7RlTn36npUhTIJM+9om
-						RvgpnK7C23YLJG2cq05ZKe+qvZf+eD1XJ9vSUg9Apu2TM5BDt3ujn80mrkApmFhr
-						jh2UK7AES6qP6jfUh5jo0xJVS6yYvoJqmk1dVDyaEKqltEQ7SbRPUZb7Yrsjt2Uy
-						y9r3YHinwQik+xzWbfy2QcrJg/kf7fPzmZpZciKgj6f/XMAkZc/kBnZ2BSOUTg==
-					</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+jCCAeKgAwIBAgIJAKV6Q72EmGfrMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEW90YS5vZXJjLm94LmFjLnVrMB4XDTEwMDgwMzEzNTQ0M1oXDTIwMDczMTEz
-						NTQ0M1owHDEaMBgGA1UEAxMRb3RhLm9lcmMub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCeu6epLyuqiwf12AcNx4/KDUyNqPv/JlTyMkDH
-						UTazP/OhS5CwI5dShCMCCT/1t+nurzNvwizpiQpl/aD3iavbv0cQi36m8rIgfFxB
-						5MPAYC6VYFrftNHCQsQ76mxSRh5oByG8K6LQZZx9AnyDiPIfwYtEuzrzcbYi9Q4j
-						jqJf/TTEkDep2i5UW3FTSL0ew4sPkddBqV+eX+htMM0yn0ktLo5vyv4A64UBC3Ej
-						65QAES0boFfzJ80avZpcbrLWs8jLgT8z+exuRmwZFjuVn/Nl7iqe/r0NTOSBW7jN
-						TCO4VGX/8wKeNHGMLlAZW/Zo7SRmocmMxcOumIBMEti09RP/AgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEW90YS5vZXJjLm94LmFjLnVrMB0GA1UdDgQWBBR0KpHgTKXM6MFj
-						NqnkzMyWPfdEvDANBgkqhkiG9w0BAQUFAAOCAQEAC6mZHBr0ba7FcLrDdQ+/i8+m
-						Yg7jLKYDI+fnVbd3PQyteeLpuup9s9UEAv7x55Hp9m6xhhlZe2dOjlhssfndpRqM
-						LhmIZ5TRLxUu5j4Jfgb4KjpPiFhWDGLmxfH6EfK1+XWGD7RlTn36npUhTIJM+9om
-						RvgpnK7C23YLJG2cq05ZKe+qvZf+eD1XJ9vSUg9Apu2TM5BDt3ujn80mrkApmFhr
-						jh2UK7AES6qP6jfUh5jo0xJVS6yYvoJqmk1dVDyaEKqltEQ7SbRPUZb7Yrsjt2Uy
-						y9r3YHinwQik+xzWbfy2QcrJg/kf7fPzmZpZciKgj6f/XMAkZc/kBnZ2BSOUTg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ota.oerc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Oxford Text Archive</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ota.oucs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Wynne</SurName>
-    <EmailAddress>mailto:martin.wynne@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Wynne</SurName>
-    <EmailAddress>mailto:martin.wynne@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ousu.org-shibboleth.xml b/swamid-interfederations-2.0/ousu.org-shibboleth.xml
deleted file mode 100644
index ecbcecc5..00000000
--- a/swamid-interfederations-2.0/ousu.org-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://ousu.org/shibboleth">
-  <!--
-		This is an "Oxford University Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-07T13:39:32Z"/>
-  </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://ousu.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://ousu.org/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ousu.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ousu.org/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ousu.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ousu.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ousu.org/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ousu.org/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ousu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ousu.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ousu.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ousu.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ousu.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oxford University Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ousu.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ow.feide.no.xml b/swamid-interfederations-2.0/ow.feide.no.xml
deleted file mode 100644
index 0ea833ba..00000000
--- a/swamid-interfederations-2.0/ow.feide.no.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ow.feide.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICYTCCAcoCCQD7k9m8pOWTATANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxEjAQBgNVBAsTCUZlaWRlIFJuRDEYMBYGA1UEAxMPZm9vZGxlLmZlaWRlLm5vMB4XDTA4MDUyODE0MTMzMFoXDTA4MDcyNzE0MTMzMFowdTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRAwDgYDVQQKEwdVTklORVRUMRIwEAYDVQQLEwlGZWlkZSBSbkQxGDAWBgNVBAMTD2Zvb2RsZS5mZWlkZS5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAslppSJXg7lGMBf/dqbVb5uMpVpuNG3dyzzF23ed2S1eArCoBGzR4BOyM90sNoYDzXqX/DGp/NQg2gnR52bFksLBNypk6ScJIP+OGMlvaP1B5dWtZFcmpRcVnQnv/u94jQvMgrqwMuooivmzdPrAwiX1XqmlDLgUGtev1D8HmkyUCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBT+vbShOJxcoNQdpdPuojZmEa+4fR91yxkPR0laTnp+WPBUBjRV9BUxLYG7vYUSwns6Py113NNnCE6IfAHSgPz8vj9K9ea50VaycMo/LP+GGfWTU9vccppUK4yCwPC1vlC3yHP7a3v+dsmj2GkhbsfVbgs8CfzbfNrxNaA7HZP5A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICYTCCAcoCCQD7k9m8pOWTATANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxEjAQBgNVBAsTCUZlaWRlIFJuRDEYMBYGA1UEAxMPZm9vZGxlLmZlaWRlLm5vMB4XDTA4MDUyODE0MTMzMFoXDTA4MDcyNzE0MTMzMFowdTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRAwDgYDVQQKEwdVTklORVRUMRIwEAYDVQQLEwlGZWlkZSBSbkQxGDAWBgNVBAMTD2Zvb2RsZS5mZWlkZS5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAslppSJXg7lGMBf/dqbVb5uMpVpuNG3dyzzF23ed2S1eArCoBGzR4BOyM90sNoYDzXqX/DGp/NQg2gnR52bFksLBNypk6ScJIP+OGMlvaP1B5dWtZFcmpRcVnQnv/u94jQvMgrqwMuooivmzdPrAwiX1XqmlDLgUGtev1D8HmkyUCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBT+vbShOJxcoNQdpdPuojZmEa+4fR91yxkPR0laTnp+WPBUBjRV9BUxLYG7vYUSwns6Py113NNnCE6IfAHSgPz8vj9K9ea50VaycMo/LP+GGfWTU9vccppUK4yCwPC1vlC3yHP7a3v+dsmj2GkhbsfVbgs8CfzbfNrxNaA7HZP5A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ow.feide.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ow.feide.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">OpenWiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">OpenWiki is a wiki farm solution where everyone can create their own wikis and setup access control.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml b/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
deleted file mode 100644
index 8e4b52e7..00000000
--- a/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>
-    <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/sp-group/aa.cesnet.cz</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 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>MIIC8jCCAdoCCQDhANKgo6HWgzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owHhcNMTUwMTI1MTQxNzE4WhcNMzUwMTI1MTQxNzE4WjA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcQUxW1Zi6objf1qJixZpDJJxuprjnUXoKQlRbLj8XxFK9jIdQv1M+Sxto3RbH4opZWpxpiM0xfJqP8y5V0N/w6h7/81p9B4r/c302Zh3z8UV4IoPUGb/+IBMinufM3qtqk5+5/Fdz+mzCoIi7adGsLFPEwiuY48mOnCsHNjvirQcE/JVwZsJoBiTJiplYe3XsPiUAFOgcyZ5DCu2LEbttBqHgdpSESyweNlWTpHhDmkxSyRlxOb1jdEyvnKdMXgZEo7OfX7O5SPe9AlvV5T3PMMsrlP34rJmQ3+2wrLr7bbh6CEGuqGxW2rhEMV3XK7HHiZX+PHPPQmeaz8nIeKPfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJGaqabntG6EQW2wZJCCEB7nXmFJbMActIhJoTgWYlp75E781jSs+qhQ40NjO+kfJ3YIf+4JKMSo3EAAY0UFrZ/JFaK2dHehx9dn6Y697yKg7fPITMI9eo3ehXBe+gpoAvF0iPD2XfpgwQn6ASMHOQdKA3LC5qhwJ6wPYwF4THKqDrGveE5BF83FSLL6w4veMuyNzfhpQ7cBZEUkEShPkfAu7B88TNz0FWE5LBsnjBEn1bWeC4QTubRFJSSIt60klOvHcToniY0qRpQAVaIQtiNNNjanNv365lXICzlcTdN/lVWawZw1MGCdjqzlrMgL9wCKb+9nQFz+yW23eJDxptU=</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>MIIC8jCCAdoCCQDhANKgo6HWgzANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owHhcNMTUwMTI1MTQxNzE4WhcNMzUwMTI1MTQxNzE4WjA7MQswCQYDVQQGEwJDWjEPMA0GA1UEChMGQ2VzbmV0MRswGQYDVQQDExJvd25jbG91ZC5jZXNuZXQuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcQUxW1Zi6objf1qJixZpDJJxuprjnUXoKQlRbLj8XxFK9jIdQv1M+Sxto3RbH4opZWpxpiM0xfJqP8y5V0N/w6h7/81p9B4r/c302Zh3z8UV4IoPUGb/+IBMinufM3qtqk5+5/Fdz+mzCoIi7adGsLFPEwiuY48mOnCsHNjvirQcE/JVwZsJoBiTJiplYe3XsPiUAFOgcyZ5DCu2LEbttBqHgdpSESyweNlWTpHhDmkxSyRlxOb1jdEyvnKdMXgZEo7OfX7O5SPe9AlvV5T3PMMsrlP34rJmQ3+2wrLr7bbh6CEGuqGxW2rhEMV3XK7HHiZX+PHPPQmeaz8nIeKPfAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAJGaqabntG6EQW2wZJCCEB7nXmFJbMActIhJoTgWYlp75E781jSs+qhQ40NjO+kfJ3YIf+4JKMSo3EAAY0UFrZ/JFaK2dHehx9dn6Y697yKg7fPITMI9eo3ehXBe+gpoAvF0iPD2XfpgwQn6ASMHOQdKA3LC5qhwJ6wPYwF4THKqDrGveE5BF83FSLL6w4veMuyNzfhpQ7cBZEUkEShPkfAu7B88TNz0FWE5LBsnjBEn1bWeC4QTubRFJSSIt60klOvHcToniY0qRpQAVaIQtiNNNjanNv365lXICzlcTdN/lVWawZw1MGCdjqzlrMgL9wCKb+9nQFz+yW23eJDxptU=</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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud4elixir.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="4"/>
-    <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="5"/>
-    <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="6"/>
-    <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="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud4elixir.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="11"/>
-  </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/owncloud.gwdg.de-shibboleth.xml b/swamid-interfederations-2.0/owncloud.gwdg.de-shibboleth.xml
deleted file mode 100644
index ece4af53..00000000
--- a/swamid-interfederations-2.0/owncloud.gwdg.de-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://owncloud.gwdg.de/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-07-23T08:14:22Z">
-      <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>
-  </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="de">GWDG ownCloud</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">GWDG ownCloud</mdui:DisplayName>
-        <mdui:Description xml:lang="de">GWDG ownCloud ist ein Dienst für das Verteilen und Synchronisieren von Dateien</mdui:Description>
-        <mdui:Description xml:lang="en">GWDG ownCloud is a service for synchronizing and sharing data.</mdui:Description>
-        <mdui:Logo height="34" width="86">https://owncloud.gwdg.de/themes/gwdg/core/img/logo-icon.png</mdui:Logo>
-        <mdui:Logo height="121" width="250">https://owncloud.gwdg.de/themes/gwdg/core/img/logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://www.gwdg.de/storage-services/gwdg-owncloud</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.gwdg.de/en/storage-services/gwdg-owncloud</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">https://owncloud.gwdg.de/coc.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://owncloud.gwdg.de/coc.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>owncloud.gwdg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=owncloud.gwdg.de,O=Gesellschaft fuer wissenschaftliche Datenverarbeitung,L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGBTCCBO2gAwIBAgIHGZYpoiZt7zANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTUwNjA5MDkw
-NDE4WhcNMTgwOTA1MDkwNDE4WjCBlTELMAkGA1UEBhMCREUxFjAUBgNVBAgMDU5J
-RURFUlNBQ0hTRU4xEzARBgNVBAcMCkdPRVRUSU5HRU4xPjA8BgNVBAoMNUdlc2Vs
-bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
-MRkwFwYDVQQDDBBvd25jbG91ZC5nd2RnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA2ntP3N8gXUfwCL/A70QAl7kMBYOvdLZBkom1SyqjQTrj+DPw
-HDRwWULQwGsOpYbXmTK2PQwhbv8NKWs12pt/lGq8M++FlbNtvAEV3TYeI6ZlmyeF
-u4G3QUq32SE4Ugp2lsabYR6EOESmFTdlRRdTyEoQf/+Qwc/NUbvBeP4K6akQb2Ob
-ZmC8F7APt0ygVObYy8CGM7ylPBOJqWf+kEMQnDfE6fr/HrnLdu/hIdaRcLXEP56b
-agiKxGEBKE2Fc1E7H0UI+/e72FUKgbc+ysYmDL8oT80x7AjlajYY+wVgcpRcW4cM
-0e3GbcknK16YYmY8q3CdVtj3/4Y8meu44WMXpwIDAQABo4ICMDCCAiwwTwYDVR0g
-BEgwRjARBg8rBgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsG
-AQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTsl11h
-9jKQ+wdpd3WSjfDmtciJ1DAfBgNVHSMEGDAWgBSm5P+Y/eVJMn5cdfIWok2MdDXe
-IjAbBgNVHREEFDASghBvd25jbG91ZC5nd2RnLmRlMHkGA1UdHwRyMHAwNqA0oDKG
-MGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIHJBggrBgEFBQcBAQSBvDCBuTAzBggrBgEFBQcwAYYnaHR0cDov
-L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEAGCCsGAQUFBzAChjRo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2d3ZGctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA96xKnKFT2
-NSmczKpZGmNZW572lpvkwYWGfA0IV8AtJdORaOI+KS7PhzWhON5UyP2w0xZh3si7
-G2f1ScagLmX1Qei9mYQ3h8VGJ6hATKmwccCaz+CzN1bMrGqtThDOpjnri6nOr41/
-Iw+KpUgPO+Lb+dzFTMfZ2+SqZ2PEAfLvJx8guNAy7Brf5VgdSJ31a9JysnUqZEFl
-sX53TC6M6wRu6yWfA4TDxy1hQcAfLZ2wPZqE+ymMpFd/uLFvK0gdSYFWr9A2+Nnx
-Rb/ka7SePtjY0euaMALaPR9W7IjIuhMt94Z9HqdfqXIeT2YYW1AA5PEdMJKAi5Sc
-OaPal0OnuJy7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.gwdg.de/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud.gwdg.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">GWDG ownCloud</md:ServiceName>
-      <md:ServiceName xml:lang="en">GWDG ownCloud</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">GWDG ownCloud ist ein Dienst für das Verteilen und Synchronisieren von Dateien</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">GWDG ownCloud is a service for synchronizing and sharing data.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ralph</md:GivenName>
-    <md:SurName>Krimmel</md:SurName>
-    <md:EmailAddress>mailto:ralph.krimmel@gwdg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Daniel</md:GivenName>
-    <md:SurName>Adler</md:SurName>
-    <md:EmailAddress>mailto:dadler1@gwdg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Daniel</md:GivenName>
-    <md:SurName>Adler</md:SurName>
-    <md:EmailAddress>mailto:dadler1@gwdg.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml b/swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml
deleted file mode 100644
index cfae5fe0..00000000
--- a/swamid-interfederations-2.0/oxford-stg.saasiteu.com-.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxford-stg.saasiteu.com/">
-  <!--
-		This is a "SaaSit Staging" FrontRange SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-01T12:23:26Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
-						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
-						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
-						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
-						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
-						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
-						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
-						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
-						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
-						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
-						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
-						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
-						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
-						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
-						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
-						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
-						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
-						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
-						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
-						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
-						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
-						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
-						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
-						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
-						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
-						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
-						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
-						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
-						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
-					</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>
-						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
-						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
-						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
-						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
-						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
-						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
-						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
-						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
-						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
-						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
-						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
-						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
-						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
-						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
-						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
-						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
-						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
-						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
-						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
-						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
-						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
-						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
-						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
-						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
-						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
-						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
-						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
-						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
-						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <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://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx?binding=urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-stg.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx" index="3" isDefault="false"/>
-    <AttributeConsumingService index="1" isDefault="false">
-      <ServiceName xml:lang="en">FRS</ServiceName>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SaaSit Staging for the University of Oxford</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://oxford-stg.saasiteu.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Cloud Service Management</GivenName>
-    <EmailAddress>mailto:CloudServiceManagement.Support@frontrange.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SaaS NOC</GivenName>
-    <EmailAddress>mailto:SaaS.NOC@frontrange.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml b/swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml
deleted file mode 100644
index 1ad70852..00000000
--- a/swamid-interfederations-2.0/oxford-uat.saasiteu.com-.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxford-uat.saasiteu.com/">
-  <!--
-		This is a "SaaSit UAT" FrontRange SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-05T13:57:22Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
-						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
-						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
-						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
-						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
-						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
-						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
-						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
-						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
-						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
-						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
-						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
-						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
-						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
-						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
-						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
-						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
-						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
-						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
-						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
-						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
-						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
-						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
-						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
-						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
-						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
-						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
-						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
-						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
-					</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>
-						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
-						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
-						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
-						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
-						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
-						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
-						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
-						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
-						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
-						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
-						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
-						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
-						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
-						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
-						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
-						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
-						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
-						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
-						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
-						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
-						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
-						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
-						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
-						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
-						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
-						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
-						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
-						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
-						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <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://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx?binding=urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford-uat.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx" index="3" isDefault="false"/>
-    <AttributeConsumingService index="1" isDefault="false">
-      <ServiceName xml:lang="en">FRS</ServiceName>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SaaSit UAT for the University of Oxford</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://oxford-uat.saasiteu.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Cloud Service Management</GivenName>
-    <EmailAddress>mailto:CloudServiceManagement.Support@frontrange.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SaaS NOC</GivenName>
-    <EmailAddress>mailto:SaaS.NOC@frontrange.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.xml b/swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.xml
deleted file mode 100644
index 8c98ff04..00000000
--- a/swamid-interfederations-2.0/oxford.corefacilities.org-account-saml-oxford.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://oxford.corefacilities.org/account/saml/oxford">
-  <!--
-		This is an "iLab Solutions" iLabSolutions Portal SP for iLab Solutions, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-12T15:11:21Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDezCCAmOgAwIBAgIJAJ2ckmy8lsPeMA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNV
-						BAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMQ8wDQYDVQQHDAZCb3N0b24x
-						HDAaBgNVBAoME2lMYWIgU29sdXRpb25zLCBMTEMwHhcNMTMxMjExMTUyNTA3WhcN
-						MjQxMjExMTUyNTA3WjBUMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
-						ZXR0czEPMA0GA1UEBwwGQm9zdG9uMRwwGgYDVQQKDBNpTGFiIFNvbHV0aW9ucywg
-						TExDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2VPbpu2uPVmE3NDD
-						E+aGuO9Zf2eLz+61ubkjuwz6ipY01oHliSId5iETSwGT3r1gJvTnpP3ndGMFq8X0
-						4xcsNb2cU2ZxCZ4+GE9XFriD2eskrfCuuBX6bKeW/yYeMNVoSBF/2YeEC+5kZ+2y
-						B7neQsUFKpB2J4kO7TlFKDAa0aj+ani0TOWdjejcYrZWNfR74Bft3IOFWxvapYvZ
-						9k6LMU/VouCVM8TqfmmTkwHemaB2bdk5rgaZpV3UgsiO5yXS9CDLlrijQSb95I1l
-						QZ2hMtbDu70xKoVOAbMhYcuVZppOObeketCXOoN4MIWEn/dYPhwHsWnGR9sOZhaB
-						9PVJzwIDAQABo1AwTjAdBgNVHQ4EFgQUfo3FkNz5UDtfW6QR5ostJDL7z1owHwYD
-						VR0jBBgwFoAUfo3FkNz5UDtfW6QR5ostJDL7z1owDAYDVR0TBAUwAwEB/zANBgkq
-						hkiG9w0BAQUFAAOCAQEAF4BJ6QX/Y6WV0rMGZYmydg/vE8SgtVB++/rGMfohXW6P
-						s/NEKrzOdIt/Nhannnn77RrjujDLkz5wp3u5zabjffHk/bPqP9yucOBMlIdyggKA
-						SQhzrFygr1kgA2JmUYrmrlKPSSrjfTGJj33qgbo23hzioLULaFFSbvEcZdP8x5lG
-						x8UndDxLcOxRMdxGTdMTu4q/TMnJlugnOe5YmIhg9jbYMwwm8JYVJ86llO5piiUv
-						YVcHQX0UCb4Iw4FoEKIzAsQW2aIQnE39DD7410/7YUzwCGVn6F6TGQuglZjGrTWe
-						ITzWFNwFKHtFqy1whxR7MarmC24an1bJCi/yQDHxDQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford.corefacilities.org/account/saml/oxford" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">iLab Solutions, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">iLab Solutions</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ilabsolutions.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@ilabsolutions.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>ID Integration support</GivenName>
-    <EmailAddress>mailto:integrations_id@ilabsolutions.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxford.saasiteu.com-.xml b/swamid-interfederations-2.0/oxford.saasiteu.com-.xml
deleted file mode 100644
index 078a5ae8..00000000
--- a/swamid-interfederations-2.0/oxford.saasiteu.com-.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://oxford.saasiteu.com/">
-  <!--
-		This is a "SaaSit Production" FrontRange SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-05T14:04:54Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
-						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
-						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
-						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
-						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
-						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
-						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
-						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
-						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
-						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
-						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
-						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
-						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
-						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
-						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
-						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
-						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
-						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
-						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
-						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
-						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
-						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
-						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
-						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
-						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
-						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
-						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
-						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
-						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
-					</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>
-						MIIF6zCCBNOgAwIBAgIQTMrZY4HLv6If0kn7sdkURTANBgkqhkiG9w0BAQUFADCB
-						iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-						BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTE0
-						MDMyNDAwMDAwMFoXDTE5MDMyMzIzNTk1OVowggEDMQswCQYDVQQGEwJVUzEOMAwG
-						A1UEERMFODA5MjAxCzAJBgNVBAgTAkNPMRkwFwYDVQQHExBDb2xvcmFkbyBTcHJp
-						bmdzMSAwHgYDVQQJExcxMTUwIEtlbGx5IEpvaG5zb24gYmx2ZDEiMCAGA1UEChMZ
-						RnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLjE/MD0GA1UECxM2SXNzdWVkIHRocm91
-						Z2ggRnJvbnRSYW5nZSBTb2x1dGlvbnMgSW5jLiBFLVBLSSBNYW5hZ2VyMRwwGgYD
-						VQQLExNQcmVtaXVtU1NMIFdpbGRjYXJkMRcwFQYDVQQDFA4qLnNhYXNpdGV1LmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMqmDadXFC+xNSlKhAmf
-						GJjNqhgNZffzlAaLEMak9vOPMfY438Ki14wyGG0DYbI7SChnrF5EAq2dS7CbjY4T
-						ztxGTEYmH+HyQ3TKujgapB0uB+7Z15ATQvImmOIxUPKL8fa3KbPpco/prDq06az6
-						qJxiDVm0NyD0uEZEJ+XFvTl7Qyc8A8Lh2ytmITUM1RC5cEd/EvUflsb4RyD3g0dG
-						m5VqKCDQ7212NWScClEVDJDPnqhw+Q4irnva4SlIa8d9bzCJr2fCVpHc0ChYVoYA
-						CH6DgBTzi46yH32XAbKf2g2NBCeXQIFh2KXtq+E42gxyJf9vfO2S+/QLoQcFYIkN
-						m8ECAwEAAaOCAdAwggHMMB8GA1UdIwQYMBaAFD/VtdDWRHlQShejm4xK3LiwImRr
-						MB0GA1UdDgQWBBRTpQYtFPBjg+wTb1IYFqOTBCcRaTAOBgNVHQ8BAf8EBAMCBaAw
-						DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYD
-						VR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9z
-						ZWN1cmUuY29tb2RvLmNvbS9DUFMwCAYGZ4EMAQICME8GA1UdHwRIMEYwRKBCoECG
-						Pmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2Vj
-						dXJlU2VydmVyQ0EuY3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0
-						dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJl
-						U2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5j
-						b20wJwYDVR0RBCAwHoIOKi5zYWFzaXRldS5jb22CDHNhYXNpdGV1LmNvbTANBgkq
-						hkiG9w0BAQUFAAOCAQEACmIYv4ag505ctEd7g79mGHkJ6DghdTe4dXry1m+mVLzj
-						82GbDzoelW2pI+cxxwSKVHpJW592evX/1BtCZ8T6n8AfcEp73ihD5YLmzUACyz6t
-						LASU4VNe7Cm6au38ssI7zIMrZHEbewg8xcH2GP0viX8Y2wqoVGLLxClv3ThRdAfJ
-						QBtw2i7jz2oYbeP76cWsbLq1ecH4EARtXgaY+8e6fQn1dP1hBrWi1BYwh4p6yKcW
-						Ei6UKxQQJS1vIrSa3Vo8ctIROuUkg2f+hfI24t0uNIydHX5dGhLxm4AD4sKEJlA7
-						sNVWD7tuxpbEzqOVkSliycFw67vK+hPRED6IXX6d7A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx"/>
-    <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://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx?binding=urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxford.saasiteu.com/handlers/sso/SamlAssertionConsumerHandler.ashx" index="3" isDefault="false"/>
-    <AttributeConsumingService index="1" isDefault="false">
-      <ServiceName xml:lang="en">FRS</ServiceName>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SaaSit Production for the University of Oxford</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://oxford.saasiteu.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Cloud Service Management</GivenName>
-    <EmailAddress>mailto:CloudServiceManagement.Support@frontrange.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SaaS NOC</GivenName>
-    <EmailAddress>mailto:SaaS.NOC@frontrange.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index 800ced5d..00000000
--- a/swamid-interfederations-2.0/oxfordbrookes.idm.oclc.org-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://oxfordbrookes.idm.oclc.org/shibboleth">
-  <!--
-		This is an "Oxford Brookes University Hosted" EZproxy SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-15T15:57:54Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEIDCCAwigAwIBAgIBAjANBgkqhkiG9w0BAQUFADBtMSUwIwYDVQQDFBwqLm94
-						Zm9yZGJyb29rZXMuaWRtLm9jbGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChME
-						T0NMQzEoMCYGCSqGSIb3DQEJARYZamFtZXMuaHV0Y2hpbnNvbkBvY2xjLm9yZzAe
-						Fw0xMzA3MTIxNjAzMjRaFw0yMzA3MTIxNjAzMjRaMG0xJTAjBgNVBAMUHCoub3hm
-						b3JkYnJvb2tlcy5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRP
-						Q0xDMSgwJgYJKoZIhvcNAQkBFhlqYW1lcy5odXRjaGluc29uQG9jbGMub3JnMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr98hUqEihQmuIR7RB4Y0re+Z
-						IJfBuWjAwmklHjbQ107kHndb4WfbCcDCrUDZ01RoPPkGwHajnpg2K5pXY6bg+Ljf
-						Q9QjnVvnLnVv5nICmNy6K3t1DsQ0v+eK0+CrEpvUGjdhfBD2z6FOJpjcKdhZXvAH
-						s2DWovpT/eoje9C5lZ+Ur22hHj+Sit5GiAWjPsE84Tdmzwp3OIcAXga/Pq0ClnNk
-						djFeZNIwaspWxik0s/hHaPUmBBm1HYqLcPXo4JjV3jLPdgH4ZlQZHx/XGIh8lUio
-						3S7ZV9rvguSAQwXCkrgChCt0TnuDik99upgOFr0FlUR2AvKazaQ2vXtbMdZ6yQID
-						AQABo4HKMIHHMB0GA1UdDgQWBBQl//EPgt0B3DrTbBuX38VSyb/r7TCBlwYDVR0j
-						BIGPMIGMgBQl//EPgt0B3DrTbBuX38VSyb/r7aFxpG8wbTElMCMGA1UEAxQcKi5v
-						eGZvcmRicm9va2VzLmlkbS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoT
-						BE9DTEMxKDAmBgkqhkiG9w0BCQEWGWphbWVzLmh1dGNoaW5zb25Ab2NsYy5vcmeC
-						AQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAa2zH9XCznFPWbsSL
-						Y2Hhaw/Xm97dFWsIIFFbRFZYl1AynVS4b5q3v5ZCzwKfKDqclhZm13E7PJufvBfV
-						rgs3zZBkoVTyUIc7KV6bk2qIR3IjB4ITG1BBn8a54b+AjjXqty1HWBBZ+UZ/r+38
-						YPLmj20+F/PjJ+4ODI6YM+Rp9Ct7si1ahxtUn+4Yl+lr6Z7bJRLUuUbBk/M3q6UK
-						ci+Pgp7VeTDMUoK9qC84LxTPeNIOYJN5nbf5u3VU8KvrglIDqRWmGz2nRAtcWhaY
-						tJol7RM0jtXXFrnpQdLWdsPTV6GFZcUmaTv0sY8m7BY5VGz8mhXAEc9lOuWGbNvy
-						GoyFwA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.oxfordbrookes.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.oxfordbrookes.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.oxfordbrookes.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.oxfordbrookes.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oxford Brookes University online resources</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxfordideas.wazoku.com-.xml b/swamid-interfederations-2.0/oxfordideas.wazoku.com-.xml
deleted file mode 100644
index 9a2d549b..00000000
--- a/swamid-interfederations-2.0/oxfordideas.wazoku.com-.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://oxfordideas.wazoku.com/">
-  <!--
-		This is an "oxfordideas.wazoku.com" Idea Spotlight SP for Wazoku Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-12T10:20:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDnzCCAoegAwIBAgIJALt69IM1gEANMA0GCSqGSIb3DQEBCwUAMGYxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UE
-						CgwGV2F6b2t1MQswCQYDVQQLDAJJVDEXMBUGA1UEAwwOd3d3Lndhem9rdS5jb20w
-						HhcNMTUwODA2MTIwNjUzWhcNMjUwODA1MTIwNjUzWjBmMQswCQYDVQQGEwJHQjEP
-						MA0GA1UECAwGTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBldhem9r
-						dTELMAkGA1UECwwCSVQxFzAVBgNVBAMMDnd3dy53YXpva3UuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzpKv/aasbpuVuiPoocArUaVYQNS/RQ6x
-						nS0hZC+nU5NqgvboG9LgUApbCW8DvKltNuErzPeDjxxO98zvkojmv4QgFXl37E4d
-						KwW8kbGgEBH2/8cvT0+9A45EP1On9CGizVVmJ46Lg0ObAjG5CRT9LYYqQ7nwK4I2
-						ylfFXGU17SztVmxXzp5DjMtOyCUxGlryD05+FvOzEj6Rxx5w4UX+Ceh7a5qncZSM
-						FXT8wo+Gxa8pci9C66dVaJXQ2rKSMZj6ndu23XWhIWQksDr72T8HbYJdlgOVBC0w
-						9f8JhTdlGoXctCw0PGQdubl80Qlib7tix0IACYfGh77C0BMgshilZQIDAQABo1Aw
-						TjAdBgNVHQ4EFgQUX8mH3Mqq7NCqICtqTdgQErAMPM0wHwYDVR0jBBgwFoAUX8mH
-						3Mqq7NCqICtqTdgQErAMPM0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
-						AQEAe8old/r6SZ3ua3pdMWOrUOEZuH8iiiZjpjD8ENKu+/vMa5HIzMJ5ecMyxwda
-						2MNhR627By5AhxuhJ2oC7/Ndgio1as1Lx8A/aj0VcvYFpa7c4BIfKWGRfWvxfn8d
-						RsaDNa+fLEgtp5Dn8AFM6eCzq+rciawuCUIovoD/8gOqiPQw/EYghj4zZPaPMrVd
-						/jdFEO51B0lVTLmVug0m9I2x53xNbCndVRQR3svm84xEZ93qcoq0nglrbavkpvK2
-						b4HAD/AIOYY597wwV/+3Jt5yTzHMrVoDiJiGGfqKXoWdLU2HQvcKN4NmsK5Ow92P
-						GmO3ftyUNMBb/z18IS+jWiKzMQ==
-					</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>
-						MIIDnzCCAoegAwIBAgIJALt69IM1gEANMA0GCSqGSIb3DQEBCwUAMGYxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UE
-						CgwGV2F6b2t1MQswCQYDVQQLDAJJVDEXMBUGA1UEAwwOd3d3Lndhem9rdS5jb20w
-						HhcNMTUwODA2MTIwNjUzWhcNMjUwODA1MTIwNjUzWjBmMQswCQYDVQQGEwJHQjEP
-						MA0GA1UECAwGTG9uZG9uMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBldhem9r
-						dTELMAkGA1UECwwCSVQxFzAVBgNVBAMMDnd3dy53YXpva3UuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzpKv/aasbpuVuiPoocArUaVYQNS/RQ6x
-						nS0hZC+nU5NqgvboG9LgUApbCW8DvKltNuErzPeDjxxO98zvkojmv4QgFXl37E4d
-						KwW8kbGgEBH2/8cvT0+9A45EP1On9CGizVVmJ46Lg0ObAjG5CRT9LYYqQ7nwK4I2
-						ylfFXGU17SztVmxXzp5DjMtOyCUxGlryD05+FvOzEj6Rxx5w4UX+Ceh7a5qncZSM
-						FXT8wo+Gxa8pci9C66dVaJXQ2rKSMZj6ndu23XWhIWQksDr72T8HbYJdlgOVBC0w
-						9f8JhTdlGoXctCw0PGQdubl80Qlib7tix0IACYfGh77C0BMgshilZQIDAQABo1Aw
-						TjAdBgNVHQ4EFgQUX8mH3Mqq7NCqICtqTdgQErAMPM0wHwYDVR0jBBgwFoAUX8mH
-						3Mqq7NCqICtqTdgQErAMPM0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
-						AQEAe8old/r6SZ3ua3pdMWOrUOEZuH8iiiZjpjD8ENKu+/vMa5HIzMJ5ecMyxwda
-						2MNhR627By5AhxuhJ2oC7/Ndgio1as1Lx8A/aj0VcvYFpa7c4BIfKWGRfWvxfn8d
-						RsaDNa+fLEgtp5Dn8AFM6eCzq+rciawuCUIovoD/8gOqiPQw/EYghj4zZPaPMrVd
-						/jdFEO51B0lVTLmVug0m9I2x53xNbCndVRQR3svm84xEZ93qcoq0nglrbavkpvK2
-						b4HAD/AIOYY597wwV/+3Jt5yTzHMrVoDiJiGGfqKXoWdLU2HQvcKN4NmsK5Ow92P
-						GmO3ftyUNMBb/z18IS+jWiKzMQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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://oxfordideas.wazoku.com/saml_ol/login" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en-GB">Wazoku Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en-GB">oxfordideas.wazoku.com</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wazoku.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nicola</GivenName>
-    <SurName>Darke</SurName>
-    <EmailAddress>mailto:nicola.darke@wazoku.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Bailey</SurName>
-    <EmailAddress>mailto:chris.bailey@wazoku.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5967cf40..00000000
--- a/swamid-interfederations-2.0/oxris.ox.ac.uk-shibboleth.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://oxris.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-05-24T09:03:32Z"/>
-  </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://oxris.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFDCCAfygAwIBAgIJANz9IQy8b9XUMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDm94cmlzLm94LmFjLnVrMB4XDTEzMDUyMzEzMDczMVoXDTM4MDUxNzEzMDcz
-						MVowGTEXMBUGA1UEAxMOb3hyaXMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDN6rRAxFlBqDGTExqMRUSaXGm1yq5hSiwSye0kEMaw78Mw
-						Q9bzvdiiFIqQYOzAmPTXjjTcFl49W/WsWGI0E3oupKEj6yvVve9GlHdS9ecsULw6
-						TSlglQfGdoa5OcIXPsPtB2CLlAYnodJ7efunK5eRxlEajioIr9Hw3HioMaCmrFBt
-						hskCpa0I7YDwhP2MhuEInmPajPKBy6JKhfFfmm3sVKmy42jFJ4ZzqgM/A+pQW8ep
-						iDMZlN6Bf4Uc8d8BqxaYjjHmM0r75yo16keF2rTbw13VzQqZWjFgxUCAvlQcu9IT
-						esF4JRBAM1yKw+jZu0rrE9ZhL6S4mLWJeR5mpST3AgMBAAGjXzBdMDwGA1UdEQQ1
-						MDOCDm94cmlzLm94LmFjLnVrhiFodHRwczovL294cmlzLm94LmFjLnVrL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFFVJkWxVEz06s2GjVAjMidooLybqMA0GCSqGSIb3DQEB
-						BQUAA4IBAQBtukSj8KhiZC8MvgG4nF05YlhbD/7lm9QDxmHakjwUA6WraBzZgvtf
-						sqlsQCvsOyRM+I4VB987Ib0vUzIgJ9dthq4gxLYJ0TudIDHotAVsiprgmpe1hCs7
-						cmD5/YwOukvE5rkxkTgHn9l7zd3ZHHmDMmIt/uN8CeKrmGSLuIxI0/N6GHHiZXXe
-						yowH/IAzH/mmfgXZoIopCvOTvbQAnaYP8THvMHnL2msQellt5QKsGxWVBT/mBXy7
-						F6nq62YvHGeR/gQ1pJn5GCiX9fCm9dtCRAW4mZGFoQVTTBi0u5wVGpbSVpf/ECNE
-						a211q7638e8Me8aRfDaUkXlVr7Xnqd5+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://oxris.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oxris.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Symplectic</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Malin</SurName>
-    <EmailAddress>mailto:ben.malin@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pa2836.peopleadmin.com-shibboleth.xml b/swamid-interfederations-2.0/pa2836.peopleadmin.com-shibboleth.xml
deleted file mode 100644
index e08e2f02..00000000
--- a/swamid-interfederations-2.0/pa2836.peopleadmin.com-shibboleth.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://pa2836.peopleadmin.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">PeopleAdmin 7 Baylor University</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC9DCCAdygAwIBAgIJAK9qYIpSXmuLMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3Blb3BsZWFkbWluLmNvbTAeFw0xMzA4MDYwNDExMjJaFw0yMzA4MDQwNDEx
-MjJaMBoxGDAWBgNVBAMTD3Blb3BsZWFkbWluLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAPNJA6keJeqd1d8rBtHYenYT+2Z5p14STKAMxI+OHzTF
-1ILCp/tXfaTeWggztaCCSGYFwSJkCaKeaLC4+easqoqS18zen4j6OEG6UWF5sUd7
-j6GumoZmFa4bYTcTpkdpa9ENG+0OKLRzWz/TTyzSdBhR3J1b1Vt+6fF/clKR1CWT
-pdHsRYwGCn9jBRN7gZkNEagh4hrjfpIMgfJ7K6FRiXb5yj5pEusFm9T9ZElMFat3
-py7PQEv9F78wKbgqqFSTnnE3rWRPy8+5tTa5kpNd6GlzqiwlhY/Yqbof1lgABcNP
-N+AX1ZRRybQheE/2e53y+5/J/F4aIUHx1WJaInD35zECAwEAAaM9MDswGgYDVR0R
-BBMwEYIPcGVvcGxlYWRtaW4uY29tMB0GA1UdDgQWBBRojmrNNN8S7AEfM20TF5MI
-RPnSnDANBgkqhkiG9w0BAQUFAAOCAQEA0yEXDmrQwS7s2gSMqMm7NXlMAAwzNDhI
-OujZiSHZ1KL71bKzKHQVz5oenjJwVem/gxo7GVsuIdIZ3vKe8PYsnLu1QDTp4ZHv
-mzgRlx4kuqGjwSNs2ub2NlVc9wy9uC0pjJL58RaOxPpHDddCAs+xINF2S1ZJEM2D
-XkMvb1xhaOLox1HGhENf99ka10jWMdMt2bj1lT8WM/Qg+XgOnoQvTyjOtELM/QuA
-OVuT1bTdGg4K398O7jlTzoo7LFhPBl99HDx3cDhhhX9NdWyFyQ32MhYa6361v+eG
-DvoszRsTTKZLYbNvWoo8BZMCxK5tQ6EqNyQTmekHxw+peNCaQ+nDKw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://baylor.peopleadmin.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://baylor-training.peopleadmin.com/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://baylor-sb.peopleadmin.com/Shibboleth.sso/SAML2/POST" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">PeopleAdmin, Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">PeopleAdmin, Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.peopleadmin.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Praveen Pinto</md:GivenName>
-    <md:EmailAddress>praveen.pinto@peopleadmin.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Amanda Merritt</md:GivenName>
-    <md:EmailAddress>amanda.merritt@peopleadmin.com</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 cb196c0b..00000000
--- a/swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://pan.unifei.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xKTAnBgNVBAoUIFVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIEl0YWp1YsOhMQwwCgYDVQQLEwNEU0kxIDAeBgkqhkiG
-9w0BCQEWEWRzaUB1bmlmZWkuZWR1LmJyMREwDwYDVQQHFAhJdGFqdWLDoTEVMBMG
-A1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRcGFuLnVu
-aWZlaS5lZHUuYnIwHhcNMTQxMTI0MTEwOTAwWhcNMTkxMTIzMTEwOTAwWjCBrjEp
-MCcGA1UEChQgVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgSXRhanViw6ExDDAKBgNV
-BAsTA0RTSTEgMB4GCSqGSIb3DQEJARYRZHNpQHVuaWZlaS5lZHUuYnIxETAPBgNV
-BAcUCEl0YWp1YsOhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFwYW4udW5pZmVpLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANt2APgawi3BE1qLGEfcHXGHVgoi+W7JvTzfwEnzZ9GZt47v
-RKsnjRe6Nww6SDLsJipvBaIzvqEqaJJFMV8NTF7t2DWPAy1Okq58syxqvyvfp2PQ
-uArvWqq5n4E0MiEj3K7HP5bXiFhFwwxhV1NhUNTik334QoobGlfWcOhxRFi56ZYX
-ghhdhzeIAPABrUS9K2Erz1bdLOzHQ1nUGQwjeVUiTgJps39t6AlKAN5AQgN/VpXj
-SKWRCM/5AMYrt0qWtiedn9y42AU2kME1yTpx9dFFpma9u9GNW/UE1lxPxx+NXjoo
-Fo9mWQ0SGJg2etW+Mk7GKtJc3j720TafS9mL8b0CAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAwSg/dr8TZxZSwJFoq+6ZLUsN9OThA4sitiMM83rlY8alnk2KMXyw78K7
-Qi4WcZX2EnLhDXqOnRoqLBSRlRlJgyZACG2baROEASdJa+0EDCvHAYyN+ZvXKQ94
-/I2/54+QbyBolwyyi9aPKOcEYJR9ChnX1lgIUuLO2iZ/95izSMoAdQcTlFW1UBAP
-JTNyehL8YKvoYOOcL8ISIrvMhXuGKFDjadKblevs1pari0G7RPdSzzjm0kdQpneJ
-Y+MQCYkcwgEL36lQq4zTxnOMWAk8kKs4cSrLhLB/VajAFrmfZST3YRKd9ySd6Erg
-sMiNc61dD6n6xKPqOEktccFKcLCaMg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://pan.unifei.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pan.unifei.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://pan.unifei.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pan.unifei.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID0jCCAroCAQAwDQYJKoZIhvcNAQEFBQAwga4xKTAnBgNVBAoUIFVuaXZlcnNp
-ZGFkZSBGZWRlcmFsIGRlIEl0YWp1YsOhMQwwCgYDVQQLEwNEU0kxIDAeBgkqhkiG
-9w0BCQEWEWRzaUB1bmlmZWkuZWR1LmJyMREwDwYDVQQHFAhJdGFqdWLDoTEVMBMG
-A1UECBMMTWluYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRcGFuLnVu
-aWZlaS5lZHUuYnIwHhcNMTQxMTI0MTEwOTAwWhcNMTkxMTIzMTEwOTAwWjCBrjEp
-MCcGA1UEChQgVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgSXRhanViw6ExDDAKBgNV
-BAsTA0RTSTEgMB4GCSqGSIb3DQEJARYRZHNpQHVuaWZlaS5lZHUuYnIxETAPBgNV
-BAcUCEl0YWp1YsOhMRUwEwYDVQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFwYW4udW5pZmVpLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANt2APgawi3BE1qLGEfcHXGHVgoi+W7JvTzfwEnzZ9GZt47v
-RKsnjRe6Nww6SDLsJipvBaIzvqEqaJJFMV8NTF7t2DWPAy1Okq58syxqvyvfp2PQ
-uArvWqq5n4E0MiEj3K7HP5bXiFhFwwxhV1NhUNTik334QoobGlfWcOhxRFi56ZYX
-ghhdhzeIAPABrUS9K2Erz1bdLOzHQ1nUGQwjeVUiTgJps39t6AlKAN5AQgN/VpXj
-SKWRCM/5AMYrt0qWtiedn9y42AU2kME1yTpx9dFFpma9u9GNW/UE1lxPxx+NXjoo
-Fo9mWQ0SGJg2etW+Mk7GKtJc3j720TafS9mL8b0CAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAwSg/dr8TZxZSwJFoq+6ZLUsN9OThA4sitiMM83rlY8alnk2KMXyw78K7
-Qi4WcZX2EnLhDXqOnRoqLBSRlRlJgyZACG2baROEASdJa+0EDCvHAYyN+ZvXKQ94
-/I2/54+QbyBolwyyi9aPKOcEYJR9ChnX1lgIUuLO2iZ/95izSMoAdQcTlFW1UBAP
-JTNyehL8YKvoYOOcL8ISIrvMhXuGKFDjadKblevs1pari0G7RPdSzzjm0kdQpneJ
-Y+MQCYkcwgEL36lQq4zTxnOMWAk8kKs4cSrLhLB/VajAFrmfZST3YRKd9ySd6Erg
-sMiNc61dD6n6xKPqOEktccFKcLCaMg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pan.unifei.edu.br:8443/idp/profile/SAML1/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">UNIFEI - Universidade Federal de Itajuba</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unifei.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unifei.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Everaldo Campos</md:SurName>
-    <md:EmailAddress>everaldo@unifei.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 72a55b41..00000000
--- a/swamid-interfederations-2.0/papercut.balliol.ox.ac.uk-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://papercut.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Balliol Print Service" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-09-05T13:49:37Z">
-      <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://papercut.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAPTQm4DlPP/UMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXBhcGVyY3V0LmJhbGxpb2wub3guYWMudWswHhcNMTQwODI5MTMxNDQyWhcN
-						MjQwODI2MTMxNDQyWjAkMSIwIAYDVQQDExlwYXBlcmN1dC5iYWxsaW9sLm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAutBlc2yLd/3y+6h6
-						VzJ6YyuYupu08Ij3ktLRVCoTOybjBGPYu38BgUrs+Y+Vf5nXtpDWDpATpWSpfSMf
-						YSIjOC2nhbfT5QdHQu83HhxP4ZD3kMEqBnL7X6E3ywR/+IdmdizTjbm6lIHUK9cp
-						Rt2OwtJ5i0ScP7twuzvTlljkcMIw5HQzKOkRhwQHoKSnx0jrCwNo4AW/PlWspZ8j
-						B6bg9xuToATk2l/TpPojyv2MOaa3KHCk6IGsI/wVOKZQ5lMbD5EHNKQ+cGkdMbX7
-						r4XNkWpQ4nsYCLjo/JYeR67Zlc0prCf3TaGFikHKIBedGcVmU5GaCpqAzVGt4aFE
-						e2ckkwIDAQABo0cwRTAkBgNVHREEHTAbghlwYXBlcmN1dC5iYWxsaW9sLm94LmFj
-						LnVrMB0GA1UdDgQWBBSBxNdryBa0/LvTZJnl7cLecW0RiTANBgkqhkiG9w0BAQUF
-						AAOCAQEAj+CNndELm4jDspknGEKTYGu0xmMsLz8nO/tQ6hHYFsa7sE3pqYE9KNmy
-						Cumz2wyZEJx3j5nLhIhtLnTD1d+EW8L0bVkyjNrv9HCMo8yZ2Sk+8ABDYQGIqCBY
-						yILBp/EuvtnyDORlet6Xg3Jz350i2eKVGA3ju/fU3a4902Z9BidRw494682y26T6
-						ZIKinjyVBG8zpJ9Kt1X5IyIp8hTOsGtpe3TqqRmyT82pquTgC7AZG3cZ4OE6ga28
-						bLgZB5ayiZnXyheZDs/80xBMdoPVDvXvu3r7rN+MJrp51f5vVXi2ikp/nXY0Hh1L
-						lBJNwFF+dySVUM4QYmAzTnXIHhR7DA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://papercut.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://papercut.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Balliol Print Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Balliol Computing</GivenName>
-    <EmailAddress>mailto:computing@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Balliol Computing</GivenName>
-    <EmailAddress>mailto:computing@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/papercut.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/papercut.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index b0833ad8..00000000
--- a/swamid-interfederations-2.0/papercut.some.ox.ac.uk-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://papercut.some.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Somerville College PaperCut" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-04-14T15:00:49Z">
-      <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://papercut.some.ox.ac.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://papercut.some.ox.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAJTgsqCNR2RFMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnBhcGVyY3V0LnNvbWUub3guYWMudWswHhcNMTQwMjI1MTQwODM0WhcNMjQw
-						MjIzMTQwODM0WjAhMR8wHQYDVQQDExZwYXBlcmN1dC5zb21lLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2DvJXeXlacXKCCY8E78LHJh8
-						eRHB6YWFigkDoY4gljzONk1eXVs91A4fk1soSLaitd7eweWpsSIu2il8iPEpKS1X
-						0Fp6dU2EOkeo+/pDlq71lFg0zGncxuKBAklZMmMMthj0o6u0M5ZH6Uv2Ep9H4dna
-						8iXyoAjvF2HihhNc9qaJ29BayvL4ucgRhce8+vNfl4eFcgSYU+rQSAZedPcMf4Rh
-						xiWV1ipV/pqrzLTCP9Mwy1yeneOP9saE/2hRa2JGaq1lF5F2LzL5++Ek+/gpoESy
-						1yIeMvOuE0beSFRb32mYvNNMQ/Do1lloe09RJasy4MO4ze/Ub7B05rBknkeouwID
-						AQABo0QwQjAhBgNVHREEGjAYghZwYXBlcmN1dC5zb21lLm94LmFjLnVrMB0GA1Ud
-						DgQWBBQmEF+Bgv8GPVkPUmxy+ZDVjdTonTANBgkqhkiG9w0BAQUFAAOCAQEAbfj2
-						C9Oz1jGuH3oqNtIQOzq7VV38/xUZHQOWEFlbn2GdDLd0Bp9KYrfZMJ2Gpr9XgFm+
-						GNHTkfJakoOyDrmwui3XMBkZqs/RtVsBnxPYfFkrawh1oZpls5+uyAHgoGGApOMn
-						bK69F+9mOEWH2QPaQn7hLTqNTHcubfP0V52ChJrnYdlKgADnCEaCyJRfZjmljdzT
-						gbEWpkOKwE5d0gwdq4us5exBrdkUlMM7KHLuugDsVNTLNbaHlfnE4c4EjQfT3Bpv
-						jrFl6qt83WYiXy7/PXLwzdBVFaAdHuYVityl5CQOME5+dJK+op9PdCByouFxrRFQ
-						gKBXjAALAzv1gQI1Jw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://papercut.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://papercut.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Somerville College PaperCut</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</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 9bc4684b..00000000
--- a/swamid-interfederations-2.0/papi.kfki.hu-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://papi.kfki.hu/idp/shibboleth">
-  <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="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>urn:schac:homeOrganizationType:hu:nren</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>kfki</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>href-idps</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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">
-        <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>
-      <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papi.kfki.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <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-POST" Location="https://papi.kfki.hu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://papi.kfki.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papi.kfki.hu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor 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>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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://papi.kfki.hu: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="hu">MTA Wigner Fizikai Kutatóközpont</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.kfki.hu/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.kfki.hu/indexeng.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>KFKI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@kfki.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>KFKI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@kfki.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>KFKI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@kfki.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 cd1cb14f..00000000
--- a/swamid-interfederations-2.0/papi.kfki.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://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>
-    </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 KFKI - Magyar Tudományos Akadémia Központi Fizikai Kutató Intézet</OrganizationName>
-    <OrganizationName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">MTA KFKI Csillebérc</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">MTA KFKI Csillebérc</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.kfki.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.kfki.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/passport01.leeds.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/passport01.leeds.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 8ee09623..00000000
--- a/swamid-interfederations-2.0/passport01.leeds.ac.uk-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://passport01.leeds.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Leeds.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-24T17:29: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">University of Leeds</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://strategy.leeds.ac.uk/logo/uol16px.gif</mdui:Logo>
-        <mdui:Logo height="64" width="64">https://strategy.leeds.ac.uk/logo/uol64px.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>129.11.0.0/16</mdui:IPHint>
-        <mdui:IPHint>194.80.232.0/22</mdui:IPHint>
-        <mdui:IPHint>194.82.12.0/22</mdui:IPHint>
-        <mdui:DomainHint>leeds.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:53.845917,-1.586838</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.818458,-1.565294</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.803158,-1.556153</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.803280,-1.558857</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.807892,-1.561518</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.810021,-1.557140</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.809185,-1.554394</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.805434,-1.550274</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.803939,-1.553707</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.806803,-1.555767</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.807948,-1.520169</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leeds.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEpjCCA46gAwIBAgIQT0wPwUIkM3fyO2zwaKh1JzANBgkqhkiG9w0BAQsFADBk
-						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-						Q0EgMjAeFw0xNTA0MjIwMDAwMDBaFw0xODA0MjEyMzU5NTlaMEQxITAfBgNVBAsT
-						GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWcGFzc3BvcnQwMS5s
-						ZWVkcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKSfAkgr
-						VnMH2IwKBmAHLd6222RI5IQQVQXSj1oj1IF5brKbJXPhMdvMys6bkR36JA8SyQbO
-						T5HGfnbHNAG8LCMeugTlj3Pb1Jyfz9YOujSUCLipv7gTKfRkhS5Ur2sKccL/B/pk
-						95ls3pGRPY7VQ39W03mZuwqBeNtlklg2QJD5GXvmNiPd/2FMF+TUd4xYwnlpO+1p
-						jDQJmG5gli0HeM0dhYSv+lpgeghXK7v5iWVLsVF0zq58a9kRvuV2USTd9U5FHIC0
-						5tONsGD3g+d+1fO0e00DxLXek82I0YKSJ4IhABOv2MA3olVsJrJZuOCpxuYmHrIX
-						Cnd473RaodIKly0CAwEAAaOCAXIwggFuMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2W
-						VBvhhiiw/ba9MB0GA1UdDgQWBBQAju0beKfx7len/S53RSdJHTfYKTAOBgNVHQ8B
-						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-						BDMwMTAvoC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENB
-						Mi5jcmwwbAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVz
-						ZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDov
-						L29jc3AudXNlcnRydXN0LmNvbTAhBgNVHREEGjAYghZwYXNzcG9ydDAxLmxlZWRz
-						LmFjLnVrMA0GCSqGSIb3DQEBCwUAA4IBAQAVMweCAaCZNhlB5xV8ifpSBqe4uKwM
-						YnGrUEYS2LNPwG8CL8nRmmKhOciIHqWMDf7nOJrrHzy45NEBv9rrCgjzD/R0jiRU
-						Gty8uRG/Um6xOz0gGZcspyDUGvHmLtPumdN68owdch/9npnOdt9qy7un2Q2xMBe4
-						BWCy9yjXDW/sJlfUIDS5MsV4+7iK/bjoHdQ824ILc4Py4bmUmiq4J1U5sxPP14/i
-						8Q1QOJsAhskPhMelJA1Gg+U12l0Dg4IBAP7zfadWEpWuqdcvwH8JU0iEHYALiPFs
-						4pRCR0n/jBWInxzYIPiHaPiAKBbyhqEqv7HpuaYNQPRdYjmi5CnNv461
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport01.leeds.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport01.leeds.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://passport01.leeds.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport01.leeds.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport01.leeds.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport01.leeds.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">leeds.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEpjCCA46gAwIBAgIQT0wPwUIkM3fyO2zwaKh1JzANBgkqhkiG9w0BAQsFADBk
-						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-						Q0EgMjAeFw0xNTA0MjIwMDAwMDBaFw0xODA0MjEyMzU5NTlaMEQxITAfBgNVBAsT
-						GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEfMB0GA1UEAxMWcGFzc3BvcnQwMS5s
-						ZWVkcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKSfAkgr
-						VnMH2IwKBmAHLd6222RI5IQQVQXSj1oj1IF5brKbJXPhMdvMys6bkR36JA8SyQbO
-						T5HGfnbHNAG8LCMeugTlj3Pb1Jyfz9YOujSUCLipv7gTKfRkhS5Ur2sKccL/B/pk
-						95ls3pGRPY7VQ39W03mZuwqBeNtlklg2QJD5GXvmNiPd/2FMF+TUd4xYwnlpO+1p
-						jDQJmG5gli0HeM0dhYSv+lpgeghXK7v5iWVLsVF0zq58a9kRvuV2USTd9U5FHIC0
-						5tONsGD3g+d+1fO0e00DxLXek82I0YKSJ4IhABOv2MA3olVsJrJZuOCpxuYmHrIX
-						Cnd473RaodIKly0CAwEAAaOCAXIwggFuMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2W
-						VBvhhiiw/ba9MB0GA1UdDgQWBBQAju0beKfx7len/S53RSdJHTfYKTAOBgNVHQ8B
-						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-						BDMwMTAvoC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENB
-						Mi5jcmwwbAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVz
-						ZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDov
-						L29jc3AudXNlcnRydXN0LmNvbTAhBgNVHREEGjAYghZwYXNzcG9ydDAxLmxlZWRz
-						LmFjLnVrMA0GCSqGSIb3DQEBCwUAA4IBAQAVMweCAaCZNhlB5xV8ifpSBqe4uKwM
-						YnGrUEYS2LNPwG8CL8nRmmKhOciIHqWMDf7nOJrrHzy45NEBv9rrCgjzD/R0jiRU
-						Gty8uRG/Um6xOz0gGZcspyDUGvHmLtPumdN68owdch/9npnOdt9qy7un2Q2xMBe4
-						BWCy9yjXDW/sJlfUIDS5MsV4+7iK/bjoHdQ824ILc4Py4bmUmiq4J1U5sxPP14/i
-						8Q1QOJsAhskPhMelJA1Gg+U12l0Dg4IBAP7zfadWEpWuqdcvwH8JU0iEHYALiPFs
-						4pRCR0n/jBWInxzYIPiHaPiAKBbyhqEqv7HpuaYNQPRdYjmi5CnNv461
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport01.leeds.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport01.leeds.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 Leeds</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Leeds</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://iss.leeds.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ISS Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@leeds.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ray</GivenName>
-    <SurName>Powell</SurName>
-    <EmailAddress>mailto:R.G.Powell@leeds.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml b/swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml
deleted file mode 100644
index a6c1d893..00000000
--- a/swamid-interfederations-2.0/passport2.e2bn.org-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://passport2.e2bn.org/shibboleth">
-  <!--
-		This is an E2BN Online Services Shibboleth SP for the East of England Broadband Network.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-06T09:59:42Z"/>
-  </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://passport2.e2bn.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://passport2.e2bn.org/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEqjCCA5KgAwIBAgIQaxilpKtFyudwNIabYTWe6zANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEyMDgwMzAwMDAwMFoXDTE1MDgwMzIzNTk1OVowgYIxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIEw1IZXJ0Zm9yZHNoaXJlMRIwEAYDVQQHEwlIaW54d29y
-						dGgxKjAoBgNVBAoTIUVhc3Qgb2YgRW5nbGFuZCBCcm9hZGJhbmQgTmV0d29yazEb
-						MBkGA1UEAxMScGFzc3BvcnQyLmUyYm4ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAwWzHYa3GF8L0WS6Vy+/oj4BXuLIegDpYmZpOdNHKc6cUelYD
-						mANHjc8crK/OzfIkdYZ/xd+RM6GWHiDfo0DwI7/T8WtOLEGy/liM+ekPEq4XQdZk
-						tDWCF937oj5CbXH8QPWdzyFVf4AUA6Sb+JZpO0zT5ptW8WHeM6TFP1izlXhaNvOl
-						Ql3lBSCuVJcMCiHUUabgA96JByWviim2i0UkHDK5NVrsx1KYL7oK2ipOuds5HXa6
-						yy/s1FUQ4DkK3xEn3ES6JQTFEwPQ1RgR3xryY335ilcvtd7Xd+ELBKuHxxB2FJGy
-						6hNcwxreLeFQiKiIV6BMJLvOh4JPBJ82GKaXQQIDAQABo4IBZTCCAWEwHwYDVR0j
-						BBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFE6U3xk/mGGDfrom
-						4PmC+wZxRgXgMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
-						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgId
-						MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
-						RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
-						L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
-						Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB0GA1UdEQQWMBSCEnBhc3Nwb3J0
-						Mi5lMmJuLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEAGF313BU94mPtvNABYwuN2RmM
-						6bUyIkedHzkE2t3jhLB5TBl1dbqcAqA9Ojgxa0/81bbtOgccAYm90df/PqFI2V5z
-						pyeMJodK8M/W+mlGfl6KtBPyV3ioFflhIeyubLUhDxP2pacTI40+4GYsylHMcvEx
-						NwzL7DXqWFzPK2OqdEqrQWFko+VnnfRDcg7pMaKO9+xqhutw9XGmllUTk1rLr/Bn
-						QVZejbc10E/YaTEWXrvsnOUPvKi9ufV7mkfi5Zq0LtwlpeI4IjgaykGZHEEcTdNA
-						A48T78ntBTNuYYtFdpAkqpAcvMhkrMJplW2G4+KFLeotqtZzBTkyIj5MANRJuA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport2.e2bn.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passport2.e2bn.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://passport2.e2bn.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">East of England Broadband Network</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">E2BN Online Services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.e2bn.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Bright</SurName>
-    <EmailAddress>mailto:service@e2bn.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Bright</SurName>
-    <EmailAddress>mailto:service@e2bn.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/payment.statista.com.xml b/swamid-interfederations-2.0/payment.statista.com.xml
deleted file mode 100644
index ecfa94dc..00000000
--- a/swamid-interfederations-2.0/payment.statista.com.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://payment.statista.com/simplesaml/">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>de.statista.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=de.statista.com,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE4jCCA8qgAwIBAgIHEn65XsmOBDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
-EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0G
-A1UEAxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMTA5MDEwODAxMThaFw0x
-NjA4MzAwODAxMThaME4xCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWlu
-MRAwDgYDVQQLEwdERk4tUEtJMRgwFgYDVQQDEw9kZS5zdGF0aXN0YS5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIP8FskLI19g/XBvxY1ua4uEtg
-Q0vdL6f/wuKNP8wc/hCNh/HGJLYj9S0BRFmVlCxiXFhr5GRZAAZN+b6msehsgPs3
-V6yKsP0Ga4yt7ccJuAzUFVU8Qrva2TIvDLPZ7Qucj+2M4ekxpqBjp850JbTqdGO1
-oDmrKAzuxWXUS/9L88tFHiHvaxLEIBK3OYf6k8lK61BZuU2DXIFkd72iCF7LS/sE
-uHh1db+185ssxNiLICu2vqJ9ZpsrYN6qOxSNvxI3jQ7jHNOlVXwFGAeDsnjg4Qxa
-oqfgLekPagmmDWpAI9QHTyqUOAaN03UWigVeb01IiH8EwBKzi82mims7CHb1AgMB
-AAGjggG8MIIBuDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFOG/Ep6pb7z0/1gHX1D6Yx8DZsGx
-MB8GA1UdIwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMIGRBgNVHR8EgYkwgYYw
-QaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBqgYIKwYBBQUH
-AQEEgZ0wgZowSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xv
-YmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBLBggrBgEFBQcw
-AoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCJFZsyyBpVIHAp
-preO/3S9+1Gw4OFWgS4Ajpfxz8H5pV5+6PK9bogtUWt7kSt41rbrWKWWbiZkjuTo
-Th4aHytOOeHpaUYH9qkFa7Cla5L4FEB52uarXlnXtrp3/2sTPvpZWtDk7KNZYvcN
-Psfu+IqZEGwHWuwh58Hl2v5xf137GhgcYuOm5Yabvi0+MdmtHihWuJ2sA7NEWzn8
-LW8dBcS4uGBLwmZ5Tq4zIAbppwwoqV81YwY+IaW9ObNpYJUMPhyxxW6ydTxF4yuT
-qZL8C8tvRqJtGUxFqPs4xImg3b9WLPThwMkFkuH/xzQqmN+xeoD3LvL/2DF88T3y
-l/xjGBYl
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://payment.statista.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Statista</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Statista</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://de.statista.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Leidinger</SurName>
-    <EmailAddress>technik@statista.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Tim</GivenName>
-    <SurName>Kröger</SurName>
-    <EmailAddress>tim.kroeger@statista.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/payments.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d3bee98f..00000000
--- a/swamid-interfederations-2.0/payments.balliol.ox.ac.uk-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://payments.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth Balliol Payments SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-20T10:54:03Z"/>
-  </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://payments.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAPvOedFZEvkcMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXBheW1lbnRzLmJhbGxpb2wub3guYWMudWswHhcNMTIwNDE3MjA1NTM3WhcN
-						MjIwNDE1MjA1NTM3WjAkMSIwIAYDVQQDExlwYXltZW50cy5iYWxsaW9sLm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwFpid6d55DBZOLIs
-						xpDcZGgKfqu6Gm/T/ZVJY3AOj5BjTdjCiLn57FpMEkyCci7wODhEnTl7M1DFhVpo
-						CskYhETMeERTP9C2vNco/X3UdCtkPR2ZWs/yBGraqBkyeg4kx7U6+trEwO+Sqirj
-						2AHrPOwBJgtyIUGVsXgF9o54bptyQQsHIUX7+XPW7stiZ5X035HR5tB6hjfoZoRe
-						skzs6kploPCCxN8dL83lYw8VdYHWyvQmgXL4fsqTGaULcUGEjhekubGxIFL5xQRF
-						l3oWY4sIz5x9FMkbwt2S8NQzQokbvKpQcntotUMHYik1fLU/0QVoTEj0PR7en4GO
-						guTiNQIDAQABo0cwRTAkBgNVHREEHTAbghlwYXltZW50cy5iYWxsaW9sLm94LmFj
-						LnVrMB0GA1UdDgQWBBTP8wkRhzQFe7iXTxZIrPIt8T4xtTANBgkqhkiG9w0BAQUF
-						AAOCAQEADgadkCnPCWgs1Y0S3Uz5ErkdPvxNlTx0Qau1DxXx2QOwqVvc55xyNcKt
-						s6MJ4dwlZPYWPZT2b1G49pmUUMUp87XD1M6melhm2IzcTbyRJrA+KoSAFEL/hEBp
-						z8MrOtNI5/IPFfZOpwvoJMdUb2wxAscU+CoEa9HF+YndCPZmscMYOE3D3/3g+hAE
-						CC7AGt/AG6LsibsXDiL7RB3S0844C/T32nam6C59kwWg0CWWQuZIY+9xZDctOgIb
-						IDoUKfE1W4rdUtZ3bT+Ra7wnX0tmfUBlBc/h/38W9wQV1kqa3tnH8BEuC0Jpqcq4
-						U0MKDSCQFv1ZBA4ckzGCSivlU9HSig==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://payments.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Balliol Payments</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stewart</GivenName>
-    <SurName>Tolhurst</SurName>
-    <EmailAddress>mailto:stewart.tolhurst@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/penn.reunioniq.com-shibboleth.xml b/swamid-interfederations-2.0/penn.reunioniq.com-shibboleth.xml
deleted file mode 100644
index 48d125bd..00000000
--- a/swamid-interfederations-2.0/penn.reunioniq.com-shibboleth.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" entityID="https://penn.reunioniq.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://penn.reunioniq.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Penn Alumni Weekend</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Alumni weekend registration service</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDTCCAfWgAwIBAgIJAO7DzRSF699YMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMMEnBlbm4ucmV1bmlvbmlxLmNvbTAeFw0xNjAyMDIwMzA0NTNaFw0yNjAxMzAw
-MzA0NTNaMB0xGzAZBgNVBAMMEnBlbm4ucmV1bmlvbmlxLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKPPikBVtrXOdrwv3HPEjjRHXRViyZQEeZdT
-LaFSpAQhym3fWa8UV5NQV1N9LDhbeIIVDlT3enOqiPT4da9YapONkBC3BCjpby0q
-bklr11OtB3kacecjmvMccwf4fNmu5ZNJRdkWASeqxP1L0o/5CW47k5ajMPXigdnZ
-mnKhDr2dSDYrAQYeWYOBo3Fg7BT1NBdX4w3xON7iDtkUX60NKoaMvb0BbdwrrAHe
-jO0HuaSklXFoO1p5nTjJ4TKvzmg7fdg8GtmmkOYtLHw1VIIWlpGrisD/pUW488gB
-HAn5Ot2BE7sev1RPXrPq6xYNnV2si0cYhjSCTK6WaURKl0JseJkCAwEAAaNQME4w
-HQYDVR0OBBYEFINUzyEygcSCIQrQDUZfVSPSzdd3MB8GA1UdIwQYMBaAFINUzyEy
-gcSCIQrQDUZfVSPSzdd3MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-ACs8zh2Lj58Xd+RkW0DBtRC42Dz4nt1qXm3Wy2uXL7p4n8DaYPhOb3nPbsnz3VTn
-7IcMkllD3+fToqwXIvEy9Dp1THbTOG5A1KKSwL6a5zT6aerEJpWIXlv7+v9gaBFB
-izwvn82tKxTBOCkXj9QZas9diwapn4Ruu1eYQbxkpWemv13iNv0ybAlFatElYmki
-GS3cV0xclj1qfl3yzQ6+NBqE1e5HA7zK6oeTCTOKpQ1rVuOE/JtCSU0VdDlWgGAH
-aZA2oIDGIZ8tHiskhBWwlaWTR3Z3t+TZKm5cKTCtSV1AgJ0vDiOU/6AVxVD3TOKx
-2Xj5hsW27PR5iSGrVcghwg0=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://penn.reunioniq.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://penn.reunioniq.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://penn.reunioniq.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://penn.reunioniq.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Penn Alumni Weekend</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Alumni weekend registration service</md:ServiceDescription>
-      <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="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="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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CounterMarch Systems LLC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CounterMarch Systems LLC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.countermarch.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AlumnIQ Helpdesk</md:GivenName>
-    <md:EmailAddress>helpdesk@alumniq.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Steve Rittler</md:GivenName>
-    <md:EmailAddress>steve@alumniq.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/perfsonarui.geant.org.xml b/swamid-interfederations-2.0/perfsonarui.geant.org.xml
deleted file mode 100644
index 3e2aefc3..00000000
--- a/swamid-interfederations-2.0/perfsonarui.geant.org.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://perfsonarui.geant.org">
-  <!--
-		This is a 'GÉANT perfSONAR UI' SP for GÉANT Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-24T12:03: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</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GÉANT perfSONAR UI - Operations instance</mdui:Description>
-        <mdui:Logo height="31" width="167" xml:lang="en">https://psui.geant.net/perfsonar-ui/images/PerfSONAR_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>
-						MIIFdTCCBF2gAwIBAgIQBruZHycalTIckX3CWVlozDANBgkqhkiG9w0BAQsFADBk
-						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-						Q0EgMzAeFw0xNTEwMTMwMDAwMDBaFw0xODEwMTcxMjAwMDBaMIGDMQswCQYDVQQG
-						EwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFt
-						MRswGQYDVQQKDBJHw4lBTlQgQXNzb2NpYXRpb24xCzAJBgNVBAsTAklUMR4wHAYD
-						VQQDExVwZXJmc29uYXJ1aS5nZWFudC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQDDyMMDtxnR01PgCmtr3WpujJjW9F1GZYOlDfqsTDuZOLuPKOHi
-						lcC+9ILMCAyv87oxqxV/m3dtlYUVgzRNqE47sE1JDHCAtitDKwR4wlIKJrTSfU6o
-						dY3qnW8Pe6UO3rxPkqMwuMs9/FP3VVbcIeeAyuFfCnwgqljKSp2mgaS3qAc2Raox
-						JOKVEAQTO5f4BHI0DdkDct/7Azq+vDpr/nZGmcoG9FLSNHWoAfeP7IQdxpgUeHB/
-						JUh12S7lEtDSlMcK1yd/xLrw3Bdyai1FotqpNpoEHV6/AjOy7Hxpf8TYRRc0OYst
-						3POtpZBBSKkcH0L07le9gpHYUMYUD94qai/5AgMBAAGjggIBMIIB/TAfBgNVHSME
-						GDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUYyZTMUgTRszC2INE
-						gJ9GdhuKuqYwUwYDVR0RBEwwSoIVcGVyZnNvbmFydWkuZ2VhbnQub3Jnghh0ZXN0
-						LXBlcmZzb25hci5nZWFudC5vcmeCF3VhdC1wZXJmc29uYXIuZ2VhbnQub3JnMA4G
-						A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwawYD
-						VR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVOQVNT
-						TENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJFTkFT
-						U0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUHAgEW
-						HGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsGAQUF
-						BwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgG
-						CCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NM
-						Q0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCNKlpHE86m
-						c8nQ+WLe4jfoX+cm0j+Fyff7q/qEIl2g7i23FsYzgEwqziX8+a/u6KU7BJ+k0eMq
-						dfenP2+86zrRXjd2clSUmkzowGRs3a5Xrl357+904BgXvxLwV7aJU8rk4Oqm3C4j
-						K6m3yuZqjshzRmWkJefVq31C8luP4YN9DNM6WLAXSL3adxxsDUZvs/lvPr9DZ0eX
-						ktYLRFuIll3n55K0KcGvnPxl/u/pjcYovDvKdbmpoZjumDBBx6DK1xa1bojrVQOu
-						ESh9mXQAx0OxLyzZVgxntpNQ2qVirQ0TJhTPBY4RDC5xw56vwB18W79l1Ic13noD
-						Yn/y2E+4DRWc
-					</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>
-						MIIFdTCCBF2gAwIBAgIQBruZHycalTIckX3CWVlozDANBgkqhkiG9w0BAQsFADBk
-						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-						Q0EgMzAeFw0xNTEwMTMwMDAwMDBaFw0xODEwMTcxMjAwMDBaMIGDMQswCQYDVQQG
-						EwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFt
-						MRswGQYDVQQKDBJHw4lBTlQgQXNzb2NpYXRpb24xCzAJBgNVBAsTAklUMR4wHAYD
-						VQQDExVwZXJmc29uYXJ1aS5nZWFudC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQDDyMMDtxnR01PgCmtr3WpujJjW9F1GZYOlDfqsTDuZOLuPKOHi
-						lcC+9ILMCAyv87oxqxV/m3dtlYUVgzRNqE47sE1JDHCAtitDKwR4wlIKJrTSfU6o
-						dY3qnW8Pe6UO3rxPkqMwuMs9/FP3VVbcIeeAyuFfCnwgqljKSp2mgaS3qAc2Raox
-						JOKVEAQTO5f4BHI0DdkDct/7Azq+vDpr/nZGmcoG9FLSNHWoAfeP7IQdxpgUeHB/
-						JUh12S7lEtDSlMcK1yd/xLrw3Bdyai1FotqpNpoEHV6/AjOy7Hxpf8TYRRc0OYst
-						3POtpZBBSKkcH0L07le9gpHYUMYUD94qai/5AgMBAAGjggIBMIIB/TAfBgNVHSME
-						GDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUYyZTMUgTRszC2INE
-						gJ9GdhuKuqYwUwYDVR0RBEwwSoIVcGVyZnNvbmFydWkuZ2VhbnQub3Jnghh0ZXN0
-						LXBlcmZzb25hci5nZWFudC5vcmeCF3VhdC1wZXJmc29uYXIuZ2VhbnQub3JnMA4G
-						A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwawYD
-						VR0fBGQwYjAvoC2gK4YpaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL1RFUkVOQVNT
-						TENBMy5jcmwwL6AtoCuGKWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9URVJFTkFT
-						U0xDQTMuY3JsMEwGA1UdIARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUHAgEW
-						HGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMG4GCCsGAQUF
-						BwEBBGIwYDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMDgG
-						CCsGAQUFBzAChixodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vVEVSRU5BU1NM
-						Q0EzLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQCNKlpHE86m
-						c8nQ+WLe4jfoX+cm0j+Fyff7q/qEIl2g7i23FsYzgEwqziX8+a/u6KU7BJ+k0eMq
-						dfenP2+86zrRXjd2clSUmkzowGRs3a5Xrl357+904BgXvxLwV7aJU8rk4Oqm3C4j
-						K6m3yuZqjshzRmWkJefVq31C8luP4YN9DNM6WLAXSL3adxxsDUZvs/lvPr9DZ0eX
-						ktYLRFuIll3n55K0KcGvnPxl/u/pjcYovDvKdbmpoZjumDBBx6DK1xa1bojrVQOu
-						ESh9mXQAx0OxLyzZVgxntpNQ2qVirQ0TJhTPBY4RDC5xw56vwB18W79l1Ic13noD
-						Yn/y2E+4DRWc
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://perfsonar.geant.org/perfsonar-ui/saml/LogoutServiceSOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perfsonar.geant.org/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://perfsonar.geant.org/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">GÉANT perfSONAR UI</ServiceName>
-      <ServiceDescription xml:lang="en">GÉANT perfSONAR UI - Operations 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="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="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">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ivan</GivenName>
-    <SurName>Garnizov</SurName>
-    <EmailAddress>mailto:ivan.garnizov@fau.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ivan</GivenName>
-    <SurName>Garnizov</SurName>
-    <EmailAddress>mailto:ivan.garnizov@fau.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.xml
deleted file mode 100644
index bcc3a2c1..00000000
--- a/swamid-interfederations-2.0/peterborough.ac.uk-oala-metadata.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://peterborough.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Peterborough Regional College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-26T15:19:53Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">peterborough.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZDCCAkygAwIBAgIINjMwhVf3jFkwDQYJKoZIhvcNAQEFBQAwSTEmMCQGA1UE
-						CgwdUGV0ZXJib3JvdWdoIFJlZ2lvbmFsIENvbGxlZ2UxHzAdBgNVBAMMFmFhcy5w
-						ZXRlcmJvcm91Z2guYWMudWswHhcNMTIxMDE3MTMzODAwWhcNMjIxMDE3MTMzODAw
-						WjBJMSYwJAYDVQQKDB1QZXRlcmJvcm91Z2ggUmVnaW9uYWwgQ29sbGVnZTEfMB0G
-						A1UEAwwWYWFzLnBldGVyYm9yb3VnaC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAIIbeuWlQPhTqwxItEPE51NVFfArYjaRW8O9b0aYfoYRQH86
-						yYBOpO0xeaqb6fpCrjwvZwz+SPDcSu26f2u0NJ4eHClO8QAWGyh9XGH3WZu0R6YW
-						nvbPTHjJOxSlDVo2Ukba3/TG+6WMQXa89b86NKbzLrOBISyrbLky1NTAtFI2+Kcm
-						Tsw7G+lk/jbAR4WD/AaXS9iXZjvOR5Fd+6ntvKp7PheNoD+7pbnEJV2Il1YMrmT4
-						puMw74kAIRbwKOGwA1VivNNGfnuGW8lYmujwPVfJwWXUXUgOqr86MHt+iatvJ7EA
-						3ZmSUYmlJYFkdc3aWbMplI5WuOLlKK0EeBlVAG0CAwEAAaNQME4wHQYDVR0OBBYE
-						FAF22/FrH+1Anys4Xk2bheSlL00KMB8GA1UdIwQYMBaAFAF22/FrH+1Anys4Xk2b
-						heSlL00KMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAkfZ2yKKff4
-						P6/mGdaEIu1t/eVwRgeCHKiW4cnDTPlIJ3qQ0oWKPnqvMuLnARbwJcA+BAKHrH47
-						Z/o9G70hzo4+yQrw9Oh9N+b99gW62DhdWNiVJKD7u9pFI5w9rX0wPRlM9tuJJQqY
-						mkS3SnkZDJOloF0cUjC2zo9cJNsCbPrjN+DkkVweNV6Bbzu8ABwDr6UV3zkY8iot
-						S7F79s1+CGoFcU8g07hpq93i957bqsyCasIEc/wn54jQyLs4LorcKO5WJg/50Q2j
-						/HItds1Wpk/aLQjt2/wnywHR3yWeBQN4B4QqN5TrzkN5OdZZsFHyWIzTmeXTwJtM
-						8OV0uQf2TwU=
-					</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>
-						MIIDZDCCAkygAwIBAgIINjMwhVf3jFkwDQYJKoZIhvcNAQEFBQAwSTEmMCQGA1UE
-						CgwdUGV0ZXJib3JvdWdoIFJlZ2lvbmFsIENvbGxlZ2UxHzAdBgNVBAMMFmFhcy5w
-						ZXRlcmJvcm91Z2guYWMudWswHhcNMTIxMDE3MTMzODAwWhcNMjIxMDE3MTMzODAw
-						WjBJMSYwJAYDVQQKDB1QZXRlcmJvcm91Z2ggUmVnaW9uYWwgQ29sbGVnZTEfMB0G
-						A1UEAwwWYWFzLnBldGVyYm9yb3VnaC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAIIbeuWlQPhTqwxItEPE51NVFfArYjaRW8O9b0aYfoYRQH86
-						yYBOpO0xeaqb6fpCrjwvZwz+SPDcSu26f2u0NJ4eHClO8QAWGyh9XGH3WZu0R6YW
-						nvbPTHjJOxSlDVo2Ukba3/TG+6WMQXa89b86NKbzLrOBISyrbLky1NTAtFI2+Kcm
-						Tsw7G+lk/jbAR4WD/AaXS9iXZjvOR5Fd+6ntvKp7PheNoD+7pbnEJV2Il1YMrmT4
-						puMw74kAIRbwKOGwA1VivNNGfnuGW8lYmujwPVfJwWXUXUgOqr86MHt+iatvJ7EA
-						3ZmSUYmlJYFkdc3aWbMplI5WuOLlKK0EeBlVAG0CAwEAAaNQME4wHQYDVR0OBBYE
-						FAF22/FrH+1Anys4Xk2bheSlL00KMB8GA1UdIwQYMBaAFAF22/FrH+1Anys4Xk2b
-						heSlL00KMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAkfZ2yKKff4
-						P6/mGdaEIu1t/eVwRgeCHKiW4cnDTPlIJ3qQ0oWKPnqvMuLnARbwJcA+BAKHrH47
-						Z/o9G70hzo4+yQrw9Oh9N+b99gW62DhdWNiVJKD7u9pFI5w9rX0wPRlM9tuJJQqY
-						mkS3SnkZDJOloF0cUjC2zo9cJNsCbPrjN+DkkVweNV6Bbzu8ABwDr6UV3zkY8iot
-						S7F79s1+CGoFcU8g07hpq93i957bqsyCasIEc/wn54jQyLs4LorcKO5WJg/50Q2j
-						/HItds1Wpk/aLQjt2/wnywHR3yWeBQN4B4QqN5TrzkN5OdZZsFHyWIzTmeXTwJtM
-						8OV0uQf2TwU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aas.peterborough.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aas.peterborough.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Peterborough Regional College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Peterborough Regional College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.peterborough.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Wildman</SurName>
-    <EmailAddress>mailto:Richard.wildman@peterborough.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lynton</GivenName>
-    <SurName>Towler</SurName>
-    <EmailAddress>mailto:Lynton.towler@peterborough.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Wildman</SurName>
-    <EmailAddress>mailto:Richard.wildman@peterborough.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/platformdev-secure.nature.com-shibboleth.xml
deleted file mode 100644
index aa61db59..00000000
--- a/swamid-interfederations-2.0/platformdev-secure.nature.com-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://platformdev-secure.nature.com/shibboleth">
-  <!--
-		This is an OpenAthens (platformdev) service provider for Nature Publishing Group (Macmillan Publishers Limited).
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbzCCAlegAwIBAgIEL+I9azANBgkqhkiG9w0BAQsFADBoMQswCQYDVQQGEwJVSzEPMA0GA1UE
-						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEmMCQGA1UEAxMdcGxh
-						dGZvcm1kZXYtc2VjdXJlLm5hdHVyZS5jb20wHhcNMTUwMzEzMDQyNjA1WhcNMjUwMzEwMDQyNjA1
-						WjBoMQswCQYDVQQGEwJVSzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAK
-						BgNVBAsTA05QRzEmMCQGA1UEAxMdcGxhdGZvcm1kZXYtc2VjdXJlLm5hdHVyZS5jb20wggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjE+9CkWEKPCWmeVwaW2IVw7nZf6UNat6bmHixJzjW
-						237phAfssFs+xLaEDhwk6LvpzSyONSdffPRGzcb/cpcLmDPH0ZzMYpsuJtBEsov9p4znpuIUvHSH
-						QO88V12GhnodzF+bv/eSqfrRAgHXoad6j0YH6kbVWqV4W7QH5KAnYRn6kGy+US5XBY1N4e4WS/9z
-						qxmV/NYVpzFkseOzvcPgkdvJqDiyGKY5fECWZc66Qu6CLWFhar5I8g9KqWLC0fsJ7f7XSL8ROwD8
-						zfTIUkc8PfeMReRvabCEsUy4nUAtDgUDpLF1UwxmLxO67oLHbWvJydgCi9I927KSz776fkBRAgMB
-						AAGjITAfMB0GA1UdDgQWBBTHP3Lmuw/WbmqWxKhlOkaTrPpA4TANBgkqhkiG9w0BAQsFAAOCAQEA
-						EaqTVJlsC9+36JfI3/afjeD+6FvSXIcchh9XHbOCkwr9OV8HSa+ZP3U5TGGJktGnoJSiaTtZMn78
-						70k8lS6wR/nmfnKR0oSOG8m2mP1Xak7+paRRDPUmidAVeg/1yrMssWVYaLho/aW0CERlQvZQhNdn
-						rn93k8jzdrmh3V7pn709An2bcIeeDPe+OVgB9Le1PSgaVZuhUCITlu24dC9Ht41vIyTtYUQZ5drg
-						0D1XRieehGxNVTw8Wq2T6JnEMBILq0j7AneiDr3X1i7U/XjKjNGf6e7Plh0qWbf3MVQKdJcS39Y+
-						Ji+ncYi6N+RRa5z+89CVTAeLRdCUhwYunfZh4A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://platformdev-secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://platformdev-secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://platformdev-secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://platformdev-secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nature Publishing Group (platformdev)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/platformdev-secure.palgrave-journals.com-shibboleth.xml b/swamid-interfederations-2.0/platformdev-secure.palgrave-journals.com-shibboleth.xml
deleted file mode 100644
index e5281658..00000000
--- a/swamid-interfederations-2.0/platformdev-secure.palgrave-journals.com-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://platformdev-secure.palgrave-journals.com/shibboleth">
-  <!--
-		This is an OpenAthens 2 SP for Macmillan Publishers Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDhTCCAm2gAwIBAgIERl2PeTANBgkqhkiG9w0BAQsFADBzMQswCQYDVQQGEwJVSzEPMA0GA1UE
-						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzExMC8GA1UEAxMocGxh
-						dGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlLWpvdXJuYWxzLmNvbTAeFw0xNTAzMTMwNDI4MTFaFw0y
-						NTAzMTAwNDI4MTFaMHMxCzAJBgNVBAYTAlVLMQ8wDQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1h
-						Y21pbGxhbjEMMAoGA1UECxMDTlBHMTEwLwYDVQQDEyhwbGF0Zm9ybWRldi1zZWN1cmUucGFsZ3Jh
-						dmUtam91cm5hbHMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk6kdHSfzOdE6
-						77Nr5JqaQU3Ojyd13aCNsBepIBTbleg7Ynb525c9K6ydhSZ2dJzmUEkkNzhtzi9w/le80AyIRbJp
-						W8EjzczsYYZGn1/RyoonCziJist9rPgjpNHInDJWnl10FJZg51MSn2aV9FHckaa6+eP66X8mzxi8
-						ISI/BsNaLxPGl3tRPXQu1d4atxc4zyULzBMG0sDCwKjh0JXoa4e0fl46Y5KAGF1LQBa8+k5xIXfU
-						cvAs1AO+6kZUSGH8kfFzAK8TGFeFDo8HPyz3Mb1gdVPBAUljlQq+QhKnWGksm90NX5xjLOecipIE
-						4oFtiy3YGQLoeWuW5pXxm0WgjwIDAQABoyEwHzAdBgNVHQ4EFgQUn3g8SfL8rkx1Q7/9ngKz7H2s
-						uD0wDQYJKoZIhvcNAQELBQADggEBAG5Y61pz+LJVmqW6t2GyDpLAZg1S1xFtLk9dvqhJRovgTH4o
-						cCkP3QCMqx+AHPCsWKX55aH8oUI63ozP3BgFKzsGMhjprbag4ogXr0hn1kaTfKUH8sDR95/7NOuy
-						W3a0J8aMMF2zksR6PqNWOUqOvi7LR2IeKcDcsPiUXLeIqRBXkFLwg5U0mbK7BnkmLxtmqQifE9ri
-						9LGuGp9pdnxbTWnqvF+9f0WkWrq4h4H72+oYq997Kn9orv53qILaBnI+W5Y8dNmVAT+87IH3Lz4+
-						ZvLN9fSxfYhe2e8ffmz9+xWLV2K2pLPT/hfVr0OTRg3v+pJ3aB0obsBmkzluIZSMRIU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://platformdev-secure.palgrave-journals.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://platformdev-secure.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://platformdev-secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://platformdev-secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Palgrave Journals (platformdev)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-shibboleth.xml
deleted file mode 100644
index aab892b9..00000000
--- a/swamid-interfederations-2.0/platformdev-secure.palgraveconnect.com-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://platformdev-secure.palgraveconnect.com/shibboleth">
-  <!--
-		This is a Palgrave Connect OpenAthens SP for Macmillan Publishers Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-14T15:05:33Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXjCCAkagAwIBAgIEUA5y6zANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29ubmVj
-						dC5jb20wHhcNMTIwNzI0MTAwMzIzWhcNMTUwNzI0MTAwMzIzWjBxMQswCQYDVQQG
-						EwJVSzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNV
-						BAsTA05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29u
-						bmVjdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClpsvzfYR2
-						JlYzZElx7y+EoBqStGsaBrV2cLzxPRH6766SFX54bWVQEpPpO41Fdjh9+QHzglWk
-						XOCrO+bgTcqdat8t9pOTSxGuq5uu4wWNz7eGlXzaR54MKGU1T1XdNxGf++sStrvI
-						ggQh5XxdDUWn+mB5j0Q3IE0zUUQClDmvYhhXfSGd1iChHzO3z/jf+yEpflNVhdgo
-						XQJZW0OcwwV46X+BqH5NhWN+j44GHtDozvX+XAT1jp7qnchiXHcrsA6gjF1DuzNT
-						XuYa7GNo8inl6Mc+v1MaO3EaVZBc1tfuvkWBC/GLcuHGminyB3ckXZGoEuvqZ2HB
-						ve/IKaHz8OnzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKPsP4ULhqHt+J81MkAg
-						X/c61vNXrGIVZSrz3xea4TkKkvsKCWMo1FHqWjdciiXg+yooM6nrPxnnCyMojNuA
-						UG4c+tsa2uOfYoZdQ7SewVHGq0ybjrfXrrtD2BRfXwXq5SSF+x+XtaRTjCVIGBSr
-						+HzaaE6rIMeZTS+pBEXIegkYc8lnyCs0CpeX1Z+COEfQ4ciH+OuCMoDVheU0pkdm
-						1WY2k3rJluzt/ebVxpCr95vbzC+2P6dsSXNs8IOqic1AeKAPSULUKTLxNQ2xfMyt
-						oPw888JFFsXn54w5CfuyMgEQDCEr1p6s/+H0QQwfabvIs7qcyK6l3eMbILFqG0Wy
-						ZuQ=
-					</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>
-						MIIDXjCCAkagAwIBAgIEUA5y6zANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29ubmVj
-						dC5jb20wHhcNMTIwNzI0MTAwMzIzWhcNMTUwNzI0MTAwMzIzWjBxMQswCQYDVQQG
-						EwJVSzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNV
-						BAsTA05QRzEvMC0GA1UEAxMmcGxhdGZvcm1kZXYtc2VjdXJlLnBhbGdyYXZlY29u
-						bmVjdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClpsvzfYR2
-						JlYzZElx7y+EoBqStGsaBrV2cLzxPRH6766SFX54bWVQEpPpO41Fdjh9+QHzglWk
-						XOCrO+bgTcqdat8t9pOTSxGuq5uu4wWNz7eGlXzaR54MKGU1T1XdNxGf++sStrvI
-						ggQh5XxdDUWn+mB5j0Q3IE0zUUQClDmvYhhXfSGd1iChHzO3z/jf+yEpflNVhdgo
-						XQJZW0OcwwV46X+BqH5NhWN+j44GHtDozvX+XAT1jp7qnchiXHcrsA6gjF1DuzNT
-						XuYa7GNo8inl6Mc+v1MaO3EaVZBc1tfuvkWBC/GLcuHGminyB3ckXZGoEuvqZ2HB
-						ve/IKaHz8OnzAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKPsP4ULhqHt+J81MkAg
-						X/c61vNXrGIVZSrz3xea4TkKkvsKCWMo1FHqWjdciiXg+yooM6nrPxnnCyMojNuA
-						UG4c+tsa2uOfYoZdQ7SewVHGq0ybjrfXrrtD2BRfXwXq5SSF+x+XtaRTjCVIGBSr
-						+HzaaE6rIMeZTS+pBEXIegkYc8lnyCs0CpeX1Z+COEfQ4ciH+OuCMoDVheU0pkdm
-						1WY2k3rJluzt/ebVxpCr95vbzC+2P6dsSXNs8IOqic1AeKAPSULUKTLxNQ2xfMyt
-						oPw888JFFsXn54w5CfuyMgEQDCEr1p6s/+H0QQwfabvIs7qcyK6l3eMbILFqG0Wy
-						ZuQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://platformdev-secure.palgraveconnect.com/pc/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://platformdev-secure.palgraveconnect.com/pc/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://platformdev-secure.palgraveconnect.com/pc/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://platformdev-secure.palgraveconnect.com/pc/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Macmillan Publishers Limited: Palgrave Connect Dev</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.palgraveconnect.com/pc/info/about.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mohammad</GivenName>
-    <SurName>Nawab</SurName>
-    <EmailAddress>mailto:m.nawab@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/play.smdb.kb.se.xml b/swamid-interfederations-2.0/play.smdb.kb.se.xml
deleted file mode 100644
index 12a56243..00000000
--- a/swamid-interfederations-2.0/play.smdb.kb.se.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://play.smdb.kb.se">
-  <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.swamid.se/category/nren-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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="sv">Kungliga biblioteket play</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">National Library of Sweden play</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Detta är KBs play tjänst</mdui:Description>
-        <mdui:Description xml:lang="en">This is the National Library of Sweden's streaming service</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>MIIE0DCCA7igAwIBAgIJAIVemh/NkBf6MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTAeFw0xNTA5MjMwNjUyMTdaFw0yNTA5MjIwNjUyMTdaMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAqnmzZy6S0sM4OSLW9W6VDwpM7jraeyZQKepi26wv0bIiMY9d+JU0CFmLIrsiiiLsUaX+xJLfwFpiWv5U0SbvdmOsxfOnhkMW4HtO/H/0C1SIAvGIlN7iYey4Opnq3qCD8nUxGx4OhfP9CoXLPgIwnkq4XRFL4QPFmWR8MYwF/3YGYnHY4wxq8dOQyjoLrnoGUeT9CrLIv+wwNURzyUKa4eiu/vR4X7Hnisva0IcEtVtGrcYUQNwgp49rWNNdcROrJv0RFTsLGriGMXl6744U0PHhroQSyBGmsV8dQgWvB5j6MhhVIRMiu6tVTwrywA2ye3UqpAozm9lGXS4vXdaECAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSAer//jPOQuvPbeMpFE/rlhdR/tzCB1QYDVR0jBIHNMIHKgBSAer//jPOQuvPbeMpFE/rlhdR/t6GBpqSBozCBoDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMR0wGwYDVQQKExRLdW5nbGlnYSBCaWJsaW90ZWtldDELMAkGA1UECxMCS0IxGDAWBgNVBAMUD0pvYWtpbSBTasO2YmVyZzEjMCEGCSqGSIb3DQEJARYUam9ha2ltLnNqb2JlcmdAa2Iuc2WCCQCFXpofzZAX+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAvr/ohwnBchzzdoEFcj7dOBquPk+9AP9iS4RlzBiWpb2l02A8Tv0kDpTgCz/eY0bIGsMEBMwQE9ys9gH5X94tA7OAsLyxYVXpgDGWDmr1eS5JX6o1KX18FbdHOibLowHVlZQMVQYb0+9lL5+ddw8/4CoypxD1vNgw0U+7cL7xmyHaqK6Jt1sxcGm08ZEBPFqQFXduUZ20q5IgR/xWO8ei2oh7TfDWTc5yv1XgzVnGKf5uddLYnNPaIU7w3tbqRsDjJOmb3GMfUQfj7ptz2rhU5Z7Dh3qRHDAzoRrqPBneN4/jV0bE2EtDu4Iv19oG/fdJuInNEb1/8E13/spMXwcoQ</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>MIIE0DCCA7igAwIBAgIJAIVemh/NkBf6MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTAeFw0xNTA5MjMwNjUyMTdaFw0yNTA5MjIwNjUyMTdaMIGgMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xHTAbBgNVBAoTFEt1bmdsaWdhIEJpYmxpb3Rla2V0MQswCQYDVQQLEwJLQjEYMBYGA1UEAxQPSm9ha2ltIFNqw7ZiZXJnMSMwIQYJKoZIhvcNAQkBFhRqb2FraW0uc2pvYmVyZ0BrYi5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKAqnmzZy6S0sM4OSLW9W6VDwpM7jraeyZQKepi26wv0bIiMY9d+JU0CFmLIrsiiiLsUaX+xJLfwFpiWv5U0SbvdmOsxfOnhkMW4HtO/H/0C1SIAvGIlN7iYey4Opnq3qCD8nUxGx4OhfP9CoXLPgIwnkq4XRFL4QPFmWR8MYwF/3YGYnHY4wxq8dOQyjoLrnoGUeT9CrLIv+wwNURzyUKa4eiu/vR4X7Hnisva0IcEtVtGrcYUQNwgp49rWNNdcROrJv0RFTsLGriGMXl6744U0PHhroQSyBGmsV8dQgWvB5j6MhhVIRMiu6tVTwrywA2ye3UqpAozm9lGXS4vXdaECAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSAer//jPOQuvPbeMpFE/rlhdR/tzCB1QYDVR0jBIHNMIHKgBSAer//jPOQuvPbeMpFE/rlhdR/t6GBpqSBozCBoDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9sbTESMBAGA1UEBxMJU3RvY2tob2xtMR0wGwYDVQQKExRLdW5nbGlnYSBCaWJsaW90ZWtldDELMAkGA1UECxMCS0IxGDAWBgNVBAMUD0pvYWtpbSBTasO2YmVyZzEjMCEGCSqGSIb3DQEJARYUam9ha2ltLnNqb2JlcmdAa2Iuc2WCCQCFXpofzZAX+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAvr/ohwnBchzzdoEFcj7dOBquPk+9AP9iS4RlzBiWpb2l02A8Tv0kDpTgCz/eY0bIGsMEBMwQE9ys9gH5X94tA7OAsLyxYVXpgDGWDmr1eS5JX6o1KX18FbdHOibLowHVlZQMVQYb0+9lL5+ddw8/4CoypxD1vNgw0U+7cL7xmyHaqK6Jt1sxcGm08ZEBPFqQFXduUZ20q5IgR/xWO8ei2oh7TfDWTc5yv1XgzVnGKf5uddLYnNPaIU7w3tbqRsDjJOmb3GMfUQfj7ptz2rhU5Z7Dh3qRHDAzoRrqPBneN4/jV0bE2EtDu4Iv19oG/fdJuInNEb1/8E13/spMXwcoQ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.smdb.kb.se/user/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://play.smdb.kb.se/user/authenticate" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SMDB Play</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SMDB Play</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://play.smdb.kb.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml b/swamid-interfederations-2.0/playgen.a-n.co.uk-shibboleth.xml
deleted file mode 100644
index 1fd5c498..00000000
--- a/swamid-interfederations-2.0/playgen.a-n.co.uk-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://playgen.a-n.co.uk/shibboleth">
-  <!--
-		This is an "a-n Resources" Shibboleth SP for An:Artists Information Company.
-	-->
-  <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#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="2013-10-17T15:04:22Z">
-      <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://playgen.a-n.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://playgen.a-n.co.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">a-n Resource</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Resource for visual artists: news, reviews, debate, research, publications, guides, toolkits....</mdui:Description>
-        <mdui:Logo height="100" width="197">https://www.a-n.co.uk/wp-content/themes/a-n/img/a-nlogoforfederation.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIJALZ0HnVpTZsXMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEXBsYXlnZW4uYS1uLmNvLnVrMB4XDTEzMTAxODExMTYwMloXDTE2MTAxNzEx
-						MTYwMlowHDEaMBgGA1UEAxMRcGxheWdlbi5hLW4uY28udWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDGy7TgC2JyLa2SqOL0bKb3UZrkBMHI3+FKgZtl
-						AeQvpKyZ8I9wG139BAdYIZlKH+RUIj/Wd2Wa69IZDnU/P20iKKQmBrheWna8ce3x
-						vGRi4q7Qp4xk+Oks/3KF3N48PYLy6JWQvOKlzkDo+vZndMwrZITINkJ+WwtWabBr
-						85yQ+g2OCnqjznYVIyzVyWaWwD7EW/x5kyDi70nYVUQ8fR21T3m64hoNfD9cPhF1
-						Uq/qvtls5ubHJWiZDoUG5OX1jhMPPtd0zwt+vNzlkm1RfnYC7WrW5WeL1WrhRU/V
-						Sozkoxl36qJwtZQAYhOXSs9lKrnX+yE2lXQRR5hlQId52oMlAgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEXBsYXlnZW4uYS1uLmNvLnVrhiRodHRwczovL3BsYXlnZW4uYS1u
-						LmNvLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFIeK96KEhd/EQmjx2xd3pj8Zeu+l
-						MA0GCSqGSIb3DQEBBQUAA4IBAQA+Po3EcuVGKS41nGDet0fD7fyEQ4sOPeCe65/T
-						PMYWByMs53FXHlB32xObJruW/cFyoDMFhwWq4D5FwmYpGnyC1TQBrR7K25yP6ZuT
-						9ogMtqKb/VIx/UlIcfiaDHZJWW4N6qF6MAwX8Qpv7ek9PQ3/ZiFdzbtEZqDd/grz
-						NtSKUusX30kNI9tAc2qvsccGEuzWWLI6h82aipoHtvb2CF+yYkS060MItJZreMSp
-						YfJHyQM480FeByWQGkzZyPOhIWIfrC0ynOBhkzKrPvjaLp+M4BHnixlVSBvjsRjH
-						8CVDPzFaPDFn3WDvQFi2bmBYvnIG3ULMJIcdjIVIoIOhe3Sz
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://playgen.a-n.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://playgen.a-n.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">An:Artists Information Company</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">a-n Resource</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.a-n.co.uk/about_an/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Eleonora</GivenName>
-    <SurName>Schinella</SurName>
-    <EmailAddress>mailto:Eleonora.Schinella@a-n.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Eleonora</GivenName>
-    <SurName>Schinella</SurName>
-    <EmailAddress>mailto:Eleonora.Schinella@a-n.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pleiades.lesoco.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/pleiades.lesoco.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index ec0eba64..00000000
--- a/swamid-interfederations-2.0/pleiades.lesoco.ac.uk-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://pleiades.lesoco.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for LeSoCo.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-27T15:24:20Z">
-      <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">lesoco.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVAKbHiecwCXwEW8jzRANDUcHw0nS3MA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFXBsZWlhZGVzLmxlc29jby5hYy51azAeFw0xMzA5MDQx
-						NDQ5MjBaFw0zMzA5MDQxNDQ5MjBaMCAxHjAcBgNVBAMTFXBsZWlhZGVzLmxlc29j
-						by5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPujg+dd0hL+
-						ZJb26+crh6T4fcFpxBBdaKNGTF1LNu5esjitzTXrAnijQVB4y1P5lR/fmqO+ajmA
-						x3hoPL7UNgH7ID5fgyMLNzzox82qoByHejpswLKp+4Snvt7bhxo/6w97iKV1Sjh3
-						pRRtxoeRBq7uxnL8e5WFbr7Ew9MFGDlD07ytU1gLVXZCg8+zxUU+BJ6PwLKnvujE
-						hYdC+A+DDAcHWGF6BlQaDjH1CXmh66E9zCRJ6YSLvazKqcJiaGbOP9skQ0Rgo4Lu
-						Xq1qXbfHxKbBhTcQbqvjSnzuMLLKrX0mGWugn+sfk7cwIXNNgBs+JbI8AfNF7dTs
-						J6e9Qasq25UCAwEAAaNxMG8wTgYDVR0RBEcwRYIVcGxlaWFkZXMubGVzb2NvLmFj
-						LnVrhixodHRwczovL3BsZWlhZGVzLmxlc29jby5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUA1OBiJSoiADL+KSZEPRvSD86g0YwDQYJKoZIhvcNAQEFBQAD
-						ggEBAISZ2JQYw5QMKpAL5VZh0/noDgzh+zYZWjDwj8w4PmvFqi7ZXyu+jLUcwU8C
-						HCSmMn/ehuxZ2zR8I1qqFSbASBPTmAcYvoK4gEVyXHVEQVkwJNj0gG39UzYcymO6
-						if1dnoQNOpU/a0wIxjtN4XqBamWuDybeb5vzGtWUDFlHn8kBMeNQjK8OjdPwF91X
-						dHvlCj9Ab4Uvebf2faiFpEykRznumWXGzFmfqHyXlwXbomP/wBN56GbiWQUEc2+1
-						MlS0EzvvZ6OgubfsZWeevOMHj5lPtwQGVrxtssl9uWEeA7ca7ZJq8J57Bk6IJIwc
-						TtsUWjpvdWLpLWoB34gTflTw080=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pleiades.lesoco.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pleiades.lesoco.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://pleiades.lesoco.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pleiades.lesoco.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pleiades.lesoco.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pleiades.lesoco.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">lesoco.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVAKbHiecwCXwEW8jzRANDUcHw0nS3MA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFXBsZWlhZGVzLmxlc29jby5hYy51azAeFw0xMzA5MDQx
-						NDQ5MjBaFw0zMzA5MDQxNDQ5MjBaMCAxHjAcBgNVBAMTFXBsZWlhZGVzLmxlc29j
-						by5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPujg+dd0hL+
-						ZJb26+crh6T4fcFpxBBdaKNGTF1LNu5esjitzTXrAnijQVB4y1P5lR/fmqO+ajmA
-						x3hoPL7UNgH7ID5fgyMLNzzox82qoByHejpswLKp+4Snvt7bhxo/6w97iKV1Sjh3
-						pRRtxoeRBq7uxnL8e5WFbr7Ew9MFGDlD07ytU1gLVXZCg8+zxUU+BJ6PwLKnvujE
-						hYdC+A+DDAcHWGF6BlQaDjH1CXmh66E9zCRJ6YSLvazKqcJiaGbOP9skQ0Rgo4Lu
-						Xq1qXbfHxKbBhTcQbqvjSnzuMLLKrX0mGWugn+sfk7cwIXNNgBs+JbI8AfNF7dTs
-						J6e9Qasq25UCAwEAAaNxMG8wTgYDVR0RBEcwRYIVcGxlaWFkZXMubGVzb2NvLmFj
-						LnVrhixodHRwczovL3BsZWlhZGVzLmxlc29jby5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUA1OBiJSoiADL+KSZEPRvSD86g0YwDQYJKoZIhvcNAQEFBQAD
-						ggEBAISZ2JQYw5QMKpAL5VZh0/noDgzh+zYZWjDwj8w4PmvFqi7ZXyu+jLUcwU8C
-						HCSmMn/ehuxZ2zR8I1qqFSbASBPTmAcYvoK4gEVyXHVEQVkwJNj0gG39UzYcymO6
-						if1dnoQNOpU/a0wIxjtN4XqBamWuDybeb5vzGtWUDFlHn8kBMeNQjK8OjdPwF91X
-						dHvlCj9Ab4Uvebf2faiFpEykRznumWXGzFmfqHyXlwXbomP/wBN56GbiWQUEc2+1
-						MlS0EzvvZ6OgubfsZWeevOMHj5lPtwQGVrxtssl9uWEeA7ca7ZJq8J57Bk6IJIwc
-						TtsUWjpvdWLpLWoB34gTflTw080=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pleiades.lesoco.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pleiades.lesoco.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">LeSoCo</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">LeSoCo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lesoco.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dan</GivenName>
-    <SurName>Humphries</SurName>
-    <EmailAddress>mailto:dan.humphries@lesoco.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>West</SurName>
-    <EmailAddress>mailto:John.West@lesoco.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/plymouth.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/plymouth.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index f399683f..00000000
--- a/swamid-interfederations-2.0/plymouth.idm.oclc.org-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://plymouth.idm.oclc.org/shibboleth">
-  <!--
-		This is a "Plymouth University" EZproxy SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-10T08:10: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 ">
-    <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://login.plymouth.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEETCCAvmgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBoMSAwHgYDVQQDFBcqLnBs
-						eW1vdXRoLmlkbS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMx
-						KDAmBgkqhkiG9w0BCQEWGWphbWVzLmh1dGNoaW5zb25Ab2NsYy5vcmcwHhcNMTQx
-						MTA2MDk0MDI3WhcNMjQxMTA1MDk0MDI3WjBoMSAwHgYDVQQDFBcqLnBseW1vdXRo
-						LmlkbS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxKDAmBgkq
-						hkiG9w0BCQEWGWphbWVzLmh1dGNoaW5zb25Ab2NsYy5vcmcwggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCuSNLwavt673OzkEej1fIP9HcNwOTTe26lJ16u
-						q1OKPqzwFMbqZchzJb2ztNCyzUAO0MxlolD9JXQ9YMr8YtwWeZVGyvkf4FKUBA1c
-						IyN8H7M5SuvtuxMsJdFnT5gje9uSUWL/64jjkrjMEDcXRbWYo2nbJwDV7ee2TIE0
-						U8+JNsFthZ0GrCzZ70xHx+VWCUIhNZv4/3n0iGHztTJvgs3JG28k5neYq39g3OBv
-						S+sc9xR2dwGXelf55dkI0WbIDf5x5l1CmbzlKA+gQJKf2462i56SbCgzqENcNNaW
-						PsaTvD8ffl9TlAmcV0YXuAaZkCi7vkeMyihWfVd+Hr9Wbn6/AgMBAAGjgcUwgcIw
-						HQYDVR0OBBYEFJCWYysoHhiotHTwQjgzoc6p7oGCMIGSBgNVHSMEgYowgYeAFJCW
-						YysoHhiotHTwQjgzoc6p7oGCoWykajBoMSAwHgYDVQQDFBcqLnBseW1vdXRoLmlk
-						bS5vY2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxKDAmBgkqhkiG
-						9w0BCQEWGWphbWVzLmh1dGNoaW5zb25Ab2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB
-						/zANBgkqhkiG9w0BAQUFAAOCAQEARRtwHtlFqlIHE6Nuu7cUw/o5fxEUFnTVV2M3
-						SBRCo6rF/Msjr5OGP2M2Z+jKbxFHAPFlgiu/PnPbdByiiaErnFlnJmUP/7OZrPsc
-						TcsIHGFgHws25yGWdZC5GZx1jTSwW3qyARN9+4C95K74jBIEKfR5BksuUIo1Asx6
-						20zAuzlfMrBAuc99gaAZdWMERpZT2UXTKoPxZiF9y0W2OCspiMh52JeXtkz6nSac
-						7VL9EoyXOzN2+FHbYqklWkem9aYNyz3fhoaydMwyaYL5bNySawbe4G6Fpk3GggWX
-						fVux9oGcU7F9DO1KMou6PeO1G44DB8z6KE6KxwE2WSzQ21eAxA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.plymouth.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Plymouth University Hosted EZProxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-</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 a8a1b5f9..00000000
--- a/swamid-interfederations-2.0/portail.u-picardie.fr.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" entityID="https://portail.u-picardie.fr">
-  <md: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>
-    <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>https://federation.renater.fr/category/wifi</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Captive Portal UPJV</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://portail.u-picardie.fr/shibauth.php</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portail.u-picardie.fr/Shibboleth.sso/SAML/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portail.u-picardie.fr/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Portail Captif UPJV</md:ServiceName>
-      <md:ServiceName xml:lang="en">Captive Portal UPJV</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Eduspot</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Eduspot</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Picardie Jules Verne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Picardie Jules Verne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.u-picardie.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Christophe Dupreuil</md:SurName>
-    <md:EmailAddress>christophe.dupreuil@u-picardie.fr</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
index 0698ed07..ecd37fa2 100644
--- a/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
+++ b/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
@@ -1,37 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portal.clarin.inl.nl/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:29:50Z">
-      <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:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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://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/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">INL Portal - CLARIN Dienste</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">INL portal - CLARIN services</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Institut für Niederländische Lexikologie (INL) Vorhaben, die CLARIN-Infrastruktur angeschlossen.</mdui:Description>
-        <mdui:Description xml:lang="en">Institute for Dutch Lexicology (INL) projects attached to the CLARIN infrastructure.</mdui:Description>
-        <mdui:Logo height="9" width="16">https://portal.clarin.inl.nl/images/logo_portal_verysmall.jpg</mdui:Logo>
-        <mdui:Logo height="281" width="500">https://portal.clarin.inl.nl/images/logo_portal.jpg</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://portal.clarin.inl.nl/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/Data_Protection_Code_of_Conduct_INL.pdf</mdui:PrivacyStatementURL>
+      <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="fi">Hollannin kielen lähderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian työkaluja.</mdui:Description>
+        <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:InformationURL xml:lang="en">http://portal.clarin.inl.nl</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://portal.clarin.inl.nl/doc/Data_Protection_Code_of_Conduct_INL.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/end_user_license_agreement.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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>portal.clarin.inl.nl</ds:KeyName>
+      <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
@@ -62,46 +49,46 @@ 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>
     </md:KeyDescriptor>
-    <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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">INL Portal - CLARIN Dienste</md:ServiceName>
-      <md:ServiceName xml:lang="en">INL portal - CLARIN services</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Institut für Niederländische Lexikologie (INL) Vorhaben, die CLARIN-Infrastruktur angeschlossen.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Institute for Dutch Lexicology (INL) projects attached to the CLARIN infrastructure.</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: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://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="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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="administrative">
-    <md:GivenName>servicedesk@inl.nl</md:GivenName>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>systeembeheer@inl.nl</md:GivenName>
     <md:SurName>INL</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
+    <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: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: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.edu-host.com-shibboleth.xml b/swamid-interfederations-2.0/portal.edu-host.com-shibboleth.xml
deleted file mode 100644
index ef2532cc..00000000
--- a/swamid-interfederations-2.0/portal.edu-host.com-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://portal.edu-host.com/shibboleth">
-  <!--
-		This is an "Edu-Host.com" Shibboleth SP for Overt Software Solutions Ltd.
-	-->
-  <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="2016-02-12T11:03:28Z">
-      <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://portal.edu-host.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://portal.edu-host.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Edu-Host.com</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Free web hosting for education.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJjCCAg4CCQCJr4zArRpCITANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJH
-						QjEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5MREwDwYDVQQKDAhFZHUgSG9zdDEcMBoG
-						A1UEAwwTcG9ydGFsLmVkdS1ob3N0LmNvbTAeFw0xNjAyMTAxMjI4NThaFw0zNjAy
-						MDUxMjI4NThaMFUxCzAJBgNVBAYTAkdCMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkx
-						ETAPBgNVBAoMCEVkdSBIb3N0MRwwGgYDVQQDDBNwb3J0YWwuZWR1LWhvc3QuY29t
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyhBVgYhMUstlnr782fm2
-						BfbC2dUqwLgCnutyX+3UyeDT0a9dCQTtNC4etwPWbghUphaDGqP8Q4EjHlLIY5fh
-						UraaI6G98bQjacjHmAMVarRJHx9rLMgDNe67LpWHFYBV+WRF0c+pjOhTESQF1IQH
-						EWlfL6nFjRcpxkEuwNqNQgwsT2jIJAxAzYT9uUxBnukSa46E2k8iSYi6gGBVvbxb
-						zIZ7F71T5/Kmc6mNG0UrjD3kXfXLmydied0EK6SZLc3JJShic2qzl4fYSU5iOeGT
-						Ahp3Et8MkRIoKwjD1fIrOsZVXXqMyZuFg1HLuocCTgPnh43rUcdBuv2yoMhzvJqK
-						EwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAeEeMsrThy0nejmvfa2Wsjw5BgVMFF
-						hwz+K2uG8ZoVUL8e/t5k3trexUM1RSxoHZdIaHb+7QnCMFsU8rjF9ghfn86OOKIx
-						2r6hv0wmUG2jB0Mtov2LTLFfawzRQU9wyckJjpWzKVqCJ5UwSV5KJfeF2RGgfp+k
-						Naqwjo/z2as6Gwo9E7Xnloz/QT31An15ukYVVSSm6Oi3970UUsuSPcj5ZEiWOzem
-						BPFO5kpcHn/8Q16JLAruj6hUpCV1ka/jQYXjV+uSVGPT5O+gq88VkY/HQv3FOyCe
-						cjzHoNHRTx4a/SCLa9INKR2MWmInkTVjx2ThTM0ld2Pzig+SgSXY5q9N
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.edu-host.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portal.edu-host.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portal.edu-host.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.edu-host.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.edu-host.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.edu-host.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://portal.edu-host.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portal.edu-host.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portal.edu-host.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portal.edu-host.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.edu-host.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Edu-Host.com</ServiceName>
-      <ServiceDescription xml:lang="en">Free web hosting for education.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Overt Software Solutions Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Edu-Host.com</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edu-host.com/about-us/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@edu-host.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@edu-host.com</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 410fa43b..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://assent.jisc.ac.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://assent.jisc.ac.uk/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://assent.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://assent.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://assent.jisc.ac.uk/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://assent.jisc.ac.uk/</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 5a1535d7..00000000
--- a/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://portofranco.ufma.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxMDAuBgNVBAoTJ1VGTUEgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmhhbzEMMAoGA1UECxMDTlRJMSEw
-HwYJKoZIhvcNAQkBFhJkaWVnby5sdWlzQHVmbWEuYnIxETAPBgNVBAcTCFNhbyBM
-dWlzMREwDwYDVQQIEwhNYXJhbmhhbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3Bv
-cnRvZnJhbmNvLnVmbWEuYnIwHhcNMTUxMTA5MjA0MTAyWhcNMTgxMTA4MjA0MTAy
-WjCBtDEwMC4GA1UEChMnVUZNQSAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIE1h
-cmFuaGFvMQwwCgYDVQQLEwNOVEkxITAfBgkqhkiG9w0BCQEWEmRpZWdvLmx1aXNA
-dWZtYS5icjERMA8GA1UEBxMIU2FvIEx1aXMxETAPBgNVBAgTCE1hcmFuaGFvMQsw
-CQYDVQQGEwJCUjEcMBoGA1UEAxMTcG9ydG9mcmFuY28udWZtYS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ8qhiylWVK+Op8tJPWa5HtGHUwgdTCk
-ihewKun6bvySKb+9A4iMXgYehtIty9lV23IaHlxDKbgGRcXjWInEwextjGToXyZB
-wRz+e4Y2joCVKw/iLOt6r5lKPEENlbYczz0+XfK3egibfibt1EbLr8Yyj/QW/6zY
-y1prsXNwGYe2vFDEMHwcrBr3Z7IpFsJGJ/9xw9UmobmwQhdny2xVq+tmYgWtFDDY
-bkc8FYk/I628ObZuKCOvaakJJkNvoFJkyZDwvOcs0tFL4560nztuRsdglbqjSl8N
-WzQ5JTM/vtIshIkYMBAjuCT5QxGDG3DwnVB0dj85dTibudQlZarD53sCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEATOK9hSMoC68PEsh4oeG81ZLpp97dwe9yNeuGq4Ly
-lYF2ikH0SIRCnj9GQ2+MyoEzbonA/ludt7ZAJfkKz0Kt+V0OL4NIF1z3D25PDlDb
-eSvL3M2EC8Dn2s7dr+cFvt2KACbRa3yRz3TmBoSHBlX1nUB33jVMIOHyKpLAKyVz
-WskJDJaGkQHHnzgWFBByR/hnx2+78lh0b65fN71yNvIurLmyCU5pPktvBpCIGB6e
-q75Pgfria4aDAF9QLVPkjsGH9v67hyUm6UVG3wWVQIPDr8yPJuyjpBQMsQjh0joV
-KppwAy5eNWAi4mWRFM4cGIz4BEG+BogTKBTVyF1/sNjC6Q==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portofranco.ufma.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://portofranco.ufma.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portofranco.ufma.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://portofranco.ufma.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://portofranco.ufma.br/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">ufma.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID3jCCAsYCAQAwDQYJKoZIhvcNAQEFBQAwgbQxMDAuBgNVBAoTJ1VGTUEgLSBV
-bml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBNYXJhbmhhbzEMMAoGA1UECxMDTlRJMSEw
-HwYJKoZIhvcNAQkBFhJkaWVnby5sdWlzQHVmbWEuYnIxETAPBgNVBAcTCFNhbyBM
-dWlzMREwDwYDVQQIEwhNYXJhbmhhbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3Bv
-cnRvZnJhbmNvLnVmbWEuYnIwHhcNMTUxMTA5MjA0MTAyWhcNMTgxMTA4MjA0MTAy
-WjCBtDEwMC4GA1UEChMnVUZNQSAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRvIE1h
-cmFuaGFvMQwwCgYDVQQLEwNOVEkxITAfBgkqhkiG9w0BCQEWEmRpZWdvLmx1aXNA
-dWZtYS5icjERMA8GA1UEBxMIU2FvIEx1aXMxETAPBgNVBAgTCE1hcmFuaGFvMQsw
-CQYDVQQGEwJCUjEcMBoGA1UEAxMTcG9ydG9mcmFuY28udWZtYS5icjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ8qhiylWVK+Op8tJPWa5HtGHUwgdTCk
-ihewKun6bvySKb+9A4iMXgYehtIty9lV23IaHlxDKbgGRcXjWInEwextjGToXyZB
-wRz+e4Y2joCVKw/iLOt6r5lKPEENlbYczz0+XfK3egibfibt1EbLr8Yyj/QW/6zY
-y1prsXNwGYe2vFDEMHwcrBr3Z7IpFsJGJ/9xw9UmobmwQhdny2xVq+tmYgWtFDDY
-bkc8FYk/I628ObZuKCOvaakJJkNvoFJkyZDwvOcs0tFL4560nztuRsdglbqjSl8N
-WzQ5JTM/vtIshIkYMBAjuCT5QxGDG3DwnVB0dj85dTibudQlZarD53sCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEATOK9hSMoC68PEsh4oeG81ZLpp97dwe9yNeuGq4Ly
-lYF2ikH0SIRCnj9GQ2+MyoEzbonA/ludt7ZAJfkKz0Kt+V0OL4NIF1z3D25PDlDb
-eSvL3M2EC8Dn2s7dr+cFvt2KACbRa3yRz3TmBoSHBlX1nUB33jVMIOHyKpLAKyVz
-WskJDJaGkQHHnzgWFBByR/hnx2+78lh0b65fN71yNvIurLmyCU5pPktvBpCIGB6e
-q75Pgfria4aDAF9QLVPkjsGH9v67hyUm6UVG3wWVQIPDr8yPJuyjpBQMsQjh0joV
-KppwAy5eNWAi4mWRFM4cGIz4BEG+BogTKBTVyF1/sNjC6Q==
-                          
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://portofranco.ufma.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://portofranco.ufma.br:8443/idp/profile/SAML1/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">UFMA - Universidade Federal do Maranhao</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFMA - Universidade Federal do Maranhao</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFMA - Universidade Federal do Maranhao</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufma.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufma.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Diego Figueiredo</md:SurName>
-    <md:EmailAddress>diego.luis@ufma.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/pp.webauth.soton.ac.uk-shibboleth.xml
deleted file mode 100644
index 33459f86..00000000
--- a/swamid-interfederations-2.0/pp.webauth.soton.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://pp.webauth.soton.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth Test IdP for the University of Southampton.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-02T14:13:42Z">
-      <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">soton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIVAKwAy5Y30bYosT2rmKq0Nj3qJE+DMA0GCSqGSIb3DQEB
-						BQUAMCExHzAdBgNVBAMTFnBwLndlYmF1dGguc290b24uYWMudWswHhcNMTEwNDA1
-						MTYxNTA5WhcNMzEwNDA1MTYxNTA5WjAhMR8wHQYDVQQDExZwcC53ZWJhdXRoLnNv
-						dG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhsR/mkH2
-						pEjNzEduiMVW7wu/no0JAcOD/EcR9ahH61oTkQMgfgMen7daVq7inRLptsV/bI1m
-						WTF+Tzh49zxomLsHpf88yt8AbGMVy2oTWU69H4AN2b3L81h2psONA8AgHU/8ifUY
-						RKtAmXGPd4Po5fVqG8zrTys/QKYAZJF4uUaCNSsSE5s5YnbTQieq69N/Z9TjhgUx
-						W2hKmjKze2wPmyR2FVT/mqY8J8aLRL/VYXees210zs1F5V+PDVrfblrlrvy8vYG0
-						V7vktx+P8P12hwj+dDy2i6Re7R02W5WNrPq6Yu66Q7IkUCeFkclCIom6JEXz8XUP
-						7lSL3h2EhUOgXQIDAQABo3MwcTBQBgNVHREESTBHghZwcC53ZWJhdXRoLnNvdG9u
-						LmFjLnVrhi1odHRwczovL3BwLndlYmF1dGguc290b24uYWMudWsvaWRwL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFBTJEexZ7VRA9DX/eiB9OwNfBS5jMA0GCSqGSIb3DQEB
-						BQUAA4IBAQAw2wkGyB4qxKKCRDKddaje78ND2bkMl0mKWBMDujL7KIYIOZvbkCL1
-						9InkQvU+PIu6lIFUvfmx2AbccHWf/o2IKi83UOrvb/e3QocIqnOIA0fX6Ivsnr88
-						JfkdJfXNBh8ucc1N6joFNX2a8mR4ywv/QRAwHujF+AwsHz9AiBYJHV9YgbSKo326
-						6cCK0I5oyB3iimdExWcc+a074sggo5kujGJhxhnHbB6BNFGjkc5kG+KR9udWk06t
-						EddY9+fUrCdg5phPGLs5NLiYi7mTepVcUKkO07jjxON2mLDiRsVQpzMRoo7hscag
-						zdj3Io3snavfZFcTxv/baypmvAmZ0ymK
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pp.webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp.webauth.soton.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://pp.webauth.soton.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pp.webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pp.webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pp.webauth.soton.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">soton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIVAKwAy5Y30bYosT2rmKq0Nj3qJE+DMA0GCSqGSIb3DQEB
-						BQUAMCExHzAdBgNVBAMTFnBwLndlYmF1dGguc290b24uYWMudWswHhcNMTEwNDA1
-						MTYxNTA5WhcNMzEwNDA1MTYxNTA5WjAhMR8wHQYDVQQDExZwcC53ZWJhdXRoLnNv
-						dG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhsR/mkH2
-						pEjNzEduiMVW7wu/no0JAcOD/EcR9ahH61oTkQMgfgMen7daVq7inRLptsV/bI1m
-						WTF+Tzh49zxomLsHpf88yt8AbGMVy2oTWU69H4AN2b3L81h2psONA8AgHU/8ifUY
-						RKtAmXGPd4Po5fVqG8zrTys/QKYAZJF4uUaCNSsSE5s5YnbTQieq69N/Z9TjhgUx
-						W2hKmjKze2wPmyR2FVT/mqY8J8aLRL/VYXees210zs1F5V+PDVrfblrlrvy8vYG0
-						V7vktx+P8P12hwj+dDy2i6Re7R02W5WNrPq6Yu66Q7IkUCeFkclCIom6JEXz8XUP
-						7lSL3h2EhUOgXQIDAQABo3MwcTBQBgNVHREESTBHghZwcC53ZWJhdXRoLnNvdG9u
-						LmFjLnVrhi1odHRwczovL3BwLndlYmF1dGguc290b24uYWMudWsvaWRwL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFBTJEexZ7VRA9DX/eiB9OwNfBS5jMA0GCSqGSIb3DQEB
-						BQUAA4IBAQAw2wkGyB4qxKKCRDKddaje78ND2bkMl0mKWBMDujL7KIYIOZvbkCL1
-						9InkQvU+PIu6lIFUvfmx2AbccHWf/o2IKi83UOrvb/e3QocIqnOIA0fX6Ivsnr88
-						JfkdJfXNBh8ucc1N6joFNX2a8mR4ywv/QRAwHujF+AwsHz9AiBYJHV9YgbSKo326
-						6cCK0I5oyB3iimdExWcc+a074sggo5kujGJhxhnHbB6BNFGjkc5kG+KR9udWk06t
-						EddY9+fUrCdg5phPGLs5NLiYi7mTepVcUKkO07jjxON2mLDiRsVQpzMRoo7hscag
-						zdj3Io3snavfZFcTxv/baypmvAmZ0ymK
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://pp.webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pp.webauth.soton.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">University of Southampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Southampton (Testing)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.soton.ac.uk/iss/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Serviceline</GivenName>
-    <EmailAddress>mailto:Serviceline@soton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Clayton</GivenName>
-    <SurName>Peters</SurName>
-    <EmailAddress>mailto:C.L.Peters@soton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ppms.eu-shibboleth.xml b/swamid-interfederations-2.0/ppms.eu-shibboleth.xml
deleted file mode 100644
index 8eba4a98..00000000
--- a/swamid-interfederations-2.0/ppms.eu-shibboleth.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://ppms.eu/shibboleth">
-  <!--
-		This is a "PPMS core facility management solution" Shibboleth SP for Stratocore.
-	-->
-  <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="2014-09-19T16:57:33Z">
-      <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://ppms.eu/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="59" width="143">https://ppms.eu/stratocore.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">PPMS core facility management solution</mdui:DisplayName>
-        <mdui:Description xml:lang="en">PPMS is a powerful, feature rich core facility resource management solution</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC8TCCAdmgAwIBAgIJAPz0WtwkZDRdMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDmV1MS1zdHJhdG9jb3JlMB4XDTEzMDIyMDAyMTc0M1oXDTIzMDIxODAyMTc0
-						M1owGTEXMBUGA1UEAxMOZXUxLXN0cmF0b2NvcmUwggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDCYe74FvKADvVsBi9j+q8cpjOQBOu2IEbdgXBT+0UNiYFp
-						p9/gMt08fbGxcXDxzKBqZ9wvjnslhXgpFrZKbD3uY1I9sEiA1rqDYmplgMwZ4A8E
-						Ow+/qRqm5t4VQ0JOZzTYccgzelBQRyl5YMYqy0FauH5CEPMuQHFKSi3CO7LO4ucg
-						gIGZOEbjKl0BNhjKd8M6zQNsKk1KzYLxZ5YzU/1ETDs1J1cqIwqI/uq+dvfCVVeX
-						o+XrPad+t/8iwhmyTS5vio21kZK+biil/cOSwQaRhBTWclg3zHVVTtPap0ypZOeK
-						xiFrqWmmr9c1qOoaG6kFZtAFkCkepZb1ix+4eLzpAgMBAAGjPDA6MBkGA1UdEQQS
-						MBCCDmV1MS1zdHJhdG9jb3JlMB0GA1UdDgQWBBSEMJDeqFu+BPz5HcVjdtaJreHK
-						3zANBgkqhkiG9w0BAQUFAAOCAQEAWnElDes0a9Fx5nP926lMbNUIhblAqziZPyvl
-						nyi1vh5zCQepefZGgFNM+8Pbi5x0059jyAnA6rfmwxNvkOtEK/qSLBLOyDpqwVbM
-						xQwQb6KUn5P28wdbbetRw1sxsYjNGmEs8RcisPyx4vK/cZnlLvGk/6b96LiCTeLV
-						C/wvGbXTcUyrTEniOO/54sVWnioRNxFz3lsa918j8CCFJbd+aM3q3fm7LPfbYIWW
-						q6YQKBzEpgV9ERLVaa1gEA1qYZaKrxjHp8G3T6wLpeKEiufCb59CPEbJkGOrXlWO
-						7Qc3nJyR1cdsp5K2qqW6f14n97mp7yfKldJJX6NQJ7dUQ4TD/A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://ppms.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ppms.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ppms.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ppms.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ppms.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ppms.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ppms.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ppms.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ppms.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ppms.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ppms.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Stratocore</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">PPMS core facility management solution</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://stratocore.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stratocore Support</GivenName>
-    <EmailAddress>mailto:support@stratocore.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mathieu</GivenName>
-    <SurName>Marchand</SurName>
-    <EmailAddress>mailto:hosting@stratocore.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pqshibboleth.proquest.com:9443.xml b/swamid-interfederations-2.0/pqshibboleth.proquest.com:9443.xml
deleted file mode 100644
index d5261786..00000000
--- a/swamid-interfederations-2.0/pqshibboleth.proquest.com:9443.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pqshibboleth.proquest.com:9443/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pqshibboleth.proquest.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pqshibboleth.proquest.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIBADANBgkqhkiG9w0BAQQFADAkMSIwIAYDVQQDExlwcXNo
-aWJib2xldGgucHJvcXVlc3QuY29tMB4XDTExMDIwMzE2MTg1MVoXDTE0MDIwMjE2
-MTg1MVowJDEiMCAGA1UEAxMZcHFzaGliYm9sZXRoLnByb3F1ZXN0LmNvbTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxrvtySvrav7TyDYaA3oWzEHImO
-8W4HDmP+xVOD2RNeYi4gDTYkEXryayLEut5rPMnZeqB5MDbEMfk8jrXHi1XdCZR1
-WTXNJHf4j9t7CDWS9rRhe+hVZxS29RLA/QBSs59zLpZQMuXxVTJo4hLRpXeyqoUb
-v672RLssm2CVGRActnih+M16xisjq2nHqXHOTTOeFNpEApeBdiDXPjauw3xp0pfw
-+mJuwgcJnKy1UNFI4uQUlkCvBBIVyuAM2krQcj0/UOFrUVX0Fa/PKJRybCA0TmYn
-6naOky9aUatENGLkmYH67RDDr6PwkWoSGr2hBQqe1Ncs4lZ9jF5lqOzDt2ECAwEA
-AaN9MHswHQYDVR0OBBYEFBNCMwuDe3qpreLgso/wDtNe/nJIMEwGA1UdIwRFMEOA
-FBNCMwuDe3qpreLgso/wDtNe/nJIoSikJjAkMSIwIAYDVQQDExlwcXNoaWJib2xl
-dGgucHJvcXVlc3QuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQAD
-ggEBACgWCNvJq4cy1i0/mE8dXYsoyQ8QRG9QXpx5Av3TQewNv9/w8rkuKKnaVo+9
-CvwShXkigdxxdUYQRpvX/Vso/6UUM8p9VeRh9fk29zHUMh2tsIv6RdR2btlBXSGP
-8ooaXIrZBW4wuSYUFUGKxmsXuC7xJN+ciFuQYPIZ48ayfMwbIjUrvWmvKDt0EHwR
-JP49gfGziQEhv0W+1LtILDhDolE+QuwqDSXUaxhWaGvOE+m/eQKUmMrnQI6Xm7iz
-llRwbl8f8tMfJFfhdcNNJk7KB9uHEKAfGxY6TVDYuTujoEPq3KGkjreAwAuagM7a
-w3TEf0UNS0mkXt4kI5wSMt2ZJP0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>pqshibboleth.proquest.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=pqshibboleth.proquest.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIBADANBgkqhkiG9w0BAQQFADAkMSIwIAYDVQQDExlwcXNo
-aWJib2xldGgucHJvcXVlc3QuY29tMB4XDTExMDIwMzE2MTg1MVoXDTE0MDIwMjE2
-MTg1MVowJDEiMCAGA1UEAxMZcHFzaGliYm9sZXRoLnByb3F1ZXN0LmNvbTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALxrvtySvrav7TyDYaA3oWzEHImO
-8W4HDmP+xVOD2RNeYi4gDTYkEXryayLEut5rPMnZeqB5MDbEMfk8jrXHi1XdCZR1
-WTXNJHf4j9t7CDWS9rRhe+hVZxS29RLA/QBSs59zLpZQMuXxVTJo4hLRpXeyqoUb
-v672RLssm2CVGRActnih+M16xisjq2nHqXHOTTOeFNpEApeBdiDXPjauw3xp0pfw
-+mJuwgcJnKy1UNFI4uQUlkCvBBIVyuAM2krQcj0/UOFrUVX0Fa/PKJRybCA0TmYn
-6naOky9aUatENGLkmYH67RDDr6PwkWoSGr2hBQqe1Ncs4lZ9jF5lqOzDt2ECAwEA
-AaN9MHswHQYDVR0OBBYEFBNCMwuDe3qpreLgso/wDtNe/nJIMEwGA1UdIwRFMEOA
-FBNCMwuDe3qpreLgso/wDtNe/nJIoSikJjAkMSIwIAYDVQQDExlwcXNoaWJib2xl
-dGgucHJvcXVlc3QuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQAD
-ggEBACgWCNvJq4cy1i0/mE8dXYsoyQ8QRG9QXpx5Av3TQewNv9/w8rkuKKnaVo+9
-CvwShXkigdxxdUYQRpvX/Vso/6UUM8p9VeRh9fk29zHUMh2tsIv6RdR2btlBXSGP
-8ooaXIrZBW4wuSYUFUGKxmsXuC7xJN+ciFuQYPIZ48ayfMwbIjUrvWmvKDt0EHwR
-JP49gfGziQEhv0W+1LtILDhDolE+QuwqDSXUaxhWaGvOE+m/eQKUmMrnQI6Xm7iz
-llRwbl8f8tMfJFfhdcNNJk7KB9uHEKAfGxY6TVDYuTujoEPq3KGkjreAwAuagM7a
-w3TEf0UNS0mkXt4kI5wSMt2ZJP0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pqshibboleth.proquest.com:9443/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">ProQuest</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ProQuest</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.proquest.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Host</GivenName>
-    <SurName>Master</SurName>
-    <EmailAddress>hostmaster@csa.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Host</GivenName>
-    <SurName>Master</SurName>
-    <EmailAddress>hostmaster@csa.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Anil</GivenName>
-    <SurName>Nair</SurName>
-    <EmailAddress>anil.nair@proquest.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.xml b/swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.xml
deleted file mode 100644
index fd446ad9..00000000
--- a/swamid-interfederations-2.0/prd.thieme.de-shibboleth-sp.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://prd.thieme.de/shibboleth-sp">
-  <!--
-		This is an OpenSAML SP for Georg Thieme Verlag KG.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-01T13:14:11Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIICtDCCAZygAwIBAgIEUX/qATANBgkqhkiG9w0BAQUFADAcMRowGAYDVQQDExFw
-						cm9maWxlLnRoaWVtZS5kZTAeFw0xMzA0MzAxNTU3NTNaFw0xNjA0MjkxNTU3NTNa
-						MBwxGjAYBgNVBAMTEXByb2ZpbGUudGhpZW1lLmRlMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEA04gpJrPW9OU6dyBVlNQgapngsHYAZc2m1ZbGohqA82Kw
-						wH2Q2hYvbIP3cHReCRkgj4rrehbrbR0smkFVrbk/lIv0/nEe191KNKYSf+2s29NO
-						SiLcGSXonAsapEH8jGx5y3rubPXQRobiz/6Wr9Xd9ojbRcaYpM+noiMYdjwGdFdV
-						UGk1R5MWa8cSc+RIfbPUOpVcGGEszDnQsiqKe+etUM01Bj8ya29uovxP2QPjt52i
-						Ilny/cTWzYkp0FkTRw8YNULgt021BavPSNQiVfF23fbN0t7CrprBGdWiqe7ski3s
-						RyVCxrd59enndAcxwG/rh2KJ8dSB/XBlcxn666xxhwIDAQABMA0GCSqGSIb3DQEB
-						BQUAA4IBAQC6BbU3qM+zYtG9gTvC5DjCU7loA9SPqP3cxvZdccZ+3Md8Op0cRVIM
-						WSyCwyNfNd6keQ3oFpMWwbebpUoyN5bs9TLzvLyVZ62eTxzMIbRa2ExZ05kZefpq
-						bK6qbEPkTGE8JMRTo7X44I/ymhKvAHPAdb8Y4nSj0i+td/Fwr/mPvreZ8/l22HCQ
-						Ngm9TpbnmenLhSckNt4gPRZNh9qffqWgT8g73pR5ZDcRKCkjUn0Z91ivcMggBhjF
-						fueU1fclrPqsuWG41V/1ffiLVsq8iok7N1hm0YIfI2Up81sAz+xqa2LntJQDPxso
-						iV7miXl0O9QZaSRSXuCmtnNbIcR4K9Mg
-					</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>
-						MIICtDCCAZygAwIBAgIEUX/qATANBgkqhkiG9w0BAQUFADAcMRowGAYDVQQDExFw
-						cm9maWxlLnRoaWVtZS5kZTAeFw0xMzA0MzAxNTU3NTNaFw0xNjA0MjkxNTU3NTNa
-						MBwxGjAYBgNVBAMTEXByb2ZpbGUudGhpZW1lLmRlMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEA04gpJrPW9OU6dyBVlNQgapngsHYAZc2m1ZbGohqA82Kw
-						wH2Q2hYvbIP3cHReCRkgj4rrehbrbR0smkFVrbk/lIv0/nEe191KNKYSf+2s29NO
-						SiLcGSXonAsapEH8jGx5y3rubPXQRobiz/6Wr9Xd9ojbRcaYpM+noiMYdjwGdFdV
-						UGk1R5MWa8cSc+RIfbPUOpVcGGEszDnQsiqKe+etUM01Bj8ya29uovxP2QPjt52i
-						Ilny/cTWzYkp0FkTRw8YNULgt021BavPSNQiVfF23fbN0t7CrprBGdWiqe7ski3s
-						RyVCxrd59enndAcxwG/rh2KJ8dSB/XBlcxn666xxhwIDAQABMA0GCSqGSIb3DQEB
-						BQUAA4IBAQC6BbU3qM+zYtG9gTvC5DjCU7loA9SPqP3cxvZdccZ+3Md8Op0cRVIM
-						WSyCwyNfNd6keQ3oFpMWwbebpUoyN5bs9TLzvLyVZ62eTxzMIbRa2ExZ05kZefpq
-						bK6qbEPkTGE8JMRTo7X44I/ymhKvAHPAdb8Y4nSj0i+td/Fwr/mPvreZ8/l22HCQ
-						Ngm9TpbnmenLhSckNt4gPRZNh9qffqWgT8g73pR5ZDcRKCkjUn0Z91ivcMggBhjF
-						fueU1fclrPqsuWG41V/1ffiLVsq8iok7N1hm0YIfI2Up81sAz+xqa2LntJQDPxso
-						iV7miXl0O9QZaSRSXuCmtnNbIcR4K9Mg
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://profile.thieme.de/shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Georg Thieme Verlag KG</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Georg Thieme Verlag KG</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.thieme.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:shib-support@thieme.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:shib-support@thieme.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/prdidp.uncg.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/prdidp.uncg.edu-idp-shibboleth.xml
deleted file mode 100644
index a5ef7bed..00000000
--- a/swamid-interfederations-2.0/prdidp.uncg.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://prdidp.uncg.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.uncg.edu/idp/error.jsp" 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">uncg.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of North Carolina at Greensboro</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNCG is a public liberal arts and research university in Greensboro, North Carolina and constituent institution of the UNC system.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uncg.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://policy.uncg.edu/acceptable_use/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="96" width="101" xml:lang="en">https://uncgcdn.blob.core.windows.net/inc/formatted-uncg-incommon.gif</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>
-MIIDMjCCAhqgAwIBAgIJAMqxN/v9QtC8MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3ByZGlkcC51bmNnLmVkdTAeFw0xMTA2MTMxNTI3MzdaFw0yMTA2MTMxNTI3
-MzdaMBoxGDAWBgNVBAMTD3ByZGlkcC51bmNnLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMcQLm/5wUB0aOWQgN+yBxS1+VsN1VLUbeaE9k6S4ADD
-BgZ6uHYrprWyp7JqYYS96I3y3B6/FFwC44CWc9Drajgx3vgwl6tmdbjMZxiVhILC
-TCT0bVBvfelq/9p/6Jy9CCEr+mtaH5YgTlfbByKjrAqzrl2/e3aIKKI8AH/MKU7p
-p9U7NBCw50GNUa+NZ+nzIXLx/iYGzyhBjmzfD1RI6sHYVV+rx2IZjYZ8+Lw9tJ/H
-kWIAbEslY7CHS6nhVsRXKN1CZUdjNUOX1Ce74ygS1/DarGb7lIB8byWfeW/8PTkR
-rE1tgSNktCtn4L8OKV/Ma4i4oFsl1s4tTAq3gy68kYsCAwEAAaN7MHkwHQYDVR0O
-BBYEFO5c0T5RBCqKHUzjFUXn9avY7HHJMEoGA1UdIwRDMEGAFO5c0T5RBCqKHUzj
-FUXn9avY7HHJoR6kHDAaMRgwFgYDVQQDEw9wcmRpZHAudW5jZy5lZHWCCQDKsTf7
-/ULQvDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCtqJqAWwbQI/l1
-i+a3Eom2upU7r9NQ8bw/IvBNr6VLkJyGmm4Y41hh6yp6zKUerECVwVGfcdOumLQQ
-rQvfG9XK9Ax5CxC34/qA8cn6TuHldPntBqGiCcPfqjN64wCITl0MhJ+FrRTXVhw1
-FutslB2FC/t+EyPkk1FB8RBa417/Rf24AcAnGb0CuM6Y/M22dvYNrLE+mePL4JTM
-Bu22LQTtR6UgA6NvQR7Znv/XrtHKCzkcEwKWTuZjiZQqjpItTjYl3Fz/BOITT+57
-+lxD/J8U1TYtgs0D5Im9Ttt09xRzeXB0+gHWUIV7oM/KURL8RO6fPxj1gE5wcQrt
-9C/plVjK
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uncg.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uncg.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uncg.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uncg.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uncg.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uncg.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uncg.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMjCCAhqgAwIBAgIJAMqxN/v9QtC8MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3ByZGlkcC51bmNnLmVkdTAeFw0xMTA2MTMxNTI3MzdaFw0yMTA2MTMxNTI3
-MzdaMBoxGDAWBgNVBAMTD3ByZGlkcC51bmNnLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMcQLm/5wUB0aOWQgN+yBxS1+VsN1VLUbeaE9k6S4ADD
-BgZ6uHYrprWyp7JqYYS96I3y3B6/FFwC44CWc9Drajgx3vgwl6tmdbjMZxiVhILC
-TCT0bVBvfelq/9p/6Jy9CCEr+mtaH5YgTlfbByKjrAqzrl2/e3aIKKI8AH/MKU7p
-p9U7NBCw50GNUa+NZ+nzIXLx/iYGzyhBjmzfD1RI6sHYVV+rx2IZjYZ8+Lw9tJ/H
-kWIAbEslY7CHS6nhVsRXKN1CZUdjNUOX1Ce74ygS1/DarGb7lIB8byWfeW/8PTkR
-rE1tgSNktCtn4L8OKV/Ma4i4oFsl1s4tTAq3gy68kYsCAwEAAaN7MHkwHQYDVR0O
-BBYEFO5c0T5RBCqKHUzjFUXn9avY7HHJMEoGA1UdIwRDMEGAFO5c0T5RBCqKHUzj
-FUXn9avY7HHJoR6kHDAaMRgwFgYDVQQDEw9wcmRpZHAudW5jZy5lZHWCCQDKsTf7
-/ULQvDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCtqJqAWwbQI/l1
-i+a3Eom2upU7r9NQ8bw/IvBNr6VLkJyGmm4Y41hh6yp6zKUerECVwVGfcdOumLQQ
-rQvfG9XK9Ax5CxC34/qA8cn6TuHldPntBqGiCcPfqjN64wCITl0MhJ+FrRTXVhw1
-FutslB2FC/t+EyPkk1FB8RBa417/Rf24AcAnGb0CuM6Y/M22dvYNrLE+mePL4JTM
-Bu22LQTtR6UgA6NvQR7Znv/XrtHKCzkcEwKWTuZjiZQqjpItTjYl3Fz/BOITT+57
-+lxD/J8U1TYtgs0D5Im9Ttt09xRzeXB0+gHWUIV7oM/KURL8RO6fPxj1gE5wcQrt
-9C/plVjK
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uncg.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uncg.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of North Carolina at Greensboro</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of North Carolina at Greensboro</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uncg.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Susan Hensley</md:GivenName>
-    <md:EmailAddress>sshensle@uncg.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Robert Gorrell</md:GivenName>
-    <md:EmailAddress>rwgorrel@uncg.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Service Desk (6-TECH)</md:GivenName>
-    <md:EmailAddress>6-tech@uncg.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml b/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
deleted file mode 100644
index 2f3b5980..00000000
--- a/swamid-interfederations-2.0/preprod-meeting.renater.fr-shibboleth.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://preprod-meeting.renater.fr/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-11-07T15:23:01Z">
-      <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>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">plateforme de preproduction pour le service rendez vous</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://dev-rdv.visio.renater.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">plateforme de preproduction pour le service rendez vous</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">plateforme de preproduction pour le service rendez vous</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">plateforme de preproduction pour le service rendez vous</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>
-					      MIIDPjCCAiagAwIBAgIJAL5YcwA5sxaHMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGGRldi1yZHYudmlzaW8ucmVuYXRlci5mcjAeFw0xNTAyMjAxMjA5MDVaFw0y
-NTAyMTcxMjA5MDVaMCMxITAfBgNVBAMTGGRldi1yZHYudmlzaW8ucmVuYXRlci5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvHnK+FZY7ulG3K9SdL
-k2H/HGG19IVFZE5nrrkg5StqoqjvQyaNHxTTQ7Q85H9w4bQ9woSPVHux/3NWveqt
-qzmMJ4MrYW1yLGdvg3zCsyg9BC2w6svY7sFcm2VBp5HZeoDXEZCc7gZrjSz0zpUw
-MLfB/t5FY3XJjUrH7RtMaqGj6W7eoa0WilXhlM5yCs7Y0XFVf30Ti/zjcX+jvkFg
-hGvo3oRGP+XSMZ5Kyi0HY1g4RYfNYfvhn7RH4LbO+DxflBvIPa0yysy4Vi/h4w4l
-tXuEyTC+JzrSXrlsReyWAyEEuZ+CyIfj9qGq/hFwnlU1nNANPkODc0UuksV4ls3v
-qJcCAwEAAaN1MHMwUgYDVR0RBEswSYIYZGV2LXJkdi52aXNpby5yZW5hdGVyLmZy
-hi1odHRwczovL3ByZXByb2QtbWVldGluZy5yZW5hdGVyLmZyL3NoaWJib2xldGgw
-HQYDVR0OBBYEFGdnP1ZS9MVZFLUfMsR5Hc1I0BZkMA0GCSqGSIb3DQEBBQUAA4IB
-AQChY+X9G6w3GwiVlazXx1JCW4dbdvTp78dSMUwB9r2Yy0Tn4i5jZIZmcLSjZMCe
-hhbmiZCge1H7mn6C27jMyMsoKy1U66aaJP9/gSUQSnxXZJ4oAsvw/PeEoT9X1vVa
-qXimugP1OJ411nT+PugizY54txS/AR5S5Z/Su8hfeN4AGq89p8o8s7Sb1XrrfXhm
-Mfmz5jy2D56c4c6yFAsFGE7GK3x6/8JhDvUqG3iox4Zmkl7JWas1B9Y7/ShBOJvE
-enR09sxSmXELZwEmrESTbuRlB+c9qhdEpxR/Mjc0g51lAyrI/jnTDeJWKg/VCaI5
-v2pL4O5/2DnqrGVffjSIqLB2
-
-					    </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>
-					      MIIDPjCCAiagAwIBAgIJAL5YcwA5sxaHMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGGRldi1yZHYudmlzaW8ucmVuYXRlci5mcjAeFw0xNTAyMjAxMjA5MDVaFw0y
-NTAyMTcxMjA5MDVaMCMxITAfBgNVBAMTGGRldi1yZHYudmlzaW8ucmVuYXRlci5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvHnK+FZY7ulG3K9SdL
-k2H/HGG19IVFZE5nrrkg5StqoqjvQyaNHxTTQ7Q85H9w4bQ9woSPVHux/3NWveqt
-qzmMJ4MrYW1yLGdvg3zCsyg9BC2w6svY7sFcm2VBp5HZeoDXEZCc7gZrjSz0zpUw
-MLfB/t5FY3XJjUrH7RtMaqGj6W7eoa0WilXhlM5yCs7Y0XFVf30Ti/zjcX+jvkFg
-hGvo3oRGP+XSMZ5Kyi0HY1g4RYfNYfvhn7RH4LbO+DxflBvIPa0yysy4Vi/h4w4l
-tXuEyTC+JzrSXrlsReyWAyEEuZ+CyIfj9qGq/hFwnlU1nNANPkODc0UuksV4ls3v
-qJcCAwEAAaN1MHMwUgYDVR0RBEswSYIYZGV2LXJkdi52aXNpby5yZW5hdGVyLmZy
-hi1odHRwczovL3ByZXByb2QtbWVldGluZy5yZW5hdGVyLmZyL3NoaWJib2xldGgw
-HQYDVR0OBBYEFGdnP1ZS9MVZFLUfMsR5Hc1I0BZkMA0GCSqGSIb3DQEBBQUAA4IB
-AQChY+X9G6w3GwiVlazXx1JCW4dbdvTp78dSMUwB9r2Yy0Tn4i5jZIZmcLSjZMCe
-hhbmiZCge1H7mn6C27jMyMsoKy1U66aaJP9/gSUQSnxXZJ4oAsvw/PeEoT9X1vVa
-qXimugP1OJ411nT+PugizY54txS/AR5S5Z/Su8hfeN4AGq89p8o8s7Sb1XrrfXhm
-Mfmz5jy2D56c4c6yFAsFGE7GK3x6/8JhDvUqG3iox4Zmkl7JWas1B9Y7/ShBOJvE
-enR09sxSmXELZwEmrESTbuRlB+c9qhdEpxR/Mjc0g51lAyrI/jnTDeJWKg/VCaI5
-v2pL4O5/2DnqrGVffjSIqLB2
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev-rdv.visio.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev-rdv.visio.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">plateforme de preproduction pour le service rendez vous</md:ServiceName>
-      <md:ServiceName xml:lang="en">plateforme de preproduction pour le service rendez vous</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">plateforme de preproduction pour le service rendez vous</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">plateforme de preproduction pour le service rendez vous</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" 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="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"/>
-      <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="cn" 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">GIP RENATER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sami Honein</md:SurName>
-    <md:EmailAddress>sami.honein@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml b/swamid-interfederations-2.0/press.endocrine.org-shibboleth.xml
deleted file mode 100644
index 45097b1c..00000000
--- a/swamid-interfederations-2.0/press.endocrine.org-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://press.endocrine.org/shibboleth">
-  <!--
-		This is a 'Endocrine Press' 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-02-11T17:17: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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIJAIDfY9h2oTCVMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3ByZXNzLmVuZG9jcmluZS5vcmcwHhcNMTMxMjExMDUzOTQ2WhcNMjMxMjA5
-						MDUzOTQ2WjAeMRwwGgYDVQQDExNwcmVzcy5lbmRvY3JpbmUub3JnMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw2Hn+r9tAA0W/oAXm9ShLD2wvy+YKkeV
-						yrmUJbzdU8DeJ0mQ0SS6/Y3yKZEAT6vsh4j4xso51qtly0HHh459F8y8n3vd829B
-						vhxRwdE5PMZixPbWyltRPbx3XogpswBust9PXIWW4Unmo37NZhxrZQrt7GHvVvIX
-						kuUAEoTkLkSurvgkLuUrPs/wm179D50kbx4E50Uz7nvJYVyEWqHdf3TGaD8gMM1E
-						6DR2w0j4pKHBAjkLDy9mHGV6c91qFVNnWrhACmX35JjBiCvc1+JTVRpapM1/JgzP
-						HNTCJogvQNn5SDU3cZsZV0T1Bu23Pb8MlXoZPmWJy2djNPzw1JtO6QIDAQABo2kw
-						ZzBGBgNVHREEPzA9ghNwcmVzcy5lbmRvY3JpbmUub3JnhiZodHRwczovL3ByZXNz
-						LmVuZG9jcmluZS5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUG3/mbZR4LTuD9+bU
-						dU0k7Li0WNkwDQYJKoZIhvcNAQEFBQADggEBAC4Sz/Os31gGbtIPklQ8SJHBs0ji
-						MgbcKx15S3OkM06S75oDVI2qIrWXnAuWidexconSD35izsAscXlGI4EJgOflRJIB
-						1kD9LOsHiz9kqUS2q7MNxWVloiQzxYCX14HGwPMtmKVTeTg5Vjo2BAuCRAhdxdFH
-						seE5nYMbC4i31u1taTsM1Ydifr3UzmWTI5AZ884SYR9TfPh07rcW5m26Pmr3LLOa
-						wDROxGmfeBQHWTnOJkbhLdE2Rv1MqCWP4XzA1a8PsuBxyboLCQUYxsn4J8hOP3ZN
-						b3NsdouxzxBdj+PJxciM9yTP1Ju8l1QfVXC68KZ2WeEowX3e84BW8jaZ0OM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://press.endocrine.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://press.endocrine.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://press.endocrine.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Endocrine Press</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://press.endocrine.org/</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/primo.abdn.ac.uk-shib.xml b/swamid-interfederations-2.0/primo.abdn.ac.uk-shib.xml
deleted file mode 100644
index f2203170..00000000
--- a/swamid-interfederations-2.0/primo.abdn.ac.uk-shib.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://primo.abdn.ac.uk/shib">
-  <!--
-		This is a "Primo Resource Discovery" Shibboleth SP for the University of Aberdeen.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://primo.abdn.ac.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://primo.abdn.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC1jCCAb6gAwIBAgIJAMK+qzxsAVY1MA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
-						BAMTBXByaW1vMB4XDTExMDcxMjExMTY0MloXDTIxMDcwOTExMTY0MlowEDEOMAwG
-						A1UEAxMFcHJpbW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDfZEZ7
-						3ADkE4F3laV8ke0QGpgfucFdPwG0lOTLi4MKafPLILMNDqluOcTXxFuS5yUsBuPW
-						O4tZ7bph8eV4CbTtbiibrUmjJBO+ilEq5yfNzhvvo89jNgY9A9SunBVKWO1FP9qY
-						Z9cNgFN6PYesvXEvZR34hioeuVWVhE1Y/xVcUFIROHTkQnSHK7rtotCQqa/9HoDV
-						6kajTr9j2B1jAMGgT8DEwA+xSVjsFNYdyCR/eehpd4DDvMEH4ohRO+sv2mMEQN5V
-						42nI3Ry9T+ruhDafQwuYENxbgSvPWeemIIRfbBS9x08BKpcd5URH+B3CXOh8NZdR
-						T9tgvlBacHrI76cjAgMBAAGjMzAxMBAGA1UdEQQJMAeCBXByaW1vMB0GA1UdDgQW
-						BBSLotg/CQq8b92d1niWksO6U2D+XzANBgkqhkiG9w0BAQUFAAOCAQEARyX+nTKW
-						HTzqsYGh1z9iznrcFQt6lJKEeuXbtb/L7WFCo3Fbd3s7nhg0Ejeuu2w9c1qV9OeV
-						LihlrjrSd9kBDjRX5JcugGZIhqU/8VGldl0dtMJElkgp5rk8avXuReDl7kCASy5E
-						aleRz39Q9X/S2nLHvoHWscNqE87goeIUjz0w+YKA225anc3bm2pRGTyUJbBHiUhS
-						jn/3FReyjv9Dt5ub2TcmU14Fy+gT7WbL5z+JC2wNWtURDjVnHKcFaYA7YLNdvS2q
-						VJF/Sd68b9N+z5cSyYeNYFdy/dy29I/GNgAdVL4SuKXRTjn4oJCZQP9v7S8vSJYE
-						heKgkUPSXP4Lww==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primo.abdn.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://primo.abdn.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Aberdeen</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Aberdeen: Primo Resource Discovery</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.abdn.ac.uk/library/about.shtml</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chrissie</GivenName>
-    <SurName>Macarthur</SurName>
-    <EmailAddress>mailto:c.macarthur@abdn.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chrissie</GivenName>
-    <SurName>Macarthur</SurName>
-    <EmailAddress>mailto:c.macarthur@abdn.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml b/swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.xml
deleted file mode 100644
index c7aec91c..00000000
--- a/swamid-interfederations-2.0/primotest.abdn.ac.uk-shib.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://primotest.abdn.ac.uk/shib">
-  <!--
-		This is a "Primo Resource Discovery (test)" Shibboleth SP for the University of Aberdeen.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://primotest.abdn.ac.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://primotest.abdn.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJANJZVmK8+XpGMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHByaW1vdGVzdC5hYmRuLmFjLnVrMB4XDTExMDcxMzA3NTEzNloXDTIxMDcx
-						MDA3NTEzNlowHzEdMBsGA1UEAxMUcHJpbW90ZXN0LmFiZG4uYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD5eVGCkyjaiKuouemgreU03zdLqREO
-						Vwxuwzd/eUQ1wymVUOjlxofXiT2zbsn0U++WUmD0MgR4DMs2ZFxfSBWJDuVHk7DW
-						bnpkC2U1ookX8Um63uYnmx6MF7BaM9MOyYAEYKMlZNMOX28zbaSOVuGAc1Q9yFkL
-						U2WN6pZKIXQC5gSYo4Y3YwQqAqiK6ShU3NQrZPdHX0kgfpVCEyODA3fTCxczCTss
-						d5xvMq/Y6HhrAOOCNm7l8hPsIwnRyIqio3PdfDCUPBZ48fHQCEWazaUtLEYwu9NL
-						YFQmGQIe9qv6dJ/wd/M+XbDhZ8k/9Lh6kuOrzEqcD3LEHYu9hyF/vz3bAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFHByaW1vdGVzdC5hYmRuLmFjLnVrMB0GA1UdDgQWBBSL
-						h1KihDFxRIVjQQ4CxS58qfCXZjANBgkqhkiG9w0BAQUFAAOCAQEAlysZy/rmOO6c
-						FwbLDhIDKqdqCMm9Dq8jBZTwxd4z2AwOienEaMp0tmWc2fMSLYu+UQhEb36dDjOi
-						LbAsMsI1TcZIc6WERZ8BdpP9LG6v1NvyfOmDaw8oBT9UJyOPleeXtv/4OqrOdbAk
-						RpHvoxq6fmeJpbQeEZqbRszVqCO/yTjJlx/eSIS92NHk8Y0so14/Not8QWFRCVxH
-						Nta2tgU0F6QZ4efIfZjyquoIZcDzEZJJdp/6HTmtkffnGCYDBICrm7p7AZXHLwWS
-						KKuNQE75OgaFXXpH1sbGq6ZGQk6Lc2YIY4NxolHMzWFhuF+ERp73ZMgItrKlGGez
-						oBMSqs6ZDw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://primotest.abdn.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Aberdeen</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Aberdeen: Primo Resource Discovery (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.abdn.ac.uk/library/about.shtml</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chrissie</GivenName>
-    <SurName>Macarthur</SurName>
-    <EmailAddress>mailto:c.macarthur@abdn.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chrissie</GivenName>
-    <SurName>Macarthur</SurName>
-    <EmailAddress>mailto:c.macarthur@abdn.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/print.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/print.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 064a7b56..00000000
--- a/swamid-interfederations-2.0/print.new.ox.ac.uk-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://print.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a "New College Printing" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-09-20T14:13: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://print.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJALkFh47QbpfXMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnByaW50Lm5ldy5veC5hYy51azAeFw0xMzA5MTkxMDI5MzNaFw0yMzA5MTcx
-						MDI5MzNaMB0xGzAZBgNVBAMTEnByaW50Lm5ldy5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBANPIKlurQiFli0Hnv0m5ABmNWlKx/lyPaFvx
-						x0Q/WZekfTwsY+rOlrEAxzqrsIxFovJVjC08ZXlJAbVhEBQF7wyMdUKGqWx7sZw2
-						FdejixKcMWoVbNLHKVXyqyvLkvrFwPnHtugz4vYyAAPb9OCLuvxXyMPKaY7lOjJ3
-						eSbeTN5PGY+6mLKnUlqeYVz2t1JIKgBJDU/N4AslwEwpb+LcmwYtktphGnV2bq7+
-						1yevEbRdBoALjE9wMmSP2hptG8ULhIA4xHy/EzzBBz3GQbAG/cGlthXQ34yTOFk6
-						cth/nq/3dTHHA+7hGnDn9PlMGa33BrldC1+0SjGJnOhIsUhEm2UCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIIScHJpbnQubmV3Lm94LmFjLnVrMB0GA1UdDgQWBBRl12Aof4tQ
-						GJLhta22gjeyyN3jaTANBgkqhkiG9w0BAQUFAAOCAQEAql1ag5DE6IPslp7ECr0m
-						7RVAUphXsGCKZeQBT4506oixZJkCINmwaElEArQqqoti5xURzP9KSqVOQE4mPH6i
-						Z94XKj6JENbFTqagUu+65ZA36NkBpYaMNOts1Fzo/Sy28EDSlPnixmkfxmAgzfNk
-						mhR1Me4KBDpOWuIsvWcNrZhbyAoRSSO3/C8iARyPx1lOlmEKUV8M81KRSeKqL4xR
-						p08yeSnz0XrdHuuJNFUqliMTnBlTkrm0svViEkM5VcKnalM6kSWqlTY0MZMP3TtP
-						fKkA3j1NfGZ2BkxqPMYQINetFuqX8bhCEVYwwQxYfCw9LXHLmYYRbR0Gmrgy3w8e
-						dg==
-					</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://print.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://print.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford New College Printing</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Dore</SurName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Dore</SurName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/projecteuclid.org-shibboleth.xml b/swamid-interfederations-2.0/projecteuclid.org-shibboleth.xml
deleted file mode 100644
index 4b02b115..00000000
--- a/swamid-interfederations-2.0/projecteuclid.org-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://projecteuclid.org/shibboleth">
-  <!--
-		This is a "Project Euclid" Shibboleth SP for Cornell University.
-	-->
-  <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-11-11T13:43:07Z">
-      <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://projecteuclid.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://projecteuclid.org/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://projecteuclid.org/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://projecteuclid.org/Shibboleth.sso/DS" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Project Euclid</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Project Euclid, an online publishing service for theoretical and applied mathematics and statistics.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh6gAwIBAgIJANq1a2ZDBykIMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-						BAMTJXNmLWxpYi1hcHAtMDA4LnNlcnZlcmZhcm0uY29ybmVsbC5lZHUwHhcNMTMw
-						NTMxMTUwNjIyWhcNMjMwNTI5MTUwNjIyWjAwMS4wLAYDVQQDEyVzZi1saWItYXBw
-						LTAwOC5zZXJ2ZXJmYXJtLmNvcm5lbGwuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAs3Hxfw7oGscg+A30MSnTHdbuukajMhIlCtrm+bfsayPDApUE
-						QLxW643U876lLNxMA5wmU0NV07gjj87yqv7ECGPLq95tIoTcTzI0MXLr8s3GTzwT
-						M9N0LEWdp37CRH2kgvYA3Cf5Oba8FxpEDHgc6rzAc2LccucdpWvi8Zon9OLZuEsH
-						qAjQlfIeuSB7YIe6z2/7VbZM9CcAb80cwYButlqMdIOcS7jBqofGq9YvovXJr7F0
-						vEXJtiL7fW28Lmv2SHdS2mL/34ud2fj5CEDaXAzKWCiDR0L7a1qYNW7upxD+w6no
-						rDAYfWrO8E6mcXv1d8P1JKLzsaZKopsuHE3BtQIDAQABo1MwUTAwBgNVHREEKTAn
-						giVzZi1saWItYXBwLTAwOC5zZXJ2ZXJmYXJtLmNvcm5lbGwuZWR1MB0GA1UdDgQW
-						BBSu8boXmoNWqSqD0y4uSmiE8p1EHzANBgkqhkiG9w0BAQUFAAOCAQEAQXOGXl4Y
-						fTXnrJQuD1xaOmLgUkLpN4eq89OisGTsdefpvAJ1SD6QSaIj1UFchfQ6Qb4vK2Fp
-						E1Ss6sZNU0rCE/C1EpQplAkQve8+IhQdIOQM7B/Yp4lHWd+3snJLF+fmIczVu9DB
-						odqQ2YbmpxPDBzZMRAIppajebSXLz2r65Uj8+cB28v4WhCt7v/T3M8w4h591pePO
-						xW2fpyIqGsGpuVRd2EOkYGmm7nqrAH9WGyUsRT1YHFY25mjgExVPYpah7eTsNYql
-						fQHR5b61zSESkl8vo6eFRgzRnETr/fNIj08nhs3UCEfuYVy1yVKv2lHLzIvDTot/
-						TyOzJ1GTj16SNA==
-					</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://projecteuclid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://projecteuclid.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://projecteuclid.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://projecteuclid.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://projecteuclid.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://projecteuclid.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://projecteuclid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://projecteuclid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://projecteuclid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://projecteuclid.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://projecteuclid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Project Euclid</ServiceName>
-      <ServiceDescription xml:lang="en">
-				Project Euclid, an online publishing service for theoretical and applied mathematics and statistics.</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cornell University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Project Euclid</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://projecteuclid.org/about</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Ruddy</SurName>
-    <EmailAddress>mailto:dwr4@cornell.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shinwoo</GivenName>
-    <SurName>Kim</SurName>
-    <EmailAddress>mailto:EUCLID-TECH-L@cornell.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml b/swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml
deleted file mode 100644
index 9a304afa..00000000
--- a/swamid-interfederations-2.0/projets-webent.univ-lille1.fr-shibboleth.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://projets-webent.univ-lille1.fr/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-12-13T20:21:34Z">
-      <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>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/local</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université of Lille 1 - projets-webent</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://projets-webent.univ-lille1.fr/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Lille 1 - projets-webent</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Cette plate-forme  permet faire de la gestion de projets inter-établissements.</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>
-					      MIIDHjCCAgagAwIBAgIJANuKP33h+ACZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHXByb2pldHMtd2ViZW50LnVuaXYtbGlsbGUxLmZyMB4XDTE0MTAzMTIwMTkz
-NloXDTI0MTAyODIwMTkzNlowKDEmMCQGA1UEAxMdcHJvamV0cy13ZWJlbnQudW5p
-di1saWxsZTEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3ahHB
-ITQNVrQ3DtL06800VBbSg5jrG4ZhCayO1dGJKNV4Emt07FVG2Z1zB0hRoVIes8lN
-JYorBcx/Yq58ndOoC2YUXyl5Dw2pFE2D+IeQ8dazLjrP5dgUvgZBn1X8/NYjZR9R
-oWzUDqpBSViMsmV9GdRhL/dQMID2wAG9XnLmv81UZQE55U62o8712yIryrshOUoN
-Nd/NzlHJWD9emh17BSISI8prU6Po+rtJ+dZlydRRNVGNVASMkbj4UvptPcmY6OIQ
-GbHz7cXCjxZuDgdM36SYBz/IWlyg8F5vpv/VbZYTPM0y7ipZDX0H8SbFi+qo+gFd
-2zW8BgCJpRPjWvqTAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXByb2pldHMtd2ViZW50
-LnVuaXYtbGlsbGUxLmZyMB0GA1UdDgQWBBRsXy4YirWGf4b8wtEVd61o5xc0hTAN
-BgkqhkiG9w0BAQUFAAOCAQEAMBFk5MKCWfJpPnVXlabonKnkSeKSHc6zSnoT0yUq
-s73y86na8++jcAzQVUVnyvkmDNRTmdCXqTHrMAZ5uPz8MpTmhk1duJJSI9C/PjJK
-lOe5wvHFaMw0ShsSXCLKLOSfmWwOrikw71G8ErbD5mgF05qu/neiwPsoEtYZes7N
-iHvbEQrYZkHXCJfubSWDTRGW1QN8kbWPQ1B2JplKVlcrB39KzDqnhGQM7xnVJ1op
-J2AcE45AwuM2i0eK9IR+/f4JCJh4R/ikJii2S/HiDn1DZu4M5hexcBxk16tC7nMR
-y2eIDhGMnEJp23NcEvLJPGEHx+9XwZcSkn8aNI8r7LwaXA==
-
-					    </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>
-					      MIIDHjCCAgagAwIBAgIJANuKP33h+ACZMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHXByb2pldHMtd2ViZW50LnVuaXYtbGlsbGUxLmZyMB4XDTE0MTAzMTIwMTkz
-NloXDTI0MTAyODIwMTkzNlowKDEmMCQGA1UEAxMdcHJvamV0cy13ZWJlbnQudW5p
-di1saWxsZTEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3ahHB
-ITQNVrQ3DtL06800VBbSg5jrG4ZhCayO1dGJKNV4Emt07FVG2Z1zB0hRoVIes8lN
-JYorBcx/Yq58ndOoC2YUXyl5Dw2pFE2D+IeQ8dazLjrP5dgUvgZBn1X8/NYjZR9R
-oWzUDqpBSViMsmV9GdRhL/dQMID2wAG9XnLmv81UZQE55U62o8712yIryrshOUoN
-Nd/NzlHJWD9emh17BSISI8prU6Po+rtJ+dZlydRRNVGNVASMkbj4UvptPcmY6OIQ
-GbHz7cXCjxZuDgdM36SYBz/IWlyg8F5vpv/VbZYTPM0y7ipZDX0H8SbFi+qo+gFd
-2zW8BgCJpRPjWvqTAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXByb2pldHMtd2ViZW50
-LnVuaXYtbGlsbGUxLmZyMB0GA1UdDgQWBBRsXy4YirWGf4b8wtEVd61o5xc0hTAN
-BgkqhkiG9w0BAQUFAAOCAQEAMBFk5MKCWfJpPnVXlabonKnkSeKSHc6zSnoT0yUq
-s73y86na8++jcAzQVUVnyvkmDNRTmdCXqTHrMAZ5uPz8MpTmhk1duJJSI9C/PjJK
-lOe5wvHFaMw0ShsSXCLKLOSfmWwOrikw71G8ErbD5mgF05qu/neiwPsoEtYZes7N
-iHvbEQrYZkHXCJfubSWDTRGW1QN8kbWPQ1B2JplKVlcrB39KzDqnhGQM7xnVJ1op
-J2AcE45AwuM2i0eK9IR+/f4JCJh4R/ikJii2S/HiDn1DZu4M5hexcBxk16tC7nMR
-y2eIDhGMnEJp23NcEvLJPGEHx+9XwZcSkn8aNI8r7LwaXA==
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://projets-webent.univ-lille1.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://projets-webent.univ-lille1.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Université de Lille 1 - projets-webent</md:ServiceName>
-      <md:ServiceName xml:lang="en">Université of Lille 1 - projets-webent</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Cette plate-forme  permet faire de la gestion de projets inter-établissements.</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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université des Sciences Techniques de Lille 1</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>WALLON Ines</md:SurName>
-    <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/proxy.nationallizenzen.de.xml b/swamid-interfederations-2.0/proxy.nationallizenzen.de.xml
deleted file mode 100644
index 5ccf8925..00000000
--- a/swamid-interfederations-2.0/proxy.nationallizenzen.de.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://proxy.nationallizenzen.de/shibboleth-ezproxy">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>proxy.nationallizenzen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=proxy.nationallizenzen.de,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFczCCBFugAwIBAgIED/+i7TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA5
-WhcNMTUwNTAzMTM0NzA5WjCBjTELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEiMCAGA1UEAxMZcHJveHkubmF0
-aW9uYWxsaXplbnplbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALl7cjTk9U/X/5G1XPi18Kr/IdXZNLzoYq00d8WXEHyhMOL4qBgpudJBv3w8hKgD
-DYIeg9GJzRjw1Poo7ggQO3aN3F0VCvADCxcbRtlygt7vr0b9hac8KrVjGouAnrbO
-s3OlDbx/WOrNfxbxkEwV5ll0b+Zn6wpo/Yn5Do7WqYeGa+XGUNkcdMsdaL0KpsxK
-jE4fPU9kt2bYxQNrK/+jDxoGM8doz++V9rSd7We8RV9pSUOKJK2cT9SkP1ZGF/Cj
-3G3kG4BqfpoIqHAAukslh5R9eAYdDMioAkvhnJ6reY8Z5i1BC6vEh1s+Q6qgbtXl
-yccvt22QtEV12HPViiLr7DsCAwEAAaOCAakwggGlMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-utYST8Z5b86NsPpvJZarjPtlCaMwHwYDVR0jBBgwFoAUpuT/mP3lSTJ+XHXyFqJN
-jHQ13iIwGgYDVR0RBBMwEYEPa2luc3RsZXJAZ2J2LmRlMHkGA1UdHwRyMHAwNqA0
-oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPUiBRbIOTiRK
-0w+HTSw/45iWajuAU4O4EW5BepK36X8pqkY93dyRwbd6SGeEEBlEfx280j5DRoC1
-2GeycwixiF6fApo6Ck7S8LdN1ElivbcSd6OMp+Fm3g17pmZobfEnDTQr4N4LRUP/
-EY7BTIUsP36dDSnn109deV1TonFMebrsQRYKFUazsLjkmkQjmCMRGAm/j9mWNW0L
-UWoMz/805COw0LBlNujSvI0cYgAJSlAPGBJci2Oyj1x7oK93eH+UKvWzojPABRdw
-L20ZBKGHY+oIYzioq9KI0UpuXMT9KkEFTlYzIQ3DH026Hg6wTruDUGotdtSadOBM
-qROSGpAVyQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>proxy.nationallizenzen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=proxy.nationallizenzen.de,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFczCCBFugAwIBAgIED/+i7TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA5
-WhcNMTUwNTAzMTM0NzA5WjCBjTELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEiMCAGA1UEAxMZcHJveHkubmF0
-aW9uYWxsaXplbnplbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ALl7cjTk9U/X/5G1XPi18Kr/IdXZNLzoYq00d8WXEHyhMOL4qBgpudJBv3w8hKgD
-DYIeg9GJzRjw1Poo7ggQO3aN3F0VCvADCxcbRtlygt7vr0b9hac8KrVjGouAnrbO
-s3OlDbx/WOrNfxbxkEwV5ll0b+Zn6wpo/Yn5Do7WqYeGa+XGUNkcdMsdaL0KpsxK
-jE4fPU9kt2bYxQNrK/+jDxoGM8doz++V9rSd7We8RV9pSUOKJK2cT9SkP1ZGF/Cj
-3G3kG4BqfpoIqHAAukslh5R9eAYdDMioAkvhnJ6reY8Z5i1BC6vEh1s+Q6qgbtXl
-yccvt22QtEV12HPViiLr7DsCAwEAAaOCAakwggGlMAkGA1UdEwQCMAAwCwYDVR0P
-BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU
-utYST8Z5b86NsPpvJZarjPtlCaMwHwYDVR0jBBgwFoAUpuT/mP3lSTJ+XHXyFqJN
-jHQ13iIwGgYDVR0RBBMwEYEPa2luc3RsZXJAZ2J2LmRlMHkGA1UdHwRyMHAwNqA0
-oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCBhDBABggrBgEFBQcwAoY0aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAPUiBRbIOTiRK
-0w+HTSw/45iWajuAU4O4EW5BepK36X8pqkY93dyRwbd6SGeEEBlEfx280j5DRoC1
-2GeycwixiF6fApo6Ck7S8LdN1ElivbcSd6OMp+Fm3g17pmZobfEnDTQr4N4LRUP/
-EY7BTIUsP36dDSnn109deV1TonFMebrsQRYKFUazsLjkmkQjmCMRGAm/j9mWNW0L
-UWoMz/805COw0LBlNujSvI0cYgAJSlAPGBJci2Oyj1x7oK93eH+UKvWzojPABRdw
-L20ZBKGHY+oIYzioq9KI0UpuXMT9KkEFTlYzIQ3DH026Hg6wTruDUGotdtSadOBM
-qROSGpAVyQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://proxy.nationallizenzen.de/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://proxy.nationallizenzen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Verbundzentrale des Gemeinsamen Bibliotheksverbundes</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Nationallizenzen Privatnutzer Zugangsproxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.gbv.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gerald</GivenName>
-    <SurName>Steilen</SurName>
-    <EmailAddress>steilen@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Till</GivenName>
-    <SurName>Kinstler</SurName>
-    <EmailAddress>kinstler@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Franck</GivenName>
-    <SurName>Borel</SurName>
-    <EmailAddress>borel@gbv.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/psuhr.neocaseonline.com-connexion_neocase.xml b/swamid-interfederations-2.0/psuhr.neocaseonline.com-connexion_neocase.xml
deleted file mode 100644
index e5fb4d53..00000000
--- a/swamid-interfederations-2.0/psuhr.neocaseonline.com-connexion_neocase.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://psuhr.neocaseonline.com/connexion_neocase">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">Penn State Production Back office</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEBTCCAu2gAwIBAgIJAJYBe8LIemJnMA0GCSqGSIb3DQEBCwUAMIGYMQswCQYD
-VQQGEwJVUzELMAkGA1UECAwCTUExDzANBgNVBAcMBkJvc3RvbjEZMBcGA1UECgwQ
-TmVvY2FzZSBTb2Z0d2FyZTENMAsGA1UECwwEU2FhUzEUMBIGA1UEAwwLbmVvY2Fz
-ZS5jb20xKzApBgkqhkiG9w0BCQEWHHN5c2FkbWluQG5lb2Nhc2Vzb2Z0d2FyZS5j
-b20wHhcNMTYwMTMwMDEwMzU2WhcNMjYwMTI3MDEwMzU2WjCBmDELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAk1BMQ8wDQYDVQQHDAZCb3N0b24xGTAXBgNVBAoMEE5lb2Nh
-c2UgU29mdHdhcmUxDTALBgNVBAsMBFNhYVMxFDASBgNVBAMMC25lb2Nhc2UuY29t
-MSswKQYJKoZIhvcNAQkBFhxzeXNhZG1pbkBuZW9jYXNlc29mdHdhcmUuY29tMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwiVffYOHVcioOdK3t9SaI9GO
-VT+lF8OkkpoDZ4LMj0+Lk7OeIXsrgb7U/bpwZ/5S15OaDGdObdol5RfscfHgZd6+
-w6iWe2cdloR9XCxchaxT3G/h57tygyclbzERZRbtSFfGVncCTaP5NFpimx9hqwSJ
-cu6h3hJIhaSokW/E47glGNF4oLEBE9YLjmuP9B3KyClJjMNB6djd8edpq/VSJPIT
-EiWvogx6y1QxqfDNkj9k9NPBs5f3cm7wEMWoIW3M/y2pJLolr9uUaucTl78Snyl0
-6+nbbq0fWySKaP3MYDpifu8HTgXczA6Y5fOaLzQ6r9Bw/f8BoVBQrQ2RokHRywID
-AQABo1AwTjAdBgNVHQ4EFgQUJ610bnby+BmkLVWUgrtaebumsPEwHwYDVR0jBBgw
-FoAUJ610bnby+BmkLVWUgrtaebumsPEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAQEAboeXPjCZ9ZVJg/YCJswhfd6Gc3WZ8P+70R5b2TessHWfBMA49LLn
-ZqUAG0H1AksiiU7AK/vNP0ot38VN0R+16DW20aOD5Xz9+U8mpN6DB2wwuR7mEICo
-UJ9IKGY8vyhtLHoVeuOCS+jgk5mEGJ5p/eQbllD3CUApmVCu3X0a3vr+fQMGGAMv
-9Ykk/QPGXF0YCqpC3Fr0d1TNIgAmmhvoMwaeFWFELCJs0qDWUe2/JvFVGx2Wqmvb
-e8bPhn/1xvpEpJVDwyZkLfPwXLiDRV7LrKmA7+0LSTQuRUeKVilPtRviD+7ZUK7Z
-vd5SAP9ABDJMMCxWArUARFYwlL5Lk2GRGw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://psuhr.neocaseonline.com/connexion_neocase/SAML/AssertionConsumerService.aspx" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Neocase Software Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Neocase Software Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.neocasesoftware.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Scott Winter</md:GivenName>
-    <md:EmailAddress>swinter@neocasesoftware.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Philippe Coezy</md:GivenName>
-    <md:EmailAddress>pcoezy@neocasesoftware.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Eileen Szczesuil</md:GivenName>
-    <md:EmailAddress>eszczesuil@neocasesoftware.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/psuportal.neocaseonline.com-connexion_neocase.xml b/swamid-interfederations-2.0/psuportal.neocaseonline.com-connexion_neocase.xml
deleted file mode 100644
index 90d7aa6a..00000000
--- a/swamid-interfederations-2.0/psuportal.neocaseonline.com-connexion_neocase.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://psuportal.neocaseonline.com/connexion_neocase">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">Penn State Production portal</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEBTCCAu2gAwIBAgIJAJYBe8LIemJnMA0GCSqGSIb3DQEBCwUAMIGYMQswCQYD
-VQQGEwJVUzELMAkGA1UECAwCTUExDzANBgNVBAcMBkJvc3RvbjEZMBcGA1UECgwQ
-TmVvY2FzZSBTb2Z0d2FyZTENMAsGA1UECwwEU2FhUzEUMBIGA1UEAwwLbmVvY2Fz
-ZS5jb20xKzApBgkqhkiG9w0BCQEWHHN5c2FkbWluQG5lb2Nhc2Vzb2Z0d2FyZS5j
-b20wHhcNMTYwMTMwMDEwMzU2WhcNMjYwMTI3MDEwMzU2WjCBmDELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAk1BMQ8wDQYDVQQHDAZCb3N0b24xGTAXBgNVBAoMEE5lb2Nh
-c2UgU29mdHdhcmUxDTALBgNVBAsMBFNhYVMxFDASBgNVBAMMC25lb2Nhc2UuY29t
-MSswKQYJKoZIhvcNAQkBFhxzeXNhZG1pbkBuZW9jYXNlc29mdHdhcmUuY29tMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwiVffYOHVcioOdK3t9SaI9GO
-VT+lF8OkkpoDZ4LMj0+Lk7OeIXsrgb7U/bpwZ/5S15OaDGdObdol5RfscfHgZd6+
-w6iWe2cdloR9XCxchaxT3G/h57tygyclbzERZRbtSFfGVncCTaP5NFpimx9hqwSJ
-cu6h3hJIhaSokW/E47glGNF4oLEBE9YLjmuP9B3KyClJjMNB6djd8edpq/VSJPIT
-EiWvogx6y1QxqfDNkj9k9NPBs5f3cm7wEMWoIW3M/y2pJLolr9uUaucTl78Snyl0
-6+nbbq0fWySKaP3MYDpifu8HTgXczA6Y5fOaLzQ6r9Bw/f8BoVBQrQ2RokHRywID
-AQABo1AwTjAdBgNVHQ4EFgQUJ610bnby+BmkLVWUgrtaebumsPEwHwYDVR0jBBgw
-FoAUJ610bnby+BmkLVWUgrtaebumsPEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAQEAboeXPjCZ9ZVJg/YCJswhfd6Gc3WZ8P+70R5b2TessHWfBMA49LLn
-ZqUAG0H1AksiiU7AK/vNP0ot38VN0R+16DW20aOD5Xz9+U8mpN6DB2wwuR7mEICo
-UJ9IKGY8vyhtLHoVeuOCS+jgk5mEGJ5p/eQbllD3CUApmVCu3X0a3vr+fQMGGAMv
-9Ykk/QPGXF0YCqpC3Fr0d1TNIgAmmhvoMwaeFWFELCJs0qDWUe2/JvFVGx2Wqmvb
-e8bPhn/1xvpEpJVDwyZkLfPwXLiDRV7LrKmA7+0LSTQuRUeKVilPtRviD+7ZUK7Z
-vd5SAP9ABDJMMCxWArUARFYwlL5Lk2GRGw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://psuportal.neocaseonline.com/connexion_neocase/SAML/AssertionConsumerService.aspx" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Neocase Software Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Neocase Software Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.neocasesoftware.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Scott Winter</md:GivenName>
-    <md:EmailAddress>swinter@neocasesoftware.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Philippe Coezy</md:GivenName>
-    <md:EmailAddress>pcoezy@neocasesoftware.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Eileen Szczesuil</md:GivenName>
-    <md:EmailAddress>eszczesuil@neocasesoftware.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/publishing.rcseng.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/publishing.rcseng.ac.uk-shibboleth.xml
deleted file mode 100644
index f1038b9f..00000000
--- a/swamid-interfederations-2.0/publishing.rcseng.ac.uk-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://publishing.rcseng.ac.uk/shibboleth">
-  <!--
-		This is a "Royal College of Surgeons of England" OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-02T13:59:42Z">
-      <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">Royal College of Surgeons of England SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Royal College of Surgeons of England publishes the Annals, Bulletin and FDJ journals.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://publishing.rcseng.ac.uk</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIJAMhKH6y9Hoa3MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF3B1Ymxpc2hpbmcucmNzZW5nLmFjLnVrMB4XDTE1MDUxOTIwMTExOVoXDTE4
-						MDUxODIwMTExOVowIjEgMB4GA1UEAxMXcHVibGlzaGluZy5yY3NlbmcuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcqP1nsR6RR63+tt7m6VpG
-						Fe0N63jWc+L75Yx/XcifuQzUgCwaUIWCDMry+0owhAp+gEKyvS6PRD8882uMz3zF
-						TV+CgO6zQhcJjnyveppcMncbMfalY3zOw1YjleoR4XLdzpyW4LuY5tNVnMAZXQVC
-						VtHG2p+9/8XfG0MlsHbY2nZ+yZgT9vkIyPtIWpXi/idj1EN+ZdLCtsL3yzGqWAve
-						Qi9kYWS+ggG5r2pQfLVkbvVmsTL23JBqRld1A9qRVUTdnpXFabP8JpOjvXE3snd1
-						syyqznSclUa/CyNxaOjHIdRwwla8uTgjBzptM+cYxVoyhmoix40D+2TM8lxMalDn
-						AgMBAAGjcTBvME4GA1UdEQRHMEWCF3B1Ymxpc2hpbmcucmNzZW5nLmFjLnVrhipo
-						dHRwczovL3B1Ymxpc2hpbmcucmNzZW5nLmFjLnVrL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFNz9EzNV6uHR8X7nyRFUHHnHpGOFMA0GCSqGSIb3DQEBBQUAA4IBAQAFEZps
-						xzkFcuj9fOp4h+TzbjL3/sEHVrKx4Dh2tVMPfGk0SMrBqKFNHAXiSNoAo6215SuU
-						Ezm1gXadzcNjJPqm7RUk3gAc5bYw1sjNSFi0Te5GSuZZZSw/WwkN0gM/FYVp4FnK
-						hQhCaQ+juVlDE5rb8ghlrI5jrtwepYPteWaxu++m5qZTlAxvvtx2pRfUyukVJjMZ
-						PkaOYchDb5r9Z+twVephYe+xxrDxLwiy0CeyVTKxwjs/tDipulBOmB5r306v8upD
-						3wvxMOAwc73Gkm2Zrkckq+6SBwQx++uWHktS09fWnbdpLOjEVAlziJ2Dibj/6rQ3
-						JSRe52fl1W9ziYsM
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://publishing.rcseng.ac.uk/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://publishing.rcseng.ac.uk/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publishing.rcseng.ac.uk/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal College of Surgeons of England SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rcseng.ac.uk/</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/pubs.acs.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.acs.org-shibboleth.xml
deleted file mode 100644
index 66facdbe..00000000
--- a/swamid-interfederations-2.0/pubs.acs.org-shibboleth.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://pubs.acs.org/shibboleth">
-  <!--
-		This is an "ACS Publications" SP for the American Chemical Society, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-02-18T17:36: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 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">ACS Publications</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Publishes products and services for the practice and advancement of the chemical sciences.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://pubs.acs.org/page/about-us.html</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAOzcasgcJSa4MA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-						BAMTDHB1YnMuYWNzLm9yZzAeFw0xMzExMTkxODU1MDNaFw0yMzExMTcxODU1MDNa
-						MBcxFTATBgNVBAMTDHB1YnMuYWNzLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALImSxorZmmzwmreQuS1BVGZkMj73sgCMICQzTYANKHnh+ePY3gC
-						z01Y+hT/hEy7cugwJm5UXynMhIsFo5N8gnhyouCbvZ0Lxh9gwk9bUAGfiz2jqSJH
-						xx8Q3HTpPR8HkIa7UmHzlDIpkqAD9snW7V4YomQE3j+4rW/svlla3H14g6o0XuX4
-						FL+1oufOmOfVfTKjzMfIiFfR6B5Dy4wJwFanPg6J/hF7/FZDX2sgS8x9KsKrLeVY
-						OfduVu5zABA77RDKTI6aNecePKTVndzLrSn5pTEtTPckRYuoD9SMR3SZCS79ldhz
-						oG0qTMfgCuGY2emKb4XoOb/ZWhZ7iYlS9Q0CAwEAAaNbMFkwOAYDVR0RBDEwL4IM
-						cHVicy5hY3Mub3Jnhh9odHRwczovL3B1YnMuYWNzLm9yZy9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBTbqI9nN5yxvTDNHBMS8b0QZJ6JXTANBgkqhkiG9w0BAQUFAAOCAQEA
-						X69dLDGafkljVuMCEGPLKvPkHIlmKjhKAH4dN02XQ8RKIYURa5wPnmL/yEp9Zncy
-						cALR9HvfFwYFx+g+8RIU6S9kOUFz0n5vKLmjOXX/8TSVKTrV0z/tq3/rXK0A7ERI
-						3F27TMEqazUTvLu3qsdcTC9geQBrwikJfEdtOzzHAtCUiAxW5UakfvjUnoZ9o+iO
-						ydnNa/tXKePgutQedylFePevjWY720k48YGfPjGK13nrYLrF52k7QjvSkj7Y18x/
-						8GUzvq+yCgYrddBczbR8g2OcC0/xDKm3vE+T6oJkpKHJFMUW26mgOMR3bgtm2Tey
-						ZOvs4J+UrDF71xNxlC9wTQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.acs.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.acs.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubs.acs.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">American Chemical Society, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ACS Publications</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.acs.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kal</GivenName>
-    <SurName>Hashmani</SurName>
-    <EmailAddress>mailto:k_hashmani@acs.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gabriel</GivenName>
-    <SurName>Kiblin</SurName>
-    <EmailAddress>mailto:g_kiblin@acs.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>MacArthur</SurName>
-    <EmailAddress>mailto:j_macarthur@acs.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pubs.aeaweb.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.aeaweb.org-shibboleth.xml
deleted file mode 100644
index 5e263650..00000000
--- a/swamid-interfederations-2.0/pubs.aeaweb.org-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://pubs.aeaweb.org/shibboleth">
-  <!--
-		This is an "American Economic Association" OpenSAML SP for Atypon Systems, Inc
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-10T08:56:45Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAKoOWJDw6RetMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3B1YnMuYWVhd2ViLm9yZzAeFw0xMzEyMTIwMTI3NDRaFw0yMzEyMTAwMTI3
-						NDRaMBoxGDAWBgNVBAMTD3B1YnMuYWVhd2ViLm9yZzCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBALhJgZeh9u4wYjh6peTaimer1DET8rqQSpXrOzF4O8Fx
-						XbNq98Fl+jcptXhLqBFB92SludwbeI0WEV935EPXZ778ujoum5BeomZa5ovc6CpL
-						B+1ETN3oDS30R/vMQuF5WT7mSd8vXNZdXcvlPbNjO59Xctib/BzaVVjzkkc5SWVO
-						rz5q/0JVCOata4vzqv1oSJ0O6rNl7icY5zkeZq9x8tFmZZSgayPIw1aTWjf92EE2
-						xJl8G34vhK+1Lcn641Aih7lyXGiRS+GvcgSqVUaicWjJ3yDhaaiwQVFP09mC4eTr
-						jRR7BYAk1PzR+ScsSSmI4AXQp3wi0S/Yc0tYIDQxoFECAwEAAaNhMF8wPgYDVR0R
-						BDcwNYIPcHVicy5hZWF3ZWIub3JnhiJodHRwczovL3B1YnMuYWVhd2ViLm9yZy9z
-						aGliYm9sZXRoMB0GA1UdDgQWBBSMePkpVX6JEvtEmetRdkNOgvAt/zANBgkqhkiG
-						9w0BAQUFAAOCAQEAfVr2rxL8fNCBjE981MAhaSCPznvdN5v7vFSUMSQTDB+X8WoL
-						B45kfM/nRSJjzdZVmDlUOdTJed+dNZIbHGCOHS/keALrgeL1HTPNtP/4mqgvJ+0G
-						BKFoKN0CQ6sLZkXBrQ1v6AfLeGU+W0UPD9rfjjRCYu805v3II7TdN3evfnbtLmjS
-						pnNdZgNqGVODh7jJgoM3dVPNXnKjGq60l7Fbxa0hjUTA9XaNZg4BeTvFQN7qi5M9
-						xNk/TOrio1K7mK7NE1OuwZ82cUSrPzEyriT0LQOmUCSEOotGLpCk5h8DiC0c8BtU
-						xHfGWdly2G2H86vOxMCeEJ+lpsW/zPvNTHJ4SQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.aeaweb.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.aeaweb.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubs.aeaweb.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">American Economic Association</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aeaweb.org/</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/pubs.ama-assn.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.ama-assn.org-shibboleth.xml
deleted file mode 100644
index 6a300fc6..00000000
--- a/swamid-interfederations-2.0/pubs.ama-assn.org-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubs.ama-assn.org/shibboleth">
-  <!--
-		This is a "JAMA & Archives Journals" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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="2008-08-08T10:28:00Z"/>
-  </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://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">JAMA &amp; Archives Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://pubs.ama-assn.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pubs.ama-assn.org.xml b/swamid-interfederations-2.0/pubs.ama-assn.org.xml
deleted file mode 100644
index 02a3768b..00000000
--- a/swamid-interfederations-2.0/pubs.ama-assn.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://pubs.ama-assn.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/amajnls/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">JAMA</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">JAMA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://pubs.ama-assn.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pubs.amstat.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.amstat.org-shibboleth.xml
deleted file mode 100644
index d2aeb625..00000000
--- a/swamid-interfederations-2.0/pubs.amstat.org-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://pubs.amstat.org/shibboleth">
-  <!--
-		This is an 'American Statistical Association' OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDozCCAougAwIBAgIJAIL6QS5OyVe1MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEYMBYGA1UEAxMPcHVicy5hbXN0YXQub3JnMB4XDTEw
-						MTEyOTIzNTY0OVoXDTIwMTEyNjIzNTY0OVowgZAxCzAJBgNVBAYTAlVTMRMwEQYD
-						VQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsGA1UEChMU
-						QXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0ZW1zLCBJ
-						bmMuMRgwFgYDVQQDEw9wdWJzLmFtc3RhdC5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDMMabeVNJUDKULVnS/2AzzJ1ChraJlmgKe0uhBaFcdN8N/
-						Qlr8kJTFCy545+5NIO7GcJjK2NSH6fxw2w50Tg6ixjF+88z5mX48HNkdWOy/i29h
-						zEwQoQc9B8EQerzyXWXKxB5BPBbV69/XOPhMKutclFEIwJdE1z1ry3uiLXbH85ei
-						0RntcR8h4lacdS5j9hjpIGya3FUCuvdXq2ub/LWAFsmOm+oKO1PWFxFouBDJwNUL
-						nHgWtbyFiF5oQV+x2AI556D1leNh+qbDCtjBDC8/RYivsaY5Wj6tHryJlOfY3MOS
-						HSJUuhsqzyT2Mpefh4fDymQiqQvYI9tUBM8BOKzfAgMBAAEwDQYJKoZIhvcNAQEF
-						BQADggEBAAgs9qFfV/MRlrrvqXiGs7AlYbmzDbqdvednE96oL9u3+4kkDjAMVHhn
-						MJzVxH4EzHFn7jw6UoC8+mLLOfCUrqFg4aInLNZLM5UmAQ/UQ8G5CmplN5+Z9xxN
-						bf8A2OyGssC3B6pKy1LVSdJPjAP+4JU1DNU5MKPdy41NCvD0EHeysFP7PiK3E4gn
-						nNrcBY+bVdYszYhGpa+yX2R1V1PYCyfw9MBNGCGjOPkgS7iPHp4Gqr2vaBpYdUeh
-						shtK6jJLDGGZn48eRlKtdi7Ff6SfZA3dQ6PsXTiyETDSkkvCc1J1EQ6CCJ7121pK
-						7hEpM9XB8Ed60foFC25ZEBphVHMP/4s=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.amstat.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pubs.amstat.org/action/samlACS" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.amstat.org/action/samlACS" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: American Statistical Association</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.amstat.org/</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/pubs.rsna.org-shibboleth.xml b/swamid-interfederations-2.0/pubs.rsna.org-shibboleth.xml
deleted file mode 100644
index 36852d93..00000000
--- a/swamid-interfederations-2.0/pubs.rsna.org-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://pubs.rsna.org/shibboleth">
-  <!--
-		This is a "Radiological Society of North America" 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-08-21T09:50:58Z">
-      <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">Radiological Society of North America</mdui:DisplayName>
-        <mdui:Description xml:lang="en">RSNA publishes two top peer-reviewed journals: Radiology, the highest-impact scientific journal in the field, and RadioGraphics, the only journal dedicated to continuing education in radiology.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://pubs.rsna.org/</mdui:InformationURL>
-        <mdui:Logo height="76" width="354">https://pubs.rsna.org/pb/assets/raw/Publications%20%2FJournals_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEDCCAfigAwIBAgIJAJzgAWzkM8T0MA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXB1YnMucnNuYS5vcmcwHhcNMTMxMDA3MjA0NzI1WhcNMjMxMDA1MjA0NzI1
-						WjAYMRYwFAYDVQQDEw1wdWJzLnJzbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAqRPhvibBGQpooUm65mN4690Qia2tM6BbQnYd/7y9HRKQe1Kk
-						hmUlNF4+ZjeEmxFvmawnGLTA/eN2oYdQXANiSjrGgmQRIUr1fcPK5xoeyyNULdic
-						iLZejtSlvXzY4dgz/DX2hMlH4Q+w6A4c1UBD8qKHDgE4ss+bN+noT4ObEua8n/Tb
-						J290MYG3/kwRyfx6Wnsm8J3kKnRwyiTMxMchimxpd1IXDE/Dt8M45TKzEQwzqlux
-						l1qz9v71h9zk5nkBKmhJ4b1BTIdECQ2Ah56jOQ/9Cuxbv0AKltJM7bLEB8qTsV/Q
-						29xm/rVVt5rQbWk1Imam0403xgmMyvGEyR/7UQIDAQABo10wWzA6BgNVHREEMzAx
-						gg1wdWJzLnJzbmEub3JnhiBodHRwczovL3B1YnMucnNuYS5vcmcvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQU0JkMEFSeGhSejeQCBo6K11ftUFEwDQYJKoZIhvcNAQEFBQAD
-						ggEBADP2WaN5mVSM3Zv9UqUPG2bO7XTXPnhtvHIgAa4hSobLixQP98Ml7sXVlqnL
-						P31IWgToTjtXTjpTNYE7vsCsKRVP9uvVOziS2A5EBtoKWrQLbOCrwTBl0IzFLn8s
-						iJfNHHNUdwDxOhJYCC0cwS22b3t0Rfv9LjQ82TRO0FvIc82gJMzlnPogQyrWOTjR
-						IhAm74GLoDngxl3tXhPN8jSSx82EAYJJpITK4Fffule8pHHZFSwOXTB73RfDBu2L
-						XZ4ZcLi1+DpZ+s8Cz8C3mKyEo1f6CRUaqaypMRhLDwi9VHOqZtE2nUqEafnyZVd6
-						WKS8JkDbp5nnxgaI0eM2fo7rUFg=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubs.rsna.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.rsna.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubs.rsna.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Radiological Society of North America</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://pubs.rsna.org/</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/pymca-wg-gw01.sso.picturemaxx.com-shibboleth-sp.xml b/swamid-interfederations-2.0/pymca-wg-gw01.sso.picturemaxx.com-shibboleth-sp.xml
deleted file mode 100644
index e1fbbd0a..00000000
--- a/swamid-interfederations-2.0/pymca-wg-gw01.sso.picturemaxx.com-shibboleth-sp.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://pymca-wg-gw01.sso.picturemaxx.com/shibboleth-sp">
-  <!--
-		This is a "PYMCA" Shibboleth SP for KINDIT LIMITED.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEszCCA5ugAwIBAgIDByqUMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
-						MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-						HhcNMTIwNjI4MjIzNjIzWhcNMTQwODMxMDM1NDExWjCBxDEpMCcGA1UEBRMgSk8z
-						cmM4bmcwZS04QW8yZEU0V0tnTW9yZDhDWjVVbnUxEzARBgNVBAsTCkdUNjYzMDAx
-						NDYxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
-						KGMpMTIxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
-						U1NMKFIpMR4wHAYDVQQDDBUqLnNzby5waWN0dXJlbWF4eC5jb20wggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaEVjXASuIZBhwoM8n9T5i/102ypwRzTRA
-						wTv7UWx2ja1W3EKVyU0Z5Jj/iVZ+5bSXjJj06OIqjB0i4wsKYqFjIx7Wn22EsOUq
-						4kHr1wD1YNMxt2Ol6weE00h7KMyygDv4jZluYskfGJqx2QKs1TNNKlhQ4e+p1277
-						xnzRrRzd4cs6fXctINxFYugxxkedRHRJhqVyiphnuwIFxK9m04zSLhZOtJuybI5y
-						mvAUCQjdU+ps6Sf618jP9LsivfpET3yVhbkapQLkgxB//BJmCunYyTfmdnW1890o
-						pFtpvB6UsUOTQQ0Jj1zNKD9BwYFetSL3yWxbW2aKirAAxE4VTgnTAgMBAAGjggEz
-						MIIBLzAfBgNVHSMEGDAWgBRraT1qGEJK3Y8CZTn9NSSGeJEWMDAOBgNVHQ8BAf8E
-						BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCAGA1UdEQQZMBeC
-						FSouc3NvLnBpY3R1cmVtYXh4LmNvbTBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8v
-						cmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNybDAdBgNV
-						HQ4EFgQUiPqxey8W2LkPp0cqZhEBGOa7J5IwDAYDVR0TAQH/BAIwADBJBggrBgEF
-						BQcBAQQ9MDswOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1
-						c3QuY29tL3JhcGlkc3NsLmNydDANBgkqhkiG9w0BAQUFAAOCAQEACCUxI/EBYHlX
-						w158lYdvKKJsSwAUuUH3QIJskViLUjFmvY26aMk26Tni45pMV+2QwZ2Iwi3I6xJo
-						uoE7GikGThGpOYsxb5gCSR/bb+Fs2lD+2gcvPIFINZFO+zqs2uaxvJxZJ3NKTOhg
-						9dOoaTOjMQiUrmkFoNwHHHgkej/fNfaU5rSpYBcd7AhG4aNhKPMiplLvq7sbXuXa
-						ZcPCNSMoOVlUc+s8JOa8ukbBUx1yIxEShNdfO+X/DqA6Mbz9ZPmOhUVvjS+qEZ/u
-						oxvz+XRdsea4OEIBam0WyrOer7q31FJANo7wXWpW8vDF+Vv969sNJPmQ05QnYLjH
-						Ph2CEHrxjw==
-					</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>
-						MIIEszCCA5ugAwIBAgIDByqUMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
-						MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-						HhcNMTIwNjI4MjIzNjIzWhcNMTQwODMxMDM1NDExWjCBxDEpMCcGA1UEBRMgSk8z
-						cmM4bmcwZS04QW8yZEU0V0tnTW9yZDhDWjVVbnUxEzARBgNVBAsTCkdUNjYzMDAx
-						NDYxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMg
-						KGMpMTIxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlk
-						U1NMKFIpMR4wHAYDVQQDDBUqLnNzby5waWN0dXJlbWF4eC5jb20wggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaEVjXASuIZBhwoM8n9T5i/102ypwRzTRA
-						wTv7UWx2ja1W3EKVyU0Z5Jj/iVZ+5bSXjJj06OIqjB0i4wsKYqFjIx7Wn22EsOUq
-						4kHr1wD1YNMxt2Ol6weE00h7KMyygDv4jZluYskfGJqx2QKs1TNNKlhQ4e+p1277
-						xnzRrRzd4cs6fXctINxFYugxxkedRHRJhqVyiphnuwIFxK9m04zSLhZOtJuybI5y
-						mvAUCQjdU+ps6Sf618jP9LsivfpET3yVhbkapQLkgxB//BJmCunYyTfmdnW1890o
-						pFtpvB6UsUOTQQ0Jj1zNKD9BwYFetSL3yWxbW2aKirAAxE4VTgnTAgMBAAGjggEz
-						MIIBLzAfBgNVHSMEGDAWgBRraT1qGEJK3Y8CZTn9NSSGeJEWMDAOBgNVHQ8BAf8E
-						BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCAGA1UdEQQZMBeC
-						FSouc3NvLnBpY3R1cmVtYXh4LmNvbTBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8v
-						cmFwaWRzc2wtY3JsLmdlb3RydXN0LmNvbS9jcmxzL3JhcGlkc3NsLmNybDAdBgNV
-						HQ4EFgQUiPqxey8W2LkPp0cqZhEBGOa7J5IwDAYDVR0TAQH/BAIwADBJBggrBgEF
-						BQcBAQQ9MDswOQYIKwYBBQUHMAKGLWh0dHA6Ly9yYXBpZHNzbC1haWEuZ2VvdHJ1
-						c3QuY29tL3JhcGlkc3NsLmNydDANBgkqhkiG9w0BAQUFAAOCAQEACCUxI/EBYHlX
-						w158lYdvKKJsSwAUuUH3QIJskViLUjFmvY26aMk26Tni45pMV+2QwZ2Iwi3I6xJo
-						uoE7GikGThGpOYsxb5gCSR/bb+Fs2lD+2gcvPIFINZFO+zqs2uaxvJxZJ3NKTOhg
-						9dOoaTOjMQiUrmkFoNwHHHgkej/fNfaU5rSpYBcd7AhG4aNhKPMiplLvq7sbXuXa
-						ZcPCNSMoOVlUc+s8JOa8ukbBUx1yIxEShNdfO+X/DqA6Mbz9ZPmOhUVvjS+qEZ/u
-						oxvz+XRdsea4OEIBam0WyrOer7q31FJANo7wXWpW8vDF+Vv969sNJPmQ05QnYLjH
-						Ph2CEHrxjw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pymca-wg-gw01.sso.picturemaxx.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">KINDIT LIMITED</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">KINDIT LIMITED: PYMCA - Photographic, Youth, Music, Culture, Archive</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.pymca.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jon</GivenName>
-    <SurName>Swinstead</SurName>
-    <EmailAddress>mailto:jon@pymca.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jon</GivenName>
-    <SurName>Swinstead</SurName>
-    <EmailAddress>mailto:jon@pymca.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qa-sso.knewknovel.com-entry-uk_federation-Metadata.xml b/swamid-interfederations-2.0/qa-sso.knewknovel.com-entry-uk_federation-Metadata.xml
deleted file mode 100644
index 569e93d7..00000000
--- a/swamid-interfederations-2.0/qa-sso.knewknovel.com-entry-uk_federation-Metadata.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://qa-sso.knewknovel.com/entry/uk_federation/Metadata">
-  <!--
-		This is a "Phoenix QA-SSO Test" simpleSAMLphp SP for Knovel Corporation.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-01T14:48:38Z">
-      <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>
-      <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://qa-sso.knewknovel.com/saml/module.php/saml/sp/discoresp.php" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="en">The Knovel website integrates technical reference information with analytical and search tools for engineers.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Knovel Corporation: PPhoenix QA-SSO</mdui:DisplayName>
-        <mdui:Logo height="115" width="350">https://qa-content.knewknovel.com/web/integration/ukfed/images/logo_350_115.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					MIIEFjCCAv6gAwIBAgIJAOFlQKWU0aQPMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
-					VQQGEwJVUzELMAkGA1UECAwCTlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25v
-					dmVsIENvcnAxCzAJBgNVBAsMAklUMR4wHAYDVQQDDBVxYS1zc28ua25ld2tub3Zl
-					bC5jb20xHjAcBgkqhkiG9w0BCQEWD2tvcHNAa25vdmVsLmNvbTAeFw0xNTA4MTkx
-					OTE0NTVaFw0yNTA4MTYxOTE0NTVaMIGLMQswCQYDVQQGEwJVUzELMAkGA1UECAwC
-					TlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25vdmVsIENvcnAxCzAJBgNVBAsM
-					AklUMR4wHAYDVQQDDBVxYS1zc28ua25ld2tub3ZlbC5jb20xHjAcBgkqhkiG9w0B
-					CQEWD2tvcHNAa25vdmVsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-					ggEBAKcwvaHRvyt7mbfHmJVIXMIIAi382Y9SJvD4rMHzLN9xtZRbe/j7y9pdXPgC
-					4eJWhHJ43oP92rRnWBFBz+APwvj+HMcyz+4GMT1G3zn4D7LtHJPrTXPSbzXP1oBR
-					pk1dpwLT9+OqYn/gxzYYE5NTuJhvKaINlDvVDVQq0drNQP8xKklxue/YeKbDjvoD
-					UB3OB/MLNHgMIRy0O4AvEcQ8HKOAudTPlQt93N10t1tM6X7aB2OY5Yol+0QAJhIX
-					Er00sxPNGO8eAfe5giE6JcJm7609iwQzOAi3zZcHsKyuXKvWR30MxsYThDOtw4HW
-					/mN3Mpl/T3af6UYBn5Ar/RtzaSECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-					hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-					FJdjchixTns34OMkysa6SqhQG+mDMB8GA1UdIwQYMBaAFJdjchixTns34OMkysa6
-					SqhQG+mDMA0GCSqGSIb3DQEBCwUAA4IBAQA6XAa/77YT9GNnESB85P4HjJbzPN09
-					0SwsDD4GxIcSbXpH2hgn1IjnSg8zLWt4XcrPwP6dBBLG4RXrfQ9HZqwMKnWQeSgu
-					YVf9ojChWVPBDjD7+Qcz+QJmZwuoXBeveLp/6NHhcA0ZRMoNkOQGhvvisoUeduxG
-					nxZ/+4xZZfjF8X+hVO419PzBUEv24lY0mtIuC4a2cZ5VNA2+XS4519aA1gtK/ltB
-					/i1QrH7M4EnXvEpRgWRs7OqXzY+Qxf+jcE3DXXtS1UahyUwYf+atf/OC+z/vLmJH
-					QqFMM4bZMW+4qDUdxLYHLJV9La3REELlmA9Hcd1e4rP4XXpKuFeP+EFb
-				</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>
-					MIIEFjCCAv6gAwIBAgIJAOFlQKWU0aQPMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
-					VQQGEwJVUzELMAkGA1UECAwCTlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25v
-					dmVsIENvcnAxCzAJBgNVBAsMAklUMR4wHAYDVQQDDBVxYS1zc28ua25ld2tub3Zl
-					bC5jb20xHjAcBgkqhkiG9w0BCQEWD2tvcHNAa25vdmVsLmNvbTAeFw0xNTA4MTkx
-					OTE0NTVaFw0yNTA4MTYxOTE0NTVaMIGLMQswCQYDVQQGEwJVUzELMAkGA1UECAwC
-					TlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25vdmVsIENvcnAxCzAJBgNVBAsM
-					AklUMR4wHAYDVQQDDBVxYS1zc28ua25ld2tub3ZlbC5jb20xHjAcBgkqhkiG9w0B
-					CQEWD2tvcHNAa25vdmVsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-					ggEBAKcwvaHRvyt7mbfHmJVIXMIIAi382Y9SJvD4rMHzLN9xtZRbe/j7y9pdXPgC
-					4eJWhHJ43oP92rRnWBFBz+APwvj+HMcyz+4GMT1G3zn4D7LtHJPrTXPSbzXP1oBR
-					pk1dpwLT9+OqYn/gxzYYE5NTuJhvKaINlDvVDVQq0drNQP8xKklxue/YeKbDjvoD
-					UB3OB/MLNHgMIRy0O4AvEcQ8HKOAudTPlQt93N10t1tM6X7aB2OY5Yol+0QAJhIX
-					Er00sxPNGO8eAfe5giE6JcJm7609iwQzOAi3zZcHsKyuXKvWR30MxsYThDOtw4HW
-					/mN3Mpl/T3af6UYBn5Ar/RtzaSECAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-					hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-					FJdjchixTns34OMkysa6SqhQG+mDMB8GA1UdIwQYMBaAFJdjchixTns34OMkysa6
-					SqhQG+mDMA0GCSqGSIb3DQEBCwUAA4IBAQA6XAa/77YT9GNnESB85P4HjJbzPN09
-					0SwsDD4GxIcSbXpH2hgn1IjnSg8zLWt4XcrPwP6dBBLG4RXrfQ9HZqwMKnWQeSgu
-					YVf9ojChWVPBDjD7+Qcz+QJmZwuoXBeveLp/6NHhcA0ZRMoNkOQGhvvisoUeduxG
-					nxZ/+4xZZfjF8X+hVO419PzBUEv24lY0mtIuC4a2cZ5VNA2+XS4519aA1gtK/ltB
-					/i1QrH7M4EnXvEpRgWRs7OqXzY+Qxf+jcE3DXXtS1UahyUwYf+atf/OC+z/vLmJH
-					QqFMM4bZMW+4qDUdxLYHLJV9La3REELlmA9Hcd1e4rP4XXpKuFeP+EFb
-				</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>
-					MIIDyDCCArCgAwIBAgIJAJCNhx+kTAXdMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNV
-					BAYTAlVTMQswCQYDVQQIEwJOWTEMMAoGA1UEBxMDTllDMRswGQYDVQQKExJLbm92
-					ZWwgQ29ycG9yYXRpb24xHjAcBgNVBAMTFXFhLXNzby5rbmV3a25vdmVsLmNvbTAe
-					Fw0xNDA0MTQxMzEzMjVaFw0zNDA0MDkxMzEzMjVaMGUxCzAJBgNVBAYTAlVTMQsw
-					CQYDVQQIEwJOWTEMMAoGA1UEBxMDTllDMRswGQYDVQQKExJLbm92ZWwgQ29ycG9y
-					YXRpb24xHjAcBgNVBAMTFXFhLXNzby5rbmV3a25vdmVsLmNvbTCCASIwDQYJKoZI
-					hvcNAQEBBQADggEPADCCAQoCggEBAOQhGveEVeEN0I/ykyCiX8YKNvBr1iK2bikE
-					UQZ17yOXoJNASYu5l3yuZrUemJ3xHYEQhwD8Hnd5A6Q2yJqt1OYdm77F/wL5cx/X
-					JQ7re247Ef5XCos9jvuBWmOs3rtjz9Hv64uVY1L7t8B1UicJA+vTXmxCoD+J8/Wf
-					6gq0Q476E75nJUYq/5Tmrdp5qCS3Sn49Scxvtruhll0dbxj1NCooJNUF2wH0QZuI
-					m1WAAuDMN/CY4DCEd5SCyMGAHL3VoT7/y+dH+VPPbJ5Z1c6KGYqVpBfQ9Z2o+QRb
-					CykI7eQa9nHfw74+jpewna843xOsrIAg8S1TdPldKPTibaOOacECAwEAAaN7MHkw
-					CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
-					dGlmaWNhdGUwHQYDVR0OBBYEFFAEiQ09smJAJxIrIVt1ggD1uphuMB8GA1UdIwQY
-					MBaAFFAEiQ09smJAJxIrIVt1ggD1uphuMA0GCSqGSIb3DQEBBQUAA4IBAQBjh39R
-					2d0urMDY7xTtE7vAhUuEO0h+gM40FRR04r111KpGmOuFX9gx785aOuK0RcYPCttS
-					fT6CodNXybhQXgjQlq5SoN7FzVVnpeTpGk3tmQedItvfwTHUNPkPWPuCi1d36Rs6
-					wv6EWmsWCQN8IT8XAZuaZr7PxwJb3u94zp5UM6mh8Sxeb3fAKGdc1K0SZIrxCmq8
-					lC/2DFnuXxC5HzfoekMdC/b+ye1nuUAFCMOrTFiavilNMdakID5vMAAt2VMIplTw
-					L/HcJXiw+VosrzUtVGW/lzaKp0xiJVNt9j9GD6ZNGwTOw/+lx89a61syIy14/8vj
-					xYCCDxWspsyeX2go
-				</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa-sso.knewknovel.com/saml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa-sso.knewknovel.com/saml/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://qa-sso.knewknovel.com/saml/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://qa-sso.knewknovel.com/saml/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://qa-sso.knewknovel.com/saml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Knovel Corporation</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Knovel Corporation: Phoenix QA-SSO</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.knovel.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Crisler</SurName>
-    <EmailAddress>mailto:m.crisler@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Johnny</GivenName>
-    <SurName>Cheung</SurName>
-    <EmailAddress>mailto:kops@knovel.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qa.dawsonera.com-shibboleth.xml b/swamid-interfederations-2.0/qa.dawsonera.com-shibboleth.xml
deleted file mode 100644
index a73d441b..00000000
--- a/swamid-interfederations-2.0/qa.dawsonera.com-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://qa.dawsonera.com/shibboleth">
-  <!--
-		This is a "Dawson" Shibboleth SP for Semantico 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-04-12T13:17:34Z"/>
-  </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://qa.dawsonera.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://qa.dawsonera.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiQCCQC0Ky/bIMuQajANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJV
-						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
-						c2VtYW50aWNvMRkwFwYDVQQDExBxYS5kYXdzb25lcmEuY29tMB4XDTEzMDQxMDA5
-						NTMzMVoXDTE1MDQxMDA5NTMzMVowYDELMAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1
-						c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoTCXNlbWFudGljbzEZMBcG
-						A1UEAxMQcWEuZGF3c29uZXJhLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAMk2vJiHzuv5fLpisAaVQFFIQVgcxiLnq1IUgsDD2b2dZwbJ+jnc9L0W
-						lRUVg7UczlTX6yFDMHXexbLr2ZK5kzamWSwPyi5VEvxrFTJk6RYHoV+OCLdqBugX
-						b7nb3k3tvtdY4M1tvNiepfxeEGvB/j2+vThdG8ziwxk9o4OoRfW5EcXI7LJiJkIx
-						lVtxQHyZ4ZzFsNx+pgaJcGuf6BXRSJ3AOUezkPGaBOLKyBeMTgwvANubCzQy6GXI
-						SVdOM5qCMMEpsjp9Bob242iJo07deEv9um7bBI4pGlE2y85PNYnIXqhnFKlqN+wP
-						n4/JgFJ4f/uiz3MNULKFd7dT6zvNhRkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						t3FU0AH1Cg/vyOcNtqk2UW67h0M8TXzya9QlYBjNPeeD2b2FxWYOWckYyxp73QUE
-						MDm/lzz9Vnt3uUR53DuidNfSwoh1xoDZWxCa04wFq41+dv+K+KTpMtbCx3LEWkm4
-						fE/AIcvD/5i0IR0UYvgyElJC8ZA5gINZQGs7GUHOWl+WSJATVZ04NMkSu81ecgPR
-						uAgAlVn4CIs6BK7w+GYmGIMPh+TOwuBeA9RXPVtYV1/DOi8J488bu1t1BRSzgFAZ
-						0LfHeCvTazIS97MK6v6zLztr5TE2Up0bGuY40AQ7os+Cve3PiPyZvwj/sh0bYWzY
-						aghk88mgQ85rliDI3J2b+A==
-					</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://qa.dawsonera.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.dawsonera.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.dawsonera.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.dawsonera.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.dawsonera.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.dawsonera.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.dawsonera.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.dawsonera.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.dawsonera.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qa.dawsonera.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Dawson Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dawsonbooks.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:daw-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:daw-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 8c80f267..00000000
--- a/swamid-interfederations-2.0/qa.esds.ac.uk-shibboleth-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://qa.esds.ac.uk/shibboleth-sp">
-  <!--
-		This is a "ESDS QA" Shibboleth SP for the University of Essex.
-	-->
-  <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="2015-07-23T11:54:20Z">
-      <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://qa.esds.ac.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://qa.esds.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDxDCCAqygAwIBAgIJAIFv979CtniPMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNV
-						BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-						aWRnaXRzIFB0eSBMdGQxHDAaBgNVBAMME2RhcGxhdDIuZXNzZXguYWMudWswHhcN
-						MTMwOTA2MDgzOTI5WhcNMjMwOTA0MDgzOTI5WjBjMQswCQYDVQQGEwJBVTETMBEG
-						A1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkg
-						THRkMRwwGgYDVQQDDBNkYXBsYXQyLmVzc2V4LmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA3ler7LUUd+O4SzG18ZOt3hnXvqPnF35l+uCoAP4U
-						/8UIglUqK7VPmQNjSIQUqqW04LtLpqJ6wCF4zzZx4yOzn5B7q3Ytu7awlYDDOoeT
-						S+E/9AaHbHIzgwSu64yHqIaGsiOfntVLVJVTVby5gnjtZk7BsLvEBbmRj/xQit2i
-						a4qoBbEfu2CV3JoikgEQ29ysaWL26BPGkPiMH4AJ8rbmkcuhsrrV4utjF6Y4XB7s
-						c5dSiCOmsiVk8qWvmvyRndUv+FqfFWKNTvhwjKUH6YPLT8fR3kya05PqP6MsfpME
-						rAK2prPIoCAq3O/5H3G8Uyv4qNXOKTlvWMeGSSrKXHne6wIDAQABo3sweTAJBgNV
-						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
-						Y2F0ZTAdBgNVHQ4EFgQUpCtjhsAZDcsg55nyc8m6G+rqmVkwHwYDVR0jBBgwFoAU
-						pCtjhsAZDcsg55nyc8m6G+rqmVkwDQYJKoZIhvcNAQEFBQADggEBAD27KL4LkToX
-						HnK4Ajmkn31e7OeB1IkDXbVU8yQmRBxQ/OVcHbf2r3dKUyVJh8kcC45eLX6CIa2S
-						YClmSnaixPYjpiu20jFV1SpglaQg3KM59qc7BvN/2a7jg7wDG6LU2d42uXPHFrtj
-						hi+kURBEMRtEPVDMjDslROkNZPEmQw8kI9cA/WWz5yW4NLqsRL2cc2rQZAUA/NUm
-						gG/+uv5UwFNZiXZVphq1ITLqgYzj4mxy9pPDT5DRu41/7tpeFgqQ1XA8gSzWh0zW
-						LD49UT6gUswxL81WggC8WDMvi5sq6xnHtq1JPxCeTWDeeafn0vCR4WAV2B2y6Iwj
-						ipl34THDqR4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://qa.esds.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.esds.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qa.esds.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Essex</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ESDS QA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ukdataservice.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@ukdataservice.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Payne</SurName>
-    <EmailAddress>mailto:jmpayne@essex.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qa.idp.uhi.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/qa.idp.uhi.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index ce3e3e19..00000000
--- a/swamid-interfederations-2.0/qa.idp.uhi.ac.uk-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://qa.idp.uhi.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of the Highlands and Islands.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-08T12:47:43Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">uhi.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVANneP+Hfy2xrQ53aw8HQ+q7keJG8MA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEHFhLmlkcC51aGkuYWMudWswHhcNMTMwMjA4MDgyODQ1
-						WhcNMzMwMjA4MDgyODQ1WjAbMRkwFwYDVQQDExBxYS5pZHAudWhpLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlXe5g51wML4p4iVbnMtrY1UZ
-						MwRAtZXU1vKNIy3XvoqzOTYA/dRB30t8A3hw/4AuhwI7yU5NdIXMP56K1hfxUfV5
-						S7ZLwnPuc87diwqXJ/m+5Tbb7i+7d4drcpB+MrYYW4JzbHiFXbk9Ze1JnAkhMTYU
-						VbmKN6Zj6YFf99Cjde4RolQlQ62VH/9AXn4IWwl4hVXvy6Qgp5hvYIaIL1TpjdKH
-						aOs8c1DUDXGgnSuOMD/jWeaGYn4WS/DbH7aaWXf/Zoz/xwyt8aVOvWw1UqkquNd/
-						E32zseb5Zp8CAYD9x60Xbwj1bI2HUIFzgwakwP1X6CnUu82fUeL+JJ5ZQQtoXwID
-						AQABo2cwZTBEBgNVHREEPTA7ghBxYS5pZHAudWhpLmFjLnVrhidodHRwczovL3Fh
-						LmlkcC51aGkuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDyTxLg3Gvf/
-						fXWfHu0sMyLodkRSMA0GCSqGSIb3DQEBBQUAA4IBAQA036ZXr0EiOMvr8ClIRlc8
-						7yFiXYFeG1slgTj6uwridK51PZhwfszlg3M/uyaogjWQd2IXJtG03s+svWpsXTWP
-						Cq70+Aa9nXM5aLs/TY5aNVQpDKPhmG8xvI5WViIMvXZ4Ty/egPGfjp+W//Nj1ogR
-						4eCQAKrUFpb1UvZqA736QcWachN+WqUlEnwtvU+yE8Wtj8CGnxRLODuRIgDhi3ml
-						jD7nr8Xu1R7d+yuulxgJQDsBrNUs2vGyBurM1nGqaZePn57HDjczJWKmKFzQ5+HH
-						r5fv3Tl9vSvzKI+N03lMB3+IVQW8H5yMajUA4B8HUAdltcGNFmir4+bgpOYtcP3X
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://qa.idp.uhi.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.idp.uhi.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://qa.idp.uhi.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qa.idp.uhi.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qa.idp.uhi.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qa.idp.uhi.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">uhi.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVANneP+Hfy2xrQ53aw8HQ+q7keJG8MA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEHFhLmlkcC51aGkuYWMudWswHhcNMTMwMjA4MDgyODQ1
-						WhcNMzMwMjA4MDgyODQ1WjAbMRkwFwYDVQQDExBxYS5pZHAudWhpLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlXe5g51wML4p4iVbnMtrY1UZ
-						MwRAtZXU1vKNIy3XvoqzOTYA/dRB30t8A3hw/4AuhwI7yU5NdIXMP56K1hfxUfV5
-						S7ZLwnPuc87diwqXJ/m+5Tbb7i+7d4drcpB+MrYYW4JzbHiFXbk9Ze1JnAkhMTYU
-						VbmKN6Zj6YFf99Cjde4RolQlQ62VH/9AXn4IWwl4hVXvy6Qgp5hvYIaIL1TpjdKH
-						aOs8c1DUDXGgnSuOMD/jWeaGYn4WS/DbH7aaWXf/Zoz/xwyt8aVOvWw1UqkquNd/
-						E32zseb5Zp8CAYD9x60Xbwj1bI2HUIFzgwakwP1X6CnUu82fUeL+JJ5ZQQtoXwID
-						AQABo2cwZTBEBgNVHREEPTA7ghBxYS5pZHAudWhpLmFjLnVrhidodHRwczovL3Fh
-						LmlkcC51aGkuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDyTxLg3Gvf/
-						fXWfHu0sMyLodkRSMA0GCSqGSIb3DQEBBQUAA4IBAQA036ZXr0EiOMvr8ClIRlc8
-						7yFiXYFeG1slgTj6uwridK51PZhwfszlg3M/uyaogjWQd2IXJtG03s+svWpsXTWP
-						Cq70+Aa9nXM5aLs/TY5aNVQpDKPhmG8xvI5WViIMvXZ4Ty/egPGfjp+W//Nj1ogR
-						4eCQAKrUFpb1UvZqA736QcWachN+WqUlEnwtvU+yE8Wtj8CGnxRLODuRIgDhi3ml
-						jD7nr8Xu1R7d+yuulxgJQDsBrNUs2vGyBurM1nGqaZePn57HDjczJWKmKFzQ5+HH
-						r5fv3Tl9vSvzKI+N03lMB3+IVQW8H5yMajUA4B8HUAdltcGNFmir4+bgpOYtcP3X
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://qa.idp.uhi.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qa.idp.uhi.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 the Highlands and Islands</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of the Highlands and Islands QA IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uhi.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UHI Helpdesk</GivenName>
-    <EmailAddress>mailto:uhihelpdesk@uhi.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>UHI Helpdesk</GivenName>
-    <EmailAddress>mailto:uhihelpdesk@uhi.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qagateway.capella.edu-FIM-sps-CAPLA_SAML2_IDP-saml20.xml b/swamid-interfederations-2.0/qagateway.capella.edu-FIM-sps-CAPLA_SAML2_IDP-saml20.xml
deleted file mode 100644
index e444c497..00000000
--- a/swamid-interfederations-2.0/qagateway.capella.edu-FIM-sps-CAPLA_SAML2_IDP-saml20.xml
+++ /dev/null
@@ -1,54 +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://qagateway.capella.edu/FIM/sps/CAPLA_SAML2_IDP/saml20">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">capella.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ztest_Capella University</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>
-MIIDdDCCAlygAwIBAgIEUKWSDTANBgkqhkiG9w0BAQQFADB8MQswCQYDVQQGEwJVUzESMBAGA1UE
-CBMJTWlubmVzb3RhMRQwEgYDVQQHEwtNaW5uZWFwb2xpczEbMBkGA1UEChMSQ2FwZWxsYSBVbml2
-ZXJzaXR5MQswCQYDVQQLEwJJVDEZMBcGA1UEAxMQY2FwZWxsYS10ZXN0LWlkcDAeFw0xMjExMTYw
-MTA4MjlaFw0xNTExMTYwMTA4MjlaMHwxCzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlNaW5uZXNvdGEx
-FDASBgNVBAcTC01pbm5lYXBvbGlzMRswGQYDVQQKExJDYXBlbGxhIFVuaXZlcnNpdHkxCzAJBgNV
-BAsTAklUMRkwFwYDVQQDExBjYXBlbGxhLXRlc3QtaWRwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsgxXFOZQy4MCO2bnHglWTdtHqoBdbzIHpdWmyekuh9IX+TqqGLgfEDGBrSMaQbYs
-g9ZoICznOCBbPxCTphU7/iAzqIIxprnJOj09jIuNLESbtNBfkOED/I72y/atxs83J8fua/OC4POo
-Nu+M3a2JSP7fxeFDCbdqE9dfg/gc9QN1gixYpRBGhMqtfNDRQNvY7GBDl/otlcEHB3mXWmD5XASe
-5dSOXm75q36NVDtFrVcnfBUn7Vt4xpXNupsLQl+L6KoYCuHb6J6eMs9yoJkdWL3IgtATrxTQpyK2
-dzHShLY4wuKQlW/EHi6sFzOAE35wPFuzIE0AQEBrDQsNdol/kwIDAQABMA0GCSqGSIb3DQEBBAUA
-A4IBAQBGmKx91zcFgdoBEj/lBh7QUXe4Sz8GuWr/6KC6umAYrjeAVeLF5SfBeuhuIG1JgCviupkD
-2cO+h3pQbznzHE6Vq4ufKLKvM2y2FPyJE/Nr+PsjklyImNKgg0+caAuSiEjeIgtETlOD1hEoQ8v7
-AMmzpUSFLbOvTSGjlkRpKHj+nPykVlZcyO93mAvYtMvAs0JZqVVkkqk3BN1Pnxy59BrFfv0TmLzK
-Ugk8hTFnw3A1kqEh86hAw+7hkfXjmhEzo8kA5RqqibMlY4qybrzJeqU2OwLZ407JRzGDcxETIqd/
-jb8Wak2eV45bmCEpUn9g5JcRS8mTFJSepa9UbWqtdZKt
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qagateway.capella.edu/FIM/sps/CAPLA_SAML2_IDP/saml20/login"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qagateway.capella.edu/FIM/sps/CAPLA_SAML2_IDP/saml20/login"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Capella University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ztest_Capella University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.capella.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Angie Shand</md:GivenName>
-    <md:EmailAddress>Angie.Shand@capella.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qml.corefacilities.org-account-saml-qml.xml b/swamid-interfederations-2.0/qml.corefacilities.org-account-saml-qml.xml
deleted file mode 100644
index 9f7a2160..00000000
--- a/swamid-interfederations-2.0/qml.corefacilities.org-account-saml-qml.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://qml.corefacilities.org/account/saml/qml">
-  <!--
-		This is an iLabSolutions Portal SP for iLab Solutions, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-16T11:59:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDezCCAmOgAwIBAgIJAJ2ckmy8lsPeMA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNV
-						BAYTAlVTMRYwFAYDVQQIDA1NYXNzYWNodXNldHRzMQ8wDQYDVQQHDAZCb3N0b24x
-						HDAaBgNVBAoME2lMYWIgU29sdXRpb25zLCBMTEMwHhcNMTMxMjExMTUyNTA3WhcN
-						MjQxMjExMTUyNTA3WjBUMQswCQYDVQQGEwJVUzEWMBQGA1UECAwNTWFzc2FjaHVz
-						ZXR0czEPMA0GA1UEBwwGQm9zdG9uMRwwGgYDVQQKDBNpTGFiIFNvbHV0aW9ucywg
-						TExDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2VPbpu2uPVmE3NDD
-						E+aGuO9Zf2eLz+61ubkjuwz6ipY01oHliSId5iETSwGT3r1gJvTnpP3ndGMFq8X0
-						4xcsNb2cU2ZxCZ4+GE9XFriD2eskrfCuuBX6bKeW/yYeMNVoSBF/2YeEC+5kZ+2y
-						B7neQsUFKpB2J4kO7TlFKDAa0aj+ani0TOWdjejcYrZWNfR74Bft3IOFWxvapYvZ
-						9k6LMU/VouCVM8TqfmmTkwHemaB2bdk5rgaZpV3UgsiO5yXS9CDLlrijQSb95I1l
-						QZ2hMtbDu70xKoVOAbMhYcuVZppOObeketCXOoN4MIWEn/dYPhwHsWnGR9sOZhaB
-						9PVJzwIDAQABo1AwTjAdBgNVHQ4EFgQUfo3FkNz5UDtfW6QR5ostJDL7z1owHwYD
-						VR0jBBgwFoAUfo3FkNz5UDtfW6QR5ostJDL7z1owDAYDVR0TBAUwAwEB/zANBgkq
-						hkiG9w0BAQUFAAOCAQEAF4BJ6QX/Y6WV0rMGZYmydg/vE8SgtVB++/rGMfohXW6P
-						s/NEKrzOdIt/Nhannnn77RrjujDLkz5wp3u5zabjffHk/bPqP9yucOBMlIdyggKA
-						SQhzrFygr1kgA2JmUYrmrlKPSSrjfTGJj33qgbo23hzioLULaFFSbvEcZdP8x5lG
-						x8UndDxLcOxRMdxGTdMTu4q/TMnJlugnOe5YmIhg9jbYMwwm8JYVJ86llO5piiUv
-						YVcHQX0UCb4Iw4FoEKIzAsQW2aIQnE39DD7410/7YUzwCGVn6F6TGQuglZjGrTWe
-						ITzWFNwFKHtFqy1whxR7MarmC24an1bJCi/yQDHxDQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qml.corefacilities.org/account/saml/qml" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qml-testing.ilabsolutions.com/account/saml/qml" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.corefacilities.org/account/saml/qml" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">iLab Solutions, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">iLab Solutions</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ilabsolutions.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@ilabsolutions.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>ID Integration support</GivenName>
-    <EmailAddress>mailto:integrations_id@ilabsolutions.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/qmplus.qmul.ac.uk-shibboleth.xml
deleted file mode 100644
index 563b8e88..00000000
--- a/swamid-interfederations-2.0/qmplus.qmul.ac.uk-shibboleth.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://qmplus.qmul.ac.uk/shibboleth">
-  <!--
-		This is a "QMPlus" Shibboleth SP for Queen Mary and Westfield College, University of London.
-	-->
-  <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-03-23T11:14:55Z">
-      <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://qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+jCCAeKgAwIBAgIJAPaB7sCOW6sMMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEXFtcGx1cy5xbXVsLmFjLnVrMB4XDTEyMDMyMDEzNTk0OVoXDTIyMDMxODEz
-						NTk0OVowHDEaMBgGA1UEAxMRcW1wbHVzLnFtdWwuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQC2Vf26P1kkbcsHU4m1xEpgU+iLkK48mVJyAX5O
-						Z7xdKj83aNr1Gj7jCRAt+fjpiyIkW9VtAjmgw5pUUHXb+YlybL0D2KilhaBBJ57M
-						t1P8AvKm1kFoeLVDFNrjQ54Hl7dFjEOiysvNHum0x6lqUC6I+lClvsLGw5o4Ak58
-						Xok3pDfUc3sUBh3p40L15iecRAcdyKFtLdvC4wkAiE21rUwn752Ps2VcZsyZ1WpU
-						6S/p5sMeO4f+udz1yfFP60oayeFBNjF5m4zeg0a7fLUtv+BQcn5cI8fIxDNjSZfF
-						u344v+tmqXK8mnNkDtdCU6kxXQxAfFX6J21YLl+8F7MSk8tbAgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEXFtcGx1cy5xbXVsLmFjLnVrMB0GA1UdDgQWBBQQlIWz5fKbyOW+
-						9rRmstXW+70WmTANBgkqhkiG9w0BAQUFAAOCAQEAOlmo8VlQRqr7nX+vW6mj6VWR
-						hxtQzPraKFBPhQmIJHwFZ8AnVN9aqnKMXq2b1yYs3u9jO8s33wh3hroPDn7RyGLH
-						944rjsPv0ewZ8EXRSpffyEDVoPm6W6jjwYVxtn+Q9Yf0iWO6DkJCQNutz4NqB+fH
-						0Ef1BuYUHqeAqvAxl8OCrDt+s2FP501Hq12OK7qDCsYwRinzg0OGFkdPBgexowdz
-						bz6KW4rkg8eKPLhaIFVt+XE567ZyrpklFJoCNYdIuca4RlGFNwPYD+JOy0um0t7k
-						SwkwunLyPQxUR+IPDEnIaJdbbdJmZA6Ub4aErcVHsvez5uap1LW7i8xTdA2DoA==
-					</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://qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: QMPlus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services helpdesk</GivenName>
-    <EmailAddress>mailto:its-helpdesk@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Moodle Support</GivenName>
-    <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qmul.co-tutor.co.uk-shibboleth.xml b/swamid-interfederations-2.0/qmul.co-tutor.co.uk-shibboleth.xml
deleted file mode 100644
index 16bf2c2a..00000000
--- a/swamid-interfederations-2.0/qmul.co-tutor.co.uk-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://qmul.co-tutor.co.uk/shibboleth">
-  <!--
-		This is a "Co-Tutor at QMUL" Shibboleth SP for Loughborough University.
-	-->
-  <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="2015-05-18T09:37:34Z">
-      <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://qmul.co-tutor.co.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAMPVjUQDBuJ5MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD2lwLTE3Mi0zMS0xMy02MDAeFw0xNTA1MTIxMDAxNDNaFw0yNTA1MDkxMDAx
-						NDNaMBoxGDAWBgNVBAMTD2lwLTE3Mi0zMS0xMy02MDCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBALmRo9osDCFd4HuAtT+hQKmnBkQPLaCUJ6K0TGOy/EWX
-						fy/NNFsaBetqLsm4d5ShSfujl0UWC/xcL1MqDUd9aMnFFVC+3pQRnTML96vp6R29
-						1IPkzXWGMUvMC4keLy2ylXyCz0RmoMFzH0o1IpAxtPbIeA0PSeVd9LbjQkDDzmpI
-						VT4bRXYoR48iu1tp7v2X/I+9B89jWwTd92Y1UrVFgu0+EjhI6rIHr/U8CzAXHpbB
-						a1Mghz4QlkcdHZCppzKGrYIoZ8TfU9CzlmvMwCFg8xKKPsScWCKaI4WRM+/hQ/q4
-						bXwxrnXq7suyVD+gE6Ubg3MYNi2kwKtW2TtytFAiCKkCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPaXAtMTcyLTMxLTEzLTYwMB0GA1UdDgQWBBSzWJU+LpvPG9LjM0yHFHaj
-						ToDlOzANBgkqhkiG9w0BAQUFAAOCAQEAXJchQuBPLMhqJYiyPMgnGdOMvCE5yiL9
-						cKUJ4OfqI0kyNNCclJsoaBoBlXU0aDVZmv3gQDeB/aszlDlJceU5rrw30dMl9+pi
-						W/nYKX7E6olhHfBGhWz8boNLsQhDx0/JKSTgouWCktryXIEoMIg1mpsZxT6GCzqH
-						H6kpNEE8FcczMFVb88sDUlJ2+5iTnqlh6qK5xXIIXSRUHA6RwwmeFqDgqPE5vFPN
-						pPkRcJVGSe6cU9x58powQzQfNIyb9TtyvnlGWYq/iGPaQOogU8kKtYt2C6uQvNEK
-						nEuAlUv6RvvvmULiZCAyICctzohEu712x3JsegldHPq9oZUhJqTJPg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://qmul.co-tutor.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qmul.co-tutor.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Loughborough University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Co-Tutor at QMUL</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.co-tutor.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ray</GivenName>
-    <SurName>Chung</SurName>
-    <EmailAddress>mailto:ray.chung@lboro.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Newman</SurName>
-    <EmailAddress>mailto:p.m.newman@lboro.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qmul.simitive.com.xml b/swamid-interfederations-2.0/qmul.simitive.com.xml
deleted file mode 100644
index 6f247a1f..00000000
--- a/swamid-interfederations-2.0/qmul.simitive.com.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qmul.simitive.com">
-  <!--
-		This is a "QMUL" Shibboleth SP for Simitive Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-13T14:35:35Z">
-      <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://qmul.simitive.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://qmul.simitive.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIJAIWe2hAWoGqQMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
-						BAMTI2hvc3QtOTUtMTU0LTI1NC0xMjcucnNjbGllbnRkbnMuY29tMB4XDTE0MDYx
-						MzE0MTUxNFoXDTI0MDYxMDE0MTUxNFowLjEsMCoGA1UEAxMjaG9zdC05NS0xNTQt
-						MjU0LTEyNy5yc2NsaWVudGRucy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQCzdKvT4GTJO7A71YpcNcqOsCuBviRZeKiNTcCSYluuzje0N/pUe1F8
-						ufP1DZqHYIrSAW3mg0cJYqD1X5bgtCU8EOIsaTZQTtPjT3ed5VgSON6Lg/S6FjE3
-						XuJ1m7JLrMRmvnkIaPFgU5zum4FehgxqyQDFKQRZx93BtsKP+evPyHtlT0Em239I
-						DShp4FQtIBKxPf7OxmIpQna+zU4rSayVZOU258MHkwtY6cKQjryrZCpHFVcr188q
-						MBF5x+64lxNfdP5xkQ7X9hW/bmAQiUMzlF7MImCko4vvnMl9zY6duqZ0bTJwmLjk
-						BccJ3+omtIm2ngVIJiY3CKdst19uYKkNAgMBAAGjbDBqMEkGA1UdEQRCMECCI2hv
-						c3QtOTUtMTU0LTI1NC0xMjcucnNjbGllbnRkbnMuY29thhlodHRwczovL3FtdWwu
-						c2ltaXRpdmUuY29tMB0GA1UdDgQWBBRPeM2+fxZB7bvxwd2ptFgsyF0JPDANBgkq
-						hkiG9w0BAQUFAAOCAQEAY9B4aw4BHYBO1OCD7A5+7w45WU9G72QywKOzmXT0aAtW
-						jq/43SGIiH2R186dmyz4OTiwNau7XBfxYBfPtadkiGtKPJNUce1kSXzjKb+N541P
-						hGBs643+UQgKqOlxa7UM475DW2fNRV7J0Bru6TCcNlsxOUo9zxI7n1ce3eaiyT5i
-						7tjzB4+FQ+VGdIgmenNgv1HJZmQn3crXtTWYIyhLHy+J63mEoxRUQobPXf0W0XAk
-						+m7n4+GXiN0LMzp39ylHlZ3PQv3iCO+V+fAvnZuPZGhFZa7JBJnzQewQG9rx0JhJ
-						pYtepKaoxPC3ztnljHK7wrYiuT313JFBFOgkT2HSgw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmul.simitive.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmul.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qmul.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.simitive.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmul.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmul.simitive.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmul.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmul.simitive.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qmul.simitive.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qmul.simitive.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qmul.simitive.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Simitive Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">QMUL Simitive</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.simitive.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adrian</GivenName>
-    <SurName>Latham</SurName>
-    <EmailAddress>mailto:adrian.latham@simitive.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adrian</GivenName>
-    <SurName>Latham</SurName>
-    <EmailAddress>mailto:adrian.latham@simitive.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/qmulfed.simitive.com.xml b/swamid-interfederations-2.0/qmulfed.simitive.com.xml
deleted file mode 100644
index 01d37a00..00000000
--- a/swamid-interfederations-2.0/qmulfed.simitive.com.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://qmulfed.simitive.com">
-  <!--
-		This is a "QMUL Simitive Test" Shibboleth SP for Simitive Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-02T09:22:35Z">
-      <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://qmulfed.simitive.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://qmulfed.simitive.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOTCCAiGgAwIBAgIJAPVp/A+epmGvMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-						BAMTHGh0dHBzOi8vcW11bGZlZC5zaW1pdGl2ZS5jb20wHhcNMTQwNDIzMTYyNTA5
-						WhcNMjQwNDIwMTYyNTA5WjAnMSUwIwYDVQQDExxodHRwczovL3FtdWxmZWQuc2lt
-						aXRpdmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2LEXCwL6
-						pyGXQKURhMSkMPWdAgyCTROyTahJM7C27+wAupRevc91r7c9cEk+ygo5Gf8meSxK
-						NEMuZ2eM6Nc1eGMkauYrpmZLjfZW8CDrMiKjI+RPFVvvmVahgXAEfHzJiH5tpayv
-						yNafBmRw5/OgwcvTNc8hg/tKF5GNvAd3B+KNdzIW4cAxiSnYw/oDMYNW6HSEGdID
-						hqWTZKBYJxcAZs4GKCNaqPsmobTK8yGvL4tGpyDwcM0iTn8YQqQQMPf25/qv/kDR
-						ROdmi/CyV/5EVZhKR/Dt8+VaOWgfAlnbdRGULf9Asuxjhr46wP9VmqpqFX6bbp2z
-						oLxzvmeJHYi8iwIDAQABo2gwZjBFBgNVHREEPjA8ghxodHRwczovL3FtdWxmZWQu
-						c2ltaXRpdmUuY29thhxodHRwczovL3FtdWxmZWQuc2ltaXRpdmUuY29tMB0GA1Ud
-						DgQWBBR77Asd02wLNO71ILyxI+RJ0/M0PjANBgkqhkiG9w0BAQUFAAOCAQEAyO6o
-						3q+pL3igo8+wZfI2+p+4jxYfXs2iWaRl4pKTNED0rXnE30XIK5cYJrU5YIkfdNTB
-						mYhaeWXt8McmkfDQxayIFSIFaLzBV5e/voE6sNcysuThCWkAEyLNP3wVsFlAVCcy
-						PE8vdP8/SofL5jazCRqi2/LWq8gYdFoWJrkd0hhmXUL87WDgLKf8atdm+xQ0Ew+8
-						3+xNT16PluCwsfg+6AU3NapfmTsG8iwxyOkQ6jgqAVS/wboDTOewKYbpjqnLNI3T
-						E1XHMX2aZGJ2VM2bMhMJKKI4i2TxHU+qos3+NPRAJKbq7n7MwkKOK5olEp3xOr0z
-						VsmquYm0Rppl3nzMmg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmulfed.simitive.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://qmulfed.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://qmulfed.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmulfed.simitive.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmulfed.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qmulfed.simitive.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Simitive Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">QMUL Simitive Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.simitive.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adrian</GivenName>
-    <SurName>Latham</SurName>
-    <EmailAddress>mailto:adrian.latham@simitive.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adrian</GivenName>
-    <SurName>Latham</SurName>
-    <EmailAddress>mailto:adrian.latham@simitive.com</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 9ead6522..00000000
--- a/swamid-interfederations-2.0/qub.ac.uk-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://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>E-Resouces Team</GivenName>
-    <EmailAddress>mailto:eresources@qub.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Goodall</SurName>
-    <EmailAddress>mailto:m.goodall@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 239bd77e..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 an "ACLS Humanities E-Book" Shibboleth SP for 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 8a982901..00000000
--- a/swamid-interfederations-2.0/ra-idp.lanet.lv.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ra-idp.lanet.lv">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rezekne Higher Education Institution</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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - RA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rezekne Higher Education Institution - RA IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lv">http://www.ru.lv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-shibboleth.xml
deleted file mode 100644
index 944c26c0..00000000
--- a/swamid-interfederations-2.0/randevu.lab.vvc.niif.hu-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://randevu.lab.vvc.niif.hu/shibboleth">
-  <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:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">randevu beta webkonferencia szolgáltatás</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Jitsi-meet</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">Jitsi-meet alapú XMPP, WebRTC, Selective Forwaring Unit technológia teszt</mdui:Description>
-        <mdui:Description xml:lang="en">Jitsi-meet</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">https://randevu.lab.vvc.niif.hu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">https://randevu.lab.vvc.niif.hu/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://randevu.lab.vvc.niif.hu/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEPzCCAyegAwIBAgIJAMKujTOJcbZLMA0GCSqGSIb3DQEBCwUAMIG1MQswCQYDVQQGEwJIVTEQMA4GA1UECAwHSHVuZ2FyeTERMA8GA1UEBwwIRGVicmVjZW4xFzAVBgNVBAoMDk5JSUYgSW5zdGl0dXRlMSIwIAYDVQQLDBlWb2ljZSBWaWRlbyBDb2xsYWJvcmF0aW9uMSAwHgYDVQQDDBdyYW5kZXZ1LmxhYi52dmMubmlpZi5odTEiMCAGCSqGSIb3DQEJARYTdmlkZW8tYWRtaW5AbmlpZi5odTAeFw0xNTA2MjQxMjU1MzFaFw0yNTA2MjMxMjU1MzFaMIG1MQswCQYDVQQGEwJIVTEQMA4GA1UECAwHSHVuZ2FyeTERMA8GA1UEBwwIRGVicmVjZW4xFzAVBgNVBAoMDk5JSUYgSW5zdGl0dXRlMSIwIAYDVQQLDBlWb2ljZSBWaWRlbyBDb2xsYWJvcmF0aW9uMSAwHgYDVQQDDBdyYW5kZXZ1LmxhYi52dmMubmlpZi5odTEiMCAGCSqGSIb3DQEJARYTdmlkZW8tYWRtaW5AbmlpZi5odTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4v/XG+RGVVvasAKvNucWWNIKEeqrehbpDEMKzb4flAOHR4p2Lr+XrNEP7eBZy3AHF09MRRvmfWYEf4IBSHUXir7s6C36uxanGFqaQ3ZbASbPzV7g3ommEKArhdh6/gdjGGxefxh/G804EI1dKSUt1AFVg/EbwuuMNTqjhu+SPD8kZ1Ii5a29b8Rl8LzOCJvCMfSaUm08K6IdGBa8DUVnlVKy/UVvzBcXYIiKZSf5jnqbjOseprQJTDWoSyiAl2284JoxHf4gA86B1X1EF/dmZLfBJBmqc/i2exyb+HqDn0AMHaXmjtcKt1fgxo1/X4fBT1pYdc40sirID9KqYIgQ8CAwEAAaNQME4wHQYDVR0OBBYEFLdzD6asNigc000FwGJi7+R6TxIaMB8GA1UdIwQYMBaAFLdzD6asNigc000FwGJi7+R6TxIaMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAF30tfXyggHu+rYI+YSuotQRQR0D4yG2Pme68hpmu6qRR0jop//OhL1Ii/p9LPqrQd076z3Am9+PeyR5wRck7XtZPHPuXgMEm44/0FjZcEPf4nkzwEhx84NWriN/XldzpvI8rQavL0obRwnp5wvkFhK/xbLqrYntRSdoeK9f0AbBkCVajJ4K/pgK0sg4yEzybDaNFtwDwtgXmdmTu6Vj71b1+2PLiO6KoWA0YJ0y5iIls6Ir0nsbr7GBfF8/ZwTNQFDc3dsNPoX73Lb4TQ7KK9rorfzajChONzpzwylKkG/wKOuG9IP6LwFZSM1Wic4BSIJKNgsbauHX6GihuxuAp4Q=</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>randevu.lab.vvc.niif.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://randevu.lab.vvc.niif.hu/Shibboleth.sso/SAML2/POST" index="4"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="hu">randevu beta webkonferencia szolgáltatás</md:ServiceName>
-      <md:ServiceName xml:lang="en">Jitsi-meet</md:ServiceName>
-      <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="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="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</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 f669cb66..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rastreador.ifba.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://rastreador.ifba.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rastreador.ifba.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rastreador.ifba.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rastreador.ifba.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rastreador.ifba.edu.br:8443/idp/profile/SAML1/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">IFBA - Instituto Federal da Bahia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFBA - Instituto Federal da Bahia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFBA - Instituto Federal da Bahia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifba.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifba.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Reinaldo Fonseca</md:SurName>
-    <md:EmailAddress>reinaldocosta@ifba.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index 666ab1a2..00000000
--- a/swamid-interfederations-2.0/rave.sisoshibboleth.co.uk-entity.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://rave.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo Ravensbourne Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2014-08-20T10:08:46Z">
-      <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://rave.siso.co/sso/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://rave.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo Ravensbourne Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo Ravensbourne Online Resource Booking</mdui:Description>
-        <mdui:Logo height="60" width="60">https://rave.siso.co/images/layout/siso-logo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rave.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rave.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo Ravensbourne Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml
deleted file mode 100644
index 85590597..00000000
--- a/swamid-interfederations-2.0/rcafe01s.inmetro.gov.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://rcafe01s.inmetro.gov.br/idp/shibboleth">
-  <md: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>
-  </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">inmetro.gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.inmetro.gov.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.inmetro.gov.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDZjCCAk4CAQAwDQYJKoZIhvcNAQEFBQAweTEOMAwGA1UEChMFQUJSRVYxDjAM
-BgNVBAsTBUFCUkVWMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEPMA0GA1UECBMG
-QnJhc2lsMQswCQYDVQQGEwJCUjEgMB4GA1UEAxMXcmNhZmUwMXMuaW5tZXRyby5n
-b3YuYnIwHhcNMTUwNjI2MTkzNDU1WhcNMTgwNjI1MTkzNDU1WjB5MQ4wDAYDVQQK
-EwVBQlJFVjEOMAwGA1UECxMFQUJSRVYxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJv
-MQ8wDQYDVQQIEwZCcmFzaWwxCzAJBgNVBAYTAkJSMSAwHgYDVQQDExdyY2FmZTAx
-cy5pbm1ldHJvLmdvdi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AN972dKeEYk5VuNNf6hN89M2bKgtWi7U8DWhPlS56DExdeI1F8bm2di7G/xhV7wR
-mecGFFeNqp1NgVDo7b9/+QjdBWKBEkhwXJ87KlPp4XSOLLiwsa1SaGbg6550bWWx
-OROhpokqeVBs5V/BjYsSdiX1/H+7mgu5ReLyci+LDYxlJf1fcu5vXLoCvuT0gaKD
-GNig6MWo5R2WSS7xMNuMcvo5Yls++tDGnLndvJPQN17shRwDqavYwGk6Ibw0RVBD
-0af2mmZc/gtlFIiSvhxZ1BxUGBMGk/eMwArdxe+nlSAYwEwhTgzA35c5QAlHbO44
-HIaocNjEOspYssy2NtBPbFcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAawtjlVTA
-lOtQ7VmcGeqc3rRcjUNAQqYcqtgsJBkkYPhreNZAXHARnNQTcQ/0V5VyIHr7B+cg
-HZW7IOrz+hTfApHx/DA4qB6FKZJtLmf27VstlMRlqZlIuiHmOpqz6x2dkz5248CV
-ayM+EzuUquRiyGFPQlGSd8CW2qJLrRR64PGvf/k+ciRyP3EY4LxTrgDYRgyEy1W4
-chSF0Vug5F1YTTmJka1DT7l7IjWHeH7AT/rWqjTnWzCkc3PvvK1hWQUXlKaIoKVF
-yUIWfdWTP1qbpv2/D1hS9Ye/4vokTjCzku85qQDYQRzH4NT+GofYlcaQ2FuJRXZk
-czNaGjGLlb2Y0Q==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://rcafe01s.inmetro.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rcafe01s.inmetro.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rcafe01s.inmetro.gov.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rcafe01s.inmetro.gov.br/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">inmetro.gov.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDZjCCAk4CAQAwDQYJKoZIhvcNAQEFBQAweTEOMAwGA1UEChMFQUJSRVYxDjAM
-BgNVBAsTBUFCUkVWMRcwFQYDVQQHEw5SaW8gZGUgSmFuZWlybzEPMA0GA1UECBMG
-QnJhc2lsMQswCQYDVQQGEwJCUjEgMB4GA1UEAxMXcmNhZmUwMXMuaW5tZXRyby5n
-b3YuYnIwHhcNMTUwNjI2MTkzNDU1WhcNMTgwNjI1MTkzNDU1WjB5MQ4wDAYDVQQK
-EwVBQlJFVjEOMAwGA1UECxMFQUJSRVYxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJv
-MQ8wDQYDVQQIEwZCcmFzaWwxCzAJBgNVBAYTAkJSMSAwHgYDVQQDExdyY2FmZTAx
-cy5pbm1ldHJvLmdvdi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AN972dKeEYk5VuNNf6hN89M2bKgtWi7U8DWhPlS56DExdeI1F8bm2di7G/xhV7wR
-mecGFFeNqp1NgVDo7b9/+QjdBWKBEkhwXJ87KlPp4XSOLLiwsa1SaGbg6550bWWx
-OROhpokqeVBs5V/BjYsSdiX1/H+7mgu5ReLyci+LDYxlJf1fcu5vXLoCvuT0gaKD
-GNig6MWo5R2WSS7xMNuMcvo5Yls++tDGnLndvJPQN17shRwDqavYwGk6Ibw0RVBD
-0af2mmZc/gtlFIiSvhxZ1BxUGBMGk/eMwArdxe+nlSAYwEwhTgzA35c5QAlHbO44
-HIaocNjEOspYssy2NtBPbFcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAawtjlVTA
-lOtQ7VmcGeqc3rRcjUNAQqYcqtgsJBkkYPhreNZAXHARnNQTcQ/0V5VyIHr7B+cg
-HZW7IOrz+hTfApHx/DA4qB6FKZJtLmf27VstlMRlqZlIuiHmOpqz6x2dkz5248CV
-ayM+EzuUquRiyGFPQlGSd8CW2qJLrRR64PGvf/k+ciRyP3EY4LxTrgDYRgyEy1W4
-chSF0Vug5F1YTTmJka1DT7l7IjWHeH7AT/rWqjTnWzCkc3PvvK1hWQUXlKaIoKVF
-yUIWfdWTP1qbpv2/D1hS9Ye/4vokTjCzku85qQDYQRzH4NT+GofYlcaQ2FuJRXZk
-czNaGjGLlb2Y0Q==
-                          
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rcafe01s.inmetro.gov.br:8443/idp/profile/SAML1/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">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">Inmetro - Instituto Nacional de Metrologia Qualidade e Tecnologia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.inmetro.gov.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.inmetro.gov.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Fabio Fischer Barros</md:SurName>
-    <md:EmailAddress>ffbarros@inmetro.gov.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.xml
deleted file mode 100644
index 59c27bda..00000000
--- a/swamid-interfederations-2.0/rcm.ac.uk-oala-metadata.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://rcm.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA 2 IdP for the Royal College of Music.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">rcm.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXjCCAkagAwIBAgIIPDy/aki2TD8wDQYJKoZIhvcNAQEFBQAwRjEjMCEGA1UE
-						CgwaVGhlIFJveWFsIENvbGxlZ2UgT2YgTXVzaWMxHzAdBgNVBAMMFm9wZW5hdGhl
-						bnNsYS5yY20uYWMudWswHhcNMTMxMDE1MTMzNDAwWhcNMjMxMDE1MTMzNDAwWjBG
-						MSMwIQYDVQQKDBpUaGUgUm95YWwgQ29sbGVnZSBPZiBNdXNpYzEfMB0GA1UEAwwW
-						b3BlbmF0aGVuc2xhLnJjbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBANtJudIyT/BQLf6P2zHPfjH4YZIqzeMjC9WgCSjtRx/asbh+78VXuUwy
-						pii28+E34wn1N0QtNx/03Bp3ngCAdm5l4WG0oB8l/prCKS3Y+Y/otrlBq9nF2NmX
-						aVh0f3PEGCFs5mCIoCMQlwZZrXBoRB+aqaCDo3jRwxoUDqWI76KMsXdPepMWwGD2
-						qnXP22WWpvrvAJBBrlxJDa9RH48vYh6hiydfjx43wRbz6zlCCsRphZpZ6UQneUw+
-						tKYrSMmKnaFFLEOzWov4slEqxwcGkq+KbF7pNRv+GHAZFmuoOR5y3+9OB1mpyU70
-						jdVwT8X4fKAycVV1m0HwGrXniqL7RfkCAwEAAaNQME4wHQYDVR0OBBYEFB6LU7jQ
-						5XlDoou/R5C0Amhjp0rXMB8GA1UdIwQYMBaAFB6LU7jQ5XlDoou/R5C0Amhjp0rX
-						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGiCXJS6KYYdPOa16ONp
-						YO9RxyV1UAJ4SWolE2othZv8HQHhH6lxlI9rOISOoBo8XkeSscrVAYMLA6fPM1aR
-						8+X/Et65VWSZN52sI2oEFlXub3DmwFI77vd67QYt13jdrJQW9rLG4Jqf7XKjvtLf
-						SwPhDfohab9O3yTxGcfxRLwgU1ZyNHOQMIz72ti085RavSLCsFOqy7hGE2DvZFrD
-						01UxhUq4UgJxcsbvAMRjOJVsxJ1TowhnDxLNv67GSMTj83+5zZaCU0ZWvU9nTggB
-						UztrSjOIxJq/HOK/cJv4DONOpL6wbJHZdA2trTfmm+YBc3cuBtPmhPcHEMfqSGS0
-						Utc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathensla.rcm.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathensla.rcm.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Royal College of Music</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal College of Music</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rcm.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Knapp</SurName>
-    <EmailAddress>mailto:mknapp@rcm.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Knapp</SurName>
-    <EmailAddress>mailto:mknapp@rcm.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rcnp-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml b/swamid-interfederations-2.0/rcnp-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
deleted file mode 100644
index d6042885..00000000
--- a/swamid-interfederations-2.0/rcnp-test.literatumonline.com-action-samlACS-shibboleth-testshib-sp.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://rcnp-test.literatumonline.com/action/samlACS/shibboleth/testshib/sp">
-  <!--
-		This is a "Royal College of Nursing Publishing Test" 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-11-26T14:28:29Z">
-      <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">RCNP Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">RCNP Test SP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://rcnp-test.literatumonline.com/page/about-us</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIJAMqMZUiIsl4nMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEXJjbnB1Ymxpc2hpbmcuY29tMB4XDTEzMTAwMzIxMzU1OFoXDTIzMTAwMTIx
-						MzU1OFowHDEaMBgGA1UEAxMRcmNucHVibGlzaGluZy5jb20wggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDBlUJDDRaIIieWxx02H8sbXKNbUE6X+ZQbDeEk
-						ifb/0TqrolBjWGbwIB55jf4qL5aHy1Xb9lWiuItveLETbDsb6LGVRXjoBLMD/hq/
-						INQNKlId7sUyaDD1dKdWo8vZAORnLLJfiNfJBFSfwt8dnnQihsv8ip1sQonfdjWF
-						2JaPRwKHX864wn6x8CvqOgRNheowlhj6Hq69zX9mL9bKww6MC9c++11rwOYHVdGZ
-						vZqhU0CxzNTDJWDRYwu5//PpMDLMJGTpbuRnN0SRR0uOJ6H9hACTO4MLGzO/WF4X
-						cU1+I48q2gCdsZ2LaHWmNJqIy5IU24r2gu75uYAdUfE/n6UxAgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEXJjbnB1Ymxpc2hpbmcuY29thiRodHRwczovL3JjbnB1Ymxpc2hp
-						bmcuY29tL3NoaWJib2xldGgwHQYDVR0OBBYEFBME3+HToUv+o1RLhxpnUhzXeecR
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAiMV6SbpPn4cSK/tteSnvlGDu0kx0WrKHcq70j
-						/TQyKZYc/roD1Xsbusj6kNhtbyg2UDKZMtUDJUX49Gy6od4hMft/LaO0d+S0fBA5
-						pMGEl3rQpubIUem/SBAfN+Au+7j6yqi0vukGCqSWNAaQXt/XqkKys69b/CIbqkrm
-						ggWl3cXSrJx7GPKL1S9O5Oxd/cJO+g32L9qMH7LuKHLlnkEH8O5ZKjZjn+F6rBy7
-						BBfwdYT/FpEL/nu+CPZwOcochpjY1HNtmq8tYGHv85r3mZkaLLnd+t0HGTw8X/Rs
-						Ulakv64cRCvOJRV/8DpP8bRsMrlqMkCQ2N3nu3eWKuQsgp67
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rcnp-test.literatumonline.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rcnp-test.literatumonline.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rcnp-test.literatumonline.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal College of Nursing Publishing</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://rcnp-test.literatumonline.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/rcse-prod.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml b/swamid-interfederations-2.0/rcse-prod.literatumonline.com-action-samlACS-shibboleth-testshib-sp.xml
deleted file mode 100644
index 32d8f7d9..00000000
--- a/swamid-interfederations-2.0/rcse-prod.literatumonline.com-action-samlACS-shibboleth-testshib-sp.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://rcse-prod.literatumonline.com/action/samlACS/shibboleth/testshib/sp">
-  <!--
-		This is a "Royal College of Surgeons of England UAT" OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-06-02T11:26:56Z">
-      <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">Royal College of Surgeons of England UAT SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Royal College of Surgeons of England is a professional membership organisation, representing surgeons in the UK and abroad and publishing the Annals, Bulletin and FDJ journals.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://publishing.rcseng.ac.uk</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIJAMhKH6y9Hoa3MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF3B1Ymxpc2hpbmcucmNzZW5nLmFjLnVrMB4XDTE1MDUxOTIwMTExOVoXDTE4
-						MDUxODIwMTExOVowIjEgMB4GA1UEAxMXcHVibGlzaGluZy5yY3NlbmcuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcqP1nsR6RR63+tt7m6VpG
-						Fe0N63jWc+L75Yx/XcifuQzUgCwaUIWCDMry+0owhAp+gEKyvS6PRD8882uMz3zF
-						TV+CgO6zQhcJjnyveppcMncbMfalY3zOw1YjleoR4XLdzpyW4LuY5tNVnMAZXQVC
-						VtHG2p+9/8XfG0MlsHbY2nZ+yZgT9vkIyPtIWpXi/idj1EN+ZdLCtsL3yzGqWAve
-						Qi9kYWS+ggG5r2pQfLVkbvVmsTL23JBqRld1A9qRVUTdnpXFabP8JpOjvXE3snd1
-						syyqznSclUa/CyNxaOjHIdRwwla8uTgjBzptM+cYxVoyhmoix40D+2TM8lxMalDn
-						AgMBAAGjcTBvME4GA1UdEQRHMEWCF3B1Ymxpc2hpbmcucmNzZW5nLmFjLnVrhipo
-						dHRwczovL3B1Ymxpc2hpbmcucmNzZW5nLmFjLnVrL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFNz9EzNV6uHR8X7nyRFUHHnHpGOFMA0GCSqGSIb3DQEBBQUAA4IBAQAFEZps
-						xzkFcuj9fOp4h+TzbjL3/sEHVrKx4Dh2tVMPfGk0SMrBqKFNHAXiSNoAo6215SuU
-						Ezm1gXadzcNjJPqm7RUk3gAc5bYw1sjNSFi0Te5GSuZZZSw/WwkN0gM/FYVp4FnK
-						hQhCaQ+juVlDE5rb8ghlrI5jrtwepYPteWaxu++m5qZTlAxvvtx2pRfUyukVJjMZ
-						PkaOYchDb5r9Z+twVephYe+xxrDxLwiy0CeyVTKxwjs/tDipulBOmB5r306v8upD
-						3wvxMOAwc73Gkm2Zrkckq+6SBwQx++uWHktS09fWnbdpLOjEVAlziJ2Dibj/6rQ3
-						JSRe52fl1W9ziYsM
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rcse-prod.literatumonline.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rcse-prod.literatumonline.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rcse-prod.literatumonline.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal College of Surgeons of England UAT SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rcseng.ac.uk/</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/rdmc-test.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/rdmc-test.nottingham.ac.uk-shibboleth.xml
deleted file mode 100644
index daae311b..00000000
--- a/swamid-interfederations-2.0/rdmc-test.nottingham.ac.uk-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://rdmc-test.nottingham.ac.uk/shibboleth">
-  <!--
-		This is a "DSPACE" Shibboleth SP for the University of Nottingham.
-	-->
-  <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="2015-04-20T08:26:59Z">
-      <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://rdmc-test.nottingham.ac.uk/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://rdmc-test.nottingham.ac.uk/Shibboleth.sso/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://rdmc-test.nottingham.ac.uk/Shibboleth.sso/UKfederation" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIErzCCA5egAwIBAgIRANJIX2z8SW0qwHxO7fubgwAwDQYJKoZIhvcNAQELBQAw
-						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-						IENBIDIwHhcNMTUwNDAyMDAwMDAwWhcNMTgwNDAxMjM1OTU5WjBIMSEwHwYDVQQL
-						ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxIzAhBgNVBAMTGnJkbWMtdGVzdC5u
-						b3R0aW5naGFtLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						8jRRgNI3LCA8g0gjOIeTyuO7H/RZKGO/PEka8MwdLp4K+F7zeHYrjh8lQx504bXg
-						xn2Lba9XCuwCNIwXapOe02LgD8x05jPHj5e8ncoRZayyM9/dOda0vbBekB7vvWH7
-						duNnW/331x2DVSUM4un0h1mlMnB1H9ZPHgZ8QeIh8CWEOKs9OvM8PxKR7KtOSJ8H
-						wNlz0Tdx3WB54FFn+i19L0iOUD8jHziYuizqGmGq444GmeFBMR9iiByyJbAIAa60
-						GPnlbSDzl8FqhwGcUWUU/mlNjWOS/q7EiZ0rIgXw4QmkGouko39w5lwSSIxZEf6h
-						JRu/ZPfzWeNEvjzRfLvchwIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUW9CKHJoy
-						W+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFB+y9Dt3cNlKivMbhgqhSYPcDqtCMA4G
-						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
-						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5B
-						U1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-						cnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlo
-						dHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMCUGA1UdEQQeMByCGnJkbWMtdGVzdC5u
-						b3R0aW5naGFtLmFjLnVrMA0GCSqGSIb3DQEBCwUAA4IBAQCHHa0RRNHCYiFFAWgk
-						598BXx5OHHpj0rbq64wMwI1ftDkEPVa96lk9rcBwlelAigA8m5qyUHXA2lgvkG9k
-						LDBmmJpPa5WMYMuW71jpkip9DYtSORtJAmZhXyhiwiy3b7G3fqTBTrJ4vQpZQWNQ
-						WLN4R4E+8prL481pJgyNu4iZsGfTd/F6YnLtFHOtOs4MJyj57VgC1wPJ5gOeY6ty
-						H27ZTl9oIMhvt1zzPi+qjMgIQ+fVspTLoA99lYDkNe26FmCERVNKD7Smu4H/paWM
-						1jIHuFbL+I053a3tMKtMlSV1SXnHiyum5aAvma7NEsS45HeASQ52zRzcycEjwo2k
-						P+p/
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://rdmc-test.nottingham.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rdmc-test.nottingham.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DSPACE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://rdmc-test.nottingham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:it-helpline@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Betts</SurName>
-    <EmailAddress>mailto:craig.betts@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rdmc.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/rdmc.nottingham.ac.uk-shibboleth.xml
deleted file mode 100644
index 2e5e6c40..00000000
--- a/swamid-interfederations-2.0/rdmc.nottingham.ac.uk-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://rdmc.nottingham.ac.uk/shibboleth">
-  <!--
-		This is a "DSPACE" Shibboleth SP for the University of Nottingham.
-	-->
-  <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="2015-05-04T11:52:31Z">
-      <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://rdmc.nottingham.ac.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://rdmc.nottingham.ac.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://rdmc.nottingham.ac.uk/Shibboleth.sso/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://rdmc.nottingham.ac.uk/Shibboleth.sso/UKfederation" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEpTCCA42gAwIBAgIRAJ2/okPnsHx5Wip6mqpvf1AwDQYJKoZIhvcNAQELBQAw
-						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-						IENBIDIwHhcNMTUwNDAyMDAwMDAwWhcNMTgwNDAxMjM1OTU5WjBDMSEwHwYDVQQL
-						ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHjAcBgNVBAMTFXJkbWMubm90dGlu
-						Z2hhbS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMkaEBv9
-						b319Pbo1S5W9yga8aTnsLKw1rEg3wx0w4WgVZDVmjMhsnJ66I+IdxMqmBhPEyLPw
-						LHZsdBe5cOW/pwnhxfTm0ie783QFiQn/9zmohCgWUI2rgFIDPc2r9bRPRkeuqJ7Z
-						9ifY08oc1yBY1amk/ik9NYhYDM8DmiPz1+Vl8wntCKWz359Cnw3XqVigO+N3Jrga
-						CtOa0E8YnhnxgCnQXDwgFxCQBMPoqiiiFCDo/G+IObIA8DOBGYdT0IDzERo+A0xC
-						dakGAdHNQPDUkq/Z2Pdg2or0GmUeZOPvQOYDUjpZ6awpaJxHHxJBlqulTkbQU9Op
-						M+pLJ0wglohcJusCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2W
-						VBvhhiiw/ba9MB0GA1UdDgQWBBTSjvnt304tu1RyfA0EvDFM+weCADAOBgNVHQ8B
-						Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-						BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
-						BDMwMTAvoC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENB
-						Mi5jcmwwbAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVz
-						ZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDov
-						L29jc3AudXNlcnRydXN0LmNvbTAgBgNVHREEGTAXghVyZG1jLm5vdHRpbmdoYW0u
-						YWMudWswDQYJKoZIhvcNAQELBQADggEBABC3WaY9MaO8xGuL44HR9+gsAY/ghCQy
-						L85iGRhaxfyVw8N3e1leGsCpUdL23U2IxZfKmOitJPS29/VO0iw48cKpj8JHWM+f
-						M9MHa64R5xdz2RX94tS055VwmBMUA5+trbxjBghDNve7lzA40Qem8gBiW4iE0mpe
-						EldxgFRlWtDNql6kmdH9PbZGUV59ZosvzN6LFi1QHpPQMwpVkDGv+acbybA95ieF
-						8F0iJHeANxWeyb/2GkDR+vuQ7UHpQ76rnYn4P8yCHU3uwegbX7GEkcz6oCCyiDUH
-						Cku4Jqus863LhvmD4gwnwkqqNrOLWpDJ2ED/KY/6bip25QsDgvQn4ZI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://rdmc.nottingham.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rdmc.nottingham.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DSPACE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://rdmc.nottingham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>University of Nottingham IT Helpline</GivenName>
-    <EmailAddress>mailto:itservicedesk@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Betts</SurName>
-    <EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.xml
deleted file mode 100644
index 740edc2c..00000000
--- a/swamid-interfederations-2.0/reading.ac.uk-oala-metadata.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://reading.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for The University of Reading.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-31T10:08:01Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">reading.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlKgAwIBAgIISa3f8+58NocwDQYJKoZIhvcNAQEFBQAwTDEiMCAGA1UE
-						CgwZVGhlIFVuaXZlcnNpdHkgb2YgUmVhZGluZzEmMCQGA1UEAwwdb3BlbmF0aGVu
-						cy5hdXRoLnJlYWRpbmcuYWMudWswHhcNMTIwMTEyMTIxNDAwWhcNMjIwMTEyMTIx
-						NDAwWjBMMSIwIAYDVQQKDBlUaGUgVW5pdmVyc2l0eSBvZiBSZWFkaW5nMSYwJAYD
-						VQQDDB1vcGVuYXRoZW5zLmF1dGgucmVhZGluZy5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAJNYQ5WyjzIufrzwdnz8gBri2uTETchGZlYYHPUF
-						LA9W8uFfZwlFbJPnxcGxiXSCVmPGfLp0c8DywmQUbumdlVuTDPBoQnKMCst8fRcI
-						CitVbYTotup97HEneR3zoWVgsAYZ92QJ/Jucxf+aXrhUygK3cIjUXq69Kgk3ywjc
-						gFfRIjpQCVi7h2VuhNE2Zy7/7kSHpG7BVWC9ebUrDC7M+enF7c+wNZZEMZzjAzDE
-						s8WuIqgnnog+KpEYqEvhNgjTKx5/aZ8JEWBmdKQc/Q/UnwUtjsYyC5aWr4q0rX5/
-						IothWPf9dwzVbJutK8fyJ098HrViCGEwFbCCGw6dAhSOAqECAwEAAaNQME4wHQYD
-						VR0OBBYEFL19dBzqhuxKdXZOjxR98MipVHf5MB8GA1UdIwQYMBaAFL19dBzqhuxK
-						dXZOjxR98MipVHf5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAChi
-						Oe5GqHzBymz+7I+UquzLz4v4aZrTbse1kiMHNVBGPnZsmAO5J0pR+8G4fI9/q8yi
-						H1NZ7j2Rju/LAnbACJoWD/Y09csVqkeYCsostlBAg0iswiGrV4XsUjoIV/2G8K/6
-						w7o2aNw0vao8gLryS7iAVTJnivnzmtjItUMX9bFCFR6DKA2z74FeyslBE8NqAw49
-						sRTw7OH3rhuCeSVieXNUUnMD1nX1cdRkndht3wn1EpJoWEywup92YqBZORywFPcY
-						S3bWx3YM0LY8BWYUjq8CBR5Sw4WdDcDiR3YeBrT9mUiVa7yqxPoA8I/+mmkjPpiA
-						XJlpnBImjl8K0L6rTNE=
-					</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>
-						MIIDajCCAlKgAwIBAgIISa3f8+58NocwDQYJKoZIhvcNAQEFBQAwTDEiMCAGA1UE
-						CgwZVGhlIFVuaXZlcnNpdHkgb2YgUmVhZGluZzEmMCQGA1UEAwwdb3BlbmF0aGVu
-						cy5hdXRoLnJlYWRpbmcuYWMudWswHhcNMTIwMTEyMTIxNDAwWhcNMjIwMTEyMTIx
-						NDAwWjBMMSIwIAYDVQQKDBlUaGUgVW5pdmVyc2l0eSBvZiBSZWFkaW5nMSYwJAYD
-						VQQDDB1vcGVuYXRoZW5zLmF1dGgucmVhZGluZy5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAJNYQ5WyjzIufrzwdnz8gBri2uTETchGZlYYHPUF
-						LA9W8uFfZwlFbJPnxcGxiXSCVmPGfLp0c8DywmQUbumdlVuTDPBoQnKMCst8fRcI
-						CitVbYTotup97HEneR3zoWVgsAYZ92QJ/Jucxf+aXrhUygK3cIjUXq69Kgk3ywjc
-						gFfRIjpQCVi7h2VuhNE2Zy7/7kSHpG7BVWC9ebUrDC7M+enF7c+wNZZEMZzjAzDE
-						s8WuIqgnnog+KpEYqEvhNgjTKx5/aZ8JEWBmdKQc/Q/UnwUtjsYyC5aWr4q0rX5/
-						IothWPf9dwzVbJutK8fyJ098HrViCGEwFbCCGw6dAhSOAqECAwEAAaNQME4wHQYD
-						VR0OBBYEFL19dBzqhuxKdXZOjxR98MipVHf5MB8GA1UdIwQYMBaAFL19dBzqhuxK
-						dXZOjxR98MipVHf5MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAChi
-						Oe5GqHzBymz+7I+UquzLz4v4aZrTbse1kiMHNVBGPnZsmAO5J0pR+8G4fI9/q8yi
-						H1NZ7j2Rju/LAnbACJoWD/Y09csVqkeYCsostlBAg0iswiGrV4XsUjoIV/2G8K/6
-						w7o2aNw0vao8gLryS7iAVTJnivnzmtjItUMX9bFCFR6DKA2z74FeyslBE8NqAw49
-						sRTw7OH3rhuCeSVieXNUUnMD1nX1cdRkndht3wn1EpJoWEywup92YqBZORywFPcY
-						S3bWx3YM0LY8BWYUjq8CBR5Sw4WdDcDiR3YeBrT9mUiVa7yqxPoA8I/+mmkjPpiA
-						XJlpnBImjl8K0L6rTNE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.auth.reading.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.auth.reading.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Reading</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Reading</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.reading.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sue</GivenName>
-    <SurName>Egleton</SurName>
-    <EmailAddress>mailto:s.egleton@reading.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Chapman</SurName>
-    <EmailAddress>mailto:c.d.chapman@reading.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml b/swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.xml
deleted file mode 100644
index 21e9dbf1..00000000
--- a/swamid-interfederations-2.0/reading.ac.uk-oala-test-metadata.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://reading.ac.uk/oala-test/metadata">
-  <!--
-		This is an OpenAthens LA IdP for The University of Reading.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T09:56:11Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">reading.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdDCCAlygAwIBAgIIb9uiE/y9tsIwDQYJKoZIhvcNAQEFBQAwUTEiMCAGA1UE
-						CgwZVGhlIFVuaXZlcnNpdHkgb2YgUmVhZGluZzErMCkGA1UEAwwib3BlbmF0aGVu
-						cy10ZXN0LmF1dGgucmVhZGluZy5hYy51azAeFw0xNDA0MjQxNTI2NTdaFw0yNDA0
-						MjQxNTI2NTdaMFExIjAgBgNVBAoMGVRoZSBVbml2ZXJzaXR5IG9mIFJlYWRpbmcx
-						KzApBgNVBAMMIm9wZW5hdGhlbnMtdGVzdC5hdXRoLnJlYWRpbmcuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHXwJkUHepe5o+ocIg/oU4ER85
-						TJcVQtpf/D7x2bs9nJS5Uu4Egoz6bJBHYDDBFj3H4ERKX2aS9o0xpBBJfLUx3/X+
-						KC19K7Zy8BdfTnZ3ZhOvMS5UBcdkOycJdGH1CBsW2vuDCRnpacm4T7kwTWHEuIEt
-						L9hkUebIbThdm8/Zq0sBnzDXMsYiI7jQtTVKPf6zAuD507BqJZJPjFtL/ZaSkNxU
-						Tov0pu7aQBZHEToMRJSC8iQnnQx4bxMwnxuP/00MIgxwT+edw0yi3Qz/8WaCpqoR
-						kLYwahs641bUAAdEm2dlxuUA3EOj0xK66BU+5TY1E/1EWcGfXGXC7Mhgeq7LAgMB
-						AAGjUDBOMB0GA1UdDgQWBBShqMqROBVGHF2mle9Q1RK3Jj7n3jAfBgNVHSMEGDAW
-						gBShqMqROBVGHF2mle9Q1RK3Jj7n3jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
-						BQUAA4IBAQAZfO08d/FsQzqhHa3L0++q+gjSyZ6GUnMsy9TEX0MxAmShPAEXP8La
-						K2JKGb/vkF1PZtfVWSH/ZzbWPkfVfyb/q9gHPv23RDpqsomcLe5RrRYpQeCnlf71
-						ZJU9uOnwqIxYI3l8x0Ahk/87G+JKTxE2Wzoy0NZiJn2Tt79qhnYq2HbYn4K7YK3q
-						BtvapLZ0XanBO2b1uBLDNem6vQ608pgrlkstf7C2jSnpM7ixx8qSg/zZWVv1QVgS
-						9DHO+QKDohvZhFpN70BoM8HZC0uZoZYL0lBYlltfzOmkE+K4W6MK7UUEJlnY/rW1
-						4vOBq2Kkl2te9ZeLhQCT76BypFptGueg
-					</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>
-						MIIDdDCCAlygAwIBAgIIb9uiE/y9tsIwDQYJKoZIhvcNAQEFBQAwUTEiMCAGA1UE
-						CgwZVGhlIFVuaXZlcnNpdHkgb2YgUmVhZGluZzErMCkGA1UEAwwib3BlbmF0aGVu
-						cy10ZXN0LmF1dGgucmVhZGluZy5hYy51azAeFw0xNDA0MjQxNTI2NTdaFw0yNDA0
-						MjQxNTI2NTdaMFExIjAgBgNVBAoMGVRoZSBVbml2ZXJzaXR5IG9mIFJlYWRpbmcx
-						KzApBgNVBAMMIm9wZW5hdGhlbnMtdGVzdC5hdXRoLnJlYWRpbmcuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHXwJkUHepe5o+ocIg/oU4ER85
-						TJcVQtpf/D7x2bs9nJS5Uu4Egoz6bJBHYDDBFj3H4ERKX2aS9o0xpBBJfLUx3/X+
-						KC19K7Zy8BdfTnZ3ZhOvMS5UBcdkOycJdGH1CBsW2vuDCRnpacm4T7kwTWHEuIEt
-						L9hkUebIbThdm8/Zq0sBnzDXMsYiI7jQtTVKPf6zAuD507BqJZJPjFtL/ZaSkNxU
-						Tov0pu7aQBZHEToMRJSC8iQnnQx4bxMwnxuP/00MIgxwT+edw0yi3Qz/8WaCpqoR
-						kLYwahs641bUAAdEm2dlxuUA3EOj0xK66BU+5TY1E/1EWcGfXGXC7Mhgeq7LAgMB
-						AAGjUDBOMB0GA1UdDgQWBBShqMqROBVGHF2mle9Q1RK3Jj7n3jAfBgNVHSMEGDAW
-						gBShqMqROBVGHF2mle9Q1RK3Jj7n3jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
-						BQUAA4IBAQAZfO08d/FsQzqhHa3L0++q+gjSyZ6GUnMsy9TEX0MxAmShPAEXP8La
-						K2JKGb/vkF1PZtfVWSH/ZzbWPkfVfyb/q9gHPv23RDpqsomcLe5RrRYpQeCnlf71
-						ZJU9uOnwqIxYI3l8x0Ahk/87G+JKTxE2Wzoy0NZiJn2Tt79qhnYq2HbYn4K7YK3q
-						BtvapLZ0XanBO2b1uBLDNem6vQ608pgrlkstf7C2jSnpM7ixx8qSg/zZWVv1QVgS
-						9DHO+QKDohvZhFpN70BoM8HZC0uZoZYL0lBYlltfzOmkE+K4W6MK7UUEJlnY/rW1
-						4vOBq2Kkl2te9ZeLhQCT76BypFptGueg
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens-test.auth.reading.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens-test.auth.reading.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Reading</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Reading (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.reading.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sue</GivenName>
-    <SurName>Egleton</SurName>
-    <EmailAddress>mailto:s.egleton@reading.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Chapman</SurName>
-    <EmailAddress>mailto:c.d.chapman@reading.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/refserver.new.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/refserver.new.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 7828cd5a..00000000
--- a/swamid-interfederations-2.0/refserver.new.ox.ac.uk-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://refserver.new.ox.ac.uk/shibboleth">
-  <!--
-		This is a "New College reference manager" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-01-14T16:46:50Z">
-      <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://refserver.new.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAItsMlvuKT4IMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnJlZnNlcnZlci5uZXcub3guYWMudWswHhcNMTQwMTE0MTEzMTM5WhcNMjQw
-						MTEyMTEzMTM5WjAhMR8wHQYDVQQDExZyZWZzZXJ2ZXIubmV3Lm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnZrPEqAQHxxuuiaezoehBHpU
-						NawZ3YVrRODqy6xwsr8QD/12/q0q4QbY1a+PR/PxApAQDkitQwS+a2rRpxwoy7C/
-						enwcamAD6uFz7v1LYav6zqpZvlDq86R10TBq2RGXhw7gyIQh8BrVnS2JCfgatn5E
-						I7FX3Fr3J20K/gffhULR0BnegUM0V/TGRRSgHyIXvB3mpxpg/dSm2zfSV3bSkxjp
-						9XfRaM1y5stVVYZX+9MEqtMehaqashrhMmZH+Q23viQKXlnK3MQOGZ9cvV/QFndL
-						5GXp0xEevx4e3cDgYpGmnB4c68KTEQ3YPInzXXvc45W9mDYhyL0HTIJL9WisMwID
-						AQABo0QwQjAhBgNVHREEGjAYghZyZWZzZXJ2ZXIubmV3Lm94LmFjLnVrMB0GA1Ud
-						DgQWBBQvMIkjuod+Da1WtFejwhAJgqa2QzANBgkqhkiG9w0BAQUFAAOCAQEAiAOq
-						cNyzyuzytSQuC86ZMmT7Xp9nIIf620PdY+G7dIUnef3vcUz4pclZ0rJsx0EwjqW3
-						Y85Is9c781dqSnSaRRUrcnb+gQlQG0WT8xLyrwbaMLeIlU2c5plESfPcyMGothbR
-						QeslfRUPQlDHfdNDegs4QzDAg2FNIjU38nrQ2tFEvqXcIzMKJaw79j2sZjt9aI2R
-						jCvGboxIJuuy6zHBiB9Y342szp4QckSwdMw+bqdW/bA+redm3bMeul0Wo5JdOE7z
-						iHiKjF+ReWFUDsfw6iItWOSgeR015KNrE0lmrbB6JHQ+pK5V196zFfOA1zDoFtNr
-						T76PuZpBItplf7PXbw==
-					</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://refserver.new.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://refserver.new.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, New College reference manager</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.new.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@new.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/register-ci.nii.ac.jp-shibboleth-sp.xml b/swamid-interfederations-2.0/register-ci.nii.ac.jp-shibboleth-sp.xml
deleted file mode 100644
index df0382c6..00000000
--- a/swamid-interfederations-2.0/register-ci.nii.ac.jp-shibboleth-sp.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://register-ci.nii.ac.jp/shibboleth-sp">
-  <!--
-		This is a "CiNii" Shibboleth SP for the National Institute of Informatics.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://register-ci.nii.ac.jp/Shibboleth.sso/auth/action/ukfamLogin" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEPDCCAyQCCQDZrw7Kede8nzANBgkqhkiG9w0BAQUFADCB3zELMAkGA1UEBhMC
-						SlAxDjAMBgNVBAgTBVRva3lvMRMwEQYDVQQHEwpDaGl5b2RhLWt1MSowKAYDVQQK
-						EyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxPDA6BgNVBAsTM0N5
-						YmVyIFNjaWVuY2UgSW5mcmFzdHJ1Y3R1cmUgRGV2ZWxvcG1lbnQgRGVwYXJ0bWVu
-						dDEeMBwGA1UEAxMVcmVnaXN0ZXItY2kubmlpLmFjLmpwMSEwHwYJKoZIhvcNAQkB
-						FhJzeXMtZGVza0BuaWkuYWMuanAwHhcNMTMwMTI1MDYwMTQyWhcNMTgwMTI0MDYw
-						MTQyWjCB3zELMAkGA1UEBhMCSlAxDjAMBgNVBAgTBVRva3lvMRMwEQYDVQQHEwpD
-						aGl5b2RhLWt1MSowKAYDVQQKEyFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3Jt
-						YXRpY3MxPDA6BgNVBAsTM0N5YmVyIFNjaWVuY2UgSW5mcmFzdHJ1Y3R1cmUgRGV2
-						ZWxvcG1lbnQgRGVwYXJ0bWVudDEeMBwGA1UEAxMVcmVnaXN0ZXItY2kubmlpLmFj
-						LmpwMSEwHwYJKoZIhvcNAQkBFhJzeXMtZGVza0BuaWkuYWMuanAwggEiMA0GCSqG
-						SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/Xcxh22qm6u7RqOrnmljIaPC5ym11FNJA
-						Lj6DSm6S2tJs4G1wbfQ4iFIF5I1QtaPzlDhUYPT+/GX81BiLDzUEFRHykGMNTLus
-						hJGYKV54EavnUgWIbhjcRR4PC+kk8GG9HplfdeWXHgODNAe7xNUtRDOv7ygoxiX/
-						H8zDrbDIRspRCsXl1qcGk+KrOx92xh2In6tIVVuvEmRKUpYcIagCClOTtoLjWBup
-						PqAA5kSSwTFLHN+BgsvCTdTSVeqhMgbYhVtZgHu6QjjKm2lvipa+WVabVT46rrGs
-						Rf47qWlyq5Cq+262PjglCpbzQAIXheL3c1ShHmjgklyC7hyjnYG9AgMBAAEwDQYJ
-						KoZIhvcNAQEFBQADggEBAHET4JzjWe5TiAbAyB8VbOnUTWeMGI3AIMhQytfeyZqf
-						L42eAMPpZjiO/g49ucpbj1ZE0YYB1MoMhYtvrKjK56Zqc3VfRFtRGoqfZlrdwcLE
-						pgQ5yAtZ4lMirrC00coUEx5ZP9LD687N1qz2B0q552twCdx92Jiv/EPGrziQRvcL
-						d781O3GDfCNtRlgCnyL71b1Djwz0WY6llpbOvbLm9AlSYTNfNve2AO700cKHVfHi
-						u22qH/3netIbZQRzEDxUGEvwVHfyKYDe3BrMTviwNTMKYSqGu/Ay5NfZS0Y730WR
-						InZCWpRbzFnfZk1vvI1jImCVZaq8d4DsHIqVuzcAD2Y=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://register-ci.nii.ac.jp/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">National Institute of Informatics</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Institute of Informatics: CiNii</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nii.ac.jp/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Portal Service Unit</GivenName>
-    <EmailAddress>mailto:co_portal@nii.ac.jp</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Portal Service Unit</GivenName>
-    <EmailAddress>mailto:co_portal@nii.ac.jp</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 5ee60ae3..00000000
--- a/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registration.dariah.eu/shibboleth">
-  <md: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:AttributeValue>http://refeds.org/category/research-and-scholarship</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>
-      <idpdisc:DiscoveryResponse 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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ldap-dariah.esc.rzg.mpg.de/Shibboleth.sso/SLO/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">DARIAH Registration</md:ServiceName>
-      <md:ServiceName xml:lang="en">DARIAH Registration</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Service zum Registrieren fremder Accounts in der DARIAH Attribute Authority zum Zweck der Autorisierung an Dariah Services</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Service for Registration of Campus Accounts in the DARIAH Attribute Authority in order to enable Authorization for DARIAH Services</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="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="givenName" Name="urn:oid:2.5.4.42" 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="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Haase</md:SurName>
-    <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Haase</md:SurName>
-    <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Haase</md:SurName>
-    <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registry-dev.icer.niaid.nih.gov-shibboleth.xml b/swamid-interfederations-2.0/registry-dev.icer.niaid.nih.gov-shibboleth.xml
deleted file mode 100644
index d7035ea7..00000000
--- a/swamid-interfederations-2.0/registry-dev.icer.niaid.nih.gov-shibboleth.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registry-dev.icer.niaid.nih.gov/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://comanage-dev.ibrsp.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">NIAID ICER Collaboration Manager (development)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">NIAID ICER collaboration management service</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://comanage-dev.ibrsp.org/spinfo</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://comanage-dev.ibrsp.org/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://comanage-dev.ibrsp.org/logo</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDITCCAgmgAwIBAgIJAKXHrFJmGSjGMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHmR1Yi1pYi1jb21nci1kMDEuZGV2LmlicnNwLm9yZzAeFw0xNTA0MjIxNTEy
-MTZaFw0yNTA0MTkxNTEyMTZaMCkxJzAlBgNVBAMTHmR1Yi1pYi1jb21nci1kMDEu
-ZGV2LmlicnNwLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANuF
-ol5/vWTpdGsywLD0CY9xhl06t7oY4suW9Rb8XlUebz40XjVOZL32OKIQ3r6A02tE
-Rx2eM5nV+mT477LL2kKhIN/IegdjD5L9GZwBXVw0pp7KiTb9FUthxr4ntgcCTEb6
-4xHfgzUGFY0m4zjVo7NcRNfBKSVCOoBoSdEYEh2ZCYXgURE7F1jMpcRa8cek1g+B
-7EfTikGIPQfQ00VtCKV8Ifd03nydZSkpxjsnDXesrL0HzxotEFpU8Fg0jt08e+Uh
-vHBRxbcb73klxgptR+0CD3jVF+ijA0q0dtLMBhQ8a/14a83UrV8g0XxAlTvT5SAF
-tDFJW3P/woP3GmKW/1kCAwEAAaNMMEowKQYDVR0RBCIwIIIeZHViLWliLWNvbWdy
-LWQwMS5kZXYuaWJyc3Aub3JnMB0GA1UdDgQWBBTrOrq+1UDduKoue/kexS6DgUS4
-wjANBgkqhkiG9w0BAQUFAAOCAQEA0tomGtbF/MvKVJzFOtiXLKY7DiDDnseUPQ5m
-vbH64q+znfmTbINrNvsdyu+uP+du9fstLNF6+1EhgQ7S3D+M/+z/ers/+MhiZFpa
-s0FrG4G8I4ssgjOAFco0y6IYFjjeTWWkPWLzCTt4cqwvFCp3omEYQZdC5UUyAQSN
-kgCqkBIswZlb+wIbxOXh3fHvye+hFIWyzfXqFfBDlqfrjnVJdXEIybcbepFGo6CU
-H5d9gDlXJkUIow33DTF49LNz06qMfwCIYn6Np0I0XuE5QoKLWkBuDI2Mf0QcBPWG
-LrYgVs8i/+PGN80oJnOo07/PFhI0QA8JQwSjUHIbZIBmGB6SUw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://comanage-dev.ibrsp.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">NIAID ICER Collaboration Manager (development)</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">NIAID ICER collaboration management service</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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>cer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>cer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
-    <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registry.icer.niaid.nih.gov-shibboleth.xml b/swamid-interfederations-2.0/registry.icer.niaid.nih.gov-shibboleth.xml
deleted file mode 100644
index b0aba566..00000000
--- a/swamid-interfederations-2.0/registry.icer.niaid.nih.gov-shibboleth.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" entityID="https://registry.icer.niaid.nih.gov/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://registry.icer.niaid.nih.gov/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">NIAID ICER Collaboration Manager</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A collaboration management platform designed for virtual organizations.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://scienceforum.sc/registry.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://scienceforum.sc/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFdzCCA1+gAwIBAgIJAMDh5yvo5rhOMA0GCSqGSIb3DQEBDQUAMFIxJDAiBgNV
-BAMMG3JlZ2lzdHJ5LmljZXIubmlhaWQubmloLmdvdjEqMCgGCSqGSIb3DQEJARYb
-aWNlci12cm8tYWRtaW5AbGlzdC5uaWguZ292MB4XDTE2MDEwODE4MjY1MFoXDTI2
-MDEwNTE4MjY1MFowUjEkMCIGA1UEAwwbcmVnaXN0cnkuaWNlci5uaWFpZC5uaWgu
-Z292MSowKAYJKoZIhvcNAQkBFhtpY2VyLXZyby1hZG1pbkBsaXN0Lm5paC5nb3Yw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGy167DCe1JrPybgf4uRuZ
-KYtRiAitvBCm7Fm78cDRQuNnqRXLzXBUlYdTXSBEa3hNoswJBaayFjhOqw0yt/B+
-oBAfFfe9s4i3zU0J7Fe0hbUxtmpIMGhbw0Q20KCo60ryA7B9z+1fwje5Yg44TIwN
-R/P26ddEf2W4JuWsx78IK8dzwGPVw/8AQP2R3QZ7/S3EqrWQZq8B3Q/y/DkW+HFm
-WVys4IF72uaMl9WDZ/wcV3gsS8drxTrXwW01sXGKZrp9F+uucKltap24xcJMRLE4
-uQy9PLFA9jIBav0GBnlhClVzilZKghwbjFSHMrx611MkBaVq94NJhOnmxF/wHOpn
-71m90kjwSXwGGZgulYX6SVKVyqZSp9eNGbr4R//cwUqG+yrzG1U99FrA5HLeIJur
-QMS9R2IRsURg6ebH5n2utHLLPw2kheOcTYm3L8lg3Mi+gxudZFTrd+RO0mZLteQ6
-6mBeSmqEGGm+vboBOKOx+Nh43tToMpZUh5dIPscPfLBP1IvmFnW8TkffWZLvLDVT
-dBZgsunafHlqAvmQMk5Z8V68BNd2W08Fkz+YhRaJAIMcx789csRopjDcp10YMbgR
-k4pB5eyPqffxNg+1aJuaM0KL0TUTMdXOXZWcC/LTCxaOZb5zxRtYtgikVb8cvcr+
-X89C6W7RXqr5Riw8HnQgQQIDAQABo1AwTjAdBgNVHQ4EFgQUhEXi0rmuN6WKWRlb
-Ef/yeu1Vt60wHwYDVR0jBBgwFoAUhEXi0rmuN6WKWRlbEf/yeu1Vt60wDAYDVR0T
-BAUwAwEB/zANBgkqhkiG9w0BAQ0FAAOCAgEAcJgy2qTzx0GTIrx7vEs5ZY4+thtx
-3eKWiucQpbGHcVCe3rSwaNSRvyz16HQDg7RB4hdXGz1lj+jvcqhTQXMTYslGwAtl
-v4JwIZSv/cwybjMG5AO42HmNwRCUTt5XbF5fyYQnjH/2yfPul21q0VQR88v2BKOq
-IDBBL7Z5TWl17S19kV/EgJL4Mn7z35q9bLs8ioehCAl/D1lScKtgGlcGTJwHKsRV
-HQmQgU8aLahZMnpKzWijn+sodE9S+zP2NSKSP/EiaQt3CMtm2EbDOGBSNHF8Xgu4
-OVVd/2Zrle5tXxb6MZ55p941i/JZRV8kzPipGVZ7SuBYGLeBe5idIOvOUYL85EfW
-/CgesuUNtCzcWcEEQITgp/398QxaCV8bACJnSHFSUZqqrzDEy7ZVcZkYMQnbAnuT
-hkj95vcLdj4Ff76XolOXRjrWGQilVs5Cc3PQhUdmEnCEBMlGmtXH6qGGxmQw3f1t
-RbxwYaBumkQHhLB6kcj0qs+UY0rjnSSb46dooVv89uvdU5NskeRrzUPX6PHF8ZnN
-VUdNkk3QJpJZT0l8ZWZ81HQxprOvEIlWpf6IJvTpP5FhcSKnr7jTQZQIy/VGj0rF
-b2SeLnJHEgFeFqyTlQabwARTqLUDCozkEmnV9fDIYJ1HjRy0IqwHiC35kkNHQdC6
-VLgD+AE4OEIwN+k=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://registry.scienceforum.sc/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://registry.scienceforum.sc/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://registry.scienceforum.sc/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://registry.scienceforum.sc/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://registry.scienceforum.sc/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">NIAID ICER Collaboration Manager</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">A collaboration management platform designed for virtual organizations.</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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>NIAID ICER VRO Technical Support</md:GivenName>
-    <md:EmailAddress>icer-vro-support@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NIAID ICER VRO Administrative Support</md:GivenName>
-    <md:EmailAddress>icer-vro-admin@list.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registry.larpp.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/registry.larpp.internet2.edu-shibboleth.xml
deleted file mode 100644
index 024303c8..00000000
--- a/swamid-interfederations-2.0/registry.larpp.internet2.edu-shibboleth.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://registry.larpp.internet2.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://registry.larpp.internet2.edu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Registry</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://registry.larpp.internet2.edu/spinfo.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="275" xml:lang="en">https://registry.larpp.internet2.edu/img/larpp_logo_transparent_275wX150h.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIJAL9sC3mP5/uMMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHHJlZ2lzdHJ5LmxhcnBwLmludGVybmV0Mi5lZHUwHhcNMTQwNDI5MTYwOTQz
-WhcNMjQwNDI2MTYwOTQzWjAnMSUwIwYDVQQDExxyZWdpc3RyeS5sYXJwcC5pbnRl
-cm5ldDIuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0kSJBA6Z
-eqoV7iBaEWg879SeOw29W2G5lBWDaqFaBYTH00WJCF5C+okSmc7bFNfbbk3zhams
-P6ZW9x52lc5AZopKidHmEJLFw54ZnEOgsxdjs5jb+iyoOOblxIbyoa10YsHsTzWV
-M3HGhXStTZJj805dTXxxkAaw2r5l4rT6h3DdkpDoSn2Ofdz9/V/HrpFIq2QHEaoU
-/pTscCaiX6ScTcpwjvYnkWubsP1QUTpukqL8GqESAulhSb9EZxAVdNwkDHSqYXjA
-k4ViF69MApkII7z5Kge4Ga27JQqxIJ6ymZMu2nkx49fezWMi3yOutxGm9lSO3SMP
-fndgfgvFRGMJcwIDAQABo0owSDAnBgNVHREEIDAeghxyZWdpc3RyeS5sYXJwcC5p
-bnRlcm5ldDIuZWR1MB0GA1UdDgQWBBQKBLaZOFBkfMFBvncyNI+q/+FuPjANBgkq
-hkiG9w0BAQUFAAOCAQEAgc2npKbviJmtknUn1aSMFCfUPjUWtO4QWP8IhYO3gC9r
-/J1EUsgxJDYuLVdsye/2mSz9y37O0TJ+bcwh9RRoo21vxj7UsKn7Crrux171dkCa
-J3J2czLUAOcZzoIxDM1mOUyI0D9QANpPxOH6707c8PSrNLk+5la7rpHXATPDyJlc
-wz1/tj+w3FgJhPG0qY+TOMGPSe+UagL2O4LMAyFk7I8vEWi60BlO52npDhaYGXeo
-mA/jv7XqqSBfGCvHS973BG/tP1XfuwmpJqgx00x0wQlbPweIH3RmmCg3S11ZCZi8
-Qpkmgq5ZqYDMrzfYjwLpl5kpRrMdP/1Nw6g2BGe6qA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://registry.larpp.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Registry</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is a project funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) contracted with Internet2. This projects sponsors pilot schools to implement privacy management software, named “ Privacy Lens.” The Privacy Lens provides users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" 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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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="givenName" Name="urn:mace:dir:attribute-def:givenName" 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="mail" Name="urn:mace:dir:attribute-def:mail" 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="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tracy Beth Mitrano</md:GivenName>
-    <md:EmailAddress>tmitrano@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>LARPP Technical Support</md:GivenName>
-    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LARPP Support</md:GivenName>
-    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LARPP Incident Response</md:GivenName>
-    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-idp.xml b/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-idp.xml
deleted file mode 100644
index bb7c1787..00000000
--- a/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-idp.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://registry.shibboleth.ox.ac.uk/idp">
-  <!--
-		This is a Shibboleth IdP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-17T11:54:57Z">
-      <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">ox.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIJAJ3Ublo6lbs7MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2lkcC5zaGliYm9sZXRoLm94LmFjLnVrMB4XDTE0MDEwOTE0MzkyNFoXDTM0
-						MDEwOTE0MzkyNFowIjEgMB4GA1UEAxMXaWRwLnNoaWJib2xldGgub3guYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw+bbvyxNRo4vqJ7KuunzG
-						mQUqIxIkPKIbcIMzLDy9qJPqAx+GkycAXUjAJZxQdaKBqWRaSqJfFU4rEmyJcFiR
-						yCh/7/KDylWQ+NKfgfbrzPc4EQ0mkCMt75Hi4dzpqs0FodlU/uzhlXCvyS0XG4d8
-						Xz8Sm9bDTnIzfuWF8k3jcFjMTXXrx6mm1fqnhtSYgC65ZvJi3WZySF1KjAcWfg4p
-						Kyep7d1wrNUpl9/f+mw+3snwogAwrfgMTcrE0HGszozeQLzpxF07BXCHcplGP/oq
-						tb4JuCs+yWfTRwjX3yGF7qQ0vUhz9Ujukn7c/kwloe1CVBnfDXre80rBMOx/lnsP
-						AgMBAAGjgYQwgYEwHQYDVR0OBBYEFJjIqPJ4q4nUpNIPB4J3EiQ2X/RqMFIGA1Ud
-						IwRLMEmAFJjIqPJ4q4nUpNIPB4J3EiQ2X/RqoSakJDAiMSAwHgYDVQQDExdpZHAu
-						c2hpYmJvbGV0aC5veC5hYy51a4IJAJ3Ublo6lbs7MAwGA1UdEwQFMAMBAf8wDQYJ
-						KoZIhvcNAQEFBQADggEBABGZFS4mtXb2vU13u6iDnT37ZhC+6M6b2dFtDNFVZQdC
-						ktfI3EvvmGuS56t26QaaR8rgfBv4dYpHiVXOj/p8+UPnJPC6HSFsnhHUsCdTaCh0
-						kw8+T4yKYQKBm7vkwItZv/wegtz1GPrcQMu8/xqaROu0SDnUn6UTiPY5Km0exKz7
-						H0oDt1HEdH/27sP4oo1Mfcj+7+n6caKbrnOH3hVNWbDJa0WIfiK03ciufpwGd3+V
-						ZnKz8ZUKn9ypehARSzHsOYPFBsWzFHWZfhN4JLUmAsaAcapBmDo2Rn1ZkXDAGYMT
-						3We0cygwa3z8pz8F9sHQEhdE2CTxxhJpdmOeI1UYE5c=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.ox.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.shibboleth.ox.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shibboleth.ox.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shibboleth.ox.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shibboleth.ox.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">ox.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIJAJ3Ublo6lbs7MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2lkcC5zaGliYm9sZXRoLm94LmFjLnVrMB4XDTE0MDEwOTE0MzkyNFoXDTM0
-						MDEwOTE0MzkyNFowIjEgMB4GA1UEAxMXaWRwLnNoaWJib2xldGgub3guYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw+bbvyxNRo4vqJ7KuunzG
-						mQUqIxIkPKIbcIMzLDy9qJPqAx+GkycAXUjAJZxQdaKBqWRaSqJfFU4rEmyJcFiR
-						yCh/7/KDylWQ+NKfgfbrzPc4EQ0mkCMt75Hi4dzpqs0FodlU/uzhlXCvyS0XG4d8
-						Xz8Sm9bDTnIzfuWF8k3jcFjMTXXrx6mm1fqnhtSYgC65ZvJi3WZySF1KjAcWfg4p
-						Kyep7d1wrNUpl9/f+mw+3snwogAwrfgMTcrE0HGszozeQLzpxF07BXCHcplGP/oq
-						tb4JuCs+yWfTRwjX3yGF7qQ0vUhz9Ujukn7c/kwloe1CVBnfDXre80rBMOx/lnsP
-						AgMBAAGjgYQwgYEwHQYDVR0OBBYEFJjIqPJ4q4nUpNIPB4J3EiQ2X/RqMFIGA1Ud
-						IwRLMEmAFJjIqPJ4q4nUpNIPB4J3EiQ2X/RqoSakJDAiMSAwHgYDVQQDExdpZHAu
-						c2hpYmJvbGV0aC5veC5hYy51a4IJAJ3Ublo6lbs7MAwGA1UdEwQFMAMBAf8wDQYJ
-						KoZIhvcNAQEFBQADggEBABGZFS4mtXb2vU13u6iDnT37ZhC+6M6b2dFtDNFVZQdC
-						ktfI3EvvmGuS56t26QaaR8rgfBv4dYpHiVXOj/p8+UPnJPC6HSFsnhHUsCdTaCh0
-						kw8+T4yKYQKBm7vkwItZv/wegtz1GPrcQMu8/xqaROu0SDnUn6UTiPY5Km0exKz7
-						H0oDt1HEdH/27sP4oo1Mfcj+7+n6caKbrnOH3hVNWbDJa0WIfiK03ciufpwGd3+V
-						ZnKz8ZUKn9ypehARSzHsOYPFBsWzFHWZfhN4JLUmAsaAcapBmDo2Rn1ZkXDAGYMT
-						3We0cygwa3z8pz8F9sHQEhdE2CTxxhJpdmOeI1UYE5c=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shibboleth.ox.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shibboleth.ox.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 Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Help</GivenName>
-    <EmailAddress>mailto:help@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sysdev</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.xml b/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.xml
deleted file mode 100644
index 5f55c0cc..00000000
--- a/swamid-interfederations-2.0/registry.shibboleth.ox.ac.uk-sp-ouls-ezproxy.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://registry.shibboleth.ox.ac.uk/sp/ouls-ezproxy">
-  <!--
-		This is an EZproxy SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-06-24T15:16: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>
-						MIIFIDCCBAigAwIBAgIBBTANBgkqhkiG9w0BAQUFADCBwDEeMBwGA1UEAxMVZXpw
-						cm94eS5vdWxzLm94LmFjLnVrMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jk
-						c2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUQ2FjaGUgU2VhcmNoIFJl
-						c3VsdHMxGzAZBgNVBAsTEkJvZGxlaWFuIExpYnJhcmllczEuMCwGCSqGSIb3DQEJ
-						ARYfc2ltb24ubWNsZWlzaEBib2RsZWlhbi5veC5hYy51azAeFw0xNDA1MTkxNDM3
-						MzNaFw0yNDA1MTgxNDM3MzNaMIHAMR4wHAYDVQQDExVlenByb3h5Lm91bHMub3gu
-						YWMudWsxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UE
-						BxMGT3hmb3JkMR0wGwYDVQQKExRDYWNoZSBTZWFyY2ggUmVzdWx0czEbMBkGA1UE
-						CxMSQm9kbGVpYW4gTGlicmFyaWVzMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xl
-						aXNoQGJvZGxlaWFuLm94LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEApfyE0QKZIyAWjyeQX3u6j8VerSbSJedbx7Xpe9xeYKO+jofSaYCI4vER
-						EktCBcydO8Thbb4FG5+Dm3UbFvL3HaoJ1kwRCPe2s6DIjMkSQgOOmJXI8uv/Fo9+
-						WbeQMSBkh3eguj7UfUyYf6X0rEDthba26UgK2A961uxhjtjBiJxOvE2m9CmA/7lw
-						fNUQo/kVMj84Cx93CSXk4ErJOR+tkz9fLsXCmD+Df47b/pBHg/O26cs/LW8kmcsL
-						rS9+C9elxDuCjyxsmwufXUfxKfXrXDuWKm1ttTn8YS72JeF7WOvkTWqRfPZfsyT+
-						vJoSB7defi3ewxXEmQ63TR+YfI1u/wIDAQABo4IBITCCAR0wHQYDVR0OBBYEFPbM
-						9KZMKtal5T6yuLnxqwAh9B6xMIHtBgNVHSMEgeUwgeKAFPbM9KZMKtal5T6yuLnx
-						qwAh9B6xoYHGpIHDMIHAMR4wHAYDVQQDExVlenByb3h5Lm91bHMub3guYWMudWsx
-						CzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hm
-						b3JkMR0wGwYDVQQKExRDYWNoZSBTZWFyY2ggUmVzdWx0czEbMBkGA1UECxMSQm9k
-						bGVpYW4gTGlicmFyaWVzMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xlaXNoQGJv
-						ZGxlaWFuLm94LmFjLnVrggEFMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAA7f5WlR21SqJJ23OtP/Hxeo3jmmm5LRrjfdftTiXWrVQdGmj0znEEZK3feS
-						VOdJucmpuwUha9y7IwcJSW5cpNON1EgNAEFJBk3yVc/QJFBI1GP4cz+LeYuGQ78y
-						QWhC1dCTzrmkZ8GPgp01z3T/Fd/alcmPfi+jakFVNVBzo438HdGp83iYOT9ZZ3wS
-						7GvWeEI9pCF6+FLSVo7lAwCdKnUz+I2QwShkVM5qz1XTwBz5r+8hSIUkjYsHnzej
-						xSMRZgfeIDO98i9fIEp6Mv4OIj7bVMTNmC+VJoKpu/T2PjuD/KHWjPouvRmDz4nu
-						OpGViTGdF0S5kv2uRj4LZ+tfkm4=
-					</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://ezproxy.ouls.ox.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ezproxy.ouls.ox.ac.uk/Shibboleth.shire" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oxford University: EZproxy Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ouls.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Mcleish</SurName>
-    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Mcleish</SurName>
-    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rellias.imodules.com-sp.xml b/swamid-interfederations-2.0/rellias.imodules.com-sp.xml
deleted file mode 100644
index c9073183..00000000
--- a/swamid-interfederations-2.0/rellias.imodules.com-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="http://rellias.imodules.com/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">rellias</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDBDCCAeygAwIBAgIQzEDukSw9R5BHpxVmr1UwFjANBgkqhkiG9w0BAQQFADAX
-MRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wHhcNMTQwNjEwMjExODU3WhcNMzQwNjEw
-MjExODU2WjAXMRUwEwYDVQQDEwxpbW9kdWxlcy5jb20wggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDC5hlDfEQ7RoqQgtcZjOxN2FdUOMu4MI8hIeydiFDy
-1fT1t1jJHmFF5V4JDGpITIapK2caenljBcGl7CGC+Z6EXID8i0lxc7lLWOOrYkJb
-8PeuVOpbxTZfOxfkC3jf4IfLZPtBfDvWjYtVUPwDCpwLLE/GQzz6HySoMIcWAkQ9
-bPoAIITTRnDpo1f4J6nO81DKx0XjBVIbz6aTsF60pcXQzLJ69KGI5Jkh3DjmNbeq
-EXH6ENtq823q4JGXRrKvCPrTlt+79EI1p+ECSaRUx006raAYHktUTT2KY1oUlsuk
-qVA+LMmhX/+jF1fgOehHEurOiKQp2aGmeV4PnJ8pXKM9AgMBAAGjTDBKMEgGA1Ud
-AQRBMD+AEG94Y5yfOU4e+OzhpzVt1UyhGTAXMRUwEwYDVQQDEwxpbW9kdWxlcy5j
-b22CEMxA7pEsPUeQR6cVZq9VMBYwDQYJKoZIhvcNAQEEBQADggEBAFDDvIjK8eJO
-YjDqnY9DfzUEN6Vp80w3ZLhT/K49/McNbbGkt0bgg45MeJ78IxLdclTIhOEeHACN
-F71+XLb9PjRfISiB37V157w0nKF5MsMYU1dathFrVOzCIxvhERgoD4lMNtwZiKKH
-J/xYeczpnHz5iFpoiCvsvPTP5sZqAKvf5ovpermVcLyqEPJJHvLHe+TbwdwTuGMS
-pF2w1WQGpSgdbcxWWwmwpbeiF5ADI6UTS5txOfG0p8L2RTxgRJ6Nb7lNrelIEcup
-6nWHUla/60ENe+AN9qsqYh1vnknLi7kSMHwvtyzFQDHnXhwhLa9mkpsZVkeLEGsR
-MJlfQnuceWY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://relliascommerce.imodules.com/controls/login/AssertionConsumerService.aspx?sid=1325&amp;gid=1" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Imodules Software, Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Imodules Software, Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.imodules.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Raoul Ellias</md:GivenName>
-    <md:EmailAddress>rellias@imodules.com</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f7cb755b..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rems.elixir-finland.org/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rems.elixir-finland.org/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://rems.elixir-finland.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">REMS ELIXIR</md:ServiceName>
-      <md:ServiceName xml:lang="en">REMS ELIXIR</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">ELIXIRin aineistojen kayttovaltuuksien hallintajarjestelma.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">An ELIXIR service for applying for and managing access rights to datasets in the biomedical sciences.</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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="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>Timo</md:GivenName>
-    <md:SurName>Mustonen</md:SurName>
-    <md:EmailAddress>mailto:rems@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Timo</md:GivenName>
-    <md:SurName>Mustonen</md:SurName>
-    <md:EmailAddress>mailto:rems@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml b/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml
deleted file mode 100644
index 4f8b5a2c..00000000
--- a/swamid-interfederations-2.0/rendez-vous.renater.fr-shibboleth.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rendez-vous.renater.fr/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-03-16T12:36:51Z">
-      <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>https://federation.renater.fr/category/metier</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">rendez-vous platform</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://rendez-vous.renater.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Videoconferencing service Rendez-vous</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">plateforme rendez-vous</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">service de visio-conférence Rendez-vous</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>
-					      MIICVDCCAb2gAwIBAgIJANCWoubBHQg0MA0GCSqGSIb3DQEBBQUAMEMxCzAJBgNV
-BAYTAkZSMRQwEgYDVQQKDAtHSVAgUkVOQVRFUjEeMBwGA1UEAwwVcmVuZGV6dm91
-cy5yZW5hdGVyLmZyMB4XDTE1MDMxNjExMjIwMFoXDTM1MDMxMTExMjIwMFowQzEL
-MAkGA1UEBhMCRlIxFDASBgNVBAoMC0dJUCBSRU5BVEVSMR4wHAYDVQQDDBVyZW5k
-ZXp2b3VzLnJlbmF0ZXIuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMTD
-MMJTf0Z4vi/0JdBjz7RB677fkjzmBAij+vKzqMY9IIbBs1y6l0l4Nfr+vQSeRHX9
-O3Z/AIB7Ii0DFU4T97Q1KX6tVG7PaLHN/Xl9faK39DTEs05DhNL8ujwxwhkOOu2u
-Ua18VXcXFl/xtB3v0x9SHiWTBf+jX0qWHkm1pA1xAgMBAAGjUDBOMB0GA1UdDgQW
-BBQ2zKClMYj2w/JbjRxyyluT0QlDCTAfBgNVHSMEGDAWgBQ2zKClMYj2w/JbjRxy
-yluT0QlDCTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKW7IIVKbf75
-cwcngkXfbr1cvj4CN/Mxc3cD3IMG2hen69uWb7bCk0OjRqG2Ns1yIiysOcVGgNsO
-zj16Ew8OQzC0oKfgorVh3LhhSqykgsmo4gLR6t3EKTtjWjjZ+tP9pVaN6vINj4lw
-40l+az59c1wHjbHZiKbFyBhLDAEwvsO1
-
-					    </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>
-					      MIICVDCCAb2gAwIBAgIJANCWoubBHQg0MA0GCSqGSIb3DQEBBQUAMEMxCzAJBgNV
-BAYTAkZSMRQwEgYDVQQKDAtHSVAgUkVOQVRFUjEeMBwGA1UEAwwVcmVuZGV6dm91
-cy5yZW5hdGVyLmZyMB4XDTE1MDMxNjExMjIwMFoXDTM1MDMxMTExMjIwMFowQzEL
-MAkGA1UEBhMCRlIxFDASBgNVBAoMC0dJUCBSRU5BVEVSMR4wHAYDVQQDDBVyZW5k
-ZXp2b3VzLnJlbmF0ZXIuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMTD
-MMJTf0Z4vi/0JdBjz7RB677fkjzmBAij+vKzqMY9IIbBs1y6l0l4Nfr+vQSeRHX9
-O3Z/AIB7Ii0DFU4T97Q1KX6tVG7PaLHN/Xl9faK39DTEs05DhNL8ujwxwhkOOu2u
-Ua18VXcXFl/xtB3v0x9SHiWTBf+jX0qWHkm1pA1xAgMBAAGjUDBOMB0GA1UdDgQW
-BBQ2zKClMYj2w/JbjRxyyluT0QlDCTAfBgNVHSMEGDAWgBQ2zKClMYj2w/JbjRxy
-yluT0QlDCTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAKW7IIVKbf75
-cwcngkXfbr1cvj4CN/Mxc3cD3IMG2hen69uWb7bCk0OjRqG2Ns1yIiysOcVGgNsO
-zj16Ew8OQzC0oKfgorVh3LhhSqykgsmo4gLR6t3EKTtjWjjZ+tP9pVaN6vINj4lw
-40l+az59c1wHjbHZiKbFyBhLDAEwvsO1
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rendez-vous.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rendez-vous.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">plateforme rendez-vous</md:ServiceName>
-      <md:ServiceName xml:lang="en">rendez-vous platform</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">service de visio-conférence Rendez-vous</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Videoconferencing service Rendez-vous</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" 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="givenName" Name="urn:oid:2.5.4.42" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sami Honein</md:SurName>
-    <md:EmailAddress>sami.honein@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Pawel Domas</md:SurName>
-    <md:EmailAddress>pawel.domas@jitsi.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml b/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml
index df1d3c60..ddc91122 100644
--- a/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml
+++ b/swamid-interfederations-2.0/repo.clarino.uib.no-shibboleth-sp.xml
@@ -1,106 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repo.clarino.uib.no/shibboleth/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-11-19T14:56:48Z">
-      <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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://repo.clarino.uib.no/shibboleth/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://repo.clarino.uib.no/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CLARINO Bergen Langzeitarchiv</mdui:DisplayName>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">CLARINO Bergen Repository</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</mdui:Description>
-        <mdui:Description xml:lang="en">The CLARINO Bergen Repository for language resources at the University of Bergen</mdui:Description>
-        <mdui:Logo height="16" width="16">https://repo.clarino.uib.no/xmlui/themes/CLARINO/images/favicon.ico</mdui:Logo>
-        <mdui:Logo height="64" width="180">https://clarino.uib.no/images/clarino_duo-180.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://repo.clarino.uib.no/xmlui/page/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://repo.clarino.uib.no/xmlui/privacypolicy.html</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="fi">CLARINO Bergen Repository</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The CLARINO Bergen Repository at the University of Bergen</mdui:Description>
+        <mdui:Logo height="165" width="460">https://clarino.uib.no/images/clarino_duo-460.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="fi">https://repo.clarino.uib.no/xmlui/page/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://repo.clarino.uib.no/xmlui/page/privacypolicy</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>repo.clarino.uib.no</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=repo.clarino.uib.no</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAP5/Ri7rxa/LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3JlcG8uY2xhcmluby51aWIubm8wHhcNMTQxMjE4MDkwNTE1WhcNMjQxMjE1
-MDkwNTE1WjAeMRwwGgYDVQQDExNyZXBvLmNsYXJpbm8udWliLm5vMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2OVEwzYCig35Ii37Buky/t7KWlNUEkGP
-E2WbfBiSPM2Iw+FIYGrpZ8KIt6qloN19vKwy8m53Asbba477R8CEx0zNQEHPfq35
-vPDxDj2xLN+xvRuk6s6KbZ2eKvV6Vov2vDtOt7kw8gDFUOJd+SdOe+ROdiuV/DbO
-jpwsW68GdDpLWHmKSqXqk8fwCdoc0Imwic5sSfc2LPjAqu95aIb7CiAh8sOg26XK
-ik6Fjibj48l3aVxtIMGJf30JtS1SqnKgqmQoO6opBGnaCF4huNa44JYUSF5CQZ3c
-4nRxupv2tp696H7lLH3XOI81dsrAVXEwt1q2D8FzNlT+U0AeFaRhbwIDAQABo0Ew
-PzAeBgNVHREEFzAVghNyZXBvLmNsYXJpbm8udWliLm5vMB0GA1UdDgQWBBQaN4I1
-A6h9Jlo90nhGCWfw3EpT4jANBgkqhkiG9w0BAQUFAAOCAQEADsJ1zgUqZqgnq4gU
-z/z3N+5bieEYEZUJnaQ78a3erdYYLETE/PBrN0QUIGR3M2DhjCi0s00QuVFa1JqX
-IK3dR4ndo5Yv4hV/fVhDIZ4mVIUQPBcTRk1om9/gl1fdmRD+YpvhUSzvheLRBsQO
-yz2syxGRIPwu6LexWb8YbZtcvtWU4ZGwm91KXDerV8J05m4X5rv4HZi0MAS349Vz
-tNRgm6CrMBfiQUxQw5Gqsiuyf3rpzQLslEWEmP4AuoiUvlXiWqW+fDKhDhj2vlc8
-0jOCrQaG00xvCbXSg91K+Xxj1kXjArfX4R7aB1TquBqLoFbPo0lNooYBECv+bN2q
-rYzidg==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAP5/Ri7rxa/LMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE3JlcG8uY2x
+hcmluby51aWIubm8wHhcNMTQxMjE4MDkwNTE1WhcNMjQxMjE1MDkwNTE1WjAeMRwwGgYDVQQDExNyZX
+BvLmNsYXJpbm8udWliLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2OVEwzYCig35I
+i37Buky/t7KWlNUEkGPE2WbfBiSPM2Iw+FIYGrpZ8KIt6qloN19vKwy8m53Asbba477R8CEx0zNQEHP
+fq35vPDxDj2xLN+xvRuk6s6KbZ2eKvV6Vov2vDtOt7kw8gDFUOJd+SdOe+ROdiuV/DbOjpwsW68GdD
+pLWHmKSqXqk8fwCdoc0Imwic5sSfc2LPjAqu95aIb7CiAh8sOg26XKik6Fjibj48l3aVxtIMGJf30Jt
+S1SqnKgqmQoO6opBGnaCF4huNa44JYUSF5CQZ3c4nRxupv2tp696H7lLH3XOI81dsrAVXEwt1q2D8Fz
+NlT+U0AeFaRhbwIDAQABo0EwPzAeBgNVHREEFzAVghNyZXBvLmNsYXJpbm8udWliLm5vMB0GA1UdDgQ
+WBBQaN4I1A6h9Jlo90nhGCWfw3EpT4jANBgkqhkiG9w0BAQUFAAOCAQEADsJ1zgUqZqgnq4gUz/z3N
++5bieEYEZUJnaQ78a3erdYYLETE/PBrN0QUIGR3M2DhjCi0s00QuVFa1JqXIK3dR4ndo5Yv4hV/fVhD
+IZ4mVIUQPBcTRk1om9/gl1fdmRD+YpvhUSzvheLRBsQOyz2syxGRIPwu6LexWb8YbZtcvtWU4ZGwm91
+KXDerV8J05m4X5rv4HZi0MAS349VztNRgm6CrMBfiQUxQw5Gqsiuyf3rpzQLslEWEmP4AuoiUvlXiWq
+W+fDKhDhj2vlc80jOCrQaG00xvCbXSg91K+Xxj1kXjArfX4R7aB1TquBqLoFbPo0lNooYBECv+bN2q
+rYzidg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repo.clarino.uib.no/Shibboleth.sso/SLO/Artifact"/>
-    <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://repo.clarino.uib.no/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repo.clarino.uib.no/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CLARINO Bergen Langzeitarchiv</md:ServiceName>
+    <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://repo.clarino.uib.no/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">CLARINO Bergen Repository</md:ServiceName>
       <md:ServiceName xml:lang="en">CLARINO Bergen Repository</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Norwegische Forschungsinfrastruktur für Sprachdaten und Dienste im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">The CLARINO Bergen Repository for language resources at the University of Bergen</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="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:oid:2.5.4.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="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="givenName" Name="urn:oid:2.5.4.42" 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="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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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:ServiceDescription xml:lang="en">The CLARINO Bergen Repository at the University of Bergen</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="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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="administrative">
+    <md:GivenName>Oyvind Liland</md:GivenName>
+    <md:SurName>Gjesdal</md:SurName>
+    <md:EmailAddress>mailto:dst@uib.no</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Oyvind Liland</md:GivenName>
     <md:SurName>Gjesdal</md:SurName>
     <md:EmailAddress>mailto:oyvind.gjesdal@uib.no</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Koenraad</md:GivenName>
-    <md:SurName>de Smedt</md:SurName>
-    <md:EmailAddress>mailto:clarino@uib.no</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Hemed</md:GivenName>
     <md:SurName>Al Ruwehy</md:SurName>
diff --git a/swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/repo.nsms.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 32856eae..00000000
--- a/swamid-interfederations-2.0/repo.nsms.ox.ac.uk-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://repo.nsms.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-28T13:41:58Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAL0apyznrmFdMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnJlcG8ubnNtcy5veC5hYy51azAeFw0xNDA0MjUxMjU4MjNaFw0yNDA0MjIx
-						MjU4MjNaMB0xGzAZBgNVBAMTEnJlcG8ubnNtcy5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBALZontMMY7ZVutHk9dU2b20uFGvoDoXIGTVY
-						zqXI5Z3QhWz8nZ0eWPoxRd8Bk8NhVvLc1yQ3PcFXWIe9YtdATvlQCdRjrWUvRmOt
-						FBfB4pKU2LVt1goVRZSr7r+EO0yW3clMtK2LJxzxmMYX1Bodx2HMDeDI856v6U1l
-						rK+NiGWx7rbj+NtgInQkIWTeHpEWuiWbbbPTikBUNlnqVOOebZAWxW53PNekENzS
-						8fvLAt9clhDvdh21raqlWXlMd3Uv3uxs3vQrvEVstT/K1Ba1zZay8Nu3kBmlWT39
-						KLKvlhA4d9RZ5RZCpSgHjA3J3x23cvv4Vr2XVJfN3fvtGpY89PECAwEAAaNAMD4w
-						HQYDVR0RBBYwFIIScmVwby5uc21zLm94LmFjLnVrMB0GA1UdDgQWBBRFVnTingt7
-						M2lVTnK1KceB7L0uVzANBgkqhkiG9w0BAQUFAAOCAQEAblejPTxWn4YhyqGHdrhc
-						ZpxaDshVRatbNS1SbDCgIxyq3xxVBnnEHdpClyPOpHUkndAzcggOI1e4IBDCuOW5
-						wG8kYaNHY+DMmbHzKn98lw81C+GuFdJOItu+PGModOO0YbpQOG9Nr9C/gj+zKpGn
-						GGAGaT7oqzWlIjvKrUB637afxa+2J5NqYIP6sC7n8HTToAjRSqsdS5UnKDiQPueJ
-						2LL/tGKw+ZPMBwQTAT/8JwWuLTAMCVmSA8jYeMs9ojVopgDZfhefsrbUDQQ2BJrF
-						UK2XQQ615BPS2VvrQ5yDpfPpT6W4IUf2fuTG6/tGecZWZMICz8HakAZtXnKKEs2q
-						AQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repo.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oper.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - repo.nsms.ox.ac.uk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</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
index 8d9f438d..d6f444c4 100644
--- a/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
@@ -1,36 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://repos.ids-mannheim.de/shibboleth">
-  <md: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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<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://repos.ids-mannheim.de/shibboleth">
+  <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://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">Forschungsprimärdatenrepository</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Research Data 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:Logo height="16" width="16">https://repos.ids-mannheim.de/logos/ids-logo-small.png</mdui:Logo>
-        <mdui:Logo height="63" width="318">https://repos.ids-mannheim.de/logos/ids-logo-large.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://repos.ids-mannheim.de</mdui:InformationURL>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Institute for the German Language (IDS) - Repository</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Institute for the German Language (IDS) - Repository</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Language resources repository of the Institute for the German Language (IDS).</mdui:Description>
         <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:PrivacyStatementURL xml:lang="fi">https://repos.ids-mannheim.de/privacy.html</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>repos.ids-mannheim.de</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=aai@ids-mannheim.de,CN=repos.ids-mannheim.de,O=Institut fuer Deutsche Sprache,L=Mannheim,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGHGxH2MWmjANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UE
 BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzERMA8GA1UEBxMITWFu
 bmhlaW0xJzAlBgNVBAoTHkluc3RpdHV0IGZ1ZXIgRGV1dHNjaGUgU3ByYWNoZTEV
@@ -63,38 +50,34 @@ Qac7iOiqrpszdbdXFtIVuZBWaZpeeei/0ZHNEzByrEIqCsgwrMat5CkjURt7uBLw
 T4i6DwZIlHs/RRr1euCJszIc25Pco/JCHf+UCNaWmXi8tWbM+RbvP14lGpgMqtEU
 2JPXOJVaUapaUeeWCx2WNpjvZQ3l7KIm3Mzz80P9gL3oMEkFZYkSaNjAV2AQwNoH
 6DYCJd/I407y24ykEwvD8HQjyERNEDJFz2P5IyH4kmsIOwXNQEoOhSFt/cvvSplt
-PZjG46BQGsou6pJHmLhC/+tMXlY0jVRn6uQ4yFjtazWE24EYG+Q7dJ5yMw==
-</ds:X509Certificate>
+PZjG46BQGsou6pJHmLhC/+tMXlY0jVRn6uQ4yFjtazWE24EYG+Q7dJ5yMw==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Redirect"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repos.ids-mannheim.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Forschungsprimärdatenrepository</md:ServiceName>
-      <md:ServiceName xml:lang="en">Research Data Respository</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Das Forschungsprimärdatenrepository des Institut für Deutsche Sprache (IDS)</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Repository of language resources provided by the Institute for the German Language (IDS).</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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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://repos.ids-mannheim.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Institute for the German Language (IDS) - Repository</md:ServiceName>
+      <md:ServiceName xml:lang="en">Institute for the German Language (IDS) - Repository</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Language resources repository of the Institute for the German Language (IDS).</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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e217</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e217</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Institut für Deutsche Sprache (IDS)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.ids-mannheim.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ids-mannheim.de</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="administrative">
     <md:GivenName>Andreas</md:GivenName>
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/repository.abertay.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/repository.abertay.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 7228fe26..00000000
--- a/swamid-interfederations-2.0/repository.abertay.ac.uk-shibboleth-sp.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://repository.abertay.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Digital Research Repository" Shibboleth SP for the University of Abertay Dundee.
-	-->
-  <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-12-10T13:04:57Z"/>
-  </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://repository.abertay.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC8TCCAdmgAwIBAgIJAMHx/2oqSbXWMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDmxhYy1yZXBvLWxpdmU5MB4XDTEyMTEyNzE0MjE1M1oXDTIyMTEyNTE0MjE1
-						M1owGTEXMBUGA1UEAxMObGFjLXJlcG8tbGl2ZTkwggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDJ9vq9tg+S9T5/aGYg5Mfd2tm4NI3LcZZir3/hqJ5Bjq9F
-						vJ5gafvU85Np3kdUz0CJlitvg3D6fpfL3odhfJLZ/nalafXvyVbFHEqfUgjzRCwU
-						xyB0ExqofsExKpvXujLRFdn6mumYupp6otb/xvfGgW23f+2ZmS7Jv9zu9SwuU+Nr
-						eQhqUdVnyPYydisF5iMn12aFptn/2ZscTWWtrIL7MtLLTy7WV9Eq/m1D0FlbsNPN
-						F3LmeAbDM5etk4NmcFt9XCjs+J4i38PR5QrMB0RvhTXm8e+/z59pVmz76XrtXhmh
-						NBN3ToPLxS4I35XoUuUt5HRC5qazF8lbcW/Nn6apAgMBAAGjPDA6MBkGA1UdEQQS
-						MBCCDmxhYy1yZXBvLWxpdmU5MB0GA1UdDgQWBBTs+3Y7cFrCnQ+3Cfo4Ji5HdNsI
-						/zANBgkqhkiG9w0BAQUFAAOCAQEAArPWLF9YlItvEYMxgDYgwbEd0PNWYuUagNkb
-						iCxjaAFwSGj5Vuq6+XtuyQb8LtHRtm/jnqm9xVsbY8vUOvOZmrTnCZMkuK+Zcjv4
-						U0yiUxFjUVttOIoH+3GoYIWFHO3lHFCOFxslZF9Hg/sSMyTtEB0w5uqcdjDPsFjD
-						caMRH5TbGtBmGRK+F/VflLfSstl5y7jOP8jFdkj9a9Ul3RtUV07Y6yeu3gpTiLYY
-						ykCTM40AyIXjA/Ta2ITgcF/RrDnBjZsO1e1CA4DYl7T3NYli8IXbZFfo10GNAF3w
-						8pR9IZk5rxzXJj2quy653rOhqoiZJ2sJw6cQW1ZXFas7jy6vfQ==
-					</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://repository.abertay.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repository.abertay.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Abertay Dundee</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Research Repository</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.abertay.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Service Desk</GivenName>
-    <EmailAddress>mailto:isservicedesk@abertay.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Colin</GivenName>
-    <SurName>Watt</SurName>
-    <EmailAddress>mailto:colin.watt@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/repository.jisc.ac.uk-shibboleth.xml
deleted file mode 100644
index 81a777c2..00000000
--- a/swamid-interfederations-2.0/repository.jisc.ac.uk-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://repository.jisc.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "JISC Repository" SP for Jisc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-27T14:57:21Z">
-      <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://repository.jisc.ac.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://repository.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">JISC Repository</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Online access for registered users to JISC Repository.</mdui:Description>
-        <mdui:Logo height="68" width="350">https://repository.jisc.ac.uk/shib/shib_repository_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJALWBNu60kA8RMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGpyZXBsdjAxLmppc2MudWxjYy5hYy51azAeFw0xMjA3MDUxMzQ1NTlaFw0y
-						MjA3MDMxMzQ1NTlaMCMxITAfBgNVBAMTGGpyZXBsdjAxLmppc2MudWxjYy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANMowFcUBw/JzuJmgKZj
-						FOomnF2WVKgHSx/o9t7qz1M2nFTDdPVyOoofneLhp2PMPfpOaymaM2wVby+bqn/Y
-						chnbZlG4+QwVP5sPl0DmlYu3PTnI/rsEpE1rZYVn0KAM9TR45wgE6LeA7PDuJd2J
-						y15bi7h3rXCuQRQ1aZ8tRHD1fjBf6KiLm9B4bguHwLGeDgDrkA/JdY1Xeh4XTVar
-						WHrnXdvY9V3vlN7uBNSd1O/eWNwE0pd0Y4a1ysf4BfNoYKjgH1AL8+7BSJDyTX2C
-						7KP6oHRSNyN1vNE3UXVSC7cYH0tFGzEim0U+y5iM2zUdtnK1+EhwgAo8brILd1As
-						8tECAwEAAaNGMEQwIwYDVR0RBBwwGoIYanJlcGx2MDEuamlzYy51bGNjLmFjLnVr
-						MB0GA1UdDgQWBBQ0t7spq60qClWktBGJSUPQIRVaxjANBgkqhkiG9w0BAQUFAAOC
-						AQEApE0apWehglMp9y1cB0UdhOyXmfTq5pZ2C0alGrlEbNVT0Em7F8grWUylhTe4
-						awNjE+xlABLi6tpG2KuMoHIhf1rrh5cdj/ghFupuhYM8f7I7lnXAGbJ4qHciHEyE
-						ocQQCWlh5ad/iAQttMmOoXhvDafSP/Qo+HQCLK6DuhWWCySMdMHOYuqnQeQTFsC/
-						XCvc3RmAP9XqWR/l5KW9IwdMXkrZRle9VYOjsx7BKKufVb5OTScl5B94AHrJvc4P
-						SfFVmy2rkht+5rqtDhiHHVkQyr1p40RnXgRNdk1MmkmhXkt4odKYTvTqscnVYvR9
-						fHsDbj+iVNwcJSOlMecWJDLdeA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://repository.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Jisc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">JISC Repository</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jisc.ac.uk/aboutus.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Laura</GivenName>
-    <SurName>Smyth</SurName>
-    <EmailAddress>mailto:itservicedesk@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Justin</GivenName>
-    <SurName>Bradley</SurName>
-    <EmailAddress>mailto:jb4@ecs.soton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml b/swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.xml
deleted file mode 100644
index 8db2b9e6..00000000
--- a/swamid-interfederations-2.0/researchmonitor.euromonitor.com-web-oa-metadata.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://researchmonitor.euromonitor.com/web/oa/metadata">
-  <!--
-		This is a "Research Monitor (Live)" SP for Euromonitor International plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-29T12:09:13Z">
-      <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>
-						MIID0DCCArigAwIBAgIJAKS7WQdSWYPPMA0GCSqGSIb3DQEBBQUAME4xIjAgBgNV
-						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxKDAmBgNVBAMTH3Jlc2VhcmNo
-						bW9uaXRvci5ldXJvbW9uaXRvci5jb20wHhcNMTMxMTA3MDYxNTUyWhcNMjMxMTA1
-						MDYxNTUyWjBOMSIwIAYDVQQKExlFdXJvbW9uaXRvciBJbnRlcm5hdGlvbmFsMSgw
-						JgYDVQQDEx9yZXNlYXJjaG1vbml0b3IuZXVyb21vbml0b3IuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx6hv8EMNT+GdE0vHgiy5tkCTZ7VEqS5L
-						vJLdan+dg7InlJviBBTcSzS2xpumpCS7qnsOkNxQ3e5CAeqZku5hG5C5EbaVQO3D
-						8UmtS8RyXAS74PoEKMAtg8vp0pXRIG3GjqYGX1qE6tSja/fPjLiVGbgj4z7sF3RY
-						zU4KgIXCYUuTYB7VuKYbodu8rwW9/gKTdkhkw+OvKWjXtUpE32QH6R9N4GVcbIN2
-						JlqqKRTsg+Xsa8vY09D2Z53aH7ONGLh/978PboQ6fjmmvZNZRFAs68333PGyAke0
-						TtAreI5whvZ/eLQ9c8HXSBgGQ6A4oifabhTecqL67c5K1xp+axxwlQIDAQABo4Gw
-						MIGtMB0GA1UdDgQWBBQCFXdeKCqBj/JyQg8QN7yLhzLIPzB+BgNVHSMEdzB1gBQC
-						FXdeKCqBj/JyQg8QN7yLhzLIP6FSpFAwTjEiMCAGA1UEChMZRXVyb21vbml0b3Ig
-						SW50ZXJuYXRpb25hbDEoMCYGA1UEAxMfcmVzZWFyY2htb25pdG9yLmV1cm9tb25p
-						dG9yLmNvbYIJAKS7WQdSWYPPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAMB/zTwkzS3z8AVTmS9I+DHzsxKDPDCfTPbdKcfylA6pPS+OVYLJDK2DvBaV
-						dvgbbK1nreCbds2RnLizdU9pkKyHPk0mNKmQSlozuKTfePtaYlxfIBU369tZIVgR
-						uAkdCT2/Y77ES7DV+qxiZXO7sCNPHWdiArpPTKzdFg3zX96SGxf6c0eXE8pplech
-						86ClSyVVW8ABVY4G7ljWArG7zF5Aa9Yi1YRrPI+VZM7gH0+HqmJLV2K5Ei6GNAG1
-						welIK72JvRFuIH4129ibwKQ+aWdpAJjJJW1tFigKhbBkRW8TECZAvZoR93ipd4Un
-						rYW3RbTRG7qxLXlaiUzJzGuejm0=
-					</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>
-						MIID0DCCArigAwIBAgIJAKS7WQdSWYPPMA0GCSqGSIb3DQEBBQUAME4xIjAgBgNV
-						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxKDAmBgNVBAMTH3Jlc2VhcmNo
-						bW9uaXRvci5ldXJvbW9uaXRvci5jb20wHhcNMTMxMTA3MDYxNTUyWhcNMjMxMTA1
-						MDYxNTUyWjBOMSIwIAYDVQQKExlFdXJvbW9uaXRvciBJbnRlcm5hdGlvbmFsMSgw
-						JgYDVQQDEx9yZXNlYXJjaG1vbml0b3IuZXVyb21vbml0b3IuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx6hv8EMNT+GdE0vHgiy5tkCTZ7VEqS5L
-						vJLdan+dg7InlJviBBTcSzS2xpumpCS7qnsOkNxQ3e5CAeqZku5hG5C5EbaVQO3D
-						8UmtS8RyXAS74PoEKMAtg8vp0pXRIG3GjqYGX1qE6tSja/fPjLiVGbgj4z7sF3RY
-						zU4KgIXCYUuTYB7VuKYbodu8rwW9/gKTdkhkw+OvKWjXtUpE32QH6R9N4GVcbIN2
-						JlqqKRTsg+Xsa8vY09D2Z53aH7ONGLh/978PboQ6fjmmvZNZRFAs68333PGyAke0
-						TtAreI5whvZ/eLQ9c8HXSBgGQ6A4oifabhTecqL67c5K1xp+axxwlQIDAQABo4Gw
-						MIGtMB0GA1UdDgQWBBQCFXdeKCqBj/JyQg8QN7yLhzLIPzB+BgNVHSMEdzB1gBQC
-						FXdeKCqBj/JyQg8QN7yLhzLIP6FSpFAwTjEiMCAGA1UEChMZRXVyb21vbml0b3Ig
-						SW50ZXJuYXRpb25hbDEoMCYGA1UEAxMfcmVzZWFyY2htb25pdG9yLmV1cm9tb25p
-						dG9yLmNvbYIJAKS7WQdSWYPPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBAMB/zTwkzS3z8AVTmS9I+DHzsxKDPDCfTPbdKcfylA6pPS+OVYLJDK2DvBaV
-						dvgbbK1nreCbds2RnLizdU9pkKyHPk0mNKmQSlozuKTfePtaYlxfIBU369tZIVgR
-						uAkdCT2/Y77ES7DV+qxiZXO7sCNPHWdiArpPTKzdFg3zX96SGxf6c0eXE8pplech
-						86ClSyVVW8ABVY4G7ljWArG7zF5Aa9Yi1YRrPI+VZM7gH0+HqmJLV2K5Ei6GNAG1
-						welIK72JvRFuIH4129ibwKQ+aWdpAJjJJW1tFigKhbBkRW8TECZAvZoR93ipd4Un
-						rYW3RbTRG7qxLXlaiUzJzGuejm0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Euromonitor International plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Research Monitor (Live) - Euromonitor International</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jürgen</GivenName>
-    <SurName>Wiehan</SurName>
-    <EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jürgen</GivenName>
-    <SurName>Wiehan</SurName>
-    <EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 312cc0d9..00000000
--- a/swamid-interfederations-2.0/researchtools.ncl.ac.uk-shibboleth-metadata.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://researchtools.ncl.ac.uk/shibboleth/metadata">
-  <!--
-		This is a "Newcastle University: Research Tools server" Shibboleth SP for the University of Newcastle upon Tyne.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-24T10:52: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://researchtools.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6zCCAdOgAwIBAgIJAJn8r34tncaPMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-						BAMTDHJ1bW1hZ2UtbGl2ZTAeFw0xNDAzMDUxNTIyMTlaFw0yNDAzMDIxNTIyMTla
-						MBcxFTATBgNVBAMTDHJ1bW1hZ2UtbGl2ZTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAJwmLl9WkTW0grIGK3+WIh0MErwFhiYXThAyK7IvAZjwoU5Wt1FJ
-						GP9RqrP95wIPmfSsWv8aCvqdmxX4YwOrN3u2DZ9o7H+zsnyslsD5kLd+JHy3+gX3
-						gxsslN+nPDaKabboFfpdxNgr6NZAl+jy5WVipYpVCgWuiyVAfCX/yEZDXIX3i1hc
-						mmVehlWYM/ZcQnqBl95CSIGtl8ESyJfgD2OVa1ObPqRlR9jOdAXxH5JjS1J2tU4l
-						fjArUueGycguxxH12DniYLkSdEK744o66hxEh0aVostcXX6k8PNhIiA5g5DykA5g
-						hp0u18B3XkllYKEvRAc/nF3gmTjwgCiW6ysCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-						cnVtbWFnZS1saXZlMB0GA1UdDgQWBBQtq+ijf01hdHfpDHVKyfWIjfRXrDANBgkq
-						hkiG9w0BAQUFAAOCAQEAMUdMSWRT+1ew6sHAmZXW6QO2u2iqEv0GwLXLs4jpRkg2
-						uh6uIG66nSb2otSPiSTqXOMPvo74u2k6VQ/t9MtsOrEtF9rbIdMaOEeK+1SamEgV
-						e5fa/SnTn3tj5EUu8DDwGuZ0a2jkfTDdt9aJ3O8ayWYl//ICYWf+9yTeZbn8vazR
-						fzTZQCjmCdN+vsrv/vw6nrhJ0eDyzUlGV1oSZBgOI/x935a+lpBdxrt8zkC+AmQU
-						EFUqhPiQJe7Rk/eEObez0JzdYVhaHXAUlc4mbuqolLL2awtse/Jaa1H0Mod8Vn55
-						qgHoQEuHc+zVzvLepkSrLO0FobW/WlrFvORrQ/NsjQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://researchtools.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newcastle University: Research Tools server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ISS Helpline</GivenName>
-    <EmailAddress>mailto:helpline@ncl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Franks</SurName>
-    <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/retrieverstories-dev.umbc.edu-shibboleth.xml b/swamid-interfederations-2.0/retrieverstories-dev.umbc.edu-shibboleth.xml
deleted file mode 100644
index 0f6e45ff..00000000
--- a/swamid-interfederations-2.0/retrieverstories-dev.umbc.edu-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://retrieverstories-dev.umbc.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://retrieverstories-dev.umbc.edu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Retriever Stories (development)</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://retrieverstories-dev.umbc.edu</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHjCCAgagAwIBAgIJAI0RUT0r/oX8MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHWphYmJhLXd3dy1wcm9kMS5jb3JlLnVtYmMuZWR1MB4XDTExMTAxMDIwMzYx
-MFoXDTIxMTAwNzIwMzYxMFowKDEmMCQGA1UEAxMdamFiYmEtd3d3LXByb2QxLmNv
-cmUudW1iYy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2IDFJ
-AGo41UtzNssD22c7fX0B+pRbMR51qpQL041yLnzcOJ+bke+R6OmX34pIWA0vagKM
-qu9iY+3GyEUxGHiuTNhDBvFKYcnO6qAEsgSroUrBCDbZo9Ntpli3ktf4zA5l11Wi
-zcMBt4HAbuXOlqD2LfE3jiPyUtOhgr2ODUoqBBIoYk3RjqxnWJ5kg5uroNjtWHOQ
-TpAM+lzm/aZEei9MO+iOu68kUR9Cf0QZQEAlxvUNWR/CPN2CF00FcfobN6r1rzkd
-Q7vNCXROs232WCL0RjqVl57NLg5ED02gelGzNWSl1MRN3tRxzWGyW0F5GLKwG888
-cT9LsXNEa+efkHYnAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWphYmJhLXd3dy1wcm9k
-MS5jb3JlLnVtYmMuZWR1MB0GA1UdDgQWBBQh7CUvbTSbYcrvs/SftNs70q6XSDAN
-BgkqhkiG9w0BAQUFAAOCAQEASdHFzNxj+9RstGDYQxNTcBXzthJ0RZgwm2WgwRj4
-peDj19tKH7k/txzj2BaaVfusTxBBqdlWZElQuv5302MPH8zDP/lhtI2j4xsuOxHL
-Wk6K8OzkjihskQeZnF6xaNlajtnab7BbrkFYmS4UCbiIOduJCmKQzbE0AFDZUN1j
-OXVVS7Im4xemrgUPAUArzcGEMhAuGc4fZgiJJ93Vtw/MzpcqXW3woU4s+yuY3Dcn
-wJC08P8O53sa3+tLYDHiJdjRo5cOXwbFhex/GrHIMAnN2s7lFw55P04VmLuo/7pB
-ao6Rbsibw3/fICNNEUjDp113Ypd6MW4ncJ0OJhknmmrRRg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://retrieverstories-dev.umbc.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Retriever Stories (development)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Maryland Baltimore County</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Maryland Baltimore County</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umbc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>B. Collier Jones</md:GivenName>
-    <md:EmailAddress>collier@umbc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ed Rude</md:GivenName>
-    <md:EmailAddress>erude1@umbc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Billy Schneider</md:GivenName>
-    <md:EmailAddress>will3@umbc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/retrieverstories.umbc.edu-shibboleth.xml b/swamid-interfederations-2.0/retrieverstories.umbc.edu-shibboleth.xml
deleted file mode 100644
index 295a548c..00000000
--- a/swamid-interfederations-2.0/retrieverstories.umbc.edu-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://retrieverstories.umbc.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://retrieverstories.umbc.edu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Retriever Stories</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://retrieverstories.umbc.edu</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHjCCAgagAwIBAgIJAI0RUT0r/oX8MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-BAMTHWphYmJhLXd3dy1wcm9kMS5jb3JlLnVtYmMuZWR1MB4XDTExMTAxMDIwMzYx
-MFoXDTIxMTAwNzIwMzYxMFowKDEmMCQGA1UEAxMdamFiYmEtd3d3LXByb2QxLmNv
-cmUudW1iYy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2IDFJ
-AGo41UtzNssD22c7fX0B+pRbMR51qpQL041yLnzcOJ+bke+R6OmX34pIWA0vagKM
-qu9iY+3GyEUxGHiuTNhDBvFKYcnO6qAEsgSroUrBCDbZo9Ntpli3ktf4zA5l11Wi
-zcMBt4HAbuXOlqD2LfE3jiPyUtOhgr2ODUoqBBIoYk3RjqxnWJ5kg5uroNjtWHOQ
-TpAM+lzm/aZEei9MO+iOu68kUR9Cf0QZQEAlxvUNWR/CPN2CF00FcfobN6r1rzkd
-Q7vNCXROs232WCL0RjqVl57NLg5ED02gelGzNWSl1MRN3tRxzWGyW0F5GLKwG888
-cT9LsXNEa+efkHYnAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWphYmJhLXd3dy1wcm9k
-MS5jb3JlLnVtYmMuZWR1MB0GA1UdDgQWBBQh7CUvbTSbYcrvs/SftNs70q6XSDAN
-BgkqhkiG9w0BAQUFAAOCAQEASdHFzNxj+9RstGDYQxNTcBXzthJ0RZgwm2WgwRj4
-peDj19tKH7k/txzj2BaaVfusTxBBqdlWZElQuv5302MPH8zDP/lhtI2j4xsuOxHL
-Wk6K8OzkjihskQeZnF6xaNlajtnab7BbrkFYmS4UCbiIOduJCmKQzbE0AFDZUN1j
-OXVVS7Im4xemrgUPAUArzcGEMhAuGc4fZgiJJ93Vtw/MzpcqXW3woU4s+yuY3Dcn
-wJC08P8O53sa3+tLYDHiJdjRo5cOXwbFhex/GrHIMAnN2s7lFw55P04VmLuo/7pB
-ao6Rbsibw3/fICNNEUjDp113Ypd6MW4ncJ0OJhknmmrRRg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://retrieverstories.umbc.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Retriever Stories</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Maryland Baltimore County</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Maryland Baltimore County</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umbc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>B. Collier Jones</md:GivenName>
-    <md:EmailAddress>collier@umbc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ed Rude</md:GivenName>
-    <md:EmailAddress>erude1@umbc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Billy Schneider</md:GivenName>
-    <md:EmailAddress>will3@umbc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 42b60c75..00000000
--- a/swamid-interfederations-2.0/rhc-fed.reaseheath.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rhc-fed.reaseheath.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Reaseheath College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-07T15:39:22Z">
-      <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 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">reaseheath.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUJtSeU6l5y3tr7fhTbEMMdn2U+BYwDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
-						NDUxMFoXDTM1MTAxNDE1NDUxMFowIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr2h1r5VBnL9+
-						BiLgULv0RqHvItjgw6Dxr7fW3PWPHxR465Igl6bQGMeBncN7BplQw2qCtf/Pdw65
-						TGKPijbrDBXobI9hKhvIUTia6w5D3qFetCSCkRnoA9dq9xFpNOcT/0bCCkshl+dt
-						lEu5dvA5q0mp9AXHo+f/h3NjVAkpQ0c9saA99nxtpZOqOR6CIB6zFLg6cSftEqX4
-						39qbAZKBIRPiJn6PQSUd8n3zPgPy5qTts1ToksRYR6LOgi4z87CfhxMMrNfjkUM9
-						LM0ma7LWhJo32Sbci0nja8HalLRfK0gUH1GlHMh2OZkgQJ9LmLUm6E0gtYdTnDYB
-						pSky2sFa+wIDAQABo3EwbzAdBgNVHQ4EFgQU9C6qwGwlN1SKjJagZYW3GKaalVUw
-						TgYDVR0RBEcwRYIVc2hpYi5yZWFzZWhlYXRoLmFjLnVrhixodHRwczovL3NoaWIu
-						cmVhc2VoZWF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAHJp4ZwMk7E8ECWWtwBL2Fq/Sg34b+WdXhgqLt2YFPxYn1Z3MzN1QVD+3JiSd
-						B6/krjU5jjhqXe69HXzTIMy7wFhEhk78IhFcHxugyj9zC1+TXoMOLo72CvnDrPcb
-						ITBm3ypNt/UV4wKUxAfltDQy/IAbs/CXFLIAhYG7xFZ06dHuGOQ1I0JYFyDf9eqn
-						8nGFHFsCW0cs16s4d6jFvGwTYHQ7/x5aKAgztkD2VgiDZXof/Hg3HiOtVPEFX1NV
-						qRa8xFl+F1m4flEPHbHDWdjbmnwe2kPl4y6PwqWJrSMNgKlOSVhPAbztz/t3H6gp
-						LesywhYMlSPtH22K+a3CiahDMw==
-					</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>
-						MIIDPzCCAiegAwIBAgIUGjPH8LhaoQmEkZaMA9mvvFacc/swDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
-						NDUwN1oXDTM1MTAxNDE1NDUwN1owIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAphZayAXU4TZd
-						GHTg8O533mIIgetrNg622ypHh8Cp4yISkwBeRqXsysm7eLisT98f6TwF/909yvVi
-						vc6nbW93ZI/NZNdgtI/TJf2PCZL7s610Ep3ovqYR39iR4bw5PHmLXGRdLiVuKWzH
-						clNq/5/J5IAVIc/ZxkrLprDKFXwzw/c323JtdBMfNhk5ybluMhMwN5nA5CykDGfz
-						tklFQ79col3TD/pZs1DdU+iyZp9G8eO4fC66DP9awfQeg3nGtGQUB5v2ZI6GcPNd
-						VauZseVGUzCpPMY3cTr9xfsR643SOSnNkTkafiEM+mkt5pYpWAPQAZ4waPpYGYES
-						JdsLXzdBLQIDAQABo3EwbzAdBgNVHQ4EFgQUVDIF0fJ8QtDTH2hViCgfNUfqit4w
-						TgYDVR0RBEcwRYIVc2hpYi5yZWFzZWhlYXRoLmFjLnVrhixodHRwczovL3NoaWIu
-						cmVhc2VoZWF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAkw7D/FwTi7k+qqVbQmLNpzKgDAioMyAFSeiuCw280IBwvxa2PfBcSTGDzR3t
-						TNbKSI1GrSfRDcsoYIVt9UQX2Hy/cNUGMUS7UgNRpQ4CG+p/f9U9GHIFO6nKDsbg
-						tT24pA5Uhn1hFRHTiGgaovx9sK6QwFFOvztOpVbF97zl5AtisKZ/tS/gD1q0IC+1
-						Dq07d0W/Ki6taSUClNk9PebFIOIuwOQHG9Gx+hqTOAqWFDNlMPwaLdvtZEVRpN+6
-						dU+M+4WHeWDHiNxPX3k/jNUTlmHskrxTtXi4RbVYyXw+tAxhHq8S4vN2kNElhr8l
-						gvZT6e+fbGfucnFJvdlyK66CbQ==
-					</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>
-						MIIDQDCCAiigAwIBAgIVALhMQiufWiWfLbo35hETLp+s2plNMA0GCSqGSIb3DQEB
-						CwUAMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0aC5hYy51azAeFw0xNTEwMTQx
-						NTQ1MDlaFw0zNTEwMTQxNTQ1MDlaMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0
-						aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANSlu8ODQ8vQ
-						5gIusx6gX27mN3vNYBwtUoH98MunT8KoKme1O2D52/Q4l9VRrRuxO5rv2X2ezSbo
-						UoacSBGmqR15LpJJE9qIysAe4nIwlOTfuSN/8P4CcrzbZAFf1gu0BHsLkVkBb2cm
-						/wSmfISG6mh/+7VKwkEcxHA+gej1QdJbjmU+TQKjK0A6Px02PHYvuHBdFBFv+00/
-						K24pUCBANpPBK9RWxN3LxYrQervyzRAWy5JHitZuIkO9q4XWW+YuJSADzTY/y1+M
-						Ar6ZBLUcxUg0NqZJLtvhQwoJZnUqIwEY8kbN9A5FmLHFpPl9BFgx32nMGKna8YvI
-						WWp7dftoAgECAwEAAaNxMG8wHQYDVR0OBBYEFLRRrSoN4c99qjThozsyvcCPqR8v
-						ME4GA1UdEQRHMEWCFXNoaWIucmVhc2VoZWF0aC5hYy51a4YsaHR0cHM6Ly9zaGli
-						LnJlYXNlaGVhdGguYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-						ggEBAAxgcPcNG1wMo8hIca5uxoaluAJ4FGPiq90h7MWS1XSMDX3ERc2wXzZWSmhp
-						vKl/6B99HoqPycfkCVqg3c3CGW9y41bdXltxhvLID3JN7cxf3Ne7vQUNMDXlR5D9
-						qVqo0lAySIWY4Yz+FB1CzcUBsxb3dnJ4cwH+xHAx3YkVDDwyIq6gsvIvuu+oN4G7
-						5eR54/RUm65jzVW2hUJLk3MLC4/1syOrvJAfmEJrIfdPg5DrlpN4HsucpWLO88wo
-						dwmJ2RZsUVyC97olmPKAQOLV0YdeoDn8jowXXo+xDGxKQzO1S8M9STBJPr3c5+yV
-						5QUuKHTcpSRcXCPL+qGac9d/T6E=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.reaseheath.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://shib.reaseheath.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/Redirect/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">reaseheath.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUJtSeU6l5y3tr7fhTbEMMdn2U+BYwDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
-						NDUxMFoXDTM1MTAxNDE1NDUxMFowIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr2h1r5VBnL9+
-						BiLgULv0RqHvItjgw6Dxr7fW3PWPHxR465Igl6bQGMeBncN7BplQw2qCtf/Pdw65
-						TGKPijbrDBXobI9hKhvIUTia6w5D3qFetCSCkRnoA9dq9xFpNOcT/0bCCkshl+dt
-						lEu5dvA5q0mp9AXHo+f/h3NjVAkpQ0c9saA99nxtpZOqOR6CIB6zFLg6cSftEqX4
-						39qbAZKBIRPiJn6PQSUd8n3zPgPy5qTts1ToksRYR6LOgi4z87CfhxMMrNfjkUM9
-						LM0ma7LWhJo32Sbci0nja8HalLRfK0gUH1GlHMh2OZkgQJ9LmLUm6E0gtYdTnDYB
-						pSky2sFa+wIDAQABo3EwbzAdBgNVHQ4EFgQU9C6qwGwlN1SKjJagZYW3GKaalVUw
-						TgYDVR0RBEcwRYIVc2hpYi5yZWFzZWhlYXRoLmFjLnVrhixodHRwczovL3NoaWIu
-						cmVhc2VoZWF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAHJp4ZwMk7E8ECWWtwBL2Fq/Sg34b+WdXhgqLt2YFPxYn1Z3MzN1QVD+3JiSd
-						B6/krjU5jjhqXe69HXzTIMy7wFhEhk78IhFcHxugyj9zC1+TXoMOLo72CvnDrPcb
-						ITBm3ypNt/UV4wKUxAfltDQy/IAbs/CXFLIAhYG7xFZ06dHuGOQ1I0JYFyDf9eqn
-						8nGFHFsCW0cs16s4d6jFvGwTYHQ7/x5aKAgztkD2VgiDZXof/Hg3HiOtVPEFX1NV
-						qRa8xFl+F1m4flEPHbHDWdjbmnwe2kPl4y6PwqWJrSMNgKlOSVhPAbztz/t3H6gp
-						LesywhYMlSPtH22K+a3CiahDMw==
-					</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>
-						MIIDPzCCAiegAwIBAgIUGjPH8LhaoQmEkZaMA9mvvFacc/swDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
-						NDUwN1oXDTM1MTAxNDE1NDUwN1owIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAphZayAXU4TZd
-						GHTg8O533mIIgetrNg622ypHh8Cp4yISkwBeRqXsysm7eLisT98f6TwF/909yvVi
-						vc6nbW93ZI/NZNdgtI/TJf2PCZL7s610Ep3ovqYR39iR4bw5PHmLXGRdLiVuKWzH
-						clNq/5/J5IAVIc/ZxkrLprDKFXwzw/c323JtdBMfNhk5ybluMhMwN5nA5CykDGfz
-						tklFQ79col3TD/pZs1DdU+iyZp9G8eO4fC66DP9awfQeg3nGtGQUB5v2ZI6GcPNd
-						VauZseVGUzCpPMY3cTr9xfsR643SOSnNkTkafiEM+mkt5pYpWAPQAZ4waPpYGYES
-						JdsLXzdBLQIDAQABo3EwbzAdBgNVHQ4EFgQUVDIF0fJ8QtDTH2hViCgfNUfqit4w
-						TgYDVR0RBEcwRYIVc2hpYi5yZWFzZWhlYXRoLmFjLnVrhixodHRwczovL3NoaWIu
-						cmVhc2VoZWF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAkw7D/FwTi7k+qqVbQmLNpzKgDAioMyAFSeiuCw280IBwvxa2PfBcSTGDzR3t
-						TNbKSI1GrSfRDcsoYIVt9UQX2Hy/cNUGMUS7UgNRpQ4CG+p/f9U9GHIFO6nKDsbg
-						tT24pA5Uhn1hFRHTiGgaovx9sK6QwFFOvztOpVbF97zl5AtisKZ/tS/gD1q0IC+1
-						Dq07d0W/Ki6taSUClNk9PebFIOIuwOQHG9Gx+hqTOAqWFDNlMPwaLdvtZEVRpN+6
-						dU+M+4WHeWDHiNxPX3k/jNUTlmHskrxTtXi4RbVYyXw+tAxhHq8S4vN2kNElhr8l
-						gvZT6e+fbGfucnFJvdlyK66CbQ==
-					</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>
-						MIIDQDCCAiigAwIBAgIVALhMQiufWiWfLbo35hETLp+s2plNMA0GCSqGSIb3DQEB
-						CwUAMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0aC5hYy51azAeFw0xNTEwMTQx
-						NTQ1MDlaFw0zNTEwMTQxNTQ1MDlaMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0
-						aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANSlu8ODQ8vQ
-						5gIusx6gX27mN3vNYBwtUoH98MunT8KoKme1O2D52/Q4l9VRrRuxO5rv2X2ezSbo
-						UoacSBGmqR15LpJJE9qIysAe4nIwlOTfuSN/8P4CcrzbZAFf1gu0BHsLkVkBb2cm
-						/wSmfISG6mh/+7VKwkEcxHA+gej1QdJbjmU+TQKjK0A6Px02PHYvuHBdFBFv+00/
-						K24pUCBANpPBK9RWxN3LxYrQervyzRAWy5JHitZuIkO9q4XWW+YuJSADzTY/y1+M
-						Ar6ZBLUcxUg0NqZJLtvhQwoJZnUqIwEY8kbN9A5FmLHFpPl9BFgx32nMGKna8YvI
-						WWp7dftoAgECAwEAAaNxMG8wHQYDVR0OBBYEFLRRrSoN4c99qjThozsyvcCPqR8v
-						ME4GA1UdEQRHMEWCFXNoaWIucmVhc2VoZWF0aC5hYy51a4YsaHR0cHM6Ly9zaGli
-						LnJlYXNlaGVhdGguYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-						ggEBAAxgcPcNG1wMo8hIca5uxoaluAJ4FGPiq90h7MWS1XSMDX3ERc2wXzZWSmhp
-						vKl/6B99HoqPycfkCVqg3c3CGW9y41bdXltxhvLID3JN7cxf3Ne7vQUNMDXlR5D9
-						qVqo0lAySIWY4Yz+FB1CzcUBsxb3dnJ4cwH+xHAx3YkVDDwyIq6gsvIvuu+oN4G7
-						5eR54/RUm65jzVW2hUJLk3MLC4/1syOrvJAfmEJrIfdPg5DrlpN4HsucpWLO88wo
-						dwmJ2RZsUVyC97olmPKAQOLV0YdeoDn8jowXXo+xDGxKQzO1S8M9STBJPr3c5+yV
-						5QUuKHTcpSRcXCPL+qGac9d/T6E=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Reaseheath College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Reaseheath College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.reaseheath.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:itservices@reaseheath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Oliver</GivenName>
-    <SurName>Dickins</SurName>
-    <EmailAddress>mailto:Oliverd@reaseheath.ac.uk</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 112a01eb..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ricevi.ct.infn.it/shibboleth">
-  <md: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>
-  </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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">RICeVI portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 cd9489c2..00000000
--- a/swamid-interfederations-2.0/ricevi.ct.infn.it.xml
+++ /dev/null
@@ -1,125 +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://ricevi.ct.infn.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-22T11:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-      <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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ricevi.ct.infn.it/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://ricevi.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
-        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
-        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
-        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
-        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
-        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
-        <ds:KeyName>www.chain-project.eu</ds:KeyName>
-        <ds:KeyName>www.special-project.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=liferay.ct.infn.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,streetAddress=Via Enrico Fermi\, 40,L=Frascati,ST=Roma,postalCode=00044,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF9jCCBN6gAwIBAgIQM7hIv/Qcute2VqiFejFbijANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTExMDYwMjAwMDAwMFoXDTE0MDYwMTIzNTk1OVowgbwxCzAJBgNV
-                            BAYTAklUMQ4wDAYDVQQREwUwMDA0NDENMAsGA1UECBMEUm9tYTERMA8GA1UEBxMI
-                            RnJhc2NhdGkxHTAbBgNVBAkTFFZpYSBFbnJpY28gRmVybWksIDQwMS4wLAYDVQQK
-                            EyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQL
-                            EwZDT01FVEExGzAZBgNVBAMTEmxpZmVyYXkuY3QuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAK9ef17gCGENgb8G6eRsVFmOji1d6ThQclUd
-                            dNUzwlqKChuGyKjQ/Rcgc2A/epqqErxYCR2OCqW98WdmxJTys24S1admUVug6vEU
-                            VyDHnh9G9i1qFSIpGJgmgvM9jP9F4xoFqcNPIJO1HHsujetPqjePy26Vke4qoEpK
-                            caoLUEPqE/3XE7QgQlmMSF2qHZXJuanAXIoW7vc+Numu7xHqm/mY2MkkpCTCJut8
-                            0ScfoEk8UHr9Nr09BKISxBsiLmUxwOIbmNlrX+K/QCODWlPhyhNbTFh0mxD5zTGt
-                            mfqfNS4a/oENemKyxKxEkvXMYUlhi9UPe5Ehqi7b7rAlgP9+E6sCAwEAAaOCAncw
-                            ggJzMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSe
-                            IIUSZfQk7NpXT9prnUnLEKAkATAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSC
-                            ASQwggEgghJsaWZlcmF5LmN0LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNp
-                            ZGUuZXWCGWFwcGxpY2F0aW9ucy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4u
-                            aXSCFGdpc2VsYS1ndy5jdC5pbmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhl
-                            ci5jdC5pbmZuLml0ghBnd2xpYi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25z
-                            b3J6aW8tY29tZXRhLml0ghFyaWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0
-                            LmluZm4uaXSCFHd3dy5jaGFpbi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9q
-                            ZWN0Lml0MA0GCSqGSIb3DQEBBQUAA4IBAQAqLeCKqd42LugNoZ8j1MOkvHDXv4rN
-                            9AgYs+Hsv1tG5jqJHl/VLqrqArjEfStqac0HM56++rPmF+27+UoBmmY6rPNs8PMu
-                            ezzQFSSjY/1icgeum5c8vqjC2t2hJp27IA5QXtpXPiO9fDCrmF3ZlOlDX5hBVtay
-                            eVEohSTUCgrlIvhCa4rrzyj/gxaqnDdpV1hgpEWUUM+UdYjlHU7Vf0/wXujDiOjM
-                            OFw1peyKJ/0UpK4310AcrjOrD0NoAykVFNZbN91OQB3hDBqcqAua7w70W6xtxXpg
-                            JJFMTLabxlk9Mb0b0YqspcuKDzQSu0QaZQz+HVwyaFt3xMcuEF8gqgvD
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">RICeVI portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RICeVI portal provided by INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">RICeVI portal erogato da INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 dc310024..00000000
--- a/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.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" entityID="https://rigal.enpc.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB7ElEQVQoz42Rz2/SYBjHX/rSvmW0sK6WhLLLPIhwdX+C2YWYGdDIMJpF/Z+W6XHxJgtTTCZb0xX5ddOMpWNhbiCQFHugykvXtQIeZjAq030vT57n+X6e7+EB40tUq9WmzgkwTUo+n9l6Xa+f/L2aAti2fXhY43m+WHx/JeBdLufz+Z49fWJZ5/l84T+A1taOjuosy8qywnFctboPgP0vICdLPpYV5vhIJMzz3HA4yr7duRSoVqvn1tnq6mNsDnRdh5CMx++22x1dNyYe13g8njRra+sQQp6f6/f7hvFVEK55PDOtdksQhNRK8s+EQqHQM3qI9tA0EoRAOHzDP+tHCHloz+dmS1XVC5v7ohiGcXCgLt5a7HTasVhsckXX9Wy2G4ncLJUr0Wj0V8LurkTTaGnpNgFhJrM1Aba3cxzHLS/fGY9GiqL8BJrN5snpKULoVXqTdLuPjz9pmgYAUFW12/3iOE46vQkh/PBxH9g2AQDIF4pBURTF4L1EPBAQQvPi3p4CACiXK6IYDIXmE4n4wsJ1lmHe5HaIUqmCv/UfPUwBACRJpih6JZnEeLCx8ZKiUCqVNM2BJMkkCRMP7jcaDdf68xcYY5Zhvg+Hpml6Z7wQuswzC2M86/eTFOU4jmVZjJdxES7D6P32h6voB98GBPZakOIQAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjIwKzAyOjAwq4YxQQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDoyMCswMjowMNrbif0AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.enpc.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://rigal.enpc.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rigal.enpc.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rigal.enpc.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enpc.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rigal.enpc.fr:8443/idp/profile/SAML1/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">École des Ponts ParisTech</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">École des Ponts ParisTech</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.enpc.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi-exploitation@enpc.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 dbdc8ead..00000000
--- a/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rir.dariah.eu/shibboleth">
-  <md: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:AttributeValue>http://refeds.org/category/research-and-scholarship</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>
-      <idpdisc:DiscoveryResponse 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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rir.dariah.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rir.dariah.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">RiR Suchportal</md:ServiceName>
-      <md:ServiceName xml:lang="en">RiR Search Portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Relationen im Raum Suchportal</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Relationen im Raum Search Portal</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tamim</md:GivenName>
-    <md:SurName>Ziai</md:SurName>
-    <md:EmailAddress>mailto:tamim.ziai@daasi.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Dariah</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d44a4ea7..00000000
--- a/swamid-interfederations-2.0/rja-idp.lanet.lv.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rja-idp.lanet.lv">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Riga Graduate School of Law</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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - RJA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Riga Graduate School of Law - RJA IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lv">http://www.rgsl.edu.lv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rnd.feide.no.xml b/swamid-interfederations-2.0/rnd.feide.no.xml
deleted file mode 100644
index 62f5a657..00000000
--- a/swamid-interfederations-2.0/rnd.feide.no.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rnd.feide.no/simplesaml/module.php/saml/sp/metadata.php/saml">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rnd.feide.no/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rnd.feide.no/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Feide RnD Blog</md:ServiceName>
-      <md:ServiceName xml:lang="no">Feide RnD Blogg</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">The blog of Feide RnD</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">Bloggen til Feide RnD</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/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 053d54c3..00000000
--- a/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +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://rnp-cafe.ifs.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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">https://www.ifs.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">https://www.ifs.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDmjCCAoICAQAwDQYJKoZIhvcNAQEFBQAwgZIxDDAKBgNVBAoTA0lGUzEMMAoG
-A1UECxMDRFRJMR8wHQYJKoZIhvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMQwwCgYD
-VQQHEwNBSlUxJTAjBgNVBAgTHElOU1RJVFVUTyBGRURFUkFMIERFIFNFUkdJUEUx
-CzAJBgNVBAYTAkJSMREwDwYDVQQDEwhybnAtY2FmZTAeFw0xNDExMTgxNzQ2MDNa
-Fw0xOTExMTcxNzQ2MDNaMIGSMQwwCgYDVQQKEwNJRlMxDDAKBgNVBAsTA0RUSTEf
-MB0GCSqGSIb3DQEJARYQY29pbXJAaWZzLmVkdS5icjEMMAoGA1UEBxMDQUpVMSUw
-IwYDVQQIExxJTlNUSVRVVE8gRkVERVJBTCBERSBTRVJHSVBFMQswCQYDVQQGEwJC
-UjERMA8GA1UEAxMIcm5wLWNhZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDCM5DpvNNnNY/sEgNPlwTqln/1ErY5NIUFJpd8Z8nhF/Ycg2PHgyaRS5QG
-zg/ytuSPgQwNsqQrBDPVYTM2mPN4bqy3JCMsQ/wurwGY33HQihsq7gsys6sIS3E9
-OeGP2PVEFAAOGBK8/7re/MNkk3zWxVrGHz+jWHUj/XVuz5bEOq/LNmUYgdCKA4EF
-8Fmi22aL522xCT3Fox8ReTq817YxTq+5XLsQEAnOzwIIvOAmRjNZD33lcASWzSJp
-2YMsVKeFpHslgJJUT6a5lbgwH1VOX8VQRYSDGayNfBh63AphlRPbRJRcLG6bQmbx
-D/hfNk2K0FKD9IWxVIJ4O+jxTatlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAAXZ
-ggk3PPdDktXF9fuhLnPpctJpFydTZaJOtZyiTr/YRjRa563VN7ryU7cIN6L/0v9J
-VqW3/LVA5m3vxJn0JFoez65HTVlIgaELJbIw5deHZbYe07e0cQKfEcfuJwzh33YO
-3PyBLMg/gdxoK6cYW0oPM3fZ9p7ypRHyrH/FwJOiFKOKEVdDPI5TlmWJnw85aAEP
-0j+yWPYFmv5t3igK9Iu0WM927mw6gZ0Wk1g53us1aWqoMTjkJZpfI7yBXCsuYYbp
-R2dlYBbt6VnHnQZs+va8RjGt6Q0lRgBsQ5cfwrwDVIdzdB0gOleF/xa0BeKS0GlT
-MC5VxNHzIJWcOb6+ZOc=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rnp-cafe.ifs.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rnp-cafe.ifs.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rnp-cafe.ifs.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDmjCCAoICAQAwDQYJKoZIhvcNAQEFBQAwgZIxDDAKBgNVBAoTA0lGUzEMMAoG
-A1UECxMDRFRJMR8wHQYJKoZIhvcNAQkBFhBjb2ltckBpZnMuZWR1LmJyMQwwCgYD
-VQQHEwNBSlUxJTAjBgNVBAgTHElOU1RJVFVUTyBGRURFUkFMIERFIFNFUkdJUEUx
-CzAJBgNVBAYTAkJSMREwDwYDVQQDEwhybnAtY2FmZTAeFw0xNDExMTgxNzQ2MDNa
-Fw0xOTExMTcxNzQ2MDNaMIGSMQwwCgYDVQQKEwNJRlMxDDAKBgNVBAsTA0RUSTEf
-MB0GCSqGSIb3DQEJARYQY29pbXJAaWZzLmVkdS5icjEMMAoGA1UEBxMDQUpVMSUw
-IwYDVQQIExxJTlNUSVRVVE8gRkVERVJBTCBERSBTRVJHSVBFMQswCQYDVQQGEwJC
-UjERMA8GA1UEAxMIcm5wLWNhZmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDCM5DpvNNnNY/sEgNPlwTqln/1ErY5NIUFJpd8Z8nhF/Ycg2PHgyaRS5QG
-zg/ytuSPgQwNsqQrBDPVYTM2mPN4bqy3JCMsQ/wurwGY33HQihsq7gsys6sIS3E9
-OeGP2PVEFAAOGBK8/7re/MNkk3zWxVrGHz+jWHUj/XVuz5bEOq/LNmUYgdCKA4EF
-8Fmi22aL522xCT3Fox8ReTq817YxTq+5XLsQEAnOzwIIvOAmRjNZD33lcASWzSJp
-2YMsVKeFpHslgJJUT6a5lbgwH1VOX8VQRYSDGayNfBh63AphlRPbRJRcLG6bQmbx
-D/hfNk2K0FKD9IWxVIJ4O+jxTatlAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAAXZ
-ggk3PPdDktXF9fuhLnPpctJpFydTZaJOtZyiTr/YRjRa563VN7ryU7cIN6L/0v9J
-VqW3/LVA5m3vxJn0JFoez65HTVlIgaELJbIw5deHZbYe07e0cQKfEcfuJwzh33YO
-3PyBLMg/gdxoK6cYW0oPM3fZ9p7ypRHyrH/FwJOiFKOKEVdDPI5TlmWJnw85aAEP
-0j+yWPYFmv5t3igK9Iu0WM927mw6gZ0Wk1g53us1aWqoMTjkJZpfI7yBXCsuYYbp
-R2dlYBbt6VnHnQZs+va8RjGt6Q0lRgBsQ5cfwrwDVIdzdB0gOleF/xa0BeKS0GlT
-MC5VxNHzIJWcOb6+ZOc=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rnp-cafe.ifs.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md: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"/>
-    <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">IFS - Instituto Federal Sergipe</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFS - Instituto Federal Sergipe</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFS - Instituto Federal Sergipe</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFS - Instituto Federal Sergipe</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.ifs.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">https://www.ifs.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Joao Silvio</md:SurName>
-    <md:EmailAddress>coimr@ifs.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8a86f7c0..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">www.ifs.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">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">www.ifs.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">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/rns.aai.niif.hu-shibboleth.xml b/swamid-interfederations-2.0/rns.aai.niif.hu-shibboleth.xml
deleted file mode 100644
index addfa75a..00000000
--- a/swamid-interfederations-2.0/rns.aai.niif.hu-shibboleth.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" entityID="https://rns.aai.niif.hu/shibboleth">
-  <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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="hu">SP for eduGAIN attribute release checker - r&amp;s</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SP for eduGAIN attribute release checker - r&amp;s</mdui:DisplayName>
-        <mdui:Description xml:lang="hu">SP for eduGAIN attribute release checker - r&amp;s</mdui:Description>
-        <mdui:Description xml:lang="en">SP for eduGAIN attribute release checker - r&amp;s</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">https://earc.eduid.hu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://earc.eduid.hu/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICvzCCAiigAwIBAgIJAKmmMNNLfw5PMA0GCSqGSIb3DQEBBQUAMEoxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGDAWBgNVBAMTD3Jucy5hYWkubmlpZi5odTAeFw0xNTExMDMxOTA4MjBaFw0yNTEwMzExOTA4MjBaMEoxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGDAWBgNVBAMTD3Jucy5hYWkubmlpZi5odTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxTKyp+PbB4vBlzgPVQsBETA/x+dyTLXqt9F34ujVMj8pHwwyLYBSguTi+sKHBZ4gkeW93BIWAJhX+e1er6oHcjlnwgqEGWOmX+oWKjfqJb7sqlnKTKrBUMTwGsdciXk1QIAXsvEYOJ1Ais8YavgrVqZYkn2tOfAFbNXdmOJTgFkCAwEAAaOBrDCBqTAdBgNVHQ4EFgQUalaXcVa41eu3N4yq1cu/p1yQCM0wegYDVR0jBHMwcYAUalaXcVa41eu3N4yq1cu/p1yQCM2hTqRMMEoxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEOMAwGA1UEChMFTklJRkkxGDAWBgNVBAMTD3Jucy5hYWkubmlpZi5odYIJAKmmMNNLfw5PMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMHBYCNkUPAf1R14pd2fiOHyTs84ejnGAKghumXqVffUO3AxERutI8AZtaH6ZSt5cfcsGqb+KsHbAb38JrRlrxGr0wxbuTr7gpwessPvECxWGUj6kkKOnQg35Xyd5EQzhsKrjUL2EC7OM5bMwok9TeUkDta4frQW8/RGZIYJq5aQ=</ds:X509Certificate>
-        </ds:X509Data>
-        <ds:KeyName>rns.aai.niif.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rns.aai.niif.hu/Shibboleth.sso/SLO/POST"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://rns.aai.niif.hu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="hu">SP for eduGAIN attribute release checker - r&amp;s</md:ServiceName>
-      <md:ServiceName xml:lang="en">SP for eduGAIN attribute release checker - r&amp;s</md:ServiceName>
-      <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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>NIIFI AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 435685f8..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ross.impa.br/idp/shibboleth">
-  <md: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>
-  </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">impa.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica 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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ross.impa.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://ross.impa.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ross.impa.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ross.impa.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ross.impa.br/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">impa.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ross.impa.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ross.impa.br:8443/idp/profile/SAML1/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">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IMPA - Associacao Instituto Nacional de Matematica Pura e Aplicada</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.impa.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.impa.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Ricardo Gomes</md:SurName>
-    <md:EmailAddress>netadm@impa.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 a25190fc..00000000
--- a/swamid-interfederations-2.0/ross.impa.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://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>
-    MIIC2DCCAcACAQAwDQYJKoZIhvcNAQEFBQAwMjEMMAoGA1UECxMDQ0lOMQswCQYD
-VQQGEwJCUjEVMBMGA1UEAxMMcm9zcy5pbXBhLmJyMB4XDTE0MDIxNDE4MTIxM1oX
-DTE3MDIxMzE4MTIxM1owMjEMMAoGA1UECxMDQ0lOMQswCQYDVQQGEwJCUjEVMBMG
-A1UEAxMMcm9zcy5pbXBhLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArp0q2Ul3/nuj8q0Ut/eYQn++cD+6PuSoxtIn9d/ZHGiGo0roJOk8/piqMy3P
-OrdUhWPEJhkOsi6xd0scmnYdo4dIdQWpnuB9fmTqziBRoI8YBWlsN+ha1/I0TiVA
-HmXoEQGK9EY9vZ06Gj8mtD9AqyG/VNLc9q9kyqIoBxYtQ7GLBk3vXrW7/o5ARIiA
-Ktr+4AQ9vhNt01XiMURyMU9erD42q4ZJxLg47H1Wl49dQUUJD2dxrOBDYhVKRZRn
-mbQe2pkwQlSuZOGU1kA0yi317kvIwEV2bpOGDh1SJ3Ywf8nfqlVqSHNo5zm8tqJT
-W4qBjuRUMmMPhSkoTi0MLAuf5QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBC/2lQ
-zw6Ix/36q5BVrUxZbv45s+Ad23I4EUW+CdFdI3MHlTfil2sQhlJC/1az7y8YfCGf
-NwzdCUsxn0K47yWfcKgIFIuiO+dQaJlVioEkhNA1xiiIAlJf9DC1bYVDGaEKUwxY
-vAqjpxi2z0n2SfWuylSLG2ShnfnosO7gb4SPUDzysDC02Amh2LjqloeHt3mEaMSh
-JyTKcJJLGy/MRzau574Vyz3CQUFQdktgg6j0tMKAYPhutgKQczGiJWENOBTMiuUX
-ogB5iHqjs440rS8prMry3tZnalfebE9l6yn+Dr10gN+o5aTpNVyIx03zWtCJdnjk
-BQbIol8hjh2qNA/n
-            </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>
-      
-MIIC2DCCAcACAQAwDQYJKoZIhvcNAQEFBQAwMjEMMAoGA1UECxMDQ0lOMQswCQYD
-VQQGEwJCUjEVMBMGA1UEAxMMcm9zcy5pbXBhLmJyMB4XDTE0MDIxNDE4MTIxM1oX
-DTE3MDIxMzE4MTIxM1owMjEMMAoGA1UECxMDQ0lOMQswCQYDVQQGEwJCUjEVMBMG
-A1UEAxMMcm9zcy5pbXBhLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArp0q2Ul3/nuj8q0Ut/eYQn++cD+6PuSoxtIn9d/ZHGiGo0roJOk8/piqMy3P
-OrdUhWPEJhkOsi6xd0scmnYdo4dIdQWpnuB9fmTqziBRoI8YBWlsN+ha1/I0TiVA
-HmXoEQGK9EY9vZ06Gj8mtD9AqyG/VNLc9q9kyqIoBxYtQ7GLBk3vXrW7/o5ARIiA
-Ktr+4AQ9vhNt01XiMURyMU9erD42q4ZJxLg47H1Wl49dQUUJD2dxrOBDYhVKRZRn
-mbQe2pkwQlSuZOGU1kA0yi317kvIwEV2bpOGDh1SJ3Ywf8nfqlVqSHNo5zm8tqJT
-W4qBjuRUMmMPhSkoTi0MLAuf5QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBC/2lQ
-zw6Ix/36q5BVrUxZbv45s+Ad23I4EUW+CdFdI3MHlTfil2sQhlJC/1az7y8YfCGf
-NwzdCUsxn0K47yWfcKgIFIuiO+dQaJlVioEkhNA1xiiIAlJf9DC1bYVDGaEKUwxY
-vAqjpxi2z0n2SfWuylSLG2ShnfnosO7gb4SPUDzysDC02Amh2LjqloeHt3mEaMSh
-JyTKcJJLGy/MRzau574Vyz3CQUFQdktgg6j0tMKAYPhutgKQczGiJWENOBTMiuUX
-ogB5iHqjs440rS8prMry3tZnalfebE9l6yn+Dr10gN+o5aTpNVyIx03zWtCJdnjk
-BQbIol8hjh2qNA/n
-                    
-            </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/royalsocietypublishing.org-shibboleth.xml b/swamid-interfederations-2.0/royalsocietypublishing.org-shibboleth.xml
deleted file mode 100644
index 1f1b1aec..00000000
--- a/swamid-interfederations-2.0/royalsocietypublishing.org-shibboleth.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://royalsocietypublishing.org/shibboleth">
-  <!--
-		This is a "Royal Society Publishing Organization" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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-16T18:24: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: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://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Society Publishing Organization</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://royalsocietypublishing.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/royalsocietypublishing.org.xml b/swamid-interfederations-2.0/royalsocietypublishing.org.xml
deleted file mode 100644
index 58f4aca9..00000000
--- a/swamid-interfederations-2.0/royalsocietypublishing.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://royalsocietypublishing.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/roysocjnls/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Royal Society Publishing</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Royal Society Publishing</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://royalsocietypublishing.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml b/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
index dc3a0b94..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rr.funet.fi/attribute-test">
-  <md: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>
-  </md:Extensions>
+<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 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">
+      <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,9 +13,13 @@
         <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>
+      <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>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -68,74 +62,74 @@ aUiD/5UIQRBIZKprBZPaQHh3M9a6FfXTAKWnwrePtRcite62ajmeGa3G0Ldh0TLO
       <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 FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="businessCode" Name="urn:oid:1.2.246.10" 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="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"/>
-      <md:RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" 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="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"/>
-      <md: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"/>
-      <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="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"/>
-      <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="true"/>
-      <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="true"/>
-      <md: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"/>
-      <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="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="electronicIdentificationNumber" Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="true"/>
-      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <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="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" 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="true"/>
-      <md:RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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"/>
-      <md:RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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"/>
-      <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="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="nationalIdentificationNumber" Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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"/>
-      <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="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="true"/>
-      <md: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"/>
-      <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md:RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" 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="true"/>
-      <md:RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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"/>
-      <md: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"/>
+      <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>
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 52f6f985..00000000
--- a/swamid-interfederations-2.0/rr.funet.fi.xml
+++ /dev/null
@@ -1,157 +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="en">Haka Attribute Test Service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</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="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEzDCCA7SgAwIBAgIRANkuMGk/HlexnQRYLfLoQaEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjAyMjgwMDAwMDBaFw0xNDAyMjcyMzU5NTlaMIGqMQswCQYD
-VQQGEwJGSTEOMAwGA1UEERMFMDIxMDExEDAOBgNVBAgTB1V1c2ltYWExDjAMBgNV
-BAcTBUVzcG9vMRYwFAYDVQQJEw1LZWlsYXJhbnRhIDE0MSkwJwYDVQQKEyBDU0Mg
-LSBJVCBDZW50ZXIgZm9yIFNjaWVuY2UgTHRkLjEQMA4GA1UECxMHVW5rbm93bjEU
-MBIGA1UEAxMLcnIuZnVuZXQuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDM5bZnIo6ilf+77pDys40qwpu1U6ym22WZvnxCmAoZ+dDOuBcVdoVagVTp
-MqJ0jc/c/7+grSHG+II+2MftSD78sa0fTWWLCqxdH8GKSfai5FeGbP/YoI14W7OL
-/Bxy7mAKluwkxtx+X5226Q7UeKHaBaF2i+An5i269HYzTO3XIt/eNHMKynsRQgje
-6pNj8PyDnIWm3DENXJi2yVK8AmVvWpEyx0RptMIazFCJa+MvypCYS4Y4D4wKEs5m
-3LWcsqM95zDsyiytv/fAYeRAVpWdTvhOPLW+3Q13/ek6/9Te03YAkzuAaLYvFxwu
-Vd2BLs7FAiyR3HDk0Ykl5TyimkaBAgMBAAGjggFeMIIBWjAfBgNVHSMEGDAWgBQM
-vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUOaXmVjDtx1G/7svHBNhFLrT5
-5rowDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
-BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
-QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
-cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
-L29jc3AudGNzLnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILcnIuZnVuZXQuZmkwDQYJ
-KoZIhvcNAQEFBQADggEBADH55FfR7I+1zt41DTwz2Ig9w6S6l0pFL889eFl772qV
-/vepbU245oc+FuHxwp1Be1EeEo5Pb1Op+imx/tnXdJZyQ8T19cttw6k0faIIOPk0
-4LDPpPHeNd5UIiegJxuXLwGrs3s8OHrICSzD6UUTGuKQ2ch7Isl65oumZ5BYtmXc
-BipmtjTfM/pv+j2iTDMRfjzTjKSlDdDOaRbCQeLDtIgJkXvwSb/OTPOWHzbLLiPE
-rpMTlKYf36DnHsyERNItnzU02J686VAecWTuNgUwHHI3LzZCWVncQm+I6veK43Ct
-PahX4Y7zrHlQEDDBvQM0uwFM4Dgy07Qk3EwVXCs+46U=</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/rs.eqa.ggtest.com-AthensWeb-oa-metadata.xml b/swamid-interfederations-2.0/rs.eqa.ggtest.com-AthensWeb-oa-metadata.xml
deleted file mode 100644
index 5cf9b48c..00000000
--- a/swamid-interfederations-2.0/rs.eqa.ggtest.com-AthensWeb-oa-metadata.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://rs.eqa.ggtest.com/AthensWeb/oa/metadata">
-  <!--
-		This is a test SP for Cengage Learning Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-05T10:22:35Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7TCCAdWgAwIBAgIEIjkEdjANBgkqhkiG9w0BAQsFADAnMRIwEAYDVQQKEwlh
-						dGhlbnMgc3AxETAPBgNVBAMTCGdhbGUuY29tMB4XDTEyMTIwNDIxMTYzN1oXDTIy
-						MTIwMjIxMTYzN1owJzESMBAGA1UEChMJYXRoZW5zIHNwMREwDwYDVQQDEwhnYWxl
-						LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJxQUhGXjG7xd51b
-						/rsCdpNcLqfT3pYo8YyuV3uzd5i/6eiI7adgcnJW/CgR+KhHBo2Ys0ViAxwzm2Mn
-						S4hYhp1SUQySVxEPv9E0QVAN2WDmUSRHxv9mDIYxlyxpWZnM6f7cufH9KFNXEwJB
-						HDB32LAt5QkxNUwPL+jy3aYEchp3Lxpd/C+yIeJYrTTO7Pr4rlIeNv9e9yH+WzQX
-						/e6gZvMJ0SXfleHdjaew8qMlqhQK/IIYDuCQ+q1aPDuDEPJI0xVjPd6vjF5NgVYC
-						BUwfWKWPBxRwOBJdG4XIlbcAKJLkUJeSMEQrQzg5LjtCg7+h3sQvHfDpyDhuNtDQ
-						/yp60sUCAwEAAaMhMB8wHQYDVR0OBBYEFCd8RyK1/NXJdOhfAWO07Jc3qrJCMA0G
-						CSqGSIb3DQEBCwUAA4IBAQAx32SYGWD9NXQlh8tcsYE6B0Yz75TdmD9TI5991fNY
-						EyI9e+lvuPp3K4L6FC8jGDDtwHCsdoC8BXl/eJzQ1nnQsZP/2GUroDDkHlwj2MF1
-						4J0n2nRSJtiHvWBiSX5filskbjLw2NibLK3p0UcA9uYA1HAR9gd0dHozBtisGXA4
-						aqB4rOHpFZjxV0CskNZhZPPnSgJtT5ryRxch2E9kIUGQ2qnHJkoOsqSNiolddahU
-						5EpMA2d9mL90JHaAMXTg15invrvy366hOqcsEYNJIc49+/PS3pLFPhI62KOTwqUj
-						FvuaT4B90sXSnthrg0rErgLVBaaj2eO/v69LA/E8Ru+X
-					</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>
-						MIIC7TCCAdWgAwIBAgIEIjkEdjANBgkqhkiG9w0BAQsFADAnMRIwEAYDVQQKEwlh
-						dGhlbnMgc3AxETAPBgNVBAMTCGdhbGUuY29tMB4XDTEyMTIwNDIxMTYzN1oXDTIy
-						MTIwMjIxMTYzN1owJzESMBAGA1UEChMJYXRoZW5zIHNwMREwDwYDVQQDEwhnYWxl
-						LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJxQUhGXjG7xd51b
-						/rsCdpNcLqfT3pYo8YyuV3uzd5i/6eiI7adgcnJW/CgR+KhHBo2Ys0ViAxwzm2Mn
-						S4hYhp1SUQySVxEPv9E0QVAN2WDmUSRHxv9mDIYxlyxpWZnM6f7cufH9KFNXEwJB
-						HDB32LAt5QkxNUwPL+jy3aYEchp3Lxpd/C+yIeJYrTTO7Pr4rlIeNv9e9yH+WzQX
-						/e6gZvMJ0SXfleHdjaew8qMlqhQK/IIYDuCQ+q1aPDuDEPJI0xVjPd6vjF5NgVYC
-						BUwfWKWPBxRwOBJdG4XIlbcAKJLkUJeSMEQrQzg5LjtCg7+h3sQvHfDpyDhuNtDQ
-						/yp60sUCAwEAAaMhMB8wHQYDVR0OBBYEFCd8RyK1/NXJdOhfAWO07Jc3qrJCMA0G
-						CSqGSIb3DQEBCwUAA4IBAQAx32SYGWD9NXQlh8tcsYE6B0Yz75TdmD9TI5991fNY
-						EyI9e+lvuPp3K4L6FC8jGDDtwHCsdoC8BXl/eJzQ1nnQsZP/2GUroDDkHlwj2MF1
-						4J0n2nRSJtiHvWBiSX5filskbjLw2NibLK3p0UcA9uYA1HAR9gd0dHozBtisGXA4
-						aqB4rOHpFZjxV0CskNZhZPPnSgJtT5ryRxch2E9kIUGQ2qnHJkoOsqSNiolddahU
-						5EpMA2d9mL90JHaAMXTg15invrvy366hOqcsEYNJIc49+/PS3pLFPhI62KOTwqUj
-						FvuaT4B90sXSnthrg0rErgLVBaaj2eO/v69LA/E8Ru+X
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rs.eqa.ggtest.com/AthensWeb/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rs.eqa.ggtest.com/AthensWeb/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rs.eqa.ggtest.com/AthensWeb/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rs.eqa.ggtest.com/AthensWeb/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cengage Learning Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Gale Cengage Learning</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cengage.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Joe</GivenName>
-    <SurName>Mathews</SurName>
-    <EmailAddress>mailto:Joe.Mathews@cengage.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Selva</GivenName>
-    <SurName>Rengarajan</SurName>
-    <EmailAddress>mailto:Selva.Kumar@cengage.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rt.niif.hu.xml b/swamid-interfederations-2.0/rt.niif.hu.xml
deleted file mode 100644
index d8e44a66..00000000
--- a/swamid-interfederations-2.0/rt.niif.hu.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rt.niif.hu/shibboleth">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">niifi</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:InformationURL xml:lang="en">https://rt.niif.hu/rt</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>rt.niif.hu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEJzCCAw+gAwIBAgIJAP2iWF409QGrMA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNVBAYTAkhVMREwDwYDVQQIEwhCdWRhcGVzdDEXMBUGA1UEChMOTklJRiBJbnN0aXR1dGUxEzARBgNVBAMTCnJ0Lm5paWYuaHUxGjAYBgkqhkiG9w0BCQEWC2FhaUBuaWlmLmh1MB4XDTEwMDYyNTExNTExNVoXDTIwMDYyMjExNTExNVowajELMAkGA1UEBhMCSFUxETAPBgNVBAgTCEJ1ZGFwZXN0MRcwFQYDVQQKEw5OSUlGIEluc3RpdHV0ZTETMBEGA1UEAxMKcnQubmlpZi5odTEaMBgGCSqGSIb3DQEJARYLYWFpQG5paWYuaHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDKdKDluI/sl4J57IcX+ZJPkIFfoAQnxS6fR7aQp8Lg5S/fg1ymgD+NZIT+2GHhDz65rEgMfre0yVVvsi3v7FAh973pCxS6iN0MWsWMNUyTD7nKCHkJr/LtDlcvGhdnUN/wo0iX0sIrPEWs31awmSELdi59bbsRKrir85sDXMjInfluJ6O7Gy+xzXv3YB04CYaUcIH5rg+iVBpNsEx9YHD1QyGsenbHaFooAf3UADrg5q+1R0lvGVCnKfnQ+JryxJIy+a+51pa3NDONYzksB89EeAMhLcuHHrI5FovQlCdIZbZepHjP8YeoNAXw4K3WFaZO+RiMmyy1KF96UxC6jpDAgMBAAGjgc8wgcwwHQYDVR0OBBYEFIwTzhmyE9GLngS1l4TiVhV1MFjMMIGcBgNVHSMEgZQwgZGAFIwTzhmyE9GLngS1l4TiVhV1MFjMoW6kbDBqMQswCQYDVQQGEwJIVTERMA8GA1UECBMIQnVkYXBlc3QxFzAVBgNVBAoTDk5JSUYgSW5zdGl0dXRlMRMwEQYDVQQDEwpydC5uaWlmLmh1MRowGAYJKoZIhvcNAQkBFgthYWlAbmlpZi5odYIJAP2iWF409QGrMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAG/xND0pKdWrymjqVof1b/05BiSeJEXyPf7E5zank5GY6PouCIvTKPAPXsAD3VISompmp/x5YlZaannaey+WvFEErh0buVbHGVV1g3gLtRpn++J4jR+Vklh0U4wp27AHEwFAG9lkgvKLtzN+b6tt85LW1lwkmkXEjJYOVO5t+etYdvsblMKUEX6CruwDPxgsP1aXqTZdi/Ps0ZglELw0Oqv7KrhTJ7hp4tQFh5cjLunRZRyQQesFG7pDCeQ9XN1w4Jl1tr+zjM9vG0yjD7fPtSHNSH3R46Gk0bHUcQ551JXoIiQV22cgxeCXsOGr4c5elFitmic1+7F6+MiHt7A/YkQ=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rt.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rt.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt.niif.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rt.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="hu">Request Tracker (GN3-SA2-T4)</ServiceName>
-      <ServiceName xml:lang="en">Request Tracker (GN3-SA4-T4)</ServiceName>
-      <ServiceDescription xml:lang="hu">Request Tracker alkalmazás a Geant3 SA2-T4 taszkhoz </ServiceDescription>
-      <ServiceDescription xml:lang="en">Request tracker instance for Geant3 SA2-T4 task</ServiceDescription>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationName>
-    <OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.niif.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.niif.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 0e70342b..00000000
--- a/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,112 +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://rtrvirshib.ifmt.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIEluc3RpdHV0
-byBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvMQ0wCwYDVQQLEwRER1RJMR8wHQYJKoZI
-hvcNAQkBFhBkZ3RpQGlmbXQuZWR1LmJyMQ8wDQYDVQQHEwZDdWlhYmExFDASBgNV
-BAgTC01hdG8gR3Jvc3NvMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcnRydmlyc2hp
-Yi5pZm10LmVkdS5icjAeFw0xNDA5MjMxNzU4MzVaFw0xNzA5MjIxNzU4MzVaMIGw
-MSkwJwYDVQQKEyBJbnN0aXR1dG8gRmVkZXJhbCBkZSBNYXRvIEdyb3NzbzENMAsG
-A1UECxMEREdUSTEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm10LmVkdS5icjEPMA0G
-A1UEBxMGQ3VpYWJhMRQwEgYDVQQIEwtNYXRvIEdyb3NzbzELMAkGA1UEBhMCQlIx
-HzAdBgNVBAMTFnJ0cnZpcnNoaWIuaWZtdC5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCydC4cBkxGYZFCNynLc//e8GiIClU8rwevPbd9onai
-aFM70fL+7y+rCLKcCYh1B8S1XvsG4LMXBaAQQKgG6/vgct0WAzaQinsZ+P38Ifnf
-ZETOWYbyqUjG35xNTlv64WHuhY2xFmAaokpqok9eEtBKymlGgzBQDcL51B6gO5Ey
-VY+ZWsf7gc2lg9kw5yNVW6lxr/XoSJ88qhemWSJK7T1nQl/Gvjvu/KF2xRJ1MBO+
-+8k6mzMx0niR8DbkI1MLRxGoAn6kzjib4bOsDirM8b51DqjUXBA/a7txNr6BeG3b
-Po1+W8HyXcqDEbxu5Oe5BhQdiqVSGkAZlPdpGyBiQgKZAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAK0RWkmTRqTK6j69f82eBN4E0J6s38vgZAHD7aV2IuQLVPhbVXXR
-X5CHHt5DnOEB8kGPugglg6Tx+cfwIp5ovdmA85PqS3/QgXkStUzmHMj/bQbAC3h/
-FEjqRxV5Qh29RLcicW5QCb2aroYw7fmSlA7uRfx/JUqjKgcN14WvBLqs26nFTUiC
-9DwsvX1GAbzqE186+n2wFnL00+1L5WnbT3jY1Ciq0S3l1GMENbbCd7k5m0CIxe1Y
-u0x8OE6tr6gp+toHWJm1IFLU9l1+AnSL7ZouTfPETt3SCmQjXa/PxoZ8Fkp+W8T1
-tzoJ03xkyR4ziZpwCwxsiwogmXqIyFewAiw=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rtrvirshib.ifmt.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIEluc3RpdHV0
-byBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvMQ0wCwYDVQQLEwRER1RJMR8wHQYJKoZI
-hvcNAQkBFhBkZ3RpQGlmbXQuZWR1LmJyMQ8wDQYDVQQHEwZDdWlhYmExFDASBgNV
-BAgTC01hdG8gR3Jvc3NvMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcnRydmlyc2hp
-Yi5pZm10LmVkdS5icjAeFw0xNDA5MjMxNzU4MzVaFw0xNzA5MjIxNzU4MzVaMIGw
-MSkwJwYDVQQKEyBJbnN0aXR1dG8gRmVkZXJhbCBkZSBNYXRvIEdyb3NzbzENMAsG
-A1UECxMEREdUSTEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm10LmVkdS5icjEPMA0G
-A1UEBxMGQ3VpYWJhMRQwEgYDVQQIEwtNYXRvIEdyb3NzbzELMAkGA1UEBhMCQlIx
-HzAdBgNVBAMTFnJ0cnZpcnNoaWIuaWZtdC5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCydC4cBkxGYZFCNynLc//e8GiIClU8rwevPbd9onai
-aFM70fL+7y+rCLKcCYh1B8S1XvsG4LMXBaAQQKgG6/vgct0WAzaQinsZ+P38Ifnf
-ZETOWYbyqUjG35xNTlv64WHuhY2xFmAaokpqok9eEtBKymlGgzBQDcL51B6gO5Ey
-VY+ZWsf7gc2lg9kw5yNVW6lxr/XoSJ88qhemWSJK7T1nQl/Gvjvu/KF2xRJ1MBO+
-+8k6mzMx0niR8DbkI1MLRxGoAn6kzjib4bOsDirM8b51DqjUXBA/a7txNr6BeG3b
-Po1+W8HyXcqDEbxu5Oe5BhQdiqVSGkAZlPdpGyBiQgKZAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAK0RWkmTRqTK6j69f82eBN4E0J6s38vgZAHD7aV2IuQLVPhbVXXR
-X5CHHt5DnOEB8kGPugglg6Tx+cfwIp5ovdmA85PqS3/QgXkStUzmHMj/bQbAC3h/
-FEjqRxV5Qh29RLcicW5QCb2aroYw7fmSlA7uRfx/JUqjKgcN14WvBLqs26nFTUiC
-9DwsvX1GAbzqE186+n2wFnL00+1L5WnbT3jY1Ciq0S3l1GMENbbCd7k5m0CIxe1Y
-u0x8OE6tr6gp+toHWJm1IFLU9l1+AnSL7ZouTfPETt3SCmQjXa/PxoZ8Fkp+W8T1
-tzoJ03xkyR4ziZpwCwxsiwogmXqIyFewAiw=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML1/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">IFMT - Instituto Federal de Mato Grosso</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifmt.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifmt.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Lilian Maria Goncalves</md:SurName>
-    <md:EmailAddress>lilian.goncalves@ifmt.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 349b2cdb..00000000
--- a/swamid-interfederations-2.0/rtrvirshib.ifmt.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://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>
-    MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIEluc3RpdHV0
-byBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvMQ0wCwYDVQQLEwRER1RJMR8wHQYJKoZI
-hvcNAQkBFhBkZ3RpQGlmbXQuZWR1LmJyMQ8wDQYDVQQHEwZDdWlhYmExFDASBgNV
-BAgTC01hdG8gR3Jvc3NvMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcnRydmlyc2hp
-Yi5pZm10LmVkdS5icjAeFw0xMTEwMjcxNjUwMTZaFw0xNDEwMjYxNjUwMTZaMIGw
-MSkwJwYDVQQKEyBJbnN0aXR1dG8gRmVkZXJhbCBkZSBNYXRvIEdyb3NzbzENMAsG
-A1UECxMEREdUSTEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm10LmVkdS5icjEPMA0G
-A1UEBxMGQ3VpYWJhMRQwEgYDVQQIEwtNYXRvIEdyb3NzbzELMAkGA1UEBhMCQlIx
-HzAdBgNVBAMTFnJ0cnZpcnNoaWIuaWZtdC5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDZ4ICN6U2M/If/rw6RQ0Dt5kXYR13WxoDnAve5hW7u
-wXf4l4n9Wcu2HigGH8AS+g/oauJt8q72QveVrSPcz3ZjRHnS39T+h6xaU/nvWWa2
-3+S0ZyuNewYX//0S6Q5U6E3nyQwX0PZkDG8TahOuWbCvNmTdl3EB2ZjgHFyF8maz
-wQf2iwJ+JgKQhj/uVzbDdf04wTrsO+D1n7kQX4q9izyaS54xCHtrOtdce1zEbxFK
-lmxo5HNrqZx4Dmew8ulenT9+vquPjsRnQsdl0TviMYB2oxiF4vCEfQGqUJ02tT4b
-YOGuwdcwr8BcWJoH06W4R7w5+vjVPGcBesSTADoIqU6FAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAHpQaEcKjErhZQWehDlHiXyZY9OG5UkBDz2pEazAudp+MxmkaIiL
-yKVnAjnr8L6c47UimSRgYkFEFMsXa7IqHFM60J5mSTeT6ZqOaA3Nu3sw5HNuBGE0
-ilqZecmTz5gtG9hTGdGUFxY5Yg/Vni5EhPHWJp6nZHhZTSkiafvT0JZGgm87sQ1e
-2kZWW1qdDaR88DYbg8kLGdf7cGZ024fQw2h62lFEJ7O0e8X5oxPdUqY7HScKHXZK
-2UKA5PYFRjyp4MOi8tPTjpI1YQ9mmFzaIAdh3aUPh8zuJoH21YtVxo8aGhms93ab
-BWahGDWbniRTLwLRC1Jq14E6Ld0cLn79Sxo=
-            </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>
-      
-MIID1jCCAr4CAQAwDQYJKoZIhvcNAQEFBQAwgbAxKTAnBgNVBAoTIEluc3RpdHV0
-byBGZWRlcmFsIGRlIE1hdG8gR3Jvc3NvMQ0wCwYDVQQLEwRER1RJMR8wHQYJKoZI
-hvcNAQkBFhBkZ3RpQGlmbXQuZWR1LmJyMQ8wDQYDVQQHEwZDdWlhYmExFDASBgNV
-BAgTC01hdG8gR3Jvc3NvMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMWcnRydmlyc2hp
-Yi5pZm10LmVkdS5icjAeFw0xMTEwMjcxNjUwMTZaFw0xNDEwMjYxNjUwMTZaMIGw
-MSkwJwYDVQQKEyBJbnN0aXR1dG8gRmVkZXJhbCBkZSBNYXRvIEdyb3NzbzENMAsG
-A1UECxMEREdUSTEfMB0GCSqGSIb3DQEJARYQZGd0aUBpZm10LmVkdS5icjEPMA0G
-A1UEBxMGQ3VpYWJhMRQwEgYDVQQIEwtNYXRvIEdyb3NzbzELMAkGA1UEBhMCQlIx
-HzAdBgNVBAMTFnJ0cnZpcnNoaWIuaWZtdC5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDZ4ICN6U2M/If/rw6RQ0Dt5kXYR13WxoDnAve5hW7u
-wXf4l4n9Wcu2HigGH8AS+g/oauJt8q72QveVrSPcz3ZjRHnS39T+h6xaU/nvWWa2
-3+S0ZyuNewYX//0S6Q5U6E3nyQwX0PZkDG8TahOuWbCvNmTdl3EB2ZjgHFyF8maz
-wQf2iwJ+JgKQhj/uVzbDdf04wTrsO+D1n7kQX4q9izyaS54xCHtrOtdce1zEbxFK
-lmxo5HNrqZx4Dmew8ulenT9+vquPjsRnQsdl0TviMYB2oxiF4vCEfQGqUJ02tT4b
-YOGuwdcwr8BcWJoH06W4R7w5+vjVPGcBesSTADoIqU6FAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAHpQaEcKjErhZQWehDlHiXyZY9OG5UkBDz2pEazAudp+MxmkaIiL
-yKVnAjnr8L6c47UimSRgYkFEFMsXa7IqHFM60J5mSTeT6ZqOaA3Nu3sw5HNuBGE0
-ilqZecmTz5gtG9hTGdGUFxY5Yg/Vni5EhPHWJp6nZHhZTSkiafvT0JZGgm87sQ1e
-2kZWW1qdDaR88DYbg8kLGdf7cGZ024fQw2h62lFEJ7O0e8X5oxPdUqY7HScKHXZK
-2UKA5PYFRjyp4MOi8tPTjpI1YQ9mmFzaIAdh3aUPh8zuJoH21YtVxo8aGhms93ab
-BWahGDWbniRTLwLRC1Jq14E6Ld0cLn79Sxo=
-                    
-            </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/rushib.rockefeller.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/rushib.rockefeller.edu-idp-shibboleth.xml
deleted file mode 100644
index 4a919657..00000000
--- a/swamid-interfederations-2.0/rushib.rockefeller.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,71 +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://rushib.rockefeller.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://rushib.rockefeller.edu/idp/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rockefeller.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rockefeller University</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>
-MIIDRDCCAiygAwIBAgIVAPI9h0Gu4CtEoQlfycXU2mmLEEeJMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFnJ1c2hpYi5yb2NrZWZlbGxlci5lZHUwHhcNMTQwNTAx
-MTczOTI2WhcNMzQwNTAxMTczOTI2WjAhMR8wHQYDVQQDExZydXNoaWIucm9ja2Vm
-ZWxsZXIuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgqOnUz5i
-9tVVs7wd0ZKlToCMv7hWhgFgbZXJ84oRTvegpVAFmWMmZIh1GCcmMLl02fYcewBW
-yplRm+hD41T+07oLxX1pbIv+dQTUNKFaBj05xxk/OazrtgQ1642JfT6mOop6Jq/U
-1BjPBRMCcVevvA9qwav1rihjv854vhR9sTRIPJvfcupkcUDme0HZPF9uDy6XhEJz
-MhHOMpD/txYHA00mW33m2bemAgSOTwn2yz0HIs6395o3M1g7tBfuuHUN5S2luuZQ
-o8EOpuV0qPjD2q2RBetKKBop4Ku6duEyOri5bwuQXk3l8xAPKBFnkhUXS6PAMLah
-YN5MPHnUKpRAHwIDAQABo3MwcTBQBgNVHREESTBHghZydXNoaWIucm9ja2VmZWxs
-ZXIuZWR1hi1odHRwczovL3J1c2hpYi5yb2NrZWZlbGxlci5lZHUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFNwc7cnXlFheGGYaSNOv6FcWQyRqMA0GCSqGSIb3DQEB
-BQUAA4IBAQAnPKCvFwkpw5p4tbSJS3XvReVUjnJPdzGiaznu6j11k6CoQoUqFuOd
-Xqin8UHInoS7XYXxWdY51DAB5ONkOwjkfhixpzmXBNuhs0vOh9mCMGiGW7CHbDu+
-Gg4gEzh7+ZEuj+aLTfa3Y4rmoaV8BJPBX7+ZZKHEmBTOyHZHmCbZfyQOrCXKAN/2
-5n3rFSaPyjc54O5nXSGbhTyEEWlA9zlx5FWheKLz5dHf+i17qLIbkQGww0saMXNz
-Bptks6bmLj9P1PAtmV842uqh05xFIHHG4WAqp7tqnglkDDw6Lze4NuxnxU9/xQFU
-XKx9JBd0Ah6DZb6aHj5cXlPl2utzn7Qd
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rushib.rockefeller.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rushib.rockefeller.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Rockefeller University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rockefeller University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rockefeller.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Chris Vancil</md:GivenName>
-    <md:EmailAddress>chrisv@rockefeller.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Anne Duffy</md:GivenName>
-    <md:EmailAddress>anne@rockefeller.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Svetlana Zarubina</md:GivenName>
-    <md:EmailAddress>svetlan@rockefeller.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Marty Leidner</md:GivenName>
-    <md:EmailAddress>marty@rockefeller.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rutcathens.rutc.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/rutcathens.rutc.ac.uk-oala-metadata.xml
deleted file mode 100644
index 4cbb955d..00000000
--- a/swamid-interfederations-2.0/rutcathens.rutc.ac.uk-oala-metadata.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://rutcathens.rutc.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Richmond upon Thames College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">rutc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDuzCCAqOgAwIBAgIJAN1WsDggoMVvMA0GCSqGSIb3DQEBBQUAMEcxJTAjBgNV
-						BAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxlZ2UxHjAcBgNVBAMTFXJ1dGNh
-						dGhlbnMucnV0Yy5hYy51azAeFw0xMDExMTExMTM0MTZaFw0yMDExMDgxMTM0MTZa
-						MEcxJTAjBgNVBAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxlZ2UxHjAcBgNV
-						BAMTFXJ1dGNhdGhlbnMucnV0Yy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALqStCmUSU8IaQxOwt2Ou+wphpG1cqQYzY/17w8G0ftlzo5+mSJf
-						AoPIBYSKmqvJtAqPww4TSrePmQihLopDHHlj6FcFywWYMoGf0JDk/piGgNF/Clj6
-						mSXdu/VSuanx2uq5V512W+5A9clJqmBPIAZiglMaHcxDgR5cG7K75it3iSAX81wA
-						PX9+T0TbvLGvqVSeSqQ2UVy728uLF53I2eSYta24l99yrSnOziNVHCD6+b0l7t1K
-						OKrkuOLLSfuwTzxLeMlq67VOgymL1FrNWvWaySrh1NWWKAdND11Vgk7z4+hFbbfL
-						ersUW6JBGJUGysvTIFlrpnp81ibXAO28mTUCAwEAAaOBqTCBpjAdBgNVHQ4EFgQU
-						nUoRxGM/pC8cQmwmpxUhC8V8wikwdwYDVR0jBHAwboAUnUoRxGM/pC8cQmwmpxUh
-						C8V8wimhS6RJMEcxJTAjBgNVBAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxl
-						Z2UxHjAcBgNVBAMTFXJ1dGNhdGhlbnMucnV0Yy5hYy51a4IJAN1WsDggoMVvMAwG
-						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKwWAWDeDlDvy8ROsFlboPkl
-						R0Kq4+4fYhf6/1ihswDC/81AsYtT+2+J7ddNt2mQ8ElBJIvPxFGo9nrfh0OAEQqE
-						/SFzabz7Co6EZrTjaq6w0Ga4SLGllKtDtHV/OgvNhNk0HdkHP4EHueq4KJl+ZWoS
-						k3F+XEpmVs7e8DSGPY2CQO1cKYqFZF/4mqs1dcmXWqK4FLU8xlR4urtwxPybYRd3
-						kTNdyaLJMlqWpe/LumRJ323OxgwDDUxgadxQ99CpcsRN8fn3CyiW5vnf3jjMl91r
-						/N50CdH4cNvfaDEqHTiucQkIxjF+VsVX3S3Q5xGnLOJex9/Li8kVqnR1hZOkxi0=
-					</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>
-						MIIDuzCCAqOgAwIBAgIJAN1WsDggoMVvMA0GCSqGSIb3DQEBBQUAMEcxJTAjBgNV
-						BAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxlZ2UxHjAcBgNVBAMTFXJ1dGNh
-						dGhlbnMucnV0Yy5hYy51azAeFw0xMDExMTExMTM0MTZaFw0yMDExMDgxMTM0MTZa
-						MEcxJTAjBgNVBAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxlZ2UxHjAcBgNV
-						BAMTFXJ1dGNhdGhlbnMucnV0Yy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALqStCmUSU8IaQxOwt2Ou+wphpG1cqQYzY/17w8G0ftlzo5+mSJf
-						AoPIBYSKmqvJtAqPww4TSrePmQihLopDHHlj6FcFywWYMoGf0JDk/piGgNF/Clj6
-						mSXdu/VSuanx2uq5V512W+5A9clJqmBPIAZiglMaHcxDgR5cG7K75it3iSAX81wA
-						PX9+T0TbvLGvqVSeSqQ2UVy728uLF53I2eSYta24l99yrSnOziNVHCD6+b0l7t1K
-						OKrkuOLLSfuwTzxLeMlq67VOgymL1FrNWvWaySrh1NWWKAdND11Vgk7z4+hFbbfL
-						ersUW6JBGJUGysvTIFlrpnp81ibXAO28mTUCAwEAAaOBqTCBpjAdBgNVHQ4EFgQU
-						nUoRxGM/pC8cQmwmpxUhC8V8wikwdwYDVR0jBHAwboAUnUoRxGM/pC8cQmwmpxUh
-						C8V8wimhS6RJMEcxJTAjBgNVBAoTHFJpY2htb25kIHVwb24gVGhhbWVzIENvbGxl
-						Z2UxHjAcBgNVBAMTFXJ1dGNhdGhlbnMucnV0Yy5hYy51a4IJAN1WsDggoMVvMAwG
-						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKwWAWDeDlDvy8ROsFlboPkl
-						R0Kq4+4fYhf6/1ihswDC/81AsYtT+2+J7ddNt2mQ8ElBJIvPxFGo9nrfh0OAEQqE
-						/SFzabz7Co6EZrTjaq6w0Ga4SLGllKtDtHV/OgvNhNk0HdkHP4EHueq4KJl+ZWoS
-						k3F+XEpmVs7e8DSGPY2CQO1cKYqFZF/4mqs1dcmXWqK4FLU8xlR4urtwxPybYRd3
-						kTNdyaLJMlqWpe/LumRJ323OxgwDDUxgadxQ99CpcsRN8fn3CyiW5vnf3jjMl91r
-						/N50CdH4cNvfaDEqHTiucQkIxjF+VsVX3S3Q5xGnLOJex9/Li8kVqnR1hZOkxi0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rutcathens.rutc.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rutcathens.rutc.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Richmond upon Thames College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Richmond upon Thames College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rutc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jane</GivenName>
-    <SurName>Ball</SurName>
-    <EmailAddress>mailto:jane.ball@rutc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Kayes</SurName>
-    <EmailAddress>mailto:tom.kayes@rutc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rxauth.reaxys.com.xml b/swamid-interfederations-2.0/rxauth.reaxys.com.xml
deleted file mode 100644
index 66ee937c..00000000
--- a/swamid-interfederations-2.0/rxauth.reaxys.com.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://rxauth.reaxys.com/">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
-MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
-ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
-NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
-a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
-AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
-OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
-ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
-RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
-aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
-aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
-WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
-GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
-hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
-mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
-Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
-0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
-TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
-W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
-MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
-ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
-NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
-a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
-AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
-OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
-ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
-RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
-aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
-aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
-WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
-GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
-hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
-mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
-Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
-0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
-TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
-W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rxauth.reaxys.com/SHIRE/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-rxauth.reaxys.com/SHIRE/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Elsevier</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Elsevier Reaxys</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.reaxys.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Elsevier</GivenName>
-    <SurName>Shibboleth Support</SurName>
-    <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Elsevier</GivenName>
-    <SurName>Shibboleth Support</SurName>
-    <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sa-test.ted.is.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sa-test.ted.is.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index 3e6cfd0d..00000000
--- a/swamid-interfederations-2.0/sa-test.ted.is.ed.ac.uk-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://sa-test.ted.is.ed.ac.uk/shibboleth">
-  <!--
-		This is a "Student Allocator - TEST Environment" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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="2013-04-18T08:51:42Z"/>
-  </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://sa-test.ted.is.ed.ac.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://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAPiFnX/AGXS/MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHNhdC1zYS1hdDF0LmVkLmFjLnVrMB4XDTEzMDIyMjEyMDcyMFoXDTIzMDIy
-						MDEyMDcyMFowHzEdMBsGA1UEAxMUc2F0LXNhLWF0MXQuZWQuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZWzFApufviUmWOb4eZ/Rf/2U1+0at
-						EFW/52W/u2Iw9m//9VQ6Cmyd/mRwVLyA9czHl7kfMVcjotbhi4VHQwgN+HyNcZUW
-						bI7WaVCtHyQyzBOpMM4Wv7+i7qI3sdkXqmKKu6MCmr4k3rLiVObuGADn2INLZ48Y
-						xS1wg9mnJX8/2WtzjL3E6aW3ehXozsQ9PGD6zFMfnxpZcO+b5iHQ74opo8fcwajF
-						Xg9d9xo4sdUbxvNnUDrE7+GXm7LQUErwpKnz1rqQFrK3xwt3D1kWs9dqc0nx+0As
-						ghF3QkXLrUc99DmZAcYIhiwCd/KIqtqml3WkMvE8g6A1aK9A/Cdx9E7pAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFHNhdC1zYS1hdDF0LmVkLmFjLnVrMB0GA1UdDgQWBBTD
-						M6QITNYO3b7WJKWqUPckzkpzzjANBgkqhkiG9w0BAQUFAAOCAQEAKo+YeiJkib22
-						EcMLNrtDi6ehAheTWZUT//zUfKYA7tcCbVaVlloDjcqkVciqFIt5z0eX/c7pXzR6
-						1ljp6Rv1NIrNu4qxS3PLlCP4WHiGwvQDvbvVnk3Y/iYkUcdnRKnGWQUDOmecK1Mb
-						q44Etl9/3KCm+Tq4VPDTfBYaAGk/GTR2AFdYm7rTcKhB3ngzRKkNU5hCLkeDgZPD
-						Cx/5AlRbCnfNhNDUrEv60WPdmwE21yV4R7tXWfuToTw/ubrc06yf+akxOPvd0y9m
-						1YWgivRKg2HaES0eeVEq9sbJEY8rit1UQnOfZ/FGpt+EgYI9F/E9ZHGN2ukKJWIO
-						jau5581/Rw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sa-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Student Allocator - TEST Environment</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>IS Apps Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sa1.nimr.mrc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sa1.nimr.mrc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 1181902a..00000000
--- a/swamid-interfederations-2.0/sa1.nimr.mrc.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://sa1.nimr.mrc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the National Institute for Medical Research at the Medical Research Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-27T13:26: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">nimr.mrc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID5jCCAs4CCQCynm0QUqUXRjANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgMBkxvbmRvbjESMBAGA1UEBwwJTWlsbCBIaWxsMTAwLgYDVQQK
-						DCdOYXRpb25hbCBJbnN0aXR1dGUgZm9yIE1lZGljYWwgUmVzZWFyY2gxCzAJBgNV
-						BAsMAklUMRswGQYDVQQDDBJzYTEubmltci5tcmMuYWMudWsxJDAiBgkqhkiG9w0B
-						CQEWFXdpbnN5c0BuaW1yLm1yYy5hYy51azAeFw0xMzA0MTkwOTM2MzJaFw0yMzA0
-						MTcwOTM2MzJaMIG0MQswCQYDVQQGEwJHQjEPMA0GA1UECAwGTG9uZG9uMRIwEAYD
-						VQQHDAlNaWxsIEhpbGwxMDAuBgNVBAoMJ05hdGlvbmFsIEluc3RpdHV0ZSBmb3Ig
-						TWVkaWNhbCBSZXNlYXJjaDELMAkGA1UECwwCSVQxGzAZBgNVBAMMEnNhMS5uaW1y
-						Lm1yYy5hYy51azEkMCIGCSqGSIb3DQEJARYVd2luc3lzQG5pbXIubXJjLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJBI4lShZ0LaFhcN4tSj
-						QYFj8uheICfLxpOIqS2MgbOsZHt6jVVs8z09yuUxbNW6C2TaY+5XtdL+QTouh6n/
-						VYfiPwHwonJ/atlbwjFL+TVzxxYXYE/BCaYxnbB3TXTVi0XkJUoFmnT98LWoxZ07
-						lAAG7Wj/oRFTZJYX4MdziRPD46wAm8IJrZ/CGdVvuGHy/TkD43sBxbvsbrNUxiy9
-						Q3Xq+4WMikIVIGu50NCh9H5t4JqTidcAJkBJWt/z86zGGMWjfQqZX+M4Va7aD7Uu
-						YWdvTVbdSlyaj9PnIiC0to/fTzOseRd/Rb9wp/NWMFjSli+FII4q8RMKFhzOHKkg
-						NwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBedlMtL3DYskkxf4i0fwhT72CHeQc4
-						puA2l9ThP8KXw5mU0y4qYdwPinntG02ni4u3bytgpI0cQ9pdvHX161BzLyr3e1dg
-						u1+4DMMereeOjlGu0YYifj1bxzTfOxJn19t4E8+T5d1BxfC50pw3YbZOcjgX5iSV
-						/o654wjFeFkG0N785HcoPL3so14RkvUXoAtCoMR9s0g0VrQzQC2ATeMoEMe23JCz
-						tmPJEmFahk4xLFFNM82KPXn6nFznGT7X2cSZKYpAudcYkn244wq3qL/3s1SjGyBP
-						2VaXuOVNp8DYTM6HlbB8wSBOzqfGWN+xSVT+g/ccRhp4pjtXTvgN4PRb
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sa1.nimr.mrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sa1.nimr.mrc.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://sa1.nimr.mrc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sa1.nimr.mrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sa1.nimr.mrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sa1.nimr.mrc.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">nimr.mrc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID5jCCAs4CCQCynm0QUqUXRjANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgMBkxvbmRvbjESMBAGA1UEBwwJTWlsbCBIaWxsMTAwLgYDVQQK
-						DCdOYXRpb25hbCBJbnN0aXR1dGUgZm9yIE1lZGljYWwgUmVzZWFyY2gxCzAJBgNV
-						BAsMAklUMRswGQYDVQQDDBJzYTEubmltci5tcmMuYWMudWsxJDAiBgkqhkiG9w0B
-						CQEWFXdpbnN5c0BuaW1yLm1yYy5hYy51azAeFw0xMzA0MTkwOTM2MzJaFw0yMzA0
-						MTcwOTM2MzJaMIG0MQswCQYDVQQGEwJHQjEPMA0GA1UECAwGTG9uZG9uMRIwEAYD
-						VQQHDAlNaWxsIEhpbGwxMDAuBgNVBAoMJ05hdGlvbmFsIEluc3RpdHV0ZSBmb3Ig
-						TWVkaWNhbCBSZXNlYXJjaDELMAkGA1UECwwCSVQxGzAZBgNVBAMMEnNhMS5uaW1y
-						Lm1yYy5hYy51azEkMCIGCSqGSIb3DQEJARYVd2luc3lzQG5pbXIubXJjLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyJBI4lShZ0LaFhcN4tSj
-						QYFj8uheICfLxpOIqS2MgbOsZHt6jVVs8z09yuUxbNW6C2TaY+5XtdL+QTouh6n/
-						VYfiPwHwonJ/atlbwjFL+TVzxxYXYE/BCaYxnbB3TXTVi0XkJUoFmnT98LWoxZ07
-						lAAG7Wj/oRFTZJYX4MdziRPD46wAm8IJrZ/CGdVvuGHy/TkD43sBxbvsbrNUxiy9
-						Q3Xq+4WMikIVIGu50NCh9H5t4JqTidcAJkBJWt/z86zGGMWjfQqZX+M4Va7aD7Uu
-						YWdvTVbdSlyaj9PnIiC0to/fTzOseRd/Rb9wp/NWMFjSli+FII4q8RMKFhzOHKkg
-						NwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBedlMtL3DYskkxf4i0fwhT72CHeQc4
-						puA2l9ThP8KXw5mU0y4qYdwPinntG02ni4u3bytgpI0cQ9pdvHX161BzLyr3e1dg
-						u1+4DMMereeOjlGu0YYifj1bxzTfOxJn19t4E8+T5d1BxfC50pw3YbZOcjgX5iSV
-						/o654wjFeFkG0N785HcoPL3so14RkvUXoAtCoMR9s0g0VrQzQC2ATeMoEMe23JCz
-						tmPJEmFahk4xLFFNM82KPXn6nFznGT7X2cSZKYpAudcYkn244wq3qL/3s1SjGyBP
-						2VaXuOVNp8DYTM6HlbB8wSBOzqfGWN+xSVT+g/ccRhp4pjtXTvgN4PRb
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sa1.nimr.mrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sa1.nimr.mrc.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">Medical Research Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Institute for Medical Research</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nimr.mrc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@nimr.mrc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>System Administrator</GivenName>
-    <EmailAddress>mailto:winsys@nimr.mrc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml b/swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml
deleted file mode 100644
index e9dd4e62..00000000
--- a/swamid-interfederations-2.0/sabia-new.ipen.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://sabia-new.ipen.br/idp/shibboleth">
-  <md: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>
-  </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">ipen.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ipen.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ipen.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xPjA8BgNVBAoTNUlQRU4gLSBJ
-bnN0aXR1dG8gZGUgUGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzMQww
-CgYDVQQLEwNHUlMxHjAcBgkqhkiG9w0BCQEWD3N1cG9ydGVAaXBlbi5icjESMBAG
-A1UEBxMJU2FvIFBhdWxvMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFzYWJpYS1uZXcuaXBlbi5icjAeFw0xNTA1MDUxMjUyNTlaFw0x
-ODA1MDQxMjUyNTlaMIG/MT4wPAYDVQQKEzVJUEVOIC0gSW5zdGl0dXRvIGRlIFBl
-c3F1aXNhcyBFbmVyZ2V0aWNhcyBlIE51Y2xlYXJlczEMMAoGA1UECxMDR1JTMR4w
-HAYJKoZIhvcNAQkBFg9zdXBvcnRlQGlwZW4uYnIxEjAQBgNVBAcTCVNhbyBQYXVs
-bzESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRc2Fi
-aWEtbmV3LmlwZW4uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw
-yXB8ik/YHwNRl2dnguuZ3hEyeGSbqh+asTWuv2r742UIIPo32PTaVl4K2fD1HbRu
-d+/dl+5YCpXG5J4psbf6ECDWbYR1X/v/o/ZIABDg48MJEcINU059qzDbpbYFMyZI
-PNmeWhebrwVZ5ggSWyrSO/Vzh5aW8mJPvwaMh+4iJzDF92OkmSKy0Wy7htv8bVoi
-plXJNN8Lv0GZHZKek1dWnEHnRMiwX7KphC5xiorFlTUotqx3TG2W11EvXKzU8L1s
-uJIP8XhRpVU1YIBYQ4fyvZtNFkiX2j3VUxn0rkYCtyAwpC/TvtSNJsylma6wkUBs
-LIpk6HOqeveqEhAqWSSJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGumyG+w8SN2
-lb/oekW0K+Je+toEMk0iUmWFtDivFjmA6SbCP7e+yct/QZDbOKNVCIGFrpNYdEX6
-SimY5vovSqetyIQCx0z/imtcwAdCKmMRNx6DlMlqL0upDPH4vEMplgUja2vQ5FsK
-3C7DGb1N6VYU+u5TNl2q+sBbNHSjoDeut8Y8yiuh+vXYLg3MMbZtW6zO6mxY/N0R
-ZrFhqQj34OlapE2GzSHA81UfqOga1nZhwWsGUvzUTPaoyBYyDnHbh5hQC0lcIOWI
-ax5+EE7ugsHIeIktKJMKaVLPwTGHTp5H76D2DL2vYoDgKtPvyW0XmZF6Cjz1ZywL
-Ma65UunXAIA=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sabia-new.ipen.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sabia-new.ipen.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://sabia-new.ipen.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sabia-new.ipen.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sabia-new.ipen.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sabia-new.ipen.br/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">ipen.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xPjA8BgNVBAoTNUlQRU4gLSBJ
-bnN0aXR1dG8gZGUgUGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzMQww
-CgYDVQQLEwNHUlMxHjAcBgkqhkiG9w0BCQEWD3N1cG9ydGVAaXBlbi5icjESMBAG
-A1UEBxMJU2FvIFBhdWxvMRIwEAYDVQQIEwlTYW8gUGF1bG8xCzAJBgNVBAYTAkJS
-MRowGAYDVQQDExFzYWJpYS1uZXcuaXBlbi5icjAeFw0xNTA1MDUxMjUyNTlaFw0x
-ODA1MDQxMjUyNTlaMIG/MT4wPAYDVQQKEzVJUEVOIC0gSW5zdGl0dXRvIGRlIFBl
-c3F1aXNhcyBFbmVyZ2V0aWNhcyBlIE51Y2xlYXJlczEMMAoGA1UECxMDR1JTMR4w
-HAYJKoZIhvcNAQkBFg9zdXBvcnRlQGlwZW4uYnIxEjAQBgNVBAcTCVNhbyBQYXVs
-bzESMBAGA1UECBMJU2FvIFBhdWxvMQswCQYDVQQGEwJCUjEaMBgGA1UEAxMRc2Fi
-aWEtbmV3LmlwZW4uYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw
-yXB8ik/YHwNRl2dnguuZ3hEyeGSbqh+asTWuv2r742UIIPo32PTaVl4K2fD1HbRu
-d+/dl+5YCpXG5J4psbf6ECDWbYR1X/v/o/ZIABDg48MJEcINU059qzDbpbYFMyZI
-PNmeWhebrwVZ5ggSWyrSO/Vzh5aW8mJPvwaMh+4iJzDF92OkmSKy0Wy7htv8bVoi
-plXJNN8Lv0GZHZKek1dWnEHnRMiwX7KphC5xiorFlTUotqx3TG2W11EvXKzU8L1s
-uJIP8XhRpVU1YIBYQ4fyvZtNFkiX2j3VUxn0rkYCtyAwpC/TvtSNJsylma6wkUBs
-LIpk6HOqeveqEhAqWSSJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGumyG+w8SN2
-lb/oekW0K+Je+toEMk0iUmWFtDivFjmA6SbCP7e+yct/QZDbOKNVCIGFrpNYdEX6
-SimY5vovSqetyIQCx0z/imtcwAdCKmMRNx6DlMlqL0upDPH4vEMplgUja2vQ5FsK
-3C7DGb1N6VYU+u5TNl2q+sBbNHSjoDeut8Y8yiuh+vXYLg3MMbZtW6zO6mxY/N0R
-ZrFhqQj34OlapE2GzSHA81UfqOga1nZhwWsGUvzUTPaoyBYyDnHbh5hQC0lcIOWI
-ax5+EE7ugsHIeIktKJMKaVLPwTGHTp5H76D2DL2vYoDgKtPvyW0XmZF6Cjz1ZywL
-Ma65UunXAIA=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sabia-new.ipen.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sabia-new.ipen.br:8443/idp/profile/SAML1/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">IPEN - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IPEN - NEW - Instituto de Pesquisas Energeticas e Nucleares</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ipen.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ipen.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Dorival A. Nunes</md:SurName>
-    <md:EmailAddress>suporte@ipen.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml b/swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml
deleted file mode 100644
index 086af0e0..00000000
--- a/swamid-interfederations-2.0/sabia.ipen.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +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://sabia.ipen.br/idp/shibboleth">
-  <md: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>
-  </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">ipen.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ipen.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ipen.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEXDCCA0QCAQAwDQYJKoZIhvcNAQEFBQAwgfMxQzBBBgNVBAoTOklQRU4gLSBJ
-bnN0aXR1dG8gZGUgUGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzIC0g
-U1AxEzARBgNVBAsTCkJpYmxpb3RlY2ExHjAcBgkqhkiG9w0BCQEWD3N1cG9ydGVA
-aXBlbi5icjESMBAGA1UEBxMJU2FvIFBhdWxvMT4wPAYDVQQIEzVJUEVOIC0gSW5z
-dGl0dXRvIGRlIFBlc3F1aXNhcyBFbmVyZ2V0aWNhcyBlIE51Y2xlYXJlczELMAkG
-A1UEBhMCQlIxFjAUBgNVBAMTDXNhYmlhLmlwZW4uYnIwHhcNMTQxMDEzMTcwODAx
-WhcNMTcxMDEyMTcwODAxWjCB8zFDMEEGA1UEChM6SVBFTiAtIEluc3RpdHV0byBk
-ZSBQZXNxdWlzYXMgRW5lcmdldGljYXMgZSBOdWNsZWFyZXMgLSBTUDETMBEGA1UE
-CxMKQmlibGlvdGVjYTEeMBwGCSqGSIb3DQEJARYPc3Vwb3J0ZUBpcGVuLmJyMRIw
-EAYDVQQHEwlTYW8gUGF1bG8xPjA8BgNVBAgTNUlQRU4gLSBJbnN0aXR1dG8gZGUg
-UGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzMQswCQYDVQQGEwJCUjEW
-MBQGA1UEAxMNc2FiaWEuaXBlbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALrq5ZevUSQE7GS93A4oZ2SZKFdHq2elGjkqOPdjvsh/mk6KZ/OECO9j
-QGA3zk8wJVmUeVJSG0ZvnpF0s3iJZHDiv5R/m8G5V4GeQsP4fc4tv5gt3ZzjCCeT
-EVO55Y0v1mnFsDT4vGhsDgICf4U+21i5nqJVQom/w2mnfccwQAkCWjbJO5OAqVF5
-at5ecNAyNutcrs4LdsbmxJPGMWjkBSiVzk7THdWy6S7Gw9PKoX82BXMewgGD/6PS
-bj9bxGb+/8o8oBeEvALvp+Jc2Z5S5NlNatZqk4CW3CsB0HhADy2HXeopDhtegWJn
-KGKKSyS/xf1Hbrk2s22GZ9tD4VpXKYcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-r2qNXfEenoYjW7Tth+cwTNXSq1k/k3xAOSiaT7he6lNhUo/QksLNb0a725ccpDf/
-JsCBqky0xj0QxQMsvLOZ+ekrY3MzsTD/ysx0Q9f04iletyBHpcHtMPtGGwXTpmWg
-rhXZjzRuezHV7mv1FA6tAR6UgoQv2WQ4WR7Yb9p4ZVVLoaguyfkWNLzYmn9wpPm0
-fNUrS3qTDFop0W8sMweA+5AaaaV9dpi2vgB00MvdL7O4yhuNFrLBxSPQMjCeJq8E
-kZi8sTfQtgq88KrN0RkbdFrUXbw8arkz9Ee5YeXswkBlyN0LD3dCT162AG/Xb0wg
-2jsa3oOpEbS11ilQ7ebVMg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sabia.ipen.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sabia.ipen.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://sabia.ipen.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sabia.ipen.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sabia.ipen.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sabia.ipen.br/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">ipen.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEXDCCA0QCAQAwDQYJKoZIhvcNAQEFBQAwgfMxQzBBBgNVBAoTOklQRU4gLSBJ
-bnN0aXR1dG8gZGUgUGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzIC0g
-U1AxEzARBgNVBAsTCkJpYmxpb3RlY2ExHjAcBgkqhkiG9w0BCQEWD3N1cG9ydGVA
-aXBlbi5icjESMBAGA1UEBxMJU2FvIFBhdWxvMT4wPAYDVQQIEzVJUEVOIC0gSW5z
-dGl0dXRvIGRlIFBlc3F1aXNhcyBFbmVyZ2V0aWNhcyBlIE51Y2xlYXJlczELMAkG
-A1UEBhMCQlIxFjAUBgNVBAMTDXNhYmlhLmlwZW4uYnIwHhcNMTQxMDEzMTcwODAx
-WhcNMTcxMDEyMTcwODAxWjCB8zFDMEEGA1UEChM6SVBFTiAtIEluc3RpdHV0byBk
-ZSBQZXNxdWlzYXMgRW5lcmdldGljYXMgZSBOdWNsZWFyZXMgLSBTUDETMBEGA1UE
-CxMKQmlibGlvdGVjYTEeMBwGCSqGSIb3DQEJARYPc3Vwb3J0ZUBpcGVuLmJyMRIw
-EAYDVQQHEwlTYW8gUGF1bG8xPjA8BgNVBAgTNUlQRU4gLSBJbnN0aXR1dG8gZGUg
-UGVzcXVpc2FzIEVuZXJnZXRpY2FzIGUgTnVjbGVhcmVzMQswCQYDVQQGEwJCUjEW
-MBQGA1UEAxMNc2FiaWEuaXBlbi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALrq5ZevUSQE7GS93A4oZ2SZKFdHq2elGjkqOPdjvsh/mk6KZ/OECO9j
-QGA3zk8wJVmUeVJSG0ZvnpF0s3iJZHDiv5R/m8G5V4GeQsP4fc4tv5gt3ZzjCCeT
-EVO55Y0v1mnFsDT4vGhsDgICf4U+21i5nqJVQom/w2mnfccwQAkCWjbJO5OAqVF5
-at5ecNAyNutcrs4LdsbmxJPGMWjkBSiVzk7THdWy6S7Gw9PKoX82BXMewgGD/6PS
-bj9bxGb+/8o8oBeEvALvp+Jc2Z5S5NlNatZqk4CW3CsB0HhADy2HXeopDhtegWJn
-KGKKSyS/xf1Hbrk2s22GZ9tD4VpXKYcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-r2qNXfEenoYjW7Tth+cwTNXSq1k/k3xAOSiaT7he6lNhUo/QksLNb0a725ccpDf/
-JsCBqky0xj0QxQMsvLOZ+ekrY3MzsTD/ysx0Q9f04iletyBHpcHtMPtGGwXTpmWg
-rhXZjzRuezHV7mv1FA6tAR6UgoQv2WQ4WR7Yb9p4ZVVLoaguyfkWNLzYmn9wpPm0
-fNUrS3qTDFop0W8sMweA+5AaaaV9dpi2vgB00MvdL7O4yhuNFrLBxSPQMjCeJq8E
-kZi8sTfQtgq88KrN0RkbdFrUXbw8arkz9Ee5YeXswkBlyN0LD3dCT162AG/Xb0wg
-2jsa3oOpEbS11ilQ7ebVMg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sabia.ipen.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sabia.ipen.br:8443/idp/profile/SAML1/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">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IPEN - Instituto de Pesquisas Energeticas e Nucleares - SP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ipen.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ipen.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Suporte</md:SurName>
-    <md:EmailAddress>suporte@ipen.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/safe.epcc.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/safe.epcc.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index ea1e15b5..00000000
--- a/swamid-interfederations-2.0/safe.epcc.ed.ac.uk-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://safe.epcc.ed.ac.uk/shibboleth">
-  <!--
-		This is an "EPCC SAFE" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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="2014-06-17T14:03:08Z">
-      <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://safe.epcc.ed.ac.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://safe.epcc.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EPCC SAFE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SAFE HPC service administration hosted at EPCC</mdui:Description>
-        <mdui:Logo height="65" width="162">https://safe.epcc.ed.ac.uk/images/safelogo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAM6PYwal8Sr+MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnNhZmUuZXBjYy5lZC5hYy51azAeFw0xNDA2MTMxMjI1MjNaFw0yNDA2MTAx
-						MjI1MjNaMB0xGzAZBgNVBAMTEnNhZmUuZXBjYy5lZC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBALyfMo6ccoUJQkWr8s+D+5Pumxqu2bpFc4V7
-						RbGGcmMLq5Nigv34AzDcdHSBejB0CbdtLd8rm7trjUx3kF50aZkU2cSYoPjl6qFq
-						+Y6FdfdGpSA7s2kRsqEyDB/BTXy8ePUgtFTmzgscI0zYtbeNNjqfoKEprtWys3+W
-						DMzHcWoc5ayCQiWzQMKxkuOaBynpaZeePBMHncmtqBOECU6xqVlhbN0C8SSqBHVf
-						/AZyaT9Re6F65v0Sstph+Hm1jBTj5zmCoszWiGpTIE392eFuU7UE6oKO2NbX1HGG
-						97+Wd1OyIxxSm6MgN1fni0n5gSEJdvfDUrllUvE1RI86kA0GXkUCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISc2FmZS5lcGNjLmVkLmFjLnVrMB0GA1UdDgQWBBQPSH7aENek
-						efLSP07GJnhd4Rz83jANBgkqhkiG9w0BAQUFAAOCAQEAWVuBgQop6+C6N61h/mbb
-						Ts2aW47rBqWb3e1SywL4QNlI6+ktCmycQmuuYxWi8kayicIk01LT8XMABRNRM/Tr
-						CmHYn2TXOnA7eWB2Cqb6dSQcKc/DuY43DWnrPNiqdWyyWkbHldf91sLBMERwjGam
-						tczJCAEP3dcXxAZQ/jY9wmFmq9hB5wK9N0VJyoR1Fk823uTGxynkdrp36JQ9ye2U
-						TbDGOMsMVIOoZaFZSBuZXWOuZZPBR9cZ3w9R2+H7PuQcpA0bbn5Zg5q8jO0EsVrY
-						xJJwl96Mjvc83n1JFmgn/IFCrv6Rohp9xKa3AOFpMI/SEbh5kEqKhAPfpFcNVp4c
-						Pg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://safe.epcc.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://safe.epcc.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EPCC SAFE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.epcc.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@epcc.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stephen</GivenName>
-    <SurName>Booth</SurName>
-    <EmailAddress>mailto:s.booth@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sal-shib-prod.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/sal-shib-prod.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 5f7f4937..00000000
--- a/swamid-interfederations-2.0/sal-shib-prod.hosted.exlibrisgroup.com-shib.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://sal-shib-prod.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is an "University of Salford - Primo" Shibboleth SP for Ex Libris (UK) 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="2015-07-10T09:47:20Z">
-      <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://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Salford - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Salford</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJANf0AmxW40+9MA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMzkwHhcNMTUwNzA5MTYwNTM0WhcNMjUwNzA2MTYwNTM0WjASMRAw
-						DgYDVQQDEwdhaW8wMDM5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						wsrJouNXKWuZwbGdfZl3D+UNPRp/c3RxZ01mLxZp6y1Hp2da5Yqda1Re6Ej/icJx
-						oG6AZtibOLklI9O/5X/4tSFUcYNl0+uVD4hkLR9ugbaSxlbpu07W7fTwtwHvOzQ/
-						5tDJ+6fNrHxo63zGMxjsgREIvHuH68xZ09iZTyc9FFIClhDH1knQEYk9h2qiDmvX
-						K6W5+zOalu7m80A0t4CPuwypNyzDmL5gB6csivQxRc3glSVgptWW+AydhyGWInoE
-						9y4OYBZYXKu6h7tRj1BchRKRV5gfnh2sVDc8g4WlYjyT47WdnnMOaxKnjMhbQmOi
-						qahqU/LqEb+Ov8S7RCxV6wIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDM5MB0G
-						A1UdDgQWBBSBiLmTqZl44j7NH7uihXGFpNkIDTANBgkqhkiG9w0BAQUFAAOCAQEA
-						iyhWO6ysrwsqbuowSwDJ/E+O7KD7/Jk9690BHf5jKRmIgAc8eHrNaNB48oLVxRTX
-						8OmDrx2XgVSPdRV9CuCb2OGfaB41EJ7ByrqBkzjn7DddcpTaPQQkasoQrt1yayBf
-						kKI1fWZJLZRfvuaz2NMikMkbpl7YqeSUvngQZ7OEEL6LlVUoHV8UB1D/02kjWUjH
-						kGmhqJjGiyaJp1/0wXIwrvpBZePQ+1FA/LceGsZeK0MIYlEnp/VO387O/MuyM5WO
-						Kb9a5NEhrJtzDPiy1LN3lTyaBRNAa/6S9ejER3as6WK34OrR2BRsoHLPYnjJomn4
-						9uemTBzzKnSChFkaLl11zg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sal-shib-prod.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Primo Resource Discovery at University of Salford</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sal-shib-test.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/sal-shib-test.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 9677d27e..00000000
--- a/swamid-interfederations-2.0/sal-shib-test.hosted.exlibrisgroup.com-shib.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://sal-shib-test.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is an "University of Salford - Primo Test" Shibboleth SP for Ex Libris (UK) 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="2016-01-12T10:53:11Z">
-      <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://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Salford - Primo Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is a Test Shibboleth SP for Primo Resource Discovery at University of Salford</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAKhHDi1Wde/sMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMzEwHhcNMTUwMzIzMTU1NzA5WhcNMjUwMzIwMTU1NzA5WjASMRAw
-						DgYDVQQDEwdhaW8wMDMxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						4/0RKaaUdMCgBK5+SX/9L/ZXX2KxjMfp7ZxYz0VovDPzlQIlUN+IHUpovrVz26e8
-						Nb6vPfBz5tkPuNmSLxpczKZ2hS/p1F+qPrFJDx+bmMegdCSMYA04DUghxB0sCwfR
-						6hthSCYQV057UW8rRcsmMQa1O4+uX+Z2wN62/9vIiMCbXwBZPf/OYz/ElrkfGr+P
-						jcGaixk4aYo+hamcWEoj6z1hSoDPx3FIF+BKXjvY+/2/hy+Ua1tG8bfy2VFByur3
-						ryw8YeT0wNXwGEYR29P40xuCLlyhGFR43vwlsw/MYL0NJcgvnuG6EPciboS5r0TC
-						SuGrT+X25IEgVvBg1xrM4QIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDMxMB0G
-						A1UdDgQWBBTInhdrgTkzot8a/5AqpBZBWaXqZTANBgkqhkiG9w0BAQUFAAOCAQEA
-						JmaJQVhaEPetwhNHpGemPnTa3Wx74BQuv+bfuRjRkmfCytBRiHab5JdDnaJcETwk
-						K9zOBCYeczxYMuQVPAC0kmcWwPRx/fHu2aBQ6JB1xUGPJK8QxwQBfBwiP5v0GuSZ
-						7RkNy+mRmAHH6Wux06mC3o4fhL12qlw2WKqVHk5iK3+ku2ytsqmPX5LfA/NxT2lt
-						2gUrhELqzgsUkRPXLwTeZJ1I3SzrJr9iTOgnjB/scJUp5EFBuQuWFizTg0iCfL77
-						1nZCeVMiGP0nRXxb9l5+WVnuomPltvSWbmWetOsESzfHa0NDYRoD0Tcmo3HivT94
-						wcpDxFonOrfUYE8n7Dc8Gg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sal-shib-test.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Test Shibboleth SP for Primo Resource Discovery at University of Salford</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/salford.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/salford.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index c5c7eecc..00000000
--- a/swamid-interfederations-2.0/salford.idm.oclc.org-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://salford.idm.oclc.org/shibboleth">
-  <!--
-		This is a "University of Salford" EZproxy SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-08T07:44:57Z">
-      <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 ">
-    <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://login.salford.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEDjCCAvagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBnMR8wHQYDVQQDFBYqLnNh
-						bGZvcmQuaWRtLm9jbGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEo
-						MCYGCSqGSIb3DQEJARYZamFtZXMuaHV0Y2hpbnNvbkBvY2xjLm9yZzAeFw0xNTA1
-						MDUxMzMwMDVaFw0yNTA1MDQxMzMwMDVaMGcxHzAdBgNVBAMUFiouc2FsZm9yZC5p
-						ZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSgwJgYJKoZI
-						hvcNAQkBFhlqYW1lcy5odXRjaGluc29uQG9jbGMub3JnMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA1kUySsrv1+6UNChn/pAjQLGxNmiSee2KzjHE+2v6
-						Ey7Mj/C5PFogUsbKR7UGNpvk/y3Jg5xk9pjeeRV2nC8E8vjq96/svo8b/SubuAfW
-						U+8Fnie0BgKzmbrGgBR/UX2urqZV0Motf1TMpkKqxvvhLSCmjLxHEms+UXdE7DP+
-						kR9WnN9qsJ31YgzT0zi3voGVUajwWfviNudqOCHfC2dO5piuV1LmjEkn+hTox9Xh
-						7wr2P2lDaYGuX3V7t9vNvNLOss3fTxWsK0T3uCt+h/MSjNp0bT+vyUR23fRqgt9K
-						94ZDNrjLpu7AS07WvxEZpWeyKP+PLwMRXuZ3mKnICLiBJQIDAQABo4HEMIHBMB0G
-						A1UdDgQWBBQZ3Q0KOx50hbPkk02txlwfKEDRZzCBkQYDVR0jBIGJMIGGgBQZ3Q0K
-						Ox50hbPkk02txlwfKEDRZ6FrpGkwZzEfMB0GA1UEAxQWKi5zYWxmb3JkLmlkbS5v
-						Y2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxKDAmBgkqhkiG9w0B
-						CQEWGWphbWVzLmh1dGNoaW5zb25Ab2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zAN
-						BgkqhkiG9w0BAQUFAAOCAQEAJ1ipjSG8TTxBrltXSd7JRGLcI+YpC0H4icIr1Ybo
-						9ulwtNmc8nXRwd4s2Hf5hClZ2flb0+dar1x+0Ht48dQ0tRRUPsAlxChkkKJ8xMI3
-						CFGVRIkpeLPWfpvY9bvmwQxJXbGtwZwH516PaSQ2BaoD/jBliKs3gGtYTFW5G3f8
-						bFb1xmsJWRJ+T82M1Ayou4Pg4zt15DUh7mQG+vKanrCCxMOwp29OwPiIt5QPNPc1
-						7/DnFzG87+qTQcdqhzs5sVf+UbQEZZWfO2h3SETBJEeurGamU4hb7snRASKCqcw4
-						htEj3D0rPUXTvX36xmS+25M81EcZKM/3NPwnGJgmNUmhPw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.salford.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Salford Hosted EZProxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</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 5e950e67..00000000
--- a/swamid-interfederations-2.0/saml-1.sys.kth.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://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</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">KTH Royal Institute of Technology</mdui:DisplayName>
-        <mdui:Description xml:lang="en">KTH Royal Institute of Technology Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://saml-1.sys.kth.se/om.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://saml-1.sys.kth.se/about.html</mdui:InformationURL>
-        <mdui:Logo height="82" width="82">https://saml-1.sys.kth.se/logo-main.png</mdui:Logo>
-      </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="technical">
-    <Company>Royal Institute of Technology (KTH)</Company>
-    <EmailAddress>itesc@kth.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml-delegation.data.kit.edu-shibboleth.xml b/swamid-interfederations-2.0/saml-delegation.data.kit.edu-shibboleth.xml
deleted file mode 100644
index 69b94d7e..00000000
--- a/swamid-interfederations-2.0/saml-delegation.data.kit.edu-shibboleth.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://saml-delegation.data.kit.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-03T14:35:45Z">
-      <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>
-  </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="de">SAML Delegation</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SAML Delegation</mdui:DisplayName>
-        <mdui:Description xml:lang="de">SAML Delegation</mdui:Description>
-        <mdui:Description xml:lang="en">SAML Delegation</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>saml-delegation.data.kit.edu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=saml-delegation.data.kit.edu,O=Karlsruhe Institute of Technology,L=Karlsruhe,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGBjCCBO6gAwIBAgIHF7FBl8mW2DANBgkqhkiG9w0BAQsFADCBvzELMAkGA1UE
-BhMCREUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzESMBAGA1UEBxMJS2Fy
-bHNydWhlMSowKAYDVQQKEyFLYXJsc3J1aGUgSW5zdGl0dXRlIG9mIFRlY2hub2xv
-Z3kxJzAlBgNVBAsTHlN0ZWluYnVjaCBDZW50cmUgZm9yIENvbXB1dGluZzEPMA0G
-A1UEAxMGS0lULUNBMRkwFwYJKoZIhvcNAQkBFgpjYUBraXQuZWR1MB4XDTE0MDYw
-NjEzMzcxMVoXDTE3MDYwNTEzMzcxMVowgZExCzAJBgNVBAYTAkRFMRswGQYDVQQI
-ExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcTCUthcmxzcnVoZTEqMCgGA1UE
-ChMhS2FybHNydWhlIEluc3RpdHV0ZSBvZiBUZWNobm9sb2d5MSUwIwYDVQQDExxz
-YW1sLWRlbGVnYXRpb24uZGF0YS5raXQuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAupIPmAT/4ExIS3CVsY4ZjH3rG7Y8LxZ5iDEDcMqRhUco9d+v
-4e10NaRwPQUk+E9QqwwleWMHoQtejG0gPuapL8IqDSOu7z9ms+hkXJ0hLDQqDrsT
-tvm30y9bMllkScGpcmy3OTom3iL+/FmhOyDzwyW/QAPbR7b+kBDdAHNoPjUHR75l
-bdn0ruWn7TU1NUIdWkma3IdlngRHUcRySkGYDoSPQZP0PekQCZYi3ndP+KTOHaA2
-9HkcO/fUXohy4HIwwernltSttVkI9vw+Ki31x31lbMtnGOA1mvdeCOFssxGWoQwj
-HHlUnOJnnwI59aFo9GrjDfFP5X/Gki7IjJ2EzQIDAQABo4ICMTCCAi0wOQYDVR0g
-BDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeB
-DAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
-AgYIKwYBBQUHAwEwHQYDVR0OBBYEFIXstfJIO0zEeHL1bQ82yMdGzg3sMB8GA1Ud
-IwQYMBaAFB90ZfSaHXr2MenfYRtzKw1t0DNJMDYGA1UdEQQvMC2CHHNhbWwtZGVs
-ZWdhdGlvbi5kYXRhLmtpdC5lZHWBDWhhcmR0QGtpdC5lZHUwdwYDVR0fBHAwbjA1
-oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9raXQtY2EvcHViL2NybC9jYWNy
-bC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0
-cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAC
-hjNodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2tpdC1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUva2l0LWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAPTiFZNdF
-kBSlYR1zkgXDCEa5GTXN+/qoLAFMdzTXhJkX0hcjZ+XXB9jhFXtB5Pi0PiaPfzT5
-hAPIJwomSpmB8d5TX69e8MKWtAXcn8Rhk5bVUjcHUt9HcORq2srluD7/HfsittAk
-TCBn2gnlr4We33hQcPqeZQUqiOImbpySLYO2Gj/f/O5Us+IlFvBS15i2sLO4dbnL
-JVX1cCfkR6zXP1IRhPuCjNoNTglrCfnkkLnmGC2ggcDJV7leBR3awzRCEO5ruNKe
-JYUZPz1dlpf1fdFe9DLd7fRcHlL0ATTd87ebMw8hjJrYBVKqPIFu4YXnOikuweOl
-gwAMmqDbvXQigg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SLO/Artifact"/>
-    <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://saml-delegation.data.kit.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://saml-delegation.data.kit.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e148</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e148</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Karlsruher Institut für Technologie (KIT)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karlsruhe Institute of Technology (KIT)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.scc.kit.edu/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.scc.kit.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Marcus</md:GivenName>
-    <md:SurName>Hardt</md:SurName>
-    <md:EmailAddress>mailto:hardt@kit.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marcus</md:GivenName>
-    <md:SurName>Hardt</md:SurName>
-    <md:EmailAddress>mailto:hardt@kit.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.adu.edu.xml b/swamid-interfederations-2.0/saml.adu.edu.xml
deleted file mode 100644
index 10db5fab..00000000
--- a/swamid-interfederations-2.0/saml.adu.edu.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="https://saml.adu.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">adu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Adventist University of Health Sciences</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://my.adu.edu/university-services/information-technology/incommon-pop</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.adu.edu/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="204" width="600" xml:lang="en">https://saml.adu.edu/simplesaml/module.php/themeADU/logo.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>
-MIIGDTCCA/WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBjjEwMC4GA1UEChMnQWR2
-ZW50aXN0IFVuaXZlcnNpdHkgb2YgSGVhbHRoIFNjaWVuY2VzMR8wHQYDVQQLExZJ
-bmZvcm1hdGlvbiBUZWNobm9sb2d5MRMwEQYDVQQDEwpteS5hZHUuZWR1MSQwIgYJ
-KoZIhvcNAQkBFhVUcmF2aXMuV29vbGV5QGFkdS5lZHUwIBcNMTMwNDI2MTkyODAw
-WhgPOTk5OTEyMzEyMzU5NTlaMIGOMTAwLgYDVQQKEydBZHZlbnRpc3QgVW5pdmVy
-c2l0eSBvZiBIZWFsdGggU2NpZW5jZXMxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRl
-Y2hub2xvZ3kxEzARBgNVBAMTCm15LmFkdS5lZHUxJDAiBgkqhkiG9w0BCQEWFVRy
-YXZpcy5Xb29sZXlAYWR1LmVkdTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
-ggIBALsumguggo/U3tw1APweGbt11OzPYU3313EQRo98PsXau0iFWngNxyugRijR
-qcs4fcrZwSwF5x+FW3h/IkBGwluX7Tt3fPxAZ6qLv2MAhO5RuCvABG8X45sGn8wX
-os3nRLSDELDzvCeGTIWan1brMgA+DouM/2ubjt209ONT3Cdl5JdcHx+P6D+5jwQU
-ac2F8CAH9z1sAl4KFdWKOnIW16JH4ulL0l6uX6DZfUvYXJyAenh5kpQv+BjryD1d
-JKy5TFF2golwABwgXBh52+/0F4fc4riowzWDo3hwN5mjl5LsbIckmRDFTeOB7Q69
-70O1dNyuoPY6JoODaUprD/w0IFqMKIiOuQWT9ta/bhuKaXr+0sUDCxTMsXPb/Cwc
-GDtkJKU34k7rn+dAzzXrCtIxElrptkB2BgLdMlfumAIKozkMTiQkXTAonPyx3gBa
-NbiDOfT7/lnGDo+ezQNprK9TlgePBVGHa3i4sMCHhT9aVnLZ3QFQCweM5wSflc60
-GvxpHNzjnrgTSI5czdbzv0WmwRFmwT6Z7d9CZu0AXjCdG8FKOmY9DLd1JB38I0Df
-TzYIYNLksWMawxmxeRQJiTPskbYqFab9A3YyZq55qiDUdbUujqAW/ZIsStGULR2P
-Rf64oF8fQLrK8krPshxj10IpsM/bmqd3EwGhWHeLvRHifEBrAgMBAAGjcjBwMA8G
-A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFCjKM5x5QjrVDYppR2EwDP1KBN7xMAsG
-A1UdDwQEAwIBBjARBglghkgBhvhCAQEEBAMCAAcwHgYJYIZIAYb4QgENBBEWD3hj
-YSBjZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQUFAAOCAgEAkDasbLNaUg1BdZAGIRAS
-jK3A2yo0WoDvovEVRXps65aMQ1wzouKn3ZacF3jbbCWgeYeJHqUrDCs75ulR8nQH
-8EM6Z7w27AZmx44CCsMcx1VGhi9pBBZmmhJoZqqnHUryC5Yyraj8GHnmGzap1o7B
-3dptYJr0SChO+2sazHvwPpOTWeaVQSYL7AM80Ca/to/N/3N+LzxsiXcDibObYBD0
-p0ETiObdhWb4zg+12CRXlB6L6lLDb6H8GUXhMlUANOnuL/PW0d9KsqLYOgvvHhXD
-SczaJ6UOx8cQM4QyYsLRRGOErmEAd35e0Huiwa3WV+We66aIzF+FKfztDmehcQE3
-xV6R1d5ttBywgU+PQSzfpfmjV2xxhJyDPoO6rEP/g5hsUeGforuqkmawHk+YxNCu
-ZBQ4VAaQbKvYNvd1q590xIY//jlzOy419IZ4+u3ex0fJaUnRQFReqJjxUD2JcvqL
-AqDzO58FB1Tg+8JLfpTMtLXlFreg/Cm7LlI7TS4466P7TDSxaz+cS6nfLfM+iTtU
-Lo4rpxt3p3jugXN6mz0GFv+3XppUJecuZCGBAJQEiSR/R0l7qcjDfOy/poCdeeF2
-5bJhvZCLcJ3mFZrYriXzACi2qpHgNTEFPiaXZGhPk7tRQjV2flwIV9tjTNb7nFF2
-v37iXkv+oRVPop1y3YlvtgI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.adu.edu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.adu.edu/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Adventist University of Health Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Adventist University of Health Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://adu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:EmailAddress>saml.tech@my.adu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Administrative Support</md:GivenName>
-    <md:EmailAddress>saml.admin@my.adu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Information Technology</md:GivenName>
-    <md:EmailAddress>webmaster@adu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.dhbw-stuttgart.de.xml b/swamid-interfederations-2.0/saml.dhbw-stuttgart.de.xml
deleted file mode 100644
index c1358185..00000000
--- a/swamid-interfederations-2.0/saml.dhbw-stuttgart.de.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.dhbw-stuttgart.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>saml.dhbw-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=saml.dhbw-stuttgart.de,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)10,OU=GT02047221,O=saml.dhbw-stuttgart.de,C=DE,serialNumber=8DlruJ2IF/mhFpqYLylpPD997PWR-8v4</ds:X509SubjectName>
-          <ds:X509Certificate>MIID7TCCA1agAwIBAgIDD0d2MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
-MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
-aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwMjA5MTc1NzA2WhcNMTMwNDEyMDkxNTI0
-WjCB8zEpMCcGA1UEBRMgOERscnVKMklGL21oRnBxWUx5bHBQRDk5N1BXUi04djQx
-CzAJBgNVBAYTAkRFMR8wHQYDVQQKExZzYW1sLmRoYnctc3R1dHRnYXJ0LmRlMRMw
-EQYDVQQLEwpHVDAyMDQ3MjIxMTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
-bS9yZXNvdXJjZXMvY3BzIChjKTEwMS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
-YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEfMB0GA1UEAxMWc2FtbC5kaGJ3LXN0dXR0
-Z2FydC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/Cb4X+HgoA
-JoQTolxkVgYbENIo1RmroBO/VpTdCfpJ1r11e7f3Lp6v1SSQxvp/fLN1JWJn4OVk
-J8J2xrH3W4PuGf65Y0uiIPOoZEBNQrzHrLQLXRi9SD0LKXNuK2T2MEywMrQbeKRh
-sgrOjfHXzwNfnRl9rhxcimOQX7ha1BzRATSjvzHIf4Kxqgjgv7ZvGsutFaZGjbhn
-RPPsa+F9IPuqyuiM11yhu6aXd3CKmkVrJUd515DRUbzBrHeL5HRr5pkb+ykzIOER
-CfVtQt5PdXxLChw2hkEy/LEyiuJBQ06GI4vPtTs9Q2pHMfGCZGIMTsH+udQZ7Bs7
-GHhTshbtUDkCAwEAAaOBrjCBqzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0OBBYEFL65
-7xtAhIIVIC95jJGECLyofdLCMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
-Z2VvdHJ1c3QuY29tL2NybHMvc2VjdXJlY2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr
-0rKV10fYIyAQTzOYkJ/UMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAN
-BgkqhkiG9w0BAQUFAAOBgQAGmUarTBwrlr6zHF9p4GoORIaTUOw+mpGbMkn7KEE4
-1MqY2Ag0nJ9wml7iqjdgijImFdbaIGYTOLHN6/Q6g8HwUGlcsi9+JlSiQm2JNSn+
-XMVxhv0bLNnq9nI+vgT1nYgT9jDFUB+AoXHCz3BaIqa4psFtclA65BHPjcxBn0d5
-cA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml.dhbw-stuttgart.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.dhbw-stuttgart.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://saml.dhbw-stuttgart.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.dhbw-stuttgart.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml.dhbw-stuttgart.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.dhbw-stuttgart.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>saml.dhbw-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=saml.dhbw-stuttgart.de,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)10,OU=GT02047221,O=saml.dhbw-stuttgart.de,C=DE,serialNumber=8DlruJ2IF/mhFpqYLylpPD997PWR-8v4</ds:X509SubjectName>
-          <ds:X509Certificate>MIID7TCCA1agAwIBAgIDD0d2MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
-MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
-aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwMjA5MTc1NzA2WhcNMTMwNDEyMDkxNTI0
-WjCB8zEpMCcGA1UEBRMgOERscnVKMklGL21oRnBxWUx5bHBQRDk5N1BXUi04djQx
-CzAJBgNVBAYTAkRFMR8wHQYDVQQKExZzYW1sLmRoYnctc3R1dHRnYXJ0LmRlMRMw
-EQYDVQQLEwpHVDAyMDQ3MjIxMTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNv
-bS9yZXNvdXJjZXMvY3BzIChjKTEwMS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBW
-YWxpZGF0ZWQgLSBSYXBpZFNTTChSKTEfMB0GA1UEAxMWc2FtbC5kaGJ3LXN0dXR0
-Z2FydC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/Cb4X+HgoA
-JoQTolxkVgYbENIo1RmroBO/VpTdCfpJ1r11e7f3Lp6v1SSQxvp/fLN1JWJn4OVk
-J8J2xrH3W4PuGf65Y0uiIPOoZEBNQrzHrLQLXRi9SD0LKXNuK2T2MEywMrQbeKRh
-sgrOjfHXzwNfnRl9rhxcimOQX7ha1BzRATSjvzHIf4Kxqgjgv7ZvGsutFaZGjbhn
-RPPsa+F9IPuqyuiM11yhu6aXd3CKmkVrJUd515DRUbzBrHeL5HRr5pkb+ykzIOER
-CfVtQt5PdXxLChw2hkEy/LEyiuJBQ06GI4vPtTs9Q2pHMfGCZGIMTsH+udQZ7Bs7
-GHhTshbtUDkCAwEAAaOBrjCBqzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0OBBYEFL65
-7xtAhIIVIC95jJGECLyofdLCMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwu
-Z2VvdHJ1c3QuY29tL2NybHMvc2VjdXJlY2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr
-0rKV10fYIyAQTzOYkJ/UMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAN
-BgkqhkiG9w0BAQUFAAOBgQAGmUarTBwrlr6zHF9p4GoORIaTUOw+mpGbMkn7KEE4
-1MqY2Ag0nJ9wml7iqjdgijImFdbaIGYTOLHN6/Q6g8HwUGlcsi9+JlSiQm2JNSn+
-XMVxhv0bLNnq9nI+vgT1nYgT9jDFUB+AoXHCz3BaIqa4psFtclA65BHPjcxBn0d5
-cA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml.dhbw-stuttgart.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.dhbw-stuttgart.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Duale Hochschule Baden Württemberg Stuttgart</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DHBW Stuttgart</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dhbw-stuttgart.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Bernd</GivenName>
-    <SurName>Ziller</SurName>
-    <EmailAddress>root@dhbw-stuttgart.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Markus</GivenName>
-    <SurName>Bundschuh</SurName>
-    <EmailAddress>bundschuh@dhbw-stuttgart.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.dpsnc.net-idp-shibboleth.xml b/swamid-interfederations-2.0/saml.dpsnc.net-idp-shibboleth.xml
deleted file mode 100644
index 99c1855f..00000000
--- a/swamid-interfederations-2.0/saml.dpsnc.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://saml.dpsnc.net/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">dpsnc.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Durham Public Schools</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>
-MIIDJDCCAgygAwIBAgIVAJKP/CmfBsecSjqKa/pkTvBAHmrHMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnNhbWwuZHBzbmMubmV0MB4XDTEyMDYyNzIwNTU0MloX
-DTMyMDYyNzIwNTU0MlowGTEXMBUGA1UEAxMOc2FtbC5kcHNuYy5uZXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQDNi0EBwc0/4CscpNS9IIRqyucgRr
-abEytQRM85p0e/J0yF/nziTzxObaHecYiDG/2QtpVwC2u7uRW62uTDAizmvZzPp3
-bQUzflrMpta/GJn5fR2ZRd1Bs3ppq8jfGKjazxrD6EHdBYo0lvPi/TKWAnhbj5n9
-9pcOUbqeH/2pxuVZUIwrFyyZsX4oAz9dCnSfzeoOs2tTvYp9DjiClcM9R90zyHbz
-M5gELwyXXDiZf4kjNulzvvv+g1b1JEst9rCIOTOYLkj90zsbwD6jc0/kM3ViqXKi
-Ocd3AYrThuToGTyra7sApxLhhhGF54KmwEBMaLRGP7N6gwAUwKySMiJBAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnNhbWwuZHBzbmMubmV0hiVodHRwczovL3NhbWwuZHBz
-bmMubmV0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQClzvMIhBX+T5mSzRFaq5V
-HT59IzANBgkqhkiG9w0BAQUFAAOCAQEAcoo31/WHWiqpMuaA0AQx5MrkJYUgiKnF
-u6PBwHPQNfPISAm0xAPf28W07J0THE1p4mDwnT+By3033A0+Pus/vHVDqg0wmnpk
-5ScTJ0rmsAViFKKwoRqBCAz8ytyNp4b4QGjoSfPK4rYW3Uw97VstraauEgAjFky3
-nxzeSWEggus8QdOo6vTSxuSFMbVQ9v0XJbiteDoGWtRKicaGORAYG06f0T8XuOl0
-19dhPE5dRHvbFdwrqXP9J9lCM0JWfn6dUeRJ9cOBJwof0fLWYA7iMib/sSmWRczl
-1pf0MpKWCya3Su27sSYzkqhT3GuFK6L50NUT2Zjrn2QkkU6y5On/zg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml.dpsnc.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml.dpsnc.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://saml.dpsnc.net/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml.dpsnc.net/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml.dpsnc.net/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dpsnc.net</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAJKP/CmfBsecSjqKa/pkTvBAHmrHMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnNhbWwuZHBzbmMubmV0MB4XDTEyMDYyNzIwNTU0MloX
-DTMyMDYyNzIwNTU0MlowGTEXMBUGA1UEAxMOc2FtbC5kcHNuYy5uZXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQDNi0EBwc0/4CscpNS9IIRqyucgRr
-abEytQRM85p0e/J0yF/nziTzxObaHecYiDG/2QtpVwC2u7uRW62uTDAizmvZzPp3
-bQUzflrMpta/GJn5fR2ZRd1Bs3ppq8jfGKjazxrD6EHdBYo0lvPi/TKWAnhbj5n9
-9pcOUbqeH/2pxuVZUIwrFyyZsX4oAz9dCnSfzeoOs2tTvYp9DjiClcM9R90zyHbz
-M5gELwyXXDiZf4kjNulzvvv+g1b1JEst9rCIOTOYLkj90zsbwD6jc0/kM3ViqXKi
-Ocd3AYrThuToGTyra7sApxLhhhGF54KmwEBMaLRGP7N6gwAUwKySMiJBAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnNhbWwuZHBzbmMubmV0hiVodHRwczovL3NhbWwuZHBz
-bmMubmV0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQClzvMIhBX+T5mSzRFaq5V
-HT59IzANBgkqhkiG9w0BAQUFAAOCAQEAcoo31/WHWiqpMuaA0AQx5MrkJYUgiKnF
-u6PBwHPQNfPISAm0xAPf28W07J0THE1p4mDwnT+By3033A0+Pus/vHVDqg0wmnpk
-5ScTJ0rmsAViFKKwoRqBCAz8ytyNp4b4QGjoSfPK4rYW3Uw97VstraauEgAjFky3
-nxzeSWEggus8QdOo6vTSxuSFMbVQ9v0XJbiteDoGWtRKicaGORAYG06f0T8XuOl0
-19dhPE5dRHvbFdwrqXP9J9lCM0JWfn6dUeRJ9cOBJwof0fLWYA7iMib/sSmWRczl
-1pf0MpKWCya3Su27sSYzkqhT3GuFK6L50NUT2Zjrn2QkkU6y5On/zg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml.dpsnc.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Durham Public Schools</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Durham Public Schools</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://dpsnc.net/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Corwin Armstrong</md:GivenName>
-    <md:EmailAddress>corwin.armstrong@dpsnc.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Qasim Lone</md:GivenName>
-    <md:EmailAddress>qasim.lone@dpsnc.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Help Desk</md:GivenName>
-    <md:EmailAddress>help.desk@dpsnc.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml b/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
deleted file mode 100644
index 4d4e5a5d..00000000
--- a/swamid-interfederations-2.0/saml.edusafe.nordu.net.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.edusafe.nordu.net">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2015-06-04T14:43:01Z" 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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="da">Formålet er at muliggøre enkel oprettelse og håndtering af VPN'er.</mdui:Description>
-        <mdui:Description xml:lang="en">The purpose is to facilitate the easy creation and management of VPNs.</mdui:Description>
-        <mdui:DisplayName xml:lang="da">eduSAFE</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">eduSAFE</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDgzCCAmugAwIBAgIEdheO2zANBgkqhkiG9w0BAQsFADByMRAwDgYDVQQGEwdV bmtub3duMRAwDgYDVQQIEwdVbmtub3duMRAwDgYDVQQHEwdVbmtub3duMRMwEQYD VQQKEwprZXltYW5hZ2VyMRMwEQYDVQQLEwpvaW9zYW1sLXNwMRAwDgYDVQQDEwdV bmtub3duMB4XDTE2MDIwMzEyMzAzNFoXDTI1MTIxMjEyMzAzNFowcjEQMA4GA1UE BhMHVW5rbm93bjEQMA4GA1UECBMHVW5rbm93bjEQMA4GA1UEBxMHVW5rbm93bjET MBEGA1UEChMKa2V5bWFuYWdlcjETMBEGA1UECxMKb2lvc2FtbC1zcDEQMA4GA1UE AxMHVW5rbm93bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ5hrfBP CSKMhqgFBXUq0HLzLCXukjoP3CXaUj6uDYp1iYR3enV7TnX3uHOzPXcSvPsx4E50 hH58yEUQKuncECWPLsC4OYOWii0UvvC7yY3TcIwLu8yv4ThIwkR9a7cneAfz/5AO d7Lcf2nb3d4yW3oPCiZqWQ21MeKBsh61Cu72bwP0gtetShJu9stPBkkztbTbWlhL 4CQTbl1WowtrXo6+o2zbofcQz4xijW6uQJLsCJz8/RHsaF99OV5P4ioVmxb20kVZ ARtGKcf3rPrDALmjaY66FhoScxuuXTPdzlregXN0Wj55bJIVs2wyd6kGzcIqUkYW sLLYsZN1ysD+xsECAwEAAaMhMB8wHQYDVR0OBBYEFHMn1/gTgQf+nIzzdwjf3DBB mBEKMA0GCSqGSIb3DQEBCwUAA4IBAQCIwXubLDBN+fpWkuQ+RkTeo9CrC2eHd7ZP nnB+CnfUqiiaM8qr8aJsR8Ft16YBTIKganYOCrRZLtlzI5KfKf+2TM0zwinm03SB ee//5Zetj/TRDi64vbQ3X/TdomkFyDdD1Pg4pxIcMb3hmnuNI94ToFlXqCRKvIOJ VlgmqbYNPyj/aRPEvUtpiN+RrZUYPjQXrSDownJkks+5I8/ZodRZ5TFccQPsQRti spB/Tj/mY3fOUQfzKlCmd5QvziIbKa9yJheLWAgHyNDT07oy1KbfK+c8jU6KN+Hb NSY/TWRXqv7IIeDw/yJkTX4CD7q3UGi90sz4g9IptXjseJ827dQg</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://edusafe.nordu.net/saml/LogoutServiceHTTPRedirect"/>
-    <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" index="0" Location="https://edusafe.nordu.net/saml/SAMLAssertionConsumer"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="da">eduSAFE</md:ServiceName>
-      <md:ServiceName xml:lang="en">eduSAFE</md:ServiceName>
-      <md:ServiceDescription xml:lang="da">Formålet er at muliggøre enkel oprettelse og håndtering af VPN'er.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">The purpose is to facilitate the easy creation and management of VPNs.</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Danish e-Infrastructure Cooperation</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Danish e-Infrastructure Cooperation</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.deic.dk/</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/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 92386638..00000000
--- a/swamid-interfederations-2.0/saml.hhs.nl-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.hhs.nl/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-01T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Haagse Hogeschool</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Hague University</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Haagse Hogeschool</mdui:Description>
-        <mdui:Description xml:lang="en">Haagse Hogeschool</mdui:Description>
-        <mdui:Logo height="22" width="108">https://static.surfconext.nl/logos/idp/hhs.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Haagse Hogeschool hhs Hague</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Haagse Hogeschool hhs Hague</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/31c58f27e40bd14fe7f81df7725e9a66"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Haagse Hogeschool</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Haagse Hogeschool</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dehaagsehogeschool.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/saml.nelnet.net.xml b/swamid-interfederations-2.0/saml.nelnet.net.xml
deleted file mode 100644
index 36086065..00000000
--- a/swamid-interfederations-2.0/saml.nelnet.net.xml
+++ /dev/null
@@ -1,66 +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://saml.nelnet.net">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">nelnet.net</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Nelnet Business Solutions</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>
-MIIDWDCCAkCgAwIBAgIGAU9vsMY4MA0GCSqGSIb3DQEBBQUAMG0xCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJORTEQMA4GA1UEBxMHTGluY29sbjEMMAoGA1UEChMDTkJTMQ8wDQYDVQQLEwZOZWxuZXQx
-IDAeBgNVBAMTF2dhdGVrZWVwZXIuZmFjdHNtZ3QuY29tMB4XDTE1MDgyNzE1MDUwMFoXDTMwMDgy
-MzE1MDUwMFowbTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk5FMRAwDgYDVQQHEwdMaW5jb2xuMQww
-CgYDVQQKEwNOQlMxDzANBgNVBAsTBk5lbG5ldDEgMB4GA1UEAxMXZ2F0ZWtlZXBlci5mYWN0c21n
-dC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGQxjqEEROxaQ/YOWU7N2KHtVg
-IVVUmSqKMzRZS6v0wIUsAd01dPFAVYTf/3tc5keT3QG+PIni3fGVpG3HZtv8GLJxpmOx8iKskKyh
-VOyBRyZ/2QHZ/OE5OMB2xGU18cohS+J7UOBfaTRC//0+8QUxRwLRcyIYh0OKma988fzYHRPbqelC
-wK3Yi8TjO8f1z3Qfk5bASKih4L2xSBjHb6PQKt9s/lxE8nRipCSTFPLmUGWx3rpN4pD667o8W+oY
-xwq3p7eAdbpxtBuXLBOJIlGJfCbYd+uPb8M/fMSkQO0xTobc27Y5fIbU+OY5lgJ2iKtg40yAmgRY
-X7fKIMQWBC0LAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAIcbxm8c5r877rN8GqvZCBIdRX8ZH/rB
-QJ7WQ0Lrr96OEy/Gq5e7ON5f4NxOJdgrpDSThJKmNxtdwWAWZ1aqIQx8NiNlI2nGOdixrBaYnjMf
-Md8rH2VyQc5dLAxyNFfNmKprtXXDZf2pjR8JX8lWMcSDGUZ/++jUFlKRnS3+Dt1WYomoFVdYvZWr
-1w1dv2dWphbdCP82uqVYvQ/sEDHyrg9Yk5TNKzJcYsD2Au+l6z4hOHEEZpbX0Ry83pLeRzmrMof7
-Cmhe6LS64j//8rgjaSgsAZ037lKxMS9mlc38UZqnGQDl0Q6x+hzbfJc0Xoo0vS7Lj0bVoxybNIV9
-LxKK+M8=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gatekeeper.factsmgt.com/idp/SSO.saml2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gatekeeper.factsmgt.com/idp/SSO.saml2"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Nelnet Business Solutions</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Nelnet Business Solutions</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nelnet.net/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Todd Bryant</md:GivenName>
-    <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Todd Bryant</md:GivenName>
-    <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Todd Bryant</md:GivenName>
-    <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Todd Bryant</md:GivenName>
-    <md:EmailAddress>todd.bryant@nelnet.net</md:EmailAddress>
-  </md: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 94826e13..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 GÉANT 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">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</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 50c2269c..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 GÉANT 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">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.psui.geant.net.xml b/swamid-interfederations-2.0/saml.psui.geant.net.xml
deleted file mode 100644
index 00092f57..00000000
--- a/swamid-interfederations-2.0/saml.psui.geant.net.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.psui.geant.net">
-  <!--
-		This is a perfsonarUI SP for GÉANT Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-10T12:37:33Z">
-      <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</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GÉANT perfSONAR UI - production instance</mdui:Description>
-        <mdui:Logo height="31" width="167" xml:lang="en">https://psui.geant.net/perfsonar-ui/images/PerfSONAR_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>
-						MIIDFjCCAf6gAwIBAgIJAN9/NobZhv1lMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDnBzdWkuZ2VhbnQubmV0MB4XDTE1MDUyOTEwMTM1NFoXDTE4MDUyOTEwMTM1
-						NFowGTEXMBUGA1UEAxMOcHN1aS5nZWFudC5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQC/DCw/1JxfAz3Dpp3Q/zLyuPtRVaYPQT2ddBmgXLEVddHs
-						weuAtQwqYfKw0UwzlW8GQqLAELFOctvdrkbh6cCBW4DAXE2Yrmm6cm4KazqpirGA
-						LnuVgFhDOV2+KhICHKc3k7wx+cEm7WioI7DBzQt85SvN6F6uRcG1GJnQK3VsYiJm
-						F8zIxwehfOCYJZ2MfMt5kUrQsSFt91KXdD8LeRsy+dZd3gMhgI1BoI1VyJ54WYXQ
-						l6LeTbm4QwvM1onXZAsEjpRIeVz5Rx04OQ+rrQQNwwTOE9iYbGXF2g7QnBa5iR+L
-						kHZ+tnXUt9hqdKyAi7OHSRFf/JeAaB7S57SjEe1XAgMBAAGjYTBfMD4GA1UdEQQ3
-						MDWCDnBzdWkuZ2VhbnQubmV0hiNodHRwczovL3BzdWkuZ2VhbnQubmV0L3BlcmZz
-						b25hci11aTAdBgNVHQ4EFgQU1XC0//JNvtRDdrsHlh0kLa17r58wDQYJKoZIhvcN
-						AQEFBQADggEBAKVs3COLHUybIBeLqkX/ngTqV7JhDVWENFPHD1V8RE4rCg3p2V5H
-						5WcO2wp3LWX+EugPna4FM3aaNKz0kFhDfj/nfQC4Ag7GLJSxLByocHsFeMmA+F+n
-						uGugxqBe9nTF0tTTG+fasLWJ9fDaMBNORxhDxIpESXB7aa8UA8khtdh8Ibmm5aRD
-						Pa2pDQziTdFP18/C0TXWkps0dAW1pvDtSCRXoMDv/L++5WE80TrYW3SlFLGXNI0q
-						UnhRIlC2dWAGrVInFFpZw4gXAAIpgrZRXd22tni7dxcqHy3Dbw5TmHE3w12OB6iT
-						kfAkynNfVcuzg3d1hf1dNs0DGW5uSY68hFk=
-					</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>
-						MIIDFjCCAf6gAwIBAgIJAN9/NobZhv1lMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDnBzdWkuZ2VhbnQubmV0MB4XDTE1MDUyOTEwMTM1NFoXDTE4MDUyOTEwMTM1
-						NFowGTEXMBUGA1UEAxMOcHN1aS5nZWFudC5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQC/DCw/1JxfAz3Dpp3Q/zLyuPtRVaYPQT2ddBmgXLEVddHs
-						weuAtQwqYfKw0UwzlW8GQqLAELFOctvdrkbh6cCBW4DAXE2Yrmm6cm4KazqpirGA
-						LnuVgFhDOV2+KhICHKc3k7wx+cEm7WioI7DBzQt85SvN6F6uRcG1GJnQK3VsYiJm
-						F8zIxwehfOCYJZ2MfMt5kUrQsSFt91KXdD8LeRsy+dZd3gMhgI1BoI1VyJ54WYXQ
-						l6LeTbm4QwvM1onXZAsEjpRIeVz5Rx04OQ+rrQQNwwTOE9iYbGXF2g7QnBa5iR+L
-						kHZ+tnXUt9hqdKyAi7OHSRFf/JeAaB7S57SjEe1XAgMBAAGjYTBfMD4GA1UdEQQ3
-						MDWCDnBzdWkuZ2VhbnQubmV0hiNodHRwczovL3BzdWkuZ2VhbnQubmV0L3BlcmZz
-						b25hci11aTAdBgNVHQ4EFgQU1XC0//JNvtRDdrsHlh0kLa17r58wDQYJKoZIhvcN
-						AQEFBQADggEBAKVs3COLHUybIBeLqkX/ngTqV7JhDVWENFPHD1V8RE4rCg3p2V5H
-						5WcO2wp3LWX+EugPna4FM3aaNKz0kFhDfj/nfQC4Ag7GLJSxLByocHsFeMmA+F+n
-						uGugxqBe9nTF0tTTG+fasLWJ9fDaMBNORxhDxIpESXB7aa8UA8khtdh8Ibmm5aRD
-						Pa2pDQziTdFP18/C0TXWkps0dAW1pvDtSCRXoMDv/L++5WE80TrYW3SlFLGXNI0q
-						UnhRIlC2dWAGrVInFFpZw4gXAAIpgrZRXd22tni7dxcqHy3Dbw5TmHE3w12OB6iT
-						kfAkynNfVcuzg3d1hf1dNs0DGW5uSY68hFk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://psui.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://psui.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://psui.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://psui.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">GÉANT perfSONAR UI</ServiceName>
-      <ServiceDescription xml:lang="en">GÉANT perfSONAR UI - production 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="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="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">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT perfSONAR UI</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>PerfSONAR developers</GivenName>
-    <EmailAddress>mailto:amres-perfsonar@rcub.bg.ac.rs</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>PerfSONAR developers</GivenName>
-    <EmailAddress>mailto:amres-perfsonar@rcub.bg.ac.rs</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml
deleted file mode 100644
index d7bc2309..00000000
--- a/swamid-interfederations-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.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>
-  <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">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="166" width="166">https://saml.sys.kth.se/idp/images/logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">stockholm</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAOHnWp4SJR1ucFuzdVgffOjOdhbCMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNhbWwtMi5zeXMua3RoLnNlMB4XDTE0MDMyNDEyNDE1
-OFoXDTM0MDMyNDEyNDE1OFowHDEaMBgGA1UEAxMRc2FtbC0yLnN5cy5rdGguc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCBH0+OjrfAPCqpnnbg/DWA
-xeYXkv8kKpi2qR5cF6O4mA38n7bYwogiu8dfX96D+PoJeXIT7JTlDLCCdzEsGwUK
-vPqpTpVD2RcOSfZY/yU6CK2dv5LdRqoB1iCZDg1hkvBpDpchSIJjw4CQrQxrTpJO
-XY2FE9E2UnaskX3UJ0mnpBicRQ6aARbPJtwbvMTPynDlI+TZVxnpQ71mn6+VVIgE
-mUBzZZy2S8DR7ihY8IioceEXnn8Pj072fbrYAbZcZPIfKiDJwx0A77rp2mAMKPRS
-tP3Z6xAaOEzwZQmXCS+evNMfyHEIPoj1sug5xDBqQx7RDFYVo6oxXEJ9f+z1evKz
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNhbWwtMi5zeXMua3RoLnNlhihodHRwczov
-L3NhbWwtMi5zeXMua3RoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRplyH7
-GQb3f40/3+jtNHO+xRON1jANBgkqhkiG9w0BAQUFAAOCAQEAIIHu+ayuE6ydI1pE
-F9Vx6Z3MGI8exqT5j8Zw/6IrURTGWbkRMcW/7loquuv6A62R7ZZzd6/ghZuh43vI
-j7VGLrmH/frz5+HvU1PRbpV0u8dkjfOvzAlXxE4qB2nXd+rWzVX5ZugoPtl+iMeV
-D005TFeUFavEdpQb0xk3eg5y06P66fiY++ewjyfJNgBrhEChMPPOd3MhTj3Sj2sa
-B7aUMBV4hT03YJmQt+jHO5Pim7pP2AQ/+AmGTixyRs1b4bryD+N/y+FOy7LEd8aO
-X+V6LngODeVrf80YJynJQRppJlSS8ecu8xbM/9GY1o37vXfDLUJVJ21ENC6DxwWe
-x7JUFw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://saml-2.sys.kth.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-2.sys.kth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-2.sys.kth.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">kth.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAOHnWp4SJR1ucFuzdVgffOjOdhbCMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNhbWwtMi5zeXMua3RoLnNlMB4XDTE0MDMyNDEyNDE1
-OFoXDTM0MDMyNDEyNDE1OFowHDEaMBgGA1UEAxMRc2FtbC0yLnN5cy5rdGguc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCBH0+OjrfAPCqpnnbg/DWA
-xeYXkv8kKpi2qR5cF6O4mA38n7bYwogiu8dfX96D+PoJeXIT7JTlDLCCdzEsGwUK
-vPqpTpVD2RcOSfZY/yU6CK2dv5LdRqoB1iCZDg1hkvBpDpchSIJjw4CQrQxrTpJO
-XY2FE9E2UnaskX3UJ0mnpBicRQ6aARbPJtwbvMTPynDlI+TZVxnpQ71mn6+VVIgE
-mUBzZZy2S8DR7ihY8IioceEXnn8Pj072fbrYAbZcZPIfKiDJwx0A77rp2mAMKPRS
-tP3Z6xAaOEzwZQmXCS+evNMfyHEIPoj1sug5xDBqQx7RDFYVo6oxXEJ9f+z1evKz
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNhbWwtMi5zeXMua3RoLnNlhihodHRwczov
-L3NhbWwtMi5zeXMua3RoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRplyH7
-GQb3f40/3+jtNHO+xRON1jANBgkqhkiG9w0BAQUFAAOCAQEAIIHu+ayuE6ydI1pE
-F9Vx6Z3MGI8exqT5j8Zw/6IrURTGWbkRMcW/7loquuv6A62R7ZZzd6/ghZuh43vI
-j7VGLrmH/frz5+HvU1PRbpV0u8dkjfOvzAlXxE4qB2nXd+rWzVX5ZugoPtl+iMeV
-D005TFeUFavEdpQb0xk3eg5y06P66fiY++ewjyfJNgBrhEChMPPOd3MhTj3Sj2sa
-B7aUMBV4hT03YJmQt+jHO5Pim7pP2AQ/+AmGTixyRs1b4bryD+N/y+FOy7LEd8aO
-X+V6LngODeVrf80YJynJQRppJlSS8ecu8xbM/9GY1o37vXfDLUJVJ21ENC6DxwWe
-x7JUFw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://saml-2.sys.kth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-2.sys.kth.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">KTH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kth.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>KTH Royal Institute of Technology</md:Company>
-    <md:SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</md:SurName>
-    <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>KTH Royal Institute of Technology</md:Company>
-    <md:SurName>UF/ITA Infra (Alexander Boström, Hans Berggren, Jonas Andersson)</md:SurName>
-    <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>KTH Royal Institute of Technology</md:Company>
-    <md:SurName>KTH IT-Support</md:SurName>
-    <md:EmailAddress>mailto:it-support@kth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 790 6600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml
deleted file mode 100644
index eb19f80b..00000000
--- a/swamid-interfederations-2.0/saml.uvt.nl-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.uvt.nl/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-25T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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 van Tilburg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Tilburg University</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Universiteit van Tilburg</mdui:Description>
-        <mdui:Description xml:lang="en">Tilburg University</mdui:Description>
-        <mdui:Logo height="44" width="108">https://static.surfconext.nl/logos/idp/uvt.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">universiteit tilburg van university uvt tiu kub kht tias nimbas tiasnimbas</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">universiteit tilburg van university uvt tiu kub kht tias nimbas tiasnimbas</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/59b5bae75a0f1404d48d70dbde8a130e"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Tilburg University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Tilburg University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.tilburguniversity.edu</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/saml.xi.dante.org.uk.xml b/swamid-interfederations-2.0/saml.xi.dante.org.uk.xml
deleted file mode 100644
index 35d834fb..00000000
--- a/swamid-interfederations-2.0/saml.xi.dante.org.uk.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://saml.xi.dante.org.uk">
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICIjCCAYugAwIBAgIGASxQBrXyMA0GCSqGSIb3DQEBBQUAMCoxEzARBgNVBAoMCmtleW1hbmFn
-ZXIxEzARBgNVBAsMCm9pb3NhbWwtc3AwHhcNMTAxMTE1MTQ1MzI1WhcNMjAxMTEyMTQ1MzI1WjA7
-MSQwIgYDVQQDDBtodHRwOi8vc2FtbC54aS5kYW50ZS5vcmcudWsxEzARBgNVBAsMCm9pb3NhbWwt
-c3AwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJinj+SozzKBNhSg40xbOnMk9VLKKma/5jXY
-6yNSFFeBnCEMDCnWuIc/BL3g8KtJX01aKluaMdyNQoP1hia5r78ZcG0Vcp1jOTnJXY/XGaE/kxeP
-qfIbbzzA+nZWreBu9w423/DFIzLbCK3JeGuddWOaWOcX1keei0fv1HRmZSB9AgMBAAGjQjBAMB0G
-A1UdDgQWBBQhcMfYZwDSCe65OGFUGE3JeAEgBDAfBgNVHSMEGDAWgBQhcMfYZwDSCe65OGFUGE3J
-eAEgBDANBgkqhkiG9w0BAQUFAAOBgQAzhIMRgmMw77Cchf0vmNK1MFotbPgMMLZKclc+ymUiELM2
-VmkNFA7cgoshLkEZzz7m0NuBLo5huNvGicSZvVhho+/hH334eerUWQP6htIqELZcd4/+ANwEnS+w
-yipEWt8Iv9QjHhFCC3A/RUxjica16KQmOfTmJnHRdcq2kmzqiA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIICIjCCAYugAwIBAgIGASxQBrXyMA0GCSqGSIb3DQEBBQUAMCoxEzARBgNVBAoMCmtleW1hbmFn
-ZXIxEzARBgNVBAsMCm9pb3NhbWwtc3AwHhcNMTAxMTE1MTQ1MzI1WhcNMjAxMTEyMTQ1MzI1WjA7
-MSQwIgYDVQQDDBtodHRwOi8vc2FtbC54aS5kYW50ZS5vcmcudWsxEzARBgNVBAsMCm9pb3NhbWwt
-c3AwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJinj+SozzKBNhSg40xbOnMk9VLKKma/5jXY
-6yNSFFeBnCEMDCnWuIc/BL3g8KtJX01aKluaMdyNQoP1hia5r78ZcG0Vcp1jOTnJXY/XGaE/kxeP
-qfIbbzzA+nZWreBu9w423/DFIzLbCK3JeGuddWOaWOcX1keei0fv1HRmZSB9AgMBAAGjQjBAMB0G
-A1UdDgQWBBQhcMfYZwDSCe65OGFUGE3JeAEgBDAfBgNVHSMEGDAWgBQhcMfYZwDSCe65OGFUGE3J
-eAEgBDANBgkqhkiG9w0BAQUFAAOBgQAzhIMRgmMw77Cchf0vmNK1MFotbPgMMLZKclc+ymUiELM2
-VmkNFA7cgoshLkEZzz7m0NuBLo5huNvGicSZvVhho+/hH334eerUWQP6htIqELZcd4/+ANwEnS+w
-yipEWt8Iv9QjHhFCC3A/RUxjica16KQmOfTmJnHRdcq2kmzqiA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://xi.dante.org.uk:9080/oiosaml-demo/saml/LogoutServiceHTTPRedirect" ResponseLocation="http://xi.dante.org.uk:9080/oiosaml-demo/saml/LogoutServiceHTTPRedirectResponse"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://xi.dante.org.uk:9080/oiosaml-demo/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">DANTE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">DANTE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://dante.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>DANTE</md:Company>
-    <md:EmailAddress>mandeep@dante.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/samlidp-its.ocad.ca-8443-idp-shibboleth.xml b/swamid-interfederations-2.0/samlidp-its.ocad.ca-8443-idp-shibboleth.xml
deleted file mode 100644
index 731855ea..00000000
--- a/swamid-interfederations-2.0/samlidp-its.ocad.ca-8443-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://samlidp-its.ocad.ca:8443/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2014-08-14T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.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">ocad.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">OCAD University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ocadu.ca/about_ocad.htm</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIVAPRpRT0TrCPgXOSWUxrZTtTEeomRMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNhbWxpZHAtaXRzLm9jYWQuY2E6ODQ0MzAeFw0xNDA3
-MDgxNDE1MThaFw0zNDA3MDgxNDE1MThaMCMxITAfBgNVBAMTGHNhbWxpZHAtaXRz
-Lm9jYWQuY2E6ODQ0MzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ7X
-oFLpNI6mfEuOV2Y0Jx4dVi2t+VDHUahlmlf5r2IAascQMuJDmmAGgoq3SDQHcpvA
-R1JkEgAx8hAFys28faaWxNyfQezZNha/WflMEdcnMPGDKpSuH9zqZnkwm/7VwEIs
-JH+14u4AnjVAZTZdHtl6DIPvUql4GImhOW8SRQeriVhBtInqnCA/AKY9UGKK4JIr
-Fno/Opmqjo1T96gSiioyfGUhSW3uPzmFj8Xabl0xUt06EjkFMP/p91+vgzIEvg/9
-PMval4Mw0i/syuMfVG6QHQRfWszuIuSyxVbg65jINkeySHpRkQWelp+E2UDy77vJ
-zJk2SK+YzgXYtfHmr5cCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2FtbGlkcC1pdHMu
-b2NhZC5jYTo4NDQzhi9odHRwczovL3NhbWxpZHAtaXRzLm9jYWQuY2E6ODQ0My9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUbJEIUMmVvHdI5G0vBFKtNUKz0bcwDQYJ
-KoZIhvcNAQEFBQADggEBAAPkUGthYxClJBy88O6uAq0WSObQ3w6Usbw2tRG47VQP
-UHe3sTXU/UgXKjQrgRDvMoyNW9y4EBm/+7+THAhTRTAISlhixId06csKJ3AW5WWS
-LVrezH22u+9M28AnTnxgH2BbhwkeSD6YZsPPXOySK6ivADlwPjgvxr4jxrZ4ioRS
-cQX0Ii9rS7spjxCmbicvlVfXl5Oe79NdtO+NcxQbRfU3QYHZap0lDVaZd+6zLXXU
-k5TIaeFkSh3RLdm4kBlaLFXzepvESschTHTfbH/PHntSGOYJVRGV34yKUEaG/mSQ
-KA9ippT+XCdKL7aFElL/FkA9Welvsk7w/EHZoo8Ixls=
-         </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SLO" ResponseLocation="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca: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://samlidp-its.ocad.ca:8443/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlidp-its.ocad.ca:8443/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">ocad.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAo2gAwIBAgIDDC/fMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
-MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
-aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDkwNzI5MTM0NDQ0WhcNMTEwOTI5MTMwOTEy
-WjCBrjELMAkGA1UEBhMCQ0ExEjAQBgNVBAoUCSoub2NhZC5jYTETMBEGA1UECxMK
-R1QxMjE4MTcwMTExMC8GA1UECxMoU2VlIHd3dy5yYXBpZHNzbC5jb20vcmVzb3Vy
-Y2VzL2NwcyAoYykwOTEvMC0GA1UECxMmRG9tYWluIENvbnRyb2wgVmFsaWRhdGVk
-IC0gUmFwaWRTU0woUikxEjAQBgNVBAMUCSoub2NhZC5jYTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEApHxUZXD1VIVnpsVhmLRbKiUcf6ANdA7pbSwxCMECl+wu
-JhynMaHhiCkED8nWTkGAZ9ueSvcd8PURDpFHMFfsMPr1Q5ZN22fizxEP4+G0hbs6
-loh1WJBzJUuYXFtLftuSzOCJ1VhI00l2+38sjAWLDrJlRrIDl+lMFa6EpOy8LacC
-AwEAAaOBrjCBqzAOBgNVHQ8BAf8EBAMCBPAwHQYDVR0OBBYEFEy0g9UjmGGasnEQ
-BNdtChLTXsi2MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2VvdHJ1c3Qu
-Y29tL2NybHMvc2VjdXJlY2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr0rKV10fYIyAQ
-TzOYkJ/UMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
-AQUFAAOBgQBl1lnGQv6nOHC2Y/IyubqnlOBSW5dbSFSn3pvrxvuL24b1MR0XA+28
-hui8jdimOzGIOWS4+ShIXaO6rAaugPpMxFU+DArOHPJ9xjolw86bFdh6Z1xhLg9P
-lOKqmQXDe3+pEod35AFdmKjRVSbliDv5BZ2lN7GVDTzea0f66nblvQ==
-           </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://samlidp-its.ocad.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlidp-its.ocad.ca: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">OCAD University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">OCAD University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ocadu.ca/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Matthew Kwasnicki</md:SurName>
-    <md:EmailAddress>mkwasnicki@ocadu.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/samlviewer.cf.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/samlviewer.cf.ac.uk-shibboleth.xml
deleted file mode 100644
index 84e93919..00000000
--- a/swamid-interfederations-2.0/samlviewer.cf.ac.uk-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://samlviewer.cf.ac.uk/shibboleth">
-  <!--
-		This is a SAML Viewer Shibboleth SP for Cardiff University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-15T09:55:20Z"/>
-  </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://samlviewer.cf.ac.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://samlviewer.cf.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJAItfjPqmm9zNMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3NhbWx2aWV3ZXIuY2YuYWMudWswHhcNMTIwNTEyMTI0ODUzWhcNMjIwNTEw
-						MTI0ODUzWjAeMRwwGgYDVQQDExNzYW1sdmlld2VyLmNmLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA41cEtiZIZyvzKrakm60sIuweLpKd4xDx
-						vINqrj2C0zh8Gd9OeTElNSsHvJIKMezm1CnTBvWcd0F0tK9Mz0DADQLwcDVG+KuU
-						yNHAMp94uTCKz5eqCLLl7M+A0fX7E1DugtnqI8qClpOxs3D7WJijKfy6yUz0q2ac
-						a5uXGueKC47EHUrU1TsavzpQjNSAMC4L2J7dS4HAIt36T7Lo61+HRrdDC2Jh0fVq
-						MC9a+Qt2C5pusWHv9zi4YXTicoAhByZ/Trz/ijU+LhZpQ3m3hpKDx6SEgCnHTSRk
-						/d8cDFr0Npa7njU7mKYq8ago2/nBMZCBiguWSLwr9c6L+SaEDqcaVQIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNzYW1sdmlld2VyLmNmLmFjLnVrMB0GA1UdDgQWBBSDis4a
-						NupQl7nNT9JwJ5E2m0HmczANBgkqhkiG9w0BAQUFAAOCAQEAd4fBqInXGnQ7Kdf8
-						yqdauBjEjVJASJ6N9GB86tBXbtVM0+iIJvDOmpLW6s2Ovq+/DkXvroDAUu/G7Rre
-						ZSxpgN5oz6XwSiMDxeJGPgSF35/c/Q5A/fKiq4b/mKWllUVhX9UqRa5LiJbllmdq
-						BIVHSoP90oksNnRHSsBbQXvqaoVZgFNgCDX6c/NYmX+CwQB4vMnSKTWN0EoCcZI+
-						uZB7Oj929YrcQ17FRcBp7KLu6jPQEqUpqiwmRTy1KEvUT48h33zw+6dfgnmlqvpA
-						gDjmryhzc9dI92jTLhORxBe7IIEYYFFBHt5w/jkj0ByL+ocWimhzW88rk+gayroy
-						T3DN4A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://samlviewer.cf.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Cardiff University SAML Viewer</ServiceName>
-      <ServiceDescription xml:lang="en">
-				This service provider allows you to see the attributes the attributes released to it by your Identity Provider.
-			</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="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"/>
-      <RequestedAttribute FriendlyName="uid" Name="urn:mace:dir:attribute-def:uid" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace: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="memberOf" 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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff University: SAML Viewer</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cardiff.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Identity Management</GivenName>
-    <EmailAddress>mailto:idman@cardiff.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Philip </GivenName>
-    <SurName>Smart</SurName>
-    <EmailAddress>mailto:smartp@cardiff.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sandbox-eu.alma.exlibrisgroup.com-mng-login.xml b/swamid-interfederations-2.0/sandbox-eu.alma.exlibrisgroup.com-mng-login.xml
deleted file mode 100644
index 59d0e0b5..00000000
--- a/swamid-interfederations-2.0/sandbox-eu.alma.exlibrisgroup.com-mng-login.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://sandbox-eu.alma.exlibrisgroup.com/mng/login">
-  <!--
-		This is an "Ex Libris Alma (Sandbox) - The Next-Generation Library Services Framework" Own Implementation SP for Ex Libris (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-14T14:48:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEUDCCArigAwIBAgIEUWQ+bzANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJJ
-						TDESMBAGA1UECBMJSmVydXNhbGVtMRIwEAYDVQQHEwlKZXJ1c2FsZW0xETAPBgNV
-						BAoTCEV4bGlicmlzMQ0wCwYDVQQLEwRBbG1hMREwDwYDVQQDEwhTQU1MIEpLUzAe
-						Fw0xMzA0MDkxNjE0MzlaFw0yMzA0MDcxNjE0MzlaMGoxCzAJBgNVBAYTAklMMRIw
-						EAYDVQQIEwlKZXJ1c2FsZW0xEjAQBgNVBAcTCUplcnVzYWxlbTERMA8GA1UEChMI
-						RXhsaWJyaXMxDTALBgNVBAsTBEFsbWExETAPBgNVBAMTCFNBTUwgSktTMIIBojAN
-						BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAkZEP11/7z1BnlfvByEfwmvkEeWdS
-						4h0500whQeaSyLAeIQLnBvv0AL+yrnHUCQhdXtuKcB2KP1hHkORujT/AoyX5KaV6
-						iO+afUWdMfePg6nHRXhg/Efpkg4pzq1suDRNlY36nloFU39LHMTDOm6fc6cli5/h
-						v0mSgEI3rwTQRYKxe3gt7Yx2HCnyehxdEMYxxLgTUst+fnDvlJ8XSeLcIgwMe8S6
-						5tDQJDxCSumDG9gLv4mHIeIWKbAaX3boeDKXM0cj7k1MA0ppDjXZiYeTeM11c3A9
-						YNHnosQPN03vKl2Z38Qtg5wBJfGKxbI9mmO517iLpZWw0ppnW0VuxOuzUoIRRgM8
-						H9Ic4MdrHrOBpdkjTdiC5P6Dy9CvPsKAf53L2olwlWtv0fAljQ1Zd7tABvUjzOHD
-						I+oGLmP5JKt42Pr1xQtA3HEm6Gdi7CMclBAFqOb//xt9fmCh6o8Elxr4p70qU48S
-						hZAXj5G1oykPWWL0Z9/Jf106wQ4fK5ePxhapAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggGBAIfkCOJbJuchcJJOQVa1Ryw6T5MDdOS81uZW8MyFRlBI9bB0CfcM0BcddzFs
-						WAGslqQra8XWpTQXUrkyY+Uqt5pM1fIupPciVoeCJcK899u+5RM5D6gP5HpC/yc3
-						IKyHg91SiGq3nUynaMsRUgGPHZ5rjsXoFg+wYbfT6fDcO+ca4y8OI/mrGczTRjWb
-						WWDkVX4RzUZgk8DqwTMytfOdUzhml7qKfdoJyP7+ScfhEkwri1ZinIJ+Drn7lQdw
-						xCofIkXeJ/2llGWekavHYf+wCINX2m7zrsl7u0pBdbvOrqB54xJ9Jd03tKlyFs7k
-						87lAj02qwCOxkOQ1PmbzjBji8NOq05yfUEHzKG/l3mPfj25HTLqLQ8M8Qs87S/H/
-						2lA7QhxVaWc0V7kPWo1yIE0KYVnXbHy4Hw2on+dcwH7wPLItCneryp8rM1WRSE+X
-						s7Q3F7NVAvvfPrcXUfxw67jc3NQEGPGESn2ZCdcD8SQNPBymdG0572nebb4AhmBR
-						2PN4Eg==
-					</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://sandbox-eu.alma.exlibrisgroup.com/mng/pdsHandleLogin" index="0" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ex Libris Alma (Sandbox) - The Next-Generation Library Services Framework</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml b/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml
deleted file mode 100644
index 5dacfd08..00000000
--- a/swamid-interfederations-2.0/sandbox.aai.niif.hu.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sandbox.aai.niif.hu/shibboleth">
-  <Extensions>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">niifi</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-test</ns9:MetadataSet>
-    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui:InformationURL xml:lang="hu">https://sandbox.aai.niif.hu/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sandbox.aai.niif.hu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDvjCCAqagAwIBAgIJAKmyDJ5RK7VnMA0GCSqGSIb3DQEBBQUAMEgxCzAJBgNVBAYTAkhVMQ0wCwYDVQQKEwROSUlGMQwwCgYDVQQLEwNBQUkxHDAaBgNVBAMTE3NhbmRib3guYWFpLm5paWYuaHUwHhcNMTAwMTA2MDkzNzM1WhcNMzcwNTI0MDkzNzM1WjBIMQswCQYDVQQGEwJIVTENMAsGA1UEChMETklJRjEMMAoGA1UECxMDQUFJMRwwGgYDVQQDExNzYW5kYm94LmFhaS5uaWlmLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAss8blriJkeVc28dczjS3P7u4Hp+mDYqx9MecEzdGqnRPtE+1yJ3M6LkjmcbMSVvF+9i/qxkZxpn0BpIJhD/6WpC7e4TbAIMls6+eBSd82MJE2siANba+g7KIIc73LhEnnMBv5fmbyaAfCGZ6yG45/hsQ7j5f0ufcJuIINfrSIG+Qo3fMggIbgxZot3kzdJFUkPTNY201yQUhNmb2mNSOX1zOQn7+cRbrQ3ZBUj8E7rasqzZc20VhLF/Jv+yNr5zvkoETucJr4G8OyudKCPQT9xegJ9s5GBQ48DEQot6LFJSZ3zwDVeIoedWju2dLe6YIpC9pamhz9y2IP/9VlUhSTwIDAQABo4GqMIGnMB0GA1UdDgQWBBSmKZt1dBQ80ZzNIcEy0Nihu/nZYzB4BgNVHSMEcTBvgBSmKZt1dBQ80ZzNIcEy0Nihu/nZY6FMpEowSDELMAkGA1UEBhMCSFUxDTALBgNVBAoTBE5JSUYxDDAKBgNVBAsTA0FBSTEcMBoGA1UEAxMTc2FuZGJveC5hYWkubmlpZi5odYIJAKmyDJ5RK7VnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAH8CkAleuCDK2S3qHSTdveyeXeIMT0JQ1sMwaNUgDpT7dItMc00Xl7kmcHyLq9ERu066ViSQYbJpFncrC+WrNbu5taArSs8I/iYXdBipRo6QRdy3DmjQEp/UgqKBWt+KZXNYm8UbaXJ0M0HNd9OvMznfDgUiBz0Bjy2e0ILhC15Bv33/zXpFJP+jaNv4C6Ql9Y8DbU/PujNBcBMWfN33gLedFHoHNSKJJcDryIxSDnDy7+TOwWcv3daztZEJ6h3rzGqkaN/+NBUynn1LebvvbWTNGarebjqDcT4D2l4d+QIYvXnECWD3ARf/rdP/KbfoNxD2EBrKdxcvDPq0uQii8nE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sandbox.aai.niif.hu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sandbox.aai.niif.hu/Shibboleth.sso/SLO/Redirect"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sandbox.aai.niif.hu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sandbox.aai.niif.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AttributeConsumingService index="1" isDefault="true">
-      <ServiceName xml:lang="hu">sandbox.aai.niif.hu</ServiceName>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="affiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationName>
-    <OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.niif.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.niif.hu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <SurName>NIIF AAI</SurName>
-    <EmailAddress>mailto:aai@niif.hu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5ca67bfa..00000000
--- a/swamid-interfederations-2.0/sant-ssp.sant.ox.ac.uk-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://sant-ssp.sant.ox.ac.uk/shibboleth">
-  <!--
-	This is a "St Antony's College" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-08T17:02:08Z"/>
-  </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://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAMhwD42RejeVMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnNhbnQtc3NwLnNhbnQub3guYWMudWswHhcNMTMwNTA2MTM0MzQ5WhcNMjMw
-						NTA0MTM0MzQ5WjAhMR8wHQYDVQQDExZzYW50LXNzcC5zYW50Lm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyTP5u2MTtwDgk9nE/YOMLyBq
-						kdM0PgaJ7CsZmtf3kynVVet2TCudVGbDPzz0ucLUGvEf5gFtJSmKNtBHS2dpECN3
-						v/tQyeCiaDxVvlpgAMquKStWxPP6/jRS0jk+QtIEzNlMqD9QQ1Y6GZB1hTK9uAXM
-						CtwYZkiwQlDFtygxQO6IMmYidVNmSGGX8WPmwKypijBwpPtLoEA5r2vj6yDZ6d/S
-						0+4w4oaXHIYJ/7i6K/L15gXeN0UG8Cf8eOrU2VKGfdWtJF1TbLlBEiMdfLMDfe5W
-						Q4xRldVXO7rvdHMSkIUw2+qehAzFYRdGOBH5OMZak699Oqcx3qLfRQP7LMgPtwID
-						AQABo0QwQjAhBgNVHREEGjAYghZzYW50LXNzcC5zYW50Lm94LmFjLnVrMB0GA1Ud
-						DgQWBBRmXuxwJcoRmVF9892XQF5+JbXQ/jANBgkqhkiG9w0BAQUFAAOCAQEAbcG6
-						cPqRKjU4ErmifQX4WGhI7VI1cef4Un1kKDSHVj7/ons5ZSUqbHFwnM9m2NRsrRGI
-						WchHAYkVnChDsRPIGrNURK1AqOE2xEo/1C2TeKWZF1wWs+xpPguU5IJO+/esIdwn
-						JtrLlTDk3mlB3bfF2ztvoAHN3UBy+WEfIw/eXdKFEyGQzR2OAAZuKIEOJ3WY3UGR
-						bq0VNxsBVKEJFDN4/AdTPVFyhsDEHYyrQ+z/oiZqsif3QjM7vB8AUXcqUDMNKnpt
-						S/rurkWwA1QuSeIejchaeEijndoSyqUMeTq7IPVoiZ/yUj9fFoh7dNt0uj9E0paJ
-						5gefI6a4f/mL0eFXGQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sant-ssp.sant.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St Antony's College Shibboleth SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sant.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>St Antony's College IT Support</GivenName>
-    <EmailAddress>mailto:it-support@sant.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Christopher</GivenName>
-    <SurName>Hoskin</SurName>
-    <EmailAddress>mailto:it-manager@sant.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sarvik.taat.edu.ee-module.php-saml-sp-metadata.php-TAAT.xml b/swamid-interfederations-2.0/sarvik.taat.edu.ee-module.php-saml-sp-metadata.php-TAAT.xml
deleted file mode 100644
index 595056af..00000000
--- a/swamid-interfederations-2.0/sarvik.taat.edu.ee-module.php-saml-sp-metadata.php-TAAT.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" entityID="https://sarvik.taat.edu.ee/module.php/saml/sp/metadata.php/TAAT">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</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" WantAssertionsSigned="true">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDVDCCAjwCCQD11wTPSPMEFjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJFRTERMA8GA1UECBMIVGFydHVtYWExDjAMBgNVBAcTBVRhcnR1MQ4wDAYDVQQKEwVFRU5ldDENMAsGA1UECxMEVEFBVDEbMBkGA1UEAxMSc2FydmlrLnRhYXQuZWR1LmVlMB4XDTEzMDMwNDExNTIxMFoXDTE2MDMwMzExNTIxMFowbDELMAkGA1UEBhMCRUUxETAPBgNVBAgTCFRhcnR1bWFhMQ4wDAYDVQQHEwVUYXJ0dTEOMAwGA1UEChMFRUVOZXQxDTALBgNVBAsTBFRBQVQxGzAZBgNVBAMTEnNhcnZpay50YWF0LmVkdS5lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbnce4LiYj/300LthjXhW1A2KYsNi+Hn8do/Y0LCSTfOmn6EOL42lLaA6XkWpGO2znN5cUden3iW1huf2YbBYaO9ljQ5xgPnEI8FCp3pkh3bhFBu2xYwbSSLLimrQejghOvEg2QAasvO+IdLJdCGvlA1H8J+sH63Mb7Qrf5GQksvEQSy5XgWlYOJePlt4cZ8oizZxXqBhEoLu6GKc+LeFflSmhEL7j/lc5UqbAcY+gQ/Wnna6u/OGQqe2F0OUu1B3Jj01uRBubGm0uVKyc8W5gEHMUpl5rAl8BF4Dw0cMDLY6eiTdHHVkmOYVJi9FCIix4R7uVXVioBVbLM8ldXBG0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAja6vG63IViGl1yacYj/6MFfgDyrA+PDzyKnn+PYyEgITZuHQnwNVWqX05CSA7Xo6iQhFE6Tv2Ri6JpCFyHXEo+8bJ93W8DeAhHc3J6Oh/nCLzr9+SibfSRddiYWmr4NMbcO13B2kQhzBPwAyKKZoKCZr0F/gkBcMKFLsvfnmJDVcKfMaRIzq9nZng6cOQjoQDNstmQ6AIyzc08x0SbqdbKePkxXaMX0KJFXagApW0sBt/v5nTC6euAyiEbSO1cpJrz4lR2UekTsDNtPWuo8NSq6rSx4kenLI4i9JsOsqVe4Lo9DUAF+BHLSKy0+ToV3Falc0EJw6eemUnANtpEBX/Q==</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>MIIDVDCCAjwCCQD11wTPSPMEFjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJFRTERMA8GA1UECBMIVGFydHVtYWExDjAMBgNVBAcTBVRhcnR1MQ4wDAYDVQQKEwVFRU5ldDENMAsGA1UECxMEVEFBVDEbMBkGA1UEAxMSc2FydmlrLnRhYXQuZWR1LmVlMB4XDTEzMDMwNDExNTIxMFoXDTE2MDMwMzExNTIxMFowbDELMAkGA1UEBhMCRUUxETAPBgNVBAgTCFRhcnR1bWFhMQ4wDAYDVQQHEwVUYXJ0dTEOMAwGA1UEChMFRUVOZXQxDTALBgNVBAsTBFRBQVQxGzAZBgNVBAMTEnNhcnZpay50YWF0LmVkdS5lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbnce4LiYj/300LthjXhW1A2KYsNi+Hn8do/Y0LCSTfOmn6EOL42lLaA6XkWpGO2znN5cUden3iW1huf2YbBYaO9ljQ5xgPnEI8FCp3pkh3bhFBu2xYwbSSLLimrQejghOvEg2QAasvO+IdLJdCGvlA1H8J+sH63Mb7Qrf5GQksvEQSy5XgWlYOJePlt4cZ8oizZxXqBhEoLu6GKc+LeFflSmhEL7j/lc5UqbAcY+gQ/Wnna6u/OGQqe2F0OUu1B3Jj01uRBubGm0uVKyc8W5gEHMUpl5rAl8BF4Dw0cMDLY6eiTdHHVkmOYVJi9FCIix4R7uVXVioBVbLM8ldXBG0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAja6vG63IViGl1yacYj/6MFfgDyrA+PDzyKnn+PYyEgITZuHQnwNVWqX05CSA7Xo6iQhFE6Tv2Ri6JpCFyHXEo+8bJ93W8DeAhHc3J6Oh/nCLzr9+SibfSRddiYWmr4NMbcO13B2kQhzBPwAyKKZoKCZr0F/gkBcMKFLsvfnmJDVcKfMaRIzq9nZng6cOQjoQDNstmQ6AIyzc08x0SbqdbKePkxXaMX0KJFXagApW0sBt/v5nTC6euAyiEbSO1cpJrz4lR2UekTsDNtPWuo8NSq6rSx4kenLI4i9JsOsqVe4Lo9DUAF+BHLSKy0+ToV3Falc0EJw6eemUnANtpEBX/Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sarvik.taat.edu.ee/module.php/saml/sp/saml2-logout.php/TAAT"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sarvik.taat.edu.ee/module.php/saml/sp/saml2-acs.php/TAAT" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sarvik.taat.edu.ee/module.php/saml/sp/saml1-acs.php/TAAT" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sarvik.taat.edu.ee/module.php/saml/sp/saml2-acs.php/TAAT" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sarvik.taat.edu.ee/module.php/saml/sp/saml1-acs.php/TAAT/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>TAAT</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 70167b93..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sau09ret.ifbaiano.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sau09ret.ifbaiano.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sau09ret.ifbaiano.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sau09ret.ifbaiano.edu.br:8443/idp/profile/SAML1/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">IFBaiano - Instituto Federal Baiano</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFBaiano - Instituto Federal Baiano</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFBaiano - Instituto Federal Baiano</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifbaiano.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifbaiano.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Humberto Santiago</md:SurName>
-    <md:EmailAddress>cotec@ifbaiano.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sawfish.conted.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sawfish.conted.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 527d538d..00000000
--- a/swamid-interfederations-2.0/sawfish.conted.ox.ac.uk-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://sawfish.conted.ox.ac.uk/shibboleth">
-  <!--
-		This is a Conted development site Shibboleth 2 SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://sawfish.conted.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAKibhIeIrX0OMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF3Nhd2Zpc2guY29udGVkLm94LmFjLnVrMB4XDTExMTAxMTE1MTgwOVoXDTIx
-						MTAwODE1MTgwOVowIjEgMB4GA1UEAxMXc2F3ZmlzaC5jb250ZWQub3guYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBqzfHO6TPn1IpvOvkGXB6
-						hdiMh61norAph+ZTqYFeXKdFI3ifdf1i52vBa4ODsCFJlgxow1+DkOO7/3Ipp4h6
-						k2xP7Vrll7cNkC80jh+/fENc4OVXBoPyNGREpLtsIHaV82cUImjEiCtjOtmA/EeO
-						QDceq/cRPfKnalntdynhPGfBKV5B07+sMYaYyfwRp2hu2OdZzFWdJqCAJ6kFxw+E
-						hFr7P4TfrMm+4ESvfjN31IpT6ak0AJk3CckpXmRgM6i5lQv4H+DXYQgOWrvIISdU
-						L6FRTKlIQ++57A9FV/UJVWRz3FGW8NIb/7NdK+u9N1z/4YTK9PTwDAwY8iQi3gX1
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3Nhd2Zpc2guY29udGVkLm94LmFjLnVrMB0G
-						A1UdDgQWBBRDY6WGUq5Zg1sxv81m23/toHTbSjANBgkqhkiG9w0BAQUFAAOCAQEA
-						XP6+tO+WyXfIXIW9xXVt+uQvjMDm58zMG4lGE+PC89lk0itPmciDMgMSko0Al3Ev
-						NMpnTh0JSmZipjOACprBt9s5ykhWBybE0Blid2TN+42tGzW2RUW7PhJbsqhF16v4
-						o4WkcJWOyhVDhzDckPu40VZ5lQSIVVrZHEegQXVPRy+lupq7lz5cnmVTrwBHk9yG
-						zIiW5643Vuv02Ma83i9eWPfruX5z4LZzLPYz4Jv/CfoIinqbj9EPmTYVl5oRm4HC
-						QdQJumsqcKAGRRjW1vvKET66KjehtL8C9hqVxyAKc5b95A2qq4WtX01eejeJLYO+
-						mkBQ7rIcTw8YYbUpVUyQVw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sawfish.conted.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Conted development site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT support</GivenName>
-    <EmailAddress>mailto:it-support@conted.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT support</GivenName>
-    <EmailAddress>mailto:it-support@conted.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml
deleted file mode 100644
index 43c751de..00000000
--- a/swamid-interfederations-2.0/sb.nemji.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sb.nemji.cz/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-11-03T10:24: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>
-    <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/hospital</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nemji.cz</shibmd:Scope>
-      <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">Hospital Jihlava</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Nemocnice Jihlava, p.o.</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for staff of Hospital Jihlava</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance Nemocnice Jihlava, p.o.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.nemji.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.nemji.cz</mdui:InformationURL>
-        <mdui:Logo height="100" width="92">https://sb.nemji.cz/idp/images/logo_nemji.jpg</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>
-MIIDGDCCAgCgAwIBAgIVAKZp9gwp4ueLeX2+eB2CvUUrnDkkMA0GCSqGSIb3DQEB
-CwUAMBYxFDASBgNVBAMMC3NiLm5lbWppLmN6MB4XDTE1MDkyODIwMjY1N1oXDTM1
-MDkyODIwMjY1N1owFjEUMBIGA1UEAwwLc2IubmVtamkuY3owggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCxEbAEO17PWjk7G9OzJCz6FoEyGF6wdBerSeHS
-oX+Seoj79HKldam3D1FaWfyvrbSATJtgdBeVkGKAL/YQ/I6t6W7XSkFsOfuJBPLu
-StWLVCIIJokaeNUMf1Hvj/C1vbl0X7ooRtR9Bw37BEAMY2Z4iEf1Os72q5RMpheG
-vSWHewbobbz9jJ8ztjvaoODvzC8QsldWA6WaFz71uvFTDQbT2CrmTKB59vPCpMAO
-O2UllJeZYm6XfCWQKc4yswfKUz7T+LsuN3rNXIVNAbInPtguqKzThzLmrXRdEVwK
-lezivULBZcl6F3y7VT9bUCEwmAmxPdtlcfpCfKgMwyR/koPZAgMBAAGjXTBbMB0G
-A1UdDgQWBBQWvRy9bMJ66wgZUWbx7GkUHDxZ6zA6BgNVHREEMzAxggtzYi5uZW1q
-aS5jeoYiaHR0cHM6Ly9zYi5uZW1qaS5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEALC7n4vEu4XHlUdwts5szUfOXRv9J1cBRfFfkhv4XZpmaK6sj
-y4ATddyBMH7qRkuIQtpgSNuUFXaeDPYaWl14S8UcDXvPJRiuESFcNAVwfhA50BYo
-WhSRu859mA8oiDf+vS8w5MsSFp0ypBRAfc7gDZlHNxSb0JjL8rDv2lb/xtyIcBeP
-xRTQTJkWnQl6/yFldSIS1vjyq4gRDeSAbEamdB9kZYXpso/6+Xci56RGkF2jqhYG
-jBnhOQm9pZ5ExPvfJg8t0uM2JkUPFWXPemvekrOsruK03/aI5fSi1xpDPXagFeTX
-duJQgq77OjeYG4HDOE+/Q1Mc78ihrQGiMt1mQA==
-                        </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>
-MIIDGDCCAgCgAwIBAgIVAKPyelTVA+LxLwVx00WMBX1JLVLrMA0GCSqGSIb3DQEB
-CwUAMBYxFDASBgNVBAMMC3NiLm5lbWppLmN6MB4XDTE1MDkyODIwMjY1NloXDTM1
-MDkyODIwMjY1NlowFjEUMBIGA1UEAwwLc2IubmVtamkuY3owggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC/boFss3wDxrlwMYgyZqe4vaMxxCzlIbHFRMTI
-F5V3x4aPqwmEzPlgI5DwrMZCPZRMllzL15yjKx3aKbPSuwUjVBeS1licKD3TUqeQ
-OOeihaGQB5LMfB+pUeknOp5IDQqSc0FhRD9RBd0HQ0RQmrguzfmvFQUgnJSivwG4
-QxdVBTOoAtjlmEDC6eI01cRlRnw/NgsHj+P3r2123O7G9FQEzuu61BVU7RBBPzbm
-jVW+o3SbgAJn8Sk5mOVKTpqq0LP4XADpL26U08wMUTri7wO27qkRH3ARda55ubhV
-ybexhPPFFHz3FXAr56xgaQbr+p66ktvdJ4u/h4M/7qfd58tnAgMBAAGjXTBbMB0G
-A1UdDgQWBBST/dnWs3qZybPk3IUtEIfUujodWzA6BgNVHREEMzAxggtzYi5uZW1q
-aS5jeoYiaHR0cHM6Ly9zYi5uZW1qaS5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEAYNb4VPXPlVhJVygSeVl3D2cc413M5icp+1y3tL7VTcRKp0/B
-8c5j1iJR9QcnEUZwe7zrAaXT18BNNb1DMZT470BEhYNfO13tqJMA5/07gzUN/cOH
-5FkT+/cUCDXYTVS2GCnGmeOPNgzbuF/oUEQEcsyZ2Lg6TFWcQ6SoCyQpzCiruGuW
-XtGqoecT2BBbSIpCBnIeffIW4Lri+DSVxE1zDpnbE80VcAF+A5TP2qRNN+KHMbro
-mbbg8OPDJqbEV4TpRiTv1dMW/7Bl3gwslK+RRYC612P8EZxFnjsLBkVzmWXv/Uje
-/5e/14K2hCSYVIQY8/gqbfJYMErJJ8XsW+0SqQ==
-                        </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>
-MIIDFzCCAf+gAwIBAgIUVFD+QoaYzxD5W4xBkA9MJtVvnREwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLc2IubmVtamkuY3owHhcNMTUwOTI4MjAyNjU2WhcNMzUw
-OTI4MjAyNjU2WjAWMRQwEgYDVQQDDAtzYi5uZW1qaS5jejCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIGmupHI9HsQgayLrbTRTrbEDGZDVHQ0ruefPbhJ
-rTDVcg+30Y31w01s+pkE8JgQY8pY2I2vHpWc15aiqc8bOkPLv8aRO/d4AzJcipY8
-2A9SKeAgQwDldUj2l4d05JjxS81ZTRO4Zz8/CVsn5u2HBoX4DXexiXcnmiuZayET
-K0RJ3pt20tOITKecV5l7nZqPifkflLg+v0g0KsJLVIb4u1UyJcGNX0Y9G622Xoe0
-UP3ffB376fPXKxeDJTl6HQCT/cauTUnWcOKDWsExF0pMO4b3JAmZub+03EgwgXrr
-TxBmw9ngbPimD5NFppaMKqygXJ/nYB7NXdMFPPsihYPevGkCAwEAAaNdMFswHQYD
-VR0OBBYEFKxXcto1nYeWQ4ghK/SWd20gxuBkMDoGA1UdEQQzMDGCC3NiLm5lbWpp
-LmN6hiJodHRwczovL3NiLm5lbWppLmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQARxvTSjMwUgaX7z0uKrsYykwoXW6ZHLQAooYsTZrRoFR4s8DY5
-u5WbcM8jkFdqxbvDBdkZ//5XQyf45X7t9m3gFzojvNwu5Ms6AzOwNDLKEqFIn2gO
-b0J0ahHtxEvwZ5OO5C+U/A5y56D9VpGkvdKyW102m+pTGuBI1PChyXqtbZOPW2oe
-GS4qzsVOlYnXW8FZgftgaPqNwu/+EtSlkRtvYQdNSjs6oVXnHgO+5JYTMDgvf0xS
-Pq2qFEC0TqaooIgKbPI9IKAg7WhwSuakyV2FIRtLpbRSZfcwSmzWnYcsmkxTGVnI
-gP5HZMJJz+FjDqHEOLAg0b82EJgLbqzVuBXy
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sb.nemji.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sb.nemji.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: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://sb.nemji.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sb.nemji.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sb.nemji.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sb.nemji.cz/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nemji.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAKZp9gwp4ueLeX2+eB2CvUUrnDkkMA0GCSqGSIb3DQEB
-CwUAMBYxFDASBgNVBAMMC3NiLm5lbWppLmN6MB4XDTE1MDkyODIwMjY1N1oXDTM1
-MDkyODIwMjY1N1owFjEUMBIGA1UEAwwLc2IubmVtamkuY3owggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCxEbAEO17PWjk7G9OzJCz6FoEyGF6wdBerSeHS
-oX+Seoj79HKldam3D1FaWfyvrbSATJtgdBeVkGKAL/YQ/I6t6W7XSkFsOfuJBPLu
-StWLVCIIJokaeNUMf1Hvj/C1vbl0X7ooRtR9Bw37BEAMY2Z4iEf1Os72q5RMpheG
-vSWHewbobbz9jJ8ztjvaoODvzC8QsldWA6WaFz71uvFTDQbT2CrmTKB59vPCpMAO
-O2UllJeZYm6XfCWQKc4yswfKUz7T+LsuN3rNXIVNAbInPtguqKzThzLmrXRdEVwK
-lezivULBZcl6F3y7VT9bUCEwmAmxPdtlcfpCfKgMwyR/koPZAgMBAAGjXTBbMB0G
-A1UdDgQWBBQWvRy9bMJ66wgZUWbx7GkUHDxZ6zA6BgNVHREEMzAxggtzYi5uZW1q
-aS5jeoYiaHR0cHM6Ly9zYi5uZW1qaS5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEALC7n4vEu4XHlUdwts5szUfOXRv9J1cBRfFfkhv4XZpmaK6sj
-y4ATddyBMH7qRkuIQtpgSNuUFXaeDPYaWl14S8UcDXvPJRiuESFcNAVwfhA50BYo
-WhSRu859mA8oiDf+vS8w5MsSFp0ypBRAfc7gDZlHNxSb0JjL8rDv2lb/xtyIcBeP
-xRTQTJkWnQl6/yFldSIS1vjyq4gRDeSAbEamdB9kZYXpso/6+Xci56RGkF2jqhYG
-jBnhOQm9pZ5ExPvfJg8t0uM2JkUPFWXPemvekrOsruK03/aI5fSi1xpDPXagFeTX
-duJQgq77OjeYG4HDOE+/Q1Mc78ihrQGiMt1mQA==
-                        </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>
-MIIDGDCCAgCgAwIBAgIVAKPyelTVA+LxLwVx00WMBX1JLVLrMA0GCSqGSIb3DQEB
-CwUAMBYxFDASBgNVBAMMC3NiLm5lbWppLmN6MB4XDTE1MDkyODIwMjY1NloXDTM1
-MDkyODIwMjY1NlowFjEUMBIGA1UEAwwLc2IubmVtamkuY3owggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC/boFss3wDxrlwMYgyZqe4vaMxxCzlIbHFRMTI
-F5V3x4aPqwmEzPlgI5DwrMZCPZRMllzL15yjKx3aKbPSuwUjVBeS1licKD3TUqeQ
-OOeihaGQB5LMfB+pUeknOp5IDQqSc0FhRD9RBd0HQ0RQmrguzfmvFQUgnJSivwG4
-QxdVBTOoAtjlmEDC6eI01cRlRnw/NgsHj+P3r2123O7G9FQEzuu61BVU7RBBPzbm
-jVW+o3SbgAJn8Sk5mOVKTpqq0LP4XADpL26U08wMUTri7wO27qkRH3ARda55ubhV
-ybexhPPFFHz3FXAr56xgaQbr+p66ktvdJ4u/h4M/7qfd58tnAgMBAAGjXTBbMB0G
-A1UdDgQWBBST/dnWs3qZybPk3IUtEIfUujodWzA6BgNVHREEMzAxggtzYi5uZW1q
-aS5jeoYiaHR0cHM6Ly9zYi5uZW1qaS5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAQEAYNb4VPXPlVhJVygSeVl3D2cc413M5icp+1y3tL7VTcRKp0/B
-8c5j1iJR9QcnEUZwe7zrAaXT18BNNb1DMZT470BEhYNfO13tqJMA5/07gzUN/cOH
-5FkT+/cUCDXYTVS2GCnGmeOPNgzbuF/oUEQEcsyZ2Lg6TFWcQ6SoCyQpzCiruGuW
-XtGqoecT2BBbSIpCBnIeffIW4Lri+DSVxE1zDpnbE80VcAF+A5TP2qRNN+KHMbro
-mbbg8OPDJqbEV4TpRiTv1dMW/7Bl3gwslK+RRYC612P8EZxFnjsLBkVzmWXv/Uje
-/5e/14K2hCSYVIQY8/gqbfJYMErJJ8XsW+0SqQ==
-                        </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>
-MIIDFzCCAf+gAwIBAgIUVFD+QoaYzxD5W4xBkA9MJtVvnREwDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLc2IubmVtamkuY3owHhcNMTUwOTI4MjAyNjU2WhcNMzUw
-OTI4MjAyNjU2WjAWMRQwEgYDVQQDDAtzYi5uZW1qaS5jejCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAIGmupHI9HsQgayLrbTRTrbEDGZDVHQ0ruefPbhJ
-rTDVcg+30Y31w01s+pkE8JgQY8pY2I2vHpWc15aiqc8bOkPLv8aRO/d4AzJcipY8
-2A9SKeAgQwDldUj2l4d05JjxS81ZTRO4Zz8/CVsn5u2HBoX4DXexiXcnmiuZayET
-K0RJ3pt20tOITKecV5l7nZqPifkflLg+v0g0KsJLVIb4u1UyJcGNX0Y9G622Xoe0
-UP3ffB376fPXKxeDJTl6HQCT/cauTUnWcOKDWsExF0pMO4b3JAmZub+03EgwgXrr
-TxBmw9ngbPimD5NFppaMKqygXJ/nYB7NXdMFPPsihYPevGkCAwEAAaNdMFswHQYD
-VR0OBBYEFKxXcto1nYeWQ4ghK/SWd20gxuBkMDoGA1UdEQQzMDGCC3NiLm5lbWpp
-LmN6hiJodHRwczovL3NiLm5lbWppLmN6L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBAQARxvTSjMwUgaX7z0uKrsYykwoXW6ZHLQAooYsTZrRoFR4s8DY5
-u5WbcM8jkFdqxbvDBdkZ//5XQyf45X7t9m3gFzojvNwu5Ms6AzOwNDLKEqFIn2gO
-b0J0ahHtxEvwZ5OO5C+U/A5y56D9VpGkvdKyW102m+pTGuBI1PChyXqtbZOPW2oe
-GS4qzsVOlYnXW8FZgftgaPqNwu/+EtSlkRtvYQdNSjs6oVXnHgO+5JYTMDgvf0xS
-Pq2qFEC0TqaooIgKbPI9IKAg7WhwSuakyV2FIRtLpbRSZfcwSmzWnYcsmkxTGVnI
-gP5HZMJJz+FjDqHEOLAg0b82EJgLbqzVuBXy
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sb.nemji.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sb.nemji.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">Nemocnice Jihlava, p.o.</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Hospital Jihlava</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">Nemocnice Jihlava, p.o.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Hospital Jihlava</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nemji.cz/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.nemji.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Málek</md:SurName>
-    <md:EmailAddress>malekp@nemji.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 83f400b3..00000000
--- a/swamid-interfederations-2.0/sbs-webhosting.sbs.ox.ac.uk-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://sbs-webhosting.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Said Business School" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-06T09:27:25Z"/>
-  </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://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAPNCbuPT2io8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG3Nicy13ZWJob3N0aW5nLnNicy5veC5hYy51azAeFw0xMjEyMDUwODM5MTda
-						Fw0yMjEyMDMwODM5MTdaMCYxJDAiBgNVBAMTG3Nicy13ZWJob3N0aW5nLnNicy5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO4N7eRtQMSY
-						X3IvueK45VAqmOQeQoGJie/mdclap1q7mhJ0QUDXvly81iLx6tYrj+pcHJjM+bZN
-						Hmwn5aNTNQeygCwYu9Q6P71Si005fRPHP6JSZxywI6DgQw2bC7PDA1ZgsEhvXqIT
-						6FUbF/K0XxaKRgYv0jire9e+mTkronnDlJOeAQtCOdf5wgp/zQjs4Yln4dD2+UXN
-						4tw1B4aOSCAlEteMO5up/DBwnx/G904kaidbOssQ180a3QEogF27bRh6lT+nDlOG
-						epKbPNwIzkJRhBZYjHHLjGUAgVIXQayS9etKvAH9hxsJ4NIiImUfH8a+2GFqZSvN
-						EgR8INMq7XcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbc2JzLXdlYmhvc3Rpbmcuc2Jz
-						Lm94LmFjLnVrMB0GA1UdDgQWBBRWZ9b7Zkx8CdEWWb10cWqQmA5CujANBgkqhkiG
-						9w0BAQUFAAOCAQEAmDjFtdmBhewEwwaAu6XPYVTnMsA1rOnrzTH8srObrgyRBNI7
-						Cd0bm1vq4Y5KwgxZYOW36b2dNDLO/oQSh/SHsWtweZj3njJsgKNZQ/9ES8gJRLAF
-						fIJK5CZBw46X4GqFSUKjBsOwq4Lwb4ziuyM7le+qJMw926RVXxCDFfsoIFFTQvMG
-						RTiokPOX7gSv91SdETtK2jf20YUt5iWlhyphx3gdd2fZBYO1yaKEaz4NMO1yIgKx
-						0qkXHgvbow0c6PP7ral0MuJkqj97HPvDvCpLuBosFVK4GDtLtMxhpTrp6NQjp982
-						uhmO5vu/Ld2xEnYKvQLGliEfuIyqmiCdmboi4w==
-					</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>
-						MIIDGDCCAgCgAwIBAgIJAPNCbuPT2io8MA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG3Nicy13ZWJob3N0aW5nLnNicy5veC5hYy51azAeFw0xMjEyMDUwODM5MTda
-						Fw0yMjEyMDMwODM5MTdaMCYxJDAiBgNVBAMTG3Nicy13ZWJob3N0aW5nLnNicy5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO4N7eRtQMSY
-						X3IvueK45VAqmOQeQoGJie/mdclap1q7mhJ0QUDXvly81iLx6tYrj+pcHJjM+bZN
-						Hmwn5aNTNQeygCwYu9Q6P71Si005fRPHP6JSZxywI6DgQw2bC7PDA1ZgsEhvXqIT
-						6FUbF/K0XxaKRgYv0jire9e+mTkronnDlJOeAQtCOdf5wgp/zQjs4Yln4dD2+UXN
-						4tw1B4aOSCAlEteMO5up/DBwnx/G904kaidbOssQ180a3QEogF27bRh6lT+nDlOG
-						epKbPNwIzkJRhBZYjHHLjGUAgVIXQayS9etKvAH9hxsJ4NIiImUfH8a+2GFqZSvN
-						EgR8INMq7XcCAwEAAaNJMEcwJgYDVR0RBB8wHYIbc2JzLXdlYmhvc3Rpbmcuc2Jz
-						Lm94LmFjLnVrMB0GA1UdDgQWBBRWZ9b7Zkx8CdEWWb10cWqQmA5CujANBgkqhkiG
-						9w0BAQUFAAOCAQEAmDjFtdmBhewEwwaAu6XPYVTnMsA1rOnrzTH8srObrgyRBNI7
-						Cd0bm1vq4Y5KwgxZYOW36b2dNDLO/oQSh/SHsWtweZj3njJsgKNZQ/9ES8gJRLAF
-						fIJK5CZBw46X4GqFSUKjBsOwq4Lwb4ziuyM7le+qJMw926RVXxCDFfsoIFFTQvMG
-						RTiokPOX7gSv91SdETtK2jf20YUt5iWlhyphx3gdd2fZBYO1yaKEaz4NMO1yIgKx
-						0qkXHgvbow0c6PP7ral0MuJkqj97HPvDvCpLuBosFVK4GDtLtMxhpTrp6NQjp982
-						uhmO5vu/Ld2xEnYKvQLGliEfuIyqmiCdmboi4w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbs-webhosting.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Aaron</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 1afc0219..00000000
--- a/swamid-interfederations-2.0/sbsintranet-prod.sbs.ox.ac.uk-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://sbsintranet-prod.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Said Business School Intranet - prod" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T13:51:17Z"/>
-  </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://sbsintranet-prod.sbs.ox.ac.uk/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://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHjCCAgagAwIBAgIJANdB9eXrYLgxMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHXNic2ludHJhbmV0LXByb2Quc2JzLm94LmFjLnVrMB4XDTEzMDMyMDExMjYw
-						OFoXDTIzMDMxODExMjYwOFowKDEmMCQGA1UEAxMdc2JzaW50cmFuZXQtcHJvZC5z
-						YnMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChX2rJ
-						z07BWAA9qBYJttygZiFvA4P68EyXKHVKJP0+GQkVbz+QWgiakqrUJ4ug/2t7WZqw
-						AYGboWfEF7fn1RTk/Cmb2qrbZnDbw91K5kBq9UHm40EVGKAvbl3pH79PvNltXm4R
-						rRmFU73w9qiSSYSoJw+H9aVwoulz6SNcgT5vBL9yU3WBbVL5UUZ6Ar0NA4MSKt1M
-						s2Di56Bj7/yruiS/IWvYEdwwviOlfwv2zNOSq5WE6+3JUjmENVIaeD2quR72jl8A
-						+A5/oCejuRxA1MXtW14c28kcW8WAq+jJNhZTyTz9J747SfjwevvZC7ZpJiHpLQ3E
-						C5ZlCMmqBkkpXHG7AgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNic2ludHJhbmV0LXBy
-						b2Quc2JzLm94LmFjLnVrMB0GA1UdDgQWBBQK6qQ7cJpaQHEchczSL1pO4sUdJDAN
-						BgkqhkiG9w0BAQUFAAOCAQEAgQSIM4wPZ/toneOiC8SOGTAQCLXXKLhAExgtVYt4
-						iD21kD77ltKjTnexFoEYZYhNYbpvjryLjoUwHNN0vkefEILSJ1AROtAtqrVRe/eq
-						BFSJUPEc9ldfaZyHfHm0HlXw/IqkB8Xwbl/pxeuk9UpANSK1BJEVF7fQ2OB+Q9tY
-						WfbpayK2H+et/4GqNBArhbaPTc24UmEg4iSMKM62px4LAFHDyY+l5hPyZIjbjaH4
-						PyOioUMLHQD7AFqiiudIMbHIexs1H8m72DY04eOfS0LbPKWjjQfnIvza4jrk5QVg
-						Pk/JmOFKxpYp6MjeyevIyqMKT75dQqAph+dRuPdrLpw3uQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbsintranet-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Aaron</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c97a8446..00000000
--- a/swamid-interfederations-2.0/sbsintranet-test.sbs.ox.ac.uk-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://sbsintranet-test.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Said Business School Intranet - test" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-22T13:51:45Z"/>
-  </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://sbsintranet-test.sbs.ox.ac.uk/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://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHjCCAgagAwIBAgIJAPI8dJKkzOVWMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHXNic2ludHJhbmV0LXRlc3Quc2JzLm94LmFjLnVrMB4XDTEzMDMyMDExMjY1
-						M1oXDTIzMDMxODExMjY1M1owKDEmMCQGA1UEAxMdc2JzaW50cmFuZXQtdGVzdC5z
-						YnMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDYJfL7
-						38MTfaNtX2gG3YT22obvOUO4CBPVBAy6kpRIoph8N7TnRqFquy/W9ml4eAX4hUD+
-						BB+mDDaSNxKfHgBu6IItHr65Dlpr1SoFqkedhbc62MwQBfTstT0kNZAfDrMs4Uzn
-						RWpcVQ57hsIzpIFglN4+cIr8RxVtECnjOw83OXSmT5Mr4kzBkZXaHfwZBEtY7cKA
-						k7GOY+NoeBiZ1DgIpHDpYi/r2YJYaRUyLliEcb9Ub2uc+C9aBhdhOn7/E/BpMn9w
-						jvW0TMCFqUQN/oV9fyoeUUx5raCSinh7rjrYefxu+tJ5Fo7IyXq+oE/B0eu6ofPM
-						E92JNYaN4aco80SLAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNic2ludHJhbmV0LXRl
-						c3Quc2JzLm94LmFjLnVrMB0GA1UdDgQWBBRs98UMkEznWm8oWFvOszcJxU6CmDAN
-						BgkqhkiG9w0BAQUFAAOCAQEAxeGvvr413wr+UGJexIedFITpLxgAG4F3YUeEXYsm
-						ol+WU2ekOFAge5nNj0Io8UmoTHpEIMXg62OSDWyTkAtpWYdIAdUoL+42lLrdTSr6
-						sbjZdXHQcSp+5fvpEuYkm3L0yCQktNy5J2dZ2dhAJOP+qf8V2G18TxkVQBmWrBW9
-						no1TMarB/+B7solMtdlyN4JUycjEP4wiTpfvxMdCtBXUDRMzZC1fHe8D77N97TwB
-						auw5Unm40o1QfOlAsaIC1jGRjFVcQ3PEo8PRFrExKCn33xDWXqLDPLP6pQUxxItK
-						1fSI3rsM+k375WfV9e/ofVNzCZ1FWe1GqB0/yu/x0I7M8w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbsintranet-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Aaron</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index b20c443d..00000000
--- a/swamid-interfederations-2.0/sbsplatinum-prod.sbs.ox.ac.uk-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://sbsplatinum-prod.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a  production "Said Business School" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-24T14:21:19Z"/>
-  </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://sbsplatinum-prod.sbs.ox.ac.uk/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://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHjCCAgagAwIBAgIJANgO33fFtCcXMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHXNic3BsYXRpbnVtLXByb2Quc2JzLm94LmFjLnVrMB4XDTEzMDYxOTA3NDQw
-						OVoXDTIzMDYxNzA3NDQwOVowKDEmMCQGA1UEAxMdc2JzcGxhdGludW0tcHJvZC5z
-						YnMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxsxUF
-						O8JjMA3zbx6THu/sz0Ji3AlS8k4IqdAG/t4t5ZygUgU+gaTrSC9kpD0wg9WvE1Py
-						ZW/ogfB8KiAkfSbUi16O919f0uowJmUUYz2D9KjZJiVq2CmDUUyryEKwe94TR17M
-						rVLMg2UxhSP7n2uT4VuZTaC+37MUDmE/VOLon7qN/mXYWCXJJyPWEbWjev6WRZ8t
-						LkMgqDUPlpt6hgfVnQKAJ7cJteULGGVp4gCb5Ezj91o2LBTM+uzKCIeJAo6Avm18
-						SKSFgqx+oxQ8SD6AAuSrdwf5fwO//I51N/9uj8xtgO7MA4tN3epUXRtJD+j/LQd5
-						mDVcTJUmZnpWvWrbAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNic3BsYXRpbnVtLXBy
-						b2Quc2JzLm94LmFjLnVrMB0GA1UdDgQWBBRo8x/YSzthXDfDcxhd2ZUvbJKGbTAN
-						BgkqhkiG9w0BAQUFAAOCAQEATbUWqGmTXGv5wlEYF0b0cm4Zwp/LPehRLpH5gYai
-						XRa/STYpeQvvRBHHiDVM64PhguE3yZ3+SxUVXdqRKJz0uTjcXZ+CHhngw+4VKW6E
-						eqSchBsjbPj/ETSykfoI+sQsmEWONYRO/zFbNrZe+rPL4QW1ZOIVZJ8xa+eZuQsS
-						AlWBC0vCmI+zMjDlUQuLquZRDchZdotqjbv7Ct1Tj9iIGOK053EIl14AILzsN/li
-						f24euHknRDl0vq3AIWYr+PO3m1B7ePD1ZQ4IOgvM+4GciI1WhjTZNvp1wIbfBfgZ
-						FNl6Gg44YYASw44hQ6PiTIcOCq19poc5h6W/PVSnhMFIZA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbsplatinum-prod.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ffd2b3e7..00000000
--- a/swamid-interfederations-2.0/sbsplatinum-test.sbs.ox.ac.uk-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://sbsplatinum-test.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a test "Said Business School" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-24T14:25:35Z"/>
-  </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://sbsplatinum-test.sbs.ox.ac.uk/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://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHjCCAgagAwIBAgIJAIgYFNjAnI8eMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHXNic3BsYXRpbnVtLXRlc3Quc2JzLm94LmFjLnVrMB4XDTEzMDYxOTA3NDQy
-						MFoXDTIzMDYxNzA3NDQyMFowKDEmMCQGA1UEAxMdc2JzcGxhdGludW0tdGVzdC5z
-						YnMub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCflklY
-						AT1EVMNRPCXm3sOtAlwJDoogJBj40AyzlvY1aj/jviEd048i0l5oYQ/Y5K7AJlML
-						9XA2ke/k6+gHsY9uglMCSY4nyeScfRdU63ZrH72D8OzkMM5sTHITyd0UYtXQfl/a
-						o3/RjnZBwarQZ4BVmSuU9KR1KHuJEaUEq3NAClcy6CKNVcJA/DuN7NyL0ib/Ihd0
-						LHN+bZ+3s34nw0k7URxyLUJPZegofLUa1i8CmKqTc59rkRtR+Akiy9cOdpWYPZgw
-						P967o/ZlTPH5emZ6WUjFKxd6ofr00sipRrIZ8ZyK6LOd5n37pIJ12yh7aDna3nlU
-						T34MBjPE33mzL2ifAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNic3BsYXRpbnVtLXRl
-						c3Quc2JzLm94LmFjLnVrMB0GA1UdDgQWBBRLBQqOm4D109M7QY2GgFO/wHFMyjAN
-						BgkqhkiG9w0BAQUFAAOCAQEAMfbJ0CGrfs6yV/K5LCFZDzIRkI6x+524ghvZbI3P
-						6+GI87D6gZ+QTxta29tqlF9ZlAMtIgdo+XYoRLephxPN5Xo6wbw2ku/U7cBcDrzD
-						MiBwpjCWzhcfIyu7pxEaU6qvuc+EAxBDjC7w388bp28FFyMPaKPfKEZ/7BKITo6K
-						i7kYtYbV9ZwSj5yAamnbMtgI0abgpQ+7UqoNV9afIABRbnVzfmMqFxvSrx07x4FC
-						73qtZeNIxo0mTGRa1eU9hyImd8BX5uoy1TQikkBGmXAXTS0AFbOZYLYVsQn5eNNj
-						so5f+e8LVT91d0XnbqkBqNlepWrI70hiDyeSNXgeZvtkAQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sbsplatinum-test.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-shibboleth.xml
deleted file mode 100644
index 9bd2b1d7..00000000
--- a/swamid-interfederations-2.0/scatfam.shrewsbury.ac.uk-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://scatfam.shrewsbury.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Shrewsbury College of Arts and Technology.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-30T12:52:22Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">shrewsbury.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEDjCCAvYCCQDdX07L9v0VEjANBgkqhkiG9w0BAQUFADCByDELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgMClNocm9wc2hpcmUxEzARBgNVBAcMClNocmV3c2J1cnkxGzAZ
-						BgNVBAoMElNocmV3c2J1cnkgQ29sbGVnZTErMCkGA1UECwwidGVjaG5pY2FsIGFu
-						ZCBJbmZvcm1hdGlvbiBTZXJ2aWNlczEdMBsGA1UEAwwUaWRwLnNocmV3c2J1cnku
-						YWMudWsxJjAkBgkqhkiG9w0BCQEWF3JvYmluYkBzaHJld3NidXJ5LmFjLnVrMB4X
-						DTE2MDExMzA5MjM1MFoXDTI2MDExMDA5MjM1MFowgcgxCzAJBgNVBAYTAkdCMRMw
-						EQYDVQQIDApTaHJvcHNoaXJlMRMwEQYDVQQHDApTaHJld3NidXJ5MRswGQYDVQQK
-						DBJTaHJld3NidXJ5IENvbGxlZ2UxKzApBgNVBAsMInRlY2huaWNhbCBhbmQgSW5m
-						b3JtYXRpb24gU2VydmljZXMxHTAbBgNVBAMMFGlkcC5zaHJld3NidXJ5LmFjLnVr
-						MSYwJAYJKoZIhvcNAQkBFhdyb2JpbmJAc2hyZXdzYnVyeS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ0i3cBulkagk4eJfEi1rDUgIKiKE0q
-						thBsZkKW7OT+HTcCOBEwqylbKsdBP6GUWN7CktVnRCN5Bjvq+ykgHE72bhsG+Hdv
-						Ga4HqEjZnttqmgfHIt1uJL/BMBzwCkMqJmckQxcwAIDvGpKpkpWXFtHh1h011iVZ
-						aO1NiveCTvjyEPFwOWxcfuMgI2CKKgXkuOyxGPUL3r/otBdbeflj6EQPJwYFCMI/
-						B7lmxvVyEzcC5ydc3MIsGNGapkwOHAMzIa4kyOdYB8FEZTUuIEcQM+B/deQSYroc
-						OF/m2IK8C5gwzO8IOdiP2DNWe2CTfeYP5/O/JIjt82QpUwvurgNRqP0CAwEAATAN
-						BgkqhkiG9w0BAQUFAAOCAQEAhtf0dSWtdyPMzdFbbHiaJyzkZZU5v46w61ubxJjM
-						yXjAmoqMVHT4nG8MZ75kLulGP/CLhZhbe/9iTqRwpeIvdy9+TkcXBbEiA74FNCp8
-						cHsz9P2D/rSIQDTa6nYx5Q677110fr1qtllErKy0iy5RB73Iynb+GaXiIB0n/2vh
-						YFmpj9sDjgTSEn/HN2BaUxFubIt4nZt9xPT3jgQutfysWtNhXfJn/qB8uX04KVxP
-						u2ROhvMTtYALUGQBvH5xDdSya1yqjjg/wC68x2bn3XEsQqWZsEHQ2wJPtCv0IsFX
-						dPv/acSrfyFVxIZgbRRTDcPSN2uF5wLsH/Ib7aNIsvxj+Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shrewsbury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shrewsbury.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.shrewsbury.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.shrewsbury.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.shrewsbury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shrewsbury.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">shrewsbury.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEDjCCAvYCCQDdX07L9v0VEjANBgkqhkiG9w0BAQUFADCByDELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgMClNocm9wc2hpcmUxEzARBgNVBAcMClNocmV3c2J1cnkxGzAZ
-						BgNVBAoMElNocmV3c2J1cnkgQ29sbGVnZTErMCkGA1UECwwidGVjaG5pY2FsIGFu
-						ZCBJbmZvcm1hdGlvbiBTZXJ2aWNlczEdMBsGA1UEAwwUaWRwLnNocmV3c2J1cnku
-						YWMudWsxJjAkBgkqhkiG9w0BCQEWF3JvYmluYkBzaHJld3NidXJ5LmFjLnVrMB4X
-						DTE2MDExMzA5MjM1MFoXDTI2MDExMDA5MjM1MFowgcgxCzAJBgNVBAYTAkdCMRMw
-						EQYDVQQIDApTaHJvcHNoaXJlMRMwEQYDVQQHDApTaHJld3NidXJ5MRswGQYDVQQK
-						DBJTaHJld3NidXJ5IENvbGxlZ2UxKzApBgNVBAsMInRlY2huaWNhbCBhbmQgSW5m
-						b3JtYXRpb24gU2VydmljZXMxHTAbBgNVBAMMFGlkcC5zaHJld3NidXJ5LmFjLnVr
-						MSYwJAYJKoZIhvcNAQkBFhdyb2JpbmJAc2hyZXdzYnVyeS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ0i3cBulkagk4eJfEi1rDUgIKiKE0q
-						thBsZkKW7OT+HTcCOBEwqylbKsdBP6GUWN7CktVnRCN5Bjvq+ykgHE72bhsG+Hdv
-						Ga4HqEjZnttqmgfHIt1uJL/BMBzwCkMqJmckQxcwAIDvGpKpkpWXFtHh1h011iVZ
-						aO1NiveCTvjyEPFwOWxcfuMgI2CKKgXkuOyxGPUL3r/otBdbeflj6EQPJwYFCMI/
-						B7lmxvVyEzcC5ydc3MIsGNGapkwOHAMzIa4kyOdYB8FEZTUuIEcQM+B/deQSYroc
-						OF/m2IK8C5gwzO8IOdiP2DNWe2CTfeYP5/O/JIjt82QpUwvurgNRqP0CAwEAATAN
-						BgkqhkiG9w0BAQUFAAOCAQEAhtf0dSWtdyPMzdFbbHiaJyzkZZU5v46w61ubxJjM
-						yXjAmoqMVHT4nG8MZ75kLulGP/CLhZhbe/9iTqRwpeIvdy9+TkcXBbEiA74FNCp8
-						cHsz9P2D/rSIQDTa6nYx5Q677110fr1qtllErKy0iy5RB73Iynb+GaXiIB0n/2vh
-						YFmpj9sDjgTSEn/HN2BaUxFubIt4nZt9xPT3jgQutfysWtNhXfJn/qB8uX04KVxP
-						u2ROhvMTtYALUGQBvH5xDdSya1yqjjg/wC68x2bn3XEsQqWZsEHQ2wJPtCv0IsFX
-						dPv/acSrfyFVxIZgbRRTDcPSN2uF5wLsH/Ib7aNIsvxj+Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.shrewsbury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.shrewsbury.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">Shrewsbury College of Arts and Technology</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Shrewsbury College of Arts and Technology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.shrewsbury.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Booth</SurName>
-    <EmailAddress>mailto:richard.booth@shrewsbury.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robin</GivenName>
-    <SurName>Breakwell</SurName>
-    <EmailAddress>mailto:robinb@shrewsbury.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scauth.scopus.com.xml b/swamid-interfederations-2.0/scauth.scopus.com.xml
deleted file mode 100644
index 335b23e9..00000000
--- a/swamid-interfederations-2.0/scauth.scopus.com.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://scauth.scopus.com/">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
-MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
-ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
-NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
-a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
-AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
-OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
-ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
-RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
-aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
-aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
-WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
-GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
-hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
-mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
-Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
-0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
-TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
-W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
-MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
-ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
-NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
-a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
-AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
-OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
-ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
-RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
-aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
-aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
-WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
-GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
-hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
-mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
-Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
-0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
-TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
-W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://scauth.scopus.com/SHIRE/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-scauth.scopus.com/SHIRE/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Elsevier</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Elsevier Scopus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.elsevier.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Elsevier</GivenName>
-    <SurName>Shibboleth Support</SurName>
-    <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Elsevier</GivenName>
-    <SurName>Shibboleth Support</SurName>
-    <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scccd.instructure.com-saml2.xml b/swamid-interfederations-2.0/scccd.instructure.com-saml2.xml
deleted file mode 100644
index 6b17f5d4..00000000
--- a/swamid-interfederations-2.0/scccd.instructure.com-saml2.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="http://scccd.instructure.com/saml2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">OEI - State Center Community College District- Canvas</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.canvaslms.com/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.canvaslms.com/policies/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="220" width="220" xml:lang="en">https://canvas.instructure.com/images/canvas/header_canvas_logo@2x.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE8TCCA9mgAwIBAgIJAOBms/PYWcPLMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-VQQGEwJVUzENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkx
-GTAXBgNVBAoTEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsTCk9wZXJhdGlvbnMx
-IDAeBgNVBAMTF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
-FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE1MDQxNTAxMDAwMFoXDTE3MDQyMjAx
-MDAwMFowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRVdGFoMRcwFQYDVQQHEw5T
-YWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
-CxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
-IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDckDPQGWedlVGC2Z9fn1wNFmN+0IPNi6OSE1nM
-voTWx2oZlQepaAu4zI5QqOfnV0rW2V1volpoJbu0WelH0DkGzdOEQdWJjAs3nRBf
-y0evxtpg0tK5kIvGsnN6YcD41YmkfWzvwbMf0cEq1Y0wCmymF6XzOUUE4zsi0nhP
-m2Z7WiuongDQdR01UsDN13YcpD/i1JXr3YtkNnJ/a1Kc9OXNycI8M5NVo5QQgdx/
-Q7zAmTk8p9E0ZRthdOQ/PBicWx39mNmBij5KpqCWlHu3NWdgcG8KXSv5atXU8Crd
-TRJ3aGIEN9vBYIHe8MHGCzs1QlRfJmXFMkeUSOTnJJx78rMDAgMBAAGjggEUMIIB
-EDAdBgNVHQ4EFgQUo0WWVlJ1SxZOs11L85ZAuZGyuzEwgeAGA1UdIwSB2DCB1YAU
-o0WWVlJ1SxZOs11L85ZAuZGyuzGhgbGkga4wgasxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIEwRVdGFoMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5z
-dHJ1Y3R1cmUsIEluYzETMBEGA1UECxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2Fu
-dmFzIFNBTUwgQ2VydGlmaWNhdGUxIjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVj
-dHVyZS5jb22CCQDgZrPz2FnDyzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
-A4IBAQBV3EmmnzYqYQ5fXNZymG2WaspEW0NeFMhDXa3p3AMIQJbnnU14lR7bqIvf
-/bLW1YE0fw1kSzsw8VrkQp7k1U+kaYA3i5/FQBy2WtqUCVq2GXZA2gs5YD4nvJB/
-F57E//0kEhbATZH9+wJqDkqyIgsrSIlJjiXDth1BppGK8weboPtr9sWV24Ui0+ls
-w16XTsGlnRRO19g+gXKOZp5ApXkDrB+HwZQvZxiCuSgvJlcBzMdxVvWSL+vPtg8Y
-shIKzobIhaQ2MzXHLcxrDhW10YFPwDXh8Tfn5iU9ONsaJivuvVhtDYZD1ZzSoPpm
-q4vYqxxY/6rFJhrCtnlLepSaxlXM
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://scccd.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://scccd.test.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://scccd.beta.instructure.com/login/saml/logout"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scccd.instructure.com/saml_consume" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scccd.instructure.com/login/saml" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scccd.beta.instructure.com/saml_consume" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scccd.beta.instructure.com/login/saml" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scccd.test.instructure.com/saml_consume" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scccd.test.instructure.com/login/saml" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">OEI - State Center Community College District- Canvas</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Instructure, Inc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Instructure, Inc</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.instructure.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml b/swamid-interfederations-2.0/school.c2kni.net-shibboleth.xml
deleted file mode 100644
index 3b329efb..00000000
--- a/swamid-interfederations-2.0/school.c2kni.net-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://school.c2kni.net/shibboleth">
-  <!--
-		This is a Shibboleth "C2k" IdP for the Western Education and Library Board.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-21T11:52: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">c2kni.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVALsvx6NLIdhUhxT9mKREB6ksXTLJMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguYzJrbmkubmV0MB4XDTEwMDgxMjEw
-						MzcxN1oXDTMwMDgxMjEwMzcxN1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5jMmtu
-						aS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkD+gWZlQqFrJB
-						yQRfAA7lP5L4bJeiiOEsvjG7LaA3/ZqcA+g8q+FScODRcyX/5OEU/Q1x82xrNAQw
-						cCW0t5m/VaA2aRmxn0eVt9hZop9BtBhhMMALLmh8eYKz8udoO0QNpaYmFVSFoPiL
-						USj+wSmPPkFQZefSDtog6FD0SrAHQw91okx8ng4Zg3MoJtFQ0/V/F/wFMK7YjGYj
-						heTrgBsMYiJf3Oc0YQclckjhdp5j/t553IttizOY1tXEmapAfpiosxVDPClbfBBK
-						Au/qIEF2Gq2yPRIIm+vlujmmW9eaeo1bEqk6J2z8/umD7gkzDBErFve/537oX8di
-						cusmQfeFAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguYzJrbmkubmV0
-						hitodHRwczovL3NoaWJib2xldGguYzJrbmkubmV0L2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBRfggaNcJ76bEhFucG0h3JafiQA5DANBgkqhkiG9w0BAQUFAAOCAQEA
-						HaRM+/rYecDWHpBrYykfl91MAJFE2T4OTCW719CpNh8zG51/AFavDS6Nopm8qibi
-						QjOehBpYlFdtyON8kkcMEKdikR9BW8mnpE8rP581hkfQl47IxX1ckbS5wD9EScWf
-						uKCraaUUkwQ4eSGQwrpkMyKMGaW7irCowInKdiOwvb3AwRQQnpHmrTR7NeoYlWEh
-						euSkfjxXVLnVBwu/4sXAV5NiZCkjNnvTE+jfqI+bYtH/7EI9Q2rn5vdwfTstN7Px
-						roZivJRxgHW76yyE9ASsrzLz3eL4rlbGNK4LCSyWO7I7wsKT0a4XHK3GW/mI5VAS
-						SnrH9o8dANbP72exZm5mEg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kni.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kni.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://shibboleth.c2kni.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.c2kni.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.c2kni.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.c2kni.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">c2kni.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVALsvx6NLIdhUhxT9mKREB6ksXTLJMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGguYzJrbmkubmV0MB4XDTEwMDgxMjEw
-						MzcxN1oXDTMwMDgxMjEwMzcxN1owHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5jMmtu
-						aS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkD+gWZlQqFrJB
-						yQRfAA7lP5L4bJeiiOEsvjG7LaA3/ZqcA+g8q+FScODRcyX/5OEU/Q1x82xrNAQw
-						cCW0t5m/VaA2aRmxn0eVt9hZop9BtBhhMMALLmh8eYKz8udoO0QNpaYmFVSFoPiL
-						USj+wSmPPkFQZefSDtog6FD0SrAHQw91okx8ng4Zg3MoJtFQ0/V/F/wFMK7YjGYj
-						heTrgBsMYiJf3Oc0YQclckjhdp5j/t553IttizOY1tXEmapAfpiosxVDPClbfBBK
-						Au/qIEF2Gq2yPRIIm+vlujmmW9eaeo1bEqk6J2z8/umD7gkzDBErFve/537oX8di
-						cusmQfeFAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGguYzJrbmkubmV0
-						hitodHRwczovL3NoaWJib2xldGguYzJrbmkubmV0L2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBRfggaNcJ76bEhFucG0h3JafiQA5DANBgkqhkiG9w0BAQUFAAOCAQEA
-						HaRM+/rYecDWHpBrYykfl91MAJFE2T4OTCW719CpNh8zG51/AFavDS6Nopm8qibi
-						QjOehBpYlFdtyON8kkcMEKdikR9BW8mnpE8rP581hkfQl47IxX1ckbS5wD9EScWf
-						uKCraaUUkwQ4eSGQwrpkMyKMGaW7irCowInKdiOwvb3AwRQQnpHmrTR7NeoYlWEh
-						euSkfjxXVLnVBwu/4sXAV5NiZCkjNnvTE+jfqI+bYtH/7EI9Q2rn5vdwfTstN7Px
-						roZivJRxgHW76yyE9ASsrzLz3eL4rlbGNK4LCSyWO7I7wsKT0a4XHK3GW/mI5VAS
-						SnrH9o8dANbP72exZm5mEg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kni.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kni.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">Western Education and Library Board</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">C2k (Western Education Library Board)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.c2kni.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Joe</GivenName>
-    <SurName>Boyle</SurName>
-    <EmailAddress>mailto:joe.boyle@capita.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Joe</GivenName>
-    <SurName>Boyle</SurName>
-    <EmailAddress>mailto:joe.boyle@capita.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml b/swamid-interfederations-2.0/sci-bath.calpendo.com-shibboleth.xml
deleted file mode 100644
index 7f65c1d0..00000000
--- a/swamid-interfederations-2.0/sci-bath.calpendo.com-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://sci-bath.calpendo.com/shibboleth">
-  <!--
-		This is a "Calpendo for University of Bath" Shibboleth SP for Exprodo Software 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="2015-09-14T14:30:23Z">
-      <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://sci-bath.calpendo.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://sci-bath.calpendo.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://sci-bath.calpendo.com/Shibboleth.sso/Login" index="2"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sci-bath.calpendo.com/Shibboleth.sso/Login" index="3"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Calpendo for University of Bath</mdui:DisplayName>
-        <mdui:Logo height="100" width="271">https://downloads.exprodo.com/images/exprodo-software_271x100.png</mdui:Logo>
-        <mdui:Description xml:lang="en">Core facility management, booking system and web-based database for research/clinical facilities.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHDCCAgSgAwIBAgIJALCR79ZDW2xvMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHNoaWIuZXhwcm9kby5jb20wHhcNMTUwNjIyMTUyMTAxWhcNMjUwNjE5MTUy
-						MTAxWjAbMRkwFwYDVQQDExBzaGliLmV4cHJvZG8uY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAlihJNaZPZ3oGM5NQlpgwJUJxlWZ8rbWrx9Kk5rPB
-						4Fb0C6CH+YIOKHb9sxVXPL5Vi9JypYE0Y7JRFEKf7qzbFNTEDAKhq0hjJ+XMWiVq
-						PJjbKYW4LJtM05DoPpTe/gKZJRaktGUDGu8m5ifLtd7klhFQmV0duDriDEPiW4ik
-						LeYZGiReIkvWSx4kFnQbERYuyrjXPOnhKw8pnv4HuzR/Js4tmUQbMy9VPbjbWSET
-						o2x9TfCubitIiOguXNGU8hcOv+ys/sWKTddPQ8208qpsfQLo+YSm9NmYDn3bJ3tg
-						SdA/9OTLJSjTZrz7RUZUeCYF/yv0vhRpicDDg1Ym8kdtCQIDAQABo2MwYTBABgNV
-						HREEOTA3ghBzaGliLmV4cHJvZG8uY29thiNodHRwczovL3NoaWIuZXhwcm9kby5j
-						b20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU7xBaV9vU2BCTDlQLhTkL5L6/1ckwDQYJ
-						KoZIhvcNAQEFBQADggEBAChUHGR1vS+giyhBJLy6gvfWFpfmo6dJlVn9zTIiztus
-						SNX3AR7Xe3KLO+YV/8r1vUz5WO+xnUwFQd7Et20M5oeeZqbDqyPJqynepUZ3NeE5
-						GfzERa8Rdvr6t6HoY0H19u0IMiMemtxQpFDt2uLtkawJLw7L3A2hUdbVta8MyUAQ
-						7WV7raxbNae56DlNuivOY2kkEl9T39xiLNpQ4cHtB2Z1uGLxPcE49j1AzfAM5ugk
-						29ai5m2neGiTzsvlEvw88pW7CMGcfZEPNsDA4zbQNTAu0FYIhrP60+OifLLZoMen
-						lT/unHR4GJe4dtKbypAo6cvgW2Uu7aCV0wO0ni7MiCE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sci-bath.calpendo.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sci-bath.calpendo.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">Calpendo for University of Bath</ServiceName>
-      <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">Exprodo Software Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Calpendo for University of Bath</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.exprodo.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Robinson</SurName>
-    <EmailAddress>mailto:paul@exprodo.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Robinson</SurName>
-    <EmailAddress>mailto:paul@exprodo.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml b/swamid-interfederations-2.0/sci-ware-customer.com-swldev-shibboleth.xml
deleted file mode 100644
index 6d93c4cb..00000000
--- a/swamid-interfederations-2.0/sci-ware-customer.com-swldev-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://sci-ware-customer.com/swldev/shibboleth">
-  <!--
-		This is a "Science Warehouse SwlDev" Shibboleth SP for Science Warehouse 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="2015-11-05T10:52: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://swldev.sci-ware-customer.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://swldev.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAPftzawoE6U+MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGlwLTEwLTk1LTE0Mi0xNDUwHhcNMTUxMTAzMTcyNzM1WhcNMjUxMDMxMTcy
-						NzM1WjAbMRkwFwYDVQQDExBpcC0xMC05NS0xNDItMTQ1MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAt9QCuEdzCjpBx2LtXLKhEWsjsBrd/4Uxkeh1/o6d
-						IPPJZHrPMhaSb3TXfWqZhNNQEomI5rPd7LTNVgcGxAG9DVU3RBZc2TqaZgvP18xh
-						IxF8SZk7tuR+HarVUXZMZJgf/yprQS8db4LCliqh1RPce5KylslsXktyjpg5AEwA
-						qCd+8dC3+qw54WAG/pj28qbXNqwUm9BHWI50JN/HmhcvJgLKofbhwoJoGUPbO21e
-						yFpGe1nQ91wLR8uLkzMb+LhFXwBNTpQ0AIIcIZ7ce6WirYRWSUrdNbWZ/nvSjq8f
-						NwAmUrfSXOzSjdQQa8M1nwBZ3uCATyE6S/eTU0TEFXgD4QIDAQABoz4wPDAbBgNV
-						HREEFDASghBpcC0xMC05NS0xNDItMTQ1MB0GA1UdDgQWBBSOvn0o+/xiKTdakpuz
-						sxefHX8ufTANBgkqhkiG9w0BAQUFAAOCAQEAIj+36LqW5NZsoBDUVA7L0/U3XTS3
-						N36rYaoT8ibqj7Ol43DYC+kREavEEYF8NAPiNp06MhcZ5+NLpT0Z+lrNeLYyFN38
-						M9HxcgrQV6syB3l09nUJaTCl4G1izUVAA0dVKWjI6qIOqrpMp2PcE181Z25lSl9b
-						WEz45qKTxs3bvMp+hgi9WVwQX8kWvzKA3CGqCwFgcZSi58kn5/lcmNpaYCK+cNZH
-						eAquk+r1oYNyazGO4kkBhsYJ33hi9+G5ZJJkBHK8mHvvJMsWmN5ISQSUE0H+5yxy
-						YCzUShNiI4OLItnjtZBuovyi9S3CB0BebK30iaLYM/LXpVI124hiqCbvdQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://swldev.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://swldev.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Science Warehouse Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Science Warehouse SwlDev</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sci-ware.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alexei</GivenName>
-    <SurName>Blue</SurName>
-    <EmailAddress>mailto:alexei.blue@sci-ware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alexei</GivenName>
-    <SurName>Blue</SurName>
-    <EmailAddress>mailto:alexei.blue@sci-ware.com</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 37fd646f..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://science-gateway.chain-project.eu/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://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>
-  </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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE8TCCA9mgAwIBAgIRAJkwiwyfpx7usj9S/zvy7rIwDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTUwNTA3MDAwMDAwWhcNMTgwNTA2MjM1OTU5WjBLMSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxJjAkBgNVBAMTHXNjaWVuY2UtZ2F0
-ZXdheS5yb21hMy5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAyzvRvoZbRbXCb5eTXKcL9zK6ZQGX/e4ccq5S+3FWoydzIjkU9LZ79o3hkwHU
-g+OSIJFs9GKYrMvVBgiG3+BY2DGyCmH+XEigqw43pmkC9VTK8bl6J8sOWjFbGC/X
-Aq3Z7gcpzA6kjCkGqTszC/Duid/J/rBHoFJXZrWljAnbYFEeYm9v9IgYtOOQzYtU
-Gx4qBSMfCgFl4OcpfRre+UPNA0+2srdcX88HxtdRNBODoIsD9o4d8f0LkSVXVwv1
-WzJycCGsUTPOTAExrjQGvK1Ufsfy8I/yRTgTc9SnwTixyQ+nSLjdR3I4EsrPEUUx
-8bAAAhwjctyC6rz9hjIBdjRDVQIDAQABo4IBtTCCAbEwHwYDVR0jBBgwFoAUW9CK
-HJoyW+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFBD3hmwITDYUQR2HIerZcvF9dMsX
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
-ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVS
-RU5BU1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6
-Ly9jcnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzAB
-hhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMGQGA1UdEQRdMFuCHXNjaWVuY2Ut
-Z2F0ZXdheS5yb21hMy5pbmZuLml0ghhncmlkc3J2LTAzLnJvbWEzLmluZm4uaXSC
-IHNjaWVuY2UtZ2F0ZXdheS5jaGFpbi1wcm9qZWN0LmV1MA0GCSqGSIb3DQEBCwUA
-A4IBAQBRQFOhixQr232gE3iNYIth4OzlMwK3pftdxdsgt3rrOHQBHFv5QBbZL42m
-0KH+EwUtk1fjDtg4FHWqnEC+GgLgNouvSiFCR0Sa/mQPx7aya+j4F0kslz/7yazI
-9bdgXkwuetwmHX1lGtbw3aUKokULJhPUu2yvxPe5fC+YwJYBzeuVn6EOITXdjHRQ
-/1e8otsVnM4pm8JDKkS1ZXWPrQf4XrmYhUDC5vyIaVJNONlWVeUaHxkLf4mP2d2x
-yfCKbqhsoCXGNbLT2AgzayLYMJRckuTX3VNGFDTdbiFiv62Z842eKkLYlpRYxUi/
-+3A6Rx0nC5V7eKNZwLSToOSPSEQA
-</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://science-gateway.chain-project.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">CHAIN-REDS Science Gateway</md:ServiceName>
-      <md: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)</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN ROMA3</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INFN ROMA3</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.roma3.infn.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml b/swamid-interfederations-2.0/scitation.aip.org-shibboleth.xml
deleted file mode 100644
index 8403bfc8..00000000
--- a/swamid-interfederations-2.0/scitation.aip.org-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://scitation.aip.org/shibboleth">
-  <!--
-		This is a "Scitation" OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-09T11:18:55Z">
-      <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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDnDCCAoSgAwIBAgIEUdvRkTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDcwOTA5
-						MDIwOVoXDTE2MDcwODA5MDIwOVowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAIqfzThQ2R8sCWiSeU7PeibXuB31/Ey51i4rdZwIcTeNRRcDxH5PYjLD
-						NjSwarBEIgTyFxmByOrkAZzaExBpdGtNrDo7b6fyI7966gCDEYO4Sh1ZKZxWQsbu
-						zQwQjovDrlqUnGa3z/h2UfilQY8wtc/2wF1/rZbqRnqMjVCwJsaFyo2OlwUh2xWu
-						gPL2usYYVkBr0qdYfjs3zxy7U+dWN1oYu3Ing9GUx7ueT/9nWUQX+4TzSCjzGb3Z
-						xRrjkEwUrRu6KXuaMVqrZbAzQboEh4HVXp7VKJijCG0gisXdcEMqBblsCtthRYkw
-						7V59Q/K8owmELbi0vaii1t0c0GQg3GMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						hiHnQS4R1ji95KCr9u+67dPdC9qTwFpo8/znSwFAC6aGbMX68swzifkIqDbgSAOY
-						NPGZCyRV4wz2gpBnVXOm9wVJvdGylmrk8dfakKwzljTKEm2+Xqq6CHD3QSQpjRrG
-						X7eKZgK+HyDDiVmFAenAzSkAHazV0I0wWOFnZp5lgrU66YggtaZMHk19Nf4ZXJuD
-						dYsGoaLN6fCVEuPStNGZ32wu4CH6sUWhi2OhlJl+rF/Z7zBFpydwMFSfd+DFUUlg
-						GOvb1z0peq8ppMqO8yvvnURF4k8T2Lzt8COgRkumpQztylohokSI0GrtCbsntZn8
-						Q0pEiZ1n5ClvAkHcGhpYog==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://scitation.aip.org/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://scitation.aip.org/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Scitation</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://scitation.aip.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Help</GivenName>
-    <EmailAddress>mailto:help@scitation.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:openathens@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scotlandonscreen.org.uk-shibboleth.xml b/swamid-interfederations-2.0/scotlandonscreen.org.uk-shibboleth.xml
deleted file mode 100644
index 33bb63a7..00000000
--- a/swamid-interfederations-2.0/scotlandonscreen.org.uk-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://scotlandonscreen.org.uk/shibboleth">
-  <!--
-		This is a "Scotland on Screen" Shibboleth SP for Scottish Film Ltd.
-	-->
-  <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="2016-01-19T16:04:50Z">
-      <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://scotlandonscreen.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://scotlandonscreen.org.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Scotland on Screen</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Access to hundreds of historical Scottish film clips from the NLS Moving Image Archive.</mdui:Description>
-        <mdui:Logo height="120" width="320">https://scotlandonscreen.org.uk/sites/default/files/SOS-UK-Federation-SSO-Logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJALvpeqGCbrAQMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCWxvY2FsaG9zdDAeFw0xNjAxMTkxNTEyMjFaFw0yNjAxMTYxNTEyMjFaMBQx
-						EjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAM5SsuMdGSD8tkkEq6thm77ZbSDuB4idZrhgFu9pRwJ5c6YqrOhPxQEjNjVZ
-						KXOuEJRHlgWc2evrvn8Cx+ofJGbTrwGMG6ueWxC+6Nfkd5QGKeI3y+4XbWv0o/Bu
-						S5HuzxqcuCvFOX4ZCsCPyl7ruYzI/mI76/wqPARQpt+du1qqLM579CDDBe/ozd2R
-						8buo6Kx/0JTKdNHwMFJaZ1QA1+6kWzFTbqLwRluHnOepOOtbVioKXE1qom1gtcoV
-						akKXtbNhAFEVC+GyiSD//Eiz+5Oey+t/XFoYHVImoHytHvt8Vwshbz624ADyBcmS
-						znilw+6WkPiRVPBo5qD6jZKmzekCAwEAAaM3MDUwFAYDVR0RBA0wC4IJbG9jYWxo
-						b3N0MB0GA1UdDgQWBBRT/yO7ueYOX/mF++TAc1dUz5sVozANBgkqhkiG9w0BAQUF
-						AAOCAQEAN/YX3n+LpBWiByVxrBYkLl8dJDMjUy6Aqn4gYjCtY2Ljia5USA70tqy9
-						fQ8fIynCIFMVl6JpxxVE9olv63qIT0kGF4Q3wBZn3SyyqG60HSH7CyjpKM7jFzC7
-						sZYgGhTOna/N7I+3Mmo0v4gOVwHOcEpQZdcXbrV4t539NKa8kO7vrmp8CbYircd1
-						hqPtZldMR6qoV+kwL1MT1AdOMxS6AMtkZHkoGBC7G0BXHhYZxAdDloSNZ7Clbl10
-						3Fh80Lk8STk4KhOTz/TCixAzlwYWnvQta3rwkjutFhmMCNmInc8+W4zpQ3GO26Y2
-						3BS6l6Hdh67Mi3kGZWtG6W0K3ehc3g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://scotlandonscreen.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://scotlandonscreen.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Scottish Film Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Scotland on Screen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://scotlandonscreen.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paolo</GivenName>
-    <SurName>Ciarrocca</SurName>
-    <EmailAddress>mailto:web@scottishfilm.scot</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paolo</GivenName>
-    <SurName>Ciarrocca</SurName>
-    <EmailAddress>mailto:web@scottishfilm.scot</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/scsh.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/scsh.scran.ac.uk-shibboleth.xml
deleted file mode 100644
index 712eb9c8..00000000
--- a/swamid-interfederations-2.0/scsh.scran.ac.uk-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://scsh.scran.ac.uk/shibboleth">
-  <!--
-		This is a "Screening Shorts" Shibboleth SP for 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-14T14:42:36Z"/>
-  </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">Screening Shorts</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A resource developed by Creative Scotland and Education Scotland to help teachers deliver moving image education (MIE).</mdui:Description>
-        <mdui:Logo height="69" width="250">https://shib.scran.ac.uk/images/logo-scsh.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-scsh.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/scsh/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/scsh/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://www.scran.ac.uk/scsh/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/scsh/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/scsh/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/scsh/Shibboleth.sso/DS/UKFederation" 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://shib.scran.ac.uk/scsh/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/scsh/Shibboleth.sso/glow"/>
-    </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/scsh/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/scsh/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/scsh/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Scran Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Screening Shorts</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.screeningshorts.org.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/sdauth.sciencedirect.com-.xml b/swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml
deleted file mode 100644
index 3fe18cd5..00000000
--- a/swamid-interfederations-2.0/sdauth.sciencedirect.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://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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Elsevier Service Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Elsevier Service Provider</mdui:Description>
-        <mdui:Logo height="80" width="73">https://origin-cdn.els-cdn.com/sd/elsevier.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <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://cdc310-auth.elsevier.com/SHIRE/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc310-auth.elsevier.com/SHIRE/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc312-auth.elsevier.com/SHIRE/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc312-auth.elsevier.com/SHIRE/SAML/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc313-auth.elsevier.com/SHIRE/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc313-auth.elsevier.com/SHIRE/SAML/POST" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc315-auth.elsevier.com/SHIRE/SAML2/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-auth.elsevier.com/SHIRE/SAML/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc316-auth.elsevier.com/SHIRE/SAML2/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc316-auth.elsevier.com/SHIRE/SAML/POST" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cdc327-auth.elsevier.com/SHIRE/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc327-auth.elsevier.com/SHIRE/SAML/POST" index="14"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Elsevier B.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Elsevier: ScienceDirect</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.elsevier.com/</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 e52f4cb6..00000000
--- a/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sdauth.sciencedirect.com/">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
-MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
-ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
-NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
-a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
-AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
-OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
-ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
-RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
-aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
-aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
-WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
-GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
-hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
-mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
-Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
-0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
-TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
-W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sdauth.sciencedirect.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sdauth.sciencedirect.com,O=LEXIS-NEXIS,L=Miamisburg,ST=Ohio,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIQcnUO443C8KNKHyRLUr2XozANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwMjE4
-MDAwMDAwWhcNMTMwMjE3MjM1OTU5WjBqMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-T2hpbzETMBEGA1UEBxQKTWlhbWlzYnVyZzEUMBIGA1UEChQLTEVYSVMtTkVYSVMx
-ITAfBgNVBAMUGHNkYXV0aC5zY2llbmNlZGlyZWN0LmNvbTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAxZRByUrTzCOL4u/Iclvizru1AenEGxrmfWLRzD8dA67G
-NNs+f2Uko+8ZxQ/cy++7pyyRpQdnt3WZNsgHZh6bHkAWVPBhG1AMto+5S4D+hfEZ
-a039dfEtwdoAcyYDmY4h51sempkYyFineRX0FFxT+YK3vgWnsmY8c/1uXLhmLBsC
-AwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDww
-OqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJT
-ZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19
-RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlz
-aWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVy
-aXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFow
-WDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEF
-GDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZI
-hvcNAQEFBQADggEBACCEW1w3Na8Q+NYj9vKani/dzxCFhiiRkJ4AcgDP33CDqcfE
-mOoj/5KBCzU8Q4uZaiIdFUNHhiXil2vyN7v3v4L9BKRr/NH01IBdEleHSAhNDFxv
-Gi1fCjC+ZkFuxxYFvQCOPwMRAUHLUOPrK5Ync5OhxSTDPOSNEOcQcaK9rQMcyoAR
-0B4mWXwz1Di4tqhRaZUqfCsz6vRAjMXvNCaooxO6N1fgKtMazZUNyfME1j/+rmYf
-TPs9lp19HMusiKjQJn5aU9HVrKDz+wVrxCCYAuMIz4IM/hV5G+JTvUk0xVRv/qQT
-W6AUlsL/QGXKT+7FzAl3lNICd4Leghc4VLa1hDQ=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sdauth.sciencedirect.com/SHIRE/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc315-sdauth.sciencedirect.com/SHIRE/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Elsevier</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Elsevier ScienceDirect</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.elsevier.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Elsevier</GivenName>
-    <SurName>Shibboleth Support</SurName>
-    <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Elsevier</GivenName>
-    <SurName>Shibboleth Support</SurName>
-    <EmailAddress>shibbolethsupport@elsevier.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sdn-openstack.oit.duke.edu.xml b/swamid-interfederations-2.0/sdn-openstack.oit.duke.edu.xml
deleted file mode 100644
index f5219deb..00000000
--- a/swamid-interfederations-2.0/sdn-openstack.oit.duke.edu.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://sdn-openstack.oit.duke.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://sdn-openstack-dev-01.oit.duke.edu/Shibboleth.sso/Login" 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="http://sdn-openstack-dev-01.oit.duke.edu:5000/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">OpenStack for Research</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKjCCAhKgAwIBAgIJAOJfno4EnLE6MA0GCSqGSIb3DQEBBQUAMCwxKjAoBgNV
-BAMTIXNkbi1vcGVuc3RhY2stZGV2LTAxLm9pdC5kdWtlLmVkdTAeFw0xNjAxMTIx
-ODEyMTZaFw0yNjAxMDkxODEyMTZaMCwxKjAoBgNVBAMTIXNkbi1vcGVuc3RhY2st
-ZGV2LTAxLm9pdC5kdWtlLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMVe4zmeL0wgsAe9egTdVQk3B6aqbsGc6PQ/twlFzMFDFc3hlC8RLw4YIpnx
-2ScFpuI1DVPqsKsC7l2wsXbBO7THYRGmmEjNjVbuYFXUC7mt8A4lluXzJjROJDBx
-dT6++d48bD81SnoLpU5wrr0JXiYNy3JxeVKshdGt9YutLLmlF91D4jOwxLt2s7op
-XXNBqspAHkZvK+TZIboUPHoycjHrFYW1xqjarwpTEpkfzyKmb12faqr78nWLISID
-Urd90Ysdwl+nPbg93Ce/zmpX1jVHnNb3zKhISYTk85uUgLYF0j6+jz9XDqZVCA7b
-BwlkwOFFG1yHMatuDRk+hlJ66DECAwEAAaNPME0wLAYDVR0RBCUwI4Ihc2RuLW9w
-ZW5zdGFjay1kZXYtMDEub2l0LmR1a2UuZWR1MB0GA1UdDgQWBBSSiEcxZhDYi+9c
-SDTGY+oXd35CoDANBgkqhkiG9w0BAQUFAAOCAQEAKMnx2FRBy7I8kIJZy3TIuCEC
-IMqyOyCo7WxVBFcA3nJPurO2SNrvC2nNWG/WKvaga+ggMos5IcDiGwNPOtRiC3MS
-fApVKRbwBCb6vxkwnM3rtLzPVGL+5Hsmsxjk82Xy8m6+JubK0XTP4xkhrIwyqj3O
-CriPKh1LYjUQ7p2mF0qQnw0mFvkCgHgKeqx7llzFMKzxk+xAXDcnunXGRB2xVHDL
-JJ7lo9u+ITPEMRXy4dr9NjWXfHVDRBdIq12HG5OR+KBomJSSLoF4B/+Lw8e5UA4k
-hqZYCJefeTUol0vkdULhuiJHN1eaOWijZo9sbu1cYeHxwVXo1hN00PS4WuJ+hg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sdn-openstack-dev-01.oit.duke.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://sdn-openstack-dev-01.oit.duke.edu:5000/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://sdn-openstack-dev-01.oit.duke.edu:5000/v3/auth/OS-FEDERATION/websso/saml2" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sdn-openstack.oit.duke.edu/Shibboleth.sso/SAML2/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://sdn-openstack.oit.duke.edu:5000/Shibboleth.sso/SAML2/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://sdn-openstack.oit.duke.edu:5000/v3/auth/OS-FEDERATION/websso/saml2" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">OpenStack for Research</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Duke University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Duke University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.duke.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rob Carter</md:GivenName>
-    <md:EmailAddress>rob@duke.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shilen Patel</md:GivenName>
-    <md:EmailAddress>shilen@duke.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 687f8b6c..00000000
--- a/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sds.geschkult.fu-berlin.de/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-11-27T10:01:09Z">
-      <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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <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>MIIGHzCCBQegAwIBAgIHGPldZLrBDjANBgkqhkiG9w0BAQsFADCBtTELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
-ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
-A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
-HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTUwMjEwMTAzOTE2WhcN
-MTkwNzA5MjM1OTAwWjCBszELMAkGA1UEBhMCREUxDzANBgNVBAgMBkJlcmxpbjEP
-MA0GA1UEBwwGQmVybGluMSIwIAYDVQQKDBlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
-bGluMTkwNwYDVQQLDDBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
-d2lzc2Vuc2NoYWZ0ZW4xIzAhBgNVBAMMGnNkcy5nZXNjaGt1bHQuZnUtYmVybGlu
-LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxQiC2Eb0zNzFtrlQ
-FMqNF4v5tTD2G4MRUDCu6j2q44u6KIq8MmUj0kmEEEwPp+SM2KgBjvWGFbi6JRxo
-KVPgqo7lSMSOxWzvPtdpMet5FNWl1fMCRff35GsWHb9eM7eE6QZDc4zNyyOCWHYk
-f/fwzWk4a5asHg00+92I1WI9+6Qud5IR4jrvoMG7Jbt3vZQLJeCxiwdiNaK+5QxO
-p/H4zXwqrUZsGCovnpgTYXJ70blUzgScyeDc0mceFActrimEfWgSM0jCIsqSALDF
-PSeQLDrLYmFsp/qWN/UeTU2KvO05CQc88f4OcwwTyZ9Bz8M2XElXT9g47eZQDImh
-PFl+PwIDAQABo4ICMjCCAi4wTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwMw
-EQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGC
-LB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIG
-CCsGAQUFBwMBMB0GA1UdDgQWBBS+8dPy2YsDwhLcALXLrUDmTPk7oTAfBgNVHSME
-GDAWgBQG4T30b/Qwt3o7V7AxBYl7DVhabDAlBgNVHREEHjAcghpzZHMuZ2VzY2hr
-dWx0LmZ1LWJlcmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHFBggrBgEF
-BQcBAQSBuDCBtTAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9P
-Q1NQLVNlcnZlci9PQ1NQMD4GCCsGAQUFBzAChjJodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL2Z1LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA+BggrBgEFBQcwAoYyaHR0
-cDovL2NkcDIucGNhLmRmbi5kZS9mdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQELBQADggEBABvBL8LrCEwVzArAZ4PVyQSg20buTtyqg/O8rs45
-BUyFP3s10JQH2VMIIkZdSOwy6uBpHdvPN+QIVBz/6j6/awFAPnrDwux/1vH5OgCP
-UDG3QmeebcWtz+uhQR/LXKK5mqD46TLan1WHj1fnDCK678pIaqNefn71IO9wGuLZ
-tM3XDmc1x9DkR22n8kKDNVQvH74LoeMXkT73W6qESha0+K9l+UzJ6/xmsOdWU2m/
-pq5Smjy+M9orfvsuXQYOzxfnYBUIEoyD9eVc2OjiwKy5VA9tISMBiS9Oyx2n42Pe
-TJpLI0EqYx0IYLCS+WkpctBenwMkYEuIOu88njquyjpZqjY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/SOAP"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Kunst und Funktion</md:ServiceName>
-      <md:ServiceName xml:lang="en">Kunst und Funktion</md:ServiceName>
-      <md: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.</md:ServiceDescription>
-      <md: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.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e5</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e5</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Freie Universität Berlin</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Freie Universität Berlin</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">https://identity.fu-berlin.de/idp-fub/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://identity.fu-berlin.de/idp-fub/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Funktionsadresse</md:GivenName>
-    <md:SurName>IT des Fachbereichs Geschichts- und Kulturwissenschaften</md:SurName>
-    <md:EmailAddress>mailto:servermaster@geschkult.fu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Funktionsadresse</md:GivenName>
-    <md:SurName>IT-Support des Fachbereichs Geschichts- und Kulturwissenschaften</md:SurName>
-    <md:EmailAddress>mailto:support@geschkult.fu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 31d381f0..00000000
--- a/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://search.de.dariah.eu/schereg">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-12T10:39:48Z">
-      <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:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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://search.de.dariah.eu/schereg/saml/login/alias/schereg" 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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/schereg/saml/SingleLogout/alias/schereg"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.de.dariah.eu/schereg/saml/SingleLogout/alias/schereg"/>
-    <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-Artifact" Location="https://search.de.dariah.eu/schereg/saml/SSO/alias/schereg" index="0"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">DARIAH Schema Registry</md:ServiceName>
-      <md:ServiceName xml:lang="en">DARIAH Schema Registry</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">DARIAH Schema Registry</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">DARIAH Schema Registry</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tobias</md:GivenName>
-    <md:SurName>Gradl</md:SurName>
-    <md:EmailAddress>mailto:tobias.gradl@uni-bamberg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Dariah</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 fa187d3f..00000000
--- a/swamid-interfederations-2.0/search.de.dariah.eu-search.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://search.de.dariah.eu/search">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-12T10:40: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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <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://search.de.dariah.eu/search/saml/login/alias/search" 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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/search/saml/SingleLogout/alias/search"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.de.dariah.eu/search/saml/SingleLogout/alias/search"/>
-    <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-Artifact" Location="https://search.de.dariah.eu/search/saml/SSO/alias/search" index="0"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">DARIAH Generic Search</md:ServiceName>
-      <md:ServiceName xml:lang="en">DARIAH Generic Search</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">DARIAH Generic Search</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">DARIAH Generic Search</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tobias</md:GivenName>
-    <md:SurName>Gradl</md:SurName>
-    <md:EmailAddress>mailto:tobias.gradl@uni-bamberg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Dariah</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:register@dariah.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml b/swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml
deleted file mode 100644
index 69cc1efa..00000000
--- a/swamid-interfederations-2.0/search.edusphere.lu-Shibboleth.sso-Metadata.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://search.edusphere.lu/Shibboleth.sso/Metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-07-07T08:20:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-02.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">eduSphere Repository (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">eduSphere Repository (TEST)</mdui:Description>
-        <mdui:Description xml:lang="fr">eduSphere Repository (TEST)</mdui:Description>
-        <mdui:Description xml:lang="de">eduSphere Repository (TEST)</mdui:Description>
-        <mdui:Description xml:lang="lb">eduSphere Repository (TEST)</mdui:Description>
-        <mdui:Keywords xml:lang="en">eduSphere Repository</mdui:Keywords>
-        <mdui:Logo height="39" width="100" xml:lang="en">http://www.edusphere.lu/wp-content/uploads/2015/03/logo-eduSphere.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://search.edusphere.lu/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://search.edusphere.lu/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://search.edusphere.lu/Shibboleth.sso/Metadata</ds:KeyName>
-        <ds:KeyName>search.edusphere.lu</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=search.edusphere.lu</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFNTCCAx2gAwIBAgIJAIkhjM9ScBFDMA0GCSqGSIb3DQEBDQUAMB4xHDAaBgNV
-BAMTE3NlYXJjaC5lZHVzcGhlcmUubHUwHhcNMTUxMDI5MTIyMDU4WhcNMjUxMDI2
-MTIyMDU4WjAeMRwwGgYDVQQDExNzZWFyY2guZWR1c3BoZXJlLmx1MIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuNZkuqPOUYwgBNjScaDTt8VtHAUJkRrf
-A7R1mErGUfaoxcjIIRX7IWCIKZqYaZdoKq+qVhNrihyDGK+GIFQVt8Zg6LRLvFAM
-H6/52L/yvNm5ILSFy6XnHYGFMCx/WtnuDpzhUurf6sQDwpIz8gKnjorfObn8IkPn
-wN9S+Zj0x12uppd0nvimCDSxqMUDbh/IAAmSSSr2TZ19OW7DgFIGY/9cv0txXpj1
-8mc///oCLQ42giSkVmxYRxVbkXHcrmT731dkhEuwOqv4NNwWeg6I1xHJPgOqhToL
-u8ODNBmYtUbFc+A4bpc6HpAHS9WSB02bkroDog04GKW6KZqp9+j4XfYjTE7b0e1p
-H15CbtuBei3nppyP3K+30kcMG3i7guJhy0GDZrWLWNrHddyaby7AKqk8DDlbImIG
-/XdZRmR+KpwhxVRluWE9K32P/HvKnDtSs/p/inelT+W/J2u5ZRYmjDWbL5zDxv0b
-qr+JwnPg8LAduiWfLcGu2ft53iH4YtbtBWR1kR3ltvvHTiihWYIyjqm+Tz1xAtOE
-+uH1IU4Uo6O5LevqfW9kzh4n/05rCpd8kYuFDR827FS2/+cVKbjyPvhev9E4ALjV
-5ekuOzPDLZ5GmBB55bbsNBCrQPlbINjehWEp6mXQQiaDRq0MsoSDvEPEfY7JYXcc
-hsryr2Y4O6sCAwEAAaN2MHQwUwYDVR0RBEwwSoITc2VhcmNoLmVkdXNwaGVyZS5s
-dYYzaHR0cHM6Ly9zZWFyY2guZWR1c3BoZXJlLmx1L1NoaWJib2xldGguc3NvL01l
-dGFkYXRhMB0GA1UdDgQWBBTB3QxElJ7T/U+zGi8VpxziqCmlrTANBgkqhkiG9w0B
-AQ0FAAOCAgEARqnwupw8BmGSCwPmzSQvL+rIRViN+NomGcs5ZuqZtYyrHU4ukPdK
-Kp9pE7Vgq3RxVF5lnPtnShIjg6vMGR/gztRg3/t2PmXZPU/aVag5FNLCinV2uS7h
-wT34YTUs44cN00ENo7EdmDay7CJHq8doadWKBBmQrL4dRm/jc2RoaeDrYF1H/lSr
-dCkLuP/Wsccn4R3ybYc8dfuPz1NKDa0luCmp2epEtcwbEGKyUkvjXEWO4NVF+d0z
-5Jzmyavc8WZp/V0UfRl1X3ANhzpqBtxgspl9/amaD5IOcuWwxAevkfH3J0eWxin/
-ciB6EHB9MUEvnpDaIn3qLBqI0JyJbAjBjzRfiJanARR0rRKvpfHt4eJDVlnucjxy
-iRumxhYBn03lEzAI7SGbd5kCHsPkHb/SaozZk4rHUPuIc9dSWD/Z7etDjS++Avwv
-2otdKYG/i347O2sjh/Y31uoThynHZOThIMNVHzYYutA0NwfzYG4s+Ama1XCEOh5g
-mCuDGuwPo68IZYRHU6KEx9JBJAJ/yoOxiSTG35rau4lIeOulcnS3PvcIwOMoxJ8f
-h5uzEETXp2xNkw59WdhPREf0/Z6BvNqohgAGSX3kiiphFJlLQHrJA40y3yfcZvH3
-epmQlqycyg3pWXHGI7YitqTUMbAI6gy9z7a6rXcaDmJrb1BxF/iRzkg=
-</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://search.edusphere.lu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.edusphere.lu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://search.edusphere.lu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">https://search.edusphere.lu/Shibboleth.sso/Metadata</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="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="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="MEN-currentstudentassignments" Name="MEN-currentstudentassignments" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="MEN-currentteachingassignments" Name="MEN-currentteachingassignments" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="MEN-currentotherassignments" Name="MEN-currentotherassignments" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Centre de Gestion Informatique de l'Education</md:OrganizationName>
-    <md:OrganizationName xml:lang="fr">Centre de Gestion Informatique de l'Education</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Centre de Gestion Informatique de l'Education</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">Centre de Gestion Informatique de l'Education</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.edusphere.lu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.edusphere.lu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Carlos</md:GivenName>
-    <md:SurName>Gamboa</md:SurName>
-    <md:EmailAddress>mailto:carlos.gamboa@edusphere.lu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Carlos</md:GivenName>
-    <md:SurName>Gamboa</md:SurName>
-    <md:EmailAddress>mailto:carlos.gamboa@edusphere.lu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.aleks.com-shibboleth-sp.xml b/swamid-interfederations-2.0/secure.aleks.com-shibboleth-sp.xml
deleted file mode 100644
index 5833b51b..00000000
--- a/swamid-interfederations-2.0/secure.aleks.com-shibboleth-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://secure.aleks.com/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://secure.aleks.com/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ALEKS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ALEKS is an artificially intelligent assessment and learning system founded on ground-breaking research in mathematical cognitive science.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.aleks.com/about_aleks/overview</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.aleks.com/privacy_statement</mdui:PrivacyStatementURL>
-        <mdui:Logo height="41" width="206" xml:lang="en">https://www.aleks.com/aleks/logo_top.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIJAKOVM4UJy40CMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHNlY3VyZS5hbGVrcy5jb20wHhcNMTAwNzE0MTc1NDE5WhcNMjAwNzExMTc1
-NDE5WjAbMRkwFwYDVQQDExBzZWN1cmUuYWxla3MuY29tMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAssrsXAPOcRLQRZxL8MwW3N7sWTsj4qIU4TKhxhZI
-5DNcaBdQ0r7jOfScs5nmKynwHoKFZqbOF35u92xg01KD3OhKLn8B2DV8y3e3Ve73
-UYf7BlRQlUrdaW2v9uUujpGtao0erIybPsm2CwyaatFoFShqxQx+n9cbY/u85/Kg
-z+XCvJSa+vQgN/v4tkM3Ts8b/THzSDr9lSxOrU2FfZ4VVy2BvJCuNuKVM3gSDzf7
-TWtS+DlOMwBCHHd3nj9DYK6IgcNOk7jnj2aAKi0vKgALDTCglgANJbA38jeuvpSf
-F49rq79Jv/qNppza1WqZZAjD2DSxv3YUD+SkB6PYLGYyxwIDAQABo2YwZDBDBgNV
-HREEPDA6ghBzZWN1cmUuYWxla3MuY29thiZodHRwczovL3NlY3VyZS5hbGVrcy5j
-b20vc2hpYmJvbGV0aC1zcDAdBgNVHQ4EFgQUSREInjyaQYDxVqJleoSuj3vzG5gw
-DQYJKoZIhvcNAQEFBQADggEBAIZhlTJ/eyWWQEz52iIogmCa8G3xKfC1z3Rkrunb
-ow0p7IVKCMykorSUHLjS7zQcDuZdbDACK1C5g+ejKWTEy9+gwFv3samxQfhpy9Uj
-6FRF4S6+0RYIAoGMO3QYhNmYQNbdO8VGNY04VOv4nzphaFQA/WE6A4/9+dfads92
-50ZjfsQfPZPrdWaNP3hp8aBW6TSNe6g0KipguOzNpaV5/omI3AbA3v8iXLVCsyRb
-8pyQ75SYZUppucohJlMf8B1y1UEYeUhCFhLwmvOr+4uZnJpsQSgFpsV0F8N2NpI1
-i9RZ+e4I5wMgVOkY/2tDhphMUzlO7vl5e1ptPqXLcxShXlQ=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.aleks.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.aleks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.aleks.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.aleks.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.aleks.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.aleks.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">ALEKS</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">ALEKS is an artificially intelligent assessment and learning system founded on ground-breaking research in mathematical cognitive science.</md:ServiceDescription>
-      <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"/>
-      <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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ALEKS Corporation</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ALEKS Corporation</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.aleks.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Nicolas Thiery</md:GivenName>
-    <md:EmailAddress>nthiery@aleks.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml b/swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.xml
deleted file mode 100644
index 308da2a5..00000000
--- a/swamid-interfederations-2.0/secure.anatomy.tv-shibboleth.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://secure.anatomy.tv/shibboleth">
-  <!--
-		This is a "Primal Pictures - Anatomy.tv" OpenAthens SP for Primal Pictures Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-22T16:57:23Z">
-      <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Primal Pictures - Anatomy.tv</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The most comprehensive, accurate and detailed 3D models of the human body. Our range of medical software covers anatomy for every region of the body plus specialised titles that focus on muscle function, injuries and more, providing over 6,500 3D anatomical structures, clinical slides, dissections, illustrations, animations and much more.</mdui:Description>
-        <mdui:Logo height="85" width="350">https://secure.anatomy.tv/images/Anatomy-TV-logo-Athens.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDrzCCApegAwIBAgIJAP7Ws37fxxA8MA0GCSqGSIb3DQEBBQUAMEMxJTAjBgNV
-						BAoTHFByaW1hbCBQaWN0dXJlcyAtIEFuYXRvbXkudHYxGjAYBgNVBAMTEXNlY3Vy
-						ZS5hbmF0b215LnR2MB4XDTEzMTEyMjEzNDY1OVoXDTIzMTEyMDEzNDY1OVowQzEl
-						MCMGA1UEChMcUHJpbWFsIFBpY3R1cmVzIC0gQW5hdG9teS50djEaMBgGA1UEAxMR
-						c2VjdXJlLmFuYXRvbXkudHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDAJdYIxLYxyV/0MqpVRYZhafOPVAbv/BmBL+1RrxBA4SUv0jiSnJiBSPnE0/YX
-						oSgyFI8UDshYX5bf78Uk0YFPQ9W9lRZaElZ2RuYqfZjZLbfM8EAtB1WSpFXim6gq
-						9rIKHBLh8jhtTZSWinAezthfpvMJWHEArEjbReJF2+dzc6bXTsKZMf84VtC4t7eh
-						dwbMCq84D8PNtBR5B4YCcIWKrTGxdTuclb/oU+hiUR8/x9DKj/QIIVgb2g/eDEmv
-						fHXrUrwUECqXCi+TLhIFEOe8eNw+cIueOkqtsg02qzTr7ThIW/LGlcprdOS+1Me1
-						Gm/0Hal/v3x79JSOaZ1ZOy2xAgMBAAGjgaUwgaIwHQYDVR0OBBYEFMPJgV8IFMbg
-						J+I6xIAIsgAZxRrtMHMGA1UdIwRsMGqAFMPJgV8IFMbgJ+I6xIAIsgAZxRrtoUek
-						RTBDMSUwIwYDVQQKExxQcmltYWwgUGljdHVyZXMgLSBBbmF0b215LnR2MRowGAYD
-						VQQDExFzZWN1cmUuYW5hdG9teS50doIJAP7Ws37fxxA8MAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQEFBQADggEBAEVvZ6kazfA45CuWgSeHvBvwfotPTQ1L0I5LQm2Z
-						8eniR7GRXHoe8ARm0KeKkOI0RPDH7P7ovvdTaBWjbESxwa/LybHUKNGKikJBnmpW
-						kD+04h6aOISdCNM5gK7arXSdymnw8tBDDcD4InhaUjpb16lKzLOg9MrEflKxYGvt
-						sRNksXgJ/NXz72RR6e2XBJc/GcJLYqtE9GUa+9WBBywVjKxCfkTchtKZJJ5671gt
-						AtuEdQrTeTQPFL40SxAPy//3f8yoCvleohvzN6T8GUPIt2F74Tapoj941DJeHWtZ
-						xhknE0CxeTWhHOBRY2zULtp+XeSN+EskWe1jPdY+1Houu4s=
-					</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>
-						MIIDrzCCApegAwIBAgIJAP7Ws37fxxA8MA0GCSqGSIb3DQEBBQUAMEMxJTAjBgNV
-						BAoTHFByaW1hbCBQaWN0dXJlcyAtIEFuYXRvbXkudHYxGjAYBgNVBAMTEXNlY3Vy
-						ZS5hbmF0b215LnR2MB4XDTEzMTEyMjEzNDY1OVoXDTIzMTEyMDEzNDY1OVowQzEl
-						MCMGA1UEChMcUHJpbWFsIFBpY3R1cmVzIC0gQW5hdG9teS50djEaMBgGA1UEAxMR
-						c2VjdXJlLmFuYXRvbXkudHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDAJdYIxLYxyV/0MqpVRYZhafOPVAbv/BmBL+1RrxBA4SUv0jiSnJiBSPnE0/YX
-						oSgyFI8UDshYX5bf78Uk0YFPQ9W9lRZaElZ2RuYqfZjZLbfM8EAtB1WSpFXim6gq
-						9rIKHBLh8jhtTZSWinAezthfpvMJWHEArEjbReJF2+dzc6bXTsKZMf84VtC4t7eh
-						dwbMCq84D8PNtBR5B4YCcIWKrTGxdTuclb/oU+hiUR8/x9DKj/QIIVgb2g/eDEmv
-						fHXrUrwUECqXCi+TLhIFEOe8eNw+cIueOkqtsg02qzTr7ThIW/LGlcprdOS+1Me1
-						Gm/0Hal/v3x79JSOaZ1ZOy2xAgMBAAGjgaUwgaIwHQYDVR0OBBYEFMPJgV8IFMbg
-						J+I6xIAIsgAZxRrtMHMGA1UdIwRsMGqAFMPJgV8IFMbgJ+I6xIAIsgAZxRrtoUek
-						RTBDMSUwIwYDVQQKExxQcmltYWwgUGljdHVyZXMgLSBBbmF0b215LnR2MRowGAYD
-						VQQDExFzZWN1cmUuYW5hdG9teS50doIJAP7Ws37fxxA8MAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQEFBQADggEBAEVvZ6kazfA45CuWgSeHvBvwfotPTQ1L0I5LQm2Z
-						8eniR7GRXHoe8ARm0KeKkOI0RPDH7P7ovvdTaBWjbESxwa/LybHUKNGKikJBnmpW
-						kD+04h6aOISdCNM5gK7arXSdymnw8tBDDcD4InhaUjpb16lKzLOg9MrEflKxYGvt
-						sRNksXgJ/NXz72RR6e2XBJc/GcJLYqtE9GUa+9WBBywVjKxCfkTchtKZJJ5671gt
-						AtuEdQrTeTQPFL40SxAPy//3f8yoCvleohvzN6T8GUPIt2F74Tapoj941DJeHWtZ
-						xhknE0CxeTWhHOBRY2zULtp+XeSN+EskWe1jPdY+1Houu4s=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.anatomy.tv/shibboleth/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.anatomy.tv/shibboleth/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.anatomy.tv/shibboleth/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.anatomy.tv/shibboleth/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Primal Pictures Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Primal Pictures - Anatomy.tv</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.primalpictures.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Deepesh</GivenName>
-    <SurName>Shah</SurName>
-    <EmailAddress>mailto:deepesh@primalpictures.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Deepesh</GivenName>
-    <SurName>Shah</SurName>
-    <EmailAddress>mailto:deepesh@primalpictures.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.binghamton.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/secure.binghamton.edu-idp-shibboleth.xml
deleted file mode 100644
index 07073245..00000000
--- a/swamid-interfederations-2.0/secure.binghamton.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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://secure.binghamton.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">binghamton.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Binghamton University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Binghamton University Authentication Service.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://its.binghamton.edu/policies/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="115" width="315" xml:lang="en">https://www.binghamton.edu/images/v2/binghamton-university-logo2.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>
-MIIDPzCCAiegAwIBAgIUaNyL/kKbNYZG22emI/Cb4+ITWZMwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2VjdXJlLmJpbmdoYW10b24uZWR1MB4XDTExMDgwMjEz
-Mzg1N1oXDTMxMDgwMjEzMzg1N1owIDEeMBwGA1UEAxMVc2VjdXJlLmJpbmdoYW10
-b24uZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt+N/Eut67Gq2
-RtBxlVNrypd+JxARp705VB3tqPz8idy/TmW71i+mbpyiT0mJyXk+eyF26DI7z8EO
-vvepTQW+dG+Fi7JR9ehNFZhpyoaQyK6hZQHW9vXqVKlfYjJnrQ3gqgmadvhiThUz
-/OUK+ufQwNe107Uu9/rpQ0eTa0FOhsfaqjd2wFlb75CqmbNzmTadlgTtT97RbxLR
-PxBI4rtByh+ozDgAo6ok5kJYZO+xc4qZi187D9v1pZ7vc3yOOAwTMFc7d0blZF4/
-+eU5yB+KWD5rU2UPUCDRAYTENwjHhMFBxZJKxVoeg6lSKNVRd/lIc76ssiRElqZh
-EAyNcF1+xwIDAQABo3EwbzBOBgNVHREERzBFghVzZWN1cmUuYmluZ2hhbXRvbi5l
-ZHWGLGh0dHBzOi8vc2VjdXJlLmJpbmdoYW10b24uZWR1L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRr3fWO4iCn+0MsEEBTBnCKxnNhcTANBgkqhkiG9w0BAQUFAAOC
-AQEAUkD0EaKGQMGIdVRzZ4l+mztDEuEcQ8AbJUDur7CKMGqx3Ytmp2iviqaYSN/Q
-W6bTi+CedTmHsXoeqNS60cDnv4Qc+2G6HFyrvRdjhcnJq3jyUxgwn+Xm61uNX8q+
-7mYhMJT1lMwoar0eIC/0SvxlY/JVNvTBd1TKrdLg7WaPcfh6mtRM+hZFF5SMm0te
-xzL9vm94Z43S9K/AKJWw7nCAMLki45IGpdAjkdz/KmegCh3wxhUaw1S5oINPa9MP
-xx7ETaJyTVowumfQdsWbZn40f4hTtiDqG/5re3T6FSQLnwcidZO8jj9FdVsfCL9X
-oTSbLzM6GP7AOzXuk8ZOqBrCkA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://secure.binghamton.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.binghamton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://secure.binghamton.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.binghamton.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.binghamton.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">binghamton.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUaNyL/kKbNYZG22emI/Cb4+ITWZMwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2VjdXJlLmJpbmdoYW10b24uZWR1MB4XDTExMDgwMjEz
-Mzg1N1oXDTMxMDgwMjEzMzg1N1owIDEeMBwGA1UEAxMVc2VjdXJlLmJpbmdoYW10
-b24uZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt+N/Eut67Gq2
-RtBxlVNrypd+JxARp705VB3tqPz8idy/TmW71i+mbpyiT0mJyXk+eyF26DI7z8EO
-vvepTQW+dG+Fi7JR9ehNFZhpyoaQyK6hZQHW9vXqVKlfYjJnrQ3gqgmadvhiThUz
-/OUK+ufQwNe107Uu9/rpQ0eTa0FOhsfaqjd2wFlb75CqmbNzmTadlgTtT97RbxLR
-PxBI4rtByh+ozDgAo6ok5kJYZO+xc4qZi187D9v1pZ7vc3yOOAwTMFc7d0blZF4/
-+eU5yB+KWD5rU2UPUCDRAYTENwjHhMFBxZJKxVoeg6lSKNVRd/lIc76ssiRElqZh
-EAyNcF1+xwIDAQABo3EwbzBOBgNVHREERzBFghVzZWN1cmUuYmluZ2hhbXRvbi5l
-ZHWGLGh0dHBzOi8vc2VjdXJlLmJpbmdoYW10b24uZWR1L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBRr3fWO4iCn+0MsEEBTBnCKxnNhcTANBgkqhkiG9w0BAQUFAAOC
-AQEAUkD0EaKGQMGIdVRzZ4l+mztDEuEcQ8AbJUDur7CKMGqx3Ytmp2iviqaYSN/Q
-W6bTi+CedTmHsXoeqNS60cDnv4Qc+2G6HFyrvRdjhcnJq3jyUxgwn+Xm61uNX8q+
-7mYhMJT1lMwoar0eIC/0SvxlY/JVNvTBd1TKrdLg7WaPcfh6mtRM+hZFF5SMm0te
-xzL9vm94Z43S9K/AKJWw7nCAMLki45IGpdAjkdz/KmegCh3wxhUaw1S5oINPa9MP
-xx7ETaJyTVowumfQdsWbZn40f4hTtiDqG/5re3T6FSQLnwcidZO8jj9FdVsfCL9X
-oTSbLzM6GP7AOzXuk8ZOqBrCkA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://secure.binghamton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Binghamton University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Binghamton University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.binghamton.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Frank Saraceno</md:GivenName>
-    <md:EmailAddress>saraceno@binghamton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Frank Saraceno</md:GivenName>
-    <md:EmailAddress>saraceno@binghamton.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml b/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
index bc32c713..5471d360 100644
--- a/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
+++ b/swamid-interfederations-2.0/secure.huygens.knaw.nl.xml
@@ -1,37 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.huygens.knaw.nl">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-17T11:14: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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
+<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://secure.huygens.knaw.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://secure.huygens.knaw.nl/saml2/login" index="0"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.secure.huygens.knaw.nl/saml2/login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Huygens ING (CLARIN Dienste)</mdui:DisplayName>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://secure.huygens.knaw.nl/saml2/login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Huygens ING (CLARIN)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Huygens ING (CLARIN services)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Verschiedene Dienste, die von Huygens ING im Rahmen des CLARIN-Initiative zur Verfügung gestellt.</mdui:Description>
+        <mdui:Description xml:lang="fi">Erilaiset palvelut Huygens ING yhteydessä CLARIN aloitteen.</mdui:Description>
         <mdui:Description xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</mdui:Description>
         <mdui:Logo height="16" width="16">https://www.huygens.knaw.nl/logo/HuygensING16x16.png</mdui:Logo>
-        <mdui:Logo height="64" width="96">https://www.huygens.knaw.nl/logo/HuygensING64x96.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://www.huygens.knaw.nl/?lang=en</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.huygens.knaw.nl/wp-content/uploads/2013/10/20140327-privacy-policy-HIRE2.pdf</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">http://www.huygens.knaw.nl</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.huygens.knaw.nl/privacy-policy/?lang=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.huygens.knaw.nl/privacy-policy/?lang=en</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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>secure.huygens.knaw.nl</ds:KeyName>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=sso@huygens.knaw.nl,CN=secure.huygens.knaw.nl,OU=Huygens ING,O=KNAW,L=Den Haag,ST=ZH,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIJrDCCBZQCCQDDazlLOi5yzDANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
 TkwxCzAJBgNVBAgMAlpIMREwDwYDVQQHDAhEZW4gSGFhZzENMAsGA1UECgwES05B
 VzEUMBIGA1UECwwLSHV5Z2VucyBJTkcxHzAdBgNVBAMMFnNlY3VyZS5odXlnZW5z
@@ -83,16 +72,13 @@ wiQLqNk4jM+u1+lFdnx/7HF9im5K+fE3NLt67GjSomKfltIdWrTm/5VrP/V+7bUY
 WFAybLEjPAs0yviXJXUm7KO+aDytE5qtFxp/7nQ53t8TSOITnJ7lOG6MLItwFJv7
 +XmRUdmsE5uVQ66+ER0qeSsaMLjYjfW3bsDeMjFbezc/T+bfZPuUW6J5cB+K9S2C
 sIyG57313sdj9AsKPiInNsKOpF+E3SOGKRafqycWUmbflSo1VMsqBBffgeDeavQv
-hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=
-</ds:X509Certificate>
+hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=</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>secure.huygens.knaw.nl</ds:KeyName>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=sso@huygens.knaw.nl,CN=secure.huygens.knaw.nl,OU=Huygens ING,O=KNAW,L=Den Haag,ST=ZH,C=NL</ds:X509SubjectName>
           <ds:X509Certificate>MIIJrDCCBZQCCQDDazlLOi5yzDANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UEBhMC
 TkwxCzAJBgNVBAgMAlpIMREwDwYDVQQHDAhEZW4gSGFhZzENMAsGA1UECgwES05B
 VzEUMBIGA1UECwwLSHV5Z2VucyBJTkcxHzAdBgNVBAMMFnNlY3VyZS5odXlnZW5z
@@ -144,31 +130,35 @@ wiQLqNk4jM+u1+lFdnx/7HF9im5K+fE3NLt67GjSomKfltIdWrTm/5VrP/V+7bUY
 WFAybLEjPAs0yviXJXUm7KO+aDytE5qtFxp/7nQ53t8TSOITnJ7lOG6MLItwFJv7
 +XmRUdmsE5uVQ66+ER0qeSsaMLjYjfW3bsDeMjFbezc/T+bfZPuUW6J5cB+K9S2C
 sIyG57313sdj9AsKPiInNsKOpF+E3SOGKRafqycWUmbflSo1VMsqBBffgeDeavQv
-hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=
-</ds:X509Certificate>
+hab7DAIb7F4F0ucrgyqoXBbmbezmumunxaTbv+NZa5Q=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.huygens.knaw.nl/saml2/acs" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.secure.huygens.knaw.nl/saml2/acs" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Huygens ING (CLARIN Dienste)</md:ServiceName>
+    <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://secure.huygens.knaw.nl/saml2/acs" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.secure.huygens.knaw.nl/saml2/acs" index="3" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Huygens ING (CLARIN)</md:ServiceName>
       <md:ServiceName xml:lang="en">Huygens ING (CLARIN services)</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Verschiedene Dienste, die von Huygens ING im Rahmen des CLARIN-Initiative zur Verfügung gestellt.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="fi">Erilaiset palvelut Huygens ING yhteydessa CLARIN aloitteen.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Various services provided by Huygens ING in the context of the CLARIN initiative.</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="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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <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: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="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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>Support</md:GivenName>
diff --git a/swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 11f2c2c2..00000000
--- a/swamid-interfederations-2.0/secure.ibisworld.co.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.ibisworld.co.uk/shibboleth-sp">
-  <!--
-		This is an "IBISWorld UK" Shibboleth SP for IBISWorld.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-23T09:34:41Z"/>
-  </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">IBISWorld UK</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Welcome to IBISWorld, the UK's richest source of business and industry information.</mdui:Description>
-        <mdui:Logo height="48" width="158">https://secure.ibisworld.co.uk/img/logosmall.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://secure.ibisworld.co.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAP4Fp5haHFgMMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnNwLmliaXN3b3JsZC5jby51azAeFw0xMTA5MDYwMDQ0MTVaFw0yMTA5MDMw
-						MDQ0MTVaMB0xGzAZBgNVBAMTEnNwLmliaXN3b3JsZC5jby51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMQHhKOh5tWySehDDucIlkK15NotzimeWOnr
-						1QklBthu1UJa07hTqrBw57aMHuJ0+WI1KSz30/xfwk3mv8sB3HvSCgt9HhwFeVnJ
-						7jMmZF/MNqI/RXFtCQdVmGyBNhhU/C2n6zDVYQE4f9115r4iIcxpR6ddbL3s9B1I
-						5UDDhTTOkFXrnfdyaPWfhANdmLbjO386S5o0IdeS5+WilyEHO7Gk7tKwi4Qn9Jim
-						tnDz0UFuMgRS9yiuNepiXhReEO2QwYRw+tDfmDql3bc+lRzlaqFTX4AbJh6OdMrO
-						zcPPjsHMnlCwDyg81UYSkNsfyUjswp5UYfZhb9KAMKyXNVLcs40CAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISc3AuaWJpc3dvcmxkLmNvLnVrMB0GA1UdDgQWBBS3kV42C8Eb
-						2/LQ1U4eh6whZrS6TDANBgkqhkiG9w0BAQUFAAOCAQEAuhXSnv+l5lcCYuhfhZ2N
-						QqAgP+4kETNy9DSiOJ65IrRP8udPrC89IXfL5ypHO8fdhNOCxI8krdIH64Jm7lth
-						vDck0+gkDGLAeXVxEDczwP8O3nNWdC+fNWTgIAkyXLDS3jhJq/cwHvW1jJRdyJlQ
-						ltUXRoyxRkveiAx/M1pMtUkJGGAwAvcwutr8poLb/SwMgqnSSyDga+zXpwYqrZ8V
-						taIO6RtXMxMf+yv3uebcJiUMAUZExF8G4h6rIPSAt2Xi3oDAavBfo1ZRS0esJUL+
-						QRuvgFY9tYDxs2vrZOwMut/o9z69OWvnQoV87PqJAH1KjIQSClzrY9gj9k0aPiva
-						3w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.ibisworld.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IBISWorld</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IBISWorld UK</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ibisworld.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IBISWorld IT Team</GivenName>
-    <EmailAddress>mailto:itsupport@ibisworld.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Sells</SurName>
-    <EmailAddress>mailto:Roberts@ibisworld.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/secure.nature.com-shibboleth.xml
deleted file mode 100644
index 94db795c..00000000
--- a/swamid-interfederations-2.0/secure.nature.com-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://secure.nature.com/shibboleth">
-  <!--
-		This is a "Nature Publishing Group" OpenAthens SP for Macmillan Publishers Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">Nature Publishing Group journals</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Online access to Nature Publishing Group journals</mdui:Description>
-        <mdui:Logo height="165" width="250">https://secure.nature.com/images/naturegroup_logo2png.PNG</mdui:Logo>
-        <mdui:Logo height="70" width="220">https://secure.nature.com/images/naturegroup_logopng.PNG</mdui:Logo>
-        <mdui:Logo height="165" width="250">https://secure.nature.com/images/naturegroup_logo2.GIF</mdui:Logo>
-        <mdui:Logo height="70" width="220">https://secure.nature.com/images/naturegroup_logo.GIF</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVzCCAj+gAwIBAgIESsDsijANBgkqhkiG9w0BAQsFADBcMQswCQYDVQQGEwJVSzEPMA0GA1UE
-						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEaMBgGA1UEAxMRc2Vj
-						dXJlLm5hdHVyZS5jb20wHhcNMTUwNjIzMDgxODQ3WhcNMjUwNjIwMDgxODQ3WjBcMQswCQYDVQQG
-						EwJVSzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEa
-						MBgGA1UEAxMRc2VjdXJlLm5hdHVyZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC0tKViXqJ6zxZ0W6kBxCk/6Jd8dqcfeODSonisCrGqAOO6uP2G81LICj/WQCSGu7J8gY2o1ZbV
-						KWxyXWzYUgs8ZR0zoPUVOCpo8JPjXqZFlo2mCy5Ex9H7VrUu2KqM0eGZ8c80r7rUj0a7Yp8HvZex
-						kt1HMcnvUYPER8XGGFqRaut7Ny/D1HlSZdQhkXVmHhySEkaObGDLR9ZG0EJFqjuRwk7RZu9fDuFw
-						uo2+GVOQsR0A/dUzo49F/RDyRmjGpSpajirCm5paLCfb2K2mNSboNQ8VQqH5nYpxL9xuwAyt5ect
-						vKlsun+gRJiRmw3Nbm4D+jrVMzz/OLqCVIWVK6PRAgMBAAGjITAfMB0GA1UdDgQWBBRAYRF+J0Fz
-						kBZcXfNNK2IXcL66ijANBgkqhkiG9w0BAQsFAAOCAQEAlQszJFL/eicmXBGXIBtz0xWpLRc4hjvt
-						LAD16bPmMqOXk8RYlFy3BFC9ZLs/imkOK4ixfgMNfCyddbT+//ABNTuM4a6qeL/5oNNPJZJmqInm
-						8QqN0fxNfSnFtyVCfX68mYBD7Onl9TcnRKKqJ4dm6C4qXQqVAUbC7gYTTljCHXoqbLjwnY5pPFqF
-						3CuGxi7rhyP39Dax4UKiQm3V9AZkcxq8fDs+GsTLUceGOYa0g4LoDsUMcPo26IP8N4gcz7VHslwv
-						mxxchptFQSwuunaMQuJhSrR18v8AFekwNd6YEDzxQSqKOo/9eLoymeztcHBVP9f+l39z/rvGsWlZ
-						5C+nbg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nature Publishing Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.nature.com.xml b/swamid-interfederations-2.0/secure.nature.com.xml
deleted file mode 100644
index 8b81e55d..00000000
--- a/swamid-interfederations-2.0/secure.nature.com.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://secure.nature.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>secure.nature.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=secure.nature.com,OU=NPG,O=Macmillan,L=London,C=UK</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIESpaZbzANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJV
-SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-A05QRzEaMBgGA1UEAxMRc2VjdXJlLm5hdHVyZS5jb20wHhcNMDkwODI3MTQzNDIz
-WhcNMTIwODI2MTQzNDIzWjBcMQswCQYDVQQGEwJVSzEPMA0GA1UEBxMGTG9uZG9u
-MRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEaMBgGA1UEAxMRc2Vj
-dXJlLm5hdHVyZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv
-3qPD8StbD+IIgRZC0HxMghUOP5B+Q4CfDg7pIkxrLU2SUfb8aepSl5p3e//sRctS
-+niHwVMi2We7NkXJLZ+BgcMf7+YxDWFv7tZzG63geyK404uxzuKmlHmmeEzaFW99
-2tNI6f9O/cvL9LIJOv5LjsfOIwBvrjY2+iECsuRNXLpgnuvrU78/D82OjR1XK7IM
-0npoZSYRiidMe/QNRBdHfY/8h8V4Wu2eozKUITZO5ggGjizkR7+eSI+1PIOydnAm
-0kKylBYhwmm+sh1SkMpcmCScWaVJmlcdw9YpGYjDcJk60r+CZIQd4TY9cWSI2J1H
-CIgsO27TSpG/Opw5+RMZAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAI8tPWDsEX3M
-CUO/aEdnb6nqnRzPmbtUHvxVFhcvNk/1M819Gt2oG5rTc2v86S/wbcrnCoYmwyHV
-W50vrRqEmEeEgZ2K7dRgrrdIfzfkInbf9Cjf/c3gX1IRNYqo3/Sw2+ShsV4tdzFA
-Y4ngrDm2pMYm0TKGXLE1jrh24BhEjCfso/yh6NT7JEA6YXdazEW3MlCHkGVhtE1Y
-SDT+VtaMa4rqCjCOEQknU/vN60oBhyoKbZPAUfknfRf5XBkPE5Vy4QsRZ/D15tx0
-yTmkAyxSSBlN79xSJ2IciALnoXg+CLFvDYrCeDKi0qs165v/NzGt59r+VNc1yefX
-UcROare0YUA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.nature.com/Shibboleth.sso/SAML/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.nature.com/Shibboleth.sso/SAML/Artifact" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Nature Publishing Group</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Nature Publishing Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.nature.com/npg_/company_info/index.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Amanda</GivenName>
-    <SurName>Ward</SurName>
-    <EmailAddress>a.ward@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>jollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.palgrave-journals.com-shibboleth.xml b/swamid-interfederations-2.0/secure.palgrave-journals.com-shibboleth.xml
deleted file mode 100644
index 40c65210..00000000
--- a/swamid-interfederations-2.0/secure.palgrave-journals.com-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://secure.palgrave-journals.com/shibboleth">
-  <!--
-		This is an OpenAthens SP for Macmillan Publishers Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbTCCAlWgAwIBAgIEJo7y3DANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJVSzEPMA0GA1UE
-						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzElMCMGA1UEAxMcc2Vj
-						dXJlLnBhbGdyYXZlLWpvdXJuYWxzLmNvbTAeFw0xNTA2MjMwODIwMzBaFw0yNTA2MjAwODIwMzBa
-						MGcxCzAJBgNVBAYTAlVLMQ8wDQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoG
-						A1UECxMDTlBHMSUwIwYDVQQDExxzZWN1cmUucGFsZ3JhdmUtam91cm5hbHMuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj10XZbAkMeoa0sv8AuzBCSvR+MFTmoXRDOW6AGNp7mv+
-						tLrbPmAEk6vJLB/mIcfW0S7AY0dvtChUajiiJui3Fizi6gYMkpvDlnY3UC54wfOA/T4m8EEEAQ1L
-						FevGkTD0zD46gP/1qiKTuUTAiCmqiHag+Yc6jS43kCzo7/CHarqTB49InY7i9cvi+2rGaGTqU7dS
-						JrbakYGWlYJlHsUpzGjHnoCQbSx/HpT787P410dIqtu0/L8puQq32cD7rii86+Pzf1vbtOLKUBUm
-						q8GrgbodKMqyHzeChhw+W5PpCjZIWU/BViHRLXJRPGrpFVOzl9QJ9ZOrPvqwVObhvx1yUQIDAQAB
-						oyEwHzAdBgNVHQ4EFgQUUD4QCZOjPq2Z4aIoM9Btn29WUjgwDQYJKoZIhvcNAQELBQADggEBAEZm
-						g/W03VrgKZ0lBu7jEjjv2IxKJkUTv4Rduunt8qGDiiAoh7+gGVkXH7ru11yDJa2GR0YdkpfCg9se
-						mN/Z3cpYRZS+jhckpDyNK8Y5eYQd+dB/1SXKSjoYEZ1nFvjWo1xL9CIll5RFJZA2ow8UEvvaarQx
-						31sZRzLkh2WAFw7ja6leRFL7IRO2rz+gmhmxR4rI3NlaJJxqgutArS4Tk0AkUE3bfDNz2EYTp+FK
-						TUBa9dLKwTnygIRH8P9M4EpFybaKGwSsx3KOA6lUQ1NhbdBJ3kXmgt9k1mAPJU6X8LXfASKgwIcv
-						7plg8LczSM6koeb2N/Za1Zh+whmyl8Eq7q8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.palgrave-journals.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Palgrave Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/secure.palgraveconnect.com-shibboleth.xml
deleted file mode 100644
index c3d1e542..00000000
--- a/swamid-interfederations-2.0/secure.palgraveconnect.com-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://secure.palgraveconnect.com/shibboleth">
-  <!--
-		This is a "Palgrave Connect" OpenAthens SP for Macmillan Publishers Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-03T09:56:41Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRjCCAi6gAwIBAgIEUgn/jjANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEjMCEGA1UEAxMac2VjdXJlLnBhbGdyYXZlY29ubmVjdC5jb20wHhcNMTMw
-						ODEzMDk0MjM4WhcNMjMwODExMDk0MjM4WjBlMQswCQYDVQQGEwJVSzEPMA0GA1UE
-						BxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsTA05QRzEjMCEG
-						A1UEAxMac2VjdXJlLnBhbGdyYXZlY29ubmVjdC5jb20wggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDVuyehBoUW75bHqXMOByfTlLs2QoQlyQjZdoQ6CE3N
-						iAsKnBQ9SzcxeLUItBFzZ5rrZtSgfbOrF8qGX7JDvr61o3We5tz33Z4zClmolRUU
-						PWItfDhUybNf217Yg0nASYdovP3feM8Li2tg+jSguD+EwUIpfNcQ+DQShpPaOj+d
-						nvl7Kut68r6JcLPaWWD/FMxFzyEr/EGmfWzyFb4wfZEaRBEEvMpwJxl+kk8hoCXx
-						vIjr4KLxlWjzplPbhdQFAvyiYvrzGEhCbNedFDXX9qE66KvY0bB4+JQ5dLEsVlIc
-						zxNZY/pCQo7k6HJ1W+lDpr8EddoJ0gt+dzwWx7Ea+5HfAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBAK/wqCVa2CziSKHgisbadotO21AeWCn8p1ny0df1iytnuxqK+UX8
-						lfr96g99CWWU74FHr0bT80sEi0HGsRXzQ2SwoHCEUNHFrSgvLWWDEVM/MOrJy/fB
-						2turD2G56p77lp1prGNUGmVQzuQaGTktcT/20+mOw0cCoHXzGPeqGb2M1EqgC5Ua
-						eGEGQvbkiflwYCRd8BLV8NL1Y5b+W+Qb+6K8GbLWiA2HLKnJBgXAtjrDau1B431H
-						TEGsxRspwZ7E6JlhHEbi4meh4zlPLll7d7el31no1O9mD+n+E8hGQCpwz/fpDWlh
-						JMnPorN3jbXoB/LWy9wZpDt7llDnSqOcr6s=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.palgraveconnect.com/shibboleth/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.palgraveconnect.com/shibboleth/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.palgraveconnect.com/shibboleth/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.palgraveconnect.com/shibboleth/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Macmillan Publishers Limited: Palgrave Connect</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.palgraveconnect.com/pc/info/about.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chike</GivenName>
-    <SurName>Abia</SurName>
-    <EmailAddress>mailto:C.Abia@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chike</GivenName>
-    <SurName>Abia</SurName>
-    <EmailAddress>mailto:C.Abia@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
deleted file mode 100644
index 04390510..00000000
--- a/swamid-interfederations-2.0/secure.stevenson.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,64 +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://secure.stevenson.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">stevenson.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Stevenson University</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>
-MIIDPDCCAiSgAwIBAgIVAKgovFDN1fBUWFA+v7d4R+4C2FLWMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNlY3VyZS5zdGV2ZW5zb24uZWR1MB4XDTEyMDcxODE4
-NDUyNFoXDTMyMDcxODE4NDUyNFowHzEdMBsGA1UEAxMUc2VjdXJlLnN0ZXZlbnNv
-bi5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSvX4t9W3UxKym
-Qv9OKQzPSE2f/a6e5AjIa+a8A7V/Zt7u5AzFMyRsfARKGI24GrWTer9fJHvI4wTD
-OhqufNOjV3fNu570+HL1W9d/1ueM4ztmoh5jiWF4JxhxVTjJwBPkx2bkv7R10nI5
-l2HaRNyPSUSOSH3U9L0jN/a/KY97rOuM66fQ4V79L+g09C6XVxyqJrKBvryjk0f0
-5E/Ua8JcAZlgf0y200x5YdcZADjF8DwUtfEItUJ1FdxOnwXjbVDIcK02+J4Os3vT
-veZ0gmeRxsj9jAvZh44qjJlW2aFElFiE+PvE5QPhheSAx7LahyRM8Y9JWAhUD4JU
-gzsimD8xAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNlY3VyZS5zdGV2ZW5zb24uZWR1
-hitodHRwczovL3NlY3VyZS5zdGV2ZW5zb24uZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBR5zC5WIV6lZzMAYwPbhfWgZN2omTANBgkqhkiG9w0BAQUFAAOCAQEA
-EpMtRKoKGLYWI+5ltPGqL7nhMzsqnlwLXP5cMLFN+FCxwa7kBi1fk//NCleLoaf7
-BiYxMqq3cDh1vhaklyr+NC3iwXGAbi6/D74rFksOhePX05xdAIi83s+6ImJXC+Gk
-jPgB9Pyd+NV6S1CkehB2fCDRE8bMBOInspa1eszMqUUmJcfOg3jqYfnUMsk6rgKG
-QUqhM9TAwowIJzUEfJcwkNrCkBAzuUIG/R9zgi/wWARXSBdpvRwTeh2feHIoRrlL
-BVngyd850gsxHeIyUveI6rZDsRI6MozOP7ApzA482aHh8YHlekMh+mDafbuYDtMV
-vcW4oD4N2OIPcMam+7V1yw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://secure.stevenson.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.stevenson.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://secure.stevenson.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.stevenson.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secure.stevenson.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.stevenson.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stevenson University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stevenson University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://stevenson.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Philip Desrosiers</md:GivenName>
-    <md:EmailAddress>pdesrosiers@stevenson.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Philip Desrosiers</md:GivenName>
-    <md:EmailAddress>pdesrosiers@stevenson.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/secure.uva.nl-cas.xml b/swamid-interfederations-2.0/secure.uva.nl-cas.xml
deleted file mode 100644
index 885fa1a8..00000000
--- a/swamid-interfederations-2.0/secure.uva.nl-cas.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://secure.uva.nl/cas">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-30T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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 van Amsterdam</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Amsterdam</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Universiteit van Amsterdam</mdui:Description>
-        <mdui:Description xml:lang="en">Universiteit van Amsterdam</mdui:Description>
-        <mdui:Logo height="48" width="48">https://static.surfconext.nl/logos/idp/uva.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">university of amsterdam universiteit van amsterdam uva</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">university of amsterdam universiteit van amsterdam uva</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/1b2e4ba73d7b526eee14a91782c45435"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Universiteit van Amsterdam</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Universiteit van Amsterdam</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Universiteit van Amsterdam</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Universiteit van Amsterdam</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.uva.nl</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uva.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/securemail.feide.no.xml b/swamid-interfederations-2.0/securemail.feide.no.xml
deleted file mode 100644
index 4117fd4b..00000000
--- a/swamid-interfederations-2.0/securemail.feide.no.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://securemail.feide.no/simplesaml/saml2/sp/metadata.php">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://securemail.feide.no/simplesaml/saml2/sp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://securemail.feide.no/simplesaml/saml2/sp/AssertionConsumerService.php" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Feide SecureMail</md:ServiceName>
-      <md:ServiceName xml:lang="no">Feide SecureMail</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Allows user to in a secure way send messages to others. A better alternative to unencrypted email messages.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">En tjeneste for å sende sikre meldinger til andre. Et godt alternativ til ukryptert e-post.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/send.goetec.ac.uk-simplesaml.xml b/swamid-interfederations-2.0/send.goetec.ac.uk-simplesaml.xml
deleted file mode 100644
index 110f13eb..00000000
--- a/swamid-interfederations-2.0/send.goetec.ac.uk-simplesaml.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://send.goetec.ac.uk/simplesaml">
-  <!--
-		This is a GOESEND simpleSAMLphp SP for the University of Kent.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-13T17:34:39Z"/>
-  </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">GOESEND</mdui:DisplayName>
-        <mdui:Logo height="66" width="325">https://send.goetec.ac.uk/federation-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>
-						MIID7zCCAtegAwIBAgIJAJ98fbY88KSnMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
-						VQQGEwJHQjENMAsGA1UECAwES2VudDETMBEGA1UEBwwKQ2FudGVyYnVyeTEfMB0G
-						A1UECgwWVGhlIFVuaXZlcnNpdHkgb2YgS2VudDEdMBsGA1UECwwUSW5mb3JtYXRp
-						b24gU2VydmljZXMxGjAYBgNVBAMMEXNlbmQuZ29ldGVjLmFjLnVrMB4XDTEyMDkx
-						MTEzMTU0OFoXDTIyMDkxMTEzMTU0OFowgY0xCzAJBgNVBAYTAkdCMQ0wCwYDVQQI
-						DARLZW50MRMwEQYDVQQHDApDYW50ZXJidXJ5MR8wHQYDVQQKDBZUaGUgVW5pdmVy
-						c2l0eSBvZiBLZW50MR0wGwYDVQQLDBRJbmZvcm1hdGlvbiBTZXJ2aWNlczEaMBgG
-						A1UEAwwRc2VuZC5nb2V0ZWMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQCtwHM4Adap0jYPj2ltPUClbjXDRxayuW36hG8Po/ZN4FxOKs1mqWvX
-						BlJowimehp8nwyKafPw2hVvsW2VsHeyECbH7Qrin7n0kXBF3n1bp6uNqK9S/j3uq
-						irlSXke+Oqn1N/1sKsAr++jSksoareGtKZyaKiWHsXGVix8m+6+xAEpbFYU+YoGK
-						UikpUW6njVMx59scTMg9fCjmEu+/FrTA1AMv3NQrdvH7SEKfkCohpQiF+IUHWwxT
-						t0pVZQwwbVwyhNCkghQquIIbffkGiP1k65GD9auUsUS+PsnDqUljkDgw/EZM+dRJ
-						yHO7R2Z7+XQTARIIX+2e2cUoNGaiJfznAgMBAAGjUDBOMB0GA1UdDgQWBBQt99ir
-						zKa9WJyz55xd4C6c2D/15TAfBgNVHSMEGDAWgBQt99irzKa9WJyz55xd4C6c2D/1
-						5TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBDDC8ZFKjivkxNix2N
-						eNWm6sNTLb7F3NxUod3uBpmWPjoLwC1OFgv6ZWn+E5pvRZM73tT6pt84uGv1HECb
-						hyrP+/EvzcVZOnEZhZ3xcmkY8tjU4YV+mxbOjM9+o6fPK6wZZEGkvuvEiozgZWz9
-						1pgoAYbcAKQg863qMZd5UZVKFnkeZSwbtT6YN7QQTvmIinB0D3kmBaIni6UE1+LV
-						ikLmcdp+31aJwR3BuffzGGsxJouON2Ls8NTGPMMhJSpVYpgtCyjVDCVU3OVosnUZ
-						TXnyUIgzIGIeCKLwH1bnhGGrV0pDbWh1rL2OzhtdeMHY64tPI2yfvuWg/a7SXILO
-						aQpy
-					</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>
-						MIID7zCCAtegAwIBAgIJAJ98fbY88KSnMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
-						VQQGEwJHQjENMAsGA1UECAwES2VudDETMBEGA1UEBwwKQ2FudGVyYnVyeTEfMB0G
-						A1UECgwWVGhlIFVuaXZlcnNpdHkgb2YgS2VudDEdMBsGA1UECwwUSW5mb3JtYXRp
-						b24gU2VydmljZXMxGjAYBgNVBAMMEXNlbmQuZ29ldGVjLmFjLnVrMB4XDTEyMDkx
-						MTEzMTU0OFoXDTIyMDkxMTEzMTU0OFowgY0xCzAJBgNVBAYTAkdCMQ0wCwYDVQQI
-						DARLZW50MRMwEQYDVQQHDApDYW50ZXJidXJ5MR8wHQYDVQQKDBZUaGUgVW5pdmVy
-						c2l0eSBvZiBLZW50MR0wGwYDVQQLDBRJbmZvcm1hdGlvbiBTZXJ2aWNlczEaMBgG
-						A1UEAwwRc2VuZC5nb2V0ZWMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQCtwHM4Adap0jYPj2ltPUClbjXDRxayuW36hG8Po/ZN4FxOKs1mqWvX
-						BlJowimehp8nwyKafPw2hVvsW2VsHeyECbH7Qrin7n0kXBF3n1bp6uNqK9S/j3uq
-						irlSXke+Oqn1N/1sKsAr++jSksoareGtKZyaKiWHsXGVix8m+6+xAEpbFYU+YoGK
-						UikpUW6njVMx59scTMg9fCjmEu+/FrTA1AMv3NQrdvH7SEKfkCohpQiF+IUHWwxT
-						t0pVZQwwbVwyhNCkghQquIIbffkGiP1k65GD9auUsUS+PsnDqUljkDgw/EZM+dRJ
-						yHO7R2Z7+XQTARIIX+2e2cUoNGaiJfznAgMBAAGjUDBOMB0GA1UdDgQWBBQt99ir
-						zKa9WJyz55xd4C6c2D/15TAfBgNVHSMEGDAWgBQt99irzKa9WJyz55xd4C6c2D/1
-						5TAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBDDC8ZFKjivkxNix2N
-						eNWm6sNTLb7F3NxUod3uBpmWPjoLwC1OFgv6ZWn+E5pvRZM73tT6pt84uGv1HECb
-						hyrP+/EvzcVZOnEZhZ3xcmkY8tjU4YV+mxbOjM9+o6fPK6wZZEGkvuvEiozgZWz9
-						1pgoAYbcAKQg863qMZd5UZVKFnkeZSwbtT6YN7QQTvmIinB0D3kmBaIni6UE1+LV
-						ikLmcdp+31aJwR3BuffzGGsxJouON2Ls8NTGPMMhJSpVYpgtCyjVDCVU3OVosnUZ
-						TXnyUIgzIGIeCKLwH1bnhGGrV0pDbWh1rL2OzhtdeMHY64tPI2yfvuWg/a7SXILO
-						aQpy
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://send.goetec.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Kent</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GOESEND</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.goetec.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>GOESEND Helpdesk</GivenName>
-    <EmailAddress>mailto:goesend@goetec.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Charlton</SurName>
-    <EmailAddress>mailto:B.C.Charlton@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml b/swamid-interfederations-2.0/serviceadmin-test.company.ja.net-shibboleth.xml
deleted file mode 100644
index 70e50b4d..00000000
--- a/swamid-interfederations-2.0/serviceadmin-test.company.ja.net-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://serviceadmin-test.company.ja.net/shibboleth">
-  <!--
-		This is a "Service Admin (test)" 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#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="2012-12-17T13:22:46Z">
-      <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://serviceadmin-test.company.ja.net/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
-						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAKyGnAXQpTnriKaVLhBxB2V01KEV7JFljb6JyCUgmPzhjozQV78Lt6wnrlVE
-						PMJUFzx6MhVOOFdmoud9f4uEt3eLeNNBkXy6F1hLsK93MmEq7NycC9f+RTGkXuI9
-						ZZ6bHpCQg4cgLlo+e+oSmyFrqdwHkKXRxhx7sLDpmrBRt4WS1Yom/sf1roaj/HYJ
-						I09jwKfl5mlFhWqHoprT6zHYZ/q4HIgo8CYFzRPTBYP2WoakD87P3UPpVZj6uLAz
-						d8LCuv1ZX2HJTHYrUyEM4tbqA2cv/CN8W6cgTkm5puZAMvPmFeNnoQlkBnUpH/oc
-						oGDmT026FyBGQ6yXva1uZVOX0xMCAwEAAaM3MDUwFAYDVR0RBA0wC4IJaGFyMDAz
-						OTE4MB0GA1UdDgQWBBQST9Pog/haMAhYi8W9rY0cKz3XfjANBgkqhkiG9w0BAQUF
-						AAOCAQEAERDcKAB+oNKMF14ys3MjR7NgPZzAnxNjyDizDMsPug9ZqfXKTfU1NFZx
-						nx1ihIXHOBZgLU4RKLJSopHZ57V+HlOebXCckx/je1y4a30B0sIg3yk9ZZlMNcVI
-						JWEIEGc6kkIhgQBMAtTaae+Yd1gqk4MQBQG08iDy9M3E4jp3BmgZbJL2lBYwCoRc
-						U2soIdQNoQS5WDuqwDVXqOljUfijVZU9YRpjPDsXqDQDVO+7v/EbPxVtRThQChxY
-						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
-						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://serviceadmin-test.company.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML/Artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://serviceadmin-test.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Service Admin (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>JANET TAG</GivenName>
-    <EmailAddress>mailto:jtag@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>JANET TAG</GivenName>
-    <EmailAddress>mailto:jtag@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml b/swamid-interfederations-2.0/serviceadmin.company.ja.net-shibboleth.xml
deleted file mode 100644
index 056a5a35..00000000
--- a/swamid-interfederations-2.0/serviceadmin.company.ja.net-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://serviceadmin.company.ja.net/shibboleth">
-  <!--
-		This is a "Service Admin" 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#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="2012-12-17T14:09:03Z">
-      <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://serviceadmin.company.ja.net/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJAKyF+vahRReuMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCWhhcjAwMzkxODAeFw0wOTExMjAwODM4MTVaFw0xOTExMTgwODM4MTVaMBQx
-						EjAQBgNVBAMTCWhhcjAwMzkxODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAKyGnAXQpTnriKaVLhBxB2V01KEV7JFljb6JyCUgmPzhjozQV78Lt6wnrlVE
-						PMJUFzx6MhVOOFdmoud9f4uEt3eLeNNBkXy6F1hLsK93MmEq7NycC9f+RTGkXuI9
-						ZZ6bHpCQg4cgLlo+e+oSmyFrqdwHkKXRxhx7sLDpmrBRt4WS1Yom/sf1roaj/HYJ
-						I09jwKfl5mlFhWqHoprT6zHYZ/q4HIgo8CYFzRPTBYP2WoakD87P3UPpVZj6uLAz
-						d8LCuv1ZX2HJTHYrUyEM4tbqA2cv/CN8W6cgTkm5puZAMvPmFeNnoQlkBnUpH/oc
-						oGDmT026FyBGQ6yXva1uZVOX0xMCAwEAAaM3MDUwFAYDVR0RBA0wC4IJaGFyMDAz
-						OTE4MB0GA1UdDgQWBBQST9Pog/haMAhYi8W9rY0cKz3XfjANBgkqhkiG9w0BAQUF
-						AAOCAQEAERDcKAB+oNKMF14ys3MjR7NgPZzAnxNjyDizDMsPug9ZqfXKTfU1NFZx
-						nx1ihIXHOBZgLU4RKLJSopHZ57V+HlOebXCckx/je1y4a30B0sIg3yk9ZZlMNcVI
-						JWEIEGc6kkIhgQBMAtTaae+Yd1gqk4MQBQG08iDy9M3E4jp3BmgZbJL2lBYwCoRc
-						U2soIdQNoQS5WDuqwDVXqOljUfijVZU9YRpjPDsXqDQDVO+7v/EbPxVtRThQChxY
-						LwXeoQe6wBNtmeBEdm16Ik+PCxkgQlTCLythjkwmB+AjmqoW6Kp9bNfh7/Tlv/lM
-						bYW9q2/JzwJW2LhAXTV1ev8D9e3peg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://serviceadmin.company.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://serviceadmin.company.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Service Admin</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>JANET TAG</GivenName>
-    <EmailAddress>mailto:jtag@ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>JANET TAG</GivenName>
-    <EmailAddress>mailto:jtag@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml b/swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.xml
deleted file mode 100644
index 671f7411..00000000
--- a/swamid-interfederations-2.0/serviceregistry.oerc.ox.ac.uk-simplesaml-.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://serviceregistry.oerc.ox.ac.uk/simplesaml/">
-  <!--
-		This is a "Service Registry" SimpleSAMLphp SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-26T17:45: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 urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFCTCCA++gAwIBAgIJAJMYOQ/+WX4fMA0GCSqGSIb3DQEBBQUAMIGyMQswCQYD
-						VQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxDTALBgNVBAsTBE9lUkMxJjAk
-						BgNVBAMTHXNlcnZpY2VyZWdpc3RyeS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcN
-						AQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTkxNDE5MTFaFw0y
-						MTA1MTYxNDE5MTFaMIGyMQswCQYDVQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hp
-						cmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZv
-						cmQxDTALBgNVBAsTBE9lUkMxJjAkBgNVBAMTHXNlcnZpY2VyZWdpc3RyeS5vZXJj
-						Lm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51
-						azCCASMwDQYJKoZIhvcNAQEBBQADggEQADCCAQsCggECAsypwS5qHz9mQhrwO7Ij
-						rtstJaTgrcuhP3S8WDlonzdTW7CWOAaUQVRpp7sOJ8o1ikA5XB0aU9ORyCu2jJOZ
-						zlVnSP5ev88JcGFTUgsWHCQ9YCS6kJFnMhnxrWP1Xr3hdmL5TVU5SEaWzINfRxNu
-						i5plV62UwuWImwVUcQ2h/kvU1GSzuS7BAH8fvUZ/bfiaCKEvmfD/PnfE/etWpil+
-						X3WrL3MYlbVcPPndHDr5w+Vk/ffzYoH19/Dqu12/iVboR7zUSrj51bojPlHlx4JS
-						el60U7gHm0muN3KPVgWJQvcyLphBEpID0zm2Zw+7+/DG4c3laJLeYTds0tpS2pBP
-						7FzfAgMBAAGjggEbMIIBFzAdBgNVHQ4EFgQUiVhE6lTDYudFqofjxhNzqqQEjz4w
-						gecGA1UdIwSB3zCB3IAUiVhE6lTDYudFqofjxhNzqqQEjz6hgbikgbUwgbIxCzAJ
-						BgNVBAYTAlVLMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3Jk
-						MR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzEm
-						MCQGA1UEAxMdc2VydmljZXJlZ2lzdHJ5Lm9lcmMub3guYWMudWsxJjAkBgkqhkiG
-						9w0BCQEWF3hpbi54aW9uZ0BvZXJjLm94LmFjLnVrggkAkxg5D/5Zfh8wDAYDVR0T
-						BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQMAAFaAy6JCEMZESspH2sDJ+37EmnCS
-						Am8e961gQd7OBlNXjqV8K9+Qrt18YAXKWwq7s1A19+96Ui1Uuc8swDRNIYdg76nV
-						Zip44kIDpk3g98Dth5zJ12BRJkd+hkR9TZ+7rOHdMZB2Legn6/hWK59PDHZCOLMq
-						3olFW9tmuxO/MTw3ZAVcitKR3q/amlCesr907AY5vnfd2tyVN3c65pY4/nEjNYpc
-						61bbwWt6x/xnmBlwdx+jNjdn8d2mHctH+1lBi3k8g494Aa27yX2t8NkGs6sk3x6j
-						vXs3buSo2iGEY4/5JsFSctsHW8yaW/nRJXKVYM/0r0m5duuXPBhRFWpkEfNU
-					</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>
-						MIIFCTCCA++gAwIBAgIJAJMYOQ/+WX4fMA0GCSqGSIb3DQEBBQUAMIGyMQswCQYD
-						VQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxDTALBgNVBAsTBE9lUkMxJjAk
-						BgNVBAMTHXNlcnZpY2VyZWdpc3RyeS5vZXJjLm94LmFjLnVrMSYwJAYJKoZIhvcN
-						AQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51azAeFw0xMTA1MTkxNDE5MTFaFw0y
-						MTA1MTYxNDE5MTFaMIGyMQswCQYDVQQGEwJVSzEUMBIGA1UECBMLT3hmb3Jkc2hp
-						cmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZv
-						cmQxDTALBgNVBAsTBE9lUkMxJjAkBgNVBAMTHXNlcnZpY2VyZWdpc3RyeS5vZXJj
-						Lm94LmFjLnVrMSYwJAYJKoZIhvcNAQkBFhd4aW4ueGlvbmdAb2VyYy5veC5hYy51
-						azCCASMwDQYJKoZIhvcNAQEBBQADggEQADCCAQsCggECAsypwS5qHz9mQhrwO7Ij
-						rtstJaTgrcuhP3S8WDlonzdTW7CWOAaUQVRpp7sOJ8o1ikA5XB0aU9ORyCu2jJOZ
-						zlVnSP5ev88JcGFTUgsWHCQ9YCS6kJFnMhnxrWP1Xr3hdmL5TVU5SEaWzINfRxNu
-						i5plV62UwuWImwVUcQ2h/kvU1GSzuS7BAH8fvUZ/bfiaCKEvmfD/PnfE/etWpil+
-						X3WrL3MYlbVcPPndHDr5w+Vk/ffzYoH19/Dqu12/iVboR7zUSrj51bojPlHlx4JS
-						el60U7gHm0muN3KPVgWJQvcyLphBEpID0zm2Zw+7+/DG4c3laJLeYTds0tpS2pBP
-						7FzfAgMBAAGjggEbMIIBFzAdBgNVHQ4EFgQUiVhE6lTDYudFqofjxhNzqqQEjz4w
-						gecGA1UdIwSB3zCB3IAUiVhE6lTDYudFqofjxhNzqqQEjz6hgbikgbUwgbIxCzAJ
-						BgNVBAYTAlVLMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3Jk
-						MR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9yZDENMAsGA1UECxMET2VSQzEm
-						MCQGA1UEAxMdc2VydmljZXJlZ2lzdHJ5Lm9lcmMub3guYWMudWsxJjAkBgkqhkiG
-						9w0BCQEWF3hpbi54aW9uZ0BvZXJjLm94LmFjLnVrggkAkxg5D/5Zfh8wDAYDVR0T
-						BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQMAAFaAy6JCEMZESspH2sDJ+37EmnCS
-						Am8e961gQd7OBlNXjqV8K9+Qrt18YAXKWwq7s1A19+96Ui1Uuc8swDRNIYdg76nV
-						Zip44kIDpk3g98Dth5zJ12BRJkd+hkR9TZ+7rOHdMZB2Legn6/hWK59PDHZCOLMq
-						3olFW9tmuxO/MTw3ZAVcitKR3q/amlCesr907AY5vnfd2tyVN3c65pY4/nEjNYpc
-						61bbwWt6x/xnmBlwdx+jNjdn8d2mHctH+1lBi3k8g494Aa27yX2t8NkGs6sk3x6j
-						vXs3buSo2iGEY4/5JsFSctsHW8yaW/nRJXKVYM/0r0m5duuXPBhRFWpkEfNU
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://serviceregistry.oerc.ox.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Service Registry SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oerc.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:support@oerc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:support@oerc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services-federation.renater.fr.xml b/swamid-interfederations-2.0/services-federation.renater.fr.xml
deleted file mode 100644
index 08ebb56f..00000000
--- a/swamid-interfederations-2.0/services-federation.renater.fr.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services-federation.renater.fr/validation/ressource">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-01-06T14:09:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">RENATER - validation resource</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">RENATER - ressource de validation de la fédération Education-Recherche (Shibboleth v2)</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">La ressource de validation permet à un organisme membre de tester son fournisseur d'identités au sein de la fédération Éducation-Recherche.
-
-Cette ressource permet de visualiser tous les attributs utilisateur transmis dans le contexte de la session d'authentification.
-
-RENATER propose également une ressource de test, proposant l'équivalent dans la fédération de Test.
-
-Cette ressource ne requiert aucun attribut, elle se contente d'afficher les attributs transmis par l'IdP.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIC5TCCAc2gAwIBAgIJAOLQPcMRyfO5MA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCmZlZC5jcnUuZnIwHhcNMTAwMjE3MDkwODE0WhcNMjAwMjE1MDkwODE0WjAV
-MRMwEQYDVQQDEwpmZWQuY3J1LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAuqwRDaahljnpxquFaZczqamfSD6oR/4HXnDr/ejA6CoiLs1Csrc4p/Im
-8SjbubbyVmuAmYeT8YW30xtxzoLYMlX/k9LfdnQQMNS0BT20fWKMudHWtKOL+gDo
-ruqK4Ivmv8XJAjzawYvOocxkOZVtsTJ0cP2N+EJTemR4SlEZD2yFGbKdzjfvaocm
-2f1EU4uUanpprf/tne2jwInaK4a3VscZ/AYxtaKTubHtcGrGSrxhvapV6CKMbt+A
-qTW5iWdF4KGdCXUTSzxGjb4mkk1dD5Y4X6zRFSimtE291E2AWL5ricAIPXo6tUax
-mZJVTj3Z0zI4Xo8yefPbFy/V/mCHUwIDAQABozgwNjAVBgNVHREEDjAMggpmZWQu
-Y3J1LmZyMB0GA1UdDgQWBBSKhhBVN/91d6MSPBXStg/lgDHU6jANBgkqhkiG9w0B
-AQUFAAOCAQEAnt8hmxNUOCXMDkJDfM07U/A+Lm+Xc6uXrCJxjr1Nk2zoQDcup4Cp
-90QqxmS483yIa9gAOIswctaDKR2ZPdN+70zBwWjMzQTJcuwRaZhYt2z8qTiDUG9z
-UenrbATCLtWu3PDuGEv4xfgwwSWrdmp/QDbCjs06l3V5WOqZ8/PHY6xbcOQTYpqY
-rrjYGlE1h9R6cGy+SwUuy+Tg8Npf6YM+jBxeSQy6i0jbb8fzF59ZLsP2Oty18qwR
-Z1MmB2gTGIGSzBpLi5rxtWJ0uL67+468ZKcspiUlF+TYr9nfUGb6+wk3wWRGKPoD
-G3v2db1TkOg7SaejzNk+Z0KP8i/gunw49A==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIC5TCCAc2gAwIBAgIJAOLQPcMRyfO5MA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAMTCmZlZC5jcnUuZnIwHhcNMTAwMjE3MDkwODE0WhcNMjAwMjE1MDkwODE0WjAV
-MRMwEQYDVQQDEwpmZWQuY3J1LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAuqwRDaahljnpxquFaZczqamfSD6oR/4HXnDr/ejA6CoiLs1Csrc4p/Im
-8SjbubbyVmuAmYeT8YW30xtxzoLYMlX/k9LfdnQQMNS0BT20fWKMudHWtKOL+gDo
-ruqK4Ivmv8XJAjzawYvOocxkOZVtsTJ0cP2N+EJTemR4SlEZD2yFGbKdzjfvaocm
-2f1EU4uUanpprf/tne2jwInaK4a3VscZ/AYxtaKTubHtcGrGSrxhvapV6CKMbt+A
-qTW5iWdF4KGdCXUTSzxGjb4mkk1dD5Y4X6zRFSimtE291E2AWL5ricAIPXo6tUax
-mZJVTj3Z0zI4Xo8yefPbFy/V/mCHUwIDAQABozgwNjAVBgNVHREEDjAMggpmZWQu
-Y3J1LmZyMB0GA1UdDgQWBBSKhhBVN/91d6MSPBXStg/lgDHU6jANBgkqhkiG9w0B
-AQUFAAOCAQEAnt8hmxNUOCXMDkJDfM07U/A+Lm+Xc6uXrCJxjr1Nk2zoQDcup4Cp
-90QqxmS483yIa9gAOIswctaDKR2ZPdN+70zBwWjMzQTJcuwRaZhYt2z8qTiDUG9z
-UenrbATCLtWu3PDuGEv4xfgwwSWrdmp/QDbCjs06l3V5WOqZ8/PHY6xbcOQTYpqY
-rrjYGlE1h9R6cGy+SwUuy+Tg8Npf6YM+jBxeSQy6i0jbb8fzF59ZLsP2Oty18qwR
-Z1MmB2gTGIGSzBpLi5rxtWJ0uL67+468ZKcspiUlF+TYr9nfUGb6+wk3wWRGKPoD
-G3v2db1TkOg7SaejzNk+Z0KP8i/gunw49A==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://services-federation.renater.fr/validation/ressource/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services-federation.renater.fr/validation/ressource/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="fr">RENATER - ressource de validation de la fédération Education-Recherche (Shibboleth v2)</ServiceName>
-      <ServiceName xml:lang="en">RENATER - validation resource</ServiceName>
-      <ServiceDescription xml:lang="fr">La ressource de validation permet à un organisme membre de tester son fournisseur d'identités au sein de la fédération Éducation-Recherche.
-
-Cette ressource permet de visualiser tous les attributs utilisateur transmis dans le contexte de la session d'authentification.
-
-RENATER propose également une ressource de test, proposant l'équivalent dans la fédération de Test.
-
-Cette ressource ne requiert aucun attribut, elle se contente d'afficher les attributs transmis par l'IdP.</ServiceDescription>
-      <ServiceDescription xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</ServiceDescription>
-      <RequestedAttribute FriendlyName="supannAutreMail" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuEtape" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.29" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannMailPerso" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuRegimeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.31" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannAutreTelephone" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.27" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEmpId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mailForwardingAddress" Name="urn:oid:2.16.840.1.113730.3.1.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuElementPedagogique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.28" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannRole" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannRoleEntite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannCivilite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannActivite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannCodeINE" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuAnneeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.25" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuSecteurDisciplinaire" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.32" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEntiteAffectationPrincipale" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEntiteAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannListeRouge" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuCursusAnnee" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.26" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtablissement" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannRoleGenerique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.30" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuTypeDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.33" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduOrgLegalName" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannOrganisme" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.renater.fr</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>equipe-federation@listes.renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services.aai.mpg.de.xml b/swamid-interfederations-2.0/services.aai.mpg.de.xml
deleted file mode 100644
index df186e1d..00000000
--- a/swamid-interfederations-2.0/services.aai.mpg.de.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services.aai.mpg.de/idp/proxy/idp">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">mpg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>services.aai.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=services.aai.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVDCCBDygAwIBAgIEDpZLlDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTA4MDMxMTQ2
-MTNaFw0xNDA4MDIxMTQ2MTNaMFsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEMMAoGA1UECxMDUEtJMRwwGgYDVQQDExNzZXJ2
-aWNlcy5hYWkubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wo/JY5GAYrXqDlrEhVK+3pVjg+fse6ZDZP2pCdmNw0LFnDxNjEXve/5PvMT6PDi9
-lCb2YPLYl8brtICD/rev9O9NyAaReZ/2HApvMNgFBlAsWSlp4NKruwcG4Sz2VG+a
-T3stcy0ud8pdFSlfe9hvRcDm6/F4d/rEoRwuGtxq4y3u1OrcFPLltOaBRQiLEfXP
-kEe4XRndVqDO2Tdv3FVK2kcQsChc3RF53BA+nRrrMzdYFHNSasR2FTAa4sCqGrXW
-fOhBk7YqX8BYyN5WcgHOUYk7o/sjAUzlc7Irk2a4TpUQTeZjxf2I3eJh3A4U/zsm
-5lGTEyoigyt7NgioMz0aaQIDAQABo4ICGzCCAhcwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
-2PB1xPMrpSNtJnu/DplMCTithDAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HR
-zn3DWzCBjwYDVR0RBIGHMIGEghNzZXJ2aWNlcy5hYWkubXBnLmRlgg5wdWIuYWFp
-Lm1wZy5kZYILYWFpLmd3ZGcuZGWCD3NoaWItaWRwLm1wZy5kZYIQc2hpYi1pZHAu
-Z3dkZy5kZYcEhkwYEIcEhkwYDIcEhkwYCoEbdGhvcnN0ZW4uaGluZGVybWFubkBn
-d2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-bXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUw
-gYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB3YUqg8sgrAdvD1gRqbo8OPl4M9VBoIBhX3Ex6EUWFYAosQPruOVrz
-om+mXgeN2RdCl2Vq/hua/vYvmNGjnBONfkCHAM7y75r2oo94MC3EhQLVfwUnR5Cq
-HHEJoE5ErvAgPS4w6iWCuZbHVpJEXmaQuu16EX//WWcTmBG9JQ1UeF1XnVRdCzWz
-ivgAWoFdxV7rPIXYUrgiLOzdzRyTzsP7odbUcGscrbbHRL44ua06ioo3iggojKRJ
-DktGe+x1VIK6EIzYwwOfhn6xcXAfrAIBj+AnWOGM16KAMb1CqFM81GYAZxUItKdh
-guP31RSo9hKlJTxwkQ7O6HcoNbkOHuH7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>services.aai.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=services.aai.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVDCCBDygAwIBAgIEDpZLlDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTA4MDMxMTQ2
-MTNaFw0xNDA4MDIxMTQ2MTNaMFsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEMMAoGA1UECxMDUEtJMRwwGgYDVQQDExNzZXJ2
-aWNlcy5hYWkubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wo/JY5GAYrXqDlrEhVK+3pVjg+fse6ZDZP2pCdmNw0LFnDxNjEXve/5PvMT6PDi9
-lCb2YPLYl8brtICD/rev9O9NyAaReZ/2HApvMNgFBlAsWSlp4NKruwcG4Sz2VG+a
-T3stcy0ud8pdFSlfe9hvRcDm6/F4d/rEoRwuGtxq4y3u1OrcFPLltOaBRQiLEfXP
-kEe4XRndVqDO2Tdv3FVK2kcQsChc3RF53BA+nRrrMzdYFHNSasR2FTAa4sCqGrXW
-fOhBk7YqX8BYyN5WcgHOUYk7o/sjAUzlc7Irk2a4TpUQTeZjxf2I3eJh3A4U/zsm
-5lGTEyoigyt7NgioMz0aaQIDAQABo4ICGzCCAhcwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
-2PB1xPMrpSNtJnu/DplMCTithDAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HR
-zn3DWzCBjwYDVR0RBIGHMIGEghNzZXJ2aWNlcy5hYWkubXBnLmRlgg5wdWIuYWFp
-Lm1wZy5kZYILYWFpLmd3ZGcuZGWCD3NoaWItaWRwLm1wZy5kZYIQc2hpYi1pZHAu
-Z3dkZy5kZYcEhkwYEIcEhkwYDIcEhkwYCoEbdGhvcnN0ZW4uaGluZGVybWFubkBn
-d2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-bXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUw
-gYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB3YUqg8sgrAdvD1gRqbo8OPl4M9VBoIBhX3Ex6EUWFYAosQPruOVrz
-om+mXgeN2RdCl2Vq/hua/vYvmNGjnBONfkCHAM7y75r2oo94MC3EhQLVfwUnR5Cq
-HHEJoE5ErvAgPS4w6iWCuZbHVpJEXmaQuu16EX//WWcTmBG9JQ1UeF1XnVRdCzWz
-ivgAWoFdxV7rPIXYUrgiLOzdzRyTzsP7odbUcGscrbbHRL44ua06ioo3iggojKRJ
-DktGe+x1VIK6EIzYwwOfhn6xcXAfrAIBj+AnWOGM16KAMb1CqFM81GYAZxUItKdh
-guP31RSo9hKlJTxwkQ7O6HcoNbkOHuH7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://services.aai.mpg.de:8443/idp/proxy/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://services.aai.mpg.de:8443/idp/proxy/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://services.aai.mpg.de/idp/proxy/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://services.aai.mpg.de/idp/proxy/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.aai.mpg.de/idp/proxy/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://services.aai.mpg.de/idp/proxy/profile/SAML2/POST-SimpleSign/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">mpg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>services.aai.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=services.aai.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVDCCBDygAwIBAgIEDpZLlDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTA4MDMxMTQ2
-MTNaFw0xNDA4MDIxMTQ2MTNaMFsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEMMAoGA1UECxMDUEtJMRwwGgYDVQQDExNzZXJ2
-aWNlcy5hYWkubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wo/JY5GAYrXqDlrEhVK+3pVjg+fse6ZDZP2pCdmNw0LFnDxNjEXve/5PvMT6PDi9
-lCb2YPLYl8brtICD/rev9O9NyAaReZ/2HApvMNgFBlAsWSlp4NKruwcG4Sz2VG+a
-T3stcy0ud8pdFSlfe9hvRcDm6/F4d/rEoRwuGtxq4y3u1OrcFPLltOaBRQiLEfXP
-kEe4XRndVqDO2Tdv3FVK2kcQsChc3RF53BA+nRrrMzdYFHNSasR2FTAa4sCqGrXW
-fOhBk7YqX8BYyN5WcgHOUYk7o/sjAUzlc7Irk2a4TpUQTeZjxf2I3eJh3A4U/zsm
-5lGTEyoigyt7NgioMz0aaQIDAQABo4ICGzCCAhcwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
-2PB1xPMrpSNtJnu/DplMCTithDAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HR
-zn3DWzCBjwYDVR0RBIGHMIGEghNzZXJ2aWNlcy5hYWkubXBnLmRlgg5wdWIuYWFp
-Lm1wZy5kZYILYWFpLmd3ZGcuZGWCD3NoaWItaWRwLm1wZy5kZYIQc2hpYi1pZHAu
-Z3dkZy5kZYcEhkwYEIcEhkwYDIcEhkwYCoEbdGhvcnN0ZW4uaGluZGVybWFubkBn
-d2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-bXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUw
-gYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB3YUqg8sgrAdvD1gRqbo8OPl4M9VBoIBhX3Ex6EUWFYAosQPruOVrz
-om+mXgeN2RdCl2Vq/hua/vYvmNGjnBONfkCHAM7y75r2oo94MC3EhQLVfwUnR5Cq
-HHEJoE5ErvAgPS4w6iWCuZbHVpJEXmaQuu16EX//WWcTmBG9JQ1UeF1XnVRdCzWz
-ivgAWoFdxV7rPIXYUrgiLOzdzRyTzsP7odbUcGscrbbHRL44ua06ioo3iggojKRJ
-DktGe+x1VIK6EIzYwwOfhn6xcXAfrAIBj+AnWOGM16KAMb1CqFM81GYAZxUItKdh
-guP31RSo9hKlJTxwkQ7O6HcoNbkOHuH7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>services.aai.mpg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=services.aai.mpg.de,OU=PKI,O=Max-Planck-Gesellschaft,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVDCCBDygAwIBAgIEDpZLlDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTA4MDMxMTQ2
-MTNaFw0xNDA4MDIxMTQ2MTNaMFsxCzAJBgNVBAYTAkRFMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEMMAoGA1UECxMDUEtJMRwwGgYDVQQDExNzZXJ2
-aWNlcy5hYWkubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-wo/JY5GAYrXqDlrEhVK+3pVjg+fse6ZDZP2pCdmNw0LFnDxNjEXve/5PvMT6PDi9
-lCb2YPLYl8brtICD/rev9O9NyAaReZ/2HApvMNgFBlAsWSlp4NKruwcG4Sz2VG+a
-T3stcy0ud8pdFSlfe9hvRcDm6/F4d/rEoRwuGtxq4y3u1OrcFPLltOaBRQiLEfXP
-kEe4XRndVqDO2Tdv3FVK2kcQsChc3RF53BA+nRrrMzdYFHNSasR2FTAa4sCqGrXW
-fOhBk7YqX8BYyN5WcgHOUYk7o/sjAUzlc7Irk2a4TpUQTeZjxf2I3eJh3A4U/zsm
-5lGTEyoigyt7NgioMz0aaQIDAQABo4ICGzCCAhcwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRP
-2PB1xPMrpSNtJnu/DplMCTithDAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HR
-zn3DWzCBjwYDVR0RBIGHMIGEghNzZXJ2aWNlcy5hYWkubXBnLmRlgg5wdWIuYWFp
-Lm1wZy5kZYILYWFpLmd3ZGcuZGWCD3NoaWItaWRwLm1wZy5kZYIQc2hpYi1pZHAu
-Z3dkZy5kZYcEhkwYEIcEhkwYDIcEhkwYCoEbdGhvcnN0ZW4uaGluZGVybWFubkBn
-d2RnLmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-bXBnLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBkgYIKwYBBQUHAQEEgYUw
-gYIwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9tcGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEB
-BQUAA4IBAQB3YUqg8sgrAdvD1gRqbo8OPl4M9VBoIBhX3Ex6EUWFYAosQPruOVrz
-om+mXgeN2RdCl2Vq/hua/vYvmNGjnBONfkCHAM7y75r2oo94MC3EhQLVfwUnR5Cq
-HHEJoE5ErvAgPS4w6iWCuZbHVpJEXmaQuu16EX//WWcTmBG9JQ1UeF1XnVRdCzWz
-ivgAWoFdxV7rPIXYUrgiLOzdzRyTzsP7odbUcGscrbbHRL44ua06ioo3iggojKRJ
-DktGe+x1VIK6EIzYwwOfhn6xcXAfrAIBj+AnWOGM16KAMb1CqFM81GYAZxUItKdh
-guP31RSo9hKlJTxwkQ7O6HcoNbkOHuH7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://services.aai.mpg.de:8443/idp/proxy/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://services.aai.mpg.de:8443/idp/proxy/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Max-Planck-Gesellschaft</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Max-Planck-Gesellschaft</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.mpg.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Sebastian</GivenName>
-    <SurName>Rieger</SurName>
-    <EmailAddress>sebastian.rieger@gwdg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthias</GivenName>
-    <SurName>Egger</SurName>
-    <EmailAddress>matthias.egger@rzg.mpg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Thorsten</GivenName>
-    <SurName>Hindermann</SurName>
-    <EmailAddress>thorsten.hindermann@gwdg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml
deleted file mode 100644
index 44b46ee0..00000000
--- a/swamid-interfederations-2.0/services.internet2.edu-shibboleth.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services.internet2.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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.internet2.edu/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://lists.internet2.edu/Shibboleth.sso/DS" 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://lists.incommon.org/Shibboleth.sso/DS" 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://service3.internet2.edu/Shibboleth.sso/DS" 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://devtracker.internet2.edu/Shibboleth.sso/Login" index="5"/>
-      <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://lists.usucan.org/Shibboleth.sso/DS" index="6"/>
-      <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://rt.internet2.edu/Shibboleth.sso/DS" index="7"/>
-      <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://chinatest.internet2.edu/Shibboleth.sso/Login" index="8"/>
-      <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://china.internet2.edu/Shibboleth.sso/Login" index="9"/>
-      <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://forum.internet2.edu/Shibboleth.sso/Login" index="10"/>
-      <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://webtest.internet2.edu/Shibboleth.sso/Login" index="11"/>
-      <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://splunk.internet2.edu/Shibboleth.sso/Login" index="12"/>
-      <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://forum-staging.internet2.edu/Shibboleth.sso/Login" index="13"/>
-      <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.internet2.edu/Shibboleth.sso/Login" index="14"/>
-      <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://saltweb.internet2.edu/Shibboleth.sso/Login" index="15"/>
-      <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://deepfield.internet2.edu/Shibboleth.sso/Login" index="16"/>
-      <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://deepfield.internet2.edu/Shibboleth.sso/DS" index="17"/>
-      <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://meetings.internet2.edu/Shibboleth.sso/Login" index="18"/>
-      <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://meetingtest.internet2.edu/Shibboleth.sso/Login" index="19"/>
-      <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.perfsonar.net/Shibboleth.sso/Login" index="20"/>
-      <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://webtest.perfsonar.net/Shibboleth.sso/Login" index="21"/>
-      <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://forum.unizin.org/Shibboleth.sso/Login" index="22"/>
-      <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://forum-staging.internet2.edu/Shibboleth.sso/Login" index="23"/>
-      <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://forum-staging.internet2.edu/Shibboleth.sso/Login" index="24"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Internet2 Services</mdui:DisplayName>
-        <mdui:Description xml:lang="en">services.internet2.edu provides Internet2 services in support of our Research and Education Networking mission. Current examples include: e-mail lists, Internet2 meeting registration, and trouble ticketing
-for administration of Net+ services.  Planned additions include
-Filesender, the Internet2 Member Portal, and wikis.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.internet2.edu/help/federated-services-user-guide/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="91" width="122" xml:lang="en">https://www.internet2.edu/media/medialibrary/2013/10/15/internet2_logo_200pxtrans.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFTCCAf2gAwIBAgIJAJcmxvLDIe+oMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV
-BAMMFnNlcnZpY2VzLmludGVybmV0Mi5lZHUwHhcNMTUxMDA2MTIzODA2WhcNMjUx
-MDA2MTIzODA2WjAhMR8wHQYDVQQDDBZzZXJ2aWNlcy5pbnRlcm5ldDIuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvnktqka8ojoq59ZAa4K2KiiM
-m4RUt4v10eeXvHEyd85N5aaHBgaRNhiflrgZ/NeU8skrui7czODaxqBs8XMzuhU4
-+KCKgVKiZdpz3BcqjKcuEu9pKCoB9Zunirx21COSOuhytWvlkc4x0bHD/k1Kg+nl
-x3z3RLu+NNDEbCZKDCnb42tN1pwBSyJlUJpfLu30J3u+FrabM/ax1eo5HeMVeNQx
-2+CRFhD2fhJpD91Nt3XNfArHYJabdegNkXq8DL3WlaVZMqkMq6G1fIOO6am+Ey/I
-wKwRUcLmRsY+JBpZ8U9vQYL9yr5L4nBPyVTv+NwonOdZOfNecqZXkCJNd0rBSQID
-AQABo1AwTjAdBgNVHQ4EFgQU/JzAr/YHO8Mh7AzefIMj3hUVSZwwHwYDVR0jBBgw
-FoAU/JzAr/YHO8Mh7AzefIMj3hUVSZwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAQEAa4VY6C9fpP7NMFJ8ImfDbu97B2n0ZFoCprC3eNRsx0HEbh+26Uk9
-d+yoqH95QvHEB4AKKm3y7dj5jGBvvT480V9Ee0m09ZNGU0n4YWnKky+LqUy9+0R3
-UFNkm3xjIy0yKwyJ6EGo9+5pmvo8tAvjvlwlYHm99YIWAKchFm/v1RrwNZmkUy2N
-WTU70aLaOQq0r3eG3FW+Net1U/dmr28QY4J0UOvD5f2LoWNPXo9xW7N+ZJHd/KsE
-uALfHFGgUGQfHIrJKfHTrdO098Yefwvxh46l/xm9r0c/HKkyfDo5UKPuVOe4srr1
-jNU70ZWm1b9LIxhfoMCYGi7dvyTnW61MVA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.internet2.edu/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.internet2.edu/Shibboleth.sso/SAML/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.internet2.edu/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://service3.internet2.edu/Shibboleth.sso/SAML2/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://service3.internet2.edu/Shibboleth.sso/SAML/POST" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.incommon.org/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.incommon.org/Shibboleth.sso/SAML/POST" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.usucan.org/Shibboleth.sso/SAML/POST" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.usucan.org/Shibboleth.sso/SAML2/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rt.internet2.edu/Shibboleth.sso/SAML2/POST" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rt.internet2.edu/Shibboleth.sso/SAML/POST" index="12"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://china.internet2.edu/Shibboleth.sso/SAML2/POST" index="13"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webtest.internet2.edu/Shibboleth.sso/SAML2/POST" index="14"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saltweb.internet2.edu/Shibboleth.sso/SAML2/POST" index="15"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://deepfield.internet2.edu/Shibboleth.sso/SAML2/POST" index="16"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meetings.internet2.edu/Shibboleth.sso/SAML2/POST" index="17"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meetingtest.internet2.edu/Shibboleth.sso/SAML2/POST" index="18"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.perfsonar.net/Shibboleth.sso/SAML2/POST" index="19"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webtest.perfsonar.net/Shibboleth.sso/SAML2/POST" index="20"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forum.internet2.edu/Shibboleth.sso/SAML2/POST" index="21"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forum.unizin.org/Shibboleth.sso/SAML2/POST" index="22"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://forum-staging.internet2.edu/Shibboleth.sso/SAML2/POST" index="23"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://devtracker.internet2.edu/Shibboleth.sso/SAML2/POST" index="24"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://devtracker.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="25"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://chinatest.internet2.edu/Shibboleth.sso/SAML2/POST" index="26"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://splunk.internet2.edu/Shibboleth.sso/SAML2/POST" index="27"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://splunk.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="28"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Internet2 Services</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">services.internet2.edu provides Internet2 services in support of our Research and Education Networking mission. Current examples include: e-mail lists, Internet2 meeting registration, and trouble ticketing
-for administration of Net+ services.  Planned additions include
-Filesender, the Internet2 Member Portal, and wikis.</md:ServiceDescription>
-      <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="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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tech Support</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tech Support</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tech Support</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services.oxfordjournals.org-shibboleth.xml b/swamid-interfederations-2.0/services.oxfordjournals.org-shibboleth.xml
deleted file mode 100644
index e4daf4df..00000000
--- a/swamid-interfederations-2.0/services.oxfordjournals.org-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services.oxfordjournals.org/shibboleth">
-  <!--
-		This is an "Oxford Journals" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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-16T18:05:53Z"/>
-  </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://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oxford Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oxfordjournals.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/services.oxfordjournals.org.xml b/swamid-interfederations-2.0/services.oxfordjournals.org.xml
deleted file mode 100644
index b8790056..00000000
--- a/swamid-interfederations-2.0/services.oxfordjournals.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://services.oxfordjournals.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/oupjournals/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Oxford Journals</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Oxford Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.oxfordjournals.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml
deleted file mode 100644
index 2d0d30cb..00000000
--- a/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.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://sesame.ifsttar.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">IFSTTAR</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA70lEQVQ4y5WSPQrCQBCFvw3ewEoURWzFJgTJOSz0DuIdcgfxBhZapPYAFgFF0ijYCaLgBazXRuNks2viaxIm835mJgoHovVeF2rjQJk1VZXsEqm5yLIxWu91u9XkersXBL0qLr/S5RKskoWG3fv5xfmKE16e/D+8soZup1eozeJYz+JYw/sKprtJOl0GANkSo3GgPgJemeNmW7cmm49GCqBmui+TJwB93wegMQTE9cwLOXdwPByy9/SRkD6Swh4AlEwwCadKfpRJpGAuwYdkm08S+76fiVUawRSRQrIna7L9SJNwquQ4NoNcfNs+yvACMY5sWAU9eNwAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDIrMDI6MDBDp9MfAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAyKzAyOjAwMvprowAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ifsttar.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">IFSTTAR</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>
-					      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>
-    </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-POST" Location="https://sesame.ifsttar.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sesame.ifsttar.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sesame.ifsttar.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IFSTTAR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFSTTAR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifsttar.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>expl@ifsttar.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ca192b27..00000000
--- a/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml
+++ /dev/null
@@ -1,102 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.africa-grid.org/shibboleth">
-  <md: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>
-  </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">
-                        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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFpTCCBI2gAwIBAgIQGR3eYsjpMdQgF9uqH5P0rzANBgkqhkiG9w0BAQsFADCB
-ljELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxPDA6BgNV
-BAMTM0NPTU9ETyBSU0EgT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gU2VjdXJlIFNl
-cnZlciBDQTAeFw0xNjAxMTQwMDAwMDBaFw0xNzAxMTMyMzU5NTlaMIGkMQswCQYD
-VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxEDAOBgNVBAgTB0NhdGFuaWExEDAOBgNV
-BAcTB0NhdGFuaWExGTAXBgNVBAkTEFZpYSBTLiBTb2ZpYSwgNjQxEjAQBgNVBAoT
-CVVOSUNULURQQTEUMBIGA1UECxMLUGxhdGludW1TU0wxHDAaBgNVBAMTE3Nndy5h
-ZnJpY2EtZ3JpZC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDS
-Oof3Gdnm/jIqr88eaE6QJDa4i9GxKY9fyW2BhobGWoFs5czbPxDr6d83cRVWykzr
-UjONLQw7+dTbv7ncLwnMd6Eo6li/7YQBlx7YiJkqiMwPD8tatKFYcNjQuD01vjb7
-zWfqIgcEWa1DHW0Fi3xcbJM2IUl1Fh9Ndx5MQOkQ7B1RJNdKlcSJZYnJh54J8OCo
-xHyxEw408k3tP4L0Zkbk/wPcX7HEumz73rqHjsl7SyOKSAocugDU9WABKLJTQ9Cr
-Aa3t0RTqPDnpmcaI2s/zX90eLBa8KrXpHjbuSBxn3IJFKFS4fvO011AHTPV1NcEe
-IL0y0SJkokyYfGk22QxtAgMBAAGjggHdMIIB2TAfBgNVHSMEGDAWgBSa8yvaz61P
-ti+7KkhIKhK3G0LBJDAdBgNVHQ4EFgQUahHmAhigtlB9HnKJ9gccH1FvvHEwDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMFAGA1UdIARJMEcwOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUH
-AgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMAgGBmeBDAECAjBaBgNV
-HR8EUzBRME+gTaBLhklodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FP
-cmdhbml6YXRpb25WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3JsMIGLBggrBgEF
-BQcBAQR/MH0wVQYIKwYBBQUHMAKGSWh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NP
-TU9ET1JTQU9yZ2FuaXphdGlvblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcnQw
-JAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTAeBgNVHREEFzAV
-ghNzZ3cuYWZyaWNhLWdyaWQub3JnMA0GCSqGSIb3DQEBCwUAA4IBAQAbxQKOTARh
-YbbDbVjVLdzP2ZcP5Y1cWgNXQ+OT1bmMaJhyWJHPW3Qa5oCuELEFoKbN8PwssS7A
-vKwEcJgYIp4bdztSu3QSxuv/r0sdEwsWTSfQUEGkja+dMuQbN2PDAd5TRE04+Jo5
-ip2LFRRGJ7WyLbNe9jqpzzmrZFrf2OtB4tUW3U/z4AFli3pnmzKsu+fLAU+r2MqI
-MiTPuc71M6gTl3C9vJAL+dy3ruNzrr//1EhwLTrIDhZkig9WuQOsP1j89Qdh2BXg
-Su+eL1aCo7yimHn08fLU6N+4lZYVONzt8bAa2hEe9xEzSpvdWuf8yPAGTZyaZp5S
-kavjl+vu7T/L
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Africa Grid Science Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">
-                    This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 85fc870f..00000000
--- a/swamid-interfederations-2.0/sgw.africa-grid.org.xml
+++ /dev/null
@@ -1,113 +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://sgw.africa-grid.org/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-27T09:58:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-      <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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.africa-grid.org/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://sgw.africa-grid.org/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
-        <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
-        <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
-        <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>klios.ct.infn.it</ds:KeyName>
-        <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
-        <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
-        <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
-          <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Africa Grid Science Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">
-                    This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
-                </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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 1366e4fb..00000000
--- a/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
+++ /dev/null
@@ -1,90 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.garr.it/shibboleth">
-  <md: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>
-  </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://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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE6TCCA9GgAwIBAgIRALptUo7+DEUSrs09PRm311swDQYJKoZIhvcNAQEFBQAw
-PzELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEfMB0GA1UEAxMWVEVSRU5B
-IGVTY2llbmNlIFNTTCBDQTAeFw0xNTAxMDcwMDAwMDBaFw0xNjAyMDYyMzU5NTla
-MIGCMRMwEQYKCZImiZPyLGQBGRYDb3JnMRYwFAYKCZImiZPyLGQBGRYGdGVyZW5h
-MRMwEQYKCZImiZPyLGQBGRYDdGNzMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBW
-YWxpZGF0ZWQxGzAZBgNVBAMTEnNnLWxpZmVyYXkuZ2Fyci5pdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALX1GKeAFimAFVU5XaPX0Jb/UnbO9FMew0rS
-CwlGA/57V+7Gr0RsuCsmUoMOuITbTCz0K23A1e9mPflSuJNPQf30d/jE+rf3icrK
-M7wZVzKdqyodzV7d2e0p1LjVz7qE/DCREUI9ADZJpMRRLk2hWfBxog93SIM3YwFq
-u6r+BySrtDuwwAbiz3Hvo3QL+dsQbX8p8doML8O1F8S2KC82Pn5piyq+QzeYzJeL
-evr+8XyUzmDVEahQ8OxU0UxsSwm19WIqhYY3TB5o2Y0fxhCJzOA6Ypg9gul/o+Jp
-Tsi1HJFrbWhQxI9rNmcy6VIoH45stsYkiFrdgY2xb2WlsH7/ad0CAwEAAaOCAZow
-ggGWMB8GA1UdIwQYMBaAFCPTl73A2KGUYYgNhbbMdZ/JeTuSMB0GA1UdDgQWBBQj
-k9y2Mc0DO7GK4AOzZF2f+FDsWDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwMAYDVR0gBCkwJzANBgsr
-BgEEAbIxAQICHTAMBgoqhkiG90wFAgIBMAgGBmeBDAECATBCBgNVHR8EOzA5MDeg
-NaAzhjFodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQWVTY2llbmNlU1NM
-Q0EuY3JsMHUGCCsGAQUFBwEBBGkwZzA9BggrBgEFBQcwAoYxaHR0cDovL2NydC50
-Y3MudGVyZW5hLm9yZy9URVJFTkFlU2NpZW5jZVNTTENBLmNydDAmBggrBgEFBQcw
-AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKgYDVR0RBCMwIYISc2ctbGlm
-ZXJheS5nYXJyLml0ggtzZ3cuZ2Fyci5pdDANBgkqhkiG9w0BAQUFAAOCAQEAQcaR
-DxdFgJsT0c5yNj/3GqYtNVwyWXN7AWul/V4VGq9sp36IqV2wmqScGkCEWHGsaUrX
-K5mNW5cmEM8Yqhew/Bvl8I10lvVreZ2TVvd+YGa2aLdIdhKld0fEMZ2RR5AYzGPY
-34PFlE6JqWOWHTvxwYGTv+tIy+Pel0D06afKEJ3PaVCcs2HuM/PxxQ/fDmvABZwR
-oV/0KZ66qrvlXYsF2RYt0SOixsJC4YOkirXzoT7Pb8jSizVZJ3DWfwvdAlXU0DNE
-hrolz4U0Hxn5gCYTiDXtQBe4c8dj4IJYa1vTZgpJnO4aDQcQeuKLiJmSuOnTuuE1
-L0omxxTTWQuG2yPHqQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="it">GARR Science Gateway</md:ServiceName>
-      <md:ServiceName xml:lang="en">GARR Science Gateway</md:ServiceName>
-      <md: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</md:ServiceDescription>
-      <md: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.</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">GARR Science Gateway erogato da Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">GARR Science Gateway provided by Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.garr.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:sgwadmin@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 617e8dc0..00000000
--- a/swamid-interfederations-2.0/sgw.garr.it.xml
+++ /dev/null
@@ -1,96 +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://sgw.garr.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-11T00:45:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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://sgw.garr.it/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://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:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sg-liferay.garr.it</ds:KeyName>
-        <ds:KeyName>sgw.garr.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sg-liferay.garr.it,OU=Domain Control Validated,DC=tcs,DC=terena,DC=org</ds:X509SubjectName>
-          <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>
-      <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://sgw.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="it">GARR Science Gateway</md:ServiceName>
-      <md:ServiceName xml:lang="en">GARR Science Gateway</md:ServiceName>
-      <md: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</md:ServiceDescription>
-      <md: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.</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <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 xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <EmailAddress>sgwadmin@garr.it</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sh2testsp1.iay.org.uk.xml b/swamid-interfederations-2.0/sh2testsp1.iay.org.uk.xml
deleted file mode 100644
index 6fdeb90e..00000000
--- a/swamid-interfederations-2.0/sh2testsp1.iay.org.uk.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sh2testsp1.iay.org.uk/shibboleth">
-  <!--
-		This is an SDSS project test SP running outside the University environment.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SDSS SAML 1.1/2.0 Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This test service provider allows you to see the attributes your identity provider is releasing.</mdui:Description>
-        <mdui:Logo height="218" width="500">https://sh2testsp1.iay.org.uk/images/leaves_500x218.jpg</mdui:Logo>
-        <mdui:Logo height="104" width="240">https://sh2testsp1.iay.org.uk/images/leaves_240x104.jpg</mdui:Logo>
-        <mdui:Logo height="44" width="100">https://sh2testsp1.iay.org.uk/images/leaves_100x44.jpg</mdui:Logo>
-        <mdui:Logo height="75" width="75">https://sh2testsp1.iay.org.uk/images/leaves_75x75.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/Login" index="1"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/Login1"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/DS" index="2"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKfedWAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKfedDS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKfedDS" index="3"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKfedWAYFall"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKtestWAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKtestDS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/UKtestDS" index="4"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTfedWAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTfedDS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTfedDS" index="5"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTfedWAYFall"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTtestWAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTtestDS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/TESTtestDS" index="6"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/EDS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/EDS" index="7"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID8DCCAtigAwIBAgIJAOw5pWQpuZYtMA0GCSqGSIb3DQEBBQUAMFgxCzAJBgNV
-						BAYTAkdCMRIwEAYDVQQHEwlFZGluYnVyZ2gxFTATBgNVBAoTDElhbiBBLiBZb3Vu
-						ZzEeMBwGA1UEAxMVc2gydGVzdHNwMS5pYXkub3JnLnVrMB4XDTA4MTExMjE2MzIx
-						MVoXDTI4MDExMjE2MzIxMVowWDELMAkGA1UEBhMCR0IxEjAQBgNVBAcTCUVkaW5i
-						dXJnaDEVMBMGA1UEChMMSWFuIEEuIFlvdW5nMR4wHAYDVQQDExVzaDJ0ZXN0c3Ax
-						LmlheS5vcmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDjn5vE
-						tcuRZwsqQdwlHKGE8YeWkLvvoPRcvp88xQjuOrZU3fVXbn1JY2oArq5y9hujPJJQ
-						MNOy9ESN7KFeH3I9qvZFZcl1gjw/arVzkNETsnXHU/Gc7Oj+lPCCWwUxIefSn5wt
-						tXoSVGqJBvctZquHXbTj62Vei1/VhlTixFYqbLHXfDgK4RYOD6QZlgHobr0Hye8y
-						Ps6sKdDbu+DhmnbtoG5y7Y5/b24SyV9p1eCbOdhYEdc+NijccDPN/Ms/Ub7zI/Rj
-						9F6JRfxcFlyMjGiYfMLeyiMTUbIC4R7AkoWiAs7ptddZ2XeuGCBjZOLQ5Xgj7sDr
-						MaXVnlFnzZQovlIRAgMBAAGjgbwwgbkwHQYDVR0OBBYEFLYTfNB3+zufAcpluCuJ
-						tXMKzEOTMIGJBgNVHSMEgYEwf4AUthN80Hf7O58BymW4K4m1cwrMQ5OhXKRaMFgx
-						CzAJBgNVBAYTAkdCMRIwEAYDVQQHEwlFZGluYnVyZ2gxFTATBgNVBAoTDElhbiBB
-						LiBZb3VuZzEeMBwGA1UEAxMVc2gydGVzdHNwMS5pYXkub3JnLnVrggkA7DmlZCm5
-						li0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAZuWG7yLuMziQbEVT
-						u7+GfL9z/5UXF1yYDUMyEkcFfKUSbyKV0aDdIaRJI/jj/7wu031Bsg3MjpA5Nxr2
-						1aSqsr3Vson3CCMISPRlj6v0B+lwB/3tK5UvPcOe7jWgmhOtcvXPpimXLChZOiHv
-						WQwkoN+WNF+TyY+9/2hKUnWyy75nRA0RTe2l2TWWrGHzECQZUbjfjR20oDVwaQbK
-						kVOI2+PkOSitsmTSFwf/9hPkqXgbIVXxzDiHIYevERxgehH910dTbhrgTnNFvV9E
-						WMK87CuoEcI9D9PHfeFTDkRp2pigVMQQwQCw+5ms72q8f1TgUCwuvoKVQ+V7joEA
-						Ei/BJQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sh2testsp1.iay.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">SDSS SAML 1.1/2.0 Test SP</ServiceName>
-      <ServiceDescription xml:lang="en">
-				This test service provider allows you to see the attributes
-				your identity provider is releasing.
-			</ServiceDescription>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:mace:dir:attribute-def:eduPersonAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:mace:dir:attribute-def:eduPersonNickname" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:mace:dir:attribute-def:eduPersonOrgDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:mace:dir:attribute-def:eduPersonAssurance" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:mace:dir:attribute-def:cn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="description" Name="urn:mace:dir:attribute-def:description" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="description" Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:mace:dir:attribute-def:facsimileTelephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="initials" Name="urn:mace:dir:attribute-def:initials" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="initials" Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="l" Name="urn:mace:dir:attribute-def:l" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="manager" Name="urn:mace:dir:attribute-def:manager" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="manager" Name="urn:oid:0.9.2342.19200300.100.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:mace:dir:attribute-def:o" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:mace:dir:attribute-def:ou" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="postalCode" Name="urn:mace:dir:attribute-def:postalCode" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="postalCode" Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="postofficeBox" Name="urn:mace:dir:attribute-def:postOfficeBox" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="postOfficeBox" Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:mace:dir:attribute-def:preferredLanguage" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="seeAlso" Name="urn:mace:dir:attribute-def:seeAlso" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="seeAlso" Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="st" Name="urn:mace:dir:attribute-def:st" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="st" Name="urn:oid:2.5.4.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="street" Name="urn:mace:dir:attribute-def:street" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="street" Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:mace:dir:attribute-def:telephoneNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="title" Name="urn:mace:dir:attribute-def:title" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="carLicense" Name="urn:mace:dir:attribute-def:carLicense" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="carLicense" Name="urn:oid:2.16.840.1.113730.3.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="departmentNumber" Name="urn:mace:dir:attribute-def:departmentNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="departmentNumber" Name="urn:oid:2.16.840.1.113730.3.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="employeeNumber" Name="urn:mace:dir:attribute-def:employeeNumber" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:1.2.840.113556.1.2.610" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="employeeType" Name="urn:mace:dir:attribute-def:employeeType" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="employeeType" Name="urn:oid:1.2.840.113556.1.2.613" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="businessCategory" Name="urn:mace:dir:attribute-def:businessCategory" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="businessCategory" Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:mace:dir:attribute-def:physicalDeliveryOfficeName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <RequestedAttribute FriendlyName="physicalDeliveryOfficeName" Name="urn:oid:2.5.4.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ian A. Young</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SDSS Fountainhall Shibboleth 2.X test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://iay.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:ukfed@iay.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:ukfed@iay.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shakespeare.acropolis.org.uk-shibboleth.xml b/swamid-interfederations-2.0/shakespeare.acropolis.org.uk-shibboleth.xml
deleted file mode 100644
index f1c4e017..00000000
--- a/swamid-interfederations-2.0/shakespeare.acropolis.org.uk-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" entityID="https://shakespeare.acropolis.org.uk/shibboleth">
-  <!--
-		This is a "BBC Shakespeare Archive Resource" simpleSAMLphp SP for BBC Worldwide Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-02-04T16:37:05Z">
-      <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">BBC Shakespeare Archive Resource</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Hundreds of TV &amp; radio programmes and thousands of photos from the BBC's Shakespeare collection</mdui:Description>
-        <mdui:Logo height="170" width="350">https://shakespeare.acropolis.org.uk/assets/shakespeare-350x170.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEMzCCAxugAwIBAgIJAIQQbjEkRVeBMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSkwJwYDVQQKDCBCcml0aXNoIEJyb2Fk
-						Y2FzdGluZyBDb3Jwb3JhdGlvbjEcMBoGA1UECwwTQXJjaGl2ZSBEZXZlbG9wbWVu
-						dDElMCMGA1UEAwwcc2hha2VzcGVhcmUuYWNyb3BvbGlzLm9yZy51azEfMB0GCSqG
-						SIb3DQEJARYQYWRvcHNkQGJiYy5jby51azAeFw0xNTEyMTcxNDM3MTlaFw0yNTEy
-						MTQxNDM3MTlaMIGvMQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSkwJwYD
-						VQQKDCBCcml0aXNoIEJyb2FkY2FzdGluZyBDb3Jwb3JhdGlvbjEcMBoGA1UECwwT
-						QXJjaGl2ZSBEZXZlbG9wbWVudDElMCMGA1UEAwwcc2hha2VzcGVhcmUuYWNyb3Bv
-						bGlzLm9yZy51azEfMB0GCSqGSIb3DQEJARYQYWRvcHNkQGJiYy5jby51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM78CtAqZYFeUykWi4zfUAh4e5t/
-						q6+yMCWoG8jyAdn9kQlD5sIcCpRj0BzhqswvDCpPlav1lN3uQtHWp5WkTeld7KmQ
-						UOFzN4TB+TDbL3EPjteAi/vORNXWXbH7scbKPgneCdTEm5Oz9oOf5xVmpl/rc4m9
-						APS6nFM4f1/mPOp2fJZEtXMi6YVf1peTJ5aVy7hNlvS6Zmlk7nj4R5QsTOaR6neP
-						tszmiNiiBdjYoTnIyb8eWLBxONVR6/DBgy/pf2G1HIQ1us2PQTgakRFYg7RnYGF8
-						jhR2payBOWO+iEn9tHM0xilEkgIfgdQFjHGKVtMT+UwpqwU1EccVxLaHHr0CAwEA
-						AaNQME4wHQYDVR0OBBYEFCyOkkYcSBjuw8jHXml8ZHoBU1T0MB8GA1UdIwQYMBaA
-						FCyOkkYcSBjuw8jHXml8ZHoBU1T0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-						BQADggEBADS84JefjipO3bx4athzVuor9SdOUSLlVQgENSUwPowA+HR9flUKIvJ1
-						SoGR5AOzArWB0tjTU4Tkj5L3dinfQseI/LAgEOEV4+r4wpCgVxceEMnAz1YzAXHz
-						zfmQ5Ws4qKGLb9oPstwkZMDZUlN9SdHYUdrvrljeNmn8yL92zZLMAm/qD6hgrcG/
-						LtQc8rGUJ9WlA9laajT8WeH3aC3CJlKIh3LdZyQcuxVCLGKFgoysEFgB8DQcsbjR
-						676YU6Puh5cRfQI1JFl9BonHZ1Pr/QWtBYt9ZnpA/VnfJ3hWCMQsUfwbJ1PfBUjy
-						/c56ELxxmXaa2osp99WXDsVLDjCDanE=
-					</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>
-						MIIEMzCCAxugAwIBAgIJAIQQbjEkRVeBMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSkwJwYDVQQKDCBCcml0aXNoIEJyb2Fk
-						Y2FzdGluZyBDb3Jwb3JhdGlvbjEcMBoGA1UECwwTQXJjaGl2ZSBEZXZlbG9wbWVu
-						dDElMCMGA1UEAwwcc2hha2VzcGVhcmUuYWNyb3BvbGlzLm9yZy51azEfMB0GCSqG
-						SIb3DQEJARYQYWRvcHNkQGJiYy5jby51azAeFw0xNTEyMTcxNDM3MTlaFw0yNTEy
-						MTQxNDM3MTlaMIGvMQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSkwJwYD
-						VQQKDCBCcml0aXNoIEJyb2FkY2FzdGluZyBDb3Jwb3JhdGlvbjEcMBoGA1UECwwT
-						QXJjaGl2ZSBEZXZlbG9wbWVudDElMCMGA1UEAwwcc2hha2VzcGVhcmUuYWNyb3Bv
-						bGlzLm9yZy51azEfMB0GCSqGSIb3DQEJARYQYWRvcHNkQGJiYy5jby51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM78CtAqZYFeUykWi4zfUAh4e5t/
-						q6+yMCWoG8jyAdn9kQlD5sIcCpRj0BzhqswvDCpPlav1lN3uQtHWp5WkTeld7KmQ
-						UOFzN4TB+TDbL3EPjteAi/vORNXWXbH7scbKPgneCdTEm5Oz9oOf5xVmpl/rc4m9
-						APS6nFM4f1/mPOp2fJZEtXMi6YVf1peTJ5aVy7hNlvS6Zmlk7nj4R5QsTOaR6neP
-						tszmiNiiBdjYoTnIyb8eWLBxONVR6/DBgy/pf2G1HIQ1us2PQTgakRFYg7RnYGF8
-						jhR2payBOWO+iEn9tHM0xilEkgIfgdQFjHGKVtMT+UwpqwU1EccVxLaHHr0CAwEA
-						AaNQME4wHQYDVR0OBBYEFCyOkkYcSBjuw8jHXml8ZHoBU1T0MB8GA1UdIwQYMBaA
-						FCyOkkYcSBjuw8jHXml8ZHoBU1T0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-						BQADggEBADS84JefjipO3bx4athzVuor9SdOUSLlVQgENSUwPowA+HR9flUKIvJ1
-						SoGR5AOzArWB0tjTU4Tkj5L3dinfQseI/LAgEOEV4+r4wpCgVxceEMnAz1YzAXHz
-						zfmQ5Ws4qKGLb9oPstwkZMDZUlN9SdHYUdrvrljeNmn8yL92zZLMAm/qD6hgrcG/
-						LtQc8rGUJ9WlA9laajT8WeH3aC3CJlKIh3LdZyQcuxVCLGKFgoysEFgB8DQcsbjR
-						676YU6Puh5cRfQI1JFl9BonHZ1Pr/QWtBYt9ZnpA/VnfJ3hWCMQsUfwbJ1PfBUjy
-						/c56ELxxmXaa2osp99WXDsVLDjCDanE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shakespeare.acropolis.org.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">BBC Shakespeare Archive Resource</ServiceName>
-      <ServiceDescription xml:lang="en">Hundreds of TV &amp; radio programmes and thousands of photos from the BBC's Shakespeare collection</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">BBC Worldwide Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">BBC Shakespeare Archive Resource</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="cy">BBC Shakespeare Ffeil Adnoddau</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://shakespeare.ch.bbc.co.uk/index.en</OrganizationURL>
-    <OrganizationURL xml:lang="cy">http://shakespeare.ch.bbc.co.uk/index.cy</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>BBC Shakespeare Archive Resource Access Helpdesk</GivenName>
-    <EmailAddress>mailto:shakespeareaccess@bbc.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>BBC Archive Development Operations</GivenName>
-    <EmailAddress>mailto:adops@bbc.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.xml
deleted file mode 100644
index 0904fa3f..00000000
--- a/swamid-interfederations-2.0/sharav.abes.fr-idp-shibboleth.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://sharav.abes.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-04-10T08:58:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ABES - French Bibliographic Agency for Higher Education</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABuklEQVQ4y5WTQUtUURiGn+/eM3Nv11Eaa6ZypCjMkSIKMlCCCqLAoH6AtonZ2CII2vcTaimCuGjbomhZBFEkQrQoRIMQKnKRpoNjzXg799zTYnCYmCvTPMvvfXh5z+LI3akFO1zsxZiIZkQcPD+FYNkOI2xsAVvPELTqZu794qw6N5Rl/NIhktiqVLE49PT4LVk5hMVPKVQUxS1hHMPc/ALTM8/B9ZksXeb8SPEfR0dgrUXtzGpmfaPCg+kXPHn0DNhDsM9ndKSI0+RYW3+KQwJBkObMyX7o7oNCluLRXLIIqKRjV+AzeWuMQiFPaDQ3rg5DJwUA+VyG0sRF2uG0Ndqw64LVcsjrDz9wEC6czrM/6/3/gj/a8vjlFyYevuHOzDxP3y539oQojtGuoT8TYKqape8VjOmgIPBcStcGuH19AJtyySgfkV0KbMLRYtnYDPn5K2Swby+jp3I4TrKnPLc1EYSPy2W+rf7m/s0TXDlbaHHSCkQEVdNp1moQm+YCOH7kMPfGD3DsoMdatf4/GrMF1rch1LFS7z6vzC59XcFEGkEa45QruK7CmBhtTCOzWEQESXeprVr06i+wzJYRwl1xdgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNCswMjowMAMfjYUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTQrMDI6MDByQjU5AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.abes.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Agency staff</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">ABES - Agence Bibliographique de l'Enseignement Supérieur</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels de l'Agence</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>
-					      MIIDJDCCAgygAwIBAgIVAMJyfTXyWtg2HoJZYvPzC5uTOkpLMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMMDnNoYXJhdi5hYmVzLmZyMB4XDTE1MDMxNjA5MzYxM1oX
-DTM1MDMxNjA5MzYxM1owGTEXMBUGA1UEAwwOc2hhcmF2LmFiZXMuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTcLz3fcz0nnGZBl8dx+gsKgz2nazH
-qLl58rvOUGQdcZqWutb0rmSlLv14aLJcSZiCse01Xa3VTdNboftLB9TzHgsRhy6E
-eR5ISWBs4Hdw2bdbaV4KQb5zh8Mrjt/CO6yVUE2cr0bVPZKB2dGyblpdwQkdyakA
-Dz2GuTIW2egZ466y0FaOTHzQ4jw3cGtOm0r1v7aMOLQg0tJQ3Ao8we36p+T/YrKN
-qrt2kQbfbWMQz9rZsWLpI6YjCwImnTHOov+Sphq1QN/f3beZUM66hHBjTWytgZoB
-tRhPzG02XGwY5FPYp/+xxU2uBUyJTdzON+J+/jK8CXlmLh6Et8qCH2mnAgMBAAGj
-YzBhMB0GA1UdDgQWBBTxc6ftLuPBfgE21OFh7hYWV5sVODBABgNVHREEOTA3gg5z
-aGFyYXYuYWJlcy5mcoYlaHR0cHM6Ly9zaGFyYXYuYWJlcy5mci9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAbxeaU+peTP/+ZEadJxgffuRWU3L+qZnc
-l36JFO9Rn1BFiABemGGUd1WU0AxNVJ0HDu3NZjKmQz3dYIjy5DR4nF9dDS25br3R
-yUPa2NSIAatSB4BPbf8j+EpWrcuBBRXGGWXfvOTQq/DuKU9/FPGEvrIW5Wnl/uDd
-kCI8+2KPpfuz002xNQID4wKyUJy9jyuE/2cn2JA1iYB0MMc3uqIls8T8Wn1leWr+
-TG5a9eJRJRp7O8KekUdkn17tzldLodiuduABA/gncseSrDLBUJntriF3yGGbCdJz
-8Dg24giw4jehoGYeEf1DW9ACdySlZDzf6YPGNUfVY9kVNDnLi9Th2Q==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sharav.abes.fr/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sharav.abes.fr/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sharav.abes.fr/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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sharav.abes.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sharav.abes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sharav.abes.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ABES - Agence Bibliographique de l'Enseignement Supérieur</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ABES - Agence Bibliographique de l'Enseignement Supérieur</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.abes.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>p2i@abes.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shastacollege.instructure.com-saml2.xml b/swamid-interfederations-2.0/shastacollege.instructure.com-saml2.xml
deleted file mode 100644
index 4c47d295..00000000
--- a/swamid-interfederations-2.0/shastacollege.instructure.com-saml2.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="http://shastacollege.instructure.com/saml2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">OEI - Shasta College - Canvas</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.canvaslms.com/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.canvaslms.com/policies/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="220" width="220" xml:lang="en">https://canvas.instructure.com/images/canvas/header_canvas_logo@2x.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE8TCCA9mgAwIBAgIJAOBms/PYWcPLMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-VQQGEwJVUzENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkx
-GTAXBgNVBAoTEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsTCk9wZXJhdGlvbnMx
-IDAeBgNVBAMTF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
-FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE1MDQxNTAxMDAwMFoXDTE3MDQyMjAx
-MDAwMFowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRVdGFoMRcwFQYDVQQHEw5T
-YWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
-CxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
-IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDckDPQGWedlVGC2Z9fn1wNFmN+0IPNi6OSE1nM
-voTWx2oZlQepaAu4zI5QqOfnV0rW2V1volpoJbu0WelH0DkGzdOEQdWJjAs3nRBf
-y0evxtpg0tK5kIvGsnN6YcD41YmkfWzvwbMf0cEq1Y0wCmymF6XzOUUE4zsi0nhP
-m2Z7WiuongDQdR01UsDN13YcpD/i1JXr3YtkNnJ/a1Kc9OXNycI8M5NVo5QQgdx/
-Q7zAmTk8p9E0ZRthdOQ/PBicWx39mNmBij5KpqCWlHu3NWdgcG8KXSv5atXU8Crd
-TRJ3aGIEN9vBYIHe8MHGCzs1QlRfJmXFMkeUSOTnJJx78rMDAgMBAAGjggEUMIIB
-EDAdBgNVHQ4EFgQUo0WWVlJ1SxZOs11L85ZAuZGyuzEwgeAGA1UdIwSB2DCB1YAU
-o0WWVlJ1SxZOs11L85ZAuZGyuzGhgbGkga4wgasxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIEwRVdGFoMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5z
-dHJ1Y3R1cmUsIEluYzETMBEGA1UECxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2Fu
-dmFzIFNBTUwgQ2VydGlmaWNhdGUxIjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVj
-dHVyZS5jb22CCQDgZrPz2FnDyzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
-A4IBAQBV3EmmnzYqYQ5fXNZymG2WaspEW0NeFMhDXa3p3AMIQJbnnU14lR7bqIvf
-/bLW1YE0fw1kSzsw8VrkQp7k1U+kaYA3i5/FQBy2WtqUCVq2GXZA2gs5YD4nvJB/
-F57E//0kEhbATZH9+wJqDkqyIgsrSIlJjiXDth1BppGK8weboPtr9sWV24Ui0+ls
-w16XTsGlnRRO19g+gXKOZp5ApXkDrB+HwZQvZxiCuSgvJlcBzMdxVvWSL+vPtg8Y
-shIKzobIhaQ2MzXHLcxrDhW10YFPwDXh8Tfn5iU9ONsaJivuvVhtDYZD1ZzSoPpm
-q4vYqxxY/6rFJhrCtnlLepSaxlXM
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shastacollege.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shastacollege.test.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shastacollege.beta.instructure.com/login/saml/logout"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shastacollege.instructure.com/saml_consume" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shastacollege.instructure.com/login/saml" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shastacollege.beta.instructure.com/saml_consume" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shastacollege.beta.instructure.com/login/saml" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shastacollege.test.instructure.com/saml_consume" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shastacollege.test.instructure.com/login/saml" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">OEI - Shasta College - Canvas</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Instructure, Inc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Instructure, Inc</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.instructure.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shi-idp2.rz.fh-muenchen.de.xml b/swamid-interfederations-2.0/shi-idp2.rz.fh-muenchen.de.xml
deleted file mode 100644
index 8aa71bf4..00000000
--- a/swamid-interfederations-2.0/shi-idp2.rz.fh-muenchen.de.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shi-idp2.rz.fh-muenchen.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hm.edu</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shi-idp2.rz.fh-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shi-idp2.rz.fh-muenchen.de,O=Hochschule Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIEDcsqjDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHDAaBgNVBAoT
-E0hvY2hzY2h1bGUgTXVlbmNoZW4xHzAdBgNVBAMTFkhvY2hzY2h1bGUgTXVlbmNo
-ZW4gQ0ExHDAaBgkqhkiG9w0BCQEWDWRmbi1jYUBobS5lZHUwHhcNMDkwMzAyMDk1
-NTA5WhcNMTQwMzAxMDk1NTA5WjB0MQswCQYDVQQGEwJERTEPMA0GA1UECBMGQmF5
-ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEcMBoGA1UEChMTSG9jaHNjaHVsZSBNdWVu
-Y2hlbjEjMCEGA1UEAxMac2hpLWlkcDIucnouZmgtbXVlbmNoZW4uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuGrk1+axrm8xQ6G9pXH0XixnLgBoe
-N6QjjppfBtJbBNgrC/VhJ2iVgxfQUh6tWi39+VTOsoqS9CC5Ek33KKucwIWvPq0Q
-C+8pWVD4xyhmfS2JZ5dcW5iJPVJuYYVNec+pkmq9v2yVS+pRPSmspHo9Nbj65QTV
-hP1S1O7lpX3hz7GeX6M47gTJPGdi6wJ7h8RCE3xSUcVZBL3tVs6jwT7tfemA4Gzs
-GZGTpY9BrqDkMqsExopYTx7JFnu1q17Ap43Xr+G3GI39TBvV+s4Hll1EoIzpdJJV
-WPMiaANdAVCA3S1jP8U5JxqP2emtYoIDNM4RLwNiqVIxjwpUCHrwUvg9AgMBAAGj
-ggGrMIIBpzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFP5RufvU6s2e5rtHIuF+rabSmIFWMB8G
-A1UdIwQYMBaAFO1rZU9acV4J2cVHw+6gHagJU86uMIGIBgNVHR8EgYAwfjA9oDug
-OYY3aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1tdWVuY2hlbi1jYS9wdWIvY3Js
-L2NhY3JsLmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1tdWVu
-Y2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYI
-KwYBBQUHMAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtbXVlbmNoZW4tY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLW11ZW5jaGVuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAD5j658J5TWHdEhE0go+39s9+yoG6QI/L6NBFu8qF
-QYvPmvUVOwyElELO+4U4m51eKWGLQVeiTvnYFzzI56bJ713wP2MnzUyjOidfRzZg
-TvTsPm8rVqSiKzLKKQajogToGbA8/dijvtP589If1rQ2yT9aGLcFq65RFc6kx0Xj
-dTsOnf/czWeuJTCHHNmL3SXoghoyqRQ91rjEqcsfZCR91CeWCe+uOviKbJ3452xz
-jTxgsSw3FdG9cUfVitvLTrqyBx9PIqxlcOl29G0COkAF4W7kKXpT8EjolBM2fRYH
-ENfPXpnICsFQ5SjpYA/67L+SWLFherT+YrordFYXmATDeg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/Redirect/SLO" ResponseLocation="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/POST/SLO" ResponseLocation="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shi-idp2.rz.fh-muenchen.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hm.edu</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shi-idp2.rz.fh-muenchen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shi-idp2.rz.fh-muenchen.de,O=Hochschule Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLjCCBBagAwIBAgIEDcsqjDANBgkqhkiG9w0BAQUFADCBjjELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHDAaBgNVBAoT
-E0hvY2hzY2h1bGUgTXVlbmNoZW4xHzAdBgNVBAMTFkhvY2hzY2h1bGUgTXVlbmNo
-ZW4gQ0ExHDAaBgkqhkiG9w0BCQEWDWRmbi1jYUBobS5lZHUwHhcNMDkwMzAyMDk1
-NTA5WhcNMTQwMzAxMDk1NTA5WjB0MQswCQYDVQQGEwJERTEPMA0GA1UECBMGQmF5
-ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEcMBoGA1UEChMTSG9jaHNjaHVsZSBNdWVu
-Y2hlbjEjMCEGA1UEAxMac2hpLWlkcDIucnouZmgtbXVlbmNoZW4uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCuGrk1+axrm8xQ6G9pXH0XixnLgBoe
-N6QjjppfBtJbBNgrC/VhJ2iVgxfQUh6tWi39+VTOsoqS9CC5Ek33KKucwIWvPq0Q
-C+8pWVD4xyhmfS2JZ5dcW5iJPVJuYYVNec+pkmq9v2yVS+pRPSmspHo9Nbj65QTV
-hP1S1O7lpX3hz7GeX6M47gTJPGdi6wJ7h8RCE3xSUcVZBL3tVs6jwT7tfemA4Gzs
-GZGTpY9BrqDkMqsExopYTx7JFnu1q17Ap43Xr+G3GI39TBvV+s4Hll1EoIzpdJJV
-WPMiaANdAVCA3S1jP8U5JxqP2emtYoIDNM4RLwNiqVIxjwpUCHrwUvg9AgMBAAGj
-ggGrMIIBpzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFP5RufvU6s2e5rtHIuF+rabSmIFWMB8G
-A1UdIwQYMBaAFO1rZU9acV4J2cVHw+6gHagJU86uMIGIBgNVHR8EgYAwfjA9oDug
-OYY3aHR0cDovL2NkcDEucGNhLmRmbi5kZS9ocy1tdWVuY2hlbi1jYS9wdWIvY3Js
-L2NhY3JsLmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy1tdWVu
-Y2hlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYI
-KwYBBQUHMAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtbXVlbmNoZW4tY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL2hzLW11ZW5jaGVuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
-BgkqhkiG9w0BAQUFAAOCAQEAD5j658J5TWHdEhE0go+39s9+yoG6QI/L6NBFu8qF
-QYvPmvUVOwyElELO+4U4m51eKWGLQVeiTvnYFzzI56bJ713wP2MnzUyjOidfRzZg
-TvTsPm8rVqSiKzLKKQajogToGbA8/dijvtP589If1rQ2yT9aGLcFq65RFc6kx0Xj
-dTsOnf/czWeuJTCHHNmL3SXoghoyqRQ91rjEqcsfZCR91CeWCe+uOviKbJ3452xz
-jTxgsSw3FdG9cUfVitvLTrqyBx9PIqxlcOl29G0COkAF4W7kKXpT8EjolBM2fRYH
-ENfPXpnICsFQ5SjpYA/67L+SWLFherT+YrordFYXmATDeg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shi-idp2.rz.fh-muenchen.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule München IdP 2.5</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule München IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hm.edu</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Harald</GivenName>
-    <SurName>Strack</SurName>
-    <EmailAddress>dfn-aai@hm.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Andreas</GivenName>
-    <SurName>Boeck</SurName>
-    <EmailAddress>dfn-aai@hm.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-dev-idp.ucl.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-dev-idp.ucl.ac.uk-shibboleth.xml
deleted file mode 100644
index 7481091d..00000000
--- a/swamid-interfederations-2.0/shib-dev-idp.ucl.ac.uk-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://shib-dev-idp.ucl.ac.uk/shibboleth">
-  <!--
-		This is a "Shib Dev" Shibboleth IdP for University College London.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-26T17:43: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">ucl.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIERjCCAy6gAwIBAgIJAMLCfrKk2sGkMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
-						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
-						bGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1zMR8wHQYD
-						VQQDDBZzaGliLWRldi1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFzeXN0
-						ZW1zQHVjbC5hYy51azAeFw0xNDA3MTYwOTM2MjVaFw0zNDA3MTEwOTM2MjVaMIGj
-						MQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJz
-						aXR5IENvbGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1z
-						MR8wHQYDVQQDDBZzaGliLWRldi1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkB
-						FhFzeXN0ZW1zQHVjbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAJoeYUGKiYtv/Oyig14vtdTmJkVWkZ72Snk6jTD0dym9MG6W7VonflQXcDtN
-						jrLd2soPM8zktKrhIH9QvzAw6w11q55zyhsQWb+L2zPob6M7+b0OuBpU2m4Cc+K6
-						8uZJWzKPJSi6wGR4cm//dGlGWdCZGA0ziXD596H7OEBOB9pq2rxHm+YeOjAmGGzm
-						iyjvMfuMDLz5o5H0jiMgXaYSlYv2kBhnemOoDOjwluFxXhiSJvtgLjsbCppSn+vz
-						fWbSD7Fu2zTA86bcKpV77EjQfudOCKhBahBrTxqj0GAkHFGvew3cxb73H0g8Fx8U
-						MLlupjasOW/Pt9M/4OEWHzUsTaUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FPweEEgVPfNY/nKzIBiBfs9yjj9RMB8GA1UdIwQYMBaAFPweEEgVPfNY/nKzIBiB
-						fs9yjj9RMA0GCSqGSIb3DQEBBQUAA4IBAQAomp8HYBjip3PbTsXEQvh7khCLjTBP
-						f0cyv39SOf5yV7p6H8hZx5o+v2aUM/MFUqFEvErdUdxGz3vhBu8BYtih7dOLspL7
-						bZzCWdl3Kt7i556G0ncfalL6mf3oW0T/LWh0bUJ3B71MU9UkoJHtUiXe+7O4C5U5
-						JKVC8RUekD9hgAAkQxlSejhbCUnVn32/6G9Ujj+VVCg9FaMxWmVaopjLDb4bdGMS
-						I+b4Q2MQMtUWQ2XszBlFshWBPZMOhDx8QLJ1x1cN/f2qofy7LAM6az+mdW0rtera
-						gUPawdt5n6YlXLM9X/CsxbEXT8e52U80+JxaaXgfk/vtiGCb8yYRvehe
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-dev-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-dev-idp.ucl.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://shib-dev-idp.ucl.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-dev-idp.ucl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-dev-idp.ucl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-dev-idp.ucl.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">ucl.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIERjCCAy6gAwIBAgIJAMLCfrKk2sGkMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
-						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
-						bGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1zMR8wHQYD
-						VQQDDBZzaGliLWRldi1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFzeXN0
-						ZW1zQHVjbC5hYy51azAeFw0xNDA3MTYwOTM2MjVaFw0zNDA3MTEwOTM2MjVaMIGj
-						MQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJz
-						aXR5IENvbGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1z
-						MR8wHQYDVQQDDBZzaGliLWRldi1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkB
-						FhFzeXN0ZW1zQHVjbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAJoeYUGKiYtv/Oyig14vtdTmJkVWkZ72Snk6jTD0dym9MG6W7VonflQXcDtN
-						jrLd2soPM8zktKrhIH9QvzAw6w11q55zyhsQWb+L2zPob6M7+b0OuBpU2m4Cc+K6
-						8uZJWzKPJSi6wGR4cm//dGlGWdCZGA0ziXD596H7OEBOB9pq2rxHm+YeOjAmGGzm
-						iyjvMfuMDLz5o5H0jiMgXaYSlYv2kBhnemOoDOjwluFxXhiSJvtgLjsbCppSn+vz
-						fWbSD7Fu2zTA86bcKpV77EjQfudOCKhBahBrTxqj0GAkHFGvew3cxb73H0g8Fx8U
-						MLlupjasOW/Pt9M/4OEWHzUsTaUCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FPweEEgVPfNY/nKzIBiBfs9yjj9RMB8GA1UdIwQYMBaAFPweEEgVPfNY/nKzIBiB
-						fs9yjj9RMA0GCSqGSIb3DQEBBQUAA4IBAQAomp8HYBjip3PbTsXEQvh7khCLjTBP
-						f0cyv39SOf5yV7p6H8hZx5o+v2aUM/MFUqFEvErdUdxGz3vhBu8BYtih7dOLspL7
-						bZzCWdl3Kt7i556G0ncfalL6mf3oW0T/LWh0bUJ3B71MU9UkoJHtUiXe+7O4C5U5
-						JKVC8RUekD9hgAAkQxlSejhbCUnVn32/6G9Ujj+VVCg9FaMxWmVaopjLDb4bdGMS
-						I+b4Q2MQMtUWQ2XszBlFshWBPZMOhDx8QLJ1x1cN/f2qofy7LAM6az+mdW0rtera
-						gUPawdt5n6YlXLM9X/CsxbEXT8e52U80+JxaaXgfk/vtiGCb8yYRvehe
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-dev-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-dev-idp.ucl.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 College London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University College London (Shib Dev)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library e-resource help</GivenName>
-    <EmailAddress>mailto:lib-eresource-help@ucl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adrian</GivenName>
-    <SurName>Barker</SurName>
-    <EmailAddress>mailto:systems@ucl.ac.uk</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 e9642e1f..00000000
--- a/swamid-interfederations-2.0/shib-idp-1.oru.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://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>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp-1.oru.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp-1.oru.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oru.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp-1.oru.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">ORU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Örebro universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Örebro University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.oru.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Örebro University</md:Company>
-    <md:SurName>IT Avdelningen</md:SurName>
-    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Örebro University</md:Company>
-    <md:SurName>Jonny Ehrnberg</md:SurName>
-    <md:EmailAddress>mailto:jonny.ehrnberg@oru.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 19 303851</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Örebro University</md:Company>
-    <md:SurName>IT Avdelningen Örebro universitet</md:SurName>
-    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 a96b5a1f..00000000
--- a/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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="en">The Örebro University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Logo height="65" width="90">https://cas-01.oru.se/cas/Logo_txt_runt_farg.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>oru.se</mdui:DomainHint>
-        <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="technical">
-    <GivenName>Jonny</GivenName>
-    <SurName>Ehrnberg</SurName>
-    <EmailAddress>jonny.ehrnberg@oru.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Mikael</GivenName>
-    <SurName>Borjesson</SurName>
-    <EmailAddress>mikael.borjesson@oru.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.awi.de.xml b/swamid-interfederations-2.0/shib-idp.awi.de.xml
deleted file mode 100644
index 89d08364..00000000
--- a/swamid-interfederations-2.0/shib-idp.awi.de.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.awi.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">awi.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.awi.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.awi.de,O=Alfred-Wegener-Institut,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIEEC8mwzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXQWxmcmVkLVdlZ2VuZXItSW5zdGl0dXQxKTAnBgNVBAMTIEFs
-ZnJlZC1XZWdlbmVyLUluc3RpdHV0IENBIC0gRzAxMRkwFwYJKoZIhvcNAQkBFgpw
-a2lAYXdpLmRlMB4XDTEwMDYwOTE0NDYxMVoXDTE1MDYwODE0NDYxMVowSTELMAkG
-A1UEBhMCREUxIDAeBgNVBAoTF0FsZnJlZC1XZWdlbmVyLUluc3RpdHV0MRgwFgYD
-VQQDEw9zaGliLWlkcC5hd2kuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDiaSolMhJPSAyZjI7vYFXAxaCz05HZFyERcR67HhswVteGFkYQbPNw1nAV
-Ob1SIT7lLG7ZeSvtyqEt4uOPMQ0devRSsPxosiWwOEuHe8SOps4Lbx/yvFqf1TH3
-1hNIC7m6D3sJUyi7c4besgEKswIHt/YaBM053NXb8zj/mxEH4xOiXGXNV1Eeljx/
-r4/CZ2c4F/n/C869+o5rNeOH+2ckqKMXpStv3nvYe+UCpJS2P1TvO81Sxh7Ygg+D
-HI8OqvUKMVEWI4UeXqrN3Id2FNP4jkOJqzPFQE5PBZFV3+1MqO4tWTvGabL0XjaY
-ggo+m/duCTayajsFGTaJkooEMcJ/AgMBAAGjggH9MIIB+TAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFIfIEZpGDu6HDWCogNqiMsL3BEubMB8GA1UdIwQYMBaAFHjAmcojVxcJG8Ct
-UMV5wSCoJ8heMB8GA1UdEQQYMBaBFEpvZXJnLk1hdHRoZXNAYXdpLmRlMIGhBgNV
-HR8EgZkwgZYwSaBHoEWGQ2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYWxmcmVkLXdl
-Z2VuZXItaW5zdGl0dXQtY2EvcHViL2NybC9jYWNybC5jcmwwSaBHoEWGQ2h0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYWxmcmVkLXdlZ2VuZXItaW5zdGl0dXQtY2EvcHVi
-L2NybC9jYWNybC5jcmwwgboGCCsGAQUFBwEBBIGtMIGqMFMGCCsGAQUFBzAChkdo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2FsZnJlZC13ZWdlbmVyLWluc3RpdHV0LWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBTBggrBgEFBQcwAoZHaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9hbGZyZWQtd2VnZW5lci1pbnN0aXR1dC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALuAFCL7py5wC6Idlmfe/O4L
-42VuJKfSOEbHSV96FmwjCQEVUrHuSglQLr9C4OKuk4r89OE4mGO+x/3T2+SOZRpa
-wBItvSZibEuq2xONGYXLT1GHIkuzTTtqB0n7gwpdrWsZyjAki5iI5HitTFabOsXG
-jMbKuzhBDftc+2vxjNJwTUW2Gi+wht1wasUng8m/ti61nXIxY/zu9thcbVByetEh
-UveGzJJ9WSgfoHkIS8TLu2iYs9X/nHC+k6h1OKA7j05gVQyox/Dhb51BPCZKVLmz
-R2Pe41rsJ55u/M507X70giwfzmI/cmnLVxnldexmDjUyFrLF+zIwY21Jkj+Vrxg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.awi.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.awi.de,O=Alfred-Wegener-Institut,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIEEC8mwzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXQWxmcmVkLVdlZ2VuZXItSW5zdGl0dXQxKTAnBgNVBAMTIEFs
-ZnJlZC1XZWdlbmVyLUluc3RpdHV0IENBIC0gRzAxMRkwFwYJKoZIhvcNAQkBFgpw
-a2lAYXdpLmRlMB4XDTEwMDYwOTE0NDYxMVoXDTE1MDYwODE0NDYxMVowSTELMAkG
-A1UEBhMCREUxIDAeBgNVBAoTF0FsZnJlZC1XZWdlbmVyLUluc3RpdHV0MRgwFgYD
-VQQDEw9zaGliLWlkcC5hd2kuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDiaSolMhJPSAyZjI7vYFXAxaCz05HZFyERcR67HhswVteGFkYQbPNw1nAV
-Ob1SIT7lLG7ZeSvtyqEt4uOPMQ0devRSsPxosiWwOEuHe8SOps4Lbx/yvFqf1TH3
-1hNIC7m6D3sJUyi7c4besgEKswIHt/YaBM053NXb8zj/mxEH4xOiXGXNV1Eeljx/
-r4/CZ2c4F/n/C869+o5rNeOH+2ckqKMXpStv3nvYe+UCpJS2P1TvO81Sxh7Ygg+D
-HI8OqvUKMVEWI4UeXqrN3Id2FNP4jkOJqzPFQE5PBZFV3+1MqO4tWTvGabL0XjaY
-ggo+m/duCTayajsFGTaJkooEMcJ/AgMBAAGjggH9MIIB+TAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFIfIEZpGDu6HDWCogNqiMsL3BEubMB8GA1UdIwQYMBaAFHjAmcojVxcJG8Ct
-UMV5wSCoJ8heMB8GA1UdEQQYMBaBFEpvZXJnLk1hdHRoZXNAYXdpLmRlMIGhBgNV
-HR8EgZkwgZYwSaBHoEWGQ2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYWxmcmVkLXdl
-Z2VuZXItaW5zdGl0dXQtY2EvcHViL2NybC9jYWNybC5jcmwwSaBHoEWGQ2h0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYWxmcmVkLXdlZ2VuZXItaW5zdGl0dXQtY2EvcHVi
-L2NybC9jYWNybC5jcmwwgboGCCsGAQUFBwEBBIGtMIGqMFMGCCsGAQUFBzAChkdo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2FsZnJlZC13ZWdlbmVyLWluc3RpdHV0LWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBTBggrBgEFBQcwAoZHaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9hbGZyZWQtd2VnZW5lci1pbnN0aXR1dC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALuAFCL7py5wC6Idlmfe/O4L
-42VuJKfSOEbHSV96FmwjCQEVUrHuSglQLr9C4OKuk4r89OE4mGO+x/3T2+SOZRpa
-wBItvSZibEuq2xONGYXLT1GHIkuzTTtqB0n7gwpdrWsZyjAki5iI5HitTFabOsXG
-jMbKuzhBDftc+2vxjNJwTUW2Gi+wht1wasUng8m/ti61nXIxY/zu9thcbVByetEh
-UveGzJJ9WSgfoHkIS8TLu2iYs9X/nHC+k6h1OKA7j05gVQyox/Dhb51BPCZKVLmz
-R2Pe41rsJ55u/M507X70giwfzmI/cmnLVxnldexmDjUyFrLF+zIwY21Jkj+Vrxg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.awi.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.awi.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.awi.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.awi.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.awi.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.awi.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">awi.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.awi.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.awi.de,O=Alfred-Wegener-Institut,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIEEC8mwzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXQWxmcmVkLVdlZ2VuZXItSW5zdGl0dXQxKTAnBgNVBAMTIEFs
-ZnJlZC1XZWdlbmVyLUluc3RpdHV0IENBIC0gRzAxMRkwFwYJKoZIhvcNAQkBFgpw
-a2lAYXdpLmRlMB4XDTEwMDYwOTE0NDYxMVoXDTE1MDYwODE0NDYxMVowSTELMAkG
-A1UEBhMCREUxIDAeBgNVBAoTF0FsZnJlZC1XZWdlbmVyLUluc3RpdHV0MRgwFgYD
-VQQDEw9zaGliLWlkcC5hd2kuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDiaSolMhJPSAyZjI7vYFXAxaCz05HZFyERcR67HhswVteGFkYQbPNw1nAV
-Ob1SIT7lLG7ZeSvtyqEt4uOPMQ0devRSsPxosiWwOEuHe8SOps4Lbx/yvFqf1TH3
-1hNIC7m6D3sJUyi7c4besgEKswIHt/YaBM053NXb8zj/mxEH4xOiXGXNV1Eeljx/
-r4/CZ2c4F/n/C869+o5rNeOH+2ckqKMXpStv3nvYe+UCpJS2P1TvO81Sxh7Ygg+D
-HI8OqvUKMVEWI4UeXqrN3Id2FNP4jkOJqzPFQE5PBZFV3+1MqO4tWTvGabL0XjaY
-ggo+m/duCTayajsFGTaJkooEMcJ/AgMBAAGjggH9MIIB+TAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFIfIEZpGDu6HDWCogNqiMsL3BEubMB8GA1UdIwQYMBaAFHjAmcojVxcJG8Ct
-UMV5wSCoJ8heMB8GA1UdEQQYMBaBFEpvZXJnLk1hdHRoZXNAYXdpLmRlMIGhBgNV
-HR8EgZkwgZYwSaBHoEWGQ2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYWxmcmVkLXdl
-Z2VuZXItaW5zdGl0dXQtY2EvcHViL2NybC9jYWNybC5jcmwwSaBHoEWGQ2h0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYWxmcmVkLXdlZ2VuZXItaW5zdGl0dXQtY2EvcHVi
-L2NybC9jYWNybC5jcmwwgboGCCsGAQUFBwEBBIGtMIGqMFMGCCsGAQUFBzAChkdo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2FsZnJlZC13ZWdlbmVyLWluc3RpdHV0LWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBTBggrBgEFBQcwAoZHaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9hbGZyZWQtd2VnZW5lci1pbnN0aXR1dC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALuAFCL7py5wC6Idlmfe/O4L
-42VuJKfSOEbHSV96FmwjCQEVUrHuSglQLr9C4OKuk4r89OE4mGO+x/3T2+SOZRpa
-wBItvSZibEuq2xONGYXLT1GHIkuzTTtqB0n7gwpdrWsZyjAki5iI5HitTFabOsXG
-jMbKuzhBDftc+2vxjNJwTUW2Gi+wht1wasUng8m/ti61nXIxY/zu9thcbVByetEh
-UveGzJJ9WSgfoHkIS8TLu2iYs9X/nHC+k6h1OKA7j05gVQyox/Dhb51BPCZKVLmz
-R2Pe41rsJ55u/M507X70giwfzmI/cmnLVxnldexmDjUyFrLF+zIwY21Jkj+Vrxg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.awi.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.awi.de,O=Alfred-Wegener-Institut,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIEEC8mwzANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXQWxmcmVkLVdlZ2VuZXItSW5zdGl0dXQxKTAnBgNVBAMTIEFs
-ZnJlZC1XZWdlbmVyLUluc3RpdHV0IENBIC0gRzAxMRkwFwYJKoZIhvcNAQkBFgpw
-a2lAYXdpLmRlMB4XDTEwMDYwOTE0NDYxMVoXDTE1MDYwODE0NDYxMVowSTELMAkG
-A1UEBhMCREUxIDAeBgNVBAoTF0FsZnJlZC1XZWdlbmVyLUluc3RpdHV0MRgwFgYD
-VQQDEw9zaGliLWlkcC5hd2kuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDiaSolMhJPSAyZjI7vYFXAxaCz05HZFyERcR67HhswVteGFkYQbPNw1nAV
-Ob1SIT7lLG7ZeSvtyqEt4uOPMQ0devRSsPxosiWwOEuHe8SOps4Lbx/yvFqf1TH3
-1hNIC7m6D3sJUyi7c4besgEKswIHt/YaBM053NXb8zj/mxEH4xOiXGXNV1Eeljx/
-r4/CZ2c4F/n/C869+o5rNeOH+2ckqKMXpStv3nvYe+UCpJS2P1TvO81Sxh7Ygg+D
-HI8OqvUKMVEWI4UeXqrN3Id2FNP4jkOJqzPFQE5PBZFV3+1MqO4tWTvGabL0XjaY
-ggo+m/duCTayajsFGTaJkooEMcJ/AgMBAAGjggH9MIIB+TAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0O
-BBYEFIfIEZpGDu6HDWCogNqiMsL3BEubMB8GA1UdIwQYMBaAFHjAmcojVxcJG8Ct
-UMV5wSCoJ8heMB8GA1UdEQQYMBaBFEpvZXJnLk1hdHRoZXNAYXdpLmRlMIGhBgNV
-HR8EgZkwgZYwSaBHoEWGQ2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYWxmcmVkLXdl
-Z2VuZXItaW5zdGl0dXQtY2EvcHViL2NybC9jYWNybC5jcmwwSaBHoEWGQ2h0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvYWxmcmVkLXdlZ2VuZXItaW5zdGl0dXQtY2EvcHVi
-L2NybC9jYWNybC5jcmwwgboGCCsGAQUFBwEBBIGtMIGqMFMGCCsGAQUFBzAChkdo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2FsZnJlZC13ZWdlbmVyLWluc3RpdHV0LWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBTBggrBgEFBQcwAoZHaHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9hbGZyZWQtd2VnZW5lci1pbnN0aXR1dC1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBALuAFCL7py5wC6Idlmfe/O4L
-42VuJKfSOEbHSV96FmwjCQEVUrHuSglQLr9C4OKuk4r89OE4mGO+x/3T2+SOZRpa
-wBItvSZibEuq2xONGYXLT1GHIkuzTTtqB0n7gwpdrWsZyjAki5iI5HitTFabOsXG
-jMbKuzhBDftc+2vxjNJwTUW2Gi+wht1wasUng8m/ti61nXIxY/zu9thcbVByetEh
-UveGzJJ9WSgfoHkIS8TLu2iYs9X/nHC+k6h1OKA7j05gVQyox/Dhb51BPCZKVLmz
-R2Pe41rsJ55u/M507X70giwfzmI/cmnLVxnldexmDjUyFrLF+zIwY21Jkj+Vrxg=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.awi.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.awi.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Stiftung Alfred-Wegener-Institut für Polar- und Meeresforschung</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Alfred-Wegener-Institut für Polar- und Meeresforschung</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.awi.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Joerg</GivenName>
-    <SurName>Matthes</SurName>
-    <EmailAddress>joerg.matthes@awi.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stefan</GivenName>
-    <SurName>Pinkernell</SurName>
-    <EmailAddress>stefan.pinkernell@awi.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.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 6433428a..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.cms.hu-berlin.de/idp/shibboleth">
-  <md: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>
-  </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">hu-berlin.de</shibmd: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>
-    </md:Extensions>
-    <md: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>MIIGUzCCBTugAwIBAgIHGYZDvIB0rjANBgkqhkiG9w0BAQsFADBoMQswCQYDVQQG
-EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
-MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
-HhcNMTUwNTI4MDczOTI1WhcNMTgwODI0MDczOTI1WjCBqDELMAkGA1UEBhMCREUx
-DzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMSgwJgYDVQQKDB9IdW1i
-b2xkdC1Vbml2ZXJzaXRhZXQgenUgQmVybGluMScwJQYDVQQLDB5aRSBDb21wdXRl
-ci0gdW5kIE1lZGllbnNlcnZpY2UxJDAiBgNVBAMMG3NoaWJib2xldGgudXZmLmh1
-LWJlcmxpbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIlG04F
-e1/y8yyfq/fx3J0yPiTwpkbixt92V8eGFt7JsHRAmK0kJ7RkWtIq8QBzopssW8Kh
-ovSQCJv+iZsx8VIViC6wWNKhfFxBlRMt2yKwA36t9PXZHho41BTJDdFJergVY0Se
-/+R+JXb7M6YTvElpmyT2tqNpsz9MzWqEcWlWD0YO+fD57QImAy5EnenLS0DHOxf8
-W8df0q6UDXeYIpH7owADpLHTl6WvKmLSHuoB4gWGo34F67zs17VGZJNV2fwvw5D4
-rJGdkJ+C+Jpb9rXfaD7+spZdvB2dZEHkVsZe11zTo7IDAQZ7taErgaxP26Yobr0A
-GhE5XKlUKdtKKNcCAwEAAaOCAr8wggK7ME8GA1UdIARIMEYwEQYPKwYBBAGBrSGC
-LAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysG
-AQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsG
-AQUFBwMBMB0GA1UdDgQWBBR45u1WtZRCUF41/A0X15YNq112RjAfBgNVHSMEGDAW
-gBQf9Sw+90CrLpCgatPieV7yds2DdDCBngYDVR0RBIGWMIGTghhzaGliLWRzLmNt
-cy5odS1iZXJsaW4uZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJi
-b2xldGgtZHMuY21zLmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1
-LWJlcmxpbi5kZYIbc2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIGDBgNVHR8E
-fDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2h1LWJlcmxpbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9o
-dS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmwwgdMGCCsGAQUFBwEBBIHGMIHD
-MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVy
-L09DU1AwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHUtYmVy
-bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA//wghXI42OXSkuy2s307AXPnHFHGQTH0M
-FcocqmTWZk3hAL7sn69nTC4LaG+TrKVj3cNUVNJPe8Ot6zfgR+Bh1Tbwb7NHLST+
-UM/uOPW9OZjmgJXz16GJb9IfS1dH69DP7kK05vYKaRjP8jMismqnwvhQ3LoIR0ZW
-8Ej2Wnky5gQzNAHHONGUkcvvFu5awzn5n1ri/OZIwXwvYlWzSGEIzKfBSa07ZE9a
-RCsDJl531ldKNCAFBju3d4ip9KtS8W9HVCIv2yqo1vm2GDcRpfkLnSz3TAiP8ctC
-mFsxhGZXe6H3Sr7aLhCsdB+7yKCROUaNU9C28W9fp3N+oFK8AGpt
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.cms.hu-berlin.de/idp/profile/Shibboleth/SSO"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-  </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">hu-berlin.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>MIIGUzCCBTugAwIBAgIHGYZDvIB0rjANBgkqhkiG9w0BAQsFADBoMQswCQYDVQQG
-EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
-MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
-HhcNMTUwNTI4MDczOTI1WhcNMTgwODI0MDczOTI1WjCBqDELMAkGA1UEBhMCREUx
-DzANBgNVBAgMBkJlcmxpbjEPMA0GA1UEBwwGQmVybGluMSgwJgYDVQQKDB9IdW1i
-b2xkdC1Vbml2ZXJzaXRhZXQgenUgQmVybGluMScwJQYDVQQLDB5aRSBDb21wdXRl
-ci0gdW5kIE1lZGllbnNlcnZpY2UxJDAiBgNVBAMMG3NoaWJib2xldGgudXZmLmh1
-LWJlcmxpbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOIlG04F
-e1/y8yyfq/fx3J0yPiTwpkbixt92V8eGFt7JsHRAmK0kJ7RkWtIq8QBzopssW8Kh
-ovSQCJv+iZsx8VIViC6wWNKhfFxBlRMt2yKwA36t9PXZHho41BTJDdFJergVY0Se
-/+R+JXb7M6YTvElpmyT2tqNpsz9MzWqEcWlWD0YO+fD57QImAy5EnenLS0DHOxf8
-W8df0q6UDXeYIpH7owADpLHTl6WvKmLSHuoB4gWGo34F67zs17VGZJNV2fwvw5D4
-rJGdkJ+C+Jpb9rXfaD7+spZdvB2dZEHkVsZe11zTo7IDAQZ7taErgaxP26Yobr0A
-GhE5XKlUKdtKKNcCAwEAAaOCAr8wggK7ME8GA1UdIARIMEYwEQYPKwYBBAGBrSGC
-LAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysG
-AQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsG
-AQUFBwMBMB0GA1UdDgQWBBR45u1WtZRCUF41/A0X15YNq112RjAfBgNVHSMEGDAW
-gBQf9Sw+90CrLpCgatPieV7yds2DdDCBngYDVR0RBIGWMIGTghhzaGliLWRzLmNt
-cy5odS1iZXJsaW4uZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJi
-b2xldGgtZHMuY21zLmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1
-LWJlcmxpbi5kZYIbc2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIGDBgNVHR8E
-fDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2h1LWJlcmxpbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9o
-dS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmwwgdMGCCsGAQUFBwEBBIHGMIHD
-MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVy
-L09DU1AwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHUtYmVy
-bGluLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA//wghXI42OXSkuy2s307AXPnHFHGQTH0M
-FcocqmTWZk3hAL7sn69nTC4LaG+TrKVj3cNUVNJPe8Ot6zfgR+Bh1Tbwb7NHLST+
-UM/uOPW9OZjmgJXz16GJb9IfS1dH69DP7kK05vYKaRjP8jMismqnwvhQ3LoIR0ZW
-8Ej2Wnky5gQzNAHHONGUkcvvFu5awzn5n1ri/OZIwXwvYlWzSGEIzKfBSa07ZE9a
-RCsDJl531ldKNCAFBju3d4ip9KtS8W9HVCIv2yqo1vm2GDcRpfkLnSz3TAiP8ctC
-mFsxhGZXe6H3Sr7aLhCsdB+7yKCROUaNU9C28W9fp3N+oFK8AGpt
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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">e233</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e233</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Humboldt-Universität zu Berlin</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Humboldt-University Berlin</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.hu-berlin.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hu-berlin.de/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Petra</md:GivenName>
-    <md:SurName>Berg</md:SurName>
-    <md:EmailAddress>mailto:shibadmin@hu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petra</md:GivenName>
-    <md:SurName>Berg</md:SurName>
-    <md:EmailAddress>mailto:shibadmin@hu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Petra</md:GivenName>
-    <md:SurName>Berg</md:SurName>
-    <md:EmailAddress>mailto:shibadmin@hu-berlin.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 23f86149..00000000
--- a/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.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://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,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEqpQbkSDdTANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQG
-EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
-MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
-HhcNMTExMDA0MDkzMzE5WhcNMTYxMDAyMDkzMzE5WjCBhjELMAkGA1UEBhMCREUx
-KDAmBgNVBAoTH0h1bWJvbGR0LVVuaXZlcnNpdGFldCB6dSBCZXJsaW4xJzAlBgNV
-BAsTHlpFIENvbXB1dGVyLSB1bmQgTWVkaWVuc2VydmljZTEkMCIGA1UEAxMbc2hp
-YmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA0vBDQzp17iY3EpgON9nw4NprsoHn0GtfkzmL2t1yYRW5U67hdMNg
-trTQ2OHpD5Yzk2zi88L1y0aRBIsWV/DvvPM+k3NkUKfD5hDrPogHphvUvjIvJG4A
-3oDpb4Tx7TmF1ZBe1M2+xeQ+MhaUrbM8JDcRdgtScgWrEp3qkLY/xMRjVsv6sPbw
-3m3BS2Kayg7Y11d0HCuPYXM8c6dtOSNNKAUYA1IG8FkhtAEVo86goCGETYLQxGLb
-CXfeNg7G8jrKa8NUN0+mOdnpvBX7jSVGSKTYsH3C8QPkMEkYOBCq++WoCDQGIF34
-zAH3QjlIvD6KGKfwFASbV6Q+6jvI1PqG2QIDAQABo4ICWzCCAlcwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
-A1UdDgQWBBRgpVpqIZHoHu6A3wNr8YHGwX0chjAfBgNVHSMEGDAWgBQf9Sw+90Cr
-LpCgatPieV7yds2DdDCBtgYDVR0RBIGuMIGrghhzaGliLWRzLmNtcy5odS1iZXJs
-aW4uZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJib2xldGgtZHMu
-Y21zLmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1LWJlcmxpbi5k
-ZYIbc2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlgRZzaGliYWRtaW5AaHUtYmVy
-bGluLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2h1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmwwgZ4G
-CCsGAQUFBwEBBIGRMIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL2h1LWJlcmxpbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUH
-MAKGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHUtYmVybGluLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEABeQzv7HU+e81io7Uh6Ux
-88a61i75dPU+gPsGutyrSj8BGpuYB55gt5Huv95uLXM7XlY4/MzElucvyLdr0nan
-9wO7HpNYVoYfcM2+BT/gD8tQrAPYf49c7vNXN6f4+DAUC66oAMR+6F2tHybAupoE
-qLGnBMAzaKgp9QibCCJb6PnpY6iLNHRMFYFyoYAsST3A8TvEp5o/ga1wziqlWR5U
-63trGi6EXf/TWfqjRVl/vIbqKjJGlXexNaxXUHJmApPMa/J83PE/GZD9nvdYqfli
-XElaOsRM2A6AOAMlKljXc1i3ZeMFMmr5+yOET0AouaSMjgKNn6oBUnf8U34udgZg
-MQ==
-</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,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEqpQbkSDdTANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQG
-EwJERTEoMCYGA1UEChMfSHVtYm9sZHQtVW5pdmVyc2l0YWV0IHp1IEJlcmxpbjEO
-MAwGA1UEAxMFSFUtQ0ExHzAdBgkqhkiG9w0BCQEWEHBraUBodS1iZXJsaW4uZGUw
-HhcNMTExMDA0MDkzMzE5WhcNMTYxMDAyMDkzMzE5WjCBhjELMAkGA1UEBhMCREUx
-KDAmBgNVBAoTH0h1bWJvbGR0LVVuaXZlcnNpdGFldCB6dSBCZXJsaW4xJzAlBgNV
-BAsTHlpFIENvbXB1dGVyLSB1bmQgTWVkaWVuc2VydmljZTEkMCIGA1UEAxMbc2hp
-YmJvbGV0aC51dmYuaHUtYmVybGluLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA0vBDQzp17iY3EpgON9nw4NprsoHn0GtfkzmL2t1yYRW5U67hdMNg
-trTQ2OHpD5Yzk2zi88L1y0aRBIsWV/DvvPM+k3NkUKfD5hDrPogHphvUvjIvJG4A
-3oDpb4Tx7TmF1ZBe1M2+xeQ+MhaUrbM8JDcRdgtScgWrEp3qkLY/xMRjVsv6sPbw
-3m3BS2Kayg7Y11d0HCuPYXM8c6dtOSNNKAUYA1IG8FkhtAEVo86goCGETYLQxGLb
-CXfeNg7G8jrKa8NUN0+mOdnpvBX7jSVGSKTYsH3C8QPkMEkYOBCq++WoCDQGIF34
-zAH3QjlIvD6KGKfwFASbV6Q+6jvI1PqG2QIDAQABo4ICWzCCAlcwCQYDVR0TBAIw
-ADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0G
-A1UdDgQWBBRgpVpqIZHoHu6A3wNr8YHGwX0chjAfBgNVHSMEGDAWgBQf9Sw+90Cr
-LpCgatPieV7yds2DdDCBtgYDVR0RBIGuMIGrghhzaGliLWRzLmNtcy5odS1iZXJs
-aW4uZGWCGXNoaWItaWRwLmNtcy5odS1iZXJsaW4uZGWCHnNoaWJib2xldGgtZHMu
-Y21zLmh1LWJlcmxpbi5kZYIfc2hpYmJvbGV0aC1pZHAuY21zLmh1LWJlcmxpbi5k
-ZYIbc2hpYmJvbGV0aC51dmYuaHUtYmVybGluLmRlgRZzaGliYWRtaW5AaHUtYmVy
-bGluLmRlMIGDBgNVHR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2h1LWJlcmxpbi1jYS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS9odS1iZXJsaW4tY2EvcHViL2NybC9jYWNybC5jcmwwgZ4G
-CCsGAQUFBwEBBIGRMIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL2h1LWJlcmxpbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUH
-MAKGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHUtYmVybGluLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEABeQzv7HU+e81io7Uh6Ux
-88a61i75dPU+gPsGutyrSj8BGpuYB55gt5Huv95uLXM7XlY4/MzElucvyLdr0nan
-9wO7HpNYVoYfcM2+BT/gD8tQrAPYf49c7vNXN6f4+DAUC66oAMR+6F2tHybAupoE
-qLGnBMAzaKgp9QibCCJb6PnpY6iLNHRMFYFyoYAsST3A8TvEp5o/ga1wziqlWR5U
-63trGi6EXf/TWfqjRVl/vIbqKjJGlXexNaxXUHJmApPMa/J83PE/GZD9nvdYqfli
-XElaOsRM2A6AOAMlKljXc1i3ZeMFMmr5+yOET0AouaSMjgKNn6oBUnf8U34udgZg
-MQ==
-</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.dev.ja.net-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.dev.ja.net-idp-shibboleth.xml
deleted file mode 100644
index b1a7e486..00000000
--- a/swamid-interfederations-2.0/shib-idp.dev.ja.net-idp-shibboleth.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.dev.ja.net/idp/shibboleth">
-  <!--
-		This is a "Jisc Technologies (Development Shibboleth IdP)" Shibboleth IdP for JISC Collections and Janet Limited.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-26T09:17:56Z">
-      <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 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">dev.ja.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUaU3qUCHZr7xxUW7Knfvc2zgBW7QwDQYJKoZIhvcNAQEL
-						BQAwHjEcMBoGA1UEAwwTc2hpYi1pZHAuZGV2LmphLm5ldDAeFw0xNTA4MjQxODQ4
-						NTNaFw0zNTA4MjQxODQ4NTNaMB4xHDAaBgNVBAMME3NoaWItaWRwLmRldi5qYS5u
-						ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJPcwZRlDNpM9h/SeA
-						4x2q8VLHI31fc6DAhH/vSgfjBq5t5V/Qj/FQHme7lraCsgMYSklxQ2ND+80gZIpI
-						Yi3zIAeEoi8DtaStS0J8MxRnqHr7vrpoYNnKyQtWUASzCxUINnDLffrz7yJwBV+k
-						dHVGc5AY3LTRzDQOTQc0/dO4tn9nwZX37L2yzASrHLf1xs2M8b5lmIvggewdzAgd
-						LwD8aFu24/rxR4R6RgOO7HlOsOtfNrMzCYt99vevysNMHb1IQrcd3XAYuz5nD+rQ
-						9EhrQLaHJv/UvahxVALhQYS752XITEaHca8y7scpJe00lo88P5Pvm8pkFITXxuuF
-						jlVlAgMBAAGjbTBrMB0GA1UdDgQWBBShbbEIrp4AY9LJ7aYr6WrK2kH2aDBKBgNV
-						HREEQzBBghNzaGliLWlkcC5kZXYuamEubmV0hipodHRwczovL3NoaWItaWRwLmRl
-						di5qYS5uZXQvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFOKaj2F
-						Waxl1hC0mry7E/19/ZbBcb1jGFrWeLxnZC1iYkGbaw4xjrgdnYLfMzcp8rbGORZB
-						lO4e8pD9HZDINjJWP1gfejEK4eUHSD0Bfnn2oLhJkkzFwbYPi85aQTS94ploRPe/
-						PoOdGL5tx3z224611QyU4MFiCUvDBtyfN+9igNCapXKAkwYGUD3N7YUpJqrcorEv
-						6qXU19VVTOOCB8eBZ5SAo6g/vTB1VtA/5qKpBQ081D3E3iox8twvu+U1aaPYOzR2
-						gS8kL8UfacDILGi4Vrf+pbQ4vR433boq3x+sT6hgs3whi5ZK1ltABgTbmCVtNEwn
-						uoDqeFZtzSo+FJM=
-					</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>
-						MIIDNzCCAh+gAwIBAgIUQQ9WRv8vtZUnDG3HA8pY15fsjgkwDQYJKoZIhvcNAQEL
-						BQAwHjEcMBoGA1UEAwwTc2hpYi1pZHAuZGV2LmphLm5ldDAeFw0xNTA4MjQxODQ4
-						NTFaFw0zNTA4MjQxODQ4NTFaMB4xHDAaBgNVBAMME3NoaWItaWRwLmRldi5qYS5u
-						ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFCR//lF/Rv4f+FKaz
-						RTch/m/KuNy60AaJ8HPE+Ni/LgyvVddP6T6A9mRkBJ4S44nGw3A01PaDQ2y4R4/l
-						SM9CTn5d1urg8Gy8R2JtZvZMjWxGwmv59nZ+9XvyGzLH7zPJpEKXD4jVCp/O4kWC
-						srBBqUoi6hQHgHyNDe9ftFVDrGVf3cVaIksPWuP6Tw8UHiz19RQBQUed7UZAnDnl
-						m/lTAH122n6uBCHtG6u2Tl91TFQ1HCoMpeypvzDcZObja3k3AlSoM9X7VXWy4YW8
-						mvgPaY3luH/udR1ttqRc7scF+9Iw/1ma0dIeehBBhUJvhbJ87HXnDwjAFkR6LOtd
-						TSu/AgMBAAGjbTBrMB0GA1UdDgQWBBTC+q/3WvsVf5Kfz0Zzp+S/ca10qzBKBgNV
-						HREEQzBBghNzaGliLWlkcC5kZXYuamEubmV0hipodHRwczovL3NoaWItaWRwLmRl
-						di5qYS5uZXQvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBALcvI5x6
-						CBfbRHAc6sM+msCpTaD7n8MT0Z9MYRG1UZClT0I9QrYBuHk4voNCeteoqjxmukWw
-						N6mEbw0xSNjfQb9Z12YKxv6NfWuZp8SbWB50PKvxXSMVBi/h0OqPAQ0EaMeJvyeF
-						PXnpVY4jxx0duCrL+Adt/AOYqssTXlHNi7T8swfoflfEQtd/V3ptiaKiv650jXL1
-						xT3mK+onpaeeBhetjvorjej9B8S+i6oFZJ5hHE/vHbKmiLVsjCAtOq/lYyIe9lx/
-						II3qo5yGEItsYApBOcXMSXOrFd3OjyCUepX7P7siAMpQ538DnmuSLdURgdYUlIID
-						avp66EtCEnhWtN8=
-					</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>
-						MIIDNzCCAh+gAwIBAgIUJNP74b6Wyv0z7gWAfmYFvRKaOPcwDQYJKoZIhvcNAQEL
-						BQAwHjEcMBoGA1UEAwwTc2hpYi1pZHAuZGV2LmphLm5ldDAeFw0xNTA4MjQxODQ4
-						NTFaFw0zNTA4MjQxODQ4NTFaMB4xHDAaBgNVBAMME3NoaWItaWRwLmRldi5qYS5u
-						ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk4+4Jki/alefE8Fu/
-						EBwTfvdlP08P5D8DXJWe/nXYhKa6K7ppCdd1oySmbPRjm4X+2LZ1woEMovAz0TnY
-						maSj3E8kpt7aTLpLbaYpyQTlgH0b8uzjGIB2ldHj9Rmr4iGz6TT40/hSaWV3aozn
-						AXAEVfM638iQbum+d3aTpFgI3P0pm2jXo+8VRxsx882dGkQaYcFOsDxjETMwsVet
-						9h4kmhblFrikcdsLmaVgetcHAwfuIeF0Zh+s41//htNfpd9upAohhXCajOgCi5AJ
-						7rfwsNGR9BDJ4UMSQ5LhKycY25AUjAOJqt6VbRZ5Z101W4fWSmquvdzNQuFCFq4U
-						QSzRAgMBAAGjbTBrMB0GA1UdDgQWBBTZhrqH6bT0I+tmGdjFNAOFPrNsdzBKBgNV
-						HREEQzBBghNzaGliLWlkcC5kZXYuamEubmV0hipodHRwczovL3NoaWItaWRwLmRl
-						di5qYS5uZXQvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAJB8qboq
-						t9orqybKDTGUYpvf95rnogvL0wq2X8ectcKJivFtEkTBBWsbFNdeDc/sxqVLMSPW
-						G1VPZ+FnvjTv8RKjlIGQCmVTPMK1B5mMH9hdw/3d+1o/w0w8GlfUf41s4MAhwJjz
-						4sMQu17tkUmhWPavgVDZqeuRSr5D3GLMv/SAnXBrJgwu4SEUTNItkb4k/n50PaU8
-						DtPk+jivu8m2qiwPXwb+ditBKHbcVKtUOV7s/finOgkwvgF+r1A+LP5PbXqhEysI
-						vUurDG6P3/K7rNPP5pC43C0sUgf7PC9PvDdkz6RDLvr3EK9nqTLwvR6F2uX2OwCt
-						9Bt3PLpZ5T1ZzOo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.dev.ja.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>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.dev.ja.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.dev.ja.net/idp/profile/SAML2/Redirect/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">dev.ja.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUaU3qUCHZr7xxUW7Knfvc2zgBW7QwDQYJKoZIhvcNAQEL
-						BQAwHjEcMBoGA1UEAwwTc2hpYi1pZHAuZGV2LmphLm5ldDAeFw0xNTA4MjQxODQ4
-						NTNaFw0zNTA4MjQxODQ4NTNaMB4xHDAaBgNVBAMME3NoaWItaWRwLmRldi5qYS5u
-						ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJPcwZRlDNpM9h/SeA
-						4x2q8VLHI31fc6DAhH/vSgfjBq5t5V/Qj/FQHme7lraCsgMYSklxQ2ND+80gZIpI
-						Yi3zIAeEoi8DtaStS0J8MxRnqHr7vrpoYNnKyQtWUASzCxUINnDLffrz7yJwBV+k
-						dHVGc5AY3LTRzDQOTQc0/dO4tn9nwZX37L2yzASrHLf1xs2M8b5lmIvggewdzAgd
-						LwD8aFu24/rxR4R6RgOO7HlOsOtfNrMzCYt99vevysNMHb1IQrcd3XAYuz5nD+rQ
-						9EhrQLaHJv/UvahxVALhQYS752XITEaHca8y7scpJe00lo88P5Pvm8pkFITXxuuF
-						jlVlAgMBAAGjbTBrMB0GA1UdDgQWBBShbbEIrp4AY9LJ7aYr6WrK2kH2aDBKBgNV
-						HREEQzBBghNzaGliLWlkcC5kZXYuamEubmV0hipodHRwczovL3NoaWItaWRwLmRl
-						di5qYS5uZXQvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFOKaj2F
-						Waxl1hC0mry7E/19/ZbBcb1jGFrWeLxnZC1iYkGbaw4xjrgdnYLfMzcp8rbGORZB
-						lO4e8pD9HZDINjJWP1gfejEK4eUHSD0Bfnn2oLhJkkzFwbYPi85aQTS94ploRPe/
-						PoOdGL5tx3z224611QyU4MFiCUvDBtyfN+9igNCapXKAkwYGUD3N7YUpJqrcorEv
-						6qXU19VVTOOCB8eBZ5SAo6g/vTB1VtA/5qKpBQ081D3E3iox8twvu+U1aaPYOzR2
-						gS8kL8UfacDILGi4Vrf+pbQ4vR433boq3x+sT6hgs3whi5ZK1ltABgTbmCVtNEwn
-						uoDqeFZtzSo+FJM=
-					</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>
-						MIIDNzCCAh+gAwIBAgIUQQ9WRv8vtZUnDG3HA8pY15fsjgkwDQYJKoZIhvcNAQEL
-						BQAwHjEcMBoGA1UEAwwTc2hpYi1pZHAuZGV2LmphLm5ldDAeFw0xNTA4MjQxODQ4
-						NTFaFw0zNTA4MjQxODQ4NTFaMB4xHDAaBgNVBAMME3NoaWItaWRwLmRldi5qYS5u
-						ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFCR//lF/Rv4f+FKaz
-						RTch/m/KuNy60AaJ8HPE+Ni/LgyvVddP6T6A9mRkBJ4S44nGw3A01PaDQ2y4R4/l
-						SM9CTn5d1urg8Gy8R2JtZvZMjWxGwmv59nZ+9XvyGzLH7zPJpEKXD4jVCp/O4kWC
-						srBBqUoi6hQHgHyNDe9ftFVDrGVf3cVaIksPWuP6Tw8UHiz19RQBQUed7UZAnDnl
-						m/lTAH122n6uBCHtG6u2Tl91TFQ1HCoMpeypvzDcZObja3k3AlSoM9X7VXWy4YW8
-						mvgPaY3luH/udR1ttqRc7scF+9Iw/1ma0dIeehBBhUJvhbJ87HXnDwjAFkR6LOtd
-						TSu/AgMBAAGjbTBrMB0GA1UdDgQWBBTC+q/3WvsVf5Kfz0Zzp+S/ca10qzBKBgNV
-						HREEQzBBghNzaGliLWlkcC5kZXYuamEubmV0hipodHRwczovL3NoaWItaWRwLmRl
-						di5qYS5uZXQvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBALcvI5x6
-						CBfbRHAc6sM+msCpTaD7n8MT0Z9MYRG1UZClT0I9QrYBuHk4voNCeteoqjxmukWw
-						N6mEbw0xSNjfQb9Z12YKxv6NfWuZp8SbWB50PKvxXSMVBi/h0OqPAQ0EaMeJvyeF
-						PXnpVY4jxx0duCrL+Adt/AOYqssTXlHNi7T8swfoflfEQtd/V3ptiaKiv650jXL1
-						xT3mK+onpaeeBhetjvorjej9B8S+i6oFZJ5hHE/vHbKmiLVsjCAtOq/lYyIe9lx/
-						II3qo5yGEItsYApBOcXMSXOrFd3OjyCUepX7P7siAMpQ538DnmuSLdURgdYUlIID
-						avp66EtCEnhWtN8=
-					</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>
-						MIIDNzCCAh+gAwIBAgIUJNP74b6Wyv0z7gWAfmYFvRKaOPcwDQYJKoZIhvcNAQEL
-						BQAwHjEcMBoGA1UEAwwTc2hpYi1pZHAuZGV2LmphLm5ldDAeFw0xNTA4MjQxODQ4
-						NTFaFw0zNTA4MjQxODQ4NTFaMB4xHDAaBgNVBAMME3NoaWItaWRwLmRldi5qYS5u
-						ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk4+4Jki/alefE8Fu/
-						EBwTfvdlP08P5D8DXJWe/nXYhKa6K7ppCdd1oySmbPRjm4X+2LZ1woEMovAz0TnY
-						maSj3E8kpt7aTLpLbaYpyQTlgH0b8uzjGIB2ldHj9Rmr4iGz6TT40/hSaWV3aozn
-						AXAEVfM638iQbum+d3aTpFgI3P0pm2jXo+8VRxsx882dGkQaYcFOsDxjETMwsVet
-						9h4kmhblFrikcdsLmaVgetcHAwfuIeF0Zh+s41//htNfpd9upAohhXCajOgCi5AJ
-						7rfwsNGR9BDJ4UMSQ5LhKycY25AUjAOJqt6VbRZ5Z101W4fWSmquvdzNQuFCFq4U
-						QSzRAgMBAAGjbTBrMB0GA1UdDgQWBBTZhrqH6bT0I+tmGdjFNAOFPrNsdzBKBgNV
-						HREEQzBBghNzaGliLWlkcC5kZXYuamEubmV0hipodHRwczovL3NoaWItaWRwLmRl
-						di5qYS5uZXQvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAJB8qboq
-						t9orqybKDTGUYpvf95rnogvL0wq2X8ectcKJivFtEkTBBWsbFNdeDc/sxqVLMSPW
-						G1VPZ+FnvjTv8RKjlIGQCmVTPMK1B5mMH9hdw/3d+1o/w0w8GlfUf41s4MAhwJjz
-						4sMQu17tkUmhWPavgVDZqeuRSr5D3GLMv/SAnXBrJgwu4SEUTNItkb4k/n50PaU8
-						DtPk+jivu8m2qiwPXwb+ditBKHbcVKtUOV7s/finOgkwvgF+r1A+LP5PbXqhEysI
-						vUurDG6P3/K7rNPP5pC43C0sUgf7PC9PvDdkz6RDLvr3EK9nqTLwvR6F2uX2OwCt
-						9Bt3PLpZ5T1ZzOo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.dev.ja.net:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Jisc Technologies (Development Shibboleth IdP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jisc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rhys</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:Rhys.Smith@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rhys</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:Rhys.Smith@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.hs-osnabrueck.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.hs-osnabrueck.de-idp-shibboleth.xml
deleted file mode 100644
index 0b6f0a1f..00000000
--- a/swamid-interfederations-2.0/shib-idp.hs-osnabrueck.de-idp-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://shib-idp.hs-osnabrueck.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-01-20T09:45:41Z">
-      <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-support" 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://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">hs-osnabrueck.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Hochschule Osnabrück</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hochschule Osnabrück</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Hochschule Osnabrück University of Applied Sciences</mdui:Description>
-        <mdui:Description xml:lang="en">Hochschule Osnabrück University of Applied Sciences</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.hs-osnabrueck.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.hs-osnabrueck.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.hs-osnabrueck.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.hs-osnabrueck.de,OU=Zentrale IT,O=Hochschule Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHSjCCBjKgAwIBAgIHGmQuE/sKwDANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgT3NuYWJydWVjazEUMBIGA1UECxML
-emVudHJhbGUgSVQxKDAmBgNVBAMTH0hvY2hzY2h1bGUgT3NuYWJydWVjayBDQSAt
-IEcgMDExIjAgBgkqhkiG9w0BCQEWE2NhQGhzLW9zbmFicnVlY2suZGUwHhcNMTUx
-MTEyMTUzMDEyWhcNMTkwMjA4MTUzMDEyWjCBlDELMAkGA1UEBhMCREUxFjAUBgNV
-BAgMDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcMCk9zbmFicnVlY2sxHjAcBgNVBAoM
-FUhvY2hzY2h1bGUgT3NuYWJydWVjazEUMBIGA1UECwwLWmVudHJhbGUgSVQxIjAg
-BgNVBAMMGXNoaWItaWRwLmhzLW9zbmFicnVlY2suZGUwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQDDQYJD6sVwlRn28SwMIwQRpG9AhuECjIuxlqa8MsT6
-x9RiZP7KZRAhD6y0pmaNiQ2entNafyKZxXRCQDRBoY5SH3DqBsZGJbE+63fVleWP
-KuapOmq/zfAlaRo8Tja7cTzYMUcLJbKELSu3x5MYHELVFda1re8oCEPkJ4IHu+2I
-vXRuRzolMg8fWXA0c+qhM2YTuzoGkxnct2mraMsMnOQ+snhomfI+x9n1uy2VdTbW
-fAJ7WL5gcD+FbNOHCd3+zRHqLl5+44qmov97oQa9KPBfOvzRLJ33ShmdQnh1W5Ww
-GLe60/2hL66PAjPFv/dLRSCgK4r2c9R0RMuTztJzIfEvVz0OvurTCzmDdt1dvb9q
-WKBFHqsmalT44j6R4RxcRVGt2fgaEg99OxCq4Flq7P3dBCFbk7Qg/7FggIjj+CGP
-NLexjxn2EduhQZ5XH2xHY3e7mW8Jj3iqf5SY+fAlMwMP5WR7AEwV0DJqRYGHIAGN
-z1mECg0Lr+3/ECsmV6fv7z5a2kjm/wg2k2KlAycPPi2E9RGfRoOuuI295WdmkcnQ
-TmRz4g1EBLe0nrtsPXPr3QF9aKKNcDgczzdgBMf9iR8CY+22s7fLhQpGnRQ5skJq
-dCP4ow3LH1762uM1O2VRov34//0A21c37YNOtu6177jtJnl0ZpfDm+cYe9PjX65W
-4wIDAQABo4ICoDCCApwwWQYDVR0gBFIwUDARBg8rBgEEAYGtIYIsAQEEAwQwEQYP
-KwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4w
-CAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUELMv7Fex8B5MaqYixiiTkcTVJDgw
-HwYDVR0jBBgwFoAUhD/IrZjcMO4g/VErbPryLdrEfe0wfQYDVR0RBHYwdIIdc2hp
-Yi1pZHAxLnplLmhzLW9zbmFicnVlY2suZGWCHXNoaWItaWRwMi56ZS5ocy1vc25h
-YnJ1ZWNrLmRlghlzaGliLWlkcC5maC1vc25hYnJ1ZWNrLmRlghlzaGliLWlkcC5o
-cy1vc25hYnJ1ZWNrLmRlMHsGA1UdHwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvaHMtb3MtY2EvcHViL2NybC9jYWNybC5jcmwwN6A1oDOGMWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb3MtY2EvcHViL2NybC9jYWNybC5jcmwwgcsG
-CCsGAQUFBwEBBIG+MIG7MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu
-LmRlL09DU1AtU2VydmVyL09DU1AwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvaHMtb3MtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEEGCCsGAQUF
-BzAChjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLW9zLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAhybbOw+vXrrRIJkh++w4bxdr
-UP3tqBXE+1psQdsh2jkfSvLTBwCq0pJhRPlqVAE3IcvAw1pdsN6C/ScPxxCJ/9Re
-4velTmZVYKkFv3sHRyju4PUgcea2JT14I6k5YJdutX9j2j5lfRTpSEPzlXbud+Xp
-GVccHbtBOzplFQIpBatohmXYUv4j6r5QLeXyh1biVxqXoFwK6j7BKIBN3iOVTNBj
-UU0mCrGIoiuCzEM6Lc7eY57KuByxmyCIPflBIx6ohH7uP+4pV6nEayUZF/1p8AWN
-0NFm1Pj8gmi0E0RBnTPSFcyoXtOL7stEa/4Cjppsk0JhVDARUQ60bpCIXa6oCA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.hs-osnabrueck.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.hs-osnabrueck.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.hs-osnabrueck.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.hs-osnabrueck.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.hs-osnabrueck.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.hs-osnabrueck.de/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">hs-osnabrueck.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.hs-osnabrueck.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.hs-osnabrueck.de,OU=Zentrale IT,O=Hochschule Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHSjCCBjKgAwIBAgIHGmQuE/sKwDANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgT3NuYWJydWVjazEUMBIGA1UECxML
-emVudHJhbGUgSVQxKDAmBgNVBAMTH0hvY2hzY2h1bGUgT3NuYWJydWVjayBDQSAt
-IEcgMDExIjAgBgkqhkiG9w0BCQEWE2NhQGhzLW9zbmFicnVlY2suZGUwHhcNMTUx
-MTEyMTUzMDEyWhcNMTkwMjA4MTUzMDEyWjCBlDELMAkGA1UEBhMCREUxFjAUBgNV
-BAgMDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcMCk9zbmFicnVlY2sxHjAcBgNVBAoM
-FUhvY2hzY2h1bGUgT3NuYWJydWVjazEUMBIGA1UECwwLWmVudHJhbGUgSVQxIjAg
-BgNVBAMMGXNoaWItaWRwLmhzLW9zbmFicnVlY2suZGUwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQDDQYJD6sVwlRn28SwMIwQRpG9AhuECjIuxlqa8MsT6
-x9RiZP7KZRAhD6y0pmaNiQ2entNafyKZxXRCQDRBoY5SH3DqBsZGJbE+63fVleWP
-KuapOmq/zfAlaRo8Tja7cTzYMUcLJbKELSu3x5MYHELVFda1re8oCEPkJ4IHu+2I
-vXRuRzolMg8fWXA0c+qhM2YTuzoGkxnct2mraMsMnOQ+snhomfI+x9n1uy2VdTbW
-fAJ7WL5gcD+FbNOHCd3+zRHqLl5+44qmov97oQa9KPBfOvzRLJ33ShmdQnh1W5Ww
-GLe60/2hL66PAjPFv/dLRSCgK4r2c9R0RMuTztJzIfEvVz0OvurTCzmDdt1dvb9q
-WKBFHqsmalT44j6R4RxcRVGt2fgaEg99OxCq4Flq7P3dBCFbk7Qg/7FggIjj+CGP
-NLexjxn2EduhQZ5XH2xHY3e7mW8Jj3iqf5SY+fAlMwMP5WR7AEwV0DJqRYGHIAGN
-z1mECg0Lr+3/ECsmV6fv7z5a2kjm/wg2k2KlAycPPi2E9RGfRoOuuI295WdmkcnQ
-TmRz4g1EBLe0nrtsPXPr3QF9aKKNcDgczzdgBMf9iR8CY+22s7fLhQpGnRQ5skJq
-dCP4ow3LH1762uM1O2VRov34//0A21c37YNOtu6177jtJnl0ZpfDm+cYe9PjX65W
-4wIDAQABo4ICoDCCApwwWQYDVR0gBFIwUDARBg8rBgEEAYGtIYIsAQEEAwQwEQYP
-KwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4w
-CAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUELMv7Fex8B5MaqYixiiTkcTVJDgw
-HwYDVR0jBBgwFoAUhD/IrZjcMO4g/VErbPryLdrEfe0wfQYDVR0RBHYwdIIdc2hp
-Yi1pZHAxLnplLmhzLW9zbmFicnVlY2suZGWCHXNoaWItaWRwMi56ZS5ocy1vc25h
-YnJ1ZWNrLmRlghlzaGliLWlkcC5maC1vc25hYnJ1ZWNrLmRlghlzaGliLWlkcC5o
-cy1vc25hYnJ1ZWNrLmRlMHsGA1UdHwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvaHMtb3MtY2EvcHViL2NybC9jYWNybC5jcmwwN6A1oDOGMWh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvaHMtb3MtY2EvcHViL2NybC9jYWNybC5jcmwwgcsG
-CCsGAQUFBwEBBIG+MIG7MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZu
-LmRlL09DU1AtU2VydmVyL09DU1AwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvaHMtb3MtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEEGCCsGAQUF
-BzAChjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLW9zLWNhL3B1Yi9jYWNlcnQv
-Y2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAhybbOw+vXrrRIJkh++w4bxdr
-UP3tqBXE+1psQdsh2jkfSvLTBwCq0pJhRPlqVAE3IcvAw1pdsN6C/ScPxxCJ/9Re
-4velTmZVYKkFv3sHRyju4PUgcea2JT14I6k5YJdutX9j2j5lfRTpSEPzlXbud+Xp
-GVccHbtBOzplFQIpBatohmXYUv4j6r5QLeXyh1biVxqXoFwK6j7BKIBN3iOVTNBj
-UU0mCrGIoiuCzEM6Lc7eY57KuByxmyCIPflBIx6ohH7uP+4pV6nEayUZF/1p8AWN
-0NFm1Pj8gmi0E0RBnTPSFcyoXtOL7stEa/4Cjppsk0JhVDARUQ60bpCIXa6oCA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.hs-osnabrueck.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.hs-osnabrueck.de: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">e495</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e495</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Hochschule Osnabrück</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Hochschule Osnabrück</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.hs-osnabrueck.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.hs-osnabrueck.de/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bernd</md:GivenName>
-    <md:SurName>Beining</md:SurName>
-    <md:EmailAddress>mailto:b.beining@hs-osnabrueck.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sebastian</md:GivenName>
-    <md:SurName>Möller</md:SurName>
-    <md:EmailAddress>mailto:s.moeller@hs-osnabrueck.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sebastian</md:GivenName>
-    <md:SurName>Möller</md:SurName>
-    <md:EmailAddress>mailto:s.moeller@hs-osnabrueck.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.its.csufresno.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.its.csufresno.edu-idp-shibboleth.xml
deleted file mode 100644
index b3b972b7..00000000
--- a/swamid-interfederations-2.0/shib-idp.its.csufresno.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://shib-idp.its.csufresno.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">csufresno.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Fresno</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>
-MIIDVDCCAjygAwIBAgIVALSvbUT9X5BLZlEcvo8wdsnCxnQ1MA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGnNoaWItaWRwLml0cy5jc3VmcmVzbm8uZWR1MB4XDTA4
-MTExMjE2MzAzMFoXDTI4MTExMjE2MzAzMFowJTEjMCEGA1UEAxMac2hpYi1pZHAu
-aXRzLmNzdWZyZXNuby5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCgFKDm+HjolJI/esmZA9m/yoACfyeUUTnjkILD4qoJHuR8VCLBh8rSMmpdobz8
-hFjAWA11dRyYIOUE+n+MOySPHPubprAgh3wUpkJ8MqZgJHCG8leadeqt09OTHp4D
-pKDMu6GAGQlK0gKDbZMWqhZcXhCQqSZ/ygPlCLlkl0VnByN/x2YmlkGTDr8SZxX8
-UyDl3t5ynOHGhGTCTZC6DF0rv+boCPyPFC6XvWMBqB/ZHf8/f3ughACG13oqFdR+
-/bKcwzllvtf3jgG8YeQmgkpwjkLpNfnvmkE6LVwiXrEIKDZUUlywztCVt3vNVxUn
-AMJbNpa94S5jUuPZKLNySTiXAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWItaWRw
-Lml0cy5jc3VmcmVzbm8uZWR1hjFodHRwczovL3NoaWItaWRwLml0cy5jc3VmcmVz
-bm8uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTuqVs6xfq+U40s67dcTqnf
-kJm6bjANBgkqhkiG9w0BAQUFAAOCAQEAXOjFSEnFzLix+yxV0BK/kKgP9VGuunu6
-oeT7bcTHJDk0GIWTD1HfN/CxMCG138U0ETjqrW2VG3XN6tN6d2YgKCNYvjMT5DTz
-g+CXvCIuHws5vUt9Y6cbzws0vgtxEP6lLP2aVsESuVJBX1BivGgpYP4gU9mVo/EK
-88x/vzEtl0TVSL2nK0tNqZCRX74uGUgOvn8aC3Yg1CQkzBt67LMrgDfl19OeZjDA
-XyFi44m87acoHxdzxSwFUz7nIvXinIB15IrsIp2BgkblbSiJudOJGxpcq0eIGI+j
-khQt9bzJkX3J4Cg2WQo63SIREH799iBIRT7he/NurdO1UVGLStfEjw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.its.csufresno.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.its.csufresno.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/POST-SimpleSign/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">csufresno.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDVDCCAjygAwIBAgIVALSvbUT9X5BLZlEcvo8wdsnCxnQ1MA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGnNoaWItaWRwLml0cy5jc3VmcmVzbm8uZWR1MB4XDTA4
-MTExMjE2MzAzMFoXDTI4MTExMjE2MzAzMFowJTEjMCEGA1UEAxMac2hpYi1pZHAu
-aXRzLmNzdWZyZXNuby5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCgFKDm+HjolJI/esmZA9m/yoACfyeUUTnjkILD4qoJHuR8VCLBh8rSMmpdobz8
-hFjAWA11dRyYIOUE+n+MOySPHPubprAgh3wUpkJ8MqZgJHCG8leadeqt09OTHp4D
-pKDMu6GAGQlK0gKDbZMWqhZcXhCQqSZ/ygPlCLlkl0VnByN/x2YmlkGTDr8SZxX8
-UyDl3t5ynOHGhGTCTZC6DF0rv+boCPyPFC6XvWMBqB/ZHf8/f3ughACG13oqFdR+
-/bKcwzllvtf3jgG8YeQmgkpwjkLpNfnvmkE6LVwiXrEIKDZUUlywztCVt3vNVxUn
-AMJbNpa94S5jUuPZKLNySTiXAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWItaWRw
-Lml0cy5jc3VmcmVzbm8uZWR1hjFodHRwczovL3NoaWItaWRwLml0cy5jc3VmcmVz
-bm8uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTuqVs6xfq+U40s67dcTqnf
-kJm6bjANBgkqhkiG9w0BAQUFAAOCAQEAXOjFSEnFzLix+yxV0BK/kKgP9VGuunu6
-oeT7bcTHJDk0GIWTD1HfN/CxMCG138U0ETjqrW2VG3XN6tN6d2YgKCNYvjMT5DTz
-g+CXvCIuHws5vUt9Y6cbzws0vgtxEP6lLP2aVsESuVJBX1BivGgpYP4gU9mVo/EK
-88x/vzEtl0TVSL2nK0tNqZCRX74uGUgOvn8aC3Yg1CQkzBt67LMrgDfl19OeZjDA
-XyFi44m87acoHxdzxSwFUz7nIvXinIB15IrsIp2BgkblbSiJudOJGxpcq0eIGI+j
-khQt9bzJkX3J4Cg2WQo63SIREH799iBIRT7he/NurdO1UVGLStfEjw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.its.csufresno.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.its.csufresno.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Fresno</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Fresno</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.csufresno.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ITS Systems Group</md:GivenName>
-    <md:EmailAddress>sysadmin@csufresno.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mike Garvey</md:GivenName>
-    <md:EmailAddress>mikeg@csufresno.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.rpi.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.rpi.edu-idp-shibboleth.xml
deleted file mode 100644
index a6e3ea36..00000000
--- a/swamid-interfederations-2.0/shib-idp.rpi.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,90 +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://shib-idp.rpi.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">rpi.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rensselaer Polytechnic Institute</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>
-MIIDLDCCAhSgAwIBAgIVANLgKXs6iKtLWK5YzJ889P9ABepqMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHNoaWItaWRwLnJwaS5lZHUwHhcNMTAxMDA3MTY1NTI5
-WhcNMzAxMDA3MTY1NTI5WjAbMRkwFwYDVQQDExBzaGliLWlkcC5ycGkuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjtNkbDoVYnm25A/D11tmoj2A
-4B4Le9Ckb0qOU5RajFnbr+h8NBHWzGHDF2nvjjmSX81h12nGY8X8a7Gn7ELABRQU
-kWPsGhljomBjD78xeZyrOAi38Klg+9MJP0DVg09SaJns9NQppG0uhwXEqpCXqO+9
-iF0QDFS3xNM9hXyONGCWgCKkoSSVmNrjIcyFuqGTWDzngEnqwBh2K2xenopluFp9
-NrHSyT/X8KgqUk/PCn3OxPxf1isySvpnPvEhuLcXJGophWbYi8V7RbO0kTIQtV2b
-RpCAj+X1zcPh3n/zQR+UUWnirQrbVYhk8111tTbv6j9JE5Ei7jh3NRNHpKPfgwID
-AQABo2cwZTBEBgNVHREEPTA7ghBzaGliLWlkcC5ycGkuZWR1hidodHRwczovL3No
-aWItaWRwLnJwaS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDED2miSXLhk
-Z1y9moAKrxbxM+j3MA0GCSqGSIb3DQEBBQUAA4IBAQBO4D8pHBfgLS6B8Q3TWuaU
-fPVUU5eRVoJMWWf+3BLW+lVUxudyTzRrUhREVwokroUvNQHwTQOTXU1CHZoAbsKz
-G+VDAqk7Ywb4/vrH74siaiZDRGemJ+IkcvmHsAhfH44ZyluuEvQVANtv5iVKJ6HA
-ETfd87oqwGzPJmfcMzDuxemHaQx9GRxaDbVt90Dun2rjZvwn6eJl4vzGzUQRn7tD
-pLAzcXdj85j7T2prc171AicsqFiKs7H0BbZJWzuby8mM0mSyydQot4AjKSEn3XjH
-tft1Upc9k4NmeGcokAOPbfZsqCBW8ESJxCqBQsrfVHb/8s5Za9BCRXlwKZYezeK6
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.rpi.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.rpi.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.rpi.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.rpi.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.rpi.edu/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">rpi.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVANLgKXs6iKtLWK5YzJ889P9ABepqMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHNoaWItaWRwLnJwaS5lZHUwHhcNMTAxMDA3MTY1NTI5
-WhcNMzAxMDA3MTY1NTI5WjAbMRkwFwYDVQQDExBzaGliLWlkcC5ycGkuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjtNkbDoVYnm25A/D11tmoj2A
-4B4Le9Ckb0qOU5RajFnbr+h8NBHWzGHDF2nvjjmSX81h12nGY8X8a7Gn7ELABRQU
-kWPsGhljomBjD78xeZyrOAi38Klg+9MJP0DVg09SaJns9NQppG0uhwXEqpCXqO+9
-iF0QDFS3xNM9hXyONGCWgCKkoSSVmNrjIcyFuqGTWDzngEnqwBh2K2xenopluFp9
-NrHSyT/X8KgqUk/PCn3OxPxf1isySvpnPvEhuLcXJGophWbYi8V7RbO0kTIQtV2b
-RpCAj+X1zcPh3n/zQR+UUWnirQrbVYhk8111tTbv6j9JE5Ei7jh3NRNHpKPfgwID
-AQABo2cwZTBEBgNVHREEPTA7ghBzaGliLWlkcC5ycGkuZWR1hidodHRwczovL3No
-aWItaWRwLnJwaS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDED2miSXLhk
-Z1y9moAKrxbxM+j3MA0GCSqGSIb3DQEBBQUAA4IBAQBO4D8pHBfgLS6B8Q3TWuaU
-fPVUU5eRVoJMWWf+3BLW+lVUxudyTzRrUhREVwokroUvNQHwTQOTXU1CHZoAbsKz
-G+VDAqk7Ywb4/vrH74siaiZDRGemJ+IkcvmHsAhfH44ZyluuEvQVANtv5iVKJ6HA
-ETfd87oqwGzPJmfcMzDuxemHaQx9GRxaDbVt90Dun2rjZvwn6eJl4vzGzUQRn7tD
-pLAzcXdj85j7T2prc171AicsqFiKs7H0BbZJWzuby8mM0mSyydQot4AjKSEn3XjH
-tft1Upc9k4NmeGcokAOPbfZsqCBW8ESJxCqBQsrfVHb/8s5Za9BCRXlwKZYezeK6
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.rpi.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.rpi.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Rensselaer Polytechnic Institute</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rensselaer Polytechnic Institute</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rpi.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alan Powell</md:GivenName>
-    <md:EmailAddress>powela@rpi.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.siu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.siu.edu-idp-shibboleth.xml
deleted file mode 100644
index cc914cb1..00000000
--- a/swamid-interfederations-2.0/shib-idp.siu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +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://shib-idp.siu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">siu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Southern Illinois University</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>
-MIIDLDCCAhSgAwIBAgIVAIJcn4M3RZTxxXP7hVa6qv+n806fMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHNoaWItaWRwLnNpdS5lZHUwHhcNMTMwMjIxMTk0ODMw
-WhcNMzMwMjIxMTk0ODMwWjAbMRkwFwYDVQQDExBzaGliLWlkcC5zaXUuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi6kE0NfGNu9kkPAXlJSHJhFU
-FSYuqnXRdpf6I56tXJYeDJ+vr/a4C9V/nOIJqpqf0E5XZxOkHshL+rG7NPOe002/
-3mmzwLtKCc4IhgEX54Yrz2WQ3x7eAAtkKHF2n85PV0oJh7/co9oMq+2V45hSrAEq
-06j4zEE4mdEbFu8XlJdsmRo7GKj5UX7Uxh7ayp8irzsBkSFSvj8UpvWuQgHgqAhR
-DUXo2zgqys8WniWX3FtoUJ9evol230GAi4otycfPAEqzAckLlSIE48le5hq9+pgm
-TJ9qHZlvZqMEpY4mCzyYD1eznjZooJ9oMjbfql5BpJGP0KmgQS8TJ7JotDslnQID
-AQABo2cwZTBEBgNVHREEPTA7ghBzaGliLWlkcC5zaXUuZWR1hidodHRwczovL3No
-aWItaWRwLnNpdS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGaJCIGrvLic
-cpyzSKZZZYGSHuqlMA0GCSqGSIb3DQEBBQUAA4IBAQBbAUGIyzryzCV4WlTVCpwE
-lKzam10cB0FEuIlJZBuhV7RAF4dlB98utwB/oLo6yDU6SGjBmZBc2rjji00HPCLF
-NNscde+Nh2GJ2Th3JO7TzEXGIeyZ2779daPRNUldWn0e/PSuljXlOv9Fxdde5FZN
-xSVY5pXQEXc1rjR6hSYZJNSkwMpipp/l7uIbvTrUicPHIXBlOgHCfxjnZD7KCZNU
-THhkLPoiTD6LKEMsf5E4vm24y70NfsQDbLRt8xO4JXec8wK05K/D2dFkvqZgrF0s
-JcNjbx+tHm0hFfpjX8J2OY+FfSw71mQ7vmgKpoVv+QesTzYaFqfZIv1ZG25t5Ga9
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.siu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.siu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.siu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.siu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.siu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.siu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">siu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAIJcn4M3RZTxxXP7hVa6qv+n806fMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHNoaWItaWRwLnNpdS5lZHUwHhcNMTMwMjIxMTk0ODMw
-WhcNMzMwMjIxMTk0ODMwWjAbMRkwFwYDVQQDExBzaGliLWlkcC5zaXUuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAi6kE0NfGNu9kkPAXlJSHJhFU
-FSYuqnXRdpf6I56tXJYeDJ+vr/a4C9V/nOIJqpqf0E5XZxOkHshL+rG7NPOe002/
-3mmzwLtKCc4IhgEX54Yrz2WQ3x7eAAtkKHF2n85PV0oJh7/co9oMq+2V45hSrAEq
-06j4zEE4mdEbFu8XlJdsmRo7GKj5UX7Uxh7ayp8irzsBkSFSvj8UpvWuQgHgqAhR
-DUXo2zgqys8WniWX3FtoUJ9evol230GAi4otycfPAEqzAckLlSIE48le5hq9+pgm
-TJ9qHZlvZqMEpY4mCzyYD1eznjZooJ9oMjbfql5BpJGP0KmgQS8TJ7JotDslnQID
-AQABo2cwZTBEBgNVHREEPTA7ghBzaGliLWlkcC5zaXUuZWR1hidodHRwczovL3No
-aWItaWRwLnNpdS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGaJCIGrvLic
-cpyzSKZZZYGSHuqlMA0GCSqGSIb3DQEBBQUAA4IBAQBbAUGIyzryzCV4WlTVCpwE
-lKzam10cB0FEuIlJZBuhV7RAF4dlB98utwB/oLo6yDU6SGjBmZBc2rjji00HPCLF
-NNscde+Nh2GJ2Th3JO7TzEXGIeyZ2779daPRNUldWn0e/PSuljXlOv9Fxdde5FZN
-xSVY5pXQEXc1rjR6hSYZJNSkwMpipp/l7uIbvTrUicPHIXBlOgHCfxjnZD7KCZNU
-THhkLPoiTD6LKEMsf5E4vm24y70NfsQDbLRt8xO4JXec8wK05K/D2dFkvqZgrF0s
-JcNjbx+tHm0hFfpjX8J2OY+FfSw71mQ7vmgKpoVv+QesTzYaFqfZIv1ZG25t5Ga9
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.siu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Southern Illinois University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Southern Illinois University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.siu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SIUC Shibboleth Tech</md:GivenName>
-    <md:EmailAddress>shib-support@siu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SIUC Shibboleth Admin</md:GivenName>
-    <md:EmailAddress>shib-support@siu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SIUC Shibboleth Support</md:GivenName>
-    <md:EmailAddress>shib-support@siu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.tufts.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.tufts.edu-idp-shibboleth.xml
deleted file mode 100644
index 77279357..00000000
--- a/swamid-interfederations-2.0/shib-idp.tufts.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,113 +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://shib-idp.tufts.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">tufts.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Tufts University</mdui:DisplayName>
-        <mdui:Logo height="67" width="154" xml:lang="en">https://shib-idp.tufts.edu/tufts_logo.jpg</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>
-MIIDujCCAqICCQDcDfgQ9DFFeTANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMC
-VVMxFjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxEzARBgNVBAcTClNvbWVydmlsbGUx
-GTAXBgNVBAoTEFR1ZnRzIFVuaXZlcnNpdHkxDDAKBgNVBAsTA1VJVDEbMBkGA1UE
-AxMSc2hpYi1pZHAudHVmdHMuZWR1MRwwGgYJKoZIhvcNAQkBFg1lc3NAdHVmdHMu
-ZWR1MB4XDTEzMDEzMTE2MTEwOVoXDTIzMDEyOTE2MTEwOVowgZ4xCzAJBgNVBAYT
-AlVTMRYwFAYDVQQIEw1NYXNzYWNodXNldHRzMRMwEQYDVQQHEwpTb21lcnZpbGxl
-MRkwFwYDVQQKExBUdWZ0cyBVbml2ZXJzaXR5MQwwCgYDVQQLEwNVSVQxGzAZBgNV
-BAMTEnNoaWItaWRwLnR1ZnRzLmVkdTEcMBoGCSqGSIb3DQEJARYNZXNzQHR1ZnRz
-LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKl/x1AF4NuRjPA2
-oEI/WMyzBf5XmVt9cy4T7ZH5MLdmeiRfmFIGLy9YdF4Q2KHBDGk+ZQlHVv06sHze
-UUKmYGt+QS2K14Frei3yaCV3rKb9aA/ukeiVWfnn7Wsxn5qWi+mvEZq55iq8xCnw
-kLij3Fx6nWrC8T9ACLo3mfx4s9GXFY1ZIXtXj1qxwI5r93NnXUI7gMGXdHVKX7Um
-VsxL155CCb3KQRGml+1f1jl5XEHbKVVvAKQT3KdrTaa9I2Ncsx2rqtDnztV3nOUz
-b8girjEOHXLyS8rxI/xkbFajZohpFBr2aXuXvDphUO20CG4fRotIfZlokK/LHGL6
-hL5WyMkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAIy3sZ9gt86yIpmU71AFriz9P
-516u7R6F6jvvQiHNNcg5RB/6qA3LDZZrmxzHdgWGGnbSd5mWiyr6ebGoxRxWzYpu
-r9ZgIOxCK7D9Ec6rhlX0jxy+ouZ5YtgENiIgCsvJaKnrMLkQrePkiunedxSHsgap
-3gF4jSiY6YZ6XN0sfbxJf4jlaI4kl47XvxHkdkjf+u8WvW+sz1tfui5rj0xLtgWN
-h7eQBFk5zu2vH7IlJ+5NrUQPM5srLIyyAQPkX3TwCIu0imLAMKVb/QMpa3jfj0u4
-nx4gfZBsxdfXaIUPuLZsW1Ae7E8kqKmgkS5floclqDnC9ebJtliJqXqaGQr+/A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.tufts.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.tufts.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.tufts.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.tufts.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.tufts.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.tufts.edu/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">tufts.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDujCCAqICCQDcDfgQ9DFFeTANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMC
-VVMxFjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxEzARBgNVBAcTClNvbWVydmlsbGUx
-GTAXBgNVBAoTEFR1ZnRzIFVuaXZlcnNpdHkxDDAKBgNVBAsTA1VJVDEbMBkGA1UE
-AxMSc2hpYi1pZHAudHVmdHMuZWR1MRwwGgYJKoZIhvcNAQkBFg1lc3NAdHVmdHMu
-ZWR1MB4XDTEzMDEzMTE2MTEwOVoXDTIzMDEyOTE2MTEwOVowgZ4xCzAJBgNVBAYT
-AlVTMRYwFAYDVQQIEw1NYXNzYWNodXNldHRzMRMwEQYDVQQHEwpTb21lcnZpbGxl
-MRkwFwYDVQQKExBUdWZ0cyBVbml2ZXJzaXR5MQwwCgYDVQQLEwNVSVQxGzAZBgNV
-BAMTEnNoaWItaWRwLnR1ZnRzLmVkdTEcMBoGCSqGSIb3DQEJARYNZXNzQHR1ZnRz
-LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKl/x1AF4NuRjPA2
-oEI/WMyzBf5XmVt9cy4T7ZH5MLdmeiRfmFIGLy9YdF4Q2KHBDGk+ZQlHVv06sHze
-UUKmYGt+QS2K14Frei3yaCV3rKb9aA/ukeiVWfnn7Wsxn5qWi+mvEZq55iq8xCnw
-kLij3Fx6nWrC8T9ACLo3mfx4s9GXFY1ZIXtXj1qxwI5r93NnXUI7gMGXdHVKX7Um
-VsxL155CCb3KQRGml+1f1jl5XEHbKVVvAKQT3KdrTaa9I2Ncsx2rqtDnztV3nOUz
-b8girjEOHXLyS8rxI/xkbFajZohpFBr2aXuXvDphUO20CG4fRotIfZlokK/LHGL6
-hL5WyMkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAIy3sZ9gt86yIpmU71AFriz9P
-516u7R6F6jvvQiHNNcg5RB/6qA3LDZZrmxzHdgWGGnbSd5mWiyr6ebGoxRxWzYpu
-r9ZgIOxCK7D9Ec6rhlX0jxy+ouZ5YtgENiIgCsvJaKnrMLkQrePkiunedxSHsgap
-3gF4jSiY6YZ6XN0sfbxJf4jlaI4kl47XvxHkdkjf+u8WvW+sz1tfui5rj0xLtgWN
-h7eQBFk5zu2vH7IlJ+5NrUQPM5srLIyyAQPkX3TwCIu0imLAMKVb/QMpa3jfj0u4
-nx4gfZBsxdfXaIUPuLZsW1Ae7E8kqKmgkS5floclqDnC9ebJtliJqXqaGQr+/A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.tufts.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.tufts.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Tufts University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Tufts University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.tufts.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>George Turner</md:GivenName>
-    <md:EmailAddress>george.turner@tufts.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>ESS</md:GivenName>
-    <md:EmailAddress>ESS@tufts.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>George Turner</md:GivenName>
-    <md:EmailAddress>george.turner@tufts.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>PeiQuan Ho</md:GivenName>
-    <md:EmailAddress>PeiQuan.Ho@tufts.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.ucl.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.ucl.ac.uk-shibboleth.xml
deleted file mode 100644
index 09dcaab3..00000000
--- a/swamid-interfederations-2.0/shib-idp.ucl.ac.uk-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://shib-idp.ucl.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for University College London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-12-04T11:40: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">ucl.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UCL (University College London)</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://www.ucl.ac.uk/images/shib-ucl-logo-80-60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.ucl.ac.uk/images/shib-ucl-logo-16-16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEBjCCAu6gAwIBAgIJAL1ZxB217UWjMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
-						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
-						bGxlZ2UgTG9uZG9uMRswGQYDVQQDDBJzaGliLWlkcC51Y2wuYWMudWsxIjAgBgkq
-						hkiG9w0BCQEWE3VrZXJuYS1yYUB1Y2wuYWMudWswHhcNMTQwMTI4MTUyODA0WhcN
-						MzQwMTIzMTUyODA0WjCBgzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEi
-						MCAGA1UECgwZVW5pdmVyc2l0eSBDb2xsZWdlIExvbmRvbjEbMBkGA1UEAwwSc2hp
-						Yi1pZHAudWNsLmFjLnVrMSIwIAYJKoZIhvcNAQkBFhN1a2VybmEtcmFAdWNsLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvqkif+72KaxIswUf
-						g18mBnkqiMaO23A1P2ovEyKwROBCOAtnEMQS04vNVa9xFdbz1HBDtdkXsQQrdDSi
-						NH7uTxOoliLe581gdJW5yOPZaLa/23YSsdbJxBykcFIXDNUCIDa5IefR6EnPHUCu
-						LBFtMGQDfv8FAQBrFj0sRTc+9c5WMvSe0GToJ4RepVS7ZudffDbIeDVEh4Tg+3yH
-						2dXIj5u6UVhg8ocYM4hk3Fjg1uggdW7EjxZBf5rjIax2e6316ppteVSEBxwxj9FI
-						lZU3iBn6ihgf3Ix6Gp/sQQvk6WcLFd6269iPt1/BTupcKiJlcSEAv8kfbJksRnvS
-						CMw13wIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUNk7UuvDUFbJTfGTthmZA
-						bhQIyU8wHwYDVR0jBBgwFoAUNk7UuvDUFbJTfGTthmZAbhQIyU8wDQYJKoZIhvcN
-						AQEFBQADggEBAFfIkvqQOaajAbNmCX6aO+Hl4xJRnDf7zDENT0iwe7llYeA4C9Mg
-						rPkCX31HnS+m7lx42q8T/ultqoeiIRfHGPFSwYrBsWqFOZtxjZVSFYtuKyM/W2+G
-						idRkeM71d3s1jkfx9nhphI27iK860nYlmbPp+a+JzjDrFXLi21vY4WkWRJoVcnPe
-						RC5J5k/16Nz+bxbzqUUPenUNiYyCbrxH7vZnqQ9xlN57YD0yfCzTQ+TyKIHWXC4I
-						1erUYkjIA7Zm87b9RXqPLiISMLio1Ncl1ppJZqu8a34sNyvYDKPtzcKZ4v0gxovk
-						askhslrZvXeC4StCDJMj32vSTmKVQZ9S8F0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.ucl.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://shib-idp.ucl.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.ucl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.ucl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.ucl.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">ucl.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEBjCCAu6gAwIBAgIJAL1ZxB217UWjMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
-						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
-						bGxlZ2UgTG9uZG9uMRswGQYDVQQDDBJzaGliLWlkcC51Y2wuYWMudWsxIjAgBgkq
-						hkiG9w0BCQEWE3VrZXJuYS1yYUB1Y2wuYWMudWswHhcNMTQwMTI4MTUyODA0WhcN
-						MzQwMTIzMTUyODA0WjCBgzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEi
-						MCAGA1UECgwZVW5pdmVyc2l0eSBDb2xsZWdlIExvbmRvbjEbMBkGA1UEAwwSc2hp
-						Yi1pZHAudWNsLmFjLnVrMSIwIAYJKoZIhvcNAQkBFhN1a2VybmEtcmFAdWNsLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvqkif+72KaxIswUf
-						g18mBnkqiMaO23A1P2ovEyKwROBCOAtnEMQS04vNVa9xFdbz1HBDtdkXsQQrdDSi
-						NH7uTxOoliLe581gdJW5yOPZaLa/23YSsdbJxBykcFIXDNUCIDa5IefR6EnPHUCu
-						LBFtMGQDfv8FAQBrFj0sRTc+9c5WMvSe0GToJ4RepVS7ZudffDbIeDVEh4Tg+3yH
-						2dXIj5u6UVhg8ocYM4hk3Fjg1uggdW7EjxZBf5rjIax2e6316ppteVSEBxwxj9FI
-						lZU3iBn6ihgf3Ix6Gp/sQQvk6WcLFd6269iPt1/BTupcKiJlcSEAv8kfbJksRnvS
-						CMw13wIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUNk7UuvDUFbJTfGTthmZA
-						bhQIyU8wHwYDVR0jBBgwFoAUNk7UuvDUFbJTfGTthmZAbhQIyU8wDQYJKoZIhvcN
-						AQEFBQADggEBAFfIkvqQOaajAbNmCX6aO+Hl4xJRnDf7zDENT0iwe7llYeA4C9Mg
-						rPkCX31HnS+m7lx42q8T/ultqoeiIRfHGPFSwYrBsWqFOZtxjZVSFYtuKyM/W2+G
-						idRkeM71d3s1jkfx9nhphI27iK860nYlmbPp+a+JzjDrFXLi21vY4WkWRJoVcnPe
-						RC5J5k/16Nz+bxbzqUUPenUNiYyCbrxH7vZnqQ9xlN57YD0yfCzTQ+TyKIHWXC4I
-						1erUYkjIA7Zm87b9RXqPLiISMLio1Ncl1ppJZqu8a34sNyvYDKPtzcKZ4v0gxovk
-						askhslrZvXeC4StCDJMj32vSTmKVQZ9S8F0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.ucl.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 College London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UCL (University College London)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library e-resource help</GivenName>
-    <EmailAddress>mailto:lib-eresource-help@ucl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adrian</GivenName>
-    <SurName>Barker</SurName>
-    <EmailAddress>mailto:systems@ucl.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.umsystem.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.umsystem.edu-idp-shibboleth.xml
deleted file mode 100644
index 134006b6..00000000
--- a/swamid-interfederations-2.0/shib-idp.umsystem.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,150 +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://shib-idp.umsystem.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">umsystem.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">missouri.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mizzou.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umh.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umkc.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umsl.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mst.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Missouri System</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>
-MIIGXzCCBEegAwIBAgIJAKWtz8DsmzihMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwITWlzc291cmkxETAPBgNVBAcMCENvbHVtYmlhMSYw
-JAYDVQQKDB1Vbml2ZXJzaXR5IG9mIE1pc3NvdXJpIFN5c3RlbTEeMBwGA1UECwwV
-RGl2aXNpb24gb2YgSVQgLSBJU0FNMR4wHAYDVQQDDBVzaGliLWlkcC51bXN5c3Rl
-bS5lZHUxKDAmBgkqhkiG9w0BCQEWGXNoaWItc3VwcG9ydEB1bXN5c3RlbS5lZHUw
-HhcNMTQwNDA5MTY1NDMwWhcNMzQwNDA5MTY1NDMwWjCBxTELMAkGA1UEBhMCVVMx
-ETAPBgNVBAgMCE1pc3NvdXJpMREwDwYDVQQHDAhDb2x1bWJpYTEmMCQGA1UECgwd
-VW5pdmVyc2l0eSBvZiBNaXNzb3VyaSBTeXN0ZW0xHjAcBgNVBAsMFURpdmlzaW9u
-IG9mIElUIC0gSVNBTTEeMBwGA1UEAwwVc2hpYi1pZHAudW1zeXN0ZW0uZWR1MSgw
-JgYJKoZIhvcNAQkBFhlzaGliLXN1cHBvcnRAdW1zeXN0ZW0uZWR1MIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuTe7xAgB7qvskFcQOFZWVEKMx/jCyFZf
-ORYXEYi/DldPD3KnJwOQXELZUo70FPGkSe1BTXDgD+lZhgsYJ9PH3mvDyUCCp3Xk
-yph8aREA8Finsea2Rd7MZ07tKN7MMIvT/+wxYbQKApbiSz/HI6iJTsqIEtFwx9F0
-/b1mDVl4VMIYuGfz9QTkV78Bp8kEz07f7VpyAP6kdYiTmfpwPgw3ZeLS8Btdp4bM
-2Kx6YMndAkp434YVU2I7MpFnu74nRrSyvxfna807rW7v7rkdfe5cH5IaSj5QlcZy
-eluiJrQZcWVFMtbK3ncCPgHlrFngQJWThXSY/ImyIjMQgjTg2X08Eo7x56jBR5wK
-LF8pgWANSuIfu3R58WhM0BuNY/eW15g4+TYkuYII/gyEGc+jeLRCAhnPPb1CSyvu
-lvJCwONcFsaiw89C5mRMDZTEK5dxVSJIP5Nr7Gc14dnNHdKiSnMLpr+yD0PecH3d
-EBvUg9iQnMUPgJ8TCtL6l0TYmNB2s2R0bV3OtUNdacIzUhqcc94GD/gvHDtd8ZUR
-vcYoUyj+jw5G0g7hP1nfXGTzaVYgUGPDtZz5EkHQbGepB2616e/P2LNW+MEu5B20
-l4f3Hnmf3mCamDX2/sa7YPUZijktcaBZjNVQ/yNYN+DQFuhLhldQrfX1dUo8PLCh
-GeHSvAlFPr0CAwEAAaNQME4wHQYDVR0OBBYEFPHqh0NX2jMWtQ0IK+BPTIgNgT0t
-MB8GA1UdIwQYMBaAFPHqh0NX2jMWtQ0IK+BPTIgNgT0tMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggIBAJxnu+vjpnWF8fSMGOZIMboM3XcO6MpHCg3Lx1QF
-+QFuPiGQ9Zz9iphL7FEukFEtBw4KspCHEYLT5VscMd1hts5C78TWYhuetzsMPJTi
-2XoMY7Kj37HCw/nQE3FSZPD7XLsV7jLL75BhXuFicdeF1K2vUCYUYDeex1CCr+do
-RNzLKtX6P5nuNNyUWfeq22wcErq1uF8sH4Tj4EwDwUNkT2UstoojGhfLIEAuLurf
-Pf1lwZcRTNNrIPhFaDROz08rTW9aO0GWuvaHu8K3FgR7SfLjBiSfv/SruF2aSlmg
-cVXiD59YVP6kmsDQ5kn7HCEYQ7X0UGL30ms90QPeAbg4jFHGG07Gtpw4swlmvV5h
-erIgIQKLLQmz9r9m4BcYy4JU6/Y3wlgrQLU7ZnAo1z4b4LWFDd3GW8jx1ev13vrX
-GilxOAYqD/dn9JE+f20/uJ85UVu56uqg8kGrpSA/feVlJAaV0u8L5XROJ14NCgLx
-814bMhiUInpshRnoj3WznhyxbuMSF6eHetcjob8zuAXCROcgPjyZTXy8LQ88QVKQ
-7QXNXjur/GReOr/JeRkzV1454cg8GS6N+m1Qd7Z7XDANJZ27ptO0Mp0sL7eJRPWe
-0uQ2ga4iAWdPhlJEgCHMPKfizeqZKMV4nY7i6TygxvhVTWYm5GhpOgQj4r8C73Mr
-br3E
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.umsystem.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.umsystem.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.umsystem.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.umsystem.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.umsystem.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.umsystem.edu/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">umsystem.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">missouri.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mizzou.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umh.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umkc.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umsl.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mst.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIGXzCCBEegAwIBAgIJAKWtz8DsmzihMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwITWlzc291cmkxETAPBgNVBAcMCENvbHVtYmlhMSYw
-JAYDVQQKDB1Vbml2ZXJzaXR5IG9mIE1pc3NvdXJpIFN5c3RlbTEeMBwGA1UECwwV
-RGl2aXNpb24gb2YgSVQgLSBJU0FNMR4wHAYDVQQDDBVzaGliLWlkcC51bXN5c3Rl
-bS5lZHUxKDAmBgkqhkiG9w0BCQEWGXNoaWItc3VwcG9ydEB1bXN5c3RlbS5lZHUw
-HhcNMTQwNDA5MTY1NDMwWhcNMzQwNDA5MTY1NDMwWjCBxTELMAkGA1UEBhMCVVMx
-ETAPBgNVBAgMCE1pc3NvdXJpMREwDwYDVQQHDAhDb2x1bWJpYTEmMCQGA1UECgwd
-VW5pdmVyc2l0eSBvZiBNaXNzb3VyaSBTeXN0ZW0xHjAcBgNVBAsMFURpdmlzaW9u
-IG9mIElUIC0gSVNBTTEeMBwGA1UEAwwVc2hpYi1pZHAudW1zeXN0ZW0uZWR1MSgw
-JgYJKoZIhvcNAQkBFhlzaGliLXN1cHBvcnRAdW1zeXN0ZW0uZWR1MIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuTe7xAgB7qvskFcQOFZWVEKMx/jCyFZf
-ORYXEYi/DldPD3KnJwOQXELZUo70FPGkSe1BTXDgD+lZhgsYJ9PH3mvDyUCCp3Xk
-yph8aREA8Finsea2Rd7MZ07tKN7MMIvT/+wxYbQKApbiSz/HI6iJTsqIEtFwx9F0
-/b1mDVl4VMIYuGfz9QTkV78Bp8kEz07f7VpyAP6kdYiTmfpwPgw3ZeLS8Btdp4bM
-2Kx6YMndAkp434YVU2I7MpFnu74nRrSyvxfna807rW7v7rkdfe5cH5IaSj5QlcZy
-eluiJrQZcWVFMtbK3ncCPgHlrFngQJWThXSY/ImyIjMQgjTg2X08Eo7x56jBR5wK
-LF8pgWANSuIfu3R58WhM0BuNY/eW15g4+TYkuYII/gyEGc+jeLRCAhnPPb1CSyvu
-lvJCwONcFsaiw89C5mRMDZTEK5dxVSJIP5Nr7Gc14dnNHdKiSnMLpr+yD0PecH3d
-EBvUg9iQnMUPgJ8TCtL6l0TYmNB2s2R0bV3OtUNdacIzUhqcc94GD/gvHDtd8ZUR
-vcYoUyj+jw5G0g7hP1nfXGTzaVYgUGPDtZz5EkHQbGepB2616e/P2LNW+MEu5B20
-l4f3Hnmf3mCamDX2/sa7YPUZijktcaBZjNVQ/yNYN+DQFuhLhldQrfX1dUo8PLCh
-GeHSvAlFPr0CAwEAAaNQME4wHQYDVR0OBBYEFPHqh0NX2jMWtQ0IK+BPTIgNgT0t
-MB8GA1UdIwQYMBaAFPHqh0NX2jMWtQ0IK+BPTIgNgT0tMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggIBAJxnu+vjpnWF8fSMGOZIMboM3XcO6MpHCg3Lx1QF
-+QFuPiGQ9Zz9iphL7FEukFEtBw4KspCHEYLT5VscMd1hts5C78TWYhuetzsMPJTi
-2XoMY7Kj37HCw/nQE3FSZPD7XLsV7jLL75BhXuFicdeF1K2vUCYUYDeex1CCr+do
-RNzLKtX6P5nuNNyUWfeq22wcErq1uF8sH4Tj4EwDwUNkT2UstoojGhfLIEAuLurf
-Pf1lwZcRTNNrIPhFaDROz08rTW9aO0GWuvaHu8K3FgR7SfLjBiSfv/SruF2aSlmg
-cVXiD59YVP6kmsDQ5kn7HCEYQ7X0UGL30ms90QPeAbg4jFHGG07Gtpw4swlmvV5h
-erIgIQKLLQmz9r9m4BcYy4JU6/Y3wlgrQLU7ZnAo1z4b4LWFDd3GW8jx1ev13vrX
-GilxOAYqD/dn9JE+f20/uJ85UVu56uqg8kGrpSA/feVlJAaV0u8L5XROJ14NCgLx
-814bMhiUInpshRnoj3WznhyxbuMSF6eHetcjob8zuAXCROcgPjyZTXy8LQ88QVKQ
-7QXNXjur/GReOr/JeRkzV1454cg8GS6N+m1Qd7Z7XDANJZ27ptO0Mp0sL7eJRPWe
-0uQ2ga4iAWdPhlJEgCHMPKfizeqZKMV4nY7i6TygxvhVTWYm5GhpOgQj4r8C73Mr
-br3E
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.umsystem.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.umsystem.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Missouri System</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Missouri System</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://umsystem.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UM System Shibboleth Technical Contact</md:GivenName>
-    <md:EmailAddress>shib-tech@umsystem.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>UM System Shibboleth Administration</md:GivenName>
-    <md:EmailAddress>shib-admin@umsystem.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UM System Shibboleth Support</md:GivenName>
-    <md:EmailAddress>shib-support@umsystem.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.uni-hildesheim.de.xml b/swamid-interfederations-2.0/shib-idp.uni-hildesheim.de.xml
deleted file mode 100644
index 47c2d08f..00000000
--- a/swamid-interfederations-2.0/shib-idp.uni-hildesheim.de.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.uni-hildesheim.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hildesheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.uni-hildesheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.uni-hildesheim.de,OU=Rechenzentrum,O=Universitaet Hildesheim,L=Hildesheim,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIEEeczVzANBgkqhkiG9w0BAQUFADCBjTELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBIaWxkZXNoZWltMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMRowGAYDVQQDExFVbmkgSGlsZGVzaGVpbSBDQTEoMCYGCSqG
-SIb3DQEJARYZdW5paGljYUB1bmktaGlsZGVzaGVpbS5kZTAeFw0xMTA1MDkwOTM3
-MTFaFw0xNjA1MDcwOTM3MTFaMIGZMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmll
-ZGVyc2FjaHNlbjETMBEGA1UEBxMKSGlsZGVzaGVpbTEgMB4GA1UEChMXVW5pdmVy
-c2l0YWV0IEhpbGRlc2hlaW0xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xIzAhBgNV
-BAMTGnNoaWItaWRwLnVuaS1oaWxkZXNoZWltLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA4XxqNrbIPfFyEuyj+7WI+YcI8ram9P+mQBqdQNJwqATu
-V8w2ohTje6uhz/sSB6YMJZ870+/EC/cNM9Xys8iZP3N9ylxaf9R6C0kPzxC2jFW5
-BQXTUVdkGuTkHNvtLifaWjlNssXWKF6kfDt+VsOl8BO8YL5khFTmco7g1UCPAHY9
-uOWEkYvnl0mB1PEPfYb2urkpQmhYryfQx+xTBw/wDCWmEvYhYSy4gReBO9BqgLIA
-4PTks/jo9Hfd9J+Pc4u7dAoMDAY52vTtrP6S+5yNE/Sm1FkOwRXADKW/oHfpbfd5
-DTEE1CgtJ5BGDhXMhiALkOPqbOM7PDCthohTBaukhwIDAQABo4IBuDCCAbQwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBQmigDF++XdQQw36lAGjYzo25G4HjAfBgNVHSMEGDAWgBSe
-BYR8FKG8O9BK7/dLD4EjE0cyXzCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS1oaWxkZXNoZWltLWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oaWxkZXNoZWlt
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEF
-BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktaGlsZGVzaGVpbS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvdW5pLWhpbGRlc2hlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQBZUJMZplWyCVFPR0mWmNF9DXduUMpuSDp6sN4N
-9qcwHd7dnnxbrVIGikPJxZaCfhxuPpilDD85D1dkqk3GIbKIj524QcFAFiRV+A5u
-y4Yr7RtI1hnAYWJewytU570xK1RZqvcPLGsAi4Zze9Pq7S8jyb8qC07cnW4H2b3L
-bP+082peNGtkf4J9HbF9qG+sfDYseo4SwI+HnJcPCwcGwkPM7zTYK0hZLd1qg4jy
-P4G2HfAZD7IbijCgoAqTr8ubPaKXkYjrm4MRZoHq2dvASaD5tnIMh9GpThsTiFme
-MkAtRia4EjYFODSPkD/k98t4OT5pTuQxW97iAXtGhIQrv6Zn
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-hildesheim.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-hildesheim.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.uni-hildesheim.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.uni-hildesheim.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.uni-hildesheim.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.uni-hildesheim.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-hildesheim.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.uni-hildesheim.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.uni-hildesheim.de,OU=Rechenzentrum,O=Universitaet Hildesheim,L=Hildesheim,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYDCCBEigAwIBAgIEEeczVzANBgkqhkiG9w0BAQUFADCBjTELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBIaWxkZXNoZWltMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMRowGAYDVQQDExFVbmkgSGlsZGVzaGVpbSBDQTEoMCYGCSqG
-SIb3DQEJARYZdW5paGljYUB1bmktaGlsZGVzaGVpbS5kZTAeFw0xMTA1MDkwOTM3
-MTFaFw0xNjA1MDcwOTM3MTFaMIGZMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmll
-ZGVyc2FjaHNlbjETMBEGA1UEBxMKSGlsZGVzaGVpbTEgMB4GA1UEChMXVW5pdmVy
-c2l0YWV0IEhpbGRlc2hlaW0xFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xIzAhBgNV
-BAMTGnNoaWItaWRwLnVuaS1oaWxkZXNoZWltLmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA4XxqNrbIPfFyEuyj+7WI+YcI8ram9P+mQBqdQNJwqATu
-V8w2ohTje6uhz/sSB6YMJZ870+/EC/cNM9Xys8iZP3N9ylxaf9R6C0kPzxC2jFW5
-BQXTUVdkGuTkHNvtLifaWjlNssXWKF6kfDt+VsOl8BO8YL5khFTmco7g1UCPAHY9
-uOWEkYvnl0mB1PEPfYb2urkpQmhYryfQx+xTBw/wDCWmEvYhYSy4gReBO9BqgLIA
-4PTks/jo9Hfd9J+Pc4u7dAoMDAY52vTtrP6S+5yNE/Sm1FkOwRXADKW/oHfpbfd5
-DTEE1CgtJ5BGDhXMhiALkOPqbOM7PDCthohTBaukhwIDAQABo4IBuDCCAbQwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBQmigDF++XdQQw36lAGjYzo25G4HjAfBgNVHSMEGDAWgBSe
-BYR8FKG8O9BK7/dLD4EjE0cyXzCBjwYDVR0fBIGHMIGEMECgPqA8hjpodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaS1oaWxkZXNoZWltLWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1oaWxkZXNoZWlt
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBKBggrBgEF
-BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktaGlsZGVzaGVpbS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvdW5pLWhpbGRlc2hlaW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQBZUJMZplWyCVFPR0mWmNF9DXduUMpuSDp6sN4N
-9qcwHd7dnnxbrVIGikPJxZaCfhxuPpilDD85D1dkqk3GIbKIj524QcFAFiRV+A5u
-y4Yr7RtI1hnAYWJewytU570xK1RZqvcPLGsAi4Zze9Pq7S8jyb8qC07cnW4H2b3L
-bP+082peNGtkf4J9HbF9qG+sfDYseo4SwI+HnJcPCwcGwkPM7zTYK0hZLd1qg4jy
-P4G2HfAZD7IbijCgoAqTr8ubPaKXkYjrm4MRZoHq2dvASaD5tnIMh9GpThsTiFme
-MkAtRia4EjYFODSPkD/k98t4OT5pTuQxW97iAXtGhIQrv6Zn
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-hildesheim.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-hildesheim.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Hildesheim</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Hildesheim</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-hildesheim.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tobias</GivenName>
-    <SurName>Werner</SurName>
-    <EmailAddress>wernert@uni-hildesheim.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml
deleted file mode 100644
index 45efdd57..00000000
--- a/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,153 +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.uni-osnabrueck.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-11-09T14:39:44Z">
-      <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-support" 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: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-osnabrueck.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Osnabrück</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Osnabrück</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider für die Mitglieder der Universität Osnabrück</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider für die Mitglieder der Universität Osnabrück</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.uni-osnabrueck.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uni-osnabrueck.de/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGhjCCBW6gAwIBAgIHGeLo0fIbejANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
-BhMCREUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBH
-LTAwMjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTUw
-ODA2MTQxMjE4WhcNMTgxMTAyMTQxMjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNV
-BAgMDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcMCk9zbmFicnVlY2sxIDAeBgNVBAoM
-F1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLDA1SZWNoZW56ZW50cnVt
-MSMwIQYDVQQDDBpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToX
-pKBvfFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMo
-R2SupHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwf
-aDCrNqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGC
-ZPN39SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5m
-AfV2m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAtcw
-ggLTME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwC
-AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgwFoAUqh/YdxVumeRf
-kNbsYyZOGepnFFAwgZYGA1UdEQSBjjCBi4Iac2hpYi1pZHAudW5pLW9zbmFicnVl
-Y2suZGWCG3NoaWItaWRwMS51bmktb3NuYWJydWVjay5kZYIbc2hpYi1pZHAyLnVu
-aS1vc25hYnJ1ZWNrLmRlgg9zaGliLWlkcC51b3MuZGWCEHNoaWItaWRwMS51b3Mu
-ZGWCEHNoaWItaWRwMi51b3MuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktb3NuYWJydWVjay1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktb3NuYWJydWVj
-ay1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
-BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktb3NuYWJydWVj
-ay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCLC6KBPh3XfxcQzT3pEo6bRkBLfCvY
-XTxYyTLq37RwmfuLE8j9Hap+cvskfE99JtEHRwl/F8Uv9SSQgw+AbKs9xeTH7T5K
-zalw3fxaK4idLxaZKbIwHMxvkZwd4ES29XdXOlP3xAx/+3yQ3hg0IbCHaTywKx0+
-yyskKDqfOdlEYTKCQ3DeP30wtws5KGeM9q924XR6DlDjcsyG2PokwTk389q2ibpV
-TaZM7XbRWs5/gwBpj9NpzsBY1PkDD54mvLEFCYrlXAMszFyjQeDVXHayJ17WIDrO
-zYfn5UP+rfVyScJjmLxneyX4yu4iwS+Bv9CpJ/lBl8hJkf5YEJ+Tkr9b
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de: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://shib-idp.uni-osnabrueck.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.uni-osnabrueck.de/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-osnabrueck.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGhjCCBW6gAwIBAgIHGeLo0fIbejANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
-BhMCREUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQL
-Ew1SZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBH
-LTAwMjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTUw
-ODA2MTQxMjE4WhcNMTgxMTAyMTQxMjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNV
-BAgMDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcMCk9zbmFicnVlY2sxIDAeBgNVBAoM
-F1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLDA1SZWNoZW56ZW50cnVt
-MSMwIQYDVQQDDBpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToX
-pKBvfFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMo
-R2SupHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwf
-aDCrNqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGC
-ZPN39SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5m
-AfV2m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAtcw
-ggLTME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwC
-AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgwFoAUqh/YdxVumeRf
-kNbsYyZOGepnFFAwgZYGA1UdEQSBjjCBi4Iac2hpYi1pZHAudW5pLW9zbmFicnVl
-Y2suZGWCG3NoaWItaWRwMS51bmktb3NuYWJydWVjay5kZYIbc2hpYi1pZHAyLnVu
-aS1vc25hYnJ1ZWNrLmRlgg9zaGliLWlkcC51b3MuZGWCEHNoaWItaWRwMS51b3Mu
-ZGWCEHNoaWItaWRwMi51b3MuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktb3NuYWJydWVjay1jYS9wdWIvY3JsL2NhY3Js
-LmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktb3NuYWJydWVj
-ay1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYB
-BQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktb3NuYWJydWVj
-ay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCLC6KBPh3XfxcQzT3pEo6bRkBLfCvY
-XTxYyTLq37RwmfuLE8j9Hap+cvskfE99JtEHRwl/F8Uv9SSQgw+AbKs9xeTH7T5K
-zalw3fxaK4idLxaZKbIwHMxvkZwd4ES29XdXOlP3xAx/+3yQ3hg0IbCHaTywKx0+
-yyskKDqfOdlEYTKCQ3DeP30wtws5KGeM9q924XR6DlDjcsyG2PokwTk389q2ibpV
-TaZM7XbRWs5/gwBpj9NpzsBY1PkDD54mvLEFCYrlXAMszFyjQeDVXHayJ17WIDrO
-zYfn5UP+rfVyScJjmLxneyX4yu4iwS+Bv9CpJ/lBl8hJkf5YEJ+Tkr9b
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de: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">e303</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e303</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Osnabrück</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Universität Osnabrück</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-osnabrueck.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-osnabrueck.de/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Werner</md:GivenName>
-    <md:SurName>Nienhüser</md:SurName>
-    <md:EmailAddress>mailto:Werner.Nienhueser@Uni-Osnabrueck.DE</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Werner</md:GivenName>
-    <md:SurName>Nienhüser</md:SurName>
-    <md:EmailAddress>mailto:Werner.Nienhueser@Uni-Osnabrueck.DE</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de.xml b/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de.xml
deleted file mode 100644
index f23e3754..00000000
--- a/swamid-interfederations-2.0/shib-idp.uni-osnabrueck.de.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-idp.uni-osnabrueck.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-osnabrueck.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGNTCCBR2gAwIBAgIEEKRuOjANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBHLTAw
-MjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTAwOTA2
-MTM0NjE4WhcNMTUwOTA1MTM0NjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNVBAgT
-DU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCk9zbmFicnVlY2sxIDAeBgNVBAoTF1Vu
-aXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMw
-IQYDVQQDExpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToXpKBv
-fFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMoR2Su
-pHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwfaDCr
-NqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGCZPN3
-9SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5mAfV2
-m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAokwggKF
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgw
-FoAUqh/YdxVumeRfkNbsYyZOGepnFFAwgc4GA1UdEQSBxjCBw4Ead3d3YWRtaW5A
-VW5pLU9zbmFicnVlY2suREWCGnNoaWItaWRwLnVuaS1vc25hYnJ1ZWNrLmRlghtz
-aGliLWlkcDEudW5pLW9zbmFicnVlY2suZGWCG3NoaWItaWRwMi51bmktb3NuYWJy
-dWVjay5kZYIac2hpYi1pZHAudW5pLW9zbmFicnVlY2suZGWCD3NoaWItaWRwLnVv
-cy5kZYIQc2hpYi1pZHAxLnVvcy5kZYIQc2hpYi1pZHAyLnVvcy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1vc25hYnJ1
-ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1vc25hYnJ1ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS91bmktb3NuYWJydWVjay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR1/LENWkw
-y4C2NqyQZTtiANtGy9pTN6AYCNNu+16zFixw75ntjYUJ09AR0mIMflfFQp2rGRoZ
-+B8mxheTEkGLmjzJlfm8WwRlLShZjSYz0F0gsm8AQInLEbBtn2me8RnreFOO1HhE
-a3vnkTm80/vAShiwgLh2I0i1HMPQD18kgdBD6YFICICm2RQgTTzAix4fUNB5BnoF
-u4OLAbY4k+wOHu9hyUmeKuXL5QWmI8iiadsGV+pyD+n51I/zP0nxYCIcs6bdVbyO
-N4m+KSLv+bRSF+sK71PQ017Nux/K9ylqfpaMkhzXgFvspL3ZQm1yUDByjp0GBW7j
-nT7WnMt5n4CA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp.uni-osnabrueck.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-osnabrueck.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib-idp.uni-osnabrueck.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib-idp.uni-osnabrueck.de,OU=Rechenzentrum,O=Universitaet Osnabrueck,L=Osnabrueck,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGNTCCBR2gAwIBAgIEEKRuOjANBgkqhkiG9w0BAQUFADCBkTELMAkGA1UEBhMC
-REUxIDAeBgNVBAoTF1VuaXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1S
-ZWNoZW56ZW50cnVtMSMwIQYDVQQDExpVbmktT3NuYWJydWVjayBSWi1DQSBHLTAw
-MjEjMCEGCSqGSIb3DQEJARYUY2FAdW5pLW9zbmFicnVlY2suZGUwHhcNMTAwOTA2
-MTM0NjE4WhcNMTUwOTA1MTM0NjE4WjCBmTELMAkGA1UEBhMCREUxFjAUBgNVBAgT
-DU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCk9zbmFicnVlY2sxIDAeBgNVBAoTF1Vu
-aXZlcnNpdGFldCBPc25hYnJ1ZWNrMRYwFAYDVQQLEw1SZWNoZW56ZW50cnVtMSMw
-IQYDVQQDExpzaGliLWlkcC51bmktb3NuYWJydWVjay5kZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALxNTwcD5VKiaXzNT0AktZBsA8IHNiu7NToXpKBv
-fFcVzi1SBo1IIMrW+YgkShoN1ObEzJPnyVOCSzZzya9/Rj7TXlfYRlDm8BMoR2Su
-pHQxQZeWMT0SWWkFdYA3NLUVdwzhNRi8t5BHmrh44GhqeLW+hUKI6NxeLPwfaDCr
-NqxGkZay5Ex4lYVdTmn07NASOmY5ub2Om0HFL3mshbS4t92+VBJyq8zTdKGCZPN3
-9SIBzFDuT3NhVVoSc+0EMNLdQL9DdKf01/TrSKOsleC4DOE/P05UFUXcxP5mAfV2
-m+CRfmeXCdek9FQs7zCJy3z/SxbuN3ncAUzKcmpBJ+B5OZsCAwEAAaOCAokwggKF
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATAdBgNVHQ4EFgQUMwLyrOd0efTabm0joB2PFxA4IkQwHwYDVR0jBBgw
-FoAUqh/YdxVumeRfkNbsYyZOGepnFFAwgc4GA1UdEQSBxjCBw4Ead3d3YWRtaW5A
-VW5pLU9zbmFicnVlY2suREWCGnNoaWItaWRwLnVuaS1vc25hYnJ1ZWNrLmRlghtz
-aGliLWlkcDEudW5pLW9zbmFicnVlY2suZGWCG3NoaWItaWRwMi51bmktb3NuYWJy
-dWVjay5kZYIac2hpYi1pZHAudW5pLW9zbmFicnVlY2suZGWCD3NoaWItaWRwLnVv
-cy5kZYIQc2hpYi1pZHAxLnVvcy5kZYIQc2hpYi1pZHAyLnVvcy5kZTCBjwYDVR0f
-BIGHMIGEMECgPqA8hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1vc25hYnJ1
-ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3VuaS1vc25hYnJ1ZWNrLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGoBggr
-BgEFBQcBAQSBmzCBmDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS91bmktb3NuYWJydWVjay1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYB
-BQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLW9zbmFicnVlY2stY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCR1/LENWkw
-y4C2NqyQZTtiANtGy9pTN6AYCNNu+16zFixw75ntjYUJ09AR0mIMflfFQp2rGRoZ
-+B8mxheTEkGLmjzJlfm8WwRlLShZjSYz0F0gsm8AQInLEbBtn2me8RnreFOO1HhE
-a3vnkTm80/vAShiwgLh2I0i1HMPQD18kgdBD6YFICICm2RQgTTzAix4fUNB5BnoF
-u4OLAbY4k+wOHu9hyUmeKuXL5QWmI8iiadsGV+pyD+n51I/zP0nxYCIcs6bdVbyO
-N4m+KSLv+bRSF+sK71PQ017Nux/K9ylqfpaMkhzXgFvspL3ZQm1yUDByjp0GBW7j
-nT7WnMt5n4CA
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp.uni-osnabrueck.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universitaet Osnabrueck</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Osnabrück</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-osnabrueck.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Werner</GivenName>
-    <SurName>Nienhüser</SurName>
-    <EmailAddress>Werner.Nienhueser@Uni-Osnabrueck.DE</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp2.uth.tmc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-idp2.uth.tmc.edu-idp-shibboleth.xml
deleted file mode 100644
index cd6b4c10..00000000
--- a/swamid-interfederations-2.0/shib-idp2.uth.tmc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://shib-idp2.uth.tmc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.uthouston.edu/index/contact-mailing.htm" 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">uth.tmc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas Health Science Center At Houston</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>
-MIIEmzCCA4OgAwIBAgIJANowEgZ9Hf00MA0GCSqGSIb3DQEBBQUAMIHjMQswCQYD
-VQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xJzAlBgNV
-BAoMHlRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIFN5c3RlbTFBMD8GA1UECww4VGhl
-IFVuaXZlcnNpdHkgb2YgVGV4YXMgSGVhbHRoIFNjaWVuY2UgQ2VudGVyIGF0IEhv
-dXN0b24xHjAcBgNVBAMMFXNoaWItaWRwMi51dGgudG1jLmVkdTEmMCQGCSqGSIb3
-DQEJARYXaXRfdW5peHRlYW1AdXRoLnRtYy5lZHUwHhcNMTAwNjI5MjAxMjQ5WhcN
-MjAwNjI2MjAxMjQ5WjCB4zELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRleGFzMRAw
-DgYDVQQHDAdIb3VzdG9uMScwJQYDVQQKDB5UaGUgVW5pdmVyc2l0eSBvZiBUZXhh
-cyBTeXN0ZW0xQTA/BgNVBAsMOFRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIEhlYWx0
-aCBTY2llbmNlIENlbnRlciBhdCBIb3VzdG9uMR4wHAYDVQQDDBVzaGliLWlkcDIu
-dXRoLnRtYy5lZHUxJjAkBgkqhkiG9w0BCQEWF2l0X3VuaXh0ZWFtQHV0aC50bWMu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz293XxnOUeFNhzwD
-V0IjiWB/Mrg9ORmpTI/YNmfWaMWMlp6kKLeAM5eDVmU4nj1AhMJkVtHUziqKtVPL
-mY+iD6YauEbRE7FjOuly9Gk1dfFJeTtURmPh814mr61D/2kxjKxjb/DkSMF3nT7/
-TjIfGrfsvYaK2ZoOpW4C0rXoCbEkjptbH7HDM7wxm7PLjQk7sG+au91QT6KNxkpd
-7T91nOG4mjGcdz4sPnLL4v1mXqBDqmQaoiYYDhOjq/3AUy6bM1UsZ8AroTqn819I
-iN4A5hbd0yNnlFGTBUTBauZHDHatm8STDDRNN18Fkn5ArpEBbithAHy/gPHgFdp/
-4xgudwIDAQABo1AwTjAdBgNVHQ4EFgQU6eBFz/sUAoMmKePYtJCrr0vBhQ4wHwYD
-VR0jBBgwFoAU6eBFz/sUAoMmKePYtJCrr0vBhQ4wDAYDVR0TBAUwAwEB/zANBgkq
-hkiG9w0BAQUFAAOCAQEAEFCG8AEm6Txc0yoeizkYKvc9HKPy7ePSfBImdcJDunWE
-b1YqSvpKowYPaW4keBJiLSw8hjqabL8BMv1GFz2tX2CwBukM4yLkzHMLJMGuIC1o
-4KTEqiIALOxHRWJZweqxFI+tDlI1bqwWo79/amiJX4t08/Fv0MuRlWAv6VRjvW+Q
-6UlXq0WlBXP6Pwii19i31IJ6TkXJtu43CnW7gVidj7q5jpKdDxy4r6TxC8Thoz/p
-ZvQfpZbP1uqoDBU3aKTbLI4gC50lC5fgEisQTjCZj0qmqWry0YaNWMQ/Qz4gPc3Z
-QWOGBj3N6LrNN6zE2+Re+ESb02hXCgk6Wi/aFeGS+A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp2.uth.tmc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp2.uth.tmc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-idp2.uth.tmc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-idp2.uth.tmc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-idp2.uth.tmc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-idp2.uth.tmc.edu/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">uth.tmc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEmzCCA4OgAwIBAgIJANowEgZ9Hf00MA0GCSqGSIb3DQEBBQUAMIHjMQswCQYD
-VQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0b24xJzAlBgNV
-BAoMHlRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIFN5c3RlbTFBMD8GA1UECww4VGhl
-IFVuaXZlcnNpdHkgb2YgVGV4YXMgSGVhbHRoIFNjaWVuY2UgQ2VudGVyIGF0IEhv
-dXN0b24xHjAcBgNVBAMMFXNoaWItaWRwMi51dGgudG1jLmVkdTEmMCQGCSqGSIb3
-DQEJARYXaXRfdW5peHRlYW1AdXRoLnRtYy5lZHUwHhcNMTAwNjI5MjAxMjQ5WhcN
-MjAwNjI2MjAxMjQ5WjCB4zELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRleGFzMRAw
-DgYDVQQHDAdIb3VzdG9uMScwJQYDVQQKDB5UaGUgVW5pdmVyc2l0eSBvZiBUZXhh
-cyBTeXN0ZW0xQTA/BgNVBAsMOFRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIEhlYWx0
-aCBTY2llbmNlIENlbnRlciBhdCBIb3VzdG9uMR4wHAYDVQQDDBVzaGliLWlkcDIu
-dXRoLnRtYy5lZHUxJjAkBgkqhkiG9w0BCQEWF2l0X3VuaXh0ZWFtQHV0aC50bWMu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz293XxnOUeFNhzwD
-V0IjiWB/Mrg9ORmpTI/YNmfWaMWMlp6kKLeAM5eDVmU4nj1AhMJkVtHUziqKtVPL
-mY+iD6YauEbRE7FjOuly9Gk1dfFJeTtURmPh814mr61D/2kxjKxjb/DkSMF3nT7/
-TjIfGrfsvYaK2ZoOpW4C0rXoCbEkjptbH7HDM7wxm7PLjQk7sG+au91QT6KNxkpd
-7T91nOG4mjGcdz4sPnLL4v1mXqBDqmQaoiYYDhOjq/3AUy6bM1UsZ8AroTqn819I
-iN4A5hbd0yNnlFGTBUTBauZHDHatm8STDDRNN18Fkn5ArpEBbithAHy/gPHgFdp/
-4xgudwIDAQABo1AwTjAdBgNVHQ4EFgQU6eBFz/sUAoMmKePYtJCrr0vBhQ4wHwYD
-VR0jBBgwFoAU6eBFz/sUAoMmKePYtJCrr0vBhQ4wDAYDVR0TBAUwAwEB/zANBgkq
-hkiG9w0BAQUFAAOCAQEAEFCG8AEm6Txc0yoeizkYKvc9HKPy7ePSfBImdcJDunWE
-b1YqSvpKowYPaW4keBJiLSw8hjqabL8BMv1GFz2tX2CwBukM4yLkzHMLJMGuIC1o
-4KTEqiIALOxHRWJZweqxFI+tDlI1bqwWo79/amiJX4t08/Fv0MuRlWAv6VRjvW+Q
-6UlXq0WlBXP6Pwii19i31IJ6TkXJtu43CnW7gVidj7q5jpKdDxy4r6TxC8Thoz/p
-ZvQfpZbP1uqoDBU3aKTbLI4gC50lC5fgEisQTjCZj0qmqWry0YaNWMQ/Qz4gPc3Z
-QWOGBj3N6LrNN6zE2+Re+ESb02hXCgk6Wi/aFeGS+A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp2.uth.tmc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-idp2.uth.tmc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas Health Science Center At Houston</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas Health Science Center At Houston</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uth.tmc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Fagon Istre</md:GivenName>
-    <md:EmailAddress>Fagon.M.Istre@uth.tmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>OAC Support</md:GivenName>
-    <md:EmailAddress>support@uth.tmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IdM Support</md:GivenName>
-    <md:EmailAddress>idm-support@utsystem.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-pprd.middleware.vt.edu.xml b/swamid-interfederations-2.0/shib-pprd.middleware.vt.edu.xml
deleted file mode 100644
index 5cc3d882..00000000
--- a/swamid-interfederations-2.0/shib-pprd.middleware.vt.edu.xml
+++ /dev/null
@@ -1,108 +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://shib-pprd.middleware.vt.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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/hide-from-discovery</saml:AttributeValue>
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login-pprd.middleware.vt.edu/support.jsp" 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">vt.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">zTEST_VTIdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">TEST Virginia Tech IdP</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>
-MIIEMTCCAxmgAwIBAgIJAKdWq5o75wFhMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExEzARBgNVBAcMCkJsYWNrc2J1cmcx
-PDA6BgNVBAoMM1ZpcmdpbmlhIFBvbHl0ZWNobmljIEluc3RpdHV0ZSBhbmQgU3Rh
-dGUgVW5pdmVyc2l0eTETMBEGA1UECwwKTWlkZGxld2FyZTEkMCIGA1UEAwwbc2hp
-Yi1wcHJkLm1pZGRsZXdhcmUudnQuZWR1MB4XDTE1MDMzMTE3NTQ1MVoXDTIwMDMz
-MDE3NTQ1MVowga4xCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhWaXJnaW5pYTETMBEG
-A1UEBwwKQmxhY2tzYnVyZzE8MDoGA1UECgwzVmlyZ2luaWEgUG9seXRlY2huaWMg
-SW5zdGl0dXRlIGFuZCBTdGF0ZSBVbml2ZXJzaXR5MRMwEQYDVQQLDApNaWRkbGV3
-YXJlMSQwIgYDVQQDDBtzaGliLXBwcmQubWlkZGxld2FyZS52dC5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC115mM3qIxxFAoGkwjGvpmQGqi3NhN
-st418It0iG4BVZR8UrruBsGBbH69G3ggDTKGRgJNA5HDcdZZMuWXqiNOQfWNTweA
-pezxK941Ax1+tV5h0vbsx0JOGtMVabGYFcty/DNb9yu5XOLEc8aGQAxSusuU5WOp
-1XS0b7TXJBQfjPywXGcOpcVl2+GedDmjEeVKmxjfoW/HklLZjn1gCrxsJOzIwnOx
-arbbc08ki97c5/Tu0BEvPeqSecOjRX2zlA3YHnPKvfj5lMRoD77az4RC4H8rNdE/
-IAqQVYt90OeTVShMad4uR/c42me45Rx+LQSFKL+dShXxIYXCYuF35y7bAgMBAAGj
-UDBOMB0GA1UdDgQWBBRHBJo36Os/RfOmR7yWQDsxgiQF4jAfBgNVHSMEGDAWgBRH
-BJo36Os/RfOmR7yWQDsxgiQF4jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4IBAQBToc/vEzySf7dFQjLqWJpmGxZgFo5xoVP66XF0qPIqAMKR1LLToetmLA0l
-NeuY5HzcpcuD5ILAHc7IZB+5RFSam1yQIj8L9u/KZTr+sdgyNm2KDHGhEmTTUB63
-JsAPDsCX8Uri2bGOk1JTnaNf/zTQxD4xD5tc/dsOUubw27xLX46LuN4w6GSvbQ+D
-RGfMNHwWfa0PXRqOMktEB4KRMimTVu7FfRX/NI8Qt1cMl0Ur/EKapBVy58SChwsS
-ekCkx5H2+ar5TQpn8MoyloboaroHeHtFlQxhUY6fJWjcvZke6hY0W9MMubaovizq
-AzGwzzUtK3/d7PxUuTm7H1vsPcEs
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login-pprd.middleware.vt.edu/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-pprd.middleware.vt.edu/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-pprd.middleware.vt.edu:10443/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">vt.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEMTCCAxmgAwIBAgIJAKnt8KUieXQOMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExEzARBgNVBAcMCkJsYWNrc2J1cmcx
-PDA6BgNVBAoMM1ZpcmdpbmlhIFBvbHl0ZWNobmljIEluc3RpdHV0ZSBhbmQgU3Rh
-dGUgVW5pdmVyc2l0eTETMBEGA1UECwwKTWlkZGxld2FyZTEkMCIGA1UEAwwbc2hp
-Yi1wcHJkLm1pZGRsZXdhcmUudnQuZWR1MB4XDTE1MDMzMTE3NTQyOFoXDTIwMDMz
-MDE3NTQyOFowga4xCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhWaXJnaW5pYTETMBEG
-A1UEBwwKQmxhY2tzYnVyZzE8MDoGA1UECgwzVmlyZ2luaWEgUG9seXRlY2huaWMg
-SW5zdGl0dXRlIGFuZCBTdGF0ZSBVbml2ZXJzaXR5MRMwEQYDVQQLDApNaWRkbGV3
-YXJlMSQwIgYDVQQDDBtzaGliLXBwcmQubWlkZGxld2FyZS52dC5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgNWawKGtmrmACiOttv7A0QQAsr1Mi
-LiPqHX1WWYRo352T9pv+IWf8lP7Ye4LXrX7MnXXm2XOB7xzEv8E0DUWXbQf+7jit
-YlKLBmqYTzh+Z2K5JC39kVyCi/wDsi5M9rYTIjAyijr/v7fy1YGnsoqZG9qe2bm4
-eoU3QsLea0AlpMZdbdt49x32NSoll6xHcz2O6iPKe17o37ook3fRaWe2B3yDPaX6
-dLr7EuVsn0ei1Npqqyj9u//eA8JlCNh08g7/gIj6z+28Vfa3ZlOfrjBStF6d7qp5
-My3+bFX7Ldp9+bS6aTmGrFmEP5ryawRzxIKLY57b4Uk7s0XSFeuNJ0pjAgMBAAGj
-UDBOMB0GA1UdDgQWBBS2W871EVgk+1Y0nsJwK/bTP3F1ZjAfBgNVHSMEGDAWgBS2
-W871EVgk+1Y0nsJwK/bTP3F1ZjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4IBAQBYeNJx24OezaEE232V/nsfu5ryx5pBonnljXUSf7C7UfiMC63YXJyLYnCo
-/9yJyBeCnkkp1M6x7sgWIkeY2yNxbuajDX+UM5xMKNmq4sNQAPXutdAJ1yV9JcYd
-nb1O7454gzgaH2i7dNOKMCZPNgKsQ3INEIz3OPD9eBnMj4+chDTGHb5nYeb1CMFE
-wHLf5kXcL0BSav4X7toyyqjvlvqZMEz4PB6A16q005R+4GN1xgAjvjKjFlLDFhEh
-cOOlMaw85rDIC2DeqD8SFdnjGvNsP+Y6F9xWta9yDgA0J8r5PeOlPYEvhKYlWlb3
-c7h6iKRJ/Px5kmp/5GQqsrZ/c+1x
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-pprd.middleware.vt.edu:10443/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Virginia Polytechnic Institute and State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">zTEST_VTIdP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vt.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marvin Addison</md:GivenName>
-    <md:EmailAddress>serac@vt.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-sp-01.ntu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-sp-01.ntu.ac.uk-shibboleth.xml
deleted file mode 100644
index 177c3116..00000000
--- a/swamid-interfederations-2.0/shib-sp-01.ntu.ac.uk-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://shib-sp-01.ntu.ac.uk/shibboleth">
-  <!--
-		This is an "NTU Service Provider" Shibboleth SP for Nottingham Trent University.
-	-->
-  <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="2015-09-04T10:58:58Z">
-      <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-01.ntu.ac.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://shib-sp-01.ntu.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAMilnmPtn3NCMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHNoaWItc3AtMDEuYWRzLm50dS5hYy51azAeFw0xNTA2MjMxNDU5NDlaFw0y
-						NTA2MjAxNDU5NDlaMCMxITAfBgNVBAMTGHNoaWItc3AtMDEuYWRzLm50dS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQoL0vvAnaIs2kuObQy
-						zfl6uLKfZt3Swmk6mAScayoLf1/G1tuNOWuyIlx8Jk11y0FKaxEpQo74L6+O3p0+
-						u50pAQbqztYPuDiZa0QXR6y2kMsaNIAg6tu3sDVZxuDm7Bb3+ooHXMFxvQX5JzQ1
-						h6YU4ZWWL8oEBtqB/ZAL1FQpOba+NTUubSyx/DlNJlMUgRhoayIRrTuSKcZ91vrP
-						cXqUczaCupMmUMmkJwgMusv0AveKQ49/wYNF8317tiJTOYaqzRCmRbFNOSWW6EOV
-						/1ScUF28R1QmdAXNHM/FNcVwupzmOkAfRwnHbMqC1u3PjjEXD04cYR0DOEoKFyzG
-						3CcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYc2hpYi1zcC0wMS5hZHMubnR1LmFjLnVr
-						MB0GA1UdDgQWBBR53RT21evYt4Y0yQy0Ly/kxwSg4jANBgkqhkiG9w0BAQUFAAOC
-						AQEAG3CAgAkm1MelQMF6jHBE59Jmun1sY2TXkLjVX9+HFHwhvTMrGhH/fvAFbNak
-						PUwLyBnOxonMmNSifULYnI7AqjpdD1/r4/nZDYbSqGW4kXjkLi5V2dy0BxQGxpgf
-						naknk3+bFdPfSCAE/IejuZ5+rRtReydXQbt2HeYLV5WfycbBUIx7lWm3MH1ECKhJ
-						mG8ADkLheueCWnsvTRGRbb81WEIYSK3O9xSlS2pvqDexY5yJRu0pHokx8Zb0v16F
-						LkBdLAY/0llo1p+XKxoL7ipZMg1m2MRV95/IEePFEK3RuKVgF7HV6nV7oeBCeWu6
-						EJSsJo3v9pO5Jxdkrf+rsCwOGw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shib-sp-01.ntu.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp-01.ntu.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp-01.ntu.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-01.ntu.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp-01.ntu.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp-01.ntu.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-01.ntu.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-01.ntu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp-01.ntu.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp-01.ntu.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp-01.ntu.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Nottingham Trent University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NTU Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Cross</SurName>
-    <EmailAddress>mailto:Richard.cross@ntu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Hallam</SurName>
-    <EmailAddress>mailto:lee.hallam@ntu.ac.uk</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 75f79176..00000000
--- a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-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://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>Identity Management</GivenName>
-    <EmailAddress>mailto:idman@cardiff.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Philip </GivenName>
-    <SurName>Smart</SurName>
-    <EmailAddress>mailto:smartp@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 5bef644d..00000000
--- a/swamid-interfederations-2.0/shib-sp.mediacore.tv.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp.mediacore.tv">
-  <!--
-		This is a "MediaCore Video Learning Platform" Shibboleth SP for Mediacore (EMEA) Ltd.
-	-->
-  <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#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="2014-07-23T09:25:15Z">
-      <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://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>
-						MIIDITCCAgmgAwIBAgIJAKfy0phoffhNMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHNoaWItc3AubWVkaWFjb3JlLnR2MB4XDTE1MDMyNTAwNTQxN1oXDTM1MDMy
-						MDAwNTQxN1owHzEdMBsGA1UEAxMUc2hpYi1zcC5tZWRpYWNvcmUudHYwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeswwiTpucsYIEakeHwJSr1FnqOOiV
-						2nwT2WqoB/cKyJrxzc0I1v1CftJ7dTCr3WLlqy7Sc3KE9+w3nl2t1TiyQlZTXHBQ
-						WVrK4qJ7/4N9pqEpuTEBusaQXnxSxEoIyeTBGytNjZpnupEGkte6opS+2IhUiKNk
-						YnicB79+CDLPyoAPzGUeHaJignnRvsXGjzUgCaI2n4pVXWv99iRyeB6osbA+uZo1
-						6dMv18n+XbnaMjJ2QujakfaffYKGvptWLExwHVEPhbAT5+pzFpZn/cwk7U38Fs8s
-						JBaqTlua0ffk3VckVSaxlJ8cdRPJ0aYZrDZRTzsqfEjwh7hRyFXP6gIdAgMBAAGj
-						YDBeMD0GA1UdEQQ2MDSCFHNoaWItc3AubWVkaWFjb3JlLnR2hhxodHRwczovL3No
-						aWItc3AubWVkaWFjb3JlLnR2MB0GA1UdDgQWBBSGpfJo72jI4LNnm4nlmaanNFH3
-						ezANBgkqhkiG9w0BAQUFAAOCAQEAm4VWgi/YuI+w8azykybKTarvUMr2ZUE/j0XH
-						XphbG6j+dpsUbIO5TcaULlRTZE5oVESfLalasQlX7ZwlZDYfQlEOpA1K3Y5bpPeR
-						IJbsFvgvVIpto4DhlBnkSk/GrhTQ3l5IIQQ2Yk79rw7wG6FkdxGGE6YIQudAC+nf
-						jPcSUn0+5pvGtGTxcQIH9JflDqI6hK8YfsDm4n5GVx0DCSSZLd/RsjjHRJKJsQzO
-						xlVZV+KkIj289EpGS6soJhh1Fq7yUmXpeXW9rZ5AMBIqiIHzauoIVIDnxZ/594eJ
-						ImZdG1OeHzR4UnAhWvd4uMM5Raah+XPIvd6mFHE+KETjsMohIw==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/POST" index="1"/>
-    <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="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </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>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Vliet</SurName>
-    <EmailAddress>mailto:matthew@mediacore.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-sp.unity.ac-shibboleth.xml b/swamid-interfederations-2.0/shib-sp.unity.ac-shibboleth.xml
deleted file mode 100644
index f1a49a01..00000000
--- a/swamid-interfederations-2.0/shib-sp.unity.ac-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://shib-sp.unity.ac/shibboleth">
-  <!--
-		This is an "Unity" Shibboleth SP for Research Research Ltd.
-	-->
-  <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#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="2014-10-09T12:53:11Z">
-      <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.unity.ac/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">*Unity</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.unity.ac</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHDCCAgSgAwIBAgIJALWq54jw0HS7MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHNoaWItc3AudW5pdHkuYWMwHhcNMTQxMDAzMTA0ODI1WhcNMjQwOTMwMTA0
-						ODI1WjAbMRkwFwYDVQQDExBzaGliLXNwLnVuaXR5LmFjMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAwS2lW2kzzr/Kwa45pah/4TVU66zHOku2Fots9M5f
-						bdzB0Q0be5rh5k2Ne3LCucEJlp2n0rIAeuuHhDIVE+opQTy0I28c5R83Bt1TY8W7
-						QSa8hg7YK/Im0dSLx4ENSEHxMuPBuynl01qdNfGGg8qjBRjZ62SvQIzA8FBgJu2g
-						DA27J3EMQrXC9ELL9ifE+IdUGflr3BuDrefipnxv67mkOZ6LCxY0+ME7w4ooZcSB
-						BrG+r7RWkv1Qzcb5xzd19MqVaDuZLv/tynE6VQ88iyz79zvYsNL9vIhwpO/OgND3
-						DOMr47v6Q5GmG3KdVfMJwvINBNQmfqxWk6+1sQRY67MFzwIDAQABo2MwYTBABgNV
-						HREEOTA3ghBzaGliLXNwLnVuaXR5LmFjhiNodHRwczovL3NoaWItc3AudW5pdHku
-						YWMvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUVcMrT2HHLPUMrdzGkObutsQRt4cwDQYJ
-						KoZIhvcNAQEFBQADggEBABxD0edMnpEUBFe0UmeSKmhBGOPUKbDJUC3xAnAjEnQR
-						l8DHsxWji4F5KMPHN/CCHVI83XvcnvB2gsp8np3xQoxVZ5ckHYkBO2p4967BgqWc
-						Bwj8AlcNkK+CcsY6WbtzAUlIl/FTguFZ08mAV5YK88hh3qfZKHPYj6AibBiB6mqf
-						Q9x6aKcEZ9texjswuDsvMxxGZhORHo5SErlJRuO+g3KuQdE56tPdwcQLQ8uKUXvW
-						PUPWRVqOa6ad3PTyhntihn88t5k8KA5HvwE3iX9JX/a+OLLKLbHbieX4F5FT02gK
-						EfBbdfskIzAWEJ158qAfJe4Sx4Jy0PCJHMOqVW6uySw=
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.unity.ac/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.unity.ac/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp.unity.ac/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.unity.ac/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.unity.ac/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp.unity.ac/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">https://shib-sp.unity.ac/shibboleth</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Research Research Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Unity</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://researchresearch.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Potter</SurName>
-    <EmailAddress>mailto:unity-sso@researchresearch.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Potter</SurName>
-    <EmailAddress>mailto:unity-sso@researchresearch.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b1f69572..00000000
--- a/swamid-interfederations-2.0/shib-staging.data-archive.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-staging.data-archive.ac.uk/idp/shibboleth">
-  <!--
-		This is a "UK Data Archive: test IdP" Shibboleth IdP for University of Essex.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-06T09:44: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 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">shib-staging.data-archive.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC0DCCAbigAwIBAgIEVqdXCTANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDDB9z
-						aGliLXN0YWdpbmcuZGF0YS1hcmNoaXZlLmFjLnVrMB4XDTE2MDEyNjExMjQwNloX
-						DTI2MDEyNjExMjQwNlowKjEoMCYGA1UEAwwfc2hpYi1zdGFnaW5nLmRhdGEtYXJj
-						aGl2ZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIKOk/HS
-						DzzdetRRi8C4rnNJVriYnnhwBHHhBBIDuHwPXPwfo3hWXKcz8J/jNUjBbrUdi6Rb
-						8mlpdoIoeCTNQPMi1sNgxqS9slofknfw+bpVvw8Ldn+43b1F7U9+D5E4rXWDiQso
-						FH7pKUPmyVU9EGuOuxglTYVtCGtl3PZlKnWeL81D7bHBDwh2tcWY2sVtL3zGCq8k
-						43eIHvaRGePpUoVYwXg5t2U9HJ2aNjjmqwTzFEttuYTZYxFpvx7k9MHuR5issALw
-						hFpe/nsQwzGH/uh08fSutLniTlbt74ZQ4EqH9JLieioVFoCx4v1nh79f8WSMXxQy
-						DZeyhTer1M+KLZUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEABllNZl4pETGtiw1x
-						nyKE6iYrMRgkgBNFuA6e1UEaL5y9RPJ3N8x76W5gf1uAaiWmwugTeNzgTtz9BEwP
-						VWGDSHQWwd7VQ5Jkb0l5EpPo7fpRtYBpJUodiPjYs5fk9U+BxvoqbGUU+HFzA6Tp
-						1nM+oSTST2oQNCfUio9X9x3EvnTmWVYm5QcQWiS+w4RYoxFi3RC6gAm30R4phxda
-						50HTZtf1P9XRbEfkLbIoKIpmXzrmrzOc05B1mQkt2Y3uMD3tpWrLKRJR4Y5TosBd
-						y6DN8jRe9Sz3V1/aaMPA32N3MdqAu8uGumsKBAlL9jW4H9FqJ1kueeUdA2tMGI6o
-						mCV3qw==
-					</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>
-						MIIDGDCCAgCgAwIBAgIVAPm6pSVpZZ6fKqqcgHO3xG0rISAyMA0GCSqGSIb3DQEB
-						CwUAMBYxFDASBgNVBAMMC2Rhc2hpYmlkcHN0MB4XDTE1MTAyNzA4NTgxMFoXDTM1
-						MTAyNzA3NTgxMFowFjEUMBIGA1UEAwwLZGFzaGliaWRwc3QwggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCS5J5hsflL0CONq8h24R6pWX55SOsj9u1suxRu
-						ne60f9BzGPBG5IaebkXFyTLUTx8CpzyJkPkeZqxeunbdbZmb8DYcYu3JZcsf11rj
-						Zk95FLeEGauc8tuerFTSW/4d02d4TI4TMQsPdwgyQqN6DBeTE+/wvPPxds8yt4vK
-						MZDxHFLIIMGedbnMcQXjbZ1tvaJIIm+SlyexRBGYtv7bU8gcUM8Ge7jGDkg/oimy
-						mjOvpZVoaywGtTNfPF2NX9AxpBTZJukQNhS5n3D6yJTYhThBHxY4D8lphXLPw4qd
-						iLleg/ZCeZ3mVeso3NKNTEvKq7J24E7ZWGaOeOnnlmrqszVhAgMBAAGjXTBbMB0G
-						A1UdDgQWBBQwLuHfyaGuycgFA/NgE1phItGQHzA6BgNVHREEMzAxggtkYXNoaWJp
-						ZHBzdIYiaHR0cHM6Ly9kYXNoaWJpZHBzdC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEACLhS8Uuon/0eLISw81YdDuQIhM901WoeMGUp8I18bkyPSoTz
-						n/8PTsZL5XB5xyU9B5W2s0lHh2kTTkZ6JSSZiXoTXTFX/aHkjeR9U7vEULIPLom+
-						EecwPZ/+xD2q1LUDMirAeHrcDxL6tFj0O8uDXtoN9WzZYSBa0vz4KBFAWwcY2EBg
-						J8gSU5m5xUjhcGbVPubzVk9RbbtwXefPoYIt7M4zv1hkNlK2Sc0YZlU3CeOmNAMT
-						xn2l4WS//kg233EZAvBfh46NTA2mqU1PId5mswayGYKZQzd73UBzezCKLBINEZkg
-						goVqVyaQUtY5LDwxyzBA3v1gXLEOaPTwfsU0Zw==
-					</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>
-						MIIDFzCCAf+gAwIBAgIUbmZf4OLB72R9bysOhNJ/qf1ChDkwDQYJKoZIhvcNAQEL
-						BQAwFjEUMBIGA1UEAwwLZGFzaGliaWRwc3QwHhcNMTUxMDI3MDg1ODEzWhcNMzUx
-						MDI3MDc1ODEzWjAWMRQwEgYDVQQDDAtkYXNoaWJpZHBzdDCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAI1kOwt4pP39Fbw8Ep3VO5WliQkZ/26kUUTv3H/k
-						Psce23XajwcxIFvhhfueQbe+etcnpzuvngwzZEb3ck45g4YpSicSKegaP00/qEH3
-						Yk8lL9xN1uYzFnRa3yL/skhRYQU5e2QpwlndKv+fzYfrXUPMtpP8sYnDETpRP67B
-						rbbn+nB6D4aRBDARLYeoD5vf6Vg26THJhnl6cgfz9z1EjJ06W6mXBWyV++iq03pM
-						jRnBlfGVJ+EVs2T17YX6Pn92cTlPsLEzSiA7R4+a+u1u8OHmQA7Yq4HlYeVsKPrH
-						oUajMSOikAOe5TlxeqHlwAjUj61642c1/+qxvZEGNkAvKZsCAwEAAaNdMFswHQYD
-						VR0OBBYEFEP1Bagoj/vFpYL35Z7FFBjNseNGMDoGA1UdEQQzMDGCC2Rhc2hpYmlk
-						cHN0hiJodHRwczovL2Rhc2hpYmlkcHN0L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-						DQEBCwUAA4IBAQAz0Sm6LB0H+dkIz1k6o5mlEX0OjOSxiqK9E4gl/nRhwnB1Q0G0
-						pY21QqFNo5/6/xX4dRWaRyP/VDyeeTSaVKgseExzRhuk2OhP6zNfYdudr3JluTLW
-						5FN7VdMjD3Iwh3On8/aSW6Ba3PoLXhBOnC93M75rYAIRc0HGEHmWoZqXBj6dwcLA
-						4uVb/e/u6VsCa6UHxu6n6TGfSYcQjr1c7gmTSylRguCeQ9JOQy7dE4c9Cd2MENF2
-						bmujUTisfVuQKj7QgByAsz/7myhfeMvMLbcPg0d9hB39IkwgtwGmA6LVFfBIsEaz
-						Y5LKo2ucwCDxr38OpQBbp9NxkMk7kBm54d+L
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-staging.data-archive.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-staging.data-archive.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://shib-staging.data-archive.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-staging.data-archive.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-staging.data-archive.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-staging.data-archive.ac.uk/idp/profile/SAML2/Redirect/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">shib-staging.data-archive.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC0DCCAbigAwIBAgIEVqdXCTANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDDB9z
-						aGliLXN0YWdpbmcuZGF0YS1hcmNoaXZlLmFjLnVrMB4XDTE2MDEyNjExMjQwNloX
-						DTI2MDEyNjExMjQwNlowKjEoMCYGA1UEAwwfc2hpYi1zdGFnaW5nLmRhdGEtYXJj
-						aGl2ZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIKOk/HS
-						DzzdetRRi8C4rnNJVriYnnhwBHHhBBIDuHwPXPwfo3hWXKcz8J/jNUjBbrUdi6Rb
-						8mlpdoIoeCTNQPMi1sNgxqS9slofknfw+bpVvw8Ldn+43b1F7U9+D5E4rXWDiQso
-						FH7pKUPmyVU9EGuOuxglTYVtCGtl3PZlKnWeL81D7bHBDwh2tcWY2sVtL3zGCq8k
-						43eIHvaRGePpUoVYwXg5t2U9HJ2aNjjmqwTzFEttuYTZYxFpvx7k9MHuR5issALw
-						hFpe/nsQwzGH/uh08fSutLniTlbt74ZQ4EqH9JLieioVFoCx4v1nh79f8WSMXxQy
-						DZeyhTer1M+KLZUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEABllNZl4pETGtiw1x
-						nyKE6iYrMRgkgBNFuA6e1UEaL5y9RPJ3N8x76W5gf1uAaiWmwugTeNzgTtz9BEwP
-						VWGDSHQWwd7VQ5Jkb0l5EpPo7fpRtYBpJUodiPjYs5fk9U+BxvoqbGUU+HFzA6Tp
-						1nM+oSTST2oQNCfUio9X9x3EvnTmWVYm5QcQWiS+w4RYoxFi3RC6gAm30R4phxda
-						50HTZtf1P9XRbEfkLbIoKIpmXzrmrzOc05B1mQkt2Y3uMD3tpWrLKRJR4Y5TosBd
-						y6DN8jRe9Sz3V1/aaMPA32N3MdqAu8uGumsKBAlL9jW4H9FqJ1kueeUdA2tMGI6o
-						mCV3qw==
-					</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>
-						MIIDGDCCAgCgAwIBAgIVAPm6pSVpZZ6fKqqcgHO3xG0rISAyMA0GCSqGSIb3DQEB
-						CwUAMBYxFDASBgNVBAMMC2Rhc2hpYmlkcHN0MB4XDTE1MTAyNzA4NTgxMFoXDTM1
-						MTAyNzA3NTgxMFowFjEUMBIGA1UEAwwLZGFzaGliaWRwc3QwggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCS5J5hsflL0CONq8h24R6pWX55SOsj9u1suxRu
-						ne60f9BzGPBG5IaebkXFyTLUTx8CpzyJkPkeZqxeunbdbZmb8DYcYu3JZcsf11rj
-						Zk95FLeEGauc8tuerFTSW/4d02d4TI4TMQsPdwgyQqN6DBeTE+/wvPPxds8yt4vK
-						MZDxHFLIIMGedbnMcQXjbZ1tvaJIIm+SlyexRBGYtv7bU8gcUM8Ge7jGDkg/oimy
-						mjOvpZVoaywGtTNfPF2NX9AxpBTZJukQNhS5n3D6yJTYhThBHxY4D8lphXLPw4qd
-						iLleg/ZCeZ3mVeso3NKNTEvKq7J24E7ZWGaOeOnnlmrqszVhAgMBAAGjXTBbMB0G
-						A1UdDgQWBBQwLuHfyaGuycgFA/NgE1phItGQHzA6BgNVHREEMzAxggtkYXNoaWJp
-						ZHBzdIYiaHR0cHM6Ly9kYXNoaWJpZHBzdC9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEACLhS8Uuon/0eLISw81YdDuQIhM901WoeMGUp8I18bkyPSoTz
-						n/8PTsZL5XB5xyU9B5W2s0lHh2kTTkZ6JSSZiXoTXTFX/aHkjeR9U7vEULIPLom+
-						EecwPZ/+xD2q1LUDMirAeHrcDxL6tFj0O8uDXtoN9WzZYSBa0vz4KBFAWwcY2EBg
-						J8gSU5m5xUjhcGbVPubzVk9RbbtwXefPoYIt7M4zv1hkNlK2Sc0YZlU3CeOmNAMT
-						xn2l4WS//kg233EZAvBfh46NTA2mqU1PId5mswayGYKZQzd73UBzezCKLBINEZkg
-						goVqVyaQUtY5LDwxyzBA3v1gXLEOaPTwfsU0Zw==
-					</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>
-						MIIDFzCCAf+gAwIBAgIUbmZf4OLB72R9bysOhNJ/qf1ChDkwDQYJKoZIhvcNAQEL
-						BQAwFjEUMBIGA1UEAwwLZGFzaGliaWRwc3QwHhcNMTUxMDI3MDg1ODEzWhcNMzUx
-						MDI3MDc1ODEzWjAWMRQwEgYDVQQDDAtkYXNoaWJpZHBzdDCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAI1kOwt4pP39Fbw8Ep3VO5WliQkZ/26kUUTv3H/k
-						Psce23XajwcxIFvhhfueQbe+etcnpzuvngwzZEb3ck45g4YpSicSKegaP00/qEH3
-						Yk8lL9xN1uYzFnRa3yL/skhRYQU5e2QpwlndKv+fzYfrXUPMtpP8sYnDETpRP67B
-						rbbn+nB6D4aRBDARLYeoD5vf6Vg26THJhnl6cgfz9z1EjJ06W6mXBWyV++iq03pM
-						jRnBlfGVJ+EVs2T17YX6Pn92cTlPsLEzSiA7R4+a+u1u8OHmQA7Yq4HlYeVsKPrH
-						oUajMSOikAOe5TlxeqHlwAjUj61642c1/+qxvZEGNkAvKZsCAwEAAaNdMFswHQYD
-						VR0OBBYEFEP1Bagoj/vFpYL35Z7FFBjNseNGMDoGA1UdEQQzMDGCC2Rhc2hpYmlk
-						cHN0hiJodHRwczovL2Rhc2hpYmlkcHN0L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-						DQEBCwUAA4IBAQAz0Sm6LB0H+dkIz1k6o5mlEX0OjOSxiqK9E4gl/nRhwnB1Q0G0
-						pY21QqFNo5/6/xX4dRWaRyP/VDyeeTSaVKgseExzRhuk2OhP6zNfYdudr3JluTLW
-						5FN7VdMjD3Iwh3On8/aSW6Ba3PoLXhBOnC93M75rYAIRc0HGEHmWoZqXBj6dwcLA
-						4uVb/e/u6VsCa6UHxu6n6TGfSYcQjr1c7gmTSylRguCeQ9JOQy7dE4c9Cd2MENF2
-						bmujUTisfVuQKj7QgByAsz/7myhfeMvMLbcPg0d9hB39IkwgtwGmA6LVFfBIsEaz
-						Y5LKo2ucwCDxr38OpQBbp9NxkMk7kBm54d+L
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-staging.data-archive.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Essex</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UK Data Archive: test IdP (do not use)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.data-archive.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Sexton</SurName>
-    <EmailAddress>mailto:jpsexton@essex.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Payne</SurName>
-    <EmailAddress>mailto:jmpayne@essex.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index 1e2d8146..00000000
--- a/swamid-interfederations-2.0/shib-test.raven.cam.ac.uk-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://shib-test.raven.cam.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Cambridge.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-31T14:51:11Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">cam.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eresources.lib.cam.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Cambridge (test only)</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://shib-test.raven.cam.ac.uk/test-idp-logo-80x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shib-test.raven.cam.ac.uk/idp-logo-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>128.232.0.0/16</mdui:IPHint>
-        <mdui:IPHint>129.169.0.0/16</mdui:IPHint>
-        <mdui:IPHint>131.111.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.18.195.0/24</mdui:IPHint>
-        <mdui:IPHint>193.60.80.0/20</mdui:IPHint>
-        <mdui:IPHint>193.63.252.0/23</mdui:IPHint>
-        <mdui:IPHint>2001:630:200::/48</mdui:IPHint>
-        <mdui:DomainHint>cam.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:52.208056,0.1225</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRjCCAi6gAwIBAgIJANGv1GtjrUKOMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXNoaWItdGVzdC5yYXZlbi5jYW0uYWMudWswHhcNMTIxMjA0MTE1NjQ0WhcN
-						MjIxMjAyMTE1NjQ0WjAkMSIwIAYDVQQDExlzaGliLXRlc3QucmF2ZW4uY2FtLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtJeHcwBjETJCV4XX
-						P9xI6qFSpbDJ94veVlT11dN1opYY/3QC+6pa811/4wXeQ35e64U1UcqpzP0f1EFR
-						MBxT22Wt3ASBpdp+2U+AEwOahfUI8uQDK2n3E67dQ1km76vhpxbX0CyZggnSkluN
-						kOMLIJrZFr0gaI7/a08JoTzwn6pjFWklvMhPHpu2Wr5AodSY6+sljX4/nNKUxyHo
-						WfwiZG50/u4f3PmFb0b2YIpjmdBIJQzaBbOHSjDUVpONRwz++rPr1DuXeWzmOHIK
-						hqGZzsk+TjbhZcA0mX26iaw59pNZq/y0W8IXSzHUGum19L6LWKwt61path7OdZTz
-						sHD2twIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUYj7x7CBTsVBP86VAwrNz
-						q/nvhRYwHwYDVR0jBBgwFoAUYj7x7CBTsVBP86VAwrNzq/nvhRYwDQYJKoZIhvcN
-						AQEFBQADggEBAKJEUuUYXss4j3cfFtz7fK8pQ7Xejnop18wBEThSyzJSjd7YEq6w
-						ZCdfGTzWjBmUXQWRijm9JX9f2sobXiUuwDvHK6N/1OM/7V2a0qPrdX53UMceVY0o
-						M/x+HKKZ6svBXkj5VTovzPEUnPAl3m1JiZAffJtn7mz+wEPluJEcgqWWrwHjRJs8
-						lzuR6fJ3PacP0Qcg2nBk9y9YxSrGKHFFZ6s8iszpnsVDzQPD3NZSuHTCbp2J7cz0
-						/XyCLO75rEBXAmp8/L96QjlEUiQukScWn3jNRsI6lX9GypVZKBm/y5v5Tyj/x+i2
-						SuQ4UiVzLdJ3C6y7SMog3XganjH9Qg6r6AA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test.raven.cam.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test.raven.cam.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://shib-test.raven.cam.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test.raven.cam.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-test.raven.cam.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test.raven.cam.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">cam.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eresources.lib.cam.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRjCCAi6gAwIBAgIJANGv1GtjrUKOMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXNoaWItdGVzdC5yYXZlbi5jYW0uYWMudWswHhcNMTIxMjA0MTE1NjQ0WhcN
-						MjIxMjAyMTE1NjQ0WjAkMSIwIAYDVQQDExlzaGliLXRlc3QucmF2ZW4uY2FtLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtJeHcwBjETJCV4XX
-						P9xI6qFSpbDJ94veVlT11dN1opYY/3QC+6pa811/4wXeQ35e64U1UcqpzP0f1EFR
-						MBxT22Wt3ASBpdp+2U+AEwOahfUI8uQDK2n3E67dQ1km76vhpxbX0CyZggnSkluN
-						kOMLIJrZFr0gaI7/a08JoTzwn6pjFWklvMhPHpu2Wr5AodSY6+sljX4/nNKUxyHo
-						WfwiZG50/u4f3PmFb0b2YIpjmdBIJQzaBbOHSjDUVpONRwz++rPr1DuXeWzmOHIK
-						hqGZzsk+TjbhZcA0mX26iaw59pNZq/y0W8IXSzHUGum19L6LWKwt61path7OdZTz
-						sHD2twIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUYj7x7CBTsVBP86VAwrNz
-						q/nvhRYwHwYDVR0jBBgwFoAUYj7x7CBTsVBP86VAwrNzq/nvhRYwDQYJKoZIhvcN
-						AQEFBQADggEBAKJEUuUYXss4j3cfFtz7fK8pQ7Xejnop18wBEThSyzJSjd7YEq6w
-						ZCdfGTzWjBmUXQWRijm9JX9f2sobXiUuwDvHK6N/1OM/7V2a0qPrdX53UMceVY0o
-						M/x+HKKZ6svBXkj5VTovzPEUnPAl3m1JiZAffJtn7mz+wEPluJEcgqWWrwHjRJs8
-						lzuR6fJ3PacP0Qcg2nBk9y9YxSrGKHFFZ6s8iszpnsVDzQPD3NZSuHTCbp2J7cz0
-						/XyCLO75rEBXAmp8/L96QjlEUiQukScWn3jNRsI6lX9GypVZKBm/y5v5Tyj/x+i2
-						SuQ4UiVzLdJ3C6y7SMog3XganjH9Qg6r6AA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test.raven.cam.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test.raven.cam.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 Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Cambridge (test only)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>University Information Services' Service Desk</GivenName>
-    <EmailAddress>mailto:service-desk@uis.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Raven Support</GivenName>
-    <EmailAddress>mailto:raven-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-uat-idp.ucl.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib-uat-idp.ucl.ac.uk-shibboleth.xml
deleted file mode 100644
index 6069fe12..00000000
--- a/swamid-interfederations-2.0/shib-uat-idp.ucl.ac.uk-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://shib-uat-idp.ucl.ac.uk/shibboleth">
-  <!--
-		This is a "Shib UAT" Shibboleth IdP for University College London.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-10-12T14:49: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">ucl.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIERjCCAy6gAwIBAgIJAMClfsZN+MybMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
-						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
-						bGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1zMR8wHQYD
-						VQQDDBZzaGliLXVhdC1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFzeXN0
-						ZW1zQHVjbC5hYy51azAeFw0xNDA2MDIxMjIyMjhaFw0zNDA1MjgxMjIyMjhaMIGj
-						MQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJz
-						aXR5IENvbGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1z
-						MR8wHQYDVQQDDBZzaGliLXVhdC1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkB
-						FhFzeXN0ZW1zQHVjbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAL/n3Jeei9jS1qL5Tn0xK04C1gHXLNkI4FV3TQ0tZTW4kf7am/h94OOI3rd5
-						6UCXobFG5FsEAWOCwY9Vt6xsNBMLXK6qRvS87+Hs4SmooBbQSt4JzhHA083a/JAy
-						TIUZj+RCKQl1tgg/bSXaun43ZwSFNoHS7mW5OUDNKTSVDtS2sw9i3ZbogIaKvGUJ
-						jG00XFXQjjSG6Ak90CphUkqJ7ng4We+eyuYTWnYJGO9Zz8l6BmjX7jEPOt5DTujp
-						OhjiE9tGG94bM3EWAM0CcxSI1LDvhAIP+/5bMX34QBHWFDHADGHbEjLkKgfvamcq
-						9OPYDKsIDxhQCfWzdmjmhfIQdhsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FNdWyQJ4XXk6XM2IjlafonfZo/63MB8GA1UdIwQYMBaAFNdWyQJ4XXk6XM2Ijlaf
-						onfZo/63MA0GCSqGSIb3DQEBBQUAA4IBAQCPI7W8d09hillpAL7U1zIkcbjfyyKp
-						GtHaYd/PMQxuz3+Z1jMR6xOD4DBONW3c5BIro6+Mgpygh3KI271ga5PxwBdCx5jk
-						Vud3xtV26Ed2aZQPM5xw6JgfRQqBTgcDeGdjiOqre9Dy8cpqr3o2YGk0FByoEQgE
-						X6aW9mLTo8QWtgvnz08xXahl/Wun46LszukLrs4ESWSgsy5UODsFkVk1vGtuIUCY
-						pFhZrqa7z3Xufm2qnsfX4agfpQ0fId9S1qp1Rx0YxcWj6mPv4BhXWuV9UzdleygO
-						mOwV4il8hzDV8GfAgM7Is0wGG5VwGATSEjlR30FRsOHjeaNqm5GvFGDB
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-uat-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-uat-idp.ucl.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://shib-uat-idp.ucl.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-uat-idp.ucl.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-uat-idp.ucl.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-uat-idp.ucl.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">ucl.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIERjCCAy6gAwIBAgIJAMClfsZN+MybMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
-						VQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJzaXR5IENv
-						bGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1zMR8wHQYD
-						VQQDDBZzaGliLXVhdC1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkBFhFzeXN0
-						ZW1zQHVjbC5hYy51azAeFw0xNDA2MDIxMjIyMjhaFw0zNDA1MjgxMjIyMjhaMIGj
-						MQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGTG9uZG9uMSIwIAYDVQQKDBlVbml2ZXJz
-						aXR5IENvbGxlZ2UgTG9uZG9uMRwwGgYDVQQLDBNJbmZvcm1hdGlvbiBTeXN0ZW1z
-						MR8wHQYDVQQDDBZzaGliLXVhdC1pZHAudWNsLmFjLnVrMSAwHgYJKoZIhvcNAQkB
-						FhFzeXN0ZW1zQHVjbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAL/n3Jeei9jS1qL5Tn0xK04C1gHXLNkI4FV3TQ0tZTW4kf7am/h94OOI3rd5
-						6UCXobFG5FsEAWOCwY9Vt6xsNBMLXK6qRvS87+Hs4SmooBbQSt4JzhHA083a/JAy
-						TIUZj+RCKQl1tgg/bSXaun43ZwSFNoHS7mW5OUDNKTSVDtS2sw9i3ZbogIaKvGUJ
-						jG00XFXQjjSG6Ak90CphUkqJ7ng4We+eyuYTWnYJGO9Zz8l6BmjX7jEPOt5DTujp
-						OhjiE9tGG94bM3EWAM0CcxSI1LDvhAIP+/5bMX34QBHWFDHADGHbEjLkKgfvamcq
-						9OPYDKsIDxhQCfWzdmjmhfIQdhsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FNdWyQJ4XXk6XM2IjlafonfZo/63MB8GA1UdIwQYMBaAFNdWyQJ4XXk6XM2Ijlaf
-						onfZo/63MA0GCSqGSIb3DQEBBQUAA4IBAQCPI7W8d09hillpAL7U1zIkcbjfyyKp
-						GtHaYd/PMQxuz3+Z1jMR6xOD4DBONW3c5BIro6+Mgpygh3KI271ga5PxwBdCx5jk
-						Vud3xtV26Ed2aZQPM5xw6JgfRQqBTgcDeGdjiOqre9Dy8cpqr3o2YGk0FByoEQgE
-						X6aW9mLTo8QWtgvnz08xXahl/Wun46LszukLrs4ESWSgsy5UODsFkVk1vGtuIUCY
-						pFhZrqa7z3Xufm2qnsfX4agfpQ0fId9S1qp1Rx0YxcWj6mPv4BhXWuV9UzdleygO
-						mOwV4il8hzDV8GfAgM7Is0wGG5VwGATSEjlR30FRsOHjeaNqm5GvFGDB
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-uat-idp.ucl.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-uat-idp.ucl.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 College London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University College London (Shib UAT)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ucl.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library e-resource help</GivenName>
-    <EmailAddress>mailto:lib-eresource-help@ucl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adrian</GivenName>
-    <SurName>Barker</SurName>
-    <EmailAddress>mailto:systems@ucl.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.xml
deleted file mode 100644
index 94d22456..00000000
--- a/swamid-interfederations-2.0/shib.alexanderstreet.com-shibboleth-sp.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://shib.alexanderstreet.com/shibboleth-sp">
-  <!--
-		This is a Shibboleth SP for Alexander Street Press, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-11T17:15: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>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.alexanderstreet.com/Shibboleth.sso/WAYF" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDwDCCAqgCCQDCf0TzHdVL9zANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
-						VVMxETAPBgNVBAgMCFZpcmdpbmlhMRMwEQYDVQQHDApBbGV4YW5kcmlhMR8wHQYD
-						VQQKDBZBbGV4YW5kZXIgU3RyZWV0IFByZXNzMSEwHwYDVQQDDBhzaGliLmFsZXhh
-						bmRlcnN0cmVldC5jb20xJjAkBgkqhkiG9w0BCQEWF2FzcC1pdEBhc3RyZWV0cHJl
-						c3MuY29tMB4XDTE0MDkyOTE0MzI0MloXDTI0MDkyNjE0MzI0MlowgaExCzAJBgNV
-						BAYTAlVTMREwDwYDVQQIDAhWaXJnaW5pYTETMBEGA1UEBwwKQWxleGFuZHJpYTEf
-						MB0GA1UECgwWQWxleGFuZGVyIFN0cmVldCBQcmVzczEhMB8GA1UEAwwYc2hpYi5h
-						bGV4YW5kZXJzdHJlZXQuY29tMSYwJAYJKoZIhvcNAQkBFhdhc3AtaXRAYXN0cmVl
-						dHByZXNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANT9VZht
-						tKm/kA8GzvNL7sCY66dybafPY36Glm7gLRFeZAC09fAGkzkW+SmLrY5Gum5kYYhH
-						99ckibDhfe3/61sgoBIwmaFn0atEb9bMbO7IVQ9bQV3vdVI+/AvsA5EIF8W9ildv
-						tx09CLonner4y8yol0h7VuUJyrlMef/rEBFiFnnDceEswiP1va3vGRRlYx396Uki
-						n/cCPae+YYFxo0HZFc6QFfCwmGkSdPeEjjrew4OBmbEeTV4NWgn7a2y81n4FlUwY
-						C6fNHuLjaB11lc0i+yNjKipTuAiTr1zRzvXuRSwwPpI9OJ0YHPUXB1Ug3U+jkNE+
-						qihC1Waoa6RNKiMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAuUgodJSN/sFhG1wy
-						ifZuq4hKlDGtpmwds+qFBYyCJV/dChhasqcvkqWfzTj7BUn83mPmdIfDcP0evdup
-						6QCFVlIr5Qv5I5f5eThovcJquPHKUTWEQdMh3VAhnp+zrjnO8CYozCKlEYJs0Z0J
-						vCIOdqIBfxQ/De7HqksyEeLWT/aAuI8WJHmYT4ZrcXs3t0zadwmxf+Fx7ItyjYSG
-						35u+naLO9KhT59QszZB81NpWP7n7dgh8TKyJzWSKI5ZcnRdD3y+J41RvnBRxuKQ+
-						De08tywH8Z0G4Htt9kxk6Em2I/C+6x7hMYYoK0mAWGcKktXMaaAFyoQQv5WZPzxB
-						TVh0fw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.alexanderstreet.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.alexanderstreet.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Alexander Street Press, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Alexander Street Press LLC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.alexanderstreet.com/about/index.htm</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support Desk</GivenName>
-    <EmailAddress>mailto:support@alexanderstreet.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Field</SurName>
-    <EmailAddress>mailto:jfield@astreetpress.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.alexanderstreet.com.xml b/swamid-interfederations-2.0/shib.alexanderstreet.com.xml
deleted file mode 100644
index 8736e529..00000000
--- a/swamid-interfederations-2.0/shib.alexanderstreet.com.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.alexanderstreet.com/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib.alexanderstreet.com/Shibboleth.sso/WAYF" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.alexanderstreet.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.alexanderstreet.com,O=Alexander Street Press,L=Alexandria,ST=Virginia,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDbjCCAlYCCQDBNjJ+wWhziDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJV
-UzERMA8GA1UECBMIVmlyZ2luaWExEzARBgNVBAcTCkFsZXhhbmRyaWExHzAdBgNV
-BAoTFkFsZXhhbmRlciBTdHJlZXQgUHJlc3MxITAfBgNVBAMTGHNoaWIuYWxleGFu
-ZGVyc3RyZWV0LmNvbTAeFw0xMTEwMjcxMzQ5NDNaFw0xNDEwMjExMzQ5NDNaMHkx
-CzAJBgNVBAYTAlVTMREwDwYDVQQIEwhWaXJnaW5pYTETMBEGA1UEBxMKQWxleGFu
-ZHJpYTEfMB0GA1UEChMWQWxleGFuZGVyIFN0cmVldCBQcmVzczEhMB8GA1UEAxMY
-c2hpYi5hbGV4YW5kZXJzdHJlZXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAm7HquS72lySd0gXBNERWazSe97ShgPJwSldxjqBuQ1BvBRp9kdlC
-oAZcHmlmsleyIFPOvbc+zaZcYprMj8vmwq3aUE8U5bmpo3WFk8DlrFgzPEIFXuHF
-3/On24Id+WSpajoTOMoopw4uDG2FHbpEKnbMB9MAHK0eVVXfnj/PfwjIEZfw5kBg
-3jpJri3fZME7VQFP6pGS1TlEWslw2PcGlhkQjyiHHzZpHMmfwUKm0QzBMY49HecX
-weB8PmIS5Pnrydx3x09/De8GTJn6rGuYhu7aF0GTw9kC0oToJAF8A2xN9vyXcMtx
-baMAro05qxlTIOWC1yNeGk9dfcdcTsFeBQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQBziIy25B83PAlHfpZroG4o6kVdyHKtr26IIb7+8l/5xOg+DZZAqP9KMbScBN1T
-XnKZf7nWfg0CPgrkZFx/M4jCrJgY5eQVlKcxhHGA3b7dXT36DK6gpcxWyB0Hkm1c
-9F++liEzSYao5HItr9epelUvzoQjY/aLT+rGzj0TmufvNxIULojZcWP/CZ1VWVVK
-k4/vgLZs88Ow9eY0GVRAO0g47xPsI4Ozu7HFVZeUsrhouwJKUOdBdHx75mxfoQDP
-68FuNHZ4/rGoVHSJlPjW9zgnNHa3yfGfPN4axlzscowZV/7yGJxeoeBLmicXr+mW
-IeRCblzZC+JMvA/j4d6Mi/s8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.alexanderstreet.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.alexanderstreet.com,O=Alexander Street Press,L=Alexandria,ST=Virginia,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDbjCCAlYCCQDBNjJ+wWhziDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJV
-UzERMA8GA1UECBMIVmlyZ2luaWExEzARBgNVBAcTCkFsZXhhbmRyaWExHzAdBgNV
-BAoTFkFsZXhhbmRlciBTdHJlZXQgUHJlc3MxITAfBgNVBAMTGHNoaWIuYWxleGFu
-ZGVyc3RyZWV0LmNvbTAeFw0xMTEwMjcxMzQ5NDNaFw0xNDEwMjExMzQ5NDNaMHkx
-CzAJBgNVBAYTAlVTMREwDwYDVQQIEwhWaXJnaW5pYTETMBEGA1UEBxMKQWxleGFu
-ZHJpYTEfMB0GA1UEChMWQWxleGFuZGVyIFN0cmVldCBQcmVzczEhMB8GA1UEAxMY
-c2hpYi5hbGV4YW5kZXJzdHJlZXQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAm7HquS72lySd0gXBNERWazSe97ShgPJwSldxjqBuQ1BvBRp9kdlC
-oAZcHmlmsleyIFPOvbc+zaZcYprMj8vmwq3aUE8U5bmpo3WFk8DlrFgzPEIFXuHF
-3/On24Id+WSpajoTOMoopw4uDG2FHbpEKnbMB9MAHK0eVVXfnj/PfwjIEZfw5kBg
-3jpJri3fZME7VQFP6pGS1TlEWslw2PcGlhkQjyiHHzZpHMmfwUKm0QzBMY49HecX
-weB8PmIS5Pnrydx3x09/De8GTJn6rGuYhu7aF0GTw9kC0oToJAF8A2xN9vyXcMtx
-baMAro05qxlTIOWC1yNeGk9dfcdcTsFeBQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQBziIy25B83PAlHfpZroG4o6kVdyHKtr26IIb7+8l/5xOg+DZZAqP9KMbScBN1T
-XnKZf7nWfg0CPgrkZFx/M4jCrJgY5eQVlKcxhHGA3b7dXT36DK6gpcxWyB0Hkm1c
-9F++liEzSYao5HItr9epelUvzoQjY/aLT+rGzj0TmufvNxIULojZcWP/CZ1VWVVK
-k4/vgLZs88Ow9eY0GVRAO0g47xPsI4Ozu7HFVZeUsrhouwJKUOdBdHx75mxfoQDP
-68FuNHZ4/rGoVHSJlPjW9zgnNHa3yfGfPN4axlzscowZV/7yGJxeoeBLmicXr+mW
-IeRCblzZC+JMvA/j4d6Mi/s8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.alexanderstreet.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Alexander Street Press LLC.</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Alexander Street Press LLC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://alexanderstreet.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Nathanel</GivenName>
-    <SurName>Sulimanov</SurName>
-    <EmailAddress>nathanels@astreetpress.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Field</SurName>
-    <EmailAddress>jfield@astreetpress.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.aylesbury.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.aylesbury.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 6727bc8e..00000000
--- a/swamid-interfederations-2.0/shib.aylesbury.ac.uk-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://shib.aylesbury.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Aylesbury College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-27T16:02:15Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">aylesbury.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaDCCAlACCQCoGCOGp22Z0jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
-						QjEYMBYGA1UECBMPQnVja2luZ2hhbXNoaXJlMRIwEAYDVQQHEwlBeWxlc2J1cnkx
-						GjAYBgNVBAoTEUF5bGVzYnVyeSBDb2xsZWdlMR0wGwYDVQQDExRzaGliLmF5bGVz
-						YnVyeS5hYy51azAeFw0xMjAyMjcwOTAxMjBaFw0zMjAyMjIwOTAxMjBaMHYxCzAJ
-						BgNVBAYTAkdCMRgwFgYDVQQIEw9CdWNraW5naGFtc2hpcmUxEjAQBgNVBAcTCUF5
-						bGVzYnVyeTEaMBgGA1UEChMRQXlsZXNidXJ5IENvbGxlZ2UxHTAbBgNVBAMTFHNo
-						aWIuYXlsZXNidXJ5LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAxNalaxRpBTFege7acqsKBZ6UUTfpWmEDY71s+eLUBDmEluiHkpM00EKjlB/3
-						4AGsYB0Il9Rjh35ShhwKC4S+ShzVd8P1zodK8G+UQLtSYhT16Y0Mx1TjUpoIdQLe
-						wcDZfk67VTOIT4IoDKcAxTuWFaZS/DtZdplYTcXnMf/BMCUaJ6CyLpt9QhHXUSP4
-						E7XaxQqRCCIVReIlwDEO7z5luyanVvm2GwDTyvuzN9jVt/hggpRUhe9DVaCrG+SG
-						DwaYh5rcs1IDPQgoxAJVGLvmkNZVnp4oeLqiAgEOPMdGboHbzgDejdGwBGrtEyOi
-						d0NzpBIgNQab0MfW7G3h+dvIpwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA1NJJY
-						sMnElc1qAHTTvgfFgP6NqtdWzPBMYnDy7++/p+cd2MVTNdY0PK4SaAVCZkv6oK86
-						swsd1XGJeCu6OuYRtBaqIhgwuxVQHO+XhG14OCtm6myaEkY5Fm6HJeBUUUfRtOI6
-						Ecw57bA/W1K1Y1G9nyNAGjl59JeK9K8aqk0lA7UtzdIs6OIsMGuyNSL99uxrFNA9
-						yHCtpXTRm06+mB1rtoTe/kVGes5CR782wPoGcmw0Phekn6yPV+dr4bwMViIfLx14
-						DsCMKW23XoT1PDhMDTN6TTAp2sppMU6xnDTX7rMe4dxWMUwvCn8Yhsp1T8KdmLYf
-						PclJOZZKA2T28cz9
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.aylesbury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.aylesbury.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://shib.aylesbury.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.aylesbury.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.aylesbury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.aylesbury.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">aylesbury.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaDCCAlACCQCoGCOGp22Z0jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
-						QjEYMBYGA1UECBMPQnVja2luZ2hhbXNoaXJlMRIwEAYDVQQHEwlBeWxlc2J1cnkx
-						GjAYBgNVBAoTEUF5bGVzYnVyeSBDb2xsZWdlMR0wGwYDVQQDExRzaGliLmF5bGVz
-						YnVyeS5hYy51azAeFw0xMjAyMjcwOTAxMjBaFw0zMjAyMjIwOTAxMjBaMHYxCzAJ
-						BgNVBAYTAkdCMRgwFgYDVQQIEw9CdWNraW5naGFtc2hpcmUxEjAQBgNVBAcTCUF5
-						bGVzYnVyeTEaMBgGA1UEChMRQXlsZXNidXJ5IENvbGxlZ2UxHTAbBgNVBAMTFHNo
-						aWIuYXlsZXNidXJ5LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAxNalaxRpBTFege7acqsKBZ6UUTfpWmEDY71s+eLUBDmEluiHkpM00EKjlB/3
-						4AGsYB0Il9Rjh35ShhwKC4S+ShzVd8P1zodK8G+UQLtSYhT16Y0Mx1TjUpoIdQLe
-						wcDZfk67VTOIT4IoDKcAxTuWFaZS/DtZdplYTcXnMf/BMCUaJ6CyLpt9QhHXUSP4
-						E7XaxQqRCCIVReIlwDEO7z5luyanVvm2GwDTyvuzN9jVt/hggpRUhe9DVaCrG+SG
-						DwaYh5rcs1IDPQgoxAJVGLvmkNZVnp4oeLqiAgEOPMdGboHbzgDejdGwBGrtEyOi
-						d0NzpBIgNQab0MfW7G3h+dvIpwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA1NJJY
-						sMnElc1qAHTTvgfFgP6NqtdWzPBMYnDy7++/p+cd2MVTNdY0PK4SaAVCZkv6oK86
-						swsd1XGJeCu6OuYRtBaqIhgwuxVQHO+XhG14OCtm6myaEkY5Fm6HJeBUUUfRtOI6
-						Ecw57bA/W1K1Y1G9nyNAGjl59JeK9K8aqk0lA7UtzdIs6OIsMGuyNSL99uxrFNA9
-						yHCtpXTRm06+mB1rtoTe/kVGes5CR782wPoGcmw0Phekn6yPV+dr4bwMViIfLx14
-						DsCMKW23XoT1PDhMDTN6TTAp2sppMU6xnDTX7rMe4dxWMUwvCn8Yhsp1T8KdmLYf
-						PclJOZZKA2T28cz9
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.aylesbury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.aylesbury.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">Aylesbury College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aylesbury College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aylesbury.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Overt Support</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Humphries</SurName>
-    <EmailAddress>mailto:mhumphries@aylesbury.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.blackpool.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.blackpool.ac.uk-shibboleth.xml
deleted file mode 100644
index 7877a765..00000000
--- a/swamid-interfederations-2.0/shib.blackpool.ac.uk-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://shib.blackpool.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Blackpool and The Fylde College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T10:25:30Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">blackpool.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Blackpool and The Fylde College</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://shib.blackpool.ac.uk/gif/BFC-Logo-80x60.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shib.blackpool.ac.uk/gif/BFC-Logo-16x16.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.63.160.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.161.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.162.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.163.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.164.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.165.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.166.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.167.0/24</mdui:IPHint>
-        <mdui:DomainHint>blackpool.ac.uk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEHDCCAwSgAwIBAgIJAOAT321OtbqJMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29s
-						MSgwJgYDVQQKEx9CbGFja3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYD
-						VQQLEwRMSVRTMR0wGwYDVQQDExRzaGliLmJsYWNrcG9vbC5hYy51azAeFw0xMjA2
-						MDExNDEzMTVaFw0yMjA1MzAxNDEzMTVaMIGOMQswCQYDVQQGEwJHQjETMBEGA1UE
-						CBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29sMSgwJgYDVQQKEx9CbGFj
-						a3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYDVQQLEwRMSVRTMR0wGwYD
-						VQQDExRzaGliLmJsYWNrcG9vbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAOZi4DacZbrXsVBpgZiW5dr3SG2U/yd3zNYWONklw89gYavq7S+w
-						3oRmBvzz+9oPLS5h40CGY5xkvly2KeT1f9XN+ndeM8NmhwT97WIA4H/TwQgOIwDD
-						NtR7hGpIalhT0poHJizomHB7G/DOL00RZSkX/GKb4KIIdyEVN9WLqQ7xNGQh8m90
-						T2bTCtqSVZgByrz48kOrYRexDogrmZHHPfw90DZjNt8p8OfhJ3VLuxMMN8QI2kg2
-						BQCc4MVWYTkSiryqzZBwePz2KdVAY8kXTVZ5mu/a5ACNdzGKNdqlvqwdht9LGu3m
-						aY8bFax0DbjQwyyY77NPKoB3n+qhtDmIfScCAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFO/ZdgkN54wOyABu+OjzGMF7wVXeMB8GA1UdIwQYMBaAFO/ZdgkN54wO
-						yABu+OjzGMF7wVXeMA0GCSqGSIb3DQEBBQUAA4IBAQB2x0UZ97nn/MeHMOjOT3ze
-						b8qzdKk1Wz4pFmz1vrUue9YJYFwemFkg54oooqwt2GBFRbBHEHc858XQWvSo0zhv
-						LN6Qo+f9BhwH4hMy8Q76WG8nYZ12zUv/7gBisXfmQh9iPZ51cMPzhwplLocQN9hz
-						m9JVeMFR9C7q/qrL35H+Rq75FpUxX7y9ndVIdrGjyjAvTHZUuu8F92YE5PeFtfSD
-						uSVAFkSET1uR2S8RieT8+j5VkE4sXl13Ah0oLDU8WVUhoxAPX25urwsPYQjbaAhF
-						PowqpyHvz1/+EN+tCkdVCNBO/4Oaz1hfGLKwM6Yu16b+OmiQfsAx+w6cMd0R8wtS
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.blackpool.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.blackpool.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.blackpool.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.blackpool.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.blackpool.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.blackpool.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">blackpool.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEHDCCAwSgAwIBAgIJAOAT321OtbqJMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29s
-						MSgwJgYDVQQKEx9CbGFja3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYD
-						VQQLEwRMSVRTMR0wGwYDVQQDExRzaGliLmJsYWNrcG9vbC5hYy51azAeFw0xMjA2
-						MDExNDEzMTVaFw0yMjA1MzAxNDEzMTVaMIGOMQswCQYDVQQGEwJHQjETMBEGA1UE
-						CBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29sMSgwJgYDVQQKEx9CbGFj
-						a3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYDVQQLEwRMSVRTMR0wGwYD
-						VQQDExRzaGliLmJsYWNrcG9vbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAOZi4DacZbrXsVBpgZiW5dr3SG2U/yd3zNYWONklw89gYavq7S+w
-						3oRmBvzz+9oPLS5h40CGY5xkvly2KeT1f9XN+ndeM8NmhwT97WIA4H/TwQgOIwDD
-						NtR7hGpIalhT0poHJizomHB7G/DOL00RZSkX/GKb4KIIdyEVN9WLqQ7xNGQh8m90
-						T2bTCtqSVZgByrz48kOrYRexDogrmZHHPfw90DZjNt8p8OfhJ3VLuxMMN8QI2kg2
-						BQCc4MVWYTkSiryqzZBwePz2KdVAY8kXTVZ5mu/a5ACNdzGKNdqlvqwdht9LGu3m
-						aY8bFax0DbjQwyyY77NPKoB3n+qhtDmIfScCAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFO/ZdgkN54wOyABu+OjzGMF7wVXeMB8GA1UdIwQYMBaAFO/ZdgkN54wO
-						yABu+OjzGMF7wVXeMA0GCSqGSIb3DQEBBQUAA4IBAQB2x0UZ97nn/MeHMOjOT3ze
-						b8qzdKk1Wz4pFmz1vrUue9YJYFwemFkg54oooqwt2GBFRbBHEHc858XQWvSo0zhv
-						LN6Qo+f9BhwH4hMy8Q76WG8nYZ12zUv/7gBisXfmQh9iPZ51cMPzhwplLocQN9hz
-						m9JVeMFR9C7q/qrL35H+Rq75FpUxX7y9ndVIdrGjyjAvTHZUuu8F92YE5PeFtfSD
-						uSVAFkSET1uR2S8RieT8+j5VkE4sXl13Ah0oLDU8WVUhoxAPX25urwsPYQjbaAhF
-						PowqpyHvz1/+EN+tCkdVCNBO/4Oaz1hfGLKwM6Yu16b+OmiQfsAx+w6cMd0R8wtS
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.blackpool.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.blackpool.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">Blackpool and The Fylde College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Blackpool and The Fylde College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.blackpool.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@blackpool.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical support</GivenName>
-    <EmailAddress>mailto:shib-tech@blackpool.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index c786e3cd..00000000
--- a/swamid-interfederations-2.0/shib.bsdc.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.bsdc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Burton and South Derbyshire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T09:42: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 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">bsdc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUN8y30toYLjtWupKH7DVDzwSSKuswDQYJKoZIhvcNAQEL
-						BQAwGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMB4XDTE1MDcyMjExMDkwMVoX
-						DTM1MDcyMjExMDkwMVowGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7cEKQ9U09f5UJt9PYlw4z+Cw/fuy
-						1N+4xPkfibEj/EWCUMJ/dyqtkhmmsId8GdUzPJOXgE37oMJP4BYjKGJHcGz9Q2DP
-						EgSDPBVBexlQKyuIjVllaB0yCGPDekKL5PWXFbp6OVEPN+YNVEyJE6wQcqFK92Ml
-						QnywsKIEC6vsAeZzBRxYnUIioL6gMKgYynuKBfPo+uylPsakFQoKF5aiqH/fdIHL
-						MO17BiDQGfWyslSgDbL1YQqONvw/NtVjpLjWjnYw3SdmyvOM8CnDZFWwDOi3MWAR
-						dSrtdPVICwRIFUk0/t30pCoebJmXMEtiG3QmeC6dBRchcr/4mkX4QQaUpQIDAQAB
-						o2UwYzAdBgNVHQ4EFgQUVLuuZKNnpMw5MMO4MsJzkeDW9SQwQgYDVR0RBDswOYIP
-						c2hpYi5ic2RjLmFjLnVrhiZodHRwczovL3NoaWIuYnNkYy5hYy51ay9pZHAvc2hp
-						YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAV5Z154bfv7fMTvjs+mIXf62g/znr
-						JpCulJmY0ckkYsm6qpAp7jRaW3g8ZIqtwcrPWbflLdlJduFeXt3iHQzNKelCuTVQ
-						zaT1uku34qLw5n8dlLSJCAYTJ3k8DP9paZAHWQutdRtfp8T52KCNEvQfaQRbMc1s
-						7xBcuyaHZp371OfoieJEpzgYkR0ZgCI5GNBBjmXMEvZT5YcClmv/X80/oLIokKWT
-						ahWWCR4DULcp+U1czGshTbCTSosxDbJSxeiqVhaBKnmzPBtc4jXuejjCfZ/cW63A
-						87436RAvjG0udEJ+1t5U5y+N8oPQC61crI39fcviBBGvdg82Y4mmCY+yxw==
-					</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+gAwIBAgIUTbwjzHy1V/QauduA1UWBe4i3xUwwDQYJKoZIhvcNAQEL
-						BQAwGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMB4XDTE1MDcyMjExMDkwMFoX
-						DTM1MDcyMjExMDkwMFowGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIEvn9RF5E6Oae2UsQZx/wyV4taa
-						1LyvNNew/XYBVzULQqETqNxCMDyKVhj74s6b6Kl0rim9y4ACSOTU/rGtYbg+WnFP
-						b6iRQnm0+hH/PJxlulPmp+ExqO+LUblY8+5/iohek7ybhpv5ysebuZbWlEJRutKK
-						AX5N4wLKNKjwXI9B2iZ9IBNfqPrsNLFs7cr3/C2le318BbKK2x37eGSqx/1VgHt6
-						JqCzZty6Y2EXRiVqktNOnPQKTrU6ycxmAhydZKVVpcOQ7MxlzbawV6Lq8xg3a1yP
-						DS533vVEAWhatvqvwk6GPhfZpF62r4uFe121gV+fMWPU2U3Kmz5730ZDgQIDAQAB
-						o2UwYzAdBgNVHQ4EFgQUvBymfqNxuuhIloDW66n/XjoR8ZIwQgYDVR0RBDswOYIP
-						c2hpYi5ic2RjLmFjLnVrhiZodHRwczovL3NoaWIuYnNkYy5hYy51ay9pZHAvc2hp
-						YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlGqFXhgYDq2lmraBfGT7hXai/+kX
-						UUnYoAx6rn0g4HXuRGLN5sdQdyjUDenHZBdUkB7iiUTKjYDIaDfFCqf7BhyTZVVp
-						AufFQSZkGobPNF7ryr13Nz1fxYChjg85MSfdLrHy5KzDZHGkbdK6OqJK1GQQmjg7
-						Etkz0PrgplwJvWoY1fwQOT2vZLYN1ZPFbxM40Q9p6cJ3TQze8FCaSeCu1gIcHlZD
-						/v833iBKd3o2FdR4hoajUlNy5qida3w+5tgQjCkIg5Uv34TZekf9KpbJeo9aC7rs
-						Js7zvcVri+nme42f+NejEW+w6qOYYYZVUT09NhIEKgqUrBJuF7KVi1ELlw==
-					</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>
-						MIIDKDCCAhCgAwIBAgIVAI7EL52ouKYn3I0Z+dRy2QFDx5jFMA0GCSqGSIb3DQEB
-						CwUAMBoxGDAWBgNVBAMMD3NoaWIuYnNkYy5hYy51azAeFw0xNTA3MjIxMTA5MDFa
-						Fw0zNTA3MjIxMTA5MDFaMBoxGDAWBgNVBAMMD3NoaWIuYnNkYy5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLucDSwLRP0IcDwnEEKCZm0SKtY
-						aOtwm6vsDDh00gJb9kYVEAY3jB0tQ1TJelP1Um+IhNVpqR6vj0wNy6TQmzC7CThZ
-						T4Ivzj5/EpVXG1J8Cee5ZHXIgy8wd9JlSsJdKEXajnvLw0y979rSfFrypH6bt9D+
-						M1gZcqJJ49W/nmVFO6KSMKg1aMLFXEW9gs0/FJ7KKHZc0zApbMjf7JPKcJLqcWkx
-						tsS1knn3IXVgCqKa8C3abRXDFm5HCjXl5W3GRUsjMtfhj0SbR2zXObW4TfCGzwjP
-						PsCB+tcJfC6ATPo6KW365qihXUdXLkwD6kDik0P7ROpIIQk/p2yPJW2gx4ECAwEA
-						AaNlMGMwHQYDVR0OBBYEFKDiJVWfMtW+Wm3pSXbjxc0cpZBtMEIGA1UdEQQ7MDmC
-						D3NoaWIuYnNkYy5hYy51a4YmaHR0cHM6Ly9zaGliLmJzZGMuYWMudWsvaWRwL3No
-						aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAEdI61HWJApulHacwluKOoreXtFZ
-						r3q7sqANksGdQGMpMqsI++fR8CHFcYj1LaiHM+R/paLIbZNVRBle5RdEaVGd7kqM
-						Y1LudYKFAF+Og9KEoPhLw4Z+uaQywMa5kcX3SA1hxVppAF4/Xgy5HX8BEifUAXcr
-						4pm7fJp/FFyAvhlqHxZBI/etUPJ34rhbg6zxP/RPgrvxh+WnQo7sFaiy14gd2U43
-						Oybgnnk8z9+xVZrJPihLdrcLVLfqW88KZOWKk6f7UuRMLiuA/PI2Fm15KOjxldT8
-						dMcsID2b60k2kzoN1u1QOsCwZv0CkOcRz+sjVix5YBsiAdkDOn3vXkSk4KE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bsdc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.bsdc.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://shib.bsdc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.bsdc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.bsdc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.bsdc.ac.uk/idp/profile/SAML2/Redirect/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">bsdc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUN8y30toYLjtWupKH7DVDzwSSKuswDQYJKoZIhvcNAQEL
-						BQAwGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMB4XDTE1MDcyMjExMDkwMVoX
-						DTM1MDcyMjExMDkwMVowGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7cEKQ9U09f5UJt9PYlw4z+Cw/fuy
-						1N+4xPkfibEj/EWCUMJ/dyqtkhmmsId8GdUzPJOXgE37oMJP4BYjKGJHcGz9Q2DP
-						EgSDPBVBexlQKyuIjVllaB0yCGPDekKL5PWXFbp6OVEPN+YNVEyJE6wQcqFK92Ml
-						QnywsKIEC6vsAeZzBRxYnUIioL6gMKgYynuKBfPo+uylPsakFQoKF5aiqH/fdIHL
-						MO17BiDQGfWyslSgDbL1YQqONvw/NtVjpLjWjnYw3SdmyvOM8CnDZFWwDOi3MWAR
-						dSrtdPVICwRIFUk0/t30pCoebJmXMEtiG3QmeC6dBRchcr/4mkX4QQaUpQIDAQAB
-						o2UwYzAdBgNVHQ4EFgQUVLuuZKNnpMw5MMO4MsJzkeDW9SQwQgYDVR0RBDswOYIP
-						c2hpYi5ic2RjLmFjLnVrhiZodHRwczovL3NoaWIuYnNkYy5hYy51ay9pZHAvc2hp
-						YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAV5Z154bfv7fMTvjs+mIXf62g/znr
-						JpCulJmY0ckkYsm6qpAp7jRaW3g8ZIqtwcrPWbflLdlJduFeXt3iHQzNKelCuTVQ
-						zaT1uku34qLw5n8dlLSJCAYTJ3k8DP9paZAHWQutdRtfp8T52KCNEvQfaQRbMc1s
-						7xBcuyaHZp371OfoieJEpzgYkR0ZgCI5GNBBjmXMEvZT5YcClmv/X80/oLIokKWT
-						ahWWCR4DULcp+U1czGshTbCTSosxDbJSxeiqVhaBKnmzPBtc4jXuejjCfZ/cW63A
-						87436RAvjG0udEJ+1t5U5y+N8oPQC61crI39fcviBBGvdg82Y4mmCY+yxw==
-					</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+gAwIBAgIUTbwjzHy1V/QauduA1UWBe4i3xUwwDQYJKoZIhvcNAQEL
-						BQAwGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMB4XDTE1MDcyMjExMDkwMFoX
-						DTM1MDcyMjExMDkwMFowGjEYMBYGA1UEAwwPc2hpYi5ic2RjLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIEvn9RF5E6Oae2UsQZx/wyV4taa
-						1LyvNNew/XYBVzULQqETqNxCMDyKVhj74s6b6Kl0rim9y4ACSOTU/rGtYbg+WnFP
-						b6iRQnm0+hH/PJxlulPmp+ExqO+LUblY8+5/iohek7ybhpv5ysebuZbWlEJRutKK
-						AX5N4wLKNKjwXI9B2iZ9IBNfqPrsNLFs7cr3/C2le318BbKK2x37eGSqx/1VgHt6
-						JqCzZty6Y2EXRiVqktNOnPQKTrU6ycxmAhydZKVVpcOQ7MxlzbawV6Lq8xg3a1yP
-						DS533vVEAWhatvqvwk6GPhfZpF62r4uFe121gV+fMWPU2U3Kmz5730ZDgQIDAQAB
-						o2UwYzAdBgNVHQ4EFgQUvBymfqNxuuhIloDW66n/XjoR8ZIwQgYDVR0RBDswOYIP
-						c2hpYi5ic2RjLmFjLnVrhiZodHRwczovL3NoaWIuYnNkYy5hYy51ay9pZHAvc2hp
-						YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAlGqFXhgYDq2lmraBfGT7hXai/+kX
-						UUnYoAx6rn0g4HXuRGLN5sdQdyjUDenHZBdUkB7iiUTKjYDIaDfFCqf7BhyTZVVp
-						AufFQSZkGobPNF7ryr13Nz1fxYChjg85MSfdLrHy5KzDZHGkbdK6OqJK1GQQmjg7
-						Etkz0PrgplwJvWoY1fwQOT2vZLYN1ZPFbxM40Q9p6cJ3TQze8FCaSeCu1gIcHlZD
-						/v833iBKd3o2FdR4hoajUlNy5qida3w+5tgQjCkIg5Uv34TZekf9KpbJeo9aC7rs
-						Js7zvcVri+nme42f+NejEW+w6qOYYYZVUT09NhIEKgqUrBJuF7KVi1ELlw==
-					</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>
-						MIIDKDCCAhCgAwIBAgIVAI7EL52ouKYn3I0Z+dRy2QFDx5jFMA0GCSqGSIb3DQEB
-						CwUAMBoxGDAWBgNVBAMMD3NoaWIuYnNkYy5hYy51azAeFw0xNTA3MjIxMTA5MDFa
-						Fw0zNTA3MjIxMTA5MDFaMBoxGDAWBgNVBAMMD3NoaWIuYnNkYy5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJLucDSwLRP0IcDwnEEKCZm0SKtY
-						aOtwm6vsDDh00gJb9kYVEAY3jB0tQ1TJelP1Um+IhNVpqR6vj0wNy6TQmzC7CThZ
-						T4Ivzj5/EpVXG1J8Cee5ZHXIgy8wd9JlSsJdKEXajnvLw0y979rSfFrypH6bt9D+
-						M1gZcqJJ49W/nmVFO6KSMKg1aMLFXEW9gs0/FJ7KKHZc0zApbMjf7JPKcJLqcWkx
-						tsS1knn3IXVgCqKa8C3abRXDFm5HCjXl5W3GRUsjMtfhj0SbR2zXObW4TfCGzwjP
-						PsCB+tcJfC6ATPo6KW365qihXUdXLkwD6kDik0P7ROpIIQk/p2yPJW2gx4ECAwEA
-						AaNlMGMwHQYDVR0OBBYEFKDiJVWfMtW+Wm3pSXbjxc0cpZBtMEIGA1UdEQQ7MDmC
-						D3NoaWIuYnNkYy5hYy51a4YmaHR0cHM6Ly9zaGliLmJzZGMuYWMudWsvaWRwL3No
-						aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAEdI61HWJApulHacwluKOoreXtFZ
-						r3q7sqANksGdQGMpMqsI++fR8CHFcYj1LaiHM+R/paLIbZNVRBle5RdEaVGd7kqM
-						Y1LudYKFAF+Og9KEoPhLw4Z+uaQywMa5kcX3SA1hxVppAF4/Xgy5HX8BEifUAXcr
-						4pm7fJp/FFyAvhlqHxZBI/etUPJ34rhbg6zxP/RPgrvxh+WnQo7sFaiy14gd2U43
-						Oybgnnk8z9+xVZrJPihLdrcLVLfqW88KZOWKk6f7UuRMLiuA/PI2Fm15KOjxldT8
-						dMcsID2b60k2kzoN1u1QOsCwZv0CkOcRz+sjVix5YBsiAdkDOn3vXkSk4KE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bsdc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Burton and South Derbyshire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Burton and South Derbyshire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.bsdc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@bsdc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alan</GivenName>
-    <SurName>Coats</SurName>
-    <EmailAddress>mailto:alan.coats@bsdc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@bsdc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.bu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.bu.edu-idp-shibboleth.xml
deleted file mode 100644
index 70ee2748..00000000
--- a/swamid-interfederations-2.0/shib.bu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,63 +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://shib.bu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">bu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Boston University</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>
-MIIDFzCCAf+gAwIBAgIUe//QyolSjXGskJVe42L94YYJ7rswDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLc2hpYi5idS5lZHUwHhcNMTEwNjIxMTYwMTQ5WhcNMzEw
-NjIxMTYwMTQ5WjAWMRQwEgYDVQQDEwtzaGliLmJ1LmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAJMwoK7RFLBGDxf9l3FSw+KPpjXTDFc7gPrEqNFi
-9dSgn7MSLBUoXRDkDquuVUgXPwZsaoKdkS2U7SelLJlUgn+/n3BuTI3o4el7k+5p
-o14VxS3XLADqKlNcQ5O7EP5fhOpx6WIbEWl25I3urDD7Q73cEOskzW9i/Du+xxs2
-S+s8xLalhhHmsmNUS1646CisfLU7+07VnwfN9uQqWoPu16aBqqRklAHHvXmZXV03
-zKNJuwTQWkLZ2q1Zv8i+S4O/viZylTvqR1AgtEfNv6MXST6v/4g1Ymq0atckPCsc
-x2hmOQo4zuDua42lvKyYh1enVviu6okydt/0vL1jtnGA/EkCAwEAAaNdMFswOgYD
-VR0RBDMwMYILc2hpYi5idS5lZHWGImh0dHBzOi8vc2hpYi5idS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFAeldMor+2SpjIAE1QpLTkcGsHKcMA0GCSqGSIb3
-DQEBBQUAA4IBAQBOBkJybdEPPbufV795YrqaCAblz3nBZK4MhA6FrRc6hAuia9EB
-9qi0v/TgPFfJ1NpAk4DnRFgmhN4rE7yEFQNeF/6QKf6EknfOYO48J1yMe0gT0aoM
-edMjBzWMvyKaCOJbXcEYcgCKgL0lZ0r8Tiv94Zn9DEvYvox33742MAAImQQQ8FdK
-N5TIK/J7ALA8/xVFgo6XluioA6DYDq7CrJUPrc6LEDApexF5i7pyns7FV+d3EzlF
-TazioztaYa7yyphC1XgYol9So698mI3wfTQz9QEA6E9iuayzj+kJU7QAQ5pdA19w
-5cQaCFdIkECu3Ruv8jGs5oF5Zo37L1gK2j11
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.bu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.bu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.bu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Boston University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Boston University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>BU IT Help Center</md:GivenName>
-    <md:EmailAddress>ithelp@bu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>BU IT Help Center</md:GivenName>
-    <md:EmailAddress>ithelp@bu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
deleted file mode 100644
index d0ba98db..00000000
--- a/swamid-interfederations-2.0/shib.bucknell.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://shib.bucknell.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">bucknell.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Bucknell University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Bucknell University, founded in 1846, combines the personal liberal arts experience with first-class research facilities, global study opportunities and 110 fields of study.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.bucknell.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.bucknell.edu/documents/lit/policies/InCommonPOP.pdf</mdui:PrivacyStatementURL>
-        <mdui:Logo height="95" width="181" xml:lang="en">https://www.bucknell.edu/images/system/bucknell_logo.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>
-MIIDMDCCAhigAwIBAgIVAJ0ZQz8YWKCXgcIODVaZZT9umZsiMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNoaWIuYnVja25lbGwuZWR1MB4XDTExMDYyOTIwMDEw
-OVoXDTMxMDYyOTIwMDEwOVowHDEaMBgGA1UEAxMRc2hpYi5idWNrbmVsbC5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSEMDkJDszCZzN4+HOefUK
-wvk32DDcnLRFA2AmHUfEkVkJkqwXvjW5GP4asdA2fsUiG23ioHOhoVsLDIoY+JPf
-wGsA9Oc1Vdfb2GoKWQq8ejasuLqLcrENE7NGdUbhbw4nxnjDfCujfwqjKa76bzgT
-CrkswqCm1C3Dq0tB/Hkz89SqiowJK7y31mvZeEjz1jWarpukg60dCzUeRoBsku/e
-rR+dZW2m9ZUIKVQT09JhLNcBTH67o9XXvJ/HhmFL4aYVru58x9m44LP8awUWmtRf
-K8InTPqTb2mAu5NDAsk78NrwAXvyULdX9zbZ0HapD4DfxKO1S1/9hwT35fw7nGIL
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWIuYnVja25lbGwuZWR1hihodHRwczov
-L3NoaWIuYnVja25lbGwuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQeviuW
-keYLwGxmnTq4kZlO+KBmwjANBgkqhkiG9w0BAQUFAAOCAQEAUZuw/Nea4UB3VPlo
-AVAJ9xbsFMLEEmYP6cYK+6sRHUVYoHQcVD0dCaeeig1XcWgSxsbLQ4dh+o0LDiks
-8ocb45une8j5la91hHa775I2I6yYGKuCF7Xw4hAKMZD13jKGzP+hLu4kywIZr6Hw
-B3j97242eL4uTH80DBuGzoIhhsXVbkMMjwKd+77uTwL81KKvLFNADxfVZHQeG+PQ
-PHxTSHfK3OYwOdHEdEjfPU4QE/bvOgonzZ5V9mHBq9xA1gp/MSM4VAFeCRP87R3n
-IRk0CqcZsAp4GAiJK9lrIAjARM8DcOm2x2qspk9ys25K45yOAxuf3VbNX7E4wYD2
-D0UPBA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bucknell.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.bucknell.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.bucknell.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.bucknell.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.bucknell.edu/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">bucknell.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAJ0ZQz8YWKCXgcIODVaZZT9umZsiMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNoaWIuYnVja25lbGwuZWR1MB4XDTExMDYyOTIwMDEw
-OVoXDTMxMDYyOTIwMDEwOVowHDEaMBgGA1UEAxMRc2hpYi5idWNrbmVsbC5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSEMDkJDszCZzN4+HOefUK
-wvk32DDcnLRFA2AmHUfEkVkJkqwXvjW5GP4asdA2fsUiG23ioHOhoVsLDIoY+JPf
-wGsA9Oc1Vdfb2GoKWQq8ejasuLqLcrENE7NGdUbhbw4nxnjDfCujfwqjKa76bzgT
-CrkswqCm1C3Dq0tB/Hkz89SqiowJK7y31mvZeEjz1jWarpukg60dCzUeRoBsku/e
-rR+dZW2m9ZUIKVQT09JhLNcBTH67o9XXvJ/HhmFL4aYVru58x9m44LP8awUWmtRf
-K8InTPqTb2mAu5NDAsk78NrwAXvyULdX9zbZ0HapD4DfxKO1S1/9hwT35fw7nGIL
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWIuYnVja25lbGwuZWR1hihodHRwczov
-L3NoaWIuYnVja25lbGwuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQeviuW
-keYLwGxmnTq4kZlO+KBmwjANBgkqhkiG9w0BAQUFAAOCAQEAUZuw/Nea4UB3VPlo
-AVAJ9xbsFMLEEmYP6cYK+6sRHUVYoHQcVD0dCaeeig1XcWgSxsbLQ4dh+o0LDiks
-8ocb45une8j5la91hHa775I2I6yYGKuCF7Xw4hAKMZD13jKGzP+hLu4kywIZr6Hw
-B3j97242eL4uTH80DBuGzoIhhsXVbkMMjwKd+77uTwL81KKvLFNADxfVZHQeG+PQ
-PHxTSHfK3OYwOdHEdEjfPU4QE/bvOgonzZ5V9mHBq9xA1gp/MSM4VAFeCRP87R3n
-IRk0CqcZsAp4GAiJK9lrIAjARM8DcOm2x2qspk9ys25K45yOAxuf3VbNX7E4wYD2
-D0UPBA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.bucknell.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.bucknell.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Bucknell University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Bucknell University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bucknell.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Keelan Cleary</md:GivenName>
-    <md:EmailAddress>cleary@bucknell.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michael Dahlberg</md:GivenName>
-    <md:EmailAddress>dahlberg@bucknell.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.byu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.byu.edu-idp-shibboleth.xml
deleted file mode 100644
index 168398ca..00000000
--- a/swamid-interfederations-2.0/shib.byu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,68 +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://shib.byu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">byu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Brigham Young University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Brigham Young University IdP</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>
-MIIDHDCCAgSgAwIBAgIVAMdtkhNUKYuSdtVPTI46fURWKKoyMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNoaWIuYnl1LmVkdTAeFw0xNTAzMjYyMjI0NTdaFw0z
-NTAzMjYyMjI0NTdaMBcxFTATBgNVBAMTDHNoaWIuYnl1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJE7Bi6W9Q828ZLW5wKkU6yvOLy6F+10UB8M
-2nQx8aD/7J3Qd5rhqYpMHxbePXXhjL0IwJvSHeyVkIS9nj09VjRMFDj7Py3PmNUY
-3EqHsQHGYfVP4SrpkImJzBHVDxzTppN2vMg4JdiR1V+tD9wI2aLgpzw60yezfzQt
-5aBxYmKbQo3INNgCMnd2Xhy7y4Kc89L90qEM2dpwzEunkbgTs8HFVK4Xh5H/e6Ht
-5PRG1WxqqHX/hcn2m+bpxjgPav/udwxBs4AwyE1/M+cWiUfQMz9ZcX7PDL3Xa9bk
-FxoyujWjZhfoMrucOI0J/3mr9vCze4dBsYkvI4PVMLmb+5+l8nsCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2hpYi5ieXUuZWR1hiNodHRwczovL3NoaWIuYnl1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1zJQjFI7ZL36TWulgBcYpYSA8cowDQYJ
-KoZIhvcNAQEFBQADggEBADP0+8gGWisnCSl/lRB/uSOffxdWGNp9243q5Q2wF+3f
-AHln1ndFRp9/pTZpTMYuhIfhj3nhBVSfbA82OIn4eq8Rn3iunj0KtxITjmsoUz55
-TwCG5KoQVVooC7SMbOabuYGCt6R/up83BdSCQR3hFraVgbcsiJXeSTYLiuiqtp0S
-CjKIp5uLbOun7i02xqPFWP98i/NYeeelpv8B9rjdPgXSUIoraJU0dmezG3WRVcEx
-geODhddBhA/9t4MPUhxE2NkerjOJ1kxuxzyTBtvo1kS7Hhe+BnwZceEfqZ3Ieb+k
-tAvdjb86Vcp7Qd6mgqHTsmU05bXWB4TCg0JngVfp4bo=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.byu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.byu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Brigham Young University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Brigham Young University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.byu.edu/index.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Doug Walker</md:GivenName>
-    <md:EmailAddress>djw5@byu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dan McNeece</md:GivenName>
-    <md:EmailAddress>dbm8@byu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alex Olson</md:GivenName>
-    <md:EmailAddress>ako@byu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>BYU IAM Team</md:GivenName>
-    <md:EmailAddress>valinda@byu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.calu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.calu.edu-idp-shibboleth.xml
deleted file mode 100644
index 82e554c8..00000000
--- a/swamid-interfederations-2.0/shib.calu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,92 +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://shib.calu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shib.calu.edu/idp/profile/SAML2/POST/SSO" 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">calu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California University of Pennsylvania</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.calu.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.calu.edu/faculty-staff/it-services/policies-guides/index.htm</mdui:PrivacyStatementURL>
-        <mdui:Logo height="72" width="72" xml:lang="en">https://www.calu.edu/_files/images/logo_72red.jpg</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>
-MIIDHzCCAgegAwIBAgIUNTBoyq7vKsfRV+tm+aeq+fVualkwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc2hpYi5jYWx1LmVkdTAeFw0xMzAzMjcyMDMwMzlaFw0z
-MzAzMjcyMDMwMzlaMBgxFjAUBgNVBAMTDXNoaWIuY2FsdS5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCl5TuZ5k1KKCJ6vBK5BCej7zKP0NvbLBvX
-evabOdTtm6D0WprBXOR2qotdykV0I0PBontu/bQabTPzdDgwK1vObx+VXmZClno2
-xZph3zLkd38l5D1L3G+r06QiFyaWCknvqDUFJ0N9ALOCPiuhcDmJTEnk8uz4zyw9
-kGjr0srfuLRAbPoaDW6T+0NAE0OSeWsRMPYJ+1/E3+/bMtmkNtMntvoHjCUqNgeY
-6w18TnRT+1OkVJl9HSmTszRg424an6MFoas5yljtUp2TAoO22ynXCnHyZZJxfmZ9
-EJFJstW8m7z2fnnqTL8ykseTLuhhbjnSGlzJev7zW/ZWqyWt411lAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNoaWIuY2FsdS5lZHWGJGh0dHBzOi8vc2hpYi5jYWx1LmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUg4dHB8uyMBk3FIB4pRG0DYFmbj8w
-DQYJKoZIhvcNAQEFBQADggEBAHYqP1brpyvprXEg8+XatQ1rKH2iwKbUvlGvdciV
-uWjgWRlcOsms7Kk9Y9/MeJd/6Nrb+1ifj3IVHbZzZ3i7FAjQY6UeHgY08FcRIebm
-Vfr3pD31o/35fYNiJKmHAX3qrykm05e2f6kfB1DX08J4iBNK0r3sLcvDAocEDaRl
-XVQ1sD4SrD1zvkgHGNmJdwcAADWt1HV80FZK2ruiaum0vskTIJxQ6BBQKnWPl0xD
-g1Yiin78qAMDA92LfN/ctvj8sFivFbL4FJeH035tl/y7k/rJJVpsDjQIHJDPROCG
-3Jz8+VUS/n8RsCWiCcjLEM+SzCbGXM1Rp9ndtD2CSwKn2dc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.calu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.calu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.calu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.calu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.calu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">calu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUNTBoyq7vKsfRV+tm+aeq+fVualkwDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc2hpYi5jYWx1LmVkdTAeFw0xMzAzMjcyMDMwMzlaFw0z
-MzAzMjcyMDMwMzlaMBgxFjAUBgNVBAMTDXNoaWIuY2FsdS5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCl5TuZ5k1KKCJ6vBK5BCej7zKP0NvbLBvX
-evabOdTtm6D0WprBXOR2qotdykV0I0PBontu/bQabTPzdDgwK1vObx+VXmZClno2
-xZph3zLkd38l5D1L3G+r06QiFyaWCknvqDUFJ0N9ALOCPiuhcDmJTEnk8uz4zyw9
-kGjr0srfuLRAbPoaDW6T+0NAE0OSeWsRMPYJ+1/E3+/bMtmkNtMntvoHjCUqNgeY
-6w18TnRT+1OkVJl9HSmTszRg424an6MFoas5yljtUp2TAoO22ynXCnHyZZJxfmZ9
-EJFJstW8m7z2fnnqTL8ykseTLuhhbjnSGlzJev7zW/ZWqyWt411lAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNoaWIuY2FsdS5lZHWGJGh0dHBzOi8vc2hpYi5jYWx1LmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUg4dHB8uyMBk3FIB4pRG0DYFmbj8w
-DQYJKoZIhvcNAQEFBQADggEBAHYqP1brpyvprXEg8+XatQ1rKH2iwKbUvlGvdciV
-uWjgWRlcOsms7Kk9Y9/MeJd/6Nrb+1ifj3IVHbZzZ3i7FAjQY6UeHgY08FcRIebm
-Vfr3pD31o/35fYNiJKmHAX3qrykm05e2f6kfB1DX08J4iBNK0r3sLcvDAocEDaRl
-XVQ1sD4SrD1zvkgHGNmJdwcAADWt1HV80FZK2ruiaum0vskTIJxQ6BBQKnWPl0xD
-g1Yiin78qAMDA92LfN/ctvj8sFivFbL4FJeH035tl/y7k/rJJVpsDjQIHJDPROCG
-3Jz8+VUS/n8RsCWiCcjLEM+SzCbGXM1Rp9ndtD2CSwKn2dc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.calu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California University of Pennsylvania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California University of Pennsylvania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.calu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Donna Wright</md:GivenName>
-    <md:EmailAddress>utechrequests@calu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ccbcmd.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ccbcmd.edu-idp-shibboleth.xml
deleted file mode 100644
index f8eb467f..00000000
--- a/swamid-interfederations-2.0/shib.ccbcmd.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +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://shib.ccbcmd.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">ccbcmd.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Community College of Baltimore County</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Community College of Baltimore County IdP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ccbcmd.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.ccbcmd.edu/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="74" width="194" xml:lang="en">https://www.ccbcmd.edu/images/templates/logo.gif</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>
-MIIDKDCCAhCgAwIBAgIVAK2wXYHuV+AmoZ5JI4gKKJP/+dP2MA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD3NoaWIuY2NiY21kLmVkdTAeFw0xMzEyMTcxODAxMTZa
-Fw0zMzEyMTcxODAxMTZaMBoxGDAWBgNVBAMTD3NoaWIuY2NiY21kLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKrgSwkIixaOjxOIkckVjW4aGpRj
-v0h5e9kqoN4TDry/8i41NSEI3yDrw6VknERLzMyBK9xIxK1WpuRnHcZA1BEinfbg
-5lsxRTyd4bjubUBkLBXBkyQDjrh+GnX0cNqZQzE/dZdvsZodNKGHv58gP6fzj2Z3
-MDPtJliZirzW4z88TXDqlrtDOyI3LSyCXCyfKITMLl+ouUqtivvN9dgGzF/NvSIL
-8KPzaKAVsmjihyvZ1y0ZT6oONSEdLG4uQAmXSGvXBsgQTdl0baDdBIIJBwGIWHzH
-e6LFVNds0nH7dI3e7j4nqKgXrLA3ENu/OxkznNCaQ0sdHXXWHm6LrTxI0/UCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPc2hpYi5jY2JjbWQuZWR1hiZodHRwczovL3NoaWIu
-Y2NiY21kLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUU9GkEhzzWbXJAFA7
-+JSLBQhmaigwDQYJKoZIhvcNAQEFBQADggEBAHhSUZQg+IrUg+HUcMcmoSUfoHZX
-4ZT72JxrMF4TFx+gxTbS4N26+xWbuf6WMUYDzluGMSu6ykYhNkTIBUvU0u7NEP+X
-9hkhHw7ZUXcnZGOaJ2Xe1WPGgiRR+4MO5F7baWSrkhOtcLuCoPjh/L5zQq/r4KmC
-a3vZNAtqSNh4Z5biYa1QT1Y3GcpxtUHE2NPmtl+K2aV7jcTAiqhvUwz3b+qtIQmd
-zY7Z5MPDyMIkT8vHoulLG+LnJDZaXjq9FKwxn1eekks9+A9r+y0T4HwzZOOzyfS8
-pMKrmA66kUgrP4d284xTvD0qYc3SifZmzNIEaMGhpCL/WW1U5XkNHvKv2qo=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ccbcmd.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ccbcmd.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ccbcmd.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ccbcmd.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ccbcmd.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ccbcmd.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAK2wXYHuV+AmoZ5JI4gKKJP/+dP2MA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD3NoaWIuY2NiY21kLmVkdTAeFw0xMzEyMTcxODAxMTZa
-Fw0zMzEyMTcxODAxMTZaMBoxGDAWBgNVBAMTD3NoaWIuY2NiY21kLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKrgSwkIixaOjxOIkckVjW4aGpRj
-v0h5e9kqoN4TDry/8i41NSEI3yDrw6VknERLzMyBK9xIxK1WpuRnHcZA1BEinfbg
-5lsxRTyd4bjubUBkLBXBkyQDjrh+GnX0cNqZQzE/dZdvsZodNKGHv58gP6fzj2Z3
-MDPtJliZirzW4z88TXDqlrtDOyI3LSyCXCyfKITMLl+ouUqtivvN9dgGzF/NvSIL
-8KPzaKAVsmjihyvZ1y0ZT6oONSEdLG4uQAmXSGvXBsgQTdl0baDdBIIJBwGIWHzH
-e6LFVNds0nH7dI3e7j4nqKgXrLA3ENu/OxkznNCaQ0sdHXXWHm6LrTxI0/UCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPc2hpYi5jY2JjbWQuZWR1hiZodHRwczovL3NoaWIu
-Y2NiY21kLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUU9GkEhzzWbXJAFA7
-+JSLBQhmaigwDQYJKoZIhvcNAQEFBQADggEBAHhSUZQg+IrUg+HUcMcmoSUfoHZX
-4ZT72JxrMF4TFx+gxTbS4N26+xWbuf6WMUYDzluGMSu6ykYhNkTIBUvU0u7NEP+X
-9hkhHw7ZUXcnZGOaJ2Xe1WPGgiRR+4MO5F7baWSrkhOtcLuCoPjh/L5zQq/r4KmC
-a3vZNAtqSNh4Z5biYa1QT1Y3GcpxtUHE2NPmtl+K2aV7jcTAiqhvUwz3b+qtIQmd
-zY7Z5MPDyMIkT8vHoulLG+LnJDZaXjq9FKwxn1eekks9+A9r+y0T4HwzZOOzyfS8
-pMKrmA66kUgrP4d284xTvD0qYc3SifZmzNIEaMGhpCL/WW1U5XkNHvKv2qo=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ccbcmd.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Community College of Baltimore County</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Community College of Baltimore County</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ccbcmd.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ben Thompson</md:GivenName>
-    <md:EmailAddress>bthompson@ccbcmd.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Desra Dickerson</md:GivenName>
-    <md:EmailAddress>systemsengineering@ccbcmd.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>System Engineering</md:GivenName>
-    <md:EmailAddress>systemsengineering@ccbcmd.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f8e94f13..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.comune.trieste.it/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</md:ServiceName>
-      <md:ServiceName xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Municipality of Trieste</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Comune di Trieste</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">TriesteFreeSpoTS provided by Municipality of Trieste</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Servizio TriesteFreeSpoTS erogato da Comune di Trieste</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.retecivica.trieste.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.retecivica.trieste.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:triestefreespots@comune.trieste.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 c4d9b76c..00000000
--- a/swamid-interfederations-2.0/shib.comune.trieste.it.xml
+++ /dev/null
@@ -1,111 +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://shib.comune.trieste.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="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>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">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 than 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/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.retecivica.trieste.it/triestefreespots/it/</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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://shib.comune.trieste.it/shibboleth</ds:KeyName>
-        <ds:KeyName>shib.comune.trieste.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.comune.trieste.it</ds:X509SubjectName>
-          <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>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://shib.comune.trieste.it/shibboleth</ds:KeyName>
-        <ds:KeyName>shib.comune.trieste.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.comune.trieste.it</ds:X509SubjectName>
-          <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</md:ServiceName>
-      <md:ServiceName xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Municipality of Trieste</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Comune di Trieste</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">TriesteFreeSpoTS provided by Municipality of Trieste</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Servizio TriesteFreeSpoTS erogato da Comune di Trieste</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.retecivica.trieste.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.retecivica.trieste.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>triestefreespots@comune.trieste.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.csub.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.csub.edu-idp-shibboleth.xml
deleted file mode 100644
index 830b90fb..00000000
--- a/swamid-interfederations-2.0/shib.csub.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,169 +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://shib.csub.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">csub.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Bakersfield</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>
-MIIFxTCCBK2gAwIBAgIQPc05I8UKJsaaDlPUHfscQzANBgkqhkiG9w0BAQUFADCB
-iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTEw
-MTIwMzAwMDAwMFoXDTExMTIwMzIzNTk1OVowgeMxCzAJBgNVBAYTAlVTMRMwEQYD
-VQQREwo5MzMxMS0xMDIyMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLQmFrZXJzZmll
-bGQxHDAaBgNVBAkTEzkwMDEgU3RvY2tmaWVsZCBId3kxMTAvBgNVBAoTKENhbGlm
-b3JuaWEgU3RhdGUgVW5pdmVyc2l0eSwgQmFrZXJzZmllbGQxDDAKBgNVBAsTA0lU
-UzEgMB4GA1UECxMXQ29tb2RvIE11bHRpLURvbWFpbiBTU0wxGzAZBgNVBAMTEmlk
-cDAuc2hpYi5jc3ViLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AL/HZKeM0Qvx2uKJD6Gtp4yw7B8WAAANMFOTT9I37tU24Bopb5XMC9kLskfvo3/B
-tgK4hfLTomHCtpUbQ9BaO6VSOGo7+8WaLRvPiBjwROfPML7vuf6nY7+j7VxsvXim
-dD/irAv+F3yLJv8sx/wHm9g30fxlc/3fUzpthatHKlIMFPOnwwCKS6ZMuGPZJO+A
-yDk6HJPLK+kEiZDutI0vlAUaKYL/J1clbCpZ5n0CDYy6dQVLQTZY8gn6tW4AcBSY
-g5yPbU5Q3mYSgr5JsCt8xdGcp+ujDceRGYdFmHtHiUGo6QR8UK74KCsiojyB/dl/
-iXzp6GDZzoL9bx+75P9LhX0CAwEAAaOCAcswggHHMB8GA1UdIwQYMBaAFD/VtdDW
-RHlQShejm4xK3LiwImRrMB0GA1UdDgQWBBRAziDZJaj+HbwF8pSLF2l1nf4MLTAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwRgYDVR0gBD8wPTA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEF
-BQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwTwYDVR0fBEgwRjBE
-oEKgQIY+aHR0cDovL2NybC5jb21vZG9jYS5jb20vQ09NT0RPSGlnaC1Bc3N1cmFu
-Y2VTZWN1cmVTZXJ2ZXJDQS5jcmwwgYAGCCsGAQUFBwEBBHQwcjBKBggrBgEFBQcw
-AoY+aHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPSGlnaC1Bc3N1cmFuY2VT
-ZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9k
-b2NhLmNvbTAsBgNVHREEJTAjghJpZHAwLnNoaWIuY3N1Yi5lZHWCDXNoaWIuY3N1
-Yi5lZHUwDQYJKoZIhvcNAQEFBQADggEBAB+4/dnbNTB1MBfjj43ltyzTVBUa2V7B
-SZc5CoZNdsNrXEAyFGxR6MJWfqz0WyNYtEyj66MrJKGFvxaEhcvhBbQFkymfZOGG
-j82KRyAEk4BfyJl+0B1w1jcVQp0EyWT45B3mXhDNdEW4MC83QHdcrk75TEFaUR7f
-Cuph5aZTUR+pAj4g+ks54l5X6Q0hj6VBKInLv7DwXcwizR56O3e/fV6E49qNm2YF
-4tYQJZJ8/YKA8V2GzKr2k64ZpHIBYg3k3XLEJ6mSpP2XWYc5Lkx0VgTk9PiSPrzz
-QF+Q3+1t51b68ryVpJeqcC9J/6pKQDd18xvgtLXJFKoIzs68rKYsUfA=
-          </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>
-MIIDNDCCAhygAwIBAgIVANTK3G8C7AHnSEGrmCj2kqRBk2pBMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcDAuc2hpYi5jc3ViLmVkdTAeFw0xMDA1MjQyMTQw
-MzZaFw0zMDA1MjQyMTQwMzZaMB0xGzAZBgNVBAMTEmlkcDAuc2hpYi5jc3ViLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJB8I56qhCOavz3K3BfC
-s/LhLDlXTPfV6d7pbkH6XGIlSpUGS4wtuqiSVec1o8PDHZmZfpbYA79RmOEcPJAW
-323LYk15GSYZSgW5kJjbegIdnYdzm4UgBQbbvfYRdoM7Zklyv/qJ+gzTuENuTHqI
-POe2/OSHXzn/XFAhB4vwEtvh4oR9Hwf73zS/JedVNXrz67XqRYCLsGi9c/C8Wa98
-PyU2yBHuXFmfkpmW1g52pF8NLTKmUwVV/iq+zMXWqnMLKJh3Nzj808r0OJ0eLtsZ
-VsmpYtxD6yNJTFvRUvwpCDdq04mQq6W9oNFh+5QqToaq9Xa2KLIyWMsUYpIkcnE3
-QGkCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwMC5zaGliLmNzdWIuZWR1hilodHRw
-czovL2lkcDAuc2hpYi5jc3ViLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-Z7PJGtKy5x6V8xiLXG9VS+ogZhQwDQYJKoZIhvcNAQEFBQADggEBAEeX1PL/cFH6
-nDjkH9u7WjfBP0etCr1SWOcpADrdv/9y1QkfP9vW5pk9UTf1/qdZw0SyPq+OC6+y
-qn+7ljz4TbuMcqmdwjPQW5WmMFeamJCU8EoXYOmLzmiigAai3lxNefzrmvFleV9j
-xA787/E2iA7cpHq89gGQNH/jlGMnyAjV69VO6v7X/CD7E5pIIlYzw0ZMAC1a1tie
-o+UtOXA0Di8W4M4d00na+QjugX9++yOX+88VYqnbzldY5M1VTWJCSsSY9kbtNtRO
-xMhd5OBqZzYJDvXNjaJrMGbFjw+lYQfFaR6/SYVfjihaGN38RlOqxMLZlIV/DwSZ
-WYA2GI4Dt+c=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.csub.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.csub.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.csub.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.csub.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.csub.edu/idp/profile/Shibboleth/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">csub.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFxTCCBK2gAwIBAgIQPc05I8UKJsaaDlPUHfscQzANBgkqhkiG9w0BAQUFADCB
-iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
-BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTEw
-MTIwMzAwMDAwMFoXDTExMTIwMzIzNTk1OVowgeMxCzAJBgNVBAYTAlVTMRMwEQYD
-VQQREwo5MzMxMS0xMDIyMQswCQYDVQQIEwJDQTEUMBIGA1UEBxMLQmFrZXJzZmll
-bGQxHDAaBgNVBAkTEzkwMDEgU3RvY2tmaWVsZCBId3kxMTAvBgNVBAoTKENhbGlm
-b3JuaWEgU3RhdGUgVW5pdmVyc2l0eSwgQmFrZXJzZmllbGQxDDAKBgNVBAsTA0lU
-UzEgMB4GA1UECxMXQ29tb2RvIE11bHRpLURvbWFpbiBTU0wxGzAZBgNVBAMTEmlk
-cDAuc2hpYi5jc3ViLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AL/HZKeM0Qvx2uKJD6Gtp4yw7B8WAAANMFOTT9I37tU24Bopb5XMC9kLskfvo3/B
-tgK4hfLTomHCtpUbQ9BaO6VSOGo7+8WaLRvPiBjwROfPML7vuf6nY7+j7VxsvXim
-dD/irAv+F3yLJv8sx/wHm9g30fxlc/3fUzpthatHKlIMFPOnwwCKS6ZMuGPZJO+A
-yDk6HJPLK+kEiZDutI0vlAUaKYL/J1clbCpZ5n0CDYy6dQVLQTZY8gn6tW4AcBSY
-g5yPbU5Q3mYSgr5JsCt8xdGcp+ujDceRGYdFmHtHiUGo6QR8UK74KCsiojyB/dl/
-iXzp6GDZzoL9bx+75P9LhX0CAwEAAaOCAcswggHHMB8GA1UdIwQYMBaAFD/VtdDW
-RHlQShejm4xK3LiwImRrMB0GA1UdDgQWBBRAziDZJaj+HbwF8pSLF2l1nf4MLTAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwRgYDVR0gBD8wPTA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEF
-BQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwTwYDVR0fBEgwRjBE
-oEKgQIY+aHR0cDovL2NybC5jb21vZG9jYS5jb20vQ09NT0RPSGlnaC1Bc3N1cmFu
-Y2VTZWN1cmVTZXJ2ZXJDQS5jcmwwgYAGCCsGAQUFBwEBBHQwcjBKBggrBgEFBQcw
-AoY+aHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPSGlnaC1Bc3N1cmFuY2VT
-ZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9k
-b2NhLmNvbTAsBgNVHREEJTAjghJpZHAwLnNoaWIuY3N1Yi5lZHWCDXNoaWIuY3N1
-Yi5lZHUwDQYJKoZIhvcNAQEFBQADggEBAB+4/dnbNTB1MBfjj43ltyzTVBUa2V7B
-SZc5CoZNdsNrXEAyFGxR6MJWfqz0WyNYtEyj66MrJKGFvxaEhcvhBbQFkymfZOGG
-j82KRyAEk4BfyJl+0B1w1jcVQp0EyWT45B3mXhDNdEW4MC83QHdcrk75TEFaUR7f
-Cuph5aZTUR+pAj4g+ks54l5X6Q0hj6VBKInLv7DwXcwizR56O3e/fV6E49qNm2YF
-4tYQJZJ8/YKA8V2GzKr2k64ZpHIBYg3k3XLEJ6mSpP2XWYc5Lkx0VgTk9PiSPrzz
-QF+Q3+1t51b68ryVpJeqcC9J/6pKQDd18xvgtLXJFKoIzs68rKYsUfA=
-          </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>
-MIIDNDCCAhygAwIBAgIVANTK3G8C7AHnSEGrmCj2kqRBk2pBMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcDAuc2hpYi5jc3ViLmVkdTAeFw0xMDA1MjQyMTQw
-MzZaFw0zMDA1MjQyMTQwMzZaMB0xGzAZBgNVBAMTEmlkcDAuc2hpYi5jc3ViLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJB8I56qhCOavz3K3BfC
-s/LhLDlXTPfV6d7pbkH6XGIlSpUGS4wtuqiSVec1o8PDHZmZfpbYA79RmOEcPJAW
-323LYk15GSYZSgW5kJjbegIdnYdzm4UgBQbbvfYRdoM7Zklyv/qJ+gzTuENuTHqI
-POe2/OSHXzn/XFAhB4vwEtvh4oR9Hwf73zS/JedVNXrz67XqRYCLsGi9c/C8Wa98
-PyU2yBHuXFmfkpmW1g52pF8NLTKmUwVV/iq+zMXWqnMLKJh3Nzj808r0OJ0eLtsZ
-VsmpYtxD6yNJTFvRUvwpCDdq04mQq6W9oNFh+5QqToaq9Xa2KLIyWMsUYpIkcnE3
-QGkCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwMC5zaGliLmNzdWIuZWR1hilodHRw
-czovL2lkcDAuc2hpYi5jc3ViLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-Z7PJGtKy5x6V8xiLXG9VS+ogZhQwDQYJKoZIhvcNAQEFBQADggEBAEeX1PL/cFH6
-nDjkH9u7WjfBP0etCr1SWOcpADrdv/9y1QkfP9vW5pk9UTf1/qdZw0SyPq+OC6+y
-qn+7ljz4TbuMcqmdwjPQW5WmMFeamJCU8EoXYOmLzmiigAai3lxNefzrmvFleV9j
-xA787/E2iA7cpHq89gGQNH/jlGMnyAjV69VO6v7X/CD7E5pIIlYzw0ZMAC1a1tie
-o+UtOXA0Di8W4M4d00na+QjugX9++yOX+88VYqnbzldY5M1VTWJCSsSY9kbtNtRO
-xMhd5OBqZzYJDvXNjaJrMGbFjw+lYQfFaR6/SYVfjihaGN38RlOqxMLZlIV/DwSZ
-WYA2GI4Dt+c=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.csub.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Bakersfield</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Bakersfield</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.csub.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Network Operations Center</md:GivenName>
-    <md:EmailAddress>netops@csub.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml
deleted file mode 100644
index 2eaef8f1..00000000
--- a/swamid-interfederations-2.0/shib.dr.ufu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://shib.dr.ufu.br/idp/shibboleth">
-  <md: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>
-  </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">ufu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFU - Universidade Federal de Uberlandia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFU - Universidade Federal de Uberlandia</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEKjCCAxICAQAwDQYJKoZIhvcNAQEFBQAwgdoxMjAwBgNVBAoUKVVGVSAtIFVuaXZ
-lcnNpZGFkZSBGZWRlcmFsIGRlIFViZXJsw6JuZGlhMTMwMQYDVQQLFCpDVEkgLSBDZW
-50cm8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHDAaBgkqhkiG9w0BCQEWD
-WRyQGN0aS51ZnUuYnIxFDASBgNVBAcUC1ViZXJsw6JuZGlhMRUwEwYDVQQIEwxNaW5h
-cyBHZXJhaXMxCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5zaGliLmRyLnVmdS5icjAeFw0
-xNDEwMjExMjE0MjVaFw0xNzEwMjAxMjE0MjVaMIHaMTIwMAYDVQQKFClVRlUgLSBVbm
-l2ZXJzaWRhZGUgRmVkZXJhbCBkZSBVYmVybMOibmRpYTEzMDEGA1UECxQqQ1RJIC0gQ
-2VudHJvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMRwwGgYJKoZIhvcNAQkB
-Fg1kckBjdGkudWZ1LmJyMRQwEgYDVQQHFAtVYmVybMOibmRpYTEVMBMGA1UECBMMTWl
-uYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOc2hpYi5kci51ZnUuYnIwgg
-EiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOTdVmbc2riXasQi22eylQoD7du
-fk28CGgtcIQHilsKKFZE050AlwhDc8/KvEGJmuQG7EW2XtSMKWTxRCBIqEejJWWlucO
-+zpCf1Kq8ARSZteMzn1DAc/NSVYvPegaWcbe9voFwSjbS38Fn3tv7QCCuJTvc/FrET6
-CsuvAJnZ6V7/yNshVTMF3bwacxVTFTnV3xjYqeTjL5BF8121W4aevAABfwOT2jBwU10
-HmFnLgwlERl9B+YaTcOX5Rw32FX3T18Xo7F6cLmMRuMA8zfv+mSvuV22XiiSVgLvpVc
-3syUfcf8J98cNTEmlZViyOYb0ZntUEVYm/NkgOAfYXqN00XAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBALfZ1QHMH1OK/uTgV1aDNZLflgGROkuA3WFddF4llImVtKbOKU6AP6r
-IjoaEq3PB1hz3HEgftoVv0X8/wcVFVm7ZPqheOEUvxOczmKAuYASRFhJIwlza+vrnA5
-04TxTkVrZGkaxLYqit6UjO2DQjIyy2Z09Azkgr73ovB6WjrcjsSnooXnm9B7Di8mz7X
-G94QZbel2spNfB+Z8JzZcgyIGCjGAscPX+9CA07ie02x9jIOOC9JNlDGgfwhbWmzg97
-aCMtX+kA/sVbLZxQwFlKqaRyDcKQUKzz7wTzhBZMz8etcMkkzfKA0FINRU5bSTenRjX
-hSn3iPrOyRPY80Vexzr4=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://shib.dr.ufu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dr.ufu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dr.ufu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dr.ufu.br/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">ufu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEKjCCAxICAQAwDQYJKoZIhvcNAQEFBQAwgdoxMjAwBgNVBAoUKVVGVSAtIFVuaXZ
-lcnNpZGFkZSBGZWRlcmFsIGRlIFViZXJsw6JuZGlhMTMwMQYDVQQLFCpDVEkgLSBDZW
-50cm8gZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hw6fDo28xHDAaBgkqhkiG9w0BCQEWD
-WRyQGN0aS51ZnUuYnIxFDASBgNVBAcUC1ViZXJsw6JuZGlhMRUwEwYDVQQIEwxNaW5h
-cyBHZXJhaXMxCzAJBgNVBAYTAkJSMRcwFQYDVQQDEw5zaGliLmRyLnVmdS5icjAeFw0
-xNDEwMjExMjE0MjVaFw0xNzEwMjAxMjE0MjVaMIHaMTIwMAYDVQQKFClVRlUgLSBVbm
-l2ZXJzaWRhZGUgRmVkZXJhbCBkZSBVYmVybMOibmRpYTEzMDEGA1UECxQqQ1RJIC0gQ
-2VudHJvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYcOnw6NvMRwwGgYJKoZIhvcNAQkB
-Fg1kckBjdGkudWZ1LmJyMRQwEgYDVQQHFAtVYmVybMOibmRpYTEVMBMGA1UECBMMTWl
-uYXMgR2VyYWlzMQswCQYDVQQGEwJCUjEXMBUGA1UEAxMOc2hpYi5kci51ZnUuYnIwgg
-EiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOTdVmbc2riXasQi22eylQoD7du
-fk28CGgtcIQHilsKKFZE050AlwhDc8/KvEGJmuQG7EW2XtSMKWTxRCBIqEejJWWlucO
-+zpCf1Kq8ARSZteMzn1DAc/NSVYvPegaWcbe9voFwSjbS38Fn3tv7QCCuJTvc/FrET6
-CsuvAJnZ6V7/yNshVTMF3bwacxVTFTnV3xjYqeTjL5BF8121W4aevAABfwOT2jBwU10
-HmFnLgwlERl9B+YaTcOX5Rw32FX3T18Xo7F6cLmMRuMA8zfv+mSvuV22XiiSVgLvpVc
-3syUfcf8J98cNTEmlZViyOYb0ZntUEVYm/NkgOAfYXqN00XAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBALfZ1QHMH1OK/uTgV1aDNZLflgGROkuA3WFddF4llImVtKbOKU6AP6r
-IjoaEq3PB1hz3HEgftoVv0X8/wcVFVm7ZPqheOEUvxOczmKAuYASRFhJIwlza+vrnA5
-04TxTkVrZGkaxLYqit6UjO2DQjIyy2Z09Azkgr73ovB6WjrcjsSnooXnm9B7Di8mz7X
-G94QZbel2spNfB+Z8JzZcgyIGCjGAscPX+9CA07ie02x9jIOOC9JNlDGgfwhbWmzg97
-aCMtX+kA/sVbLZxQwFlKqaRyDcKQUKzz7wTzhBZMz8etcMkkzfKA0FINRU5bSTenRjX
-hSn3iPrOyRPY80Vexzr4=
-                          
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dr.ufu.br:8443/idp/profile/SAML1/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">UFU - Universidade Federal de Uberlandia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFU - Universidade Federal de Uberlandia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFU - Universidade Federal de Uberlandia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Divisao de Redes</md:SurName>
-    <md:EmailAddress>dr@cti.ufu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.dur.ac.uk-444-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.dur.ac.uk-444-idp-shibboleth.xml
deleted file mode 100644
index 6d9abcf2..00000000
--- a/swamid-interfederations-2.0/shib.dur.ac.uk-444-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" entityID="https://shib.dur.ac.uk:444/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP for the University of Durham.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">dur.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Durham test (Do not use)</mdui:DisplayName>
-        <mdui:Logo height="101" width="90">https://shib.dur.ac.uk:444/idp/images/du90x101.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shib.dur.ac.uk:444/idp/images/du16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
-						HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
-						BgNVBAMMDnNoaWIuZHVyLmFjLnVrMB4XDTEzMDMwNDExNTYyMloXDTIzMDMwNDEx
-						NTYyMlowfDELMAkGA1UEBhMCR0IxFjAUBgNVBAgMDUNvdW50eSBEdXJoYW0xDzAN
-						BgNVBAcMBkR1cmhhbTEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBEdXJoYW0xDDAK
-						BgNVBAsMA0NJUzEXMBUGA1UEAwwOc2hpYi5kdXIuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDb3Inw3qmbQglj/PfdG0Gt4NLlgIF3VyMMKhkX
-						KTgEZnEqMtz56yCrEQUv2q52+gEBHj5BC2I+tLH/D+hxeE2mscTsj5GYQEdXrZro
-						8+hlAxD5ygHPYYA0vTUWXp1jy7Oa5jL9nzVFVCcxXowuEOezLFdDPR2+q99dz29O
-						Az/9b6dVHb3IatG0ueDDNE+jtr+z7s67OEsgYL9cgkOs5bTbqZe6+BHs+MuRNYTI
-						3FmwtVRwiGEITMbAe/BRyr6Oa04uzLBqH5Xgrl/N0cqwsjo+IR9QG1GoMwY1PYa4
-						oQKr5NXMfnjZ1fZnWwbiDnRpwvxzX8nDgPdNRrjqZGQzxLofAgMBAAGjezB5MAkG
-						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
-						ZmljYXRlMB0GA1UdDgQWBBTjOCzu4jEoqNnF741QhQ6iWPfeIzAfBgNVHSMEGDAW
-						gBTjOCzu4jEoqNnF741QhQ6iWPfeIzANBgkqhkiG9w0BAQUFAAOCAQEA0Ayun4MT
-						76SeQDaSUUJY6CSMgk65rX/U7Be3QgPLGkjnWS1jyuQ0iEMIbMINEQuqhLAhxmh1
-						yGzwt4GOwqDO/HmzGbDA02coUENR58uwPXRwGjmNIW8k+BNOvfyh018rjM7dLxJU
-						zxGW+ge+jbEjiGG/gVdarffIDjDmAONjmcdhrbunMCcL9xgH/2UDm/eowOr8TiBC
-						drL5y3PFQUwmcJwJx4hZs8GiTUtuEQa18vxYTM4tgKvOpey97hnhJxWOhk+kuH7v
-						0pA98AVsugdhEPTTuW6EQSwKHKPWAqTE9D0hTr8frCdrSUIppziwK5Nlk5qXAn70
-						CDgIrJGVkQXCNg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dur.ac.uk:444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/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">dur.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
-						HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
-						BgNVBAMMDnNoaWIuZHVyLmFjLnVrMB4XDTEzMDMwNDExNTYyMloXDTIzMDMwNDEx
-						NTYyMlowfDELMAkGA1UEBhMCR0IxFjAUBgNVBAgMDUNvdW50eSBEdXJoYW0xDzAN
-						BgNVBAcMBkR1cmhhbTEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBEdXJoYW0xDDAK
-						BgNVBAsMA0NJUzEXMBUGA1UEAwwOc2hpYi5kdXIuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDb3Inw3qmbQglj/PfdG0Gt4NLlgIF3VyMMKhkX
-						KTgEZnEqMtz56yCrEQUv2q52+gEBHj5BC2I+tLH/D+hxeE2mscTsj5GYQEdXrZro
-						8+hlAxD5ygHPYYA0vTUWXp1jy7Oa5jL9nzVFVCcxXowuEOezLFdDPR2+q99dz29O
-						Az/9b6dVHb3IatG0ueDDNE+jtr+z7s67OEsgYL9cgkOs5bTbqZe6+BHs+MuRNYTI
-						3FmwtVRwiGEITMbAe/BRyr6Oa04uzLBqH5Xgrl/N0cqwsjo+IR9QG1GoMwY1PYa4
-						oQKr5NXMfnjZ1fZnWwbiDnRpwvxzX8nDgPdNRrjqZGQzxLofAgMBAAGjezB5MAkG
-						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
-						ZmljYXRlMB0GA1UdDgQWBBTjOCzu4jEoqNnF741QhQ6iWPfeIzAfBgNVHSMEGDAW
-						gBTjOCzu4jEoqNnF741QhQ6iWPfeIzANBgkqhkiG9w0BAQUFAAOCAQEA0Ayun4MT
-						76SeQDaSUUJY6CSMgk65rX/U7Be3QgPLGkjnWS1jyuQ0iEMIbMINEQuqhLAhxmh1
-						yGzwt4GOwqDO/HmzGbDA02coUENR58uwPXRwGjmNIW8k+BNOvfyh018rjM7dLxJU
-						zxGW+ge+jbEjiGG/gVdarffIDjDmAONjmcdhrbunMCcL9xgH/2UDm/eowOr8TiBC
-						drL5y3PFQUwmcJwJx4hZs8GiTUtuEQa18vxYTM4tgKvOpey97hnhJxWOhk+kuH7v
-						0pA98AVsugdhEPTTuW6EQSwKHKPWAqTE9D0hTr8frCdrSUIppziwK5Nlk5qXAn70
-						CDgIrJGVkQXCNg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Durham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Durham test (Do not use)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dur.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:m.a.young@durham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:m.a.young@durham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.dur.ac.uk:444-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.dur.ac.uk:444-idp-shibboleth.xml
deleted file mode 100644
index 6d9abcf2..00000000
--- a/swamid-interfederations-2.0/shib.dur.ac.uk:444-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" entityID="https://shib.dur.ac.uk:444/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP for the University of Durham.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">dur.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Durham test (Do not use)</mdui:DisplayName>
-        <mdui:Logo height="101" width="90">https://shib.dur.ac.uk:444/idp/images/du90x101.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shib.dur.ac.uk:444/idp/images/du16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
-						HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
-						BgNVBAMMDnNoaWIuZHVyLmFjLnVrMB4XDTEzMDMwNDExNTYyMloXDTIzMDMwNDEx
-						NTYyMlowfDELMAkGA1UEBhMCR0IxFjAUBgNVBAgMDUNvdW50eSBEdXJoYW0xDzAN
-						BgNVBAcMBkR1cmhhbTEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBEdXJoYW0xDDAK
-						BgNVBAsMA0NJUzEXMBUGA1UEAwwOc2hpYi5kdXIuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDb3Inw3qmbQglj/PfdG0Gt4NLlgIF3VyMMKhkX
-						KTgEZnEqMtz56yCrEQUv2q52+gEBHj5BC2I+tLH/D+hxeE2mscTsj5GYQEdXrZro
-						8+hlAxD5ygHPYYA0vTUWXp1jy7Oa5jL9nzVFVCcxXowuEOezLFdDPR2+q99dz29O
-						Az/9b6dVHb3IatG0ueDDNE+jtr+z7s67OEsgYL9cgkOs5bTbqZe6+BHs+MuRNYTI
-						3FmwtVRwiGEITMbAe/BRyr6Oa04uzLBqH5Xgrl/N0cqwsjo+IR9QG1GoMwY1PYa4
-						oQKr5NXMfnjZ1fZnWwbiDnRpwvxzX8nDgPdNRrjqZGQzxLofAgMBAAGjezB5MAkG
-						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
-						ZmljYXRlMB0GA1UdDgQWBBTjOCzu4jEoqNnF741QhQ6iWPfeIzAfBgNVHSMEGDAW
-						gBTjOCzu4jEoqNnF741QhQ6iWPfeIzANBgkqhkiG9w0BAQUFAAOCAQEA0Ayun4MT
-						76SeQDaSUUJY6CSMgk65rX/U7Be3QgPLGkjnWS1jyuQ0iEMIbMINEQuqhLAhxmh1
-						yGzwt4GOwqDO/HmzGbDA02coUENR58uwPXRwGjmNIW8k+BNOvfyh018rjM7dLxJU
-						zxGW+ge+jbEjiGG/gVdarffIDjDmAONjmcdhrbunMCcL9xgH/2UDm/eowOr8TiBC
-						drL5y3PFQUwmcJwJx4hZs8GiTUtuEQa18vxYTM4tgKvOpey97hnhJxWOhk+kuH7v
-						0pA98AVsugdhEPTTuW6EQSwKHKPWAqTE9D0hTr8frCdrSUIppziwK5Nlk5qXAn70
-						CDgIrJGVkQXCNg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dur.ac.uk:444/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dur.ac.uk:444/idp/profile/SAML2/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">dur.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
-						HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
-						BgNVBAMMDnNoaWIuZHVyLmFjLnVrMB4XDTEzMDMwNDExNTYyMloXDTIzMDMwNDEx
-						NTYyMlowfDELMAkGA1UEBhMCR0IxFjAUBgNVBAgMDUNvdW50eSBEdXJoYW0xDzAN
-						BgNVBAcMBkR1cmhhbTEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBEdXJoYW0xDDAK
-						BgNVBAsMA0NJUzEXMBUGA1UEAwwOc2hpYi5kdXIuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDb3Inw3qmbQglj/PfdG0Gt4NLlgIF3VyMMKhkX
-						KTgEZnEqMtz56yCrEQUv2q52+gEBHj5BC2I+tLH/D+hxeE2mscTsj5GYQEdXrZro
-						8+hlAxD5ygHPYYA0vTUWXp1jy7Oa5jL9nzVFVCcxXowuEOezLFdDPR2+q99dz29O
-						Az/9b6dVHb3IatG0ueDDNE+jtr+z7s67OEsgYL9cgkOs5bTbqZe6+BHs+MuRNYTI
-						3FmwtVRwiGEITMbAe/BRyr6Oa04uzLBqH5Xgrl/N0cqwsjo+IR9QG1GoMwY1PYa4
-						oQKr5NXMfnjZ1fZnWwbiDnRpwvxzX8nDgPdNRrjqZGQzxLofAgMBAAGjezB5MAkG
-						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
-						ZmljYXRlMB0GA1UdDgQWBBTjOCzu4jEoqNnF741QhQ6iWPfeIzAfBgNVHSMEGDAW
-						gBTjOCzu4jEoqNnF741QhQ6iWPfeIzANBgkqhkiG9w0BAQUFAAOCAQEA0Ayun4MT
-						76SeQDaSUUJY6CSMgk65rX/U7Be3QgPLGkjnWS1jyuQ0iEMIbMINEQuqhLAhxmh1
-						yGzwt4GOwqDO/HmzGbDA02coUENR58uwPXRwGjmNIW8k+BNOvfyh018rjM7dLxJU
-						zxGW+ge+jbEjiGG/gVdarffIDjDmAONjmcdhrbunMCcL9xgH/2UDm/eowOr8TiBC
-						drL5y3PFQUwmcJwJx4hZs8GiTUtuEQa18vxYTM4tgKvOpey97hnhJxWOhk+kuH7v
-						0pA98AVsugdhEPTTuW6EQSwKHKPWAqTE9D0hTr8frCdrSUIppziwK5Nlk5qXAn70
-						CDgIrJGVkQXCNg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.ac.uk:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Durham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Durham test (Do not use)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dur.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:m.a.young@durham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:m.a.young@durham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.exprodo.com-shibboleth.xml b/swamid-interfederations-2.0/shib.exprodo.com-shibboleth.xml
deleted file mode 100644
index 955c2b65..00000000
--- a/swamid-interfederations-2.0/shib.exprodo.com-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://shib.exprodo.com/shibboleth">
-  <!--
-		This is an "Exprodo Software" Shibboleth SP for Exprodo Software 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="2015-06-23T14:30:24Z">
-      <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">Exprodo Software</mdui:DisplayName>
-        <mdui:Logo height="100" width="271">https://www.exprodo.com/wp-content/uploads/2014/10/exprodo-software_271x100.png</mdui:Logo>
-        <mdui:Description xml:lang="en">Web-based database and research/clinical bookings and facility management software</mdui:Description>
-      </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://shib.exprodo.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://shib.exprodo.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHDCCAgSgAwIBAgIJALCR79ZDW2xvMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHNoaWIuZXhwcm9kby5jb20wHhcNMTUwNjIyMTUyMTAxWhcNMjUwNjE5MTUy
-						MTAxWjAbMRkwFwYDVQQDExBzaGliLmV4cHJvZG8uY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAlihJNaZPZ3oGM5NQlpgwJUJxlWZ8rbWrx9Kk5rPB
-						4Fb0C6CH+YIOKHb9sxVXPL5Vi9JypYE0Y7JRFEKf7qzbFNTEDAKhq0hjJ+XMWiVq
-						PJjbKYW4LJtM05DoPpTe/gKZJRaktGUDGu8m5ifLtd7klhFQmV0duDriDEPiW4ik
-						LeYZGiReIkvWSx4kFnQbERYuyrjXPOnhKw8pnv4HuzR/Js4tmUQbMy9VPbjbWSET
-						o2x9TfCubitIiOguXNGU8hcOv+ys/sWKTddPQ8208qpsfQLo+YSm9NmYDn3bJ3tg
-						SdA/9OTLJSjTZrz7RUZUeCYF/yv0vhRpicDDg1Ym8kdtCQIDAQABo2MwYTBABgNV
-						HREEOTA3ghBzaGliLmV4cHJvZG8uY29thiNodHRwczovL3NoaWIuZXhwcm9kby5j
-						b20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU7xBaV9vU2BCTDlQLhTkL5L6/1ckwDQYJ
-						KoZIhvcNAQEFBQADggEBAChUHGR1vS+giyhBJLy6gvfWFpfmo6dJlVn9zTIiztus
-						SNX3AR7Xe3KLO+YV/8r1vUz5WO+xnUwFQd7Et20M5oeeZqbDqyPJqynepUZ3NeE5
-						GfzERa8Rdvr6t6HoY0H19u0IMiMemtxQpFDt2uLtkawJLw7L3A2hUdbVta8MyUAQ
-						7WV7raxbNae56DlNuivOY2kkEl9T39xiLNpQ4cHtB2Z1uGLxPcE49j1AzfAM5ugk
-						29ai5m2neGiTzsvlEvw88pW7CMGcfZEPNsDA4zbQNTAu0FYIhrP60+OifLLZoMen
-						lT/unHR4GJe4dtKbypAo6cvgW2Uu7aCV0wO0ni7MiCE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shib.exprodo.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.exprodo.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.exprodo.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.exprodo.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.exprodo.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.exprodo.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.exprodo.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.exprodo.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.exprodo.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.exprodo.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.exprodo.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Exprodo Software Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Exprodo Software</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.exprodo.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Robinson</SurName>
-    <EmailAddress>mailto:paul@exprodo.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Robinson</SurName>
-    <EmailAddress>mailto:paul@exprodo.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.fortlewis.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.fortlewis.edu-idp-shibboleth.xml
deleted file mode 100644
index 866c9d31..00000000
--- a/swamid-interfederations-2.0/shib.fortlewis.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,171 +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://shib.fortlewis.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">fortlewis.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Fort Lewis College</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>
-MIIDNDCCAhygAwIBAgIVAKAwA2GeOWnox0HE2Cs9vOZ+vGNlMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNoaWIuZm9ydGxld2lzLmVkdTAeFw0xMzA4MTYxMzMz
-MzVaFw0yODA4MTYxMzMzMzVaMB0xGzAZBgNVBAMTEnNoaWIuZm9ydGxld2lzLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIU0/7DIXyuOPF2Wl2Rh
-vSS6WlMwwqq3lSYCzbbuvW958k4Qm18KtqnnEBVvnxj9kOzMJqH1MSwjpKU41J88
-sGlQIdy0Os6DxQXY09NnhNRInSjbgCnw17UEniXUqJpg8IYFebwMkX1UfpqULO8y
-KWv5tB80M4dhvcLswHHBmngRsgSHopN393i/vo/mnjQ6uFDyoZtv4nIn8GP1zaV4
-c2w9QqNa3JoSgAZWDdxfU3Xzu4l0XMzVE3TsI4V6nxVg3K6blTOGIG5qSFevgTFh
-qzqDlIxn2Da9wjEME74ISGPxWbs96zdL7Y5O5LrwySXYyfoXgAmuF7ZGtYe/rlsG
-B8cCAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYi5mb3J0bGV3aXMuZWR1hilodHRw
-czovL3NoaWIuZm9ydGxld2lzLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-BYK1Me0MowhhHsiQq//A36KfbJIwDQYJKoZIhvcNAQEFBQADggEBADGo3/7fy+eD
-/iXi2AhSVIHG5vCDL3Mg1hqTMc2A1u9qjVFsLg89zu05QuhgqXldFqW5BY5foJaa
-bvVlQx/2qcbYXiBWLqKwORXDLzoHXaWO2Ipl4zZgehf4PpE3+uZqzdz7zCjJUdMA
-vhm6RvQmet50R0UfTj7VqjFNmjhanu//Z5kEWwrh1ynVa9270EskmcKJBfuGYYDO
-L44iLiEoDtkonZHj80wAxweX2ZKTUV3Zx1rN9izq0/7Wmcs8d7kxK/fUvSRMOLeY
-aQ3ZXyJG9G28xL1x7mCjLJ8atZIXr+Y74eG0dH+02TBR8zBwIOwfRORG+2XdydG+
-Zw/pUkWhDXU=
-          </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>
-MIIFFTCCA/2gAwIBAgIRAPUWamBIK1aXyICncL6wac0wDQYJKoZIhvcNAQEFBQAw
-UTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5D
-b21tb24xGzAZBgNVBAMTEkluQ29tbW9uIFNlcnZlciBDQTAeFw0xMjEwMTcwMDAw
-MDBaFw0xMzEwMTcyMzU5NTlaMIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08x
-EDAOBgNVBAcTB0R1cmFuZ28xGzAZBgNVBAoTEkZvcnQgTGV3aXMgQ29sbGVnZTEf
-MB0GA1UECxMWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMSc2hpYi5m
-b3J0bGV3aXMuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuHnY
-uLhhYF7y9qcw/IgWJBiKVku2KX9v+boiZ70rY6q2fICxRT+LnP4bYmM32zO1pYvM
-6ljizoeClyDGdfpeEx3tZGTv1BklifTcwlOVPGFGCY1MBbEzdrQpAkGXzUIfz2Lv
-mtfS+AzXiJo7j9dBxhHEnGCLAbZ5ESGmxeqc3famc+sF7PyVNoxj8wZTbE3HMemZ
-BPmgZg6I5yHxUgyCVTKCPveyHdkfuCs5ZFeZ4Sf2BQJrhpquGLyW7CotDh1TBZhk
-yXVpK1+eftzF2hor4FFno+hp4cr+N+vOdkcmBFZ09RymsDTbHpS7me4OAfZsd58G
-/vmgaTuy99fNQTHFRQIDAQABo4IBrzCCAaswHwYDVR0jBBgwFoAUSE9a+i9Kml7g
-UPNre1Wl3vW+NF0wHQYDVR0OBBYEFFoDrA7HuCnwCVx1peQzV9Z/q28mMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjBdBgNVHSAEVjBUMFIGDCsGAQQBriMBBAMBATBCMEAGCCsGAQUFBwIB
-FjRodHRwczovL3d3dy5pbmNvbW1vbi5vcmcvY2VydC9yZXBvc2l0b3J5L2Nwc19z
-c2wucGRmMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwuaW5jb21tb24ub3Jn
-L0luQ29tbW9uU2VydmVyQ0EuY3JsMG8GCCsGAQUFBwEBBGMwYTA5BggrBgEFBQcw
-AoYtaHR0cDovL2NlcnQuaW5jb21tb24ub3JnL0luQ29tbW9uU2VydmVyQ0EuY3J0
-MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5pbmNvbW1vbi5vcmcwHQYDVR0RBBYw
-FIISc2hpYi5mb3J0bGV3aXMuZWR1MA0GCSqGSIb3DQEBBQUAA4IBAQAs002TnY7Z
-hyavh81tlkKJf70Dw5MIYaZKEh96nXxX2/7oGnq97s4Bp5ySuY1ys+K7X43Y9mpk
-gT9lm3R/OvGRiANHETfIkZyLOWFbFtELBEpYGlrFpt4q8n0/6+x2+l3JAAkBSlpg
-/rddXNkoefgVAEz+u9C0HKj3fsruXqYBHbIfW9Rf66lQyEp01+QZJlyKIedNFzBL
-VTadJwCCueFoLeybzutNJ4IOELLDRvFcea2IY9C+c31MowYoa+hV75HqXGpgnvGU
-T7QYiZ2Vq8KFk/pYWOQfBPkGVcosrLHHv7I3n8BsdY2I/hcCluZah/E9hNo6nXgC
-Cl7+smoK7FL0
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.fortlewis.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.fortlewis.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.fortlewis.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.fortlewis.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.fortlewis.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fortlewis.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAKAwA2GeOWnox0HE2Cs9vOZ+vGNlMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNoaWIuZm9ydGxld2lzLmVkdTAeFw0xMzA4MTYxMzMz
-MzVaFw0yODA4MTYxMzMzMzVaMB0xGzAZBgNVBAMTEnNoaWIuZm9ydGxld2lzLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIU0/7DIXyuOPF2Wl2Rh
-vSS6WlMwwqq3lSYCzbbuvW958k4Qm18KtqnnEBVvnxj9kOzMJqH1MSwjpKU41J88
-sGlQIdy0Os6DxQXY09NnhNRInSjbgCnw17UEniXUqJpg8IYFebwMkX1UfpqULO8y
-KWv5tB80M4dhvcLswHHBmngRsgSHopN393i/vo/mnjQ6uFDyoZtv4nIn8GP1zaV4
-c2w9QqNa3JoSgAZWDdxfU3Xzu4l0XMzVE3TsI4V6nxVg3K6blTOGIG5qSFevgTFh
-qzqDlIxn2Da9wjEME74ISGPxWbs96zdL7Y5O5LrwySXYyfoXgAmuF7ZGtYe/rlsG
-B8cCAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYi5mb3J0bGV3aXMuZWR1hilodHRw
-czovL3NoaWIuZm9ydGxld2lzLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-BYK1Me0MowhhHsiQq//A36KfbJIwDQYJKoZIhvcNAQEFBQADggEBADGo3/7fy+eD
-/iXi2AhSVIHG5vCDL3Mg1hqTMc2A1u9qjVFsLg89zu05QuhgqXldFqW5BY5foJaa
-bvVlQx/2qcbYXiBWLqKwORXDLzoHXaWO2Ipl4zZgehf4PpE3+uZqzdz7zCjJUdMA
-vhm6RvQmet50R0UfTj7VqjFNmjhanu//Z5kEWwrh1ynVa9270EskmcKJBfuGYYDO
-L44iLiEoDtkonZHj80wAxweX2ZKTUV3Zx1rN9izq0/7Wmcs8d7kxK/fUvSRMOLeY
-aQ3ZXyJG9G28xL1x7mCjLJ8atZIXr+Y74eG0dH+02TBR8zBwIOwfRORG+2XdydG+
-Zw/pUkWhDXU=
-          </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>
-MIIFFTCCA/2gAwIBAgIRAPUWamBIK1aXyICncL6wac0wDQYJKoZIhvcNAQEFBQAw
-UTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5D
-b21tb24xGzAZBgNVBAMTEkluQ29tbW9uIFNlcnZlciBDQTAeFw0xMjEwMTcwMDAw
-MDBaFw0xMzEwMTcyMzU5NTlaMIGHMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ08x
-EDAOBgNVBAcTB0R1cmFuZ28xGzAZBgNVBAoTEkZvcnQgTGV3aXMgQ29sbGVnZTEf
-MB0GA1UECxMWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMSc2hpYi5m
-b3J0bGV3aXMuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuHnY
-uLhhYF7y9qcw/IgWJBiKVku2KX9v+boiZ70rY6q2fICxRT+LnP4bYmM32zO1pYvM
-6ljizoeClyDGdfpeEx3tZGTv1BklifTcwlOVPGFGCY1MBbEzdrQpAkGXzUIfz2Lv
-mtfS+AzXiJo7j9dBxhHEnGCLAbZ5ESGmxeqc3famc+sF7PyVNoxj8wZTbE3HMemZ
-BPmgZg6I5yHxUgyCVTKCPveyHdkfuCs5ZFeZ4Sf2BQJrhpquGLyW7CotDh1TBZhk
-yXVpK1+eftzF2hor4FFno+hp4cr+N+vOdkcmBFZ09RymsDTbHpS7me4OAfZsd58G
-/vmgaTuy99fNQTHFRQIDAQABo4IBrzCCAaswHwYDVR0jBBgwFoAUSE9a+i9Kml7g
-UPNre1Wl3vW+NF0wHQYDVR0OBBYEFFoDrA7HuCnwCVx1peQzV9Z/q28mMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjBdBgNVHSAEVjBUMFIGDCsGAQQBriMBBAMBATBCMEAGCCsGAQUFBwIB
-FjRodHRwczovL3d3dy5pbmNvbW1vbi5vcmcvY2VydC9yZXBvc2l0b3J5L2Nwc19z
-c2wucGRmMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6Ly9jcmwuaW5jb21tb24ub3Jn
-L0luQ29tbW9uU2VydmVyQ0EuY3JsMG8GCCsGAQUFBwEBBGMwYTA5BggrBgEFBQcw
-AoYtaHR0cDovL2NlcnQuaW5jb21tb24ub3JnL0luQ29tbW9uU2VydmVyQ0EuY3J0
-MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5pbmNvbW1vbi5vcmcwHQYDVR0RBBYw
-FIISc2hpYi5mb3J0bGV3aXMuZWR1MA0GCSqGSIb3DQEBBQUAA4IBAQAs002TnY7Z
-hyavh81tlkKJf70Dw5MIYaZKEh96nXxX2/7oGnq97s4Bp5ySuY1ys+K7X43Y9mpk
-gT9lm3R/OvGRiANHETfIkZyLOWFbFtELBEpYGlrFpt4q8n0/6+x2+l3JAAkBSlpg
-/rddXNkoefgVAEz+u9C0HKj3fsruXqYBHbIfW9Rf66lQyEp01+QZJlyKIedNFzBL
-VTadJwCCueFoLeybzutNJ4IOELLDRvFcea2IY9C+c31MowYoa+hV75HqXGpgnvGU
-T7QYiZ2Vq8KFk/pYWOQfBPkGVcosrLHHv7I3n8BsdY2I/hcCluZah/E9hNo6nXgC
-Cl7+smoK7FL0
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.fortlewis.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Fort Lewis College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Fort Lewis College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://explore.fortlewis.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>James Bodine</md:GivenName>
-    <md:EmailAddress>bodine_j@fortlewis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gary Maxwell</md:GivenName>
-    <md:EmailAddress>maxwell_g@fortlewis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Gary Maxwell</md:GivenName>
-    <md:EmailAddress>maxwell_g@fortlewis.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.gcu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.gcu.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 8c13a1a9..00000000
--- a/swamid-interfederations-2.0/shib.gcu.ac.uk-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://shib.gcu.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Glasgow Caledonian University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-03T11:52:43Z">
-      <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">gcu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIzCCAgugAwIBAgIUGOsthEUhMn8ZqSRhbf29aeFD9OswDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOc2hpYi5nY3UuYWMudWswHhcNMTQwNDAxMTUxOTAwWhcN
-						MzQwNDAxMTUxOTAwWjAZMRcwFQYDVQQDEw5zaGliLmdjdS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIchBd2lzuQ45cxGQVaDT0WpztTW9Bi1
-						+oXgxor2jun7trjtQe93sHmkCfjsAvZad9+gSVxFV3gHFHfpDix+XRZu1l3/f1mW
-						bDhQtsFi3ooMRb+z8eN6XsSzRXjOm+Zq/TtvG5ASVvJIqKM5zAZmbAjhlF3GyaWa
-						+MFTc9Jk84Gfo9v7apFKx1LAUxnQaCYNSMSombtAyVUNSc74YqN56F/0V+jUnvMT
-						NkkQ4YiiFYzcO7M6xut1avUzZn00aEjlnCFHB8beWH4UV+DXGKxb/k31IjOpox4K
-						esz9S1J0UhZsqmLZdjxExfVzgZLvplKpSKfEpxyheSeSg525XURwl2kCAwEAAaNj
-						MGEwQAYDVR0RBDkwN4IOc2hpYi5nY3UuYWMudWuGJWh0dHBzOi8vc2hpYi5nY3Uu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC2/w2ppSqmygKbmZGMoPqKT
-						cbhrMA0GCSqGSIb3DQEBBQUAA4IBAQBCV7RJxCsiFIMkBwB9FwOCP3jGjOcUXde7
-						fwMwb99pAuwEZPe2LwwHxZZSowsKkt3y7KEhqzG4mMxBvvf++mlmErnpvVW9xptc
-						nRHfNCw44o/MXjTc5oK85iUDL0XW6NpaNlUFO68oYh+o5syUgLeSjtFVvrZn7Skd
-						NyG6F7QvM6YMx7RFp0ij1h9/yGfUb2iVFTWOePRzTTJ+/u8zOay+fLHiFmL3u6Al
-						OK8MOQIZBD6o4lZJNsg2YCUHuHMDE3hrYDZQjraE7R6GcyC9lkaHNonm1lQKf+oP
-						/0/rNHQNKC7TUfL8iAQ4ZPlfaXK3Joo2G+NL8Pg6ldPP1hBDvnvt
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.gcu.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://shib.gcu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.gcu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.gcu.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">gcu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIzCCAgugAwIBAgIUGOsthEUhMn8ZqSRhbf29aeFD9OswDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOc2hpYi5nY3UuYWMudWswHhcNMTQwNDAxMTUxOTAwWhcN
-						MzQwNDAxMTUxOTAwWjAZMRcwFQYDVQQDEw5zaGliLmdjdS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAIchBd2lzuQ45cxGQVaDT0WpztTW9Bi1
-						+oXgxor2jun7trjtQe93sHmkCfjsAvZad9+gSVxFV3gHFHfpDix+XRZu1l3/f1mW
-						bDhQtsFi3ooMRb+z8eN6XsSzRXjOm+Zq/TtvG5ASVvJIqKM5zAZmbAjhlF3GyaWa
-						+MFTc9Jk84Gfo9v7apFKx1LAUxnQaCYNSMSombtAyVUNSc74YqN56F/0V+jUnvMT
-						NkkQ4YiiFYzcO7M6xut1avUzZn00aEjlnCFHB8beWH4UV+DXGKxb/k31IjOpox4K
-						esz9S1J0UhZsqmLZdjxExfVzgZLvplKpSKfEpxyheSeSg525XURwl2kCAwEAAaNj
-						MGEwQAYDVR0RBDkwN4IOc2hpYi5nY3UuYWMudWuGJWh0dHBzOi8vc2hpYi5nY3Uu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFC2/w2ppSqmygKbmZGMoPqKT
-						cbhrMA0GCSqGSIb3DQEBBQUAA4IBAQBCV7RJxCsiFIMkBwB9FwOCP3jGjOcUXde7
-						fwMwb99pAuwEZPe2LwwHxZZSowsKkt3y7KEhqzG4mMxBvvf++mlmErnpvVW9xptc
-						nRHfNCw44o/MXjTc5oK85iUDL0XW6NpaNlUFO68oYh+o5syUgLeSjtFVvrZn7Skd
-						NyG6F7QvM6YMx7RFp0ij1h9/yGfUb2iVFTWOePRzTTJ+/u8zOay+fLHiFmL3u6Al
-						OK8MOQIZBD6o4lZJNsg2YCUHuHMDE3hrYDZQjraE7R6GcyC9lkaHNonm1lQKf+oP
-						/0/rNHQNKC7TUfL8iAQ4ZPlfaXK3Joo2G+NL8Pg6ldPP1hBDvnvt
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.gcu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.gcu.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">Glasgow Caledonian University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Glasgow Caledonian University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gcu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Support</GivenName>
-    <EmailAddress>mailto:ddil@gcu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shibboleth Support</GivenName>
-    <EmailAddress>mailto:ddil@gcu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.hope.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.hope.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 5730208a..00000000
--- a/swamid-interfederations-2.0/shib.hope.ac.uk-idp-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://shib.hope.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Liverpool Hope University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">hope.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUF9LBjyyNarRHVF85JrS8jx1eFDIwDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPc2hpYi5ob3BlLmFjLnVrMB4XDTEzMDcxNjA4NDgyMloX
-						DTMzMDcxNjA4NDgyMlowGjEYMBYGA1UEAxMPc2hpYi5ob3BlLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzmHDbw1UxozQxVsCj8D1elIGXe1j
-						lUMlT8KADqpY0N1K5R2G1j2cXXGXxx764LMpBm7Ln1WruGU0c+pSN+4m/5/hc1Ub
-						q1PKjnVuhj+kBJjx6GilX4UaeCJVpxTsPvev9Nd8Wxg+FFBVppJXPvJvAlZxACjX
-						i93rokFJXieWQx3R4OGiJxsouCbfJsyjKxS+DOMtQqQ229NrcGNNfBwjKtLopaYI
-						oo8ofxZLY6Y1aOhpepMTczZqFND/gtHVcUfhXGHNUDG+sN/cbe6W6VEzDIKlge5w
-						vjEJWn9IRfdo2RYGoBdc561L1RnXiTNekmsmrBOGO3MXUJSkplzepr08XwIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg9zaGliLmhvcGUuYWMudWuGJmh0dHBzOi8vc2hpYi5o
-						b3BlLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTS/UZaSWqRgi54sLx4
-						HaDi1fGhizANBgkqhkiG9w0BAQUFAAOCAQEAQMiFtqFds58lE3wT/UqQqFSxpz6t
-						eFvNR90R1jJ1en7YGFKFtVqL6gEOh/O4Y5et+VASZ9OJalRpmlO14l3NrG5+h8Nx
-						K4NUH/9lOBrMPvwgWWuiSYxigmWIgfsTTQIWbnc8m/koGuAzHkhmki/LE0DcEeeW
-						c4OxCwaN4AHpdet/nYzSAU7dO1RunbPGSx57N97B8hDELyYW722iSbUHrUceve4L
-						rGFF1QHnMhz7uidDubpoJ6ZJtPhXIr+eFPw15Y0P4Rw9rTFGKofJ5lbX7FleuQJv
-						wMyh37KZ3ivrQ8dpKTnnMnKyckECdFT0jqYAZHMeHLWiRYfxAAXi3mqDzQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.hope.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.hope.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://shib.hope.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.hope.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.hope.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.hope.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">hope.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIUF9LBjyyNarRHVF85JrS8jx1eFDIwDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPc2hpYi5ob3BlLmFjLnVrMB4XDTEzMDcxNjA4NDgyMloX
-						DTMzMDcxNjA4NDgyMlowGjEYMBYGA1UEAxMPc2hpYi5ob3BlLmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzmHDbw1UxozQxVsCj8D1elIGXe1j
-						lUMlT8KADqpY0N1K5R2G1j2cXXGXxx764LMpBm7Ln1WruGU0c+pSN+4m/5/hc1Ub
-						q1PKjnVuhj+kBJjx6GilX4UaeCJVpxTsPvev9Nd8Wxg+FFBVppJXPvJvAlZxACjX
-						i93rokFJXieWQx3R4OGiJxsouCbfJsyjKxS+DOMtQqQ229NrcGNNfBwjKtLopaYI
-						oo8ofxZLY6Y1aOhpepMTczZqFND/gtHVcUfhXGHNUDG+sN/cbe6W6VEzDIKlge5w
-						vjEJWn9IRfdo2RYGoBdc561L1RnXiTNekmsmrBOGO3MXUJSkplzepr08XwIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg9zaGliLmhvcGUuYWMudWuGJmh0dHBzOi8vc2hpYi5o
-						b3BlLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTS/UZaSWqRgi54sLx4
-						HaDi1fGhizANBgkqhkiG9w0BAQUFAAOCAQEAQMiFtqFds58lE3wT/UqQqFSxpz6t
-						eFvNR90R1jJ1en7YGFKFtVqL6gEOh/O4Y5et+VASZ9OJalRpmlO14l3NrG5+h8Nx
-						K4NUH/9lOBrMPvwgWWuiSYxigmWIgfsTTQIWbnc8m/koGuAzHkhmki/LE0DcEeeW
-						c4OxCwaN4AHpdet/nYzSAU7dO1RunbPGSx57N97B8hDELyYW722iSbUHrUceve4L
-						rGFF1QHnMhz7uidDubpoJ6ZJtPhXIr+eFPw15Y0P4Rw9rTFGKofJ5lbX7FleuQJv
-						wMyh37KZ3ivrQ8dpKTnnMnKyckECdFT0jqYAZHMeHLWiRYfxAAXi3mqDzQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.hope.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.hope.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">Liverpool Hope University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Liverpool Hope University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hope.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Beecroft</SurName>
-    <EmailAddress>mailto:beecrom@hope.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jeff</GivenName>
-    <SurName>Stone</SurName>
-    <EmailAddress>mailto:stonej@hope.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.hopwood.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.hopwood.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 5e71ef6e..00000000
--- a/swamid-interfederations-2.0/shib.hopwood.ac.uk-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" entityID="https://shib.hopwood.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Hopwood Hall College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-25T16: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">hopwood.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEsTCCA5mgAwIBAgIRALnjZG05JaVVoUZ0xE0JifUwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMTA4MTgwMDAwMDBaFw0xNDA4MTcyMzU5NTlaMIGIMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjESMBAGA1UEBxMJTWlkZGxldG9u
-						MR0wGwYDVQQKExRIb3B3b29kIEhhbGwgQ29sbGVnZTEUMBIGA1UECxMLSVQgU2Vy
-						dmljZXMxGzAZBgNVBAMTEnNoaWIuaG9wd29vZC5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAMTEzlsQCuuQ22DtG3+IFJTPxvZ2iZyYdIbOFduU
-						USos7vfb5GQfJkwSrYS6UursJvwrFBVcKi2KCDkS+EJ7ymvWaMKSQY38NbaNwsjw
-						0MzynunhcVGHVEidZB2X2MgwYn6aT2rWcu8GSdScxYg9mlgGy0xN6kxooMB3Gxhy
-						Bi06mYqMZYGFwdZfuJC0VbRfAW2X1cxxIs07aTrx+xx7Lghzf7BWgupVnqtvIkGW
-						efk4oYerYwcCWe6pNHhw5XTbJzjyNLIKz+4yAP36Bbu2TezoGr0ZiQ8ah2Xwq/h6
-						Wzg4Jbvx2u+9BCuBXyELhOKi5Idfg3f4LHaG4pcrhiT0fmUCAwEAAaOCAWUwggFh
-						MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTaHgoB
-						4D9pslBrxTsyQgpCmLFk2zAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAd
-						BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEE
-						AbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-						b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-						KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-						AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-						aGliLmhvcHdvb2QuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAHRlfjnge7jB++dY
-						xSUX3tdqK0mUO9z3QurwOkMQ/IiJj0vZEag9Y34Pmz4rG0qMGrZAM0oUpH7y2kDA
-						7zib/aBERmNzdzviCw7FOcSBeNL53vRJqmK/4/cz6eLYeFqCZlSQ6m9Cog9VpmhQ
-						RrSHcJlKGTejTq/XoLiwUFgRzlpDcRWJ8oyxyGEWfut2jG15SNTa99RXGvpC3KJW
-						ZE3W6D7eFqgEQqfNN5r+aVuRrBxgIJYC+CrJWOyGifwjtqLbHmdDiH6jiAocIYvG
-						AFrPIiFp7CO63f1PksTxW1WEYIs2h5iRHPJlUY0TCpOti+PO+h4WIKCL3jAvhcMH
-						u1oFYBY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.hopwood.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.hopwood.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://shib.hopwood.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.hopwood.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.hopwood.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.hopwood.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">hopwood.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEsTCCA5mgAwIBAgIRALnjZG05JaVVoUZ0xE0JifUwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMTA4MTgwMDAwMDBaFw0xNDA4MTcyMzU5NTlaMIGIMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjESMBAGA1UEBxMJTWlkZGxldG9u
-						MR0wGwYDVQQKExRIb3B3b29kIEhhbGwgQ29sbGVnZTEUMBIGA1UECxMLSVQgU2Vy
-						dmljZXMxGzAZBgNVBAMTEnNoaWIuaG9wd29vZC5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAMTEzlsQCuuQ22DtG3+IFJTPxvZ2iZyYdIbOFduU
-						USos7vfb5GQfJkwSrYS6UursJvwrFBVcKi2KCDkS+EJ7ymvWaMKSQY38NbaNwsjw
-						0MzynunhcVGHVEidZB2X2MgwYn6aT2rWcu8GSdScxYg9mlgGy0xN6kxooMB3Gxhy
-						Bi06mYqMZYGFwdZfuJC0VbRfAW2X1cxxIs07aTrx+xx7Lghzf7BWgupVnqtvIkGW
-						efk4oYerYwcCWe6pNHhw5XTbJzjyNLIKz+4yAP36Bbu2TezoGr0ZiQ8ah2Xwq/h6
-						Wzg4Jbvx2u+9BCuBXyELhOKi5Idfg3f4LHaG4pcrhiT0fmUCAwEAAaOCAWUwggFh
-						MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTaHgoB
-						4D9pslBrxTsyQgpCmLFk2zAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAd
-						BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEE
-						AbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-						b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-						KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-						AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
-						aGliLmhvcHdvb2QuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAHRlfjnge7jB++dY
-						xSUX3tdqK0mUO9z3QurwOkMQ/IiJj0vZEag9Y34Pmz4rG0qMGrZAM0oUpH7y2kDA
-						7zib/aBERmNzdzviCw7FOcSBeNL53vRJqmK/4/cz6eLYeFqCZlSQ6m9Cog9VpmhQ
-						RrSHcJlKGTejTq/XoLiwUFgRzlpDcRWJ8oyxyGEWfut2jG15SNTa99RXGvpC3KJW
-						ZE3W6D7eFqgEQqfNN5r+aVuRrBxgIJYC+CrJWOyGifwjtqLbHmdDiH6jiAocIYvG
-						AFrPIiFp7CO63f1PksTxW1WEYIs2h5iRHPJlUY0TCpOti+PO+h4WIKCL3jAvhcMH
-						u1oFYBY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.hopwood.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.hopwood.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">Hopwood Hall College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hopwood Hall College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hopwood.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Les</GivenName>
-    <SurName>Douthwaite</SurName>
-    <EmailAddress>mailto:Les.Douthwaite@hopwood.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Les</GivenName>
-    <SurName>Douthwaite</SurName>
-    <EmailAddress>mailto:Les.Douthwaite@hopwood.ac.uk</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 136619bd..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ifgoiano.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://shib.ifgoiano.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ifgoiano.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ifgoiano.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ifgoiano.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ifgoiano.edu.br:8443/idp/profile/SAML1/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">IFGOIANO - Instituto Federal Goiano</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFGOIANO - Instituto Federal Goiano</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFGOIANO - Instituto Federal Goiano</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifgoiano.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifgoiano.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Frederico Pereira da Cunha</md:SurName>
-    <md:EmailAddress>frederico.pereira@ifgoiano.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml
deleted file mode 100644
index a461b97b..00000000
--- a/swamid-interfederations-2.0/shib.ihs.ac.at-idp-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ihs.ac.at/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2014-06-03T09:19:52Z">
-      <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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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">ihs.ac.at</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Institut für Höhere Studien</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Institute for Advanced Studies</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ihs.ac.at/</mdui:InformationURL>
-        <mdui:Logo width="312" height="53">https://shib.ihs.ac.at/logo.jpg</mdui:Logo>
-        <mdui:Logo width="16" height="16">https://shib.ihs.ac.at/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>78.104.136.0/21</mdui:IPHint>
-        <mdui:DomainHint>ihs.ac.at</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:48.19539,16.34310</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>
-MIIDJDCCAgygAwIBAgIVAOgeJhXY1VXjDMkzFquM9nu+yZo+MA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnNoaWIuaWhzLmFjLmF0MB4XDTE0MDUwOTE1MjU1MloX
-DTM0MDUwOTE1MjU1MlowGTEXMBUGA1UEAxMOc2hpYi5paHMuYWMuYXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeED2QysFaRKSzdMP+QuJArV7j8bBP
-bVVZqLwW25RDrL6kBl5FRyQYtnkTE9yXKlEy2mAj43FzqBTknxnTMWHShXSFISdi
-3mY/tjqoTAgaN6JfyISlBSNLsx+0XcZ3ZelakqZHp1b5mvJnSiGI6o69dunFcxGU
-vPf9NJaaZsUxM+9wYlQQqLM7HYeknl6KpCi9jgDr9k3INlqE6wpVXHdyDytd7CAh
-8NGvmmlB9744Pd07raqnQGOHizgZ97/33of6S5QAC0F+KihcSSMxq93VTkC6eRUI
-YEZUyhPfPDyv1a26+bqikA5PWER/Vfq6bdaS62ARr9hvbZafYwfM8YpTAgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnNoaWIuaWhzLmFjLmF0hiVodHRwczovL3NoaWIuaWhz
-LmFjLmF0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSkJ/IMZqy7K+EaaDk3roup
-bMsUJjANBgkqhkiG9w0BAQUFAAOCAQEAd1TCkWpH7wc9NVWtzJ1y67C7ZX9C6SL2
-lIUqBMKL95mVmnLloOUhUSqydLznim5sMdduKAh+p6axDxAwP+3Q9uwVtcHh0tlb
-C0+F70Mm6MnVaQwVDITcqCIBqeONDDXUd++dTxPqDj2cQ1Mg6a+ULXxwhjBwfW8g
-sGSusWJI4ZNZ4/Nd9u4/RJ7te2n84xl9qYQ0RsQ/7vr5Tp31JiFlsi+0nrUr6y0N
-lEVKAYqUEoEwL/X/qMs2kR2kp148SaKFZ5JwjiFjss9eXOIMwJuue5khX4on7WkB
-JLo91A2mOkXHy02yCevI30nGPpmdkozBkfz59uy1k2gzB0XQ85jQuw==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ihs.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ihs.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://shib.ihs.ac.at/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ihs.ac.at/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ihs.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: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://shib.ihs.ac.at/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ihs.ac.at/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ihs.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ihs.ac.at/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">Institut für Höhere Studien</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Institute for Advanced Studies</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Institut für Höhere Studien</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Institute for Advanced Studies</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ihs.ac.at/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IHS</md:GivenName>
-    <md:SurName>Hotline</md:SurName>
-    <md:EmailAddress>mailto:hotline@ihs.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml b/swamid-interfederations-2.0/shib.informit.com.au-shibboleth.xml
deleted file mode 100644
index 025f183d..00000000
--- a/swamid-interfederations-2.0/shib.informit.com.au-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://shib.informit.com.au/shibboleth">
-  <!--
-		This is an "Informit" Shibboleth SP for RMIT Training Pty Ltd.
-	-->
-  <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="2014-12-23T10:04:29Z">
-      <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:Description xml:lang="en">Informit is the premier source of core research and resources from the Australasian region.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Informit</mdui:DisplayName>
-        <mdui:Logo height="43" width="136">https://search.informit.com.au/images-v4/logo-informit.gif</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://shib.informit.com.au/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://shib.informit.com.au/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://shib.informit.com.au/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://shib.informit.com.au/Shibboleth.sso/WAYF"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJALYvWF0HTg94MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHNoaWIuaW5mb3JtaXQuY29tLmF1MB4XDTEzMDYwNjAxMzMzMFoXDTIzMDYw
-						NDAxMzMzMFowHzEdMBsGA1UEAxMUc2hpYi5pbmZvcm1pdC5jb20uYXUwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQConFnj3K7sHy3Xa8iyPuW3NSYl9H8L
-						1yUYum0MvgrMtxSn+hhrRQZS9Ub1E+7BLjsdBfmnDVsL8i+nCmTtWuDhINSeCPhh
-						RVF4pJ6zl6OFRc0k4X5JhTF7hfqKMmvALAUzMvRRb/Q6YmRFdsZq6cdyZxZaMKUN
-						CWwjsFHD9Tg4bF6s+OVdnSqpTJE518wzl8LxklkSeo/xjWoBezA11t8/E5HKFqv3
-						Djwvd5cF8Pt5Cyxp8wz8oacyzamQFhWcn2XQcaSUh8vodNCFtFxvPXl1mcZGY+kq
-						iCyT91pSxSFasliWoJaY839DmqaqYZtPN92lYMmDLeNYEX0hBczBxztTAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFHNoaWIuaW5mb3JtaXQuY29tLmF1MB0GA1UdDgQWBBT2
-						l+da01RVVegnzL4KMKKI9W79cTANBgkqhkiG9w0BAQUFAAOCAQEAKZyhvO7eDK57
-						xQ2STBOYKOJC9yEpH2CmNhkshIgvTN3S2yYfz1jjtTAxCke/2FyO3BIJCGgDeXG/
-						MdL9DTmblscFdhyAqvw/Y4IZMVPePrvOna8CmdsSXxV1V1B+YO6q8qlWQ/19Aqs8
-						yfoTBDA3DSXYPqfYN2Q44J9B45tSdfr5Et3bcISdusu6aXnxwfpm2S9SZ9fkQCSM
-						oT3Pa2/yXfxkvLyszNsiSjV7p30I6qpIOELLILYxN881SGs0Xi0GPhw9LtGJT6wY
-						/HUOp21fktmi6T1RRosh/kjF69hpNeY1qnoobw4stsDRi36AybFABgv0wxFk/4PL
-						t2UA+9z1qA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shib.informit.com.au/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.informit.com.au/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.informit.com.au/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.informit.com.au/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RMIT Training Pty Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Informit</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.informit.com.au/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Informit Support</GivenName>
-    <EmailAddress>mailto:support@rmitpublishing.com.au</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Deepak</GivenName>
-    <SurName>Vasa</SurName>
-    <EmailAddress>mailto:deepak.vasa@rmit.edu.au</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ingramdigital.com-shibboleth.xml b/swamid-interfederations-2.0/shib.ingramdigital.com-shibboleth.xml
deleted file mode 100644
index dddc51ee..00000000
--- a/swamid-interfederations-2.0/shib.ingramdigital.com-shibboleth.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.ingramdigital.com/shibboleth">
-  <!--
-		This is a Shibboleth MyiLibrary.com SP owned by Ingram Digital.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-02T16:54:25Z"/>
-  </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.ingramdigital.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://shib.ingramdigital.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFxDCCBKygAwIBAgIQOpCD+8UZ84TwSedea43aUDANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwMzMw
-						MDAwMDAwWhcNMTgwMzMxMjM1OTU5WjCBsDELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
-						CVRlbm5lc3NlZTERMA8GA1UEBxQITGFWZXJnbmUxFzAVBgNVBAoUDkluZ3JhbSBE
-						aWdpdGFsMQswCQYDVQQLFAJJVDEzMDEGA1UECxQqVGVybXMgb2YgdXNlIGF0IHd3
-						dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MR8wHQYDVQQDFBZzaGliLmluZ3JhbWRp
-						Z2l0YWwuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtR7bJj0G
-						944b3VEsUv+lB9czHTMCVsjQxKL9gj39e5kwh0pv1d2dNgcVTiMxjeX+ytziakLw
-						jvNugfmWRqV5P2TAcyforAVFjknUGIY33vfqqn8EhxE8ydpcf1e2soYb8SnqBW84
-						AKkcuy9sOvsmjH2mP5wxzdHfbUG+2iJqhXPzEdZZp+3OjA0MKpJgoo0LDxmiGbKL
-						6u+DOLsi0sqvh8c/M0fq3vA+BQQOL+9vWL2Yf1jbV0hpdoTUMxixLlf9thItPh6h
-						Ucok8f6OhWSK5slTXO3IVoki9uRAzEOckkyzRqthuNOgQgXSzDVxzaygeGSfmvSL
-						wJ59DW3pYFhLIwIDAQABo4IB0TCCAc0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAw
-						RQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMy1jcmwudmVyaXNp
-						Z24uY29tL1NWUlNlY3VyZUczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcD
-						MCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwHQYD
-						VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGC
-						fh0gqyX0AWPYvnmlMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDov
-						L29jc3AudmVyaXNpZ24uY29tMEAGCCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJl
-						LUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEM
-						BGIwYKFeoFwwWjBYMFYWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy7
-						0FI4mymsSweLIQUYMCYWJGh0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28x
-						LmdpZjANBgkqhkiG9w0BAQUFAAOCAQEApLyZmCn4L1QNZ2xg1zbqv07Jfvo4WllF
-						kWOxaWWOBLoWi73/BNwcPsUgbnDGxRFLWKeMbdVPiS2ezI4ckTPShxw6Vq7wkRWQ
-						wRkQAE8AOfv5ZqMc3T2RSEJQu+FRSfYh4W6CTbDd0YXf6kPC5X/tStgFWlFr3hNY
-						ahkl80i8Ykgw14NIuW0AFTSQc+9Wl/B46rQ2wyOhM51XOQe9yvfKllef3npk8NTw
-						mMUY52JZtyVONCAvb8UlR67nIEfo1gKWsLqajHh3T39WaAzlqN7wJm+ugOx9WD/S
-						o8jyra7+kME1GlD/W7OIckTkwxoAkB3J8jOgmlzVfOtITlgjTn/iHA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ingramdigital.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ingramdigital.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ingramdigital.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ingramdigital.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.ingramdigital.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.ingramdigital.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ingram Digital</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MyiLibrary.com</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.myilibrary.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Deron</GivenName>
-    <SurName>Masales</SurName>
-    <EmailAddress>mailto:dmasales@myilibrary.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Deron</GivenName>
-    <SurName>Masales</SurName>
-    <EmailAddress>mailto:dmasales@myilibrary.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml
deleted file mode 100644
index f7d2019d..00000000
--- a/swamid-interfederations-2.0/shib.its.fsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,230 +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://shib.its.fsu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">fsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Florida State University</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>
-MIIHHDCCBQSgAwIBAgIJAOyJ6VxozPsEMA0GCSqGSIb3DQEBBQUAMIIBFjELMAkG
-A1UEBhMCVVMxDjAMBgNVBBETBTMyMzA2MRAwDgYDVQQIEwdGbG9yaWRhMRQwEgYD
-VQQHEwtUYWxsYWhhc3NlZTEhMB8GA1UECRMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJz
-aXR5MSgwJgYDVQQJEx82MTAwQyBVbml2ZXJzaXR5IENlbnRlciBNUyAyNjIwMSEw
-HwYDVQQKExhGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxFzAVBgNVBAsTDklUUy1N
-aWRkbGV3YXJlMSswKQYJKoZIhvcNAQkBFhxJVFMtTWlkZGxld2FyZUBhZG1pbi5m
-c3UuZWR1MRkwFwYDVQQDExBzaGliLml0cy5mc3UuZWR1MCAXDTE0MDExNTE5MTM0
-NVoYDzIxMTIxMjIyMTkxMzQ1WjCCARYxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUz
-MjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UEBxMLVGFsbGFoYXNzZWUxITAf
-BgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0eTEoMCYGA1UECRMfNjEwMEMg
-VW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8GA1UEChMYRmxvcmlkYSBTdGF0
-ZSBVbml2ZXJzaXR5MRcwFQYDVQQLEw5JVFMtTWlkZGxld2FyZTErMCkGCSqGSIb3
-DQEJARYcSVRTLU1pZGRsZXdhcmVAYWRtaW4uZnN1LmVkdTEZMBcGA1UEAxMQc2hp
-Yi5pdHMuZnN1LmVkdTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN3A
-S8Ioxszl8uY33i/h84lkk5pVrqBaj5oWdZtC2hKwhbO9cUDl0Fy0oB/YEeyVerZV
-QG9dO9JZp+5ydO1yiUM67U/qYffN+6pzclt4r4RPnXQwMQEEiTcruGNN3rQy/u8y
-BPAY5nkOz7ybBg7FntYmzHJY+i9w187MGac7jGmAW9TaGM66eOUS9P+lXQjjlc0i
-gEj8vlXoPe5aNz4a5rW6PczOpdpf8qYhVFTJsAzhbrXO2WICWRKETOgX6J+nX9za
-rL9c5otDNySI79Gdz0xy9bpE5ivJsxWvyxyEun0mQsTonEn/fyqyTvuc5+6XAosH
-fcfD/x0aiUOMhpgRKccWpzkLitu2QpjLPb75d03owKjnovfMxVKYxAqDwpE5xuLd
-pjoafLC64nGtBT1s+9jtTx5eYeUZX+K6bBpzIPTgX9josG5+9El72d82MrDenV6L
-PK2PrtInGlIIP85jyg05iX3N4xVaV0/FzHaSmGmHdBm7ssYjF1i2a7RwU0q+EtOy
-hEBAvU+eyJiQ/cOlCEcAqZTGt/pPeJyLMGCbFguHnjDOXlUkIlr8GmiXnS9xth7W
-R3zRwhdQNgaR8SOQ1NcMxHvXTo7UYE03QUrYNNtCcXqGM9YEi5NP4/GVIhBLSntj
-T8Km5daR4G8aPyjsibFmIT6SJpeOn4Tkr1BVilatAgMBAAGjZzBlMEQGA1UdEQQ9
-MDuCEHNoaWIuaXRzLmZzdS5lZHWGJ2h0dHBzOi8vc2hpYi5pdHMuZnN1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUH7v4eLmZUMErxgbbwx6JlI2svoswDQYJ
-KoZIhvcNAQEFBQADggIBAM2ycz4FwhL/2vApURa/hpmlp0zGhsX2F60vm9HDxTFe
-MadcRHuPRNAeYT6sSXHZrKbgPBMxcYwFDZbNzJW2+WmDzr+NRMdHLKWc/gpns2l0
-O83fw9EihpatOCDaaWx2AQ+YANrC+hsTTKWUypGukV4iz2UfLofOgzzrqkVADImO
-o71xkmtGTdNi8LIZ5TAh0VdjgulLmhtO00fQVUX67pfatJqqymG5sZSWIF7TJ6Mg
-sH26ppdQm6KI2gk8fqVEon1db4JmHqKyWmFHJk71FsP9no0zzuQFnYO2rVYuYOUu
-58bsvp29wdHdyudRx04bCVh2EWEpgqhmAv95I2YC2mSTOQappUB/oBmdfmLJIYLI
-2kbl8Y2NRpBXdk9qMPYCclR6wOviatjMQo9sEy3qIejwyv+a01zEkiMnJSSNyX8M
-ttiOQplZe5GdXU/zC0nx5IOHMIkfjQqtFVn1EWgUuXqDheBSMdTlKpg6Vur7GnD2
-fTdPc7y0ZqurUa2Ux5VOnv+ZvdcsbCVrLPdROZZDcmXhmfb9sq6UzCskN0WRnHpf
-RLpLfE22HaiKomONZ9OhbEW7Wz+ht/oA9AGbJdmpYEqEXBPe5tipffXzGLzzQd5Z
-tkZaeBriA8z142lSzChElmO1LRQ4pSvdjX6yr0BMb3PFQR2w/n0SG9uStXJNobxg
-          </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>
-MIIHMzCCBhugAwIBAgIRANeIvvgkRHOihdJ4fkShxBYwDQYJKoZIhvcNAQEFBQAw
-gZMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtl
-IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMY
-aHR0cDovL3d3dy51c2VydHJ1c3QuY29tMRswGQYDVQQDExJVVE4gLSBEQVRBQ29y
-cCBTR0MwHhcNMTEwMTMxMDAwMDAwWhcNMTMwMTMwMjM1OTU5WjCCASoxCzAJBgNV
-BAYTAlVTMQ4wDAYDVQQREwUzMjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UE
-BxMLVGFsbGFoYXNzZWUxITAfBgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0
-eTEoMCYGA1UECRMfNjEwMEMgVW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8G
-A1UEChMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxKzAp
-BgNVBAsTIkhvc3RlZCBieSBGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxIDAeBgNV
-BAsTF0NvbW9kbyBTR0MgU1NMIFdpbGRjYXJkMRYwFAYDVQQDFA0qLml0cy5mc3Uu
-ZWR1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3cBLwijGzOXy5jfe
-L+HziWSTmlWuoFqPmhZ1m0LaErCFs71xQOXQXLSgH9gR7JV6tlVAb1070lmn7nJ0
-7XKJQzrtT+ph9837qnNyW3ivhE+ddDAxAQSJNyu4Y03etDL+7zIE8BjmeQ7PvJsG
-DsWe1ibMclj6L3DXzswZpzuMaYBb1NoYzrp45RL0/6VdCOOVzSKASPy+Veg97lo3
-Phrmtbo9zM6l2l/ypiFUVMmwDOFutc7ZYgJZEoRM6Bfon6df3Nqsv1zmi0M3JIjv
-0Z3PTHL1ukTmK8mzFa/LHIS6fSZCxOicSf9/KrJO+5zn7pcCiwd9x8P/HRqJQ4yG
-mBEpxxanOQuK27ZCmMs9vvl3TejAqOei98zFUpjECoPCkTnG4t2mOhp8sLrica0F
-PWz72O1PHl5h5Rlf4rpsGnMg9OBf2Oiwbn70SXvZ3zYysN6dXos8rY+u0icaUgg/
-zmPKDTmJfc3jFVpXT8XMdpKYaYd0GbuyxiMXWLZrtHBTSr4S07KEQEC9T57ImJD9
-w6UIRwCplMa3+k94nIswYJsWC4eeMM5eVSQiWvwaaJedL3G2HtZHfNHCF1A2BpHx
-I5DU1wzEe9dOjtRgTTdBStg020JxeoYz1gSLk0/j8ZUiEEtKe2NPwqbl1pHgbxo/
-KOyJsWYhPpIml46fhOSvUFWKVq0CAwEAAaOCAeYwggHiMB8GA1UdIwQYMBaAFFMy
-0bPPf/rg8aBdhU6S0p5FHbRPMB0GA1UdDgQWBBQfu/h4uZlQwSvGBtvDHomUjay+
-izAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADA0BgNVHSUELTArBggrBgEF
-BQcDAQYIKwYBBQUHAwIGCisGAQQBgjcKAwMGCWCGSAGG+EIEATBGBgNVHSAEPzA9
-MDsGDCsGAQQBsjEBAgEDBDArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5j
-b21vZG8uY29tL0NQUzBtBgNVHR8EZjBkMDGgL6AthitodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9VVE4tREFUQUNvcnBTR0MuY3JsMC+gLaArhilodHRwOi8vY3JsLmNv
-bW9kby5uZXQvVVROLURBVEFDb3JwU0dDLmNybDBuBggrBgEFBQcBAQRiMGAwOAYI
-KwYBBQUHMAKGLGh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL1VUTkFkZFRydXN0U0dD
-Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wJQYD
-VR0RBB4wHIINKi5pdHMuZnN1LmVkdYILaXRzLmZzdS5lZHUwDQYJKoZIhvcNAQEF
-BQADggEBAH0d8k4qW7pbDYGk3w9ydUuOMPZbiTzAZdtNlBTWegSIYz+XqKDLBUhc
-WAqNlEzP6EgMIqbotu6fDPslqjh+E302DSJIHAXMyY6LpacEszxBxQGTg+sv4W5z
-/b3AYJ1/U7wfNSHIucZUEaR5sFlVAylrFD5vvTXssmBaxjoAguR1UR9VETSVDiQf
-PwB3HhlDuzfGb2f38Lih4zMBOLTpfYmrk61R8EeZy0EfbihvNaXPCPwiEIHbO782
-Y48ocWiFA1v3w9AiVGRbgItfnaZ9I/tWZeRuegm4D0pcJdVnxoRDqDA54vEQlUt1
-2eRDf3zvQVY3IgWWsBv6VDWwwBhjYY4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.its.fsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.its.fsu.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHHDCCBQSgAwIBAgIJAOyJ6VxozPsEMA0GCSqGSIb3DQEBBQUAMIIBFjELMAkG
-A1UEBhMCVVMxDjAMBgNVBBETBTMyMzA2MRAwDgYDVQQIEwdGbG9yaWRhMRQwEgYD
-VQQHEwtUYWxsYWhhc3NlZTEhMB8GA1UECRMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJz
-aXR5MSgwJgYDVQQJEx82MTAwQyBVbml2ZXJzaXR5IENlbnRlciBNUyAyNjIwMSEw
-HwYDVQQKExhGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxFzAVBgNVBAsTDklUUy1N
-aWRkbGV3YXJlMSswKQYJKoZIhvcNAQkBFhxJVFMtTWlkZGxld2FyZUBhZG1pbi5m
-c3UuZWR1MRkwFwYDVQQDExBzaGliLml0cy5mc3UuZWR1MCAXDTE0MDExNTE5MTM0
-NVoYDzIxMTIxMjIyMTkxMzQ1WjCCARYxCzAJBgNVBAYTAlVTMQ4wDAYDVQQREwUz
-MjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UEBxMLVGFsbGFoYXNzZWUxITAf
-BgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0eTEoMCYGA1UECRMfNjEwMEMg
-VW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8GA1UEChMYRmxvcmlkYSBTdGF0
-ZSBVbml2ZXJzaXR5MRcwFQYDVQQLEw5JVFMtTWlkZGxld2FyZTErMCkGCSqGSIb3
-DQEJARYcSVRTLU1pZGRsZXdhcmVAYWRtaW4uZnN1LmVkdTEZMBcGA1UEAxMQc2hp
-Yi5pdHMuZnN1LmVkdTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAN3A
-S8Ioxszl8uY33i/h84lkk5pVrqBaj5oWdZtC2hKwhbO9cUDl0Fy0oB/YEeyVerZV
-QG9dO9JZp+5ydO1yiUM67U/qYffN+6pzclt4r4RPnXQwMQEEiTcruGNN3rQy/u8y
-BPAY5nkOz7ybBg7FntYmzHJY+i9w187MGac7jGmAW9TaGM66eOUS9P+lXQjjlc0i
-gEj8vlXoPe5aNz4a5rW6PczOpdpf8qYhVFTJsAzhbrXO2WICWRKETOgX6J+nX9za
-rL9c5otDNySI79Gdz0xy9bpE5ivJsxWvyxyEun0mQsTonEn/fyqyTvuc5+6XAosH
-fcfD/x0aiUOMhpgRKccWpzkLitu2QpjLPb75d03owKjnovfMxVKYxAqDwpE5xuLd
-pjoafLC64nGtBT1s+9jtTx5eYeUZX+K6bBpzIPTgX9josG5+9El72d82MrDenV6L
-PK2PrtInGlIIP85jyg05iX3N4xVaV0/FzHaSmGmHdBm7ssYjF1i2a7RwU0q+EtOy
-hEBAvU+eyJiQ/cOlCEcAqZTGt/pPeJyLMGCbFguHnjDOXlUkIlr8GmiXnS9xth7W
-R3zRwhdQNgaR8SOQ1NcMxHvXTo7UYE03QUrYNNtCcXqGM9YEi5NP4/GVIhBLSntj
-T8Km5daR4G8aPyjsibFmIT6SJpeOn4Tkr1BVilatAgMBAAGjZzBlMEQGA1UdEQQ9
-MDuCEHNoaWIuaXRzLmZzdS5lZHWGJ2h0dHBzOi8vc2hpYi5pdHMuZnN1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUH7v4eLmZUMErxgbbwx6JlI2svoswDQYJ
-KoZIhvcNAQEFBQADggIBAM2ycz4FwhL/2vApURa/hpmlp0zGhsX2F60vm9HDxTFe
-MadcRHuPRNAeYT6sSXHZrKbgPBMxcYwFDZbNzJW2+WmDzr+NRMdHLKWc/gpns2l0
-O83fw9EihpatOCDaaWx2AQ+YANrC+hsTTKWUypGukV4iz2UfLofOgzzrqkVADImO
-o71xkmtGTdNi8LIZ5TAh0VdjgulLmhtO00fQVUX67pfatJqqymG5sZSWIF7TJ6Mg
-sH26ppdQm6KI2gk8fqVEon1db4JmHqKyWmFHJk71FsP9no0zzuQFnYO2rVYuYOUu
-58bsvp29wdHdyudRx04bCVh2EWEpgqhmAv95I2YC2mSTOQappUB/oBmdfmLJIYLI
-2kbl8Y2NRpBXdk9qMPYCclR6wOviatjMQo9sEy3qIejwyv+a01zEkiMnJSSNyX8M
-ttiOQplZe5GdXU/zC0nx5IOHMIkfjQqtFVn1EWgUuXqDheBSMdTlKpg6Vur7GnD2
-fTdPc7y0ZqurUa2Ux5VOnv+ZvdcsbCVrLPdROZZDcmXhmfb9sq6UzCskN0WRnHpf
-RLpLfE22HaiKomONZ9OhbEW7Wz+ht/oA9AGbJdmpYEqEXBPe5tipffXzGLzzQd5Z
-tkZaeBriA8z142lSzChElmO1LRQ4pSvdjX6yr0BMb3PFQR2w/n0SG9uStXJNobxg
-          </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>
-MIIHMzCCBhugAwIBAgIRANeIvvgkRHOihdJ4fkShxBYwDQYJKoZIhvcNAQEFBQAw
-gZMxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtl
-IENpdHkxHjAcBgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMY
-aHR0cDovL3d3dy51c2VydHJ1c3QuY29tMRswGQYDVQQDExJVVE4gLSBEQVRBQ29y
-cCBTR0MwHhcNMTEwMTMxMDAwMDAwWhcNMTMwMTMwMjM1OTU5WjCCASoxCzAJBgNV
-BAYTAlVTMQ4wDAYDVQQREwUzMjMwNjEQMA4GA1UECBMHRmxvcmlkYTEUMBIGA1UE
-BxMLVGFsbGFoYXNzZWUxITAfBgNVBAkTGEZsb3JpZGEgU3RhdGUgVW5pdmVyc2l0
-eTEoMCYGA1UECRMfNjEwMEMgVW5pdmVyc2l0eSBDZW50ZXIgTVMgMjYyMDEhMB8G
-A1UEChMYRmxvcmlkYSBTdGF0ZSBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxKzAp
-BgNVBAsTIkhvc3RlZCBieSBGbG9yaWRhIFN0YXRlIFVuaXZlcnNpdHkxIDAeBgNV
-BAsTF0NvbW9kbyBTR0MgU1NMIFdpbGRjYXJkMRYwFAYDVQQDFA0qLml0cy5mc3Uu
-ZWR1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3cBLwijGzOXy5jfe
-L+HziWSTmlWuoFqPmhZ1m0LaErCFs71xQOXQXLSgH9gR7JV6tlVAb1070lmn7nJ0
-7XKJQzrtT+ph9837qnNyW3ivhE+ddDAxAQSJNyu4Y03etDL+7zIE8BjmeQ7PvJsG
-DsWe1ibMclj6L3DXzswZpzuMaYBb1NoYzrp45RL0/6VdCOOVzSKASPy+Veg97lo3
-Phrmtbo9zM6l2l/ypiFUVMmwDOFutc7ZYgJZEoRM6Bfon6df3Nqsv1zmi0M3JIjv
-0Z3PTHL1ukTmK8mzFa/LHIS6fSZCxOicSf9/KrJO+5zn7pcCiwd9x8P/HRqJQ4yG
-mBEpxxanOQuK27ZCmMs9vvl3TejAqOei98zFUpjECoPCkTnG4t2mOhp8sLrica0F
-PWz72O1PHl5h5Rlf4rpsGnMg9OBf2Oiwbn70SXvZ3zYysN6dXos8rY+u0icaUgg/
-zmPKDTmJfc3jFVpXT8XMdpKYaYd0GbuyxiMXWLZrtHBTSr4S07KEQEC9T57ImJD9
-w6UIRwCplMa3+k94nIswYJsWC4eeMM5eVSQiWvwaaJedL3G2HtZHfNHCF1A2BpHx
-I5DU1wzEe9dOjtRgTTdBStg020JxeoYz1gSLk0/j8ZUiEEtKe2NPwqbl1pHgbxo/
-KOyJsWYhPpIml46fhOSvUFWKVq0CAwEAAaOCAeYwggHiMB8GA1UdIwQYMBaAFFMy
-0bPPf/rg8aBdhU6S0p5FHbRPMB0GA1UdDgQWBBQfu/h4uZlQwSvGBtvDHomUjay+
-izAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADA0BgNVHSUELTArBggrBgEF
-BQcDAQYIKwYBBQUHAwIGCisGAQQBgjcKAwMGCWCGSAGG+EIEATBGBgNVHSAEPzA9
-MDsGDCsGAQQBsjEBAgEDBDArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5j
-b21vZG8uY29tL0NQUzBtBgNVHR8EZjBkMDGgL6AthitodHRwOi8vY3JsLmNvbW9k
-b2NhLmNvbS9VVE4tREFUQUNvcnBTR0MuY3JsMC+gLaArhilodHRwOi8vY3JsLmNv
-bW9kby5uZXQvVVROLURBVEFDb3JwU0dDLmNybDBuBggrBgEFBQcBAQRiMGAwOAYI
-KwYBBQUHMAKGLGh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL1VUTkFkZFRydXN0U0dD
-Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wJQYD
-VR0RBB4wHIINKi5pdHMuZnN1LmVkdYILaXRzLmZzdS5lZHUwDQYJKoZIhvcNAQEF
-BQADggEBAH0d8k4qW7pbDYGk3w9ydUuOMPZbiTzAZdtNlBTWegSIYz+XqKDLBUhc
-WAqNlEzP6EgMIqbotu6fDPslqjh+E302DSJIHAXMyY6LpacEszxBxQGTg+sv4W5z
-/b3AYJ1/U7wfNSHIucZUEaR5sFlVAylrFD5vvTXssmBaxjoAguR1UR9VETSVDiQf
-PwB3HhlDuzfGb2f38Lih4zMBOLTpfYmrk61R8EeZy0EfbihvNaXPCPwiEIHbO782
-Y48ocWiFA1v3w9AiVGRbgItfnaZ9I/tWZeRuegm4D0pcJdVnxoRDqDA54vEQlUt1
-2eRDf3zvQVY3IgWWsBv6VDWwwBhjYY4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.its.fsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Florida State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Florida State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fsu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Chuck Kemeny</md:GivenName>
-    <md:EmailAddress>ckemeny@admin.fsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Diane Higgins</md:GivenName>
-    <md:EmailAddress>dhiggins@fsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jonathan Liedy</md:GivenName>
-    <md:EmailAddress>jliedy@fsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml b/swamid-interfederations-2.0/shib.labarchives.com-sp-production.xml
deleted file mode 100644
index dfd79c9d..00000000
--- a/swamid-interfederations-2.0/shib.labarchives.com-sp-production.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://shib.labarchives.com/sp/production">
-  <!--
-		This is a "LabArchives" Shibboleth SP for LabArchives, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-18T17:36:26Z"/>
-  </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.labarchives.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">LabArchives</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Electronic Laboratory Notebook, including Professional and Classroom Editions.</mdui:Description>
-        <mdui:Logo height="100" width="100">https://mynotebook.labarchives.com/images/la_beaker.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQjCCAiqgAwIBAgIJAN/P3HVfB4O6MA0GCSqGSIb3DQEBBQUAMDQxMjAwBgNV
-						BAMTKWRvbVUtMTItMzEtMzktMDMtMzAtNTQuY29tcHV0ZS0xLmludGVybmFsMB4X
-						DTEyMTIwNDIxMDM1NloXDTIyMTIwMjIxMDM1NlowNDEyMDAGA1UEAxMpZG9tVS0x
-						Mi0zMS0zOS0wMy0zMC01NC5jb21wdXRlLTEuaW50ZXJuYWwwggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDYEIq97L4YEh0lzxO1gU0c3ZlD4luAqhr2DQeo
-						/14OAlhUDRqgDgEdpKaGec2guAXiyJSuA0bsTFOx+DaYZorr7MFfuMMm2P7rU45G
-						mbrhBmMLiQalvlAyk/2tOVenPM4yCJ6FMvf9o5AS+c4JsZCprSKSjSegMt6+zy4E
-						uaO/SjD4DJ6sz4Xa7RqWIxVygGrjPKD7zOQpfDVVOc78mdUnCtNAudTiiLGBsRrZ
-						etlymJm7snHG2gGcHC9Zfa1uoBsBzrwPA4X/nu/B4ICnuyTgLJq4Fx+o54bqWSZZ
-						A9CNXvSXjoAOw3+Jqgdm1WFOrYOwOPGP0Y84vKUbaj+lzL1FAgMBAAGjVzBVMDQG
-						A1UdEQQtMCuCKWRvbVUtMTItMzEtMzktMDMtMzAtNTQuY29tcHV0ZS0xLmludGVy
-						bmFsMB0GA1UdDgQWBBQXjWp50EyWG9BwpuZJai08QZoJRTANBgkqhkiG9w0BAQUF
-						AAOCAQEAiczpR8WP641CI/wX0wuVnhtYWQvrLcqhbzsOSojlK04DC8MdDysK+tpv
-						KROZ8F4D1Tngrr4l1MWa0+BVQhW03opIQ2iKDp7fRSlqyJqqXS4DMEw0G2zcde7P
-						D7o/Q8YD/PsboOIvsveaV8g3uaRvv0Y6/i+B/TslX8Mcpc8kkYhpVR1QfFpHo18m
-						OzV0TEys7QRbVskIW8+a0uomjapzkYd3A9GWE4liaWByDSNDw/dqz9TNHKxHg4Ii
-						yIRaQldYvHwxl9A5OL7ZutupYQ4z+C3c7QNBvrRVvM+bcDqxNVGk4MuhcjBdlIlE
-						/C6n87viaq/ZgIt4Vck1JCGjLbLlqg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.labarchives.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.labarchives.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.labarchives.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.labarchives.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.labarchives.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.labarchives.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.labarchives.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.labarchives.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.labarchives.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.labarchives.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.labarchives.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">LabArchives, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">LabArchives</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.labarchives.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>LabArchives Support</GivenName>
-    <EmailAddress>mailto:support@labarchives.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Norman</GivenName>
-    <SurName>Kenney</SurName>
-    <EmailAddress>mailto:nkenney@labarchives.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.lexisnexis.com.xml b/swamid-interfederations-2.0/shib.lexisnexis.com.xml
deleted file mode 100644
index efe55c31..00000000
--- a/swamid-interfederations-2.0/shib.lexisnexis.com.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://shib.lexisnexis.com">
-  <!--
-		This is an SP for Lexis-Nexis Europe Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIEQzCCAyugAwIBAgIJAKsEBMs9ysWqMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNV
-						BAYTAlVTMQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpNaWFtaXNidXJnMRQwEgYD
-						VQQKEwtMRVhJUy1ORVhJUzEcMBoGA1UEAxMTc2hpYi5sZXhpc25leGlzLmNvbTAe
-						Fw0xMTExMzAwMjQ4MzRaFw0yMTExMjcwMjQ4MzRaMGUxCzAJBgNVBAYTAlVTMQ0w
-						CwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpNaWFtaXNidXJnMRQwEgYDVQQKEwtMRVhJ
-						Uy1ORVhJUzEcMBoGA1UEAxMTc2hpYi5sZXhpc25leGlzLmNvbTCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBANjDzx1Y2nFbwojj8gXeqQnJ4QIhK/XYagTy
-						I3v7vJODtI5Ekns5oUqW3eDlJrOsixuzk5sYoqQEkNF3vjcVXPrwEOVb/I4vq/qb
-						Sk8q1+YkFD7CCNx8sMOhUeuJEsYYdgxOaWuHzB0juAGxbeCYGLZU8DY/Zb5kBLXU
-						esSqF1uRKTUl+z5CTls/91Bq9PuM58jesGRIKTg7doyAx+VJi0frnr0Dyse2mG6Y
-						onlgiGOSVdUGQsqj4zHP10xRGbQqEfpvnZxRR/j34uZLaS3H9r0Yks8FSQj+UmtL
-						OkaEDqoWJVGpdwY+HUX6bmTt5BBu1uowAlgOI+6jqF6cXrX0jR0CAwEAAaOB9TCB
-						8jAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
-						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUbbexhyY79bl5AamiayqLi4BN4PowgZcGA1Ud
-						IwSBjzCBjIAUbbexhyY79bl5AamiayqLi4BN4PqhaaRnMGUxCzAJBgNVBAYTAlVT
-						MQ0wCwYDVQQIEwRPaGlvMRMwEQYDVQQHEwpNaWFtaXNidXJnMRQwEgYDVQQKEwtM
-						RVhJUy1ORVhJUzEcMBoGA1UEAxMTc2hpYi5sZXhpc25leGlzLmNvbYIJAKsEBMs9
-						ysWqMA0GCSqGSIb3DQEBBQUAA4IBAQC5UdjOHxhSl8qRwWklR4bpml1aD4/lDInE
-						3/QtvJRQVnZY/VlUF6wnyFMiRJ8twjYvFDQ9OnUFj56N1rc0tbrYxxwhmJ8zGVs0
-						mNKoRZDSa/iUDZ1tUZ1e2Qc2D0/kqqg8tD2WUmXJqHu8SdFZE0wobj2mIOxAO6pV
-						PCAt4y7P0xNscbZ9tXX5RoVIAw1mR7NqFPeGSSUDkzkdpF/ikuRiv2/JLhsb5V+3
-						k5wU1ANaeyvxE8/SFlu3Vi9H0z1ga7Cqp/W9SK93M2yf+ThYWfQj685P2pZkFlm9
-						+3eetB5dJG2Q/ZtZB6LI+i7qqpIoe0fMVx/5GS/Le5m1vuHaCU95
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lexisnexis.com/start/shib/post" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lexisnexis.com/start/shib/artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc1-www.lexisnexis.com/start/shib/post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc1-www.lexisnexis.com/start/shib/artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc2-www.lexisnexis.com/start/shib/post" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc2-www.lexisnexis.com/start/shib/artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc3-www.lexisnexis.com/start/shib/post" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc3-www.lexisnexis.com/start/shib/artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc4-www.lexisnexis.com/start/shib/post" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc4-www.lexisnexis.com/start/shib/artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc5-www.lexisnexis.com/start/shib/post" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc5-www.lexisnexis.com/start/shib/artifact" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc6-www.lexisnexis.com/start/shib/post" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc6-www.lexisnexis.com/start/shib/artifact" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc7-www.lexisnexis.com/start/shib/post" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc7-www.lexisnexis.com/start/shib/artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc8-www.lexisnexis.com/start/shib/post" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc8-www.lexisnexis.com/start/shib/artifact" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc9-www.lexisnexis.com/start/shib/post" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc9-www.lexisnexis.com/start/shib/artifact" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc9shib-www.lexisnexis.com/start/shib/post" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc9shib-www.lexisnexis.com/start/shib/artifact" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc10-www.lexisnexis.com/start/shib/post" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc10-www.lexisnexis.com/start/shib/artifact" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc11-www.lexisnexis.com/start/shib/post" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc11-www.lexisnexis.com/start/shib/artifact" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cdc12-www.lexisnexis.com/start/shib/post" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cdc12-www.lexisnexis.com/start/shib/artifact" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://release-www.lexisnexis.com/start/shib/post" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://release-www.lexisnexis.com/start/shib/artifact" index="29"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Lexis-Nexis Europe Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">LexisNexis</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lexisnexis.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Key Accounts Support</GivenName>
-    <EmailAddress>mailto:KeyAccountsSupport@lexisnexis.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Helpdesk</GivenName>
-    <EmailAddress>mailto:technical.helpdesk@lexisnexis.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml
deleted file mode 100644
index aff8ea0a..00000000
--- a/swamid-interfederations-2.0/shib.lternet.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://shib.lternet.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">lternet.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">LTERN (Long Term Ecological Research Network)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The U.S. LTER Network is an National Science Funded project that includes 26 research sites encompasing a wide range of ecosystem types spanning broad ranges of environmental conditions and human domination of the landscape. The geographic distribution of sites ranges from Alaska to Antarctica and from the Caribbean to French Polynesia and includes agricultural lands, alpine tundra, barrier islands, coastal lagoons, cold and hot deserts, coral reefs, estuaries, forests, freshwater wetlands, grasslands, kelp forests, lakes, open ocean, savannas, streams, and urban landscapes.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.lternet.edu</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>
-MIIDKzCCAhOgAwIBAgIUNQ0S3k+4XlqeFEPjY/nhbLcHvaAwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQc2hpYi5sdGVybmV0LmVkdTAeFw0xMTA1MjYxNDUxMTRa
-Fw0zMTA1MjYxNDUxMTRaMBsxGTAXBgNVBAMTEHNoaWIubHRlcm5ldC5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnFvUgQ4yMEsHe9AVhOfn+1oh6
-7AYPw+9XgL6FRJ12Gfxmvrb/irE0+50xUV5L+okUGhUuyoKTQHBSUOajmlszC4AR
-b8xpYvPQF8WO/wIySxHdHOHrhCYVG96vyosM2U3FgNQ168pdrjooqK4DO2MiBe3e
-ts8nc/ZI0QRrrcQ0ictiw1TAoWj5RX2gRiCgkoLc2sP5mKI4IrnGWaD4Pl+aGIm8
-ceOGIybtVGFXsrbz0pyHZarvIRguKDj3HePZBgCZ/ilixShuEkYaoxLLj0TjSBxc
-QupkXi4rgNKBiyjXu+mSVqi3Ugvvhrsf89MAuCWSox8dPhCxdtfL0LSIeH9LAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHNoaWIubHRlcm5ldC5lZHWGJ2h0dHBzOi8vc2hp
-Yi5sdGVybmV0LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUO/dzbA/SAWfv
-qW5u9ojjlAes5z8wDQYJKoZIhvcNAQEFBQADggEBAG0ebyLXBHau5V06fjQZTD8O
-1oygZEeF1veVV7wnMiLm1hz9b4Wq9pVwXmxGTCtz3ugPm7WfgZNYUvYCm4d4dWQn
-OgPukcpyu57Bi7FWqcLo47rmPhImSQMxr/Z+f9K+wda28yBgxrTwOal6+yOEQTxj
-4qxmVQruRdw8ig+Nj+Ia5+78XpscxQ87uEhrnzSpa9s6g6a20bmbQboH9IWT6WTT
-TRpg/Tzxum6NIPdd4P4mJ2i4h8ivHl59Rl/X3A6H/YvGfMoJIsiuGU5/ydC4gbBL
-aBW874sHe5I9WUlV3L8bfagPwFbw54Htg+fgzSWtN/I0mBUOpm3CglPzd4SvQ5A=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lternet.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lternet.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.lternet.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lternet.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.lternet.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lternet.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUNQ0S3k+4XlqeFEPjY/nhbLcHvaAwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQc2hpYi5sdGVybmV0LmVkdTAeFw0xMTA1MjYxNDUxMTRa
-Fw0zMTA1MjYxNDUxMTRaMBsxGTAXBgNVBAMTEHNoaWIubHRlcm5ldC5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCnFvUgQ4yMEsHe9AVhOfn+1oh6
-7AYPw+9XgL6FRJ12Gfxmvrb/irE0+50xUV5L+okUGhUuyoKTQHBSUOajmlszC4AR
-b8xpYvPQF8WO/wIySxHdHOHrhCYVG96vyosM2U3FgNQ168pdrjooqK4DO2MiBe3e
-ts8nc/ZI0QRrrcQ0ictiw1TAoWj5RX2gRiCgkoLc2sP5mKI4IrnGWaD4Pl+aGIm8
-ceOGIybtVGFXsrbz0pyHZarvIRguKDj3HePZBgCZ/ilixShuEkYaoxLLj0TjSBxc
-QupkXi4rgNKBiyjXu+mSVqi3Ugvvhrsf89MAuCWSox8dPhCxdtfL0LSIeH9LAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHNoaWIubHRlcm5ldC5lZHWGJ2h0dHBzOi8vc2hp
-Yi5sdGVybmV0LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUO/dzbA/SAWfv
-qW5u9ojjlAes5z8wDQYJKoZIhvcNAQEFBQADggEBAG0ebyLXBHau5V06fjQZTD8O
-1oygZEeF1veVV7wnMiLm1hz9b4Wq9pVwXmxGTCtz3ugPm7WfgZNYUvYCm4d4dWQn
-OgPukcpyu57Bi7FWqcLo47rmPhImSQMxr/Z+f9K+wda28yBgxrTwOal6+yOEQTxj
-4qxmVQruRdw8ig+Nj+Ia5+78XpscxQ87uEhrnzSpa9s6g6a20bmbQboH9IWT6WTT
-TRpg/Tzxum6NIPdd4P4mJ2i4h8ivHl59Rl/X3A6H/YvGfMoJIsiuGU5/ydC4gbBL
-aBW874sHe5I9WUlV3L8bfagPwFbw54Htg+fgzSWtN/I0mBUOpm3CglPzd4SvQ5A=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lternet.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LTERN (Long Term Ecological Research Network)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">LTERN (Long Term Ecological Research Network)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lternet.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mark Servilla</md:GivenName>
-    <md:EmailAddress>servilla@lternet.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.xml
deleted file mode 100644
index d2bb248e..00000000
--- a/swamid-interfederations-2.0/shib.lynda.com-shibboleth-sp.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.lynda.com/shibboleth-sp">
-  <!--
-		This is a Shibboleth SP for Lynda.com.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDFDCCAfygAwIBAgIJAMLZrCd7zl9XMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXd3dy5seW5kYS5jb20wHhcNMTExMDIxMTQ0OTE5WhcNMzExMDE2MTQ0OTE5
-						WjAYMRYwFAYDVQQDEw13d3cubHluZGEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA6j3DFreCqV2jROA5Y0LR/q5BCpbI3NmdMyq5wF0CbkZOfp/s
-						rnGyK2Xf6EdidAwGe8E2DwzvQpQHcs3iUb9jyaep8uo4Vkih8UTuO5G7+iZGprYI
-						6qi83uH0euXoCmH7Z0iiFsyYrtnzmxWzGYYiFyXS0/7HaGBnWgXrMCqs5e0VZO0I
-						uYn58OC4HR4Ydx7S11CwV8l/3Yuf1iESuT8718ik2N6xGEY+yAe1GB/QT/GVzuel
-						4R7y+Aas9Gl+6SgvY1Mkxo7iqERx+viGY3sWLzMuQblC4+pCrKU6AeK4Exs+NxWL
-						HT+/B4ADE+vdSF4L6r/D2CBw/kog7x33ociv2QIDAQABo2EwXzA+BgNVHREENzA1
-						gg13d3cubHluZGEuY29thiRodHRwczovL3NoaWIubHluZGEuY29tL3NoaWJib2xl
-						dGgtc3AwHQYDVR0OBBYEFE7TaeX7Yg7gEyzogSoL4g+zg2EzMA0GCSqGSIb3DQEB
-						BQUAA4IBAQCeIHAuamRAKxlbCsSi8xqG9KrFgCA75JhT1eJqkM1IofR0Ylx5fLnp
-						Qi99/vxNtqfPLCvFBEIkOjKy1INVM8rjkz2koMbLSQuyM4e69P3Xdd691sceFgMb
-						f0T7vMGKHoRElMWERg4VPjYA7vQaVQ+DWV+WPhHILmCBkKXI4ja4p4pW3NWBU96E
-						ooh1dyZQJXIr1k+cKdlHm9q8QtJfE7O6dZsm3aKBwQVkOuwZnv7lL8/ePgxp/bDv
-						oaHoiht2caAGV9kXMykmV7dAK/qQlkGz1l1/3r+EN/NorVNj2KXJNH6Ut/0rp9o1
-						TJM9F1C2c+z/p0fksgBV2U5qy5W32bkU
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lynda.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lynda.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.lynda.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lynda.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.lynda.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lynda.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.lynda.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lynda.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.lynda.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.lynda.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.lynda.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.lynda.com/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.lynda.com/Shibboleth.sso/SAML2/ECP" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.lynda.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.lynda.com/Shibboleth.sso/SAML/Artifact" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Lynda.com</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lynda.com</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lynda.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Flynn</SurName>
-    <EmailAddress>mailto:mflynn@lynda.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Flynn</SurName>
-    <EmailAddress>mailto:mflynn@lynda.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.lythamsixth.ac.uk-shibboleth.xml
deleted file mode 100644
index 743baab9..00000000
--- a/swamid-interfederations-2.0/shib.lythamsixth.ac.uk-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://shib.lythamsixth.ac.uk/shibboleth">
-  <!--
-		This is a "Lytham Sixth Form College" Shibboleth IdP for Blackpool and The Fylde College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-19T12:06:12Z">
-      <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">lythamsixth.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lytham Sixth Form College</mdui:DisplayName>
-        <mdui:Logo height="146" width="350">https://shib.lythamsixth.ac.uk/gif/LSF-Logo-350x64.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.63.160.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.161.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.162.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.163.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.164.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.165.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.166.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.167.0/24</mdui:IPHint>
-        <mdui:DomainHint>lythamsixth.ac.uk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdjCCA16gAwIBAgIJAOeox3UBOO8vMA0GCSqGSIb3DQEBCwUAMIG7MQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTEPMA0GA1UEBxMGTHl0aGFtMSIw
-						IAYDVQQKExlMeXRoYW0gU2l4dGggRm9ybSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBT
-						ZXJ2aWNlczEfMB0GA1UEAxMWc2hpYi5seXRoYW1zaXh0aC5hYy51azErMCkGCSqG
-						SIb3DQEJARYccG9zdG1hc3RlckBseXRoYW1zaXh0aC5hYy51azAeFw0xNTEwMTYx
-						NDIwNDZaFw0yNTEwMTMxNDIwNDZaMIG7MQswCQYDVQQGEwJHQjETMBEGA1UECBMK
-						TGFuY2FzaGlyZTEPMA0GA1UEBxMGTHl0aGFtMSIwIAYDVQQKExlMeXRoYW0gU2l4
-						dGggRm9ybSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEfMB0GA1UEAxMW
-						c2hpYi5seXRoYW1zaXh0aC5hYy51azErMCkGCSqGSIb3DQEJARYccG9zdG1hc3Rl
-						ckBseXRoYW1zaXh0aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAL3bcKHTe4mNGr9hCMPc8PwvjYPspPS5MlHOSPLtxMMCFxs7a2mPjrJsoXHG
-						q3xE7I/QHAninXZG9FgAjvhpr5poYHg8ZWgPfH/jGV4qScb5kCjPR4AAGMHxb7hD
-						UXd4n05M854yKjUz1luIUKe65121L9E08/qvrQ8mUVhtRFIsY+vYZXWDql1IrtQQ
-						6fl4Kn+cr829WM4Z/ZKgj7J+EsmR3ejyTFMn9VmQihXkPgeSGTzs+Etv7k1Bn9OF
-						VmMeyaUxAVhbYvR+qHbH1iEdNfHJ7ku1XlG5HJ3tvusF7ar5QycTqsoIaCCDJJ5/
-						3rvcTpLDqr35aDDdmiH6jogZglsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FIUZC6IwXrhL2dZpcBtcSudbPv4cMB8GA1UdIwQYMBaAFIUZC6IwXrhL2dZpcBtc
-						SudbPv4cMA0GCSqGSIb3DQEBCwUAA4IBAQAKffu+lOxW1bPF1j18RaGgjB5x58ME
-						pM9ocOpqkPLdPkOW4/OehNVNFdLE4jw1p7iPr9Q+dRIRxVl/ewsXnDi7HaIySrja
-						rriIhi4/j5WBczTN6cjg8gWo4/31PXfS2OwKJ4BTaiVscSCvlIedBM5uIFaX4CwF
-						T0ioAwWKcYc3dpEz97w2b5s3JeHyjjrqZjlLkxRuI9U0jxu/j2M+mLl6pdmDIGXL
-						XuCbJtyKrqjmkL9TD9qXKQBBDxHCqOmGdJRp5EhUyVoC3u3wFDhaUufSXd6K863r
-						jxKoHRU8H+vWtT+cjFopBvaAVyQjqNRoN7zXX5xjecEFsnNkhSgjeZTR
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lythamsixth.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.lythamsixth.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lythamsixth.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.lythamsixth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lythamsixth.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">lythamsixth.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEdjCCA16gAwIBAgIJAOeox3UBOO8vMA0GCSqGSIb3DQEBCwUAMIG7MQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTEPMA0GA1UEBxMGTHl0aGFtMSIw
-						IAYDVQQKExlMeXRoYW0gU2l4dGggRm9ybSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBT
-						ZXJ2aWNlczEfMB0GA1UEAxMWc2hpYi5seXRoYW1zaXh0aC5hYy51azErMCkGCSqG
-						SIb3DQEJARYccG9zdG1hc3RlckBseXRoYW1zaXh0aC5hYy51azAeFw0xNTEwMTYx
-						NDIwNDZaFw0yNTEwMTMxNDIwNDZaMIG7MQswCQYDVQQGEwJHQjETMBEGA1UECBMK
-						TGFuY2FzaGlyZTEPMA0GA1UEBxMGTHl0aGFtMSIwIAYDVQQKExlMeXRoYW0gU2l4
-						dGggRm9ybSBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEfMB0GA1UEAxMW
-						c2hpYi5seXRoYW1zaXh0aC5hYy51azErMCkGCSqGSIb3DQEJARYccG9zdG1hc3Rl
-						ckBseXRoYW1zaXh0aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAL3bcKHTe4mNGr9hCMPc8PwvjYPspPS5MlHOSPLtxMMCFxs7a2mPjrJsoXHG
-						q3xE7I/QHAninXZG9FgAjvhpr5poYHg8ZWgPfH/jGV4qScb5kCjPR4AAGMHxb7hD
-						UXd4n05M854yKjUz1luIUKe65121L9E08/qvrQ8mUVhtRFIsY+vYZXWDql1IrtQQ
-						6fl4Kn+cr829WM4Z/ZKgj7J+EsmR3ejyTFMn9VmQihXkPgeSGTzs+Etv7k1Bn9OF
-						VmMeyaUxAVhbYvR+qHbH1iEdNfHJ7ku1XlG5HJ3tvusF7ar5QycTqsoIaCCDJJ5/
-						3rvcTpLDqr35aDDdmiH6jogZglsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FIUZC6IwXrhL2dZpcBtcSudbPv4cMB8GA1UdIwQYMBaAFIUZC6IwXrhL2dZpcBtc
-						SudbPv4cMA0GCSqGSIb3DQEBCwUAA4IBAQAKffu+lOxW1bPF1j18RaGgjB5x58ME
-						pM9ocOpqkPLdPkOW4/OehNVNFdLE4jw1p7iPr9Q+dRIRxVl/ewsXnDi7HaIySrja
-						rriIhi4/j5WBczTN6cjg8gWo4/31PXfS2OwKJ4BTaiVscSCvlIedBM5uIFaX4CwF
-						T0ioAwWKcYc3dpEz97w2b5s3JeHyjjrqZjlLkxRuI9U0jxu/j2M+mLl6pdmDIGXL
-						XuCbJtyKrqjmkL9TD9qXKQBBDxHCqOmGdJRp5EhUyVoC3u3wFDhaUufSXd6K863r
-						jxKoHRU8H+vWtT+cjFopBvaAVyQjqNRoN7zXX5xjecEFsnNkhSgjeZTR
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.lythamsixth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.lythamsixth.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">Blackpool and The Fylde College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lytham Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lythamsixth.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@blackpool.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical support</GivenName>
-    <EmailAddress>mailto:shib-tech@blackpool.ac.uk</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.mcnallysmith.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.mcnallysmith.edu-idp-shibboleth.xml
deleted file mode 100644
index 49486974..00000000
--- a/swamid-interfederations-2.0/shib.mcnallysmith.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +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://shib.mcnallysmith.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">mcnallysmith.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">McNally Smith College</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>
-MIIDYTCCAkmgAwIBAgIVAM47804tppNeaFK403GcGkz0zlxlMA0GCSqGSIb3DQEB
-BQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgubWNuYWxseXNtaXRoLmxvY2FsMB4X
-DTExMDUzMTE2Mzg1NloXDTMxMDUzMTE2Mzg1NlowKDEmMCQGA1UEAxMdc2hpYmJv
-bGV0aC5tY25hbGx5c21pdGgubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCjkaCWAGFJhT/iH/XpJMXI4/U7Urhf3grvTlX96LsRLdft4dXVftcg
-umn2nkWGSEcWryX7eCTEsBTggCZDwUWoDbrtgIXf5FC6EfKe3vbgfZ/SHA1C+pl5
-w08I9YkpKDCv9hutRR6jcWZNL5sXeU+085QLvsQIVHm0ZBmc94mktKPIw77L5uar
-DqL1zYBwg1A10vQJ4dBv6jmzIlE51oSBYYRs+DG3DGVGrGtdP+kbw7LhBcUaL9R0
-LbF4WEYRRam3y1IP1JMhPkhcYvXOJXcRqIloSW0XfjO2edhcn+dAjRoaoprcv2DT
-Vj9Jmmpl6qniwn+OK+uaYXiGMgRa7FkVAgMBAAGjgYEwfzBeBgNVHREEVzBVgh1z
-aGliYm9sZXRoLm1jbmFsbHlzbWl0aC5sb2NhbIY0aHR0cHM6Ly9zaGliYm9sZXRo
-Lm1jbmFsbHlzbWl0aC5sb2NhbC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXlJi
-F7qHU4WBdAzcYo5mMQeG6hgwDQYJKoZIhvcNAQEFBQADggEBAERZxsRswD9FZOht
-CF5uDkx8ZkT7zRZfUUD6KIHKRSUr9pw1im21jRiyKZ8R3/iVkx2C1y3fKsQl3QPc
-nWLiL/Z+Bx51IgRNLISBJ51zcDAQET14G5QOIWWUQbOtoccV/JEUWnhpXgeBsBgJ
-9/f6NGsf6llxaOslK5XGdv8kLz0c+tubOa6DEx5XssSs+6/LaGOh2vKTpYcP3fpk
-DNhPVw00eoP0NCWoIOswqdMAKY3ekPmjwYhllbPkOBFKuWZqUHgEw6RjPEISk99u
-W3wi9jRKmEDn2R/qt1u74BUd6B3UcLSWYQhMd2/dOyTtB4Eux5vRlRsNqx+mbKms
-BcfhYPA=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnallysmith.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnallysmith.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mcnallysmith.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mcnallysmith.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mcnallysmith.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mcnallysmith.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAM47804tppNeaFK403GcGkz0zlxlMA0GCSqGSIb3DQEB
-BQUAMCgxJjAkBgNVBAMTHXNoaWJib2xldGgubWNuYWxseXNtaXRoLmxvY2FsMB4X
-DTExMDUzMTE2Mzg1NloXDTMxMDUzMTE2Mzg1NlowKDEmMCQGA1UEAxMdc2hpYmJv
-bGV0aC5tY25hbGx5c21pdGgubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCjkaCWAGFJhT/iH/XpJMXI4/U7Urhf3grvTlX96LsRLdft4dXVftcg
-umn2nkWGSEcWryX7eCTEsBTggCZDwUWoDbrtgIXf5FC6EfKe3vbgfZ/SHA1C+pl5
-w08I9YkpKDCv9hutRR6jcWZNL5sXeU+085QLvsQIVHm0ZBmc94mktKPIw77L5uar
-DqL1zYBwg1A10vQJ4dBv6jmzIlE51oSBYYRs+DG3DGVGrGtdP+kbw7LhBcUaL9R0
-LbF4WEYRRam3y1IP1JMhPkhcYvXOJXcRqIloSW0XfjO2edhcn+dAjRoaoprcv2DT
-Vj9Jmmpl6qniwn+OK+uaYXiGMgRa7FkVAgMBAAGjgYEwfzBeBgNVHREEVzBVgh1z
-aGliYm9sZXRoLm1jbmFsbHlzbWl0aC5sb2NhbIY0aHR0cHM6Ly9zaGliYm9sZXRo
-Lm1jbmFsbHlzbWl0aC5sb2NhbC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXlJi
-F7qHU4WBdAzcYo5mMQeG6hgwDQYJKoZIhvcNAQEFBQADggEBAERZxsRswD9FZOht
-CF5uDkx8ZkT7zRZfUUD6KIHKRSUr9pw1im21jRiyKZ8R3/iVkx2C1y3fKsQl3QPc
-nWLiL/Z+Bx51IgRNLISBJ51zcDAQET14G5QOIWWUQbOtoccV/JEUWnhpXgeBsBgJ
-9/f6NGsf6llxaOslK5XGdv8kLz0c+tubOa6DEx5XssSs+6/LaGOh2vKTpYcP3fpk
-DNhPVw00eoP0NCWoIOswqdMAKY3ekPmjwYhllbPkOBFKuWZqUHgEw6RjPEISk99u
-W3wi9jRKmEDn2R/qt1u74BUd6B3UcLSWYQhMd2/dOyTtB4Eux5vRlRsNqx+mbKms
-BcfhYPA=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnallysmith.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">McNally Smith College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">McNally Smith College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://mcnallysmith.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brian Bierma</md:GivenName>
-    <md:EmailAddress>brian.bierma@mcnallysmith.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.mdanderson.org-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.mdanderson.org-idp-shibboleth.xml
deleted file mode 100644
index a90313ba..00000000
--- a/swamid-interfederations-2.0/shib.mdanderson.org-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://shib.mdanderson.org/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">mdanderson.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas M.D. Anderson Cancer Center</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>
-MIIDODCCAiCgAwIBAgIVAN9NaOe859o4m2yJ5DUijMku+q4tMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWIubWRhbmRlcnNvbi5vcmcwHhcNMDkxMDAxMjI0
-NjAyWhcNMjkxMDAxMjI0NjAyWjAeMRwwGgYDVQQDExNzaGliLm1kYW5kZXJzb24u
-b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiKDahIBcn1K0mp5A
-mT2zcPTNaRITSnkgajXbN12Wzwk2CFLJZ6QekzoeyhKGuUNgYXHcPnWJuoclpmXo
-eX8C3egYAWorgC2LMjKvBMPCaSmH3ioe9avwOSCpG37Zw4ydWPJod2hy7h5NQedq
-9ath8J9I7U2q/Y5a/khlttR7o/7lGJHBCumAp+VnUEgLzUkAYbXo9gbdwC+GhdI1
-Wx+msDZwq8qIgT679SUm6RHUfkHKZD352zCaP+VHxuX4uMUj/ue/2BnN0Z9RnHZ/
-xgDmURoSwokxnbLWodMV0Ny0eDvcpS9eEf5Zx04YFMJ3XpjnOxvvO4WaXt8WPcRT
-CHtEQwIDAQABo20wazBKBgNVHREEQzBBghNzaGliLm1kYW5kZXJzb24ub3Jnhipo
-dHRwczovL3NoaWIubWRhbmRlcnNvbi5vcmcvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFALOifNwK+8AFuidZ/PXBFI5+j5BMA0GCSqGSIb3DQEBBQUAA4IBAQAzMZSH
-2QsL5RGHaHkM9+2fLesMDjPzd35RnbR1iRkcBi9eFvQah3pH1ITWNWRNsUbs+UUH
-uO44upcOk6VCbZ88rNeS6kE1BgSRNsRNTy/wJth/rsvIoAVek9arZNEMoBCCixGP
-81YR1OzjO2Egmcan0GsYCdPDowRcYEzEtLZGq8S5+0pa8vtEpa6UtakWsfTAZqFP
-t0OioSV7pwA9szQp2fCqvp61B5RP1zeUfWJIcjpKYlRCejwboHTN/S40bjxsXJ32
-c6j5VoHLH/WEfXJ262osyqeyDwVPyJZx7WWPWlYY3GCKYxwhrAZSA7A1u8VHe3wD
-qHwdXzHWzbbPX5x9
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mdanderson.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mdanderson.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mdanderson.org/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mdanderson.org/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mdanderson.org/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.mdanderson.org/idp/profile/SAML2/POST-SimpleSign/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">mdanderson.org</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAN9NaOe859o4m2yJ5DUijMku+q4tMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWIubWRhbmRlcnNvbi5vcmcwHhcNMDkxMDAxMjI0
-NjAyWhcNMjkxMDAxMjI0NjAyWjAeMRwwGgYDVQQDExNzaGliLm1kYW5kZXJzb24u
-b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiKDahIBcn1K0mp5A
-mT2zcPTNaRITSnkgajXbN12Wzwk2CFLJZ6QekzoeyhKGuUNgYXHcPnWJuoclpmXo
-eX8C3egYAWorgC2LMjKvBMPCaSmH3ioe9avwOSCpG37Zw4ydWPJod2hy7h5NQedq
-9ath8J9I7U2q/Y5a/khlttR7o/7lGJHBCumAp+VnUEgLzUkAYbXo9gbdwC+GhdI1
-Wx+msDZwq8qIgT679SUm6RHUfkHKZD352zCaP+VHxuX4uMUj/ue/2BnN0Z9RnHZ/
-xgDmURoSwokxnbLWodMV0Ny0eDvcpS9eEf5Zx04YFMJ3XpjnOxvvO4WaXt8WPcRT
-CHtEQwIDAQABo20wazBKBgNVHREEQzBBghNzaGliLm1kYW5kZXJzb24ub3Jnhipo
-dHRwczovL3NoaWIubWRhbmRlcnNvbi5vcmcvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFALOifNwK+8AFuidZ/PXBFI5+j5BMA0GCSqGSIb3DQEBBQUAA4IBAQAzMZSH
-2QsL5RGHaHkM9+2fLesMDjPzd35RnbR1iRkcBi9eFvQah3pH1ITWNWRNsUbs+UUH
-uO44upcOk6VCbZ88rNeS6kE1BgSRNsRNTy/wJth/rsvIoAVek9arZNEMoBCCixGP
-81YR1OzjO2Egmcan0GsYCdPDowRcYEzEtLZGq8S5+0pa8vtEpa6UtakWsfTAZqFP
-t0OioSV7pwA9szQp2fCqvp61B5RP1zeUfWJIcjpKYlRCejwboHTN/S40bjxsXJ32
-c6j5VoHLH/WEfXJ262osyqeyDwVPyJZx7WWPWlYY3GCKYxwhrAZSA7A1u8VHe3wD
-qHwdXzHWzbbPX5x9
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mdanderson.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mdanderson.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas M.D. Anderson Cancer Center</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas M.D. Anderson Cancer Center</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mdanderson.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>MDACC IdM Support</md:GivenName>
-    <md:EmailAddress>idm@mdanderson.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>MDACC 4Info</md:GivenName>
-    <md:EmailAddress>4info@mdanderson.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.med.cornell.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.med.cornell.edu-idp-shibboleth.xml
deleted file mode 100644
index 40c5ea71..00000000
--- a/swamid-interfederations-2.0/shib.med.cornell.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://shib.med.cornell.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shib.med.cornell.edu/idp/error.jsp" 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">med.cornell.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Weill Cornell Medical College</mdui:DisplayName>
-        <mdui:Logo height="87" width="360" xml:lang="en">https://shib.med.cornell.edu/idp/images/wcmc.jpg</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>
-MIIDPDCCAiSgAwIBAgIVALf2UjTulHPvT1Tql4y9F07IaKUoMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWIubWVkLmNvcm5lbGwuZWR1MB4XDTExMTIxMjIz
-NDMwMVoXDTMxMTIxMjIzNDMwMVowHzEdMBsGA1UEAxMUc2hpYi5tZWQuY29ybmVs
-bC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpSX+ljW9kBT8o
-Wr6dWDSTO3Xt4YUVW2D4f0HRGappmxcRL0eTj+5xMem5toiHuHmrnyyS3fByVmWZ
-DUm4aiTzbhxktRiL2VlIB1j+ggLq4g+y6R8w4xAwC1Kgi8iHPrp164mh+/7pmbd1
-UP2qjdOJLjg3NqVjZa/YhFBVdF22qc3tjOddqMvay5wh3smGvr7gygQy1oZnAbOq
-m9cX0nHB71C0ITa65v8QojU3+ivj3b8c8HW+OAeMWe2sd65BgkwBAZ29Ms7bc/N4
-SGaJOuRPvDd556afu64/p/s0AW0vXePwlxyY6puFZcHCREOLqImODGiaC0j9q+qf
-a9UNeIgjAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWIubWVkLmNvcm5lbGwuZWR1
-hitodHRwczovL3NoaWIubWVkLmNvcm5lbGwuZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTLuL7YYyGqqqyNrM1VTvMM31GBOjANBgkqhkiG9w0BAQUFAAOCAQEA
-ZOuFvp/wh93CGfs0VP7VpVsX/Nfy/6xqYYPFywUeBdLmiP00rk7dbmFftQxil82u
-hsENb1L/quzerzHQPZPjzhMY1lMuLr9vIBZkfyFgyE96LlYrpsWqWT86gJeKEgWu
-kKKOa1rzD75EjjAQCogb6nK7FHKOhfFle5bYdVnRW+1RkZRXb0sJYwqsVttXuBes
-NbQ++tq32Y01h5+LgfGaK0QJ1nkUthT09OtyT/1Zs1X5plOvUvCHpfCcq9exE/G9
-8AZTYkxqWSzEVVXNh2dglaskxIfxRaKfTsznYfuqu+sDLNWPDiP7TCJ5pBHUSqO/
-MkcicsifJ9hvJTUFVS7mSg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.med.cornell.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.med.cornell.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.med.cornell.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.med.cornell.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.med.cornell.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">med.cornell.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVALf2UjTulHPvT1Tql4y9F07IaKUoMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWIubWVkLmNvcm5lbGwuZWR1MB4XDTExMTIxMjIz
-NDMwMVoXDTMxMTIxMjIzNDMwMVowHzEdMBsGA1UEAxMUc2hpYi5tZWQuY29ybmVs
-bC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpSX+ljW9kBT8o
-Wr6dWDSTO3Xt4YUVW2D4f0HRGappmxcRL0eTj+5xMem5toiHuHmrnyyS3fByVmWZ
-DUm4aiTzbhxktRiL2VlIB1j+ggLq4g+y6R8w4xAwC1Kgi8iHPrp164mh+/7pmbd1
-UP2qjdOJLjg3NqVjZa/YhFBVdF22qc3tjOddqMvay5wh3smGvr7gygQy1oZnAbOq
-m9cX0nHB71C0ITa65v8QojU3+ivj3b8c8HW+OAeMWe2sd65BgkwBAZ29Ms7bc/N4
-SGaJOuRPvDd556afu64/p/s0AW0vXePwlxyY6puFZcHCREOLqImODGiaC0j9q+qf
-a9UNeIgjAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWIubWVkLmNvcm5lbGwuZWR1
-hitodHRwczovL3NoaWIubWVkLmNvcm5lbGwuZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBTLuL7YYyGqqqyNrM1VTvMM31GBOjANBgkqhkiG9w0BAQUFAAOCAQEA
-ZOuFvp/wh93CGfs0VP7VpVsX/Nfy/6xqYYPFywUeBdLmiP00rk7dbmFftQxil82u
-hsENb1L/quzerzHQPZPjzhMY1lMuLr9vIBZkfyFgyE96LlYrpsWqWT86gJeKEgWu
-kKKOa1rzD75EjjAQCogb6nK7FHKOhfFle5bYdVnRW+1RkZRXb0sJYwqsVttXuBes
-NbQ++tq32Y01h5+LgfGaK0QJ1nkUthT09OtyT/1Zs1X5plOvUvCHpfCcq9exE/G9
-8AZTYkxqWSzEVVXNh2dglaskxIfxRaKfTsznYfuqu+sDLNWPDiP7TCJ5pBHUSqO/
-MkcicsifJ9hvJTUFVS7mSg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.med.cornell.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Weill Cornell Medical College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Weill Cornell Medical College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.med.cornell.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tom McMahon</md:GivenName>
-    <md:EmailAddress>tom2010@med.cornell.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ITS Service Desk</md:GivenName>
-    <md:EmailAddress>Support@med.cornell.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2d5df1ef..00000000
--- a/swamid-interfederations-2.0/shib.mines-albi.fr-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://shib.mines-albi.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Mines-Albi</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACeElEQVQ4y32SWUjUURjFf/fOpmOLimurSyJCkQ+mPSSGbZBRYPnQAkFY+iBFpa2U1UtQkUSkRvhiBAUJlUQJPqRt2KKiLSao5ZY0oOOoM47zn//tYcRR0w7cl8M59/sO30EpxZyvp5H0m6+OK0cf82qUYm5yEtdq2lTa1bc1anwYpXvn1EpmQ3Oz9Mj1Az02+0j9TxcNNvdWkfe8X6QUnxVCQMuNGXIxfaJDA5vd+S0+zJr0vG2QHWUfwSRBSDBawGH7o0qy1mE2d8/6QONJlzF0Y8T4QHBQgOnuu17yH30FowQxbZw0gGdC10u2hQsYBOGLIIQJe9+Plg6HMmXe+UT+g9Z/zQC6F0wBUmbfahRC+jeIOlhe4IhPvu2y2cEgfOb5IA1g6yRV2nMbKgorJMBEfHK2a3gMLIb/mxHgcYPTzu+FUXsBjABDQiaA7te5vaApkIDZ4NvKlxUG2sGl0auTAEye0auZpsxOjdLdiXy/ksHrE2mkLgkCpwa6gvZm0mNCqCragXJ5LICvSJyra+BkraLghap8161m4/77bkVumaqsbZriLla3fvAXqbmpDoMRNJ3M1ZH/JE9bYaV0+xr2bUqe4jq6e974ezDSh7jQNI4KsJTnJJK3YTkAI26Nons1BJokcZEhHH3cgOf+MWz2UW/0YqsRKf1NFGv3byMp5SVONzGx4YQGmGn80MnKxEgk0DU2wbJAE70uIxXFh3cdWsWzmVX+fAlx2r2ZqOineLEy7uZUznqSIxbQOziKJchK7Zf+ieozO/co3VvN9CLNgGeE9MKH57XgsAybU4s1L7SKFRFhv4JGx+qrsoYuY1kEcVum5H8BReRiA2ayAcEAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTkrMDI6MDDmguK/AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU5KzAyOjAwl99aAwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.enstimac.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Ecole des mines d'Albi-Carmaux</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>
-					      MIIDNDCCAhygAwIBAgIVAP0DZFmoaqaMkf4YJmDc1SwYfx2yMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMMEnNoaWIubWluZXMtYWxiaS5mcjAeFw0xNTAyMTcwODU0
-NDhaFw0zNTAyMTcwODU0NDhaMB0xGzAZBgNVBAMMEnNoaWIubWluZXMtYWxiaS5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIVlu4wyAmLrCkmiUliB
-ffvyAmfDXYpQ0p9cjFJY7lN5DzaUNgObehddk7YFmyzBcfl7QKILPO4a81e3TcNr
-8+RXWspk3qkIcTwPrIPhp2vbcjRZR/j10akqG8A2D1beHNJbQ4K5IqfJG0EFeSc0
-ut1LrdW/ZSiUMNESZHa8ASJU7yHJO667ij9yYAA8IHDgN57vO15Z/kHeFOGddNDo
-MR4Gn1NLytcC+AVZghIw+Asj/Ch6049LcxEXBj4nFvaa8JNdxJJVcetDMbXg/jsE
-JwgBfnlCn5PmuTaBBRI4YmaBjSJdNvepYcH0IhiJjrkp8HbNHIkwGmCfyCsVCxz1
-MHUCAwEAAaNrMGkwHQYDVR0OBBYEFCXTZozk5rGaw1NTmqrzTXYM5TLrMEgGA1Ud
-EQRBMD+CEnNoaWIubWluZXMtYWxiaS5mcoYpaHR0cHM6Ly9zaGliLm1pbmVzLWFs
-YmkuZnIvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAHmGkCqHUGFu
-K6g9Cy+JUbNDGILpNw8T4o/8acA/D5fwooiU7e2vo9/vX9WDOu7HU8jSW+gQxFLe
-9OhUpOZq6WV5R1zhFS8tkvhAXNtPGvon33QxcmT7nAS9epiQMrpbkBL6L+B9Rp/z
-rqj9lwITB6M5lt9s7WCWPr7yqGM4vyB7Gos/2Ng9XoK1IKl5LfMtmEbHlv454dlK
-nxi4i5Y1wnnNHebY9PNYU+rJPabA1HsrC4qBw9jFiTa2LonPdXIc9SYTxASbcZ96
-SksdcOTnimu/nRLGQnwqpOvNYEsom3R26wT2q0C8Joro18KXAZ7ebzn0/l0jOi+Q
-8o++pmkdoIw=
-					    </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-POST" Location="https://shib.mines-albi.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mines-albi.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mines-albi.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole des mines d'Albi-Carmaux</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole des mines d'Albi-Carmaux</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.enstimac.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ORTEU Catherine</md:SurName>
-    <md:EmailAddress>catherine.orteu@mines-albi.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>OTTON Emmanuel</md:SurName>
-    <md:EmailAddress>emmanuel.otton@mines-albi.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.newbury-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.newbury-college.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 25282898..00000000
--- a/swamid-interfederations-2.0/shib.newbury-college.ac.uk-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://shib.newbury-college.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Newbury College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-17T14:27:39Z">
-      <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">newbury-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUKgGFTl/wyIVoEZcrAuaNGJkaS4AwDQYJKoZIhvcNAQEF
-						BQAwJTEjMCEGA1UEAxMac2hpYi5uZXdidXJ5LWNvbGxlZ2UuYWMudWswHhcNMTQw
-						NDMwMTU1OTUzWhcNMzQwNDMwMTU1OTUzWjAlMSMwIQYDVQQDExpzaGliLm5ld2J1
-						cnktY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ALEO9V52NgElGB2494w+RP0YGpV97JXNQa7mSeSgrExS6EYfC+xq6GpShPq2CxZG
-						ds8DqfA6A4SZ9Br6MVw65X/9vuDu2rN9caivpV9v/Q9MEgkOlJK9NzgKqdZYLz/X
-						pkkL9sqN5L5SQ85+dRa3OaiV2WeqL+Op4Zljp0MEnJXYcA7rFvPcwZiSXrb56xTl
-						bqMKMuAPlDQ+GB46Z63uGGnXg4lm5eIh5txkl7hDeHZhVnnGQ8BZfsBvtRjCOyUm
-						x5oW7gUsD0tFzC1ZSXtM69Ufy5KsLN24tlfDmU2D3G0KCjpgRwypbgRNKOCavn2q
-						afjRy10kfcAKg740DO0v4W8CAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYi5uZXdi
-						dXJ5LWNvbGxlZ2UuYWMudWuGMWh0dHBzOi8vc2hpYi5uZXdidXJ5LWNvbGxlZ2Uu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHm3jrIqUdXgKqgeoSsHsYWg
-						a0miMA0GCSqGSIb3DQEBBQUAA4IBAQB2vb7dzO3rVcbWlAffs2ssjty0vACBKm5M
-						1WoSA1j0DGIr9s8LxWn+On/L+JzR6ymXfGkK7WdVmVMZcD/zTm4fjFJOviNHAUwl
-						3jttuRJtG6FLibv72jFLFyIF7a02ezNKViNbsX0s89zIHLSW7RA64DBp6pgQXDes
-						IICc/5SxQeg7BRlfLHwGFe6l6N7L6OpXJccvAiEgMum/l0HVtOIQC0qW3tgyUohj
-						V0IUrFMXIcCZ7rucxgmvsdp3f31bscAZfyqW5OvpnkZbXndLSRhseVgeeeyUOl9k
-						t13oLz/71kVuQ4KeP949T8BcB33uLI+rJpCvWPPa25DFQvaSMkGl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.newbury-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.newbury-college.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://shib.newbury-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.newbury-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.newbury-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.newbury-college.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">newbury-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUKgGFTl/wyIVoEZcrAuaNGJkaS4AwDQYJKoZIhvcNAQEF
-						BQAwJTEjMCEGA1UEAxMac2hpYi5uZXdidXJ5LWNvbGxlZ2UuYWMudWswHhcNMTQw
-						NDMwMTU1OTUzWhcNMzQwNDMwMTU1OTUzWjAlMSMwIQYDVQQDExpzaGliLm5ld2J1
-						cnktY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						ALEO9V52NgElGB2494w+RP0YGpV97JXNQa7mSeSgrExS6EYfC+xq6GpShPq2CxZG
-						ds8DqfA6A4SZ9Br6MVw65X/9vuDu2rN9caivpV9v/Q9MEgkOlJK9NzgKqdZYLz/X
-						pkkL9sqN5L5SQ85+dRa3OaiV2WeqL+Op4Zljp0MEnJXYcA7rFvPcwZiSXrb56xTl
-						bqMKMuAPlDQ+GB46Z63uGGnXg4lm5eIh5txkl7hDeHZhVnnGQ8BZfsBvtRjCOyUm
-						x5oW7gUsD0tFzC1ZSXtM69Ufy5KsLN24tlfDmU2D3G0KCjpgRwypbgRNKOCavn2q
-						afjRy10kfcAKg740DO0v4W8CAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYi5uZXdi
-						dXJ5LWNvbGxlZ2UuYWMudWuGMWh0dHBzOi8vc2hpYi5uZXdidXJ5LWNvbGxlZ2Uu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHm3jrIqUdXgKqgeoSsHsYWg
-						a0miMA0GCSqGSIb3DQEBBQUAA4IBAQB2vb7dzO3rVcbWlAffs2ssjty0vACBKm5M
-						1WoSA1j0DGIr9s8LxWn+On/L+JzR6ymXfGkK7WdVmVMZcD/zTm4fjFJOviNHAUwl
-						3jttuRJtG6FLibv72jFLFyIF7a02ezNKViNbsX0s89zIHLSW7RA64DBp6pgQXDes
-						IICc/5SxQeg7BRlfLHwGFe6l6N7L6OpXJccvAiEgMum/l0HVtOIQC0qW3tgyUohj
-						V0IUrFMXIcCZ7rucxgmvsdp3f31bscAZfyqW5OvpnkZbXndLSRhseVgeeeyUOl9k
-						t13oLz/71kVuQ4KeP949T8BcB33uLI+rJpCvWPPa25DFQvaSMkGl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.newbury-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.newbury-college.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">Newbury College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newbury College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.newbury-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Elwell</SurName>
-    <EmailAddress>mailto:r-elwell@newbury-college.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Elwell</SurName>
-    <EmailAddress>mailto:r-elwell@newbury-college.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.nnc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.nnc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 53fff03a..00000000
--- a/swamid-interfederations-2.0/shib.nnc.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://shib.nnc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for North Nottinghamshire College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-30T10:04:48Z">
-      <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">nnc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIzCCAgugAwIBAgIUAVYbxlyk3ieD8sFKJKXLfvokSAIwDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOc2hpYi5ubmMuYWMudWswHhcNMTQwODExMTUwNzQ4WhcN
-						MzQwODExMTUwNzQ4WjAZMRcwFQYDVQQDEw5zaGliLm5uYy5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZwzwsxTC1S4Zdkq15KxeNPBEbJiboZ
-						YZ2hEYpxFqy+A/DL2QSUGG4rwuOuMha2LTrJ7otU3kdtMSXEPfXdsxiBE4KAKIPH
-						E0ZtFllhPLUcbI0N0LJ98XEgMca0Lla/gpM26fuWzWMNAMHYl/FH6Rd2HMxJ48qE
-						iVbAPuBLb1tUNL5Ui3TwnrA9xww1XiRt2Uy2zLzEjRc2byeaOTGmF0XB3xzxQKfW
-						tcWlAsLsIgoeE/R2XoJI8Te/hWBncvFqxJMZO0B2hBz6VhW8lf6l+bXSp7xlK5Di
-						kqEfGFfx0OUXZyVyJXQVd3m37KfeibVa8idPhlpWGQU4YIboMp1+Cg0CAwEAAaNj
-						MGEwQAYDVR0RBDkwN4IOc2hpYi5ubmMuYWMudWuGJWh0dHBzOi8vc2hpYi5ubmMu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJddobBGcJBNHVz8Kk+BuJXI
-						KiMdMA0GCSqGSIb3DQEBBQUAA4IBAQAZX/aRdg2GVkabHj/GL50YvG+BVIgAr5+p
-						tg29AUnLVYL8kpC9FaV/fZnS35JRd2/fM60CZwJxdQ7gP7b9Ye9dXanZTTwTIcpf
-						khlHK7mZbvhDwmoHdRRhmXE5UAiNzgXa6xZoAVYaNyW0jw83P7XS1YdRvo4uXK7U
-						l50OB20JMRNVKn6M1Ot/Mu87f9+3bPEW+FiOzPQ+X3IKzJ+l9Tayqs299FNrMAXr
-						JHiLYUmU5kt5LWExuOvufsm7O8xy5jU0rJ+Gtwo5ikylbxnGrET0E1YdIcug3Ps4
-						vKyBVK0HbJsFP4JQVkZ84kTqxJWEXlUssTOLLeJ1l/2xAHhDd577
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nnc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.nnc.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://shib.nnc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.nnc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.nnc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.nnc.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">nnc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIzCCAgugAwIBAgIUAVYbxlyk3ieD8sFKJKXLfvokSAIwDQYJKoZIhvcNAQEF
-						BQAwGTEXMBUGA1UEAxMOc2hpYi5ubmMuYWMudWswHhcNMTQwODExMTUwNzQ4WhcN
-						MzQwODExMTUwNzQ4WjAZMRcwFQYDVQQDEw5zaGliLm5uYy5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZwzwsxTC1S4Zdkq15KxeNPBEbJiboZ
-						YZ2hEYpxFqy+A/DL2QSUGG4rwuOuMha2LTrJ7otU3kdtMSXEPfXdsxiBE4KAKIPH
-						E0ZtFllhPLUcbI0N0LJ98XEgMca0Lla/gpM26fuWzWMNAMHYl/FH6Rd2HMxJ48qE
-						iVbAPuBLb1tUNL5Ui3TwnrA9xww1XiRt2Uy2zLzEjRc2byeaOTGmF0XB3xzxQKfW
-						tcWlAsLsIgoeE/R2XoJI8Te/hWBncvFqxJMZO0B2hBz6VhW8lf6l+bXSp7xlK5Di
-						kqEfGFfx0OUXZyVyJXQVd3m37KfeibVa8idPhlpWGQU4YIboMp1+Cg0CAwEAAaNj
-						MGEwQAYDVR0RBDkwN4IOc2hpYi5ubmMuYWMudWuGJWh0dHBzOi8vc2hpYi5ubmMu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJddobBGcJBNHVz8Kk+BuJXI
-						KiMdMA0GCSqGSIb3DQEBBQUAA4IBAQAZX/aRdg2GVkabHj/GL50YvG+BVIgAr5+p
-						tg29AUnLVYL8kpC9FaV/fZnS35JRd2/fM60CZwJxdQ7gP7b9Ye9dXanZTTwTIcpf
-						khlHK7mZbvhDwmoHdRRhmXE5UAiNzgXa6xZoAVYaNyW0jw83P7XS1YdRvo4uXK7U
-						l50OB20JMRNVKn6M1Ot/Mu87f9+3bPEW+FiOzPQ+X3IKzJ+l9Tayqs299FNrMAXr
-						JHiLYUmU5kt5LWExuOvufsm7O8xy5jU0rJ+Gtwo5ikylbxnGrET0E1YdIcug3Ps4
-						vKyBVK0HbJsFP4JQVkZ84kTqxJWEXlUssTOLLeJ1l/2xAHhDd577
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nnc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.nnc.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">North Nottinghamshire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">North Notts College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nnc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adam</GivenName>
-    <SurName>Elce</SurName>
-    <EmailAddress>mailto:aelce@nnc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Watson</SurName>
-    <EmailAddress>mailto:cwatson@nnc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/shib.oclc.org-shibboleth.xml
deleted file mode 100644
index 453cf9aa..00000000
--- a/swamid-interfederations-2.0/shib.oclc.org-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://shib.oclc.org/shibboleth">
-  <!--
-		This is a service provider for OCLC (UK) Limited.
-		Uses 1.3 of the Shib SP, and a home-brew WAYF
-		written in Java using Tomcat as a servlet container.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIEgDCCA2igAwIBAgIJAK0C0pCgLQHkMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD
-						VQQGEwJVUzELMAkGA1UECBMCT0gxDzANBgNVBAcTBkR1YmxpbjETMBEGA1UEChMK
-						T0NMQywgSW5jLjEgMB4GA1UECxMXR2xvYmFsIFdvcmxkIERvbWluYXRpb24xIjAg
-						BgkqhkiG9w0BCQEWE3NoaWJib2xldGhAb2NsYy5vcmcwHhcNMTIwMzA4MjIyNDM3
-						WhcNMjIwMzA5MjIyNDM3WjCBhjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk9IMQ8w
-						DQYDVQQHEwZEdWJsaW4xEzARBgNVBAoTCk9DTEMsIEluYy4xIDAeBgNVBAsTF0ds
-						b2JhbCBXb3JsZCBEb21pbmF0aW9uMSIwIAYJKoZIhvcNAQkBFhNzaGliYm9sZXRo
-						QG9jbGMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0GMRvPa5
-						AnW0p6El1RovfmD5jNK3ZSWbdSmD3rPaJY14iaG+oUjYqTz/qD7gRsYsCv1s3FIg
-						H8q1/6Q83qZnw0GMGF6Aot2GtsQneLaYNFdiqQEvRLcDcHcb+fwlglXI8/Q14E1i
-						OlEfkqLshRGHRM8H+l+8ypyMFcSgX+9Y2ep8qPp7ZA6bbO0/AiYBWXqOF5Xj0cxj
-						YsX0gwv3gipvhjLUnKjA5dDjWr7MWEYhN0rGY9jAZqgm6/eLLit1LnnebeJPMKOm
-						RtNOkZ7icgq+yBMi7fwsUt/wti5M5tot2cqqS5pSpgfWszAoWSzaiC5TlKCrrdp8
-						GPPWTC1Q2/O27QIDAQABo4HuMIHrMB0GA1UdDgQWBBQJScrHf319rPm2hwo2omNl
-						YBaYLzCBuwYDVR0jBIGzMIGwgBQJScrHf319rPm2hwo2omNlYBaYL6GBjKSBiTCB
-						hjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk9IMQ8wDQYDVQQHEwZEdWJsaW4xEzAR
-						BgNVBAoTCk9DTEMsIEluYy4xIDAeBgNVBAsTF0dsb2JhbCBXb3JsZCBEb21pbmF0
-						aW9uMSIwIAYJKoZIhvcNAQkBFhNzaGliYm9sZXRoQG9jbGMub3JnggkArQLSkKAt
-						AeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAZtUntXC2HfkkdS1q
-						MBeKgtNkk9Cb822R0k8IBww/7pxe3367g2CP8CIauPjOTunG1gXG+iab50pVtQvW
-						uezeGx3+9i4VPhDeadseTR1nIXxHb08VcokvVKWOlFMQt61cr+Qzx8Oax9eWkvFh
-						yCzg3zaEeSOXc//ZSVgIHk7bkLXKx6379Y8oFy7E4f3u1zE0YIuHlA/VaRbPdyif
-						Onno/UhKeJYKJm14L5Bi6jy3zHMgSbIRNBA9fIEmPGgEHy+65R9vCQ0Qw+cQQF8I
-						W0/AQEl5+bAMZvoC+cqpQR3pmxwKZPHOI1zb5SY5wmRxAd772nBH31b9br2L7ETI
-						G2k2Hg==
-					</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://shib.oclc.org:2443/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.oclc.org:2443/Shibboleth.shire" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">OCLC FirstSearch</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UK Service Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Scranton</SurName>
-    <EmailAddress>mailto:scrantor@oclc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ou.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ou.edu-idp-shibboleth.xml
deleted file mode 100644
index c0bd2763..00000000
--- a/swamid-interfederations-2.0/shib.ou.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +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://shib.ou.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">ou.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Oklahoma</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>
-MIIDQDCCAigCCQDc5lzkFlIc/jANBgkqhkiG9w0BAQUFADBiMRQwEgYDVQQDEwtz
-aGliLm91LmVkdTEfMB0GA1UEChMWVW5pdmVyc2l0eSBvZiBPa2xhaG9tYTELMAkG
-A1UEBhMCVVMxCzAJBgNVBAgTAk9LMQ8wDQYDVQQHEwZOb3JtYW4wHhcNMTExMjA5
-MTMwMzM3WhcNMTIxMjA4MTMwMzM3WjBiMRQwEgYDVQQDEwtzaGliLm91LmVkdTEf
-MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBPa2xhaG9tYTELMAkGA1UEBhMCVVMxCzAJ
-BgNVBAgTAk9LMQ8wDQYDVQQHEwZOb3JtYW4wggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDWSD/N2sPHJ2Sg//K+mVAi6Oep5tXdxsmVIC6jegFaQVHSYpL8
-GPULb89CyxekyjMIkNfXOnh9Ycfw+PgOVIspVejmdFyM9O9Lp7XYgG4xi9RwL406
-sbIbVUx74HPGAbp/z6XQqus4TemAeJlfzvlRsmwQkiC4IU2iUc0vM8X2OnXGcQ1M
-1nf/lRDYjxFeeSFFKv/SSZQgApXiORb8BgOxJTP2huppWiq+JAX5dSLArlZPfZTE
-A81ULTd0D9HFsViThTb426UHR1CvuUbfb+saA65WWk9s1jLFD5omksXGP0qkglPV
-+rrc+MbQltnM3arxyFSEfm2nvNqdVStbt+M7AgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAJJsqc/AA4p+CPPKnQnQoU0uIUt6V9IBuk6z3JjXPjy5gFYtLJ7RBslMui8x
-whi6eTdUdHpASv7T7WKBBKFSA/NeiZ3TCpYMmdQsPdznzsVS/wsD+pU4PALCfqd6
-jJ9ntDEDOezYSTxAdbU8KmPxb5VZr7QseHAtf5OwZQI5131bVjkIjcM8pH4Sx2gk
-gyHNLf2byp1u1gSTRBbC8m1bESeQRTphQtsM+o3m6JUR3k9bV2tfgXLV8zaFWWuM
-aQgoBThl3ubE6tZmNvkC76OAzv+E+bRNfLV9lm+5Y66Ar9rSQHKur9xGm59GtmI/
-Ghy0tfpx50Ku5N+Baf2OZmHjuv4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ou.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ou.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ou.edu:443/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ou.edu:443/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ou.edu:443/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ou.edu:443/idp/profile/SAML2/POST-SimpleSign/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">ou.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAigCCQDc5lzkFlIc/jANBgkqhkiG9w0BAQUFADBiMRQwEgYDVQQDEwtz
-aGliLm91LmVkdTEfMB0GA1UEChMWVW5pdmVyc2l0eSBvZiBPa2xhaG9tYTELMAkG
-A1UEBhMCVVMxCzAJBgNVBAgTAk9LMQ8wDQYDVQQHEwZOb3JtYW4wHhcNMTExMjA5
-MTMwMzM3WhcNMTIxMjA4MTMwMzM3WjBiMRQwEgYDVQQDEwtzaGliLm91LmVkdTEf
-MB0GA1UEChMWVW5pdmVyc2l0eSBvZiBPa2xhaG9tYTELMAkGA1UEBhMCVVMxCzAJ
-BgNVBAgTAk9LMQ8wDQYDVQQHEwZOb3JtYW4wggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDWSD/N2sPHJ2Sg//K+mVAi6Oep5tXdxsmVIC6jegFaQVHSYpL8
-GPULb89CyxekyjMIkNfXOnh9Ycfw+PgOVIspVejmdFyM9O9Lp7XYgG4xi9RwL406
-sbIbVUx74HPGAbp/z6XQqus4TemAeJlfzvlRsmwQkiC4IU2iUc0vM8X2OnXGcQ1M
-1nf/lRDYjxFeeSFFKv/SSZQgApXiORb8BgOxJTP2huppWiq+JAX5dSLArlZPfZTE
-A81ULTd0D9HFsViThTb426UHR1CvuUbfb+saA65WWk9s1jLFD5omksXGP0qkglPV
-+rrc+MbQltnM3arxyFSEfm2nvNqdVStbt+M7AgMBAAEwDQYJKoZIhvcNAQEFBQAD
-ggEBAJJsqc/AA4p+CPPKnQnQoU0uIUt6V9IBuk6z3JjXPjy5gFYtLJ7RBslMui8x
-whi6eTdUdHpASv7T7WKBBKFSA/NeiZ3TCpYMmdQsPdznzsVS/wsD+pU4PALCfqd6
-jJ9ntDEDOezYSTxAdbU8KmPxb5VZr7QseHAtf5OwZQI5131bVjkIjcM8pH4Sx2gk
-gyHNLf2byp1u1gSTRBbC8m1bESeQRTphQtsM+o3m6JUR3k9bV2tfgXLV8zaFWWuM
-aQgoBThl3ubE6tZmNvkC76OAzv+E+bRNfLV9lm+5Y66Ar9rSQHKur9xGm59GtmI/
-Ghy0tfpx50Ku5N+Baf2OZmHjuv4=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ou.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ou.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Oklahoma</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Oklahoma</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ou.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David Horton</md:GivenName>
-    <md:EmailAddress>david-horton@ouhsc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Aaron Bighourse</md:GivenName>
-    <md:EmailAddress>bighorse@ou.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Pat Amburn</md:GivenName>
-    <md:EmailAddress>pat-amburn@ouhsc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.pebblepad.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/shib.pebblepad.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 13c2c9cc..00000000
--- a/swamid-interfederations-2.0/shib.pebblepad.co.uk-shibboleth-sp.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://shib.pebblepad.co.uk/shibboleth-sp">
-  <!--
-		This is a "PebblePad" Shibboleth SP for Pebble Learning Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEZjCCA06gAwIBAgIJAL5B8Zy7kEzwMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKU2hyb3BzaGlyZTEQMA4GA1UEBxMHVGVsZm9yZDEc
-						MBoGA1UEChMTUGViYmxlIExlYXJuaW5nIEx0ZDETMBEGA1UECxMKVUsgSG9zdGlu
-						ZzEdMBsGA1UEAxMUc2hpYi5wZWJibGVwYWQuY28udWsxKzApBgkqhkiG9w0BCQEW
-						HHN1cHBvcnRAcGViYmxlbGVhcm5pbmcuY28udWswHhcNMDkwNTIwMTAwMDQxWhcN
-						MTkwNTE4MTAwMDQxWjCBszELMAkGA1UEBhMCR0IxEzARBgNVBAgTClNocm9wc2hp
-						cmUxEDAOBgNVBAcTB1RlbGZvcmQxHDAaBgNVBAoTE1BlYmJsZSBMZWFybmluZyBM
-						dGQxEzARBgNVBAsTClVLIEhvc3RpbmcxHTAbBgNVBAMTFHNoaWIucGViYmxlcGFk
-						LmNvLnVrMSswKQYJKoZIhvcNAQkBFhxzdXBwb3J0QHBlYmJsZWxlYXJuaW5nLmNv
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxTTa8hVdZcuaVazA
-						mzHq2+kxGvJwrHFlre1YjACzeq8kqAm/nIWXALQetTP8qyKI0XtSIiMDwjPjgY4A
-						/8e3X0ykeOqMGldu+D3Wj29tF4n6B8/JjWHwg2f6V5xarviTvy/MWdLXqk1epnQv
-						MsRyWC6qA9/Lta3WtKDkYzcLDpoUZzYQUhcK2Zuobr0kW3egsvh3Qf2sAIBkKaF6
-						qq4J+HioE16VdtearBQzYgCd5G2p+sVpusp/6wMMFB6DopIDbV5Z6Ob9e5AdFtmu
-						R8U8VH15T8+kNnV/pF5++iq0u7y3SloOZYo8RcnB1BcobclmxiiDB0w0BbzmcU58
-						mSt0swIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUmispW4WPol2JC57a4w9q
-						nAQtGlkwHwYDVR0jBBgwFoAUmispW4WPol2JC57a4w9qnAQtGlkwDQYJKoZIhvcN
-						AQEFBQADggEBAIsdhSn+mIj+smLRJiIBHcXLN+DTXuv/7d3ev9mllgNMfTVemgdz
-						ELW6lFbWrpSs/F/nxIunKJ4dVp2FqR/mDKbjck2rb4d+9lgT6/8lT9WwkXdNG+be
-						xhqqERiKJ6Juo2OoDBv+ME96WzF7Z1iiO4LZNO8UKx8xFOThs68EyTqftpxekdQA
-						oCdcuQpmPD4qPGMmsHZ1mHWV0odYX88syhOV9mp2LGHBku49npZzCtHSHomwAH2t
-						TrsG+JZHCj5y3rzxae76z/T9zfa1oTaQRYUonCqQfTh3t3l2SJX6B1Pw6r2n0HJJ
-						8yu2OwvTBnRwfBEZAo9YeLOl8VXR2AZS/AE=
-					</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>
-						MIIEZjCCA06gAwIBAgIJAL5B8Zy7kEzwMA0GCSqGSIb3DQEBBQUAMIGzMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKU2hyb3BzaGlyZTEQMA4GA1UEBxMHVGVsZm9yZDEc
-						MBoGA1UEChMTUGViYmxlIExlYXJuaW5nIEx0ZDETMBEGA1UECxMKVUsgSG9zdGlu
-						ZzEdMBsGA1UEAxMUc2hpYi5wZWJibGVwYWQuY28udWsxKzApBgkqhkiG9w0BCQEW
-						HHN1cHBvcnRAcGViYmxlbGVhcm5pbmcuY28udWswHhcNMDkwNTIwMTAwMDQxWhcN
-						MTkwNTE4MTAwMDQxWjCBszELMAkGA1UEBhMCR0IxEzARBgNVBAgTClNocm9wc2hp
-						cmUxEDAOBgNVBAcTB1RlbGZvcmQxHDAaBgNVBAoTE1BlYmJsZSBMZWFybmluZyBM
-						dGQxEzARBgNVBAsTClVLIEhvc3RpbmcxHTAbBgNVBAMTFHNoaWIucGViYmxlcGFk
-						LmNvLnVrMSswKQYJKoZIhvcNAQkBFhxzdXBwb3J0QHBlYmJsZWxlYXJuaW5nLmNv
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxTTa8hVdZcuaVazA
-						mzHq2+kxGvJwrHFlre1YjACzeq8kqAm/nIWXALQetTP8qyKI0XtSIiMDwjPjgY4A
-						/8e3X0ykeOqMGldu+D3Wj29tF4n6B8/JjWHwg2f6V5xarviTvy/MWdLXqk1epnQv
-						MsRyWC6qA9/Lta3WtKDkYzcLDpoUZzYQUhcK2Zuobr0kW3egsvh3Qf2sAIBkKaF6
-						qq4J+HioE16VdtearBQzYgCd5G2p+sVpusp/6wMMFB6DopIDbV5Z6Ob9e5AdFtmu
-						R8U8VH15T8+kNnV/pF5++iq0u7y3SloOZYo8RcnB1BcobclmxiiDB0w0BbzmcU58
-						mSt0swIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NM
-						IEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUmispW4WPol2JC57a4w9q
-						nAQtGlkwHwYDVR0jBBgwFoAUmispW4WPol2JC57a4w9qnAQtGlkwDQYJKoZIhvcN
-						AQEFBQADggEBAIsdhSn+mIj+smLRJiIBHcXLN+DTXuv/7d3ev9mllgNMfTVemgdz
-						ELW6lFbWrpSs/F/nxIunKJ4dVp2FqR/mDKbjck2rb4d+9lgT6/8lT9WwkXdNG+be
-						xhqqERiKJ6Juo2OoDBv+ME96WzF7Z1iiO4LZNO8UKx8xFOThs68EyTqftpxekdQA
-						oCdcuQpmPD4qPGMmsHZ1mHWV0odYX88syhOV9mp2LGHBku49npZzCtHSHomwAH2t
-						TrsG+JZHCj5y3rzxae76z/T9zfa1oTaQRYUonCqQfTh3t3l2SJX6B1Pw6r2n0HJJ
-						8yu2OwvTBnRwfBEZAo9YeLOl8VXR2AZS/AE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.pebblepad.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Pebble Learning Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Pebble Learning Ltd: PebblePad</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.pebblepad.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Joanne</GivenName>
-    <SurName>Edgecombe</SurName>
-    <EmailAddress>mailto:support@pebblelearning.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Everson</SurName>
-    <EmailAddress>mailto:andy@pebblelearning.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ph-heidelberg.de.xml b/swamid-interfederations-2.0/shib.ph-heidelberg.de.xml
deleted file mode 100644
index 5824e0fb..00000000
--- a/swamid-interfederations-2.0/shib.ph-heidelberg.de.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ph-heidelberg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-heidelberg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.ph-heidelberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.ph-heidelberg.de,O=Paedagogische Hochschule Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFljCCBH6gAwIBAgIED7SAPTANBgkqhkiG9w0BAQUFADCBvDELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
-YmVyZzEsMCoGA1UEChMjUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEhlaWRlbGJl
-cmcxDTALBgNVBAsTBElmREkxGTAXBgNVBAMTEFBIIEhlaWRlbGJlcmcgQ0ExIzAh
-BgkqhkiG9w0BCQEWFHBraUBwaC1oZWlkZWxiZXJnLmRlMB4XDTEwMDMwODEzNTkx
-MFoXDTE1MDMwNzEzNTkxMFowgY0xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
-bi1XdWVydHRlbWJlcmcxEzARBgNVBAcTCkhlaWRlbGJlcmcxLDAqBgNVBAoTI1Bh
-ZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBIZWlkZWxiZXJnMR4wHAYDVQQDExVzaGli
-LnBoLWhlaWRlbGJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCaNSXvrmvT19AvsCFE9PniESkF7r6EI+r6OACiNvHGfvFw0ZIKLmGH6GTY7WhV
-tJo7AU6/Ycr7fjjvKDyEjVtmf+0OmRkDOdZ2+zkUboJd1LAgstrsAAkYFbrav30G
-Vs3DyK168EyCq5doKaPc6Fb+hFgxL/DmZeD8lfdXX7R8zQ9K9id4n5ZeobiLVdQ7
-2hAVfGxyqH1cjEk9x9NEbCAHbKI+l4TnhL5LGRR31dM8PZ1dY0gJrbF8kWDlJhPe
-oFuGcuByIVXPtXugvSH0ViKFL9baa6kWlaCeQ0s0YUiiW65w0td3usHmB3Ae+ao5
-lw4Vyz7fhj8sy5l+3i1H1GovAgMBAAGjggHLMIIBxzAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUowniR9xGIDxW
-roxo8n8LUOvO6EowHwYDVR0jBBgwFoAU1hg11RbbDdTZj96rLpNG4jHhQU4wHwYD
-VR0RBBgwFoEUcGtpQHBoLWhlaWRlbGJlcmcuZGUwgY0GA1UdHwSBhTCBgjA/oD2g
-O4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1oZWlkZWxiZXJnLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLWhl
-aWRlbGJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGW
-MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWhlaWRlbGJl
-cmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3BoLWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCFS0SuZkqs/s1gpuUSRQxLtRdv+s4g
-9iosFSGuT1H8BZoksUzZS4TkUXuHlTgJorh0V5st4XjWRRropDalG2RgbhjKTxAq
-PpCiy/BNLsr/Ou5fU3rsz7nw2oE96cMSe0MmgE5HGoH0BLcFiiNt4X22FRTLWA3P
-IEPPQeEoZD02DMNBW9y0jD/oVjv6icHP7WCcqVlYf6W1fZHAI3c/tEFreyxLAAGQ
-7IqmzPINmXHe1JAUT8hpv9LlM/t+gni/HGkoSrwckcg7sRFKRQzYCvjpoDxGRjO+
-/K3IBPE7aytW8scxty+/v2kGI+wG0sQME6BoP5Q6jAM0GbRGIujIxrKc
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ph-heidelberg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ph-heidelberg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ph-heidelberg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ph-heidelberg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ph-heidelberg.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ph-heidelberg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-heidelberg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.ph-heidelberg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.ph-heidelberg.de,O=Paedagogische Hochschule Heidelberg,L=Heidelberg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFljCCBH6gAwIBAgIED7SAPTANBgkqhkiG9w0BAQUFADCBvDELMAkGA1UEBhMC
-REUxGzAZBgNVBAgTEkJhZGVuLVd1ZXJ0dGVtYmVyZzETMBEGA1UEBxMKSGVpZGVs
-YmVyZzEsMCoGA1UEChMjUGFlZGFnb2dpc2NoZSBIb2Noc2NodWxlIEhlaWRlbGJl
-cmcxDTALBgNVBAsTBElmREkxGTAXBgNVBAMTEFBIIEhlaWRlbGJlcmcgQ0ExIzAh
-BgkqhkiG9w0BCQEWFHBraUBwaC1oZWlkZWxiZXJnLmRlMB4XDTEwMDMwODEzNTkx
-MFoXDTE1MDMwNzEzNTkxMFowgY0xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRl
-bi1XdWVydHRlbWJlcmcxEzARBgNVBAcTCkhlaWRlbGJlcmcxLDAqBgNVBAoTI1Bh
-ZWRhZ29naXNjaGUgSG9jaHNjaHVsZSBIZWlkZWxiZXJnMR4wHAYDVQQDExVzaGli
-LnBoLWhlaWRlbGJlcmcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCaNSXvrmvT19AvsCFE9PniESkF7r6EI+r6OACiNvHGfvFw0ZIKLmGH6GTY7WhV
-tJo7AU6/Ycr7fjjvKDyEjVtmf+0OmRkDOdZ2+zkUboJd1LAgstrsAAkYFbrav30G
-Vs3DyK168EyCq5doKaPc6Fb+hFgxL/DmZeD8lfdXX7R8zQ9K9id4n5ZeobiLVdQ7
-2hAVfGxyqH1cjEk9x9NEbCAHbKI+l4TnhL5LGRR31dM8PZ1dY0gJrbF8kWDlJhPe
-oFuGcuByIVXPtXugvSH0ViKFL9baa6kWlaCeQ0s0YUiiW65w0td3usHmB3Ae+ao5
-lw4Vyz7fhj8sy5l+3i1H1GovAgMBAAGjggHLMIIBxzAJBgNVHRMEAjAAMAsGA1Ud
-DwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUowniR9xGIDxW
-roxo8n8LUOvO6EowHwYDVR0jBBgwFoAU1hg11RbbDdTZj96rLpNG4jHhQU4wHwYD
-VR0RBBgwFoEUcGtpQHBoLWhlaWRlbGJlcmcuZGUwgY0GA1UdHwSBhTCBgjA/oD2g
-O4Y5aHR0cDovL2NkcDEucGNhLmRmbi5kZS9waC1oZWlkZWxiZXJnLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3BoLWhl
-aWRlbGJlcmctY2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGW
-MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL3BoLWhlaWRlbGJl
-cmctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3BoLWhlaWRlbGJlcmctY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCFS0SuZkqs/s1gpuUSRQxLtRdv+s4g
-9iosFSGuT1H8BZoksUzZS4TkUXuHlTgJorh0V5st4XjWRRropDalG2RgbhjKTxAq
-PpCiy/BNLsr/Ou5fU3rsz7nw2oE96cMSe0MmgE5HGoH0BLcFiiNt4X22FRTLWA3P
-IEPPQeEoZD02DMNBW9y0jD/oVjv6icHP7WCcqVlYf6W1fZHAI3c/tEFreyxLAAGQ
-7IqmzPINmXHe1JAUT8hpv9LlM/t+gni/HGkoSrwckcg7sRFKRQzYCvjpoDxGRjO+
-/K3IBPE7aytW8scxty+/v2kGI+wG0sQME6BoP5Q6jAM0GbRGIujIxrKc
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ph-heidelberg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ph-heidelberg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">PH-Heidelberg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Pädagogische Hochschule Heidelberg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ph-heidelberg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Dieter</GivenName>
-    <SurName>Schlaier</SurName>
-    <EmailAddress>schlaier@ph-heidelberg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Peter</GivenName>
-    <SurName>Moos</SurName>
-    <EmailAddress>moos@ph-heidelberg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.raven.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index dd5deaa9..00000000
--- a/swamid-interfederations-2.0/shib.raven.cam.ac.uk-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://shib.raven.cam.ac.uk/shibboleth">
-  <!--
-		This is an IdP for the University of Cambridge.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">cam.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eresources.lib.cam.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Cambridge</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://shib.raven.cam.ac.uk/idp-logo-80x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shib.raven.cam.ac.uk/idp-logo-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>128.232.0.0/16</mdui:IPHint>
-        <mdui:IPHint>129.169.0.0/16</mdui:IPHint>
-        <mdui:IPHint>131.111.0.0/16</mdui:IPHint>
-        <mdui:IPHint>192.18.195.0/24</mdui:IPHint>
-        <mdui:IPHint>193.60.80.0/20</mdui:IPHint>
-        <mdui:IPHint>193.63.252.0/23</mdui:IPHint>
-        <mdui:IPHint>2001:630:200::/48</mdui:IPHint>
-        <mdui:DomainHint>cam.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:52.208056,0.1225</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIICujCCAaICCQDN9BMM2g2oWzANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDExRz
-						aGliLnJhdmVuLmNhbS5hYy51azAeFw0xNTExMjAxNDUwNTFaFw0yNTExMTcxNDUw
-						NTFaMB8xHTAbBgNVBAMTFHNoaWIucmF2ZW4uY2FtLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxBNt1CZhNwQfCTD7sT0VctwAsdHAqhOmADg+
-						Jkpw27QKxVIPlUANAY3e7mbKuWGNYjLv9+KUrkwGhSXnOwUUCC01w+8JpII2j1W6
-						8iAvKGszfolVfmfj8vqscQ/UqlSKaGjruWk394v3b7eddYh7HCAOtgOJDIKX9F0e
-						bMkIdqQgw2e5uenwt1S9TgwOvYi+IfuZ5yhQv9Yuwo76QS8UkxOyvZdRZl7MIchx
-						O0THaTYbrca0GsSc+r9SIb++rM5fQ0yxQzh36PqbGiA1noS/dhkRZb3ywLPNoFzu
-						qwWOvcN6ubhO5YOKmTPn1N0uVg94LVMCxMWlO+DjZ8aFmMr96wIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQBimCfClavq2Wk1Zsq9AQ3TWeVFrm1kaCUi4J5j3uWNlMVK
-						PsIGE0BHAALMixG+XWt5+QW70CXq6RnHXMS0TLfM5q6K8jIVURK599bTF2/d4fNq
-						3QJNaVusuqCqym3Z7rt71QfGtPi0rVKVlQL+lL87a0TDLIyWLsbEe786NpYe0mEe
-						BXPQwpPwSaJ1PnPNlsl5i/cUZou5zZQGHtqEY/PR7wAxS/28A6qWLVpMQEUYtb9M
-						ZBb6lO15RJ5qwk6paQG87nhMPAFwSbK+OpCkt3hYd7l8LjXNG74eOZdPM5V6DmZz
-						nMRF0t4QBDKsuZ64N/+u7R3Nj6uzsQsb7PJXGNTf
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.raven.cam.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.raven.cam.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://shib.raven.cam.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.raven.cam.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.raven.cam.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.raven.cam.ac.uk/idp/profile/SAML2/Redirect/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">cam.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eresources.lib.cam.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIICujCCAaICCQDN9BMM2g2oWzANBgkqhkiG9w0BAQUFADAfMR0wGwYDVQQDExRz
-						aGliLnJhdmVuLmNhbS5hYy51azAeFw0xNTExMjAxNDUwNTFaFw0yNTExMTcxNDUw
-						NTFaMB8xHTAbBgNVBAMTFHNoaWIucmF2ZW4uY2FtLmFjLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxBNt1CZhNwQfCTD7sT0VctwAsdHAqhOmADg+
-						Jkpw27QKxVIPlUANAY3e7mbKuWGNYjLv9+KUrkwGhSXnOwUUCC01w+8JpII2j1W6
-						8iAvKGszfolVfmfj8vqscQ/UqlSKaGjruWk394v3b7eddYh7HCAOtgOJDIKX9F0e
-						bMkIdqQgw2e5uenwt1S9TgwOvYi+IfuZ5yhQv9Yuwo76QS8UkxOyvZdRZl7MIchx
-						O0THaTYbrca0GsSc+r9SIb++rM5fQ0yxQzh36PqbGiA1noS/dhkRZb3ywLPNoFzu
-						qwWOvcN6ubhO5YOKmTPn1N0uVg94LVMCxMWlO+DjZ8aFmMr96wIDAQABMA0GCSqG
-						SIb3DQEBBQUAA4IBAQBimCfClavq2Wk1Zsq9AQ3TWeVFrm1kaCUi4J5j3uWNlMVK
-						PsIGE0BHAALMixG+XWt5+QW70CXq6RnHXMS0TLfM5q6K8jIVURK599bTF2/d4fNq
-						3QJNaVusuqCqym3Z7rt71QfGtPi0rVKVlQL+lL87a0TDLIyWLsbEe786NpYe0mEe
-						BXPQwpPwSaJ1PnPNlsl5i/cUZou5zZQGHtqEY/PR7wAxS/28A6qWLVpMQEUYtb9M
-						ZBb6lO15RJ5qwk6paQG87nhMPAFwSbK+OpCkt3hYd7l8LjXNG74eOZdPM5V6DmZz
-						nMRF0t4QBDKsuZ64N/+u7R3Nj6uzsQsb7PJXGNTf
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.raven.cam.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.raven.cam.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 Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Cambridge</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>University Information Services' Service Desk</GivenName>
-    <EmailAddress>mailto:service-desk@uis.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Raven Support</GivenName>
-    <EmailAddress>mailto:raven-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.rcs.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.rcs.ac.uk-shibboleth.xml
deleted file mode 100644
index 7f490881..00000000
--- a/swamid-interfederations-2.0/shib.rcs.ac.uk-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://shib.rcs.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the Royal Conservatoire of Scotland.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-01T17:00: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">rcs.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbjCCAlYCCQCDCJdvHB5WaDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
-						QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxLDAqBgNVBAoT
-						I1RoZSBSb3lhbCBDb25zZXJ2YXRvaXJlIG9mIFNjb3RsYW5kMRcwFQYDVQQDEw5z
-						aGliLnJjcy5hYy51azAeFw0xNDA3MDgxNTMzNTJaFw0zNDA3MDMxNTMzNTJaMHkx
-						CzAJBgNVBAYTAkdCMREwDwYDVQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dv
-						dzEsMCoGA1UEChMjVGhlIFJveWFsIENvbnNlcnZhdG9pcmUgb2YgU2NvdGxhbmQx
-						FzAVBgNVBAMTDnNoaWIucmNzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEAypwPMmApdGwlBBiB1xNnyoOydBx+QGr/Hh9ENnyZ6PAmvpBu2Zlg
-						lqFx0o710C1Adp4kMYgBGWBxUDUrGVOJjnHQDmKcSFo1fLy95F6TPm9t51c6OE16
-						OP8pF+yJeJA5A6Lk26SHxzdadp7D1sZ7PYO9WhvpggBrNixRMFWADiSL4aoKQ5bG
-						/guTCqW2yV9jBsEFWmCoF4meLfk5j7MQvVwDo6Ks9Xtal6zXyh5UHwqGSZC4kWmv
-						D0Xj44cKZsow5BrvErlGwNyyIsQcvl4NsO6+2C+YpYv24Fk5QNm5eYUvLwZ+6zC5
-						lNXusB64DThRBvI7f3D3douu8/8MCTBhTQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-						AQAAH+R05+KlX9gIGrwim26gw95z3xY+FFF6nrlx/6jJ9cxvbGQIbnblZ6N1DumI
-						HK1bm97f82MEbzPMCgOzDP93ENjWhaAaq3Z4+6g5ZFrPSVDeVxYs7f2t6RmjA5Ep
-						3JEHgX11kAupmM+H41zV9aLJ+w3u2j4g3nsZYYUb4PDrVaI0oWHBjN6UaxfMT+F0
-						bBPdUZwF66jbWazOEZrNvrVSSPetTOf49psjExkYxe4IGFRM7wTcavKwljxUd6RU
-						bblLBonmSadeuNSLiq+w/a5BgMK9HI2h4Ou4kis756bHzsM4/TjXzfK+wyHWfzEb
-						lqZ24vi8hAuJEGe32pxCm2MO
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rcs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rcs.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://shib.rcs.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rcs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rcs.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">rcs.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbjCCAlYCCQCDCJdvHB5WaDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
-						QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxLDAqBgNVBAoT
-						I1RoZSBSb3lhbCBDb25zZXJ2YXRvaXJlIG9mIFNjb3RsYW5kMRcwFQYDVQQDEw5z
-						aGliLnJjcy5hYy51azAeFw0xNDA3MDgxNTMzNTJaFw0zNDA3MDMxNTMzNTJaMHkx
-						CzAJBgNVBAYTAkdCMREwDwYDVQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dv
-						dzEsMCoGA1UEChMjVGhlIFJveWFsIENvbnNlcnZhdG9pcmUgb2YgU2NvdGxhbmQx
-						FzAVBgNVBAMTDnNoaWIucmNzLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEAypwPMmApdGwlBBiB1xNnyoOydBx+QGr/Hh9ENnyZ6PAmvpBu2Zlg
-						lqFx0o710C1Adp4kMYgBGWBxUDUrGVOJjnHQDmKcSFo1fLy95F6TPm9t51c6OE16
-						OP8pF+yJeJA5A6Lk26SHxzdadp7D1sZ7PYO9WhvpggBrNixRMFWADiSL4aoKQ5bG
-						/guTCqW2yV9jBsEFWmCoF4meLfk5j7MQvVwDo6Ks9Xtal6zXyh5UHwqGSZC4kWmv
-						D0Xj44cKZsow5BrvErlGwNyyIsQcvl4NsO6+2C+YpYv24Fk5QNm5eYUvLwZ+6zC5
-						lNXusB64DThRBvI7f3D3douu8/8MCTBhTQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-						AQAAH+R05+KlX9gIGrwim26gw95z3xY+FFF6nrlx/6jJ9cxvbGQIbnblZ6N1DumI
-						HK1bm97f82MEbzPMCgOzDP93ENjWhaAaq3Z4+6g5ZFrPSVDeVxYs7f2t6RmjA5Ep
-						3JEHgX11kAupmM+H41zV9aLJ+w3u2j4g3nsZYYUb4PDrVaI0oWHBjN6UaxfMT+F0
-						bBPdUZwF66jbWazOEZrNvrVSSPetTOf49psjExkYxe4IGFRM7wTcavKwljxUd6RU
-						bblLBonmSadeuNSLiq+w/a5BgMK9HI2h4Ou4kis756bHzsM4/TjXzfK+wyHWfzEb
-						lqZ24vi8hAuJEGe32pxCm2MO
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rcs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rcs.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">Royal Conservatoire of Scotland</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Conservatoire of Scotland</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rcs.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Brian</GivenName>
-    <SurName>Hunter</SurName>
-    <EmailAddress>mailto:b.hunter@rcs.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Brian</GivenName>
-    <SurName>Hunter</SurName>
-    <EmailAddress>mailto:b.hunter@rcs.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.reaseheath.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.reaseheath.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 662873f5..00000000
--- a/swamid-interfederations-2.0/shib.reaseheath.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.reaseheath.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP for Reaseheath College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-03T15:43:53Z">
-      <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 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">reaseheath.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUJtSeU6l5y3tr7fhTbEMMdn2U+BYwDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
-						NDUxMFoXDTM1MTAxNDE1NDUxMFowIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr2h1r5VBnL9+
-						BiLgULv0RqHvItjgw6Dxr7fW3PWPHxR465Igl6bQGMeBncN7BplQw2qCtf/Pdw65
-						TGKPijbrDBXobI9hKhvIUTia6w5D3qFetCSCkRnoA9dq9xFpNOcT/0bCCkshl+dt
-						lEu5dvA5q0mp9AXHo+f/h3NjVAkpQ0c9saA99nxtpZOqOR6CIB6zFLg6cSftEqX4
-						39qbAZKBIRPiJn6PQSUd8n3zPgPy5qTts1ToksRYR6LOgi4z87CfhxMMrNfjkUM9
-						LM0ma7LWhJo32Sbci0nja8HalLRfK0gUH1GlHMh2OZkgQJ9LmLUm6E0gtYdTnDYB
-						pSky2sFa+wIDAQABo3EwbzAdBgNVHQ4EFgQU9C6qwGwlN1SKjJagZYW3GKaalVUw
-						TgYDVR0RBEcwRYIVc2hpYi5yZWFzZWhlYXRoLmFjLnVrhixodHRwczovL3NoaWIu
-						cmVhc2VoZWF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAHJp4ZwMk7E8ECWWtwBL2Fq/Sg34b+WdXhgqLt2YFPxYn1Z3MzN1QVD+3JiSd
-						B6/krjU5jjhqXe69HXzTIMy7wFhEhk78IhFcHxugyj9zC1+TXoMOLo72CvnDrPcb
-						ITBm3ypNt/UV4wKUxAfltDQy/IAbs/CXFLIAhYG7xFZ06dHuGOQ1I0JYFyDf9eqn
-						8nGFHFsCW0cs16s4d6jFvGwTYHQ7/x5aKAgztkD2VgiDZXof/Hg3HiOtVPEFX1NV
-						qRa8xFl+F1m4flEPHbHDWdjbmnwe2kPl4y6PwqWJrSMNgKlOSVhPAbztz/t3H6gp
-						LesywhYMlSPtH22K+a3CiahDMw==
-					</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>
-						MIIDPzCCAiegAwIBAgIUGjPH8LhaoQmEkZaMA9mvvFacc/swDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
-						NDUwN1oXDTM1MTAxNDE1NDUwN1owIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAphZayAXU4TZd
-						GHTg8O533mIIgetrNg622ypHh8Cp4yISkwBeRqXsysm7eLisT98f6TwF/909yvVi
-						vc6nbW93ZI/NZNdgtI/TJf2PCZL7s610Ep3ovqYR39iR4bw5PHmLXGRdLiVuKWzH
-						clNq/5/J5IAVIc/ZxkrLprDKFXwzw/c323JtdBMfNhk5ybluMhMwN5nA5CykDGfz
-						tklFQ79col3TD/pZs1DdU+iyZp9G8eO4fC66DP9awfQeg3nGtGQUB5v2ZI6GcPNd
-						VauZseVGUzCpPMY3cTr9xfsR643SOSnNkTkafiEM+mkt5pYpWAPQAZ4waPpYGYES
-						JdsLXzdBLQIDAQABo3EwbzAdBgNVHQ4EFgQUVDIF0fJ8QtDTH2hViCgfNUfqit4w
-						TgYDVR0RBEcwRYIVc2hpYi5yZWFzZWhlYXRoLmFjLnVrhixodHRwczovL3NoaWIu
-						cmVhc2VoZWF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAkw7D/FwTi7k+qqVbQmLNpzKgDAioMyAFSeiuCw280IBwvxa2PfBcSTGDzR3t
-						TNbKSI1GrSfRDcsoYIVt9UQX2Hy/cNUGMUS7UgNRpQ4CG+p/f9U9GHIFO6nKDsbg
-						tT24pA5Uhn1hFRHTiGgaovx9sK6QwFFOvztOpVbF97zl5AtisKZ/tS/gD1q0IC+1
-						Dq07d0W/Ki6taSUClNk9PebFIOIuwOQHG9Gx+hqTOAqWFDNlMPwaLdvtZEVRpN+6
-						dU+M+4WHeWDHiNxPX3k/jNUTlmHskrxTtXi4RbVYyXw+tAxhHq8S4vN2kNElhr8l
-						gvZT6e+fbGfucnFJvdlyK66CbQ==
-					</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>
-						MIIDQDCCAiigAwIBAgIVALhMQiufWiWfLbo35hETLp+s2plNMA0GCSqGSIb3DQEB
-						CwUAMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0aC5hYy51azAeFw0xNTEwMTQx
-						NTQ1MDlaFw0zNTEwMTQxNTQ1MDlaMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0
-						aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANSlu8ODQ8vQ
-						5gIusx6gX27mN3vNYBwtUoH98MunT8KoKme1O2D52/Q4l9VRrRuxO5rv2X2ezSbo
-						UoacSBGmqR15LpJJE9qIysAe4nIwlOTfuSN/8P4CcrzbZAFf1gu0BHsLkVkBb2cm
-						/wSmfISG6mh/+7VKwkEcxHA+gej1QdJbjmU+TQKjK0A6Px02PHYvuHBdFBFv+00/
-						K24pUCBANpPBK9RWxN3LxYrQervyzRAWy5JHitZuIkO9q4XWW+YuJSADzTY/y1+M
-						Ar6ZBLUcxUg0NqZJLtvhQwoJZnUqIwEY8kbN9A5FmLHFpPl9BFgx32nMGKna8YvI
-						WWp7dftoAgECAwEAAaNxMG8wHQYDVR0OBBYEFLRRrSoN4c99qjThozsyvcCPqR8v
-						ME4GA1UdEQRHMEWCFXNoaWIucmVhc2VoZWF0aC5hYy51a4YsaHR0cHM6Ly9zaGli
-						LnJlYXNlaGVhdGguYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-						ggEBAAxgcPcNG1wMo8hIca5uxoaluAJ4FGPiq90h7MWS1XSMDX3ERc2wXzZWSmhp
-						vKl/6B99HoqPycfkCVqg3c3CGW9y41bdXltxhvLID3JN7cxf3Ne7vQUNMDXlR5D9
-						qVqo0lAySIWY4Yz+FB1CzcUBsxb3dnJ4cwH+xHAx3YkVDDwyIq6gsvIvuu+oN4G7
-						5eR54/RUm65jzVW2hUJLk3MLC4/1syOrvJAfmEJrIfdPg5DrlpN4HsucpWLO88wo
-						dwmJ2RZsUVyC97olmPKAQOLV0YdeoDn8jowXXo+xDGxKQzO1S8M9STBJPr3c5+yV
-						5QUuKHTcpSRcXCPL+qGac9d/T6E=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.reaseheath.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://shib.reaseheath.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.reaseheath.ac.uk/idp/profile/SAML2/Redirect/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">reaseheath.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUJtSeU6l5y3tr7fhTbEMMdn2U+BYwDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
-						NDUxMFoXDTM1MTAxNDE1NDUxMFowIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr2h1r5VBnL9+
-						BiLgULv0RqHvItjgw6Dxr7fW3PWPHxR465Igl6bQGMeBncN7BplQw2qCtf/Pdw65
-						TGKPijbrDBXobI9hKhvIUTia6w5D3qFetCSCkRnoA9dq9xFpNOcT/0bCCkshl+dt
-						lEu5dvA5q0mp9AXHo+f/h3NjVAkpQ0c9saA99nxtpZOqOR6CIB6zFLg6cSftEqX4
-						39qbAZKBIRPiJn6PQSUd8n3zPgPy5qTts1ToksRYR6LOgi4z87CfhxMMrNfjkUM9
-						LM0ma7LWhJo32Sbci0nja8HalLRfK0gUH1GlHMh2OZkgQJ9LmLUm6E0gtYdTnDYB
-						pSky2sFa+wIDAQABo3EwbzAdBgNVHQ4EFgQU9C6qwGwlN1SKjJagZYW3GKaalVUw
-						TgYDVR0RBEcwRYIVc2hpYi5yZWFzZWhlYXRoLmFjLnVrhixodHRwczovL3NoaWIu
-						cmVhc2VoZWF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAHJp4ZwMk7E8ECWWtwBL2Fq/Sg34b+WdXhgqLt2YFPxYn1Z3MzN1QVD+3JiSd
-						B6/krjU5jjhqXe69HXzTIMy7wFhEhk78IhFcHxugyj9zC1+TXoMOLo72CvnDrPcb
-						ITBm3ypNt/UV4wKUxAfltDQy/IAbs/CXFLIAhYG7xFZ06dHuGOQ1I0JYFyDf9eqn
-						8nGFHFsCW0cs16s4d6jFvGwTYHQ7/x5aKAgztkD2VgiDZXof/Hg3HiOtVPEFX1NV
-						qRa8xFl+F1m4flEPHbHDWdjbmnwe2kPl4y6PwqWJrSMNgKlOSVhPAbztz/t3H6gp
-						LesywhYMlSPtH22K+a3CiahDMw==
-					</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>
-						MIIDPzCCAiegAwIBAgIUGjPH8LhaoQmEkZaMA9mvvFacc/swDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRoLmFjLnVrMB4XDTE1MTAxNDE1
-						NDUwN1oXDTM1MTAxNDE1NDUwN1owIDEeMBwGA1UEAwwVc2hpYi5yZWFzZWhlYXRo
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAphZayAXU4TZd
-						GHTg8O533mIIgetrNg622ypHh8Cp4yISkwBeRqXsysm7eLisT98f6TwF/909yvVi
-						vc6nbW93ZI/NZNdgtI/TJf2PCZL7s610Ep3ovqYR39iR4bw5PHmLXGRdLiVuKWzH
-						clNq/5/J5IAVIc/ZxkrLprDKFXwzw/c323JtdBMfNhk5ybluMhMwN5nA5CykDGfz
-						tklFQ79col3TD/pZs1DdU+iyZp9G8eO4fC66DP9awfQeg3nGtGQUB5v2ZI6GcPNd
-						VauZseVGUzCpPMY3cTr9xfsR643SOSnNkTkafiEM+mkt5pYpWAPQAZ4waPpYGYES
-						JdsLXzdBLQIDAQABo3EwbzAdBgNVHQ4EFgQUVDIF0fJ8QtDTH2hViCgfNUfqit4w
-						TgYDVR0RBEcwRYIVc2hpYi5yZWFzZWhlYXRoLmFjLnVrhixodHRwczovL3NoaWIu
-						cmVhc2VoZWF0aC5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAkw7D/FwTi7k+qqVbQmLNpzKgDAioMyAFSeiuCw280IBwvxa2PfBcSTGDzR3t
-						TNbKSI1GrSfRDcsoYIVt9UQX2Hy/cNUGMUS7UgNRpQ4CG+p/f9U9GHIFO6nKDsbg
-						tT24pA5Uhn1hFRHTiGgaovx9sK6QwFFOvztOpVbF97zl5AtisKZ/tS/gD1q0IC+1
-						Dq07d0W/Ki6taSUClNk9PebFIOIuwOQHG9Gx+hqTOAqWFDNlMPwaLdvtZEVRpN+6
-						dU+M+4WHeWDHiNxPX3k/jNUTlmHskrxTtXi4RbVYyXw+tAxhHq8S4vN2kNElhr8l
-						gvZT6e+fbGfucnFJvdlyK66CbQ==
-					</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>
-						MIIDQDCCAiigAwIBAgIVALhMQiufWiWfLbo35hETLp+s2plNMA0GCSqGSIb3DQEB
-						CwUAMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0aC5hYy51azAeFw0xNTEwMTQx
-						NTQ1MDlaFw0zNTEwMTQxNTQ1MDlaMCAxHjAcBgNVBAMMFXNoaWIucmVhc2VoZWF0
-						aC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANSlu8ODQ8vQ
-						5gIusx6gX27mN3vNYBwtUoH98MunT8KoKme1O2D52/Q4l9VRrRuxO5rv2X2ezSbo
-						UoacSBGmqR15LpJJE9qIysAe4nIwlOTfuSN/8P4CcrzbZAFf1gu0BHsLkVkBb2cm
-						/wSmfISG6mh/+7VKwkEcxHA+gej1QdJbjmU+TQKjK0A6Px02PHYvuHBdFBFv+00/
-						K24pUCBANpPBK9RWxN3LxYrQervyzRAWy5JHitZuIkO9q4XWW+YuJSADzTY/y1+M
-						Ar6ZBLUcxUg0NqZJLtvhQwoJZnUqIwEY8kbN9A5FmLHFpPl9BFgx32nMGKna8YvI
-						WWp7dftoAgECAwEAAaNxMG8wHQYDVR0OBBYEFLRRrSoN4c99qjThozsyvcCPqR8v
-						ME4GA1UdEQRHMEWCFXNoaWIucmVhc2VoZWF0aC5hYy51a4YsaHR0cHM6Ly9zaGli
-						LnJlYXNlaGVhdGguYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-						ggEBAAxgcPcNG1wMo8hIca5uxoaluAJ4FGPiq90h7MWS1XSMDX3ERc2wXzZWSmhp
-						vKl/6B99HoqPycfkCVqg3c3CGW9y41bdXltxhvLID3JN7cxf3Ne7vQUNMDXlR5D9
-						qVqo0lAySIWY4Yz+FB1CzcUBsxb3dnJ4cwH+xHAx3YkVDDwyIq6gsvIvuu+oN4G7
-						5eR54/RUm65jzVW2hUJLk3MLC4/1syOrvJAfmEJrIfdPg5DrlpN4HsucpWLO88wo
-						dwmJ2RZsUVyC97olmPKAQOLV0YdeoDn8jowXXo+xDGxKQzO1S8M9STBJPr3c5+yV
-						5QUuKHTcpSRcXCPL+qGac9d/T6E=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.reaseheath.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Reaseheath College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Reaseheath College (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.reaseheath.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:support@reaseheath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:support@reaseheath.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.rio.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.rio.edu-idp-shibboleth.xml
deleted file mode 100644
index 222f43f0..00000000
--- a/swamid-interfederations-2.0/shib.rio.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +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://shib.rio.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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/hide-from-discovery</saml:AttributeValue>
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</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">rio.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Rio Grande</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for the University of Rio Grande and Rio Grande Community College</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.rio.edu/about/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.rio.edu/camptech/Policies.cfm</mdui:PrivacyStatementURL>
-        <mdui:Logo height="185" width="149" xml:lang="en">https://shib.rio.edu/idp/images/rio-icon.jpg</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>
-MIIDGzCCAgOgAwIBAgIUaUJi0vL1gnTjBfKAu4Q0FSERZxkwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAwwMc2hpYi5yaW8uZWR1MB4XDTE1MDQyMTE0NDgwNloXDTM1
-MDQyMTE0NDgwNlowFzEVMBMGA1UEAwwMc2hpYi5yaW8uZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmteOxWDQLIqLj/a7Q/Lc43hZfYeQaPPcLUh+
-l4LR2J6sYpDVtS+Fg+fYthSMPSPUr5QbSkCD1SHzFFVUnDLSR9syfYREceonFRpD
-jBIfeNiJguPYS5doOyc77sRRfayxVZiDLls23e+c0iV9euQ/5DTtbvx4pW2i7+vZ
-S+adbaoRpJQHQ4+Mtxg8ypXQCP7nf0OW6P50Sb4sPYGAPzs1GHDctwNLpLREZzF3
-8WLbNlCgDhDurcmd19h4dWBB53wBqTEjNLvKx5gAG8EnXJYA+tBGN/ttfctvHRgO
-zMohfBQpjDgIeSPC9rtlT5HsFo4ETWu7kETLJKSn0+2Y8csnOwIDAQABo18wXTAd
-BgNVHQ4EFgQUKSr2j30PDNjuGnPlGcd486Z6ewIwPAYDVR0RBDUwM4IMc2hpYi5y
-aW8uZWR1hiNodHRwczovL3NoaWIucmlvLmVkdS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQUFAAOCAQEASe+1I4d5Q+FF+aDq3x5ux2EiQ/pDTyK2UnYaMgjr4iRe
-CobMVK43vfWVrokhBFrr5csu0Ei9aypy6LU8lTATGIRWcZf0FiB2hB8K2ADNVh71
-Gx3bVGkcUJRhX2Ti19rzkq1+LsIYw53/htCZCzvDAvJix9p+L9EGzXGaMLMPMGjq
-OKOmJecKqgmREgX4UNBLvnCRSC5IQfcQtC3gwlwVHy0JsMaoOOW/4jUcpaZ8wX4d
-tL65yo0BeCIJZLm4krEnwTp4IRJDitiRgvxX/TtD3ukGkSWstdktq9kAT9dGP753
-uXkfozJhPiwV90P6DNBkmS6MeSVPWoggq75BbFMFCg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rio.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rio.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.rio.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rio.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rio.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rio.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUaUJi0vL1gnTjBfKAu4Q0FSERZxkwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAwwMc2hpYi5yaW8uZWR1MB4XDTE1MDQyMTE0NDgwNloXDTM1
-MDQyMTE0NDgwNlowFzEVMBMGA1UEAwwMc2hpYi5yaW8uZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmteOxWDQLIqLj/a7Q/Lc43hZfYeQaPPcLUh+
-l4LR2J6sYpDVtS+Fg+fYthSMPSPUr5QbSkCD1SHzFFVUnDLSR9syfYREceonFRpD
-jBIfeNiJguPYS5doOyc77sRRfayxVZiDLls23e+c0iV9euQ/5DTtbvx4pW2i7+vZ
-S+adbaoRpJQHQ4+Mtxg8ypXQCP7nf0OW6P50Sb4sPYGAPzs1GHDctwNLpLREZzF3
-8WLbNlCgDhDurcmd19h4dWBB53wBqTEjNLvKx5gAG8EnXJYA+tBGN/ttfctvHRgO
-zMohfBQpjDgIeSPC9rtlT5HsFo4ETWu7kETLJKSn0+2Y8csnOwIDAQABo18wXTAd
-BgNVHQ4EFgQUKSr2j30PDNjuGnPlGcd486Z6ewIwPAYDVR0RBDUwM4IMc2hpYi5y
-aW8uZWR1hiNodHRwczovL3NoaWIucmlvLmVkdS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQUFAAOCAQEASe+1I4d5Q+FF+aDq3x5ux2EiQ/pDTyK2UnYaMgjr4iRe
-CobMVK43vfWVrokhBFrr5csu0Ei9aypy6LU8lTATGIRWcZf0FiB2hB8K2ADNVh71
-Gx3bVGkcUJRhX2Ti19rzkq1+LsIYw53/htCZCzvDAvJix9p+L9EGzXGaMLMPMGjq
-OKOmJecKqgmREgX4UNBLvnCRSC5IQfcQtC3gwlwVHy0JsMaoOOW/4jUcpaZ8wX4d
-tL65yo0BeCIJZLm4krEnwTp4IRJDitiRgvxX/TtD3ukGkSWstdktq9kAT9dGP753
-uXkfozJhPiwV90P6DNBkmS6MeSVPWoggq75BbFMFCg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rio.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Rio Grande</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Rio Grande</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rio.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kingsley Meyer</md:GivenName>
-    <md:EmailAddress>kmeyer@rio.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rio Grande Technical Support</md:GivenName>
-    <md:EmailAddress>support@rio.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Rio Grande Technical Support</md:GivenName>
-    <md:EmailAddress>support@rio.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Rio Grande Technical Support</md:GivenName>
-    <md:EmailAddress>support@rio.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml b/swamid-interfederations-2.0/shib.rsc-uat.org-shibboleth.xml
deleted file mode 100644
index b55ddc5b..00000000
--- a/swamid-interfederations-2.0/shib.rsc-uat.org-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.rsc-uat.org/shibboleth">
-  <!--
-		This is a "Test System" Shibboleth SP for Royal Society of Chemistry.
-	-->
-  <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="2013-06-14T12:34:32Z">
-      <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.rsc-uat.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://shib.rsc-uat.org/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAIdMRZNoOlUKMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHNoaWIucnNjLXVhdC5vcmcwHhcNMTMwNjEzMTUxMTA3WhcNMjMwNjExMTUx
-						MTA3WjAbMRkwFwYDVQQDExBzaGliLnJzYy11YXQub3JnMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAvCYfBRJznhtFJ6ObF/CZd2L+NfFHkc3Xc1Hq8ahf
-						B3OjIWGT86P11rSBoqgKAKjc/paf3H8fqbieWcl23zFYZt2p5Tgn/N+0gWEDqU3E
-						FElv3BkG1qDm6dzASfUe2d6UmywWxA8o755qiR61EyW44t8zBnMlP3zz/4D/c30c
-						60pE6ey7vjYo/OSUU1NtJKiSnRVul4ojisBcyQBqTEA+rSz3tdY5tDahZs0ETY15
-						OulSEeIgAJ+jyixna5hG88LujxTLfP8eJ5c44bB6tlj+zxX6t2NffbJvmbGA7tsO
-						m9HNLaEYpIkvB85FcFU0okDKvEVb0oCi9bxV1G1KnwW5pQIDAQABoz4wPDAbBgNV
-						HREEFDASghBzaGliLnJzYy11YXQub3JnMB0GA1UdDgQWBBStPkn6a3WJboUaFzSW
-						4gO3/fZFDTANBgkqhkiG9w0BAQUFAAOCAQEAC63PW0yGjrWEiHKCIPHQJfekHD1/
-						EVXsk3Acjv9Hi6oCgMc3aWPvOwdL6CaeiX4VHGkVtiTWpSaG/6UbsjMVF9sdG4PD
-						/DsYKjsjVj3+72zIpVhSrKQt5tbl0fvgaZWLjiCTua1NI+Iw2BSI1C6NCgguvpP8
-						LKnz7yF0ck8omkoQVuAEUEJcniWzdaxXPeU53/4LeWti2tH7240yH3gjNeN3J09v
-						/rfTDcT7i58eKalUZtWL7XvKZ+kp5ziyyWnjqRyLUbrWaBXOlBsyZkrhu4i+XwHl
-						E9Z+U+Ne35q+J2NuQ3Z3TXADXkPmz5i2O87MoZcKhdcm1EoZdpi3iUJAgA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shib.rsc-uat.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc-uat.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rsc-uat.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc-uat.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc-uat.org/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc-uat.org/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rsc-uat.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc-uat.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc-uat.org/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.rsc-uat.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Royal Society of Chemistry</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Society of Chemistry Test System</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rsc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Internet Services</GivenName>
-    <EmailAddress>mailto:internet_services@rsc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Internet Services</GivenName>
-    <EmailAddress>mailto:internet_services@rsc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml b/swamid-interfederations-2.0/shib.rsc.org-shibboleth.xml
deleted file mode 100644
index 0df8fd93..00000000
--- a/swamid-interfederations-2.0/shib.rsc.org-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.rsc.org/shibboleth">
-  <!--
-		This is a Shibboleth SP for the Royal Society of Chemistry.
-	-->
-  <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="2008-08-20T11:51: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://shib.rsc.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://shib.rsc.org/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6zCCAdOgAwIBAgIJAI2c7IusuZ5TMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-						BAMTDHNoaWIucnNjLm9yZzAeFw0xMDA3MjcxMTA3MzlaFw0yMDA3MjQxMTA3Mzla
-						MBcxFTATBgNVBAMTDHNoaWIucnNjLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAMZz+1jRYCDUqaGAKnq3AH6BAdsUjMW+saQwgx8bEjEa5kQ0NSHw
-						7g3RyE6qNB6BVRoeveqTaR97haz2K02ujOKLJpCRQvZ8qT3/KdnrjRhTfekhGV/F
-						PLk1sUu32B4VLXY82hqHjaRBNteF+3Ez2/kFOD8VO82woiN2P9s2HhKSqXsM9rDB
-						EJNKva0oFUyDrvcmGyU5hebbAO6aJSkjC2ZZ+oRTbc7jVfSvYxJFejMQRe+3vApj
-						WcE1rSqiVA9D5m1zy8q+pYMgyWUgm2tPK46s+xq8QsSguimNhlrAaWkUtXaGmyPo
-						ygZBl83B4BiSIVkXVp6pVRhBF6tVp6a7n4kCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-						c2hpYi5yc2Mub3JnMB0GA1UdDgQWBBSg4xxfMjUKAHXCOPIEKfl+m56MUDANBgkq
-						hkiG9w0BAQUFAAOCAQEAZuQxsfshqIs1QF9EK+lblk0K8GLOpC9bUgGbM0xO+qk7
-						2VYpi1DjmCLMemfPSqopr0X68jrnd/K5SLv5GUKy2tpJyndVBQcOGYjUtanIUtiB
-						DirWlDDT+Ru5J94mc+aEeyrWH6slRrONqYgEOuKOzD8pDgS7fcThTZBnqo/ywE5a
-						hYnP/EZ3wPhR+HudHbRcaFguVSAe+9hu7lqpPOUsmmZIAcUkPq78sckMhVohpyy/
-						0FenvgTlpbL0eKdn0WkkyPrcakFZk9d3l5aiKxcffteu1G/V5AyQiL2ZkI/hhU5V
-						8WXqr8jwzK1gLwel29uXXyVjCDSVfSWSSHBHqhn9/g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shib.rsc.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rsc.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc.org/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rsc.org/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rsc.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc.org/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rsc.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rsc.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.rsc.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.rsc.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.rsc.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.rsc.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Royal Society of Chemistry</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Society of Chemistry</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rsc.org/aboutus/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ICT Helpdesk</GivenName>
-    <EmailAddress>mailto:ict@rsc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>ICT Helpdesk</GivenName>
-    <EmailAddress>mailto:ict@rsc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.slcs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.slcs.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index ba2a0843..00000000
--- a/swamid-interfederations-2.0/shib.slcs.ac.uk-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://shib.slcs.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for MyScience.co Limited, trading as National Science Learning Centre.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-05T16:28: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">slcs.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Science Learning Centre</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Science Learning Centres are a national network for professional development in science teaching.</mdui:Description>
-        <mdui:Logo height="72" width="200">https://shib.slcs.ac.uk/images/nslc.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEbDCCA1SgAwIBAgIRAK0yQqUXeWtcLxUv7qHLOWMwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MTYwMDAwMDBaFw0xNjA0MTUyMzU5NTlaMD0xITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPc2hpYi5zbGNz
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwmGmPdTY0lm
-						gJv1BOz0VKGDHxYARn6CjWcAiYwSCRdKPcvuC+9u+WE/Ix99pohRmUBPMvMrV7cQ
-						3tay1PVfzRKaQHuaBfebcdKvTbYit+9qkPF0G2bpEAGExDILj+iX4hz2aDXWALsZ
-						h7KgAnqDmFtEBTQ7zSSaJ0RC/OHxSfnPcKq+5u9q2khSSlZ2qm9TALHBqzHFZ5Fc
-						CqiwDlpaTHUsq+na51qgzMTlFcRUdhuWqswjHwMCXfy+LXrKuB2Tqx2GJGhyxKj0
-						qOEcS2Y0sCcbFxWu2YMWBLALrMbWrlxEYQx+rUhc4vaSUP3bdn9WeGSDDmvivc0G
-						EH0WGNlHHQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-						6pDjue0wHQYDVR0OBBYEFF5kyhGCi1vHv58VqH8E0F2lyFtzMA4GA1UdDwEB/wQE
-						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-						cC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9zaGliLnNsY3MuYWMudWswDQYJ
-						KoZIhvcNAQEFBQADggEBAJNfGU4saCObDfVoX5gl/czSR7tT7d/SCn/eC1SrGrfq
-						JQGYqWjJUd99BXN5E6ZKWyrYxQmoiciKNDLznkP5JmxKKASZe2J5gTzLX2KiPx43
-						b3Bh0oqr3h/aLs0ZPoODUoMYoNDl1Pa83zR9g7sfWD+xmrKWUTLRLtZkagMl17wh
-						fofDtEw68wcgdZRE5Nal0fh0lB2W0Ot9fuWEHHIsw1ofedKSyQBmRdB+ZXmaBzeb
-						FUt9W2huCi7fG7A5O4VNeh4rrdcQ4EOfg/K4pTSayAphryV7DfnH3L7BpreKFQwX
-						7nwQQNJNDTLtIPdwewp8lXQLC+3IMUUqhQCTVQ9TVrs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.slcs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.slcs.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://shib.slcs.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.slcs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.slcs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.slcs.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">slcs.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEbDCCA1SgAwIBAgIRAK0yQqUXeWtcLxUv7qHLOWMwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MTYwMDAwMDBaFw0xNjA0MTUyMzU5NTlaMD0xITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPc2hpYi5zbGNz
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwmGmPdTY0lm
-						gJv1BOz0VKGDHxYARn6CjWcAiYwSCRdKPcvuC+9u+WE/Ix99pohRmUBPMvMrV7cQ
-						3tay1PVfzRKaQHuaBfebcdKvTbYit+9qkPF0G2bpEAGExDILj+iX4hz2aDXWALsZ
-						h7KgAnqDmFtEBTQ7zSSaJ0RC/OHxSfnPcKq+5u9q2khSSlZ2qm9TALHBqzHFZ5Fc
-						CqiwDlpaTHUsq+na51qgzMTlFcRUdhuWqswjHwMCXfy+LXrKuB2Tqx2GJGhyxKj0
-						qOEcS2Y0sCcbFxWu2YMWBLALrMbWrlxEYQx+rUhc4vaSUP3bdn9WeGSDDmvivc0G
-						EH0WGNlHHQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-						6pDjue0wHQYDVR0OBBYEFF5kyhGCi1vHv58VqH8E0F2lyFtzMA4GA1UdDwEB/wQE
-						AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-						AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-						MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-						bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-						cC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9zaGliLnNsY3MuYWMudWswDQYJ
-						KoZIhvcNAQEFBQADggEBAJNfGU4saCObDfVoX5gl/czSR7tT7d/SCn/eC1SrGrfq
-						JQGYqWjJUd99BXN5E6ZKWyrYxQmoiciKNDLznkP5JmxKKASZe2J5gTzLX2KiPx43
-						b3Bh0oqr3h/aLs0ZPoODUoMYoNDl1Pa83zR9g7sfWD+xmrKWUTLRLtZkagMl17wh
-						fofDtEw68wcgdZRE5Nal0fh0lB2W0Ot9fuWEHHIsw1ofedKSyQBmRdB+ZXmaBzeb
-						FUt9W2huCi7fG7A5O4VNeh4rrdcQ4EOfg/K4pTSayAphryV7DfnH3L7BpreKFQwX
-						7nwQQNJNDTLtIPdwewp8lXQLC+3IMUUqhQCTVQ9TVrs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.slcs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.slcs.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">MyScience.co Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">National Science Learning Centre</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.sciencelearningcentres.org.uk/national/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>SLCS support</GivenName>
-    <EmailAddress>mailto:support@slcs.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SLCS support</GivenName>
-    <EmailAddress>mailto:support@slcs.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.sou.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.sou.edu-idp-shibboleth.xml
deleted file mode 100644
index e683ad1b..00000000
--- a/swamid-interfederations-2.0/shib.sou.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,67 +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://shib.sou.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shib.sou.edu/idp/error.jsp" 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">sou.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Southern Oregon University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A public liberal arts university.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.sou.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.sou.edu/policies/Electronic-Commerce-Privacy.pdf</mdui:PrivacyStatementURL>
-        <mdui:Logo height="96" width="96" xml:lang="en">https://shib.sou.edu/SOU-Logo.jpg</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>
-MIIDGzCCAgOgAwIBAgIUHi1qf8ZHuuT85F7NR8j74fvWWqIwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMc2hpYi5zb3UuZWR1MB4XDTExMDUxMjIwMDkxNVoXDTMx
-MDUxMjIwMDkxNVowFzEVMBMGA1UEAxMMc2hpYi5zb3UuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk9NC9AvTLSwAdcAhjkvhwGeI8muAGSCK1vVU
-FjMf0PpcizEnW2MIGV44eOCEJF3gzyBYKgkIiiMzRDpydmM3IrkiTt7s/jTsez7e
-R8GRgzjJcMsjKZH2TBGVziggs4FChv1YL3wzbVCLimZq23cj5CBQw2IiXzo/KIqE
-9xNqqg/o0e/Gdu0H15hajkVGiFxjzcERw/iy6JIOg9PyLGnTRuu6yOkacIvV78wf
-Hdap/cj6TZQr//5Qs5yCebeekh5nBtOpUTdop21CbOdeKpqX4IrsLP8lBgFkm+rl
-oqIK365tbY6Qjx5Bw8PYEc5zMP2DRLLq0qqnm19yVOeucfHm7QIDAQABo18wXTA8
-BgNVHREENTAzggxzaGliLnNvdS5lZHWGI2h0dHBzOi8vc2hpYi5zb3UuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRm7aYfeD2Lba31XzLlLLl4ojnkoTANBgkq
-hkiG9w0BAQUFAAOCAQEARUceV1FxV09Vmfg9fX+wQpFxkSLioz+0ColYNpbsbAu/
-Mcxgql5hoHQIeVpFtJio2UOGEwk9gl1ZtJz8aBQ/fs0kQKf7XxWRtzz4V0xnPznE
-KbWbntYu+84X6N+d51olQ5DRBp120dBBrRsGgDxRX+l/dBneIu1Ht5+YSl7phBIb
-iypEYN6U2M5cN/5un4rR6NI0950Fg6YizIh58SkPVNxkRTNyQC/Djxmz44q05oKz
-V6vQDuNw1E/38wMn3hRvr+xDshTOrgTAAdmO0g+Fnn2ewD2lBow/6aqaXPUqOqxB
-uoe4SJwHwKvWq/ZZBvDfR9GwlXaDOR9yXXDLLIcYaA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.sou.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.sou.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.sou.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.sou.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.sou.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.sou.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Southern Oregon University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Southern Oregon University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sou.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Brad Christ</md:GivenName>
-    <md:EmailAddress>christb@sou.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>David Whipp</md:GivenName>
-    <md:EmailAddress>whipp@sou.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml b/swamid-interfederations-2.0/shib.theiet.org-shibboleth.xml
deleted file mode 100644
index 528fcfaa..00000000
--- a/swamid-interfederations-2.0/shib.theiet.org-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://shib.theiet.org/shibboleth">
-  <!--
-		This is a Shibboleth SP for The Institution of Engineering and Technology.
-	-->
-  <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="2015-07-30T09:54:24Z">
-      <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.theiet.org/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDITCCAgmgAwIBAgIJAN2I4zf0p8hfMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-						BAMTHjYzMzkzMy13c2VpMS5sb24uaW50ZW5zaXZlLmludDAeFw0xNTA3MjMwNzQy
-						MjdaFw0yNTA3MjAwNzQyMjdaMCkxJzAlBgNVBAMTHjYzMzkzMy13c2VpMS5sb24u
-						aW50ZW5zaXZlLmludDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJgw
-						uzjl7ojagD+weX2xP9tmanTdXC1S2Z+/RmlJFgTH3e8vuZGefGA/CiG0NZfhGeIA
-						IvLG1mNgq1XUk+i2zj0bpo1lf9ZD4+rM1WEDP9Is3o+CId4rlqlLEV1+wiWv+lKi
-						R9sYhub+SBNCsWbndUtgL8B9Uzi1wc4zQ7lvbV0MoCJPUGtdtK5eee+9VMD4MPOL
-						szTxCJg5vsU+bolurr0NB4lETrd93JVtp3kLRkygC1xzuBxreOUn5DTOVww0Sz2I
-						y1WRU9VK0BjbIJRnznHoLxQWbj7CgKuygI4vpOlt0HBzSC/6BB/3dUnHT9oxlZ3z
-						d3LY5Cy3k9tI9njU6sUCAwEAAaNMMEowKQYDVR0RBCIwIIIeNjMzOTMzLXdzZWkx
-						Lmxvbi5pbnRlbnNpdmUuaW50MB0GA1UdDgQWBBTweJWrTk3cVYECwy8wA49GfYVs
-						QTANBgkqhkiG9w0BAQUFAAOCAQEAltn6UF4taVBOa+wOMu7qRIw80TtFzaZLud15
-						f7OggdEiN7eXRnuvgPIegCPcPQstjTDQxG2yY+tStKlzwqMJLUbi0jYieAAQhWL1
-						xn+t/O2X89w7mgMQftVcgZO4qo3FA0qFhmSYRcqUQnBWWrN9+Upjv75qmZ9Y4f4J
-						m91hsYbVGg5wjb25Z+NMfaq9j4E+cta0w10ipCiUYjp+3c2BCTY8RfmvNjleBw2C
-						LS9D/jGafuWQZ6Wu2E7/tgGPdh3ncDsFwXEw4BBx3NVu8UxPuGBwBSzjl4JetuOM
-						EiKAsWccGKR+zkAE1ZQv9Kf0t1dxdsNPK9aoLqY1dO3dILZdow==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shib.theiet.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.theiet.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.theiet.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.theiet.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.theiet.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.theiet.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.theiet.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.theiet.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Institution of Engineering and Technology</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Institution of Engineering and Technology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.theiet.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ross</GivenName>
-    <SurName>London</SurName>
-    <EmailAddress>mailto:RLondon@theiet.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ravi</GivenName>
-    <SurName>Racharla</SurName>
-    <EmailAddress>mailto:ravi.racharla@northgate-is.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.towson.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.towson.edu-idp-shibboleth.xml
deleted file mode 100644
index b98c609d..00000000
--- a/swamid-interfederations-2.0/shib.towson.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +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://shib.towson.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shib.towson.edu/errorpage.jsp" 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">towson.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Towson University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Towson University Shibboleth Identity Provider allows TU faculty, staff and students to access external service providers using their TU NetID.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://shib.towson.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://inside.towson.edu/generalcampus/tupolicies/categorylist.cfm?thecategory=Information%20Technology</mdui:PrivacyStatementURL>
-        <mdui:Logo height="95" width="150" xml:lang="en">https://shib.towson.edu/tulogo.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>
-MIIDJzCCAg+gAwIBAgIUeUyjo2SlWE+7HVwZNNPhmaRq7IUwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYi50b3dzb24uZWR1MB4XDTEwMTExOTIwNTAwNloX
-DTMwMTExOTIwNTAwNlowGjEYMBYGA1UEAxMPc2hpYi50b3dzb24uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm+80ygl/7o0zJ9WOjMmCcxXoQDbC
-K3nzwqwBlbdZsrbyI2CK1jVdbm14qwX+CV7RcPlYn1UySNa5IKKcA5Peg4ZYgMY6
-Zcql5VYe9soBEek/i/hDoUehZmk6IWOvJA/EdL+eVGU1YmFDTFVvdc0/VZVnSh3r
-MwAwULUIUYJ+VzEmGv2RvrH6q15DUlkvCu+DWbkAWOK2ttXI1jcBwciBtRkoeL6t
-vxSZLB62zaPMEwu337Qkb1nYW72LLJWxmdb5uoC6BO1mE/Gz1VnFGHLmWZESj31m
-ghMM3Jq1c5F7pyw15ItYnp+cuEjhACYGUDXsVVzm0IHfU8Hn8pZ4+XfodQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliLnRvd3Nvbi5lZHWGJmh0dHBzOi8vc2hpYi50
-b3dzb24uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTxJKAJrXHxDDfkW8v/
-6jWfrJawZDANBgkqhkiG9w0BAQUFAAOCAQEAPPBq7pprx9bbAblcUa4ma65htZ4K
-adAHoIcglr33+nQqXBHzfVosNT9iB2lZcOYsICLu0Y9CuPVHKvVQDQlgXsn5YaWu
-iv5oVv3pl91q0eE621oFH+igbl2RpiKENNj4w1fNTikJLIWXSEYpZa5jdmhLNn6Y
-z9FJuXn8i7FSvQfu8kOsjmKOCUD333hzjWzy1mYA59Y1dvfz3WGu4FeUB6F6sHLw
-q4DITFHAjZ2SWqqovGnDQE4gDkjMo9VcoCkuJXlDe5tcL4p4VVCpTxAf1gjVjZI8
-nFkR2HziVx5kyIQzS4OseZJhuckZtZM/ln/unK1EHe7e7DEx/l47qSDrBg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.towson.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.towson.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.towson.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.towson.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.towson.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.towson.edu/idp/profile/SAML2/POST-SimpleSign/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">towson.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUeUyjo2SlWE+7HVwZNNPhmaRq7IUwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYi50b3dzb24uZWR1MB4XDTEwMTExOTIwNTAwNloX
-DTMwMTExOTIwNTAwNlowGjEYMBYGA1UEAxMPc2hpYi50b3dzb24uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm+80ygl/7o0zJ9WOjMmCcxXoQDbC
-K3nzwqwBlbdZsrbyI2CK1jVdbm14qwX+CV7RcPlYn1UySNa5IKKcA5Peg4ZYgMY6
-Zcql5VYe9soBEek/i/hDoUehZmk6IWOvJA/EdL+eVGU1YmFDTFVvdc0/VZVnSh3r
-MwAwULUIUYJ+VzEmGv2RvrH6q15DUlkvCu+DWbkAWOK2ttXI1jcBwciBtRkoeL6t
-vxSZLB62zaPMEwu337Qkb1nYW72LLJWxmdb5uoC6BO1mE/Gz1VnFGHLmWZESj31m
-ghMM3Jq1c5F7pyw15ItYnp+cuEjhACYGUDXsVVzm0IHfU8Hn8pZ4+XfodQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliLnRvd3Nvbi5lZHWGJmh0dHBzOi8vc2hpYi50
-b3dzb24uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTxJKAJrXHxDDfkW8v/
-6jWfrJawZDANBgkqhkiG9w0BAQUFAAOCAQEAPPBq7pprx9bbAblcUa4ma65htZ4K
-adAHoIcglr33+nQqXBHzfVosNT9iB2lZcOYsICLu0Y9CuPVHKvVQDQlgXsn5YaWu
-iv5oVv3pl91q0eE621oFH+igbl2RpiKENNj4w1fNTikJLIWXSEYpZa5jdmhLNn6Y
-z9FJuXn8i7FSvQfu8kOsjmKOCUD333hzjWzy1mYA59Y1dvfz3WGu4FeUB6F6sHLw
-q4DITFHAjZ2SWqqovGnDQE4gDkjMo9VcoCkuJXlDe5tcL4p4VVCpTxAf1gjVjZI8
-nFkR2HziVx5kyIQzS4OseZJhuckZtZM/ln/unK1EHe7e7DEx/l47qSDrBg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.towson.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.towson.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Towson University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Towson University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://towson.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth Technical Issues</md:GivenName>
-    <md:EmailAddress>shib@towson.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Student Computing Services</md:GivenName>
-    <md:EmailAddress>scs@towson.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>OTS Help Center</md:GivenName>
-    <md:EmailAddress>helpcenter@towson.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Shibboleth Technical Issues</md:GivenName>
-    <md:EmailAddress>shib@towson.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 956a8cdb..00000000
--- a/swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.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://shib.u-paris10.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université Paris Ouest Nanterre La Défense</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAQUlEQVQY04WOMQ4AMAgC+f9L3XkAjWnaqAwOmngoAlBRSsjOUmgTTSdgZPeQeWjZSQ81PQa5OdrVIC+Hyo/4JP0OTEq5NtQeSrYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDgrMDI6MDBjnYKrAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQ4KzAyOjAwEsA6FwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.u-paris10.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université Paris Ouest Nanterre La Défense</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>
-					      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>
-    </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-POST" Location="https://shib.u-paris10.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.u-paris10.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.u-paris10.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université Paris Ouest Nanterre La Défense</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Paris Ouest Nanterre La Défense</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.u-paris10.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Driss Bouzekhrout</md:SurName>
-    <md:EmailAddress>driss@u-paris10.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Gaël Merlin</md:SurName>
-    <md:EmailAddress>gmerlin@u-paris10.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 44a6cca4..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.ufg.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ufg.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://shib.ufg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ufg.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ufg.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ufg.br/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">ufg.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ufg.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ufg.br:8443/idp/profile/SAML1/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">UFG - Universidade Federal de Goias</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFG - Universidade Federal de Goias</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFG - Universidade Federal de Goias</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFG - Universidade Federal de Goias</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufg.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufg.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Douglas Borges de Oliveira Filho</md:SurName>
-    <md:EmailAddress>douglasfilho@cercomp.ufg.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 5b9af2c7..00000000
--- a/swamid-interfederations-2.0/shib.ufg.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://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>
-    MIIDhDCCAmwCAQAwDQYJKoZIhvcNAQEFBQAwgYcxDDAKBgNVBAoTA1VGRzEQMA4G
-A1UECxMHQ0VSQ09NUDEjMCEGCSqGSIb3DQEJARYUcmVkZXMuY2VyY29tcEB1Zmcu
-YnIxEDAOBgNVBAcTB0dvaWFuaWExCzAJBgNVBAgTAkdPMQswCQYDVQQGEwJCUjEU
-MBIGA1UEAxMLc2hpYi51ZmcuYnIwHhcNMTQwMjEwMTUxNzU4WhcNMTkwMjA5MTUx
-NzU4WjCBhzEMMAoGA1UEChMDVUZHMRAwDgYDVQQLEwdDRVJDT01QMSMwIQYJKoZI
-hvcNAQkBFhRyZWRlcy5jZXJjb21wQHVmZy5icjEQMA4GA1UEBxMHR29pYW5pYTEL
-MAkGA1UECBMCR08xCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAON3u/XO/1eJm6MQ1rJVF/6V
-FwUe9Srcq0sVafKzdSGwCVA+JeXesJ0JXeqALeYsUqhC0Ii/FbS5tpfsT7tTUUZ0
-tkdkGCQJd28nfbAy0X8MSGIP8DBPokyNJYtwT14Yrfk0FoHqQL3U+f2ggPw6OCBC
-YUCi3Y1DspGVI0mDedjdFBgIVmCGCwt5z37SH9gdpG4qAMpwWet4BD1RDgzhDWM8
-qK0WSf8glraiRLBci7qDBX/ZjYj3ZqvcuBs1+lcI9b+Aap+WQ8QD7gBfBFvtls52
-qwOD88szOLeNLhUcg5VQfHh+Ds9kX4IQmk0brmLmlAHZ31UjaF7Z7eBS2djFl4EC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAaFOtZ3B5x/uCRDDQ/JyK9oYE3WY43U/x
-k2mqTxgZb5CnYuty4C1xUJlXYpt7W4tzUlgjzuMUWxo+lyi07NsLGsQN4c7E+LU5
-4q7HuUJK1p7pdsJmh009+uKTg4eKPl3KLNPCrF/wh9g5wmwoYCD/YRw2XrIt/pxq
-3GWOxlRrytTLxwNXu0ogj9pvdP2Wrqa/eT8a8tfUDqanBljhHPFXl0wnIJC00RO7
-f++HH1Q7lws42gA4j7FxJGlhKpTJaBs+4hBFtiu7HJ2/4fzrZLAzB8roL9Caa43s
-JDTR9bPLvU4UTnmU/mYqb6H+6mqgOOaXmXDyLjfz4vxsaDHL1kTKpA==
-            </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>
-      
-MIIDhDCCAmwCAQAwDQYJKoZIhvcNAQEFBQAwgYcxDDAKBgNVBAoTA1VGRzEQMA4G
-A1UECxMHQ0VSQ09NUDEjMCEGCSqGSIb3DQEJARYUcmVkZXMuY2VyY29tcEB1Zmcu
-YnIxEDAOBgNVBAcTB0dvaWFuaWExCzAJBgNVBAgTAkdPMQswCQYDVQQGEwJCUjEU
-MBIGA1UEAxMLc2hpYi51ZmcuYnIwHhcNMTQwMjEwMTUxNzU4WhcNMTkwMjA5MTUx
-NzU4WjCBhzEMMAoGA1UEChMDVUZHMRAwDgYDVQQLEwdDRVJDT01QMSMwIQYJKoZI
-hvcNAQkBFhRyZWRlcy5jZXJjb21wQHVmZy5icjEQMA4GA1UEBxMHR29pYW5pYTEL
-MAkGA1UECBMCR08xCzAJBgNVBAYTAkJSMRQwEgYDVQQDEwtzaGliLnVmZy5icjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAON3u/XO/1eJm6MQ1rJVF/6V
-FwUe9Srcq0sVafKzdSGwCVA+JeXesJ0JXeqALeYsUqhC0Ii/FbS5tpfsT7tTUUZ0
-tkdkGCQJd28nfbAy0X8MSGIP8DBPokyNJYtwT14Yrfk0FoHqQL3U+f2ggPw6OCBC
-YUCi3Y1DspGVI0mDedjdFBgIVmCGCwt5z37SH9gdpG4qAMpwWet4BD1RDgzhDWM8
-qK0WSf8glraiRLBci7qDBX/ZjYj3ZqvcuBs1+lcI9b+Aap+WQ8QD7gBfBFvtls52
-qwOD88szOLeNLhUcg5VQfHh+Ds9kX4IQmk0brmLmlAHZ31UjaF7Z7eBS2djFl4EC
-AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAaFOtZ3B5x/uCRDDQ/JyK9oYE3WY43U/x
-k2mqTxgZb5CnYuty4C1xUJlXYpt7W4tzUlgjzuMUWxo+lyi07NsLGsQN4c7E+LU5
-4q7HuUJK1p7pdsJmh009+uKTg4eKPl3KLNPCrF/wh9g5wmwoYCD/YRw2XrIt/pxq
-3GWOxlRrytTLxwNXu0ogj9pvdP2Wrqa/eT8a8tfUDqanBljhHPFXl0wnIJC00RO7
-f++HH1Q7lws42gA4j7FxJGlhKpTJaBs+4hBFtiu7HJ2/4fzrZLAzB8roL9Caa43s
-JDTR9bPLvU4UTnmU/mYqb6H+6mqgOOaXmXDyLjfz4vxsaDHL1kTKpA==
-                    
-            </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.ukmsl.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shib.ukmsl.com-shibboleth-sp.xml
deleted file mode 100644
index cfdf2ad4..00000000
--- a/swamid-interfederations-2.0/shib.ukmsl.com-shibboleth-sp.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://shib.ukmsl.com/shibboleth-sp">
-  <!--
-		This is a Shibboleth test service provider for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-16T16:43:06.362897Z">
-      <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.ukmsl.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://shib.ukmsl.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGzCCAgOgAwIBAgIJAOulbFGs3eq7MA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-						BAMTHHR1cmJlcnQuc3VuaW9uLndhcndpY2suYWMudWswHhcNMTEwODMwMDkwNzMw
-						WhcNMjEwODI3MDkwNzMwWjAnMSUwIwYDVQQDExx0dXJiZXJ0LnN1bmlvbi53YXJ3
-						aWNrLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoVp3lX99
-						jZkKVQIWyMblgNh9oHW9l2eEE7gW7RyzMEcjJ/lWehfc7K8LDiWWbidZapYC5Sx7
-						pRwdgdqOAC8grdmdcJA/qj0ep0fV3I9jnVIlgwRGn2RO9Io955nLQzwRTvYmt/9I
-						e77UaHwA+XNzTzw9cOzsoTgcyAPjRqnfhvlUFfsFblCWTrUNhD/HvgpWmYmJsdrF
-						sbVA0UzXVnMe9qFSkBXS/lhD5h5prR/3JEq0TKqPTGDYFTaOjpPgwqSDmySem+bb
-						bxJjAvBgcqw3kLEboy9rZMFej5tg9ojBHe12QjHNey+pGXNNeu0qJbrJ13KTIj5n
-						ZSTzchG5IsNHDwIDAQABo0owSDAnBgNVHREEIDAeghx0dXJiZXJ0LnN1bmlvbi53
-						YXJ3aWNrLmFjLnVrMB0GA1UdDgQWBBTh+kMq012za4Vb14VoRQiKCduefzANBgkq
-						hkiG9w0BAQUFAAOCAQEADE2xlhQD+GsVP9wp4iGgCnvwaS4+WY/pNclIsvVQM3FA
-						jqLqJZNQ3qm4gORayrhAsdkMUetnjDAQjDDFW/PUlFVIXQOyA1zjY5Fsga6/ljsc
-						MnoexDo4msuSsqQ2ug42cHD8PhRVTMhj5sPsOtUZe2f7aiuIzWkJp/wb3iVy2nxu
-						DYftq3HQKKsx0H2I6M/DsHTovhShrj0DhS9SK5vBhS8+bJv1fP6sc3YYazxdRcMC
-						WG2lytblwDmdavbtjGzserMTYQSqn2/F5Cv8J+3c7XSvZufqFc4CbwlGJTIgTtT8
-						QVg8XpX98kwieHCNWmeVMJL2qiov3OhYK8xG4uYHAQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ukmsl.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ukmsl.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ukmsl.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ukmsl.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.ukmsl.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.ukmsl.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Membership Solutions Limited: MSL Test Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ukmsl.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ulster.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.ulster.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index daafea9c..00000000
--- a/swamid-interfederations-2.0/shib.ulster.ac.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://shib.ulster.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Ulster.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-29T15:21:15Z">
-      <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">ulster.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUDpGkh/duNiN6+rhYKO7+e0H+z0owDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAxMRc2hpYi51bHN0ZXIuYWMudWswHhcNMTQwOTI5MTMxMDQw
-						WhcNMzQwOTI5MTMxMDQwWjAcMRowGAYDVQQDExFzaGliLnVsc3Rlci5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzQ0qaikQBm8TZ4mHIlwkqF
-						mc0XXnZoH1mBi1nU/jK0ofWvDzr13EueVf+kkIwdq1NcGhy4Q45tPpCJ/ut+Hx1Y
-						ui51P952G6gkZaa70FaW0y6x98Lo9MnJEazdBYH8tXNmDBOaUV+r6FvSWkCA+943
-						PDrRLbdVXr3SvwNAMY0sjbqAoaqQ34jyR5vwICvQvm2kgZnO/b2pWBIcnUUihRl/
-						C23Lhzc2h4XzLoo05mxUqkZwTWoZG3LvayctaN3/4wQD6OMFg50JvK25JoKLBiFw
-						ywvcDl3s0lWaPy2D6k1qtNiSXkNmQKNdTqnZ1P55U41jnhruP2bstMFdfMCRtaUC
-						AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2hpYi51bHN0ZXIuYWMudWuGKGh0dHBzOi8v
-						c2hpYi51bHN0ZXIuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlgjh3c
-						rPcwJ+B2l9Oe56HULqhaMA0GCSqGSIb3DQEBBQUAA4IBAQAede2459De5mPMtedE
-						hGfrQtgggyPWJqsu+nvWhHpDQAJ2Rcq+dvMmMmCWpdWjhUiTQ1AQnWbuhKmMsker
-						sWZZIQ7WqcFwSMNS8OQyyO+OqDxJaoyu2qRS39URPMgKwWPtHOeYp93zfEdE5cGA
-						kWw4oPABOL0VlWRoVlGFOGxiyvTuq0DOPC9M50ICx/suLNyuidxyK35XGCUzjn6c
-						MkaQH8OymowRW981IQbhbtM6IWY9ATbrmw7+YJwstcEaQN6LvUhkUESTrdCKPobT
-						hmWzROvxEEf88wjO6qxxJCahd+tcJ7k8ef5q/5xinQwuwIW3ln8CGcPXEfJiYnHo
-						k4aR
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ulster.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ulster.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ulster.ac.uk/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.ulster.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ulster.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ulster.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">ulster.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUDpGkh/duNiN6+rhYKO7+e0H+z0owDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAxMRc2hpYi51bHN0ZXIuYWMudWswHhcNMTQwOTI5MTMxMDQw
-						WhcNMzQwOTI5MTMxMDQwWjAcMRowGAYDVQQDExFzaGliLnVsc3Rlci5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIzQ0qaikQBm8TZ4mHIlwkqF
-						mc0XXnZoH1mBi1nU/jK0ofWvDzr13EueVf+kkIwdq1NcGhy4Q45tPpCJ/ut+Hx1Y
-						ui51P952G6gkZaa70FaW0y6x98Lo9MnJEazdBYH8tXNmDBOaUV+r6FvSWkCA+943
-						PDrRLbdVXr3SvwNAMY0sjbqAoaqQ34jyR5vwICvQvm2kgZnO/b2pWBIcnUUihRl/
-						C23Lhzc2h4XzLoo05mxUqkZwTWoZG3LvayctaN3/4wQD6OMFg50JvK25JoKLBiFw
-						ywvcDl3s0lWaPy2D6k1qtNiSXkNmQKNdTqnZ1P55U41jnhruP2bstMFdfMCRtaUC
-						AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2hpYi51bHN0ZXIuYWMudWuGKGh0dHBzOi8v
-						c2hpYi51bHN0ZXIuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlgjh3c
-						rPcwJ+B2l9Oe56HULqhaMA0GCSqGSIb3DQEBBQUAA4IBAQAede2459De5mPMtedE
-						hGfrQtgggyPWJqsu+nvWhHpDQAJ2Rcq+dvMmMmCWpdWjhUiTQ1AQnWbuhKmMsker
-						sWZZIQ7WqcFwSMNS8OQyyO+OqDxJaoyu2qRS39URPMgKwWPtHOeYp93zfEdE5cGA
-						kWw4oPABOL0VlWRoVlGFOGxiyvTuq0DOPC9M50ICx/suLNyuidxyK35XGCUzjn6c
-						MkaQH8OymowRW981IQbhbtM6IWY9ATbrmw7+YJwstcEaQN6LvUhkUESTrdCKPobT
-						hmWzROvxEEf88wjO6qxxJCahd+tcJ7k8ef5q/5xinQwuwIW3ln8CGcPXEfJiYnHo
-						k4aR
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ulster.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ulster.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 Ulster</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Ulster - Shibboleth</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ulster.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ISD Service desk</GivenName>
-    <EmailAddress>mailto:servicedesk@ulster.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Vitty</SurName>
-    <EmailAddress>mailto:paul@ulster.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Barney</GivenName>
-    <SurName>Carolan</SurName>
-    <EmailAddress>mailto:barney@ulster.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml
deleted file mode 100644
index 5dec211e..00000000
--- a/swamid-interfederations-2.0/shib.uni-mainz.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.uni-mainz.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-05-17T15:01:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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-mainz.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Mainz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Mainz</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Single-Sign-On der Johannes Gutenberg-Universität Mainz</mdui:Description>
-        <mdui:Description xml:lang="en">Single-Sign-On der Johannes Gutenberg-Universität Mainz</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.uni-mainz.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uni-mainz.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.uni-mainz.de,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF2jCCBMKgAwIBAgIHFUXfZ4347jANBgkqhkiG9w0BAQUFADCBojELMAkGA1UE
-BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
-LjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnox
-FTATBgNVBAMTDEpHVSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTamd1LWNhQHVu
-aS1tYWluei5kZTAeFw0xMzAyMjExODA1MTFaFw0xODAyMjAxODA1MTFaMIGDMQsw
-CQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYDVQQHEwVN
-YWluejEuMCwGA1UEChMlSm9oYW5uZXMgR3V0ZW5iZXJnLVVuaXZlcnNpdGFldCBN
-YWluejEaMBgGA1UEAxMRc2hpYi51bmktbWFpbnouZGUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC5V0tZG9Ic9Nov70JfqfO4t9GcozAWBXJGMQMfbIfL
-Zmt564t5+et+oOWgKtVFj2+RmqlBvbxU53XavGsBvA6jNLsjOxQWUQMY8KrkU9aI
-aN2mNoOJ9ehD3yZ6F9Gbm0SF3QqwbeoRpjQcZeIO3o/PkII0kQm2mq+3eCSH+kAa
-c6PgaER/TjB3OvATmWrWMQ6zFvzjnmYpXJgbiC+a00gNrjRzwM2W9OWcXCzEy+vI
-KGxa3HPpoRuTWH+4ZX1kaexXr9qc5AFdh/mkfyPh7A6plSdNNz688jH40Ve9nmTe
-afnRWqrnQg8/+hKSq8eV+aR7ljJMgS5WxDn/THZL8p43AgMBAAGjggIwMIICLDA5
-BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDADARBg8rBgEEAYGtIYIsAgEEAwAw
-CAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUCThNUyURKm/PrBqSzVV5GNlLnfcw
-HwYDVR0jBBgwFoAUMxg5PVU0WHCjrK/wjPuaRyI9T80wHAYDVR0RBBUwE4IRc2hp
-Yi51bmktbWFpbnouZGUwgYMGA1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvdW5pLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYWluei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCB0wYIKwYBBQUHAQEEgcYwgcMwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3Nw
-LnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBFBggrBgEFBQcwAoY5aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktbWFpbnotY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYWlu
-ei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGX8
-aJBr9XXcme9DVKbjX1ZxWxX6PfFYZ6LnwzTlCaVzoFyhn4TgjhDrD+nONfNnTaBg
-51dhMCb8pxO/EVJ9ARk0G7sXdn9RXmWpz3h2isf0GkqPQmmoNwcYzMLUdhzcbT9B
-birS0hKIA90L8mDmUfq1xC+fubW5RVgM/WD5mwTamU0i/iJ7F5kkS3iPNtMz60A0
-Zt2tbiyWnF28DXObhDp6tKRbnaEyX1/lTSNVHB20tvj4yPhfNgy6BINSpkPa3Otg
-rmPKXapBTUXw83z+IQnGkFBKypI3ceETkGaydx+aHwCyL9WBKRC87GfKFSvB620e
-QlWpyRQfOn6GOvmhDbM=
-</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>shib.uni-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.uni-mainz.de,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF8DCCBNigAwIBAgIHGlGNEMJrKTANBgkqhkiG9w0BAQsFADCBojELMAkGA1UE
-BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
-LjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnox
-FTATBgNVBAMTDEpHVSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTamd1LWNhQHVu
-aS1tYWluei5kZTAeFw0xNTEwMjkxMjIyMjVaFw0xOTAxMjUxMjIyMjVaMIGDMQsw
-CQYDVQQGEwJERTEYMBYGA1UECAwPUmhlaW5sYW5kLVBmYWx6MQ4wDAYDVQQHDAVN
-YWluejEuMCwGA1UECgwlSm9oYW5uZXMgR3V0ZW5iZXJnLVVuaXZlcnNpdGFldCBN
-YWluejEaMBgGA1UEAwwRc2hpYi51bmktbWFpbnouZGUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDcpVmR0l6m/MrnlyY/LgILDGUMLHf/m7X8NI5Lju0s
-RNQYdTk0jZ3SfW7hoIbeCOW1W8cDjPsyYl13cU1FYsQ/43W4qKLR1+0A/bZ05CDH
-5yDV3yGaFLWzzomQ6eHEpgFHOuNpySsXJ4MXsfObkL3yTD9CgiuS1XqpCQHx6TOM
-YVFrjoNLKukCp7flG+/OFueVN0uUwL7huomGKtIXPQFprT+q06EqbdNszcq2bt3l
-FWmEUwbAK66wTNJvkFEa3fgbsW1DuIK+oDeA6hr0dHb8tirA4ww97y3upNqKTSBd
-z7lr/xD1S6Hl7A8xKWTSORzpbsoptsT3dsvB/1tqPUMzAgMBAAGjggJGMIICQjBZ
-BgNVHSAEUjBQMBEGDysGAQQBga0hgiwBAQQDBDARBg8rBgEEAYGtIYIsAgEEAwEw
-DwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAIBgZngQwBAgIwCQYDVR0T
-BAIwADALBgNVHQ8EBAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYE
-FM+hafRdjETrrKia7HYSPoPA4/XfMB8GA1UdIwQYMBaAFDMYOT1VNFhwo6yv8Iz7
-mkciPU/NMBwGA1UdEQQVMBOCEXNoaWIudW5pLW1haW56LmRlMIGDBgNVHR8EfDB6
-MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1tYWluei1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmkt
-bWFpbnotY2EvcHViL2NybC9jYWNybC5jcmwwgdMGCCsGAQUFBwEBBIHGMIHDMDMG
-CCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09D
-U1AwRQYIKwYBBQUHMAKGOWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLW1haW56
-LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBFBggrBgEFBQcwAoY5aHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS91bmktbWFpbnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBCwUAA4IBAQCQACHxVetQU3UZoPVLDeXWTl6SBU8MAKNw6z6Y
-VRts0YC7bPUy44M+JT8nyQtZ3i/iiv7LpsGlAXhAI8V33vdckcKVAfzKW72dLHqb
-uVfNgNg51oOc3GfnEZ/CiqMeb24IThvhL05d2ozo5Sp455cUU5WumLERYQyYqkrO
-M6VaDqej+QIgKFmUHqDy1MpFFr1cmTQa0G8aCccAHPzMDzpsy4ixjL+MeV/XQDr3
-4Wjha/zHnj7H5lVSNXdKuo8JwBERv5nf++6IiJs8R7agG7h9Lg9sc5oXyY+dv3pO
-KYeXaQluI5vCZTsL0vjTNZ1kphU4MWsXGXXtiP5p2G+cZw8s
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uni-mainz.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uni-mainz.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.uni-mainz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uni-mainz.de/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-mainz.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.uni-mainz.de,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF2jCCBMKgAwIBAgIHFUXfZ4347jANBgkqhkiG9w0BAQUFADCBojELMAkGA1UE
-BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
-LjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnox
-FTATBgNVBAMTDEpHVSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTamd1LWNhQHVu
-aS1tYWluei5kZTAeFw0xMzAyMjExODA1MTFaFw0xODAyMjAxODA1MTFaMIGDMQsw
-CQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYDVQQHEwVN
-YWluejEuMCwGA1UEChMlSm9oYW5uZXMgR3V0ZW5iZXJnLVVuaXZlcnNpdGFldCBN
-YWluejEaMBgGA1UEAxMRc2hpYi51bmktbWFpbnouZGUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC5V0tZG9Ic9Nov70JfqfO4t9GcozAWBXJGMQMfbIfL
-Zmt564t5+et+oOWgKtVFj2+RmqlBvbxU53XavGsBvA6jNLsjOxQWUQMY8KrkU9aI
-aN2mNoOJ9ehD3yZ6F9Gbm0SF3QqwbeoRpjQcZeIO3o/PkII0kQm2mq+3eCSH+kAa
-c6PgaER/TjB3OvATmWrWMQ6zFvzjnmYpXJgbiC+a00gNrjRzwM2W9OWcXCzEy+vI
-KGxa3HPpoRuTWH+4ZX1kaexXr9qc5AFdh/mkfyPh7A6plSdNNz688jH40Ve9nmTe
-afnRWqrnQg8/+hKSq8eV+aR7ljJMgS5WxDn/THZL8p43AgMBAAGjggIwMIICLDA5
-BgNVHSAEMjAwMBEGDysGAQQBga0hgiwBAQQDADARBg8rBgEEAYGtIYIsAgEEAwAw
-CAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUCThNUyURKm/PrBqSzVV5GNlLnfcw
-HwYDVR0jBBgwFoAUMxg5PVU0WHCjrK/wjPuaRyI9T80wHAYDVR0RBBUwE4IRc2hp
-Yi51bmktbWFpbnouZGUwgYMGA1UdHwR8MHowO6A5oDeGNWh0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvdW5pLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDugOaA3hjVo
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYWluei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDCB0wYIKwYBBQUHAQEEgcYwgcMwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3Nw
-LnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBFBggrBgEFBQcwAoY5aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS91bmktbWFpbnotY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1tYWlu
-ei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAGX8
-aJBr9XXcme9DVKbjX1ZxWxX6PfFYZ6LnwzTlCaVzoFyhn4TgjhDrD+nONfNnTaBg
-51dhMCb8pxO/EVJ9ARk0G7sXdn9RXmWpz3h2isf0GkqPQmmoNwcYzMLUdhzcbT9B
-birS0hKIA90L8mDmUfq1xC+fubW5RVgM/WD5mwTamU0i/iJ7F5kkS3iPNtMz60A0
-Zt2tbiyWnF28DXObhDp6tKRbnaEyX1/lTSNVHB20tvj4yPhfNgy6BINSpkPa3Otg
-rmPKXapBTUXw83z+IQnGkFBKypI3ceETkGaydx+aHwCyL9WBKRC87GfKFSvB620e
-QlWpyRQfOn6GOvmhDbM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.de: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">e265</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e265</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Johannes Gutenberg-Universität Mainz</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Johannes Gutenberg-Universität Mainz</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-mainz.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-mainz.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Glatzer</md:SurName>
-    <md:EmailAddress>mailto:glatzert@uni-mainz.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ZDV</md:GivenName>
-    <md:SurName>Hotline</md:SurName>
-    <md:EmailAddress>mailto:hotline@uni-mainz.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.uni-mainz.de.xml b/swamid-interfederations-2.0/shib.uni-mainz.de.xml
deleted file mode 100644
index f9257156..00000000
--- a/swamid-interfederations-2.0/shib.uni-mainz.de.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.uni-mainz.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mainz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=hostmaster@uni-mainz.de,CN=shib.uni-mainz.de,OU=StartCom Verified Certificate Member,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE,description=371190-Ew4GnZ0vEX42MdIg</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHDjCCBfagAwIBAgICV0wwDQYJKoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAklM
-MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRh
-bCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAy
-IFByaW1hcnkgSW50ZXJtZWRpYXRlIFNlcnZlciBDQTAeFw0xMTAzMDMwNTMzMTJa
-Fw0xMzAzMDMwNDI1MzZaMIH8MSAwHgYDVQQNExczNzExOTAtRXc0R25aMHZFWDQy
-TWRJZzELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwG
-A1UEBxMFTWFpbnoxLjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJz
-aXRhZXQgTWFpbnoxLTArBgNVBAsTJFN0YXJ0Q29tIFZlcmlmaWVkIENlcnRpZmlj
-YXRlIE1lbWJlcjEaMBgGA1UEAxMRc2hpYi51bmktbWFpbnouZGUxJjAkBgkqhkiG
-9w0BCQEWF2hvc3RtYXN0ZXJAdW5pLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwT6NQ2xVNwXxTBD5fEZi7uABESzHPpP6tPNN6qQugmAE
-O/3PvRBlvkbicadY8vBaYG8GAjYtJseraGCanqeOF/jilZ2TgUk9OeQWVu7iufAg
-TfqSKzo4CF9myFqpPDL5DYYKHZVEf1BoIACb5LZGohOOPLxw7P6KJY5K0HOQhzPu
-TXgnc7F1pMk+H13jTCwp+rfIbDGKjevt7OQL2DUXgZbsw/BGDXhOPNhzchEZl7ce
-nTuICyx6B4z9ePHySWSnYAFHQ99n2n3n1RGvfMeQcko0lRw60ycHqKSY0Z7nysaP
-Ou9pV6oXwIeRDv0kiEBZN4OwzL9Q3Caz74NTyaUdzwIDAQABo4IDBjCCAwIwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBQ11hAN/JzswSGhR2joEoU4cKAEGjAfBgNVHSMEGDAWgBQR
-2yNF/VTManFvhIoD1773AS8mhjAqBgNVHREEIzAhghFzaGliLnVuaS1tYWluei5k
-ZYIMdW5pLW1haW56LmRlMIIBQgYDVR0gBIIBOTCCATUwggExBgsrBgEEAYG1NwEC
-AjCCASAwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
-eS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVy
-bWVkaWF0ZS5wZGYwgbcGCCsGAQUFBwICMIGqMBQWDVN0YXJ0Q29tIEx0ZC4wAwIB
-ARqBkUxpbWl0ZWQgTGlhYmlsaXR5LCBzZWUgc2VjdGlvbiAqTGVnYWwgTGltaXRh
-dGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBQ
-b2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
-eS5wZGYwYQYDVR0fBFowWDAqoCigJoYkaHR0cDovL3d3dy5zdGFydHNzbC5jb20v
-Y3J0Mi1jcmwuY3JsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQy
-LWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9v
-Y3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL3NlcnZlci9jYTBCBggrBgEFBQcw
-AoY2aHR0cDovL3d3dy5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMi5zZXJ2
-ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN
-BgkqhkiG9w0BAQUFAAOCAQEAvROhgKCSARf5XxMlFrgqM2L8z+6vpxcyBbk2VP0b
-l6fyoweBJ3hVMEHjsnLvc13xdjl4UybWHBgJrF6QGonJUSzR01Zrnae5j00zAy7j
-SKv2IgmRNoLWdLk6/lwB8J0Ai7kHSlHcsrTWyTdlppwEF3yfBNQ4rsR0yPXp/oMw
-Um0W47uYkn4rKhRCDyc7YLF11u/uIN3+QZ7cjWWGJFtt4Mv9yVRLsIuQCoJn8Kgq
-YbXDotXT6u9xaXNvmcNBQxG11AO5Bg1E29EUgLPoRVe6QODiXHRm7m10xsnXJB2J
-qId+gUq0/6Lm0AWZGW+NOUQvMbxX9CMLbiTcBe3s6xGqhQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uni-mainz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uni-mainz.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.uni-mainz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uni-mainz.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-mainz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.uni-mainz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=hostmaster@uni-mainz.de,CN=shib.uni-mainz.de,OU=StartCom Verified Certificate Member,O=Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE,description=371190-Ew4GnZ0vEX42MdIg</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHDjCCBfagAwIBAgICV0wwDQYJKoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAklM
-MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRh
-bCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAy
-IFByaW1hcnkgSW50ZXJtZWRpYXRlIFNlcnZlciBDQTAeFw0xMTAzMDMwNTMzMTJa
-Fw0xMzAzMDMwNDI1MzZaMIH8MSAwHgYDVQQNExczNzExOTAtRXc0R25aMHZFWDQy
-TWRJZzELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwG
-A1UEBxMFTWFpbnoxLjAsBgNVBAoTJUpvaGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJz
-aXRhZXQgTWFpbnoxLTArBgNVBAsTJFN0YXJ0Q29tIFZlcmlmaWVkIENlcnRpZmlj
-YXRlIE1lbWJlcjEaMBgGA1UEAxMRc2hpYi51bmktbWFpbnouZGUxJjAkBgkqhkiG
-9w0BCQEWF2hvc3RtYXN0ZXJAdW5pLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwT6NQ2xVNwXxTBD5fEZi7uABESzHPpP6tPNN6qQugmAE
-O/3PvRBlvkbicadY8vBaYG8GAjYtJseraGCanqeOF/jilZ2TgUk9OeQWVu7iufAg
-TfqSKzo4CF9myFqpPDL5DYYKHZVEf1BoIACb5LZGohOOPLxw7P6KJY5K0HOQhzPu
-TXgnc7F1pMk+H13jTCwp+rfIbDGKjevt7OQL2DUXgZbsw/BGDXhOPNhzchEZl7ce
-nTuICyx6B4z9ePHySWSnYAFHQ99n2n3n1RGvfMeQcko0lRw60ycHqKSY0Z7nysaP
-Ou9pV6oXwIeRDv0kiEBZN4OwzL9Q3Caz74NTyaUdzwIDAQABo4IDBjCCAwIwCQYD
-VR0TBAIwADALBgNVHQ8EBAMCA6gwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-BwMBMB0GA1UdDgQWBBQ11hAN/JzswSGhR2joEoU4cKAEGjAfBgNVHSMEGDAWgBQR
-2yNF/VTManFvhIoD1773AS8mhjAqBgNVHREEIzAhghFzaGliLnVuaS1tYWluei5k
-ZYIMdW5pLW1haW56LmRlMIIBQgYDVR0gBIIBOTCCATUwggExBgsrBgEEAYG1NwEC
-AjCCASAwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
-eS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVy
-bWVkaWF0ZS5wZGYwgbcGCCsGAQUFBwICMIGqMBQWDVN0YXJ0Q29tIEx0ZC4wAwIB
-ARqBkUxpbWl0ZWQgTGlhYmlsaXR5LCBzZWUgc2VjdGlvbiAqTGVnYWwgTGltaXRh
-dGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBQ
-b2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
-eS5wZGYwYQYDVR0fBFowWDAqoCigJoYkaHR0cDovL3d3dy5zdGFydHNzbC5jb20v
-Y3J0Mi1jcmwuY3JsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQy
-LWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9v
-Y3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL3NlcnZlci9jYTBCBggrBgEFBQcw
-AoY2aHR0cDovL3d3dy5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMi5zZXJ2
-ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzAN
-BgkqhkiG9w0BAQUFAAOCAQEAvROhgKCSARf5XxMlFrgqM2L8z+6vpxcyBbk2VP0b
-l6fyoweBJ3hVMEHjsnLvc13xdjl4UybWHBgJrF6QGonJUSzR01Zrnae5j00zAy7j
-SKv2IgmRNoLWdLk6/lwB8J0Ai7kHSlHcsrTWyTdlppwEF3yfBNQ4rsR0yPXp/oMw
-Um0W47uYkn4rKhRCDyc7YLF11u/uIN3+QZ7cjWWGJFtt4Mv9yVRLsIuQCoJn8Kgq
-YbXDotXT6u9xaXNvmcNBQxG11AO5Bg1E29EUgLPoRVe6QODiXHRm7m10xsnXJB2J
-qId+gUq0/6Lm0AWZGW+NOUQvMbxX9CMLbiTcBe3s6xGqhQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni-mainz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Johannes Gutenberg Universität Mainz</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Mainz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-mainz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Thomas</GivenName>
-    <SurName>Glatzer</SurName>
-    <EmailAddress>glatzert@uni-mainz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.uni.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.uni.edu-idp-shibboleth.xml
deleted file mode 100644
index a2011b0f..00000000
--- a/swamid-interfederations-2.0/shib.uni.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://shib.uni.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uni.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Northern Iowa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Northern Iowa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uni.edu/its/success/federated-identity-based-authentication-and-authorization</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.uni.edu/policies/web-privacy-statement</mdui:PrivacyStatementURL>
-        <mdui:Logo height="151" width="150" xml:lang="en">https://shib.uni.edu/uni_shib_logo.jpg</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>
-MIIDGzCCAgOgAwIBAgIUCu4IcZbPLmOuHB1lfiwiMS3C3awwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMc2hpYi51bmkuZWR1MB4XDTEwMTEwODIyMTYwN1oXDTMw
-MTEwODIyMTYwN1owFzEVMBMGA1UEAxMMc2hpYi51bmkuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsB2tsghTo0KUgABFUMSxsDrozS1W08ZsYtXw
-2G1BMnXDsbQbPmvXlQ46qML3I78xErOMkr1oZ+ni3rlUD3G+GtLNVhO9cq5oqANJ
-sbrF99bs6cxYbuYx8vriijSCgEPaV3rPkqmLE0TIzFyDnaDp2U56tCN41CxA2g4Y
-xFYwk2PTs0QPDfdbtNqmyFcGaNnYsJEmxVjKc+zMQQd2dBikOeKwrhzGYO980BmK
-DOiFk7eTXpyW+hBOaiKveUwS81cORvlCcLIf6dm0tPPGlOjH8L3WqZve0nqmOxqi
-mPzf+Fps77DOPaRZxtn2N7YCEK7UMsj0DBxFBQJVtUH8F9eL1wIDAQABo18wXTA8
-BgNVHREENTAzggxzaGliLnVuaS5lZHWGI2h0dHBzOi8vc2hpYi51bmkuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBReKCQUpF/hHZGp8UEdgJIXFLrP5zANBgkq
-hkiG9w0BAQUFAAOCAQEANsWWgW8We+gkawvvf3WXgBPieqOqYGi/6FWyjIyIHnfk
-UViTJ6wIvEJ1Cn1jKaVafrvEEPTo4T0QwSJnySEuGQYsqoo4o2JG/w74+6+As4ka
-mzr9bFrxFHn7PWGqaW1cYVQ/u8JKBb9fCBbkSrCB97zEuunpW7N2ZJw1UHyrSBS3
-r+MGykM/8VJU9Qql88dSUZ/kJru02gNQaqFpjAL3fk+R901tdP4+B4LYQlb+jHg5
-3p5sK3Hiue0026r9kZw9D7u+fPecPUxnjZLBo7WgI5fPZ+lKhXTPNzeFqP+rAdDe
-kCdWJpucLkkmoLQQ21pIXNh5PSelhthswpCAnAkulA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uni.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uni.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uni.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uni.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUCu4IcZbPLmOuHB1lfiwiMS3C3awwDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMc2hpYi51bmkuZWR1MB4XDTEwMTEwODIyMTYwN1oXDTMw
-MTEwODIyMTYwN1owFzEVMBMGA1UEAxMMc2hpYi51bmkuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsB2tsghTo0KUgABFUMSxsDrozS1W08ZsYtXw
-2G1BMnXDsbQbPmvXlQ46qML3I78xErOMkr1oZ+ni3rlUD3G+GtLNVhO9cq5oqANJ
-sbrF99bs6cxYbuYx8vriijSCgEPaV3rPkqmLE0TIzFyDnaDp2U56tCN41CxA2g4Y
-xFYwk2PTs0QPDfdbtNqmyFcGaNnYsJEmxVjKc+zMQQd2dBikOeKwrhzGYO980BmK
-DOiFk7eTXpyW+hBOaiKveUwS81cORvlCcLIf6dm0tPPGlOjH8L3WqZve0nqmOxqi
-mPzf+Fps77DOPaRZxtn2N7YCEK7UMsj0DBxFBQJVtUH8F9eL1wIDAQABo18wXTA8
-BgNVHREENTAzggxzaGliLnVuaS5lZHWGI2h0dHBzOi8vc2hpYi51bmkuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBReKCQUpF/hHZGp8UEdgJIXFLrP5zANBgkq
-hkiG9w0BAQUFAAOCAQEANsWWgW8We+gkawvvf3WXgBPieqOqYGi/6FWyjIyIHnfk
-UViTJ6wIvEJ1Cn1jKaVafrvEEPTo4T0QwSJnySEuGQYsqoo4o2JG/w74+6+As4ka
-mzr9bFrxFHn7PWGqaW1cYVQ/u8JKBb9fCBbkSrCB97zEuunpW7N2ZJw1UHyrSBS3
-r+MGykM/8VJU9Qql88dSUZ/kJru02gNQaqFpjAL3fk+R901tdP4+B4LYQlb+jHg5
-3p5sK3Hiue0026r9kZw9D7u+fPecPUxnjZLBo7WgI5fPZ+lKhXTPNzeFqP+rAdDe
-kCdWJpucLkkmoLQQ21pIXNh5PSelhthswpCAnAkulA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uni.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Northern Iowa</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Northern Iowa</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uni.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Aaron Thompson</md:GivenName>
-    <md:EmailAddress>aaron.thompson@uni.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Steve Moon</md:GivenName>
-    <md:EmailAddress>steve.moon@uni.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 39f61b7d..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.unibo.it/idp/shibboleth">
-  <md: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>
-  </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">unibo.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </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://shib.unibo.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.unibo.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.unibo.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.unibo.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibo.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unibo.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unibo.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Bologna</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università di Bologna</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Bologna</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Bologna</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.eng.unibo.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unibo.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:cesia-sso-support@unibo.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.univ-reims.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.univ-reims.fr-idp-shibboleth.xml
deleted file mode 100644
index b031581a..00000000
--- a/swamid-interfederations-2.0/shib.univ-reims.fr-idp-shibboleth.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://shib.univ-reims.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-12-08T10:46:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">TEST - URCA</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-reims.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">TEST - URCA</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">TEST - URCA</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">TEST - URCA</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>
-					      MIIDNDCCAhygAwIBAgIVAPkhMvLgY2ZrI5pH4Iz9K3yEoaBnMA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWIudW5pdi1yZWltcy5mcjAeFw0xNTEyMDcxNjE4
-MjJaFw0zNTEyMDcxNjE4MjJaMB0xGzAZBgNVBAMMEnNoaWIudW5pdi1yZWltcy5m
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIc3VJWa4wmjotzGHZmT
-lSwU6IWHMJv2DxLi/Rr+hu5FCIpLHC3wLTMiaAn2QT5i/M/jcbd+euaTKDncH1lF
-CDyRV+4FPDG1fM/QtneOx+90GiV0YKE0/iQ8nrhJDmZtnmqcpFsggPAAfhmf417S
-Wwios6s7osiE7xoQ7zjMeIRVDW83Pqi5QCHrowSeSmMEl1cwokbHV10TDMzHCrrL
-8LuB5UN7xJgzaSWsEYRq9Vc577j6tn2NWkx/lGlRcz4yzRz9jIsdtJtKE1m/17as
-+fqiYVdaEKVZPR6OnkqdmpXqCk0zUEepq9r1bBMWLiO58aE2oky9a374tUoNXnKK
-aD8CAwEAAaNrMGkwHQYDVR0OBBYEFIDldfXIKmkdTqqwVDMBJb+EiUlZMEgGA1Ud
-EQRBMD+CEnNoaWIudW5pdi1yZWltcy5mcoYpaHR0cHM6Ly9zaGliLnVuaXYtcmVp
-bXMuZnIvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBABBItTY6kO2S
-X7TrZyDJDkLRI0+i7MSxTHHLtMh7XAcqUjRuXWpgR25TGihmBFYkKmicRvyn5fDn
-EamxmtVD0Re9yjsnnOf2IMGItHQ9DQDmpIIAhVt5LFYgwJr6QMUs7uzD6Sr0zc20
-Xq1XGHbsai8ilgpZhe1zWyPje489fehMhOel9WDeoEgogCWs0aY5Ia1PLXX93iIZ
-RII++BqGUGcbDULDV3QsfqmhtGIJx3zeenGcdbJlwv7mdzYywvtlXrmSpLWkdDO6
-KjXqULhEIW1vrF4ffyTEphjqptw89dWd2O972IM/xSiEWz1HDXd8BsyODRihLZq/
-LJ8gs2GQxRQ=
-					    </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-POST" Location="https://shib.univ-reims.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.univ-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.univ-reims.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">TEST - URCA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">TEST - URCA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-reims.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Kevin Déré</md:SurName>
-    <md:EmailAddress>kevin.dere@univ-reims.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
deleted file mode 100644
index ecfec44d..00000000
--- a/swamid-interfederations-2.0/shib.unl.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +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://shib.unl.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">unl.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Nebraska-Lincoln</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of Nebraska-Lincoln, chartered in 1869, is an educational institution of international stature. UNL is listed by the Carnegie Foundation within the "Research Universities (very high research activity)" category. UNL is a land-grant university and a member of the Association of Public and Land-grant Universities (APLU). The university is accredited by the Higher Learning Commission of the North Central Association of Colleges and Schools.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unl.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unl.edu/is/about/UNLprivacy.pdf</mdui:PrivacyStatementURL>
-        <mdui:Logo height="67" width="66" xml:lang="en">https://idm.unl.edu/wdn/templates_3.0/images/logo.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>
-MIIDHDCCAgSgAwIBAgIVALR4hUzlhDFUyPrCzbCR8aB8/okIMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNoaWIudW5sLmVkdTAeFw0xMDA5MTAyMTA4MjZaFw0z
-MDA5MTAyMTA4MjZaMBcxFTATBgNVBAMTDHNoaWIudW5sLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJhLs+N32LNQicvVL26oZcWyU46MixkhDOdG
-h5XmzO8vWckrIPs+4LUG5U9ozfIksiYVVJW4mTl21RID0RJ9l3svZeKvEKBGrxUR
-6mQb1nQQcUPVVxNlMIZ5rlWfyffWcP686kGYTdWMU14KyflrVyFW7Vq70izKe9oT
-nX+bEclWv6KjzFayWJcIYCE4+jX7GvxSMyQTh3TRenUGOh9iukzIHlApI9bfzh89
-OdHsHy3WPmvoZYRTLeeTtG+qvzNvD+IMBNCUM9f8bRYc6N790/vBHn7kU5XSiMIv
-5sXFMt5nwNPDq3+37vY7xpu+r74tcT3HpXF5OeOPmG2OC8FSIvMCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2hpYi51bmwuZWR1hiNodHRwczovL3NoaWIudW5sLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTEOLq42EOS0daP8iT0PJ1kc4rMUwDQYJ
-KoZIhvcNAQEFBQADggEBAIAZpYEcXhU317hPR08os2NC3TM2K6BaNrRm53fu+tIT
-zsdHv7cfQ7ONLUE5vC0Wis6g468wGOKi01ueSrIU7emQUgQaxRoCbinUsSu1R6a1
-NP/c0ZhOo88hweNRac8zpZccjUi9Oc3WssQ/uHbkumN2hM7BhvC/4NRg5NRMWLNs
-ko224ENGUqVqFkBiZJWH5ooxOM/8Gt4Ut1cTkNxyMSJvno7Gki95l0M45fNfSbWw
-voZFOzm0IBZx1K786PNxotISs/WY/R7yJA91L0FCzrXFMh+jK5L1nCg5ZfEL0YEM
-D0DIYdBk2yItSdfimeC1/cwOOK1xLZfLs9q46OUL7UU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unl.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unl.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.unl.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.unl.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.unl.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.unl.edu/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">unl.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVALR4hUzlhDFUyPrCzbCR8aB8/okIMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNoaWIudW5sLmVkdTAeFw0xMDA5MTAyMTA4MjZaFw0z
-MDA5MTAyMTA4MjZaMBcxFTATBgNVBAMTDHNoaWIudW5sLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJhLs+N32LNQicvVL26oZcWyU46MixkhDOdG
-h5XmzO8vWckrIPs+4LUG5U9ozfIksiYVVJW4mTl21RID0RJ9l3svZeKvEKBGrxUR
-6mQb1nQQcUPVVxNlMIZ5rlWfyffWcP686kGYTdWMU14KyflrVyFW7Vq70izKe9oT
-nX+bEclWv6KjzFayWJcIYCE4+jX7GvxSMyQTh3TRenUGOh9iukzIHlApI9bfzh89
-OdHsHy3WPmvoZYRTLeeTtG+qvzNvD+IMBNCUM9f8bRYc6N790/vBHn7kU5XSiMIv
-5sXFMt5nwNPDq3+37vY7xpu+r74tcT3HpXF5OeOPmG2OC8FSIvMCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2hpYi51bmwuZWR1hiNodHRwczovL3NoaWIudW5sLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTEOLq42EOS0daP8iT0PJ1kc4rMUwDQYJ
-KoZIhvcNAQEFBQADggEBAIAZpYEcXhU317hPR08os2NC3TM2K6BaNrRm53fu+tIT
-zsdHv7cfQ7ONLUE5vC0Wis6g468wGOKi01ueSrIU7emQUgQaxRoCbinUsSu1R6a1
-NP/c0ZhOo88hweNRac8zpZccjUi9Oc3WssQ/uHbkumN2hM7BhvC/4NRg5NRMWLNs
-ko224ENGUqVqFkBiZJWH5ooxOM/8Gt4Ut1cTkNxyMSJvno7Gki95l0M45fNfSbWw
-voZFOzm0IBZx1K786PNxotISs/WY/R7yJA91L0FCzrXFMh+jK5L1nCg5ZfEL0YEM
-D0DIYdBk2yItSdfimeC1/cwOOK1xLZfLs9q46OUL7UU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.unl.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.unl.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Nebraska-Lincoln</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Nebraska-Lincoln</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unl.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Paul Erickson</md:GivenName>
-    <md:EmailAddress>phe@unl.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UNL Computer Help Center</md:GivenName>
-    <md:EmailAddress>mysupport@unl.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Brett Bieber</md:GivenName>
-    <md:EmailAddress>bieber@unl.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.urz.uni-halle.de.xml b/swamid-interfederations-2.0/shib.urz.uni-halle.de.xml
deleted file mode 100644
index 6179ace6..00000000
--- a/swamid-interfederations-2.0/shib.urz.uni-halle.de.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.urz.uni-halle.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-halle.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.urz.uni-halle.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.urz.uni-halle.de,O=Martin-Luther-Universitaet Halle-Wittenberg,L=Halle,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEEQm+4TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIG
-A1UEChMrTWFydGluLUx1dGhlci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVy
-ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVVbml2ZXJzaXRhZXQgSGFsbGUgQ0Ex
-HzAdBgkqhkiG9w0BCQEWEHBraUB1bmktaGFsbGUuZGUwHhcNMTAxMTIyMTAwOTIx
-WhcNMTUxMTIxMTAwOTIxWjCBjDELMAkGA1UEBhMCREUxFzAVBgNVBAgTDlNhY2hz
-ZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIGA1UEChMrTWFydGluLUx1dGhl
-ci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVyZzEeMBwGA1UEAxMVc2hpYi51
-cnoudW5pLWhhbGxlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-5szGJBeY9CPcdSE6ALzM8cKzMp5ND8os/xeP3jYI5Hzonp+qh93ZAWZLQk02vz8X
-LT2bATtUuDlEwVfx1t4B68DJzBthFrOecLrFn5no5WnckpKQm8J1w7PiK+g1nWEI
-xUhlLsx5dEOJNXdg/3XqvVzo2TrRlASjLNdRplHvXL+zaG0lIWw4qs3XNBb9X3KK
-nLa6EaNKVCJZENUJkILn3Qs+/LNKUxpSspwLeccSh+taRy5u4rXh7kvOZbqLWrF2
-GoIoUlzdca6kxzXlYFMWu4EHw1m61ytnTH0S5zFe+XY0gqvbDviZd7n6eqb90hrR
-Tpri0g3u5ae9aT5+aWvaMQIDAQABo4IBmDCCAZQwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUpriTtnK8QvxlJ
-UKVOvUqBkKUCMB8GA1UdIwQYMBaAFCETSr9xSoqIsdDDSZJ70eDHQ3DvMIGDBgNV
-HR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxsZS1j
-YS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS91bmktaGFsbGUtY2EvcHViL2NybC9jYWNybC5jcmwwgZ4GCCsGAQUFBwEBBIGR
-MIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxs
-ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWhhbGxlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAn5vgq2CHWVoOt5YaJJ94ozPqJ8q+wfKiVBOz
-iv1d7KAIcq9T6i84Sa9NBcoQKDPERmH7+X9zqo2YMAKrUVE6VmWYCwIbpH8VtnlI
-w2Ts0AcBWRoNrg2PJW4kpdrvZIuPZCyp0qqyUgWACY6yGlvfewJi5HW9jbxnZyJ8
-N2CVWkNlcMM9zjg6E6Nkp3n3x5Iv39y3R6V/YvafkD139c66tQE8UrK5ywcaBTpv
-6VRXucatF1JuKBnN2pyK1kcIk2ObPX+HUs9LVFvyttxrxtGfEHOA4/DXDW/9SPaM
-F2M3ERpQP3eXHCWlEKx+tlsIHNKNQ6T4YomjbbiZEAGTjiMrEg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.urz.uni-halle.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.urz.uni-halle.de,O=Martin-Luther-Universitaet Halle-Wittenberg,L=Halle,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEEQm+4TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIG
-A1UEChMrTWFydGluLUx1dGhlci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVy
-ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVVbml2ZXJzaXRhZXQgSGFsbGUgQ0Ex
-HzAdBgkqhkiG9w0BCQEWEHBraUB1bmktaGFsbGUuZGUwHhcNMTAxMTIyMTAwOTIx
-WhcNMTUxMTIxMTAwOTIxWjCBjDELMAkGA1UEBhMCREUxFzAVBgNVBAgTDlNhY2hz
-ZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIGA1UEChMrTWFydGluLUx1dGhl
-ci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVyZzEeMBwGA1UEAxMVc2hpYi51
-cnoudW5pLWhhbGxlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-5szGJBeY9CPcdSE6ALzM8cKzMp5ND8os/xeP3jYI5Hzonp+qh93ZAWZLQk02vz8X
-LT2bATtUuDlEwVfx1t4B68DJzBthFrOecLrFn5no5WnckpKQm8J1w7PiK+g1nWEI
-xUhlLsx5dEOJNXdg/3XqvVzo2TrRlASjLNdRplHvXL+zaG0lIWw4qs3XNBb9X3KK
-nLa6EaNKVCJZENUJkILn3Qs+/LNKUxpSspwLeccSh+taRy5u4rXh7kvOZbqLWrF2
-GoIoUlzdca6kxzXlYFMWu4EHw1m61ytnTH0S5zFe+XY0gqvbDviZd7n6eqb90hrR
-Tpri0g3u5ae9aT5+aWvaMQIDAQABo4IBmDCCAZQwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUpriTtnK8QvxlJ
-UKVOvUqBkKUCMB8GA1UdIwQYMBaAFCETSr9xSoqIsdDDSZJ70eDHQ3DvMIGDBgNV
-HR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxsZS1j
-YS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS91bmktaGFsbGUtY2EvcHViL2NybC9jYWNybC5jcmwwgZ4GCCsGAQUFBwEBBIGR
-MIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxs
-ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWhhbGxlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAn5vgq2CHWVoOt5YaJJ94ozPqJ8q+wfKiVBOz
-iv1d7KAIcq9T6i84Sa9NBcoQKDPERmH7+X9zqo2YMAKrUVE6VmWYCwIbpH8VtnlI
-w2Ts0AcBWRoNrg2PJW4kpdrvZIuPZCyp0qqyUgWACY6yGlvfewJi5HW9jbxnZyJ8
-N2CVWkNlcMM9zjg6E6Nkp3n3x5Iv39y3R6V/YvafkD139c66tQE8UrK5ywcaBTpv
-6VRXucatF1JuKBnN2pyK1kcIk2ObPX+HUs9LVFvyttxrxtGfEHOA4/DXDW/9SPaM
-F2M3ERpQP3eXHCWlEKx+tlsIHNKNQ6T4YomjbbiZEAGTjiMrEg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.urz.uni-halle.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.urz.uni-halle.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.urz.uni-halle.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.urz.uni-halle.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.urz.uni-halle.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.urz.uni-halle.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-halle.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.urz.uni-halle.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.urz.uni-halle.de,O=Martin-Luther-Universitaet Halle-Wittenberg,L=Halle,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEEQm+4TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIG
-A1UEChMrTWFydGluLUx1dGhlci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVy
-ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVVbml2ZXJzaXRhZXQgSGFsbGUgQ0Ex
-HzAdBgkqhkiG9w0BCQEWEHBraUB1bmktaGFsbGUuZGUwHhcNMTAxMTIyMTAwOTIx
-WhcNMTUxMTIxMTAwOTIxWjCBjDELMAkGA1UEBhMCREUxFzAVBgNVBAgTDlNhY2hz
-ZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIGA1UEChMrTWFydGluLUx1dGhl
-ci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVyZzEeMBwGA1UEAxMVc2hpYi51
-cnoudW5pLWhhbGxlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-5szGJBeY9CPcdSE6ALzM8cKzMp5ND8os/xeP3jYI5Hzonp+qh93ZAWZLQk02vz8X
-LT2bATtUuDlEwVfx1t4B68DJzBthFrOecLrFn5no5WnckpKQm8J1w7PiK+g1nWEI
-xUhlLsx5dEOJNXdg/3XqvVzo2TrRlASjLNdRplHvXL+zaG0lIWw4qs3XNBb9X3KK
-nLa6EaNKVCJZENUJkILn3Qs+/LNKUxpSspwLeccSh+taRy5u4rXh7kvOZbqLWrF2
-GoIoUlzdca6kxzXlYFMWu4EHw1m61ytnTH0S5zFe+XY0gqvbDviZd7n6eqb90hrR
-Tpri0g3u5ae9aT5+aWvaMQIDAQABo4IBmDCCAZQwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUpriTtnK8QvxlJ
-UKVOvUqBkKUCMB8GA1UdIwQYMBaAFCETSr9xSoqIsdDDSZJ70eDHQ3DvMIGDBgNV
-HR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxsZS1j
-YS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS91bmktaGFsbGUtY2EvcHViL2NybC9jYWNybC5jcmwwgZ4GCCsGAQUFBwEBBIGR
-MIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxs
-ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWhhbGxlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAn5vgq2CHWVoOt5YaJJ94ozPqJ8q+wfKiVBOz
-iv1d7KAIcq9T6i84Sa9NBcoQKDPERmH7+X9zqo2YMAKrUVE6VmWYCwIbpH8VtnlI
-w2Ts0AcBWRoNrg2PJW4kpdrvZIuPZCyp0qqyUgWACY6yGlvfewJi5HW9jbxnZyJ8
-N2CVWkNlcMM9zjg6E6Nkp3n3x5Iv39y3R6V/YvafkD139c66tQE8UrK5ywcaBTpv
-6VRXucatF1JuKBnN2pyK1kcIk2ObPX+HUs9LVFvyttxrxtGfEHOA4/DXDW/9SPaM
-F2M3ERpQP3eXHCWlEKx+tlsIHNKNQ6T4YomjbbiZEAGTjiMrEg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.urz.uni-halle.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.urz.uni-halle.de,O=Martin-Luther-Universitaet Halle-Wittenberg,L=Halle,ST=Sachsen-Anhalt,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFYTCCBEmgAwIBAgIEEQm+4TANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFzAVBgNVBAgTDlNhY2hzZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIG
-A1UEChMrTWFydGluLUx1dGhlci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVy
-ZzEMMAoGA1UECxMDVVJaMR4wHAYDVQQDExVVbml2ZXJzaXRhZXQgSGFsbGUgQ0Ex
-HzAdBgkqhkiG9w0BCQEWEHBraUB1bmktaGFsbGUuZGUwHhcNMTAxMTIyMTAwOTIx
-WhcNMTUxMTIxMTAwOTIxWjCBjDELMAkGA1UEBhMCREUxFzAVBgNVBAgTDlNhY2hz
-ZW4tQW5oYWx0MQ4wDAYDVQQHEwVIYWxsZTE0MDIGA1UEChMrTWFydGluLUx1dGhl
-ci1Vbml2ZXJzaXRhZXQgSGFsbGUtV2l0dGVuYmVyZzEeMBwGA1UEAxMVc2hpYi51
-cnoudW5pLWhhbGxlLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-5szGJBeY9CPcdSE6ALzM8cKzMp5ND8os/xeP3jYI5Hzonp+qh93ZAWZLQk02vz8X
-LT2bATtUuDlEwVfx1t4B68DJzBthFrOecLrFn5no5WnckpKQm8J1w7PiK+g1nWEI
-xUhlLsx5dEOJNXdg/3XqvVzo2TrRlASjLNdRplHvXL+zaG0lIWw4qs3XNBb9X3KK
-nLa6EaNKVCJZENUJkILn3Qs+/LNKUxpSspwLeccSh+taRy5u4rXh7kvOZbqLWrF2
-GoIoUlzdca6kxzXlYFMWu4EHw1m61ytnTH0S5zFe+XY0gqvbDviZd7n6eqb90hrR
-Tpri0g3u5ae9aT5+aWvaMQIDAQABo4IBmDCCAZQwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBPAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUpriTtnK8QvxlJ
-UKVOvUqBkKUCMB8GA1UdIwQYMBaAFCETSr9xSoqIsdDDSZJ70eDHQ3DvMIGDBgNV
-HR8EfDB6MDugOaA3hjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxsZS1j
-YS9wdWIvY3JsL2NhY3JsLmNybDA7oDmgN4Y1aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS91bmktaGFsbGUtY2EvcHViL2NybC9jYWNybC5jcmwwgZ4GCCsGAQUFBwEBBIGR
-MIGOMEUGCCsGAQUFBzAChjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1oYWxs
-ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWhhbGxlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAn5vgq2CHWVoOt5YaJJ94ozPqJ8q+wfKiVBOz
-iv1d7KAIcq9T6i84Sa9NBcoQKDPERmH7+X9zqo2YMAKrUVE6VmWYCwIbpH8VtnlI
-w2Ts0AcBWRoNrg2PJW4kpdrvZIuPZCyp0qqyUgWACY6yGlvfewJi5HW9jbxnZyJ8
-N2CVWkNlcMM9zjg6E6Nkp3n3x5Iv39y3R6V/YvafkD139c66tQE8UrK5ywcaBTpv
-6VRXucatF1JuKBnN2pyK1kcIk2ObPX+HUs9LVFvyttxrxtGfEHOA4/DXDW/9SPaM
-F2M3ERpQP3eXHCWlEKx+tlsIHNKNQ6T4YomjbbiZEAGTjiMrEg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.urz.uni-halle.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.urz.uni-halle.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universitäts- und Landesbibliothek Sachsen-Anhalt</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universitäts- und Landesbibliothek Sachsen-Anhalt</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://bibliothek.uni-halle.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Schaarschmidt</SurName>
-    <EmailAddress>michael.schaarschmidt@urz.uni-halle.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Armin</GivenName>
-    <SurName>Angelus</SurName>
-    <EmailAddress>armin.angelus@bibliothek.uni-halle.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.utb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.utb.edu-idp-shibboleth.xml
deleted file mode 100644
index 64ae9ff2..00000000
--- a/swamid-interfederations-2.0/shib.utb.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://shib.utb.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://helpdesk.utb.edu/SitePages/default.aspx" 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">utb.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas At Brownsville</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>
-MIIDKDCCAhCgAwIBAgIVAPskM9VOo/UHjUvs7z0EEEw6JcEUMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD3NoaWIudXRidHNjLmVkdTAeFw0wOTExMTIxODQyNTRa
-Fw0yOTExMTIxODQyNTRaMBoxGDAWBgNVBAMTD3NoaWIudXRidHNjLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQbdqpIwNey/tzMbaQX3RMbbVkq
-OInJtLFdxUOF9SWK9Sk0yp1S/FhHwaCoqpr0Eu4yJwOyLMyzIiwxW+wwwtzh16Go
-NA7y3lAT91wPG+mMbg8oymy70f1fNYCVTYqJD0E8zPrcZjYKllWfKLc87az75bhs
-xbtyvzOzu1150MTi2Xli2+PtvL6Spt2gCAfARmSCn41Lj2Q0Z2uNnJcYg8Pw1VJ7
-z26QZPyVvtiKR3+PIfuou24zQI8gYRJRx3fDws6V0SBXLXsJ1XcAplgEV01HWOrT
-fDzFQSL0l98y8g4J8xuv488m2TlK/ZPivKiR+zz57s+8Cqpq4jzE3jftV0sCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPc2hpYi51dGJ0c2MuZWR1hiZodHRwczovL3NoaWIu
-dXRidHNjLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU78T7ilHNVI4b67ho
-5GBUB0KDVtgwDQYJKoZIhvcNAQEFBQADggEBAFsvP17jyU2Chi7LEAcPmGxhkBuq
-y8NcBLvp7Vq/tuLMlxi7zKuUTTaQoiqSmLYnRTZsNJGgi4gZfX292BP/snsIsG2D
-61Lzy2UrE/ivB/5Bt7oOQqj6LyFZsatzVrOpYi67uXLycbEG3EvGDEQHsccF4bn0
-ErShJeYhWztnOVhcLe8pFrJt0BwJZO63mgRRmyiZ93GjvPeRIm4ky9HEooA6n8y4
-Q/0+/UE2jZugQtVTd7yOtBYRKGpSSiDgsQRMyi9nacHoWS9nKqDnOUEFYQ3Zt9lL
-a9FpqaeIdrzlh0WNP/SodyEYHiALp5t9uvLCXzHb6wfvNhzRj7FB4AhRTLw=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.utb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.utb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.utb.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.utb.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.utb.edu/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">utb.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAPskM9VOo/UHjUvs7z0EEEw6JcEUMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD3NoaWIudXRidHNjLmVkdTAeFw0wOTExMTIxODQyNTRa
-Fw0yOTExMTIxODQyNTRaMBoxGDAWBgNVBAMTD3NoaWIudXRidHNjLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQbdqpIwNey/tzMbaQX3RMbbVkq
-OInJtLFdxUOF9SWK9Sk0yp1S/FhHwaCoqpr0Eu4yJwOyLMyzIiwxW+wwwtzh16Go
-NA7y3lAT91wPG+mMbg8oymy70f1fNYCVTYqJD0E8zPrcZjYKllWfKLc87az75bhs
-xbtyvzOzu1150MTi2Xli2+PtvL6Spt2gCAfARmSCn41Lj2Q0Z2uNnJcYg8Pw1VJ7
-z26QZPyVvtiKR3+PIfuou24zQI8gYRJRx3fDws6V0SBXLXsJ1XcAplgEV01HWOrT
-fDzFQSL0l98y8g4J8xuv488m2TlK/ZPivKiR+zz57s+8Cqpq4jzE3jftV0sCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPc2hpYi51dGJ0c2MuZWR1hiZodHRwczovL3NoaWIu
-dXRidHNjLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU78T7ilHNVI4b67ho
-5GBUB0KDVtgwDQYJKoZIhvcNAQEFBQADggEBAFsvP17jyU2Chi7LEAcPmGxhkBuq
-y8NcBLvp7Vq/tuLMlxi7zKuUTTaQoiqSmLYnRTZsNJGgi4gZfX292BP/snsIsG2D
-61Lzy2UrE/ivB/5Bt7oOQqj6LyFZsatzVrOpYi67uXLycbEG3EvGDEQHsccF4bn0
-ErShJeYhWztnOVhcLe8pFrJt0BwJZO63mgRRmyiZ93GjvPeRIm4ky9HEooA6n8y4
-Q/0+/UE2jZugQtVTd7yOtBYRKGpSSiDgsQRMyi9nacHoWS9nKqDnOUEFYQ3Zt9lL
-a9FpqaeIdrzlh0WNP/SodyEYHiALp5t9uvLCXzHb6wfvNhzRj7FB4AhRTLw=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.utb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.utb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas At Brownsville</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas At Brownsville</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utb.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Abel De La Garza</md:GivenName>
-    <md:EmailAddress>Abel.DeLaGarza@utb.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Hermilo Deluze</md:GivenName>
-    <md:EmailAddress>Hermilo.Deluze1@utb.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.uthscsa.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.uthscsa.edu-idp-shibboleth.xml
deleted file mode 100644
index f9f48cf7..00000000
--- a/swamid-interfederations-2.0/shib.uthscsa.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,91 +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://shib.uthscsa.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://ims.uthscsa.edu/TechSuppt/HelpDesk.aspx" 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">uthscsa.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas Health Science Center At San Antonio</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>
-MIIDKzCCAhOgAwIBAgIUOBCFT1ioD0RKc/AB856Jnvb79kEwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQc2hpYi51dGhzY3NhLmVkdTAeFw0wOTEwMTkxNTUwMDha
-Fw0yOTEwMTkxNTUwMDhaMBsxGTAXBgNVBAMTEHNoaWIudXRoc2NzYS5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWW8cEBcuG3QBhlSVu7WSbvxAw
-8QLM51Dpg/QsJvUes6hjZGetH/WV9u6LjlCGc6sVr5uXpd0IFkpvVFikLszqlOrH
-p62jO8uomSAlI5nDjG51HAd2lGYx+aTO+ioc5BU9RnMo/VA6VcBsySGlTbWEbf59
-u87fvyTktNRjPOr5mMztZsrb5twYy3e4XfdFTiWJYIccZvjfsZZOwa7vu+JnfUl2
-M2q2jsO/dgCMk2nIAcYOYKEd5F0exwY4qjFHUCPm8s315I9+RZBPFGVB+Y77Rg2e
-VS4Q+9CoTTFLY2LZ4isR3a0RbBr+2TFqMv0ES0aUt3YC8sqWOvxiIhclvCHXAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHNoaWIudXRoc2NzYS5lZHWGJ2h0dHBzOi8vc2hp
-Yi51dGhzY3NhLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUqadoMe9LA6OA
-NuWMvOkr+fZCuwowDQYJKoZIhvcNAQEFBQADggEBAGWZjR5NFsdiB+IY1eb89+zQ
-txFy3a8Jct9Dv+nRePNOc5YCF0FLx+BRYfc4L0+yGxhAjyq3XlRe7e4YVpQ/Qy0e
-dqFClRLNXYAVXku2/8zkGNVh+wMDpxOiILoKN1wi+wQ8WnnS7iQPiT2h9ypnrvbf
-RDu+MTSSlVM/XbDOUxtoLWV0YnhhFksN6cseeqW5sUK+4pbj9as+PgTLSt+pxLzY
-WNfu12cY6+Qjam6zo6qiYXfqrvqoVvWf971mJWgf7APZqdp5GrLpMqQoa3XSgfQ6
-sZemi2r9GnG7yy/S/oAW5ZJjeHjRkp+4IBAjCVy8XmRkqx9Lbvq/eincPQjhDjQ=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uthscsa.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uthscsa.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uthscsa.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uthscsa.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.uthscsa.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uthscsa.edu/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">uthscsa.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUOBCFT1ioD0RKc/AB856Jnvb79kEwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQc2hpYi51dGhzY3NhLmVkdTAeFw0wOTEwMTkxNTUwMDha
-Fw0yOTEwMTkxNTUwMDhaMBsxGTAXBgNVBAMTEHNoaWIudXRoc2NzYS5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCWW8cEBcuG3QBhlSVu7WSbvxAw
-8QLM51Dpg/QsJvUes6hjZGetH/WV9u6LjlCGc6sVr5uXpd0IFkpvVFikLszqlOrH
-p62jO8uomSAlI5nDjG51HAd2lGYx+aTO+ioc5BU9RnMo/VA6VcBsySGlTbWEbf59
-u87fvyTktNRjPOr5mMztZsrb5twYy3e4XfdFTiWJYIccZvjfsZZOwa7vu+JnfUl2
-M2q2jsO/dgCMk2nIAcYOYKEd5F0exwY4qjFHUCPm8s315I9+RZBPFGVB+Y77Rg2e
-VS4Q+9CoTTFLY2LZ4isR3a0RbBr+2TFqMv0ES0aUt3YC8sqWOvxiIhclvCHXAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHNoaWIudXRoc2NzYS5lZHWGJ2h0dHBzOi8vc2hp
-Yi51dGhzY3NhLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUqadoMe9LA6OA
-NuWMvOkr+fZCuwowDQYJKoZIhvcNAQEFBQADggEBAGWZjR5NFsdiB+IY1eb89+zQ
-txFy3a8Jct9Dv+nRePNOc5YCF0FLx+BRYfc4L0+yGxhAjyq3XlRe7e4YVpQ/Qy0e
-dqFClRLNXYAVXku2/8zkGNVh+wMDpxOiILoKN1wi+wQ8WnnS7iQPiT2h9ypnrvbf
-RDu+MTSSlVM/XbDOUxtoLWV0YnhhFksN6cseeqW5sUK+4pbj9as+PgTLSt+pxLzY
-WNfu12cY6+Qjam6zo6qiYXfqrvqoVvWf971mJWgf7APZqdp5GrLpMqQoa3XSgfQ6
-sZemi2r9GnG7yy/S/oAW5ZJjeHjRkp+4IBAjCVy8XmRkqx9Lbvq/eincPQjhDjQ=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uthscsa.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uthscsa.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas Health Science Center At San Antonio</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas Health Science Center At San Antonio</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uthscsa.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brian Purcell</md:GivenName>
-    <md:EmailAddress>purcell@uthscsa.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.uvu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.uvu.edu-idp-shibboleth.xml
deleted file mode 100644
index 09b02e96..00000000
--- a/swamid-interfederations-2.0/shib.uvu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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://shib.uvu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</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">uvu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Utah Valley University</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>
-MIIDHDCCAgSgAwIBAgIVAIWjwZnQgd29AuQOjNMS9y2+8FFwMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNoaWIudXZ1LmVkdTAeFw0xMzEyMTAxNzU3MDNaFw0z
-MzEyMTAxNzU3MDNaMBcxFTATBgNVBAMTDHNoaWIudXZ1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAN1YKRKz+60gwNpZEYxw51V3q9BblanyftbM
-yaHTAA/SN9H855TBFiss878JtQLCvbbodnaYVlDK72z6vTBEnw4cJ+q8OkYmnSmx
-PkVDAn3rPN1ZhQXtRxQRQgVWVZafOMn8VtPSNWhKuuWHDkeAJ0eurJXkgnAHVdlZ
-xl+GCEtYqcNTzDY6rjRei2SIoIW8iTxslLSIOB3bKot4MSw76r/pTRTM2sT1LguW
-IBmWyiEf0ZE1eN2tFUuJ0YXRdY+gv5cXE/4FJvmRZLUIpESbgVhKYqE1nZ/uOdDy
-xelKK/KyiNobPC+j0kOEK8kqBH52uDEHYAEfgOZVY6jF8+bSOSkCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2hpYi51dnUuZWR1hiNodHRwczovL3NoaWIudXZ1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU9ry+XKPGV4qG5d5pmeOxy8macHgwDQYJ
-KoZIhvcNAQEFBQADggEBAEI3J/h+DD38s5sQAZ9CGLEryR38OcI3YoOVomOcbWqh
-4OySvoopqnpkKyn3CU7+6YY7JHKIM3dOZJCrVdMkLdMaiM+qZU/KVPoWCYP82fx7
-QpvT/IJmfVDOQvo5g74G071up6qoJD0/F7u4Ay88EeCeWZj56FDUEoLPdA7nbIPs
-VMrMibM4Ev/bsVae0FBMJFhOvNc23AbdB4tGn28u7TKhh9GhVT6OQCFt3Mh9t7s9
-8ImEM2KbtYysjpDT7fIvlc7AOeeXSAmhdjSB+D3BKcJfwWqHEl9mZ0WQHgmPUj+L
-Brv9aaSeb9ZfeFo2Sw2coWZe3ONc4UsUWdwDiPjTElU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uvu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uvu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uvu.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uvu.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.uvu.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.uvu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.uvu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.uvu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAIWjwZnQgd29AuQOjNMS9y2+8FFwMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNoaWIudXZ1LmVkdTAeFw0xMzEyMTAxNzU3MDNaFw0z
-MzEyMTAxNzU3MDNaMBcxFTATBgNVBAMTDHNoaWIudXZ1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAN1YKRKz+60gwNpZEYxw51V3q9BblanyftbM
-yaHTAA/SN9H855TBFiss878JtQLCvbbodnaYVlDK72z6vTBEnw4cJ+q8OkYmnSmx
-PkVDAn3rPN1ZhQXtRxQRQgVWVZafOMn8VtPSNWhKuuWHDkeAJ0eurJXkgnAHVdlZ
-xl+GCEtYqcNTzDY6rjRei2SIoIW8iTxslLSIOB3bKot4MSw76r/pTRTM2sT1LguW
-IBmWyiEf0ZE1eN2tFUuJ0YXRdY+gv5cXE/4FJvmRZLUIpESbgVhKYqE1nZ/uOdDy
-xelKK/KyiNobPC+j0kOEK8kqBH52uDEHYAEfgOZVY6jF8+bSOSkCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2hpYi51dnUuZWR1hiNodHRwczovL3NoaWIudXZ1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU9ry+XKPGV4qG5d5pmeOxy8macHgwDQYJ
-KoZIhvcNAQEFBQADggEBAEI3J/h+DD38s5sQAZ9CGLEryR38OcI3YoOVomOcbWqh
-4OySvoopqnpkKyn3CU7+6YY7JHKIM3dOZJCrVdMkLdMaiM+qZU/KVPoWCYP82fx7
-QpvT/IJmfVDOQvo5g74G071up6qoJD0/F7u4Ay88EeCeWZj56FDUEoLPdA7nbIPs
-VMrMibM4Ev/bsVae0FBMJFhOvNc23AbdB4tGn28u7TKhh9GhVT6OQCFt3Mh9t7s9
-8ImEM2KbtYysjpDT7fIvlc7AOeeXSAmhdjSB+D3BKcJfwWqHEl9mZ0WQHgmPUj+L
-Brv9aaSeb9ZfeFo2Sw2coWZe3ONc4UsUWdwDiPjTElU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.uvu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Utah Valley University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Utah Valley University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uvu.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Daniel Hutchison</md:GivenName>
-    <md:EmailAddress>daniel.hutchison@uvu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Roark Fisher</md:GivenName>
-    <md:EmailAddress>roark.fisher@uvu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ray Walker</md:GivenName>
-    <md:EmailAddress>ray.walker@uvu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UVU Service Desk</md:GivenName>
-    <md:EmailAddress>servicedesk@uvu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.wheatonma.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.wheatonma.edu-idp-shibboleth.xml
deleted file mode 100644
index 5901912f..00000000
--- a/swamid-interfederations-2.0/shib.wheatonma.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +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://shib.wheatonma.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">wheatonma.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Wheaton College (MA)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Wheaton College Norton, MA</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>
-MIIDDTCCAfWgAwIBAgIJAP6+QFyXUWbFMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMMEnNoaWIud2hlYXRvbm1hLmVkdTAeFw0xNDA0MTAxMjU2MzJaFw0yNDA0MDcx
-MjU2MzJaMB0xGzAZBgNVBAMMEnNoaWIud2hlYXRvbm1hLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMAdKq3FBYmschbWPLHn133qKNJXf6VQnEwJ
-pwwypn9oKxAywzzsDcp/j8nUQs47PG3W9XtrF84vh3N/H4rDi3JoNTrMyk4bFyYk
-VX+VFWxy+NVXWXi2egOIxwMfL9IBDMVCSkyrUW10PigLxhg+4DBSlNQtQpcK61D8
-gu2LNSqVvS4aDz5Tf0KD1p+dAYi/RwvmEYupklfyj/MFfgbNFrlpRmtgH5FLpd2t
-huxpLiaQR+g4WkTBlWTz0xJmVKEtVEcmD6fSKm0niHkmoSPL9hdk0jH454sXW4c3
-xO1aH1ndjc80F87iXc/bxxyo/eAJStxzkyT2wzF1dfAAK1SiP2UCAwEAAaNQME4w
-HQYDVR0OBBYEFBIqM49eCOA0H7TU18z0I81MDdvNMB8GA1UdIwQYMBaAFBIqM49e
-COA0H7TU18z0I81MDdvNMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-AAiN0t8hkKKEz/QuTizhE/KSq2g3FVPAY2v5GfExkc8Rrfco5eDIt/+6KCBcT+oK
-/HrVf3QUpaY8wWpLIsmnxDljYsKlakbx39KZXkGBaQ9YekxAtETwij7pwmluTVS7
-pC9bdNsv25+F/BbQ61ccsfcWK0y2im+u2efE972ksJm1Ch19TxBidRh+9WJAr7pk
-S2QrfAb23EkRNm9JHzM7s5BBJJ/3D3ZvK52/XEb8fH//u0Y5cynkwpemf5PZYFnR
-UHlWki9gH3Vd3GPCCnSYDIuKE0QtzrjFoNdBgBsGxs82wyT/Tt6emn86g/xzWi/M
-Lcl69y1Yfli289CCOSkgiaU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.wheatonma.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.wheatonma.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.wheatonma.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.wheatonma.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.wheatonma.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wheatonma.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDDTCCAfWgAwIBAgIJAP6+QFyXUWbFMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMMEnNoaWIud2hlYXRvbm1hLmVkdTAeFw0xNDA0MTAxMjU2MzJaFw0yNDA0MDcx
-MjU2MzJaMB0xGzAZBgNVBAMMEnNoaWIud2hlYXRvbm1hLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMAdKq3FBYmschbWPLHn133qKNJXf6VQnEwJ
-pwwypn9oKxAywzzsDcp/j8nUQs47PG3W9XtrF84vh3N/H4rDi3JoNTrMyk4bFyYk
-VX+VFWxy+NVXWXi2egOIxwMfL9IBDMVCSkyrUW10PigLxhg+4DBSlNQtQpcK61D8
-gu2LNSqVvS4aDz5Tf0KD1p+dAYi/RwvmEYupklfyj/MFfgbNFrlpRmtgH5FLpd2t
-huxpLiaQR+g4WkTBlWTz0xJmVKEtVEcmD6fSKm0niHkmoSPL9hdk0jH454sXW4c3
-xO1aH1ndjc80F87iXc/bxxyo/eAJStxzkyT2wzF1dfAAK1SiP2UCAwEAAaNQME4w
-HQYDVR0OBBYEFBIqM49eCOA0H7TU18z0I81MDdvNMB8GA1UdIwQYMBaAFBIqM49e
-COA0H7TU18z0I81MDdvNMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-AAiN0t8hkKKEz/QuTizhE/KSq2g3FVPAY2v5GfExkc8Rrfco5eDIt/+6KCBcT+oK
-/HrVf3QUpaY8wWpLIsmnxDljYsKlakbx39KZXkGBaQ9YekxAtETwij7pwmluTVS7
-pC9bdNsv25+F/BbQ61ccsfcWK0y2im+u2efE972ksJm1Ch19TxBidRh+9WJAr7pk
-S2QrfAb23EkRNm9JHzM7s5BBJJ/3D3ZvK52/XEb8fH//u0Y5cynkwpemf5PZYFnR
-UHlWki9gH3Vd3GPCCnSYDIuKE0QtzrjFoNdBgBsGxs82wyT/Tt6emn86g/xzWi/M
-Lcl69y1Yfli289CCOSkgiaU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.wheatonma.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Wheaton College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Wheaton College (MA)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wheatoncollege.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brian Gibson</md:GivenName>
-    <md:EmailAddress>incommon@wheatoncollege.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.wit.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.wit.edu-idp-shibboleth.xml
deleted file mode 100644
index e2573a7a..00000000
--- a/swamid-interfederations-2.0/shib.wit.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://shib.wit.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">wit.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Wentworth Institute of Technology</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.wit.edu/dts/network-services</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.wit.edu/dts/policies/incommon.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="85" width="274" xml:lang="en">https://shib.wit.edu/logo.gif</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>
-MIIDHDCCAgSgAwIBAgIVAL4gPAI3pps+1dKHkSSIGxbUOJQVMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNoaWIud2l0LmVkdTAeFw0xMzA3MDIyMDQ1MDVaFw0z
-MzA3MDIyMDQ1MDVaMBcxFTATBgNVBAMTDHNoaWIud2l0LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANBosjBBQW8kEhdpr+RhZ4quqdVvhFfyoha8
-8iG6SyRX+U04180c8XWcIKJqn2s6VZyRf7iTFvRXPQLdryN0yGV+lPLBW5KsvbyO
-ibf5LdAweeKOvs9bbLQtH6FCuZB5stkk2/rAf/LbOyFMwrT5KWajAobVP5Aseddz
-+UZzkW6FieB2I9BDVYpJhWiNrtZXRi2tCJrSWg69E+opq5CP0vUKuRiIuMcBCZHJ
-pCdmlMgx2dr3Brn5BuSLIolKh/WLQGD6IqLLd3WthD/MvDIQ+EkSejfNyUgsnqIj
-ekanbU0B7TQyqSh2dwUGE5gfS88UtAISCVtXc4UhxIe3juFoVC8CAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2hpYi53aXQuZWR1hiNodHRwczovL3NoaWIud2l0LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPZPH3e6ZQYadGo00kbpfVT9kMXQwDQYJ
-KoZIhvcNAQEFBQADggEBAFT8KC7nfTQtOu4QJ9Z+D8Zf379GauJdRxohP0BP9zuG
-iCUZMdSrMPq61/jLTafF8tu8hNn1EkcLuTWbasksgxWdgCCYbiuyPkG3+dCRj/yX
-GqidPO/07veu9/SXf3DcMM5zA8QW2eawhvwds9txIY7gLxfSjbeQ0BcjpGthKMKB
-y6QzabIS0ZwYXcX++WTIQeRCenro+0AvjvYOw6ZPKdrTuzImGdPk37eXuXgqj1a1
-A6dXswKkeOmY7Ky2OFtCmKzgXiwzoUyAwijdkkpEKqKF+gl9kyef3H6pcYHr8/dJ
-pDCw7VYeZA86FY+O/OlnlcceJZkWJb7rRITUEVvQYz8=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.wit.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.wit.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.wit.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.wit.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.wit.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wit.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAL4gPAI3pps+1dKHkSSIGxbUOJQVMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNoaWIud2l0LmVkdTAeFw0xMzA3MDIyMDQ1MDVaFw0z
-MzA3MDIyMDQ1MDVaMBcxFTATBgNVBAMTDHNoaWIud2l0LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANBosjBBQW8kEhdpr+RhZ4quqdVvhFfyoha8
-8iG6SyRX+U04180c8XWcIKJqn2s6VZyRf7iTFvRXPQLdryN0yGV+lPLBW5KsvbyO
-ibf5LdAweeKOvs9bbLQtH6FCuZB5stkk2/rAf/LbOyFMwrT5KWajAobVP5Aseddz
-+UZzkW6FieB2I9BDVYpJhWiNrtZXRi2tCJrSWg69E+opq5CP0vUKuRiIuMcBCZHJ
-pCdmlMgx2dr3Brn5BuSLIolKh/WLQGD6IqLLd3WthD/MvDIQ+EkSejfNyUgsnqIj
-ekanbU0B7TQyqSh2dwUGE5gfS88UtAISCVtXc4UhxIe3juFoVC8CAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2hpYi53aXQuZWR1hiNodHRwczovL3NoaWIud2l0LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPZPH3e6ZQYadGo00kbpfVT9kMXQwDQYJ
-KoZIhvcNAQEFBQADggEBAFT8KC7nfTQtOu4QJ9Z+D8Zf379GauJdRxohP0BP9zuG
-iCUZMdSrMPq61/jLTafF8tu8hNn1EkcLuTWbasksgxWdgCCYbiuyPkG3+dCRj/yX
-GqidPO/07veu9/SXf3DcMM5zA8QW2eawhvwds9txIY7gLxfSjbeQ0BcjpGthKMKB
-y6QzabIS0ZwYXcX++WTIQeRCenro+0AvjvYOw6ZPKdrTuzImGdPk37eXuXgqj1a1
-A6dXswKkeOmY7Ky2OFtCmKzgXiwzoUyAwijdkkpEKqKF+gl9kyef3H6pcYHr8/dJ
-pDCw7VYeZA86FY+O/OlnlcceJZkWJb7rRITUEVvQYz8=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.wit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Wentworth Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Wentworth Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wit.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Justin Sabourin</md:GivenName>
-    <md:EmailAddress>sabourinj@wit.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Justin Ragsdale</md:GivenName>
-    <md:EmailAddress>ragsdalej@wit.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>DTS Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@wit.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>John Knights</md:GivenName>
-    <md:EmailAddress>knightsj@wit.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.worldcat.org-shibboleth.xml b/swamid-interfederations-2.0/shib.worldcat.org-shibboleth.xml
deleted file mode 100644
index 8ae9c0aa..00000000
--- a/swamid-interfederations-2.0/shib.worldcat.org-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://shib.worldcat.org/shibboleth">
-  <!--
-		This is an EZProxy 5 Worldcat.org SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE/zCCA+egAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBtTEaMBgGA1UEAxMRc2hp
-						Yi53b3JsZGNhdC5vcmcxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRPaGlvMQ8wDQYD
-						VQQHEwZEdWJsaW4xMTAvBgNVBAoTKE9DTEMgT25saW5lIENvbXB1dGVyIExpYnJh
-						cnkgQ2VudGVyIEluYy4xDDAKBgNVBAsTA1NNRDEpMCcGCSqGSIb3DQEJARYaY2Vy
-						dGlmaWNhdGUtYWRtaW5Ab2NsYy5vcmcwHhcNMTEwMjExMTcxNzI4WhcNMjEwMjEw
-						MTcxNzI4WjCBtTEaMBgGA1UEAxMRc2hpYi53b3JsZGNhdC5vcmcxCzAJBgNVBAYT
-						AlVTMQ0wCwYDVQQIEwRPaGlvMQ8wDQYDVQQHEwZEdWJsaW4xMTAvBgNVBAoTKE9D
-						TEMgT25saW5lIENvbXB1dGVyIExpYnJhcnkgQ2VudGVyIEluYy4xDDAKBgNVBAsT
-						A1NNRDEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGUtYWRtaW5Ab2NsYy5vcmcw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7tgh0vvmAnEsG8bASyhYl
-						eRFMyBU6aDW4FZSaPjNGfCYEWUlbyjTGP23btu2B4w17NIV3xySC+N4HXIunliQt
-						chF0ojhLnJBiyZBRnni502yNrV9Xtve1HaTq0bByDEs26O1sEBiCc7bcduCnx8ib
-						G3KFe0B/iG6+9/TpAuOnfMl7YP5euaZGqhBCQuecKif2aWb8L9AGJt1qDTOABUI/
-						WcNATCPH3WNanU+TDZszALwGv8xkDk6W36PSRq1yI/PYrWbSvi64MqEfAdPYb8jT
-						Lo+OAensfJCfgjVQwp/B3TPgqMDe2yEQbxwCQ/ls0O3m9vnqdjQ0ULbWQA/MlOsf
-						AgMBAAGjggEWMIIBEjAdBgNVHQ4EFgQUw9NsKfrnZn9WPdX8Q9nW7qRgvO4wgeIG
-						A1UdIwSB2jCB14AUw9NsKfrnZn9WPdX8Q9nW7qRgvO6hgbukgbgwgbUxGjAYBgNV
-						BAMTEXNoaWIud29ybGRjYXQub3JnMQswCQYDVQQGEwJVUzENMAsGA1UECBMET2hp
-						bzEPMA0GA1UEBxMGRHVibGluMTEwLwYDVQQKEyhPQ0xDIE9ubGluZSBDb21wdXRl
-						ciBMaWJyYXJ5IENlbnRlciBJbmMuMQwwCgYDVQQLEwNTTUQxKTAnBgkqhkiG9w0B
-						CQEWGmNlcnRpZmljYXRlLWFkbWluQG9jbGMub3JnggECMAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQEFBQADggEBACTeN4dChviZW1r3dOo29w2TrvhVg0neuq13mvV7
-						d7jh1Jnhic7peKCK2E/0falzbxMoPPPecAXSXeppLa2EQhyu5AVqDhlt5GxZGClr
-						ennnS/O0j18Y1Z/alUPANxWdJy66p60jIPWDdkx+W5uED0YPpmw+QS76eYe9tkHk
-						9ZcqwRIZnNYFUVwVwxtZQY+v3fwq4awgw7ThqT2uaivEygJDBhOciGC3GfTY3+3c
-						T4uXjY9tj/G02GBmtWdUU613Tw9zUbvpadjpb0ZwFfDE325mEa+2zg1UDFnNiwSK
-						XukDgQJevk8a+0iUk2C2SHuZwE88iFVjbZcqc1ZEoqlXct0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.worldcat.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.worldcat.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.worldcat.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.worldcat.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">OCLC (UK) Limited: WorldCat.org</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UK Service Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Don</GivenName>
-    <SurName>Hamparian</SurName>
-    <EmailAddress>mailto:hamparid@oclc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib.york.ac.uk-shibboleth.xml
deleted file mode 100644
index 1b4031d7..00000000
--- a/swamid-interfederations-2.0/shib.york.ac.uk-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://shib.york.ac.uk/shibboleth">
-  <!--
-		This is the Identity Provider for the University of York.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-10-15T11:05:25.614639Z">
-      <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">york.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID+DCCAuCgAwIBAgIJAJhO6a6qGOfvMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
-						BAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNVBAcTBFlvcmsxGzAZBgNV
-						BAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxMLSVQgU2VydmljZXMxGDAW
-						BgNVBAMTD3NoaWIueW9yay5hYy51azAeFw0xMzA4MTYxMjAxNDRaFw0yMzA4MTQx
-						MjAxNDRaMH0xCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNV
-						BAcTBFlvcmsxGzAZBgNVBAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxML
-						SVQgU2VydmljZXMxGDAWBgNVBAMTD3NoaWIueW9yay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMQQw+p+wFg6EvOtEOJWjX0W+IYuNq5EQjVW
-						6iupNRMJvuG6sMJB5WK/fPSiCRzrnZKOQrL8S23fitL4bxCN2tJd60ejKsy0TVy1
-						wyOZNUKYOjwaV+luAiyiLNfwZpHiDXWLlW8OwrdWNKXP9klVE+bOQSVmseIN996p
-						EZdsxZCwr0cmOqHC5dOssX+LWbk+q/8mqRnt/somCs+4wmc0E8OyTVsbqoR7b4vm
-						c62mHsixUDg4QE21L+weQb1zHdTq2ORAGpumB57Az8k+xsB3FDrhLiZKWRrBfaYd
-						bKRUDkgjUuTqVheeOS7IEUlrkA8XALDPZWyiYRCf8EkPBI+QvWcCAwEAAaN7MHkw
-						CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
-						dGlmaWNhdGUwHQYDVR0OBBYEFLmjsqdnc3fM4amWI6O1nF3/1biZMB8GA1UdIwQY
-						MBaAFLmjsqdnc3fM4amWI6O1nF3/1biZMA0GCSqGSIb3DQEBBQUAA4IBAQBcwCD/
-						mgjaj2CnORxfVcGbllIdCBDnFx6xWFbz1GxeSxzFGeL8HdWVEzYCcu9o7/GAX00c
-						XAOU7qUVI6cGL9S9cuzembcLDKf1DzIf1IGA0QIaNxwEpu+MVxOp/i2tAuOnKjXp
-						r/ot+oYXtU1O4QoDtO7cDOx0LN3/fi5SiELgAzfcCPB5CNC6NWhkZ9dz1t9cFMbM
-						A4SSjs/kcAjGVXIv19yyulv4kZ+uUD7OoB6uGhcXA8L9ENEXmcpZ9Cr6n6Op1cEJ
-						WhdbSNckji6+UTBB/qSf6hsmJnVa4CQmg0XVqy0ceBkrkYHgEuVxesT64stH5nMJ
-						qc/emtVSHd3jgeSW
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.york.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.york.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://shib.york.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.york.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.york.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.york.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">york.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID+DCCAuCgAwIBAgIJAJhO6a6qGOfvMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNV
-						BAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNVBAcTBFlvcmsxGzAZBgNV
-						BAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxMLSVQgU2VydmljZXMxGDAW
-						BgNVBAMTD3NoaWIueW9yay5hYy51azAeFw0xMzA4MTYxMjAxNDRaFw0yMzA4MTQx
-						MjAxNDRaMH0xCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxDTALBgNV
-						BAcTBFlvcmsxGzAZBgNVBAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxML
-						SVQgU2VydmljZXMxGDAWBgNVBAMTD3NoaWIueW9yay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMQQw+p+wFg6EvOtEOJWjX0W+IYuNq5EQjVW
-						6iupNRMJvuG6sMJB5WK/fPSiCRzrnZKOQrL8S23fitL4bxCN2tJd60ejKsy0TVy1
-						wyOZNUKYOjwaV+luAiyiLNfwZpHiDXWLlW8OwrdWNKXP9klVE+bOQSVmseIN996p
-						EZdsxZCwr0cmOqHC5dOssX+LWbk+q/8mqRnt/somCs+4wmc0E8OyTVsbqoR7b4vm
-						c62mHsixUDg4QE21L+weQb1zHdTq2ORAGpumB57Az8k+xsB3FDrhLiZKWRrBfaYd
-						bKRUDkgjUuTqVheeOS7IEUlrkA8XALDPZWyiYRCf8EkPBI+QvWcCAwEAAaN7MHkw
-						CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
-						dGlmaWNhdGUwHQYDVR0OBBYEFLmjsqdnc3fM4amWI6O1nF3/1biZMB8GA1UdIwQY
-						MBaAFLmjsqdnc3fM4amWI6O1nF3/1biZMA0GCSqGSIb3DQEBBQUAA4IBAQBcwCD/
-						mgjaj2CnORxfVcGbllIdCBDnFx6xWFbz1GxeSxzFGeL8HdWVEzYCcu9o7/GAX00c
-						XAOU7qUVI6cGL9S9cuzembcLDKf1DzIf1IGA0QIaNxwEpu+MVxOp/i2tAuOnKjXp
-						r/ot+oYXtU1O4QoDtO7cDOx0LN3/fi5SiELgAzfcCPB5CNC6NWhkZ9dz1t9cFMbM
-						A4SSjs/kcAjGVXIv19yyulv4kZ+uUD7OoB6uGhcXA8L9ENEXmcpZ9Cr6n6Op1cEJ
-						WhdbSNckji6+UTBB/qSf6hsmJnVa4CQmg0XVqy0ceBkrkYHgEuVxesT64stH5nMJ
-						qc/emtVSHd3jgeSW
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.york.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.york.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 York</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of York</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.york.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>User Support</GivenName>
-    <EmailAddress>mailto:itsupport@york.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:itsupport@york.ac.uk</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 646f6f32..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.zcu.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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">zcu.cz</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.zcu.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://shib.zcu.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.zcu.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.zcu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.zcu.cz/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">zcu.cz</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gapps.zcu.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.zcu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.zcu.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="en">University of West Bohemia</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Západočeská univerzita v Plzni</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of West Bohemia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Západočeská univerzita v Plzni</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.zcu.cz/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.zcu.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Grolmus</md:SurName>
-    <md:EmailAddress>indy@civ.zcu.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.xml
deleted file mode 100644
index 65711878..00000000
--- a/swamid-interfederations-2.0/shib1.coastal.edu-idp-shibboleth.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="https://shib1.coastal.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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/hide-from-discovery</saml:AttributeValue>
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">coastal.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDbTCCAlWgAwIBAgIEcWV8mDANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJ1
-czELMAkGA1UECBMCc2MxDzANBgNVBAcTBmNvbndheTEQMA4GA1UEChMHY29hc3Rh
-bDEMMAoGA1UECxMDY2N1MRowGAYDVQQDExFzaGliMS5jb2FzdGFsLmVkdTAeFw0x
-NTEyMDkyMTIzMjVaFw0yNTEyMDYyMTIzMjVaMGcxCzAJBgNVBAYTAnVzMQswCQYD
-VQQIEwJzYzEPMA0GA1UEBxMGY29ud2F5MRAwDgYDVQQKEwdjb2FzdGFsMQwwCgYD
-VQQLEwNjY3UxGjAYBgNVBAMTEXNoaWIxLmNvYXN0YWwuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxuxRIL4OA5Dp3y3yARjUbE0JYWs4VbHs4iTu
-+le9+ToZ5TWo1VBsxEK7RZYUMu/sAksvXZ0Bu63Sqm+Su/6dCJi2cET3Q4AnrAXm
-hLMZ7J8uCQuKJgh1uIGNn6FXT/f1p+jJ/TzDqDx2VSE5eioB0e1TzIaU6AiszVnP
-VqtZDTzgz9sMp5yLAyMrZ+kb/M+XB5QiMkBLcVO0GZCv+h3+miXX1ZHF0BgJDfQ1
-J2sbn9uCeFN4Kx2OL1Hdl5eIpZuL4h9W3xysB+Q2yoetVZ+8V4IGujNxEuWhPzmC
-vJh1Og2/gDTZ/JpCYM+gmIsDA0f6y9gdW1O4yvgxE3encoUt2QIDAQABoyEwHzAd
-BgNVHQ4EFgQUA2hOJjUOrRjvO8R4Dwv3tDmwsHQwDQYJKoZIhvcNAQELBQADggEB
-ADFxQVRvspUloAojY1gRuJ39eGwMAQ/fhXNlblyWOCM2JklSuCsIEg0UTwSHMqaD
-l2WxXCB3oKwH0fELbKoP1FVPIofRbGGXwRfrYHMGRT8zq0dkB6kpMSqpOWAyYZI1
-wj7x/roPxmBB7dqwuMpe+9bcuwr7IZaixSy4egNIfKjmBWWkjCU2Gf+gNp59xEAY
-8zaxNFuDJUsNrugQkPSwd5neL4YJg5DtDWLHnlx49Bsu++8gCQtfUVCtMpJTRpA7
-S0v9splMv9Fef+mT4OC/STxhqwssEjXW5UabRkX8pCUJ1Io8XFolm17nFT4zHqyb
-EorC5nk0gN9/NXYq3M5P5iM=
-          </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>
-MIIDMDCCAhigAwIBAgIVAPmtKMkTjP6RBo5vqaqeBo9Cwh65MA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEXNoaWIxLmNvYXN0YWwuZWR1MB4XDTE1MTIyMTE5NDAw
-OFoXDTM1MTIyMTE5NDAwOFowHDEaMBgGA1UEAwwRc2hpYjEuY29hc3RhbC5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFJu1ciBx39t6+Ez8mE8ZE
-tvQvdcBbckSyGgPoBGhdS34gswsnUoJtNp6W1++Pqo3bGuhk+iysP7HewRSyKDX9
-JTo7ZDuMKxTOwfBH/GllBP/Uar/f0QVFjMIjAXVzN0N71vEaFz52344FRcU3Fi6F
-z4CuaiKuQlQ9Qsq60rdP6hNLHNav2rFCclVuLLN129w/1v9oDZfTIQeLOgGF2KSF
-P/l7TzX89pb2vSTTfhVMI2JqwEerMVmtx7Z8zI8U1t799PHdLkBatK/7vIQYeElV
-Bm3MNITWFr9CZX6q4FYQhxWOTYzaxnOQe5Aqh9KfZsQ5xv1vR3JIqvVaPEBPVfcz
-AgMBAAGjaTBnMB0GA1UdDgQWBBS6y0a1WXOva6WsTyLrd035hpR9cTBGBgNVHREE
-PzA9ghFzaGliMS5jb2FzdGFsLmVkdYYoaHR0cHM6Ly9zaGliMS5jb2FzdGFsLmVk
-dS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAATVOzwx2FSYs9n0j
-wjvrcvbI9AzPf0tLrlb/zGwsqO5ngChQGml+tl7vAML1Dnw0xi7c6BSty7f9W72y
-Ik3uUiDkw0vm2b8LFJyBDyn5uC6QDXVWVmzLfFyn2pwOV+hcKiClQYVdLVBxjzOT
-BN++tfOCsM+vDod0FgGniMInlmkUNn9fQgeWO4EHW7SSF6B92cmxyjQbxWpYiJIj
-kF50bURYh9pl1w+m1JehzSeR0rPuFhx5uMXuD34tyO0ofwmlKJB+MCnhpZh9VXsU
-VySeXmS5PG0tCJeyQU0flRjY0Yvpy7VmPYBCiFjhKJ8/k5wHRO1fA7Dw052XeDZP
-T9t6jQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.coastal.edu/idp/profile/Logout"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.coastal.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.coastal.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Coastal Carolina University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Coastal Carolina University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.coastal.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mike Richter</md:GivenName>
-    <md:EmailAddress>mrichter@coastal.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1.hw.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib1.hw.ac.uk-shibboleth.xml
deleted file mode 100644
index 753a4408..00000000
--- a/swamid-interfederations-2.0/shib1.hw.ac.uk-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://shib1.hw.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Heriot-Watt University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-02T16:47:03Z">
-      <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">hw.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEyjCCA7KgAwIBAgIJAIRz4nENPzTrMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECBMHTG90aGlhbjESMBAGA1UEBxMJRWRpbmJ1cmdoMR8w
-						HQYDVQQKExZIZXJpb3QtV2F0dCBVbml2ZXJzaXR5MQswCQYDVQQLEwJJUzEXMBUG
-						A1UEAxMOc2hpYjEuaHcuYWMudWsxIjAgBgkqhkiG9w0BCQEWE24uYS5tb3JyaXNA
-						aHcuYWMudWswHhcNMTQwNDA0MTMzNzQ3WhcNMjQwNDAxMTMzNzQ3WjCBnjELMAkG
-						A1UEBhMCR0IxEDAOBgNVBAgTB0xvdGhpYW4xEjAQBgNVBAcTCUVkaW5idXJnaDEf
-						MB0GA1UEChMWSGVyaW90LVdhdHQgVW5pdmVyc2l0eTELMAkGA1UECxMCSVMxFzAV
-						BgNVBAMTDnNoaWIxLmh3LmFjLnVrMSIwIAYJKoZIhvcNAQkBFhNuLmEubW9ycmlz
-						QGh3LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyz97yEPF
-						VuXIJNgPVIbakqCkohOfu84WhDL2Ng6/IfVHAM0Ekw9wb36iaTnAY8FzwzHOoV3Z
-						iyWJ9LNcR4LZ5twCgtmbXb+IhvTGY24M/kNmcIjy035m/JQTaZrUt98K4LjjW0tw
-						Hb8PaP/OH4KP+aD2RofacCD1LQ5uglFOMQtEAWUDgR2S0v4Mpsp9iPmJcr9Jk3Br
-						PX+zjfhiwo05X8iS4XJL5wO3hrMi4/wNG+y2Ag1A4OBtojGwvUAeHCv5QzLgVY4N
-						9YdC9Y+p89xHX4VtNpHY8Y1Mu4jU3iyUsoK0S+UKNSfdBnHJkgAjhD7hWb1ipqM7
-						BrTpfWSizP5GgQIDAQABo4IBBzCCAQMwHQYDVR0OBBYEFOjliEHArhe9qgYgp1QL
-						q/BpgJgXMIHTBgNVHSMEgcswgciAFOjliEHArhe9qgYgp1QLq/BpgJgXoYGkpIGh
-						MIGeMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHTG90aGlhbjESMBAGA1UEBxMJRWRp
-						bmJ1cmdoMR8wHQYDVQQKExZIZXJpb3QtV2F0dCBVbml2ZXJzaXR5MQswCQYDVQQL
-						EwJJUzEXMBUGA1UEAxMOc2hpYjEuaHcuYWMudWsxIjAgBgkqhkiG9w0BCQEWE24u
-						YS5tb3JyaXNAaHcuYWMudWuCCQCEc+JxDT806zAMBgNVHRMEBTADAQH/MA0GCSqG
-						SIb3DQEBBQUAA4IBAQCYhVo1561uH9WLY6BDdgrHOYy7mWEaFh9IN3hGiN0Xaol1
-						l9cL/OQxrDiNAeYE5v2k4gmrmqQ1k+SarfyG1+y2Cz2nRCeIvFUgzP2ZxY6NihlK
-						rxiPaMOj8Lhpm1qnMYqfOgEmZm7DspgWTca9ee3GfMi3gNKDhNc3ClT3fmJEz3su
-						m591vtWWwBK8FFjmdrfEpMscEBDIjmK3++ZSZcpi7RDgmcOkyYAU4SehufVqTiG/
-						LVmqVmL3cap2AeHoYFLsZerEuI/3ZgBE/P0em2OQxFyXAlWOSiD2piEgAUUxl4Vt
-						TeTRcCOx2CPOUV8iEok1S6c/YqtF3YOSmCca1Ey2
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.hw.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.hw.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://shib1.hw.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.hw.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib1.hw.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.hw.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">hw.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEyjCCA7KgAwIBAgIJAIRz4nENPzTrMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECBMHTG90aGlhbjESMBAGA1UEBxMJRWRpbmJ1cmdoMR8w
-						HQYDVQQKExZIZXJpb3QtV2F0dCBVbml2ZXJzaXR5MQswCQYDVQQLEwJJUzEXMBUG
-						A1UEAxMOc2hpYjEuaHcuYWMudWsxIjAgBgkqhkiG9w0BCQEWE24uYS5tb3JyaXNA
-						aHcuYWMudWswHhcNMTQwNDA0MTMzNzQ3WhcNMjQwNDAxMTMzNzQ3WjCBnjELMAkG
-						A1UEBhMCR0IxEDAOBgNVBAgTB0xvdGhpYW4xEjAQBgNVBAcTCUVkaW5idXJnaDEf
-						MB0GA1UEChMWSGVyaW90LVdhdHQgVW5pdmVyc2l0eTELMAkGA1UECxMCSVMxFzAV
-						BgNVBAMTDnNoaWIxLmh3LmFjLnVrMSIwIAYJKoZIhvcNAQkBFhNuLmEubW9ycmlz
-						QGh3LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyz97yEPF
-						VuXIJNgPVIbakqCkohOfu84WhDL2Ng6/IfVHAM0Ekw9wb36iaTnAY8FzwzHOoV3Z
-						iyWJ9LNcR4LZ5twCgtmbXb+IhvTGY24M/kNmcIjy035m/JQTaZrUt98K4LjjW0tw
-						Hb8PaP/OH4KP+aD2RofacCD1LQ5uglFOMQtEAWUDgR2S0v4Mpsp9iPmJcr9Jk3Br
-						PX+zjfhiwo05X8iS4XJL5wO3hrMi4/wNG+y2Ag1A4OBtojGwvUAeHCv5QzLgVY4N
-						9YdC9Y+p89xHX4VtNpHY8Y1Mu4jU3iyUsoK0S+UKNSfdBnHJkgAjhD7hWb1ipqM7
-						BrTpfWSizP5GgQIDAQABo4IBBzCCAQMwHQYDVR0OBBYEFOjliEHArhe9qgYgp1QL
-						q/BpgJgXMIHTBgNVHSMEgcswgciAFOjliEHArhe9qgYgp1QLq/BpgJgXoYGkpIGh
-						MIGeMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHTG90aGlhbjESMBAGA1UEBxMJRWRp
-						bmJ1cmdoMR8wHQYDVQQKExZIZXJpb3QtV2F0dCBVbml2ZXJzaXR5MQswCQYDVQQL
-						EwJJUzEXMBUGA1UEAxMOc2hpYjEuaHcuYWMudWsxIjAgBgkqhkiG9w0BCQEWE24u
-						YS5tb3JyaXNAaHcuYWMudWuCCQCEc+JxDT806zAMBgNVHRMEBTADAQH/MA0GCSqG
-						SIb3DQEBBQUAA4IBAQCYhVo1561uH9WLY6BDdgrHOYy7mWEaFh9IN3hGiN0Xaol1
-						l9cL/OQxrDiNAeYE5v2k4gmrmqQ1k+SarfyG1+y2Cz2nRCeIvFUgzP2ZxY6NihlK
-						rxiPaMOj8Lhpm1qnMYqfOgEmZm7DspgWTca9ee3GfMi3gNKDhNc3ClT3fmJEz3su
-						m591vtWWwBK8FFjmdrfEpMscEBDIjmK3++ZSZcpi7RDgmcOkyYAU4SehufVqTiG/
-						LVmqVmL3cap2AeHoYFLsZerEuI/3ZgBE/P0em2OQxFyXAlWOSiD2piEgAUUxl4Vt
-						TeTRcCOx2CPOUV8iEok1S6c/YqtF3YOSmCca1Ey2
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.hw.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.hw.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">Heriot-Watt University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Heriot-Watt University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hw.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:ithelp@hw.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>George</GivenName>
-    <SurName>Livie</SurName>
-    <EmailAddress>mailto:G.Livie@hw.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1.napier.ac.uk-entity.xml b/swamid-interfederations-2.0/shib1.napier.ac.uk-entity.xml
deleted file mode 100644
index d1d0ef96..00000000
--- a/swamid-interfederations-2.0/shib1.napier.ac.uk-entity.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://shib1.napier.ac.uk/entity">
-  <!--
-	This is a Shibboleth IdP for Edinburgh Napier University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-08T17:11: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">napier.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUTi/qwLJiY52T4kltTmNqkd1B5l4wDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSc2hpYjEubmFwaWVyLmFjLnVrMB4XDTE0MDMyNDE2MjEy
-						NloXDTM0MDMyNDE2MjEyNlowHTEbMBkGA1UEAxMSc2hpYjEubmFwaWVyLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWQo/dClCX3CqsYfxWDB
-						ouKIAl/kkobQLrukfV5cyu9P94PBOQK/hR+S2V7zxtZ/vmE+kWO9SXfnTJv8hBhr
-						0QiF64tK2fllzTRGC5NoWBy2iJ7LsxxI37wmB5n195mfaenb+nOdEF3XYhTer1NR
-						c/PjrcnWmWOImGGS770Gra7jC+i4LDqlVRihJQHfUooStIPghmblu7qsIjUZ+LUU
-						Xc8RK12Va5Wl0CvEJj0jPNUZ9IjuJjlLcz27Ot1XFiLMdo3qBCk4VM9pTB8k6Y4Z
-						J7GaEo4PlMja9u6qerThIFeIGPzfCg9wvExNi5T+qjgO75C4pcduMWCipa4Lbt/F
-						swIDAQABo2swaTBIBgNVHREEQTA/ghJzaGliMS5uYXBpZXIuYWMudWuGKWh0dHBz
-						Oi8vc2hpYjEubmFwaWVyLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSc
-						+TA4/2hb/0/5R4QBKnrA3hTQ0jANBgkqhkiG9w0BAQUFAAOCAQEAhP6pcfyhqfAc
-						SolKIRerz/8MieqSFSBR+MCc3Ow4MeGcf++7wim6IPKpAlBXl8T8BatoqO9yVLLB
-						2AFpRHHlgoYceryrlwcWJOcyX/DwPBvaqEZgg16IwGZ6dwrVm+qHlRWZgOPs3blY
-						0AvEsoucZkWGp4q5rVXTSb8V+PZ++QQuvxPpN6ZweVJWLyqNTiprHzg3ef+lecK2
-						FeboIZjNCsRtYo3FhXguhrf4ORkzU6jmm4iqdqApQbNyPuQ/W+6GQ7EQcU0dyK9M
-						NVZrPTK8LScXAcwOoMDzltNhzLHUa/WJUB95shI9hXSscHrpt8oQfHyAsrUoV07t
-						DeJEdpoirw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.napier.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.napier.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://shib.napier.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.napier.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.napier.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.napier.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">napier.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIUTi/qwLJiY52T4kltTmNqkd1B5l4wDQYJKoZIhvcNAQEF
-						BQAwHTEbMBkGA1UEAxMSc2hpYjEubmFwaWVyLmFjLnVrMB4XDTE0MDMyNDE2MjEy
-						NloXDTM0MDMyNDE2MjEyNlowHTEbMBkGA1UEAxMSc2hpYjEubmFwaWVyLmFjLnVr
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWQo/dClCX3CqsYfxWDB
-						ouKIAl/kkobQLrukfV5cyu9P94PBOQK/hR+S2V7zxtZ/vmE+kWO9SXfnTJv8hBhr
-						0QiF64tK2fllzTRGC5NoWBy2iJ7LsxxI37wmB5n195mfaenb+nOdEF3XYhTer1NR
-						c/PjrcnWmWOImGGS770Gra7jC+i4LDqlVRihJQHfUooStIPghmblu7qsIjUZ+LUU
-						Xc8RK12Va5Wl0CvEJj0jPNUZ9IjuJjlLcz27Ot1XFiLMdo3qBCk4VM9pTB8k6Y4Z
-						J7GaEo4PlMja9u6qerThIFeIGPzfCg9wvExNi5T+qjgO75C4pcduMWCipa4Lbt/F
-						swIDAQABo2swaTBIBgNVHREEQTA/ghJzaGliMS5uYXBpZXIuYWMudWuGKWh0dHBz
-						Oi8vc2hpYjEubmFwaWVyLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSc
-						+TA4/2hb/0/5R4QBKnrA3hTQ0jANBgkqhkiG9w0BAQUFAAOCAQEAhP6pcfyhqfAc
-						SolKIRerz/8MieqSFSBR+MCc3Ow4MeGcf++7wim6IPKpAlBXl8T8BatoqO9yVLLB
-						2AFpRHHlgoYceryrlwcWJOcyX/DwPBvaqEZgg16IwGZ6dwrVm+qHlRWZgOPs3blY
-						0AvEsoucZkWGp4q5rVXTSb8V+PZ++QQuvxPpN6ZweVJWLyqNTiprHzg3ef+lecK2
-						FeboIZjNCsRtYo3FhXguhrf4ORkzU6jmm4iqdqApQbNyPuQ/W+6GQ7EQcU0dyK9M
-						NVZrPTK8LScXAcwOoMDzltNhzLHUa/WJUB95shI9hXSscHrpt8oQfHyAsrUoV07t
-						DeJEdpoirw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.napier.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.napier.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">Edinburgh Napier University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Edinburgh Napier University (legacy)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.napier.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Foley</SurName>
-    <EmailAddress>mailto:citsupport@napier.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Todd</SurName>
-    <EmailAddress>mailto:J.Todd@napier.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1.univ-nc.nc-idp-shibboleth.xml b/swamid-interfederations-2.0/shib1.univ-nc.nc-idp-shibboleth.xml
deleted file mode 100644
index 3003962e..00000000
--- a/swamid-interfederations-2.0/shib1.univ-nc.nc-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://shib1.univ-nc.nc/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-04-07T06:55:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-nc.nc</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of New-Caledonia</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACCElEQVQoz22Ry09TQRTGz5yZe+eCLbcPbGlTCwsSUCMpxhgTNT4g8RVXbgyuXOofQCAxUTfu1IWJrsQVf4BGWRITsHGHQhAIRiI2tcXa9Lalvb2PGRa9KbZ4VmdOvt98M98hUkoAwDc/AQAA5q9FL/Zp8L/KlhbS36dYx9R1jfTmo0J1xa8lh2IT8cD55nyr8L5i/rqZmsOKud1SJ9R1t/w0HjzX6zuRLS28W7qR3pwCgI3cbI/WP5K4x5lOk2OvLcfo8Y9ljK+3+z4MJ5+kIseOhMeHYnfq1s637Mzf6gql2mDkVvNSNpK4v5x5eaV3OzVYnP7x7Ppxz40z/dLRV5zpksCpgenWK4iUciM3O7c6+Tw3k7GGD3768VKp2TwcDXgAAJx8+/tL0SIE5q9GL7QDrQDF3X4A8FJaLdmHGFEoYUg6ctMosYQU0jt6QJAjp4QjKJ16CHOsu7LmyDYgpKLGCEeiHHAIcVpzBaey06GLEo12Avm6G+TIHVDRA9ADVAxxDHPcqtj/Aov5RkjFoIq6gm0O43FtzbC7KX7aafgVPBPhALCYNz/mzABHhnA2qu7vAQAyu+6LtbKPoUaJgoAAroSGkDVHVm1ZtsWDlD7gY/sAACwXrc9/GowQFQkScIQ0XVl1pCXk5VjX6cPtDs2q2mLdcAqmiwRsAbu2iHTT0ZCqq9jS7AFb2suDvgWTpwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-nc.nc</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Users from the University of New-Caledonia</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de la Nouvelle-Calédonie</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Les usagers de l'Université de la Nouvelle-Calédonie</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>
-					      MIIDKzCCAhOgAwIBAgIUKHSh1ylYLiRjTuGeUpFo+BFI/NswDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAwwQc2hpYjEudW5pdi1uYy5uYzAeFw0xNTA0MDcwMjU3NTda
-Fw0zNTA0MDcwMjU3NTdaMBsxGTAXBgNVBAMMEHNoaWIxLnVuaXYtbmMubmMwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIS9HXIQ3OAVzkUY67B8btSmU6
-hqpJDtN/uFlX6sx7ceaJUAGA647RutZE8iYNx7w3cxaR5HircULm4XUhwsGxAjGv
-kbHLNCyilXx3leF268cjaFE5q/OVVcn8ZhH1UPQ5sMHs9i93X9BnJfkJVjl0EZQB
-X+Q3N2ToI8bXIqSHvJOLZDKHfVYuzrMfJlxZMvtGdeLafST5gAiTpacZ3nSy5eH4
-MZT2kj8c0AzVE8gFRb0RdoJvOrsJvNCHo0mlVKhOF2K4tPc5tmUPyH0Qz9raXaJV
-CGTQiHDlQKm93b45gHgsiH5SnvJzjXgxjfiufRWLdODKigq2w5Wd8V5c5QZTAgMB
-AAGjZzBlMB0GA1UdDgQWBBTR9hQtChLxyxmf/sFiJ8l8mxvZNTBEBgNVHREEPTA7
-ghBzaGliMS51bml2LW5jLm5jhidodHRwczovL3NoaWIxLnVuaXYtbmMubmMvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBALGrtfzm7UuiNtns7ZfJa79M
-FyaK2XzboYw4LbE21RQa8YrHfuLytZi3xYZE/1Z88n5MgEFuUnFqqqZ0/qwax7Wb
-6DHtiBtpVzD6bI/IYQHRBUZHEkfItEe6gOUX43ndaXum/qb1ojEqsSAttvyDSkIZ
-dZMZ4qfiTgpW69Qb1z6CGCouZC2ssxSc4YK6lDO9fKhnbE+9N0nFYrJNwONPy5Sv
-+XhkKPoxbZ2BMnwQZlbCzoJPt9mG1hcpxrjEDpu5MDl4Ma12ycSHOAjLedMvv2Xv
-IsXFZf9tlVP3B/KFbcFPpRJviR3uaiwWsahu7Zd0ojoS20riz5LOdWi8i281QUU=
-					    </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-POST" Location="https://shib1.univ-nc.nc/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.univ-nc.nc/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.univ-nc.nc/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de la Nouvelle-Calédonie</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de la Nouvelle-Calédonie</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-nc.nc</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi-srs@univ-nc.nc</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1.uwplatt.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib1.uwplatt.edu-idp-shibboleth.xml
deleted file mode 100644
index 4034eb4a..00000000
--- a/swamid-interfederations-2.0/shib1.uwplatt.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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://shib1.uwplatt.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uwplatt.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Wisconsin - Platteville</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Wisconsin-Platteville Shibboleth IdP Server</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uwplatt.edu/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://kb.uwplatt.edu/page.php?id=36091</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="60" xml:lang="en">https://shib1.uwplatt.edu/logo.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>
-MIIDMDCCAhigAwIBAgIVAP8Xbwf1Tuc/Rp4EvdoU1gZkcvOrMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNoaWIxLnV3cGxhdHQuZWR1MB4XDTE0MDUwOTE1MDcw
-MloXDTM0MDUwOTE1MDcwMlowHDEaMBgGA1UEAxMRc2hpYjEudXdwbGF0dC5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYdo9R90GljPUE807is1EP
-M7R41IbOQtGq6FbNae/xcSfxFvVNg5ONVfCFXfNK0PiMWP8uLviE6hw4AJhHTwLX
-pscbllJYXb8wQl4fIyNfakuHlmuU3gPLflzeXvnJ+4wCFFv+R2wGkbZ4O01ZrGF/
-99pPyHIL1nmDPFCYxjbePYq8f0zebH/Mq+BSXDcV6qx2mrN5vJBvQ5K8Na9wQdsB
-mIt2Mv93QwN9tjif9H1kg7W1WIRAzgNFbe0x99g734OA06QHOW6lx7Nm8RaH9/8W
-NAsJpzpk3gmWrllI0/Od8Q9sAjF8DwFbkYUURTow1wiUP6mlue+gEDK8L7xqL+xv
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWIxLnV3cGxhdHQuZWR1hihodHRwczov
-L3NoaWIxLnV3cGxhdHQuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR83GAw
-Mgixxu/yNpTRTW6+t5dg0jANBgkqhkiG9w0BAQUFAAOCAQEAApu/L+9PoY2VYteQ
-+ragjqINEpKn8BN52Agi6uJSb1+YJOSIi2MpTVk0VmASN6TEqojOuOjd52KCAl98
-Ivxu8sozeR2oOwPU/A0i8y2KsYZvrhadWvrdT1wLau6yDY93VY57nDTQap7ZHCIy
-8cR3OtSUZ/27XN0+T9h+eqR+IOtL0FxQQ77A8YKAsNyiMaxV2VnT4ATM0aR31fee
-o/7CBCSFgT8NxLha7tuxYka6zYh9CymL5hEEDDrE7+j/IqYdgNrnVQORMei3SsZR
-rJ5rLt9TKWB4CB+6csEOqQ0kMSk5t8Sqr2p+97SSv8Og+nXdrE9NabrSNFB3r0rG
-WmxXwg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.uwplatt.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1.uwplatt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib1.uwplatt.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1.uwplatt.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1.uwplatt.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwplatt.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAP8Xbwf1Tuc/Rp4EvdoU1gZkcvOrMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXNoaWIxLnV3cGxhdHQuZWR1MB4XDTE0MDUwOTE1MDcw
-MloXDTM0MDUwOTE1MDcwMlowHDEaMBgGA1UEAxMRc2hpYjEudXdwbGF0dC5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYdo9R90GljPUE807is1EP
-M7R41IbOQtGq6FbNae/xcSfxFvVNg5ONVfCFXfNK0PiMWP8uLviE6hw4AJhHTwLX
-pscbllJYXb8wQl4fIyNfakuHlmuU3gPLflzeXvnJ+4wCFFv+R2wGkbZ4O01ZrGF/
-99pPyHIL1nmDPFCYxjbePYq8f0zebH/Mq+BSXDcV6qx2mrN5vJBvQ5K8Na9wQdsB
-mIt2Mv93QwN9tjif9H1kg7W1WIRAzgNFbe0x99g734OA06QHOW6lx7Nm8RaH9/8W
-NAsJpzpk3gmWrllI0/Od8Q9sAjF8DwFbkYUURTow1wiUP6mlue+gEDK8L7xqL+xv
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWIxLnV3cGxhdHQuZWR1hihodHRwczov
-L3NoaWIxLnV3cGxhdHQuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR83GAw
-Mgixxu/yNpTRTW6+t5dg0jANBgkqhkiG9w0BAQUFAAOCAQEAApu/L+9PoY2VYteQ
-+ragjqINEpKn8BN52Agi6uJSb1+YJOSIi2MpTVk0VmASN6TEqojOuOjd52KCAl98
-Ivxu8sozeR2oOwPU/A0i8y2KsYZvrhadWvrdT1wLau6yDY93VY57nDTQap7ZHCIy
-8cR3OtSUZ/27XN0+T9h+eqR+IOtL0FxQQ77A8YKAsNyiMaxV2VnT4ATM0aR31fee
-o/7CBCSFgT8NxLha7tuxYka6zYh9CymL5hEEDDrE7+j/IqYdgNrnVQORMei3SsZR
-rJ5rLt9TKWB4CB+6csEOqQ0kMSk5t8Sqr2p+97SSv8Og+nXdrE9NabrSNFB3r0rG
-WmxXwg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1.uwplatt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wisconsin - Platteville</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin - Platteville</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwplatt.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mike Sherer</md:GivenName>
-    <md:EmailAddress>sherer@uwplatt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UW-Platteville Help desk</md:GivenName>
-    <md:EmailAddress>helpdesk@uwplatt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Mike Perkins</md:GivenName>
-    <md:EmailAddress>perkinsm@uwplatt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mike Perkins</md:GivenName>
-    <md:EmailAddress>perkinsm@uwplatt.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib1snc.suffolk.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib1snc.suffolk.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 9f247232..00000000
--- a/swamid-interfederations-2.0/shib1snc.suffolk.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://shib1snc.suffolk.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Suffolk New College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-22T13:48:13Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">suffolk.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUfzCoW57XmoYd7vMlxp5dQBZ3IlswDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWc2hpYjFzbmMuc3VmZm9say5hYy51azAeFw0xMjA4MTYx
-						MDQxNTlaFw0zMjA4MTYxMDQxNTlaMCExHzAdBgNVBAMTFnNoaWIxc25jLnN1ZmZv
-						bGsuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC33xMKw0Bo
-						NtZFy4/0pVwutCV+s+Abw8SVssaEsgfE5uTPitGRAr04JCD7OIXMYSPqwLb84Bc7
-						TWZ3gelziBLZMHv/QmtAv09OtZOlRW3PeCPTuDRKDjQaxskOYdLPQXF9tMv52pEQ
-						gmdDobUnDTErerHZNE48bUWlcdqkN8wp9z+qdK0ejZHEDevEmaH6mCfI+2pzJyMr
-						iiASeSxQSUjdkFgxt7JF1zohHJXs+Qykvqd3X5hd/vfnt1F11CRcl1FSg+efjWKR
-						tTKudEzjYgHLDds/J0i3c6wnbqArLUMW+M2S62r0RIKtQU7zZ8FhC299a4s7gIuk
-						6wqWUcQ13qBbAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWIxc25jLnN1ZmZvbGsu
-						YWMudWuGLWh0dHBzOi8vc2hpYjFzbmMuc3VmZm9say5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUPHsNuCLkrODOU8s0nhrCAIWnNl4wDQYJKoZIhvcNAQEF
-						BQADggEBAIMg4WDk4Sb4oO4jUn5dxcZS1kZi3BP0nnO3cn1qU4y2qdEEbtqgBdF1
-						/dhGj1sGEH2b08HjCx52Xr/IsOjlmEgBq5nZgwqccCHiALZLqhazV620dGTjhU5F
-						w4AoSO2LyrDCX7xSAI0CF9EDcUGw6o6t3WrlwlTRmUY4/c12SSmqqhYM/YOS+2ny
-						b+2KrX7e6vI0vlvmPFiGkoKPfkUfJp3sUu/x1b48DEceZ2/gtZ0P5hdneYTP0kZI
-						oTvLS1eWkipkwLD7bfT+cFix5ADRu35TL+OSXiONhIcS/JYk6SLsEk1tAbvBfXoW
-						DPvOr2BNReNY3ljjUNFUUmRke9HXoqk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1snc.suffolk.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1snc.suffolk.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://shib1snc.suffolk.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib1snc.suffolk.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib1snc.suffolk.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib1snc.suffolk.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">suffolk.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUfzCoW57XmoYd7vMlxp5dQBZ3IlswDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWc2hpYjFzbmMuc3VmZm9say5hYy51azAeFw0xMjA4MTYx
-						MDQxNTlaFw0zMjA4MTYxMDQxNTlaMCExHzAdBgNVBAMTFnNoaWIxc25jLnN1ZmZv
-						bGsuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC33xMKw0Bo
-						NtZFy4/0pVwutCV+s+Abw8SVssaEsgfE5uTPitGRAr04JCD7OIXMYSPqwLb84Bc7
-						TWZ3gelziBLZMHv/QmtAv09OtZOlRW3PeCPTuDRKDjQaxskOYdLPQXF9tMv52pEQ
-						gmdDobUnDTErerHZNE48bUWlcdqkN8wp9z+qdK0ejZHEDevEmaH6mCfI+2pzJyMr
-						iiASeSxQSUjdkFgxt7JF1zohHJXs+Qykvqd3X5hd/vfnt1F11CRcl1FSg+efjWKR
-						tTKudEzjYgHLDds/J0i3c6wnbqArLUMW+M2S62r0RIKtQU7zZ8FhC299a4s7gIuk
-						6wqWUcQ13qBbAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWIxc25jLnN1ZmZvbGsu
-						YWMudWuGLWh0dHBzOi8vc2hpYjFzbmMuc3VmZm9say5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUPHsNuCLkrODOU8s0nhrCAIWnNl4wDQYJKoZIhvcNAQEF
-						BQADggEBAIMg4WDk4Sb4oO4jUn5dxcZS1kZi3BP0nnO3cn1qU4y2qdEEbtqgBdF1
-						/dhGj1sGEH2b08HjCx52Xr/IsOjlmEgBq5nZgwqccCHiALZLqhazV620dGTjhU5F
-						w4AoSO2LyrDCX7xSAI0CF9EDcUGw6o6t3WrlwlTRmUY4/c12SSmqqhYM/YOS+2ny
-						b+2KrX7e6vI0vlvmPFiGkoKPfkUfJp3sUu/x1b48DEceZ2/gtZ0P5hdneYTP0kZI
-						oTvLS1eWkipkwLD7bfT+cFix5ADRu35TL+OSXiONhIcS/JYk6SLsEk1tAbvBfXoW
-						DPvOr2BNReNY3ljjUNFUUmRke9HXoqk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib1snc.suffolk.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib1snc.suffolk.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">Suffolk New College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Suffolk New College (Shibboleth)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.suffolk.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Burhan</GivenName>
-    <SurName>Loqueman</SurName>
-    <EmailAddress>mailto:burhanloqueman@suffolk.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Burhan</GivenName>
-    <SurName>Loqueman</SurName>
-    <EmailAddress>mailto:burhanloqueman@suffolk.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.blackpool.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.blackpool.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 25ecebe3..00000000
--- a/swamid-interfederations-2.0/shib2.blackpool.ac.uk-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://shib2.blackpool.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Blackpool and The Fylde College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">blackpool.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Blackpool and The Fylde College (Development)</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://shib2.blackpool.ac.uk/gif/BFC-Logo-80x60.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shib2.blackpool.ac.uk/gif/BFC-Logo-16x16.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.63.160.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.161.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.162.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.163.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.164.0/24</mdui:IPHint>
-        <mdui:IPHint>193.63.165.0/24</mdui:IPHint>
-        <mdui:DomainHint>blackpool.ac.uk</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEHjCCAwagAwIBAgIJAIbJGsXAMFHuMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29s
-						MSgwJgYDVQQKEx9CbGFja3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYD
-						VQQLEwRMSVRTMR4wHAYDVQQDExVzaGliMi5ibGFja3Bvb2wuYWMudWswHhcNMTIw
-						NjI5MTMxNzIwWhcNMjIwNjI3MTMxNzIwWjCBjzELMAkGA1UEBhMCR0IxEzARBgNV
-						BAgTCkxhbmNhc2hpcmUxEjAQBgNVBAcTCUJsYWNrcG9vbDEoMCYGA1UEChMfQmxh
-						Y2twb29sIGFuZCBUaGUgRnlsZGUgQ29sbGVnZTENMAsGA1UECxMETElUUzEeMBwG
-						A1UEAxMVc2hpYjIuYmxhY2twb29sLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAyJaTYlzIs0P3e0xr3KRAdAsm7NTC3b68nCcX7SwTefwgwGPT
-						/dkYhR2Fbu8pUVb5gZ7YX3G6ZnGwsq5pV/gr8Zw6jgtYJ+aqq18lkPbRdTcd+rLX
-						OL456IhQmjYV5MathiVukkhpKlYmxL+eIL5PfHCF5JlwEQgwgSktpfM4Rk7Z29wG
-						rZrv3AMQqey3BzgYm4Zhp1FDMn5lFgB9ivkBzzsNkHDciHO1AP0kfdtqBrXYr2m1
-						gIG6AOi8bkHAB2nwwPCPGVhyvEYHAt+8PvofdCS80g8W0mSXz28QRE7QMTy0p2e/
-						sEkceF7V/sbvMjxGPsjbGWoEgARFtBQl07stTwIDAQABo3sweTAJBgNVHRMEAjAA
-						MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
-						BgNVHQ4EFgQURhmQ85mS+G8vK+IC45bY0aQx2eAwHwYDVR0jBBgwFoAURhmQ85mS
-						+G8vK+IC45bY0aQx2eAwDQYJKoZIhvcNAQEFBQADggEBALu+51j8hIjTAxO2UHND
-						SzTANca/7K/++d4p7oYuIqlkg1Ql3Fm8xXmwljOdYhhIKWeB24pRP8waewl9Ibvh
-						JFZfmm07XW2qYna5cJeow7QeaHo2wD7x2jz6D893ONrqXNLjv03lhA/le97LZ6KU
-						2C/oKDxGvwFMDa+3acPWPrcwhz4l5/FeYAn9UbxAqmSdmioz7WFitbzAlLFyf+OT
-						pGnYFjRQBxApP6mPCrh3glB5kkCEtqw1V/vxHo6bGyC8XyoGVuMcihpEfWzu7bKa
-						ilVW760JMDOt2zkUwScTpKdDksPm/BqlTMZxfE+nFGu9xK7pgO39GmXYudXj1jFL
-						TpE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.blackpool.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.blackpool.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://idp2.blackpool.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.blackpool.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.blackpool.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.blackpool.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">blackpool.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEHjCCAwagAwIBAgIJAIbJGsXAMFHuMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTGFuY2FzaGlyZTESMBAGA1UEBxMJQmxhY2twb29s
-						MSgwJgYDVQQKEx9CbGFja3Bvb2wgYW5kIFRoZSBGeWxkZSBDb2xsZWdlMQ0wCwYD
-						VQQLEwRMSVRTMR4wHAYDVQQDExVzaGliMi5ibGFja3Bvb2wuYWMudWswHhcNMTIw
-						NjI5MTMxNzIwWhcNMjIwNjI3MTMxNzIwWjCBjzELMAkGA1UEBhMCR0IxEzARBgNV
-						BAgTCkxhbmNhc2hpcmUxEjAQBgNVBAcTCUJsYWNrcG9vbDEoMCYGA1UEChMfQmxh
-						Y2twb29sIGFuZCBUaGUgRnlsZGUgQ29sbGVnZTENMAsGA1UECxMETElUUzEeMBwG
-						A1UEAxMVc2hpYjIuYmxhY2twb29sLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAyJaTYlzIs0P3e0xr3KRAdAsm7NTC3b68nCcX7SwTefwgwGPT
-						/dkYhR2Fbu8pUVb5gZ7YX3G6ZnGwsq5pV/gr8Zw6jgtYJ+aqq18lkPbRdTcd+rLX
-						OL456IhQmjYV5MathiVukkhpKlYmxL+eIL5PfHCF5JlwEQgwgSktpfM4Rk7Z29wG
-						rZrv3AMQqey3BzgYm4Zhp1FDMn5lFgB9ivkBzzsNkHDciHO1AP0kfdtqBrXYr2m1
-						gIG6AOi8bkHAB2nwwPCPGVhyvEYHAt+8PvofdCS80g8W0mSXz28QRE7QMTy0p2e/
-						sEkceF7V/sbvMjxGPsjbGWoEgARFtBQl07stTwIDAQABo3sweTAJBgNVHRMEAjAA
-						MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
-						BgNVHQ4EFgQURhmQ85mS+G8vK+IC45bY0aQx2eAwHwYDVR0jBBgwFoAURhmQ85mS
-						+G8vK+IC45bY0aQx2eAwDQYJKoZIhvcNAQEFBQADggEBALu+51j8hIjTAxO2UHND
-						SzTANca/7K/++d4p7oYuIqlkg1Ql3Fm8xXmwljOdYhhIKWeB24pRP8waewl9Ibvh
-						JFZfmm07XW2qYna5cJeow7QeaHo2wD7x2jz6D893ONrqXNLjv03lhA/le97LZ6KU
-						2C/oKDxGvwFMDa+3acPWPrcwhz4l5/FeYAn9UbxAqmSdmioz7WFitbzAlLFyf+OT
-						pGnYFjRQBxApP6mPCrh3glB5kkCEtqw1V/vxHo6bGyC8XyoGVuMcihpEfWzu7bKa
-						ilVW760JMDOt2zkUwScTpKdDksPm/BqlTMZxfE+nFGu9xK7pgO39GmXYudXj1jFL
-						TpE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.blackpool.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.blackpool.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">Blackpool and The Fylde College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Blackpool and The Fylde College (Development)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.blackpool.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@blackpool.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical support</GivenName>
-    <EmailAddress>mailto:shib-tech@blackpool.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.its.rochester.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.its.rochester.edu-idp-shibboleth.xml
deleted file mode 100644
index 58a01bf3..00000000
--- a/swamid-interfederations-2.0/shib2.its.rochester.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://shib2.its.rochester.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shib2.its.rochester.edu/idp/error.jsp" 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">rochester.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Rochester</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.rochester.edu/aboutus/</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>
-MIIDSDCCAjCgAwIBAgIVAM8nPCRk50aihh9jR5hpm0QebIz8MA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWIyLml0cy5yb2NoZXN0ZXIuZWR1MB4XDTEwMDUw
-MzE3Mzk0NloXDTMwMDUwMzE3Mzk0NlowIjEgMB4GA1UEAxMXc2hpYjIuaXRzLnJv
-Y2hlc3Rlci5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSsvAF
-IHstqZI+DowfRTvgPn7cQ2CFWX24RmJCR5X5hYTfI2AMrN9JE+7PY9F2JHPKj/PV
-7uXt3oiN7jDexGtDQojywAsEz86GKTEgHKEGQ8YzwLnI1/6ZDrvykH8aCrgoQm7O
-M8U3suUb6pFo2/ZZ3jmzMbd4k8NJa7QXjtqA0XM1I+3F41dIaC5/s8XIcg7Ahjd/
-nm6sohuGVHJx+HZog1VaTqFuVuR3cWyqQ6dC55XIAMq9NiA3JtU69JKMTB34Ux7b
-KTmgVmsKi3JLapcDF1pzCcQoVuEy0PSbLz+R+02RRbGs3QeJqZbLOSUR9KraW0qD
-rERHsLgJcdbFguAzAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWIyLml0cy5yb2No
-ZXN0ZXIuZWR1hi5odHRwczovL3NoaWIyLml0cy5yb2NoZXN0ZXIuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBR8nYpQTgEI/aYKmVXqfgmstZVmpDANBgkqhkiG
-9w0BAQUFAAOCAQEAr6si4Z4y/1kCtAGjUpEB0JooKlMZ0SuKJlFPmXhPZXZSbgXo
-N9MAHMnjlhzjCdde39FAtlYPuryGiP0Rtk8C3T+aZg/Whzp1iY7aDuj0MG5XvRrY
-WClnuYqRa7ImEOP1X/L3/5j67fBOvIuYVKAfE28HJFLgnMscd+BLwFwg4MUP51OJ
-XfUt2z0ezqr2o+rDRnkBZLiizpHQcaIycAEoOsQpjg1tQE7Uc/uk4pah/eHu1f1C
-bkmTAMBCJrx8UG038vZR+ylLz1i+I2UI7AmhvNfuh84TdMZH85Sf5G8mPz+Krwib
-5iANvMct2zX06MsOylywfcDKALrij57mN3ZP+A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.its.rochester.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.its.rochester.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.its.rochester.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2.its.rochester.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.its.rochester.edu/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">rochester.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAM8nPCRk50aihh9jR5hpm0QebIz8MA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWIyLml0cy5yb2NoZXN0ZXIuZWR1MB4XDTEwMDUw
-MzE3Mzk0NloXDTMwMDUwMzE3Mzk0NlowIjEgMB4GA1UEAxMXc2hpYjIuaXRzLnJv
-Y2hlc3Rlci5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSsvAF
-IHstqZI+DowfRTvgPn7cQ2CFWX24RmJCR5X5hYTfI2AMrN9JE+7PY9F2JHPKj/PV
-7uXt3oiN7jDexGtDQojywAsEz86GKTEgHKEGQ8YzwLnI1/6ZDrvykH8aCrgoQm7O
-M8U3suUb6pFo2/ZZ3jmzMbd4k8NJa7QXjtqA0XM1I+3F41dIaC5/s8XIcg7Ahjd/
-nm6sohuGVHJx+HZog1VaTqFuVuR3cWyqQ6dC55XIAMq9NiA3JtU69JKMTB34Ux7b
-KTmgVmsKi3JLapcDF1pzCcQoVuEy0PSbLz+R+02RRbGs3QeJqZbLOSUR9KraW0qD
-rERHsLgJcdbFguAzAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWIyLml0cy5yb2No
-ZXN0ZXIuZWR1hi5odHRwczovL3NoaWIyLml0cy5yb2NoZXN0ZXIuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBR8nYpQTgEI/aYKmVXqfgmstZVmpDANBgkqhkiG
-9w0BAQUFAAOCAQEAr6si4Z4y/1kCtAGjUpEB0JooKlMZ0SuKJlFPmXhPZXZSbgXo
-N9MAHMnjlhzjCdde39FAtlYPuryGiP0Rtk8C3T+aZg/Whzp1iY7aDuj0MG5XvRrY
-WClnuYqRa7ImEOP1X/L3/5j67fBOvIuYVKAfE28HJFLgnMscd+BLwFwg4MUP51OJ
-XfUt2z0ezqr2o+rDRnkBZLiizpHQcaIycAEoOsQpjg1tQE7Uc/uk4pah/eHu1f1C
-bkmTAMBCJrx8UG038vZR+ylLz1i+I2UI7AmhvNfuh84TdMZH85Sf5G8mPz+Krwib
-5iANvMct2zX06MsOylywfcDKALrij57mN3ZP+A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.its.rochester.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.its.rochester.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Rochester</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Rochester</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rochester.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sean Singh</md:GivenName>
-    <md:EmailAddress>sean.singh@rochester.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sean Singh</md:GivenName>
-    <md:EmailAddress>sean.singh@rochester.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Lisa Sprague</md:GivenName>
-    <md:EmailAddress>lisa.sprague@rochester.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.qmu.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index a3221f77..00000000
--- a/swamid-interfederations-2.0/shib2.qmu.ac.uk-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" entityID="https://shib2.qmu.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Queen Margaret University, Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-04T12:46: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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Queen Margaret University, Edinburgh</mdui:DisplayName>
-        <mdui:Logo height="47" width="50">https://shib2.qmu.ac.uk/qmu_logo.gif</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shib2.qmu.ac.uk/qmu_icon.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>194.83.92.0/23</mdui:IPHint>
-        <mdui:IPHint>193.62.47.0/24</mdui:IPHint>
-        <mdui:IPHint>194.83.30.0/24</mdui:IPHint>
-        <mdui:IPHint>212.219.89.0/25</mdui:IPHint>
-        <mdui:DomainHint>qmu.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:55.931696,-3.073457</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">qmu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEHDCCAwSgAwIBAgIJALXqP3+WEFbxMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-						VQQGEwJHQjEVMBMGA1UECBMMRWFzdCBMb3RoaWFuMRQwEgYDVQQHEwtNdXNzZWxi
-						dXJnaDEiMCAGA1UEChMZUXVlZW4gTWFyZ2FyZXQgVW5pdmVyc2l0eTEUMBIGA1UE
-						CxMLSVQgU2VydmljZXMxGDAWBgNVBAMTD3NoaWIyLnFtdS5hYy51azAeFw0xNTAy
-						MDYxMzQ5MzlaFw0yNTAyMDMxMzQ5MzlaMIGOMQswCQYDVQQGEwJHQjEVMBMGA1UE
-						CBMMRWFzdCBMb3RoaWFuMRQwEgYDVQQHEwtNdXNzZWxidXJnaDEiMCAGA1UEChMZ
-						UXVlZW4gTWFyZ2FyZXQgVW5pdmVyc2l0eTEUMBIGA1UECxMLSVQgU2VydmljZXMx
-						GDAWBgNVBAMTD3NoaWIyLnFtdS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALZ45sT4BFzeyQq+7s+fB3MXY5DEJ7M5LqLwOuLQu9qQy8QXkfjl
-						IF/njXWdTISjaQduqpfxQ2s2math1WjYqw+ahbBo7pLMtJjUZaFuBu8SfWOvlAcj
-						nBmZGuo38oaKVi7F+cPEltwEyA4soxdjy+VnwIHlcmgapQf6/qu/zUwDzQpr+DjO
-						VXLc2E/F4ac6DdWaymQgCyuukR6nz8y690XurJmd9neaZGMjYRcM9MStHM6rNuRh
-						snpjcTgJ1LVtMeLHzp6F3AyEy10oRGmuehLNsG53jD8qyjVQgiN1BICaUBEwuz49
-						lB5IsP1LbP5ZaGx23w/gm/TndqTo3toThX8CAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFG+x6Z1HFy1EVNofQT5Pz5MbLFglMB8GA1UdIwQYMBaAFG+x6Z1HFy1E
-						VNofQT5Pz5MbLFglMA0GCSqGSIb3DQEBBQUAA4IBAQBu+SRFvMc99/KKW615vkO0
-						IZYqXVKtt13FjHOzNIm9Pb51dzOqEBVqSn4Hc0lhaL5Bat8t8JgDbKFd85H8v/oB
-						tM7XBK4bgQhyG4jd144SSwN1HLqWKdQE54w3MyWvFHrGrPAqjgqZMqGSCFpORlJG
-						rd2EC/yHEkOrY0X74q0uaU6D7Kp96Ayv5NtZWvCcj1hNdQF/CoX0vA+uFdYWWUEd
-						oiaa7CX11axaCto39+d4wwqSeX3j0YUkvkU+0spZeYstSA5PNX4G8drgxRGK3+uV
-						blLOGW/k9vBqR2M4FEIMjli/7ytkIVG6q0g1ENv3x89Q6y7pqzP/G1L4q0d0lkKq
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.qmu.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://shib2.qmu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.qmu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2.qmu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.qmu.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">qmu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEHDCCAwSgAwIBAgIJALXqP3+WEFbxMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
-						VQQGEwJHQjEVMBMGA1UECBMMRWFzdCBMb3RoaWFuMRQwEgYDVQQHEwtNdXNzZWxi
-						dXJnaDEiMCAGA1UEChMZUXVlZW4gTWFyZ2FyZXQgVW5pdmVyc2l0eTEUMBIGA1UE
-						CxMLSVQgU2VydmljZXMxGDAWBgNVBAMTD3NoaWIyLnFtdS5hYy51azAeFw0xNTAy
-						MDYxMzQ5MzlaFw0yNTAyMDMxMzQ5MzlaMIGOMQswCQYDVQQGEwJHQjEVMBMGA1UE
-						CBMMRWFzdCBMb3RoaWFuMRQwEgYDVQQHEwtNdXNzZWxidXJnaDEiMCAGA1UEChMZ
-						UXVlZW4gTWFyZ2FyZXQgVW5pdmVyc2l0eTEUMBIGA1UECxMLSVQgU2VydmljZXMx
-						GDAWBgNVBAMTD3NoaWIyLnFtdS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALZ45sT4BFzeyQq+7s+fB3MXY5DEJ7M5LqLwOuLQu9qQy8QXkfjl
-						IF/njXWdTISjaQduqpfxQ2s2math1WjYqw+ahbBo7pLMtJjUZaFuBu8SfWOvlAcj
-						nBmZGuo38oaKVi7F+cPEltwEyA4soxdjy+VnwIHlcmgapQf6/qu/zUwDzQpr+DjO
-						VXLc2E/F4ac6DdWaymQgCyuukR6nz8y690XurJmd9neaZGMjYRcM9MStHM6rNuRh
-						snpjcTgJ1LVtMeLHzp6F3AyEy10oRGmuehLNsG53jD8qyjVQgiN1BICaUBEwuz49
-						lB5IsP1LbP5ZaGx23w/gm/TndqTo3toThX8CAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFG+x6Z1HFy1EVNofQT5Pz5MbLFglMB8GA1UdIwQYMBaAFG+x6Z1HFy1E
-						VNofQT5Pz5MbLFglMA0GCSqGSIb3DQEBBQUAA4IBAQBu+SRFvMc99/KKW615vkO0
-						IZYqXVKtt13FjHOzNIm9Pb51dzOqEBVqSn4Hc0lhaL5Bat8t8JgDbKFd85H8v/oB
-						tM7XBK4bgQhyG4jd144SSwN1HLqWKdQE54w3MyWvFHrGrPAqjgqZMqGSCFpORlJG
-						rd2EC/yHEkOrY0X74q0uaU6D7Kp96Ayv5NtZWvCcj1hNdQF/CoX0vA+uFdYWWUEd
-						oiaa7CX11axaCto39+d4wwqSeX3j0YUkvkU+0spZeYstSA5PNX4G8drgxRGK3+uV
-						blLOGW/k9vBqR2M4FEIMjli/7ytkIVG6q0g1ENv3x89Q6y7pqzP/G1L4q0d0lkKq
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.qmu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.qmu.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">Queen Margaret University, Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Margaret University, Edinburgh</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Garry</GivenName>
-    <SurName>Haining</SurName>
-    <EmailAddress>mailto:ghaining@qmu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Garry</GivenName>
-    <SurName>Haining</SurName>
-    <EmailAddress>mailto:ghaining@qmu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml
deleted file mode 100644
index af5ee162..00000000
--- a/swamid-interfederations-2.0/shib2.rowan.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +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://shib2.rowan.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shib2.rowan.edu" 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">rowan.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rowan University</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>
-MIIDJzCCAg+gAwIBAgIUV1h7BDn1TSOjSv/+LSq0IE3Oy+AwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MB4XDTEzMDkxMTE5MDAyMVoX
-DTMzMDkxMTE5MDAyMVowGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dC45ZVWTnEsm6ku5CSWBf/yKB6G
-LGYNi4aSG5sYvw88ODE0wAHDxeVUpUV93Mq3HpsNVD7ciBCynYyeGy9myDPd8GF+
-LgozcIMKEL9y3pys8EfOz+ZiewJZXXldwuI8ULYZ8tApAJofeO+rZYW5TleyNEE/
-l/sxuEU/GzYIFS5Adr0SpzL5UGIr0WR+unkgv3cdz1lJwJW8ZxqJLNOEnwPQniXt
-5t7im0X7Jb2mMeAqtkfi3t9UGiprYV5gltCSV+phWA7uw/eIBCf+T+MrLOA/bJeK
-f4tHpCGGGn9dWgHczBq3tJcmqrU9KZXMjP8F6EX+UhlI9M0kQcXtFaDfyQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliMi5yb3dhbi5lZHWGJmh0dHBzOi8vc2hpYjIu
-cm93YW4uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQD5L1958tIrqBF2l7b
-ItJU0uhJnzANBgkqhkiG9w0BAQUFAAOCAQEAF+xcIxBd1V8BtD5VKV5CPdBY9JXX
-JrsB9ETj+9Dtv12c7XdbwoumlkdORbDXsoAB156kF5VJSEhOU45QpRI5o6mwQzBR
-oKw1Zem0MLWTgrLDZvFeQzEO/lcnnKSa82sEJ+ooyk59Pjn8ZHNwV/76xGx4cIe0
-VYrgZQqBSiVJaCaEQUndNw3+9d4SNIfQ+KPfsFyJE/0RXzDO35RqT8gP6vqsTtyr
-mNCEYGye/xJOKXb8vnyf/r6sCDiaJCBxB6pwHiRS5TlxOXJOx/CPLQe3oLBHm6NV
-V4Hgw585iFPY3CHO+EezoWVCuDIVlvcnMAHlLYh/kZypvjuuIzizI2l28g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.rowan.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.rowan.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.rowan.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.rowan.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.rowan.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rowan.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUV1h7BDn1TSOjSv/+LSq0IE3Oy+AwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MB4XDTEzMDkxMTE5MDAyMVoX
-DTMzMDkxMTE5MDAyMVowGjEYMBYGA1UEAxMPc2hpYjIucm93YW4uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0dC45ZVWTnEsm6ku5CSWBf/yKB6G
-LGYNi4aSG5sYvw88ODE0wAHDxeVUpUV93Mq3HpsNVD7ciBCynYyeGy9myDPd8GF+
-LgozcIMKEL9y3pys8EfOz+ZiewJZXXldwuI8ULYZ8tApAJofeO+rZYW5TleyNEE/
-l/sxuEU/GzYIFS5Adr0SpzL5UGIr0WR+unkgv3cdz1lJwJW8ZxqJLNOEnwPQniXt
-5t7im0X7Jb2mMeAqtkfi3t9UGiprYV5gltCSV+phWA7uw/eIBCf+T+MrLOA/bJeK
-f4tHpCGGGn9dWgHczBq3tJcmqrU9KZXMjP8F6EX+UhlI9M0kQcXtFaDfyQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliMi5yb3dhbi5lZHWGJmh0dHBzOi8vc2hpYjIu
-cm93YW4uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQD5L1958tIrqBF2l7b
-ItJU0uhJnzANBgkqhkiG9w0BAQUFAAOCAQEAF+xcIxBd1V8BtD5VKV5CPdBY9JXX
-JrsB9ETj+9Dtv12c7XdbwoumlkdORbDXsoAB156kF5VJSEhOU45QpRI5o6mwQzBR
-oKw1Zem0MLWTgrLDZvFeQzEO/lcnnKSa82sEJ+ooyk59Pjn8ZHNwV/76xGx4cIe0
-VYrgZQqBSiVJaCaEQUndNw3+9d4SNIfQ+KPfsFyJE/0RXzDO35RqT8gP6vqsTtyr
-mNCEYGye/xJOKXb8vnyf/r6sCDiaJCBxB6pwHiRS5TlxOXJOx/CPLQe3oLBHm6NV
-V4Hgw585iFPY3CHO+EezoWVCuDIVlvcnMAHlLYh/kZypvjuuIzizI2l28g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.rowan.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Rowan University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rowan University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rowan.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josh Grochowski</md:GivenName>
-    <md:EmailAddress>grochowski@rowan.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.swmed.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.swmed.edu-idp-shibboleth.xml
deleted file mode 100644
index 2ef566a4..00000000
--- a/swamid-interfederations-2.0/shib2.swmed.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,129 +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://shib2.swmed.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.utsouthwestern.edu/about-us/administrative-offices/information-resources/index.html" 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">utsouthwestern.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas Southwestern Medical Center at Dallas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Logon service for The University of Texas Southwestern Medical Center</mdui:Description>
-        <mdui:Logo height="103" width="75" xml:lang="en">https://idm.utsystem.edu/images/utswmc-logo.jpg</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>
-MIIGkTCCBHmgAwIBAgIJANAN4Fnb5GaDMA0GCSqGSIb3DQEBBQUAMIHeMQswCQYD
-VQQGEwJVUzEOMAwGA1UEEQwFNzUzOTAxCzAJBgNVBAgMAlRYMQ8wDQYDVQQHDAZE
-YWxsYXMxIzAhBgNVBAkMGjUzMjMgSGFycnkgSGluZXMgQm91bGV2YXJkMTwwOgYD
-VQQKDDNUaGUgVW5pdmVyc2l0eSBvZiBUZXhhcyBTb3V0aHdlc3Rlcm4gTWVkaWNh
-bCBDZW50ZXIxJDAiBgNVBAsMG1NvdXRod2VzdGVybiBNZWRpY2FsIENlbnRlcjEY
-MBYGA1UEAwwPc2hpYjIuc3dtZWQuZWR1MB4XDTEyMDEyMDAxMTYzNFoXDTQyMDEx
-OTAxMTYzNFowgd4xCzAJBgNVBAYTAlVTMQ4wDAYDVQQRDAU3NTM5MDELMAkGA1UE
-CAwCVFgxDzANBgNVBAcMBkRhbGxhczEjMCEGA1UECQwaNTMyMyBIYXJyeSBIaW5l
-cyBCb3VsZXZhcmQxPDA6BgNVBAoMM1RoZSBVbml2ZXJzaXR5IG9mIFRleGFzIFNv
-dXRod2VzdGVybiBNZWRpY2FsIENlbnRlcjEkMCIGA1UECwwbU291dGh3ZXN0ZXJu
-IE1lZGljYWwgQ2VudGVyMRgwFgYDVQQDDA9zaGliMi5zd21lZC5lZHUwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDcNVdqUIwdgfkI6tIdk4gIwIXseL5l
-QlVB0YQgvDDLUWJpH9yeN8npeyEMx+IvJJSNm6tNrUKFVGMoEKPqyicrfpsYzsmq
-MNv5bjnkgodFuDiWj5QlWaX1FBSWzf1rllN4JOtXdgwbzx3Z+fbUbzvAIKiOHNeX
-jYcWxdDthVKOr6WVQKehPsEMcsTexSN0CEghDRY4qnsksz35v3zMnSTyVot83Iez
-wTjt6VF7MEpq2ldUwPuwkHxnHOuojpanQFEC7xraKNgQ3r2Eqc4khIvTWhqiKzaC
-t/mn+M1xogYY190/JRtJLAFg4qIQF04GUnFUsIOfelAm18U8wQXPwRCpHV5iP88/
-oToWEZifMcr3xUEh9LEhJkRmpYVETcOB5oZybdjHuXwffdTl10Tpu7aA+caYKmcj
-4CiynmfqcLHnxnpS9l2OcTdXL8XoLr11m9bDMYmXOw382LwaegHyVFySEKTTqM/7
-Bfu4r9SE6RBF2Snnq5olqgsKJ0WWIpDUpP953FYSh+GH3xKl6UrqUCKXKPWedXcv
-JYRSbSrjG4FOUaazxFB582+IvwnwzSsY2PVv9L6RkRB5zPK1vv91CV+q+d+BFf/0
-yRfL1CqO6XQEJQMB2GN8rS/J4zROfnFXoaqtkumhT567K1HxYWN9ww76czEplZ8n
-a5KuDuNthFcEUwIDAQABo1AwTjAdBgNVHQ4EFgQUBxYgsb7kiW+IBSUegJx39Avk
-OmIwHwYDVR0jBBgwFoAUBxYgsb7kiW+IBSUegJx39AvkOmIwDAYDVR0TBAUwAwEB
-/zANBgkqhkiG9w0BAQUFAAOCAgEAVGbYyRckf++odoxwfAZX9a1Xf3K3o2CRaK+p
-0SQkmbI0g57BLIPqJLyGtkNq0skqVvvW7Va7+3UPJExR4FtbHA1KeDqRhkZup4KV
-v5ctXQJuidzNmoHzNzCrxnZiZhLrfD0thfXQvDLgfiYtfrVyMlmj3tUaXYSaMv0X
-GKOmEr2IFP40MlxWQvyCedrs/4ARlGZK9A8MKes/Nz+n5jA3e8T1CNSoilFoENvq
-XZjHIe06eIelPmOzy3j9ReOmluYxjZ8EMhS20628ijocKqS9U/av7XGX05ZhHxin
-7mde1dkl2+Bx05pmm6CBij02PCYd+ucKX1AMgLnbmOFfEGVzwYUgaMs0DN1ThjML
-JV1k03UCYEg+35xYLOyzj0ocIABSZLcttpvDtMEkrhiCIqV2onU7X/qyiSFz078X
-aE6xfqLtIXpLVHiRU7XjMm+UG6rdRa6Yabhty2Hb8h9KPDyGgGPVmizUAi2xRBlL
-O35IIGQHv2FgFQKMjjVRdJjquwzTPQRF8XnE6HlrVXxBF0SQsOQgsfvbl/XXrccQ
-8/+NFFhNY7Wim+HmWt8BBJra51uhSlypF7oLYaDgBIeu7hdOoFqeuQIyHNzdnWZ/
-X4aHLDhWmas7794s9j8vWMaeLdzuc4MVKuUioCoMbx0NFtQtF/yTunNTAvBGlykT
-+3mYgUw=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.swmed.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.swmed.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.swmed.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.swmed.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.swmed.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utsouthwestern.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIGkTCCBHmgAwIBAgIJANAN4Fnb5GaDMA0GCSqGSIb3DQEBBQUAMIHeMQswCQYD
-VQQGEwJVUzEOMAwGA1UEEQwFNzUzOTAxCzAJBgNVBAgMAlRYMQ8wDQYDVQQHDAZE
-YWxsYXMxIzAhBgNVBAkMGjUzMjMgSGFycnkgSGluZXMgQm91bGV2YXJkMTwwOgYD
-VQQKDDNUaGUgVW5pdmVyc2l0eSBvZiBUZXhhcyBTb3V0aHdlc3Rlcm4gTWVkaWNh
-bCBDZW50ZXIxJDAiBgNVBAsMG1NvdXRod2VzdGVybiBNZWRpY2FsIENlbnRlcjEY
-MBYGA1UEAwwPc2hpYjIuc3dtZWQuZWR1MB4XDTEyMDEyMDAxMTYzNFoXDTQyMDEx
-OTAxMTYzNFowgd4xCzAJBgNVBAYTAlVTMQ4wDAYDVQQRDAU3NTM5MDELMAkGA1UE
-CAwCVFgxDzANBgNVBAcMBkRhbGxhczEjMCEGA1UECQwaNTMyMyBIYXJyeSBIaW5l
-cyBCb3VsZXZhcmQxPDA6BgNVBAoMM1RoZSBVbml2ZXJzaXR5IG9mIFRleGFzIFNv
-dXRod2VzdGVybiBNZWRpY2FsIENlbnRlcjEkMCIGA1UECwwbU291dGh3ZXN0ZXJu
-IE1lZGljYWwgQ2VudGVyMRgwFgYDVQQDDA9zaGliMi5zd21lZC5lZHUwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDcNVdqUIwdgfkI6tIdk4gIwIXseL5l
-QlVB0YQgvDDLUWJpH9yeN8npeyEMx+IvJJSNm6tNrUKFVGMoEKPqyicrfpsYzsmq
-MNv5bjnkgodFuDiWj5QlWaX1FBSWzf1rllN4JOtXdgwbzx3Z+fbUbzvAIKiOHNeX
-jYcWxdDthVKOr6WVQKehPsEMcsTexSN0CEghDRY4qnsksz35v3zMnSTyVot83Iez
-wTjt6VF7MEpq2ldUwPuwkHxnHOuojpanQFEC7xraKNgQ3r2Eqc4khIvTWhqiKzaC
-t/mn+M1xogYY190/JRtJLAFg4qIQF04GUnFUsIOfelAm18U8wQXPwRCpHV5iP88/
-oToWEZifMcr3xUEh9LEhJkRmpYVETcOB5oZybdjHuXwffdTl10Tpu7aA+caYKmcj
-4CiynmfqcLHnxnpS9l2OcTdXL8XoLr11m9bDMYmXOw382LwaegHyVFySEKTTqM/7
-Bfu4r9SE6RBF2Snnq5olqgsKJ0WWIpDUpP953FYSh+GH3xKl6UrqUCKXKPWedXcv
-JYRSbSrjG4FOUaazxFB582+IvwnwzSsY2PVv9L6RkRB5zPK1vv91CV+q+d+BFf/0
-yRfL1CqO6XQEJQMB2GN8rS/J4zROfnFXoaqtkumhT567K1HxYWN9ww76czEplZ8n
-a5KuDuNthFcEUwIDAQABo1AwTjAdBgNVHQ4EFgQUBxYgsb7kiW+IBSUegJx39Avk
-OmIwHwYDVR0jBBgwFoAUBxYgsb7kiW+IBSUegJx39AvkOmIwDAYDVR0TBAUwAwEB
-/zANBgkqhkiG9w0BAQUFAAOCAgEAVGbYyRckf++odoxwfAZX9a1Xf3K3o2CRaK+p
-0SQkmbI0g57BLIPqJLyGtkNq0skqVvvW7Va7+3UPJExR4FtbHA1KeDqRhkZup4KV
-v5ctXQJuidzNmoHzNzCrxnZiZhLrfD0thfXQvDLgfiYtfrVyMlmj3tUaXYSaMv0X
-GKOmEr2IFP40MlxWQvyCedrs/4ARlGZK9A8MKes/Nz+n5jA3e8T1CNSoilFoENvq
-XZjHIe06eIelPmOzy3j9ReOmluYxjZ8EMhS20628ijocKqS9U/av7XGX05ZhHxin
-7mde1dkl2+Bx05pmm6CBij02PCYd+ucKX1AMgLnbmOFfEGVzwYUgaMs0DN1ThjML
-JV1k03UCYEg+35xYLOyzj0ocIABSZLcttpvDtMEkrhiCIqV2onU7X/qyiSFz078X
-aE6xfqLtIXpLVHiRU7XjMm+UG6rdRa6Yabhty2Hb8h9KPDyGgGPVmizUAi2xRBlL
-O35IIGQHv2FgFQKMjjVRdJjquwzTPQRF8XnE6HlrVXxBF0SQsOQgsfvbl/XXrccQ
-8/+NFFhNY7Wim+HmWt8BBJra51uhSlypF7oLYaDgBIeu7hdOoFqeuQIyHNzdnWZ/
-X4aHLDhWmas7794s9j8vWMaeLdzuc4MVKuUioCoMbx0NFtQtF/yTunNTAvBGlykT
-+3mYgUw=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.swmed.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas Southwestern Medical Center at Dallas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas Southwestern Medical Center at Dallas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www3.utsouthwestern.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Peter Smith</md:GivenName>
-    <md:EmailAddress>Peter.Smith@UTSouthwestern.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml
deleted file mode 100644
index c03e8446..00000000
--- a/swamid-interfederations-2.0/shib2.to.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,125 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib2.to.cnr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceris.cnr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CNR IRCrES</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">CNR IRCrES</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for CNR IRCrES users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di CNR IRCrES</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://intranet.ircres.cnr.it/IRCRES_80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://intranet.ircres.cnr.it/IRCRES_80x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://intranet.ircres.cnr.it/IRCRES_16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://intranet.ircres.cnr.it/IRCRES_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEkDCCA3igAwIBAgIQA7YHo7zjDDdKW4N5+ddItjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbDELMAkGA1UE
-BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
-bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGDAWBgNVBAMTD3NoaWIyLnRvLmNu
-ci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMo4zqb/PU/AH2Vs
-d1oQAnJpAXHO6OEMutdBGxRRw4np3jjr32Lehd/NsAtUq4GOzbui08cWj/q6C0S9
-kX7soZti+/wggpZt9l5DaQIO9n0cfBo3qvsSZwHY8wfzi6mmkm+uBR1ro67BvHe5
-HoFTgdmmsB2kXPyZTzatC4+0ux0xGEa+3RdrFRe/nH21mVpc5NpRmHnSCDf8XEEJ
-VsbQAJ5IXEOIb7ZqmlhWdKYwJZt/C/tcWHDOl9T5uVQe1SKsNZRPqbbL6HH5LYm8
-e2umiaOk0HIDGlMyQR0U95s3SfAi2GyLulpxKWoE+1VaV/YQc3MB0htH9b6qvNfF
-EbkzNVcCAwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBQJMBh7eDwsje9LkEEtlZu97Y4YvjAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAaBgNVHREEEzARgg9zaGliMi50by5jbnIuaXQwDQYJKoZIhvcNAQEFBQAD
-ggEBAANUFWLXwxPLIukJtShIOBuAFLKmCgRIoJHJEKJqj6SkMG/j3RalS312LPxk
-DGm6OsPSk34AvloSfpUJHeFtrNECpxlcC34jtpGG/uvjC7V1O78o/1KO1ON4966T
-6hbhZ1NWs9VFg+kKDnOni712akqaqNiHqP1C0PMKbOWWRRRgKHe6CpV3BLfJnZCy
-XQ0hJbyzxm5hOhXJdPBwl8V65TrVG+4FBN4iK077+leQWzjvwtyCXuKjoA8CbEUn
-75aNc43eKZdsPVAV7uXumhc4b3eAgh72H+p3SL8/4gU4+EqqdslhzhZqSqpqdl/o
-xLAyzTVSpamrag76ZF4Qye/ENGU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.to.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.to.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.to.cnr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.to.cnr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2.to.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.to.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ceris.cnr.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEkDCCA3igAwIBAgIQA7YHo7zjDDdKW4N5+ddItjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbDELMAkGA1UE
-BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
-bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGDAWBgNVBAMTD3NoaWIyLnRvLmNu
-ci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMo4zqb/PU/AH2Vs
-d1oQAnJpAXHO6OEMutdBGxRRw4np3jjr32Lehd/NsAtUq4GOzbui08cWj/q6C0S9
-kX7soZti+/wggpZt9l5DaQIO9n0cfBo3qvsSZwHY8wfzi6mmkm+uBR1ro67BvHe5
-HoFTgdmmsB2kXPyZTzatC4+0ux0xGEa+3RdrFRe/nH21mVpc5NpRmHnSCDf8XEEJ
-VsbQAJ5IXEOIb7ZqmlhWdKYwJZt/C/tcWHDOl9T5uVQe1SKsNZRPqbbL6HH5LYm8
-e2umiaOk0HIDGlMyQR0U95s3SfAi2GyLulpxKWoE+1VaV/YQc3MB0htH9b6qvNfF
-EbkzNVcCAwEAAaOCAWIwggFeMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBQJMBh7eDwsje9LkEEtlZu97Y4YvjAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAaBgNVHREEEzARgg9zaGliMi50by5jbnIuaXQwDQYJKoZIhvcNAQEFBQAD
-ggEBAANUFWLXwxPLIukJtShIOBuAFLKmCgRIoJHJEKJqj6SkMG/j3RalS312LPxk
-DGm6OsPSk34AvloSfpUJHeFtrNECpxlcC34jtpGG/uvjC7V1O78o/1KO1ON4966T
-6hbhZ1NWs9VFg+kKDnOni712akqaqNiHqP1C0PMKbOWWRRRgKHe6CpV3BLfJnZCy
-XQ0hJbyzxm5hOhXJdPBwl8V65TrVG+4FBN4iK077+leQWzjvwtyCXuKjoA8CbEUn
-75aNc43eKZdsPVAV7uXumhc4b3eAgh72H+p3SL8/4gU4+EqqdslhzhZqSqpqdl/o
-xLAyzTVSpamrag76ZF4Qye/ENGU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.to.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.to.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">CNR IRCrES</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CNR IRCrES</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.ircres.cnr.it/index.php/it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ircres.cnr.it/index.php/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Giancarlo Birello</md:SurName>
-    <md:EmailAddress>mailto:giancarlo.birello@ircres.cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:supporto@to.cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2.utep.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2.utep.edu-idp-shibboleth.xml
deleted file mode 100644
index 60a1d886..00000000
--- a/swamid-interfederations-2.0/shib2.utep.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://shib2.utep.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">utep.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas at El Paso</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Logon service for The University of Texas at El Paso</mdui:Description>
-        <mdui:Logo height="100" width="75" xml:lang="en">https://idm.utsystem.edu/images/utep-logo.jpg</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>
-MIIDIzCCAgugAwIBAgIUSDSYO+BRB2O9LZP6/yb56FSVeZAwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOc2hpYjIudXRlcC5lZHUwHhcNMTAwNDI5MjE1NTM1WhcN
-MzAwNDI5MjE1NTM1WjAZMRcwFQYDVQQDEw5zaGliMi51dGVwLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKhymeRCHrNVP7XIRf3Wkyw3eyONM2cR
-fBrW2d6v5Bdr+4nk7a23BAFi2urLGkQog91KaZ2V6kVkpOn9nxFYzm5xAT3w93De
-SxX2PH5d7WD+7kjREuBx/2OSF0BMTBA6jZxT23WSYLJRkKBN5L8cVDvz/HtvI8dJ
-TcHx+J/K6lSqDwPSjk7ShzOk/MPcIdFUlYY49cvTAReHOUR6pKNuyDU1BRM8AuoF
-7UGEqjLOpz/RitoTkJFwpP/+AM48KIhXC8g/ip/e1uq2yBGnCECI/IQmzxqlrXAz
-qHeNY16jjiVPbIm1BioHFjLpluYCg4dhtxf8Q9rARZ67jF9+vIT7DCUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOc2hpYjIudXRlcC5lZHWGJWh0dHBzOi8vc2hpYjIudXRl
-cC5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOU2rYgczWF4trebCY091BZN
-QnvYMA0GCSqGSIb3DQEBBQUAA4IBAQCdzB7xc9s2vXRBf+fJKpVeuNFFYqM/UMsm
-v4uhGS85yYXXTwyfekfyKPmp0wf0Tl5EAxrR0SxIG5wQU4v+O5SiVzXoq4/ldjH0
-Q+wjgHazX7Z7KzToHcvo8qyzmUREKfzAdCBbfSEaRA1JrzepwsTn0OVKO7BDDYCj
-rOHQE4QHJpgt05WsxsrN5dslpg3NChR90uxgS1SaYvHk2PfLqLsWY0MX438ScgY5
-bFEBNN3InSuW4rFBadZRNZsFgfejnw5apBHDW5EGlZKYrtAHFQCjliAVhOmA711U
-N0vWPiofU45Ka1EWdfwhlEuVQW2UzUcogTJreXpCBhj61gExq6FZ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.utep.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.utep.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib2.utep.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2.utep.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2.utep.edu/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">utep.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUSDSYO+BRB2O9LZP6/yb56FSVeZAwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOc2hpYjIudXRlcC5lZHUwHhcNMTAwNDI5MjE1NTM1WhcN
-MzAwNDI5MjE1NTM1WjAZMRcwFQYDVQQDEw5zaGliMi51dGVwLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKhymeRCHrNVP7XIRf3Wkyw3eyONM2cR
-fBrW2d6v5Bdr+4nk7a23BAFi2urLGkQog91KaZ2V6kVkpOn9nxFYzm5xAT3w93De
-SxX2PH5d7WD+7kjREuBx/2OSF0BMTBA6jZxT23WSYLJRkKBN5L8cVDvz/HtvI8dJ
-TcHx+J/K6lSqDwPSjk7ShzOk/MPcIdFUlYY49cvTAReHOUR6pKNuyDU1BRM8AuoF
-7UGEqjLOpz/RitoTkJFwpP/+AM48KIhXC8g/ip/e1uq2yBGnCECI/IQmzxqlrXAz
-qHeNY16jjiVPbIm1BioHFjLpluYCg4dhtxf8Q9rARZ67jF9+vIT7DCUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOc2hpYjIudXRlcC5lZHWGJWh0dHBzOi8vc2hpYjIudXRl
-cC5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOU2rYgczWF4trebCY091BZN
-QnvYMA0GCSqGSIb3DQEBBQUAA4IBAQCdzB7xc9s2vXRBf+fJKpVeuNFFYqM/UMsm
-v4uhGS85yYXXTwyfekfyKPmp0wf0Tl5EAxrR0SxIG5wQU4v+O5SiVzXoq4/ldjH0
-Q+wjgHazX7Z7KzToHcvo8qyzmUREKfzAdCBbfSEaRA1JrzepwsTn0OVKO7BDDYCj
-rOHQE4QHJpgt05WsxsrN5dslpg3NChR90uxgS1SaYvHk2PfLqLsWY0MX438ScgY5
-bFEBNN3InSuW4rFBadZRNZsFgfejnw5apBHDW5EGlZKYrtAHFQCjliAVhOmA711U
-N0vWPiofU45Ka1EWdfwhlEuVQW2UzUcogTJreXpCBhj61gExq6FZ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2.utep.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2.utep.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas at El Paso</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas at El Paso</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utep.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Gerard Cochrane</md:GivenName>
-    <md:EmailAddress>gdcochrane@utep.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Information Security Office</md:GivenName>
-    <md:EmailAddress>security@utep.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@utep.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2idp-2.rgu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2idp-2.rgu.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index eafefab2..00000000
--- a/swamid-interfederations-2.0/shib2idp-2.rgu.ac.uk-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://shib2idp-2.rgu.ac.uk/idp/shibboleth">
-  <!--
-		This is a test Shibboleth IdP for The Robert Gordon University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-27T13:00:57Z">
-      <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">rgu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEozCCA4ugAwIBAgIRAKWfpZdh7g9wz9mxzKXmeEMwDQYJKoZIhvcNAQELBQAw
-						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-						IENBIDIwHhcNMTUwMjE4MDAwMDAwWhcNMTgwMjE3MjM1OTU5WjBCMSEwHwYDVQQL
-						ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHTAbBgNVBAMTFHNoaWIyaWRwLTIu
-						cmd1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0f5wqUju
-						aXytpxhUvEINWnjJknOJlQCjE5I3b6zLtA19wEjJwPaxfynT6RNyZ6SFB+YLhmY1
-						/jwMQtInvaCvyNwlT12/dgllyCroi8pcHzNk2qIr4oeKuV3Ey+Gu4f6Q3O7r2jIA
-						/ZLasZYEBssdZXibwiIzGMIptXgNpA32G0hZkf4CXOfyXf21YxWaEQUAmNF/kZzx
-						nI/syf/lT3WofFf1Z44xpxY3hvqurxwp+y+pFp3ulJ52NL11BYcpxyucKSNqLvvf
-						aCFLPbhRPXC1l4ZZaNcYt37YRTb7uFzDn/DBZC/WvDaRugpxwAKcNtvlhtyHiXm4
-						idSf1CbxT2C8IQIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
-						G+GGKLD9tr0wHQYDVR0OBBYEFIm+C+W8KETQHZjRFK0SNZLp4bTlMA4GA1UdDwEB
-						/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-						BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-						MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
-						LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
-						cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
-						b2NzcC51c2VydHJ1c3QuY29tMB8GA1UdEQQYMBaCFHNoaWIyaWRwLTIucmd1LmFj
-						LnVrMA0GCSqGSIb3DQEBCwUAA4IBAQB58/SY7DvyV8owwALt0tzRGdeDQ/Mquplz
-						Un9XXTbrFycawmt5bes3zKhCeeRaKk/ZDfM1PbKydYxJlJ+1C7KGxW6eLCNTiKCO
-						yvbjvqG6DSZPq8PBf5V+Z28WTn5z5TPQlfjiqW7NJrDv8wQeDRImflWLNpW4/iu2
-						UD9E6mx+MNBQB3V1ICH9GdlNtmcdBjEIdAqfYQ1XRhVezlsKreHw7U5osiJRutAX
-						KTjfii2gfRVj3nY0/gfyOeGB2zuQbz+npQYHqVzALIrWbFqwvMErl+sww2vN3lcw
-						QJ781d5laJnxYr9a1fWShNVgPZB2fQvl3DglKN/fnRBY6xb96bpV
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp-2.rgu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp-2.rgu.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://shib2idp-2.rgu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2idp-2.rgu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2idp-2.rgu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2idp-2.rgu.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">rgu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEozCCA4ugAwIBAgIRAKWfpZdh7g9wz9mxzKXmeEMwDQYJKoZIhvcNAQELBQAw
-						ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-						CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-						IENBIDIwHhcNMTUwMjE4MDAwMDAwWhcNMTgwMjE3MjM1OTU5WjBCMSEwHwYDVQQL
-						ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHTAbBgNVBAMTFHNoaWIyaWRwLTIu
-						cmd1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0f5wqUju
-						aXytpxhUvEINWnjJknOJlQCjE5I3b6zLtA19wEjJwPaxfynT6RNyZ6SFB+YLhmY1
-						/jwMQtInvaCvyNwlT12/dgllyCroi8pcHzNk2qIr4oeKuV3Ey+Gu4f6Q3O7r2jIA
-						/ZLasZYEBssdZXibwiIzGMIptXgNpA32G0hZkf4CXOfyXf21YxWaEQUAmNF/kZzx
-						nI/syf/lT3WofFf1Z44xpxY3hvqurxwp+y+pFp3ulJ52NL11BYcpxyucKSNqLvvf
-						aCFLPbhRPXC1l4ZZaNcYt37YRTb7uFzDn/DBZC/WvDaRugpxwAKcNtvlhtyHiXm4
-						idSf1CbxT2C8IQIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
-						G+GGKLD9tr0wHQYDVR0OBBYEFIm+C+W8KETQHZjRFK0SNZLp4bTlMA4GA1UdDwEB
-						/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-						BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-						MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
-						LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
-						cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
-						b2NzcC51c2VydHJ1c3QuY29tMB8GA1UdEQQYMBaCFHNoaWIyaWRwLTIucmd1LmFj
-						LnVrMA0GCSqGSIb3DQEBCwUAA4IBAQB58/SY7DvyV8owwALt0tzRGdeDQ/Mquplz
-						Un9XXTbrFycawmt5bes3zKhCeeRaKk/ZDfM1PbKydYxJlJ+1C7KGxW6eLCNTiKCO
-						yvbjvqG6DSZPq8PBf5V+Z28WTn5z5TPQlfjiqW7NJrDv8wQeDRImflWLNpW4/iu2
-						UD9E6mx+MNBQB3V1ICH9GdlNtmcdBjEIdAqfYQ1XRhVezlsKreHw7U5osiJRutAX
-						KTjfii2gfRVj3nY0/gfyOeGB2zuQbz+npQYHqVzALIrWbFqwvMErl+sww2vN3lcw
-						QJ781d5laJnxYr9a1fWShNVgPZB2fQvl3DglKN/fnRBY6xb96bpV
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp-2.rgu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp-2.rgu.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 Robert Gordon University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Robert Gordon University - TEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rgu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Milne</SurName>
-    <EmailAddress>mailto:r.milne@rgu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Cunningham</SurName>
-    <EmailAddress>mailto:m.cunningham@rgu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2idp.ntu.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b4596c1e..00000000
--- a/swamid-interfederations-2.0/shib2idp.ntu.ac.uk-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" entityID="https://shib2idp.ntu.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Nottingham Trent University
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">ntu.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Nottingham Trent University</mdui:DisplayName>
-        <mdui:Logo height="33" width="38">https://shib2idp.ntu.ac.uk/cas/themes/ntu/ntushib-v2.PNG</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFETCCA/mgAwIBAgIUf6ORiSVI2C32bVc/pw0qlk211l4wDQYJKoZIhvcNAQEL
-						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MTEwMzEyMDQy
-						M1oXDTE4MTEwMzEyMDQxOVowgZ0xCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Ob3R0
-						aW5naGFtc2hpcmUxEzARBgNVBAcTCk5PVFRJTkdIQU0xJDAiBgNVBAoTG05vdHRp
-						bmdoYW0gVHJlbnQgVW5pdmVyc2l0eTEcMBoGA1UECxMTSW5mb3JtYXRpb24gU3lz
-						dGVtczEbMBkGA1UEAxMSc2hpYjJpZHAubnR1LmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtn3OZnkj82U1qep4KBD8tMy2A84GtKZj14us/mCz
-						U4JBMQWoBUhihZfhLNErE4EQllz5wUAEDfYYwnclcngY2X6nzgqTJuGmrQLZfukF
-						RPzBfdrQnJGTg/3/dIvCGJ+KfqIt5fGEAwYVpMJaDg6LjBcZSgjmppOocEKVQJyd
-						ZWEZtKp5+PLDIfQ4btrxw1mCOo/ngEGB8owPeFXstxIweC+9XNhJp4c8L2iZEsfy
-						rNSE+0KFb7DI2sdEbFyaDixLSFlX5CY7fhUStPUzMOnhXnl2UR9hdgH8x60zu0iU
-						AIXLx0cs81W+VtX2xgsg42oB/dw/6rfFWT37EmXuJi+cQQIDAQABo4IBljCCAZIw
-						cwYIKwYBBQUHAQEEZzBlMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRp
-						c2dsb2JhbC5jb20wNwYIKwYBBQUHMAKGK2h0dHA6Ly90cnVzdC5xdW92YWRpc2ds
-						b2JhbC5jb20vcXZzc2xnMi5jcnQwHQYDVR0RBBYwFIISc2hpYjJpZHAubnR1LmFj
-						LnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEWKGh0
-						dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0PAQH/
-						BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
-						gBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v
-						Y3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQUdOYX
-						CiIw/0+Pmuy3G+dj7ShaC0kwDQYJKoZIhvcNAQELBQADggEBAEG6I9qcqCWJzXDe
-						YzumSW1UKABfa3lSs8F+7G5cWHPq39C5Eas8+ZUpDytTug6pg2CLn9qWIjW2hstY
-						BuPkFULUL1nmJP8iLiY5YtdfFG9GS7gHAPy9urAAR7i6UMSlqJgfyIHlY6kPxv4+
-						IUHPQC0LVUFzQhHrFkjdBj5IcH1KIT0/b7T8IwovtRDGCyBoXeUr5y7uZjzmVGF4
-						Uq+fiME+67uMhY9TV9ERdn+NiYkxScu/2WSve5ZrsfrwxQTe9FhgYnMDv2JNGSUk
-						Jxl/t3PafEIUbWMpcSWZinaLGZ/2nZ9cRH3fgu45o1co8CjjrDHTGSrWdjhKrmgM
-						fjw7AVA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp.ntu.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://shib2idp.ntu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2idp.ntu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2idp.ntu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2idp.ntu.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">ntu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFETCCA/mgAwIBAgIUf6ORiSVI2C32bVc/pw0qlk211l4wDQYJKoZIhvcNAQEL
-						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MTEwMzEyMDQy
-						M1oXDTE4MTEwMzEyMDQxOVowgZ0xCzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Ob3R0
-						aW5naGFtc2hpcmUxEzARBgNVBAcTCk5PVFRJTkdIQU0xJDAiBgNVBAoTG05vdHRp
-						bmdoYW0gVHJlbnQgVW5pdmVyc2l0eTEcMBoGA1UECxMTSW5mb3JtYXRpb24gU3lz
-						dGVtczEbMBkGA1UEAxMSc2hpYjJpZHAubnR1LmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtn3OZnkj82U1qep4KBD8tMy2A84GtKZj14us/mCz
-						U4JBMQWoBUhihZfhLNErE4EQllz5wUAEDfYYwnclcngY2X6nzgqTJuGmrQLZfukF
-						RPzBfdrQnJGTg/3/dIvCGJ+KfqIt5fGEAwYVpMJaDg6LjBcZSgjmppOocEKVQJyd
-						ZWEZtKp5+PLDIfQ4btrxw1mCOo/ngEGB8owPeFXstxIweC+9XNhJp4c8L2iZEsfy
-						rNSE+0KFb7DI2sdEbFyaDixLSFlX5CY7fhUStPUzMOnhXnl2UR9hdgH8x60zu0iU
-						AIXLx0cs81W+VtX2xgsg42oB/dw/6rfFWT37EmXuJi+cQQIDAQABo4IBljCCAZIw
-						cwYIKwYBBQUHAQEEZzBlMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRp
-						c2dsb2JhbC5jb20wNwYIKwYBBQUHMAKGK2h0dHA6Ly90cnVzdC5xdW92YWRpc2ds
-						b2JhbC5jb20vcXZzc2xnMi5jcnQwHQYDVR0RBBYwFIISc2hpYjJpZHAubnR1LmFj
-						LnVrMFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAEBMDYwNAYIKwYBBQUHAgEWKGh0
-						dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwDgYDVR0PAQH/
-						BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
-						gBSRGWKtWxenMPvw3jklsb2MubhRJzA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8v
-						Y3JsLnF1b3ZhZGlzZ2xvYmFsLmNvbS9xdnNzbGcyLmNybDAdBgNVHQ4EFgQUdOYX
-						CiIw/0+Pmuy3G+dj7ShaC0kwDQYJKoZIhvcNAQELBQADggEBAEG6I9qcqCWJzXDe
-						YzumSW1UKABfa3lSs8F+7G5cWHPq39C5Eas8+ZUpDytTug6pg2CLn9qWIjW2hstY
-						BuPkFULUL1nmJP8iLiY5YtdfFG9GS7gHAPy9urAAR7i6UMSlqJgfyIHlY6kPxv4+
-						IUHPQC0LVUFzQhHrFkjdBj5IcH1KIT0/b7T8IwovtRDGCyBoXeUr5y7uZjzmVGF4
-						Uq+fiME+67uMhY9TV9ERdn+NiYkxScu/2WSve5ZrsfrwxQTe9FhgYnMDv2JNGSUk
-						Jxl/t3PafEIUbWMpcSWZinaLGZ/2nZ9cRH3fgu45o1co8CjjrDHTGSrWdjhKrmgM
-						fjw7AVA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp.ntu.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">Nottingham Trent University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nottingham Trent University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Cross</SurName>
-    <EmailAddress>mailto:richard.cross@ntu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Hallam</SurName>
-    <EmailAddress>mailto:ITSShibbolethTechnical@ntu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shib2idp.rgu.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 485f9590..00000000
--- a/swamid-interfederations-2.0/shib2idp.rgu.ac.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://shib2idp.rgu.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The Robert Gordon University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-15T14:21: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">rgu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEYDCCA0igAwIBAgIJANG+SOhVkyPLMA0GCSqGSIb3DQEBCwUAMIGwMQswCQYD
-						VQQGEwJHQjEWMBQGA1UECBMNQWJlcmRlZW5zaGlyZTERMA8GA1UEBxMIQWJlcmRl
-						ZW4xITAfBgNVBAoTGFJvYmVydCBHb3Jkb24gVW5pdmVyc2l0eTEUMBIGA1UECxML
-						SVQgU2VydmljZXMxGzAZBgNVBAMTEnNoaWIyaWRwLnJndS5hYy51azEgMB4GCSqG
-						SIb3DQEJARYRaXRzLXN5c0ByZ3UuYWMudWswHhcNMTUwNzAxMDY1OTQzWhcNMjUw
-						NjI4MDY1OTQzWjCBsDELMAkGA1UEBhMCR0IxFjAUBgNVBAgTDUFiZXJkZWVuc2hp
-						cmUxETAPBgNVBAcTCEFiZXJkZWVuMSEwHwYDVQQKExhSb2JlcnQgR29yZG9uIFVu
-						aXZlcnNpdHkxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRswGQYDVQQDExJzaGliMmlk
-						cC5yZ3UuYWMudWsxIDAeBgkqhkiG9w0BCQEWEWl0cy1zeXNAcmd1LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtlnIv3WseSau1bSwKYgWnl3w
-						W4A510yAe4EVHxCDXPbblHFmZwjN3F1Elw56e1LlSwhS4zS25R/cfjrH4NPqsTqD
-						5TWHmmTaduonCdzVhqJ9do9hLcFrfkCSGwJGswKGutbphOvcG2tvRCt/BBtxf5yu
-						I2D/cZ1jwJoURJe1X+r2d0HyjU23wlG9ImY8VLHTLjndQAPWddnvSySTrCNagfDB
-						KQU8vWEQomm4griv1CFs205eqWBriZjoyt/i8q3XY+smafZ1sRR90YoidYGK0FbU
-						BiyOfsTgE++GBTXQzGPf+pIN5U8GD8PxgTNal6ncKps1hiquqQGlLCJ3pybMsQID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUoPahtUqnvLSmYMgVnP2s16wxXpUw
-						HwYDVR0jBBgwFoAUoPahtUqnvLSmYMgVnP2s16wxXpUwDQYJKoZIhvcNAQELBQAD
-						ggEBAEsrmXShp2e+MEVSjpWYYTh2Yj45DBeHJVpBlJzkeb7UB1EViBa0O4DPojh0
-						PFjmkfCIAvoCQAF3BL8j92DL+ltQOWZ3bnUTePUrGzN6RAXC5Qcv8HzSM77t3Cm9
-						StUmTfcMp0Y5Ij7nHQdllzQND4nYp2OOhcWxn1cbPGHWl5tORBKVC3CacgY34H4g
-						nqpHZyD+ngZtpCdGUmqpndD5+H+l0s91nm00akyYxFuRCpm6c97Tf5BfADtAumVY
-						Xz2bbxGztusvVUYAr75X+daVeh+/9N9SEybqeOuk99VSHBDwwaVkFiul2LzZRi0V
-						XyNCrBFWNSC7s6MHLPcmlrG8YdY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp.rgu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp.rgu.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://shiblogin.rgu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.rgu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shiblogin.rgu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.rgu.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">rgu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEYDCCA0igAwIBAgIJANG+SOhVkyPLMA0GCSqGSIb3DQEBCwUAMIGwMQswCQYD
-						VQQGEwJHQjEWMBQGA1UECBMNQWJlcmRlZW5zaGlyZTERMA8GA1UEBxMIQWJlcmRl
-						ZW4xITAfBgNVBAoTGFJvYmVydCBHb3Jkb24gVW5pdmVyc2l0eTEUMBIGA1UECxML
-						SVQgU2VydmljZXMxGzAZBgNVBAMTEnNoaWIyaWRwLnJndS5hYy51azEgMB4GCSqG
-						SIb3DQEJARYRaXRzLXN5c0ByZ3UuYWMudWswHhcNMTUwNzAxMDY1OTQzWhcNMjUw
-						NjI4MDY1OTQzWjCBsDELMAkGA1UEBhMCR0IxFjAUBgNVBAgTDUFiZXJkZWVuc2hp
-						cmUxETAPBgNVBAcTCEFiZXJkZWVuMSEwHwYDVQQKExhSb2JlcnQgR29yZG9uIFVu
-						aXZlcnNpdHkxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRswGQYDVQQDExJzaGliMmlk
-						cC5yZ3UuYWMudWsxIDAeBgkqhkiG9w0BCQEWEWl0cy1zeXNAcmd1LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtlnIv3WseSau1bSwKYgWnl3w
-						W4A510yAe4EVHxCDXPbblHFmZwjN3F1Elw56e1LlSwhS4zS25R/cfjrH4NPqsTqD
-						5TWHmmTaduonCdzVhqJ9do9hLcFrfkCSGwJGswKGutbphOvcG2tvRCt/BBtxf5yu
-						I2D/cZ1jwJoURJe1X+r2d0HyjU23wlG9ImY8VLHTLjndQAPWddnvSySTrCNagfDB
-						KQU8vWEQomm4griv1CFs205eqWBriZjoyt/i8q3XY+smafZ1sRR90YoidYGK0FbU
-						BiyOfsTgE++GBTXQzGPf+pIN5U8GD8PxgTNal6ncKps1hiquqQGlLCJ3pybMsQID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUoPahtUqnvLSmYMgVnP2s16wxXpUw
-						HwYDVR0jBBgwFoAUoPahtUqnvLSmYMgVnP2s16wxXpUwDQYJKoZIhvcNAQELBQAD
-						ggEBAEsrmXShp2e+MEVSjpWYYTh2Yj45DBeHJVpBlJzkeb7UB1EViBa0O4DPojh0
-						PFjmkfCIAvoCQAF3BL8j92DL+ltQOWZ3bnUTePUrGzN6RAXC5Qcv8HzSM77t3Cm9
-						StUmTfcMp0Y5Ij7nHQdllzQND4nYp2OOhcWxn1cbPGHWl5tORBKVC3CacgY34H4g
-						nqpHZyD+ngZtpCdGUmqpndD5+H+l0s91nm00akyYxFuRCpm6c97Tf5BfADtAumVY
-						Xz2bbxGztusvVUYAr75X+daVeh+/9N9SEybqeOuk99VSHBDwwaVkFiul2LzZRi0V
-						XyNCrBFWNSC7s6MHLPcmlrG8YdY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib2idp.rgu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2idp.rgu.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 Robert Gordon University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Robert Gordon University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rgu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Milne</SurName>
-    <EmailAddress>mailto:r.milne@rgu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Cunningham</SurName>
-    <EmailAddress>mailto:m.cunningham@rgu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shib2sp.ntu.ac.uk-shibboleth.xml
deleted file mode 100644
index b58d05a1..00000000
--- a/swamid-interfederations-2.0/shib2sp.ntu.ac.uk-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://shib2sp.ntu.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2.3.1 SP for Nottingham Trent University
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://shib2sp.ntu.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAJo8E70ZFlUHMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3NoaWIyc3AwHhcNMTAwNTE3MDk0MjM5WhcNMjAwNTE0MDk0MjM5WjASMRAw
-						DgYDVQQDEwdzaGliMnNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						wdIcqfW5diwfvyCH6wQhCg9/foLi7OgVOsxPag90eS2QTU1+AXjRpXPo7SWF8L6s
-						vPbnWuBNb6ygxNtSgou9dq1+s9/Ib5JeDNfJYF0HmcXme72xdqkRlLNd+AM1pWie
-						ww6+pTJRognTl8Kvahr9OWmF8WsmnTpktC4sKzOalchrTt+FoEJotyN/b4Eo7XI3
-						6IFsW8UkX9Fgq0A2RC99URx3eJoeJ+tBaWAkarGCvpzRt4EL9htAui+oeiRRldKV
-						VY2WlIJC6v8ay9cnqmhMwk/jhx9uyNmFIP49pFinhJiZ9MkOhJHDdVYuDmp9covj
-						YXyaBJIPeEbvHovSzcaKEwIDAQABozUwMzASBgNVHREECzAJggdzaGliMnNwMB0G
-						A1UdDgQWBBQz/l71WUEnWuQoGlxqcvps54wrbTANBgkqhkiG9w0BAQUFAAOCAQEA
-						OSvTiwxS1HnSyTRzmBtU2AL8w/IhO7XHYbMQpaaMYDSrQs8ajxDpUOjOuvXv5g+I
-						d9kncKZzuE4IJ1OmdzcsrJ0eETDjujPI0b5smxOoBWNJxl3KKKeJybpJVMFkTA0z
-						yLyymq/nf23QG76qVbUDr6GsJO2RDgX6h1OfUhBzEzGW59TQRoqKyvWqPuCNp4lU
-						os1OGZMyq8k9K5S1yIrNqmxI+TI/+aG1QXGKqGy0uhOHGEa0mClLrFBUVGEpoi2L
-						x5BCvr49YvlqB+HeIWj+ZmcF8e+8yYKceVaZ67yVFCkZMcHp/CkVY7V1hLX8mHki
-						4lcfxOKtZ+Rx/ai+73mSLQ==
-					</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>
-						MIIC3DCCAcSgAwIBAgIJAJo8E70ZFlUHMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3NoaWIyc3AwHhcNMTAwNTE3MDk0MjM5WhcNMjAwNTE0MDk0MjM5WjASMRAw
-						DgYDVQQDEwdzaGliMnNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						wdIcqfW5diwfvyCH6wQhCg9/foLi7OgVOsxPag90eS2QTU1+AXjRpXPo7SWF8L6s
-						vPbnWuBNb6ygxNtSgou9dq1+s9/Ib5JeDNfJYF0HmcXme72xdqkRlLNd+AM1pWie
-						ww6+pTJRognTl8Kvahr9OWmF8WsmnTpktC4sKzOalchrTt+FoEJotyN/b4Eo7XI3
-						6IFsW8UkX9Fgq0A2RC99URx3eJoeJ+tBaWAkarGCvpzRt4EL9htAui+oeiRRldKV
-						VY2WlIJC6v8ay9cnqmhMwk/jhx9uyNmFIP49pFinhJiZ9MkOhJHDdVYuDmp9covj
-						YXyaBJIPeEbvHovSzcaKEwIDAQABozUwMzASBgNVHREECzAJggdzaGliMnNwMB0G
-						A1UdDgQWBBQz/l71WUEnWuQoGlxqcvps54wrbTANBgkqhkiG9w0BAQUFAAOCAQEA
-						OSvTiwxS1HnSyTRzmBtU2AL8w/IhO7XHYbMQpaaMYDSrQs8ajxDpUOjOuvXv5g+I
-						d9kncKZzuE4IJ1OmdzcsrJ0eETDjujPI0b5smxOoBWNJxl3KKKeJybpJVMFkTA0z
-						yLyymq/nf23QG76qVbUDr6GsJO2RDgX6h1OfUhBzEzGW59TQRoqKyvWqPuCNp4lU
-						os1OGZMyq8k9K5S1yIrNqmxI+TI/+aG1QXGKqGy0uhOHGEa0mClLrFBUVGEpoi2L
-						x5BCvr49YvlqB+HeIWj+ZmcF8e+8yYKceVaZ67yVFCkZMcHp/CkVY7V1hLX8mHki
-						4lcfxOKtZ+Rx/ai+73mSLQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib2sp.ntu.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Nottingham Trent University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nottingham Trent University: Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Cross</SurName>
-    <EmailAddress>mailto:richard.cross@ntu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Hallam</SurName>
-    <EmailAddress>mailto:ITSShibbolethTechnical@ntu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb-idp.cymoedd.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb-idp.cymoedd.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 3aecf8b5..00000000
--- a/swamid-interfederations-2.0/shibb-idp.cymoedd.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://shibb-idp.cymoedd.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Coleg y Cymoedd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-20T15:44:06Z">
-      <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">cymoedd.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Coleg y Cymoedd</mdui:DisplayName>
-        <mdui:Logo height="40" width="80">https://sam.cymoedd.ac.uk/shibbolethlogos/cymoeddlogo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://sam.cymoedd.ac.uk/shibbolethlogos/cymoeddlogo.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIULRO7ZHUs0SJDRM62ZW0iCOUY4fQwDQYJKoZIhvcNAQEF
-						BQAwIjEgMB4GA1UEAxMXc2hpYmItaWRwLmN5bW9lZGQuYWMudWswHhcNMTMxMjE4
-						MTMyNTQ2WhcNMzMxMjE4MTMyNTQ2WjAiMSAwHgYDVQQDExdzaGliYi1pZHAuY3lt
-						b2VkZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALC7lzGf
-						WahC/hN3q1zfeZNpJQHnhPrxXWw9VZ5IJ6YZtk88fKlV6dPp1SAUPS4bq0FcjJ/3
-						8Pue5g9qIFS1q9xrBnYZzmaQhNxZRyYBc7KRQW9PaxUgGZ70GzYu1hQ/dPv4J7jd
-						+Y1RjDAu/Z1WbsFFUZD3eJjmZw5OKDmQ/fWAWTMt8jMN7D8RG5Fu9/qTCpskNlPK
-						CXO8md73Khe8Gj/0lrxv46e36AtFNEaU70Gta2pGAyRmYjrqEshADb8m1swPWRgH
-						kL0bLR8VAw+QMu27wID1uE1InC4lGL7lYm3l98+2IN+pA0t2BGdBywBcpyKWGKL1
-						GC/lpoa7+tEcwxUCAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmItaWRwLmN5bW9l
-						ZGQuYWMudWuGLmh0dHBzOi8vc2hpYmItaWRwLmN5bW9lZGQuYWMudWsvaWRwL3No
-						aWJib2xldGgwHQYDVR0OBBYEFGV/KcZ9mmkWUCs5f8fBqJPndCu/MA0GCSqGSIb3
-						DQEBBQUAA4IBAQAVU8CEJc6dLNj3fs3Ec+hBH5YZcHHe8nMS1SZY0y8lM+os3n2/
-						7HRf3c9z1sFRNW44cAcnIpAu2nRlHrE5dk/EiL473wzZQ3vRMqbQR15FKRJvgMoH
-						AHSzhYPddx22CM/y9YDphk+LDM+DGVMmINO2Uc2BYnD3f+AefKfUuNCLvhXrY27R
-						jhEtJPVTHnkMndHjGw4cWPO0F6Ve9Ta6ztDhdfYyUrEF2lr6qD+8ujpDMl5ngI7T
-						ZFTP7dCtcvT15Mg9ASKN2e6jNKbZm5YaAPPY8NJMZ88jcCvqk6t/r+qD1OU8fcFM
-						lBlhGNippVT4jOwxY47G+V1Xc7aPz6F/X6Tm
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.cymoedd.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://shibb-idp.cymoedd.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb-idp.cymoedd.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-idp.cymoedd.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">cymoedd.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIULRO7ZHUs0SJDRM62ZW0iCOUY4fQwDQYJKoZIhvcNAQEF
-						BQAwIjEgMB4GA1UEAxMXc2hpYmItaWRwLmN5bW9lZGQuYWMudWswHhcNMTMxMjE4
-						MTMyNTQ2WhcNMzMxMjE4MTMyNTQ2WjAiMSAwHgYDVQQDExdzaGliYi1pZHAuY3lt
-						b2VkZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALC7lzGf
-						WahC/hN3q1zfeZNpJQHnhPrxXWw9VZ5IJ6YZtk88fKlV6dPp1SAUPS4bq0FcjJ/3
-						8Pue5g9qIFS1q9xrBnYZzmaQhNxZRyYBc7KRQW9PaxUgGZ70GzYu1hQ/dPv4J7jd
-						+Y1RjDAu/Z1WbsFFUZD3eJjmZw5OKDmQ/fWAWTMt8jMN7D8RG5Fu9/qTCpskNlPK
-						CXO8md73Khe8Gj/0lrxv46e36AtFNEaU70Gta2pGAyRmYjrqEshADb8m1swPWRgH
-						kL0bLR8VAw+QMu27wID1uE1InC4lGL7lYm3l98+2IN+pA0t2BGdBywBcpyKWGKL1
-						GC/lpoa7+tEcwxUCAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmItaWRwLmN5bW9l
-						ZGQuYWMudWuGLmh0dHBzOi8vc2hpYmItaWRwLmN5bW9lZGQuYWMudWsvaWRwL3No
-						aWJib2xldGgwHQYDVR0OBBYEFGV/KcZ9mmkWUCs5f8fBqJPndCu/MA0GCSqGSIb3
-						DQEBBQUAA4IBAQAVU8CEJc6dLNj3fs3Ec+hBH5YZcHHe8nMS1SZY0y8lM+os3n2/
-						7HRf3c9z1sFRNW44cAcnIpAu2nRlHrE5dk/EiL473wzZQ3vRMqbQR15FKRJvgMoH
-						AHSzhYPddx22CM/y9YDphk+LDM+DGVMmINO2Uc2BYnD3f+AefKfUuNCLvhXrY27R
-						jhEtJPVTHnkMndHjGw4cWPO0F6Ve9Ta6ztDhdfYyUrEF2lr6qD+8ujpDMl5ngI7T
-						ZFTP7dCtcvT15Mg9ASKN2e6jNKbZm5YaAPPY8NJMZ88jcCvqk6t/r+qD1OU8fcFM
-						lBlhGNippVT4jOwxY47G+V1Xc7aPz6F/X6Tm
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.cymoedd.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.cymoedd.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">Coleg y Cymoedd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Coleg y Cymoedd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cymoedd.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Joseph</SurName>
-    <EmailAddress>mailto:Chris.Joseph@cymoedd.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Joseph</SurName>
-    <EmailAddress>mailto:Chris.Joseph@cymoedd.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb-idp.georgetown.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb-idp.georgetown.edu-idp-shibboleth.xml
deleted file mode 100644
index d8f64a51..00000000
--- a/swamid-interfederations-2.0/shibb-idp.georgetown.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://shibb-idp.georgetown.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">georgetown.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Georgetown University</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>
-MIIDTDCCAjSgAwIBAgIVAK6Lh23lIaSgXAUl1GG/B1nM7SKjMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJiLWlkcC5nZW9yZ2V0b3duLmVkdTAeFw0xMDA2
-MTQxNjExNDZaFw0zMDA2MTQxNjExNDZaMCMxITAfBgNVBAMTGHNoaWJiLWlkcC5n
-ZW9yZ2V0b3duLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2M
-e3cdBys92wVfMQTi0oOQ0Uw3ltBc0Z9vDj3QURI0DKUtQ/z12O3pxMVW0U9mW9At
-0S4x1s7DrffOwt0wzVN0bifN8mTYtJDUGw3twOkJDmrq6MXDwhQfkLX54DE1pR85
-8YT3G4WzS6V6+4xxFMH2nj6SijthfuOuIKAPi8oVLBI6CFpiNSJgOeSuQ2Wc2ogn
-8D4b6B0ZyMH/j5h1XZ/pj7qtrFJ5hqnbeJ/DQipOpYlN33r1M03Ei+3/MAIjyi9h
-/VujG67p4fxoTBCwkJPUJH9idLX47oZmLlJZveDIJRhWreJJXXFxchzUNy1PPwla
-k28u8K9mqtwDAvGx4D0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmItaWRwLmdl
-b3JnZXRvd24uZWR1hi9odHRwczovL3NoaWJiLWlkcC5nZW9yZ2V0b3duLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUFW8gLtaVr67EZZmKF4ol5UdfXRQwDQYJ
-KoZIhvcNAQEFBQADggEBAJUOvjBsszXQ79hD+YEUT208kj3bynbRITPVBiXQJZgc
-+1MT6wrmZpPCt/oKDHU6H8peXSCIwmwpNs1Ldcgunf0eSr1XGoCAn+KY+IdRJtuN
-hs+KCuNVNehLQzBRtO67HkPlVBVHEpxIoARZDUR6oLixZPNMKiFuAgdsySCz43W0
-cupokw76fdO6ik8BtdIUWzCoN5vpH94hg8QTW4BLg7Gh7ZXy6ymHytKCZqkgaoUk
-qeQASM800x93B3n6jr1GEq3m6r+MLEkVBlDmymZG9CWGBY6UOUsJt9U4Xe/r1DDI
-QN6kfDHIlXFhLmKYCtzxMjBf7TziEOIt2ZYrKM6CRI8=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.georgetown.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.georgetown.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-idp.georgetown.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-idp.georgetown.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-idp.georgetown.edu/idp/profile/Shibboleth/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">georgetown.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIVAK6Lh23lIaSgXAUl1GG/B1nM7SKjMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJiLWlkcC5nZW9yZ2V0b3duLmVkdTAeFw0xMDA2
-MTQxNjExNDZaFw0zMDA2MTQxNjExNDZaMCMxITAfBgNVBAMTGHNoaWJiLWlkcC5n
-ZW9yZ2V0b3duLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2M
-e3cdBys92wVfMQTi0oOQ0Uw3ltBc0Z9vDj3QURI0DKUtQ/z12O3pxMVW0U9mW9At
-0S4x1s7DrffOwt0wzVN0bifN8mTYtJDUGw3twOkJDmrq6MXDwhQfkLX54DE1pR85
-8YT3G4WzS6V6+4xxFMH2nj6SijthfuOuIKAPi8oVLBI6CFpiNSJgOeSuQ2Wc2ogn
-8D4b6B0ZyMH/j5h1XZ/pj7qtrFJ5hqnbeJ/DQipOpYlN33r1M03Ei+3/MAIjyi9h
-/VujG67p4fxoTBCwkJPUJH9idLX47oZmLlJZveDIJRhWreJJXXFxchzUNy1PPwla
-k28u8K9mqtwDAvGx4D0CAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmItaWRwLmdl
-b3JnZXRvd24uZWR1hi9odHRwczovL3NoaWJiLWlkcC5nZW9yZ2V0b3duLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUFW8gLtaVr67EZZmKF4ol5UdfXRQwDQYJ
-KoZIhvcNAQEFBQADggEBAJUOvjBsszXQ79hD+YEUT208kj3bynbRITPVBiXQJZgc
-+1MT6wrmZpPCt/oKDHU6H8peXSCIwmwpNs1Ldcgunf0eSr1XGoCAn+KY+IdRJtuN
-hs+KCuNVNehLQzBRtO67HkPlVBVHEpxIoARZDUR6oLixZPNMKiFuAgdsySCz43W0
-cupokw76fdO6ik8BtdIUWzCoN5vpH94hg8QTW4BLg7Gh7ZXy6ymHytKCZqkgaoUk
-qeQASM800x93B3n6jr1GEq3m6r+MLEkVBlDmymZG9CWGBY6UOUsJt9U4Xe/r1DDI
-QN6kfDHIlXFhLmKYCtzxMjBf7TziEOIt2ZYrKM6CRI8=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.georgetown.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.georgetown.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Georgetown University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Georgetown University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.georgetown.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Marty Johnson</md:GivenName>
-    <md:EmailAddress>es-collaboration@georgetown.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Suresh Veliveli</md:GivenName>
-    <md:EmailAddress>es-collaboration@georgetown.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Service Desk</md:GivenName>
-    <md:EmailAddress>help@georgetown.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>University Information Security Officer</md:GivenName>
-    <md:EmailAddress>security@georgetown.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb-idp.hs-weingarten.de.xml b/swamid-interfederations-2.0/shibb-idp.hs-weingarten.de.xml
deleted file mode 100644
index 2ab839d2..00000000
--- a/swamid-interfederations-2.0/shibb-idp.hs-weingarten.de.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb-idp.hs-weingarten.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-weingarten.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb-idp.hs-weingarten.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb-idp.hs-weingarten.de,O=Hochschule Ravensburg-Weingarten,L=Weingarten,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEDv1KbDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
-RTEpMCcGA1UEChMgSG9jaHNjaHVsZSBSYXZlbnNidXJnLVdlaW5nYXJ0ZW4xFjAU
-BgNVBAMTDUhTLVdHVC1DQS1HMDIxKTAnBgkqhkiG9w0BCQEWGmhzLXdndC1jYUBo
-cy13ZWluZ2FydGVuLmRlMB4XDTA5MTAyMDE0NDQ0NFoXDTE0MTAxOTE0NDQ0NFow
-gY8xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzAR
-BgNVBAcTCldlaW5nYXJ0ZW4xKTAnBgNVBAoTIEhvY2hzY2h1bGUgUmF2ZW5zYnVy
-Zy1XZWluZ2FydGVuMSMwIQYDVQQDExpzaGliYi1pZHAuaHMtd2VpbmdhcnRlbi5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5WTGDKpvzEhYNM5v1F
-iESicJ3Hwnc6rnsn2VfQs4JbKqE6n26pj8xi03r4nwKJmhIES1cdmcSegbjQ7LdA
-p/3ibfAUvvXWkvSei9DTpdvbers5JQPZHLHKGmAFt96CYE4Dtr++S7nG1TiD6483
-5XZ84le+u2f0i9TN4W1VQlvivaeyBazETgwO0XSLQ5zV48qC/HcDqBR7YRXYvL+u
-lQB5/AXt0J7L4etLXhSV+FYq/tTlheafiFqURJYih1xPIyW2ajfWYdob+l1oT5ws
-Si3snj8fhm1fvBm+eV21seHbb3igtimcag4UhLQTi7JIsHk9ZML5V0S2/5YXVHZj
-2SECAwEAAaOCAcIwggG+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUYzOVTdenMixAH/5DOhP2
-8Q7M0LkwHwYDVR0jBBgwFoAUxK2bKM2xJvrKq56g+w6Nb74aWvAwIgYDVR0RBBsw
-GYEXZXJkb2VzQGhzLXdlaW5nYXJ0ZW4uZGUwgYEGA1UdHwR6MHgwOqA4oDaGNGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwOqA4oDaGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwgZwGCCsGAQUFBwEBBIGPMIGMMEQGCCsGAQUFBzAChjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXdndC1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy13
-Z3QtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AGFGvoZxqW37SnxgPxWPsPSJSDLNHOsqepPUcmyYAf6InAuouePQOLJj9knZbhii
-CLESL0+XHlLCldzv3ZCwMdDCObfqQOBa112JjysacAJeaw9dA1B/W/ShmMneH4j/
-I2udFZt5d4vdbTJfo87F0TW/gUu8QPUY7N9EjTf+a0aAf98LkJP8BTc/SaBvLYqR
-GxwzSBWHvNW3xJJHxBqx+UFDMbKlgbM+o3x/rqg9iXGo5OFUnPdFiktbp0ADbUGI
-IgJCrn+bP6DzVTqIUA82wEZTD/StUG+un/TeXnZYoR+OZX3YEWzkZSvXB4fRZg7o
-H3lgjwLUApbZq/qieYKqmBs=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb-idp.hs-weingarten.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb-idp.hs-weingarten.de,O=Hochschule Ravensburg-Weingarten,L=Weingarten,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEDv1KbDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
-RTEpMCcGA1UEChMgSG9jaHNjaHVsZSBSYXZlbnNidXJnLVdlaW5nYXJ0ZW4xFjAU
-BgNVBAMTDUhTLVdHVC1DQS1HMDIxKTAnBgkqhkiG9w0BCQEWGmhzLXdndC1jYUBo
-cy13ZWluZ2FydGVuLmRlMB4XDTA5MTAyMDE0NDQ0NFoXDTE0MTAxOTE0NDQ0NFow
-gY8xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzAR
-BgNVBAcTCldlaW5nYXJ0ZW4xKTAnBgNVBAoTIEhvY2hzY2h1bGUgUmF2ZW5zYnVy
-Zy1XZWluZ2FydGVuMSMwIQYDVQQDExpzaGliYi1pZHAuaHMtd2VpbmdhcnRlbi5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5WTGDKpvzEhYNM5v1F
-iESicJ3Hwnc6rnsn2VfQs4JbKqE6n26pj8xi03r4nwKJmhIES1cdmcSegbjQ7LdA
-p/3ibfAUvvXWkvSei9DTpdvbers5JQPZHLHKGmAFt96CYE4Dtr++S7nG1TiD6483
-5XZ84le+u2f0i9TN4W1VQlvivaeyBazETgwO0XSLQ5zV48qC/HcDqBR7YRXYvL+u
-lQB5/AXt0J7L4etLXhSV+FYq/tTlheafiFqURJYih1xPIyW2ajfWYdob+l1oT5ws
-Si3snj8fhm1fvBm+eV21seHbb3igtimcag4UhLQTi7JIsHk9ZML5V0S2/5YXVHZj
-2SECAwEAAaOCAcIwggG+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUYzOVTdenMixAH/5DOhP2
-8Q7M0LkwHwYDVR0jBBgwFoAUxK2bKM2xJvrKq56g+w6Nb74aWvAwIgYDVR0RBBsw
-GYEXZXJkb2VzQGhzLXdlaW5nYXJ0ZW4uZGUwgYEGA1UdHwR6MHgwOqA4oDaGNGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwOqA4oDaGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwgZwGCCsGAQUFBwEBBIGPMIGMMEQGCCsGAQUFBzAChjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXdndC1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy13
-Z3QtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AGFGvoZxqW37SnxgPxWPsPSJSDLNHOsqepPUcmyYAf6InAuouePQOLJj9knZbhii
-CLESL0+XHlLCldzv3ZCwMdDCObfqQOBa112JjysacAJeaw9dA1B/W/ShmMneH4j/
-I2udFZt5d4vdbTJfo87F0TW/gUu8QPUY7N9EjTf+a0aAf98LkJP8BTc/SaBvLYqR
-GxwzSBWHvNW3xJJHxBqx+UFDMbKlgbM+o3x/rqg9iXGo5OFUnPdFiktbp0ADbUGI
-IgJCrn+bP6DzVTqIUA82wEZTD/StUG+un/TeXnZYoR+OZX3YEWzkZSvXB4fRZg7o
-H3lgjwLUApbZq/qieYKqmBs=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.hs-weingarten.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.hs-weingarten.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-idp.hs-weingarten.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb-idp.hs-weingarten.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb-idp.hs-weingarten.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-idp.hs-weingarten.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hs-weingarten.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb-idp.hs-weingarten.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb-idp.hs-weingarten.de,O=Hochschule Ravensburg-Weingarten,L=Weingarten,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEDv1KbDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
-RTEpMCcGA1UEChMgSG9jaHNjaHVsZSBSYXZlbnNidXJnLVdlaW5nYXJ0ZW4xFjAU
-BgNVBAMTDUhTLVdHVC1DQS1HMDIxKTAnBgkqhkiG9w0BCQEWGmhzLXdndC1jYUBo
-cy13ZWluZ2FydGVuLmRlMB4XDTA5MTAyMDE0NDQ0NFoXDTE0MTAxOTE0NDQ0NFow
-gY8xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzAR
-BgNVBAcTCldlaW5nYXJ0ZW4xKTAnBgNVBAoTIEhvY2hzY2h1bGUgUmF2ZW5zYnVy
-Zy1XZWluZ2FydGVuMSMwIQYDVQQDExpzaGliYi1pZHAuaHMtd2VpbmdhcnRlbi5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5WTGDKpvzEhYNM5v1F
-iESicJ3Hwnc6rnsn2VfQs4JbKqE6n26pj8xi03r4nwKJmhIES1cdmcSegbjQ7LdA
-p/3ibfAUvvXWkvSei9DTpdvbers5JQPZHLHKGmAFt96CYE4Dtr++S7nG1TiD6483
-5XZ84le+u2f0i9TN4W1VQlvivaeyBazETgwO0XSLQ5zV48qC/HcDqBR7YRXYvL+u
-lQB5/AXt0J7L4etLXhSV+FYq/tTlheafiFqURJYih1xPIyW2ajfWYdob+l1oT5ws
-Si3snj8fhm1fvBm+eV21seHbb3igtimcag4UhLQTi7JIsHk9ZML5V0S2/5YXVHZj
-2SECAwEAAaOCAcIwggG+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUYzOVTdenMixAH/5DOhP2
-8Q7M0LkwHwYDVR0jBBgwFoAUxK2bKM2xJvrKq56g+w6Nb74aWvAwIgYDVR0RBBsw
-GYEXZXJkb2VzQGhzLXdlaW5nYXJ0ZW4uZGUwgYEGA1UdHwR6MHgwOqA4oDaGNGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwOqA4oDaGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwgZwGCCsGAQUFBwEBBIGPMIGMMEQGCCsGAQUFBzAChjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXdndC1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy13
-Z3QtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AGFGvoZxqW37SnxgPxWPsPSJSDLNHOsqepPUcmyYAf6InAuouePQOLJj9knZbhii
-CLESL0+XHlLCldzv3ZCwMdDCObfqQOBa112JjysacAJeaw9dA1B/W/ShmMneH4j/
-I2udFZt5d4vdbTJfo87F0TW/gUu8QPUY7N9EjTf+a0aAf98LkJP8BTc/SaBvLYqR
-GxwzSBWHvNW3xJJHxBqx+UFDMbKlgbM+o3x/rqg9iXGo5OFUnPdFiktbp0ADbUGI
-IgJCrn+bP6DzVTqIUA82wEZTD/StUG+un/TeXnZYoR+OZX3YEWzkZSvXB4fRZg7o
-H3lgjwLUApbZq/qieYKqmBs=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb-idp.hs-weingarten.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb-idp.hs-weingarten.de,O=Hochschule Ravensburg-Weingarten,L=Weingarten,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIEDv1KbDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
-RTEpMCcGA1UEChMgSG9jaHNjaHVsZSBSYXZlbnNidXJnLVdlaW5nYXJ0ZW4xFjAU
-BgNVBAMTDUhTLVdHVC1DQS1HMDIxKTAnBgkqhkiG9w0BCQEWGmhzLXdndC1jYUBo
-cy13ZWluZ2FydGVuLmRlMB4XDTA5MTAyMDE0NDQ0NFoXDTE0MTAxOTE0NDQ0NFow
-gY8xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEzAR
-BgNVBAcTCldlaW5nYXJ0ZW4xKTAnBgNVBAoTIEhvY2hzY2h1bGUgUmF2ZW5zYnVy
-Zy1XZWluZ2FydGVuMSMwIQYDVQQDExpzaGliYi1pZHAuaHMtd2VpbmdhcnRlbi5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK5WTGDKpvzEhYNM5v1F
-iESicJ3Hwnc6rnsn2VfQs4JbKqE6n26pj8xi03r4nwKJmhIES1cdmcSegbjQ7LdA
-p/3ibfAUvvXWkvSei9DTpdvbers5JQPZHLHKGmAFt96CYE4Dtr++S7nG1TiD6483
-5XZ84le+u2f0i9TN4W1VQlvivaeyBazETgwO0XSLQ5zV48qC/HcDqBR7YRXYvL+u
-lQB5/AXt0J7L4etLXhSV+FYq/tTlheafiFqURJYih1xPIyW2ajfWYdob+l1oT5ws
-Si3snj8fhm1fvBm+eV21seHbb3igtimcag4UhLQTi7JIsHk9ZML5V0S2/5YXVHZj
-2SECAwEAAaOCAcIwggG+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUYzOVTdenMixAH/5DOhP2
-8Q7M0LkwHwYDVR0jBBgwFoAUxK2bKM2xJvrKq56g+w6Nb74aWvAwIgYDVR0RBBsw
-GYEXZXJkb2VzQGhzLXdlaW5nYXJ0ZW4uZGUwgYEGA1UdHwR6MHgwOqA4oDaGNGh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9jcmwvZ19jYWNybC5j
-cmwwOqA4oDaGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtd2d0LWNhL3B1Yi9j
-cmwvZ19jYWNybC5jcmwwgZwGCCsGAQUFBwEBBIGPMIGMMEQGCCsGAQUFBzAChjho
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLXdndC1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDBEBggrBgEFBQcwAoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS9ocy13
-Z3QtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AGFGvoZxqW37SnxgPxWPsPSJSDLNHOsqepPUcmyYAf6InAuouePQOLJj9knZbhii
-CLESL0+XHlLCldzv3ZCwMdDCObfqQOBa112JjysacAJeaw9dA1B/W/ShmMneH4j/
-I2udFZt5d4vdbTJfo87F0TW/gUu8QPUY7N9EjTf+a0aAf98LkJP8BTc/SaBvLYqR
-GxwzSBWHvNW3xJJHxBqx+UFDMbKlgbM+o3x/rqg9iXGo5OFUnPdFiktbp0ADbUGI
-IgJCrn+bP6DzVTqIUA82wEZTD/StUG+un/TeXnZYoR+OZX3YEWzkZSvXB4fRZg7o
-H3lgjwLUApbZq/qieYKqmBs=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb-idp.hs-weingarten.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb-idp.hs-weingarten.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Ravensburg-Weingarten</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Ravensburg-Weingarten</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-weingarten.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michaiela</GivenName>
-    <SurName>Erdoes</SurName>
-    <EmailAddress>erdoes@hs-weingarten.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Michaiela</GivenName>
-    <SurName>Erdoes</SurName>
-    <EmailAddress>erdoes@hs-weingarten.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml
deleted file mode 100644
index bf7b55ad..00000000
--- a/swamid-interfederations-2.0/shibb-prod.eseo.fr-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://shibb-prod.eseo.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Groupe ESEO</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACjklEQVQoz22PW0iTYRzGn/f9Pr/t29lDzkxZWDdF4rEiCKQIw1AMjIiitMKoSK3AqGsvQgoxyA7eNMIIBLsyM89JmTp1GlPLnJOZ20xt2pzTbd/eLhxh0v/yx/Pj+T9gjPVbZm2zbrtrubnPyhh70zEelCS7Y8nuXAoEgvWto4yx1s/WYFBijPEAIjVyEKKQR+wxRAOIj1VTQkAJz1FCyNHMnQAS9BrGAIACSIzTWGw/u0fsPEf7xx3Lq+sA1gPB3rHZtgGbWinUtVrUKoHnKQAeQG3jcNnTdkJQfSXrnrFnzR/orDx9ubrV6nQbopUXspMrXvemJW3re1zIcRwFsLDsKz+ZOvWiWKtSHNkXV5qf0W6e/uXxDVSd6a4699HiqL+T41j0zrs94QYAWpXMEB/FjztFGa9Vy/2+NQA79NrYGJ0UYvooJaXUa/6yYpsIC5uv/NQBSZKevx/dwkM+r5if8x9BIQpbiORysWW3LHM/p4+hG6jhk/Xus3ZKYPo+X/zwnd21FGIoe9LZYpoEsNbWBVGxkQwLMwuewYnZg15HAl1rNE0am4cBZppw/phbAiDmHieC7B/hZn5q043DUWMj3S9vXc1NW/cHKCE91Wcv5WYCoLrIv++FBcaY11inuV1KCAUQ/PaVra4CkBbmQ7apzXvCo/2DZkVhbvPQTJd5SqEU+V27iXV8xWgU5heJPnGzQAEgFBJSkoWM9N8+v83lBkAiIsBxqqIiXWUFVarCUUoA8J5HNaTP+WA1urZjsiQvpWlopmXEUXMtS+C59JJXhhhVclJswf23Ik+jNAoAvDwv+/r57YEGkz8QPJZukMtk9rnFgqy9WrXqg3lapxQunkgLSKGCQ0miKAfwB8CbFDy3w6N2AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwck/JggAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMSswMjowMAMScT4AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.eseo.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Groupe ESEO</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">École d'ingénieurs</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>
-					      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>
-    </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-POST" Location="https://shibb-prod.eseo.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb-prod.eseo.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb-prod.eseo.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Groupe ESEO</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Groupe ESEO</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.eseo.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Duclos Philippe</md:SurName>
-    <md:EmailAddress>philippe.duclos@eseo.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Tessier Fabien</md:SurName>
-    <md:EmailAddress>fabien.tessier@eseo.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 1fa942fe..00000000
--- a/swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.crous-amiens.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Amiens Picardie</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoxNyswMjowMDL3lxgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDBDqi+kAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-amiens.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">staff of CROUS d'Amiens</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CROUS Amiens Picardie</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">personnels du CROUS d'Amiens</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>
-					      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>
-    </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-POST" Location="https://shibb.crous-amiens.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.crous-amiens.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.crous-amiens.fr/idp/profile/shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-amiens.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.crous-amiens.fr/idp/AA"/>
-    <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">CROUS Amiens Picardie</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Amiens Picardie</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-amiens.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>informatique@crous-amiens.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index c532c61e..00000000
--- a/swamid-interfederations-2.0/shibb.hull-college.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.hull-college.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Hull College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-09-17T15:23:20Z">
-      <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 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">hull-college.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Hull College Group</mdui:DisplayName>
-        <mdui:Description xml:lang="en">eResources Identity Provider for Hull College Group (Test)</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWzCCAkOgAwIBAgIUFaEJe3e4GnwKX80iSX44NmAiM+EwDQYJKoZIhvcNAQEL
-						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
-						NTA0MTQxNTAyNTdaFw0zNTA0MTQxNTAyNTdaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
-						di5odWxsLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQC1xi57g/PBwkZg1n482c1RMIgsKXBMJP0GGjiuJzjnzLd3U9hjfKr3UcJy
-						NXT5c/QPQUjIQbufZEPyQj9HDg3QEWs7HKeDhsdXeCvzNwJzeosN6vNyY5jxZwqJ
-						juBgrjmzm6+u8xIfnXQqubQmhQp0hRjQ7jddTambRB8/mF+HuwwLikCRAP/gRaJn
-						qT9jzr0LYqo5gF5J+PC8QgDCphl//Pav/t6cBSzOaBqfuUpcjc3WD+0rSqhDv4vK
-						k/z2uKg9FcjsDT5I71zYy42dTGn1OxUWMg1MQVBU1DLva+Ikybz87XF4GdpHRR5v
-						ak0rxyY6+q6nIlPVkTD2V2qQICKrAgMBAAGjfzB9MB0GA1UdDgQWBBRBPm6Au/Y+
-						JHYulm/N7yoO9YuXajBcBgNVHREEVTBTghxzaGliYi5zcnYuaHVsbC1jb2xsZWdl
-						LmFjLnVrhjNodHRwczovL3NoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAEqTR1WV/+bvBCGgx9R+GhYY
-						CaJ6zwFk8LWo2mJ3YXG0tJezv+d3yzNpvQsIk6nS48K9sah2Qj3TzbNrC9Ad4s6g
-						uTm3v0TKu6yjn3QaJ2dz8zOsrn8HLT1q/WDH68R8jqWFhbUcn93/ylFTIlB3oTkV
-						r9FNRjZFlVXUA6b2uwHaOCRh83vRYGFdlOTMs/bYvwsNytI+a3k/OPINO8T65sAj
-						r4cK+agm7B3EI2X8ZfGaNju7/8W/CzrRQkGu1xzfDBJUR0/OAe3F1Xr9qAJfgdLW
-						26trcqDy9z2BRn+NZpAgZYZ5Ku2qMLISyLG6RkXHjpir8YMYT4BhPINjOGByQlY=
-					</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>
-						MIIDWzCCAkOgAwIBAgIUCdRmVaxWoaZWOEFPDqv0D/EKrz4wDQYJKoZIhvcNAQEL
-						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
-						NTA0MTQxNTAyNTZaFw0zNTA0MTQxNTAyNTZaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
-						di5odWxsLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQCImOU31GMtCnxJ6kSP2Uw6Z8smqzVHpL9wlUOx29BL4MnVmk5GWrTXlM3j
-						pZTdX9XeCZWYfjg2xel7VhSR9m0t2H36Y0xhr29dj9vmADs5bCB8BUOtFgDXupLb
-						U2ZNYPTnl9tigYZjk2zjl8D0LccY03kSWsVcC6bhYy6QZan4n1bHwiv3Ud1I0qLa
-						hvD5VyvrK3EvFO5qieC51/A3kZQKu4r79RIXawbCYx/52pyoE3VHWBWaDVKg76es
-						NcBADyjr17+v34Qx+ntDAXq+XCI8wHtchRMYOfJVqSNrxSi9eR9D3Lwf3MfSIQ8h
-						nWmqvZ3HRjZ7FLoVDMhHa7DAFenrAgMBAAGjfzB9MB0GA1UdDgQWBBTFv6UOmTlM
-						Iy3yIZKw+SiZLF8GgzBcBgNVHREEVTBTghxzaGliYi5zcnYuaHVsbC1jb2xsZWdl
-						LmFjLnVrhjNodHRwczovL3NoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAD33JoB6DITFlI7p3MN6OXOL
-						7Y1KQjZJnrTQn9FopVWbeEeGEg0jafyvjItD79ouC+aUXTozGKk6eITs5XbJJdzi
-						VKL0tZrPDcz/dF5Eo1xW8oOUDpyIU0QXp/zJngHk+YxSgSAvVXaGTevHif+9T9+l
-						JysHrwOBEZ6+sH6Nset755kjFjiXru1FIP8/ftrsEhW8lDpcqOX6tXi+psgyN9+h
-						6DWHMG96DZF9oB7zuXhkk2tVr57ThnOzITEjoQ4iUR3fA1SpLCbBv5Y6ZlN2DaFy
-						IMl3RBORxRx04O/NwLb1675QhCe38PATlTtkrC1+r5Z2RYgwOJ3f0L/eSRWrlpE=
-					</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>
-						MIIDXDCCAkSgAwIBAgIVAMBxtBNygxJDhz+XICMyMyNDz3M5MA0GCSqGSIb3DQEB
-						CwUAMCcxJTAjBgNVBAMMHHNoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWswHhcN
-						MTUwNDE0MTUwMjU2WhcNMzUwNDE0MTUwMjU2WjAnMSUwIwYDVQQDDBxzaGliYi5z
-						cnYuaHVsbC1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAg250fL+LAgg5QkLp3uYHVclUitYgFXvZomu3gTPlKOxb+2DE0PeqpeBF
-						zFdK1+8LrfwjNm8rqW+jNVUmP+aJ+vWKbmS79feYnMBe08L0OY/UX5IqBVRlWok0
-						LXsD8Q6cyKT2zZeImPsUZLcvl0f30wm9cQ+37OEz0ow2ehKzzuDSoz2aJNOrbN0l
-						nsvuYSIH/8hg/UXq3vw69WvpXtMNN2VOghwE71bgpO3iELpoAPctM8X7SOvUwme/
-						zB/vNquTdmkZTGqem33NIjvulXbnuAqTpFq45wQPF1Jw/eaxtKm9+LR3TNu+1zRO
-						Erfa82aM62iFNY0H0wi/ZMN29sJ/6wIDAQABo38wfTAdBgNVHQ4EFgQUn+mHuBYA
-						PXywHU2WZU/KDimiWCwwXAYDVR0RBFUwU4Icc2hpYmIuc3J2Lmh1bGwtY29sbGVn
-						ZS5hYy51a4YzaHR0cHM6Ly9zaGliYi5zcnYuaHVsbC1jb2xsZWdlLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBdKX+mFvFM/3bT+EnCL5zB
-						GOwVBTSueTupZCkJ0TICbYNZtBIpjBEGuloIofqrEEWJxv8nf1wjTANQeCsXawVH
-						5WX67WVvH/AGOgiOkAoETn6pTJwD+mbPphiMuxpmCbfIDSkc8KPBv01Dd4RgNt6t
-						E5F20miUKgEllVBKrOta8VQaI9RLuYxAXUkdUUDEEKBZ7NEabbzeQAdjue17T6ho
-						zT7PWljk4zS+ZQWYtm8ZSJGnAtzf2qkeBqRuVe7KpVUSHSnVmXkkAS5BTBqiZ4jj
-						rRv8ji64j4NqrLPTYWSGAwjjQzwvB8BQZ2Jgks7AO/yOvWD3M56uPKIxIMf/RCgE
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.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://shibb.srv.hull-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.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">hull-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWzCCAkOgAwIBAgIUFaEJe3e4GnwKX80iSX44NmAiM+EwDQYJKoZIhvcNAQEL
-						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
-						NTA0MTQxNTAyNTdaFw0zNTA0MTQxNTAyNTdaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
-						di5odWxsLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQC1xi57g/PBwkZg1n482c1RMIgsKXBMJP0GGjiuJzjnzLd3U9hjfKr3UcJy
-						NXT5c/QPQUjIQbufZEPyQj9HDg3QEWs7HKeDhsdXeCvzNwJzeosN6vNyY5jxZwqJ
-						juBgrjmzm6+u8xIfnXQqubQmhQp0hRjQ7jddTambRB8/mF+HuwwLikCRAP/gRaJn
-						qT9jzr0LYqo5gF5J+PC8QgDCphl//Pav/t6cBSzOaBqfuUpcjc3WD+0rSqhDv4vK
-						k/z2uKg9FcjsDT5I71zYy42dTGn1OxUWMg1MQVBU1DLva+Ikybz87XF4GdpHRR5v
-						ak0rxyY6+q6nIlPVkTD2V2qQICKrAgMBAAGjfzB9MB0GA1UdDgQWBBRBPm6Au/Y+
-						JHYulm/N7yoO9YuXajBcBgNVHREEVTBTghxzaGliYi5zcnYuaHVsbC1jb2xsZWdl
-						LmFjLnVrhjNodHRwczovL3NoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAEqTR1WV/+bvBCGgx9R+GhYY
-						CaJ6zwFk8LWo2mJ3YXG0tJezv+d3yzNpvQsIk6nS48K9sah2Qj3TzbNrC9Ad4s6g
-						uTm3v0TKu6yjn3QaJ2dz8zOsrn8HLT1q/WDH68R8jqWFhbUcn93/ylFTIlB3oTkV
-						r9FNRjZFlVXUA6b2uwHaOCRh83vRYGFdlOTMs/bYvwsNytI+a3k/OPINO8T65sAj
-						r4cK+agm7B3EI2X8ZfGaNju7/8W/CzrRQkGu1xzfDBJUR0/OAe3F1Xr9qAJfgdLW
-						26trcqDy9z2BRn+NZpAgZYZ5Ku2qMLISyLG6RkXHjpir8YMYT4BhPINjOGByQlY=
-					</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>
-						MIIDWzCCAkOgAwIBAgIUCdRmVaxWoaZWOEFPDqv0D/EKrz4wDQYJKoZIhvcNAQEL
-						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
-						NTA0MTQxNTAyNTZaFw0zNTA0MTQxNTAyNTZaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
-						di5odWxsLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQCImOU31GMtCnxJ6kSP2Uw6Z8smqzVHpL9wlUOx29BL4MnVmk5GWrTXlM3j
-						pZTdX9XeCZWYfjg2xel7VhSR9m0t2H36Y0xhr29dj9vmADs5bCB8BUOtFgDXupLb
-						U2ZNYPTnl9tigYZjk2zjl8D0LccY03kSWsVcC6bhYy6QZan4n1bHwiv3Ud1I0qLa
-						hvD5VyvrK3EvFO5qieC51/A3kZQKu4r79RIXawbCYx/52pyoE3VHWBWaDVKg76es
-						NcBADyjr17+v34Qx+ntDAXq+XCI8wHtchRMYOfJVqSNrxSi9eR9D3Lwf3MfSIQ8h
-						nWmqvZ3HRjZ7FLoVDMhHa7DAFenrAgMBAAGjfzB9MB0GA1UdDgQWBBTFv6UOmTlM
-						Iy3yIZKw+SiZLF8GgzBcBgNVHREEVTBTghxzaGliYi5zcnYuaHVsbC1jb2xsZWdl
-						LmFjLnVrhjNodHRwczovL3NoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAD33JoB6DITFlI7p3MN6OXOL
-						7Y1KQjZJnrTQn9FopVWbeEeGEg0jafyvjItD79ouC+aUXTozGKk6eITs5XbJJdzi
-						VKL0tZrPDcz/dF5Eo1xW8oOUDpyIU0QXp/zJngHk+YxSgSAvVXaGTevHif+9T9+l
-						JysHrwOBEZ6+sH6Nset755kjFjiXru1FIP8/ftrsEhW8lDpcqOX6tXi+psgyN9+h
-						6DWHMG96DZF9oB7zuXhkk2tVr57ThnOzITEjoQ4iUR3fA1SpLCbBv5Y6ZlN2DaFy
-						IMl3RBORxRx04O/NwLb1675QhCe38PATlTtkrC1+r5Z2RYgwOJ3f0L/eSRWrlpE=
-					</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>
-						MIIDXDCCAkSgAwIBAgIVAMBxtBNygxJDhz+XICMyMyNDz3M5MA0GCSqGSIb3DQEB
-						CwUAMCcxJTAjBgNVBAMMHHNoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWswHhcN
-						MTUwNDE0MTUwMjU2WhcNMzUwNDE0MTUwMjU2WjAnMSUwIwYDVQQDDBxzaGliYi5z
-						cnYuaHVsbC1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAg250fL+LAgg5QkLp3uYHVclUitYgFXvZomu3gTPlKOxb+2DE0PeqpeBF
-						zFdK1+8LrfwjNm8rqW+jNVUmP+aJ+vWKbmS79feYnMBe08L0OY/UX5IqBVRlWok0
-						LXsD8Q6cyKT2zZeImPsUZLcvl0f30wm9cQ+37OEz0ow2ehKzzuDSoz2aJNOrbN0l
-						nsvuYSIH/8hg/UXq3vw69WvpXtMNN2VOghwE71bgpO3iELpoAPctM8X7SOvUwme/
-						zB/vNquTdmkZTGqem33NIjvulXbnuAqTpFq45wQPF1Jw/eaxtKm9+LR3TNu+1zRO
-						Erfa82aM62iFNY0H0wi/ZMN29sJ/6wIDAQABo38wfTAdBgNVHQ4EFgQUn+mHuBYA
-						PXywHU2WZU/KDimiWCwwXAYDVR0RBFUwU4Icc2hpYmIuc3J2Lmh1bGwtY29sbGVn
-						ZS5hYy51a4YzaHR0cHM6Ly9zaGliYi5zcnYuaHVsbC1jb2xsZWdlLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBdKX+mFvFM/3bT+EnCL5zB
-						GOwVBTSueTupZCkJ0TICbYNZtBIpjBEGuloIofqrEEWJxv8nf1wjTANQeCsXawVH
-						5WX67WVvH/AGOgiOkAoETn6pTJwD+mbPphiMuxpmCbfIDSkc8KPBv01Dd4RgNt6t
-						E5F20miUKgEllVBKrOta8VQaI9RLuYxAXUkdUUDEEKBZ7NEabbzeQAdjue17T6ho
-						zT7PWljk4zS+ZQWYtm8ZSJGnAtzf2qkeBqRuVe7KpVUSHSnVmXkkAS5BTBqiZ4jj
-						rRv8ji64j4NqrLPTYWSGAwjjQzwvB8BQZ2Jgks7AO/yOvWD3M56uPKIxIMf/RCgE
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Hull College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hull College Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hull-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Skerrow</SurName>
-    <EmailAddress>mailto:Chris.Skerrow@hull-college.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Perry</SurName>
-    <EmailAddress>mailto:Dave.Perry@hull-college.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.srv.hull-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb.srv.hull-college.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 56d450b2..00000000
--- a/swamid-interfederations-2.0/shibb.srv.hull-college.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.srv.hull-college.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Group (Test)" Shibboleth IdP for Hull College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-19T12:41:49Z">
-      <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 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">hull-college.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Hull College Group (Test)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">eResources Identity Provider for Hull College Group (Test)</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWzCCAkOgAwIBAgIUFaEJe3e4GnwKX80iSX44NmAiM+EwDQYJKoZIhvcNAQEL
-						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
-						NTA0MTQxNTAyNTdaFw0zNTA0MTQxNTAyNTdaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
-						di5odWxsLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQC1xi57g/PBwkZg1n482c1RMIgsKXBMJP0GGjiuJzjnzLd3U9hjfKr3UcJy
-						NXT5c/QPQUjIQbufZEPyQj9HDg3QEWs7HKeDhsdXeCvzNwJzeosN6vNyY5jxZwqJ
-						juBgrjmzm6+u8xIfnXQqubQmhQp0hRjQ7jddTambRB8/mF+HuwwLikCRAP/gRaJn
-						qT9jzr0LYqo5gF5J+PC8QgDCphl//Pav/t6cBSzOaBqfuUpcjc3WD+0rSqhDv4vK
-						k/z2uKg9FcjsDT5I71zYy42dTGn1OxUWMg1MQVBU1DLva+Ikybz87XF4GdpHRR5v
-						ak0rxyY6+q6nIlPVkTD2V2qQICKrAgMBAAGjfzB9MB0GA1UdDgQWBBRBPm6Au/Y+
-						JHYulm/N7yoO9YuXajBcBgNVHREEVTBTghxzaGliYi5zcnYuaHVsbC1jb2xsZWdl
-						LmFjLnVrhjNodHRwczovL3NoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAEqTR1WV/+bvBCGgx9R+GhYY
-						CaJ6zwFk8LWo2mJ3YXG0tJezv+d3yzNpvQsIk6nS48K9sah2Qj3TzbNrC9Ad4s6g
-						uTm3v0TKu6yjn3QaJ2dz8zOsrn8HLT1q/WDH68R8jqWFhbUcn93/ylFTIlB3oTkV
-						r9FNRjZFlVXUA6b2uwHaOCRh83vRYGFdlOTMs/bYvwsNytI+a3k/OPINO8T65sAj
-						r4cK+agm7B3EI2X8ZfGaNju7/8W/CzrRQkGu1xzfDBJUR0/OAe3F1Xr9qAJfgdLW
-						26trcqDy9z2BRn+NZpAgZYZ5Ku2qMLISyLG6RkXHjpir8YMYT4BhPINjOGByQlY=
-					</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>
-						MIIDWzCCAkOgAwIBAgIUCdRmVaxWoaZWOEFPDqv0D/EKrz4wDQYJKoZIhvcNAQEL
-						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
-						NTA0MTQxNTAyNTZaFw0zNTA0MTQxNTAyNTZaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
-						di5odWxsLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQCImOU31GMtCnxJ6kSP2Uw6Z8smqzVHpL9wlUOx29BL4MnVmk5GWrTXlM3j
-						pZTdX9XeCZWYfjg2xel7VhSR9m0t2H36Y0xhr29dj9vmADs5bCB8BUOtFgDXupLb
-						U2ZNYPTnl9tigYZjk2zjl8D0LccY03kSWsVcC6bhYy6QZan4n1bHwiv3Ud1I0qLa
-						hvD5VyvrK3EvFO5qieC51/A3kZQKu4r79RIXawbCYx/52pyoE3VHWBWaDVKg76es
-						NcBADyjr17+v34Qx+ntDAXq+XCI8wHtchRMYOfJVqSNrxSi9eR9D3Lwf3MfSIQ8h
-						nWmqvZ3HRjZ7FLoVDMhHa7DAFenrAgMBAAGjfzB9MB0GA1UdDgQWBBTFv6UOmTlM
-						Iy3yIZKw+SiZLF8GgzBcBgNVHREEVTBTghxzaGliYi5zcnYuaHVsbC1jb2xsZWdl
-						LmFjLnVrhjNodHRwczovL3NoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAD33JoB6DITFlI7p3MN6OXOL
-						7Y1KQjZJnrTQn9FopVWbeEeGEg0jafyvjItD79ouC+aUXTozGKk6eITs5XbJJdzi
-						VKL0tZrPDcz/dF5Eo1xW8oOUDpyIU0QXp/zJngHk+YxSgSAvVXaGTevHif+9T9+l
-						JysHrwOBEZ6+sH6Nset755kjFjiXru1FIP8/ftrsEhW8lDpcqOX6tXi+psgyN9+h
-						6DWHMG96DZF9oB7zuXhkk2tVr57ThnOzITEjoQ4iUR3fA1SpLCbBv5Y6ZlN2DaFy
-						IMl3RBORxRx04O/NwLb1675QhCe38PATlTtkrC1+r5Z2RYgwOJ3f0L/eSRWrlpE=
-					</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>
-						MIIDXDCCAkSgAwIBAgIVAMBxtBNygxJDhz+XICMyMyNDz3M5MA0GCSqGSIb3DQEB
-						CwUAMCcxJTAjBgNVBAMMHHNoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWswHhcN
-						MTUwNDE0MTUwMjU2WhcNMzUwNDE0MTUwMjU2WjAnMSUwIwYDVQQDDBxzaGliYi5z
-						cnYuaHVsbC1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAg250fL+LAgg5QkLp3uYHVclUitYgFXvZomu3gTPlKOxb+2DE0PeqpeBF
-						zFdK1+8LrfwjNm8rqW+jNVUmP+aJ+vWKbmS79feYnMBe08L0OY/UX5IqBVRlWok0
-						LXsD8Q6cyKT2zZeImPsUZLcvl0f30wm9cQ+37OEz0ow2ehKzzuDSoz2aJNOrbN0l
-						nsvuYSIH/8hg/UXq3vw69WvpXtMNN2VOghwE71bgpO3iELpoAPctM8X7SOvUwme/
-						zB/vNquTdmkZTGqem33NIjvulXbnuAqTpFq45wQPF1Jw/eaxtKm9+LR3TNu+1zRO
-						Erfa82aM62iFNY0H0wi/ZMN29sJ/6wIDAQABo38wfTAdBgNVHQ4EFgQUn+mHuBYA
-						PXywHU2WZU/KDimiWCwwXAYDVR0RBFUwU4Icc2hpYmIuc3J2Lmh1bGwtY29sbGVn
-						ZS5hYy51a4YzaHR0cHM6Ly9zaGliYi5zcnYuaHVsbC1jb2xsZWdlLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBdKX+mFvFM/3bT+EnCL5zB
-						GOwVBTSueTupZCkJ0TICbYNZtBIpjBEGuloIofqrEEWJxv8nf1wjTANQeCsXawVH
-						5WX67WVvH/AGOgiOkAoETn6pTJwD+mbPphiMuxpmCbfIDSkc8KPBv01Dd4RgNt6t
-						E5F20miUKgEllVBKrOta8VQaI9RLuYxAXUkdUUDEEKBZ7NEabbzeQAdjue17T6ho
-						zT7PWljk4zS+ZQWYtm8ZSJGnAtzf2qkeBqRuVe7KpVUSHSnVmXkkAS5BTBqiZ4jj
-						rRv8ji64j4NqrLPTYWSGAwjjQzwvB8BQZ2Jgks7AO/yOvWD3M56uPKIxIMf/RCgE
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.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://shibb.srv.hull-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.srv.hull-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.srv.hull-college.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">hull-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWzCCAkOgAwIBAgIUFaEJe3e4GnwKX80iSX44NmAiM+EwDQYJKoZIhvcNAQEL
-						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
-						NTA0MTQxNTAyNTdaFw0zNTA0MTQxNTAyNTdaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
-						di5odWxsLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQC1xi57g/PBwkZg1n482c1RMIgsKXBMJP0GGjiuJzjnzLd3U9hjfKr3UcJy
-						NXT5c/QPQUjIQbufZEPyQj9HDg3QEWs7HKeDhsdXeCvzNwJzeosN6vNyY5jxZwqJ
-						juBgrjmzm6+u8xIfnXQqubQmhQp0hRjQ7jddTambRB8/mF+HuwwLikCRAP/gRaJn
-						qT9jzr0LYqo5gF5J+PC8QgDCphl//Pav/t6cBSzOaBqfuUpcjc3WD+0rSqhDv4vK
-						k/z2uKg9FcjsDT5I71zYy42dTGn1OxUWMg1MQVBU1DLva+Ikybz87XF4GdpHRR5v
-						ak0rxyY6+q6nIlPVkTD2V2qQICKrAgMBAAGjfzB9MB0GA1UdDgQWBBRBPm6Au/Y+
-						JHYulm/N7yoO9YuXajBcBgNVHREEVTBTghxzaGliYi5zcnYuaHVsbC1jb2xsZWdl
-						LmFjLnVrhjNodHRwczovL3NoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAEqTR1WV/+bvBCGgx9R+GhYY
-						CaJ6zwFk8LWo2mJ3YXG0tJezv+d3yzNpvQsIk6nS48K9sah2Qj3TzbNrC9Ad4s6g
-						uTm3v0TKu6yjn3QaJ2dz8zOsrn8HLT1q/WDH68R8jqWFhbUcn93/ylFTIlB3oTkV
-						r9FNRjZFlVXUA6b2uwHaOCRh83vRYGFdlOTMs/bYvwsNytI+a3k/OPINO8T65sAj
-						r4cK+agm7B3EI2X8ZfGaNju7/8W/CzrRQkGu1xzfDBJUR0/OAe3F1Xr9qAJfgdLW
-						26trcqDy9z2BRn+NZpAgZYZ5Ku2qMLISyLG6RkXHjpir8YMYT4BhPINjOGByQlY=
-					</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>
-						MIIDWzCCAkOgAwIBAgIUCdRmVaxWoaZWOEFPDqv0D/EKrz4wDQYJKoZIhvcNAQEL
-						BQAwJzElMCMGA1UEAwwcc2hpYmIuc3J2Lmh1bGwtY29sbGVnZS5hYy51azAeFw0x
-						NTA0MTQxNTAyNTZaFw0zNTA0MTQxNTAyNTZaMCcxJTAjBgNVBAMMHHNoaWJiLnNy
-						di5odWxsLWNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-						AoIBAQCImOU31GMtCnxJ6kSP2Uw6Z8smqzVHpL9wlUOx29BL4MnVmk5GWrTXlM3j
-						pZTdX9XeCZWYfjg2xel7VhSR9m0t2H36Y0xhr29dj9vmADs5bCB8BUOtFgDXupLb
-						U2ZNYPTnl9tigYZjk2zjl8D0LccY03kSWsVcC6bhYy6QZan4n1bHwiv3Ud1I0qLa
-						hvD5VyvrK3EvFO5qieC51/A3kZQKu4r79RIXawbCYx/52pyoE3VHWBWaDVKg76es
-						NcBADyjr17+v34Qx+ntDAXq+XCI8wHtchRMYOfJVqSNrxSi9eR9D3Lwf3MfSIQ8h
-						nWmqvZ3HRjZ7FLoVDMhHa7DAFenrAgMBAAGjfzB9MB0GA1UdDgQWBBTFv6UOmTlM
-						Iy3yIZKw+SiZLF8GgzBcBgNVHREEVTBTghxzaGliYi5zcnYuaHVsbC1jb2xsZWdl
-						LmFjLnVrhjNodHRwczovL3NoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWsvaWRw
-						L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAD33JoB6DITFlI7p3MN6OXOL
-						7Y1KQjZJnrTQn9FopVWbeEeGEg0jafyvjItD79ouC+aUXTozGKk6eITs5XbJJdzi
-						VKL0tZrPDcz/dF5Eo1xW8oOUDpyIU0QXp/zJngHk+YxSgSAvVXaGTevHif+9T9+l
-						JysHrwOBEZ6+sH6Nset755kjFjiXru1FIP8/ftrsEhW8lDpcqOX6tXi+psgyN9+h
-						6DWHMG96DZF9oB7zuXhkk2tVr57ThnOzITEjoQ4iUR3fA1SpLCbBv5Y6ZlN2DaFy
-						IMl3RBORxRx04O/NwLb1675QhCe38PATlTtkrC1+r5Z2RYgwOJ3f0L/eSRWrlpE=
-					</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>
-						MIIDXDCCAkSgAwIBAgIVAMBxtBNygxJDhz+XICMyMyNDz3M5MA0GCSqGSIb3DQEB
-						CwUAMCcxJTAjBgNVBAMMHHNoaWJiLnNydi5odWxsLWNvbGxlZ2UuYWMudWswHhcN
-						MTUwNDE0MTUwMjU2WhcNMzUwNDE0MTUwMjU2WjAnMSUwIwYDVQQDDBxzaGliYi5z
-						cnYuaHVsbC1jb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAg250fL+LAgg5QkLp3uYHVclUitYgFXvZomu3gTPlKOxb+2DE0PeqpeBF
-						zFdK1+8LrfwjNm8rqW+jNVUmP+aJ+vWKbmS79feYnMBe08L0OY/UX5IqBVRlWok0
-						LXsD8Q6cyKT2zZeImPsUZLcvl0f30wm9cQ+37OEz0ow2ehKzzuDSoz2aJNOrbN0l
-						nsvuYSIH/8hg/UXq3vw69WvpXtMNN2VOghwE71bgpO3iELpoAPctM8X7SOvUwme/
-						zB/vNquTdmkZTGqem33NIjvulXbnuAqTpFq45wQPF1Jw/eaxtKm9+LR3TNu+1zRO
-						Erfa82aM62iFNY0H0wi/ZMN29sJ/6wIDAQABo38wfTAdBgNVHQ4EFgQUn+mHuBYA
-						PXywHU2WZU/KDimiWCwwXAYDVR0RBFUwU4Icc2hpYmIuc3J2Lmh1bGwtY29sbGVn
-						ZS5hYy51a4YzaHR0cHM6Ly9zaGliYi5zcnYuaHVsbC1jb2xsZWdlLmFjLnVrL2lk
-						cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBdKX+mFvFM/3bT+EnCL5zB
-						GOwVBTSueTupZCkJ0TICbYNZtBIpjBEGuloIofqrEEWJxv8nf1wjTANQeCsXawVH
-						5WX67WVvH/AGOgiOkAoETn6pTJwD+mbPphiMuxpmCbfIDSkc8KPBv01Dd4RgNt6t
-						E5F20miUKgEllVBKrOta8VQaI9RLuYxAXUkdUUDEEKBZ7NEabbzeQAdjue17T6ho
-						zT7PWljk4zS+ZQWYtm8ZSJGnAtzf2qkeBqRuVe7KpVUSHSnVmXkkAS5BTBqiZ4jj
-						rRv8ji64j4NqrLPTYWSGAwjjQzwvB8BQZ2Jgks7AO/yOvWD3M56uPKIxIMf/RCgE
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.srv.hull-college.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Hull College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hull College Group (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hull-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Perry</SurName>
-    <EmailAddress>mailto:Dave.Perry@hull-college.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Perry</SurName>
-    <EmailAddress>mailto:Dave.Perry@hull-college.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.stockport.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb.stockport.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index f517de4d..00000000
--- a/swamid-interfederations-2.0/shibb.stockport.ac.uk-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" entityID="https://shibb.stockport.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Stockport College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-05-20T11:53: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">stockport.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUM+WxIbWXv2I74/FnfG6jjwU+Ri0wDQYJKoZIhvcNAQEF
-						BQAwIDEeMBwGA1UEAxMVc2hpYmIuc3RvY2twb3J0LmFjLnVrMB4XDTExMDUwNjE0
-						MDAyM1oXDTMxMDUwNjE0MDAyM1owIDEeMBwGA1UEAxMVc2hpYmIuc3RvY2twb3J0
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAifpJBo9UYsko
-						kMULJTlBmVICnEZWWnlX3XFNf3aUtkOYW5EgGgwro1jR0irV252k/WIThep4ozjI
-						C31suuhrKVUtPggMVaP7LxXcEvO7FP2fc++yqvpUYs8h4kJylmy5J4UX6MlSqM7W
-						LcyH3SOPeQkh/XEGdsNcxphhaXHMhyCEsB5xESYyp0tMFh7bjX9+YjBMxnoWu7iz
-						Zk/+bxP2lgaQA1DayxgvhSEsvdSJkxCerjPnPrGv6f0pVN2exDCOpwsFPPQWsCIC
-						0BQnqbxqf/ONpBUCi2fJHFEqNHIh+YBfLBqSOpPqIkhAlXnAlYVfP3/oJ/zaIHoG
-						TKp2AP62pQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYi5zdG9ja3BvcnQuYWMu
-						dWuGLGh0dHBzOi8vc2hpYmIuc3RvY2twb3J0LmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MB0GA1UdDgQWBBTNA3WQ8zvZbogwr3KVdrj2DAZLlTANBgkqhkiG9w0BAQUFAAOC
-						AQEATxljwm7uXHGMCNLIFyJlpTx/TLCW7m4kP+FMhDa67Odpv3rNyu33fgtxP5lN
-						14RioV5jXaPruxMjdVw8L2v3Q4mBAOOB1qfJyIAmn+QpGvouXvh/rIOywlz9S9Ng
-						a0vc5R47wfL6Zyb548WnO6QqVgSgg8ZbsBZalcvrDLHLX+xFlltXo3x+rrfWLgf6
-						hfWNaS4qX4wFjS02bb6BaYt8dExP/MjJ93F/NnsaatHc6ez2OQSQAaHDWWBUXB/P
-						DY9eQDYcEDia9hZgAs3FnwK2Cmwk6aqOIW3WlUMmVPCat764FOLrOMiAVtq4kFJq
-						ba0bpVtpnDdaJXtivnztmKRWPw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.stockport.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.stockport.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://shibb.stockport.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.stockport.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.stockport.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.stockport.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">stockport.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUM+WxIbWXv2I74/FnfG6jjwU+Ri0wDQYJKoZIhvcNAQEF
-						BQAwIDEeMBwGA1UEAxMVc2hpYmIuc3RvY2twb3J0LmFjLnVrMB4XDTExMDUwNjE0
-						MDAyM1oXDTMxMDUwNjE0MDAyM1owIDEeMBwGA1UEAxMVc2hpYmIuc3RvY2twb3J0
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAifpJBo9UYsko
-						kMULJTlBmVICnEZWWnlX3XFNf3aUtkOYW5EgGgwro1jR0irV252k/WIThep4ozjI
-						C31suuhrKVUtPggMVaP7LxXcEvO7FP2fc++yqvpUYs8h4kJylmy5J4UX6MlSqM7W
-						LcyH3SOPeQkh/XEGdsNcxphhaXHMhyCEsB5xESYyp0tMFh7bjX9+YjBMxnoWu7iz
-						Zk/+bxP2lgaQA1DayxgvhSEsvdSJkxCerjPnPrGv6f0pVN2exDCOpwsFPPQWsCIC
-						0BQnqbxqf/ONpBUCi2fJHFEqNHIh+YBfLBqSOpPqIkhAlXnAlYVfP3/oJ/zaIHoG
-						TKp2AP62pQIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYi5zdG9ja3BvcnQuYWMu
-						dWuGLGh0dHBzOi8vc2hpYmIuc3RvY2twb3J0LmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MB0GA1UdDgQWBBTNA3WQ8zvZbogwr3KVdrj2DAZLlTANBgkqhkiG9w0BAQUFAAOC
-						AQEATxljwm7uXHGMCNLIFyJlpTx/TLCW7m4kP+FMhDa67Odpv3rNyu33fgtxP5lN
-						14RioV5jXaPruxMjdVw8L2v3Q4mBAOOB1qfJyIAmn+QpGvouXvh/rIOywlz9S9Ng
-						a0vc5R47wfL6Zyb548WnO6QqVgSgg8ZbsBZalcvrDLHLX+xFlltXo3x+rrfWLgf6
-						hfWNaS4qX4wFjS02bb6BaYt8dExP/MjJ93F/NnsaatHc6ez2OQSQAaHDWWBUXB/P
-						DY9eQDYcEDia9hZgAs3FnwK2Cmwk6aqOIW3WlUMmVPCat764FOLrOMiAVtq4kFJq
-						ba0bpVtpnDdaJXtivnztmKRWPw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.stockport.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.stockport.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">Stockport College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stockport College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stockport.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nichole</GivenName>
-    <SurName>Bahrt</SurName>
-    <EmailAddress>mailto:nichole.bahrt@stockport.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:michael.smith@stockport.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Patrick</GivenName>
-    <SurName>Doherty</SurName>
-    <EmailAddress>mailto:Patrick.Doherty@Stockport.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Comer</SurName>
-    <EmailAddress>mailto:Robert.Comer@Stockport.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.utpb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb.utpb.edu-idp-shibboleth.xml
deleted file mode 100644
index cf3bb3c2..00000000
--- a/swamid-interfederations-2.0/shibb.utpb.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +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://shibb.utpb.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.utpb.edu/services/ird" 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">utpb.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas of the Permian Basin</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>
-MIIDJDCCAgygAwIBAgIVAP5tjp4Tow6cy5oFYmuYaqJvvh6kMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnNoaWJiLnV0cGIuZWR1MB4XDTA5MDIxNzIxMzQyOFoX
-DTI5MDIxNzIxMzQyOFowGTEXMBUGA1UEAxMOc2hpYmIudXRwYi5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDr94zxTZvCkwbFAnBH4B4qHfwecnU
-c1jMKpceqTB2XWwfn3C2ta1by+DgZzZUu5yBi+pTk/ulGUpaCsQoWQuXxJGJjDeq
-GNPLA6sd40HG4sV2xP4ApPRyZEv1bHqungSMXiBKigbuQaPkTrUhFmXLAXXpk3NE
-rri8F5Dpe0Gnyuajx2swX8b52qik9FvFVr0GnM3/47cXCLzheg+Dyj7CbRpZ6F3Z
-xGh5XyNSat8gKTDPTzkAIwGuDTwvU5HpTRmBdIwxquccVsiJaxaOVp6sllut8cXD
-4W3XcBhqJXrqRYzp8rwBzwWFQqdEeBmHlWoRUkEEG4yoiC/LeIknVNn3AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnNoaWJiLnV0cGIuZWR1hiVodHRwczovL3NoaWJiLnV0
-cGIuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT259l63IiF+k5UaXZZbX5G
-iJZEKzANBgkqhkiG9w0BAQUFAAOCAQEAZ70LIDprVaQl5rbmd31QMdRamxsCi8XR
-ufcuqXlFIu/TeRWsQfUcPc9ta02jU0Ruut0IMRiQDEyNqKJXTXnl+w7BACWZxw8O
-/AZb9p1/hv/ql5C1/axK/1jCAZZMTZK4rYtjCgv30QCGUAGo2OZntXAhyrji6Ql8
-qwf6ulhp0qtGtOXqrgA9eqll/g5fliDRS5Jn0LltriwYFq4FjSYIR5rnfOwQls6Y
-JCyQO8jWSKK5bulKzsYQL60j7C3WKzUdgG929H61rjkDREFZXMiPOkqsQvH17X5J
-YMaaG/t0+kQC2uFq/Kq9ruMjzOhSVywAO9St96lTyQhVB9JEmThZlw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.utpb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.utpb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.utpb.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.utpb.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.utpb.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utpb.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAP5tjp4Tow6cy5oFYmuYaqJvvh6kMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnNoaWJiLnV0cGIuZWR1MB4XDTA5MDIxNzIxMzQyOFoX
-DTI5MDIxNzIxMzQyOFowGTEXMBUGA1UEAxMOc2hpYmIudXRwYi5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDr94zxTZvCkwbFAnBH4B4qHfwecnU
-c1jMKpceqTB2XWwfn3C2ta1by+DgZzZUu5yBi+pTk/ulGUpaCsQoWQuXxJGJjDeq
-GNPLA6sd40HG4sV2xP4ApPRyZEv1bHqungSMXiBKigbuQaPkTrUhFmXLAXXpk3NE
-rri8F5Dpe0Gnyuajx2swX8b52qik9FvFVr0GnM3/47cXCLzheg+Dyj7CbRpZ6F3Z
-xGh5XyNSat8gKTDPTzkAIwGuDTwvU5HpTRmBdIwxquccVsiJaxaOVp6sllut8cXD
-4W3XcBhqJXrqRYzp8rwBzwWFQqdEeBmHlWoRUkEEG4yoiC/LeIknVNn3AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnNoaWJiLnV0cGIuZWR1hiVodHRwczovL3NoaWJiLnV0
-cGIuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBT259l63IiF+k5UaXZZbX5G
-iJZEKzANBgkqhkiG9w0BAQUFAAOCAQEAZ70LIDprVaQl5rbmd31QMdRamxsCi8XR
-ufcuqXlFIu/TeRWsQfUcPc9ta02jU0Ruut0IMRiQDEyNqKJXTXnl+w7BACWZxw8O
-/AZb9p1/hv/ql5C1/axK/1jCAZZMTZK4rYtjCgv30QCGUAGo2OZntXAhyrji6Ql8
-qwf6ulhp0qtGtOXqrgA9eqll/g5fliDRS5Jn0LltriwYFq4FjSYIR5rnfOwQls6Y
-JCyQO8jWSKK5bulKzsYQL60j7C3WKzUdgG929H61rjkDREFZXMiPOkqsQvH17X5J
-YMaaG/t0+kQC2uFq/Kq9ruMjzOhSVywAO9St96lTyQhVB9JEmThZlw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.utpb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas of the Permian Basin</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas of the Permian Basin</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utpb.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SSO Support</md:GivenName>
-    <md:EmailAddress>sso_support@utpb.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml b/swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.xml
deleted file mode 100644
index 73c8c82a..00000000
--- a/swamid-interfederations-2.0/shibb.ws.seemis.gov.scot-shibboleth-sp.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://shibb.ws.seemis.gov.scot/shibboleth-sp">
-  <!--
-		This is a "Glow Services" Shibboleth SP for SEEMIS Group LLP.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIC1jCCAb6gAwIBAgIJANnFj5LehaRsMA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
-						BAMTBXNoaWJiMB4XDTEwMDkxMzE0MjEyMloXDTIwMDkxMDE0MjEyMlowEDEOMAwG
-						A1UEAxMFc2hpYmIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtSXC9
-						5Iq68ruXAxPoscW47pepV3+UBJne3/lJ5VxdI3n3QbmM0GfMrd3jDkS4r2BgnYF1
-						veTqa9BCCGKh5Hp6ISDo9dZ4Si/zllypDYhOmcBBbuUr/bjAj7y7hjp9Q18yHBnO
-						FmeYQIXfI5Q5gbEaTT3JCON+65nVMH3rifQvoGU9Dbxwo2INR0lmZtLBpPgeq+2i
-						Gt+FKLOOOey0ydB0eKD2qDASoqQhOKKNTvgxmWGWiXQwswRQNygLyvbnJ+pIf0GG
-						YyHCyplLkq99nEeChSx7wSjaiD9J5uUDEICJAZo6V6vqNC+DJu6Ztx4Tq1w39m0A
-						QuwgWV4d5XQTLnftAgMBAAGjMzAxMBAGA1UdEQQJMAeCBXNoaWJiMB0GA1UdDgQW
-						BBTuy95SjJcKxjwAb2d7iwYOHVJMETANBgkqhkiG9w0BAQUFAAOCAQEAOeOhi+4R
-						GhqXhKLiw8yUCOSff4x+dDfjzseeWUeBhVyYeMsAklANvDE7nlKB8gcQv9HgHaLC
-						fbo2bGQegAumPYkNBbLbHk5wMM9lcKV+h08ak54ufgY5dxdKN2YYl9EC56egzuJg
-						hTWoSRbwML5X6CGKuKMLSCiEVJXS8hmZHJl1kxmwXKAqArUhFwhfFMYxBbXnBUSV
-						gI3Rbjt43XXJJEt6BhLaLVxqmzndyabdI2u3zx6CdtvFynSPDOA/p8Rifcrfzt20
-						l5nkqOEMNUx0VHYCZ/W+pt8AmPMWGRWjL2wcUndgwrdBVqaeT7Dmz7ozeniJbF1n
-						mCaszq2WwCToAw==
-					</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>
-						MIIC1jCCAb6gAwIBAgIJANnFj5LehaRsMA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
-						BAMTBXNoaWJiMB4XDTEwMDkxMzE0MjEyMloXDTIwMDkxMDE0MjEyMlowEDEOMAwG
-						A1UEAxMFc2hpYmIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtSXC9
-						5Iq68ruXAxPoscW47pepV3+UBJne3/lJ5VxdI3n3QbmM0GfMrd3jDkS4r2BgnYF1
-						veTqa9BCCGKh5Hp6ISDo9dZ4Si/zllypDYhOmcBBbuUr/bjAj7y7hjp9Q18yHBnO
-						FmeYQIXfI5Q5gbEaTT3JCON+65nVMH3rifQvoGU9Dbxwo2INR0lmZtLBpPgeq+2i
-						Gt+FKLOOOey0ydB0eKD2qDASoqQhOKKNTvgxmWGWiXQwswRQNygLyvbnJ+pIf0GG
-						YyHCyplLkq99nEeChSx7wSjaiD9J5uUDEICJAZo6V6vqNC+DJu6Ztx4Tq1w39m0A
-						QuwgWV4d5XQTLnftAgMBAAGjMzAxMBAGA1UdEQQJMAeCBXNoaWJiMB0GA1UdDgQW
-						BBTuy95SjJcKxjwAb2d7iwYOHVJMETANBgkqhkiG9w0BAQUFAAOCAQEAOeOhi+4R
-						GhqXhKLiw8yUCOSff4x+dDfjzseeWUeBhVyYeMsAklANvDE7nlKB8gcQv9HgHaLC
-						fbo2bGQegAumPYkNBbLbHk5wMM9lcKV+h08ak54ufgY5dxdKN2YYl9EC56egzuJg
-						hTWoSRbwML5X6CGKuKMLSCiEVJXS8hmZHJl1kxmwXKAqArUhFwhfFMYxBbXnBUSV
-						gI3Rbjt43XXJJEt6BhLaLVxqmzndyabdI2u3zx6CdtvFynSPDOA/p8Rifcrfzt20
-						l5nkqOEMNUx0VHYCZ/W+pt8AmPMWGRWjL2wcUndgwrdBVqaeT7Dmz7ozeniJbF1n
-						mCaszq2WwCToAw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.ws.seemis.gov.scot/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibb.ws.seemis.gov.scot/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SEEMIS Group LLP</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SEEMIS Group LLP: Glow Services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.seemis.gov.scot/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>SEEMIS Helpdesk</GivenName>
-    <EmailAddress>mailto:letters@seemis.gov.scot</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Mountfort</SurName>
-    <EmailAddress>mailto:ian.mountfort@seemis.gov.scot</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.ws.seemis.gov.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/shibb.ws.seemis.gov.uk-shibboleth-sp.xml
deleted file mode 100644
index 6c589a8e..00000000
--- a/swamid-interfederations-2.0/shibb.ws.seemis.gov.uk-shibboleth-sp.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://shibb.ws.seemis.gov.uk/shibboleth-sp">
-  <!--
-		This is a "Glow Services" Shibboleth SP for SEEMIS Group LLP.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIC1jCCAb6gAwIBAgIJANnFj5LehaRsMA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
-						BAMTBXNoaWJiMB4XDTEwMDkxMzE0MjEyMloXDTIwMDkxMDE0MjEyMlowEDEOMAwG
-						A1UEAxMFc2hpYmIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtSXC9
-						5Iq68ruXAxPoscW47pepV3+UBJne3/lJ5VxdI3n3QbmM0GfMrd3jDkS4r2BgnYF1
-						veTqa9BCCGKh5Hp6ISDo9dZ4Si/zllypDYhOmcBBbuUr/bjAj7y7hjp9Q18yHBnO
-						FmeYQIXfI5Q5gbEaTT3JCON+65nVMH3rifQvoGU9Dbxwo2INR0lmZtLBpPgeq+2i
-						Gt+FKLOOOey0ydB0eKD2qDASoqQhOKKNTvgxmWGWiXQwswRQNygLyvbnJ+pIf0GG
-						YyHCyplLkq99nEeChSx7wSjaiD9J5uUDEICJAZo6V6vqNC+DJu6Ztx4Tq1w39m0A
-						QuwgWV4d5XQTLnftAgMBAAGjMzAxMBAGA1UdEQQJMAeCBXNoaWJiMB0GA1UdDgQW
-						BBTuy95SjJcKxjwAb2d7iwYOHVJMETANBgkqhkiG9w0BAQUFAAOCAQEAOeOhi+4R
-						GhqXhKLiw8yUCOSff4x+dDfjzseeWUeBhVyYeMsAklANvDE7nlKB8gcQv9HgHaLC
-						fbo2bGQegAumPYkNBbLbHk5wMM9lcKV+h08ak54ufgY5dxdKN2YYl9EC56egzuJg
-						hTWoSRbwML5X6CGKuKMLSCiEVJXS8hmZHJl1kxmwXKAqArUhFwhfFMYxBbXnBUSV
-						gI3Rbjt43XXJJEt6BhLaLVxqmzndyabdI2u3zx6CdtvFynSPDOA/p8Rifcrfzt20
-						l5nkqOEMNUx0VHYCZ/W+pt8AmPMWGRWjL2wcUndgwrdBVqaeT7Dmz7ozeniJbF1n
-						mCaszq2WwCToAw==
-					</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>
-						MIIC1jCCAb6gAwIBAgIJANnFj5LehaRsMA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
-						BAMTBXNoaWJiMB4XDTEwMDkxMzE0MjEyMloXDTIwMDkxMDE0MjEyMlowEDEOMAwG
-						A1UEAxMFc2hpYmIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtSXC9
-						5Iq68ruXAxPoscW47pepV3+UBJne3/lJ5VxdI3n3QbmM0GfMrd3jDkS4r2BgnYF1
-						veTqa9BCCGKh5Hp6ISDo9dZ4Si/zllypDYhOmcBBbuUr/bjAj7y7hjp9Q18yHBnO
-						FmeYQIXfI5Q5gbEaTT3JCON+65nVMH3rifQvoGU9Dbxwo2INR0lmZtLBpPgeq+2i
-						Gt+FKLOOOey0ydB0eKD2qDASoqQhOKKNTvgxmWGWiXQwswRQNygLyvbnJ+pIf0GG
-						YyHCyplLkq99nEeChSx7wSjaiD9J5uUDEICJAZo6V6vqNC+DJu6Ztx4Tq1w39m0A
-						QuwgWV4d5XQTLnftAgMBAAGjMzAxMBAGA1UdEQQJMAeCBXNoaWJiMB0GA1UdDgQW
-						BBTuy95SjJcKxjwAb2d7iwYOHVJMETANBgkqhkiG9w0BAQUFAAOCAQEAOeOhi+4R
-						GhqXhKLiw8yUCOSff4x+dDfjzseeWUeBhVyYeMsAklANvDE7nlKB8gcQv9HgHaLC
-						fbo2bGQegAumPYkNBbLbHk5wMM9lcKV+h08ak54ufgY5dxdKN2YYl9EC56egzuJg
-						hTWoSRbwML5X6CGKuKMLSCiEVJXS8hmZHJl1kxmwXKAqArUhFwhfFMYxBbXnBUSV
-						gI3Rbjt43XXJJEt6BhLaLVxqmzndyabdI2u3zx6CdtvFynSPDOA/p8Rifcrfzt20
-						l5nkqOEMNUx0VHYCZ/W+pt8AmPMWGRWjL2wcUndgwrdBVqaeT7Dmz7ozeniJbF1n
-						mCaszq2WwCToAw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.ws.seemis.gov.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibb.ws.seemis.gov.uk/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SEEMIS Group LLP</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SEEMIS Group LLP: Glow Services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.seemis.gov.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>SEEMIS Helpdesk</GivenName>
-    <EmailAddress>mailto:letters@seemis.gov.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Mountfort</SurName>
-    <EmailAddress>mailto:ian.mountfort@seemis.gov.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb.zalf.de.xml b/swamid-interfederations-2.0/shibb.zalf.de.xml
deleted file mode 100644
index 5d23668b..00000000
--- a/swamid-interfederations-2.0/shibb.zalf.de.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibb.zalf.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">zalf.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb.zalf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb.zalf.de,O=Leibniz-Zentrum fuer Agrarlandschaftsforschung (ZALF) e. V.,L=Muencheberg,ST=Brandenburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEDgvYszANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-REUxFDASBgNVBAgTC0JyYW5kZW5idXJnMRQwEgYDVQQHEwtNdWVuY2hlYmVyZzFE
-MEIGA1UEChM7TGVpYm5pei1aZW50cnVtIGZ1ZXIgQWdyYXJsYW5kc2NoYWZ0c2Zv
-cnNjaHVuZyAoWkFMRikgZS4gVi4xEDAOBgNVBAMTB1pBTEYgQ0ExGjAYBgkqhkiG
-9w0BCQEWC3BraUB6YWxmLmRlMB4XDTA5MDQyMDExMjMxNloXDTE0MDQxOTExMjMx
-NlowgZcxCzAJBgNVBAYTAkRFMRQwEgYDVQQIEwtCcmFuZGVuYnVyZzEUMBIGA1UE
-BxMLTXVlbmNoZWJlcmcxRDBCBgNVBAoTO0xlaWJuaXotWmVudHJ1bSBmdWVyIEFn
-cmFybGFuZHNjaGFmdHNmb3JzY2h1bmcgKFpBTEYpIGUuIFYuMRYwFAYDVQQDEw1z
-aGliYi56YWxmLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApatl
-y7Vna/XNIJwgKezoSlcgMOsOc+865rtyzbo+8hjKvVzxqrLS8CeNQ6wpoVduXqsg
-ziaFAUBJrYVxj6VjOKRweaD7RKTV9FMZCVVjDBStXsVnXHawXOAL/IesbMkvqDln
-GtYWs8LnqPu5APtNrT1CNuk86ME+Irrcl0t2pDrxJaVsKDvAuMZk5tenTylg1fq+
-KkYLfTlA1dQ4J0GX6MMO46JURQGISghexTW/ScJLRZE/TOJs2n0K1zax1Yjh0eeN
-pk8EVUIi2+zZPf3mYUZu5ft3xZi0ZEbtujDuw+uHudzZrlFQM4nxb3Ii0V/v03YX
-TPlf/PZpRKBVUlKBzwIDAQABo4IBjTCCAYkwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSqCdHs
-Pu2om5wrmqAdtPu01OdVnzAfBgNVHSMEGDAWgBQWxG4NO/iVdmAZI182/JOTeWb0
-ljB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3phbGYt
-Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvemFsZi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvemFsZi1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvemFsZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAIHV1yYEKLEMiY7YSVaGqUKHnCTULooHEPR0V0xTeUBdABx5XinkImDE
-Xc6Al9M8bp55ML0A9KYHd7dViab3Jd6PDp5HkRGgg9MjlqkVR8RYfAb1dKMLaV5w
-Y+S2yv5K8cJOc2Es58a0ADLrhgtgimotAOjzwX96LJ+66l43UXeh+YVbxJhKyfmw
-FtKWvwQr14Xa7GTVdBQTbxjzTFsvaMtER+M34iMTTvI+U6UXLS0NOLgvCZ3iPRM4
-y5ROjHSpxTb2+b4pGMjvvr3IIFeEDN9oVJ6gvl1okX9zFpe1w0NeFLsQvPq2n7G6
-hEN/Mg6m61y0ay6D2X3UJOaDMjKuE0M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb.zalf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb.zalf.de,O=Leibniz-Zentrum fuer Agrarlandschaftsforschung (ZALF) e. V.,L=Muencheberg,ST=Brandenburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEDgvYszANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-REUxFDASBgNVBAgTC0JyYW5kZW5idXJnMRQwEgYDVQQHEwtNdWVuY2hlYmVyZzFE
-MEIGA1UEChM7TGVpYm5pei1aZW50cnVtIGZ1ZXIgQWdyYXJsYW5kc2NoYWZ0c2Zv
-cnNjaHVuZyAoWkFMRikgZS4gVi4xEDAOBgNVBAMTB1pBTEYgQ0ExGjAYBgkqhkiG
-9w0BCQEWC3BraUB6YWxmLmRlMB4XDTA5MDQyMDExMjMxNloXDTE0MDQxOTExMjMx
-NlowgZcxCzAJBgNVBAYTAkRFMRQwEgYDVQQIEwtCcmFuZGVuYnVyZzEUMBIGA1UE
-BxMLTXVlbmNoZWJlcmcxRDBCBgNVBAoTO0xlaWJuaXotWmVudHJ1bSBmdWVyIEFn
-cmFybGFuZHNjaGFmdHNmb3JzY2h1bmcgKFpBTEYpIGUuIFYuMRYwFAYDVQQDEw1z
-aGliYi56YWxmLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApatl
-y7Vna/XNIJwgKezoSlcgMOsOc+865rtyzbo+8hjKvVzxqrLS8CeNQ6wpoVduXqsg
-ziaFAUBJrYVxj6VjOKRweaD7RKTV9FMZCVVjDBStXsVnXHawXOAL/IesbMkvqDln
-GtYWs8LnqPu5APtNrT1CNuk86ME+Irrcl0t2pDrxJaVsKDvAuMZk5tenTylg1fq+
-KkYLfTlA1dQ4J0GX6MMO46JURQGISghexTW/ScJLRZE/TOJs2n0K1zax1Yjh0eeN
-pk8EVUIi2+zZPf3mYUZu5ft3xZi0ZEbtujDuw+uHudzZrlFQM4nxb3Ii0V/v03YX
-TPlf/PZpRKBVUlKBzwIDAQABo4IBjTCCAYkwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSqCdHs
-Pu2om5wrmqAdtPu01OdVnzAfBgNVHSMEGDAWgBQWxG4NO/iVdmAZI182/JOTeWb0
-ljB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3phbGYt
-Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvemFsZi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvemFsZi1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvemFsZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAIHV1yYEKLEMiY7YSVaGqUKHnCTULooHEPR0V0xTeUBdABx5XinkImDE
-Xc6Al9M8bp55ML0A9KYHd7dViab3Jd6PDp5HkRGgg9MjlqkVR8RYfAb1dKMLaV5w
-Y+S2yv5K8cJOc2Es58a0ADLrhgtgimotAOjzwX96LJ+66l43UXeh+YVbxJhKyfmw
-FtKWvwQr14Xa7GTVdBQTbxjzTFsvaMtER+M34iMTTvI+U6UXLS0NOLgvCZ3iPRM4
-y5ROjHSpxTb2+b4pGMjvvr3IIFeEDN9oVJ6gvl1okX9zFpe1w0NeFLsQvPq2n7G6
-hEN/Mg6m61y0ay6D2X3UJOaDMjKuE0M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.zalf.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.zalf.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.zalf.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.zalf.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.zalf.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">zalf.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb.zalf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb.zalf.de,O=Leibniz-Zentrum fuer Agrarlandschaftsforschung (ZALF) e. V.,L=Muencheberg,ST=Brandenburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEDgvYszANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-REUxFDASBgNVBAgTC0JyYW5kZW5idXJnMRQwEgYDVQQHEwtNdWVuY2hlYmVyZzFE
-MEIGA1UEChM7TGVpYm5pei1aZW50cnVtIGZ1ZXIgQWdyYXJsYW5kc2NoYWZ0c2Zv
-cnNjaHVuZyAoWkFMRikgZS4gVi4xEDAOBgNVBAMTB1pBTEYgQ0ExGjAYBgkqhkiG
-9w0BCQEWC3BraUB6YWxmLmRlMB4XDTA5MDQyMDExMjMxNloXDTE0MDQxOTExMjMx
-NlowgZcxCzAJBgNVBAYTAkRFMRQwEgYDVQQIEwtCcmFuZGVuYnVyZzEUMBIGA1UE
-BxMLTXVlbmNoZWJlcmcxRDBCBgNVBAoTO0xlaWJuaXotWmVudHJ1bSBmdWVyIEFn
-cmFybGFuZHNjaGFmdHNmb3JzY2h1bmcgKFpBTEYpIGUuIFYuMRYwFAYDVQQDEw1z
-aGliYi56YWxmLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApatl
-y7Vna/XNIJwgKezoSlcgMOsOc+865rtyzbo+8hjKvVzxqrLS8CeNQ6wpoVduXqsg
-ziaFAUBJrYVxj6VjOKRweaD7RKTV9FMZCVVjDBStXsVnXHawXOAL/IesbMkvqDln
-GtYWs8LnqPu5APtNrT1CNuk86ME+Irrcl0t2pDrxJaVsKDvAuMZk5tenTylg1fq+
-KkYLfTlA1dQ4J0GX6MMO46JURQGISghexTW/ScJLRZE/TOJs2n0K1zax1Yjh0eeN
-pk8EVUIi2+zZPf3mYUZu5ft3xZi0ZEbtujDuw+uHudzZrlFQM4nxb3Ii0V/v03YX
-TPlf/PZpRKBVUlKBzwIDAQABo4IBjTCCAYkwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSqCdHs
-Pu2om5wrmqAdtPu01OdVnzAfBgNVHSMEGDAWgBQWxG4NO/iVdmAZI182/JOTeWb0
-ljB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3phbGYt
-Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvemFsZi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvemFsZi1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvemFsZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAIHV1yYEKLEMiY7YSVaGqUKHnCTULooHEPR0V0xTeUBdABx5XinkImDE
-Xc6Al9M8bp55ML0A9KYHd7dViab3Jd6PDp5HkRGgg9MjlqkVR8RYfAb1dKMLaV5w
-Y+S2yv5K8cJOc2Es58a0ADLrhgtgimotAOjzwX96LJ+66l43UXeh+YVbxJhKyfmw
-FtKWvwQr14Xa7GTVdBQTbxjzTFsvaMtER+M34iMTTvI+U6UXLS0NOLgvCZ3iPRM4
-y5ROjHSpxTb2+b4pGMjvvr3IIFeEDN9oVJ6gvl1okX9zFpe1w0NeFLsQvPq2n7G6
-hEN/Mg6m61y0ay6D2X3UJOaDMjKuE0M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibb.zalf.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibb.zalf.de,O=Leibniz-Zentrum fuer Agrarlandschaftsforschung (ZALF) e. V.,L=Muencheberg,ST=Brandenburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFUzCCBDugAwIBAgIEDgvYszANBgkqhkiG9w0BAQUFADCBrTELMAkGA1UEBhMC
-REUxFDASBgNVBAgTC0JyYW5kZW5idXJnMRQwEgYDVQQHEwtNdWVuY2hlYmVyZzFE
-MEIGA1UEChM7TGVpYm5pei1aZW50cnVtIGZ1ZXIgQWdyYXJsYW5kc2NoYWZ0c2Zv
-cnNjaHVuZyAoWkFMRikgZS4gVi4xEDAOBgNVBAMTB1pBTEYgQ0ExGjAYBgkqhkiG
-9w0BCQEWC3BraUB6YWxmLmRlMB4XDTA5MDQyMDExMjMxNloXDTE0MDQxOTExMjMx
-NlowgZcxCzAJBgNVBAYTAkRFMRQwEgYDVQQIEwtCcmFuZGVuYnVyZzEUMBIGA1UE
-BxMLTXVlbmNoZWJlcmcxRDBCBgNVBAoTO0xlaWJuaXotWmVudHJ1bSBmdWVyIEFn
-cmFybGFuZHNjaGFmdHNmb3JzY2h1bmcgKFpBTEYpIGUuIFYuMRYwFAYDVQQDEw1z
-aGliYi56YWxmLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApatl
-y7Vna/XNIJwgKezoSlcgMOsOc+865rtyzbo+8hjKvVzxqrLS8CeNQ6wpoVduXqsg
-ziaFAUBJrYVxj6VjOKRweaD7RKTV9FMZCVVjDBStXsVnXHawXOAL/IesbMkvqDln
-GtYWs8LnqPu5APtNrT1CNuk86ME+Irrcl0t2pDrxJaVsKDvAuMZk5tenTylg1fq+
-KkYLfTlA1dQ4J0GX6MMO46JURQGISghexTW/ScJLRZE/TOJs2n0K1zax1Yjh0eeN
-pk8EVUIi2+zZPf3mYUZu5ft3xZi0ZEbtujDuw+uHudzZrlFQM4nxb3Ii0V/v03YX
-TPlf/PZpRKBVUlKBzwIDAQABo4IBjTCCAYkwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSqCdHs
-Pu2om5wrmqAdtPu01OdVnzAfBgNVHSMEGDAWgBQWxG4NO/iVdmAZI182/JOTeWb0
-ljB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3phbGYt
-Y2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvemFsZi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYBBQUHAQEEgYcwgYQw
-QAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvemFsZi1jYS9wdWIv
-Y2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvemFsZi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAIHV1yYEKLEMiY7YSVaGqUKHnCTULooHEPR0V0xTeUBdABx5XinkImDE
-Xc6Al9M8bp55ML0A9KYHd7dViab3Jd6PDp5HkRGgg9MjlqkVR8RYfAb1dKMLaV5w
-Y+S2yv5K8cJOc2Es58a0ADLrhgtgimotAOjzwX96LJ+66l43UXeh+YVbxJhKyfmw
-FtKWvwQr14Xa7GTVdBQTbxjzTFsvaMtER+M34iMTTvI+U6UXLS0NOLgvCZ3iPRM4
-y5ROjHSpxTb2+b4pGMjvvr3IIFeEDN9oVJ6gvl1okX9zFpe1w0NeFLsQvPq2n7G6
-hEN/Mg6m61y0ay6D2X3UJOaDMjKuE0M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.zalf.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.zalf.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Leibniz-Zentrum für Agrarlandschaftsforschung (ZALF) e. V. Müncheberg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ZALF Müncheberg IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.zalf.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gunar</GivenName>
-    <SurName>Maiwald</SurName>
-    <EmailAddress>maiwald@zib.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gunar</GivenName>
-    <SurName>Maiwald</SurName>
-    <EmailAddress>maiwald@zib.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml b/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
deleted file mode 100644
index f52965fa..00000000
--- a/swamid-interfederations-2.0/shibb1.hj.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://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>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</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">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="84" width="749" xml:lang="sv">https://shibb1.hj.se/idp/images/logo.png</mdui:Logo>
-        <mdui:Logo height="84" width="749" xml:lang="en">https://shibb1.hj.se/idp/images/logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://hj.se/it-helpdesk/faq---manualer/mitt-anvandarkonto/ovrigt/gemensam-inloggningstjanst.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://hj.se/en/it-helpdesk/ju-faq---manuals/my-user-account/other/joint-web-login-service.html</mdui:PrivacyStatementURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.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://shibb1.hj.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb1.hj.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb1.hj.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb1.hj.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">hj.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb1.hj.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb1.hj.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">HJ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Jönköping University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hj.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Jönköping University</md:Company>
-    <md:SurName>Joakim Danielsson</md:SurName>
-    <md:EmailAddress>mailto:Joakim.Danielsson@hj.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 36 101116</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Jönköping University</md:Company>
-    <md:SurName>Stefan Kindh</md:SurName>
-    <md:EmailAddress>mailto:Stefan.Kindh@hj.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 36 101170</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Jönköping University</md:Company>
-    <md:SurName>IT-Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@hj.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 36 101112</md:TelephoneNumber>
-  </md: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 0ee7808e..00000000
--- a/swamid-interfederations-2.0/shibb1.hj.se.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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: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: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="technical">
-    <Company>Högskolan i Jönköping</Company>
-    <EmailAddress>Stefan.Kindh@hj.se</EmailAddress>
-  </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 c59baf0b..00000000
--- a/swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.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://shibbo.ec-nantes.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Ecole Centrale de Nantes</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAAFNSURBVCjPPdCxS5RxHIDxz/f3vr52lYSaoQWhRUlQSzTUJA0txTm02NAuTf07+QcEDk0dhdAUNQVC0SCNXhyGQXjCXV7d+/4alJ71eaYnHs6njWiLrGVCXyhlDeTcadaL5Zflag7G7rnvs7/WTOpKIsrlfD1Fu0ah9sM5ax67idqUpBbtUmSn3DIy45IVDC1JLnunL6KEcM2qgV/2LDjtqeSFQ41CggOvfVEbWzBWS7KBWYsos7PuumDKyHkjP834rfLItJ6uksoVdyzqqdDDkZF9e7aRwoE3Pgi1gUnTthUqm96rhUStr1FoDHHVSMcZN7QEUjbrmQdCaYjCbd+90nVMGYY+2vVE6Q+4aM5bEwIkjnzyVWNCBcZqTjRJzpY8N+tIC3yzqzjRcsqdyowdm7bsy9j5HxRyJ1bmpza0c2Qha5lzqH88OOdOs/4P2YNzUjZh7G4AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTQrMDI6MDCHVYN/AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU0KzAyOjAw9gg7wwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ec-nantes.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Ecole Centrale de Nantes</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>
-					      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>
-    </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-POST" Location="https://shibbo.ec-nantes.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ec-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ec-nantes.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Centrale de Nantes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Centrale de Nantes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ec-nantes.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>cri-sys@ec-nantes.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 17ae5c7f..00000000
--- a/swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.emse.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Ecole des Mines de Saint-Etienne</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB4UlEQVQ4y9WSX0hTARTGv3Pv9U9x53Ut72zgqFybJkhloA0RsQeJgojooWAbEj34IELQQxE9BdJDQaOwQeG2FJFMfInoJXHRzc2REIjNdM5h01zZDFviWqenhaK9+BJ9b9+B38c5hw/470XbBaOvmUiA4a8BXge3EcH0C8hMLWpHLKr9FjEOAlAADAOoZEJc3AIUVJ0lUqavdksiPo4nXl6oMDa8DcX6LhfmycL052CtUWeZBVD8I7Ncv2mDjtPvu0062xAETDHjEID+D0nNIxcYUpFPgaa1n2m9JOZ/P25rPeXy04iw4S6NDyx8i1hYxGNijBKhjwiyVbXf31Nke3bjziVraZE13GRtPeHy08jmx2h89O65hGedVwGgy8mG3Oz22fijqMa1OS+tD3j1AOJ0MnQ4qnFhoBPXAp144XNyJYCYz8kSEVKjs4PVQNnXHPPnBK+DW8LxwXvlJXVj19vdX5IrM+ZwfMDNjMZMNtMOQJEE6Pcaat7tt9NkjhOjGu8wpy56duYpQZNSsbaUnjOWyPsmE8sTthrzma6JhaFmo668B4AajD19ePP5sZMbiuRz8nmXn3q9Dr4KYA5AFRFCWcJYenXpipy/a56RVQQSgy4/PdmyNDNvePd2G/nv9Rtal7AqsQkV4AAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo1OSswMjowMOaC4r8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NTkrMDI6MDCX31oDAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.emse.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Ecole des Mines de Saint-Etienne</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>
-					      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>
-    </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-POST" Location="https://shibbo.emse.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.emse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.emse.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole des Mines de Saint-Etienne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole des Mines de Saint-Etienne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.emse.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi-admin@emse.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.enc.sorbonne.fr-idp-login.jsp-actionUrl--idp-Authn-UserPassword.xml b/swamid-interfederations-2.0/shibbo.enc.sorbonne.fr-idp-login.jsp-actionUrl--idp-Authn-UserPassword.xml
deleted file mode 100644
index 2e9ff481..00000000
--- a/swamid-interfederations-2.0/shibbo.enc.sorbonne.fr-idp-login.jsp-actionUrl--idp-Authn-UserPassword.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://shibbo.enc.sorbonne.fr/idp/login.jsp?actionUrl=%2Fidp%2FAuthn%2FUserPassword">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-05-27T14:29:47Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enc.sorbonne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ecole Nationale des Chartes</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZElEQVQoz5WSTU8TURSGz507czvTaacfFlCioEATAwkLEEgMK9iYuNKNiX/ExJ1/wYWJP4DEjTGRmLAwJn7ECCaopCja0hSKpdChH8x07nz03uMCgkZXvrtz3ufkbB6CiPA/Uf5dFasNAFgtVADA5eHfNf6RH5VDiVg/ck5Gxws6Dne8wHH5GXP6oWYfd/2eAHn/4dOMZSytrK0WKnbLffD4efWglTD1cq15QhJEbHZ4KqE/e7WeSZkSUQihx5gQMuoJCch5oMf0m/MTQiClREFEy2SuH3zfqdft40jI/NBAOplIW+al8+d0Ve3PWp+2Km433No5QETScTwkZOnFh7nJUcvQx4ZyEmDfbuuMGUzTNOp2/ZrdWtvcvXtjtid6is40KQQAVOtHRlz1goj7kdMN7LYLIP0gkhKXX28Ud/bbxx4FII7LPxerrQ6fn86HYVQo1abGhwGAqZoQ0cq7rwuz+XQy/ma9hADXJ0cUSpXxkcHtvcajJy+/lWtMo5QQRgmgRATT1DbL9Tv3Hi+/3ZgYG5QoVYkSQBnszwqR3Dto9WUtBUAhClEUABmGIqTR7cWZjBWPqRQlEs65w3t+EL7/Ui7/PDSY5ofRhVxapaRUbfRlE5Vac/Ri38LceMYyEjFVBYC4TgHYQC6VSuq5TPKo7Xo89MPo1uJUtd60O3x2ciRjGQajAEA8zwMAKSEUUtPoZrHW7vJeL5JSMQ0WCjF9dZhphNFTJ4jruqcaUgqIQkoeiLYTBGF0eTAFiJRSKeWZe78PbIeXdhszE1c+Frb3DzuUEhbTmKqaeqzrBwvX8ifYL1UkZ1awU1oLAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjU3KzAyOjAwtr2Z4gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo1NyswMjowMMfgIV4AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.enc.sorbonne.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">University</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale des Chartes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Universités</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>
-					      MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
-					    </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>
-					      MIIDQzCCAiugAwIBAgIURnlTsFhmhP9SZsM1c3xkx3LTTKIwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvLmVuYy5zb3Jib25uZS5mcjAeFw0xMzA3MjAx
-NjE0NDdaFw0zMzA3MjAxNjE0NDdaMCExHzAdBgNVBAMTFnNoaWJiby5lbmMuc29y
-Ym9ubmUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrnh3dyFgQ
-96onZcQwb6/HkwUrYzo7dKYV3GxYLmhk3t1eysQXxyM7VuLMuPvU9nUy23NKc6W9
-ajbVKvMlR91NF10pk48VmVeMoGp9HwEUMHfneEtbdcO/kk0R5MIc4D6P9R3qWUIw
-Iy32z+dtp+IGHRdx/4kWmWIw6+OUdS/ZKGDNlwR2/JqLsyeb2XKQQ2WCtwGCcnXt
-pO1LY6lV6QwBp3FE1Nu2SpSXEtzN33Oki0ghKbzJ6fP79QKDIfPJUKdTJGMRGn5c
-3LsNsMGB3gOg+kPDgGSeHVh5j2QE5ABNIgJozg5K3H+iudoRy+nSaVN45f/YbKjM
-rp6jqjD/MACzAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJiby5lbmMuc29yYm9u
-bmUuZnKGLWh0dHBzOi8vc2hpYmJvLmVuYy5zb3Jib25uZS5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUvt3HHwVsw8VLJc7YzdsjINBuSIkwDQYJKoZIhvcNAQEF
-BQADggEBAE9rUUSoc7EA3Uzk6sx9pqyQNugQOlFiYkgMSVT4+ivdO6vmFQXSrJtw
-fhB6RG+2Ja/9OC/tQBldKIVfoXNZHy7ve8tAyrNelzUhaj7mtHPaRPd/owRCOvGm
-A3KDCWMAD7e7GsSh+P0/Ne0oOewtXzA2Fcvi22rIl+WvNTX3FPZC/JxsTzromHBX
-p/PrFufvy7aCGSg8ro1wZIwYugRoOGFcEjuLkcbcKfGcJaxgQEDqnCu+lMD0o6Vr
-VlLcDEoXwC/Adlyoqe7kjVDBg2xrL8zmQfFcOlm/TRuflM2qjrbr7VT32g58/RD6
-IlPUl5fmLrWrbbk9h0uCYWVxUMZ5qmA=
-					    </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-POST" Location="https://shibbo.enc.sorbonne.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.enc.sorbonne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.enc.sorbonne.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Nationale des Chartes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale des Chartes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.enc.sorbonne.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>informatique@enc.sorbonne.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.enc.sorbonne.fr-idp-login.jsp-actionUrl-/idp/Authn/UserPassword.xml b/swamid-interfederations-2.0/shibbo.enc.sorbonne.fr-idp-login.jsp-actionUrl-/idp/Authn/UserPassword.xml
deleted file mode 100644
index 83936347..00000000
--- a/swamid-interfederations-2.0/shibbo.enc.sorbonne.fr-idp-login.jsp-actionUrl-/idp/Authn/UserPassword.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.enc.sorbonne.fr/idp/login.jsp?actionUrl=%2Fidp%2FAuthn%2FUserPassword">
-    <md:Extensions>
-      <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2013-05-27T14:29:47Z">
-        <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-      </mdrpi:RegistrationInfo>
-    </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enc.sorbonne.fr</shibmd:Scope>
-        <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-          <mdui:DisplayName xml:lang="en">Ecole Nationale des Chartes</mdui:DisplayName>
-          <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZElEQVQoz5WSTU8TURSGz507czvTaacfFlCioEATAwkLEEgMK9iYuNKNiX/ExJ1/wYWJP4DEjTGRmLAwJn7ECCaopCja0hSKpdChH8x07nz03uMCgkZXvrtz3ufkbB6CiPA/Uf5dFasNAFgtVADA5eHfNf6RH5VDiVg/ck5Gxws6Dne8wHH5GXP6oWYfd/2eAHn/4dOMZSytrK0WKnbLffD4efWglTD1cq15QhJEbHZ4KqE/e7WeSZkSUQihx5gQMuoJCch5oMf0m/MTQiClREFEy2SuH3zfqdft40jI/NBAOplIW+al8+d0Ve3PWp+2Km433No5QETScTwkZOnFh7nJUcvQx4ZyEmDfbuuMGUzTNOp2/ZrdWtvcvXtjtid6is40KQQAVOtHRlz1goj7kdMN7LYLIP0gkhKXX28Ud/bbxx4FII7LPxerrQ6fn86HYVQo1abGhwGAqZoQ0cq7rwuz+XQy/ma9hADXJ0cUSpXxkcHtvcajJy+/lWtMo5QQRgmgRATT1DbL9Tv3Hi+/3ZgYG5QoVYkSQBnszwqR3Dto9WUtBUAhClEUABmGIqTR7cWZjBWPqRQlEs65w3t+EL7/Ui7/PDSY5ofRhVxapaRUbfRlE5Vac/Ri38LceMYyEjFVBYC4TgHYQC6VSuq5TPKo7Xo89MPo1uJUtd60O3x2ciRjGQajAEA8zwMAKSEUUtPoZrHW7vJeL5JSMQ0WCjF9dZhphNFTJ4jruqcaUgqIQkoeiLYTBGF0eTAFiJRSKeWZe78PbIeXdhszE1c+Frb3DzuUEhbTmKqaeqzrBwvX8ifYL1UkZ1awU1oLAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjU3KzAyOjAwtr2Z4gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo1NyswMjowMMfgIV4AAAAASUVORK5CYII=</mdui:Logo>
-          <mdui:InformationURL xml:lang="fr">http://www.enc.sorbonne.fr</mdui:InformationURL>
-          <mdui:Description xml:lang="en">University</mdui:Description>
-          <mdui:DisplayName xml:lang="fr">Ecole Nationale des Chartes</mdui:DisplayName>
-          <mdui:Description xml:lang="fr">Universités</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>
-					      MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
-					    </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>
-					      MIIDQzCCAiugAwIBAgIURnlTsFhmhP9SZsM1c3xkx3LTTKIwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvLmVuYy5zb3Jib25uZS5mcjAeFw0xMzA3MjAx
-NjE0NDdaFw0zMzA3MjAxNjE0NDdaMCExHzAdBgNVBAMTFnNoaWJiby5lbmMuc29y
-Ym9ubmUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrnh3dyFgQ
-96onZcQwb6/HkwUrYzo7dKYV3GxYLmhk3t1eysQXxyM7VuLMuPvU9nUy23NKc6W9
-ajbVKvMlR91NF10pk48VmVeMoGp9HwEUMHfneEtbdcO/kk0R5MIc4D6P9R3qWUIw
-Iy32z+dtp+IGHRdx/4kWmWIw6+OUdS/ZKGDNlwR2/JqLsyeb2XKQQ2WCtwGCcnXt
-pO1LY6lV6QwBp3FE1Nu2SpSXEtzN33Oki0ghKbzJ6fP79QKDIfPJUKdTJGMRGn5c
-3LsNsMGB3gOg+kPDgGSeHVh5j2QE5ABNIgJozg5K3H+iudoRy+nSaVN45f/YbKjM
-rp6jqjD/MACzAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJiby5lbmMuc29yYm9u
-bmUuZnKGLWh0dHBzOi8vc2hpYmJvLmVuYy5zb3Jib25uZS5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUvt3HHwVsw8VLJc7YzdsjINBuSIkwDQYJKoZIhvcNAQEF
-BQADggEBAE9rUUSoc7EA3Uzk6sx9pqyQNugQOlFiYkgMSVT4+ivdO6vmFQXSrJtw
-fhB6RG+2Ja/9OC/tQBldKIVfoXNZHy7ve8tAyrNelzUhaj7mtHPaRPd/owRCOvGm
-A3KDCWMAD7e7GsSh+P0/Ne0oOewtXzA2Fcvi22rIl+WvNTX3FPZC/JxsTzromHBX
-p/PrFufvy7aCGSg8ro1wZIwYugRoOGFcEjuLkcbcKfGcJaxgQEDqnCu+lMD0o6Vr
-VlLcDEoXwC/Adlyoqe7kjVDBg2xrL8zmQfFcOlm/TRuflM2qjrbr7VT32g58/RD6
-IlPUl5fmLrWrbbk9h0uCYWVxUMZ5qmA=
-					    </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-POST" Location="https://shibbo.enc.sorbonne.fr/idp/profile/SAML2/POST/SSO"/>
-      <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.enc.sorbonne.fr/idp/profile/SAML2/Redirect/SSO"/>
-      <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.enc.sorbonne.fr/idp/profile/Shibboleth/SSO"/>
-    </md:IDPSSODescriptor>
-    <md:Organization>
-      <md:OrganizationName xml:lang="en">Ecole Nationale des Chartes</md:OrganizationName>
-      <md:OrganizationDisplayName xml:lang="en">Ecole Nationale des Chartes</md:OrganizationDisplayName>
-      <md:OrganizationURL xml:lang="en">http://www.enc.sorbonne.fr</md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="technical">
-      <md:EmailAddress>informatique@enc.sorbonne.fr</md:EmailAddress>
-    </md:ContactPerson>
-  </md: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 870e80f7..00000000
--- a/swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.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://shibbo.enise.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENISE</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACJUlEQVQoz02ST0hVQRTGzzkzc692yRJsISQRGNgiSAoKadGuctVWSFdtovYtXLRp0aYgNy0i+0NU4sKNFC0ikqIokkzBwkwfKfjC93g+e+++O3fmnBbjU7/VLH7fN98wH87PzxtjtNbGmHBQSiEiIjIzM3vvnXN5UzqgURTFcRzORLTbwMx5nocUANihoygyxiilCBEQ12uVA0k7CzNziAAAESGtdRRFOzQREt18dX/wyTAgEBHRFhM6k25qi0Zcqfx9ufDxwtHznwt/ilW77dkqrJravrdrZOj1lZFjHad//c7ezKwAACISUWB0CAgoADz4MHG7b6CW7hn/8iOJVe7F49LgmcMAEAxQLpfTNHXOiUipXoXrJ0RkI83Xa7ZUs6WaXas26tYJs7V2c3NTh7eH+HP3rk1ffQoAc8ulxdUNIgQA5/ns8YOHOpJAamYWEaXU5Pd33e2dvV091YZ79L7Q1qqhqamJuTuXelsViAgWi8UkSUTR3uHef7e+JaalkuZeAJu0AIiId7K/Rer1VHvvY2WGnt0YG7ibmBYAmF3aWFythD4AIAIK8cXC9OTli1XntHienJ16PjPW331q9O04Ihit4gQBEEQAgVkU0lz54eNPuv9IHxaWlr+u/czYCYEioubyQhsW1qTaW9uYGRm693Xqhs1OdvZEURz2obUmUqGPiIS12jy31tosS7OGds6l0Mi9y/LMWLP967sNYd7OOefcf6osMhcjak7pAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjMzKzAyOjAwhJ20dgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODozMyswMjowMPXADMoAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.enise.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENISE</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>
-					      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>
-    </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-POST" Location="https://shibbo.enise.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.enise.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.enise.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENISE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENISE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.enise.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Guy Dantony</md:SurName>
-    <md:EmailAddress>dantony@enise.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Garcia</md:SurName>
-    <md:EmailAddress>mathieu.garcia@enise.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2a61ec90..00000000
--- a/swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.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://shibbo.ephe.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACkklEQVQ4y52SW0jTARjFv79bzXssG9Vo5aKlCUNiaoFJUPSQSpqsotIU8RqIBoWZF8gghUjCQIQi5oOEVoLKrGneW0Imal5Q25xuLt3mvambu5yeFCoS7Tydh/M7fHwcon9IBRAaG/rxczGG/kfoaBlsIT56g0/CDFzaGaxRP8bKYtJI9m3MKOrnB4oL1zE+8mp78IS6uEscgKHMJDQRF63EhargLjrJE9Bryv/MszfMChzk3tEqI7ddhgOXoyzM0cO7BXmeLpbJKbL4+5HtTpxV+aEpEaphFnMsIPm3lhkHCEDpQHj46kRZCcYS4pfn+rvX2kmAofQ0KMkXnalpljbi4wsRrLDnbV6gdYD2D/Z0vQ8MOn1RPWAgLu/t+MJs3PLEd/KrfULDCgV5kStpDHqO3+tiGK02RvcgN98Ou5zNsHsJBm1tPREmy4rQSARNUQGaiYeu4BDoKyvQRlxUnTuL9qeF+CQUOw11lc6u4xIMSG8AsEW4mHmCqHB5zZKxWk6H0lOIJTxi5F4IdZD7XjI4zeR6QkQizh4a15vIjdhMU+lLxu3WeWK5gnIKH/ozREQ6B8ijRzllnjGuz6uHfDyMJs/JALGLoK+fnBw2tap0FBN2hryuSJsdn9vEpplZrsybl/UoNraM2XiGHXbfHwnxGjPZSF+hIGHGVTL26YnGp8kUKiQfb3cSSa9PL74oP8iprgv0ZTHf/t7A8px0sKFmYTTxGlqflyzYFO8m3qTGQSt7hmoPESwf5XotHJKthzRvSO2OjoSuSrak9JPg6z5/yDOTMJafvca3gr+9NVpXU6AerVXlZqIuIxk2OGMpIkKyLXizxLx4s/dUGEbvZ61RQFDIjuDNEoctP/peTuRWmV+ezla3AwA+jQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MSswMjowMBnHrEYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDBomhT6AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ephe.sorbonne.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://shibbo.ephe.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ephe.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ephe.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">EPHE - Ecole Pratique des Hautes Etudes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ephe.sorbonne.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>interv@ephe.sorbonne.Fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2e2cae05..00000000
--- a/swamid-interfederations-2.0/shibbo.ltu.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://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>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.ltu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo.ltu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.ltu.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">ltu.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.ltu.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">LTU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lulea University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ltu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Lulea University of Technology</md:Company>
-    <md:SurName>LTU Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Lulea University of Technology</md:Company>
-    <md:SurName>LTU Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Lulea University of Technology</md:Company>
-    <md:SurName>LTU Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 6c534b2d..00000000
--- a/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibbo.tul.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                        MIID6jCCAtKgAwIBAgIBCjANBgkqhkiG9w0BAQsFADCBmjELMAkGA1UEBhMCQ1ox
-                        EDAOBgNVBAcTB0xpYmVyZWMxKDAmBgNVBAoTH1RlY2huaWNhbCBVbml2ZXJzaXR5
-                        IG9mIExpYmVyZWMxDjAMBgNVBAsTBUxpYW5lMSIwIAYDVQQDExlUVUwgQ2VydGlm
-                        aWNhdGUgQXV0aG9yaXR5MRswGQYJKoZIhvcNAQkBFgxsaWFuZUB0dWwuY3owHhcN
-                        MTUxMDI2MDAwMDAwWhcNMzAxMDI1MjM1OTU5WjBxMQswCQYDVQQGEwJDWjEQMA4G
-                        A1UEBxMHTGliZXJlYzEoMCYGA1UEChMfVGVjaG5pY2FsIFVuaXZlcnNpdHkgb2Yg
-                        TGliZXJlYzEOMAwGA1UECxMFTGlhbmUxFjAUBgNVBAMTDXNoaWJiby50dWwuY3ow
-                        ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdUYyRY1/QVM6cuR3mTWpw
-                        wHdc6Aeuy/DNUcvzXUEnWZ6bhdPBScu231BBr9NCZ5wr8pZ3N4JB7n5qjScRqpz2
-                        D1VOtb/BLy8mFEThE/wWE6DINbAMzF1FQjGE4vLO7FWt0G1nURxqe5USZkFLIZUL
-                        Wqs1Fnrlfsl1hGbm2ELu/8gfXNbnKQKZ12a8qqojpwIec860+zGS+YkHyYz4IzUq
-                        kRHM0KQG0qcPzeB3OdQMy44nhHknLeNQ7WIpVAn1bx6g3blyAYxEhqGVjGxbm2j1
-                        r+FV2r/0ZrwVavM9aeOw3bX+F/M2VBPBsbimnuE/xYnjVhIN76PcsaMdtSsYR4+9
-                        AgMBAAGjYzBhMAsGA1UdDwQEAwIFoDAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8v
-                        bGlhbmUudHVsLmN6L2NybC90dWxDQS5jcmwwHgYJYIZIAYb4QgENBBEWD3hjYSBj
-                        ZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQsFAAOCAQEAZfabkvqZVo4w4LOoLQfVtTP8
-                        VCI/HoJsgAsYl7Gf2RngZ76XAePhza0JNCfo0SJDJBWca0VtX91EzazFWkRR1cEO
-                        B0IwF0MVLQttZA8XItk0EaXi05sC/s4qeykLk31AP3mPD2SC58Vty2DbPCWJxLBQ
-                        31qNr9zxzVzDVAtzXkVWdfdRrgzFICDIfo9BqELUPCIcw2+/xzoy4h33NB05ZFa7
-                        +UqvbZl6I4Rz3ZWHt8moGUGQF04kKGI3psHS6M0hxMQccNtbb269gFcuK5vb5AZa
-                        nH0Q6NVuH5v93Y3fOM0wIgosOcrB90QrXq5BpWu+XL1VxhyPnSxTf/teOIy3hw==
-                  </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.tul.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:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo.tul.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo.tul.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo.tul.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo.tul.cz/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">tul.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                        MIID6jCCAtKgAwIBAgIBCjANBgkqhkiG9w0BAQsFADCBmjELMAkGA1UEBhMCQ1ox
-                        EDAOBgNVBAcTB0xpYmVyZWMxKDAmBgNVBAoTH1RlY2huaWNhbCBVbml2ZXJzaXR5
-                        IG9mIExpYmVyZWMxDjAMBgNVBAsTBUxpYW5lMSIwIAYDVQQDExlUVUwgQ2VydGlm
-                        aWNhdGUgQXV0aG9yaXR5MRswGQYJKoZIhvcNAQkBFgxsaWFuZUB0dWwuY3owHhcN
-                        MTUxMDI2MDAwMDAwWhcNMzAxMDI1MjM1OTU5WjBxMQswCQYDVQQGEwJDWjEQMA4G
-                        A1UEBxMHTGliZXJlYzEoMCYGA1UEChMfVGVjaG5pY2FsIFVuaXZlcnNpdHkgb2Yg
-                        TGliZXJlYzEOMAwGA1UECxMFTGlhbmUxFjAUBgNVBAMTDXNoaWJiby50dWwuY3ow
-                        ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdUYyRY1/QVM6cuR3mTWpw
-                        wHdc6Aeuy/DNUcvzXUEnWZ6bhdPBScu231BBr9NCZ5wr8pZ3N4JB7n5qjScRqpz2
-                        D1VOtb/BLy8mFEThE/wWE6DINbAMzF1FQjGE4vLO7FWt0G1nURxqe5USZkFLIZUL
-                        Wqs1Fnrlfsl1hGbm2ELu/8gfXNbnKQKZ12a8qqojpwIec860+zGS+YkHyYz4IzUq
-                        kRHM0KQG0qcPzeB3OdQMy44nhHknLeNQ7WIpVAn1bx6g3blyAYxEhqGVjGxbm2j1
-                        r+FV2r/0ZrwVavM9aeOw3bX+F/M2VBPBsbimnuE/xYnjVhIN76PcsaMdtSsYR4+9
-                        AgMBAAGjYzBhMAsGA1UdDwQEAwIFoDAyBgNVHR8EKzApMCegJaAjhiFodHRwOi8v
-                        bGlhbmUudHVsLmN6L2NybC90dWxDQS5jcmwwHgYJYIZIAYb4QgENBBEWD3hjYSBj
-                        ZXJ0aWZpY2F0ZTANBgkqhkiG9w0BAQsFAAOCAQEAZfabkvqZVo4w4LOoLQfVtTP8
-                        VCI/HoJsgAsYl7Gf2RngZ76XAePhza0JNCfo0SJDJBWca0VtX91EzazFWkRR1cEO
-                        B0IwF0MVLQttZA8XItk0EaXi05sC/s4qeykLk31AP3mPD2SC58Vty2DbPCWJxLBQ
-                        31qNr9zxzVzDVAtzXkVWdfdRrgzFICDIfo9BqELUPCIcw2+/xzoy4h33NB05ZFa7
-                        +UqvbZl6I4Rz3ZWHt8moGUGQF04kKGI3psHS6M0hxMQccNtbb269gFcuK5vb5AZa
-                        nH0Q6NVuH5v93Y3fOM0wIgosOcrB90QrXq5BpWu+XL1VxhyPnSxTf/teOIy3hw==
-                  </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo.tul.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo.tul.cz: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:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Technical University of Liberec</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Technická univerzita v Liberci</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Technical University of Liberec</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Technická univerzita v Liberci</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.tul.cz/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.tul.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Adamec</md:SurName>
-    <md:EmailAddress>Petr.Adamec@tul.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>David</md:GivenName>
-    <md:SurName>Kmoch</md:SurName>
-    <md:EmailAddress>David.Kmoch@tul.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-2.baylor.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-2.baylor.edu-idp-shibboleth.xml
deleted file mode 100644
index c3aa2f43..00000000
--- a/swamid-interfederations-2.0/shibboleth-2.baylor.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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://shibboleth-2.baylor.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">baylor.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Baylor University</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>
-MIIDSDCCAjCgAwIBAgIVAJwrpZTSCIpBHJObNPrSziMptCxsMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGgtMi5iYXlsb3IuZWR1MB4XDTA4MTAx
-MDE1NTE1MloXDTI4MTAxMDE1NTE1MlowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC0y
-LmJheWxvci5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxLhS3
-FaukoY9w6xx2ScH9t+VBKN3SgpoNCtlSTA+c+EzlFN1U8JT/TM7frLCW5hw9iCZE
-skLYrWlp6h//hukAf6O+WVNrDD3KnCF3Tnf29Rvf0xM0Xe8Vu7l/O87B6UA5a8+L
-Cw1+7OGBX5Ji6PB/sBDbCCs76G/EA4PqbHFomS03z7Qo8vJaAF5eEoq14FPt154G
-+1mL4MUzrDIB4obFZqFRkJgh8dl13cDFsew5hMQbRVMHnOKIBPspaHJauYHK15SB
-5WRCUdkkn/+cfriS2w+LXPttPryaZNelNmwAEcDdY8WBE6fKRU1O2aYSXt6fPdlB
-5ood0aDV4RjWJ5uTAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGgtMi5i
-YXlsb3IuZWR1hi5odHRwczovL3NoaWJib2xldGgtMi5iYXlsb3IuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTCaiA6Ojg47/4ar0uw2B3+ATl8DDANBgkqhkiG
-9w0BAQUFAAOCAQEAmQ+aPuw0MMuCKdkpBJslXyNI+lKUqdnY/aaMsOwN2M1TGiOL
-pi5thbpX5CTte366j/F+vePY2cQjte2z8h5bZTPr9/v9HaEQqon3uX6cANlXd0CB
-qojrtBlaiI5Ij7xYoO0uqbh2jXs6gJ58DVOHma20spm+qELlaD+lqaTIA1Ge5rma
-JtRoJmSugC0tc/E1FuSWyRkdzxra1ZZjakUbEZBYO0x5STmrFWZ0E6ewMLu6u/X2
-wp8io5JHRYH74kW3WeXaR0/hi2wiaVBsOACQ75dFrlJZTb4oMWGothemjzQV3K3Q
-xXawYVydT5jy18eqkAFFtBDOlRVFXEqY/oOetw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-2.baylor.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-2.baylor.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-2.baylor.edu/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">baylor.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAJwrpZTSCIpBHJObNPrSziMptCxsMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGgtMi5iYXlsb3IuZWR1MB4XDTA4MTAx
-MDE1NTE1MloXDTI4MTAxMDE1NTE1MlowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC0y
-LmJheWxvci5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxLhS3
-FaukoY9w6xx2ScH9t+VBKN3SgpoNCtlSTA+c+EzlFN1U8JT/TM7frLCW5hw9iCZE
-skLYrWlp6h//hukAf6O+WVNrDD3KnCF3Tnf29Rvf0xM0Xe8Vu7l/O87B6UA5a8+L
-Cw1+7OGBX5Ji6PB/sBDbCCs76G/EA4PqbHFomS03z7Qo8vJaAF5eEoq14FPt154G
-+1mL4MUzrDIB4obFZqFRkJgh8dl13cDFsew5hMQbRVMHnOKIBPspaHJauYHK15SB
-5WRCUdkkn/+cfriS2w+LXPttPryaZNelNmwAEcDdY8WBE6fKRU1O2aYSXt6fPdlB
-5ood0aDV4RjWJ5uTAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGgtMi5i
-YXlsb3IuZWR1hi5odHRwczovL3NoaWJib2xldGgtMi5iYXlsb3IuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTCaiA6Ojg47/4ar0uw2B3+ATl8DDANBgkqhkiG
-9w0BAQUFAAOCAQEAmQ+aPuw0MMuCKdkpBJslXyNI+lKUqdnY/aaMsOwN2M1TGiOL
-pi5thbpX5CTte366j/F+vePY2cQjte2z8h5bZTPr9/v9HaEQqon3uX6cANlXd0CB
-qojrtBlaiI5Ij7xYoO0uqbh2jXs6gJ58DVOHma20spm+qELlaD+lqaTIA1Ge5rma
-JtRoJmSugC0tc/E1FuSWyRkdzxra1ZZjakUbEZBYO0x5STmrFWZ0E6ewMLu6u/X2
-wp8io5JHRYH74kW3WeXaR0/hi2wiaVBsOACQ75dFrlJZTb4oMWGothemjzQV3K3Q
-xXawYVydT5jy18eqkAFFtBDOlRVFXEqY/oOetw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-2.baylor.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-2.baylor.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Baylor University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Baylor University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.baylor.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tommy Roberson</md:GivenName>
-    <md:EmailAddress>tommy_roberson@baylor.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Becky King</md:GivenName>
-    <md:EmailAddress>becky_king@baylor.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ray Nazzario</md:GivenName>
-    <md:EmailAddress>ray_nazzario@baylor.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-dev-v.musc.edu-shibboleth-idp.xml b/swamid-interfederations-2.0/shibboleth-dev-v.musc.edu-shibboleth-idp.xml
deleted file mode 100644
index 2349283e..00000000
--- a/swamid-interfederations-2.0/shibboleth-dev-v.musc.edu-shibboleth-idp.xml
+++ /dev/null
@@ -1,120 +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://shibboleth-dev-v.musc.edu/shibboleth-idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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/hide-from-discovery</saml:AttributeValue>
-        <saml:AttributeValue>http://id.incommon.org/category/registered-by-incommon</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">musc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ztest_Medical University of South Carolina</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>
-MIIFZzCCBE+gAwIBAgIJAN5m0nACGtBMMA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
-VQQGEwJVUzEXMBUGA1UECBMOU291dGggQ2Fyb2xpbmExEzARBgNVBAcTCkNoYXJs
-ZXN0b24xLTArBgNVBAoTJE1lZGljYWwgVW5pdmVyc2l0eSBvZiBTb3V0aCBDYXJv
-bGluYTEfMB0GA1UECxMWSW5jaWRlbnQgUmVzcG9uc2UgVGVhbTEiMCAGA1UEAxMZ
-c2hpYmJvbGV0aC1kZXYtdi5tdXNjLmVkdTEhMB8GCSqGSIb3DQEJARYSd2VibWFz
-dGVyQG11c2MuZWR1MB4XDTEwMTEyMjE4MTEyOFoXDTIwMTExOTE4MTEyOFowgdIx
-CzAJBgNVBAYTAlVTMRcwFQYDVQQIEw5Tb3V0aCBDYXJvbGluYTETMBEGA1UEBxMK
-Q2hhcmxlc3RvbjEtMCsGA1UEChMkTWVkaWNhbCBVbml2ZXJzaXR5IG9mIFNvdXRo
-IENhcm9saW5hMR8wHQYDVQQLExZJbmNpZGVudCBSZXNwb25zZSBUZWFtMSIwIAYD
-VQQDExlzaGliYm9sZXRoLWRldi12Lm11c2MuZWR1MSEwHwYJKoZIhvcNAQkBFhJ3
-ZWJtYXN0ZXJAbXVzYy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDCCF+n5SXiIr8D7N0K68NXX8JBqVlHA9Auo0WQh/DDJ4Lf63FYw9eqPXBJeOJT
-RlbKTmq2Q4oHvrkvh4pmssIHvrLjQF5RDHJc/qfGLo+oo+xgPP44jfz4ak8jd7C3
-t8fZWTalElwC1/UfTxOYWPAqHef+6sSp4HD6rkjrwYfnhX3IGCmO5uMuJolIFDlo
-/VyMSO6DehbQsfjm+B3mBRPjkMoMEw9ues7BoY6vnP1GP+72fQOBmc1m4xh5Ysj5
-wl3F1qf1ElsjX2Lt74UimCfvWPpBLCSOwbipaFEKqavhgDJRWnrcTFPke8vC1/Bw
-FYau2JsGxPPzSKSdo2O4YEL7AgMBAAGjggE8MIIBODAdBgNVHQ4EFgQUsrCn25jz
-UegOu65+7KfBsc95K6kwggEHBgNVHSMEgf8wgfyAFLKwp9uY81HoDruufuynwbHP
-eSupoYHYpIHVMIHSMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOU291dGggQ2Fyb2xp
-bmExEzARBgNVBAcTCkNoYXJsZXN0b24xLTArBgNVBAoTJE1lZGljYWwgVW5pdmVy
-c2l0eSBvZiBTb3V0aCBDYXJvbGluYTEfMB0GA1UECxMWSW5jaWRlbnQgUmVzcG9u
-c2UgVGVhbTEiMCAGA1UEAxMZc2hpYmJvbGV0aC1kZXYtdi5tdXNjLmVkdTEhMB8G
-CSqGSIb3DQEJARYSd2VibWFzdGVyQG11c2MuZWR1ggkA3mbScAIa0EwwDAYDVR0T
-BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAQ7L76s5GZWA6vqOCp63oOUE1IPKr
-NZaw732+R42eePV0qVkzTUDHPH4kfdAfnFp8eU3ikkPg8TyDI7bFtMvFcgKUQStv
-924dbbA04MCbqxqoszOs5nILxDV0S8dXf+WHCZIIRb6s4DHm3+rZYLKS4gBvn5B1
-OnY4wSmMr4fMM9XqZDkcZtCwaWJwmK6p1gHOkEUxkBUlT/LxWIUwShOATcsfFPmm
-QM9DHUw4fMzqiqGdj4gYPKb14f1ShAGCKnhzOH/ziiX1EuspJOIkLTWDdJhbMJ+a
-Fk6V6xmt1PTXZUnBvjYptaPWiVFHepuIdkaPr9Mvo7BvOc3CzwmmQUH5XA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML2/POST/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">musc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFZzCCBE+gAwIBAgIJAN5m0nACGtBMMA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
-VQQGEwJVUzEXMBUGA1UECBMOU291dGggQ2Fyb2xpbmExEzARBgNVBAcTCkNoYXJs
-ZXN0b24xLTArBgNVBAoTJE1lZGljYWwgVW5pdmVyc2l0eSBvZiBTb3V0aCBDYXJv
-bGluYTEfMB0GA1UECxMWSW5jaWRlbnQgUmVzcG9uc2UgVGVhbTEiMCAGA1UEAxMZ
-c2hpYmJvbGV0aC1kZXYtdi5tdXNjLmVkdTEhMB8GCSqGSIb3DQEJARYSd2VibWFz
-dGVyQG11c2MuZWR1MB4XDTEwMTEyMjE4MTEyOFoXDTIwMTExOTE4MTEyOFowgdIx
-CzAJBgNVBAYTAlVTMRcwFQYDVQQIEw5Tb3V0aCBDYXJvbGluYTETMBEGA1UEBxMK
-Q2hhcmxlc3RvbjEtMCsGA1UEChMkTWVkaWNhbCBVbml2ZXJzaXR5IG9mIFNvdXRo
-IENhcm9saW5hMR8wHQYDVQQLExZJbmNpZGVudCBSZXNwb25zZSBUZWFtMSIwIAYD
-VQQDExlzaGliYm9sZXRoLWRldi12Lm11c2MuZWR1MSEwHwYJKoZIhvcNAQkBFhJ3
-ZWJtYXN0ZXJAbXVzYy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDCCF+n5SXiIr8D7N0K68NXX8JBqVlHA9Auo0WQh/DDJ4Lf63FYw9eqPXBJeOJT
-RlbKTmq2Q4oHvrkvh4pmssIHvrLjQF5RDHJc/qfGLo+oo+xgPP44jfz4ak8jd7C3
-t8fZWTalElwC1/UfTxOYWPAqHef+6sSp4HD6rkjrwYfnhX3IGCmO5uMuJolIFDlo
-/VyMSO6DehbQsfjm+B3mBRPjkMoMEw9ues7BoY6vnP1GP+72fQOBmc1m4xh5Ysj5
-wl3F1qf1ElsjX2Lt74UimCfvWPpBLCSOwbipaFEKqavhgDJRWnrcTFPke8vC1/Bw
-FYau2JsGxPPzSKSdo2O4YEL7AgMBAAGjggE8MIIBODAdBgNVHQ4EFgQUsrCn25jz
-UegOu65+7KfBsc95K6kwggEHBgNVHSMEgf8wgfyAFLKwp9uY81HoDruufuynwbHP
-eSupoYHYpIHVMIHSMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOU291dGggQ2Fyb2xp
-bmExEzARBgNVBAcTCkNoYXJsZXN0b24xLTArBgNVBAoTJE1lZGljYWwgVW5pdmVy
-c2l0eSBvZiBTb3V0aCBDYXJvbGluYTEfMB0GA1UECxMWSW5jaWRlbnQgUmVzcG9u
-c2UgVGVhbTEiMCAGA1UEAxMZc2hpYmJvbGV0aC1kZXYtdi5tdXNjLmVkdTEhMB8G
-CSqGSIb3DQEJARYSd2VibWFzdGVyQG11c2MuZWR1ggkA3mbScAIa0EwwDAYDVR0T
-BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAQ7L76s5GZWA6vqOCp63oOUE1IPKr
-NZaw732+R42eePV0qVkzTUDHPH4kfdAfnFp8eU3ikkPg8TyDI7bFtMvFcgKUQStv
-924dbbA04MCbqxqoszOs5nILxDV0S8dXf+WHCZIIRb6s4DHm3+rZYLKS4gBvn5B1
-OnY4wSmMr4fMM9XqZDkcZtCwaWJwmK6p1gHOkEUxkBUlT/LxWIUwShOATcsfFPmm
-QM9DHUw4fMzqiqGdj4gYPKb14f1ShAGCKnhzOH/ziiX1EuspJOIkLTWDdJhbMJ+a
-Fk6V6xmt1PTXZUnBvjYptaPWiVFHepuIdkaPr9Mvo7BvOc3CzwmmQUH5XA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-dev-v.musc.edu/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Medical University of South Carolina</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ztest_Medical University of South Carolina</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.musc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Richard Gadsden</md:GivenName>
-    <md:EmailAddress>gadsden@musc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Vanna Vignesh</md:GivenName>
-    <md:EmailAddress>vignesh@musc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-dev.derby.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-dev.derby.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 72d181f0..00000000
--- a/swamid-interfederations-2.0/shibboleth-dev.derby.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://shibboleth-dev.derby.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Derby.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-24T12:03:26Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">derby.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjygAwIBAgIVAIS5CSZypB0N/9WAdPoZcaHvhD9FMA0GCSqGSIb3DQEB
-						BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGgtZGV2LmRlcmJ5LmFjLnVrMB4XDTEz
-						MDYyMDExMjUxN1oXDTMzMDYyMDExMjUxN1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
-						aC1kZXYuZGVyYnkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDAhN9QbYsdN4nENW2bozesyzvCnPKGADL66kcw7+SIXbUcmpiLZctfG2pk8Myq
-						b42n1RQlHcQ9QXcH0DD0bJWNiiiVkBciVtY7WcfxkyTlioc8IfgncHergH0uBVfE
-						YRINrSSbss5l657QRbnbJVJ8R2c0WHS4Pw8Nm40hkbO7GqYkht/MiRL6utW2yrA5
-						ID2o/dXX7NqUr/9NUtvtczfd12reoyradlg7DkqfCHCE8S5Q8CWbj68nbZN+eEK8
-						wdiRnVmyvsC6htWN9HsnYMQAEAqQBA9KHbVsVFAdZsYlIGvjirTDD3n4TLPppfDE
-						YY5HoNYNe1nJJnXAqE/OpBJLAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
-						dGgtZGV2LmRlcmJ5LmFjLnVrhjFodHRwczovL3NoaWJib2xldGgtZGV2LmRlcmJ5
-						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSqUMV7MJKbA3K8FtQY5Ern
-						kVp6BzANBgkqhkiG9w0BAQUFAAOCAQEAXkonAxu78/1gNxTeBdASryyipP8T56v7
-						BptkFIG8pjymWe5JpBFANjePMUrlyYisC3qfivdEJxP51Igw+TEf/rbRL+HFElWC
-						nRgEkUmLAicNpCsDujXAw7J9ID28kcM+Ut8uQqRQs+/potj1TN4WInzjasH2R+Lw
-						yrDOv2opvCGUupfH/dkIGHNdgs0iQRRgp0rUv9OCwwWYcQazmovxHPuXd0yd7uXR
-						0xKNdvCIJ2yeny2x5Bzm3aHXncUn6STA2SZYBOYHZjpFitBpAIc9oASCeMwu2Z18
-						Oa45E8Q95Tq7yvmGFuSBvH0K3ijY+V1yq+oNwRqKaX5QIvNAufFfMw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-dev.derby.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-dev.derby.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://shibboleth-dev.derby.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-dev.derby.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-dev.derby.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-dev.derby.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">derby.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjygAwIBAgIVAIS5CSZypB0N/9WAdPoZcaHvhD9FMA0GCSqGSIb3DQEB
-						BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGgtZGV2LmRlcmJ5LmFjLnVrMB4XDTEz
-						MDYyMDExMjUxN1oXDTMzMDYyMDExMjUxN1owJTEjMCEGA1UEAxMac2hpYmJvbGV0
-						aC1kZXYuZGVyYnkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDAhN9QbYsdN4nENW2bozesyzvCnPKGADL66kcw7+SIXbUcmpiLZctfG2pk8Myq
-						b42n1RQlHcQ9QXcH0DD0bJWNiiiVkBciVtY7WcfxkyTlioc8IfgncHergH0uBVfE
-						YRINrSSbss5l657QRbnbJVJ8R2c0WHS4Pw8Nm40hkbO7GqYkht/MiRL6utW2yrA5
-						ID2o/dXX7NqUr/9NUtvtczfd12reoyradlg7DkqfCHCE8S5Q8CWbj68nbZN+eEK8
-						wdiRnVmyvsC6htWN9HsnYMQAEAqQBA9KHbVsVFAdZsYlIGvjirTDD3n4TLPppfDE
-						YY5HoNYNe1nJJnXAqE/OpBJLAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
-						dGgtZGV2LmRlcmJ5LmFjLnVrhjFodHRwczovL3NoaWJib2xldGgtZGV2LmRlcmJ5
-						LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSqUMV7MJKbA3K8FtQY5Ern
-						kVp6BzANBgkqhkiG9w0BAQUFAAOCAQEAXkonAxu78/1gNxTeBdASryyipP8T56v7
-						BptkFIG8pjymWe5JpBFANjePMUrlyYisC3qfivdEJxP51Igw+TEf/rbRL+HFElWC
-						nRgEkUmLAicNpCsDujXAw7J9ID28kcM+Ut8uQqRQs+/potj1TN4WInzjasH2R+Lw
-						yrDOv2opvCGUupfH/dkIGHNdgs0iQRRgp0rUv9OCwwWYcQazmovxHPuXd0yd7uXR
-						0xKNdvCIJ2yeny2x5Bzm3aHXncUn6STA2SZYBOYHZjpFitBpAIc9oASCeMwu2Z18
-						Oa45E8Q95Tq7yvmGFuSBvH0K3ijY+V1yq+oNwRqKaX5QIvNAufFfMw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-dev.derby.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-dev.derby.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 Derby</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Derby Shibboleth (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://ulib.derby.ac.uk/library/homelib.php</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Glenn</GivenName>
-    <SurName>Handley</SurName>
-    <EmailAddress>mailto:g.handley@derby.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Glenn</GivenName>
-    <SurName>Handley</SurName>
-    <EmailAddress>mailto:g.handley@derby.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dan</GivenName>
-    <SurName>Webb</SurName>
-    <EmailAddress>mailto:D.Webb@derby.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp-test.webbased.co.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp-test.webbased.co.uk-idp-shibboleth.xml
deleted file mode 100644
index 14e02f90..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp-test.webbased.co.uk-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" entityID="https://shibboleth-idp-test.webbased.co.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP for WebBased Limited.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-29T12:00:13Z">
-      <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">webbased.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdTCCAl2gAwIBAgIUU54vEjtKOOABUhSxZsk0VE1MwU0wDQYJKoZIhvcNAQEF
-						BQAwLTErMCkGA1UEAxMic2hpYmJvbGV0aC1pZHAtdGVzdC53ZWJiYXNlZC5jby51
-						azAeFw0xMDA3MjAwODMzNDRaFw0zMDA3MjAwODMzNDRaMC0xKzApBgNVBAMTInNo
-						aWJib2xldGgtaWRwLXRlc3Qud2ViYmFzZWQuY28udWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCLdK52PjcXq4Ol8NM3JEzp9DoMRpuXHR8Aj30ibsVR
-						U60FWLT43hZ1Bv8oKDrk5dPu1rbRPntV8n3a77vVdEysx+/Ee3qnAib4jXBxMgST
-						9M+ShmalHppcgfAjWokVcym+75djvZalpSRZKeQF+3FrRGOOn93vpVyOWWp/Kma9
-						hiIJAA/zndFX306yCSfNlz50uts3CpWNsgrV4ZKuh5VelMPPEhz7wx0LB1Dvl+jY
-						Kd0npHNZZCwmsQPYataRG6ivOgO5MFs+lb+9dNWTqBFs9iyad24NrPrWSKcpdOix
-						FxEsisZokUFqsZdJI++Bqd2gCn+Y6JHmT5rb6djaCbTDAgMBAAGjgYwwgYkwaAYD
-						VR0RBGEwX4Iic2hpYmJvbGV0aC1pZHAtdGVzdC53ZWJiYXNlZC5jby51a4Y5aHR0
-						cHM6Ly9zaGliYm9sZXRoLWlkcC10ZXN0LndlYmJhc2VkLmNvLnVrL2lkcC9zaGli
-						Ym9sZXRoMB0GA1UdDgQWBBQHkqpcIbQGn1UX9UfHYM+wlpwvODANBgkqhkiG9w0B
-						AQUFAAOCAQEAhcdcLi+i56v9SuXTG9ejuPQE0dGJHfYKyMCWlae8ogjJgjqZ0IE+
-						6ujWQbp0RO8awbbNd/z8jdC3yxG3+Ql8vKUEaF1brIzM3HSs4HSe823bArArCIyJ
-						gwVdLzFEOlP2joNaVF2FU/8pqqZMQZaj3PQoDe5pBiVCYMxl2w+s0Jl58BexEA5q
-						zQlggw4Sx2/53VlcvWHqThdnSyFcZdnzCNHKstZ74Ck9k3cCklVflVfJu3owPlGB
-						4b78OBcKNFBXX4xm/GfZOg0Uldru6AcXKOvImQ6X1+Ie+2eS9qOpVNYvQz5pJilu
-						bKl+hgG/XcLUN8kP64IgNZJDm/pt5zCyhA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp-test.webbased.co.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp-test.webbased.co.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://shibboleth-idp-test.webbased.co.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp-test.webbased.co.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp-test.webbased.co.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp-test.webbased.co.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">webbased.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdTCCAl2gAwIBAgIUU54vEjtKOOABUhSxZsk0VE1MwU0wDQYJKoZIhvcNAQEF
-						BQAwLTErMCkGA1UEAxMic2hpYmJvbGV0aC1pZHAtdGVzdC53ZWJiYXNlZC5jby51
-						azAeFw0xMDA3MjAwODMzNDRaFw0zMDA3MjAwODMzNDRaMC0xKzApBgNVBAMTInNo
-						aWJib2xldGgtaWRwLXRlc3Qud2ViYmFzZWQuY28udWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCLdK52PjcXq4Ol8NM3JEzp9DoMRpuXHR8Aj30ibsVR
-						U60FWLT43hZ1Bv8oKDrk5dPu1rbRPntV8n3a77vVdEysx+/Ee3qnAib4jXBxMgST
-						9M+ShmalHppcgfAjWokVcym+75djvZalpSRZKeQF+3FrRGOOn93vpVyOWWp/Kma9
-						hiIJAA/zndFX306yCSfNlz50uts3CpWNsgrV4ZKuh5VelMPPEhz7wx0LB1Dvl+jY
-						Kd0npHNZZCwmsQPYataRG6ivOgO5MFs+lb+9dNWTqBFs9iyad24NrPrWSKcpdOix
-						FxEsisZokUFqsZdJI++Bqd2gCn+Y6JHmT5rb6djaCbTDAgMBAAGjgYwwgYkwaAYD
-						VR0RBGEwX4Iic2hpYmJvbGV0aC1pZHAtdGVzdC53ZWJiYXNlZC5jby51a4Y5aHR0
-						cHM6Ly9zaGliYm9sZXRoLWlkcC10ZXN0LndlYmJhc2VkLmNvLnVrL2lkcC9zaGli
-						Ym9sZXRoMB0GA1UdDgQWBBQHkqpcIbQGn1UX9UfHYM+wlpwvODANBgkqhkiG9w0B
-						AQUFAAOCAQEAhcdcLi+i56v9SuXTG9ejuPQE0dGJHfYKyMCWlae8ogjJgjqZ0IE+
-						6ujWQbp0RO8awbbNd/z8jdC3yxG3+Ql8vKUEaF1brIzM3HSs4HSe823bArArCIyJ
-						gwVdLzFEOlP2joNaVF2FU/8pqqZMQZaj3PQoDe5pBiVCYMxl2w+s0Jl58BexEA5q
-						zQlggw4Sx2/53VlcvWHqThdnSyFcZdnzCNHKstZ74Ck9k3cCklVflVfJu3owPlGB
-						4b78OBcKNFBXX4xm/GfZOg0Uldru6AcXKOvImQ6X1+Ie+2eS9qOpVNYvQz5pJilu
-						bKl+hgG/XcLUN8kP64IgNZJDm/pt5zCyhA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp-test.webbased.co.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp-test.webbased.co.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">WebBased Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">WebBased Limited: Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.webbased.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martine</GivenName>
-    <SurName>Davies</SurName>
-    <EmailAddress>mailto:martine.davies@webbased.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Greg</GivenName>
-    <SurName>Hawkins</SurName>
-    <EmailAddress>mailto:greg.hawkins@webbased.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.admin.furness.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.admin.furness.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index f18a5518..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.admin.furness.ac.uk-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-idp.admin.furness.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Furness College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-06-15T14:19: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">furness.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdjCCAl6gAwIBAgIVALs/YE9npCxW3z5NMlKyKk2qevJIMA0GCSqGSIb3DQEB
-						BQUAMC0xKzApBgNVBAMTInNoaWJib2xldGgtaWRwLmFkbWluLmZ1cm5lc3MuYWMu
-						dWswHhcNMTQwNTIxMDk1NzUxWhcNMzQwNTIxMDk1NzUxWjAtMSswKQYDVQQDEyJz
-						aGliYm9sZXRoLWlkcC5hZG1pbi5mdXJuZXNzLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAjXzSa0XZ09tmjgj707vH8G0c/8tQzEMLaCM0Ro3o
-						YElCAtaGAOXZU4H727e70sJE5lsyjVfvcazQUciEKSUMkpVLNUWrxBK7CHz7Y5v8
-						fjZ/EI8trVar9lKy897qNQ/bn2Afjo3I+lxpTHLG1vr6ITkDe1mtBtK4JR1Z6Ile
-						RhPcfuuodAnAKTrqUKKkzwdU93lv8zQlcry2KQXHCogR5zmSBD+tWLJ+xEuNlg1e
-						GNVGd8fxPKq4JuNgBp+RFgVD+syo4atfM1vFRQ5OpLPAQhqepi5DTRSYhnlpmZ4O
-						A39LqmIHNFiHLTnl3gXYwjrRbmB+8FizX+xJlHLm+ot06wIDAQABo4GMMIGJMGgG
-						A1UdEQRhMF+CInNoaWJib2xldGgtaWRwLmFkbWluLmZ1cm5lc3MuYWMudWuGOWh0
-						dHBzOi8vc2hpYmJvbGV0aC1pZHAuYWRtaW4uZnVybmVzcy5hYy51ay9pZHAvc2hp
-						YmJvbGV0aDAdBgNVHQ4EFgQUnVQpK7QZsa33ZUV9YeeadKMUBScwDQYJKoZIhvcN
-						AQEFBQADggEBADsc9RB178Iytf4OpvflGmaYZSNppreZ/RfUpASOLqXUmvk7nTdO
-						Xw7boB4N1hRj6qTNiAHsxvbSu5je9WzU6j7KSg4tvHo2x+UzvIBqiwFbO7o+BrWf
-						BrYava5ZGwylfPUgyyN1Y66GqtFAso4bHEf5VyzT6ASKYS8v5WOrza/8cSOIjW6q
-						jvZuFG9kOofHYbc+fAN/kuemGV3ihFTphEwivQAOV5houX2LonzDn+o6DtpBYyew
-						eJFu9qkoGg5sBBdGC+dblznwcM2elkboWjm4WxcoDWxvHt7zMpPuxZHaiZEQHhj0
-						cHC+YOw3ZjGPpkQyJ3Xyx343PaNgEOpxZ0s=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.admin.furness.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.admin.furness.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://shibboleth-idp.admin.furness.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.admin.furness.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.admin.furness.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.admin.furness.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">furness.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdjCCAl6gAwIBAgIVALs/YE9npCxW3z5NMlKyKk2qevJIMA0GCSqGSIb3DQEB
-						BQUAMC0xKzApBgNVBAMTInNoaWJib2xldGgtaWRwLmFkbWluLmZ1cm5lc3MuYWMu
-						dWswHhcNMTQwNTIxMDk1NzUxWhcNMzQwNTIxMDk1NzUxWjAtMSswKQYDVQQDEyJz
-						aGliYm9sZXRoLWlkcC5hZG1pbi5mdXJuZXNzLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAjXzSa0XZ09tmjgj707vH8G0c/8tQzEMLaCM0Ro3o
-						YElCAtaGAOXZU4H727e70sJE5lsyjVfvcazQUciEKSUMkpVLNUWrxBK7CHz7Y5v8
-						fjZ/EI8trVar9lKy897qNQ/bn2Afjo3I+lxpTHLG1vr6ITkDe1mtBtK4JR1Z6Ile
-						RhPcfuuodAnAKTrqUKKkzwdU93lv8zQlcry2KQXHCogR5zmSBD+tWLJ+xEuNlg1e
-						GNVGd8fxPKq4JuNgBp+RFgVD+syo4atfM1vFRQ5OpLPAQhqepi5DTRSYhnlpmZ4O
-						A39LqmIHNFiHLTnl3gXYwjrRbmB+8FizX+xJlHLm+ot06wIDAQABo4GMMIGJMGgG
-						A1UdEQRhMF+CInNoaWJib2xldGgtaWRwLmFkbWluLmZ1cm5lc3MuYWMudWuGOWh0
-						dHBzOi8vc2hpYmJvbGV0aC1pZHAuYWRtaW4uZnVybmVzcy5hYy51ay9pZHAvc2hp
-						YmJvbGV0aDAdBgNVHQ4EFgQUnVQpK7QZsa33ZUV9YeeadKMUBScwDQYJKoZIhvcN
-						AQEFBQADggEBADsc9RB178Iytf4OpvflGmaYZSNppreZ/RfUpASOLqXUmvk7nTdO
-						Xw7boB4N1hRj6qTNiAHsxvbSu5je9WzU6j7KSg4tvHo2x+UzvIBqiwFbO7o+BrWf
-						BrYava5ZGwylfPUgyyN1Y66GqtFAso4bHEf5VyzT6ASKYS8v5WOrza/8cSOIjW6q
-						jvZuFG9kOofHYbc+fAN/kuemGV3ihFTphEwivQAOV5houX2LonzDn+o6DtpBYyew
-						eJFu9qkoGg5sBBdGC+dblznwcM2elkboWjm4WxcoDWxvHt7zMpPuxZHaiZEQHhj0
-						cHC+YOw3ZjGPpkQyJ3Xyx343PaNgEOpxZ0s=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.admin.furness.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.admin.furness.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">Furness College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Furness College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.furness.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Techies</GivenName>
-    <EmailAddress>mailto:techies@furness.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Techies</GivenName>
-    <EmailAddress>mailto:techies@furness.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.collegenet.com-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.collegenet.com-idp-shibboleth.xml
deleted file mode 100644
index 818ebc00..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.collegenet.com-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://shibboleth-idp.collegenet.com/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">collegenet.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CollegeNET, Inc.</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CollegeNET, Inc. is a leading developer of web-based systems for higher education and non-profit organizations, serving more than 1,300 clients worldwide.
-CollegeNET products include course and event scheduling, space and resource management, web calendar publishing, e-commerce and contributions, accounting, online admission application processing, online course evaluation, and commencement services.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://corp.collegenet.com/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://corp.collegenet.com/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="51" width="200" xml:lang="en">https://corp.collegenet.com/img-link/CN_blue-small.jpg</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>
-MIIDYDCCAkigAwIBAgIUE7bIe4hwDfwhSM8wn4E8Rza/AdEwDQYJKoZIhvcNAQEF
-BQAwKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC1pZHAuY29sbGVnZW5ldC5jb20wHhcN
-MTAwMjExMjMxNTMyWhcNMzAwMjExMjMxNTMyWjAoMSYwJAYDVQQDEx1zaGliYm9s
-ZXRoLWlkcC5jb2xsZWdlbmV0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAIFEn4f9ObsbquJlOPvIazrYJ+cltWyFL5My6Sci6K1L/xTfRNAtGA3U
-DQL3wOALSFtfddl/ULTfQYU2/AZKFj7BwA72lou6G9SUco5QchHUoaiCxnOs1LQ8
-kP2rA5nsxwfJrYnGULx1+c7qKmatN+OftKL96LD6g2rBw794FZd7j29ptrqOv97B
-gzVaH5od8ZMvegsKzpuYf0cOklD0dRJEW0ppb79JLJvSrWVX6K9oAvOXJx7+nHwK
-BGqETOU4nhXXJOgyVqib7d3mCg7YWyJXl1tLnTLZrHLi7bVk2BKUZO2yT62SsBy3
-MkThcDHokvyvwo/GUmF2dnJaYj59afUCAwEAAaOBgTB/MF4GA1UdEQRXMFWCHXNo
-aWJib2xldGgtaWRwLmNvbGxlZ2VuZXQuY29thjRodHRwczovL3NoaWJib2xldGgt
-aWRwLmNvbGxlZ2VuZXQuY29tL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRf5n4e
-0WSw5ow5doI1M71y7rzfGjANBgkqhkiG9w0BAQUFAAOCAQEAGlTRbPUU9d5ond5O
-O3efuPRoIMCurUo6xaTD39rnr5m94Cr55n3dOwCnvjn0IMQvvvqGBJRD92i0VvZI
-4r63QtU5ZqSeAiNG5FFCA89jnR6P0nZqXV3R3mRaRHDM2apD9pNz2PUtFdktw5AB
-cURaOv4usFw8sWMQg0oM3rHC5VbTCCoQbmiRGiMCIqSEJbZ02JG+lUhrv1jp9xNj
-PjDjvSkxTTH3Mo4Lt7jVww76pgWRDa8L0eZ4sOREQVqMXEMcB3JNy7fFimunvxgw
-fIJN0Yk9uqeMFBoZiL8r0itI9BTt4gk2sYDbNnG6/pqoPS9mwmiM22XEeTeG1x3a
-WWeBDw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.collegenet.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.collegenet.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.collegenet.com/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.collegenet.com/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.collegenet.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.collegenet.com/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">collegenet.com</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYDCCAkigAwIBAgIUE7bIe4hwDfwhSM8wn4E8Rza/AdEwDQYJKoZIhvcNAQEF
-BQAwKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC1pZHAuY29sbGVnZW5ldC5jb20wHhcN
-MTAwMjExMjMxNTMyWhcNMzAwMjExMjMxNTMyWjAoMSYwJAYDVQQDEx1zaGliYm9s
-ZXRoLWlkcC5jb2xsZWdlbmV0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAIFEn4f9ObsbquJlOPvIazrYJ+cltWyFL5My6Sci6K1L/xTfRNAtGA3U
-DQL3wOALSFtfddl/ULTfQYU2/AZKFj7BwA72lou6G9SUco5QchHUoaiCxnOs1LQ8
-kP2rA5nsxwfJrYnGULx1+c7qKmatN+OftKL96LD6g2rBw794FZd7j29ptrqOv97B
-gzVaH5od8ZMvegsKzpuYf0cOklD0dRJEW0ppb79JLJvSrWVX6K9oAvOXJx7+nHwK
-BGqETOU4nhXXJOgyVqib7d3mCg7YWyJXl1tLnTLZrHLi7bVk2BKUZO2yT62SsBy3
-MkThcDHokvyvwo/GUmF2dnJaYj59afUCAwEAAaOBgTB/MF4GA1UdEQRXMFWCHXNo
-aWJib2xldGgtaWRwLmNvbGxlZ2VuZXQuY29thjRodHRwczovL3NoaWJib2xldGgt
-aWRwLmNvbGxlZ2VuZXQuY29tL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRf5n4e
-0WSw5ow5doI1M71y7rzfGjANBgkqhkiG9w0BAQUFAAOCAQEAGlTRbPUU9d5ond5O
-O3efuPRoIMCurUo6xaTD39rnr5m94Cr55n3dOwCnvjn0IMQvvvqGBJRD92i0VvZI
-4r63QtU5ZqSeAiNG5FFCA89jnR6P0nZqXV3R3mRaRHDM2apD9pNz2PUtFdktw5AB
-cURaOv4usFw8sWMQg0oM3rHC5VbTCCoQbmiRGiMCIqSEJbZ02JG+lUhrv1jp9xNj
-PjDjvSkxTTH3Mo4Lt7jVww76pgWRDa8L0eZ4sOREQVqMXEMcB3JNy7fFimunvxgw
-fIJN0Yk9uqeMFBoZiL8r0itI9BTt4gk2sYDbNnG6/pqoPS9mwmiM22XEeTeG1x3a
-WWeBDw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.collegenet.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.collegenet.com:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CollegeNET, Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CollegeNET, Inc.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://collegenet.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>CollegeNET IT Administrator</md:GivenName>
-    <md:EmailAddress>admins@collegenet.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>CollegeNET Help Desk</md:GivenName>
-    <md:EmailAddress>maint@collegenet.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.don.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-idp.don.ac.uk-shibboleth.xml
deleted file mode 100644
index fc89521c..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.don.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://shibboleth-idp.don.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Doncaster College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-05-07T11:17:05Z">
-      <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">don.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAK8RPs/u00+SAcNWs4bMNfrk/CKcMA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMTDWlkcC5kb24uYWMudWswHhcNMTUwNTE5MDkyODMyWhcN
-						MzUwNTE5MDkyODMyWjAYMRYwFAYDVQQDEw1pZHAuZG9uLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyZDjYtG71spcGTQfuxeMqEbhPbLyLb1
-						PfUjkpcgL4XEuoSokBL6xUqAHsnsGx43l/CKqagSOrYcj9cLldjhUTTkaXIEGeMe
-						2HDLSUiCin5P4OamFRYtKd6ZA2mZTgwhhUnfMU58XvcLvPJKa0xbFtvg5fW3Zunh
-						X8MQ3RW51rS8OA+gvmiz6ObL4eKdGFBMGwGJGFSuM271LLeW63urNLNx+SFKgy8g
-						/w4+PjLUO6yT7aw1SI9D67ZsEHYluuXt8TJI8cexndKLbULGTfylX/0XeO/IWL6v
-						FLhDcbYMQ6YufuX+TWbznTsVtUT32wxige7QcKfq3EfwGVaPqIeUEQIDAQABo2Ew
-						XzA+BgNVHREENzA1gg1pZHAuZG9uLmFjLnVrhiRodHRwczovL2lkcC5kb24uYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBXefJlUvzYENqK4j4ELocNrbEo7
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAr6JWW4s83L4uE+aOGa1UMmdb2Q9jbYvFXJrwz
-						UopzS0DxVSjwqvUmXFKiHMQxTBWyRFzPSyxx/hANezDAMW0UnwTx88xUP8JbP64d
-						bqWGyrDpJ/ZFbE5pROKdCWoNUW+NRgeKb8bZoQmzD4wJAoieX2NFrzVkJpO0iXdc
-						OYX+o5NvQwjSkXSXTCMNBeg+kXvSG0dRFnbkQu5q0BMTflpj3WdOE8ct5qUOU2WU
-						KvqnIkQMB3AcvJYLArP7zNO8S0DqvzvCDvOVHo+CyB5mSafRyZNgH4XG8gJ/T0xw
-						PbMaTnddQBczEWuq39LDslvq0BICEP8cCrrdPq0U/LyGeeg+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.don.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.don.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.don.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.don.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.don.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.don.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">don.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIVAK8RPs/u00+SAcNWs4bMNfrk/CKcMA0GCSqGSIb3DQEB
-						BQUAMBgxFjAUBgNVBAMTDWlkcC5kb24uYWMudWswHhcNMTUwNTE5MDkyODMyWhcN
-						MzUwNTE5MDkyODMyWjAYMRYwFAYDVQQDEw1pZHAuZG9uLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyZDjYtG71spcGTQfuxeMqEbhPbLyLb1
-						PfUjkpcgL4XEuoSokBL6xUqAHsnsGx43l/CKqagSOrYcj9cLldjhUTTkaXIEGeMe
-						2HDLSUiCin5P4OamFRYtKd6ZA2mZTgwhhUnfMU58XvcLvPJKa0xbFtvg5fW3Zunh
-						X8MQ3RW51rS8OA+gvmiz6ObL4eKdGFBMGwGJGFSuM271LLeW63urNLNx+SFKgy8g
-						/w4+PjLUO6yT7aw1SI9D67ZsEHYluuXt8TJI8cexndKLbULGTfylX/0XeO/IWL6v
-						FLhDcbYMQ6YufuX+TWbznTsVtUT32wxige7QcKfq3EfwGVaPqIeUEQIDAQABo2Ew
-						XzA+BgNVHREENzA1gg1pZHAuZG9uLmFjLnVrhiRodHRwczovL2lkcC5kb24uYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFBXefJlUvzYENqK4j4ELocNrbEo7
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAr6JWW4s83L4uE+aOGa1UMmdb2Q9jbYvFXJrwz
-						UopzS0DxVSjwqvUmXFKiHMQxTBWyRFzPSyxx/hANezDAMW0UnwTx88xUP8JbP64d
-						bqWGyrDpJ/ZFbE5pROKdCWoNUW+NRgeKb8bZoQmzD4wJAoieX2NFrzVkJpO0iXdc
-						OYX+o5NvQwjSkXSXTCMNBeg+kXvSG0dRFnbkQu5q0BMTflpj3WdOE8ct5qUOU2WU
-						KvqnIkQMB3AcvJYLArP7zNO8S0DqvzvCDvOVHo+CyB5mSafRyZNgH4XG8gJ/T0xw
-						PbMaTnddQBczEWuq39LDslvq0BICEP8cCrrdPq0U/LyGeeg+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.don.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.don.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">Doncaster College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Doncaster College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.don.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sue</GivenName>
-    <SurName>Gold</SurName>
-    <EmailAddress>mailto:sue.gold@don.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Pete</GivenName>
-    <SurName>Lettin</SurName>
-    <EmailAddress>mailto:pete.lettin@don.ac.uk</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 c819515c..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.dti.ufv.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.dti.ufv.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.dti.ufv.br/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">ufv.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.dti.ufv.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md: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"/>
-    <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">UFV - Universidade Federal de Vicosa</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFV - Universidade Federal de Vicosa</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFV - universidade Federal de Vicosa</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFV - universidade Federal de Vicosa</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufv.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufv.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Harley Balduino Saraiva</md:SurName>
-    <md:EmailAddress>harley.saraiva@ufv.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f4fcca3a..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.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://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
-ZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
-ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
-ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
-dWZ2LmJyMB4XDTEzMDMyMjIwNTM1N1oXDTE2MDMyMTIwNTM1N1owgdkxLTArBgNV
-BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
-CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZ
-MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
-VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
-ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
-8vDrHts9RZOOOUXHYsJR2D0jm4lcVRxczZD5P4qDLpYp28kY3OfsOQ9TMZJ8HmnN
-RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
-aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
-YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
-WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAobds5
-X9EyPCWOnEwnMLUmxbTJQ5twEEND7JesKiNJSIK1oaZcYsxS4d5HAjrCUFVop/cK
-9ZhFbpLVnky/SvSYAqyU0LifKMHqTGkpB2o64A1oPRPQRQrPCuG3/AIAALBQeGJP
-EFB4KyGunENrD1rUsWiz7RCX9uVcEuncCtdhYxCve+7JKbzCxv/pUGNorQK9fdhm
-b/LBWLQCi3PmrZQ2DW1L2pz9ATfIduYRamw0F+udCEkP7l0CjeCE81xkBFxRLIDI
-TEo7mEQN4S99NlVV1pGuWtZRJz4Zco8ThPhBp3ya98phTcMxYs9aJt/AWFJdcnfq
-mnRgIPsxKrrKvirQ
-            </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
-ZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZMBcGCSqGSIb3DQEJ
-ARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYDVQQIEwxNaW5hcyBH
-ZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9sZXRoLWlkcC5kdGku
-dWZ2LmJyMB4XDTEzMDMyMjIwNTM1N1oXDTE2MDMyMTIwNTM1N1owgdkxLTArBgNV
-BAoTJFVGViAtIFVuaXZlcnNpZGFkZSBGZWRlcmFsIGRlIFZpY29zYTE0MDIGA1UE
-CxMrRFRJIC0gRGlyZXRvcmlhIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEZ
-MBcGCSqGSIb3DQEJARYKZHRpQHVmdi5icjEPMA0GA1UEBxMGVmljb3NhMRUwEwYD
-VQQIEwxNaW5hcyBHZXJhaXMxCzAJBgNVBAYTAkJSMSIwIAYDVQQDExlzaGliYm9s
-ZXRoLWlkcC5kdGkudWZ2LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwHXw5lxhsUVVy9cHSvvnkanv1HyyMZz6lmeY76rh79I2bopDPgZlbdHnTAYn
-8vDrHts9RZOOOUXHYsJR2D0jm4lcVRxczZD5P4qDLpYp28kY3OfsOQ9TMZJ8HmnN
-RyjAmR8CofBG1ZHN2xi7tWqMI4HVEJfZw/ZvSWfX4eNBQsvv5oTa1v5eOw1YQQ6A
-aHB6p/Xp7tccGX0+OgTVty2Bq20xEZNBJeJtz2SBYxbiRUE+vaiYTyCJVxDeyNcN
-YIkiOUCUu2pEvgFciuzjhlG7UuUsq7S19HqOEjtUiqdH72gDRGvLNRhwpQ+u22vd
-WBOsXDXZeHB/5MfcOQImtgkYUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAobds5
-X9EyPCWOnEwnMLUmxbTJQ5twEEND7JesKiNJSIK1oaZcYsxS4d5HAjrCUFVop/cK
-9ZhFbpLVnky/SvSYAqyU0LifKMHqTGkpB2o64A1oPRPQRQrPCuG3/AIAALBQeGJP
-EFB4KyGunENrD1rUsWiz7RCX9uVcEuncCtdhYxCve+7JKbzCxv/pUGNorQK9fdhm
-b/LBWLQCi3PmrZQ2DW1L2pz9ATfIduYRamw0F+udCEkP7l0CjeCE81xkBFxRLIDI
-TEo7mEQN4S99NlVV1pGuWtZRJz4Zco8ThPhBp3ya98phTcMxYs9aJt/AWFJdcnfq
-mnRgIPsxKrrKvirQ
-
-                    
-            </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 bf608871..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.gwdg.de/gwdg/shibboleth">
-  <md: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>
-  </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">gwdg.de</shibmd: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://shibboleth-idp.gwdg.de/favicon.ico</mdui:Logo>
-        <mdui:Logo height="72" width="240">https://shibboleth-idp.gwdg.de/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>
-    </md:Extensions>
-    <md: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>MIIGETCCBPmgAwIBAgIHGcwgX+yB9TANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTUwNzIwMDcy
-NzEyWhcNMTgxMDE2MDcyNzEyWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgMDU5J
-RURFUlNBQ0hTRU4xEzARBgNVBAcMCkdPRVRUSU5HRU4xPjA8BgNVBAoMNUdlc2Vs
-bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
-MR8wHQYDVQQDDBZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAvuGgY721exXNzW6SPuaNhWMeUED1Lj6eKvrCmSaL
-B1zH/2wgN9tbVBrGn6MWx+4AkxrrfCqblUJ2JrtWvUnuMjto+Je8nY+PL4tD+vR7
-vFZp21lawidadyI7AwH9v9mv3P7dJrtlu/KS/4SAy37dFPeEdbjf2YZBXNyryC8P
-TqRqTixiu7q3kxYZmRyJpxcA09pqB6ls6VX3MMFgjayiQOHDjagKo47AoUUC2+bT
-8sAoUlE42uT6UG1DogyJdh7F8az2WuWv0Jdm3Ci1vUulYycLqiijVJ2q+1MnJK2k
-wx5RI/T+xMGwgN8JFXIzPR2hU2C9RMcVme3+XRYRC5Hq1QIDAQABo4ICNjCCAjIw
-TwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMB
-MA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBRRrnxskCiWvf8OnMB+1fXdknZogDAfBgNVHSMEGDAWgBSm5P+Y/eVJMn5cdfIW
-ok2MdDXeIjAhBgNVHREEGjAYghZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMHkGA1Ud
-HwRyMHAwNqA0oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHJBggrBgEFBQcBAQSBvDCBuTAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEAG
-CCsGAQUFBzAChjRodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2d3ZGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUA
-A4IBAQBaiOgGnC7KEWAUSmcKLMWAhGH2pN/OmII7DGUnKWdtg/aKhJ8ACG1vWJtc
-6QEKmAQc1hFqC5F5YYiL99g+n4FfPvaEikQHodNnHU3MFCBjQSb1nPAVoWs5enwP
-l2effbyUP1UYDfJKFemgR4EOHxQXtxmaT8SBmNty6fwPXfTSBWznct0S00IhfiR+
-9Gi+/yjvfj0Xkqd7tV+mYXjUhi19DdnA6Cs9S1TqlojeaFrysBsMFqrUxuwv7mUg
-cDFaS6pm8B5T/9nfcBumf/rRSiIWrcNF9cBBVNL165qTpcJLB0cOP/PwdlugmZWo
-JpA2gfQhkeFqqwJRdF6UeVYRdtar
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.gwdg.de/gwdg/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.gwdg.de/gwdg/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">gwdg.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>MIIGETCCBPmgAwIBAgIHGcwgX+yB9TANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTUwNzIwMDcy
-NzEyWhcNMTgxMDE2MDcyNzEyWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgMDU5J
-RURFUlNBQ0hTRU4xEzARBgNVBAcMCkdPRVRUSU5HRU4xPjA8BgNVBAoMNUdlc2Vs
-bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
-MR8wHQYDVQQDDBZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAvuGgY721exXNzW6SPuaNhWMeUED1Lj6eKvrCmSaL
-B1zH/2wgN9tbVBrGn6MWx+4AkxrrfCqblUJ2JrtWvUnuMjto+Je8nY+PL4tD+vR7
-vFZp21lawidadyI7AwH9v9mv3P7dJrtlu/KS/4SAy37dFPeEdbjf2YZBXNyryC8P
-TqRqTixiu7q3kxYZmRyJpxcA09pqB6ls6VX3MMFgjayiQOHDjagKo47AoUUC2+bT
-8sAoUlE42uT6UG1DogyJdh7F8az2WuWv0Jdm3Ci1vUulYycLqiijVJ2q+1MnJK2k
-wx5RI/T+xMGwgN8JFXIzPR2hU2C9RMcVme3+XRYRC5Hq1QIDAQABo4ICNjCCAjIw
-TwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMB
-MA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBRRrnxskCiWvf8OnMB+1fXdknZogDAfBgNVHSMEGDAWgBSm5P+Y/eVJMn5cdfIW
-ok2MdDXeIjAhBgNVHREEGjAYghZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMHkGA1Ud
-HwRyMHAwNqA0oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHJBggrBgEFBQcBAQSBvDCBuTAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEAG
-CCsGAQUFBzAChjRodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2d3ZGctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUA
-A4IBAQBaiOgGnC7KEWAUSmcKLMWAhGH2pN/OmII7DGUnKWdtg/aKhJ8ACG1vWJtc
-6QEKmAQc1hFqC5F5YYiL99g+n4FfPvaEikQHodNnHU3MFCBjQSb1nPAVoWs5enwP
-l2effbyUP1UYDfJKFemgR4EOHxQXtxmaT8SBmNty6fwPXfTSBWznct0S00IhfiR+
-9Gi+/yjvfj0Xkqd7tV+mYXjUhi19DdnA6Cs9S1TqlojeaFrysBsMFqrUxuwv7mUg
-cDFaS6pm8B5T/9nfcBumf/rRSiIWrcNF9cBBVNL165qTpcJLB0cOP/PwdlugmZWo
-JpA2gfQhkeFqqwJRdF6UeVYRdtar
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.gwdg.de:8443/gwdg/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">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Daniel</md:GivenName>
-    <md:SurName>Adler</md:SurName>
-    <md:EmailAddress>mailto:daniel.adler@gwdg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Christof</md:GivenName>
-    <md:SurName>Pohl</md:SurName>
-    <md:EmailAddress>mailto:christof.pohl@gwdg.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2604e5a6..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>MIIGCTCCBPGgAwIBAgIHFsFJyd283jANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTMxMjA2MTMw
-ODEwWhcNMTgxMjA1MTMwODEwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
-RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
-bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
-MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAzUs/tC17vTh5+KZ1+RaUMipo8/OnDZY76s3lRLAd
-FQ3eaSCXrFeuMp21w71iTMqJxvj7HwVQ4slSotmwSyn//U2BIiQMqQVhwuK1c7u7
-QHw7mogBjEo0/xmYTZ6Xx7/+fm86jQNf9pL47rxGUX4G/X/cSYZGYLWhc/mIgpWf
-i32hvqSwz9u+X4Q8jO2hVfT5lJk1H1J5+EOjnlI8IGhzp2u5NIuy9nMc6VATTaIk
-0HdFxcr8x3daqHtEsfeSy5ZE22ITp+03saUpsAIXex5WkYP75TbgSUYcvs22To/4
-gIl6Jl/Jw3Sa8V0jk3Ed6HXYjiRfOdRzzfl3NlQEKanrZQIDAQABo4ICLjCCAiow
-OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
-MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFMhTA+0Nc1+MczLZ6oUYfwO08FUZ
-MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
-aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
-NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
-bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
-dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
-AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
-LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEANcGz
-LfMEfB2Irmv2OgEyePVCVT8jikgEUxP4wSsLhMJwprRRlV4WeYNgO9gALwsvIynx
-c/k7TcXHJh6dESftGGLXGDLcEv4BMawknGaJUJwOzW4RGE3oBJ5qo+ZpCEpcrM6C
-shG0W5POPklboLkeOWSgL+KUZPfxoTWGzeDMEQrE48ZXXyGGMhC+ZpNUBd7vDqRX
-eRVgqLqduaem685vNXwa426VnTNirg3elFgTufAal1Fwng2mk5OEe6RpWSrFIDg7
-rvJlvTpJwovKS8VIyX8syWNfQ73p8oquIvVWYhBRoveO/ir9vvTrg0txaKNJqtww
-mNIjImyl26Rs6RqKxw==
-</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>MIIGCTCCBPGgAwIBAgIHFsFJyd283jANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTMxMjA2MTMw
-ODEwWhcNMTgxMjA1MTMwODEwWjCBmzELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5J
-RURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xPjA8BgNVBAoTNUdlc2Vs
-bHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERhdGVudmVyYXJiZWl0dW5n
-MR8wHQYDVQQDExZzaGliYm9sZXRoLWlkcC5nd2RnLmRlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAzUs/tC17vTh5+KZ1+RaUMipo8/OnDZY76s3lRLAd
-FQ3eaSCXrFeuMp21w71iTMqJxvj7HwVQ4slSotmwSyn//U2BIiQMqQVhwuK1c7u7
-QHw7mogBjEo0/xmYTZ6Xx7/+fm86jQNf9pL47rxGUX4G/X/cSYZGYLWhc/mIgpWf
-i32hvqSwz9u+X4Q8jO2hVfT5lJk1H1J5+EOjnlI8IGhzp2u5NIuy9nMc6VATTaIk
-0HdFxcr8x3daqHtEsfeSy5ZE22ITp+03saUpsAIXex5WkYP75TbgSUYcvs22To/4
-gIl6Jl/Jw3Sa8V0jk3Ed6HXYjiRfOdRzzfl3NlQEKanrZQIDAQABo4ICLjCCAiow
-OQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMB
-MAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFMhTA+0Nc1+MczLZ6oUYfwO08FUZ
-MB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMC8GA1UdEQQoMCaCFnNo
-aWJib2xldGgtaWRwLmd3ZGcuZGWBDHNoaWJAZ3dkZy5kZTB5BgNVHR8EcjBwMDag
-NKAyhjBodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNy
-bC5jcmwwNqA0oDKGMGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCByQYIKwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0
-dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcw
-AoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2Rn
-LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEANcGz
-LfMEfB2Irmv2OgEyePVCVT8jikgEUxP4wSsLhMJwprRRlV4WeYNgO9gALwsvIynx
-c/k7TcXHJh6dESftGGLXGDLcEv4BMawknGaJUJwOzW4RGE3oBJ5qo+ZpCEpcrM6C
-shG0W5POPklboLkeOWSgL+KUZPfxoTWGzeDMEQrE48ZXXyGGMhC+ZpNUBd7vDqRX
-eRVgqLqduaem685vNXwa426VnTNirg3elFgTufAal1Fwng2mk5OEe6RpWSrFIDg7
-rvJlvTpJwovKS8VIyX8syWNfQ73p8oquIvVWYhBRoveO/ir9vvTrg0txaKNJqtww
-mNIjImyl26Rs6RqKxw==
-</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.ics.forth.gr-idp-shibboleth-.xml b/swamid-interfederations-2.0/shibboleth-idp.ics.forth.gr-idp-shibboleth-.xml
deleted file mode 100644
index a953b4d7..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.ics.forth.gr-idp-shibboleth-.xml
+++ /dev/null
@@ -1,131 +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://shibboleth-idp.ics.forth.gr/idp/shibboleth/">
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ics.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iesl.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imbb.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iacm.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iceht.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pek.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ims.forth.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIECTCCAvGgAwIBAgIJAIAFFNmTM96cMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
-                            VQQGEwJHUjEOMAwGA1UECAwFQ3JldGUxEjAQBgNVBAcMCUhlcmFrbGlvbjEOMAwG
-                            A1UECgwFRk9SVEgxDDAKBgNVBAsMA0lDUzEkMCIGA1UEAwwbc2hpYmJvbGV0aC1p
-                            ZHAuaWNzLmZvcnRoLmdyMSMwIQYJKoZIhvcNAQkBFhRzdXBwb3J0QGljcy5mb3J0
-                            aC5ncjAeFw0xNTEwMDgxMDM5MjBaFw00MDEwMDExMDM5MjBaMIGaMQswCQYDVQQG
-                            EwJHUjEOMAwGA1UECAwFQ3JldGUxEjAQBgNVBAcMCUhlcmFrbGlvbjEOMAwGA1UE
-                            CgwFRk9SVEgxDDAKBgNVBAsMA0lDUzEkMCIGA1UEAwwbc2hpYmJvbGV0aC1pZHAu
-                            aWNzLmZvcnRoLmdyMSMwIQYJKoZIhvcNAQkBFhRzdXBwb3J0QGljcy5mb3J0aC5n
-                            cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK44C09K73i6drwcyTYY
-                            yfUHRdNoecBGCKiEW4Nv3XPROKyJEpZeXcqNIjX9Ay5tCgXLI7pwVyD2zvmrw9J+
-                            Bh2zJUSez5icumO3kwoQd+5kt9vqusHCs168ttlcSQ7ulWReSU0geS+uQ7uY2MOw
-                            m1dCSZJ8lBX3l13AZ/KIm2+Q/zt6FDy42ZliosWoi+HBns7W3PzpjSWtfpq+scyd
-                            7jAu8y/pyYoWUK6FCp2CuRSHl4DPzMKcUXdbmN0WsjZVPmnRCedXqXpfu21DRJRK
-                            aI47OJ2E29XqqqiLozbwSsex9sOy8rDyqkwXF5jxfRsTBZTCuT3pOiFnfUJQCeI9
-                            0PUCAwEAAaNQME4wHQYDVR0OBBYEFB0BaUQoT2qrSl67KfbiuzComuW2MB8GA1Ud
-                            IwQYMBaAFB0BaUQoT2qrSl67KfbiuzComuW2MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-                            hvcNAQEFBQADggEBAIQfZ8sg/vT2r3FBaF79wUN5Y0IzvsAhBGcswiljzOJDxOn/
-                            xFLgUjhmpwW7Mo8siDR5RVg0ANRw5nMdvG05SkhJsuzKgQkweQin3NflNR5U5ZOe
-                            3oOM7gMvSP0OR6e1o7PdTU9QnDiWrB760lwUf1ny86dUooNZ0VZNo/CU+2IB6dnQ
-                            K3H7c0cMoWoMFolzhsAxg/HZvv0igIMAJ83Nj0ktzpxJR4s9vSTL+RTVHL3vRVjG
-                            mXvUT48DDF48hmWDN9rh1aApoBf+OvrVGfeaazdMrK/ho6xts+kbJdCumfGx5cyP
-                            AXf1z42E/mE/ELURJf75+xO8AShPK4Ua/5qsbnM=
-                            
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.ics.forth.gr:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.ics.forth.gr:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.ics.forth.gr/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.ics.forth.gr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-idp.ics.forth.gr/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.ics.forth.gr/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">forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ics.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iesl.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imbb.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iacm.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iceht.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">admin.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pek.forth.gr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ims.forth.gr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIECTCCAvGgAwIBAgIJAIAFFNmTM96cMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
-                            VQQGEwJHUjEOMAwGA1UECAwFQ3JldGUxEjAQBgNVBAcMCUhlcmFrbGlvbjEOMAwG
-                            A1UECgwFRk9SVEgxDDAKBgNVBAsMA0lDUzEkMCIGA1UEAwwbc2hpYmJvbGV0aC1p
-                            ZHAuaWNzLmZvcnRoLmdyMSMwIQYJKoZIhvcNAQkBFhRzdXBwb3J0QGljcy5mb3J0
-                            aC5ncjAeFw0xNTEwMDgxMDM5MjBaFw00MDEwMDExMDM5MjBaMIGaMQswCQYDVQQG
-                            EwJHUjEOMAwGA1UECAwFQ3JldGUxEjAQBgNVBAcMCUhlcmFrbGlvbjEOMAwGA1UE
-                            CgwFRk9SVEgxDDAKBgNVBAsMA0lDUzEkMCIGA1UEAwwbc2hpYmJvbGV0aC1pZHAu
-                            aWNzLmZvcnRoLmdyMSMwIQYJKoZIhvcNAQkBFhRzdXBwb3J0QGljcy5mb3J0aC5n
-                            cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK44C09K73i6drwcyTYY
-                            yfUHRdNoecBGCKiEW4Nv3XPROKyJEpZeXcqNIjX9Ay5tCgXLI7pwVyD2zvmrw9J+
-                            Bh2zJUSez5icumO3kwoQd+5kt9vqusHCs168ttlcSQ7ulWReSU0geS+uQ7uY2MOw
-                            m1dCSZJ8lBX3l13AZ/KIm2+Q/zt6FDy42ZliosWoi+HBns7W3PzpjSWtfpq+scyd
-                            7jAu8y/pyYoWUK6FCp2CuRSHl4DPzMKcUXdbmN0WsjZVPmnRCedXqXpfu21DRJRK
-                            aI47OJ2E29XqqqiLozbwSsex9sOy8rDyqkwXF5jxfRsTBZTCuT3pOiFnfUJQCeI9
-                            0PUCAwEAAaNQME4wHQYDVR0OBBYEFB0BaUQoT2qrSl67KfbiuzComuW2MB8GA1Ud
-                            IwQYMBaAFB0BaUQoT2qrSl67KfbiuzComuW2MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-                            hvcNAQEFBQADggEBAIQfZ8sg/vT2r3FBaF79wUN5Y0IzvsAhBGcswiljzOJDxOn/
-                            xFLgUjhmpwW7Mo8siDR5RVg0ANRw5nMdvG05SkhJsuzKgQkweQin3NflNR5U5ZOe
-                            3oOM7gMvSP0OR6e1o7PdTU9QnDiWrB760lwUf1ny86dUooNZ0VZNo/CU+2IB6dnQ
-                            K3H7c0cMoWoMFolzhsAxg/HZvv0igIMAJ83Nj0ktzpxJR4s9vSTL+RTVHL3vRVjG
-                            mXvUT48DDF48hmWDN9rh1aApoBf+OvrVGfeaazdMrK/ho6xts+kbJdCumfGx5cyP
-                            AXf1z42E/mE/ELURJf75+xO8AShPK4Ua/5qsbnM=
-                            
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.ics.forth.gr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.ics.forth.gr: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">Foundation for Research and Technology - Hellas</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Ίδρυμα Τεχνολογίας και Έρευνας</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Foundation for Research and Technology - Hellas</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Ίδρυμα Τεχνολογίας και Έρευνας</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.forth.gr/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.forth.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Foundation for Research and Technology - Hellas</md:Company>
-    <md:EmailAddress>noc@ics.forth.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Foundation for Research and Technology - Hellas</md:Company>
-    <md:EmailAddress>noc@ics.forth.gr</md:EmailAddress>
-    <md:TelephoneNumber>+30-2810-391647</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 5f7a3d57..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-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://shibboleth-idp.mpg.de/mpg/shibboleth">
-  <md: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>
-  </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">mpg.de</shibmd: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>
-    </md:Extensions>
-    <md: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>MIIFnTCCBIWgAwIBAgIHGcwgoGctzjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNTA3MjAw
-NzI4MTdaFw0xODEwMTYwNzI4MTdaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECAwN
-TmllZGVyc2FjaHNlbjETMBEGA1UEBwwKR29ldHRpbmdlbjEgMB4GA1UECgwXTWF4
-LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsMA1BLSTEeMBwGA1UEAwwVc2hp
-YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAyonU61JD/L8NXg+nYLf5NyzuViFuADwgpiyZMlHto4tZLOi4acF4Ji5UIRwj
-D7NwVU8NMr6UjMD6bCnv6OZNAL9L2t4dmRqk0RAzH4IIoL4jq9p10BKYfGRNpiXE
-Lza2ArTdiTojBOpvD3VYgFbjCXHjfUSmvn+e0Dx0SYIfG+t1NSebf8Txgq9IDgBV
-WgZZN012VrWiezDOn+Lh8497cr8PM6lxqj4duDbn7HQcAJGyPxIPwAMJF5fhTM4P
-HtZQZPAUjv6Z01gXlCCthDek3Q2YPA8HilwSxJcjXCBfejJJTLZFieVRydBcA/ap
-aewaww/i7+0rVRbAK1XBJ6fMFwIDAQABo4ICMTCCAi0wTwYDVR0gBEgwRjARBg8r
-BgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
-AQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSq+b/gIhlsgfk5gfSi
-rqa17AQeNjAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HRzn3DWzAgBgNVHREE
-GTAXghVzaGliYm9sZXRoLWlkcC5tcGcuZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9tcGctY2EvcHViL2NybC9jYWNybC5jcmwwNaAz
-oDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3Au
-cGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPwYI
-KwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEARYTUSInl9UH5wdNLPHys
-rhP1LCBXWjhrnf9ejdJRIWiX3DURVvCWvBkOBTRrc3XpkyoRqzJfSPJ5iMFBNzqH
-GZsJ8ZwLqhmqFN2d1DS5J7cEOHqyvm9HTV4nTVq6mHoCAclFtWZ+ByVHs+aqkxEe
-KChZEW5O/tFETb5PPWdGAgX8aSQ8nk6U8+LeGF1CdYmXzTWpArkxU1dhgTkR94px
-OW1hWyZdRMBMDQ8r2HOEa/+3/2fOA9fJPfopOO5LnYPOX254d7AP5p/KRlrre596
-HsbNUEVhOjgMmy4luhzK9AUWTDCyZSRRRHbuWpy1apUBn/fcEHXi+7UwYahx8PPA
-HQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.mpg.de/mpg/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.mpg.de/mpg/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.mpg.de/mpg/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">mpg.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>MIIFnTCCBIWgAwIBAgIHGcwgoGctzjANBgkqhkiG9w0BAQsFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNTA3MjAw
-NzI4MTdaFw0xODEwMTYwNzI4MTdaMIGKMQswCQYDVQQGEwJERTEWMBQGA1UECAwN
-TmllZGVyc2FjaHNlbjETMBEGA1UEBwwKR29ldHRpbmdlbjEgMB4GA1UECgwXTWF4
-LVBsYW5jay1HZXNlbGxzY2hhZnQxDDAKBgNVBAsMA1BLSTEeMBwGA1UEAwwVc2hp
-YmJvbGV0aC1pZHAubXBnLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAyonU61JD/L8NXg+nYLf5NyzuViFuADwgpiyZMlHto4tZLOi4acF4Ji5UIRwj
-D7NwVU8NMr6UjMD6bCnv6OZNAL9L2t4dmRqk0RAzH4IIoL4jq9p10BKYfGRNpiXE
-Lza2ArTdiTojBOpvD3VYgFbjCXHjfUSmvn+e0Dx0SYIfG+t1NSebf8Txgq9IDgBV
-WgZZN012VrWiezDOn+Lh8497cr8PM6lxqj4duDbn7HQcAJGyPxIPwAMJF5fhTM4P
-HtZQZPAUjv6Z01gXlCCthDek3Q2YPA8HilwSxJcjXCBfejJJTLZFieVRydBcA/ap
-aewaww/i7+0rVRbAK1XBJ6fMFwIDAQABo4ICMTCCAi0wTwYDVR0gBEgwRjARBg8r
-BgEEAYGtIYIsAQEEAwMwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
-AQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSq+b/gIhlsgfk5gfSi
-rqa17AQeNjAfBgNVHSMEGDAWgBQC1h5uCau/WGWnCjxIM2HRzn3DWzAgBgNVHREE
-GTAXghVzaGliYm9sZXRoLWlkcC5tcGcuZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9tcGctY2EvcHViL2NybC9jYWNybC5jcmwwNaAz
-oDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMIHHBggrBgEFBQcBAQSBujCBtzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3Au
-cGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPwYI
-KwYBBQUHMAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEARYTUSInl9UH5wdNLPHys
-rhP1LCBXWjhrnf9ejdJRIWiX3DURVvCWvBkOBTRrc3XpkyoRqzJfSPJ5iMFBNzqH
-GZsJ8ZwLqhmqFN2d1DS5J7cEOHqyvm9HTV4nTVq6mHoCAclFtWZ+ByVHs+aqkxEe
-KChZEW5O/tFETb5PPWdGAgX8aSQ8nk6U8+LeGF1CdYmXzTWpArkxU1dhgTkR94px
-OW1hWyZdRMBMDQ8r2HOEa/+3/2fOA9fJPfopOO5LnYPOX254d7AP5p/KRlrre596
-HsbNUEVhOjgMmy4luhzK9AUWTDCyZSRRRHbuWpy1apUBn/fcEHXi+7UwYahx8PPA
-HQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.mpg.de:8443/mpg/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.mpg.de:8443/mpg/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">e71</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e71</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Max-Planck-Gesellschaft</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Max-Planck-Gesellschaft</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.biochem.mpg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.biochem.mpg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Daniel</md:GivenName>
-    <md:SurName>Adler</md:SurName>
-    <md:EmailAddress>mailto:daniel.adler@gwdg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Christof</md:GivenName>
-    <md:SurName>Pohl</md:SurName>
-    <md:EmailAddress>mailto:christof.pohl@gwdg.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9eddfa7a..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.pucrs.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://shibboleth-idp.pucrs.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.pucrs.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.pucrs.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.pucrs.br/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">pucrs.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.pucrs.br:8443/idp/profile/SAML1/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">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">PUCRS - Pontificia Universidade Catolica do Rio Grande do Sul</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pucrs.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.pucrs.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Dilermando Bueno</md:SurName>
-    <md:EmailAddress>dbueno@pucrs.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0b60efea..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.pucrs.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://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>
-    MIIEoDCCA4gCAQAwDQYJKoZIhvcNAQEFBQAwggEUMUYwRAYDVQQKEz1QVUNSUyAt
-IFBvbnRpZmljaWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRvIFJpbyBHcmFuZGUg
-ZG8gU3VsMUYwRAYDVQQLEz1HVElUIC0gR2VyZW5jaWEgZGUgVGVjbm9sb2dpYSBk
-YSBJbmZvcm1hY2FvIGUgVGVsZWNvbXVuaWNhY2FvMSAwHgYJKoZIhvcNAQkBFhFz
-ZWN1cml0eUBwdWNycy5icjEVMBMGA1UEBxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQI
-ExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIxIDAeBgNVBAMTF3NoaWJi
-b2xldGgtaWRwLnB1Y3JzLmJyMB4XDTEzMTEyODE1MDgxM1oXDTE4MTEyNzE1MDgx
-M1owggEUMUYwRAYDVQQKEz1QVUNSUyAtIFBvbnRpZmljaWEgVW5pdmVyc2lkYWRl
-IENhdG9saWNhIGRvIFJpbyBHcmFuZGUgZG8gU3VsMUYwRAYDVQQLEz1HVElUIC0g
-R2VyZW5jaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgVGVsZWNvbXVu
-aWNhY2FvMSAwHgYJKoZIhvcNAQkBFhFzZWN1cml0eUBwdWNycy5icjEVMBMGA1UE
-BxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkG
-A1UEBhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6
-V8CtSEs8GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3
-nvWJwkImqNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU
-+16+ceqGF75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEX
-aYFb2jl0piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4a
-eb9YEQJaNWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQBWgaGE0pkFuzO+YgGdUwsr22f/mhlJ2QbyN+XP
-UP+Ra1uKrE572YdXHpl4jhHhncMyDLJX/adNeLF80r/QmkoiWZeagW3ItRDjwK+m
-5Zt7tYYsyf9CoJq+oCXo90yZupzBQX5PSln5AowM1lvY5/eB2MRkdVvfV7ZgwgK+
-4LNNFiqsTc8hjLRnrZwnAggnoOFHw1azsRZ9+VvK0zdpFlp4yznKukcuBu5Oylly
-1VY/foKEsd3XeKk+u53rhOw6KlGRH7cW6umSzZGuThg7KS9f1KRC7F9vqndGcmkP
-3GdRNnUePk9OmIeNHL6yBjA+ryz2A4uSy99h2JOLf/IhcAAH
-            </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>
-      
-MIIEoDCCA4gCAQAwDQYJKoZIhvcNAQEFBQAwggEUMUYwRAYDVQQKEz1QVUNSUyAt
-IFBvbnRpZmljaWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRvIFJpbyBHcmFuZGUg
-ZG8gU3VsMUYwRAYDVQQLEz1HVElUIC0gR2VyZW5jaWEgZGUgVGVjbm9sb2dpYSBk
-YSBJbmZvcm1hY2FvIGUgVGVsZWNvbXVuaWNhY2FvMSAwHgYJKoZIhvcNAQkBFhFz
-ZWN1cml0eUBwdWNycy5icjEVMBMGA1UEBxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQI
-ExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIxIDAeBgNVBAMTF3NoaWJi
-b2xldGgtaWRwLnB1Y3JzLmJyMB4XDTEzMTEyODE1MDgxM1oXDTE4MTEyNzE1MDgx
-M1owggEUMUYwRAYDVQQKEz1QVUNSUyAtIFBvbnRpZmljaWEgVW5pdmVyc2lkYWRl
-IENhdG9saWNhIGRvIFJpbyBHcmFuZGUgZG8gU3VsMUYwRAYDVQQLEz1HVElUIC0g
-R2VyZW5jaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgVGVsZWNvbXVu
-aWNhY2FvMSAwHgYJKoZIhvcNAQkBFhFzZWN1cml0eUBwdWNycy5icjEVMBMGA1UE
-BxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkG
-A1UEBhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6
-V8CtSEs8GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3
-nvWJwkImqNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU
-+16+ceqGF75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEX
-aYFb2jl0piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4a
-eb9YEQJaNWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQBWgaGE0pkFuzO+YgGdUwsr22f/mhlJ2QbyN+XP
-UP+Ra1uKrE572YdXHpl4jhHhncMyDLJX/adNeLF80r/QmkoiWZeagW3ItRDjwK+m
-5Zt7tYYsyf9CoJq+oCXo90yZupzBQX5PSln5AowM1lvY5/eB2MRkdVvfV7ZgwgK+
-4LNNFiqsTc8hjLRnrZwnAggnoOFHw1azsRZ9+VvK0zdpFlp4yznKukcuBu5Oylly
-1VY/foKEsd3XeKk+u53rhOw6KlGRH7cW6umSzZGuThg7KS9f1KRC7F9vqndGcmkP
-3GdRNnUePk9OmIeNHL6yBjA+ryz2A4uSy99h2JOLf/IhcAAH
-                    
-            </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 54ee9881..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.uni-goettingen.de/uni/shibboleth">
-  <md: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>
-  </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-goettingen.de</shibmd: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>
-    </md:Extensions>
-    <md: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>MIIGMjCCBRqgAwIBAgIHGcwhSXcahzANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNTA3MjAwNzMxMDVaFw0xODEwMTYw
-NzMxMDVaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECAwNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBwwKR29ldHRpbmdlbjEtMCsGA1UECgwkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDDCBzaGliYm9sZXRoLWlkcC51bmkt
-Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMgu
-6nduuISVKup+kElmVF7XAyszJ/p+rWNzAjJGQkaBvl0vpWX5yHu5iXhiqObTXYJK
-7FO3MVbwNXqNDgN94mNx/eHzA+qG8pKLZT4ZQKGqmtNWci+IMiKC0q2QIbCL2K+h
-qfAVUuNEVwlDrcZMdTtjoFD54aGJp7iVZ+ScJOM2LQAx4JcbZS2TuZgdLqVUmoG9
-mIZAZGp+lch1+3nPXkehibDQBCIpzmGKZ97uEBrsev7cNDeTvYPFKwgbJNfDoBKS
-zuuVzXALcE8vvdpOma7hXJ7NisQJTJrSom+Fo5mYOWCZ8in0SNxLiWhFoJ5CMA77
-aXP74kLskB8fI4xETZsCAwEAAaOCAmswggJnME8GA1UdIARIMEYwEQYPKwYBBAGB
-rSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0G
-CysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUCsPxT6RjkIz0xG32zGNyDQnP
-nHYwHwYDVR0jBBgwFoAUHb1zzG3ubhx0cNmjGzq6qCfevOswKwYDVR0RBCQwIoIg
-c2hpYmJvbGV0aC1pZHAudW5pLWdvZXR0aW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBA
-oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
-gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBNdN1swPGoOzT1
-OWp6VZVlKop49Tp+K0L8OluEn/oj9vdTvhii2ZV2/YGIaAT5TyghgxlbiOdi+kM0
-a7Cz3eMXFLW7pc3gUvssYB29sq8P/PoPGncVThpU192YWhCSEDYqqdPqUexPfh5G
-BRr8W0PSQzimiDdOGQkq36A5QM7i1iwlfvIw0V95kvBbi4Oxg3+cH5yDCTxhXySn
-Q1bAHYn1v1OvosRmBJ94W+eJV35+rxMyak2KrAJ/PDHQ2nqY7m4hQ5g1w7W/kkia
-8D3IjupYe+uXdGC0tSUAh/p32hnnvG5kf0oQAVEydyhCawll2q1dG14yWCZENShq
-wDkP23Ru
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-goettingen.de/uni/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-goettingen.de/uni/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-goettingen.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>MIIGMjCCBRqgAwIBAgIHGcwhSXcahzANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
-ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
-bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
-9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNTA3MjAwNzMxMDVaFw0xODEwMTYw
-NzMxMDVaMIGUMQswCQYDVQQGEwJERTEWMBQGA1UECAwNTmllZGVyc2FjaHNlbjET
-MBEGA1UEBwwKR29ldHRpbmdlbjEtMCsGA1UECgwkR2VvcmctQXVndXN0LVVuaXZl
-cnNpdGFldCBHb2V0dGluZ2VuMSkwJwYDVQQDDCBzaGliYm9sZXRoLWlkcC51bmkt
-Z29ldHRpbmdlbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMgu
-6nduuISVKup+kElmVF7XAyszJ/p+rWNzAjJGQkaBvl0vpWX5yHu5iXhiqObTXYJK
-7FO3MVbwNXqNDgN94mNx/eHzA+qG8pKLZT4ZQKGqmtNWci+IMiKC0q2QIbCL2K+h
-qfAVUuNEVwlDrcZMdTtjoFD54aGJp7iVZ+ScJOM2LQAx4JcbZS2TuZgdLqVUmoG9
-mIZAZGp+lch1+3nPXkehibDQBCIpzmGKZ97uEBrsev7cNDeTvYPFKwgbJNfDoBKS
-zuuVzXALcE8vvdpOma7hXJ7NisQJTJrSom+Fo5mYOWCZ8in0SNxLiWhFoJ5CMA77
-aXP74kLskB8fI4xETZsCAwEAAaOCAmswggJnME8GA1UdIARIMEYwEQYPKwYBBAGB
-rSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0G
-CysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUCsPxT6RjkIz0xG32zGNyDQnP
-nHYwHwYDVR0jBBgwFoAUHb1zzG3ubhx0cNmjGzq6qCfevOswKwYDVR0RBCQwIoIg
-c2hpYmJvbGV0aC1pZHAudW5pLWdvZXR0aW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBA
-oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
-dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
-gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
-ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
-bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
-MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBNdN1swPGoOzT1
-OWp6VZVlKop49Tp+K0L8OluEn/oj9vdTvhii2ZV2/YGIaAT5TyghgxlbiOdi+kM0
-a7Cz3eMXFLW7pc3gUvssYB29sq8P/PoPGncVThpU192YWhCSEDYqqdPqUexPfh5G
-BRr8W0PSQzimiDdOGQkq36A5QM7i1iwlfvIw0V95kvBbi4Oxg3+cH5yDCTxhXySn
-Q1bAHYn1v1OvosRmBJ94W+eJV35+rxMyak2KrAJ/PDHQ2nqY7m4hQ5g1w7W/kkia
-8D3IjupYe+uXdGC0tSUAh/p32hnnvG5kf0oQAVEydyhCawll2q1dG14yWCZENShq
-wDkP23Ru
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-goettingen.de:8443/uni/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">e281</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e281</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Georg-August-Universität Göttingen</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Georg-August-Universität Göttingen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-goettingen.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-goettingen.de/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Daniel</md:GivenName>
-    <md:SurName>Adler</md:SurName>
-    <md:EmailAddress>mailto:dadler1@gwdg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Christof</md:GivenName>
-    <md:SurName>Pohl</md:SurName>
-    <md:EmailAddress>mailto:cpohl@gwdg.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 745cc7a6..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.uni-regensburg.de/idp/shibboleth">
-  <md: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>
-  </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-regensburg.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ur.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ukr.de</shibmd: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-idp.uni-regensburg.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-regensburg.de/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-regensburg.de/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-regensburg.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ur.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ukr.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-regensburg.de: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">e311</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e311</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Regensburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University Regensburg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-regensburg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-regensburg.de/index.html.en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Wimmer</md:SurName>
-    <md:EmailAddress>mailto:martin.wimmer@rz.uni-regensburg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Edmund</md:GivenName>
-    <md:SurName>Weber</md:SurName>
-    <md:EmailAddress>mailto:edmund.weber@rz.uni-regensburg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Help</md:GivenName>
-    <md:SurName>Desk</md:SurName>
-    <md:EmailAddress>mailto:support@rz.uni-regensburg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Gerd</md:GivenName>
-    <md:SurName>Böhm</md:SurName>
-    <md:EmailAddress>mailto:gerd.boehm@rz.uni-regensburg.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-wuerzburg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-wuerzburg.de.xml
deleted file mode 100644
index 96161de5..00000000
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-wuerzburg.de.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth-idp.uni-wuerzburg.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuerzburg.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">klinik.uni-wuerzburg.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hfm-wuerzburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.uni-wuerzburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIECw84DjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTA3MDkxODExNDYwN1oXDTEyMDkxNjExNDYwN1owcDELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xKDAmBgNVBAMTH3NoaWJib2xldGgtaWRwLnVuaS13dWVyemJ1cmcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC84cX32r+HV2E7qvWR
-IO/t/h2yaLIHH616DK2UINekFPhKLW5gy9CSzBA5DLaQkGh5Slmn3XwEtitU6XnB
-BiKCpK5w7DprNQwbJ1Hr3nkTy5uZT3wZJUVZ7JGlTZzLwi9D5vRxPYOAkRWMz8RN
-LG07aKMGcLk0kw9yzZhBajJiI22eCTcXCD9NSuPfWoDE095xuAUbV3AYDMTpQU+c
-jUC0eTZMVulIHI9tc2LtLWY28lOkLN49PjMHi/QHrEsa1oX84j/2J684+ZY0eukD
-4ho1QWLc5VQ5Z9PRA3J6waEET5YMAOAvUshsKyYwWWAswgnYEX5iaYatdPb2MMvU
-0qJdAgMBAAGjggG2MIIBsjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJbyCEZ9HzZq5Ze364JA
-FIp28I1sMB8GA1UdIwQYMBaAFH0fqED2pvYyToHl+DILw20rxDNuMB8GA1UdEQQY
-MBaBFHp2ZEB1bmktd3VlcnpidXJnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDig
-NqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBC
-BggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCY4qMwDI+qEDF1
-qmKBboDLpL+dj0JiLPRjntWMN8wUgrwczE49L/drVkOxJtGztN5Z4L4RYnVPgqO4
-VxjTUnLmUV9/duUtMdDxBm0sCvg2bnH7bi5WSl14hSFS0rvfbxO8MkFWXSnuS6q4
-2Ef6XYsMNYgRZX5UkP80JDyvq9LwqgbjBaXWhRH3MV8fiNoBszfW8Ql82FpcNGpt
-Y0EB4jWzrnNqgh8ewhExh2NFHMRIOKB7mKE6nl7zrME/FDiIKeHTsB0iGNCiQcII
-O0t36p60L9R37wLEQtV0ErabP96Z5EsIeWbinxG3IoR4WPIE+/QQzYVBSot8kJhW
-fiTDOOsi
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.uni-wuerzburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIECw84DjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTA3MDkxODExNDYwN1oXDTEyMDkxNjExNDYwN1owcDELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xKDAmBgNVBAMTH3NoaWJib2xldGgtaWRwLnVuaS13dWVyemJ1cmcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC84cX32r+HV2E7qvWR
-IO/t/h2yaLIHH616DK2UINekFPhKLW5gy9CSzBA5DLaQkGh5Slmn3XwEtitU6XnB
-BiKCpK5w7DprNQwbJ1Hr3nkTy5uZT3wZJUVZ7JGlTZzLwi9D5vRxPYOAkRWMz8RN
-LG07aKMGcLk0kw9yzZhBajJiI22eCTcXCD9NSuPfWoDE095xuAUbV3AYDMTpQU+c
-jUC0eTZMVulIHI9tc2LtLWY28lOkLN49PjMHi/QHrEsa1oX84j/2J684+ZY0eukD
-4ho1QWLc5VQ5Z9PRA3J6waEET5YMAOAvUshsKyYwWWAswgnYEX5iaYatdPb2MMvU
-0qJdAgMBAAGjggG2MIIBsjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJbyCEZ9HzZq5Ze364JA
-FIp28I1sMB8GA1UdIwQYMBaAFH0fqED2pvYyToHl+DILw20rxDNuMB8GA1UdEQQY
-MBaBFHp2ZEB1bmktd3VlcnpidXJnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDig
-NqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBC
-BggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCY4qMwDI+qEDF1
-qmKBboDLpL+dj0JiLPRjntWMN8wUgrwczE49L/drVkOxJtGztN5Z4L4RYnVPgqO4
-VxjTUnLmUV9/duUtMdDxBm0sCvg2bnH7bi5WSl14hSFS0rvfbxO8MkFWXSnuS6q4
-2Ef6XYsMNYgRZX5UkP80JDyvq9LwqgbjBaXWhRH3MV8fiNoBszfW8Ql82FpcNGpt
-Y0EB4jWzrnNqgh8ewhExh2NFHMRIOKB7mKE6nl7zrME/FDiIKeHTsB0iGNCiQcII
-O0t36p60L9R37wLEQtV0ErabP96Z5EsIeWbinxG3IoR4WPIE+/QQzYVBSot8kJhW
-fiTDOOsi
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-wuerzburg.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-wuerzburg.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-idp.uni-wuerzburg.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-idp.uni-wuerzburg.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-idp.uni-wuerzburg.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-wuerzburg.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">klinik.uni-wuerzburg.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hfm-wuerzburg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.uni-wuerzburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIECw84DjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTA3MDkxODExNDYwN1oXDTEyMDkxNjExNDYwN1owcDELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xKDAmBgNVBAMTH3NoaWJib2xldGgtaWRwLnVuaS13dWVyemJ1cmcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC84cX32r+HV2E7qvWR
-IO/t/h2yaLIHH616DK2UINekFPhKLW5gy9CSzBA5DLaQkGh5Slmn3XwEtitU6XnB
-BiKCpK5w7DprNQwbJ1Hr3nkTy5uZT3wZJUVZ7JGlTZzLwi9D5vRxPYOAkRWMz8RN
-LG07aKMGcLk0kw9yzZhBajJiI22eCTcXCD9NSuPfWoDE095xuAUbV3AYDMTpQU+c
-jUC0eTZMVulIHI9tc2LtLWY28lOkLN49PjMHi/QHrEsa1oX84j/2J684+ZY0eukD
-4ho1QWLc5VQ5Z9PRA3J6waEET5YMAOAvUshsKyYwWWAswgnYEX5iaYatdPb2MMvU
-0qJdAgMBAAGjggG2MIIBsjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJbyCEZ9HzZq5Ze364JA
-FIp28I1sMB8GA1UdIwQYMBaAFH0fqED2pvYyToHl+DILw20rxDNuMB8GA1UdEQQY
-MBaBFHp2ZEB1bmktd3VlcnpidXJnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDig
-NqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBC
-BggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCY4qMwDI+qEDF1
-qmKBboDLpL+dj0JiLPRjntWMN8wUgrwczE49L/drVkOxJtGztN5Z4L4RYnVPgqO4
-VxjTUnLmUV9/duUtMdDxBm0sCvg2bnH7bi5WSl14hSFS0rvfbxO8MkFWXSnuS6q4
-2Ef6XYsMNYgRZX5UkP80JDyvq9LwqgbjBaXWhRH3MV8fiNoBszfW8Ql82FpcNGpt
-Y0EB4jWzrnNqgh8ewhExh2NFHMRIOKB7mKE6nl7zrME/FDiIKeHTsB0iGNCiQcII
-O0t36p60L9R37wLEQtV0ErabP96Z5EsIeWbinxG3IoR4WPIE+/QQzYVBSot8kJhW
-fiTDOOsi
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth-idp.uni-wuerzburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth-idp.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIECw84DjANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTA3MDkxODExNDYwN1oXDTEyMDkxNjExNDYwN1owcDELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xKDAmBgNVBAMTH3NoaWJib2xldGgtaWRwLnVuaS13dWVyemJ1cmcu
-ZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC84cX32r+HV2E7qvWR
-IO/t/h2yaLIHH616DK2UINekFPhKLW5gy9CSzBA5DLaQkGh5Slmn3XwEtitU6XnB
-BiKCpK5w7DprNQwbJ1Hr3nkTy5uZT3wZJUVZ7JGlTZzLwi9D5vRxPYOAkRWMz8RN
-LG07aKMGcLk0kw9yzZhBajJiI22eCTcXCD9NSuPfWoDE095xuAUbV3AYDMTpQU+c
-jUC0eTZMVulIHI9tc2LtLWY28lOkLN49PjMHi/QHrEsa1oX84j/2J684+ZY0eukD
-4ho1QWLc5VQ5Z9PRA3J6waEET5YMAOAvUshsKyYwWWAswgnYEX5iaYatdPb2MMvU
-0qJdAgMBAAGjggG2MIIBsjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUE
-FjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJbyCEZ9HzZq5Ze364JA
-FIp28I1sMB8GA1UdIwQYMBaAFH0fqED2pvYyToHl+DILw20rxDNuMB8GA1UdEQQY
-MBaBFHp2ZEB1bmktd3VlcnpidXJnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDig
-NqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2Nh
-Y3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6Ly9j
-ZHAxLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBC
-BggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCY4qMwDI+qEDF1
-qmKBboDLpL+dj0JiLPRjntWMN8wUgrwczE49L/drVkOxJtGztN5Z4L4RYnVPgqO4
-VxjTUnLmUV9/duUtMdDxBm0sCvg2bnH7bi5WSl14hSFS0rvfbxO8MkFWXSnuS6q4
-2Ef6XYsMNYgRZX5UkP80JDyvq9LwqgbjBaXWhRH3MV8fiNoBszfW8Ql82FpcNGpt
-Y0EB4jWzrnNqgh8ewhExh2NFHMRIOKB7mKE6nl7zrME/FDiIKeHTsB0iGNCiQcII
-O0t36p60L9R37wLEQtV0ErabP96Z5EsIeWbinxG3IoR4WPIE+/QQzYVBSot8kJhW
-fiTDOOsi
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-idp.uni-wuerzburg.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-idp.uni-wuerzburg.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Würzburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Würzburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-wuerzburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Matthias</GivenName>
-    <SurName>Funken</SurName>
-    <EmailAddress>matthias.funken@uni-wuerzburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Maria</GivenName>
-    <SurName>Warren</SurName>
-    <EmailAddress>maria.warren@uni-wuerzburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-sp-test.webbased.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-sp-test.webbased.co.uk-shibboleth.xml
deleted file mode 100644
index fb55a31d..00000000
--- a/swamid-interfederations-2.0/shibboleth-sp-test.webbased.co.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://shibboleth-sp-test.webbased.co.uk/shibboleth">
-  <!--
-		This is a "Test service provider" Shibboleth SP for WebBased 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#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="2009-09-04T10:36: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://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.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://shibboleth-sp-test.webbased.co.uk/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://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/idp.merlin.swgfl.org.uk"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/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://shibboleth-sp-test.webbased.co.uk/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://shibboleth-sp-test.webbased.co.uk/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://shibboleth-sp-test.webbased.co.uk/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://shibboleth-sp-test.webbased.co.uk/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://shibboleth-sp-test.webbased.co.uk/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://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/shibboleth.networcs.net"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/dev-shibboleth.networcs.net"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/embc.uk.com"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/WAYF/idp.leedslearning.net"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFYjCCA0oCCQD/5vJ0PJIN6jANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
-						QjEOMAwGA1UECBMFRGV2b24xETAPBgNVBAcTCFBseW1vdXRoMRUwEwYDVQQKEwxX
-						ZWJiYXNlZCBMdGQxKjAoBgNVBAMTIXNoaWJib2xldGgtc3AtdGVzdC53ZWJiYXNl
-						ZC5jby51azAeFw0wOTA5MDMxNTUzNDBaFw0xOTA5MDExNTUzNDBaMHMxCzAJBgNV
-						BAYTAkdCMQ4wDAYDVQQIEwVEZXZvbjERMA8GA1UEBxMIUGx5bW91dGgxFTATBgNV
-						BAoTDFdlYmJhc2VkIEx0ZDEqMCgGA1UEAxMhc2hpYmJvbGV0aC1zcC10ZXN0Lndl
-						YmJhc2VkLmNvLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsrL+
-						xb8NRkLHPxuI5LMuev0YqCjb4YC/cN0s9ywj8kSIf/wJzt55HlrWmnDJNd0dz2Vm
-						DWbpP9nmK2nbVAeAaA5SftcWvOp/rrDcpTQyeajS1PDMThlxvy9tLmld0bscpimW
-						1hQJP9iMmquflg4ONdsu+dO3xjHs/phQ5WrqOGPTpecSreeIHx2Mu9zBOYgV7lqG
-						lgi/HyKafyAlnBSPnuoU2mq2PB0LZTZ3pkKyUtl1sNQcuTNHhhJNtNKYj5NZf1Hl
-						9nZTnZxxaa4Sfj3ZTsYA+fECfvNJBi03/uDihNgw3UZkX0QvrWS3TupuWiQkvgYd
-						U8gcMaGnMXQIZVr3RKaVbBraB2F90zUXtut9w6pc53xmtyI7cvQgNpkMiI06eJxh
-						M/8r9Wet9LX02AIDbpPYiqgJgPMGfqmrYg7ZVoo66/TaSYxLs4P0h5aGEfRSaLk5
-						OSx8ulRn7CXXOK1g8XGpIV48KvN7hW2yZz04jKBa3VSwF1Tc7w3+AoG3YswQ3iLz
-						FTtCDzKEKCxzJQ7m5Dtzgy9+4hWlGbbgcf9IJqozsl/bVxWlrPi82Cqw9Ykj1uf4
-						oWS8V6/d3r/gJIK263+0cz43DJ9Pa2qOrZkqn5q6VhnCVxbbbI4Crq6pip7y6812
-						Qzpv59krPNWa0UMgzQPEcd/oYMWFw2ECmnYttaMCAwEAATANBgkqhkiG9w0BAQUF
-						AAOCAgEAnwsq//wg4lK92Uhu3Z/ysqHK7s0nTERPAcPgeDDTQ880UbRhu7sMnq3k
-						UzjKyJkBx4wA8kvUPK2V+JzpIvMIrUirQfAvsRZ7CZhcJN2rDF/VHwukXPS5xMPD
-						UxP1wajf4PlWF/1Mj6xOB6OjVzex53aFwbMVbgc73YVNwpokYBN78bDyG2Kn17Pf
-						KZbxvRjx6PGyJrR7Sr3bA3Fos2sYK1iJkBK+Pnk7eMc6JjJhGyOsGsfSM8psoeQE
-						S5/a+2vHqxuxK0crKJ7uKLPIscpxByAEwElNisfgSpDXEzLQogltVn1MIN1JxhDe
-						/k8QOhPdJ6VcUVD0MRLce2qjLcuMZ2f4fLNtlweh9NkiJ1OBL8EYLSMk6Xomxhgk
-						nZgO4QVByq5mnWXjSKMTOSjXdaDDPHOIFLWyKmcXR2HqTVk/XswR+MNCw+0EQuwk
-						XAB7b3eZFZTZtQARW1s4mixqKB+V1mvMVbk/hcsJHJXR8Fdy2wS9n1PguPSsrwp3
-						Kr+bKu7e3h6jwWD8hxF8iF4kq+jJOyG9WLz86De+pOFk7Wl1DeZcgEqZr44eiaTd
-						XnWLxI/wfb4ZP/ZbIPtSX9JTJZcOBX8MNmjmWiz7x0sVSSEUhb/+BVV2a5LJMPuo
-						g2Exwdg4BWnIcH1aUtuS2Q1pzhTVq5oAD77qFCZnLgI+9BHU80g=
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-sp-test.webbased.co.uk/Shibboleth.sso/SAML/Artifact" index="10"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">WebBased Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">WebBased Ltd: Test service provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.webbased.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martine</GivenName>
-    <SurName>Davies</SurName>
-    <EmailAddress>mailto:martine.davies@webbased.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Greg</GivenName>
-    <SurName>Hawkins</SurName>
-    <EmailAddress>mailto:greg.hawkins@webbased.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-sp.pre.proquest.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-sp.pre.proquest.com-shibboleth.xml
deleted file mode 100644
index 756f7d61..00000000
--- a/swamid-interfederations-2.0/shibboleth-sp.pre.proquest.com-shibboleth.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://shibboleth-sp.pre.proquest.com/shibboleth">
-  <!--
-		This is a "ProQuest Pre-Production Test" Shibboleth SP for Proquest Information and Learning 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="2014-07-21T14:13:24Z">
-      <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://shibboleth-sp.pre.proquest.com/Shibboleth.sso/DS"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJTCCAg2gAwIBAgIJALnScQHvrMirMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-						BAMMHnNoaWJib2xldGgtc3AucHJlLnByb3F1ZXN0LmNvbTAeFw0xNDA0MzAxNjM3
-						NThaFw0xNzA0MjkxNjM3NThaMCkxJzAlBgNVBAMMHnNoaWJib2xldGgtc3AucHJl
-						LnByb3F1ZXN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu2
-						ulnDhrfoKBQQbuEz/DLnadTAPbH6mjwEN1WL3wwzsbT9tBvbgUkeJVek3IzrcQyY
-						wNupltjdz1oy+D8SEeZl3k7FNl++OOWbYeoJC2x+H4DlN9JJKAc3BHjWWqxgsg/q
-						yA90PqgnLx92Ssrg3Q1A7wEtX2Og7KRZvduo7Ku+xwZaKUHSOldk/us9EydhyPXX
-						8mq4f8+VfsdHxEG8snu8XUaldH8m155dnh14JqgeK9Fhwd50uXbrMsRuRuoy6nTD
-						OI2tkuHK31wlsDuJe7MskWmHTuF2U58dG4K7EoWEkPxJhddFFGlEWL3Zx9ZMncmb
-						H4a0EjLSv4sVs865dYcCAwEAAaNQME4wHQYDVR0OBBYEFMHUep80KowQJBTazxKk
-						hIM2iDwYMB8GA1UdIwQYMBaAFMHUep80KowQJBTazxKkhIM2iDwYMAwGA1UdEwQF
-						MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIMGnbKNiy6Pt/ODzEQH2cmNzHVLIjsk
-						RHjBtRtCFaPaicReEVfb4TsC5BIUcocizp/ik+cicggvvbmsDhygbugA+iXo2edH
-						4u40jaPWUfSdhPJkUeU/R8s+5NPXrI3IVyHhc+oYeDIHTFOulXqICtymxidq54ci
-						nVpwM/ENfcMy0H4azdwnzuvUnJcane6w7tBryN0nitUrL0/g1CM4/jw1x+hpZBUf
-						JP7HaWe7IriI2oWnBx5h9LcxFco6dRhVOVJ63duuPh32pNeRvNRCk4+KwTuEy9Z7
-						21I9IB6pfRoS4k/s/rB2Zt3JLJHgsZpRFhaqEmMTnKWi9xn2tdFd2gw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shibboleth-sp.pre.proquest.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-sp.pre.proquest.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Proquest Information and Learning Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ProQuest Pre-Production Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.proquest.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ProQuest Technical Support</GivenName>
-    <EmailAddress>mailto:tsupport@proquest.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Anil</GivenName>
-    <SurName>Nair</SurName>
-    <EmailAddress>mailto:anil.nair@proquest.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-sp.prod.proquest.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-sp.prod.proquest.com-shibboleth.xml
deleted file mode 100644
index 0d0807bd..00000000
--- a/swamid-interfederations-2.0/shibboleth-sp.prod.proquest.com-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://shibboleth-sp.prod.proquest.com/shibboleth">
-  <!--
-		This is a "ProQuest" Shibboleth SP for Proquest Information and Learning 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="2014-08-14T16:15:53Z">
-      <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://shibboleth-sp.prod.proquest.com/Shibboleth.sso/DS"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWTCCAkGgAwIBAgIJALUXgtUwAcW1MA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-						BAMTH3NoaWJib2xldGgtc3AucHJvZC5wcm9xdWVzdC5jb20wHhcNMTQwODA0MTgx
-						NjMxWhcNMTcwODA0MTgxNjMxWjAqMSgwJgYDVQQDEx9zaGliYm9sZXRoLXNwLnBy
-						b2QucHJvcXVlc3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						uL3AvdPUloVAT2SxU5zfIMS1Q51dz15rM97hcspWkeJbOJRzuWGmdn1NTO8wNgfH
-						WMcvxCH+MlUZdixFEEZ/oghDCKYQyngBe5DFb1o2MmXyXidtaFVzKOdkvwkrGNB4
-						AEAg0ee6EN72qxlUSk3md90GWsv2RVOicpxwKcpk/f8ibfuaqwUZoqyzBM9/jADp
-						uBG3iyiNr1/uGvCBhghvTpHRjZ6+L1t1tY8fi9xs15kd8k5nxQi1BSoGcqkmGJXB
-						OwBhn5mb5FjHGbzw6kbL/O+zWBLlzIIJmS3YsbgBiAGWbzIdGl366VRkea0yuVQE
-						KybgYDA/W5ezLNSeEdmMlwIDAQABo4GBMH8wXgYDVR0RBFcwVYIfc2hpYmJvbGV0
-						aC1zcC5wcm9kLnByb3F1ZXN0LmNvbYYyaHR0cHM6Ly9zaGliYm9sZXRoLXNwLnBy
-						b2QucHJvcXVlc3QuY29tL3NoaWJib2xldGgwHQYDVR0OBBYEFGaLI8FVRsbPeB4H
-						Q2517x6lRlkqMA0GCSqGSIb3DQEBBQUAA4IBAQCqcb5MKykmiQCSv19us1E1+gk5
-						LWew6OUY/rWRdM9EpVbKlMgo0A2KTuJ5qrI/miS69wv+5nbEPax007kP7Xd4e54K
-						yK0KWmTt92O3Rie2uf1dIF/VDOaIGvny0WTNfgiRmGrq3KERz26j7vQXbk9WOdp3
-						+L3v1Wr8+1N/MLrQ7JDZAygO3Xb4gGcGI9VWlPKL8o09K4fR8EM97p3qeqJINMqw
-						QsWrBhm9Tb51QxpARIjlF8paFZ0h6ugS/thDOh50wvqJ8B0r3ozD6E2Mu3A0zF/o
-						J4Wfgn170Gts8ghZeFrntOIilzGjb13VgnUpVXqsMEkmYqtzmKOGxiVuIyXc
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shibboleth-sp.prod.proquest.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-sp.prod.proquest.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Proquest Information and Learning Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ProQuest</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.proquest.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Technical Support Team</GivenName>
-    <EmailAddress>mailto:support@proquest.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Wilt</SurName>
-    <EmailAddress>mailto:pqshibbolethtech@proquest.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth-test.cranfield.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth-test.cranfield.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index ed3f23d1..00000000
--- a/swamid-interfederations-2.0/shibboleth-test.cranfield.ac.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://shibboleth-test.cranfield.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth Test IdP for Cranfield University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-22T11:14: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">cranfield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlKgAwIBAgIVAIq9SAD1Wg+WoXnjv9yjObPYWEodMA0GCSqGSIb3DQEB
-						BQUAMCoxKDAmBgNVBAMTH3NoaWJib2xldGgtdGVzdC5jcmFuZmllbGQuYWMudWsw
-						HhcNMTMwNzE1MTMyMjQ2WhcNMjMwNzE1MTMyMjQ2WjAqMSgwJgYDVQQDEx9zaGli
-						Ym9sZXRoLXRlc3QuY3JhbmZpZWxkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAp4zvWrdtUsjn4bWBMxcW7m7yBE72BSjOlFqmS6V9l0bDXRSc
-						NRcAOv4E65rwa3PfWv5omXyoWeUb2NxL5VYzOT3Q2oOuhFgyJ2IW82ahcdGuNkHM
-						FzT3iToZD5Ar9LPHv22f08wd3xY/cNhYgmE8G/CbpImr/GYflwYcK7r+bXTXl3WG
-						rKtHyo/G9U5IR1+Vt3yYKmF80v2gUPBMkIYt2XwgR4pJ17jZhX9GrDvL36wab9BR
-						Q23xAQqzqiIyC2sJwFR8xAKlmR84V42tJyOnA0P7dsOS1MD8SiRYXxf22hxelP4D
-						Th1cShuxjeOywDMAitOyWF5CCm2Fed2EyFm8ewIDAQABo4GGMIGDMGIGA1UdEQRb
-						MFmCH3NoaWJib2xldGgtdGVzdC5jcmFuZmllbGQuYWMudWuGNmh0dHBzOi8vc2hp
-						YmJvbGV0aC10ZXN0LmNyYW5maWVsZC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNV
-						HQ4EFgQUrjkjd0ZnnftSM8MS2V3BqUFOiJIwDQYJKoZIhvcNAQEFBQADggEBAGUJ
-						krPSvm32mmqQUAzrm2F5QYvjIzuyhLGWCYdhsbXrfHfOp1zc/9n3WCqYLGroA37f
-						tWg1qarE74v1q8oBh3sHw6zYLAY5ux/NBJ1yucwQ4p/ephvQ3uD56Nv7lTOgcFbW
-						OJQNwi2Zh6712VNACDXmyjrVE2GciTgNLXE5QQRS/yjAHEmB4KyDSRQkyRXAI/Hy
-						wfhbnquAZuaCCkre7CpbzMJT2HZNadhZPWZLs58MzV/eS2uQrjTSe0gr6o7CTA4R
-						v2E0+ZOLGM5EVx5myEWFewRqBgWxwDEuZlkHEMta+VVrrEZOu9qqgIM8xVeTbq+O
-						D8DFHLHPKqVbB13mytQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.cranfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-test.cranfield.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://shibboleth-test.cranfield.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-test.cranfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-test.cranfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-test.cranfield.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">cranfield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDajCCAlKgAwIBAgIVAIq9SAD1Wg+WoXnjv9yjObPYWEodMA0GCSqGSIb3DQEB
-						BQUAMCoxKDAmBgNVBAMTH3NoaWJib2xldGgtdGVzdC5jcmFuZmllbGQuYWMudWsw
-						HhcNMTMwNzE1MTMyMjQ2WhcNMjMwNzE1MTMyMjQ2WjAqMSgwJgYDVQQDEx9zaGli
-						Ym9sZXRoLXRlc3QuY3JhbmZpZWxkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAp4zvWrdtUsjn4bWBMxcW7m7yBE72BSjOlFqmS6V9l0bDXRSc
-						NRcAOv4E65rwa3PfWv5omXyoWeUb2NxL5VYzOT3Q2oOuhFgyJ2IW82ahcdGuNkHM
-						FzT3iToZD5Ar9LPHv22f08wd3xY/cNhYgmE8G/CbpImr/GYflwYcK7r+bXTXl3WG
-						rKtHyo/G9U5IR1+Vt3yYKmF80v2gUPBMkIYt2XwgR4pJ17jZhX9GrDvL36wab9BR
-						Q23xAQqzqiIyC2sJwFR8xAKlmR84V42tJyOnA0P7dsOS1MD8SiRYXxf22hxelP4D
-						Th1cShuxjeOywDMAitOyWF5CCm2Fed2EyFm8ewIDAQABo4GGMIGDMGIGA1UdEQRb
-						MFmCH3NoaWJib2xldGgtdGVzdC5jcmFuZmllbGQuYWMudWuGNmh0dHBzOi8vc2hp
-						YmJvbGV0aC10ZXN0LmNyYW5maWVsZC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNV
-						HQ4EFgQUrjkjd0ZnnftSM8MS2V3BqUFOiJIwDQYJKoZIhvcNAQEFBQADggEBAGUJ
-						krPSvm32mmqQUAzrm2F5QYvjIzuyhLGWCYdhsbXrfHfOp1zc/9n3WCqYLGroA37f
-						tWg1qarE74v1q8oBh3sHw6zYLAY5ux/NBJ1yucwQ4p/ephvQ3uD56Nv7lTOgcFbW
-						OJQNwi2Zh6712VNACDXmyjrVE2GciTgNLXE5QQRS/yjAHEmB4KyDSRQkyRXAI/Hy
-						wfhbnquAZuaCCkre7CpbzMJT2HZNadhZPWZLs58MzV/eS2uQrjTSe0gr6o7CTA4R
-						v2E0+ZOLGM5EVx5myEWFewRqBgWxwDEuZlkHEMta+VVrrEZOu9qqgIM8xVeTbq+O
-						D8DFHLHPKqVbB13mytQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.cranfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-test.cranfield.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">Cranfield University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cranfield University - Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cranfield.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Haynes</SurName>
-    <EmailAddress>mailto:j.haynes@cranfield.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kenneth</GivenName>
-    <SurName>Caines</SurName>
-    <EmailAddress>mailto:Kenneth.Caines@Cranfield.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Haynes</SurName>
-    <EmailAddress>mailto:j.haynes@cranfield.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth-TST.xml b/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth-TST.xml
deleted file mode 100644
index df0bf97b..00000000
--- a/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth-TST.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.aber.ac.uk/shibboleth-TST">
-  <!--
-		This is a Test Shibboleth IdP for Aberystwyth University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-09T12:16:54Z">
-      <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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Aberystwyth University IdP 3.1 Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Login@Aber</mdui:Description>
-        <mdui:Logo height="64" width="264">https://shibboleth.aber.ac.uk/mdui/pau_264x64.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shibboleth.aber.ac.uk/mdui/pau_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>144.124.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>aber.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:52.41806,-4.06576</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aber.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANUFXICF+oFNmWD1BQ4+pBSTdfLiMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJlci5hYy51azAeFw0xNjAyMTUx
-						MjQ2NTZaFw0zNjAyMTUxMjQ2NTZaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJl
-						ci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKG26zGeNxwr
-						df1mqabjwMlQLKL5IoucDg9QUaUdwZaDx1POccH8WicRwVGzFgsgu1whyWZP8mU5
-						+1Y+syOMtKeIx1CtIze950UqfUoaYRbIqoZerD67EgrZUE5wll0mrRAV5xImV1hz
-						WOIVyMid3Ze3ohYoegEbvDrS/Mkb2qIspRrAZGkV027JLVBar64qgYMgLMjKD/iO
-						rbEvMQT/+N6C+/hizqHIOq9uEFrWfx7OApJn+J36806TnhlgESqxzLTG0+PX86ZF
-						JGQJ73B5t9NuRh7VY46XVZWckxjDBrUcbNyz0hooDP0ECjIknUhVaj0zD/V+lJc0
-						0JGELS0335ECAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aC5hYmVyLmFj
-						LnVrhixodHRwczovL3NoaWJib2xldGguYWJlci5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQU+I7oDbYkhMlHIAj30Ri9FwzMagswDQYJKoZIhvcNAQEFBQAD
-						ggEBAI6Z/wmRpUo78wBenhCEjDwLltikfPmph4vHCfZZB9PAaETtVycjLOPLk3q0
-						nCZ/lVpcuqhT+CR/Fy7jME/zyxkaN2BtHQfoO1IC9d1vro0FOw2q1jS/jJ55QE4b
-						cxhbSaLkWyPbEdFbe+6NC/XigrKh+3oULjlLJ9VrcYIjGXM7ow/D1BZunFgZ0fEY
-						KUlbufKEe4dXJhD2ohIJSEjo7UH/nmVbnt3uz+CCL4mtZom72KxmauZIpV/2Z9Uu
-						hUPrgxUBssSlFQCtZ3IJNB1NA8NG9tnrIaLyR1J+6I5NsfBfow5hDDuoYE9kDha3
-						6tbiD66dhrK60oX7Sg2cPBc13Mo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIRAJlcQ3++vLgNmrr+TlKHgPEwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAzMDQwMDAwMDBaFw0xNjAzMDMyMzU5NTlaMEMxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
-						aC5hYmVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolIy
-						AOe63/CzqzDShypFAjBduFNikhH/mCUETUQh/Y88DZtr8PocWwdKjanlJTU0YHe5
-						3Qmc3YrLfKQggFUv6QWpF4wf8wAB25rWJ90nFrTyPobwXXelzuyQrUep8j6deoHv
-						3v+FAefGZWOUY4h+LOoH/Q2Jgsn10+US0JRQMjNdJWKU6gS6M7XEflYoyPn8QnEm
-						pWX/HyOniLsNXYhZQA/S0Djb/BObLm6FrrqAWJ2crepTeUnfB/Zf5qLjipcaEC2R
-						Qc3I0/d65uWntrgiSE2PElLqOy/QOxXV5EqGX6Q+Wv274aN8BTUjdtdNJPEUNbHp
-						36suelLrZKWI1IPy6wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-						SWsrN1dH6pDjue0wHQYDVR0OBBYEFIxYqlYMBHB65BGIwDs05Rczer4UMA4GA1Ud
-						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoLmFi
-						ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAtvRG+fRTg4bOlUsHXG6+me9RmP
-						gMJqh8AQ2gpjzebvRhRV8YWs1uG0NBkRoE5Xx/fQvQhtCgLT1/u4KAY0cTxj4yBj
-						gTBN4PV9GOXGRu4UXE1WKqplWdJqUCyxlbnd3tqFxM3GFhgnHqLnOIpTWoHrHu6G
-						3RoRWG0AHyw8UkdwXsog5maEmIPV6a5wQ5jXAY0o5Zo4IHQ6W/vVikKgscDVE+Ow
-						oD+ZwrzABgYMNDIXKI/ZVxUCKUZPwyTwbdNfp5n8qYK3USLu/OP0l8IjGUlW5jGA
-						N2VovIYVKB2cEEl6RMPPBLiQbsczCeN/O4Du2hxilIDiH+4CjORDPnzK5dA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8447/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.aber.ac.uk:447/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk:447/idp/profile/SAML2/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">aber.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANUFXICF+oFNmWD1BQ4+pBSTdfLiMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJlci5hYy51azAeFw0xNjAyMTUx
-						MjQ2NTZaFw0zNjAyMTUxMjQ2NTZaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJl
-						ci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKG26zGeNxwr
-						df1mqabjwMlQLKL5IoucDg9QUaUdwZaDx1POccH8WicRwVGzFgsgu1whyWZP8mU5
-						+1Y+syOMtKeIx1CtIze950UqfUoaYRbIqoZerD67EgrZUE5wll0mrRAV5xImV1hz
-						WOIVyMid3Ze3ohYoegEbvDrS/Mkb2qIspRrAZGkV027JLVBar64qgYMgLMjKD/iO
-						rbEvMQT/+N6C+/hizqHIOq9uEFrWfx7OApJn+J36806TnhlgESqxzLTG0+PX86ZF
-						JGQJ73B5t9NuRh7VY46XVZWckxjDBrUcbNyz0hooDP0ECjIknUhVaj0zD/V+lJc0
-						0JGELS0335ECAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aC5hYmVyLmFj
-						LnVrhixodHRwczovL3NoaWJib2xldGguYWJlci5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQU+I7oDbYkhMlHIAj30Ri9FwzMagswDQYJKoZIhvcNAQEFBQAD
-						ggEBAI6Z/wmRpUo78wBenhCEjDwLltikfPmph4vHCfZZB9PAaETtVycjLOPLk3q0
-						nCZ/lVpcuqhT+CR/Fy7jME/zyxkaN2BtHQfoO1IC9d1vro0FOw2q1jS/jJ55QE4b
-						cxhbSaLkWyPbEdFbe+6NC/XigrKh+3oULjlLJ9VrcYIjGXM7ow/D1BZunFgZ0fEY
-						KUlbufKEe4dXJhD2ohIJSEjo7UH/nmVbnt3uz+CCL4mtZom72KxmauZIpV/2Z9Uu
-						hUPrgxUBssSlFQCtZ3IJNB1NA8NG9tnrIaLyR1J+6I5NsfBfow5hDDuoYE9kDha3
-						6tbiD66dhrK60oX7Sg2cPBc13Mo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIRAJlcQ3++vLgNmrr+TlKHgPEwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAzMDQwMDAwMDBaFw0xNjAzMDMyMzU5NTlaMEMxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
-						aC5hYmVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolIy
-						AOe63/CzqzDShypFAjBduFNikhH/mCUETUQh/Y88DZtr8PocWwdKjanlJTU0YHe5
-						3Qmc3YrLfKQggFUv6QWpF4wf8wAB25rWJ90nFrTyPobwXXelzuyQrUep8j6deoHv
-						3v+FAefGZWOUY4h+LOoH/Q2Jgsn10+US0JRQMjNdJWKU6gS6M7XEflYoyPn8QnEm
-						pWX/HyOniLsNXYhZQA/S0Djb/BObLm6FrrqAWJ2crepTeUnfB/Zf5qLjipcaEC2R
-						Qc3I0/d65uWntrgiSE2PElLqOy/QOxXV5EqGX6Q+Wv274aN8BTUjdtdNJPEUNbHp
-						36suelLrZKWI1IPy6wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-						SWsrN1dH6pDjue0wHQYDVR0OBBYEFIxYqlYMBHB65BGIwDs05Rczer4UMA4GA1Ud
-						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoLmFi
-						ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAtvRG+fRTg4bOlUsHXG6+me9RmP
-						gMJqh8AQ2gpjzebvRhRV8YWs1uG0NBkRoE5Xx/fQvQhtCgLT1/u4KAY0cTxj4yBj
-						gTBN4PV9GOXGRu4UXE1WKqplWdJqUCyxlbnd3tqFxM3GFhgnHqLnOIpTWoHrHu6G
-						3RoRWG0AHyw8UkdwXsog5maEmIPV6a5wQ5jXAY0o5Zo4IHQ6W/vVikKgscDVE+Ow
-						oD+ZwrzABgYMNDIXKI/ZVxUCKUZPwyTwbdNfp5n8qYK3USLu/OP0l8IjGUlW5jGA
-						N2VovIYVKB2cEEl6RMPPBLiQbsczCeN/O4Du2hxilIDiH+4CjORDPnzK5dA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8447/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8447/idp/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">Aberystwyth University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aberystwyth University IdP 3.1 Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aber.ac.uk/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Information Services</GivenName>
-    <EmailAddress>mailto:is@aber.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Wiles</SurName>
-    <EmailAddress>mailto:aew@aber.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml
deleted file mode 100644
index d75af343..00000000
--- a/swamid-interfederations-2.0/shibboleth.aber.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.aber.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Aberystwyth University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-08-08T07:11:05Z">
-      <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">aber.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Aberystwyth University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Login@Aber</mdui:Description>
-        <mdui:Logo height="64" width="264">https://shibboleth.aber.ac.uk/mdui/pau_264x64.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shibboleth.aber.ac.uk/mdui/pau_16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>144.124.0.0/16</mdui:IPHint>
-        <mdui:DomainHint>aber.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:52.41806,-4.06576</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANUFXICF+oFNmWD1BQ4+pBSTdfLiMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJlci5hYy51azAeFw0xNjAyMTUx
-						MjQ2NTZaFw0zNjAyMTUxMjQ2NTZaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJl
-						ci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKG26zGeNxwr
-						df1mqabjwMlQLKL5IoucDg9QUaUdwZaDx1POccH8WicRwVGzFgsgu1whyWZP8mU5
-						+1Y+syOMtKeIx1CtIze950UqfUoaYRbIqoZerD67EgrZUE5wll0mrRAV5xImV1hz
-						WOIVyMid3Ze3ohYoegEbvDrS/Mkb2qIspRrAZGkV027JLVBar64qgYMgLMjKD/iO
-						rbEvMQT/+N6C+/hizqHIOq9uEFrWfx7OApJn+J36806TnhlgESqxzLTG0+PX86ZF
-						JGQJ73B5t9NuRh7VY46XVZWckxjDBrUcbNyz0hooDP0ECjIknUhVaj0zD/V+lJc0
-						0JGELS0335ECAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aC5hYmVyLmFj
-						LnVrhixodHRwczovL3NoaWJib2xldGguYWJlci5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQU+I7oDbYkhMlHIAj30Ri9FwzMagswDQYJKoZIhvcNAQEFBQAD
-						ggEBAI6Z/wmRpUo78wBenhCEjDwLltikfPmph4vHCfZZB9PAaETtVycjLOPLk3q0
-						nCZ/lVpcuqhT+CR/Fy7jME/zyxkaN2BtHQfoO1IC9d1vro0FOw2q1jS/jJ55QE4b
-						cxhbSaLkWyPbEdFbe+6NC/XigrKh+3oULjlLJ9VrcYIjGXM7ow/D1BZunFgZ0fEY
-						KUlbufKEe4dXJhD2ohIJSEjo7UH/nmVbnt3uz+CCL4mtZom72KxmauZIpV/2Z9Uu
-						hUPrgxUBssSlFQCtZ3IJNB1NA8NG9tnrIaLyR1J+6I5NsfBfow5hDDuoYE9kDha3
-						6tbiD66dhrK60oX7Sg2cPBc13Mo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIRAJlcQ3++vLgNmrr+TlKHgPEwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAzMDQwMDAwMDBaFw0xNjAzMDMyMzU5NTlaMEMxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
-						aC5hYmVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolIy
-						AOe63/CzqzDShypFAjBduFNikhH/mCUETUQh/Y88DZtr8PocWwdKjanlJTU0YHe5
-						3Qmc3YrLfKQggFUv6QWpF4wf8wAB25rWJ90nFrTyPobwXXelzuyQrUep8j6deoHv
-						3v+FAefGZWOUY4h+LOoH/Q2Jgsn10+US0JRQMjNdJWKU6gS6M7XEflYoyPn8QnEm
-						pWX/HyOniLsNXYhZQA/S0Djb/BObLm6FrrqAWJ2crepTeUnfB/Zf5qLjipcaEC2R
-						Qc3I0/d65uWntrgiSE2PElLqOy/QOxXV5EqGX6Q+Wv274aN8BTUjdtdNJPEUNbHp
-						36suelLrZKWI1IPy6wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-						SWsrN1dH6pDjue0wHQYDVR0OBBYEFIxYqlYMBHB65BGIwDs05Rczer4UMA4GA1Ud
-						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoLmFi
-						ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAtvRG+fRTg4bOlUsHXG6+me9RmP
-						gMJqh8AQ2gpjzebvRhRV8YWs1uG0NBkRoE5Xx/fQvQhtCgLT1/u4KAY0cTxj4yBj
-						gTBN4PV9GOXGRu4UXE1WKqplWdJqUCyxlbnd3tqFxM3GFhgnHqLnOIpTWoHrHu6G
-						3RoRWG0AHyw8UkdwXsog5maEmIPV6a5wQ5jXAY0o5Zo4IHQ6W/vVikKgscDVE+Ow
-						oD+ZwrzABgYMNDIXKI/ZVxUCKUZPwyTwbdNfp5n8qYK3USLu/OP0l8IjGUlW5jGA
-						N2VovIYVKB2cEEl6RMPPBLiQbsczCeN/O4Du2hxilIDiH+4CjORDPnzK5dA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.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://shibboleth.aber.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.aber.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aber.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">aber.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANUFXICF+oFNmWD1BQ4+pBSTdfLiMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJlci5hYy51azAeFw0xNjAyMTUx
-						MjQ2NTZaFw0zNjAyMTUxMjQ2NTZaMCAxHjAcBgNVBAMTFXNoaWJib2xldGguYWJl
-						ci5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKG26zGeNxwr
-						df1mqabjwMlQLKL5IoucDg9QUaUdwZaDx1POccH8WicRwVGzFgsgu1whyWZP8mU5
-						+1Y+syOMtKeIx1CtIze950UqfUoaYRbIqoZerD67EgrZUE5wll0mrRAV5xImV1hz
-						WOIVyMid3Ze3ohYoegEbvDrS/Mkb2qIspRrAZGkV027JLVBar64qgYMgLMjKD/iO
-						rbEvMQT/+N6C+/hizqHIOq9uEFrWfx7OApJn+J36806TnhlgESqxzLTG0+PX86ZF
-						JGQJ73B5t9NuRh7VY46XVZWckxjDBrUcbNyz0hooDP0ECjIknUhVaj0zD/V+lJc0
-						0JGELS0335ECAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aC5hYmVyLmFj
-						LnVrhixodHRwczovL3NoaWJib2xldGguYWJlci5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQU+I7oDbYkhMlHIAj30Ri9FwzMagswDQYJKoZIhvcNAQEFBQAD
-						ggEBAI6Z/wmRpUo78wBenhCEjDwLltikfPmph4vHCfZZB9PAaETtVycjLOPLk3q0
-						nCZ/lVpcuqhT+CR/Fy7jME/zyxkaN2BtHQfoO1IC9d1vro0FOw2q1jS/jJ55QE4b
-						cxhbSaLkWyPbEdFbe+6NC/XigrKh+3oULjlLJ9VrcYIjGXM7ow/D1BZunFgZ0fEY
-						KUlbufKEe4dXJhD2ohIJSEjo7UH/nmVbnt3uz+CCL4mtZom72KxmauZIpV/2Z9Uu
-						hUPrgxUBssSlFQCtZ3IJNB1NA8NG9tnrIaLyR1J+6I5NsfBfow5hDDuoYE9kDha3
-						6tbiD66dhrK60oX7Sg2cPBc13Mo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIRAJlcQ3++vLgNmrr+TlKHgPEwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzAzMDQwMDAwMDBaFw0xNjAzMDMyMzU5NTlaMEMxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
-						aC5hYmVyLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAolIy
-						AOe63/CzqzDShypFAjBduFNikhH/mCUETUQh/Y88DZtr8PocWwdKjanlJTU0YHe5
-						3Qmc3YrLfKQggFUv6QWpF4wf8wAB25rWJ90nFrTyPobwXXelzuyQrUep8j6deoHv
-						3v+FAefGZWOUY4h+LOoH/Q2Jgsn10+US0JRQMjNdJWKU6gS6M7XEflYoyPn8QnEm
-						pWX/HyOniLsNXYhZQA/S0Djb/BObLm6FrrqAWJ2crepTeUnfB/Zf5qLjipcaEC2R
-						Qc3I0/d65uWntrgiSE2PElLqOy/QOxXV5EqGX6Q+Wv274aN8BTUjdtdNJPEUNbHp
-						36suelLrZKWI1IPy6wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-						SWsrN1dH6pDjue0wHQYDVR0OBBYEFIxYqlYMBHB65BGIwDs05Rczer4UMA4GA1Ud
-						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoLmFi
-						ZXIuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAtvRG+fRTg4bOlUsHXG6+me9RmP
-						gMJqh8AQ2gpjzebvRhRV8YWs1uG0NBkRoE5Xx/fQvQhtCgLT1/u4KAY0cTxj4yBj
-						gTBN4PV9GOXGRu4UXE1WKqplWdJqUCyxlbnd3tqFxM3GFhgnHqLnOIpTWoHrHu6G
-						3RoRWG0AHyw8UkdwXsog5maEmIPV6a5wQ5jXAY0o5Zo4IHQ6W/vVikKgscDVE+Ow
-						oD+ZwrzABgYMNDIXKI/ZVxUCKUZPwyTwbdNfp5n8qYK3USLu/OP0l8IjGUlW5jGA
-						N2VovIYVKB2cEEl6RMPPBLiQbsczCeN/O4Du2hxilIDiH+4CjORDPnzK5dA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.aber.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aber.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">Aberystwyth University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aberystwyth University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aber.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Information</GivenName>
-    <SurName>Services</SurName>
-    <EmailAddress>mailto:is@aber.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Wiles</SurName>
-    <EmailAddress>mailto:aew@aber.ac.uk</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 d17f1974..00000000
--- a/swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ac-limoges.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACNUlEQVQoz32ST2iScRjHn9/vfdXXOfW113RJ09Y2xWXvDJLYkiIGRR1ih6AReIh1aF2COu1Q9Ic61W0xqE616LCglRdjh1ogdZhsWZTTzWzWmDLf+W5z6uvr++swoWbSc3y+z4fvA98vIoRAo5mKLGEEFMa93pa/97jhdTQh3Hsw/ex1nHeZ6yTU0GE+La6slg7xVvSPVA98SuQ+ziz/XN7AGO22Nvu6rV4n1xgQC5Xbo9OLqTxnaXK3myoVJZbM53ObjjbTtaGDRp1qG1AoyZduvqcxXDi7z9vJIYwojAiByNzK6FiUovDI9SM6hv4D3HkYiSWER3f7Xga/TUx+RwhVFbKxKY/cOqpntZdvTPH7LcODBwCABoCsUJqJZi4GeEaFCYCWofw+m92ml6Sq0aAxs0z/yfYXwXh21W0xMRgAFtIixrjbtbP2JaBiURbXpfxaWa2iAMDnsWKEFtJizaEsyQRA30RvARSFIp+zZUlZK1SO+fcY9BqdVkUAypJcA4wGDQKSyRUdu5oBoCxVBwc8fJe1IiscqwGArFBEhLB6ppa0p4NDGIfCiwBQrRIAePz8y9Dw5Pmrb+JJAQCCb5NYTXs6d9QcVBQaOO0cG//a1cEd9tksZmbrN0WBvXb21bvU7Gzm3Bk3jdG24O4/iYY/pI/3tZ3yO+wtOgUg9Wt9PDQ/HVnq6Wm9EuAbVCMUTj+diEklGTACAogQtVYV6Hed6G39X/nmfohCvggAHKt1Oox16m8MQ+kQHdNaCQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozNCswMjowMK744cYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzQrMDI6MDDfpVl6AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ac-limoges.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://shibboleth.ac-limoges.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ac-limoges.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ac-limoges.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Rectorat Limoges shib</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rectorat Limoges shib</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ac-limoges.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>cazarres thierry</md:SurName>
-    <md:EmailAddress>l.das-ie@ac-limoges.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 4f48dc97..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ad.cybera.ca/idp/shibboleth">
-  <md: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>
-  </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">ad.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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca: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.ad.cybera.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ad.cybera.ca/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ad.cybera.ca/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">ad.cybera.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ad.cybera.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ad.cybera.ca: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">Cybera</md:OrganizationName>
-    <md:OrganizationName xml:lang="fr">Cybera </md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cybera</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">Cybera</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cybera.ca/about/cybera/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.cybera.ca/about/cybera/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>System Admin</md:SurName>
-    <md:EmailAddress>sysadmin@cybera.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.allegheny.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.allegheny.edu-idp-shibboleth.xml
deleted file mode 100644
index 81f3c80a..00000000
--- a/swamid-interfederations-2.0/shibboleth.allegheny.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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://shibboleth.allegheny.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">allegheny.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Allegheny College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The national liberal arts college where 2,100 students with unusual combinations of interests, skills and talents excel.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.allegheny.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://sites.allegheny.edu/resources/privacy-and-security-policy/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="120" width="460" xml:lang="en">https://shibboleth.allegheny.edu/ac-logo.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>
-MIIDTDCCAjSgAwIBAgIVANLyVjAX/Uk9Aso93bpHlCTpBTF8MA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguYWxsZWdoZW55LmVkdTAeFw0xMzA4
-MDUxNTIwNTlaFw0zMzA4MDUxNTIwNTlaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
-YWxsZWdoZW55LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJY3
-RRWmCqsK3x6HIw/E5IzffKNKtva3mcnkaXg7BQFrLtYbd545USrNrGWfxm8A17PH
-XZtryAAW9fxKMw/jyYs5ZSwG9Z0QmeC1wB8XLgXqSsbsuof/YtbERdBVR+FHsTia
-EgpT7BlCjE7pYF5eMvCAdJs0z8nj8t1N+b+GOb6CGKTG3K2vVg01yz21FnGBToLL
-7xH3TG7x8AGn2Y+Ma/wUSA2h6iJrNfDu++rgtA470PvOEjyg2ALsPr3zJjVgDQZ5
-iUazNdONHB9nWNJwx3qmuG1hF7pJ8kX+RqsyE2h+i5kBr876J5sZc0vhJndZJ94E
-TrBznVI+2sBNYpG2cxcCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5h
-bGxlZ2hlbnkuZWR1hi9odHRwczovL3NoaWJib2xldGguYWxsZWdoZW55LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU0ixc8qdTPL739Yb6NOu3Y3+KvMkwDQYJ
-KoZIhvcNAQEFBQADggEBACV9VBktER4Pp9Y6Z6oeaXjZ3NybRp+y3ewBk1Qed868
-eaKDsZ6OQjJ5dWBgPNzPYbJWWhoS/tZoMuzAIdVW4LOPRWx0ZaCOGawbcz2O4Qqo
-pyyRdyQ5C0C4Cum5Y55M+G7tuVX4OF/KswTj/rezoajle87GK1TLsKJC6jGPcw9n
-8XLlsHb6m6V1Gu1xpgO+wLKDMTpQ1ipN2qEHnPTTwXpIQ60cb2BuZwPvB5i6jk76
-vLJW4nZl0p17MW5zYAAX54lELuOUm9p8zf5Jzdfozd7a+zA2LMHtvyk/3JhdhJZn
-DnXrTH3xJSDEUPi4YHSx/BAVxJ7syEgEki9ayfTzJuU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.allegheny.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.allegheny.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.allegheny.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.allegheny.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.allegheny.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">allegheny.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTDCCAjSgAwIBAgIVANLyVjAX/Uk9Aso93bpHlCTpBTF8MA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJib2xldGguYWxsZWdoZW55LmVkdTAeFw0xMzA4
-MDUxNTIwNTlaFw0zMzA4MDUxNTIwNTlaMCMxITAfBgNVBAMTGHNoaWJib2xldGgu
-YWxsZWdoZW55LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJY3
-RRWmCqsK3x6HIw/E5IzffKNKtva3mcnkaXg7BQFrLtYbd545USrNrGWfxm8A17PH
-XZtryAAW9fxKMw/jyYs5ZSwG9Z0QmeC1wB8XLgXqSsbsuof/YtbERdBVR+FHsTia
-EgpT7BlCjE7pYF5eMvCAdJs0z8nj8t1N+b+GOb6CGKTG3K2vVg01yz21FnGBToLL
-7xH3TG7x8AGn2Y+Ma/wUSA2h6iJrNfDu++rgtA470PvOEjyg2ALsPr3zJjVgDQZ5
-iUazNdONHB9nWNJwx3qmuG1hF7pJ8kX+RqsyE2h+i5kBr876J5sZc0vhJndZJ94E
-TrBznVI+2sBNYpG2cxcCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYmJvbGV0aC5h
-bGxlZ2hlbnkuZWR1hi9odHRwczovL3NoaWJib2xldGguYWxsZWdoZW55LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU0ixc8qdTPL739Yb6NOu3Y3+KvMkwDQYJ
-KoZIhvcNAQEFBQADggEBACV9VBktER4Pp9Y6Z6oeaXjZ3NybRp+y3ewBk1Qed868
-eaKDsZ6OQjJ5dWBgPNzPYbJWWhoS/tZoMuzAIdVW4LOPRWx0ZaCOGawbcz2O4Qqo
-pyyRdyQ5C0C4Cum5Y55M+G7tuVX4OF/KswTj/rezoajle87GK1TLsKJC6jGPcw9n
-8XLlsHb6m6V1Gu1xpgO+wLKDMTpQ1ipN2qEHnPTTwXpIQ60cb2BuZwPvB5i6jk76
-vLJW4nZl0p17MW5zYAAX54lELuOUm9p8zf5Jzdfozd7a+zA2LMHtvyk/3JhdhJZn
-DnXrTH3xJSDEUPi4YHSx/BAVxJ7syEgEki9ayfTzJuU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.allegheny.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Allegheny College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Allegheny College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.allegheny.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Doug Tomer</md:GivenName>
-    <md:EmailAddress>dtomer@allegheny.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Doug Tomer</md:GivenName>
-    <md:EmailAddress>dtomer@allegheny.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Doug Tomer</md:GivenName>
-    <md:EmailAddress>dtomer@allegheny.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Doug Tomer</md:GivenName>
-    <md:EmailAddress>dtomer@allegheny.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.amdigital.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.amdigital.co.uk-shibboleth-sp.xml
deleted file mode 100644
index cdc7920c..00000000
--- a/swamid-interfederations-2.0/shibboleth.amdigital.co.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.amdigital.co.uk/shibboleth-sp">
-  <!--
-		This is a Shibboleth SP for Adam Matthew Digital Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://shibboleth.amdigital.co.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://shibboleth.amdigital.co.uk/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.amdigital.co.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://shibboleth.amdigital.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAPe6QSEcGRk8MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnNoaWJib2xldGguYW1kaWdpdGFsLmNvLnVrMB4XDTExMDMwMzEyMDIxMloX
-						DTE2MDMwMTEyMDIxMlowJTEjMCEGA1UEAxMac2hpYmJvbGV0aC5hbWRpZ2l0YWwu
-						Y28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4pvlbjpzFVWoX
-						CwMEQs/lKAB5fRNdIbeCLqumBjdVeh/rNVWHsLdOltDuaLlfRT+OXYI3962tezKO
-						gPJb0WhuUEoT5My92nyceHU1tUtZTtRxrXh7NbNxNasmBpXxhWxdxPkQpvt7tza8
-						bcoXX7Y1V8AFdoOoOA+CE05mimoqPf+76JuW6PTpF083fPMyf34EyYwWiVcGNfTJ
-						IaNdAd23Q3hxpm2P3WhFI3y/jWK74jziP0a9r6Wp/HRIvcyFfLlaqlFaOvr7v0SR
-						Gk6kuMF2sXrfj9OMd7m6+5v9CRdiX56nYYHdD1jhf/5zsNXMDvMTY1fNtosEIomm
-						BaGnnwIHAgMBAAGjSDBGMCUGA1UdEQQeMByCGnNoaWJib2xldGguYW1kaWdpdGFs
-						LmNvLnVrMB0GA1UdDgQWBBRSfPmrYGKQQdVWbnmrysdcv1KtpzANBgkqhkiG9w0B
-						AQUFAAOCAQEAYalolZpZEQk9zTCR503YHoxf901rRBqF39GBt59Gw/pDKhop+ktm
-						i0aYmIJP60NATkKYluvUtQBKSb11FaSil6QZuzcz5q1aVPfyW1jMgK2C3R0f43mD
-						pl8gfZGBXF6Sm96KGuXrT89+bWuzndflDLCaHltTmwg7UFM0uGYhfO49TVENLU9O
-						9O3zn5BmDgPO6E7zlnLLkLd3HYV5mf8JmQmupCsuHeL8Ip1twZbbuixEVrXSOEV/
-						iw65O0mJIhVzUnl2rQ+/7GiB0A3wZpvGu8EVEgjJGT6wye3l8D8lN11NNGCs76CC
-						lM5VbBovDN5R8HI4KUo2eMInLDUUf5p0oQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Adam Matthew Digital Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Adam Matthew Digital Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.amdigital.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Mansfield</SurName>
-    <EmailAddress>mailto:support@amdigital.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Glyn</GivenName>
-    <SurName>Porritt</SurName>
-    <EmailAddress>mailto:glyn@amdigital.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.amdigital.co.uk.xml b/swamid-interfederations-2.0/shibboleth.amdigital.co.uk.xml
deleted file mode 100644
index e5e6cc27..00000000
--- a/swamid-interfederations-2.0/shibboleth.amdigital.co.uk.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.amdigital.co.uk/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.amdigital.co.uk</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.amdigital.co.uk</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDFTCCAf2gAwIBAgIJAPe6QSEcGRk8MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-BAMTGnNoaWJib2xldGguYW1kaWdpdGFsLmNvLnVrMB4XDTExMDMwMzEyMDIxMloX
-DTE2MDMwMTEyMDIxMlowJTEjMCEGA1UEAxMac2hpYmJvbGV0aC5hbWRpZ2l0YWwu
-Y28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4pvlbjpzFVWoX
-CwMEQs/lKAB5fRNdIbeCLqumBjdVeh/rNVWHsLdOltDuaLlfRT+OXYI3962tezKO
-gPJb0WhuUEoT5My92nyceHU1tUtZTtRxrXh7NbNxNasmBpXxhWxdxPkQpvt7tza8
-bcoXX7Y1V8AFdoOoOA+CE05mimoqPf+76JuW6PTpF083fPMyf34EyYwWiVcGNfTJ
-IaNdAd23Q3hxpm2P3WhFI3y/jWK74jziP0a9r6Wp/HRIvcyFfLlaqlFaOvr7v0SR
-Gk6kuMF2sXrfj9OMd7m6+5v9CRdiX56nYYHdD1jhf/5zsNXMDvMTY1fNtosEIomm
-BaGnnwIHAgMBAAGjSDBGMCUGA1UdEQQeMByCGnNoaWJib2xldGguYW1kaWdpdGFs
-LmNvLnVrMB0GA1UdDgQWBBRSfPmrYGKQQdVWbnmrysdcv1KtpzANBgkqhkiG9w0B
-AQUFAAOCAQEAYalolZpZEQk9zTCR503YHoxf901rRBqF39GBt59Gw/pDKhop+ktm
-i0aYmIJP60NATkKYluvUtQBKSb11FaSil6QZuzcz5q1aVPfyW1jMgK2C3R0f43mD
-pl8gfZGBXF6Sm96KGuXrT89+bWuzndflDLCaHltTmwg7UFM0uGYhfO49TVENLU9O
-9O3zn5BmDgPO6E7zlnLLkLd3HYV5mf8JmQmupCsuHeL8Ip1twZbbuixEVrXSOEV/
-iw65O0mJIhVzUnl2rQ+/7GiB0A3wZpvGu8EVEgjJGT6wye3l8D8lN11NNGCs76CC
-lM5VbBovDN5R8HI4KUo2eMInLDUUf5p0oQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.amdigital.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Adam Matthew Digital</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Adam Matthew Digital</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.amdigital.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Dave</GivenName>
-    <SurName>Mills</SurName>
-    <EmailAddress>dave.mills@trueclarity.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rhys</GivenName>
-    <SurName>Godfrey</SurName>
-    <EmailAddress>rhys.godfrey@trueclarity.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.aws.dev.progressivedigitalmedia.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.aws.dev.progressivedigitalmedia.com-shibboleth.xml
deleted file mode 100644
index c3518fc4..00000000
--- a/swamid-interfederations-2.0/shibboleth.aws.dev.progressivedigitalmedia.com-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://shibboleth.aws.dev.progressivedigitalmedia.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Progressive Digital Media Group Plc.
-	-->
-  <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="2016-01-19T09:55: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://shibboleth.aws.dev.progressivedigitalmedia.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://shibboleth.aws.dev.progressivedigitalmedia.com/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://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/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://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/UKfederation" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJAJ0anKvb8NpwMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXBkbS1kZXYtd2ViMDEwHhcNMTYwMTIyMTcxMTQ4WhcNMjYwMTE5MTcxMTQ4
-						WjAYMRYwFAYDVQQDEw1wZG0tZGV2LXdlYjAxMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA7FdrCgGZLid5434KxGyqa6VNLIV6wMy6YSBMkmDU0Zu1NdLH
-						cmvQdgCQLalMYROs/gWNtI46zu1K9sLa04CFege3HKdTbNgYKEutm/PefmgpwocY
-						VFaXmfjYwBBPnpNcJx4xOFAU/MBvbnbi13uXORBohpG3Ls6Pt1j9Iq29dKf9AwPY
-						1wdkFPetgc4g+DagfOaCKLy3gUZM3TJrEwu2M6MgqSRE7azZKNXHH25SGcTFtTSB
-						oXv93omnYn3VyfbStqkbFjI61MgyE39ubs62qmgVq78HkDTYu5mNrocbVlbrfGke
-						GPQ9xSXYvoEHcgpMZB8umh76cIRXtaerJQmLbwIDAQABozswOTAYBgNVHREEETAP
-						gg1wZG0tZGV2LXdlYjAxMB0GA1UdDgQWBBRvGfAZty2hHkw+jYQqxVxihYrmTjAN
-						BgkqhkiG9w0BAQUFAAOCAQEAWFzoOr6uoi0PwNcJxKUsr2lbYbJtigUC/IUA5Rnb
-						g68H8dO8go/NWKppp88eEBpI8CGF9wssKX8J1XS0LYAaAHf4AZdUpOSS9Tjk3JlX
-						Yp4tGuyfr9nsbm2q3wBoY3vYEcj1pmqhcAfB+PSR2p9/h29Z0Xm1i2NMMXwjRHSf
-						vg71L+mudKv/gxpX6mKct9mcFisyM1JDtPmO1Rhpqophe4D6Hjevy6tRl5xw2kNg
-						ddwE8o3bWp7Nvl+OuquXBPI2dLrDHL6mYaKW1AJteYgpxSsj4jw4KlugOlrcaYum
-						lXL+Gte857dAAqPxxmXJdHnUDpWHAoIl9dSmoPTNpK9Yyw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.aws.dev.progressivedigitalmedia.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Progressive Digital Media Group Plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Marketline Advantage</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.progressivemediagroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Panagiotis</GivenName>
-    <SurName>Sfikas</SurName>
-    <EmailAddress>mailto:Panagiotis.Sfikas@progressivemediagroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Dominique</GivenName>
-    <SurName>Wafo-Tapa</SurName>
-    <EmailAddress>mailto:Dominique.Wafo-Tapa@progressivemediagroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Geoffrey</GivenName>
-    <SurName>Hogg</SurName>
-    <EmailAddress>mailto:ghogg@progressivemediagroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Assad</GivenName>
-    <SurName>Imran</SurName>
-    <EmailAddress>mailto:Assad.Imran@progressivemediagroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Panagiotis</GivenName>
-    <SurName>Sfikas</SurName>
-    <EmailAddress>mailto:Panagiotis.Sfikas@progressivemediagroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dominique</GivenName>
-    <SurName>Wafo-Tapa</SurName>
-    <EmailAddress>mailto:Dominique.Wafo-Tapa@progressivemediagroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Geoffrey</GivenName>
-    <SurName>Hogg</SurName>
-    <EmailAddress>mailto:ghogg@progressivemediagroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Assad</GivenName>
-    <SurName>Imran</SurName>
-    <EmailAddress>mailto:Assad.Imran@progressivemediagroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
index 5e4536bc..443ad94a 100644
--- a/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
+++ b/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
@@ -1,35 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.bbaw.de/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-03-13T16:23:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <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: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://shibboleth.bbaw.de/shibboleth">
+  <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://shibboleth.bbaw.de/Shibboleth.sso/DiscoJuice" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">BBAW - CLARIN Dienste</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">BBAW - CLARIN services</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW) im Rahmen der CLARIN-Initiative.</mdui:Description>
-        <mdui:Description xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW) in the context of the CLARIN initiative.</mdui:Description>
-        <mdui:Logo height="104" width="234">https://shibboleth.bbaw.de/bbaw_logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.bbaw.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.bbaw.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://shibboleth.bbaw.de/privacy.html</mdui:PrivacyStatementURL>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.bbaw.de/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">German NLP tools from the BBAW/DWDS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">German NLP tools from the BBAW/DWDS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Tokenizer, Tagger (Moot), Shallow Parser (SynCop) and Named Entity Recognition for historic texts.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.clarin.eu/system/files/CLARIN_Service_Provider_Start-Up_Federation_Agreement_Final.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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.bbaw.de</ds:KeyName>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.bbaw.de,O=Berlin-Brandenburgische Akademie der Wissenschaften,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
           <ds:X509Certificate>MIIF3TCCBMWgAwIBAgIHGFtty9nuvzANBgkqhkiG9w0BAQsFADCBnDELMAkGA1UE
 BhMCREUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWll
 IGRlciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5v
@@ -61,93 +48,43 @@ M/2YkWIzRwfI/DAwXhiwXByqyYFcB6ICnqtIenuxgrhgcZcY5nOrV5NJ+kS8ivv8
 jLdayhH+CBCA/UpDbyujMdeVjlJWPwaSacD51FIm6Ao3T+DBdXArNSphcGV+y2jD
 5JLMDjRaj/g29jQuJNhTvNajJFfVdNZt8KPEbYvJwwOk9rD9P3BEyAT9At/V6LyY
 gP+LmoAAhHE052Fg3khXrQ8qLV5ubP7DKZtIWA7nGg8v7/9iynjoUJ6yZn8Gx4s4
-WdNzDxmjE9EyFPvbQdfnOkE=
-</ds:X509Certificate>
+WdNzDxmjE9EyFPvbQdfnOkE=</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>shibboleth.bbaw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.bbaw.de,O=Berlin-Brandenburgische Akademie der Wissenschaften,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF3TCCBMWgAwIBAgIHGFtty9nuvzANBgkqhkiG9w0BAQsFADCBnDELMAkGA1UE
-BhMCREUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWll
-IGRlciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5v
-bG9naWUxEjAQBgNVBAMTCUJCQVctQ0EgMTEZMBcGCSqGSIb3DQEJARYKY2FAYmJh
-dy5kZTAeFw0xNDEwMTMxNTMxMDdaFw0xOTA3MDkyMzU5MDBaMIGKMQswCQYDVQQG
-EwJERTEPMA0GA1UECBMGQmVybGluMQ8wDQYDVQQHEwZCZXJsaW4xPDA6BgNVBAoT
-M0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWllIGRlciBXaXNzZW5zY2hh
-ZnRlbjEbMBkGA1UEAxMSc2hpYmJvbGV0aC5iYmF3LmRlMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtciZovXzGD+K7C5bwgQl29CGss8jg8NoLco1C+h7
-REVbgOZo9ipf4OUoI8XieicXewor2hTF89Iy5nt/HuTQuKDW8q3edn+C/DNJgu4B
-0gmdZmZ+ubXcOd/1hnjRRLS9wxvgq2Q+mBLZwV8wMMJA/tEkO1xd0yGAysl4tcu2
-BcV/2SM+oI9rdWNuGK2m4lOsouEi0mIvm9v4aJBIfknOXm0cfC7xJB1fV5Q59gBL
-74PYTB99XKjQ3jVTzu3j1lOq9UgwbhYNXOiw2rWT2wY64LFAuNrk2j0tFnIIBLYM
-ws2DLo4AXOeDUR6TY5xWfMRg6rHEKYY8s/ggeEj5KG+HNwIDAQABo4ICMjCCAi4w
-TwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwIwEQYPKwYBBAGBrSGCLAIBBAMB
-MA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBTr7kmL7423Mx9V5mu8Ukx5vyME0zAfBgNVHSMEGDAWgBSMpo/xPxQ7ArX5J1RM
-qzyh2BuQmDAdBgNVHREEFjAUghJzaGliYm9sZXRoLmJiYXcuZGUweQYDVR0fBHIw
-cDA2oDSgMoYwaHR0cDovL2NkcDEucGNhLmRmbi5kZS9iYmF3LWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMDagNKAyhjBodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2Ev
-cHViL2NybC9jYWNybC5jcmwwgckGCCsGAQUFBwEBBIG8MIG5MDMGCCsGAQUFBzAB
-hidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwQAYIKwYB
-BQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvYmJhdy1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-YmJhdy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEB
-AIcuZcIEBKtbbf/OOTxBfEiZ2iGfu3kLO2QXYR5oqh6D7ZVjrjXfWjyCR6beFosY
-M/2YkWIzRwfI/DAwXhiwXByqyYFcB6ICnqtIenuxgrhgcZcY5nOrV5NJ+kS8ivv8
-jLdayhH+CBCA/UpDbyujMdeVjlJWPwaSacD51FIm6Ao3T+DBdXArNSphcGV+y2jD
-5JLMDjRaj/g29jQuJNhTvNajJFfVdNZt8KPEbYvJwwOk9rD9P3BEyAT9At/V6LyY
-gP+LmoAAhHE052Fg3khXrQ8qLV5ubP7DKZtIWA7nGg8v7/9iynjoUJ6yZn8Gx4s4
-WdNzDxmjE9EyFPvbQdfnOkE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">BBAW - CLARIN Dienste</md:ServiceName>
-      <md:ServiceName xml:lang="en">BBAW - CLARIN services</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Verschiedene Dienste der Berlin-Brandenburgischen Akademie der Wissenschaften (BBAW) im Rahmen der CLARIN-Initiative.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Various services provided by the Berlin-Brandenburg Academy of Sciences and Humanities (BBAW) in the context of the CLARIN initiative.</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="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: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://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <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:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+      <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="de">e209</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e209</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Berlin-Brandenburgische Akademie der Wissenschaften</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Berlin-Brandenburgische Akademie der Wissenschaften</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.bbaw.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.bbaw.de</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="administrative">
+    <md:GivenName>Wolf-Hagen</md:GivenName>
+    <md:SurName>Krauth</md:SurName>
+    <md:EmailAddress>mailto:krauth@bbaw.de</md:EmailAddress>
+  </md:ContactPerson>
   <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:ContactPerson contactType="administrative">
-    <md:GivenName>Dr. Wolf-Hagen</md:GivenName>
-    <md:SurName>Krauth</md:SurName>
-    <md:EmailAddress>mailto:krauth@bbaw.de</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:GivenName>Kai</md:GivenName>
     <md:SurName>Zimmer</md:SurName>
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.bca.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.bca.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 6086027a..00000000
--- a/swamid-interfederations-2.0/shibboleth.bca.ac.uk-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://shibboleth.bca.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Berkshire College of Agriculture.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-07T14:59: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">bca.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDfjCCAmYCCQDx7t/Xm+vk2jANBgkqhkiG9w0BAQsFADCBgDELMAkGA1UEBhMC
-						R0IxEjAQBgNVBAgMCUJlcmtzaGlyZTETMBEGA1UEBwwKTWFpZGVuaGVhZDEpMCcG
-						A1UECgwgQmVya3NoaXJlIENvbGxlZ2Ugb2YgQWdyaWN1bHR1cmUxHTAbBgNVBAMM
-						FHNoaWJib2xldGguYmNhLmFjLnVrMB4XDTE1MDExNTEwMjA1OVoXDTM1MDExMDEw
-						MjA1OVowgYAxCzAJBgNVBAYTAkdCMRIwEAYDVQQIDAlCZXJrc2hpcmUxEzARBgNV
-						BAcMCk1haWRlbmhlYWQxKTAnBgNVBAoMIEJlcmtzaGlyZSBDb2xsZWdlIG9mIEFn
-						cmljdWx0dXJlMR0wGwYDVQQDDBRzaGliYm9sZXRoLmJjYS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALmriTHAnzTh0koWNhcZeqWl1VkHR+wi
-						0w6zWxI3961lmUJbfu9md/HZT6wTzoTxiIUPq1CS11zgkUuDybtNc3JHUojHtArw
-						LHw/PgRaDZaPZMpqEf7zsRR7ouytPw9XqhVD4XJLWSQMYpHlvHB7rE1sLVb6j9dA
-						h5niM+6kmd3iozcDcVENptYeNxwuZwKk6BfMT9PgpWCYB0SvfgYdMPGC3VJ0VgPw
-						NrNeI0IKRyl7Lj0g6h8HUfl0C4sVcf+PXnzD0iLzaEmra1fBWV3Yy7E+E7N7NqwW
-						TCNTNiRO2lBbddVjtaRYVcj4RyxsESJ3dwAT8iojFTYYW8/ZH7l4JWcCAwEAATAN
-						BgkqhkiG9w0BAQsFAAOCAQEABU3bhbpaCtOrumoaBklKmVhZTrpuo1T9SGHMA6yO
-						Gjd+E5ZFgNQp3CYO0nDikmQX5QFIxnW+tVpC/fsC/zaNxj4WqYSP4+Ufv6vg2wiY
-						KX4rkZ8a6kRvTprxFwrrXySL4l9b7Y/3gNco5Pqm38x3QUp/D4jfI5kzTyxnQjaR
-						X7DQsNjtE8jJQMzY4q+fazQ0xcgVtYP8Hyr5zw6Pm83IbTUjHSsQt8DKA6N4lHKY
-						g6jq1rxI6gl+gQh+D35UoNrGcjo2xdS0xqcKLNLdlHJe/WmVvr5lZORTj5rQxKr6
-						85G9KyAB1Ly2q4Vohbob+kcEb/5qtjq2hjgfMZbOGKj1ZA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bca.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bca.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://shibboleth.bca.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bca.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bca.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bca.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">bca.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDfjCCAmYCCQDx7t/Xm+vk2jANBgkqhkiG9w0BAQsFADCBgDELMAkGA1UEBhMC
-						R0IxEjAQBgNVBAgMCUJlcmtzaGlyZTETMBEGA1UEBwwKTWFpZGVuaGVhZDEpMCcG
-						A1UECgwgQmVya3NoaXJlIENvbGxlZ2Ugb2YgQWdyaWN1bHR1cmUxHTAbBgNVBAMM
-						FHNoaWJib2xldGguYmNhLmFjLnVrMB4XDTE1MDExNTEwMjA1OVoXDTM1MDExMDEw
-						MjA1OVowgYAxCzAJBgNVBAYTAkdCMRIwEAYDVQQIDAlCZXJrc2hpcmUxEzARBgNV
-						BAcMCk1haWRlbmhlYWQxKTAnBgNVBAoMIEJlcmtzaGlyZSBDb2xsZWdlIG9mIEFn
-						cmljdWx0dXJlMR0wGwYDVQQDDBRzaGliYm9sZXRoLmJjYS5hYy51azCCASIwDQYJ
-						KoZIhvcNAQEBBQADggEPADCCAQoCggEBALmriTHAnzTh0koWNhcZeqWl1VkHR+wi
-						0w6zWxI3961lmUJbfu9md/HZT6wTzoTxiIUPq1CS11zgkUuDybtNc3JHUojHtArw
-						LHw/PgRaDZaPZMpqEf7zsRR7ouytPw9XqhVD4XJLWSQMYpHlvHB7rE1sLVb6j9dA
-						h5niM+6kmd3iozcDcVENptYeNxwuZwKk6BfMT9PgpWCYB0SvfgYdMPGC3VJ0VgPw
-						NrNeI0IKRyl7Lj0g6h8HUfl0C4sVcf+PXnzD0iLzaEmra1fBWV3Yy7E+E7N7NqwW
-						TCNTNiRO2lBbddVjtaRYVcj4RyxsESJ3dwAT8iojFTYYW8/ZH7l4JWcCAwEAATAN
-						BgkqhkiG9w0BAQsFAAOCAQEABU3bhbpaCtOrumoaBklKmVhZTrpuo1T9SGHMA6yO
-						Gjd+E5ZFgNQp3CYO0nDikmQX5QFIxnW+tVpC/fsC/zaNxj4WqYSP4+Ufv6vg2wiY
-						KX4rkZ8a6kRvTprxFwrrXySL4l9b7Y/3gNco5Pqm38x3QUp/D4jfI5kzTyxnQjaR
-						X7DQsNjtE8jJQMzY4q+fazQ0xcgVtYP8Hyr5zw6Pm83IbTUjHSsQt8DKA6N4lHKY
-						g6jq1rxI6gl+gQh+D35UoNrGcjo2xdS0xqcKLNLdlHJe/WmVvr5lZORTj5rQxKr6
-						85G9KyAB1Ly2q4Vohbob+kcEb/5qtjq2hjgfMZbOGKj1ZA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bca.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bca.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">Berkshire College of Agriculture</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Berkshire College of Agriculture</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bca.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Ricketts</SurName>
-    <EmailAddress>mailto:cricketts@bca.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Neil</GivenName>
-    <SurName>Prior</SurName>
-    <EmailAddress>mailto:NCPrior@bca.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bolton-sfc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.bolton-sfc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b40d1a02..00000000
--- a/swamid-interfederations-2.0/shibboleth.bolton-sfc.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://shibboleth.bolton-sfc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Bolton Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">bolton-sfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVzCCAj+gAwIBAgIUWPJgrnNMjlbymBlvPaO34/X+UVswDQYJKoZIhvcNAQEF
-						BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC5ib2x0b24tc2ZjLmFjLnVrMB4XDTEz
-						MTExMTEzMDE1OFoXDTMzMTExMTEzMDE1OFowJjEkMCIGA1UEAxMbc2hpYmJvbGV0
-						aC5ib2x0b24tc2ZjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAhQnvJrLzeiakUFvRRezAt2TPOMDRSgg6jZvnjaD489IZbDTbod7VBI3LGMKq
-						D/sox6gm/tM42nYXpL/UBCyfP5GYc6ahLg0CSPtmv/uY2TUZEJzUNjQG2X7LzbUv
-						yWzG8HniHgag9q0FLRx6Qf1jNWCLVEOEPtceWJz+UCDdJzOvjYE6/XIqQ/7tY+V8
-						2yDafdgzOOoNNkPYuuY4qUcGLvKP0WNos04YdZZr3P5JEvey1Ssvb+LAiExKNHmC
-						CFMLNd/zFwEE/TMno412PSPhfbSuAbCropK4QvV67nf7pOZQ6llX3XvWNuL7fN4t
-						FtwHCwYYHDm6JzksA56K4QugkwIDAQABo30wezBaBgNVHREEUzBRghtzaGliYm9s
-						ZXRoLmJvbHRvbi1zZmMuYWMudWuGMmh0dHBzOi8vc2hpYmJvbGV0aC5ib2x0b24t
-						c2ZjLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ908freXtGmAgPCz06
-						ptbx0ZuXHjANBgkqhkiG9w0BAQUFAAOCAQEAP0xmq5ftDMTIuPDbqPNvfR/GrDTo
-						NfX8pt5dTiTvTqJC0g2YCHWgQt1rOZl1ZjXyNFaDwqg4VVEVLvG2k99FshXsZzY7
-						Rwp8AfzaNt5B9TpRRhchBVwgfpXbhHVsSB602J0qYHHgGY7IvlaZ9xGq2B6OgCR2
-						+l2Yh1ZOPqvRkj1VINzLNwJLroZLGURQoqwsADWBw9GRr/6hecHiE3T33dCHzfcd
-						v16BqVBjhtbPhTq4MRodc625S0JJL6xdKuw7ieAP/ElEQV0nLGayyZQMdwpHQnfO
-						XcpfcLXmf8Vsttog01faahJDcIECJTYOmK9VlxRX2KSD60rDfqmUWFGbhQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bolton-sfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bolton-sfc.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://shibboleth.bolton-sfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bolton-sfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bolton-sfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bolton-sfc.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">bolton-sfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVzCCAj+gAwIBAgIUWPJgrnNMjlbymBlvPaO34/X+UVswDQYJKoZIhvcNAQEF
-						BQAwJjEkMCIGA1UEAxMbc2hpYmJvbGV0aC5ib2x0b24tc2ZjLmFjLnVrMB4XDTEz
-						MTExMTEzMDE1OFoXDTMzMTExMTEzMDE1OFowJjEkMCIGA1UEAxMbc2hpYmJvbGV0
-						aC5ib2x0b24tc2ZjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAhQnvJrLzeiakUFvRRezAt2TPOMDRSgg6jZvnjaD489IZbDTbod7VBI3LGMKq
-						D/sox6gm/tM42nYXpL/UBCyfP5GYc6ahLg0CSPtmv/uY2TUZEJzUNjQG2X7LzbUv
-						yWzG8HniHgag9q0FLRx6Qf1jNWCLVEOEPtceWJz+UCDdJzOvjYE6/XIqQ/7tY+V8
-						2yDafdgzOOoNNkPYuuY4qUcGLvKP0WNos04YdZZr3P5JEvey1Ssvb+LAiExKNHmC
-						CFMLNd/zFwEE/TMno412PSPhfbSuAbCropK4QvV67nf7pOZQ6llX3XvWNuL7fN4t
-						FtwHCwYYHDm6JzksA56K4QugkwIDAQABo30wezBaBgNVHREEUzBRghtzaGliYm9s
-						ZXRoLmJvbHRvbi1zZmMuYWMudWuGMmh0dHBzOi8vc2hpYmJvbGV0aC5ib2x0b24t
-						c2ZjLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ908freXtGmAgPCz06
-						ptbx0ZuXHjANBgkqhkiG9w0BAQUFAAOCAQEAP0xmq5ftDMTIuPDbqPNvfR/GrDTo
-						NfX8pt5dTiTvTqJC0g2YCHWgQt1rOZl1ZjXyNFaDwqg4VVEVLvG2k99FshXsZzY7
-						Rwp8AfzaNt5B9TpRRhchBVwgfpXbhHVsSB602J0qYHHgGY7IvlaZ9xGq2B6OgCR2
-						+l2Yh1ZOPqvRkj1VINzLNwJLroZLGURQoqwsADWBw9GRr/6hecHiE3T33dCHzfcd
-						v16BqVBjhtbPhTq4MRodc625S0JJL6xdKuw7ieAP/ElEQV0nLGayyZQMdwpHQnfO
-						XcpfcLXmf8Vsttog01faahJDcIECJTYOmK9VlxRX2KSD60rDfqmUWFGbhQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bolton-sfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bolton-sfc.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">Bolton Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bolton Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bolton-sfc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kevin</GivenName>
-    <SurName>Ratcliffe</SurName>
-    <EmailAddress>mailto:kev@bolton-sfc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Ratcliffe</SurName>
-    <EmailAddress>mailto:kev@bolton-sfc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bradfordcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.bradfordcollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 864a168a..00000000
--- a/swamid-interfederations-2.0/shibboleth.bradfordcollege.ac.uk-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://shibboleth.bradfordcollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Bradford College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-08T11:00: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">bradfordcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFCjCCA/KgAwIBAgIJALdslILT05qQMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
-						VQQGEwJHQjESMBAGA1UECBMJWW9ya3NoaXJlMREwDwYDVQQHEwhCcmFkZm9yZDEZ
-						MBcGA1UEChMQQnJhZGZvcmQgQ29sbGVnZTEpMCcGA1UEAxMgc2hpYmJvbGV0aC5i
-						cmFkZm9yZGNvbGxlZ2UuYWMudWsxKTAnBgkqhkiG9w0BCQEWGnJvb3RAYnJhZGZv
-						cmRjb2xsZWdlLmFjLnVrMB4XDTEzMTEwODEyMzI1OFoXDTIzMTEwNjEyMzI1OFow
-						gaUxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxETAPBgNVBAcTCEJy
-						YWRmb3JkMRkwFwYDVQQKExBCcmFkZm9yZCBDb2xsZWdlMSkwJwYDVQQDEyBzaGli
-						Ym9sZXRoLmJyYWRmb3JkY29sbGVnZS5hYy51azEpMCcGCSqGSIb3DQEJARYacm9v
-						dEBicmFkZm9yZGNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQCwYsDvkLqkCOFTHrZ3Er53jfoqYD9mq8d0KGt6BH/oaEhDf9LVLoTm
-						zDgu0dSsDBxCyoIWcyV2snrQ1SjkRRKc7km1Cqlt3X1F7HJwCd9ocJRkWOkJLCyv
-						o0lMzO9Fv1PcjWHwnJmFQom7WTrZ5bqAOYmvPJF03Mfbg5pQcNXZqSz0F4r7wJpX
-						4d0rU+sq2H27TDaIgwWZ2PU8vfLlYshctMv1b8h1wpyBwyLdidtov8yHXRjKuTmL
-						xYhHESz4j3Ji4bPY5Dry2mG+TVDbI8MKScdYxdIXaI51fwo5JtOv0mT3qAUD+RN+
-						TAg7YXpwS6X6dlQqqJDu6AbgDzAImq47AgMBAAGjggE5MIIBNTAJBgNVHRMEAjAA
-						MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
-						BgNVHQ4EFgQUvwyrftHX/bc1Rrx58TEml80zNagwgdoGA1UdIwSB0jCBz4AUvwyr
-						ftHX/bc1Rrx58TEml80zNaihgaukgagwgaUxCzAJBgNVBAYTAkdCMRIwEAYDVQQI
-						EwlZb3Jrc2hpcmUxETAPBgNVBAcTCEJyYWRmb3JkMRkwFwYDVQQKExBCcmFkZm9y
-						ZCBDb2xsZWdlMSkwJwYDVQQDEyBzaGliYm9sZXRoLmJyYWRmb3JkY29sbGVnZS5h
-						Yy51azEpMCcGCSqGSIb3DQEJARYacm9vdEBicmFkZm9yZGNvbGxlZ2UuYWMudWuC
-						CQC3bJSC09OakDANBgkqhkiG9w0BAQUFAAOCAQEAQMSXezpcwMwJDj1eg9Y/I0gj
-						ArGP9oZIvPUX7l19e915ndg+eYaiDHNcjf+fMduiTS9SKd0HhGhki0FwLhbf//yX
-						0YGKyeBEdV2lz9WjXZelGt45DuMLBtMB2TFWxXizW5KAObNvrtTW2nYQLaZ8LkD4
-						yIPqH09eGC1qsTVOeHKlOT58VuXVL/UgKg4Qt09Tve327l1vkIoklaF62AX6cXKF
-						KmEMreKHeMMbULtXfw1WAKyLveqxC2P6sm7r5RHmphlssqHzl6ga+5LWQMiQFUG2
-						ArKpUGwpk16lWUh1A+FJ7KMSP2BUQUp4NBku9sD8LUzMuey2zHMifjx3QxoFcQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bradfordcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bradfordcollege.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://shibboleth.bradfordcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bradfordcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.bradfordcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bradfordcollege.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">bradfordcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFCjCCA/KgAwIBAgIJALdslILT05qQMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
-						VQQGEwJHQjESMBAGA1UECBMJWW9ya3NoaXJlMREwDwYDVQQHEwhCcmFkZm9yZDEZ
-						MBcGA1UEChMQQnJhZGZvcmQgQ29sbGVnZTEpMCcGA1UEAxMgc2hpYmJvbGV0aC5i
-						cmFkZm9yZGNvbGxlZ2UuYWMudWsxKTAnBgkqhkiG9w0BCQEWGnJvb3RAYnJhZGZv
-						cmRjb2xsZWdlLmFjLnVrMB4XDTEzMTEwODEyMzI1OFoXDTIzMTEwNjEyMzI1OFow
-						gaUxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlZb3Jrc2hpcmUxETAPBgNVBAcTCEJy
-						YWRmb3JkMRkwFwYDVQQKExBCcmFkZm9yZCBDb2xsZWdlMSkwJwYDVQQDEyBzaGli
-						Ym9sZXRoLmJyYWRmb3JkY29sbGVnZS5hYy51azEpMCcGCSqGSIb3DQEJARYacm9v
-						dEBicmFkZm9yZGNvbGxlZ2UuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQCwYsDvkLqkCOFTHrZ3Er53jfoqYD9mq8d0KGt6BH/oaEhDf9LVLoTm
-						zDgu0dSsDBxCyoIWcyV2snrQ1SjkRRKc7km1Cqlt3X1F7HJwCd9ocJRkWOkJLCyv
-						o0lMzO9Fv1PcjWHwnJmFQom7WTrZ5bqAOYmvPJF03Mfbg5pQcNXZqSz0F4r7wJpX
-						4d0rU+sq2H27TDaIgwWZ2PU8vfLlYshctMv1b8h1wpyBwyLdidtov8yHXRjKuTmL
-						xYhHESz4j3Ji4bPY5Dry2mG+TVDbI8MKScdYxdIXaI51fwo5JtOv0mT3qAUD+RN+
-						TAg7YXpwS6X6dlQqqJDu6AbgDzAImq47AgMBAAGjggE5MIIBNTAJBgNVHRMEAjAA
-						MCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAd
-						BgNVHQ4EFgQUvwyrftHX/bc1Rrx58TEml80zNagwgdoGA1UdIwSB0jCBz4AUvwyr
-						ftHX/bc1Rrx58TEml80zNaihgaukgagwgaUxCzAJBgNVBAYTAkdCMRIwEAYDVQQI
-						EwlZb3Jrc2hpcmUxETAPBgNVBAcTCEJyYWRmb3JkMRkwFwYDVQQKExBCcmFkZm9y
-						ZCBDb2xsZWdlMSkwJwYDVQQDEyBzaGliYm9sZXRoLmJyYWRmb3JkY29sbGVnZS5h
-						Yy51azEpMCcGCSqGSIb3DQEJARYacm9vdEBicmFkZm9yZGNvbGxlZ2UuYWMudWuC
-						CQC3bJSC09OakDANBgkqhkiG9w0BAQUFAAOCAQEAQMSXezpcwMwJDj1eg9Y/I0gj
-						ArGP9oZIvPUX7l19e915ndg+eYaiDHNcjf+fMduiTS9SKd0HhGhki0FwLhbf//yX
-						0YGKyeBEdV2lz9WjXZelGt45DuMLBtMB2TFWxXizW5KAObNvrtTW2nYQLaZ8LkD4
-						yIPqH09eGC1qsTVOeHKlOT58VuXVL/UgKg4Qt09Tve327l1vkIoklaF62AX6cXKF
-						KmEMreKHeMMbULtXfw1WAKyLveqxC2P6sm7r5RHmphlssqHzl6ga+5LWQMiQFUG2
-						ArKpUGwpk16lWUh1A+FJ7KMSP2BUQUp4NBku9sD8LUzMuey2zHMifjx3QxoFcQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.bradfordcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.bradfordcollege.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">Bradford College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bradford College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bradfordcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Deborah</GivenName>
-    <SurName>Duffy</SurName>
-    <EmailAddress>mailto:d.duffy@bradfordcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Belal</GivenName>
-    <SurName>Sayed</SurName>
-    <EmailAddress>mailto:b.sayed@bradfordcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.brandeis.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.brandeis.edu-idp-shibboleth.xml
deleted file mode 100644
index 2185f697..00000000
--- a/swamid-interfederations-2.0/shibboleth.brandeis.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://shibboleth.brandeis.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">brandeis.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Brandeis University</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>
-MIIDSDCCAjCgAwIBAgIVAJ07ki+U+Q1jeqL9/EKoyRbWCMAyMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYnJhbmRlaXMuZWR1MB4XDTEzMDMw
-ODIwMTczOVoXDTMzMDMwODIwMTczOVowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5i
-cmFuZGVpcy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKZIwW
-KwP8VTEQc8aR/fukHycUON1HPpq7LoIjINdzuzMR2C6ZdNRMzbR+4qkQRdeW6Ptp
-9L7C0HMEeIPRhEFh6gdAgl3VwyyDgz/fqMHpXNQn/7Tw+vl3I2Joha69iNQK3K6I
-gNI2E/x2b8YizudhSSCu3RAm7vPLN3gcyc2sRA3KkXvaEWO0jU7GJVTmaCgRpCH0
-Bsv5vZ724UMuuPP1Feu4nhKtqRm0khEA9svRGfDVxhWnPpg8rLT9Yu03IChN8hdq
-NspAQCmDI2OFQB5frAuiQ9MQT7Q9jzBSJ3bcWQsYsdbWNG7Hpl2hBSlUtqR5tzat
-iU1U1LsZAv/wQbgLAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGguYnJh
-bmRlaXMuZWR1hi5odHRwczovL3NoaWJib2xldGguYnJhbmRlaXMuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQPTVgZcvtUxjYUCn8mj6n/ldo5zjANBgkqhkiG
-9w0BAQUFAAOCAQEAVGtWGwmb6iIG3sbWiBvuayHCmiWCl3rZN/CpFYxU5p9Xcuu6
-lcTq6wAY04Cs/v4rjStdsH1REnI6CUyOcLzVCK55bhpyvLCTxQYAaULVg95UmZF2
-Kkr0LXmXHkOfG7nTwY8Qm13tfBAPwqNdHmstlMvw3LAgmy96heq+bHryqbTYKC/V
-dTdUuhV14vl7PJt9y3EqXISJjwNG7wEF9wM0qUIG51qlp4f4MiNaNxJI/cYUC1cw
-7d/XK0tGHAwQxu/IeOIxUYbsUbTSua3u/Xc6WaTwfWxSl96NcOuTnyazB4hkSIYa
-C30ze3MSAph0HLqEHTWk8Ldt2Y3QWku9g5WNlA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.brandeis.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.brandeis.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.brandeis.edu/cgi-bin/logout"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.brandeis.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.brandeis.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.brandeis.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brandeis.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAJ07ki+U+Q1jeqL9/EKoyRbWCMAyMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguYnJhbmRlaXMuZWR1MB4XDTEzMDMw
-ODIwMTczOVoXDTMzMDMwODIwMTczOVowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5i
-cmFuZGVpcy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCKZIwW
-KwP8VTEQc8aR/fukHycUON1HPpq7LoIjINdzuzMR2C6ZdNRMzbR+4qkQRdeW6Ptp
-9L7C0HMEeIPRhEFh6gdAgl3VwyyDgz/fqMHpXNQn/7Tw+vl3I2Joha69iNQK3K6I
-gNI2E/x2b8YizudhSSCu3RAm7vPLN3gcyc2sRA3KkXvaEWO0jU7GJVTmaCgRpCH0
-Bsv5vZ724UMuuPP1Feu4nhKtqRm0khEA9svRGfDVxhWnPpg8rLT9Yu03IChN8hdq
-NspAQCmDI2OFQB5frAuiQ9MQT7Q9jzBSJ3bcWQsYsdbWNG7Hpl2hBSlUtqR5tzat
-iU1U1LsZAv/wQbgLAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGguYnJh
-bmRlaXMuZWR1hi5odHRwczovL3NoaWJib2xldGguYnJhbmRlaXMuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQPTVgZcvtUxjYUCn8mj6n/ldo5zjANBgkqhkiG
-9w0BAQUFAAOCAQEAVGtWGwmb6iIG3sbWiBvuayHCmiWCl3rZN/CpFYxU5p9Xcuu6
-lcTq6wAY04Cs/v4rjStdsH1REnI6CUyOcLzVCK55bhpyvLCTxQYAaULVg95UmZF2
-Kkr0LXmXHkOfG7nTwY8Qm13tfBAPwqNdHmstlMvw3LAgmy96heq+bHryqbTYKC/V
-dTdUuhV14vl7PJt9y3EqXISJjwNG7wEF9wM0qUIG51qlp4f4MiNaNxJI/cYUC1cw
-7d/XK0tGHAwQxu/IeOIxUYbsUbTSua3u/Xc6WaTwfWxSl96NcOuTnyazB4hkSIYa
-C30ze3MSAph0HLqEHTWk8Ldt2Y3QWku9g5WNlA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.brandeis.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Brandeis University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Brandeis University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.brandeis.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Josh Wilson</md:GivenName>
-    <md:EmailAddress>jwilson@brandeis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ian Rifkin</md:GivenName>
-    <md:EmailAddress>irifkin@brandeis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jim Lambert</md:GivenName>
-    <md:EmailAddress>jlambert@brandeis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Library Systems</md:GivenName>
-    <md:EmailAddress>e-resources@brandeis.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bsu.edu-sso.xml b/swamid-interfederations-2.0/shibboleth.bsu.edu-sso.xml
deleted file mode 100644
index 1ac219d6..00000000
--- a/swamid-interfederations-2.0/shibboleth.bsu.edu-sso.xml
+++ /dev/null
@@ -1,61 +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://shibboleth.bsu.edu/sso">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://shibboleth.bsu.edu/error.html" 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">bsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ball State University</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>
-MIIDOzCCAiOgAwIBAgIJAKAO80Hri578MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnNoaWJib2xldGguYnN1LmVkdTAeFw0xMTA0MTkxNzA3MjZaFw0yMTA0MTYx
-NzA3MjZaMB0xGzAZBgNVBAMTEnNoaWJib2xldGguYnN1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALJheSWlUoTPpr154iRhjkGdtfdvCeJr09z4
-FdzDnMpFaBHxPf58b2YH8IVdwamoC3AKyoCkCStobCttV+lVodYhH0SXFZap2Fzq
-T62NxpFHQLLW14El9uC+cwRYYEBUTnQ9fsftv8xOz7jv9DQzhTW8GwGX33P98Y5w
-Q1MWulryvWzH3Hcc7wRCyXRa91/oN9M3gDEi6CfUfeZgz8Omq21rBIxgWNi/FyH4
-VfuPMEUfzm5qTnPyBvKJvPDewQZ6g6RyMtrqkx3h0Z9v/TZyxWeqCZctBiVHGEW9
-/+vnDC+LxMOHqoV4TquV6l2reeqECEM7zIT2pANwYfWXrrAIRIcCAwEAAaN+MHww
-HQYDVR0OBBYEFHpRlcFJbr61YLvNmm0jauaLwEasME0GA1UdIwRGMESAFHpRlcFJ
-br61YLvNmm0jauaLwEasoSGkHzAdMRswGQYDVQQDExJzaGliYm9sZXRoLmJzdS5l
-ZHWCCQCgDvNB64ue/DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBc
-kXZa/U7dQH6rSh8tdfp3RhoCo9f7e0qtysH2BLWQrl54SUqXhGP5FMbybhodQKFx
-JOj4zD9h9EM1gg4YkSjCHgL7X9w5TH/47+m0R6P/PPitwCYMLCdAFESrhpO/sGSe
-BohT0pLdmQg4S7qvBG5qWwnuF/XQlJauVxWzA/vzReQnmVjHeYiWboEHrF5/t83e
-v0WxHdbpa3yELcIkIy7cHaEza80jhLNLX2P3BeWMXpTjAhyzRKqOgFw51C2NkI/T
-+mWS+cDSy+uOrGHD9NYCQdO0pynSeNVxNkQeobYBU8l3E7oS4ThlsxKHEJifjarX
-lXYN/Vp1V8upHuz8zaF7
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bsu.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.bsu.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.bsu.edu/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ball State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ball State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://cms.bsu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alex Chalmers</md:GivenName>
-    <md:EmailAddress>abchalmers@bsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Todd Meister</md:GivenName>
-    <md:EmailAddress>tmeister@bsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.burnley.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.burnley.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 44cfa99d..00000000
--- a/swamid-interfederations-2.0/shibboleth.burnley.ac.uk-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" entityID="https://shibboleth.burnley.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Burnley College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">burnley.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYjCCAkoCCQC+CFHVE+EW0DANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHQnVybmxleTEVMBMGA1UEBxMMT3JtZXJvZCBSb2FkMRgwFgYD
-						VQQKEw9CdXJubGV5IENvbGxlZ2UxITAfBgNVBAMTGHNoaWJib2xldGguYnVybmxl
-						eS5hYy51azAeFw0xMjAyMTUxMDU2NDJaFw0zMjAyMTAxMDU2NDJaMHMxCzAJBgNV
-						BAYTAkdCMRAwDgYDVQQIEwdCdXJubGV5MRUwEwYDVQQHEwxPcm1lcm9kIFJvYWQx
-						GDAWBgNVBAoTD0J1cm5sZXkgQ29sbGVnZTEhMB8GA1UEAxMYc2hpYmJvbGV0aC5i
-						dXJubGV5LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu02J
-						nEVRwBDvdmovXS1AGkMGHjfX43NPkhCOkgIBw5eiN2ZqnijYvkt9abqueU6hPqQE
-						sOm09pPLBfqHGj2bWNVksv57Msym/17UFUQnA3v6B5WQeqYG4X96Ek5KwRp96flv
-						+wwzfdUq5eS5sekw9dNk9zT5vgfzcfWwvCS+ceiqu+yu7Jd2HlRl9f0PXgZWhxMK
-						ECIlXNbGmW5IErMiF1EBYBgcnP7mlq9wHXxx97KzmzSl2ZKpAFipp/tgslChrEgI
-						UjSRYOh7OsUH4B8cFAee7qjcm+GUY1oCH/g6qpg3jTaousib7RMrBeLYEgHaXjqy
-						vpTQpYhoUz3qayisYQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCMCpYGjy9m7F9i
-						r3iVWZU47F/HLYFD1k7vKpEwnotBHhb5SZMz0+uzEOv1axpp4gPb1m2J14G11Iz1
-						BR9vPcPg65pNjq1oE2G7UDV2gciosZZrioSF/DJuJuDrbxJegLruU2ESijSPR1wg
-						bhpDgRRK956nWY98DxglA1v+LqEQuEFve/Fn9HGfeW43xrmO1a6RuvtTI0HilcuN
-						T5S5xQpcCrkdevvm82/mNdA0aolYGIbnMkORSc3Mtphr4LxXm42SPa+JxVDiY0bJ
-						KoZv9294rqjpQG30+B3HvkNcQkTY0lZ9Bq9s56OLjzO6+/rwBAbAxQ1qjMYNn7iN
-						uWGfRnNT
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.burnley.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.burnley.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://shibboleth.burnley.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.burnley.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.burnley.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.burnley.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">burnley.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYjCCAkoCCQC+CFHVE+EW0DANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHQnVybmxleTEVMBMGA1UEBxMMT3JtZXJvZCBSb2FkMRgwFgYD
-						VQQKEw9CdXJubGV5IENvbGxlZ2UxITAfBgNVBAMTGHNoaWJib2xldGguYnVybmxl
-						eS5hYy51azAeFw0xMjAyMTUxMDU2NDJaFw0zMjAyMTAxMDU2NDJaMHMxCzAJBgNV
-						BAYTAkdCMRAwDgYDVQQIEwdCdXJubGV5MRUwEwYDVQQHEwxPcm1lcm9kIFJvYWQx
-						GDAWBgNVBAoTD0J1cm5sZXkgQ29sbGVnZTEhMB8GA1UEAxMYc2hpYmJvbGV0aC5i
-						dXJubGV5LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu02J
-						nEVRwBDvdmovXS1AGkMGHjfX43NPkhCOkgIBw5eiN2ZqnijYvkt9abqueU6hPqQE
-						sOm09pPLBfqHGj2bWNVksv57Msym/17UFUQnA3v6B5WQeqYG4X96Ek5KwRp96flv
-						+wwzfdUq5eS5sekw9dNk9zT5vgfzcfWwvCS+ceiqu+yu7Jd2HlRl9f0PXgZWhxMK
-						ECIlXNbGmW5IErMiF1EBYBgcnP7mlq9wHXxx97KzmzSl2ZKpAFipp/tgslChrEgI
-						UjSRYOh7OsUH4B8cFAee7qjcm+GUY1oCH/g6qpg3jTaousib7RMrBeLYEgHaXjqy
-						vpTQpYhoUz3qayisYQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCMCpYGjy9m7F9i
-						r3iVWZU47F/HLYFD1k7vKpEwnotBHhb5SZMz0+uzEOv1axpp4gPb1m2J14G11Iz1
-						BR9vPcPg65pNjq1oE2G7UDV2gciosZZrioSF/DJuJuDrbxJegLruU2ESijSPR1wg
-						bhpDgRRK956nWY98DxglA1v+LqEQuEFve/Fn9HGfeW43xrmO1a6RuvtTI0HilcuN
-						T5S5xQpcCrkdevvm82/mNdA0aolYGIbnMkORSc3Mtphr4LxXm42SPa+JxVDiY0bJ
-						KoZv9294rqjpQG30+B3HvkNcQkTY0lZ9Bq9s56OLjzO6+/rwBAbAxQ1qjMYNn7iN
-						uWGfRnNT
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.burnley.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.burnley.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">Burnley College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Burnley College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.burnley.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nick</GivenName>
-    <SurName>Williams</SurName>
-    <EmailAddress>mailto:n.williams@burnley.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Hamza</GivenName>
-    <SurName>Raziq</SurName>
-    <EmailAddress>mailto:h.raziq@burnley.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Williams</SurName>
-    <EmailAddress>mailto:n.williams@burnley.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-shibboleth.xml
deleted file mode 100644
index 8d24391d..00000000
--- a/swamid-interfederations-2.0/shibboleth.burycollege.ac.uk-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.burycollege.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Bury College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-21T15:13: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">burycollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWjCCAkICCQC8tl6skoCc8zANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJH
-						QjETMBEGA1UECBMKTWFuY2hlc3RlcjENMAsGA1UEBxMEQnVyeTEVMBMGA1UEChMM
-						QnVyeSBDb2xsZWdlMSUwIwYDVQQDExxzaGliYm9sZXRoLmJ1cnljb2xsZWdlLmFj
-						LnVrMB4XDTE0MDcwOTE0Mjk1OFoXDTM0MDcwNDE0Mjk1OFowbzELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgTCk1hbmNoZXN0ZXIxDTALBgNVBAcTBEJ1cnkxFTATBgNVBAoT
-						DEJ1cnkgQ29sbGVnZTElMCMGA1UEAxMcc2hpYmJvbGV0aC5idXJ5Y29sbGVnZS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAND/tL2yS5omqRAg
-						MRXvoOL7sdII0Bl3pe6mSPebwAIk252444CXXnPyYxNjjwTc4EKRNsI2KYAVgqRf
-						ng9+2bie34Qfb/xvgHN6wrh/oJRQCXaTt1fFLdOIVNKRNVEE5/Gij9ItT9RAWCgZ
-						oQsu6e5wIfxmkPARwDrhw99UfIlZG5vsrlISaxE+EWUZCjaJdBPwAEKbm9HF3/Zm
-						BQ2fldxbMSG0uBm17UNg606BmWlRthXlSG2mbvwEPTRnQ4n0vvOWIl6fFUD1iNUE
-						tX3Ay3ab3/FagvJ8jiwDXPZT6boXNYdd1zLwHsuHcAvphi+AxIW7xZ3kBAHHWQ6z
-						yIUdNQkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcU/my3lp/CHxZE45dOmGmex2
-						Smuni9Wzh9U01OHUiBzY7FTET4pdpitboZ/f7xRobnbHecFJfzHt3bVJDBDAPs/+
-						VHwRJP40SvrSDtq5fHA4L41sMZcHVfxFHmzQblgpBjuwUqcfsoEmg3/lCrk8zhef
-						wllZha3ZbPbLaTMqhttUtOhgZ+x3tJEvnoJJem9gXu6yAdQQooEtOvSebLbnxjL5
-						efQCQP3Hn4/00dV32OSfv/ZME7C+XyNGP9fCVV1tl44Po/3FhPEmhu0SmmF5DIIx
-						AMJshMgl/n/2lWhtoezBSuHSoLRtboKXS54Jqzf9Z7PcuPbOLsYMymfdR1vsqg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.burycollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.burycollege.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://shibboleth.burycollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.burycollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.burycollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.burycollege.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">burycollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWjCCAkICCQC8tl6skoCc8zANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJH
-						QjETMBEGA1UECBMKTWFuY2hlc3RlcjENMAsGA1UEBxMEQnVyeTEVMBMGA1UEChMM
-						QnVyeSBDb2xsZWdlMSUwIwYDVQQDExxzaGliYm9sZXRoLmJ1cnljb2xsZWdlLmFj
-						LnVrMB4XDTE0MDcwOTE0Mjk1OFoXDTM0MDcwNDE0Mjk1OFowbzELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgTCk1hbmNoZXN0ZXIxDTALBgNVBAcTBEJ1cnkxFTATBgNVBAoT
-						DEJ1cnkgQ29sbGVnZTElMCMGA1UEAxMcc2hpYmJvbGV0aC5idXJ5Y29sbGVnZS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAND/tL2yS5omqRAg
-						MRXvoOL7sdII0Bl3pe6mSPebwAIk252444CXXnPyYxNjjwTc4EKRNsI2KYAVgqRf
-						ng9+2bie34Qfb/xvgHN6wrh/oJRQCXaTt1fFLdOIVNKRNVEE5/Gij9ItT9RAWCgZ
-						oQsu6e5wIfxmkPARwDrhw99UfIlZG5vsrlISaxE+EWUZCjaJdBPwAEKbm9HF3/Zm
-						BQ2fldxbMSG0uBm17UNg606BmWlRthXlSG2mbvwEPTRnQ4n0vvOWIl6fFUD1iNUE
-						tX3Ay3ab3/FagvJ8jiwDXPZT6boXNYdd1zLwHsuHcAvphi+AxIW7xZ3kBAHHWQ6z
-						yIUdNQkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcU/my3lp/CHxZE45dOmGmex2
-						Smuni9Wzh9U01OHUiBzY7FTET4pdpitboZ/f7xRobnbHecFJfzHt3bVJDBDAPs/+
-						VHwRJP40SvrSDtq5fHA4L41sMZcHVfxFHmzQblgpBjuwUqcfsoEmg3/lCrk8zhef
-						wllZha3ZbPbLaTMqhttUtOhgZ+x3tJEvnoJJem9gXu6yAdQQooEtOvSebLbnxjL5
-						efQCQP3Hn4/00dV32OSfv/ZME7C+XyNGP9fCVV1tl44Po/3FhPEmhu0SmmF5DIIx
-						AMJshMgl/n/2lWhtoezBSuHSoLRtboKXS54Jqzf9Z7PcuPbOLsYMymfdR1vsqg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.burycollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.burycollege.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">Bury College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bury College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.burycollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Louise</GivenName>
-    <SurName>Minta</SurName>
-    <EmailAddress>mailto:louise.minta@burycollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dominic</GivenName>
-    <SurName>Garner</SurName>
-    <EmailAddress>mailto:dominic.garner@burycollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.c2kqa.net-idp-shibboleth.xml
deleted file mode 100644
index 7a53eae9..00000000
--- a/swamid-interfederations-2.0/shibboleth.c2kqa.net-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" entityID="https://shibboleth.c2kqa.net/idp/shibboleth">
-  <!--
-		This is a Shibboleth "C2k" IdP for the Western Education and Library Board.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-08T12:31: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">c2kqa.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUOmrWnoGvFDkaJ0RFpEBraZk80cMwDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5jMmtxYS5uZXQwHhcNMTAwNjIzMTAy
-						OTA0WhcNMzAwNjIzMTAyOTA0WjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLmMya3Fh
-						Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAaXKjkiDo2I09Y
-						lpyzrWyIg2MrK0AKi5dIi5Svue8pv9XXCwhlBaFqvPZgmI6isdCUzOXAh0lV/XzY
-						OEvvQsBVoEeebWpWm7pPOS8rtGYuUvwFPkdi6MyXsVw7Ei+d70rFeKJijNbhnMkg
-						oMRk/pRTPROQCffl4SqmFAqb2vn+L4XbXcXdcT/bhaxitbjalTffvx3PrGhco/D1
-						wjWxoR9kY8Q6t9K9/8hnZU3xlUUqy5Viq5fCacu7zv9frhZ1O85p6F/NZSwnKQq0
-						wZrbDDBGwXHVh4IMIwVLTaCmB7gNUWTfo0dOPKjakUMNaIEsyDt6KNRe0CGslv3J
-						eVzKMJcCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmJvbGV0aC5jMmtxYS5uZXSG
-						K2h0dHBzOi8vc2hpYmJvbGV0aC5jMmtxYS5uZXQvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFOA3DMt6qji7fUywGEUlp+SNCqGGMA0GCSqGSIb3DQEBBQUAA4IBAQBj
-						CI4GK5AcY+NYY3twlyOt4BTjECTWTndFbctqKM1eLgNOrucaKchRGoqZUs5TOjpM
-						DWTD6sROH1SSmPb+igQeR7H1hLBsVCHt25WCNfaSlw9v4s1+6H78iugY30bdP00/
-						wx1YQ8oQAT/f0u0QyNCmwHrFc3Z0KL7Ep/Ja8Dv2BfKXZ2D1epNins1ehZeMbEbT
-						/FYibzNtKmBDmCiTF20Bglf6nJySn8cN31z+VlHQNZxyCz/vae4TfgOktsDN7AOL
-						q3KitZrzJZ0KGE9R1nnKSuW86fm+eLp6ai0jhUZP9NV+uUb/O4wRuJP8JTec0tjd
-						DE3ljx9HJYZ7RbLYPnxd
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kqa.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kqa.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://shibboleth.c2kqa.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.c2kqa.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.c2kqa.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">c2kqa.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIUOmrWnoGvFDkaJ0RFpEBraZk80cMwDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5jMmtxYS5uZXQwHhcNMTAwNjIzMTAy
-						OTA0WhcNMzAwNjIzMTAyOTA0WjAfMR0wGwYDVQQDExRzaGliYm9sZXRoLmMya3Fh
-						Lm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAaXKjkiDo2I09Y
-						lpyzrWyIg2MrK0AKi5dIi5Svue8pv9XXCwhlBaFqvPZgmI6isdCUzOXAh0lV/XzY
-						OEvvQsBVoEeebWpWm7pPOS8rtGYuUvwFPkdi6MyXsVw7Ei+d70rFeKJijNbhnMkg
-						oMRk/pRTPROQCffl4SqmFAqb2vn+L4XbXcXdcT/bhaxitbjalTffvx3PrGhco/D1
-						wjWxoR9kY8Q6t9K9/8hnZU3xlUUqy5Viq5fCacu7zv9frhZ1O85p6F/NZSwnKQq0
-						wZrbDDBGwXHVh4IMIwVLTaCmB7gNUWTfo0dOPKjakUMNaIEsyDt6KNRe0CGslv3J
-						eVzKMJcCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmJvbGV0aC5jMmtxYS5uZXSG
-						K2h0dHBzOi8vc2hpYmJvbGV0aC5jMmtxYS5uZXQvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFOA3DMt6qji7fUywGEUlp+SNCqGGMA0GCSqGSIb3DQEBBQUAA4IBAQBj
-						CI4GK5AcY+NYY3twlyOt4BTjECTWTndFbctqKM1eLgNOrucaKchRGoqZUs5TOjpM
-						DWTD6sROH1SSmPb+igQeR7H1hLBsVCHt25WCNfaSlw9v4s1+6H78iugY30bdP00/
-						wx1YQ8oQAT/f0u0QyNCmwHrFc3Z0KL7Ep/Ja8Dv2BfKXZ2D1epNins1ehZeMbEbT
-						/FYibzNtKmBDmCiTF20Bglf6nJySn8cN31z+VlHQNZxyCz/vae4TfgOktsDN7AOL
-						q3KitZrzJZ0KGE9R1nnKSuW86fm+eLp6ai0jhUZP9NV+uUb/O4wRuJP8JTec0tjd
-						DE3ljx9HJYZ7RbLYPnxd
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.c2kqa.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.c2kqa.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">Western Education and Library Board</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">C2k</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.c2kni.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Joe</GivenName>
-    <SurName>Boyle</SurName>
-    <EmailAddress>mailto:joe.boyle@capita.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Joe</GivenName>
-    <SurName>Boyle</SurName>
-    <EmailAddress>mailto:joe.boyle@capita.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.xml
deleted file mode 100644
index a41ca8b8..00000000
--- a/swamid-interfederations-2.0/shibboleth.cambridge.org-shibboleth-sp.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://shibboleth.cambridge.org/shibboleth-sp">
-  <!--
-		This is a "Cambridge Journals Online" Shibboleth SP for the University of Cambridge.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-12T12:20:34Z"/>
-  </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://shibboleth.cambridge.org/Shibboleth.sso/discovery"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFVTCCBD2gAwIBAgIQO9N4D50Dc9cwSe8N1yLYVzANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTQwOTI5
-						MDAwMDAwWhcNMTYwOTI4MjM1OTU5WjCBoTELMAkGA1UEBhMCR0IxFzAVBgNVBAgT
-						DkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHFAlDYW1icmlkZ2UxIzAhBgNVBAoUGkNh
-						bWJyaWRnZSBVbml2ZXJzaXR5IFByZXNzMR0wGwYDVQQLFBRJbmZvcm1hdGlvbiBT
-						ZXJ2aWNlczEhMB8GA1UEAxQYc2hpYmJvbGV0aC5jYW1icmlkZ2Uub3JnMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt2Ofo7vlrETNfNCDgn7biPRQ6hcB
-						/CTA+LxQwZeDt/ib3gdfnnoPvBVTd4hyLZRCvwL+5plgYSVrqLSbLbHQR6kCwHAH
-						jexj8CJWOG/Kozy0MgNbOfrzhQ8RZWwxB7/RIH6d5FpJKtZ+RyrN/Ms43HjLwfNo
-						x5d2N9X25q6gPg9Zmk2OJTPbj0UUhFN3ktL05ONWRU7E4Q1Hw7W9ChMxpMy/QftW
-						2ewCMT7+5th31HbAwhMm6yhA0qGy2A/hY75ULpd/Ira3OV65QVyEfSD7x+ZszAgc
-						Rcq0iXLDFzuNcz7MyNht1EZNhgy3tx2+nBY+V4pCkpqC3ofq8aIlXUet3QIDAQAB
-						o4IBcTCCAW0wIwYDVR0RBBwwGoIYc2hpYmJvbGV0aC5jYW1icmlkZ2Uub3JnMAkG
-						A1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMCsGA1UdHwQkMCIwIKAeoByGGmh0dHA6
-						Ly9zZC5zeW1jYi5jb20vc2QuY3JsMGUGA1UdIAReMFwwWgYKYIZIAYb4RQEHNjBM
-						MCMGCCsGAQUFBwIBFhdodHRwczovL2Quc3ltY2IuY29tL2NwczAlBggrBgEFBQcC
-						AjAZDBdodHRwczovL2Quc3ltY2IuY29tL3JwYTAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUDURcFlNEwYJ+HSCrJfQBY9i+eaUwVwYI
-						KwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNodHRwOi8vc2Quc3ltY2QuY29tMCYG
-						CCsGAQUFBzAChhpodHRwOi8vc2Quc3ltY2IuY29tL3NkLmNydDANBgkqhkiG9w0B
-						AQUFAAOCAQEACZOZGk5CunXPz+ceERyAtjpwXIaeI1hb8OYTtz8U5yPEHvzRTC+L
-						yWrcVOSZ46esMYOMaTxrCljd3XEBTVeuNDg+guiNS8UsU5WQNxdHubzJ9coxsqX5
-						2YEDY4zCSo/GMTI5lz5QKWRmKx1TLzfz2v6pvqVmYBW9eAq7dH9GqQCGlh7bhzOp
-						rLk0pczCE3uRGx+U6l+lMCT/vtfKPUesSkmhcLyfHS+esyPJ7ve9KoAoISmkYmjQ
-						B8G5M+isJBCf4hLchnl21QR0Q9MxeIujkL1sa7p5Ve6mgdL6YtCPRnPj017ixuVZ
-						4UP5qHJN1g34tRozzMPE0TOTpLcVHULwIQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cambridge.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cambridge.org/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cambridge.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cambridge.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cambridge.org/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.cambridge.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cambridge Journals Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cambridge.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Phillips</SurName>
-    <EmailAddress>mailto:sysadmin@cambridge.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Jarvy</GivenName>
-    <SurName>Alvarez</SurName>
-    <EmailAddress>mailto:jalvarez@cambridge.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Godofredo</GivenName>
-    <SurName>Avena</SurName>
-    <EmailAddress>mailto:gavena@cambridge.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jarvy</GivenName>
-    <SurName>Alvarez</SurName>
-    <EmailAddress>mailto:jalvarez@cambridge.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-shibboleth.xml
deleted file mode 100644
index 10f33903..00000000
--- a/swamid-interfederations-2.0/shibboleth.camsfc.ac.uk-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://shibboleth.camsfc.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Cheadle and Marple Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-11-06T15:35: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">camsfc.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The Cheadle and Marple College Network</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://shibboleth.camsfc.ac.uk/idp/images/icon.jpg</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://shibboleth.camsfc.ac.uk/idp/images/ukfed_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqDCCApACCQDwANC11k/QRTANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0NoZWFkbGUxETAPBgNVBAcTCENoZXNoaXJlMS4wLAYDVQQK
-						EyVDaGVhZGxlIGFuZCBNYXJwbGUgU2l4dGggRm9ybSBDb2xsZWdlMQ8wDQYDVQQL
-						EwZDQU1TRkMxIDAeBgNVBAMTF3NoaWJib2xldGguY2Ftc2ZjLmFjLnVrMB4XDTE0
-						MDkxMDA5NTAxM1oXDTM0MDkwNTA5NTAxM1owgZUxCzAJBgNVBAYTAkdCMRAwDgYD
-						VQQIEwdDaGVhZGxlMREwDwYDVQQHEwhDaGVzaGlyZTEuMCwGA1UEChMlQ2hlYWRs
-						ZSBhbmQgTWFycGxlIFNpeHRoIEZvcm0gQ29sbGVnZTEPMA0GA1UECxMGQ0FNU0ZD
-						MSAwHgYDVQQDExdzaGliYm9sZXRoLmNhbXNmYy5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBALWoieHqdYIyK9llKMreLfw+cesAbbzWLjzwf02H
-						WiYZbu7oS8XYciMNI4fKxq7GNuJ7AmaoRXcdIftWVgyKkYQtPqquBw0PLZng0T00
-						aEwbfLLlnm34XeacBdx2rNp4dui4OBm3qVI+qDFGNTCCOA+ZrGcSbgItsjvLAeN2
-						uzttrVkFr6/Cyj4//oYTi4SWw1Hj7VBWk6flZzUIDBsGL2Z5A5hlKrrmsZ3t3ifD
-						SwCioXaemR8yH6k1QqBv3hD94iYJGvHN4OTHqe6/icpUv9FzgGV9VwMAhbvKIUkM
-						MtxEJWfHt15HOnBskmpX4+OUC0iugxmraNTmMFflWAWLBcUCAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEAHxg3UuDrKkAPNdPNySJYL1zynlQWmmdK9ZO4dAPUPl8a0Avq
-						3KSwrukc+XTOfpQVOBlSf8JdqzANPaBW1Q9a4CKqu/Qm6T4I9EoRrgeo/8BsZ2em
-						4Kx2U3lm3CLLW8hROcppUG2h+MPGxcQ4i7GqphKdn/NYLDBkPVQqWwKWtuqHOCr/
-						Tda5UoqXbj6fZAnihorAj7enYU3EniX+yZaXEdmnL7lPQkAdWYylnwNkHOOE+Riz
-						GtwdAL6pvnDrDqZiYuoIOgKg3X0rcF0RQ5mmCIbYK372Bnl6z8DuIvioorFAXNCW
-						5pqnOi9PIkOlE6R66aTytHCMJeQCdlufJ3etaQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.camsfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.camsfc.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://shibboleth.camsfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.camsfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.camsfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.camsfc.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">camsfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqDCCApACCQDwANC11k/QRTANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0NoZWFkbGUxETAPBgNVBAcTCENoZXNoaXJlMS4wLAYDVQQK
-						EyVDaGVhZGxlIGFuZCBNYXJwbGUgU2l4dGggRm9ybSBDb2xsZWdlMQ8wDQYDVQQL
-						EwZDQU1TRkMxIDAeBgNVBAMTF3NoaWJib2xldGguY2Ftc2ZjLmFjLnVrMB4XDTE0
-						MDkxMDA5NTAxM1oXDTM0MDkwNTA5NTAxM1owgZUxCzAJBgNVBAYTAkdCMRAwDgYD
-						VQQIEwdDaGVhZGxlMREwDwYDVQQHEwhDaGVzaGlyZTEuMCwGA1UEChMlQ2hlYWRs
-						ZSBhbmQgTWFycGxlIFNpeHRoIEZvcm0gQ29sbGVnZTEPMA0GA1UECxMGQ0FNU0ZD
-						MSAwHgYDVQQDExdzaGliYm9sZXRoLmNhbXNmYy5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBALWoieHqdYIyK9llKMreLfw+cesAbbzWLjzwf02H
-						WiYZbu7oS8XYciMNI4fKxq7GNuJ7AmaoRXcdIftWVgyKkYQtPqquBw0PLZng0T00
-						aEwbfLLlnm34XeacBdx2rNp4dui4OBm3qVI+qDFGNTCCOA+ZrGcSbgItsjvLAeN2
-						uzttrVkFr6/Cyj4//oYTi4SWw1Hj7VBWk6flZzUIDBsGL2Z5A5hlKrrmsZ3t3ifD
-						SwCioXaemR8yH6k1QqBv3hD94iYJGvHN4OTHqe6/icpUv9FzgGV9VwMAhbvKIUkM
-						MtxEJWfHt15HOnBskmpX4+OUC0iugxmraNTmMFflWAWLBcUCAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEAHxg3UuDrKkAPNdPNySJYL1zynlQWmmdK9ZO4dAPUPl8a0Avq
-						3KSwrukc+XTOfpQVOBlSf8JdqzANPaBW1Q9a4CKqu/Qm6T4I9EoRrgeo/8BsZ2em
-						4Kx2U3lm3CLLW8hROcppUG2h+MPGxcQ4i7GqphKdn/NYLDBkPVQqWwKWtuqHOCr/
-						Tda5UoqXbj6fZAnihorAj7enYU3EniX+yZaXEdmnL7lPQkAdWYylnwNkHOOE+Riz
-						GtwdAL6pvnDrDqZiYuoIOgKg3X0rcF0RQ5mmCIbYK372Bnl6z8DuIvioorFAXNCW
-						5pqnOi9PIkOlE6R66aTytHCMJeQCdlufJ3etaQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.camsfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.camsfc.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">Cheadle and Marple Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Cheadle and Marple College Network</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.camsfc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Bobby</GivenName>
-    <SurName>Ricardo</SurName>
-    <EmailAddress>mailto:Bobby.Ricardo@camsfc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Green</SurName>
-    <EmailAddress>mailto:Chris.Green@camsfc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Colin</GivenName>
-    <SurName>Thorley</SurName>
-    <EmailAddress>mailto:colin.thorley@camsfc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Green</SurName>
-    <EmailAddress>mailto:Chris.Green@camsfc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cancom.de.xml b/swamid-interfederations-2.0/shibboleth.cancom.de.xml
deleted file mode 100644
index b987ba71..00000000
--- a/swamid-interfederations-2.0/shibboleth.cancom.de.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.cancom.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.cancom.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.cancom.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.cancom.de,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)11,OU=GT43331679,O=shibboleth.cancom.de,C=DE,serialNumber=F4dXwt5ugAu7e7Ltux5s8bM/j7lNMezn</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE3DCCA8SgAwIBAgICSoEwDQYJKoZIhvcNAQEFBQAwPDELMAkGA1UEBhMCVVMx
-FzAVBgNVBAoTDkdlb1RydXN0LCBJbmMuMRQwEgYDVQQDEwtSYXBpZFNTTCBDQTAe
-Fw0xMTAxMDkxNDQ0NDhaFw0xMzAxMTEyMzI1MDZaMIHvMSkwJwYDVQQFEyBGNGRY
-d3Q1dWdBdTdlN0x0dXg1czhiTS9qN2xOTWV6bjELMAkGA1UEBhMCREUxHTAbBgNV
-BAoTFHNoaWJib2xldGguY2FuY29tLmRlMRMwEQYDVQQLEwpHVDQzMzMxNjc5MTEw
-LwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNvbS9yZXNvdXJjZXMvY3BzIChjKTEx
-MS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQgLSBSYXBpZFNTTChS
-KTEdMBsGA1UEAxMUc2hpYmJvbGV0aC5jYW5jb20uZGUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDVmUFYIEL9UJy4KuViBxD0czaGIe0/NPBHBslPike2
-kEnkayjIDKq9VKM2qmTVWud2Zz7lDicCbZe7CQ8bcPYSV0I8temTV2qZRXKIfYa7
-JXSdwLPlN8hgBRAXlrKnlvyeVLfohPq5/dW5sXmK5DJsAU5vIG7y2uT24MRJfN3U
-39iP2B2zy7uo/q5aCutrIphnhHGjFv3ZiIS4UNHUA+rj4mjPVWxc7p7wko0XteQg
-9qmH/Ec+hIBdRWNaMwgjkvlsrHwaMpXm0d4WZZ9Alo0OeEN9LgGGSZzkrLJlEXgz
-CGOVxgWuZV/w1CD7QkxB0Mb2yFzdyYP1slEGDLbJhvopAgMBAAGjggEyMIIBLjAf
-BgNVHSMEGDAWgBRraT1qGEJK3Y8CZTn9NSSGeJEWMDAOBgNVHQ8BAf8EBAMCBaAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdEQQYMBaCFHNoaWJi
-b2xldGguY2FuY29tLmRlMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNz
-bC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBQq
-xzB+sSIJfDxj6RHC/lXqvkg/fDAMBgNVHRMBAf8EAjAAMEkGCCsGAQUFBwEBBD0w
-OzA5BggrBgEFBQcwAoYtaHR0cDovL3JhcGlkc3NsLWFpYS5nZW90cnVzdC5jb20v
-cmFwaWRzc2wuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQAGgTC+pETyFmjT3Kt/wx7q
-QGUGWbqaWCmzYgStsEnDxWyZbUc6rMq7W6TVFSkahKYtBMTo3FWRRwp2htzOGeET
-1oUft7RiLAA3wVoT9u+rqICDerohrptv1eL9hcgzfxb61b71KfRqmWjgFHijQSY8
-1NAzSDDSCHpGtc3ezlDSKDOkNEob6gyKqCIcl07/FSvJ5RdYg//Eot6KgHHL/bNZ
-eJur9jqTlpTnC3jbRKS5CFQyW1A7nuO5qS7754LYipej85P3/KBgK8/YkOotHxyY
-vWiel2Ikzc/M5wNfxh5dHOxvy/vi09ktSrrgoS10Z/x8Q+ulyBYGJpcmPO0FkSHZ
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cancom.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cancom.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cancom.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cancom.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cancom.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cancom.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cancom.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cancom.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.cancom.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Cancom Deutschland GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Cancom Deutschland GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.cancom.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Florian</GivenName>
-    <SurName>Schneider</SurName>
-    <EmailAddress>florian.schneider@cancom.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Felicia</GivenName>
-    <SurName>Henkel</SurName>
-    <EmailAddress>felicia.henkel@cancom.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.carshalton.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.carshalton.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b9932ea9..00000000
--- a/swamid-interfederations-2.0/shibboleth.carshalton.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://shibboleth.carshalton.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Carshalton College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-11T09:15:13Z">
-      <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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Carshalton College UK</mdui:DisplayName>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carshalton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWDCCAkCgAwIBAgIVAK9zq/AGPCsO/yVh6eCXxG1GorxSMA0GCSqGSIb3DQEB
-						BQUAMCYxJDAiBgNVBAMMG3NoaWJib2xldGguY2Fyc2hhbHRvbi5hYy51azAeFw0x
-						NTAzMjAyMTE0MjlaFw0zNTAzMjAyMTE0MjlaMCYxJDAiBgNVBAMMG3NoaWJib2xl
-						dGguY2Fyc2hhbHRvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMhqQcCsuNuhtnmSRMeocTutCXZkgaYK93fHH6k6jyS3GWlfhpIJisUt4oWH
-						QBOFIDjWEFiLh78QatyTEzsJ3sCn/K65j69jEY4AlXFhYLw7Kva+3WOXNGvrxC3X
-						hW1BbBmowXIs3J5b12huosQH6NR1/7jrZzPxAqtCexmdkmsnkAZdR1BoahuVH5AU
-						UcLt70qKKFtP4sNLipZFfij9/voYTefD4+f7qejxjAOGPspDKBy71SJGIn1lAMKa
-						EPzBBjUUpXIa4f+LK38ccUtJFbA6+sBzrBEgw4YVTIG919bdtdC6fVsL65gAlZes
-						m/EeCZiPAVVzkyrA6MDB3EkM5tcCAwEAAaN9MHswHQYDVR0OBBYEFE69ioHDWu+y
-						CvMQGnbrcXvrL4GtMFoGA1UdEQRTMFGCG3NoaWJib2xldGguY2Fyc2hhbHRvbi5h
-						Yy51a4YyaHR0cHM6Ly9zaGliYm9sZXRoLmNhcnNoYWx0b24uYWMudWsvaWRwL3No
-						aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBACsQILUEknK3w+OYS+nsR8bwaQ1t
-						1cFIn13TU4uL0wk+ZqycRZb9FQHgmDwZC550m7XEuT8QJLuS5kA2XulJ+HzD3G5Z
-						RLLZ7lHtsLcMI6+w8B414dR2oNCA4C1whGVOC9MVHE3JYRcXqR2c1gAEA1UdFCyH
-						X77FHhdWlqqEsZOP+RfYy6pCd7w6KEh1/zMr+rAQhOcr8JzKPHpu3ejGQn0cPZ5C
-						TvmDIyDspkoPMxW1M2dUl+g+nIZSqY1gUKdE+4wgvWZ64giL4VqmqsCpf1WmQuok
-						aZ/E2PZAbR5KW3lPYXM3YF/ym2KBQM0F95HSTqAYWjiMbSVoBVhvRDtt+u0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.carshalton.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://shibboleth.carshalton.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.carshalton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.carshalton.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">carshalton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWDCCAkCgAwIBAgIVAK9zq/AGPCsO/yVh6eCXxG1GorxSMA0GCSqGSIb3DQEB
-						BQUAMCYxJDAiBgNVBAMMG3NoaWJib2xldGguY2Fyc2hhbHRvbi5hYy51azAeFw0x
-						NTAzMjAyMTE0MjlaFw0zNTAzMjAyMTE0MjlaMCYxJDAiBgNVBAMMG3NoaWJib2xl
-						dGguY2Fyc2hhbHRvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMhqQcCsuNuhtnmSRMeocTutCXZkgaYK93fHH6k6jyS3GWlfhpIJisUt4oWH
-						QBOFIDjWEFiLh78QatyTEzsJ3sCn/K65j69jEY4AlXFhYLw7Kva+3WOXNGvrxC3X
-						hW1BbBmowXIs3J5b12huosQH6NR1/7jrZzPxAqtCexmdkmsnkAZdR1BoahuVH5AU
-						UcLt70qKKFtP4sNLipZFfij9/voYTefD4+f7qejxjAOGPspDKBy71SJGIn1lAMKa
-						EPzBBjUUpXIa4f+LK38ccUtJFbA6+sBzrBEgw4YVTIG919bdtdC6fVsL65gAlZes
-						m/EeCZiPAVVzkyrA6MDB3EkM5tcCAwEAAaN9MHswHQYDVR0OBBYEFE69ioHDWu+y
-						CvMQGnbrcXvrL4GtMFoGA1UdEQRTMFGCG3NoaWJib2xldGguY2Fyc2hhbHRvbi5h
-						Yy51a4YyaHR0cHM6Ly9zaGliYm9sZXRoLmNhcnNoYWx0b24uYWMudWsvaWRwL3No
-						aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBACsQILUEknK3w+OYS+nsR8bwaQ1t
-						1cFIn13TU4uL0wk+ZqycRZb9FQHgmDwZC550m7XEuT8QJLuS5kA2XulJ+HzD3G5Z
-						RLLZ7lHtsLcMI6+w8B414dR2oNCA4C1whGVOC9MVHE3JYRcXqR2c1gAEA1UdFCyH
-						X77FHhdWlqqEsZOP+RfYy6pCd7w6KEh1/zMr+rAQhOcr8JzKPHpu3ejGQn0cPZ5C
-						TvmDIyDspkoPMxW1M2dUl+g+nIZSqY1gUKdE+4wgvWZ64giL4VqmqsCpf1WmQuok
-						aZ/E2PZAbR5KW3lPYXM3YF/ym2KBQM0F95HSTqAYWjiMbSVoBVhvRDtt+u0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.carshalton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.carshalton.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">Carshalton College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Carshalton College UK</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.carshalton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpline</GivenName>
-    <EmailAddress>mailto:helpline@carshalton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpline</GivenName>
-    <EmailAddress>mailto:helpline@carshalton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cavc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index a0192cff..00000000
--- a/swamid-interfederations-2.0/shibboleth.cavc.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://shibboleth.cavc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Cardiff and Vale College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-13T15:08:56Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">cavc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUH99VjfXgjcBNReQ0wEed9egxoRQwDQYJKoZIhvcNAQEF
-						BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5jYXZjLmFjLnVrMB4XDTEzMDgwNjEw
-						MzcxM1oXDTMzMDgwNjEwMzcxM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5jYXZj
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzHe0UQloxGjG
-						ZSgJRA29yJy7PZGb8Dnt4+BvZfJUZN2Pyo2MzXgDzDN1XuX+STZboJJDF5O/yzsH
-						HHk//noti8fyc5HcZrFUj8fkqtHgOlqwWCootKydYBdqxDY7V6RCZIcFXUf9INfQ
-						Lw49oTnTGBD82+q4QCNq3vU4xVosiyz2MOMcK8bka4QIThU0u9JeKd3e93/jWWhj
-						ccuPzn/vplmhWlubEznTDRu2KEeJMy6mKl1srJYvur+iQitTVZgb3tn4wLG2AWve
-						NTZ0oSh71IsHtx/utcFuKUHbILjWaw/6QQNhIoTCwrB8ADclhsZnxbMUEDUXJcMB
-						YbEH7f9B4QIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmNhdmMuYWMu
-						dWuGLGh0dHBzOi8vc2hpYmJvbGV0aC5jYXZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MB0GA1UdDgQWBBRy33u71EP4CwAaRU0KGQfUaXZUTTANBgkqhkiG9w0BAQUFAAOC
-						AQEAIcImOx9qUjZJEeywXVQfG4LLMWVAfwWa/kaa99HgSkiP+I1ZyYszSP7uq08X
-						6ZCmuNuKnmFPdvcXlRmXtDnIJAxGzUnz7MmxZQM33oI9SCmMpjZs8hAGM/rv4umc
-						jv2oS0AuPs4zUKf+FtlkLozX/MLYFWGA1k2DWkMpX0NhkO6x/2L0U7R80KEV7kjt
-						S3mGmEvdiB1r5NGqANDV0tnMuBTD8QZ1QJk4ysLfZlB/OuMcqyNX5ltn2B0DCO00
-						SMLkcYgNqvg8nqco5vKv6v9pkdh1MV40pOAWeaHT1FHJGW2UhuZpwK4MbbChbev2
-						oBcKoqYIcHYU0kK+KQpGb6qBIw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cavc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cavc.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://shibboleth.cavc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cavc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cavc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cavc.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">cavc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUH99VjfXgjcBNReQ0wEed9egxoRQwDQYJKoZIhvcNAQEF
-						BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5jYXZjLmFjLnVrMB4XDTEzMDgwNjEw
-						MzcxM1oXDTMzMDgwNjEwMzcxM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5jYXZj
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzHe0UQloxGjG
-						ZSgJRA29yJy7PZGb8Dnt4+BvZfJUZN2Pyo2MzXgDzDN1XuX+STZboJJDF5O/yzsH
-						HHk//noti8fyc5HcZrFUj8fkqtHgOlqwWCootKydYBdqxDY7V6RCZIcFXUf9INfQ
-						Lw49oTnTGBD82+q4QCNq3vU4xVosiyz2MOMcK8bka4QIThU0u9JeKd3e93/jWWhj
-						ccuPzn/vplmhWlubEznTDRu2KEeJMy6mKl1srJYvur+iQitTVZgb3tn4wLG2AWve
-						NTZ0oSh71IsHtx/utcFuKUHbILjWaw/6QQNhIoTCwrB8ADclhsZnxbMUEDUXJcMB
-						YbEH7f9B4QIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmNhdmMuYWMu
-						dWuGLGh0dHBzOi8vc2hpYmJvbGV0aC5jYXZjLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MB0GA1UdDgQWBBRy33u71EP4CwAaRU0KGQfUaXZUTTANBgkqhkiG9w0BAQUFAAOC
-						AQEAIcImOx9qUjZJEeywXVQfG4LLMWVAfwWa/kaa99HgSkiP+I1ZyYszSP7uq08X
-						6ZCmuNuKnmFPdvcXlRmXtDnIJAxGzUnz7MmxZQM33oI9SCmMpjZs8hAGM/rv4umc
-						jv2oS0AuPs4zUKf+FtlkLozX/MLYFWGA1k2DWkMpX0NhkO6x/2L0U7R80KEV7kjt
-						S3mGmEvdiB1r5NGqANDV0tnMuBTD8QZ1QJk4ysLfZlB/OuMcqyNX5ltn2B0DCO00
-						SMLkcYgNqvg8nqco5vKv6v9pkdh1MV40pOAWeaHT1FHJGW2UhuZpwK4MbbChbev2
-						oBcKoqYIcHYU0kK+KQpGb6qBIw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cavc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cavc.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 and Vale College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff and Vale College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cavc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Evan</GivenName>
-    <SurName>Davies</SurName>
-    <EmailAddress>mailto:EDavies@cavc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Evan</GivenName>
-    <SurName>Davies</SurName>
-    <EmailAddress>mailto:EDavies@cavc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml
deleted file mode 100644
index 029c28c0..00000000
--- a/swamid-interfederations-2.0/shibboleth.cbpf.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://shibboleth.cbpf.br/idp/shibboleth">
-  <md: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>
-  </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">cbpf.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:Description>
-        <mdui:Description xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://portal.cbpf.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://portal.cbpf.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxNjA0BgNVBAoTLUNCUEYgLSBD
-ZW50cm8gQnJhc2lsZWlybyBkZSBQZXNxdWlzYXMgRmlzaWNhczEMMAoGA1UECxMD
-Q0FUMRwwGgYJKoZIhvcNAQkBFg1sYW5uYUBjYnBmLmJyMRcwFQYDVQQHEw5SaW8g
-ZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJBgNVBAYTAkJS
-MRswGQYDVQQDExJzaGliYm9sZXRoLmNicGYuYnIwHhcNMTUxMDE2MTQxOTE3WhcN
-MTgxMDE1MTQxOTE3WjCBwDE2MDQGA1UEChMtQ0JQRiAtIENlbnRybyBCcmFzaWxl
-aXJvIGRlIFBlc3F1aXNhcyBGaXNpY2FzMQwwCgYDVQQLEwNDQVQxHDAaBgkqhkiG
-9w0BCQEWDWxhbm5hQGNicGYuYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcw
-FQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxGzAZBgNVBAMTEnNo
-aWJib2xldGguY2JwZi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AOP5KsReKesB+mSCPtKECtbEHR4HmL5nDtsirSweQs/0B91kQoYgNl7AMpmOt25p
-sGrWAF8poXJIZsFnVeFPRxXxamtOsbsmCNc5RFipG7ZNpnJEmH+TFVAFfBzav/xj
-hH0RQPGJ2CxGBxeS+zY6GzKqlKRCNTP0uud/dVeVw2A17FNJbOA7kEucrhVyxI1D
-7nOrYuMmL4H84Pe7SpXHWpdEZaiiuvbSW1XM+mHNlvBDNOWLilTB+LP7Xjq7Fpjr
-XTGvJ+zKL9SMEOnn8lc/6Iszu4ffg0S5xbJ+wwqBND2SLNxvJQtF9Ee3b/KjA2AI
-MRc4ZZ8eQZq4RKD65BBW7zkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlbBD9rz1
-TZSKOHEkt0TwLnhlwKJBqAQYrhr4kMeJdEmnQszWYNPmTnuaJ7byo0U95g9mJDRm
-qS+tX+qIOv/ds9qKY9bEXZOGKMo0srgMWaKufEOegxaZkP6x3nhCB6DzEmXuMVg+
-1HDGoHIZJuDZpXEE3Hdu1KiuQFhmcnO5MQ99WoMI3+Vy36Wrm/mdhyplkLTb1S3S
-mtit3VgXMl3KNv9IcRISBY9oyZdOTzHP/676+HwNYB888FApyKlmLnTvMtxCwuI8
-p2bQTau4MNCPHLB6bYabI5bb21dowUM2UHgRMMQ3KtX9QADp8jQquqO10GIciPe4
-XQmKkysRlE2Thg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://shibboleth.cbpf.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cbpf.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cbpf.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cbpf.br/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">cbpf.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID9jCCAt4CAQAwDQYJKoZIhvcNAQEFBQAwgcAxNjA0BgNVBAoTLUNCUEYgLSBD
-ZW50cm8gQnJhc2lsZWlybyBkZSBQZXNxdWlzYXMgRmlzaWNhczEMMAoGA1UECxMD
-Q0FUMRwwGgYJKoZIhvcNAQkBFg1sYW5uYUBjYnBmLmJyMRcwFQYDVQQHEw5SaW8g
-ZGUgSmFuZWlybzEXMBUGA1UECBMOUmlvIGRlIEphbmVpcm8xCzAJBgNVBAYTAkJS
-MRswGQYDVQQDExJzaGliYm9sZXRoLmNicGYuYnIwHhcNMTUxMDE2MTQxOTE3WhcN
-MTgxMDE1MTQxOTE3WjCBwDE2MDQGA1UEChMtQ0JQRiAtIENlbnRybyBCcmFzaWxl
-aXJvIGRlIFBlc3F1aXNhcyBGaXNpY2FzMQwwCgYDVQQLEwNDQVQxHDAaBgkqhkiG
-9w0BCQEWDWxhbm5hQGNicGYuYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcw
-FQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxGzAZBgNVBAMTEnNo
-aWJib2xldGguY2JwZi5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AOP5KsReKesB+mSCPtKECtbEHR4HmL5nDtsirSweQs/0B91kQoYgNl7AMpmOt25p
-sGrWAF8poXJIZsFnVeFPRxXxamtOsbsmCNc5RFipG7ZNpnJEmH+TFVAFfBzav/xj
-hH0RQPGJ2CxGBxeS+zY6GzKqlKRCNTP0uud/dVeVw2A17FNJbOA7kEucrhVyxI1D
-7nOrYuMmL4H84Pe7SpXHWpdEZaiiuvbSW1XM+mHNlvBDNOWLilTB+LP7Xjq7Fpjr
-XTGvJ+zKL9SMEOnn8lc/6Iszu4ffg0S5xbJ+wwqBND2SLNxvJQtF9Ee3b/KjA2AI
-MRc4ZZ8eQZq4RKD65BBW7zkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAlbBD9rz1
-TZSKOHEkt0TwLnhlwKJBqAQYrhr4kMeJdEmnQszWYNPmTnuaJ7byo0U95g9mJDRm
-qS+tX+qIOv/ds9qKY9bEXZOGKMo0srgMWaKufEOegxaZkP6x3nhCB6DzEmXuMVg+
-1HDGoHIZJuDZpXEE3Hdu1KiuQFhmcnO5MQ99WoMI3+Vy36Wrm/mdhyplkLTb1S3S
-mtit3VgXMl3KNv9IcRISBY9oyZdOTzHP/676+HwNYB888FApyKlmLnTvMtxCwuI8
-p2bQTau4MNCPHLB6bYabI5bb21dowUM2UHgRMMQ3KtX9QADp8jQquqO10GIciPe4
-XQmKkysRlE2Thg==
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cbpf.br:8443/idp/profile/SAML1/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">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">CBPF - Centro Brasileiro de Pesquisas Fisicas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://portal.cbpf.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://portal.cbpf.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Orlanna Oliveira</md:SurName>
-    <md:EmailAddress>lanna@cbpf.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml
deleted file mode 100644
index 123b7bfe..00000000
--- a/swamid-interfederations-2.0/shibboleth.cefet-rj.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +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://shibboleth.cefet-rj.br/idp/shibboleth">
-  <md: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>
-  </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">cefet-rj.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:Description>
-        <mdui:Description xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cefet-rj.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.cefet-rj.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIELDCCAxQCAQAwDQYJKoZIhvcNAQEFBQAwgdsxRzBFBgNVBAoUPkNlbnRybyBG
-ZWRlcmFsIGRlIEVkdWNh5+NvIFRlY25vbPNnaWNhIENlbHNvIFN1Y2tvdyBkYSBG
-b25zZWNhMQ4wDAYDVQQLEwVEVElORjEgMB4GCSqGSIb3DQEJARYRZHRpbmZAY2Vm
-ZXQtcmouYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8g
-ZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xldGguY2Vm
-ZXQtcmouYnIwHhcNMTUxMDIzMTQxMjM5WhcNMTgxMDIyMTQxMjM5WjCB2zFHMEUG
-A1UEChQ+Q2VudHJvIEZlZGVyYWwgZGUgRWR1Y2Hn428gVGVjbm9s82dpY2EgQ2Vs
-c28gU3Vja293IGRhIEZvbnNlY2ExDjAMBgNVBAsTBURUSU5GMSAwHgYJKoZIhvcN
-AQkBFhFkdGluZkBjZWZldC1yai5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMW
-c2hpYmJvbGV0aC5jZWZldC1yai5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKAHz/3nFY8T9shurcbmk+DAaA5pUY28eCmtYLHygAZ2Dz2qdJcsWY0U
-1WjWzoxlaXIjRSffiG1xrq/BMxHppGo8qrGdbi34T9989eCJ5AMesoyVj3qy3nQe
-F08mdE2gKeq8ZN+kRpVNEH6rkJzdH06hrgtvHNrnPtsnWuuo+kK2G53vbD+/O+Yb
-EYEPOyZI0poLYhsFR+qBMLMxo/Kfu9cfWsVixYmPHFnqiF0HiwElX9cEB1YqH+xN
-mvfs8aa4sqY05IYhOmOZXQbn8GmV6m1KNglUQbwuq7cMWwi82qo8Nb8bh+NH0Jxw
-J1tY4db/G0EBpWrBcu2Q4qR4EKfaLfkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-mogHpnDhhAruiF2aQQiLp216GJ4XM6ZmlqPq5q8s8r59pfNO+9Ork/AHZR8Z/Hkp
-Dkfoso1qkYAbpNDdiGt4vleUfCHdHoq2N3SG/tYKatx/ozp7L/PWSXBy+C4GT6u+
-m1mKJBRLjIPxc3jYovdSBJDvTwWzT16Jh4xls+mHXK2NQtObPIAMjkFUYZKYNFTf
-6Pk43YzySIldWH8zQk+7T1sucVAgV/C5qw4BlJdywX6xBSjG0KoX6xsClgdsjuuU
-ed0HOE+rbfcdak8uDdywV4Fqbi6IkKGo/mTO/OImm9aMqHMoG05HzRFDqPjn3Uv8
-fVFA8m9TqEvrRbsw1wmqyg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://shibboleth.cefet-rj.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cefet-rj.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cefet-rj.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cefet-rj.br/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">cefet-rj.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIELDCCAxQCAQAwDQYJKoZIhvcNAQEFBQAwgdsxRzBFBgNVBAoUPkNlbnRybyBG
-ZWRlcmFsIGRlIEVkdWNh5+NvIFRlY25vbPNnaWNhIENlbHNvIFN1Y2tvdyBkYSBG
-b25zZWNhMQ4wDAYDVQQLEwVEVElORjEgMB4GCSqGSIb3DQEJARYRZHRpbmZAY2Vm
-ZXQtcmouYnIxFzAVBgNVBAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8g
-ZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xldGguY2Vm
-ZXQtcmouYnIwHhcNMTUxMDIzMTQxMjM5WhcNMTgxMDIyMTQxMjM5WjCB2zFHMEUG
-A1UEChQ+Q2VudHJvIEZlZGVyYWwgZGUgRWR1Y2Hn428gVGVjbm9s82dpY2EgQ2Vs
-c28gU3Vja293IGRhIEZvbnNlY2ExDjAMBgNVBAsTBURUSU5GMSAwHgYJKoZIhvcN
-AQkBFhFkdGluZkBjZWZldC1yai5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
-FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjEfMB0GA1UEAxMW
-c2hpYmJvbGV0aC5jZWZldC1yai5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKAHz/3nFY8T9shurcbmk+DAaA5pUY28eCmtYLHygAZ2Dz2qdJcsWY0U
-1WjWzoxlaXIjRSffiG1xrq/BMxHppGo8qrGdbi34T9989eCJ5AMesoyVj3qy3nQe
-F08mdE2gKeq8ZN+kRpVNEH6rkJzdH06hrgtvHNrnPtsnWuuo+kK2G53vbD+/O+Yb
-EYEPOyZI0poLYhsFR+qBMLMxo/Kfu9cfWsVixYmPHFnqiF0HiwElX9cEB1YqH+xN
-mvfs8aa4sqY05IYhOmOZXQbn8GmV6m1KNglUQbwuq7cMWwi82qo8Nb8bh+NH0Jxw
-J1tY4db/G0EBpWrBcu2Q4qR4EKfaLfkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-mogHpnDhhAruiF2aQQiLp216GJ4XM6ZmlqPq5q8s8r59pfNO+9Ork/AHZR8Z/Hkp
-Dkfoso1qkYAbpNDdiGt4vleUfCHdHoq2N3SG/tYKatx/ozp7L/PWSXBy+C4GT6u+
-m1mKJBRLjIPxc3jYovdSBJDvTwWzT16Jh4xls+mHXK2NQtObPIAMjkFUYZKYNFTf
-6Pk43YzySIldWH8zQk+7T1sucVAgV/C5qw4BlJdywX6xBSjG0KoX6xsClgdsjuuU
-ed0HOE+rbfcdak8uDdywV4Fqbi6IkKGo/mTO/OImm9aMqHMoG05HzRFDqPjn3Uv8
-fVFA8m9TqEvrRbsw1wmqyg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cefet-rj.br:8443/idp/profile/SAML1/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">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">CEFET/RJ - Centro Federal de Educacao Tecnologica Celso Suckow da Fonseca</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cefet-rj.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.cefet-rj.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Cesar Gama</md:SurName>
-    <md:EmailAddress>cesar.gama@cefet-rj.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml
deleted file mode 100644
index f1ec92fa..00000000
--- a/swamid-interfederations-2.0/shibboleth.cetem.gov.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://shibboleth.cetem.gov.br/idp/shibboleth">
-  <md: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>
-  </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">gov.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CETEM - Centro de Tecnologia Mineral</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CETEM - Centro de Tecnologia Mineral</mdui:Description>
-        <mdui:Description xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.cetem.gov.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.cetem.gov.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEBDCCAuwCAQAwDQYJKoZIhvcNAQEFBQAwgccxLTArBgNVBAoTJENFVEVNIC0g
-Q2VudHJvIGRlIFRlY25vbG9naWEgTWluZXJhbDENMAsGA1UECxMEU0VJTjEmMCQG
-CSqGSIb3DQEJARYXc2Vpbi1yZWRlc0BjZXRlbS5nb3YuYnIxFzAVBgNVBAcTDlJp
-byBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMC
-QlIxIDAeBgNVBAMTF3NoaWJib2xldGguY2V0ZW0uZ292LmJyMB4XDTE1MTAxNDE5
-MTYzNFoXDTE4MTAxMzE5MTYzNFowgccxLTArBgNVBAoTJENFVEVNIC0gQ2VudHJv
-IGRlIFRlY25vbG9naWEgTWluZXJhbDENMAsGA1UECxMEU0VJTjEmMCQGCSqGSIb3
-DQEJARYXc2Vpbi1yZWRlc0BjZXRlbS5nb3YuYnIxFzAVBgNVBAcTDlJpbyBkZSBK
-YW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxIDAe
-BgNVBAMTF3NoaWJib2xldGguY2V0ZW0uZ292LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwLmjjlh/U5GsJ0NxjhR7gJfPrruNYnK+Cb0xCorpbUkX
-oxK6X36ZNEi2Rut6Y3gEsYeFCjFKJLLtFDpG8Snm6hzYXe3L0U6Q84CcxoYWcfvY
-OnM1mivtpc0yl3iPEAUd5AFcox/sNSbkGtDjkbX86h9b7+BFvnT5UZyZChg81Ppf
-+DuuEQ0HVxTs3cpxg/Vhh7dF6kHOpzaJXdUJHq+f2O/u7c0doSBW6MNY+a8cJM3N
-Q3yNY7cEaW3e1o5yBVknFIJu8k210p7XiTaF7c9szVqQ41c3eQAB0okYXizG2H0w
-Ovd/QTCOaHyEkc+TvxYByaoUgkWtWjUN0jyYHVBFcwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCsJrZ+1CKqTJhW7oU/tU/MC6QyvR2RoM9dl3NrdWOkSDMCRqIl+hDM
-zioi+xvYJN8RTthdTLNhkF2dge+yR2mLoneF++Pi+X0xR3lubowGiCLLiGfa0i+U
-X/LeJUPON+bX7NbbXdtM6nUxiLd0lAxjScOpY+NAwvCswM+xHfHZG2ehxgvAV5gc
-BHl7OWkgGmgUWrtS1JRBpYxRbnhlOGngoLVrzmBhCo5eCrWLp2hb2whzDuu8if/1
-d5oA+IrrKlrbLyUsagA3Zb6lakPsmZNayxV+GBi5QdEEzQQ/9xet0Ugq1R0P7u6x
-iEcPQigOKOCHgUO5rjTwYd5NkRpzYgnw
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://shibboleth.cetem.gov.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cetem.gov.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cetem.gov.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cetem.gov.br/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">gov.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEBDCCAuwCAQAwDQYJKoZIhvcNAQEFBQAwgccxLTArBgNVBAoTJENFVEVNIC0g
-Q2VudHJvIGRlIFRlY25vbG9naWEgTWluZXJhbDENMAsGA1UECxMEU0VJTjEmMCQG
-CSqGSIb3DQEJARYXc2Vpbi1yZWRlc0BjZXRlbS5nb3YuYnIxFzAVBgNVBAcTDlJp
-byBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMC
-QlIxIDAeBgNVBAMTF3NoaWJib2xldGguY2V0ZW0uZ292LmJyMB4XDTE1MTAxNDE5
-MTYzNFoXDTE4MTAxMzE5MTYzNFowgccxLTArBgNVBAoTJENFVEVNIC0gQ2VudHJv
-IGRlIFRlY25vbG9naWEgTWluZXJhbDENMAsGA1UECxMEU0VJTjEmMCQGCSqGSIb3
-DQEJARYXc2Vpbi1yZWRlc0BjZXRlbS5nb3YuYnIxFzAVBgNVBAcTDlJpbyBkZSBK
-YW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkGA1UEBhMCQlIxIDAe
-BgNVBAMTF3NoaWJib2xldGguY2V0ZW0uZ292LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwLmjjlh/U5GsJ0NxjhR7gJfPrruNYnK+Cb0xCorpbUkX
-oxK6X36ZNEi2Rut6Y3gEsYeFCjFKJLLtFDpG8Snm6hzYXe3L0U6Q84CcxoYWcfvY
-OnM1mivtpc0yl3iPEAUd5AFcox/sNSbkGtDjkbX86h9b7+BFvnT5UZyZChg81Ppf
-+DuuEQ0HVxTs3cpxg/Vhh7dF6kHOpzaJXdUJHq+f2O/u7c0doSBW6MNY+a8cJM3N
-Q3yNY7cEaW3e1o5yBVknFIJu8k210p7XiTaF7c9szVqQ41c3eQAB0okYXizG2H0w
-Ovd/QTCOaHyEkc+TvxYByaoUgkWtWjUN0jyYHVBFcwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQCsJrZ+1CKqTJhW7oU/tU/MC6QyvR2RoM9dl3NrdWOkSDMCRqIl+hDM
-zioi+xvYJN8RTthdTLNhkF2dge+yR2mLoneF++Pi+X0xR3lubowGiCLLiGfa0i+U
-X/LeJUPON+bX7NbbXdtM6nUxiLd0lAxjScOpY+NAwvCswM+xHfHZG2ehxgvAV5gc
-BHl7OWkgGmgUWrtS1JRBpYxRbnhlOGngoLVrzmBhCo5eCrWLp2hb2whzDuu8if/1
-d5oA+IrrKlrbLyUsagA3Zb6lakPsmZNayxV+GBi5QdEEzQQ/9xet0Ugq1R0P7u6x
-iEcPQigOKOCHgUO5rjTwYd5NkRpzYgnw
-                          
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cetem.gov.br:8443/idp/profile/SAML1/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">CETEM - Centro de Tecnologia Mineral</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CETEM - Centro de Tecnologia Mineral</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">CETEM - Centro de Tecnologia Mineral</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cetem.gov.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.cetem.gov.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Carlos Silva</md:SurName>
-    <md:EmailAddress>sein-redes@cetem.gov.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.chadwyck.co.uk.xml b/swamid-interfederations-2.0/shibboleth.chadwyck.co.uk.xml
deleted file mode 100644
index 23dfa436..00000000
--- a/swamid-interfederations-2.0/shibboleth.chadwyck.co.uk.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.chadwyck.co.uk/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.chadwyck.co.uk</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.chadwyck.co.uk,O=ProQuest Information and Learning Limited,L=Cambridge,ST=Cambridgeshire,C=GB</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEnDCCA4SgAwIBAgILAQAAAAABI/DCPAcwDQYJKoZIhvcNAQEFBQAwajEjMCEG
-A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
-bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
-b24gQ0EwHhcNMDkwOTI1MDk1MzE5WhcNMTIxMTAxMTYwOTE4WjCBkjELMAkGA1UE
-BhMCR0IxFzAVBgNVBAgTDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHEwlDYW1icmlk
-Z2UxMjAwBgNVBAoTKVByb1F1ZXN0IEluZm9ybWF0aW9uIGFuZCBMZWFybmluZyBM
-aW1pdGVkMSIwIAYDVQQDExlzaGliYm9sZXRoLmNoYWR3eWNrLmNvLnVrMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtW217damatpxJwqauGW5Kqa1WDMDOA0KA
-34xyHCTvdM2+0aAVUcS4ZZMKhLPvthg1P//KKf4dtx1vGEzooP8+hWuXzI9UuWKI
-4Dl/D1f1u5/VAEED3bxUwRz/8AzoaBq8oY0tNNL0c6zgoXN39J6PhWlttj+x6zW5
-6xh+/H4S/QIDAQABo4IBnDCCAZgwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCP
-xFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJl
-Lmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKg
-MIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNy
-bDAdBgNVHQ4EFgQUbat6c5ScZ0QrN02tC56CBvLjMbQwCQYDVR0TBAIwADAOBgNV
-HQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEE
-AYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0
-dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEB
-BAQDAgbAMCQGA1UdEQQdMBuCGXNoaWJib2xldGguY2hhZHd5Y2suY28udWswDQYJ
-KoZIhvcNAQEFBQADggEBAABjzNx5LCTEC4PYuXKnKZQvNE7uujnj2Sm1VOVGm9eW
-hEYcsrr9vtShzV6CsgJmmJkKgLHsjlpnEWbW6SqOcrcaqESaoyQhlPO3CfhpE6RG
-aJ2SKVCnwlMbSkFcBU1BbsONU2Ts8FATa/6gHoE4l7Z4mrBW+9Ix2W3jUdaRx/fS
-4lkh5B3buICF0471+lSgz3v6cca7pSlKlA1B9daQ23E+BraI0Z8gQvfT/S+b3/rA
-5K5Piut1UOW9DuIOjBakK2CUlogDfkVmz5kU3neUise6ZyG8wcqedXMN5sS39KDw
-YiDXJy2+KavxQS92ILmKrMPa97JkJOw5tLLqojVxJbM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.chadwyck.co.uk</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.chadwyck.co.uk,O=ProQuest Information and Learning Limited,L=Cambridge,ST=Cambridgeshire,C=GB</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEnDCCA4SgAwIBAgILAQAAAAABI/DCPAcwDQYJKoZIhvcNAQEFBQAwajEjMCEG
-A1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2Jh
-bFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRp
-b24gQ0EwHhcNMDkwOTI1MDk1MzE5WhcNMTIxMTAxMTYwOTE4WjCBkjELMAkGA1UE
-BhMCR0IxFzAVBgNVBAgTDkNhbWJyaWRnZXNoaXJlMRIwEAYDVQQHEwlDYW1icmlk
-Z2UxMjAwBgNVBAoTKVByb1F1ZXN0IEluZm9ybWF0aW9uIGFuZCBMZWFybmluZyBM
-aW1pdGVkMSIwIAYDVQQDExlzaGliYm9sZXRoLmNoYWR3eWNrLmNvLnVrMIGfMA0G
-CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtW217damatpxJwqauGW5Kqa1WDMDOA0KA
-34xyHCTvdM2+0aAVUcS4ZZMKhLPvthg1P//KKf4dtx1vGEzooP8+hWuXzI9UuWKI
-4Dl/D1f1u5/VAEED3bxUwRz/8AzoaBq8oY0tNNL0c6zgoXN39J6PhWlttj+x6zW5
-6xh+/H4S/QIDAQABo4IBnDCCAZgwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCP
-xFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJl
-Lmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKg
-MIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNy
-bDAdBgNVHQ4EFgQUbat6c5ScZ0QrN02tC56CBvLjMbQwCQYDVR0TBAIwADAOBgNV
-HQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEE
-AYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0
-dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEB
-BAQDAgbAMCQGA1UdEQQdMBuCGXNoaWJib2xldGguY2hhZHd5Y2suY28udWswDQYJ
-KoZIhvcNAQEFBQADggEBAABjzNx5LCTEC4PYuXKnKZQvNE7uujnj2Sm1VOVGm9eW
-hEYcsrr9vtShzV6CsgJmmJkKgLHsjlpnEWbW6SqOcrcaqESaoyQhlPO3CfhpE6RG
-aJ2SKVCnwlMbSkFcBU1BbsONU2Ts8FATa/6gHoE4l7Z4mrBW+9Ix2W3jUdaRx/fS
-4lkh5B3buICF0471+lSgz3v6cca7pSlKlA1B9daQ23E+BraI0Z8gQvfT/S+b3/rA
-5K5Piut1UOW9DuIOjBakK2CUlogDfkVmz5kU3neUise6ZyG8wcqedXMN5sS39KDw
-YiDXJy2+KavxQS92ILmKrMPa97JkJOw5tLLqojVxJbM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.chadwyck.co.uk/Shibboleth.sso/SAML/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">ProQuest (Chadwyck-Healey products)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ProQuest-Chadwyck-Healey</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.proquest.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Geoff</GivenName>
-    <SurName>Leach</SurName>
-    <EmailAddress>Geoff.Leach@proquest.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.clickview.co.uk-shibboleth.xml
deleted file mode 100644
index e610966b..00000000
--- a/swamid-interfederations-2.0/shibboleth.clickview.co.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://shibboleth.clickview.co.uk/shibboleth">
-  <!--
-		This is a 'ClickView Online' Shibboleth SP for ClickView Ltd.
-	-->
-  <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="2014-02-26T10:28:26Z">
-      <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://shibboleth.clickview.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://shibboleth.clickview.co.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://shibboleth.clickview.co.uk/Shibboleth.sso/TestShibLoginSahan"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ClickView</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ClickView is the market leader in digital video solutions for education</mdui:Description>
-        <mdui:Logo height="64" width="350">https://downloads.clickview.co.uk/www/images/Clickviewlogo350px.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC5TCCAc2gAwIBAgIJAPVbJWGWsfPlMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-						BAMTCmN2LXNoaWJiaWUwHhcNMTQwMjAzMjIzMjQ3WhcNMjQwMjAxMjIzMjQ3WjAV
-						MRMwEQYDVQQDEwpjdi1zaGliYmllMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAnV1dwqyl8MfIyVDZGPZRTmEeNsJrZzWY5wFR/35trfu2bfnjRyJuuKGZ
-						aMj90GOwidzqXbLxbgjwbUb6RuhvOoYUHTtyohu0CWBU3e/aU4G4Ls6BmikRHrSr
-						6aT6u4AFFf9v4yxO33ReJME++3wVVNPI5v+kb/MGc6FJ2PAjj4lyAetxciTFmgwq
-						GiuVPklxqCK/j0KrIeE284b7DsP5HpZYjiW4wRATPfRym86vxWwrWIlBM/xSYvb1
-						rnGImAhg0fxTQWteHkZKscBENZCGZl8GWF6NqzqeQcvqCZOBXMHXY3ct5+M/IaSJ
-						YcVg19SOyoyukEUjQzppN5zMvUMX7wIDAQABozgwNjAVBgNVHREEDjAMggpjdi1z
-						aGliYmllMB0GA1UdDgQWBBQxeZ/BBNNlmEB5ICBbpXjIjxUFmzANBgkqhkiG9w0B
-						AQUFAAOCAQEAjjtVTDqGA+4JL2WbtqFxubs2yWHLPgkKFHNZmdryZ9EX383Gs0Ca
-						3HrzTAkuJ9aZLDYdWbfxiSWePEcNYhnSKM1EmPo2BV3oVbtODDRJNcQC1fdHJHXJ
-						1RdFLgH0TlaYLT0JhwCO89P87JGP0+5toAe1opZW+nYI+AzNvq4m7IBovB92/GPq
-						iF49vK9SE3cKIQt+ICcLmrbU38hVtA6HDc0YxSC1CgGJOrx7RjG2+iwmcXCqnC7Y
-						qkdD2iAPnL0dvkY3D5snTUOl5b/1jyE7h4wCBCYTYQ2dBjPtdtcxRHUg1Lca0cFg
-						BGi6QxxdSG6OiTxeuWPZr3NkD4YI4RB0Yg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.clickview.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ClickView Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ClickView Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.clickview.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sahan</GivenName>
-    <SurName>Wimalasiri</SurName>
-    <EmailAddress>mailto:sahan.wimalasiri@clickview.com.au</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sahan</GivenName>
-    <SurName>Wimalasiri</SurName>
-    <EmailAddress>mailto:sahan.wimalasiri@clickview.com.au</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Newman</SurName>
-    <EmailAddress>mailto:chris.newman@clickview.co.uk</EmailAddress>
-  </ContactPerson>
-</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 ef3f7861..00000000
--- a/swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.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://shibboleth.cndp.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CNDP - Centre National de Documentation Pédagogique</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.cndp.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CNDP - Centre National de Documentation Pédagogique</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>
-					      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>
-    </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-POST" Location="https://shibboleth.cndp.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cndp.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.cndp.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CNDP - Centre National de Documentation Pédagogique</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CNDP - Centre National de Documentation Pédagogique</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cndp.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Alexandre LUCAS</md:SurName>
-    <md:EmailAddress>alexandre.lucas@cndp.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Simon BIGOT</md:SurName>
-    <md:EmailAddress>simon.bigot@cndp.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.coconino.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.coconino.edu-idp-shibboleth.xml
deleted file mode 100644
index c65aa797..00000000
--- a/swamid-interfederations-2.0/shibboleth.coconino.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +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://shibboleth.coconino.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://oldsite.coconino.edu/ssoerror/" 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">coconino.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Coconino County Community College</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>
-MIIDNjCCAh6gAwIBAgIVAPSwsQHYPvqzpEH56syv5GkMl9dXMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWlkcDEuY29jb25pbm8uZWR1MB4XDTE1MDkxNjIwNTMx
-NFoXDTM1MDkxNjIwNTMxNFowHDEaMBgGA1UEAwwRaWRwMS5jb2Nvbmluby5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx4DL5WzxN2n3gD8T919EG
-M9CxM4wBd4FOHjmHjMTnkISNLq2MrAbWB9czCftWATBGrckIhU77buZaGZWmx2R6
-oyB+lSYofWjNsRvrJLd+4imJVjNeDx+lax5VcNvqQIlbbAWLmlzeACeewdlMdva4
-SYjraXRCwKd/IGS0yCseTUEbgSg5sQK7Djz5igt4Ht2ew07wlsRSNoSp6Eks/6PM
-Ljrtzz5ZlRXrWWeN0ADyHw3qTBqmX29x/2HmFvC3MYjCQnd0zgzYEut3mPrbGrK7
-yKNjnEhWWk5lhgjx5E+jvz4uYjKA1T/MExKWo5zLZm2VVyiYkVnhNTV8hr49pmhn
-AgMBAAGjbzBtMB0GA1UdDgQWBBR5xizbzAvzExtWbk8fWLvAJOCLCTBMBgNVHREE
-RTBDghFpZHAxLmNvY29uaW5vLmVkdYYuaHR0cHM6Ly9zaGliYm9sZXRoLmNvY29u
-aW5vLmVkdS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAMdvaL82E
-76BsCWr+e+mW9UWIN3NFv0Hq8IXxU9ZAQGlwvBIGCQt6wNTpQQJLvH5Lvj4ZHUSz
-wLUguOoDJC3BPOAnZhL2uBDaUk36FhOR65CbBJ++yS57LdcCkN+zSigl9YN3WW/b
-zh4RGfmIbFYOWg6GRN8RDMsU5Yfb15veOElFFQW7p8I9EAJJNGUW27hDrL2sjrCD
-Q3rrWXbSexe8/ibVAXfQvNC8luMfCcPkgnMq3oQgfHeNbDAYVz9GM2Y5nIbNWizk
-G/8n5DP/9K8IsilSsISKTTkI3pdWsyCmHx+ejHkp9TtgZYTmgq3TDhHc8wsV8CMS
-A+Gg2c5GuR3TCg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.coconino.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.coconino.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.coconino.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.coconino.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.coconino.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.coconino.edu/idp/profile/SAML2/POST-SimpleSign/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">coconino.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNjCCAh6gAwIBAgIVAPSwsQHYPvqzpEH56syv5GkMl9dXMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWlkcDEuY29jb25pbm8uZWR1MB4XDTE1MDkxNjIwNTMx
-NFoXDTM1MDkxNjIwNTMxNFowHDEaMBgGA1UEAwwRaWRwMS5jb2Nvbmluby5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx4DL5WzxN2n3gD8T919EG
-M9CxM4wBd4FOHjmHjMTnkISNLq2MrAbWB9czCftWATBGrckIhU77buZaGZWmx2R6
-oyB+lSYofWjNsRvrJLd+4imJVjNeDx+lax5VcNvqQIlbbAWLmlzeACeewdlMdva4
-SYjraXRCwKd/IGS0yCseTUEbgSg5sQK7Djz5igt4Ht2ew07wlsRSNoSp6Eks/6PM
-Ljrtzz5ZlRXrWWeN0ADyHw3qTBqmX29x/2HmFvC3MYjCQnd0zgzYEut3mPrbGrK7
-yKNjnEhWWk5lhgjx5E+jvz4uYjKA1T/MExKWo5zLZm2VVyiYkVnhNTV8hr49pmhn
-AgMBAAGjbzBtMB0GA1UdDgQWBBR5xizbzAvzExtWbk8fWLvAJOCLCTBMBgNVHREE
-RTBDghFpZHAxLmNvY29uaW5vLmVkdYYuaHR0cHM6Ly9zaGliYm9sZXRoLmNvY29u
-aW5vLmVkdS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAMdvaL82E
-76BsCWr+e+mW9UWIN3NFv0Hq8IXxU9ZAQGlwvBIGCQt6wNTpQQJLvH5Lvj4ZHUSz
-wLUguOoDJC3BPOAnZhL2uBDaUk36FhOR65CbBJ++yS57LdcCkN+zSigl9YN3WW/b
-zh4RGfmIbFYOWg6GRN8RDMsU5Yfb15veOElFFQW7p8I9EAJJNGUW27hDrL2sjrCD
-Q3rrWXbSexe8/ibVAXfQvNC8luMfCcPkgnMq3oQgfHeNbDAYVz9GM2Y5nIbNWizk
-G/8n5DP/9K8IsilSsISKTTkI3pdWsyCmHx+ejHkp9TtgZYTmgq3TDhHc8wsV8CMS
-A+Gg2c5GuR3TCg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.coconino.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.coconino.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Coconino County Community College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Coconino County Community College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.coconino.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ITS Infrastructure</md:GivenName>
-    <md:EmailAddress>its-infrastructure@coconino.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index be5408fb..00000000
--- a/swamid-interfederations-2.0/shibboleth.cranfield.ac.uk-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://shibboleth.cranfield.ac.uk/idp/shibboleth">
-  <!--
-	This is a Shibboleth IdP for Cranfield University.
--->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">cranfield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIJAMVh01FmcQItMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD
-						VQQGEwJHQjEVMBMGA1UECBMMQmVkZm9yZHNoaXJlMRIwEAYDVQQHEwlDcmFuZmll
-						bGQxHTAbBgNVBAoTFENyYW5maWVsZCBVbml2ZXJzaXR5MRYwFAYDVQQLEw1JVCBE
-						ZXBhcnRtZW50MSMwIQYDVQQDExpzaGliYm9sZXRoLmNyYW5maWVsZC5hYy51azEm
-						MCQGCSqGSIb3DQEJARYXc3lzdGVtc0BjcmFuZmllbGQuYWMudWswHhcNMTIwODE1
-						MTQzNDAyWhcNMjIwODEzMTQzNDAyWjCBvDELMAkGA1UEBhMCR0IxFTATBgNVBAgT
-						DEJlZGZvcmRzaGlyZTESMBAGA1UEBxMJQ3JhbmZpZWxkMR0wGwYDVQQKExRDcmFu
-						ZmllbGQgVW5pdmVyc2l0eTEWMBQGA1UECxMNSVQgRGVwYXJ0bWVudDEjMCEGA1UE
-						AxMac2hpYmJvbGV0aC5jcmFuZmllbGQuYWMudWsxJjAkBgkqhkiG9w0BCQEWF3N5
-						c3RlbXNAY3JhbmZpZWxkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEArQKTDHzFCgeJlA5Ihl8bKlVKmOvvTb9hzAEVRKaJJV7SEhzGEfVMdy48
-						MAYvF7MxGmSFmDlUQGIEdQIaV+4GKikmArV5HvQijm/REkyChWhv6cqbWrweWg2k
-						IxwvLwYDy6e3tqfyGoGODstlqT6Paacu0y/WGi6XqczrVqr6pFITc0qfGopqOxTO
-						S8VTCbucP5T85NDuG2g58TRYAEwX6UX5Lpzl22HRrQxm9yBxydzF9eidb9N2QLFJ
-						fsl9nAWzAcf1wIfJr2IQwjeNUG+971To0nToQwT8wUm//IhiXqcynbWOCuIgWCnr
-						NpMhzqaVgo7MrJ5hJusDN6aWxaN8wwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQUJR+QfdHNcDVCRxPsYFyKxIATcAAwHwYDVR0jBBgwFoAUJR+QfdHNcDVCRxPs
-						YFyKxIATcAAwDQYJKoZIhvcNAQEFBQADggEBAIKd+Q/1umHnB0U4yJMmz60kXEn2
-						4V7hWArz9KGhwKLcHKM3lMdMzvFIdXDXVp0XWeorzD0fboFtOpIN8+Lmgo5la3rR
-						P5NozQTzlC6ga8zKBjhjaELLhiTBKJ5KWpe/xF1qY6qSO1Id35gjx9zOnsT5Xdkz
-						jJZspa0idepzJcotgx/YCQvfz6LGQpK7yx4lzKJyLXC0vLGjK3ZHPBVgfVlvFEpm
-						SakTjEGtEtO+tk8yoI8HXHjsWa1M/Fu0e1n8vAu8Af2Aqlelq39loO7SmrCzYPJ1
-						Axewsjzk+IZbXd39dF6YzYNvWn7+yy/My9TwHaGSTywPR+yJ0NcOJ40PyQo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cranfield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cranfield.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://shibboleth.cranfield.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.cranfield.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.cranfield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.cranfield.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">cranfield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIJAMVh01FmcQItMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD
-						VQQGEwJHQjEVMBMGA1UECBMMQmVkZm9yZHNoaXJlMRIwEAYDVQQHEwlDcmFuZmll
-						bGQxHTAbBgNVBAoTFENyYW5maWVsZCBVbml2ZXJzaXR5MRYwFAYDVQQLEw1JVCBE
-						ZXBhcnRtZW50MSMwIQYDVQQDExpzaGliYm9sZXRoLmNyYW5maWVsZC5hYy51azEm
-						MCQGCSqGSIb3DQEJARYXc3lzdGVtc0BjcmFuZmllbGQuYWMudWswHhcNMTIwODE1
-						MTQzNDAyWhcNMjIwODEzMTQzNDAyWjCBvDELMAkGA1UEBhMCR0IxFTATBgNVBAgT
-						DEJlZGZvcmRzaGlyZTESMBAGA1UEBxMJQ3JhbmZpZWxkMR0wGwYDVQQKExRDcmFu
-						ZmllbGQgVW5pdmVyc2l0eTEWMBQGA1UECxMNSVQgRGVwYXJ0bWVudDEjMCEGA1UE
-						AxMac2hpYmJvbGV0aC5jcmFuZmllbGQuYWMudWsxJjAkBgkqhkiG9w0BCQEWF3N5
-						c3RlbXNAY3JhbmZpZWxkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEArQKTDHzFCgeJlA5Ihl8bKlVKmOvvTb9hzAEVRKaJJV7SEhzGEfVMdy48
-						MAYvF7MxGmSFmDlUQGIEdQIaV+4GKikmArV5HvQijm/REkyChWhv6cqbWrweWg2k
-						IxwvLwYDy6e3tqfyGoGODstlqT6Paacu0y/WGi6XqczrVqr6pFITc0qfGopqOxTO
-						S8VTCbucP5T85NDuG2g58TRYAEwX6UX5Lpzl22HRrQxm9yBxydzF9eidb9N2QLFJ
-						fsl9nAWzAcf1wIfJr2IQwjeNUG+971To0nToQwT8wUm//IhiXqcynbWOCuIgWCnr
-						NpMhzqaVgo7MrJ5hJusDN6aWxaN8wwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQUJR+QfdHNcDVCRxPsYFyKxIATcAAwHwYDVR0jBBgwFoAUJR+QfdHNcDVCRxPs
-						YFyKxIATcAAwDQYJKoZIhvcNAQEFBQADggEBAIKd+Q/1umHnB0U4yJMmz60kXEn2
-						4V7hWArz9KGhwKLcHKM3lMdMzvFIdXDXVp0XWeorzD0fboFtOpIN8+Lmgo5la3rR
-						P5NozQTzlC6ga8zKBjhjaELLhiTBKJ5KWpe/xF1qY6qSO1Id35gjx9zOnsT5Xdkz
-						jJZspa0idepzJcotgx/YCQvfz6LGQpK7yx4lzKJyLXC0vLGjK3ZHPBVgfVlvFEpm
-						SakTjEGtEtO+tk8yoI8HXHjsWa1M/Fu0e1n8vAu8Af2Aqlelq39loO7SmrCzYPJ1
-						Axewsjzk+IZbXd39dF6YzYNvWn7+yy/My9TwHaGSTywPR+yJ0NcOJ40PyQo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.cranfield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.cranfield.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">Cranfield University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cranfield University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cranfield.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Haynes</SurName>
-    <EmailAddress>mailto:j.haynes@cranfield.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kenneth</GivenName>
-    <SurName>Caines</SurName>
-    <EmailAddress>mailto:Kenneth.Caines@Cranfield.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Haynes</SurName>
-    <EmailAddress>mailto:j.haynes@cranfield.ac.uk</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 fb25dc38..00000000
--- a/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.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://shibboleth.crous-poitiers.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Poitiers - Etudiants</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoyOSswMjowMOxH66YAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MjkrMDI6MDCdGlMaAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ac-poitiers.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Poitiers - Etudiants</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>
-					      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>
-    </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-POST" Location="https://shibboleth.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Poitiers - Etudiants</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Poitiers - Etudiants</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ac-poitiers.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>crous.informatique@crous-poitiers.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.csuchico.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.csuchico.edu-idp-shibboleth.xml
deleted file mode 100644
index fcaee5ef..00000000
--- a/swamid-interfederations-2.0/shibboleth.csuchico.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,157 +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://shibboleth.csuchico.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">csuchico.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Chico</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Provides authentication and authorization functions for federated applications used by faculty, staff, and students at California State University, Chico.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.csuchico.edu/isec/incommonpop.shtml</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.csuchico.edu/isec/incommonpop.shtml</mdui:PrivacyStatementURL>
-        <mdui:Logo height="154" width="154" xml:lang="en">https://www.csuchico.edu/weblogos/logos/seal154r.gif</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>
-MIIDSDCCAjCgAwIBAgIVAIEEdq+4nDzx9lzoLHgf0Lhl3d8BMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguY3N1Y2hpY28uZWR1MB4XDTE0MDQx
-ODE2MzY1M1oXDTM0MDQxODE2MzY1M1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5j
-c3VjaGljby5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3/5KV
-RgaUyoR2AZ+mVvR2V4Dw1bjeD42RRWupVlEu6u1HajYNeK77ZV18vZo6J0Hxx7yJ
-HfogEo1cpD7rnDwMwm4lnwSqnsobp8dyOQXX57n0qseciEMxV6t9YyFTFSnA2qBb
-1KmCS5omeV2YEbviTUW+6S9Af63bH2qomPID7Vt7Waw6FFIQVHWrqOQtrThDQPSy
-2sG1WFt4Z3yhhWjMZLGCJdNaBJK6dK9iibTsTJU2H0GKs4NX7RmUXYGtNloGjDU7
-AttNrff44h5+Vc+Qs76XELsVUji9LUvBu0a9sdMMhqyUVaiDt59e7eZgQ0LWWOuq
-RH364SCmr7AvPn2JAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGguY3N1
-Y2hpY28uZWR1hi5odHRwczovL3NoaWJib2xldGguY3N1Y2hpY28uZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSjK/qfcx+jwvdDasx4M2PX+ieL0jANBgkqhkiG
-9w0BAQUFAAOCAQEARTR+CWxWOP7VdCYo/YgCXi0Bk7voOVcyAgrrp/DWYVp7aY4s
-sx1JEAIKFJI2ImBqHLuAZFztJoxN/GGvbVNM4QG0288EJOkO5I/UwgQyzczW5TRD
-hjHmSYru01r9ax/hTqK0Xirc3NOquAz5FOSFfg2dmFKjp/nzJbcLAlnuAlkmUjrM
-elF6prjEAvRxdRHg3O1TQoo6xdxR/Iod+wPTgmg9G0gKQPL/4++eiUvotCMMraUR
-C4mfTA0pqKLnIIqgfW7AathlVBdQnDhubTVT1OEp7E7TgG4U6uzsx4qvEkA66C4l
-hERQRKfoE96zHmakc8SmiMASUbUzxjbMYVyJ3g==
-          </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>
-MIIDTDCCAjSgAwIBAgIJANla2HUGoCmtMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF3NoaWJib2xldGguY3N1Y2hpY28uZWR1MB4XDTExMDQxMzE3MzIyMloXDTIx
-MDQxMDE3MzIyMlowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5jc3VjaGljby5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDuAtVw7i6Z4VPL2459YGeS
-TqzHz8durVObETdARko4QGWgnDaGIOJrmPlTJkdP4IZEm53BxIZxhWGutnwrTCrF
-yOJO+brKJtfbMD5JT7ib5EVNQzn3cJ819EBJm2tklJ2OS4WFrhhvkpUOoKHrsJQf
-63/jZbFdw7vcmbpUIH5WDPKVyC/w87+Oqcf7ZUkYPlhWZLAo3WzNwCJI+HwdZHDF
-So+66qwu2v8HiH9uKLqVGVU3luF8ySY/lnMfeYdkfpMsnxnyqaeODzcopgNgm34s
-/fYkvrU7TGQdDW5FYX4RddrwnWi4/7PODyPtzhLPfXh75Li3RTS/RbVbuyJ1OZ9R
-AgMBAAGjgYQwgYEwHQYDVR0OBBYEFG9E0fMYVCbrIVX2fb5gpFD731apMFIGA1Ud
-IwRLMEmAFG9E0fMYVCbrIVX2fb5gpFD731apoSakJDAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmNzdWNoaWNvLmVkdYIJANla2HUGoCmtMAwGA1UdEwQFMAMBAf8wDQYJ
-KoZIhvcNAQEFBQADggEBAJeeNHArje/LUYrXVXD2BsXfL6c701vaatOMY67HoOyu
-C+7SlU0zHTo4f2VBPlzvEjeG4LvHJHI8k2g5/EperiaS11JOErz9C2fACua9VfxI
-kzQjkC5NVimeBy8Q86wWivt+1J5+6Nd/CTx0Bac7/CjTghsNy0AUWC4dR8vHa+Fv
-IfvBrCjTxarHxA+2wGD0CLrYXcFj7yo3NjQClmhkMTxquTSq6LBgeRuJyNcUnA8L
-/TudO9r//xU7h/rrRz+WhUH7KCNk/fkZDNiriqfj90yExFeDILr5g0G9swLYZoqU
-OkvoU7bZUozGMD6b/VOon3gG54/d9WM2+vQ+hP282rM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csuchico.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csuchico.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.csuchico.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.csuchico.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.csuchico.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.csuchico.edu/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">csuchico.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAIEEdq+4nDzx9lzoLHgf0Lhl3d8BMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGguY3N1Y2hpY28uZWR1MB4XDTE0MDQx
-ODE2MzY1M1oXDTM0MDQxODE2MzY1M1owIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5j
-c3VjaGljby5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3/5KV
-RgaUyoR2AZ+mVvR2V4Dw1bjeD42RRWupVlEu6u1HajYNeK77ZV18vZo6J0Hxx7yJ
-HfogEo1cpD7rnDwMwm4lnwSqnsobp8dyOQXX57n0qseciEMxV6t9YyFTFSnA2qBb
-1KmCS5omeV2YEbviTUW+6S9Af63bH2qomPID7Vt7Waw6FFIQVHWrqOQtrThDQPSy
-2sG1WFt4Z3yhhWjMZLGCJdNaBJK6dK9iibTsTJU2H0GKs4NX7RmUXYGtNloGjDU7
-AttNrff44h5+Vc+Qs76XELsVUji9LUvBu0a9sdMMhqyUVaiDt59e7eZgQ0LWWOuq
-RH364SCmr7AvPn2JAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGguY3N1
-Y2hpY28uZWR1hi5odHRwczovL3NoaWJib2xldGguY3N1Y2hpY28uZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSjK/qfcx+jwvdDasx4M2PX+ieL0jANBgkqhkiG
-9w0BAQUFAAOCAQEARTR+CWxWOP7VdCYo/YgCXi0Bk7voOVcyAgrrp/DWYVp7aY4s
-sx1JEAIKFJI2ImBqHLuAZFztJoxN/GGvbVNM4QG0288EJOkO5I/UwgQyzczW5TRD
-hjHmSYru01r9ax/hTqK0Xirc3NOquAz5FOSFfg2dmFKjp/nzJbcLAlnuAlkmUjrM
-elF6prjEAvRxdRHg3O1TQoo6xdxR/Iod+wPTgmg9G0gKQPL/4++eiUvotCMMraUR
-C4mfTA0pqKLnIIqgfW7AathlVBdQnDhubTVT1OEp7E7TgG4U6uzsx4qvEkA66C4l
-hERQRKfoE96zHmakc8SmiMASUbUzxjbMYVyJ3g==
-          </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>
-MIIDTDCCAjSgAwIBAgIJANla2HUGoCmtMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF3NoaWJib2xldGguY3N1Y2hpY28uZWR1MB4XDTExMDQxMzE3MzIyMloXDTIx
-MDQxMDE3MzIyMlowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5jc3VjaGljby5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDuAtVw7i6Z4VPL2459YGeS
-TqzHz8durVObETdARko4QGWgnDaGIOJrmPlTJkdP4IZEm53BxIZxhWGutnwrTCrF
-yOJO+brKJtfbMD5JT7ib5EVNQzn3cJ819EBJm2tklJ2OS4WFrhhvkpUOoKHrsJQf
-63/jZbFdw7vcmbpUIH5WDPKVyC/w87+Oqcf7ZUkYPlhWZLAo3WzNwCJI+HwdZHDF
-So+66qwu2v8HiH9uKLqVGVU3luF8ySY/lnMfeYdkfpMsnxnyqaeODzcopgNgm34s
-/fYkvrU7TGQdDW5FYX4RddrwnWi4/7PODyPtzhLPfXh75Li3RTS/RbVbuyJ1OZ9R
-AgMBAAGjgYQwgYEwHQYDVR0OBBYEFG9E0fMYVCbrIVX2fb5gpFD731apMFIGA1Ud
-IwRLMEmAFG9E0fMYVCbrIVX2fb5gpFD731apoSakJDAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmNzdWNoaWNvLmVkdYIJANla2HUGoCmtMAwGA1UdEwQFMAMBAf8wDQYJ
-KoZIhvcNAQEFBQADggEBAJeeNHArje/LUYrXVXD2BsXfL6c701vaatOMY67HoOyu
-C+7SlU0zHTo4f2VBPlzvEjeG4LvHJHI8k2g5/EperiaS11JOErz9C2fACua9VfxI
-kzQjkC5NVimeBy8Q86wWivt+1J5+6Nd/CTx0Bac7/CjTghsNy0AUWC4dR8vHa+Fv
-IfvBrCjTxarHxA+2wGD0CLrYXcFj7yo3NjQClmhkMTxquTSq6LBgeRuJyNcUnA8L
-/TudO9r//xU7h/rrRz+WhUH7KCNk/fkZDNiriqfj90yExFeDILr5g0G9swLYZoqU
-OkvoU7bZUozGMD6b/VOon3gG54/d9WM2+vQ+hP282rM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csuchico.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csuchico.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Chico</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Chico</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.csuchico.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>David Fuhs</md:GivenName>
-    <md:EmailAddress>dfuhs@csuchico.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>David Fuhs</md:GivenName>
-    <md:EmailAddress>dfuhs@csuchico.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Andy Miller</md:GivenName>
-    <md:EmailAddress>lamiller@csuchico.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.csustan.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.csustan.edu-idp-shibboleth.xml
deleted file mode 100644
index 99d10987..00000000
--- a/swamid-interfederations-2.0/shibboleth.csustan.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://shibboleth.csustan.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">csustan.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Stanislaus</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>
-MIIDQzCCAiugAwIBAgIUGMBL/KES+CItQJGiZd2xZSh8rJkwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aC5jc3VzdGFuLmVkdTAeFw0wOTA5MDEy
-MTExMDlaFw0yOTA5MDEyMTExMDlaMCExHzAdBgNVBAMTFnNoaWJib2xldGguY3N1
-c3Rhbi5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjiFi9hRTI
-uF6n0w82/XQHlhhj34q59TzPvf9vPh9pjgxd6sju/hCY1tx/hmAf5Woa2ilegpVt
-iy+G3tZCKgaJdVLq49zgEmKU0VYXCliGaLW1gtpwKdUYLY3M47oReql3lGlb0ml9
-zC4f8yeg7tCP1+OpnSt2EGR38SqNKqGSpdtsNVP007G4FYOZ5I/bDwCGbdyMrEuH
-G8hmXVSZOtt36Z8uXnVZb8ZWMruEvwm4Ch4SYp1ArSXF7eqyWI5juNQA8orzBjCe
-C/vpF08H/iZsAJ5ZtRYU77046cJwvzsRuFyfl74A6p4iFUl9botcIAE6O+kix2z/
-4QnLRK7kpLTzAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGguY3N1c3Rh
-bi5lZHWGLWh0dHBzOi8vc2hpYmJvbGV0aC5jc3VzdGFuLmVkdS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU0+lADdpb6oUYg9Oc96Zjx/cFThswDQYJKoZIhvcNAQEF
-BQADggEBAFqASbOPNSUo4KijkXfQv9yemFmjX5g0FBO3quSUtmX0XFHMkJrAfkUQ
-34KIwGE1NKEnR5DE2CMhi+CMLM3UwsV/AH54PfMnFZYxKOeya1h5ou99rliwYfE/
-oERIMqkMdqfZI2eVOmjKMfgZMpjhSAjqkvuZ0lJSrHM6GhJTZGVF1qHHxAniNJuL
-EiG0dCIfR86g8fLLIKB2T6NExYY6yYJHobC9h8G9IiR+2QAf/UxuC6hEGAQAnUWj
-NqWgMu7TiZy0oedXYZYYaAHmWQDJWXt2SGC11bB8qtEU2tcccppV75MWjC7SYqko
-+1hpIr+zlLqhBIi73qZPIVggyEH8HpE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csustan.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csustan.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.csustan.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.csustan.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.csustan.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.csustan.edu/idp/profile/SAML2/POST/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">csustan.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQzCCAiugAwIBAgIUGMBL/KES+CItQJGiZd2xZSh8rJkwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aC5jc3VzdGFuLmVkdTAeFw0wOTA5MDEy
-MTExMDlaFw0yOTA5MDEyMTExMDlaMCExHzAdBgNVBAMTFnNoaWJib2xldGguY3N1
-c3Rhbi5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjiFi9hRTI
-uF6n0w82/XQHlhhj34q59TzPvf9vPh9pjgxd6sju/hCY1tx/hmAf5Woa2ilegpVt
-iy+G3tZCKgaJdVLq49zgEmKU0VYXCliGaLW1gtpwKdUYLY3M47oReql3lGlb0ml9
-zC4f8yeg7tCP1+OpnSt2EGR38SqNKqGSpdtsNVP007G4FYOZ5I/bDwCGbdyMrEuH
-G8hmXVSZOtt36Z8uXnVZb8ZWMruEvwm4Ch4SYp1ArSXF7eqyWI5juNQA8orzBjCe
-C/vpF08H/iZsAJ5ZtRYU77046cJwvzsRuFyfl74A6p4iFUl9botcIAE6O+kix2z/
-4QnLRK7kpLTzAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGguY3N1c3Rh
-bi5lZHWGLWh0dHBzOi8vc2hpYmJvbGV0aC5jc3VzdGFuLmVkdS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU0+lADdpb6oUYg9Oc96Zjx/cFThswDQYJKoZIhvcNAQEF
-BQADggEBAFqASbOPNSUo4KijkXfQv9yemFmjX5g0FBO3quSUtmX0XFHMkJrAfkUQ
-34KIwGE1NKEnR5DE2CMhi+CMLM3UwsV/AH54PfMnFZYxKOeya1h5ou99rliwYfE/
-oERIMqkMdqfZI2eVOmjKMfgZMpjhSAjqkvuZ0lJSrHM6GhJTZGVF1qHHxAniNJuL
-EiG0dCIfR86g8fLLIKB2T6NExYY6yYJHobC9h8G9IiR+2QAf/UxuC6hEGAQAnUWj
-NqWgMu7TiZy0oedXYZYYaAHmWQDJWXt2SGC11bB8qtEU2tcccppV75MWjC7SYqko
-+1hpIr+zlLqhBIi73qZPIVggyEH8HpE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csustan.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csustan.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Stanislaus</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Stanislaus</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.csustan.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Chris Wincentsen</md:GivenName>
-    <md:EmailAddress>CWincentsen@csustan.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Corey Cardoza</md:GivenName>
-    <md:EmailAddress>CCardoza@csustan.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.derby.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 72bbe94a..00000000
--- a/swamid-interfederations-2.0/shibboleth.derby.ac.uk-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" entityID="https://shibboleth.derby.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Derby.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-20T14:51:23Z">
-      <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">derby.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Derby</mdui:DisplayName>
-        <mdui:Logo height="80" width="60">https://ulib.derby.ac.uk/library/images/uni_logo_80_60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://ulib.derby.ac.uk/library/images/uni_logo_16_16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDjDCCAnQCCQDB/+b3WBJu4jANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxDjAMBgNVBAcMBURlcmJ5MRwwGgYDVQQK
-						DBNVbml2ZXJzaXR5IG9mIERlcmJ5MRQwEgYDVQQLDAtJVCBTZXJ2aWNlczEfMB0G
-						A1UEAwwWc2hpYmJvbGV0aC5kZXJieS5hYy51azAeFw0xNDA2MDIxNDI3MDBaFw0z
-						NDA1MjgxNDI3MDBaMIGHMQswCQYDVQQGEwJHQjETMBEGA1UECAwKRGVyYnlzaGly
-						ZTEOMAwGA1UEBwwFRGVyYnkxHDAaBgNVBAoME1VuaXZlcnNpdHkgb2YgRGVyYnkx
-						FDASBgNVBAsMC0lUIFNlcnZpY2VzMR8wHQYDVQQDDBZzaGliYm9sZXRoLmRlcmJ5
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyaG4GcFLhW2i
-						LUYQjbt0nWR4lff3ePqBKhJbkWPdOe35XpvjmJxivjq81mbm413kBgxowFFoCusE
-						weZsikrolFyP5VTMGPB+W6aUyY5Y1DeYx7c4hsk5eMusH4jaL07jHxEhhhTfzadW
-						B4gdiN2SOZ3+xTGzB8jTe7D25Ybao+zGSssBwJbB5+72cdDGxS+n/eCVzVHYbnXm
-						lOnjfre31eZ+IO5ZBUje0fO/gd1kr9pEUsmo3PSw080iFrWriDxzFVa8z0zEd6EO
-						tdFmz6ySbiehdCMk8SIXH3UcWUooZ4PaNvvUt7j/rm7sg7tn8Mj+RrolaKvnHMnk
-						P3zR71nQywIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBRrEfwYWy6FI49DHbVj/5t
-						uFEhgyUR45mSX6f4YEZ7aUiwSPsXKdsceKhiJYKtVZCX9cELHAIyHED3fOpfRy7y
-						5g+9Fw2fBY6jPnh3EabPcR6W4RRtj4ZdOTl8K0frMzfJ6GfRCu17JJCPxNVML8lK
-						qgZjHrxaYoVYcuk9ruVRVZrwVE6HyB75TC8SGz/562HZ/888QhiWQfLbI0H0Xdx6
-						ZFoqx/T0VhoKIh0ijqp2RcJOhN4/xi2W9Do1+NsWq2vqdFrwFrGtn1vyiEVt/CPd
-						qVuqWTRreMPKmJ0kUDZIHygko4iKmYXxlRXwKfyDo+/bHP2xCRTFQtlS/KtMkWxn
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.derby.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.derby.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://shibboleth.derby.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.derby.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.derby.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.derby.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">derby.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDjDCCAnQCCQDB/+b3WBJu4jANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxDjAMBgNVBAcMBURlcmJ5MRwwGgYDVQQK
-						DBNVbml2ZXJzaXR5IG9mIERlcmJ5MRQwEgYDVQQLDAtJVCBTZXJ2aWNlczEfMB0G
-						A1UEAwwWc2hpYmJvbGV0aC5kZXJieS5hYy51azAeFw0xNDA2MDIxNDI3MDBaFw0z
-						NDA1MjgxNDI3MDBaMIGHMQswCQYDVQQGEwJHQjETMBEGA1UECAwKRGVyYnlzaGly
-						ZTEOMAwGA1UEBwwFRGVyYnkxHDAaBgNVBAoME1VuaXZlcnNpdHkgb2YgRGVyYnkx
-						FDASBgNVBAsMC0lUIFNlcnZpY2VzMR8wHQYDVQQDDBZzaGliYm9sZXRoLmRlcmJ5
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyaG4GcFLhW2i
-						LUYQjbt0nWR4lff3ePqBKhJbkWPdOe35XpvjmJxivjq81mbm413kBgxowFFoCusE
-						weZsikrolFyP5VTMGPB+W6aUyY5Y1DeYx7c4hsk5eMusH4jaL07jHxEhhhTfzadW
-						B4gdiN2SOZ3+xTGzB8jTe7D25Ybao+zGSssBwJbB5+72cdDGxS+n/eCVzVHYbnXm
-						lOnjfre31eZ+IO5ZBUje0fO/gd1kr9pEUsmo3PSw080iFrWriDxzFVa8z0zEd6EO
-						tdFmz6ySbiehdCMk8SIXH3UcWUooZ4PaNvvUt7j/rm7sg7tn8Mj+RrolaKvnHMnk
-						P3zR71nQywIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBRrEfwYWy6FI49DHbVj/5t
-						uFEhgyUR45mSX6f4YEZ7aUiwSPsXKdsceKhiJYKtVZCX9cELHAIyHED3fOpfRy7y
-						5g+9Fw2fBY6jPnh3EabPcR6W4RRtj4ZdOTl8K0frMzfJ6GfRCu17JJCPxNVML8lK
-						qgZjHrxaYoVYcuk9ruVRVZrwVE6HyB75TC8SGz/562HZ/888QhiWQfLbI0H0Xdx6
-						ZFoqx/T0VhoKIh0ijqp2RcJOhN4/xi2W9Do1+NsWq2vqdFrwFrGtn1vyiEVt/CPd
-						qVuqWTRreMPKmJ0kUDZIHygko4iKmYXxlRXwKfyDo+/bHP2xCRTFQtlS/KtMkWxn
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.derby.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.derby.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 Derby</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Derby</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.derby.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Glenn</GivenName>
-    <SurName>Handley</SurName>
-    <EmailAddress>mailto:G.Handley@derby.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Glenn</GivenName>
-    <SurName>Handley</SurName>
-    <EmailAddress>mailto:G.Handley@derby.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.dhbw-karlsruhe.de.xml b/swamid-interfederations-2.0/shibboleth.dhbw-karlsruhe.de.xml
deleted file mode 100644
index 09261975..00000000
--- a/swamid-interfederations-2.0/shibboleth.dhbw-karlsruhe.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.dhbw-karlsruhe.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-karlsruhe.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.dhbw-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.dhbw-karlsruhe.de,OU=Karlsruhe,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE9TCCA92gAwIBAgIEEQNdOzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
-RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
-FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
-LXZzLmRlMB4XDTEwMTExNzEzNTkwN1oXDTE1MTExNjEzNTkwN1owdjELMAkGA1UE
-BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
-ZXJnMRIwEAYDVQQLEwlLYXJsc3J1aGUxJTAjBgNVBAMTHHNoaWJib2xldGguZGhi
-dy1rYXJsc3J1aGUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDi
-bF3wklsaOy0bg22LMdxn5qsZ2ykDtZqE0JF1Koi4w42VG1tjQDfHpA9FFwo/EVuS
-qeCe09b0f2Daqkjz1UcFSufMrcHEHZZN2xBG+88UMW7MMmCZeD3GuL7wNJvoFnM9
-mp0xPe3x4POopLdGBiWZXhTe789BCSTChcUmTuTyFiV90b14CA0wI8A32JhiM3Hh
-/eRzRRL4z6tP19+WwJ2Le0nJkokz3Gp4TxbYmPiDHdXQIMlZ1f0D8YKoVNjh5bSw
-y9Cst6Zyzm61sR/HMFUZzsAO70ymJumM2/uMPGfwybJyGy6J6MwIWwL8uN7Pdxin
-+l+W7S8ozHzpRrroqi1zAgMBAAGjggGNMIIBiTAJBgNVHRMEAjAAMAsGA1UdDwQE
-AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFATy
-Qy4DajG8sx8vyoNHrIskLklzMB8GA1UdIwQYMBaAFIzpcHFguFOfRMaXXkIf7Shy
-vQ5+MHkGA1UdHwRyMHAwNqA0oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhi
-dy1jYS9wdWIvY3JsL2NhY3JsLmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9kaGJ3LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCB
-hDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQUFAAOCAQEAb6Y5E9ZGeli/tZBJHc1HRWNbQWpx8DBNJ9tOJ2CIpHW2Fci29twp
-G+4b6V0FxDTIBHAamNuKUAjdDIov05YhaXXfU8NidA5M+/xVioaaY/ADTw7aRaJr
-8UHCLmQSaQFel6vpi82f+R7Fdoel+zxnbwCan31UZHz2XGFDCFlvLDs3/uk3fl1L
-GkKHPe3CKWcwuRJsv+6Jymhro91stI74bGpG5AcITFUevHNdueicbV+JndJ/IHjh
-MvpGWuUj2tdg9zVz+YS34mANNt4zIg5lh+VHgwzprbNutQhEwiq56rhKz+mRd8jO
-AmXQxl/y0E3UsR/P+8lLMune9mRyoKhKCw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.dhbw-karlsruhe.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dhbw-karlsruhe.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.dhbw-karlsruhe.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.dhbw-karlsruhe.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.dhbw-karlsruhe.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.dhbw-karlsruhe.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dhbw-karlsruhe.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.dhbw-karlsruhe.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.dhbw-karlsruhe.de,OU=Karlsruhe,O=Duale Hochschule Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE9TCCA92gAwIBAgIEEQNdOzANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJE
-RTEsMCoGA1UEChMjRHVhbGUgSG9jaHNjaHVsZSBCYWRlbi1XdWVydHRlbWJlcmcx
-FjAUBgNVBAMTDURIQlcgQ0EgLSBHMDExHTAbBgkqhkiG9w0BCQEWDnBraUBkaGJ3
-LXZzLmRlMB4XDTEwMTExNzEzNTkwN1oXDTE1MTExNjEzNTkwN1owdjELMAkGA1UE
-BhMCREUxLDAqBgNVBAoTI0R1YWxlIEhvY2hzY2h1bGUgQmFkZW4tV3VlcnR0ZW1i
-ZXJnMRIwEAYDVQQLEwlLYXJsc3J1aGUxJTAjBgNVBAMTHHNoaWJib2xldGguZGhi
-dy1rYXJsc3J1aGUuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDi
-bF3wklsaOy0bg22LMdxn5qsZ2ykDtZqE0JF1Koi4w42VG1tjQDfHpA9FFwo/EVuS
-qeCe09b0f2Daqkjz1UcFSufMrcHEHZZN2xBG+88UMW7MMmCZeD3GuL7wNJvoFnM9
-mp0xPe3x4POopLdGBiWZXhTe789BCSTChcUmTuTyFiV90b14CA0wI8A32JhiM3Hh
-/eRzRRL4z6tP19+WwJ2Le0nJkokz3Gp4TxbYmPiDHdXQIMlZ1f0D8YKoVNjh5bSw
-y9Cst6Zyzm61sR/HMFUZzsAO70ymJumM2/uMPGfwybJyGy6J6MwIWwL8uN7Pdxin
-+l+W7S8ozHzpRrroqi1zAgMBAAGjggGNMIIBiTAJBgNVHRMEAjAAMAsGA1UdDwQE
-AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFATy
-Qy4DajG8sx8vyoNHrIskLklzMB8GA1UdIwQYMBaAFIzpcHFguFOfRMaXXkIf7Shy
-vQ5+MHkGA1UdHwRyMHAwNqA0oDKGMGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZGhi
-dy1jYS9wdWIvY3JsL2NhY3JsLmNybDA2oDSgMoYwaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9kaGJ3LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGUBggrBgEFBQcBAQSBhzCB
-hDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kaGJ3LWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDIucGNh
-LmRmbi5kZS9kaGJ3LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQUFAAOCAQEAb6Y5E9ZGeli/tZBJHc1HRWNbQWpx8DBNJ9tOJ2CIpHW2Fci29twp
-G+4b6V0FxDTIBHAamNuKUAjdDIov05YhaXXfU8NidA5M+/xVioaaY/ADTw7aRaJr
-8UHCLmQSaQFel6vpi82f+R7Fdoel+zxnbwCan31UZHz2XGFDCFlvLDs3/uk3fl1L
-GkKHPe3CKWcwuRJsv+6Jymhro91stI74bGpG5AcITFUevHNdueicbV+JndJ/IHjh
-MvpGWuUj2tdg9zVz+YS34mANNt4zIg5lh+VHgwzprbNutQhEwiq56rhKz+mRd8jO
-AmXQxl/y0E3UsR/P+8lLMune9mRyoKhKCw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.dhbw-karlsruhe.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dhbw-karlsruhe.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DHBW Karlsruhe</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DHBW Karlsruhe</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dhbw-karlsruhe.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Johannes</GivenName>
-    <SurName>Mickel</SurName>
-    <EmailAddress>mickel@dhbw-karlsruhe.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml b/swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.xml
deleted file mode 100644
index 15c516e1..00000000
--- a/swamid-interfederations-2.0/shibboleth.digiknihovna.cz-metadata.xml.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://shibboleth.digiknihovna.cz/metadata.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-10-01T16:55: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/library</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">digiknihovna.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The Municipal Library of Česká Třebová</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Městská knihovna Česká Třebová</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for employees and readers of the Municipal Library Česká Třebová</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a čtenáře Městské knihovny Česká Třebová</mdui:Description>
-        <mdui:Logo height="40" width="40">https://shibboleth.digiknihovna.cz/logo.png</mdui:Logo>
-        <mdui:Logo height="40" width="231" xml:lang="cs">https://shibboleth.digiknihovna.cz/logo_c.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>MIIEuTCCA6GgAwIBAgIQMSRlr+rBP5LrTZg2Fn21DDANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIVdvU2lnbiBDQSBGcmVlIFNTTCBDZXJ0aWZpY2F0ZSBHMjAeFw0xNTA5MDkxMDQxNDhaFw0xODA5MDkxMDQxNDhaMCUxIzAhBgNVBAMMGnNoaWJib2xldGguZGlnaWtuaWhvdm5hLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvjg/PDJR3owFOJp+giLTmykCobeZnwyKUy3rCvSFGI8P3VrkiEUf706KOkF2flgvgJNaJo/fZjR5zLdK9yoSVEhyc2rvaMJmpZoak7O9mD2kVWSdE1m55m31DnKApGUm8+GR9aboDJsfTg8NsVDy95uVLDV6tPK0z4TUyNmSFn6elvGk5uR2imByb6CnGPjsHZipdHdxYTSOCXnzyG/xeo1owa2NAPIY/VQ+PoRR7AzyJNbNJJ/vJeyFCaesTckjVVWZ9JUKyXZIwgspgHoDrgi+vMrCpJHyjw5aMUNelmEg6pXh912/erW27ttmLlQfqzSOjYk/GWvHJwRiowQUsQIDAQABo4IBszCCAa8wCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAJBgNVHRMEAjAAMB0GA1UdDgQWBBR3ercwolapHISAswrafros0OmeqzAfBgNVHSMEGDAWgBTSpxYgfK/ZlZ7rQwoZ8uC5dA6oxzB9BggrBgEFBQcBAQRxMG8wNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwNi53b3NpZ24uY29tL2NhNi9zZXJ2ZXIxL2ZyZWUwNwYIKwYBBQUHMAKGK2h0dHA6Ly9haWE2Lndvc2lnbi5jb20vY2E2LnNlcnZlcjEuZnJlZS5jZXIwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2NybHM2Lndvc2lnbi5jb20vY2E2LXNlcnZlcjEtZnJlZS5jcmwwJQYDVR0RBB4wHIIac2hpYmJvbGV0aC5kaWdpa25paG92bmEuY3owUQYDVR0gBEowSDAIBgZngQwBAgEwPAYNKwYBBAGCm1EGAQICATArMCkGCCsGAQUFBwIBFh1odHRwOi8vd3d3Lndvc2lnbi5jb20vcG9saWN5LzANBgkqhkiG9w0BAQsFAAOCAQEA0x/GwChs/IwVX8feGUJg9SAC35CunowX+4qziQlBeHDe3KuF7JU/K6Ev4wVNL099pLbzD9kry1E/VGaNt6Bmj5Ib7qE8rMSropFZi1Q+0fy8rAYlfIg+ge1Jcc5CAN8n2qJOWIupas1c2RG8B9SG1HG4055mZkdZncxUaWxKccSWTh7OI0MhmyJqYFoGGoodWXXnz/FGGdPUIQ00MPRZtVvf3ykGn7kI2XdRbPvig1XXoz9A/39xhJjn6EUxWeyHwuTeN7ZJH+OldiYTpE99mFcLEec2/Y52ZcZ1Cv1hwwdZKOBw2sRuwAfpZ+Wwv4A8ucdKWKOXd4nCFnS+zMtmcA==</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>MIIEuTCCA6GgAwIBAgIQMSRlr+rBP5LrTZg2Fn21DDANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIVdvU2lnbiBDQSBGcmVlIFNTTCBDZXJ0aWZpY2F0ZSBHMjAeFw0xNTA5MDkxMDQxNDhaFw0xODA5MDkxMDQxNDhaMCUxIzAhBgNVBAMMGnNoaWJib2xldGguZGlnaWtuaWhvdm5hLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvjg/PDJR3owFOJp+giLTmykCobeZnwyKUy3rCvSFGI8P3VrkiEUf706KOkF2flgvgJNaJo/fZjR5zLdK9yoSVEhyc2rvaMJmpZoak7O9mD2kVWSdE1m55m31DnKApGUm8+GR9aboDJsfTg8NsVDy95uVLDV6tPK0z4TUyNmSFn6elvGk5uR2imByb6CnGPjsHZipdHdxYTSOCXnzyG/xeo1owa2NAPIY/VQ+PoRR7AzyJNbNJJ/vJeyFCaesTckjVVWZ9JUKyXZIwgspgHoDrgi+vMrCpJHyjw5aMUNelmEg6pXh912/erW27ttmLlQfqzSOjYk/GWvHJwRiowQUsQIDAQABo4IBszCCAa8wCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAJBgNVHRMEAjAAMB0GA1UdDgQWBBR3ercwolapHISAswrafros0OmeqzAfBgNVHSMEGDAWgBTSpxYgfK/ZlZ7rQwoZ8uC5dA6oxzB9BggrBgEFBQcBAQRxMG8wNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwNi53b3NpZ24uY29tL2NhNi9zZXJ2ZXIxL2ZyZWUwNwYIKwYBBQUHMAKGK2h0dHA6Ly9haWE2Lndvc2lnbi5jb20vY2E2LnNlcnZlcjEuZnJlZS5jZXIwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2NybHM2Lndvc2lnbi5jb20vY2E2LXNlcnZlcjEtZnJlZS5jcmwwJQYDVR0RBB4wHIIac2hpYmJvbGV0aC5kaWdpa25paG92bmEuY3owUQYDVR0gBEowSDAIBgZngQwBAgEwPAYNKwYBBAGCm1EGAQICATArMCkGCCsGAQUFBwIBFh1odHRwOi8vd3d3Lndvc2lnbi5jb20vcG9saWN5LzANBgkqhkiG9w0BAQsFAAOCAQEA0x/GwChs/IwVX8feGUJg9SAC35CunowX+4qziQlBeHDe3KuF7JU/K6Ev4wVNL099pLbzD9kry1E/VGaNt6Bmj5Ib7qE8rMSropFZi1Q+0fy8rAYlfIg+ge1Jcc5CAN8n2qJOWIupas1c2RG8B9SG1HG4055mZkdZncxUaWxKccSWTh7OI0MhmyJqYFoGGoodWXXnz/FGGdPUIQ00MPRZtVvf3ykGn7kI2XdRbPvig1XXoz9A/39xhJjn6EUxWeyHwuTeN7ZJH+OldiYTpE99mFcLEec2/Y52ZcZ1Cv1hwwdZKOBw2sRuwAfpZ+Wwv4A8ucdKWKOXd4nCFnS+zMtmcA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SingleLogoutService.php"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SingleLogoutService.php"/>
-    <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:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.digiknihovna.cz/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Municipal Library Česká Třebová</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Městská knihovna Česká Třebová</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Municipal Library Česká Třebová</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Městská knihovna Česká Třebová</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://knihovna.ceska-trebova.cz/index.php/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://knihovna.ceska-trebova.cz/index.php/cs/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jiří</md:GivenName>
-    <md:SurName>Kozlovský</md:SurName>
-    <md:EmailAddress>Jiri.Kozlovsky@mzk.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.dundeeandangus.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.dundeeandangus.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 53ec18b7..00000000
--- a/swamid-interfederations-2.0/shibboleth.dundeeandangus.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.dundeeandangus.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Dundee and Angus College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-03-06T16:06:16Z">
-      <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">dundeeandangus.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dundee and Angus College</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaTCCAlGgAwIBAgIUOOzCa1peQPJkYnPUCVHoA+pzk+UwDQYJKoZIhvcNAQEF
-						BQAwKjEoMCYGA1UEAxMfc2hpYmJvbGV0aC5kdW5kZWVhbmRhbmd1cy5hYy51azAe
-						Fw0xNDAzMDQyMTIxNDlaFw0zNDAzMDQyMTIxNDlaMCoxKDAmBgNVBAMTH3NoaWJi
-						b2xldGguZHVuZGVlYW5kYW5ndXMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQCG2sBuC7Mb3oSBWgAfzmW3W3Fij3UeBb7+9WKK3dwMYminLoii
-						tjrz4muGd6kDAZAZ+kOihheh7gkaEmPpwo1x422cJ6MVWf1/FVKs6pV33GVGVgrj
-						XtVxr5KdSiwhlGh5xDVUga8zM68PULLT65ISWl7MnMPETIZTZDZoKZVXoFlPsVc3
-						vRIciFJB0Zh7TxwccN8pWx9ZbPkqkyIDZ4OajnflX6nEDVY+JgNRvaCndfxRlvhi
-						AdTXRldjdsJEW9UMY8fUBI11ZX8Cf5L05GOCQm38kzlb2hdCQAQBZiJGbKStxcSs
-						gxntCMX+E0yp+NAaYTI6hTgJcjRbh2KdJuMtAgMBAAGjgYYwgYMwYgYDVR0RBFsw
-						WYIfc2hpYmJvbGV0aC5kdW5kZWVhbmRhbmd1cy5hYy51a4Y2aHR0cHM6Ly9zaGli
-						Ym9sZXRoLmR1bmRlZWFuZGFuZ3VzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1Ud
-						DgQWBBTjIJQ164yN7YeSnns0H3DhdDD8vDANBgkqhkiG9w0BAQUFAAOCAQEAP7ZJ
-						osT/Ni9LMsaM9W/xQ97ZhxlEigWXZyunCRzgb7qGwTcXn8dMcC1oU6Ev/ybMtZrl
-						teisZkrhVG85zQ4tUc5ih2ykURPpgOnWgmuPzaWLiEH3EG+GL790735hmPzlVGeG
-						BkPj9QZ/fMjn1WiGr9zF/UN7IgpHEN1c6M5+m5bh6IQOWf3d0KDz5Mb62bCTWj1a
-						Iokh6jB1sQpje3UFWqG8L+fDFPhzyuFkCBT6y89gyyPHNj8UN7ggOg6KaEJ/KYdm
-						loP/MEWE2eokIFQvB6DKN6kSUUxOM8iKyfaHf99YWXbqdfcRNqPPE/itq2VeWZ9d
-						uQHJCbKISTdD5+fZjQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dundeeandangus.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://shibboleth.dundeeandangus.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.dundeeandangus.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.dundeeandangus.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">dundeeandangus.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaTCCAlGgAwIBAgIUOOzCa1peQPJkYnPUCVHoA+pzk+UwDQYJKoZIhvcNAQEF
-						BQAwKjEoMCYGA1UEAxMfc2hpYmJvbGV0aC5kdW5kZWVhbmRhbmd1cy5hYy51azAe
-						Fw0xNDAzMDQyMTIxNDlaFw0zNDAzMDQyMTIxNDlaMCoxKDAmBgNVBAMTH3NoaWJi
-						b2xldGguZHVuZGVlYW5kYW5ndXMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQCG2sBuC7Mb3oSBWgAfzmW3W3Fij3UeBb7+9WKK3dwMYminLoii
-						tjrz4muGd6kDAZAZ+kOihheh7gkaEmPpwo1x422cJ6MVWf1/FVKs6pV33GVGVgrj
-						XtVxr5KdSiwhlGh5xDVUga8zM68PULLT65ISWl7MnMPETIZTZDZoKZVXoFlPsVc3
-						vRIciFJB0Zh7TxwccN8pWx9ZbPkqkyIDZ4OajnflX6nEDVY+JgNRvaCndfxRlvhi
-						AdTXRldjdsJEW9UMY8fUBI11ZX8Cf5L05GOCQm38kzlb2hdCQAQBZiJGbKStxcSs
-						gxntCMX+E0yp+NAaYTI6hTgJcjRbh2KdJuMtAgMBAAGjgYYwgYMwYgYDVR0RBFsw
-						WYIfc2hpYmJvbGV0aC5kdW5kZWVhbmRhbmd1cy5hYy51a4Y2aHR0cHM6Ly9zaGli
-						Ym9sZXRoLmR1bmRlZWFuZGFuZ3VzLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1Ud
-						DgQWBBTjIJQ164yN7YeSnns0H3DhdDD8vDANBgkqhkiG9w0BAQUFAAOCAQEAP7ZJ
-						osT/Ni9LMsaM9W/xQ97ZhxlEigWXZyunCRzgb7qGwTcXn8dMcC1oU6Ev/ybMtZrl
-						teisZkrhVG85zQ4tUc5ih2ykURPpgOnWgmuPzaWLiEH3EG+GL790735hmPzlVGeG
-						BkPj9QZ/fMjn1WiGr9zF/UN7IgpHEN1c6M5+m5bh6IQOWf3d0KDz5Mb62bCTWj1a
-						Iokh6jB1sQpje3UFWqG8L+fDFPhzyuFkCBT6y89gyyPHNj8UN7ggOg6KaEJ/KYdm
-						loP/MEWE2eokIFQvB6DKN6kSUUxOM8iKyfaHf99YWXbqdfcRNqPPE/itq2VeWZ9d
-						uQHJCbKISTdD5+fZjQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.dundeeandangus.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.dundeeandangus.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">Dundee and Angus College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Dundee and Angus College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dundeeandangus.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Brian</GivenName>
-    <SurName>Sinclair</SurName>
-    <EmailAddress>mailto:brian.sinclair@dundeeandangus.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Findlater</SurName>
-    <EmailAddress>mailto:ian.findlater@dundeeandangus.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Graham</GivenName>
-    <SurName>Dingwall</SurName>
-    <EmailAddress>mailto:g.dingwall@dundeeandangus.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Brian</GivenName>
-    <SurName>Sinclair</SurName>
-    <EmailAddress>mailto:brian.sinclair@dundeeandangus.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Findlater</SurName>
-    <EmailAddress>mailto:ian.findlater@dundeeandangus.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Graham</GivenName>
-    <SurName>Dingwall</SurName>
-    <EmailAddress>mailto:g.dingwall@dundeeandangus.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.eb.com-sp.xml b/swamid-interfederations-2.0/shibboleth.eb.com-sp.xml
deleted file mode 100644
index c5ecab95..00000000
--- a/swamid-interfederations-2.0/shibboleth.eb.com-sp.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://shibboleth.eb.com/sp">
-  <!--
-		This is a Shibboleth SP for Encyclopaedia Britannica (UK) 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="2013-07-04T10:13:12Z"/>
-  </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://shibboleth.eb.com/shibboleth.sso/kidder"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.eb.com/shibboleth.sso/WAYF"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEYzCCAksCAQwwDQYJKoZIhvcNAQEFBQAwZzELMAkGA1UEBhMCVVMxCzAJBgNV
-						BAgTAklMMRAwDgYDVQQHEwdDaGljYWdvMQswCQYDVQQKEwJFQjEPMA0GA1UEAxMG
-						ZWJjZXJ0MRswGQYJKoZIhvcNAQkBFgxqbWFyc0BlYi5jb20wHhcNMTMwNjIwMTY0
-						OTE0WhcNMjMwNjE4MTY0OTE0WjCBhzELMAkGA1UEBhMCVVMxETAPBgNVBAgMCEls
-						bGlub2lzMRAwDgYDVQQHDAdDaGljYWdvMSYwJAYDVQQKDB1FbmN5Y2xvcGFlZGlh
-						IEJyaXRhbm5pY2EgSW5jLjEPMA0GA1UECwwGc3lzb3BzMRowGAYDVQQDDBFzaGli
-						Ym9sZXRoLmViLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALs+
-						F77GATVQVtLGWEh7lOxGpCm2VFHMdcTjxRNWudanh5+/8sI+Bkd0Vpxkdtla2KaX
-						bopDUTB1Q9vXYAwVbsX0iqNDI9PaWdCyUmzVujF1NNy3WWVj8YJMr0AnE9eRuo4H
-						5FFesx8Felcgq7Nmgd3xUvjOy6IjtpJWbnY3lyPFqp0wCue2He23Mq/NMlJTxS4c
-						JLGZR4FMeHsjfKgSL3hFDIfbpsxDK8iJCVGYR0eQjHMfZU94qkD6jdqTFZYKIcw4
-						5IfRNq7i0T0l2JQiBaUJJoGIv4GoDlkX65evO4CioeyrT3UXbFH9ZjSYmih9OfUm
-						jcLhWMxYdOAYN2aeOJ0CAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAJmUFYnjaD/Lw
-						/ukxO1//gyndf1wzSoUTKZB4XWJp+2g/wgf7RL+VR3YW9Myy7w4uq0SFy+pZx2bW
-						XVZd05NOtNgeD1CgpLH002mZRTmnj+5aRwI8oz0pR1xiYF5YOQDtiXEDAIA1UGdH
-						snBJsArumZHo55ss77gESONBhvdxDcHmF8RyRp+f60Mtey9+miz8I3sLQ48nELnE
-						X84qrPzS76qfMmmIVQwvDLqEmw6RKVkMZlzkmkQ/b3TTCAFy84Affka+17k5iEsi
-						GJCbUZNo+AjrSMHfeJrcert1blUZP0d8CCaLATfp6PlSzzO+LpjqZ0kWDX88CyhG
-						sV415fcnDyiyNf7Iyw9B4B8IfNIn0sr0EknE08D+3gUuuVssnczkVL/CWc5U8sOA
-						G2Yl+jnqxB2IKB/kY4uDWIxHMMmONZt4+t+O3vBW/hz0hkif61g3+BhRT2nOkcLa
-						JxMvVqRPiV2vdiRkLea3MALOJZHR6LAsPNawvyWIGZ66GVOiKD40xXGWL/GzsnvQ
-						QiXYbS6BL57mxJ4BotTRZRSFxOtIh0qOraMLWEcG4Tdv07T1n0cfv356aouGl2dR
-						t36zi8dK/SAbGysPEPvHrsoU38zo7s/WA9I6gA4ZyKWXlx6k3xnR6R2GNuh1Vjio
-						urVZD7P8AKbj+2gFol6KaUOrLk7t7QQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shibboleth.eb.com/shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.eb.com/shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.eb.com/shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.eb.com/shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.eb.com/shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.eb.com/shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.eb.com/shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.eb.com/shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.eb.com/shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.eb.com/shibboleth.sso/SAML2/Post" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.eb.com/shibboleth.sso/SAML2/Post-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.eb.com/shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.eb.com/shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.eb.com/shibboleth.sso/SAML/Post" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.eb.com/shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Encyclopaedia Britannica (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Britannica Online School Edition</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.britannica.co.uk/BritannicaCoUK_Info_History.htm</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Customer Service</GivenName>
-    <EmailAddress>mailto:ukcustomerservice@britannica.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shawn</GivenName>
-    <SurName>McCullars</SurName>
-    <EmailAddress>mailto:smcculla@us.britannica.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml b/swamid-interfederations-2.0/shibboleth.ebscohost.com.xml
deleted file mode 100644
index 033354de..00000000
--- a/swamid-interfederations-2.0/shibboleth.ebscohost.com.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="http://shibboleth.ebscohost.com">
-  <!--
-		This is a Shibboleth SP for EBSCO Publishing, Inc.
-	-->
-  <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="2007-06-12T13:07: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.ebscohost.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://shibboleth.ebscohost.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFizCCBHOgAwIBAgIQAUMqMY4GGE7RyypkxwmWTzANBgkqhkiG9w0BAQsFADCB
-						vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
-						VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
-						DTEzMDMyNzAwMDAwMFoXDTE2MDMyNjIzNTk1OVowgaoxCzAJBgNVBAYTAlVTMRYw
-						FAYDVQQIEw1NYXNzYWNodXNldHRzMRAwDgYDVQQHFAdJcHN3aWNoMRkwFwYDVQQK
-						FBBFQlNDTyBQdWJsaXNoaW5nMTMwMQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3
-						LnZlcmlzaWduLmNvbS9ycGEgKGMpMDUxITAfBgNVBAMUGHNoaWJib2xldGguZWJz
-						Y29ob3N0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKUKHWUi
-						hEa2qeQcooFqXBl/+AwmtcvIMdNroFBD2a8Z0r0HFYYxfsisIWxnJkfwkzYpuz/X
-						jOy5kBHRDoFmdpPcEf65fLfdrhsUJ/oHnZ5mf3XNVZA3mrabZzWUI7WPTpR2SMB/
-						1mgFthIZ/+4KSqAScC8OKbb7pkg6McxDw+c20RplQIwlayVezCn1DD3ynNYlXz26
-						kqNMLhWwT4AGkEHD8H4w5QDbhYaAW7bo36syiOnU+FhGHzTCbjYCM+ZeolY56rjj
-						UctR2S9HZQyXqeHQ/ksMW7PKgsuhsfuUqYmI+rvxoVe1jkquhCGYODQVnWJyiiFS
-						qat+jjZyPeVHiRkCAwEAAaOCAZcwggGTMCMGA1UdEQQcMBqCGHNoaWJib2xldGgu
-						ZWJzY29ob3N0LmNvbTAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIFoDBDBgNVHSAE
-						PDA6MDgGCmCGSAGG+EUBBzYwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVy
-						aXNpZ24uY29tL2NwczBBBgNVHR8EOjA4MDagNKAyhjBodHRwOi8vU1ZSSW50bC1H
-						My1jcmwudmVyaXNpZ24uY29tL1NWUkludGxHMy5jcmwwNAYDVR0lBC0wKwYIKwYB
-						BQUHAwEGCCsGAQUFBwMCBglghkgBhvhCBAEGCisGAQQBgjcKAwMwHwYDVR0jBBgw
-						FoAU15t82CKgFffdrV/OKZtYw7xGALUwcgYIKwYBBQUHAQEEZjBkMCQGCCsGAQUF
-						BzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5jb20wPAYIKwYBBQUHMAKGMGh0dHA6
-						Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNlcjANBgkq
-						hkiG9w0BAQsFAAOCAQEAZDAVJq/8qorA7GxHW+6rcjxUsjjlrPFIsE+xWWlrLepn
-						GmSTrw9udap0Iq0kO+42bCd0aMvhRlTOZKW5+ra89vKoaH16hrpnYZMIxpwzre7X
-						zxhkNnw1Mx1dE8Cmol47V8dPBTr8/U8HiJmH4YFCoQX+zMsdC40AcyhPIxgyo1ra
-						Gki40IQJ/zFXkLpUO87nAYQy6WVJNFbtPB0ZWEhmaPWsmF51Dybw0HK0/2KkXLP9
-						aefnD8KF5bcPuu2spKwU4CfbZdSPo0n6AiDTxucbJt/OMS5Uh50ZRiE8Oc8v1tt+
-						8z47khf6dA5tT/OCeVEwt2z0O8VgNTQ4gcF2jbuK/A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAMyOzC7Vc+89MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHNoaWJib2xldGguZWJzY29ob3N0LmNvbTAeFw0xNDA0MjQxMzE4MTFaFw0y
-						NDA0MjExMzE4MTFaMCMxITAfBgNVBAMTGHNoaWJib2xldGguZWJzY29ob3N0LmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtMod/aT8Q+Jc1qRTOh
-						ijxgxCZRkg+BRBkokvsaeVfq4LSMRxaqh2CMK7WOmFOkM4vQinV3LIKmu9oQ5ObW
-						SOXTeNpfIko03lQTIf20smhS83dPCsROz3np5KtrTwTmMkIHdSOasczD9yVJkrvZ
-						ClKrYHnvzY76iWzlI3NP6GIdlCEk9hIYG2Otxiyg1ct7cXHhqOPZwA3lKTFZDoH5
-						DeqU70gNZ/L39QmPTb/WOj06/+96pyzWTO0Ij7hw/Z2Bg3o+X96dmQ9h5QxFfkcR
-						3nsGOvoeQfT0o4cWLehX8NYTGoBil8N1E7XVbxbJoB7G6dCGnKUk7z13VjC8Zqkm
-						EI0CAwEAAaNGMEQwIwYDVR0RBBwwGoIYc2hpYmJvbGV0aC5lYnNjb2hvc3QuY29t
-						MB0GA1UdDgQWBBQMMZ62QB2/b4UMhukiOjiYXAJw7TANBgkqhkiG9w0BAQUFAAOC
-						AQEANelL29dtzQAUTGXzBDFuE5gR7paWe5KmCSoRmyHLP1gu6dqW6GO1NSHuXcZi
-						Ls2Owljlh0YDUaIEItrE/vD/ZSezpHzjkzyH+OHwmkyAImJDwcapY0XoQ4soBMa5
-						Oge0TZw8Cu4zEDbxgr4ksddHQNpPoqZGsFB4yctpm68wEO65F235UHzKNULOD2Ho
-						xq2Z8ufFFZpmY2EJDQy/ILLbkUvgglfy4P1gTNCHfbDFSV+DSXJ3xxgKDoOnn9ha
-						mFeekTOCi/QauZiSNwywKFssG1xmQ/0F0hVkHSu4TnycZ+ebE6tng3fux7JIrWiX
-						GU/FKl6h+yb9xow2u6V8+fkKEQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ebscohost.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">EBSCO Publishing, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EBSCO Publishing, Inc</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ebsco.com/home/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>EBSCO Customer Satisfaction</GivenName>
-    <EmailAddress>mailto:shib-tech@ebscohost.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>EBSCO Shibboleth Tech</GivenName>
-    <EmailAddress>mailto:shib-tech@ebscohost.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-shibboleth.xml
deleted file mode 100644
index 0c060cce..00000000
--- a/swamid-interfederations-2.0/shibboleth.edgehill.ac.uk-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://shibboleth.edgehill.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Edge Hill University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-02T12:16: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">edgehill.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFCTCCA/GgAwIBAgIUZAJxK/aWhFu1wZNKpSMFkRznQnQwDQYJKoZIhvcNAQEL
-						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDYyOTEyNDI1
-						MloXDTE4MDYyOTEyNDI1MFowgY4xCzAJBgNVBAYTAkdCMRMwEQYDVQQIEwpMYW5j
-						YXNoaXJlMREwDwYDVQQHEwhPUk1TS0lSSzEdMBsGA1UEChMURWRnZSBIaWxsIFVu
-						aXZlcnNpdHkxFDASBgNVBAsTC0lUIFNlcnZpY2VzMSIwIAYDVQQDExlzaGliYm9s
-						ZXRoLmVkZ2VoaWxsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEA4x3qVyHwxLP4Q6GubKCHQ4+4jJO5W2D4OmJwSqRWkfOYYh13bWHxorGkwYcR
-						sARfpfcceJcflRd2qVmBXP7Ea+ck4D0ZX7zVNg5kSI0t5SYfM2dt3LycYqIZLTM7
-						F6QeDbntcQk3RPYkOQUYq2BQOGXxXDw04FsQ2ysQpN+GbdEhHU9o9vJfv0AHnfvu
-						5ZA6WVKTUSnLy1UqS7vCvhRfvG2fKfkdWKWlNa8b9La9xsmyR9DxFP5fvEIBLgM7
-						Bd//jSVj8eIoCn+g5XAy7brYFpxD43SbSRRhVaV+hgRR28Ithu2EUwW8BUkcjT7H
-						rEAscKi17Ti3CmmGh5OtakoNEQIDAQABo4IBnTCCAZkwcwYIKwYBBQUHAQEEZzBl
-						MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wNwYI
-						KwYBBQUHMAKGK2h0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xn
-						Mi5jcnQwJAYDVR0RBB0wG4IZc2hpYmJvbGV0aC5lZGdlaGlsbC5hYy51azBRBgNV
-						HSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3
-						LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB/wQEAwIFoDAd
-						BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsX
-						pzD78N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92
-						YWRpc2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFBlnbP5DL/4jUy1Q
-						8YaGN4xDFm5UMA0GCSqGSIb3DQEBCwUAA4IBAQBqzzj49G3ZRb7GAa5qWiVJ6S+a
-						RetDyTwOkQ0P+MbeHEvalj3fUOHRoukvJqlNXh6lH34oR0+F0A2jhHMvPyQ1B6yj
-						1Fh1xz40SnGIuLcBKzO08IIAoQpggOKB9bzoxH8t1c4c10z179TbU4W8pXMu86AP
-						KdaUaKuVekcWHL8lFJ85hGTvNiwbV/KllFIOhj8QfvxbX/tMValDG7Uc9RJj8L96
-						P1S6otiApfA6xJE2P4+uxbmmvLQguzbdoqMYI4oV55j5btMuZv2YSPtwnFXVaEbw
-						9z3NGpOKrko0OWCZ4AKIGYb83kg8k4zbZnLrOh/VAzR3cpPU6e5jQ9A0C4lE
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.edgehill.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://shibboleth.edgehill.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.edgehill.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.edgehill.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.edgehill.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">edgehill.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFCTCCA/GgAwIBAgIUZAJxK/aWhFu1wZNKpSMFkRznQnQwDQYJKoZIhvcNAQEL
-						BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-						BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEcyMB4XDTE1MDYyOTEyNDI1
-						MloXDTE4MDYyOTEyNDI1MFowgY4xCzAJBgNVBAYTAkdCMRMwEQYDVQQIEwpMYW5j
-						YXNoaXJlMREwDwYDVQQHEwhPUk1TS0lSSzEdMBsGA1UEChMURWRnZSBIaWxsIFVu
-						aXZlcnNpdHkxFDASBgNVBAsTC0lUIFNlcnZpY2VzMSIwIAYDVQQDExlzaGliYm9s
-						ZXRoLmVkZ2VoaWxsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEA4x3qVyHwxLP4Q6GubKCHQ4+4jJO5W2D4OmJwSqRWkfOYYh13bWHxorGkwYcR
-						sARfpfcceJcflRd2qVmBXP7Ea+ck4D0ZX7zVNg5kSI0t5SYfM2dt3LycYqIZLTM7
-						F6QeDbntcQk3RPYkOQUYq2BQOGXxXDw04FsQ2ysQpN+GbdEhHU9o9vJfv0AHnfvu
-						5ZA6WVKTUSnLy1UqS7vCvhRfvG2fKfkdWKWlNa8b9La9xsmyR9DxFP5fvEIBLgM7
-						Bd//jSVj8eIoCn+g5XAy7brYFpxD43SbSRRhVaV+hgRR28Ithu2EUwW8BUkcjT7H
-						rEAscKi17Ti3CmmGh5OtakoNEQIDAQABo4IBnTCCAZkwcwYIKwYBBQUHAQEEZzBl
-						MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wNwYI
-						KwYBBQUHMAKGK2h0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xn
-						Mi5jcnQwJAYDVR0RBB0wG4IZc2hpYmJvbGV0aC5lZGdlaGlsbC5hYy51azBRBgNV
-						HSAESjBIMEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3
-						LnF1b3ZhZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB/wQEAwIFoDAd
-						BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUkRlirVsX
-						pzD78N45JbG9jLm4UScwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92
-						YWRpc2dsb2JhbC5jb20vcXZzc2xnMi5jcmwwHQYDVR0OBBYEFBlnbP5DL/4jUy1Q
-						8YaGN4xDFm5UMA0GCSqGSIb3DQEBCwUAA4IBAQBqzzj49G3ZRb7GAa5qWiVJ6S+a
-						RetDyTwOkQ0P+MbeHEvalj3fUOHRoukvJqlNXh6lH34oR0+F0A2jhHMvPyQ1B6yj
-						1Fh1xz40SnGIuLcBKzO08IIAoQpggOKB9bzoxH8t1c4c10z179TbU4W8pXMu86AP
-						KdaUaKuVekcWHL8lFJ85hGTvNiwbV/KllFIOhj8QfvxbX/tMValDG7Uc9RJj8L96
-						P1S6otiApfA6xJE2P4+uxbmmvLQguzbdoqMYI4oV55j5btMuZv2YSPtwnFXVaEbw
-						9z3NGpOKrko0OWCZ4AKIGYb83kg8k4zbZnLrOh/VAzR3cpPU6e5jQ9A0C4lE
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.edgehill.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.edgehill.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">Edge Hill University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Edge Hill University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.edgehill.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Neil</GivenName>
-    <SurName>Malcolm</SurName>
-    <EmailAddress>mailto:neil.malcolm@edgehill.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Neil</GivenName>
-    <SurName>Malcolm</SurName>
-    <EmailAddress>mailto:neil.malcolm@edgehill.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.editure.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.editure.co.uk-shibboleth.xml
deleted file mode 100644
index 3dea000a..00000000
--- a/swamid-interfederations-2.0/shibboleth.editure.co.uk-shibboleth.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://shibboleth.editure.co.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for New Era Education Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-25T13:47: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://shibboleth.editure.co.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIJALzAXoogu0OFMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHNoaWJib2xldGguZWRpdHVyZS5jby51azAeFw0xMjA0MTMxNDE1NDFaFw0y
-						MjA0MTExNDE1NDFaMCMxITAfBgNVBAMTGHNoaWJib2xldGguZWRpdHVyZS5jby51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMG3mYtAvjNLIGIChu6j
-						S4ia5UAGno6CWIeM3yIJje1WnjVc0K6Bm/ulQGou7KFw0QrMhqTmdcqoT25tUbD+
-						YGTajArHEW/cefay3G1NKP/IqVfUp9xKFimvtUEqAPCAWTWUP7VeGPyhlB99p43F
-						PxXNu4wb8TRleXTpstyarlstM5+AK6MoMZXaoGtkUh0c14ChE7KFvGiH32Z/I9L5
-						oeTM3lE3naAyy3cUlmKGPcageo4r5ToiPaY2Ym8zmAI4XzSFLQPELbjZKua6zN8W
-						Pgg6fm1xDsIw7V2hfOt3xlf+0JmY0e0L9yUbtqk8oQ1c5KaIN4pBahzQT6tt3P5o
-						u7cCAwEAAaNzMHEwUAYDVR0RBEkwR4IYc2hpYmJvbGV0aC5lZGl0dXJlLmNvLnVr
-						hitodHRwczovL3NoaWJib2xldGguZWRpdHVyZS5jby51ay9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBTzRjbL3Tk36c5S0QNEKRYtvxmf/TANBgkqhkiG9w0BAQUFAAOCAQEA
-						hTfB/KawwGi4mjlbn+FzNAz3uxuS0vWxMQbaCgwuMSz2bP7c3c/bpT7RGZx+pZAp
-						WYYKQgARJ1HZPBjKNKUqD7vGcEDWMFZbLD9uAhM/7ZWw5heZkObT1Z50i9RnOnQ9
-						ZHxvcsQDEK642BUAccrT9hJnSOBv1HjryKFsjI4H2ISJwQAGZrx8gK1w3E7yN2Xz
-						8JKVpWqvncLCV9twO3woRmjq9S9D59j7p0kNLfLO3cmk9CuBi9z2rwevsTlaSpHC
-						rT64LLFKB468UlpfdpVyosQ6Fi5L5lG5SLtmmMgF+1vK+vAGHmR47hZLt+iKnmfw
-						mZTLX4Py/Vl94v6sULZDtw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.editure.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">New Era Education Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">New Era Education Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.editure.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Customer Support</GivenName>
-    <EmailAddress>mailto:customersupport@neweraed.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Team</GivenName>
-    <EmailAddress>mailto:systems@neweraed.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.xml
deleted file mode 100644
index 82bd09cd..00000000
--- a/swamid-interfederations-2.0/shibboleth.enc.sorbonne.fr-idp-shibboleth.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://shibboleth.enc.sorbonne.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-02T14:31:53Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enc.sorbonne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ecole Nationale des Chartes production</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZElEQVQoz5WSTU8TURSGz507czvTaacfFlCioEATAwkLEEgMK9iYuNKNiX/ExJ1/wYWJP4DEjTGRmLAwJn7ECCaopCja0hSKpdChH8x07nz03uMCgkZXvrtz3ufkbB6CiPA/Uf5dFasNAFgtVADA5eHfNf6RH5VDiVg/ck5Gxws6Dne8wHH5GXP6oWYfd/2eAHn/4dOMZSytrK0WKnbLffD4efWglTD1cq15QhJEbHZ4KqE/e7WeSZkSUQihx5gQMuoJCch5oMf0m/MTQiClREFEy2SuH3zfqdft40jI/NBAOplIW+al8+d0Ve3PWp+2Km433No5QETScTwkZOnFh7nJUcvQx4ZyEmDfbuuMGUzTNOp2/ZrdWtvcvXtjtid6is40KQQAVOtHRlz1goj7kdMN7LYLIP0gkhKXX28Ud/bbxx4FII7LPxerrQ6fn86HYVQo1abGhwGAqZoQ0cq7rwuz+XQy/ma9hADXJ0cUSpXxkcHtvcajJy+/lWtMo5QQRgmgRATT1DbL9Tv3Hi+/3ZgYG5QoVYkSQBnszwqR3Dto9WUtBUAhClEUABmGIqTR7cWZjBWPqRQlEs65w3t+EL7/Ui7/PDSY5ofRhVxapaRUbfRlE5Vac/Ri38LceMYyEjFVBYC4TgHYQC6VSuq5TPKo7Xo89MPo1uJUtd60O3x2ciRjGQajAEA8zwMAKSEUUtPoZrHW7vJeL5JSMQ0WCjF9dZhphNFTJ4jruqcaUgqIQkoeiLYTBGF0eTAFiJRSKeWZe78PbIeXdhszE1c+Frb3DzuUEhbTmKqaeqzrBwvX8ifYL1UkZ1awU1oLAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjEzKzAyOjAwKXrYNQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OToxMyswMjowMFgnYIkAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.enc.sorbonne.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Idp test école nationale des Chartes</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale des Chartes production</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Idp test école nationale des Chartes</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>
-					      MIIDUzCCAjugAwIBAgIUHHNR9K1ZuuDTVcVyeRLx99mFDa8wDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAwwac2hpYmJvbGV0aC5lbmMuc29yYm9ubmUuZnIwHhcNMTQx
-MTE0MTUxMjMzWhcNMzQxMTE0MTUxMjMzWjAlMSMwIQYDVQQDDBpzaGliYm9sZXRo
-LmVuYy5zb3Jib25uZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANZSfCkacJ9hNSaYxgFaZojB+8jhgGCdm4UrACCnIEWe0nUmAXZxkAsP4qwBIoFQ
-VVU/MrgEUdC0IET7zMDoJTNVAWny/7RwBUS5hqk9UW8SWWk7G3UK3JYQNyQQz94H
-ijjiBGWaul5Im+JmqIq53qQ0i6Eb6ME+PhtquaLHY7NbGADRBGl0FLxXculDirtr
-KagzWDL8WGem9pPK70VfA7NdoGK0mTQJ+sGtUpOMsnNzj9PdCh8Fy+zyc4mUWeE8
-ihunnzwXgh4JBdVpVoadL+RFjjrchNVl0URUDc+hppaq7o1dceGz7WjNE+tDczVU
-HsehrjZBMyiOWELToCRixaECAwEAAaN7MHkwHQYDVR0OBBYEFNb7pKFV8CQpIfWw
-5yA4HECYK+RDMFgGA1UdEQRRME+CGnNoaWJib2xldGguZW5jLnNvcmJvbm5lLmZy
-hjFodHRwczovL3NoaWJib2xldGguZW5jLnNvcmJvbm5lLmZyL2lkcC9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQAU+8wCycc2Bi+7LEh80AgyarkG5P/NUtc+
-tkIZrrOz69LB6f8BFngBo/+gbUshNKRW7LE8KvCu2qLJJlCh3hUs6dHtYi8qt/xk
-0y2Y86WizmPpA4+72wDw6i+nbWfaTUvs+pwY9In2gXxegFVZldCmbIwEflmu1gfM
-8nZJMLLuD1HkmNPA0bJSK15W+m8nj7H+90L9o9vm+Tl8aqilcVk4llTZRibACZXM
-fJHF1BDZX2A5KV8UzZ4NO8HQrBdMW/tVBZvBCCqAzrZreQY+fBv8se9HkR5M83Rr
-K+rXM7jkNQmgfZEZYJwccXuA+Ugd0UMtXh6qTpXcf8hNrCZEj9jQ
-					    </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-POST" Location="https://shibboleth.enc.sorbonne.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.enc.sorbonne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.enc.sorbonne.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Nationale des Chartes production</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale des Chartes production</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.enc.sorbonne.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>informatique@enc.sorbonne.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 a9b8ae7a..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ens-lyon.fr/idp/shibboleth">
-  <md: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>
-  </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 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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ens-lyon.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lyon.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ens-lyon.fr/idp/profile/SAML1/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">ENS de Lyon</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENS de Lyon</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://unknown.site.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Hugo Etievant</md:SurName>
-    <md:EmailAddress>hugo.etievant@ens-lyon.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sébastien Mei</md:SurName>
-    <md:EmailAddress>Sebastien.Mei@ens-lyon.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 1a443825..00000000
--- a/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.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://shibboleth.ensi-bourges.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.insa-cvl.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Supérieure d'Ingénieurs de Bourges</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>
-					      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>
-    </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-POST" Location="https://shibboleth.ensi-bourges.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensi-bourges.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensi-bourges.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Supérieure d'Ingénieurs de Bourges</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.insa-cvl.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Frédéric AURAMBOUT</md:SurName>
-    <md:EmailAddress>frederic.aurambout@ensi-bourges.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sylvain LESAGE</md:SurName>
-    <md:EmailAddress>sylvain.lesage@ensi-bourges.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 4c076999..00000000
--- a/swamid-interfederations-2.0/shibboleth.ensicaen.fr-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://shibboleth.ensicaen.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENSICAEN</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABCFBMVEUAFFIAdbUYRXMAqtZSnr0AUZwAjrUAKFp7qsYAZaWlvs4AgrUANGNCbYwAjtYIMFoASYwAbbXGy9YAIFK1vs4AgsYAos4AWYwAXZwAba0QMFoAecacssatw9Z7lq0ALGMAZa0AUZQAIFoAis4Amt4AHFIAfb1ars4AWZxKlr0ALFqErs4AirUAls4AMGMATZQAcb21w84Ags4AVZQAYa0QMGMAGFIAebUARYRSosYAVZwAjsaErsYAaaWUvtYAhrUAOGtKbYwAktYATYwAcbW9z94AJFIAntYAYaUAca0YMFoAfcacts61w9aUnrUAaa0AJFoAot5jstYILFoIMGO9w84Ahs4AWZRhldOjAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAxUlEQVQY01WP2w7BUBBFp25TNAZtKMrRRtCENERDUEXqcgjihf//E6MJIbPOetjZOZmBk/8/wO/LW6D59MHXWCBIe4OEDBGB0AgdfV0NZHRr9z0CcmCTSg6nigyOT29GgNed6g4O2zAKTA58QKO5dMP8olB4NErtOTeM3IoDRcpa1rRndQ6sVS/Mx3/07SI3Lpbaq2S6UmbNp+1xY2QtU5V7Z7sYn5VJmhvl1iaB+h6RoXUdhO4gCd5WsAR9josnFvxcHusFvMopDOdNWeIAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MzgrMDI6MDCGmuCMAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjM4KzAyOjAw98dYMAAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ensicaen.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENSICAEN</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>
-					      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>
-    </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-POST" Location="https://shibboleth.ensicaen.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensicaen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensicaen.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENSICAEN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENSICAEN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ensicaen.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>LEPLANQUAIS ARNAUD</md:SurName>
-    <md:EmailAddress>arnaud.leplanquais@ensicaen.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>LEVEE FREDDY</md:SurName>
-    <md:EmailAddress>freddy.levee@ensicaen.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9d6dd029..00000000
--- a/swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.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://shibboleth.ensiie.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">ENSIIE</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.ensiie.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ENSIIE</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>
-					      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>
-    </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-POST" Location="https://shibboleth.ensiie.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ensiie.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ensiie.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENSIIE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENSIIE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ensiie.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>THOMAS Gael</md:SurName>
-    <md:EmailAddress>gael.thomas@ensiie.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f78202a3..00000000
--- a/swamid-interfederations-2.0/shibboleth.envt.fr-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://shibboleth.envt.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</mdui:DisplayName>
-        <mdui:Logo height="7" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAHCAYAAAABIM1CAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAABwBZRSlVAAABaElEQVQY002Qv0tVYQCGn+9WJ26ZmqgpUpLIHRUadBAaG3KpNRAKp/4NQRuiJaE1cHBRlwgHGzIQRZwkvBVG5vHHufijo95b537nfud7WxTvs77P8PIYSdQxgnePsXEP+bb7eN+Sbhdzwc1bp7R3h8AmsCp4fVSBtqIBSUh6Kyl1qXQyhSpzyEZ7Ohi9ocMXqPQUufhYklQrn8jFf6TPMx/W9oWR9F7wHMAANtokWy6QGyphv8xBTuQfPsHZCrWD35igmca+wYvH34w9DuUW71FreEnTo3d4QbI8Rna6hEtvI+cx9idBRz/X+l9xvbWT6tEh/6bbuVp4hpH00Yarw8HdAYwxlL+uYHyVoLWDXEMXZ2lCFJboNZ/w0RvywxEAWXLGlXzjDluxUHV3Ni39UHljXS75q3p+bRS1uxUq+b6geOZB/bQiCRTvoAnQ9hKSxiXNy/t9770yay91l8WZ1aKkSUl3zuPzH5plBAlWtfmlAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjU3KzAyOjAwtr2Z4gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODo1NyswMjowMMfgIV4AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.envt.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Ecole Nationale Vétérinaire de Toulouse (ENVT)</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>
-					      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>
-    </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-POST" Location="https://shibboleth.envt.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.envt.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.envt.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Nationale Vétérinaire de Toulouse (ENVT)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.envt.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ARNOUX Jean-Baptiste</md:SurName>
-    <md:EmailAddress>jb.arnoux@envt.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.falmouth.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.falmouth.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 25f4d1b0..00000000
--- a/swamid-interfederations-2.0/shibboleth.falmouth.ac.uk-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://shibboleth.falmouth.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Falmouth University" Shibboleth IdP for Falmouth Exeter plus.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-15T17:28: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>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">falmouth.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVALQiK8QYmXH3vEarjOmgkNsvKZyyMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguZmFsbW91dGguYWMudWswHhcNMTQx
-						MTExMTUxMzMxWhcNMzQxMTExMTUxMzMxWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-						LmZhbG1vdXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						htyRP37lfHCQSvTtB09QGwRMXaHxV0KcAyDm2haJWRVnS/Q2nCXkDH4N0l3nsb8S
-						ibeizS3gnWkJM52C4VXm1Dn/4jZEu0tT/yrjfz4LOWx6pPluUg29euLr7ICLdPAv
-						fjH0iQ4Ah2mVc0iEwtFhrnDCV1uGPgxsu8DpiV0TrpoqTlEIzcB9z6Y4ha7yuZ2j
-						p0SP1piRoFBoeXeRDJ3D4Lprw8YV1ZKLOZaeyI8n8KIwspLZLcAqIkGoJ0k1u1Fl
-						OcqRD2xPzQ+CgOtzzvSIOrPD0yKhuwb1zJ66cu2cpRdITRnrg2ayP/gXiF+LAhTJ
-						ybc9lDB//HyWDrj9iU00cwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-						LmZhbG1vdXRoLmFjLnVrhjBodHRwczovL3NoaWJib2xldGguZmFsbW91dGguYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDl7aG6kieISm3+HL81qMYelebh9
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBvm0t4OJ4W610vCQDGC5irYM4JqFYItWAL783e
-						raMoAAhoQ37r+qfeXeZXox0tpz1A2Jt//4ub46//AOksCPbAa22mWoHyFxcJcjRR
-						ZR17kXkAaopgrcUhrrPSt+TFy2i2CHnuWcR1ypqyPj6nq5RfgptUYkJEVe4fwF6n
-						zjv7yp0173zZckOhbclz2yer9jl92eYG0eTVtOY43TILPkc55e5JDd72A2YfqLSz
-						8PF/30MxntDXnOWtFXYktXQW7u4cIEVFcOytK1kap6TQhjDVHulpPvFocfGj/OVp
-						Vk5or0/R1H+xdwevs2D+MnCZfXq8lZPgZHgthYP/lhIhlvvB
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.falmouth.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://shibboleth.falmouth.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.falmouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.falmouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.falmouth.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">falmouth.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVALQiK8QYmXH3vEarjOmgkNsvKZyyMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGguZmFsbW91dGguYWMudWswHhcNMTQx
-						MTExMTUxMzMxWhcNMzQxMTExMTUxMzMxWjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-						LmZhbG1vdXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						htyRP37lfHCQSvTtB09QGwRMXaHxV0KcAyDm2haJWRVnS/Q2nCXkDH4N0l3nsb8S
-						ibeizS3gnWkJM52C4VXm1Dn/4jZEu0tT/yrjfz4LOWx6pPluUg29euLr7ICLdPAv
-						fjH0iQ4Ah2mVc0iEwtFhrnDCV1uGPgxsu8DpiV0TrpoqTlEIzcB9z6Y4ha7yuZ2j
-						p0SP1piRoFBoeXeRDJ3D4Lprw8YV1ZKLOZaeyI8n8KIwspLZLcAqIkGoJ0k1u1Fl
-						OcqRD2xPzQ+CgOtzzvSIOrPD0yKhuwb1zJ66cu2cpRdITRnrg2ayP/gXiF+LAhTJ
-						ybc9lDB//HyWDrj9iU00cwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-						LmZhbG1vdXRoLmFjLnVrhjBodHRwczovL3NoaWJib2xldGguZmFsbW91dGguYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDl7aG6kieISm3+HL81qMYelebh9
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBvm0t4OJ4W610vCQDGC5irYM4JqFYItWAL783e
-						raMoAAhoQ37r+qfeXeZXox0tpz1A2Jt//4ub46//AOksCPbAa22mWoHyFxcJcjRR
-						ZR17kXkAaopgrcUhrrPSt+TFy2i2CHnuWcR1ypqyPj6nq5RfgptUYkJEVe4fwF6n
-						zjv7yp0173zZckOhbclz2yer9jl92eYG0eTVtOY43TILPkc55e5JDd72A2YfqLSz
-						8PF/30MxntDXnOWtFXYktXQW7u4cIEVFcOytK1kap6TQhjDVHulpPvFocfGj/OVp
-						Vk5or0/R1H+xdwevs2D+MnCZfXq8lZPgZHgthYP/lhIhlvvB
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.falmouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.falmouth.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">Falmouth Exeter plus</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Falmouth University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.falmouth.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Pellow</SurName>
-    <EmailAddress>mailto:steve.pellow@fxplus.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Pellow</SurName>
-    <EmailAddress>mailto:steve.pellow@fxplus.ac.uk</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 ee0acece..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="de">FH Wiener Neustadt</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Applied Sciences Wiener Neustadt</mdui:DisplayName>
-        <mdui:Logo width="125" height="85">https://moodle2.fhwn.ac.at/bilder/logo.jpg</mdui:Logo>
-        <mdui:Logo width="16" height="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 f456acf5..00000000
--- a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.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://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-20131015</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">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>
-      <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>
-      <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.fiz-technik.de.xml b/swamid-interfederations-2.0/shibboleth.fiz-technik.de.xml
deleted file mode 100644
index 82eeab9d..00000000
--- a/swamid-interfederations-2.0/shibboleth.fiz-technik.de.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.fiz-technik.de/tecfinder">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.fiz-technik.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.fiz-technik.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=shibboleth.fiz-technik.de</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDrzCCAxigAwIBAgIQSmJiEIhvAft2pfFj8ep6UjANBgkqhkiG9w0BAQUFADCB
-xDELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
-Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
-CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhh
-d3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
-ZS5jb20wHhcNMTAwMzMwMDAwMDAwWhcNMTMwMzI5MjM1OTU5WjCBxDEiMCAGA1UE
-ChQZc2hpYmJvbGV0aC5maXotdGVjaG5pay5kZTE7MDkGA1UECxMyR28gdG8gaHR0
-cHM6Ly93d3cudGhhd3RlLmNvbS9yZXBvc2l0b3J5L2luZGV4Lmh0bWwxIjAgBgNV
-BAsTGVRoYXd0ZSBTU0wxMjMgY2VydGlmaWNhdGUxGTAXBgNVBAsTEERvbWFpbiBW
-YWxpZGF0ZWQxIjAgBgNVBAMUGXNoaWJib2xldGguZml6LXRlY2huaWsuZGUwgZ8w
-DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDklec3g2ICvi2qW/wtqnW1YA1/2eHu
-Rs01+aEMcb/ccljjbl+dW8klZgZA5Srisz+GTDwxBrf6zVFeS57LpIyXAEjnDUOW
-bK3430IyzI1iK4NYwRm94Ay587U18Hz+U3poxj2QVYND0O2lAK8YzqbzkTIoZk9U
-eXQq6xRhLYxnAgMBAAGjgZ8wgZwwDAYDVR0TAQH/BAIwADA5BgNVHR8EMjAwMC6g
-LKAqhihodHRwOi8vY3JsLnRoYXd0ZS5jb20vVGhhd3RlU2VydmVyQ0EuY3JsMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYI
-KwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQAD
-gYEAKmlKgA3lVXhrOw8B2DENHdsXW2UHbwb1YMhGiD4vGETlqOPdcr/yxwGQ7y2M
-u4E6h4nwnIbf7iGw/N/d27RRpELP8RISHDmEyjanUsI5jjF69+dsqU6zbVVJtBDe
-3gXxVMmLZ3gV/u4BtQX3+4qsQe0cZG/sMW0sp5wU+8K9Yq0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.fiz-technik.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.fiz-technik.de,OU=Domain Validated,OU=Thawte SSL123 certificate,OU=Go to https://www.thawte.com/repository/index.html,O=shibboleth.fiz-technik.de</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDrzCCAxigAwIBAgIQSmJiEIhvAft2pfFj8ep6UjANBgkqhkiG9w0BAQUFADCB
-xDELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
-Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
-CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhh
-d3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0
-ZS5jb20wHhcNMTAwMzMwMDAwMDAwWhcNMTMwMzI5MjM1OTU5WjCBxDEiMCAGA1UE
-ChQZc2hpYmJvbGV0aC5maXotdGVjaG5pay5kZTE7MDkGA1UECxMyR28gdG8gaHR0
-cHM6Ly93d3cudGhhd3RlLmNvbS9yZXBvc2l0b3J5L2luZGV4Lmh0bWwxIjAgBgNV
-BAsTGVRoYXd0ZSBTU0wxMjMgY2VydGlmaWNhdGUxGTAXBgNVBAsTEERvbWFpbiBW
-YWxpZGF0ZWQxIjAgBgNVBAMUGXNoaWJib2xldGguZml6LXRlY2huaWsuZGUwgZ8w
-DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKDklec3g2ICvi2qW/wtqnW1YA1/2eHu
-Rs01+aEMcb/ccljjbl+dW8klZgZA5Srisz+GTDwxBrf6zVFeS57LpIyXAEjnDUOW
-bK3430IyzI1iK4NYwRm94Ay587U18Hz+U3poxj2QVYND0O2lAK8YzqbzkTIoZk9U
-eXQq6xRhLYxnAgMBAAGjgZ8wgZwwDAYDVR0TAQH/BAIwADA5BgNVHR8EMjAwMC6g
-LKAqhihodHRwOi8vY3JsLnRoYXd0ZS5jb20vVGhhd3RlU2VydmVyQ0EuY3JsMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcBAQQmMCQwIgYI
-KwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZIhvcNAQEFBQAD
-gYEAKmlKgA3lVXhrOw8B2DENHdsXW2UHbwb1YMhGiD4vGETlqOPdcr/yxwGQ7y2M
-u4E6h4nwnIbf7iGw/N/d27RRpELP8RISHDmEyjanUsI5jjF69+dsqU6zbVVJtBDe
-3gXxVMmLZ3gV/u4BtQX3+4qsQe0cZG/sMW0sp5wU+8K9Yq0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.fiz-technik.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">WTI-Frankfurt eG</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">WTI-Frankfurt</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.wti-frankfurt.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Christian</GivenName>
-    <SurName>Seger</SurName>
-    <EmailAddress>christian.seger@wti-frankfurt.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.fucape.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.fucape.br-idp-shibboleth.xml
deleted file mode 100644
index 1b66f666..00000000
--- a/swamid-interfederations-2.0/shibboleth.fucape.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://shibboleth.fucape.br/idp/shibboleth">
-  <md: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>
-  </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">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</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</mdui:Description>
-        <mdui:Description xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xMDAuBgNVBAoTJ0Z1bmRhY2Fv
-IEluc3RpdHV0byBDYXBpeGFiYSBkZSBQZXNxdWlzYTELMAkGA1UECxMCVEkxJTAj
-BgkqhkiG9w0BCQEWFmNhcmxvc3JlbmF0b0BmdWNhcGUuYnIxEjAQBgNVBAcTCUJv
-YSBWaXN0YTEXMBUGA1UECBMORXNwaXJpdG8gU2FudG8xCzAJBgNVBAYTAkJSMR0w
-GwYDVQQDExRzaGliYm9sZXRoLmZ1Y2FwZS5icjAeFw0xNTA1MTkxMTEyNTVaFw0x
-ODA1MTgxMTEyNTVaMIG/MTAwLgYDVQQKEydGdW5kYWNhbyBJbnN0aXR1dG8gQ2Fw
-aXhhYmEgZGUgUGVzcXVpc2ExCzAJBgNVBAsTAlRJMSUwIwYJKoZIhvcNAQkBFhZj
-YXJsb3NyZW5hdG9AZnVjYXBlLmJyMRIwEAYDVQQHEwlCb2EgVmlzdGExFzAVBgNV
-BAgTDkVzcGlyaXRvIFNhbnRvMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMUc2hpYmJv
-bGV0aC5mdWNhcGUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCn
-3tnSlQ+G13XgIL+lq1AdNUVrGXs01C8Rhq6hnCN8RG7PNgkQKgaXdQ4cSsFEoj4j
-8JFYdBDBPQnzqZRrZA2an8IpX0iz4sU5tF/o2ege9LiAlt47VoBxXS3ca53QFbKB
-U7aqdVYWdJ3v1fMMoDgfDeTwzHG9mNIM/xzHmJTl/cn+as79zqV5SL80b5PvLLpT
-2zxJXGyBLWj36NBsUAF+8wWJDkgej1jFhmKeD4LrihTKG17769Gy5p7ZlyZRBdnn
-keSi+eTVEv9d4kP5xpjtyBx2Kk6yK/j8fBL0m1LU2VC1iLbv/YRMLoba6Xi1rE5R
-xAJ8Zke8IohaSYQPY4aTAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAI47DxpRLjUC
-CUMOGHSe/LKTu6hFLDj0O7uCgjTgd18+kQGrPiwc6SOzWbulXi1jrrfKI6rnI1PO
-IvP3upcjS45jcMl3zBVljsVayHR/OWH7n6UJowexBLHmSiAcbrimdedQJkhlO55q
-90YLosc3+VpUqQQsig6/CZbAH8m++mtfXtXdhWVxi7JFKtbndQMRv0LkYxGd420a
-3rj++WpUOJeaKIN2SBP/EDVY5NHYz6ZYsD37K9QLlWuGR7jdJE4H6OftlRgAAU1E
-fH4ipdpb88WsxqPvxI40KormMp6Cp39pyQtMm5JzztVWLeP/pBjUMixByeDbwY4d
-HTlVjz7ufx0=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fucape.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fucape.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://shibboleth.fucape.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fucape.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.fucape.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fucape.br/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">fucape.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID9DCCAtwCAQAwDQYJKoZIhvcNAQEFBQAwgb8xMDAuBgNVBAoTJ0Z1bmRhY2Fv
-IEluc3RpdHV0byBDYXBpeGFiYSBkZSBQZXNxdWlzYTELMAkGA1UECxMCVEkxJTAj
-BgkqhkiG9w0BCQEWFmNhcmxvc3JlbmF0b0BmdWNhcGUuYnIxEjAQBgNVBAcTCUJv
-YSBWaXN0YTEXMBUGA1UECBMORXNwaXJpdG8gU2FudG8xCzAJBgNVBAYTAkJSMR0w
-GwYDVQQDExRzaGliYm9sZXRoLmZ1Y2FwZS5icjAeFw0xNTA1MTkxMTEyNTVaFw0x
-ODA1MTgxMTEyNTVaMIG/MTAwLgYDVQQKEydGdW5kYWNhbyBJbnN0aXR1dG8gQ2Fw
-aXhhYmEgZGUgUGVzcXVpc2ExCzAJBgNVBAsTAlRJMSUwIwYJKoZIhvcNAQkBFhZj
-YXJsb3NyZW5hdG9AZnVjYXBlLmJyMRIwEAYDVQQHEwlCb2EgVmlzdGExFzAVBgNV
-BAgTDkVzcGlyaXRvIFNhbnRvMQswCQYDVQQGEwJCUjEdMBsGA1UEAxMUc2hpYmJv
-bGV0aC5mdWNhcGUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCn
-3tnSlQ+G13XgIL+lq1AdNUVrGXs01C8Rhq6hnCN8RG7PNgkQKgaXdQ4cSsFEoj4j
-8JFYdBDBPQnzqZRrZA2an8IpX0iz4sU5tF/o2ege9LiAlt47VoBxXS3ca53QFbKB
-U7aqdVYWdJ3v1fMMoDgfDeTwzHG9mNIM/xzHmJTl/cn+as79zqV5SL80b5PvLLpT
-2zxJXGyBLWj36NBsUAF+8wWJDkgej1jFhmKeD4LrihTKG17769Gy5p7ZlyZRBdnn
-keSi+eTVEv9d4kP5xpjtyBx2Kk6yK/j8fBL0m1LU2VC1iLbv/YRMLoba6Xi1rE5R
-xAJ8Zke8IohaSYQPY4aTAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAI47DxpRLjUC
-CUMOGHSe/LKTu6hFLDj0O7uCgjTgd18+kQGrPiwc6SOzWbulXi1jrrfKI6rnI1PO
-IvP3upcjS45jcMl3zBVljsVayHR/OWH7n6UJowexBLHmSiAcbrimdedQJkhlO55q
-90YLosc3+VpUqQQsig6/CZbAH8m++mtfXtXdhWVxi7JFKtbndQMRv0LkYxGd420a
-3rj++WpUOJeaKIN2SBP/EDVY5NHYz6ZYsD37K9QLlWuGR7jdJE4H6OftlRgAAU1E
-fH4ipdpb88WsxqPvxI40KormMp6Cp39pyQtMm5JzztVWLeP/pBjUMixByeDbwY4d
-HTlVjz7ufx0=
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fucape.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.fucape.br:8443/idp/profile/SAML1/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">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">FUCAPE - Fundacao Instituto Capixaba de Pesquisa</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fucape.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.fucape.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Carlos Renato Souza</md:SurName>
-    <md:EmailAddress>carlosrenato@fucape.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.fullerton.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.fullerton.edu-idp-shibboleth.xml
deleted file mode 100644
index e643fef0..00000000
--- a/swamid-interfederations-2.0/shibboleth.fullerton.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,114 +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://shibboleth.fullerton.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shibboleth.fullerton.edu/idp/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fullerton.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Fullerton</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>
-MIIE7jCCA9agAwIBAgIJAKJvT9iELa2jMA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTESMBAGA1UEBxMJRnVsbGVydG9u
-MS4wLAYDVQQKEyVDYWxpZm9ybmlhIFN0YXRlIFVuaXZlcnNpdHkgRnVsbGVydG9u
-MR8wHQYDVQQLExZJbmZvcm1hdGlvbiBUZWNobm9sb2d5MSEwHwYDVQQDExhzaGli
-Ym9sZXRoLmZ1bGxlcnRvbi5lZHUwHhcNMTEwNTA1MjI0OTE3WhcNMzEwNTA1MjI0
-OTE3WjCBqjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNV
-BAcTCUZ1bGxlcnRvbjEuMCwGA1UEChMlQ2FsaWZvcm5pYSBTdGF0ZSBVbml2ZXJz
-aXR5IEZ1bGxlcnRvbjEfMB0GA1UECxMWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEh
-MB8GA1UEAxMYc2hpYmJvbGV0aC5mdWxsZXJ0b24uZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAvHq9C03zghSdwmcxhBuvfsE+75ZZHQMUMXhzpSiV
-8/xOmcbYuqqLZfx4fnwKtAebj1qsrG8my4cHI99+phQaDZsrsBjfsd/eiYjol6iy
-KkwQlrTni3KuXH7akeKA5xNEcu/sUbT30a1nwG0aB1PgyHievHEkgvnA0FPXCefb
-UuEpGhCVF6O9oHdHVw19sKWuwBYU/vXC2WqVtsTANyIQO/AkMBkGmlDRrYHanRBB
-P2XtovZ2IqL1wXH8UofvNtgrWqcD8VV7zzPww7yKxLUDc4HTMQL98sulmeDwyL8M
-d55uMgYoFTwiQy9HIaGNdWpIYp6mBcdB9gvRpxXlCuNfnwIDAQABo4IBEzCCAQ8w
-HQYDVR0OBBYEFK3UuxZpYqB/HCc+iN5At67mWuKgMIHfBgNVHSMEgdcwgdSAFK3U
-uxZpYqB/HCc+iN5At67mWuKgoYGwpIGtMIGqMQswCQYDVQQGEwJVUzETMBEGA1UE
-CBMKQ2FsaWZvcm5pYTESMBAGA1UEBxMJRnVsbGVydG9uMS4wLAYDVQQKEyVDYWxp
-Zm9ybmlhIFN0YXRlIFVuaXZlcnNpdHkgRnVsbGVydG9uMR8wHQYDVQQLExZJbmZv
-cm1hdGlvbiBUZWNobm9sb2d5MSEwHwYDVQQDExhzaGliYm9sZXRoLmZ1bGxlcnRv
-bi5lZHWCCQCib0/YhC2tozAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQB2mWlr3Gf0uCYnn6OIc8W9ciHYwYKH2SW+RlkLJ7TaP+KDHn53/bIe1Wpxx3i0
-69ExK8IjgkKr2QBjxJ8ovM4BS3qmFU90ktscyE7Gyv46KqnZ1mN2LTKview+Vwup
-R8QDOdsOKEbGAe5VpfIADW8Ld+Lf8H3EyUACMmS39QrlLOsliv+caAAMfzMYaLZv
-971G1LFkSC7x3MiRcTWILPysYyXNyzY5inrd6tq1/mKvPJznDrIuB5/GeuHVWDXF
-XWs1h62037Zvh7EB/R1xe50WroBer+UaY/wYHGI/3fvNGL+kqLPTr4/AlvQqxvy3
-Gc2F/ykKIjW0nT9SvOyCxjGw
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fullerton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fullerton.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.fullerton.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fullerton.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE7jCCA9agAwIBAgIJAKJvT9iELa2jMA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTESMBAGA1UEBxMJRnVsbGVydG9u
-MS4wLAYDVQQKEyVDYWxpZm9ybmlhIFN0YXRlIFVuaXZlcnNpdHkgRnVsbGVydG9u
-MR8wHQYDVQQLExZJbmZvcm1hdGlvbiBUZWNobm9sb2d5MSEwHwYDVQQDExhzaGli
-Ym9sZXRoLmZ1bGxlcnRvbi5lZHUwHhcNMTEwNTA1MjI0OTE3WhcNMzEwNTA1MjI0
-OTE3WjCBqjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNV
-BAcTCUZ1bGxlcnRvbjEuMCwGA1UEChMlQ2FsaWZvcm5pYSBTdGF0ZSBVbml2ZXJz
-aXR5IEZ1bGxlcnRvbjEfMB0GA1UECxMWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEh
-MB8GA1UEAxMYc2hpYmJvbGV0aC5mdWxsZXJ0b24uZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAvHq9C03zghSdwmcxhBuvfsE+75ZZHQMUMXhzpSiV
-8/xOmcbYuqqLZfx4fnwKtAebj1qsrG8my4cHI99+phQaDZsrsBjfsd/eiYjol6iy
-KkwQlrTni3KuXH7akeKA5xNEcu/sUbT30a1nwG0aB1PgyHievHEkgvnA0FPXCefb
-UuEpGhCVF6O9oHdHVw19sKWuwBYU/vXC2WqVtsTANyIQO/AkMBkGmlDRrYHanRBB
-P2XtovZ2IqL1wXH8UofvNtgrWqcD8VV7zzPww7yKxLUDc4HTMQL98sulmeDwyL8M
-d55uMgYoFTwiQy9HIaGNdWpIYp6mBcdB9gvRpxXlCuNfnwIDAQABo4IBEzCCAQ8w
-HQYDVR0OBBYEFK3UuxZpYqB/HCc+iN5At67mWuKgMIHfBgNVHSMEgdcwgdSAFK3U
-uxZpYqB/HCc+iN5At67mWuKgoYGwpIGtMIGqMQswCQYDVQQGEwJVUzETMBEGA1UE
-CBMKQ2FsaWZvcm5pYTESMBAGA1UEBxMJRnVsbGVydG9uMS4wLAYDVQQKEyVDYWxp
-Zm9ybmlhIFN0YXRlIFVuaXZlcnNpdHkgRnVsbGVydG9uMR8wHQYDVQQLExZJbmZv
-cm1hdGlvbiBUZWNobm9sb2d5MSEwHwYDVQQDExhzaGliYm9sZXRoLmZ1bGxlcnRv
-bi5lZHWCCQCib0/YhC2tozAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQB2mWlr3Gf0uCYnn6OIc8W9ciHYwYKH2SW+RlkLJ7TaP+KDHn53/bIe1Wpxx3i0
-69ExK8IjgkKr2QBjxJ8ovM4BS3qmFU90ktscyE7Gyv46KqnZ1mN2LTKview+Vwup
-R8QDOdsOKEbGAe5VpfIADW8Ld+Lf8H3EyUACMmS39QrlLOsliv+caAAMfzMYaLZv
-971G1LFkSC7x3MiRcTWILPysYyXNyzY5inrd6tq1/mKvPJznDrIuB5/GeuHVWDXF
-XWs1h62037Zvh7EB/R1xe50WroBer+UaY/wYHGI/3fvNGL+kqLPTr4/AlvQqxvy3
-Gc2F/ykKIjW0nT9SvOyCxjGw
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.fullerton.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Fullerton</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Fullerton</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fullerton.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>James O'Dell</md:GivenName>
-    <md:EmailAddress>jodell@fullerton.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.genios.de.xml b/swamid-interfederations-2.0/shibboleth.genios.de.xml
deleted file mode 100644
index 5410dcd2..00000000
--- a/swamid-interfederations-2.0/shibboleth.genios.de.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.genios.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.genios.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.genios.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.genios.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCDCCA/CgAwIBAgIEDwkukjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTEwMjkxNTEzMDdaFw0xNDEw
-MjgxNTEzMDdaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRzaGliYm9sZXRoLmdlbmlvcy5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANs1k1RNyLZJd5PM2XgPBeq3
-LYXgP6DfmAFbFQuoIDANZneVnjLsHs/DqlqDV8pxzVKaOePrtVG9XDqiwAQNMxkX
-Fs/yiGQgcpsOu/Hn55MJDPgVs8gJlo72twjlfsMYkysxeKpo02HcPk94v3G+DGqu
-paM0Qatil5bFGtPFnbiPcEHWhL5IHeMmOQgtgPRmcCdegUoiUQy3XzNe2/AlebQq
-3jY5/j+139Gt4l6NdFBVtrClC3No9TYQzud5/AZqK6c8C/OdoZS5JqGTCjxuFr52
-HFIgUquO+NnvX3l+/KHEX3BpJn8G3QSxTK29N/ZOyvBnZZERc6wLjlHsPfRKfDEC
-AwEAAaOCAeAwggHcMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUAsSAuxpb2YDdSV9WArYEb5tR
-2ZwwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIgYDVR0RBBswGYEX
-bWljaGFlbC5rbGVua0BnZW5pb3MuZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9j
-YWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNl
-cnZpY2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCBmjBL
-BggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
-ZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAFoCZY0R/3oytr3alxrwA6Tr+Kbo
-QakMblJoTygM6U+JA5+aKbSiQ5Kdyhw77ax2pmwN7BQYTLyL23S69C5/hFIg5BBk
-dbaIxxixf+Y7Nt+GZQL1WoUDikRs+KPRJqBOh0AVbYLnEUsOgEWWC7e/WnarH/lK
-taXlY6gtmP9FoUgn96U6tw1KOTXaGnA0DX3DBVhzMMQubgeecEAPey8wuIc1CpZP
-HjFM51epuXN3Tgw25hDokzI31dxNFAi+N8DjC3EHLWGPj8ac+m0pJ/7c4BMKU0H5
-bgLvAdbf7U7Z4IidrTae8SmJ385S0oLvO/NOheaRinhBZbSPkkXxniZaDAU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.genios.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.genios.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCDCCA/CgAwIBAgIEDwkukjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTEwMjkxNTEzMDdaFw0xNDEw
-MjgxNTEzMDdaMFMxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMR0wGwYDVQQDExRzaGliYm9sZXRoLmdlbmlvcy5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANs1k1RNyLZJd5PM2XgPBeq3
-LYXgP6DfmAFbFQuoIDANZneVnjLsHs/DqlqDV8pxzVKaOePrtVG9XDqiwAQNMxkX
-Fs/yiGQgcpsOu/Hn55MJDPgVs8gJlo72twjlfsMYkysxeKpo02HcPk94v3G+DGqu
-paM0Qatil5bFGtPFnbiPcEHWhL5IHeMmOQgtgPRmcCdegUoiUQy3XzNe2/AlebQq
-3jY5/j+139Gt4l6NdFBVtrClC3No9TYQzud5/AZqK6c8C/OdoZS5JqGTCjxuFr52
-HFIgUquO+NnvX3l+/KHEX3BpJn8G3QSxTK29N/ZOyvBnZZERc6wLjlHsPfRKfDEC
-AwEAAaOCAeAwggHcMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUAsSAuxpb2YDdSV9WArYEb5tR
-2ZwwHwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIgYDVR0RBBswGYEX
-bWljaGFlbC5rbGVua0BnZW5pb3MuZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9j
-YWNybC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNl
-cnZpY2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCBmjBL
-BggrBgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2Vydmlj
-ZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAFoCZY0R/3oytr3alxrwA6Tr+Kbo
-QakMblJoTygM6U+JA5+aKbSiQ5Kdyhw77ax2pmwN7BQYTLyL23S69C5/hFIg5BBk
-dbaIxxixf+Y7Nt+GZQL1WoUDikRs+KPRJqBOh0AVbYLnEUsOgEWWC7e/WnarH/lK
-taXlY6gtmP9FoUgn96U6tw1KOTXaGnA0DX3DBVhzMMQubgeecEAPey8wuIc1CpZP
-HjFM51epuXN3Tgw25hDokzI31dxNFAi+N8DjC3EHLWGPj8ac+m0pJ/7c4BMKU0H5
-bgLvAdbf7U7Z4IidrTae8SmJ385S0oLvO/NOheaRinhBZbSPkkXxniZaDAU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.genios.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.genios.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.genios.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.genios.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.genios.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.genios.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.genios.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.genios.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.genios.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">GBI-Genios Deutsche Wirtschaftsdatenbanken GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">GBI-Genios Deutsche Wirtschaftsdatenbanken GmbH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.genios.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Klenk</SurName>
-    <EmailAddress>michael.klenk@genios.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.globaldata.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.globaldata.com-shibboleth.xml
deleted file mode 100644
index 2f56e4c5..00000000
--- a/swamid-interfederations-2.0/shibboleth.globaldata.com-shibboleth.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://shibboleth.globaldata.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for GlobalData Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAItPz9n2+PuaMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB4XDTExMTEyODEwMTQxMFoXDTE2
-						MTEyNjEwMTQxMFowIjEgMB4GA1UEAxMXZGVkMDk2Lm1heGltdW1hc3AubG9jYWww
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwNeNpZKlWDp7GciyA162g
-						VSy3uTRG2BT48mp/oB4Wh7DqNbPHx8PrWJrN0xw+c1o1OarYuaWK24H9F1n3ZI8g
-						i/czA4Zi2JsIZmWksu5jYVgZQQnMyVCrA1fB4tjz2GTnrmy7HTt7axMAHlUyupDw
-						gh/YcaJ84U1JssiLeSypkHeSyLv/Cew5HI6kARv99/oVSBR7kfOAUPg+fP8kjvlK
-						dn6RShLwkY+9KQCK9lY6aaJHrNtRDfSQVZsZgfLwzK+HCGspWHFp7KirfdTBcCkR
-						w+berqH4RmOPbcv4TxGva/XEefM9Ikw8FD1Yb7Hcum6avHcD/s02jYzvISUr56FT
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB0G
-						A1UdDgQWBBQsoQCuifh3Q5K7lzut09/s9A3G8jANBgkqhkiG9w0BAQUFAAOCAQEA
-						DyvSdKPdXmbCft4A6Bwqpw0Y1hMuyme8wOskJpQIJ7WXhdyCB3eOYz1dGcmFkeQU
-						aUJS6x9ZPLkRVX0e8Eoa/w1rYam5Zi3Fv0ZjLLKA7EFkX4aNzeE8vU0y/XZ9amRf
-						fIZ/Tse7wvCJTHWNrw0eoTy2xNnPRWhLALF8nNaR66S5Usesosv0fKqpK20nrjmF
-						wtHuAhh4Jbh6mZZemqKOgcxs9JX5qTsO96plS+Rb2iH2oMP0PrqzjwvHyFAPv8gb
-						Rt8vBK4vYP16FHxWHw9TNnlQ93w4ozWNtnUHOrvoXghavIUg7MTOIQZ5awgMKr8U
-						KRmv+oFXiBHlwyDVz3wIPg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GlobalData Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GlobalData Ltd SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.globaldata.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jeevan Kumar</GivenName>
-    <SurName>Pinnireddy</SurName>
-    <EmailAddress>mailto:jpinnireddy@globaldata.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jeevan Kumar</GivenName>
-    <SurName>Pinnireddy</SurName>
-    <EmailAddress>mailto:jpinnireddy@globaldata.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.globaldata.com.xml b/swamid-interfederations-2.0/shibboleth.globaldata.com.xml
deleted file mode 100644
index c650e116..00000000
--- a/swamid-interfederations-2.0/shibboleth.globaldata.com.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.globaldata.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ded096.maximumasp.local</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ded096.maximumasp.local</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAItPz9n2+PuaMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB4XDTExMTEyODEwMTQxMFoXDTE2
-MTEyNjEwMTQxMFowIjEgMB4GA1UEAxMXZGVkMDk2Lm1heGltdW1hc3AubG9jYWww
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwNeNpZKlWDp7GciyA162g
-VSy3uTRG2BT48mp/oB4Wh7DqNbPHx8PrWJrN0xw+c1o1OarYuaWK24H9F1n3ZI8g
-i/czA4Zi2JsIZmWksu5jYVgZQQnMyVCrA1fB4tjz2GTnrmy7HTt7axMAHlUyupDw
-gh/YcaJ84U1JssiLeSypkHeSyLv/Cew5HI6kARv99/oVSBR7kfOAUPg+fP8kjvlK
-dn6RShLwkY+9KQCK9lY6aaJHrNtRDfSQVZsZgfLwzK+HCGspWHFp7KirfdTBcCkR
-w+berqH4RmOPbcv4TxGva/XEefM9Ikw8FD1Yb7Hcum6avHcD/s02jYzvISUr56FT
-AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB0G
-A1UdDgQWBBQsoQCuifh3Q5K7lzut09/s9A3G8jANBgkqhkiG9w0BAQUFAAOCAQEA
-DyvSdKPdXmbCft4A6Bwqpw0Y1hMuyme8wOskJpQIJ7WXhdyCB3eOYz1dGcmFkeQU
-aUJS6x9ZPLkRVX0e8Eoa/w1rYam5Zi3Fv0ZjLLKA7EFkX4aNzeE8vU0y/XZ9amRf
-fIZ/Tse7wvCJTHWNrw0eoTy2xNnPRWhLALF8nNaR66S5Usesosv0fKqpK20nrjmF
-wtHuAhh4Jbh6mZZemqKOgcxs9JX5qTsO96plS+Rb2iH2oMP0PrqzjwvHyFAPv8gb
-Rt8vBK4vYP16FHxWHw9TNnlQ93w4ozWNtnUHOrvoXghavIUg7MTOIQZ5awgMKr8U
-KRmv+oFXiBHlwyDVz3wIPg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ded096.maximumasp.local</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ded096.maximumasp.local</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAItPz9n2+PuaMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB4XDTExMTEyODEwMTQxMFoXDTE2
-MTEyNjEwMTQxMFowIjEgMB4GA1UEAxMXZGVkMDk2Lm1heGltdW1hc3AubG9jYWww
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwNeNpZKlWDp7GciyA162g
-VSy3uTRG2BT48mp/oB4Wh7DqNbPHx8PrWJrN0xw+c1o1OarYuaWK24H9F1n3ZI8g
-i/czA4Zi2JsIZmWksu5jYVgZQQnMyVCrA1fB4tjz2GTnrmy7HTt7axMAHlUyupDw
-gh/YcaJ84U1JssiLeSypkHeSyLv/Cew5HI6kARv99/oVSBR7kfOAUPg+fP8kjvlK
-dn6RShLwkY+9KQCK9lY6aaJHrNtRDfSQVZsZgfLwzK+HCGspWHFp7KirfdTBcCkR
-w+berqH4RmOPbcv4TxGva/XEefM9Ikw8FD1Yb7Hcum6avHcD/s02jYzvISUr56FT
-AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2RlZDA5Ni5tYXhpbXVtYXNwLmxvY2FsMB0G
-A1UdDgQWBBQsoQCuifh3Q5K7lzut09/s9A3G8jANBgkqhkiG9w0BAQUFAAOCAQEA
-DyvSdKPdXmbCft4A6Bwqpw0Y1hMuyme8wOskJpQIJ7WXhdyCB3eOYz1dGcmFkeQU
-aUJS6x9ZPLkRVX0e8Eoa/w1rYam5Zi3Fv0ZjLLKA7EFkX4aNzeE8vU0y/XZ9amRf
-fIZ/Tse7wvCJTHWNrw0eoTy2xNnPRWhLALF8nNaR66S5Usesosv0fKqpK20nrjmF
-wtHuAhh4Jbh6mZZemqKOgcxs9JX5qTsO96plS+Rb2iH2oMP0PrqzjwvHyFAPv8gb
-Rt8vBK4vYP16FHxWHw9TNnlQ93w4ozWNtnUHOrvoXghavIUg7MTOIQZ5awgMKr8U
-KRmv+oFXiBHlwyDVz3wIPg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.globaldata.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Global Data</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">GBI, Global Data</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.globaldata.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Anand</GivenName>
-    <SurName>Perumandla</SurName>
-    <EmailAddress>aperumandla@globaldata.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jeevan</GivenName>
-    <SurName>Pinnireddy</SurName>
-    <EmailAddress>jpinnireddy@globaldata.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.gmu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.gmu.edu-idp-shibboleth.xml
deleted file mode 100644
index 9d271841..00000000
--- a/swamid-interfederations-2.0/shibboleth.gmu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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://shibboleth.gmu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">gmu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">George Mason University</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>
-MIIDMzCCAhugAwIBAgIUepAw2N9+pmX9TWoDp/ZsdB/L1yEwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC5nbXUuZWR1MB4XDTEwMDYyNDE0NTMy
-MVoXDTMwMDYyNDE0NTMyMVowHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC5nbXUuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgp2Dn6k3UuILLaGWGcyQ
-enA31AxjXOoCM7zrhPpSJFzUSPHs2mC/fEqUhqmHJnPxGNalPpW9BH6SN1U2/C+e
-rfVL/OcO/x+Var0Pt+GodnlMsf+f7jcyLMzQB+xG+4/iKPoPByyOlThM+dO7/j/w
-QuclJu6f5iUTYyQM5u+DnvGzCmEA7Oq6E6c/FPegTAXCTnhQie9ZOOKjYfc/Y+y/
-1r7JYP4wkyk6ldk/Jt3xlP7eSvREIzMb5cetg1CbX6NmBsrBiSixMUDbOShDf01/
-8X6ebsaDIFCocE44/UAEM7xAQHUB/wHa7lhsVXI4pHUQ4eE5+9cjAq6/KkioOHnZ
-aQIDAQABo2swaTBIBgNVHREEQTA/ghJzaGliYm9sZXRoLmdtdS5lZHWGKWh0dHBz
-Oi8vc2hpYmJvbGV0aC5nbXUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSM
-UsKgJtDJoCxpwHtips8ra+EF+TANBgkqhkiG9w0BAQUFAAOCAQEAcpGmKUvfmyI7
-hbGONBpP3O5hTDeVe5Xiq5CHsfpduhsknht6uEWa8Z4dUg0QfAQKfaHvan4rg9Wl
-CHk4CnbLvB31Bbvz+TGjepNldfGeY2D0O4O2bxSjanFUAo1Kh+dUKSECtTEbwYdC
-2NcU2TQN4y5aEnC0jE8rj8VhvK3ynej8xJbqjVEY4Q6ndcvkUieqphdFOxBzIgk5
-IHEk7lPD0ggHR2Rp8nKE5xbCnL0j6WLTi+MbyMSZKlaNijMJJsybnB7L7dTXOR0z
-07DA0lAnAjYsa5Y/+xYddE7hlz3BkcttcuOgsEuLUtpd2wrWUGmJcOR7GUBTYfm4
-g750I0EPsQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.gmu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.gmu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.gmu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.gmu.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.gmu.edu/idp/profile/Shibboleth/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gmu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUepAw2N9+pmX9TWoDp/ZsdB/L1yEwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC5nbXUuZWR1MB4XDTEwMDYyNDE0NTMy
-MVoXDTMwMDYyNDE0NTMyMVowHTEbMBkGA1UEAxMSc2hpYmJvbGV0aC5nbXUuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgp2Dn6k3UuILLaGWGcyQ
-enA31AxjXOoCM7zrhPpSJFzUSPHs2mC/fEqUhqmHJnPxGNalPpW9BH6SN1U2/C+e
-rfVL/OcO/x+Var0Pt+GodnlMsf+f7jcyLMzQB+xG+4/iKPoPByyOlThM+dO7/j/w
-QuclJu6f5iUTYyQM5u+DnvGzCmEA7Oq6E6c/FPegTAXCTnhQie9ZOOKjYfc/Y+y/
-1r7JYP4wkyk6ldk/Jt3xlP7eSvREIzMb5cetg1CbX6NmBsrBiSixMUDbOShDf01/
-8X6ebsaDIFCocE44/UAEM7xAQHUB/wHa7lhsVXI4pHUQ4eE5+9cjAq6/KkioOHnZ
-aQIDAQABo2swaTBIBgNVHREEQTA/ghJzaGliYm9sZXRoLmdtdS5lZHWGKWh0dHBz
-Oi8vc2hpYmJvbGV0aC5nbXUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSM
-UsKgJtDJoCxpwHtips8ra+EF+TANBgkqhkiG9w0BAQUFAAOCAQEAcpGmKUvfmyI7
-hbGONBpP3O5hTDeVe5Xiq5CHsfpduhsknht6uEWa8Z4dUg0QfAQKfaHvan4rg9Wl
-CHk4CnbLvB31Bbvz+TGjepNldfGeY2D0O4O2bxSjanFUAo1Kh+dUKSECtTEbwYdC
-2NcU2TQN4y5aEnC0jE8rj8VhvK3ynej8xJbqjVEY4Q6ndcvkUieqphdFOxBzIgk5
-IHEk7lPD0ggHR2Rp8nKE5xbCnL0j6WLTi+MbyMSZKlaNijMJJsybnB7L7dTXOR0z
-07DA0lAnAjYsa5Y/+xYddE7hlz3BkcttcuOgsEuLUtpd2wrWUGmJcOR7GUBTYfm4
-g750I0EPsQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.gmu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">George Mason University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">George Mason University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gmu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tracy Holt</md:GivenName>
-    <md:EmailAddress>holt@gmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Wally Grotophorst</md:GivenName>
-    <md:EmailAddress>wallyg@gmu.edu</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 a6ea46db..00000000
--- a/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.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://shibboleth.grenoble-inp.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Grenoble INP - Institut polytechnique de Grenoble</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACG0lEQVQ4y4WTv2sUQRTHPzO7s5fd5LyQxGgEtZDTNjZBtBVBTSOif4F/g4U/QMFCCIggabQTbIKNxMKkEBLJtUaQkKAEUROSIN6dSfZyuZt5Frt7d3pF3rDsY9h97/s+M18FKMAAEdAHhICf7neGAE0gBnbTdwMgB4zMzs4+2tzc/CoHxNra2vL09PQDYATIKaB/cXFxYtscufX83TJXLtwFFVG/cwkzEPBq/Cp5o3nRuA0mYvXTCU5ev8YX3OTY2Ng9H8gXi8Ublx++R2mF8QsYbxA93IvX69FnNDlPQdMH2+Dn3Dwb8x84P/P2JvDYB8IoigpRj08hMuS8AZSO0KGH8jQI/KjU2f82A7ZO+XNI7/BhgiDIAz1+Coy+HkNoNCiDiGL7V4Xf37eYOnSWyChcXEGZEBFB2mB9P8s8DbvxPuuVj1RqW/yZu4gf+iCS8E8fgWQvq5Alb0qrBDhGR1cRQhwOJw6cIKLApUX+C50le3sNxFqaTnAiiDgka+kyFUK2ugrgLDiLdYlCh0NwHT8foABnkabFuqR+a4RsdtdmIJ0U0+uZKFBp939GkJYK6VbR1EAtjuPq0f4IsTb5NhuhQ0H7FIRwaIh6vV4F9jSws7Ky8vrl/XFOHR9MmSWgHNkptDkMnjnNuScTLC0tTQE7mZmOlUqlZ9VqdeMgM5XL5fWFhYWnnWZSQJDaOLOz6ebdsnMt7VwD9v8C3mZSAcLTEj0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDErMDI6MDByT8mCAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwAxJxPgAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.grenoble-inp.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Grenoble INP - Institut polytechnique de Grenoble</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>
-					      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>
-    </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-POST" Location="https://shibboleth.grenoble-inp.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.grenoble-inp.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.grenoble-inp.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Grenoble INP - Institut polytechnique de Grenoble</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Grenoble INP - Institut polytechnique de Grenoble</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.grenoble-inp.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>federation.sos@grenoble-inp.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.hamilton.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.hamilton.edu-idp-shibboleth.xml
deleted file mode 100644
index 1652eee7..00000000
--- a/swamid-interfederations-2.0/shibboleth.hamilton.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,109 +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://shibboleth.hamilton.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://my.hamilton.edu/its/rc/federated-id-error" 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">hamilton.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Hamilton College</mdui:DisplayName>
-        <mdui:Logo height="49" width="212" xml:lang="en">https://my.hamilton.edu/images/wordmark.jpg</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>
-MIIEKTCCAxGgAwIBAgIJAO0MvS2Wg11NMA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxEDAOBgNVBAcMB0NsaW50b24xGTAX
-BgNVBAoMEEhhbWlsdG9uIENvbGxlZ2UxGTAXBgNVBAsMEE5ldHdvcmsgU2Vydmlj
-ZXMxIDAeBgNVBAMMF3NoaWJib2xldGguaGFtaWx0b24uZWR1MR4wHAYJKoZIhvcN
-AQkBFg9uc0BoYW1pbHRvbi5lZHUwHhcNMTMwMjA0MTk0MDA4WhcNMjMwMjAyMTk0
-MDA4WjCBqjELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE5ldyBZb3JrMRAwDgYDVQQH
-DAdDbGludG9uMRkwFwYDVQQKDBBIYW1pbHRvbiBDb2xsZWdlMRkwFwYDVQQLDBBO
-ZXR3b3JrIFNlcnZpY2VzMSAwHgYDVQQDDBdzaGliYm9sZXRoLmhhbWlsdG9uLmVk
-dTEeMBwGCSqGSIb3DQEJARYPbnNAaGFtaWx0b24uZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAoqYh/6u7bh2Ivh2HCNfV4SC1qRzfkAixYoiQQ0gz
-lg5ijczeMFdrMWhrf34eJWxmEiXk/jhDaTrUise7SdyU5muP1AoEcOlffChan6jI
-lHToO+c1/N4agwHWEvQjQCilUQPAmeq+rI4ciLMLplbbC+r+OlQzMO7rmZPrzgr5
-F6kJiAfeWIsUiALOjIXN17kxv+EU9etkyack6xsCxP9LK7AEImOZUy2KN8nmOFnO
-ACWkIBNK++PqICQQimNgp0f3Orlbg9O7W0bxfyho6PmJJrXqe38hPcGDXGoI98qQ
-22vP2ukEqJarGNhpSn1HGbh/LlLFaTlA44pzIlutfV4JjwIDAQABo1AwTjAdBgNV
-HQ4EFgQU/FKHPlyRVc07sbzvNQjnz1oVNwwwHwYDVR0jBBgwFoAU/FKHPlyRVc07
-sbzvNQjnz1oVNwwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAbj6z
-fxx/rYaP02TF1SSpo1IhHSwOF+iYi/z9/knQSdPQ5xTPddux824+HaT78b3lz1sD
-/MO9QaP+iZ430ClMC+L/FF80+tLtmUHxbx9lrQh5UDFF9PVH3wfraYb2mHnZtEVT
-o//C2g0LE5dj2srng76WBeKFm19rqDXY9Lxz0wvYlsgcmHPAjq09P+aU+03qzHmj
-ACgQ8OKvEkmgwC8wlILRke7h2kTgGQ2RXC/MAum5X1058aO+MCUoJR2FKdrs90Il
-M9tbUfHRaiJJwVKXJJpy9PfIGa7+daGyDEv1TXEx+8uqI2Gwr870NJKTtGp/uxP0
-b2vzKnRygo55b/VJxw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hamilton.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hamilton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hamilton.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hamilton.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hamilton.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.hamilton.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hamilton.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hamilton.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hamilton.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEKTCCAxGgAwIBAgIJAO0MvS2Wg11NMA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwITmV3IFlvcmsxEDAOBgNVBAcMB0NsaW50b24xGTAX
-BgNVBAoMEEhhbWlsdG9uIENvbGxlZ2UxGTAXBgNVBAsMEE5ldHdvcmsgU2Vydmlj
-ZXMxIDAeBgNVBAMMF3NoaWJib2xldGguaGFtaWx0b24uZWR1MR4wHAYJKoZIhvcN
-AQkBFg9uc0BoYW1pbHRvbi5lZHUwHhcNMTMwMjA0MTk0MDA4WhcNMjMwMjAyMTk0
-MDA4WjCBqjELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE5ldyBZb3JrMRAwDgYDVQQH
-DAdDbGludG9uMRkwFwYDVQQKDBBIYW1pbHRvbiBDb2xsZWdlMRkwFwYDVQQLDBBO
-ZXR3b3JrIFNlcnZpY2VzMSAwHgYDVQQDDBdzaGliYm9sZXRoLmhhbWlsdG9uLmVk
-dTEeMBwGCSqGSIb3DQEJARYPbnNAaGFtaWx0b24uZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAoqYh/6u7bh2Ivh2HCNfV4SC1qRzfkAixYoiQQ0gz
-lg5ijczeMFdrMWhrf34eJWxmEiXk/jhDaTrUise7SdyU5muP1AoEcOlffChan6jI
-lHToO+c1/N4agwHWEvQjQCilUQPAmeq+rI4ciLMLplbbC+r+OlQzMO7rmZPrzgr5
-F6kJiAfeWIsUiALOjIXN17kxv+EU9etkyack6xsCxP9LK7AEImOZUy2KN8nmOFnO
-ACWkIBNK++PqICQQimNgp0f3Orlbg9O7W0bxfyho6PmJJrXqe38hPcGDXGoI98qQ
-22vP2ukEqJarGNhpSn1HGbh/LlLFaTlA44pzIlutfV4JjwIDAQABo1AwTjAdBgNV
-HQ4EFgQU/FKHPlyRVc07sbzvNQjnz1oVNwwwHwYDVR0jBBgwFoAU/FKHPlyRVc07
-sbzvNQjnz1oVNwwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAbj6z
-fxx/rYaP02TF1SSpo1IhHSwOF+iYi/z9/knQSdPQ5xTPddux824+HaT78b3lz1sD
-/MO9QaP+iZ430ClMC+L/FF80+tLtmUHxbx9lrQh5UDFF9PVH3wfraYb2mHnZtEVT
-o//C2g0LE5dj2srng76WBeKFm19rqDXY9Lxz0wvYlsgcmHPAjq09P+aU+03qzHmj
-ACgQ8OKvEkmgwC8wlILRke7h2kTgGQ2RXC/MAum5X1058aO+MCUoJR2FKdrs90Il
-M9tbUfHRaiJJwVKXJJpy9PfIGa7+daGyDEv1TXEx+8uqI2Gwr870NJKTtGp/uxP0
-b2vzKnRygo55b/VJxw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hamilton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Hamilton College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Hamilton College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hamilton.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David Smallen</md:GivenName>
-    <md:EmailAddress>dsmallen@hamilton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>David Swartz</md:GivenName>
-    <md:EmailAddress>dswartz@hamilton.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.hartpury.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.hartpury.ac.uk-shibboleth.xml
deleted file mode 100644
index 727e2e81..00000000
--- a/swamid-interfederations-2.0/shibboleth.hartpury.ac.uk-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://shibboleth.hartpury.ac.uk/shibboleth">
-  <!--
-		This is an IdP for Hartpury College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-15T09:56:09Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">hartpury.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVALyl0dbpeXfYuEe49LYtPN8+LpmNMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5oYXJ0cHVyeS5hYy51azAeFw0xMjA4MTQxODM2
-						MjlaFw0zMjA4MTQxODM2MjlaMB0xGzAZBgNVBAMTEmlkcC5oYXJ0cHVyeS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJPi0Xw859VIvqyqTHWt
-						JXN7KlgEhe+OXy4YNimWwphxPFMuYkdzycnAyhzso9oSou0rcwNpKGVFSmSyjF9x
-						xeVb/vZtn3xG/peLC+ui20w1caoRJytCC93mWCgtBtj4cZ88jJu8Y/t/5Cmcr+ov
-						R4+nJrEP+z162/Law913nLBPAW4TNKFtUGvXaaHDu4H3kAKZeVmIDMqzhyXtAvQV
-						vODGiCAYEKm7nqYW5qzIs6+W4mdyYQai0Aw9C5XzlOjV4IaH6Y2kWa2AedcrBao9
-						IpBR9tm6PlOT4L+gwwtPynhoHrKGVsu+633JjFIkcOK5xGQtRhe5nwJMTZVnILvG
-						4n8CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmhhcnRwdXJ5LmFjLnVrhilodHRw
-						czovL2lkcC5oYXJ0cHVyeS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						xqp4n/FKdmw6rnk/dIBV654mwsgwDQYJKoZIhvcNAQEFBQADggEBAF14kkpYbOAR
-						ReDt0Wk1RjJDj7YT3rPx3/A4+6h0WtzMRlTEOp6H99cDnRd/HKtWnhYwy9DU7MBg
-						rQumD2VgmCnnOTR8X/oFq3t/hB9bIRY2+w9RL+WSeM1tWCHBob+8SOibzLf/c63g
-						1OpfT+X0bK40aTOvuJeVlZ66WKxW8dUr9GOzCOxkarW6HQlFhE7y+p5mt9jnKoQJ
-						R93wQBJdWf3Bsr51pnY1XKCkYNQn0uxLS9zJYG2Nyvo7hV6Q2GBQko+XJSHsA3cm
-						HHeZlWhHsM3MJuEK39lp1ZVtncv94hFKo2WUNfC59Hz8arKr4w3KFYQ107v3KG81
-						IGu3QwNTGBs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hartpury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hartpury.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.hartpury.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hartpury.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hartpury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hartpury.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">hartpury.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVALyl0dbpeXfYuEe49LYtPN8+LpmNMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEmlkcC5oYXJ0cHVyeS5hYy51azAeFw0xMjA4MTQxODM2
-						MjlaFw0zMjA4MTQxODM2MjlaMB0xGzAZBgNVBAMTEmlkcC5oYXJ0cHVyeS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJPi0Xw859VIvqyqTHWt
-						JXN7KlgEhe+OXy4YNimWwphxPFMuYkdzycnAyhzso9oSou0rcwNpKGVFSmSyjF9x
-						xeVb/vZtn3xG/peLC+ui20w1caoRJytCC93mWCgtBtj4cZ88jJu8Y/t/5Cmcr+ov
-						R4+nJrEP+z162/Law913nLBPAW4TNKFtUGvXaaHDu4H3kAKZeVmIDMqzhyXtAvQV
-						vODGiCAYEKm7nqYW5qzIs6+W4mdyYQai0Aw9C5XzlOjV4IaH6Y2kWa2AedcrBao9
-						IpBR9tm6PlOT4L+gwwtPynhoHrKGVsu+633JjFIkcOK5xGQtRhe5nwJMTZVnILvG
-						4n8CAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmhhcnRwdXJ5LmFjLnVrhilodHRw
-						czovL2lkcC5oYXJ0cHVyeS5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						xqp4n/FKdmw6rnk/dIBV654mwsgwDQYJKoZIhvcNAQEFBQADggEBAF14kkpYbOAR
-						ReDt0Wk1RjJDj7YT3rPx3/A4+6h0WtzMRlTEOp6H99cDnRd/HKtWnhYwy9DU7MBg
-						rQumD2VgmCnnOTR8X/oFq3t/hB9bIRY2+w9RL+WSeM1tWCHBob+8SOibzLf/c63g
-						1OpfT+X0bK40aTOvuJeVlZ66WKxW8dUr9GOzCOxkarW6HQlFhE7y+p5mt9jnKoQJ
-						R93wQBJdWf3Bsr51pnY1XKCkYNQn0uxLS9zJYG2Nyvo7hV6Q2GBQko+XJSHsA3cm
-						HHeZlWhHsM3MJuEK39lp1ZVtncv94hFKo2WUNfC59Hz8arKr4w3KFYQ107v3KG81
-						IGu3QwNTGBs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hartpury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hartpury.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">Hartpury College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hartpury College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hartpury.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:itsupport@hartpury.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>West</SurName>
-    <EmailAddress>mailto:nick.west@hartpury.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.hct.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.hct.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 64f7f760..00000000
--- a/swamid-interfederations-2.0/shibboleth.hct.ac.uk-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.hct.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Herefordshire and Ludlow College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-01-12T15:47:00Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">hct.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdjCCAl4CCQDfc3alqzccaDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJH
-						QjERMA8GA1UECBMISGVyZWZvcmQxEzARBgNVBAcTCkZvbGx5IExhbmUxJzAlBgNV
-						BAoTHkhlcmVmb3JkIENvbGxlZ2Ugb2YgVGVjaG5vbG9neTEdMBsGA1UEAxMUc2hp
-						YmJvbGV0aC5oY3QuYWMudWswHhcNMTMwODI3MDkyNzIzWhcNMzMwODIyMDkyNzIz
-						WjB9MQswCQYDVQQGEwJHQjERMA8GA1UECBMISGVyZWZvcmQxEzARBgNVBAcTCkZv
-						bGx5IExhbmUxJzAlBgNVBAoTHkhlcmVmb3JkIENvbGxlZ2Ugb2YgVGVjaG5vbG9n
-						eTEdMBsGA1UEAxMUc2hpYmJvbGV0aC5oY3QuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDJUQE1iW+9qx6vTJryX7gJC751rIfdGGscSfDDeU9h
-						ajg6x36EmcA8+c4FYCDQ74uPS7rjSAedaj4AyZTeowz9BWF6vj+YaF8myeVZ/RSt
-						vnc9YqOitKw9i1h9TGoQgR2t8PU+hp+47mtlyAT2WtD9DAHHteT7RjK+nwR3Q4iX
-						CjQrmZuwUUrAraFDjhQtTPopUYe082QcwirOqL2DBICET6RCsTdlNfXTKWNYLRU0
-						+Itxl1jX+o9bQaZdNeiiJD1f2+E0CCQmjB2Bovw3Lg3NQ1Namtn1u4t7VyWF7xs4
-						0N0r9K0lgiPaawL3AuXIlAxnP1EhsxMXv7nOZSB0qftZAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBADTTj8sJmX8p5EnhiLOWYFpKgkHrsmwEKYCwWzc+dLuH2DD8ixZ0
-						g2xPQ/OjhsU/kH0DH7DCgLyn8Y0hzeZSV2w+aeJqxgIZirTa1snIIsYIZGYKpSqm
-						LtF4rEYgkYUzZhU7Sg1F3/uuMZcxU30ZzI6LoBZiXjd4tlgwe7IB8WYNpm8wVq9w
-						zCsZ4C4OWoz56oDjCrFYo4PJlF9/ERp+XPVpQ1rbAwQsbZzKY22ypn8D1dkIz6Cm
-						c4KXdtRkv2kke2tteJOByaXt54uFj+NNJVic/IMJCVik7RFLyY+P5ut+1Gs90OIS
-						1smsVkYPhj+xDQZ/npJN8HkOaB0rPVtrDmg=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hct.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hct.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://shibboleth.hct.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hct.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.hct.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hct.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">hct.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdjCCAl4CCQDfc3alqzccaDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJH
-						QjERMA8GA1UECBMISGVyZWZvcmQxEzARBgNVBAcTCkZvbGx5IExhbmUxJzAlBgNV
-						BAoTHkhlcmVmb3JkIENvbGxlZ2Ugb2YgVGVjaG5vbG9neTEdMBsGA1UEAxMUc2hp
-						YmJvbGV0aC5oY3QuYWMudWswHhcNMTMwODI3MDkyNzIzWhcNMzMwODIyMDkyNzIz
-						WjB9MQswCQYDVQQGEwJHQjERMA8GA1UECBMISGVyZWZvcmQxEzARBgNVBAcTCkZv
-						bGx5IExhbmUxJzAlBgNVBAoTHkhlcmVmb3JkIENvbGxlZ2Ugb2YgVGVjaG5vbG9n
-						eTEdMBsGA1UEAxMUc2hpYmJvbGV0aC5oY3QuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDJUQE1iW+9qx6vTJryX7gJC751rIfdGGscSfDDeU9h
-						ajg6x36EmcA8+c4FYCDQ74uPS7rjSAedaj4AyZTeowz9BWF6vj+YaF8myeVZ/RSt
-						vnc9YqOitKw9i1h9TGoQgR2t8PU+hp+47mtlyAT2WtD9DAHHteT7RjK+nwR3Q4iX
-						CjQrmZuwUUrAraFDjhQtTPopUYe082QcwirOqL2DBICET6RCsTdlNfXTKWNYLRU0
-						+Itxl1jX+o9bQaZdNeiiJD1f2+E0CCQmjB2Bovw3Lg3NQ1Namtn1u4t7VyWF7xs4
-						0N0r9K0lgiPaawL3AuXIlAxnP1EhsxMXv7nOZSB0qftZAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBADTTj8sJmX8p5EnhiLOWYFpKgkHrsmwEKYCwWzc+dLuH2DD8ixZ0
-						g2xPQ/OjhsU/kH0DH7DCgLyn8Y0hzeZSV2w+aeJqxgIZirTa1snIIsYIZGYKpSqm
-						LtF4rEYgkYUzZhU7Sg1F3/uuMZcxU30ZzI6LoBZiXjd4tlgwe7IB8WYNpm8wVq9w
-						zCsZ4C4OWoz56oDjCrFYo4PJlF9/ERp+XPVpQ1rbAwQsbZzKY22ypn8D1dkIz6Cm
-						c4KXdtRkv2kke2tteJOByaXt54uFj+NNJVic/IMJCVik7RFLyY+P5ut+1Gs90OIS
-						1smsVkYPhj+xDQZ/npJN8HkOaB0rPVtrDmg=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hct.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hct.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">Herefordshire and Ludlow College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Herefordshire and Ludlow College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hct.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tony</GivenName>
-    <SurName>Darch</SurName>
-    <EmailAddress>mailto:DarchT@hlcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dan</GivenName>
-    <SurName>Cooley</SurName>
-    <EmailAddress>mailto:CooleyD@hlcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asmjournals.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asmjournals.xml
deleted file mode 100644
index 55abbc40..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asmjournals.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/asmjournals">
-  <!--
-		This is an "American Society for Microbiology Journals" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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-26T17:52: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 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://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/asmjournals/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">American Society for Microbiology Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://journals.asm.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asnjnls.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asnjnls.xml
deleted file mode 100644
index 9857e056..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-asnjnls.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/asnjnls">
-  <!--
-		This is a "Journals of the American Society of Nephrology" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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-16T18:42: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: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://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/asnjnls/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stanford University: Journals of the American Society of Nephrology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://asnjournals.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-cobjnls.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-cobjnls.xml
deleted file mode 100644
index 3daa0e1d..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-cobjnls.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/cobjnls">
-  <!--
-	This is a "Stanford University: Company of Biologists Journals" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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-07-08T14:05: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 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://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/cobjnls/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stanford University: Company of Biologists Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.biologists.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-dupjnls.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-dupjnls.xml
deleted file mode 100644
index 0a99acd9..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-dupjnls.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/dupjnls">
-  <!--
-		This is a "Stanford University: Duke University Press Journals" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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="2010-07-21T13: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: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://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/dupjnls/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stanford University: Duke University Press Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://dukejournals.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml
deleted file mode 100644
index bf7252bd..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-ecspubs.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/ecspubs">
-  <!--
-		This is "The Electrochemical Society" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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-26T17:52: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 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://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/ecspubs/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Electrochemical Society</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ecsdl.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-jbjsbrumb.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-jbjsbrumb.xml
deleted file mode 100644
index 80e69bfc..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-jbjsbrumb.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/jbjsbrumb">
-  <!--
-		This is a "Stanford University: Journal of Bone and Joint Surgery" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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-14T11:45: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 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://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/jbjsbrumb/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stanford University: Journal of Bone and Joint Surgery</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jbjs.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-lcgsl.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-lcgsl.xml
deleted file mode 100644
index b58093dc..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-lcgsl.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/lcgsl">
-  <!--
-		This is a "Lyell Collection: The Geological Society of London" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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="2010-08-05T10:00: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 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://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/lcgsl/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lyell Collection: The Geological Society of London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lyellcollection.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oupacademic.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oupacademic.xml
deleted file mode 100644
index 672ee8e2..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oupacademic.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/oupacademic">
-  <!--
-		This is an "Oxford Medicine" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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-16T18:36: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: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://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/oupacademic/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stanford University: Oxford Medicine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oxfordmedicine.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oxfordservices.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oxfordservices.xml
deleted file mode 100644
index 1f94e5ad..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-oxfordservices.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/oxfordservices">
-  <!--
-		This is an "Oxford Online" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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="2009-09-14T15:23:45Z">
-      <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://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/oxfordservices/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oxford Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oxfordonline.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-physiology.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-physiology.xml
deleted file mode 100644
index b450eaae..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-physiology.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/physiology">
-  <!--
-		This is an "American Physiology Society" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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-26T17:52: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 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://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/physiology/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">American Physiology Society</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.physiology.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-rupjnls.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-rupjnls.xml
deleted file mode 100644
index 8b5bec08..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-rupjnls.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/rupjnls">
-  <!--
-		This is a "Stanford University: Rockefeller University Press Organization" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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="2010-07-22T16:56: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 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://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stanford University: Rockefeller University Press Organization</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rupress.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-secure-sp.xml b/swamid-interfederations-2.0/shibboleth.highwire.org-entity-secure-sp.xml
deleted file mode 100644
index b907b019..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org-entity-secure-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://shibboleth.highwire.org/entity/secure-sp">
-  <!--
-		This is a "HighWire Press Online" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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-26T17:52: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 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://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/secure-sp/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">HighWire Press Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://highwire.stanford.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.highwire.org.xml b/swamid-interfederations-2.0/shibboleth.highwire.org.xml
deleted file mode 100644
index b7611a80..00000000
--- a/swamid-interfederations-2.0/shibboleth.highwire.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.highwire.org/entity/rupjnls">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rupjnls/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Rockefeller University Press Journals</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Rockefeller University Press Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.rupress.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 2c97e2b2..00000000
--- a/swamid-interfederations-2.0/shibboleth.hillcroft.ac.uk-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" entityID="https://shibboleth.hillcroft.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Hillcroft College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-09T10:50:01Z">
-      <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">hillcroft.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Hillcroft College</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://shibboleth.hillcroft.ac.uk/logo.jpg</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shibboleth.hillcroft.ac.uk/icon.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUY+dzAdJP4F29WhYMkIYWVz7OXIkwDQYJKoZIhvcNAQEF
-						BQAwJTEjMCEGA1UEAwwac2hpYmJvbGV0aC5oaWxsY3JvZnQuYWMudWswHhcNMTUw
-						NjMwMTQ0OTE2WhcNMzUwNjMwMTQ0OTE2WjAlMSMwIQYDVQQDDBpzaGliYm9sZXRo
-						LmhpbGxjcm9mdC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AKZsE6hMiiscNndGGJrMv0d77p+JYtgJcyChH/YklmL4W4YbJFubYposfFjRUOHL
-						q9h/ZoKE1uNRMI0wCZ/43FX5uTeBoOWfldsDU5z0GPh6J/D/KM6d+ahoYHSQVkJT
-						H3lQNTCizjEXs6LsMgQYiWeaNhsAvmBEz/2IotGzfQkS4wa8C+saWpog2p1Z+iqr
-						4IZVcoKdIAZdrUBxAdBxITdoOsC3GPyIksqvLhfwa9CmYI6iI0NgDwUfsPJlKBJy
-						urdHHsJonEn5iJnkgCVX8Qg3XFcdtn15Q7LDUUNDp9nwQ/2SUJMmMpjf7r+bIYx3
-						gqQCIh53qERD8qCmE+LXrsMCAwEAAaN7MHkwHQYDVR0OBBYEFNYN0h/Zy2tW0tfR
-						Sp7LfNDOOhckMFgGA1UdEQRRME+CGnNoaWJib2xldGguaGlsbGNyb2Z0LmFjLnVr
-						hjFodHRwczovL3NoaWJib2xldGguaGlsbGNyb2Z0LmFjLnVrL2lkcC9zaGliYm9s
-						ZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQButipjXmmT9bD6lP6yYyqqE3kCC87p6ub8
-						QuwSjnHpAxSJlhdyS/o3rS5SauwqDs12gYgrx4zoJWNZfAfV0QzSR/mmX5+k0Vt6
-						oSyhY0flaCi0np13AAJKQCVyiIfqBATXaGOV4fSoTIpC2ajEQA0QBMbW9tb10/uA
-						4hTmxJ/AT5GADtMpe9iUknnsBQCXmojKtnILV9bGSgPi0bmHK68GIHe72TPfgXae
-						EninOSrPVYCTYu2Ye0uNMjUJLcaWG/4Bg4KHjCcw0ElUB6gAAozzBGg4YWuYIX69
-						khh8QXuVbtNdLDflq8uEmlwtw92SweSEsLZpZrF/dTPMjmy9XzP7
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hillcroft.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://shibboleth.hillcroft.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.hillcroft.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.hillcroft.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">hillcroft.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUY+dzAdJP4F29WhYMkIYWVz7OXIkwDQYJKoZIhvcNAQEF
-						BQAwJTEjMCEGA1UEAwwac2hpYmJvbGV0aC5oaWxsY3JvZnQuYWMudWswHhcNMTUw
-						NjMwMTQ0OTE2WhcNMzUwNjMwMTQ0OTE2WjAlMSMwIQYDVQQDDBpzaGliYm9sZXRo
-						LmhpbGxjcm9mdC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AKZsE6hMiiscNndGGJrMv0d77p+JYtgJcyChH/YklmL4W4YbJFubYposfFjRUOHL
-						q9h/ZoKE1uNRMI0wCZ/43FX5uTeBoOWfldsDU5z0GPh6J/D/KM6d+ahoYHSQVkJT
-						H3lQNTCizjEXs6LsMgQYiWeaNhsAvmBEz/2IotGzfQkS4wa8C+saWpog2p1Z+iqr
-						4IZVcoKdIAZdrUBxAdBxITdoOsC3GPyIksqvLhfwa9CmYI6iI0NgDwUfsPJlKBJy
-						urdHHsJonEn5iJnkgCVX8Qg3XFcdtn15Q7LDUUNDp9nwQ/2SUJMmMpjf7r+bIYx3
-						gqQCIh53qERD8qCmE+LXrsMCAwEAAaN7MHkwHQYDVR0OBBYEFNYN0h/Zy2tW0tfR
-						Sp7LfNDOOhckMFgGA1UdEQRRME+CGnNoaWJib2xldGguaGlsbGNyb2Z0LmFjLnVr
-						hjFodHRwczovL3NoaWJib2xldGguaGlsbGNyb2Z0LmFjLnVrL2lkcC9zaGliYm9s
-						ZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQButipjXmmT9bD6lP6yYyqqE3kCC87p6ub8
-						QuwSjnHpAxSJlhdyS/o3rS5SauwqDs12gYgrx4zoJWNZfAfV0QzSR/mmX5+k0Vt6
-						oSyhY0flaCi0np13AAJKQCVyiIfqBATXaGOV4fSoTIpC2ajEQA0QBMbW9tb10/uA
-						4hTmxJ/AT5GADtMpe9iUknnsBQCXmojKtnILV9bGSgPi0bmHK68GIHe72TPfgXae
-						EninOSrPVYCTYu2Ye0uNMjUJLcaWG/4Bg4KHjCcw0ElUB6gAAozzBGg4YWuYIX69
-						khh8QXuVbtNdLDflq8uEmlwtw92SweSEsLZpZrF/dTPMjmy9XzP7
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.hillcroft.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.hillcroft.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">Hillcroft College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hillcroft College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hillcroft.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Overt Software Solutions</GivenName>
-    <EmailAddress>mailto:support@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Frary</SurName>
-    <EmailAddress>mailto:pfrary@hillcroft.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.hrc.ac.uk-idp.xml b/swamid-interfederations-2.0/shibboleth.hrc.ac.uk-idp.xml
deleted file mode 100644
index 6e553150..00000000
--- a/swamid-interfederations-2.0/shibboleth.hrc.ac.uk-idp.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://shibboleth.hrc.ac.uk/idp">
-  <!--
-		This is a Shibboleth IdP for Hertford Regional College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-01T15:04: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">hrc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVAOg3Fb090dB9p32MB4EgjYEXyiOxMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMudWswHhcNMTMw
-						NzA2MDcyMjMxWhcNMzMwNzA2MDcyMjMxWjAkMSIwIAYDVQQDExlmZWRlcmF0ZWRh
-						Y2Nlc3MuaHJjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						koOul030k6LhcQ2zW3YErb4osJQwvj7gskGciL2HdKH/BKI1EFOqfayB3QKS7cJ6
-						ekdeHdkhhwamDnXGW2IZO3xaeGXiebT9vy/m3bi3VScUZsydhCC5vZ6vKJHqA2aN
-						qWPH6uNqS9D9X+BXQ1Yaa0zaB671M1gbZ9TwCP473+jtBjRh3b5LaNh41MbOJ4xk
-						7UyQvG1Q2tiO1+0OfBnjen3cKnL2u8HrKXq0aZFV1FXmL/S/C7RSlXp3+FX3+VZa
-						Pn/jlBBQHn7j8hEoQ3KkrnO7PFIiD4szmm40ubKk9m1iR3JKu8wsP/wkFll1MCxq
-						3QDeoo8c6I/RHgIa7zzHgQIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0ZWRh
-						Y2Nlc3MuaHJjLmFjLnVrhjBodHRwczovL2ZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB7hyBviehtzOyJTo/85hiqrmtaS
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCPwEmDe/HVq9orxzy9lS7qYg4tte2dqJHpsLD+
-						AxcI5Uamg1/7IbuG5P6r9gPgdVzB1qo5DWaXbJSo8wY+003v2kvdXYK2x0/85DZ4
-						dtkftolCrgwGJqeEePUV4TWCoihdSjaqr7/0Qe27nZi83hNjy3OipfMm/lDZQDgB
-						3mIg0IbbBXVh4BjnnaJZqGj7qqhCJduCaU0hUK1cvb31Po/Ub+8fqmobstCFxcw4
-						6YExHZsPvcbWhVk8bZEn1bBKjXlozIL46pATE/ApTj955UAocZs/0HeTbPTszOjM
-						2+lio+vkIsRiGCzd1QgB/JmMbZ3I0016UR31P7+M5AaOiJ0s
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federatedaccess.hrc.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://federatedaccess.hrc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://federatedaccess.hrc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federatedaccess.hrc.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">hrc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVAOg3Fb090dB9p32MB4EgjYEXyiOxMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGWZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMudWswHhcNMTMw
-						NzA2MDcyMjMxWhcNMzMwNzA2MDcyMjMxWjAkMSIwIAYDVQQDExlmZWRlcmF0ZWRh
-						Y2Nlc3MuaHJjLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						koOul030k6LhcQ2zW3YErb4osJQwvj7gskGciL2HdKH/BKI1EFOqfayB3QKS7cJ6
-						ekdeHdkhhwamDnXGW2IZO3xaeGXiebT9vy/m3bi3VScUZsydhCC5vZ6vKJHqA2aN
-						qWPH6uNqS9D9X+BXQ1Yaa0zaB671M1gbZ9TwCP473+jtBjRh3b5LaNh41MbOJ4xk
-						7UyQvG1Q2tiO1+0OfBnjen3cKnL2u8HrKXq0aZFV1FXmL/S/C7RSlXp3+FX3+VZa
-						Pn/jlBBQHn7j8hEoQ3KkrnO7PFIiD4szmm40ubKk9m1iR3JKu8wsP/wkFll1MCxq
-						3QDeoo8c6I/RHgIa7zzHgQIDAQABo3kwdzBWBgNVHREETzBNghlmZWRlcmF0ZWRh
-						Y2Nlc3MuaHJjLmFjLnVrhjBodHRwczovL2ZlZGVyYXRlZGFjY2Vzcy5ocmMuYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFB7hyBviehtzOyJTo/85hiqrmtaS
-						MA0GCSqGSIb3DQEBBQUAA4IBAQCPwEmDe/HVq9orxzy9lS7qYg4tte2dqJHpsLD+
-						AxcI5Uamg1/7IbuG5P6r9gPgdVzB1qo5DWaXbJSo8wY+003v2kvdXYK2x0/85DZ4
-						dtkftolCrgwGJqeEePUV4TWCoihdSjaqr7/0Qe27nZi83hNjy3OipfMm/lDZQDgB
-						3mIg0IbbBXVh4BjnnaJZqGj7qqhCJduCaU0hUK1cvb31Po/Ub+8fqmobstCFxcw4
-						6YExHZsPvcbWhVk8bZEn1bBKjXlozIL46pATE/ApTj955UAocZs/0HeTbPTszOjM
-						2+lio+vkIsRiGCzd1QgB/JmMbZ3I0016UR31P7+M5AaOiJ0s
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federatedaccess.hrc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federatedaccess.hrc.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">Hertford Regional College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Hertford Regional College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hrc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Denis</GivenName>
-    <SurName>Featherstone</SurName>
-    <EmailAddress>mailto:dfeatherstone@hrc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Denis</GivenName>
-    <SurName>Featherstone</SurName>
-    <EmailAddress>mailto:dfeatherstone@hrc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.huddnewcoll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.huddnewcoll.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index a369c1dd..00000000
--- a/swamid-interfederations-2.0/shibboleth.huddnewcoll.ac.uk-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://shibboleth.huddnewcoll.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Huddersfield New College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-07-12T13:35: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">huddnewcoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID1jCCAr4CCQDipzubEmV65TANBgkqhkiG9w0BAQUFADCBrDELMAkGA1UEBhMC
-						R0IxFTATBgNVBAgTDEh1ZGRlcnNmaWVsZDEVMBMGA1UEBxMMTmV3IEhleSBSb2Fk
-						MSEwHwYDVQQKExhIdWRkZXJzZmllbGQgTmV3IENvbGxlZ2UxJTAjBgNVBAsTHHNo
-						aWJib2xldGguaHVkZG5ld2NvbGwuYWMudWsxJTAjBgNVBAMTHHNoaWJib2xldGgu
-						aHVkZG5ld2NvbGwuYWMudWswHhcNMTMwNTIwMDg1NDM5WhcNMzMwNTE1MDg1NDM5
-						WjCBrDELMAkGA1UEBhMCR0IxFTATBgNVBAgTDEh1ZGRlcnNmaWVsZDEVMBMGA1UE
-						BxMMTmV3IEhleSBSb2FkMSEwHwYDVQQKExhIdWRkZXJzZmllbGQgTmV3IENvbGxl
-						Z2UxJTAjBgNVBAsTHHNoaWJib2xldGguaHVkZG5ld2NvbGwuYWMudWsxJTAjBgNV
-						BAMTHHNoaWJib2xldGguaHVkZG5ld2NvbGwuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDITxYchqgwkjzeMznQ3pAKZcssEogz3vkQpZhnuABl
-						PiVWBj/mBI2HuVXXKIi5hf5vxwtU5vrxGyWnQobKl8GioNDH0ijbZE2XSiB6xDWP
-						NVnvWOwQF60Rmblu/nGlbyKY3iRsTs3cJSMxGb0if6eBb2Z+vYtfhvcxU7omCCNU
-						6QjV0klmu0fLOP/qoVFkyPRKPvYgkZMtajvXt4yc6gigwsNmVJF7VczqjJNi9yN2
-						k2GkGUXcMg7Vaqgg61kGhDOO7zqHNRrMnbBjQte+99OkuOLDPdHgreFlP3MV7Jbc
-						ZEzpFuoFYk3qdGbAVhM1965Kgoqy6ch4AOgmFSFy0KxpAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBAK9RrkLse5uPKVnAsFhGFEnSgcaf/4kejl2cy/+2kTkUXYPJegf+
-						5bluOqZJfjsYcguTtOIhRli4JnNrPd5b1evrXnBAZFDztvqSiBaZkT7pGwuecrjF
-						Kfykj21LxZrPCfIdmfTyacDCWJamUblQG5B/fpIzRlUps5ueI5uyIBKYqtg8rpdz
-						S5Tv7kpjdFCJnO8nyD95EiGc36pV+C6Q91k7Zq08mIxJEgDlnFEGjkPpN5QFUI1B
-						Eku18ndqAe3yyTTtYjzBC8yz03J49x8OcJoBmjF1TldyfjE25y/23juUoT7o3UT0
-						6KDdLZLQpW7ZoCPDM22iFArIEPpajNu8tVU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.huddnewcoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.huddnewcoll.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://shibboleth.huddnewcoll.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.huddnewcoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.huddnewcoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.huddnewcoll.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">huddnewcoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID1jCCAr4CCQDipzubEmV65TANBgkqhkiG9w0BAQUFADCBrDELMAkGA1UEBhMC
-						R0IxFTATBgNVBAgTDEh1ZGRlcnNmaWVsZDEVMBMGA1UEBxMMTmV3IEhleSBSb2Fk
-						MSEwHwYDVQQKExhIdWRkZXJzZmllbGQgTmV3IENvbGxlZ2UxJTAjBgNVBAsTHHNo
-						aWJib2xldGguaHVkZG5ld2NvbGwuYWMudWsxJTAjBgNVBAMTHHNoaWJib2xldGgu
-						aHVkZG5ld2NvbGwuYWMudWswHhcNMTMwNTIwMDg1NDM5WhcNMzMwNTE1MDg1NDM5
-						WjCBrDELMAkGA1UEBhMCR0IxFTATBgNVBAgTDEh1ZGRlcnNmaWVsZDEVMBMGA1UE
-						BxMMTmV3IEhleSBSb2FkMSEwHwYDVQQKExhIdWRkZXJzZmllbGQgTmV3IENvbGxl
-						Z2UxJTAjBgNVBAsTHHNoaWJib2xldGguaHVkZG5ld2NvbGwuYWMudWsxJTAjBgNV
-						BAMTHHNoaWJib2xldGguaHVkZG5ld2NvbGwuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDITxYchqgwkjzeMznQ3pAKZcssEogz3vkQpZhnuABl
-						PiVWBj/mBI2HuVXXKIi5hf5vxwtU5vrxGyWnQobKl8GioNDH0ijbZE2XSiB6xDWP
-						NVnvWOwQF60Rmblu/nGlbyKY3iRsTs3cJSMxGb0if6eBb2Z+vYtfhvcxU7omCCNU
-						6QjV0klmu0fLOP/qoVFkyPRKPvYgkZMtajvXt4yc6gigwsNmVJF7VczqjJNi9yN2
-						k2GkGUXcMg7Vaqgg61kGhDOO7zqHNRrMnbBjQte+99OkuOLDPdHgreFlP3MV7Jbc
-						ZEzpFuoFYk3qdGbAVhM1965Kgoqy6ch4AOgmFSFy0KxpAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBAK9RrkLse5uPKVnAsFhGFEnSgcaf/4kejl2cy/+2kTkUXYPJegf+
-						5bluOqZJfjsYcguTtOIhRli4JnNrPd5b1evrXnBAZFDztvqSiBaZkT7pGwuecrjF
-						Kfykj21LxZrPCfIdmfTyacDCWJamUblQG5B/fpIzRlUps5ueI5uyIBKYqtg8rpdz
-						S5Tv7kpjdFCJnO8nyD95EiGc36pV+C6Q91k7Zq08mIxJEgDlnFEGjkPpN5QFUI1B
-						Eku18ndqAe3yyTTtYjzBC8yz03J49x8OcJoBmjF1TldyfjE25y/23juUoT7o3UT0
-						6KDdLZLQpW7ZoCPDM22iFArIEPpajNu8tVU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.huddnewcoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.huddnewcoll.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">Huddersfield New College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Huddersfield New College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.huddnewcoll.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Andre</SurName>
-    <EmailAddress>mailto:candre@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Andre</SurName>
-    <EmailAddress>mailto:candre@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 17adc19d..00000000
--- a/swamid-interfederations-2.0/shibboleth.ifac.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,113 +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://shibboleth.ifac.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFAC - Instituto Federal do Acre</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFAC - Instituto Federal do Acre</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFAC - Instituto Federal do Acre</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFAC - Instituto Federal do Acre</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifac.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifac.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKTAnBgNVBAoTIElGQUMgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBBY3JlMQ4wDAYDVQQLEwVEU0dUSTEgMB4GCSqG
-SIb3DQEJARYRY29yZWRAaWZhYy5lZHUuYnIxEzARBgNVBAcTClJpbyBCcmFuY28x
-DTALBgNVBAgTBEFjcmUxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmlmYWMuZWR1LmJyMB4XDTE1MTAwNjIwNTUyOVoXDTE4MTAwNTIwNTUyOVowga8x
-KTAnBgNVBAoTIElGQUMgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBBY3JlMQ4wDAYD
-VQQLEwVEU0dUSTEgMB4GCSqGSIb3DQEJARYRY29yZWRAaWZhYy5lZHUuYnIxEzAR
-BgNVBAcTClJpbyBCcmFuY28xDTALBgNVBAgTBEFjcmUxCzAJBgNVBAYTAkJSMR8w
-HQYDVQQDExZzaGliYm9sZXRoLmlmYWMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA4IsqgsWcWHB9bzA2eBTmpB1q1rPh9gtJsBLT5iLkaDm3
-u60f94zj2aUAKkibZJTUfzdwqS4FfYa5I4OFJeBjgB7i7OeHk8GpVd3ZhTEGeQ3t
-BcqoEfYvGjUBd7IWECFwqrzHm+uDNyg62O3UlZjeHeIQ5nIIkXVZg6DRdR0ExTNI
-FWca/Mej0M0ChvZ6TAMfSAL60DUK4rE20399txo/vml/IwG/9GmqymJwsO27m2fT
-qYJGIcnM+/xddmlhNmrdpa7uWSS8K10gV4DX3JEeXAQAuf3bmeAG51Kbh/qAs9dX
-Z/CQd08wBHDIY06yIW3cMEIxGtnxvBfgVc1MIiNOLwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQAwG40LnqlODWjBoNtt20Ds8rO9NOaOsngoVYdfZ5/1qogsdfAl+br2
-06GrsPgnbN0dfES2pVOuUDUa3eDmpv5ugBZOSZF6m0Zdm0vRgOtlLDABiFHYOtm1
-eK20dlzVLCearR72mRnJxQhB+p6hFLJoCdJk+OnrvMDr9qz4v+G2wPp19xMxLe97
-Zpc18pLXEiGimtu1mtMwJWFiEPyYnRp8ls0PwAhDMy/ZwdGJ29xtnl9DLfTuBx5c
-ilBQMwsWRA4QgnDig1I1Lf2dhEQC6ccEez6yOMSpkH/1Dy95S9G85svsuF2PWRtP
-BN+Ko78mWuJWJz4hCcf0LfkUuWTZHuiu
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifac.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifac.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://shibboleth.ifac.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifac.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifac.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifac.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID1DCCArwCAQAwDQYJKoZIhvcNAQEFBQAwga8xKTAnBgNVBAoTIElGQUMgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBBY3JlMQ4wDAYDVQQLEwVEU0dUSTEgMB4GCSqG
-SIb3DQEJARYRY29yZWRAaWZhYy5lZHUuYnIxEzARBgNVBAcTClJpbyBCcmFuY28x
-DTALBgNVBAgTBEFjcmUxCzAJBgNVBAYTAkJSMR8wHQYDVQQDExZzaGliYm9sZXRo
-LmlmYWMuZWR1LmJyMB4XDTE1MTAwNjIwNTUyOVoXDTE4MTAwNTIwNTUyOVowga8x
-KTAnBgNVBAoTIElGQUMgLSBJbnN0aXR1dG8gRmVkZXJhbCBkbyBBY3JlMQ4wDAYD
-VQQLEwVEU0dUSTEgMB4GCSqGSIb3DQEJARYRY29yZWRAaWZhYy5lZHUuYnIxEzAR
-BgNVBAcTClJpbyBCcmFuY28xDTALBgNVBAgTBEFjcmUxCzAJBgNVBAYTAkJSMR8w
-HQYDVQQDExZzaGliYm9sZXRoLmlmYWMuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA4IsqgsWcWHB9bzA2eBTmpB1q1rPh9gtJsBLT5iLkaDm3
-u60f94zj2aUAKkibZJTUfzdwqS4FfYa5I4OFJeBjgB7i7OeHk8GpVd3ZhTEGeQ3t
-BcqoEfYvGjUBd7IWECFwqrzHm+uDNyg62O3UlZjeHeIQ5nIIkXVZg6DRdR0ExTNI
-FWca/Mej0M0ChvZ6TAMfSAL60DUK4rE20399txo/vml/IwG/9GmqymJwsO27m2fT
-qYJGIcnM+/xddmlhNmrdpa7uWSS8K10gV4DX3JEeXAQAuf3bmeAG51Kbh/qAs9dX
-Z/CQd08wBHDIY06yIW3cMEIxGtnxvBfgVc1MIiNOLwIDAQABMA0GCSqGSIb3DQEB
-BQUAA4IBAQAwG40LnqlODWjBoNtt20Ds8rO9NOaOsngoVYdfZ5/1qogsdfAl+br2
-06GrsPgnbN0dfES2pVOuUDUa3eDmpv5ugBZOSZF6m0Zdm0vRgOtlLDABiFHYOtm1
-eK20dlzVLCearR72mRnJxQhB+p6hFLJoCdJk+OnrvMDr9qz4v+G2wPp19xMxLe97
-Zpc18pLXEiGimtu1mtMwJWFiEPyYnRp8ls0PwAhDMy/ZwdGJ29xtnl9DLfTuBx5c
-ilBQMwsWRA4QgnDig1I1Lf2dhEQC6ccEez6yOMSpkH/1Dy95S9G85svsuF2PWRtP
-BN+Ko78mWuJWJz4hCcf0LfkUuWTZHuiu
-
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifac.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifac.edu.br:8443/idp/profile/SAML1/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">IFAC - Instituto Federal do Acre</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFAC - Instituto Federal do Acre</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFAC - Instituto Federal do Acre</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFAC - Instituto Federal do Acre</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifac.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifac.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Kellyton Azevedo</md:SurName>
-    <md:EmailAddress>cored@ifac.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 417d769e..00000000
--- a/swamid-interfederations-2.0/shibboleth.ifam.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://shibboleth.ifam.edu.br/idp/shibboleth">
-  <md: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>
-  </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">edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFAM - Instituto Federal do Amazonas</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFAM - Instituto Federal do Amazonas</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifam.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifam.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxLTArBgNVBAoTJElGQU0gLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWF6b25hczENMAsGA1UECxMEREdUSTEqMCgG
-CSqGSIb3DQEJARYbamFuZGVyc29uX3NpbHZhQGlmYW0uZWR1LmJyMQ8wDQYDVQQH
-EwZNYW5hdXMxETAPBgNVBAgTCEFtYXpvbmFzMQswCQYDVQQGEwJCUjEfMB0GA1UE
-AxMWc2hpYmJvbGV0aC5pZmFtLmVkdS5icjAeFw0xNTA5MTExNDM4MjRaFw0xODA5
-MTAxNDM4MjRaMIG8MS0wKwYDVQQKEyRJRkFNIC0gSW5zdGl0dXRvIEZlZGVyYWwg
-ZG8gQW1hem9uYXMxDTALBgNVBAsTBERHVEkxKjAoBgkqhkiG9w0BCQEWG2phbmRl
-cnNvbl9zaWx2YUBpZmFtLmVkdS5icjEPMA0GA1UEBxMGTWFuYXVzMREwDwYDVQQI
-EwhBbWF6b25hczELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xldGguaWZh
-bS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwe8oW4kt+
-10kAHIs5ktvLFB1Re/x4DAOxPMDrTVrM9rK8KRp9ITjlHgCgwsE/hLmyebRlTPCA
-PVGol2yAX6MUqTaF8CEqoUs3E2Cs2vpFWUjcx7oP89TsL1nLHF+Ye33gfYUtOi/V
-mK0jP4BW4/OI/5GaYj3WhYSJd9ygWLeScxokricn+yrQzOH0pdbRFxXsiwURQCdD
-YWD5DKSER/44M1HK430Tl+5UST/9hGhTn7L5cfxC+iJUkythj6ZYEWp3e1SHfqWF
-/QgGk2nKT3B2PgMnLfiXRsry4cVaukty4r/9cRJAgC241wGbWEWnXiPshWOJIqBi
-sFhiqWvT5E81AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADgvNKCE3XgLvEk3HUND
-JdrWzeK2XIw9c8z0Qr4im901tpPKaJrt13M+C+lou9K1uQm6Bvf8Cb0KL35P/jtM
-Zmxquu1syvxmRW1utOTt4jJUYA3k8E+dXMic995IWEQPIQMpFD53gE3/LF6QqD8F
-FsMYsy832J83v55+TWqMNSwG9Y6usOm/UqHyxh1/PKldHTCpr9bMY5Pba0ko++0B
-8TUVA71uquwvJaSPbGWhf6IvWKiZZXyNyswF59UmOZJzzk3biEOdCALlRNy4UOn9
-3HzXQpIvueRNQ4uKUw6CxbyFZBv5oosN399A0zqYQGNSYRJIx66T7UcsW1MoNM5f
-gl0=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifam.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifam.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://shibboleth.ifam.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifam.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifam.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifam.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIID7jCCAtYCAQAwDQYJKoZIhvcNAQEFBQAwgbwxLTArBgNVBAoTJElGQU0gLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBBbWF6b25hczENMAsGA1UECxMEREdUSTEqMCgG
-CSqGSIb3DQEJARYbamFuZGVyc29uX3NpbHZhQGlmYW0uZWR1LmJyMQ8wDQYDVQQH
-EwZNYW5hdXMxETAPBgNVBAgTCEFtYXpvbmFzMQswCQYDVQQGEwJCUjEfMB0GA1UE
-AxMWc2hpYmJvbGV0aC5pZmFtLmVkdS5icjAeFw0xNTA5MTExNDM4MjRaFw0xODA5
-MTAxNDM4MjRaMIG8MS0wKwYDVQQKEyRJRkFNIC0gSW5zdGl0dXRvIEZlZGVyYWwg
-ZG8gQW1hem9uYXMxDTALBgNVBAsTBERHVEkxKjAoBgkqhkiG9w0BCQEWG2phbmRl
-cnNvbl9zaWx2YUBpZmFtLmVkdS5icjEPMA0GA1UEBxMGTWFuYXVzMREwDwYDVQQI
-EwhBbWF6b25hczELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFnNoaWJib2xldGguaWZh
-bS5lZHUuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwe8oW4kt+
-10kAHIs5ktvLFB1Re/x4DAOxPMDrTVrM9rK8KRp9ITjlHgCgwsE/hLmyebRlTPCA
-PVGol2yAX6MUqTaF8CEqoUs3E2Cs2vpFWUjcx7oP89TsL1nLHF+Ye33gfYUtOi/V
-mK0jP4BW4/OI/5GaYj3WhYSJd9ygWLeScxokricn+yrQzOH0pdbRFxXsiwURQCdD
-YWD5DKSER/44M1HK430Tl+5UST/9hGhTn7L5cfxC+iJUkythj6ZYEWp3e1SHfqWF
-/QgGk2nKT3B2PgMnLfiXRsry4cVaukty4r/9cRJAgC241wGbWEWnXiPshWOJIqBi
-sFhiqWvT5E81AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADgvNKCE3XgLvEk3HUND
-JdrWzeK2XIw9c8z0Qr4im901tpPKaJrt13M+C+lou9K1uQm6Bvf8Cb0KL35P/jtM
-Zmxquu1syvxmRW1utOTt4jJUYA3k8E+dXMic995IWEQPIQMpFD53gE3/LF6QqD8F
-FsMYsy832J83v55+TWqMNSwG9Y6usOm/UqHyxh1/PKldHTCpr9bMY5Pba0ko++0B
-8TUVA71uquwvJaSPbGWhf6IvWKiZZXyNyswF59UmOZJzzk3biEOdCALlRNy4UOn9
-3HzXQpIvueRNQ4uKUw6CxbyFZBv5oosN399A0zqYQGNSYRJIx66T7UcsW1MoNM5f
-gl0=
-
-                          
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifam.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifam.edu.br:8443/idp/profile/SAML1/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">IFAM - Instituto Federal do Amazonas</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFAM - Instituto Federal do Amazonas</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFAM - Instituto Federal do Amazonas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifam.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifam.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Janderson Silva</md:SurName>
-    <md:EmailAddress>janderson_silva@ifam.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ifes.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ifes.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 918e4020..00000000
--- a/swamid-interfederations-2.0/shibboleth.ifes.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,110 +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://shibboleth.ifes.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElmZXMxDDAK
-BgNVBAsTA0RUSTEeMBwGCSqGSIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMREwDwYD
-VQQHFAhWaXTDs3JpYTEYMBYGA1UECBQPRXNww61yaXRvIFNhbnRvMQswCQYDVQQG
-EwJCUjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5pZmVzLmVkdS5icjAeFw0xNTA1Mjcx
-NzIxMTRaFw0xODA1MjYxNzIxMTRaMIGYMQ0wCwYDVQQKEwRJZmVzMQwwCgYDVQQL
-EwNEVEkxHjAcBgkqhkiG9w0BCQEWD2R0aUBpZmVzLmVkdS5icjERMA8GA1UEBxQI
-Vml0w7NyaWExGDAWBgNVBAgUD0VzcMOtcml0byBTYW50bzELMAkGA1UEBhMCQlIx
-HzAdBgNVBAMTFnNoaWJib2xldGguaWZlcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDDQKGUMB+kGYe4LbyZevimFzeFi2L6kLi2FnTLoip4
-YXeGBcSEz6sqJfaODq0NrRbfYH9dlP3SoxSHjN4j7G60Vhg0FlyKSA0tub76+FW9
-uu2CUpfOTfRdZUFcizwPh+Y8/7sSevPj5Xy0UqLlixETtR4uyyLBHssZSIpStRb2
-bKL+BtJjwCG5oRJbnIlK3/5MNwe4bGMor85TxAcQu2s2iDYzKfKRVBQ1fXkgHF1y
-W/zTqFNJt6HzEnIx3BkmkC+p+JrLThxiqsZauikOF9z3Xkm3RdwK0F9pFVwQZvAj
-aTwO6+n9brX40409y6Y8DR6YJX2qsiKUHNeeIXcYtjNNAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAJZ1v506MKbGj2BLTlyWiO9rrtvAgUqkaSJnu0IONIcLkgGqLxVd
-LZYkgHY2BGblgk8q1by2TdcgvU97EJwWJfnJP3ssnVsppMSlNQj/PpEY8HdjdpcD
-uRJlSeLcIIaNjgtAcd1Gf6cPiCVlEpTbzuZaqTGMPph1saqOe2GqyK3w/T77c5Bg
-EaTESvRwpXEyKVBtEY2cgikp52pDD/KyH99GJ3XLU5rdrwpmmiCa9bGvABQH8hhd
-uhuDc4RigznHLvlxoiALH/EH1rglIPpdv8MG2FaUEAdtGgc4GIeBNpsEdKkR/7a4
-znp/YgyE1kJOxcCrcbaV9OaXAQvXe72je1g=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifes.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifes.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://shibboleth.ifes.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifes.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifes.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifes.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDpjCCAo4CAQAwDQYJKoZIhvcNAQEFBQAwgZgxDTALBgNVBAoTBElmZXMxDDAK
-BgNVBAsTA0RUSTEeMBwGCSqGSIb3DQEJARYPZHRpQGlmZXMuZWR1LmJyMREwDwYD
-VQQHFAhWaXTDs3JpYTEYMBYGA1UECBQPRXNww61yaXRvIFNhbnRvMQswCQYDVQQG
-EwJCUjEfMB0GA1UEAxMWc2hpYmJvbGV0aC5pZmVzLmVkdS5icjAeFw0xNTA1Mjcx
-NzIxMTRaFw0xODA1MjYxNzIxMTRaMIGYMQ0wCwYDVQQKEwRJZmVzMQwwCgYDVQQL
-EwNEVEkxHjAcBgkqhkiG9w0BCQEWD2R0aUBpZmVzLmVkdS5icjERMA8GA1UEBxQI
-Vml0w7NyaWExGDAWBgNVBAgUD0VzcMOtcml0byBTYW50bzELMAkGA1UEBhMCQlIx
-HzAdBgNVBAMTFnNoaWJib2xldGguaWZlcy5lZHUuYnIwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDDQKGUMB+kGYe4LbyZevimFzeFi2L6kLi2FnTLoip4
-YXeGBcSEz6sqJfaODq0NrRbfYH9dlP3SoxSHjN4j7G60Vhg0FlyKSA0tub76+FW9
-uu2CUpfOTfRdZUFcizwPh+Y8/7sSevPj5Xy0UqLlixETtR4uyyLBHssZSIpStRb2
-bKL+BtJjwCG5oRJbnIlK3/5MNwe4bGMor85TxAcQu2s2iDYzKfKRVBQ1fXkgHF1y
-W/zTqFNJt6HzEnIx3BkmkC+p+JrLThxiqsZauikOF9z3Xkm3RdwK0F9pFVwQZvAj
-aTwO6+n9brX40409y6Y8DR6YJX2qsiKUHNeeIXcYtjNNAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAJZ1v506MKbGj2BLTlyWiO9rrtvAgUqkaSJnu0IONIcLkgGqLxVd
-LZYkgHY2BGblgk8q1by2TdcgvU97EJwWJfnJP3ssnVsppMSlNQj/PpEY8HdjdpcD
-uRJlSeLcIIaNjgtAcd1Gf6cPiCVlEpTbzuZaqTGMPph1saqOe2GqyK3w/T77c5Bg
-EaTESvRwpXEyKVBtEY2cgikp52pDD/KyH99GJ3XLU5rdrwpmmiCa9bGvABQH8hhd
-uhuDc4RigznHLvlxoiALH/EH1rglIPpdv8MG2FaUEAdtGgc4GIeBNpsEdKkR/7a4
-znp/YgyE1kJOxcCrcbaV9OaXAQvXe72je1g=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifes.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifes.edu.br:8443/idp/profile/SAML1/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">IFES - Instituto Federal do Espirito Santo</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFES - Instituto Federal do Espirito Santo</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFES - Instituto Federal do Espirito Santo</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifes.edu.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifes.edu.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Ramon Ramos</md:SurName>
-    <md:EmailAddress>ramon.ramos@ifes.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 ad627369..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ifpr.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://shibboleth.ifpr.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ifpr.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ifpr.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ifpr.edu.br/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">edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ifpr.edu.br:8443/idp/profile/SAML1/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">IFPR - Instituto Federal do Parana</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFPR - Instituto Federal do Parana</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFPR - Instituto Federal do Parana</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFPR - Instituto Federal do Parana</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifpr.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifpr.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jefferson</md:SurName>
-    <md:EmailAddress>cinfra@ifpr.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.illumina.csa.com.xml b/swamid-interfederations-2.0/shibboleth.illumina.csa.com.xml
deleted file mode 100644
index 628362ab..00000000
--- a/swamid-interfederations-2.0/shibboleth.illumina.csa.com.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.illumina.csa.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.illumina.csa.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.illumina.csa.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDRjCCAi6gAwIBAgIBADANBgkqhkiG9w0BAQQFADAmMSQwIgYDVQQDExtzaGli
-Ym9sZXRoLmlsbHVtaW5hLmNzYS5jb20wHhcNMTAwNTE5MjA1NTE2WhcNMTMwNTE4
-MjA1NTE2WjAmMSQwIgYDVQQDExtzaGliYm9sZXRoLmlsbHVtaW5hLmNzYS5jb20w
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSXNMiD0tcy3DrBiAGbZmK
-9vfubnuz4AfNTZshRNQJHKnMPjc++Vd0AhLEnJzFwTtgvlZ5dIprOgAxC+mfB5N5
-c4WsxrqNNcmtJMKaEi46MsGLj+/s2vxf07MJjZUzJ1Taeni2kXYswuNLO+X6FRfU
-kPWF4uDTrKDDHQQfWmogQxTbkPO8BV9fgNJZZ8hazk08kAD2ubQr5ZXgV8Z8EpUH
-QLConXjH3v7+d4j0qSQP8EBLJPnut6gGe3P0GPbr6Mioep+qnxXlGzkDhaD7hiDr
-P0euqmoHclU7G28Xfy1Ro93UrpW1F8Sm2jwqIp8XjGE63CxohX9lrbbXnUJe9Bfn
-AgMBAAGjfzB9MB0GA1UdDgQWBBRbM2JLRKrIxQ3LLJPMQZszQa2LEDBOBgNVHSME
-RzBFgBRbM2JLRKrIxQ3LLJPMQZszQa2LEKEqpCgwJjEkMCIGA1UEAxMbc2hpYmJv
-bGV0aC5pbGx1bWluYS5jc2EuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
-AQEEBQADggEBAHdPTDYH53OU25SkOCWT/WoBBCv+UErTxBu5aKmoRcw2SASgQVBL
-6hup5Etfwg7LHhWpKscIRQk+rPTGW1DM/RHeSUleTD1qzhgW2w+rdI+dMyOD2Ho7
-xqX9hSJYnHmhzqgjuri5rQ8dYKUuqbrs5ryqlAb7VZP8jY0QWawdO9m5F5+gOAZC
-46X+hGwdKaTBWWV/3RX3StgDIs1GjPZ5RudiKI/76iIbqroz0hBKJh18Gy+eVv2h
-+bN3hVsSEn9WcOz75uP90Q/lg8LuZqBZKCFrEGHSsYbGtk5IiumElnoPAqp19gH1
-4i6fOm/9CSJLtMAZAAvBOqeMquAe94I5tdc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.illumina.csa.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.illumina.csa.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDRjCCAi6gAwIBAgIBADANBgkqhkiG9w0BAQQFADAmMSQwIgYDVQQDExtzaGli
-Ym9sZXRoLmlsbHVtaW5hLmNzYS5jb20wHhcNMTAwNTE5MjA1NTE2WhcNMTMwNTE4
-MjA1NTE2WjAmMSQwIgYDVQQDExtzaGliYm9sZXRoLmlsbHVtaW5hLmNzYS5jb20w
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSXNMiD0tcy3DrBiAGbZmK
-9vfubnuz4AfNTZshRNQJHKnMPjc++Vd0AhLEnJzFwTtgvlZ5dIprOgAxC+mfB5N5
-c4WsxrqNNcmtJMKaEi46MsGLj+/s2vxf07MJjZUzJ1Taeni2kXYswuNLO+X6FRfU
-kPWF4uDTrKDDHQQfWmogQxTbkPO8BV9fgNJZZ8hazk08kAD2ubQr5ZXgV8Z8EpUH
-QLConXjH3v7+d4j0qSQP8EBLJPnut6gGe3P0GPbr6Mioep+qnxXlGzkDhaD7hiDr
-P0euqmoHclU7G28Xfy1Ro93UrpW1F8Sm2jwqIp8XjGE63CxohX9lrbbXnUJe9Bfn
-AgMBAAGjfzB9MB0GA1UdDgQWBBRbM2JLRKrIxQ3LLJPMQZszQa2LEDBOBgNVHSME
-RzBFgBRbM2JLRKrIxQ3LLJPMQZszQa2LEKEqpCgwJjEkMCIGA1UEAxMbc2hpYmJv
-bGV0aC5pbGx1bWluYS5jc2EuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcN
-AQEEBQADggEBAHdPTDYH53OU25SkOCWT/WoBBCv+UErTxBu5aKmoRcw2SASgQVBL
-6hup5Etfwg7LHhWpKscIRQk+rPTGW1DM/RHeSUleTD1qzhgW2w+rdI+dMyOD2Ho7
-xqX9hSJYnHmhzqgjuri5rQ8dYKUuqbrs5ryqlAb7VZP8jY0QWawdO9m5F5+gOAZC
-46X+hGwdKaTBWWV/3RX3StgDIs1GjPZ5RudiKI/76iIbqroz0hBKJh18Gy+eVv2h
-+bN3hVsSEn9WcOz75uP90Q/lg8LuZqBZKCFrEGHSsYbGtk5IiumElnoPAqp19gH1
-4i6fOm/9CSJLtMAZAAvBOqeMquAe94I5tdc=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.illumina.csa.com/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.illumina.csa.com/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.illumina.csa.com/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.illumina.csa.com/Shibboleth.sso/SAML2/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">ProQuest</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ProQuest-CSA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.proquest.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Host</GivenName>
-    <SurName>Master</SurName>
-    <EmailAddress>hostmaster@csa.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Host</GivenName>
-    <SurName>Master</SurName>
-    <EmailAddress>hostmaster@csa.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
deleted file mode 100644
index c8b73bef..00000000
--- a/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-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://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 width="385" height="183">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks.png</mdui:Logo>
-        <mdui:Logo width="193" height="92">https://shibboleth.im.jku.at/logos/JKULogokurzWappenlinks_50.png</mdui:Logo>
-        <mdui:Logo width="16" height="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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.im.jku.at/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://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: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.imperial.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index d1439ece..00000000
--- a/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-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" entityID="https://shibboleth.imperial.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth TEST IdP for Imperial College of Science, Technology and Medicine.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-07T15:04:06Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">imperial.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQDjJF1/WYnlsjANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
-						QjEPMA0GA1UEBwwGTG9uZG9uMSAwHgYDVQQKDBdJbXBlcmlhbCBDb2xsZWdlIExv
-						bmRvbjEMMAoGA1UECwwDSUNUMSIwIAYDVQQDDBlzaGliYm9sZXRoLmltcGVyaWFs
-						LmFjLnVrMB4XDTEzMDUwMjE1NDcyMVoXDTMzMDQyNzE1NDcyMVowcjELMAkGA1UE
-						BhMCR0IxDzANBgNVBAcMBkxvbmRvbjEgMB4GA1UECgwXSW1wZXJpYWwgQ29sbGVn
-						ZSBMb25kb24xDDAKBgNVBAsMA0lDVDEiMCAGA1UEAwwZc2hpYmJvbGV0aC5pbXBl
-						cmlhbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxAnDyn
-						QHFHVPockHEPcWY70joBPv5GA7uT+SqC1z1wv3LBph6XcOhzAo9Xv7ZHK/GLjo7s
-						rUwZOeP34XDDKytxA7+suaxzyXvLieiw8DIauHZrFiX9DPEvmjJGAMAeQnStLrr/
-						c62m8EvOmGrp0hjh9W8Lu/4NtWJuW2rUa2BZIPDskL9qZbYlyQ2RzPpG7yFNtUwG
-						5qhNigg2h5S4nJP8fA3LbMcTxijg5Pr+P5L2sYxHaXoVORZLTM1Ntz7JObaNK27u
-						VVFV0K7BdpnIjMrOV/uZhEJGgODdXG1qBzItxBLQNCq2AYGYeCFawd5wJfRLRcaD
-						nCd0ayGrmasOvPsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAKSFrP+8jjrpPD70+
-						DYfQZCMZng6eoHfOsTaylUNHpfwrPGBITD1uu27OblMyw6KVncQHv86JBdVjDJ0T
-						soPNdUDNO/ive6jgRlHAKRN337IDAiyVLC7eNBBm5ofIECroy02r5ky32diX2GH8
-						VMTm57mqOmOFgN0in1t2Nobl70hfHV4P+k6XKwVspjwAe4ZjfGdN83bOclR1LovF
-						EGdpH3yR/c95KaT/pQDJjpgdv6EE2duDckyDDeFabHacXtUGuaMAb6vK0xAaA1V6
-						tVAi5wjRyhiG7+DEjkBNazHUkzB6+116OvkouR3P7w//b8IGo70DoD6WpBAfQwWO
-						LPc7Eg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbotest.imperial.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbotest.imperial.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://shibbotest.imperial.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbotest.imperial.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbotest.imperial.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbotest.imperial.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">imperial.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQDjJF1/WYnlsjANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
-						QjEPMA0GA1UEBwwGTG9uZG9uMSAwHgYDVQQKDBdJbXBlcmlhbCBDb2xsZWdlIExv
-						bmRvbjEMMAoGA1UECwwDSUNUMSIwIAYDVQQDDBlzaGliYm9sZXRoLmltcGVyaWFs
-						LmFjLnVrMB4XDTEzMDUwMjE1NDcyMVoXDTMzMDQyNzE1NDcyMVowcjELMAkGA1UE
-						BhMCR0IxDzANBgNVBAcMBkxvbmRvbjEgMB4GA1UECgwXSW1wZXJpYWwgQ29sbGVn
-						ZSBMb25kb24xDDAKBgNVBAsMA0lDVDEiMCAGA1UEAwwZc2hpYmJvbGV0aC5pbXBl
-						cmlhbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxAnDyn
-						QHFHVPockHEPcWY70joBPv5GA7uT+SqC1z1wv3LBph6XcOhzAo9Xv7ZHK/GLjo7s
-						rUwZOeP34XDDKytxA7+suaxzyXvLieiw8DIauHZrFiX9DPEvmjJGAMAeQnStLrr/
-						c62m8EvOmGrp0hjh9W8Lu/4NtWJuW2rUa2BZIPDskL9qZbYlyQ2RzPpG7yFNtUwG
-						5qhNigg2h5S4nJP8fA3LbMcTxijg5Pr+P5L2sYxHaXoVORZLTM1Ntz7JObaNK27u
-						VVFV0K7BdpnIjMrOV/uZhEJGgODdXG1qBzItxBLQNCq2AYGYeCFawd5wJfRLRcaD
-						nCd0ayGrmasOvPsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAKSFrP+8jjrpPD70+
-						DYfQZCMZng6eoHfOsTaylUNHpfwrPGBITD1uu27OblMyw6KVncQHv86JBdVjDJ0T
-						soPNdUDNO/ive6jgRlHAKRN337IDAiyVLC7eNBBm5ofIECroy02r5ky32diX2GH8
-						VMTm57mqOmOFgN0in1t2Nobl70hfHV4P+k6XKwVspjwAe4ZjfGdN83bOclR1LovF
-						EGdpH3yR/c95KaT/pQDJjpgdv6EE2duDckyDDeFabHacXtUGuaMAb6vK0xAaA1V6
-						tVAi5wjRyhiG7+DEjkBNazHUkzB6+116OvkouR3P7w//b8IGo70DoD6WpBAfQwWO
-						LPc7Eg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbotest.imperial.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbotest.imperial.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">Imperial College of Science, Technology and Medicine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Imperial College London TEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.imperial.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Neil</GivenName>
-    <SurName>McLennan</SurName>
-    <EmailAddress>mailto:n.mclennan@imperial.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Neil</GivenName>
-    <SurName>McLennan</SurName>
-    <EmailAddress>mailto:n.mclennan@imperial.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-shibboleth.xml
deleted file mode 100644
index 920c4851..00000000
--- a/swamid-interfederations-2.0/shibboleth.imperial.ac.uk-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.imperial.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Imperial College of Science, Technology and Medicine.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-12-07T15:04:06Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">imperial.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQDjJF1/WYnlsjANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
-						QjEPMA0GA1UEBwwGTG9uZG9uMSAwHgYDVQQKDBdJbXBlcmlhbCBDb2xsZWdlIExv
-						bmRvbjEMMAoGA1UECwwDSUNUMSIwIAYDVQQDDBlzaGliYm9sZXRoLmltcGVyaWFs
-						LmFjLnVrMB4XDTEzMDUwMjE1NDcyMVoXDTMzMDQyNzE1NDcyMVowcjELMAkGA1UE
-						BhMCR0IxDzANBgNVBAcMBkxvbmRvbjEgMB4GA1UECgwXSW1wZXJpYWwgQ29sbGVn
-						ZSBMb25kb24xDDAKBgNVBAsMA0lDVDEiMCAGA1UEAwwZc2hpYmJvbGV0aC5pbXBl
-						cmlhbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxAnDyn
-						QHFHVPockHEPcWY70joBPv5GA7uT+SqC1z1wv3LBph6XcOhzAo9Xv7ZHK/GLjo7s
-						rUwZOeP34XDDKytxA7+suaxzyXvLieiw8DIauHZrFiX9DPEvmjJGAMAeQnStLrr/
-						c62m8EvOmGrp0hjh9W8Lu/4NtWJuW2rUa2BZIPDskL9qZbYlyQ2RzPpG7yFNtUwG
-						5qhNigg2h5S4nJP8fA3LbMcTxijg5Pr+P5L2sYxHaXoVORZLTM1Ntz7JObaNK27u
-						VVFV0K7BdpnIjMrOV/uZhEJGgODdXG1qBzItxBLQNCq2AYGYeCFawd5wJfRLRcaD
-						nCd0ayGrmasOvPsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAKSFrP+8jjrpPD70+
-						DYfQZCMZng6eoHfOsTaylUNHpfwrPGBITD1uu27OblMyw6KVncQHv86JBdVjDJ0T
-						soPNdUDNO/ive6jgRlHAKRN337IDAiyVLC7eNBBm5ofIECroy02r5ky32diX2GH8
-						VMTm57mqOmOFgN0in1t2Nobl70hfHV4P+k6XKwVspjwAe4ZjfGdN83bOclR1LovF
-						EGdpH3yR/c95KaT/pQDJjpgdv6EE2duDckyDDeFabHacXtUGuaMAb6vK0xAaA1V6
-						tVAi5wjRyhiG7+DEjkBNazHUkzB6+116OvkouR3P7w//b8IGo70DoD6WpBAfQwWO
-						LPc7Eg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.imperial.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.imperial.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://shibboleth.imperial.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.imperial.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.imperial.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.imperial.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">imperial.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQDjJF1/WYnlsjANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
-						QjEPMA0GA1UEBwwGTG9uZG9uMSAwHgYDVQQKDBdJbXBlcmlhbCBDb2xsZWdlIExv
-						bmRvbjEMMAoGA1UECwwDSUNUMSIwIAYDVQQDDBlzaGliYm9sZXRoLmltcGVyaWFs
-						LmFjLnVrMB4XDTEzMDUwMjE1NDcyMVoXDTMzMDQyNzE1NDcyMVowcjELMAkGA1UE
-						BhMCR0IxDzANBgNVBAcMBkxvbmRvbjEgMB4GA1UECgwXSW1wZXJpYWwgQ29sbGVn
-						ZSBMb25kb24xDDAKBgNVBAsMA0lDVDEiMCAGA1UEAwwZc2hpYmJvbGV0aC5pbXBl
-						cmlhbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMxAnDyn
-						QHFHVPockHEPcWY70joBPv5GA7uT+SqC1z1wv3LBph6XcOhzAo9Xv7ZHK/GLjo7s
-						rUwZOeP34XDDKytxA7+suaxzyXvLieiw8DIauHZrFiX9DPEvmjJGAMAeQnStLrr/
-						c62m8EvOmGrp0hjh9W8Lu/4NtWJuW2rUa2BZIPDskL9qZbYlyQ2RzPpG7yFNtUwG
-						5qhNigg2h5S4nJP8fA3LbMcTxijg5Pr+P5L2sYxHaXoVORZLTM1Ntz7JObaNK27u
-						VVFV0K7BdpnIjMrOV/uZhEJGgODdXG1qBzItxBLQNCq2AYGYeCFawd5wJfRLRcaD
-						nCd0ayGrmasOvPsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAKSFrP+8jjrpPD70+
-						DYfQZCMZng6eoHfOsTaylUNHpfwrPGBITD1uu27OblMyw6KVncQHv86JBdVjDJ0T
-						soPNdUDNO/ive6jgRlHAKRN337IDAiyVLC7eNBBm5ofIECroy02r5ky32diX2GH8
-						VMTm57mqOmOFgN0in1t2Nobl70hfHV4P+k6XKwVspjwAe4ZjfGdN83bOclR1LovF
-						EGdpH3yR/c95KaT/pQDJjpgdv6EE2duDckyDDeFabHacXtUGuaMAb6vK0xAaA1V6
-						tVAi5wjRyhiG7+DEjkBNazHUkzB6+116OvkouR3P7w//b8IGo70DoD6WpBAfQwWO
-						LPc7Eg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.imperial.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.imperial.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">Imperial College of Science, Technology and Medicine</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Imperial College London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.imperial.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Neil</GivenName>
-    <SurName>McLennan</SurName>
-    <EmailAddress>mailto:n.mclennan@imperial.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Neil</GivenName>
-    <SurName>McLennan</SurName>
-    <EmailAddress>mailto:n.mclennan@imperial.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 276a2853..00000000
--- a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.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://shibboleth.insa-cvl.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">INSA CENTRE VAL DE LOIRE</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.insa-cvl.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">INSA Centre Val de Loire</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>
-					      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>
-    </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-POST" Location="https://shibboleth.insa-cvl.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.insa-cvl.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.insa-cvl.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INSA Centre Val de Loire</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INSA Centre Val de Loire</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.insa-cvl.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Christophe DEROUET</md:SurName>
-    <md:EmailAddress>christophe.derouet@insa-cvl.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Sylvain LESAGE</md:SurName>
-    <md:EmailAddress>sylvain.lesage@insa-cvl.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6311a20b..00000000
--- a/swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.insa-rouen.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">INSA de Rouen</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABaUlEQVQoz92SyytEcRzFz+/6XeMRRs2DHQtpIhYiC1KKDWmKnZS9NKX8B4rsUSws2MjKe5aSx4KFjcewIDUznnPnjnn43d+9v68FKXY2Fs76fOqc02FEhN9I+5X77wClIARsCcsCgFwOACUNFY99uoSAbVtSAgARic31BJAeCyUAubf7AojtjQSQALJTE+rp6RlQvd19/QNEpAFgLpdW7WduNwHO5blW7ZfhHR7sKb2O8M4u5+KMN9WLu9tgext96+Ao3tUhw1vIpgpHQ07kLFVTi0zaOtjPHxq2/ZV1afMH4PDmFpXNgetOLFaysuaanswMBtVVRMzP2adHVbatfQAkhLp5UGaS8jhvaVXRlH1ybDY0WgszBT39anGpbHa+aGS8eHUZACMiSEm5LLjONAauU/qVucvp8Z4x7TAaV9Jiit6E8Hg9jYEABwBdZ3rZVzTmLgfAfBUAvIZpGG+MaR6f92NW9g++9A7Bdq8oKAVBaAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTowNCswMjowMCB35iUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MDQrMDI6MDBRKl6ZAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.insa-rouen.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">INSA de Rouen</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>
-					      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>
-    </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-POST" Location="https://shibboleth.insa-rouen.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.insa-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.insa-rouen.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-rouen.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.insa-rouen.fr/idp/profile/SAML1/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">INSA de Rouen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INSA de Rouen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.insa-rouen.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>LE GUILLOUS Franck</md:SurName>
-    <md:EmailAddress>franck.le-guillous@insa-rouen.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Kesraoui Nadir</md:SurName>
-    <md:EmailAddress>nadir.kesraoui@insa-rouen.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.its.msstate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.its.msstate.edu-idp-shibboleth.xml
deleted file mode 100644
index 5388f641..00000000
--- a/swamid-interfederations-2.0/shibboleth.its.msstate.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://shibboleth.its.msstate.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">msstate.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Mississippi State University</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>
-MIIDVDCCAjygAwIBAgIVANqzVBR0Ub2osTQEQ2V2uRrFt0GPMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguaXRzLm1zc3RhdGUuZWR1MB4XDTEz
-MDExNTE3MTU0MFoXDTMzMDExNTE3MTU0MFowJTEjMCEGA1UEAxMac2hpYmJvbGV0
-aC5pdHMubXNzdGF0ZS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCyvEFOnNepgD7v2ksAAsWXzY0M6s8nVe8SCt1wWDkK+XtdTVguj2ddZIQlzjkH
-JkepcXA9x5Gnd/1lzOnVFYUSBGcsnMNDmiKxOPxIOHFOzAybNeYQD4ulR0HKyxWd
-HVH/y7G5AXcZaRPuYT1e2z5xXVl3JGZHTqt6pqQy00NwL3xi1sTv9FqD20r3JcEH
-jG1m2S/VO8SFu3cVgrfcA9J9BbKFc4FJvrPDLP8ds8/gqchqF5L7sWyybJC6VbEP
-qqiK//h38QqVr/hsuVLRgJNF2PrksxCaCbsA0Q+cSumBDOEQDgX3V6SOyFGx0oJs
-1BBlQBFdaZBRQQpQQaYVfIfVAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
-dGguaXRzLm1zc3RhdGUuZWR1hjFodHRwczovL3NoaWJib2xldGguaXRzLm1zc3Rh
-dGUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTJyRHIMBZd5g8w0YzhKEBA
-jGoJCjANBgkqhkiG9w0BAQUFAAOCAQEAdStvD4PVUxs4VUgBjHbPKXoYQQVS/2Q7
-z7Vm4pPhZPK6m82kIfSfaHp1LbfrERPN04hNWIlFW4oj/QbSPuBDMlaCabXuoVH9
-XiVr8cDW2f66FuDeSZrVYvltQqZQDUPsys15UUAZNFEb0EQhKgHHECA1CnW9A9QM
-wqjNtO9uC2kPB65jwrfvR4Eujy6e/wmYtdDgBOdOyjp0rDsNahJTHIyC1kzmZlPK
-Hw4g1sKAIewhtdzA1GPcBp4kuEf8aibTacVSgcihfol036K/BdzBQoQRKGhxD2Kv
-UohgYrFSnjdlhb1yEAXtpAsc8HTum2zkA4NGo3R+9J8rXL6lS6oozA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.its.msstate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.its.msstate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.its.msstate.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.its.msstate.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.its.msstate.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.its.msstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msstate.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDVDCCAjygAwIBAgIVANqzVBR0Ub2osTQEQ2V2uRrFt0GPMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGnNoaWJib2xldGguaXRzLm1zc3RhdGUuZWR1MB4XDTEz
-MDExNTE3MTU0MFoXDTMzMDExNTE3MTU0MFowJTEjMCEGA1UEAxMac2hpYmJvbGV0
-aC5pdHMubXNzdGF0ZS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCyvEFOnNepgD7v2ksAAsWXzY0M6s8nVe8SCt1wWDkK+XtdTVguj2ddZIQlzjkH
-JkepcXA9x5Gnd/1lzOnVFYUSBGcsnMNDmiKxOPxIOHFOzAybNeYQD4ulR0HKyxWd
-HVH/y7G5AXcZaRPuYT1e2z5xXVl3JGZHTqt6pqQy00NwL3xi1sTv9FqD20r3JcEH
-jG1m2S/VO8SFu3cVgrfcA9J9BbKFc4FJvrPDLP8ds8/gqchqF5L7sWyybJC6VbEP
-qqiK//h38QqVr/hsuVLRgJNF2PrksxCaCbsA0Q+cSumBDOEQDgX3V6SOyFGx0oJs
-1BBlQBFdaZBRQQpQQaYVfIfVAgMBAAGjezB5MFgGA1UdEQRRME+CGnNoaWJib2xl
-dGguaXRzLm1zc3RhdGUuZWR1hjFodHRwczovL3NoaWJib2xldGguaXRzLm1zc3Rh
-dGUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTJyRHIMBZd5g8w0YzhKEBA
-jGoJCjANBgkqhkiG9w0BAQUFAAOCAQEAdStvD4PVUxs4VUgBjHbPKXoYQQVS/2Q7
-z7Vm4pPhZPK6m82kIfSfaHp1LbfrERPN04hNWIlFW4oj/QbSPuBDMlaCabXuoVH9
-XiVr8cDW2f66FuDeSZrVYvltQqZQDUPsys15UUAZNFEb0EQhKgHHECA1CnW9A9QM
-wqjNtO9uC2kPB65jwrfvR4Eujy6e/wmYtdDgBOdOyjp0rDsNahJTHIyC1kzmZlPK
-Hw4g1sKAIewhtdzA1GPcBp4kuEf8aibTacVSgcihfol036K/BdzBQoQRKGhxD2Kv
-UohgYrFSnjdlhb1yEAXtpAsc8HTum2zkA4NGo3R+9J8rXL6lS6oozA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.its.msstate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Mississippi State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Mississippi State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.msstate.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>MSU ITS Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@msstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>MSU ITS Network Services</md:GivenName>
-    <md:EmailAddress>ns@its.msstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Timothy Griffin</md:GivenName>
-    <md:EmailAddress>timothy.griffin@msstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.iumis.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.iumis.co.uk-shibboleth-sp.xml
deleted file mode 100644
index bf17cb33..00000000
--- a/swamid-interfederations-2.0/shibboleth.iumis.co.uk-shibboleth-sp.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://shibboleth.iumis.co.uk/shibboleth-sp">
-  <!--
-		This is a "Test Development System" Shibboleth SP for Uniware Systems Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-03T13:55:20Z"/>
-  </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://shibboleth.iumis.co.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAMfd/MptgTr4MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXUwMTgwNDUudW5pd2FyZS5jby51azAeFw0xMjA0MjAxMjQyMzZaFw0yMjA0
-						MTgxMjQyMzZaMCAxHjAcBgNVBAMTFXUwMTgwNDUudW5pd2FyZS5jby51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKRgcl652XDcWIJ4rVhsdKbWPRD/
-						+pr2WI7G91fpbrbgpmelV8i+YyQ3Xztz/7XbfQDLPyWUvy8cPRUXLBq+xzk65Hj+
-						Pe17k8Bo2YzWk3mVj9utSi+4VWZ+qC4l+GnIdQ4t0iDj9X9KcMCJFv541Ih1I0cA
-						Dq3YggxcibM13Bne3mYkBr38Zk8zUHFW0oxlwndOtvMaTZkoANuPAxgs2W004VFh
-						9BOv6Ww+w0aU08LkmI5U5Yxojuq/53/1IDXsMPoSdxrICR/AzJ2RbZB8i2ttYvCy
-						yU8VungwG8rkGU5T8w91kSQdlmF0TaiiYTqYqVxon0tRulqyKRomPIBIIasCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVdTAxODA0NS51bml3YXJlLmNvLnVrMB0GA1UdDgQW
-						BBRXqfbwMPvQYTEZhluO4Cu+YM7d6TANBgkqhkiG9w0BAQUFAAOCAQEAFanur4sV
-						TKS5I8TvnCyG57S4W3xJb18W64opxWNxEPHIady60LRlLWIQWaXFLIEL5zq4/VEA
-						0boBhIhSGJO821Z/WRH0bzD4gVjnbR1aJasaxgd1hkwTcJRRorW/f8OPnCNy/FAH
-						VaMplq1E0yMFcCozq0ZfWXwlUaZMdvCqweAsSFt3EehdtZpJVoA73fOoPiwoYzSl
-						BnmDKI4Ch//jObq+xXoENh7q2w/pbPPCeDOyYi50fV69n0sGVpsCUwkNdm+r+94g
-						Nbnt/AF1tYJKe6aqD99bOFtcFksQP75LCDERU5vsluFzm5Qf9YwXFM39YfiP2X/u
-						7ArVRNUmGaMpHw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.iumis.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Uniware Systems Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Uniware Systems Limited: Test Development System</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniware.co.uk/upay</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dean</GivenName>
-    <SurName>Cachia</SurName>
-    <EmailAddress>mailto:dean.cachia@uniware.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Moore</SurName>
-    <EmailAddress>mailto:Craig.Moore@uniware.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.iwcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.iwcollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index d17210ad..00000000
--- a/swamid-interfederations-2.0/shibboleth.iwcollege.ac.uk-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.iwcollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The Isle of Wight College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-12T12:31:19Z">
-      <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">iwcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUU3AARW5EezCLsq9ZxfkceNTJVYEwDQYJKoZIhvcNAQEF
-						BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aC5pd2NvbGxlZ2UuYWMudWswHhcNMTQw
-						MjEwMTQ0MDEzWhcNMzQwMjEwMTQ0MDEzWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
-						Lml3Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AKzUxmDIS29Sejm1J9fiY/ld8mkk6sskW5Pghzam6gGCa/YcH0VYdJvqCMC2juZO
-						rGHHePIr4X4pygytSKgyXf6MOuavQ8xdhpglM73DDiPeGZsGsdvAET994q2gbIpR
-						UaR0kzFW4LDSsY1GFbujIl59hu0vbxbddlgR9byKamsEmiXETKf+1oDkWLPHQQ9H
-						Sc6xFZihQT5562RBlhswMquk2ZKY9WsUhzG+PaVrXxQoFCPsus8QhX9cALKNFH2g
-						99VkRqlS+3fE5v3AQnEBCUXJSAK/Y8lNuLWQnSmLuYRxXbXVzQy3JB1fHCZKCxYm
-						DTlMiNEMJoziUQ3Oa+9cqxECAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYmJvbGV0
-						aC5pd2NvbGxlZ2UuYWMudWuGMWh0dHBzOi8vc2hpYmJvbGV0aC5pd2NvbGxlZ2Uu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFoss0RidHbwaeYmqjP1zYLn
-						4ptTMA0GCSqGSIb3DQEBBQUAA4IBAQCj2RH3sEFLevVNOV7Tg30KcYw0IYYLGVD9
-						g2WjGCAm/7ukH4jP9Tbdo8aUMx7ouCdTFcfHO0j5l5iezPf65fo/Zt8sCf8vd75f
-						CfUeB0p5d174teNMpQiMrF753TWUjdtde36+d97WHpAhDwaKEfRc1wR1N0rjXrBy
-						nZ3+lS4aUxJqdbzU2/zHJxfsMasqJTybKUk2CEkFp+54nbE88LmFe0be3S+1iTKY
-						rMTyTBDwBP+18XGlbE3LMu/ZjoIUcpuVfoDsFUG6yZSsE8gVTh1IutH33K0Y7ikx
-						ZBo49q3f1kRNl5PRuqWPA3U/tG5LsoStLJ+SxD2xbc4q3D9A6YBZ
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.iwcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iwcollege.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://shibboleth.iwcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.iwcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.iwcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.iwcollege.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">iwcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUzCCAjugAwIBAgIUU3AARW5EezCLsq9ZxfkceNTJVYEwDQYJKoZIhvcNAQEF
-						BQAwJTEjMCEGA1UEAxMac2hpYmJvbGV0aC5pd2NvbGxlZ2UuYWMudWswHhcNMTQw
-						MjEwMTQ0MDEzWhcNMzQwMjEwMTQ0MDEzWjAlMSMwIQYDVQQDExpzaGliYm9sZXRo
-						Lml3Y29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AKzUxmDIS29Sejm1J9fiY/ld8mkk6sskW5Pghzam6gGCa/YcH0VYdJvqCMC2juZO
-						rGHHePIr4X4pygytSKgyXf6MOuavQ8xdhpglM73DDiPeGZsGsdvAET994q2gbIpR
-						UaR0kzFW4LDSsY1GFbujIl59hu0vbxbddlgR9byKamsEmiXETKf+1oDkWLPHQQ9H
-						Sc6xFZihQT5562RBlhswMquk2ZKY9WsUhzG+PaVrXxQoFCPsus8QhX9cALKNFH2g
-						99VkRqlS+3fE5v3AQnEBCUXJSAK/Y8lNuLWQnSmLuYRxXbXVzQy3JB1fHCZKCxYm
-						DTlMiNEMJoziUQ3Oa+9cqxECAwEAAaN7MHkwWAYDVR0RBFEwT4Iac2hpYmJvbGV0
-						aC5pd2NvbGxlZ2UuYWMudWuGMWh0dHBzOi8vc2hpYmJvbGV0aC5pd2NvbGxlZ2Uu
-						YWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFoss0RidHbwaeYmqjP1zYLn
-						4ptTMA0GCSqGSIb3DQEBBQUAA4IBAQCj2RH3sEFLevVNOV7Tg30KcYw0IYYLGVD9
-						g2WjGCAm/7ukH4jP9Tbdo8aUMx7ouCdTFcfHO0j5l5iezPf65fo/Zt8sCf8vd75f
-						CfUeB0p5d174teNMpQiMrF753TWUjdtde36+d97WHpAhDwaKEfRc1wR1N0rjXrBy
-						nZ3+lS4aUxJqdbzU2/zHJxfsMasqJTybKUk2CEkFp+54nbE88LmFe0be3S+1iTKY
-						rMTyTBDwBP+18XGlbE3LMu/ZjoIUcpuVfoDsFUG6yZSsE8gVTh1IutH33K0Y7ikx
-						ZBo49q3f1kRNl5PRuqWPA3U/tG5LsoStLJ+SxD2xbc4q3D9A6YBZ
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.iwcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.iwcollege.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 Isle of Wight College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Isle of Wight College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://iwcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Violaris</SurName>
-    <EmailAddress>mailto:Steve.Violaris@iwcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Annetts</SurName>
-    <EmailAddress>mailto:simon@ateb.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.kcollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.kcollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 4a9f51f6..00000000
--- a/swamid-interfederations-2.0/shibboleth.kcollege.ac.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://shibboleth.kcollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for South and West Kent College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-03-08T17:52: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">kcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEVDCCAzygAwIBAgIJAIt8JpQ7ds27MA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
-						VQQGEwJHQjENMAsGA1UECBMES2VudDESMBAGA1UEBxMJVG9uYnJpZGdlMRIwEAYD
-						VQQKEwlLIENvbGxlZ2UxFjAUBgNVBAsTDUlUIERlcGFydG1lbnQxIjAgBgNVBAMT
-						GXNoaWJib2xldGgua2NvbGxlZ2UuYWMudWsxKDAmBgkqhkiG9w0BCQEWGWl0c2Vy
-						dmljZXNAa2NvbGxlZ2UuYWMudWswHhcNMTQwMjEyMDk1MDA5WhcNMjQwMjEwMDk1
-						MDA5WjCBqjELMAkGA1UEBhMCR0IxDTALBgNVBAgTBEtlbnQxEjAQBgNVBAcTCVRv
-						bmJyaWRnZTESMBAGA1UEChMJSyBDb2xsZWdlMRYwFAYDVQQLEw1JVCBEZXBhcnRt
-						ZW50MSIwIAYDVQQDExlzaGliYm9sZXRoLmtjb2xsZWdlLmFjLnVrMSgwJgYJKoZI
-						hvcNAQkBFhlpdHNlcnZpY2VzQGtjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAyUONnw9FNuYKcET6VNifgEdvZOAOZXlyJTOmS+dR
-						tEhyW8TBc5gFjyPyc12Odj3qelGj/IwN0UuvN9XSZwVXVfTfxShmAxfA4jGp9/QS
-						3GDvDJRaIEpZBXdnnj1/mBtXUc3kz8bATlKK2iOyl+M4YtwxoHzDyFhlsu+h4A2Y
-						LOl3ippTtSql++pgoRAITDLuALIgF/BSzWV/wv1l11AzPauPONJTPWH8uBZ8e85H
-						kcgm2+psZwP3NYGrgzWmR2OKFZg/4buis+S1LDTX66zuwaMnCwnK7y6jcgQ8piB0
-						Y5ypSZCq4fOUc7vNiYmA/EJVq5c6//cyfo4OHUxMgOStHwIDAQABo3sweTAJBgNV
-						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
-						Y2F0ZTAdBgNVHQ4EFgQUhvOVaHPTsggHRCxEXm6G8hfJbVswHwYDVR0jBBgwFoAU
-						hvOVaHPTsggHRCxEXm6G8hfJbVswDQYJKoZIhvcNAQEFBQADggEBALIGgkvNn9fX
-						HlxH5CiHKVOSwEHE7MlnkJLOemlMv/n4jjWJyKOQ1XR6nZ7Q9UQl0v5cHZKJMMYq
-						chJebSDsho3kb9LkibDEAO6b2b8ZUGMf0F/6hqETy5Qj/w9YFRHqsIHkDMbCZAKd
-						8fm5chrfV2op269TzIrs0LLiCqGE7Jak0ZafxxHUofxQb2d31OdT5xga47ReJI1n
-						CwTAsqXJlK6Zt6T5x29G94U0l5jgYlIrkbGI5ybdfCmOI7NIk+N6uadQ0CLx4sbH
-						TGHu0K6ZOPVhjPVgBOVGFbmVDx9WrGCSliwiYBc8hzurYDhZFH323wiUja7yrCUs
-						zGCgMnWgl18=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.kcollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.kcollege.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://shibboleth.kcollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.kcollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.kcollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.kcollege.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">kcollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEVDCCAzygAwIBAgIJAIt8JpQ7ds27MA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
-						VQQGEwJHQjENMAsGA1UECBMES2VudDESMBAGA1UEBxMJVG9uYnJpZGdlMRIwEAYD
-						VQQKEwlLIENvbGxlZ2UxFjAUBgNVBAsTDUlUIERlcGFydG1lbnQxIjAgBgNVBAMT
-						GXNoaWJib2xldGgua2NvbGxlZ2UuYWMudWsxKDAmBgkqhkiG9w0BCQEWGWl0c2Vy
-						dmljZXNAa2NvbGxlZ2UuYWMudWswHhcNMTQwMjEyMDk1MDA5WhcNMjQwMjEwMDk1
-						MDA5WjCBqjELMAkGA1UEBhMCR0IxDTALBgNVBAgTBEtlbnQxEjAQBgNVBAcTCVRv
-						bmJyaWRnZTESMBAGA1UEChMJSyBDb2xsZWdlMRYwFAYDVQQLEw1JVCBEZXBhcnRt
-						ZW50MSIwIAYDVQQDExlzaGliYm9sZXRoLmtjb2xsZWdlLmFjLnVrMSgwJgYJKoZI
-						hvcNAQkBFhlpdHNlcnZpY2VzQGtjb2xsZWdlLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAyUONnw9FNuYKcET6VNifgEdvZOAOZXlyJTOmS+dR
-						tEhyW8TBc5gFjyPyc12Odj3qelGj/IwN0UuvN9XSZwVXVfTfxShmAxfA4jGp9/QS
-						3GDvDJRaIEpZBXdnnj1/mBtXUc3kz8bATlKK2iOyl+M4YtwxoHzDyFhlsu+h4A2Y
-						LOl3ippTtSql++pgoRAITDLuALIgF/BSzWV/wv1l11AzPauPONJTPWH8uBZ8e85H
-						kcgm2+psZwP3NYGrgzWmR2OKFZg/4buis+S1LDTX66zuwaMnCwnK7y6jcgQ8piB0
-						Y5ypSZCq4fOUc7vNiYmA/EJVq5c6//cyfo4OHUxMgOStHwIDAQABo3sweTAJBgNV
-						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
-						Y2F0ZTAdBgNVHQ4EFgQUhvOVaHPTsggHRCxEXm6G8hfJbVswHwYDVR0jBBgwFoAU
-						hvOVaHPTsggHRCxEXm6G8hfJbVswDQYJKoZIhvcNAQEFBQADggEBALIGgkvNn9fX
-						HlxH5CiHKVOSwEHE7MlnkJLOemlMv/n4jjWJyKOQ1XR6nZ7Q9UQl0v5cHZKJMMYq
-						chJebSDsho3kb9LkibDEAO6b2b8ZUGMf0F/6hqETy5Qj/w9YFRHqsIHkDMbCZAKd
-						8fm5chrfV2op269TzIrs0LLiCqGE7Jak0ZafxxHUofxQb2d31OdT5xga47ReJI1n
-						CwTAsqXJlK6Zt6T5x29G94U0l5jgYlIrkbGI5ybdfCmOI7NIk+N6uadQ0CLx4sbH
-						TGHu0K6ZOPVhjPVgBOVGFbmVDx9WrGCSliwiYBc8hzurYDhZFH323wiUja7yrCUs
-						zGCgMnWgl18=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.kcollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.kcollege.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">South and West Kent College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">K College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kcollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Gareth</GivenName>
-    <SurName>Mitchell</SurName>
-    <EmailAddress>mailto:garethmitchell@kcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gareth</GivenName>
-    <SurName>Mitchell</SurName>
-    <EmailAddress>mailto:garethmitchell@kcollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.knovel.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.knovel.com-shibboleth.xml
deleted file mode 100644
index fc9354ce..00000000
--- a/swamid-interfederations-2.0/shibboleth.knovel.com-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://shibboleth.knovel.com/shibboleth">
-  <!--
-		This is a simpleSAMLphp SP for Knovel Corporation.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-04T16:52:54Z"/>
-  </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://sso.knovel.com/saml/module.php/saml/sp/discoresp.php" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="en">The Knovel website integrates technical reference information with analytical and search tools for engineers.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Knovel Corporation: Production</mdui:DisplayName>
-        <mdui:Logo height="115" width="350">https://content.knovel.com/web/integration/ukfed/images/logo_350_115.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEGDCCAwCgAwIBAgIJAPOXUUi71HxhMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD
-						VQQGEwJVUzELMAkGA1UECAwCTlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25v
-						dmVsIENvcnAxCzAJBgNVBAsMAklUMR8wHQYDVQQDDBZodHRwczovL3Nzby5rbm92
-						ZWwuY29tMR4wHAYJKoZIhvcNAQkBFg9rb3BzQGtub3ZlbC5jb20wHhcNMTUwODE5
-						MTkxNjIyWhcNMjUwODE2MTkxNjIyWjCBjDELMAkGA1UEBhMCVVMxCzAJBgNVBAgM
-						Ak5ZMQwwCgYDVQQHDANOWUMxFDASBgNVBAoMC0tub3ZlbCBDb3JwMQswCQYDVQQL
-						DAJJVDEfMB0GA1UEAwwWaHR0cHM6Ly9zc28ua25vdmVsLmNvbTEeMBwGCSqGSIb3
-						DQEJARYPa29wc0Brbm92ZWwuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAvbVY22BR9u0z5Ymu8dhGgGtHF11CHW+4og/cfmEApsF5vjT+weE2irNl
-						7bqZ7nFqp30aCTUlFz2+WbaGtG7tV9jAKn7XhIx5e3HFpYUof3ziHuCiSo83olaw
-						6pj7cXM0zXonUypLSL4HXIafU1KdIsbeKC10PlKchQLFba1OJqLFudN/xOMmh+Sx
-						q7xcT//54s2TqvtE3B7eAowfB3VYTe69Iuru9F9HuZSCVnSy1q+cqlmdkKjHX5r4
-						VRs07UzyprTyqOKBy5fehwj1YrXHoYZhwTsiISJ9fI1OGcrioaousHYb0YagNRyg
-						cIUxgBvy1zSb6TRGQsfdKsHlF9UXuwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQUqBniZ9JiN6KqodktdnHmlizjn6kwHwYDVR0jBBgwFoAUqBniZ9JiN6Kqodkt
-						dnHmlizjn6kwDQYJKoZIhvcNAQELBQADggEBAApSwJ0PMw+Ijt5t9+sQqPn3PXo3
-						ZvniUj2W8VA9ob4O72WAuvanHlxz6IeDeiLfB6MKx4nayv+l6W5CP8wRAGupiIZ0
-						RIYJEutE9EspbwUTLgKhv0EaUc1GA0JbcBU0VqUjZlWmo/IqNjDLpxBfaPxVRH35
-						wAuGnN87uouRUz6vYPAb6csBDu+muqQ92ZI40rWgDvjv9qfbkv3cE8Ef0yaInIAG
-						mTMHFxRkoi2aJF+B3KjGkOKSMQLDvsxYwbengNEmH8GE1j/vSLWMt2uAuGNOVjO+
-						X788brUQmk13D8HngKAkCA5GLH4TKsfbNOmD28c8fkYf2tZhOddOdXNjNm0=
-					</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>
-						MIIEGDCCAwCgAwIBAgIJAPOXUUi71HxhMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYD
-						VQQGEwJVUzELMAkGA1UECAwCTlkxDDAKBgNVBAcMA05ZQzEUMBIGA1UECgwLS25v
-						dmVsIENvcnAxCzAJBgNVBAsMAklUMR8wHQYDVQQDDBZodHRwczovL3Nzby5rbm92
-						ZWwuY29tMR4wHAYJKoZIhvcNAQkBFg9rb3BzQGtub3ZlbC5jb20wHhcNMTUwODE5
-						MTkxNjIyWhcNMjUwODE2MTkxNjIyWjCBjDELMAkGA1UEBhMCVVMxCzAJBgNVBAgM
-						Ak5ZMQwwCgYDVQQHDANOWUMxFDASBgNVBAoMC0tub3ZlbCBDb3JwMQswCQYDVQQL
-						DAJJVDEfMB0GA1UEAwwWaHR0cHM6Ly9zc28ua25vdmVsLmNvbTEeMBwGCSqGSIb3
-						DQEJARYPa29wc0Brbm92ZWwuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAvbVY22BR9u0z5Ymu8dhGgGtHF11CHW+4og/cfmEApsF5vjT+weE2irNl
-						7bqZ7nFqp30aCTUlFz2+WbaGtG7tV9jAKn7XhIx5e3HFpYUof3ziHuCiSo83olaw
-						6pj7cXM0zXonUypLSL4HXIafU1KdIsbeKC10PlKchQLFba1OJqLFudN/xOMmh+Sx
-						q7xcT//54s2TqvtE3B7eAowfB3VYTe69Iuru9F9HuZSCVnSy1q+cqlmdkKjHX5r4
-						VRs07UzyprTyqOKBy5fehwj1YrXHoYZhwTsiISJ9fI1OGcrioaousHYb0YagNRyg
-						cIUxgBvy1zSb6TRGQsfdKsHlF9UXuwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQUqBniZ9JiN6KqodktdnHmlizjn6kwHwYDVR0jBBgwFoAUqBniZ9JiN6Kqodkt
-						dnHmlizjn6kwDQYJKoZIhvcNAQELBQADggEBAApSwJ0PMw+Ijt5t9+sQqPn3PXo3
-						ZvniUj2W8VA9ob4O72WAuvanHlxz6IeDeiLfB6MKx4nayv+l6W5CP8wRAGupiIZ0
-						RIYJEutE9EspbwUTLgKhv0EaUc1GA0JbcBU0VqUjZlWmo/IqNjDLpxBfaPxVRH35
-						wAuGnN87uouRUz6vYPAb6csBDu+muqQ92ZI40rWgDvjv9qfbkv3cE8Ef0yaInIAG
-						mTMHFxRkoi2aJF+B3KjGkOKSMQLDvsxYwbengNEmH8GE1j/vSLWMt2uAuGNOVjO+
-						X788brUQmk13D8HngKAkCA5GLH4TKsfbNOmD28c8fkYf2tZhOddOdXNjNm0=
-					</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>
-						MIIDujCCAqKgAwIBAgIJANDf/KbdI37xMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNV
-						BAYTAlVTMQswCQYDVQQIEwJOWTEMMAoGA1UEBxMDTllDMRswGQYDVQQKExJLbm92
-						ZWwgQ29ycG9yYXRpb24xFzAVBgNVBAMTDnNzby5rbm92ZWwuY29tMB4XDTE0MDQx
-						NDEzMTQxNVoXDTM0MDQwOTEzMTQxNVowXjELMAkGA1UEBhMCVVMxCzAJBgNVBAgT
-						Ak5ZMQwwCgYDVQQHEwNOWUMxGzAZBgNVBAoTEktub3ZlbCBDb3Jwb3JhdGlvbjEX
-						MBUGA1UEAxMOc3NvLmtub3ZlbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQCiA2U/scRrpv+vAMjajlfo6VL+7LbLAbFwf/B+Irwb6+tqNgE7KhZx
-						fFb7gTQE4zaDnhBEtlHoJtR0mKz0Lnh2XK09EijA3Z1Rtu7sWbJIlIfZxA6PxPzp
-						OXY6tuTOzjPYM90I4fpHHLd04lGwWiJyRcx02tKAPUSxMXcmFYXFDaa9jAXRXYxe
-						Qjvpg9uZhmRd8qyA3MraLTSva/Qx6iXpT7G50RJvMIuZ91wW654/BSWSBdaCFzoL
-						PNLEb1Wda08XmNPebfdi5fDyZV6ePvYNLQZnjxtIWwy13QMop7bmCqbYf4hC13Rh
-						Svd/rtye0RZp900uxpNrBghIPPnR91obAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJ
-						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
-						DgQWBBT/FCscZUqNjJQkE+P0/Z8imgrKGTAfBgNVHSMEGDAWgBT/FCscZUqNjJQk
-						E+P0/Z8imgrKGTANBgkqhkiG9w0BAQUFAAOCAQEAVRTsaVKqAMLTv6iYqf5KDPSU
-						6BQssDlhy249VNVAdQ3kX1flTxmLcCrRVQVCZ9oB4U67mixsro+vCcs04cZ+aoQM
-						uZGBE7ikRv3sOn0uwc5JJ1en4jF4CxzSlESZZt/REnCYecmsnzUFHgwezQoRFArV
-						biQRRQxr3A4va92z/pjASq8J0R4rJ50j5aQi0ay1zE6aAiyXiws8450D0lBg6+Te
-						dMhYTbb+4y+nzT090QiHVgHltgGXTdmhtJo+WPRqMB4Ph+vadtYkQHEHZZiIdjqX
-						/Zic8mF3byatILMfu6OlNXJpueeEC1uAhgScLuk92REdd7PipJ0Dum8QWgwzlg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.knovel.com/saml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.knovel.com/saml/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://sso.knovel.com/saml/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://sso.knovel.com/saml/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://sso.knovel.com/saml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Knovel Corporation</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Knovel Corporation: Production</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.knovel.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Crisler</SurName>
-    <EmailAddress>mailto:mcrisler@knovel.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Johnny</GivenName>
-    <SurName>Cheung</SurName>
-    <EmailAddress>mailto:jcheung@knovel.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.lib.uh.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.lib.uh.edu-idp-shibboleth.xml
deleted file mode 100644
index 18a76c2c..00000000
--- a/swamid-interfederations-2.0/shibboleth.lib.uh.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,106 +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://shibboleth.lib.uh.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">lib.uh.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Houston Libraries</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Shibboleth identity provider for the University of Houston Libraries. </mdui:Description>
-        <mdui:Logo height="150" width="379" xml:lang="en">https://shibboleth.lib.uh.edu/idp/images2/uhl.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>
-MIIDPzCCAiegAwIBAgIULlNaR/yPtpIHLsg043vHlyUUb9owDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5saWIudWguZWR1MB4XDTA5MTEwNjIx
-NTEwOVoXDTI5MTEwNjIxNTEwOVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5saWIu
-dWguZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiLfH0IINKgkb
-rIOkA/VFCgs+O8Voj/ywl8krAdq2+F5VQQC1+pHoTtcMp7MRHJ/HsRmDjQVkWlNR
-QEnFhnJv38dEIZnfkKWoijqWXTvkQeSvw+9rhU44I1GoBAxYRLm8BuljkOUlt/Xe
-pfusfkjNZaSoeXyS4Q8VGxOtY4FrRXK5SuVhU8tYiBHj+oN7EEHaaj6amADey8u/
-kmGdlJIaq71qwkm9xPeOCcAceLJF0pJBsGUx4sDR4E3y+wGEoPfMSMgJFDH1cmmj
-lFlbE81f6R+57NaX5gIX2oDQStj/D4B5BTSkV0EJiG6ZwcdzsX4nRv+qI1XtMfN3
-vYu8DcA4VwIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmxpYi51aC5l
-ZHWGLGh0dHBzOi8vc2hpYmJvbGV0aC5saWIudWguZWR1L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBTWtN42GnjSk3RkyD9wChaumT6JeTANBgkqhkiG9w0BAQUFAAOC
-AQEAckRFXo/Ps3CGTexk0U6VhZ3nUihG8dQR6yECjxpnrZU19u8u8jETLvTdgccL
-LTUlW9oapCGLiDNe9pAz04OrXrWFPaAG64eeFudF9ADat26Fb93alIUlJYTvIH9C
-7cIVqjtE4w1YDiGxIkmlxPCFsjxqQjRNzWvNmJAZ/7BqunjcKu573Ilv4CcteD2P
-E9I51v3x2TJs8SbOPJN87OyKEAilTSERUgXLxPKpGdL/3D3fZTB2cg35/EbDsAHd
-YBqltouvVCvEIi4TGm2qwqj8+X+JwbZ+ZHyLsy6u0GTBDQtMAvij6n17rKlM7DOv
-asKcVxzFt1IOY7qRu811/rvH7A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.lib.uh.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.lib.uh.edu/idp/profile/Shibboleth/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">lib.uh.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIULlNaR/yPtpIHLsg043vHlyUUb9owDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5saWIudWguZWR1MB4XDTA5MTEwNjIx
-NTEwOVoXDTI5MTEwNjIxNTEwOVowIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5saWIu
-dWguZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiLfH0IINKgkb
-rIOkA/VFCgs+O8Voj/ywl8krAdq2+F5VQQC1+pHoTtcMp7MRHJ/HsRmDjQVkWlNR
-QEnFhnJv38dEIZnfkKWoijqWXTvkQeSvw+9rhU44I1GoBAxYRLm8BuljkOUlt/Xe
-pfusfkjNZaSoeXyS4Q8VGxOtY4FrRXK5SuVhU8tYiBHj+oN7EEHaaj6amADey8u/
-kmGdlJIaq71qwkm9xPeOCcAceLJF0pJBsGUx4sDR4E3y+wGEoPfMSMgJFDH1cmmj
-lFlbE81f6R+57NaX5gIX2oDQStj/D4B5BTSkV0EJiG6ZwcdzsX4nRv+qI1XtMfN3
-vYu8DcA4VwIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLmxpYi51aC5l
-ZHWGLGh0dHBzOi8vc2hpYmJvbGV0aC5saWIudWguZWR1L2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBTWtN42GnjSk3RkyD9wChaumT6JeTANBgkqhkiG9w0BAQUFAAOC
-AQEAckRFXo/Ps3CGTexk0U6VhZ3nUihG8dQR6yECjxpnrZU19u8u8jETLvTdgccL
-LTUlW9oapCGLiDNe9pAz04OrXrWFPaAG64eeFudF9ADat26Fb93alIUlJYTvIH9C
-7cIVqjtE4w1YDiGxIkmlxPCFsjxqQjRNzWvNmJAZ/7BqunjcKu573Ilv4CcteD2P
-E9I51v3x2TJs8SbOPJN87OyKEAilTSERUgXLxPKpGdL/3D3fZTB2cg35/EbDsAHd
-YBqltouvVCvEIi4TGm2qwqj8+X+JwbZ+ZHyLsy6u0GTBDQtMAvij6n17rKlM7DOv
-asKcVxzFt1IOY7qRu811/rvH7A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.lib.uh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.lib.uh.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Houston Libraries</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Houston Libraries</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://info.lib.uh.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Robert Spragg</md:GivenName>
-    <md:EmailAddress>rspragg@uh.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Robert Spragg</md:GivenName>
-    <md:EmailAddress>rspragg@uh.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Robert Spragg</md:GivenName>
-    <md:EmailAddress>rspragg@uh.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.louisville.edu-idp.xml b/swamid-interfederations-2.0/shibboleth.louisville.edu-idp.xml
deleted file mode 100644
index 0941ee6e..00000000
--- a/swamid-interfederations-2.0/shibboleth.louisville.edu-idp.xml
+++ /dev/null
@@ -1,89 +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://shibboleth.louisville.edu/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">louisville.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Louisville</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>
-MIIDGzCCAgOgAwIBAgIJALDu/ry2L6bqMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMMGXNoaWJib2xldGgubG91aXN2aWxsZS5lZHUwHhcNMTUwNjE3MTczNDA1WhcN
-MjUwNjE0MTczNDA1WjAkMSIwIAYDVQQDDBlzaGliYm9sZXRoLmxvdWlzdmlsbGUu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv8A4Tzxa/PMT6NaC
-iqlQkARIILJhzO4rjL1Kcl1Pic9nSSCBOaLTAT3EpSWScS0u939zzfSLGFtv2NYs
-Hl2UuSi6jgalL8wDoYLsrKjU178i5zqzIdo1+zIS+fx3jeV0qAwqjiJEknzolol+
-roQD945++3tn1fmo1rsyMm0ET+6E1zgKaxyzeOGxciUoddv+9IaaoU96ZXOlRYm6
-QSlxrrPFv6tsJ9BGTU/5KaOAzcP6keZRAJqs0hxzButeyRnpuSOxjv97Ouwyl1b/
-BxFuWVaXMmvYtOcqL6eTy4Ev0asQglQo+Z1Let3GL4lHS197XksL3N7lI/6x7sFg
-V1NowQIDAQABo1AwTjAdBgNVHQ4EFgQUxv0kRZN8bw+FTTgvXNzWQjaC0pQwHwYD
-VR0jBBgwFoAUxv0kRZN8bw+FTTgvXNzWQjaC0pQwDAYDVR0TBAUwAwEB/zANBgkq
-hkiG9w0BAQUFAAOCAQEAJAWkC8Mu1BKt2HtV3Uh2A4zwqQj0hrlt9UFICJZ8M6Vo
-nD+A194tS8aL4DM03SfM1GFZxzC0ZWq1Uwpy4ncfeGQJ4scTpQQxvOV+EUA7merr
-RTALxWh4QJeN4ctico/5cLn0U1jFfmTIHpmrdShCyj62uXP1sxXGktIDnYLL6HJ1
-9tax85z5ayftqJYrZtk3tnK4LmxYoYC5tXq0AU2f1dvqIfmCUYKr6zEu8bI4oniy
-qeO+hQCk0ogILP/3WDJe8nkDLGsjy4aQguui//rgJu5R975bmdBmMwuXYo7ZJGOM
-/RUeiSUWA/0+u7DLASHh+VR3fG5e1XEH8YDch0/sjA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.louisville.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.louisville.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.louisville.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.louisville.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.louisville.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">louisville.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIJALDu/ry2L6bqMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMMGXNoaWJib2xldGgubG91aXN2aWxsZS5lZHUwHhcNMTUwNjE3MTczNDA1WhcN
-MjUwNjE0MTczNDA1WjAkMSIwIAYDVQQDDBlzaGliYm9sZXRoLmxvdWlzdmlsbGUu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv8A4Tzxa/PMT6NaC
-iqlQkARIILJhzO4rjL1Kcl1Pic9nSSCBOaLTAT3EpSWScS0u939zzfSLGFtv2NYs
-Hl2UuSi6jgalL8wDoYLsrKjU178i5zqzIdo1+zIS+fx3jeV0qAwqjiJEknzolol+
-roQD945++3tn1fmo1rsyMm0ET+6E1zgKaxyzeOGxciUoddv+9IaaoU96ZXOlRYm6
-QSlxrrPFv6tsJ9BGTU/5KaOAzcP6keZRAJqs0hxzButeyRnpuSOxjv97Ouwyl1b/
-BxFuWVaXMmvYtOcqL6eTy4Ev0asQglQo+Z1Let3GL4lHS197XksL3N7lI/6x7sFg
-V1NowQIDAQABo1AwTjAdBgNVHQ4EFgQUxv0kRZN8bw+FTTgvXNzWQjaC0pQwHwYD
-VR0jBBgwFoAUxv0kRZN8bw+FTTgvXNzWQjaC0pQwDAYDVR0TBAUwAwEB/zANBgkq
-hkiG9w0BAQUFAAOCAQEAJAWkC8Mu1BKt2HtV3Uh2A4zwqQj0hrlt9UFICJZ8M6Vo
-nD+A194tS8aL4DM03SfM1GFZxzC0ZWq1Uwpy4ncfeGQJ4scTpQQxvOV+EUA7merr
-RTALxWh4QJeN4ctico/5cLn0U1jFfmTIHpmrdShCyj62uXP1sxXGktIDnYLL6HJ1
-9tax85z5ayftqJYrZtk3tnK4LmxYoYC5tXq0AU2f1dvqIfmCUYKr6zEu8bI4oniy
-qeO+hQCk0ogILP/3WDJe8nkDLGsjy4aQguui//rgJu5R975bmdBmMwuXYo7ZJGOM
-/RUeiSUWA/0+u7DLASHh+VR3fG5e1XEH8YDch0/sjA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.louisville.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Louisville</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Louisville</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://louisville.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Derick Hill</md:GivenName>
-    <md:EmailAddress>dwhill06@exchange.louisville.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.lsbu.ac.uk-shibboleth.xml
deleted file mode 100644
index 2985900c..00000000
--- a/swamid-interfederations-2.0/shibboleth.lsbu.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://shibboleth.lsbu.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for London South Bank University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-23T10:42:32Z">
-      <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">lsbu.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">London South Bank University</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://www.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://www.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUPksCn3BruNlalmPU1+Y/4zBDRkEwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIubHNidS5hYy51azAeFw0xMjAyMTMx
-						MzI5NDJaFw0zMjAyMTMxMzI5NDJaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmxz
-						YnUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChnhct+F+F
-						8yqhCpZrGgSzMVxqLQazMISxrLM+KX5+PIM5myd5MYoZ0O9JDeJF9Ww65dV7lbaw
-						DlnSf1GRlQW1YD//GaeTQQYHtbx9orC7TKZF73L2nTH4NcfD/lm1jyPpNyeB8I20
-						QxgIGDMmoZXqNgggmAcA8tibSiUPWP1NmiZP4fGmReqWbA1Rq9DfxwjBt4YjFvxe
-						7tUnQVcEL2h5g4/RSFCwmC2O8Wsh9x4RGz4iVFpyOXZ0P96WiRShG/FnyfKXaMWe
-						e/zBAq0g51BcbPCVf2vELMAuH3oDKdIcyiDps7ixz+hIl9tW4g7fFeVr34eg0wj3
-						OZZ2T+cyJr5pAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgyLmxzYnUu
-						YWMudWuGLWh0dHBzOi8vc2hpYmJvbGV0aDIubHNidS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQU0DRW++Gu2kI3IgXnorvTnzWmXMQwDQYJKoZIhvcNAQEF
-						BQADggEBAEFHkhujfcQMepjTo57cZzYSIxSYO5qvvOweEwWXKY226L1SqwOAFg0I
-						hqoVVuOPC2NupUK/JM9UwgR1L+rNc25Kosb0QgiLXt4kq5+fpFKu291BBRHdaHQj
-						80KlkkS3H2AWyGMEFAPCBB9RpXFBOVG/Y4ed315j5KmB/DT3jYf9xBXr3RX5/6C+
-						3a/VC9/mfyzUZA1tKSf+GAeS1aoNnnNVncVd4oVud+i6+rggnVbYLCT6JPtTNr38
-						c913IcBFtazSONYlpG9+EtOOCn1vFzjZu3PelE4Z6aYu/AVWvhZlV6EzhXwdCyQt
-						k9BFBpOxm483cpLiiSFTLULEw7NvYzs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.lsbu.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://shibboleth2.lsbu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.lsbu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.lsbu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.lsbu.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">lsbu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUPksCn3BruNlalmPU1+Y/4zBDRkEwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIubHNidS5hYy51azAeFw0xMjAyMTMx
-						MzI5NDJaFw0zMjAyMTMxMzI5NDJaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmxz
-						YnUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQChnhct+F+F
-						8yqhCpZrGgSzMVxqLQazMISxrLM+KX5+PIM5myd5MYoZ0O9JDeJF9Ww65dV7lbaw
-						DlnSf1GRlQW1YD//GaeTQQYHtbx9orC7TKZF73L2nTH4NcfD/lm1jyPpNyeB8I20
-						QxgIGDMmoZXqNgggmAcA8tibSiUPWP1NmiZP4fGmReqWbA1Rq9DfxwjBt4YjFvxe
-						7tUnQVcEL2h5g4/RSFCwmC2O8Wsh9x4RGz4iVFpyOXZ0P96WiRShG/FnyfKXaMWe
-						e/zBAq0g51BcbPCVf2vELMAuH3oDKdIcyiDps7ixz+hIl9tW4g7fFeVr34eg0wj3
-						OZZ2T+cyJr5pAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgyLmxzYnUu
-						YWMudWuGLWh0dHBzOi8vc2hpYmJvbGV0aDIubHNidS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQU0DRW++Gu2kI3IgXnorvTnzWmXMQwDQYJKoZIhvcNAQEF
-						BQADggEBAEFHkhujfcQMepjTo57cZzYSIxSYO5qvvOweEwWXKY226L1SqwOAFg0I
-						hqoVVuOPC2NupUK/JM9UwgR1L+rNc25Kosb0QgiLXt4kq5+fpFKu291BBRHdaHQj
-						80KlkkS3H2AWyGMEFAPCBB9RpXFBOVG/Y4ed315j5KmB/DT3jYf9xBXr3RX5/6C+
-						3a/VC9/mfyzUZA1tKSf+GAeS1aoNnnNVncVd4oVud+i6+rggnVbYLCT6JPtTNr38
-						c913IcBFtazSONYlpG9+EtOOCn1vFzjZu3PelE4Z6aYu/AVWvhZlV6EzhXwdCyQt
-						k9BFBpOxm483cpLiiSFTLULEw7NvYzs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.lsbu.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">London South Bank University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London South Bank University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lsbu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ICT Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@lsbu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Swigg</SurName>
-    <EmailAddress>mailto:swiggtc@lsbu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml
deleted file mode 100644
index 04d42631..00000000
--- a/swamid-interfederations-2.0/shibboleth.mcgill.ca-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:elab="http://eduserv.org.uk/labels" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label" xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mcgill.ca/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-07T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/templates/services/docs/CAF_join_en.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">mcgill.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:InformationURL xml:lang="en">http://www.mcgill.ca/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAKFxePPwNhoZCU/fBrDudUYkci5yMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGgubWNnaWxsLmNhMB4XDTEwMDkyNzE0
-NTQyMloXDTMwMDkyNzE0NTQyMlowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5tY2dp
-bGwuY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCI6PNQptKRhQiG
-tOCyQdN6aUWLKkNZuVmT3poxRUidZpIOb5erxXMO8QJwLkVrhMke8grdcz6Vvf8R
-RMW0HXLvdo/FUCkGh2ZG8Cc4+zoD8fydix48RuVbXFj365KbwwzMnmTJPah79PAY
-YSWTNz7/GQ/Bkc/H+M17ZBTxMgKC2KnfNoQKt/b5q/V8p+4jyS+jOnGmdiTZewj/
-93nF8NHAeVjkJNXar0trJA3FIVXGNBzR9mGJT/yvjNOoh+RYXkAu4cAAyGCaGCyX
-H2LK/bRuNGVZIs7e+pjF6fLkO1eBczWLLh95SlnLPCNqQJEdUALheaMAco/ZPZSy
-PBiA59/PAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGgubWNnaWxsLmNh
-hitodHRwczovL3NoaWJib2xldGgubWNnaWxsLmNhL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBR9d78sZf5fuWvwdRUSKNHNOmodyjANBgkqhkiG9w0BAQUFAAOCAQEA
-aC9u7Fw8PkXZHYWv7cxBTvWaQWPnG3T9zRFXT9nbaTWKhnvGG/UwklwRUyPv6oKA
-hTZ+J/8xsmR+IlkSkZhT7RCO2qVWJgKLFFR5NncHIwFiztcyiu9kOYNY5h5WtCde
-b5yYM3NYl2Unh9fHE7ZMSYnVUisC0KjQH7yn9z/7tWGAP7/rjXhPVJSGIwLUpdKN
-F7qiMg3a4zpfvypZOGjtkXyJMBanaLc9UiGBGBE/t4b+fbJP1HQn085EvQPW3tin
-f7FLtBGjplM/vCklFh57cHLjew1y1vud5iMVWqVgKdPJH0EZbbnR7Xa2tt8MKWWs
-yiqk26yLVKsf3etilKA7Jw==
-     </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mcgill.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mcgill.ca:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mcgill.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mcgill.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.mcgill.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mcgill.ca/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">mcgill.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAKFxePPwNhoZCU/fBrDudUYkci5yMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGgubWNnaWxsLmNhMB4XDTEwMDkyNzE0
-NTQyMloXDTMwMDkyNzE0NTQyMlowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC5tY2dp
-bGwuY2EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCI6PNQptKRhQiG
-tOCyQdN6aUWLKkNZuVmT3poxRUidZpIOb5erxXMO8QJwLkVrhMke8grdcz6Vvf8R
-RMW0HXLvdo/FUCkGh2ZG8Cc4+zoD8fydix48RuVbXFj365KbwwzMnmTJPah79PAY
-YSWTNz7/GQ/Bkc/H+M17ZBTxMgKC2KnfNoQKt/b5q/V8p+4jyS+jOnGmdiTZewj/
-93nF8NHAeVjkJNXar0trJA3FIVXGNBzR9mGJT/yvjNOoh+RYXkAu4cAAyGCaGCyX
-H2LK/bRuNGVZIs7e+pjF6fLkO1eBczWLLh95SlnLPCNqQJEdUALheaMAco/ZPZSy
-PBiA59/PAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGgubWNnaWxsLmNh
-hitodHRwczovL3NoaWJib2xldGgubWNnaWxsLmNhL2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBR9d78sZf5fuWvwdRUSKNHNOmodyjANBgkqhkiG9w0BAQUFAAOCAQEA
-aC9u7Fw8PkXZHYWv7cxBTvWaQWPnG3T9zRFXT9nbaTWKhnvGG/UwklwRUyPv6oKA
-hTZ+J/8xsmR+IlkSkZhT7RCO2qVWJgKLFFR5NncHIwFiztcyiu9kOYNY5h5WtCde
-b5yYM3NYl2Unh9fHE7ZMSYnVUisC0KjQH7yn9z/7tWGAP7/rjXhPVJSGIwLUpdKN
-F7qiMg3a4zpfvypZOGjtkXyJMBanaLc9UiGBGBE/t4b+fbJP1HQn085EvQPW3tin
-f7FLtBGjplM/vCklFh57cHLjew1y1vud5iMVWqVgKdPJH0EZbbnR7Xa2tt8MKWWs
-yiqk26yLVKsf3etilKA7Jw==
-     </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mcgill.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mcgill.ca: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">McGill University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">McGill University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mcgill.ca/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>McGill</md:GivenName>
-    <md:SurName>Shibboleth Support</md:SurName>
-    <md:EmailAddress>mailto:isrdbateam@campus.mcgill.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8c6de095..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.medvik.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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="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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.medvik.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.cz/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="true">medvik.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Medical Library</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Národní lékařská knihovna</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Medical Library, Prague - Medvik</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nlk.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.nlk.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Filip</md:GivenName>
-    <md:SurName>Kriz</md:SurName>
-    <md:EmailAddress>medvik@nlk.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.xml
deleted file mode 100644
index 31ddd75d..00000000
--- a/swamid-interfederations-2.0/shibboleth.metapress.com-shibboleth-sp.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="http://shibboleth.metapress.com/shibboleth-sp">
-  <!--
-		This is a "MetaPress" Shibboleth SP for EBSCO Industries, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPjCCAiagAwIBAgIJAKTDQvdm67vhMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHNoaWJib2xldGgubWV0YXByZXNzLmNvbTAeFw0xMjA2MjUxNTI5NDFaFw0y
-						MjA2MjMxNTI5NDFaMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWV0YXByZXNzLmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANCgbbfHnyWZP//SKjok
-						oNxy7YAFDxFysMjUBJnoeSN0J/nD8XvggcO10PpL+g1RnUAnc9L/2Zp0A6DpQSbN
-						9RUX3o+lG4X9bQGBntImQcRx37joWq6bEKuMNxJzf42gqUCGYbUyXIRfPpjAgqEE
-						5MEmjt7qK3j1NsE7NPoLpXtgNGSl9TM2dClruZiSGVPeYjA1GFW6cAk6CWy17KyB
-						CZMF0d+FLEu5RQnJZOYz4fCSdhdn4lOw1gjNRI02zhMtfwgJt4Haq5H/qtsJyaPW
-						9kcz1EqeX88QpJKB/eDYwQ5cLcQXuNex3eaPuzF4lwS+Ybh3CDCBg3k+VPCNVgx5
-						0zECAwEAAaN1MHMwUgYDVR0RBEswSYIYc2hpYmJvbGV0aC5tZXRhcHJlc3MuY29t
-						hi1odHRwOi8vc2hpYmJvbGV0aC5tZXRhcHJlc3MuY29tL3NoaWJib2xldGgtc3Aw
-						HQYDVR0OBBYEFPmH00sX6+2+UJXx2FEPf008kLDjMA0GCSqGSIb3DQEBBQUAA4IB
-						AQAu+UyC9yMgDkfRYmLOzgIu6lUExX7JNN1tAjU6mXUb59cSs0nnk6s6lHab2DD4
-						tc4i9aWS0e5q4UXnzV04+tr2Cr6AYDBS05d1trKAb3QZLBxeC9h+DGw23nLRwKTg
-						YCELf07nXYSUr6KfLpNCH3d+ws+urhZtpFeElipKJQXdUnV1oe7be4ZveCaqqLm4
-						yAJJ+ag8LeAszHnxACtNDd7cMvM0vgEc9WosMsBoMhY02dXSniM/9aMeKUNx6vLO
-						w4MgU2zatZCHJjjn+lIwK4I5nJ36/jGx9bMJS7j0LxkEu1ITvZkaNre256n8JQKB
-						ZO4eKkKd2NI2Sm3qkNxfiLv6
-					</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>
-						MIIDPjCCAiagAwIBAgIJAKTDQvdm67vhMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHNoaWJib2xldGgubWV0YXByZXNzLmNvbTAeFw0xMjA2MjUxNTI5NDFaFw0y
-						MjA2MjMxNTI5NDFaMCMxITAfBgNVBAMTGHNoaWJib2xldGgubWV0YXByZXNzLmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANCgbbfHnyWZP//SKjok
-						oNxy7YAFDxFysMjUBJnoeSN0J/nD8XvggcO10PpL+g1RnUAnc9L/2Zp0A6DpQSbN
-						9RUX3o+lG4X9bQGBntImQcRx37joWq6bEKuMNxJzf42gqUCGYbUyXIRfPpjAgqEE
-						5MEmjt7qK3j1NsE7NPoLpXtgNGSl9TM2dClruZiSGVPeYjA1GFW6cAk6CWy17KyB
-						CZMF0d+FLEu5RQnJZOYz4fCSdhdn4lOw1gjNRI02zhMtfwgJt4Haq5H/qtsJyaPW
-						9kcz1EqeX88QpJKB/eDYwQ5cLcQXuNex3eaPuzF4lwS+Ybh3CDCBg3k+VPCNVgx5
-						0zECAwEAAaN1MHMwUgYDVR0RBEswSYIYc2hpYmJvbGV0aC5tZXRhcHJlc3MuY29t
-						hi1odHRwOi8vc2hpYmJvbGV0aC5tZXRhcHJlc3MuY29tL3NoaWJib2xldGgtc3Aw
-						HQYDVR0OBBYEFPmH00sX6+2+UJXx2FEPf008kLDjMA0GCSqGSIb3DQEBBQUAA4IB
-						AQAu+UyC9yMgDkfRYmLOzgIu6lUExX7JNN1tAjU6mXUb59cSs0nnk6s6lHab2DD4
-						tc4i9aWS0e5q4UXnzV04+tr2Cr6AYDBS05d1trKAb3QZLBxeC9h+DGw23nLRwKTg
-						YCELf07nXYSUr6KfLpNCH3d+ws+urhZtpFeElipKJQXdUnV1oe7be4ZveCaqqLm4
-						yAJJ+ag8LeAszHnxACtNDd7cMvM0vgEc9WosMsBoMhY02dXSniM/9aMeKUNx6vLO
-						w4MgU2zatZCHJjjn+lIwK4I5nJ36/jGx9bMJS7j0LxkEu1ITvZkaNre256n8JQKB
-						ZO4eKkKd2NI2Sm3qkNxfiLv6
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.metapress.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.metapress.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">EBSCO Industries, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MetaPress</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.metapress.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MetaPress Support Desk</GivenName>
-    <EmailAddress>mailto:support@metapress.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>MetaPress Support Desk</GivenName>
-    <EmailAddress>mailto:support@metapress.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.metapress.com.xml b/swamid-interfederations-2.0/shibboleth.metapress.com.xml
deleted file mode 100644
index 37e9cc29..00000000
--- a/swamid-interfederations-2.0/shibboleth.metapress.com.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://shibboleth.metapress.com/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.metapress.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.metapress.com,OU=Terms of use at www.verisign.com/rpa (c)05,OU=MetaPress,O=EBSCO Industries\, Inc.,L=Birmingham,ST=Alabama,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzjCCBLagAwIBAgIQSxVYxfBDm07E/ewzv9//WDANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMDkwNzA5
-MDAwMDAwWhcNMTIwNzIyMjM1OTU5WjCBujELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FsYWJhbWExEzARBgNVBAcUCkJpcm1pbmdoYW0xHzAdBgNVBAoUFkVCU0NPIElu
-ZHVzdHJpZXMsIEluYy4xEjAQBgNVBAsUCU1ldGFQcmVzczEzMDEGA1UECxQqVGVy
-bXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MRowGAYDVQQD
-FBF3d3cubWV0YXByZXNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANAPC4w32D0Op8alyIxfONpWuIFeLGCyXnaeOcOErbgnoHopdbWWUo8wjiEU
-U29vhIMwF3u+j61N8/dqZYxxA4quICrzNXBun2pOmjeTXAR+tXgJVWuYnPhnMSuV
-vmE3U7lX1ZvwP2FkHE8H2ZyPunsl6RDeJ54x7rKSKdp9OkidT0+O0UySDrgLuqZ8
-SF1x9OexB5iptj8mYfj2Jzq/ReHh/HX3ID5JdJMOv2eQ+SEiNjmCYLm+PMPsGioV
-dNpkx9/pY7VL+n33wC6LqttYHIt1f9IWIvyCpfJwdWEhtehjFIdF3v//x7yO1oWd
-WhHH8w1ri2vXtMex3owFT5QFeAcCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzIt
-Y3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5Bgtg
-hkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5j
-b20vcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
-gBSl7wsRzsBBA6NKZZBIshzgVy19RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
-MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
-L1NWUlNlY3VyZS1HMi1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBu
-BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
-BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
-b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBADuSJ4d+vP3YzNGiidkS
-0pyRxh8xukjDZZoxH1WvC/59Easd5ImEj3S1CK3TRVLMYsqAKLS+ZKw70M3RGjhl
-cdkC+XKBX8owdoJvxCPzGkcVbl4+fbZBFU9Ig+4D0Td66Y8zvF4WNKVfkfCbOhWk
-9S69SYhmpKvPrS17l72FrQl1yr6pBMN43BbjweWaR0r+w6Qous/8p9YRx5bvRGEx
-bbqSHr+ThK+cA+ejsKFih6b7J1/tISSp3UYu3OGRZfW5aYC+zLX/fSzNpEIOoQkD
-1eiD1q3uKUkZ7i5OulGc6iD292VVLCTC5T25o67sGFLUrv3Jaz78uE35egIBTMFu
-IBA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.metapress.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.metapress.com,OU=Terms of use at www.verisign.com/rpa (c)05,OU=MetaPress,O=EBSCO Industries\, Inc.,L=Birmingham,ST=Alabama,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzjCCBLagAwIBAgIQSxVYxfBDm07E/ewzv9//WDANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMDkwNzA5
-MDAwMDAwWhcNMTIwNzIyMjM1OTU5WjCBujELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
-B0FsYWJhbWExEzARBgNVBAcUCkJpcm1pbmdoYW0xHzAdBgNVBAoUFkVCU0NPIElu
-ZHVzdHJpZXMsIEluYy4xEjAQBgNVBAsUCU1ldGFQcmVzczEzMDEGA1UECxQqVGVy
-bXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MRowGAYDVQQD
-FBF3d3cubWV0YXByZXNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBANAPC4w32D0Op8alyIxfONpWuIFeLGCyXnaeOcOErbgnoHopdbWWUo8wjiEU
-U29vhIMwF3u+j61N8/dqZYxxA4quICrzNXBun2pOmjeTXAR+tXgJVWuYnPhnMSuV
-vmE3U7lX1ZvwP2FkHE8H2ZyPunsl6RDeJ54x7rKSKdp9OkidT0+O0UySDrgLuqZ8
-SF1x9OexB5iptj8mYfj2Jzq/ReHh/HX3ID5JdJMOv2eQ+SEiNjmCYLm+PMPsGioV
-dNpkx9/pY7VL+n33wC6LqttYHIt1f9IWIvyCpfJwdWEhtehjFIdF3v//x7yO1oWd
-WhHH8w1ri2vXtMex3owFT5QFeAcCAwEAAaOCAdEwggHNMAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzIt
-Y3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMi5jcmwwRAYDVR0gBD0wOzA5Bgtg
-hkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5j
-b20vcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
-gBSl7wsRzsBBA6NKZZBIshzgVy19RzB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
-MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
-L1NWUlNlY3VyZS1HMi1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUcyLmNlcjBu
-BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
-BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
-b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBADuSJ4d+vP3YzNGiidkS
-0pyRxh8xukjDZZoxH1WvC/59Easd5ImEj3S1CK3TRVLMYsqAKLS+ZKw70M3RGjhl
-cdkC+XKBX8owdoJvxCPzGkcVbl4+fbZBFU9Ig+4D0Td66Y8zvF4WNKVfkfCbOhWk
-9S69SYhmpKvPrS17l72FrQl1yr6pBMN43BbjweWaR0r+w6Qous/8p9YRx5bvRGEx
-bbqSHr+ThK+cA+ejsKFih6b7J1/tISSp3UYu3OGRZfW5aYC+zLX/fSzNpEIOoQkD
-1eiD1q3uKUkZ7i5OulGc6iD292VVLCTC5T25o67sGFLUrv3Jaz78uE35egIBTMFu
-IBA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.metapress.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.metapress.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Metapress</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">MetaPress</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.metapress.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Tiffany</GivenName>
-    <SurName>Rich</SurName>
-    <EmailAddress>tiffanyrich@metapress.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Casey</GivenName>
-    <SurName>Patterson</SurName>
-    <EmailAddress>metapress@openidp.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml
deleted file mode 100644
index 394c2f27..00000000
--- a/swamid-interfederations-2.0/shibboleth.mh-hannover.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mh-hannover.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-01-26T13:58: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>
-  </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">mh-hannover.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Medizinische Hochschule Hannover</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hannover Medical School</mdui:DisplayName>
-        <mdui:Description xml:lang="de">MHH-IdP - Produktiv</mdui:Description>
-        <mdui:Description xml:lang="en">MHH IdP - Productive</mdui:Description>
-        <mdui:Logo height="16" width="16">https://shibboleth.mh-hannover.de/idp/images/mhh_icon.ico</mdui:Logo>
-        <mdui:Logo height="60" width="250">https://shibboleth.mh-hannover.de/idp/images/mhh_logo.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.mh-hannover.de/zimt.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.mh-hannover.de/zimt.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">http://www.mh-hannover.de/zimt.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.mh-hannover.de/zimt.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.mh-hannover.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.mh-hannover.de,OU=ZIMt,O=Medizinische Hochschule Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG3zCCBcegAwIBAgIHF5kthgN4JTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
-EwJERTEpMCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIx
-DzANBgNVBAMTBk1ISCBDQTEhMB8GCSqGSIb3DQEJARYScGtpQG1oLWhhbm5vdmVy
-LmRlMB4XDTE0MDUxOTA3MTcxMVoXDTE5MDUxODA3MTcxMVowgZYxCzAJBgNVBAYT
-AkRFMRYwFAYDVQQIEw1OaWVkZXJzYWNoc2VuMREwDwYDVQQHEwhIYW5ub3ZlcjEp
-MCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIxDTALBgNV
-BAsTBFpJTXQxIjAgBgNVBAMTGXNoaWJib2xldGgubWgtaGFubm92ZXIuZGUwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+rVeMLRdkpnizrYdnx6rKFTjK
-fEZXh+1RrTvHsbTt6DLz41QLrrr2aTma8HMyLbJtr62uuKvOqOlat7ikt6x6KT4E
-njHjc4xFgW6LpyJ3hvpq/fMGV2nXRo5pvjFhd6A4bg5TfmECkkTnmu55TllIC1t1
-JzYIgMfR6STiH4qt09Oefd36R70oHWFwOfyS01d0nZ5/6AmMFv7I74Dh0ASeCiQo
-N0B+hocT+WJxXVqukjPIxDygj3EMOwBBjqVCRobLpyacQSc1Akiw71yH9AFj5LNR
-rDjhbom4Vk+Q3TuIXwLI07sl8dDF7W8f2OdI+PHZLu3d44WvxjJiGddbJ1Zlppt/
-8cuK5Alst+AtazTuLCRG78y3TkLYMU4CDdV3ravzy1YL1dUCsXyDamxNIN8digNN
-BzXjkJ7QTOah3nYAiG0yE34tpt2DNbGNZglkPQbhgbM/+lCM76DH95/AC6yyZOLF
-ZbcOgmpAkNVq7htd/Z62KaiUSSzB1KzOxs+IPq3erC6CozyDuXgiIbC/98SnS0cz
-XFKyOzgks3o6o2Mu6D1+lCOHE1kUvABL4sedrkmhERAteR9A1F4yAy+ZD379BtSY
-gA8Sc2vPIBKvx2o/+fhQR4/YNjGOaR+rUiVXzeGHr/u3Yup9ztsKpLM0ksZksYxX
-X6QUMAICu1oDUtKWjwIDAQABo4ICWTCCAlUwOQYDVR0gBDIwMDARBg8rBgEEAYGt
-IYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU+uf4
-1Hbz3g+5aTVL89lFbtU5sv4wHwYDVR0jBBgwFoAUJZuBmmj89gJMu3dfHExoM7Nu
-RmswRgYDVR0RBD8wPYIZc2hpYmJvbGV0aC5taC1oYW5ub3Zlci5kZYEgdGV0emxh
-ZmYuYmVuamFtaW5AbWgtaGFubm92ZXIuZGUwgYgGA1UdHwSBgDB+MD2gO6A5hjdo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL21oLWhhbm5vdmVyLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD2gO6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21oLWhhbm5vdmVy
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHXBggrBgEFBQcBAQSByjCBxzAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEcG
-CCsGAQUFBzAChjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL21oLWhhbm5vdmVyLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBHBggrBgEFBQcwAoY7aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9taC1oYW5ub3Zlci1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBAKXYkO2475QAfkK4IZgARuHUesp8kZZHh8YU6YAH
-Wruj5A032fwktpkVt9rhkyPjm/oZr0RdPQKM1BE0se3kCPL4v7MYQDhjvZa66xs3
-iCvJN8NtusArjA9LyjDHUuG+oVKUB+d1HjD3nT8fXGUrw+FYaKoSOPaNBceBBhzr
-DhjST4fPGDO9xwgXbhUcg/+I3E/pLfg8Hj38iFKr9hlpawsJc3A7gruNQp30RyfK
-MN0mlBaZ3pqibwbaDcibWo/Eu8PtwrpYB4XrtBvEgiqWVfA90kNsphQDNYfvaEoZ
-K18PEJr4gbSWIPjE1lQEyqGD5n0ZrU/xJiM8BlvUdStJChk=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mh-hannover.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.mh-hannover.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mh-hannover.de/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">mh-hannover.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.mh-hannover.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.mh-hannover.de,OU=ZIMt,O=Medizinische Hochschule Hannover,L=Hannover,ST=Niedersachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG3zCCBcegAwIBAgIHF5kthgN4JTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
-EwJERTEpMCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIx
-DzANBgNVBAMTBk1ISCBDQTEhMB8GCSqGSIb3DQEJARYScGtpQG1oLWhhbm5vdmVy
-LmRlMB4XDTE0MDUxOTA3MTcxMVoXDTE5MDUxODA3MTcxMVowgZYxCzAJBgNVBAYT
-AkRFMRYwFAYDVQQIEw1OaWVkZXJzYWNoc2VuMREwDwYDVQQHEwhIYW5ub3ZlcjEp
-MCcGA1UEChMgTWVkaXppbmlzY2hlIEhvY2hzY2h1bGUgSGFubm92ZXIxDTALBgNV
-BAsTBFpJTXQxIjAgBgNVBAMTGXNoaWJib2xldGgubWgtaGFubm92ZXIuZGUwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC+rVeMLRdkpnizrYdnx6rKFTjK
-fEZXh+1RrTvHsbTt6DLz41QLrrr2aTma8HMyLbJtr62uuKvOqOlat7ikt6x6KT4E
-njHjc4xFgW6LpyJ3hvpq/fMGV2nXRo5pvjFhd6A4bg5TfmECkkTnmu55TllIC1t1
-JzYIgMfR6STiH4qt09Oefd36R70oHWFwOfyS01d0nZ5/6AmMFv7I74Dh0ASeCiQo
-N0B+hocT+WJxXVqukjPIxDygj3EMOwBBjqVCRobLpyacQSc1Akiw71yH9AFj5LNR
-rDjhbom4Vk+Q3TuIXwLI07sl8dDF7W8f2OdI+PHZLu3d44WvxjJiGddbJ1Zlppt/
-8cuK5Alst+AtazTuLCRG78y3TkLYMU4CDdV3ravzy1YL1dUCsXyDamxNIN8digNN
-BzXjkJ7QTOah3nYAiG0yE34tpt2DNbGNZglkPQbhgbM/+lCM76DH95/AC6yyZOLF
-ZbcOgmpAkNVq7htd/Z62KaiUSSzB1KzOxs+IPq3erC6CozyDuXgiIbC/98SnS0cz
-XFKyOzgks3o6o2Mu6D1+lCOHE1kUvABL4sedrkmhERAteR9A1F4yAy+ZD379BtSY
-gA8Sc2vPIBKvx2o/+fhQR4/YNjGOaR+rUiVXzeGHr/u3Yup9ztsKpLM0ksZksYxX
-X6QUMAICu1oDUtKWjwIDAQABo4ICWTCCAlUwOQYDVR0gBDIwMDARBg8rBgEEAYGt
-IYIsAQEEAwEwEQYPKwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU+uf4
-1Hbz3g+5aTVL89lFbtU5sv4wHwYDVR0jBBgwFoAUJZuBmmj89gJMu3dfHExoM7Nu
-RmswRgYDVR0RBD8wPYIZc2hpYmJvbGV0aC5taC1oYW5ub3Zlci5kZYEgdGV0emxh
-ZmYuYmVuamFtaW5AbWgtaGFubm92ZXIuZGUwgYgGA1UdHwSBgDB+MD2gO6A5hjdo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL21oLWhhbm5vdmVyLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMD2gO6A5hjdodHRwOi8vY2RwMi5wY2EuZGZuLmRlL21oLWhhbm5vdmVy
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIHXBggrBgEFBQcBAQSByjCBxzAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEcG
-CCsGAQUFBzAChjtodHRwOi8vY2RwMS5wY2EuZGZuLmRlL21oLWhhbm5vdmVyLWNh
-L3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBHBggrBgEFBQcwAoY7aHR0cDovL2NkcDIu
-cGNhLmRmbi5kZS9taC1oYW5ub3Zlci1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBAKXYkO2475QAfkK4IZgARuHUesp8kZZHh8YU6YAH
-Wruj5A032fwktpkVt9rhkyPjm/oZr0RdPQKM1BE0se3kCPL4v7MYQDhjvZa66xs3
-iCvJN8NtusArjA9LyjDHUuG+oVKUB+d1HjD3nT8fXGUrw+FYaKoSOPaNBceBBhzr
-DhjST4fPGDO9xwgXbhUcg/+I3E/pLfg8Hj38iFKr9hlpawsJc3A7gruNQp30RyfK
-MN0mlBaZ3pqibwbaDcibWo/Eu8PtwrpYB4XrtBvEgiqWVfA90kNsphQDNYfvaEoZ
-K18PEJr4gbSWIPjE1lQEyqGD5n0ZrU/xJiM8BlvUdStJChk=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mh-hannover.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.mh-hannover.de: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">e435</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e435</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Medizinischen Hochschule Hannover</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Hannover Medical School (MHH)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.mh-hannover.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.mh-hannover.de/index.php?id=2</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Benjamin</md:GivenName>
-    <md:SurName>Tetzlaff</md:SurName>
-    <md:EmailAddress>mailto:Tetzlaff.Benjamin@mh-hannover.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Benjamin</md:GivenName>
-    <md:SurName>Tetzlaff</md:SurName>
-    <md:EmailAddress>mailto:Tetzlaff.Benjamin@mh-hannover.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.midkent.ac.uk-shibboleth.xml
deleted file mode 100644
index 57fdde02..00000000
--- a/swamid-interfederations-2.0/shibboleth.midkent.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://shibboleth.midkent.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Mid-Kent College of Higher and Further Education.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-10-02T15:56: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">midkent.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUNoEJdB/0XMNzrx6TpF9l+vmgmH0wDQYJKoZIhvcNAQEF
-						BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aDIubWlka2VudC5hYy51azAeFw0xNDA1
-						MDYxMzEzNTVaFw0zNDA1MDYxMzEzNTVaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgy
-						Lm1pZGtlbnQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZ
-						FxthTyRgoHipxaAAoald9sOKxKf6dmrKSu8aZe0aI2vELihyQ80EBbhq+ELFUKzr
-						+ZMA2BGC7j2xlzplC7evTx1hTIFwCr6r+5Ezh6yhozKDkMCLVh8SkCqoMuVLkwr+
-						414KLGmmPqS51QuRajcDJu/5kg12CI8rvw3M6NvEhmduwuRZFCwuDOEB9nftY3PY
-						9B6bIx7wBLO9YflPbfP/+kZUqp5iwoWZrsHiX/do8w2zHp5hH0ny3dmAtqNhDzEA
-						xCvvyeU0FXjKcz+0INbl4VMvyjGzfrqSL8CuDx8xegcIWg3p8Q7ZqqNAIOb+3GQ0
-						Mfv+SNteBe1wsMXzOcIXAgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgy
-						Lm1pZGtlbnQuYWMudWuGMGh0dHBzOi8vc2hpYmJvbGV0aDIubWlka2VudC5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUGgaMdXWEPm2ueSgt1bplk0u9X1Mw
-						DQYJKoZIhvcNAQEFBQADggEBAFLDEKLNrzHBhOjb3jING7WIb57xMaTCN2n57blH
-						PWD826DN9EQiqh8zCbhw/b8K7GQmZBbL7egvh0imC7kzdEqDiGeK4BV7YG1i1TUA
-						hS8mQvrMq7xl7SHPOEHEFxxZE2b65R3JYZQhyrFaOOEGv95d+8QbOG7XaAC5JBLS
-						Ak8fnTEGoUAB4X7VPvdzUe48WHAf3O7GkhvbMTZ0t9nqGI5teTltQNINbI5DEhBJ
-						dTJO4nNaoq6TBit1NCGIlKxCzhYMZFPLEsLSqW7D+CVZurqOaLlr5EyIHVNpx4ai
-						vNAdDLuB+XgGcIT+ib/E14TMVg3qCAbW6YqD9N2ZywV41Wk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.midkent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.midkent.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://shibboleth2.midkent.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.midkent.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.midkent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.midkent.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">midkent.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUNoEJdB/0XMNzrx6TpF9l+vmgmH0wDQYJKoZIhvcNAQEF
-						BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aDIubWlka2VudC5hYy51azAeFw0xNDA1
-						MDYxMzEzNTVaFw0zNDA1MDYxMzEzNTVaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgy
-						Lm1pZGtlbnQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZ
-						FxthTyRgoHipxaAAoald9sOKxKf6dmrKSu8aZe0aI2vELihyQ80EBbhq+ELFUKzr
-						+ZMA2BGC7j2xlzplC7evTx1hTIFwCr6r+5Ezh6yhozKDkMCLVh8SkCqoMuVLkwr+
-						414KLGmmPqS51QuRajcDJu/5kg12CI8rvw3M6NvEhmduwuRZFCwuDOEB9nftY3PY
-						9B6bIx7wBLO9YflPbfP/+kZUqp5iwoWZrsHiX/do8w2zHp5hH0ny3dmAtqNhDzEA
-						xCvvyeU0FXjKcz+0INbl4VMvyjGzfrqSL8CuDx8xegcIWg3p8Q7ZqqNAIOb+3GQ0
-						Mfv+SNteBe1wsMXzOcIXAgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgy
-						Lm1pZGtlbnQuYWMudWuGMGh0dHBzOi8vc2hpYmJvbGV0aDIubWlka2VudC5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUGgaMdXWEPm2ueSgt1bplk0u9X1Mw
-						DQYJKoZIhvcNAQEFBQADggEBAFLDEKLNrzHBhOjb3jING7WIb57xMaTCN2n57blH
-						PWD826DN9EQiqh8zCbhw/b8K7GQmZBbL7egvh0imC7kzdEqDiGeK4BV7YG1i1TUA
-						hS8mQvrMq7xl7SHPOEHEFxxZE2b65R3JYZQhyrFaOOEGv95d+8QbOG7XaAC5JBLS
-						Ak8fnTEGoUAB4X7VPvdzUe48WHAf3O7GkhvbMTZ0t9nqGI5teTltQNINbI5DEhBJ
-						dTJO4nNaoq6TBit1NCGIlKxCzhYMZFPLEsLSqW7D+CVZurqOaLlr5EyIHVNpx4ai
-						vNAdDLuB+XgGcIT+ib/E14TMVg3qCAbW6YqD9N2ZywV41Wk=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.midkent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.midkent.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">Mid-Kent College of Higher and Further Education</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Mid-Kent College of Higher and Further Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.midkent.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ICT Help</GivenName>
-    <EmailAddress>mailto:ict.helpdesk@midkent.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>ICT Technical Support</GivenName>
-    <EmailAddress>mailto:ict.helpdesk@midkent.ac.uk</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 7191475c..00000000
--- a/swamid-interfederations-2.0/shibboleth.mines-ales.fr-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://shibboleth.mines-ales.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Ecole des Mines d'Alès</mdui:DisplayName>
-        <mdui:Logo height="7" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAHCAIAAACOQloVAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAABwBZRSlVAAABCklEQVQY04WPPU7DMBhA/dlxfprWQGgliNSlAwJxAgYOwB24E/dgZWFATAghdUZVVSZEA6JVSps4duLYH0OZEBJvedLbHiAi+QuHSAFqYz0GhACjsO3eVsa6p+m7CFle1itphklwPc4uz4b3k+WoH1lnL05FtJMSQgARW6OKUt5N1ucnB0rr0Oe7Xa4aiEPetJZR6lNDKdNy3REDsG2z+niJ+yPf91tLCFqwlbFUfs2TwyNnDaHcOWRYy81nby+ljS6S9Jiga7SqywWacjmfBoG/yGamyh9urqr8NZs9Po9vm1pRxkHJHLweZ66SJedeEIlf963Ruiq6Yp8A/Xko8jcexM62HTEg//ENvWiKwEtcZq0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6NTgrMDI6MDBA9ekLAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjU4KzAyOjAwMahRtwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.mines-ales.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Ecole des Mines d'Alès</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Permanents et Etudiants</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>
-					      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>
-    </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-POST" Location="https://shibboleth.mines-ales.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mines-ales.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mines-ales.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-ales.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.mines-ales.fr/idp/profile/SAML1/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">Ecole des Mines d'Alès</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole des Mines d'Alès</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mines-ales.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>cisana</md:SurName>
-    <md:EmailAddress>pascal.cisana@mines-ales.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>pellissier</md:SurName>
-    <md:EmailAddress>laurent.pellissier@mines-ales.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
deleted file mode 100644
index 2f6a9680..00000000
--- a/swamid-interfederations-2.0/shibboleth.msacademicverify.com-shibboleth-sp.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://shibboleth.msacademicverify.com/shibboleth-sp">
-  <!--
-		This is a "Microsoft Academic Verification Engine" Shibboleth SP for Microsoft Corporation.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-15T18:17: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://shibboleth.msacademicverify.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://shibboleth.msacademicverify.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Microsoft Academic Verification Engine</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXTCCAkWgAwIBAgIJAIPNJpzdV/nXMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-						BAMTH3NoaWJib2xldGgubXNhY2FkZW1pY3ZlcmlmeS5jb20wHhcNMTMwNzEyMDc0
-						ODEwWhcNMTYwNzExMDc0ODEwWjAqMSgwJgYDVQQDEx9zaGliYm9sZXRoLm1zYWNh
-						ZGVtaWN2ZXJpZnkuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						y8xlr8kDHGHgLvfGzdFlV4gWov5IpGy9dtMWjkf5xE5817sGXhBNIt1ejQN6Nj3w
-						y3ZwPWaDJ/tOXDhncPJ2+ur2L6a4IuNlTg0FcqEwc/VnofaRC5iyihtSGuttheQY
-						6T+ptcdvbLDp4Wsq5hpQJrL3W6f4KfFkDr+3iqzLMFbw1IbhGSmpuS6xfHE7nTdR
-						NheBF1pZgeUsNvgacwrKpZN4pdU9kmaEy3Iti59uOwGACOydxE6LHKCYcjVVjOmb
-						Z65jPB+P3mnW0gdcz4U26jlThTJ+4E6DbLbeBZ2tGGWNZ9xvSrJzTqrh6wJbpXbg
-						Z0F+FUfPtfT1uHBezSolZQIDAQABo4GFMIGCMGEGA1UdEQRaMFiCH3NoaWJib2xl
-						dGgubXNhY2FkZW1pY3ZlcmlmeS5jb22GNWh0dHBzOi8vc2hpYmJvbGV0aC5tc2Fj
-						YWRlbWljdmVyaWZ5LmNvbS9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBSl6x2NAW3h
-						oeUBLh7lSL+yIFmolTANBgkqhkiG9w0BAQUFAAOCAQEAGimMyBN15TiohXYEeg+7
-						Ky0ggztUQVHcvlZZL+E4bo048H2hZYD2mYwtbYfa9GQdWv+H2qy0Q9rjkWupdz6J
-						audemQiHo2otVR/QQLRaj8KJAieheIMfnH9UB4ZJBGPhVlO9eMuU5fpwKtPZMahY
-						Z2eUEvuRzidSTbSHWxeQ0lwbeFjEsO+vPTsWG+khGESA9fb/WhndZk+Qvn8Gdlfb
-						I36H8KRs3YIJ7eKIg6CS6g1/n1MP65pAvitTtY/yf7Oy5BGDBVJ0c8vhaDx0NMdm
-						oqv/H3FB0kYoLtSxthUd1GcV2kgO0brHNSobuzYi4yePTH9rkY8Kn/ZF5pDVu4SK
-						/Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shibboleth.msacademicverify.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.msacademicverify.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Microsoft Academic Verification Engine</ServiceName>
-      <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="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">Microsoft Corporation</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Microsoft Academic Verification Engine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>AVE Support</GivenName>
-    <EmailAddress>mailto:avesupp@microsoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AVE Support</GivenName>
-    <EmailAddress>mailto:avesupp@microsoft.com</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 e443e094..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: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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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>
-MIIFQTCCBCmgAwIBAgIQCRROBPt6REfjjtwwkS8W6jANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAxMjYwMDAwMDBaFw0xOTAxMzAxMjAwMDBaMIGGMQswCQYDVQQGEwJDWjEbMBkGA1UECAwSSmlob21vcmF2c2vDvSBrcmFqMRQwEgYDVQQHDAtCcm5vLXN0xZllZDEoMCYGA1UEChMfTW9yYXZza2EgemVtc2thIGtuaWhvdm5hIHYgQnJuZTEaMBgGA1UEAxMRc2hpYmJvbGV0aC5temsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOcSiUXQ2KY7dO4ImB2hokEwDxG3UlAXfH4XBGn417uzrG6VLcSh/OqiEpljmLSaOMkTAQ8C6oT7HqwxnAmheuDgYCCCsAA1ltTdaoWEhyG7D8ForDbnJVGcCOjOSqQpfzP91NrrHNVvPTIqecsGg8cEstubYhAP0jiRXZMa4Xt53WXUvO9FrBpT81WWgJ44Npy1SgDbflgd2YXT9GZCpNoNlL78NE+/m64Ccx4pvheMp/7tTqBzpo1IRUrjYr8eGVPYfu5rSRUTCQaEySfmLkbdIEKr7BMRZxf01DaW17MqK0srOUbarGNSilJ5sfv+h3C5lpoVfaMGFelBuV8DWtAgMBAAGjggHKMIIBxjAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUre4x48667NN4iCQRNTZfTXIGadAwHAYDVR0RBBUwE4IRc2hpYmJvbGV0aC5temsuY3owDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBACMBDa3dxPDOqR9S+dS6/7vr2YhwNsVS5ye0t3bHW1merdMpcjcLRter2YXHjr54DQ4OjjU6LxHEShdxcwoeHRW1bDX7AA+HN/dUkNArPM2Oc4KtDaIuLVKReQoCabE/XijvVL7g4Xb0xFPpgG4oA/TvhnQVig29RLBsK3MdYuGu4HrJ4av179Z5gWIWx0tk8mcTUW0tDhOQGyIRAHF1RLA/QW7MXbIe5q1NF5AXZYTxbnGga9NWZHljL8pNwoww+Akr3XCeXGJldVDj7jPfyFgoc5sOY8vUPBn7n6GToJeRVLinUfLfm5BHbkNvtI23GPtEiJKkg3zxWiGqNRAoSM4=
-</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>
-MIIFQTCCBCmgAwIBAgIQCRROBPt6REfjjtwwkS8W6jANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNjAxMjYwMDAwMDBaFw0xOTAxMzAxMjAwMDBaMIGGMQswCQYDVQQGEwJDWjEbMBkGA1UECAwSSmlob21vcmF2c2vDvSBrcmFqMRQwEgYDVQQHDAtCcm5vLXN0xZllZDEoMCYGA1UEChMfTW9yYXZza2EgemVtc2thIGtuaWhvdm5hIHYgQnJuZTEaMBgGA1UEAxMRc2hpYmJvbGV0aC5temsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOcSiUXQ2KY7dO4ImB2hokEwDxG3UlAXfH4XBGn417uzrG6VLcSh/OqiEpljmLSaOMkTAQ8C6oT7HqwxnAmheuDgYCCCsAA1ltTdaoWEhyG7D8ForDbnJVGcCOjOSqQpfzP91NrrHNVvPTIqecsGg8cEstubYhAP0jiRXZMa4Xt53WXUvO9FrBpT81WWgJ44Npy1SgDbflgd2YXT9GZCpNoNlL78NE+/m64Ccx4pvheMp/7tTqBzpo1IRUrjYr8eGVPYfu5rSRUTCQaEySfmLkbdIEKr7BMRZxf01DaW17MqK0srOUbarGNSilJ5sfv+h3C5lpoVfaMGFelBuV8DWtAgMBAAGjggHKMIIBxjAfBgNVHSMEGDAWgBRn/YggFCeYxwnSJRm76VERY3VQYjAdBgNVHQ4EFgQUre4x48667NN4iCQRNTZfTXIGadAwHAYDVR0RBBUwE4IRc2hpYmJvbGV0aC5temsuY3owDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBACMBDa3dxPDOqR9S+dS6/7vr2YhwNsVS5ye0t3bHW1merdMpcjcLRter2YXHjr54DQ4OjjU6LxHEShdxcwoeHRW1bDX7AA+HN/dUkNArPM2Oc4KtDaIuLVKReQoCabE/XijvVL7g4Xb0xFPpgG4oA/TvhnQVig29RLBsK3MdYuGu4HrJ4av179Z5gWIWx0tk8mcTUW0tDhOQGyIRAHF1RLA/QW7MXbIe5q1NF5AXZYTxbnGga9NWZHljL8pNwoww+Akr3XCeXGJldVDj7jPfyFgoc5sOY8vUPBn7n6GToJeRVLinUfLfm5BHbkNvtI23GPtEiJKkg3zxWiGqNRAoSM4=
-</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>
-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: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.ncgrp.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ncgrp.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 3482150a..00000000
--- a/swamid-interfederations-2.0/shibboleth.ncgrp.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://shibboleth.ncgrp.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for NCG Corporation.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-20T14:53:58Z">
-      <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">ncgrp.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUG4ZxkzS9IGpdhHMn1TzQI90BY4kwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAwwWc2hpYmJvbGV0aC5uY2dycC5hYy51azAeFw0xNTAzMDUw
-						OTM3MDFaFw0zNTAzMDUwOTM3MDFaMCExHzAdBgNVBAMMFnNoaWJib2xldGgubmNn
-						cnAuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNwml7nMPw
-						kfB47H6K5ieeSuGeGL7fNohzrgJHn6d3oreShzrBNszrw7NQA4WuqiR2tJiE6dui
-						qe2q18Z++eJYzKg5rNjgSTWPOHbZUwb5T+SIVByNiPi4OKZsK/0PBU8v4Drmq3zr
-						9Hg4h9J23bM86C8gmq5DzueK1YBUQad6Kyg63w+XXJlhTn/EFuHsgprxoanXk4jd
-						qOKBliOwpYsmxhNoFAV3K8f/qpxyWXKUhShM75RhZ7iSLrCUmbTpkPU8p1JIelxn
-						yx0JxOUS4IXtRw6XcFXkXKyW28ELErnliJ7ZteYjXFbyC1CQWtpNJDzaLyFAzHPw
-						qFa2GND8uFQbAgMBAAGjczBxMB0GA1UdDgQWBBSboIzUYE1snND/8/InWC7LHlL9
-						GjBQBgNVHREESTBHghZzaGliYm9sZXRoLm5jZ3JwLmFjLnVrhi1odHRwczovL3No
-						aWJib2xldGgubmNncnAuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEF
-						BQADggEBAFlIkvTRemTSxMW4X3U/xe4oa3e56YM591wZbzGe9kyTzW801+FUmKAq
-						+6P42HYoulpj6JY5JSt2T10159IIscluBdygY3yGe8hDbeHGO+bPs4DKJD6ZOVvf
-						CQKkmpWqCpGp7KqDu7N9QEigtjT9j2r1StGh/QEPhGNKyIlEVAlGxIXTy1ZAsnoM
-						p2gB6jTJKy1ul1E9ITXI8ZKRx2dJe+AkQ2u/fSfX6+jfZIk1dTDQgG70WL026Y2z
-						cVn9MS6oTJVbl8DIp3Ayoqv79OlnQ/Z2nGN6N1naD9GsysYkMdVIunQYEbrrL94K
-						efCFXXYuNe739AqEH2Glv2zttZHiRPQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncgrp.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://shibboleth.ncgrp.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ncgrp.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ncgrp.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">ncgrp.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUG4ZxkzS9IGpdhHMn1TzQI90BY4kwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAwwWc2hpYmJvbGV0aC5uY2dycC5hYy51azAeFw0xNTAzMDUw
-						OTM3MDFaFw0zNTAzMDUwOTM3MDFaMCExHzAdBgNVBAMMFnNoaWJib2xldGgubmNn
-						cnAuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNwml7nMPw
-						kfB47H6K5ieeSuGeGL7fNohzrgJHn6d3oreShzrBNszrw7NQA4WuqiR2tJiE6dui
-						qe2q18Z++eJYzKg5rNjgSTWPOHbZUwb5T+SIVByNiPi4OKZsK/0PBU8v4Drmq3zr
-						9Hg4h9J23bM86C8gmq5DzueK1YBUQad6Kyg63w+XXJlhTn/EFuHsgprxoanXk4jd
-						qOKBliOwpYsmxhNoFAV3K8f/qpxyWXKUhShM75RhZ7iSLrCUmbTpkPU8p1JIelxn
-						yx0JxOUS4IXtRw6XcFXkXKyW28ELErnliJ7ZteYjXFbyC1CQWtpNJDzaLyFAzHPw
-						qFa2GND8uFQbAgMBAAGjczBxMB0GA1UdDgQWBBSboIzUYE1snND/8/InWC7LHlL9
-						GjBQBgNVHREESTBHghZzaGliYm9sZXRoLm5jZ3JwLmFjLnVrhi1odHRwczovL3No
-						aWJib2xldGgubmNncnAuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEF
-						BQADggEBAFlIkvTRemTSxMW4X3U/xe4oa3e56YM591wZbzGe9kyTzW801+FUmKAq
-						+6P42HYoulpj6JY5JSt2T10159IIscluBdygY3yGe8hDbeHGO+bPs4DKJD6ZOVvf
-						CQKkmpWqCpGp7KqDu7N9QEigtjT9j2r1StGh/QEPhGNKyIlEVAlGxIXTy1ZAsnoM
-						p2gB6jTJKy1ul1E9ITXI8ZKRx2dJe+AkQ2u/fSfX6+jfZIk1dTDQgG70WL026Y2z
-						cVn9MS6oTJVbl8DIp3Ayoqv79OlnQ/Z2nGN6N1naD9GsysYkMdVIunQYEbrrL94K
-						efCFXXYuNe739AqEH2Glv2zttZHiRPQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ncgrp.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncgrp.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">NCG Corporation</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newcastle College Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ncgrp.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helen</GivenName>
-    <SurName>Ashton</SurName>
-    <EmailAddress>mailto:helen.ashton@ncl-coll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Phil</GivenName>
-    <SurName>Robinson</SurName>
-    <EmailAddress>mailto:Phil.Robinson@ncgrp.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ncl-coll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ncl-coll.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 05a57a19..00000000
--- a/swamid-interfederations-2.0/shibboleth.ncl-coll.ac.uk-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" entityID="https://shibboleth.ncl-coll.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Newcastle College" Shibboleth IdP for NCG Corporation.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">ncl-coll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID7DCCAtSgAwIBAgIJAKVaXHtxIPVVMA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
-						BAYTAkdCMRQwEgYDVQQIDAtUeW5lICYgV2VhcjESMBAGA1UEBxMJTmV3Y2FzdGxl
-						MRowGAYDVQQKExFOZXdjYXN0bGUgQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJvbGV0
-						aC5uY2wtY29sbC5hYy51azAeFw0xMzA1MTcxNTE4MjBaFw0yMzA1MTUxNTE4MjBa
-						MHcxCzAJBgNVBAYTAkdCMRQwEgYDVQQIDAtUeW5lICYgV2VhcjESMBAGA1UEBxMJ
-						TmV3Y2FzdGxlMRowGAYDVQQKExFOZXdjYXN0bGUgQ29sbGVnZTEiMCAGA1UEAxMZ
-						c2hpYmJvbGV0aC5uY2wtY29sbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAKEREiypT26FB/GHKtfr/XZBjcQtpJyzBCpluioX4s8mCiX+7Hxp
-						W8zb5LV5FobeUhGMfj7We1a6vXxE7+DRci2O3RebrkGUDrtxuhTYJeM9eiD1ym8u
-						1xJUc9wkkFyKR8ELzhK3Nwc4AmZUlnCR/8nmQKogkbs+DMxcCOendqTFU/PHO5YB
-						Tldaj5K754XLQDrJcF9eanWYsR80lPro7QboTnFqpYpmDMk2gRgZ+c0UGpLh+PHz
-						0HBGnT/8NgcEoCbrNYnmAdAlu8maPeqmPLXqI2k2WeFeEIrMjXOsBy7Swa9BtC6v
-						+nZe4CxFnbDBbOCz680ljgHyi171yID9RdcCAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJCtZq7NRV0Nn0t1gEEPHCm/NIyyMB8GA1UdIwQYMBaAFJCtZq7NRV0N
-						n0t1gEEPHCm/NIyyMA0GCSqGSIb3DQEBBQUAA4IBAQBfWO+H2B2VXoVehJgjYjb8
-						NHcIMyKbL1TH9lle3rAVqQB/p41UODk+g3Tzqe5uFN7sHF88PhcrSq+7ORzOYzLr
-						2zBQ/BZUixt92KT1Z/jvnfF1d2aLXh2XL5JG6j3NZQhVBDbKrD38L+/1hP7xfeRz
-						+qQ9puB9hRIDZnglAE3rYfPKQ1d7gLxnz683ny0uYRlPIWuWETJNQ+8mae0wS/k6
-						LMVRiDmLop/2ClZVnivv8L7giJ7BG1bCQK2iEfaMURdRyGSPODq5ljGiLIBTuEa3
-						TfeD5m39qepGwMTVxG4qCelOhTtTkjGwSNBN0zXNPr5JZCO/3pv5lPM2uCjtL30Y
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ncl-coll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncl-coll.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://shibboleth.ncl-coll.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ncl-coll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ncl-coll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ncl-coll.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">ncl-coll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID7DCCAtSgAwIBAgIJAKVaXHtxIPVVMA0GCSqGSIb3DQEBBQUAMHcxCzAJBgNV
-						BAYTAkdCMRQwEgYDVQQIDAtUeW5lICYgV2VhcjESMBAGA1UEBxMJTmV3Y2FzdGxl
-						MRowGAYDVQQKExFOZXdjYXN0bGUgQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJvbGV0
-						aC5uY2wtY29sbC5hYy51azAeFw0xMzA1MTcxNTE4MjBaFw0yMzA1MTUxNTE4MjBa
-						MHcxCzAJBgNVBAYTAkdCMRQwEgYDVQQIDAtUeW5lICYgV2VhcjESMBAGA1UEBxMJ
-						TmV3Y2FzdGxlMRowGAYDVQQKExFOZXdjYXN0bGUgQ29sbGVnZTEiMCAGA1UEAxMZ
-						c2hpYmJvbGV0aC5uY2wtY29sbC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAKEREiypT26FB/GHKtfr/XZBjcQtpJyzBCpluioX4s8mCiX+7Hxp
-						W8zb5LV5FobeUhGMfj7We1a6vXxE7+DRci2O3RebrkGUDrtxuhTYJeM9eiD1ym8u
-						1xJUc9wkkFyKR8ELzhK3Nwc4AmZUlnCR/8nmQKogkbs+DMxcCOendqTFU/PHO5YB
-						Tldaj5K754XLQDrJcF9eanWYsR80lPro7QboTnFqpYpmDMk2gRgZ+c0UGpLh+PHz
-						0HBGnT/8NgcEoCbrNYnmAdAlu8maPeqmPLXqI2k2WeFeEIrMjXOsBy7Swa9BtC6v
-						+nZe4CxFnbDBbOCz680ljgHyi171yID9RdcCAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJCtZq7NRV0Nn0t1gEEPHCm/NIyyMB8GA1UdIwQYMBaAFJCtZq7NRV0N
-						n0t1gEEPHCm/NIyyMA0GCSqGSIb3DQEBBQUAA4IBAQBfWO+H2B2VXoVehJgjYjb8
-						NHcIMyKbL1TH9lle3rAVqQB/p41UODk+g3Tzqe5uFN7sHF88PhcrSq+7ORzOYzLr
-						2zBQ/BZUixt92KT1Z/jvnfF1d2aLXh2XL5JG6j3NZQhVBDbKrD38L+/1hP7xfeRz
-						+qQ9puB9hRIDZnglAE3rYfPKQ1d7gLxnz683ny0uYRlPIWuWETJNQ+8mae0wS/k6
-						LMVRiDmLop/2ClZVnivv8L7giJ7BG1bCQK2iEfaMURdRyGSPODq5ljGiLIBTuEa3
-						TfeD5m39qepGwMTVxG4qCelOhTtTkjGwSNBN0zXNPr5JZCO/3pv5lPM2uCjtL30Y
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ncl-coll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ncl-coll.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">NCG Corporation</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newcastle College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ncl-coll.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Wardhaugh</SurName>
-    <EmailAddress>mailto:david.wardhaugh@ncl-coll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Wardhaugh</SurName>
-    <EmailAddress>mailto:david.wardhaugh@ncl-coll.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 083819ac..00000000
--- a/swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.nkp.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFZDCCBEygAwIBAgIQBX7gcQUh/KCJXiApMy1ANTANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNjAxMjUwMDAwMDBaFw0xOTAxMjkxMjAwMDBaMIGBMQswCQYDVQQG
-EwJDWjEPMA0GA1UECBMGUHJhZ3VlMRAwDgYDVQQHEwdQcmFoYSAxMTMwMQYDVQQK
-EypUaGUgTmF0aW9uYWwgTGlicmFyeSBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxGjAY
-BgNVBAMTEXNoaWJib2xldGgubmtwLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxVz9glo7tIF0FV6n1PNww6xY1RXXH863lHNc2GIdZPHjjqjZLEuR
-Y80rRawhlCtRhis0zfwnwlfFE5svgQzs2VhSS+858BJerWKkDhx2NkGOVAvhVpik
-k8+dslRxYAGh8zMbEfdJccZdpx397gaCLhHxbpbDxKlQK0Cv6nHhmv1gb1q/KOgN
-pFDGPByjQQ6yZN5q0UQ1jYUtb/yoydt2hbtBFCE9/5ZoehK3Qr8GMkF36bL8yXxe
-zRXX3gK9rM5n2M/6bM86D+YHG40r4Q3XvQLdAPMMphr4b1C3sfkX8iGjolxgQEm8
-YfUYVXUFG4Qx5mxwJQPOaQj863wwn4EYGwIDAQABo4IB8jCCAe4wHwYDVR0jBBgw
-FoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFBXpVcpKQRux0SxErHIO
-SwZzsq16MEQGA1UdEQQ9MDuCEXNoaWJib2xldGgubmtwLmN6ghJzaGliYm9sZXRo
-Mi5ua3AuY3qCEnNoaWJib2xldGgzLm5rcC5jejAOBgNVHQ8BAf8EBAMCBaAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0
-dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilo
-dHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBMBgNVHSAE
-RTBDMDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdp
-Y2VydC5jb20vQ1BTMAgGBmeBDAECAjBuBggrBgEFBQcBAQRiMGAwJAYIKwYBBQUH
-MAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTA4BggrBgEFBQcwAoYsaHR0cDov
-L2NhY2VydHMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcnQwDAYDVR0TAQH/
-BAIwADANBgkqhkiG9w0BAQsFAAOCAQEAum1TFHVyw8j5ravnpSfedLc+na/GsxQE
-YPAGV4TV0zD69BgH0iQNkTsfjlGNYtj2/j8xpHX/8RIzBkJz4VxOO6bKt2ZhmACG
-mar3Z5kqYeBfWlEM2qFM2dI0IqA1fUlpzTUTug+vspf7RNKGkcZiGfChPDOSD1XN
-VeD3nbwewrypJ7FhDqn42y+FcN3rZJYmwM2WLOWEyAFY6/NGUs9UJand39hR9tcq
-UC1T4fjlKFOc+BRuahdBg15hm3eWR5Aa+23z6kePOezjf5vzBqPTVQWERwXECJlX
-n81sTHIJBu0U+KA0p2PUB/v3CW/lT0NBwOCCADwTtB98dddMxvzyTg==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nkp.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:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nkp.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nkp.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nkp.cz/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">nkp.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFZDCCBEygAwIBAgIQBX7gcQUh/KCJXiApMy1ANTANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMzAeFw0xNjAxMjUwMDAwMDBaFw0xOTAxMjkxMjAwMDBaMIGBMQswCQYDVQQG
-EwJDWjEPMA0GA1UECBMGUHJhZ3VlMRAwDgYDVQQHEwdQcmFoYSAxMTMwMQYDVQQK
-EypUaGUgTmF0aW9uYWwgTGlicmFyeSBvZiB0aGUgQ3plY2ggUmVwdWJsaWMxGjAY
-BgNVBAMTEXNoaWJib2xldGgubmtwLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxVz9glo7tIF0FV6n1PNww6xY1RXXH863lHNc2GIdZPHjjqjZLEuR
-Y80rRawhlCtRhis0zfwnwlfFE5svgQzs2VhSS+858BJerWKkDhx2NkGOVAvhVpik
-k8+dslRxYAGh8zMbEfdJccZdpx397gaCLhHxbpbDxKlQK0Cv6nHhmv1gb1q/KOgN
-pFDGPByjQQ6yZN5q0UQ1jYUtb/yoydt2hbtBFCE9/5ZoehK3Qr8GMkF36bL8yXxe
-zRXX3gK9rM5n2M/6bM86D+YHG40r4Q3XvQLdAPMMphr4b1C3sfkX8iGjolxgQEm8
-YfUYVXUFG4Qx5mxwJQPOaQj863wwn4EYGwIDAQABo4IB8jCCAe4wHwYDVR0jBBgw
-FoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFBXpVcpKQRux0SxErHIO
-SwZzsq16MEQGA1UdEQQ9MDuCEXNoaWJib2xldGgubmtwLmN6ghJzaGliYm9sZXRo
-Mi5ua3AuY3qCEnNoaWJib2xldGgzLm5rcC5jejAOBgNVHQ8BAf8EBAMCBaAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGsGA1UdHwRkMGIwL6AtoCuGKWh0
-dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3JsMC+gLaArhilo
-dHRwOi8vY3JsNC5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDBMBgNVHSAE
-RTBDMDcGCWCGSAGG/WwBATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdp
-Y2VydC5jb20vQ1BTMAgGBmeBDAECAjBuBggrBgEFBQcBAQRiMGAwJAYIKwYBBQUH
-MAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTA4BggrBgEFBQcwAoYsaHR0cDov
-L2NhY2VydHMuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcnQwDAYDVR0TAQH/
-BAIwADANBgkqhkiG9w0BAQsFAAOCAQEAum1TFHVyw8j5ravnpSfedLc+na/GsxQE
-YPAGV4TV0zD69BgH0iQNkTsfjlGNYtj2/j8xpHX/8RIzBkJz4VxOO6bKt2ZhmACG
-mar3Z5kqYeBfWlEM2qFM2dI0IqA1fUlpzTUTug+vspf7RNKGkcZiGfChPDOSD1XN
-VeD3nbwewrypJ7FhDqn42y+FcN3rZJYmwM2WLOWEyAFY6/NGUs9UJand39hR9tcq
-UC1T4fjlKFOc+BRuahdBg15hm3eWR5Aa+23z6kePOezjf5vzBqPTVQWERwXECJlX
-n81sTHIJBu0U+KA0p2PUB/v3CW/lT0NBwOCCADwTtB98dddMxvzyTg==
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nkp.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The National Library of the Czech Republic</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Národní knihovna České republiky</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The National Library of the Czech Republic</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Národní knihovna České republiky</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.en.nkp.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.nkp.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Pavel</md:GivenName>
-    <md:SurName>Kotrba</md:SurName>
-    <md:EmailAddress>Pavel.Kotrba@nkp.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 a543ee4b..00000000
--- a/swamid-interfederations-2.0/shibboleth.nkp.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.nkp.cz/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">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.nptc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.nptc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 57a06dbc..00000000
--- a/swamid-interfederations-2.0/shibboleth.nptc.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://shibboleth.nptc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Neath Port Talbot College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-01T09:00:48Z">
-      <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">nptc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVAOuMhJPh+PUsyjWCDIkMwY77mV8nMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGgubnB0Yy5hYy51azAeFw0xNDA3MzEx
-						MzM4MTRaFw0zNDA3MzExMzM4MTRaMCAxHjAcBgNVBAMTFXNoaWJib2xldGgubnB0
-						Yy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIxTzrChL9Ud
-						ALbMY1tQii/tKJb010drODV9hTRwm9p5kGPiviV9kMqaWkuBLihzZtaXnOa0RfBj
-						b+wrJxGx1JGzSUXSvZaI3LMUKM+P8+ewhAfd4z+85uxdBtS7Foy5HD5xNZfCAQap
-						ODUsT0nG/N7eMBv4v0CatmygS6WRRjE89UVQQcc69j+/hjfMvO+oBHlMXgfqMc2a
-						jq/A3TUy/fHUosYdAZiQ5Cu2uJS2qwvxE59vkI1/x70k+PKuG2CB7UKmN5iGoYQ7
-						kThjQJMyjL2W7V4f9/9Y3oe6Co6stCF+4v+RuVBXM8GzITGP1lpdPk0qFSxFMdS6
-						XghrbldDD5cCAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aC5ucHRjLmFj
-						LnVrhixodHRwczovL3NoaWJib2xldGgubnB0Yy5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQULe2KsIkQADxw5Ty0+mY6dQuclkYwDQYJKoZIhvcNAQEFBQAD
-						ggEBAHFeFNvxnYZS4C36tCWddIbqhy28j02wq9BNa1Z81rgFW4X/7bLYMCWVogz8
-						Ix0XDTqYoYabDygGk5KNXMufaBg6or5Yc95YyVWYEfDMYZvttprXeY7wLtXqiZdq
-						4swR+ZPGF5Dahmn+fG+2bqL3E7PdCDkQNzpIlc57a1faLMnh8qeZyN62mxYrFEKJ
-						Rv5fXenQI9vwy9STCfHzgu7F9Lo3O3C3+VLsp128RL7RvAAt8ylswYPw5c1OhLVF
-						1tPtzpQSWBjOGsjeFOI5IK0TbyX3e6GK8NjypAX0gjSqO70v6o2ZFm5svXDHyUl/
-						rhxiSLK1U13f5Z1zFhi15dJ7tLE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nptc.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://shibboleth.nptc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.nptc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nptc.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">nptc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVAOuMhJPh+PUsyjWCDIkMwY77mV8nMA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGgubnB0Yy5hYy51azAeFw0xNDA3MzEx
-						MzM4MTRaFw0zNDA3MzExMzM4MTRaMCAxHjAcBgNVBAMTFXNoaWJib2xldGgubnB0
-						Yy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIxTzrChL9Ud
-						ALbMY1tQii/tKJb010drODV9hTRwm9p5kGPiviV9kMqaWkuBLihzZtaXnOa0RfBj
-						b+wrJxGx1JGzSUXSvZaI3LMUKM+P8+ewhAfd4z+85uxdBtS7Foy5HD5xNZfCAQap
-						ODUsT0nG/N7eMBv4v0CatmygS6WRRjE89UVQQcc69j+/hjfMvO+oBHlMXgfqMc2a
-						jq/A3TUy/fHUosYdAZiQ5Cu2uJS2qwvxE59vkI1/x70k+PKuG2CB7UKmN5iGoYQ7
-						kThjQJMyjL2W7V4f9/9Y3oe6Co6stCF+4v+RuVBXM8GzITGP1lpdPk0qFSxFMdS6
-						XghrbldDD5cCAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aC5ucHRjLmFj
-						LnVrhixodHRwczovL3NoaWJib2xldGgubnB0Yy5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQULe2KsIkQADxw5Ty0+mY6dQuclkYwDQYJKoZIhvcNAQEFBQAD
-						ggEBAHFeFNvxnYZS4C36tCWddIbqhy28j02wq9BNa1Z81rgFW4X/7bLYMCWVogz8
-						Ix0XDTqYoYabDygGk5KNXMufaBg6or5Yc95YyVWYEfDMYZvttprXeY7wLtXqiZdq
-						4swR+ZPGF5Dahmn+fG+2bqL3E7PdCDkQNzpIlc57a1faLMnh8qeZyN62mxYrFEKJ
-						Rv5fXenQI9vwy9STCfHzgu7F9Lo3O3C3+VLsp128RL7RvAAt8ylswYPw5c1OhLVF
-						1tPtzpQSWBjOGsjeFOI5IK0TbyX3e6GK8NjypAX0gjSqO70v6o2ZFm5svXDHyUl/
-						rhxiSLK1U13f5Z1zFhi15dJ7tLE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nptc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nptc.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">Neath Port Talbot College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NPTC Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nptc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Lewis</SurName>
-    <EmailAddress>mailto:chris.lewis@nptcgroup.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Lewis</SurName>
-    <EmailAddress>mailto:chris.lewis@nptcgroup.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.nss.udel.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.nss.udel.edu-idp-shibboleth.xml
deleted file mode 100644
index 3beb10b2..00000000
--- a/swamid-interfederations-2.0/shibboleth.nss.udel.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://shibboleth.nss.udel.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shibboleth.nss.udel.edu/idp/shibboleth/error" 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">udel.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Delaware</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>
-MIIDSDCCAjCgAwIBAgIVAPzSSqG9t2K8y1dCX8zWxR+XUXrCMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGgubnNzLnVkZWwuZWR1MB4XDTEzMDQy
-NDE1NDg0MFoXDTMzMDQyNDE1NDg0MFowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5u
-c3MudWRlbC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCLYSWS
-8lZ7mSNu60m35msFGjoEx1C4gRvy9liQ5XScHKYtbqu6JryJTogYUWGBdQ4Am7vb
-ZqyTM9rdfBVX7tzbWAIdMaUhf9ORHVN0ElDk9qwW5irFzsotoeHVDEK6TrzUDws9
-/wkERk9p2Tm7hy+8sWhOx3Ybq7TkA2I4zS5f0QGFQZnYob1/zU9tdPWkjMf5H99g
-nDNCVqqk8pKZJIF2E3dt9IQBYDmTsffk563k8CV0784xiBaVXC5i3+Uh4E4mLBaq
-g0T+BQ5tHR40GolAq4Ia+hfXrcHGTcYT+Mfl6skMCBFwLK0sF24RFAQzD+L/jH+M
-DnTwx7JKiXqIdNS7AgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGgubnNz
-LnVkZWwuZWR1hi5odHRwczovL3NoaWJib2xldGgubnNzLnVkZWwuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSUTIwR8Sy0NgXoq72J1QRVBOkC2jANBgkqhkiG
-9w0BAQUFAAOCAQEAJoZ9nOxRVwuYF2rM6CjSBVwRIlkv8GFRNhl4Rxevz4Sl9lX9
-gvJyJnchy+6F3UYh0QRgjiu8SKa05/8qdElac8OEpaYHrf3ZZE8Dl8o6CibW1Lkq
-IsAXbYLiZDlhxw7Z+cQm0gaE84p+m219iWGf9HGdIUwGEBEL9JLKwBFjPU55WGhC
-6ytIRSKVqxoPPuhcSJI758WWv/wsmH7F/8flH1pqsumE7FLgKRJBB94TFXk6Ajts
-xyo7IcIbdxUsuGPY55IdcAN2cTNO+ONuzLgf2gtj+Byrw4YQPj5fp6rMFNXUkNMf
-EWrgTL1D4S1H5wyY2qBla9ba8P2/PZC0bGK4Xg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nss.udel.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nss.udel.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nss.udel.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nss.udel.edu/idp/profile/Shibboleth/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nss.udel.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udel.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAPzSSqG9t2K8y1dCX8zWxR+XUXrCMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJib2xldGgubnNzLnVkZWwuZWR1MB4XDTEzMDQy
-NDE1NDg0MFoXDTMzMDQyNDE1NDg0MFowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5u
-c3MudWRlbC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCLYSWS
-8lZ7mSNu60m35msFGjoEx1C4gRvy9liQ5XScHKYtbqu6JryJTogYUWGBdQ4Am7vb
-ZqyTM9rdfBVX7tzbWAIdMaUhf9ORHVN0ElDk9qwW5irFzsotoeHVDEK6TrzUDws9
-/wkERk9p2Tm7hy+8sWhOx3Ybq7TkA2I4zS5f0QGFQZnYob1/zU9tdPWkjMf5H99g
-nDNCVqqk8pKZJIF2E3dt9IQBYDmTsffk563k8CV0784xiBaVXC5i3+Uh4E4mLBaq
-g0T+BQ5tHR40GolAq4Ia+hfXrcHGTcYT+Mfl6skMCBFwLK0sF24RFAQzD+L/jH+M
-DnTwx7JKiXqIdNS7AgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJib2xldGgubnNz
-LnVkZWwuZWR1hi5odHRwczovL3NoaWJib2xldGgubnNzLnVkZWwuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSUTIwR8Sy0NgXoq72J1QRVBOkC2jANBgkqhkiG
-9w0BAQUFAAOCAQEAJoZ9nOxRVwuYF2rM6CjSBVwRIlkv8GFRNhl4Rxevz4Sl9lX9
-gvJyJnchy+6F3UYh0QRgjiu8SKa05/8qdElac8OEpaYHrf3ZZE8Dl8o6CibW1Lkq
-IsAXbYLiZDlhxw7Z+cQm0gaE84p+m219iWGf9HGdIUwGEBEL9JLKwBFjPU55WGhC
-6ytIRSKVqxoPPuhcSJI758WWv/wsmH7F/8flH1pqsumE7FLgKRJBB94TFXk6Ajts
-xyo7IcIbdxUsuGPY55IdcAN2cTNO+ONuzLgf2gtj+Byrw4YQPj5fp6rMFNXUkNMf
-EWrgTL1D4S1H5wyY2qBla9ba8P2/PZC0bGK4Xg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nss.udel.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Delaware</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Delaware</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.udel.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Fraser S. Gutteridge</md:GivenName>
-    <md:EmailAddress>blue@udel.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Melvin Rau</md:GivenName>
-    <md:EmailAddress>mrau@udel.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Daniel J. Grim</md:GivenName>
-    <md:EmailAddress>grim@udel.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 eba75e8c..00000000
--- a/swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.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://shibboleth.obspm.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Observatoire de Paris</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACLElEQVQoz3WSX2hScRTHv/fen9drOo0Wm0X0UEFvPRSM6C+x0Vr0UA/Z6kFczdSYijMYEdRDQWON/Y3KMRKaQS0oiSAX4qC9RS8Re5EaCAMTG7Pcvd57vd5fD7qQub4P5+V8P5zDOV+GUooGFX6tEZ6zWE2NLdA6ZZbyIV8MCAM+wAuEQ75YZilf72H+TZianPcEXgJGnieEMAA0jaqqBqiTwxf6wp1VWw2Ymkh5glGg2byF27CCTlEqFSMTjuv+DgAsgNzPgtXOJeaC3Y69oqSJklIPsAwEweIJvFnOrNSA6cfzly+9ONMZ6ek9BjAfEi5REkWpUiVFSZFlHcD4wzkABMDzp18BM1BWVMUK08FDe/w32lZ/l1xXj3S0jyZTodevPhPCSZpUA9L5VUHgZBkAY2a5VOrb0ZP7LE3C+EgqNnOt3xu/P9JVklRFpgBlAQCqLCuAzBs4lkAQDISw586OunoPn+46sHvXtuijL2aL0emMqmqFBRCPu969dy586n9w96PepCVmv9tM1j5/O8pc2/7h4O3jVKfJ5CKP7TxPGErpnYHZe0NJwADwRiOjKBVAAwzrtQwQQB0Inhgc62Yopblswb7zliCYOJbBZtIpSqW1XHaoxW5jAbTu2PrsiUOWizr9n7sYmbjYYrfVrgSgx3tKFFX/zbcAz/PEQBgA5fVojA2er755Y/h+pLMB7wwQBtyAGwi7r0ynF5c3D1+9VnJ/ADS3WhtbfwHf4Ru+52sb3QAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMCswMjowMFq3xdUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzArMDI6MDAr6n1pAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.obspm.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Observatoire de Paris</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>
-					      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>
-    </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-POST" Location="https://shibboleth.obspm.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.obspm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.obspm.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Observatoire de Paris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Observatoire de Paris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.obspm.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>interne.admin.DIO@obspm.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.oldham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.oldham.ac.uk-shibboleth.xml
deleted file mode 100644
index afbee742..00000000
--- a/swamid-interfederations-2.0/shibboleth.oldham.ac.uk-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" entityID="https://shibboleth.oldham.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for The Oldham College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-31T13:45: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">oldham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIRAMcHtIGAOBG7Xl/x6OlCvx8wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzExMjAwMDAwMDBaFw0xNjExMTkyMzU5NTlaMEUxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXc2hpYmJvbGV0
-						aC5vbGRoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDp
-						ck8rlkYXQ99QaIZpn1ik2kBd7wvCnJ6QifQFXckEGEMSZzGG0/mWchho5XXOb+Sm
-						6jOAIEI+m/pSzss1iz3tPAKJIujtV0D7NwiEwFaUOrOQ+oeRAQtdNS8GBbKPGMgH
-						lsX6zIydvH/59ZeYT11FsKErwVb4n1apu2BbGuwK9M40vJ8eRwxS3y7kK64NdE9/
-						XBsxC6+iswe9UBTMYi3h5Pny4ihsJtZrMgC+ctyZFv4N3GVTXA1gK7QaGaUjhg+M
-						Z3CSDfpc6UzQ++hxvve8LO6w3nJ0M/uyyq9kZ5ZvxVcx8Dv+mFSWXdf9QC5A0amJ
-						WXbZTlWDz3tHCvCC2FwxAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
-						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUxy1jShUzSc9Rh9vCP8y/c9yzUk0wDgYD
-						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF3NoaWJib2xldGgu
-						b2xkaGFtLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB0Fwd2Jh3G5xkA8gbEi1HV
-						2lvMgUxoo/8e4ZwmQpPT7zS/No3XGcpxw07+6Zx8X6FKm5MnqcLsehvJ5Vvpty6T
-						jur/5oD0I4L+Vuj/fQxSuG7AlGMC/0geHY65BAuxVOrKhKEU3bBdSIg8aWZwjzLS
-						CSyVju5jBTncT/ebRNdOVn9WQ6it8wQBHnLRw/s6liYD81K8OJL+WUUPetyDokGJ
-						uRqaKvbYt5qYseXcbOrwBvyERQ3j+j+g4tLRWo/k1QJxilBbXtqo22L4e8AjOMN7
-						SvdjM8XejBUGw++3ZzPbg/v0meOi2EidA5m5mHbAvLV248hMsLUCJxA9qYJ5DebU
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.oldham.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.oldham.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://shibboleth.oldham.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.oldham.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.oldham.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.oldham.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">oldham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIRAMcHtIGAOBG7Xl/x6OlCvx8wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzExMjAwMDAwMDBaFw0xNjExMTkyMzU5NTlaMEUxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEgMB4GA1UEAxMXc2hpYmJvbGV0
-						aC5vbGRoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDp
-						ck8rlkYXQ99QaIZpn1ik2kBd7wvCnJ6QifQFXckEGEMSZzGG0/mWchho5XXOb+Sm
-						6jOAIEI+m/pSzss1iz3tPAKJIujtV0D7NwiEwFaUOrOQ+oeRAQtdNS8GBbKPGMgH
-						lsX6zIydvH/59ZeYT11FsKErwVb4n1apu2BbGuwK9M40vJ8eRwxS3y7kK64NdE9/
-						XBsxC6+iswe9UBTMYi3h5Pny4ihsJtZrMgC+ctyZFv4N3GVTXA1gK7QaGaUjhg+M
-						Z3CSDfpc6UzQ++hxvve8LO6w3nJ0M/uyyq9kZ5ZvxVcx8Dv+mFSWXdf9QC5A0amJ
-						WXbZTlWDz3tHCvCC2FwxAgMBAAGjggF0MIIBcDAfBgNVHSMEGDAWgBQMvZNoDPPe
-						q6NJays3V0fqkOO57TAdBgNVHQ4EFgQUxy1jShUzSc9Rh9vCP8y/c9yzUk0wDgYD
-						VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-						CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-						A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5B
-						U1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-						dC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0
-						dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCIGA1UdEQQbMBmCF3NoaWJib2xldGgu
-						b2xkaGFtLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQB0Fwd2Jh3G5xkA8gbEi1HV
-						2lvMgUxoo/8e4ZwmQpPT7zS/No3XGcpxw07+6Zx8X6FKm5MnqcLsehvJ5Vvpty6T
-						jur/5oD0I4L+Vuj/fQxSuG7AlGMC/0geHY65BAuxVOrKhKEU3bBdSIg8aWZwjzLS
-						CSyVju5jBTncT/ebRNdOVn9WQ6it8wQBHnLRw/s6liYD81K8OJL+WUUPetyDokGJ
-						uRqaKvbYt5qYseXcbOrwBvyERQ3j+j+g4tLRWo/k1QJxilBbXtqo22L4e8AjOMN7
-						SvdjM8XejBUGw++3ZzPbg/v0meOi2EidA5m5mHbAvLV248hMsLUCJxA9qYJ5DebU
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.oldham.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.oldham.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 Oldham College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oldham College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oldham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stuart</GivenName>
-    <SurName>Catterall</SurName>
-    <EmailAddress>mailto:stuart.catterall@oldham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Robert</GivenName>
-    <SurName>Hough</SurName>
-    <EmailAddress>mailto:robert.hough@oldham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stuart</GivenName>
-    <SurName>Catterall</SurName>
-    <EmailAddress>mailto:stuart.catterall@oldham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Hough</SurName>
-    <EmailAddress>mailto:robert.hough@oldham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ovid.com-entity.xml b/swamid-interfederations-2.0/shibboleth.ovid.com-entity.xml
deleted file mode 100644
index 4835516e..00000000
--- a/swamid-interfederations-2.0/shibboleth.ovid.com-entity.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://shibboleth.ovid.com/entity">
-  <!--
-		This is a Shibboleth and OpenAthens SP for Ovid Technologies, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-03-22T17:06:00Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJAITuZd98PRlHMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3NoaWJib2xldGgub3ZpZC5jb20wHhcNMTUwMzE2MjAwNzE2WhcNMjUwMzEz
-						MjAwNzE2WjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm92aWQuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5CiQZ1pwB2nWCq9fRqpXFayxcS5T5f1+
-						XnBBl56me9lijCJLuWT3pLlsYBBLVsfmFDlfuXjwXWEvYh/ADN4JquePwp8RNI8z
-						2G96Ocoo+P0cqUcFT/4Cxl11aMDHPVzoTQaau9XfZTz2f6JmK7Cxmzjj9yoGUKVR
-						gxPA7Fi5ISrBK3l5Ohwl9k/mQrTAwUvJ8JVvt8CmH3ETGSD1kWazuCCxklJtFANo
-						A510/rEWCzVbA8OA13B9z93F80cb59t/6qPOokv+2TZ8ckXhoQgtOsGLrh3pstv2
-						CvTylRZ86fWDo8pYcfw6A14EP2X70W4C61PU3+H4wukx/fxADEOU1wIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNzaGliYm9sZXRoLm92aWQuY29tMB0GA1UdDgQWBBTHog2n
-						Tv+S33JoIXPyzm11YQ3ZRzANBgkqhkiG9w0BAQUFAAOCAQEAq0tBVaGdVCo4XIOm
-						DyZtsa8L9UsY4Yf4SU8ZI7I/mKitzXh9PCeWAziSaqbuE1x8t8pJP+mHtd2K8PTk
-						LnAtGWZUXA7bEiGy6a79tw3DS+VMvI6e+hKd7SVIq9ysWW98JSWXfnRb8TCBN68o
-						qgPbo/TAIFHojLP1E5ebI6+iPcRBl+qeGvJcA+3gyEvLhqVNbyUWXic3QQ3t6LTf
-						SX1MTs9PdwzbHbMNmqaELGBiC1J3cuJkax7P5mK/N6YzYeYkPQGsZmXSn53nEeWF
-						x417jKQy4/M0qnccp7uu2Yn8xvCH13BpqfvginDhdWTXHnZ03fFpXovteyHdPeWU
-						egg3ug==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-dev.ovid.com:8397/Shibboleth.sso/SAML/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-dev.ovid.com:8397/Shibboleth.sso/SAML/Artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-qa.ovid.com/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-qa.ovid.com/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-dev.ovid.com:8397/secure-ssl/oa/auth/rcv/shib/post" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-dev.ovid.com:8397/secure-ssl/oa/auth/rcv/shib/art" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-dev.ovid.com:8397/secure-ssl/oa/auth/rcv/saml2/post" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth-dev.ovid.com:8397/secure-ssl/oa/auth/rcv/saml2/art" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-qa.ovid.com/secure-ssl/oa/auth/rcv/saml2/post" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-qa.ovid.com/secure-ssl/oa/auth/rcv/saml2/art" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiboa-qa.ovid.com/secure-ssl/oa/auth/rcv/saml2/post" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shiboa-qa.ovid.com/secure-ssl/oa/auth/rcv/saml2/art" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openathens.ovid.com/secure-ssl/oa/auth/rcv/saml2/post" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openathens.ovid.com/secure-ssl/oa/auth/rcv/saml2/art" index="15"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ovid Technologies, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ovid</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ovid.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support Team</GivenName>
-    <EmailAddress>mailto:support@ovid.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Global Online Operations</GivenName>
-    <EmailAddress>mailto:GOOSandy@ovid.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ovid.com.xml b/swamid-interfederations-2.0/shibboleth.ovid.com.xml
deleted file mode 100644
index 3af836cb..00000000
--- a/swamid-interfederations-2.0/shibboleth.ovid.com.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ovid.com/entity">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.ovid.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.ovid.com,O=Ovid Technologies\, Inc.,L=Sandy,ST=Utah,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+zCCA+OgAwIBAgIQRcoWrU6+ffPVrfItakXStDANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTEwMzI4
-MDAwMDAwWhcNMTIwMzI3MjM1OTU5WjBsMQswCQYDVQQGEwJVUzENMAsGA1UECBME
-VXRhaDEOMAwGA1UEBxQFU2FuZHkxIDAeBgNVBAoUF092aWQgVGVjaG5vbG9naWVz
-LCBJbmMuMRwwGgYDVQQDFBNzaGliYm9sZXRoLm92aWQuY29tMIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQCw1X91LxDWuHGrQUsXVLEVPy1TWAeCq+o9O8b/B7Ak
-xlqPlSpbduanoo5quky+5PhVDcePXzbkzIX6gXV0yKQdkxOqoSTelXQr/kgacWVm
-TouCY1Gq/YyGk4PlMw9CKW4har9gcdN4hX20Ml0CNBqAbKD7laW9/KClj0Nf7rhK
-jwIDAQABo4IB0TCCAc0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwRQYDVR0fBD4w
-PDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMy1jcmwudmVyaXNpZ24uY29tL1NW
-UlNlY3VyZUczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYB
-BQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwHQYDVR0lBBYwFAYI
-KwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPY
-vnmlMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVy
-aXNpZ24uY29tMEAGCCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52
-ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFeoFww
-WjBYMFYWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweL
-IQUYMCYWJGh0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjANBgkq
-hkiG9w0BAQUFAAOCAQEAnH4QwA1KVFARs7qXwzBUgGs6nZSkuZ5BMmnrpIbjJah3
-U7cEsb30/nhDckRVdHOx/+FWuYs5l4gPZ5VGlNz25yv4Tsy5jxcNZGHHDzGZWAcc
-GQZ+CSGYb5Bi2UUI4pLAK0qo7cDc/WHyYG/hMEUiZs5VbeplJupEXvDnP0GoJRfl
-npDYxsgoGjX6vUYqJCoccRRVot0tJCAm2vLBYk5Vb15XPd8cotb7OceW/wznj79o
-7kQji0SE5U8eJTJvMLcuRqpC2yYLlrVyZHxk6v2xgFs5AsjXR/zBv8+hVukrhIb3
-MLXlHVJRLoeP410NcHfsm1LrhOHl/GJmuXWm+DUIBg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth-dev.ovid.com:8085/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-dev.ovid.com:8085/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-qa.ovid.com/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-qa.ovid.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ovid.com/Shibboleth.sso/SAML2/POST" index="7"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Ovid Technologies - A Wolters Kluwer Business</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Ovid</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ovid.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Mark</GivenName>
-    <SurName>Rodrigues</SurName>
-    <EmailAddress>mark.rodrigues@wolterskluwer.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Marquiss</SurName>
-    <EmailAddress>john.marquiss@wolterskluwer.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Global Online</GivenName>
-    <SurName>Operations</SurName>
-    <EmailAddress>goosandy@ovid.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.pace.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.pace.edu-idp-shibboleth.xml
deleted file mode 100644
index 86b66e80..00000000
--- a/swamid-interfederations-2.0/shibboleth.pace.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +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://shibboleth.pace.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">pace.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Pace University</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>
-MIIDODCCAiCgAwIBAgIVAIDwMFVZHLZMtA9SpNTVZQT/s2QcMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgucGFjZS5lZHUwHhcNMTIwOTIxMTkz
-NDU1WhcNMzIwOTIxMTkzNDU1WjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnBhY2Uu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyW3OgmQXsqS/wtC5
-sX/4lwNICfQGHUsk9m7t8VA9G5VmW81y3nZI0cwNeS2ZvVRfQsWo51/kopAS3MNy
-y6bv/mnQBquHr1cL/4SGGJePkL4GKW2KLL+KFR5Lf1QZ6It08/tWJBy95YBNOWpK
-+7sXi3v3hf+SF3D7JqRU8th6qwnYGxynnw2Kr0F7dR258l7sjpnu84ecEzresF+t
-uJzSgD1JhH8vFKUqyw4gBVvO700+Z63/9Q3JwtECxIuQ1/j6JlRe+3NwHOis2SkK
-lMzw2RezM8kq4QXETKOnxr0hCX6q3FU0cV571suawWYR2oOHzelNXheFebY026Wu
-DoQrZwIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLnBhY2UuZWR1hipo
-dHRwczovL3NoaWJib2xldGgucGFjZS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFF7JGYo/Hb6pmWSoH2ZX6tYVvfToMA0GCSqGSIb3DQEBBQUAA4IBAQAheM9m
-PNR+R4sJ6gMkS5dbFuGu3o/5eH0guemCOMT+25Di/HZP2+BOj55+0hgVMmN0sFm7
-jFVX/zd0LurqgCVNWu41XP/l3ybctM6bXg9XsZ/BWaXah/c4yglGzHEiulJcZyo2
-sk4EhmpFUZQXZGk3wU95X/xiX5Lgcuf9Id9gfjDG80nyd5X9PG/DOjWclGRP9KqN
-kM0iPsZNWC1xrNnNUUzrrsj2fXH3gvPuXFL1Qwrily6BtY3VekYsv4jqmM59kodg
-xe9+xuSYTj/nMFJWA8UN83T6id0A3tYIRr66BLWWQhfoNopfJPHmO7CaCJQz+16A
-908GmV+NLASTJTXX
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.pace.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.pace.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.pace.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.pace.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.pace.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pace.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAIDwMFVZHLZMtA9SpNTVZQT/s2QcMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgucGFjZS5lZHUwHhcNMTIwOTIxMTkz
-NDU1WhcNMzIwOTIxMTkzNDU1WjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnBhY2Uu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyW3OgmQXsqS/wtC5
-sX/4lwNICfQGHUsk9m7t8VA9G5VmW81y3nZI0cwNeS2ZvVRfQsWo51/kopAS3MNy
-y6bv/mnQBquHr1cL/4SGGJePkL4GKW2KLL+KFR5Lf1QZ6It08/tWJBy95YBNOWpK
-+7sXi3v3hf+SF3D7JqRU8th6qwnYGxynnw2Kr0F7dR258l7sjpnu84ecEzresF+t
-uJzSgD1JhH8vFKUqyw4gBVvO700+Z63/9Q3JwtECxIuQ1/j6JlRe+3NwHOis2SkK
-lMzw2RezM8kq4QXETKOnxr0hCX6q3FU0cV571suawWYR2oOHzelNXheFebY026Wu
-DoQrZwIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLnBhY2UuZWR1hipo
-dHRwczovL3NoaWJib2xldGgucGFjZS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFF7JGYo/Hb6pmWSoH2ZX6tYVvfToMA0GCSqGSIb3DQEBBQUAA4IBAQAheM9m
-PNR+R4sJ6gMkS5dbFuGu3o/5eH0guemCOMT+25Di/HZP2+BOj55+0hgVMmN0sFm7
-jFVX/zd0LurqgCVNWu41XP/l3ybctM6bXg9XsZ/BWaXah/c4yglGzHEiulJcZyo2
-sk4EhmpFUZQXZGk3wU95X/xiX5Lgcuf9Id9gfjDG80nyd5X9PG/DOjWclGRP9KqN
-kM0iPsZNWC1xrNnNUUzrrsj2fXH3gvPuXFL1Qwrily6BtY3VekYsv4jqmM59kodg
-xe9+xuSYTj/nMFJWA8UN83T6id0A3tYIRr66BLWWQhfoNopfJPHmO7CaCJQz+16A
-908GmV+NLASTJTXX
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.pace.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Pace University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Pace University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pace.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Lauren Valiente</md:GivenName>
-    <md:EmailAddress>lvaliente@pace.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Donna Scarano</md:GivenName>
-    <md:EmailAddress>dscarano@pace.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.plumpton.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.plumpton.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index a31f2535..00000000
--- a/swamid-interfederations-2.0/shibboleth.plumpton.ac.uk-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" entityID="https://shibboleth.plumpton.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Plumpton College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-15T13:18:29Z">
-      <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">plumpton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVAJgtMhzTWBfgn2Mz2ywEeOKpkBfcMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMMGXNoaWJib2xldGgucGx1bXB0b24uYWMudWswHhcNMTUw
-						NTE0MDgyNjU0WhcNMzUwNTE0MDgyNjU0WjAkMSIwIAYDVQQDDBlzaGliYm9sZXRo
-						LnBsdW1wdG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						mR5vQ9l9UXO+q029dr7chrDPHg7SeCo191STaB+nUBr3e6+bJyc2j2CH6dcbjvB1
-						62DtiyswciLcTe/yBMJPOcay4bUuLb3y/C8Gp20PXOyaV2Y6DaIfdMYDUdWbUQiO
-						+vFUOMH5rHlGh5Di/2sKlypLUgX0wer4sQ71xjTG9kPpzP9nHkAznWIoevb93il4
-						++pmY3DFDsoNo4YbO8//VK0YXgBcvoQumNvMp9WVnlkLtIqqtDEYKrNgNybDPmtr
-						pUhVOIKjiJGfEzP53xsGnmVlpPi+SPL7YLLzdexpkBx5MWHvctm6CiuV7OGpKXC6
-						PuJy3neGCGkc9pIBT9+AoQIDAQABo3kwdzAdBgNVHQ4EFgQU50Tr9x/EKj4E0udh
-						k1kzOHWYz90wVgYDVR0RBE8wTYIZc2hpYmJvbGV0aC5wbHVtcHRvbi5hYy51a4Yw
-						aHR0cHM6Ly9zaGliYm9sZXRoLnBsdW1wdG9uLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAyFtJrWrXKkOCbXLt0LDHe9GTgD8IoEQwKlqqX
-						gHfTjGf9pFVhESpe5cUwEw+7oH4S5ppJJ3riL60ne2TTxtEbcgFIb1FUbT2HlN8u
-						RRCpL+RttzkxMZzeF3aW/SMCyQbYGNUNNbhSgoZMW49Jbd9Cdy9sAfceaGhOSsaW
-						esuNMSX9FSuYApTZpeWaiotpimdGlRc7TLet48XBRTFbXjdYEjgABaAbcihGW8wp
-						BZmeXBv22v17AxYxHXh22k0X1za7CqNt3UVGhafqrPZeNCNMGcX+S8BSa5rAKsop
-						tWP38Ae6DWHxNP91fg5Ojh9o0ae5hYTYukEBySuMj2ZJ2HPx
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plumpton.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://shibboleth.plumpton.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.plumpton.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.plumpton.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">plumpton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVAJgtMhzTWBfgn2Mz2ywEeOKpkBfcMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMMGXNoaWJib2xldGgucGx1bXB0b24uYWMudWswHhcNMTUw
-						NTE0MDgyNjU0WhcNMzUwNTE0MDgyNjU0WjAkMSIwIAYDVQQDDBlzaGliYm9sZXRo
-						LnBsdW1wdG9uLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						mR5vQ9l9UXO+q029dr7chrDPHg7SeCo191STaB+nUBr3e6+bJyc2j2CH6dcbjvB1
-						62DtiyswciLcTe/yBMJPOcay4bUuLb3y/C8Gp20PXOyaV2Y6DaIfdMYDUdWbUQiO
-						+vFUOMH5rHlGh5Di/2sKlypLUgX0wer4sQ71xjTG9kPpzP9nHkAznWIoevb93il4
-						++pmY3DFDsoNo4YbO8//VK0YXgBcvoQumNvMp9WVnlkLtIqqtDEYKrNgNybDPmtr
-						pUhVOIKjiJGfEzP53xsGnmVlpPi+SPL7YLLzdexpkBx5MWHvctm6CiuV7OGpKXC6
-						PuJy3neGCGkc9pIBT9+AoQIDAQABo3kwdzAdBgNVHQ4EFgQU50Tr9x/EKj4E0udh
-						k1kzOHWYz90wVgYDVR0RBE8wTYIZc2hpYmJvbGV0aC5wbHVtcHRvbi5hYy51a4Yw
-						aHR0cHM6Ly9zaGliYm9sZXRoLnBsdW1wdG9uLmFjLnVrL2lkcC9zaGliYm9sZXRo
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAyFtJrWrXKkOCbXLt0LDHe9GTgD8IoEQwKlqqX
-						gHfTjGf9pFVhESpe5cUwEw+7oH4S5ppJJ3riL60ne2TTxtEbcgFIb1FUbT2HlN8u
-						RRCpL+RttzkxMZzeF3aW/SMCyQbYGNUNNbhSgoZMW49Jbd9Cdy9sAfceaGhOSsaW
-						esuNMSX9FSuYApTZpeWaiotpimdGlRc7TLet48XBRTFbXjdYEjgABaAbcihGW8wp
-						BZmeXBv22v17AxYxHXh22k0X1za7CqNt3UVGhafqrPZeNCNMGcX+S8BSa5rAKsop
-						tWP38Ae6DWHxNP91fg5Ojh9o0ae5hYTYukEBySuMj2ZJ2HPx
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.plumpton.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plumpton.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">Plumpton College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Plumpton College Shibboleth</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.plumpton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Plumpton College IT Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@plumpton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Howe</SurName>
-    <EmailAddress>mailto:sam.howe@plumpton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index a7575aba..00000000
--- a/swamid-interfederations-2.0/shibboleth.plymouth.ac.uk-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" entityID="https://shibboleth.plymouth.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Plymouth.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-21T13:42:16Z">
-      <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">plymouth.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVAKyHcygxYWHKhPBwJxtAsM65mkppMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgucGx5bW91dGguYWMudWswHhcNMTMx
-						MDAzMTQyOTA0WhcNMzMxMDAzMTQyOTA0WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-						LnBseW1vdXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						7/XpT5wwAH8Exy6GRuy5UQnZxgs/AuMqzHHOyTQY0h9zNIIDaOWMClV6uRFtAonE
-						Bw7hdGCh4Rp+0USw8BlOXE5MR+wCNPOhK4a/HnE2YNDG3BadDdaM5XEqaT+NGEXI
-						a9bT3j7Py3sm3p6+sMp6gPb36VkrZABZBkc1hORvvM6DkEtge3cihaSFd8o57UHQ
-						LuEda0EW2fq1obYWUFEHN6mW12D4HHl6S2NjIHbh/Ytnqui4qO+0G/FL79+N7S2O
-						/hrV1zpM4kUl0GlMEWHy8Hayjpx8mff6pdmXxyFDy5tCmdYyy8Jj5Cc3NwqUtZu/
-						E0klUwSGUatD15/FAnTzmwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-						LnBseW1vdXRoLmFjLnVrhjBodHRwczovL3NoaWJib2xldGgucGx5bW91dGguYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDlNnbrNQSY8ZiIbc+S8WrOlEJc2
-						MA0GCSqGSIb3DQEBBQUAA4IBAQB9av5yp4nund76PaSJ2vRDvTXPSc5ZndJ0nj1L
-						tcU5a2BVJFFrawhywnhdMMEA3fuQu5FRmleEJks2pS8Dx4Kbhk/6sEyiB1PzshYs
-						Jb6jGIV50inltedhNWRLxPZLxNb/vVZnObebZzVaRjVuWu0CImGGFHxj/T6VzXtb
-						FzqACoxbXFZHV4khqLuBuCunbKy4VovkiT9T/fK8dDDgohiAbDpmOL3I+wN95kA5
-						NbllXNhng/oE/3YWDzcLCj9tPB8xJaw2FdiH9vPmx06F2e3jxOBxOxCeOkx1N6hU
-						RC5QBAnV84/JkA5Y1mD35/HCdF0B0gA38D2X6sTkFISlTYCM
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plymouth.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://shibboleth.plymouth.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.plymouth.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.plymouth.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">plymouth.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIVAKyHcygxYWHKhPBwJxtAsM65mkppMA0GCSqGSIb3DQEB
-						BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgucGx5bW91dGguYWMudWswHhcNMTMx
-						MDAzMTQyOTA0WhcNMzMxMDAzMTQyOTA0WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-						LnBseW1vdXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						7/XpT5wwAH8Exy6GRuy5UQnZxgs/AuMqzHHOyTQY0h9zNIIDaOWMClV6uRFtAonE
-						Bw7hdGCh4Rp+0USw8BlOXE5MR+wCNPOhK4a/HnE2YNDG3BadDdaM5XEqaT+NGEXI
-						a9bT3j7Py3sm3p6+sMp6gPb36VkrZABZBkc1hORvvM6DkEtge3cihaSFd8o57UHQ
-						LuEda0EW2fq1obYWUFEHN6mW12D4HHl6S2NjIHbh/Ytnqui4qO+0G/FL79+N7S2O
-						/hrV1zpM4kUl0GlMEWHy8Hayjpx8mff6pdmXxyFDy5tCmdYyy8Jj5Cc3NwqUtZu/
-						E0klUwSGUatD15/FAnTzmwIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-						LnBseW1vdXRoLmFjLnVrhjBodHRwczovL3NoaWJib2xldGgucGx5bW91dGguYWMu
-						dWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDlNnbrNQSY8ZiIbc+S8WrOlEJc2
-						MA0GCSqGSIb3DQEBBQUAA4IBAQB9av5yp4nund76PaSJ2vRDvTXPSc5ZndJ0nj1L
-						tcU5a2BVJFFrawhywnhdMMEA3fuQu5FRmleEJks2pS8Dx4Kbhk/6sEyiB1PzshYs
-						Jb6jGIV50inltedhNWRLxPZLxNb/vVZnObebZzVaRjVuWu0CImGGFHxj/T6VzXtb
-						FzqACoxbXFZHV4khqLuBuCunbKy4VovkiT9T/fK8dDDgohiAbDpmOL3I+wN95kA5
-						NbllXNhng/oE/3YWDzcLCj9tPB8xJaw2FdiH9vPmx06F2e3jxOBxOxCeOkx1N6hU
-						RC5QBAnV84/JkA5Y1mD35/HCdF0B0gA38D2X6sTkFISlTYCM
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.plymouth.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.plymouth.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 Plymouth</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Plymouth University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.plymouth.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@plymouth.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olly</GivenName>
-    <SurName>Morgan</SurName>
-    <EmailAddress>mailto:olly.morgan@plymouth.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Horne</SurName>
-    <EmailAddress>mailto:john.horne@plymouth.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.rcn.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.rcn.org.uk-idp-shibboleth.xml
deleted file mode 100644
index b9f592f3..00000000
--- a/swamid-interfederations-2.0/shibboleth.rcn.org.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://shibboleth.rcn.org.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the Royal College of Nursing.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-24T08:40:57Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">rcn.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUXswXhO6uDK4MV7I9aly5vnD77ZcwDQYJKoZIhvcNAQEF
-						BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5yY24ub3JnLnVrMB4XDTEyMDgxNTE1
-						MTcwM1oXDTMyMDgxNTE1MTcwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5yY24u
-						b3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwdOecQlpkznI
-						hj5OKgl7HSg1bcTEbk4t2l4CZ/nrQYqTr/y3eGM66v4+V/jU65iw989xVal3o65N
-						baDB1+eIAEtDadhCxVZrdqRFLm8M5XgCfZ9FHZyPmth02mh6ODrqHGpuK6g7rfYw
-						RZ+1aU00kUoPTS3Ex95m9wufCai/IYpCLNF0uLqvgrPjHUdSkFBhJumUH8Km7HHo
-						iJRLc3lCIBfnEDLHLgESNQ/R7H7t3bg0ncar6EvNXEJzG+2lfQqVSZcQh+cgl4Z8
-						/O0w/C67yIop+NYlbP+H42NqHwWu5UNYvj1QFidh3UAD0kEGaCu6JLV8aBpKyoTR
-						hanCRBgPtwIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnJjbi5vcmcu
-						dWuGLGh0dHBzOi8vc2hpYmJvbGV0aC5yY24ub3JnLnVrL2lkcC9zaGliYm9sZXRo
-						MB0GA1UdDgQWBBQWbyOjE1aj+Hbxix3s/WCO8tOA9zANBgkqhkiG9w0BAQUFAAOC
-						AQEAm20IB4KT5TykwOLIRbEhNK9+ccd0EcRKkTc91w/J7JCU64n69AJZ/xeXCo5E
-						8YxmkJSO/SQSTzXrWFR+lGo0brO622Uc9YxUdbTIfiiq/bZIDqTiEiIkpfUoBTkB
-						l5LenKSFfnvnty697DGOKJ5ZCyvuEiitdYyIrXU09wrVw+03FnhMwkUKOaZ0WFxl
-						jbsZ5ut9IHExbGMJJDg+dMBS7B9dlekzYvzdcqJaF3YMUgF4mCuKvM52VxCaJeHg
-						ZKFO8alq69naYWxQ8zjYygPSpM3wZ+U+ympl8A/SWz2nAYYAMHeRiHy5+HxqtRoH
-						vGxcw0jItQ4SQ9/nHEbArNfwkQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.rcn.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.rcn.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://shibboleth.rcn.org.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.rcn.org.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.rcn.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.rcn.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">rcn.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUXswXhO6uDK4MV7I9aly5vnD77ZcwDQYJKoZIhvcNAQEF
-						BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5yY24ub3JnLnVrMB4XDTEyMDgxNTE1
-						MTcwM1oXDTMyMDgxNTE1MTcwM1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aC5yY24u
-						b3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwdOecQlpkznI
-						hj5OKgl7HSg1bcTEbk4t2l4CZ/nrQYqTr/y3eGM66v4+V/jU65iw989xVal3o65N
-						baDB1+eIAEtDadhCxVZrdqRFLm8M5XgCfZ9FHZyPmth02mh6ODrqHGpuK6g7rfYw
-						RZ+1aU00kUoPTS3Ex95m9wufCai/IYpCLNF0uLqvgrPjHUdSkFBhJumUH8Km7HHo
-						iJRLc3lCIBfnEDLHLgESNQ/R7H7t3bg0ncar6EvNXEJzG+2lfQqVSZcQh+cgl4Z8
-						/O0w/C67yIop+NYlbP+H42NqHwWu5UNYvj1QFidh3UAD0kEGaCu6JLV8aBpKyoTR
-						hanCRBgPtwIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoLnJjbi5vcmcu
-						dWuGLGh0dHBzOi8vc2hpYmJvbGV0aC5yY24ub3JnLnVrL2lkcC9zaGliYm9sZXRo
-						MB0GA1UdDgQWBBQWbyOjE1aj+Hbxix3s/WCO8tOA9zANBgkqhkiG9w0BAQUFAAOC
-						AQEAm20IB4KT5TykwOLIRbEhNK9+ccd0EcRKkTc91w/J7JCU64n69AJZ/xeXCo5E
-						8YxmkJSO/SQSTzXrWFR+lGo0brO622Uc9YxUdbTIfiiq/bZIDqTiEiIkpfUoBTkB
-						l5LenKSFfnvnty697DGOKJ5ZCyvuEiitdYyIrXU09wrVw+03FnhMwkUKOaZ0WFxl
-						jbsZ5ut9IHExbGMJJDg+dMBS7B9dlekzYvzdcqJaF3YMUgF4mCuKvM52VxCaJeHg
-						ZKFO8alq69naYWxQ8zjYygPSpM3wZ+U+ympl8A/SWz2nAYYAMHeRiHy5+HxqtRoH
-						vGxcw0jItQ4SQ9/nHEbArNfwkQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.rcn.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.rcn.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">Royal College of Nursing</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal College of Nursing</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rcn.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Jacklin</SurName>
-    <EmailAddress>mailto:ian.jacklin@rcn.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Forsyth</SurName>
-    <EmailAddress>mailto:service.desk@rcn.org.uk</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 ae4c9509..00000000
--- a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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://shibboleth.reitoria.unesp.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQx
-MjAxMjAzOTQ3WhcNMTkxMTMwMjAzOTQ3WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2
-bIvFwo6pJnzMsR0+Pl3pZbuxGur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYU
-uPMnu8Kwn/DtUeNGvSLgQ+k3Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8de
-HpH7fsL/m9ONsUNtoVrmabHAAR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwp
-VpDg+yyCdoBfu/AANYqu2a6gahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjn
-E9/Wam33SID6yKXYA5EIoS9HkgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAKrx3a2Gx+/r3DpVp56AsqZx8lm92UVSSWBe2Hxfa
-jCEz9C1zxRQK2y1W9QC9t1XrCBG+6H18pqikLUWKGe+lHminNX2zZp6JNtMl4k6m
-WZTifmyvycjY/ZfeVcREIlonkRB2XAAnSdC3ZGCv/qarQEpn3tvsc9FthlDcpv/q
-bjo2re/YAP8PVnYBlLiTBGioRSaNN83HLM81sgrJnNM3rohFrgD1DWGzyj/M7u1Y
-/oUNFeEG1kFkbG2kXLPg+ylOKuUKOaa56gsXv8KFbcMQdIFkQ6od/YWPh2M+V8a7
-KFxMONImVUlFWJZRk3i46kBydqoZoCzP7nOBK6XCQ2WSPg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://shibboleth.reitoria.unesp.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.reitoria.unesp.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.reitoria.unesp.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.reitoria.unesp.br/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">unesp.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIICjjCCAXYCAQAwDQYJKoZIhvcNAQEFBQAwDTELMAkGA1UEBhMCQlIwHhcNMTQx
-MjAxMjAzOTQ3WhcNMTkxMTMwMjAzOTQ3WjANMQswCQYDVQQGEwJCUjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ+enDXKwvFOCJ3Ybg6BK+bGi1qY9P2
-bIvFwo6pJnzMsR0+Pl3pZbuxGur2ri3HajOlwc5QnxfSq9fSY8PLiBPo/eA/oeYU
-uPMnu8Kwn/DtUeNGvSLgQ+k3Z4X5Qx12yOTwDZGnHHiaPCctEezundMVLQZmh8de
-HpH7fsL/m9ONsUNtoVrmabHAAR6WbqkKgX2lfP7Lkcu0zO2+mdNDn/S1oELavFwp
-VpDg+yyCdoBfu/AANYqu2a6gahRcABWog2Ut6smft/UYtODRb8tLEfduguEevnjn
-E9/Wam33SID6yKXYA5EIoS9HkgxftMVSMNKaqO/zMMPELRNxX0AMc3sCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAKrx3a2Gx+/r3DpVp56AsqZx8lm92UVSSWBe2Hxfa
-jCEz9C1zxRQK2y1W9QC9t1XrCBG+6H18pqikLUWKGe+lHminNX2zZp6JNtMl4k6m
-WZTifmyvycjY/ZfeVcREIlonkRB2XAAnSdC3ZGCv/qarQEpn3tvsc9FthlDcpv/q
-bjo2re/YAP8PVnYBlLiTBGioRSaNN83HLM81sgrJnNM3rohFrgD1DWGzyj/M7u1Y
-/oUNFeEG1kFkbG2kXLPg+ylOKuUKOaa56gsXv8KFbcMQdIFkQ6od/YWPh2M+V8a7
-KFxMONImVUlFWJZRk3i46kBydqoZoCzP7nOBK6XCQ2WSPg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.reitoria.unesp.br:8443/idp/profile/SAML1/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">UNESP - Univ Estadual Paulista</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNESP - Univ Estadual Paulista</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNESP - Univ Estadual Paulista</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNESP - Univ Estadual Paulista</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unesp.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unesp.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Carlos Coletti</md:SurName>
-    <md:EmailAddress>grc@unesp.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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.riversidecollege.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.riversidecollege.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index d2c76c5f..00000000
--- a/swamid-interfederations-2.0/shibboleth.riversidecollege.ac.uk-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" entityID="https://shibboleth.riversidecollege.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Riverside College Halton.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-22T11:36:12Z">
-      <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">riversidecollege.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Riverside College Cheshire</mdui:DisplayName>
-        <mdui:Logo height="100" width="392">https://shibboleth.riversidecollege.ac.uk/emailbanner.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDcjCCAlqgAwIBAgIVAOacRZG9aw8yzfhRZ2EE+v/4e/VVMA0GCSqGSIb3DQEB
-						BQUAMCwxKjAoBgNVBAMMIXNoaWJib2xldGgucml2ZXJzaWRlY29sbGVnZS5hYy51
-						azAeFw0xNTA0MTYxMDAwMDJaFw0zNTA0MTYxMDAwMDJaMCwxKjAoBgNVBAMMIXNo
-						aWJib2xldGgucml2ZXJzaWRlY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAM73AzWyk0xUPIN0Pb1SSyqp5S4ZM3EbPHeOd8hmNZFt
-						vcWwPYtcE8pMtcsnk9Ol3YwqpGdQUhsxmbQ9/pVzfTQIGys3aLPCqCpBXCP6AyDw
-						AtFkzNo6KLkztWyiGkMh38BRAgW/8XPwTnzI7fJTxzoMUJKaXEzlcic6PnOsmy/U
-						1PbfgoVjIg6nSYw69n/+ubtLZ3bwvzjLbuip0OaUXr26PYCwo3y2OFhdYU/hK5v8
-						+ArPwMJoaeJ4B7z+S9CPcqMHGkiWZeCUffquwS2kBE4kG7VWiMBf38WefhusMD1B
-						zYkNxSfNr1RQ88m2b/FBsM6rr467UdPhBzbgHdIoLXECAwEAAaOBijCBhzAdBgNV
-						HQ4EFgQUtWV9slXU6ATVtoszweNCn4Q9Q54wZgYDVR0RBF8wXYIhc2hpYmJvbGV0
-						aC5yaXZlcnNpZGVjb2xsZWdlLmFjLnVrhjhodHRwczovL3NoaWJib2xldGgucml2
-						ZXJzaWRlY29sbGVnZS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUF
-						AAOCAQEAFTriszqR/vRtNm+QUpsMx4/0HgTYnE0a2KfYFDQCevsL51bw8e56mm8c
-						yL4Xt152H6BMroTModnG3S2Cf3DhvP+BviDDNx51kobyHeN8aImRl+XhCVqoR84H
-						nNEvRYSB61ttd28fFMrQKffhwx47Xt4BdccomjIsGXyD+dmemZ4ysop1T1vXQbyH
-						eZ183p2WZiProZRuQ9UbQrOfPmwtGnMjmgd+ewkFT4LNGga150ROA7HEdcjkZ5R4
-						bYt83NovYbGf35MeoODWhvVDeXHBzMXvta8bkJFFmdFD4skSDBROiK5mXnIZGkWC
-						0Icw2lNC4PD5sF3IRKHqG3frOfQxzw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.riversidecollege.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://shibboleth.riversidecollege.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.riversidecollege.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.riversidecollege.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">riversidecollege.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDcjCCAlqgAwIBAgIVAOacRZG9aw8yzfhRZ2EE+v/4e/VVMA0GCSqGSIb3DQEB
-						BQUAMCwxKjAoBgNVBAMMIXNoaWJib2xldGgucml2ZXJzaWRlY29sbGVnZS5hYy51
-						azAeFw0xNTA0MTYxMDAwMDJaFw0zNTA0MTYxMDAwMDJaMCwxKjAoBgNVBAMMIXNo
-						aWJib2xldGgucml2ZXJzaWRlY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAM73AzWyk0xUPIN0Pb1SSyqp5S4ZM3EbPHeOd8hmNZFt
-						vcWwPYtcE8pMtcsnk9Ol3YwqpGdQUhsxmbQ9/pVzfTQIGys3aLPCqCpBXCP6AyDw
-						AtFkzNo6KLkztWyiGkMh38BRAgW/8XPwTnzI7fJTxzoMUJKaXEzlcic6PnOsmy/U
-						1PbfgoVjIg6nSYw69n/+ubtLZ3bwvzjLbuip0OaUXr26PYCwo3y2OFhdYU/hK5v8
-						+ArPwMJoaeJ4B7z+S9CPcqMHGkiWZeCUffquwS2kBE4kG7VWiMBf38WefhusMD1B
-						zYkNxSfNr1RQ88m2b/FBsM6rr467UdPhBzbgHdIoLXECAwEAAaOBijCBhzAdBgNV
-						HQ4EFgQUtWV9slXU6ATVtoszweNCn4Q9Q54wZgYDVR0RBF8wXYIhc2hpYmJvbGV0
-						aC5yaXZlcnNpZGVjb2xsZWdlLmFjLnVrhjhodHRwczovL3NoaWJib2xldGgucml2
-						ZXJzaWRlY29sbGVnZS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUF
-						AAOCAQEAFTriszqR/vRtNm+QUpsMx4/0HgTYnE0a2KfYFDQCevsL51bw8e56mm8c
-						yL4Xt152H6BMroTModnG3S2Cf3DhvP+BviDDNx51kobyHeN8aImRl+XhCVqoR84H
-						nNEvRYSB61ttd28fFMrQKffhwx47Xt4BdccomjIsGXyD+dmemZ4ysop1T1vXQbyH
-						eZ183p2WZiProZRuQ9UbQrOfPmwtGnMjmgd+ewkFT4LNGga150ROA7HEdcjkZ5R4
-						bYt83NovYbGf35MeoODWhvVDeXHBzMXvta8bkJFFmdFD4skSDBROiK5mXnIZGkWC
-						0Icw2lNC4PD5sF3IRKHqG3frOfQxzw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.riversidecollege.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.riversidecollege.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">Riverside College Halton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Riverside College Cheshire</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.riversidecollege.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matthew</GivenName>
-    <SurName>Brown</SurName>
-    <EmailAddress>mailto:matthew.brown@riversidecollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Brown</SurName>
-    <EmailAddress>mailto:matthew.brown@riversidecollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.runshaw.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.runshaw.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 7db3cfa1..00000000
--- a/swamid-interfederations-2.0/shibboleth.runshaw.ac.uk-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://shibboleth.runshaw.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Runshaw College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-20T09:52: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">runshaw.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIVANxclogryqwYGu19nKOzmdP84Ca0MA0GCSqGSIb3DQEB
-						BQUAMCMxITAfBgNVBAMMGHNoaWJib2xldGgucnVuc2hhdy5hYy51azAeFw0xNTA0
-						MjMxMDIyNThaFw0zNTA0MjMxMDIyNThaMCMxITAfBgNVBAMMGHNoaWJib2xldGgu
-						cnVuc2hhdy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANiX
-						7IYiXMY1SGFgrR8PBQA65R9qoS4XP8oyMOwSmXw66DxyzUa4zjjJY8iRSpXt6xYr
-						0DpTBOGt/hbUeBXZz+MFL+QBlS9MmGMY8zKIXujaXWRhT208hxY8ROkhTGU9PGAA
-						uE0qnylaLrqORKBmEQrFRUTMD9Rf3su7KN484Vr8IyW+W2GRVtvxkn6xrQCpRPb9
-						V6GqlXVp9+NofrEUvl2mCAAXiGAKvIFBx/dHJdZg//zecRwMFIWmfKB+AfMiHr/d
-						KotVIHtjV1Ln89qq7LD2GXNLczEg9c4PRhPo3/YiEBRLvUjuT6lDC0OwaiDwuLBa
-						dtnQRrXdtI0kO94L8ucCAwEAAaN3MHUwHQYDVR0OBBYEFGXp66qZBQ87PR0+8dN5
-						zINuFt7FMFQGA1UdEQRNMEuCGHNoaWJib2xldGgucnVuc2hhdy5hYy51a4YvaHR0
-						cHM6Ly9zaGliYm9sZXRoLnJ1bnNoYXcuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJ
-						KoZIhvcNAQEFBQADggEBANST0/5PspBh/cEXFzxvm5byFdLgAuIUG+vyLSw8yGur
-						y5yAXJLQO6a6O3rQu36DYgbY1FTA3xPDByeYL+2tYCtrK7202KtMZ11boGQVwpWN
-						tF6ddSgtBYkGFgaxKShsKKBowuf7eC7D5K8GO1ugJYK766MbYEzQtf467kvxKWeX
-						oXVx3Dt4T1rP+IYkKO2Fggyb6uKKZwhi2PrrPs2Kp4yvJ3JY9LPb+1Tf5LKbRS2b
-						0sSweNlLsJ2jVGZ0v/LK1nTjT8d34alzVwYHrX7A9d1PhudmBIG9lzRIJxxHznSp
-						kpaorlZ3en0Z1zG6x6U452/g5wbB9vkinE+NNpc6XBI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.runshaw.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://shibboleth.runshaw.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.runshaw.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.runshaw.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">runshaw.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIVANxclogryqwYGu19nKOzmdP84Ca0MA0GCSqGSIb3DQEB
-						BQUAMCMxITAfBgNVBAMMGHNoaWJib2xldGgucnVuc2hhdy5hYy51azAeFw0xNTA0
-						MjMxMDIyNThaFw0zNTA0MjMxMDIyNThaMCMxITAfBgNVBAMMGHNoaWJib2xldGgu
-						cnVuc2hhdy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANiX
-						7IYiXMY1SGFgrR8PBQA65R9qoS4XP8oyMOwSmXw66DxyzUa4zjjJY8iRSpXt6xYr
-						0DpTBOGt/hbUeBXZz+MFL+QBlS9MmGMY8zKIXujaXWRhT208hxY8ROkhTGU9PGAA
-						uE0qnylaLrqORKBmEQrFRUTMD9Rf3su7KN484Vr8IyW+W2GRVtvxkn6xrQCpRPb9
-						V6GqlXVp9+NofrEUvl2mCAAXiGAKvIFBx/dHJdZg//zecRwMFIWmfKB+AfMiHr/d
-						KotVIHtjV1Ln89qq7LD2GXNLczEg9c4PRhPo3/YiEBRLvUjuT6lDC0OwaiDwuLBa
-						dtnQRrXdtI0kO94L8ucCAwEAAaN3MHUwHQYDVR0OBBYEFGXp66qZBQ87PR0+8dN5
-						zINuFt7FMFQGA1UdEQRNMEuCGHNoaWJib2xldGgucnVuc2hhdy5hYy51a4YvaHR0
-						cHM6Ly9zaGliYm9sZXRoLnJ1bnNoYXcuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJ
-						KoZIhvcNAQEFBQADggEBANST0/5PspBh/cEXFzxvm5byFdLgAuIUG+vyLSw8yGur
-						y5yAXJLQO6a6O3rQu36DYgbY1FTA3xPDByeYL+2tYCtrK7202KtMZ11boGQVwpWN
-						tF6ddSgtBYkGFgaxKShsKKBowuf7eC7D5K8GO1ugJYK766MbYEzQtf467kvxKWeX
-						oXVx3Dt4T1rP+IYkKO2Fggyb6uKKZwhi2PrrPs2Kp4yvJ3JY9LPb+1Tf5LKbRS2b
-						0sSweNlLsJ2jVGZ0v/LK1nTjT8d34alzVwYHrX7A9d1PhudmBIG9lzRIJxxHznSp
-						kpaorlZ3en0Z1zG6x6U452/g5wbB9vkinE+NNpc6XBI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.runshaw.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.runshaw.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">Runshaw College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Runshaw College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.runshaw.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Runshaw College Servicedesk</GivenName>
-    <EmailAddress>mailto:servicedesk@runshaw.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Runshaw College Servicedesk</GivenName>
-    <EmailAddress>mailto:servicedesk@runshaw.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.salisbury.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.salisbury.edu-idp-shibboleth.xml
deleted file mode 100644
index ecdca28e..00000000
--- a/swamid-interfederations-2.0/shibboleth.salisbury.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,72 +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://shibboleth.salisbury.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">salisbury.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Salisbury University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Salisbury University Shibboleth Identity Provider allows SU faculty, staff and students to access external service providers using their SU NetID.</mdui:Description>
-        <mdui:Logo height="72" width="228" xml:lang="en">https://shibboleth.salisbury.edu/idp/images/sulogobig.gif</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>
-MIIDSzCCAjOgAwIBAgIUY64S0cXi06fxxH8FDOgtO3uuMFAwDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC5zYWxpc2J1cnkuZWR1MB4XDTEzMDYy
-ODEzMDA1M1oXDTMzMDYyODEzMDA1M1owIzEhMB8GA1UEAxMYc2hpYmJvbGV0aC5z
-YWxpc2J1cnkuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlmxb
-XdTKUdXuAsbatHPWmcfBSYCwVKM3vQnNw0q7sKMD1G3dM0QOrdcplsKVXMjRz/Cv
-+UWIx/XLpBszh++1NRBts2vxgsFSazW1+KrMq1+phHIBaYIffBhlaXSmzPOthMQC
-96ZZvYrqEtSlN5FBx4RHokrmDRw+fAeOHIpIMhcHRscWp85UjK9pR/h/g4GRgRxn
-lH/OXjmiBVB2xA0UBl+7wM1XVyv61URCrZSduNtR8o7iBVFDaRCmE8PWasjaSVJg
-ZCgSVY3qxVUZYlGhXCyjXXIRorHa03CZ2buJ3FyZNE9KHoriXOhvm9Dd9ZYBPhpk
-JZhxlLKPs8pKSjsNMwIDAQABo3cwdTBUBgNVHREETTBLghhzaGliYm9sZXRoLnNh
-bGlzYnVyeS5lZHWGL2h0dHBzOi8vc2hpYmJvbGV0aC5zYWxpc2J1cnkuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRuLalbqNtdk/j4ITBwvtjm1GP80zANBgkq
-hkiG9w0BAQUFAAOCAQEAT3R829x+66m4UmzDZtj2QY/IwXuOWjpwZsBptf38DdTJ
-2DtTDlqyzQt69Y+bWqCRICkl9GgCwN8+FqFAkGtQ/W3PdDg/O3t22XGPf8TLByrd
-O1p9AZ9XPegE0xFAxu+/sQx58KIX/6R6bL7XcH436M9w0ktyaQVHXbvLWH+7jFc2
-bCpHxVJ1k3zEgA3KI1K7Dp6n8pAVA35ZVP0EO1i7Wjae+pThMCzm8XVQ/9q8AuKy
-gYLlfmoR7oW8554uAku/74AnF7W89rMyaWcsv3mjTpLvYTNaD6BIRmG8ykuCRPq3
-kqmLDZGykto7PgAKNYbdUf1tzfrYMVhNBrGkMBv1QA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.salisbury.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.salisbury.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.salisbury.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.salisbury.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Salisbury University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Salisbury University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.salisbury.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth Support</md:GivenName>
-    <md:EmailAddress>shibsupport@salisbury.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Shibboleth Support</md:GivenName>
-    <md:EmailAddress>shibsupport@salisbury.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Shibboleth Support</md:GivenName>
-    <md:EmailAddress>shibsupport@salisbury.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 64740030..00000000
--- a/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-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://shibboleth.sciencespo-grenoble.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Sciences Po Grenoble</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABm0lEQVQ4y6WSr28UURRGz32vM7vbyU73pUMIP0JqMSiCw+BQOBCEhD+ABIciqUGgseBqCAqBoBoECo8gKYImDWlnp7s7s8zOexfRATbZbSnw2fty7ndPnjjnlP+IOWnogVwD4V8AHoiBl4NzTOA4iB4LONTAZj/jameV2/EqhS6/dClgBmyYFW72+tSqiPzlCePgeZqe4UG+SxE8M9XTA6Yo16IufWN5Ox3xuakpVYmXt1h0UIXA4zTj2WgfxDIKnrEG7GkaTFBuxD3WjGW7LkGEABQasMifAXUIPEoztsZDkKORAj2EwKIHnQfkqtzqJFy0ES+qgkGrvtbAlahDOSeyad8PNcw5UM/D/jpvqhGItIWFT03N/cSxbix58OTB48SwmTheuwtGnHOaq3K3m/Bk7SzXv+0wVCVqKw418D67xHkbsesbUmPY8w2vyoLnZeFbgOdDtsEXP+POwVec+e3cA4eq3OsmCLBdV+z5BsTgRPyKBy7bmI91xbvv5S95P2OBgQhb0wkAqcj8AhXnnB5tCYDgTvq3i2l+ABwLse0z7diPAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjM1KzAyOjAwCI/qcgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTozNSswMjowMHnSUs4AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.sciencespo-grenoble.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Sciences Po Grenoble</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>
-					      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>
-    </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-POST" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.sciencespo-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Sciences Po Grenoble</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sciences Po Grenoble</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sciencespo-grenoble.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Damien Limoges</md:SurName>
-    <md:EmailAddress>damien.limoges@sciencespo-grenoble.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Frank Boussagol</md:SurName>
-    <md:EmailAddress>frank.boussagol@sciencespo-grenoble.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.selby.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.selby.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 66d635c2..00000000
--- a/swamid-interfederations-2.0/shibboleth.selby.ac.uk-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" entityID="https://shibboleth.selby.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Selby College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-18T11:19: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">selby.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFKzCCBBOgAwIBAgIJAIGAdYhCdXOTMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECBMPTm9ydGggWW9ya3NoaXJlMQ4wDAYDVQQHEwVTZWxi
-						eTEWMBQGA1UEChMNU2VsYnkgQ29sbGVnZTEZMBcGA1UECxMQTmV0d29yayBTZXJ2
-						aWNlczEfMB0GA1UEAxMWc2hpYmJvbGV0aC5zZWxieS5hYy51azEjMCEGCSqGSIb3
-						DQEJARYUcGlsbGluZ21Ac2VsYnkuYWMudWswHhcNMTMxMDI5MDkzNjA4WhcNMjMx
-						MDI3MDkzNjA4WjCBsDELMAkGA1UEBhMCR0IxGDAWBgNVBAgTD05vcnRoIFlvcmtz
-						aGlyZTEOMAwGA1UEBxMFU2VsYnkxFjAUBgNVBAoTDVNlbGJ5IENvbGxlZ2UxGTAX
-						BgNVBAsTEE5ldHdvcmsgU2VydmljZXMxHzAdBgNVBAMTFnNoaWJib2xldGguc2Vs
-						YnkuYWMudWsxIzAhBgkqhkiG9w0BCQEWFHBpbGxpbmdtQHNlbGJ5LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0WCeQdUOOwr1zgrswrslHE0L
-						UIN97PbpESv/ash874+27SUiJ4xff+OCrmTD/bleiWTwe2gS629blM8ehj7WMI4i
-						Qvor3Kx13jDsb7rp2TF/G3rFhCwvl6PyDJGUzdKWxKMxyaNRaAI6KmKwFNeUGnTO
-						l9f4tXZvuZlvGOmERxmArpIq4R7sMU+ORooIQxDtGriEd/OD9ILPBv7sI0ahY03h
-						uLcUpk/INWDdwxS1gxAB7tkpbg7P5ZCczYPEHY0LLSh4G3sQ7dGJULKzj4CwWODS
-						No+XLXpRBg86gE8ijvyMm9znVjoh2jH2izn5pvc61GALEKbDeJnM9dtqG0wrVQID
-						AQABo4IBRDCCAUAwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
-						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFBe4qAGMntqL06Msf5ZbMHGk
-						Ppp9MIHlBgNVHSMEgd0wgdqAFBe4qAGMntqL06Msf5ZbMHGkPpp9oYG2pIGzMIGw
-						MQswCQYDVQQGEwJHQjEYMBYGA1UECBMPTm9ydGggWW9ya3NoaXJlMQ4wDAYDVQQH
-						EwVTZWxieTEWMBQGA1UEChMNU2VsYnkgQ29sbGVnZTEZMBcGA1UECxMQTmV0d29y
-						ayBTZXJ2aWNlczEfMB0GA1UEAxMWc2hpYmJvbGV0aC5zZWxieS5hYy51azEjMCEG
-						CSqGSIb3DQEJARYUcGlsbGluZ21Ac2VsYnkuYWMudWuCCQCBgHWIQnVzkzANBgkq
-						hkiG9w0BAQUFAAOCAQEAdFdP+fjhBkK5qfIPqErHOJRlOUq3NNgpbrzpq7P6aGY+
-						bCH1vZCV593B3x1avTMWjP/6GEjXxPQOrhC93u3DQsAH+sbpGHIhSnir7egKa0GO
-						tCIRBjIuEVrwoLkNudGD+ZXG6rSQBe/8rvKa1PovjeGSWvtMiLdNyI2LqW9gzQog
-						YJQRakt5pqHYL0KK+TdZceNVnRyiTTJfl6GZw24ij7zIbTdOTv/vDfNLqHdebkIo
-						SgGHbK7rJ0ywnr5qIwrjpfXkyNDUobGdGcrccynBSJoUNwR9dNLFZ8funAukMR4W
-						6sm3KNXOyBTi8GzW+r6Ray34zb5DUo1CSfO5fCWRsA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.selby.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.selby.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://shibboleth.selby.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.selby.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.selby.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.selby.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">selby.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFKzCCBBOgAwIBAgIJAIGAdYhCdXOTMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECBMPTm9ydGggWW9ya3NoaXJlMQ4wDAYDVQQHEwVTZWxi
-						eTEWMBQGA1UEChMNU2VsYnkgQ29sbGVnZTEZMBcGA1UECxMQTmV0d29yayBTZXJ2
-						aWNlczEfMB0GA1UEAxMWc2hpYmJvbGV0aC5zZWxieS5hYy51azEjMCEGCSqGSIb3
-						DQEJARYUcGlsbGluZ21Ac2VsYnkuYWMudWswHhcNMTMxMDI5MDkzNjA4WhcNMjMx
-						MDI3MDkzNjA4WjCBsDELMAkGA1UEBhMCR0IxGDAWBgNVBAgTD05vcnRoIFlvcmtz
-						aGlyZTEOMAwGA1UEBxMFU2VsYnkxFjAUBgNVBAoTDVNlbGJ5IENvbGxlZ2UxGTAX
-						BgNVBAsTEE5ldHdvcmsgU2VydmljZXMxHzAdBgNVBAMTFnNoaWJib2xldGguc2Vs
-						YnkuYWMudWsxIzAhBgkqhkiG9w0BCQEWFHBpbGxpbmdtQHNlbGJ5LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0WCeQdUOOwr1zgrswrslHE0L
-						UIN97PbpESv/ash874+27SUiJ4xff+OCrmTD/bleiWTwe2gS629blM8ehj7WMI4i
-						Qvor3Kx13jDsb7rp2TF/G3rFhCwvl6PyDJGUzdKWxKMxyaNRaAI6KmKwFNeUGnTO
-						l9f4tXZvuZlvGOmERxmArpIq4R7sMU+ORooIQxDtGriEd/OD9ILPBv7sI0ahY03h
-						uLcUpk/INWDdwxS1gxAB7tkpbg7P5ZCczYPEHY0LLSh4G3sQ7dGJULKzj4CwWODS
-						No+XLXpRBg86gE8ijvyMm9znVjoh2jH2izn5pvc61GALEKbDeJnM9dtqG0wrVQID
-						AQABo4IBRDCCAUAwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
-						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFBe4qAGMntqL06Msf5ZbMHGk
-						Ppp9MIHlBgNVHSMEgd0wgdqAFBe4qAGMntqL06Msf5ZbMHGkPpp9oYG2pIGzMIGw
-						MQswCQYDVQQGEwJHQjEYMBYGA1UECBMPTm9ydGggWW9ya3NoaXJlMQ4wDAYDVQQH
-						EwVTZWxieTEWMBQGA1UEChMNU2VsYnkgQ29sbGVnZTEZMBcGA1UECxMQTmV0d29y
-						ayBTZXJ2aWNlczEfMB0GA1UEAxMWc2hpYmJvbGV0aC5zZWxieS5hYy51azEjMCEG
-						CSqGSIb3DQEJARYUcGlsbGluZ21Ac2VsYnkuYWMudWuCCQCBgHWIQnVzkzANBgkq
-						hkiG9w0BAQUFAAOCAQEAdFdP+fjhBkK5qfIPqErHOJRlOUq3NNgpbrzpq7P6aGY+
-						bCH1vZCV593B3x1avTMWjP/6GEjXxPQOrhC93u3DQsAH+sbpGHIhSnir7egKa0GO
-						tCIRBjIuEVrwoLkNudGD+ZXG6rSQBe/8rvKa1PovjeGSWvtMiLdNyI2LqW9gzQog
-						YJQRakt5pqHYL0KK+TdZceNVnRyiTTJfl6GZw24ij7zIbTdOTv/vDfNLqHdebkIo
-						SgGHbK7rJ0ywnr5qIwrjpfXkyNDUobGdGcrccynBSJoUNwR9dNLFZ8funAukMR4W
-						6sm3KNXOyBTi8GzW+r6Ray34zb5DUo1CSfO5fCWRsA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.selby.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.selby.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">Selby College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Selby College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.selby.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Pilling</SurName>
-    <EmailAddress>mailto:pillingm@selby.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Pilling</SurName>
-    <EmailAddress>mailto:pillingm@selby.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.serc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.serc.ac.uk-shibboleth.xml
deleted file mode 100644
index fa96f9f4..00000000
--- a/swamid-interfederations-2.0/shibboleth.serc.ac.uk-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://shibboleth.serc.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for South Eastern Regional College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-18T10:34: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">serc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdjCCAl4CCQCag8g+o0iWVDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJH
-						QjEUMBIGA1UECBMLQ291bnR5IERvd24xDzANBgNVBAcTBkJhbmdvcjEnMCUGA1UE
-						ChMeU291dGggRWFzdGVybiBSZWdpb25hbCBDb2xsZWdlMR4wHAYDVQQDExVzaGli
-						Ym9sZXRoLnNlcmMuYWMudWswHhcNMTQwMjI4MDkyNzQ3WhcNMzQwMjIzMDkyNzQ3
-						WjB9MQswCQYDVQQGEwJHQjEUMBIGA1UECBMLQ291bnR5IERvd24xDzANBgNVBAcT
-						BkJhbmdvcjEnMCUGA1UEChMeU291dGggRWFzdGVybiBSZWdpb25hbCBDb2xsZWdl
-						MR4wHAYDVQQDExVzaGliYm9sZXRoLnNlcmMuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDENh+SLa6LWOKed5gS07GYyu6+XW7RVMQ+hutgiqxO
-						rOnTzAmZTxJTIvwmaRsk37+z3n/rsU5YDosjMTlO0Wl1C7xruvOAHd2K44HHrb16
-						X+A4pK7znx9FMt8n0i/stUVQMhh8ir/sZlOjQz0uat4y3HtioZybengGjkNL7iM9
-						tG31fIwpOYBlfNVknslvVUFYLsnVOnlEcZ0O+5WlYnHa8Qd6Ay4XiA2VdkICAIdN
-						10jIMe0hV/2hBnIIxSdGwRghNhcTMmN/80xV59XX6QkXtpZy/Gd9L5BQfabfQyFm
-						tRF+hcMgW7tqqpp+KFnXjG/WMzuOhBJjSqfZGZcjQUThAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBACrmmmqUQY1zCfiSNfeTPob6wNDyJh1XglgeR5hUuQRuHrNCT2D5
-						tDERide7jZM0FYzXFuovuoMtHr7uHyK3qOEqYzWlS6Z9hwMqYZm5jXZ4zSfExu9p
-						EyeDHLmQt0/PZPb25hQrWUHCvnqbu3d5ScAVVh9gJ4CpFmaustbEXckAdabDm5bR
-						K69fc1XerX5HiEz1kSI0AGecOS4aHq5B1LgKWodL9JIvJi3de1GNSxG7OCOPINA7
-						Q6PnTqInoOWw8Nbb9h640tVD/hxkUJcvfM+2bwOi5JSB4oRWCTgNeKxuf3K9YGYG
-						/d3Km0PXmZriNGP8T6lbBW5Hx3qcVGcfoL8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.serc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.serc.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://shibboleth.serc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.serc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.serc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.serc.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">serc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdjCCAl4CCQCag8g+o0iWVDANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJH
-						QjEUMBIGA1UECBMLQ291bnR5IERvd24xDzANBgNVBAcTBkJhbmdvcjEnMCUGA1UE
-						ChMeU291dGggRWFzdGVybiBSZWdpb25hbCBDb2xsZWdlMR4wHAYDVQQDExVzaGli
-						Ym9sZXRoLnNlcmMuYWMudWswHhcNMTQwMjI4MDkyNzQ3WhcNMzQwMjIzMDkyNzQ3
-						WjB9MQswCQYDVQQGEwJHQjEUMBIGA1UECBMLQ291bnR5IERvd24xDzANBgNVBAcT
-						BkJhbmdvcjEnMCUGA1UEChMeU291dGggRWFzdGVybiBSZWdpb25hbCBDb2xsZWdl
-						MR4wHAYDVQQDExVzaGliYm9sZXRoLnNlcmMuYWMudWswggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDENh+SLa6LWOKed5gS07GYyu6+XW7RVMQ+hutgiqxO
-						rOnTzAmZTxJTIvwmaRsk37+z3n/rsU5YDosjMTlO0Wl1C7xruvOAHd2K44HHrb16
-						X+A4pK7znx9FMt8n0i/stUVQMhh8ir/sZlOjQz0uat4y3HtioZybengGjkNL7iM9
-						tG31fIwpOYBlfNVknslvVUFYLsnVOnlEcZ0O+5WlYnHa8Qd6Ay4XiA2VdkICAIdN
-						10jIMe0hV/2hBnIIxSdGwRghNhcTMmN/80xV59XX6QkXtpZy/Gd9L5BQfabfQyFm
-						tRF+hcMgW7tqqpp+KFnXjG/WMzuOhBJjSqfZGZcjQUThAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBACrmmmqUQY1zCfiSNfeTPob6wNDyJh1XglgeR5hUuQRuHrNCT2D5
-						tDERide7jZM0FYzXFuovuoMtHr7uHyK3qOEqYzWlS6Z9hwMqYZm5jXZ4zSfExu9p
-						EyeDHLmQt0/PZPb25hQrWUHCvnqbu3d5ScAVVh9gJ4CpFmaustbEXckAdabDm5bR
-						K69fc1XerX5HiEz1kSI0AGecOS4aHq5B1LgKWodL9JIvJi3de1GNSxG7OCOPINA7
-						Q6PnTqInoOWw8Nbb9h640tVD/hxkUJcvfM+2bwOi5JSB4oRWCTgNeKxuf3K9YGYG
-						/d3Km0PXmZriNGP8T6lbBW5Hx3qcVGcfoL8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.serc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.serc.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">South Eastern Regional College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South Eastern Regional College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.serc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Elaine</GivenName>
-    <SurName>Mulholland</SurName>
-    <EmailAddress>mailto:emulholland@serc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Francis</SurName>
-    <EmailAddress>mailto:mfrancis@serc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml
deleted file mode 100644
index dc7c097a..00000000
--- a/swamid-interfederations-2.0/shibboleth.simplyvoting.com-shibboleth-sp.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.simplyvoting.com/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-18T02:54:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/identity/join/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Simply Voting</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Simply Voting - Shibboleth</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.simplyvoting.com/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>*.simplyvoting.com</ds:KeyName>
-        <ds:KeyName>https://shibboleth.simplyvoting.com/shibboleth-sp</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKTCCAhGgAwIBAgIJAPuqVV3UDY+GMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMUEiouc2ltcGx5dm90aW5nLmNvbTAeFw0xMzA1MDIxNDMxNDZaFw0zMzA1MDIx
-NDMxNDZaMB0xGzAZBgNVBAMUEiouc2ltcGx5dm90aW5nLmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL1NfC7sSbZ7rIrPRtOX0XyQqopOixyz+Wbt
-absciRx5kGvy6W5B7LCj5szZdkfX0kJNel5DsxDID3jhv5C8nyCzyPzPpK2WaS0g
-bziPtEF63KI90joSar/o/Vi3zDw35zjObedB2YOT40O+lGv1tYPu4grptJvY14Pd
-Qhv/Lm9RZMtR1mVpx/Ll//I3/WPmFqFCX2HsTD4uLY6rNbsPqpzFN4d42RB8Gg4P
-poUA+hs1c/LxnEJ2pcTSPUcJqYMLp+Pvgn6sCofwDjf+DgB9M12LRer5jsW7O8Z8
-zM3tbSjLRv62h0wsT0YaCv/0G+DT2zbuERLROXjCJOavrCiHs+kCAwEAAaNsMGow
-SQYDVR0RBEIwQIISKi5zaW1wbHl2b3RpbmcuY29thipodHRwczovL3d3dy5zaW1w
-bHl2b3RpbmcuY29tL3NoaWJib2xldGgtc3AwHQYDVR0OBBYEFKSYgzozQrmdd9lC
-SOa1hZ3NybOGMA0GCSqGSIb3DQEBBQUAA4IBAQCSCHsQUbBjXUBRXcZUQI1gvjlH
-3ny35okVnU9ynT+048dsf/xSm+9IbBXoZw9H1G6/+jC0S5jUSawcr6goHJ8XYVO8
-cFfr5VgrxvV8HR/FtLd3ezEMmJSR20/3AdNC1HyV3Dxgqc59li04Qu5a6zYlUe5t
-hBP2VdDCNba45G0vDUbJXU+XR0F4Xb1XKKoqdI6RSMkzegtbCJoEpi38XqQpQIne
-VDTcV8JaXroxakWgnfj7ARXlchH0tkOP2T8P8WN+SqnuXS9RRQa6GDx4HSoc+lLn
-0obwKRPux6UP6dtWT9gj3nih8ie1XstmErfBW1vLS0+AvfR8cY6KJLkFMZFP
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.simplyvoting.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Simply Voting</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Simply Voting - Shibboleth</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.simplyvoting.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brian</md:GivenName>
-    <md:SurName>Lack</md:SurName>
-    <md:EmailAddress>mailto:black@simplyvoting.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.staffs.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.staffs.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 4a07b381..00000000
--- a/swamid-interfederations-2.0/shibboleth.staffs.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://shibboleth.staffs.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Staffordshire University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-29T11:53:15Z">
-      <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">staffs.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Staffordshire University (Login)</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://www.staffs.ac.uk/images/logo80x60.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.staffs.ac.uk/images/logo16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIUM4eMQ3ZvFUQU7+tPiztqHDYE9F8wDQYJKoZIhvcNAQEF
-						BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5zdGFmZnMuYWMudWswHhcNMTMwOTAz
-						MTQzNzA3WhcNMzMwOTAzMTQzNzA3WjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLnN0
-						YWZmcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIkk3zHZ
-						A/HFNwUa+mjyTJ7sQG+RJEb+4sG1vqYyQPhK0OcqIqpqFLY/PRnWx7WXDCtAq9R2
-						xHx47wzNCmZGwvO0GYc2oc/RRafhKAhQlhYQH2CTjPQhP8A74e50WJanedCBrOXi
-						jttjPCennFXePlGMGCh68Nb0hKlm8GjyI/S5vjJa4NeFuis1NrZEZPJjINUFj6im
-						LRbd6iNcVqc+DoOj7PD+DFzYc8/La1lzDhTsuH969NPc+OOtM4axVddxAK5WVsr/
-						zJK3mzC0u9+kYiQp4Qr3mbVn9SSonBkUjKxgE4PdwwuBTi60bYJe6YKvp0ghRSQU
-						Dx4iR7ug0ympOw0CAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmJvbGV0aC5zdGFm
-						ZnMuYWMudWuGLmh0dHBzOi8vc2hpYmJvbGV0aC5zdGFmZnMuYWMudWsvaWRwL3No
-						aWJib2xldGgwHQYDVR0OBBYEFLUI9TLJ8mZwP8L792SDHlWJMQXCMA0GCSqGSIb3
-						DQEBBQUAA4IBAQAoT+y1xv7Cb/xtwH8cLn0zNIo7Ms6TbKxqeSWE0R2c4rvS9nlA
-						59iqcUsUaAzVIjQ8kRUP8mgss42xfOwYYnJXoj5EFn2fV6ttjnepw/FI+kV9DJpH
-						eggpV2XUmasjPqAZCbkO87/SirnICsDxhO6n09FEAIvJrDb4M3VTHR2lXZI8JyTp
-						1DvaCJgwgU7t2y/roz2nLo21kY1XAZG+JWxytS+r4dU1UskopixMZNxh2QN+Oxqf
-						q/65YEeFV/EGtf8b57F53TCRBNwBq/wml+y5ey6hSerDlVVteiGM91pMXepKs3Mg
-						E6q5FqulkMAFTPXvsX84S8A1mX3pCQwv3Puk
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.staffs.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.staffs.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://shibboleth.staffs.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.staffs.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.staffs.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.staffs.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">staffs.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIUM4eMQ3ZvFUQU7+tPiztqHDYE9F8wDQYJKoZIhvcNAQEF
-						BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5zdGFmZnMuYWMudWswHhcNMTMwOTAz
-						MTQzNzA3WhcNMzMwOTAzMTQzNzA3WjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLnN0
-						YWZmcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIkk3zHZ
-						A/HFNwUa+mjyTJ7sQG+RJEb+4sG1vqYyQPhK0OcqIqpqFLY/PRnWx7WXDCtAq9R2
-						xHx47wzNCmZGwvO0GYc2oc/RRafhKAhQlhYQH2CTjPQhP8A74e50WJanedCBrOXi
-						jttjPCennFXePlGMGCh68Nb0hKlm8GjyI/S5vjJa4NeFuis1NrZEZPJjINUFj6im
-						LRbd6iNcVqc+DoOj7PD+DFzYc8/La1lzDhTsuH969NPc+OOtM4axVddxAK5WVsr/
-						zJK3mzC0u9+kYiQp4Qr3mbVn9SSonBkUjKxgE4PdwwuBTi60bYJe6YKvp0ghRSQU
-						Dx4iR7ug0ympOw0CAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmJvbGV0aC5zdGFm
-						ZnMuYWMudWuGLmh0dHBzOi8vc2hpYmJvbGV0aC5zdGFmZnMuYWMudWsvaWRwL3No
-						aWJib2xldGgwHQYDVR0OBBYEFLUI9TLJ8mZwP8L792SDHlWJMQXCMA0GCSqGSIb3
-						DQEBBQUAA4IBAQAoT+y1xv7Cb/xtwH8cLn0zNIo7Ms6TbKxqeSWE0R2c4rvS9nlA
-						59iqcUsUaAzVIjQ8kRUP8mgss42xfOwYYnJXoj5EFn2fV6ttjnepw/FI+kV9DJpH
-						eggpV2XUmasjPqAZCbkO87/SirnICsDxhO6n09FEAIvJrDb4M3VTHR2lXZI8JyTp
-						1DvaCJgwgU7t2y/roz2nLo21kY1XAZG+JWxytS+r4dU1UskopixMZNxh2QN+Oxqf
-						q/65YEeFV/EGtf8b57F53TCRBNwBq/wml+y5ey6hSerDlVVteiGM91pMXepKs3Mg
-						E6q5FqulkMAFTPXvsX84S8A1mX3pCQwv3Puk
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.staffs.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.staffs.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">Staffordshire University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Staffordshire University (Login)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.staffs.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Information Services customer support</GivenName>
-    <EmailAddress>mailto:3800@staffs.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Client Technology &amp; Applications Group</GivenName>
-    <EmailAddress>mailto:isitcta@staffs.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.stamford.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.stamford.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 092916e9..00000000
--- a/swamid-interfederations-2.0/shibboleth.stamford.ac.uk-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" entityID="https://shibboleth.stamford.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for New College Stamford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">stamford.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIJAK+NSDEsMrPuMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD
-						VQQGEwJHQjEVMBMGA1UECBMMTGluY29sbnNoaXJlMREwDwYDVQQHEwhTdGFtZm9y
-						ZDEdMBsGA1UEChMUTmV3IENvbGxlZ2UgU3RhbWZvcmQxEzARBgNVBAsTCklUIFN1
-						cHBvcnQxIjAgBgNVBAMTGXNoaWJib2xldGguc3RhbWZvcmQuYWMudWsxKzApBgkq
-						hkiG9w0BCQEWHGFkbWluaXN0cmF0b3JAc3RhbWZvcmQuYWMudWswHhcNMTMwOTE5
-						MTEyMDEzWhcNMjMwOTE3MTEyMDEzWjCBvDELMAkGA1UEBhMCR0IxFTATBgNVBAgT
-						DExpbmNvbG5zaGlyZTERMA8GA1UEBxMIU3RhbWZvcmQxHTAbBgNVBAoTFE5ldyBD
-						b2xsZWdlIFN0YW1mb3JkMRMwEQYDVQQLEwpJVCBTdXBwb3J0MSIwIAYDVQQDExlz
-						aGliYm9sZXRoLnN0YW1mb3JkLmFjLnVrMSswKQYJKoZIhvcNAQkBFhxhZG1pbmlz
-						dHJhdG9yQHN0YW1mb3JkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAxNZhRlfySArnO5DOBDE9vfyzUzoKovS7ek9eQTI0kcze+pG227ymsKwW
-						B/vhPHZt2344CtXqBiKxUv0U9jCf3/Dway3SvQ4fCAxgx0ceLqHToSZY1V67apeV
-						R75t4Cexv2OZJ5mdvBA6Re1i37J+xZyKiSFnI2Bw0tCEY34tyxsdJFH2Q+S7kmiq
-						YB56/pq3y8FDeDMntCJQNGPtjPQg0wNYz8z3FxBN7X/ko1bpr8TSYe/jfGOIiEbT
-						/zE3izycJIpeLbTUX0RWsmA35mRdEe/SUPykEBaWhzcdE2aDAQMrCXSYdbf2hrCF
-						DV6ekslfNFcfnoDVd4idzcC/AnvmfQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQUZE2SOgx8EKt1Vry6YLh4zpTWE6cwHwYDVR0jBBgwFoAUZE2SOgx8EKt1Vry6
-						YLh4zpTWE6cwDQYJKoZIhvcNAQEFBQADggEBAG/yhdTzRTEiwb5aApbiIFT9di/+
-						i9pClFe37QWrqTr+oNrbbIThq/gB4tEeFNXopYg8ZQIgLTsc1HZKmociZ1zYMQ3C
-						4eHvRxRpflQtIGy61+An9q5Gsx39ttAtLt4lG6VhJZQFFVD9CT6sBoQoFM+G2NQA
-						RO1nSa2NmA2ezlRRuq0sJ7Ves9T4A0llSSpuPYVn0mOpU/oOgbWl88Fwr1G4/xIL
-						dgcT7aAQbRSmDIuqhN8vjZzDyzXeBvtrHAhfRZh3QRbKoHeXtRCNAZbGxPPi9X64
-						/puoYMet3mzYin0PEI6zw1AAZly79koe0tQZtjeybnmvvGrN6PrqCEWs2KY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stamford.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stamford.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://shibboleth.stamford.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.stamford.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.stamford.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.stamford.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">stamford.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIJAK+NSDEsMrPuMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD
-						VQQGEwJHQjEVMBMGA1UECBMMTGluY29sbnNoaXJlMREwDwYDVQQHEwhTdGFtZm9y
-						ZDEdMBsGA1UEChMUTmV3IENvbGxlZ2UgU3RhbWZvcmQxEzARBgNVBAsTCklUIFN1
-						cHBvcnQxIjAgBgNVBAMTGXNoaWJib2xldGguc3RhbWZvcmQuYWMudWsxKzApBgkq
-						hkiG9w0BCQEWHGFkbWluaXN0cmF0b3JAc3RhbWZvcmQuYWMudWswHhcNMTMwOTE5
-						MTEyMDEzWhcNMjMwOTE3MTEyMDEzWjCBvDELMAkGA1UEBhMCR0IxFTATBgNVBAgT
-						DExpbmNvbG5zaGlyZTERMA8GA1UEBxMIU3RhbWZvcmQxHTAbBgNVBAoTFE5ldyBD
-						b2xsZWdlIFN0YW1mb3JkMRMwEQYDVQQLEwpJVCBTdXBwb3J0MSIwIAYDVQQDExlz
-						aGliYm9sZXRoLnN0YW1mb3JkLmFjLnVrMSswKQYJKoZIhvcNAQkBFhxhZG1pbmlz
-						dHJhdG9yQHN0YW1mb3JkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAxNZhRlfySArnO5DOBDE9vfyzUzoKovS7ek9eQTI0kcze+pG227ymsKwW
-						B/vhPHZt2344CtXqBiKxUv0U9jCf3/Dway3SvQ4fCAxgx0ceLqHToSZY1V67apeV
-						R75t4Cexv2OZJ5mdvBA6Re1i37J+xZyKiSFnI2Bw0tCEY34tyxsdJFH2Q+S7kmiq
-						YB56/pq3y8FDeDMntCJQNGPtjPQg0wNYz8z3FxBN7X/ko1bpr8TSYe/jfGOIiEbT
-						/zE3izycJIpeLbTUX0RWsmA35mRdEe/SUPykEBaWhzcdE2aDAQMrCXSYdbf2hrCF
-						DV6ekslfNFcfnoDVd4idzcC/AnvmfQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQUZE2SOgx8EKt1Vry6YLh4zpTWE6cwHwYDVR0jBBgwFoAUZE2SOgx8EKt1Vry6
-						YLh4zpTWE6cwDQYJKoZIhvcNAQEFBQADggEBAG/yhdTzRTEiwb5aApbiIFT9di/+
-						i9pClFe37QWrqTr+oNrbbIThq/gB4tEeFNXopYg8ZQIgLTsc1HZKmociZ1zYMQ3C
-						4eHvRxRpflQtIGy61+An9q5Gsx39ttAtLt4lG6VhJZQFFVD9CT6sBoQoFM+G2NQA
-						RO1nSa2NmA2ezlRRuq0sJ7Ves9T4A0llSSpuPYVn0mOpU/oOgbWl88Fwr1G4/xIL
-						dgcT7aAQbRSmDIuqhN8vjZzDyzXeBvtrHAhfRZh3QRbKoHeXtRCNAZbGxPPi9X64
-						/puoYMet3mzYin0PEI6zw1AAZly79koe0tQZtjeybnmvvGrN6PrqCEWs2KY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stamford.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stamford.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">New College Stamford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">New College Stamford</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stamford.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>The IT Department</GivenName>
-    <EmailAddress>mailto:itsupport@stamford.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Cottrell</SurName>
-    <EmailAddress>mailto:rob.cottrell@stamford.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.statista.com.xml b/swamid-interfederations-2.0/shibboleth.statista.com.xml
deleted file mode 100644
index 7bb02714..00000000
--- a/swamid-interfederations-2.0/shibboleth.statista.com.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.statista.com">
-  <!--
-		This is a Shibboleth SP for Statista GmbH.
-	-->
-  <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="2014-08-11T11:49:28Z">
-      <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://shibboleth.statista.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://shibboleth.statista.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Statista</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Statista.com is a statistics portal integrating data on over 60,000 topics from over 18,000 sources.</mdui:Description>
-        <mdui:Logo height="36" width="169">https://d28wbuch0jlv7v.cloudfront.net/static/img/Statista-Logo-Color-Primary.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE4jCCA8qgAwIBAgIHEn65XsmOBDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
-						EwJERTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0G
-						A1UEAxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMTA5MDEwODAxMThaFw0x
-						NjA4MzAwODAxMThaME4xCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWlu
-						MRAwDgYDVQQLEwdERk4tUEtJMRgwFgYDVQQDEw9kZS5zdGF0aXN0YS5jb20wggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIP8FskLI19g/XBvxY1ua4uEtg
-						Q0vdL6f/wuKNP8wc/hCNh/HGJLYj9S0BRFmVlCxiXFhr5GRZAAZN+b6msehsgPs3
-						V6yKsP0Ga4yt7ccJuAzUFVU8Qrva2TIvDLPZ7Qucj+2M4ekxpqBjp850JbTqdGO1
-						oDmrKAzuxWXUS/9L88tFHiHvaxLEIBK3OYf6k8lK61BZuU2DXIFkd72iCF7LS/sE
-						uHh1db+185ssxNiLICu2vqJ9ZpsrYN6qOxSNvxI3jQ7jHNOlVXwFGAeDsnjg4Qxa
-						oqfgLekPagmmDWpAI9QHTyqUOAaN03UWigVeb01IiH8EwBKzi82mims7CHb1AgMB
-						AAGjggG8MIIBuDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggr
-						BgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFOG/Ep6pb7z0/1gHX1D6Yx8DZsGx
-						MB8GA1UdIwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMIGRBgNVHR8EgYkwgYYw
-						QaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNh
-						L3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRl
-						L2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBqgYIKwYBBQUH
-						AQEEgZ0wgZowSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xv
-						YmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBLBggrBgEFBQcw
-						AoY/aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHVi
-						L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCJFZsyyBpVIHAp
-						preO/3S9+1Gw4OFWgS4Ajpfxz8H5pV5+6PK9bogtUWt7kSt41rbrWKWWbiZkjuTo
-						Th4aHytOOeHpaUYH9qkFa7Cla5L4FEB52uarXlnXtrp3/2sTPvpZWtDk7KNZYvcN
-						Psfu+IqZEGwHWuwh58Hl2v5xf137GhgcYuOm5Yabvi0+MdmtHihWuJ2sA7NEWzn8
-						LW8dBcS4uGBLwmZ5Tq4zIAbppwwoqV81YwY+IaW9ObNpYJUMPhyxxW6ydTxF4yuT
-						qZL8C8tvRqJtGUxFqPs4xImg3b9WLPThwMkFkuH/xzQqmN+xeoD3LvL/2DF88T3y
-						l/xjGBYl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <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://shibboleth.statista.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.statista.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.statista.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.statista.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.statista.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.statista.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Statista GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Statista</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.statista.com/aboutus/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Technik</GivenName>
-    <EmailAddress>mailto:technik@statista.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technik</GivenName>
-    <EmailAddress>mailto:technik@statista.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.strode-college.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.strode-college.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index e5610851..00000000
--- a/swamid-interfederations-2.0/shibboleth.strode-college.ac.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://shibboleth.strode-college.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Strode College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">strode-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEjDCCA3SgAwIBAgIRAM41B8R40Vbx+iUIaGkgqqcwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MjMwMDAwMDBaFw0xNjA0MjIyMzU5NTlaME0xITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEoMCYGA1UEAxMfc2hpYmJvbGV0
-						aC5zdHJvZGUtY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBANirzHi6TLkZ9a/jBiJnW2SDq3C12XDTz48ohkxhJdNVaDP6s7mkHI/C
-						QIAivdA1t+uVpXq+6jq6usl7kiZ5vJ6PdPSETEI/hzzd+yr7pb9nJ/4gCNSwwdUg
-						bmZPATbzR6lqnpEZYdoiTOO7r/fDHfyaeKEyZq1fxlH51LLxhH0zsox+KZATFd/I
-						5Pv0OqZYZa+QEWSReFHEFaISSjiI1XBq7kNUDqbgaTWhcSju4CK/XNal0wVC604S
-						3ABvSh8kPwppxNcqRFiRXADhAcLF4+mSx3XRCE0SlGbNjmJqu3pPAFNErX3wHZCF
-						I4jvlMkfAPaCu5a580L95zDEOuQ+/mMCAwEAAaOCAXwwggF4MB8GA1UdIwQYMBaA
-						FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBS0f5oAazGa9uNdSNquviGF
-						58J0ZTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-						BgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZn
-						gQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKgYDVR0RBCMwIYIfc2hp
-						YmJvbGV0aC5zdHJvZGUtY29sbGVnZS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEA
-						mD7iITFcafQy6S75VcRHWZoBZ8AaxGPfzw2h584swzmfpDhfuTrAPb0gQqnI3wB1
-						ojHA7nHWi5SBjZbfRrtYkXkLP7JBqd/ODCJwjs9OOR2Bs2FYgSKfIaDo0x7bxlXL
-						jMVLJMOlw5CyOen7L56pSrFSDUCcFI11qQqTZrJKOnuB8+M+OJ7NXdPTxeovx8DE
-						i1o/5lZY4ExXtpBi8C824VQW/kaw/OLw7AoixIO8NtHJQZXczCluq3DmSfjmzXxL
-						zk34zZV8zfCKL8nip9c7FyOs4T435ohfn/pgjdeymebl6lxosT05f0q1YHmUC76K
-						0HEvec1HFeaydGx2GgAgcA==                        
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.strode-college.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.strode-college.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://shibboleth.strode-college.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.strode-college.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.strode-college.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.strode-college.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">strode-college.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEjDCCA3SgAwIBAgIRAM41B8R40Vbx+iUIaGkgqqcwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MjMwMDAwMDBaFw0xNjA0MjIyMzU5NTlaME0xITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEoMCYGA1UEAxMfc2hpYmJvbGV0
-						aC5zdHJvZGUtY29sbGVnZS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBANirzHi6TLkZ9a/jBiJnW2SDq3C12XDTz48ohkxhJdNVaDP6s7mkHI/C
-						QIAivdA1t+uVpXq+6jq6usl7kiZ5vJ6PdPSETEI/hzzd+yr7pb9nJ/4gCNSwwdUg
-						bmZPATbzR6lqnpEZYdoiTOO7r/fDHfyaeKEyZq1fxlH51LLxhH0zsox+KZATFd/I
-						5Pv0OqZYZa+QEWSReFHEFaISSjiI1XBq7kNUDqbgaTWhcSju4CK/XNal0wVC604S
-						3ABvSh8kPwppxNcqRFiRXADhAcLF4+mSx3XRCE0SlGbNjmJqu3pPAFNErX3wHZCF
-						I4jvlMkfAPaCu5a580L95zDEOuQ+/mMCAwEAAaOCAXwwggF4MB8GA1UdIwQYMBaA
-						FAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBS0f5oAazGa9uNdSNquviGF
-						58J0ZTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-						BgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZn
-						gQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-						Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-						dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-						BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwKgYDVR0RBCMwIYIfc2hp
-						YmJvbGV0aC5zdHJvZGUtY29sbGVnZS5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEA
-						mD7iITFcafQy6S75VcRHWZoBZ8AaxGPfzw2h584swzmfpDhfuTrAPb0gQqnI3wB1
-						ojHA7nHWi5SBjZbfRrtYkXkLP7JBqd/ODCJwjs9OOR2Bs2FYgSKfIaDo0x7bxlXL
-						jMVLJMOlw5CyOen7L56pSrFSDUCcFI11qQqTZrJKOnuB8+M+OJ7NXdPTxeovx8DE
-						i1o/5lZY4ExXtpBi8C824VQW/kaw/OLw7AoixIO8NtHJQZXczCluq3DmSfjmzXxL
-						zk34zZV8zfCKL8nip9c7FyOs4T435ohfn/pgjdeymebl6lxosT05f0q1YHmUC76K
-						0HEvec1HFeaydGx2GgAgcA==                        
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.strode-college.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.strode-college.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">Strode College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Strode College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.strode-college.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matt</GivenName>
-    <SurName>Seymour</SurName>
-    <EmailAddress>mailto:mseymour@strode-college.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matt</GivenName>
-    <SurName>Seymour</SurName>
-    <EmailAddress>mailto:mseymour@strode-college.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.stvincent.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.stvincent.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 447d64b1..00000000
--- a/swamid-interfederations-2.0/shibboleth.stvincent.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://shibboleth.stvincent.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Computing Services" Shibboleth IdP for St Vincent College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-16T17:32: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">stvincent.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID+zCCAuOgAwIBAgIJAPVJaPGZ6hp0MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
-						VQQGEwJHQjESMBAGA1UECAwJSGFtcHNoaXJlMRAwDgYDVQQHDAdHb3Nwb3J0MRww
-						GgYDVQQKDBNTdC4gVmluY2VudCBDb2xsZWdlMRswGQYDVQQLDBJDb21wdXRpbmcg
-						U2VydmljZXMxIzAhBgNVBAMMGnNoaWJib2xldGguc3R2aW5jZW50LmFjLnVrMB4X
-						DTE0MDQyMjA4NTEzOVoXDTI0MDQxOTA4NTEzOVowgZMxCzAJBgNVBAYTAkdCMRIw
-						EAYDVQQIDAlIYW1wc2hpcmUxEDAOBgNVBAcMB0dvc3BvcnQxHDAaBgNVBAoME1N0
-						LiBWaW5jZW50IENvbGxlZ2UxGzAZBgNVBAsMEkNvbXB1dGluZyBTZXJ2aWNlczEj
-						MCEGA1UEAwwac2hpYmJvbGV0aC5zdHZpbmNlbnQuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDnZN2BAOnzT6khf5iV7SoGU+o5T0gZUqi06pWN
-						t9QBYAcls5EtcX1Use0V9o3T6eolbTAuTEtLb4rA2XTl3GdC0Kxp47+FpxQPl+eE
-						T5FKpm4JtsSGwSlOTWlpVB5tM5MHgo08OXCJvheFYalwHJwTSJq9iJRl3k1z/7iu
-						awm0mwfrL7WkoGqsxByzuPzVOeVjcwcCu6vqPD0FdSnbgtdhUooEPH5Z9UxGmLkz
-						JTsswUt4HgoZ8wfpOF8rMmWx3q2j6AlWouDZ2e+09/Da6P+OzZc3MuLI0p5RsL5g
-						FZbZAd9ug3co9kat8Dv8lpgAbOD7rKnpypSd0vYQvlFnHiADAgMBAAGjUDBOMB0G
-						A1UdDgQWBBRLo6YHlfQdXHuHAgwUecCZHW5n+jAfBgNVHSMEGDAWgBRLo6YHlfQd
-						XHuHAgwUecCZHW5n+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCF
-						fCPtuwRUOtWh/CW45ut5124QgxvCuSz6fhINBWUAJ+MM0jwq+IXwyfPZrdHYfSSR
-						ibIfAW15EHT+aDnHNGLkvmWN6E4OBzHiN5kepH4ANrSp2WSIwYEzTBvYSxhzc8Tf
-						B1OGqzI4O9v3sTAnoh0MgUa0/8Bl6dhhVfvZ2VCyPSpem42FBLrrZS08MPogLkSJ
-						jxpoy684e6jQDX0X1mn+f5o9syml1pEXHgsZrnWrW71xBngBKc7NdUf3GhdDNIYL
-						FKaMmHp4zIQhAhM6MoWEzMJloMkRZjwa85MIVdCr7Ffyi4qhd/SlMgEsjP8Aqtih
-						Xptt+IaBrxyoISOIgH+z
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stvincent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stvincent.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://shibboleth.stvincent.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.stvincent.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.stvincent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.stvincent.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">stvincent.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID+zCCAuOgAwIBAgIJAPVJaPGZ6hp0MA0GCSqGSIb3DQEBBQUAMIGTMQswCQYD
-						VQQGEwJHQjESMBAGA1UECAwJSGFtcHNoaXJlMRAwDgYDVQQHDAdHb3Nwb3J0MRww
-						GgYDVQQKDBNTdC4gVmluY2VudCBDb2xsZWdlMRswGQYDVQQLDBJDb21wdXRpbmcg
-						U2VydmljZXMxIzAhBgNVBAMMGnNoaWJib2xldGguc3R2aW5jZW50LmFjLnVrMB4X
-						DTE0MDQyMjA4NTEzOVoXDTI0MDQxOTA4NTEzOVowgZMxCzAJBgNVBAYTAkdCMRIw
-						EAYDVQQIDAlIYW1wc2hpcmUxEDAOBgNVBAcMB0dvc3BvcnQxHDAaBgNVBAoME1N0
-						LiBWaW5jZW50IENvbGxlZ2UxGzAZBgNVBAsMEkNvbXB1dGluZyBTZXJ2aWNlczEj
-						MCEGA1UEAwwac2hpYmJvbGV0aC5zdHZpbmNlbnQuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDnZN2BAOnzT6khf5iV7SoGU+o5T0gZUqi06pWN
-						t9QBYAcls5EtcX1Use0V9o3T6eolbTAuTEtLb4rA2XTl3GdC0Kxp47+FpxQPl+eE
-						T5FKpm4JtsSGwSlOTWlpVB5tM5MHgo08OXCJvheFYalwHJwTSJq9iJRl3k1z/7iu
-						awm0mwfrL7WkoGqsxByzuPzVOeVjcwcCu6vqPD0FdSnbgtdhUooEPH5Z9UxGmLkz
-						JTsswUt4HgoZ8wfpOF8rMmWx3q2j6AlWouDZ2e+09/Da6P+OzZc3MuLI0p5RsL5g
-						FZbZAd9ug3co9kat8Dv8lpgAbOD7rKnpypSd0vYQvlFnHiADAgMBAAGjUDBOMB0G
-						A1UdDgQWBBRLo6YHlfQdXHuHAgwUecCZHW5n+jAfBgNVHSMEGDAWgBRLo6YHlfQd
-						XHuHAgwUecCZHW5n+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCF
-						fCPtuwRUOtWh/CW45ut5124QgxvCuSz6fhINBWUAJ+MM0jwq+IXwyfPZrdHYfSSR
-						ibIfAW15EHT+aDnHNGLkvmWN6E4OBzHiN5kepH4ANrSp2WSIwYEzTBvYSxhzc8Tf
-						B1OGqzI4O9v3sTAnoh0MgUa0/8Bl6dhhVfvZ2VCyPSpem42FBLrrZS08MPogLkSJ
-						jxpoy684e6jQDX0X1mn+f5o9syml1pEXHgsZrnWrW71xBngBKc7NdUf3GhdDNIYL
-						FKaMmHp4zIQhAhM6MoWEzMJloMkRZjwa85MIVdCr7Ffyi4qhd/SlMgEsjP8Aqtih
-						Xptt+IaBrxyoISOIgH+z
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stvincent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stvincent.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">St Vincent College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St Vincent College: Computing Services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stvincent.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lukasz</GivenName>
-    <SurName>Grochowicz</SurName>
-    <EmailAddress>mailto:lukasz@stvincent.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lukasz</GivenName>
-    <SurName>Grochowicz</SurName>
-    <EmailAddress>mailto:lukasz@stvincent.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.submit.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.submit.ac.uk-shibboleth.xml
deleted file mode 100644
index f05c9346..00000000
--- a/swamid-interfederations-2.0/shibboleth.submit.ac.uk-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://shibboleth.submit.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 'TurnitinUK' SP for iParadigms Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIEJDCCAwygAwIBAgIJANNCqdS5T/uTMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYD
-						VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEQMA4GA1UEBwwHT2FrbGFuZDET
-						MBEGA1UECgwKaVBhcmFkaWdtczEgMB4GA1UEAwwXc2hpYmJvbGV0aC5zdWJtaXQu
-						YWMudWsxJTAjBgkqhkiG9w0BCQEWFnNoaWJhZG1pbkB0dXJuaXRpbi5jb20wHhcN
-						MTMwODIzMDAzMjM4WhcNMjMwODIxMDAzMjM4WjCBkjELMAkGA1UEBhMCVVMxEzAR
-						BgNVBAgMCkNhbGlmb3JuaWExEDAOBgNVBAcMB09ha2xhbmQxEzARBgNVBAoMCmlQ
-						YXJhZGlnbXMxIDAeBgNVBAMMF3NoaWJib2xldGguc3VibWl0LmFjLnVrMSUwIwYJ
-						KoZIhvcNAQkBFhZzaGliYWRtaW5AdHVybml0aW4uY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAwP4A/JGVAR4/MLEn2/YgG+8RqWnJqi/Pxuux6AR8
-						YJouaq6OIN7FtmFTze4aOVji3u0QoxDU559gl72VA3c4J+DYV/6sKz4LCGrN7NTM
-						RdtHrHJkPtj1ktIkBaCSYPADoTsrlQnRqZ5sSc8Q1vQNFQCfhf61mkKE3VX+EwTK
-						njx6NhyhpPSfctUdPR/QADZZCWazldENSuH7yyUjTlxhBLLQD9Yyahn2e11Afqvc
-						iJvyZMVtfQ0ezKVQlinXTtPKROuVHPybKcCcvu0WLncrW1M1kbhkmUNbCjPWspxp
-						y91ggvdRePbOdZZwmUIxkEMeGiXDA8YvmF2gk6wptRv/7wIDAQABo3sweTAJBgNV
-						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
-						Y2F0ZTAdBgNVHQ4EFgQUvcJOH3FW/nHHBg7gjXPFvTUg0EkwHwYDVR0jBBgwFoAU
-						vcJOH3FW/nHHBg7gjXPFvTUg0EkwDQYJKoZIhvcNAQEFBQADggEBAJteiRc11ZQe
-						mm2idBi0wnpXTsXq7Boo2tFBB1QhJ4c/XkkBb1gzBaGe2dH4jZ0NbpN8+JXifplz
-						ZokKNVILqvi7xnR3aAs2lFRqN3mpZ2a3Kkn5liLtiOeuVx37o/n6RxpTKS/KHufz
-						ebYCs8ORGrdWHuiGHPX6LNy9ITONdFr7ma57aQ7Xr47hxgT/XRk48OcDGhTFAlmt
-						XCnhD1dwMqXgkfULzheeg/j2BDCBfWjfG+4D6FzQlbFbyfOK03w8Yjxmy397OYbC
-						Q/KYFVKd7S68jRoJ05AH/RvuEL7Fr8hSYJHhs26lgTM9MFU79jjzfhH4OvYyjoK5
-						Bqox791QdCs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.submit.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">iParadigms Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">iParadigms: TurnitinUK</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.submit.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Shuh</SurName>
-    <EmailAddress>mailto:mshuh@iparadigms.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Miller</SurName>
-    <EmailAddress>mailto:jmiller@turnitin.com</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 f48418b7..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.techlib.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.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: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.techlib.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.techlib.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.techlib.cz/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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.techlib.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Library of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Narodni technicka knihovna</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Library of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Narodni technicka knihovna</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.techlib.cz/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.techlib.cz/cs/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ondrej</md:GivenName>
-    <md:SurName>Koch</md:SurName>
-    <md:EmailAddress>ondrej.koch@techlib.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.truro-penwith.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.truro-penwith.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 01eb9124..00000000
--- a/swamid-interfederations-2.0/shibboleth.truro-penwith.ac.uk-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://shibboleth.truro-penwith.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Truro and Penwith College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-24T12:37:39Z">
-      <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">truro-penwith.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZTCCAk2gAwIBAgIUVIqVGTLdOThvAs45mIha28LOG0cwDQYJKoZIhvcNAQEF
-						BQAwKTEnMCUGA1UEAxMec2hpYmJvbGV0aC50cnVyby1wZW53aXRoLmFjLnVrMB4X
-						DTEzMDcyNTA5MjU1OFoXDTMzMDcyNTA5MjU1OFowKTEnMCUGA1UEAxMec2hpYmJv
-						bGV0aC50cnVyby1wZW53aXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEAjNqa9ASmhvPnSc/Sg2TXmSShKIwWmTXV7eNgqQY/yacb2zrsWJes
-						Fx/hGQ2GADV/+PWyHNT208q0Bb7IsutKLSRCntKKB8FPREaSTRO8QVkEpDAuakpR
-						m9B/Q1z0+HGVlGc6ZifDgChxZYYlOxr8CyGk9r5xNu28KnQsjUodwEPW7Xv5tjaH
-						Ukg9ZI8UpYkxYKt9yQj+KdfV5g0BiUkaKTRIQ+20L5ohFYweuH2DKTOv48td7bMa
-						Y5MRpabacOhJOs+Pt6AKToGcmM+gEhib0fifhdMg2Qf77dZ3miuI+8sjIZFuttyQ
-						SKeWWJgnpka95I0m8hfr/DxzkSPIHzJFbQIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
-						HnNoaWJib2xldGgudHJ1cm8tcGVud2l0aC5hYy51a4Y1aHR0cHM6Ly9zaGliYm9s
-						ZXRoLnRydXJvLXBlbndpdGguYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
-						FPe307YqPO7BPihGONrKkqFzgZCDMA0GCSqGSIb3DQEBBQUAA4IBAQCL0w8cTddh
-						iqoUJu/oGOju7URDWO+YwIjJV+tWEf8lC0nGnPehoaYitXDexoNNZ9yqEJ3XhrTF
-						gTNtJfRPnT9RZ0e+dbJu/f68HKLkv798yy14wgv6m20miPvY14OhlTT2mUcUuhz0
-						m29Yd8Kg1MIDcH1Me7SVAvJex0uaDn0J74dNJofWxeCRv4+rlMuDQa2NL2sJ6GL0
-						oZnqLAehosKei0nPPNYFE4aa+L/V6BSDs7hqimBf6oFt4qDqOeGgfAZeuWdqCYDN
-						kUAJtuR24UgajKJGGInWVDBNlXJMCNyAVoSevzXTO6Dp+XDyDdOY/Dt8MMSvKPc4
-						SZjtHVMDghth
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.truro-penwith.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.truro-penwith.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://shibboleth.truro-penwith.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.truro-penwith.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.truro-penwith.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.truro-penwith.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">truro-penwith.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZTCCAk2gAwIBAgIUVIqVGTLdOThvAs45mIha28LOG0cwDQYJKoZIhvcNAQEF
-						BQAwKTEnMCUGA1UEAxMec2hpYmJvbGV0aC50cnVyby1wZW53aXRoLmFjLnVrMB4X
-						DTEzMDcyNTA5MjU1OFoXDTMzMDcyNTA5MjU1OFowKTEnMCUGA1UEAxMec2hpYmJv
-						bGV0aC50cnVyby1wZW53aXRoLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEAjNqa9ASmhvPnSc/Sg2TXmSShKIwWmTXV7eNgqQY/yacb2zrsWJes
-						Fx/hGQ2GADV/+PWyHNT208q0Bb7IsutKLSRCntKKB8FPREaSTRO8QVkEpDAuakpR
-						m9B/Q1z0+HGVlGc6ZifDgChxZYYlOxr8CyGk9r5xNu28KnQsjUodwEPW7Xv5tjaH
-						Ukg9ZI8UpYkxYKt9yQj+KdfV5g0BiUkaKTRIQ+20L5ohFYweuH2DKTOv48td7bMa
-						Y5MRpabacOhJOs+Pt6AKToGcmM+gEhib0fifhdMg2Qf77dZ3miuI+8sjIZFuttyQ
-						SKeWWJgnpka95I0m8hfr/DxzkSPIHzJFbQIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
-						HnNoaWJib2xldGgudHJ1cm8tcGVud2l0aC5hYy51a4Y1aHR0cHM6Ly9zaGliYm9s
-						ZXRoLnRydXJvLXBlbndpdGguYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
-						FPe307YqPO7BPihGONrKkqFzgZCDMA0GCSqGSIb3DQEBBQUAA4IBAQCL0w8cTddh
-						iqoUJu/oGOju7URDWO+YwIjJV+tWEf8lC0nGnPehoaYitXDexoNNZ9yqEJ3XhrTF
-						gTNtJfRPnT9RZ0e+dbJu/f68HKLkv798yy14wgv6m20miPvY14OhlTT2mUcUuhz0
-						m29Yd8Kg1MIDcH1Me7SVAvJex0uaDn0J74dNJofWxeCRv4+rlMuDQa2NL2sJ6GL0
-						oZnqLAehosKei0nPPNYFE4aa+L/V6BSDs7hqimBf6oFt4qDqOeGgfAZeuWdqCYDN
-						kUAJtuR24UgajKJGGInWVDBNlXJMCNyAVoSevzXTO6Dp+XDyDdOY/Dt8MMSvKPc4
-						SZjtHVMDghth
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.truro-penwith.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.truro-penwith.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">Truro and Penwith College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Truro and Penwith College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.truro-penwith.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Robert</GivenName>
-    <SurName>Stephens</SurName>
-    <EmailAddress>mailto:roberts@truro-penwith.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Robert</GivenName>
-    <SurName>Stephens</SurName>
-    <EmailAddress>mailto:roberts@truro-penwith.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml
deleted file mode 100644
index 727e3620..00000000
--- a/swamid-interfederations-2.0/shibboleth.turnitinuk.com-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.turnitinuk.com/shibboleth">
-  <!--
-		This is a 'TurnitinUK' Shibboleth SP for iParadigms Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-18T10:58:40Z">
-      <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://shibboleth.turnitinuk.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://shibboleth.turnitinuk.com/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://shibboleth.turnitinuk.com/Shibboleth.sso/WAYF/UKFederation"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEJDCCAwygAwIBAgIJANNCqdS5T/uTMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYD
-						VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEQMA4GA1UEBwwHT2FrbGFuZDET
-						MBEGA1UECgwKaVBhcmFkaWdtczEgMB4GA1UEAwwXc2hpYmJvbGV0aC5zdWJtaXQu
-						YWMudWsxJTAjBgkqhkiG9w0BCQEWFnNoaWJhZG1pbkB0dXJuaXRpbi5jb20wHhcN
-						MTMwODIzMDAzMjM4WhcNMjMwODIxMDAzMjM4WjCBkjELMAkGA1UEBhMCVVMxEzAR
-						BgNVBAgMCkNhbGlmb3JuaWExEDAOBgNVBAcMB09ha2xhbmQxEzARBgNVBAoMCmlQ
-						YXJhZGlnbXMxIDAeBgNVBAMMF3NoaWJib2xldGguc3VibWl0LmFjLnVrMSUwIwYJ
-						KoZIhvcNAQkBFhZzaGliYWRtaW5AdHVybml0aW4uY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAwP4A/JGVAR4/MLEn2/YgG+8RqWnJqi/Pxuux6AR8
-						YJouaq6OIN7FtmFTze4aOVji3u0QoxDU559gl72VA3c4J+DYV/6sKz4LCGrN7NTM
-						RdtHrHJkPtj1ktIkBaCSYPADoTsrlQnRqZ5sSc8Q1vQNFQCfhf61mkKE3VX+EwTK
-						njx6NhyhpPSfctUdPR/QADZZCWazldENSuH7yyUjTlxhBLLQD9Yyahn2e11Afqvc
-						iJvyZMVtfQ0ezKVQlinXTtPKROuVHPybKcCcvu0WLncrW1M1kbhkmUNbCjPWspxp
-						y91ggvdRePbOdZZwmUIxkEMeGiXDA8YvmF2gk6wptRv/7wIDAQABo3sweTAJBgNV
-						HRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZp
-						Y2F0ZTAdBgNVHQ4EFgQUvcJOH3FW/nHHBg7gjXPFvTUg0EkwHwYDVR0jBBgwFoAU
-						vcJOH3FW/nHHBg7gjXPFvTUg0EkwDQYJKoZIhvcNAQEFBQADggEBAJteiRc11ZQe
-						mm2idBi0wnpXTsXq7Boo2tFBB1QhJ4c/XkkBb1gzBaGe2dH4jZ0NbpN8+JXifplz
-						ZokKNVILqvi7xnR3aAs2lFRqN3mpZ2a3Kkn5liLtiOeuVx37o/n6RxpTKS/KHufz
-						ebYCs8ORGrdWHuiGHPX6LNy9ITONdFr7ma57aQ7Xr47hxgT/XRk48OcDGhTFAlmt
-						XCnhD1dwMqXgkfULzheeg/j2BDCBfWjfG+4D6FzQlbFbyfOK03w8Yjxmy397OYbC
-						Q/KYFVKd7S68jRoJ05AH/RvuEL7Fr8hSYJHhs26lgTM9MFU79jjzfhH4OvYyjoK5
-						Bqox791QdCs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.turnitinuk.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">TurnitinUK</ServiceName>
-      <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="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">iParadigms Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">iParadigms: TurnitinUK</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.turnitinuk.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth admin</GivenName>
-    <EmailAddress>mailto:shibadmin@turnitin.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shibboleth admin</GivenName>
-    <EmailAddress>mailto:shibadmin@turnitin.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.twu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.twu.edu-idp-shibboleth.xml
deleted file mode 100644
index fa698083..00000000
--- a/swamid-interfederations-2.0/shibboleth.twu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://shibboleth.twu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.twu.edu/tis/InCommon_help.asp" 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">twu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Texas Woman's University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Texas Woman's University</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.twu.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.twu.edu/privacy.asp</mdui:PrivacyStatementURL>
-        <mdui:Logo height="536" width="1001" xml:lang="en">https://www.twu.edu/webguide/images/twu-logo-screen.jpg</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>
-MIIDNDCCAhygAwIBAgIVAI0T7xzZIygfVuYxMru5q5nZHShqMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudHd1LmVkdTAeFw0xNDA0MDcyMjEw
-MDZaFw0zNDA0MDcyMjEwMDZaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudHd1LmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIx+VXaomj3kZQ4iHNng
-slXgUKdvvrMK95fSEIQaAFLGT7FRqE5x9XT8A/6MD7IGK8ju1oTRSNQCB2Y4SuvL
-fipAKnPVdOkbLIWHnCqOz/k/FK5cawLUE5oHcO/Z8G3yuS8e/5JTd/0uvjg3UaeH
-wx0NjTqQ3nsgU0PGXYjb7mecQoRscb7sbuNs1hfc+HVP3XCpg4UtH3d8blHojFQF
-wmpn9JhFBz8nLUpVzciQR0MVdIGfHKorBiAchpIPuiUMsQyH3bhstf6UfovHjJDP
-+D+QQEK9xltDiAsg7n0r2X+Qmcbn9UaVkBe19n+CMbUWI8Xyu8WJwtonkmqgu5Et
-+ecCAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmJvbGV0aC50d3UuZWR1hilodHRw
-czovL3NoaWJib2xldGgudHd1LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-ihWr1R5mHoynw9MVCPrH0FNDuWkwDQYJKoZIhvcNAQEFBQADggEBAAntMjyeQnD7
-cV4V3xEHC+PZIURMgMlf533Zuq1I55mwpt71Vpyw5aCMGgnL+ijvLUVwBRowdUtn
-wjLhcOB6gF7jUBs70tcY2JCCxXqIJOpLrOkKuMpcbQbuyQ/INy6pVYXJuiBdwBUW
-/3Ys+ape2tq11LtVh9p7U2GqiFvYhD1Gi2axD8Dw6hZuFWxSPZxPfRqjB+LG6QuU
-BTKp7zGJR7u+0fClzPPD0eNrB+Xm/EVxKiy974O3LxRtdM7f1Y+PajUVqEmCrfA8
-liI+dPkY6jYTEUJ5o8LqDH2gOs/p5xDeNllYxA2hcA4ap4RI3SVsKyyJHGLaLyjJ
-epclpLX4uwE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.twu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.twu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.twu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.twu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.twu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.twu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">twu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAI0T7xzZIygfVuYxMru5q5nZHShqMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudHd1LmVkdTAeFw0xNDA0MDcyMjEw
-MDZaFw0zNDA0MDcyMjEwMDZaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudHd1LmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIx+VXaomj3kZQ4iHNng
-slXgUKdvvrMK95fSEIQaAFLGT7FRqE5x9XT8A/6MD7IGK8ju1oTRSNQCB2Y4SuvL
-fipAKnPVdOkbLIWHnCqOz/k/FK5cawLUE5oHcO/Z8G3yuS8e/5JTd/0uvjg3UaeH
-wx0NjTqQ3nsgU0PGXYjb7mecQoRscb7sbuNs1hfc+HVP3XCpg4UtH3d8blHojFQF
-wmpn9JhFBz8nLUpVzciQR0MVdIGfHKorBiAchpIPuiUMsQyH3bhstf6UfovHjJDP
-+D+QQEK9xltDiAsg7n0r2X+Qmcbn9UaVkBe19n+CMbUWI8Xyu8WJwtonkmqgu5Et
-+ecCAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmJvbGV0aC50d3UuZWR1hilodHRw
-czovL3NoaWJib2xldGgudHd1LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-ihWr1R5mHoynw9MVCPrH0FNDuWkwDQYJKoZIhvcNAQEFBQADggEBAAntMjyeQnD7
-cV4V3xEHC+PZIURMgMlf533Zuq1I55mwpt71Vpyw5aCMGgnL+ijvLUVwBRowdUtn
-wjLhcOB6gF7jUBs70tcY2JCCxXqIJOpLrOkKuMpcbQbuyQ/INy6pVYXJuiBdwBUW
-/3Ys+ape2tq11LtVh9p7U2GqiFvYhD1Gi2axD8Dw6hZuFWxSPZxPfRqjB+LG6QuU
-BTKp7zGJR7u+0fClzPPD0eNrB+Xm/EVxKiy974O3LxRtdM7f1Y+PajUVqEmCrfA8
-liI+dPkY6jYTEUJ5o8LqDH2gOs/p5xDeNllYxA2hcA4ap4RI3SVsKyyJHGLaLyjJ
-epclpLX4uwE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.twu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Texas Woman's University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Texas Woman's University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.twu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Kerry Williams</md:GivenName>
-    <md:EmailAddress>kwilliams1@twu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Svetlana Galuzinschii</md:GivenName>
-    <md:EmailAddress>sgaluzinschii@twu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Julie Muller</md:GivenName>
-    <md:EmailAddress>jmuller@twu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Svetlana Galuzinschii</md:GivenName>
-    <md:EmailAddress>sgaluzinschii@twu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 bb23ea8c..00000000
--- a/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.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://shibboleth.u-bourgogne.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Bourgogne</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABuklEQVQ4y72Sz2sTURDHP29/ZAlZGyMqogaxFENB6KV6UygIgqdeBE8eRcGDlIJHexUR8eYf4CngQWyL6EEUvHgwJ5U2YiFRqkKISXaTvLf7djzIQhXRQ2kHBma+zHznO8MoEWE75myre1cIvse8HKZ0jKWjUzpxQqenWTaWwwCIyD890tIQEdEmkeFYS24/xrIiInhPmtzvG4qZhTPHqFeKtFabLALM17iVKxmJ99x3uB4ZeRMWVFkppgAI5xYk91ctufF5IHN53h3LdK4gMvKpp6U+NonVJpHuWG6KCM7m07u1ykSY/O8WJZ/jEwUuBr7njIxNHMUmgBMWWPdcL8sLswzvbwR9TWNguKpTeuVS4AN3gN+L44SDr79waguk8kAgAjZSwQSAtWkAHkpEOH3tQfvDWvPon1Mr5T2jh0uXnbMzk8FWPMuEfqLu7Q1YcK8sLp2vTs/ue7z67CTA/IVz79c/bhxwXYfhSPtTR/Z7qbW0v3Vpfe3ydq2dmdKhFc+lPjBMqku3l9/N1qooFMXAJ9YGY1KG2uA6Dr1oxMyJKt1+TKlYwKZCYlPCYsCjF41fK+zoK+84wU8yPvqBB/K5mgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMSswMjowME/UPYgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDErMDI6MDA+iYU0AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.u-bourgogne.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Bourgogne</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>
-					      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>
-    </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-POST" Location="https://shibboleth.u-bourgogne.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.u-bourgogne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.u-bourgogne.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Bourgogne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Bourgogne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.u-bourgogne.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>shibboleth@u-bourgogne.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 7b1b08b4..00000000
--- a/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-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://shibboleth.u-grenoble3.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université  Stendhal - Grenoble 3</mdui:DisplayName>
-        <mdui:Logo height="16" width="15">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAPAAAAEACuRh2NAAABz0lEQVQoz5WRzWpTQRTHf2dmMvcmN21abxs0sQZRBBH8WAnizpfQh8gD1IVLHyBv4Kr4Crp278aNtkKsFLQLadp83Ll3ZlykbVqKtP7hMMPh/Ob8zxwZDAav+/3+pp9M9xGEyxSJulFfeb+1tWViw7b5vN389OR503ILLvACxONTcOzx+M0m8rTbMSI6UsyY8AvP0iVthYIfuMMRonrBzHMKjUGRXgprckTVgIA6O8xVFM/UqSsR/9B/wufdmcXVH8fJDy/K5TR3sst4Fo4ISyT3bgKBMJqB0UhtHmE8IxYe3cqodg6I8YJtjUkzdJrNDTiPeNA6QWlLdBWCOoeYhT2HpDVqrQydpaAUptVEZw3KPyNC6ZAgsPP1dKj5M8FTMiEWU5AA4rFryyTddfRSHaUD6fUcnRkq9gjV9Lhz6SG/RvvZS2o32hhbQ63mEAPF8DeynKHydYLWmLWU9otXJA/vg6sw0Tm406Xz7i1HkzH56iqzsqQYHdLaP2DcSJDOOsXRmKzZpNlooBILHz9gfFVZlNC5e/v8SkOk/PKNvNOGfOXixqsqEeBBr9d79HM4nNl6HTedoq1F1+tMvcNqi3YOAOcc3ns2Njbs7u7u97/He58iedZbTQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0MyswMjowMGGa1lEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDMrMDI6MDAQx27tAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.u-grenoble3.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université  Stendhal - Grenoble 3</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>
-					      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>
-    </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-POST" Location="https://shibboleth.u-grenoble3.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.u-grenoble3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.u-grenoble3.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université  Stendhal - Grenoble 3</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université  Stendhal - Grenoble 3</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.u-grenoble3.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Yoann MITAINE</md:SurName>
-    <md:EmailAddress>yoann.mitaine@u-grenoble3.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Nicolay DIMITROV</md:SurName>
-    <md:EmailAddress>nicolay.dimitrov@u-grenoble3.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uams.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uams.edu-idp-shibboleth.xml
deleted file mode 100644
index e527b867..00000000
--- a/swamid-interfederations-2.0/shibboleth.uams.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,122 +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://shibboleth.uams.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uams.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Arkansas for Medical Sciences</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>
-MIIF6DCCA9ACAQEwDQYJKoZIhvcNAQEFBQAwgbkxCzAJBgNVBAYTAlVTMREwDwYD
-VQQIEwhBcmthbnNhczEUMBIGA1UEBxMLTGl0dGxlIFJvY2sxNDAyBgNVBAoTK1Vu
-aXZlcnNpdHkgb2YgQXJrYW5zYXMgZm9yIE1lZGljYWwgU2NpZW5jZXMxCzAJBgNV
-BAsTAklUMRwwGgYDVQQDExNzaGliYm9sZXRoLnVhbXMuZWR1MSAwHgYJKoZIhvcN
-AQkBFhFrYXBvd2VsbEB1YW1zLmVkdTAeFw0xMDAxMjEyMDIwMTlaFw0yMDAxMTky
-MDIwMTlaMIG5MQswCQYDVQQGEwJVUzERMA8GA1UECBMIQXJrYW5zYXMxFDASBgNV
-BAcTC0xpdHRsZSBSb2NrMTQwMgYDVQQKEytVbml2ZXJzaXR5IG9mIEFya2Fuc2Fz
-IGZvciBNZWRpY2FsIFNjaWVuY2VzMQswCQYDVQQLEwJJVDEcMBoGA1UEAxMTc2hp
-YmJvbGV0aC51YW1zLmVkdTEgMB4GCSqGSIb3DQEJARYRa2Fwb3dlbGxAdWFtcy5l
-ZHUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD5Hc8JIuSngcQzhmkZ
-hjJy5R1d/7zlBNEHuBrHw21UE1y7lpVAJUAk1wDj4twxLjrkzTuWcClvr+8DU+ov
-Kvd8as3UmxcLtUdzpgDPGNggLyyNn5kdJP0Ds0eQ7RzIVMOq4tU87eL0TjIFY6Kg
-4898Now4GKkcb+D13d+a3mXWSUAi1HfnUtKoAwZIj1awc/P7C5lO+sq+rgB4+EAl
-TcjB+vS1puUbk+eKBLWfp4iQfwpmRVtTRhQT/fDxvvebbW/in2GoRUDLHsgkxLLk
-cIVPw965w3bek93EOj/nJeZ8FtGgByQhIONOyXWgLgIzSb6q+r0aO7cGYOeTD2fd
-ckJxFIu6lrk25pdWE7heUCwmFiOpG5i4Dn/Zyfbk5Mf2rrEOimzNLQGMXoXrSo2x
-w8Md5hQTa2hgkEhOAqYCYVeZEkpPJkj9yeYvnYF1pOvzRvUVbje93SV9Mp1Umt4A
-kmGR7PWBYnRO+ibspy5KTt2wZvwm8Nnz9FMa4KY93/HdS55OYPzUZ0U6J1Qb66Co
-jjD0/7DAKNWyP2rDxor1HAP94tYwkkM5N/nmGh7rp5/ky0UYN46dVruLozO6CvC0
-HL4Jv3oAByDM3mA9zEWUFnPLGSel87N6Bghp7y+NSbop6QxDThgKJom3BZdoFrRd
-IVpTEW1a4Bkx0n4/HN+wVSuaiQIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQAVSKZp
-WRiiI/GMwP8J1qLpPYps9GAg8K3SSamNTZjFb4Bx1U9BX2oVfhFzWUHlkEZ4I9Kn
-pHy1DoajsUMXGihIAW7nE4QB7Scg0/j72qWD8RTYJf45LOMmYjwaFzh6nx8ZW8nr
-jQFlZ3FZqrdxRlc09QGj+/1EAB8zsl1TwY5LLHKXmxrrzxgcjlEJQj5W1QsxY+cp
-qR7U2FTIUHWPYIuk32j+4D0cADEgSPRoWQvhQ4yv6ObXnnysmQyL80vMy4qWRkQW
-EZzValhP7+c1HlX/3ZFE5oyfa4MIArxQ2cD6wCxhGLauMOCAGkWw2OBSTsNrAQ9k
-Z5w7ZkB+dkZjTLbMpXEBEjInQraA6daFGpHn0XZWt0yUrPv8yuwrPZPEhCulnCwz
-jPT8ic+thGwdiyXVouxToFoDS+IHHhQXkH4tNTZSVK8g8do5V5mxSJLq2QiySAKj
-8HCKUSg+5YT9hghvD/DZg7AIG7x15WB7tguybmEZ0ZQTMbXfxW8++ennnMv0YB08
-0TcaZVLkzfGqpa7LViMTg+DMOxrbxDPyWwmJYIp1wctIwD/0Mt1GLO24SCpsL0Xi
-/oQmUfmngWJ89KOYIv/FBO1yVwq3LUuwc1bDS+6zYsmOTIdNTjl+HGmq07Nu5IEV
-5CGF3Xf3OCIcIPuFxeF6aJA+h9o82twJq3mwpw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uams.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uams.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uams.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uams.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uams.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIF6DCCA9ACAQEwDQYJKoZIhvcNAQEFBQAwgbkxCzAJBgNVBAYTAlVTMREwDwYD
-VQQIEwhBcmthbnNhczEUMBIGA1UEBxMLTGl0dGxlIFJvY2sxNDAyBgNVBAoTK1Vu
-aXZlcnNpdHkgb2YgQXJrYW5zYXMgZm9yIE1lZGljYWwgU2NpZW5jZXMxCzAJBgNV
-BAsTAklUMRwwGgYDVQQDExNzaGliYm9sZXRoLnVhbXMuZWR1MSAwHgYJKoZIhvcN
-AQkBFhFrYXBvd2VsbEB1YW1zLmVkdTAeFw0xMDAxMjEyMDIwMTlaFw0yMDAxMTky
-MDIwMTlaMIG5MQswCQYDVQQGEwJVUzERMA8GA1UECBMIQXJrYW5zYXMxFDASBgNV
-BAcTC0xpdHRsZSBSb2NrMTQwMgYDVQQKEytVbml2ZXJzaXR5IG9mIEFya2Fuc2Fz
-IGZvciBNZWRpY2FsIFNjaWVuY2VzMQswCQYDVQQLEwJJVDEcMBoGA1UEAxMTc2hp
-YmJvbGV0aC51YW1zLmVkdTEgMB4GCSqGSIb3DQEJARYRa2Fwb3dlbGxAdWFtcy5l
-ZHUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQD5Hc8JIuSngcQzhmkZ
-hjJy5R1d/7zlBNEHuBrHw21UE1y7lpVAJUAk1wDj4twxLjrkzTuWcClvr+8DU+ov
-Kvd8as3UmxcLtUdzpgDPGNggLyyNn5kdJP0Ds0eQ7RzIVMOq4tU87eL0TjIFY6Kg
-4898Now4GKkcb+D13d+a3mXWSUAi1HfnUtKoAwZIj1awc/P7C5lO+sq+rgB4+EAl
-TcjB+vS1puUbk+eKBLWfp4iQfwpmRVtTRhQT/fDxvvebbW/in2GoRUDLHsgkxLLk
-cIVPw965w3bek93EOj/nJeZ8FtGgByQhIONOyXWgLgIzSb6q+r0aO7cGYOeTD2fd
-ckJxFIu6lrk25pdWE7heUCwmFiOpG5i4Dn/Zyfbk5Mf2rrEOimzNLQGMXoXrSo2x
-w8Md5hQTa2hgkEhOAqYCYVeZEkpPJkj9yeYvnYF1pOvzRvUVbje93SV9Mp1Umt4A
-kmGR7PWBYnRO+ibspy5KTt2wZvwm8Nnz9FMa4KY93/HdS55OYPzUZ0U6J1Qb66Co
-jjD0/7DAKNWyP2rDxor1HAP94tYwkkM5N/nmGh7rp5/ky0UYN46dVruLozO6CvC0
-HL4Jv3oAByDM3mA9zEWUFnPLGSel87N6Bghp7y+NSbop6QxDThgKJom3BZdoFrRd
-IVpTEW1a4Bkx0n4/HN+wVSuaiQIDAQABMA0GCSqGSIb3DQEBBQUAA4ICAQAVSKZp
-WRiiI/GMwP8J1qLpPYps9GAg8K3SSamNTZjFb4Bx1U9BX2oVfhFzWUHlkEZ4I9Kn
-pHy1DoajsUMXGihIAW7nE4QB7Scg0/j72qWD8RTYJf45LOMmYjwaFzh6nx8ZW8nr
-jQFlZ3FZqrdxRlc09QGj+/1EAB8zsl1TwY5LLHKXmxrrzxgcjlEJQj5W1QsxY+cp
-qR7U2FTIUHWPYIuk32j+4D0cADEgSPRoWQvhQ4yv6ObXnnysmQyL80vMy4qWRkQW
-EZzValhP7+c1HlX/3ZFE5oyfa4MIArxQ2cD6wCxhGLauMOCAGkWw2OBSTsNrAQ9k
-Z5w7ZkB+dkZjTLbMpXEBEjInQraA6daFGpHn0XZWt0yUrPv8yuwrPZPEhCulnCwz
-jPT8ic+thGwdiyXVouxToFoDS+IHHhQXkH4tNTZSVK8g8do5V5mxSJLq2QiySAKj
-8HCKUSg+5YT9hghvD/DZg7AIG7x15WB7tguybmEZ0ZQTMbXfxW8++ennnMv0YB08
-0TcaZVLkzfGqpa7LViMTg+DMOxrbxDPyWwmJYIp1wctIwD/0Mt1GLO24SCpsL0Xi
-/oQmUfmngWJ89KOYIv/FBO1yVwq3LUuwc1bDS+6zYsmOTIdNTjl+HGmq07Nu5IEV
-5CGF3Xf3OCIcIPuFxeF6aJA+h9o82twJq3mwpw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uams.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Arkansas for Medical Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Arkansas for Medical Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uams.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Keith A. Powell</md:GivenName>
-    <md:EmailAddress>kapowell@uams.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Steve W. Cochran</md:GivenName>
-    <md:EmailAddress>CochranStephenW@uams.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uchastings.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uchastings.edu-idp-shibboleth.xml
deleted file mode 100644
index 4a211a30..00000000
--- a/swamid-interfederations-2.0/shibboleth.uchastings.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,95 +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://shibboleth.uchastings.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uchastings.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of California Hastings College of the Law</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>
-MIIDTzCCAjegAwIBAgIULgOAs/Tf+A5icFcGA4Rhib2qyiIwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC51Y2hhc3RpbmdzLmVkdTAeFw0xMjEx
-MjAwMjUzMTRaFw0zMjExMjAwMjUzMTRaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
-dWNoYXN0aW5ncy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCI
-3hbJpnF1jSXmIkYcgbkQihqtmY9kdeKweWZlnUq/9nGMDig7EEurRci7DPVf4an9
-nNqaFO9SnfXjkcK50XUlojtQReKu2y9XEtqP2bpb24NPeJZVC5lGKo14USBtXLQs
-h4SMipV2p9JbhgVVBoc5HK/+XN+ceSUJdQWDAGOb/plSBnT3Xpr5yEg88kiG+Ogl
-PawAqXBcTf7GX5pcIdRaivnCCVuMs1jdtjlOOZrm3jNpQ9lLluUjzlTJeQEaKdSp
-8lNhPXGYOK+nvjzzz7Q4WjhCOzBvJEQ65j7rG7xv67BPJaq/Z39NblYOorPyHyg0
-8bwyxTmByXDsv89GsAFNAgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgu
-dWNoYXN0aW5ncy5lZHWGMGh0dHBzOi8vc2hpYmJvbGV0aC51Y2hhc3RpbmdzLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1AIdyJ3tLG0jtHse7Et6r/0wHHAw
-DQYJKoZIhvcNAQEFBQADggEBAF/MjsAp1CUH0HHW/IFm2RaYFkkTDTpsYgkiK9nR
-9lO0uBTLMPb4OAUSh0lWLCHGDI3XGcs88eOgrfUfMeEF0ZSzG5Re0XrdpdRr+08R
-uvwMOAkOffYOyj+QKnZ8Rc2wJ3lNjC4XJXDUAPms5KhKBcvS3OKdv9j4UIMZLihL
-lrY2fAeErFDqKpITwtKShev1mjxe/XdvgkWhSudryLi6KAiXZVAI58YJjDvnenXq
-cNfywjmUvtBaLs4PBLUGOdECvQ9b/yAV4OrVAkQhJmv2Qa8SRVCLVzhs9pui8DlJ
-Bd22SCSfMLz0OSX/8PQPqMyFNzt+pG3rP4r+8yHg/8wjgtE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uchastings.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uchastings.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uchastings.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uchastings.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uchastings.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uchastings.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTzCCAjegAwIBAgIULgOAs/Tf+A5icFcGA4Rhib2qyiIwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC51Y2hhc3RpbmdzLmVkdTAeFw0xMjEx
-MjAwMjUzMTRaFw0zMjExMjAwMjUzMTRaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
-dWNoYXN0aW5ncy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCI
-3hbJpnF1jSXmIkYcgbkQihqtmY9kdeKweWZlnUq/9nGMDig7EEurRci7DPVf4an9
-nNqaFO9SnfXjkcK50XUlojtQReKu2y9XEtqP2bpb24NPeJZVC5lGKo14USBtXLQs
-h4SMipV2p9JbhgVVBoc5HK/+XN+ceSUJdQWDAGOb/plSBnT3Xpr5yEg88kiG+Ogl
-PawAqXBcTf7GX5pcIdRaivnCCVuMs1jdtjlOOZrm3jNpQ9lLluUjzlTJeQEaKdSp
-8lNhPXGYOK+nvjzzz7Q4WjhCOzBvJEQ65j7rG7xv67BPJaq/Z39NblYOorPyHyg0
-8bwyxTmByXDsv89GsAFNAgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgu
-dWNoYXN0aW5ncy5lZHWGMGh0dHBzOi8vc2hpYmJvbGV0aC51Y2hhc3RpbmdzLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1AIdyJ3tLG0jtHse7Et6r/0wHHAw
-DQYJKoZIhvcNAQEFBQADggEBAF/MjsAp1CUH0HHW/IFm2RaYFkkTDTpsYgkiK9nR
-9lO0uBTLMPb4OAUSh0lWLCHGDI3XGcs88eOgrfUfMeEF0ZSzG5Re0XrdpdRr+08R
-uvwMOAkOffYOyj+QKnZ8Rc2wJ3lNjC4XJXDUAPms5KhKBcvS3OKdv9j4UIMZLihL
-lrY2fAeErFDqKpITwtKShev1mjxe/XdvgkWhSudryLi6KAiXZVAI58YJjDvnenXq
-cNfywjmUvtBaLs4PBLUGOdECvQ9b/yAV4OrVAkQhJmv2Qa8SRVCLVzhs9pui8DlJ
-Bd22SCSfMLz0OSX/8PQPqMyFNzt+pG3rP4r+8yHg/8wjgtE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uchastings.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California Hastings College of the Law</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California Hastings College of the Law</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uchastings.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ronald Proschan</md:GivenName>
-    <md:EmailAddress>proschan@uchastings.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ronald Proschan</md:GivenName>
-    <md:EmailAddress>proschan@uchastings.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uconn.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uconn.edu-idp-shibboleth.xml
deleted file mode 100644
index 8eaa576d..00000000
--- a/swamid-interfederations-2.0/shibboleth.uconn.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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://shibboleth.uconn.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uconn.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Connecticut</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>
-MIIDPDCCAiSgAwIBAgIVAM0bjDh08PO/4qtkatg7X4k6+BN1MA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGgudWNvbm4uZWR1MB4XDTExMTIwNzE2
-MTIzMFoXDTMxMTIwNzE2MTIzMFowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC51Y29u
-bi5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAqGjMJ07oRFxk
-esd2xSZmYBtBth7KiGzou8rHdMQ+heGKU3BwIpWtirCNONmClq6A0tFrYfhyF+8W
-q8XLtVjrn3QXmbie09QYrvqj46kr8CiQ0aMGuIB3l8/pDMG8WVwOAUgSY3ffMSrL
-O/j1yg6IgiIT3Gf0MNgyj5G7qHKGWfFL4uw1BaRX08BOfmgFBDBdrSPKpLNoKw9z
-btjt/ytPxKMl4+cQ3jBxKQAK5unOT5Cmhc0tLmUBMFs0cWEkZPwX3HkuVoYVx8Vu
-0Zeb0keEByRO3j055oHTHtvdu6P03ThC8N2mOGOumSPn4v6enHEy5bZmE+VflfZi
-LKlv32tDAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGgudWNvbm4uZWR1
-hitodHRwczovL3NoaWJib2xldGgudWNvbm4uZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBSkRSc23CRBgycmRtZEAQnbW6I2fjANBgkqhkiG9w0BAQUFAAOCAQEA
-RIWT9lvMkliN3McoYMKi44BBnd6oxGbJtioZdDr2xZZ2GQfdijtR5YcflA4BwF27
-GetQ2pzGIX5O28jgjxYv6GjNY389+CxucT9pHRvO3tEkdY8GAJOFi06nDGtGcsS+
-txkM8CItNzbEG962C3c85A5GwX/y4OtmiAe4EkScPAYYaKiNnuf3KvAlOw0ZiqZ3
-SPGQ7Db04FPcLLncNwkIeT0h235ZPOo6wM0Utwa6e+n2hhV4AVKj/r4U/F6CAPuC
-+7lvO1Xvsty0e7ruYk84+USBla8u5Iq8tJokQk8dboLLJQViygVpiVdS6oCwZDG7
-K1bUJ0l1vnaNfRNJ/rLFgg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uconn.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uconn.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uconn.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uconn.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uconn.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uconn.edu/idp/profile/SAML2/POST-SimpleSign/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">uconn.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAM0bjDh08PO/4qtkatg7X4k6+BN1MA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGgudWNvbm4uZWR1MB4XDTExMTIwNzE2
-MTIzMFoXDTMxMTIwNzE2MTIzMFowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC51Y29u
-bi5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAqGjMJ07oRFxk
-esd2xSZmYBtBth7KiGzou8rHdMQ+heGKU3BwIpWtirCNONmClq6A0tFrYfhyF+8W
-q8XLtVjrn3QXmbie09QYrvqj46kr8CiQ0aMGuIB3l8/pDMG8WVwOAUgSY3ffMSrL
-O/j1yg6IgiIT3Gf0MNgyj5G7qHKGWfFL4uw1BaRX08BOfmgFBDBdrSPKpLNoKw9z
-btjt/ytPxKMl4+cQ3jBxKQAK5unOT5Cmhc0tLmUBMFs0cWEkZPwX3HkuVoYVx8Vu
-0Zeb0keEByRO3j055oHTHtvdu6P03ThC8N2mOGOumSPn4v6enHEy5bZmE+VflfZi
-LKlv32tDAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGgudWNvbm4uZWR1
-hitodHRwczovL3NoaWJib2xldGgudWNvbm4uZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBSkRSc23CRBgycmRtZEAQnbW6I2fjANBgkqhkiG9w0BAQUFAAOCAQEA
-RIWT9lvMkliN3McoYMKi44BBnd6oxGbJtioZdDr2xZZ2GQfdijtR5YcflA4BwF27
-GetQ2pzGIX5O28jgjxYv6GjNY389+CxucT9pHRvO3tEkdY8GAJOFi06nDGtGcsS+
-txkM8CItNzbEG962C3c85A5GwX/y4OtmiAe4EkScPAYYaKiNnuf3KvAlOw0ZiqZ3
-SPGQ7Db04FPcLLncNwkIeT0h235ZPOo6wM0Utwa6e+n2hhV4AVKj/r4U/F6CAPuC
-+7lvO1Xvsty0e7ruYk84+USBla8u5Iq8tJokQk8dboLLJQViygVpiVdS6oCwZDG7
-K1bUJ0l1vnaNfRNJ/rLFgg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uconn.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uconn.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Connecticut</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Connecticut</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uconn.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marc Jones</md:GivenName>
-    <md:EmailAddress>marc.jones@uconn.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Marc Jones</md:GivenName>
-    <md:EmailAddress>marc.jones@uconn.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Help Center</md:GivenName>
-    <md:EmailAddress>helpcenter@uconn.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Information Security</md:GivenName>
-    <md:EmailAddress>security@uconn.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml
deleted file mode 100644
index 4814b432..00000000
--- a/swamid-interfederations-2.0/shibboleth.ucs.org.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ucs.org.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for University College School.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-27T12:19:58Z">
-      <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 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">ucs.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUXs62jEnH5FsW4cjbIFYDsu/rYeUwDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mub3JnLnVrMB4XDTE1MTAyNzA3
-						NTkxN1oXDTM1MTAyNzA2NTkxN1owIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mu
-						b3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkEWdF/SA6DAl
-						o2IOEgyXVX2mBGHEDDGuhl1smegJjxwo0Ys47OL8n2/9QdzAO5u3ByhdcF37S5Wa
-						Col14nxdz/TM5iqOQjQnYEC4XQ8ZUMxuC/aHrw5786R6wNnxVBtxhNMRd2tzdJ4R
-						PWqBkdJXLCm72S79aOKF2akyj1Ieg0z4ZvV/DvAkZxxlwZm2q8o+JEDNfJsvk9p4
-						PhwpR3PzOETNCMLPnQx1YHBFEW0KOtZG8b2Auf0CsaXsRcw3zqGzIjvmTqHie3bO
-						DIIrR/L4EMc5xafB58J3NVvnwqGvqidv4spfvS5hE2b8JQCtXHuEf7Xj0ncLtSsl
-						8h+yzePBXQIDAQABo3EwbzAdBgNVHQ4EFgQUAdHMNEvYUBJ4lyohJ6WpEifDkeEw
-						TgYDVR0RBEcwRYIVc2hpYmJvbGV0aC51Y3Mub3JnLnVrhixodHRwczovL3NoaWJi
-						b2xldGgudWNzLm9yZy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAMe+dycc8L+gL30bOi/6DmIuKj4zS94Br/Yh8y0FL64ike3uBCn5+UlRsV35D
-						m9xSY+tjxZlLMovzE9xE22yhO4vK7gx364dGtQ6PoitAzzbXDpbsGkDzhYxBGEF/
-						xKLQvUfSIRvDGCgf0EgKshAipP2TdPA84SIUEHCkIXXwtNz6tz4La/KYr1wOkrML
-						gbiqIyN2gkFwA9btTvSpnARzgfduOvh0WmipFDmTGsMKAxX/nLedA/sjKnu2vAmH
-						y9uFaB1FlLq7QvRs9Nqqos8621+YaSci+fS3lJbSoQM8UKwolsl3DNcPh4QtOOBT
-						zs3XPrEtTuaOzNRQRXwFfO0baA==
-					</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>
-						MIIDQDCCAiigAwIBAgIVAK5lpCtEt0YEj/CJZgaG7dPZIw7xMA0GCSqGSIb3DQEB
-						CwUAMCAxHjAcBgNVBAMMFXNoaWJib2xldGgudWNzLm9yZy51azAeFw0xNTEwMjcw
-						NzU5MTZaFw0zNTEwMjcwNjU5MTZaMCAxHjAcBgNVBAMMFXNoaWJib2xldGgudWNz
-						Lm9yZy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2U2LzuslPT
-						fJ2Ezm2NcS9DyCJMPfSbTUJnoFraUW4mcwW0m0dn0ryaLGYMNNJzEn1Tv7ClhD0W
-						Y0JoKrVO1o9k+qZYpZAfh9bUayuL7eqv49+Z8vincc0mZ3JdHrIfny28Z+MIIdTd
-						kGMMFHujprfdc8fhGmCShgqzzH4F8qQPwlY0L+afT/nUxDECj5H1Qf3GWSg2u8UV
-						AotnbeGbWRY9O0cbvMXRirpry1dzMYTDIEAsylaUUepooX9PMGQhDUjmqxUnzf4H
-						DhwvOBPu/5/gW7onYp10l71arOGyPxnBLvFnRqipGV7+on8SFNDP2uVvfk1UfTCO
-						Wz409p3So6UCAwEAAaNxMG8wHQYDVR0OBBYEFG3JTHabDX4l7zWK933Gyowb3UGe
-						ME4GA1UdEQRHMEWCFXNoaWJib2xldGgudWNzLm9yZy51a4YsaHR0cHM6Ly9zaGli
-						Ym9sZXRoLnVjcy5vcmcudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-						ggEBAE12AL3ypSOjL6vtnH0Kj+QBuHDl/G/m7CJUaRpk6d7uJ97nRSfrBNV/RAFi
-						0KJWolJ3x543MjhdbNhog8Lpc3jPvLUl3Lbw1efqgRDO/6JyAYtoQoykr++WDQh7
-						vyA+26N3nkWJRbIkkCJG4Z+Cy6epAH1eNbiDCEYT2qS+Cx2Z1nuwRKB1VfWxtsBl
-						pQhU9N0kWcgV8b1hBkeaGYiEoGNqRgZKdXscegcllvz3h73EnicmNk11jVcFbAfV
-						iw8/udM/e21y7rZAThdDQn6RfrEkdcfKHEt4mhT9sltGkj47/ijjJoO4SLIMn2gy
-						7x54O572tP8flTqE+GyCEuwQj0w=
-					</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>
-						MIIDPzCCAiegAwIBAgIUAdfxtpW8SR/vWxMYD8AA9FJnV9AwDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mub3JnLnVrMB4XDTE1MTAyNzA3
-						NTkxN1oXDTM1MTAyNzA2NTkxN1owIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mu
-						b3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmgoO4GAHQGFL
-						FiLCtVDpODWZdcJ7PolpjigT5pPVe4YcU7C9yCIO695i67amSYoI9gF2iL+5vHO6
-						QBMdJhTo9hI3/vtMcXt8ycOE9iIAwxryn0Weeul74qtjSrwjcyysmqb6BReZGikh
-						i/Ay0rGCsQbZHTPmSDXGgU5FYTi5Kb5rVS4SHJVJTNujCOgj8Ezgxk/sEMWp+v6e
-						DIcaGeJgOK71wB8ZGFsixwU3HE1Goqv+W8wfk58jX82sYa8mNNBWX7yTS3cgmAfr
-						q17KWun9GuZ5YnASZ/aOSf8tazRLwaBWAPF4wolBmmdyi8EkZkPcMxgsCLp+GmRf
-						RdZafD89QQIDAQABo3EwbzAdBgNVHQ4EFgQUuvSPDirxARyNoaZFPw9bAZuQSwww
-						TgYDVR0RBEcwRYIVc2hpYmJvbGV0aC51Y3Mub3JnLnVrhixodHRwczovL3NoaWJi
-						b2xldGgudWNzLm9yZy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAA1edyj4I4+zqlc5lImXyAQe4NLB9qMZVo0clUImKLEXFoozyG9tv495wId5Q
-						WREgtkJd0bDkv1+GkGgcwkFeV488BXWx8jG7uQ9SdpOuE3nPacWLzUZnbX9Ate+F
-						VZjXx5XFCf9ITAyKfAj8Ap+bvoDSopHOX04x4yu/6UvpQzuTC33rui0w2dlihOXQ
-						tHd9tqg7XEq55EVB0B4ahXU4EGpflBhPo7uY2bmO5b6aoCcGCMEPRdkxXyg+2m4J
-						itkouztW7o137ACQFkenM95VyKqQm5/dBdQ71j0XR2ZKCypd6n2aa5HlVfAsa9R5
-						pI6zE5tbN6oDkV62/80Ft22n6A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucs.org.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ucs.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://shibboleth.ucs.org.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ucs.org.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ucs.org.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ucs.org.uk/idp/profile/SAML2/Redirect/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">ucs.org.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUXs62jEnH5FsW4cjbIFYDsu/rYeUwDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mub3JnLnVrMB4XDTE1MTAyNzA3
-						NTkxN1oXDTM1MTAyNzA2NTkxN1owIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mu
-						b3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkEWdF/SA6DAl
-						o2IOEgyXVX2mBGHEDDGuhl1smegJjxwo0Ys47OL8n2/9QdzAO5u3ByhdcF37S5Wa
-						Col14nxdz/TM5iqOQjQnYEC4XQ8ZUMxuC/aHrw5786R6wNnxVBtxhNMRd2tzdJ4R
-						PWqBkdJXLCm72S79aOKF2akyj1Ieg0z4ZvV/DvAkZxxlwZm2q8o+JEDNfJsvk9p4
-						PhwpR3PzOETNCMLPnQx1YHBFEW0KOtZG8b2Auf0CsaXsRcw3zqGzIjvmTqHie3bO
-						DIIrR/L4EMc5xafB58J3NVvnwqGvqidv4spfvS5hE2b8JQCtXHuEf7Xj0ncLtSsl
-						8h+yzePBXQIDAQABo3EwbzAdBgNVHQ4EFgQUAdHMNEvYUBJ4lyohJ6WpEifDkeEw
-						TgYDVR0RBEcwRYIVc2hpYmJvbGV0aC51Y3Mub3JnLnVrhixodHRwczovL3NoaWJi
-						b2xldGgudWNzLm9yZy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAMe+dycc8L+gL30bOi/6DmIuKj4zS94Br/Yh8y0FL64ike3uBCn5+UlRsV35D
-						m9xSY+tjxZlLMovzE9xE22yhO4vK7gx364dGtQ6PoitAzzbXDpbsGkDzhYxBGEF/
-						xKLQvUfSIRvDGCgf0EgKshAipP2TdPA84SIUEHCkIXXwtNz6tz4La/KYr1wOkrML
-						gbiqIyN2gkFwA9btTvSpnARzgfduOvh0WmipFDmTGsMKAxX/nLedA/sjKnu2vAmH
-						y9uFaB1FlLq7QvRs9Nqqos8621+YaSci+fS3lJbSoQM8UKwolsl3DNcPh4QtOOBT
-						zs3XPrEtTuaOzNRQRXwFfO0baA==
-					</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>
-						MIIDQDCCAiigAwIBAgIVAK5lpCtEt0YEj/CJZgaG7dPZIw7xMA0GCSqGSIb3DQEB
-						CwUAMCAxHjAcBgNVBAMMFXNoaWJib2xldGgudWNzLm9yZy51azAeFw0xNTEwMjcw
-						NzU5MTZaFw0zNTEwMjcwNjU5MTZaMCAxHjAcBgNVBAMMFXNoaWJib2xldGgudWNz
-						Lm9yZy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2U2LzuslPT
-						fJ2Ezm2NcS9DyCJMPfSbTUJnoFraUW4mcwW0m0dn0ryaLGYMNNJzEn1Tv7ClhD0W
-						Y0JoKrVO1o9k+qZYpZAfh9bUayuL7eqv49+Z8vincc0mZ3JdHrIfny28Z+MIIdTd
-						kGMMFHujprfdc8fhGmCShgqzzH4F8qQPwlY0L+afT/nUxDECj5H1Qf3GWSg2u8UV
-						AotnbeGbWRY9O0cbvMXRirpry1dzMYTDIEAsylaUUepooX9PMGQhDUjmqxUnzf4H
-						DhwvOBPu/5/gW7onYp10l71arOGyPxnBLvFnRqipGV7+on8SFNDP2uVvfk1UfTCO
-						Wz409p3So6UCAwEAAaNxMG8wHQYDVR0OBBYEFG3JTHabDX4l7zWK933Gyowb3UGe
-						ME4GA1UdEQRHMEWCFXNoaWJib2xldGgudWNzLm9yZy51a4YsaHR0cHM6Ly9zaGli
-						Ym9sZXRoLnVjcy5vcmcudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-						ggEBAE12AL3ypSOjL6vtnH0Kj+QBuHDl/G/m7CJUaRpk6d7uJ97nRSfrBNV/RAFi
-						0KJWolJ3x543MjhdbNhog8Lpc3jPvLUl3Lbw1efqgRDO/6JyAYtoQoykr++WDQh7
-						vyA+26N3nkWJRbIkkCJG4Z+Cy6epAH1eNbiDCEYT2qS+Cx2Z1nuwRKB1VfWxtsBl
-						pQhU9N0kWcgV8b1hBkeaGYiEoGNqRgZKdXscegcllvz3h73EnicmNk11jVcFbAfV
-						iw8/udM/e21y7rZAThdDQn6RfrEkdcfKHEt4mhT9sltGkj47/ijjJoO4SLIMn2gy
-						7x54O572tP8flTqE+GyCEuwQj0w=
-					</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>
-						MIIDPzCCAiegAwIBAgIUAdfxtpW8SR/vWxMYD8AA9FJnV9AwDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mub3JnLnVrMB4XDTE1MTAyNzA3
-						NTkxN1oXDTM1MTAyNzA2NTkxN1owIDEeMBwGA1UEAwwVc2hpYmJvbGV0aC51Y3Mu
-						b3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmgoO4GAHQGFL
-						FiLCtVDpODWZdcJ7PolpjigT5pPVe4YcU7C9yCIO695i67amSYoI9gF2iL+5vHO6
-						QBMdJhTo9hI3/vtMcXt8ycOE9iIAwxryn0Weeul74qtjSrwjcyysmqb6BReZGikh
-						i/Ay0rGCsQbZHTPmSDXGgU5FYTi5Kb5rVS4SHJVJTNujCOgj8Ezgxk/sEMWp+v6e
-						DIcaGeJgOK71wB8ZGFsixwU3HE1Goqv+W8wfk58jX82sYa8mNNBWX7yTS3cgmAfr
-						q17KWun9GuZ5YnASZ/aOSf8tazRLwaBWAPF4wolBmmdyi8EkZkPcMxgsCLp+GmRf
-						RdZafD89QQIDAQABo3EwbzAdBgNVHQ4EFgQUuvSPDirxARyNoaZFPw9bAZuQSwww
-						TgYDVR0RBEcwRYIVc2hpYmJvbGV0aC51Y3Mub3JnLnVrhixodHRwczovL3NoaWJi
-						b2xldGgudWNzLm9yZy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAA1edyj4I4+zqlc5lImXyAQe4NLB9qMZVo0clUImKLEXFoozyG9tv495wId5Q
-						WREgtkJd0bDkv1+GkGgcwkFeV488BXWx8jG7uQ9SdpOuE3nPacWLzUZnbX9Ate+F
-						VZjXx5XFCf9ITAyKfAj8Ap+bvoDSopHOX04x4yu/6UvpQzuTC33rui0w2dlihOXQ
-						tHd9tqg7XEq55EVB0B4ahXU4EGpflBhPo7uY2bmO5b6aoCcGCMEPRdkxXyg+2m4J
-						itkouztW7o137ACQFkenM95VyKqQm5/dBdQ71j0XR2ZKCypd6n2aa5HlVfAsa9R5
-						pI6zE5tbN6oDkV62/80Ft22n6A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucs.org.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University College School</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University College School</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ucs.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Matthew</GivenName>
-    <SurName>Meilack</SurName>
-    <EmailAddress>mailto:matt.meilack@ucs.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Meilack</SurName>
-    <EmailAddress>mailto:matt.meilack@ucs.org.uk</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 2444a21f..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ufsc.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ufsc.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ufsc.br/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">ufsc.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML1/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">UFSC - Universidade Federal de Santa Catarina</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufsc.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufsc.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Marcio Clemes</md:SurName>
-    <md:EmailAddress>marcio@npd.ufsc.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ufsc.br.xml b/swamid-interfederations-2.0/shibboleth.ufsc.br.xml
deleted file mode 100644
index e3b503b8..00000000
--- a/swamid-interfederations-2.0/shibboleth.ufsc.br.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://shibboleth.ufsc.br/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ufsc.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UFSC - Universidade Federal de Santa Catarina</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ufsc.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ufsc.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIESzCCAzOgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxDELMAkGA1UEBhMCQlIx
-FzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMRYwFAYDVQQHEw1GbG9yaWFub3BvbGlz
-MTYwNAYDVQQKEy1VRlNDIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgU2FudGEg
-Q2F0YXJpbmExLzAtBgNVBAsTJk5QRCAtIE51Y2xlbyBkZSBQcm9jZXNzYW1lbnRv
-IGRlIERhZG9zMRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwHhcNMTAwNTAy
-MTUyNTQzWhcNMTMwNTAxMTUyNTQzWjCBxDELMAkGA1UEBhMCQlIxFzAVBgNVBAgT
-DlNhbnRhIENhdGFyaW5hMRYwFAYDVQQHEw1GbG9yaWFub3BvbGlzMTYwNAYDVQQK
-Ey1VRlNDIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgU2FudGEgQ2F0YXJpbmEx
-LzAtBgNVBAsTJk5QRCAtIE51Y2xlbyBkZSBQcm9jZXNzYW1lbnRvIGRlIERhZG9z
-MRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC/oBIF0VeleZ37F3PzefDHAIrgwIaN2aRyLzZ4Uv8/FYsW
-LIXeOxXr49qJ77jFFkv/UzXZJvLvb6yhKC0A18E+ZDcKSQZuYoG8Arx+ohPREI82
-4htm1uAwGAw/SUsDVTgFodHOmIOmal71f6sorCKb1GeBkDkpkSYyYXG3t7fktVY7
-41kqaPcGellMrccwKztjFs31GvNLNZCpLOpF3lLmmpDApOaFO1f9qbSKv0GZPYPm
-/8NxE+4wJMUVHzExCpn/YV0rBd4DfNhU4LJGx6yYQCe+Rj6Uu9vL3AHcBU5kPT/g
-gxte+CDsQADIoYct8oPPDsZa4ezejgh1+XbTcqTzAgMBAAGjRjBEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgWgMCoGA1UdJQQjMCEGCCsGAQUFBwMBBglghkgBhvhCBAEG
-CisGAQQBgjcKAwMwDQYJKoZIhvcNAQEFBQADggEBABDXKoRWo0mR3SNv98le5NbN
-0QeuL52xlm51qmhWHKCT0ph0AmfDO4LdG/o1oPrtZup34/7BBRKHifuvluknH2DW
-dD9JhriTxsCsw/6Q5UtkQ2ZL40eic2VKk7LKsv8WsVq0Dddfz9aQVAmqnAExKLux
-YY+Hd0263kpDiu/0yEiT4G/3RPhKAmtib08Muc5FPQfIjM/IpF0OydhKYLCPQhtQ
-+0L6xe7VreHsP/n9EoGQ/2hZty+D4k2myZ/ypZH00jSs4+0cVysLZGKbRp481nOn
-utYTuLXJ0VDcCFf3RMwNYDCkW9k160NOZIap3RGIftCo2KR12TlxIE0+McltbGQ=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ufsc.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ufsc.br/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ufsc.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIESzCCAzOgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxDELMAkGA1UEBhMCQlIx
-FzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMRYwFAYDVQQHEw1GbG9yaWFub3BvbGlz
-MTYwNAYDVQQKEy1VRlNDIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgU2FudGEg
-Q2F0YXJpbmExLzAtBgNVBAsTJk5QRCAtIE51Y2xlbyBkZSBQcm9jZXNzYW1lbnRv
-IGRlIERhZG9zMRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwHhcNMTAwNTAy
-MTUyNTQzWhcNMTMwNTAxMTUyNTQzWjCBxDELMAkGA1UEBhMCQlIxFzAVBgNVBAgT
-DlNhbnRhIENhdGFyaW5hMRYwFAYDVQQHEw1GbG9yaWFub3BvbGlzMTYwNAYDVQQK
-Ey1VRlNDIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZGUgU2FudGEgQ2F0YXJpbmEx
-LzAtBgNVBAsTJk5QRCAtIE51Y2xlbyBkZSBQcm9jZXNzYW1lbnRvIGRlIERhZG9z
-MRswGQYDVQQDExJzaGliYm9sZXRoLnVmc2MuYnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC/oBIF0VeleZ37F3PzefDHAIrgwIaN2aRyLzZ4Uv8/FYsW
-LIXeOxXr49qJ77jFFkv/UzXZJvLvb6yhKC0A18E+ZDcKSQZuYoG8Arx+ohPREI82
-4htm1uAwGAw/SUsDVTgFodHOmIOmal71f6sorCKb1GeBkDkpkSYyYXG3t7fktVY7
-41kqaPcGellMrccwKztjFs31GvNLNZCpLOpF3lLmmpDApOaFO1f9qbSKv0GZPYPm
-/8NxE+4wJMUVHzExCpn/YV0rBd4DfNhU4LJGx6yYQCe+Rj6Uu9vL3AHcBU5kPT/g
-gxte+CDsQADIoYct8oPPDsZa4ezejgh1+XbTcqTzAgMBAAGjRjBEMAkGA1UdEwQC
-MAAwCwYDVR0PBAQDAgWgMCoGA1UdJQQjMCEGCCsGAQUFBwMBBglghkgBhvhCBAEG
-CisGAQQBgjcKAwMwDQYJKoZIhvcNAQEFBQADggEBABDXKoRWo0mR3SNv98le5NbN
-0QeuL52xlm51qmhWHKCT0ph0AmfDO4LdG/o1oPrtZup34/7BBRKHifuvluknH2DW
-dD9JhriTxsCsw/6Q5UtkQ2ZL40eic2VKk7LKsv8WsVq0Dddfz9aQVAmqnAExKLux
-YY+Hd0263kpDiu/0yEiT4G/3RPhKAmtib08Muc5FPQfIjM/IpF0OydhKYLCPQhtQ
-+0L6xe7VreHsP/n9EoGQ/2hZty+D4k2myZ/ypZH00jSs4+0cVysLZGKbRp481nOn
-utYTuLXJ0VDcCFf3RMwNYDCkW9k160NOZIap3RGIftCo2KR12TlxIE0+McltbGQ=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ufsc.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UFSC - Universidade Federal de Santa Catarina</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UFSC - Universidade Federal de Santa Catarina</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ufsc.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ufsc.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Marcio Clemes</SurName>
-    <EmailAddress>marcio@npd.ufsc.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uic.edu-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uic.edu-shibboleth.xml
deleted file mode 100644
index a7d137a6..00000000
--- a/swamid-interfederations-2.0/shibboleth.uic.edu-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://shibboleth.uic.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shibboleth.uic.edu/idp/error.jsp" 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">uic.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Illinois at Chicago</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>
-MIIDOzCCAiOgAwIBAgIJAMnh1KsacvUeMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnNoaWJib2xldGgudWljLmVkdTAeFw0xMTA3MTgxNjQzNDdaFw0yMTA3MTUx
-NjQzNDdaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudWljLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK/LA9eioSPqX+ipdmNMyZerjyPhPWBiem4f
-piOGnBiua76pGvvujhlaPnWT3YfwFWLpKKuPt0nBgk8SC9PTlP2oubVqF9FIFA5O
-UHtAj3nrkXNCu67HLzaW8ClGwCwdImCcTnXXhp1c8iVcRjp2r+DcxjYHpXLyT3o8
-8BmWnGJX8fCo8gtnVukc6Xv+J+gSOFRmCnvbkBkeiALNn3lkJgdvdJhAHE+OcRg1
-4kEmt3/mxOENVouRMi505ez4hMH4iR3fvD3w+1rGKtrNYCBrvagqUSZ2fBF3k6tG
-TQfzNswoGiSrLAkrMZ+N8qjkC/hdQNj4t48uKzEUYvcka7x5q2sCAwEAAaN+MHww
-HQYDVR0OBBYEFPCmz0jymFskc2beyFTMGZ8F7ERVME0GA1UdIwRGMESAFPCmz0jy
-mFskc2beyFTMGZ8F7ERVoSGkHzAdMRswGQYDVQQDExJzaGliYm9sZXRoLnVpYy5l
-ZHWCCQDJ4dSrGnL1HjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBY
-WrbjYC+bfwb1gPCchi0vil5x92avIJjQv/AOIT5xp9vmg6km429KXD5BoI32tf7i
-SgmwOllxtLGLE8j7EKZwcVcm3JYo5PIVzWX8yI2q2UpUZKFryoS/KFUoolDN1bNQ
-RnrLeO1Pwy7i93H8mnLGBa/S0+pcjEitKdC+VGEw+i+ZVVBCZMsyggzLK8KIrJPr
-I7vNFfld6a9DYkGUK59mwUwfVU1syUk0Eht25bNa4wKkWGf4OYV83x36xWMyN2Yy
-9fvlUHzM13HdEFvfPytJ2z1wpDUVZaGJ5LWb13cSpTZ2yEyllrRW8we9Paoac8js
-Ej+l4a6PybN1ttx/R08j
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uic.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uic.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uic.edu/shibboleth-idp/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uic.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uic.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uic.edu/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">uic.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIJAMnh1KsacvUeMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnNoaWJib2xldGgudWljLmVkdTAeFw0xMTA3MTgxNjQzNDdaFw0yMTA3MTUx
-NjQzNDdaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudWljLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK/LA9eioSPqX+ipdmNMyZerjyPhPWBiem4f
-piOGnBiua76pGvvujhlaPnWT3YfwFWLpKKuPt0nBgk8SC9PTlP2oubVqF9FIFA5O
-UHtAj3nrkXNCu67HLzaW8ClGwCwdImCcTnXXhp1c8iVcRjp2r+DcxjYHpXLyT3o8
-8BmWnGJX8fCo8gtnVukc6Xv+J+gSOFRmCnvbkBkeiALNn3lkJgdvdJhAHE+OcRg1
-4kEmt3/mxOENVouRMi505ez4hMH4iR3fvD3w+1rGKtrNYCBrvagqUSZ2fBF3k6tG
-TQfzNswoGiSrLAkrMZ+N8qjkC/hdQNj4t48uKzEUYvcka7x5q2sCAwEAAaN+MHww
-HQYDVR0OBBYEFPCmz0jymFskc2beyFTMGZ8F7ERVME0GA1UdIwRGMESAFPCmz0jy
-mFskc2beyFTMGZ8F7ERVoSGkHzAdMRswGQYDVQQDExJzaGliYm9sZXRoLnVpYy5l
-ZHWCCQDJ4dSrGnL1HjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBY
-WrbjYC+bfwb1gPCchi0vil5x92avIJjQv/AOIT5xp9vmg6km429KXD5BoI32tf7i
-SgmwOllxtLGLE8j7EKZwcVcm3JYo5PIVzWX8yI2q2UpUZKFryoS/KFUoolDN1bNQ
-RnrLeO1Pwy7i93H8mnLGBa/S0+pcjEitKdC+VGEw+i+ZVVBCZMsyggzLK8KIrJPr
-I7vNFfld6a9DYkGUK59mwUwfVU1syUk0Eht25bNa4wKkWGf4OYV83x36xWMyN2Yy
-9fvlUHzM13HdEFvfPytJ2z1wpDUVZaGJ5LWb13cSpTZ2yEyllrRW8we9Paoac8js
-Ej+l4a6PybN1ttx/R08j
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uic.edu:8443/shibboleth-idp/AA"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uic.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Illinois at Chicago</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Illinois at Chicago</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uic.edu/index.html/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Roberto Ullfig</md:GivenName>
-    <md:EmailAddress>rullfig@uic.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Mathew Willis</md:GivenName>
-    <md:EmailAddress>mat@uic.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johnathan Kupferer</md:GivenName>
-    <md:EmailAddress>jtk@uic.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Allen Randall</md:GivenName>
-    <md:EmailAddress>wallenr@uic.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2f6431d4..00000000
--- a/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.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://shibboleth.ujf-grenoble.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Grenoble 1 - Joseph Fourier</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACoElEQVQozwXBy4tbVRwH8O8593fOfeTeO5kkN036SK3FgjLi/AGiKAhuxOnKhSAuBFfiRpD+FV3qxoUrN8Jsu7DduLAiVuoDtAqOw+Qyk8lkktzkvs7Lz4e15Vb4NVxYIoz4wp4ccPd9Pb9y+PizM9NVgX4z/+tmMRus+4+z7HyckmCRtdGFZzyGEFUZRKxC4wcP/niqS9q/3Kr8aLupf9gdPsl6l/OIwNEQAnhJsUF+FBdDp+/weoTOztVq+dZ8/ULFHHrH49E6jrxQkGELi15it8svv2oPHxL9eR7mK6vivf29RXF7s2ylebKb/N2NSyYyxcjjJAC0upyd6umqS8lu+twgnqStful8K2x5lMbf3ewUJJWzNeeEJhUBtO/TO28kg0nx86P5v790bd2v6mHd1CTzTnocx3FlFVcXAREI2qAWbOe11/29V7Wb6emv1rK98w3X6iLw/+l0mfGdq8JWVdanS9l2YDxsgD48X1R+UoSJ6++72nBeyOhkJwkMtUKPqtZvGAlIaSyZkFdAhIWaboJyl51qZ0pySeDu/vdbGXIRXBGffyLZVSIARtck/RRetV79/uwaT7erykspU7J9tsocN4kw42hw+2V0M+IAOAevPGfzB4ejy9oURiaZaReVjPQrLyq/o3xP7PQQhLAg4QAOgQKPfiy+/rZ/UZajQW84WT6duhu3bt2/h8k1xxgrVBMGvgK3Bo5zdTY/++Kb3k/HuXbX37+7SSUDNDgm12uRlhQj6SpjwcGtdQY8inpqUSkZP//Rh/Lg7Wa5DCm40R+DEwd8MGjEkHAgJw2BXNIfv3cwO5nFn36s9LyTL1ZNPUxT46EGJEAEcDiAHJxtUUjqfvDuWPinJNrpPJsVeUTWJw82bFrhSRhowhr4H08ZSnLvV/9qAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwfjwnFQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMiswMjowMA9hn6kAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ujf-grenoble.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Grenoble 1 - Joseph Fourier</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>
-					      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>
-    </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-POST" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ujf-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Grenoble 1 - Joseph Fourier</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Grenoble 1 - Joseph Fourier</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ujf-grenoble.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>disi-agalan@ujf-grenoble.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.ulbra.br-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.ulbra.br-idp-shibboleth.xml
deleted file mode 100644
index dea2913c..00000000
--- a/swamid-interfederations-2.0/shibboleth.ulbra.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://shibboleth.ulbra.br/idp/shibboleth">
-  <md: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>
-  </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">ulbra.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ULBRA - Universidade Luterana do Brasil</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">ULBRA - Universidade Luterana do Brasil</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ULBRA - Universidade Luterana do Brasil</mdui:Description>
-        <mdui:Description xml:lang="pt-br">ULBRA - Universidade Luterana do Brasil</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ulbra.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ulbra.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEOMAwGA1UECxMFVUxCUkExCzAJ
-BgNVBAYTAkJSMRwwGgYDVQQDExNzaGliYm9sZXRoLnVsYnJhLmJyMB4XDTE1MDMx
-NzIyNTk1OVoXDTE4MDMxNjIyNTk1OVowOzEOMAwGA1UECxMFVUxCUkExCzAJBgNV
-BAYTAkJSMRwwGgYDVQQDExNzaGliYm9sZXRoLnVsYnJhLmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1CAScbHPIqd8bbaxJdYmkmLa6Ur+nR4SxCIH
-jt0/GGT0l6gx0uxTKGdl88dKEI85VvWRj6hp/0RlghxxrvAx31Je7SjeHgH6bDZT
-+bsH7QBkUZ9XMI7PjpwF5lOKnvsae5rRNGh4JOglPewj6k8TFHb/pCWPi/A1e1As
-jR+S8psiP8k0FMOVUczK1SB0XgMYcSPPx/YeDss8Mg4EPFJgtDbUOiHZx4QNPEsG
-437iunNsC4fefIV9Sx9yrKeUxlGmsM+Sccia9tiTUbQBxlJ42WpzNsezQHe3G4Ho
-SOHQIdL1J4a4QYLpgCGemINradRnu4FYECzeTlOUIJBskn1jzQIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQDI/ZQBSTW/wdMRz3QP8YPm/iRDxcLsXaFDTY2hMk3VO8gL
-XEddi9cvgApJLBkyjsE34HTYqp6cT6gHkLOCeQuRxs9VeUWs37Rzis55bKuI9S1M
-f4PawFVZe4Doalz5vAr8InT5xFkTN7FSEVKY0FGG1pAwZZO0DkwDj5hYgwzJKHFT
-JjhDlBmnKL+sdr+7Iy7kbAzxe4SMefqUkFc5C66hqmt6rF/yPQbEJyUeE/7LaKYf
-ujFNOSl0ZlMOPaRSj82ZhRvbEOubchgMczz2GNqMfAY4IYo6MlzLvsew8ZJRILgG
-16FzfOW0GeZMJ2tNnrd4cfqeC3lwWz4Bpb6RZdLC
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ulbra.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ulbra.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://shibboleth.ulbra.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ulbra.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ulbra.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ulbra.br/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">ulbra.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEOMAwGA1UECxMFVUxCUkExCzAJ
-BgNVBAYTAkJSMRwwGgYDVQQDExNzaGliYm9sZXRoLnVsYnJhLmJyMB4XDTE1MDMx
-NzIyNTk1OVoXDTE4MDMxNjIyNTk1OVowOzEOMAwGA1UECxMFVUxCUkExCzAJBgNV
-BAYTAkJSMRwwGgYDVQQDExNzaGliYm9sZXRoLnVsYnJhLmJyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1CAScbHPIqd8bbaxJdYmkmLa6Ur+nR4SxCIH
-jt0/GGT0l6gx0uxTKGdl88dKEI85VvWRj6hp/0RlghxxrvAx31Je7SjeHgH6bDZT
-+bsH7QBkUZ9XMI7PjpwF5lOKnvsae5rRNGh4JOglPewj6k8TFHb/pCWPi/A1e1As
-jR+S8psiP8k0FMOVUczK1SB0XgMYcSPPx/YeDss8Mg4EPFJgtDbUOiHZx4QNPEsG
-437iunNsC4fefIV9Sx9yrKeUxlGmsM+Sccia9tiTUbQBxlJ42WpzNsezQHe3G4Ho
-SOHQIdL1J4a4QYLpgCGemINradRnu4FYECzeTlOUIJBskn1jzQIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQDI/ZQBSTW/wdMRz3QP8YPm/iRDxcLsXaFDTY2hMk3VO8gL
-XEddi9cvgApJLBkyjsE34HTYqp6cT6gHkLOCeQuRxs9VeUWs37Rzis55bKuI9S1M
-f4PawFVZe4Doalz5vAr8InT5xFkTN7FSEVKY0FGG1pAwZZO0DkwDj5hYgwzJKHFT
-JjhDlBmnKL+sdr+7Iy7kbAzxe4SMefqUkFc5C66hqmt6rF/yPQbEJyUeE/7LaKYf
-ujFNOSl0ZlMOPaRSj82ZhRvbEOubchgMczz2GNqMfAY4IYo6MlzLvsew8ZJRILgG
-16FzfOW0GeZMJ2tNnrd4cfqeC3lwWz4Bpb6RZdLC
-                
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ulbra.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ulbra.br:8443/idp/profile/SAML1/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">ULBRA - Universidade Luterana do Brasil</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">ULBRA - Universidade Luterana do Brasil</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ULBRA - Universidade Luterana do Brasil</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">ULBRA - Universidade Luterana do Brasil</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ulbra.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ulbra.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Suporte</md:SurName>
-    <md:EmailAddress>suporteti@ulbra.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.umich.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.umich.edu-idp-shibboleth.xml
deleted file mode 100644
index c3b6c7f9..00000000
--- a/swamid-interfederations-2.0/shibboleth.umich.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +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://shibboleth.umich.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.its.umich.edu/help/" 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">umich.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umd.umich.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flint.umich.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">annarbor.umich.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dearborn.umich.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Michigan</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of Michigan</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.umich.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.itcs.umich.edu/itcsdocs/r1465/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="300" xml:lang="en">https://shibboleth.umich.edu/images/StackedBlockM-InC.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>
-MIIDPDCCAiSgAwIBAgIVAKTsnSoDNC7AuF7I0MFTRrakT8UzMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGgudW1pY2guZWR1MB4XDTA5MDMyNTE0
-MzcwMVoXDTI5MDMyNTE0MzcwMVowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC51bWlj
-aC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhtn+rMsZLQXwO
-SGUnB4+S4lfo9UAvenGskm74puRzGBO9UB5QxPn8LIkHEloafvlWuYKOf8yVqFom
-/q+odD7wl+M66z0E+d0Ci5P2pw2ZaREymG6JMLg7kHuuXWKuxOZPsLcExFqqroF5
-p1NTVaNAT2F27+NXuTabW/p09Tn2H2FPnWhtaZ9PzFfj2Y7SRSPWxp/6KdPZ/rlv
-y9FVIpojwh0uQxPz/un22XMu7W+sw49vBKa4xgHv1TTrMIi83fMElEE4NVQuQc0X
-uT7J29+b+BRQnXLYvIbxJWVrSxXZIbgAirNaW3DYNocH3LweQSXSLOAmFlIMvJ5L
-bMa5BvhDAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGgudW1pY2guZWR1
-hitodHRwczovL3NoaWJib2xldGgudW1pY2guZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBS99cFe6MAQ+FC7bKXUVybdWHsAFjANBgkqhkiG9w0BAQUFAAOCAQEA
-jqQuqBLJLw6OtPVs0V3ZPU/q09qzxpU4GWx+h/GCuex6oVYJmgXweK8vJd7R/pW1
-1LbspeQU1NIsO19k1YF8TZlhqYzbx4PQoDwMYsvl98NN9J1MdMt0I0tx23bT3egP
-WDGivFjtUra8t0VXjVu7opsRcd125wNBLglpk2tu7i7la87BzUDXpidX60KimfaC
-JZUi4F4cCLgSEdoliyfSn2Whqwbm2AGfH+77tyFMI2ZhKa9nmskThwmK12Y6ElnS
-9LmVd8q6AjVB3HnwguPOQjs9UBcxb9eeYwhhgUl11nyEmpvIUmYlGKLT/+ghVmTM
-6e4eBYMhFygzksi2hS6UIw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.umich.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.umich.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.umich.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.umich.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.umich.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.umich.edu/idp/profile/Shibboleth/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">umich.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umd.umich.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">flint.umich.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">annarbor.umich.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dearborn.umich.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAKTsnSoDNC7AuF7I0MFTRrakT8UzMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHNoaWJib2xldGgudW1pY2guZWR1MB4XDTA5MDMyNTE0
-MzcwMVoXDTI5MDMyNTE0MzcwMVowHzEdMBsGA1UEAxMUc2hpYmJvbGV0aC51bWlj
-aC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhtn+rMsZLQXwO
-SGUnB4+S4lfo9UAvenGskm74puRzGBO9UB5QxPn8LIkHEloafvlWuYKOf8yVqFom
-/q+odD7wl+M66z0E+d0Ci5P2pw2ZaREymG6JMLg7kHuuXWKuxOZPsLcExFqqroF5
-p1NTVaNAT2F27+NXuTabW/p09Tn2H2FPnWhtaZ9PzFfj2Y7SRSPWxp/6KdPZ/rlv
-y9FVIpojwh0uQxPz/un22XMu7W+sw49vBKa4xgHv1TTrMIi83fMElEE4NVQuQc0X
-uT7J29+b+BRQnXLYvIbxJWVrSxXZIbgAirNaW3DYNocH3LweQSXSLOAmFlIMvJ5L
-bMa5BvhDAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNoaWJib2xldGgudW1pY2guZWR1
-hitodHRwczovL3NoaWJib2xldGgudW1pY2guZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBS99cFe6MAQ+FC7bKXUVybdWHsAFjANBgkqhkiG9w0BAQUFAAOCAQEA
-jqQuqBLJLw6OtPVs0V3ZPU/q09qzxpU4GWx+h/GCuex6oVYJmgXweK8vJd7R/pW1
-1LbspeQU1NIsO19k1YF8TZlhqYzbx4PQoDwMYsvl98NN9J1MdMt0I0tx23bT3egP
-WDGivFjtUra8t0VXjVu7opsRcd125wNBLglpk2tu7i7la87BzUDXpidX60KimfaC
-JZUi4F4cCLgSEdoliyfSn2Whqwbm2AGfH+77tyFMI2ZhKa9nmskThwmK12Y6ElnS
-9LmVd8q6AjVB3HnwguPOQjs9UBcxb9eeYwhhgUl11nyEmpvIUmYlGKLT/+ghVmTM
-6e4eBYMhFygzksi2hS6UIw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.umich.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.umich.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Michigan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Michigan</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umich.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Liam Hoekenga</md:GivenName>
-    <md:EmailAddress>shibboleth@umich.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ITS Infrastructure Services Identity and Access Management</md:GivenName>
-    <md:EmailAddress>shibboleth@umich.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>ITS Security</md:GivenName>
-    <md:EmailAddress>security@umich.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bruce Timberlake</md:GivenName>
-    <md:EmailAddress>shibboleth@umich.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>DePriest Dockins</md:GivenName>
-    <md:EmailAddress>shibboleth@umich.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 94ad340e..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.unb.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unb.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://shibboleth.unb.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unb.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unb.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unb.br/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">unb.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unb.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unb.br:8443/idp/profile/SAML1/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">UNB - Universidade de Brasilia</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNB - Universidade de Brasilia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNB - Universidade de Brasilia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNB - Universidade de Brasilia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unb.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unb.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Dionisio Miziara</md:SurName>
-    <md:EmailAddress>dionisiojr@unb.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uni-bonn.de.xml b/swamid-interfederations-2.0/shibboleth.uni-bonn.de.xml
deleted file mode 100644
index 2b90ed74..00000000
--- a/swamid-interfederations-2.0/shibboleth.uni-bonn.de.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uni-bonn.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-bonn.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.uni-bonn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uni-bonn.de,OU=Hochschulrechenzentrum,O=Universitaet Bonn,L=Bonn,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGQTCCBSmgAwIBAgIHEunRqyAN0TANBgkqhkiG9w0BAQUFADCBujELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDTALBgNVBAcTBEJv
-bm4xGjAYBgNVBAoTEVVuaXZlcnNpdGFldCBCb25uMR8wHQYDVQQLExZIb2Noc2No
-dWxyZWNoZW56ZW50cnVtMR0wGwYDVQQDExRVbml2ZXJzaXRhZXQgQm9ubiBDQTEi
-MCAGCSqGSIb3DQEJARYTY2FhZG1pbkB1bmktYm9ubi5kZTAeFw0xMTExMjExMzM3
-MzJaFw0xNjExMTkxMzM3MzJaMIGYMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjENMAsGA1UEBxMEQm9ubjEaMBgGA1UEChMRVW5pdmVy
-c2l0YWV0IEJvbm4xHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xHzAd
-BgNVBAMTFnNoaWJib2xldGgudW5pLWJvbm4uZGUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDhmb095e8n0Ntnl+T69lwmLIJOsoR9K2H+queaqzrEoXWx
-X3EEJSb7nIHQ9RuP4kUo8KRkUtYNoKBV/LZC2XH+NKvgnGyYFIu6GKBZFXeYuQMc
-VRTypqEeTJnQ9Vt7N+7c2KojOQ5lB8qtJk5EuAkofgKBgePgVgob7a3SFx+0HnNX
-R6SDOBQQo695NdgDhuUSiS63WRi0Lafec2xjpb+a9Iq5gjhUsP7lhve3fjm7fnky
-IARB6EE8N37htwEFquG1UWFMvPxa0URymi0GZuTH6Fjok6CnR+NWGrK8QufltW9U
-ONE0/KJrNM5f5HxtuBa+n3To/u9VPag4SQirvuQtAgMBAAGjggJqMIICZjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFHqcomCwNt7ndEc81rP8KsSSBdtQMB8GA1UdIwQYMBaAFOs3
-0OvXhC5GnhLTsxjbjeWC5GinMIHJBgNVHREEgcEwgb6BD2J2d0B1bmktYm9ubi5k
-ZYIWc2hpYmJvbGV0aC51bmktYm9ubi5kZYIbc2hpYmJvbGV0aC5yaHJ6LnVuaS1i
-b25uLmRlghxzaGliYm9sZXRoMS5yaHJ6LnVuaS1ib25uLmRlghxzaGliYm9sZXRo
-Mi5yaHJ6LnVuaS1ib25uLmRlghxzaGliYm9sZXRoMy5yaHJ6LnVuaS1ib25uLmRl
-ghxzaGliYm9sZXRoNC5yaHJ6LnVuaS1ib25uLmRlMIGBBgNVHR8EejB4MDqgOKA2
-hjRodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1ib25uLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMDqgOKA2hjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1ib25uLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMIGcBggrBgEFBQcBAQSBjzCBjDBEBggrBgEFBQcw
-AoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktYm9ubi1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwRAYIKwYBBQUHMAKGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLWJvbm4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQBpSi0VhhudTolynhedRGNbvHi8uK8HD51pG9Xm1BTlqIMa4VwkrBeU07As
-nsSciEBSiALIhrLayokU/z5EpROSE4HBvHMomjSezpkPQ60bwIABSplmiwCpu5zF
-ArW5cuNFvSdgVKqkElg4Us2uZYcu9s3HdJWB5giU3GbhyReAviQOHO5Dzo+4twbp
-FqDbI6Tj+m4ZOd1u19hcR4TBIvgn7CEk7tSAZfdEQF+nRlYmFyV0LMGCAqksIYC/
-JJvOc54vwjBXXA+3LU5CSoTt7wjLXC2BjLH4OeJL05owk55toOhNNXg1AxMw1Gew
-NHr2AA4aMaB5TQyo2nz1udsI86g4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-bonn.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-bonn.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uni-bonn.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni-bonn.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uni-bonn.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni-bonn.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-bonn.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.uni-bonn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uni-bonn.de,OU=Hochschulrechenzentrum,O=Universitaet Bonn,L=Bonn,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGQTCCBSmgAwIBAgIHEunRqyAN0TANBgkqhkiG9w0BAQUFADCBujELMAkGA1UE
-BhMCREUxHDAaBgNVBAgTE05vcmRyaGVpbi1XZXN0ZmFsZW4xDTALBgNVBAcTBEJv
-bm4xGjAYBgNVBAoTEVVuaXZlcnNpdGFldCBCb25uMR8wHQYDVQQLExZIb2Noc2No
-dWxyZWNoZW56ZW50cnVtMR0wGwYDVQQDExRVbml2ZXJzaXRhZXQgQm9ubiBDQTEi
-MCAGCSqGSIb3DQEJARYTY2FhZG1pbkB1bmktYm9ubi5kZTAeFw0xMTExMjExMzM3
-MzJaFw0xNjExMTkxMzM3MzJaMIGYMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjENMAsGA1UEBxMEQm9ubjEaMBgGA1UEChMRVW5pdmVy
-c2l0YWV0IEJvbm4xHzAdBgNVBAsTFkhvY2hzY2h1bHJlY2hlbnplbnRydW0xHzAd
-BgNVBAMTFnNoaWJib2xldGgudW5pLWJvbm4uZGUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDhmb095e8n0Ntnl+T69lwmLIJOsoR9K2H+queaqzrEoXWx
-X3EEJSb7nIHQ9RuP4kUo8KRkUtYNoKBV/LZC2XH+NKvgnGyYFIu6GKBZFXeYuQMc
-VRTypqEeTJnQ9Vt7N+7c2KojOQ5lB8qtJk5EuAkofgKBgePgVgob7a3SFx+0HnNX
-R6SDOBQQo695NdgDhuUSiS63WRi0Lafec2xjpb+a9Iq5gjhUsP7lhve3fjm7fnky
-IARB6EE8N37htwEFquG1UWFMvPxa0URymi0GZuTH6Fjok6CnR+NWGrK8QufltW9U
-ONE0/KJrNM5f5HxtuBa+n3To/u9VPag4SQirvuQtAgMBAAGjggJqMIICZjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFHqcomCwNt7ndEc81rP8KsSSBdtQMB8GA1UdIwQYMBaAFOs3
-0OvXhC5GnhLTsxjbjeWC5GinMIHJBgNVHREEgcEwgb6BD2J2d0B1bmktYm9ubi5k
-ZYIWc2hpYmJvbGV0aC51bmktYm9ubi5kZYIbc2hpYmJvbGV0aC5yaHJ6LnVuaS1i
-b25uLmRlghxzaGliYm9sZXRoMS5yaHJ6LnVuaS1ib25uLmRlghxzaGliYm9sZXRo
-Mi5yaHJ6LnVuaS1ib25uLmRlghxzaGliYm9sZXRoMy5yaHJ6LnVuaS1ib25uLmRl
-ghxzaGliYm9sZXRoNC5yaHJ6LnVuaS1ib25uLmRlMIGBBgNVHR8EejB4MDqgOKA2
-hjRodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1ib25uLWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMDqgOKA2hjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1ib25uLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMIGcBggrBgEFBQcBAQSBjzCBjDBEBggrBgEFBQcw
-AoY4aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktYm9ubi1jYS9wdWIvY2FjZXJ0
-L2NhY2VydC5jcnQwRAYIKwYBBQUHMAKGOGh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLWJvbm4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
-A4IBAQBpSi0VhhudTolynhedRGNbvHi8uK8HD51pG9Xm1BTlqIMa4VwkrBeU07As
-nsSciEBSiALIhrLayokU/z5EpROSE4HBvHMomjSezpkPQ60bwIABSplmiwCpu5zF
-ArW5cuNFvSdgVKqkElg4Us2uZYcu9s3HdJWB5giU3GbhyReAviQOHO5Dzo+4twbp
-FqDbI6Tj+m4ZOd1u19hcR4TBIvgn7CEk7tSAZfdEQF+nRlYmFyV0LMGCAqksIYC/
-JJvOc54vwjBXXA+3LU5CSoTt7wjLXC2BjLH4OeJL05owk55toOhNNXg1AxMw1Gew
-NHr2AA4aMaB5TQyo2nz1udsI86g4
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-bonn.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-bonn.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">uni-bonn.de</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Bonn</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-bonn.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Irina</GivenName>
-    <SurName>Neerfeld</SurName>
-    <EmailAddress>neerfeld@uni-bonn.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Annette</GivenName>
-    <SurName>Jamitzky</SurName>
-    <EmailAddress>jamitzky@uni-bonn.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uni-trier.de-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uni-trier.de-idp-shibboleth.xml
deleted file mode 100644
index a0e3be8b..00000000
--- a/swamid-interfederations-2.0/shibboleth.uni-trier.de-idp-shibboleth.xml
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uni-trier.de/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2016-01-08T16:16: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>
-  </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-trier.de</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Trier</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Trier</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Universitaet Trier Test IdP (shibboleth.uni-trier.de)</mdui:Description>
-        <mdui:Description xml:lang="en">University of Trier Test IdP (shibboleth.uni-trier.de)</mdui:Description>
-        <mdui:Logo height="16" width="16">https://shibboleth.uni-trier.de/idp/images/logo_uni-trier_klein.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p3fO22jANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTYwMTA4MTIzMjE0WhcNMTkw
-NDA2MTIzMjE0WjCBhTELMAkGA1UEBhMCREUxGDAWBgNVBAgMD1JoZWlubGFuZC1Q
-ZmFsejEOMAwGA1UEBwwFVHJpZXIxGzAZBgNVBAoMElVuaXZlcnNpdGFldCBUcmll
-cjENMAsGA1UECwwEWklNSzEgMB4GA1UEAwwXc2hpYmJvbGV0aC51bmktdHJpZXIu
-ZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDmdZPea459kHujd1Zb
-W+8lc6aTQAuEQ9hQ37hI7r6jPzdhU9J0qPhyQetKm6alMnjMB+iIXxFlnrkXw5sx
-J5YhYNKkS7Yga48B24K2JiBOypTGtR4APUtUIRjxKefw7sDA7tCAa1h4nUzkor9O
-2NUGrMKg7FZ0hviYm9h7xVbdtRRK/TficauBDMqObCWxKFRS9ESsg6S9tf9cMHWE
-gj7s61nOVJr8VLkIVoEzSh/CvstOX0qUw1Hr9yePyYMJn6XZl/emK1G2M482sXuc
-rsjKo/k1a6/ZEnh/6JpczbDCjJrcHMaOalnmcY9GlBpSPB4onW0fOsRh9qMZMs0j
-CSONzAe/7EQWa88x5vN6EawYTXObYP6kAQYZzD9KcvgduA/UnoPMBJ0AQAEsvas4
-7aAyYfJzcu+Jo1/CANJHI3F6AngLl1CO0HhzYz6YWbsQLqsgeEH7P1wRnF/WF8UG
-UqAAGYGd2tA21sr2CT5qaNdq+DwIeLMMwtyGE1LVKXcvelgU6aUm1itdZdQXhyar
-w1dQ0XOdm1k6HvG1uoQIOSiC10yxdaqph1rlfIvrJOeNvSQ8V3yf3MR9NgRz+XG9
-fCK2JET6Et8qv3wlGk4450vbNerGIYh0Ig9wjQ25XmT8PWZAxjeWXgwgpLrKkjAw
-HCuPZFejBSi1an2lNi6DkUMMswIDAQABo4ICSTCCAkUwWQYDVR0gBFIwUDARBg8r
-BgEEAYGtIYIsAQEEAwQwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
-AQQwDQYLKwYBBAGBrSGCLB4wCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU8rss
-qYSyJATz9wUUKThLwQ0QuGcwHwYDVR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6
-tgIwIgYDVR0RBBswGYIXc2hpYmJvbGV0aC51bmktdHJpZXIuZGUwfQYDVR0fBHYw
-dDA4oDagNIYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwOKA2oDSGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1j
-YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHNBggrBgEFBQcBAQSBwDCBvTAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEIG
-CCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3JocmstY2EvcHViL2Nh
-Y2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQsFAAOCAQEAnjP52QMIYMMcC3Ch9mxhSYYsOVabgf89yz0O3nROsSxWQ8JL0UBG
-xWm/nw/GWbUVVbBHZZbvq3IXnDBgjovl4q5kU5kL5yjbF58mCxn2482+Vbirn5np
-ojrb3qzzAzwBc4PaA/BlHyR8RI6JEuoRuu4MxeDXc/bD4G6PlahOPgXPMDgK0kYj
-OwTG5ALARhtv23ux8/81j6cEr/yoO/Ji6u66fbTv+Eow6D29vsKXWIpm4U2/Nf7h
-7f5O3UBWFhh2H6J+VZaL5giMtnp1Jf4Hc6CJUIbin6OJHV5H86RWXtM6CMBPvQwD
-66So0BL4l93LdaiKPEcl9bwH+XuUN8LyZg==
-</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>shibboleth.uni-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p2/FggDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTYwMTA4MTIzMjExWhcNMTkw
-NDA2MTIzMjExWjCBhTELMAkGA1UEBhMCREUxGDAWBgNVBAgMD1JoZWlubGFuZC1Q
-ZmFsejEOMAwGA1UEBwwFVHJpZXIxGzAZBgNVBAoMElVuaXZlcnNpdGFldCBUcmll
-cjENMAsGA1UECwwEWklNSzEgMB4GA1UEAwwXc2hpYmJvbGV0aC51bmktdHJpZXIu
-ZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDLnfiZ/3fcMwLHg6e7
-pvJGN5cfPSU0xxRhKC8NNEjp0On2sLBGDdANlwW9UH+WrVogrIxZflcFlwyZESyQ
-SLe2YG3S6w95v/Gmm6gO5iuEi6J7GP6Jd5NeGJUKHQmGYiP9QIso2yga4gv0hByl
-OFAufnHjCU1qDAbihoPv0eJss2GY5zZpJ2Q2Cf0HK9cXtnddchT1NklaChDvSm1t
-kIjSVSXCtBwWj2H4khrDVnF+5FGLstkQckcNxDwIvIUQHCfgQnHhQ1qTr3kYmi5p
-zn7oZRdmHneRc1+VB5rY3EU0XheLZo3M/RmirDzeXvDEplOT+r4kDvCrvV7r7XxQ
-tg8pProjVxyyLL+xRiqsCc3pLy3WuYzuEIxFJfjwu04hyYUm4tBg7JUag9WYzpxN
-A/oyfw9p9750v1ojXj0zoi4Qf25sEt8XdbNhke/MZjqo/YUcteXCPkzNQtmT/Jcp
-t9KkKrAGI1ByKqTSRMluiWf9lVVE9Jbie47YsPqx2Nf5GxLwK/yPiUtTxVUsTNDC
-5T15GZYwjp9Tt9EabB2NcbaYa4AhoH4groM+/ukv4bdF7Okv8ZFqu1d3K1YBo3Uh
-n2+VjbG/jtIEhlsfGNPboSA9RQf+AZZwNJ6tXvPEsFcMUTOhXx4ca6H3rug+3cGb
-jLZP+WmQaPZZgguICWPjxPjIoQIDAQABo4ICSTCCAkUwWQYDVR0gBFIwUDARBg8r
-BgEEAYGtIYIsAQEEAwQwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
-AQQwDQYLKwYBBAGBrSGCLB4wCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUXlJW
-4cN5+S65JleeYnQvMv+VNigwHwYDVR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6
-tgIwIgYDVR0RBBswGYIXc2hpYmJvbGV0aC51bmktdHJpZXIuZGUwfQYDVR0fBHYw
-dDA4oDagNIYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwOKA2oDSGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1j
-YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHNBggrBgEFBQcBAQSBwDCBvTAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEIG
-CCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3JocmstY2EvcHViL2Nh
-Y2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQsFAAOCAQEAAS/Ax9gBIuf3GPiSwu9UNkJOXb0ATFoZWQeh4Vsz2AsBn7ZOx76I
-kY1qQSfEOko/7JigWHG/BolaDUKEoWJuxgeS//CApsR9U/0CbztsQJgnOVC9dm0S
-BoueXV/1QmE4VPuCJxaB57f8KWONQlQBlopddyWMB18fzyLCF65q9WX60ofz4UA/
-Kbx1K3SR00x4fOoOHvk95sh9hpkhaATYJ0xAOl6u2tm06P+RHo3cLWb6CMVX3Cb/
-D4cIRB9DETEzueGA7eLRZiy1MijWJ/DPZmXWPk7nUf/m+fEQLjcU39wY97+cSXPt
-d+AgGBhISGMkYCuP35MDBWIA0yUjdIMhFA==
-</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>shibboleth.uni-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p3H46EzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTYwMTA4MTIzMjEyWhcNMTkw
-NDA2MTIzMjEyWjCBhTELMAkGA1UEBhMCREUxGDAWBgNVBAgMD1JoZWlubGFuZC1Q
-ZmFsejEOMAwGA1UEBwwFVHJpZXIxGzAZBgNVBAoMElVuaXZlcnNpdGFldCBUcmll
-cjENMAsGA1UECwwEWklNSzEgMB4GA1UEAwwXc2hpYmJvbGV0aC51bmktdHJpZXIu
-ZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDfvxfaqUplPJ47PLBp
-tIJQdP40Hj8hsIDpWq21SLaiF4bovSTqYz/uvNeJoj6SwAbt+PY85HbISScmB5Wz
-nu+40QNAD9Dzv+RdfhkYnBmAFfY28uXLNevBpUbe3gvJCo8lppn+YMpOdcgSvdj/
-M8zfL0Qyba7SMaCCJbqUYNSVTNwOX9NXZhAMWgRNgg7nl2NDBAiqjTr0ccA9HjMB
-rVN0nvS7AFpwxLnEW75Ne++3GmhEM4GW/tantWmf7fNlFcESvpxLgQleuyHIvdin
-b3GyD9Eo+tob/zuj7ymIAHH2rOGf79aTLkfgvjBpNHbiLfz1fA3Jihqqhkzk7XVK
-P/CCdkjSwNuMayTymxoV03JWcSIeYld01+VEoHsT/X7RtHnEud79H2QQaZ/PAy7Z
-dhmUthyoKj+IxEHY/+RlJ6opIXytNYjqAbbFuvmEc9h1vWcszuatG6MhTwcwNvRJ
-LS/kBmQ3CXrJe7LT6Z+vYWmWfB9rvs4XuFNuRmNXpkDYVtlYAyNtWbzRMYPxsQ5C
-TqaziGKVWk7QwNbNaWdGwLVhVig25nIHPnkWfURMUIbDW41315oGFP6W8mnbUVFJ
-dpeX/BAbZfO/mMP/8faIeEgmZI/5RkeXnt3o4fBpf8kexbfvIpKrDuRR5VDG/Vco
-0GFfoxT3Vaz31F4qLBEaekMZ0QIDAQABo4ICSTCCAkUwWQYDVR0gBFIwUDARBg8r
-BgEEAYGtIYIsAQEEAwQwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
-AQQwDQYLKwYBBAGBrSGCLB4wCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZ9N0
-gEW7bcJlgm0v/ntCnnIbFi4wHwYDVR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6
-tgIwIgYDVR0RBBswGYIXc2hpYmJvbGV0aC51bmktdHJpZXIuZGUwfQYDVR0fBHYw
-dDA4oDagNIYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwOKA2oDSGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1j
-YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHNBggrBgEFBQcBAQSBwDCBvTAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEIG
-CCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3JocmstY2EvcHViL2Nh
-Y2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQsFAAOCAQEAI7Br+53p8un2nrxTrx4H0YnANpfXoAnxkAKrmqoDL7AkJmUfLDWU
-xwTfwcjEjdqaIYDYjwcL/nCqYxzidD8h8vRHgH9coG0LuE8KkrwnYgY6gUZxFe8i
-QcO0hKXJt28vl37JJsjQ/X8R3hoUBqRbj3sMde2G/0/1KVM92tMBnZAX5E7Z5BlT
-ZDXXnJecWJYksS9f0Z1PTjp5cUQnsDLZI76yZ0H1Oav22qYaASJlkMvtyxvrTbMQ
-j1puu5J79T+gDmwtRNBJBQ1Jbc6sp45Na3obTmLZeBMNWERL2a7ipoQweeh0XhFx
-tQkWiW73DjMOwOmQhPpnYfRM6f+pLmh5iQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-trier.de/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-trier.de/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.uni-trier.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-trier.de</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.uni-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p3fO22jANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTYwMTA4MTIzMjE0WhcNMTkw
-NDA2MTIzMjE0WjCBhTELMAkGA1UEBhMCREUxGDAWBgNVBAgMD1JoZWlubGFuZC1Q
-ZmFsejEOMAwGA1UEBwwFVHJpZXIxGzAZBgNVBAoMElVuaXZlcnNpdGFldCBUcmll
-cjENMAsGA1UECwwEWklNSzEgMB4GA1UEAwwXc2hpYmJvbGV0aC51bmktdHJpZXIu
-ZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDmdZPea459kHujd1Zb
-W+8lc6aTQAuEQ9hQ37hI7r6jPzdhU9J0qPhyQetKm6alMnjMB+iIXxFlnrkXw5sx
-J5YhYNKkS7Yga48B24K2JiBOypTGtR4APUtUIRjxKefw7sDA7tCAa1h4nUzkor9O
-2NUGrMKg7FZ0hviYm9h7xVbdtRRK/TficauBDMqObCWxKFRS9ESsg6S9tf9cMHWE
-gj7s61nOVJr8VLkIVoEzSh/CvstOX0qUw1Hr9yePyYMJn6XZl/emK1G2M482sXuc
-rsjKo/k1a6/ZEnh/6JpczbDCjJrcHMaOalnmcY9GlBpSPB4onW0fOsRh9qMZMs0j
-CSONzAe/7EQWa88x5vN6EawYTXObYP6kAQYZzD9KcvgduA/UnoPMBJ0AQAEsvas4
-7aAyYfJzcu+Jo1/CANJHI3F6AngLl1CO0HhzYz6YWbsQLqsgeEH7P1wRnF/WF8UG
-UqAAGYGd2tA21sr2CT5qaNdq+DwIeLMMwtyGE1LVKXcvelgU6aUm1itdZdQXhyar
-w1dQ0XOdm1k6HvG1uoQIOSiC10yxdaqph1rlfIvrJOeNvSQ8V3yf3MR9NgRz+XG9
-fCK2JET6Et8qv3wlGk4450vbNerGIYh0Ig9wjQ25XmT8PWZAxjeWXgwgpLrKkjAw
-HCuPZFejBSi1an2lNi6DkUMMswIDAQABo4ICSTCCAkUwWQYDVR0gBFIwUDARBg8r
-BgEEAYGtIYIsAQEEAwQwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
-AQQwDQYLKwYBBAGBrSGCLB4wCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU8rss
-qYSyJATz9wUUKThLwQ0QuGcwHwYDVR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6
-tgIwIgYDVR0RBBswGYIXc2hpYmJvbGV0aC51bmktdHJpZXIuZGUwfQYDVR0fBHYw
-dDA4oDagNIYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwOKA2oDSGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1j
-YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHNBggrBgEFBQcBAQSBwDCBvTAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEIG
-CCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3JocmstY2EvcHViL2Nh
-Y2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQsFAAOCAQEAnjP52QMIYMMcC3Ch9mxhSYYsOVabgf89yz0O3nROsSxWQ8JL0UBG
-xWm/nw/GWbUVVbBHZZbvq3IXnDBgjovl4q5kU5kL5yjbF58mCxn2482+Vbirn5np
-ojrb3qzzAzwBc4PaA/BlHyR8RI6JEuoRuu4MxeDXc/bD4G6PlahOPgXPMDgK0kYj
-OwTG5ALARhtv23ux8/81j6cEr/yoO/Ji6u66fbTv+Eow6D29vsKXWIpm4U2/Nf7h
-7f5O3UBWFhh2H6J+VZaL5giMtnp1Jf4Hc6CJUIbin6OJHV5H86RWXtM6CMBPvQwD
-66So0BL4l93LdaiKPEcl9bwH+XuUN8LyZg==
-</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>shibboleth.uni-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p2/FggDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTYwMTA4MTIzMjExWhcNMTkw
-NDA2MTIzMjExWjCBhTELMAkGA1UEBhMCREUxGDAWBgNVBAgMD1JoZWlubGFuZC1Q
-ZmFsejEOMAwGA1UEBwwFVHJpZXIxGzAZBgNVBAoMElVuaXZlcnNpdGFldCBUcmll
-cjENMAsGA1UECwwEWklNSzEgMB4GA1UEAwwXc2hpYmJvbGV0aC51bmktdHJpZXIu
-ZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDLnfiZ/3fcMwLHg6e7
-pvJGN5cfPSU0xxRhKC8NNEjp0On2sLBGDdANlwW9UH+WrVogrIxZflcFlwyZESyQ
-SLe2YG3S6w95v/Gmm6gO5iuEi6J7GP6Jd5NeGJUKHQmGYiP9QIso2yga4gv0hByl
-OFAufnHjCU1qDAbihoPv0eJss2GY5zZpJ2Q2Cf0HK9cXtnddchT1NklaChDvSm1t
-kIjSVSXCtBwWj2H4khrDVnF+5FGLstkQckcNxDwIvIUQHCfgQnHhQ1qTr3kYmi5p
-zn7oZRdmHneRc1+VB5rY3EU0XheLZo3M/RmirDzeXvDEplOT+r4kDvCrvV7r7XxQ
-tg8pProjVxyyLL+xRiqsCc3pLy3WuYzuEIxFJfjwu04hyYUm4tBg7JUag9WYzpxN
-A/oyfw9p9750v1ojXj0zoi4Qf25sEt8XdbNhke/MZjqo/YUcteXCPkzNQtmT/Jcp
-t9KkKrAGI1ByKqTSRMluiWf9lVVE9Jbie47YsPqx2Nf5GxLwK/yPiUtTxVUsTNDC
-5T15GZYwjp9Tt9EabB2NcbaYa4AhoH4groM+/ukv4bdF7Okv8ZFqu1d3K1YBo3Uh
-n2+VjbG/jtIEhlsfGNPboSA9RQf+AZZwNJ6tXvPEsFcMUTOhXx4ca6H3rug+3cGb
-jLZP+WmQaPZZgguICWPjxPjIoQIDAQABo4ICSTCCAkUwWQYDVR0gBFIwUDARBg8r
-BgEEAYGtIYIsAQEEAwQwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
-AQQwDQYLKwYBBAGBrSGCLB4wCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUXlJW
-4cN5+S65JleeYnQvMv+VNigwHwYDVR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6
-tgIwIgYDVR0RBBswGYIXc2hpYmJvbGV0aC51bmktdHJpZXIuZGUwfQYDVR0fBHYw
-dDA4oDagNIYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwOKA2oDSGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1j
-YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHNBggrBgEFBQcBAQSBwDCBvTAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEIG
-CCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3JocmstY2EvcHViL2Nh
-Y2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQsFAAOCAQEAAS/Ax9gBIuf3GPiSwu9UNkJOXb0ATFoZWQeh4Vsz2AsBn7ZOx76I
-kY1qQSfEOko/7JigWHG/BolaDUKEoWJuxgeS//CApsR9U/0CbztsQJgnOVC9dm0S
-BoueXV/1QmE4VPuCJxaB57f8KWONQlQBlopddyWMB18fzyLCF65q9WX60ofz4UA/
-Kbx1K3SR00x4fOoOHvk95sh9hpkhaATYJ0xAOl6u2tm06P+RHo3cLWb6CMVX3Cb/
-D4cIRB9DETEzueGA7eLRZiy1MijWJ/DPZmXWPk7nUf/m+fEQLjcU39wY97+cSXPt
-d+AgGBhISGMkYCuP35MDBWIA0yUjdIMhFA==
-</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>shibboleth.uni-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG1TCCBb2gAwIBAgIHGq8p3H46EzANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTYwMTA4MTIzMjEyWhcNMTkw
-NDA2MTIzMjEyWjCBhTELMAkGA1UEBhMCREUxGDAWBgNVBAgMD1JoZWlubGFuZC1Q
-ZmFsejEOMAwGA1UEBwwFVHJpZXIxGzAZBgNVBAoMElVuaXZlcnNpdGFldCBUcmll
-cjENMAsGA1UECwwEWklNSzEgMB4GA1UEAwwXc2hpYmJvbGV0aC51bmktdHJpZXIu
-ZGUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDfvxfaqUplPJ47PLBp
-tIJQdP40Hj8hsIDpWq21SLaiF4bovSTqYz/uvNeJoj6SwAbt+PY85HbISScmB5Wz
-nu+40QNAD9Dzv+RdfhkYnBmAFfY28uXLNevBpUbe3gvJCo8lppn+YMpOdcgSvdj/
-M8zfL0Qyba7SMaCCJbqUYNSVTNwOX9NXZhAMWgRNgg7nl2NDBAiqjTr0ccA9HjMB
-rVN0nvS7AFpwxLnEW75Ne++3GmhEM4GW/tantWmf7fNlFcESvpxLgQleuyHIvdin
-b3GyD9Eo+tob/zuj7ymIAHH2rOGf79aTLkfgvjBpNHbiLfz1fA3Jihqqhkzk7XVK
-P/CCdkjSwNuMayTymxoV03JWcSIeYld01+VEoHsT/X7RtHnEud79H2QQaZ/PAy7Z
-dhmUthyoKj+IxEHY/+RlJ6opIXytNYjqAbbFuvmEc9h1vWcszuatG6MhTwcwNvRJ
-LS/kBmQ3CXrJe7LT6Z+vYWmWfB9rvs4XuFNuRmNXpkDYVtlYAyNtWbzRMYPxsQ5C
-TqaziGKVWk7QwNbNaWdGwLVhVig25nIHPnkWfURMUIbDW41315oGFP6W8mnbUVFJ
-dpeX/BAbZfO/mMP/8faIeEgmZI/5RkeXnt3o4fBpf8kexbfvIpKrDuRR5VDG/Vco
-0GFfoxT3Vaz31F4qLBEaekMZ0QIDAQABo4ICSTCCAkUwWQYDVR0gBFIwUDARBg8r
-BgEEAYGtIYIsAQEEAwQwEQYPKwYBBAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwB
-AQQwDQYLKwYBBAGBrSGCLB4wCAYGZ4EMAQICMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUZ9N0
-gEW7bcJlgm0v/ntCnnIbFi4wHwYDVR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6
-tgIwIgYDVR0RBBswGYIXc2hpYmJvbGV0aC51bmktdHJpZXIuZGUwfQYDVR0fBHYw
-dDA4oDagNIYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwv
-Z19jYWNybC5jcmwwOKA2oDSGMmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1j
-YS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHNBggrBgEFBQcBAQSBwDCBvTAzBggrBgEF
-BQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMEIG
-CCsGAQUFBzAChjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3JocmstY2EvcHViL2Nh
-Y2VydC9nX2NhY2VydC5jcnQwQgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5k
-Zm4uZGUvcmhyay1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
-AQsFAAOCAQEAI7Br+53p8un2nrxTrx4H0YnANpfXoAnxkAKrmqoDL7AkJmUfLDWU
-xwTfwcjEjdqaIYDYjwcL/nCqYxzidD8h8vRHgH9coG0LuE8KkrwnYgY6gUZxFe8i
-QcO0hKXJt28vl37JJsjQ/X8R3hoUBqRbj3sMde2G/0/1KVM92tMBnZAX5E7Z5BlT
-ZDXXnJecWJYksS9f0Z1PTjp5cUQnsDLZI76yZ0H1Oav22qYaASJlkMvtyxvrTbMQ
-j1puu5J79T+gDmwtRNBJBQ1Jbc6sp45Na3obTmLZeBMNWERL2a7ipoQweeh0XhFx
-tQkWiW73DjMOwOmQhPpnYfRM6f+pLmh5iQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-trier.de/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e297</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e297</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Trier</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Universität Trier</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">https://www.uni-trier.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.uni-trier.de/?L=2</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Reusch</md:SurName>
-    <md:EmailAddress>mailto:reusch@uni-trier.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Thomas</md:GivenName>
-    <md:SurName>Reusch</md:SurName>
-    <md:EmailAddress>mailto:reusch@uni-trier.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ZIMK</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@uni-trier.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uni-trier.de.xml b/swamid-interfederations-2.0/shibboleth.uni-trier.de.xml
deleted file mode 100644
index f2bffca6..00000000
--- a/swamid-interfederations-2.0/shibboleth.uni-trier.de.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uni-trier.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-trier.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>urts35.uni-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=urts35.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFazCCBFOgAwIBAgIHEmM7DinMbzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTEwODExMTEzMTExWhcNMTUx
-MjMxMjM1OTU5WjCBgTELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1Q
-ZmFsejEOMAwGA1UEBxMFVHJpZXIxGzAZBgNVBAoTElVuaXZlcnNpdGFldCBUcmll
-cjENMAsGA1UECxMEWklNSzEcMBoGA1UEAxMTdXJ0czM1LnVuaS10cmllci5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO26IXeNpQDCSFCWhbIz3xvV
-5uHgSOtCNluHl/QE1TZ4UzkM+fFZvwTmp6RFesyGd/RrGnCVtAJVo/FujhPyZssH
-Erl0InYdvZnIa40bX4llxwA6bs+kkCfDzY+8nuKTXNXOCdRoOxedtiUwpNbsiWtN
-6KLhKdUn75e5R/7mW/6laCcTz0LpWT2lCqDn77Fb5Tn8tuRCcMPKEi1DlMP22vOn
-/d4CGWvGYyvR/RwpRmAvva8f4I99Zer5KY4JLnB65m0lAHvcz/2BxFhX6oe0FKJI
-SaqCcTpQXQjPyU8KkPZU3i1jUUx8y0XbWXCzMoWq9EhWUmWRub66F8Q9Gvz/FmkC
-AwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUEHpkJpBk149HP6mUARHOS53w
-Fj4wHwYDVR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwTAYDVR0RBEUwQ4EU
-emllZ2xlckB1bmktdHJpZXIuZGWCBnVydHMzNYIXc2hpYmJvbGV0aC51bmktdHJp
-ZXIuZGWCCnNoaWJib2xldGgwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwOKA2oDSGMmh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY3JsL2dfY2FjcmwuY3Js
-MIGYBggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9yaHJrLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEIGCCsGAQUF
-BzAChjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3JocmstY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAaMlGD1R6mbnmmmxyXC2Txp
-/Q7UymsTtjykS4Ct/19fQJxl4c5QxzXWQVta6VwxXVBt7G6SjIeyoRFceAg8TEnD
-wOmA+b4iTiD2xxiqreF/gB4TFwWA9jAJOHO8kr0iVK0HwtVGd/I9TVODPY6z8HMa
-Mo7Zs1BTLPbBI/H3lwRXY5nj6jLPGZHDMFmfKltfTIdWfU3xHmXHvJ1aSxBXNpmi
-18PkyB3cLh+x7gmm9ePhE/kgOinFW6mGTqAZcGuSBYIWoZ3hzAroV+JrqjW5W7DD
-9jUQ40xEFjN5qXNehv/bhph98oavY+tzDLG/TCamx3LMdURRCQig4rBo7cDuHfY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-trier.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-trier.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uni-trier.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni-trier.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-trier.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>urts35.uni-trier.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=urts35.uni-trier.de,OU=ZIMK,O=Universitaet Trier,L=Trier,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFazCCBFOgAwIBAgIHEmM7DinMbzANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
-BhMCREUxOTA3BgNVBAoTMFJlZ2lvbmFsZXMgSG9jaHNjaHVscmVjaGVuemVudHJ1
-bSBLYWlzZXJzbGF1dGVybjEWMBQGA1UEAxMNUkhSSy1DQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRY2FAcmhyay51bmkta2wuZGUwHhcNMTEwODExMTEzMTExWhcNMTUx
-MjMxMjM1OTU5WjCBgTELMAkGA1UEBhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1Q
-ZmFsejEOMAwGA1UEBxMFVHJpZXIxGzAZBgNVBAoTElVuaXZlcnNpdGFldCBUcmll
-cjENMAsGA1UECxMEWklNSzEcMBoGA1UEAxMTdXJ0czM1LnVuaS10cmllci5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO26IXeNpQDCSFCWhbIz3xvV
-5uHgSOtCNluHl/QE1TZ4UzkM+fFZvwTmp6RFesyGd/RrGnCVtAJVo/FujhPyZssH
-Erl0InYdvZnIa40bX4llxwA6bs+kkCfDzY+8nuKTXNXOCdRoOxedtiUwpNbsiWtN
-6KLhKdUn75e5R/7mW/6laCcTz0LpWT2lCqDn77Fb5Tn8tuRCcMPKEi1DlMP22vOn
-/d4CGWvGYyvR/RwpRmAvva8f4I99Zer5KY4JLnB65m0lAHvcz/2BxFhX6oe0FKJI
-SaqCcTpQXQjPyU8KkPZU3i1jUUx8y0XbWXCzMoWq9EhWUmWRub66F8Q9Gvz/FmkC
-AwEAAaOCAeMwggHfMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUEHpkJpBk149HP6mUARHOS53w
-Fj4wHwYDVR0jBBgwFoAUL90TmGNcC8NvuO2G4AMnwW+6tgIwTAYDVR0RBEUwQ4EU
-emllZ2xlckB1bmktdHJpZXIuZGWCBnVydHMzNYIXc2hpYmJvbGV0aC51bmktdHJp
-ZXIuZGWCCnNoaWJib2xldGgwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS9yaHJrLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwOKA2oDSGMmh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvcmhyay1jYS9wdWIvY3JsL2dfY2FjcmwuY3Js
-MIGYBggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9yaHJrLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEIGCCsGAQUF
-BzAChjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3JocmstY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAAaMlGD1R6mbnmmmxyXC2Txp
-/Q7UymsTtjykS4Ct/19fQJxl4c5QxzXWQVta6VwxXVBt7G6SjIeyoRFceAg8TEnD
-wOmA+b4iTiD2xxiqreF/gB4TFwWA9jAJOHO8kr0iVK0HwtVGd/I9TVODPY6z8HMa
-Mo7Zs1BTLPbBI/H3lwRXY5nj6jLPGZHDMFmfKltfTIdWfU3xHmXHvJ1aSxBXNpmi
-18PkyB3cLh+x7gmm9ePhE/kgOinFW6mGTqAZcGuSBYIWoZ3hzAroV+JrqjW5W7DD
-9jUQ40xEFjN5qXNehv/bhph98oavY+tzDLG/TCamx3LMdURRCQig4rBo7cDuHfY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni-trier.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni-trier.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Trier</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Trier</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-trier.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Uwe</GivenName>
-    <SurName>Ziegler</SurName>
-    <EmailAddress>ziegler@uni-trier.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml
deleted file mode 100644
index 83cc7a63..00000000
--- a/swamid-interfederations-2.0/shibboleth.uni.opole.pl-idp-shibboleth.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.uni.opole.pl/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-12-02T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.opole.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">
-         Opole University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pl">
-         Uniwersytet Opolski</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-         Opole University Identity Provider
-    </mdui:Description>
-        <mdui:Description xml:lang="pl">
-       Dostawca Tożsamości Uniwersytetu Opolskiego
-    </mdui:Description>
-        <mdui:Logo height="55" width="165" xml:lang="en">
-       https://shibboleth.uni.opole.pl/idp/logouo_header.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>
-MIIDJzCCAg+gAwIBAgIUJYgjpRkfWuuLnYgjmOtFu6kZyuQwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMB4XDTE1MDQzMDA2NTU1MloX
-DTM1MDQzMDA2NTU1MlowGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvpolQ/zhvPO0OGBOJu8JjMLurb10
-qNcR+RuS/YUZ2wbnjggMSCHm+X+dY2RAX2Qu3sty2f6Rizpwa4dHcTVARrHonPu2
-0j+bFjQndzODqAbg3IsD+i9P2qPXJOZ0atgfcf5FQ+h8AgOST3pRX9YSwDcOZ/mO
-hoDlitxWJmXxX+e39Ix0/ONtfpy+R9JKE+UEuqZ/xBiwmKwfRll5M4V7mZj8UcFW
-/AvoWol8h+UUtHSweZxZYAad1nniIlDOBN//ABM+wRc4saC/bB/wV1NTi8ZQp8i+
-MEZ+81TwOmpxo/z5EOPbl0/rl1VhG54yxjFFgqI13tn4QLoJWUGozYO1dwIDAQAB
-o2UwYzAdBgNVHQ4EFgQUA1adRNultXunWuW5NyNRqc46bdowQgYDVR0RBDswOYIP
-aWRwLmV4YW1wbGUub3JnhiZodHRwczovL2lkcC5leGFtcGxlLm9yZy9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAooPuGuUZiJUc+9rW8FnHvflucH3h
-rpu75Fyp6/e7U+KpiKAmrdo83/Ve4GadEhBEANZ/lbu1z5eZTurXhPA6j4Df89Xf
-3GkPpyy9YoFvKypn/FeUAMpyo+BlNSnzAQuC+b+AYZrKwjwBKk9vrpGPJ7uUsz9D
-VBWHN6W0pQqExq6qXfgcLGnluzqJ0LbNGJrndfKV4WN/MAE52zVo24f9huQandRt
-PTimpBVSen6/qlR87r67YGV6/jgfL3Q8N5g42sT2iT/05Q22aYaIk1+e9X44jIos
-gn4E7aCKeaHFN/LG+NCNR1Fq+g0vDJIPe6FDeaC+kqK84MtvxqxG/wJxBQ==
-                        </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>
-MIIDKDCCAhCgAwIBAgIVANM9C5l48yMhTAHJ9LbCXXOK1yQHMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLm9yZzAeFw0xNTA0MzAwNjU1NTBa
-Fw0zNTA0MzAwNjU1NTBaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLm9yZzCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALCW6XciidnTK7mHBV+aDlGBuNKk
-Pj6O3bXSdt0cQQhMlKS7rNmxMaKsS1SxKB/E5OcUeL1DjAqICGpYls33cWIgLvSB
-wTkLRWQRLxsV2cvdRK6Deb32Tf7KeR3w0coHpYQ8GeYVTGA98F2Ovmo/ZUgXr2qK
-C55rOrmbyPs7Bqi9jjeFDNaczu3Y25kkp1sultt4AZZOtMkIsjypnYkhxn9/2fVp
-W/ZFXqoemfT3N63t1SWNZc+Yaeo82kvbLcrkFeOdkD2vmXMXSjt/+LGOnI8fpARy
-r/57UVycEpyfDp+Fve+EeUOP7LMQMVpLTQJxLFesL0lTTUsgx1PktUmc18ECAwEA
-AaNlMGMwHQYDVR0OBBYEFKlA/UMF3cCICQgPWEmRaIAaALeYMEIGA1UdEQQ7MDmC
-D2lkcC5leGFtcGxlLm9yZ4YmaHR0cHM6Ly9pZHAuZXhhbXBsZS5vcmcvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAA95wRr3PU93Cy9Cu2oCIOPpNrHm
-7FO524QdyhuInC9Ue6ZGrez2J9TNJIblQzzsCw+STD0A0Hs8oHuZxl0hV8USsq4f
-ZNkdoRIntpIpOt7VefS2pxNDP1JGzgI36S2dgRPgNGBhtsd+5EjRCOPONeUy2gx/
-OeBnwcw8j36pQHdRlZKQVspAS5h0ePRHbS7luIQDeL8ZUkXIXuLEmnjHXnJzWUCP
-N5DC9rjlhu2+0Z1KeiuZgmVAiB66BFvjXCnkWIK5kh+/C/BYQpgHDx7B9nBYr5Xb
-2iYaqN73c9+XwBSf0+vYLC9Ivn6fAXMUN/wkK1FH9hjX09wBPR8LS2oq5fg=
-                        </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>
-MIIDJzCCAg+gAwIBAgIUEVPEG+BAdndjuiWqotqWKaPL2jowDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMB4XDTE1MDQzMDA2NTU1MVoX
-DTM1MDQzMDA2NTU1MVowGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoGJI6hLgX21HDCZsTHQoI4xA91YD
-LNuTv2q+nxSHeYy3uCDCAbDAuwJDnpdbdGlYadVvG1gHTkHRMc7pS2HSgd5y27Ig
-TMzAUeLLJM1ZUajJs8d7g32LLGQEHIFAwidYB+saKaCOCSRowLx5Cw5vFWLxEEih
-evERL6P8J3mb/6vzTSJeqYU9XQxI8+FQQY9mI7JLaprn60dHj3S/XnxLmbVEgQ2Z
-/jSRFDAufZ8Jv9EAqMqmRtXEakaYjQzM/anu0wPE+CeBHQA6geobUN+L1sbs70iE
-eei8gvGiI+Y+2cQzSjIL0qEH3YFcLV05R2iRgUN1aMXywxLOlfRhl9bOrQIDAQAB
-o2UwYzAdBgNVHQ4EFgQU/rP7y0WdXMLRdHdnxh5xPbLpFskwQgYDVR0RBDswOYIP
-aWRwLmV4YW1wbGUub3JnhiZodHRwczovL2lkcC5leGFtcGxlLm9yZy9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAL1YSqSt0GbkJqiBsKvf0NgInNIAz
-25HjG/RxxETiQicxIrusYLgOb9czKQKGi9cWxyKY00cVBPLq9J2TIg0URWJBZMnh
-QzcZS9Bz4eDIuQ/s1zzOTxJzeAUJHIIme8DwEx+VNJHdVuntmf44TsxdOxxTPg0S
-dd55ODSvyXtIcJcCSj4Iuh6iQM+Wlq2PAH4GxhPmevz/Yl/5kEGIKrAjcfDOTwaD
-vp0OaVjVxH3HPESQTqPd2JrOVd4Ghtf59oadIMAwGxQ93/Ci33s9iaoHYEQtnHdQ
-KbGw/zFpxtXvzKZu3tXYOU79RQceiSTlOhm2JNPPL43AwNw6rsX69prLZg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni.opole.pl:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uni.opole.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uni.opole.pl/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uni.opole.pl/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uni.opole.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uni.opole.pl/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni.opole.pl</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUJYgjpRkfWuuLnYgjmOtFu6kZyuQwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMB4XDTE1MDQzMDA2NTU1MloX
-DTM1MDQzMDA2NTU1MlowGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvpolQ/zhvPO0OGBOJu8JjMLurb10
-qNcR+RuS/YUZ2wbnjggMSCHm+X+dY2RAX2Qu3sty2f6Rizpwa4dHcTVARrHonPu2
-0j+bFjQndzODqAbg3IsD+i9P2qPXJOZ0atgfcf5FQ+h8AgOST3pRX9YSwDcOZ/mO
-hoDlitxWJmXxX+e39Ix0/ONtfpy+R9JKE+UEuqZ/xBiwmKwfRll5M4V7mZj8UcFW
-/AvoWol8h+UUtHSweZxZYAad1nniIlDOBN//ABM+wRc4saC/bB/wV1NTi8ZQp8i+
-MEZ+81TwOmpxo/z5EOPbl0/rl1VhG54yxjFFgqI13tn4QLoJWUGozYO1dwIDAQAB
-o2UwYzAdBgNVHQ4EFgQUA1adRNultXunWuW5NyNRqc46bdowQgYDVR0RBDswOYIP
-aWRwLmV4YW1wbGUub3JnhiZodHRwczovL2lkcC5leGFtcGxlLm9yZy9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAooPuGuUZiJUc+9rW8FnHvflucH3h
-rpu75Fyp6/e7U+KpiKAmrdo83/Ve4GadEhBEANZ/lbu1z5eZTurXhPA6j4Df89Xf
-3GkPpyy9YoFvKypn/FeUAMpyo+BlNSnzAQuC+b+AYZrKwjwBKk9vrpGPJ7uUsz9D
-VBWHN6W0pQqExq6qXfgcLGnluzqJ0LbNGJrndfKV4WN/MAE52zVo24f9huQandRt
-PTimpBVSen6/qlR87r67YGV6/jgfL3Q8N5g42sT2iT/05Q22aYaIk1+e9X44jIos
-gn4E7aCKeaHFN/LG+NCNR1Fq+g0vDJIPe6FDeaC+kqK84MtvxqxG/wJxBQ==
-                        </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>
-MIIDKDCCAhCgAwIBAgIVANM9C5l48yMhTAHJ9LbCXXOK1yQHMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLm9yZzAeFw0xNTA0MzAwNjU1NTBa
-Fw0zNTA0MzAwNjU1NTBaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLm9yZzCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALCW6XciidnTK7mHBV+aDlGBuNKk
-Pj6O3bXSdt0cQQhMlKS7rNmxMaKsS1SxKB/E5OcUeL1DjAqICGpYls33cWIgLvSB
-wTkLRWQRLxsV2cvdRK6Deb32Tf7KeR3w0coHpYQ8GeYVTGA98F2Ovmo/ZUgXr2qK
-C55rOrmbyPs7Bqi9jjeFDNaczu3Y25kkp1sultt4AZZOtMkIsjypnYkhxn9/2fVp
-W/ZFXqoemfT3N63t1SWNZc+Yaeo82kvbLcrkFeOdkD2vmXMXSjt/+LGOnI8fpARy
-r/57UVycEpyfDp+Fve+EeUOP7LMQMVpLTQJxLFesL0lTTUsgx1PktUmc18ECAwEA
-AaNlMGMwHQYDVR0OBBYEFKlA/UMF3cCICQgPWEmRaIAaALeYMEIGA1UdEQQ7MDmC
-D2lkcC5leGFtcGxlLm9yZ4YmaHR0cHM6Ly9pZHAuZXhhbXBsZS5vcmcvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAA95wRr3PU93Cy9Cu2oCIOPpNrHm
-7FO524QdyhuInC9Ue6ZGrez2J9TNJIblQzzsCw+STD0A0Hs8oHuZxl0hV8USsq4f
-ZNkdoRIntpIpOt7VefS2pxNDP1JGzgI36S2dgRPgNGBhtsd+5EjRCOPONeUy2gx/
-OeBnwcw8j36pQHdRlZKQVspAS5h0ePRHbS7luIQDeL8ZUkXIXuLEmnjHXnJzWUCP
-N5DC9rjlhu2+0Z1KeiuZgmVAiB66BFvjXCnkWIK5kh+/C/BYQpgHDx7B9nBYr5Xb
-2iYaqN73c9+XwBSf0+vYLC9Ivn6fAXMUN/wkK1FH9hjX09wBPR8LS2oq5fg=
-                        </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>
-MIIDJzCCAg+gAwIBAgIUEVPEG+BAdndjuiWqotqWKaPL2jowDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMB4XDTE1MDQzMDA2NTU1MVoX
-DTM1MDQzMDA2NTU1MVowGjEYMBYGA1UEAwwPaWRwLmV4YW1wbGUub3JnMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoGJI6hLgX21HDCZsTHQoI4xA91YD
-LNuTv2q+nxSHeYy3uCDCAbDAuwJDnpdbdGlYadVvG1gHTkHRMc7pS2HSgd5y27Ig
-TMzAUeLLJM1ZUajJs8d7g32LLGQEHIFAwidYB+saKaCOCSRowLx5Cw5vFWLxEEih
-evERL6P8J3mb/6vzTSJeqYU9XQxI8+FQQY9mI7JLaprn60dHj3S/XnxLmbVEgQ2Z
-/jSRFDAufZ8Jv9EAqMqmRtXEakaYjQzM/anu0wPE+CeBHQA6geobUN+L1sbs70iE
-eei8gvGiI+Y+2cQzSjIL0qEH3YFcLV05R2iRgUN1aMXywxLOlfRhl9bOrQIDAQAB
-o2UwYzAdBgNVHQ4EFgQU/rP7y0WdXMLRdHdnxh5xPbLpFskwQgYDVR0RBDswOYIP
-aWRwLmV4YW1wbGUub3JnhiZodHRwczovL2lkcC5leGFtcGxlLm9yZy9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAL1YSqSt0GbkJqiBsKvf0NgInNIAz
-25HjG/RxxETiQicxIrusYLgOb9czKQKGi9cWxyKY00cVBPLq9J2TIg0URWJBZMnh
-QzcZS9Bz4eDIuQ/s1zzOTxJzeAUJHIIme8DwEx+VNJHdVuntmf44TsxdOxxTPg0S
-dd55ODSvyXtIcJcCSj4Iuh6iQM+Wlq2PAH4GxhPmevz/Yl/5kEGIKrAjcfDOTwaD
-vp0OaVjVxH3HPESQTqPd2JrOVd4Ghtf59oadIMAwGxQ93/Ci33s9iaoHYEQtnHdQ
-KbGw/zFpxtXvzKZu3tXYOU79RQceiSTlOhm2JNPPL43AwNw6rsX69prLZg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uni.opole.pl:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="pl">Uniwersytet Opolski</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Opole University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Opole University  
-    </md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">Uniwersytet Opolski</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="pl">http://www.uni.opole.pl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni.opole.pl/en
-    </md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sławomir</md:GivenName>
-    <md:SurName>Paszkiewicz</md:SurName>
-    <md:EmailAddress>mailto:idp@uni.opole.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d1912fb3..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.unifi.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-06-23T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifi.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Florence</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Firenze</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for University of Florence users </mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università di Firenze</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unifi.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unifi.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifi.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Studies of Florence</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Firenze</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Florence</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Firenze</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unifi.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unifi.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idem@unifi.it.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8128b39c..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.univ-corse.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Corse</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB1klEQVQ4y6WTT0iTcRjHv8+7PzqiLIqSIpQYUUhENt0OssDlal27REI3O1dqq2uI7FZ4yXXpkLEt89Ylagg2sLK2pqHudTrXdDFduZa2et/f9nQIQWxvTvpePzwfnt/veR5gi0RnGcNh7tbi0lYCIeB7OSJ3anG9FngyzDAfxEAwNH1p+Ws+vW1Bo/mH92FgvD2/xpBKhZ3besLzt+wJjcau9nRasKcqjYJSLFUsGImyJ/Jhyr2SW4GiCOjUGC6eQY0i+DYz/1sQmmDP+3DMnUxloddLyGSWoIoSTNVVSH1K9ooiPv9UubWsYHS84H0XnnEnF7IgAnSSDrIs40H/faTTi3g08BjyTLx2PpEIJhcyH/8SqKXqvqXst6JEBAKgChUOx1m4XBdQX1ePtrZziEQiCPj9qdoD+++s19HGdsLTbB16NvY69/0XzIcUXOtoxeDTIcRnEzhtaYbdbr9rMtINzT9oPEZvWlqa7EaDAST9Qd7+PhhMh3NOh402F5edgstGr05ZrJd37TBhbm4eNuctZIQ1OzZprHyRrpwnXzTOHHgx4VN5L/Krq2huoLICzVs4aSZ/3ZET1xkEqfhlX8WLtDHtTrp39HjTTWKxG/+TwSB3abHflUu/94Q3u0cAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDB+PCcVAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwD2GfqQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-corse.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Corse</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>
-					      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>
-    </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-POST" Location="https://shibboleth.univ-corse.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-corse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-corse.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-corse.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-corse.fr/idp/profile/SAML1/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">Université de Corse</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Corse</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-corse.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>VAREILLE</md:SurName>
-    <md:EmailAddress>vareille@univ-corse.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f90c60c8..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.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://shibboleth.univ-evry.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université d'Evry Val d'Essonne</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACXUlEQVQ4y51S4UsTARx9552nU3ckis3MpZmmYYUsBfsQCY3y20jYYBYSQUH/RH2rbxERVGRJoXALLRGiBI0KzEyRSGboMnbblG267dzdrl27+/UpkUit3qcfP3iP93vvB/wjMtGoi4hIIaLxmYVe7m+JSlx2F5cLogpgfFWHZvIoAMsxAKBoJhUXMjAMM8RxrH0zkbR1Nwqt4rIOTIZlzMfWsRRahddxACf25J/jAGAqLKPGykAoyK8mMiWGybMDQEInt8xCfP4hiEAijW8BCYm4jB5nG+oo7eEtVT4OAOalKNTdAuTIMjpbm6qJzH6Gyeue/hwWRyY+IRqNIxVaRjqWRE/XKZysKfHY7DYfAHAAoK7EMCcFIS0GkY2s4Hz3Ge+9vlfem7f6oCeTUGJrYL4bcHs6UVdp2SBvCByvs+H6jQegbAalRgajY+8x0Csim9SgJ3VYhRK4L7rQcLTK43S2+zZnxAFAxS5+IJdKezVFRSyYwNiTCfABoHFfPeqP1cLRcRhCQ5HH0X7I93s7zK9hWHxDI0/HUCGUQp1Ko7yo2I8ydtpzzVVY01b9kmfYR3+qd0OAiGjQ9xraugqhyIraxsr7RxwHL+/0H3mkKy4ioqHRj5BiCexv2gvn2TaU2couzc8tSTsJMIpBdPfZJNYCEXQ02+FobwLLmuB5Dixrgd+/MNTS0ti1pYPbQzP44g/DRtrDjtMtj3O5H185tgB8vgUgA6ZJqW0tXLnaL468eHdh8y6Vyoizs/5ARs0SEVEkEh/e8oTtxAOLoUEykEul5betrc13dsrjv/ATgF8QqGCBY4sAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDArMDI6MDDpozY8AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAwKzAyOjAwmP6OgAAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-evry.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université d'Evry Val d'Essonne</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>
-					      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>
-    </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-POST" Location="https://shibboleth.univ-evry.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-evry.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-evry.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université d'Evry Val d'Essonne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université d'Evry Val d'Essonne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-evry.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>assistance-reseau@univ-evry.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 20d16c37..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.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" entityID="https://shibboleth.univ-paris-est.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université Paris - Est</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABUUlEQVQ4y82TvUoDURCFz9ybzSbZtTAIWhoICFaSBAt9A/ENxMZCC5GkE/II4g8SSKWdpa2dNvbaWIgp7CxUTHDNkmR/7lisYtZN1qRzymHOx7ln5gJxdcDAJseOiMFtBuq8bqYeLGPpvYEaL6I6GESRzhHn0tN8nm7fFAQFIt8T6BjFi24Tq6jQEMAhQ8vizLBv1xJJH6w4NEVCwLEJVqa4h1fsokp9gBrDVHdOyuhprBQw7NkEQAh03ammrWZz2CYryMAFtKQbL/6KBr6CLltZOMiHQuT4sMOcYFbFbGH0+kcAGkNEfRsMABLwPAGSfxgigKSA09MdJPD0AygTPtQCtfXSpWIJElE/JAW8nkSTSift1ryOHXqJOi8zkMdyxrRO025jjr5P2RfoGIWr7hutoELOL1ODioE6tibU/b4yZp5ta3IDj7jG8ThJASN9509zO3fNGpcRbAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0OCswMjowMGOdgqsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDgrMDI6MDASwDoXAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-paris-est.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université Paris - Est</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>
-					      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>
-    </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-POST" Location="https://shibboleth.univ-paris-est.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-paris-est.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-paris-est.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris-est.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-paris-est.fr/idp/profile/SAML1/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">Université Paris - Est</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Paris - Est</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-paris-est.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>systeme-information@univ-paris-est.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e958b9dd..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-savoie.fr-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://shibboleth.univ-savoie.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université Savoie Mont Blanc</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACgElEQVQoz1VTW0hUYRCe//zn7MXcs0tkEUUWmF0wsiJIg5B62Yj1kpWSLwViNy0Ss6QyyYweEiKwhyIMKUgyy7IbottDJLhrskEbK+7aQykbBtq6655z/v+fHs5q9b3MwDfDfDN8A3weiKjrRsu1F4bB6useR8LRp10+70AQERljjKXKCOccABAhHtdU1V5edjvxW1+1OgO5+DAYau84lrs5U9eY1aYgIgAQzjkh5EzNw1gsmZ+fZbMp/b6J7EznrziHRMK9Z11vb2ByYrq2zr0jL8swGCDi7OxcdfUDTdMZYwIxUnPu57uBsdP1Mf8nAxER29r6OjsHTc0SAAIQi6xQKkkSEQiyS7U60qyLXUgpAACARZaplMolMwiBiIgIhACPz/GkzmbjIESKNbl/GwAIAEEhBIDsdCxS7TaXAxSLmOcWsNAAiEgkKiOuaLxQeefL6O5Djk0bQWfwP2QAIASEEIoi+/3jikL73nxeszz90b3+Jao7FIqW7N8mBJL5MbK5gMUix2LJqsr7I4FvDeeLrt84OPhxrNBzKzz+/b23yelKY5z/lSRJhEhQfapjJBDcmbe+8Uqxrht5+Vlna90A7MTxdr8voqr2lCZdNxCx4nAbQMnSjJOjoUlETCZ1TTMQ8eiRuwClTrUqHI4iomEwMImuJ0MAZa9fBRAxHk/u29v68sUIIibiWs6GhoJdLWY151yiVBJClB7YXlFeoCgUAC5f7PZ4cp91D4fHovY0S07OyqvNpeYhU15CRErp1FSsualnejqxNnvZpcYi31Ck9ebb9HRrUfFWT+EWw2CUSgAApmkZY0IITTN6ng/PzCQYY4jo9Qa/Bn+YFlr4gj9nNohWG/NjZQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNiswMjowMIpzAwYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDYrMDI6MDD7Lru6AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-savoie.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université Savoie Mont Blanc</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>
-					      MIIExDCCA6ygAwIBAgIJAJbxent7hKLoMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD
-VQQGEwJGUjEPMA0GA1UECBMGU2F2b2llMSUwIwYDVQQKExxVbml2ZXJzaXRlIFNh
-dm9pZSBNb250IEJsYW5jMQwwCgYDVQQLEwNkc2kxIjAgBgNVBAMTGXNoaWJib2xl
-dGgudW5pdi1zYXZvaWUuZnIxIzAhBgkqhkiG9w0BCQEWFGFkbWluQHVuaXYtc2F2
-b2llLmZyMB4XDTE2MDIxMDE1NTMwNloXDTI2MDIwNzE1NTMwNlowgZwxCzAJBgNV
-BAYTAkZSMQ8wDQYDVQQIEwZTYXZvaWUxJTAjBgNVBAoTHFVuaXZlcnNpdGUgU2F2
-b2llIE1vbnQgQmxhbmMxDDAKBgNVBAsTA2RzaTEiMCAGA1UEAxMZc2hpYmJvbGV0
-aC51bml2LXNhdm9pZS5mcjEjMCEGCSqGSIb3DQEJARYUYWRtaW5AdW5pdi1zYXZv
-aWUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4KlcQxN5T9TCY
-G9HJc93oBGyp/IPPUhHNwbVuGaR9KAgWPlnIO35975SlA6Qqaa61K3nQduRf1iii
-AdqY1ydteTdz1tfj4TSRjisQpuL4aLl+nRjIlmeLQtnGuQODwWLnmtEt9sXhFv+e
-hRGtFz9tx0IMOhjwRcMO0+Ww9uMJgmq3CNk20Y4T4LCa5IhySMTJcKr29N190LrF
-PzqTNPj63BQkW024kaSbJ2Y+iZltki6LkBR1ImW72+BzT1y67Bm9CXfoZQwYG7SM
-oeWSwOGb1udoT0D5VVjcHtn7Rm6A70clfSiGdYejCu8hRpR39LKu0Ho7jpeJeV61
-ij7mWIPVAgMBAAGjggEFMIIBATAdBgNVHQ4EFgQUleairMIFuBdMbW1POt5FaZwt
-1HMwgdEGA1UdIwSByTCBxoAUleairMIFuBdMbW1POt5FaZwt1HOhgaKkgZ8wgZwx
-CzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZTYXZvaWUxJTAjBgNVBAoTHFVuaXZlcnNp
-dGUgU2F2b2llIE1vbnQgQmxhbmMxDDAKBgNVBAsTA2RzaTEiMCAGA1UEAxMZc2hp
-YmJvbGV0aC51bml2LXNhdm9pZS5mcjEjMCEGCSqGSIb3DQEJARYUYWRtaW5AdW5p
-di1zYXZvaWUuZnKCCQCW8Xp7e4Si6DAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
-CwUAA4IBAQAtaBrE87iXhJVQ38JOgy29ruhkxsAQGJfxAmhPIhXvUFGm7gBtYkHG
-AHxGAOfXlgsvF6ekC7z4rGwJdiH97ptJhGZIBe0pSdhzaX1FOGOADb5stDXIMaVI
-qpW9O8oLPaOUvQyZ7RNbuJZiCLjd7KtfJAy63nnmPTlaO1KseEcEZrST5uuWbltU
-sa0Kdh5BaG+SZGojEU7rdaPHLivYBl01AqHUH8GGh8lEpW927qT5DbHB8PQ0ADLb
-Ejy9Isdv3XKc4EQXb0tXfL4ot92kqqykLaoMAePFpC84lOl7ImeTh/ZCKXIbIcHX
-TZ4u3TcwVEXeqvbuZPUec7hFrEtrVbcA
-					    </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>
-					      MIIErTCCA5WgAwIBAgIRALPbdkEOx6FPwPjzvFKn2PswDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTUwNjAxMDAwMDAwWhcNMTgwNjA2MjM1OTU5WjBHMSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxIjAgBgNVBAMTGXNoaWJib2xldGgu
-dW5pdi1zYXZvaWUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc
-n+cQ/mdGc3AY6bv830qQsonjGaGyWQ51vQUZFZHp29Icwb6ALXtlvZAo8Qq8r3xD
-TA6FxG3s+oLvVjMhkKxID4LC/8yqtMPq7DNj++1SX+7gLDhIPf05/bwnMN3tfgqY
-trOTeNOjClEmCyuPRFZVMqU4jdSS/NGwPHTEG1hKn43dzRMR/eSaA6b4rrOqGETC
-TVnWOTvBy+nF61HwV5ZSwRaqcwby3fk6GmysrNEWqOH0QCxKoOWMbD6mWlP2C3Xl
-my783dWTlBZLYLj3uHnacY876T4gW13PA+uI0RrI6PrBu/u7PirnhD3en4PRgZW2
-sQ+BUQ4l6yGrcDo5wFmHAgMBAAGjggF1MIIBcTAfBgNVHSMEGDAWgBRb0IocmjJb
-4LXdllQb4YYosP22vTAdBgNVHQ4EFgQU5SwCQHTC34s3Ji4uOI26ObhwSoAwDgYD
-VR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEG
-CCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoG
-A1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFT
-U0xDQTIuY3JsMGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2Ny
-dC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0
-dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wJAYDVR0RBB0wG4IZc2hpYmJvbGV0aC51
-bml2LXNhdm9pZS5mcjANBgkqhkiG9w0BAQsFAAOCAQEAcLqMd/xRnFts0Ww92RCE
-bKKcHlzHKXwhhS3nod2dvcw/fVTdqUno7ixuyFuRyEjj0+MkDNB7+avIwBpzFg8x
-Job5B3yADerKwycwZvK9x7IeKF9k4XpQr6NYQEwzefCf824URQoe9gfKqpsikcJE
-2SbtIZkdk9iPRsllEYtX8wBrpRojuxd8KTnrs9H+avbiMEMGNab6abXo/LlzV24r
-spTSQxjPfGyDRqxfdI72tc0ES0O0S1NyCI9BovBjTz0sNXqHajpaOKfOmdSjasI4
-vKSy/VQ/I5RdC1gSqP+zBpdnBCrc2PHmKeDo1ofCxa0kR8omQn+Y994RoV1PdKkv
-7w==
-					    </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-POST" Location="https://shibboleth.univ-savoie.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-savoie.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-savoie.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université Savoie Mont Blanc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Savoie Mont Blanc</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-savoie.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>admin@univ-savoie.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 aecc5db1..00000000
--- a/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-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://shibboleth.univ-toulouse.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Toulouse</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACKUlEQVQ4y3WSu2sUURTGf3dmdvaRZNZkDUR3MYkBES0MKlsIJlsIVkGCTQor/wJbCyEi2NuLhSCmkbVKFwj4IqCyWmijcY27EpldEyfuI7Mzcyx2TDLZ5Dbnnsf3ncP5jpK5zDRQ4KCn1Hv1tPaumZt6klR6GSjvq1g2gMJ6W+b3Rpu+8PEP1NxgEVh40P5RmCCFpYwI+mpiaF7b39TpCC/r0PJhPKVtA3GATzSwxe0ZsofggwOeQEegIxIHmNT6ywBfadEQ/3CC9baw5YGhwDKg0hKA6rQ5WB7BBKBC+3CCapjLJcGK7YSzRdce8BEANvDwRCIEOwo0w+ksA37tNoqv+i3LYxfUxGcqnl4GSgZwayShjgCUNtxZgJtjiRdL6+3Lb+peHdi+Uy/fA6rhQk8CReAngJLhXBqYBErKrtwImxSB2fC//fbKSP5C2qw++t44/aXhWffPWJ9Bbalna3eVDOemK4G/DLCiezgIWdHwEAJYnLHthYcXM4+HTY2S08EN4OyAQZ+uuPbaVpElJgU8BVUVAJDqGqvmBthugBuArqBPVwerkJWu6ylwlDCqxxxgNa7Bt3DDR83o6US8jGgMSZc9hmJCaUVg6X/e1CCbiBJEjxs47+u80j1+K+G261yaOZY8XnO7Eo4mdQy1O75cP5HuOeUYirxvMBDKPmTqY7qC8ZTOYKynfNIANnOa/hwo7c2cEoO5VHyFvKGt/e2c6zd6wACb/wA7XMnoqvjdIAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-toulouse.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Toulouse</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>
-					      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>
-    </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-POST" Location="https://shibboleth.univ-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Toulouse</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Toulouse</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-toulouse.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Francis DELBOS</md:SurName>
-    <md:EmailAddress>francis.delbos@univ-toulouse.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Boris VALERA</md:SurName>
-    <md:EmailAddress>boris.valera@univ-toulouse.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uoregon.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uoregon.edu-idp-shibboleth.xml
deleted file mode 100644
index 3e359bd2..00000000
--- a/swamid-interfederations-2.0/shibboleth.uoregon.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://shibboleth.uoregon.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</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">uoregon.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Oregon</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Oregon's Shibboleth Identity Provider</mdui:Description>
-        <mdui:Logo height="239" width="200" xml:lang="en">https://shibboleth.uoregon.edu/images/Large_UO_Logo.jpg</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>
-MIIDQjCCAiqgAwIBAgITFP1Rwp3clPykVwEUThiy/rAHejANBgkqhkiG9w0BAQUF
-ADAhMR8wHQYDVQQDExZzaGliYm9sZXRoLnVvcmVnb24uZWR1MB4XDTA4MDgyMTE3
-MDc1OFoXDTI4MDgyMTE3MDc1OFowITEfMB0GA1UEAxMWc2hpYmJvbGV0aC51b3Jl
-Z29uLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMteVz2c/MiM
-sfGzE40vUED14ud3FeW9GI3cP57J2zBqAqjYhpNj30MV1BysTOJOGJj2tw8AA1pS
-V/FCMEqq6jrQxVtb8gcBML2gQMhJoiy6EHB5hXZSXBzfizrjoz7/DaaB3ECpMecH
-9ZzUmG84ZCiSXKoc4unTuJW+pMGbwTbG6gikxdUuQo3Aq03zJU0shOl7jK32NgPK
-smQ8cQomcKVwYuep2i8JvEL/N7NH4ERJafEYA7/kVS4Qe4UmjLG3aJ9XjVagnjnR
-S+8sTNk2MGJZLubY1C8atcQLxVhO4oqkTe32ogiv/lloPHD2Mi7aztE94wLpNcjs
-ycupoUurNIcCAwEAAaNzMHEwUAYDVR0RBEkwR4IWc2hpYmJvbGV0aC51b3JlZ29u
-LmVkdYYtaHR0cHM6Ly9zaGliYm9sZXRoLnVvcmVnb24uZWR1L2lkcC9zaGliYm9s
-ZXRoMB0GA1UdDgQWBBQColYoD3sV0YAk4Ir4jFYkYOBITjANBgkqhkiG9w0BAQUF
-AAOCAQEAl31lJSmErQH4KnFZbukNAhYesZc8M/M0vNi4fLrJm1SlKunYof6fykpB
-LdvlamuJd1eoV0ltCeR52meq+ej1BdFj/hyZcM66hglH5UY4LaeejG31zJplw5o7
-7ohjKy09RmIaiMX0rlutX14IYgEtRXrFGuYFJYiXpK6qiwC/ikjBU3Yjj0Y9B5/K
-5k29STlxFRsKiE511gGeO0Xkcxj4c7Dy3KfwW5wooNiBcL6hCIu+FUUC649WpkNG
-N5GXH191Krz58J6/VJJBsz6T3anUiK6NxxX+/T3fb1FDmR+isSsAJfbFwSpXA1sM
-gVS2dGCBxZlwSzi9cmvk13sneid0+Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uoregon.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uoregon.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uoregon.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uoregon.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uoregon.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.uoregon.edu/idp/profile/SAML2/POST-SimpleSign/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">uoregon.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQjCCAiqgAwIBAgITFP1Rwp3clPykVwEUThiy/rAHejANBgkqhkiG9w0BAQUF
-ADAhMR8wHQYDVQQDExZzaGliYm9sZXRoLnVvcmVnb24uZWR1MB4XDTA4MDgyMTE3
-MDc1OFoXDTI4MDgyMTE3MDc1OFowITEfMB0GA1UEAxMWc2hpYmJvbGV0aC51b3Jl
-Z29uLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMteVz2c/MiM
-sfGzE40vUED14ud3FeW9GI3cP57J2zBqAqjYhpNj30MV1BysTOJOGJj2tw8AA1pS
-V/FCMEqq6jrQxVtb8gcBML2gQMhJoiy6EHB5hXZSXBzfizrjoz7/DaaB3ECpMecH
-9ZzUmG84ZCiSXKoc4unTuJW+pMGbwTbG6gikxdUuQo3Aq03zJU0shOl7jK32NgPK
-smQ8cQomcKVwYuep2i8JvEL/N7NH4ERJafEYA7/kVS4Qe4UmjLG3aJ9XjVagnjnR
-S+8sTNk2MGJZLubY1C8atcQLxVhO4oqkTe32ogiv/lloPHD2Mi7aztE94wLpNcjs
-ycupoUurNIcCAwEAAaNzMHEwUAYDVR0RBEkwR4IWc2hpYmJvbGV0aC51b3JlZ29u
-LmVkdYYtaHR0cHM6Ly9zaGliYm9sZXRoLnVvcmVnb24uZWR1L2lkcC9zaGliYm9s
-ZXRoMB0GA1UdDgQWBBQColYoD3sV0YAk4Ir4jFYkYOBITjANBgkqhkiG9w0BAQUF
-AAOCAQEAl31lJSmErQH4KnFZbukNAhYesZc8M/M0vNi4fLrJm1SlKunYof6fykpB
-LdvlamuJd1eoV0ltCeR52meq+ej1BdFj/hyZcM66hglH5UY4LaeejG31zJplw5o7
-7ohjKy09RmIaiMX0rlutX14IYgEtRXrFGuYFJYiXpK6qiwC/ikjBU3Yjj0Y9B5/K
-5k29STlxFRsKiE511gGeO0Xkcxj4c7Dy3KfwW5wooNiBcL6hCIu+FUUC649WpkNG
-N5GXH191Krz58J6/VJJBsz6T3anUiK6NxxX+/T3fb1FDmR+isSsAJfbFwSpXA1sM
-gVS2dGCBxZlwSzi9cmvk13sneid0+Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uoregon.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uoregon.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Oregon</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Oregon</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uoregon.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Noreen Hogan</md:GivenName>
-    <md:EmailAddress>noreenh@uoregon.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rob Chevalier</md:GivenName>
-    <md:EmailAddress>middleware@uoregon.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8e8eec87..00000000
--- a/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.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://shibboleth.upmf-grenoble.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACKklEQVQoz43ST0hUURgF8HPvfeM4oqT9s8YiRcWiVpOg1SqQgpQwCAqqXYuKIlC3LkKC2geSLmoTCBKWEVYo5aJICzRGLQipdKYZbSZNR9978969p8VkBJH023yrczbnEySxhoAgKACSAhICfxF/Bv6HRUII5pIEkfVXO7t1Kh2o3JdXH1E1u4QUAAgi16yNNqTz6vV8pDbT0+NGo3FgbjMWTiNVVzwfqV9sa89+/mJIrY3WGtoYP7Myv3tvDHDHxu2hoRngx1XFjNTvYXchuQOJcLk7NUnSI+GTK/f7YsBiSxvJ5Tt3ZwG7WzKh+EkwBX9UJjci3XzKkNpxpATsztsiVFTQ2gLAn/ygBNQe0CMMsQhVZfKb4I9ECbjPBqX78JE9+KSgsdEKbzeAN/LOqoAKC/ogQAl40szAWEoCTm+vXLp0RQCBhsMCMKmU/3Y8eACikMKQVChSzkux+gL5zQ3a87yh54gDX1XAfTNK0u57EIewu6RJKsaESUm3H4kSfIvU64UFe2AgBliqbCdWHVVeAcDufypDzKsDbZMdg/OY7uDW4JmzGzraRXGxfa/H2laG7xcvJzeVaqON48xV1sSBVB3SR0vTJxqXb97ypmcNaUhvJZMoKlm61mGFjh2RoBAyG53wpz/mNR0vOHnOOnTQqgoL5MYlAelmC9taQxfOg2uWr99IbCn1HIfrkvhVA3d4OLC/VgWD67+jzB2TzeqJqUB19e/8v/wE7wdXROlEJI0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDIrMDI6MDB+PCcVAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAyKzAyOjAwD2GfqQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.upmf-grenoble.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.upmf-grenoble.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Grenoble 2 UPMF</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Grenoble 2 UPMF</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.upmf-grenoble.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>sysadm-dsiu2@upmf-grenoble.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 641d5d9b..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.ups-tlse.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Toulouse 3 - Paul Sabatier</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAA1VBMVEW9AADegnvOQTnvw73WYWPGIBj/4+fnopzecWvGEAjnkpTWUUr3087OMDH/8/feaWPGCAjniozOKCnvtrXeeXPGGBDnmpTWWVr3297WSUL3y8b/6+/OODn/+//GBADehoTeZWPOICHecXPWUVL309beaWvvvr3GGBjnmpzGAADWRUL3x8beYWP/5+fvpqXGEBDnlpTONDH/9/fGDAjnjozOLCnvur3efXvWXVr3397WTUr3z87/7+/OPDn////nhoTOJCHedXPWVVL319bebWvGHBjnnpzxf+KOAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAx0lEQVQY0y2ObW+CQBCEpxWDxKIXQGsVvFgFjYRQjFbRc2Ik8f//JG/R+bDZl9ndBwqYA2q0ficQLT4uxkz+fOlI62T40r4do58wdw61yUgtnrKge967pkZE/ljDkV/LnfXPPDyY2Rv/TDfs3SofCJJkAdUw1sw2Oi0l70v4LFfyY6rQ8BsqZwpVxVXIq2dYAZo5EDvOlEHKxmJ1B/b9w664vuGvgPXIccjxMCrYUS26lpOTmrysW3SFbSZk9dF7laLg7lzbEk90xx7pCF5XGwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-tlse3.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Students and staff from Université de Toulouse 3 - Paul Sabatier</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Toulouse 3 - Paul Sabatier</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels et étudiants Université de Toulouse 3 - Paul Sabatier</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>
-					      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>
-    </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-POST" Location="https://shibboleth.ups-tlse.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ups-tlse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ups-tlse.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Toulouse 3 - Paul Sabatier</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Toulouse 3 - Paul Sabatier</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-tlse3.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>federidmaster@univ-tlse3.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.usu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.usu.edu-idp-shibboleth.xml
deleted file mode 100644
index 3cf042e1..00000000
--- a/swamid-interfederations-2.0/shibboleth.usu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://shibboleth.usu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">usu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Utah State University</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>
-MIIDNDCCAhygAwIBAgIVAN5rvbP4K7GmRoDpmtKTw2gl0lEMMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudXN1LmVkdTAeFw0xMTAyMTQxMjI1
-MDdaFw0zMTAyMTQxMjI1MDdaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudXN1LmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfljSATBO8mCYlTKdCf
-XKBDTSbXttlSplVly3qutRqGkBsJYMPoK0nd7vaGmHmZXjXVXFRwGMLHBG6lkxQj
-rf8748zoKGWjdka3QFEYcEXK+xbbkCg7WyCLatAS23TyQEc0Rn2XEBgdrxXEvFAt
-jZtGVusXfXk25xldHJJ/usqCO7cXoZEoN+mWE8W/Wd5tZJTtLjH1Cxl5s8Cgpd7g
-buotzbsyykph8eJWycFOy5BUVi8e7umyWLKh9ZqSYjlmLcqcK/ZfWpVKjDBYM8Bt
-W0QD0CwhAJnBPvNi6j1q1vbNeIuisuRbWEqnKIJU8pqgJdA4FKHwLDeQ7k3wxeNJ
-O1MCAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmJvbGV0aC51c3UuZWR1hilodHRw
-czovL3NoaWJib2xldGgudXN1LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-Bb5q0BZx1Lx8/dnKvlOt51u4yJwwDQYJKoZIhvcNAQEFBQADggEBADP3QDO1PDLv
-3nzgisFfoPyVS25k9dgzx8/58U5cC+XSsV5CeoFSvegW/ji9zy4rSD3p3naxqfEK
-/cyDYI2ajwNzo9cBquMHHYe/AP1xF46sCjxAIPiABQaGGvBt4qNHGMSA12HQeB2B
-2Bg+JwMw2RBGXIJxHSGMhqDHfU8HeGlaowKdviDS2Y/fdSD6u7miGX9f26kPT+UI
-YI3rmm+hqgCiHnN4ROJ6aCcII03zTdyVbE97Ho77trGKzB2F4aXqTBhMab39rAOl
-oBeFIPuEqHYWp3GalpQ4DlTYl3+t24gGqfR+XcZSfSbMV7YEB09Bg72LSU7h+t1t
-4WTDmHYR+OA=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.usu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.usu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.usu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.usu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.usu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.usu.edu/idp/profile/SAML2/POST-SimpleSign/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">usu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAN5rvbP4K7GmRoDpmtKTw2gl0lEMMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudXN1LmVkdTAeFw0xMTAyMTQxMjI1
-MDdaFw0zMTAyMTQxMjI1MDdaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudXN1LmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfljSATBO8mCYlTKdCf
-XKBDTSbXttlSplVly3qutRqGkBsJYMPoK0nd7vaGmHmZXjXVXFRwGMLHBG6lkxQj
-rf8748zoKGWjdka3QFEYcEXK+xbbkCg7WyCLatAS23TyQEc0Rn2XEBgdrxXEvFAt
-jZtGVusXfXk25xldHJJ/usqCO7cXoZEoN+mWE8W/Wd5tZJTtLjH1Cxl5s8Cgpd7g
-buotzbsyykph8eJWycFOy5BUVi8e7umyWLKh9ZqSYjlmLcqcK/ZfWpVKjDBYM8Bt
-W0QD0CwhAJnBPvNi6j1q1vbNeIuisuRbWEqnKIJU8pqgJdA4FKHwLDeQ7k3wxeNJ
-O1MCAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmJvbGV0aC51c3UuZWR1hilodHRw
-czovL3NoaWJib2xldGgudXN1LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-Bb5q0BZx1Lx8/dnKvlOt51u4yJwwDQYJKoZIhvcNAQEFBQADggEBADP3QDO1PDLv
-3nzgisFfoPyVS25k9dgzx8/58U5cC+XSsV5CeoFSvegW/ji9zy4rSD3p3naxqfEK
-/cyDYI2ajwNzo9cBquMHHYe/AP1xF46sCjxAIPiABQaGGvBt4qNHGMSA12HQeB2B
-2Bg+JwMw2RBGXIJxHSGMhqDHfU8HeGlaowKdviDS2Y/fdSD6u7miGX9f26kPT+UI
-YI3rmm+hqgCiHnN4ROJ6aCcII03zTdyVbE97Ho77trGKzB2F4aXqTBhMab39rAOl
-oBeFIPuEqHYWp3GalpQ4DlTYl3+t24gGqfR+XcZSfSbMV7YEB09Bg72LSU7h+t1t
-4WTDmHYR+OA=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.usu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.usu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Utah State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Utah State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.usu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>USU IT Security</md:GivenName>
-    <md:EmailAddress>security@usu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>USU IT Technical</md:GivenName>
-    <md:EmailAddress>tech.contact@usu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>USU IT Service Desk</md:GivenName>
-    <md:EmailAddress>servicedesk@usu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>USU IT Administrative</md:GivenName>
-    <md:EmailAddress>admin.contact@usu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e4b7813f..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.utb.cz/idp/shibboleth">
-  <md:Extensions>
-    <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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utb.cz/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.utb.cz/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://shibboleth.utb.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.utb.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.utb.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.utb.cz/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">utb.cz</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utb.cz/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.utb.cz/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Tomas Bata University in Zlín</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Tomas Bata University in Zlín</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Univerzita Tomáše Bati ve Zlíně</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utb.cz/index.php?lang=2</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.utb.cz/index.php?lang=1</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ivan</md:GivenName>
-    <md:SurName>Masár</md:SurName>
-    <md:EmailAddress>imasar@k.utb.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ondřej</md:GivenName>
-    <md:SurName>Fabián</md:SurName>
-    <md:EmailAddress>fabian@k.utb.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 1fad0d50..00000000
--- a/swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.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://shibboleth.uvsq.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université de Versailles - Saint Quentin en Yvelines</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACZklEQVQozzXOzY4TRxSG4e+cOlVdbbfdYxscrACjGY0SoQkhQgoLBFLEErFjmytIriEXklUugX2yBiSUXRQkfkRGCp7FBPDM+KfdXVWnshjxrp/FS5su/Pz8zW+LeMubRnG/cu+b9gvLDD1r22ulebs870Pnm+UP08kv9+7Q3x8Xh0/eYrYHZFidUj4J6bYkQTzu2j3uKHWn7crn5sXx8asfH8vIWdQFpIPia0ufNH9XoEcogBtsoWnsHJMfAPuXJ7Wz/KkN8BFde8nrqxz2JQ0lZUqG88TRtDCJ8l7frzK+qfqnXeCeEZxv4NOH0FzhWHDsmViLjgU9o6VQZc1a00HVf7puSmMkZMWA0TUoLaAAj4UdoSJYoi5CQH22i7Z5MBymnMUyodtiUAI0E55aGgnGQiVRypqMCQlNzHXhjjZrxywxZwiAAOGx8Kyg64WZOrFEbUybEFchM5vUptq5mFUYBFKwitFZQQd9e3PQv+oLYfq4DfNNc9IArao1Z8YwkYAyNIH1juNdL7d3qu9HO4UxAL7spVI4qWrOW01EBBAzGFwg25r8dT/8djS50ACcMQd1PSwGCrtNtsuWiKTk9if+s5do59zlUDxbVc5wzgBAhC6l+Wq92rYuxqsRnvYlxWVe/OpHp00w/6zT65OQAQUAMECAsFhipk7baYyPhUlO1rpKua68d9YLs0lEYMLnVHMI6bRVGBKKKfzx15MX736fL9+sw79GzkrPvbIwnKOuk2ZB3be7V6obt2YP7x48onzxCyyb8/ni3dF/L48+vDxeviZK13a+2p0c7l46nNX7g7K+YP8DWk4gReOlj2AAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDDaTHhbAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA4KzAyOjAwqxHA5wAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.uvsq.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Versailles - Saint Quentin en Yvelines</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>
-					      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>
-    </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-POST" Location="https://shibboleth.uvsq.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uvsq.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uvsq.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Versailles - Saint Quentin en Yvelines</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Versailles - Saint Quentin en Yvelines</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uvsq.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>sysadm@cri.uvsq.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.uwyo.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.uwyo.edu-idp-shibboleth.xml
deleted file mode 100644
index 5c57f4a2..00000000
--- a/swamid-interfederations-2.0/shibboleth.uwyo.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,109 +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://shibboleth.uwyo.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</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">uwyo.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Wyoming</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Production IdP for UWYO domain</mdui:Description>
-        <mdui:Logo height="253" width="88" xml:lang="en">https://www.uwyo.edu/_files/images/logo.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>
-MIIDODCCAiCgAwIBAgIVANo3Z4/Uxn2PVJs0WudES8wCVuyuMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgudXd5by5lZHUwHhcNMTIwMjE1MjE1
-MTMwWhcNMzIwMjE1MjE1MTMwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnV3eW8u
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhs08G8iQTjb2XzJ2
-5O6QqeYfvXWiELJyGXYQzx3Wmk86vTciI2xZ7Jty+ltBtWVwo7L9y9/d1oLLVjZ+
-/lpQiwyOrL0mjg5XmUAZlvUkgPYFdrUUQRGFFxn+23U47hx7QuXyLDNkaJp9rZXb
-DpieXuKpg5eqCKBFUWKIlFeUKUIKJStSHck2dTiIX2fFc/MkkCW4ThNUpZxbz+3w
-a/qamV9bu81/MBXze8ZYIWe/vw/9IN6BHq6rgH+W7DZVMrVdkwSHDGuVnrIkoO23
-igi2EJZ3rkW3C8mkZW98TL3kLVJtmhUxrHE3ET+y9qibujXINGiaZbfMjJqVm8Yh
-peNqnwIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLnV3eW8uZWR1hipo
-dHRwczovL3NoaWJib2xldGgudXd5by5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFOiPv5aGKE0BejOyz/xU627PJMLQMA0GCSqGSIb3DQEBBQUAA4IBAQBlYTmR
-WIs7Z8XFGNMmBpLMhEreQry4EC3mErUaLgH88mAT907dkZYmUBnQh2+ckFdzJtaX
-jGu4xCad6HFgCW/6OwmvfqaLEmCmu1ePX/05opEZS/dbbGN4qnbe7hxetC7mm8FW
-ZpdD0gf3Agw5wNueGv7cubwYGYEdG4yQGcq59Z1WwW9mD92tI7KfnxX4Ew0vO1pg
-35OqYyFafhnIhBGVi3SyxNSCuy2et9euMTwnmg/Q1DJvWup1US8Ny3GJEFytX72T
-vvzAEN1ksmkE84dyB8aObIrU3F7zmXG3LhS93xrPKNiXtB48BM6ovBkUQr+DGlRZ
-sAnxXYy7lSDqYZTx
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uwyo.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.uwyo.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uwyo.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uwyo.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uwyo.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uwyo.edu/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uwyo.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVANo3Z4/Uxn2PVJs0WudES8wCVuyuMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgudXd5by5lZHUwHhcNMTIwMjE1MjE1
-MTMwWhcNMzIwMjE1MjE1MTMwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnV3eW8u
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhs08G8iQTjb2XzJ2
-5O6QqeYfvXWiELJyGXYQzx3Wmk86vTciI2xZ7Jty+ltBtWVwo7L9y9/d1oLLVjZ+
-/lpQiwyOrL0mjg5XmUAZlvUkgPYFdrUUQRGFFxn+23U47hx7QuXyLDNkaJp9rZXb
-DpieXuKpg5eqCKBFUWKIlFeUKUIKJStSHck2dTiIX2fFc/MkkCW4ThNUpZxbz+3w
-a/qamV9bu81/MBXze8ZYIWe/vw/9IN6BHq6rgH+W7DZVMrVdkwSHDGuVnrIkoO23
-igi2EJZ3rkW3C8mkZW98TL3kLVJtmhUxrHE3ET+y9qibujXINGiaZbfMjJqVm8Yh
-peNqnwIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLnV3eW8uZWR1hipo
-dHRwczovL3NoaWJib2xldGgudXd5by5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFOiPv5aGKE0BejOyz/xU627PJMLQMA0GCSqGSIb3DQEBBQUAA4IBAQBlYTmR
-WIs7Z8XFGNMmBpLMhEreQry4EC3mErUaLgH88mAT907dkZYmUBnQh2+ckFdzJtaX
-jGu4xCad6HFgCW/6OwmvfqaLEmCmu1ePX/05opEZS/dbbGN4qnbe7hxetC7mm8FW
-ZpdD0gf3Agw5wNueGv7cubwYGYEdG4yQGcq59Z1WwW9mD92tI7KfnxX4Ew0vO1pg
-35OqYyFafhnIhBGVi3SyxNSCuy2et9euMTwnmg/Q1DJvWup1US8Ny3GJEFytX72T
-vvzAEN1ksmkE84dyB8aObIrU3F7zmXG3LhS93xrPKNiXtB48BM6ovBkUQr+DGlRZ
-sAnxXYy7lSDqYZTx
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.uwyo.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wyoming</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wyoming</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwyo.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tom Wilson</md:GivenName>
-    <md:EmailAddress>thomas.wilson@uwyo.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Robert Morrison</md:GivenName>
-    <md:EmailAddress>Robert.Morrison@uwyo.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Matt Kelly</md:GivenName>
-    <md:EmailAddress>mkelly@uwyo.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tom Wilson</md:GivenName>
-    <md:EmailAddress>thomas.wilson@uwyo.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.vcu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.vcu.edu-idp-shibboleth.xml
deleted file mode 100644
index 58982b51..00000000
--- a/swamid-interfederations-2.0/shibboleth.vcu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,142 +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://shibboleth.vcu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">vcu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Virginia Commonwealth University</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>
-MIIDOzCCAiOgAwIBAgIJAMyTsDp4A5caMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnNoaWJib2xldGgudmN1LmVkdTAeFw0xMjEwMDIxNTI2MzhaFw0yMjA5MzAx
-NTI2MzhaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudmN1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALFTvPHWzUL5EaaR1MVTG9wQ1Kn93kblwNRY
-Oa2vdsN25zod0NQCsp+XvqN1pn2w7zOvcY/ed3lYS9LqUZtiOTi6UCstT9w/4ci3
-9hJ9A4mRwk2+AUI7bQREhSF9z3Qk6FGjQfJXPFFyE3mnVIfavR9p/czIJIXlOIcX
-i6FCX3JQlMjdJue2xra0B6VkIavzFVkFNGlBkH/Mydxzt3HqgjI1k/57DnS0yCyy
-/pvfGmqtO11BxuZOHRfwIdxNIr3P5Mlc8kazUaPU+C3/fn0rfmvbdpAiCsSBSiAF
-uGapr9NfPRzVDnvwFNxz0PkLoHVm3yAaa7D7FeiFDUoo2ejrUR8CAwEAAaN+MHww
-HQYDVR0OBBYEFHp4Wom01tr/3XpayMXmUS5fLLCXME0GA1UdIwRGMESAFHp4Wom0
-1tr/3XpayMXmUS5fLLCXoSGkHzAdMRswGQYDVQQDExJzaGliYm9sZXRoLnZjdS5l
-ZHWCCQDMk7A6eAOXGjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAH
-iM8gjbZBldvhW1qopkF1KFqRh0HKOjSVTgQBNj5vU/AlL5PS7Cz9Ja/2X4+V24K+
-byitlj98kZF0OKDvWRb74w8cNDEE9us8Tl1txZVhTXfN7b5uzWb6g8CEcqxbLbHv
-RD3SSuWFEPpQlMAKDkGtSAS3ho3miQSIR1d236DA69ot8BTe8YM6P3AocDO7jPAn
-tlcoYKNW6ADof1DI8Q1z6ZgtYEnc/zVfA7dtudPYeYQZ6TL/R00gSdfN9GM+j7PA
-PBMWlPnwimjDzbm/2/sjWQ4+XXo1LpySq58tAyeqlmwQchr7rWzfQdJw8h5pBTLI
-tBa/rT5xLEJ4lKciSEO4
-          </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>
-MIIDOzCCAiOgAwIBAgIJAMkP0cy6Mj6OMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnNoaWJib2xldGgudmN1LmVkdTAeFw0wOTEwMzAxMzM0MjFaFw0xMjEwMjkx
-MzM0MjFaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudmN1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL4gIuA1ljlDh/jlffYhbTRMsfGFErcWrejd
-5UA2FvUEL14+PPzpHq6+8HHZL1TYW5WnRq4dpuvHUxOfSxt5gom9bl3SUa3pAFsk
-hKcXqOwZzvPPVo0Rp7iZguVjkiZBlSYXo3cP4bfMuNrfvDTCAFvxa8fZN8yxclVL
-Bg7yXKh6gPbVN9VST3KG/mExI7yghNFnxJgh1xsfl4idJCvKb+V3IuD8hdWiS7hp
-Q+mcn+1rA+TQarXODC5rf/JilvWaRvh6cwMHw35sBownzI44h/L1vfHimiPGXvo7
-oroZ7NGUK1j0G6GolK7ixBHjQZZGUv7O2X/4Rj+NaIFkf+KnNIECAwEAAaN+MHww
-HQYDVR0OBBYEFFb2M0GvEkqM6CsDMAgoGdxe/022ME0GA1UdIwRGMESAFFb2M0Gv
-EkqM6CsDMAgoGdxe/022oSGkHzAdMRswGQYDVQQDExJzaGliYm9sZXRoLnZjdS5l
-ZHWCCQDJD9HMujI+jjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBl
-RNsX0fk9l9EeZa8AHpPcxk3eQaW8r4MT+o57LXtBDZEvKFc8fRws09Ptkyg9CETv
-5uT7GQZ0HEFZyONJHsQy8Q1Etr4Q7I5J9EAxokBG4kFAn7Jcp1LHf5zHlWVhDsR+
-LMhDmHPuyDGqN8pVU/47MA0hFGILpckRY6q4j7L3aXyet0ImyPVlgJUoMXRso7vN
-Uw8mKyvL8HT3iZ42D8wENFNhA3nck2RDX3K1nv0qCbNF+FlnUDTy7i6EnH4U2aoe
-mYJ3G1FBVt0b8LdS0XisQ9pY3kpuQqspN4SFrJUDi6luNLdH8/YguSB0uf2Pdyyj
-KUd8anrB7gIglUS1bz6F
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.vcu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.vcu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.vcu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vcu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIJAMyTsDp4A5caMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnNoaWJib2xldGgudmN1LmVkdTAeFw0xMjEwMDIxNTI2MzhaFw0yMjA5MzAx
-NTI2MzhaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudmN1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALFTvPHWzUL5EaaR1MVTG9wQ1Kn93kblwNRY
-Oa2vdsN25zod0NQCsp+XvqN1pn2w7zOvcY/ed3lYS9LqUZtiOTi6UCstT9w/4ci3
-9hJ9A4mRwk2+AUI7bQREhSF9z3Qk6FGjQfJXPFFyE3mnVIfavR9p/czIJIXlOIcX
-i6FCX3JQlMjdJue2xra0B6VkIavzFVkFNGlBkH/Mydxzt3HqgjI1k/57DnS0yCyy
-/pvfGmqtO11BxuZOHRfwIdxNIr3P5Mlc8kazUaPU+C3/fn0rfmvbdpAiCsSBSiAF
-uGapr9NfPRzVDnvwFNxz0PkLoHVm3yAaa7D7FeiFDUoo2ejrUR8CAwEAAaN+MHww
-HQYDVR0OBBYEFHp4Wom01tr/3XpayMXmUS5fLLCXME0GA1UdIwRGMESAFHp4Wom0
-1tr/3XpayMXmUS5fLLCXoSGkHzAdMRswGQYDVQQDExJzaGliYm9sZXRoLnZjdS5l
-ZHWCCQDMk7A6eAOXGjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAH
-iM8gjbZBldvhW1qopkF1KFqRh0HKOjSVTgQBNj5vU/AlL5PS7Cz9Ja/2X4+V24K+
-byitlj98kZF0OKDvWRb74w8cNDEE9us8Tl1txZVhTXfN7b5uzWb6g8CEcqxbLbHv
-RD3SSuWFEPpQlMAKDkGtSAS3ho3miQSIR1d236DA69ot8BTe8YM6P3AocDO7jPAn
-tlcoYKNW6ADof1DI8Q1z6ZgtYEnc/zVfA7dtudPYeYQZ6TL/R00gSdfN9GM+j7PA
-PBMWlPnwimjDzbm/2/sjWQ4+XXo1LpySq58tAyeqlmwQchr7rWzfQdJw8h5pBTLI
-tBa/rT5xLEJ4lKciSEO4
-          </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>
-MIIDOzCCAiOgAwIBAgIJAMkP0cy6Mj6OMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnNoaWJib2xldGgudmN1LmVkdTAeFw0wOTEwMzAxMzM0MjFaFw0xMjEwMjkx
-MzM0MjFaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudmN1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAL4gIuA1ljlDh/jlffYhbTRMsfGFErcWrejd
-5UA2FvUEL14+PPzpHq6+8HHZL1TYW5WnRq4dpuvHUxOfSxt5gom9bl3SUa3pAFsk
-hKcXqOwZzvPPVo0Rp7iZguVjkiZBlSYXo3cP4bfMuNrfvDTCAFvxa8fZN8yxclVL
-Bg7yXKh6gPbVN9VST3KG/mExI7yghNFnxJgh1xsfl4idJCvKb+V3IuD8hdWiS7hp
-Q+mcn+1rA+TQarXODC5rf/JilvWaRvh6cwMHw35sBownzI44h/L1vfHimiPGXvo7
-oroZ7NGUK1j0G6GolK7ixBHjQZZGUv7O2X/4Rj+NaIFkf+KnNIECAwEAAaN+MHww
-HQYDVR0OBBYEFFb2M0GvEkqM6CsDMAgoGdxe/022ME0GA1UdIwRGMESAFFb2M0Gv
-EkqM6CsDMAgoGdxe/022oSGkHzAdMRswGQYDVQQDExJzaGliYm9sZXRoLnZjdS5l
-ZHWCCQDJD9HMujI+jjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBl
-RNsX0fk9l9EeZa8AHpPcxk3eQaW8r4MT+o57LXtBDZEvKFc8fRws09Ptkyg9CETv
-5uT7GQZ0HEFZyONJHsQy8Q1Etr4Q7I5J9EAxokBG4kFAn7Jcp1LHf5zHlWVhDsR+
-LMhDmHPuyDGqN8pVU/47MA0hFGILpckRY6q4j7L3aXyet0ImyPVlgJUoMXRso7vN
-Uw8mKyvL8HT3iZ42D8wENFNhA3nck2RDX3K1nv0qCbNF+FlnUDTy7i6EnH4U2aoe
-mYJ3G1FBVt0b8LdS0XisQ9pY3kpuQqspN4SFrJUDi6luNLdH8/YguSB0uf2Pdyyj
-KUd8anrB7gIglUS1bz6F
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.vcu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.vcu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Virginia Commonwealth University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Virginia Commonwealth University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vcu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>L T Harris</md:GivenName>
-    <md:EmailAddress>tsmiddleware@vcu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.webassign.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.webassign.net-shibboleth.xml
deleted file mode 100644
index e556d263..00000000
--- a/swamid-interfederations-2.0/shibboleth.webassign.net-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.webassign.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://shibboleth.webassign.net/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">WebAssign - PlaceU</mdui:DisplayName>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIGtDCCBZygAwIBAgIHBx3OYpjt3TANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
-BhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBE
-aWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENs
-YXNzIDIgUHJpbWFyeSBJbnRlcm1lZGlhdGUgU2VydmVyIENBMB4XDTE1MDQxNjE3
-NDIxMFoXDTE3MDQxNjE2MjE0OVowgbYxCzAJBgNVBAYTAlVTMRcwFQYDVQQIEw5O
-b3J0aCBDYXJvbGluYTEQMA4GA1UEBxMHUmFsZWlnaDE5MDcGA1UEChMwV2ViQXNz
-aWduIChBZHZhbmNlZCBJbnN0cnVjdGlvbmFsIFN5c3RlbXMsIEluYy4pMRgwFgYD
-VQQDFA8qLndlYmFzc2lnbi5uZXQxJzAlBgkqhkiG9w0BCQEWGGhvc3RtYXN0ZXJA
-d2ViYXNzaWduLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANNE
-7Ne+VRMSh8ofCPMzyi2i1fbSEj7Vob4R5E5gHv0qWgbrPPkogArMfSWMXZjOQCMM
-KjjEtlU+og7ngOG1iqvpjQ1yRZ+0oQGCg/e0dGJHyZTeb6dd8C6uH/Qo41MsyGXH
-68wVYb57Jqu9d146uKBoKI/My3c8aMMayqUjmoB7YVQ9k102x6rO0bMj12Vm7M6N
-pvg+O/LBHtqS3bNLgK5/Y9FCeh3Vmr0SREZuTdJNozl8f0/TksVU7y18uV6jw330
-JVnKDeg89wdMHkviCPD77A4DUWJiJHycxvud1+sTNOkxjV7JLtqYxwOYIgDHjs9L
-cGSwvU3FL6M1EX1kgccCAwEAAaOCAu0wggLpMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgOoMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU4DiG
-pTCQK/nV7v8ZUMEdBQTE0VYwHwYDVR0jBBgwFoAUEdsjRf1UzGpxb4SKA9e+9wEv
-JoYwKQYDVR0RBCIwIIIPKi53ZWJhc3NpZ24ubmV0gg13ZWJhc3NpZ24ubmV0MIIB
-VgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQICMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4G
-CCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3
-BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0
-byB0aGUgQ2xhc3MgMiBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3Rh
-cnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQg
-cHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGln
-YXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNv
-bS9jcnQyLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0
-dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MyL3NlcnZlci9jYTBCBggr
-BgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNz
-Mi5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wu
-Y29tLzANBgkqhkiG9w0BAQsFAAOCAQEAm2zqtGHQpUTpocJaLjS6MDHFIioYYNhE
-Eg6qR8eoDeOCb6lJ7LlHMA/grVQ8rCQM+b7f5pp9NVB9icSmuijflQEYQNVxJdDD
-iKRw/5BNgitAqdzeIGUA3eA9kZDzBm+ZnXkb/gsTiHrAOIsAHpqIVmVkpNG5xLK3
-NZSZ8I6BpxYXuklpQiqYhix7j33BMx9WmXVbxBDyFFCWMEYhVJfhFyOhpUNyLljE
-L1w65SA7X1AgB2x3zTlL3EfrjTnJaAMzz2qCvlTMdmYT+XmgaBNq08un9JnNa8EQ
-3QhMBkpxpdG7DQxhEkDyZUArmdH011y94LJk3W5or4AQna2hVQSs8g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.webassign.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.webassign.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.webassign.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.webassign.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">WebAssign</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">WebAssign</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.webassign.net/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Dodd Jones</md:GivenName>
-    <md:EmailAddress>djones@webassign.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brent Wells</md:GivenName>
-    <md:EmailAddress>bwells@webassign.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.webbased.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.webbased.co.uk-shibboleth.xml
deleted file mode 100644
index 7eeb40d1..00000000
--- a/swamid-interfederations-2.0/shibboleth.webbased.co.uk-shibboleth.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://shibboleth.webbased.co.uk/shibboleth">
-  <!--
-		This is a "Shibboleth service provider" SP for WebBased 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#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="2009-09-09T16:45:58Z">
-      <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://shibboleth.webbased.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						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
-						HJPUxmoTmWo=
-					</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>
-						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
-						HJPUxmoTmWo=
-					</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"/>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.webbased.co.uk/Shibboleth.sso/SAML/Artifact" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">WebBased Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">WebBased Limited: Shibboleth service provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.webbased.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martine</GivenName>
-    <SurName>Davies</SurName>
-    <EmailAddress>mailto:martine.davies@webbased.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Greg</GivenName>
-    <SurName>Hawkins</SurName>
-    <EmailAddress>mailto:greg.hawkins@webbased.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.westking.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.westking.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 552c121f..00000000
--- a/swamid-interfederations-2.0/shibboleth.westking.ac.uk-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://shibboleth.westking.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Westminster Kingsway College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-03T14:58: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">westking.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDijCCAnICCQDsX92sZyIapDANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkxvbmRvbjEbMBkGA1UEBxMSMjExIEdyYXlzIElubiBSb2Fk
-						MSUwIwYDVQQKExxXZXN0bWluc3RlciBLaW5nc3dheSBDb2xsZWdlMSIwIAYDVQQD
-						ExlzaGliYm9sZXRoLndlc3RraW5nLmFjLnVrMB4XDTE0MDQwOTA5NTIzMVoXDTM0
-						MDQwNDA5NTIzMVowgYYxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xGzAZ
-						BgNVBAcTEjIxMSBHcmF5cyBJbm4gUm9hZDElMCMGA1UEChMcV2VzdG1pbnN0ZXIg
-						S2luZ3N3YXkgQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJvbGV0aC53ZXN0a2luZy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7zCFR0dysInbEU
-						t/zyXqB++zmwMY8p6aZqQQ3lvHWVLPOTXNqXpEXygu6v+mlg2fV3SJhnJJcZU/uS
-						luUn9pAZooB5ROZv8I/IpPl2UH0d0v5qf0FNwnebH9RmGhtElkFSdplGEN1j8hux
-						X1jx6/693zj99WZPSWNpYMdFezMYnXjpVvU92GHO0C6iC6hwIaI+7RECgP0Ly8oy
-						RTvba+OAcPivfED7dTfFMj6H4vjC6nNjP71mqAjhd0yRr+4piJm0q94fREi2HvzZ
-						Hpu97MC717l3FOgtytKycjrOuw/YpVOuXaOdbUnEPlnc2BYg1h+1QFx+Rr1l0Py9
-						Jh1MPfUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAHj/mYxaOUqQyhiTnJrDAAfrj
-						zgUA6Eoiba5DDqQnKXh33wcQms3fAXRgAX05gzFWg3u8Vdhsy1ZqTpciehiJ1fLF
-						M8Xx1VkrRL5tfPGg/yVYCN5Xu8FQTzrlZ0LwVLXt92DjzaibfWDzFeraUXDdswFT
-						bKSORgtYFUWhQUplo8lZ5o/eDOyrhxktqBlRzfm6E8McZraYSEK67MGgKC+7npdD
-						VMItRsiEAyRjKrCKpI3OKMVlG7zIXsT9NHJhdgswP9F0aSZMqshJlwqzLo+JojfZ
-						i8cWVtd1PUDIV3RJapAS+tcUTOFIirh1kTv4pD5VvRfSPYabAuXCAvU9jfnlsQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.westking.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.westking.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://shibboleth.westking.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.westking.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.westking.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.westking.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">westking.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDijCCAnICCQDsX92sZyIapDANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkxvbmRvbjEbMBkGA1UEBxMSMjExIEdyYXlzIElubiBSb2Fk
-						MSUwIwYDVQQKExxXZXN0bWluc3RlciBLaW5nc3dheSBDb2xsZWdlMSIwIAYDVQQD
-						ExlzaGliYm9sZXRoLndlc3RraW5nLmFjLnVrMB4XDTE0MDQwOTA5NTIzMVoXDTM0
-						MDQwNDA5NTIzMVowgYYxCzAJBgNVBAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xGzAZ
-						BgNVBAcTEjIxMSBHcmF5cyBJbm4gUm9hZDElMCMGA1UEChMcV2VzdG1pbnN0ZXIg
-						S2luZ3N3YXkgQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJvbGV0aC53ZXN0a2luZy5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7zCFR0dysInbEU
-						t/zyXqB++zmwMY8p6aZqQQ3lvHWVLPOTXNqXpEXygu6v+mlg2fV3SJhnJJcZU/uS
-						luUn9pAZooB5ROZv8I/IpPl2UH0d0v5qf0FNwnebH9RmGhtElkFSdplGEN1j8hux
-						X1jx6/693zj99WZPSWNpYMdFezMYnXjpVvU92GHO0C6iC6hwIaI+7RECgP0Ly8oy
-						RTvba+OAcPivfED7dTfFMj6H4vjC6nNjP71mqAjhd0yRr+4piJm0q94fREi2HvzZ
-						Hpu97MC717l3FOgtytKycjrOuw/YpVOuXaOdbUnEPlnc2BYg1h+1QFx+Rr1l0Py9
-						Jh1MPfUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAHj/mYxaOUqQyhiTnJrDAAfrj
-						zgUA6Eoiba5DDqQnKXh33wcQms3fAXRgAX05gzFWg3u8Vdhsy1ZqTpciehiJ1fLF
-						M8Xx1VkrRL5tfPGg/yVYCN5Xu8FQTzrlZ0LwVLXt92DjzaibfWDzFeraUXDdswFT
-						bKSORgtYFUWhQUplo8lZ5o/eDOyrhxktqBlRzfm6E8McZraYSEK67MGgKC+7npdD
-						VMItRsiEAyRjKrCKpI3OKMVlG7zIXsT9NHJhdgswP9F0aSZMqshJlwqzLo+JojfZ
-						i8cWVtd1PUDIV3RJapAS+tcUTOFIirh1kTv4pD5VvRfSPYabAuXCAvU9jfnlsQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.westking.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.westking.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">Westminster Kingsway College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Westminster Kingsway College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.westking.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Inderpal</GivenName>
-    <SurName>Chaggar</SurName>
-    <EmailAddress>mailto:Inderpal.Chaggar@westking.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Inderpal</GivenName>
-    <SurName>Chaggar</SurName>
-    <EmailAddress>mailto:Inderpal.Chaggar@westking.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.wmintelligence.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.wmintelligence.com-shibboleth.xml
deleted file mode 100644
index 505347fb..00000000
--- a/swamid-interfederations-2.0/shibboleth.wmintelligence.com-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://shibboleth.wmintelligence.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for World Market Intelligence 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="2014-04-03T12:00: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://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/POST"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/POST" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">World Market Intelligence</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The world's markets quantified, qualified and expertly evaluated</mdui:Description>
-        <mdui:Logo height="67" width="201">https://s3-eu-west-1.amazonaws.com/www.worldmarketintelligence.com/world_market_intelligence_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIJAOR5X3M97uKJMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHXNoaWJib2xldGgud21pbnRlbGxpZ2VuY2UuY29tMB4XDTE0MDMyMjA0MDAy
-						OVoXDTE3MDMyMTA0MDAyOVowKDEmMCQGA1UEAxMdc2hpYmJvbGV0aC53bWludGVs
-						bGlnZW5jZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCiRNxg
-						Ce6zMPijvEumDw+cb4Y/DUR8GPLV9HqiAN+0n0QKE/lZIa+kC3TxldgMrIkFjtle
-						gZ4iG7MCBvoAb8w2DPjrH5KwoyhLRRXKVEq8axmdeXU0CUJw+N6518vzKmQGv1GU
-						Rs8If5ctvvZi6LcZIUI09/fHPt1PehNUFzoCDN7RCE3xztWCIbFaDptDLrJ1oMqW
-						vbNbOnn07uyEtNYjAtI7mkR/A1fbYNTez0t+6GawtGmexwHCOT3UefOhRfGqBh+5
-						RM2VvZQH+vGxzqzg4qdDahF7FYi9r2OpxgTeebSmrZ7vjfRRt9TQ29oN1NyxgjJr
-						W5S+LhdfiIWqMOL3AgMBAAGjfDB6MFkGA1UdEQRSMFCCHXNoaWJib2xldGgud21p
-						bnRlbGxpZ2VuY2UuY29thi9odHRwOi8vc2hpYmJvbGV0aC53bWludGVsbGlnZW5j
-						ZS5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU6LfyT/3Hb1BITfsUmAwnzz3jX+0w
-						DQYJKoZIhvcNAQEFBQADggEBAGVK1LxrSZw5uwP6rjgaFGtFFjvdlPoyS3S7CTsj
-						9wpg7zs/gEoO+ptXeAcPkENgU7InUxfn3RVhB1sIit5UWRYCtNFBih4WZXCbmL0G
-						/9YOOmSGbEGpDrPCLmxYc8oVNFe5ks5+lOBqUZK15lPpgwQwlAX/c1Jn//BMte7c
-						gP556YvRParYU9E1zN+npL4c7pbLXPpkkpDTqJjplvCcnMbkD9e5LmexaRwy5CQa
-						iuc28kLhBX8fCLSx4fnkb7l9g6ogFqNJEGf3PG1EDahl9oX6r51bBVYHYBJM6+Zr
-						hTLk6uX2iiqI9onok/cihw18QDh106Ws9cafIukWyVpHbt4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shibboleth.wmintelligence.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.wmintelligence.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">World Market Intelligence Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">World Market Intelligence</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.worldmarketintelligence.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Bharadwaj</GivenName>
-    <SurName>Revuri</SurName>
-    <EmailAddress>mailto:bharadwaj.revuri@digitalinsightresearch.in</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Bharadwaj</GivenName>
-    <SurName>Revuri</SurName>
-    <EmailAddress>mailto:bharadwaj.revuri@digitalinsightresearch.in</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.wolvcoll.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.wolvcoll.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 4de44e8c..00000000
--- a/swamid-interfederations-2.0/shibboleth.wolvcoll.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://shibboleth.wolvcoll.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for City of Wolverhampton College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-08T11:12:40Z">
-      <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">wolvcoll.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">City of Wolverhampton College</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUQ4d3Glz5yjW7FW9jd2mP9LsAUe8wDQYJKoZIhvcNAQEF
-						BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC53b2x2Y29sbC5hYy51azAeFw0xNDA2
-						MjQwOTA1MTdaFw0zNDA2MjQwOTA1MTdaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
-						d29sdmNvbGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCl
-						AWQo9/uMAecnAsdN9csAGTK2489RtQ7rJcRbozcr64BT1/w1iuh+RrWWqACgoNJP
-						aC2cGGm4DAEtguZlxv/EIm2YhKNQaDSgA472GPHRLslb2pRfNVJyFRfKJeVn2H/L
-						/StgbnczUp1gj81bZpdT6LoT0kw6SBh42H4ktTQQcdchiLqapDdLl+mx/x6F+BuH
-						HH6Pa4TwIKyu7FM7sTKek/Q4PLrLuHDFP7rg43lqjL2pQntsF4cNPewN+bcQujKn
-						+aQ/sUzUtLsi0bAuTJeU0rPZgJtg5Y3XnmZTlHyVvyBODtQhXhU2OfYH2FWiEZmj
-						D886Zakepq44z9wE19c5AgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgu
-						d29sdmNvbGwuYWMudWuGMGh0dHBzOi8vc2hpYmJvbGV0aC53b2x2Y29sbC5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUEPnyUWWLLersRzyV9z/bHlXyz0Ew
-						DQYJKoZIhvcNAQEFBQADggEBAJmDjexTbXsG8J5SYzXt8hda+nyrnlraOl6E6ql8
-						yIazs9Tg2nKgLhlAalyERD712mwL+lSE+qHHFifdSO44YuOgVNJ0e+vWxISrhNpt
-						d59kjd1l8b1ZeQ3P507rDz2Uw+cA5YxkEVdlBrkb9fR26kPXDsXiz1P1DhHh/Qt0
-						48PkIQdrwiSygWvNQGgMaB76XA3hqVyadpokVL/F1MFP2mKRIG4kGlDoV6iemLP6
-						SEtWwENvyTZ9VwAGYNoZaEmAjl1eVGaQANlcpXGuTRTLNHFYE+aCa7vYJuxdeU/N
-						Z+YEKF+K/tNlHmpEZ2x/tIv8PvDWgGsK+1FaCPoBrzZmKLo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.wolvcoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wolvcoll.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://shibboleth.wolvcoll.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.wolvcoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.wolvcoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.wolvcoll.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">wolvcoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIUQ4d3Glz5yjW7FW9jd2mP9LsAUe8wDQYJKoZIhvcNAQEF
-						BQAwJDEiMCAGA1UEAxMZc2hpYmJvbGV0aC53b2x2Y29sbC5hYy51azAeFw0xNDA2
-						MjQwOTA1MTdaFw0zNDA2MjQwOTA1MTdaMCQxIjAgBgNVBAMTGXNoaWJib2xldGgu
-						d29sdmNvbGwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCl
-						AWQo9/uMAecnAsdN9csAGTK2489RtQ7rJcRbozcr64BT1/w1iuh+RrWWqACgoNJP
-						aC2cGGm4DAEtguZlxv/EIm2YhKNQaDSgA472GPHRLslb2pRfNVJyFRfKJeVn2H/L
-						/StgbnczUp1gj81bZpdT6LoT0kw6SBh42H4ktTQQcdchiLqapDdLl+mx/x6F+BuH
-						HH6Pa4TwIKyu7FM7sTKek/Q4PLrLuHDFP7rg43lqjL2pQntsF4cNPewN+bcQujKn
-						+aQ/sUzUtLsi0bAuTJeU0rPZgJtg5Y3XnmZTlHyVvyBODtQhXhU2OfYH2FWiEZmj
-						D886Zakepq44z9wE19c5AgMBAAGjeTB3MFYGA1UdEQRPME2CGXNoaWJib2xldGgu
-						d29sdmNvbGwuYWMudWuGMGh0dHBzOi8vc2hpYmJvbGV0aC53b2x2Y29sbC5hYy51
-						ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUEPnyUWWLLersRzyV9z/bHlXyz0Ew
-						DQYJKoZIhvcNAQEFBQADggEBAJmDjexTbXsG8J5SYzXt8hda+nyrnlraOl6E6ql8
-						yIazs9Tg2nKgLhlAalyERD712mwL+lSE+qHHFifdSO44YuOgVNJ0e+vWxISrhNpt
-						d59kjd1l8b1ZeQ3P507rDz2Uw+cA5YxkEVdlBrkb9fR26kPXDsXiz1P1DhHh/Qt0
-						48PkIQdrwiSygWvNQGgMaB76XA3hqVyadpokVL/F1MFP2mKRIG4kGlDoV6iemLP6
-						SEtWwENvyTZ9VwAGYNoZaEmAjl1eVGaQANlcpXGuTRTLNHFYE+aCa7vYJuxdeU/N
-						Z+YEKF+K/tNlHmpEZ2x/tIv8PvDWgGsK+1FaCPoBrzZmKLo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.wolvcoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.wolvcoll.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">City of Wolverhampton College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">City of Wolverhampton College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wolvcoll.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ashley</GivenName>
-    <SurName>Mills</SurName>
-    <EmailAddress>mailto:millsash@wolvcoll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ashley</GivenName>
-    <SurName>Mills</SurName>
-    <EmailAddress>mailto:millsash@wolvcoll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Dean</SurName>
-    <EmailAddress>mailto:deani@wolvcoll.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth1.rz.hft-stuttgart.de.xml b/swamid-interfederations-2.0/shibboleth1.rz.hft-stuttgart.de.xml
deleted file mode 100644
index 53d37d38..00000000
--- a/swamid-interfederations-2.0/shibboleth1.rz.hft-stuttgart.de.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth1.rz.hft-stuttgart.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hft-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth1.rz.hft-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth1.rz.hft-stuttgart.de,O=Hochschule fuer Technik Stuttgart,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLTCCBBWgAwIBAgIEEC7jezANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
-REUxKjAoBgNVBAoTIUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIFN0dXR0Z2FydDEW
-MBQGA1UECxMNUmVjaGVuemVudHJ1bTEdMBsGA1UEAxMUSGZULVN0dXR0Z2FydCBD
-QS1HMDExIzAhBgkqhkiG9w0BCQEWFHBraUBoZnQtc3R1dHRnYXJ0LmRlMB4XDTEw
-MDYwOTA5NTkwOFoXDTE1MDYwODA5NTkwOFowYzELMAkGA1UEBhMCREUxKjAoBgNV
-BAoTIUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIFN0dXR0Z2FydDEoMCYGA1UEAxMf
-c2hpYmJvbGV0aDEucnouaGZ0LXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJ9MYSQpqbmV643kMInlv1c5CQjyKw3C12/ZKFpiRixm
-V6UAgLhtYyvGEkljYY0yNChHtVFEaqIiUykfDzcPfaiVuAWRE+kKVnQ0kh+qRL1w
-/vIy5zoETcDfmiUDUOxW4h+o5IjBPwRvb1/4wBe97kJqG4+GIQ6O6SzSnAGQ0vGj
-YOetkbIxAkW8Vi5FfFIh80vqWXYkA7LHIgiGofbKVu/8v1wEkL36g95eKpUFuyh1
-n/QAIxDbKB2QRWzv8YEq9UmA0cOaBLv6yLmaxccIdIb84xiBrvMYOB94fqv0crwO
-zxN7NMU+cSNHtszZDYI8rEcN6deZuoNEKci4QvyRLScCAwEAAaOCAbQwggGwMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
-BQcDATAdBgNVHQ4EFgQU6atJwhxY1aZ6aZ8Gx6tihQ56XRkwHwYDVR0jBBgwFoAU
-cbWZntYfgHFOyE9eGPu6gf6V+xMwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9oZnQtc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmdC1zdHV0dGdhcnQt
-Y2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsGAQUF
-BzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmdC1zdHV0dGdhcnQtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2hmdC1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQBKDMf/EyqR4sjd31b+uABdLzD+o14B5ejumSgWfvOS
-mr8eDvdRWreQZvLFtSWXUCzaYi3hDPhjGJLxM02Lo+7oVFHBGjMaxBoyXlZ+PLbj
-gT90PqMDXgBr+L+bF2GGWNJxo3ZF1oX6IcMambiV4JZ8bDyCaPLCD1gkVaQDCjaH
-56AbHKmxs2ot5j8KChzTTyqWGy7/gCyeC4S8MpV75krvanfAz3gdalhwdV+IOdF9
-HNHZayQHrYtMd0F1i8hCyVXi9QyJwCpQitWbN/HmbuXUttu68uDf83y9kUF6v40k
-1kPEHFpAssjRZMqFtxGkuXDEd8TUf45zsT/etRXkcFW8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth1.rz.hft-stuttgart.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth1.rz.hft-stuttgart.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth1.rz.hft-stuttgart.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth1.rz.hft-stuttgart.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth1.rz.hft-stuttgart.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth1.rz.hft-stuttgart.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">hft-stuttgart.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth1.rz.hft-stuttgart.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth1.rz.hft-stuttgart.de,O=Hochschule fuer Technik Stuttgart,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLTCCBBWgAwIBAgIEEC7jezANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
-REUxKjAoBgNVBAoTIUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIFN0dXR0Z2FydDEW
-MBQGA1UECxMNUmVjaGVuemVudHJ1bTEdMBsGA1UEAxMUSGZULVN0dXR0Z2FydCBD
-QS1HMDExIzAhBgkqhkiG9w0BCQEWFHBraUBoZnQtc3R1dHRnYXJ0LmRlMB4XDTEw
-MDYwOTA5NTkwOFoXDTE1MDYwODA5NTkwOFowYzELMAkGA1UEBhMCREUxKjAoBgNV
-BAoTIUhvY2hzY2h1bGUgZnVlciBUZWNobmlrIFN0dXR0Z2FydDEoMCYGA1UEAxMf
-c2hpYmJvbGV0aDEucnouaGZ0LXN0dXR0Z2FydC5kZTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAJ9MYSQpqbmV643kMInlv1c5CQjyKw3C12/ZKFpiRixm
-V6UAgLhtYyvGEkljYY0yNChHtVFEaqIiUykfDzcPfaiVuAWRE+kKVnQ0kh+qRL1w
-/vIy5zoETcDfmiUDUOxW4h+o5IjBPwRvb1/4wBe97kJqG4+GIQ6O6SzSnAGQ0vGj
-YOetkbIxAkW8Vi5FfFIh80vqWXYkA7LHIgiGofbKVu/8v1wEkL36g95eKpUFuyh1
-n/QAIxDbKB2QRWzv8YEq9UmA0cOaBLv6yLmaxccIdIb84xiBrvMYOB94fqv0crwO
-zxN7NMU+cSNHtszZDYI8rEcN6deZuoNEKci4QvyRLScCAwEAAaOCAbQwggGwMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
-BQcDATAdBgNVHQ4EFgQU6atJwhxY1aZ6aZ8Gx6tihQ56XRkwHwYDVR0jBBgwFoAU
-cbWZntYfgHFOyE9eGPu6gf6V+xMwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9oZnQtc3R1dHRnYXJ0LWNhL3B1Yi9jcmwvY2Fjcmwu
-Y3JsMD+gPaA7hjlodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hmdC1zdHV0dGdhcnQt
-Y2EvcHViL2NybC9jYWNybC5jcmwwgaYGCCsGAQUFBwEBBIGZMIGWMEkGCCsGAQUF
-BzAChj1odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hmdC1zdHV0dGdhcnQtY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MEkGCCsGAQUFBzAChj1odHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL2hmdC1zdHV0dGdhcnQtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0G
-CSqGSIb3DQEBBQUAA4IBAQBKDMf/EyqR4sjd31b+uABdLzD+o14B5ejumSgWfvOS
-mr8eDvdRWreQZvLFtSWXUCzaYi3hDPhjGJLxM02Lo+7oVFHBGjMaxBoyXlZ+PLbj
-gT90PqMDXgBr+L+bF2GGWNJxo3ZF1oX6IcMambiV4JZ8bDyCaPLCD1gkVaQDCjaH
-56AbHKmxs2ot5j8KChzTTyqWGy7/gCyeC4S8MpV75krvanfAz3gdalhwdV+IOdF9
-HNHZayQHrYtMd0F1i8hCyVXi9QyJwCpQitWbN/HmbuXUttu68uDf83y9kUF6v40k
-1kPEHFpAssjRZMqFtxGkuXDEd8TUf45zsT/etRXkcFW8
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth1.rz.hft-stuttgart.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth1.rz.hft-stuttgart.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">HFT-Stuttgart</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule für Technik Stuttgart</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hft-stuttgart.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Hans-Peter</GivenName>
-    <SurName>Heppel</SurName>
-    <EmailAddress>hans-peter.heppel@hft-stuttgart.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml
deleted file mode 100644
index ae01f01a..00000000
--- a/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.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" entityID="https://shibboleth2.crous-poitiers.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Poitiers - Personnels</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODoyOSswMjowMOxH66YAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MjkrMDI6MDCdGlMaAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ac-poitiers.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Poitiers - Personnels</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.crous-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CROUS Poitiers - Personnels</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Poitiers - Personnels</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ac-poitiers.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>crous.informatique@crous-poitiers.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml
deleted file mode 100644
index 17235859..00000000
--- a/swamid-interfederations-2.0/shibboleth2.id.ubc.ca-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2.id.ubc.ca/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-07-24T15:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.canarie.ca/identity/join/</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">ubc.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The University of British Columbia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of British Columbia</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ubc.ca</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUS6eV0UJWr8nFaqbSe1zg4O1lb7kwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aDIuaWQudWJjLmNhMB4XDTEwMTIwODAx
-NDMyN1oXDTMwMTIwODAxNDMyN1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aDIuaWQu
-dWJjLmNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4hL/rsMTupH9
-+xNmZgPw+ru6Xonn05D1I4ZOlEh54MNEY+bEuYahSvoAzeNVZXvJjN1f7HQIMmrT
-5USVSrFBnDCGE7hq/RumtlGcl4S5EeBacp2GWKwrWQ9ymKVF8OqNGRnhJDIb3lIh
-DIMx3Zs9AvMOFz+U2TmRLcjZ4lC1bsB5xFlFwJbPrKxCGAIgNVtkNmvhtLpbHN4K
-s4zsTdCIzPu+G3zDNZeZ//hktAiCNF1wDdVZmB7jDLE7JM6dtkAK42ooiXu1hqq1
-bOfd4Eecc754CUeIbk6ElZpli/s8stGe1XPkahZ1LL5JJQbKX1Udokk9FaRg5DNQ
-Mmxwco66HwIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoMi5pZC51YmMu
-Y2GGLGh0dHBzOi8vc2hpYmJvbGV0aDIuaWQudWJjLmNhL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBQ+jbb1yi2BZmUxzopC6sV3NmRrODANBgkqhkiG9w0BAQUFAAOC
-AQEAxoy2HSTK/L1ZL7T8joNJ/4j1Exp9fqnViEWItrsyWG/6KufG6s2j0+GXOvy9
-WXpdeIdHzjU3iAUcX5mV7NbKskqLKp0QCmBCLjT3FWjIBFkbdAbf2DvjNSp5XAPt
-kjy3ThVWAFRxbnXu+K3had6WXVtmHzokFA1FtjfTZlNJYlzRrjdMRZAFAswnb6Iw
-LBiArzwbulDn6e1JchJsQjmYeySC3ukrNubxZbprJvgkF3JB/SVGmdd59lR26kSN
-Razfk7UV1M4HAv71TpcdpKM/zApv5/9Glp9lQT+uq2U5TS8njGgEC6Z+ZKDRcOw6
-rmMMp8QfnRo+ehVUPP49SGgN/g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.id.ubc.ca: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://shibboleth2.id.ubc.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.id.ubc.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.id.ubc.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.id.ubc.ca/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ubc.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPzCCAiegAwIBAgIUS6eV0UJWr8nFaqbSe1zg4O1lb7kwDQYJKoZIhvcNAQEF
-BQAwIDEeMBwGA1UEAxMVc2hpYmJvbGV0aDIuaWQudWJjLmNhMB4XDTEwMTIwODAx
-NDMyN1oXDTMwMTIwODAxNDMyN1owIDEeMBwGA1UEAxMVc2hpYmJvbGV0aDIuaWQu
-dWJjLmNhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4hL/rsMTupH9
-+xNmZgPw+ru6Xonn05D1I4ZOlEh54MNEY+bEuYahSvoAzeNVZXvJjN1f7HQIMmrT
-5USVSrFBnDCGE7hq/RumtlGcl4S5EeBacp2GWKwrWQ9ymKVF8OqNGRnhJDIb3lIh
-DIMx3Zs9AvMOFz+U2TmRLcjZ4lC1bsB5xFlFwJbPrKxCGAIgNVtkNmvhtLpbHN4K
-s4zsTdCIzPu+G3zDNZeZ//hktAiCNF1wDdVZmB7jDLE7JM6dtkAK42ooiXu1hqq1
-bOfd4Eecc754CUeIbk6ElZpli/s8stGe1XPkahZ1LL5JJQbKX1Udokk9FaRg5DNQ
-Mmxwco66HwIDAQABo3EwbzBOBgNVHREERzBFghVzaGliYm9sZXRoMi5pZC51YmMu
-Y2GGLGh0dHBzOi8vc2hpYmJvbGV0aDIuaWQudWJjLmNhL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBQ+jbb1yi2BZmUxzopC6sV3NmRrODANBgkqhkiG9w0BAQUFAAOC
-AQEAxoy2HSTK/L1ZL7T8joNJ/4j1Exp9fqnViEWItrsyWG/6KufG6s2j0+GXOvy9
-WXpdeIdHzjU3iAUcX5mV7NbKskqLKp0QCmBCLjT3FWjIBFkbdAbf2DvjNSp5XAPt
-kjy3ThVWAFRxbnXu+K3had6WXVtmHzokFA1FtjfTZlNJYlzRrjdMRZAFAswnb6Iw
-LBiArzwbulDn6e1JchJsQjmYeySC3ukrNubxZbprJvgkF3JB/SVGmdd59lR26kSN
-Razfk7UV1M4HAv71TpcdpKM/zApv5/9Glp9lQT+uq2U5TS8njGgEC6Z+ZKDRcOw6
-rmMMp8QfnRo+ehVUPP49SGgN/g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.id.ubc.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The University of British Columbia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The University of British Columbia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ubc.ca/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Hari</md:GivenName>
-    <md:SurName>Mailvaganam</md:SurName>
-    <md:EmailAddress>mailto:hari.mailvaganam@ubc.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.liv.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.liv.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index e49e0a73..00000000
--- a/swamid-interfederations-2.0/shibboleth2.liv.ac.uk-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" entityID="https://shibboleth2.liv.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth Test IdP for University of Liverpool.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-29T09:49: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">liv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaDCCAlACCQDWC0umrtoXlDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
-						QjEQMA4GA1UECAwHRW5nbGFuZDETMBEGA1UEBwwKTWVyc2V5c2lkZTEgMB4GA1UE
-						CgwXVW5pdmVyc2l0eSBvZiBMaXZlcnBvb2wxHjAcBgNVBAMMFXNoaWJib2xldGgy
-						Lmxpdi5hYy51azAeFw0xNTA0MzAwOTUyMTBaFw0yNTA0MjcwOTUyMTBaMHYxCzAJ
-						BgNVBAYTAkdCMRAwDgYDVQQIDAdFbmdsYW5kMRMwEQYDVQQHDApNZXJzZXlzaWRl
-						MSAwHgYDVQQKDBdVbml2ZXJzaXR5IG9mIExpdmVycG9vbDEeMBwGA1UEAwwVc2hp
-						YmJvbGV0aDIubGl2LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAvpJmrHAHwvd5VyvTC8IbreA/RC6MAdosUKnleXdlNAztJNzYbrakgxzoKxML
-						Xo42eybvolKRu7tzjQsOSoYsi+VabKlvRPv6VZbWrBNNXm0YAwu9U5Qam0Q6iJj9
-						+dVbV2AzMa59HY0csUhEuucpHwtcx3XjtUPl+h8jaqvRV0YP9GOHpIBXic9EHfIr
-						bCiGvX+2GJArbAHGcx40sUN+Uxi2NFZRlz/Ra4HebL3+T1v+963q6J6srCyrb+9p
-						1ZtQY7WN6fOeIouVIQb0K4eKUAz1rU/NH/xwBROCqW3Qe03570bDNVKRyMHBbZG5
-						lQwmx4FpqHvGBKWH5eQIl8ET+wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBLpHce
-						zwNxs0oKZMwrHJAip1zEWCvUuJ3Imt5sv81L9MK+BRfmTXw/LkBX8wVBUOZpHJf/
-						ZCAyT6OuAAyu/2f5XAB1hjWGG22qY3vCrFU2bqOQ9P//sWbZbHv09YM8Mnk8HQWa
-						36i3gr2wyaw8ye0Binq8e7ogR3JlG4JErBwnNnFWZNyIhpPc6zPnBcFSkhIQ7LbE
-						8SwM7+j8BNPXp5+JNfYWkprHLGpEnp59cXAPsXkkN/15ZwfIgfpKtu1q6uBGe8Qo
-						SIk8ozzg9KvEhce6LWuJTSYgUNXkGjl84VhJAMK9ioFkQmdFaCXCs+Vp2bZJovkN
-						t8ukc2Dgz1WJXVlP
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.liv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.liv.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://shibboleth2.liv.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.liv.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.liv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.liv.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">liv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaDCCAlACCQDWC0umrtoXlDANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
-						QjEQMA4GA1UECAwHRW5nbGFuZDETMBEGA1UEBwwKTWVyc2V5c2lkZTEgMB4GA1UE
-						CgwXVW5pdmVyc2l0eSBvZiBMaXZlcnBvb2wxHjAcBgNVBAMMFXNoaWJib2xldGgy
-						Lmxpdi5hYy51azAeFw0xNTA0MzAwOTUyMTBaFw0yNTA0MjcwOTUyMTBaMHYxCzAJ
-						BgNVBAYTAkdCMRAwDgYDVQQIDAdFbmdsYW5kMRMwEQYDVQQHDApNZXJzZXlzaWRl
-						MSAwHgYDVQQKDBdVbml2ZXJzaXR5IG9mIExpdmVycG9vbDEeMBwGA1UEAwwVc2hp
-						YmJvbGV0aDIubGl2LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAvpJmrHAHwvd5VyvTC8IbreA/RC6MAdosUKnleXdlNAztJNzYbrakgxzoKxML
-						Xo42eybvolKRu7tzjQsOSoYsi+VabKlvRPv6VZbWrBNNXm0YAwu9U5Qam0Q6iJj9
-						+dVbV2AzMa59HY0csUhEuucpHwtcx3XjtUPl+h8jaqvRV0YP9GOHpIBXic9EHfIr
-						bCiGvX+2GJArbAHGcx40sUN+Uxi2NFZRlz/Ra4HebL3+T1v+963q6J6srCyrb+9p
-						1ZtQY7WN6fOeIouVIQb0K4eKUAz1rU/NH/xwBROCqW3Qe03570bDNVKRyMHBbZG5
-						lQwmx4FpqHvGBKWH5eQIl8ET+wIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBLpHce
-						zwNxs0oKZMwrHJAip1zEWCvUuJ3Imt5sv81L9MK+BRfmTXw/LkBX8wVBUOZpHJf/
-						ZCAyT6OuAAyu/2f5XAB1hjWGG22qY3vCrFU2bqOQ9P//sWbZbHv09YM8Mnk8HQWa
-						36i3gr2wyaw8ye0Binq8e7ogR3JlG4JErBwnNnFWZNyIhpPc6zPnBcFSkhIQ7LbE
-						8SwM7+j8BNPXp5+JNfYWkprHLGpEnp59cXAPsXkkN/15ZwfIgfpKtu1q6uBGe8Qo
-						SIk8ozzg9KvEhce6LWuJTSYgUNXkGjl84VhJAMK9ioFkQmdFaCXCs+Vp2bZJovkN
-						t8ukc2Dgz1WJXVlP
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.liv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.liv.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 Liverpool</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Liverpool (TEST do not use)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.liv.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Gilbertson</SurName>
-    <EmailAddress>mailto:webmaster@liv.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Pretlove</SurName>
-    <EmailAddress>mailto:T.Pretlove@liverpool.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2.rwcmd.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2.rwcmd.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 3386935b..00000000
--- a/swamid-interfederations-2.0/shibboleth2.rwcmd.ac.uk-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" entityID="https://shibboleth2.rwcmd.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Royal Welsh College of Music and Drama.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-09-03T18: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">rwcmd.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glam.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID9DCCAtwCCQCCojb3OfH/lTANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0NhcmRpZmYxEDAOBgNVBAcTB0NhcmRpZmYxLzAtBgNVBAoT
-						JlJveWFsIFdlbHNoIENvbGxlZ2Ugb2YgTXVzaWMgYW5kIERyYW1hMRYwFAYDVQQL
-						Ew1JVCBEZXBhcnRtZW50MSAwHgYDVQQDExdzaGliYm9sZXRoMi5yd2NtZC5hYy51
-						azEdMBsGCSqGSIb3DQEJARYOaXRAcndjbWQuYWMudWswHhcNMTQwMTE1MTE0MjM4
-						WhcNMjMxMDE1MTE0MjM4WjCBuzELMAkGA1UEBhMCR0IxEDAOBgNVBAgTB0NhcmRp
-						ZmYxEDAOBgNVBAcTB0NhcmRpZmYxLzAtBgNVBAoTJlJveWFsIFdlbHNoIENvbGxl
-						Z2Ugb2YgTXVzaWMgYW5kIERyYW1hMRYwFAYDVQQLEw1JVCBEZXBhcnRtZW50MSAw
-						HgYDVQQDExdzaGliYm9sZXRoMi5yd2NtZC5hYy51azEdMBsGCSqGSIb3DQEJARYO
-						aXRAcndjbWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDK
-						Lb1ki7lYC9VR+7oMZTbIxAM8xRp25olZgAX2sXp6huwiCuhIpQKdiSNaC/CY2ExZ
-						MtlABHncCP9yvaxZeQKsAlNi3LuPHtPoLwtfePDbaTxWgRt65yzKXYsdFCq5tSDa
-						rsRUSYyQPpdOzTolcwdyJBObpis3Mgzeg+Sid4rrDIVK+Ym+Z7CxC63O1eBgDi+8
-						C78moSRVzQjhywJtxQp2tcKOV9X21TE08+s3B9QLswV0rFqkyToaAMV0EfAdk0oh
-						oQXQXuqD7QnfHkaQw2vca6uQRjR5PEK9VRHV0J7XTglqK+elUbENyeYeAVqzHZ6n
-						KLmi8UcCPbvepguEL88fAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAK+dGhOQQSJ+
-						8OHwaQkkDUciMrYx5V3fGSTxO76ZrK4Ix/mD6iaRqvd1rxPaDfxXITC8qTQLjSFK
-						ihgzoQqRM4EbL4XBpyLQw6Z7wtxsrWmm7iQXA2p+w39c8myPl4nTfXI4aGKfMvpO
-						0Ee/EdEKxwC+QJ4WXiATs0V2+zWtsN2wOAbTw23MXKKQawAiDQpGZ7acpGFXrElS
-						cwH6hlJACBs1fsuXyjkrQGe636ZQdjK/v7wCFQXTzg6bW6WiqW0DtdKYxD7bLN6q
-						jJlh7/XeUvowweMSEk7iKrbGp4pHhMbPQsFo90i3BWBE9yot/DN+T/G9Z6W05Tsr
-						Pk3B5nn2ecE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.rwcmd.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.rwcmd.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://shibboleth2.rwcmd.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.rwcmd.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.rwcmd.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.rwcmd.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">rwcmd.ac.uk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">glam.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID9DCCAtwCCQCCojb3OfH/lTANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0NhcmRpZmYxEDAOBgNVBAcTB0NhcmRpZmYxLzAtBgNVBAoT
-						JlJveWFsIFdlbHNoIENvbGxlZ2Ugb2YgTXVzaWMgYW5kIERyYW1hMRYwFAYDVQQL
-						Ew1JVCBEZXBhcnRtZW50MSAwHgYDVQQDExdzaGliYm9sZXRoMi5yd2NtZC5hYy51
-						azEdMBsGCSqGSIb3DQEJARYOaXRAcndjbWQuYWMudWswHhcNMTQwMTE1MTE0MjM4
-						WhcNMjMxMDE1MTE0MjM4WjCBuzELMAkGA1UEBhMCR0IxEDAOBgNVBAgTB0NhcmRp
-						ZmYxEDAOBgNVBAcTB0NhcmRpZmYxLzAtBgNVBAoTJlJveWFsIFdlbHNoIENvbGxl
-						Z2Ugb2YgTXVzaWMgYW5kIERyYW1hMRYwFAYDVQQLEw1JVCBEZXBhcnRtZW50MSAw
-						HgYDVQQDExdzaGliYm9sZXRoMi5yd2NtZC5hYy51azEdMBsGCSqGSIb3DQEJARYO
-						aXRAcndjbWQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDK
-						Lb1ki7lYC9VR+7oMZTbIxAM8xRp25olZgAX2sXp6huwiCuhIpQKdiSNaC/CY2ExZ
-						MtlABHncCP9yvaxZeQKsAlNi3LuPHtPoLwtfePDbaTxWgRt65yzKXYsdFCq5tSDa
-						rsRUSYyQPpdOzTolcwdyJBObpis3Mgzeg+Sid4rrDIVK+Ym+Z7CxC63O1eBgDi+8
-						C78moSRVzQjhywJtxQp2tcKOV9X21TE08+s3B9QLswV0rFqkyToaAMV0EfAdk0oh
-						oQXQXuqD7QnfHkaQw2vca6uQRjR5PEK9VRHV0J7XTglqK+elUbENyeYeAVqzHZ6n
-						KLmi8UcCPbvepguEL88fAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAK+dGhOQQSJ+
-						8OHwaQkkDUciMrYx5V3fGSTxO76ZrK4Ix/mD6iaRqvd1rxPaDfxXITC8qTQLjSFK
-						ihgzoQqRM4EbL4XBpyLQw6Z7wtxsrWmm7iQXA2p+w39c8myPl4nTfXI4aGKfMvpO
-						0Ee/EdEKxwC+QJ4WXiATs0V2+zWtsN2wOAbTw23MXKKQawAiDQpGZ7acpGFXrElS
-						cwH6hlJACBs1fsuXyjkrQGe636ZQdjK/v7wCFQXTzg6bW6WiqW0DtdKYxD7bLN6q
-						jJlh7/XeUvowweMSEk7iKrbGp4pHhMbPQsFo90i3BWBE9yot/DN+T/G9Z6W05Tsr
-						Pk3B5nn2ecE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.rwcmd.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.rwcmd.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">Royal Welsh College of Music and Drama</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Welsh College of Music and Drama</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rwcmd.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Gareth</GivenName>
-    <SurName>Tottle</SurName>
-    <EmailAddress>mailto:gareth.tottle@rwcmd.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gareth</GivenName>
-    <SurName>Tottle</SurName>
-    <EmailAddress>mailto:gareth.tottle@rwcmd.ac.uk</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 66cdbeb3..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2.ufms.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://shibboleth2.ufms.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.ufms.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.ufms.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.ufms.br/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">ufms.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ufms.br:8443/idp/profile/SAML1/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">UFMS - Universidade Federal de Mato Grosso do Sul</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFMS - Universidade Federal de Mato Grosso do Sul</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFMS - Universidade Federal de Mato Grosso do Sul</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufms.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufms.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Ronaldo Alves Ferreira</md:SurName>
-    <md:EmailAddress>raf@dct.ufms.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 fab13110..00000000
--- a/swamid-interfederations-2.0/shibboleth2.ufms.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://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>
-    MIIEwTCCA6mgAwIBAgIBADANBgkqhkiG9w0BAQUFADCB/zELMAkGA1UEBhMCQlIx
-GzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDEVMBMGA1UEBxMMQ2FtcG8gR3Jh
-bmRlMTowOAYDVQQKEzFVRk1TIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZG8gTWF0
-byBHcm9zc28gZG8gU3VsMTowOAYDVQQLEzFVRk1TIC0gVW5pdmVyc2lkYWRlIEZl
-ZGVyYWwgZG8gTWF0byBHcm9zc28gZG8gU3VsMSYwJAYJKoZIhvcNAQkBFhdicml2
-YWxkby5qdW5pb3JAdWZtcy5icjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5i
-cjAeFw0xMDA5MDkxOTQ0MzVaFw0xMzA5MDgxOTQ0MzVaMIH/MQswCQYDVQQGEwJC
-UjEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMRUwEwYDVQQHEwxDYW1wbyBH
-cmFuZGUxOjA4BgNVBAoTMVVGTVMgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBN
-YXRvIEdyb3NzbyBkbyBTdWwxOjA4BgNVBAsTMVVGTVMgLSBVbml2ZXJzaWRhZGUg
-RmVkZXJhbCBkbyBNYXRvIEdyb3NzbyBkbyBTdWwxJjAkBgkqhkiG9w0BCQEWF2Jy
-aXZhbGRvLmp1bmlvckB1Zm1zLmJyMRwwGgYDVQQDExNzaGliYm9sZXRoMi51Zm1z
-LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuP6n5bTFwA9aFxAx
-lJWzlcMJuGHe0eG4IYvmVODpTzz8M3kzHtXZwg8qcccPd/+c+rY94mmGpDH/11T4
-eBnpZJ4x9Jz4kC/zW5/lS/Sce8UnGf/7Jfya/iBs0ZdEyKXFsCWiXCFH8gKisJL5
-cr4Ae8/+/BWIYBPxZ/EDT6y0GJqRGoihgNVpDXt6PVO7f2+sRYDjpGToUQto5/DA
-Tfip+XlMR9MGkJOrYhx2fNKx+bnfAuhNKHKZDgxBVseR9l5+bVND1J+kZ4FVBLKs
-4JEEGwJN7ZEXQ+3dIFxvDR0z++KHL9Ir779wQaQw40h5a2L1KuW1e83T1F6VVZWR
-jxSNqwIDAQABo0YwRDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAh
-BggrBgEFBQcDAQYJYIZIAYb4QgQBBgorBgEEAYI3CgMDMA0GCSqGSIb3DQEBBQUA
-A4IBAQA3MOvYaqfwv5NcEzJ45/hCxZ55GJLmZRGxY2Zh/zxNr1L92aNTQxKSy9GJ
-AbVq0HDIjfeul7MwmyOZeMtE5p+vH4p5TNvH0dl7XHO/znXB9YXp2ur6eSq5+a+l
-z7sYBukoxh2f8FOyCC3Q7K8LPcWLp9qYSO2afVnRn2IrKN7bTK1QaSoqMYhHtFxu
-a5tg8ShIu5+p5jWdszdj5T/vsT50Dk+DzbD3982fvW5w8WsGyx48RODFGPzR1I7/
-e9ZnIRiIdcsOlq2r0r41zQZLB8pMW/JejKMf2ta5tRWQ/j6XfPQRnSbyO0UjVitZ
-lkqI2tRwg0C+2HVWQXMUga97IjyC
-            </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>
-      
-MIIEwTCCA6mgAwIBAgIBADANBgkqhkiG9w0BAQUFADCB/zELMAkGA1UEBhMCQlIx
-GzAZBgNVBAgTEk1hdG8gR3Jvc3NvIGRvIFN1bDEVMBMGA1UEBxMMQ2FtcG8gR3Jh
-bmRlMTowOAYDVQQKEzFVRk1TIC0gVW5pdmVyc2lkYWRlIEZlZGVyYWwgZG8gTWF0
-byBHcm9zc28gZG8gU3VsMTowOAYDVQQLEzFVRk1TIC0gVW5pdmVyc2lkYWRlIEZl
-ZGVyYWwgZG8gTWF0byBHcm9zc28gZG8gU3VsMSYwJAYJKoZIhvcNAQkBFhdicml2
-YWxkby5qdW5pb3JAdWZtcy5icjEcMBoGA1UEAxMTc2hpYmJvbGV0aDIudWZtcy5i
-cjAeFw0xMDA5MDkxOTQ0MzVaFw0xMzA5MDgxOTQ0MzVaMIH/MQswCQYDVQQGEwJC
-UjEbMBkGA1UECBMSTWF0byBHcm9zc28gZG8gU3VsMRUwEwYDVQQHEwxDYW1wbyBH
-cmFuZGUxOjA4BgNVBAoTMVVGTVMgLSBVbml2ZXJzaWRhZGUgRmVkZXJhbCBkbyBN
-YXRvIEdyb3NzbyBkbyBTdWwxOjA4BgNVBAsTMVVGTVMgLSBVbml2ZXJzaWRhZGUg
-RmVkZXJhbCBkbyBNYXRvIEdyb3NzbyBkbyBTdWwxJjAkBgkqhkiG9w0BCQEWF2Jy
-aXZhbGRvLmp1bmlvckB1Zm1zLmJyMRwwGgYDVQQDExNzaGliYm9sZXRoMi51Zm1z
-LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuP6n5bTFwA9aFxAx
-lJWzlcMJuGHe0eG4IYvmVODpTzz8M3kzHtXZwg8qcccPd/+c+rY94mmGpDH/11T4
-eBnpZJ4x9Jz4kC/zW5/lS/Sce8UnGf/7Jfya/iBs0ZdEyKXFsCWiXCFH8gKisJL5
-cr4Ae8/+/BWIYBPxZ/EDT6y0GJqRGoihgNVpDXt6PVO7f2+sRYDjpGToUQto5/DA
-Tfip+XlMR9MGkJOrYhx2fNKx+bnfAuhNKHKZDgxBVseR9l5+bVND1J+kZ4FVBLKs
-4JEEGwJN7ZEXQ+3dIFxvDR0z++KHL9Ir779wQaQw40h5a2L1KuW1e83T1F6VVZWR
-jxSNqwIDAQABo0YwRDAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDAqBgNVHSUEIzAh
-BggrBgEFBQcDAQYJYIZIAYb4QgQBBgorBgEEAYI3CgMDMA0GCSqGSIb3DQEBBQUA
-A4IBAQA3MOvYaqfwv5NcEzJ45/hCxZ55GJLmZRGxY2Zh/zxNr1L92aNTQxKSy9GJ
-AbVq0HDIjfeul7MwmyOZeMtE5p+vH4p5TNvH0dl7XHO/znXB9YXp2ur6eSq5+a+l
-z7sYBukoxh2f8FOyCC3Q7K8LPcWLp9qYSO2afVnRn2IrKN7bTK1QaSoqMYhHtFxu
-a5tg8ShIu5+p5jWdszdj5T/vsT50Dk+DzbD3982fvW5w8WsGyx48RODFGPzR1I7/
-e9ZnIRiIdcsOlq2r0r41zQZLB8pMW/JejKMf2ta5tRWQ/j6XfPQRnSbyO0UjVitZ
-lkqI2tRwg0C+2HVWQXMUga97IjyC
-                    
-            </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/shibboleth2sp.bpp.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.bpp.semcs.net-shibboleth.xml
deleted file mode 100644
index c5777cee..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.bpp.semcs.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://shibboleth2sp.bpp.semcs.net/shibboleth">
-  <!--
-		This is a Bloomsbury Shibboleth SP for Semantico Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-29T12:04:50Z"/>
-  </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>
-						MIIDzjCCAzegAwIBAgIDEAAXMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
-						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
-						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-						dHkwHhcNMTIwMzI4MTU0MTQ2WhcNMTcwMzI3MTU0MTQ2WjBrMQswCQYDVQQGEwJV
-						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
-						c2VtYW50aWNvMSQwIgYDVQQDExtzaGliYm9sZXRoMnNwLmJwcC5zZW1jcy5uZXQw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEzdkuVvTeZ0gCxQtc3rMj
-						gY1fVWq9dFsxbWvTuGT9Sejzz2vbDFrOHgeBoLZnjfKf5JujsfGFirnip9ZmJiks
-						GVFjaV+JemCPYh2WNIudQYufAC+wv1NCWjR2+04QOHr581rWwFkf6q0jTtF5UP4F
-						ub19xhGI1iV90SENqOoXUAYKd4M883OKzNeZEALsldjsTw9yqeA78puMxPGVCM+H
-						esxrbYjQxvrANfTewFKgyUP3/vY285iZuOtCWD3xNxA9LVjIomm5DHmPo9al+uB5
-						fvZkyeffX4RaJxxsFbZEF3IY2XbwM3pe/X8VZVTmZ2sgek59mBlzmEiieNFtLxqr
-						AgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
-						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMMIwcKVssY66nSLa95evHYB
-						Ux7eMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBvMQsw
-						CQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjES
-						MBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlmaWNh
-						dGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAD4uD2MnsI21aulQbNDY
-						e+c3unQDVuXqlUaNPqxWnOMQfPCL4I2GRkM8L0v9i4cXyFHf5lZTcAgAilLEk1vJ
-						x37npAKQWvdmRWPFQPmXq1vzl+K21P25cPpuKyfmTakrVBCgLc6FfF/+mMlSl1QG
-						WDHMW7heQivp3022de81dMFg
-					</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>
-						MIIDzjCCAzegAwIBAgIDEAAXMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
-						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
-						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-						dHkwHhcNMTIwMzI4MTU0MTQ2WhcNMTcwMzI3MTU0MTQ2WjBrMQswCQYDVQQGEwJV
-						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
-						c2VtYW50aWNvMSQwIgYDVQQDExtzaGliYm9sZXRoMnNwLmJwcC5zZW1jcy5uZXQw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEzdkuVvTeZ0gCxQtc3rMj
-						gY1fVWq9dFsxbWvTuGT9Sejzz2vbDFrOHgeBoLZnjfKf5JujsfGFirnip9ZmJiks
-						GVFjaV+JemCPYh2WNIudQYufAC+wv1NCWjR2+04QOHr581rWwFkf6q0jTtF5UP4F
-						ub19xhGI1iV90SENqOoXUAYKd4M883OKzNeZEALsldjsTw9yqeA78puMxPGVCM+H
-						esxrbYjQxvrANfTewFKgyUP3/vY285iZuOtCWD3xNxA9LVjIomm5DHmPo9al+uB5
-						fvZkyeffX4RaJxxsFbZEF3IY2XbwM3pe/X8VZVTmZ2sgek59mBlzmEiieNFtLxqr
-						AgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
-						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMMIwcKVssY66nSLa95evHYB
-						Ux7eMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBvMQsw
-						CQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjES
-						MBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlmaWNh
-						dGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAD4uD2MnsI21aulQbNDY
-						e+c3unQDVuXqlUaNPqxWnOMQfPCL4I2GRkM8L0v9i4cXyFHf5lZTcAgAilLEk1vJ
-						x37npAKQWvdmRWPFQPmXq1vzl+K21P25cPpuKyfmTakrVBCgLc6FfF/+mMlSl1QG
-						WDHMW7heQivp3022de81dMFg
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.bpp.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bloomsbury Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bloomsbury.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:bpp-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:bpp-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml
deleted file mode 100644
index faf801c7..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.brill.test.semantico.net-shibboleth.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.brill.test.semantico.net/shibboleth">
-  <!--
-		This is a "Brill Test" Shibboleth SP for Semantico Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIEADCCAuigAwIBAgIJAJHnQHTfSIkVMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xLzAtBgNVBAMTJnNoaWJib2xldGgyc3AuYnJpbGwudGVz
-						dC5zZW1hbnRpY28ubmV0MB4XDTE1MDcwNzE1Mjc0OVoXDTM1MDcwMjE1Mjc0OVow
-						djELMAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0
-						b24xEjAQBgNVBAoTCXNlbWFudGljbzEvMC0GA1UEAxMmc2hpYmJvbGV0aDJzcC5i
-						cmlsbC50ZXN0LnNlbWFudGljby5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQCpbkZr9C5pTKHeSBhXOdlyq0cj1H7HnJaeFqfNTIsSTeGBz9YQOQj1
-						YDpUFvNMz68i9Tr2PmipA9YdpCyx6WacZ97gcicacHQR8bvR40xpdxICKSPbk4q5
-						04Lcqk7oWmEqwTKq1HHTZ4beJ+J4nZvuJp6OEsYWlgo0GAppYXomufaIiKgKcMTE
-						1o+RmzAqC1NhTGt9bhmu4miGL/E5gF1Ee09rT+CyPy2uU5FfERc9iYbRU1y2nlYa
-						l9lGuNKKgCR/i4X6o5N41wbAhC7qVyOgdnC3URIXY6kDxXZXxRJ43CqiN6K7fzXr
-						PnbCaIjdcvZNenqIWXmeZZazDhQS0+PrAgMBAAGjgZAwgY0wbAYDVR0RBGUwY4Im
-						c2hpYmJvbGV0aDJzcC5icmlsbC50ZXN0LnNlbWFudGljby5uZXSGOWh0dHBzOi8v
-						c2hpYmJvbGV0aDJzcC5icmlsbC50ZXN0LnNlbWFudGljby5uZXQvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUQYXkdOeISwzSlep0EN4KZMtWxzgwDQYJKoZIhvcNAQEFBQAD
-						ggEBAInyZ2x2Zsnl1/GiTYRZVuQvCXiTkb8qgZPfikCC3j+WWXo3F1vh30frNWrJ
-						l/y58imdgq52tNgXlJzzjMWMMGdeDqcCmhEl+G/BzFMcxzR3IJiqasj7uWYe6RLT
-						F0CLUN5ireWRoDC7qgCsNw/jdSHA9V0svY6A2zEu/4slg32P3QjXzygHCNNOBPFF
-						F1RetJItbWNbQNG7+bZOKHtBzheAiBc0o7i7ewRtk7oJ8TCOsTSV7auJQ9XfjcHc
-						YewH2BVJfIHcvb0og5JuID8n6pK5dk3Oto7JfrfFBMud5HXQyiJQBFG3XImvCKyA
-						apRzo7PMQM8MkzJRll+WaeTncU4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.brill.test.semantico.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Semantico Limited: Brill Test Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brill.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:brill-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:brill-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.xml
deleted file mode 100644
index 011f85f4..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl-shibboleth.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://shibboleth2sp.brillonline.nl/shibboleth">
-  <!--
-		This is a "Brill" Shibboleth SP for Semantico Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIID1jCCAr6gAwIBAgIJANySKK7sPqq+MA0GCSqGSIb3DQEBBQUAMGwxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xJTAjBgNVBAMTHHNoaWJib2xldGgyc3AuYnJpbGxvbmxp
-						bmUubmwwHhcNMTUwNzMwMTAzNDI5WhcNMzUwNzI1MTAzNDI5WjBsMQswCQYDVQQG
-						EwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UE
-						ChMJc2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5l
-						Lm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzDGthKGzhqlGBQcB
-						u9c2+gPZvoL8QcIfYuz7gyMi1hs4ZQEK/mNwiM2wSbMcG44yvXPcDFSYiKmPtykJ
-						GXRMlSS2Q9O5F5eOnZU40sl4s6Va2oK6SyKA0RnFKwt9svLjHbmMbobQEB4hRdNX
-						Ju9YHL+ql33rAhCdmnDuBmtfPvgu0V6uqb1x5yXShYQdXwD0o6gaBXcxIfDZfCqw
-						ZLeV9XmdRAX5viX2tBp2B6CNT4uPPyhIdVJ6P299xfMwrkKD8+OxzgPn9wYxzq0J
-						vd7WwKFD4Z6waUHTbU2KLVcaCmEZz19K9xofDon1pi+GLUrQawf82mQKGHAhH8Jw
-						+L2tkwIDAQABo3sweTBYBgNVHREEUTBPghxzaGliYm9sZXRoMnNwLmJyaWxsb25s
-						aW5lLm5shi9odHRwczovL3NoaWJib2xldGgyc3AuYnJpbGxvbmxpbmUubmwvc2hp
-						YmJvbGV0aDAdBgNVHQ4EFgQUyOAI3XrlGiIPV0Tofnyk2xSjn1IwDQYJKoZIhvcN
-						AQEFBQADggEBAHyrsIjUUcOSIc5+zVKRH59MFbEjeYMPomEeJmFOxojwDlSbhZ4b
-						2K2iTcCXlY8rtuuYLrWTLGyhJW+xWGRAJFJwD6F6WHJFEklMYeIAmlXKzCJJKuJn
-						rFzPjibYq2YafhbKn5N8k2QUJKOIhgg4FAWsGXLrcR/7W0LJCg5l2fPyDH/KbRzP
-						OgBYciKv5fbMr+vSM8LYJ9zAKYWsyg3yo6Hrf8RQKsn0ptaSOqJZf0W4mGlH3Ug5
-						GUyHWM3Hk/NPMuV49u+GU/beegr/XVyLUTMj1EyxCPpXr5bShe1sZ73TVQ51b6am
-						uVOG89dvf99DIrLXGx9zxyM6HTWXTmaT/9A=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Semantico Limited: Brill Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brill.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:brill-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:brill-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl.xml b/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl.xml
deleted file mode 100644
index b3933e85..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.brillonline.nl.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.brillonline.nl/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth2sp.brillonline.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth2sp.brillonline.nl,O=semantico,L=Brighton,ST=Sussex,C=UK</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDzzCCAzigAwIBAgIDEACAMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
-MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
-ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkwHhcNMTAwODAzMTEyMjUyWhcNMTUwODAyMTEyMjUyWjBsMQswCQYDVQQGEwJV
-SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
-c2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5lLm5s
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ryqiC3McpzrOXZWOeFF
-GTO4Nd/oiBgEQtfP/oymsEm+1H1TvDDoXpqNVo+tTrWbfZh/yjgsBzxW8/1sWM5n
-jZO0JygTkJmh5Pmvdz6P7mUNu9HlGk60B8PpU0dRsJrNJRNgBe9vWJnNxaSDerxO
-M5+iWGJUgRf2jh3+PQ9FFflEBEUpesJHBKKYVLAwk0q2UUcXIzN92xVakUUN8+u6
-DapeD9bYi1N/6E9jiwwE7J3JDAhKbGrJRWt63dzCd79iHJG3jj7TdJzQtHoJ3f1r
-eJ+hE+ST+uikU9GxNfWmoCTTnjh5Cncwl7Zz6aig71MKNR/Z2jjAOIg7CKvI9zjR
-kwIDAQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
-R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeZ1VPClGa+wJ0lwl8apv1
-XRb0fTCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzEL
-MAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24x
-EjAQBgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmlj
-YXRlIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQBx33DwzT1uEOkH9GrA
-XO6DXjduvykr96g5B1CmnfdEiFQCninnDdjoIZ0e+437a98rBx81bH4xGdu/Q+4Y
-E4RTqlWzO+xS8HLYiuSrIL83sSKGPmX94xlWMVvuvoJRhidkKvammP+IReq4q99w
-OsSkSoP6HZrPCOXMEAK23C8pxQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth2sp.brillonline.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth2sp.brillonline.nl,O=semantico,L=Brighton,ST=Sussex,C=UK</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDzzCCAzigAwIBAgIDEACAMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
-MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
-ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkwHhcNMTAwODAzMTEyMjUyWhcNMTUwODAyMTEyMjUyWjBsMQswCQYDVQQGEwJV
-SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
-c2VtYW50aWNvMSUwIwYDVQQDExxzaGliYm9sZXRoMnNwLmJyaWxsb25saW5lLm5s
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ryqiC3McpzrOXZWOeFF
-GTO4Nd/oiBgEQtfP/oymsEm+1H1TvDDoXpqNVo+tTrWbfZh/yjgsBzxW8/1sWM5n
-jZO0JygTkJmh5Pmvdz6P7mUNu9HlGk60B8PpU0dRsJrNJRNgBe9vWJnNxaSDerxO
-M5+iWGJUgRf2jh3+PQ9FFflEBEUpesJHBKKYVLAwk0q2UUcXIzN92xVakUUN8+u6
-DapeD9bYi1N/6E9jiwwE7J3JDAhKbGrJRWt63dzCd79iHJG3jj7TdJzQtHoJ3f1r
-eJ+hE+ST+uikU9GxNfWmoCTTnjh5Cncwl7Zz6aig71MKNR/Z2jjAOIg7CKvI9zjR
-kwIDAQABo4H3MIH0MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
-R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSeZ1VPClGa+wJ0lwl8apv1
-XRb0fTCBmQYDVR0jBIGRMIGOgBQCG06aN/CNamhERsYdRP66sl6+OaFzpHEwbzEL
-MAkGA1UEBhMCVUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24x
-EjAQBgNVBAoTCXNlbWFudGljbzEoMCYGA1UEAxMfc2VtYW50aWNvIENlcnRpZmlj
-YXRlIEF1dGhvcml0eYIBADANBgkqhkiG9w0BAQQFAAOBgQBx33DwzT1uEOkH9GrA
-XO6DXjduvykr96g5B1CmnfdEiFQCninnDdjoIZ0e+437a98rBx81bH4xGdu/Q+4Y
-E4RTqlWzO+xS8HLYiuSrIL83sSKGPmX94xlWMVvuvoJRhidkKvammP+IReq4q99w
-OsSkSoP6HZrPCOXMEAK23C8pxQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.brillonline.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Brill Shibboleth 2 SP</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Brill Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.brill.nl/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Help</GivenName>
-    <SurName>desk</SurName>
-    <EmailAddress>brill-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Colin</GivenName>
-    <SurName>Caveney</SurName>
-    <EmailAddress>colin.caveney@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.bw.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.bw.semcs.net-shibboleth.xml
deleted file mode 100644
index 666f7c11..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.bw.semcs.net-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://shibboleth2sp.bw.semcs.net/shibboleth">
-  <!--
-		This is a "Wiley" Shibboleth SP for Semantico Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-06T13:59:27Z">
-      <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://shibboleth2sp.bw.semcs.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://shibboleth2sp.bw.semcs.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDzjCCAragAwIBAgIJAOrzhMg7IMvZMA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xIzAhBgNVBAMTGnNoaWJib2xldGgyc3AuYncuc2VtY3Mu
-						bmV0MB4XDTE0MTIwMjE0NTgyMloXDTM0MTEyNzE0NTgyMlowajELMAkGA1UEBhMC
-						VUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoT
-						CXNlbWFudGljbzEjMCEGA1UEAxMac2hpYmJvbGV0aDJzcC5idy5zZW1jcy5uZXQw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFi/wIgmSuv3qLeh0z3FfF
-						TwkaZ13XUKHPsI7r7vFySiGIlV141jGkE+ilWb8BZwjV75nC10l+4bGHueGzxpwg
-						Kk0EWzZlUDFHW6xyjEn4uAocTyZw3LI4yn2DjdhTm07QA2f3ckS3FAg9NcA0Uj22
-						WQD8TcGgr3IpRm2b2PwFY7a2WW+KK0nAkbJl8XeD+ZmofIgBodzj2HvAsabCyCSg
-						zDm07iEIYj2QPTFwi7ZlNHK5p1QPtyBhv4Uh3STvSnWEjwT74TplvYXv6BBwwbVA
-						Mc3O+uq9F/nkHcxR8MWGXbWpPVIs4JkxO9et0yKjw7nTCugEYGlRjfNMGv86FzKd
-						AgMBAAGjdzB1MFQGA1UdEQRNMEuCGnNoaWJib2xldGgyc3AuYncuc2VtY3MubmV0
-						hi1odHRwczovL3NoaWJib2xldGgyc3AuYncuc2VtY3MubmV0L3NoaWJib2xldGgw
-						HQYDVR0OBBYEFG5qIQhlR9RI7eUVWXgkBhe+LcnIMA0GCSqGSIb3DQEBBQUAA4IB
-						AQCaWKa/mQaXL1VF57LYXA3HyAhgzWNzDbZfXAgaloose/a/db23f482HU4Ibx/G
-						Y9oksWNs43Ltp7lFdSXSfgAwqQ/ca1aZvnFuqyawQ9kNgUQkbIh86GHovYAi9Ame
-						h6J01wD3LwNGW9/x/nNA6QqgtUgPSWk0YxD6vczPWDJzRD0kAtnmxGPf08elXArq
-						TPMxoFxhzliDDW4k/Nwydfiw7fSkPbmZAPCS7ykyzeGF7yMAZSz+7yc/uKY5ixAL
-						4voeK7R1wmoYtSVdDb506kbMzSM+jsSaX8tjlI5AULxOFcarmZnJQzSV6RkSUSqP
-						dZIy/reh17W2tzo/KX0nvOa+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.bw.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Semantico Limited: Wiley Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://eu.wiley.com/WileyCDA/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Williamson</SurName>
-    <EmailAddress>mailto:mawilliams@wiley.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Wiley Support</GivenName>
-    <EmailAddress>mailto:wiley-support@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.xml
deleted file mode 100644
index ff4d6f69..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.cab.semcs.net-shibboleth.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://shibboleth2sp.cab.semcs.net/shibboleth">
-  <!--
-		This is a "CABI" Shibboleth SP for Semantico Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIID0jCCArqgAwIBAgIJAKhAI5hrPtycMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AuY2FiLnNlbWNz
-						Lm5ldDAeFw0xNTA0MjMxMDQwMDNaFw0zNTA0MTgxMDQwMDNaMGsxCzAJBgNVBAYT
-						AlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQK
-						EwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AuY2FiLnNlbWNzLm5l
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMo6HEsVY5D3FNTamNhM
-						U2/zkVh6ZWNSekvPiXIXi074Vol8nTbHO18ckTQCoovUAEC8pTnMPITo4ga3m2Yr
-						SDYfu/YvsTzl+caOkGqY9atp6Hpc6643PruMgf0jHn128gFP7OopZK7UN+wn8kF1
-						ZbjouHyKvORBbcik8eiHiRpn4k04N7JESS5CgpFB9KY7NQsPOqJ/FkYYggM8zXSe
-						3lSyzIx8FzzL0vj9Q0fOkbJRDCV/TVGxL3sWo0eAD7Swq7civ3TzOuEgYVTARsxp
-						zMoj7m6TjI+3VsfJKZkbhrlxp/NVyhvcUKBd1eW/5s2sjOkbj3cgKKMlalyWHWMZ
-						XWUCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc2hpYmJvbGV0aDJzcC5jYWIuc2VtY3Mu
-						bmV0hi5odHRwczovL3NoaWJib2xldGgyc3AuY2FiLnNlbWNzLm5ldC9zaGliYm9s
-						ZXRoMB0GA1UdDgQWBBQsdfdbM8eHua2UVoVlNd7UMrgx3jANBgkqhkiG9w0BAQUF
-						AAOCAQEAVXXqftpGfy/pw1uzmR7sqzxiFjbqak9wkfLkF4iFD4/ADgFYewY308fa
-						1Rqz3hgUw/3Wtjyii39OKxb5+hJmz3Yu36OBcES7NF7jKv+XXp24O0bKHlbuyq1J
-						3ktWP+klEWrBkMXMbBfP+Hxtm18XYgtrP7DIMyXO160APWFCgV+6q4clgax05EdC
-						iPwvA0S2/LNrsGdyFhT2TgIoedPJzG0bRQxhR7wD+Tp7Q78TpRBMjSIh5+hN1jfG
-						0m0iUUdeVcYD/QO1RmKCVKRiE/ggedRWm9kWuZndS9NKueRPBSUS+cRTrt1gjHT6
-						6rueyK7gPe52OqpcIeT+P9Ubo17Llg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.cab.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Semantico Limited: CABI Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.semantico.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:cab-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:cab-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.col.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.col.semcs.net-shibboleth.xml
deleted file mode 100644
index 8a265355..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.col.semcs.net-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://shibboleth2sp.col.semcs.net/shibboleth">
-  <!--
-		This is a "Columbia Shibboleth 2 SP" for Semantico 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="2016-01-22T13:05:58Z">
-      <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://shibboleth2sp.col.semcs.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://shibboleth2sp.col.semcs.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID0jCCArqgAwIBAgIJAIR565zZHkQcMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AuY29sLnNlbWNz
-						Lm5ldDAeFw0xNTA1MjYxNDIyMDRaFw0zNTA1MjExNDIyMDRaMGsxCzAJBgNVBAYT
-						AlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQK
-						EwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AuY29sLnNlbWNzLm5l
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjrcOnlfjCF9vEy1LlF
-						roaucZ/S/4dLmCTQ7Qjkn6uur9vGH0Y9+Ygl6OgAOHU/8mT8F96g0MtxWmlw7TvJ
-						TivffJRsj0EcgU3HTx1lw+8BA7b4g4ZYhR5vmP5tzkz37SZ7hpXWXMiToCqBl4gr
-						pN4le6fJxL9vwx7SFz/wQ0fDNFNzr16/A0RqyMGjZpsoL4ex/PhSPuFCA4lK1+vr
-						oBg/RmPx3UWcUAWxmUzpQUR861dI3FqegJafWCq5oeXoMWZGftbitrFjesAatJXv
-						+hUjM0OuPLFd9UaRaNWR93Mce8PX9WlmXHaL780tfA96Fb4Uk+IS/twwIRn0k6a5
-						jb0CAwEAAaN5MHcwVgYDVR0RBE8wTYIbc2hpYmJvbGV0aDJzcC5jb2wuc2VtY3Mu
-						bmV0hi5odHRwczovL3NoaWJib2xldGgyc3AuY29sLnNlbWNzLm5ldC9zaGliYm9s
-						ZXRoMB0GA1UdDgQWBBQIEQGvpv4hpPVmWgOTd1G+wJg19DANBgkqhkiG9w0BAQUF
-						AAOCAQEAMFx34m5W7N3UK9vLjfHhyWgtlojrhlUgmsX+MlSEETPQQ5Jwe9nLZQMY
-						bE73J3ZPSW42o9NODV+oy9ee2MAZxJz5dtBH9QggekvotZFVBF7fzVfhimspGwxp
-						jjy5bXQNCpV4DtN1vVGhulO1vMJ4g0HnNADgYIQ0HbH8D7kfXZgSL7bN8qDeL+0R
-						gFyL0+jSWbVltlQK6wW1sVu2cp7G67FuKKB0eZzGP1692CkX17aqwzhrKEQoZAta
-						sLggjdvG35vJWHdpUgrzL1hqg4409PL/XNr9JSLUCHp7hjMW5GhHG8fGiwgEC/gl
-						fgKAz+RKd1veDuEVh3+fQuDubthfwg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shibboleth2sp.col.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.col.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Columbia Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.columbia.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stephen</GivenName>
-    <SurName>Sterns</SurName>
-    <EmailAddress>mailto:ss724@columbia.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stephen</GivenName>
-    <SurName>Sterns</SurName>
-    <EmailAddress>mailto:ss724@columbia.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml
deleted file mode 100644
index ef752470..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.gar.semcs.net-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.gar.semcs.net/shibboleth">
-  <!--
-		This is a Shibboleth VLebooks.com SP for The Little Group Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-28T10:24:56Z"/>
-  </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://shibboleth2sp.gar.semcs.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://shibboleth2sp.gar.semcs.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDzjCCAzegAwIBAgIDEAAjMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
-						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
-						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-						dHkwHhcNMTIwNDIwMTM1MjI5WhcNMTcwNDE5MTM1MjI5WjBrMQswCQYDVQQGEwJV
-						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
-						c2VtYW50aWNvMSQwIgYDVQQDExtzaGliYm9sZXRoMnNwLmdhci5zZW1jcy5uZXQw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdJq+9YYHBJSKcQ26wtmpE
-						hsXw0R2I+9H9WSzo6ERHWulIEv7ttLeE6c3kaZ2n0lI9LQJ2AY1FrHh5tuf7gNCG
-						2RuCOn3i5TMKOw1V3t6PST+iobyoHm/sVH5g83gsnWdy4wMQr35u/0ltPpx5prEd
-						iTLDBechElt+xSBmwab5FK+MDqd9cjYsg8JSw4bdwA9sXmODhARJTt4tq8lM4okO
-						XJv9Wxs1YChFDfp8IxCbPt6POqwSsRzQkUEOmXslZXFAliClL1MN0PrEIzjHX37+
-						VuUJiClGh0xIk8Q5W8zQmSt7aFDXz0Sd5iMTAFt4uD3euQKSj1h3zlKra7/tDKIF
-						AgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
-						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFKMVuS23Tsl/+3uAUf2T1db7
-						/LWdMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBvMQsw
-						CQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjES
-						MBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlmaWNh
-						dGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAHV2kw0DugD5tIFjK8Nz
-						zc07Blr0nhVACm9y3rE+qThIW9N36HG9QiFbMjNECctggBtR/3Ne81wMqJF4V2fT
-						O37Rw5jvRqdt0E37hhYtiWVCQPPKYtuHpQ9Jiz/8nEiH2Ozpq3CHC8VDb3D5qbZm
-						x5OFM73HnkJd1Zy08T41rQ9l
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.gar.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Little Group Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">VLebooks.com</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.vlebooks.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Pallant</SurName>
-    <EmailAddress>mailto:gsupport@gardners.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Pallant</SurName>
-    <EmailAddress>mailto:gsupport@gardners.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.jstor.org-shibboleth.xml
deleted file mode 100644
index 8eb30a26..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.jstor.org-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://shibboleth2sp.jstor.org/shibboleth">
-  <!--
-		This is a "JSTOR" Shibboleth SP for Ithaka Harbors, Inc.
-	-->
-  <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="2015-09-16T08:54:29Z">
-      <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://shibboleth2sp.jstor.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://shibboleth2sp.jstor.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">JSTOR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">JSTOR is a digital library of academic journals, books, and primary sources.</mdui:Description>
-        <mdui:Logo height="80" width="80">https://jstorstatic.global.ssl.fastly.net/images/J_Logo_80x80px.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://jstorstatic.global.ssl.fastly.net/images/J_Logo_16x16px.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDwjCCAqqgAwIBAgIJAJgkGmQBfO0tMA0GCSqGSIb3DQEBBQUAMGcxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xIDAeBgNVBAMTF3NoaWJib2xldGgyc3AuanN0b3Iub3Jn
-						MB4XDTE1MDgyMDEwMjEyMVoXDTM1MDgxNTEwMjEyMVowZzELMAkGA1UEBhMCVUsx
-						DzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoTCXNl
-						bWFudGljbzEgMB4GA1UEAxMXc2hpYmJvbGV0aDJzcC5qc3Rvci5vcmcwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDuvYnVYRRNnT700akTCLjMpeYMiybx
-						+QDbBZUagVPJ7ozTXBSM6f+NgLBBa7BZ4/lSKH7y0DSP7xpu2IDZGDclwOse8tG7
-						rV+CgXJj7Kt7fRoJsk2KYmMPwD0KGJDw7MpZFb+2m1h3542QoJqQFxCHvPa4vas1
-						LhxAcSSsLdFvlAYWPQliBISls1YitEbtCzLke26jYHrat1H79miprcrQ966zyEyb
-						JIFAmtftHTuC+RhpOw6VS9y30GK5/i/iofj37lBQ83FNCsGnzgjLeJCMrQz1SYOI
-						jGmsjKntUs0/lhEaES2OohGIIkqBZZ6A4ZzWWJqPhdeysluQ1mU+j+dVAgMBAAGj
-						cTBvME4GA1UdEQRHMEWCF3NoaWJib2xldGgyc3AuanN0b3Iub3JnhipodHRwczov
-						L3NoaWJib2xldGgyc3AuanN0b3Iub3JnL3NoaWJib2xldGgwHQYDVR0OBBYEFDtp
-						FSMX6Vm2e+Corjd0Y86bkI7lMA0GCSqGSIb3DQEBBQUAA4IBAQDqCMPX1TR6E32T
-						FYmhD1m/HOmugfYXj85rMWQmBzP8PoCVY3YylS8ludV2EQKaIueMRqQa/d4VXRGS
-						5g7hQ9z3/G6MHpPD3a/gESN0+49poZ3W/fIV5lbH2osTTntZbKtZY/XEf712eCfw
-						29shrnSLWosfsTI1kN1HqGS/ZpoeKP/jf2pMCfp1zsng0hcGaC+6FPQhAGz0FAOj
-						URNA4uZ6QUwmUlAFRfw9HG25sZmsWl5Aq8DKa0sjbo3VPD/bAw919+cnuu0Yhtkm
-						DhqQFdFGUhFvH+wuY366L7UhWBLqhLhERqJ4qBe06Qeg7JrAvK7fqPBWNTbDtEkI
-						NNLmpeHL
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shibboleth2sp.jstor.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.jstor.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">JSTOR</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ithaka Harbors, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">JSTOR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://about.jstor.org/about/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Brian</GivenName>
-    <SurName>Larsen</SurName>
-    <EmailAddress>mailto:brian.larsen@ithaka.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Brian</GivenName>
-    <SurName>Larsen</SurName>
-    <EmailAddress>mailto:brian.larsen@ithaka.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-shibboleth.xml
deleted file mode 100644
index 71601bd6..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.mhp.semcs.net-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://shibboleth2sp.mhp.semcs.net/shibboleth">
-  <!--
-		This is a "McGraw-Hill Education" Shibboleth SP for McGraw-Hill Education LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-23T13:54:33Z">
-      <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://shibboleth2sp.mhp.semcs.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://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID0jCCArqgAwIBAgIJAPx54Ehep++5MA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AubWhwLnNlbWNz
-						Lm5ldDAeFw0xMzA4MjkxNTQ1MzNaFw0zMzA4MjQxNTQ1MzNaMGsxCzAJBgNVBAYT
-						AlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQK
-						EwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AubWhwLnNlbWNzLm5l
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLkKacGmaIQb0f44H/J
-						PPzSXgOvQaKBnm2r76HIj9DQCy71fneTf7dWt0XgNi6ycsP+lBPYxry28khmukva
-						G1BJVsnvJcDSR6uu2O57Bv0tr50g6N8GHOAl+MlS1ONLwpGwVXs4X/OAY+8NnWFX
-						bxTElNYuuu7p2zRL46qTwpUKe+9KQ2Np9NM1ZtPMLU/a4p8uKhq/4mJb4/wK+Ek5
-						27WEKp8wdOaBGsZ9KsxlohgDpks0F5hTA99vzmlztBtR7OmEvkbT6S8MSOgNIPxM
-						NacyuEdnkjQnUkBZFJYnGSbZnWvnmF2Vr3NqPnpISOTf1SLW98fuX49FdAC9Rhqu
-						5ycCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc2hpYmJvbGV0aDJzcC5taHAuc2VtY3Mu
-						bmV0hi5odHRwczovL3NoaWJib2xldGgyc3AubWhwLnNlbWNzLm5ldC9zaGliYm9s
-						ZXRoMB0GA1UdDgQWBBQPQt9ON9lAutcLAfmC6Avxe1vevzANBgkqhkiG9w0BAQUF
-						AAOCAQEAgwVbqg3PtW154Dg+JiUgVohCnst3ntJr+LU0gbu9i92Dcpfy1ZSDI82Z
-						GVV2W70h0UfzRWiaejdi8+nOOp7q7Ak6zcm5bGwdkXSB7cTiybZ8OrkRPMS0Lp2M
-						V5II6/xvAsvKWCA1bnLkTdzm+J2WTzvQG+tnxdBF3xkHSQLbuXO8guyRjh28V4uU
-						xzWt1riN1QDY2gtPot2jCKrPXE1/M0Xwj0UkV8OAM9RuttQXCPVyoppkI+/4ULDQ
-						bDPaJ11iT7DRjo2la7koLO/ZuPVilaWNPD2DTKQzkbErUbKmWY7RSp2QgwIKuDT/
-						zLCWlyfdI+tWif3o7y28c1cRve942w==
-					</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>
-						MIID0jCCArqgAwIBAgIJAPx54Ehep++5MA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AubWhwLnNlbWNz
-						Lm5ldDAeFw0xMzA4MjkxNTQ1MzNaFw0zMzA4MjQxNTQ1MzNaMGsxCzAJBgNVBAYT
-						AlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQK
-						EwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AubWhwLnNlbWNzLm5l
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLkKacGmaIQb0f44H/J
-						PPzSXgOvQaKBnm2r76HIj9DQCy71fneTf7dWt0XgNi6ycsP+lBPYxry28khmukva
-						G1BJVsnvJcDSR6uu2O57Bv0tr50g6N8GHOAl+MlS1ONLwpGwVXs4X/OAY+8NnWFX
-						bxTElNYuuu7p2zRL46qTwpUKe+9KQ2Np9NM1ZtPMLU/a4p8uKhq/4mJb4/wK+Ek5
-						27WEKp8wdOaBGsZ9KsxlohgDpks0F5hTA99vzmlztBtR7OmEvkbT6S8MSOgNIPxM
-						NacyuEdnkjQnUkBZFJYnGSbZnWvnmF2Vr3NqPnpISOTf1SLW98fuX49FdAC9Rhqu
-						5ycCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc2hpYmJvbGV0aDJzcC5taHAuc2VtY3Mu
-						bmV0hi5odHRwczovL3NoaWJib2xldGgyc3AubWhwLnNlbWNzLm5ldC9zaGliYm9s
-						ZXRoMB0GA1UdDgQWBBQPQt9ON9lAutcLAfmC6Avxe1vevzANBgkqhkiG9w0BAQUF
-						AAOCAQEAgwVbqg3PtW154Dg+JiUgVohCnst3ntJr+LU0gbu9i92Dcpfy1ZSDI82Z
-						GVV2W70h0UfzRWiaejdi8+nOOp7q7Ak6zcm5bGwdkXSB7cTiybZ8OrkRPMS0Lp2M
-						V5II6/xvAsvKWCA1bnLkTdzm+J2WTzvQG+tnxdBF3xkHSQLbuXO8guyRjh28V4uU
-						xzWt1riN1QDY2gtPot2jCKrPXE1/M0Xwj0UkV8OAM9RuttQXCPVyoppkI+/4ULDQ
-						bDPaJ11iT7DRjo2la7koLO/ZuPVilaWNPD2DTKQzkbErUbKmWY7RSp2QgwIKuDT/
-						zLCWlyfdI+tWif3o7y28c1cRve942w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.mhp.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">McGraw-Hill Education LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">McGraw-Hill Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mheducation.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>McGraw-Hill Tech Support</GivenName>
-    <EmailAddress>mailto:techsupport@mhprofessional.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>McGraw-Hill Tech Support</GivenName>
-    <EmailAddress>mailto:techsupport@mhprofessional.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.now.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.now.semcs.net-shibboleth.xml
deleted file mode 100644
index df0b1f11..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.now.semcs.net-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://shibboleth2sp.now.semcs.net/shibboleth">
-  <!--
-		This is a "Now Publishers" Shibboleth SP for Semantico Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-19T09:18: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">
-    <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://shibboleth2sp.now.semcs.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://shibboleth2sp.now.semcs.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDzjCCAzegAwIBAgIDEAB8MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
-						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
-						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-						dHkwHhcNMTMwMzI2MTYzODM1WhcNMTgwMzI1MTYzODM1WjBrMQswCQYDVQQGEwJV
-						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
-						c2VtYW50aWNvMSQwIgYDVQQDExtzaGliYm9sZXRoMnNwLm5vdy5zZW1jcy5uZXQw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDspSMFisMgrFl7wbAzbd0d
-						7Mm2vqPTBIx9JUrInCeyptcCL6cYsmkZfD6L34Izf4lXxiFYSeZ9/arLvMrfHw6V
-						LHCY1c8Ujlldrf1jWXUlddjV/0jj2bHSpaSkd5Pv2DE+YPbQuWNgEO8LvveJRhsj
-						RjdlVb+kp/suP4rV0fE+mBtI0r+fg89NVt0ljGY/fG93jIXZOo+EoRTLQuZdB2p0
-						qs/LT/cvicGvD9nlYagx02iRpkRzdEaMd/8K3m9LlUdWAoTE8Pp/gRoDvtjC1b3s
-						zNw8bTlb6cnxaNnNkTVhcNVFJU93E+i/tofqdg5SXm1t5XQLBVRn7h+flMhz96dR
-						AgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
-						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFGn2QrAsZmobkkf7vuZiAaeV
-						qBTIMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBvMQsw
-						CQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjES
-						MBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlmaWNh
-						dGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAN99BJdWNmZf2n1X5eDs
-						nh+bjmiearQYMxtcGari4biwsLaxboTxWA3RdKAOSiu8mYM/eG9SoafdW5qTv87n
-						VvzqCHHHXeXOtizBpnolXO1ggqU5oY8lbIEdGeigfwDCyyKwefLkemv34QpzHWes
-						unAmGhPhZk/kNUUgSblqhFu7
-					</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>
-						MIIDzjCCAzegAwIBAgIDEAB8MA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
-						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
-						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-						dHkwHhcNMTMwMzI2MTYzODM1WhcNMTgwMzI1MTYzODM1WjBrMQswCQYDVQQGEwJV
-						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
-						c2VtYW50aWNvMSQwIgYDVQQDExtzaGliYm9sZXRoMnNwLm5vdy5zZW1jcy5uZXQw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDspSMFisMgrFl7wbAzbd0d
-						7Mm2vqPTBIx9JUrInCeyptcCL6cYsmkZfD6L34Izf4lXxiFYSeZ9/arLvMrfHw6V
-						LHCY1c8Ujlldrf1jWXUlddjV/0jj2bHSpaSkd5Pv2DE+YPbQuWNgEO8LvveJRhsj
-						RjdlVb+kp/suP4rV0fE+mBtI0r+fg89NVt0ljGY/fG93jIXZOo+EoRTLQuZdB2p0
-						qs/LT/cvicGvD9nlYagx02iRpkRzdEaMd/8K3m9LlUdWAoTE8Pp/gRoDvtjC1b3s
-						zNw8bTlb6cnxaNnNkTVhcNVFJU93E+i/tofqdg5SXm1t5XQLBVRn7h+flMhz96dR
-						AgMBAAGjgfcwgfQwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBH
-						ZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFGn2QrAsZmobkkf7vuZiAaeV
-						qBTIMIGZBgNVHSMEgZEwgY6AFAIbTpo38I1qaERGxh1E/rqyXr45oXOkcTBvMQsw
-						CQYDVQQGEwJVSzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjES
-						MBAGA1UEChMJc2VtYW50aWNvMSgwJgYDVQQDEx9zZW1hbnRpY28gQ2VydGlmaWNh
-						dGUgQXV0aG9yaXR5ggEAMA0GCSqGSIb3DQEBBAUAA4GBAN99BJdWNmZf2n1X5eDs
-						nh+bjmiearQYMxtcGari4biwsLaxboTxWA3RdKAOSiu8mYM/eG9SoafdW5qTv87n
-						VvzqCHHHXeXOtizBpnolXO1ggqU5oY8lbIEdGeigfwDCyyKwefLkemv34QpzHWes
-						unAmGhPhZk/kNUUgSblqhFu7
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.now.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Semantico Limited: Now Publishers Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nowpublishers.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:info@nowpublishers.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:info@nowpublishers.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.xml
deleted file mode 100644
index 5b6cc7ab..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.pm.semcs.net-shibboleth.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://shibboleth2sp.pm.semcs.net/shibboleth">
-  <!--
-		This is a "Palgrave Macmillan" Shibboleth SP for Semantico Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDzjCCAragAwIBAgIJALftanjyX859MA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xIzAhBgNVBAMTGnNoaWJib2xldGgyc3AucG0uc2VtY3Mu
-						bmV0MB4XDTE1MDMxMDExNTkzN1oXDTM1MDMwNTExNTkzN1owajELMAkGA1UEBhMC
-						VUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoT
-						CXNlbWFudGljbzEjMCEGA1UEAxMac2hpYmJvbGV0aDJzcC5wbS5zZW1jcy5uZXQw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCk4Om/LJxKkUz/YG9c3lg2
-						+jJP0JWGWcDPHdislxOBgQG5NPD/MpzUnyarTFwt7JUzNuwKCnEPaGvrm8RB3K19
-						a6oJNbZr0BG/gHIzO3AyXb0UU60aBVrUz0S5LTNL8mLnZQkMNish0sn1LSX6jfvp
-						T77EpYpI07GzXX6X5BfMnm3N5G3dpkgDO5RbkIiAZ90GyklxkBPTcbCmaczuGaGi
-						Qi5PL94EWG+pILFmEkG0qT7aX5QVVcq9ZmzN+PVeDcyIyX9i5qHyyztHhVaXnB7X
-						QAdlrgQFPU0DdMTqWVJ50y1UNHAA0b+gANLa+W1jPAgjaVGmKQM29xVcVnj+LPcf
-						AgMBAAGjdzB1MFQGA1UdEQRNMEuCGnNoaWJib2xldGgyc3AucG0uc2VtY3MubmV0
-						hi1odHRwczovL3NoaWJib2xldGgyc3AucG0uc2VtY3MubmV0L3NoaWJib2xldGgw
-						HQYDVR0OBBYEFC9PeQ/B3VqMqTLhxaHLrmu0q/uPMA0GCSqGSIb3DQEBBQUAA4IB
-						AQBlLbfCLpFhuhVPIMBOhJivtU6/IPFEJSsBnO+lsYSrl+8zSWzknW04GHvgVAQu
-						98i9g+Ds7+NrMTGBQqAHJe9uGciHbJOSGlYwPfTUlCNdsLbfZfbE40jWm+5MfDKh
-						AzPChYrEZKzGn3FH3ojPLoay8wRDFzf11ulFO426RBxlIlh2ZteuNTSQG6ChGr7k
-						z0eD1NrDQRkUBxxWVmSAB9dju+R6gXzyIeVbOlUZiy3u1NwlYbX4EhMeccZfnXD2
-						wpqstIhDfYaH16h7HTMThBsVP6AlR+ANOzavUQsZTw73l/KeFAJtIFICkqK1jFlq
-						CySVk3++EEgHcu1AN8Mb779L
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.pm.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Semantico Limited: Palgrave Macmillan Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.semantico.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:pm-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:pm-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.rps.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.rps.semcs.net-shibboleth.xml
deleted file mode 100644
index ddccc336..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.rps.semcs.net-shibboleth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth2sp.rps.semcs.net/shibboleth">
-  <!--
-		This is an "RPS" Shibboleth SP for Semantico Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-17T14:32:36Z">
-      <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://shibboleth2sp.rps.semcs.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://shibboleth2sp.rps.semcs.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID0jCCArqgAwIBAgIJAOqGEKcJ4C/CMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AucnBzLnNlbWNz
-						Lm5ldDAeFw0xNTAzMDQxNzE3MDJaFw0zNTAyMjcxNzE3MDJaMGsxCzAJBgNVBAYT
-						AlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQK
-						EwlzZW1hbnRpY28xJDAiBgNVBAMTG3NoaWJib2xldGgyc3AucnBzLnNlbWNzLm5l
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1cNcgEvr4HK96LW7LF
-						9quFUIMecvE/XmbtRuF0AbtJ94w7YBteHZCuTPQrc3/s6WB6+rw7RKsYSaFYdnee
-						3czMU5FrUMMd6qtk+CjPaDfVexQc8EVIuLXzA9bj1jzc6fdekcjAOD5usxrK39r3
-						ankO1tvVqo9hZKFvhZ88AFHe7j0qQQjCWOIU0MNXtjRG+9XBfkJkiWTQ0LtkS7A4
-						HTWY0foAjiegnmJ/HJq8+VBPuZpF985VdGZ2Yr2Q4H9jU/xk0xgTEA7P6maeOgXm
-						zXSG62mgVLxx2y1v1voc6mQik+VoUjcaWiLbZfdSCAQv13PxnNEGv30//jh1UNBX
-						FVMCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc2hpYmJvbGV0aDJzcC5ycHMuc2VtY3Mu
-						bmV0hi5odHRwczovL3NoaWJib2xldGgyc3AucnBzLnNlbWNzLm5ldC9zaGliYm9s
-						ZXRoMB0GA1UdDgQWBBQTOAcQrD6T+YmRMhwddmmpUq2HlzANBgkqhkiG9w0BAQUF
-						AAOCAQEAOsipOcsIU6IOt6amOpp7RKQg5ugS8qjIYZwYPZGgLbjP+RgOPC7TxV1b
-						B0xmTJIsTqVykQzHyc+sOefVajO4u1Dt/QG2I+16wpuQk/qpHgKDHyOdgiNKfs01
-						JY3h9svinhV3I1piKMYKKKBvrpW3LW5cmDa4+Jsv8NZjFdZ/vbgscV0DeF7NT4Hr
-						PoE3pH8mbR1nUZqfCI6nMZZS60eu7c3dBX8TCz2k7Bg77ZOe7D7aQ8j//r91kuwm
-						fy7FRF3c0SYeXHzVnLhlGC9GNmE7UgKcrllxkfnuQSujIElzo1QXYhYS1/xLl34A
-						mDKmI+Hu/XcCdWeZu0zW90bBAEGR4w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.rps.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Semantico Limited: RPS Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rpharms.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@rps.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>RPS Support</GivenName>
-    <EmailAddress>mailto:rps-support@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.xml
deleted file mode 100644
index 98142830..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.sams.oup.com-shibboleth.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://shibboleth2sp.sams.oup.com/shibboleth">
-  <!--
-		This is an "OUP" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDzjCCAragAwIBAgIJAOCOWWVEFpLlMA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xIzAhBgNVBAMTGnNoaWJib2xldGgyc3Auc2Ftcy5vdXAu
-						Y29tMB4XDTE1MDgxNTA3MjQ0N1oXDTM1MDgxMDA3MjQ0N1owajELMAkGA1UEBhMC
-						VUsxDzANBgNVBAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoT
-						CXNlbWFudGljbzEjMCEGA1UEAxMac2hpYmJvbGV0aDJzcC5zYW1zLm91cC5jb20w
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyAXmCH1hrYXWhhfC93BqK
-						KlPtb2UYpFKeY9TldMW/6c3fS6BYoIVD3OPoxgvKblLnsTj9f0SUtXD9A02ylDo5
-						uGTEYRpDR7TCcN0GlCAAOK4+V6KtAJwiOkv/lxitWBzZpyXjQR6PCDQw4o9F3JnX
-						VuDlkioRml43RD4kIXU7AC+ctfpdymRahS4ysVqI4cWvY9rQlMnFcFR230D6OrI+
-						Zz53d7bAETtbsYc232Qwy5ZqnAGl7bDBgmOn1Ke5YslNii6SK/BpEmNhxuNJb4cd
-						8+GrNq3ly1Yw93VxxJeo0iSHlIBOrpCrYCUh22uvO7Qp1NnZEDQWcRcJhaRHpWcZ
-						AgMBAAGjdzB1MFQGA1UdEQRNMEuCGnNoaWJib2xldGgyc3Auc2Ftcy5vdXAuY29t
-						hi1odHRwczovL3NoaWJib2xldGgyc3Auc2Ftcy5vdXAuY29tL3NoaWJib2xldGgw
-						HQYDVR0OBBYEFGr/idVW8CTL+9RTAMGYgh/03SI9MA0GCSqGSIb3DQEBBQUAA4IB
-						AQAHC4k9yO3CSza8yasl95dgjAMrRPjz5HSs6cJDCGbA4LlghoDYf8lF6TaeXBhs
-						n9vFPK44vro8G3XPTx9EvWAuyW2/q9KMNLjzcFEFRWiNueBGyTtNukE+WkGHEX5k
-						e41rZuuveH2wgk0UIOfVjSV8rNjmHbYaksq+8IOn+9bun2HX6hz+sFciRqHH6F1E
-						/i54MxKqnbb3Ou99zqbw4WdxLF79g9wZzUVoUuQgCMZ80SQQGarkbSIB8lio8cEw
-						vBhfOmEMUYk81ZVClGg8E3sxZlKowDo50xkUPnBIqEtBwvQssEcNipQ4bTOtK0qn
-						zZ5OrA5cf9v+vwbMpv+nt4L+
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.sams.oup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">OUP Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:oup-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:oup-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.samstest.oup.com-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.samstest.oup.com-shibboleth.xml
deleted file mode 100644
index 7ceb9f49..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.samstest.oup.com-shibboleth.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://shibboleth2sp.samstest.oup.com/shibboleth">
-  <!--
-		This is an "OUP Test" Shibboleth SP for Semantico Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIID3jCCAsagAwIBAgIJALmUDAYFh5xSMA0GCSqGSIb3DQEBBQUAMG4xCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xJzAlBgNVBAMTHnNoaWJib2xldGgyc3Auc2Ftc3Rlc3Qu
-						b3VwLmNvbTAeFw0xNTA1MTgxMTEzMDhaFw0zNTA1MTMxMTEzMDhaMG4xCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xJzAlBgNVBAMTHnNoaWJib2xldGgyc3Auc2Ftc3Rlc3Qu
-						b3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMPWBTU2S/V7
-						CcB796DAgABz8SD3Ec2YuBW10xxR45vuY7sl3mQ9lL6n6P5ZKoNtue+IantdeN6m
-						EAQnrkPeEZTq8k8736A6dFrT/lTME/4Cy6xUr6Z1NkrgFvDZ+BASk7cYd7DIJA+U
-						AOtwj5d33/Nq47OWevLVw673dLlPOFenjVXiGAT3RmfSpfGwUTE2fxPydd+pspnf
-						7eUqbJzOyhbw23T2OUGPcTiCg4jJ0N7nop5K6H3ScVsdynJV1TkwqFalYiCv/E2q
-						TMCn/uG5SbeEorPMv4s9KlvrqHQ2u0pRho2A3Nlh+zoxUC4ViZ7jULwIfnrNe3u8
-						F0VCg1Vhbn0CAwEAAaN/MH0wXAYDVR0RBFUwU4Iec2hpYmJvbGV0aDJzcC5zYW1z
-						dGVzdC5vdXAuY29thjFodHRwczovL3NoaWJib2xldGgyc3Auc2Ftc3Rlc3Qub3Vw
-						LmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBT6+iOtch2ecP1vxwzN1skB3oyTnDAN
-						BgkqhkiG9w0BAQUFAAOCAQEAhPWQisJmFz2DYbCzC2LodkjnO8HU3IY9TFoUsjel
-						US00ieNe7EaFyPkoJdHiDIPG5cPj8UnUkPIhz2d+2QiIW5t5vnjiNiXnC8BeHEhb
-						b4np0bAfPAQw2iwtLm3zlWJo8B9KZXi13q3dcGfLMw0GtGO87cMO6Qwn28u1M09X
-						G6DfBrC0dfBB7ynLzWODhn2GSn5O77xOENUzEbZxx4zDlA0XDAw1vFBlNWbrflIn
-						LBpvmKRfF8+YKlXaQs3Bbc9asY7l/D+JHfa392OXEwEZg5MsRfhOBrmRw0lJHO+V
-						wp4If5+CQ3qDrxN7e9dH2boYn/dxLkDTeg4bSVeU0YvUQw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.samstest.oup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Semantico Limited: OUP Test Shibboleth 2 SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.semantico.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:oup-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:oup-shibboleth-support@semantico.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth2sp.tf.semcs.net-shibboleth.xml b/swamid-interfederations-2.0/shibboleth2sp.tf.semcs.net-shibboleth.xml
deleted file mode 100644
index 06ff6419..00000000
--- a/swamid-interfederations-2.0/shibboleth2sp.tf.semcs.net-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://shibboleth2sp.tf.semcs.net/shibboleth">
-  <!--
-		This is a "Taylor and Francis" Shibboleth SP for Semantico Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-23T15:07:00Z"/>
-  </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://shibboleth2sp.tf.semcs.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDzTCCAzagAwIBAgIDEAAKMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
-						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
-						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-						dHkwHhcNMTIwMjE2MTI1MjA3WhcNMTcwMjE0MTI1MjA3WjBqMQswCQYDVQQGEwJV
-						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
-						c2VtYW50aWNvMSMwIQYDVQQDExpzaGliYm9sZXRoMnNwLnRmLnNlbWNzLm5ldDCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALlHB2zAGe9ctjQQJMRQ5EGr
-						jbe3RucMOl2TTv2XxD3QRkPltjR/loYX9+Elz+YXVHqUmJmkhK/7K3sbM+8dPtwr
-						kMbWJ7I6peKmOF0fFx5KY0hWAiXC+oPpBBBItpNETnNGQUJPsTh7EeK6Qh8a5oAe
-						7qp2i3PdH2kKb54NTeUjmeXDCq3sVo9KScjbcQx2FHdVXWX6VzO4gLQ+GoPP9ZK1
-						U3hQ7OMW3d3B2WQFQZB9awkqWpWcsWPr+xYY7noxvu5+raYUgy+ks4usWM8va+bU
-						MRLDxCfY0lV/rpxEvrq30gi1GmDNt/XvZXOqS6VL8m1vPhzchscavOZ/CfW2+ykC
-						AwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
-						bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU98wmnF2Ul7kw8GGRolQKie7T
-						eKcwgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJevjmhc6RxMG8xCzAJ
-						BgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIw
-						EAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0
-						ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAOjfVqx8vLDf9nQv1XKXK
-						l+HFoV80S0R0abpO7IEELQENa8GWPIJyVHHVjESHXYDF63/SgnHJXAMl1afR7t8R
-						jpfkkHBvE7wePMvargxjK/IzU8Q627GESWcLk4Z2oGcYo4DDQLJMim3iklcl2PJt
-						v8IZHuUqZxTbUnnNWkrb8Kc=
-					</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>
-						MIIDzTCCAzagAwIBAgIDEAAKMA0GCSqGSIb3DQEBBAUAMG8xCzAJBgNVBAYTAlVL
-						MQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYDVQQKEwlz
-						ZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-						dHkwHhcNMTIwMjE2MTI1MjA3WhcNMTcwMjE0MTI1MjA3WjBqMQswCQYDVQQGEwJV
-						SzEPMA0GA1UECBMGU3Vzc2V4MREwDwYDVQQHEwhCcmlnaHRvbjESMBAGA1UEChMJ
-						c2VtYW50aWNvMSMwIQYDVQQDExpzaGliYm9sZXRoMnNwLnRmLnNlbWNzLm5ldDCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALlHB2zAGe9ctjQQJMRQ5EGr
-						jbe3RucMOl2TTv2XxD3QRkPltjR/loYX9+Elz+YXVHqUmJmkhK/7K3sbM+8dPtwr
-						kMbWJ7I6peKmOF0fFx5KY0hWAiXC+oPpBBBItpNETnNGQUJPsTh7EeK6Qh8a5oAe
-						7qp2i3PdH2kKb54NTeUjmeXDCq3sVo9KScjbcQx2FHdVXWX6VzO4gLQ+GoPP9ZK1
-						U3hQ7OMW3d3B2WQFQZB9awkqWpWcsWPr+xYY7noxvu5+raYUgy+ks4usWM8va+bU
-						MRLDxCfY0lV/rpxEvrq30gi1GmDNt/XvZXOqS6VL8m1vPhzchscavOZ/CfW2+ykC
-						AwEAAaOB9zCB9DAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdl
-						bmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU98wmnF2Ul7kw8GGRolQKie7T
-						eKcwgZkGA1UdIwSBkTCBjoAUAhtOmjfwjWpoREbGHUT+urJevjmhc6RxMG8xCzAJ
-						BgNVBAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIw
-						EAYDVQQKEwlzZW1hbnRpY28xKDAmBgNVBAMTH3NlbWFudGljbyBDZXJ0aWZpY2F0
-						ZSBBdXRob3JpdHmCAQAwDQYJKoZIhvcNAQEEBQADgYEAOjfVqx8vLDf9nQv1XKXK
-						l+HFoV80S0R0abpO7IEELQENa8GWPIJyVHHVjESHXYDF63/SgnHJXAMl1afR7t8R
-						jpfkkHBvE7wePMvargxjK/IzU8Q627GESWcLk4Z2oGcYo4DDQLJMim3iklcl2PJt
-						v8IZHuUqZxTbUnnNWkrb8Kc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth2sp.tf.semcs.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Semantico Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Semantico Limited: Taylor and Francis</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.taylorandfrancisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>TandF Online Support</GivenName>
-    <EmailAddress>mailto:support@tandfonline.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Joanne</GivenName>
-    <SurName>Golding</SurName>
-    <EmailAddress>mailto:eproductsopssupport@informa.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth3.liv.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index fda60b4e..00000000
--- a/swamid-interfederations-2.0/shibboleth3.liv.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://shibboleth3.liv.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP for the University of Liverpool.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T11:14: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">liv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANlUxUdyvt878JJZeQqXZAX2ZiW9MA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxpdi5hYy51azAeFw0xNDAzMjEx
-						NjMxNDlaFw0zNDAzMjExNjMxNDlaMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxp
-						di5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtlHz1hrD0F
-						f0M6F1zN8ZBoY5qI2wYwfjcRuXVfZlSJVhODsOUWWxUnfdqV7KBA0HcgRCK008g2
-						h/sjZXH/VU8M0EHhaYHHkyQxSBwEjWhbVcOT9iI1TkZqHNqZtJQIw7rnybskkv/3
-						6IiBtGZgkZL3CZjp0kkqsOh19k/cioEsNsd4cKUyvhVEUvqtO1VULemasTnkmUtk
-						xJegTZXyW2W6TYMlTxeTwJQWe97WNxpCvV/3ounzXnLTUG5Te4i2ptA67JItknmw
-						kS1p/a6d9B63gvHch27jFzollXccq4Gb2VSNLq3B8eAo8+Hnny9vLYYlKH1H7H9q
-						gAo8OSA2ZbUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aDMubGl2LmFj
-						LnVrhixodHRwczovL3NoaWJib2xldGgzLmxpdi5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQU7Cmjd6WsvyQ90NQeufSKvO/8yVIwDQYJKoZIhvcNAQEFBQAD
-						ggEBAIhTLBoOX4fvW9dYMfvjD77y8lyo2UFdATt6G6KWlCosBDkOwDTGK4N5g7CU
-						/AxoGWBYLtd+KHy5ii5oV781aMLPa3ClDs1UYE/NuwkylvoSO0+agpeH6oF7IJxH
-						N7EsSimVuaLi/R2ghs0KLwv6JfFUkhO2G2S5VTS/FZn/B8NgmBo+fLuJ6DLCQwJJ
-						vnqXf9DPozHSBUOQAEkZcjKRSl+QTO6SleKLg5ahHNC3kT+dzF2ACKJMC7f4WzAL
-						rA/YOcNxfwUB/eiEgmw9dDwpUvOuH+NDET/ASLH3mXUA1w7DkzzHTZkMn9k/Up6O
-						SX7ypoc/4IGOgkCbLMA/5Z8ZidI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3-test.liv.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://shib3-test.liv.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib3-test.liv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib3-test.liv.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">liv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANlUxUdyvt878JJZeQqXZAX2ZiW9MA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxpdi5hYy51azAeFw0xNDAzMjEx
-						NjMxNDlaFw0zNDAzMjExNjMxNDlaMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxp
-						di5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtlHz1hrD0F
-						f0M6F1zN8ZBoY5qI2wYwfjcRuXVfZlSJVhODsOUWWxUnfdqV7KBA0HcgRCK008g2
-						h/sjZXH/VU8M0EHhaYHHkyQxSBwEjWhbVcOT9iI1TkZqHNqZtJQIw7rnybskkv/3
-						6IiBtGZgkZL3CZjp0kkqsOh19k/cioEsNsd4cKUyvhVEUvqtO1VULemasTnkmUtk
-						xJegTZXyW2W6TYMlTxeTwJQWe97WNxpCvV/3ounzXnLTUG5Te4i2ptA67JItknmw
-						kS1p/a6d9B63gvHch27jFzollXccq4Gb2VSNLq3B8eAo8+Hnny9vLYYlKH1H7H9q
-						gAo8OSA2ZbUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aDMubGl2LmFj
-						LnVrhixodHRwczovL3NoaWJib2xldGgzLmxpdi5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQU7Cmjd6WsvyQ90NQeufSKvO/8yVIwDQYJKoZIhvcNAQEFBQAD
-						ggEBAIhTLBoOX4fvW9dYMfvjD77y8lyo2UFdATt6G6KWlCosBDkOwDTGK4N5g7CU
-						/AxoGWBYLtd+KHy5ii5oV781aMLPa3ClDs1UYE/NuwkylvoSO0+agpeH6oF7IJxH
-						N7EsSimVuaLi/R2ghs0KLwv6JfFUkhO2G2S5VTS/FZn/B8NgmBo+fLuJ6DLCQwJJ
-						vnqXf9DPozHSBUOQAEkZcjKRSl+QTO6SleKLg5ahHNC3kT+dzF2ACKJMC7f4WzAL
-						rA/YOcNxfwUB/eiEgmw9dDwpUvOuH+NDET/ASLH3mXUA1w7DkzzHTZkMn9k/Up6O
-						SX7ypoc/4IGOgkCbLMA/5Z8ZidI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib3-test.liv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib3-test.liv.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 Liverpool</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Liverpool - Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.liv.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tim</GivenName>
-    <SurName>Pretlove</SurName>
-    <EmailAddress>mailto:T.Pretlove@liverpool.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Pretlove</SurName>
-    <EmailAddress>mailto:T.Pretlove@liverpool.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboletht.lsbu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboletht.lsbu.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 49fae4c1..00000000
--- a/swamid-interfederations-2.0/shibboletht.lsbu.ac.uk-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" entityID="https://shibboletht.lsbu.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth Test IdP for London South Bank University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-12T17:50:10Z">
-      <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">lsbu.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">London South Bank University (Test)</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://www.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://www.lsbu.ac.uk/clsdresources/libimages/ShibbolethLSBULogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIVANaRWeyV4EZWBxiDDbeqrCEOlAx/MA0GCSqGSIb3DQEB
-						BQUAMCExHzAdBgNVBAMTFnNoaWJib2xldGh0LmxzYnUuYWMudWswHhcNMTMwMzEy
-						MDkyMDQwWhcNMzMwMzEyMDkyMDQwWjAhMR8wHQYDVQQDExZzaGliYm9sZXRodC5s
-						c2J1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt3WPIRAX
-						SJiOngXAXVwOhNgUECGAqkuPpP1Z4hot13WcBWcFfPEHVEuT0a+J7mDNmunMcmuy
-						VWaONGK3/1xsQIUOUeFwQGbjc3XB/EAmvu6HtPXHPcJ6lKfNM4qclTp5+S4XeZHl
-						ZwVvC+dN/h/zy5w+ACq4OpTMU/QXScW+S/cGaM7vIdb1K2EHSBQ/VxZaqYZ7XvCW
-						A2kwNXj2NCszMCooKY9SGZOz6GIygBgT7H1tLgCzpQhdsC/4CQAeXXflAuX03FDD
-						2Lpcv+xIxMsUFFX0CdWYFhKPBftUllLFaWg9vdI/sG7GdIor4I5BV5R+YcCltJGV
-						OiMC1TRF0i2FXQIDAQABo3MwcTBQBgNVHREESTBHghZzaGliYm9sZXRodC5sc2J1
-						LmFjLnVrhi1odHRwczovL3NoaWJib2xldGh0LmxzYnUuYWMudWsvaWRwL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFNxLjXNMtSLAaE8RKxedlIosAclRMA0GCSqGSIb3DQEB
-						BQUAA4IBAQBgWpZTk1YRTk3D4L5OR2MfPGoj3OGUFuZtD3P5rPuysHIGpQyEx0wk
-						EStgqbOJZO3y3F66F/XidGOJelvsvzoVSIesi2MHa9bJZCwm5vhNiJ1oyRp1jkL9
-						kEHXYD2pY2NAb8lwV4mVuZrFj6BAibWGG1r+d1mZzf7v/HnT1tFS3dM0N8ijf4lO
-						MdmPrJL11otwyxOjhso4vrK69UvDP+y1PYqiAkqEHOuBh5Ei1bcIu95yA+6B//dg
-						Rk/wXB36TDkXc/SzFG0A8TfwgU0UbGmCmEdywRiSR/YrgOJQjTtet52TtbO6winR
-						HMkLjW4kYt87oasn5kJ1P/G3WWy4BZvd
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboletht.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboletht.lsbu.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://shibboletht.lsbu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboletht.lsbu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboletht.lsbu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboletht.lsbu.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">lsbu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIVANaRWeyV4EZWBxiDDbeqrCEOlAx/MA0GCSqGSIb3DQEB
-						BQUAMCExHzAdBgNVBAMTFnNoaWJib2xldGh0LmxzYnUuYWMudWswHhcNMTMwMzEy
-						MDkyMDQwWhcNMzMwMzEyMDkyMDQwWjAhMR8wHQYDVQQDExZzaGliYm9sZXRodC5s
-						c2J1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt3WPIRAX
-						SJiOngXAXVwOhNgUECGAqkuPpP1Z4hot13WcBWcFfPEHVEuT0a+J7mDNmunMcmuy
-						VWaONGK3/1xsQIUOUeFwQGbjc3XB/EAmvu6HtPXHPcJ6lKfNM4qclTp5+S4XeZHl
-						ZwVvC+dN/h/zy5w+ACq4OpTMU/QXScW+S/cGaM7vIdb1K2EHSBQ/VxZaqYZ7XvCW
-						A2kwNXj2NCszMCooKY9SGZOz6GIygBgT7H1tLgCzpQhdsC/4CQAeXXflAuX03FDD
-						2Lpcv+xIxMsUFFX0CdWYFhKPBftUllLFaWg9vdI/sG7GdIor4I5BV5R+YcCltJGV
-						OiMC1TRF0i2FXQIDAQABo3MwcTBQBgNVHREESTBHghZzaGliYm9sZXRodC5sc2J1
-						LmFjLnVrhi1odHRwczovL3NoaWJib2xldGh0LmxzYnUuYWMudWsvaWRwL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFNxLjXNMtSLAaE8RKxedlIosAclRMA0GCSqGSIb3DQEB
-						BQUAA4IBAQBgWpZTk1YRTk3D4L5OR2MfPGoj3OGUFuZtD3P5rPuysHIGpQyEx0wk
-						EStgqbOJZO3y3F66F/XidGOJelvsvzoVSIesi2MHa9bJZCwm5vhNiJ1oyRp1jkL9
-						kEHXYD2pY2NAb8lwV4mVuZrFj6BAibWGG1r+d1mZzf7v/HnT1tFS3dM0N8ijf4lO
-						MdmPrJL11otwyxOjhso4vrK69UvDP+y1PYqiAkqEHOuBh5Ei1bcIu95yA+6B//dg
-						Rk/wXB36TDkXc/SzFG0A8TfwgU0UbGmCmEdywRiSR/YrgOJQjTtet52TtbO6winR
-						HMkLjW4kYt87oasn5kJ1P/G3WWy4BZvd
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboletht.lsbu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboletht.lsbu.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">London South Bank University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London South Bank University (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lsbu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Subscriptions and Licensing Team</GivenName>
-    <EmailAddress>mailto:llrejnls@lsbu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Swigg</SurName>
-    <EmailAddress>mailto:swiggtc@lsbu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbox.charanga.com-shibboleth.xml b/swamid-interfederations-2.0/shibbox.charanga.com-shibboleth.xml
deleted file mode 100644
index f8c2676b..00000000
--- a/swamid-interfederations-2.0/shibbox.charanga.com-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://shibbox.charanga.com/shibboleth">
-  <!--
-		This is an "eLearning" Shibboleth SP for Charanga Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIELjCCAxagAwIBAgIJAL9/L58hDw4wMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLRWFzdCBTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9u
-						MRkwFwYDVQQKExBDaGFyYW5nYSBMaW1pdGVkMR0wGwYDVQQDExRzaGliYm94LmNo
-						YXJhbmdhLmNvbTElMCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQGNoYXJhbmdhLmNv
-						bTAeFw0xMDA2MjkxNTIyMDNaFw0yMDA2MjYxNTIyMDNaMIGXMQswCQYDVQQGEwJH
-						QjEUMBIGA1UECBMLRWFzdCBTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRkwFwYD
-						VQQKExBDaGFyYW5nYSBMaW1pdGVkMR0wGwYDVQQDExRzaGliYm94LmNoYXJhbmdh
-						LmNvbTElMCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQGNoYXJhbmdhLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANYoGZS/WguHq6pRim/vSIB5qhOu
-						n6ijPVVZBurlhU7gFfVBPMY5rYdfa0H3h4QGXA9jMYdQKcpH+g7kMrmClQ8azLH/
-						d67snvtCHZ81AzIVJjGfOoHucyEVkPas6jgG5RWfpxOzQtYfm0lYc+CuTrkIojwC
-						9wpFRzWL4OEVqy5FiQygjFJBI5CpDG2EmEY+XKjp+AfAxvvZ5Vyk07Rm9gQmrk99
-						m0qG6g5JJa68p/v8VmTannqtyERmmb4PMfRjilXgWYkZegBn0pj2ltFZVKp/F0sr
-						5oVxHQE/rhxWtSz43C6yEGaZ8jIoTReQzn+ouCI4WEjJlIBvEPVnpofu34cCAwEA
-						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
-						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMruJSo1sytozEbczKQEttLtBtmmMB8G
-						A1UdIwQYMBaAFMruJSo1sytozEbczKQEttLtBtmmMA0GCSqGSIb3DQEBBQUAA4IB
-						AQBdR/7rtP4OTHjxidRF98wl6Rd/fXvEs/YdjCQlxFXNQhbT/r9TiX9Y0FCNlJYr
-						uza26IEc8Dm4oA//8eWV96mD7KErkUBvzojhkovHcOjdsFG8ceuJnpEvHkM2rDqC
-						pKD5W56d97cUdLuyAtPVjl5ho4aF0achwbrBuGXg/VpzCBzHP02WmEuxBBkhIFLV
-						XZ2jOgpiCSrVlDNm2X6Chg9g/tfgK30lN0GImnnzzSHuRlFTxgwKuDV4JeuqTsvf
-						0ImlveH8IqR28SFnSUED+nylj0Ap/8RB58BHLlZN5R6bUTKRFRdNeESGNH5i+NRc
-						lvxdpwxr83npRdyMleyUtAKF
-					</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>
-						MIIELjCCAxagAwIBAgIJAL9/L58hDw4wMA0GCSqGSIb3DQEBBQUAMIGXMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLRWFzdCBTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9u
-						MRkwFwYDVQQKExBDaGFyYW5nYSBMaW1pdGVkMR0wGwYDVQQDExRzaGliYm94LmNo
-						YXJhbmdhLmNvbTElMCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQGNoYXJhbmdhLmNv
-						bTAeFw0xMDA2MjkxNTIyMDNaFw0yMDA2MjYxNTIyMDNaMIGXMQswCQYDVQQGEwJH
-						QjEUMBIGA1UECBMLRWFzdCBTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRkwFwYD
-						VQQKExBDaGFyYW5nYSBMaW1pdGVkMR0wGwYDVQQDExRzaGliYm94LmNoYXJhbmdh
-						LmNvbTElMCMGCSqGSIb3DQEJARYWd2VibWFzdGVyQGNoYXJhbmdhLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANYoGZS/WguHq6pRim/vSIB5qhOu
-						n6ijPVVZBurlhU7gFfVBPMY5rYdfa0H3h4QGXA9jMYdQKcpH+g7kMrmClQ8azLH/
-						d67snvtCHZ81AzIVJjGfOoHucyEVkPas6jgG5RWfpxOzQtYfm0lYc+CuTrkIojwC
-						9wpFRzWL4OEVqy5FiQygjFJBI5CpDG2EmEY+XKjp+AfAxvvZ5Vyk07Rm9gQmrk99
-						m0qG6g5JJa68p/v8VmTannqtyERmmb4PMfRjilXgWYkZegBn0pj2ltFZVKp/F0sr
-						5oVxHQE/rhxWtSz43C6yEGaZ8jIoTReQzn+ouCI4WEjJlIBvEPVnpofu34cCAwEA
-						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
-						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFMruJSo1sytozEbczKQEttLtBtmmMB8G
-						A1UdIwQYMBaAFMruJSo1sytozEbczKQEttLtBtmmMA0GCSqGSIb3DQEBBQUAA4IB
-						AQBdR/7rtP4OTHjxidRF98wl6Rd/fXvEs/YdjCQlxFXNQhbT/r9TiX9Y0FCNlJYr
-						uza26IEc8Dm4oA//8eWV96mD7KErkUBvzojhkovHcOjdsFG8ceuJnpEvHkM2rDqC
-						pKD5W56d97cUdLuyAtPVjl5ho4aF0achwbrBuGXg/VpzCBzHP02WmEuxBBkhIFLV
-						XZ2jOgpiCSrVlDNm2X6Chg9g/tfgK30lN0GImnnzzSHuRlFTxgwKuDV4JeuqTsvf
-						0ImlveH8IqR28SFnSUED+nylj0Ap/8RB58BHLlZN5R6bUTKRFRdNeESGNH5i+NRc
-						lvxdpwxr83npRdyMleyUtAKF                        
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbox.charanga.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbox.charanga.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.charanga.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.charanga.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbox.charanga.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbox.charanga.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.charanga.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.charanga.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibbox.charanga.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Charanga Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Charanga eLearning</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.charanga.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Help Desk</GivenName>
-    <EmailAddress>mailto:helpdesk@charanga.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jay</GivenName>
-    <SurName>Caines-Gooby</SurName>
-    <EmailAddress>mailto:jaygooby@charanga.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbox.lpplus.net-shibboleth.xml b/swamid-interfederations-2.0/shibbox.lpplus.net-shibboleth.xml
deleted file mode 100644
index 8f4783b5..00000000
--- a/swamid-interfederations-2.0/shibbox.lpplus.net-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://shibbox.lpplus.net/shibboleth">
-  <!--
-		This is a Shibboleth SP for LP+ 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="2012-06-13T11:11:20Z">
-      <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://shibbox.lpplus.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://shibbox.lpplus.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAKnfC0bVM4B8MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWxwZTFiMTEtZHBtLTAxLmxwcGx1cy5uZXQwHhcNMTUwNjExMTE0NjI3WhcN
-						MjUwNjA4MTE0NjI3WjAkMSIwIAYDVQQDExlscGUxYjExLWRwbS0wMS5scHBsdXMu
-						bmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0t2ADfnkC5lKAdtO
-						uGrMgyt9x/j95jLgtMs6bYBjVaYKohOErBqL8kAFcjxY5VWkLy/P8untgOyrnJtU
-						I1EF6Qgt1Bo7+DY18htb01Ceu9F3S7bzNFaT2H8GXsTG1QopqZ1wkYgLpzw19DQY
-						j1p8xp5RbXTtF6TiMWVeMY+hWG3ZO/kmAwo+yTvgGEkMRwvress/xxiA3GqhQ+jV
-						vGylCpInNAr7dfjLTZrZriICAChHGs7/QaNsiLHn6Bzql0vFeqpujJ4K8AqJUyr7
-						EEdpCiRiufzrtVKA9s0mB9W/adauX5TxQXE1gfjLkt5aeV16TW627DC1kXEZfGqa
-						ZrnZNQIDAQABo0cwRTAkBgNVHREEHTAbghlscGUxYjExLWRwbS0wMS5scHBsdXMu
-						bmV0MB0GA1UdDgQWBBRAwEiU9cL90DldsrLKolQybKjBzTANBgkqhkiG9w0BAQUF
-						AAOCAQEAzEzxKuMTgVWsY0u7ATfTfq+pP/CvHsdqXIr5g84amDBZY8YzQuPgIeV2
-						fZrh688P1jqHP9JwHe3Ud6FN3e5NjArwZcKsWjzE2su0K/OsecJs5SdCfpos+VhY
-						Dz6KqWF7IBx3PV/86rdIWau/JG3t+jeJONQE/LjU9oQ/RILzDg1nqc+VRrpLWWKt
-						deaPMCAoStjlcjQqetfL/S6znYL10i8+zw3p7jACUO0HFvvdbnu/ZRlUUCjNZrHx
-						uLJGy1P1ZbNhvLrcFsfa9DWPvDNmg2BxLs0GTv84b2Tqfc09muz7IEQbeRv5IVzJ
-						+mCa8NQYKoO0Gn2O/HMlYdnqjqw/Hw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shibbox.lpplus.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbox.lpplus.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbox.lpplus.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.lpplus.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.lpplus.net/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibbox.lpplus.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">LP+ Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">LP+ Limited: Shibboleth single signon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lpplus.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sandip</GivenName>
-    <SurName>Mehta</SurName>
-    <EmailAddress>mailto:Sandip.mehta@lpplus.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sandip</GivenName>
-    <SurName>Mehta</SurName>
-    <EmailAddress>mailto:Sandip.mehta@lpplus.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbserver.preston.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibbserver.preston.ac.uk-shibboleth.xml
deleted file mode 100644
index 77b2b960..00000000
--- a/swamid-interfederations-2.0/shibbserver.preston.ac.uk-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://shibbserver.preston.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Preston College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">preston.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQDkmtqgfo843jANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
-						QjETMBEGA1UECBMKTGFuY2FzaGlyZTEQMA4GA1UEBxMHUHJlc3RvbjEYMBYGA1UE
-						ChMPUHJlc3RvbiBDb2xsZWdlMSIwIAYDVQQDExlzaGliYnNlcnZlci5wcmVzdG9u
-						LmFjLnVrMB4XDTEzMDYyMTExNTYxNVoXDTMzMDYxNjExNTYxNVowcjELMAkGA1UE
-						BhMCR0IxEzARBgNVBAgTCkxhbmNhc2hpcmUxEDAOBgNVBAcTB1ByZXN0b24xGDAW
-						BgNVBAoTD1ByZXN0b24gQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJzZXJ2ZXIucHJl
-						c3Rvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKirj7Jb
-						E0a0tk0wGm4kACMfzDGVLCpovdU4TKE0a40zGy77oJugnCwdYPkeGFRTXL6mp64A
-						6jSJKG2PwAKsqgZ8kBlYSmsPAEqWpKGukqEVmNubJuZjlSGQW6/03/ILRP1v2FBR
-						YPa5QVL+iZDQnOabgD0xHA+5TOeyF+ncACMR6CVbf67b04nTUfMSMdPfALJmKB9t
-						LaKqb5IkNVc0UyN66BnH+KZfXyex5c8qtPTc9d6dRkpPT2OawbvhZv94U9kYzzwI
-						0UeARnr6h4dcmUjmP2KsXXpdEzyNb6H5cBYavz9+Ah2c2fQowMRe1BAaxFsYqpq7
-						c9CUEf0f37JXRnsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAjcuAywnWMGSntE85
-						+1TM+UZ9C30HujCptlqpPq9TatZLNn5Epbn9c9OFeap5yfz1T0cMF+Uj6l/+Hgbg
-						jpWIrGeD+Q3IaZ2Ogk1UbezOsHvz6TLdLnZ+TdxlVaRs500HboPa4vRb5f8tYy3p
-						HwUtkElhKcKebgtaSh48WyztxtXq3rS6FiDGrri8JKXCudW9OIsbRdOjqliPKAxf
-						RNVnEXmfbv4cN/YlvFrKtrMPOPc8PDI8GPtHap8DHTyVLrw+0PGX8P4tJ+m8GUMC
-						LwVxuog72RAqDyvj84SV+ihyvitlwBEs3Q9/qecTCl9zvdYuhUrdqQ/CiWut7Vhu
-						jPVaDg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbserver.preston.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbserver.preston.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://shibbserver.preston.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbserver.preston.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbserver.preston.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbserver.preston.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">preston.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYDCCAkgCCQDkmtqgfo843jANBgkqhkiG9w0BAQUFADByMQswCQYDVQQGEwJH
-						QjETMBEGA1UECBMKTGFuY2FzaGlyZTEQMA4GA1UEBxMHUHJlc3RvbjEYMBYGA1UE
-						ChMPUHJlc3RvbiBDb2xsZWdlMSIwIAYDVQQDExlzaGliYnNlcnZlci5wcmVzdG9u
-						LmFjLnVrMB4XDTEzMDYyMTExNTYxNVoXDTMzMDYxNjExNTYxNVowcjELMAkGA1UE
-						BhMCR0IxEzARBgNVBAgTCkxhbmNhc2hpcmUxEDAOBgNVBAcTB1ByZXN0b24xGDAW
-						BgNVBAoTD1ByZXN0b24gQ29sbGVnZTEiMCAGA1UEAxMZc2hpYmJzZXJ2ZXIucHJl
-						c3Rvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKirj7Jb
-						E0a0tk0wGm4kACMfzDGVLCpovdU4TKE0a40zGy77oJugnCwdYPkeGFRTXL6mp64A
-						6jSJKG2PwAKsqgZ8kBlYSmsPAEqWpKGukqEVmNubJuZjlSGQW6/03/ILRP1v2FBR
-						YPa5QVL+iZDQnOabgD0xHA+5TOeyF+ncACMR6CVbf67b04nTUfMSMdPfALJmKB9t
-						LaKqb5IkNVc0UyN66BnH+KZfXyex5c8qtPTc9d6dRkpPT2OawbvhZv94U9kYzzwI
-						0UeARnr6h4dcmUjmP2KsXXpdEzyNb6H5cBYavz9+Ah2c2fQowMRe1BAaxFsYqpq7
-						c9CUEf0f37JXRnsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAjcuAywnWMGSntE85
-						+1TM+UZ9C30HujCptlqpPq9TatZLNn5Epbn9c9OFeap5yfz1T0cMF+Uj6l/+Hgbg
-						jpWIrGeD+Q3IaZ2Ogk1UbezOsHvz6TLdLnZ+TdxlVaRs500HboPa4vRb5f8tYy3p
-						HwUtkElhKcKebgtaSh48WyztxtXq3rS6FiDGrri8JKXCudW9OIsbRdOjqliPKAxf
-						RNVnEXmfbv4cN/YlvFrKtrMPOPc8PDI8GPtHap8DHTyVLrw+0PGX8P4tJ+m8GUMC
-						LwVxuog72RAqDyvj84SV+ihyvitlwBEs3Q9/qecTCl9zvdYuhUrdqQ/CiWut7Vhu
-						jPVaDg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbserver.preston.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbserver.preston.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">Preston College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Preston College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.preston.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Greenwood</SurName>
-    <EmailAddress>mailto:JGreenwood@preston.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Greenwood</SurName>
-    <EmailAddress>mailto:JGreenwood@preston.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbsrv1.gsa.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibbsrv1.gsa.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index c450041e..00000000
--- a/swamid-interfederations-2.0/shibbsrv1.gsa.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://shibbsrv1.gsa.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the Glasgow School of Art
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">gsa.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWjCCAkICCQCivWPQEvRbljANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHR2xhc2dvdzEXMBUGA1UEBxMOUmVuZnJldyBTdHJlZXQxFzAV
-						BgNVBAoTDlJlbmZyZXcgU3RyZWV0MRwwGgYDVQQDExNzaGliYnNydjEuZ3NhLmFj
-						LnVrMB4XDTEzMDQxMDE0Mjc1MloXDTMzMDQwNTE0Mjc1MlowbzELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0dsYXNnb3cxFzAVBgNVBAcTDlJlbmZyZXcgU3RyZWV0MRcw
-						FQYDVQQKEw5SZW5mcmV3IFN0cmVldDEcMBoGA1UEAxMTc2hpYmJzcnYxLmdzYS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyvtXXL1ZjqGV45
-						QRqdOrqXaX+trM2srXsh74k8UfivA5QxDAho548YVlcdmnm/d1kSTYSIHzD1IZu0
-						1HD2X3RehRORQTiejQQl+KfZa3HNwVc96PqkQ3UDmsTLwkzCnKToto3SVqEmflGG
-						ibj1SUA8kr/4kYmO/EZEIyhDq0dWYlx4iMQGHoUUHUp1FBDFRfOffBjUVyoDGzbM
-						cZesKVyJLIMuwZdWYm8diYnQggNHw17N0t/FsgKbUnPA1Wj2w5bE2sObR/eGCRv1
-						/QgiPvuW0qawibwgfdNYr+u6x8ZB9D1CA5xwSAmLhxDxAG8Vn34e/j51doS1ET5U
-						rR071ccCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAzBfS3T2zWUe+nCXopLOASUxv
-						Jzx4WHXsLbuR5I9dA/l1GXdQkgswDwMvSBh+eP6bLe2qncKOys/2QLx2R1g/ata2
-						dxACjh5t68Aca5xKfxD4Axnyzu2j0aW3CojrR0SlzIAiXEWzQAOwUM9FtEYfrcDc
-						SauS3ziuUbHzzLufHrnuKOvzyTv/6acMNnlL4JZQPTUtMluzdNxApbsndvYuOty+
-						yhnJqONwsMlgVqghAmHILD54ZgEsBUX+drhMVu7+Vk0tocvfr5SDmp5yfB2zl2RV
-						ZAsbj5IQmyAuMRF3AnM7837HCnvjO/89bCjODt286HBAvPgyRFbHiUpruf3F+A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbsrv1.gsa.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbsrv1.gsa.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://shibbsrv1.gsa.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbsrv1.gsa.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbsrv1.gsa.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbsrv1.gsa.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">gsa.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWjCCAkICCQCivWPQEvRbljANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHR2xhc2dvdzEXMBUGA1UEBxMOUmVuZnJldyBTdHJlZXQxFzAV
-						BgNVBAoTDlJlbmZyZXcgU3RyZWV0MRwwGgYDVQQDExNzaGliYnNydjEuZ3NhLmFj
-						LnVrMB4XDTEzMDQxMDE0Mjc1MloXDTMzMDQwNTE0Mjc1MlowbzELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0dsYXNnb3cxFzAVBgNVBAcTDlJlbmZyZXcgU3RyZWV0MRcw
-						FQYDVQQKEw5SZW5mcmV3IFN0cmVldDEcMBoGA1UEAxMTc2hpYmJzcnYxLmdzYS5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyvtXXL1ZjqGV45
-						QRqdOrqXaX+trM2srXsh74k8UfivA5QxDAho548YVlcdmnm/d1kSTYSIHzD1IZu0
-						1HD2X3RehRORQTiejQQl+KfZa3HNwVc96PqkQ3UDmsTLwkzCnKToto3SVqEmflGG
-						ibj1SUA8kr/4kYmO/EZEIyhDq0dWYlx4iMQGHoUUHUp1FBDFRfOffBjUVyoDGzbM
-						cZesKVyJLIMuwZdWYm8diYnQggNHw17N0t/FsgKbUnPA1Wj2w5bE2sObR/eGCRv1
-						/QgiPvuW0qawibwgfdNYr+u6x8ZB9D1CA5xwSAmLhxDxAG8Vn34e/j51doS1ET5U
-						rR071ccCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAzBfS3T2zWUe+nCXopLOASUxv
-						Jzx4WHXsLbuR5I9dA/l1GXdQkgswDwMvSBh+eP6bLe2qncKOys/2QLx2R1g/ata2
-						dxACjh5t68Aca5xKfxD4Axnyzu2j0aW3CojrR0SlzIAiXEWzQAOwUM9FtEYfrcDc
-						SauS3ziuUbHzzLufHrnuKOvzyTv/6acMNnlL4JZQPTUtMluzdNxApbsndvYuOty+
-						yhnJqONwsMlgVqghAmHILD54ZgEsBUX+drhMVu7+Vk0tocvfr5SDmp5yfB2zl2RV
-						ZAsbj5IQmyAuMRF3AnM7837HCnvjO/89bCjODt286HBAvPgyRFbHiUpruf3F+A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbsrv1.gsa.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbsrv1.gsa.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">Glasgow School of Art</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Glasgow School of Art (MyGSA)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gsa.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sid</GivenName>
-    <SurName>Meldrum</SurName>
-    <EmailAddress>mailto:s.meldrum@gsa.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sid</GivenName>
-    <SurName>Meldrum</SurName>
-    <EmailAddress>mailto:s.meldrum@gsa.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibby.wmc.ac.uk-shibboleth-idp.xml b/swamid-interfederations-2.0/shibby.wmc.ac.uk-shibboleth-idp.xml
deleted file mode 100644
index 311d06b5..00000000
--- a/swamid-interfederations-2.0/shibby.wmc.ac.uk-shibboleth-idp.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://shibby.wmc.ac.uk/shibboleth-idp">
-  <!--
-		This is a Shibboleth IdP for Wirral Metropolitan College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-16T13:29:41Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">wmc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAJm8LRnbbTtCyAebesXC3JGiCv8lMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEHNoaWJieS53bWMuYWMudWswHhcNMTIxMTAyMTYxNDQx
-						WhcNMzIxMTAyMTYxNDQxWjAbMRkwFwYDVQQDExBzaGliYnkud21jLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmB+fHJr1LUyR9Z4JroVqJhPy
-						OkmecEdAqw1uuIFVlyZ+XH4yxYE8fcOww4aKm0vEs6QRvrMHwr4w0ndRb2W/iWHK
-						BGBfsafixfxI/aS40pc3OTzoXpo11535MsOzg4yTzulhKwi5MgYqX+Zb9Q/XaLFd
-						mAkZC45yIjpPQvzjgHLHNW27dlfQiCdy9lzsL68FrYVHuZTV3AVAEyczC33HoRUA
-						ReCN5EJFpvbYL1NfsqaAQF7C9Yyga0WCTSjKugWEi3gjOePo6MFztyHYU8LvDeYx
-						6vBtcnI1VjIycVHgI1g/t6MPm7buiaEJPl9230fcHZIG15/M8UqLxzM2Phru7wID
-						AQABo2cwZTBEBgNVHREEPTA7ghBzaGliYnkud21jLmFjLnVrhidodHRwczovL3No
-						aWJieS53bWMuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMcgJtREB6nk
-						HiCQfshoRqRshvq6MA0GCSqGSIb3DQEBBQUAA4IBAQAp8LRX6cOK/u0y/bA8HCt7
-						3PyZAwXyAGN905x9Yd7PCdnRxiI+WMKmuD01M71FM6apJFsHHkHv8IgvTZb10yXm
-						bIbgE1718NiZTL33E08l+QAPUp/5AsEv4HFOmVgyOO5149w2pdwft/z23acf2fVV
-						ddz5OPjsJSdkZP//qO0C6lKsE+rlRXdBkuUVKopVPGLWV5xzk2yCzeIj6V/nzDbf
-						frMvrz8BJyqOnVn3ZPPCnURELyep6IyLChkzQv34g7hdewKWzF/fvrz1XAD2e3RO
-						Lf2uU4A+RncCtsGT3wOKNjecHAfQ5rZy+MGd3LT9iRDeWeHwF0+dYV2vSb43n90e
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibby.wmc.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibby.wmc.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://shibby.wmc.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibby.wmc.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibby.wmc.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibby.wmc.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">wmc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAJm8LRnbbTtCyAebesXC3JGiCv8lMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEHNoaWJieS53bWMuYWMudWswHhcNMTIxMTAyMTYxNDQx
-						WhcNMzIxMTAyMTYxNDQxWjAbMRkwFwYDVQQDExBzaGliYnkud21jLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmB+fHJr1LUyR9Z4JroVqJhPy
-						OkmecEdAqw1uuIFVlyZ+XH4yxYE8fcOww4aKm0vEs6QRvrMHwr4w0ndRb2W/iWHK
-						BGBfsafixfxI/aS40pc3OTzoXpo11535MsOzg4yTzulhKwi5MgYqX+Zb9Q/XaLFd
-						mAkZC45yIjpPQvzjgHLHNW27dlfQiCdy9lzsL68FrYVHuZTV3AVAEyczC33HoRUA
-						ReCN5EJFpvbYL1NfsqaAQF7C9Yyga0WCTSjKugWEi3gjOePo6MFztyHYU8LvDeYx
-						6vBtcnI1VjIycVHgI1g/t6MPm7buiaEJPl9230fcHZIG15/M8UqLxzM2Phru7wID
-						AQABo2cwZTBEBgNVHREEPTA7ghBzaGliYnkud21jLmFjLnVrhidodHRwczovL3No
-						aWJieS53bWMuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMcgJtREB6nk
-						HiCQfshoRqRshvq6MA0GCSqGSIb3DQEBBQUAA4IBAQAp8LRX6cOK/u0y/bA8HCt7
-						3PyZAwXyAGN905x9Yd7PCdnRxiI+WMKmuD01M71FM6apJFsHHkHv8IgvTZb10yXm
-						bIbgE1718NiZTL33E08l+QAPUp/5AsEv4HFOmVgyOO5149w2pdwft/z23acf2fVV
-						ddz5OPjsJSdkZP//qO0C6lKsE+rlRXdBkuUVKopVPGLWV5xzk2yCzeIj6V/nzDbf
-						frMvrz8BJyqOnVn3ZPPCnURELyep6IyLChkzQv34g7hdewKWzF/fvrz1XAD2e3RO
-						Lf2uU4A+RncCtsGT3wOKNjecHAfQ5rZy+MGd3LT9iRDeWeHwF0+dYV2vSb43n90e
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibby.wmc.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibby.wmc.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">Wirral Metropolitan College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Wirral Metropolitan College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://wmc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Fogarty</SurName>
-    <EmailAddress>mailto:ian.fogarty@wmc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Fogarty</SurName>
-    <EmailAddress>mailto:ian.fogarty@wmc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml b/swamid-interfederations-2.0/shibdev.ltscotland.com-shibboleth.xml
deleted file mode 100644
index d0deb35a..00000000
--- a/swamid-interfederations-2.0/shibdev.ltscotland.com-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://shibdev.ltscotland.com/shibboleth">
-  <!--
-		This is a Shibboleth Development SP for Education Scotland.
-	-->
-  <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="2012-04-25T08:40:02Z"/>
-  </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://shibdev.educationscotland.gov.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://shibdev.educationscotland.gov.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://shibdev.educationscotland.gov.uk/Shibboleth.sso/GlowApproval"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/GlowDS"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJALr0olzkd9TzMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWx0c2UtZGV2MDEubHRzY290bGFuZC5jb20wHhcNMTAwMzAzMTIyMjEyWhcN
-						MjAwMjI5MTIyMjEyWjAkMSIwIAYDVQQDExlsdHNlLWRldjAxLmx0c2NvdGxhbmQu
-						Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3MIiCvfKQ/w1RYJg
-						bp1tfVWaaCH66IQO0yE2PG0Eotdg+GR/LVfQlY9QXJj7Kvj1UqsncmIia9hK9Td/
-						onmydjcfxsheeLPDkS9H8EUTJSn1yNfq/4bMJ03Wn+/gT/UWVtyhRBvCMwA/gdUJ
-						nyQTdKBOLOYCzSr1Q3X8NlBmezmsw1mAu1wa+nyWciUP4d7pH+5h4oHCXHzAyw2I
-						5HHCTzN8bR2Q5y6W0yCXfcM/ChbO1ii3uHwnLruN1LKBqvmirLk7UlkCITpaYLmC
-						a2eS2ZkA3bMEbixGL5osjpUah5GB9tB/IK5EKkXxSrlyE+TvBIoXx5HKWEyLb6PO
-						HhY76wIDAQABo0cwRTAkBgNVHREEHTAbghlsdHNlLWRldjAxLmx0c2NvdGxhbmQu
-						Y29tMB0GA1UdDgQWBBQQVXRf9vWh6lfW092XrIDlT6WLejANBgkqhkiG9w0BAQUF
-						AAOCAQEAyrRlJ79mn0tmcyiAX6HsYcnBvITOztgXcyHmnGMSAwqpWDidderSwgso
-						P82PaffnZkYc62eOrMbDqOdPjhpUT7DepyRRjIxdmZq5DiC1u+XweoQhe0EO4qAG
-						xrp6528ksWgecUNgh28/Mw2MmsbVeuZY4hIUiTE+dUCaH+85e8i7MBnycNrJVDco
-						wRbczc6a1T+FCSy+cYF5TLdZXQneRVv9VxTmhgsXpES+gwKiFO2YrqySuVbE8P5A
-						EWiBnZJb0MdjMCENixhuHes8WRqs5CZ3GRqswZ1WdQJI7YirJLzaSydiasXH/QqL
-						eoQwxslZb8rsMUyN8K/+4EGSsAa35g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shibdev.educationscotland.gov.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibdev.educationscotland.gov.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Education Scotland</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Education Scotland: Development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.educationscotland.gov.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Graham</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Graham</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibdev.shef.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibdev.shef.ac.uk-shibboleth.xml
deleted file mode 100644
index afed0888..00000000
--- a/swamid-interfederations-2.0/shibdev.shef.ac.uk-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://shibdev.shef.ac.uk/shibboleth">
-  <!--
-		This is a TEST Shibboleth IdP for the University of Sheffield.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-10-14T17:56: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">sheffield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEcjCCA1qgAwIBAgIRAPsd0lQ3zA9qshZ/AtQzPukwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA5MzAwMDAwMDBaFw0xNjA5MjkyMzU5NTlaMEAxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSc2hpYmRldi5z
-						aGVmLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq0TlVbOQ
-						ComVMFNLl1MPD2RkIrJXoaAZlR+ezoCmdec4rv5SadlGQSXFiGsiw9fhjkS/bb1p
-						TfqxwdcBGJQ2FSw5Hig+vlVDiPo/BEA0H0ejnRZ7RwYe4q3gKentjhJ9OyI3qBkX
-						wPMFfX4x+CG0sML/SC26omReQUVLFBJR0tHlIOiKgsbvHPY2ih9FcvWYhckG/VMd
-						0VwAhWzue7c6e/f6HASq1V4ovtlgmbbvaWgah01iPHiCzG/Yo9SbGewHObj5GR7K
-						FC7ayORvM6tzKoR5JmJ8QX9IYuiH0wuoNFDz9kQtMvZJBjEGYq8hsYgJACC5S8Dt
-						vF2JFzmsUM43hwIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-						N1dH6pDjue0wHQYDVR0OBBYEFB+0r9UYq6Ytp9e3hwqSARAVypaSMA4GA1UdDwEB
-						/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-						BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-						MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-						LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-						LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-						b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJzaGliZGV2LnNoZWYuYWMu
-						dWswDQYJKoZIhvcNAQEFBQADggEBADAWzwonR3Un1FKUk5dQyOe5ugNt+jqIQ8MX
-						9CVYHWFpT76cH6jw9xRPooIigi+qUAMfdDhustmzMHJwapt1cKLCuwbsFXTQS4r4
-						b9wWuemt/4hefT+Cv8h+oo4uCxEipD2H20c+I7bS0TcejN9/HeO378rSAAvI40Mo
-						eq4++mTN6M8HJRBOOtfwU0dpQ/ln6PkOSsXGvDcklLsMaMfM+IE+4vq1cF0jPZ2n
-						EB/lCePMbGo0SM+B5SDGNNGksrW1LczHBsCSUBLDxaYEYbldDVeRybFNMc6N7y+x
-						0OgEvEcrtOAwP6Jl4BujPGJZBytgiK6zu/8jG9xGys6DVheK5OA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev.shef.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.shef.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://shibdev.shef.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev.shef.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibdev.shef.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev.shef.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">sheffield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEcjCCA1qgAwIBAgIRAPsd0lQ3zA9qshZ/AtQzPukwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA5MzAwMDAwMDBaFw0xNjA5MjkyMzU5NTlaMEAxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSc2hpYmRldi5z
-						aGVmLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq0TlVbOQ
-						ComVMFNLl1MPD2RkIrJXoaAZlR+ezoCmdec4rv5SadlGQSXFiGsiw9fhjkS/bb1p
-						TfqxwdcBGJQ2FSw5Hig+vlVDiPo/BEA0H0ejnRZ7RwYe4q3gKentjhJ9OyI3qBkX
-						wPMFfX4x+CG0sML/SC26omReQUVLFBJR0tHlIOiKgsbvHPY2ih9FcvWYhckG/VMd
-						0VwAhWzue7c6e/f6HASq1V4ovtlgmbbvaWgah01iPHiCzG/Yo9SbGewHObj5GR7K
-						FC7ayORvM6tzKoR5JmJ8QX9IYuiH0wuoNFDz9kQtMvZJBjEGYq8hsYgJACC5S8Dt
-						vF2JFzmsUM43hwIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-						N1dH6pDjue0wHQYDVR0OBBYEFB+0r9UYq6Ytp9e3hwqSARAVypaSMA4GA1UdDwEB
-						/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-						BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-						MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-						LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-						LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-						b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJzaGliZGV2LnNoZWYuYWMu
-						dWswDQYJKoZIhvcNAQEFBQADggEBADAWzwonR3Un1FKUk5dQyOe5ugNt+jqIQ8MX
-						9CVYHWFpT76cH6jw9xRPooIigi+qUAMfdDhustmzMHJwapt1cKLCuwbsFXTQS4r4
-						b9wWuemt/4hefT+Cv8h+oo4uCxEipD2H20c+I7bS0TcejN9/HeO378rSAAvI40Mo
-						eq4++mTN6M8HJRBOOtfwU0dpQ/ln6PkOSsXGvDcklLsMaMfM+IE+4vq1cF0jPZ2n
-						EB/lCePMbGo0SM+B5SDGNNGksrW1LczHBsCSUBLDxaYEYbldDVeRybFNMc6N7y+x
-						0OgEvEcrtOAwP6Jl4BujPGJZBytgiK6zu/8jG9xGys6DVheK5OA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev.shef.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev.shef.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 Sheffield</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Sheffield TEST IDP (DO NOT USE!)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.shef.ac.uk/cics/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Harnomit</GivenName>
-    <SurName>Babraa</SurName>
-    <EmailAddress>mailto:h.babraa@sheffield.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Gilbert</SurName>
-    <EmailAddress>mailto:R.Gilbert@sheffield.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index ef959e57..00000000
--- a/swamid-interfederations-2.0/shibdev2.stir.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibdev2.stir.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Development" Shibboleth IdP for the University of Stirling.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-10-23T10:56: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">stir.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFczCCBFugAwIBAgIQIL2D0diB6YBG+8rOQmekSzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDUxMzAwMDAwMFoXDTE3MDUxMjIzNTk1OVowQTEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzaGliZGV2Mi5z
-						dGlyLmFjLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwgrFtR/J
-						voK7/c+KDX0XUZqQkDnx+XwAvkJwRvRWJDgMmqajuC10ksTw9T/CW65BCXDpRI/x
-						TAn2ktYvR+JdfV3IeV6oBdur4f6jlSipKZOfDXej7Ypi/kQjCrjKvS3zboCYq4y2
-						rV+/N8bW8z/vFjgaogmCROoGAJrISVZnGuXuMwoldN5qgzdaAFuiZ8wuVnWkFIIm
-						fnDCxDgtIWSF+xD4KIhZPOVM/jEdn/DuVTbWIZtddlx8RlnVlBEjQ0qY+ggXejXf
-						5Ny6vgNK8wmKHbR+eZQNfh+EwmdbTwHPWSZBUaz9qGDcxgB2I0NNHKOGl4+O3BL6
-						IVIPqgIdrR8XLD7xd0uT2iKOKGANHUq0HLkCSEfL9G6zvL7eTWYaoQEbgiLt4MvO
-						P0b6LYmcyfIILi3N0gm854nw9LIwfOtu90P1wf0QKCJ7VWPws85dBKurKVOeT05l
-						IT5mSE9I2VczG+iLJye2ty3Y7fUlMsA47nlc3lQ6ECjZIfEK9yBxzi9E7TuMZD5m
-						rbq1FBJ/t09GO7WfvIAujaetCZhBBa5/cs7H1C5jY6AOXOnMjjvt0KjMD4SI1qAT
-						mqSz7F19C/qTIpfEtB1b0uA16G1txrCsPOys6qy0LeOTlPZcx6VUMHj5GQwsd3jl
-						myZ1va1yq7muxs8EAjOoHb8I+JMT52Zsi6ECAwEAAaOCAXAwggFsMB8GA1UdIwQY
-						MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTk+Ch3PUz9vlaFREMq
-						xqML3xNPxDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-						BggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAI
-						BgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
-						Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
-						hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
-						BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYIT
-						c2hpYmRldjIuc3Rpci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAoY+8HykdGG3j
-						Wo9U/RTQsGUejsaafMPPjcpQjFep0GI3S+cDFYiw4RNuumhlM7FvJQQ2+exogkG6
-						xlXSj4KxuXfY5aYRcV5hnHGQE/9AzClpYiilVQmPoVkfd3dmHAcDkp5ka7j+0MyA
-						ceB0T51gFWY3u+Idd96z4xrJDbVenn0dy1HsvNsaiozrndzXdpGWs0XDumic7jxZ
-						bavf0Ovny/qEwpR5vrSyEr2rwqzs8crHw4HTtekaTUnzXyBZ+HidfEDq7T+qVw2k
-						JJDXl3JKJ9QAJhoJsVEdDNBO6NqODHT+mLQl3OoHTxHoF74zn1LJw06SRNBAwkvm
-						ky1VDCZ6sw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev2.stir.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev2.stir.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://shibdev2.stir.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibdev2.stir.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibdev2.stir.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibdev2.stir.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">stir.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFczCCBFugAwIBAgIQIL2D0diB6YBG+8rOQmekSzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTE0MDUxMzAwMDAwMFoXDTE3MDUxMjIzNTk1OVowQTEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzaGliZGV2Mi5z
-						dGlyLmFjLnVrMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAwgrFtR/J
-						voK7/c+KDX0XUZqQkDnx+XwAvkJwRvRWJDgMmqajuC10ksTw9T/CW65BCXDpRI/x
-						TAn2ktYvR+JdfV3IeV6oBdur4f6jlSipKZOfDXej7Ypi/kQjCrjKvS3zboCYq4y2
-						rV+/N8bW8z/vFjgaogmCROoGAJrISVZnGuXuMwoldN5qgzdaAFuiZ8wuVnWkFIIm
-						fnDCxDgtIWSF+xD4KIhZPOVM/jEdn/DuVTbWIZtddlx8RlnVlBEjQ0qY+ggXejXf
-						5Ny6vgNK8wmKHbR+eZQNfh+EwmdbTwHPWSZBUaz9qGDcxgB2I0NNHKOGl4+O3BL6
-						IVIPqgIdrR8XLD7xd0uT2iKOKGANHUq0HLkCSEfL9G6zvL7eTWYaoQEbgiLt4MvO
-						P0b6LYmcyfIILi3N0gm854nw9LIwfOtu90P1wf0QKCJ7VWPws85dBKurKVOeT05l
-						IT5mSE9I2VczG+iLJye2ty3Y7fUlMsA47nlc3lQ6ECjZIfEK9yBxzi9E7TuMZD5m
-						rbq1FBJ/t09GO7WfvIAujaetCZhBBa5/cs7H1C5jY6AOXOnMjjvt0KjMD4SI1qAT
-						mqSz7F19C/qTIpfEtB1b0uA16G1txrCsPOys6qy0LeOTlPZcx6VUMHj5GQwsd3jl
-						myZ1va1yq7muxs8EAjOoHb8I+JMT52Zsi6ECAwEAAaOCAXAwggFsMB8GA1UdIwQY
-						MBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTk+Ch3PUz9vlaFREMq
-						xqML3xNPxDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-						BggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAI
-						BgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
-						Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
-						hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
-						BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYIT
-						c2hpYmRldjIuc3Rpci5hYy51azANBgkqhkiG9w0BAQUFAAOCAQEAoY+8HykdGG3j
-						Wo9U/RTQsGUejsaafMPPjcpQjFep0GI3S+cDFYiw4RNuumhlM7FvJQQ2+exogkG6
-						xlXSj4KxuXfY5aYRcV5hnHGQE/9AzClpYiilVQmPoVkfd3dmHAcDkp5ka7j+0MyA
-						ceB0T51gFWY3u+Idd96z4xrJDbVenn0dy1HsvNsaiozrndzXdpGWs0XDumic7jxZ
-						bavf0Ovny/qEwpR5vrSyEr2rwqzs8crHw4HTtekaTUnzXyBZ+HidfEDq7T+qVw2k
-						JJDXl3JKJ9QAJhoJsVEdDNBO6NqODHT+mLQl3OoHTxHoF74zn1LJw06SRNBAwkvm
-						ky1VDCZ6sw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibdev2.stir.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibdev2.stir.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 Stirling</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Stirling - Development</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stir.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Information Centre</GivenName>
-    <EmailAddress>mailto:infocentre@stir.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>White</SurName>
-    <EmailAddress>mailto:michael.white@stir.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml b/swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml
deleted file mode 100644
index 50884228..00000000
--- a/swamid-interfederations-2.0/shibfederation.scientia.com-shibboleth-sp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibfederation.scientia.com/shibboleth-sp">
-  <!--
-		This is a Shibboleth SP for Scientia Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://shibfederation.scientia.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Scientia Ltd</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Suppliers of resource management software, including timetabling and room booking, to higher and further education institutions</mdui:Description>
-        <mdui:Logo height="106" width="145">https://shibfederation.scientia.com/SciLogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALUmSoZ/nhXKMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDWNhbS1ocS1kLXNoaWIwHhcNMTIwMTA1MTIzNzI0WhcNMjIwMTAyMTIzNzI0
-						WjAYMRYwFAYDVQQDEw1jYW0taHEtZC1zaGliMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAvvEtt6F0MPyMWhtA09h6qNKFwRoVVVK//Ob4WbTMkjjuO1QP
-						jFT958wdcKdwIam0d5pg0cx/UaYUUJ0EdXMh4Q6yZNS93WrRtodCnUupAqh4KiiW
-						uKVpNN5zcM+uUwvK1PIksL+KXmj8xUZkho/iD8hnY53Kdd7p9qAx5KZIo0nH07ja
-						nvQhtJjqlhF7DndPXQqCHs7SgP3DRUVQyxTfFz0soqwgLNSFN98k+P0HUrgWyL2O
-						UWCLMk3l1nUYvo4vFKnrQsrkGudico9LIO6pemDzKoGWuJGvdzPfUqOYTraOZEW7
-						8p34N3qSDFLFK0mmkuDEzEJinbgv5lg44i9RtwIDAQABozswOTAYBgNVHREEETAP
-						gg1jYW0taHEtZC1zaGliMB0GA1UdDgQWBBRr4P0aIY3MN4nd8qZuZGwCoktgWDAN
-						BgkqhkiG9w0BAQUFAAOCAQEAcV9DdlcmZzYNK8X5n2nGmFOefRJLV8FHaw8R0Q5c
-						SUhUljXnPsg9QdVXs9FQDFublEKxzLkfr2rxiwL5oQKAyhEbYMjRLi0giCQ+zELy
-						xqT2IDXConQSIxOnlDEv7a0QCqy7luUpRbW+m8c5l9Q/02y9A7CN0AfU99yLzua6
-						mGdq90mfCHKbGw1fsxmOFwUFTPjYkJ6V9BoKAx46IrmahvllnGIRjUMYkcQcM+qN
-						0IDuIE9DmXK2avh/8h4afo2uRZVKxTLi/e4nrk/hZGdOaREmzxYTh18IZ85+JdDY
-						xpo3Zin7muZ026j4rqBuHFQyAaJoKcKU2m8kaKte2Mym8Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibfederation.scientia.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibfederation.scientia.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibfederation.scientia.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibfederation.scientia.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibfederation.scientia.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibfederation.scientia.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Scientia Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Scientia Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.scientia.com/uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Bulman</SurName>
-    <EmailAddress>mailto:Richard_Bulman@scientia.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Strong</SurName>
-    <EmailAddress>mailto:Michael_Strong@scientia.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.amherst.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.amherst.edu-idp-shibboleth.xml
deleted file mode 100644
index 5c5e0f2e..00000000
--- a/swamid-interfederations-2.0/shibidp.amherst.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://shibidp.amherst.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">amherst.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Amherst College</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>
-MIIDODCCAiCgAwIBAgIVAKMvGP/vH0uzAwPfsNR+8twMxr8nMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJpZHAuYW1oZXJzdC5lZHUwHhcNMTAwMzI5MTc0
-MDIzWhcNMzAwMzI5MTc0MDIzWjAeMRwwGgYDVQQDExNzaGliaWRwLmFtaGVyc3Qu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkNJ1nVz/FM/CchMM
-NfgW4ROHyNf3K15dT4LB1x+GVivrpYuvOHAY4eyhwoBfkm0t5NM19EHpsdFIVePO
-Cm80WYFwCpR1lCPcN/3/JelfCTKKcjKJM6RCHUiM7e0JUlTTV/f0PEdiDrNn01wM
-9kknwkAxkXCyN4TNKT/KTMhYNwxhCqTa4QVDThJMQWXJkIbOA7pJbgmVmCfdcJub
-4E8C9gtgPTWnQPXtXxRtfH2YYd8fRwPIIx6ASW9VThOSk+FNmcbEGLpxFSRjnfMO
-+SPdVahROAhP6IAgASEBzjgp9qb4deqLjIpk1hIQhHkoKZELlUq5lezaraxOemJI
-KFoG4wIDAQABo20wazBKBgNVHREEQzBBghNzaGliaWRwLmFtaGVyc3QuZWR1hipo
-dHRwczovL3NoaWJpZHAuYW1oZXJzdC5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFMj2O62lcU/Ny7iWyJ/vDyYkzMJOMA0GCSqGSIb3DQEBBQUAA4IBAQAkppMI
-tdfWe60+4ipCZ+aT/Fg30auva3YgKZsWEsTRcJ8cMLcst27AvswP16DtKp+eksN1
-Pgq+CEj6ahY1O4Rtic8hKwBsyHlMY47VdjZK2lvWBA3Dh81636jmOePQVRFqIAfQ
-EpKiUdqXNpwy61ODSFRJ/XEyod2tN+J2f5Rq2Cej6VWSNZ5FatuemjZMlxEXNi5s
-gl7fU1fEoCtBURaLf/tkzMKykipuzzSpZVS3uq8slt2jVsQlddIXR60pkGyQgr6/
-Is8EDBRpRFjVojjmYbLxcdbgEVA3CteakwkNe5Gb4gJuhFiq6nGhxFOron13TF69
-fuOjmWpbYZwDGqld
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.amherst.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.amherst.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.amherst.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.amherst.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.amherst.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.amherst.edu/idp/profile/SAML2/POST-SimpleSign/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">amherst.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAKMvGP/vH0uzAwPfsNR+8twMxr8nMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJpZHAuYW1oZXJzdC5lZHUwHhcNMTAwMzI5MTc0
-MDIzWhcNMzAwMzI5MTc0MDIzWjAeMRwwGgYDVQQDExNzaGliaWRwLmFtaGVyc3Qu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkNJ1nVz/FM/CchMM
-NfgW4ROHyNf3K15dT4LB1x+GVivrpYuvOHAY4eyhwoBfkm0t5NM19EHpsdFIVePO
-Cm80WYFwCpR1lCPcN/3/JelfCTKKcjKJM6RCHUiM7e0JUlTTV/f0PEdiDrNn01wM
-9kknwkAxkXCyN4TNKT/KTMhYNwxhCqTa4QVDThJMQWXJkIbOA7pJbgmVmCfdcJub
-4E8C9gtgPTWnQPXtXxRtfH2YYd8fRwPIIx6ASW9VThOSk+FNmcbEGLpxFSRjnfMO
-+SPdVahROAhP6IAgASEBzjgp9qb4deqLjIpk1hIQhHkoKZELlUq5lezaraxOemJI
-KFoG4wIDAQABo20wazBKBgNVHREEQzBBghNzaGliaWRwLmFtaGVyc3QuZWR1hipo
-dHRwczovL3NoaWJpZHAuYW1oZXJzdC5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFMj2O62lcU/Ny7iWyJ/vDyYkzMJOMA0GCSqGSIb3DQEBBQUAA4IBAQAkppMI
-tdfWe60+4ipCZ+aT/Fg30auva3YgKZsWEsTRcJ8cMLcst27AvswP16DtKp+eksN1
-Pgq+CEj6ahY1O4Rtic8hKwBsyHlMY47VdjZK2lvWBA3Dh81636jmOePQVRFqIAfQ
-EpKiUdqXNpwy61ODSFRJ/XEyod2tN+J2f5Rq2Cej6VWSNZ5FatuemjZMlxEXNi5s
-gl7fU1fEoCtBURaLf/tkzMKykipuzzSpZVS3uq8slt2jVsQlddIXR60pkGyQgr6/
-Is8EDBRpRFjVojjmYbLxcdbgEVA3CteakwkNe5Gb4gJuhFiq6nGhxFOron13TF69
-fuOjmWpbYZwDGqld
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.amherst.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.amherst.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Amherst College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Amherst College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.amherst.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rob Ansaldo</md:GivenName>
-    <md:EmailAddress>rlansaldo@amherst.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>John Manly</md:GivenName>
-    <md:EmailAddress>jwmanly@amherst.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.bates.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.bates.edu-idp-shibboleth.xml
deleted file mode 100644
index c297b47a..00000000
--- a/swamid-interfederations-2.0/shibidp.bates.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,111 +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://shibidp.bates.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.bates.edu/ils/login-service" 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">bates.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Bates College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Bates College Identity Provider</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.bates.edu/ils/login-service</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.bates.edu/ils/policies</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="515" xml:lang="en">https://abacus.bates.edu/1855/wordmarks/bates-wordmark-201-515x150.jpg</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>
-MIIDLzCCAhegAwIBAgIUL/x4yeKXw8Qo1fj6nOo++CaAWnEwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRc2hpYmlkcC5iYXRlcy5lZHUwHhcNMTMwODMwMTQwOTMx
-WhcNMzMwODMwMTQwOTMxWjAcMRowGAYDVQQDExFzaGliaWRwLmJhdGVzLmVkdTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8gHC7Wjjzyp5xNqVGvh+YZ
-/Yc0j4Srp/vh6iNoDKgyxm8ttcUoBWmtauchw0EXs6uCihZpTlms+kVp+C8sVZC+
-6CBrfnwXb3cL251AIhsOex3eA94+1ugxs0ot8g9jSjFXpLu3FUcAyiIxYlODaVcy
-3wdfsMPVr0tx9eGN9jwuvJHE3wFn2IfmJb6cb7m4QlpDO+9jpjYJyya3a8NKrQwQ
-75EBq07muPbHPIJWDF+STOnQWdyxj5ly4XIg+S11P77saEz9vQbVB/Z5FX/lD7/J
-ihxbKld7OurrXF/NjBwLXWkOnC3Np0lzAvYtU4JUqgxLpOpLyCwmbuMJRJNlzaMC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2hpYmlkcC5iYXRlcy5lZHWGKGh0dHBzOi8v
-c2hpYmlkcC5iYXRlcy5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFF6udEhN
-MEepB0wrvrtfT8Nkm4ytMA0GCSqGSIb3DQEBBQUAA4IBAQA2KfxSHhsyuzK62mna
-qnG7ctE70OZRBQiia9QE2aadgolB+CEr43dZb2YC4+EpbfBCODW5QNixLod3dYlx
-sG3R9y7ilVz+0dKFje+O31JHP+HKTbVhurvb/A+ksuUTyngczT/TxkwEz3WLXUK6
-wNtnuj7nHea0zQFF4RWcJ2UrN0I+RT6czQwSoTnrDlpGUPhYbd7fDUgj4XTC85Tk
-NMGcNLnWPXMs/8cJh+BhVcMR+ATeUYIT6ZZR5XVsjxtSVj/dYlugatENLwu4Zxye
-P9qcR8MfjVr4G5DgNUhpRXkHN5Oj8WhYwa2rgzTR+QqGnIKHZNVyna7BTHVIDsgV
-Iq67
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.bates.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.bates.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.bates.edu/idp/profile/Logout"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.bates.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.bates.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.bates.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bates.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUL/x4yeKXw8Qo1fj6nOo++CaAWnEwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRc2hpYmlkcC5iYXRlcy5lZHUwHhcNMTMwODMwMTQwOTMx
-WhcNMzMwODMwMTQwOTMxWjAcMRowGAYDVQQDExFzaGliaWRwLmJhdGVzLmVkdTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8gHC7Wjjzyp5xNqVGvh+YZ
-/Yc0j4Srp/vh6iNoDKgyxm8ttcUoBWmtauchw0EXs6uCihZpTlms+kVp+C8sVZC+
-6CBrfnwXb3cL251AIhsOex3eA94+1ugxs0ot8g9jSjFXpLu3FUcAyiIxYlODaVcy
-3wdfsMPVr0tx9eGN9jwuvJHE3wFn2IfmJb6cb7m4QlpDO+9jpjYJyya3a8NKrQwQ
-75EBq07muPbHPIJWDF+STOnQWdyxj5ly4XIg+S11P77saEz9vQbVB/Z5FX/lD7/J
-ihxbKld7OurrXF/NjBwLXWkOnC3Np0lzAvYtU4JUqgxLpOpLyCwmbuMJRJNlzaMC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2hpYmlkcC5iYXRlcy5lZHWGKGh0dHBzOi8v
-c2hpYmlkcC5iYXRlcy5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFF6udEhN
-MEepB0wrvrtfT8Nkm4ytMA0GCSqGSIb3DQEBBQUAA4IBAQA2KfxSHhsyuzK62mna
-qnG7ctE70OZRBQiia9QE2aadgolB+CEr43dZb2YC4+EpbfBCODW5QNixLod3dYlx
-sG3R9y7ilVz+0dKFje+O31JHP+HKTbVhurvb/A+ksuUTyngczT/TxkwEz3WLXUK6
-wNtnuj7nHea0zQFF4RWcJ2UrN0I+RT6czQwSoTnrDlpGUPhYbd7fDUgj4XTC85Tk
-NMGcNLnWPXMs/8cJh+BhVcMR+ATeUYIT6ZZR5XVsjxtSVj/dYlugatENLwu4Zxye
-P9qcR8MfjVr4G5DgNUhpRXkHN5Oj8WhYwa2rgzTR+QqGnIKHZNVyna7BTHVIDsgV
-Iq67
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.bates.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Bates College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Bates College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bates.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bates NetAdmin</md:GivenName>
-    <md:EmailAddress>netadmin@bates.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Bates NetAdmin</md:GivenName>
-    <md:EmailAddress>netadmin@bates.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Bates NetAdmin</md:GivenName>
-    <md:EmailAddress>netadmin@bates.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Help Desk Services</md:GivenName>
-    <md:EmailAddress>helpdesk@bates.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.bloomu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.bloomu.edu-idp-shibboleth.xml
deleted file mode 100644
index f2052106..00000000
--- a/swamid-interfederations-2.0/shibidp.bloomu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,109 +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://shibidp.bloomu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://sso.bloomu.edu/idp/error.jsp" 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">bloomu.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">huskies.bloomu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Bloomsburg University of Pennsylvania</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for all faculty, staff, and students of Bloomsburg University, one of the fourteen universities in the Pennsylvania State System of Higher Education (PASSHE).</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.bloomu.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.bloomu.edu/policies_procedures</mdui:PrivacyStatementURL>
-        <mdui:Logo height="137" width="259" xml:lang="en">https://sso.bloomu.edu/idp/images/bu.jpg</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>
-MIIDIzCCAgugAwIBAgIUa2z6CycWE6LUrGRPn7Cemf5wDEswDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOc3NvLmJsb29tdS5lZHUwHhcNMTMwMjA3MjEzMzE1WhcN
-MzMwMjA3MjEzMzE1WjAZMRcwFQYDVQQDEw5zc28uYmxvb211LmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJrah6PH2ovsDZBWU6vJU29edlusGHWJ
-o9lUpDUYtyf6G51acfVNzvryDDK9Is+HqM8DNdpGXEURVrpGHeVs3bUC0kceMIQu
-3gQe+E0VLpYPckLOt0GW33xyRZqjvv+B4+FTYJ0NclelpKw6h0zKhI6n9OEVV9U+
-0KqeB5hFSOc3Wxmim1AFGWb7gF3zi4Pu/qK0yWw/stwF3Q1yn+ckMISSffutRCNY
-XjQULnIIo9akAP/3PLYpOrL11YZpmpkl2K+evEJctmd8h0TE7jK0c5D/6pmVaiWt
-dKHSvtT43iqQ1Hlo4K3jlXIRPh2zsr8h2nWFwoI4tOJ0hvE/Vlu3yJUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOc3NvLmJsb29tdS5lZHWGJWh0dHBzOi8vc3NvLmJsb29t
-dS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDUwz2WNduEDYYsYescY9Xpm
-64lDMA0GCSqGSIb3DQEBBQUAA4IBAQBLa26KpzbFcTiZkPRE2vaX+s0scV8GFXZ1
-TNPcfT8c1EVDB2k0DyUPCBm9kdhNm1qbl4horhilS7pVCAcw3dmTpnjMusEtxquc
-7333PpuTJ3sFvgpD3p1WB0g5mBiPAxj2YnPthWqmTdEvH/F1L8TC6xmg7YDGRPHt
-gfISZot3Vn5ux3rA8/JiXhEOi1zJlbeSRLWQRUm9+lTftEWWg19TE9NR5YJK9D1p
-R26ZBnGAXB3pxgg6q08oHO7BQ7esjKXaf4Y3rpghvA5SFf1A3vFBXrTK1WgoUTXd
-QZ8qhl/Wc9j5mSANbebH6m5IJcNikMvib+f34/Jy9j82Aw8yP1n7
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.bloomu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bloomu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.bloomu.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.bloomu.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bloomu.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.bloomu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.bloomu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.bloomu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.bloomu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bloomu.edu:444/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">bloomu.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">huskies.bloomu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUa2z6CycWE6LUrGRPn7Cemf5wDEswDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOc3NvLmJsb29tdS5lZHUwHhcNMTMwMjA3MjEzMzE1WhcN
-MzMwMjA3MjEzMzE1WjAZMRcwFQYDVQQDEw5zc28uYmxvb211LmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJrah6PH2ovsDZBWU6vJU29edlusGHWJ
-o9lUpDUYtyf6G51acfVNzvryDDK9Is+HqM8DNdpGXEURVrpGHeVs3bUC0kceMIQu
-3gQe+E0VLpYPckLOt0GW33xyRZqjvv+B4+FTYJ0NclelpKw6h0zKhI6n9OEVV9U+
-0KqeB5hFSOc3Wxmim1AFGWb7gF3zi4Pu/qK0yWw/stwF3Q1yn+ckMISSffutRCNY
-XjQULnIIo9akAP/3PLYpOrL11YZpmpkl2K+evEJctmd8h0TE7jK0c5D/6pmVaiWt
-dKHSvtT43iqQ1Hlo4K3jlXIRPh2zsr8h2nWFwoI4tOJ0hvE/Vlu3yJUCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOc3NvLmJsb29tdS5lZHWGJWh0dHBzOi8vc3NvLmJsb29t
-dS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFDUwz2WNduEDYYsYescY9Xpm
-64lDMA0GCSqGSIb3DQEBBQUAA4IBAQBLa26KpzbFcTiZkPRE2vaX+s0scV8GFXZ1
-TNPcfT8c1EVDB2k0DyUPCBm9kdhNm1qbl4horhilS7pVCAcw3dmTpnjMusEtxquc
-7333PpuTJ3sFvgpD3p1WB0g5mBiPAxj2YnPthWqmTdEvH/F1L8TC6xmg7YDGRPHt
-gfISZot3Vn5ux3rA8/JiXhEOi1zJlbeSRLWQRUm9+lTftEWWg19TE9NR5YJK9D1p
-R26ZBnGAXB3pxgg6q08oHO7BQ7esjKXaf4Y3rpghvA5SFf1A3vFBXrTK1WgoUTXd
-QZ8qhl/Wc9j5mSANbebH6m5IJcNikMvib+f34/Jy9j82Aw8yP1n7
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.bloomu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.bloomu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Bloomsburg University of Pennsylvania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Bloomsburg University of Pennsylvania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bloomu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Vincent Kozlek</md:GivenName>
-    <md:EmailAddress>idp-admin@bloomu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Vincent Kozlek</md:GivenName>
-    <md:EmailAddress>idp-admin@bloomu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Vincent Kozlek</md:GivenName>
-    <md:EmailAddress>idp-admin@bloomu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 cd9e1cfb..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.cca.unipd.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipd.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Padova</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Padova</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for users affiliated to the University of Padova</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Padova</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unipd.it/en/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unipd.it/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unipd.it/en/idem</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipd.it/idem</mdui:PrivacyStatementURL>
-        <mdui: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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.cca.unipd.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipd.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Padova</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Padova</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Padova</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Padova</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unipd.it/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unipd.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:supporto.sso@unipd.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.cit.cornell.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.cit.cornell.edu-idp-shibboleth.xml
deleted file mode 100644
index d2fb0bed..00000000
--- a/swamid-interfederations-2.0/shibidp.cit.cornell.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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://shibidp.cit.cornell.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">cornell.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cornell University</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>
-MIIDSDCCAjCgAwIBAgIVAOZ8NfBem6sHcI7F39sYmD/JG4YDMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJpZHAuY2l0LmNvcm5lbGwuZWR1MB4XDTA5MTEy
-MzE4NTI0NFoXDTI5MTEyMzE4NTI0NFowIjEgMB4GA1UEAxMXc2hpYmlkcC5jaXQu
-Y29ybmVsbC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTURo9
-90uuODo/5ju3GZThcT67K3RXW69jwlBwfn3png75Dhyw9Xa50RFv0EbdfrojH1P1
-9LyfCjubfsm9Z7FYkVWSVdPSvQ0BXx7zQxdTpE9137qj740tMJr7Wi+iWdkyBQS/
-bCNhuLHeNQor6NXZoBgX8HvLy4sCUb/4v7vbp90HkmP3FzJRDevzgr6PVNqWwNqp
-tZ0vQHSF5D3iBNbxq3csfRGQQyVi729XuWMSqEjPhhkf1UjVcJ3/cG8tWbRKw+W+
-OIm71k+99kOgg7IvygndzzaGDVhDFMyiGZ4njMzEJT67sEq0pMuuwLMlLE/86mSv
-uGwO2Qacb1ckzjodAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJpZHAuY2l0LmNv
-cm5lbGwuZWR1hi5odHRwczovL3NoaWJpZHAuY2l0LmNvcm5lbGwuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSQgitoP2/rJMDepS1sFgM35xw19zANBgkqhkiG
-9w0BAQUFAAOCAQEAaFrLOGqMsbX1YlseO+SM3JKfgfjBBL5TP86qqiCuq9a1J6B7
-Yv+XYLmZBy04EfV0L7HjYX5aGIWLDtz9YAis4g3xTPWe1/bjdltUq5seRuksJjyb
-prGI2oAv/ShPBOyrkadectHzvu5K6CL7AxNTWCSXswtfdsuxcKo65tO5TRO1hWlr
-7Pq2F+Oj2hOvcwC0vOOjlYNe9yRE9DjJAzv4rrZUg71R3IEKNjfOF80LYPAFD2Sp
-p36uB6TmSYl1nBmS5LgWF4EpEuODPSmy4sIV6jl1otuyI/An2dOcNqcgu7tYEXLX
-C8N6DXggDWPtPRdpk96UW45huvXudpZenrcd7A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cit.cornell.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cit.cornell.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.cit.cornell.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.cit.cornell.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.cit.cornell.edu/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">cornell.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAOZ8NfBem6sHcI7F39sYmD/JG4YDMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3NoaWJpZHAuY2l0LmNvcm5lbGwuZWR1MB4XDTA5MTEy
-MzE4NTI0NFoXDTI5MTEyMzE4NTI0NFowIjEgMB4GA1UEAxMXc2hpYmlkcC5jaXQu
-Y29ybmVsbC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTURo9
-90uuODo/5ju3GZThcT67K3RXW69jwlBwfn3png75Dhyw9Xa50RFv0EbdfrojH1P1
-9LyfCjubfsm9Z7FYkVWSVdPSvQ0BXx7zQxdTpE9137qj740tMJr7Wi+iWdkyBQS/
-bCNhuLHeNQor6NXZoBgX8HvLy4sCUb/4v7vbp90HkmP3FzJRDevzgr6PVNqWwNqp
-tZ0vQHSF5D3iBNbxq3csfRGQQyVi729XuWMSqEjPhhkf1UjVcJ3/cG8tWbRKw+W+
-OIm71k+99kOgg7IvygndzzaGDVhDFMyiGZ4njMzEJT67sEq0pMuuwLMlLE/86mSv
-uGwO2Qacb1ckzjodAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3NoaWJpZHAuY2l0LmNv
-cm5lbGwuZWR1hi5odHRwczovL3NoaWJpZHAuY2l0LmNvcm5lbGwuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSQgitoP2/rJMDepS1sFgM35xw19zANBgkqhkiG
-9w0BAQUFAAOCAQEAaFrLOGqMsbX1YlseO+SM3JKfgfjBBL5TP86qqiCuq9a1J6B7
-Yv+XYLmZBy04EfV0L7HjYX5aGIWLDtz9YAis4g3xTPWe1/bjdltUq5seRuksJjyb
-prGI2oAv/ShPBOyrkadectHzvu5K6CL7AxNTWCSXswtfdsuxcKo65tO5TRO1hWlr
-7Pq2F+Oj2hOvcwC0vOOjlYNe9yRE9DjJAzv4rrZUg71R3IEKNjfOF80LYPAFD2Sp
-p36uB6TmSYl1nBmS5LgWF4EpEuODPSmy4sIV6jl1otuyI/An2dOcNqcgu7tYEXLX
-C8N6DXggDWPtPRdpk96UW45huvXudpZenrcd7A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cit.cornell.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cit.cornell.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cornell University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cornell University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cornell.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Hong Ye</md:GivenName>
-    <md:EmailAddress>hy93@cornell.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>University Security Office</md:GivenName>
-    <md:EmailAddress>security@cornell.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Steve Edgar</md:GivenName>
-    <md:EmailAddress>se10@cornell.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Identity Management</md:GivenName>
-    <md:EmailAddress>idmgmt@cornell.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.colostate.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.colostate.edu-idp-shibboleth.xml
deleted file mode 100644
index fa1066fc..00000000
--- a/swamid-interfederations-2.0/shibidp.colostate.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,118 +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://shibidp.colostate.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">colostate.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Colorado State University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Enterprise identity provider at Colorado State University</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.acns.colostate.edu/Help/Single-Sign-On-Shibboleth</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.colostate.edu/info-privacy.aspx</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://wsnet.colostate.edu/cwis262/ShibIdpLogout/images/csu-fc-logo-80-60.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>
-MIIENTCCAx2gAwIBAgIJAPoTdBgmWKz8MA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwIQ29sb3JhZG8xFTATBgNVBAcMDEZvcnQgQ29sbGlu
-czEiMCAGA1UECgwZQ29sb3JhZG8gU3RhdGUgVW5pdmVyc2l0eTEzMDEGA1UECwwq
-QWNhZGVtaWMgQ29tcHV0aW5nIGFuZCBOZXR3b3JraW5nIFNlcnZpY2VzMR4wHAYD
-VQQDDBVzaGliaWRwLmNvbG9zdGF0ZS5lZHUwHhcNMTQxMTA3MjMwNTU1WhcNMTcx
-MTA2MjMwNTU1WjCBsDELMAkGA1UEBhMCVVMxETAPBgNVBAgMCENvbG9yYWRvMRUw
-EwYDVQQHDAxGb3J0IENvbGxpbnMxIjAgBgNVBAoMGUNvbG9yYWRvIFN0YXRlIFVu
-aXZlcnNpdHkxMzAxBgNVBAsMKkFjYWRlbWljIENvbXB1dGluZyBhbmQgTmV0d29y
-a2luZyBTZXJ2aWNlczEeMBwGA1UEAwwVc2hpYmlkcC5jb2xvc3RhdGUuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhgmIpA1J/csYLYZcFrLGFeY
-g9Q73LH01jutOuuRa/N6gCjcwKNEIb8uP4d6m9SRIOiA+j+Gxdv0ods5L1Tnxz8j
-MW1vJp0XWkRR5UZ7cG6zuUD8iLjSTGNVcC9ltl5/oc2n0eCnAVZauFea1WOJ7Hoe
-58n9T45+yuU3eg7eKQ3qbNmsAxLw7g3Iq63H1t7KXk5M94rJ0mY/AtYocaB3Y1Q3
-MCPG0YTAEb0nB7kSahxdYyXjAAAJiLb0BQ84nG5YyXqKnhBZ9vQCZlclO9Z9mzTC
-hh1Rsit7ydCqp/tt91O7HPL+3E/fABpGwhXW21rRNmqpEU2ksCjtQLwdaquIKwID
-AQABo1AwTjAdBgNVHQ4EFgQUlHESewYaHeBfikADW2Lumvtf+VAwHwYDVR0jBBgw
-FoAUlHESewYaHeBfikADW2Lumvtf+VAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEANxFF0QhPYcvSnX+fBM6CEYlEJkpJ3RFHoEHSrT611dRa69V2X7X7
-52XoB600c6CuZyKQRdmhCf1/WhmT61RKnNUX8MlAitjXEj582WEBxqpd9YQqb3KE
-jSFFRXYSlRJIsrg+Uh7ysGgO7VarAyqk9MJaws1jOKKuty67mmsisYdq7kXdD1bg
-1JAWFGWAqrAU+20hN2dKOFZ8DrzYvXZ5ZnFyseh58BaiFo21z7RLuX2OattosQkN
-ZITT93c2OAMIaG88OOem1zR+9uaKJY3HZZxP4LniL796pGtoKLcv4ZJxQHx3Y9oG
-ZLnubpkwFuURC5Ffz084UPzpg/oiHm/r7Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.colostate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.colostate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.colostate.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.colostate.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.colostate.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.colostate.edu/idp/profile/SAML2/POST-SimpleSign/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">colostate.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIENTCCAx2gAwIBAgIJAPoTdBgmWKz8MA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwIQ29sb3JhZG8xFTATBgNVBAcMDEZvcnQgQ29sbGlu
-czEiMCAGA1UECgwZQ29sb3JhZG8gU3RhdGUgVW5pdmVyc2l0eTEzMDEGA1UECwwq
-QWNhZGVtaWMgQ29tcHV0aW5nIGFuZCBOZXR3b3JraW5nIFNlcnZpY2VzMR4wHAYD
-VQQDDBVzaGliaWRwLmNvbG9zdGF0ZS5lZHUwHhcNMTQxMTA3MjMwNTU1WhcNMTcx
-MTA2MjMwNTU1WjCBsDELMAkGA1UEBhMCVVMxETAPBgNVBAgMCENvbG9yYWRvMRUw
-EwYDVQQHDAxGb3J0IENvbGxpbnMxIjAgBgNVBAoMGUNvbG9yYWRvIFN0YXRlIFVu
-aXZlcnNpdHkxMzAxBgNVBAsMKkFjYWRlbWljIENvbXB1dGluZyBhbmQgTmV0d29y
-a2luZyBTZXJ2aWNlczEeMBwGA1UEAwwVc2hpYmlkcC5jb2xvc3RhdGUuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhgmIpA1J/csYLYZcFrLGFeY
-g9Q73LH01jutOuuRa/N6gCjcwKNEIb8uP4d6m9SRIOiA+j+Gxdv0ods5L1Tnxz8j
-MW1vJp0XWkRR5UZ7cG6zuUD8iLjSTGNVcC9ltl5/oc2n0eCnAVZauFea1WOJ7Hoe
-58n9T45+yuU3eg7eKQ3qbNmsAxLw7g3Iq63H1t7KXk5M94rJ0mY/AtYocaB3Y1Q3
-MCPG0YTAEb0nB7kSahxdYyXjAAAJiLb0BQ84nG5YyXqKnhBZ9vQCZlclO9Z9mzTC
-hh1Rsit7ydCqp/tt91O7HPL+3E/fABpGwhXW21rRNmqpEU2ksCjtQLwdaquIKwID
-AQABo1AwTjAdBgNVHQ4EFgQUlHESewYaHeBfikADW2Lumvtf+VAwHwYDVR0jBBgw
-FoAUlHESewYaHeBfikADW2Lumvtf+VAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEANxFF0QhPYcvSnX+fBM6CEYlEJkpJ3RFHoEHSrT611dRa69V2X7X7
-52XoB600c6CuZyKQRdmhCf1/WhmT61RKnNUX8MlAitjXEj582WEBxqpd9YQqb3KE
-jSFFRXYSlRJIsrg+Uh7ysGgO7VarAyqk9MJaws1jOKKuty67mmsisYdq7kXdD1bg
-1JAWFGWAqrAU+20hN2dKOFZ8DrzYvXZ5ZnFyseh58BaiFo21z7RLuX2OattosQkN
-ZITT93c2OAMIaG88OOem1zR+9uaKJY3HZZxP4LniL796pGtoKLcv4ZJxQHx3Y9oG
-ZLnubpkwFuURC5Ffz084UPzpg/oiHm/r7Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.colostate.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.colostate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Colorado State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Colorado State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.colostate.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Randy Miotke</md:GivenName>
-    <md:EmailAddress>shibboleth@colostate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Scott Baily</md:GivenName>
-    <md:EmailAddress>shibboleth@colostate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Daniel Hamp</md:GivenName>
-    <md:EmailAddress>shibboleth@colostate.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.kgv.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.kgv.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 0a488676..00000000
--- a/swamid-interfederations-2.0/shibidp.kgv.ac.uk-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" entityID="https://shibidp.kgv.ac.uk/idp/shibboleth">
-  <!--
-		This is a "KGV College - Latest" Shibboleth IdP for King George V College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-22T10:26:54Z">
-      <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">kgv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVANzd8W7p4MbyVI3/OVktKiz5Ch7uMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEXNoaWJpZHAua2d2LmFjLnVrMB4XDTE0MDUwODE1MDE1
-						NloXDTM0MDUwODE1MDE1NlowHDEaMBgGA1UEAxMRc2hpYmlkcC5rZ3YuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNzquN3Npl2h/H2EYoayIP
-						pfTpjPN10gvpYWT1OeMeGrGcTzwetB0UZaE4YYFmpfo+4LJH+wJMUY1FaLLw+GbE
-						XUsgaz3ungFsqyaMagEkBhHukrpDTbbU9daprg512h4HKckfdhnc0km7yXmB9dG9
-						7ahJvvxlirB0yM9VWK7c+b2AoGKDFLT1SDM/x2oSqP7VWouGg+ncxZvRvkyvx5oI
-						WfqoM6o3B7FF0N+XdZdiDiAtv7GqttiusFQvfHHLovREyrWgeIzUIeP7JcQ57gEa
-						RZRAqfI0M0FUKnIQrnks3u4pwhx6QyIpb6sk2GZ4rSAKs0FZElgVd+X8LxzC9YIf
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJpZHAua2d2LmFjLnVrhihodHRwczov
-						L3NoaWJpZHAua2d2LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQXGuRc
-						d8maaWEM20jGXTwh0ag9bDANBgkqhkiG9w0BAQUFAAOCAQEAl85FH7yO5IZtaYZ3
-						Yx04UDAeMMS1LWAgLvz/tEyBK4/Fru7wDuPPhvT4UPtMfg37tKqPXzDisAXAulWP
-						0FGUHbDgIMVQ5etmv2hk6Ck/2QdTQ45FTS22xTiveTP0pUYwg3owS4on/hp4KAAb
-						VbRxFyQM5onKMCk2XREtfCWThnz+ftuhxJV7pfQMzHaR6Ws2saYHI6bk2TldpQXC
-						BzvBJQvwHShZeIlmDzHVNPfpyqDYE0lO2XiqqnHEAImYHuNKoAvgj5jJcViFhWXI
-						ZhQMaxwU9/UVwOWO1REhWcd7KE+W2ELIgeySGijZmKquKTrOSqyFx3DKSxGdhFsk
-						nSUetQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.kgv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.kgv.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://shibidp.kgv.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.kgv.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.kgv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.kgv.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">kgv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVANzd8W7p4MbyVI3/OVktKiz5Ch7uMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEXNoaWJpZHAua2d2LmFjLnVrMB4XDTE0MDUwODE1MDE1
-						NloXDTM0MDUwODE1MDE1NlowHDEaMBgGA1UEAxMRc2hpYmlkcC5rZ3YuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNzquN3Npl2h/H2EYoayIP
-						pfTpjPN10gvpYWT1OeMeGrGcTzwetB0UZaE4YYFmpfo+4LJH+wJMUY1FaLLw+GbE
-						XUsgaz3ungFsqyaMagEkBhHukrpDTbbU9daprg512h4HKckfdhnc0km7yXmB9dG9
-						7ahJvvxlirB0yM9VWK7c+b2AoGKDFLT1SDM/x2oSqP7VWouGg+ncxZvRvkyvx5oI
-						WfqoM6o3B7FF0N+XdZdiDiAtv7GqttiusFQvfHHLovREyrWgeIzUIeP7JcQ57gEa
-						RZRAqfI0M0FUKnIQrnks3u4pwhx6QyIpb6sk2GZ4rSAKs0FZElgVd+X8LxzC9YIf
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJpZHAua2d2LmFjLnVrhihodHRwczov
-						L3NoaWJpZHAua2d2LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQXGuRc
-						d8maaWEM20jGXTwh0ag9bDANBgkqhkiG9w0BAQUFAAOCAQEAl85FH7yO5IZtaYZ3
-						Yx04UDAeMMS1LWAgLvz/tEyBK4/Fru7wDuPPhvT4UPtMfg37tKqPXzDisAXAulWP
-						0FGUHbDgIMVQ5etmv2hk6Ck/2QdTQ45FTS22xTiveTP0pUYwg3owS4on/hp4KAAb
-						VbRxFyQM5onKMCk2XREtfCWThnz+ftuhxJV7pfQMzHaR6Ws2saYHI6bk2TldpQXC
-						BzvBJQvwHShZeIlmDzHVNPfpyqDYE0lO2XiqqnHEAImYHuNKoAvgj5jJcViFhWXI
-						ZhQMaxwU9/UVwOWO1REhWcd7KE+W2ELIgeySGijZmKquKTrOSqyFx3DKSxGdhFsk
-						nSUetQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.kgv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.kgv.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">King George V College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">KGV College - Latest</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kgv.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martyn</GivenName>
-    <SurName>Coleman</SurName>
-    <EmailAddress>mailto:mpc@kgv.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martyn</GivenName>
-    <SurName>Coleman</SurName>
-    <EmailAddress>mailto:mpc@kgv.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.ku.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.ku.edu-idp-shibboleth.xml
deleted file mode 100644
index e736312a..00000000
--- a/swamid-interfederations-2.0/shibidp.ku.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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://shibidp.ku.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://technology.ku.edu/personal-accounts" 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">ku.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Kansas</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of Kansas</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ku.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://policy.ku.edu/IT/info-access-control-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="139" width="180" xml:lang="en">https://webmedia.ku.edu/css/template2012/login/logo.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>
-MIIDIzCCAgugAwIBAgIUDA++q9rOZ3sgUuUAKIcSiarF79UwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOc2hpYmlkcC5rdS5lZHUwHhcNMTIwOTI0MjEyOTIyWhcN
-MzIwOTI0MjEyOTIyWjAZMRcwFQYDVQQDEw5zaGliaWRwLmt1LmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMn7ncS5QpUgnr8ORzo+LaSN5LEyh+f3
-8V9hAFJwrAA23dG8qAXP5OjqzZjyqLtW38dMaoh6TZHGGbCv+R5OM2nPSzp0d798
-4348ZR86bgz7qJHabSZ6ZpjJMzr0YSrHYyBUaR39JIBcX05GZd+Vo9yoA/sxnbS9
-dGZ1Ft3kPW33b5dviC+6EniDkuM0pntQ/UzmVQgDNZzUlRfIeQiL03z6yjBfPILf
-0dGqRXMxkvrFZcDtbYp+lS+A624Mxo9xYhtysPKd+pXVVi1SxqHps8F0W9NepJQD
-ZXZ48AEL6Ya9dv2OgrggOwjpXUlSK1/L3t0ilkn/VwavE8Co0KKaR9MCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOc2hpYmlkcC5rdS5lZHWGJWh0dHBzOi8vc2hpYmlkcC5r
-dS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFG8yu32aqrSfKvXLbhIUkzN4
-qxHDMA0GCSqGSIb3DQEBBQUAA4IBAQCCRwNh/6tHIbS3ORonmj5+4XnqXBQ7vg+x
-ZIwY4SEx/6AbkYxmvjHiAr6brqe3aTlMTfp2mit7O7ucOt0T7ifmj7dDatcIUxRu
-QNVyGISL1Jqo0Cf2Hbx/oBpZG0ZfQWp1yjRQEGIY0rPmoUAXiMwS84QejZaAhYEo
-/42bNCo5JZQWtbd2KpWdLLp25NH1m8c7zBkDQ667EspTc9GZRlHHGxwcHRwVpD92
-8VSJChX0odckTkyR9tIRsamzggitwOZFBcfe5tActER8pWSwoV3TI51wWUkgHCPC
-Whg3BytKZnscULFupWbLbJq8TAVX/WfUAomsXvqpxn+N1PEybPMC
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.ku.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.ku.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.ku.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.ku.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.ku.edu/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">ku.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUDA++q9rOZ3sgUuUAKIcSiarF79UwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOc2hpYmlkcC5rdS5lZHUwHhcNMTIwOTI0MjEyOTIyWhcN
-MzIwOTI0MjEyOTIyWjAZMRcwFQYDVQQDEw5zaGliaWRwLmt1LmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMn7ncS5QpUgnr8ORzo+LaSN5LEyh+f3
-8V9hAFJwrAA23dG8qAXP5OjqzZjyqLtW38dMaoh6TZHGGbCv+R5OM2nPSzp0d798
-4348ZR86bgz7qJHabSZ6ZpjJMzr0YSrHYyBUaR39JIBcX05GZd+Vo9yoA/sxnbS9
-dGZ1Ft3kPW33b5dviC+6EniDkuM0pntQ/UzmVQgDNZzUlRfIeQiL03z6yjBfPILf
-0dGqRXMxkvrFZcDtbYp+lS+A624Mxo9xYhtysPKd+pXVVi1SxqHps8F0W9NepJQD
-ZXZ48AEL6Ya9dv2OgrggOwjpXUlSK1/L3t0ilkn/VwavE8Co0KKaR9MCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOc2hpYmlkcC5rdS5lZHWGJWh0dHBzOi8vc2hpYmlkcC5r
-dS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFG8yu32aqrSfKvXLbhIUkzN4
-qxHDMA0GCSqGSIb3DQEBBQUAA4IBAQCCRwNh/6tHIbS3ORonmj5+4XnqXBQ7vg+x
-ZIwY4SEx/6AbkYxmvjHiAr6brqe3aTlMTfp2mit7O7ucOt0T7ifmj7dDatcIUxRu
-QNVyGISL1Jqo0Cf2Hbx/oBpZG0ZfQWp1yjRQEGIY0rPmoUAXiMwS84QejZaAhYEo
-/42bNCo5JZQWtbd2KpWdLLp25NH1m8c7zBkDQ667EspTc9GZRlHHGxwcHRwVpD92
-8VSJChX0odckTkyR9tIRsamzggitwOZFBcfe5tActER8pWSwoV3TI51wWUkgHCPC
-Whg3BytKZnscULFupWbLbJq8TAVX/WfUAomsXvqpxn+N1PEybPMC
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.ku.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.ku.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Kansas</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Kansas</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ku.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Information Technology Customer Service Center</md:GivenName>
-    <md:EmailAddress>itcsc@ku.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Information Technology System Integration</md:GivenName>
-    <md:EmailAddress>itsi@ku.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>InCommon Admin</md:GivenName>
-    <md:EmailAddress>incommon-admin@ku.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.luc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.luc.edu-idp-shibboleth.xml
deleted file mode 100644
index 733d691a..00000000
--- a/swamid-interfederations-2.0/shibidp.luc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://shibidp.luc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">luc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Loyola University of Chicago</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>
-MIIFGDCCBACgAwIBAgIJAMgsqvOPf0BMMA0GCSqGSIb3DQEBBQUAMIG4MQswCQYD
-VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xHjAc
-BgNVBAoTFVVuaXZlcnNpdHkgb2YgQ2hpY2FnbzEoMCYGA1UECxMfSW5mb3JtYXRp
-b24gVGVjaG5vbG9neSBTZXJ2aWNlczEYMBYGA1UEAxMPc2hpYmlkcC5sdWMuZWR1
-MSAwHgYJKoZIhvcNAQkBFhFkbnMtYWRtaW5AbHVjLmVkdTAeFw0xMzA1MTcxOTIw
-NDNaFw0xODA1MTgxOTIwNDNaMIG4MQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxs
-aW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xHjAcBgNVBAoTFVVuaXZlcnNpdHkgb2Yg
-Q2hpY2FnbzEoMCYGA1UECxMfSW5mb3JtYXRpb24gVGVjaG5vbG9neSBTZXJ2aWNl
-czEYMBYGA1UEAxMPc2hpYmlkcC5sdWMuZWR1MSAwHgYJKoZIhvcNAQkBFhFkbnMt
-YWRtaW5AbHVjLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPaB
-oFEEJ8SB3HPYxRlz+AP8kqfvxXZUg3qW1SUOdR61LNQ3H105Mn87JNEOBJI0fXKD
-GhP52UeXy6VCGWiCW424GVvPqCC0iqDE+MOnQd7AVarUsERF53ngfJLw7UT89CA0
-TuoHwMqG9t2N7f8RYe3m7MoHPfE2gccfKUvA7gXj/licMNCLJnDvYHBERud0ljpm
-MAYc8+eqhBCsouumiofrFeotfNverU03OasKptJZ21nu6o7tCoz2FgTIRWlHtyEz
-T8bjHG+TYyEaW/4vhcwCvCyPEm76GLhSLKd8Ye7ZLPNMJEcX8zOR+ah1jJlFILzP
-Kh3/Q/Zdm99ztv+YlUcCAwEAAaOCASEwggEdMB0GA1UdDgQWBBSnFXtGoWXa2qok
-eiLJ+7t2DhemaDCB7QYDVR0jBIHlMIHigBSnFXtGoWXa2qokeiLJ+7t2DhemaKGB
-vqSBuzCBuDELMAkGA1UEBhMCVVMxETAPBgNVBAgTCElsbGlub2lzMRAwDgYDVQQH
-EwdDaGljYWdvMR4wHAYDVQQKExVVbml2ZXJzaXR5IG9mIENoaWNhZ28xKDAmBgNV
-BAsTH0luZm9ybWF0aW9uIFRlY2hub2xvZ3kgU2VydmljZXMxGDAWBgNVBAMTD3No
-aWJpZHAubHVjLmVkdTEgMB4GCSqGSIb3DQEJARYRZG5zLWFkbWluQGx1Yy5lZHWC
-CQDILKrzj39ATDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCwagY4
-6ZOKo7qE0bURa18HAKsNDltHriyEqmLfWulHrru4GybvoLbRG+CgPk/CVORQ4ISC
-qlMvC87ii3cX+zuGH6qEwUxiU4OkR0/bF6iMuLTvMZCZ8N4yBdSbmooICax7NbMd
-x7+QlahCJeChDx/na1jHXFk0PNxynKPf4sKdgXqdsaKUc0eT7gbOilG0O03RZp/k
-Sv1JUZ8WViWg/2H1ELeCnhc5MDvHCKZd2+tdm7vyi+9gQTuBUhTcAM68yqtMf9kA
-F4MhlfISGNByyfe+7TgWasEJjTyrX1UyNm4S219PsfZ1xvfk+5mv3ZgRnk/ioqB7
-l2CikVfLPoeavqtv
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.luc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.luc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.luc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.luc.edu/idp/profile/Shibboleth/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.luc.edu/idp/profile/Shibboleth/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">luc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFGDCCBACgAwIBAgIJAMgsqvOPf0BMMA0GCSqGSIb3DQEBBQUAMIG4MQswCQYD
-VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xHjAc
-BgNVBAoTFVVuaXZlcnNpdHkgb2YgQ2hpY2FnbzEoMCYGA1UECxMfSW5mb3JtYXRp
-b24gVGVjaG5vbG9neSBTZXJ2aWNlczEYMBYGA1UEAxMPc2hpYmlkcC5sdWMuZWR1
-MSAwHgYJKoZIhvcNAQkBFhFkbnMtYWRtaW5AbHVjLmVkdTAeFw0xMzA1MTcxOTIw
-NDNaFw0xODA1MTgxOTIwNDNaMIG4MQswCQYDVQQGEwJVUzERMA8GA1UECBMISWxs
-aW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xHjAcBgNVBAoTFVVuaXZlcnNpdHkgb2Yg
-Q2hpY2FnbzEoMCYGA1UECxMfSW5mb3JtYXRpb24gVGVjaG5vbG9neSBTZXJ2aWNl
-czEYMBYGA1UEAxMPc2hpYmlkcC5sdWMuZWR1MSAwHgYJKoZIhvcNAQkBFhFkbnMt
-YWRtaW5AbHVjLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPaB
-oFEEJ8SB3HPYxRlz+AP8kqfvxXZUg3qW1SUOdR61LNQ3H105Mn87JNEOBJI0fXKD
-GhP52UeXy6VCGWiCW424GVvPqCC0iqDE+MOnQd7AVarUsERF53ngfJLw7UT89CA0
-TuoHwMqG9t2N7f8RYe3m7MoHPfE2gccfKUvA7gXj/licMNCLJnDvYHBERud0ljpm
-MAYc8+eqhBCsouumiofrFeotfNverU03OasKptJZ21nu6o7tCoz2FgTIRWlHtyEz
-T8bjHG+TYyEaW/4vhcwCvCyPEm76GLhSLKd8Ye7ZLPNMJEcX8zOR+ah1jJlFILzP
-Kh3/Q/Zdm99ztv+YlUcCAwEAAaOCASEwggEdMB0GA1UdDgQWBBSnFXtGoWXa2qok
-eiLJ+7t2DhemaDCB7QYDVR0jBIHlMIHigBSnFXtGoWXa2qokeiLJ+7t2DhemaKGB
-vqSBuzCBuDELMAkGA1UEBhMCVVMxETAPBgNVBAgTCElsbGlub2lzMRAwDgYDVQQH
-EwdDaGljYWdvMR4wHAYDVQQKExVVbml2ZXJzaXR5IG9mIENoaWNhZ28xKDAmBgNV
-BAsTH0luZm9ybWF0aW9uIFRlY2hub2xvZ3kgU2VydmljZXMxGDAWBgNVBAMTD3No
-aWJpZHAubHVjLmVkdTEgMB4GCSqGSIb3DQEJARYRZG5zLWFkbWluQGx1Yy5lZHWC
-CQDILKrzj39ATDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCwagY4
-6ZOKo7qE0bURa18HAKsNDltHriyEqmLfWulHrru4GybvoLbRG+CgPk/CVORQ4ISC
-qlMvC87ii3cX+zuGH6qEwUxiU4OkR0/bF6iMuLTvMZCZ8N4yBdSbmooICax7NbMd
-x7+QlahCJeChDx/na1jHXFk0PNxynKPf4sKdgXqdsaKUc0eT7gbOilG0O03RZp/k
-Sv1JUZ8WViWg/2H1ELeCnhc5MDvHCKZd2+tdm7vyi+9gQTuBUhTcAM68yqtMf9kA
-F4MhlfISGNByyfe+7TgWasEJjTyrX1UyNm4S219PsfZ1xvfk+5mv3ZgRnk/ioqB7
-l2CikVfLPoeavqtv
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.luc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.luc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Loyola University of Chicago</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Loyola University of Chicago</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.luc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ITS</md:GivenName>
-    <md:EmailAddress>dns-admin@luc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 399ae35b..00000000
--- a/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.oca.eu/idp/shibboleth">
-  <md: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>
-  </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 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="en">Observatoire de la Côte d'Azur</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH6y5QEjNUMIJD1YBxkpOgkaJjEBAAAAAAYJDAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQGAAMEBg4BAwYYAAAFGQEFCWcAAwwoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAYOAgQGJgIEBjkAAgQ7AAIETTAiE7RONBv2Ujgcx1g8IQg6KRsFEA0KBgAAAAAAAAAAAAAAAAAAAAAAAAAAAgQGIQIEBikDBQcbAwICL0w1JdVZPin/XT8ifFw+H00AAAAAAAAABVc8KD5WPy1yAAAAAAAAAAAAAAAAAAAAAAIEBhYCBAYKAAAAAkw5LcBhRzb1RC8hak87L41BMik8TTkugTcpIzdPOi03WUAuSGVLO4YAAAAAAAAAAAAAAAACBAYEAAAAATksJ2BmTkH/blJBW0I1MI5mTkLdUT41TVlEOtpCMSkaOS0nRnFXSmhdRjqZcldLfzkbCwEAAAAAAAAAAAAAAAJVRD3AeV9U4SgiISxsVUzybFNJdlZEOzZsVUzKAAAACjksJiRnUki7QjMtN3JbUPN4YFYXAAAAAAAAAAAAAAAAa1dQ1oJqYMBKPjl6gmhfywAAAAgmIB8ic11VdVRGQEkAAAAAa1hQ4wAAAAt3Yln/gWlfMAAAAAAAAAAAAAAAAHBdVqCPeG3LYlJLe4p0aqIAAAACAAAADzEmJA9pV1BHXlBJZoRuZdsYFBQriHJo/4x1azMAAAAAAAAAAAAAAABqWVI1lYB10HZlXEiTfnKanId6HAAAAACNe28/jnxwZoNwZt6ZgXVtZlhRiJ2GePuVfnMfAAAAAAAAAAAAAAAAAAAAAJeDdmuslohloIt9U5qGeE55amAIlIF1q5+KfeCii36EYFZOLpyIe/SmkoK1qpGCAwAAAAAAAAAAAAAAAAAAAAAAAAAAsp2MiLijkjmwnIwZeWpgGp2Nfz+olodTnpCBN5WFd+O4opHgtqGRJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4pZIYqJaGIgAAAACQg3V+s6KQ2cKvnP7NuKXhx7SeJQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAy7ijO+HOtNfcyrCUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD16ccFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP//AAD//wAA+P8AAPP/AADldwAA6XcAAMtrAADL6wAAy+sAAOvTAAD/EwAA9+cAAP+PAAD/nwAA//8AAA==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.oca.eu</mdui:InformationURL>
-        <mdui:Description xml:lang="en">People with an OCA account.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Observatoire de la Côte d'Azur</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnes ayant un compte OCA.</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>
-					      MIIDQTCCAimgAwIBAgIJAOV7bDK2kJs0MA0GCSqGSIb3DQEBDQUAMDcxCzAJBgNV
-BAYTAkZSMQ8wDQYDVQQKDAZvY2EuZXUxFzAVBgNVBAMMDnNoaWJpZHAub2NhLmV1
-MB4XDTE1MDcyMDE3NDQzNVoXDTE4MDcxOTE3NDQzNVowNzELMAkGA1UEBhMCRlIx
-DzANBgNVBAoMBm9jYS5ldTEXMBUGA1UEAwwOc2hpYmlkcC5vY2EuZXUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPrcMzEvozMviR0Ux2TDQJ/IRM63bF
-KRhOTpY6DxVS2U3QShAgSfXCJ7vtcZuKsNkjDbItYOyrO2Qlz98dXKd3F5HYfH9E
-mpWuE9Y6R2LNTiC2rfuyzVSoNQthj3JkRFEjUlmU4V25wa+6tEC/+qL336MBsMCM
-K6SVjMh9Io8ypPhcvwa9fk0pjN62cEhB+oHBrKQhNUzw6QMw9eK7ES+MvrWdlmg0
-iAWXAnTvUkuHCCU9gHMSRwvrpBn7wEsBUftIvQJ4EycZqQe+y1PV/tGlKcUOoHva
-BxepDCXDMGOskD8UkroMxGk9mS/SKYvTnSjzzsctMf2cRSXlQAC+Z/zrAgMBAAGj
-UDBOMB0GA1UdDgQWBBQ2M1IiOnEUkA/Dad0vZnqEYzKVhTAfBgNVHSMEGDAWgBQ2
-M1IiOnEUkA/Dad0vZnqEYzKVhTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBDQUA
-A4IBAQAy/EICYQABN8gfoQbg40tAEtboKbgRVrTOGEDn3YIP8zkIx46YOvt1jPEL
-ElnJuCkgFLaP5BcqIa3Ao2JqhKc0vt9NB2+iFAoXLlKnX1qA9GQynclA2adrIlFs
-2CEIZNs37ch1jm8VN0h3kvUBGJPf6uwspnEbGhU7+iUpzBDMt1lhq5aC12IGtcYB
-KhTmiD1DrndtsdMrD9T69ra2BSW/MgUhuUOUisMqqJZNWDnrVG1bb1OBoC8zx1kV
-22klzEX/n1uKYUj1tmLdD8PgS+xD4qsYc4dUwdSc1Ee+jzy6Fw+IDlZWXETbwsd3
-4cPhU/7ZhxoTQe+Vryc61Cs97o5u
-					    </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>
-					      MIIDMzCCAhugAwIBAgIJAKyLcn7sL8vlMA0GCSqGSIb3DQEBDQUAMDAxCzAJBgNV
-BAYTAkZSMQ8wDQYDVQQKDAZvY2EuZXUxEDAOBgNVBAMMB3NoaWJpZHAwHhcNMTUw
-NzIwMTY0ODQyWhcNMTgwNzE5MTY0ODQyWjAwMQswCQYDVQQGEwJGUjEPMA0GA1UE
-CgwGb2NhLmV1MRAwDgYDVQQDDAdzaGliaWRwMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA86IDYElbcap9Jqk0pDhsu7EeOztWPT/9FHXBLk7F5MhEbtf8
-Ol+qpr/2iTFLAkFEmSFBeH3/GZAlCcHhqFK0jsX7CN4jD6YWGxBsW7ei83g96XzC
-68o7NwAhAOFXej8B91uKq57SE+yDHKfH5iijbmliedvyJp4D0vlHZam+wxOqCwlf
-wQ+ju4ObLWXhAJwBYrP1O61LLX67sXaucLlybNS2OCE42KuCXyKaf43Vvlqwqh+b
-MdrrQ31A3iZba/yNlAKlaFxaKRXh82lteUUlj+r1vEEMUs9vd2kNX5MMUnqG2c7J
-9eO38zQQFufw4jMUpTV5Yt+lNxfUZbRADbbzjQIDAQABo1AwTjAdBgNVHQ4EFgQU
-0TJHupykS7kfEFgzvKWOqD6jtaMwHwYDVR0jBBgwFoAU0TJHupykS7kfEFgzvKWO
-qD6jtaMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQ0FAAOCAQEAq1TPf+MQaFpU
-64zcP87Cea1Ox9aWlR7UARjo1f0ygghpK1dgAZAJRa6huXaQ5YqJFWGDl1JE39oC
-4RUvVnVo+sR2Lzt2Zih/NoDrV9lhvtszef7GsW6TYsNrUWnI/le9LrM4B9VgBkBm
-wNKbN68s2jw/u0c3NPLAI1EQYG5Z6qOXAuyBnAaKWlJ5UhhhIMLNVpgK+VjBfVmG
-NaSpjU0SpU2lWAsJWS7mfWjO9ZyNnhjhmlUatHEq9qjDMKdtlCfd4Mg6v3Sf5YiM
-Hi8WsKvOPJRSWmD7niI3qfMF07UU0OgCQ6eFhvh19E2MOi9lD6D10gd76QYZjAbg
-UfiJZdPA+g==
-					    </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-POST" Location="https://shibidp.oca.eu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.oca.eu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.oca.eu/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Observatoire de la Côte d'Azur</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Observatoire de la Côte d'Azur</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.oca.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi@oca.eu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml
deleted file mode 100644
index 220e769b..00000000
--- a/swamid-interfederations-2.0/shibidp.polimi.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,123 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.polimi.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polimi.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Politecnico di Milano</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Politecnico di Milano</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Politecnico di Milano users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti del Politecnico di Milano</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://aunicalogin.polimi.it/aunicalogin/idem.jsp</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.polimi.it/en/english-version/</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>
-MIIDjTCCAnWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCSVQx
-CzAJBgNVBAgTAk1JMQ4wDAYDVQQHEwVNaWxhbjEPMA0GA1UEChMGUE9MSU1JMQ4w
-DAYDVQQLEwVBU0lDVDEaMBgGA1UEAxMRc2hpYmlkcC5wb2xpbWkuaXQxIDAeBgkq
-hkiG9w0BCQEWEWhvc3RpbmdAcG9saW1pLml0MB4XDTE0MDIyMDExMDcwMFoXDTI2
-MDIyMDExMDcwMFowgYkxCzAJBgNVBAYTAklUMQswCQYDVQQIEwJNSTEOMAwGA1UE
-BxMFTWlsYW4xDzANBgNVBAoTBlBPTElNSTEOMAwGA1UECxMFQVNJQ1QxGjAYBgNV
-BAMTEXNoaWJpZHAucG9saW1pLml0MSAwHgYJKoZIhvcNAQkBFhFob3N0aW5nQHBv
-bGltaS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKhtqK271QYD
-CWbYMZSqPdm29Oh3yeOVC+6FyoU9i3DIHaiqRxa1yKlYHLx5oLgtPi8ASDzXPfMo
-6MGVGYLOzCe/Y2efdJyz1Pqguna+8jfDtm1MeNCrjYd/cTp5gr/HGZGz262dSmIM
-WrWloF7Zg3jwsXvJYO0wCHLsKVRul7vdosPX7Jy9pIxTO1ZJMZCa/NASWMqf1i+B
-tYVpJqMQZJ85H9pEnu+6dBJMz6QM67zL9WnncMUz1ANkCkLX6mAFV9sydjTXPKrK
-hBBCZF44HOdiIbeZ+NKBZLeirVNALptmTxMg1bNYR2eeys9pdht7qdrvDcBziy5E
-tVFwmsFxMF8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEApV/JH6zxNIBuB/8zTbO7
-K/uJsh14u/ihkWxCwGJoZTKSttIwlH2Y0+R8fQW/+ZV/aOT3vzJzxJJ/WL6x9Bku
-mlaYSnZ+zD0fQWWWSGK/ncqELDCE35h2B5/hmJ0wSHZewPTPRhvptIYsEFzr9Gr4
-hja1IylB5u+kXNOgR5XJvoojnI1855S/N1p6Y+JUfJKCTciw/0w8Kqlz5Hs9/GHt
-WRQMqSSzXV/Ti6l+6Mu2wvg0LSH2F9XZjN49ZX1E4LPcB8ChCzmrMf87+9+tru9C
-Y00stxLKVpXdX8pXFj3zFusdHk7fSeE4cCUYQvN7+Jyy7uSEM10eED6xOqvPw31n
-oA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIICbDCCAdWgAwIBAgIBATANBgkqhkiG9w0BAQUFADB8MQswCQYDVQQGEwJJVDEO
-MAwGA1UEBxMFTWlsYW4xDzANBgNVBAoTBlBPTElNSTEOMAwGA1UECxMFQVNJQ1Qx
-GjAYBgNVBAMTEXNoaWJpZHAucG9saW1pLml0MSAwHgYJKoZIhvcNAQkBFhFob3N0
-aW5nQHBvbGltaS5pdDAeFw0xMTA5MjYxMDE1NDJaFw0xNjA5MjQxMDE1NDJaMHwx
-CzAJBgNVBAYTAklUMQ4wDAYDVQQHEwVNaWxhbjEPMA0GA1UEChMGUE9MSU1JMQ4w
-DAYDVQQLEwVBU0lDVDEaMBgGA1UEAxMRc2hpYmlkcC5wb2xpbWkuaXQxIDAeBgkq
-hkiG9w0BCQEWEWhvc3RpbmdAcG9saW1pLml0MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQCjz71cLVbMNyigmSb65PrEOwyeox5VBxHiopdI1yKsbbyptChP67hK
-nXYogljqpFRzBloaqwJy5UT8gkCMohhtf2VQTfVYtxnrs33BXgy/+UrJRZnBcbu7
-JspXHcxOB4XWLooiNQDbHOFCvh+oHPpqDg3WFA0HJVfHi2mTZkra5wIDAQABMA0G
-CSqGSIb3DQEBBQUAA4GBAJOfpmXgkDQR7Eo3lwD1Q1s7425CHjYk0q/ZHehe4IBW
-0e9EjP+b3vfUE1M2FNWE3xdMwIc5ZzCkpy8C1K+Kur2AIDGmYGUSOJDxh89ZgaK1
-rO0iogFcYXXs7FpNjcZAv77ur9aGaFZhBzqhHA1KK1ovrRVssBQ1BXt9kWmU5QBu
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.polimi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.polimi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.polimi.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.polimi.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.polimi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.polimi.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">polimi.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIICbDCCAdWgAwIBAgIBATANBgkqhkiG9w0BAQUFADB8MQswCQYDVQQGEwJJVDEO
-MAwGA1UEBxMFTWlsYW4xDzANBgNVBAoTBlBPTElNSTEOMAwGA1UECxMFQVNJQ1Qx
-GjAYBgNVBAMTEXNoaWJpZHAucG9saW1pLml0MSAwHgYJKoZIhvcNAQkBFhFob3N0
-aW5nQHBvbGltaS5pdDAeFw0xMTA5MjYxMDE1NDJaFw0xNjA5MjQxMDE1NDJaMHwx
-CzAJBgNVBAYTAklUMQ4wDAYDVQQHEwVNaWxhbjEPMA0GA1UEChMGUE9MSU1JMQ4w
-DAYDVQQLEwVBU0lDVDEaMBgGA1UEAxMRc2hpYmlkcC5wb2xpbWkuaXQxIDAeBgkq
-hkiG9w0BCQEWEWhvc3RpbmdAcG9saW1pLml0MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQCjz71cLVbMNyigmSb65PrEOwyeox5VBxHiopdI1yKsbbyptChP67hK
-nXYogljqpFRzBloaqwJy5UT8gkCMohhtf2VQTfVYtxnrs33BXgy/+UrJRZnBcbu7
-JspXHcxOB4XWLooiNQDbHOFCvh+oHPpqDg3WFA0HJVfHi2mTZkra5wIDAQABMA0G
-CSqGSIb3DQEBBQUAA4GBAJOfpmXgkDQR7Eo3lwD1Q1s7425CHjYk0q/ZHehe4IBW
-0e9EjP+b3vfUE1M2FNWE3xdMwIc5ZzCkpy8C1K+Kur2AIDGmYGUSOJDxh89ZgaK1
-rO0iogFcYXXs7FpNjcZAv77ur9aGaFZhBzqhHA1KK1ovrRVssBQ1BXt9kWmU5QBu
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.polimi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.polimi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Politecnico di Milano Identity Provider</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Politecnico di Milano Identity Provider</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Politecnico di Milano</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Politecnico di Milano</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://shibidp.polimi.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://shibidp.polimi.it/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Gaffuri</md:SurName>
-    <md:EmailAddress>mailto:roberto.gaffuri@polimi.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idem@polimi.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.syr.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.syr.edu-idp-shibboleth.xml
deleted file mode 100644
index 1b010020..00000000
--- a/swamid-interfederations-2.0/shibidp.syr.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://shibidp.syr.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</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">syr.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Syracuse University</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>
-MIIDJzCCAg+gAwIBAgIUVVcomBH8KzJQ9YGnfZRbSd7sVU4wDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYmlkcC5zeXIuZWR1MB4XDTEzMDMyNjEyMDMwM1oX
-DTMzMDMyNjEyMDMwM1owGjEYMBYGA1UEAxMPc2hpYmlkcC5zeXIuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnXRD/fcJFieSaqGw8BVPDNtxCf8R
-j+g8VCkN5fD8bMpFo/aPBoxMAsHstvsdxUZVNy66rarz63Yo79lgCG66APGIx0TK
-UFfFTKx/rWHWfMn2k4/mJydQrxElJfGmiJySXZcqprLIjLxk+kfhH24I4eewnuq5
-ilgdx9PXl0ZVzOg3klOQKV4xvlgmSpUcuY18ziA5NO9CH+uaXg4rj4poqNu/w58O
-jweoQALZiissFa1W6aIiwJswq/XIbTLcxSWc+QhcOIq7c8eAbKRL7i51sZMAYFOd
-gjlAHw8UcSkm9ibah6p3lFYgHbVQ98f5+fQGhJcHbmjaqr1cOj4Mm1weCwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliaWRwLnN5ci5lZHWGJmh0dHBzOi8vc2hpYmlk
-cC5zeXIuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRfOAeHe266XIh5TjMW
-VrQ7WVWzvDANBgkqhkiG9w0BAQUFAAOCAQEAOBXMtSTx1Q9DRC8jU5AJX4tB7XML
-GynS/IT2cxHtRHt5bpukveikqh+vokQf3Vq09pUk8HMXqBvdhPIhIt4wTFapdQwy
-rcuH6S22woObDp/piQegOJ85tZO/0vq6oMfwU03o6y9wcZAKpQp+2uWIaVJszXWs
-TRgUSKBwLA0z3ual+MQ5FDr+flqoThn4OFHxXxjyp4MBd2o5eyMGyCiZ0JH+s0Hc
-5WVUMo7am2UIynA+j+rhpm5rQhTXjkEA1lTHtqDOnALwKzGsXh5trle0tBcs1B1M
-2fzviLyo4jkmqs5KbWl2c5jut2uUl8jmJ6588cy0BHKiiJOwd/+bFTJF8Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.syr.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.syr.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.syr.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.syr.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.syr.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.syr.edu/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">syr.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUVVcomBH8KzJQ9YGnfZRbSd7sVU4wDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYmlkcC5zeXIuZWR1MB4XDTEzMDMyNjEyMDMwM1oX
-DTMzMDMyNjEyMDMwM1owGjEYMBYGA1UEAxMPc2hpYmlkcC5zeXIuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnXRD/fcJFieSaqGw8BVPDNtxCf8R
-j+g8VCkN5fD8bMpFo/aPBoxMAsHstvsdxUZVNy66rarz63Yo79lgCG66APGIx0TK
-UFfFTKx/rWHWfMn2k4/mJydQrxElJfGmiJySXZcqprLIjLxk+kfhH24I4eewnuq5
-ilgdx9PXl0ZVzOg3klOQKV4xvlgmSpUcuY18ziA5NO9CH+uaXg4rj4poqNu/w58O
-jweoQALZiissFa1W6aIiwJswq/XIbTLcxSWc+QhcOIq7c8eAbKRL7i51sZMAYFOd
-gjlAHw8UcSkm9ibah6p3lFYgHbVQ98f5+fQGhJcHbmjaqr1cOj4Mm1weCwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliaWRwLnN5ci5lZHWGJmh0dHBzOi8vc2hpYmlk
-cC5zeXIuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRfOAeHe266XIh5TjMW
-VrQ7WVWzvDANBgkqhkiG9w0BAQUFAAOCAQEAOBXMtSTx1Q9DRC8jU5AJX4tB7XML
-GynS/IT2cxHtRHt5bpukveikqh+vokQf3Vq09pUk8HMXqBvdhPIhIt4wTFapdQwy
-rcuH6S22woObDp/piQegOJ85tZO/0vq6oMfwU03o6y9wcZAKpQp+2uWIaVJszXWs
-TRgUSKBwLA0z3ual+MQ5FDr+flqoThn4OFHxXxjyp4MBd2o5eyMGyCiZ0JH+s0Hc
-5WVUMo7am2UIynA+j+rhpm5rQhTXjkEA1lTHtqDOnALwKzGsXh5trle0tBcs1B1M
-2fzviLyo4jkmqs5KbWl2c5jut2uUl8jmJ6588cy0BHKiiJOwd/+bFTJF8Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.syr.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.syr.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Syracuse University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Syracuse University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.syr.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Cynthia Hoalcraft</md:GivenName>
-    <md:EmailAddress>clhoalcr@syr.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Steve Leonard</md:GivenName>
-    <md:EmailAddress>sleonard@syr.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kelly Fallon</md:GivenName>
-    <md:EmailAddress>kjfallon@syr.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.tameside.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.tameside.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 6d5b567a..00000000
--- a/swamid-interfederations-2.0/shibidp.tameside.ac.uk-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://shibidp.tameside.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Tameside College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-09-17T16:46:36Z">
-      <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">tameside.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUFPl+UkOqD1xU344a+Z5gAA9KFhIwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWc2hpYmlkcC50YW1lc2lkZS5hYy51azAeFw0xMzEwMDMw
-						ODA2MDBaFw0zMzEwMDMwODA2MDBaMCExHzAdBgNVBAMTFnNoaWJpZHAudGFtZXNp
-						ZGUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtwxXIV0H0
-						N3Tn9kfx0vEjWwtR0RDsCQ5NIe4yemy1Ko/QcHoT55G0znKHbDyfufcP2C9hoqzd
-						cxWhDY21aYKNUUPCiwyA3y8IjfEfDXc/zN564SI1rXt0e8IyfzTegr7nEZ4pIzb3
-						ZsOvvZw/guS3SFRT8I/Y4+mQHAeBxYEFHhQEyTAzEa1CkMbQ5g0DBZaZLoem+WR+
-						Qe5522Hqix5Vx2Dy7ttKe+5mItJAbSGI17p9r6StS7VKBpGfODeoHMIoGcMH5kWs
-						79URYp9/KsJvK5xUQIxXYST21lM62fnaOjsNccCMT+6FT0bx/C4khty+ObYdDxWX
-						ZfbKM6X7b1uTAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJpZHAudGFtZXNpZGUu
-						YWMudWuGLWh0dHBzOi8vc2hpYmlkcC50YW1lc2lkZS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUXwU/7iPk5goOeUXikZ1DAsV1Z1UwDQYJKoZIhvcNAQEF
-						BQADggEBABuP25r95KICsuJ/DnQFVPFxzrHFt76smE3HPMGaxxZUmyijN/llqzVx
-						YqCeoMNc5mt0RKgd0FUl/ksik2tKc2J7LhFEaPSjPAGmT6ELbhTwU+/Fgnusy4tX
-						FE0VKaEDasnf6Ohel5aDDVPkFO1zTAGTm7PtXspdEe0v4JiDTqsDCe3fnu2gEdPL
-						w7TLUC8hL0gwos9S/WdgKCvIve41DEj6Y6n03Z2dCtlMMQbvt7OPDNpQRKssj2QV
-						e0DJl3bx82dv2VE65r/Ugzfu95M9GnIVTX6GZ/S6ey2/mYNi8/7XNkdk5Y5OLnP7
-						2e4BhZ7ipNcvA3dRv8lUFszj/juA6xM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.tameside.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.tameside.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://shibidp.tameside.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.tameside.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.tameside.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.tameside.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">tameside.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUFPl+UkOqD1xU344a+Z5gAA9KFhIwDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWc2hpYmlkcC50YW1lc2lkZS5hYy51azAeFw0xMzEwMDMw
-						ODA2MDBaFw0zMzEwMDMwODA2MDBaMCExHzAdBgNVBAMTFnNoaWJpZHAudGFtZXNp
-						ZGUuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtwxXIV0H0
-						N3Tn9kfx0vEjWwtR0RDsCQ5NIe4yemy1Ko/QcHoT55G0znKHbDyfufcP2C9hoqzd
-						cxWhDY21aYKNUUPCiwyA3y8IjfEfDXc/zN564SI1rXt0e8IyfzTegr7nEZ4pIzb3
-						ZsOvvZw/guS3SFRT8I/Y4+mQHAeBxYEFHhQEyTAzEa1CkMbQ5g0DBZaZLoem+WR+
-						Qe5522Hqix5Vx2Dy7ttKe+5mItJAbSGI17p9r6StS7VKBpGfODeoHMIoGcMH5kWs
-						79URYp9/KsJvK5xUQIxXYST21lM62fnaOjsNccCMT+6FT0bx/C4khty+ObYdDxWX
-						ZfbKM6X7b1uTAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJpZHAudGFtZXNpZGUu
-						YWMudWuGLWh0dHBzOi8vc2hpYmlkcC50YW1lc2lkZS5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUXwU/7iPk5goOeUXikZ1DAsV1Z1UwDQYJKoZIhvcNAQEF
-						BQADggEBABuP25r95KICsuJ/DnQFVPFxzrHFt76smE3HPMGaxxZUmyijN/llqzVx
-						YqCeoMNc5mt0RKgd0FUl/ksik2tKc2J7LhFEaPSjPAGmT6ELbhTwU+/Fgnusy4tX
-						FE0VKaEDasnf6Ohel5aDDVPkFO1zTAGTm7PtXspdEe0v4JiDTqsDCe3fnu2gEdPL
-						w7TLUC8hL0gwos9S/WdgKCvIve41DEj6Y6n03Z2dCtlMMQbvt7OPDNpQRKssj2QV
-						e0DJl3bx82dv2VE65r/Ugzfu95M9GnIVTX6GZ/S6ey2/mYNi8/7XNkdk5Y5OLnP7
-						2e4BhZ7ipNcvA3dRv8lUFszj/juA6xM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.tameside.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.tameside.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">Tameside College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Tameside College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tameside.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Albert</GivenName>
-    <SurName>Peach</SurName>
-    <EmailAddress>mailto:apeach@tameside.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Albert</GivenName>
-    <SurName>Peach</SurName>
-    <EmailAddress>mailto:apeach@tameside.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml
deleted file mode 100644
index cb97e1d8..00000000
--- a/swamid-interfederations-2.0/shibidp.to.cnr.it-idp-shibboleth.xml
+++ /dev/null
@@ -1,121 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.to.cnr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ivv.cnr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CNR IPSP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">CNR IPSP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for CNR IPSP Turin users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Torino del CNR IPSP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.to.cnr.it/index.php/contatti</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.to.cnr.it/index.php/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIElDCCA3ygAwIBAgIQbmgQNrDfCy1Vf7XBczhplTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbjELMAkGA1UE
-BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
-bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGjAYBgNVBAMTEXNoaWJpZHAudG8u
-Y25yLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVcNLT6xsJ8G
-dRHnHyBTfHOfe4OfgM4TylvG19un1euBULZEN5tDbbAZssX/on1N0LOhdcfhmi1x
-fVUQiyVf9Sbd8WicMuCHBfMRTylyPmyMS2Z398G8Vwy33o75Z8G3F6bXXKlLA0/J
-uLVFnNURX9lr4nfA8/309lRKoKVwAeSfHnMnrPbfChGN8mXxpCQygG/759ji+plk
-5DVvFhvPR/x1xVuYbrdAv/NbU1oBI4fVMzezwZkBxcZTBCewxgXVRR3/XZvQBPAL
-iICbJ6JHman13XLmUarrzmYzlK+eMHqkhksR4pU80IhuMd9ImFh9NAOvpl84BvcN
-/kTnRRvsSwIDAQABo4IBZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFFOg1tTJhlKw+kdxyVXznQztzUaSMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
-dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
-BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
-bmEub3JnMBwGA1UdEQQVMBOCEXNoaWJpZHAudG8uY25yLml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQAn2QUgPIrMj5axwXQZ3DRdYICGToeZDt7OQTefoL38/lXx+msooHrH
-nCahg5fLkpxYx3eFLw/gfNcOoiXKe44oq6/lygg4ZoIKk81stcnxO0zm0w5P70ZN
-XEGKqcxD/uOM+VAVSFhHt4X2uZBBi5xeSQuOm4zG5rWzLz+KobBj9fcgrYn4AasW
-cITaZl/8c52MqyPOkBO1JSJce0RIGLVtQqgpCS5m+u1FtaxA/A5FxDBMW1HxodnP
-HvlG8PNgeM6dbExE/Kli1DjCbpmDaDpeRB/F3jemASDp0ZkFYf8HTU++WWB0tZdk
-MfjrxHcURjQu4WndL3iDdR1DMImDHyBu
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.to.cnr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.to.cnr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.to.cnr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.to.cnr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.to.cnr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.to.cnr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ivv.cnr.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIElDCCA3ygAwIBAgIQbmgQNrDfCy1Vf7XBczhplTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExNTAwMDAwMFoXDTE2MDEzMTIzNTk1OVowbjELMAkGA1UE
-BhMCSVQxQzBBBgNVBAoTOkNOUiAtIElzdGl0dXRvIGRpIFJpY2VyY2Egc3VsbCdJ
-bXByZXNhIGxvIFN2aWx1cHBvIChDRVJJUykxGjAYBgNVBAMTEXNoaWJpZHAudG8u
-Y25yLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVcNLT6xsJ8G
-dRHnHyBTfHOfe4OfgM4TylvG19un1euBULZEN5tDbbAZssX/on1N0LOhdcfhmi1x
-fVUQiyVf9Sbd8WicMuCHBfMRTylyPmyMS2Z398G8Vwy33o75Z8G3F6bXXKlLA0/J
-uLVFnNURX9lr4nfA8/309lRKoKVwAeSfHnMnrPbfChGN8mXxpCQygG/759ji+plk
-5DVvFhvPR/x1xVuYbrdAv/NbU1oBI4fVMzezwZkBxcZTBCewxgXVRR3/XZvQBPAL
-iICbJ6JHman13XLmUarrzmYzlK+eMHqkhksR4pU80IhuMd9ImFh9NAOvpl84BvcN
-/kTnRRvsSwIDAQABo4IBZDCCAWAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-6pDjue0wHQYDVR0OBBYEFFOg1tTJhlKw+kdxyVXznQztzUaSMA4GA1UdDwEB/wQE
-AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0
-dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUF
-BwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJl
-bmEub3JnMBwGA1UdEQQVMBOCEXNoaWJpZHAudG8uY25yLml0MA0GCSqGSIb3DQEB
-BQUAA4IBAQAn2QUgPIrMj5axwXQZ3DRdYICGToeZDt7OQTefoL38/lXx+msooHrH
-nCahg5fLkpxYx3eFLw/gfNcOoiXKe44oq6/lygg4ZoIKk81stcnxO0zm0w5P70ZN
-XEGKqcxD/uOM+VAVSFhHt4X2uZBBi5xeSQuOm4zG5rWzLz+KobBj9fcgrYn4AasW
-cITaZl/8c52MqyPOkBO1JSJce0RIGLVtQqgpCS5m+u1FtaxA/A5FxDBMW1HxodnP
-HvlG8PNgeM6dbExE/Kli1DjCbpmDaDpeRB/F3jemASDp0ZkFYf8HTU++WWB0tZdk
-MfjrxHcURjQu4WndL3iDdR1DMImDHyBu
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.to.cnr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.to.cnr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Consiglio Nazionale delle Ricerche (CNR)</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Research Council (CNR)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">CNR IPSP</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CNR IPSP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.ipsp.cnr.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ipsp.cnr.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Giancarlo Birello</md:SurName>
-    <md:EmailAddress>mailto:giancarlo.birello@ircres.cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:supporto@to.cnr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.uclan.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.uclan.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 5cec142d..00000000
--- a/swamid-interfederations-2.0/shibidp.uclan.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://shibidp.uclan.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Central Lancashire.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">uclan.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Central Lancashire</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://shibidp.uclan.ac.uk/shib_icons/shib_logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shibidp.uclan.ac.uk/shib_icons/shib_16_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>
-						MIIDNzCCAh+gAwIBAgIUSKz+Pzg6MzaPsUgoAoOA39vnnNowDQYJKoZIhvcNAQEF
-						BQAwHjEcMBoGA1UEAxMTc2hpYmlkcC51Y2xhbi5hYy51azAeFw0xMDAxMTUxMDQ2
-						NTNaFw0zMDAxMTUxMDQ2NTNaMB4xHDAaBgNVBAMTE3NoaWJpZHAudWNsYW4uYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCGynbwRAulpAV+OM9i
-						+3U2cgeSZ9mAHMCKzC6gwA8hzFfKy950l0F5hCWwsr/vIuGGfPaR9MRUQ8KJB/O1
-						A/FpHnXd8yYXAac8OWCgn7/SRv/mfkAavse86Z8pve/7UiQCPFSQP8flvBS2PIt9
-						8Bq2J7qHUyFdYl9XEw0aJ2YNxOj3ixCpzcMGp6TY0agSX6OikkjhG2sazNgOZeXt
-						ZC8tqUVw/Ugq+yA7CT/ukLFJhNcXltjQlL72LO43/BrREI+JSQnysSc9yjA6dCXi
-						KVmZmOKVr9m4baagQmvqgYAGsar3Eoxxjny3ZU9zcQJtqiMt+UgMW1PKiiySXXru
-						LpHPAgMBAAGjbTBrMEoGA1UdEQRDMEGCE3NoaWJpZHAudWNsYW4uYWMudWuGKmh0
-						dHBzOi8vc2hpYmlkcC51Y2xhbi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-						FgQU9qLDsRWZbj/L90KawITJWhL6MtUwDQYJKoZIhvcNAQEFBQADggEBAATyYytE
-						tX+7PJtIs6xzaA4ojgWYS/eJDBcwhulsCKWGbx/V+msGhcnTwiQibqLfIsXteSpm
-						iWeOxqR+VLsNqp0joIkm3xmi+oh207O7e9BzyuqxQViM2Y5/nHz5Cfp4XI5rt4NP
-						DQjdNXBz6C7DxHWMKx2UAdY6MfHKeLpZw6HhSR/3Jd4HMWTC8RAU5qto8RrTuKkD
-						y7VbRz7Q3F0I9B8KBxUR+PMnj44UKJTHADSIr6Zd9usBxRabe5fKGftkquEWWiXG
-						weHFK1mmzgO5pFZlnMlfNXETio2pjmd2xImp3MsVxjQwXaIA/BDUOWKgJOS+usLP
-						w0iuQVGHNW3BFZA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uclan.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.uclan.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://shibidp.uclan.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.uclan.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.uclan.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.uclan.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">uclan.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUSKz+Pzg6MzaPsUgoAoOA39vnnNowDQYJKoZIhvcNAQEF
-						BQAwHjEcMBoGA1UEAxMTc2hpYmlkcC51Y2xhbi5hYy51azAeFw0xMDAxMTUxMDQ2
-						NTNaFw0zMDAxMTUxMDQ2NTNaMB4xHDAaBgNVBAMTE3NoaWJpZHAudWNsYW4uYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCGynbwRAulpAV+OM9i
-						+3U2cgeSZ9mAHMCKzC6gwA8hzFfKy950l0F5hCWwsr/vIuGGfPaR9MRUQ8KJB/O1
-						A/FpHnXd8yYXAac8OWCgn7/SRv/mfkAavse86Z8pve/7UiQCPFSQP8flvBS2PIt9
-						8Bq2J7qHUyFdYl9XEw0aJ2YNxOj3ixCpzcMGp6TY0agSX6OikkjhG2sazNgOZeXt
-						ZC8tqUVw/Ugq+yA7CT/ukLFJhNcXltjQlL72LO43/BrREI+JSQnysSc9yjA6dCXi
-						KVmZmOKVr9m4baagQmvqgYAGsar3Eoxxjny3ZU9zcQJtqiMt+UgMW1PKiiySXXru
-						LpHPAgMBAAGjbTBrMEoGA1UdEQRDMEGCE3NoaWJpZHAudWNsYW4uYWMudWuGKmh0
-						dHBzOi8vc2hpYmlkcC51Y2xhbi5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-						FgQU9qLDsRWZbj/L90KawITJWhL6MtUwDQYJKoZIhvcNAQEFBQADggEBAATyYytE
-						tX+7PJtIs6xzaA4ojgWYS/eJDBcwhulsCKWGbx/V+msGhcnTwiQibqLfIsXteSpm
-						iWeOxqR+VLsNqp0joIkm3xmi+oh207O7e9BzyuqxQViM2Y5/nHz5Cfp4XI5rt4NP
-						DQjdNXBz6C7DxHWMKx2UAdY6MfHKeLpZw6HhSR/3Jd4HMWTC8RAU5qto8RrTuKkD
-						y7VbRz7Q3F0I9B8KBxUR+PMnj44UKJTHADSIr6Zd9usBxRabe5fKGftkquEWWiXG
-						weHFK1mmzgO5pFZlnMlfNXETio2pjmd2xImp3MsVxjQwXaIA/BDUOWKgJOS+usLP
-						w0iuQVGHNW3BFZA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uclan.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.uclan.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 Central Lancashire</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Central Lancashire</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uclan.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Guy</GivenName>
-    <SurName>Heatley</SurName>
-    <EmailAddress>mailto:grheatley@uclan.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Malcolm</GivenName>
-    <SurName>Lowe</SurName>
-    <EmailAddress>mailto:MJLowe@uclan.ac.uk</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 70bf0ccd..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.unipr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:44.76630697035048,10.314061939716339</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.unipr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.unipr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.unipr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.unipr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.unipr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipr.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.unipr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.unipr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Parma</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Parma</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Parma</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Parma</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unipr.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://en.unipr.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Panella</md:SurName>
-    <md:EmailAddress>mailto:idem@unipr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.uwo.ca-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.uwo.ca-idp-shibboleth.xml
deleted file mode 100644
index 2d9515f1..00000000
--- a/swamid-interfederations-2.0/shibidp.uwo.ca-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://shibidp.uwo.ca/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2015-04-08T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-http://www.canarie.ca/templates/services/docs/CAF_join_en.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">uwo.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Western Ontario</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Western Ontario</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uwo.ca</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUHu68aG+ypoAo35nJ065wP9seHlAwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOc2hpYmlkcC51d28uY2EwHhcNMTAxMjA5MTgzNzA2WhcN
-MzAxMjA5MTgzNzA2WjAZMRcwFQYDVQQDEw5zaGliaWRwLnV3by5jYTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJjE2nZkhVprRxjFk/p9noiDzlJ+E9P5
-/5Xu4rvHl4MgS1HCKRaafPabQ/E1V/rxYfXWBnl8td8obnZgXz0letf6976F8+Vm
-tuJ/mkXaeqbH1tEd9yOHCvmsre42Hfjto1lsuRoa85fmRJIzaRoxmsNXfCEDj84N
-hNXvvdWafI56rEwM0dV/0+b0dfxGyUDGbfsMVgCwMUa4Ya8ojvQUksLE4Y36WDfv
-qthW620BefvPuGnS2NUO3Kl6Cg9qzqLIr1nzvZvNrfBAEeMCjE8Cgg5snNmmAY+H
-NiC+QtTZ3ZFgva6lHGn0JX/8mUd1NG6UqSsbVHMJ42JNcQm/QLe0xDcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOc2hpYmlkcC51d28uY2GGJWh0dHBzOi8vc2hpYmlkcC51
-d28uY2EvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKKnJSjJugiONjm1ywm7/lDo
-uF1yMA0GCSqGSIb3DQEBBQUAA4IBAQCExnbVX0deoMmDW5tBYHy9tMmKCNCZiN3j
-+QH74ln4XCisGxy0gs8ZapVUP0X96bqhaGbym9ZJbFgHpwfXSElaMBEQbqhQokyq
-l7diPjKXjpU05Q5nhZZmNNY6a9dyPcyfKlvk5N8f95TbMf/yOY5eY7UHkP0O7YVa
-vp/ydJZ440q0UrF+OYk2/5e189gaN29GYDYA7EyDpytm9fZ8VYqI971jSOpL3kdn
-0fE7zOUe938KjLSx9YTJKthJHO+8pYGKHtS6d72LVaVSGtcQe6nLSPcP/k5Kvsmi
-M7uVja22Aj1EEVKZzF23JRNlkuqp1T6fi59hN+Y16Za36mfF1yTC
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uwo.ca:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.uwo.ca: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:emailaddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailaddress</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.uwo.ca/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.uwo.ca/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.uwo.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.uwo.ca/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">uwo.ca</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUHu68aG+ypoAo35nJ065wP9seHlAwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOc2hpYmlkcC51d28uY2EwHhcNMTAxMjA5MTgzNzA2WhcN
-MzAxMjA5MTgzNzA2WjAZMRcwFQYDVQQDEw5zaGliaWRwLnV3by5jYTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJjE2nZkhVprRxjFk/p9noiDzlJ+E9P5
-/5Xu4rvHl4MgS1HCKRaafPabQ/E1V/rxYfXWBnl8td8obnZgXz0letf6976F8+Vm
-tuJ/mkXaeqbH1tEd9yOHCvmsre42Hfjto1lsuRoa85fmRJIzaRoxmsNXfCEDj84N
-hNXvvdWafI56rEwM0dV/0+b0dfxGyUDGbfsMVgCwMUa4Ya8ojvQUksLE4Y36WDfv
-qthW620BefvPuGnS2NUO3Kl6Cg9qzqLIr1nzvZvNrfBAEeMCjE8Cgg5snNmmAY+H
-NiC+QtTZ3ZFgva6lHGn0JX/8mUd1NG6UqSsbVHMJ42JNcQm/QLe0xDcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOc2hpYmlkcC51d28uY2GGJWh0dHBzOi8vc2hpYmlkcC51
-d28uY2EvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFKKnJSjJugiONjm1ywm7/lDo
-uF1yMA0GCSqGSIb3DQEBBQUAA4IBAQCExnbVX0deoMmDW5tBYHy9tMmKCNCZiN3j
-+QH74ln4XCisGxy0gs8ZapVUP0X96bqhaGbym9ZJbFgHpwfXSElaMBEQbqhQokyq
-l7diPjKXjpU05Q5nhZZmNNY6a9dyPcyfKlvk5N8f95TbMf/yOY5eY7UHkP0O7YVa
-vp/ydJZ440q0UrF+OYk2/5e189gaN29GYDYA7EyDpytm9fZ8VYqI971jSOpL3kdn
-0fE7zOUe938KjLSx9YTJKthJHO+8pYGKHtS6d72LVaVSGtcQe6nLSPcP/k5Kvsmi
-M7uVja22Aj1EEVKZzF23JRNlkuqp1T6fi59hN+Y16Za36mfF1yTC
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.uwo.ca:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.uwo.ca:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Western Ontario</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Western Ontario</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwo.ca</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>noc@uwo.ca</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.varndean.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.varndean.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index c392ac76..00000000
--- a/swamid-interfederations-2.0/shibidp.varndean.ac.uk-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" entityID="https://shibidp.varndean.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Varndean College.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-16T11:52:38Z">
-      <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">varndean.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Varndean College</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://shibidp.varndean.ac.uk/idp/images/dummylogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUYnAHVOZFTgSHvflAx2tiuguv7kowDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWc2hpYmlkcC52YXJuZGVhbi5hYy51azAeFw0xNDA1MDEx
-						MDEwNTlaFw0zNDA1MDExMDEwNTlaMCExHzAdBgNVBAMTFnNoaWJpZHAudmFybmRl
-						YW4uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAz+ei5lxa
-						TA4LwlADyP4JJKaGIa1xpQoSAkluJaXogaTq0BsXIFEk0/FOoTCq3bjUVpq+bjfz
-						ZbLeFioKUyWBULNW//qLBmfcN8lVWdWyhju/PepezoM3sjup7JW4pZQp/7fdjmok
-						fKFaaBFVsnILzIZ2/26KmDzek19cmlfI/Zn+9VTzKA7TL0qneQdFoyTkLUB2gIZG
-						1TGqohPGxW59ZyYsU0Ic209zpqS1VSz4lMAXvfCMAU/ngmDIXUqxWSwV/zZcEZGq
-						ySMdE23U5YFT9jNG2aLaYXx8GB6sWg/kshMcgadfPyT9AZa68ObpSdrm6uc1mqgj
-						PhqvevqDRLMtAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJpZHAudmFybmRlYW4u
-						YWMudWuGLWh0dHBzOi8vc2hpYmlkcC52YXJuZGVhbi5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUmuqY360czCtkfOA9uYzZDygT2ogwDQYJKoZIhvcNAQEF
-						BQADggEBAGjREkcSrh8oEx1TCylPjB+DrzlZuIcrsQKtRBr3CwQcP011h5Dwq/Lq
-						1RXtMFm10qnU2+x7bhI8xCqjlz0k80G6yEcY/9+pwqL6LgoeUT3sGvXfMf0k6usJ
-						noW7QnGPavB+i2Al8yeH/setuVUWnsObISiLte3poWn1fY8028MQqDuwNJRojBRY
-						3M//PcIdYzftbeqgtno5g9++ChY3ZwaPFHnLJra/FVvTeUa0aIfk4KhEsmqzp/18
-						OjXjAm0VoplJriXkOkpXBRpP/XraSC+wha4JhjrZZTLOs2qwHf0WkT19H5i5Fe2x
-						hG2q5MTeya5x8Bg9CY3QvgzviQlwuho=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.varndean.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.varndean.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://shibidp.varndean.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.varndean.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.varndean.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.varndean.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">varndean.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQzCCAiugAwIBAgIUYnAHVOZFTgSHvflAx2tiuguv7kowDQYJKoZIhvcNAQEF
-						BQAwITEfMB0GA1UEAxMWc2hpYmlkcC52YXJuZGVhbi5hYy51azAeFw0xNDA1MDEx
-						MDEwNTlaFw0zNDA1MDExMDEwNTlaMCExHzAdBgNVBAMTFnNoaWJpZHAudmFybmRl
-						YW4uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAz+ei5lxa
-						TA4LwlADyP4JJKaGIa1xpQoSAkluJaXogaTq0BsXIFEk0/FOoTCq3bjUVpq+bjfz
-						ZbLeFioKUyWBULNW//qLBmfcN8lVWdWyhju/PepezoM3sjup7JW4pZQp/7fdjmok
-						fKFaaBFVsnILzIZ2/26KmDzek19cmlfI/Zn+9VTzKA7TL0qneQdFoyTkLUB2gIZG
-						1TGqohPGxW59ZyYsU0Ic209zpqS1VSz4lMAXvfCMAU/ngmDIXUqxWSwV/zZcEZGq
-						ySMdE23U5YFT9jNG2aLaYXx8GB6sWg/kshMcgadfPyT9AZa68ObpSdrm6uc1mqgj
-						PhqvevqDRLMtAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJpZHAudmFybmRlYW4u
-						YWMudWuGLWh0dHBzOi8vc2hpYmlkcC52YXJuZGVhbi5hYy51ay9pZHAvc2hpYmJv
-						bGV0aDAdBgNVHQ4EFgQUmuqY360czCtkfOA9uYzZDygT2ogwDQYJKoZIhvcNAQEF
-						BQADggEBAGjREkcSrh8oEx1TCylPjB+DrzlZuIcrsQKtRBr3CwQcP011h5Dwq/Lq
-						1RXtMFm10qnU2+x7bhI8xCqjlz0k80G6yEcY/9+pwqL6LgoeUT3sGvXfMf0k6usJ
-						noW7QnGPavB+i2Al8yeH/setuVUWnsObISiLte3poWn1fY8028MQqDuwNJRojBRY
-						3M//PcIdYzftbeqgtno5g9++ChY3ZwaPFHnLJra/FVvTeUa0aIfk4KhEsmqzp/18
-						OjXjAm0VoplJriXkOkpXBRpP/XraSC+wha4JhjrZZTLOs2qwHf0WkT19H5i5Fe2x
-						hG2q5MTeya5x8Bg9CY3QvgzviQlwuho=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.varndean.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.varndean.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">Varndean College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Varndean College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.varndean.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steven</GivenName>
-    <SurName>Skelhorn</SurName>
-    <EmailAddress>mailto:sas@varndean.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Skelhorn</SurName>
-    <EmailAddress>mailto:sas@varndean.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.wcupa.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.wcupa.edu-idp-shibboleth.xml
deleted file mode 100644
index 9ab972d2..00000000
--- a/swamid-interfederations-2.0/shibidp.wcupa.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,71 +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://shibidp.wcupa.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">wcupa.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">West Chester University of Pennsylvania</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://wcupa.edu/infoservices/security/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wcupa.edu/infoservices/security/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="201" xml:lang="en">https://wcupa.edu/images/WCULogo100x201.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>
-MIIDLzCCAhegAwIBAgIUdeH51iARpA9IRaqlBc5rN1Yb6gUwDQYJKoZIhvcNAQEL
-BQAwHDEaMBgGA1UEAwwRc2hpYmlkcC53Y3VwYS5lZHUwHhcNMTUxMDMwMjAzNTM0
-WhcNMzUxMDMwMjAzNTM0WjAcMRowGAYDVQQDDBFzaGliaWRwLndjdXBhLmVkdTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9s+rurhmsVv2Nrdwx2ZngE
-ogf41zeSQyxwS3kOmylJ3GyUrbSKdUL/E5+OUds/k/V9M63s8LpQ56lqa24pjp+Y
-visg7PK1+LjeemSmEzltG3alDzrqBdk2cZ+f4KsOjlFTAPG92/JlJg8Wf1CJRTpJ
-/3Eth64kfz83/Q1xzJnO2tVdSwGbbFybc+b6hApUrE7QwCoOVk9rl5HCwfXE5SKu
-9dpvTL4X8QmfBNDAapRHjqFq4A48EnywJcceRElKX+eXa8iArkS1RVnipuDww+1O
-dfdVktBRC518AWH0eHHG9Cn8MbVoRHo4q6P3IBysfRh+6Rf5yY94L/m59CUFy7UC
-AwEAAaNpMGcwHQYDVR0OBBYEFCoZ8a9VWOYqg67BwvrhMKGop6fGMEYGA1UdEQQ/
-MD2CEXNoaWJpZHAud2N1cGEuZWR1hihodHRwczovL3NoaWJpZHAud2N1cGEuZWR1
-L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBQcQLRMvL7ozLENHkE
-9/CJ+oC4eDd4NyHPcbTt8o0rRBHK260AohKP8rllZDTcNYiqH868r05cbhpCed38
-hWPvwhoAvs8sdQ9BWxNfizS0N9i+3jOB8djB8xwG84FzDy0S25WEOg2Ho7OU56Jf
-mA9j9eXob0zBb/y50dAD42P4Yt60QMVPizsON27R503gRJPd39kv6xoc1k+/Wv2z
-wsB2fZoZ/BEWyXyKG3k7rOfY5O1BvVQefIJZBlD2CYQr8Oc8PLZK1eHGB7pjD8qg
-8p22ptxVX4rEhY8uEkXGjxUNzvCy+R7HIJMnssjYyyu394532pvLwrFEJbi3IIpk
-lG2H
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.wcupa.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.wcupa.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">West Chester University of Pennsylvania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">West Chester University of Pennsylvania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://wcupa.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rashed Kabir</md:GivenName>
-    <md:EmailAddress>rkabir@wcupa.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Frank Piscitello</md:GivenName>
-    <md:EmailAddress>fpiscitello@wcupa.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Information Security</md:GivenName>
-    <md:EmailAddress>abuse@wcupa.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT HelpDesk</md:GivenName>
-    <md:EmailAddress>helpdesk@wcupa.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.whoi.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.whoi.edu-idp-shibboleth.xml
deleted file mode 100644
index 44b4e92a..00000000
--- a/swamid-interfederations-2.0/shibidp.whoi.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +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://shibidp.whoi.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">whoi.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Woods Hole Oceanographic Institution</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>
-MIIDLDCCAhSgAwIBAgIVAK9ViuP7Id0FFmCVaVuFWSnKVkLaMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAud2hvaS5lZHUwHhcNMTMwNTAyMTQxNzM2
-WhcNMzMwNTAyMTQxNzM2WjAbMRkwFwYDVQQDExBzaGliaWRwLndob2kuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoZmnXX+ABC9/ZVHpuoa3ab+9
-IdSp36dmDwNCkUnFa7GcLuN6Tn5PYIv06KR7jvkPm+2ttgGegvDcSrV52L2nc1zr
-DenO2QG4WMinWclaEPbwRIi1GPcJJS2Uq8m2cu36bqYEwf4dTma021Uiy2+6iT/6
-uSvKSdxixrad3hzJq1LQbkP4nzb/x3q3DQ6nUQGlVyK3V+/7d+kahKtjzsdSz3gz
-HfJy3KUl3WZyzG1fmnUKpvxHYrpsyMEh18cjKA2Ld5P61rpaT6JZGk8bSRkVTfnW
-8HUVGfq4CxxtVv2RTiq/rjHVV6KL+y4EcrsZttZvmGuX6ABTzfJHMSlTwrufVwID
-AQABo2cwZTBEBgNVHREEPTA7ghBzaGliaWRwLndob2kuZWR1hidodHRwczovL3No
-aWJpZHAud2hvaS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFfkJo5Kx+ue
-fwEU5V7XqSF+QHeoMA0GCSqGSIb3DQEBBQUAA4IBAQAIZIAjmHaMwezzmMBsZmqj
-4s9izsJwz2jbaSTE1bmgqvfY+IS8zsbF5ewf9DgXqJ1t7e8PBLc3N/cInGqbljK5
-Dd3Ow9OXLT2mGIKQtIIvWbJH8P4wNZs+5uRy2WtSIHdR065WE6Zdi8eTobDryBqt
-c6lcEum0KbdThIYWQtyg0k7SEtjY5cEn7ICnNSzhfbpPWLsgoq6jwWStEa8NAV1M
-FDR1FwRmayfteRPZA0EnE08UbFA11Uwwh/od4x8HlIo5ETVho2acGzJAM71wmgOP
-xw3C9UWXaVWxIYXm/JvbQCPf++KaXM3P4cZ7GhitZVCnXWNwEty6P84nQRAKoyat
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.whoi.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.whoi.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.whoi.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.whoi.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.whoi.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">whoi.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAK9ViuP7Id0FFmCVaVuFWSnKVkLaMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAud2hvaS5lZHUwHhcNMTMwNTAyMTQxNzM2
-WhcNMzMwNTAyMTQxNzM2WjAbMRkwFwYDVQQDExBzaGliaWRwLndob2kuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoZmnXX+ABC9/ZVHpuoa3ab+9
-IdSp36dmDwNCkUnFa7GcLuN6Tn5PYIv06KR7jvkPm+2ttgGegvDcSrV52L2nc1zr
-DenO2QG4WMinWclaEPbwRIi1GPcJJS2Uq8m2cu36bqYEwf4dTma021Uiy2+6iT/6
-uSvKSdxixrad3hzJq1LQbkP4nzb/x3q3DQ6nUQGlVyK3V+/7d+kahKtjzsdSz3gz
-HfJy3KUl3WZyzG1fmnUKpvxHYrpsyMEh18cjKA2Ld5P61rpaT6JZGk8bSRkVTfnW
-8HUVGfq4CxxtVv2RTiq/rjHVV6KL+y4EcrsZttZvmGuX6ABTzfJHMSlTwrufVwID
-AQABo2cwZTBEBgNVHREEPTA7ghBzaGliaWRwLndob2kuZWR1hidodHRwczovL3No
-aWJpZHAud2hvaS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFfkJo5Kx+ue
-fwEU5V7XqSF+QHeoMA0GCSqGSIb3DQEBBQUAA4IBAQAIZIAjmHaMwezzmMBsZmqj
-4s9izsJwz2jbaSTE1bmgqvfY+IS8zsbF5ewf9DgXqJ1t7e8PBLc3N/cInGqbljK5
-Dd3Ow9OXLT2mGIKQtIIvWbJH8P4wNZs+5uRy2WtSIHdR065WE6Zdi8eTobDryBqt
-c6lcEum0KbdThIYWQtyg0k7SEtjY5cEn7ICnNSzhfbpPWLsgoq6jwWStEa8NAV1M
-FDR1FwRmayfteRPZA0EnE08UbFA11Uwwh/od4x8HlIo5ETVho2acGzJAM71wmgOP
-xw3C9UWXaVWxIYXm/JvbQCPf++KaXM3P4cZ7GhitZVCnXWNwEty6P84nQRAKoyat
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.whoi.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Woods Hole Oceanographic Institution</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Woods Hole Oceanographic Institution</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.whoi.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Greg Pike</md:GivenName>
-    <md:EmailAddress>gpike@whoi.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Mark Jones</md:GivenName>
-    <md:EmailAddress>mark@whoi.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.wnc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.wnc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index b8b0db03..00000000
--- a/swamid-interfederations-2.0/shibidp.wnc.ac.uk-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://shibidp.wnc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for West Nottinghamshire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-04-04T16:04: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">wnc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDeDCCAmACCQDV2f231qNoMzANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJH
-						QjEYMBYGA1UECAwPTm90dGluZ2hhbXNoaXJlMRIwEAYDVQQHDAlNYW5zZmllbGQx
-						JTAjBgNVBAoMHFdlc3QgTm90dGluZ2hhbXNoaXJlIENvbGxlZ2UxGjAYBgNVBAMM
-						EXNoaWJpZHAud25jLmFjLnVrMB4XDTE0MDIwMzEwMzYzNVoXDTM0MDEyOTEwMzYz
-						NVowfjELMAkGA1UEBhMCR0IxGDAWBgNVBAgMD05vdHRpbmdoYW1zaGlyZTESMBAG
-						A1UEBwwJTWFuc2ZpZWxkMSUwIwYDVQQKDBxXZXN0IE5vdHRpbmdoYW1zaGlyZSBD
-						b2xsZWdlMRowGAYDVQQDDBFzaGliaWRwLnduYy5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBANjphOxHqFN24tCPo/ZUfNvzOUTDoyeq5lHSOWlN
-						aWRtax7z5fbQ+Ajpdgyp6wP7JA5+CktdwVjR5maIGS8Snow5W2/oLKIH6qZN3Dmh
-						4RbfL3IPjWNGqcLBZ5cR6B2b71BmEFowJ4RopV0uLd4yud0aVA33AuNHtt5FCbmx
-						57UaykuwNUH0AUP0Mmhw0Unlh5C/SmrLRdeQxQpB3qWDNasgFMcvCet7jUP3Tje5
-						LysqQdDV0iS5C7sWmAzVfwJ4oF+CgM6IrCobOf+45dEa7v5+ILDQEpYJJa5vYbvu
-						zGxTWbH6Wt6QnJOFX3ZHVYMnh7gogu/vposOzgaJhFYu6ekCAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEAt2WPnd7BzzXgF7yd1qcPpYFcnx1eaFD5PHCqtSUtPM4tqmrT
-						ICM5ELCpwZYSZbyTm1MikC1um2U9tZIi780kZnjSSMff7YkiSCN3pEjjM8OaJtnO
-						7NKT0bRrx5y0UlVI0D/It4AasMZCL4tJf7J74lbi/6WGMMPz3JMKSJlWSaBg9875
-						0LiyYQ0LugAJYLzYvGjdzqg08QOZWnMgUB0clI8moXNLUiE8Q4VN12PJqugUuzEi
-						t7IWhuOL2qj1e65huFQRUrHdvKsvm9+iydT7JkIMw0tUDO/uTPRl51QNYCP6aiC2
-						d88+xmq6gSOp+ZyGanKnNUHyRuukGiawzUDS5w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wnc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wnc.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://shibidp.wnc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.wnc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.wnc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.wnc.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">wnc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDeDCCAmACCQDV2f231qNoMzANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJH
-						QjEYMBYGA1UECAwPTm90dGluZ2hhbXNoaXJlMRIwEAYDVQQHDAlNYW5zZmllbGQx
-						JTAjBgNVBAoMHFdlc3QgTm90dGluZ2hhbXNoaXJlIENvbGxlZ2UxGjAYBgNVBAMM
-						EXNoaWJpZHAud25jLmFjLnVrMB4XDTE0MDIwMzEwMzYzNVoXDTM0MDEyOTEwMzYz
-						NVowfjELMAkGA1UEBhMCR0IxGDAWBgNVBAgMD05vdHRpbmdoYW1zaGlyZTESMBAG
-						A1UEBwwJTWFuc2ZpZWxkMSUwIwYDVQQKDBxXZXN0IE5vdHRpbmdoYW1zaGlyZSBD
-						b2xsZWdlMRowGAYDVQQDDBFzaGliaWRwLnduYy5hYy51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBANjphOxHqFN24tCPo/ZUfNvzOUTDoyeq5lHSOWlN
-						aWRtax7z5fbQ+Ajpdgyp6wP7JA5+CktdwVjR5maIGS8Snow5W2/oLKIH6qZN3Dmh
-						4RbfL3IPjWNGqcLBZ5cR6B2b71BmEFowJ4RopV0uLd4yud0aVA33AuNHtt5FCbmx
-						57UaykuwNUH0AUP0Mmhw0Unlh5C/SmrLRdeQxQpB3qWDNasgFMcvCet7jUP3Tje5
-						LysqQdDV0iS5C7sWmAzVfwJ4oF+CgM6IrCobOf+45dEa7v5+ILDQEpYJJa5vYbvu
-						zGxTWbH6Wt6QnJOFX3ZHVYMnh7gogu/vposOzgaJhFYu6ekCAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEAt2WPnd7BzzXgF7yd1qcPpYFcnx1eaFD5PHCqtSUtPM4tqmrT
-						ICM5ELCpwZYSZbyTm1MikC1um2U9tZIi780kZnjSSMff7YkiSCN3pEjjM8OaJtnO
-						7NKT0bRrx5y0UlVI0D/It4AasMZCL4tJf7J74lbi/6WGMMPz3JMKSJlWSaBg9875
-						0LiyYQ0LugAJYLzYvGjdzqg08QOZWnMgUB0clI8moXNLUiE8Q4VN12PJqugUuzEi
-						t7IWhuOL2qj1e65huFQRUrHdvKsvm9+iydT7JkIMw0tUDO/uTPRl51QNYCP6aiC2
-						d88+xmq6gSOp+ZyGanKnNUHyRuukGiawzUDS5w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wnc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wnc.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">West Nottinghamshire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">West Nottinghamshire College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wnc.ac.uk/About-Us/The-College/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Heather</GivenName>
-    <SurName>Peake</SurName>
-    <EmailAddress>mailto:heather.peake@wnc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Owen</GivenName>
-    <SurName>Williams</SurName>
-    <EmailAddress>mailto:owen.williams@wnc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.wqeic.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibidp.wqeic.ac.uk-shibboleth.xml
deleted file mode 100644
index 4a269ad2..00000000
--- a/swamid-interfederations-2.0/shibidp.wqeic.ac.uk-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://shibidp.wqeic.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Wyggeston and Queen Elizabeth I College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-28T12: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">wqeic.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEijCCA3KgAwIBAgIJANv4hjZSaLpQMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
-						VQQGEwJHQjEXMBUGA1UECAwOTGVpY2VzdGVyc2hpcmUxEjAQBgNVBAcMCUxlaWNl
-						c3RlcjEuMCwGA1UECgwlV3lnZ2VzdG9uICYgUXVlZW4gRWxpemFiZXRoIEkgQ29s
-						bGVnZTEUMBIGA1UECwwLSVQgU2VydmljZXMxHDAaBgNVBAMME3NoaWJpZHAud3Fl
-						aWMuYWMudWsxJTAjBgkqhkiG9w0BCQEWFml0aGVscGRlc2tAd3FlaWMuYWMudWsw
-						HhcNMTQwMzE4MTIzNDU4WhcNMjQwMzE1MTIzNDU4WjCBxTELMAkGA1UEBhMCR0Ix
-						FzAVBgNVBAgMDkxlaWNlc3RlcnNoaXJlMRIwEAYDVQQHDAlMZWljZXN0ZXIxLjAs
-						BgNVBAoMJVd5Z2dlc3RvbiAmIFF1ZWVuIEVsaXphYmV0aCBJIENvbGxlZ2UxFDAS
-						BgNVBAsMC0lUIFNlcnZpY2VzMRwwGgYDVQQDDBNzaGliaWRwLndxZWljLmFjLnVr
-						MSUwIwYJKoZIhvcNAQkBFhZpdGhlbHBkZXNrQHdxZWljLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxVKEV8L05iIYj4KRgdBCcBJRuW6c6Kal
-						XrqwV6y55rPuKo+oAKPQ1D2N9/zLq7abDb5ftS0MaXMEg9oqiRc9d15J4cPMT5wp
-						h2icZMShZP14pouI4ia7hqgwzFpF1PYD77ZFRRNIyBh9fBeiB155D2NeUCJhu4Xl
-						riUhKCedOAfnL50GNTNpKEYxLjtrzVzHyrenKMUnF4aiq2G7DOfeWK9i/eItNETq
-						WF1lvNfYqxcKHjcUVmcs8ACHUEh4MLesvZdl9sZtP52gdxfNiCiAo1BJIxsqJ8HB
-						0NLOJK70YEU+To3XM9cONSUOffftTrB+9tmzRB+vc9mBGasg53+zgwIDAQABo3sw
-						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
-						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUSrv6hTErz+8nx1Np6R8mpyg4DU8wHwYDVR0j
-						BBgwFoAUSrv6hTErz+8nx1Np6R8mpyg4DU8wDQYJKoZIhvcNAQEFBQADggEBABiy
-						AqUhi20nKdQmVmHq0Rj6uWosu1NCYYVGAtrEfzG2pNFiKm7yGI5AsKYcYR80VEds
-						3QO66RRc4jtSEJokDpcuim7QsW08+87alhMfJSj+/Y2YMTRG6Ruv/WDXHln1OoFS
-						myDjdSWk4gIrAMQc5/AbnYtvgAJxmlvKOST34hXOCX5HXTu2hUjruPop15+ucwYC
-						cPVkx4NgoOPsM60BJJElzhBwYBBZmBTDfSg9XkvY41YCcKS5dyCqfkG0SD55tubN
-						IR2ATC49n4iiDdgsestoH8IsHHoClXDv1wMFL5TfGS2BJq3PWWYN/bB9R7xL2F6N
-						SlZXFQLen4vcwe+CNlM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wqeic.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wqeic.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://shibidp.wqeic.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.wqeic.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.wqeic.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.wqeic.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">wqeic.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEijCCA3KgAwIBAgIJANv4hjZSaLpQMA0GCSqGSIb3DQEBBQUAMIHFMQswCQYD
-						VQQGEwJHQjEXMBUGA1UECAwOTGVpY2VzdGVyc2hpcmUxEjAQBgNVBAcMCUxlaWNl
-						c3RlcjEuMCwGA1UECgwlV3lnZ2VzdG9uICYgUXVlZW4gRWxpemFiZXRoIEkgQ29s
-						bGVnZTEUMBIGA1UECwwLSVQgU2VydmljZXMxHDAaBgNVBAMME3NoaWJpZHAud3Fl
-						aWMuYWMudWsxJTAjBgkqhkiG9w0BCQEWFml0aGVscGRlc2tAd3FlaWMuYWMudWsw
-						HhcNMTQwMzE4MTIzNDU4WhcNMjQwMzE1MTIzNDU4WjCBxTELMAkGA1UEBhMCR0Ix
-						FzAVBgNVBAgMDkxlaWNlc3RlcnNoaXJlMRIwEAYDVQQHDAlMZWljZXN0ZXIxLjAs
-						BgNVBAoMJVd5Z2dlc3RvbiAmIFF1ZWVuIEVsaXphYmV0aCBJIENvbGxlZ2UxFDAS
-						BgNVBAsMC0lUIFNlcnZpY2VzMRwwGgYDVQQDDBNzaGliaWRwLndxZWljLmFjLnVr
-						MSUwIwYJKoZIhvcNAQkBFhZpdGhlbHBkZXNrQHdxZWljLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxVKEV8L05iIYj4KRgdBCcBJRuW6c6Kal
-						XrqwV6y55rPuKo+oAKPQ1D2N9/zLq7abDb5ftS0MaXMEg9oqiRc9d15J4cPMT5wp
-						h2icZMShZP14pouI4ia7hqgwzFpF1PYD77ZFRRNIyBh9fBeiB155D2NeUCJhu4Xl
-						riUhKCedOAfnL50GNTNpKEYxLjtrzVzHyrenKMUnF4aiq2G7DOfeWK9i/eItNETq
-						WF1lvNfYqxcKHjcUVmcs8ACHUEh4MLesvZdl9sZtP52gdxfNiCiAo1BJIxsqJ8HB
-						0NLOJK70YEU+To3XM9cONSUOffftTrB+9tmzRB+vc9mBGasg53+zgwIDAQABo3sw
-						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
-						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUSrv6hTErz+8nx1Np6R8mpyg4DU8wHwYDVR0j
-						BBgwFoAUSrv6hTErz+8nx1Np6R8mpyg4DU8wDQYJKoZIhvcNAQEFBQADggEBABiy
-						AqUhi20nKdQmVmHq0Rj6uWosu1NCYYVGAtrEfzG2pNFiKm7yGI5AsKYcYR80VEds
-						3QO66RRc4jtSEJokDpcuim7QsW08+87alhMfJSj+/Y2YMTRG6Ruv/WDXHln1OoFS
-						myDjdSWk4gIrAMQc5/AbnYtvgAJxmlvKOST34hXOCX5HXTu2hUjruPop15+ucwYC
-						cPVkx4NgoOPsM60BJJElzhBwYBBZmBTDfSg9XkvY41YCcKS5dyCqfkG0SD55tubN
-						IR2ATC49n4iiDdgsestoH8IsHHoClXDv1wMFL5TfGS2BJq3PWWYN/bB9R7xL2F6N
-						SlZXFQLen4vcwe+CNlM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wqeic.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wqeic.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">Wyggeston and Queen Elizabeth I College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Wyggeston &amp; QEI College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wqeic.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Roger</GivenName>
-    <SurName>Laurenti</SurName>
-    <EmailAddress>mailto:roger.laurenti@wqeic.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Roger</GivenName>
-    <SurName>Laurenti</SurName>
-    <EmailAddress>mailto:roger.laurenti@wqeic.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.wsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.wsu.edu-idp-shibboleth.xml
deleted file mode 100644
index 50935b1f..00000000
--- a/swamid-interfederations-2.0/shibidp.wsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,90 +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://shibidp.wsu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">wsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Washington State University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Shibboleth Identity Provider for Washington State University</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>
-MIIDJzCCAg+gAwIBAgIUfDyEVJT9ZZfmUITKqh/iiWittqowDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYmlkcC53c3UuZWR1MB4XDTEyMDgwOTE5MzQzNFoX
-DTMyMDgwOTE5MzQzNFowGjEYMBYGA1UEAxMPc2hpYmlkcC53c3UuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhPecq0Y/ZnVu5qSYglWqAAXuBBJD
-GqqvjQjCqMTvqIe0gwO9+LYuERFjBDeCR0EdR78W+z1CpeAX2uJK39o1EHvuFGKP
-2soMVmTyxX/RCPwPgNCBhLm8H9C/qSo9t0uy6OBuM8j8jLZEeogQMIFMhSQBb/sX
-xG6yf4HlBxUR4UwXt+1B2uPUyeuFb5d7cXiER0vypCVUOYTMoktJi2BhTPWwq0Uw
-gl8wIOdrGcYWA/TlM7kN7dbECSMQ7+vyjJcjmLl+S+uTP8XMBO++73cusWm9PcQQ
-h0YM4upH24fn1rgfDaz9hFSfh6YpoTd1jkZfuZ4LIAA+4qhmi2H4jirBAwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliaWRwLndzdS5lZHWGJmh0dHBzOi8vc2hpYmlk
-cC53c3UuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSH6+ewj1D+ZqZ0HqhD
-FjcDSZ9qnDANBgkqhkiG9w0BAQUFAAOCAQEACdd+0kvLvaK7066P0rk6cNvMZvhu
-/nwdn0nQwty/KDm7N95FWYCheijkcMD78DE+uzcUH/nwpTyULTJHVAhmwXJYJjoD
-LFKX3/QZr7f4L2ZYP80ic/6Ua45BFfHAOwp8ABO1XQlc34AQ4P226f3PSZQJmrb7
-EsSHjRpXbDNZcGr33nqSJ3nO1jM9pZziJfQK6pd20kRJL0SciAJlKcq3C/OHPDpW
-PN24xa2MgysJHH0EW8DeMX2qkmmXQcwOR+WITmYWm3gFNLSYGVuOQHVlMHr36Sgj
-yhBzX1IxZYmZwTPf9bX6fxdb1KoMOKPR09NUokT6l41eBJmpxiZQXLr3fw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.wsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.wsu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.wsu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.wsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">wsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUfDyEVJT9ZZfmUITKqh/iiWittqowDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPc2hpYmlkcC53c3UuZWR1MB4XDTEyMDgwOTE5MzQzNFoX
-DTMyMDgwOTE5MzQzNFowGjEYMBYGA1UEAxMPc2hpYmlkcC53c3UuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhPecq0Y/ZnVu5qSYglWqAAXuBBJD
-GqqvjQjCqMTvqIe0gwO9+LYuERFjBDeCR0EdR78W+z1CpeAX2uJK39o1EHvuFGKP
-2soMVmTyxX/RCPwPgNCBhLm8H9C/qSo9t0uy6OBuM8j8jLZEeogQMIFMhSQBb/sX
-xG6yf4HlBxUR4UwXt+1B2uPUyeuFb5d7cXiER0vypCVUOYTMoktJi2BhTPWwq0Uw
-gl8wIOdrGcYWA/TlM7kN7dbECSMQ7+vyjJcjmLl+S+uTP8XMBO++73cusWm9PcQQ
-h0YM4upH24fn1rgfDaz9hFSfh6YpoTd1jkZfuZ4LIAA+4qhmi2H4jirBAwIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9zaGliaWRwLndzdS5lZHWGJmh0dHBzOi8vc2hpYmlk
-cC53c3UuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSH6+ewj1D+ZqZ0HqhD
-FjcDSZ9qnDANBgkqhkiG9w0BAQUFAAOCAQEACdd+0kvLvaK7066P0rk6cNvMZvhu
-/nwdn0nQwty/KDm7N95FWYCheijkcMD78DE+uzcUH/nwpTyULTJHVAhmwXJYJjoD
-LFKX3/QZr7f4L2ZYP80ic/6Ua45BFfHAOwp8ABO1XQlc34AQ4P226f3PSZQJmrb7
-EsSHjRpXbDNZcGr33nqSJ3nO1jM9pZziJfQK6pd20kRJL0SciAJlKcq3C/OHPDpW
-PN24xa2MgysJHH0EW8DeMX2qkmmXQcwOR+WITmYWm3gFNLSYGVuOQHVlMHr36Sgj
-yhBzX1IxZYmZwTPf9bX6fxdb1KoMOKPR09NUokT6l41eBJmpxiZQXLr3fw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.wsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Washington State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Washington State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wsu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IDM Administrators</md:GivenName>
-    <md:EmailAddress>IDM.Admins@wsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibidptest.york.ac.uk-shibboleth.xml
deleted file mode 100644
index eb257a44..00000000
--- a/swamid-interfederations-2.0/shibidptest.york.ac.uk-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://shibidptest.york.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth test IdP owned by the University of York.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-05-07T16:13:09Z">
-      <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">york.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID/DCCAuSgAwIBAgIJAOgs+vZkeVN+MA0GCSqGSIb3DQEBBQUAMH8xCzAJBgNV
-						BAYTAkdCMQ0wCwYDVQQIEwRZb3JrMQ0wCwYDVQQHEwRZb3JrMRswGQYDVQQKExJV
-						bml2ZXJzaXR5IG9mIFlvcmsxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR8wHQYDVQQD
-						ExZzaGliaWRwdGVzdC55b3JrLmFjLnVrMB4XDTEzMDUwNzEzMTIwOFoXDTIzMDUw
-						NTEzMTIwOFowfzELMAkGA1UEBhMCR0IxDTALBgNVBAgTBFlvcmsxDTALBgNVBAcT
-						BFlvcmsxGzAZBgNVBAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxMLSVQg
-						U2VydmljZXMxHzAdBgNVBAMTFnNoaWJpZHB0ZXN0LnlvcmsuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMUmL9nDPjCZvZ8+dOTqAqJ7nskqlp
-						YXb94lrlj299DJ6vQaUm4/dR8S3lW1o4mImOJoRW1KWq57vnhKZc7XX8KjxLPRlB
-						LJ5RMSFnqkOZKMNxvESu03eFljawaedz6I9hgDV75EB8AQOXq5guFYx7gmFEmV01
-						68qtDZzfahsgTQaMmyvXDFtQjPFtyPFM7gXAZ7hN7IqG4/nfNXoGuL8ACGHsr7c9
-						B1loWgc7SHzM7Dg8Wx8I+cDvieJi2O6m7k39IX2SXcx4ddwNpsD07v0GmvwUckia
-						oqiV/ZwqCNIn5mNW9DIKVy7Tf845BlaQEQPeGwbYnG0tNi0VbxxEaXm/AgMBAAGj
-						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
-						IENlcnRpZmljYXRlMB0GA1UdDgQWBBRxs5ICZ+pK/8qFe1SVvLDCXUUI5TAfBgNV
-						HSMEGDAWgBRxs5ICZ+pK/8qFe1SVvLDCXUUI5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						PVQMh/w0BlmmO1IBojykKwkxfs5Q7dbUSbumoFPFfb/RzZ+qTNW7EKDtU84GULGR
-						HiFvbC7CxnXSzRtwt9v+RMyUcw3K9Rsm66zWWqebfm/apNvRgBLpB6z9AK2wQQiJ
-						XMxmlAoM41ZeENbLYI0MoUKTFPg9FnAsyDZe5MEk831VbuY7engJkezFtKQ1TuW3
-						/6bXFnodg3tFTgEcl9ZNZVahH/KRDlxlOR9umHIRKgd7BX/mZsAewsyt4BGs58yL
-						mjybiHzAx77eG8wAb0J52d2t64ppwtOjauky+ppRFmP9Nu+J4WVwlnJsqQZTcQYt
-						RKXBwZEOA6Bf4YjcgUtkWQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidptest.york.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://shibidptest.york.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidptest.york.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidptest.york.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidptest.york.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">york.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID/DCCAuSgAwIBAgIJAOgs+vZkeVN+MA0GCSqGSIb3DQEBBQUAMH8xCzAJBgNV
-						BAYTAkdCMQ0wCwYDVQQIEwRZb3JrMQ0wCwYDVQQHEwRZb3JrMRswGQYDVQQKExJV
-						bml2ZXJzaXR5IG9mIFlvcmsxFDASBgNVBAsTC0lUIFNlcnZpY2VzMR8wHQYDVQQD
-						ExZzaGliaWRwdGVzdC55b3JrLmFjLnVrMB4XDTEzMDUwNzEzMTIwOFoXDTIzMDUw
-						NTEzMTIwOFowfzELMAkGA1UEBhMCR0IxDTALBgNVBAgTBFlvcmsxDTALBgNVBAcT
-						BFlvcmsxGzAZBgNVBAoTElVuaXZlcnNpdHkgb2YgWW9yazEUMBIGA1UECxMLSVQg
-						U2VydmljZXMxHzAdBgNVBAMTFnNoaWJpZHB0ZXN0LnlvcmsuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMUmL9nDPjCZvZ8+dOTqAqJ7nskqlp
-						YXb94lrlj299DJ6vQaUm4/dR8S3lW1o4mImOJoRW1KWq57vnhKZc7XX8KjxLPRlB
-						LJ5RMSFnqkOZKMNxvESu03eFljawaedz6I9hgDV75EB8AQOXq5guFYx7gmFEmV01
-						68qtDZzfahsgTQaMmyvXDFtQjPFtyPFM7gXAZ7hN7IqG4/nfNXoGuL8ACGHsr7c9
-						B1loWgc7SHzM7Dg8Wx8I+cDvieJi2O6m7k39IX2SXcx4ddwNpsD07v0GmvwUckia
-						oqiV/ZwqCNIn5mNW9DIKVy7Tf845BlaQEQPeGwbYnG0tNi0VbxxEaXm/AgMBAAGj
-						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
-						IENlcnRpZmljYXRlMB0GA1UdDgQWBBRxs5ICZ+pK/8qFe1SVvLDCXUUI5TAfBgNV
-						HSMEGDAWgBRxs5ICZ+pK/8qFe1SVvLDCXUUI5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						PVQMh/w0BlmmO1IBojykKwkxfs5Q7dbUSbumoFPFfb/RzZ+qTNW7EKDtU84GULGR
-						HiFvbC7CxnXSzRtwt9v+RMyUcw3K9Rsm66zWWqebfm/apNvRgBLpB6z9AK2wQQiJ
-						XMxmlAoM41ZeENbLYI0MoUKTFPg9FnAsyDZe5MEk831VbuY7engJkezFtKQ1TuW3
-						/6bXFnodg3tFTgEcl9ZNZVahH/KRDlxlOR9umHIRKgd7BX/mZsAewsyt4BGs58yL
-						mjybiHzAx77eG8wAb0J52d2t64ppwtOjauky+ppRFmP9Nu+J4WVwlnJsqQZTcQYt
-						RKXBwZEOA6Bf4YjcgUtkWQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidptest.york.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidptest.york.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 York</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of York test service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.york.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>User Support</GivenName>
-    <EmailAddress>mailto:itsupport@york.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:itsupport@york.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shiblogin.hull.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shiblogin.hull.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 9a97f11e..00000000
--- a/swamid-interfederations-2.0/shiblogin.hull.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://shiblogin.hull.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for University of Hull.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-06-28T11:48:17Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">hull.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Hull (Shibboleth)</mdui:DisplayName>
-        <mdui:Logo height="80" width="60">https://library.hull.ac.uk/screens/newlogo.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIULUB2P8Qd8xEzfYUd14VtQqBiwXswDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUc2hpYmxvZ2luLmh1bGwuYWMudWswHhcNMTMwNjI2MTQy
-						ODQwWhcNMzMwNjI2MTQyODQwWjAfMR0wGwYDVQQDExRzaGlibG9naW4uaHVsbC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4dV4SFn79Mv9KA
-						ul1dlv9rPUfQuZPBVkNNjCtGk+KA3RpDPcidgV/2s8AdMG8NTknoT4vFzPYlgyaS
-						g2/tpzHKx9XqqJJQcAG4EvA3Pf8GF80Jk/hiI9T21tlp1S10g6KAU9hhqcsFZPR1
-						jSCtK45yjQ/WMzxdh/ds99qmCkjEQIn253Ra15vcoQApdSCusPO5oTENBK0SUTQe
-						uhGdWJlFBDHs7eHX+Fngyx066FrlrgUsCpiCor54m7DTB3NBOCD5LlpZMGJonrS6
-						O3XX/Bdt03ZdbPVLoAMb1hDY0uaIxrcCg3gMuIa9+wE5PsA/gvU60+uv3lzVzvsI
-						w81aZxsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmxvZ2luLmh1bGwuYWMudWuG
-						K2h0dHBzOi8vc2hpYmxvZ2luLmh1bGwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFLMPSMcSqArLLEqd9nbiw7CBYaO3MA0GCSqGSIb3DQEBBQUAA4IBAQCs
-						sKAv5nTTPIJ70oUcqtifzfHIYYCKnAKU0M6ug6Vcd0mFZJJ705u3dmtsTDylbDC7
-						sNDHtw/gbrmPb6PCGK0+8Ifr0yl16/i5vAzm7oCN2OqTsX94qAlWuey8xNIF9SW5
-						3q7n2jTOvOo4293pV1hNFGkpZSrqM/KaNhgOxOKx2ezb17QvEmKXX/JUJprOA+Y1
-						iWz5dMqvNl4a8Gbvp71bMtREfKa6m904CBCK69NKllb4kqRRoXggkVQjHQlLChv1
-						+e+c96h5fZroNkwofpqn6rpmvQfSmV2eRkpShhOjXXOarehRMQ+TIJJhdYR/w/8R/
-						I7/29liqhV3JptWNE4C
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shiblogin.hull.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://shiblogin.hull.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shiblogin.hull.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shiblogin.hull.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">hull.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIULUB2P8Qd8xEzfYUd14VtQqBiwXswDQYJKoZIhvcNAQEF
-						BQAwHzEdMBsGA1UEAxMUc2hpYmxvZ2luLmh1bGwuYWMudWswHhcNMTMwNjI2MTQy
-						ODQwWhcNMzMwNjI2MTQyODQwWjAfMR0wGwYDVQQDExRzaGlibG9naW4uaHVsbC5h
-						Yy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK4dV4SFn79Mv9KA
-						ul1dlv9rPUfQuZPBVkNNjCtGk+KA3RpDPcidgV/2s8AdMG8NTknoT4vFzPYlgyaS
-						g2/tpzHKx9XqqJJQcAG4EvA3Pf8GF80Jk/hiI9T21tlp1S10g6KAU9hhqcsFZPR1
-						jSCtK45yjQ/WMzxdh/ds99qmCkjEQIn253Ra15vcoQApdSCusPO5oTENBK0SUTQe
-						uhGdWJlFBDHs7eHX+Fngyx066FrlrgUsCpiCor54m7DTB3NBOCD5LlpZMGJonrS6
-						O3XX/Bdt03ZdbPVLoAMb1hDY0uaIxrcCg3gMuIa9+wE5PsA/gvU60+uv3lzVzvsI
-						w81aZxsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmxvZ2luLmh1bGwuYWMudWuG
-						K2h0dHBzOi8vc2hpYmxvZ2luLmh1bGwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFLMPSMcSqArLLEqd9nbiw7CBYaO3MA0GCSqGSIb3DQEBBQUAA4IBAQCs
-						sKAv5nTTPIJ70oUcqtifzfHIYYCKnAKU0M6ug6Vcd0mFZJJ705u3dmtsTDylbDC7
-						sNDHtw/gbrmPb6PCGK0+8Ifr0yl16/i5vAzm7oCN2OqTsX94qAlWuey8xNIF9SW5
-						3q7n2jTOvOo4293pV1hNFGkpZSrqM/KaNhgOxOKx2ezb17QvEmKXX/JUJprOA+Y1
-						iWz5dMqvNl4a8Gbvp71bMtREfKa6m904CBCK69NKllb4kqRRoXggkVQjHQlLChv1
-						+e+c96h5fZroNkwofpqn6rpmvQfSmV2eRkpShhOjXXOarehRMQ+TIJJhdYR/w/8R
-						/I7/29liqhV3JptWNE4C
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shiblogin.hull.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shiblogin.hull.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 Hull</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Hull (Shibboleth)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hull.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Library help</GivenName>
-    <EmailAddress>mailto:libhelp@hull.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>McLoughlin</SurName>
-    <EmailAddress>mailto:Michael.McLoughlin@hull.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml
deleted file mode 100644
index 57c5ed3f..00000000
--- a/swamid-interfederations-2.0/shibo.vkol.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibo.vkol.cz/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2015-12-08T15:12: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>
-    <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:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vkol.cz</shibmd:Scope>
-      <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">Research Library in Olomouc</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Vědecká knihovna v Olomouci</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for patrons and staff of Research Library in Olomouc</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro čtenáře a zaměstance Vědecké knihovny v Olomouci</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.vkol.cz/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.vkol.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="40">https://shibo.vkol.cz/logo_40.png</mdui:Logo>
-        <mdui:Logo height="90" width="91">https://shibo.vkol.cz/logo_90.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>
-MIIDIDCCAgigAwIBAgIVANklP/WPGioD4uJOxCiHuW1lyYvLMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owHhcNMTUxMDI3MTMzNDM5WhcN
-MzUxMDI3MTIzNDM5WjAYMRYwFAYDVQQDDA1zaGliby52a29sLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhK6yT8AnPYSFrdvpNPrk0/8CT77AHMcx
-KchaopWFfmb740mzgeMqM9fR6WomOHhqv8EoB+nxdnEBnVn0schp3F6Xuh5FK1d4
-TR6Hbc2LM1cZRlsXeUT1bk9SVkfI8pJV0va2Q/ffW1eKypXRuotD8NMA5L/SBo3I
-pQsPIDmb2zufEJQ2TPG3nCQ4viX+qPqs9Ptils7ZyNMywkxiYDIkYYttdP7hoduH
-pHTZF6lBbVME+VYJPfrTdPvbb72WlnysrrhcEmqMUirdcb4KQSmCuJ9rXVFhxq50
-mHD/ikn63M4DGKfFPOkMcedVjV76NuM6mc/9BIBUc4GjLfxspwtjTwIDAQABo2Ew
-XzAdBgNVHQ4EFgQUdjZRkENDX91W48XAsxxJEsyX3M4wPgYDVR0RBDcwNYINc2hp
-Ym8udmtvbC5jeoYkaHR0cHM6Ly9zaGliby52a29sLmN6L2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAU2soh0Qe8YuEjVUYFEoZwdpZSAbxqV7ffVQQx
-ZDP8V7NS1yhiuSpaltYarEKEe79Roikw4o85TDoTLqOKHjvDBEoTEESDoEeEt85w
-CzsskVpEzKc9abziC+swCWwGp7h1hlmStE1+wqMENw7tu5bfG8TjVXazV6JAB/uW
-ch/yHVANoJSXRI1Lg5sQ6YJD48CJyk3HKxLegiBdArok3rupcUMzpU9Ibbi2lUe+
-+jRxhQBU9X1CRgb5y6UdeWrFmE5N3tMsRP1D5hEOFDXzpMO+9N+mqNT74HXVHmBh
-IunquFiwHqaq+d/VHve7lJaNERMGP8dnUjTisHQYoBXzzE2Y
-                        </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>
-MIIDHzCCAgegAwIBAgIUFpKDcZj8pgvy6pKI1EiT0+Z7PpAwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNc2hpYm8udmtvbC5jejAeFw0xNTEwMjcxMzM0MzdaFw0z
-NTEwMjcxMjM0MzdaMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDtm2eqb0mrOJR6/N76g8cADzU0Ba0rMwD
-LctnNi0s2Aj4pldpFinbF27krFNszV1pcpw9Ts9SmS27j6hhE0njlgG/+TsL2NAJ
-5h6fd/Zh+GD2WXKJhs7m5CsX5dIK8xCcY3CrZMtWay+tdTn9ZPm8fV61+dHJ/cA2
-c1MPD8ICd1iAjR+coAxkFO6nBWs64F1DC/bCVSKVltzGWcfpOS2QQVHEt9ptQ3ja
-iY51LVAdzHtUQM5DBXR7MvjsXbl9EjGahj/CRCkL95oiDr0kKjgqJXFiIgigRwWa
-JJ3WHIHD1am9m+V3bjhaSa2s6X6eTHD4XhZXkbByEz245dgR8dGFAgMBAAGjYTBf
-MB0GA1UdDgQWBBQU1Iq8GcJcBtzVSgnAblOs5nzafTA+BgNVHREENzA1gg1zaGli
-by52a29sLmN6hiRodHRwczovL3NoaWJvLnZrb2wuY3ovaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAHCLtsaQyGsVuR+Nqd+sk0qu5CdMMq3t4Dpi8AfL
-3WmzMobgZtnlT+M9k1/zQ8E/+RD9WALxFuWhywxI8An7Xvu4UShtjIOlYNlr6Xec
-t6JyKWyrPk4Lg6dhrd+Fm6OzTTYOtwDR/KoMx8O3mONzGLFp5qAvYbveEUqYlOZ5
-Y+n53tBF9hIjkOYsO/z0GUlu96PncZeZ96vc5Vm9lkW0gs7druFFc/GgUZ+1RB/R
-MrZqvpCJ8ufxMWB+d+Y0ogq5CXmYrvbVYiQf+KieHmY7jw7/oBTnYnM8JANC2pwe
-FhbZRUsHucC16PyRIVtne6BJfM1mwy6+BQTNUAl9y4KXO9U=
-                        </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>
-MIIDIDCCAgigAwIBAgIVAKS9iTg+VmzdK2E7t2F4uc9lX0QAMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owHhcNMTUxMDI3MTMzNDM4WhcN
-MzUxMDI3MTIzNDM4WjAYMRYwFAYDVQQDDA1zaGliby52a29sLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkrVwD9sKCqANF5mPXpBx8NTNogEBFFjZ
-LhxdGZrmM/VQGRtzd+Apgf6UxY6X20BPARo3TvgedQVvYhjC4TFU43J54CxepHwN
-igC0mLQ6F8K4RHmE3YzX5/ziocIqXTvbpleIDrHCX0mdIDbBPZ9JchDCXTJXiJCg
-TwVq+wKAv6ujgCsUQtDdEkVbhH/5b3VUMnLvJC6pweJ0MLTHUULHGcTtZkuS4mAV
-+/xCuBNqz4AHSXPViKIfZ/eOE8c2l7USkGeKk1IyDvnF7P479cAdjw34C7gSe+1z
-8TwErZYbwbex530yZGsid0gOlKN8Chb12hKaDOU8oqhFEFCgVcQskwIDAQABo2Ew
-XzAdBgNVHQ4EFgQUNbt7QAsyt7NEHn/xvN6BEgV3900wPgYDVR0RBDcwNYINc2hp
-Ym8udmtvbC5jeoYkaHR0cHM6Ly9zaGliby52a29sLmN6L2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQBvf8Q6BumhEbT4H1K9clkLLepE8LrafTWFniv8
-2LXIqltCEcMjCerhAaXtcDBVBKFKFJx6kdO5aWQ+bdVZ45E1JMnS099aLyaj+Db2
-3wc4MiVGnsgWvJtUW4ebAWrggW4AG23NEta3Gq9bMzh4d4LVacK4Num85KlW5Ptg
-6stUJZ+7qQ2f66PByYeQ7KuIyfyYeQeC9Jdxhqh+f4eq55hfoe+xTiyqee+XjVSi
-v+8IGZJ5jUs5oKN/zYrSkLwtgg05gLGRRohYmrOenaIdvtJN7zezoZOEaq1G6scC
-EFATVycEnZXPpoVMS/L8mnJxbKmTSRcsOn8gsOBYLVIV03Zw
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibo.vkol.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibo.vkol.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibo.vkol.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibo.vkol.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibo.vkol.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibo.vkol.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibo.vkol.cz/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">vkol.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVANklP/WPGioD4uJOxCiHuW1lyYvLMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owHhcNMTUxMDI3MTMzNDM5WhcN
-MzUxMDI3MTIzNDM5WjAYMRYwFAYDVQQDDA1zaGliby52a29sLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhK6yT8AnPYSFrdvpNPrk0/8CT77AHMcx
-KchaopWFfmb740mzgeMqM9fR6WomOHhqv8EoB+nxdnEBnVn0schp3F6Xuh5FK1d4
-TR6Hbc2LM1cZRlsXeUT1bk9SVkfI8pJV0va2Q/ffW1eKypXRuotD8NMA5L/SBo3I
-pQsPIDmb2zufEJQ2TPG3nCQ4viX+qPqs9Ptils7ZyNMywkxiYDIkYYttdP7hoduH
-pHTZF6lBbVME+VYJPfrTdPvbb72WlnysrrhcEmqMUirdcb4KQSmCuJ9rXVFhxq50
-mHD/ikn63M4DGKfFPOkMcedVjV76NuM6mc/9BIBUc4GjLfxspwtjTwIDAQABo2Ew
-XzAdBgNVHQ4EFgQUdjZRkENDX91W48XAsxxJEsyX3M4wPgYDVR0RBDcwNYINc2hp
-Ym8udmtvbC5jeoYkaHR0cHM6Ly9zaGliby52a29sLmN6L2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAU2soh0Qe8YuEjVUYFEoZwdpZSAbxqV7ffVQQx
-ZDP8V7NS1yhiuSpaltYarEKEe79Roikw4o85TDoTLqOKHjvDBEoTEESDoEeEt85w
-CzsskVpEzKc9abziC+swCWwGp7h1hlmStE1+wqMENw7tu5bfG8TjVXazV6JAB/uW
-ch/yHVANoJSXRI1Lg5sQ6YJD48CJyk3HKxLegiBdArok3rupcUMzpU9Ibbi2lUe+
-+jRxhQBU9X1CRgb5y6UdeWrFmE5N3tMsRP1D5hEOFDXzpMO+9N+mqNT74HXVHmBh
-IunquFiwHqaq+d/VHve7lJaNERMGP8dnUjTisHQYoBXzzE2Y
-                        </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>
-MIIDHzCCAgegAwIBAgIUFpKDcZj8pgvy6pKI1EiT0+Z7PpAwDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNc2hpYm8udmtvbC5jejAeFw0xNTEwMjcxMzM0MzdaFw0z
-NTEwMjcxMjM0MzdaMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCDtm2eqb0mrOJR6/N76g8cADzU0Ba0rMwD
-LctnNi0s2Aj4pldpFinbF27krFNszV1pcpw9Ts9SmS27j6hhE0njlgG/+TsL2NAJ
-5h6fd/Zh+GD2WXKJhs7m5CsX5dIK8xCcY3CrZMtWay+tdTn9ZPm8fV61+dHJ/cA2
-c1MPD8ICd1iAjR+coAxkFO6nBWs64F1DC/bCVSKVltzGWcfpOS2QQVHEt9ptQ3ja
-iY51LVAdzHtUQM5DBXR7MvjsXbl9EjGahj/CRCkL95oiDr0kKjgqJXFiIgigRwWa
-JJ3WHIHD1am9m+V3bjhaSa2s6X6eTHD4XhZXkbByEz245dgR8dGFAgMBAAGjYTBf
-MB0GA1UdDgQWBBQU1Iq8GcJcBtzVSgnAblOs5nzafTA+BgNVHREENzA1gg1zaGli
-by52a29sLmN6hiRodHRwczovL3NoaWJvLnZrb2wuY3ovaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAHCLtsaQyGsVuR+Nqd+sk0qu5CdMMq3t4Dpi8AfL
-3WmzMobgZtnlT+M9k1/zQ8E/+RD9WALxFuWhywxI8An7Xvu4UShtjIOlYNlr6Xec
-t6JyKWyrPk4Lg6dhrd+Fm6OzTTYOtwDR/KoMx8O3mONzGLFp5qAvYbveEUqYlOZ5
-Y+n53tBF9hIjkOYsO/z0GUlu96PncZeZ96vc5Vm9lkW0gs7druFFc/GgUZ+1RB/R
-MrZqvpCJ8ufxMWB+d+Y0ogq5CXmYrvbVYiQf+KieHmY7jw7/oBTnYnM8JANC2pwe
-FhbZRUsHucC16PyRIVtne6BJfM1mwy6+BQTNUAl9y4KXO9U=
-                        </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>
-MIIDIDCCAgigAwIBAgIVAKS9iTg+VmzdK2E7t2F4uc9lX0QAMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDXNoaWJvLnZrb2wuY3owHhcNMTUxMDI3MTMzNDM4WhcN
-MzUxMDI3MTIzNDM4WjAYMRYwFAYDVQQDDA1zaGliby52a29sLmN6MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkrVwD9sKCqANF5mPXpBx8NTNogEBFFjZ
-LhxdGZrmM/VQGRtzd+Apgf6UxY6X20BPARo3TvgedQVvYhjC4TFU43J54CxepHwN
-igC0mLQ6F8K4RHmE3YzX5/ziocIqXTvbpleIDrHCX0mdIDbBPZ9JchDCXTJXiJCg
-TwVq+wKAv6ujgCsUQtDdEkVbhH/5b3VUMnLvJC6pweJ0MLTHUULHGcTtZkuS4mAV
-+/xCuBNqz4AHSXPViKIfZ/eOE8c2l7USkGeKk1IyDvnF7P479cAdjw34C7gSe+1z
-8TwErZYbwbex530yZGsid0gOlKN8Chb12hKaDOU8oqhFEFCgVcQskwIDAQABo2Ew
-XzAdBgNVHQ4EFgQUNbt7QAsyt7NEHn/xvN6BEgV3900wPgYDVR0RBDcwNYINc2hp
-Ym8udmtvbC5jeoYkaHR0cHM6Ly9zaGliby52a29sLmN6L2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQBvf8Q6BumhEbT4H1K9clkLLepE8LrafTWFniv8
-2LXIqltCEcMjCerhAaXtcDBVBKFKFJx6kdO5aWQ+bdVZ45E1JMnS099aLyaj+Db2
-3wc4MiVGnsgWvJtUW4ebAWrggW4AG23NEta3Gq9bMzh4d4LVacK4Num85KlW5Ptg
-6stUJZ+7qQ2f66PByYeQ7KuIyfyYeQeC9Jdxhqh+f4eq55hfoe+xTiyqee+XjVSi
-v+8IGZJ5jUs5oKN/zYrSkLwtgg05gLGRRohYmrOenaIdvtJN7zezoZOEaq1G6scC
-EFATVycEnZXPpoVMS/L8mnJxbKmTSRcsOn8gsOBYLVIV03Zw
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibo.vkol.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibo.vkol.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">Vědecká knihovna v Olomouci</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Research Library in Olomouc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">Vědecká knihovna v Olomouci</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Research Library in Olomouc</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vkol.cz/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.vkol.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Petr</md:GivenName>
-    <md:SurName>Novák</md:SurName>
-    <md:EmailAddress>petr.novak@ruk.cuni.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibprodapp.loyola.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/shibprodapp.loyola.edu-idp-shibboleth.xml
deleted file mode 100644
index e207a7b0..00000000
--- a/swamid-interfederations-2.0/shibprodapp.loyola.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +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://shibprodapp.loyola.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">loyola.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Loyola University Maryland</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>
-MIIDQzCCAiugAwIBAgIUWLSGsZvWl23rl/5DUpC+PY0gdCowDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYnByb2RhcHAubG95b2xhLmVkdTAeFw0xMTAyMTcx
-NjUyMDVaFw0zMTAyMTcxNjUyMDVaMCExHzAdBgNVBAMTFnNoaWJwcm9kYXBwLmxv
-eW9sYS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQk81WTkU5
-3/Uns2puutfJt6fcr6cp8g0PLhU7TdS824eRZRquLENS9zP8Qutne8pziezilohM
-M+iDrOcqfyjXTG/NZYkzNy7pbx31YYUYMsEvP5OwIky/+GZrBUiAv15y9P5pJ+v7
-OT/BoJU97ZbRmyLgLlyXEtJQqZ4dbaSTNN9BKUUeIF34ejVY6KmUlk4MECa52MhV
-hANAQrzk154KLBPE/bM4TKZ1je7C2KTDo1dsyrN/nbRbvN3fZp5pEvsLNVgxSd85
-WwOKpSO1nxns53JrroU+1JyjcT1N3JEHokmZV94md61d82fPn8KvRI8klAQtjHmn
-lNL/cUXlcDQ/AgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJwcm9kYXBwLmxveW9s
-YS5lZHWGLWh0dHBzOi8vc2hpYnByb2RhcHAubG95b2xhLmVkdS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU41Dh0cyz/KaBIxUJgmD2l3POdowwDQYJKoZIhvcNAQEF
-BQADggEBAGGNbwqn2yK4GO3IQAzqmc3t4g6hxVV4RiArdcl/vXka6T6/qabXADa2
-4FET0JtmQb82iwVWYB1trIFv0Vx/uNIzOW8runPeH845ue+KUJhLiOs+L5uO1qxj
-ht/rW5SFnbRAX0v4KyQ3YUpnnL0335rWfuCVnyni2pzAfSzYb5/wJMvP74wI+FuJ
-/mtQFyJMOEnJVoUFX46HaugtDOQBrFR+lsjVgZxqlEFsVAkEumReRKRD7lKKFjV8
-FvQGSFkWMaNqaxat36IGB684E28xf/OPEJ+0L/x83anw+zz7oPZHhUVnK72ps3al
-tni4iLs+Rp8r9iFpwZc5M51492MyihM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibprodapp.loyola.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibprodapp.loyola.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibprodapp.loyola.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibprodapp.loyola.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibprodapp.loyola.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibprodapp.loyola.edu/idp/profile/SAML2/POST-SimpleSign/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">loyola.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQzCCAiugAwIBAgIUWLSGsZvWl23rl/5DUpC+PY0gdCowDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYnByb2RhcHAubG95b2xhLmVkdTAeFw0xMTAyMTcx
-NjUyMDVaFw0zMTAyMTcxNjUyMDVaMCExHzAdBgNVBAMTFnNoaWJwcm9kYXBwLmxv
-eW9sYS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQk81WTkU5
-3/Uns2puutfJt6fcr6cp8g0PLhU7TdS824eRZRquLENS9zP8Qutne8pziezilohM
-M+iDrOcqfyjXTG/NZYkzNy7pbx31YYUYMsEvP5OwIky/+GZrBUiAv15y9P5pJ+v7
-OT/BoJU97ZbRmyLgLlyXEtJQqZ4dbaSTNN9BKUUeIF34ejVY6KmUlk4MECa52MhV
-hANAQrzk154KLBPE/bM4TKZ1je7C2KTDo1dsyrN/nbRbvN3fZp5pEvsLNVgxSd85
-WwOKpSO1nxns53JrroU+1JyjcT1N3JEHokmZV94md61d82fPn8KvRI8klAQtjHmn
-lNL/cUXlcDQ/AgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJwcm9kYXBwLmxveW9s
-YS5lZHWGLWh0dHBzOi8vc2hpYnByb2RhcHAubG95b2xhLmVkdS9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQU41Dh0cyz/KaBIxUJgmD2l3POdowwDQYJKoZIhvcNAQEF
-BQADggEBAGGNbwqn2yK4GO3IQAzqmc3t4g6hxVV4RiArdcl/vXka6T6/qabXADa2
-4FET0JtmQb82iwVWYB1trIFv0Vx/uNIzOW8runPeH845ue+KUJhLiOs+L5uO1qxj
-ht/rW5SFnbRAX0v4KyQ3YUpnnL0335rWfuCVnyni2pzAfSzYb5/wJMvP74wI+FuJ
-/mtQFyJMOEnJVoUFX46HaugtDOQBrFR+lsjVgZxqlEFsVAkEumReRKRD7lKKFjV8
-FvQGSFkWMaNqaxat36IGB684E28xf/OPEJ+0L/x83anw+zz7oPZHhUVnK72ps3al
-tni4iLs+Rp8r9iFpwZc5M51492MyihM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibprodapp.loyola.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibprodapp.loyola.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Loyola University Maryland</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Loyola University Maryland</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.loyola.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>James McCartin</md:GivenName>
-    <md:EmailAddress>jmccartin@loyola.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibserv.abdn.ac.uk-shibboleth.xml
deleted file mode 100644
index 1bee9119..00000000
--- a/swamid-interfederations-2.0/shibserv.abdn.ac.uk-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://shibserv.abdn.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Aberdeen.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-03-24T15:39: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">abdn.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Aberdeen</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://www.abdn.ac.uk/local/shibboleth/universitylogo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://www.abdn.ac.uk/local/shibboleth/favicon.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEYDCCA0igAwIBAgIJAKyEfiLtLS+qMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxETAPBgNVBAcTCEFiZXJkZWVuMR8w
-						HQYDVQQKExZVbml2ZXJzaXR5IG9mIEFiZXJkZWVuMRQwEgYDVQQLEwtJVCBTZXJ2
-						aWNlczEdMBsGA1UEAxMUc2hpYnNlcnYyLmFiZG4uYWMudWsxJTAjBgkqhkiG9w0B
-						CQEWFnNlcnZpY2VkZXNrQGFiZG4uYWMudWswHhcNMTMwNTI5MTQwMDEyWhcNMjMw
-						NTI3MTQwMDEyWjCBsDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMREw
-						DwYDVQQHEwhBYmVyZGVlbjEfMB0GA1UEChMWVW5pdmVyc2l0eSBvZiBBYmVyZGVl
-						bjEUMBIGA1UECxMLSVQgU2VydmljZXMxHTAbBgNVBAMTFHNoaWJzZXJ2Mi5hYmRu
-						LmFjLnVrMSUwIwYJKoZIhvcNAQkBFhZzZXJ2aWNlZGVza0BhYmRuLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxjGiuC2ICUaK41q9JytdjDtc
-						wh+gSpqeSVwFRdyjvLmZ8Y3r1be9yX0+7dqse0RmwPST6I1EX+K2hdwQA3BKqemm
-						puDVz0z5bra8Xo/vSxNfMpB0mEoH/52j5rGRuq7sXnrnfprbgX2iw7vAgTNDnlGE
-						9RjAYXRZI4n+8baD6nGSKhnVxI3FBSnDknyAjrkPBJdScENBlu09YJWOKTN6RpWB
-						5heA6wqQSJfrgzhLsyIVtz5bxO/FQa5hTgytbs+vtPutu2Q0oANo4Y1yZatt4oQE
-						28eoLvJTHq2z9PO4qbs2xUkAl7XZ/moN8zjj2JuFe0GeEnf+L5qknYM+oAw0MwID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUfGZPIqt5aq2RSJNIdImK1zb36rcw
-						HwYDVR0jBBgwFoAUfGZPIqt5aq2RSJNIdImK1zb36rcwDQYJKoZIhvcNAQEFBQAD
-						ggEBAHK++6fKCQdVwNJW2zkiLWaHI82Ea/YE/8q9LXJjLE5iiCg+Nl8fjxW1Oad6
-						BhH6a9cAsada37Ppyt8+Y8yGrc5lwJHd1d5XupaFyojs4FuJ3eOb9cOHIG7P62Q5
-						NB0D7c52UvZDJkY3Z0OEmBhMWTFxK+H+B8B5QzAeQGWHGYScUAyelYg6kkQVeWyP
-						c+4InQwPaNfaS0QqachIQKxq2DIrhpWIC191CemLyuPi/1cqiqQoe/BCEZ4LuGAe
-						gnrpddtYjDrcly5nGW+xcCzHmxJE11pNuvBs3smlTrl2KWSo376k4hCTMXJkCSna
-						/Of8WnJZ6TQKBGIFWx6paDusZPY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibserv2.abdn.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibserv2.abdn.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://shibserv2.abdn.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibserv2.abdn.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibserv2.abdn.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibserv2.abdn.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">abdn.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEYDCCA0igAwIBAgIJAKyEfiLtLS+qMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxETAPBgNVBAcTCEFiZXJkZWVuMR8w
-						HQYDVQQKExZVbml2ZXJzaXR5IG9mIEFiZXJkZWVuMRQwEgYDVQQLEwtJVCBTZXJ2
-						aWNlczEdMBsGA1UEAxMUc2hpYnNlcnYyLmFiZG4uYWMudWsxJTAjBgkqhkiG9w0B
-						CQEWFnNlcnZpY2VkZXNrQGFiZG4uYWMudWswHhcNMTMwNTI5MTQwMDEyWhcNMjMw
-						NTI3MTQwMDEyWjCBsDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNjb3RsYW5kMREw
-						DwYDVQQHEwhBYmVyZGVlbjEfMB0GA1UEChMWVW5pdmVyc2l0eSBvZiBBYmVyZGVl
-						bjEUMBIGA1UECxMLSVQgU2VydmljZXMxHTAbBgNVBAMTFHNoaWJzZXJ2Mi5hYmRu
-						LmFjLnVrMSUwIwYJKoZIhvcNAQkBFhZzZXJ2aWNlZGVza0BhYmRuLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxjGiuC2ICUaK41q9JytdjDtc
-						wh+gSpqeSVwFRdyjvLmZ8Y3r1be9yX0+7dqse0RmwPST6I1EX+K2hdwQA3BKqemm
-						puDVz0z5bra8Xo/vSxNfMpB0mEoH/52j5rGRuq7sXnrnfprbgX2iw7vAgTNDnlGE
-						9RjAYXRZI4n+8baD6nGSKhnVxI3FBSnDknyAjrkPBJdScENBlu09YJWOKTN6RpWB
-						5heA6wqQSJfrgzhLsyIVtz5bxO/FQa5hTgytbs+vtPutu2Q0oANo4Y1yZatt4oQE
-						28eoLvJTHq2z9PO4qbs2xUkAl7XZ/moN8zjj2JuFe0GeEnf+L5qknYM+oAw0MwID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUfGZPIqt5aq2RSJNIdImK1zb36rcw
-						HwYDVR0jBBgwFoAUfGZPIqt5aq2RSJNIdImK1zb36rcwDQYJKoZIhvcNAQEFBQAD
-						ggEBAHK++6fKCQdVwNJW2zkiLWaHI82Ea/YE/8q9LXJjLE5iiCg+Nl8fjxW1Oad6
-						BhH6a9cAsada37Ppyt8+Y8yGrc5lwJHd1d5XupaFyojs4FuJ3eOb9cOHIG7P62Q5
-						NB0D7c52UvZDJkY3Z0OEmBhMWTFxK+H+B8B5QzAeQGWHGYScUAyelYg6kkQVeWyP
-						c+4InQwPaNfaS0QqachIQKxq2DIrhpWIC191CemLyuPi/1cqiqQoe/BCEZ4LuGAe
-						gnrpddtYjDrcly5nGW+xcCzHmxJE11pNuvBs3smlTrl2KWSo376k4hCTMXJkCSna
-						/Of8WnJZ6TQKBGIFWx6paDusZPY=                       
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibserv2.abdn.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibserv2.abdn.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 Aberdeen</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Aberdeen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.abdn.ac.uk/dit/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Morrow</SurName>
-    <EmailAddress>mailto:webmaster@abdn.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Morrow</SurName>
-    <EmailAddress>mailto:webmaster@abdn.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibsles.brunel.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index d6dcdd39..00000000
--- a/swamid-interfederations-2.0/shibsles.brunel.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://shibsles.brunel.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Brunel University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">brunel.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIJAPWdUCwLL6STMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNoaWJzbGVzLmJydW5lbC5hYy51azAeFw0xMjA2MDExMTMwMDFaFw0yMjA2
-						MDExMTMwMDFaMCAxHjAcBgNVBAMTFXNoaWJzbGVzLmJydW5lbC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeoXX34/IQVQfUnXhGeOIv+casO
-						4UTpWfR7m1jGvZwH29IDkD/yp1smabJz4uxHaMfgeN3KdjOThvkblPvElwuddnX0
-						ql6+zeJ0W/QaNU0dxgGzrUnaUcVsqmBH3onrR63dr94opNzYDw2SIV1HAhiUKCIM
-						A5zOAIEMTfSiS8xLxgQ8zR13tLPsq8TdRPoHDdqpbQFZOhxCD804NN3MvsN0LUnP
-						VvJ939m3aUpZbwjLlQsMgRBdkV7WfUxGggCfGgLMfuT8IoN555b0NzzsHdjIdCzi
-						jjpogH7HZYeIRn//qWCwz0Ulg6d/wpzyWW/YQhlkXiiP+LCRWbPtIBr4bskCAwEA
-						AaNxMG8wTgYDVR0RBEcwRYIVc2hpYnNsZXMuYnJ1bmVsLmFjLnVrhixodHRwczov
-						L3NoaWJzbGVzLmJydW5lbC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						Xp7b4ZI5lsrpyW2A+MmkBO+D/70wDQYJKoZIhvcNAQEFBQADggEBALimmRmPVvsh
-						gn3C/lssDcncpnnrNjhuMgjCkeO2Vh9bvDW4WDRgvNPsR2WXoRGFrFYB8DExh6Lk
-						+J92k7BKQtPriDYh+NtYxqc9z1pJxp0AIzh9DohkyY0QXllLjJ+GM5ddt0iRMAvJ
-						3tPbv2Kk6sZYIa2bgmQJiyjnDLFKHjihJk8cLzbWQ84NMZJmDyub+SpoEcFEcaZ7
-						0s54t2iEQpQ9z0JCYwZSE6JcBB0uxqxLEO79a2VJFTeQlf/u/0Urd6kVpprqh8rZ
-						84p18Y4QJKlwEQhkkqg8PykdSAHzaIDTN9N6qJjfdFSKLp0DRHWpeDqnbhlc2+8H
-						NySru11ACLA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibsles.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsles.brunel.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://shibsles.brunel.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsles.brunel.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibsles.brunel.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibsles.brunel.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">brunel.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIJAPWdUCwLL6STMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNoaWJzbGVzLmJydW5lbC5hYy51azAeFw0xMjA2MDExMTMwMDFaFw0yMjA2
-						MDExMTMwMDFaMCAxHjAcBgNVBAMTFXNoaWJzbGVzLmJydW5lbC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeoXX34/IQVQfUnXhGeOIv+casO
-						4UTpWfR7m1jGvZwH29IDkD/yp1smabJz4uxHaMfgeN3KdjOThvkblPvElwuddnX0
-						ql6+zeJ0W/QaNU0dxgGzrUnaUcVsqmBH3onrR63dr94opNzYDw2SIV1HAhiUKCIM
-						A5zOAIEMTfSiS8xLxgQ8zR13tLPsq8TdRPoHDdqpbQFZOhxCD804NN3MvsN0LUnP
-						VvJ939m3aUpZbwjLlQsMgRBdkV7WfUxGggCfGgLMfuT8IoN555b0NzzsHdjIdCzi
-						jjpogH7HZYeIRn//qWCwz0Ulg6d/wpzyWW/YQhlkXiiP+LCRWbPtIBr4bskCAwEA
-						AaNxMG8wTgYDVR0RBEcwRYIVc2hpYnNsZXMuYnJ1bmVsLmFjLnVrhixodHRwczov
-						L3NoaWJzbGVzLmJydW5lbC5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						Xp7b4ZI5lsrpyW2A+MmkBO+D/70wDQYJKoZIhvcNAQEFBQADggEBALimmRmPVvsh
-						gn3C/lssDcncpnnrNjhuMgjCkeO2Vh9bvDW4WDRgvNPsR2WXoRGFrFYB8DExh6Lk
-						+J92k7BKQtPriDYh+NtYxqc9z1pJxp0AIzh9DohkyY0QXllLjJ+GM5ddt0iRMAvJ
-						3tPbv2Kk6sZYIa2bgmQJiyjnDLFKHjihJk8cLzbWQ84NMZJmDyub+SpoEcFEcaZ7
-						0s54t2iEQpQ9z0JCYwZSE6JcBB0uxqxLEO79a2VJFTeQlf/u/0Urd6kVpprqh8rZ
-						84p18Y4QJKlwEQhkkqg8PykdSAHzaIDTN9N6qJjfdFSKLp0DRHWpeDqnbhlc2+8H
-						NySru11ACLA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibsles.brunel.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsles.brunel.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">Brunel University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brunel University (Old)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brunel.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alex</GivenName>
-    <SurName>Fraser</SurName>
-    <EmailAddress>mailto:alex.fraser@brunel.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alex</GivenName>
-    <SurName>Fraser</SurName>
-    <EmailAddress>mailto:alex.fraser@brunel.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibsp.ntu.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibsp.ntu.ac.uk-shibboleth.xml
deleted file mode 100644
index 89ea4cc4..00000000
--- a/swamid-interfederations-2.0/shibsp.ntu.ac.uk-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://shibsp.ntu.ac.uk/shibboleth">
-  <!--
-		This is a "NTU Confluence Service" Shibboleth SP for Nottingham Trent University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2007-12-06T11:10:29Z">
-      <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>
-						MIIEbjCCA1agAwIBAgIRAINZdo3dP0KuwGTsFOp3rQowDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA1MjkwMDAwMDBaFw0xNjA1MjgyMzU5NTlaMD4xITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQc2hpYnNwLm50
-						dS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALjSrervk/wV
-						ZiwDfbtcXMeFAaopjAy0e7cUKNvdKp7fPAqxmZWwD2Z3lWGjHBIX65SZvN1Tf8yc
-						FyW1f2LC4Pr8p6qSvtcqunw4MAM3TtGGjZCE2RDkMu21q7hxoadtWKgH89w4RgvK
-						1wUX0D06p/5OOXwbfQq4hH4hfjpdvZvk/AI4aw/Z7nVA4EtCqmE/g6nxOzpha96K
-						gzRpqcQQf7iCu+tKRathdsQ73rASZvSyofOz6IQvIjr/SWEvekDppGhxgOf8ZAmo
-						spLbk/mzNmXfJ3nQ4ohzN/dQy/3wq4bFw0Mczo3ro1KA5+UgCYg3VgmuyesMFDOa
-						kQmZUMYJqqsCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-						R+qQ47ntMB0GA1UdDgQWBBQo0vzESwtkG5NMv5hxlHw90yR7mTAOBgNVHQ8BAf8E
-						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-						c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQc2hpYnNwLm50dS5hYy51azAN
-						BgkqhkiG9w0BAQUFAAOCAQEAHbvvM7+e8Fy6zF7MXQBg0GkVyKXJVntproMyMFCl
-						V7rAkBskj1wqGekoWBCsbJjgufPVRTVvML0bb0YozvG87+ylkRnExP0hN5rxPp21
-						e045BvLwMOr2YoV5VO5LqezEZ2QfFDz4rg6zT1HoJiyt8bM+7KmlgWWX5bh8EY4/
-						N1aiE8XkC6/W0yuCvs0f/80m0QsWmyB+y034++yVFdcf4wlGfpYNa35uahVUjUgu
-						4VOhc9u8Jfzi1Zu3/q+zzoh0Uo71lKpSMkheTRTVM5jWEDbcUezX0ZSaZftRi/2o
-						RWaU8UjYRvmYN66UJFwccUT3ShNrqD2TR/qFSgGFq/7FpA==
-					</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://shibsp.ntu.ac.uk/Shibboleth.sso/SAML/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibsp.ntu.ac.uk/Shibboleth.sso/SAML/Artifact" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Nottingham Trent University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NTU Confluence service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Cross</SurName>
-    <EmailAddress>mailto:richard.cross@ntu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Hallam</SurName>
-    <EmailAddress>mailto:ITSShibbolethTechnical@ntu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml b/swamid-interfederations-2.0/shibsp.proofidcloud.co.uk-shibboleth.xml
deleted file mode 100644
index 22ea8240..00000000
--- a/swamid-interfederations-2.0/shibsp.proofidcloud.co.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://shibsp.proofidcloud.co.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for ProofID 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="2014-07-14T16:03:56Z">
-      <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">ProofID test Shibboleth service provider</mdui:DisplayName>
-        <mdui:Logo height="65" width="160">https://shibsp.proofidcloud.co.uk/images/pid_logo.png</mdui:Logo>
-        <mdui:Description xml:lang="en">Used to test Shibboleth SP and customers IdP's</mdui:Description>
-      </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://shibsp.proofidcloud.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://shibsp.proofidcloud.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJALfRd5E/JliNMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXNoaWJzcC5wcm9vZmlkY2xvdWQuY28udWswHhcNMTQwNzEzMTkyOTQ5WhcN
-						MjQwNzEwMTkyOTQ5WjAkMSIwIAYDVQQDExlzaGlic3AucHJvb2ZpZGNsb3VkLmNv
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxBuaLEBvbWgdgBpO
-						FnM1RM+OOwl5Qq8nlII0jxOC8c9991duuNTY/0yPPN2aMoSVjOhotqoekAZOsuLx
-						GpEzeqc1KR0JBmRp4qdY0tG4cZ8/8OPzNq/XVPGPhbIslbq05qgxD0862KwldjYl
-						M6y4SbicMSda/xH1+pLh08uk7JD/3fX0/0TzXzr+zObsd7cMwEsLcLcLR+hLZV+N
-						wZAeyk/0eiUO8buhCiGUUHQtcR+tJjLcG1Kw/O2E4/qQese1tptJ0aLecVoIMvjN
-						V47ryW/nzAAxDrb2roD6zy7mp0hQDqQbi0qU1zeOcs7CC/rmKiOpp66nCvURZQhT
-						SKQH1wIDAQABo0cwRTAkBgNVHREEHTAbghlzaGlic3AucHJvb2ZpZGNsb3VkLmNv
-						LnVrMB0GA1UdDgQWBBRMzbqD0mqYS6TTIHBm28ieLfmDLDANBgkqhkiG9w0BAQUF
-						AAOCAQEAXj/KoR+c73NwSHM9ZhdlB740D0cV4h9jnj1XsDHLUH8c1lNqJ1/bY9ZH
-						st+jsNRPwgHO+bUaRzafhiCwR68qEsQH9nh1tllacUa238j4TRdy0N1IVcrXYqCr
-						UMy77YWaeoK/CYPn0nPcCqjioIbYLgPfSi1ZPlsGNUwbPhihJcVqSHv8lqsdkGO3
-						gr0BxErS7qeWyO5zobMuwI8+iBecdRrQgszN8qxaJjOLyq2eTaFzgxtQnzbrSZSD
-						9CrnIlE7O4sZBY2VJAtaunwddT1dKQy+x8QDFQT0NwbvmQi4wQg5y0BSAyFvt/xV
-						brtz87FyltGkVZR1IVYfqb05znwnfQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shibsp.proofidcloud.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibsp.proofidcloud.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ProofID Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ProofID test Shibboleth service provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.proofid.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Heaney</SurName>
-    <EmailAddress>mailto:ukfed@proofid.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Heaney</SurName>
-    <EmailAddress>mailto:ukfed@proofid.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml b/swamid-interfederations-2.0/shibsp.test.openathens.net-shibboleth.xml
deleted file mode 100644
index fdfdc884..00000000
--- a/swamid-interfederations-2.0/shibsp.test.openathens.net-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://shibsp.test.openathens.net/shibboleth">
-  <!--
-		This is a Test Shibboleth SP for Eduserv.
-	-->
-  <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-10-19T09:15:34Z"/>
-  </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://shibsp.test.openathens.net/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAIk7Iq11rRt9MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnNoaWJzcC50ZXN0Lm9wZW5hdGhlbnMubmV0MB4XDTEyMTAxNzE0NDA0NFoX
-						DTIyMTAxNTE0NDA0NFowJTEjMCEGA1UEAxMac2hpYnNwLnRlc3Qub3BlbmF0aGVu
-						cy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWGWHhxgjISM46
-						9b3A8gkGUa2ylMd+Ubx/41jPo8a9F0edLOfcJRrJz3yXz4fyqkfO7kINyQzN3mv3
-						CsLOu3SfYfS+oPlQV0UjRrwCJooGZgSYRCl1XzSesRUWUw6S42kc39z10KEKfC4o
-						8o3yvsef+OAMB6GpvY3JeiqzN8iSKZFRwr9hAA670YVs3PaGJtKcsGTIidX6PbXl
-						s7P9z6mnysxOLMVaPOFmo0poCLgEAmAg/8nIYd19sHJbT4Zp0rhLG31Re4P9b8IU
-						3YEUsNFlSQ7/9n69rYlthriKBq+Lu8dPfG8oHrBKmqmeDYAdHla5J00lCEJX6pjP
-						+F4a7x7rAgMBAAGjSDBGMCUGA1UdEQQeMByCGnNoaWJzcC50ZXN0Lm9wZW5hdGhl
-						bnMubmV0MB0GA1UdDgQWBBSNL+bmIEoGpOitytkAJWqzqQVexzANBgkqhkiG9w0B
-						AQUFAAOCAQEAh6YPN9WA+ie41e+xTwepOMsupMgdJAvO3Pj2GqTRV7ub8oYHsNPz
-						e4hnUgy3PgWZUprg2Xu0dR80UaCt76RZktkywhE5Ese6gRzCnw5naeq+BohzZYhT
-						3aQqYN/3seBxz7q2ykidNM/FAuK0wzoS4kekkValdz58KNlqM5dFWyahc8nHN+3Q
-						PbHhdrEP/5L39XmhM1jCI3DUOL0FupAeosuYPOSfA7eTha7pPKc4hbdPrBWDumBz
-						49zWCVrzQN0i1CSS9gy9YBiqjnns9/ziNp6qb1VX2BIJ9Po6llnGAYOR6DLLgcYQ
-						3+F3/x57N94upwLaCaoj+04/l3acLW3ylQ==
-					</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://shibsp.test.openathens.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibsp.test.openathens.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv Test Shibboleth SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibtest.copac.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibtest.copac.ac.uk-shibboleth.xml
deleted file mode 100644
index 45bca2f8..00000000
--- a/swamid-interfederations-2.0/shibtest.copac.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibtest.copac.ac.uk/shibboleth">
-  <!--
-		This is a "MIMAS Copac Test" Shibboleth SP for the University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIEqzCCA5OgAwIBAgIQNaQKyn5I3KvJMbfFiT6fKDANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDExMDAwMDAwMFoXDTE2MDExMDIzNTk1OVoweDELMAkGA1UE
-						BhMCR0IxEzARBgNVBAgTClNvbWUtU3RhdGUxJTAjBgNVBAoTHFRoZSBVbml2ZXJz
-						aXR5IG9mIE1hbmNoZXN0ZXIxDjAMBgNVBAsTBU1pbWFzMR0wGwYDVQQDExRzaGli
-						dGVzdC5jb3BhYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AOB8APPzklLfr8onf7jJ5QWXg9qSwyv4OD7MI1CKlhTWb823O3iPX75XIjqZjFO9
-						EAZTxUwOBIxpmIWKt54HFt6jyuRAUVXxb9itICpOvI4lPqZuL9SiSOieT4p3lDCB
-						dXnoI4+JP6HUwc6EKHLhyRW0Q3bHjhSvxuArMNBRFSt6Ub8/IsytCdjai9rekQvH
-						+w2Rxv4c3TnRXemESfytPpyPVeBnBP/A5M73+oQ4ZOBrP7kr/6jDbaAWBRPzY4vV
-						TZInHKt3nhD8lD0avETHCVKPrXSHl7/NkGCeFQjb35Wrh2yMCb4X4C21mbbSc7Co
-						jxngvxKjZG3i29oCjOmDhAUCAwEAAaOCAXEwggFtMB8GA1UdIwQYMBaAFAy9k2gM
-						896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRs6qv/R9HUiqMWPiSJnw4MsKEt2TAO
-						BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-						AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgIw
-						OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-						TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-						Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-						aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUc2hpYnRlc3Qu
-						Y29wYWMuYWMudWswDQYJKoZIhvcNAQEFBQADggEBADK9aNSziNKbrsd/FCh1Cpiz
-						R8rgs1dV1XVT/4ujJXJB1D9reS7GFdeBAQfmzyr91p18JE91biGPCJ6lepimmwxZ
-						qNSvAWXN9XzVBmEzsx//9bYfG6D6NkbAcwiRq55IcqU46dhEV6WDGB8oMroYn9HW
-						cSbQ9aiheN+O6a/SRBZypTJGeNiQdCa66OpGjs73nGe4mvb36CPr1fzWbGf3gWG5
-						HgPzIhypbVI4JpBORlHqKDsC8MvgxIkyUhWwNyLBlC6fijceMN3rmHz98CefeG0a
-						S5e2E/dEHa+2m10+7mwUvLMiPVuCWlHXFKnowQb7f9R/riTtQWAi/MFqib3RS2Y=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibtest.copac.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MIMAS Copac Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mimas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Copac Helpdesk</GivenName>
-    <EmailAddress>mailto:copac@mimas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibtest.ex.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index df183748..00000000
--- a/swamid-interfederations-2.0/shibtest.ex.ac.uk-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" entityID="https://shibtest.ex.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP for the University of Exeter.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-17T17:49: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">exeter.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAIy6kv9GigBZ9U3z8fU8Mx1ZZgITMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEXNoaWJ0ZXN0LmV4LmFjLnVrMB4XDTE0MDQwMzEyMTU0
-						NFoXDTM0MDQwMzEyMTU0NFowHDEaMBgGA1UEAxMRc2hpYnRlc3QuZXguYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCGliS4d9uxBYDLZbK65nnF
-						iOww/S5w/YUPIAFiEhcyc7pMYalA5hQ6u24jdJB2wCPws5zRNo4LCDhBI9HcEg1l
-						4/4cUQ9CCfroqYxKCvFoUMGIMD67YC1kyEl5EyI0IfTyMcaBM0ZC/w7sFizle34P
-						/o5HYgs2LH4A/oOrL1tnXStp7KIr86AolereIiuhPGTwRRZBKRpuTlL/H6OutQnR
-						id50ELwScoYGb8AMshr2/zi1A4qFRIrAKukzARMzzIEsA+HVTvSmoBE7c+Dd+xD1
-						9ysn3WJW8NZ0brpqMEf4l+mL/3zASMMOKncWs4fJtumZEDEibLn+WOjmNwgLTYMd
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJ0ZXN0LmV4LmFjLnVrhihodHRwczov
-						L3NoaWJ0ZXN0LmV4LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQN7xG3
-						UNjLDL6+INIwixGOlqLKIjANBgkqhkiG9w0BAQUFAAOCAQEAPMJapSaPkXzXLCjf
-						gVn2/oOiORjWRHXMbAOAbVDZV8JDogSSAHOBnyoWm1EEq/7YsuCN2E0LIeCkesN/
-						3l5Te5sDLGVTsGgA38ZsCEARSgXTKtd7K12gN9PwrONxiWs8H2s4O+XWZXmSypnj
-						iAdNlsIaUIXm+9D2iCQf6AYGZGNLgTI/IpYcTO+bWM8j7+CLLRIZbgSGq5mxXvrH
-						cgnzzj6gsts4WdkjxbjFiamiKs7OcrccBoEwF+SbkhyLafqiH7RG4m37j/JTNCg7
-						vX0KDQfY9ZUswe33O2BqbGmS6XWET6Dx039Kh0RSn4aq3bQq0sZqU3z2QrN9qwxW
-						GU4XtQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibtest.ex.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.ex.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://shibtest.ex.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.ex.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.ex.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.ex.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">exeter.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIVAIy6kv9GigBZ9U3z8fU8Mx1ZZgITMA0GCSqGSIb3DQEB
-						BQUAMBwxGjAYBgNVBAMTEXNoaWJ0ZXN0LmV4LmFjLnVrMB4XDTE0MDQwMzEyMTU0
-						NFoXDTM0MDQwMzEyMTU0NFowHDEaMBgGA1UEAxMRc2hpYnRlc3QuZXguYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCGliS4d9uxBYDLZbK65nnF
-						iOww/S5w/YUPIAFiEhcyc7pMYalA5hQ6u24jdJB2wCPws5zRNo4LCDhBI9HcEg1l
-						4/4cUQ9CCfroqYxKCvFoUMGIMD67YC1kyEl5EyI0IfTyMcaBM0ZC/w7sFizle34P
-						/o5HYgs2LH4A/oOrL1tnXStp7KIr86AolereIiuhPGTwRRZBKRpuTlL/H6OutQnR
-						id50ELwScoYGb8AMshr2/zi1A4qFRIrAKukzARMzzIEsA+HVTvSmoBE7c+Dd+xD1
-						9ysn3WJW8NZ0brpqMEf4l+mL/3zASMMOKncWs4fJtumZEDEibLn+WOjmNwgLTYMd
-						AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNoaWJ0ZXN0LmV4LmFjLnVrhihodHRwczov
-						L3NoaWJ0ZXN0LmV4LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQN7xG3
-						UNjLDL6+INIwixGOlqLKIjANBgkqhkiG9w0BAQUFAAOCAQEAPMJapSaPkXzXLCjf
-						gVn2/oOiORjWRHXMbAOAbVDZV8JDogSSAHOBnyoWm1EEq/7YsuCN2E0LIeCkesN/
-						3l5Te5sDLGVTsGgA38ZsCEARSgXTKtd7K12gN9PwrONxiWs8H2s4O+XWZXmSypnj
-						iAdNlsIaUIXm+9D2iCQf6AYGZGNLgTI/IpYcTO+bWM8j7+CLLRIZbgSGq5mxXvrH
-						cgnzzj6gsts4WdkjxbjFiamiKs7OcrccBoEwF+SbkhyLafqiH7RG4m37j/JTNCg7
-						vX0KDQfY9ZUswe33O2BqbGmS6XWET6Dx039Kh0RSn4aq3bQq0sZqU3z2QrN9qwxW
-						GU4XtQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibtest.ex.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.ex.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 Exeter</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Exeter Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.as.exeter.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Exeter IT Helpdesk</GivenName>
-    <EmailAddress>mailto:Helpdesk@exeter.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:L.W.Taylor@exeter.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Pete</GivenName>
-    <SurName>Leggett</SurName>
-    <EmailAddress>mailto:P.F.Leggett@exeter.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibtest.idp.mimas.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/shibtest.idp.mimas.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index c1a4da59..00000000
--- a/swamid-interfederations-2.0/shibtest.idp.mimas.ac.uk-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://shibtest.idp.mimas.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Mimas development" Shibboleth IdP for The University of Manchester.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">mimas.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIVAN7ga1+uXpDOX1/droiJ39Pl1TLUMA0GCSqGSIb3DQEB
-						BQUAMCMxITAfBgNVBAMTGHNoaWJ0ZXN0LmlkcC5taW1hcy5hYy51azAeFw0xMDA3
-						MTAxNDE4NTdaFw0zMDA3MTAxNDE4NTdaMCMxITAfBgNVBAMTGHNoaWJ0ZXN0Lmlk
-						cC5taW1hcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI5a
-						s9OeylQjgw9Ikt2LQ0PeyVpArU30QKiawZ0vTELSAYGmguMnDqONV6TpYeBA6ul1
-						/Yk50Qc8VoSLbz6gXINVdAHykSsYj4hdiAbKZUcu4+5GLvQ2/WRdsAQ+SHoL3IoD
-						V0u9rkSfuHH/TdVpF/Ub+FT2bRDqVWnxdePhKwyc6rFVu7fl4aJ9sPwaCykbF8YL
-						RvDjm+yRbO2REUv2j1S5ALKpem5RsSlk8BO/7N2GC9BZ45OdUyNEs61O0HSnTr5I
-						W8TIAyKkbHjPgDog26pFRBpIOXUGwX8iLTPd/A4t8OfivW+yQHhRly8DIJvEkmLQ
-						uQmFFsJYiD0cgcHEvLcCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYnRlc3QuaWRw
-						Lm1pbWFzLmFjLnVrhi9odHRwczovL3NoaWJ0ZXN0LmlkcC5taW1hcy5hYy51ay9p
-						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUF8HL505cOeu0WSjw1vYH0cpDUlUwDQYJ
-						KoZIhvcNAQEFBQADggEBADaxi5Bc/h9oaFU8tuD1V67gUlwPsNTU8lR3vlOGZqan
-						3gxFnmOAkB+GOyqOSZ2TKyQkSMslpV4Vh1CVYl/tCzojfjd0vtu/BGyj+GwkwLBH
-						v3xee+AZAE14ENQwNCakQmylSDk4Jrd+4L2LgaAj/HXO2LC2y4WpekFSo1LdBHIo
-						64Ar2nuXGtzIuQ1xaQP/uzhkbTSRn67RYWfNXaoy8gAbSVC64YfQPQsGrutJZBxr
-						hnd57QZ3WTyqB0/30TrDkpPkL3GAjrdoUAMfG7wBYagR+soc+1URAr8oP+shK8M/
-						uSohqKcoLLVvY0qjE+AzYlX6YdrpGbad1nCO6WOIm/0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibtest.idp.mimas.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.idp.mimas.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://shibtest.idp.mimas.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.idp.mimas.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.idp.mimas.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.idp.mimas.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">mimas.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTDCCAjSgAwIBAgIVAN7ga1+uXpDOX1/droiJ39Pl1TLUMA0GCSqGSIb3DQEB
-						BQUAMCMxITAfBgNVBAMTGHNoaWJ0ZXN0LmlkcC5taW1hcy5hYy51azAeFw0xMDA3
-						MTAxNDE4NTdaFw0zMDA3MTAxNDE4NTdaMCMxITAfBgNVBAMTGHNoaWJ0ZXN0Lmlk
-						cC5taW1hcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI5a
-						s9OeylQjgw9Ikt2LQ0PeyVpArU30QKiawZ0vTELSAYGmguMnDqONV6TpYeBA6ul1
-						/Yk50Qc8VoSLbz6gXINVdAHykSsYj4hdiAbKZUcu4+5GLvQ2/WRdsAQ+SHoL3IoD
-						V0u9rkSfuHH/TdVpF/Ub+FT2bRDqVWnxdePhKwyc6rFVu7fl4aJ9sPwaCykbF8YL
-						RvDjm+yRbO2REUv2j1S5ALKpem5RsSlk8BO/7N2GC9BZ45OdUyNEs61O0HSnTr5I
-						W8TIAyKkbHjPgDog26pFRBpIOXUGwX8iLTPd/A4t8OfivW+yQHhRly8DIJvEkmLQ
-						uQmFFsJYiD0cgcHEvLcCAwEAAaN3MHUwVAYDVR0RBE0wS4IYc2hpYnRlc3QuaWRw
-						Lm1pbWFzLmFjLnVrhi9odHRwczovL3NoaWJ0ZXN0LmlkcC5taW1hcy5hYy51ay9p
-						ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUF8HL505cOeu0WSjw1vYH0cpDUlUwDQYJ
-						KoZIhvcNAQEFBQADggEBADaxi5Bc/h9oaFU8tuD1V67gUlwPsNTU8lR3vlOGZqan
-						3gxFnmOAkB+GOyqOSZ2TKyQkSMslpV4Vh1CVYl/tCzojfjd0vtu/BGyj+GwkwLBH
-						v3xee+AZAE14ENQwNCakQmylSDk4Jrd+4L2LgaAj/HXO2LC2y4WpekFSo1LdBHIo
-						64Ar2nuXGtzIuQ1xaQP/uzhkbTSRn67RYWfNXaoy8gAbSVC64YfQPQsGrutJZBxr
-						hnd57QZ3WTyqB0/30TrDkpPkL3GAjrdoUAMfG7wBYagR+soc+1URAr8oP+shK8M/
-						uSohqKcoLLVvY0qjE+AzYlX6YdrpGbad1nCO6WOIm/0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibtest.idp.mimas.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.idp.mimas.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 University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Manchester: Mimas Development IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://mimas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mimas helpdesk</GivenName>
-    <EmailAddress>mailto:info@mimas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml b/swamid-interfederations-2.0/shibtest.informit.com.au-shibboleth.xml
deleted file mode 100644
index 22a488f7..00000000
--- a/swamid-interfederations-2.0/shibtest.informit.com.au-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://shibtest.informit.com.au/shibboleth">
-  <!--
-		This is an "Informit" Shibboleth SP for RMIT Training Pty Ltd.
-	-->
-  <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="2014-11-18T09:01:07Z">
-      <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://shibtest.informit.com.au/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://shibtest.informit.com.au/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://shibtest.informit.com.au/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://shibtest.informit.com.au/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://shibtest.informit.com.au/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://shibtest.informit.com.au/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shibtest.informit.com.au/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://shibtest.informit.com.au/Shibboleth.sso/TESTtestDS" index="3"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Informit</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Informit is the premier source of core research and resources from the Australasian region.</mdui:Description>
-        <mdui:Logo height="43" width="136">https://search.informit.com.au/images-v4/logo-informit.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIJANAW6lqADfvcMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHNoaWJ0ZXN0LmluZm9ybWl0LmNvbS5hdTAeFw0xMjEwMDgwMzIxMjBaFw0y
-						MjEwMDYwMzIxMjBaMCMxITAfBgNVBAMTGHNoaWJ0ZXN0LmluZm9ybWl0LmNvbS5h
-						dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/16egiJMNo0s7luNCB
-						57tJ0Lvpe/CuA5MeEJJGnwumGP4tmmYjaLsO+7m1L5HVnH99JlPoY5XXLDIXpB46
-						R3VMs0yS5FkvSF3GKdKtzNdGNUKZwJHVyevayJbIoSFgsTzjdrKfn0f7wFl1gT/o
-						j8I8FWy+dzj6oFqQTd1hGQoIh/sqd6QoDJ3GYDR2LJUkmkYZbx+Y3XhEWXpklWzz
-						PTx47StStcciRwcpLQ5/PTiQPUjuzl4L3TuhpNt9jy7+min9zYrCVBjOKvjRIBKL
-						53G5WyAeHPn5Woe2c52Ryy5bZn07WG0xQbkpRfBXZm8JidyGZlZ3UQbFqk0vRmOA
-						k/kCAwEAAaNzMHEwUAYDVR0RBEkwR4IYc2hpYnRlc3QuaW5mb3JtaXQuY29tLmF1
-						hitodHRwczovL3NoaWJ0ZXN0LmluZm9ybWl0LmNvbS5hdS9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBS29MuUEdmm7liCK8DyPCyiBUnfNDANBgkqhkiG9w0BAQUFAAOCAQEA
-						KY+aK2b6zeMx50dKwVqjtsNMaUPI+Cwp2+ghJyG/j2NUmpeTRPwVBRPnifRFKSi6
-						UXCI+eRzP4vJqbdksIebPr0feqwEHD5XDrbYeDmOLM4IN2u/ykVuSDIqFVV4rwTr
-						Yf6JyJCYJoebja/DtiqRE2nqDIrOYgdzreGyTHRm+PaVlEv9DSapC324F+WZDwoo
-						aqtGszguF/5Km8U1LJxLaQTyYV0skSJEhKWK8c41Erip2Iuv4c3gT/J0ML5sY1xB
-						h6LqQQCPoFMVqQPIacUcCcKA5scEpnxtalUccX8h6zOdpDjijSPRABuFJVRD4kWl
-						2jG8gQO/jLpnk4IGfgwN1w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shibtest.informit.com.au/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.informit.com.au/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.informit.com.au/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.informit.com.au/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.informit.com.au/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibtest.informit.com.au/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RMIT Training Pty Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Informit</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.informit.com.au/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Informit Support</GivenName>
-    <EmailAddress>mailto:support@rmitpublishing.com.au</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Deepak</GivenName>
-    <SurName>Vasa</SurName>
-    <EmailAddress>mailto:deepak.vasa@rmit.edu.au</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibtest.zetoc.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shibtest.zetoc.mimas.ac.uk-shibboleth.xml
deleted file mode 100644
index e5824607..00000000
--- a/swamid-interfederations-2.0/shibtest.zetoc.mimas.ac.uk-shibboleth.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://shibtest.zetoc.mimas.ac.uk/shibboleth">
-  <!--
-		This is a "MIMAS Zetoc Service Test" Shibboleth SP for the University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIID+jCCAuKgAwIBAgIJALJQK6WnWBR9MA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNV
-						BAYTAkdCMRMwEQYDVQQHEwpNYW5jaGVzdGVyMSUwIwYDVQQKExxUaGUgVW5pdmVy
-						c2l0eSBvZiBNYW5jaGVzdGVyMQ4wDAYDVQQLEwVNaW1hczEjMCEGA1UEAxMac2hp
-						YnRlc3QuemV0b2MubWltYXMuYWMudWswHhcNMTMwMTMwMTIyODQwWhcNMjMwMTI4
-						MTIyODQwWjB+MQswCQYDVQQGEwJHQjETMBEGA1UEBxMKTWFuY2hlc3RlcjElMCMG
-						A1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UECxMFTWlt
-						YXMxIzAhBgNVBAMTGnNoaWJ0ZXN0LnpldG9jLm1pbWFzLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwYrzV9W4FRjd960nw7LQiR5ThpyMeY1K
-						tDzt4WG6K3hKfPrvbddxa5RjsQV2HbnTjEguOwM5pVqgYClgEP5TDRPWzzKwp/uF
-						l1RNPFAdzpYZry3+b5IOyTipOLaH0lSX2sxGeHzeM42Qk7sv5ze8M1OifovcMEUK
-						NZER6/evAJbUSwIpuYrom6WSyRP9cPFz/8aLHoQjVsk1GcXXEcfACGWKCHO4ImaB
-						y1+PfLgM7z8x4hGYM0Ovrmy6S3F4lnoS9E44l1nee2eicPEWRFepdprKEcl8sdF+
-						t/uhBeDX7AH2D3dzCJ7yxRzNKtOeKCKgpUjNxCTl75XmhGTLk4f4LwIDAQABo3sw
-						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
-						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUwxHyq5lUAiW+S9Wcs0KtNf9+mGswHwYDVR0j
-						BBgwFoAUwxHyq5lUAiW+S9Wcs0KtNf9+mGswDQYJKoZIhvcNAQEFBQADggEBAGf5
-						LwIB+2JMqPXXkE8giX64mlkKDUDvwht3dlkN5vV9pbejCghaY/aEFGGOw88tmGhw
-						L+as0lPq0kCvdUGRP1/N5zU198gLOvL6i6Oo3psCVgSIobEd+eIjBqJj+/KcjyU9
-						yhembQl9SuEgzUiGzkE2giwOv1SnD605/sSjrnBuPdI2PU3/r0tsipB1IN4PXRtK
-						epdNWNz3pMY8i82Zt86ehzgR/V1UJhAgJ53v8UCaAj+OuQGSiiOBUGnG8eDbm9ET
-						bA1OE1Qdd7atomQvFpRilpWvYVFDjd9v7oEovrcc0oZJ9ObIcFug951Kfpvhk4d7
-						XR9LvyjviSLUKhaEZa0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibtest.zetoc.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MIMAS Zetoc Service Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://mimas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Zetoc Helpdesk</GivenName>
-    <EmailAddress>mailto:zetoc@mimas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shidp.glam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shidp.glam.ac.uk-shibboleth.xml
deleted file mode 100644
index e1fa5cb5..00000000
--- a/swamid-interfederations-2.0/shidp.glam.ac.uk-shibboleth.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://shidp.glam.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of South Wales.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">glam.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAOq/2C/MoDMaYd36KL3bSPyQItVzMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEHNoaWRwLmdsYW0uYWMudWswHhcNMTIxMTIxMTA1NTE0
-						WhcNMzIxMTIxMTA1NTE0WjAbMRkwFwYDVQQDExBzaGlkcC5nbGFtLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnzmaVL9I3yNiqKniGKG1pRF
-						WeRejOpNJia1Y7wGxD4WjiMyVMf3nhRGLFDtQgVxB0xFbkzuxRmcZxRb+YiPR/Dy
-						P4ASQJ2QgOpWj7YUMk48nEq1G3A747bWVzwiRBs1XXN2BT4dvhgYXfTxiFKVWOdv
-						ffGOixfNfmF2+y9KSQ138izkIewG1ZL4e+OB0zRe182rAr0w9mchZb7+VAV5BW6q
-						tVLekPky+WDA4FWHI2CFC/9NyGnzmEqxQczdSF/b5qCHm0HUTV2AO415wAc2yyKH
-						XVgeCx4TahSrh9/08xAySDYZIY96CkNOahNjN6FG0iBAC0lGgxWX5nTB+PBt+QID
-						AQABo2cwZTBEBgNVHREEPTA7ghBzaGlkcC5nbGFtLmFjLnVrhidodHRwczovL3No
-						aWRwLmdsYW0uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL6PJ9Ijs6+h
-						r6RavogHch1LNQ+JMA0GCSqGSIb3DQEBBQUAA4IBAQAjwbTW6ulWDIbwoJl0bs2S
-						+akVMUNN5/y03Uy87vMs+x/C+8H5qKb77zCcT0ey5qtXWjxrguKzyskEiGiIN7zu
-						MwaAbQFWRXyWfyanR182Ff15emFrETH9QTprRp/XYIjs5VmL6rUHtVyRrFq5tTAw
-						fVxnP0tcwpKoAcs4TUvGFokcY0RHjxutrYKXKA2T9/kJXkqXcYJII8LAe0QOJ6Qx
-						AWjHb1nOc8EIMekqmGuiQMmvBnp86qHn2Dpm4bioErd4401iF+mHfpTdaLEu0YUr
-						whThODhFpFOM7D3ct8xJhHG1lK+wwqGzn32PVvxKlXGAVr42J1ejVDKdRXA2rCtY
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shidp.glam.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shidp.glam.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://shidp.glam.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shidp.glam.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shidp.glam.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shidp.glam.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">glam.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIVAOq/2C/MoDMaYd36KL3bSPyQItVzMA0GCSqGSIb3DQEB
-						BQUAMBsxGTAXBgNVBAMTEHNoaWRwLmdsYW0uYWMudWswHhcNMTIxMTIxMTA1NTE0
-						WhcNMzIxMTIxMTA1NTE0WjAbMRkwFwYDVQQDExBzaGlkcC5nbGFtLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnzmaVL9I3yNiqKniGKG1pRF
-						WeRejOpNJia1Y7wGxD4WjiMyVMf3nhRGLFDtQgVxB0xFbkzuxRmcZxRb+YiPR/Dy
-						P4ASQJ2QgOpWj7YUMk48nEq1G3A747bWVzwiRBs1XXN2BT4dvhgYXfTxiFKVWOdv
-						ffGOixfNfmF2+y9KSQ138izkIewG1ZL4e+OB0zRe182rAr0w9mchZb7+VAV5BW6q
-						tVLekPky+WDA4FWHI2CFC/9NyGnzmEqxQczdSF/b5qCHm0HUTV2AO415wAc2yyKH
-						XVgeCx4TahSrh9/08xAySDYZIY96CkNOahNjN6FG0iBAC0lGgxWX5nTB+PBt+QID
-						AQABo2cwZTBEBgNVHREEPTA7ghBzaGlkcC5nbGFtLmFjLnVrhidodHRwczovL3No
-						aWRwLmdsYW0uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFL6PJ9Ijs6+h
-						r6RavogHch1LNQ+JMA0GCSqGSIb3DQEBBQUAA4IBAQAjwbTW6ulWDIbwoJl0bs2S
-						+akVMUNN5/y03Uy87vMs+x/C+8H5qKb77zCcT0ey5qtXWjxrguKzyskEiGiIN7zu
-						MwaAbQFWRXyWfyanR182Ff15emFrETH9QTprRp/XYIjs5VmL6rUHtVyRrFq5tTAw
-						fVxnP0tcwpKoAcs4TUvGFokcY0RHjxutrYKXKA2T9/kJXkqXcYJII8LAe0QOJ6Qx
-						AWjHb1nOc8EIMekqmGuiQMmvBnp86qHn2Dpm4bioErd4401iF+mHfpTdaLEu0YUr
-						whThODhFpFOM7D3ct8xJhHG1lK+wwqGzn32PVvxKlXGAVr42J1ejVDKdRXA2rCtY
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shidp.glam.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shidp.glam.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 South Wales</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of South Wales</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.glam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services Support</GivenName>
-    <EmailAddress>mailto:itsupport@southwales.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Sewell</SurName>
-    <EmailAddress>mailto:kevin.sewell@southwales.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shu-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/shu-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 8b4564cd..00000000
--- a/swamid-interfederations-2.0/shu-shib.hosted.exlibrisgroup.com-shib.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://shu-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "Sheffield Hallam University" Shibboleth SP for Ex Libris (UK) 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="2015-06-08T13:43:20Z">
-      <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://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sheffield Hallam University - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of Sheffield Hallam University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAMbLNjH7IdN7MA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMjgwHhcNMTUwNDAyMTkyMjE5WhcNMjUwMzMwMTkyMjE5WjASMRAw
-						DgYDVQQDEwdhaW8wMDI4MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						lmjeE3y9jL60+iV+qcDYc6/nOs5YIyeLpkSYmQmIyhxDdHWNowH71qEO5esUrvAU
-						Gt2Fz1fp4ZNc5IRDXhqEG5w/5RHVRdtVTWYQBrZKKtgVrwwC76mAl7sHCvexFep6
-						FvWE7jhIi/ybRDKO9Ajqow4oPFk5YPOaRj7qy2Rk92b6SSz8YMVU3U8Mn9WdSKNk
-						EyhjwqM9TnTPLGttjZGOmXc5o2lbvt9NjJU3BeG8Sr1dx6JHEBXfuXPUns15Ry27
-						bAtbWslGKxpgt9ubJE6FICGslRPxpXJTpMYW7D+jFHqPSimSb4GUzhDJULSMyZpe
-						mooKno/Lsu3lFQ1el9IevwIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDI4MB0G
-						A1UdDgQWBBThYVZfmqu4Vlq+kYervlubORuF5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						QjAAP63C1Letp+5hXqZCGCyV47Xox+HhKfsM4jq2IC8/2CwvuoDyvnWL6AHtDRxw
-						1hlM5MP13AIrRzhN0oLsJVnfshgXRs0WvpyzlARIZECnMqXDNq4amdLp/ydRgWOE
-						xXnlvEqdbbnZ0gJueeiWrO6TeCvIoiUpv9LqjnqYnPUbFMfD7M63B1y2f6FeCwMK
-						3EcRGV15x15BRqn20jupvVsGr7FkRN49LV8qu6U+Ff3E88SOmqLAP9ELvCAZ2MM0
-						fd+fRWW+0dWqB9jA2+UE1R4V+6NiJVESYmnc+pfeVOtt8kinJ3fXa3kjFgwN7gZt
-						616nxaRmxDQmzhRhAYD2LA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shu-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Sheffield Hallam University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shu.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/shu.unidesk.ac.uk-shibboleth.xml
deleted file mode 100644
index 3145b644..00000000
--- a/swamid-interfederations-2.0/shu.unidesk.ac.uk-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://shu.unidesk.ac.uk/shibboleth">
-  <!--
-		This is a "Unidesk - Sheffield Hallam University" Shibboleth SP owned by the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-18T13:51:31Z">
-      <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://shu.unidesk.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAPHsl6kKrFrnMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEmxpdmUudW5pZGVzay5hYy51azAeFw0xMjA0MTExNDU4MjhaFw0yMjA0MDkx
-						NDU4MjhaMB0xGzAZBgNVBAMTEmxpdmUudW5pZGVzay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAL9qh/Dehm5jJdWdeFPNKqcjMdiqii8Iz9Rc
-						tCAsEwRsYww4EQDG7MxG5hg4NSS+iIPFCp9gR+G7hTnZAMGgNpxs2vk4vs9lmhRY
-						GmB7Y1NFloP9Pcsu+MaufaLzxi6bzIXV4dBVHqVnIcgxchDIsXmPE6xlq4poEq+q
-						XJ3aFE/eWwxfwN9z0s5yeICzsil73xk9T9NLeNAeYq+jfVTcdqDbBHY6eHtMOYh/
-						uPVYYxkKXjkgSH5cwG0b+7qN4z+uzKDNBXxnI1Nz+bLOazXW6ljQIDtAPQZMJSlr
-						3OepVaQS+fMBi0Sku5yvADgINdXxkz6H4Zx4pZg/rTQBQ/8u2esCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISbGl2ZS51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBQ2tPlzxC8e
-						akC2nh9qrG4TWfI3tzANBgkqhkiG9w0BAQUFAAOCAQEAWPY3Nv9ChZ+4XVNANhLq
-						fGF7SbiPmUNj9vWGNjCp8Ma0tdDOZPvqBRzxKkkR+LS+fHpSQQ54RuNeZrulWBiN
-						akZe3LZiSH9AHG2uD0lDuxr0UQt1AHGDiLjFXuRg9+CdqqrdT3Anmy6exDDfRsjH
-						k+ZJflkEtqTNd0dbEVlkYlg8Baqx/ZMOxkccx8PtQt1yptAMsH4Rn92vXLd9d3JM
-						H1mrFuiriqrgsAfVLmzc4WeGmB+dK01cSB+CY7hKnoe7ds1y7kNhOmZ9HP3Iy7ev
-						gF2RCdnqkP9zScihW4b20PlVa/sWMUyCj2uZE1lSO51PJcGVU0H/JFrBEpaM7u6t
-						jg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shu.unidesk.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Unidesk - Sheffield Hallam University</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>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</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 50fbedda..00000000
--- a/swamid-interfederations-2.0/si.crous-rouen.fr-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://si.crous-rouen.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CROUS Rouen - Personnels</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz21SHZjEMBSc63fw8GEwGCwWi4vFxcXi4uLiYvGwWAwGi8VgMRgMDh7sXbfbu1B+Zt6bmZePZU23kPFnXeiDNAkW4ONkG6vP+0pEDlBCDMqZXw0jICByeb1WwD+EEwPA3yP4uwdQyRGtNdaOnjBRaoAHQLVvQIhBupaB0FGvq9RPveXVAJ97toJn+llPkW5JAL2qhbHcEwQQvDSO0mfS5qXT7H1YYhTXNrcHYDbT2HwTkkkXh9H6u13GvoEI0mLK8i5payGSZ9/Tl4SQkBVfw9C2rbV2J+k9BaZlopa6c5eua1s9Zo5PQAQowNMMSBh3vQ9/Z09SRCrB2+jUunmeg/cHdAghxvgzB9nVME0H0Uvf7znzHKZpcs69YgWf0ijG1JdHHG/d+dw2jXU2pRTXNI2jqgL4IHn1KaayuRfRktc8T3ldSKqt6673t5NssR6/E4sY6853SwKEqACl0KgA+AYQWrENjB9HAAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODozMCswMjowMLV1rusAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6MzArMDI6MDDEKBZXAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crous-rouen.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CROUS Rouen - Personnels</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>
-					      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>
-    </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-POST" Location="https://si.crous-rouen.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://si.crous-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://si.crous-rouen.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-rouen.fr</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://si.crous-rouen.fr/idp/profile/SAML1/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">CROUS Rouen - Personnels</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CROUS Rouen - Personnels</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crous-rouen.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>service-informatique@crous-rouen.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 2c1fdf66..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://siaiap08.univali.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://siaiap08.univali.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://siaiap08.univali.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://siaiap08.univali.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://siaiap08.univali.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://siaiap08.univali.br/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">univali.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://siaiap08.univali.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://siaiap08.univali.br:8443/idp/profile/SAML1/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">UNIVALI - Universidade do Vale do Itajai</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNIVALI - Universidade do Vale do Itajai</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNIVALI - Universidade do Vale do Itajai</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univali.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.univali.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Marcio Luiz Ota</md:SurName>
-    <md:EmailAddress>admin@univali.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f1f3e57c..00000000
--- a/swamid-interfederations-2.0/siaiap08.univali.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://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>
-    MIIDMDCCAhgCAQAwDQYJKoZIhvcNAQEFBQAwXjExMC8GA1UECxMoRGVwYXJ0YW1l
-bnRvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxHDAa
-BgNVBAMTE3NpYWlhcDA4LnVuaXZhbGkuYnIwHhcNMTExMDMxMjAxNjA2WhcNMTQx
-MDMwMjAxNjA2WjBeMTEwLwYDVQQLEyhEZXBhcnRhbWVudG8gZGUgVGVjbm9sb2dp
-YSBkYSBJbmZvcm1hY2FvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTc2lhaWFwMDgu
-dW5pdmFsaS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSPve5D
-Psco2/eYX9R9DiqIIL8DWjxDBgkaG/JPsh70NBQ/VQvLEXiFJhD9e2VrsGbQTeIk
-FmRwkNn2TrE6EjAytZrut5bMPOpQJ3NtvQO29KqJHV6IOId9LSSNLjzYgFoGw72F
-g655GbwWWsB7wkERVZqKV3X/2jc5rMVvo2eb3u1u5bSQsd4CMznPlDYcNoA8fibD
-vxy11mtCAuB3AqfvUQ8isPYPDTQHP/U12/HUok9QXEGEMdPRwxNDeKZ5am2hzLrl
-OrurbGkHC2RaMmoYwtigZVuvj5oGrwJqGhb7zMyuWqhpU1T3f3xrC0aIu4UpBFDP
-Chg44DL0KgOVwkcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMSkGCAcfrSqA4SX+
-r/vTJs8yyMMC4y7+QepZ769jUKKOpCQN4SYrm/yRFcCZSXeT3Z/2EDaYdFfwn2fA
-GqObZCHyxXPwM6dn1bDFh9GYHoYG9HAHf3yCeb1J0ZWW884H3twJ4bQDGijOTGLq
-8mACaAeFZ4mMMhA9SboOPplRiy+71wG2Qy0PaRT/jBXFUHBB0NWMDkz9rGHpd5NL
-TZuudxelwa4buucQEmg0MDfeNVkIgSQ8a4Y4AQZRHbrKI4Fd3PFNa08uyyQrvwCZ
-IM6gRRG03yPs2TlFwq7DFCcYvCvRxlgSYzDVTkbVDgmJjuykGmfnSxFtFhQfxppB
-r+ccYg==
-            </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>
-       MIIDMDCCAhgCAQAwDQYJKoZIhvcNAQEFBQAwXjExMC8GA1UECxMoRGVwYXJ0YW1l
-bnRvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzELMAkGA1UEBhMCQlIxHDAa
-BgNVBAMTE3NpYWlhcDA4LnVuaXZhbGkuYnIwHhcNMTExMDMxMjAxNjA2WhcNMTQx
-MDMwMjAxNjA2WjBeMTEwLwYDVQQLEyhEZXBhcnRhbWVudG8gZGUgVGVjbm9sb2dp
-YSBkYSBJbmZvcm1hY2FvMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTc2lhaWFwMDgu
-dW5pdmFsaS5icjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSPve5D
-Psco2/eYX9R9DiqIIL8DWjxDBgkaG/JPsh70NBQ/VQvLEXiFJhD9e2VrsGbQTeIk
-FmRwkNn2TrE6EjAytZrut5bMPOpQJ3NtvQO29KqJHV6IOId9LSSNLjzYgFoGw72F
-g655GbwWWsB7wkERVZqKV3X/2jc5rMVvo2eb3u1u5bSQsd4CMznPlDYcNoA8fibD
-vxy11mtCAuB3AqfvUQ8isPYPDTQHP/U12/HUok9QXEGEMdPRwxNDeKZ5am2hzLrl
-OrurbGkHC2RaMmoYwtigZVuvj5oGrwJqGhb7zMyuWqhpU1T3f3xrC0aIu4UpBFDP
-Chg44DL0KgOVwkcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMSkGCAcfrSqA4SX+
-r/vTJs8yyMMC4y7+QepZ769jUKKOpCQN4SYrm/yRFcCZSXeT3Z/2EDaYdFfwn2fA
-GqObZCHyxXPwM6dn1bDFh9GYHoYG9HAHf3yCeb1J0ZWW884H3twJ4bQDGijOTGLq
-8mACaAeFZ4mMMhA9SboOPplRiy+71wG2Qy0PaRT/jBXFUHBB0NWMDkz9rGHpd5NL
-TZuudxelwa4buucQEmg0MDfeNVkIgSQ8a4Y4AQZRHbrKI4Fd3PFNa08uyyQrvwCZ
-IM6gRRG03yPs2TlFwq7DFCcYvCvRxlgSYzDVTkbVDgmJjuykGmfnSxFtFhQfxppB
-r+ccYg==
-
-                    
-            </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/sid.kent.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sid.kent.ac.uk-shibboleth.xml
deleted file mode 100644
index 387f53ff..00000000
--- a/swamid-interfederations-2.0/sid.kent.ac.uk-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://sid.kent.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth Identity Provider for the University of Kent.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">kent.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Kent</mdui:DisplayName>
-        <mdui:Logo height="177" width="236">https://jordan.kent.ac.uk/images/logo.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://jordan.kent.ac.uk/images/icon-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>129.12.0.0/16</mdui:IPHint>
-        <mdui:IPHint>195.195.86.0/23</mdui:IPHint>
-        <mdui:IPHint>195.195.88.0/24</mdui:IPHint>
-        <mdui:IPHint>195.195.89.0/26</mdui:IPHint>
-        <mdui:IPHint>195.195.89.128/25</mdui:IPHint>
-        <mdui:DomainHint>kent.ac.uk</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:51.29861,1.07059</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:51.39781,0.54197</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:51.19263,0.27140</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:48.841877,2.331676</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:50.82142,4.39169</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUFTvaqDYnEQRtqGKyg61iRHS6DSMwDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAwwRam9yZGFuLmtlbnQuYWMudWswHhcNMTYwMTA0MTAxMTEw
-						WhcNMzYwMTA0MTAxMTEwWjAcMRowGAYDVQQDDBFqb3JkYW4ua2VudC5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPTxfRvmsz9ZUZ/XJ/YEvjWj
-						B5eBdqEekSIeQxPX9Sag5dviyteNEWYn+VQT0CEfWt3gnRrZicaMI4z11kT1lH8E
-						Vis1tmOhchvQqeA3JMH8ASUnv5PpvjQ+D+xrsVmNf+K6ZuaHw9iV5509ndazEC0q
-						p/MceBtvE359Gsx3LN/VQjP/i5FflbzjPFvaTZfPq8LcNLYCZRZOs8lIfKd2cKFk
-						4kczBdfRdUtirK6zXYPxdL1aGl0rZkAy6f6rNTFA9/nPbHcMkRJYJAkQaoBnI7mE
-						rUsFsN8zLSQtmtMocmYFN3y16lQtgStOjZFqgg+ngHdqBuWBaG/r8AteHAgEyasC
-						AwEAAaNpMGcwHQYDVR0OBBYEFFuFstjVrT6bJ3asam2XRxCk1BYCMEYGA1UdEQQ/
-						MD2CEWpvcmRhbi5rZW50LmFjLnVrhihodHRwczovL2pvcmRhbi5rZW50LmFjLnVr
-						L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQC1EXf13aibZ6FUdPQa
-						GC/dvmHAVOWHSBB3jGfXCh5r3rJxMzy0pEk3/rmSFyFal/nYR1GxlK6MOB3PxpKZ
-						Se8Ne1/79MFnXamPtZumumIJ90Duo8IpJnGpznd1xMARZuh5rmy611lTJVsbdEeC
-						SB4oepAPrk1DYqAUodRdT8ZdJKK1KavYVkVDzlEvV6utEx3MWJUMx8Q82s2uiV/5
-						dQPzWrErw8Gs+/eXIP4upOzSNTJPMb3DGqjol90Zva5b4gDtBaKBEfT+FqJmIeup
-						j6vg6TghDxdXZTqf631sCMtZHCiuSE1ErlrleXwIi6GCCSoDjCEWG36E8Yi/291n
-						LkgY
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jordan.kent.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jordan.kent.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://jordan.kent.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jordan.kent.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jordan.kent.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jordan.kent.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">kent.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUFTvaqDYnEQRtqGKyg61iRHS6DSMwDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAwwRam9yZGFuLmtlbnQuYWMudWswHhcNMTYwMTA0MTAxMTEw
-						WhcNMzYwMTA0MTAxMTEwWjAcMRowGAYDVQQDDBFqb3JkYW4ua2VudC5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPTxfRvmsz9ZUZ/XJ/YEvjWj
-						B5eBdqEekSIeQxPX9Sag5dviyteNEWYn+VQT0CEfWt3gnRrZicaMI4z11kT1lH8E
-						Vis1tmOhchvQqeA3JMH8ASUnv5PpvjQ+D+xrsVmNf+K6ZuaHw9iV5509ndazEC0q
-						p/MceBtvE359Gsx3LN/VQjP/i5FflbzjPFvaTZfPq8LcNLYCZRZOs8lIfKd2cKFk
-						4kczBdfRdUtirK6zXYPxdL1aGl0rZkAy6f6rNTFA9/nPbHcMkRJYJAkQaoBnI7mE
-						rUsFsN8zLSQtmtMocmYFN3y16lQtgStOjZFqgg+ngHdqBuWBaG/r8AteHAgEyasC
-						AwEAAaNpMGcwHQYDVR0OBBYEFFuFstjVrT6bJ3asam2XRxCk1BYCMEYGA1UdEQQ/
-						MD2CEWpvcmRhbi5rZW50LmFjLnVrhihodHRwczovL2pvcmRhbi5rZW50LmFjLnVr
-						L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQC1EXf13aibZ6FUdPQa
-						GC/dvmHAVOWHSBB3jGfXCh5r3rJxMzy0pEk3/rmSFyFal/nYR1GxlK6MOB3PxpKZ
-						Se8Ne1/79MFnXamPtZumumIJ90Duo8IpJnGpznd1xMARZuh5rmy611lTJVsbdEeC
-						SB4oepAPrk1DYqAUodRdT8ZdJKK1KavYVkVDzlEvV6utEx3MWJUMx8Q82s2uiV/5
-						dQPzWrErw8Gs+/eXIP4upOzSNTJPMb3DGqjol90Zva5b4gDtBaKBEfT+FqJmIeup
-						j6vg6TghDxdXZTqf631sCMtZHCiuSE1ErlrleXwIi6GCCSoDjCEWG36E8Yi/291n
-						LkgY
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://jordan.kent.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jordan.kent.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 Kent</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Kent</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kent.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Slowe</SurName>
-    <EmailAddress>mailto:M.Slowe@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sid.swarthmore.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sid.swarthmore.edu-idp-shibboleth.xml
deleted file mode 100644
index da1cf862..00000000
--- a/swamid-interfederations-2.0/sid.swarthmore.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,74 +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://sid.swarthmore.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">swarthmore.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Swarthmore College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Swarthmore College</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>
-MIIDNDCCAhygAwIBAgIVAO7xcYpBnwYIVTLfF6pF14NXi0KmMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNpZC5zd2FydGhtb3JlLmVkdTAeFw0xNDAyMTAyMDEw
-MThaFw0zNDAyMTAyMDEwMThaMB0xGzAZBgNVBAMTEnNpZC5zd2FydGhtb3JlLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKFxkzJbUP/JjWW42xxm
-D5TOzoB5iQDgXTkSaN54Oe7oSDFzPb2KwavU6VJcnoT7uRARElQ+aYvKsVHlMWH9
-M8XS7V5i7VPVg0UnGSHa311O+ur2oqi4HInZJ54mldyY8XywWl3rYu4xLLUAl5+t
-LXlnus1UmWdxBqiyaGQlYy0YVkPBG2M6lvBsLUOdG2r7hha4yvqrnPgbAAADIz/v
-aOSq+lB4g9ApDoPPB4ucwq8p3bGKmtiuJCdGDlpsahIYsm/2ifGnkVfyU3pCAdfr
-aO+pAU4z8tS53d2gRTrBXH0R8C8jBeaF/qXCN52Kl+oYP76Z68Jt3XL/CUg7DwWj
-B0ECAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2lkLnN3YXJ0aG1vcmUuZWR1hilodHRw
-czovL3NpZC5zd2FydGhtb3JlLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-T6SCMFLKsSwfvX3fgI77E4c3xz8wDQYJKoZIhvcNAQEFBQADggEBACje/CpQzRRc
-jrrNnirMbg3ERMwkLTtP6Ou2lrp8thPk5L+pIwsmdHJFpxtlQbqDSALRu16N68LF
-Efmx8GeTEKl60MIhVfCmf1glaE4D02gKL3P8M5USPNYcFuLjjpHacEwK26ASxNbe
-+N2ClItzuz2GP4KVgLgjPOkugeQNZT3DrKmsRMHBoqbkrIOM02c6YuhcnuHXNKV8
-G+CNVVb2DBJTvVkhO3f17lY/dklyI2gdwVllRNFBAnmy1Df9aWkDyKjUOJ/8q/fF
-CE6FGmpQsHtUKkKdVS5iUqYG7e6khmfvWCCsU25yjK9G05ktEvFcD/3FCsyGG3hs
-BaXUFreM06I=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sid.swarthmore.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sid.swarthmore.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sid.swarthmore.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Swarthmore College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swarthmore College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.swarthmore.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth Admin</md:GivenName>
-    <md:EmailAddress>shib-admin@swarthmore.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Glenn Stauffer</md:GivenName>
-    <md:EmailAddress>stauffer@swarthmore.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Michael Clemente</md:GivenName>
-    <md:EmailAddress>mclemen2@swarthmore.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Jason Rotunno</md:GivenName>
-    <md:EmailAddress>jrotunno@swarthmore.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Swarthmore Support</md:GivenName>
-    <md:EmailAddress>help@swarthmore.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sidp.wwu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sidp.wwu.edu-idp-shibboleth.xml
deleted file mode 100644
index dc96b6be..00000000
--- a/swamid-interfederations-2.0/sidp.wwu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,64 +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://sidp.wwu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">wwu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Western Washington University</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>
-MIIDHDCCAgSgAwIBAgIVAIyxNK+nL1tj4FcJPnDbbol76zmjMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNpZHAud3d1LmVkdTAeFw0xMzAzMDQyMTI0MDBaFw0z
-MzAzMDQyMTI0MDBaMBcxFTATBgNVBAMTDHNpZHAud3d1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK+yYxMNpUnupPxhrlowryIiCXXzDaeJv1N7
-m1Fl9KgtcvRiAaySjD0GFWvqdHPQiaqPvB0sHWduwoKg2tr1B8d1kFE9CoLlFIIm
-jfJx7NQY+1Z9S1AlVPP9ClrreAUDp85bjUck3M+cZBO4sIeOs4jEJJ5S+usC1UXU
-SxqUONvn0EMIBVAkxsjwcy6/ntGYo0NdzLnDBg5Jd8VUvPMtW8dd7Ob4LQxgOqAw
-iZM20hu2/7EiEgvNxjn+p55X9/zDNn0aP2gLKvx5nPdiDmGYqz0NpD8RqTjQ4qot
-2FG+mAjLAG4/fcz/R0IdHqrh6RWL2owK/xxrzZgoG9gD4AJr10kCAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2lkcC53d3UuZWR1hiNodHRwczovL3NpZHAud3d1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU5zhEmOKr7pJly3uYH8IxVBqLPIQwDQYJ
-KoZIhvcNAQEFBQADggEBAK+X9XyzH2Uy8vNWSou5rccPjj7RtoVl7jhU2IkUTRrQ
-XJEB8LxK6kjiJ56QMyJ3VNV63S8lewE+KRgE8RMsS033BRb6z08MTp8FuS1+Y6G0
-JtSnodUNcrQK0A/HYWJd8SU9+KwcB4nFcfjALiMAGxLcxqGTa+jA2wPjR5Aw57PE
-BJdhULANxUopZOpy8U2fDG9mepmv95tWPBIz2XOqkya9hGNGAnvL0PmRUMt55O8L
-dOrRtblBNkeAYH1baKgdjO6nPQoZkENYrIpPD6yvosumYyUyo3fHvM+YOi+TdK2/
-6lphblIDurvkP+seqzCJBN3tjEYWQh+eVmvzbwH1nDg=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sidp.wwu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sidp.wwu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sidp.wwu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Western Washington University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Western Washington University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wwu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tim McLaughlin</md:GivenName>
-    <md:EmailAddress>tim.mclaughlin@wwu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Ken Pearce</md:GivenName>
-    <md:EmailAddress>ken.pearce@wwu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Linc Nesheim</md:GivenName>
-    <md:EmailAddress>linc.nesheim@wwu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml b/swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.xml
deleted file mode 100644
index 91618b9c..00000000
--- a/swamid-interfederations-2.0/sids.somerset.ac.uk-metadata.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://sids.somerset.ac.uk/metadata">
-  <!--
-		This is a Shibboleth  2 IdP for Somerset College of Arts and Technology.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">somerset.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIESDCCAzCgAwIBAgIJAJhc0Z//qBJuMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIU29tZXJzZXQxEDAOBgNVBAcTB1RhdW50b24xGTAX
-						BgNVBAoTEFNvbWVyc2V0IENvbGxlZ2UxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRww
-						GgYDVQQDExNzaWRzLnNvbWVyc2V0LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJJVFVA
-						c29tZXJzZXQuYWMudWswHhcNMTMwMzIwMTEzMTQyWhcNMjMwMzE4MTEzMTQyWjCB
-						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNvbWVyc2V0MRAwDgYDVQQHEwdUYXVu
-						dG9uMRkwFwYDVQQKExBTb21lcnNldCBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2
-						aWNlczEcMBoGA1UEAxMTc2lkcy5zb21lcnNldC5hYy51azEhMB8GCSqGSIb3DQEJ
-						ARYSSVRVQHNvbWVyc2V0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAqf0t5xntwBwEwen1V+yeVDIQH/KeNSNBUF1LlaVU9q3HPKIRUVDVRp/P
-						+f/NwsxXfdIrcfycBmJJT/sJoIgtF+aiYJw1VZp0hSc7rCF1Z+VlBpA1mWvnvkGA
-						11V9tCEA3Hk0IO7Ttrt4ObsFgfM7DrvkKwlrb5JkqVZxNebhbrzOaaiwAy3iDbXn
-						RKIMz5AzFz88NYGM+swyfApuxMgvraNWW0dVqYuVuSRuTW5YGpevH2Ml1X7Z1yf8
-						nfOwgGpFiRWLrran8m+ePy6lNUXj+7LHKmIDDJY3XGkwme1XdM6AuizfE6fdkjgi
-						4nRHoueY2bE9c9R+Te9gKRYMy476MwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQUfm7ZHxim2b+0FmNBSQuHpaet4REwHwYDVR0jBBgwFoAUfm7ZHxim2b+0FmNB
-						SQuHpaet4REwDQYJKoZIhvcNAQEFBQADggEBABx6x/C2GGUJvqx3Zflx/tr/edtw
-						bsQ18fOij0TrN5aQUsCfrf3q2tTA+5lRbWYaxIHJW70re7IVmv275mFHkC696TtQ
-						r9suaJ7Ba+8p84OSHaY8jSyERKNoqCIQF7lHXHkL2kaeB8KZJ2uNaVOYGzBPFP5i
-						YcKE+b2k3LRS5iDhI34pgcWj7Dr096GSRwICVRaAjNyZUSgnQfVBMgeUOXKYy+sF
-						sZoM785kMGdeBeTv1HBl3REOMog53DByCkCLaD/YfsfekU/V3AUNsLA6fPIpTefI
-						MMqkediE0Hq1mipwj+g10F2TrMFHxGMHv3hLtgjVXSbBbzcSocw1Mgi4P2U=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sids.somerset.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sids.somerset.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://sids.somerset.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sids.somerset.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sids.somerset.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sids.somerset.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">somerset.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIESDCCAzCgAwIBAgIJAJhc0Z//qBJuMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIU29tZXJzZXQxEDAOBgNVBAcTB1RhdW50b24xGTAX
-						BgNVBAoTEFNvbWVyc2V0IENvbGxlZ2UxFDASBgNVBAsTC0lUIFNlcnZpY2VzMRww
-						GgYDVQQDExNzaWRzLnNvbWVyc2V0LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJJVFVA
-						c29tZXJzZXQuYWMudWswHhcNMTMwMzIwMTEzMTQyWhcNMjMwMzE4MTEzMTQyWjCB
-						pDELMAkGA1UEBhMCR0IxETAPBgNVBAgTCFNvbWVyc2V0MRAwDgYDVQQHEwdUYXVu
-						dG9uMRkwFwYDVQQKExBTb21lcnNldCBDb2xsZWdlMRQwEgYDVQQLEwtJVCBTZXJ2
-						aWNlczEcMBoGA1UEAxMTc2lkcy5zb21lcnNldC5hYy51azEhMB8GCSqGSIb3DQEJ
-						ARYSSVRVQHNvbWVyc2V0LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAqf0t5xntwBwEwen1V+yeVDIQH/KeNSNBUF1LlaVU9q3HPKIRUVDVRp/P
-						+f/NwsxXfdIrcfycBmJJT/sJoIgtF+aiYJw1VZp0hSc7rCF1Z+VlBpA1mWvnvkGA
-						11V9tCEA3Hk0IO7Ttrt4ObsFgfM7DrvkKwlrb5JkqVZxNebhbrzOaaiwAy3iDbXn
-						RKIMz5AzFz88NYGM+swyfApuxMgvraNWW0dVqYuVuSRuTW5YGpevH2Ml1X7Z1yf8
-						nfOwgGpFiRWLrran8m+ePy6lNUXj+7LHKmIDDJY3XGkwme1XdM6AuizfE6fdkjgi
-						4nRHoueY2bE9c9R+Te9gKRYMy476MwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQUfm7ZHxim2b+0FmNBSQuHpaet4REwHwYDVR0jBBgwFoAUfm7ZHxim2b+0FmNB
-						SQuHpaet4REwDQYJKoZIhvcNAQEFBQADggEBABx6x/C2GGUJvqx3Zflx/tr/edtw
-						bsQ18fOij0TrN5aQUsCfrf3q2tTA+5lRbWYaxIHJW70re7IVmv275mFHkC696TtQ
-						r9suaJ7Ba+8p84OSHaY8jSyERKNoqCIQF7lHXHkL2kaeB8KZJ2uNaVOYGzBPFP5i
-						YcKE+b2k3LRS5iDhI34pgcWj7Dr096GSRwICVRaAjNyZUSgnQfVBMgeUOXKYy+sF
-						sZoM785kMGdeBeTv1HBl3REOMog53DByCkCLaD/YfsfekU/V3AUNsLA6fPIpTefI
-						MMqkediE0Hq1mipwj+g10F2TrMFHxGMHv3hLtgjVXSbBbzcSocw1Mgi4P2U=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sids.somerset.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sids.somerset.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">Somerset College of Arts and Technology</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Somerset College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.somerset.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Snook</SurName>
-    <EmailAddress>mailto:chris.snook@somerset.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Snook</SurName>
-    <EmailAddress>mailto:chris.snook@somerset.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signin.k-state.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/signin.k-state.edu-idp-shibboleth.xml
deleted file mode 100644
index 75562d72..00000000
--- a/swamid-interfederations-2.0/signin.k-state.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,108 +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://signin.k-state.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://signin.k-state.edu/idp/error.jsp" 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">ksu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Kansas State University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Kansas State University Shibboleth Identity Provider</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.k-state.edu/its/security/procedures/incommon.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.k-state.edu/its/policies/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="65" width="200" xml:lang="en">https://www.k-state.edu/images/kstate-logo.jpg</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>
-MIIDMzCCAhugAwIBAgIUddkT+9u91blTGSOr4CVwQBZ/FFYwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSc2lnbmluLmstc3RhdGUuZWR1MB4XDTEyMDYwNTE1NDAw
-OVoXDTMyMDYwNTE1NDAwOVowHTEbMBkGA1UEAxMSc2lnbmluLmstc3RhdGUuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhiD6+w540j8uCiAKz+4k
-1D8woOO+GFe/iqMU1PH4YPSqTmyrnegaHrvcQDi/V1DKkuXZEU+j/g/Ln1i95Huf
-voIZrcc5suKa5yu2hVPELGAjq7qOaVfwX9kZKUVcAH9o1Gus3pleZ5JreH9mj7HC
-ZQMKQoJ43064g904mJcI/+k9KEf5Tbs/pmAYvTG6xrTSPbJ0RecXZRDkPV2s88zZ
-Qgyt9tdvOuRFHkPyDsYPmaU+A6gVuq+/MtTDu7y856u/LNQv91mFUga5fAtyXcls
-5L01nl615wxqPSwtd+L6LOZ9nZX0deUtyGYS2cpyuBROy62DNuDWwAlV++9yK9e1
-kQIDAQABo2swaTBIBgNVHREEQTA/ghJzaWduaW4uay1zdGF0ZS5lZHWGKWh0dHBz
-Oi8vc2lnbmluLmstc3RhdGUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTX
-SOMqCmNFaAmMokhDAJjuyKid+zANBgkqhkiG9w0BAQUFAAOCAQEAe7JTysS5hWbj
-Bh2LDgGV7Ct9fjbv+HpL9B60F3WBWGQlWndsyXXZDqJ9TNZ6TfGJFtn4irmcd8II
-dJb1HrIzVNVmR8Vtzx9Q/zeU5kgAcBcmjU5GQxWTU5dEIi/uKTj55KyW8+TkkQWa
-0Lj4Qwez629onnih6UOeC6yZ/M2NClNupvxBZXE6nl91djmT6qvSR0GiWi/Tssrm
-UKw8tiWpALVruSodJQw9Guq0Mpmic3daaI/TjD5rl3k6rXDlr5aXHpCRdpZynQGx
-ABEpAgjaGHvTyEOi849GB2Tewhzj8HGIyx1TfT175MtFN2kfVCDznA+zPXZUg73f
-ymGADBlpjg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signin.k-state.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signin.k-state.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://signin.k-state.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.k-state.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://signin.k-state.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signin.k-state.edu/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">ksu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMzCCAhugAwIBAgIUddkT+9u91blTGSOr4CVwQBZ/FFYwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSc2lnbmluLmstc3RhdGUuZWR1MB4XDTEyMDYwNTE1NDAw
-OVoXDTMyMDYwNTE1NDAwOVowHTEbMBkGA1UEAxMSc2lnbmluLmstc3RhdGUuZWR1
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhiD6+w540j8uCiAKz+4k
-1D8woOO+GFe/iqMU1PH4YPSqTmyrnegaHrvcQDi/V1DKkuXZEU+j/g/Ln1i95Huf
-voIZrcc5suKa5yu2hVPELGAjq7qOaVfwX9kZKUVcAH9o1Gus3pleZ5JreH9mj7HC
-ZQMKQoJ43064g904mJcI/+k9KEf5Tbs/pmAYvTG6xrTSPbJ0RecXZRDkPV2s88zZ
-Qgyt9tdvOuRFHkPyDsYPmaU+A6gVuq+/MtTDu7y856u/LNQv91mFUga5fAtyXcls
-5L01nl615wxqPSwtd+L6LOZ9nZX0deUtyGYS2cpyuBROy62DNuDWwAlV++9yK9e1
-kQIDAQABo2swaTBIBgNVHREEQTA/ghJzaWduaW4uay1zdGF0ZS5lZHWGKWh0dHBz
-Oi8vc2lnbmluLmstc3RhdGUuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTX
-SOMqCmNFaAmMokhDAJjuyKid+zANBgkqhkiG9w0BAQUFAAOCAQEAe7JTysS5hWbj
-Bh2LDgGV7Ct9fjbv+HpL9B60F3WBWGQlWndsyXXZDqJ9TNZ6TfGJFtn4irmcd8II
-dJb1HrIzVNVmR8Vtzx9Q/zeU5kgAcBcmjU5GQxWTU5dEIi/uKTj55KyW8+TkkQWa
-0Lj4Qwez629onnih6UOeC6yZ/M2NClNupvxBZXE6nl91djmT6qvSR0GiWi/Tssrm
-UKw8tiWpALVruSodJQw9Guq0Mpmic3daaI/TjD5rl3k6rXDlr5aXHpCRdpZynQGx
-ABEpAgjaGHvTyEOi849GB2Tewhzj8HGIyx1TfT175MtFN2kfVCDznA+zPXZUg73f
-ymGADBlpjg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signin.k-state.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signin.k-state.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Kansas State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Kansas State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ksu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support Team</md:GivenName>
-    <md:EmailAddress>idm-dev-l@ksu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Office of Administrative Support</md:GivenName>
-    <md:EmailAddress>caffey@ksu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@ksu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml b/swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.xml
deleted file mode 100644
index 36ba43ca..00000000
--- a/swamid-interfederations-2.0/signin.staging.studentmoneysaver.co.uk.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://signin.staging.studentmoneysaver.co.uk">
-  <!--
-		This is a test SP for Student Money Saver Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-20T11:21:13Z">
-      <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Student Money Saver (Test SP)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is a test­-only SP for Student Money Saver. Do not use in production.</mdui:Description>
-        <mdui:Logo height="61" width="107">https://cdn.studentmoneysaver.co.uk/assets/logos/sms-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>
-						MIIEKzCCAxOgAwIBAgIJAI3xfY2iDzkeMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMSAwHgYD
-						VQQKDBdTdHVkZW50IE1vbmV5IFNhdmVyIExURDEPMA0GA1UECwwGRGV2T3BzMRcw
-						FQYDVQQDDA5zbXMtc2lnbmluLWFwaTEtMCsGCSqGSIb3DQEJARYeYWRyaWFuQHN0
-						dWRlbnRtb25leXNhdmVyLmNvLnVrMB4XDTE1MDYyNjA4NDcxMloXDTE3MDYyNTA4
-						NDcxMlowgasxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdFbmdsYW5kMQ8wDQYDVQQH
-						DAZMb25kb24xIDAeBgNVBAoMF1N0dWRlbnQgTW9uZXkgU2F2ZXIgTFREMQ8wDQYD
-						VQQLDAZEZXZPcHMxFzAVBgNVBAMMDnNtcy1zaWduaW4tYXBpMS0wKwYJKoZIhvcN
-						AQkBFh5hZHJpYW5Ac3R1ZGVudG1vbmV5c2F2ZXIuY28udWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDDh7gKf0OElHwbGJ9tCzuifS/1qfSFRxg8wBVk
-						Z8/gRSTPyr1xHRYeQMf9+W9bWejDaaDxQq/yRQDwGEOTYN/ghGlej/MD4tBlP4CS
-						qUP2stV91Vp8sSyz8Ue2F7surXWk04dav7wLNR3giwpLPL7rSBF8cG3sJiAgFnSC
-						3uGLBlP/BHy2UzeWYPhteD80QjBnbGFSA/ETMlDIGj48HmdHyE7gATpVJ84Bw6Db
-						Ac0xiNKP4rFL0QzD55q4NR1/GQB4MqZdoTA3LXKPrO8HRkIQqEDA3WjcpCQeKuqt
-						VPU9mB/XSdzV3+iCVsIW1dSYNnC1FJWB5LBnQijEylcJSY2NAgMBAAGjUDBOMB0G
-						A1UdDgQWBBQv1uF4H7q9kZG4TSDpZBWU+yE2BjAfBgNVHSMEGDAWgBQv1uF4H7q9
-						kZG4TSDpZBWU+yE2BjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAL
-						ea2RNtk74QMKsbwzICCuADT/rllrKNzsgAkaAjcCdL+DfspFZSnav40MB7ksK16t
-						aebkpkCK6x3vE5eU3bosiOGektkVoAjbb+BVhuEQHSV17FaXQnkUe2t1httVIihx
-						WF/bCXqIzLkbz3KhMX/oYWnLvB7R4UcmaPxImRmcJ5BFA6UXHqlU+d3/9+oOErUu
-						TJBBU9BcDoIAcfgMe5MaDXNdVa2P8HD+JDeE3EWx1L7KEOVQaSfekYSTSmstnqBj
-						OL0Jr2kxldHRwhrHu50f2PMJFKwvjy4/X79YwapTCn1ee7FWft255LdEqpBFz+we
-						y3MXd8zZdHL4dhUTYdiF
-					</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>
-						MIIEKzCCAxOgAwIBAgIJAI3xfY2iDzkeMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMSAwHgYD
-						VQQKDBdTdHVkZW50IE1vbmV5IFNhdmVyIExURDEPMA0GA1UECwwGRGV2T3BzMRcw
-						FQYDVQQDDA5zbXMtc2lnbmluLWFwaTEtMCsGCSqGSIb3DQEJARYeYWRyaWFuQHN0
-						dWRlbnRtb25leXNhdmVyLmNvLnVrMB4XDTE1MDYyNjA4NDcxMloXDTE3MDYyNTA4
-						NDcxMlowgasxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdFbmdsYW5kMQ8wDQYDVQQH
-						DAZMb25kb24xIDAeBgNVBAoMF1N0dWRlbnQgTW9uZXkgU2F2ZXIgTFREMQ8wDQYD
-						VQQLDAZEZXZPcHMxFzAVBgNVBAMMDnNtcy1zaWduaW4tYXBpMS0wKwYJKoZIhvcN
-						AQkBFh5hZHJpYW5Ac3R1ZGVudG1vbmV5c2F2ZXIuY28udWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDDh7gKf0OElHwbGJ9tCzuifS/1qfSFRxg8wBVk
-						Z8/gRSTPyr1xHRYeQMf9+W9bWejDaaDxQq/yRQDwGEOTYN/ghGlej/MD4tBlP4CS
-						qUP2stV91Vp8sSyz8Ue2F7surXWk04dav7wLNR3giwpLPL7rSBF8cG3sJiAgFnSC
-						3uGLBlP/BHy2UzeWYPhteD80QjBnbGFSA/ETMlDIGj48HmdHyE7gATpVJ84Bw6Db
-						Ac0xiNKP4rFL0QzD55q4NR1/GQB4MqZdoTA3LXKPrO8HRkIQqEDA3WjcpCQeKuqt
-						VPU9mB/XSdzV3+iCVsIW1dSYNnC1FJWB5LBnQijEylcJSY2NAgMBAAGjUDBOMB0G
-						A1UdDgQWBBQv1uF4H7q9kZG4TSDpZBWU+yE2BjAfBgNVHSMEGDAWgBQv1uF4H7q9
-						kZG4TSDpZBWU+yE2BjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAL
-						ea2RNtk74QMKsbwzICCuADT/rllrKNzsgAkaAjcCdL+DfspFZSnav40MB7ksK16t
-						aebkpkCK6x3vE5eU3bosiOGektkVoAjbb+BVhuEQHSV17FaXQnkUe2t1httVIihx
-						WF/bCXqIzLkbz3KhMX/oYWnLvB7R4UcmaPxImRmcJ5BFA6UXHqlU+d3/9+oOErUu
-						TJBBU9BcDoIAcfgMe5MaDXNdVa2P8HD+JDeE3EWx1L7KEOVQaSfekYSTSmstnqBj
-						OL0Jr2kxldHRwhrHu50f2PMJFKwvjy4/X79YwapTCn1ee7FWft255LdEqpBFz+we
-						y3MXd8zZdHL4dhUTYdiF
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signin.staging.studentmoneysaver.co.uk/saml/signout/"/>
-    <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://signin.staging.studentmoneysaver.co.uk/saml/consume/" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Student Money Saver Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Student Money Saver (Test SP)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.studentmoneysaver.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support Team</GivenName>
-    <EmailAddress>mailto:support@studentmoneysaver.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adrian</GivenName>
-    <SurName>Silimon</SurName>
-    <EmailAddress>mailto:adrian@studentmoneysaver.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml b/swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.xml
deleted file mode 100644
index 9c5f21dd..00000000
--- a/swamid-interfederations-2.0/signin.studentmoneysaver.co.uk.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://signin.studentmoneysaver.co.uk">
-  <!--
-		This is a "Student Money Saver" Own Implementation SP for Student Money Saver Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-03T08:33:07Z">
-      <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Student Money Saver</mdui:DisplayName>
-        <mdui:Logo height="61" width="107">https://cdn.studentmoneysaver.co.uk/assets/logos/sms-logo.png</mdui:Logo>
-        <mdui:Description xml:lang="en">We specialise in student discounts, deals and free stuff, as well as ways to make money quickly. Plus, everything you need to know about student finance, made simple.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEKzCCAxOgAwIBAgIJAI3xfY2iDzkeMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMSAwHgYD
-						VQQKDBdTdHVkZW50IE1vbmV5IFNhdmVyIExURDEPMA0GA1UECwwGRGV2T3BzMRcw
-						FQYDVQQDDA5zbXMtc2lnbmluLWFwaTEtMCsGCSqGSIb3DQEJARYeYWRyaWFuQHN0
-						dWRlbnRtb25leXNhdmVyLmNvLnVrMB4XDTE1MDYyNjA4NDcxMloXDTE3MDYyNTA4
-						NDcxMlowgasxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdFbmdsYW5kMQ8wDQYDVQQH
-						DAZMb25kb24xIDAeBgNVBAoMF1N0dWRlbnQgTW9uZXkgU2F2ZXIgTFREMQ8wDQYD
-						VQQLDAZEZXZPcHMxFzAVBgNVBAMMDnNtcy1zaWduaW4tYXBpMS0wKwYJKoZIhvcN
-						AQkBFh5hZHJpYW5Ac3R1ZGVudG1vbmV5c2F2ZXIuY28udWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDDh7gKf0OElHwbGJ9tCzuifS/1qfSFRxg8wBVk
-						Z8/gRSTPyr1xHRYeQMf9+W9bWejDaaDxQq/yRQDwGEOTYN/ghGlej/MD4tBlP4CS
-						qUP2stV91Vp8sSyz8Ue2F7surXWk04dav7wLNR3giwpLPL7rSBF8cG3sJiAgFnSC
-						3uGLBlP/BHy2UzeWYPhteD80QjBnbGFSA/ETMlDIGj48HmdHyE7gATpVJ84Bw6Db
-						Ac0xiNKP4rFL0QzD55q4NR1/GQB4MqZdoTA3LXKPrO8HRkIQqEDA3WjcpCQeKuqt
-						VPU9mB/XSdzV3+iCVsIW1dSYNnC1FJWB5LBnQijEylcJSY2NAgMBAAGjUDBOMB0G
-						A1UdDgQWBBQv1uF4H7q9kZG4TSDpZBWU+yE2BjAfBgNVHSMEGDAWgBQv1uF4H7q9
-						kZG4TSDpZBWU+yE2BjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAL
-						ea2RNtk74QMKsbwzICCuADT/rllrKNzsgAkaAjcCdL+DfspFZSnav40MB7ksK16t
-						aebkpkCK6x3vE5eU3bosiOGektkVoAjbb+BVhuEQHSV17FaXQnkUe2t1httVIihx
-						WF/bCXqIzLkbz3KhMX/oYWnLvB7R4UcmaPxImRmcJ5BFA6UXHqlU+d3/9+oOErUu
-						TJBBU9BcDoIAcfgMe5MaDXNdVa2P8HD+JDeE3EWx1L7KEOVQaSfekYSTSmstnqBj
-						OL0Jr2kxldHRwhrHu50f2PMJFKwvjy4/X79YwapTCn1ee7FWft255LdEqpBFz+we
-						y3MXd8zZdHL4dhUTYdiF
-					</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>
-						MIIEKzCCAxOgAwIBAgIJAI3xfY2iDzkeMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMSAwHgYD
-						VQQKDBdTdHVkZW50IE1vbmV5IFNhdmVyIExURDEPMA0GA1UECwwGRGV2T3BzMRcw
-						FQYDVQQDDA5zbXMtc2lnbmluLWFwaTEtMCsGCSqGSIb3DQEJARYeYWRyaWFuQHN0
-						dWRlbnRtb25leXNhdmVyLmNvLnVrMB4XDTE1MDYyNjA4NDcxMloXDTE3MDYyNTA4
-						NDcxMlowgasxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdFbmdsYW5kMQ8wDQYDVQQH
-						DAZMb25kb24xIDAeBgNVBAoMF1N0dWRlbnQgTW9uZXkgU2F2ZXIgTFREMQ8wDQYD
-						VQQLDAZEZXZPcHMxFzAVBgNVBAMMDnNtcy1zaWduaW4tYXBpMS0wKwYJKoZIhvcN
-						AQkBFh5hZHJpYW5Ac3R1ZGVudG1vbmV5c2F2ZXIuY28udWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDDh7gKf0OElHwbGJ9tCzuifS/1qfSFRxg8wBVk
-						Z8/gRSTPyr1xHRYeQMf9+W9bWejDaaDxQq/yRQDwGEOTYN/ghGlej/MD4tBlP4CS
-						qUP2stV91Vp8sSyz8Ue2F7surXWk04dav7wLNR3giwpLPL7rSBF8cG3sJiAgFnSC
-						3uGLBlP/BHy2UzeWYPhteD80QjBnbGFSA/ETMlDIGj48HmdHyE7gATpVJ84Bw6Db
-						Ac0xiNKP4rFL0QzD55q4NR1/GQB4MqZdoTA3LXKPrO8HRkIQqEDA3WjcpCQeKuqt
-						VPU9mB/XSdzV3+iCVsIW1dSYNnC1FJWB5LBnQijEylcJSY2NAgMBAAGjUDBOMB0G
-						A1UdDgQWBBQv1uF4H7q9kZG4TSDpZBWU+yE2BjAfBgNVHSMEGDAWgBQv1uF4H7q9
-						kZG4TSDpZBWU+yE2BjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAL
-						ea2RNtk74QMKsbwzICCuADT/rllrKNzsgAkaAjcCdL+DfspFZSnav40MB7ksK16t
-						aebkpkCK6x3vE5eU3bosiOGektkVoAjbb+BVhuEQHSV17FaXQnkUe2t1httVIihx
-						WF/bCXqIzLkbz3KhMX/oYWnLvB7R4UcmaPxImRmcJ5BFA6UXHqlU+d3/9+oOErUu
-						TJBBU9BcDoIAcfgMe5MaDXNdVa2P8HD+JDeE3EWx1L7KEOVQaSfekYSTSmstnqBj
-						OL0Jr2kxldHRwhrHu50f2PMJFKwvjy4/X79YwapTCn1ee7FWft255LdEqpBFz+we
-						y3MXd8zZdHL4dhUTYdiF
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signin.studentmoneysaver.co.uk/saml/signout/"/>
-    <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://signin.studentmoneysaver.co.uk/saml/consume/" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Student Money Saver Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Student Money Saver</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.studentmoneysaver.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support Team</GivenName>
-    <EmailAddress>mailto:info@studentmoneysaver.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adrian</GivenName>
-    <SurName>Silimon</SurName>
-    <EmailAddress>mailto:adrian@studentmoneysaver.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
deleted file mode 100644
index 5fb83bec..00000000
--- a/swamid-interfederations-2.0/signon.hh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://signon.hh.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">hh.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Högskolan i Halmstad</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Halmstad University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Högskolan i Halmstad</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Halmstad University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.hh.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.hh.se</mdui:InformationURL>
-        <mdui:Logo height="116" width="350">https://signon.hh.se/hh-logo-en-350x116.png</mdui:Logo>
-        <mdui:Logo height="116" width="350" xml:lang="sv">https://signon.hh.se/hh-logo-sv-350x116.png</mdui:Logo>
-        <mdui:Logo height="116" width="350" xml:lang="en">https://signon.hh.se/hh-logo-en-350x116.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://signon.hh.se/idp_privacy_statement.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://signon.hh.se/idp_privacy_statement_en.html</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">hh hh.se hogskolan+i+halmstad halmstad+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">hh hh.se hogskolan+i+halmstad halmstad+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>hh.se</mdui:DomainHint>
-        <mdui:IPHint>194.47.0.0/20</mdui:IPHint>
-        <mdui:GeolocationHint>geo:56.6647,12.8779</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVANvNFOWJZe9T3CpX7Sk5ZKgztjMgMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTAeFw0wOTA5MTYwODM0MjZaFw0y
-OTA5MTYwODM0MjZaMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIdi7+4jvkJyhmR/IHjVKV0TOJ1TBw5x8FXo
-VVDkZdixmiT/YVp6kfRsKL6yWlNKEm7X6kcrJ+xKUNYUi9n8p1uloS6tBhfG37pC
-Xt7fi7imSi882T4fUYzCR3cVAbe8k6L8UKIdWdNVGIkvXzgeBZh/qHCnvyjtF1Bd
-4mEUHh55KieKVmKCYD7TE4T14tE4xSBf7L9Dna4U9aM7Ne+xeHSW/rGGALtfZhIr
-DOZLZSBCIAzBhzwuDb2h7xYBrCBF7QEWInI8tkQPa/g/sS/5xH+nTGO0RAWY9EWu
-2V2HN3hp3/nX8smCSIKRyxWzLJ29htCrsljTLSvFVOstCU0NI/8CAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2lnbm9uLmhoLnNlhiNodHRwczovL3NpZ25vbi5oaC5zZS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUQJ23SW9pFtWUbgw5WcI2qK7YSZAwDQYJ
-KoZIhvcNAQEFBQADggEBAIAl6LBd5IzC+1MxH293vgBeVnIJvRNAp0vn4BqyHgX0
-3i4lqzw/g8hj+va7kOfr1VidYoS3ur5YYnoVC7muILBy8uNeXGaRNeh7xRJHb+HF
-7eEjWvDrj2RQtaED3+1INj2bl5gR4vEt5VkWh6TVU40x4ea0V97Vm4ZO416b9L6I
-06Hp/H4L2oHEJUMdOfxhlipIXZeAxZ2lSHmGspfNRCybLAs/raVGBvq1/RSpRS+X
-vAXrKY9loLQYkufnJ3GlXmbn3eFOyxmA11Q9xTukB8qno9QI2KMxUH8N2cG0vYXB
-CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signon.hh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signon.hh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://signon.hh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signon.hh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://signon.hh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://signon.hh.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">hh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVANvNFOWJZe9T3CpX7Sk5ZKgztjMgMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTAeFw0wOTA5MTYwODM0MjZaFw0y
-OTA5MTYwODM0MjZaMBcxFTATBgNVBAMTDHNpZ25vbi5oaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIdi7+4jvkJyhmR/IHjVKV0TOJ1TBw5x8FXo
-VVDkZdixmiT/YVp6kfRsKL6yWlNKEm7X6kcrJ+xKUNYUi9n8p1uloS6tBhfG37pC
-Xt7fi7imSi882T4fUYzCR3cVAbe8k6L8UKIdWdNVGIkvXzgeBZh/qHCnvyjtF1Bd
-4mEUHh55KieKVmKCYD7TE4T14tE4xSBf7L9Dna4U9aM7Ne+xeHSW/rGGALtfZhIr
-DOZLZSBCIAzBhzwuDb2h7xYBrCBF7QEWInI8tkQPa/g/sS/5xH+nTGO0RAWY9EWu
-2V2HN3hp3/nX8smCSIKRyxWzLJ29htCrsljTLSvFVOstCU0NI/8CAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMc2lnbm9uLmhoLnNlhiNodHRwczovL3NpZ25vbi5oaC5zZS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUQJ23SW9pFtWUbgw5WcI2qK7YSZAwDQYJ
-KoZIhvcNAQEFBQADggEBAIAl6LBd5IzC+1MxH293vgBeVnIJvRNAp0vn4BqyHgX0
-3i4lqzw/g8hj+va7kOfr1VidYoS3ur5YYnoVC7muILBy8uNeXGaRNeh7xRJHb+HF
-7eEjWvDrj2RQtaED3+1INj2bl5gR4vEt5VkWh6TVU40x4ea0V97Vm4ZO416b9L6I
-06Hp/H4L2oHEJUMdOfxhlipIXZeAxZ2lSHmGspfNRCybLAs/raVGBvq1/RSpRS+X
-vAXrKY9loLQYkufnJ3GlXmbn3eFOyxmA11Q9xTukB8qno9QI2KMxUH8N2cG0vYXB
-CXwK7XzaaZnKkk8K3Hgodpmh+2CIkt0nGwYXAFyb6RE=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://signon.hh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://signon.hh.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">HH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Halmstad University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Halmstad University</md:Company>
-    <md:SurName>Magnus Morén</md:SurName>
-    <md:EmailAddress>mailto:magnus.moren@hh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 35 167383</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Halmstad University</md:Company>
-    <md:SurName>Magnus Morén</md:SurName>
-    <md:EmailAddress>mailto:magnus.moren@hh.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 35 167383</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Halmstad University</md:Company>
-    <md:SurName>Helpdesk Högskloan i Halmstad</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@hh.se</md:EmailAddress>
-    <md:TelephoneNumber>+35 167800</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-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 e3862b92..00000000
--- a/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml
+++ /dev/null
@@ -1,49 +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.surfnet.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">rug.nl</shibmd:Scope>
-      <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/logos/idp/rug.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">university of groningen rijksuniversiteit groningen rug</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">university of groningen rijksuniversiteit groningen rug</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md: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/singlesignon.gwu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/singlesignon.gwu.edu-idp-shibboleth.xml
deleted file mode 100644
index 48e82e95..00000000
--- a/swamid-interfederations-2.0/singlesignon.gwu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +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://singlesignon.gwu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">gwu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The George Washington University</mdui:DisplayName>
-        <mdui:Logo height="90" width="199" xml:lang="en">https://singlesignon.gwu.edu/idp/images/gwlogo.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>
-MIIDOzCCAiOgAwIBAgIUCCBIyMPxHCBVy4X6syXgB3qY64gwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2luZ2xlc2lnbm9uLmd3dS5lZHUwHhcNMTMwNTE1MTMx
-NDU3WhcNMzMwNTE1MTMxNDU3WjAfMR0wGwYDVQQDExRzaW5nbGVzaWdub24uZ3d1
-LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKWgSYvEgHdsFFAv
-ww8Z7ePb4hwpsrYdbauSArofVI3tE6USHvhH5PgDqhvYzk4HkKZSs1WUmggI0keY
-HvChJAnlDmMjaDAjfPymFMmMYfjhOMaVJmV+GLEcoKpWd64LcmyYkfSbNE7TPJn0
-afWKXfJZ8DCIKDeDPzMVa2xIabNE4IvKt6gA73bR40wym72S4RfKxzzI1vw0UHNz
-ri3uW1g5X5AiTsM9tOatIp4Hd40suXl59FUU1ipZzCKnP2qOSkOW47DNQEHoEWVN
-FW5BiJC8iR5D0LYph9eZt+7izq8GT38CeSpaZkA/uq6fDDNG96drZo2FZhzGoEo8
-H8u6PwsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2luZ2xlc2lnbm9uLmd3dS5lZHWG
-K2h0dHBzOi8vc2luZ2xlc2lnbm9uLmd3dS5lZHUvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFHtesMCjBqphZFg+PXku5pUNc5uJMA0GCSqGSIb3DQEBBQUAA4IBAQAc
-Q7edavN+AswtQiwulho1K3MZ33339SlEMvzbhl2CPDCDqVLbH0ClRVYMZaS6Prdi
-iV6GLHrp00gRXrojbOSDmqRZ29dTdauvIbIC07JTqgM4aV5PUOjxI+spLcCqI7GE
-MRvNiq47Lb/amkzUEkSjlaeMRMD2Ay8xzSTQ+8lweS5zoypJf9NzbH9jqP89VtW7
-bvAGbxdEwTssKwpaD1d2KWHdaX+SImsJ58jOna4mJ6eCAYPfjgrtLPht9aiRHtvx
-Wz3Q2BXEs5f75bfIUKL/LKI8/LMmP650thtM6YlRjLIDNoa+ymaV48i1+Lb7dPRZ
-2/bMRZ3Y0d/jjfFfYyhu
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://singlesignon.gwu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://singlesignon.gwu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://singlesignon.gwu.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://singlesignon.gwu.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://singlesignon.gwu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://singlesignon.gwu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://singlesignon.gwu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gwu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIUCCBIyMPxHCBVy4X6syXgB3qY64gwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAxMUc2luZ2xlc2lnbm9uLmd3dS5lZHUwHhcNMTMwNTE1MTMx
-NDU3WhcNMzMwNTE1MTMxNDU3WjAfMR0wGwYDVQQDExRzaW5nbGVzaWdub24uZ3d1
-LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKWgSYvEgHdsFFAv
-ww8Z7ePb4hwpsrYdbauSArofVI3tE6USHvhH5PgDqhvYzk4HkKZSs1WUmggI0keY
-HvChJAnlDmMjaDAjfPymFMmMYfjhOMaVJmV+GLEcoKpWd64LcmyYkfSbNE7TPJn0
-afWKXfJZ8DCIKDeDPzMVa2xIabNE4IvKt6gA73bR40wym72S4RfKxzzI1vw0UHNz
-ri3uW1g5X5AiTsM9tOatIp4Hd40suXl59FUU1ipZzCKnP2qOSkOW47DNQEHoEWVN
-FW5BiJC8iR5D0LYph9eZt+7izq8GT38CeSpaZkA/uq6fDDNG96drZo2FZhzGoEo8
-H8u6PwsCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2luZ2xlc2lnbm9uLmd3dS5lZHWG
-K2h0dHBzOi8vc2luZ2xlc2lnbm9uLmd3dS5lZHUvaWRwL3NoaWJib2xldGgwHQYD
-VR0OBBYEFHtesMCjBqphZFg+PXku5pUNc5uJMA0GCSqGSIb3DQEBBQUAA4IBAQAc
-Q7edavN+AswtQiwulho1K3MZ33339SlEMvzbhl2CPDCDqVLbH0ClRVYMZaS6Prdi
-iV6GLHrp00gRXrojbOSDmqRZ29dTdauvIbIC07JTqgM4aV5PUOjxI+spLcCqI7GE
-MRvNiq47Lb/amkzUEkSjlaeMRMD2Ay8xzSTQ+8lweS5zoypJf9NzbH9jqP89VtW7
-bvAGbxdEwTssKwpaD1d2KWHdaX+SImsJ58jOna4mJ6eCAYPfjgrtLPht9aiRHtvx
-Wz3Q2BXEs5f75bfIUKL/LKI8/LMmP650thtM6YlRjLIDNoa+ymaV48i1+Lb7dPRZ
-2/bMRZ3Y0d/jjfFfYyhu
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://singlesignon.gwu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The George Washington University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The George Washington University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.gwu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dhinakaran Thamanan Ramaian (Dhina)</md:GivenName>
-    <md:EmailAddress>dhina@gwu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Dhinakaran Thamanan Ramaian (Dhina)</md:GivenName>
-    <md:EmailAddress>dhina@gwu.edu</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 67a1d016..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sistemas.uepg.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.uepg.br/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.uepg.br/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://sistemas.uepg.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sistemas.uepg.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sistemas.uepg.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sistemas.uepg.br/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">uepg.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sistemas.uepg.br/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sistemas.uepg.br/idp/profile/SAML1/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">UEPG - Universidade Estadual de Ponta Grossa</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UEPG - Universidade Estadual de Ponta Grossa</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UEPG - Universidade Estadual de Ponta Grossa</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uepg.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.uepg.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Luiz Gustavo Barros</md:SurName>
-    <md:EmailAddress>gustavo@uepg.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 09d6e4d1..00000000
--- a/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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"/>
-      <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/DSRENATA" index="3"/>
-    </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>redclara.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
-MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
-bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
-cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
-RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
-l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
-/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
-UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
-amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
-AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
-G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
-ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
-dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
-cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
-KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
-BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
-bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
-ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
-DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
-8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
-MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
-I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
-yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
-s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
-</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>redclara.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
-MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
-bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
-cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
-RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
-l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
-/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
-UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
-amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
-AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
-G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
-ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
-dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
-cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
-KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
-BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
-bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
-ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
-DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
-8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
-MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
-I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
-yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
-s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
-</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:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/Artifact"/>
-    <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-Redirect" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/Artifact"/>
-    <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-Redirect" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sivic.redclara.net/Shibboleth.sso/NIM/SOAP"/>
-    <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sivic.redclara.net/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sivic.redclara.net/Shibboleth.sso/SAML2/POST" index="10"/>
-    <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="11"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">SIVIC - RedCLARA</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">
-SIVIC - RedCLARA
-</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="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:AttributeConsumingService>
-  </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 110b9219..00000000
--- a/swamid-interfederations-2.0/skmms-idp.lanet.lv.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://skmms-idp.lanet.lv">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Riga Red Cross Medical College</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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - RCMC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Riga Red Cross Medical College - RCMC IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lv">http://www.rcmc.lv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/slademedia.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/slademedia.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index 201fc9a9..00000000
--- a/swamid-interfederations-2.0/slademedia.sisoshibboleth.co.uk-entity.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://slademedia.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo UCL ~ Sade School of Fine Art, Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2015-04-23T09:14: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://slademedia.siso.co/sso/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://slademedia.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo UCL ~ Sade School of Fine Art, Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo UCL ~ Sade School of Fine Art, Online Resource Booking</mdui:Description>
-        <mdui:Logo height="64" width="64">https://shibboleth.siso.co/siso-logo64x64.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slademedia.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://slademedia.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo UCL ~ Sade School of Fine Art, Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sisoshibboleth.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/slateford.edina.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index a4171748..00000000
--- a/swamid-interfederations-2.0/slateford.edina.ac.uk-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://slateford.edina.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Slateford Test" Shibboleth IdP for the University of Edinburgh.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-30T09:42:06Z">
-      <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 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">slateford.edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUaFQBDsbQD1myaqUBq2Sfj+zNqTMwDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2xhdGVmb3JkLmVkaW5hLmFjLnVrMB4XDTE1MDkxNzE1
-						MTIzNloXDTM1MDkxNzE1MTIzNlowIDEeMBwGA1UEAwwVc2xhdGVmb3JkLmVkaW5h
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAntjVOxkCP9da
-						ER4feMyp9emdkDLUsIyz4ER7mfzIOX3MV4kBixou796nBXc0DW1Tamh8k1+e/y/d
-						xL3hX2Mje/grZMQrCgTnUUcMb4Chs1mMgA1nrYGBZcDzeCPFNe/65yohIWlR9RLo
-						vGRitaHu2P8edI+Ax82woCD/eFq8uf25KT2mpY2PzFH3qsASR9vPE1SjVj9/IyEL
-						vaMpPhfFhQ1cwKG9WZr6FmX3oWQwNRTUyv5Oke7S/IKk4ucogtnrGsxql8zasjpL
-						7iVVHuiFYEYPDLbuags7dJ66GMyufpXYhJiWb7VJrMuTt6jjMAdGsjkOTJtha6YF
-						+iB2m3NkWQIDAQABo3EwbzAdBgNVHQ4EFgQUxERMysccN0DYIXIaspFY2+9BNRkw
-						TgYDVR0RBEcwRYIVc2xhdGVmb3JkLmVkaW5hLmFjLnVrhixodHRwczovL3NsYXRl
-						Zm9yZC5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAF4VaakgAejlEA4YlVymEXCstzhKpN66lZuL+lW3Y91EgoabxD5dyq0mezO+Y
-						Gt7UNGGnSRt9UxDkY7E4heeVBGmdoFPBj0wsUGXcfTOZ3/TTTJYmtEKEFLU5S5Nv
-						wF4O4IDVsT3VDy/5u5iOtNGT4F1wMXFgHjC7PCpgHL6VvYX2w5O/abZvFMMtFE3M
-						avfm9oJO4Ai+eWZXEucqZX0HS8hVAzxLRDrZOmZLiLaYBPujvqligEa++K6WJpu0
-						495tpKxyzKlo4C5QKUDpViGUP58XSD5kJCJeS4Ymi+WV+aFs/O8lmZ5hDfewOc1g
-						5uS5lUQuoXJ9EWaUU4yHKgG38Q==
-					</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>
-						MIIDQDCCAiigAwIBAgIVAJXbfu0qWAZqhGmvDTbCJH2YO2I8MA0GCSqGSIb3DQEB
-						CwUAMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA5MTcx
-						NTEyMzRaFw0zNTA5MTcxNTEyMzRaMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGlu
-						YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ+y62JbfCH7
-						z71R9TDNbvfuuLigntMBihrLoozF2Km+yk3uLfqbQX9HDWEpQt3fS3oSdRJxR3H2
-						Mnk3/wfu4KeIMhN1avZsEbzN/BsnX+Cqw/SLi1V5OAqqSZI7yr6NmTE5TqW0/h0n
-						S7Xq4D45zrbzGZ/3/W7X+707o/9UV/V0HLb/A3HSCJJ4oIGYbHkzqfREoO6r0fDu
-						siv5KQZBmonyi7qkkzDFtOk+zyaJxJQdUymz1XuvkUAhNf50cSjyoyiObmIdCdBg
-						cPOjVFIMcbGXlb7h4q1yoCCj+eBwR8HzZ4kwHDy5M/nU0jkX9d5A3ls9Li22W3GY
-						eoAhtUO56a8CAwEAAaNxMG8wHQYDVR0OBBYEFOeXB8Kk8+DvOBzzPYfnPV/VDG4V
-						ME4GA1UdEQRHMEWCFXNsYXRlZm9yZC5lZGluYS5hYy51a4YsaHR0cHM6Ly9zbGF0
-						ZWZvcmQuZWRpbmEuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-						ggEBAIOF8rTpggkzBYuwVbvnbrlzD8tV7BgbU4QDpWCtgolHoL+qm9AYoSoxO+Uh
-						JF7049JiVNdX9TgGDHTOtQkRUBQ5uirhaeJcJMlUTs7JTmQM49hTaI1fcxZ5rD5t
-						Q5WoLcyiGNan46wVen32DBSqtuqKM3cfGciQPuRNWIKeD7a9TawyH9C4h0b84mFN
-						d+vDupXO0jo/NDCdwrG9KqSebhI6dlKerEQ5VtvAEMWBY0iAdo4SyhT3XxjLm/A8
-						3/6MjSrnTGa+QNCQYYKgPYEcUi5O3Pzt5kqELoU4AEHS9UePQ5no+8VLaNrOanrk
-						UgdUiNZ8Ouem7SX/w7R0VgYEvno=
-					</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>
-						MIIDQDCCAiigAwIBAgIVAKOoQhLtWEUvuc1BChPnl4v49qTyMA0GCSqGSIb3DQEB
-						CwUAMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA5MTcx
-						NTEyMzVaFw0zNTA5MTcxNTEyMzVaMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGlu
-						YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgms50q8J1x
-						sHNNtr5zF3cq5+K1cjdKekiDWNry+iPp1W8mNPm/ExP/CDHZrU4W9U5S7I+CrPOH
-						1jECGhS7ezEoXs0slc9zKIetcKbOV3AcLcorQildO/y8A+Rn6qwSQ59+zGRcxccI
-						Os5EXVgpNMZy9coUPk/tnVPC9javymsodJYGX3nUT/E//YmWxRWWbLtkqPf2R8N3
-						qRVQ7e1Z4i1pvdG++ANGXjg6TvPHJivdLj2LfoGcJGu1YTbmfKC0sDbXNp86rFcY
-						YAWqrMTiAL9kaYT+UDS5ZCnxc2IH+nXQh9OwC+qLyf1ZoXN5ezODwKxagBvH9Ypt
-						6iED7+6TA58CAwEAAaNxMG8wHQYDVR0OBBYEFOwRhkPfA8Cwo0ReFdBFgQy+WqNS
-						ME4GA1UdEQRHMEWCFXNsYXRlZm9yZC5lZGluYS5hYy51a4YsaHR0cHM6Ly9zbGF0
-						ZWZvcmQuZWRpbmEuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-						ggEBAEcHtO97dQXmxDs3IsZcIJh+XM/m07JFm6rtcPnuuyIM7Ys7cUL460h0qe2+
-						enFYdxe7FCib36zFaaSp0SYE2FWnuWMtLzg9JAIl7HBPLFdSzryJsH0gMyKOPFff
-						2mF6of6K/AolKNP1enS0DgY0LiCY74VEh4S4COm4sUkHPRtMJTtRrkoiLuNXMUaL
-						JQdDzzK6KZ4uQucPErvQxXjhaNCAHUQRclR+QfFM9Ibr3uIbD+Zs50fFkS/ihlhk
-						1quXSXm1737rQJwd9EsXzGhUxxdRC2H/ly3H8E0NuDgeWfmBYVkXUn4JY1J2W1Dq
-						xnuCMY0qHTFh2QuZSh0kGrs2wcY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://slateford.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slateford.edina.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://slateford.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slateford.edina.ac.uk/idp/profile/SAML2/SOAP/ECP"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slateford.edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIUaFQBDsbQD1myaqUBq2Sfj+zNqTMwDQYJKoZIhvcNAQEL
-						BQAwIDEeMBwGA1UEAwwVc2xhdGVmb3JkLmVkaW5hLmFjLnVrMB4XDTE1MDkxNzE1
-						MTIzNloXDTM1MDkxNzE1MTIzNlowIDEeMBwGA1UEAwwVc2xhdGVmb3JkLmVkaW5h
-						LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAntjVOxkCP9da
-						ER4feMyp9emdkDLUsIyz4ER7mfzIOX3MV4kBixou796nBXc0DW1Tamh8k1+e/y/d
-						xL3hX2Mje/grZMQrCgTnUUcMb4Chs1mMgA1nrYGBZcDzeCPFNe/65yohIWlR9RLo
-						vGRitaHu2P8edI+Ax82woCD/eFq8uf25KT2mpY2PzFH3qsASR9vPE1SjVj9/IyEL
-						vaMpPhfFhQ1cwKG9WZr6FmX3oWQwNRTUyv5Oke7S/IKk4ucogtnrGsxql8zasjpL
-						7iVVHuiFYEYPDLbuags7dJ66GMyufpXYhJiWb7VJrMuTt6jjMAdGsjkOTJtha6YF
-						+iB2m3NkWQIDAQABo3EwbzAdBgNVHQ4EFgQUxERMysccN0DYIXIaspFY2+9BNRkw
-						TgYDVR0RBEcwRYIVc2xhdGVmb3JkLmVkaW5hLmFjLnVrhixodHRwczovL3NsYXRl
-						Zm9yZC5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQsFAAOC
-						AQEAF4VaakgAejlEA4YlVymEXCstzhKpN66lZuL+lW3Y91EgoabxD5dyq0mezO+Y
-						Gt7UNGGnSRt9UxDkY7E4heeVBGmdoFPBj0wsUGXcfTOZ3/TTTJYmtEKEFLU5S5Nv
-						wF4O4IDVsT3VDy/5u5iOtNGT4F1wMXFgHjC7PCpgHL6VvYX2w5O/abZvFMMtFE3M
-						avfm9oJO4Ai+eWZXEucqZX0HS8hVAzxLRDrZOmZLiLaYBPujvqligEa++K6WJpu0
-						495tpKxyzKlo4C5QKUDpViGUP58XSD5kJCJeS4Ymi+WV+aFs/O8lmZ5hDfewOc1g
-						5uS5lUQuoXJ9EWaUU4yHKgG38Q==
-					</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>
-						MIIDQDCCAiigAwIBAgIVAJXbfu0qWAZqhGmvDTbCJH2YO2I8MA0GCSqGSIb3DQEB
-						CwUAMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA5MTcx
-						NTEyMzRaFw0zNTA5MTcxNTEyMzRaMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGlu
-						YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ+y62JbfCH7
-						z71R9TDNbvfuuLigntMBihrLoozF2Km+yk3uLfqbQX9HDWEpQt3fS3oSdRJxR3H2
-						Mnk3/wfu4KeIMhN1avZsEbzN/BsnX+Cqw/SLi1V5OAqqSZI7yr6NmTE5TqW0/h0n
-						S7Xq4D45zrbzGZ/3/W7X+707o/9UV/V0HLb/A3HSCJJ4oIGYbHkzqfREoO6r0fDu
-						siv5KQZBmonyi7qkkzDFtOk+zyaJxJQdUymz1XuvkUAhNf50cSjyoyiObmIdCdBg
-						cPOjVFIMcbGXlb7h4q1yoCCj+eBwR8HzZ4kwHDy5M/nU0jkX9d5A3ls9Li22W3GY
-						eoAhtUO56a8CAwEAAaNxMG8wHQYDVR0OBBYEFOeXB8Kk8+DvOBzzPYfnPV/VDG4V
-						ME4GA1UdEQRHMEWCFXNsYXRlZm9yZC5lZGluYS5hYy51a4YsaHR0cHM6Ly9zbGF0
-						ZWZvcmQuZWRpbmEuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-						ggEBAIOF8rTpggkzBYuwVbvnbrlzD8tV7BgbU4QDpWCtgolHoL+qm9AYoSoxO+Uh
-						JF7049JiVNdX9TgGDHTOtQkRUBQ5uirhaeJcJMlUTs7JTmQM49hTaI1fcxZ5rD5t
-						Q5WoLcyiGNan46wVen32DBSqtuqKM3cfGciQPuRNWIKeD7a9TawyH9C4h0b84mFN
-						d+vDupXO0jo/NDCdwrG9KqSebhI6dlKerEQ5VtvAEMWBY0iAdo4SyhT3XxjLm/A8
-						3/6MjSrnTGa+QNCQYYKgPYEcUi5O3Pzt5kqELoU4AEHS9UePQ5no+8VLaNrOanrk
-						UgdUiNZ8Ouem7SX/w7R0VgYEvno=
-					</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>
-						MIIDQDCCAiigAwIBAgIVAKOoQhLtWEUvuc1BChPnl4v49qTyMA0GCSqGSIb3DQEB
-						CwUAMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA5MTcx
-						NTEyMzVaFw0zNTA5MTcxNTEyMzVaMCAxHjAcBgNVBAMMFXNsYXRlZm9yZC5lZGlu
-						YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgms50q8J1x
-						sHNNtr5zF3cq5+K1cjdKekiDWNry+iPp1W8mNPm/ExP/CDHZrU4W9U5S7I+CrPOH
-						1jECGhS7ezEoXs0slc9zKIetcKbOV3AcLcorQildO/y8A+Rn6qwSQ59+zGRcxccI
-						Os5EXVgpNMZy9coUPk/tnVPC9javymsodJYGX3nUT/E//YmWxRWWbLtkqPf2R8N3
-						qRVQ7e1Z4i1pvdG++ANGXjg6TvPHJivdLj2LfoGcJGu1YTbmfKC0sDbXNp86rFcY
-						YAWqrMTiAL9kaYT+UDS5ZCnxc2IH+nXQh9OwC+qLyf1ZoXN5ezODwKxagBvH9Ypt
-						6iED7+6TA58CAwEAAaNxMG8wHQYDVR0OBBYEFOwRhkPfA8Cwo0ReFdBFgQy+WqNS
-						ME4GA1UdEQRHMEWCFXNsYXRlZm9yZC5lZGluYS5hYy51a4YsaHR0cHM6Ly9zbGF0
-						ZWZvcmQuZWRpbmEuYWMudWsvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQAD
-						ggEBAEcHtO97dQXmxDs3IsZcIJh+XM/m07JFm6rtcPnuuyIM7Ys7cUL460h0qe2+
-						enFYdxe7FCib36zFaaSp0SYE2FWnuWMtLzg9JAIl7HBPLFdSzryJsH0gMyKOPFff
-						2mF6of6K/AolKNP1enS0DgY0LiCY74VEh4S4COm4sUkHPRtMJTtRrkoiLuNXMUaL
-						JQdDzzK6KZ4uQucPErvQxXjhaNCAHUQRclR+QfFM9Ibr3uIbD+Zs50fFkS/ihlhk
-						1quXSXm1737rQJwd9EsXzGhUxxdRC2H/ly3H8E0NuDgeWfmBYVkXUn4JY1J2W1Dq
-						xnuCMY0qHTFh2QuZSh0kGrs2wcY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://slateford.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Slateford Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ukfederation.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alex</GivenName>
-    <SurName>Stuart</SurName>
-    <EmailAddress>mailto:alex.stuart@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alex</GivenName>
-    <SurName>Stuart</SurName>
-    <EmailAddress>mailto:alex.stuart@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/slateford.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/slateford.edina.ac.uk-shibboleth.xml
deleted file mode 100644
index 1666306a..00000000
--- a/swamid-interfederations-2.0/slateford.edina.ac.uk-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://slateford.edina.ac.uk/shibboleth">
-  <!--
-		This is a "Slateford" test Shibboleth SP for the University of Edinburgh.
-	-->
-  <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="2015-06-16T13:56: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://slateford.edina.ac.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://slateford.edina.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAOyJ8qoa9P1EMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNsYXRlZm9yZC5lZGluYS5hYy51azAeFw0xNTA2MTUxNjEzMTRaFw0yNTA2
-						MTIxNjEzMTRaMCAxHjAcBgNVBAMTFXNsYXRlZm9yZC5lZGluYS5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOJTRzMDCh8DZkYxMxNJHCcWVNOV
-						z6J3rWG90urlurHLozovTq+eTqr5JLrJ5c+BkGVUZlqmrmjbL3B4REbqo1z+OryS
-						UeirpFAmg6x43kliIqRDhjEuyScZyUKW33Jv1J9bimNB1z+FWn7j43DZrb6K6sLV
-						+ztjpgYXCRoQVctR04ARiwqVlhPnbULy3NydDVKtsgyICkEc0osOsMtD0HdvY+hY
-						qa6kdLXKvYzZrkJOtfX7ELXSeIOJ2f9779PgGh4WBLgyieFQYarDu/PwK2QQIGhn
-						y+g/eIBsYQ1XqWOz18nmAukLep7IrhL5b4d8IUFbF1yZFtbnlRh+KjIdQc0CAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVc2xhdGVmb3JkLmVkaW5hLmFjLnVrMB0GA1UdDgQW
-						BBSmLfXgbxNlCPa76Sf3WOtbBZ82RTANBgkqhkiG9w0BAQUFAAOCAQEAg2vimu9p
-						GWq5ZeED2Km2oIAJShhXQzexi3implPYrXxik4/K9w3lrCBVLsEAIUkpK4VaeIoM
-						rwBCJsym0okPlHvepMejLOle6F3cuk9sfTIX2M39lpA9MKxMMMKwDLGVOaKzWP/N
-						BSxgy9B0QWGlV1Olm1WL4RQ+neCmrYxYp7W46Q9vkEmiLcW+8Jc70xMmadFeu/5s
-						9b2O8rjVYDR2KmtSD8Yqk2ZJxxt4VxDriGXgEMx7OAhsJ1KkydWKAS4FhW12GiAE
-						8WdrnAJTiIHQ+dCDEJ7aP4UUyW27pNpqPHNQVRcj9x2fT2egIy/7qG6Xpy/ZaC6R
-						GZxkOPiMUxA+/g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://slateford.edina.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://slateford.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Slateford</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alex</GivenName>
-    <SurName>Stuart</SurName>
-    <EmailAddress>mailto:alex.stuart@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alex</GivenName>
-    <SurName>Stuart</SurName>
-    <EmailAddress>mailto:alex.stuart@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/slcs.pca.dfn.de.xml b/swamid-interfederations-2.0/slcs.pca.dfn.de.xml
deleted file mode 100644
index 09a167a9..00000000
--- a/swamid-interfederations-2.0/slcs.pca.dfn.de.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://slcs.pca.dfn.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://slcs.pca.dfn.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>slcs.pca.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=slcs.pca.dfn.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFATCCA+mgAwIBAgIEDbn3WDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTAyMTcwODQ4MDhaFw0xNDAy
-MTYwODQ4MDhaME4xCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRgwFgYDVQQDEw9zbGNzLnBjYS5kZm4uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw3Jc6eE6FdEoDHX4bGRTQ8tt2f65t
-hR76ZN4o4WIMXlnKuUiPcj84bSnsToXi8CTZy0Y3IS/iqiG+VIhlwombfqgEJb1/
-YXxW9hL3s38qobUNsSlv1cam6MjJVRRbvmnulqA2UkcXh0j8oXjMgMrvRscvc5Vr
-R+qrLotFyEp3weKYTS03k6f2QN63pFCtwu+4db5g7DLAgf4T8LkCwPR1yrAjfIyQ
-KZlilI1I+LIEepIbZ5Yi/HWxGJ4rE0QQzf595yiygtXL+lwgOjexnKOEoVNdRa3k
-gDUoh5xyTkdnLDjV2J/fsHkzjy8mODDl9POPm+5xsLXLwGMn+ChU6CSrAgMBAAGj
-ggHeMIIB2jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJweQjSs1QUY3yB1FTgAhsULqiHTMB8G
-A1UdIwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMCAGA1UdEQQZMBeBFXdlYm1h
-c3RlckBkZm4tY2VydC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMt
-Y2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAilQf5k73NxqSFP81D51u6cnwE+ZW1WCPcUhd
-IkQ+K85pP57nd4ClbL+mond011qRiyzA9txYuoxw6+J6mXU9MlKDgWh7ACVIjEZB
-VeS/ROi0GvRKQBlUp4OgwFFMhoHp5wZbpL7cCp5NE7ZOMNZfGk095tEFEDZX7Csg
-GlcR2n3wMi66UIFjaMKTdmh5kPFVtQNw8FltrO+qRJeTljDTB4Ct9SOCV7F2VnNo
-/bBzPejsxto0mF0W/gqyfZqcQSnSGEFVDQsAEv2aLMHoFvuOIr4nHWTsimbKuidM
-73o/AK2KZu86hs7mFt0tLOrUUlJJOtekqrPLWHFfLLBT8f9L+w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>slcs.pca.dfn.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=slcs.pca.dfn.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFATCCA+mgAwIBAgIEDbn3WDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wOTAyMTcwODQ4MDhaFw0xNDAy
-MTYwODQ4MDhaME4xCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRgwFgYDVQQDEw9zbGNzLnBjYS5kZm4uZGUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw3Jc6eE6FdEoDHX4bGRTQ8tt2f65t
-hR76ZN4o4WIMXlnKuUiPcj84bSnsToXi8CTZy0Y3IS/iqiG+VIhlwombfqgEJb1/
-YXxW9hL3s38qobUNsSlv1cam6MjJVRRbvmnulqA2UkcXh0j8oXjMgMrvRscvc5Vr
-R+qrLotFyEp3weKYTS03k6f2QN63pFCtwu+4db5g7DLAgf4T8LkCwPR1yrAjfIyQ
-KZlilI1I+LIEepIbZ5Yi/HWxGJ4rE0QQzf595yiygtXL+lwgOjexnKOEoVNdRa3k
-gDUoh5xyTkdnLDjV2J/fsHkzjy8mODDl9POPm+5xsLXLwGMn+ChU6CSrAgMBAAGj
-ggHeMIIB2jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEF
-BQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFJweQjSs1QUY3yB1FTgAhsULqiHTMB8G
-A1UdIwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMCAGA1UdEQQZMBeBFXdlYm1h
-c3RlckBkZm4tY2VydC5kZTCBkQYDVR0fBIGJMIGGMEGgP6A9hjtodHRwOi8vY2Rw
-MS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY3JsL2NhY3JsLmNy
-bDBBoD+gPYY7aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMt
-Y2EvcHViL2NybC9jYWNybC5jcmwwgaoGCCsGAQUFBwEBBIGdMIGaMEsGCCsGAQUF
-BzAChj9odHRwOi8vY2RwMS5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwSwYIKwYBBQUHMAKGP2h0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAilQf5k73NxqSFP81D51u6cnwE+ZW1WCPcUhd
-IkQ+K85pP57nd4ClbL+mond011qRiyzA9txYuoxw6+J6mXU9MlKDgWh7ACVIjEZB
-VeS/ROi0GvRKQBlUp4OgwFFMhoHp5wZbpL7cCp5NE7ZOMNZfGk095tEFEDZX7Csg
-GlcR2n3wMi66UIFjaMKTdmh5kPFVtQNw8FltrO+qRJeTljDTB4Ct9SOCV7F2VnNo
-/bBzPejsxto0mF0W/gqyfZqcQSnSGEFVDQsAEv2aLMHoFvuOIr4nHWTsimbKuidM
-73o/AK2KZu86hs7mFt0tLOrUUlJJOtekqrPLWHFfLLBT8f9L+w==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slcs.pca.dfn.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slcs.pca.dfn.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://slcs.pca.dfn.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://slcs.pca.dfn.de/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://slcs.pca.dfn.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DFN-CERT Services GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DFN Short-Lived Credential Service (DFN-SLCS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dfn-cert.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Reimer</GivenName>
-    <SurName>Karlsen-Masur</SurName>
-    <EmailAddress>dfnpca@dfn-cert.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Reimer</GivenName>
-    <SurName>Karlsen-Masur</SurName>
-    <EmailAddress>dfnpca@dfn-cert.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/smidp.uwstout.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/smidp.uwstout.edu-idp-shibboleth.xml
deleted file mode 100644
index 8ee5edce..00000000
--- a/swamid-interfederations-2.0/smidp.uwstout.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,72 +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://smidp.uwstout.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">uwstout.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Wisconsin - Stout</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>
-MIIGQzCCBSugAwIBAgIQdYe679tqRUWxqWGBWyB7jjANBgkqhkiG9w0BAQUFADBE
-MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMU
-R2VvVHJ1c3QgU1NMIENBIC0gRzIwHhcNMTQwMTI3MDAwMDAwWhcNMTgwMTIzMjM1
-OTU5WjB5MQswCQYDVQQGEwJVUzESMBAGA1UECBMJV2lzY29uc2luMRIwEAYDVQQH
-FAlNZW5vbW9uaWUxJjAkBgNVBAoUHVVuaXZlcnNpdHkgb2YgV2lzY29uc2luLVN0
-b3V0MRowGAYDVQQDFBFzbWlkcC51d3N0b3V0LmVkdTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAJjJRjs3IIJBWUS3a8JEibav5CdLmNsOedPihT4JZ/Gc
-XhEljQrFWVTTIU8BXXAqpeYTaNgGEbd/mwzbLF2mvan4wesrWNs+lUCQFdkWMEbd
-tCD5fpSN+eNztO4a4KDYf2OsDSf+9i2dUQAVXJTf5ofJPAoKvdf7uUgF/ZdQcmcq
-zWFIrB64tTnxAevU1UFxGG7bhXhUZJlZ9Xbtcs/36VvuFNqflZIbj59JKuC7/SO2
-PXEnbkG1DlvBJnoKMF2iCe57vZxsxcey3FUoa5uqOBxWHEC45uXkuJXbAKjTpyAS
-wu0340wKpXq8yabx0cHvdlCnvyuJHCKTm8tQXvxRjD9kPqIf+ASIl4LcUKNKMe4l
-T2+ZPxZqwtbDqqid9xBWGU0kDyjQ/at6yw+AvMbYYS4BOfNB2dj52qyxj2/5wCma
-iSK9lTd2mQxmFzajaXw7X+tw7OiMWTJtDPPko/4b/n7B6EWkNPnwuyjW7eup5tx/
-h8uZFyBXW6GsPSzrHE2XIHs8qr79ajXJ6KDjXKfiuo1Lc6/1fRI9GLRCQuBsUMrj
-CPaZ0dQnbi4m1/U0U8m6hJS9moDe0LFSEkeDtq6/xKe74fqktDIHpBJAivhxh7Tp
-P1vsY3SAMV9TC2v/S4TrYNO1Ni8pWfq3uLj7hQp9QuPppWdqsbqvdiqVGqxB4kWR
-AgMBAAGjggH6MIIB9jCBmgYDVR0RBIGSMIGPgg9pZHAudXdzdG91dC5lZHWCFGFz
-c2Fzc2luLnV3c3RvdXQuZWR1ghZzaGliYm9sZXRoLnV3c3RvdXQuZWR1ghBzaGli
-LnV3c3RvdXQuZWR1ghVicmVpdGJhcnQudXdzdG91dC5lZHWCEmRhbGxhcy51d3N0
-b3V0LmVkdYIRc21pZHAudXdzdG91dC5lZHUwCQYDVR0TBAIwADAOBgNVHQ8BAf8E
-BAMCBaAwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2d0c3NsMi1jcmwuZ2VvdHJ1
-c3QuY29tL2d0c3NsMi5jcmwwTAYDVR0gBEUwQzBBBgpghkgBhvhFAQc2MDMwMQYI
-KwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNlcy9jcHMw
-HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFBFK0HM5
-1VtpCFy6Pb9kmqiLHFW8MHIGCCsGAQUFBwEBBGYwZDArBggrBgEFBQcwAYYfaHR0
-cDovL2d0c3NsMi1vY3NwLmdlb3RydXN0LmNvbTA1BggrBgEFBQcwAoYpaHR0cDov
-L2d0c3NsMi1haWEuZ2VvdHJ1c3QuY29tL2d0c3NsMi5jZXIwDQYJKoZIhvcNAQEF
-BQADggEBAIM7QMXFfE6PmzJcHcwqS7hLmR4IoIF/pMbfYLp2Uq1QaT6W8BXAUCok
-mSLkbwgUDkNsb27bAFO+oFmB2jlYCnucUSyxlPDMQhNtzxqDWie0S5cX32ia49oS
-RSB8b/KAUzjxxGmAnzA5mDPrrkPiMV4COR+Jb+ez1A8JF/HFb1nidSI3/Rt70X7U
-0S4Osh7MIfHeCS2Fc51+5WsiiREES3SNm0CPxpsRRa4bqdJFwvRXJFOvD1Ri9SnY
-0DIq8r5JX+47/W6ikqvq2OOxikFJG57d9eldAjC3jXhjHG/HnafzZ6stL1FYKHuF
-6zchnxeWCYfmFi6iASRnTMQBMipNMsc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://smidp.uwstout.edu/SAML/ArtifactResolutionService.aspx" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://smidp.uwstout.edu/SAML/SSOService.aspx?binding=redirect"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wisconsin - Stout</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin - Stout</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwstout.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Darren Hoyland</md:GivenName>
-    <md:EmailAddress>tnst@uwstout.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/smile.informatik.uni-freiburg.de-shibboleth.xml b/swamid-interfederations-2.0/smile.informatik.uni-freiburg.de-shibboleth.xml
deleted file mode 100644
index b31b34e7..00000000
--- a/swamid-interfederations-2.0/smile.informatik.uni-freiburg.de-shibboleth.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://smile.informatik.uni-freiburg.de/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-09-18T12:59:06Z">
-      <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>
-  </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="de">SMILE - Smartphones in der Lehre</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SMILE - Smartphones in der Lehre</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Die SMILE-App für Smartphones, Tablets und Internetbrowser ermöglicht Live-Feedback, Quiz-Fragen und Lernfragen während sehr großen Lehrveranstaltungen. Mit der Q&amp;A-Funktion können Studierende Fragen genau dann stellen, wenn Sie auftreten - ohne den Vortragenden zu stören.</mdui:Description>
-        <mdui:Description xml:lang="en">SMILE serves as a lecture-supporting system which students and lecturers can use with their usual login data given by their home institution. The system offers - among other functions - live feedback for the lecturer and quizzes for checking the learning process of the students.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://www.smile.informatik.uni-freiburg.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.smile.informatik.uni-freiburg.de/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://smile.informatik.uni-freiburg.de/CoC/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>smile.informatik.uni-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ira-web@informatik.uni-freiburg.de,CN=smile.informatik.uni-freiburg.de,OU=Institut fuer Informatik,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHxzCCBq+gAwIBAgIHGIKSSfQ6RTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMN
-UmVjaGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZI
-hvcNAQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTE0MTExMjA4MDUxNFoX
-DTE5MDcwOTIzNTkwMFowgd4xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1X
-dWVydHRlbWJlcmcxETAPBgNVBAcTCEZyZWlidXJnMR4wHAYDVQQKExVVbml2ZXJz
-aXRhZXQgRnJlaWJ1cmcxITAfBgNVBAsTGEluc3RpdHV0IGZ1ZXIgSW5mb3JtYXRp
-azEpMCcGA1UEAxMgc21pbGUuaW5mb3JtYXRpay51bmktZnJlaWJ1cmcuZGUxMTAv
-BgkqhkiG9w0BCQEWImlyYS13ZWJAaW5mb3JtYXRpay51bmktZnJlaWJ1cmcuZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYSbgNbyDYBOdqS7dDOA+x
-8IkgR+SYA4qbNrgytwTp3UKHUX6Um+LMhiKcAwjL7DtT/OBE/SmS9WbSlzrclIfB
-6wGiMUpZadWn7kegpFGlpijy7tZK525+FVd24KUVwW5nePHcD2oHCjgxJgbf+dj4
-J5IcLJzpno0GKr81TVwp97zavSsYh41Pwhhy+EWFm4vGK14rbaOl2TeQqGBGLwEJ
-X2s58zgYdLevLD2u74wy6mVGS7PjyK8PEWI7yzttZT4kfQeEseK64qWquYuGIsW4
-XYd4JGG226Jf0BZn1pKY3hIQN+2/ZQpnkXxYCQzlSE+TM60AGTJbj6dchLyeaq9L
-AgMBAAGjggPeMIID2jBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
-BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
-BQUHAwEwHQYDVR0OBBYEFIJWV6FrgUU9Zfwucawz8nLm1xHPMB8GA1UdIwQYMBaA
-FDNnqdbxk1U2rKEyvcHkljn/THAxMIIBnAYDVR0RBIIBkzCCAY+CJ2NoYW5nZS5z
-bWlsZS5pbmZvcm1hdGlrLnVuaS1mcmVpYnVyZy5kZYIlZGVtby5zbWlsZS5pbmZv
-cm1hdGlrLnVuaS1mcmVpYnVyZy5kZYIkZG9jLnNtaWxlLmluZm9ybWF0aWsudW5p
-LWZyZWlidXJnLmRlgitwbGF5Z3JvdW5kLnNtaWxlLmluZm9ybWF0aWsudW5pLWZy
-ZWlidXJnLmRlgihyZWRtaW5lLnNtaWxlLmluZm9ybWF0aWsudW5pLWZyZWlidXJn
-LmRlgiBzbWlsZS5pbmZvcm1hdGlrLnVuaS1mcmVpYnVyZy5kZYInc3RhYmxlLnNt
-aWxlLmluZm9ybWF0aWsudW5pLWZyZWlidXJnLmRlgiV0ZXN0LnNtaWxlLmluZm9y
-bWF0aWsudW5pLWZyZWlidXJnLmRlgih0ZXN0aW5nLnNtaWxlLmluZm9ybWF0aWsu
-dW5pLWZyZWlidXJnLmRlgiR3d3cuc21pbGUuaW5mb3JtYXRpay51bmktZnJlaWJ1
-cmcuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0
-cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9nX2Nh
-Y3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9v
-Y3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3
-DQEBCwUAA4IBAQA72D4fmLKd2ZyTnuy/Ma1pkT5/BcBFxEuYCUnrmiEFJIQAs85L
-pvghgeuoJFPXIqzGHdBdhQMNlAGKveE94pDCUzsb5KeYQfx1cxv7WHtrBiSFCNU9
-UoittffeRdPTKVbgYky7fvT1bNVSdjcY6XJeHsWGM9VEz3a8P418BuJD5r6ieta0
-EMjPtDVQCM0J2ubHFyrlaUPExBLlR+4Nw+w2zCII/ToDW3dpEW19Qh9aqrNvaCtp
-A3WX+PsJTXiVTe3aMB8naNylEm4JfyvMSzWP09kuPVF0WQP7+t5pZwXcqNPDuFJF
-SA1QPBvLr4BMM0YEyE5oqagy03A8rmgvpFDJ
-</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>smile.informatik.uni-freiburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=ira-web@informatik.uni-freiburg.de,CN=smile.informatik.uni-freiburg.de,OU=Institut fuer Informatik,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIHxzCCBq+gAwIBAgIHGIKSSfQ6RTANBgkqhkiG9w0BAQsFADCBhjELMAkGA1UE
-BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMN
-UmVjaGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZI
-hvcNAQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTE0MTExMjA4MDUxNFoX
-DTE5MDcwOTIzNTkwMFowgd4xCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1X
-dWVydHRlbWJlcmcxETAPBgNVBAcTCEZyZWlidXJnMR4wHAYDVQQKExVVbml2ZXJz
-aXRhZXQgRnJlaWJ1cmcxITAfBgNVBAsTGEluc3RpdHV0IGZ1ZXIgSW5mb3JtYXRp
-azEpMCcGA1UEAxMgc21pbGUuaW5mb3JtYXRpay51bmktZnJlaWJ1cmcuZGUxMTAv
-BgkqhkiG9w0BCQEWImlyYS13ZWJAaW5mb3JtYXRpay51bmktZnJlaWJ1cmcuZGUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYSbgNbyDYBOdqS7dDOA+x
-8IkgR+SYA4qbNrgytwTp3UKHUX6Um+LMhiKcAwjL7DtT/OBE/SmS9WbSlzrclIfB
-6wGiMUpZadWn7kegpFGlpijy7tZK525+FVd24KUVwW5nePHcD2oHCjgxJgbf+dj4
-J5IcLJzpno0GKr81TVwp97zavSsYh41Pwhhy+EWFm4vGK14rbaOl2TeQqGBGLwEJ
-X2s58zgYdLevLD2u74wy6mVGS7PjyK8PEWI7yzttZT4kfQeEseK64qWquYuGIsW4
-XYd4JGG226Jf0BZn1pKY3hIQN+2/ZQpnkXxYCQzlSE+TM60AGTJbj6dchLyeaq9L
-AgMBAAGjggPeMIID2jBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
-BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
-BQUHAwEwHQYDVR0OBBYEFIJWV6FrgUU9Zfwucawz8nLm1xHPMB8GA1UdIwQYMBaA
-FDNnqdbxk1U2rKEyvcHkljn/THAxMIIBnAYDVR0RBIIBkzCCAY+CJ2NoYW5nZS5z
-bWlsZS5pbmZvcm1hdGlrLnVuaS1mcmVpYnVyZy5kZYIlZGVtby5zbWlsZS5pbmZv
-cm1hdGlrLnVuaS1mcmVpYnVyZy5kZYIkZG9jLnNtaWxlLmluZm9ybWF0aWsudW5p
-LWZyZWlidXJnLmRlgitwbGF5Z3JvdW5kLnNtaWxlLmluZm9ybWF0aWsudW5pLWZy
-ZWlidXJnLmRlgihyZWRtaW5lLnNtaWxlLmluZm9ybWF0aWsudW5pLWZyZWlidXJn
-LmRlgiBzbWlsZS5pbmZvcm1hdGlrLnVuaS1mcmVpYnVyZy5kZYInc3RhYmxlLnNt
-aWxlLmluZm9ybWF0aWsudW5pLWZyZWlidXJnLmRlgiV0ZXN0LnNtaWxlLmluZm9y
-bWF0aWsudW5pLWZyZWlidXJnLmRlgih0ZXN0aW5nLnNtaWxlLmluZm9ybWF0aWsu
-dW5pLWZyZWlidXJnLmRlgiR3d3cuc21pbGUuaW5mb3JtYXRpay51bmktZnJlaWJ1
-cmcuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5k
-ZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDBAoD6gPIY6aHR0
-cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9nX2Nh
-Y3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9v
-Y3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NhY2VydC9n
-X2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUv
-dW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MA0GCSqGSIb3
-DQEBCwUAA4IBAQA72D4fmLKd2ZyTnuy/Ma1pkT5/BcBFxEuYCUnrmiEFJIQAs85L
-pvghgeuoJFPXIqzGHdBdhQMNlAGKveE94pDCUzsb5KeYQfx1cxv7WHtrBiSFCNU9
-UoittffeRdPTKVbgYky7fvT1bNVSdjcY6XJeHsWGM9VEz3a8P418BuJD5r6ieta0
-EMjPtDVQCM0J2ubHFyrlaUPExBLlR+4Nw+w2zCII/ToDW3dpEW19Qh9aqrNvaCtp
-A3WX+PsJTXiVTe3aMB8naNylEm4JfyvMSzWP09kuPVF0WQP7+t5pZwXcqNPDuFJF
-SA1QPBvLr4BMM0YEyE5oqagy03A8rmgvpFDJ
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://smile.informatik.uni-freiburg.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">SMILE - Smartphones in der Lehre</md:ServiceName>
-      <md:ServiceName xml:lang="en">SMILE - Smartphones in der Lehre</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Die SMILE-App für Smartphones, Tablets und Internetbrowser ermöglicht Live-Feedback, Quiz-Fragen und Lernfragen während sehr großen Lehrveranstaltungen. Mit der Q&amp;A-Funktion können Studierende Fragen genau dann stellen, wenn Sie auftreten - ohne den Vortragenden zu stören.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">SMILE serves as a lecture-supporting system which students and lecturers can use with their usual login data given by their home institution. The system offers - among other functions - live feedback for the lecturer and quizzes for checking the learning process of the students.</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="persistentId" Name="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e14</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e14</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Albert-Ludwigs-Universität Freiburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Albert-Ludwigs-Universität Freiburg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-freiburg.de/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sebastian</md:GivenName>
-    <md:SurName>Sester</md:SurName>
-    <md:EmailAddress>mailto:smile@informatik.uni-freiburg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Sebastian</md:GivenName>
-    <md:SurName>Sester</md:SurName>
-    <md:EmailAddress>mailto:smile@informatik.uni-freiburg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Linus</md:GivenName>
-    <md:SurName>Feiten</md:SurName>
-    <md:EmailAddress>mailto:feiten@informatik.uni-freiburg.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/snf.esc.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/snf.esc.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index e8304a2b..00000000
--- a/swamid-interfederations-2.0/snf.esc.cam.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://snf.esc.cam.ac.uk/shibboleth">
-  <!--
-		This is a "UK Spent Fuel Research Group" Shibboleth SP for the University of Cambridge.
-	-->
-  <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="2011-08-01T14:08:02Z">
-      <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://snf.esc.cam.ac.uk/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://snf.esc.cam.ac.uk/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://snf.esc.cam.ac.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://snf.esc.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
-						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
-						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
-						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
-						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
-						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
-						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
-						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
-						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
-						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
-						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
-						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
-						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
-						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
-						RsenNm/aXp0wIU+jHVmi/GAPCQ==
-					</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://snf.esc.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://snf.esc.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Cambridge: UK Spent Fuel Research Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://snf.esc.cam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/soasunion.org-shibboleth.xml b/swamid-interfederations-2.0/soasunion.org-shibboleth.xml
deleted file mode 100644
index f71f3bd6..00000000
--- a/swamid-interfederations-2.0/soasunion.org-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://soasunion.org/shibboleth">
-  <!--
-		This is a "SOAS Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-09T15:21: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://soasunion.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://soasunion.org/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soasunion.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soasunion.org/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soasunion.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://soasunion.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soasunion.org/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soasunion.org/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soasunion.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soasunion.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://soasunion.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://soasunion.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://soasunion.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SOAS Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://soasunion.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</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/solo-dev.bodleian.ox.ac.uk-shib.xml b/swamid-interfederations-2.0/solo-dev.bodleian.ox.ac.uk-shib.xml
deleted file mode 100644
index 5935a3c2..00000000
--- a/swamid-interfederations-2.0/solo-dev.bodleian.ox.ac.uk-shib.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://solo-dev.bodleian.ox.ac.uk/shib">
-  <!--
-		This is a Shibboleth "development SOLO service" SP for the University of Oxford.
-	-->
-  <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-08-02T09:29:59Z"/>
-  </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://solo-dev.bodleian.ox.ac.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://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEXjCCA0agAwIBAgIJAPIgssUDFSzVMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-						VQQGEwJHQjEPMA0GA1UEBwwGT3hmb3JkMR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9m
-						IE94Zm9yZDEbMBkGA1UECwwSQm9kbGVpYW4gTGlicmFyaWVzMSMwIQYDVQQDDBpz
-						b2xvLWRldi5ib2RsZWlhbi5veC5hYy51azEuMCwGCSqGSIb3DQEJARYfc2ltb24u
-						bWNsZWlzaEBib2RsZWlhbi5veC5hYy51azAeFw0xMzA4MDExNTQzMjRaFw0yMzA3
-						MzAxNTQzMjRaMIGvMQswCQYDVQQGEwJHQjEPMA0GA1UEBwwGT3hmb3JkMR0wGwYD
-						VQQKDBRVbml2ZXJzaXR5IG9mIE94Zm9yZDEbMBkGA1UECwwSQm9kbGVpYW4gTGli
-						cmFyaWVzMSMwIQYDVQQDDBpzb2xvLWRldi5ib2RsZWlhbi5veC5hYy51azEuMCwG
-						CSqGSIb3DQEJARYfc2ltb24ubWNsZWlzaEBib2RsZWlhbi5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMvZxJ+caJPEyeOKUCDpxCorxYXA
-						gjxmXF5eia6O+3osrGkSsGcJVPonOM+4q5M//Fac712g7IKctYb0qyXW9AySECzT
-						K97wc2ipA8CrsO6WDn/OdP7+046grKrsebCA/lD4QPt9g3fnHL71cXGDFTxfviNw
-						by0Tm+ky2kCn9VjQ2LS+mlnvT/0k/KUnHE2t3RuD9R4n+W8UL8gVqSAcsK+TwfBG
-						6jGvkPXdtzDmhcpJtg2NHGyvSWaOfi3UMFKbUithVKD8lODXT0V5kNkCTXzSJ+KT
-						GFdnajEVh824e2i7ncVG7rEKT7DXy++Q/O1FN0r2nTkcNK7K/wlXm7xsuDcCAwEA
-						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
-						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFK2cTGkvAfXnkkIA0TYWaSP+rBeUMB8G
-						A1UdIwQYMBaAFK2cTGkvAfXnkkIA0TYWaSP+rBeUMA0GCSqGSIb3DQEBBQUAA4IB
-						AQCDb2fRtR3NBPHJv6/CEABkkM4M36YfPNTreUu4POStDXiLJat12vzVwd73YYTL
-						jLRTLzUybvy8DfYieF/9h3jgtO5b9lLJy1MARXsi8ESNjBY+T9g/8Ele9ZvrBiNH
-						SlowrQCG+L137zKlSwIakv9yPfIK+GoEaz6a4hVglxAsip60FGAbM3Tv+WsJNraD
-						82EzLVYI5MXAk7qcsYBenWo4EG5PVquqOOS1l1WjdnnY/hHky6NYXm9whp0gNm/V
-						xFbXEjzuiRklrfzb0OZYHQPZdkY+UfB4XOvmcF1J7aMpDDm8FdWUn4XY6IRPThH8
-						F+k7SwJUiw3OvQvFChsEMFm7
-					</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://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo-dev.bodleian.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford development SOLO service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>McLeish</SurName>
-    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>McLeish</SurName>
-    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml b/swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.xml
deleted file mode 100644
index 993bc3f1..00000000
--- a/swamid-interfederations-2.0/solo-prd.bodleian.ox.ac.uk-shib.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://solo-prd.bodleian.ox.ac.uk/shib">
-  <!--
-		This is a Shibboleth SP for University of Oxford.
-	-->
-  <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-08-30T09:30:23Z"/>
-  </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://solo.bodleian.ox.ac.uk/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://solo-prd.bodleian.ox.ac.uk/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://solo.bodleian.ox.ac.uk/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://solo-prd.bodleian.ox.ac.uk/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://solo.bodleian.ox.ac.uk/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://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEYDCCA0igAwIBAgIJALCeRD5Ey6eDMA0GCSqGSIb3DQEBBQUAMIGwMQswCQYD
-						VQQGEwJHQjEPMA0GA1UEBwwGT3hmb3JkMR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9m
-						IE94Zm9yZDEbMBkGA1UECwwSQm9kbGVpYW4gTGlicmFyaWVzMSQwIgYDVQQDDBtw
-						cmltby1wcmQuYm9kbGVpYW4ub3guYWMudWsxLjAsBgkqhkiG9w0BCQEWH3NpbW9u
-						Lm1jbGVpc2hAYm9kbGVpYW4ub3guYWMudWswHhcNMTMwODE5MTI0ODM4WhcNMjMw
-						ODE3MTI0ODM4WjCBsDELMAkGA1UEBhMCR0IxDzANBgNVBAcMBk94Zm9yZDEdMBsG
-						A1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxGzAZBgNVBAsMEkJvZGxlaWFuIExp
-						YnJhcmllczEkMCIGA1UEAwwbcHJpbW8tcHJkLmJvZGxlaWFuLm94LmFjLnVrMS4w
-						LAYJKoZIhvcNAQkBFh9zaW1vbi5tY2xlaXNoQGJvZGxlaWFuLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzd/glHdFqitXdRfTGqzwzfGS
-						pOKkqcZIUoxXJEuxnJ3dLgIALQMYu68UjS2W3WCZKF+k4MOXpitKFAmbFIcEi1/q
-						+jbuPiSIRXrWz6iqbpOZq5CZQriq3FYqewcYdNNxRNPqbgP9hWE66l2jmUTONv0K
-						He6UxllWYc/AFwsilPD9sX4np/qh3Q6a+zB1VE2f10rEzliqrYQ9ysNLHoX0lKd9
-						bX1VvqHcImn9kInq14JEDi/3wYst61K975KbCTTwlfLdujwnFvfa9aUl3RCu4NcL
-						TD0/XI6MjW4rIJE4/CJEeJ2+hrUJHQk+7s70bvABthrSvGVR3j9iGf0OJ+kKKQID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUhcoljC8tV5EYZVtPEHERLNhg0Lcw
-						HwYDVR0jBBgwFoAUhcoljC8tV5EYZVtPEHERLNhg0LcwDQYJKoZIhvcNAQEFBQAD
-						ggEBAKFyCfTM1nEAMq9VubPmfl/ZM4hs7H8CJQPZ2s2JPJR3nlB7qs/7zRou89R+
-						I+J6eKQHyvxSLQYIp+4NwZ3Y8WYeDLc774bt3YK0KOSbgn5Fxm9yk8vArFCsGgq4
-						JmcylYYxEwwoyaivlDzBFyIINOz4fVMB2pU8nKfRc9WDp3O3kXMDZNRvGikPn3wS
-						euArapbRdg9RK9zs0vrqTZST4Q9BrNY4ER4NmfYXs7UIJBQ+ZXvg3B+GO3gBmBQ0
-						JX0GvDm9yo7Xori5a5cwo8I2TGwtSe+g9fh3f5Lmpj4re5r5ejlLXpqiWF31VvD5
-						Q3Km7nTnYkPWfM66yqBgn/yqO5c=
-					</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://solo.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo.bodleian.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo-prd.bodleian.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford's Bodleian SOLO Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>McLeish</SurName>
-    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>McLeish</SurName>
-    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml b/swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.xml
deleted file mode 100644
index ff873ef8..00000000
--- a/swamid-interfederations-2.0/solo-qa.bodleian.ox.ac.uk-shib.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://solo-qa.bodleian.ox.ac.uk/shib">
-  <!--
-		This is a "Bodleian Libraries QA/test SOLO service" Shibboleth SP for the University of Oxford.
-	-->
-  <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-10-18T13:27:07Z">
-      <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://solo-qa.bodleian.ox.ac.uk/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://solo-qa.bodleian.ox.ac.uk/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://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEXDCCA0SgAwIBAgIJANKEvVlt+w2GMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-						VQQGEwJHQjEPMA0GA1UEBwwGT3hmb3JkMR0wGwYDVQQKDBRVbml2ZXJzaXR5IG9m
-						IE94Zm9yZDEbMBkGA1UECwwSQm9kbGVpYW4gTGlicmFyaWVzMSIwIAYDVQQDDBlz
-						b2xvLXFhLmJvZGxlaWFuLm94LmFjLnVrMS4wLAYJKoZIhvcNAQkBFh9zaW1vbi5t
-						Y2xlaXNoQGJvZGxlaWFuLm94LmFjLnVrMB4XDTEzMTAwMjExMDIzMFoXDTIzMDkz
-						MDExMDIzMFowga4xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZPeGZvcmQxHTAbBgNV
-						BAoMFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRswGQYDVQQLDBJCb2RsZWlhbiBMaWJy
-						YXJpZXMxIjAgBgNVBAMMGXNvbG8tcWEuYm9kbGVpYW4ub3guYWMudWsxLjAsBgkq
-						hkiG9w0BCQEWH3NpbW9uLm1jbGVpc2hAYm9kbGVpYW4ub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsSr8kv9nT1/q/4nj1PQTMFz6TNvE+
-						vNDC6OEKdrfRGNSF3Bynhn7wsp5J/BzcOlS6eFB3hGl3XnbzBPsXB/nlPQgqz3AX
-						psJC5B8w/4N4WDj2EtSdLIrcOe8ENHP/Rp4hITjgI++YbnMUCVeeMYoKHLWR1QmX
-						HO+1EmTGeECZKQV4BHlvnLDcJ2WpSyAJJRybRkYb8YaTzL1L92wzk+EZreppkLt4
-						Qz8PhuRUKYKX0a1y6j+2aKBI2cAi3ciftK9oDva3u7CzjAvZ2H6Twmv0IsUNncIe
-						iQqmamoCb2HQlEXrVw9edMd4nPvzrWAx9plzSOJoQMAKnW2we1t1HAJhAgMBAAGj
-						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
-						IENlcnRpZmljYXRlMB0GA1UdDgQWBBSaMBPRVamznkbIVr8XEepipygz7TAfBgNV
-						HSMEGDAWgBSaMBPRVamznkbIVr8XEepipygz7TANBgkqhkiG9w0BAQUFAAOCAQEA
-						OO37gVWuVmsOtukeie3dwFMMG+lWihswACJNQBQ75DuN0L92PL+Vr85qoK0QqCFV
-						/IZJvAbAa7hA4GnLbCqb9e/wTv6Y7XLXzWW5tEwTQBgiuqnh2mv8rEUtBaLKCFKq
-						XYFkA5QpJPuWnApMHBw9Ilgaygy/MYn1kay5OJ4A0iTMnnKlPHel7T3zxyXeRX1C
-						+zygRQi8ayDN0ENItW0sO0/nGTbPmYEbMZ1g/duin1x1ql33MAoCdPxSclPNvUN4
-						7ECVkveDwi2J8q8OQ0pjkn12zYAm5DGVaFS6pcBq+bEKUEWI4nIgfmUiHy6LLPK6
-						0XHX1lZYfOrciG30TyZ4nA==
-					</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://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://solo-qa.bodleian.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Bodleian Libraries QA/test SOLO service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bodleian.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>McLeish</SurName>
-    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>McLeish</SurName>
-    <EmailAddress>mailto:simon.mcleish@bodleian.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/solutions.sciquest.com.xml b/swamid-interfederations-2.0/solutions.sciquest.com.xml
deleted file mode 100644
index 73631263..00000000
--- a/swamid-interfederations-2.0/solutions.sciquest.com.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://solutions.sciquest.com">
-  <!--
-		This is a SelectSite 10 SP for SciQuest Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-12-13T16:38:32Z">
-      <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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC8zCCAlygAwIBAgIIXNlF3j4QphEwDQYJKoZIhvcNAQEEBQAwXjELMAkGA1UEBhMCVVMxETAP
-						BgNVBAoTCFNjaVF1ZXN0MRMwEQYDVQQLEwpQcm9kdWN0aW9uMScwJQYDVQQDEx5TY2lRdWVzdCBD
-						ZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTMwOTA5MjAzMjE1WhcNMzMwMzMxMjAzMjE1WjBgMRUw
-						EwYDVQQDEwxzY2lxdWVzdC5jb20xFDASBgNVBAsTC0RldmVsb3BtZW50MRcwFQYDVQQKEw5TY2lR
-						dWVzdCwgSW5jLjELMAkGA1UECBMCTkMxCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAggpL7bnjeQ/BI6voeasB/4RUMIL7d9rJN4ZAn+fUSbXquYhzHG5uifOOuEFn
-						KFq1XaXcGPRBy1Gvrt/JQb9ZL/0c/Z/IqtR0vsEthX+EStwtQUr1XJDC1l+eg9Z6x+CFXx2zsgHm
-						sIUcNeZ7nlDK6P+CI33P8wR1SkZZCce+4I0qc+C1Q3sN7LsNr2kdB2xAjHdRQtfBsD/3R/B9hChP
-						Svk9SiesQuiL5DnRC+GpLqmBeA6CQQ9n9LOg/E3NiSdLgUdQOyHt82eptEydm3vbZ/xRmfnNHEsZ
-						bAukNB2Iar+kg5dK9Qcw6QtqJhapi7nB1/cSRFj6uprpWw4bzBzEwwIDAQABozQwMjAOBgNVHQ8B
-						Af8EBAMCBaAwIAYDVR0lAQH/BBYwFAYIKwYBBQUHAwQGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBAUA
-						A4GBAHVXeQpZA5kEj/qufyv2U7NbVYKpscsAQ+G+9zMSF7Tclks6Nas1QybYXzpx7z84KfcsppK5
-						kDCehLIDIkMAjvohSIQutcNv6MY/snhHfrB+0cbabtIItYC8aAVhS5FLXmFMTxjZFUUPMVqMWo8L
-						tth7vyK/SYLX2V4sn3LELAUA
-					</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://solutions.sciquest.com/apps/Router/ExternalAuth/SAML/Login/Edinburgh" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://solutions.sciquest.com/apps/Router/ExternalAuth/SAML/Login/Warwick" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SciQuest Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SciQuest, Inc.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sciquest.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Monroe</SurName>
-    <EmailAddress>mailto:MMonroe@SciQuest.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Monroe</SurName>
-    <EmailAddress>mailto:MMonroe@SciQuest.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 6bd34f99..00000000
--- a/swamid-interfederations-2.0/some-develsp.some.ox.ac.uk-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://some-develsp.some.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Somerville College SharePoint01" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-06-16T15:43: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://some-develsp.some.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIJANXhSSqDSViiMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnNvbWUtZGV2ZWxzcC5zb21lLm94LmFjLnVrMB4XDTE0MDYxMTE0MzU0NloX
-						DTI0MDYwODE0MzU0NlowJTEjMCEGA1UEAxMac29tZS1kZXZlbHNwLnNvbWUub3gu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCXH7lw13G4eqAT
-						prFxI+KMrjJs8IjKlnsfsHcBkHTwyPLf8hL9Ia5lJMtBhbJrTcv/fznsAnbzUo0I
-						nncmCF5tQFljOap2VhPCFKm79JZ69bL/Eu5o5bqiv/njw/PfdiiIR3x3cdqwPWOr
-						2aNuzoNVQzlXFK0v3Mt927MXZZ4BUpbtPaP3NjxHfEktZhCH/R2duFNz16azWWul
-						Pch0Jw9D+4XMeF6i8CqeBEgmawZFN0cb5sgPcoacMhNmd5lMd8Ami+qfsmFlp05t
-						HB6fMY47pYy/O5RvYskgdftCCGuDIu89UmiWmNjHPytv6VeoPAyTAW7kehdpa85j
-						9bn/cBdfAgMBAAGjdzB1MFQGA1UdEQRNMEuCGnNvbWUtZGV2ZWxzcC5zb21lLm94
-						LmFjLnVrhi1odHRwczovL3NvbWUtZGV2ZWxzcC5zb21lLm94LmFjLnVrL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFG0CsUCHIt0y9PN0th+wQkPelh/OMA0GCSqGSIb3DQEB
-						BQUAA4IBAQBxVrg19YoV4XxXSNhaPYcjbWyZgZ41mB5AVrG87TOHh8mxBkbKLLAU
-						ZR+c3JqU4zSfle0zPFtD2IZyqbGoojswc482B5ZTltUGjLycfvNksfTT1C0/w50g
-						+Je9Njn4evUuw62XBPBG9m4S9pPCuKe28zmWWC/MjFQenK43TYU4Unud3OoyEMHY
-						sRW3pdor018DiAv0bV1q7r2KaWaEZWbgFtdqWYxU/R7VhFYKj9wWHs5DLIAnpmkc
-						xrs3kV6juklNJUG4pICaF88CW9Zcd4d6B4O26HeShWAD1X37iJVfdAqAgTXXLyvj
-						0rrgwvOpovrO2SefkaQVmpAqclAivahc
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://some-develsp.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://some-develsp.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Somerville College SharePoint01</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sonny.furman.edu-idp.xml b/swamid-interfederations-2.0/sonny.furman.edu-idp.xml
deleted file mode 100644
index 248dca1e..00000000
--- a/swamid-interfederations-2.0/sonny.furman.edu-idp.xml
+++ /dev/null
@@ -1,100 +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://sonny.furman.edu/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://sonny.furman.edu/idp/error.jsp" 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">furman.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Furman University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://furman.edu/</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>
-MIIDAzCCAeugAwIBAgIVAI1H0QkWz5jLIhTXfA7tHGhkNvo5MA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHNvbm55LmZ1cm1hbi5lZHUwHhcNMTIwMzIxMTYyNDQ1
-WhcNMzIwMzIxMTYyNDQ1WjAbMRkwFwYDVQQDExBzb25ueS5mdXJtYW4uZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsbvr70tE2cpMZ7095I5tEPYV
-foyJL9RWpwwnDMEMFH2fT74Tl8s1WRXe6xwEaAMT+5dx0qcZbgQC27mF0l2+zmMx
-6GvUeLC6CIgDLJtRumTtsRV9E8UsvRswRJnYtYT9eE2CAkUvbjkJZEGSRfZG2o0P
-l8S1munBzQFBD+fFEZYFl4FBxDxpRtkUxM2ylJ0NbqF+mQUCFYhCD+XbCw4IAkwb
-TBHd3cQ/6EMIfdzvVcCBMB3l8Fm2X/CGDlVcLB5boILGYEDX7HPxDLy6DJ0K4I3B
-7T8pxyK8jE6eyWl1S1tUXoi40CQJAbQzy7E2DtL0cZx9Ry1ql6bbIgSXpHiQBQID
-AQABoz4wPDAbBgNVHREEFDASghBzb25ueS5mdXJtYW4uZWR1MB0GA1UdDgQWBBRU
-MLOp0m88ZTOTShxkqeb0GrEL1DANBgkqhkiG9w0BAQUFAAOCAQEAEeOSGj3CBLqs
-WcdXSvyYK9geRTiML+uVZldoHn0yotZcexIgAA+Kwi59TUeRigsC2AAq+rXnJSY3
-JD/wJjdPhWD31bp0C7UFqv5VWiDxMXLPgVNrEZRHvWEwBusUEHkmD95eQoBNAEuB
-yABPQE3LJxQ1tyOFRVYjxNbh9P7fR8bqEtLSPOZyiElyc+eV1Y6sQF6edXY1hyuK
-+0B+9FngV0Wq63/lVLFeuazD+3tI/WugahzvVXleoG49TsFMyjgpFERkcFj9SC6A
-6t98O1ZdhVRiz7VlYeAspGvww4oDGKQUZiKTL7VWvPhIlDNv5kcakfZSRcN/QCf9
-cmzZA1pJew==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sonny.furman.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sonny.furman.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sonny.furman.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sonny.furman.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sonny.furman.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sonny.furman.edu/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">furman.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDAzCCAeugAwIBAgIVAI1H0QkWz5jLIhTXfA7tHGhkNvo5MA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHNvbm55LmZ1cm1hbi5lZHUwHhcNMTIwMzIxMTYyNDQ1
-WhcNMzIwMzIxMTYyNDQ1WjAbMRkwFwYDVQQDExBzb25ueS5mdXJtYW4uZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsbvr70tE2cpMZ7095I5tEPYV
-foyJL9RWpwwnDMEMFH2fT74Tl8s1WRXe6xwEaAMT+5dx0qcZbgQC27mF0l2+zmMx
-6GvUeLC6CIgDLJtRumTtsRV9E8UsvRswRJnYtYT9eE2CAkUvbjkJZEGSRfZG2o0P
-l8S1munBzQFBD+fFEZYFl4FBxDxpRtkUxM2ylJ0NbqF+mQUCFYhCD+XbCw4IAkwb
-TBHd3cQ/6EMIfdzvVcCBMB3l8Fm2X/CGDlVcLB5boILGYEDX7HPxDLy6DJ0K4I3B
-7T8pxyK8jE6eyWl1S1tUXoi40CQJAbQzy7E2DtL0cZx9Ry1ql6bbIgSXpHiQBQID
-AQABoz4wPDAbBgNVHREEFDASghBzb25ueS5mdXJtYW4uZWR1MB0GA1UdDgQWBBRU
-MLOp0m88ZTOTShxkqeb0GrEL1DANBgkqhkiG9w0BAQUFAAOCAQEAEeOSGj3CBLqs
-WcdXSvyYK9geRTiML+uVZldoHn0yotZcexIgAA+Kwi59TUeRigsC2AAq+rXnJSY3
-JD/wJjdPhWD31bp0C7UFqv5VWiDxMXLPgVNrEZRHvWEwBusUEHkmD95eQoBNAEuB
-yABPQE3LJxQ1tyOFRVYjxNbh9P7fR8bqEtLSPOZyiElyc+eV1Y6sQF6edXY1hyuK
-+0B+9FngV0Wq63/lVLFeuazD+3tI/WugahzvVXleoG49TsFMyjgpFERkcFj9SC6A
-6t98O1ZdhVRiz7VlYeAspGvww4oDGKQUZiKTL7VWvPhIlDNv5kcakfZSRcN/QCf9
-cmzZA1pJew==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sonny.furman.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sonny.furman.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Furman University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Furman University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www2.furman.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Randy Dill</md:GivenName>
-    <md:EmailAddress>randy.dill@furman.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Clayton Burton</md:GivenName>
-    <md:EmailAddress>clayton.burton@furman.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Service Center</md:GivenName>
-    <md:EmailAddress>service.center@furman.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sonotc.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/sonotc.cirqahosting.com-shibboleth.xml
deleted file mode 100644
index e71d8b82..00000000
--- a/swamid-interfederations-2.0/sonotc.cirqahosting.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://sonotc.cirqahosting.com/shibboleth">
-  <!--
-		This is a "Central College Nottingham Heritage Online" SP for IS Oxford Ltd.
-	-->
-  <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="2015-01-21T14:27:55Z">
-      <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://sonotc.cirqahosting.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHjCCAgagAwIBAgIJAIkX1kpNjmt4MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHXNvbm90Yy5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDExNTE4NDcw
-						M1oXDTI1MDExMjE4NDcwM1owKDEmMCQGA1UEAxMdc29ub3RjLmlzb3hmb3JkLWhv
-						c3RpbmcubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm8XcG
-						mYqERRLESmYo9p0ComVYypIJTvca91ISaE+CZLF/nvTY2b8VrW5EnhDNcn1sQCdY
-						BS3Jm57cw24x7reWWmLid33xz5obV/SR+zf+tesvohEUFO27Q+9PfOPLeURuVyYm
-						k2QNPBbi+LztRy+T6+ytAfv7WRqG/E6N4p7tDUKgR/5KXw/Nrfjt1ZBumICxmNp5
-						iyODvtllhXCsepO8tY7wAus1bn1/haI7+/rL3LcYJi01hO6+PAfVzNmRrAjj3oJ+
-						hJxfNYxMOkxcuyk+Ucvd0zVVlvNF4U+iAJxMlx5awstVo3Er7jwQ+qH5/+8ROB97
-						WlCeau59cJHcHWufAgMBAAGjSzBJMCgGA1UdEQQhMB+CHXNvbm90Yy5pc294Zm9y
-						ZC1ob3N0aW5nLmxvY2FsMB0GA1UdDgQWBBT7cCXhL2ILRWx9LSOnFnbytrznLzAN
-						BgkqhkiG9w0BAQUFAAOCAQEAx2qlPDb0JBoonpmrM/TtbPIX8NgtRe4A/JgXCwmn
-						PjGISpu6iWzY+Q8kUm3DDUBwVVlCTaL1cQtxX/8KfUiFEsJH2P+OaHBSfeBVFX4S
-						biTsyzaBdGeFpH0IZsvds2VLUd8b8yrL7OE9lji65ATM/x26tSlYWT7wMG/RseNX
-						8M2al5lbt2WgyQjWHX6wAHx5xDo9xJzL2X+poFLb9QlyStkXIRWF/FwUsdhZ852p
-						q6+D40u+RkuFZVpUQkZbbzqssNWPKNcmc+uyL5mmtftY3jrpfSr5drEavAvP56YA
-						6JOF2uvl6zbgdTrMH8GNTMVyqtpeBOZPwDR1RJTd4PH+4w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sonotc.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sonotc.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IS Oxford Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Central College Nottingham Heritage Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.isoxford.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lee</GivenName>
-    <SurName>Orchard</SurName>
-    <EmailAddress>mailto:lee@isoxford.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Salvesen</SurName>
-    <EmailAddress>mailto:david@isoxford.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sos.scran.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sos.scran.ac.uk-shibboleth.xml
deleted file mode 100644
index 7729d859..00000000
--- a/swamid-interfederations-2.0/sos.scran.ac.uk-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://sos.scran.ac.uk/shibboleth">
-  <!--
-		This is a "Scotland On Screen" 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:38:53Z"/>
-  </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">Scotland on Screen</mdui:DisplayName>
-        <mdui:Description xml:lang="en">An educational resource of historical film texts, providing students with a rear-view mirror on our society over the past century.</mdui:Description>
-        <mdui:Logo height="16" width="16">https://shib.scran.ac.uk/images/icon-sos.png</mdui:Logo>
-        <mdui:Logo height="100" width="138">https://shib.scran.ac.uk/images/logo-sos.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/sos/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/sos/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://www.scran.ac.uk/sos/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/sos/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/sos/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/sos/Shibboleth.sso/DS/UKFederation" 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://shib.scran.ac.uk/sos/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/sos/Shibboleth.sso/glow"/>
-    </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/sos/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scran.ac.uk/sos/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.scran.ac.uk/sos/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Scran Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Scotland On Screen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.scotlandonscreen.org.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/soton.co-tutor.co.uk-shibboleth.xml b/swamid-interfederations-2.0/soton.co-tutor.co.uk-shibboleth.xml
deleted file mode 100644
index 191bff90..00000000
--- a/swamid-interfederations-2.0/soton.co-tutor.co.uk-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://soton.co-tutor.co.uk/shibboleth">
-  <!--
-		This is a "Co-Tutor at Southampton" Shibboleth SP for Loughborough University.
-	-->
-  <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="2015-06-05T10:16:47Z">
-      <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://soton.co-tutor.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://soton.co-tutor.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAJlCEOj+nIZfMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGlwLTE3Mi0zMS0xMS0yMTcwHhcNMTUwNjAzMTEyMTUxWhcNMjUwNTMxMTEy
-						MTUxWjAbMRkwFwYDVQQDExBpcC0xNzItMzEtMTEtMjE3MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAvMun7yeyVxinfRuL0WvIR788UHIvTr6Zbom8LQam
-						gtgo529uQpxyz7qfiU9Ze8TJlNpo2ySw36J5sozy7cZgm2yXJ0H1GZh4BivzMlQC
-						ius0rgsmHQzE3vFurix4x7J8W+MnLRSB4fPg2Ha2FjmojoBOs7q9YOSfnXp78sQI
-						UEpcpTdOJhQ8cEZwYRIpcoMtUIbwE9i74IpNwsrmBTLLXkRvOrlEYEMU6IkT1OZc
-						aTvWWtL5Qz9+NvPaacw71H8+OerdUYjalM6uIFP6fKlrm7PhLRRZM7iQxxzHY8+n
-						G4yORfN3jxMTuF9XWWdE6wirPIs6ydE7Hgz5Fbj+AFYwWwIDAQABoz4wPDAbBgNV
-						HREEFDASghBpcC0xNzItMzEtMTEtMjE3MB0GA1UdDgQWBBSbRvcZTdr07G0ki1fn
-						J8zCQ7dVQzANBgkqhkiG9w0BAQUFAAOCAQEAZ/w7dbDACwEk7CIx7KRtIO/PJd5l
-						RCvUEIL9MW/KMXXM33qD5sgPdjRMoDv/fgdchdzmOrk/rkwANJmtfSBK3EqYdjgF
-						RYs39si4FTlTvY1ojOH14j26WBSRhBouex6SzeTminuS7T6tlpi3h/hwqefSFzt5
-						CrlUrZMBJ+tlAT7UvY76fLcl5c/dAUxjiEYAEI03ceCVQLSAARqmGbaO2QWqcMVX
-						LPLV8uxLejPBzqHqJAhWFluXzd5zQ+/EOiC7V7mTAnoAVDrAUNkBL0dbeAHUTnyC
-						KDAVvSt52LmVV8PEOmxkTjVwJnTlE5Acb3D+aIHu/YwRkSeyeVdUvdYlJw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://soton.co-tutor.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://soton.co-tutor.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Loughborough University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Co-Tutor at Southampton</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.co-tutor.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ray</GivenName>
-    <SurName>Chung</SurName>
-    <EmailAddress>mailto:ray.chung@lboro.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Newman</SurName>
-    <EmailAddress>mailto:p.m.newman@lboro.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sounds.bl.uk-shibboleth.xml b/swamid-interfederations-2.0/sounds.bl.uk-shibboleth.xml
deleted file mode 100644
index 7cf384fb..00000000
--- a/swamid-interfederations-2.0/sounds.bl.uk-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://sounds.bl.uk/shibboleth">
-  <!--
-		This is an 'Archival Sound Recordings' Shibboleth SP for the British Library (production).
-	-->
-  <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="2013-05-10T13:34:53Z"/>
-  </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://sounds.bl.uk/Shibboleth.sso/WAYF/UKFederation"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6DCCAdCgAwIBAgIJAMDqFzqjF6jWMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC3Y4Yi13ZWJwcm9kMB4XDTEzMDIxOTExMzIzMloXDTIzMDIxNzExMzIzMlow
-						FjEUMBIGA1UEAxMLdjhiLXdlYnByb2QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDtV0Wcb1yKMcfz3CBPKqxKbUpn3P7rpOf1O0RgocPTghq4FKKiUKxg
-						TDQQRpzZtjH2b6JtzIt94fTi4H5ETHqDtCC2FnExmsKAsmowH4ZDZ5WgUIea9eN0
-						mYJovj3kVSGgMuo8/mFhebGLPf79BtBQZN5iwc+WWwIG4/ULdzAc1Zj2mM41LiBw
-						n4cJLaAGpT8Yu8bhLBAhby3yUB+/3h+U8tjwo9srjvDD9n+Y6TnLAuxuNehBpkhm
-						kKebnVqanDyjGUCoe3gVmVkQHrWrUF/L/wEBcq5sCKedCRdOCgOhiVhTypdRpUeD
-						ZDAEpFtnO4G4ryZF/2Npp7zx7hO6Sxk5AgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Y4
-						Yi13ZWJwcm9kMB0GA1UdDgQWBBRGA+HLt05y3yAYOZQmk1mgc0Va+zANBgkqhkiG
-						9w0BAQUFAAOCAQEAUyjkQMO113dtFxaEMHWFog6V1jVKdGa9+lU3LtNh8jat6xPs
-						uV0wHYmAF8qFl17dD7vYOZBA05DTogo10/q89KJrfof6OLuHK32Hm0T8G3QoHe2G
-						fSum/EGk+8M8MupRPdVI+hwhlgFiGDVCY4q+6GiU9zmVXhvCsB+Ssfx0GH0D1Auq
-						CH7HN3mqNcjEsgFixzpgNsoD+McdGBeXrWNyKxJNgliq7BPvKnC2KhOXl7edd3hz
-						CU1pROsZ/785vkAVYrvxKnzuCoGAnlWf2X6UExDgeWZLEJ9mrYL6pTU6eHc2ukl5
-						Xou/5adlzlgyMCWRMLIRs7fMaiZ3/guduGhqnw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sounds.bl.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sounds.bl.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sounds.bl.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sounds.bl.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sounds.bl.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sounds.bl.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sounds.bl.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sounds.bl.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sounds.bl.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sounds.bl.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sounds.bl.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sounds.bl.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sounds.bl.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sounds.bl.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sounds.bl.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The British Library</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">British Library: Archival Sound Recordings</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bl.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Penty</SurName>
-    <EmailAddress>mailto:david.penty@bl.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Penty</SurName>
-    <EmailAddress>mailto:david.penty@bl.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/soundstage.bl.uk-shibboleth.xml b/swamid-interfederations-2.0/soundstage.bl.uk-shibboleth.xml
deleted file mode 100644
index 996588e1..00000000
--- a/swamid-interfederations-2.0/soundstage.bl.uk-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://soundstage.bl.uk/shibboleth">
-  <!--
-		This is a British Library Shibboleth SP for 'Archival Sound Recordings' (staging).
-	-->
-  <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="2013-02-22T17:29:28Z"/>
-  </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://soundstage.bl.uk/Shibboleth.sso/WAYF/UKFederation"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6DCCAdCgAwIBAgIJAMDqFzqjF6jWMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC3Y4Yi13ZWJwcm9kMB4XDTEzMDIxOTExMzIzMloXDTIzMDIxNzExMzIzMlow
-						FjEUMBIGA1UEAxMLdjhiLXdlYnByb2QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDtV0Wcb1yKMcfz3CBPKqxKbUpn3P7rpOf1O0RgocPTghq4FKKiUKxg
-						TDQQRpzZtjH2b6JtzIt94fTi4H5ETHqDtCC2FnExmsKAsmowH4ZDZ5WgUIea9eN0
-						mYJovj3kVSGgMuo8/mFhebGLPf79BtBQZN5iwc+WWwIG4/ULdzAc1Zj2mM41LiBw
-						n4cJLaAGpT8Yu8bhLBAhby3yUB+/3h+U8tjwo9srjvDD9n+Y6TnLAuxuNehBpkhm
-						kKebnVqanDyjGUCoe3gVmVkQHrWrUF/L/wEBcq5sCKedCRdOCgOhiVhTypdRpUeD
-						ZDAEpFtnO4G4ryZF/2Npp7zx7hO6Sxk5AgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Y4
-						Yi13ZWJwcm9kMB0GA1UdDgQWBBRGA+HLt05y3yAYOZQmk1mgc0Va+zANBgkqhkiG
-						9w0BAQUFAAOCAQEAUyjkQMO113dtFxaEMHWFog6V1jVKdGa9+lU3LtNh8jat6xPs
-						uV0wHYmAF8qFl17dD7vYOZBA05DTogo10/q89KJrfof6OLuHK32Hm0T8G3QoHe2G
-						fSum/EGk+8M8MupRPdVI+hwhlgFiGDVCY4q+6GiU9zmVXhvCsB+Ssfx0GH0D1Auq
-						CH7HN3mqNcjEsgFixzpgNsoD+McdGBeXrWNyKxJNgliq7BPvKnC2KhOXl7edd3hz
-						CU1pROsZ/785vkAVYrvxKnzuCoGAnlWf2X6UExDgeWZLEJ9mrYL6pTU6eHc2ukl5
-						Xou/5adlzlgyMCWRMLIRs7fMaiZ3/guduGhqnw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://soundstage.bl.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soundstage.bl.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://soundstage.bl.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soundstage.bl.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soundstage.bl.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://soundstage.bl.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://soundstage.bl.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soundstage.bl.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soundstage.bl.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://soundstage.bl.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The British Library</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">British Library: Archival Sound Recordings</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bl.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Penty</SurName>
-    <EmailAddress>mailto:david.penty@bl.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Penty</SurName>
-    <EmailAddress>mailto:david.penty@bl.uk</EmailAddress>
-  </ContactPerson>
-</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 d618002a..00000000
--- a/swamid-interfederations-2.0/sourcesup.cru.fr-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://sourcesup.cru.fr/shibboleth">
-  <md: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>
-    <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>https://federation.renater.fr/category/collaboratif</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md: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:InformationURL xml:lang="fr">http://sourcesup.renater.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDEjCCAfqgAwIBAgIJAOiUbftDbrjWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXByb2Qtc291cmNlc3VwLnJlbmF0ZXIuZnIwHhcNMTQxMjE4MTQwNjMyWhcN
-MjQxMjE1MTQwNjMyWjAkMSIwIAYDVQQDExlwcm9kLXNvdXJjZXN1cC5yZW5hdGVy
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoDkTHv1kV24iHZz5
-TixIlPuOPUSlOBZHlOVl/FDcWeIXErAtne6s5e7CDuwMCVhc9nFikYz8fXvoHrmL
-xWmeEKFn1HcKX/EFmZzW32lGkt7mVvawFwvA1xhA5UgEeyxMkMUDK9pqAOv8rRrw
-AVqHeae+rTfm3ByRmwrirvu2yX08LzjMTSXaVyofGbRgQBKrtJ+4YgTrznTDbkcI
-ljSY5Ia2yA/FyDMNBnCPd0zeAFFN0DDp9yTjYpFcGKPocSgGCxUNTViqi3BP0/QT
-OebHMKy2iPOMPhuraHPtGzfpB2WsNrIj1/MyUDhvSgL8+Jb5EuhzuUW/4Nf7hggI
-gQwmzQIDAQABo0cwRTAkBgNVHREEHTAbghlwcm9kLXNvdXJjZXN1cC5yZW5hdGVy
-LmZyMB0GA1UdDgQWBBT0gDsgE5GBO7ONrYHRLmDGeQj49DANBgkqhkiG9w0BAQUF
-AAOCAQEANXCISKQFikmoLiCTkh9FQb2JH0diznFpyw3bNjwJJMbpa7dRhE3ovbpw
-qFKdTdClvARZqvVrS8H5+vG3TLlw/VaFbadtDWDcrBy9fPar22GButx2QtSDHUN1
-8v6UYlUDc5aYHXP9kHrWe4jQbspUk//ra6kEc/VSTmmRbDEYZRnA1GP+cYh5fK2L
-fGATL7uXdhzPwDjo1kpd9TeuZ1JvWHQqgXgtIG4xnNCLERS0FYT+Hw3sXxyoNmcO
-fHoVLzXiO+cyO8ju79HLsrI28go6UlY+I2nAXmDolYqOwUgjqkXnC9GnX40zZCMw
-CpyHcHTaVxqS+lxgQHejUBXGYLXNSg==
-					    </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>
-					      MIIDEjCCAfqgAwIBAgIJAOiUbftDbrjWMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-BAMTGXByb2Qtc291cmNlc3VwLnJlbmF0ZXIuZnIwHhcNMTQxMjE4MTQwNjMyWhcN
-MjQxMjE1MTQwNjMyWjAkMSIwIAYDVQQDExlwcm9kLXNvdXJjZXN1cC5yZW5hdGVy
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoDkTHv1kV24iHZz5
-TixIlPuOPUSlOBZHlOVl/FDcWeIXErAtne6s5e7CDuwMCVhc9nFikYz8fXvoHrmL
-xWmeEKFn1HcKX/EFmZzW32lGkt7mVvawFwvA1xhA5UgEeyxMkMUDK9pqAOv8rRrw
-AVqHeae+rTfm3ByRmwrirvu2yX08LzjMTSXaVyofGbRgQBKrtJ+4YgTrznTDbkcI
-ljSY5Ia2yA/FyDMNBnCPd0zeAFFN0DDp9yTjYpFcGKPocSgGCxUNTViqi3BP0/QT
-OebHMKy2iPOMPhuraHPtGzfpB2WsNrIj1/MyUDhvSgL8+Jb5EuhzuUW/4Nf7hggI
-gQwmzQIDAQABo0cwRTAkBgNVHREEHTAbghlwcm9kLXNvdXJjZXN1cC5yZW5hdGVy
-LmZyMB0GA1UdDgQWBBT0gDsgE5GBO7ONrYHRLmDGeQj49DANBgkqhkiG9w0BAQUF
-AAOCAQEANXCISKQFikmoLiCTkh9FQb2JH0diznFpyw3bNjwJJMbpa7dRhE3ovbpw
-qFKdTdClvARZqvVrS8H5+vG3TLlw/VaFbadtDWDcrBy9fPar22GButx2QtSDHUN1
-8v6UYlUDc5aYHXP9kHrWe4jQbspUk//ra6kEc/VSTmmRbDEYZRnA1GP+cYh5fK2L
-fGATL7uXdhzPwDjo1kpd9TeuZ1JvWHQqgXgtIG4xnNCLERS0FYT+Hw3sXxyoNmcO
-fHoVLzXiO+cyO8ju79HLsrI28go6UlY+I2nAXmDolYqOwUgjqkXnC9GnX40zZCMw
-CpyHcHTaVxqS+lxgQHejUBXGYLXNSg==
-					    </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>
-					      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>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">RENATER - la plateforme SourceSup</md:ServiceName>
-      <md:ServiceName xml:lang="en">RENATER - software forge for RENATER community</md:ServiceName>
-      <md: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.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">SourceSup is a forge hosting development projects for the French HiEd community</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>support@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 15af9807..00000000
--- a/swamid-interfederations-2.0/sourcesup.cru.fr.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://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>
-					      MIIDAzCCAeugAwIBAgIJAKuk6oRKZz4uMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTEyMTIxMDE1MDMyMloXDTIyMTIw
-ODE1MDMyMlowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlfCY6MZquL5Lk6KBnaT4pItD6AQKr
-T2GY8CwNhFeCqbeg1UbUvYo/a/4uGq7S+HeDK+/AIoapC5AzG4E+0Ca+uVkiWRld
-dpaQx5rPPCfdoI6WtutWrlkNYmmMFzoxOEaOv9YIa0sVHy6zJyghHAhK/PiSqt26
-sYCJRW2vTWJ5PKGhLG3UunQxPfa9N2GO19g/pKyPvX19bi43HgZEGj8GvmcEgAVu
-eJeeGlSXxTzPOLuyvDzt9zvRTIHirHp++K5+l8vhkDTJza7ODcTsiS8SOEP5v5Fk
-BJS6a+HNJm/N22xhrBcshwXfvXMmESsdaUEtIMzQf66r1OTmbgeAeHZZAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQx
-TfD1M0AVI4lWqvsJdklkJv1INTANBgkqhkiG9w0BAQUFAAOCAQEAOMr0aTllYChc
-I3nffrxNj6xyWlI35AlzWmgQqLwScSDDWPwgHD81Maazbq0SSo+4A42/x7P3Jz1u
-R5t73qphmBgzLmX3HA/FGUhbyevzr0zsLf5b+LDi0ncIZ0PM5L8ZMZDTv/k7DVZE
-JwoA1/fFU4st7EU0NjemkE9SCgzqyZc8GRuEs8As7mK7p4slpaZo6kXG9A2dKsmZ
-s0R+Iuj8q0ccUHFb1n92kS4gqSxJCKmbtcIcFk3QdC2o+IXdaDB8RHxKaS8kfFS1
-Am6Gl2+CfY5FrK1p9pIYU0YoTIqma1498HOq3f82/aO61mxzfUMu2vH/Fds0BhM8
-WVDj2hrySg==
-
-					    </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>
-					      MIIDAzCCAeugAwIBAgIJAKuk6oRKZz4uMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTEyMTIxMDE1MDMyMloXDTIyMTIw
-ODE1MDMyMlowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlfCY6MZquL5Lk6KBnaT4pItD6AQKr
-T2GY8CwNhFeCqbeg1UbUvYo/a/4uGq7S+HeDK+/AIoapC5AzG4E+0Ca+uVkiWRld
-dpaQx5rPPCfdoI6WtutWrlkNYmmMFzoxOEaOv9YIa0sVHy6zJyghHAhK/PiSqt26
-sYCJRW2vTWJ5PKGhLG3UunQxPfa9N2GO19g/pKyPvX19bi43HgZEGj8GvmcEgAVu
-eJeeGlSXxTzPOLuyvDzt9zvRTIHirHp++K5+l8vhkDTJza7ODcTsiS8SOEP5v5Fk
-BJS6a+HNJm/N22xhrBcshwXfvXMmESsdaUEtIMzQf66r1OTmbgeAeHZZAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQx
-TfD1M0AVI4lWqvsJdklkJv1INTANBgkqhkiG9w0BAQUFAAOCAQEAOMr0aTllYChc
-I3nffrxNj6xyWlI35AlzWmgQqLwScSDDWPwgHD81Maazbq0SSo+4A42/x7P3Jz1u
-R5t73qphmBgzLmX3HA/FGUhbyevzr0zsLf5b+LDi0ncIZ0PM5L8ZMZDTv/k7DVZE
-JwoA1/fFU4st7EU0NjemkE9SCgzqyZc8GRuEs8As7mK7p4slpaZo6kXG9A2dKsmZ
-s0R+Iuj8q0ccUHFb1n92kS4gqSxJCKmbtcIcFk3QdC2o+IXdaDB8RHxKaS8kfFS1
-Am6Gl2+CfY5FrK1p9pIYU0YoTIqma1498HOq3f82/aO61mxzfUMu2vH/Fds0BhM8
-WVDj2hrySg==
-
-					    </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:2.0:bindings:HTTP-POST" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sourcesup.renater.fr/Shibboleth.sso/SAML/POST" index="5"/>
-    <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"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Olivier Lumineau</SurName>
-    <EmailAddress>olivier.lumineau@renater.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>sebastien Medard</SurName>
-    <EmailAddress>sebastien.medard@renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/southdowns.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/southdowns.ac.uk-oala-metadata.xml
deleted file mode 100644
index 84b9af56..00000000
--- a/swamid-interfederations-2.0/southdowns.ac.uk-oala-metadata.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://southdowns.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for South Downs College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">southdowns.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDsjCCApqgAwIBAgIJAJAieyFUQYVfMA0GCSqGSIb3DQEBBQUAMEQxHDAaBgNV
-						BAoTE1NvdXRoIERvd25zIENvbGxlZ2UxJDAiBgNVBAMTG29wZW5hdGhlbnMuc291
-						dGhkb3ducy5hYy51azAeFw0xMDExMTUxNjA0NTNaFw0yMDExMTIxNjA0NTNaMEQx
-						HDAaBgNVBAoTE1NvdXRoIERvd25zIENvbGxlZ2UxJDAiBgNVBAMTG29wZW5hdGhl
-						bnMuc291dGhkb3ducy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBALi6iaxoZs3UPZ4OPz12rT6Q+by/nqe0LFm9rC54os5NF04Japi0AywD5mZl
-						QMTUmJA/6Plp6V1dvG2/4Mta9v6IJtZhZAL9KuYUCCT0TIAq+226B1Xn3U8i6QBD
-						HtjiEYtVf+wpSrt3Q+4SCn3yb/NkqoBRJrKK0LQaQk4309lMB5Z9PBy0mBp9nuW1
-						SwU8XfXfWP++yfpbb8TVqUZC51b9ZvlzWqEmnn6Uz+p85XoVL91iI9/9JrRaXX4U
-						/szDn/pLeMXFaH2cXLMQM4euz506SQlCNityzJglLDvdMPNunKHR5KjiTA4zNtQ9
-						dsPjyqib43NXqLQmzoKtEG/YsyECAwEAAaOBpjCBozAdBgNVHQ4EFgQU4IMEMW2y
-						iVoYr16A1nQXUHubRWYwdAYDVR0jBG0wa4AU4IMEMW2yiVoYr16A1nQXUHubRWah
-						SKRGMEQxHDAaBgNVBAoTE1NvdXRoIERvd25zIENvbGxlZ2UxJDAiBgNVBAMTG29w
-						ZW5hdGhlbnMuc291dGhkb3ducy5hYy51a4IJAJAieyFUQYVfMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBABSUUKFcDUqRg5UDgzKAaP8/+jb/T3W+KN6H
-						p7sy/xmc7LP732LfcBifw0t4HRQwRl/oTnoNvcD8W6jbY0U4fP8WNWkDdXrJYFjw
-						86jx+XlOz3/Y0wvgOSzRuJ41J7pFdLqYawpKeI8fKyKVaVSTWVxuCtwKP9CTVh7M
-						S1BtgAi2EBcadc3b+/mWU8er+wJ83YGZ9kguxptxmoCWj0mpsUKuAb9NzzLpIsPZ
-						NZ6Ufwr690QZwjqWJFZa7EmIM5KOqKWncwW5fglxrfs+EwXxWP3Ku0HY1JfDqKTX
-						7YF1KUNKqWlQIDB/gyHChM5t0MjRxWMs0WRm4Oorz+U4YZfObkI=
-					</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>
-						MIIDsjCCApqgAwIBAgIJAJAieyFUQYVfMA0GCSqGSIb3DQEBBQUAMEQxHDAaBgNV
-						BAoTE1NvdXRoIERvd25zIENvbGxlZ2UxJDAiBgNVBAMTG29wZW5hdGhlbnMuc291
-						dGhkb3ducy5hYy51azAeFw0xMDExMTUxNjA0NTNaFw0yMDExMTIxNjA0NTNaMEQx
-						HDAaBgNVBAoTE1NvdXRoIERvd25zIENvbGxlZ2UxJDAiBgNVBAMTG29wZW5hdGhl
-						bnMuc291dGhkb3ducy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBALi6iaxoZs3UPZ4OPz12rT6Q+by/nqe0LFm9rC54os5NF04Japi0AywD5mZl
-						QMTUmJA/6Plp6V1dvG2/4Mta9v6IJtZhZAL9KuYUCCT0TIAq+226B1Xn3U8i6QBD
-						HtjiEYtVf+wpSrt3Q+4SCn3yb/NkqoBRJrKK0LQaQk4309lMB5Z9PBy0mBp9nuW1
-						SwU8XfXfWP++yfpbb8TVqUZC51b9ZvlzWqEmnn6Uz+p85XoVL91iI9/9JrRaXX4U
-						/szDn/pLeMXFaH2cXLMQM4euz506SQlCNityzJglLDvdMPNunKHR5KjiTA4zNtQ9
-						dsPjyqib43NXqLQmzoKtEG/YsyECAwEAAaOBpjCBozAdBgNVHQ4EFgQU4IMEMW2y
-						iVoYr16A1nQXUHubRWYwdAYDVR0jBG0wa4AU4IMEMW2yiVoYr16A1nQXUHubRWah
-						SKRGMEQxHDAaBgNVBAoTE1NvdXRoIERvd25zIENvbGxlZ2UxJDAiBgNVBAMTG29w
-						ZW5hdGhlbnMuc291dGhkb3ducy5hYy51a4IJAJAieyFUQYVfMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBABSUUKFcDUqRg5UDgzKAaP8/+jb/T3W+KN6H
-						p7sy/xmc7LP732LfcBifw0t4HRQwRl/oTnoNvcD8W6jbY0U4fP8WNWkDdXrJYFjw
-						86jx+XlOz3/Y0wvgOSzRuJ41J7pFdLqYawpKeI8fKyKVaVSTWVxuCtwKP9CTVh7M
-						S1BtgAi2EBcadc3b+/mWU8er+wJ83YGZ9kguxptxmoCWj0mpsUKuAb9NzzLpIsPZ
-						NZ6Ufwr690QZwjqWJFZa7EmIM5KOqKWncwW5fglxrfs+EwXxWP3Ku0HY1JfDqKTX
-						7YF1KUNKqWlQIDB/gyHChM5t0MjRxWMs0WRm4Oorz+U4YZfObkI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://openathens.southdowns.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openathens.southdowns.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">South Downs College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South Downs College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.southdowns.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:ithelpdesk@southdowns.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Neil</GivenName>
-    <SurName>McQueen</SurName>
-    <EmailAddress>mailto:nmcqueen@southdowns.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-fedhub.xml b/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-fedhub.xml
deleted file mode 100644
index 12559245..00000000
--- a/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-fedhub.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-demo.proofidcloud.co.uk/fedhub">
-  <!--
-		This is a "Federation Hub" SP for ProofID Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-16T10:36:26Z">
-      <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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIGAUwSegszMA0GCSqGSIb3DQEBCwUAMEQxCzAJBgNVBAYT
-						AkdCMRAwDgYDVQQKEwdQcm9vZklEMSMwIQYDVQQDExpzcC1kZW1vLnByb29maWRj
-						bG91ZC5jby51azAeFw0xNTAzMTMwOTMyMTBaFw0yNTAzMTAwOTMyMTBaMEQxCzAJ
-						BgNVBAYTAkdCMRAwDgYDVQQKEwdQcm9vZklEMSMwIQYDVQQDExpzcC1kZW1vLnBy
-						b29maWRjbG91ZC5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AJbTlE98EWG7xF6dGiiAxoFPLVgwOwN455DGjlRA7T5zir8wTfA798hOpd0lLQHW
-						o2JgAWcYCQxkvW0tbUz62x/w4WwRuphqX56vENlNO1ujfVLwB8uV1PTz9E2dd2Zk
-						ldhd34wS7nTm4TDStxo6hjDy7SNJIpjSin5ZUzj6qhchE7yEj8WdNIHfI5n873aQ
-						r34lhTeX0bO1SkjUVWZ35h/BZlQxMRxfAIWtRYjtDpCF5FQIuBjLYLGsQdbAuKUy
-						22wfInSfKKeCtcvoGU2tiRNP2VlLndh8V9PTn90mb//7QQKTFybmu3Zg9+FMVvV5
-						ABffqolzoN+Ko6h14bdVk88CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEASJ7zGI7R
-						P+hAWaI6pPDQgBwcH0ofsd22b20n7Iy8dMNlmthFHy21B9LHiMijhaKUeRN0A7By
-						sEDKCx2S8hDkbc+PtQocpummmjFdi7O7FzuAad12gq+v16xWcfrXePDb25koi3fs
-						GvqNNGK5P5ix9ZoxYWuFNwbBfaKCZiUBfF3fKBg0nlx30Y2B5DhhI64FW9XNeVDn
-						44cbVreq3j/qmRLvxwZ5NUXFmzR2Zo6Q3aj7Ytr39xVuOXUMmfPH0HbFQ66PKVWv
-						52cBGjDQSv4b9b63zX/MGxHASJ2m1jV+CQ+ZAUb1+Ek0lXtfULBHrE9q6XDt5UWQ
-						LJfFHRUh/AHvJA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-demo.proofidcloud.co.uk/sp/ACS.saml2" index="0" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ProofID Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ProofID Federation Hub SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.proofid.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@proofid.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@proofid.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-portal.xml b/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-portal.xml
deleted file mode 100644
index 121ab9ca..00000000
--- a/swamid-interfederations-2.0/sp-demo.proofidcloud.co.uk-portal.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp-demo.proofidcloud.co.uk/portal">
-  <!--
-		This is a "ProofID test portal SP" PingFederate SP for ProofID Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-16T15:12:48Z">
-      <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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIGAUwSegszMA0GCSqGSIb3DQEBCwUAMEQxCzAJBgNVBAYT
-						AkdCMRAwDgYDVQQKEwdQcm9vZklEMSMwIQYDVQQDExpzcC1kZW1vLnByb29maWRj
-						bG91ZC5jby51azAeFw0xNTAzMTMwOTMyMTBaFw0yNTAzMTAwOTMyMTBaMEQxCzAJ
-						BgNVBAYTAkdCMRAwDgYDVQQKEwdQcm9vZklEMSMwIQYDVQQDExpzcC1kZW1vLnBy
-						b29maWRjbG91ZC5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AJbTlE98EWG7xF6dGiiAxoFPLVgwOwN455DGjlRA7T5zir8wTfA798hOpd0lLQHW
-						o2JgAWcYCQxkvW0tbUz62x/w4WwRuphqX56vENlNO1ujfVLwB8uV1PTz9E2dd2Zk
-						ldhd34wS7nTm4TDStxo6hjDy7SNJIpjSin5ZUzj6qhchE7yEj8WdNIHfI5n873aQ
-						r34lhTeX0bO1SkjUVWZ35h/BZlQxMRxfAIWtRYjtDpCF5FQIuBjLYLGsQdbAuKUy
-						22wfInSfKKeCtcvoGU2tiRNP2VlLndh8V9PTn90mb//7QQKTFybmu3Zg9+FMVvV5
-						ABffqolzoN+Ko6h14bdVk88CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEASJ7zGI7R
-						P+hAWaI6pPDQgBwcH0ofsd22b20n7Iy8dMNlmthFHy21B9LHiMijhaKUeRN0A7By
-						sEDKCx2S8hDkbc+PtQocpummmjFdi7O7FzuAad12gq+v16xWcfrXePDb25koi3fs
-						GvqNNGK5P5ix9ZoxYWuFNwbBfaKCZiUBfF3fKBg0nlx30Y2B5DhhI64FW9XNeVDn
-						44cbVreq3j/qmRLvxwZ5NUXFmzR2Zo6Q3aj7Ytr39xVuOXUMmfPH0HbFQ66PKVWv
-						52cBGjDQSv4b9b63zX/MGxHASJ2m1jV+CQ+ZAUb1+Ek0lXtfULBHrE9q6XDt5UWQ
-						LJfFHRUh/AHvJA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-demo.proofidcloud.co.uk/sp/ACS.saml2" index="0" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ProofID Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ProofID test portal SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.proofid.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@proofid.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@proofid.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml b/swamid-interfederations-2.0/sp-test.canstudios.com-shibboleth.xml
deleted file mode 100644
index 4b6f4648..00000000
--- a/swamid-interfederations-2.0/sp-test.canstudios.com-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://sp-test.canstudios.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Boardworks Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDRTCCAi2gAwIBAgIJALlo8Ome5hOyMA0GCSqGSIb3DQEBBQUAMDUxMzAxBgNV
-						BAMTKmlwLTEwLTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDAe
-						Fw0xMTA0MDQxMDIyMTdaFw0yMTA0MDExMDIyMTdaMDUxMzAxBgNVBAMTKmlwLTEw
-						LTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMyqeka+BvUmQyfbNfa3cIm0qDc0hrdsNcWe
-						WwqLVgVn1ybRvG7meK+hb9SunW9jo6drWN5YcDuKAvSzNFO5PaPM2c2rcSjqGnuk
-						hGt490fIchEKlEqMCdlcQ3iuADLDiugbWDmcUw9KsC7oXMCSeILvOGdX1uIe9TBY
-						zKcc8hUAHQ3wtcLspb36bkDK4NUzIaGgVLcq9g6zILb+Fcn/LhkLdJtoawiFM/Fq
-						I9GL0IpsUEcwBnVVJ0/95YUh2pc6XRp6+AYQNFm5z2KSJbJkXRkU2yuORh1Hj3dq
-						TZ+F+p0RDydWwqiRZcNUkfyb+CaJg3hFivY+C/AHu8djt56ahYECAwEAAaNYMFYw
-						NQYDVR0RBC4wLIIqaXAtMTAtNTYtNjctMTQzLmV1LXdlc3QtMS5jb21wdXRlLmlu
-						dGVybmFsMB0GA1UdDgQWBBT2pR0g9K3m7Y6bIq/RsoOj6lHjUTANBgkqhkiG9w0B
-						AQUFAAOCAQEANTAPP0B5Uh4eRpl2qmgeS4m+c0wNvYOeApgytH9UiCouivZrfx1x
-						0/0PUaF0rSnVjcGaGNVBkWh6Lj6ghfVis2BUa4McyetgsV1KmSsrrN+AtlK3WXkf
-						WLd6WQ/fB3FQ7gPEczRULjS6/tOrr3o96KW2ANkEZE3xjZi0YDC89dlEsESdojr4
-						icU0w5Hh2enXVym/rIrPReK+G19phnsZFw1AhSXQmhq0L1x4f0XQMHj0C2QDlJOD
-						SyG+rbw/0u9SeNx/iMZKa1qKz9WEOj6CZGh83bW8OneXzP04/g98kWgQ7FIAzYYb
-						zEv3N6DD8ZWFPrnpVVTE8F0rXeUFmbax4g==
-					</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>
-						MIIDRTCCAi2gAwIBAgIJALlo8Ome5hOyMA0GCSqGSIb3DQEBBQUAMDUxMzAxBgNV
-						BAMTKmlwLTEwLTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDAe
-						Fw0xMTA0MDQxMDIyMTdaFw0yMTA0MDExMDIyMTdaMDUxMzAxBgNVBAMTKmlwLTEw
-						LTU2LTY3LTE0My5ldS13ZXN0LTEuY29tcHV0ZS5pbnRlcm5hbDCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMyqeka+BvUmQyfbNfa3cIm0qDc0hrdsNcWe
-						WwqLVgVn1ybRvG7meK+hb9SunW9jo6drWN5YcDuKAvSzNFO5PaPM2c2rcSjqGnuk
-						hGt490fIchEKlEqMCdlcQ3iuADLDiugbWDmcUw9KsC7oXMCSeILvOGdX1uIe9TBY
-						zKcc8hUAHQ3wtcLspb36bkDK4NUzIaGgVLcq9g6zILb+Fcn/LhkLdJtoawiFM/Fq
-						I9GL0IpsUEcwBnVVJ0/95YUh2pc6XRp6+AYQNFm5z2KSJbJkXRkU2yuORh1Hj3dq
-						TZ+F+p0RDydWwqiRZcNUkfyb+CaJg3hFivY+C/AHu8djt56ahYECAwEAAaNYMFYw
-						NQYDVR0RBC4wLIIqaXAtMTAtNTYtNjctMTQzLmV1LXdlc3QtMS5jb21wdXRlLmlu
-						dGVybmFsMB0GA1UdDgQWBBT2pR0g9K3m7Y6bIq/RsoOj6lHjUTANBgkqhkiG9w0B
-						AQUFAAOCAQEANTAPP0B5Uh4eRpl2qmgeS4m+c0wNvYOeApgytH9UiCouivZrfx1x
-						0/0PUaF0rSnVjcGaGNVBkWh6Lj6ghfVis2BUa4McyetgsV1KmSsrrN+AtlK3WXkf
-						WLd6WQ/fB3FQ7gPEczRULjS6/tOrr3o96KW2ANkEZE3xjZi0YDC89dlEsESdojr4
-						icU0w5Hh2enXVym/rIrPReK+G19phnsZFw1AhSXQmhq0L1x4f0XQMHj0C2QDlJOD
-						SyG+rbw/0u9SeNx/iMZKa1qKz9WEOj6CZGh83bW8OneXzP04/g98kWgQ7FIAzYYb
-						zEv3N6DD8ZWFPrnpVVTE8F0rXeUFmbax4g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.canstudios.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.canstudios.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.canstudios.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.canstudios.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Boardworks Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Boardworks Limited: MyWorks Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.myworks.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Catherine</GivenName>
-    <SurName>Marks</SurName>
-    <EmailAddress>mailto:catherine.marks@boardworks.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Catherine</GivenName>
-    <SurName>Marks</SurName>
-    <EmailAddress>mailto:catherine.marks@boardworks.co.uk</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 1859c2d1..00000000
--- a/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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">
-      <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.swamid.se/category/sfs-1993-1153</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/nren-service</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>
-      <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>
-      <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+jCCAeKgAwIBAgIJANmYETA8gTbGMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXNwLXRlc3Quc3dhbWlkLnNlMB4XDTE1MDEyODE0NDkzNVoXDTI1MDEyNTE0
-NDkzNVowHDEaMBgGA1UEAxMRc3AtdGVzdC5zd2FtaWQuc2UwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDB9LT9HoTmLjPiMQvo9zujGS3cLF6TbukK8A0B
-CfA/A6JJkwLpbHbGzL4VRnaSzS8qW+6TvehFFDlh+u1W91rOodiqkpAubHcO97O2
-th677wXUyyOWsnlyxnOWQVBrtWJFfV1zjmr8AfdHW1zbpstWWz+orEUNBE7X39dd
-Zq7eorJZD+rD07XU40cwXUwKUy7m73XLHlW3sXuJXddZ/1qs4UilC9LRflaL7j4A
-UmUbil+Md+xm3rEuiEjN3hiZiyjSTja7NIP2unhzxJSoAC9X/6cj5aWrEjO6oplf
-s+xei1Rya8qzFHcLvGRME2tFMb047sTCGl6oCkoizC4hCCfpAgMBAAGjPzA9MBwG
-A1UdEQQVMBOCEXNwLXRlc3Quc3dhbWlkLnNlMB0GA1UdDgQWBBSsTWqxt6/xVeVD
-RW62Ap+udtmTNzANBgkqhkiG9w0BAQUFAAOCAQEAIB6TPgX+qJ5pa8oLETXnArQg
-C946h+Im7zjT8kuCpeiL7/lfohqclaJB3PfYOs82FwmOOkmA3kcZdk4aaOXXZkh9
-05ZoxxYo64mssvXLNcB0ydOJ1o82gdPzL2dTR+iT1IlanJkAyI6OR6ZO6q69+sFJ
-Z7BVMhzPKNxFNlHEJOEVenCxPNn/B4pVV3W7pq2EKYgi6e2MtpQGKb0IKWaZzVLz
-bqvHv30vxBnEMgIgSmDtVTlSKFzulp153JSZJpb/88H0RPZY6odIakCuDzOkVhIj
-CUgd8Vxw9b2Xr/McJ4HsCt/ebBUvDnW98Sk+e03ZX2PQNLhKOtyKaF0l+o0K8g==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-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 9df59b98..00000000
--- a/swamid-interfederations-2.0/sp-test.swamid.se.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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://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.wortech.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp-test.wortech.ac.uk-shibboleth.xml
deleted file mode 100644
index 2472833f..00000000
--- a/swamid-interfederations-2.0/sp-test.wortech.ac.uk-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-test.wortech.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 SP for Heart of Worcestershire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://sp-test.wortech.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAMwsgNyzDRXNMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azAeFw0xMDExMDkxNTI5MDZaFw0yMDEx
-						MDYxNTI5MDZaMCAxHjAcBgNVBAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeI+dq6Q0k+EvCnXvyITtkxUYDS
-						+6b0GXkofMeMyDt+4fy0IznKXK46VncC1sfronjA5ah6Y2VXhDzZKrt/2TtPRNLQ
-						J7k9CfyYUTAXZ5B1pR4a1IevXcoQPFROmXxZsoqViuNXH+BzuIviv9f6TSPennW0
-						SX3plKCFAvnHiYPsPbdcBwTku6NVLOsgfeAV1XQUVHP0f3xBr2wk3TiELxEhbtTx
-						S2rNqgkHkx+eDKAfTBp7GzCh5Q7VsMfKNWmdgAq42HLpOnqvviPF/Fn9KLKCNuMA
-						TH01ypbb4vEL5xP/UbQKfER0Wa67isFpfkXgMeS66wmA6TlwNXCGOudrZIMCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVc3AtdGVzdC53b3J0ZWNoLmFjLnVrMB0GA1UdDgQW
-						BBSB03qpqS73R8ADFUKyCMvsO/7OozANBgkqhkiG9w0BAQUFAAOCAQEAxJctEFMq
-						SKsmQPuc/oudcQYsbC8IUzbVjJ6TsuC/s/Y9sVPKtCCmaCJFeymbx9yHRdH8k0dP
-						7n2pFmv7oHpohHniOzF/X5O3HZLTAKq077axk54ca4MtLU4gnkhGqQUQ6tucPJ/8
-						4fu2xH394cGVl3giPI6zZahTvks3OH4GizkELNF5/NYbxx6tilQDmYnijp5z+m88
-						58jIhUpEdUI/ZkwjA7Bgf/+1t8Q9ys2GC9xjBk46H537S7UlDJGwojUTsHPGceVD
-						mRjRzBOnlMe7YT8NEvKK16QvehZlwfnMosIlNFozGmhwVtWlJ+pJATGm0gu4vZDU
-						I64R7eQVc7Z6kw==
-					</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>
-						MIIDBjCCAe6gAwIBAgIJAMwsgNyzDRXNMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azAeFw0xMDExMDkxNTI5MDZaFw0yMDEx
-						MDYxNTI5MDZaMCAxHjAcBgNVBAMTFXNwLXRlc3Qud29ydGVjaC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeI+dq6Q0k+EvCnXvyITtkxUYDS
-						+6b0GXkofMeMyDt+4fy0IznKXK46VncC1sfronjA5ah6Y2VXhDzZKrt/2TtPRNLQ
-						J7k9CfyYUTAXZ5B1pR4a1IevXcoQPFROmXxZsoqViuNXH+BzuIviv9f6TSPennW0
-						SX3plKCFAvnHiYPsPbdcBwTku6NVLOsgfeAV1XQUVHP0f3xBr2wk3TiELxEhbtTx
-						S2rNqgkHkx+eDKAfTBp7GzCh5Q7VsMfKNWmdgAq42HLpOnqvviPF/Fn9KLKCNuMA
-						TH01ypbb4vEL5xP/UbQKfER0Wa67isFpfkXgMeS66wmA6TlwNXCGOudrZIMCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVc3AtdGVzdC53b3J0ZWNoLmFjLnVrMB0GA1UdDgQW
-						BBSB03qpqS73R8ADFUKyCMvsO/7OozANBgkqhkiG9w0BAQUFAAOCAQEAxJctEFMq
-						SKsmQPuc/oudcQYsbC8IUzbVjJ6TsuC/s/Y9sVPKtCCmaCJFeymbx9yHRdH8k0dP
-						7n2pFmv7oHpohHniOzF/X5O3HZLTAKq077axk54ca4MtLU4gnkhGqQUQ6tucPJ/8
-						4fu2xH394cGVl3giPI6zZahTvks3OH4GizkELNF5/NYbxx6tilQDmYnijp5z+m88
-						58jIhUpEdUI/ZkwjA7Bgf/+1t8Q9ys2GC9xjBk46H537S7UlDJGwojUTsHPGceVD
-						mRjRzBOnlMe7YT8NEvKK16QvehZlwfnMosIlNFozGmhwVtWlJ+pJATGm0gu4vZDU
-						I64R7eQVc7Z6kw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp-test.wortech.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Heart of Worcestershire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Worcester College of Technology Test Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wortech.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:itservices@wortech.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Services</GivenName>
-    <EmailAddress>mailto:itservices@wortech.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.asknet.de.xml b/swamid-interfederations-2.0/sp.asknet.de.xml
deleted file mode 100644
index 28ee30ea..00000000
--- a/swamid-interfederations-2.0/sp.asknet.de.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.asknet.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.asknet.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp.asknet.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.asknet.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+jCCA+KgAwIBAgIED9Kx6zANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAzMzExMTM5MDhaFw0xNTAz
-MzAxMTM5MDhaMEsxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRUwEwYDVQQDEwxzcC5hc2tuZXQuZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+n8aGXU8eGT0HeiRTnXASUoTstkWzkkhL
-LOEGblTGhO7cMFbJM/g/kOdUIIRi0dzhan8UdAKkeqtWnUpf2vgKfu/f97mwfpT7
-qKbN2LvX1VoQXtpmCwkf477fKXsaiHojRxx87/zfURJRUQK9fDeO7k1r3iTzSLJO
-7lEDIQVeezplT1MhzOYPdS8sUaCJogPgvYBZ+mPjpA8SYx6Rq5mtlDZGUII951Uh
-InrCCgmk0WpIxclL1IHdNqy3FOv1XSDS0k+KBQQnu/FpxhInUm1lILXfV2IkTvnn
-HcTJFh6/5Ojk8sOEh0vaBB2Q1ncJsrR0NWCBlgLfSdhX5zXmeFmtAgMBAAGjggHa
-MIIB1jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
-AgYIKwYBBQUHAwEwHQYDVR0OBBYEFNVU8a0BOqrMQNKc91DuHripAe3nMB8GA1Ud
-IwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMBwGA1UdEQQVMBOBEWNlcnRhZG1A
-YXNrbmV0LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9
-hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCBqgYIKwYBBQUHAQEEgZ0wgZowSwYIKwYBBQUHMAKGP2h0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqG
-SIb3DQEBBQUAA4IBAQAmucftP9132NU6iIByTjBoup1At2Nj0NeA+vE7Tg3iHBZh
-yWGxTsCVCHLSzDi8RpQKnnov1wsJ/Z7JCyd+C292zIFoUamliYVJKcTJtCOLmCkq
-wGLbbYq8CK8Tlv5BaWaleiNVaBxx1At7QT7PnV/YF9dPR3tQKP5vLYtPARAexbcV
-fKsNZP13cjxUMSmHBTgMLgpegD8btC7KcdKbO9xcLPz8A8ge00NElX53dqVGH83z
-RaTY5YqsKUIDh0mx2UxjFV9irG5X/QE6YCt0tBZtjaE7b9cHapIL9BZDRE7aRGDt
-rWoZ1ruqB2jP59EBdg4sTfzhvlLtUdL3H3aUimlg
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp.asknet.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.asknet.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE+jCCA+KgAwIBAgIED9Kx6zANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0xMDAzMzExMTM5MDhaFw0xNTAz
-MzAxMTM5MDhaMEsxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRUwEwYDVQQDEwxzcC5hc2tuZXQuZGUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+n8aGXU8eGT0HeiRTnXASUoTstkWzkkhL
-LOEGblTGhO7cMFbJM/g/kOdUIIRi0dzhan8UdAKkeqtWnUpf2vgKfu/f97mwfpT7
-qKbN2LvX1VoQXtpmCwkf477fKXsaiHojRxx87/zfURJRUQK9fDeO7k1r3iTzSLJO
-7lEDIQVeezplT1MhzOYPdS8sUaCJogPgvYBZ+mPjpA8SYx6Rq5mtlDZGUII951Uh
-InrCCgmk0WpIxclL1IHdNqy3FOv1XSDS0k+KBQQnu/FpxhInUm1lILXfV2IkTvnn
-HcTJFh6/5Ojk8sOEh0vaBB2Q1ncJsrR0NWCBlgLfSdhX5zXmeFmtAgMBAAGjggHa
-MIIB1jAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcD
-AgYIKwYBBQUHAwEwHQYDVR0OBBYEFNVU8a0BOqrMQNKc91DuHripAe3nMB8GA1Ud
-IwQYMBaAFB2p8YYmdk3PXf1Qo27r8bwidW3rMBwGA1UdEQQVMBOBEWNlcnRhZG1A
-YXNrbmV0LmRlMIGRBgNVHR8EgYkwgYYwQaA/oD2GO2h0dHA6Ly9jZHAxLnBjYS5k
-Zm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEGgP6A9
-hjtodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCBqgYIKwYBBQUHAQEEgZ0wgZowSwYIKwYBBQUHMAKGP2h0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZpY2VzLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDBLBggrBgEFBQcwAoY/aHR0cDovL2NkcDIucGNhLmRmbi5k
-ZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqG
-SIb3DQEBBQUAA4IBAQAmucftP9132NU6iIByTjBoup1At2Nj0NeA+vE7Tg3iHBZh
-yWGxTsCVCHLSzDi8RpQKnnov1wsJ/Z7JCyd+C292zIFoUamliYVJKcTJtCOLmCkq
-wGLbbYq8CK8Tlv5BaWaleiNVaBxx1At7QT7PnV/YF9dPR3tQKP5vLYtPARAexbcV
-fKsNZP13cjxUMSmHBTgMLgpegD8btC7KcdKbO9xcLPz8A8ge00NElX53dqVGH83z
-RaTY5YqsKUIDh0mx2UxjFV9irG5X/QE6YCt0tBZtjaE7b9cHapIL9BZDRE7aRGDt
-rWoZ1ruqB2jP59EBdg4sTfzhvlLtUdL3H3aUimlg
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.asknet.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.asknet.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.asknet.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.asknet.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.asknet.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.asknet.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">asknet AG Karlsruhe</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">asknet AG Serviceprovider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.asknet.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Frank</GivenName>
-    <SurName>Flottemesch</SurName>
-    <EmailAddress>frank.flottemesch@asknet.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jörgen</GivenName>
-    <SurName>Dahlke</SurName>
-    <EmailAddress>joergen.dahlke@asknet.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.careknowledge.com-shibboleth.xml b/swamid-interfederations-2.0/sp.careknowledge.com-shibboleth.xml
deleted file mode 100644
index 512b89f8..00000000
--- a/swamid-interfederations-2.0/sp.careknowledge.com-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://sp.careknowledge.com/shibboleth">
-  <!--
-		This is a 'careknowledge' Open Athens SP for OLM Pavilion Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="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>
-						MIIEXDCCA0SgAwIBAgIJAIaBUg+B2NUPMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEZ
-						MBcGA1UEChMQT0xNIFBhdmlsaW9uIEx0ZDEWMBQGA1UECxMNQ2FyZUtub3dsZWRn
-						ZTEeMBwGA1UEAxMVd3d3LmNhcmVrbm93bGVkZ2UuY29tMSUwIwYJKoZIhvcNAQkB
-						FhZpbmZvQGNhcmVrbm93bGVkZ2UuY29tMB4XDTA5MTEwMzExMDYwM1oXDTE5MTEw
-						MTExMDYwM1owga4xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEP
-						MA0GA1UEBxMGT3hmb3JkMRkwFwYDVQQKExBPTE0gUGF2aWxpb24gTHRkMRYwFAYD
-						VQQLEw1DYXJlS25vd2xlZGdlMR4wHAYDVQQDExV3d3cuY2FyZWtub3dsZWRnZS5j
-						b20xJTAjBgkqhkiG9w0BCQEWFmluZm9AY2FyZWtub3dsZWRnZS5jb20wggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcltH4L5PBPkfoLbrKN6INtUzDUucH
-						en9Uln4yCiHHQG7V+I9fQ3VcwBUxuvkfCKlInOTh8UkHapOfTGXXgADtjBkMfhJ+
-						US/uuoi6mQ1csLq0Nnp7tVebJ3vpY2U8SPIhRMHp/fOGW//wEDVnO38wnjFF3rMp
-						UDbp6SZfJDhwgdIR322zk42aZUB/RQ41VpQiq11kT70V4gvKpHYjOq0tDbOz+i+p
-						YOvtpBhCRLChqsn89ovDnfqP12BvtVCJQegz04AXwssn+VeOK8J/1AQp6KzuCnRo
-						IOD/GjIpA+UCcqUnz4+eYl8i0u5NwVq+0vtatPKX4SWP41qzNegJFa/9AgMBAAGj
-						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
-						IENlcnRpZmljYXRlMB0GA1UdDgQWBBSdSyju4c9KMWmI14j0cjp8z3+yijAfBgNV
-						HSMEGDAWgBSdSyju4c9KMWmI14j0cjp8z3+yijANBgkqhkiG9w0BAQUFAAOCAQEA
-						P+DxS8qDpaAO177uo8IKMvkRAx7ZsTaYdVXdEexuDNvq9wBesQ2x0CYfvK/Lsjmc
-						4kPebsg4+QXVrBgz0C/x+1ghCFf/DJ/XZTKhhh/d2Rzh2cYIZ7cc1zTEM6X0LXJr
-						wXvwW77b4h6OWrwJ2Ac0/9fNSx7sAhvkJB8iV0Ft8R0gCIevsCAwtwr9ymflkYke
-						897WDuAEO09j/qAUO/jrH5Pg26OBtxtg9sX066+SbjK5np8BaDuqP48kJpuCix1g
-						RvsXL6hYaWg/uy9ysgrbgq2tuyMRazTbxZK+zevikEMHJiu9q4K1kYadgYDXUATo
-						DOZU336g80XprEbmhq+v7w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.careknowledge.com/athens/ukfedrcv.aspx" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.careknowledge.com/athens/ukfedrcv.aspx" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OLM Pavilion Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Pavilion Publishing and Media Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.careknowledge.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tanya</GivenName>
-    <SurName>Rackham</SurName>
-    <EmailAddress>mailto:Tanya.Rackham@olmgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:Tim.Smith@olmgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.cat-portal.epigenesys.org.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.cat-portal.epigenesys.org.uk-shibboleth.xml
deleted file mode 100644
index 416a8a99..00000000
--- a/swamid-interfederations-2.0/sp.cat-portal.epigenesys.org.uk-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://sp.cat-portal.epigenesys.org.uk/shibboleth">
-  <!--
-		This is a "Clinical Academic Training Portal" Shibboleth SP for Epi Genesys Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-07-15T11:40:14Z">
-      <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://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Clinical Academic Training Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Clinical Academic Training Portal provides management and monitoring of the training undertaken by postgraduate medical professionals.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIJALwqYDQ+/VO6MA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-						BAMMH3NwLmNhdC1wb3J0YWwuZXBpZ2VuZXN5cy5vcmcudWswHhcNMTUwNzE1MDkz
-						MjQ1WhcNMjUwNzEyMDkzMjQ1WjAqMSgwJgYDVQQDDB9zcC5jYXQtcG9ydGFsLmVw
-						aWdlbmVzeXMub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						o1494sYXTSFT31LkzQREFZjq6HNTZJznd0Q73T1SPZqt8G2e3UjoAA7cIq9qPpoi
-						JCiXj1gtc+gqyJz++lz0xi2xj7TBYfeqRsicX6Xu2uVNJUWDBL3v2qs3Cavzk7ZM
-						amnNg7fntbuq8ienG20rbPPFbD3yHbwIWb5e5UjMv2fXg+Bn5ky0Cr4c+aXw+8ci
-						JCK6kA2ygZbrnoui59rTJcE6Luc8T8hYLaeMT5WuE2btaPC1MlXaUNigFnau7L/4
-						lUQxsX3horXsslNAzq0J3gRp8I3yxLUv0z0eCZ2/Yi3GZX20a8MNuRNKXMjf4HC+
-						80sdZtwGy2VlmFlgebgv6QIDAQABo1AwTjAdBgNVHQ4EFgQU93bNqheTncDjUW8+
-						aCAhUmvKpnswHwYDVR0jBBgwFoAU93bNqheTncDjUW8+aCAhUmvKpnswDAYDVR0T
-						BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAGi43Omihdohtgy/LSXkgVf7+YW1i
-						jx/c8OtBqvAxnzTOowlZQtG52VDSke91MABEPIEMqfrqXgFPcknWKxJGUXpMDr+F
-						iXeMakpSMJ2eu7g6vcUriSx5g2CnjfMTUXNBHm3SjwsTjxoQtM0IyS0kSw+VWxYf
-						TTCVYM4UikSGW/6DR/BXOFIa2BiQhkT+nvGaOBjiK0072RnxGJM205NzpGcxbUlC
-						oQVG2tSDNdiE6UN+D3jXlgmZSYSs80SvPVo3WFGdmj3y0lC89i7+dsRAaJNeakZH
-						buM7D9A982RDuZMPE7hmviLtmENGtpw8zJBjOxkKTxmMPxNTXMotCBLdzA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leeds.cat-portal.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML2/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leeds-cat-portal.qa2.epigenesys.org.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Epi Genesys Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Clinical Academic Training Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.epigenesys.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>epiGenesys Support</GivenName>
-    <EmailAddress>mailto:support@epigenesys.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Gregory</SurName>
-    <EmailAddress>mailto:james.gregory@epigenesys.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
index c254fe4a..071fb97a 100644
--- a/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-2.0/sp.catalog.clarin.eu.xml
@@ -1,65 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.catalog.clarin.eu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:53: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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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>
-      <idpdisc:DiscoveryResponse 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 CMDI Metadaten Anwendungen und Dienste - Katalog</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CLARIN CMDI metadata applications and services - catalog</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Für die Component Registry, Virtual Language Observatory.</mdui:Description>
-        <mdui:Description xml:lang="en">For the Component Registry, Virtual Language Observatory.</mdui:Description>
-        <mdui:Logo height="220" width="195">https://www.clarin.eu/sites/default/files/clarin-logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://www.clarin.eu/applications</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.xhtml</mdui:PrivacyStatementURL>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Clarin Catalog Service Provider</mdui:DisplayName>
+        <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>
+      <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 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>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>catalog.clarin.eu</ds:KeyName>
+    <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
@@ -79,51 +35,36 @@ A0oCNgDwBaY/GdYIYloU/6GAxEu5Kql4HmB1XW5XyYZ15+zYluL86eLFe2DHnPHR
 Z3ZjnjzAkcZS6VU/vbowpAL9Oiic9I15BwyNXsT8lWPtOxKcmxAESMc7OtWm0o4C
 ijjjB4MNkyvUmnvJZD+7ZpYW6qI4v64a4h1kdydtuCSxFz7lQ9U80gOA+oJWKa9a
 yN2Xk8rmco4g1veIYIZ6hKrydr0QJ40WvaiR1EkO0tpPa7wkayhFaOQDRrzFNpfr
-gDLbA/e0dbDclBvxUIm9cemA
-</ds:X509Certificate>
+gDLbA/e0dbDclBvxUIm9cemA</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CLARIN CMDI Metadaten Anwendungen und Dienste - Katalog</md:ServiceName>
-      <md:ServiceName xml:lang="en">CLARIN CMDI metadata applications and services - catalog</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Für die Component Registry, Virtual Language Observatory.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">For the Component Registry, Virtual Language Observatory.</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="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="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: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="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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="administrative">
-    <md:GivenName>CLARIN</md:GivenName>
-    <md:SurName>Admin</md:SurName>
-    <md:EmailAddress>mailto:clarin@clarin.eu</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>CLARIN</md:GivenName>
-    <md:SurName>Sysops</md:SurName>
-    <md:EmailAddress>mailto:sysops@clarin.eu</md:EmailAddress>
+    <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.cds.stfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.cds.stfc.ac.uk-shibboleth.xml
deleted file mode 100644
index ab988848..00000000
--- a/swamid-interfederations-2.0/sp.cds.stfc.ac.uk-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://sp.cds.stfc.ac.uk/shibboleth">
-  <!--
-		This is a "Chemical Database Service, Daresbury" Shibboleth SP for the Science and Technology Facilities Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-20T11:39: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://cds.dl.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALfgUSfF89pnMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDWNkczYuZGwuYWMudWswHhcNMTAwMjE2MTMzNDI2WhcNMjAwMjE0MTMzNDI2
-						WjAYMRYwFAYDVQQDEw1jZHM2LmRsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA7oViYpAbYqdi+QInwb//yT2pCJ+lMpq1ST4TgOsu8A+NJ8V7
-						8zE4TzIDsXKOlXhWQ51JhvbpqGQeYHWO/ipGC/GJIxfb/ZMsRH9NOubO2A9JQsSu
-						4pFhSjoEq2OyQYQQYbf5+06vWxr2MAhCyBhH3UvC1yIbhwGJYFgZZg05pBGIBoR2
-						GxcfEXNQLhhdgdYUUDLUmF3s79U10I8ZJikvzKGLlXmWWaMD53M8M4Rom8r13kEB
-						0xr13CWhd/H9xKwVImG62qCCMakF2O6+8HZziZmfPuiJD/G6HSVL3hTz9hdz9unP
-						pOTFmcGxjnRU1k79TEPbbHvsTJXoYInGFiqyOQIDAQABozswOTAYBgNVHREEETAP
-						gg1jZHM2LmRsLmFjLnVrMB0GA1UdDgQWBBSpcwVd1js90ymqIUzIeiUp1K8BHzAN
-						BgkqhkiG9w0BAQUFAAOCAQEASYhQmAbVn4Yt+5+xcqsE25rCn9Etx3ZVqNLfoZ3G
-						9Xc7QCggfVTltVFKKvxeIZ9QUOb1HH/27V1okJoH6uRoD+AnK1UGVP/+ufv0Ev2H
-						vkPSyG+oVhDFYuMrTmUE3bwBiNSfHAOsflR44GEQZ5RqWTdztS4PhWF2g3s3sMY4
-						Jr9dD/8WUXZhV60ZQJC0hTV0RzKjdqCrKuTgMbmwCmEVQTrkj5JkrOafI7/SnfHf
-						FWLAMzDMWQMdKGY6yndSdSf+RVCNka03NbDNOWkRf5pUfmsbTnr2Jn0StH2tOPBu
-						SR5rJW8JbCAeIO/ydDoOl43joSNAAzoOPF0HFf5WHJDZCw==
-					</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>
-						MIIC7jCCAdagAwIBAgIJALfgUSfF89pnMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDWNkczYuZGwuYWMudWswHhcNMTAwMjE2MTMzNDI2WhcNMjAwMjE0MTMzNDI2
-						WjAYMRYwFAYDVQQDEw1jZHM2LmRsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA7oViYpAbYqdi+QInwb//yT2pCJ+lMpq1ST4TgOsu8A+NJ8V7
-						8zE4TzIDsXKOlXhWQ51JhvbpqGQeYHWO/ipGC/GJIxfb/ZMsRH9NOubO2A9JQsSu
-						4pFhSjoEq2OyQYQQYbf5+06vWxr2MAhCyBhH3UvC1yIbhwGJYFgZZg05pBGIBoR2
-						GxcfEXNQLhhdgdYUUDLUmF3s79U10I8ZJikvzKGLlXmWWaMD53M8M4Rom8r13kEB
-						0xr13CWhd/H9xKwVImG62qCCMakF2O6+8HZziZmfPuiJD/G6HSVL3hTz9hdz9unP
-						pOTFmcGxjnRU1k79TEPbbHvsTJXoYInGFiqyOQIDAQABozswOTAYBgNVHREEETAP
-						gg1jZHM2LmRsLmFjLnVrMB0GA1UdDgQWBBSpcwVd1js90ymqIUzIeiUp1K8BHzAN
-						BgkqhkiG9w0BAQUFAAOCAQEASYhQmAbVn4Yt+5+xcqsE25rCn9Etx3ZVqNLfoZ3G
-						9Xc7QCggfVTltVFKKvxeIZ9QUOb1HH/27V1okJoH6uRoD+AnK1UGVP/+ufv0Ev2H
-						vkPSyG+oVhDFYuMrTmUE3bwBiNSfHAOsflR44GEQZ5RqWTdztS4PhWF2g3s3sMY4
-						Jr9dD/8WUXZhV60ZQJC0hTV0RzKjdqCrKuTgMbmwCmEVQTrkj5JkrOafI7/SnfHf
-						FWLAMzDMWQMdKGY6yndSdSf+RVCNka03NbDNOWkRf5pUfmsbTnr2Jn0StH2tOPBu
-						SR5rJW8JbCAeIO/ydDoOl43joSNAAzoOPF0HFf5WHJDZCw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cds.dl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cds.dl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cds.dl.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cds.dl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cds.dl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cds.dl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cds.dl.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cds.dl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cds.dl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Science and Technology Facilities Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Chemical Database Service, Daresbury</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.scitech.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Miller</SurName>
-    <EmailAddress>mailto:cdsbb@stfc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ali</GivenName>
-    <SurName>Akkas</SurName>
-    <EmailAddress>mailto:ali.akkas@stfc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.clarin.si-.xml b/swamid-interfederations-2.0/sp.clarin.si-.xml
index fa799b26..f5e8a199 100644
--- a/swamid-interfederations-2.0/sp.clarin.si-.xml
+++ b/swamid-interfederations-2.0/sp.clarin.si-.xml
@@ -1,102 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.clarin.si/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-15T16:24: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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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.clarin.si/">
+  <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://www.clarin.si/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CLARIN.SI Dienste</mdui:DisplayName>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">CLARIN.SI Repository</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">CLARIN.SI Repository</mdui:DisplayName>
-        <mdui:Description xml:lang="de">CLARIN.SI: digitale Langzeitarchiv und Dienste auf die Sprache konzentriert Forschungsinfrastruktur und CLARIN</mdui:Description>
-        <mdui:Description xml:lang="en">CLARIN.SI: Digital repository and services of the CLARIN language research infrastructure, hosted at Jožef Stefan Institute, Ljubljana, Slovenia</mdui:Description>
+        <mdui:Description xml:lang="fi">Digitaalinen arkisto ja CLARIN kielentutkimuspalveluja Jozef Stefan instituutissa</mdui:Description>
+        <mdui:Description xml:lang="en">CLARIN.SI: Digital repository and services of the CLARIN language research infrastructure, hosted at Jozef Stefan Institute</mdui:Description>
         <mdui:Logo height="64" width="64">https://www.clarin.si/clarin_si_icon.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Slovenian Slovene digital repository language research corpora tools</mdui:Keywords>
         <mdui:InformationURL xml:lang="en">http://www.clarin.si/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://www.clarin.si/privacy_policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.clarin.si/privacy_policy.html</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>fido</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=fido</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAMF/Tdr8i9CuMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-BAMTBGZpZG8wHhcNMTQwNDI0MTAyODAyWhcNMjQwNDIxMTAyODAyWjAPMQ0wCwYD
-VQQDEwRmaWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAru0HRu+t
-qyjRI6Y07bMruUz39rZbESeIekqt7LFe3RuowbYwYuwZEC0wHwFSheDgV70Q/sDs
-yAKt7OSCH5seVHFE9bmWY2cXIATnsP90+ijPkdA/zXFoOvibeTqNwbIQ5qZ1cQ2e
-dFL2tL2PVC9W0BFS/QYK79sdIHSS+7zwCWU5kMsrCKlJ2+3ZfQRTAaYBp5yYcm+B
-wzHW5euFN9nvAruagvSnEDI42PzpjeT+S4yPKxTEkj+w68kMnm6KFzW8K9aHt1N0
-SKKRrZYKwqPF3yDbLIhEDZPHwV23fXax6qfW//shIkhYzfs6xuaBOFI86IgR11oM
-024XBCKg+gCAcQIDAQABozIwMDAPBgNVHREECDAGggRmaWRvMB0GA1UdDgQWBBSF
-K2aqnNGBq9YIqrRYWcx+P16fPDANBgkqhkiG9w0BAQUFAAOCAQEAPWauwmt3vKhb
-EMPdWMSltr7QzCnbwqrDDbI7e+oRJXlh/rfyYSshEWyF+9in+14InvK5Me9nL9jr
-4OIkjuceC5EbYhthkzoaFneYOJ9CFX5clvLKqSK7lWLl94YxJcvK7pcWPu3bb4th
-Z7LENHPrlaHEYWI7Gz0RiFi2Mk21S8S2aH0Av6yP0giylAK3RFQklZD/WejQh5xG
-nEAEQtr4mtLzJO8yC8mQrT89tUNW7Uj6D84YO9q57BbdugNew7Zb90z359GqjMDZ
-p4E2ZJZF5NWCFiPdJTBoNtMPngEHxcgYsDQefnJAk3YTKzkWXT/sqx8cRPLJXpYk
-+Xb2ywjVWg==
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIC0zCCAbugAwIBAgIJAMF/Tdr8i9CuMA0GCSqGSIb3DQEBBQUAMA8xDTALBgN
+VBAMTBGZpZG8wHhcNMTQwNDI0MTAyODAyWhcNMjQwNDIxMTAyODAyWjAPMQ0wCw
+YDVQQDEwRmaWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAru0HR
+u+tqyjRI6Y07bMruUz39rZbESeIekqt7LFe3RuowbYwYuwZEC0wHwFSheDgV70Q
+/sDsyAKt7OSCH5seVHFE9bmWY2cXIATnsP90+ijPkdA/zXFoOvibeTqNwbIQ5qZ
+1cQ2edFL2tL2PVC9W0BFS/QYK79sdIHSS+7zwCWU5kMsrCKlJ2+3ZfQRTAaYBp5
+yYcm+BwzHW5euFN9nvAruagvSnEDI42PzpjeT+S4yPKxTEkj+w68kMnm6KFzW8K
+9aHt1N0SKKRrZYKwqPF3yDbLIhEDZPHwV23fXax6qfW//shIkhYzfs6xuaBOFI8
+6IgR11oM024XBCKg+gCAcQIDAQABozIwMDAPBgNVHREECDAGggRmaWRvMB0GA1U
+dDgQWBBSFK2aqnNGBq9YIqrRYWcx+P16fPDANBgkqhkiG9w0BAQUFAAOCAQEAPW
+auwmt3vKhbEMPdWMSltr7QzCnbwqrDDbI7e+oRJXlh/rfyYSshEWyF+9in+14In
+vK5Me9nL9jr4OIkjuceC5EbYhthkzoaFneYOJ9CFX5clvLKqSK7lWLl94YxJcvK
+7pcWPu3bb4thZ7LENHPrlaHEYWI7Gz0RiFi2Mk21S8S2aH0Av6yP0giylAK3RFQ
+klZD/WejQh5xGnEAEQtr4mtLzJO8yC8mQrT89tUNW7Uj6D84YO9q57BbdugNew7
+Zb90z359GqjMDZp4E2ZJZF5NWCFiPdJTBoNtMPngEHxcgYsDQefnJAk3YTKzkWX
+T/sqx8cRPLJXpYk+Xb2ywjVWg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.clarin.si/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.clarin.si/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.clarin.si/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clarin.si/Shibboleth.sso/SLO/Artifact"/>
-    <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://www.clarin.si/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.clarin.si/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clarin.si/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.clarin.si/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.clarin.si/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.clarin.si/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CLARIN.SI Dienste</md:ServiceName>
+    <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://www.clarin.si/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">CLARIN.SI Repository</md:ServiceName>
       <md:ServiceName xml:lang="en">CLARIN.SI Repository</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">CLARIN.SI: digitale Langzeitarchiv und Dienste auf die Sprache konzentriert Forschungsinfrastruktur und CLARIN</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">CLARIN.SI: Digital repository and services of the CLARIN language research infrastructure, hosted at Jožef Stefan Institute, Ljubljana, Slovenia</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="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: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:oid:2.5.4.42" 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:ServiceDescription xml:lang="fi">Digitaalinen arkisto ja CLARIN kielentutkimuspalveluja Jozef Stefan instituutissa</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Digital repository and services of the CLARIN language research infrastructure, hosted at Jozef Stefan Institute</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.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.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: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.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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>Jan Jona</md:GivenName>
-    <md:SurName>Javoršek</md:SurName>
-    <md:EmailAddress>mailto:repo-technical@clarin.si</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jan Jona</md:GivenName>
-    <md:SurName>Javoršek</md:SurName>
-    <md:EmailAddress>mailto:repo-help@clarin.si</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tomaž Jona</md:GivenName>
+    <md:GivenName>Tomaz Jona</md:GivenName>
     <md:SurName>Erjavec</md:SurName>
     <md:EmailAddress>mailto:repo-admin@clarin.si</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jan Jona</md:GivenName>
+    <md:SurName>Javorsek</md:SurName>
+    <md:EmailAddress>mailto:repo-technical@clarin.si</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.cliowebhost.co.uk-Patron-Stirling-entity.xml b/swamid-interfederations-2.0/sp.cliowebhost.co.uk-Patron-Stirling-entity.xml
deleted file mode 100644
index 88594436..00000000
--- a/swamid-interfederations-2.0/sp.cliowebhost.co.uk-Patron-Stirling-entity.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://sp.cliowebhost.co.uk/Patron/Stirling/entity">
-  <!--
-		This is a "ClioWeb for University of Stirling" ComponentPro SP for Clio Software UK Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-28T12:56: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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCDCCAfSgAwIBAgIQY/Afradun5dG2rwUj4AANzAJBgUrDgMCHQUAMBsxGTAX
-						BgNVBAMTEENsaW9TdGlybGluZzIwMTMwHhcNMTMwOTAzMDgyNDMxWhcNMjMwOTAz
-						MDgyNDMwWjAbMRkwFwYDVQQDExBDbGlvU3RpcmxpbmcyMDEzMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvG5RHaEtu4OXZip6APTjKWL0vy+WYJoVodIP
-						yNRRO5oP1R9N09kOKo+3fHvnURA0W8guZIk9twGs/RdB4tNzD4aWgPmo7Ml1tVZw
-						eHZdwU2y87lSSkdM1/sZtY3Ju7ERoxdK3jCoIdnRSVx8Fm7WOtStpgdclT6V0fcZ
-						3YQUuPONRpOdxivawPkUPL0c9i2Jx67kp35f63eBY/dPBON8p5Vo8BnZ70zqepUj
-						cnXhG3PfE10lKASLRarQqGJjrdm/sGY44ChIHcKfSbUhonop6K9oh4hEKatBL1+p
-						xodbS0BaJEZ/fkgQrbyPLlgf5jDL80Ua7tcuVGm8ozi0Ls3CzQIDAQABo1AwTjBM
-						BgNVHQEERTBDgBCQ/hClfq8r3PkbIADeLaxtoR0wGzEZMBcGA1UEAxMQQ2xpb1N0
-						aXJsaW5nMjAxM4IQY/Afradun5dG2rwUj4AANzAJBgUrDgMCHQUAA4IBAQAwe5Xx
-						ZrFE+rCI3Z2tfBX4oocgkgLD6weq29MqRcuhxBALpxeoKpT4bjjHzusLg/hzEyeQ
-						xbkZwu0HvXa230LnC9fpO3mjLHewLXDFEaZpfrOZvNa142RfMQU7iAQJfIrc42j8
-						rl7s17BVtYq+EzGgFgZm0YMBoL4SASS2QCoviwsGYHZmy/8h33jvHRMAB41OWjXZ
-						WoaVaOm8sp/5AegAAcoIF33Tqv+fweHdrB4J/Q3d8+7vE8hWjTQ/HB+ZrOUig+Da
-						VE+wnFJbmrR6M0zEPlKlhgEVZhDbCuu6qCHdnnby2yuNr6Kuv19Jad2cAZfMI+7U
-						vCvcjHSOY6SmLIwA
-					</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://cliowebhost.co.uk/Patron/Stirling/Login2.aspx" index="0"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Clio Software UK Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ClioWeb for University of Stirling</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://cliosoftware.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jennifer</GivenName>
-    <SurName>Perkins</SurName>
-    <EmailAddress>mailto:jennifer@cliosoftware.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jennifer</GivenName>
-    <SurName>Perkins</SurName>
-    <EmailAddress>mailto:jennifer@cliosoftware.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.colegsirgar.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.colegsirgar.ac.uk-shibboleth.xml
deleted file mode 100644
index cf789744..00000000
--- a/swamid-interfederations-2.0/sp.colegsirgar.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://sp.colegsirgar.ac.uk/shibboleth">
-  <!--
-		This is a "Coleg Sir Gar" Shibboleth SP for Coleg Sir Gar.
-	-->
-  <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="2015-01-13T11:27:19Z">
-      <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">Coleg Sir Gar</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Shibboleth Service Provider for Coleg Sir Gar providing online access to Coleg Sir Gar applications</mdui:Description>
-        <mdui:Logo height="142" width="350">https://sp.colegsirgar.ac.uk/img/csg_logo_350.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://sp.colegsirgar.ac.uk/img/csg_shield.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.colegsirgar.ac.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://sp.colegsirgar.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIICzTCCAbWgAwIBAgIJAIl+WHxfd4mhMA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNV
-						BAMTAnNwMB4XDTE1MDEwNzEzNDc0N1oXDTI1MDEwNDEzNDc0N1owDTELMAkGA1UE
-						AxMCc3AwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6TAAssygAHhtn
-						scD7mgyf5RjV5+wncxcsVLdGtm6GaROqqhz/SL521Y+aQLxtqCfJyBlN9mIkboAv
-						vBmmcvc4xCBirmHWFQEtcISIYyh7KYcVpUomXQUIJUkJa8EXdyWlVxV9EE0K3VYF
-						z5nlUXgpLjwfxnevkRJhRI/lR5J4iAJner61vAWNvcTyu6g6Hlj4TeH20GzuuEY/
-						adgKwtqW8riKaQWNIebfHNGzW3S0lqEYLmntPC2Y/M8rH6m9t8yN2qUx6hBKB0mH
-						eCwqxC3BAbZax55sMSw+f6/MHKF0pjtWymqDbbNfD98VxhUkmqmVjgq3/DhbKWCH
-						aI6p4KKVAgMBAAGjMDAuMA0GA1UdEQQGMASCAnNwMB0GA1UdDgQWBBR7ZIA5K0DE
-						+CdJsFCvDsIXaCvouDANBgkqhkiG9w0BAQUFAAOCAQEAY79NtNn1cgqdO9E985g5
-						vx4j3mzDqBkajG6TP/pnAEzNoHODaltP5bHAX0Kew6bVnlYwzN7jVZec0WDdH/SH
-						2enUTJkD15/XZvH+oFa7MWLJ2pLYEfgJIxFz3nw0ozzZKAHuPsRejpXMKAv56bT3
-						lu1S/dkNs9u6MttdCQcznLppIGSjx7QUx7tPF6bE706BYytYlCHziB9NmgqT1b4n
-						xccA2shkXbhcoEQ78y2YHMlhkM4axlYHsnnpVmTA2vASPrQoaIim/diEbv44/EFm
-						iiXTgSzWSDPcAp/x5Vqrvd2qkKx5efJYioATLHvnBeW8L2Tnwf4ehtlaI524a/y4
-						OA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.colegsirgar.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.colegsirgar.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Coleg Sir Gar</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Coleg Sir Gar</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://colegsirgar.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <SurName>Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@colegsirgar.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Palmer</SurName>
-    <EmailAddress>mailto:Simon.Palmer@colegsirgar.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
index 52aedcb8..02c807da 100644
--- a/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml
@@ -1,64 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.corpus1.mpi.nl">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:30: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>
-    <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Korpuslinguistik und Sprachdokumentation Anwendungen - corpus1</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Corpus linguistics and language documentation applications - corpus1</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
-        <mdui:Description xml:lang="en">Linguistic applications for researchers: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
-        <mdui:Logo height="90" width="90">https://corpus1.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://tla.mpi.nl/tools/tla-tools/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Psykolingvistiikan Max Planck-instituutin palveluntarjoaja</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Psykolingvistiikan Max Planck-instituutin tutkijoille suunnattu kielitieteellinen palveluntarjoaja.</mdui:Description>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics Service Provider for Linguistic Services aimed at researchers.</mdui:Description>
+        <mdui:Logo height="194" width="189">https://corpus1.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://corpus1.mpi.nl/IMDI/info/privacy_statement.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://corpus1.mpi.nl/IMDI/info/privacy_statement.html</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 use="signing">
-      <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>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>corpus1.mpi.nl</ds:KeyName>
+    <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
@@ -77,55 +38,44 @@ kf+2Jm0GRVEJKjBxFEsbNbY8vusnP25u88vJa4Qy3JJZbsYGcPZiFOKffZWg/xqW
 t5F3i+akH5ihUn910/5l85SDUnDS1VvHVdOGwsedRNW4Yi9eEWjiEGQwjlhH0sWh
 uxjCIgYajcptpsZ8N8g+bR7ysVk61E5tcmScA5Pnu1fwu6+76mTF6gZO57jzWK93
 FlSHA6c7bCPMo+r4EZVccHBdrTRe6ZdD+OSOuEV4i0iI7IONOE1/ClWKUyueTsA/
-vKRir2Cb6A/NaScKNHBBhg==
-</ds:X509Certificate>
+vKRir2Cb6A/NaScKNHBBhg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpus1.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Korpuslinguistik und Sprachdokumentation Anwendungen - corpus1</md:ServiceName>
-      <md:ServiceName xml:lang="en">Corpus linguistics and language documentation applications - corpus1</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Linguistic applications for researchers: Annex, IMDI Browser, Lamus, Metadata Browser.</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="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: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="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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="support">
-    <md:GivenName>Shibboleth</md:GivenName>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
     <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>LAT</md:GivenName>
-    <md:SurName>Admin</md:SurName>
     <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>LAT</md:GivenName>
-    <md:SurName>Admin</md:SurName>
-    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
+  <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.data.alpha.jisc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.data.alpha.jisc.ac.uk-shibboleth.xml
deleted file mode 100644
index 75ae3f30..00000000
--- a/swamid-interfederations-2.0/sp.data.alpha.jisc.ac.uk-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://sp.data.alpha.jisc.ac.uk/shibboleth">
-  <!--
-		This is a "Jisc Learning Analytics App" Shibboleth SP for Jisc.
-	-->
-  <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="2016-02-02T13:28: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://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Jisc Learning Analytics App</mdui:DisplayName>
-        <mdui:Logo height="34" width="61">https://www.jisc.ac.uk/sites/all/themes/jisc_clean/logo.png</mdui:Logo>
-        <mdui:Description xml:lang="en">Access to the Jisc Learning Analytics App</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAJbOo5wDkdRWMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD2lwLTE3Mi0zMS0zMy02NDAeFw0xNjAxMTIxMzE5NDBaFw0yNjAxMDkxMzE5
-						NDBaMBoxGDAWBgNVBAMTD2lwLTE3Mi0zMS0zMy02NDCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAJYwSoZTDb6cbDKwX2dxWre1fEm05iadPp0QGtpbVHMW
-						3hv8+qB5wOozodhQtXR7crESXACc/WSpG36jhdoCGWkwrjXVKCPlejSpIf5aNk9t
-						eSiH6Xwc1+hhp1iw/K7l67uBCsv+4/LiiXYIOGmrKSXC+EFu+Vixvs2o3ElTQlWB
-						OdJvxnbG5wg4xBn7uSF6UElQiw6cPs+lCtvYD/tVnX99N7Hy4TJZW7YUMgF5Kb6n
-						Fp0b5YdBCy/THTd1Nxm5tjFPsxe+8dRtC5jC+ZW8/Zl3ZsFWbth1z025G7W1cv2W
-						10V5yl0GsqXaehGMOl79aw/XHgFOocPqMVt1lZRMcqUCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPaXAtMTcyLTMxLTMzLTY0MB0GA1UdDgQWBBSXeQyAz96ObtOikCU5KWhi
-						eTGVDTANBgkqhkiG9w0BAQUFAAOCAQEAT40dQRvruiRg2ATIb4tFCWKoVTZvsnax
-						wbdOIvKWq+h2/wFpRwXg54mGzeoosl/rbudyh3+VRgd25ethaVEvpO9EZHxGZ9j0
-						feIaC2upEFbeUC5lj2phYv5Lc2hZBXT3VYYiGQgwTuKPSyGTLJ3LK2ILpq5MRbKV
-						JFxagomw/o1CZ3s4tMPum6GD+/qHU98Va9QmRQX6MC4q/RIzND8Dnt5qw6v068Af
-						cMGZ28Oyh7V1E+6+ul78gIdfy1yQj5WqBKL0Uz/qCuCO8s1X3C/awptnKK8DpILu
-						Uwh1H7KfHMaG/3PxyNByst2/w0gFWfgG+omDTMb1d0EO81nDbFJBYQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.data.alpha.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.data.alpha.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">Jisc Learning Analytics App</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"/>
-      <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">Jisc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Jisc Learning Analytics App</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.jisc.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lee</GivenName>
-    <SurName>Baylis</SurName>
-    <EmailAddress>mailto:lee.baylis@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Baylis</SurName>
-    <EmailAddress>mailto:lee.baylis@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.demo.researchspace.com-shibboleth.xml b/swamid-interfederations-2.0/sp.demo.researchspace.com-shibboleth.xml
deleted file mode 100644
index eb95702a..00000000
--- a/swamid-interfederations-2.0/sp.demo.researchspace.com-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://sp.demo.researchspace.com/shibboleth">
-  <!--
-		This is a "RSpace ELN Demo" Shibboleth SP for Research Innovations Ltd.
-	-->
-  <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="2015-08-27T09:25:01Z">
-      <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://demo.researchspace.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://demo.researchspace.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">RSpace ELN Demo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">RSpace is an enterprise grade Electronic Lab Notebook designed for use in research universities</mdui:Description>
-        <mdui:Logo height="158" width="246">https://demo.researchspace.com/images/biggerLogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDITCCAgmgAwIBAgIJANwZ+u5yyYcuMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-						BAMTHmlwLTEwLTE4My0yMDQtMTEyLmVjMi5pbnRlcm5hbDAeFw0xNjAxMjgxMzI5
-						MTFaFw0yNjAxMjUxMzI5MTFaMCkxJzAlBgNVBAMTHmlwLTEwLTE4My0yMDQtMTEy
-						LmVjMi5pbnRlcm5hbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+R
-						QrD+/rGvxp/lV23XELO+46UXlpF21JN2QzYCulmK/OdWIveXSMVX5GyJr2qNOLQ+
-						WaJiY/22IYBT6y+JBNSG0Y1035Dt9NWvZiZwhpaRQLvolrVQ54NtNzEI3OW+fEyO
-						Zi+jpCRLjMjRbym5pbQI0In5ObPSO9yMu8PeUAvAOTQiF07yH/+V1CKIyHzW9KwT
-						9hBzUr4oLqTcHIGQt2k7TiQojAUUx+r6UjE5zFha9IBO+w0RBvzfIjhLCcJ1NbJe
-						6H30hCTA6o4VFfP4EIDnDi39TDj8uZwa6WpZB/unSfWJDrIoio7Nv+V+ri3Q69Rc
-						9OuHqKyVq0G0sBMWKTkCAwEAAaNMMEowKQYDVR0RBCIwIIIeaXAtMTAtMTgzLTIw
-						NC0xMTIuZWMyLmludGVybmFsMB0GA1UdDgQWBBQXYjoNhygtiSsX3YWZ4gjruh5Y
-						+DANBgkqhkiG9w0BAQUFAAOCAQEAnQeRbKocV6Kle4vZnYGTlLc83FbjyHJx9CvB
-						dDunWGEs9pX2P5F8j2jOr+U0n/UsABXlIWRDWvtUb8uE6uByDJ+C2gIUCPSiUQmc
-						oOEUZSdnw0896U9U+u8Z7rb0p1ymcSb8nHMKDFRmerAc42HMAdXXHk2x11z9jDFT
-						TQA2PGw8r3gVx7CYNYH6cpPcnpqw+oJdq9aJZuPPiiQxLsKcfZRdP0QWVB7OFeov
-						cmZfEyO7pK5jDrtmAk9LcGMBQ/rDcI0oMgTdDPfmdI2vlIx+ubcdE26jzllYOWUF
-						gxcqTxdxZ1uOBFCZBpakANq368HS3vm1rFISGY2Vup0tTCkolw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://demo.researchspace.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.researchspace.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.researchspace.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo.researchspace.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo.researchspace.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Research Innovations Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RSpace ELN Demo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.researchspace.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Research Support</GivenName>
-    <EmailAddress>mailto:support@researchspace.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthias</GivenName>
-    <SurName>Kowalski</SurName>
-    <EmailAddress>mailto:matthias@researchspace.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.xml b/swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.xml
deleted file mode 100644
index f1ee1523..00000000
--- a/swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.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.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.eblib.com-shibboleth.xml b/swamid-interfederations-2.0/sp.eblib.com-shibboleth.xml
deleted file mode 100644
index d35e1a4b..00000000
--- a/swamid-interfederations-2.0/sp.eblib.com-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://sp.eblib.com/shibboleth">
-  <!--
-		This is an "EBL - Ebook Library" Shibboleth SP for Ebooks Corporation Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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"/>
-  </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>
-						MIIDCzCCAfOgAwIBAgIJALoCnTVhq1IhMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-						BAMTDHNwLmVibGliLmNvbTAeFw0xMjAxMDUwMDIyMzZaFw0yMjAxMDIwMDIyMzZa
-						MBcxFTATBgNVBAMTDHNwLmVibGliLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAL7h4T/JsESXBRIXlPdeBLB5L9UAYCBdvpvPtqiksWkphoujeqjk
-						mBO2NT98USIRwg6ktP4KYTBlQxItfniFx/lt4xeS8TboN+sTlW6LnY05j9UPL5kN
-						rnIpFmtbhKseIfDEEbO3m8h0+SZKE/RmfS6+l4/yTePoIhvtTKISDajr2GhdhJoa
-						/fjng0lHMikaFzfdd39DfKg/v73v8X9UvtH14ZkSrn4bTRvBCrKHSaMNneAH5N1G
-						PopSv+eVkrTPuQMse/w3JplYk08jujhv5Y24YvP9FCpgbQClxXbDn6OxMmejIpEk
-						Ri3EU2qqEN6N0BSN3N1PeuDOiaViOhbCAoUCAwEAAaNaMFgwNwYDVR0RBDAwLoIM
-						c3AuZWJsaWIuY29thh5odHRwOi8vc3AuZWJsaWIuY29tL3NoaWJib2xldGgwHQYD
-						VR0OBBYEFH/f6xMjqy+Ci9ctWA+7FStjJwNoMA0GCSqGSIb3DQEBBQUAA4IBAQC8
-						y6IkTzJqruNKtOZno4GswDkszRcDYMNx1w+JfMVJZG2YkVkPvWkP9JTCN/tVjKEZ
-						a5H4kq2jMUrBndjdu1W+v5jio8mXY8kDCp7Sly5eUtWrqE2q/1iTmJ4oWCHydRcD
-						Ez+X0sxSnQqxmcFe4ssS8EFzs1WPvinbhz71JZbnkOadPf//1epRxqJlDTq41p0e
-						mllYEt3rXPJBv1vCEbjLcZ8d1CTzPc8iveaNjU5h/rglqvDFwoIL870yMJg0n9bK
-						4elyV6s5HxPWucc0hyO4eUkbyMnP9QKLAemBKJUgU4SzTVSPLfiFdbe1x4zUMsSO
-						3yQ7F/pT44mChEK7mdRw
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.eblib.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eblib.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eblib.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.eblib.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.eblib.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ebooks Corporation Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EBL - Ebook Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eblib.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Drew</GivenName>
-    <SurName>Watson</SurName>
-    <EmailAddress>mailto:drew.watson@eblib.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Vinay</GivenName>
-    <SurName>Bharadwaj</SurName>
-    <EmailAddress>mailto:vinay.bharadwaj@ebooks.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ashmir</GivenName>
-    <SurName>Dhrolia</SurName>
-    <EmailAddress>mailto:ashmir.dhrolia@eblib.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.eblib.com.xml b/swamid-interfederations-2.0/sp.eblib.com.xml
deleted file mode 100644
index 0a5bc150..00000000
--- a/swamid-interfederations-2.0/sp.eblib.com.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.eblib.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.eblib.com/Shibboleth.sso/DS" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.eblib.com/Shibboleth.sso/ACODS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ebooks.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=vinay.bharadwaj@ebooks.com,CN=ebooks.com,OU=Area Servizi ICT,O=Politecnico di Milano,L=Milan,ST=Milan,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNzCCAqCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBqDELMAkGA1UEBhMCSVQx
-DjAMBgNVBAgTBU1pbGFuMQ4wDAYDVQQHEwVNaWxhbjEeMBwGA1UEChMVUG9saXRl
-Y25pY28gZGkgTWlsYW5vMRkwFwYDVQQLExBBcmVhIFNlcnZpemkgSUNUMRMwEQYD
-VQQDEwplYm9va3MuY29tMSkwJwYJKoZIhvcNAQkBFhp2aW5heS5iaGFyYWR3YWpA
-ZWJvb2tzLmNvbTAeFw0xMTAyMjMxNTU2NDRaFw0xNjAyMjIxNTU2NDRaMIGoMQsw
-CQYDVQQGEwJJVDEOMAwGA1UECBMFTWlsYW4xDjAMBgNVBAcTBU1pbGFuMR4wHAYD
-VQQKExVQb2xpdGVjbmljbyBkaSBNaWxhbm8xGTAXBgNVBAsTEEFyZWEgU2Vydml6
-aSBJQ1QxEzARBgNVBAMTCmVib29rcy5jb20xKTAnBgkqhkiG9w0BCQEWGnZpbmF5
-LmJoYXJhZHdhakBlYm9va3MuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQD9XQY5ysPYf4+guHJH+o75Ebn+bXE44uogDRo+IMLqCKxvEV5+C9RaDLKmeAs1
-YbYaHRx1Y5bHgHgj4nX44k266qpV78WoUEslkP9ivOKW4+waMzYvRGSC++vMIVtr
-ir6jQ94WvCxnS6JPJ5mDX6mEiVPIfuevBqYt+Cgj0Q2bMQIDAQABo28wbTAMBgNV
-HRMBAf8EAjAAMB0GA1UdDgQWBBS99SAMv7ZRQnNJ64Q5iC+xVikSCDALBgNVHQ8E
-BAMCBLAwEQYJYIZIAYb4QgEBBAQDAgWgMB4GCWCGSAGG+EIBDQQRFg94Y2EgY2Vy
-dGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADgYEAG9XLSlU6eORQ1LTL481PFvwsmxUq
-q0Dc6MRsFLwilB3nI1MyA9R6EDh/Tw1Fo7YiZ397OrgYEMvVV5GC+z923Zta9pI+
-h71V8Nt69iFENpx52d3BuYDNkhjSf5oo1KkVHgAmhCPjhFqFa+B6BE79KIz2Bwrx
-YzM6IclOG3yKzoY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ebooks.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=vinay.bharadwaj@ebooks.com,CN=ebooks.com,OU=Area Servizi ICT,O=Politecnico di Milano,L=Milan,ST=Milan,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNzCCAqCgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBqDELMAkGA1UEBhMCSVQx
-DjAMBgNVBAgTBU1pbGFuMQ4wDAYDVQQHEwVNaWxhbjEeMBwGA1UEChMVUG9saXRl
-Y25pY28gZGkgTWlsYW5vMRkwFwYDVQQLExBBcmVhIFNlcnZpemkgSUNUMRMwEQYD
-VQQDEwplYm9va3MuY29tMSkwJwYJKoZIhvcNAQkBFhp2aW5heS5iaGFyYWR3YWpA
-ZWJvb2tzLmNvbTAeFw0xMTAyMjMxNTU2NDRaFw0xNjAyMjIxNTU2NDRaMIGoMQsw
-CQYDVQQGEwJJVDEOMAwGA1UECBMFTWlsYW4xDjAMBgNVBAcTBU1pbGFuMR4wHAYD
-VQQKExVQb2xpdGVjbmljbyBkaSBNaWxhbm8xGTAXBgNVBAsTEEFyZWEgU2Vydml6
-aSBJQ1QxEzARBgNVBAMTCmVib29rcy5jb20xKTAnBgkqhkiG9w0BCQEWGnZpbmF5
-LmJoYXJhZHdhakBlYm9va3MuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQD9XQY5ysPYf4+guHJH+o75Ebn+bXE44uogDRo+IMLqCKxvEV5+C9RaDLKmeAs1
-YbYaHRx1Y5bHgHgj4nX44k266qpV78WoUEslkP9ivOKW4+waMzYvRGSC++vMIVtr
-ir6jQ94WvCxnS6JPJ5mDX6mEiVPIfuevBqYt+Cgj0Q2bMQIDAQABo28wbTAMBgNV
-HRMBAf8EAjAAMB0GA1UdDgQWBBS99SAMv7ZRQnNJ64Q5iC+xVikSCDALBgNVHQ8E
-BAMCBLAwEQYJYIZIAYb4QgEBBAQDAgWgMB4GCWCGSAGG+EIBDQQRFg94Y2EgY2Vy
-dGlmaWNhdGUwDQYJKoZIhvcNAQEFBQADgYEAG9XLSlU6eORQ1LTL481PFvwsmxUq
-q0Dc6MRsFLwilB3nI1MyA9R6EDh/Tw1Fo7YiZ397OrgYEMvVV5GC+z923Zta9pI+
-h71V8Nt69iFENpx52d3BuYDNkhjSf5oo1KkVHgAmhCPjhFqFa+B6BE79KIz2Bwrx
-YzM6IclOG3yKzoY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eblib.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eblib.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eblib.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.eblib.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.eblib.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.eblib.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Ebook Library</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">EBL</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.eblib.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Vinay</GivenName>
-    <SurName>Bharadwaj</SurName>
-    <EmailAddress>v@ebooks.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml b/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml
deleted file mode 100644
index e0d4b1a7..00000000
--- a/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.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://sp.ebrary.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Ebrary.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-09T13:15: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 urn:oasis:names:tc:SAML:1.0: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" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <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"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ebrary</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ebrary</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ebrary.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Su-Ho</GivenName>
-    <SurName>Hwang</SurName>
-    <EmailAddress>mailto:Su-Ho.Hwang@proquest.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Su-Ho</GivenName>
-    <SurName>Hwang</SurName>
-    <EmailAddress>mailto:Su-Ho.Hwang@proquest.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-agcensus.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.xml
deleted file mode 100644
index 0b38d21e..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-agcensus.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://sp.edina.ac.uk/shibboleth/agcensus">
-  <!--
-		This is a University of Edinburgh (EDINA) Service Provider for EDINA agcensus.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="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">Agcensus</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Grid square agricultural census data for England, Scotland and Wales</mdui:Description>
-        <mdui:Logo height="161" width="350">https://vsp2.edina.ac.uk/public/images/splogos/agcensus.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <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>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/agcensus/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/agcensus/Shibboleth.sso/SAML/Artifact" index="10"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA: agcensus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/agcensus/description.html</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-shibboleth-cris.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-cris.xml
deleted file mode 100644
index 0a4e8353..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-cris.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/cris">
-  <!--
-		This is an "EDINA CRIS" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						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>
-    <KeyDescriptor use="encryption">
-      <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/cris/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/cris/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/cris/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/cris/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp3.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML2/Artifact" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML2/ECP" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp4.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML/Artifact" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML/POST" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML2/Artifact" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML2/ECP" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/cris/Shibboleth.sso/SAML2/POST-SimpleSign" index="29"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: EDINA CRIS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.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-shibboleth-depot.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-depot.xml
deleted file mode 100644
index 8bcac9d8..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-depot.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://sp.edina.ac.uk/shibboleth/depot">
-  <!--
-		This is a University of Edinburgh (EDINA) Service Provider for 'The Depot'.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds: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>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/depot/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/depot/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/depot/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/depot/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/depot/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/depot/Shibboleth.sso/SAML/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/depot/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/depot/Shibboleth.sso/SAML/Artifact" index="10"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA: The Depot</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.depot.edina.ac.uk/about/</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-shibboleth-digicolleges.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.xml
deleted file mode 100644
index 44731f18..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digicolleges.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://sp.edina.ac.uk/shibboleth/digicolleges">
-  <!--
-		This is an "EDINA Digimap for Colleges" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-28T11:09:30Z">
-      <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://vsp2.edina.ac.uk/digicolleges/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/digicolleges/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/digicolleges/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/digicolleges/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/digicolleges/Shibboleth.sso/WAYF/UKall"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Digimap for Colleges</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EDINA Digimap for Colleges</mdui:Description>
-        <mdui:Logo height="90" width="350">https://vsp2.edina.ac.uk/public/images/splogos/digimap.png</mdui:Logo>
-      </mdui:UIInfo>
-    </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/digicolleges/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/digicolleges/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/digicolleges/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/digicolleges/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA Digimap for Colleges</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.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-shibboleth-digischools.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digischools.xml
deleted file mode 100644
index ca562981..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-digischools.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://sp.edina.ac.uk/shibboleth/digischools">
-  <!--
-		This is a Shibboleth 'EDINA Digimap for Schools' SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds: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>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/digischools/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/digischools/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/digischools/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/digischools/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/digischools/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/digischools/Shibboleth.sso/SAML/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/digischools/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/digischools/Shibboleth.sso/SAML/Artifact" index="10"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA: Digimap for Schools</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/about/</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-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-shibboleth-m2m.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.xml
deleted file mode 100644
index 459cf0d0..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-m2m.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://sp.edina.ac.uk/shibboleth/m2m">
-  <!--
-		This is an "EDINA M2M Authentication" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-28T13:09:20Z">
-      <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://vsp2.edina.ac.uk/m2m/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/m2m/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/m2m/Shibboleth.sso/WAYF/UKall"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EDINA M2M Authentication</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EDINA M2M Authentication</mdui:Description>
-        <mdui:Logo height="65" width="150">https://vsp2.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
-      </mdui:UIInfo>
-    </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/m2m/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/m2m/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/m2m/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/m2m/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/m2m/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA M2M Authentication</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.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-shibboleth-mediahub.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.xml
deleted file mode 100644
index 66955fb4..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-mediahub.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://sp.edina.ac.uk/shibboleth/mediahub">
-  <!--
-		This is an "EDINA Mediahub" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">JISC MediaHub</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The definitive academic video, image &amp; audio resource</mdui:Description>
-        <mdui:Logo height="84" width="350">https://vsp2.edina.ac.uk/public/images/splogos/mediahub.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <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>
-    <KeyDescriptor use="encryption">
-      <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/mediahub/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/mediahub/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/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp3.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp4.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML/Artifact" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML/POST" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/Artifact" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/ECP" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/mediahub/Shibboleth.sso/SAML2/POST-SimpleSign" index="29"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: EDINA Mediahub</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.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-shibboleth-safenet.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.xml
deleted file mode 100644
index 71a3c272..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-safenet.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://sp.edina.ac.uk/shibboleth/safenet">
-  <!--
-		This is a "SafeNet" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-15T10:26:38Z">
-      <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://vsp2.edina.ac.uk/safenet/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/safenet/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/safenet/Shibboleth.sso/WAYF/UKall"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SafeNet</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SafeNet</mdui:Description>
-        <mdui:Logo height="65" width="150">https://vsp2.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
-      </mdui:UIInfo>
-    </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/safenet/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/Artifact/SOAP" index="12"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/safenet/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/safenet/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/safenet/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/safenet/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/safenet/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/safenet/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/safenet/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/safenet/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/safenet/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/safenet/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/safenet/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/safenet/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/safenet/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/safenet/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML/Artifact" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML/POST" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML2/Artifact" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML2/ECP" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML2/POST" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/safenet/Shibboleth.sso/SAML2/POST-SimpleSign" index="22"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SafeNet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.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-shibboleth-ukborders.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
deleted file mode 100644
index 203cce1a..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-ukborders.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.edina.ac.uk/shibboleth/ukborders">
-  <!--
-		This is an "EDINA: UKBORDERS" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">UKBORDERS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Boundary datasets and geographic look up tables of the United Kingdom</mdui:Description>
-        <mdui:Logo height="161" width="350">https://vsp2.edina.ac.uk/public/images/splogos/ukborders.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEnDCCA4SgAwIBAgIQWut7bBSSWefrikHOubml4zANBgkqhkiG9w0BAQsFADBk
-						MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-						QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-						Q0EgMjAeFw0xNTAzMDUwMDAwMDBaFw0xODAzMDQyMzU5NTlaMD8xITAfBgNVBAsT
-						GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRdWtibHguZWRpbmEu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5SJEZTKQCZbNb
-						zTqHNtIFN0IRDdIEtk2vPTcPbqtnFkKP1X+Z0EjhamVEDr0s1L25s43C7J5nLHz5
-						VFX3ktuVO5FCxF/2Oaq2LWfbGuxeV0wyhzpfJT/YgsLfEdb2IMnP96BZV/d+TgGU
-						NdDetn8LWtIzAO4zg8jHFxslNOXazzECKZ46kKngRsDWAaMkjBxc4g5mTsjPd3EX
-						ao8pmPHe0a5vHY0qNyWtUEenKHqF3yHw4Q43Kq1CJJsNvP24RrJmlH5DxX1ZUFXv
-						Lv1uW3K8IUFb1FyiUr5GrxL3gUSlv0qQbD19Ixp4VP2klRTP/8/Wax6pUiwuRTz4
-						oWevYryTAgMBAAGjggFtMIIBaTAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYo
-						sP22vTAdBgNVHQ4EFgQUAuKr/P8UNkDO7T22HNNhXsUD4RgwDgYDVR0PAQH/BAQD
-						AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-						MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-						L6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3Js
-						MGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1
-						c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3Nw
-						LnVzZXJ0cnVzdC5jb20wHAYDVR0RBBUwE4IRdWtibHguZWRpbmEuYWMudWswDQYJ
-						KoZIhvcNAQELBQADggEBAFrzP+3+Pg1a4fUwUjRnUCUUNP1BrFlNlA0BL9/VkJpO
-						2BYVPxc3D2ycgKzCWangrcWSUAGiiQ7gS0fkoXYn2oQhEz/vmnaUaIIIupKvRmjn
-						8dzig0vHNjJ7oXS0GznG1IBefrtTKiHk6nD5qO2/vy4G5co+Ki1yfVhB4gAP1fIW
-						K3A2K4yil0F2YGUI5SM2sxjc9SEJng/3B1z0T5bmTU/GJNxXQTViBFztU2M4YHkb
-						vnPPZxVDGAaP4I1gJPTdzPqtTsiKRiMb3x1hMMK/dF/n6nlK94YZ3tixX6OJRAwD
-						a2U2jkfsIUdtV6+2zYAlc6uXUWKRrE8+ManCTprC5/k=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukblx.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://census.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dlib-terzis.ucs.ed.ac.uk:8140/Shibboleth.sso/SAML2/POST" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dlib-terzis.ucs.ed.ac.uk:8140/Shibboleth.sso/SAML2/POST-SimpleSign" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dlib-terzis.ucs.ed.ac.uk:8140/Shibboleth.sso/SAML2/Artifact" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dlib-terzis.ucs.ed.ac.uk:8140/Shibboleth.sso/SAML2/ECP" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dlib-terzis.ucs.ed.ac.uk:8140/Shibboleth.sso/SAML/POST" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dlib-terzis.ucs.ed.ac.uk:8140/Shibboleth.sso/SAML/Artifact" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="29"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="31"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="32"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="33"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://borders.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="34"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="35"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="37"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="38"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="39"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://borders-staging.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="40"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA: UKBORDERS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/ukborders/description/</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-shibboleth-vsm.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.xml
deleted file mode 100644
index 332e8f31..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-vsm.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://sp.edina.ac.uk/shibboleth/vsm">
-  <!--
-		This is a University of Edinburgh Service Provider for EDINA VSM Portal.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds: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>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/vsm/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/vsm/Shibboleth.sso/SAML/Artifact" index="10"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA VSM Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/projects/vsmportal/</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 1c22a346..00000000
--- a/swamid-interfederations-2.0/sp.edina.ac.uk.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://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"/>
-    <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"/>
-    <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"/>
-    <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"/>
-  </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.elearning.uni-bremen.de.xml b/swamid-interfederations-2.0/sp.elearning.uni-bremen.de.xml
deleted file mode 100644
index 06ce1e4f..00000000
--- a/swamid-interfederations-2.0/sp.elearning.uni-bremen.de.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.elearning.uni-bremen.de/module.php/saml/sp/metadata.php/default-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp.elearning.uni-bremen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.elearning.uni-bremen.de,OU=Zentrum fuer Multimedia in der Lehre,O=Universitaet Bremen,L=Bremen,ST=Bremen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIEEKXHTTANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQnJlbWVuMQ8wDQYDVQQHEwZCcmVtZW4xHDAaBgNVBAoTE1Vu
-aXZlcnNpdGFldCBCcmVtZW4xHzAdBgNVBAMTFlVuaXZlcnNpdGFldCBCcmVtZW4g
-Q0EwHhcNMTAwOTA3MTQxODM3WhcNMTUwODEyMTQxODM3WjCBoTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJyZW1lbjEPMA0GA1UEBxMGQnJlbWVuMRwwGgYDVQQKExNV
-bml2ZXJzaXRhZXQgQnJlbWVuMS0wKwYDVQQLEyRaZW50cnVtIGZ1ZXIgTXVsdGlt
-ZWRpYSBpbiBkZXIgTGVocmUxIzAhBgNVBAMTGnNwLmVsZWFybmluZy51bmktYnJl
-bWVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRz6jsYLtM9u
-mhTah1G1ja6fM6pxYotgxAX0AVIeqN0yPoMqbyWPyVSah6dYWcB6w9mluUMOQl7n
-uYrR02PPewdeaQjbfszzMsvedPisstsgQQovcqsDerQf/8DCwoYTRXr02BH58zIP
-g6xa10lCPmAVs8hvQCgOwfpHiJkBosFYnXT26KgB+x5BvzRtk0SP6suxaukTAzrY
-5P6B9bS0a6cug5BAKPTtGePogyiMG4q1+XYH0CbLNW5xaBdSwP5D8ZbPDTQ+kaJ6
-clJjpvQikNsAd54QAXEtAugGcd+FHePQ66zc6Pwd9ScMBujdWc+urJR7XxO+4arS
-IVocpMFzrwIDAQABo4IBpjCCAaIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ66O97b2HFg7rR
-kNvrX0sSEZZ35DAfBgNVHSMEGDAWgBTky8TsedDfrm6skomunUkvxeWYQTCBhQYD
-VR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktYnJlbWVu
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4hjZodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3VuaS1icmVtZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgaAGCCsGAQUFBwEB
-BIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1i
-cmVtZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEYGCCsGAQUFBzAChjpodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1icmVtZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCZWz6MxY30W1tO9ee+bvveN7qnyHcP
-mVIVrCaJoNBj1XrybyWwJIAHJgxu8MAk9mqovgPnankubQapGPLvm9cEQcy2Prk8
-0dMbYUvQUDQ7bBAqtWz+tcJ7xdbbAsS5ZKXkqgrrjxhdELmraNDuJLixq0uoeyHw
-LFfjps9UgaikwwxlAkh/GI3eKbEdBjW600BwmKGgX8+Fn2xxkEDlDuiBrTqOenJ1
-ya7z3CrdIienWIfrTcFvvQfoQMeRuKt0hyoZvgVrpEh9Cy9wr6eQb3aV1MouSOaU
-n+92msAlsUQLZR6LMB31MwVzS3NGr+9Xd2N4h2bcaD4U9nYuPAMD4JRK
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp.elearning.uni-bremen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.elearning.uni-bremen.de,OU=Zentrum fuer Multimedia in der Lehre,O=Universitaet Bremen,L=Bremen,ST=Bremen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFNjCCBB6gAwIBAgIEEKXHTTANBgkqhkiG9w0BAQUFADBuMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQnJlbWVuMQ8wDQYDVQQHEwZCcmVtZW4xHDAaBgNVBAoTE1Vu
-aXZlcnNpdGFldCBCcmVtZW4xHzAdBgNVBAMTFlVuaXZlcnNpdGFldCBCcmVtZW4g
-Q0EwHhcNMTAwOTA3MTQxODM3WhcNMTUwODEyMTQxODM3WjCBoTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJyZW1lbjEPMA0GA1UEBxMGQnJlbWVuMRwwGgYDVQQKExNV
-bml2ZXJzaXRhZXQgQnJlbWVuMS0wKwYDVQQLEyRaZW50cnVtIGZ1ZXIgTXVsdGlt
-ZWRpYSBpbiBkZXIgTGVocmUxIzAhBgNVBAMTGnNwLmVsZWFybmluZy51bmktYnJl
-bWVuLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsRz6jsYLtM9u
-mhTah1G1ja6fM6pxYotgxAX0AVIeqN0yPoMqbyWPyVSah6dYWcB6w9mluUMOQl7n
-uYrR02PPewdeaQjbfszzMsvedPisstsgQQovcqsDerQf/8DCwoYTRXr02BH58zIP
-g6xa10lCPmAVs8hvQCgOwfpHiJkBosFYnXT26KgB+x5BvzRtk0SP6suxaukTAzrY
-5P6B9bS0a6cug5BAKPTtGePogyiMG4q1+XYH0CbLNW5xaBdSwP5D8ZbPDTQ+kaJ6
-clJjpvQikNsAd54QAXEtAugGcd+FHePQ66zc6Pwd9ScMBujdWc+urJR7XxO+4arS
-IVocpMFzrwIDAQABo4IBpjCCAaIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ66O97b2HFg7rR
-kNvrX0sSEZZ35DAfBgNVHSMEGDAWgBTky8TsedDfrm6skomunUkvxeWYQTCBhQYD
-VR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktYnJlbWVu
-LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4hjZodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3VuaS1icmVtZW4tY2EvcHViL2NybC9jYWNybC5jcmwwgaAGCCsGAQUFBwEB
-BIGTMIGQMEYGCCsGAQUFBzAChjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1i
-cmVtZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEYGCCsGAQUFBzAChjpodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1icmVtZW4tY2EvcHViL2NhY2VydC9jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCZWz6MxY30W1tO9ee+bvveN7qnyHcP
-mVIVrCaJoNBj1XrybyWwJIAHJgxu8MAk9mqovgPnankubQapGPLvm9cEQcy2Prk8
-0dMbYUvQUDQ7bBAqtWz+tcJ7xdbbAsS5ZKXkqgrrjxhdELmraNDuJLixq0uoeyHw
-LFfjps9UgaikwwxlAkh/GI3eKbEdBjW600BwmKGgX8+Fn2xxkEDlDuiBrTqOenJ1
-ya7z3CrdIienWIfrTcFvvQfoQMeRuKt0hyoZvgVrpEh9Cy9wr6eQb3aV1MouSOaU
-n+92msAlsUQLZR6LMB31MwVzS3NGr+9Xd2N4h2bcaD4U9nYuPAMD4JRK
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.elearning.uni-bremen.de/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Bremen - Zentrum für Multimedia in der Lehre</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Bremen - Zentrum für Multimedia in der Lehre</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://elearning.uni-bremen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Oliver</GivenName>
-    <SurName>Oster</SurName>
-    <EmailAddress>olio@zmml.uni-bremen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.xml b/swamid-interfederations-2.0/sp.gigajamvle.com-shibboleth.xml
deleted file mode 100644
index cf7f65e4..00000000
--- a/swamid-interfederations-2.0/sp.gigajamvle.com-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://sp.gigajamvle.com/shibboleth">
-  <!--
-		This is a "GigajamVLE" Shibboleth SP for Interactive Music School Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIC6DCCAdCgAwIBAgIJAKL0Rd2ZS0IhMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC3NlcnZlcjUwNjg1MB4XDTA5MDYxNTA4NDU1NloXDTE5MDYxMzA4NDU1Nlow
-						FjEUMBIGA1UEAxMLc2VydmVyNTA2ODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQC7qvdYa5Ntk80wfZrtkJTFwAI9Cdx88C0Ql9/nab/L7oXVdNO3IgGx
-						bQqI0P71yCA//g5oJrnaQstNPA1pjq9wJsn6Dppy8+DQTOaYmJAZbt2dZ2JJZQPs
-						5THow+T6BbXGKtEVmKBtkvCuyK9uRlSHu/B6gQCsEeCCk+zZA9XP7rGxvEddWD2Y
-						rhmNpe4P9k5QzFbW7fBIgCC+v8tE2U+4ufm9AY1whs+VgKLS8F7hYGnjjQAM62mC
-						E+4M/9UgNt30TSwUcHmaDw0S6obsOUY+pH2kUdiNL3IPfd5/RTwcbm90kgae1ks3
-						MrOXjRxnKx3dS0KwMVBbjgPW89CYPTlRAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Nl
-						cnZlcjUwNjg1MB0GA1UdDgQWBBSGpWMub0XU+qKZm5q1SOxMSPBqPDANBgkqhkiG
-						9w0BAQUFAAOCAQEAD54bxpNe9K1R0GDlV/q3Y4SrAGRps7//DdtqBE1VgvYYxKNn
-						liNEGxWKg7fe9NNXUsnlbkmGFzgvbUlfAiRhprB8yEeKOCfCzpEem6I7qQiRk1vP
-						bdYf3nxNr1AYf71QskQrVcG4NazrOEBhscNBZNzDdgYJh9iHMWOKoAwOXAux7rwj
-						wmvyOXcT8nYskOwgP+S6bY9Nujy4N3zOK67MWQUeGaDk+Dy2MWeE4HALRS1uekZO
-						GQLj4hRRG7q1Bd+rjyh4YI3FtCDrmTk9ZtVL2OigpRhl4zF46htqt7B1EoZrG9V7
-						U7cJNLDizKNwHettuv1vTwydaCIJ4VQ8cvkIaQ==
-					</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>
-						MIIC6DCCAdCgAwIBAgIJAKL0Rd2ZS0IhMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC3NlcnZlcjUwNjg1MB4XDTA5MDYxNTA4NDU1NloXDTE5MDYxMzA4NDU1Nlow
-						FjEUMBIGA1UEAxMLc2VydmVyNTA2ODUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQC7qvdYa5Ntk80wfZrtkJTFwAI9Cdx88C0Ql9/nab/L7oXVdNO3IgGx
-						bQqI0P71yCA//g5oJrnaQstNPA1pjq9wJsn6Dppy8+DQTOaYmJAZbt2dZ2JJZQPs
-						5THow+T6BbXGKtEVmKBtkvCuyK9uRlSHu/B6gQCsEeCCk+zZA9XP7rGxvEddWD2Y
-						rhmNpe4P9k5QzFbW7fBIgCC+v8tE2U+4ufm9AY1whs+VgKLS8F7hYGnjjQAM62mC
-						E+4M/9UgNt30TSwUcHmaDw0S6obsOUY+pH2kUdiNL3IPfd5/RTwcbm90kgae1ks3
-						MrOXjRxnKx3dS0KwMVBbjgPW89CYPTlRAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Nl
-						cnZlcjUwNjg1MB0GA1UdDgQWBBSGpWMub0XU+qKZm5q1SOxMSPBqPDANBgkqhkiG
-						9w0BAQUFAAOCAQEAD54bxpNe9K1R0GDlV/q3Y4SrAGRps7//DdtqBE1VgvYYxKNn
-						liNEGxWKg7fe9NNXUsnlbkmGFzgvbUlfAiRhprB8yEeKOCfCzpEem6I7qQiRk1vP
-						bdYf3nxNr1AYf71QskQrVcG4NazrOEBhscNBZNzDdgYJh9iHMWOKoAwOXAux7rwj
-						wmvyOXcT8nYskOwgP+S6bY9Nujy4N3zOK67MWQUeGaDk+Dy2MWeE4HALRS1uekZO
-						GQLj4hRRG7q1Bd+rjyh4YI3FtCDrmTk9ZtVL2OigpRhl4zF46htqt7B1EoZrG9V7
-						U7cJNLDizKNwHettuv1vTwydaCIJ4VQ8cvkIaQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gigajamvle.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gigajamvle.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigajamvle.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigajamvle.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gigajamvle.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gigajamvle.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigajamvle.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigajamvle.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gigajamvle.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gigajamvle.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gigajamvle.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gigajamvle.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gigajamvle.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gigajamvle.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Interactive Music School Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Interactive Music School Limited: GigajamVLE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://gigajamvle.com/about/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Iain</GivenName>
-    <SurName>Norman</SurName>
-    <EmailAddress>mailto:support@gigajam.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Iain</GivenName>
-    <SurName>Norman</SurName>
-    <EmailAddress>mailto:iain.norman@gigajam.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.gogeo.ac.uk-shibboleth.xml
deleted file mode 100644
index 3547693a..00000000
--- a/swamid-interfederations-2.0/sp.gogeo.ac.uk-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://sp.gogeo.ac.uk/shibboleth">
-  <!--
-		This is a University of Edinburgh (EDINA) Service Provider for Go-Geo!
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="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">GeoDoc</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A metadata creation and management tool</mdui:Description>
-        <mdui:Logo height="100" width="350">https://vsp2.edina.ac.uk/public/images/splogos/gogeo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <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>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/gogeo/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/gogeo/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/gogeo/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/gogeo/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/gogeo/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/gogeo/Shibboleth.sso/SAML/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/gogeo/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/gogeo/Shibboleth.sso/SAML/Artifact" index="10"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA: Go-Geo!</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gogeo.ac.uk/cgi-bin/info.cgi</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.igpublish.com-shibboleth.xml b/swamid-interfederations-2.0/sp.igpublish.com-shibboleth.xml
deleted file mode 100644
index 2c6e2279..00000000
--- a/swamid-interfederations-2.0/sp.igpublish.com-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://sp.igpublish.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Academic Rights Press Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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">IG Publishing Pte Ltd</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Established in Singapore since 2006, we work with many reputable publishers to represent their brands.</mdui:Description>
-        <mdui:Logo height="99" width="256">https://sp.igpublish.com/logos/256.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC5TCCAc2gAwIBAgIJAP+bL8Y9JiKWMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-						BAMTClNFQVJDSFNSVkEwHhcNMTAxMTEyMDcyMzA4WhcNMjAxMTA5MDcyMzA4WjAV
-						MRMwEQYDVQQDEwpTRUFSQ0hTUlZBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEA3wqCYIkxitDSLy2yJdmPGTWLPB4MDvgRHEwT7ZiPsrPigXhAF3/ZOs/n
-						hMBNYwEUZZr0aFNoqxzsEk2gbWFedJXAQsU1bIX9ykDP0QfHLijVUv2KdWQfzKGw
-						udm2WFSCFJArqpHcM8gvbLjvYxMMCgw5c5Ja8XWL6mjjRKMdBpTboJpsEZWsTL1h
-						E6hHY9yFIKHsmGr69cMOCSSpfGx10ZKSQgugBMKq6JatdNPFLkEn2T0AzZOOQgL+
-						TNQEpLLXZ/69j4DjYAB5kjr9cpvWZQReE7lP0lkSnALUVM7s+/fytV8lfGs7pDbR
-						NE5VpOgewWdXpqX119X6LZPdQJgEKwIDAQABozgwNjAVBgNVHREEDjAMggpTRUFS
-						Q0hTUlZBMB0GA1UdDgQWBBQoMgjN6ERGsRxlKhUylzN5II0OuTANBgkqhkiG9w0B
-						AQUFAAOCAQEAOf1vokGaIZdmdbIk+HrncGML98lEQrjna4Wp4NiMOKuauszLFKEK
-						Ys6b42oL0NdaDM/9zu6lwxtJBGO2Hb7DKA6CwBRObDhbLOdaFynDGHq45roQN0gB
-						R69V4ZFGxqrpFdyX1gp2P3YRGfdoZKFa+U9n4kZ7GGofaak15ZiCrWPh6GeRLCF/
-						xQfXQh802/FPY2tnqk2bs7LHIjGziCAjvvLVxHGIqoXUgmD89oQTYA8zB6b2jwWo
-						MOkHFT1pJm1IeztRNZZ+4ARMt54WciOkwbYb1rxGCi2Mi3ex5avJPyQioHoezkKo
-						ZHd6NA1VwSUDsZ3pgZB//nGB5fZPi9SIJw==
-					</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>
-						MIIC5TCCAc2gAwIBAgIJAP+bL8Y9JiKWMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-						BAMTClNFQVJDSFNSVkEwHhcNMTAxMTEyMDcyMzA4WhcNMjAxMTA5MDcyMzA4WjAV
-						MRMwEQYDVQQDEwpTRUFSQ0hTUlZBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEA3wqCYIkxitDSLy2yJdmPGTWLPB4MDvgRHEwT7ZiPsrPigXhAF3/ZOs/n
-						hMBNYwEUZZr0aFNoqxzsEk2gbWFedJXAQsU1bIX9ykDP0QfHLijVUv2KdWQfzKGw
-						udm2WFSCFJArqpHcM8gvbLjvYxMMCgw5c5Ja8XWL6mjjRKMdBpTboJpsEZWsTL1h
-						E6hHY9yFIKHsmGr69cMOCSSpfGx10ZKSQgugBMKq6JatdNPFLkEn2T0AzZOOQgL+
-						TNQEpLLXZ/69j4DjYAB5kjr9cpvWZQReE7lP0lkSnALUVM7s+/fytV8lfGs7pDbR
-						NE5VpOgewWdXpqX119X6LZPdQJgEKwIDAQABozgwNjAVBgNVHREEDjAMggpTRUFS
-						Q0hTUlZBMB0GA1UdDgQWBBQoMgjN6ERGsRxlKhUylzN5II0OuTANBgkqhkiG9w0B
-						AQUFAAOCAQEAOf1vokGaIZdmdbIk+HrncGML98lEQrjna4Wp4NiMOKuauszLFKEK
-						Ys6b42oL0NdaDM/9zu6lwxtJBGO2Hb7DKA6CwBRObDhbLOdaFynDGHq45roQN0gB
-						R69V4ZFGxqrpFdyX1gp2P3YRGfdoZKFa+U9n4kZ7GGofaak15ZiCrWPh6GeRLCF/
-						xQfXQh802/FPY2tnqk2bs7LHIjGziCAjvvLVxHGIqoXUgmD89oQTYA8zB6b2jwWo
-						MOkHFT1pJm1IeztRNZZ+4ARMt54WciOkwbYb1rxGCi2Mi3ex5avJPyQioHoezkKo
-						ZHd6NA1VwSUDsZ3pgZB//nGB5fZPi9SIJw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.igpublish.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.igpublish.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.igpublish.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.igpublish.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.igpublish.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.igpublish.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.igpublish.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.igpublish.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.igpublish.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.igpublish.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.igpublish.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.igpublish.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.igpublish.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.igpublish.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.igpublish.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Academic Rights Press Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IG Publishing Pte Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.igpublish.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Art</GivenName>
-    <SurName>Hung</SurName>
-    <EmailAddress>mailto:art@igroupnet.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Art</GivenName>
-    <SurName>Hung</SurName>
-    <EmailAddress>mailto:art@igroupnet.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.issuesonline.co.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.issuesonline.co.uk-shibboleth.xml
deleted file mode 100644
index c3502b92..00000000
--- a/swamid-interfederations-2.0/sp.issuesonline.co.uk-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://sp.issuesonline.co.uk/shibboleth">
-  <!--
-		This is an "Issues Online" Shibboleth SP for Independence Educational Publishers Ltd.
-	-->
-  <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="2015-03-02T08:54:34Z">
-      <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">Issues Online</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Resources for schools, colleges and libraries</mdui:Description>
-        <mdui:Logo height="79" width="329">https://www.issuesonline.co.uk/resources/images/header/logo.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.issuesonline.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://www.issuesonline.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDITCCAgmgAwIBAgIJALqyRi7RcRm9MA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-						BAMTHnNlcmVuaXR5LTAwMS5yZWFsbmV0MjAwMC5jby51azAeFw0xNTAyMjYxMjEy
-						NTNaFw0yNTAyMjMxMjEyNTNaMCkxJzAlBgNVBAMTHnNlcmVuaXR5LTAwMS5yZWFs
-						bmV0MjAwMC5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7f
-						GguU7RUkjcExiPCDt6y7m8O95jgYTnBf0JR1NC6XUmq5ClSrvwopeoYHdFZgZNPg
-						hBdN9ZpLNf7zXprkNnycsMw4FNKw+9XptaiYLM4j1/yNTyZ8Rskrnvd1lPvlVjmx
-						RvOtF+gNbXDKDgPTWYsvu1BkjtaHHcWN/tmRkPdjST7H4aGhQc7F5S0ka1HiqO1T
-						p6IWYiJ25VCVq+eszCz+FO/bXkR8B32P3Zp0ccLwqOEAHn0K3UKu21/HJ6eNpT5s
-						0b7uirPmveSS7L5+XSIDe6u1jmlxwtk9cDgSh0FvRBqEjLw5us7tXfMhUHTWAr/s
-						GoUgXNHkYBRT6DFAxhsCAwEAAaNMMEowKQYDVR0RBCIwIIIec2VyZW5pdHktMDAx
-						LnJlYWxuZXQyMDAwLmNvLnVrMB0GA1UdDgQWBBTCr+UQKfAtVYV9QIFpBp8sxXhJ
-						8zANBgkqhkiG9w0BAQUFAAOCAQEAvRii27N52xgxwRsO9qQC67rbW4Wa7tNzKlGH
-						iRzlhTWBFi5e3nmnDZ/svXQI0dfeJIsVV293CgO7RQqkcNH/ZqQ6wQW8nkBG0ruz
-						BlPV8v27e017FzbrjncQMT8Fxsxxc5YPa710ihh+OTvDAjMhW7UmOYRL7oOTXI5Z
-						95HM8MY0CercGLx6vUpLCoiAj/HXDu8lxP1meX4fUODoAiKXXyNI0F6X2WBCeW1O
-						B/bTTlZ72l4idlNBvCEanRUR3vteHosW+NdoHZqfeb/2hoZDgVX6mxrNmVsngt+a
-						HxkUVc9Uc6QfHSqM+dXfPFIex+3Xwa+jJ6RvjcoUIWJoMN8r0g==
-					</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.issuesonline.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.issuesonline.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Independence Educational Publishers Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Issues Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://issuesonline.co.uk/what-we-do/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kari</GivenName>
-    <SurName>Sewell</SurName>
-    <EmailAddress>mailto:kari@realnet.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kari</GivenName>
-    <SurName>Sewell</SurName>
-    <EmailAddress>mailto:kari@realnet.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.kbplus.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.kbplus.ac.uk-shibboleth.xml
deleted file mode 100644
index bae5457a..00000000
--- a/swamid-interfederations-2.0/sp.kbplus.ac.uk-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" entityID="https://sp.kbplus.ac.uk/shibboleth">
-  <!--
-		This is a "KnowledgeBase+" 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#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="2014-12-22T11:56:58Z">
-      <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://sp.kbplus.ac.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://sp.kbplus.ac.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://www.kbplus.ac.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://www.kbplus.ac.uk/Shibboleth.sso/Login" index="4"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">KnowledgeBase+</mdui:DisplayName>
-        <mdui:Description xml:lang="en">KnowledgeBase+</mdui:Description>
-        <mdui:Logo height="170" width="242">https://sp.kbplus.ac.uk/kbplus.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJAIBmyUyWFATyMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDWlwLTEwLTAtNjAtMjgwHhcNMTQxMjE5MTQzMzE5WhcNMjQxMjE2MTQzMzE5
-						WjAYMRYwFAYDVQQDEw1pcC0xMC0wLTYwLTI4MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA08UgodtgpL2QVTy9K43/KrIMvEIh1ZQZpAFsmWYyHaW0T0kx
-						bBVyV9jmFOyCC6YIsP7wb5EwwXsYQKuDYwyhucrF7mBTJYT9JHsBEsNTI/ckB7YJ
-						rTe21BGZYrDsNl+Ncxqnt9RFalljCet7N+co2H3/EBXIhttz+Yfv+RwtvGQnTK7s
-						+jHMwXHni4pRCeuJZJzynTjQypBT3noRu1Ay0nJPnDuDOzcJ+t+5T1NQkGOFGWbo
-						Vr/rlGILNibJ+SK+o2ZYvezTh1KWo3I/1GiMCUnAywyiF47k7TiFF2BVSVj1gAr5
-						X8w9v7qU/EFGCtk6SNrNjwdzfSaHzBQa1RqMZwIDAQABozswOTAYBgNVHREEETAP
-						gg1pcC0xMC0wLTYwLTI4MB0GA1UdDgQWBBQGGh8/UCXKoembhzc6Bpt5IT315DAN
-						BgkqhkiG9w0BAQUFAAOCAQEAPBszDkuKHytoFPV3P/nnXaHdLJuLer/XxPi8BiWI
-						MwQaaqcymdqZOixsdXyIHYcIwS1HRwob+aMgdo5R87v830DO0bAWLnXHb89Bls/z
-						zRo1bSnkNNo8ifNwmaQE1J8ttvbwmQuveBy8iD/NQjmhlS2oULEIVCGsIEsfPGDw
-						HArLHsB6yRGs0bwBfGpXx1hD8vblXsTAdm3ZPR0BwG300xFfVAAzIYTB9ScB8q46
-						t/b+LmlaKpl3emlCNXTRMA3reOd/DprijQ1LfLwvcDpU+T3TQ8SlNwy77eoOxP6O
-						KnqjBKrvm9/rhPNvZwtmlWq7PcmrftbKcYLsJNpIC5j2nw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.kbplus.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML2/POST" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML2/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML2/ECP" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML/POST" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.kbplus.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">KnowledgeBase+</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jisc-collections.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support (Ian Ibbotson)</GivenName>
-    <EmailAddress>mailto:support@k-int.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>mailto:mike.jones@manchester.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 ab78262d..a0b677c9 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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.korp.csc.fi/">
-  <md: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>
-  </md:Extensions>
+<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 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">
+      <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="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
         <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
@@ -24,9 +14,13 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://korp.csc.fi/privacy-policy.html</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -63,8 +57,8 @@ eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
       <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 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="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 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>
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 d35d911d..00000000
--- a/swamid-interfederations-2.0/sp.korp.csc.fi.xml
+++ /dev/null
@@ -1,93 +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="fi">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.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml b/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.xml
deleted file mode 100644
index efed8895..00000000
--- a/swamid-interfederations-2.0/sp.kpi.ua-simplesaml-module.php-saml-sp-metadata.php-ntuu-kpi-sp.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://sp.kpi.ua/simplesaml/module.php/saml/sp/metadata.php/ntuu-kpi-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-05-12T11:04:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">NTUU KPI SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Service Provider for NTUU KPI</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://sp.kpi.ua</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://sp.kpi.ua/privacy-policy.html</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>
-MIIFjDCCBHSgAwIBAgIQEUOHKK6sc4pWmFK5HgFIITANBgkqhkiG9w0BAQsFADCB
-kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
-BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
-QTAeFw0xNTEyMDMwMDAwMDBaFw0xNzAzMDUyMzU5NTlaMIGZMSEwHwYDVQQLExhE
-b21haW4gQ29udHJvbCBWYWxpZGF0ZWQxQjBABgNVBAsTOVByb3ZpZGVkIGJ5IENl
-bnRlciBvZiBVa3JhaW5pYW4gSW50ZXJuZXQgTmFtZXMgKFVLUk5BTUVTKTEcMBoG
-A1UECxMTVWtybmFtZXMgRG9tYWluIFNTTDESMBAGA1UEAxMJc3Aua3BpLnVhMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvonPE5+8bja2hn3MFzSwhuAB
-vFZBdpUq7//hvcpNsdHSjNBL5oWTT99bO+E4hIjf5HaSl1T6ZcH2KNl1AWHFKZnO
-pLoi57mX0e8iMYXkOC5SCxSOEURgyBzjDO0bg26NuxWKnTHNjcRqTt3X+aI8qOHa
-EbvokM6E4MmKUErQqBlC85KrNS6Mn6oclRjNP/QYfKk5LE1wQwEa9WEGIMfzXwbz
-IFA61/Shscrq2LOEYAo1L/2Lp6xWPgnPrHXJNN1jj8tvINnslAJ6qTVNPbGWDgni
-zY5rAhcNSJOeWfaKsJdSD4vrcFWhMsf34HI+/EYyn99mjSzU5FtAoEzAcjqFiQID
-AQABo4IB1TCCAdEwHwYDVR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYD
-VR0OBBYEFIMTyzQx9IadYPh9b4ApSthFUYIFMA4GA1UdDwEB/wQEAwIFoDAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAE
-SDBGMDoGCysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJl
-LmNvbW9kby5jb20vQ1BTMAgGBmeBDAECATBUBgNVHR8ETTBLMEmgR6BFhkNodHRw
-Oi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2Vj
-dXJlU2VydmVyQ0EuY3JsMIGFBggrBgEFBQcBAQR5MHcwTwYIKwYBBQUHMAKGQ2h0
-dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25T
-ZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9k
-b2NhLmNvbTAjBgNVHREEHDAagglzcC5rcGkudWGCDXd3dy5zcC5rcGkudWEwDQYJ
-KoZIhvcNAQELBQADggEBAIFHyhglkkb80erci5a4pK6Vgsi2C34WxnUZzcwWmD3G
-m3UJsOkNPDAv3E1bifayu05nZQdLHy1crtgKs0q5FkqhPSBs6iOzr5YObCZOCVl7
-rYyarYeMXdqcPYKuRYXPO3Z8RGoVPYRyUU7gi5lyz+5i1EeSFqEkwVGTV7EzjBtr
-scGwj5R7R1F8+6m+zW6wLnJqIIYUZ8UpxtF7n/Mtza8bdJQJ+39JeHX+ZErdYh3e
-2a7XcvfmOg9UBEhd/UhzCegDplloCmxzt2dmmlFEPj/IA5wJCtc0nUmeirxhYoZx
-5GHTzCwt0Z2osUZDlKP/lZr+nSBukUtRYtyoNNJoUJ0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml2-logout.php/ntuu-kpi-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml2-acs.php/ntuu-kpi-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml1-acs.php/ntuu-kpi-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml2-acs.php/ntuu-kpi-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.kpi.ua/simplesaml/module.php/saml/sp/saml1-acs.php/ntuu-kpi-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">NTUU KPI SP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Service Provider for NTUU KPI</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.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="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="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="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="ru">Национальный Технический Университет Украины "Киевский политехнический институт"</md:OrganizationName>
-    <md:OrganizationName xml:lang="uk">Національний Технічний Університет України "Київський політехнічний інститут"</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">National Technical University of Ukraine "Kyiv Polytechnic Institute"</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="ru">НТУУ "КПИ"</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="uk">НТУУ "КПІ"</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NTUU "KPI"</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="ru">http://kpi.ua/ru</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="uk">http://kpi.ua</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://kpi.ua/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>TechSupport</md:GivenName>
-    <md:EmailAddress>mailto:support@kpi.ua</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.lamlash.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.lamlash.edina.ac.uk-shibboleth.xml
deleted file mode 100644
index 34337f1a..00000000
--- a/swamid-interfederations-2.0/sp.lamlash.edina.ac.uk-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://sp.lamlash.edina.ac.uk/shibboleth">
-  <!--
-		This is a "Lamlash UK fed support test SP" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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-09-20T14:18: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://lamlash.edina.ac.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://lamlash.edina.ac.uk/Shibboleth.sso/UKFedDS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lamlash UK fed support test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Lamlash UK fed support test SP</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJAIz7KDvHw5ORMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2xhbWxhc2guZWRpbmEuYWMudWswHhcNMTMwOTEzMTc1NDI1WhcNMjMwOTEx
-						MTc1NDI1WjAeMRwwGgYDVQQDExNsYW1sYXNoLmVkaW5hLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq0M2cjdOzJJBxoIEWtP6SCapbrGLQ7zv
-						dJ2U2jqufS02CUDkFB33MRPayOq/PVIRLVjfQMaA2D34LkWHhnF6VzF1ERXAFHjj
-						Q5/Nkkb5EVQMJ6C1hNe3MVo0uns+V13WzYhsImPpwJhIIB6SoRu/EQdS9p9lsqdd
-						wCg90AYObN1BNTLPVMW5e1OsN1YNHEt8DEtNEm7FRG+5tkAj4wXQZ8pun2GtZUdi
-						dYR88kvsNpXMje5xtZg4u+6LGJxfJns9/ad6RERT7fVYCE4vNMpozuB6ByjaOmbE
-						hHwumZM7cFJtnT4HU92sPOIMnE392jEhrYpzq+mLNEqCmDwJ5kwnQwIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNsYW1sYXNoLmVkaW5hLmFjLnVrMB0GA1UdDgQWBBT6y7VG
-						2F3VKyvXjJzKhFVQg+AT5zANBgkqhkiG9w0BAQUFAAOCAQEAVJkvK0y+0nwvIvQ3
-						uI7UVmmgVpGxhAcVdid30WtLnAR+zrUUzkiLEYNm6wQuatAHie5vYrfYmxs8p/K7
-						hBeUJ9h/htCyeZpLtlP6qr//cUmrSDSOtngy088Mhn4dZKv2Hn3UHCcdtYe4cSAC
-						wbv5STfw1XddQNVMFCDuWhqWkHaYCqLuF1ExtNf4NreTTeBaLXzgBJ2WbMd3Hhzo
-						YbQr28qsBfKqUHOwiol2Lc3fnnGTMuy+tVQEkotuPX+11atM4tke4UiyQe2nt4SH
-						xaFW7FiB0FShlypmGvWvjIC6h4+oxI3D7fVMoX7MElb5+Xmy4qdTKZIXFBRSTLnt
-						fbyOPg==
-					</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://lamlash.edina.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lamlash.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Lamlash UK fed support test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ukfederation.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</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 06377180..9d3eb96f 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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sp.lat.csc.fi">
-  <md: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>
-  </md:Extensions>
+<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 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">
+      <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="en">LAT – Language Archive Tools</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">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,9 +16,13 @@
         <mdui:PrivacyStatementURL xml:lang="fi">https://lat.csc.fi/corpora/Info/Lat_Privacy_Policy.html</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://lat.csc.fi/corpora/Info/Lat_Privacy_Policy.html</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQIp6gFDuZ6VnJilIzPrnFvzANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
@@ -65,7 +59,7 @@ TE5WJb+s+lUOs3IoVL33fpbG+Aor</ds:X509Certificate>
       <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 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 Name="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>
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index 2bfb5f38..52390543 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -1,36 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.lux17.mpi.nl">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:54: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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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>
-      <idpdisc:DiscoveryResponse 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">Korpuslinguistik und Sprachdokumentation Anwendungen - lux17 (dev)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Corpus linguistics and language documentation applications - lux17 (dev)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
-        <mdui:Description xml:lang="en">Linguistic applications for researchers: Annex, IMDI Browser, Lamus, Metadata Browser.</mdui:Description>
+      <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="en">https://tla.mpi.nl/tools/tla-tools/</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>
+      <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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lux17.mpi.nl</ds:KeyName>
+    <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
@@ -49,83 +36,37 @@ iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
 DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
 GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
 MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
-HFhkY9jzkGrcHMME
-</ds:X509Certificate>
+HFhkY9jzkGrcHMME</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>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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Korpuslinguistik und Sprachdokumentation Anwendungen - lux17 (dev)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Corpus linguistics and language documentation applications - lux17 (dev)</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Sprachanwendungen für Forscher: Annex, IMDI Browser, Lamus, Metadata Browser.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Linguistic applications for researchers: Annex, IMDI Browser, Lamus, Metadata Browser.</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="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: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="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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="support">
-    <md:GivenName>Shibboleth</md:GivenName>
-    <md:SurName>Admin</md:SurName>
-    <md:EmailAddress>mailto:shibboleth@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>LAT</md:GivenName>
-    <md:SurName>Admin</md:SurName>
-    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>LAT</md:GivenName>
-    <md:SurName>Admin</md:SurName>
+    <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.moodledo.co.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.moodledo.co.uk-shibboleth.xml
deleted file mode 100644
index 57f1ca8a..00000000
--- a/swamid-interfederations-2.0/sp.moodledo.co.uk-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" entityID="https://sp.moodledo.co.uk/shibboleth">
-  <!--
-		This is a "Moodledo" Shibboleth SP for Capita Business Services Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-06-17T12:26:58Z">
-      <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://moodledo.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEMDCCAxigAwIBAgIJAKFo34oT/WkGMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKU2hyb3BzaGlyZTEQMA4GA1UEBxMHVGVsZm9yZDEb
-						MBkGA1UEChMSQ2FwaXRhIElUIFNlcnZpY2VzMRowGAYDVQQDExFzcC5tb29kbGVk
-						by5jby51azEpMCcGCSqGSIb3DQEJARYabGVvbi5zdHJpbmdlckBjYXBpdGEuY28u
-						dWswHhcNMTMwNTEwMTQzNDUwWhcNMjMwNTA4MTQzNDUwWjCBmDELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgTClNocm9wc2hpcmUxEDAOBgNVBAcTB1RlbGZvcmQxGzAZBgNV
-						BAoTEkNhcGl0YSBJVCBTZXJ2aWNlczEaMBgGA1UEAxMRc3AubW9vZGxlZG8uY28u
-						dWsxKTAnBgkqhkiG9w0BCQEWGmxlb24uc3RyaW5nZXJAY2FwaXRhLmNvLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzLCy9BYBftu1xzeN6tnaMoN0
-						9rGw0uDYUME/UTy4u+U7z0X713tkOl1vzkovtJ258OxyzJbBXTC3YH+bFckTDwtl
-						nh+o5NjzmHuqc1n+upyvAK4Yx4dc9JE6xBR7KEjaXsc4B4zRzoOMMvtrKt/J9H0K
-						tNVWVyeVSaY42yyan/upsI7soM9P8ra+Bo2MvhAIWZiIgIx9fm1+LzI+hIDoy2AA
-						MVc5EbkHhxiZxeJmzHM6dRdziaGk5X1otlIaOujBAoHzuO6tzBlAX083l/S4XkVw
-						dBEJgDXUdHv85zHIG2ZOxG/J3QaWNszT7833NeRcp3SY6cZZwcB3fsMkT5Z71QID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU4BQ5j9K8ujFcLWS01aleXlPTUcgw
-						HwYDVR0jBBgwFoAU4BQ5j9K8ujFcLWS01aleXlPTUcgwDQYJKoZIhvcNAQEFBQAD
-						ggEBACVCBEuzqfOAYQP2T0wLnYymfdqTwb8wuGC/a47+Ei7p6eS+tG/I+3wjCJY0
-						8Q5MF/7lytwu1ZSWBjPRDgdSWUcE2C0MFlsrecrW0rN3pDYbZfFtNxi07IJcKpD7
-						33Wwu4cTuaZoMF+R2jPg6r9bfGjfeLsvDIqMB7EiVI8XLi23TnwfR1fXGRAPqKlI
-						+VanMzaeUvLeG0d+DOFMj12LXFuLTTrpegsFVfcjOCkgmsGva1d0l245oUjrcjHE
-						jBqQ0Lu5E59wVNCcZjorPO2NXBgjJj1RCIGuT6t0XcUWqoc+8BquPHUnCPDxcGLI
-						Lc5jKY1m2DuiXohoI6f8rmRKggs=
-					</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>
-						MIIEMDCCAxigAwIBAgIJAKFo34oT/WkGMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKU2hyb3BzaGlyZTEQMA4GA1UEBxMHVGVsZm9yZDEb
-						MBkGA1UEChMSQ2FwaXRhIElUIFNlcnZpY2VzMRowGAYDVQQDExFzcC5tb29kbGVk
-						by5jby51azEpMCcGCSqGSIb3DQEJARYabGVvbi5zdHJpbmdlckBjYXBpdGEuY28u
-						dWswHhcNMTMwNTEwMTQzNDUwWhcNMjMwNTA4MTQzNDUwWjCBmDELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgTClNocm9wc2hpcmUxEDAOBgNVBAcTB1RlbGZvcmQxGzAZBgNV
-						BAoTEkNhcGl0YSBJVCBTZXJ2aWNlczEaMBgGA1UEAxMRc3AubW9vZGxlZG8uY28u
-						dWsxKTAnBgkqhkiG9w0BCQEWGmxlb24uc3RyaW5nZXJAY2FwaXRhLmNvLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzLCy9BYBftu1xzeN6tnaMoN0
-						9rGw0uDYUME/UTy4u+U7z0X713tkOl1vzkovtJ258OxyzJbBXTC3YH+bFckTDwtl
-						nh+o5NjzmHuqc1n+upyvAK4Yx4dc9JE6xBR7KEjaXsc4B4zRzoOMMvtrKt/J9H0K
-						tNVWVyeVSaY42yyan/upsI7soM9P8ra+Bo2MvhAIWZiIgIx9fm1+LzI+hIDoy2AA
-						MVc5EbkHhxiZxeJmzHM6dRdziaGk5X1otlIaOujBAoHzuO6tzBlAX083l/S4XkVw
-						dBEJgDXUdHv85zHIG2ZOxG/J3QaWNszT7833NeRcp3SY6cZZwcB3fsMkT5Z71QID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU4BQ5j9K8ujFcLWS01aleXlPTUcgw
-						HwYDVR0jBBgwFoAU4BQ5j9K8ujFcLWS01aleXlPTUcgwDQYJKoZIhvcNAQEFBQAD
-						ggEBACVCBEuzqfOAYQP2T0wLnYymfdqTwb8wuGC/a47+Ei7p6eS+tG/I+3wjCJY0
-						8Q5MF/7lytwu1ZSWBjPRDgdSWUcE2C0MFlsrecrW0rN3pDYbZfFtNxi07IJcKpD7
-						33Wwu4cTuaZoMF+R2jPg6r9bfGjfeLsvDIqMB7EiVI8XLi23TnwfR1fXGRAPqKlI
-						+VanMzaeUvLeG0d+DOFMj12LXFuLTTrpegsFVfcjOCkgmsGva1d0l245oUjrcjHE
-						jBqQ0Lu5E59wVNCcZjorPO2NXBgjJj1RCIGuT6t0XcUWqoc+8BquPHUnCPDxcGLI
-						Lc5jKY1m2DuiXohoI6f8rmRKggs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodledo.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodledo.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodledo.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodledo.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodledo.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodledo.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodledo.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodledo.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodledo.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://moodledo.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodledo.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodledo.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodledo.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodledo.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Capita Business Services Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Synetrix Limited: Moodledo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.synetrix.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Hillyer</SurName>
-    <EmailAddress>mailto:andrew.hillyer@capita.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Carter</SurName>
-    <EmailAddress>mailto:andy.carter2@capita.co.uk</EmailAddress>
-  </ContactPerson>
-</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 8323abce..00000000
--- a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-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://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>Support</GivenName>
-    <EmailAddress>mailto:wps-olhelp@wiley.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:wps-olhelp@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 e8774313..00000000
--- a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.onlinelibrary.wiley.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp.onlinelibrary.wiley.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.onlinelibrary.wiley.com,OU=Internet Hosting,O=John Wiley &amp; Sons\, Inc,L=Somerset,ST=New Jersey,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJjCCBA6gAwIBAgIQf8xgfHknPoBIKeZ+du1IjTANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwNzE5
-MDAwMDAwWhcNMTIwNzE4MjM1OTU5WjCBljELMAkGA1UEBhMCVVMxEzARBgNVBAgT
-Ck5ldyBKZXJzZXkxETAPBgNVBAcUCFNvbWVyc2V0MR8wHQYDVQQKFBZKb2huIFdp
-bGV5ICYgU29ucywgSW5jMRkwFwYDVQQLFBBJbnRlcm5ldCBIb3N0aW5nMSMwIQYD
-VQQDFBpzcC5vbmxpbmVsaWJyYXJ5LndpbGV5LmNvbTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEAxVwHCIeAYJhnOnIeoMa3xrO0MeHii7ewtMEVWSFIc8sUCuIH
-TBKmrZhRblxLq+IokDD/3EWinbQy8h6Y03HZs6N3rVkBjsRRzK2K6IwoScb6tIZn
-SaOZW07eLG4GGtwc2BHlYwQ2Z3TYI/9cJbujqi/Oo9Sn7HCjsQImyddtq4sCAwEA
-AaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4
-oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1
-cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIB
-FhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19RzB2
-BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWdu
-LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVyaXNp
-Z24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBW
-FglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAm
-FiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcN
-AQEFBQADggEBAF/uHCrjIt/9pk+3YuQ17YwCASb0tsVwKQcURjHQElRp7biB9Yeb
-or2frE8NIzCZxe8anzq4uiIVdy1IrnCp8fSLVunmwimfh6jc3kDQSf87wjh5Xxln
-ZpKECfnt/gcTzeaGtcBLM1pUTNTYth4r/IGfQj6g6DSZVdsWBcn7ggfJo+d1oqoI
-QzKCUsLF8DxUlfLyoWtRo4hSFKVdKb7FoqMPj+gpQ5Emu8azR17MEU61Z1XgNPN2
-3QTEer7Uhd12JTaerFnc8aebbQaWt0xnaEmwelIm50Pvoxms6gKQPRFo2M+YNZM6
-YjwnO0CxymDk6bfYSbFO6qPv00QmBphHgFw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp.onlinelibrary.wiley.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp.onlinelibrary.wiley.com,OU=Internet Hosting,O=John Wiley &amp; Sons\, Inc,L=Somerset,ST=New Jersey,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJjCCBA6gAwIBAgIQf8xgfHknPoBIKeZ+du1IjTANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwNzE5
-MDAwMDAwWhcNMTIwNzE4MjM1OTU5WjCBljELMAkGA1UEBhMCVVMxEzARBgNVBAgT
-Ck5ldyBKZXJzZXkxETAPBgNVBAcUCFNvbWVyc2V0MR8wHQYDVQQKFBZKb2huIFdp
-bGV5ICYgU29ucywgSW5jMRkwFwYDVQQLFBBJbnRlcm5ldCBIb3N0aW5nMSMwIQYD
-VQQDFBpzcC5vbmxpbmVsaWJyYXJ5LndpbGV5LmNvbTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEAxVwHCIeAYJhnOnIeoMa3xrO0MeHii7ewtMEVWSFIc8sUCuIH
-TBKmrZhRblxLq+IokDD/3EWinbQy8h6Y03HZs6N3rVkBjsRRzK2K6IwoScb6tIZn
-SaOZW07eLG4GGtwc2BHlYwQ2Z3TYI/9cJbujqi/Oo9Sn7HCjsQImyddtq4sCAwEA
-AaOCAdEwggHNMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4
-oDaGNGh0dHA6Ly9TVlJTZWN1cmUtRzItY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1
-cmVHMi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUFBwIB
-FhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBSl7wsRzsBBA6NKZZBIshzgVy19RzB2
-BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWdu
-LmNvbTBABggrBgEFBQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMi1haWEudmVyaXNp
-Z24uY29tL1NWUlNlY3VyZUcyLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBW
-FglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAm
-FiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcN
-AQEFBQADggEBAF/uHCrjIt/9pk+3YuQ17YwCASb0tsVwKQcURjHQElRp7biB9Yeb
-or2frE8NIzCZxe8anzq4uiIVdy1IrnCp8fSLVunmwimfh6jc3kDQSf87wjh5Xxln
-ZpKECfnt/gcTzeaGtcBLM1pUTNTYth4r/IGfQj6g6DSZVdsWBcn7ggfJo+d1oqoI
-QzKCUsLF8DxUlfLyoWtRo4hSFKVdKb7FoqMPj+gpQ5Emu8azR17MEU61Z1XgNPN2
-3QTEer7Uhd12JTaerFnc8aebbQaWt0xnaEmwelIm50Pvoxms6gKQPRFo2M+YNZM6
-YjwnO0CxymDk6bfYSbFO6qPv00QmBphHgFw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.onlinelibrary.wiley.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">John Wiley and Sons</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">John Wiley and Sons</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://onlinelibrary.wiley.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Sean</GivenName>
-    <SurName>Timmins</SurName>
-    <EmailAddress>stimmins@wiley.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Chris</GivenName>
-    <SurName>Potter</SurName>
-    <EmailAddress>cpotter@wiley.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.owncloud.gla.ac.uk-entity.xml b/swamid-interfederations-2.0/sp.owncloud.gla.ac.uk-entity.xml
deleted file mode 100644
index 4f29dd52..00000000
--- a/swamid-interfederations-2.0/sp.owncloud.gla.ac.uk-entity.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://sp.owncloud.gla.ac.uk/entity">
-  <!--
-		This is a "Cloud" simpleSAMLphp SP for the University of Glasgow.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-23T14:19: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: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">University of Glasgow Cloud</mdui:DisplayName>
-        <mdui:Description xml:lang="en">simpleSAMLPHP SP for federated access to Uni. Of Glasgow cloud infrastructure.</mdui:Description>
-        <mdui:Logo height="60" width="80">https://milngavie.cent.gla.ac.uk/UoG_colour_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>
-						MIIECjCCAvKgAwIBAgIJAKwtx3NdckJyMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-						VQQGEwJHQjERMA8GA1UECAwIU2NvdGxhbmQxEDAOBgNVBAcMB0dsYXNnb3cxHjAc
-						BgNVBAoMFVVuaXZlcnNpdHkgb2YgR2xhc2dvdzEUMBIGA1UECwwLSVQgU2Vydmlj
-						ZXMxGzAZBgNVBAMMEm93bmNsb3VkLmdsYS5hYy51azAeFw0xNTAyMjMxMDI5NDNa
-						Fw0yNTAyMjAxMDI5NDNaMIGFMQswCQYDVQQGEwJHQjERMA8GA1UECAwIU2NvdGxh
-						bmQxEDAOBgNVBAcMB0dsYXNnb3cxHjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgR2xh
-						c2dvdzEUMBIGA1UECwwLSVQgU2VydmljZXMxGzAZBgNVBAMMEm93bmNsb3VkLmds
-						YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPW7Jsg02GHZ
-						/E01ULgwISkQ4Qr/Rid4+bhe3TG4OH5aHcdChNRdxP55PYuIV+yy4yOYD6ZP+veE
-						PlmBw0VYl6IIQTpFVeY+j2LrxL9vdRmSfn4+qnd0xbr2hBdd5xtC0SMvxZLEzM7U
-						gGHu4LUn9WDhwRiuCSZFoEhEjVFOcV8MdnxUA3GsleMdVQaI7Hb7yR9o5cYMsXPj
-						sCCCpnH5E76O9/uNuh+0CzBJaVqxwjungiXrWz1tr/+j/dKtpf/sTdH+Tw+xj02X
-						HXCwjO8My8rPf2q5hn6+xKjsHnnIJXGHIxiYbEzESbffLzOFl8mevIQLQWxDz8L1
-						Khwjk85sw18CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
-						blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFPz/VTu8R3dicZ/o
-						TV75yyBGAgSvMB8GA1UdIwQYMBaAFPz/VTu8R3dicZ/oTV75yyBGAgSvMA0GCSqG
-						SIb3DQEBCwUAA4IBAQAElnHrdy1FhRqY0gV7Ml2+QUdaI/o3Z2SAlDlKhk9dlOsw
-						dzyizx/wdXksEgBk/oqXglL5LgsvbPITtx8VfTbxZ9azdvD2ke+rc5I4vuzlHu/R
-						Y7l8W96uek7tSYpHJElPPOkktXJuPH1e4e58loyeLFBTmYHgvTSxbY8/+L21M2DB
-						W4Xvn7yK6tXwYACCGw3h0dVy62OoQHGef8uxeiJJAuQQ9Bu6VMsUWTsgpZ14h0Qh
-						4Ucenlt3BaKnK3VatoEjN/qo99xeWuIfjj9YWRKpuPV4k95VuK9ye9bfBmpEjpqu
-						8JmOVu1HXJd97u281HNmTHuDPFEHCPMK/qYtDP4Y
-					</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>
-						MIIECjCCAvKgAwIBAgIJAKwtx3NdckJyMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
-						VQQGEwJHQjERMA8GA1UECAwIU2NvdGxhbmQxEDAOBgNVBAcMB0dsYXNnb3cxHjAc
-						BgNVBAoMFVVuaXZlcnNpdHkgb2YgR2xhc2dvdzEUMBIGA1UECwwLSVQgU2Vydmlj
-						ZXMxGzAZBgNVBAMMEm93bmNsb3VkLmdsYS5hYy51azAeFw0xNTAyMjMxMDI5NDNa
-						Fw0yNTAyMjAxMDI5NDNaMIGFMQswCQYDVQQGEwJHQjERMA8GA1UECAwIU2NvdGxh
-						bmQxEDAOBgNVBAcMB0dsYXNnb3cxHjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgR2xh
-						c2dvdzEUMBIGA1UECwwLSVQgU2VydmljZXMxGzAZBgNVBAMMEm93bmNsb3VkLmds
-						YS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPW7Jsg02GHZ
-						/E01ULgwISkQ4Qr/Rid4+bhe3TG4OH5aHcdChNRdxP55PYuIV+yy4yOYD6ZP+veE
-						PlmBw0VYl6IIQTpFVeY+j2LrxL9vdRmSfn4+qnd0xbr2hBdd5xtC0SMvxZLEzM7U
-						gGHu4LUn9WDhwRiuCSZFoEhEjVFOcV8MdnxUA3GsleMdVQaI7Hb7yR9o5cYMsXPj
-						sCCCpnH5E76O9/uNuh+0CzBJaVqxwjungiXrWz1tr/+j/dKtpf/sTdH+Tw+xj02X
-						HXCwjO8My8rPf2q5hn6+xKjsHnnIJXGHIxiYbEzESbffLzOFl8mevIQLQWxDz8L1
-						Khwjk85sw18CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
-						blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFPz/VTu8R3dicZ/o
-						TV75yyBGAgSvMB8GA1UdIwQYMBaAFPz/VTu8R3dicZ/oTV75yyBGAgSvMA0GCSqG
-						SIb3DQEBCwUAA4IBAQAElnHrdy1FhRqY0gV7Ml2+QUdaI/o3Z2SAlDlKhk9dlOsw
-						dzyizx/wdXksEgBk/oqXglL5LgsvbPITtx8VfTbxZ9azdvD2ke+rc5I4vuzlHu/R
-						Y7l8W96uek7tSYpHJElPPOkktXJuPH1e4e58loyeLFBTmYHgvTSxbY8/+L21M2DB
-						W4Xvn7yK6tXwYACCGw3h0dVy62OoQHGef8uxeiJJAuQQ9Bu6VMsUWTsgpZ14h0Qh
-						4Ucenlt3BaKnK3VatoEjN/qo99xeWuIfjj9YWRKpuPV4k95VuK9ye9bfBmpEjpqu
-						8JmOVu1HXJd97u281HNmTHuDPFEHCPMK/qYtDP4Y
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud.gla.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Glasgow</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Glasgow Cloud</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gla.ac.uk/</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/sp.primaryblogger.co.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.primaryblogger.co.uk-shibboleth.xml
deleted file mode 100644
index 39ac2814..00000000
--- a/swamid-interfederations-2.0/sp.primaryblogger.co.uk-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://sp.primaryblogger.co.uk/shibboleth">
-  <!--
-		This is a Primary Blogger Shibboleth 2.3 SP for Primary Technology.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://shib.primaryblogger.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAOZHOEMKBHC2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wOTExMDgyMzUxNThaFw0xOTEx
-						MDYyMzUxNThaMCAxHjAcBgNVBAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgEkbr2RKR4I0utlNh/vw1jX7p0
-						i7kqSW+nn6yL0AkkoTCheUI7wG+g0tr85EI8NJDgjn32VTuwKuvZfG8Glq6egaN3
-						gYTrZobvMpeGE5EdkFDRqGdecxjaNoVnVJypPo2h6WYiID7AvHb2+HWMcwa4sboH
-						ROg+xUA9WEuD0NHXiNgM7Olq41GDGnfkpra3xIQyuTdqi8m4BeKx0C37twr7cuEf
-						dDUI/obOQXGKMaq7o0vEIRIzQAVkiYdwHhT0QCZ9iy8TdNzLymGHqqwWUql3kADh
-						d4JF159CUg4DfC+nOOsyrBrALcKQrnvPG/m9co8RXE1uUjdU/3Eu/KcM0wUCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVbG9jYWxob3N0LmxvY2FsZG9tYWluMB0GA1UdDgQW
-						BBRocwEiryFGPISri/h1VtntIAhbuzANBgkqhkiG9w0BAQUFAAOCAQEAebIJkE/j
-						XykPygSsAdZVXKw/udtaFkWOnTQCjfUpJClLnuTwTSwd4n5yp+YbQ5OK3i9TsziF
-						vIF8Ef6Lu7CBDEgKqQbQaiRSPSGV83eCcQ3dPMz3Y7e0b1N5VJZ2+PdOvU0G62ti
-						P40Lq5ggDCKejJNh/G/3cZ13ycwUZ7e5tqS0dcCKqBNvDLbYEGa9jjClclFOyDv8
-						3fDaIHNHpBeXqtP3TOkAAkdBLQrdvuA2DOYl1fNLMFFKKP8ARt9zTwNCEyLuzSmG
-						+gFtPl/xOz4ha0mucdRHuztOM32CHnYO8dv4s6hr0hWVu5rt+msf4UN1lgNd3lVf
-						LzHzZem0YfRmWw==
-					</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>
-						MIIDBjCCAe6gAwIBAgIJAOZHOEMKBHC2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wOTExMDgyMzUxNThaFw0xOTEx
-						MDYyMzUxNThaMCAxHjAcBgNVBAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANgEkbr2RKR4I0utlNh/vw1jX7p0
-						i7kqSW+nn6yL0AkkoTCheUI7wG+g0tr85EI8NJDgjn32VTuwKuvZfG8Glq6egaN3
-						gYTrZobvMpeGE5EdkFDRqGdecxjaNoVnVJypPo2h6WYiID7AvHb2+HWMcwa4sboH
-						ROg+xUA9WEuD0NHXiNgM7Olq41GDGnfkpra3xIQyuTdqi8m4BeKx0C37twr7cuEf
-						dDUI/obOQXGKMaq7o0vEIRIzQAVkiYdwHhT0QCZ9iy8TdNzLymGHqqwWUql3kADh
-						d4JF159CUg4DfC+nOOsyrBrALcKQrnvPG/m9co8RXE1uUjdU/3Eu/KcM0wUCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVbG9jYWxob3N0LmxvY2FsZG9tYWluMB0GA1UdDgQW
-						BBRocwEiryFGPISri/h1VtntIAhbuzANBgkqhkiG9w0BAQUFAAOCAQEAebIJkE/j
-						XykPygSsAdZVXKw/udtaFkWOnTQCjfUpJClLnuTwTSwd4n5yp+YbQ5OK3i9TsziF
-						vIF8Ef6Lu7CBDEgKqQbQaiRSPSGV83eCcQ3dPMz3Y7e0b1N5VJZ2+PdOvU0G62ti
-						P40Lq5ggDCKejJNh/G/3cZ13ycwUZ7e5tqS0dcCKqBNvDLbYEGa9jjClclFOyDv8
-						3fDaIHNHpBeXqtP3TOkAAkdBLQrdvuA2DOYl1fNLMFFKKP8ARt9zTwNCEyLuzSmG
-						+gFtPl/xOz4ha0mucdRHuztOM32CHnYO8dv4s6hr0hWVu5rt+msf4UN1lgNd3lVf
-						LzHzZem0YfRmWw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.primaryblogger.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Primary Technology Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Primary Technology Limited: Primary Blogger</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.primaryt.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>McLear</SurName>
-    <EmailAddress>mailto:john@mclear.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>McLear</SurName>
-    <EmailAddress>mailto:john@mclear.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.primarylogon.co.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.primarylogon.co.uk-shibboleth.xml
deleted file mode 100644
index 103c56d6..00000000
--- a/swamid-interfederations-2.0/sp.primarylogon.co.uk-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://sp.primarylogon.co.uk/shibboleth">
-  <!--
-		This is a Primary Logon Shibboleth 2.3 SP for Primary Technology.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://shib.primarylogon.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAJEKbmu/vCH3MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wOTExMDcwNDU0NDBaFw0xOTEx
-						MDUwNDU0NDBaMCAxHjAcBgNVBAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7lMkqj6Sxq7AexnModmAyRAUTx
-						YHjriZnM6f7X8+QI8VYMXxvSHtA7HGmihqtSN/1A1Y0KuCF0Qs3nD5mrc6MT7bo9
-						yKOgy5lYMV3gAdTxWj8EwKxdfdVNXM/AuqE0zPNtft56Owx0OkCUIBAabcTFVn5p
-						TdTa8d8KaxFmHQFnsrFKMm2EcXJrJMU3uBvlOLeAn5Wv88prnghIwMz81VZ9NXPC
-						aG4BYUNPXKgFbzAScFj8DVftSanhN9CPCEO2LhQl7u9O0DVEA95iyTabEG1eJyoY
-						yZEsvRbeliHAaAZWzaw8d/7T9D72MqVYYVkbshHGs1MYnxSdRC1ANSu/utUCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVbG9jYWxob3N0LmxvY2FsZG9tYWluMB0GA1UdDgQW
-						BBSQ00uRX/jErFhgECxBXIKkX9nOZTANBgkqhkiG9w0BAQUFAAOCAQEAwzhPMTAw
-						7+kNYCssU8JOywDnM90RKKEa1Te+WaknFIWTz+m7hGeCWnjtyMugcszVp+CEwOqb
-						/LfOGM0ShQR6obvcM5VlH/xiHKehNVllQeuTWYujv9jdruO/Wr2sBA/y8aREczkF
-						OQzugXsXyhPY4m++zmEBuACnEXzc3Ew/hBCWvyU3aKKOHcC/RTipEO7Ouh87CTpd
-						/TDfAurDdKg6puGSzPyDVwiwFd6LBghyvs4+/aN4Stz0Y4KzUpBLCQ6wOgXbiZr3
-						XJd0Lv5uSEgCMCJLNmufrXzG8Ygi4fCiOlWFIcFhWkWqNwd+ZTds6K04wdYGL3bA
-						uNL0cvubK2qd7Q==
-					</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>
-						MIIDBjCCAe6gAwIBAgIJAJEKbmu/vCH3MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjAeFw0wOTExMDcwNDU0NDBaFw0xOTEx
-						MDUwNDU0NDBaMCAxHjAcBgNVBAMTFWxvY2FsaG9zdC5sb2NhbGRvbWFpbjCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN7lMkqj6Sxq7AexnModmAyRAUTx
-						YHjriZnM6f7X8+QI8VYMXxvSHtA7HGmihqtSN/1A1Y0KuCF0Qs3nD5mrc6MT7bo9
-						yKOgy5lYMV3gAdTxWj8EwKxdfdVNXM/AuqE0zPNtft56Owx0OkCUIBAabcTFVn5p
-						TdTa8d8KaxFmHQFnsrFKMm2EcXJrJMU3uBvlOLeAn5Wv88prnghIwMz81VZ9NXPC
-						aG4BYUNPXKgFbzAScFj8DVftSanhN9CPCEO2LhQl7u9O0DVEA95iyTabEG1eJyoY
-						yZEsvRbeliHAaAZWzaw8d/7T9D72MqVYYVkbshHGs1MYnxSdRC1ANSu/utUCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVbG9jYWxob3N0LmxvY2FsZG9tYWluMB0GA1UdDgQW
-						BBSQ00uRX/jErFhgECxBXIKkX9nOZTANBgkqhkiG9w0BAQUFAAOCAQEAwzhPMTAw
-						7+kNYCssU8JOywDnM90RKKEa1Te+WaknFIWTz+m7hGeCWnjtyMugcszVp+CEwOqb
-						/LfOGM0ShQR6obvcM5VlH/xiHKehNVllQeuTWYujv9jdruO/Wr2sBA/y8aREczkF
-						OQzugXsXyhPY4m++zmEBuACnEXzc3Ew/hBCWvyU3aKKOHcC/RTipEO7Ouh87CTpd
-						/TDfAurDdKg6puGSzPyDVwiwFd6LBghyvs4+/aN4Stz0Y4KzUpBLCQ6wOgXbiZr3
-						XJd0Lv5uSEgCMCJLNmufrXzG8Ygi4fCiOlWFIcFhWkWqNwd+ZTds6K04wdYGL3bA
-						uNL0cvubK2qd7Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.primarylogon.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Primary Technology Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Primary Technology Limited: Primary Logon</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.primaryt.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>McLear</SurName>
-    <EmailAddress>mailto:john@mclear.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>McLear</SurName>
-    <EmailAddress>mailto:john@mclear.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.refme.com-shibboleth.xml b/swamid-interfederations-2.0/sp.refme.com-shibboleth.xml
deleted file mode 100644
index 139ee6df..00000000
--- a/swamid-interfederations-2.0/sp.refme.com-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://sp.refme.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for RefME Ltd.
-	-->
-  <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="2016-02-08T09:57:02Z">
-      <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://sp.refme.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://sp.refme.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">RefME</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Accurate, automated citations in over 7,500 styles. The leading smart reference management tool</mdui:Description>
-        <mdui:Logo height="70" width="220">https://sp.refme.com/shibboleth-sp/refme.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6zCCAdOgAwIBAgIJAKDqrd6tuFRoMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-						BAMTDHNwLnJlZm1lLmNvbTAeFw0xNjAyMDMxNDUyMDJaFw0yNjAxMzExNDUyMDJa
-						MBcxFTATBgNVBAMTDHNwLnJlZm1lLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAMNcP5n7JK1LY87i9pjKexZO8tqoHIw62CIktYuS2PVGdVaPGJNJ
-						DCqqjrUW7CkiCUVccax7LO9Kew6wqQmsTesa4BaGjqvKQaxzXi9dIKJTD3jlg9Xk
-						d1CwbSoeCsVErnHwcnUXWxkCMUmwHYr/MJNftRiWC6ItZ2Qs7yPGLSCTK7HFk9QX
-						BH38Zlt+fotMOQeo5G1oTGUV9Jdet4VOl6X6QcEzr7csfijLNYFUzJHVTXa/BR1j
-						CVGahNMP2sXpLfqWNrricLGa4/hlcrYqRXyy49/qkaHqzBeiLl0GH8MJ4QpwFg2f
-						IsBQCZW6DBdYH3PbzkkccBjxEOVxJOpw3LMCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-						c3AucmVmbWUuY29tMB0GA1UdDgQWBBQL3DBAVitR/K57X+BYz8SK2TsYWDANBgkq
-						hkiG9w0BAQUFAAOCAQEAIMtgvxnFgS0js/FT3mSo1wH6MCLRjvrxORHqETaEeFCV
-						clc/cUyzpNF6QGoX7TY0iam2Hfu4khJAIv7Bzn2ZnDxMqAxhJlkFjCok7wyH91Ed
-						jkiKLd2hySBXk7f3dTpml1Pm2WFtj70ci/edGXR+3u6cquZvavZMhC8xIGN38fE5
-						qflluoHekq3i8vnTA8sDz5+OYGPuNv4uswc7QXgmZWI01dIhOKPBeD7M0aVULs3n
-						6wBdaSG/rj+CjUHXTvjop42zY53H4daC0afDALEK3B9g2OpeDVOTsZwCMTI7gZHW
-						xtvfwBO3xVnetZqHnVDunjMewZwlU0/UVpfUmhGi/g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.refme.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.refme.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.refme.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.refme.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.refme.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.refme.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.refme.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.refme.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.refme.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.refme.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.refme.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">RefME</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"/>
-      <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">RefME Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RefME</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.refme.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support contact</GivenName>
-    <EmailAddress>mailto:hello@refme.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical contact</GivenName>
-    <EmailAddress>mailto:productivity@refme.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.sae.org-shibboleth.xml b/swamid-interfederations-2.0/sp.sae.org-shibboleth.xml
deleted file mode 100644
index f2dece25..00000000
--- a/swamid-interfederations-2.0/sp.sae.org-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://sp.sae.org/shibboleth">
-  <!--
-		This is a "SAE Digital Library" Shibboleth SP for SAE International.
-	-->
-  <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="2014-05-14T09:58:53Z">
-      <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>
-      <init: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.sae.org/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SAE Digital Library</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Subscription-based access to aerospace and automotive technical information from SAE International</mdui:Description>
-        <mdui:Logo height="67" width="106">https://www.sae.org/images/design13/sae-international.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC5TCCAc2gAwIBAgIJAMzQRYYPKgNmMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-						BAMTCnNwLnNhZS5vcmcwHhcNMTQwNTA4MTg1ODAyWhcNMjQwNTA1MTg1ODAyWjAV
-						MRMwEQYDVQQDEwpzcC5zYWUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAwFM+ZGsgDIBo8K5978MlaXxqFBHhNVp1EcI9irg627zjSQxc58G4U1H2
-						3kvm4ku04jon3/4jBtfmBTZOtWbdOjTKcbEgwmINlH2Jauy3S2M4XmxM3Q5PU412
-						LKe6zZE7jpjJ1lRzHDKtFyujKoIUAiGYjuCJN+XxQJIdIci7mwpnrIJeu+bbbDfX
-						gGjUHQnVXI/OOxb+lfzp/dc6feYQL/RGammPm+sZpsIjtSBuNQkTlJZOZylFMtqb
-						O/IoQuMEiRmqb2OAAv+ePnQf7lnS14sLu4nhXrBgCEn1K+Lql/Vkk3I1NKQRDGwA
-						8TkLBm8tQRBZNtLMWatCJZ3b9MIrEwIDAQABozgwNjAVBgNVHREEDjAMggpzcC5z
-						YWUub3JnMB0GA1UdDgQWBBRZD8PzLLNGYvb95Q+GmvZonJ73fzANBgkqhkiG9w0B
-						AQUFAAOCAQEACkDp1AnogySx14XbKgPuD4L1II4SOiNZZIPtzpTY+oKJYBI/ftRY
-						jO1WDh0kG9vr/OUCVPCrJ5Dzf8Vq2VgBkYbkJHt15bkYRb0RTOl3CQEH14gLXpbf
-						yhY+SiW+b9UpRYfYX5r9zE78Ksb4yNLVztvrs+KtfLO6D6lZzVMTVHeGt4neg6XG
-						Mfac7z4zH4mgPgRDdM9yZU21CjuCGmHqVKYQhz27rUhkxn/LTEYANpKYlULAKk/N
-						zc920LYEc7WudUXMp8/0+q0f20iPBWRETgybUmCEQE6yabF3wuQ0QMpBW2f71dzP
-						qUpkwubpN3QS7q9U8Emmulh/zSie3zkeBQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.sae.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.sae.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.sae.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.sae.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.sae.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.sae.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.sae.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.sae.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.sae.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SAE International</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SAE Digital Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sae.org/about/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>HelpDesk</GivenName>
-    <EmailAddress>mailto:eptech@sae.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jim</GivenName>
-    <SurName>Yauger</SurName>
-    <EmailAddress>mailto:jyauger@sae.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.schoolspeoplenet.nsix.org.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.schoolspeoplenet.nsix.org.uk-shibboleth.xml
deleted file mode 100644
index 96c4b583..00000000
--- a/swamid-interfederations-2.0/sp.schoolspeoplenet.nsix.org.uk-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://sp.schoolspeoplenet.nsix.org.uk/shibboleth">
-  <!--
-		This is a "Norfolk Schools Peoplenet" Shibboleth SP for Norfolk County Council.
-	-->
-  <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="2014-01-09T10:29:04Z">
-      <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://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAN5YKsPXDSWGMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGG5jY3ZtcnAwOC5ub3Jmb2xrLmdvdi51azAeFw0xNDAxMDkwOTI3MzhaFw0y
-						NDAxMDcwOTI3MzhaMCMxITAfBgNVBAMTGG5jY3ZtcnAwOC5ub3Jmb2xrLmdvdi51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKY8JugWRi8mTZVkCiD0
-						HBPw7+uorNwt6pOfIvtRqs7TJyNYjbKaE5dM/ZSuiD0Zv+YSuOGmZJClcRbX5w5S
-						58qNXjqQKSj5FrSxOmlGq0SGcmNVai1fedaMSrUIgJzoGEKwmpGw1+TL7m22h1nZ
-						lYl2p47/8hSXixdYYwLH0XpPzLrqQzvj3TRGQOVHYhnUJcDR2gUzmPqXAaKDEd5d
-						neeV/s3eko9kJWRpGsXG+epPzrYtakHhireRsoaka+t20T3biRLa4IT9OqQzT4OJ
-						Xn4ae/LvJ9NLORVDKTgPKxp0shN0OLvOmWKCZIyb2I2dp9JyXVXDdCC4rJXZi23S
-						HbMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYbmNjdm1ycDA4Lm5vcmZvbGsuZ292LnVr
-						MB0GA1UdDgQWBBSPEDbgPGg9G0Jm+54R4+UEvh/UrzANBgkqhkiG9w0BAQUFAAOC
-						AQEADudrAdcCD/UWqwvZ7+wL+RUK3E5YCIqwLOYVa80vMtR+PzBpHALoAj6cCm60
-						t05dwf4wbPYnJaHoTF/m0Lp/Upwx4UWn8eATlg9Ao6Crkblv3z4gkzd744Cxc9Jr
-						gOEHnn+YomA2pEe91rWT/vWapAlveMKdbXLw7eYmUfXeC0w2fQ6elnfhLSpUJXCR
-						4DTDyww2YdMVDdkW+8e520LdkXROLEyzZjRWJ8ltXFMGqIr7/ulkOh4M6CoMgSO5
-						V1RkCcDHXv9gSHsR4sLFl7ihWLiy8cwYh2ZrV+WfrVMPq+apGUNvw/2rr8LGZ7GI
-						WRa4qcbZKMNcIe2284SSyOXXLA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.schoolspeoplenet.nsix.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Norfolk County Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Norfolk Schools Peoplenet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.norfolk.gov.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>School Apps Team</GivenName>
-    <EmailAddress>mailto:schoolapps@norfolk.gov.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>School Apps Team</GivenName>
-    <EmailAddress>mailto:schoolapps@norfolk.gov.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-accp-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-accp-development-shibboleth.xml
deleted file mode 100644
index fd39b656..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-accp-development-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://sp.silverchair.com/accp/development/shibboleth">
-  <!--
-		This is a Development: American College of Chest Physicians Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T08:24:40Z"/>
-  </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://accpdev.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAOnxeyETHXm1MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjA2MDUxNzU2NDNaFw0yMjA2MDMxNzU2
-						NDNaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBALL55DRPN6W6LC899+Z4S/wvZop4jMfn+8fyeuWrU4HO
-						KVLk0zt8oG8KNff1eaU0SUshqbNDrotvDFrF67/CUvxTiju3TBAwCU9+1+ui9hG3
-						RrB09ScBsMnODAIDEAPtPYXg5q2FDFRnO1mgT0/Kys4jlIujsYtPhVs+cMQl5mt6
-						ANH14RiICRPnuQM5xcsXe284Ry40E8vi5/yJcozV3DaRjnE17f9mAEsbWOB7kUDc
-						9frQKlNH2x7CIjnku9FvjkqRyoGJKtdVoSP0Yh6RXuDwsjS9cXEodTkC5bwB2SLt
-						WD1vMUuwwB7DqPOn21WxHZ+gM86ASHwVQp+rvyVkKQ0CAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPc2lzd2ViMS5zc2MuaW50MB0GA1UdDgQWBBTus065XW0fl57GPIa3yPRk
-						3Y2igTANBgkqhkiG9w0BAQUFAAOCAQEAr5XZgVon2nogF3UL6P5b9kVURyaUQkK/
-						2gITgZPyfSzPbcsaXptatkJY3l2Z3Au/gTbttZwFs6kr+B6q6OuNG4H9zyqxPZS4
-						zlC2bag5nJ1CkLd2yRiMGp5o1s0lFLeHmhjtPJfLYOayXad/tMxaC+/dzlkOTgrc
-						IYejATqDiN2j2OBZrExvo4VBaMVQK/xhIb8PiQZVPnTabOR0M6A4XKQUziCwvQ2M
-						aaNBHcUL8keqOTY8ysUEOR6KX85YvoGmqrqiCQqJHRPBQgoOuMgGK5iHg97hFk9g
-						G7EPjuEL78uppkzFBJ0XRmOQ4YBUzYxYqxmwYElCO+/9bP+ETGAXBQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accpdev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accpdev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accpdev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accpdev.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accpdev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accpdev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Development: American College of Chest Physicians</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://accpdev.silverchair.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Josh</GivenName>
-    <SurName>Laseter</SurName>
-    <EmailAddress>mailto:jlaseter@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-accp-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-accp-production-shibboleth.xml
deleted file mode 100644
index eed5d7fe..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-accp-production-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://sp.silverchair.com/accp/production/shibboleth">
-  <!--
-		This is a "Production: American College of Chest Physicians Shibboleth" SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2012-07-03T09:21:14Z">
-      <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://publications.chestnet.org/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAM6qfAoL8z8tMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmludDAeFw0xMjA2MjYxNzQ2NDhaFw0y
-						MjA2MjQxNzQ2NDhaMCMxITAfBgNVBAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmlu
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9CZk4YB3WUKTLvuW+B
-						cm42hphwMqoPawLn39vfw2PHuSOBKHuXLb8+h1Gnoq6WUID6cJuGmhPQ2Dal6byB
-						bsyW7psjPTC0RO3CL7kbTcZ6x0ieqp/HJjy9bpGnM7Uph0+vVfSqBVlLVaa2ztKB
-						+Q88LYalVV9qmPZ0a1+gZzzol6cnOMachgPujO5KC3KnWSBXuYKLJYyorPspHjvU
-						3E+oq5f2xd90SnH/TlX3PhODQRvqN/lCSh6hc9DqAIyqsr7uCe/80LKOdCfxeHKp
-						/Anv5CWl9CjMWg7A9UfF8OIV/vOgdZMTGTrp5jDuBc6joskvHwRcAjdTqEBRkjOG
-						VWsCAwEAAaNGMEQwIwYDVR0RBBwwGoIYc2NtNi1kNXB2bS13ZWIxLnNjc2wuaW50
-						MB0GA1UdDgQWBBTHG4J30/NZerp0VtZHwb1PCtCQdzANBgkqhkiG9w0BAQUFAAOC
-						AQEAdRr2MgwHUOwdeYeEHdsn9kK6kQp5tapHtsrLymJ/lMqIekac7sBcHqrSm7s4
-						MZFAQDL+kpipMslm40+Q6V/bM17nWp8FL1S8ujRED64NkTl2ianVOAbpTHQTCNds
-						Q0T7rHJH0o4B/RzjOOP7gfXd4BKaT7FnKzDlhvWc6NhBNotWdr/RUXvrU88eiHCd
-						QSF1TwC8AJQUu7iTXalcg3ETu7qMIE/yRp/DLd29kztdVPLkjpPaxqzW5tYAU9Wr
-						Dme3Upx+SwBPhVrpKbIfsHldCI9J0bRn99npxaboQO+IQiQDt6/VckxpoA8KHPJT
-						f2uosMUQ4B+r8+Je/nia0So1Zg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://publications.chestnet.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://publications.chestnet.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://publications.chestnet.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://publications.chestnet.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publications.chestnet.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://publications.chestnet.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://publications.chestnet.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://publications.chestnet.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Production: American College of Chest Physicians</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://publications.chestnet.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Josh</GivenName>
-    <SurName>Laseter</SurName>
-    <EmailAddress>mailto:jlaseter@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-accp-qa-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-accp-qa-shibboleth.xml
deleted file mode 100644
index 6887125e..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-accp-qa-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://sp.silverchair.com/accp/qa/shibboleth">
-  <!--
-		This is a QA: American College of Chest Physicians Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-12T14:30:05Z"/>
-  </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://accpqa.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIJAMSQAnn0pgeRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmFjY3BxYS5zaWx2ZXJjaGFpci5jb20wHhcNMTIwOTEwMTQ1NjUxWhcNMTcw
-						OTA5MTQ1NjUxWjAhMR8wHQYDVQQDExZhY2NwcWEuc2lsdmVyY2hhaXIuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxZl4R9l1SS4hPAUlQuAVpW4M
-						p5PkbMvIPjiUSlz2FRTuenQlqe2wj+pM0UvM/V/gTO7+ntoEl4SeCZHrcGXLgDJu
-						e4r1RRQlrbQPHO9Ve03rpSTHpaDf3qkL01bCecr6ykHg9TMeOWxTY3qgwPqtsiCa
-						kfKB+sJtLFbsQ/nWwxVTqJauz2TA4HIyHsbDIhXV8aRVWtVhPzfd1+/JnEeNUtWm
-						plg5iOrqOmvoR6SQ0DQaMSIGntxvCpnMd3Abl/4EiV/6f1J8YD9SdfpfOyPp5vRq
-						dBV5OHEcBfqPrPKBzy8xenCVEycOS4uw272sZhqwLVgKbyTM4PKu02G3aLeO3QID
-						AQABo3MwcTBQBgNVHREESTBHghZhY2NwcWEuc2lsdmVyY2hhaXIuY29thi1odHRw
-						czovL3NwLnNpbHZlcmNoYWlyLmNvbS9hY2NwL3FhL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFOakAFHnBCHBmItiTPD/b02+9LYZMA0GCSqGSIb3DQEBBQUAA4IBAQC0nnWZ
-						NJSzLUIRSw/HDu9AGLo+eL9TaTq1WihsiFKnHfzLoifIUsxTpPFr7YXkA5E1KXXp
-						M7oTK/CclJlYIyT4JaUbtkrvAeTUnmgPbUNbhMFwPreiZxdpUCu5DA1ZHigpNEAM
-						njgVQ3ZdcDNSKNMtUf97LJnEJ+vaRA0AixdGEzuPJMEooNeVvBcje+wnE7FDS/iW
-						sA9dTGf+pnvdG9G13kS6IKKKgtZOt69tbjc7+QEcC4D7L0hpaKqNXpDR/7/rwIPp
-						Gq1fJzvfn7PdQNLr7csb3PiECWhvFWwPk2KGVzq74VRuxyHASWZ+AXyvTpltB8a1
-						4KgBBHMxs84w4ffM
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accpqa.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accpqa.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accpqa.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accpqa.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accpqa.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accpqa.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair QA: American College of Chest Physicians</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://publications.chestnet.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Josh</GivenName>
-    <SurName>Laseter</SurName>
-    <EmailAddress>mailto:jlaseter@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-accp-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-accp-staging-shibboleth.xml
deleted file mode 100644
index 2be79250..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-accp-staging-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://sp.silverchair.com/accp/staging/shibboleth">
-  <!--
-		This is a Shibboleth "Silverchair Staging: Chest Publications" SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2012-06-18T14:48:07Z">
-      <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://accprc.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAIgwGFzp7TWjMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmFjY3ByYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNjEwMTg0NjE5WhcNMjUw
-						NjA3MTg0NjE5WjAhMR8wHQYDVQQDExZhY2NwcmMuc2lsdmVyY2hhaXIuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklyQaxRYKzdEhY1PVEjB5rc/
-						6qMi56X0dJS2bTzUpcLWwGlvz1wLXRvL/zjB/jRIu9q+l+r+D3JERMIvZzkwo07T
-						Zro/8ztmWSYjkahT3CHgcIb3AGbHW+dmhfbYD83jxxF3m/2MWSxL2dlGudXnSafg
-						7alQ6YegRMFcgZtRb2J/tdtEmpHLTDxObReg8SX5/9TBziJttdfxw50gqk5yqX5L
-						Z2Of/XeVdFiJuyLdBYVvuEYKOA1kyuIYdQ0sM9p/4PyAeR+Gtalthii48AWAOM9s
-						IeO3dJm9J/KYoi0xCfygdKKSK7iNefMWznmrB2Rz880Aj0BkroyIYT3KbPWC6wID
-						AQABo0QwQjAhBgNVHREEGjAYghZhY2NwcmMuc2lsdmVyY2hhaXIuY29tMB0GA1Ud
-						DgQWBBTESYuwQWxtO/SstsiPsctYRKn9gDANBgkqhkiG9w0BAQUFAAOCAQEACAbj
-						IqXabK0hoKQlSvfS3D6uLy8aahEcfuUSd5NXcdfdzpC4bZ2TMxTl32/6D7k0VgdE
-						iNNzMbFcrElUGbD172qS2758YP0CtM59bMxFFQb53Z4YmWCEhTHaSp/VB03WomrC
-						Q5oxsgvrNZKxaa7tYaZp8KhmSo0FZU5tVoCyTs8dzIu88PRaMUyjS2OYZj+ScNCv
-						8zsvsQ8KNuTsQbAtnVZNdrrBCFwiBMNRoh3XE6AMX659IRZfGcEZS0RcH269NPLs
-						JVHIKx9avGRJlYdd81XdQ9UAaGEhx1BWYRWSDmWWNnjU6O4l78SmQLikwPsLj5dP
-						KJuHiHhmS7Pxi9kfyw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://accprc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://accprc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://accprc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accprc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accprc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://accprc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Staging: Chest Publications</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://books.publications.chestnet.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:technicaloperations@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Operations</GivenName>
-    <EmailAddress>mailto:technicaloperations@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-aclands-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-aclands-development-shibboleth.xml
deleted file mode 100644
index 0166b85e..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-aclands-development-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.silverchair.com/aclands/development/shibboleth">
-  <!--
-		This is a "Development:  Wolters Kluwer Acland’s Video Atlas Of Human Anatomy" SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2015-04-06T10:19: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 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://aclandanatomy.dev.ssc.int/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIJAPiUPVz43aH0MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWFjbGFuZGFuYXRvbXkuZGV2LnNzYy5pbnQwHhcNMTUwNDAyMTI1ODM5WhcN
-						MjAwMzMxMTI1ODM5WjAkMSIwIAYDVQQDExlhY2xhbmRhbmF0b215LmRldi5zc2Mu
-						aW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2qxSmkeHJoz2k4zg
-						bnAItKs662PzazOCOsSrkedq/f4Kmhd6SJJAVRSWxQkurUt5ANIeQ0le/CX0REQn
-						TsmRAscmRF0g/6+Acr0p9Bvip9GyZkOLSlmkNUMGsJeYhBmSq547ji+17dKGu2hG
-						8xaV0t0Q6smJxM77o91vE7kv8WpgRVm7tpGDAlOsvB/ITlTyY/BfDLQxc0wnZv6S
-						+1+sk1HIokVIO20/cvJvPMdj+oRZtK5hfF9HNgqv47zx+MFj52gZdWgzjnaBaaGV
-						PUcM3pYOydxIOk/QrU41biyR+yHHueZVptajTUDRY38qCx49nezcqDU+MyX5mmAy
-						jXkzXwIDAQABo4GDMIGAMF8GA1UdEQRYMFaCGWFjbGFuZGFuYXRvbXkuZGV2LnNz
-						Yy5pbnSGOWh0dHBzOi8vc3Auc2lsdmVyY2hhaXIuY29tL2FjbGFuZHMvZGV2ZWxv
-						cG1lbnQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUgNo5p0TSiFSvG7d0kjAbcVeioTAw
-						DQYJKoZIhvcNAQEFBQADggEBABxIQJrSaQBE/xhhcl9EiRU115GVOYwsxebMMi99
-						Tl0HpWEUZkCJxZDaCCVj1GZxt47gE5X+4wIFNk0uXTTe3lt0ATVn9eWc6hOQTKuJ
-						70gJ0Q7yYSEroptEwJl11bKAPFgTWKBdXpFrN3oBiW1Bs7OqXaj5zKAHLMQkI+yk
-						tvOmd1sK17cq+6jSZK0tFBxDH2FsU+sibdy4NL9uT/MwFj3JEAMfjHtXc5V+AL9m
-						R/+Zzl32L5W3B0jhx9NhNi0e3GpADQwolOiU3fis+kYnNV2BoQpXJ078buJwaczY
-						1QeyT+fSedIs7gT7TBwwU/irCCxBkbTkg3ejO/rbnrlIGDw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://aclandanatomy.dev.ssc.int/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aclandanatomy.dev.ssc.int/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Development:  Wolters Kluwer Acland’s Video Atlas Of Human Anatomy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://aclandanatomy.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Hirst</SurName>
-    <EmailAddress>mailto:khirst@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-aclands-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-aclands-production-shibboleth.xml
deleted file mode 100644
index e2c9c8f0..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-aclands-production-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://sp.silverchair.com/aclands/production/shibboleth">
-  <!--
-		This is a "Wolters Kluwer Acland's Video Atlas Of Human Anatomy" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2015-08-13T08:42:37Z">
-      <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://aclandanatomy.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIJANQPFsPXukDlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWFjbGFuZGFuYXRvbXkuY29tMB4XDTE1MDgwNjE2MjcwNloXDTIwMDgwNDE2
-						MjcwNlowHDEaMBgGA1UEAxMRYWNsYW5kYW5hdG9teS5jb20wggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDr15mY+HLovWjx4TFuAOSTnHWHF//DGCRewNYs
-						w9e0gDgpaYHrInhOTWzDLjdg2XJtFas28TZW2S6eTtF1tWrrMsp4gIw5vp74tRL+
-						A4gjMdue47FUaFlQ2PkDAoi4nZ3d4JYn8L+YAPmMrVcu9Q5CtYOz6c9AzENIXQQW
-						hecP4+jR8AEECual86ScygR4NyxF4GVP54ZglMFtKS0z+Bo+Yryr1m+Q/dWG/26+
-						Ib0Y+FhE0LSOKgxFKzJCp/q/Z8USBljtZxTCk0lwJRUTg+qhmv+hBkRP50S6AdB8
-						ma68l2borcrAz9XQwbIIJkXBNb+xX28fDz6CnyLJeV/AJgXNAgMBAAGjeTB3MFYG
-						A1UdEQRPME2CEWFjbGFuZGFuYXRvbXkuY29thjhodHRwczovL3NwLnNpbHZlcmNo
-						YWlyLmNvbS9hY2xhbmRzL3Byb2R1Y3Rpb24vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						Ut2oQKIFtrmnEfetkNfk0XUoGRkwDQYJKoZIhvcNAQEFBQADggEBADerFgWkusON
-						Z6TNPel4LxLox0mN/n4tHIChfyhCXqPGYr9yvCgpkHwlsukGNjxaFtsKmv2X9Z9M
-						aXqAQidfd+8RTES0VamtNY2ywvXxBia3HfSIJd9plaaF9C5/8LQfF1bO4sFPDhNa
-						jF4+kg/tvPs6J9QV56/SzdOzA6iywvGfwge4Fa+/3/xcR4d7ypuIBOXWOqxzufQx
-						Gl/1LaOkGDSX7mVIf6YLankFr3HbE28qAANx1zbJ2P9PL0ay2f7TyfVOj64e1iTR
-						ns4Sfo76aXjkCwGTIIzI1wNIrvdRT3XQZPGCPSCA9DNyU2JuZdL9vq79F/PVPlDk
-						JDcaYjS2aIc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://aclandanatomy.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomy.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aclandanatomy.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomy.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomy.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomy.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aclandanatomy.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomy.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aclandanatomy.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aclandanatomy.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aclandanatomy.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Production: Wolters Kluwer Acland's Video Atlas Of Human Anatomy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://aclandanatomy.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth</GivenName>
-    <SurName>Admin</SurName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Collier</SurName>
-    <EmailAddress>mailto:dcollier@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-shibboleth.xml
deleted file mode 100644
index 2f63cad9..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-aclands-staging-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.silverchair.com/aclands/staging/shibboleth">
-  <!--
-		This is a "Silverchair Staging: Wolters Kluwer Acland's Video Atlas Of Human Anatomy" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2015-05-06T13:15:33Z">
-      <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://aclandanatomyrc.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXTCCAkWgAwIBAgIJAP0kjtCO5LCSMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-						BAMTH2FjbGFuZGFuYXRvbXlyYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNTA1MTI1
-						OTQyWhcNMjAwNTAzMTI1OTQyWjAqMSgwJgYDVQQDEx9hY2xhbmRhbmF0b215cmMu
-						c2lsdmVyY2hhaXIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						4KlybwJfF5/BPhQtkuJVGsgsUtGccJRx+CBb7xh7g/yOk6BprnfPrWkE9bd40WvX
-						SBy8gNLmFeGHRdl52rpxYfD2xFXgMv1kg1E/pArvO/ulWUVO75s4aHDsh2ZyW0yA
-						xEnsKYbpPVwD+dcg/ilZ2PQ+D2Q0vCOXgukbwX0dNw3Dt0uBCMRlJsdkMn82kUHH
-						ZXE1aSw0i4EGgR1JOnFXmcelGhCwN+BK7WodUIJtN22OLPiSjwOEITEhd+cYLPov
-						EhRu5hYGp87ouJscd6SaiNKThJUjzx09MoetxkXB3Oo0zgeJPuE8VFEF/MRZemnb
-						jCNQRXCfUCVYAhVZS12d8wIDAQABo4GFMIGCMGEGA1UdEQRaMFiCH2FjbGFuZGFu
-						YXRvbXlyYy5zaWx2ZXJjaGFpci5jb22GNWh0dHBzOi8vc3Auc2lsdmVyY2hhaXIu
-						Y29tL2FjbGFuZHMvc3RhZ2luZy9zaGliYm9sZXRoMB0GA1UdDgQWBBS3GtGfzTPW
-						uObt+vb/xORB5huW0DANBgkqhkiG9w0BAQUFAAOCAQEAUB6buU3Bti3wCLmypcFQ
-						CCFXNfQSRWCdhD9OE4RDMlT0H2EibiXCN8ST9gxy7OdMk4SPI+fCjfxKW6EMptBs
-						98EkLD1NW4wtUFDek9ify6OrmUS0zuEIeCYQ6PK1o9Gjltzu7yIxyexkDrR4vZXC
-						KgaCrxImOhmNTNRPcq3KUa8brOeuLqGLGSfZ24eyd7swYYMpwbsaVYTHxIdonSqI
-						xlMcKiDeqZxfndOrwJUbTPJDLTl3OhjWCnYBZsjkP3wVzs47XSki/yIUotWZlmZS
-						4kzhd/HkufOmKXEgGTXk4n+7KETjJzDaIQVWRiOBZgWGVtBRqglkhiNRg/gTkARJ
-						Ww==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://aclandanatomyrc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aclandanatomyrc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Staging: Wolters Kluwer Acland’s Video Atlas Of Human Anatomy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://aclandanatomy.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:technicaloperations@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Operations</GivenName>
-    <EmailAddress>mailto:technicaloperations@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-acp-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-acp-development-shibboleth.xml
deleted file mode 100644
index cd5493d3..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-acp-development-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://sp.silverchair.com/acp/development/shibboleth">
-  <!--
-		This is a Silverchair Dev: Annals of Internal Medicine Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-12T08:30:27Z"/>
-  </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://annals.acpdev.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJANkdfBndUGSUMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjAzMTQyMDU5NTlaFw0yMjAzMTIyMDU5
-						NTlaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBALDS5+UqQIJ2fAumOUsihM5wVe2HSLiGUnX4bLxaKFCY
-						aO393EIDcGk0kcGwgD7zyJC+q/iCdIUn32vWY160wit+pIQFBHfSU8AMrV0QwPOy
-						ayVgO5EK3LY0hXceSQqaqRYt2wZF0EDIABCESQjyUU/9uTvpWjuBtSpeicRBUwkB
-						OfOBo4LbuyYgd9hcYNWwIymoZqrZkEEkrFdT9CKPi8hWP7VAJvwxhBs1cJe6EOUv
-						73uUw5UMHQBVrJOpv/YxyIxPNBHG/kZYESWo5Yir6GMrTSK4D5UWurBA05wfbhAh
-						k8mq2LtrvGGZjKhHvRVYvSXD4uQEOrwpq53J//M5MzECAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPc2lzd2ViMS5zc2MuaW50MB0GA1UdDgQWBBQNKdSTkEGS8KPfjVSaZe3V
-						N7DQRDANBgkqhkiG9w0BAQUFAAOCAQEAAqtYH86Hpr8AXcEcPCb3Rq2e+b8aa3yA
-						mEnbgu6Qk4A1GDx/GC0RTpj2s/tdOPj7BNY22eAgbspo9UcC0YOVKc1Gtnaurogq
-						RTE0t3GtSyzRjV2pH/9fefP61ttsyM63ec1K75xXGHaAJEdMPoIWR2ysP0C5whCA
-						iJdGkrh2wQvBJF8yd8KS1zSVg1Bk8tKbasqqg8sBe5O2OElzKKdOmWebrQH7h5Jg
-						woa/kecYOrfOwsG37V5+oZYDCKSQqRN9YNHWYWe9EFTudAhXQ5OddG6dfUCRHSjR
-						82RnLXadMaIx/FmmRgg6I5P2NcEmdxVgDi6yQQ/FY1h0DaoFbBSC9A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://annals.acpdev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Dev: Annals of Internal Medicine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://annals.acpdev.silverchair.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Josh</GivenName>
-    <SurName>Laseter</SurName>
-    <EmailAddress>mailto:jlaseter@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-acp-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-acp-production-shibboleth.xml
deleted file mode 100644
index 99d76c7a..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-acp-production-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://sp.silverchair.com/acp/production/shibboleth">
-  <!--
-		This is a "Silverchair Production: Annals of Internal Medicine" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2012-04-12T09:33:34Z"/>
-  </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://annals.org/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJANicnaiWujsWMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmludDAeFw0xMjAzMjMxNjEzNDlaFw0y
-						MjAzMjExNjEzNDlaMCMxITAfBgNVBAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmlu
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMBwkz9AV9PbPUK7SXa7
-						rWvUj+xCylNNDrE4beQIKFSon64hKwfgXFyH7y9UMAq8eajn4J86htU7sLxQxaxe
-						XMkU35WHo7GoFbtSFb+L6NHHv+UnIpl2FpeVwGGFUAEG/L4q69Bpy4VMDs0/7m6r
-						UBEn/vz74A9nIvglxtyY3aOC9z5RWf0WYQ6MKFXDcVpWzXXRBxiQAGjwNLIDwMn/
-						CCSsDjnt8vKWyBr8d/ehkPalUYWj5pBWdhrdSrQ1cWCrBtYJpBxJFgXbFs4i28w8
-						b/Zf7ZkXkRLEL6d9C3Bs4yOQmBLWB33VURvAwTGt2SSgVCSt1PYrjkX8qdxe0bE6
-						PJ0CAwEAAaNGMEQwIwYDVR0RBBwwGoIYc2NtNi1kNXB2bS13ZWIxLnNjc2wuaW50
-						MB0GA1UdDgQWBBSDkYKQ64pYrPAkh2OIuEEcmy3reTANBgkqhkiG9w0BAQUFAAOC
-						AQEAuMzCg0YVNDuS7dA9lQSKoqrXh5UjrTVS66McThWCSVz5anQLzk+yYzjDRfY5
-						6UGp6vzrnXkd06hLXiYkhp+iKaWi0XtcSzMJ2hKK7JZCEjlDv2aa5G1RZOlVbrgb
-						b5iLQRhPD8vkD41JfwqVWFPSUbhCHLpVyxcGsiSvns0lUyShDr+ud/ew1+uD38T+
-						IYw3q6gIHAZTydVD5h3Zk0H2VtT1QjoMs9YQFl1iJJCLayeOSRulsUdyB8DxhkGJ
-						mEdO6bcXXu7zFrr7ckCioS4N12ZSQuIDPFyfb9/fbpxmcbMmqY3KvZlPvR9OkV6L
-						Td7a8cntDuAvJ/skPcyYKaXcbA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://annals.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://annals.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.org/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://annals.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://annals.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://annals.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://annals.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Production: Annals of Internal Medicine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://annals.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Josh</GivenName>
-    <SurName>Laseter</SurName>
-    <EmailAddress>mailto:jlaseter@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-acp-staging-shibboleth.xml
deleted file mode 100644
index 4ace60d0..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-acp-staging-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.silverchair.com/acp/staging/shibboleth">
-  <!--
-		This is a Silverchair Staging: Annals of Internal Medicine Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2012-04-12T09:28: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://annals.acprc.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTjCCAjagAwIBAgIJAJZHv95563KvMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-						BAMTHGFubmFscy5hY3ByYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNzE0MjEwNDA0
-						WhcNMjAwNzEyMjEwNDA0WjAnMSUwIwYDVQQDExxhbm5hbHMuYWNwcmMuc2lsdmVy
-						Y2hhaXIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx3gcRS/n
-						KEJ7E1rnbpEr5bFNSLH05dYeJw8gO5qvgZWS8kEK742uRAy/BDEytNNGru6Kgn2T
-						OKAUXFjqYhpUMZD0dvdrkuIBRLsluyWqHNFKNV2kfxdn2P0Ku5DWrhDERcVjsBCV
-						DV2ZFuLSXUjO//Tf4U3hddnQAmDY+DHzn5JVQc2qxAcm3SauHllpdf2D3ml5jt0C
-						JJ2HjzLe7RjWsB2ZcdfTx53YoBjHs8fQ//a9XueczEEnGLee6KWoOafmJtNUaNJw
-						LUJKMqQ0cwkDGO9+GHXIUv0UZaQqJzOEpassE6pnDWF+lU0QLiKEhLWb4t/raYb5
-						FNw5MX7Dh1KflQIDAQABo30wezBaBgNVHREEUzBRghxhbm5hbHMuYWNwcmMuc2ls
-						dmVyY2hhaXIuY29thjFodHRwczovL3NwLnNpbHZlcmNoYWlyLmNvbS9hY3Avc3Rh
-						Z2luZy9zaGliYm9sZXRoMB0GA1UdDgQWBBTR5Oq0DmD770Dj6nz8AVhHW7M+1DAN
-						BgkqhkiG9w0BAQUFAAOCAQEANTzhu7oiv6sPVeLQJIurSMlWUlVdslHfKtHITuUq
-						rJr2V7ENZqiP96ZExF6rd6gfnrQJW0j0Qlpa3BBmoY1mXKf9ptnU3CeEFF772AL6
-						XqUH7G/qwYzxoybsQSMvcmvnwJtDXJ7/7UElzdnnIOEemewIvWr/JP9uKT4I7QpM
-						H9FxsfFwkiIaC1tljcEjmtmNBqep8/5k9bTY78/FhI2VBWViA9G9SjW/wsTHg2n7
-						yd73sCRREx9PLTR9xwaFTXd3sUKa9twF2Mcelv+YMQ54jDLMYMXYE7sQQAmCJntA
-						XHPzjiDW9qkSn90k3YhY8pW1gd59mGKAZUiC+cQFhlnRFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://annals.acprc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://annals.acprc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Staging: Annals of Internal Medicine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://annals.acprc.silverchair.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Josh</GivenName>
-    <SurName>Laseter</SurName>
-    <EmailAddress>mailto:jlaseter@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-ama-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-ama-development-shibboleth.xml
deleted file mode 100644
index 82d67f9a..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-ama-development-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://sp.silverchair.com/ama/development/shibboleth">
-  <!--
-		This is a Shibboleth dev American Medical Association SP for Silverchair Science + Communications, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-13T09:25:47Z"/>
-  </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://amadev.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAPXRSgDr+PDuMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjA0MTAyMTEyNDRaFw0yMjA0MDgyMTEy
-						NDRaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAKgoCVhPuU9Ngx3Lz1NGrE/FnVRd/IHInKH51CEBq2W9
-						Wq8r7y7YxRZa6DoFzoE6wM223zkBEFkNzc9pAQBTyQOKyHYrPV8nwbjifeA/Lq2h
-						nbUx6nrc3RxwGw7v31H24AVkmf8cpnAcgnnD01LvNtLpbmGJoOGCBJEwi+YmFK2N
-						fo0M15Cptq6NVZc2JR2OOFb6mCwwu2otazAYsPSQpZAZ4CHz8s9kiEkC7+KJu8jQ
-						d5DmdkRGxESwHsWIHCmRWLxH40tLp9rYuaGSmFBd0TK8Fb+POB2RYroqi3KBMQUH
-						GOu4PKqcMvXkDkqMJSOWaYZHi2SCPkGvZ/0sPtkNMt8CAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPc2lzd2ViMS5zc2MuaW50MB0GA1UdDgQWBBSjS9WbtSJtcWgF6gaMH9yn
-						PGYwxTANBgkqhkiG9w0BAQUFAAOCAQEAIkWEhqevWn7BMqwO73Gu6EDCFrf7POjP
-						7Nq1ALesArOQUEJPW5hv0HeAvLoSsByllgw+2eZVSseJNXOMlK0LIeVOmZyreasX
-						eBmkQhpPKu+KVbO7hABeZxTrbihD/TiQnyfA63w/mRSHsqjtSfzzQOKTak2v8KQY
-						xQLA0eVmbaFhMoCCprPDcR7RqVaK2+mKWqi3KloNz3xVwGffjM8YHIoyIiHu328a
-						s8B1+61eO70ycIKXRJHIOtIKk4Yw2/I2i3oqMaLmNhUoIv2ffsWmvzrD+L3ekdHn
-						WUsU5iaReLX2zaEHSuiSsV+twmfrjxC81N77dMrndS+fAQD6BVQ2OA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amadev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amadev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://amadev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amadev.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amadev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://amadev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Dev: The American Medical Association</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://amadev.silverchair.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Josh</GivenName>
-    <SurName>Laseter</SurName>
-    <EmailAddress>mailto:jlaseter@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-ama-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-ama-production-shibboleth.xml
deleted file mode 100644
index 7706fac6..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-ama-production-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://sp.silverchair.com/ama/production/shibboleth">
-  <!--
-		This is a "Silverchair Production: The American Medical Association" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2012-05-01T09:41:42Z">
-      <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://jamanetwork.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAORzNvJp0EaDMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmludDAeFw0xMjA0MTYxOTA1NTVaFw0y
-						MjA0MTQxOTA1NTVaMCMxITAfBgNVBAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmlu
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9MqpHzY/2XNz5e72by
-						iLIMsfTp+IkYpxH7J24qf9S59sNFD228Eds7HOixJwIx4qPkMkKWQiJgHbOw9yo6
-						1vYZKWeJs9AiJhZxJqML69mcpXaJ+DcHrTuIARbLixwv8DgrbaqVd7E6xfGnqkwd
-						DBn6fEKEOOKENzZoLoihYfXbVmvAmErwoezim/cBMBJP8+v1/tbYaTwBWkOMEzap
-						C29TA8+rIqHeeH34NczHkKvcdecV/G5wh1/xrCpQFjQ3301L3T25HBE8dPXdxrap
-						ysgQyjNM7lvDHkpJIGRTv/pLeKWwuESpmqqsd8rdm/EV1G/rj1lab0zz5VoX0/+H
-						l8ECAwEAAaNGMEQwIwYDVR0RBBwwGoIYc2NtNi1kNXB2bS13ZWIxLnNjc2wuaW50
-						MB0GA1UdDgQWBBRMXra8qny2NUOSMAON/3BRFvrkNzANBgkqhkiG9w0BAQUFAAOC
-						AQEAFjRqhwmt88P4noKvHM4nBVtIobkwD283MrJ9fD/Fc+tTuqCj5XhIA9tmhzkH
-						wuGP6tByD35/C7feUC9QSycD5+g8c1XuX7DoaBpjarBvlZRBQHeDDMl0Axq/5QaZ
-						KTTx0sAUqueD5Ksn8AOEmSXKagQQxmcD4T9A1+aENL3iORU/yTCIuEbulP/hTWqS
-						/4LfA6JCQzz9vWpeFEOQPxzYQdPtn/imfqK+APgxJ+sOt4VBiWDow3Rc/Jurvr/e
-						3rS8ZogxfmobnOH0s+5b057fVvyufQDC0HKekcn27HKzyGlml/uZVN0dN2ZxsPk9
-						dF0f57p7T8LXtcYychN122+l5A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://jamanetwork.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://jamanetwork.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://jamanetwork.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jamanetwork.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jamanetwork.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://jamanetwork.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jamanetwork.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jamanetwork.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Production: The American Medical Association</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://jamanetwork.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Josh</GivenName>
-    <SurName>Laseter</SurName>
-    <EmailAddress>mailto:jlaseter@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-ama-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-ama-staging-shibboleth.xml
deleted file mode 100644
index 21e1cf5e..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-ama-staging-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://sp.silverchair.com/ama/staging/shibboleth">
-  <!--
-		This is a "Silverchair Staging: The JAMA Network" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2012-04-30T10:37:01Z">
-      <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://amarc.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOTCCAiGgAwIBAgIJAJFFNj7kjgfPMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWFtYXJjLnNpbHZlcmNoYWlyLmNvbTAeFw0xNTA2MTAxNTA0MDFaFw0yNTA2
-						MDcxNTA0MDFaMCAxHjAcBgNVBAMTFWFtYXJjLnNpbHZlcmNoYWlyLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMehsAXBrqZfJ/ycfulzOVcVgRFL
-						gkz2PEJx3FSuu9tJ8gJdEooyWQ2DxNgpiEVjk8Lo2puLTF4AzAqLF96/TofVRB4k
-						BL7wRc84X3WhTHLAPtD5JZyxDciJA+fH7DL87uQAJDTHmAWktsDDxYsVDQ1DciUa
-						tvxS2STVsNE3uIQ+dgjcPYTyC4AjQ0ru/q6K+VZ+lnIIay7OI17+jmClRAmeonlo
-						L+BIYQQH1KPHS6iMGIoXQ61PL9Mt4F1ZhpbnUfCLecZ7gciUGa0pdRWAjlEB9k+s
-						+VJIp4WGW7n4Jo+5mlZWUmhtd478m5bMroIhLr9Zz2OqTzmz2lqkrhrHEbECAwEA
-						AaN2MHQwUwYDVR0RBEwwSoIVYW1hcmMuc2lsdmVyY2hhaXIuY29thjFodHRwczov
-						L3NwLnNpbHZlcmNoYWlyLmNvbS9hbWEvc3RhZ2luZy9zaGliYm9sZXRoMB0GA1Ud
-						DgQWBBRgwtVKrHJHtSVLEEocqeZN9rLM2zANBgkqhkiG9w0BAQUFAAOCAQEAcj5W
-						sGCeozxF1JZMRZ0ZXeodcFyov5STOpf8GsBREIDMYWSW6YxYwIiq7Eq41qSCyeDs
-						J6dzw9c8b2IO2L86E/S77MVZtlRcE1LW7R2Ig/7VhUEg/9/OzzbQScOvJxBUk2II
-						RzrRqbegilRC83tX6MB3+7NcZFP++jYSXYP0RZ1efKyIWeCW8LLvcLF+MWpXTYhO
-						Nu+Wn55INHklk7EDQqTSB9mFiOsG5NGJXrg2KnWFqxCGi+3225w4Z9AG+xhLjM1O
-						re+F8ASbv5E/diQLVBP8asRNLNZc1UerSrCS79MaKqjfNv0mYwuCji7+f/+uR3HE
-						SwMMGe5NEtYVH3YFKA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://amarc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://amarc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://amarc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amarc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amarc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://amarc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Staging: The JAMA Network</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://jamanetwork.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:technicaloperations@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Operations</GivenName>
-    <EmailAddress>mailto:technicaloperations@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-asme-development-shibboleth.xml
deleted file mode 100644
index 37f75852..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-asme-development-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://sp.silverchair.com/asme/development/shibboleth">
-  <!--
-		This is a "ASME Digital Collection" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-14T10:40: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://asmedevscm6.asme.org/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDOzCCAiOgAwIBAgIJAMfTOFohtsoAMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFGFzbWVkZXZzY202LmFzbWUub3JnMB4XDTE1MDgzMTE0NTMzMVoXDTI1MDgy
-						ODE0NTMzMVowHzEdMBsGA1UEAxMUYXNtZWRldnNjbTYuYXNtZS5vcmcwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSIr0BKju2k50Sy1RXMDOr8FwVVvpb
-						vKu9UV48mmpSofl2iUvfohhDIahO0GxZGpUElfobckm37ON6CPZW/Qzeu3mO/Lsq
-						Czg92js9dRZ/NSvE6xMrZEt46VxsND8lWrepU0E/k7HsexZnh4U2itZ5e8gpzyRP
-						xAueR3SKDEtpPhoabGKqRD1LfzevS7ozGwQ02r/YysMYV/M+l86zREKMSfQijRFk
-						UYQj5O2Pf78zX7cbuPFJJFNeCns74GV5+ILgia0STTRNRiigBGDFq1xFltxLarZD
-						j5cPQdMGPoFjDsJc5CNv2jsfvMiC7zl8qQ/ZHJk8h7J0L2wTZDe9S56bAgMBAAGj
-						ejB4MFcGA1UdEQRQME6CFGFzbWVkZXZzY202LmFzbWUub3JnhjZodHRwczovL3Nw
-						LnNpbHZlcmNoYWlyLmNvbS9hc21lL2RldmVsb3BtZW50L3NoaWJib2xldGgwHQYD
-						VR0OBBYEFOO5r/GmeZWnFDh7lRQxNgZdZycRMA0GCSqGSIb3DQEBBQUAA4IBAQBw
-						wnbyHm+pB8WR8Aj7C1QXUVDXW8G1ZOj7Ltgw9c58MaaZttNqk1euI/E4F6JNYIoe
-						kmqrLXxaQodFgXVzbzA+qZ5wMoe7Z1mrc6tipT4HKLwwqxbv7IQ/8yhtyUGhjcKl
-						PhNsNc5YO9/rLGO6XDBniny2MelwT+lXV2iQaKp/BUKq8+Wb55q9mW+/uu1KUIuq
-						FMt+UCEZxiIeWk2XvifgntDR8BGvoLx8Ofu6aGjUQm75XLxmKqXkC8Z5gPs4rxZ4
-						rMp9E87N8wIkNyEvWdd5YgDwtMqHgcFSuzv0r1aEr8AbTxKU4cNTiHMYd/8DJDSI
-						bSaO7kJ1d0p5tmwRU8PK
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedevscm6.asme.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://asmedevscm6.asme.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Development:  ASME Digital Collection</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.asme.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Call</SurName>
-    <EmailAddress>mailto:benc@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-asme-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-asme-production-shibboleth.xml
deleted file mode 100644
index 2116769c..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-asme-production-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.silverchair.com/asme/production/shibboleth">
-  <!--
-		This is a "ASME Digital Collection" production Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2016-01-11T10:50:48Z">
-      <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://asmedigitalcollection.asme.org/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDWjCCAkKgAwIBAgIJAOZ/+oV5563RMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-						BAMTHmFzbWVkaWdpdGFsY29sbGVjdGlvbi5hc21lLm9yZzAeFw0xNTA4MzExNTAy
-						MzVaFw0yNTA4MjgxNTAyMzVaMCkxJzAlBgNVBAMTHmFzbWVkaWdpdGFsY29sbGVj
-						dGlvbi5hc21lLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJXo
-						b/YsW00Nn3yAK2H581CMJt6IJU68BDrj28kT91unuQxCCM3qloakx4bUtChqPlnl
-						Z5jBOdh2Q+4tSOO3vnod5zjEBP9byD8J7MADDfRs4QFtq1t4FDsBb9FFlQZfxGUS
-						ID3lnrpdnMlqsU08vivE8B72glHOGvd7PmGwCo8XMyFxK8S9FK/QiZr7TB2lJLtm
-						pNuHjcaBXkUXQR1EG06KrnipUfOh1CWGSSBp3jM9rs3jW6XS2U4X8zefdDqfXl7/
-						afXJc1shFuT37iVS796k5ATN72gHHmY46BqC/zmPyT/WW8cgEOtUlgjX+SAXkwnY
-						LxN+LHV8WExceiPu4z0CAwEAAaOBhDCBgTBgBgNVHREEWTBXgh5hc21lZGlnaXRh
-						bGNvbGxlY3Rpb24uYXNtZS5vcmeGNWh0dHBzOi8vc3Auc2lsdmVyY2hhaXIuY29t
-						L2FzbWUvcHJvZHVjdGlvbi9zaGliYm9sZXRoMB0GA1UdDgQWBBTYPBU1H5czcpL8
-						0eqjApN6rfh3XzANBgkqhkiG9w0BAQUFAAOCAQEAKo3yAAeMIz7l7MKG+TJLBH/Q
-						VXJEaqHCX0RF6vTU0UzkFBDjj91dDalhBtJF6K/P5Z5z3IbG0V2Fat3EsSA9gFQO
-						pUjMdntBnjcRDV1NVMKM9zvX3KTzTABtAfwO9rFDxJYa9DpB/kyaJH5/8zZyXJ/D
-						uHZGq92Tyd3X1C44w2so2CWbF4LETzGnSVh+LFSAB0JPsn5HVx4nCvaJfrvG13Xz
-						MiR2KKNHBmqkQy1MBMyTQlNZ6WFCJwMZ4Av6gFvvx8aFshAP567LJ4EL9qJsaloa
-						KDpHjZY1f4q5ikk+6A667DYhM+hUjrjUg/54DXVTvkBsIyZ8fdKZEt07OEMUhg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://asmedigitalcollection.asme.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://asmedigitalcollection.asme.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Production: ASME Digital Collection</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.asme.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Call</SurName>
-    <EmailAddress>mailto:benc@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-bates-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-bates-development-shibboleth.xml
deleted file mode 100644
index c93622bd..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-bates-development-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://sp.silverchair.com/bates/development/shibboleth">
-  <!--
-		This is a "Silverchair Development:  Wolters Kluwer Bates Visual Guide" Shibboleth SP for Silverchair Science + Communications, LLC. 
-	-->
-  <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="2015-01-22T11:14:32Z">
-      <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://bates.dev.ssc.int/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+jCCAeKgAwIBAgIJAOjfBbdUrprIMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEWJhdGVzLmRldi5zc2MuaW50MB4XDTE1MDEyMTE2MTk0NVoXDTI1MDExODE2
-						MTk0NVowHDEaMBgGA1UEAxMRYmF0ZXMuZGV2LnNzYy5pbnQwggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCtF8B7w3RLPqlpTfPyNw7l8qQYcYzbAEB2r7gY
-						QVcqP+SYFaZteqNeQhFGne7gXy3RJXjtoxmd7IrfegHPyn4oXyMQjg3WS1s63eG+
-						8rRLODdvRzswOncVJwj2toqrDdIIUm5ZrM/NuVIQpbvEMvxYDnWXx4q69qEGRcBI
-						o5rmd52HN1Xp9abdedJ7YMozlB1Hn/ipA+rlj92IK10ArAMh9qGsGW+tFWZhJMtX
-						uqskTE1kuVGq3MW8+6hWMf92y9JPslhavT69waNOxjUWAz+5nFHn8AHvkVLM9rHN
-						NihFourWQyE1dqf4rAZaojFfo2KIc2YeDzjXbuP9ILVsECBpAgMBAAGjPzA9MBwG
-						A1UdEQQVMBOCEWJhdGVzLmRldi5zc2MuaW50MB0GA1UdDgQWBBQ/Loo8ka7f9Tlf
-						+aVNZ7ZxQWUG/zANBgkqhkiG9w0BAQUFAAOCAQEApw44dQEXskBe5wU5SgJv50KW
-						6TwWigGk8NFtD+3qpESjSp1jWRV6bQTqwD9fyrqlhWIkcNfkygkiNGNsU5k/K8Aw
-						JyP6EVjyQrDVNTrWQAXbmV5PFZ2n506S9EbZLEiQLXrb3gCms+U0sR384Kzqt0kp
-						qETpTA41DoR0jrEVp2yysR9mTTeF5NzWf5CN58RVxIe5kv3XzcHp9f/MRkkl2o65
-						+hHOQ9XVo5GjhvSGpWsPFfuTo5L/sAf+s1rmzfNJ5sZE5ka8Vh7bd8WxP3kRMUcO
-						yMUwgp6WFPxp5b/JWSuXvaQM75RO1edmy4SJJQNKZ8HVZ1aava+i3i9D5up/8w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://bates.dev.ssc.int/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://bates.dev.ssc.int/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bates.dev.ssc.int/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bates.dev.ssc.int/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bates.dev.ssc.int/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bates.dev.ssc.int/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Development:  Wolters Kluwer Bates Visual Guide</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://batesvisualguide.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Hirst</SurName>
-    <EmailAddress>mailto:khirst@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-bates-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-bates-production-shibboleth.xml
deleted file mode 100644
index 644f5854..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-bates-production-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://sp.silverchair.com/bates/production/shibboleth">
-  <!--
-		This is a "Silverchair Production: Wolters Kluwer Bates Visual Guide" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2015-02-27T11:52:49Z">
-      <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://batesvisualguide.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAOFo9MBRXeFRMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjAeFw0xNTAyMjYxNjIyMzZaFw0yNTAy
-						MjMxNjIyMzZaMCAxHjAcBgNVBAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL4rrdOYTdOOx3hU6sLw5SuLnoMY
-						Nl7zueILpPdpy/aix1CqJ9evkwFNwy9lST7MbJe5Dj6Llg+jnu4Czp0+FeGUUwFU
-						2osBP9fFBvU+0s7G0ixT6FoKSMak2mq8IF1QHCTa0h9Fxj+dWvGTsr5LwjuGoqAz
-						oPSm5wXFw2Wf/qCVDGrYpuwFrnI9C5tboukUQNLcoVxKUzUc74MKOSQ/yDnw+5gJ
-						d17oTEMXrId/snTfdz2Vt9g8St0nfL003+N45ZrksoZjLKyhAzZFk6nUPuUuqhOU
-						hCYkLhjlouMZass2IUJLY4YHBQ+YRnayoO14rOZ41n0dmKAOx/ji+l03yNkCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVc2NtLXByb2R3ZWIwMS5zaXMubGFuMB0GA1UdDgQW
-						BBT41sXyIBF6ETN3en6hOQZ+sfvkMzANBgkqhkiG9w0BAQUFAAOCAQEAuBRCom7N
-						l2KrRgCABtXj+EEpCAVmn/TU/Y1bNqmZIj7YB23w+YpbDS3o3d9euouHhcLeDRUg
-						L4guMR3sLMlEYzyJPNwuWXwbC/uctW1/djMHJbVh9VHF4Iq0u0WhsadwwMbKM+nH
-						JCLIoF3gnHM/zOyNSl9CiZH44SUjeF/Pi4BTugS7BIaeHNEL6INBheXWE24kDpil
-						d8SAOHfOQsqvYRLlnl61ESpAuh1vRvcG7MOQ9YRsDOLoK7O/wa4QpmHRnvBxk670
-						taO2s6UldkU0aSnJaTrk/q+F6LGyyA2cpVEhjSNQrUdd0o7JHDzo1/62wILbORpj
-						+0cK6G714oAgXg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://batesvisualguide.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesvisualguide.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://batesvisualguide.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesvisualguide.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesvisualguide.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesvisualguide.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://batesvisualguide.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesvisualguide.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://batesvisualguide.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://batesvisualguide.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://batesvisualguide.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Production: Wolters Kluwer Bates Visual Guide</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://batesvisualguide.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Hirst</SurName>
-    <EmailAddress>mailto:khirst@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-bates-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-bates-staging-shibboleth.xml
deleted file mode 100644
index 4895cd47..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-bates-staging-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://sp.silverchair.com/bates/staging/shibboleth">
-  <!--
-		This is a "Silverchair Staging: Bates Visual Guide to Physical Examination" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2015-02-13T10:07: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://batesrc.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAJ2KkG77HkGAMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2JhdGVzcmMuc2lsdmVyY2hhaXIuY29tMB4XDTE1MDYwOTE4Mjk0M1oXDTI1
-						MDYwNjE4Mjk0M1owIjEgMB4GA1UEAxMXYmF0ZXNyYy5zaWx2ZXJjaGFpci5jb20w
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmkrPfcl6WOqq9VTTl3W0I
-						kY92nqD3bUMEJl2xUZvbfQS5opwkCZX92nDdU8VlWLanmWjCN9pn7v0oNKsznYoU
-						nQ3FYoS6AFCuwBxMcM7BPfefOuzQiGb9e29hFPxOrabnuCtU7Qp4lEIxovcPUJWN
-						JvnJhkvO6ozN85RYmWK+HAX5k61XqYqWVpOBdLWYygDGT8m9JBmJUr60vHI31VbJ
-						1gjlus9jyOB3ZOfDJ+doK+jQQg3Gxux8lcEuS4Peouhb93cWg561XM7VV6Zj8CoC
-						0RmRFbPy3Qhmp1bguva9jumIHiJjyRsZ0uwkOp+ztFChLA7WwzTxcKOuO+rC07X7
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2JhdGVzcmMuc2lsdmVyY2hhaXIuY29tMB0G
-						A1UdDgQWBBSsGjJ8Yd4xoiuTaj9OWTXGLCi2VjANBgkqhkiG9w0BAQUFAAOCAQEA
-						DkWLJVnH0A5zbVrVLkzAM1mpmU9DwXpQekNNePid0M1GjXOJj0HRl2gfbHm9qDy5
-						WfoZOsJJjeLw/YxiKlb6vY98OY0+hydm65wNt3IoyM5NrcscUk9tHMBVPSntjeI9
-						JpY5O/sz+GJ8/LB2jvN5bs6bKBYJbK2akFT5nRsqXmFq/BQSjeO1iiWaJ0DUyx+1
-						Ing6yhcR+ZP0Y1IMcyg7JpQJez19YSrMvYuoSA3sAwn8qa8oJs8GB4ZYT1m1U0+J
-						TmtN8MS1QK7dip9Z28UfFVXYZOAXzKGWbH6hVO1dqYfydZB43D1KBEOgvZSlmCQi
-						m1PTokszlb2QuY/86Yar3g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://batesrc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesrc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://batesrc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesrc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesrc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://batesrc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Staging: Bates Visual Guide to Physical Examination</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://batesvisualguide.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:technicaloperations@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Operations</GivenName>
-    <EmailAddress>mailto:technicaloperations@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-esbates-production-shibboleth.xml
deleted file mode 100644
index 842068bf..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-esbates-production-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://sp.silverchair.com/esbates/production/shibboleth">
-  <!--
-		This is a "Silverchair Production: Wolters Kluwer Bates Visual Guide Spanish" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2015-03-05T09:19: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">
-    <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://batesguiavisual.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJALin0XFwb82yMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjAeFw0xNTAzMDMxNTQyNDJaFw0yNTAy
-						MjgxNTQyNDJaMCAxHjAcBgNVBAMTFXNjbS1wcm9kd2ViMDEuc2lzLmxhbjCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALsi9y2ljlDuMGn64lhRsO1Q7MYo
-						ppIQ2Mm49zT3/7b9eEW+8DLIdhJocmwturiTb7Z+3LqVhuoRsBtAFq2xb3rh7Tv3
-						xc9jAeig/M3Sf4lEdr51hkQMZ2lfIyQNXEwCejKt8/al3i3CBAedBf/M3GeU53AC
-						lAKWbfs6jHbN2kE2rWbex8YxazX1tJARdbtBx9tujie7W/tOj2iVd5C6eqpsU5Zu
-						PvKKsmUQ8I0jIJa+eF/FSp+cKW8uXWLWx1l2S9HJme4vOBi1XGtLpjSn4VGOsF2p
-						bs5sHMyV5eApcSLVBaqZnHcE9HMoHhsjKLnme6JbJ826rtaCxLRXqr59lF0CAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVc2NtLXByb2R3ZWIwMS5zaXMubGFuMB0GA1UdDgQW
-						BBS2/5NIi4BwDPX6NXCg/cdzKP1RYjANBgkqhkiG9w0BAQUFAAOCAQEAcfRfLZgf
-						sZJ4U3auPGf6GCBzs1QjJUzNgIiL7IZOEHPE1ezvRMbBpxu5iXfuXU8mxFPTDtXE
-						KgRl0qPEZrtW5h/LZd97CcbA71WohAznkjzIAUOCHVBSfOCcstr3HbnCQ3LglCrC
-						YJQNwFhNRu0e2gbapN4xlKap+YS9akyd4i+ODD3Rj5jbxDbqlErDkwII6923Jo+s
-						HeKVBNQD3godVRJn/UlzOYvLfN4l3aS8VpRv1plf9gMPe1TF2ei+1LX1sRspFqqm
-						bCcqOJmtKjzk1/DIfnKQ4av6pqbdsJCtZI2gFo2qTPtZK3mJJjew8qOmIqUnbEIj
-						j3IeauG38pyehw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://batesguiavisual.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesguiavisual.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://batesguiavisual.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://batesguiavisual.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://batesguiavisual.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Production: Wolters Kluwer Bates Visual Guide Spanish</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://batesguiavisual.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Hirst</SurName>
-    <EmailAddress>mailto:khirst@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-spie-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-spie-development-shibboleth.xml
deleted file mode 100644
index 5ef23dbe..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-spie-development-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://sp.silverchair.com/spie/development/shibboleth">
-  <!--
-		This is a Dev: International Society for Optics and Photonics (SPIE) Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T14:57:55Z"/>
-  </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://spiedev.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJALlaiHmGwxxMMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3Npc3dlYjEuc3NjLmludDAeFw0xMjA2MDUyMTQ2MzZaFw0yMjA2MDMyMTQ2
-						MzZaMBoxGDAWBgNVBAMTD3Npc3dlYjEuc3NjLmludDCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAOf/K/gvKC/u7Ua0cgI1XfMba1Wws8EAmB74uogwn6fd
-						/IoHNj1IYchQ/D8Him3Zn+/ZaqmXiRBs6BrIyvi5Wxcjset63BCM8JSyRK0tyiHu
-						x3d8Y787FKohrJ5KIT7a207fGGTBydEDz79Snp/Mfz334DyOt19/7STPBCAtAtvp
-						Ok4amip2bHfjA9tvQcnrM0hGcYibhEc9Kgxgx62J9rEoRC5sm/B5rvHtccu6lrHZ
-						CcVkK9nByGAA/bRm1B9E0Ds9sFHb4y5/t+wHh/atWOdaxCvQeQdcD9/hqOV6Oe0x
-						AFG/akUrXelKWsmcqcjcHSS2VOlWMUdH6o14Ah6PG1UCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPc2lzd2ViMS5zc2MuaW50MB0GA1UdDgQWBBT4/+lctR28WS/Ckl3SPVVe
-						JHflNzANBgkqhkiG9w0BAQUFAAOCAQEAK0W7UeTG1w5h97v3Zy+z+Gsx5qIsmY9I
-						ETvlGWIGaOmYx4O/ufFqU1dnqdbBb44Jm8l1N4YZdyo3iMxyD1SryH9tcr8V7PJj
-						Z1VVGS7Gg6Rp6mpEtubGukx1mRzL6GqUelMiG+MxxBLKhJv3Io5/ll6ooMi6VDzV
-						apjaONZvyrwnWfLcGurjHKeBE04zZEQQ1fOxpvLgcQS1XCw1KqqPAYvfNQnbr782
-						l9tktU5kKQam047p/nqlfbTrgh/YIOiOrTaHGs7xS0lGpm2Nv/HE7Plwrm1QFnwq
-						5SFytGmkTdNq/TwMwm8GWlPEObESkTCavAvPo3CqO7xALX2XJRO3WA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spiedev.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spiedev.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spiedev.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spiedev.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedev.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spiedev.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Dev: International Society for Optics and Photonics (SPIE)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://spiedev.silverchair.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Josh</GivenName>
-    <SurName>Laseter</SurName>
-    <EmailAddress>mailto:jlaseter@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-spie-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-spie-production-shibboleth.xml
deleted file mode 100644
index 68f60da8..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-spie-production-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://sp.silverchair.com/spie/production/shibboleth">
-  <!--
-		This is a "Production: International Society for Optics and Photonics (SPIE)" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2012-07-20T07:40:58Z">
-      <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://spiedigitallibrary.org/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJALDmz160GZUgMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmludDAeFw0xMjA3MTkxNzIyMjRaFw0y
-						MjA3MTcxNzIyMjRaMCMxITAfBgNVBAMTGHNjbTYtZDVwdm0td2ViMS5zY3NsLmlu
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKy1suWo6bSOBOft6isd
-						NMjOmCiY/er3+zb7H4DEC71X76DUTN+BNYbPCvYzcgncAoFIMftH3OL1+2ku1zpX
-						+eHXPAmPX85cMIsnQG0mRFF67+Aieg/dSXPUg7H/4gV/qanlUX238A96pS/zf/aT
-						DKq/HB6wvb4UDB6874ZHkhlzsBmF6giQh3DsiyvQaMbw41oAIR/GReDZnu1yx7+u
-						UPzAwpLnqY/lrAnl1vyGmoxjNbwNnxCo6WjusiEtoQcd7Ted+oHjvi910FQI+7kI
-						b4Cj8Iqb5uZ0iQ60mzOuBTzMJgb+OYuQINPO8719Q/8Nf7YTgm5jCw0y4EZe4Otu
-						wmUCAwEAAaNGMEQwIwYDVR0RBBwwGoIYc2NtNi1kNXB2bS13ZWIxLnNjc2wuaW50
-						MB0GA1UdDgQWBBRDU2Ew8E7Xwa6XxKtPysNZNS59vDANBgkqhkiG9w0BAQUFAAOC
-						AQEAc91ruViikIw39jO3H0vYGk87IHE7x1F0ymeRlHJ/NsJ3oVIFrNFbwEy5CaIg
-						sS/0L+UwyBT/bW9r7XsYNHGaip3ONHH3bd05L4mxoBplKHJK9yhrw0Y0RHwPqfTr
-						VUJmsexW3CSDAShJ6SWydIqF2GfUGYz5WH6FH7Nsa9GwctxRGIn8/kDz0CpbsD8F
-						KRlv5RUWyPVOZr2sFhHsooERzhY6eRrj5wttWe/RKOiHYyC9zWDLrNktYF1MC/vz
-						MMW8uxvLMg0NdQGLtSclrrUCUf5qcoRvdAxkdoCxbJgrqNSI9xOnOmdQgwfDwQbu
-						4lzH+AGLbg18D+2I28Y7IdPrUg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://spiedigitallibrary.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spiedigitallibrary.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spiedigitallibrary.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spiedigitallibrary.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedigitallibrary.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spiedigitallibrary.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Production: International Society for Optics and Photonics (SPIE)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://spiedigitallibrary.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Josh</GivenName>
-    <SurName>Laseter</SurName>
-    <EmailAddress>mailto:jlaseter@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-spie-qa-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-spie-qa-shibboleth.xml
deleted file mode 100644
index 35d17b87..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-spie-qa-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://sp.silverchair.com/spie/qa/shibboleth">
-  <!--
-		This is a QA: International Society for Optics and Photonics (SPIE) Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-12T14:12:02Z"/>
-  </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://spieqa.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIJAPnMLU76c53nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnNwaWVxYS5zaWx2ZXJjaGFpci5jb20wHhcNMTIwOTEwMTQ1ODM1WhcNMTcw
-						OTA5MTQ1ODM1WjAhMR8wHQYDVQQDExZzcGllcWEuc2lsdmVyY2hhaXIuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7QX2LidgKfknNSjQia/3NvVn
-						6COQ6GbaFb82GLhSJi6Zn76eUWEHLUXgZdh9eS+fQf0MN13huynlRLPbEpYdfVgF
-						6ps4s5y2NO++bu4MoirWV6HntJkvz1ry2gwG4VyqjSB2Rr+TYWpkgX6GVnGbImN2
-						T9z0tmDJk5tQzEJ14XcnTLuFJ4jnUY/JkbV3DVrFntXOClHc380dqepxZsdgfzXT
-						kq/jjPqG2i7ZSMNyO3U4Wp6tmgUOI8guNCch9nv7rJNGiYu8DEJwtaqh2LU2jvs0
-						vcMcxipge92/Ajdfhy60OGILioG8XF2VQuN95rp1oN6aur9WYXoGaKSDXIjgFQID
-						AQABo3MwcTBQBgNVHREESTBHghZzcGllcWEuc2lsdmVyY2hhaXIuY29thi1odHRw
-						czovL3NwLnNpbHZlcmNoYWlyLmNvbS9zcGllL3FhL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFL6vSPSwRDKzRRCbhywrPQV0l2ZSMA0GCSqGSIb3DQEBBQUAA4IBAQCEfLqE
-						NvfbmbsSA8p71lWhtwqkOmZE2/oFxpAkTiXg7/PL9NlUCEWFMFu7GDQhu0MbSula
-						J1/NRV5btTBiaKOtiP63CfTsdeAKO9GnM1NFWEsb8Tv+QMJ/nkLcQ+rs/VzcqWAB
-						w0ztlvSh4toPIIyByTmn1/PGfUxXvcvLkJ5669f+ke9QD3xphlFH7GsdieKwLsr/
-						7scsYi/3Q+D+BCb00zz3lKyTCiMfOLsLMoRwyGXIi1F3Yt1qLqtrfMbzAq7O/2Pp
-						q0YAwR3jfb6c9XO9hxJECjQXdf1LUq3Upu8UOVrjLNcTKLmIfHELW7Qc/i2Xc/Xf
-						fd2W+VeaBiFExG0U
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spieqa.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spieqa.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spieqa.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spieqa.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spieqa.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spieqa.silverchair.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair QA: International Society for Optics and Photonics (SPIE)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://spieqa.silverchair.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Josh</GivenName>
-    <SurName>Laseter</SurName>
-    <EmailAddress>mailto:jlaseter@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-spie-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-spie-staging-shibboleth.xml
deleted file mode 100644
index b6ee8a7d..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-spie-staging-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://sp.silverchair.com/spie/staging/shibboleth">
-  <!--
-		This is a "Silverchair Staging: SPIE Digital Library" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2012-07-19T09:42:09Z">
-      <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://spierc.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJANpeel3qLSr0MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnNwaWVyYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNjEwMTQ0NTI5WhcNMjUw
-						NjA3MTQ0NTI5WjAhMR8wHQYDVQQDExZzcGllcmMuc2lsdmVyY2hhaXIuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt4+KRwTSRzRPPSFZShN3H30F
-						ciOzYa3qrl8ipBIeEQtV8K9wAeydT+o2FwWiPLEKamv6R7oit98dCnzWLDrgIDnA
-						wVnYGX27QbkNJsTJbXeQpJh3dkrPq+jlp3cZM6XQ0bUsJh76JqOzhJDUzmyZ4FMR
-						aWvAm0sBcprSf5nxiOPH2VzCyun/C1EIK2gU9CrUxFTIfKptEPrkuGFXh5xSOn4y
-						9/68TPv/SE0XsPwEBCdqZ/EpbOuaJDZ2EzOe1c9fxpKtR7CuGMx71haY85/6knbZ
-						HwIeHA03MkHxE6ZQUNjnusDdZWaany+hGLK/CkK2IIyotfZ2IsPcPIaCUxCFQQID
-						AQABo0QwQjAhBgNVHREEGjAYghZzcGllcmMuc2lsdmVyY2hhaXIuY29tMB0GA1Ud
-						DgQWBBTSNV95kaVHM+na7Z+piM/kAwguvzANBgkqhkiG9w0BAQUFAAOCAQEAMy9J
-						71MkiFqNmDkx0qyZTfw8LZf3n7hZQzk9+/oC7+UOMr2gRQov8Gr78SYygJJQj+Ga
-						50T+6qn/iutj7yiW2fFE6ODzTFWwx9NmsRaPEK59asVuvzGLIZFiT1izkZZs8rJB
-						5kdJ3uAQgF2L+HETUGLVI7Qq2fcNfOVVkewlsadhCxScCYg0FbN4Xxk4RDdjxS2Y
-						XL1JpLRQV3Uh1mO4W/nFIKedVJBxlCXMHX0uRx1kEq0xUHDGZvADeJh5DGTDy0Sm
-						lwBvLW3jYxApTijN0OtJY5T+FrCKi0GHAmxfXJHhgOvd3UbnhjSx7aPiIkMY6TIE
-						tDq3WK+nizIMVNDEcg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://spierc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spierc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spierc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spierc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spierc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spierc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Staging: SPIE Digital Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://spiedigitallibrary.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:technicaloperations@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Operations</GivenName>
-    <EmailAddress>mailto:technicaloperations@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-wk-development-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-wk-development-shibboleth.xml
deleted file mode 100644
index 3a9b1a9f..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-wk-development-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.silverchair.com/wk/development/shibboleth">
-  <!--
-		This is a "Silverchair Dev: Wolters Kluwer Health Library" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2014-05-13T13:24:22Z">
-      <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://healthlibrary.dev.ssc.int/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIJAM4mt4HjZTAdMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWhlYWx0aGxpYnJhcnkuZGV2LnNzYy5pbnQwHhcNMTQwNTA4MjA1NjM0WhcN
-						MTkwNTA3MjA1NjM0WjAkMSIwIAYDVQQDExloZWFsdGhsaWJyYXJ5LmRldi5zc2Mu
-						aW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnH2SvahuxzYrG2vg
-						YlVQRtgofqTbunyCsaZPZaTAh4/jZBL/vTzXJmNzS+E6w4H9+TJSjh4aqJrKJ/PZ
-						g39AAYwcFzAmUHn1FJVuG95LXmzMLYDCNlm8eJg9b+KZRUOQHauH9bmUZJGUYfby
-						QqxDJ20tw4RcnixvH+LO2IvIgh8GObI5kTjuwHrC3JkdYTgd8FKRHVC1MfsQItRh
-						bejY9cvU6sG27psysGDdxWlbS1NGfCE5zEQoKtCJJEJc7lcg+8tiuH4WvQ3NQY2C
-						D4y8p99ymSF2TJFFUlwVePNRNhESod6v/xKxN31xafJKlRg/ij4/WF6Krxow9Oig
-						vKGS8QIDAQABo30wezBaBgNVHREEUzBRghloZWFsdGhsaWJyYXJ5LmRldi5zc2Mu
-						aW50hjRodHRwczovL3NwLnNpbHZlcmNoYWlyLmNvbS93ay9kZXZlbG9wbWVudC9z
-						aGliYm9sZXRoMB0GA1UdDgQWBBRJ/uKkXqFZ+BTyqIUHrwtgEX7rhDANBgkqhkiG
-						9w0BAQUFAAOCAQEARvDVj3Ruyhy4E+dA87E98wayBUA/AryDbRSRlUsev4Jv2Ke0
-						u5rd11kOlH1XdKy6u+PG2x40OfBMAsOwVySBuEAXaQtQuWaudunqd6VWZWWT408L
-						23yBKeIGxdF3U0JRScDofsw42DYmunAVo9+s+DxG7tlUZH8KCUP0Gdl9MhybBeJ8
-						/DSTUyulPtQt0FMtAkI40yL4fBYO5tyeA2vI/KLlGZ2QtZL/9JHaMS2fXyfmfZOP
-						lIjfB2fGvFOB3MTZBGQPcDQmaOo5L4CPPyV/K/EogvjK5sQ34yO5Lm44G1QWWAXl
-						IGpJC/ak3Nz/isC5vMl7v2NAxF12Htfk8DQOtg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://healthlibrary.dev.ssc.int/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://healthlibrary.dev.ssc.int/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Dev: Wolters Kluwer Health Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://healthlibrary.dev.ssc.int/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Hirst</SurName>
-    <EmailAddress>mailto:khirst@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-wk-production-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-wk-production-shibboleth.xml
deleted file mode 100644
index 3dd3b6b0..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-wk-production-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://sp.silverchair.com/wk/production/shibboleth">
-  <!--
-		This is a "Silverchair Production: Wolters Kluwer Health Library" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2014-05-22T10:13:51Z">
-      <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://lwwhealthlibrary.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJALWFGogVxAS2MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNjbS1wcm9kd2ViMDguc2lzLmxhbjAeFw0xNDA1MTkyMDUwMzdaFw0yNDA1
-						MTYyMDUwMzdaMCAxHjAcBgNVBAMTFXNjbS1wcm9kd2ViMDguc2lzLmxhbjCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhlZv6BETquXyvEmf8oSffyC5pz
-						icdjsRznZHl1qBOlAjS5Eg9IktDIyzleBfFEEcduI/DhQ3WOg3qmCuhbAJnSEgps
-						lTRZAj5k7C9DHL4X3bAt6Hi4IS8D2R2N7INaXpQK5aLR/DuB5FglpEQMWcnTzUvC
-						FCA1jv48KvlsXL93dc7Q8ULDG7IWOSdEJyy02jP/TU6ZN8hRIq4WSuyC48JieodB
-						5aFxvr6pOHncTLb92wUyD7ER9fRJmDBQ2unCVwmJrwRfIjxFoZX8T0xZzhoJRguP
-						UWQdJ5oJ3gARrZ/ZCW+i4OLRPpWEDoeAAK2UkanEto6diwYGkRXUr1O1MS8CAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVc2NtLXByb2R3ZWIwOC5zaXMubGFuMB0GA1UdDgQW
-						BBRQrPatpd/nNs6l0KDSrXJADjhFijANBgkqhkiG9w0BAQUFAAOCAQEAjqPAWnJG
-						CAqkQzV0QtDiDvJ3CHRQrb4QyVWnIMw8ZY5SJL9VWRJjBoegrIhY+u0hMDtsjveH
-						GeR5mPej7fQ8kQL4IqvdNsulj/Du6RB1Z1oOXS7XKF1O+pK/sr3AJji9lxh4O6ir
-						FZd5eLT/2O9yYABsfsW2DQDTRW/vovQ++jOTlWLOW+UGdkMGtFemlZ8R+PBsq5AA
-						D8Sokc2SljU6av3gfZwm1dHxIru0BA5hR+iwsN48QV6SGyMeLF1gqgcxa3GUjl40
-						OFyN7PBLATDkX9S1xjUSySmjbgl64V9NLDH2kLJcKSm9SvTTqItvyr24+vW7mP+U
-						SVE9x2xO/0m9Dw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://lwwhealthlibrary.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lwwhealthlibrary.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Production:  Wolters Kluwer Health Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://lwwhealthlibrary.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:ShibbolethAdmin@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Hirst</SurName>
-    <EmailAddress>mailto:khirst@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.silverchair.com-wk-staging-shibboleth.xml b/swamid-interfederations-2.0/sp.silverchair.com-wk-staging-shibboleth.xml
deleted file mode 100644
index 50843390..00000000
--- a/swamid-interfederations-2.0/sp.silverchair.com-wk-staging-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://sp.silverchair.com/wk/staging/shibboleth">
-  <!--
-		This is a "Silverchair Staging: Wolters Kluwer Health Library" Shibboleth SP for Silverchair Science + Communications, LLC.
-	-->
-  <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="2014-05-16T11:20:21Z">
-      <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://healthlibraryrc.silverchair.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVjCCAj6gAwIBAgIJANemRPFFotJuMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-						BAMTH2hlYWx0aGxpYnJhcnlyYy5zaWx2ZXJjaGFpci5jb20wHhcNMTUwNjA5MTgz
-						NTMyWhcNMjUwNjA2MTgzNTMyWjAqMSgwJgYDVQQDEx9oZWFsdGhsaWJyYXJ5cmMu
-						c2lsdmVyY2hhaXIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xRVCIICMw+pomhROCVVSVpi6SnVkBzBPRDlNKXUPGMJTIjhQbcwB0TeEuS+xW9RN
-						NY7uu4FoeAgUMo3IHBruLCX4JV46u0oOmw+pZXfb8CDFDmRz0LHxcUEmGTltpske
-						Ajw+0kTIE62fZ2vs3FCkp/QNynPq1O3Ck/akLGWtZ4occtRFfCnSpN4+lCfFJlap
-						1gDcRE7H01hp0IPa2ggK2o+QSsE8YCpf1BPDl1kExXXnVka4ecWtv63a7E1Q65wX
-						otlwvz9UD1jg+1eXA11MYgah1XK2l3mjYy89rqAC3QXxAI/yw02SH9n8TEC+nwzb
-						bnEVnEBMPsJfkBtKwsb9PwIDAQABo38wfTBcBgNVHREEVTBTgh9oZWFsdGhsaWJy
-						YXJ5cmMuc2lsdmVyY2hhaXIuY29thjBodHRwczovL3NwLnNpbHZlcmNoYWlyLmNv
-						bS93ay9zdGFnaW5nL3NoaWJib2xldGgwHQYDVR0OBBYEFIOj/LVIr5NcoUp0vsm9
-						Jew620lqMA0GCSqGSIb3DQEBBQUAA4IBAQCF9Yt2xy+dTIBZTB1yNMFurSXWS+CX
-						GqhczWvso5MXRMUnD+w4mAoVVPE2KvJHi5XeQyQB23HBCI9cQt0fEhy3gf1ySQDM
-						ROCHfjy4bsig8tB17hFKYh0kn2OdICIQ2/5P3NezT1CTSRUhvLd/TBKCejNNK0aM
-						9sAxcwHazoXQI26JW3LekWTQhAjMI5/9QogzWEOP8nY0fFU2q0uFizw6NpJugv83
-						Ik3lqQT6SDFjVEe4hInI7jBQbkLudMIotGPeTNxgF1C2qOHTr8q0phZz+YQnTikV
-						RQNj1gLvwUV5w6Ci5TgGjq+ceVJRpDssoSst3fGXAbE1O2ncFR6ZBsWx
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://healthlibraryrc.silverchair.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://healthlibraryrc.silverchair.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Silverchair Science + Communications, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Silverchair Staging: Wolters Kluwer Health Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://lwwhealthlibrary.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Shibboleth Admin</GivenName>
-    <EmailAddress>mailto:technicaloperations@silverchair.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Operations</GivenName>
-    <EmailAddress>mailto:technicaloperations@silverchair.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.strubi.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp.strubi.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 85275d0a..00000000
--- a/swamid-interfederations-2.0/sp.strubi.ox.ac.uk-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://sp.strubi.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Division of Structural Biology" Shibboleth SP for the University of Oxford.
-		-->
-  <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="2015-04-28T07:59:01Z">
-      <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://sp.strubi.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-							MIIDCTCCAfGgAwIBAgIJAL/JPtEDio6dMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-							BAMTFmVnZ25vZy5zdHJ1Ymkub3guYWMudWswHhcNMTUwNDIzMTEwMjU2WhcNMjUw
-							NDIwMTEwMjU2WjAhMR8wHQYDVQQDExZlZ2dub2cuc3RydWJpLm94LmFjLnVrMIIB
-							IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuW+xvQ4Imque0Mxrbuxo3X9e
-							Tx4ZkdmR/Qfry7PZdHVLgEIeMzkcsKd8ulgqcrfMTT93CdUfeNnGPEGQra+76LAQ
-							rl38x09889S2MIPrgMgTL3zuVgrVLqQwGKtpmQFzpXo65W1K1MzuVyhugd0aFjlO
-							hzANSiTfpU7Tw2zwFDBLlqigjriV/LjDcu1cVPjercqNNZYC4OIqhS61XlAUHcqe
-							OMUZjcBv6+0qpA7Y3b2Zy0RaRo8+zAxRYcrpiT1LMyCd/3hpGXQn2FnIgVBcR5kM
-							c/Ac+CrHhds6z56zcgcbk87KpyaOPnXttzkaITRBDDwUWU9CUJsYNA7nmDNzCwID
-							AQABo0QwQjAhBgNVHREEGjAYghZlZ2dub2cuc3RydWJpLm94LmFjLnVrMB0GA1Ud
-							DgQWBBR/fdq7edXopCysSIW6HteQPtUCvzANBgkqhkiG9w0BAQUFAAOCAQEAdVOc
-							seGBQxVeyDTDqLQecyL3go/qJQmk3agHzfAOG8GbNIzRFODugvbbbzv4AZMFUkgi
-							agEEdhuctaVxrrEmeD8IcaqU/Zaq32mCBCnwnc2InPzyGxNZ4wyo5DRH05QypYjc
-							VexK4t8q+FIK2U8tExUv86t9qHa8Vp+LromPEceLmljvYVg3pYogrAbmZqBzTvW8
-							ezInzJrXCw7cDIRnGqrKp2hp9hS23C3SnxpYFofAeyMdnLcG4HTRasvCx0FNu1Qp
-							U3fQV0/6WlIjdp/hYDa9bNp/t9lOb7qj6/GOml96mhyNDpYGos+3UXPvgEJzwGPy
-							W1KLJhYtR1M9XiLeuw==
-						</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.strubi.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="4"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.strubi.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.strubi.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.strubi.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://app.strubi.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Division of Structural Biology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.strubi.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@strubi.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Webmaster</GivenName>
-    <EmailAddress>mailto:webmaster@strubi.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.studentsponge.com-shibboleth.xml b/swamid-interfederations-2.0/sp.studentsponge.com-shibboleth.xml
deleted file mode 100644
index 6695c03f..00000000
--- a/swamid-interfederations-2.0/sp.studentsponge.com-shibboleth.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://sp.studentsponge.com/shibboleth">
-  <!--
-		This is a "Student Sponge" Shibboleth SP for Student Sponge 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-10-02T17:00:32Z">
-      <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://sp.studentsponge.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://sp.studentsponge.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJALYqZP4B0mCPMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHNwLnN0dWRlbnRzcG9uZ2UuY29tMB4XDTEzMDkyMDE5MTAwM1oXDTIzMDkx
-						ODE5MTAwM1owHzEdMBsGA1UEAxMUc3Auc3R1ZGVudHNwb25nZS5jb20wggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnGQZZo7AIdk66OMGPdbZ1fS5zgraJ
-						g1hN8bgJ4MoxCYHIj/CDMmYwA+ytanSfMs6U3fkTLQ+dhDKFQGqu7qafQTW01lCU
-						hPVZ8MdzgPM3tRqpMzl9/HyuJlJNgNUkqmbPT9Mwn2XezlFvt/gH/yOQBrrcQCNh
-						ZlByu4ye36m4zJu5KmBuFEmmgSQakFJopq5kNLz8q/t1j+IIfqbPdtHXvS757d58
-						aoZYQv8TWQJPxgH7b8T/FjUM+PSqhcuxpSrFHsrP7ymjdeRjDYy9Ne1dRUHOYdFt
-						WIXv79vIbigTD3r8451IqONlJEKepFK8tmWqzlZP/hscCPXkGZ3o4D1LAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFHNwLnN0dWRlbnRzcG9uZ2UuY29tMB0GA1UdDgQWBBSq
-						5sq3KKEycHAzxzWF06kVNHhIUjANBgkqhkiG9w0BAQUFAAOCAQEAMoV5GJ+pOTmU
-						zI61k8AjKNU0rQtbZ1SPKxdy538McHq21MbcuR/aLS62itcbNz+3DQtzx3inrx8N
-						dT5H+hSbt0PRw3X3vmsqWPWzQJhp/XI3BYk+ydRvM2GtZrRH81sx6pJoXnAV7RwM
-						bIta8D3rYLx2ZTs+/GGrArLS48WmH338EW9Ind+RuBhfAC6xcoApTaF+VPSefQZ/
-						Q+PaTVlRgeskhX2LpBiTyJ36xqZyHPbhsBSUAZbSWytqN9wsEPWRPkjvMzlpziLG
-						ofHQDrKLmgZz0yWkkCTo9w3seESEViIiz9pivL405wJGFltc7HhuI56FsG763W8v
-						mMCgoLVuAA==
-					</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.studentsponge.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.studentsponge.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.studentsponge.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.studentsponge.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.studentsponge.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.studentsponge.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Student Sponge Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Student Sponge</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.studentsponge.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Swapnica</GivenName>
-    <SurName>Jain</SurName>
-    <EmailAddress>mailto:swapnica@personaliveservices.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Swapnica</GivenName>
-    <SurName>Jain</SurName>
-    <EmailAddress>mailto:swapnica@personaliveservices.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 cd9a8634..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">
-      <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.swamid.se/category/nren-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</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>
-      <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 04deb4d5..00000000
--- a/swamid-interfederations-2.0/sp.swamid.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://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: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 45e198a1..00000000
--- a/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.textgridlab.org/shibboleth">
-  <md: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:AttributeValue>http://refeds.org/category/research-and-scholarship</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>
-      <idpdisc:DiscoveryResponse 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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/2.0/Shibboleth.sso/SAML2/POST" index="7"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">TextGridLab</md:ServiceName>
-      <md:ServiceName xml:lang="en">TextGridLab</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Virtuelle Forschungsumgebung TextGridLab</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">TextGridLab virtual research environment</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="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="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="o" Name="urn:oid:2.5.4.10" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e112</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e112</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.gwdg.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.gwdg.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Martin</md:GivenName>
-    <md:SurName>Haase</md:SurName>
-    <md:EmailAddress>mailto:martin.haase@daasi.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Christof</md:GivenName>
-    <md:SurName>Pohl</md:SurName>
-    <md:EmailAddress>mailto:christof.pohl@gwdg.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>TextGrid</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@textgrid.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.thestudentroom.com-entity.xml b/swamid-interfederations-2.0/sp.thestudentroom.com-entity.xml
deleted file mode 100644
index 4e1409a9..00000000
--- a/swamid-interfederations-2.0/sp.thestudentroom.com-entity.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://sp.thestudentroom.com/entity">
-  <!--
-		This is a Shibboleth SP for The Student Room Group Ltd.
-	-->
-  <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="2015-01-21T09:35:48Z">
-      <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">The Student Room Group Ltd.</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Student Room SP.</mdui:Description>
-        <mdui:Logo height="112" width="123">https://static1.tsrfiles.co.uk/images/base/logo.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.thestudentroom.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://sp.thestudentroom.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAOQNyj4JRfiuMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNwLnRoZXN0dWRlbnRyb29tLmNvbTAeFw0xNTAxMjIxMTAyNTVaFw0yNTAx
-						MTkxMTAyNTVaMCAxHjAcBgNVBAMTFXNwLnRoZXN0dWRlbnRyb29tLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMKvl0LQot8N6i1fvhRTGjv127ap
-						IxWDJn+/vnCv7G/+UuSVJZWAUSrJB+ialjNWSTq8aV6cChi4ZbXrbvjALd7pxAop
-						jhyZbU2QKO3IfJs19f+23TP4W3kK8jw8gH9qY9jbLUQR/nG3HoM5nlgIRUd0+fX0
-						JiDxKq8Z3J62cE+f7eU9C+9RFq3BFju8sXK52aFyXAOMmzvSNQtNiERL2L8ep4jD
-						f7Y18pKfo+mMk7tNMcJbIFzGIPHqiY1aXIlWYLNAYJY5ifcVlK5bO9kGoZHF8/wC
-						DE3FWC3DEEI8GdGHyE/51wavQQAlQGPrJOkrHCASfuh4qrYLqVFo9SBJWj0CAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVc3AudGhlc3R1ZGVudHJvb20uY29tMB0GA1UdDgQW
-						BBRscE3ncwoF76gsgBUgGIIWI7qplTANBgkqhkiG9w0BAQUFAAOCAQEAqekMouVr
-						qGq+W0OljWwinzdXO78phag5LIwKDbVzRJYpgzpscoJhHMm8BMrAA4Qkp5e0s3Qu
-						WqXkHU/Io8rfU5Gq1cYWQMD4qY0Os6lsN0J51SgAAUhNzyYGn+4AXbZWsh2/CYYd
-						ScNd/jebhXMIBEcScQVGPIa8VQcdwX01SzwbgQR0tA6/Q2a+xvnsqcCnEkgSZFGk
-						enIxKHgvQxOdL9lDDqJgsT5xmbqv7TLrwbpPHFnQwdRV5R7U3wUHmzzljbAEF8B5
-						IAdwjUmiIgwi5TyEulA8NXC1w9DQuR3TBQP7NAMXYyu65JDIVqeD9Udk3vXkj87D
-						vJgWzXpNHSoUNA==
-					</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.thestudentroom.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.thestudentroom.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.thestudentroom.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.thestudentroom.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.thestudentroom.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.thestudentroom.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Student Room Group Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Student Room Group Ltd.</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.thestudentroom.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@thestudentroom.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Dept.</GivenName>
-    <EmailAddress>mailto:techies@thestudentroom.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.tshhosting.com-shibboleth.xml b/swamid-interfederations-2.0/sp.tshhosting.com-shibboleth.xml
deleted file mode 100644
index cd72404a..00000000
--- a/swamid-interfederations-2.0/sp.tshhosting.com-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://sp.tshhosting.com/shibboleth">
-  <!--
-		This is a "Thomson Reuters" Atypon eRights SP for Thomson Scientific Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-14T10:17:00Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.isiknowledge.com/" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.webofknowledge.com/" index="2"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://admin-router.webofknowledge.com/" index="3"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Thomson Reuters SP (Web of Knowledge &amp; EndNote Web)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Explore literature in the sciences, social sciences, arts and humanities and publish bibliographies.</mdui:Description>
-        <mdui:Logo height="84" width="292">https://www.myendnoteweb.com/Download/logos/tr-wok-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF7jCCBNagAwIBAgIQH5TpeUp+Ukx0gMOWeqLCZDANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwNjIy
-						MDAwMDAwWhcNMTYwNzExMjM1OTU5WjCB2jELMAkGA1UEBhMCVVMxFDASBgNVBAgT
-						C0Nvbm5lY3RpY3V0MRMwEQYDVQQHFApFYXN0IEhhdmVuMTAwLgYDVQQKFCdUaG9t
-						c29uIFJldXRlcnMgKFRheCAmIEFjY291bnRpbmcpIEluYy4xGzAZBgNVBAsUElRo
-						b21zb24gU2NpZW50aWZpYzEzMDEGA1UECxQqVGVybXMgb2YgdXNlIGF0IHd3dy52
-						ZXJpc2lnbi5jb20vcnBhIChjKTA1MRwwGgYDVQQDFBNzaGliLnRzaGhvc3Rpbmcu
-						Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyW3478pCuAxKLWVx
-						n6RDCOsnRHN4GP9Z10GWhuE9CTCe+Z95sfeMhwwbpYgclX0ygYv8ZTsDqfu6Ln78
-						RDg/5G4H6ceA0dgiE7FT3yWCR/puIb8kWYgaq5XD5jq+e0cCWWeLhkL836D8LDuI
-						OwKXvbbzaRql38RxJj59lg/XARc7j6UdMUPcKcJrkSeuMrn6gw626x4yL01R5uEc
-						5s+VuwodLo1hTiRsewCOyfX0N7Fv16j8bxEecZtTfGOSL5FoxcjXjAf3JQcFoKr7
-						76IY5ImPxNnS1vwfx84tWN0m/481ho/Q9rH15jChF/QXvIENCu/LUfURO0UajjHs
-						yGADdQIDAQABo4IB0TCCAc0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwRQYDVR0f
-						BD4wPDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMy1jcmwudmVyaXNpZ24uY29t
-						L1NWUlNlY3VyZUczLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYI
-						KwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwHQYDVR0lBBYw
-						FAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0
-						AWPYvnmlMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au
-						dmVyaXNpZ24uY29tMEAGCCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFp
-						YS52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFe
-						oFwwWjBYMFYWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4myms
-						SweLIQUYMCYWJGh0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjAN
-						BgkqhkiG9w0BAQUFAAOCAQEAJ+ckyvFj6ePTWp6PMkHSonNavE43FfEIw0cRoKWv
-						SgEwHPLRVpvS+iOwTzeTjy3Srph58ZbZugvjjp3Bc1vdbwcmUEsXGm2MN+M6tYK0
-						qIIvS9hGIKClhzKR43BEybO2BttESL2Bv2UUJcVH0Ds3//6pcUyaHuIxbnKbezfn
-						j5ijhM3Bth829thSjIr9zYbqKdYl2sBFhzBQe5oPdCNEger4Nn8SqbrMMbP4IhIX
-						IP8ivy/IUHCt3nZongEQgQsPnG1m3LHyWdTQ98XeHbgn8YOJdRPbsRFtNIYyXurv
-						PDhe2VbSBBIUxBcGBTWkewIXexyKjQlfjFXQiOdS0M6zfQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://admin-router.webofknowledge.com/?auth=Shibboleth" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cortellis.thomsonreuterslifesciences.com/ngg/sso/saml2/responseGateway.do" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2&amp;auth=Shibboleth" index="111"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=PROF&amp;auth=Shibboleth" index="112"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2ESI&amp;auth=Shibboleth" index="113"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.incites.thomsonreuters.com/?DestApp=IC2JCR&amp;auth=Shibboleth" index="114"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2" index="115"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2ESI" index="116"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_IC2JCR" index="117"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.incites.thomsonreuters.com/?auth=Shibboleth1_PROF" index="118"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Thomson Scientific Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Thomson Scientific Inc: Thomson Reuters</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.thomsonreuters.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>European Help Desk</GivenName>
-    <EmailAddress>mailto:ts.cts.emea@thomson.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:websupp@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.tshhosting.com.xml b/swamid-interfederations-2.0/sp.tshhosting.com.xml
deleted file mode 100644
index 06af7b79..00000000
--- a/swamid-interfederations-2.0/sp.tshhosting.com.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.tshhosting.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.isiknowledge.com/" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.webofknowledge.com/" index="2"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.webofknowledgev4.com/" index="3"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shib.tshhosting.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.tshhosting.com,OU=Terms of use at www.verisign.com/rpa (c)05,OU=Thomson Scientific,O=Thomson Reuters (Tax &amp; Accounting) Inc.,L=East Haven,ST=Connecticut,C=US</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF7jCCBNagAwIBAgIQE6nUqB9NUlBYPyzlywMpUjANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwNzA2
-MDAwMDAwWhcNMTIwNzEwMjM1OTU5WjCB2jELMAkGA1UEBhMCVVMxFDASBgNVBAgT
-C0Nvbm5lY3RpY3V0MRMwEQYDVQQHFApFYXN0IEhhdmVuMTAwLgYDVQQKFCdUaG9t
-c29uIFJldXRlcnMgKFRheCAmIEFjY291bnRpbmcpIEluYy4xGzAZBgNVBAsUElRo
-b21zb24gU2NpZW50aWZpYzEzMDEGA1UECxQqVGVybXMgb2YgdXNlIGF0IHd3dy52
-ZXJpc2lnbi5jb20vcnBhIChjKTA1MRwwGgYDVQQDFBNzaGliLnRzaGhvc3Rpbmcu
-Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyW3478pCuAxKLWVx
-n6RDCOsnRHN4GP9Z10GWhuE9CTCe+Z95sfeMhwwbpYgclX0ygYv8ZTsDqfu6Ln78
-RDg/5G4H6ceA0dgiE7FT3yWCR/puIb8kWYgaq5XD5jq+e0cCWWeLhkL836D8LDuI
-OwKXvbbzaRql38RxJj59lg/XARc7j6UdMUPcKcJrkSeuMrn6gw626x4yL01R5uEc
-5s+VuwodLo1hTiRsewCOyfX0N7Fv16j8bxEecZtTfGOSL5FoxcjXjAf3JQcFoKr7
-76IY5ImPxNnS1vwfx84tWN0m/481ho/Q9rH15jChF/QXvIENCu/LUfURO0UajjHs
-yGADdQIDAQABo4IB0TCCAc0wCQYDVR0TBAIwADALBgNVHQ8EBAMCBaAwRQYDVR0f
-BD4wPDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMi1jcmwudmVyaXNpZ24uY29t
-L1NWUlNlY3VyZUcyLmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYI
-KwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFKXvCxHOwEEDo0plkEiy
-HOBXLX1HMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au
-dmVyaXNpZ24uY29tMEAGCCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUcyLWFp
-YS52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzIuY2VyMG4GCCsGAQUFBwEMBGIwYKFe
-oFwwWjBYMFYWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4myms
-SweLIQUYMCYWJGh0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjAN
-BgkqhkiG9w0BAQUFAAOCAQEAH+DiV8qdzW762rt7SIY7+z9xJSobGqzQKZRRFv00
-0lt1peE/UDGyRSc7fSSfnCXgjKxYOLT43z0zFqvX2B3au1E9Sskk4IlBygjRkaJr
-jRYTJ4xBOMx6ppD93xXC59Unv9VwK5qo/qObqnMWz5ZPJBL8UOQ9QgXfQx0VJ4dx
-avmAGfeVrcSW8ih+s1KLD2D8F00a8A4wz5HvsGqL3zcph34ZrnHi0CKpOVW75LlZ
-kggo+nm06wWcaYtATsvsvkiBgFhnU8avQWMM7ienzabFPzABgjgq5OgDb6cc3cPm
-TbuT7A0uVRSN/CkntM5VSDg6KlZId4pE3QsD7TcsbMJirA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.isiknowledge.com/?auth=Shibboleth" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.isiknowledge.com/?auth=Shibboleth" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledge.com/?auth=Shibboleth" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.webofknowledgev4.com/?auth=Shibboleth" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.webofknowledgev4.com/?auth=Shibboleth" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Thomson Scientific</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Thomson Reuters - ISI Web of Knowledge and EndNote Web</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.thomsonreuters.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Manoj</GivenName>
-    <SurName>Panicker</SurName>
-    <EmailAddress>manoj.panicker@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>websupp@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.uk-plc.net-shibboleth.xml b/swamid-interfederations-2.0/sp.uk-plc.net-shibboleth.xml
deleted file mode 100644
index c45c7075..00000000
--- a/swamid-interfederations-2.0/sp.uk-plc.net-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://sp.uk-plc.net/shibboleth">
-  <!--
-		This is an "@UK PLC" Shibboleth SP for Cloudbuy PLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-01-18T18:08:20Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJAIV70zuQ2vBVMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXNwLnVrLXBsYy5uZXQwHhcNMTEwMTE3MTEwNDU5WhcNMjEwMTE0MTEwNDU5
-						WjAYMRYwFAYDVQQDEw1zcC51ay1wbGMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAm69+UMm20EyOMmETcniHi59ED3GW+f1B+qNgCQZpP+PRNnLA
-						Z0+lLrrBrAb1oDjUqt3ya45AUVcHxDuEtpQnbIsvSvQztQr/J7Il9rBAHa7MKQVl
-						6vWt8VQA8njt/Zy3Zwed6CvbPyB6jBe6KrrHdqfdXBXqxXt5KbcNb4nTKUIe081p
-						wMkNThERBLbFg48FDsSytT2D+ERsz4Ivg8fW6kTEl7Fvx35lK4rBUQjIBcsWNuFN
-						hTy29mfVAZOWq0TnrzE84uYioNf5LrZiZSdmPFDarqyl9/T2Lo7OeG+8ZGxpOe8f
-						BRVhqpY/xHev7S1hdHTn8f+fM59PiWA8IUN+xwIDAQABozswOTAYBgNVHREEETAP
-						gg1zcC51ay1wbGMubmV0MB0GA1UdDgQWBBQm+W+pJIIr4Gh6H9Hl7CXWBYnjYTAN
-						BgkqhkiG9w0BAQUFAAOCAQEAhN9iAGeAhzrOkYr5wRWcZmJTaD1XCMZsgfB2sF/Z
-						+Xu8dlJ2wHw+xubq2PU7aYZRGb3QblGODdowyDzV1/hQ43/psakSBmm14VDqKu7M
-						/+ZvM5hCUoGfTgXRaUXPVhDbNLJyoFewg9IEYS1UXQo6GuXoFqOf602Bd9SWpfgM
-						WrjGCgrkN7arw85MqyiWoP5lEH9NMw3yyrYqEjV5L15ciszslzRCLsMF2viSpJDH
-						rmLaDUQp1MFaZc8ulVkIJIc2vvj4AdZ5BS3N8qsPc6+l4E7aunsP/WXxxFqT8VVa
-						vkVcbTLRcJHyGdZsf++gt0fT+WmWbQsVC0Y1ILG/LNkfaA==
-					</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>
-						MIIC7jCCAdagAwIBAgIJAIV70zuQ2vBVMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXNwLnVrLXBsYy5uZXQwHhcNMTEwMTE3MTEwNDU5WhcNMjEwMTE0MTEwNDU5
-						WjAYMRYwFAYDVQQDEw1zcC51ay1wbGMubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAm69+UMm20EyOMmETcniHi59ED3GW+f1B+qNgCQZpP+PRNnLA
-						Z0+lLrrBrAb1oDjUqt3ya45AUVcHxDuEtpQnbIsvSvQztQr/J7Il9rBAHa7MKQVl
-						6vWt8VQA8njt/Zy3Zwed6CvbPyB6jBe6KrrHdqfdXBXqxXt5KbcNb4nTKUIe081p
-						wMkNThERBLbFg48FDsSytT2D+ERsz4Ivg8fW6kTEl7Fvx35lK4rBUQjIBcsWNuFN
-						hTy29mfVAZOWq0TnrzE84uYioNf5LrZiZSdmPFDarqyl9/T2Lo7OeG+8ZGxpOe8f
-						BRVhqpY/xHev7S1hdHTn8f+fM59PiWA8IUN+xwIDAQABozswOTAYBgNVHREEETAP
-						gg1zcC51ay1wbGMubmV0MB0GA1UdDgQWBBQm+W+pJIIr4Gh6H9Hl7CXWBYnjYTAN
-						BgkqhkiG9w0BAQUFAAOCAQEAhN9iAGeAhzrOkYr5wRWcZmJTaD1XCMZsgfB2sF/Z
-						+Xu8dlJ2wHw+xubq2PU7aYZRGb3QblGODdowyDzV1/hQ43/psakSBmm14VDqKu7M
-						/+ZvM5hCUoGfTgXRaUXPVhDbNLJyoFewg9IEYS1UXQo6GuXoFqOf602Bd9SWpfgM
-						WrjGCgrkN7arw85MqyiWoP5lEH9NMw3yyrYqEjV5L15ciszslzRCLsMF2viSpJDH
-						rmLaDUQp1MFaZc8ulVkIJIc2vvj4AdZ5BS3N8qsPc6+l4E7aunsP/WXxxFqT8VVa
-						vkVcbTLRcJHyGdZsf++gt0fT+WmWbQsVC0Y1ILG/LNkfaA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.uk-plc.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.uk-plc.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.uk-plc.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.uk-plc.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.uk-plc.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.uk-plc.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.uk-plc.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.uk-plc.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.uk-plc.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.uk-plc.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cloudbuy PLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">@UK PLC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uk-plc.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>@UK PLC Customer Support</GivenName>
-    <EmailAddress>mailto:support@cloudbuy.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Roberts</SurName>
-    <EmailAddress>mailto:paul.roberts@cloudbuy.com</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/sp.vivomiles.com-shibboleth.xml b/swamid-interfederations-2.0/sp.vivomiles.com-shibboleth.xml
deleted file mode 100644
index 13c9ae01..00000000
--- a/swamid-interfederations-2.0/sp.vivomiles.com-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://sp.vivomiles.com/shibboleth">
-  <!--
-		This is a "Vivomiles" Shibboleth SP for Everlution Software Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://sp.vivomiles.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN66lpSg173QMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHNwLnZpdm9taWxlcy5jb20wHhcNMTEwNDA1MTMzMTU5WhcNMjEwNDAyMTMz
-						MTU5WjAbMRkwFwYDVQQDExBzcC52aXZvbWlsZXMuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAzARjQBBuE87LSlNd6570gHLigYhVXr46123MR5ln
-						/VOeFHcnof6+To7Ztlh81cM4BoR9tf5j7UxzSFW5iepICzDDzSmT4IyoBvDwZwCT
-						nEw5RuYdlLDK26PVad6EhSMAm9JTmICCtO1VqfeslKCk5/MS2aq+I2W9aypnNNrC
-						3q8tg3fzmnXaBYBhJ3ToUszK/y/fu2cpzZZA6NaJjnmDe0GvJiqP2O3Ylx46QABv
-						8tU/Pur11+htjB4JVDS/SaiXtRP07E6db2EBYUbvYiG5hQZal+J+XBHyRIyHP5AP
-						RKdb9CGo9JKB+0wl9Gegqh859jUK2vs/Vum4MMczPwIozQIDAQABoz4wPDAbBgNV
-						HREEFDASghBzcC52aXZvbWlsZXMuY29tMB0GA1UdDgQWBBTTtb+JbRhX8ff+vn8w
-						t9K9SiJs/DANBgkqhkiG9w0BAQUFAAOCAQEARXepedwie+WYAgs5k9Xr7TbLD2ut
-						GunzGs/1QdR4rA6w7vz93tL2zYDq/D7GcfNnR343Y2/0nRIAbHc+MDo/IrjWxP0c
-						BOa7wztmyrmetlg+Xh8me0VqLoMlTbQms7RrzI1uHzb03qwr6q+bk88Pv0rTWNd3
-						uT01Jln+UHrfihCK+14tXFCr8VOtRad+q28tUyeQ+KIs3kV9K1vCAkP4FX5GCCNn
-						zGhDgZb6TogMbP9LbAMiYAX8n5ye3ffm9059+4qUBCaMNwD2zIxvU/5/JNKu3B1G
-						RPjrEJyHJANuvnu/9Nywj3LyZt4iPzxjZchE7n0pyK4SIcMptWwWbJC1wQ==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN66lpSg173QMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHNwLnZpdm9taWxlcy5jb20wHhcNMTEwNDA1MTMzMTU5WhcNMjEwNDAyMTMz
-						MTU5WjAbMRkwFwYDVQQDExBzcC52aXZvbWlsZXMuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAzARjQBBuE87LSlNd6570gHLigYhVXr46123MR5ln
-						/VOeFHcnof6+To7Ztlh81cM4BoR9tf5j7UxzSFW5iepICzDDzSmT4IyoBvDwZwCT
-						nEw5RuYdlLDK26PVad6EhSMAm9JTmICCtO1VqfeslKCk5/MS2aq+I2W9aypnNNrC
-						3q8tg3fzmnXaBYBhJ3ToUszK/y/fu2cpzZZA6NaJjnmDe0GvJiqP2O3Ylx46QABv
-						8tU/Pur11+htjB4JVDS/SaiXtRP07E6db2EBYUbvYiG5hQZal+J+XBHyRIyHP5AP
-						RKdb9CGo9JKB+0wl9Gegqh859jUK2vs/Vum4MMczPwIozQIDAQABoz4wPDAbBgNV
-						HREEFDASghBzcC52aXZvbWlsZXMuY29tMB0GA1UdDgQWBBTTtb+JbRhX8ff+vn8w
-						t9K9SiJs/DANBgkqhkiG9w0BAQUFAAOCAQEARXepedwie+WYAgs5k9Xr7TbLD2ut
-						GunzGs/1QdR4rA6w7vz93tL2zYDq/D7GcfNnR343Y2/0nRIAbHc+MDo/IrjWxP0c
-						BOa7wztmyrmetlg+Xh8me0VqLoMlTbQms7RrzI1uHzb03qwr6q+bk88Pv0rTWNd3
-						uT01Jln+UHrfihCK+14tXFCr8VOtRad+q28tUyeQ+KIs3kV9K1vCAkP4FX5GCCNn
-						zGhDgZb6TogMbP9LbAMiYAX8n5ye3ffm9059+4qUBCaMNwD2zIxvU/5/JNKu3B1G
-						RPjrEJyHJANuvnu/9Nywj3LyZt4iPzxjZchE7n0pyK4SIcMptWwWbJC1wQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.vivomiles.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.vivomiles.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.vivomiles.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.vivomiles.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.vivomiles.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.vivomiles.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.vivomiles.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.vivomiles.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.vivomiles.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Everlution Software Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Everlution Software Limited: Vivomiles</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.vivomiles.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Thunder</GivenName>
-    <SurName>Raven-Stoker</SurName>
-    <EmailAddress>mailto:thunder@everlution.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Thunder</GivenName>
-    <SurName>Raven-Stoker</SurName>
-    <EmailAddress>mailto:thunder@everlution.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml b/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml
index ba376973..690cd0ec 100644
--- a/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml
+++ b/swamid-interfederations-2.0/sp.vs1.corpora.uni-hamburg.de.xml
@@ -1,39 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sp.vs1.corpora.uni-hamburg.de">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-05-15T09:48: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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+<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.vs1.corpora.uni-hamburg.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://corpora.uni-hamburg.de/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Hamburger Zentrum für Sprachkorpora</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Hamburg Centre for Language Corpora</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Das Hamburger Zentrum für Sprachkorpora bietet einen Zugang zum HZSK Repository, in dem hauptsächlich Sprachkorpora vorgehalten werden</mdui:Description>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">The Hamburg Centre for Language Corpora (HZSK) provides access to the HZSK Repository (mainly including spoken language corpora)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Hampurin Kielivarakeskus (Hamburger Zentrum für Sprachkorpora)</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Hampurin Kielivarakeskus (HZSK) tarjoaa pääsyä HZSK-arkistoon. (Arkisto sisältää ennimäkseen puhutun kielen korpuksia.)</mdui:Description>
         <mdui:Description xml:lang="en">The Hamburg Centre for Language Corpora (HZSK) provides access to the HZSK Repository (mainly including spoken language corpora)</mdui:Description>
-        <mdui:Logo height="23" width="153">https://corpora.uni-hamburg.de/drupal/sites/default/files/hzsk-logo-mittel.png</mdui:Logo>
         <mdui:Logo height="68" width="453">https://corpora.uni-hamburg.de/drupal/sites/default/files/hzsk-logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">https://corpora.uni-hamburg.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://corpora.uni-hamburg.de</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="de">http://corpora.uni-hamburg.de/drupal/en/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://corpora.uni-hamburg.de/drupal/en/privacy-policy</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="fi">https://corpora.uni-hamburg.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://corpora.uni-hamburg.de/drupal/en/privacy-policy</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>vs1.corpora.uni-hamburg.de</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=vs1.corpora.uni-hamburg.de</ds:X509SubjectName>
           <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJANuIbKBKwh2kMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
 BAMTGnZzMS5jb3Jwb3JhLnVuaS1oYW1idXJnLmRlMB4XDTE0MDUwNzEwMTUxMFoX
 DTI0MDUwNDEwMTUxMFowJTEjMCEGA1UEAxMadnMxLmNvcnBvcmEudW5pLWhhbWJ1
@@ -51,56 +37,44 @@ bZcS2wvGCENGebMueDwISTvvyGW3hUoA94K28T5WCr/WNPwDty3yBFvn/wboztZ0
 gQcIJWAcCh//HW4fi7LPZ9DG8OjiK00DinEqm901uznyK0e/NziN/5ExP1d3onxi
 k1oLIeAl0snOKGd1Cw2MfQYh7QaJdXpM2W3aG6UVLNbzjAvInTjMT6rVJIxxGSdE
 00Ev3tKPZ6iDZDjawwChLxAlfAby3JLylUJ4Lg/bh8/fY0SUFHAYpS8+ZPvdO6iR
-LPhJPdKT3mM=
-</ds:X509Certificate>
+LPhJPdKT3mM=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SLO/Artifact"/>
-    <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://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://corpora.uni-hamburg.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Hamburger Zentrum für Sprachkorpora</md:ServiceName>
-      <md:ServiceName xml:lang="en">Hamburg Centre for Language Corpora</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Das Hamburger Zentrum für Sprachkorpora bietet einen Zugang zum HZSK Repository, in dem hauptsächlich Sprachkorpora vorgehalten werden</md:ServiceDescription>
+    <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://corpora.uni-hamburg.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Hampurin Kielivarakeskus (Hamburger Zentrum für Sprachkorpora)</md:ServiceName>
+      <md:ServiceName xml:lang="en">The Hamburg Centre for Language Corpora (HZSK) provides access to the HZSK Repository (mainly including spoken language corpora)</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Hampurin Kielivarakeskus (HZSK) tarjoaa paasya HZSK-arkistoon. (Arkisto sisaltaa ennimakseen puhutun kielen korpuksia.)</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">The Hamburg Centre for Language Corpora (HZSK) provides access to the HZSK Repository (mainly including spoken language corpora)</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="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:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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 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="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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>Timm</md:GivenName>
     <md:SurName>Lehmberg</md:SurName>
     <md:EmailAddress>mailto:timm.lehmberg@uni-hamburg.de</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Hanna</md:GivenName>
-    <md:SurName>Hedeland</md:SurName>
-    <md:EmailAddress>mailto:hanna.hedeland@uni-hamburg.de</md:EmailAddress>
-  </md:ContactPerson>
   <md:ContactPerson contactType="support">
-    <md:GivenName>HZSK</md:GivenName>
-    <md:SurName>Support</md:SurName>
+    <md:GivenName>Timm</md:GivenName>
+    <md:SurName>Lehmberg</md:SurName>
     <md:EmailAddress>mailto:corpora@uni-hamburg.de</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp1.colegsirgar.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sp1.colegsirgar.ac.uk-shibboleth.xml
deleted file mode 100644
index 8ab7fd80..00000000
--- a/swamid-interfederations-2.0/sp1.colegsirgar.ac.uk-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://sp1.colegsirgar.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for Coleg Sir Gar 
-	-->
-  <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="2015-01-20T15:30:30Z">
-      <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">Coleg Sir Gar</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Shibboleth Service Provider for Coleg Sir Gar, which
-					provides online access to Coleg Sir Gar applications</mdui:Description>
-        <mdui:Logo height="142" width="350">https://shibimages.colegsirgar.ac.uk/csg_logo_350.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://sp1.colegsirgar.ac.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://sp1.colegsirgar.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC0DCCAbigAwIBAgIJANFIrDUvJOlkMA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
-						BAMTA3NwMTAeFw0xNTAxMTQxNjE2MDJaFw0yNTAxMTExNjE2MDJaMA4xDDAKBgNV
-						BAMTA3NwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK14YbqRnUY2
-						9Ng3CMJNc6sDK4BdVAHlo9t4f7wU654KhGO3CHcxQoqL5hwtjUafymMx8+YToWSF
-						3Mzn/nC6zeJRWftWxoybvcyof1sYQgmIWO7f9h9klcDFXFfMvIumVHVHUlJL9K+Z
-						txSILIp1HpmTNEzhy425eTvn6ZLw0KO3nq3jSJbKXuhAePKjb4uoxKVbe4degGMZ
-						Q1pndraP5hE2PgQppj5pBj7YjB/O8zoo7Ae9FWuJ9EU38Zn8t38w6hkyZG9TVdK9
-						t07WnmhhMqkAP0DiO3zQn9AndRY6wFoqNYv95St2npoijJg+w5XIBsLITDfUVOYR
-						7QsUhK9LN70CAwEAAaMxMC8wDgYDVR0RBAcwBYIDc3AxMB0GA1UdDgQWBBTIzzX6
-						nK3dI0J1PMI0EG33fWbQ9TANBgkqhkiG9w0BAQUFAAOCAQEAJtcdejLz2iGZkK9o
-						kuWnZbj4ph+QcaW+HQNDhBvbJhMG4SgA3uVCP/ItSdUSrU8me/WwrJPOo6YlkBGl
-						V+QY0J9vCrzSn9rABLZ1HWVwmFCGF6sHzXqT5WhlBdDsV8cEqadERf+YvOCtsrao
-						lMxjYN1WMuZ/ZLCDJxP+0rPOEFFDaAnB58HWXgA3ER1fTAt9YaEctxld9x6vwi3z
-						SAb16SXmCgRoVpxpkU/+wWuoVe5ZpGiE3DBlrFFlrn05ujsrP0bTpkd2Q+3uDpCv
-						0TPj1Uxs5t+3oYBtpACDk2Gx7tjNh42Kdi1hUk6T3BW0GH7NBnzFoLgbUlmELTtU
-						4sgeiw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sp1.colegsirgar.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp1.colegsirgar.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Coleg Sir Gar</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Coleg Sir Gar</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://colegsirgar.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@colegsirgar.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Palmer</SurName>
-    <EmailAddress>mailto:simon.palmer@colegsirgar.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp1.segfl.org.uk-shibboleth.xml b/swamid-interfederations-2.0/sp1.segfl.org.uk-shibboleth.xml
deleted file mode 100644
index 3705f09d..00000000
--- a/swamid-interfederations-2.0/sp1.segfl.org.uk-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://sp1.segfl.org.uk/shibboleth">
-  <!--
-		This is a "SEGfL Website Services" Shibboleth SP for Bracknell Forest Borough Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-18T14:50:55Z"/>
-  </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://sp1.segfl.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://sp1.segfl.org.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJAKo2TwyB3hkyMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCXNlZ2ZsLXNwMTAeFw0xMTEyMTYxNTE0MDBaFw0yMTEyMTMxNTE0MDBaMBQx
-						EjAQBgNVBAMTCXNlZ2ZsLXNwMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMQQA44wvMGBJWDyxubnF0Q5x3+ZZ2E9W6DhGIFlEUv09X+j9WIqNf7a66uQ
-						FW2N1OOTCbn4gDHSKKjQ3kTz03f6XIoGOJVJYJ/6dU0mXmZ5/jqZqWY9fFCoGQBz
-						rylI1SFH7X1O6r/wpPvmp8dbA0/AMwvirXKKhzvvw8F/Jpu5W1g89VXBvDTJ/yjh
-						RJasNM102Qhd8xlXH2N5ZReXXb1yEqzZ7Ss/oigFyXjhiHcxzBk/Zbt45+PyVDxw
-						zfqLJKW763oHunaEXbCq2w5rbYGnlbTLEXc6CjDA4asOxEqY3+xlzqE8yJTngNae
-						+SZQa5I6zSLjEwMz5s4EhJSdPGUCAwEAAaM3MDUwFAYDVR0RBA0wC4IJc2VnZmwt
-						c3AxMB0GA1UdDgQWBBThQdOJbEqv+ifbPsJuWrJSoWjNEDANBgkqhkiG9w0BAQUF
-						AAOCAQEAGNp6mtzGck7Dv7dxc6kZVC8jb9zVbXAFaVMBVyEjyd74E8T3/UTZVB00
-						ABKTImJYdFuSYSxSKLEtDQcMlIDvO/+YW7NuMaJCB1raxAJ5qRAxdqYheICa53uc
-						tokIITAaNj5kVTfnUeLmZTerotNEQRduwzHDKE0X3IqrSLYx0s+maaa7hN7wgL88
-						08KCC5+qL2JQQ6qNCwc/qY/ghhpEMhy3NLWnyrBnuv/4iErY0ogypOi/nXwOyNvn
-						kVBc8iI75C1//VFt+8CiMkY9rnBRxn5IVAHXxVXnrssB/crrmyckb+YgwBBQ8iZa
-						dCprZdnQx0YClGTn1VG3XHxua2BeCw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp1.segfl.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp1.segfl.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Bracknell Forest Borough Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SEGfL Website Services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.segfl.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Heather</GivenName>
-    <SurName>Hadfield</SurName>
-    <EmailAddress>mailto:heather.hadfield@segfl.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Taras</GivenName>
-    <SurName>Johnson</SurName>
-    <EmailAddress>mailto:taras@gooii.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp2.cesnet.cz.xml b/swamid-interfederations-2.0/sp2.cesnet.cz.xml
deleted file mode 100644
index 17b0eb6f..00000000
--- a/swamid-interfederations-2.0/sp2.cesnet.cz.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp2.cesnet.cz/sp/shibboleth/edugain">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CESNET Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A test SP showing released attributes and SAML assertions.</mdui:Description>
-        <mdui:DisplayName xml:lang="cs">CESNET Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="cs">Testovací SP - ukazuje doručené atributy a SAML zprávy.</mdui:Description>
-      </mdui:UIInfo>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp2.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp2.cesnet.cz,O=CESNET,DC=cesnet-ca,DC=cz</ds:X509SubjectName>
-          <ds:X509Certificate>MIIELzCCAxegAwIBAgIEQrOJWDANBgkqhkiG9w0BAQUFADBDMRIwEAYKCZImiZPy
-LGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNuZXQtY2ExEjAQBgNVBAMTCUNF
-U05FVCBDQTAeFw0xMDAyMjIwOTU5MzFaFw0xMTAzMjIxMDI5MzFaMFgxEjAQBgoJ
-kiaJk/IsZAEZFgJjejEZMBcGCgmSJomT8ixkARkWCWNlc25ldC1jYTEPMA0GA1UE
-ChMGQ0VTTkVUMRYwFAYDVQQDEw1zcDIuY2VzbmV0LmN6MIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQC+Q9oT1doCHIBxlNtPhsfVhfTUAQ8EcBnbOZeNRpcabQ4v
-Xvb65ji2Wgis3LDvr1oin0u1i5kTI35bi8nHjRYIfTtPwv+eXVEjsHbR+kDymmo+
-NeRT19ogZlNjslL2CZKtpb9b1cabIgco6rPWOo42CPiMGhp3pmTZD50MwrZS5wID
-AQABo4IBmDCCAZQwDgYDVR0PAQH/BAQDAgWgMBkGA1UdIAQSMBAwDgYMKwYBBAG+
-eQECAgIAMBgGA1UdEQQRMA+CDXNwMi5jZXNuZXQuY3owggELBgNVHR8EggECMIH/
-MFqgWKBWpFQwUjESMBAGCgmSJomT8ixkARkWAmN6MRkwFwYKCZImiZPyLGQBGRYJ
-Y2VzbmV0LWNhMRIwEAYDVQQDEwlDRVNORVQgQ0ExDTALBgNVBAMTBENSTDUwgaCg
-gZ2ggZqGQmh0dHA6Ly93d3cuY2VzbmV0LmN6L3BraS9jcmwvY249Q0VTTkVUJTIw
-Q0EsZGM9Y2VzbmV0LWNhLGRjPWN6LmNybIZUbGRhcDovL2xkYXAuY2VzbmV0LWNh
-LmN6L2NuPUNFU05FVCUyMENBLGRjPWNlc25ldC1jYSxkYz1jej9jZXJ0aWZpY2F0
-ZVJldm9jYXRpb25MaXN0MB8GA1UdIwQYMBaAFC9sBcNRJqyvOZw+ODXdUikngMX1
-MB0GA1UdDgQWBBSo9Hnbvg5HchstLUwj8kkBHA88HDANBgkqhkiG9w0BAQUFAAOC
-AQEAgbnrp/sPF76DlC2Ehll9I417XOnOZdW3C1rKcZSh9vm6tonse21pBVC4799H
-Ajy4i22AbIg37N9Wh7sfUf0pZbuen4Eo6PEdUTQhIsJTAp/Dpp7WlQwjDRSUCTS7
-PyqPHKHCacSogDCwilylgBvD/VokryJKWce4cIr2YT09+uMCCIqHNYcihDEBOdGM
-0S1uFcV7bUeHtXqvDfWeSaU0XgraSZvSuDGu1S5BkKvg3GbaYlakjEZce6g1GQsA
-035XrYOVM4U3+W/C8SuxS47R31SGE1xsBWbwz6EPhUK1/SFAoAPDZ5P1aeuugcEX
-OdbkmjrpK8okfqGw+9V2Sgk08Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sp2.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sp2.cesnet.cz,O=CESNET,DC=cesnet-ca,DC=cz</ds:X509SubjectName>
-          <ds:X509Certificate>MIIELzCCAxegAwIBAgIEQrOJWDANBgkqhkiG9w0BAQUFADBDMRIwEAYKCZImiZPy
-LGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNuZXQtY2ExEjAQBgNVBAMTCUNF
-U05FVCBDQTAeFw0xMDAyMjIwOTU5MzFaFw0xMTAzMjIxMDI5MzFaMFgxEjAQBgoJ
-kiaJk/IsZAEZFgJjejEZMBcGCgmSJomT8ixkARkWCWNlc25ldC1jYTEPMA0GA1UE
-ChMGQ0VTTkVUMRYwFAYDVQQDEw1zcDIuY2VzbmV0LmN6MIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQC+Q9oT1doCHIBxlNtPhsfVhfTUAQ8EcBnbOZeNRpcabQ4v
-Xvb65ji2Wgis3LDvr1oin0u1i5kTI35bi8nHjRYIfTtPwv+eXVEjsHbR+kDymmo+
-NeRT19ogZlNjslL2CZKtpb9b1cabIgco6rPWOo42CPiMGhp3pmTZD50MwrZS5wID
-AQABo4IBmDCCAZQwDgYDVR0PAQH/BAQDAgWgMBkGA1UdIAQSMBAwDgYMKwYBBAG+
-eQECAgIAMBgGA1UdEQQRMA+CDXNwMi5jZXNuZXQuY3owggELBgNVHR8EggECMIH/
-MFqgWKBWpFQwUjESMBAGCgmSJomT8ixkARkWAmN6MRkwFwYKCZImiZPyLGQBGRYJ
-Y2VzbmV0LWNhMRIwEAYDVQQDEwlDRVNORVQgQ0ExDTALBgNVBAMTBENSTDUwgaCg
-gZ2ggZqGQmh0dHA6Ly93d3cuY2VzbmV0LmN6L3BraS9jcmwvY249Q0VTTkVUJTIw
-Q0EsZGM9Y2VzbmV0LWNhLGRjPWN6LmNybIZUbGRhcDovL2xkYXAuY2VzbmV0LWNh
-LmN6L2NuPUNFU05FVCUyMENBLGRjPWNlc25ldC1jYSxkYz1jej9jZXJ0aWZpY2F0
-ZVJldm9jYXRpb25MaXN0MB8GA1UdIwQYMBaAFC9sBcNRJqyvOZw+ODXdUikngMX1
-MB0GA1UdDgQWBBSo9Hnbvg5HchstLUwj8kkBHA88HDANBgkqhkiG9w0BAQUFAAOC
-AQEAgbnrp/sPF76DlC2Ehll9I417XOnOZdW3C1rKcZSh9vm6tonse21pBVC4799H
-Ajy4i22AbIg37N9Wh7sfUf0pZbuen4Eo6PEdUTQhIsJTAp/Dpp7WlQwjDRSUCTS7
-PyqPHKHCacSogDCwilylgBvD/VokryJKWce4cIr2YT09+uMCCIqHNYcihDEBOdGM
-0S1uFcV7bUeHtXqvDfWeSaU0XgraSZvSuDGu1S5BkKvg3GbaYlakjEZce6g1GQsA
-035XrYOVM4U3+W/C8SuxS47R31SGE1xsBWbwz6EPhUK1/SFAoAPDZ5P1aeuugcEX
-OdbkmjrpK8okfqGw+9V2Sgk08Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/NIM/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/NIM/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML2/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp2.cesnet.cz/edugain/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">CESNET Test SP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Shows available attributes and assertions</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="email" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:mace:dir:attribute-def:eduPersonEntitlement" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">CESNET</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET, a. l. e.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET, z. s. p. o.</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ivan</md:GivenName>
-    <md:SurName>Novakov</md:SurName>
-    <md:EmailAddress>novakoi@fel.cvut.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sp2.kcc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 4eb380e1..00000000
--- a/swamid-interfederations-2.0/sp2.kcc.ac.uk-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" entityID="https://sp2.kcc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Kensington and Chelsea College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">kcc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEZzCCA0+gAwIBAgIQSm2nqIqiox26I11iklHlFzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDQxNTAwMDAwMFoXDTE2MDQxNDIzNTk1OVowOzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1zcDIua2NjLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkTipNhRClDjUbpHw
-						ZAdd9ZrG0E9GnQF5oL2CgZJceS2V7zv34sMVnCzkxwqlpVR5z0HxSutQK+Rxy9XY
-						7/6HXsZA6OdzVc492YYTUHpJt1CSK9xbUYdbGe5c6fnJHEiIVjwZPukWbUH0Yz7n
-						VxLzq2GXvvwzwTQOjM+Y7eb5A1C6JURbo2EGgYO0LjA2QBwJV2EbTGYW7qE5iTo2
-						ajiEGbDBqWBrgmCYyz2zNCaMeD6DQTswELji1HKMk19mwIJpH0JQzmrn5O2aTCU/
-						3Oe0b8fB/HWak5Vg51kJLA2qxYQQmaH7KzjGkqYXV6irw631wKsee07E7ic4gioA
-						ox1CuwIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-						ue0wHQYDVR0OBBYEFM+h8xC5KMRvvlwFtYPzQvRPekYbMA4GA1UdDwEB/wQEAwIF
-						oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-						BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-						LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-						BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-						YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-						Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1zcDIua2NjLmFjLnVrMA0GCSqGSIb3
-						DQEBBQUAA4IBAQB/KYLbwlBTr9Y5wz+L9aTbVCAbpGaEut5pUcX1FFnn8ZWyomvJ
-						Px4W55mC3W+XKjC6eH/tto15qaeRuJBstE+IqpFpJrgFRgjyAbdL6ytY03nA/ZnN
-						700/ZxxrYrAkRxNll3hsxupLg4mgPvi7VFFS15ogEKdlAdwzpxjFF5SzJ1s5NMbl
-						WNXBd/U8BYJREwDCEu9uV1OQU0IHx/7OVLgI6yH0Y4wElPPFvOXA4bPzZDr/lVLA
-						RZF/i3C90xcqJ/54WaYuFnU8EZDbYExPuqv6OvL53F215iCRecxWEfjYaz7D3amu
-						zWWeRb5g3nssaRQeVqEG3zg0tUq0GYtUj82l
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.kcc.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://sp2.kcc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp2.kcc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp2.kcc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp2.kcc.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">kcc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEZzCCA0+gAwIBAgIQSm2nqIqiox26I11iklHlFzANBgkqhkiG9w0BAQUFADA2
-						MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-						U1NMIENBMB4XDTEzMDQxNTAwMDAwMFoXDTE2MDQxNDIzNTk1OVowOzEhMB8GA1UE
-						CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1zcDIua2NjLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkTipNhRClDjUbpHw
-						ZAdd9ZrG0E9GnQF5oL2CgZJceS2V7zv34sMVnCzkxwqlpVR5z0HxSutQK+Rxy9XY
-						7/6HXsZA6OdzVc492YYTUHpJt1CSK9xbUYdbGe5c6fnJHEiIVjwZPukWbUH0Yz7n
-						VxLzq2GXvvwzwTQOjM+Y7eb5A1C6JURbo2EGgYO0LjA2QBwJV2EbTGYW7qE5iTo2
-						ajiEGbDBqWBrgmCYyz2zNCaMeD6DQTswELji1HKMk19mwIJpH0JQzmrn5O2aTCU/
-						3Oe0b8fB/HWak5Vg51kJLA2qxYQQmaH7KzjGkqYXV6irw631wKsee07E7ic4gioA
-						ox1CuwIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-						ue0wHQYDVR0OBBYEFM+h8xC5KMRvvlwFtYPzQvRPekYbMA4GA1UdDwEB/wQEAwIF
-						oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-						BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-						LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-						BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-						YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-						Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1zcDIua2NjLmFjLnVrMA0GCSqGSIb3
-						DQEBBQUAA4IBAQB/KYLbwlBTr9Y5wz+L9aTbVCAbpGaEut5pUcX1FFnn8ZWyomvJ
-						Px4W55mC3W+XKjC6eH/tto15qaeRuJBstE+IqpFpJrgFRgjyAbdL6ytY03nA/ZnN
-						700/ZxxrYrAkRxNll3hsxupLg4mgPvi7VFFS15ogEKdlAdwzpxjFF5SzJ1s5NMbl
-						WNXBd/U8BYJREwDCEu9uV1OQU0IHx/7OVLgI6yH0Y4wElPPFvOXA4bPzZDr/lVLA
-						RZF/i3C90xcqJ/54WaYuFnU8EZDbYExPuqv6OvL53F215iCRecxWEfjYaz7D3amu
-						zWWeRb5g3nssaRQeVqEG3zg0tUq0GYtUj82l
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sp2.kcc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp2.kcc.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">Kensington and Chelsea College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Kensington and Chelsea College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kcc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Leslie-Ann</GivenName>
-    <SurName>Campbell</SurName>
-    <EmailAddress>mailto:l.campbell@kcc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Williams</SurName>
-    <EmailAddress>mailto:r.williams@kcc.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 e58480e2..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp24-test.garr.it/shibboleth">
-  <md: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 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: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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">SP TEST shib 24 Firenze</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">IDEM test sp with optional attributes</md:ServiceDescription>
-      <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 FriendlyName="cn" Name="urn:oid:2.5.4.3" 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="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"/>
-      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md: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"/>
-      <md: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"/>
-      <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="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md: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"/>
-      <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"/>
-      <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"/>
-      <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"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="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="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SP shib 2.4 di Prova provided by GARR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">SP shib 2.4 di Prova erogato da GARR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>idem-help</md:SurName>
-    <md:EmailAddress>mailto:idem-help@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9fd37e67..00000000
--- a/swamid-interfederations-2.0/sp24-test.garr.it.xml
+++ /dev/null
@@ -1,93 +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://sp24-test.garr.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-07T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </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>
-      <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: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://sp24-test.garr.it/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://sp24-test.garr.it/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>centos5</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=centos5</ds:X509SubjectName>
-          <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">SP TEST shib 24 Firenze</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">IDEM test sp with optional attributes</md:ServiceDescription>
-      <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 FriendlyName="cn" Name="urn:oid:2.5.4.3" 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="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"/>
-      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md: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"/>
-      <md: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"/>
-      <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="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md: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"/>
-      <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"/>
-      <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"/>
-      <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"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="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="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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SP shib 2.4 di Prova provided by GARR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">SP shib 2.4 di Prova erogato da GARR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>idem-help</md:SurName>
-    <md:EmailAddress>idem-help@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.xml
deleted file mode 100644
index e1639338..00000000
--- a/swamid-interfederations-2.0/spaces.internet2.edu-shibboleth.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" entityID="https://spaces.internet2.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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>
-      <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://spaces.internet2.edu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Collaboration Wiki Spaces at Internet2</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Collaboration spaces to support the activities of Internet2 projects and working groups.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.internet2.edu/about/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="122" width="91" xml:lang="en">https://www.internet2.edu/media/medialibrary/2013/12/02/internet2_logo_colorpos.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIID9TCCAt2gAwIBAgIBADANBgkqhkiG9w0BAQQFADBAMQswCQYDVQQGEwJVUzES
-MBAGA1UEChMJSW50ZXJuZXQyMR0wGwYDVQQDExRzcGFjZXMuaW50ZXJuZXQyLmVk
-dTAeFw0wNjEyMTMxNzQwMjdaFw0xNjEyMTAxNzQwMjdaMEAxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQKEwlJbnRlcm5ldDIxHTAbBgNVBAMTFHNwYWNlcy5pbnRlcm5ldDIu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfZWpU5/8rgfFbxh
-DOwYuQ4/TNycAQ/VQ5DFMU3M3bvF52WktUtfwBDozdXQt/tOIlBFvPVHH/pdp0q6
-RrzjXP5pQFZoKKc+p9cGdxHqKlx7RWAnFycNaKFZyV9kUTUvSHDjQk00i5gJUGEt
-D1j8NLE9o0y68x+5jK3onhQs3IXkHVYDslXHNXPovcv7OQuWIL69oBxyTxeTBUIA
-WoIiSZh6XrjGmNUid2ZnFFk7YtY1UNGV18LbfVhnxBlIxIq5v9KQgK9T0P5pogYs
-6N7Ki4eMK3cKCJkAibrbo8iPcOJnwbCXTlLmnhv5yd/W8Bk8A/pluNX7kbsSYr1f
-7P6YqQIDAQABo4H5MIH2MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
-U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQ8t+Ty3BI/EncjTRX+
-JB8jn/SU0zBoBgNVHSMEYTBfgBQ8t+Ty3BI/EncjTRX+JB8jn/SU06FEpEIwQDEL
-MAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjEdMBsGA1UEAxMUc3BhY2Vz
-LmludGVybmV0Mi5lZHWCAQAwMgYDVR0RBCswKYYnaHR0cHM6Ly9zcGFjZXMuaW50
-ZXJuZXQyLmVkdS9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBAUAA4IBAQCd2JE3zSY3
-JLYBdr/WhFphpMHavrXpcK8GYro0YYfPN0QDxjBUSGkGgw0QzKAGmthqJWJ6yeip
-Ht36uzobQ2iQtFU08LKiK2jPNegSU3uW/LsmnweFCDmWDyacmK91q+m3oNfY631l
-+vLX82GQYRssQbis1CJbrD/XE1W+2sEnGHc4eNRJZYNzMRvfSatNavCgI1IoOFEC
-gBAD9negf1qiDeouxjXCiixAMR5XnVd7lyZ7VN3goXIN//4SdCLT5fd1tIspaOOy
-BPE4P/6N3KmAMY7VNejGcpoRKvb0R0Yd7a8aMR7xImUNsycFlthz+sl26fTVNNmz
-/n0PiqFXEkFy
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/Redirect"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Collaboration Wiki Spaces at Internet2</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Collaboration spaces to support the activities of Internet2 projects and working groups.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" 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="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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="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: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="mail" Name="urn:mace:dir:attribute-def:mail" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/spprod.targetconnect.net-saml2.xml b/swamid-interfederations-2.0/spprod.targetconnect.net-saml2.xml
deleted file mode 100644
index 668ca8ff..00000000
--- a/swamid-interfederations-2.0/spprod.targetconnect.net-saml2.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://spprod.targetconnect.net/saml2">
-  <!--
-		This is a "GTI: TARGETconnect" Guanxi SP owned by GTI Media Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-09T17:19:50Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDpjCCAo6gAwIBAgIEUgEctzANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEW
-						MBQGA1UEChMNR1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEvMC0GA1UE
-						AxMmaHR0cHM6Ly9zcHByb2QudGFyZ2V0Y29ubmVjdC5uZXQvc2FtbDIwHhcNMTMw
-						ODA2MTU1NjM5WhcNMjMwODA0MTU1NjM5WjCBlDELMAkGA1UEBhMCR0IxFDASBgNV
-						BAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEWMBQGA1UEChMN
-						R1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEvMC0GA1UEAxMmaHR0cHM6
-						Ly9zcHByb2QudGFyZ2V0Y29ubmVjdC5uZXQvc2FtbDIwggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCXqeXpMl82js4Sp01xd/E1lMH4WDC3maIrSzCdbun4
-						uLWp3qTwa98USshgPrqTlBXRROnul/0fBJMLlBDREbNkk/PUPbWCNQHkXrybk5f1
-						4uK02zuD4IflscIuRKM3Iu3VV8IPvKKVhfLSx/1INZ+T6GHcRojlo6EfmaN3CPp4
-						AjzHrlwRzre2zhYJDgejAcdX4l9VBxuHSoSQVfVH96tHhKumKH4PwQif4wWGnlDB
-						rZ6I1cRTP1hm2eqqv1TzhYscjcwN0bdnynnfJTJAw+fMZGJxEZnZqqEyXuLJBPTp
-						25wRUGcsWR6GqH68K1Jn975hbIQ/dYc+Eccly61tkRWVAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBAH1oH3iIEwA13CJ+UleE3CP+82B9jk7BApq3+4QWWZ7deO5r4Z4+
-						d4XsCuifNIcYUchOBM9rB8KwCmgqM2+yKwgnLeCNzJk+SZR7qz+z8fsWTfbqctUn
-						HuJjg4LWfuJZb3TPqcZYAojH1ThumOPfgOUh+W+WarLHsVYOkBFz5LyFByrzPGvj
-						Y2H+JYtuN2ASqkblybMUB6KGy06f5doxkjT/jUQ/2wzKKEjWwr+qJrRpPQBGT0Wz
-						175GahMvbhwW9kUQ1/Abriss5ugoy+AFSWdCbG9ZBZOhW0rSIcaxqy7/Pp2T2kCD
-						xkcdoYikjlip0bxxjwKiLOa9g5GiFD6ipkc=
-					</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>
-						MIIDpjCCAo6gAwIBAgIEUgEctzANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEW
-						MBQGA1UEChMNR1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEvMC0GA1UE
-						AxMmaHR0cHM6Ly9zcHByb2QudGFyZ2V0Y29ubmVjdC5uZXQvc2FtbDIwHhcNMTMw
-						ODA2MTU1NjM5WhcNMjMwODA0MTU1NjM5WjCBlDELMAkGA1UEBhMCR0IxFDASBgNV
-						BAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEWMBQGA1UEChMN
-						R1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEvMC0GA1UEAxMmaHR0cHM6
-						Ly9zcHByb2QudGFyZ2V0Y29ubmVjdC5uZXQvc2FtbDIwggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCXqeXpMl82js4Sp01xd/E1lMH4WDC3maIrSzCdbun4
-						uLWp3qTwa98USshgPrqTlBXRROnul/0fBJMLlBDREbNkk/PUPbWCNQHkXrybk5f1
-						4uK02zuD4IflscIuRKM3Iu3VV8IPvKKVhfLSx/1INZ+T6GHcRojlo6EfmaN3CPp4
-						AjzHrlwRzre2zhYJDgejAcdX4l9VBxuHSoSQVfVH96tHhKumKH4PwQif4wWGnlDB
-						rZ6I1cRTP1hm2eqqv1TzhYscjcwN0bdnynnfJTJAw+fMZGJxEZnZqqEyXuLJBPTp
-						25wRUGcsWR6GqH68K1Jn975hbIQ/dYc+Eccly61tkRWVAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBAH1oH3iIEwA13CJ+UleE3CP+82B9jk7BApq3+4QWWZ7deO5r4Z4+
-						d4XsCuifNIcYUchOBM9rB8KwCmgqM2+yKwgnLeCNzJk+SZR7qz+z8fsWTfbqctUn
-						HuJjg4LWfuJZb3TPqcZYAojH1ThumOPfgOUh+W+WarLHsVYOkBFz5LyFByrzPGvj
-						Y2H+JYtuN2ASqkblybMUB6KGy06f5doxkjT/jUQ/2wzKKEjWwr+qJrRpPQBGT0Wz
-						175GahMvbhwW9kUQ1/Abriss5ugoy+AFSWdCbG9ZBZOhW0rSIcaxqy7/Pp2T2kCD
-						xkcdoYikjlip0bxxjwKiLOa9g5GiFD6ipkc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine2/shibb/acs" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine2/s2/wbsso/acs" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine2/s2/wbsso/acs" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GTI Media Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GTI: TARGETconnect</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.groupgti.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>TARGETconnect Support</GivenName>
-    <EmailAddress>mailto:targetconnect.support@groupgti.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Masters</SurName>
-    <EmailAddress>mailto:chris.masters@groupgti.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sprov.d2digital.co.uk-.xml b/swamid-interfederations-2.0/sprov.d2digital.co.uk-.xml
deleted file mode 100644
index 959fef6d..00000000
--- a/swamid-interfederations-2.0/sprov.d2digital.co.uk-.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sprov.d2digital.co.uk/">
-  <!--
-		This is a d2 Test Shibboleth SP for D2.Digital By Design Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-26T11:23:11Z"/>
-  </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://sprov.d2digital.co.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">d2 Digital By Design Limited</mdui:DisplayName>
-        <mdui:Description xml:lang="en">d2 Test SP</mdui:Description>
-        <mdui:Logo height="170" width="170">https://shib.d2digital.co.uk/d2-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIJAIdis0SAXmmpMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNwcm92LmQyZGlnaXRhbC5jby51azAeFw0xMjA3MjUxMjMzMzlaFw0yMjA3
-						MjMxMjMzMzlaMCAxHjAcBgNVBAMTFXNwcm92LmQyZGlnaXRhbC5jby51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbf3pH83WxgptR2EyioaxWy4OMy
-						PIxIoJ/ERpNdpTxQqWsjJf4pHcHA/DtbRpX9PFDgGFm604JfmzOj/Wd/U05Wo1MF
-						VhlvxgDvdpbANS9rR62f83WZv9WGkxk+N/Bz1haRdRFi3x4/zef3uxwOFJnGHHD0
-						Jas1+9nYUv/FxPNXYVDnBp1MfGk6OWlG3OPsemJXPSvgw0iG201oabyx/GWb/e2E
-						mi1Yjd65ksVvzdZ6LxZHAUGuyeV3m4wP35EaXjesHJ6Y5CmUZ9dapOGDlavJRjda
-						0Eau3HCAiS0mJ9KZjyOFIgX3oowO+cf+XXpzb3rp1X92wsT707wG5wN+ezECAwEA
-						AaNwMG4wTQYDVR0RBEYwRIIVc3Byb3YuZDJkaWdpdGFsLmNvLnVrhitodHRwczov
-						L3Nwcm92LmQyZGlnaXRhbC5jby51ay9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBQj
-						6RBpdUzW3y30eT1nnauBiEZ7ozANBgkqhkiG9w0BAQUFAAOCAQEASxk2bIv7u2TE
-						Ikm5avZwC0Jg4YmS/vEiMbsbF/cn7KklmdqrKoVZXPHXZGqGO95/Wni81s5ZCAPI
-						+Ny0a+4SGufdW6mu7LdzdKsDQTXw+tEGNF3+7FMyTaW9Ey4cQt+RgIUy/injMwnR
-						w5dC9P3x/w5PlmNgD8TTsKWeLoonP4y6RdtgsW7h33zylG5PdHmremgGmiKYr0mT
-						u5EpXfUGl1A/HdGkUYIP4AYxz0MB1K2ZdLrWtFqP1kgT8+iwxIh/v+PEVZ8ltU91
-						xdRbHTBf3Fd/8gVhZw4lSDWFHbyJDznGTYE6H5UyxgLqGI/KgQfMxDVdqXQhZ0Hu
-						UZV+Z3CP5w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sprov.d2digital.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">D2.Digital By Design Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">d2 Test Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.d2digital.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adam</GivenName>
-    <SurName>Thorpe</SurName>
-    <EmailAddress>mailto:shibboleth@d2digital.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Thorpe</SurName>
-    <EmailAddress>mailto:shibboleth@d2digital.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml b/swamid-interfederations-2.0/sprovtest.e2bn.org-shibboleth.xml
deleted file mode 100644
index c1e19f71..00000000
--- a/swamid-interfederations-2.0/sprovtest.e2bn.org-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://sprovtest.e2bn.org/shibboleth">
-  <!--
-		This is an "E2BN Services" Shibboleth SP for the East of England Broadband Network.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://sprovtest.e2bn.org/Shibboleth.sso/DS" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://passport.e2bn.org/Shibboleth.sso/DS" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAME6p5J6275MMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCXNwcm92dGVzdDAeFw0xNTExMjMxMTE0NTZaFw0yNTExMjAxMTE0NTZaMBQx
-						EjAQBgNVBAMTCXNwcm92dGVzdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMrP3s/YWGdpfZ8vpuUJ84u01pPdN5TPCsMbNdvCTg02ICxUcCxVhCvEu6XO
-						j1XMxmShOfsK7yjQwkGW78aq3N4mu174ge693YA+cr5aQ/bRyD3ivQL6pdZ0JZjJ
-						b8WQlymZD1DDFQzYTsGbUO4Ehle/xcg4VsfGnsL9+oMdBu1do2hT5YlCX/i6t46J
-						yGs7hwNdMa3lzykQgvjBwqtXNgh5YE7vuPq71kwLS92tdwBT5McOvBU0SvcRSvdf
-						xDFk+VdtEXtqwRpQfSnHC3bs70x+o7S0Di1aiBtxsP8cHXNBv5fWvYPMQ+qvhHVD
-						JBffRvOjPpEJlFqVgz9mv4UuSsUCAwEAAaNeMFwwOwYDVR0RBDQwMoIJc3Byb3Z0
-						ZXN0hiVodHRwczovL3Nwcm92dGVzdC5lMmJuLm9yZy9zaGliYm9sZXRoMB0GA1Ud
-						DgQWBBRtUHrPUHw7pov+Xhic3y7uDHQ96jANBgkqhkiG9w0BAQUFAAOCAQEAPKSS
-						mAPt6VhYv6yRE2kPEHJQvsXsBLH8tHrhF904HNgXghMoFGYQGPsLY7hAKXijh469
-						V5R7baZoSau5jrVM5P2GlZZvnNedPMzYSZzYuIYdfDBVRJcfGAzSvMgs+J2Xy0p1
-						DSzEBbWkV90tD+9rrW8cwrFL0WI9DZdbTNt+o2f0EtS2BSBP47UibVmftEs+6tN0
-						BgWhJ7OiNUofH0OasFSwFCoPNnKR0DfPSIA2qDVozOAqx/jrv96p+ukWNoK3g49B
-						lnJgP9/GxoLuoFpcJ0el9dqriqw9dcFw7IhWG/SZmZKD6XslLE6YcvKhduBUgBNX
-						Tx92z7ahaw1BOYPfpw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sprovtest.e2bn.org/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sprovtest.e2bn.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprovtest.e2bn.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprovtest.e2bn.org/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sprovtest.e2bn.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport.e2bn.org/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport.e2bn.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passport.e2bn.org/Shibboleth.sso/SAML2/Artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://passport.e2bn.org/Shibboleth.sso/SAML2/ECP" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://passport.e2bn.org/Shibboleth.sso/SAML/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://passport.e2bn.org/Shibboleth.sso/SAML/Artifact" index="18"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">East of England Broadband Network</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">E2BN Services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.e2bn.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Bright</SurName>
-    <EmailAddress>mailto:service@e2bn.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Bright</SurName>
-    <EmailAddress>mailto:service@e2bn.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/spuat.targetconnect.net-saml2.xml b/swamid-interfederations-2.0/spuat.targetconnect.net-saml2.xml
deleted file mode 100644
index 6e6d86d4..00000000
--- a/swamid-interfederations-2.0/spuat.targetconnect.net-saml2.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://spuat.targetconnect.net/saml2">
-  <!--
-		This is a "GTI: TARGETconnect Test" Guanxi SP owned by GTI Media Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-09T17:28:30Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDpDCCAoygAwIBAgIEUgEiyTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEW
-						MBQGA1UEChMNR1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEuMCwGA1UE
-						AxMlaHR0cHM6Ly9zcHVhdC50YXJnZXRjb25uZWN0Lm5ldC9zYW1sMjAeFw0xMzA4
-						MDYxNjIyMzNaFw0yMzA4MDQxNjIyMzNaMIGTMQswCQYDVQQGEwJHQjEUMBIGA1UE
-						CBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1H
-						VEkgTWVkaWEgTHRkMRAwDgYDVQQLEwdVbmtub3duMS4wLAYDVQQDEyVodHRwczov
-						L3NwdWF0LnRhcmdldGNvbm5lY3QubmV0L3NhbWwyMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEAjum54CJ2ZfU7CLwF6PPVC92qUF29WORHMoZBEBQV0LFf
-						nhr9fGzS3sMGXEGi+0QGX8ckuVnnlaFkty8xkFFsCWy3SurIoD+De1Ks0cN19QfX
-						Nsk4OlfOQ3jfL7WfpKUCn5kDvKM35HCG5EVw9BQqxJ2sk+VVKiZe5w5R0M3khUkG
-						zUpvAayCExXeR1zc9F9vXmsqRmc4ALsz+nXGebKNQVaIQ+I40SANH6byim6BHU+A
-						g63jFlAbGR4v18TFKlLypBhcloaIc1cxVet4pnOTjUtt0bsD7WDAKggO4xXpwpof
-						u/nqx1SJFTnuup0Idlp9B1PjOBL42qaV2mmyfAkJrQIDAQABMA0GCSqGSIb3DQEB
-						BQUAA4IBAQCGZzX1ZYtU2dRSs63H+PhDHv1JgKRLCC5eparvxEQikkM/5h1iVQBo
-						iqn0iUG2nHznTm4AOX/shRG/5ygUPRAUhU4aaEmLPK7cK39HsMh4Bf3l/dDRQ7mO
-						+lz0j68e/qYsRtzkZl7idHUfNbrtaI1U6diNNzmJGomdH4+rh/TeS1N2xUcEIFdE
-						ULkKPr4aGmUaCn7/V9Od1Tnx92WaMZSvqcwoMMgF7lbOPkPoOSYXaxY6TmsG/HYu
-						abifOAPWD3wj86DWorWsha5J04PK+cCxwPBED4itZVU0I0XnBUPuYKLKxiqXHmip
-						MQ4rGJjqRVRhf5ie/5CbFXJ4httfh87P
-					</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>
-						MIIDpDCCAoygAwIBAgIEUgEiyTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMRQwEgYDVQQHEwtXYWxsaW5nZm9yZDEW
-						MBQGA1UEChMNR1RJIE1lZGlhIEx0ZDEQMA4GA1UECxMHVW5rbm93bjEuMCwGA1UE
-						AxMlaHR0cHM6Ly9zcHVhdC50YXJnZXRjb25uZWN0Lm5ldC9zYW1sMjAeFw0xMzA4
-						MDYxNjIyMzNaFw0yMzA4MDQxNjIyMzNaMIGTMQswCQYDVQQGEwJHQjEUMBIGA1UE
-						CBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1H
-						VEkgTWVkaWEgTHRkMRAwDgYDVQQLEwdVbmtub3duMS4wLAYDVQQDEyVodHRwczov
-						L3NwdWF0LnRhcmdldGNvbm5lY3QubmV0L3NhbWwyMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEAjum54CJ2ZfU7CLwF6PPVC92qUF29WORHMoZBEBQV0LFf
-						nhr9fGzS3sMGXEGi+0QGX8ckuVnnlaFkty8xkFFsCWy3SurIoD+De1Ks0cN19QfX
-						Nsk4OlfOQ3jfL7WfpKUCn5kDvKM35HCG5EVw9BQqxJ2sk+VVKiZe5w5R0M3khUkG
-						zUpvAayCExXeR1zc9F9vXmsqRmc4ALsz+nXGebKNQVaIQ+I40SANH6byim6BHU+A
-						g63jFlAbGR4v18TFKlLypBhcloaIc1cxVet4pnOTjUtt0bsD7WDAKggO4xXpwpof
-						u/nqx1SJFTnuup0Idlp9B1PjOBL42qaV2mmyfAkJrQIDAQABMA0GCSqGSIb3DQEB
-						BQUAA4IBAQCGZzX1ZYtU2dRSs63H+PhDHv1JgKRLCC5eparvxEQikkM/5h1iVQBo
-						iqn0iUG2nHznTm4AOX/shRG/5ygUPRAUhU4aaEmLPK7cK39HsMh4Bf3l/dDRQ7mO
-						+lz0j68e/qYsRtzkZl7idHUfNbrtaI1U6diNNzmJGomdH4+rh/TeS1N2xUcEIFdE
-						ULkKPr4aGmUaCn7/V9Od1Tnx92WaMZSvqcwoMMgF7lbOPkPoOSYXaxY6TmsG/HYu
-						abifOAPWD3wj86DWorWsha5J04PK+cCxwPBED4itZVU0I0XnBUPuYKLKxiqXHmip
-						MQ4rGJjqRVRhf5ie/5CbFXJ4httfh87P
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://samltest.targetconnect.net/samlengine2/shibb/acs" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.targetconnect.net/samlengine2/s2/wbsso/acs" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://samltest.targetconnect.net/samlengine2/s2/wbsso/acs" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GTI Media Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.groupgti.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>TARGETconnect Support</GivenName>
-    <EmailAddress>mailto:targetconnect.support@groupgti.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Masters</SurName>
-    <EmailAddress>mailto:chris.masters@groupgti.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srmo.sagepub.com-oa-metadata.xml b/swamid-interfederations-2.0/srmo.sagepub.com-oa-metadata.xml
deleted file mode 100644
index 8e6ecd5e..00000000
--- a/swamid-interfederations-2.0/srmo.sagepub.com-oa-metadata.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://srmo.sagepub.com/oa/metadata">
-  <!--
-		This is a "SAGE Research Methods" OpenAthens SP for SAGE Publications Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-19T09:13:02Z">
-      <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">SAGE Research Methods</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC8jCCAdqgAwIBAgIEU3YWujANBgkqhkiG9w0BAQUFADA7MR4wHAYDVQQKExVT
-						QUdFIFJlc2VhcmNoIE1ldGhvZHMxGTAXBgNVBAMTEHNybW8uc2FnZXB1Yi5jb20w
-						HhcNMTQwNTE2MTM0NjM0WhcNMjQwNTEzMTM0NjM0WjA7MR4wHAYDVQQKExVTQUdF
-						IFJlc2VhcmNoIE1ldGhvZHMxGTAXBgNVBAMTEHNybW8uc2FnZXB1Yi5jb20wggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAj7S6njJm0RnWWITsCrEtFaXe
-						fOL5sO/jeFs1OdsMOdJvrF2W1ogslAV1Dg7SnF/aVeOkybQbE1iA8astIPLf1qv/
-						Fcv6a8lSlGBk3hMFX6ye3431lqw1nsF53S/TUzEflixBjxO7j9QcM2l4wRLwuo9M
-						W2qYrOw2AfxE7vca3fDICdhtfcQIkHFnkLi67bhR6rFqTjwz1cj38RXXz2c2TSPA
-						fTjRZoePMNqDaucNcBVrT9KqXxWJBr8zqMrC5CUYGCuYiqNB8MbHdW/o14ah4uVl
-						ZB0B9iJ2eGmA5tzs+dTKzcspDpF11LS0i3RMBysfFB+Grj3mu5GgFGDnVW5nAgMB
-						AAEwDQYJKoZIhvcNAQEFBQADggEBAEV8fmC0KbKrXDKBq5ZDrvRRoFZMynTWnkMs
-						KT2ImrfxpIbv+XO06lWAh5j8XIgV5tqTTam9IpcudEOxjmd6imwQ4qTdc2MbFzRR
-						X4HG+J+GOuvH6ZhCSfWEoZRqRkw6c/PCokyWeYkXPPL24d8zVDWcVKQBngMPtopE
-						yJpPVcRPu71eZ5KOarxT9nawAzAhuVrMLrhlg8yqEWa66y1AZwtasasFZXqlkVI+
-						dxiaed8zkkHD2w69AjFwKA1RnhTTbrC2bKzUdcqOHonpyPPUap0inRbmqUjKzQCl
-						55ck9QM2cw42xmEUlINH1J6X6dML/U+SLIf6kozvqhrPqJTWnAA=
-					</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>
-						MIIC8jCCAdqgAwIBAgIEU3YWujANBgkqhkiG9w0BAQUFADA7MR4wHAYDVQQKExVT
-						QUdFIFJlc2VhcmNoIE1ldGhvZHMxGTAXBgNVBAMTEHNybW8uc2FnZXB1Yi5jb20w
-						HhcNMTQwNTE2MTM0NjM0WhcNMjQwNTEzMTM0NjM0WjA7MR4wHAYDVQQKExVTQUdF
-						IFJlc2VhcmNoIE1ldGhvZHMxGTAXBgNVBAMTEHNybW8uc2FnZXB1Yi5jb20wggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAj7S6njJm0RnWWITsCrEtFaXe
-						fOL5sO/jeFs1OdsMOdJvrF2W1ogslAV1Dg7SnF/aVeOkybQbE1iA8astIPLf1qv/
-						Fcv6a8lSlGBk3hMFX6ye3431lqw1nsF53S/TUzEflixBjxO7j9QcM2l4wRLwuo9M
-						W2qYrOw2AfxE7vca3fDICdhtfcQIkHFnkLi67bhR6rFqTjwz1cj38RXXz2c2TSPA
-						fTjRZoePMNqDaucNcBVrT9KqXxWJBr8zqMrC5CUYGCuYiqNB8MbHdW/o14ah4uVl
-						ZB0B9iJ2eGmA5tzs+dTKzcspDpF11LS0i3RMBysfFB+Grj3mu5GgFGDnVW5nAgMB
-						AAEwDQYJKoZIhvcNAQEFBQADggEBAEV8fmC0KbKrXDKBq5ZDrvRRoFZMynTWnkMs
-						KT2ImrfxpIbv+XO06lWAh5j8XIgV5tqTTam9IpcudEOxjmd6imwQ4qTdc2MbFzRR
-						X4HG+J+GOuvH6ZhCSfWEoZRqRkw6c/PCokyWeYkXPPL24d8zVDWcVKQBngMPtopE
-						yJpPVcRPu71eZ5KOarxT9nawAzAhuVrMLrhlg8yqEWa66y1AZwtasasFZXqlkVI+
-						dxiaed8zkkHD2w69AjFwKA1RnhTTbrC2bKzUdcqOHonpyPPUap0inRbmqUjKzQCl
-						55ck9QM2cw42xmEUlINH1J6X6dML/U+SLIf6kozvqhrPqJTWnAA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://srmo.sagepub.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://srmo.sagepub.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srmo.sagepub.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://srmo.sagepub.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SAGE Publications Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SAGE Research Methods</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sagepublications.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sage Online Support</GivenName>
-    <EmailAddress>mailto:onlinesupport@sagepub.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:rob.smith@sagepub.co.uk</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 a74d7c8c..00000000
--- a/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-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://srv-cr-idp.crdp-aquitaine.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">CRDP d'Aquitaine</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABDlBMVEUASVprpq21194YeYSMvsbe7+8AYXOly85KkpzG4+cAbXt7sr2t09YAdYQphpSlx87G3969y87W6+8AcYSUtr1zrrUxgoycx87v+/+ly9Zzoq0AVWPG194pfYycw85jmqXW5+97pq2cvsbv9/cAaXNakpzW4+cQcXuMur0QdYRChpSlz9YAXWu9294heYze7/fO5+cAcXu909a1x87G3+cQcYSUusYAVWt7qrVjlqVSjpS9194heYSUvsYAZXOty87O4+eEtr2109YIdYStx861z9be6+8IcYSlur17rrX///+ty9bG294xfYycw8YAaXtalpyMusYYdYRKipStz9bn8/cIcXvO3+cAWWuEqrWNTmANAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA70lEQVQY0y3NYU+CUBSA4VPmsVEGNmOVO4nrFpDHClu1gg43hpuUcpujdf3/fyS2+vJ+eL68QFkcky/GKlJsUIFcHf8wGfVhfXvKMwQcOJlDuE3HtxzkU26hP1Fr1t15h5tSM8iNXrCvXDjr4B72EEQsCgkqbiNowCefaP8/SShghFl8sSyEGBgB+dLaUvI9e9mM793uur2MVjHFq6O5Uyy9ftECrh4puXwIN7vLu6T421L4ZiWbpCf6FYSfR5ihFeyMsq1jYcd9n1YXVX0QNdpteodwHtV5NSzyKhgUZfPkQfU57HlpVEbXVVm7+eIXOzYrltYMOjUAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDg6MTcrMDI6MDAy95cYAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ4OjE3KzAyOjAwQ6ovpAAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.crdp-aquitaine.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CRDP d'Aquitaine</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>
-					      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>
-    </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-POST" Location="https://srv-cr-idp.crdp-aquitaine.fr/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-cr-idp.crdp-aquitaine.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CRDP d'Aquitaine</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CRDP d'Aquitaine</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crdp-aquitaine.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Alain-Aymerick François</md:SurName>
-    <md:EmailAddress>Alain-Aymerick.Francois@crdp-aquitaine.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean-Hervé RIVARD</md:SurName>
-    <md:EmailAddress>jean-herve.rivard@crdp-aquitaine.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 97c74d4f..00000000
--- a/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-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://srv-fii.insa-toulouse.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABp0lEQVQoz83SQUgUYRwF8Pf/dnJm3YVKKg+iLqtYBEEGXQS7CF6EULwUXTt6EDpLSCB48ZAUQV6EDTttHiLIlgIFL6s5ahGk8bVjQzojabM7tvvNfPvv0q0uXsJ3fu/w4EfMjONEHKv9fwY7RMHMI4dob6hffbAlUSy3vg8PfCEqEantLQDfiFyi94+nR0bvCZwFJQRZqM6/AZiAMD+n8q/aHWm04XBynI8qGkAGly1TmKYgARDAEM34tfCSgMT5ZgDeraGm50sXnubCwgID6Qez0ZOJzu5rfz5wDak7d8MXeQDWjb5zhdd62fZ7en9MjEdSNlxtaejIBsXS9fYWAwSAGEgO3i5PzYg0jt4VlOu1MrttpArzrFnb7m5P76kULpYPhN4HhxUNsFLmzT5dgUg1BmP33awV7cC4dKW6uJ5+OJUJAxWCPn1GbX0t9r3qSlEfHsS+V10tchRxpRwvvWW5zczxhs3BT2bWGzY7X+lvGrpez+Weubte05nTXZ0dhml+3NzMZjJhTe37Pv3TklNypJRW0komG4UQda0NIxHHmpnp5OH7Day70xP7LFB/AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjA0KzAyOjAwIHfmJQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowNCswMjowMFEqXpkAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.insa-toulouse.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv-fii.insa-toulouse.fr/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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv-fii.insa-toulouse.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srv-fii.insa-toulouse.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INSA de Toulouse</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INSA de Toulouse</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.insa-toulouse.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>support-federation@insa-toulouse.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srv00847.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/srv00847.soton.ac.uk-shibboleth.xml
deleted file mode 100644
index 51abfd30..00000000
--- a/swamid-interfederations-2.0/srv00847.soton.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srv00847.soton.ac.uk/shibboleth">
-  <!--
-		This is a "Test Service" Shibboleth SP for the University of Southampton.
-	-->
-  <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-05-14T09:37: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">
-    <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://srv00847.soton.ac.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://srv00847.soton.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3zCCAcegAwIBAgIJAIAbqup9yKKMMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHNydjAwODQ3MB4XDTE0MDUwNjExNTY1MFoXDTI0MDUwMzExNTY1MFowEzER
-						MA8GA1UEAxMIc3J2MDA4NDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDfhFR+xjj1/R3UX0UDL9wX1Yo1lMCA9gCjvzE6j6i6b2rLfTwlc9cgaBkN2Cpe
-						SLkFUxkJq4D1jtAE1slBTEos29o+7LGgpxr4CTbiKwAbcPIfezYGnjaCECBqCDVj
-						KMmYt0mP8K1n7Lh7lHpg55K6ldVtDS7v2UWEH/604fwxeRDEwvf2BvvKoD8aztkE
-						aZubA9KEWit+m0xPIpMKZ0xOc96upMsz0NZwByNe47NKt1UiR1qoba/54/w9hATQ
-						ICW7zdFN9eRFkC4kDOFU+8JPJ1PJwIIIwmZsL/h30uN3ZRr6P3Su57e4Be6Kse2u
-						w7lgpRDbBx4mec+wPZ8GD+oFAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHNydjAwODQ3
-						MB0GA1UdDgQWBBTBlMHnSTXBUylCdM2mqIb7TdtTIDANBgkqhkiG9w0BAQUFAAOC
-						AQEAhl9srCrHEXFRQhO7Q5tsSPYXwr/nWqgaPR/nPTjE43elXKNy57P0uDXdEAQU
-						3ax6OQIO5xMy4bBA4qRF50N2JzmKVz96GANDguvWQBtn3LDu0g8SRxgaogm0WYCv
-						6IhB/6HJ4XIeVeIwlQbwvp69lRV9z2O851yRJL1Rtqk5vnxmikSNQk7RH4Dd4PCw
-						7KH0cfGW3vA8sngRHX2JtjDpjgunpVKzmXffdt1WZIHJJ4LcNVXd8moFGQetL+H7
-						kUs4VoXiMXI702q9rXK7OH9Qg07bFB20jdoYpw3UfBBPSPylb/SQR9kCRL78JCqY
-						nxbGI9WQz4LJ5w9S87j8jiPEzg==
-					</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://srv00847.soton.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://srv00847.soton.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Southampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Southampton Test Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.southampton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Serviceline</GivenName>
-    <EmailAddress>mailto:Serviceline@soton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Clayton</GivenName>
-    <SurName>Peters</SurName>
-    <EmailAddress>mailto:C.L.Peters@soton.ac.uk</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 585ed965..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srvcafe.ifma.edu.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.ifma.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.ifma.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.ifma.edu.br/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">ifma.edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.ifma.edu.br:8443/idp/profile/SAML1/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">IFMA - Instituto Federal do Maranhao</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFMA - Instituto Federal do Maranhao</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">IFMA - Instituto Federal do Maranhao</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ifma.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ifma.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Daniel Torres</md:SurName>
-    <md:EmailAddress>daniel.torres@ifma.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0b2cdeda..00000000
--- a/swamid-interfederations-2.0/srvcafe.ifma.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://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">www.ifma.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">www.ifma.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIID6DCCAtACAQAwDQYJKoZIhvcNAQEFBQAwgbkxLTArBgNVBAoTJElGTUEgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmhhbzENMAsGA1UECxMEREdUSTEoMCYG
-CSqGSIb3DQEJARYZZGFuaWVsLnRvcnJlc0BpZm1hLmVkdS5icjERMA8GA1UEBxMI
-U2FvIEx1aXMxETAPBgNVBAgTCE1hcmFuaGFvMQswCQYDVQQGEwJCUjEcMBoGA1UE
-AxMTc3J2Y2FmZS5pZm1hLmVkdS5icjAeFw0xNDAxMTUxMjQwMjBaFw0xNzAxMTQx
-MjQwMjBaMIG5MS0wKwYDVQQKEyRJRk1BIC0gSW5zdGl0dXRvIEZlZGVyYWwgZG8g
-TWFyYW5oYW8xDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGWRhbmllbC50
-b3JyZXNAaWZtYS5lZHUuYnIxETAPBgNVBAcTCFNhbyBMdWlzMREwDwYDVQQIEwhN
-YXJhbmhhbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3NydmNhZmUuaWZtYS5lZHUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd15DZMNa3T9YPjnpy
-qB1dD1v/wah8hKHhup8CAT+vImdOrv5B/9kQWgAPR0ilLI+UGFSNgTbDA6VRREPj
-7zKK81LBhsLjgxe9Mf7tARLzoSL7+tJS+aM5qJteveNygRlk+hhIcFRa+48zzK5u
-NfBpj53LKD0CMYwarpubnGbumtwT0hBP76wLOGcvH08ul8SIWU+vemdkq4ta+URv
-85UTQiTPMICgV8sN9kBsQrk0iex3f31nD2jQF+jczSlEbPJlQdqGdMqIYFqB0r/+
-2mYGGJPdrNK99YXunGV5Q4IwkdMS6bjboC1oGkXIoGu8gQqvQ6qAOPy4GyJrg8fW
-VRgjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJscBX+H+WZaqmbVRHu6gGc/5XJb
-PXqqLxul11bF4qh5KcLpzf1lMSn6qIObKdNSncclkZAZ8kGZSIzkCBcXwyo7k2kT
-oKBgWdL8DvsajgtEwdzUxNY7sg/jOqXUC7knU7tb2sE9Tz01djN8v7qDc0tBkTzK
-wJxyAjVlA2Of5Dw5bFPl6cKaXeLHRV2YCwOGgZ57q650KrbMkh3qHB8dS+rsfz7W
-GC5DyDaTHLMRwyQ2MklaSLh0HW1HXrgkWbmxPzdtnZb88MV5QMumcD67yg7HVlGt
-WrdeJGm2B0FsNpyd2sEPGb9TZ0+LFof6V60psWm6Q/TNx6CLcqOo+3x6b+A=
-            </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>
-      
-MIID6DCCAtACAQAwDQYJKoZIhvcNAQEFBQAwgbkxLTArBgNVBAoTJElGTUEgLSBJ
-bnN0aXR1dG8gRmVkZXJhbCBkbyBNYXJhbmhhbzENMAsGA1UECxMEREdUSTEoMCYG
-CSqGSIb3DQEJARYZZGFuaWVsLnRvcnJlc0BpZm1hLmVkdS5icjERMA8GA1UEBxMI
-U2FvIEx1aXMxETAPBgNVBAgTCE1hcmFuaGFvMQswCQYDVQQGEwJCUjEcMBoGA1UE
-AxMTc3J2Y2FmZS5pZm1hLmVkdS5icjAeFw0xNDAxMTUxMjQwMjBaFw0xNzAxMTQx
-MjQwMjBaMIG5MS0wKwYDVQQKEyRJRk1BIC0gSW5zdGl0dXRvIEZlZGVyYWwgZG8g
-TWFyYW5oYW8xDTALBgNVBAsTBERHVEkxKDAmBgkqhkiG9w0BCQEWGWRhbmllbC50
-b3JyZXNAaWZtYS5lZHUuYnIxETAPBgNVBAcTCFNhbyBMdWlzMREwDwYDVQQIEwhN
-YXJhbmhhbzELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE3NydmNhZmUuaWZtYS5lZHUu
-YnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCd15DZMNa3T9YPjnpy
-qB1dD1v/wah8hKHhup8CAT+vImdOrv5B/9kQWgAPR0ilLI+UGFSNgTbDA6VRREPj
-7zKK81LBhsLjgxe9Mf7tARLzoSL7+tJS+aM5qJteveNygRlk+hhIcFRa+48zzK5u
-NfBpj53LKD0CMYwarpubnGbumtwT0hBP76wLOGcvH08ul8SIWU+vemdkq4ta+URv
-85UTQiTPMICgV8sN9kBsQrk0iex3f31nD2jQF+jczSlEbPJlQdqGdMqIYFqB0r/+
-2mYGGJPdrNK99YXunGV5Q4IwkdMS6bjboC1oGkXIoGu8gQqvQ6qAOPy4GyJrg8fW
-VRgjAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAJscBX+H+WZaqmbVRHu6gGc/5XJb
-PXqqLxul11bF4qh5KcLpzf1lMSn6qIObKdNSncclkZAZ8kGZSIzkCBcXwyo7k2kT
-oKBgWdL8DvsajgtEwdzUxNY7sg/jOqXUC7knU7tb2sE9Tz01djN8v7qDc0tBkTzK
-wJxyAjVlA2Of5Dw5bFPl6cKaXeLHRV2YCwOGgZ57q650KrbMkh3qHB8dS+rsfz7W
-GC5DyDaTHLMRwyQ2MklaSLh0HW1HXrgkWbmxPzdtnZb88MV5QMumcD67yg7HVlGt
-WrdeJGm2B0FsNpyd2sEPGb9TZ0+LFof6V60psWm6Q/TNx6CLcqOo+3x6b+A=
-                    
-            </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">www.ifma.edu.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">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 3bb26916..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://srvcafe.uniso.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://srvcafe.uniso.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvcafe.uniso.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://srvcafe.uniso.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvcafe.uniso.br/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">uniso.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvcafe.uniso.br:8443/idp/profile/SAML1/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">Universidade de Sorocaba</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">Universidade de Sorocaba</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNISO - Universidade de Sorocaba</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNISO - Universidade de Sorocaba</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uniso.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.uniso.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>William A Oliveira</md:SurName>
-    <md:EmailAddress>william.oliveira@uniso.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-shibboleth.xml
deleted file mode 100644
index 950c63e2..00000000
--- a/swamid-interfederations-2.0/srvshibboleth.asfc.ac.uk-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://srvshibboleth.asfc.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Ashton Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-03-06T18:30: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">asfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDiDCCAnACCQCMsALWwQfckDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgTCkxhbmNhc2hpcmUxGjAYBgNVBAcTEUFzaHRvbiBVbmRlciBM
-						eW5lMSIwIAYDVQQKExlBc2h0b24gU2l4dGggRm9ybSBDb2xsZWdlMSEwHwYDVQQD
-						ExhzcnZzaGliYm9sZXRoLmFzZmMuYWMudWswHhcNMTQwMTA3MTYwMjI0WhcNMzQw
-						MTAyMTYwMjI0WjCBhTELMAkGA1UEBhMCR0IxEzARBgNVBAgTCkxhbmNhc2hpcmUx
-						GjAYBgNVBAcTEUFzaHRvbiBVbmRlciBMeW5lMSIwIAYDVQQKExlBc2h0b24gU2l4
-						dGggRm9ybSBDb2xsZWdlMSEwHwYDVQQDExhzcnZzaGliYm9sZXRoLmFzZmMuYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCS2BIAyZIFK07OlTIt
-						eoYkuz3iiWLp/kG4n9naDKw1EQ7iAbY6/vfnC0D9Gs7sS1Qq0oafilcqpEeZWutn
-						z24yc/iGJMOwHHI6+QZwdzULwZWbBRr9V1kesy1WxJYihX8JEOmawi/TmDECyCkA
-						6UZqvQTdniWBNzpQ1FWqTCQNK4EluxoVCVsx38pLHF0QYSTiojfXH46q2GRgD7NG
-						GcZdCRqm/lsnbV8v0o/F+WzRxSSQ6rsYwVOCVIT9aZ88JevgilDutmPayHbL8nVo
-						tqy/deyQ5P/hRhgNidC3aaKevzElSU++WxFEp6G0bWqm6FMeNC6l/I8hGwiwwi+a
-						yGP9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABVx5AkbvgqJzu2buqUDifFb8WEG
-						JdrR/8XUyISgoCS4HLTvglT9dpsYH2FOPDDNUoC6xHDH1ewbC3Y15Oj+e4DpOLPH
-						QNpflC+DaSA4M/Vm4Gro1M3VYiICZ0DZ/V824psUgmjPTCgdyjpVq0JUzDTL14ee
-						yohw7ORdRb7ikR1r3b8xdqme63+0bCEfUclFonQrZtlxnp3l/8SAjI4y4nD9NQFo
-						AYFpurGaY4Zu2Wvzu3dauyMLbT8YIb+s4esYuWxNhQR4Dt2XA6tEqPww6I86jwqj
-						jMkM6nvuR66jMnzjNEefK7lfmuV48Gk7HFQPcUzx26jpLKNXC/CIZpU/MvQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvshibboleth.asfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvshibboleth.asfc.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://srvshibboleth.asfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://srvshibboleth.asfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://srvshibboleth.asfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://srvshibboleth.asfc.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">asfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDiDCCAnACCQCMsALWwQfckDANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-						R0IxEzARBgNVBAgTCkxhbmNhc2hpcmUxGjAYBgNVBAcTEUFzaHRvbiBVbmRlciBM
-						eW5lMSIwIAYDVQQKExlBc2h0b24gU2l4dGggRm9ybSBDb2xsZWdlMSEwHwYDVQQD
-						ExhzcnZzaGliYm9sZXRoLmFzZmMuYWMudWswHhcNMTQwMTA3MTYwMjI0WhcNMzQw
-						MTAyMTYwMjI0WjCBhTELMAkGA1UEBhMCR0IxEzARBgNVBAgTCkxhbmNhc2hpcmUx
-						GjAYBgNVBAcTEUFzaHRvbiBVbmRlciBMeW5lMSIwIAYDVQQKExlBc2h0b24gU2l4
-						dGggRm9ybSBDb2xsZWdlMSEwHwYDVQQDExhzcnZzaGliYm9sZXRoLmFzZmMuYWMu
-						dWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCS2BIAyZIFK07OlTIt
-						eoYkuz3iiWLp/kG4n9naDKw1EQ7iAbY6/vfnC0D9Gs7sS1Qq0oafilcqpEeZWutn
-						z24yc/iGJMOwHHI6+QZwdzULwZWbBRr9V1kesy1WxJYihX8JEOmawi/TmDECyCkA
-						6UZqvQTdniWBNzpQ1FWqTCQNK4EluxoVCVsx38pLHF0QYSTiojfXH46q2GRgD7NG
-						GcZdCRqm/lsnbV8v0o/F+WzRxSSQ6rsYwVOCVIT9aZ88JevgilDutmPayHbL8nVo
-						tqy/deyQ5P/hRhgNidC3aaKevzElSU++WxFEp6G0bWqm6FMeNC6l/I8hGwiwwi+a
-						yGP9AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABVx5AkbvgqJzu2buqUDifFb8WEG
-						JdrR/8XUyISgoCS4HLTvglT9dpsYH2FOPDDNUoC6xHDH1ewbC3Y15Oj+e4DpOLPH
-						QNpflC+DaSA4M/Vm4Gro1M3VYiICZ0DZ/V824psUgmjPTCgdyjpVq0JUzDTL14ee
-						yohw7ORdRb7ikR1r3b8xdqme63+0bCEfUclFonQrZtlxnp3l/8SAjI4y4nD9NQFo
-						AYFpurGaY4Zu2Wvzu3dauyMLbT8YIb+s4esYuWxNhQR4Dt2XA6tEqPww6I86jwqj
-						jMkM6nvuR66jMnzjNEefK7lfmuV48Gk7HFQPcUzx26jpLKNXC/CIZpU/MvQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://srvshibboleth.asfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://srvshibboleth.asfc.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">Ashton Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ashton Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.asfc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lee</GivenName>
-    <SurName>Morris</SurName>
-    <EmailAddress>mailto:lm@asfc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Morris</SurName>
-    <EmailAddress>mailto:lm@asfc.ac.uk</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 0ab2b8fa..00000000
--- a/swamid-interfederations-2.0/sse-idp.lanet.lv.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sse-idp.lanet.lv">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Stockholm School of Economics in Riga</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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - SSE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics in Riga - SSE IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lv">http://www.sseriga.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 8468c963..00000000
--- a/swamid-interfederations-2.0/ssl.education.lu-saml-saml2-idp-metadata.php.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://ssl.education.lu/saml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.lu" registrationInstant="2015-09-22T08:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://eduid.lu/media/eduid-mrps-10.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">MENJE - CGIE IAM Users</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fr">MENJE - CGIE IAM Utilisateurs</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">MENJE - CGIE IAM Benutzer</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="lb">MENJE - CGIE IAM Benotzer</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for IAM end users of the Ministry of Education</mdui:Description>
-        <mdui:Description xml:lang="fr">Fournisseur d'Identité IAM pour les utilisateurs du Ministère de l'Éducation nationale</mdui:Description>
-        <mdui:Description xml:lang="de">Identitätsprovider für die IAM Nutzer des Ministeriums für Bildung</mdui:Description>
-        <mdui:Keywords xml:lang="en">IAM CGIE MENJE luxembourg user users login education</mdui:Keywords>
-        <mdui:Logo width="16" height="16" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0DN9GR/zoAAAEZSURBVDjLndO9SgNBFAXgb0OwFythOxf8IY2ljaQRax/Al7AUQfRRfAAbCxHTCEIQLEVUIiikXbATDDE2WbkZRghON3PmnHvuuTNFXVZn2Pe/dVvUZTXBBEUA0r2/7rSmmyIcxotf+Ax3GvyX004UG+AdPTxjhFV0sZa6aSc2C/RxvDQcXEegLqstnGAnttJKFN9yZFgaDvo4xEN0nGZw05DrsorVG5F7XEZOKxQZ4SlUjNWj4CM+0hYaS+M5Zv8dAp8RWJimLddCcLSOxVyI0K3LajvajuS6rDrYjZzmJcZJ9HCEu0CEDk6xNzP3jAC84gAX0/MNnIcWJ7kpxKe6gs2AL+fIuQyKAI6T5GX+jRauMj9vnlXg5QcATWTFHAxLwAAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo width="50" height="50" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0EFUuwKBkAAASRSURBVGje7ZpLjxRlFIaft6Z1JgoZkm7AgdKg02JUMKIbo1ujiQlRkSAiiRsJ6B/QhXGhW1f+ATQBE5SAstGFt40JMSLBEF1YiGi1w8gUlxHkMsO8Lqr6IghUT1e304Rv2zXd3/Od77znnLdGSTgqm1ckbTGsxEYSc3zNAOOYN4Ad5Vp0JsDaLOkp4E7B3IewMciwAHkL8DyAkrB6ALgLmAc4e3wu0xiQDdmZ78TeWAIeyEj74k5lEM52KmAY6cGg+XE/MLRu1c0IGZdaP6d/li7ZrgOukxUUnIS++gNufXbOgly2O192H9QNBgBKhQg7km1Jwhihc8BJQQ2YAgaBYUMZa1h1pksk9f8Ayfbb0JCLoEnsU5JqwFHbY0I/IM4C84ERYJnEcswS4FZgQXYr1GkNK836Ekmt5xhLfAzaCRzETAIDWSvRvFk2FsOSVgKrgfXAkiKCUppFJEAoq58XgG3AHpv9EuPlODrf0g/910omwupewRHgc2AjsNpovjogKrWbCwhsIYiBD4EPynG0r50frcTROeAwcDgJR08YJgRrQCFpH2W1ec3yg1hC6WlJjAG7bV6r1KLpTpK0HB/amyytHkKeAjYAI0phUBvRyS+/zXSctr0VeL1TiAZMLTpm9BbwCfDnbDI+yJ/daYoD2wS7ynH0d5F1oBJHk8bvAl91syDWO87fDTuQ9nejqFXiQz8BnwK/ZMqSu4IGOSLhVKFIgD2CA+U4muni3PS1YSswozTli8wRAZwAPjOc6mbzV6lFRwRfAmdThXQhV0tN8WAC2FspODeusMaA7+owhUTEWRW3/Uc5jiZ61JVfAA5gTisnSZBHrwTjkn7r4VA+BRxDTBWiWvXqZ3sc+LV3459PA/uAv0xBVysbkiezHOkVyrQhyUaAzkHUDM1N2UzRq6tVEgy300JdO9nTGrLMZmUPR/Ah4B7gFgqS37r3MixR6aFFMuTUNBzKa7UFOb60fkIjSVid1yOWm4EV2RRZCEjTGTEhsCoJq73IlYWC++3iQFpmKirAOkO5mwRJWF0MPGp7sdowXfK1KBLYZcMzaszYXVuPgF+SNNCOB5Z/HkkrYwismQhHl3UpGouAJ0CrGu2iip0QlbEY8yrWc4VDLK0OAZuAxzHYqvs0hQ5WDTvAqRS/kITVTQVCDCKeBL8ILPcsXKHcldOpd6LMm1sBbE7C6jzD+5U4Oj5biIlwNATWGtYJ3U3q/Lne6RUOImUakhr6g4aHbRYCQRJWvwDGynE0njMCQaaCI9hPI9YL7q1P1Q2B6aJBpyz3nFk2d0i8g/kWsT0Jqx8BR8tx5Gtk3G2GtYKXQfcBA7PxsjoBaW3wG4dmeAg8IvQY8DZw8CrKVAaeFbwJLEAMNHbfgWs6SxBdYjq7BLodOEn6UvVqaxCzCKWFNfMvnV9oO1WtK87zdbH3eeAMcPEafzeDuPDvnrTz1343Xr3dAOkWSIsB5j7mUMD1gAEKJEXAGdf7AvcFUsOTtplG/BwA24EfsdNqLfrl/1EEqgm+KcfR8cDwHvC9pLP1J/oiIGkV24XYzfW0/gHhg7VpVb73tQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:Logo width="80" height="80" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB98LAw0FC6ikJDsAAASPSURBVHja7ZhdaBxVFMd/ZzepWGlt2SrUbiO2i1oTpIpWoi8FtVoE9cEaM7Pz0ocIFQWxWKkFKVq1BakPgh8PPnQzs4If4DcRBOmDaJE+qEUrmyKy0aRmK0jUptnk+DA37WJ2N9nNsgg5PxhY7t45c87/nnvOnQHDMAzDMAzDMAzDMAzDMAzDMAzDMAzDMAzDMAyj9UgpnTkA7G2Bra9SxULvUhRQW2gvkyoWhpeSgImWWlOml1oGJurKETOtMAFMnh9RVQwAOuptb1XuXTNS+HB2oJTOdANfIrISRRGkmYd6fpAEiMLcdLP3qyoiMhOFOW3ShgAJVchH8/vR72dFkDnzEzUyrwgkK8UDSBULJ1LFwqUo+WbFc5QVPef52Y4mAr8BKAtSRvXzRfiwC6UsQtnzg+fmbRbIx3B+/qZaAqoqgrIhVSzM1DKWGil4wOiiuhfSbB140hkAkVsX4UK3SwEFfax+9gWrQLfrBY1uryWgCHipkcLUAhzoanch9PxgOfCQwinQELjI84Onmup3ymZgHNXfQVZ4fnB17cWmj3jLvaWqgnBfLQFnUiOF/EIcSBULUwLjbdbweRfQOyAvurEX+l1NbWgHCFtAJxB5wpWtT+tMfxWYisJcv4ggcEctAScbPLacabOAO13z2ROFue+BibiXcX1DmewFy4AkKqeBDwBBucrzg84qWX+zKgL86IbOuaayeo6ACssaLGSr2rh9BxRWAG9WDrtOdqyxdec25/9oFOb+BD0e71DdVWXufhFQ1R1uZMrtgnVzBBRIltKZexbixHh6Y0Lh8vYlnz4tcUAHK6L7LO4mdHh+cGUDC3+LqoLydVwPpS/exfKyO97MLtpKQbcDY/lo8GT8TPnHGVlftQuDflRKZ2R+H+RE+7Iv2wPShXI0H+Z+mh2PotwkcFhRUM03sBjdLtjj7sT7M4g7deh1F8TQAVQA3q0IfMj96q3ahTVeik/qPb6UzjwMXCttyz4Zcs4/63lBp+fHV7+f7QT2ClJGpNfzg66F6SebBEGEbwHy4WAZ2OdUe6UiSfYjEIW5RypuftuJf1fVg7QgAtxdWpf52715VAp3SSmd+QX0tYpXvXZwhQtuCOEsxJcgZ4G/gKQL6tGFdWDdgChRmPu1ItsOAmVEtnp+sNbzgwdQXY5ytPLeKBx835W7LfO9C19cpbX3AevjRKUtCeh5wTG3UocQdgAPVrnuj98A2O3OivWaUQJkNcgfleP5cHBGYThOC70TGHAZ9czcM6ROAvR72cs66hQ5gJkaHxikTbUviXKjxAX+QNwxawozDqwBssAbdcxucyL8UCXkrQi/gTwO9CAyFoW5L+ZmsJxR1bUi0pPQ1u7EZCuNqcoehCTIkXriOfa5SF6ax+hNKIjIyf/+FYW5UeA0sBmlQ2svxITEKbQxIciRFn0LLKZGFvYxVWFMoSB16mi/F3SI6E5gGHT3fDajMPe6wHegJc8PttUpgNcgFIBvavh2WOEUwiiqh2rMeQ9kGI3PgoZhGIZhGIZhGIZhGIZhGIZhGIZhGIZhGIZhGIbxP+NfTtmklCc4oeQAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:Logo width="320" height="240" xml:lang="en">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAUAAAADwCAYAAABxLb1rAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB98LAw0KLmQ47LMAACAASURBVHja7Z15nFtV+f/fpwulLXtZ2wEqDcq+yb44KqvAsMhmMx0sBPyCMJpg/LEpgiIgRhIYNpFgYTopKLI47IgwghQUsOxb2KRAoZ3SQhe6nt8f54kNmXtvkplkJmmft6++BpObe889957Pec5znvMcUBRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURQFwBQ7oLshdBFwCjB61a4qC5iXgMSo6dmb9dVRlJVcAGeNCb1kDNtqNa1QQQvGWHvjqA/eOlWrQ1Hqm0FBlp+KX88Ow/UY5pTuhtA3tDoUZSUVQBn2Kt52s7WWH2lFKMpKK4B2tFZPgCVo+JpWg6KstAJotHaCsVoFirLyDoEVRVFUABVFUVQAFUVRVAAVRVFUABVFUVQAFUVRVAAVRVFUABVFUWqbITVWHgsYl3EAgP8CsyzMN1iwBgxrW8tGwEbuGPcTNHJbUZR6E0Brscb8T8FeBR4A+4dR0996rdhvu8eEGq3hFAPfBBr0cSqKUi8CaMEa48y42wycOmp69vNyTjDqg2wX0AXQ3RDaCbgS0CwtiqLUtACKwWfuGjU9e3QlTjhqenYa0Ng9ZtxGFnMfhl3M/66jKIpSOwI4B9hz1PTsG5U+8agP3voY+Hp3Q+hU4IZV8aGOb56wp4ErfFwOg4wxe2U62leqZA7h5pbNgNvBLvXucs3nmUz7wavKOxBuntABfMX/CAPwRKaj/f/V2HN8HOzg4KPMlExHe1u9CaCzxqx9YtQHb+1X7YuNmp79Q3dD6I/AdGCjVUoBLetgzF6er45ZWW+Zaw3s6neHFgiHW3bIZNpfWDVeAhMuoda2A2pGAMPNLecC+5YwaBsBVEQAB/Xf+4kBMv0hfnkiuHTU9OzGwGuavGpltnZaNjBwWJC7wxjA2HtWlfqwJb3wZs3xzS3hmim45aeUlmZux0pdsr8E0ABTRk3PNg9EvY6ant0aw1uawm+l5YelNRyzaTjcstoqMAQImdJc39bARTUi2g0Y1qVEn324uWXDehLAqaOmZwe0pxk1PRvCmrkqgSsX45tbhgIXltpwrOGRVWD4W2q2cmMhFHZ1ONAujHvLGk/CpvUggBaYM2p6du/aeC8YKzPDqoMrS1OHI8t8JfdY6e0/2KOM+gPLrTXwHLcu42ALbFnrApjz++1WKy/GqOnZOdbySzQ0ZmVq7ZN9vlnq1dEZzNDx4ZarVvJOYZ9A26mnVXzgAA9/L7bW9rRCrfUrs8FyUK0LoLFw/6jp2WwtvRzrf5C9EPhQlaP+CTdP2AvDMJ+vD/bp6KwxK/2Oh9t7fLbYwhIfwVxzfHPL+AEs75kY01PojHnB11gxtiKiXS0BtMCy9adnD63RF+QYlY+Vwta53ufdm5PpaP+79R/1DR8fnnD8ytkptGzs89VCA7f4WFTWwCUDVN6vYFnbeAvdGQE/rcjS1+oIoMVYqNmQg1HTs0/h4gPVF1i/DT0E7OAjcM/Jf3T5Nnhj/riSVk3Ip03OB27CWuMzWhs7vnnC4P73YPCQn0Mq09H+RNBAP9zcsnlNCqDFYqC5xl+Un7uOT6lTLrD+HdiZ8iZGrfVsXgYYEW6esBLufW238tGLOVj7rMXfLDaY2/vdhreM9RQQay+T/zcv4Oc1KYDWGJMdNT07v5Zfk1HTs5PALFEdqUvrbx2LbekxbHLRvzMzHe2vSvN6NXjli3lq5dM/7xVAQHcmM3kxxjzhP/Kx+/fzc/wtpudqNGuswZhrxUKc63en1to+B0RXQwCNhQfr5HV5S+WkLjlJMqgVmjHGWntH3hBqEdjf+zV4ix2z0tWMwS/k7OMVIx+/QadZc3x4wvf6cfh7Ot4z9WQ62t8XMZnr8/yMMeaAmhNAiwVbmXV6VX8A1t5lrboB687IwV7h1YithSmZyacVmBMX+DV4gxkUbm5Z2ZbHbeUhNGB5QYa6TwYsk7PGmMv7yfrbxsBIj2djwf5sRYF4x+/5Wdv3meCKC6DBsP4H2dfrorM0psMYdQPW2fD3SOM3vWt4pvCzTKb9E+B9HyvCQmXiyWqjbrx9mpJt+Fmxihcba67PBdn1aL6wabi5pT9WiN3vKyHW/CGvQI8EtN/h4eaW4TVmAdZPjN2o6dmXVFLqjrR3whcLcKKPpXCAjxVhgKHh5pZzVpLx79d8JAXI6xwMSRu8GODO6o++fMNYZkunlePRgBEcBKb8GgABxDKnzt6aBaopdWP97QmM8m5P5p0Vkx9fZkpm8hsBEU8W7EUrQ/1Y2MrrPq2z/P4nKpmO9jeAOfiOhe23q1nO8c0t1xjjqz2HfcmC72ifFjCEw2LH1tYQ2LCwzt6bRSotdcNvrc/QzWB/UUQcjvN7ZS1mtXB4wj51b//Bnl6GnbHM6nmsacH4hYGZNcLNLSdUsagn4d8j/cfjs8/8DFuD6VOegUHVeQ6KUmGrIdzyFazd1/Qc/1pgbqZjcnvwS2nuCXhhLcb8bSWwAff2ucEPPWzmvwU0VYu1ySpZ8bsZ7HA8Jz+40s3c92BWwCm/VWsCWIcdp1LzD8kQ91wvKrkmi/0+09H+hbX2dz6Wh7Gwejg8YWSd11LI2/jtKYCZzOQvwF7tVx8Ys0mVxun3+aZksPza51efBJyxtixAC2vWmd9khMpLbSMzfT/07KysJdPRfnqJKvpL67P6x7h34dm6tZCbJ4wJ6OBf8fnqCmv9V0OFm1s6q2BurOc9iWU+z2TaZ/o00oeDwtXCzS2jaskCXL/Ohg2rqcTUPKcENKiuUk8ypaP9MyzT8PM/GbNlvVaQsWwb8I7/y8cqfsfAp371YW3fhpceQnVjgOYcGvCM7/ULVxNhHFczAmhg3Xp5abobQocaHQHXfhdlCcjfZyaUOZY+CN/AaAaNb55wc30qIFsFfPlMQH2cgK8byI4MN7dULmuOZYJP/CHW8u8A98XTQYIDbFFLFiCzGkJH1Mfw156q60Bqfvh7lF+suoWXMx3t08s535SO9pnAcn+PiGmux3qysLvPO06moz1oyec/rK9BbCwV2n1tfHPLnhaG4T2JddOUTPui4E7QzvXWPwPwjZoSQBOcx6uW3ppd1f6reX4X8J79rJfn3NfXHoLB4eaWU+vPAPRJgmD5NOh3mY72RQaT8nGxGWDDCmnCg14dmfNB2qJbcxrDx/5D9d4ncajWLPDX6+S1aUCpZetvD6/hjaTBmpnpaL+rl6d+JiAs2gLX12F1beFjxX1QgiWQ9HOLWvcc7q1A+db0EbZFmY7J3SW01Q99XRfGfLWmBNDCqO6G0P61/LZ0N4Q6dBlwjRvolgs8e31rDdbe2NvzZjralxjLOX6mFJZB45tbtqqjjmJTn1lSi2V68fqY/F9jjKeFJZsmfbOPw9+MZ+5NawHTVKKmPBz0Zbi5ZbNaGgJbC1fVduOyR6jE1HSjHm2wh3r0+tYYYzOZyef18SW9KugFNpZn6qir2M5zltRiMLxR4kmOw/rtv8GIcHPLcb2uastxnh2ZW8r2eIkN9p4igtOrmeBqDYGNgW26G0I12Yt2N4R+C6yhMlPTnOUb+GztX/t68kxH+0LrMpJY/0Y/oU5CpMx2AcrxdIkGwb+sCXIM2F65BcLNLYe4pKeekx/tUzomf1HKeaZkJr8QVHxj7La1JIA5X8oDNTq0+rGmwap1o4af4JXzDwvGfL9CVzke/5VABswTdVJbX/czvWyJluyUzORFBlI+/YGxsF7vHqNvZhljrf1xmeeaFfCsGmtLAN389ObdDaGLa8z6e9nAUFWYmh7+nuFvmJmnMx3tcytxnSkd7fMICAQGdg2HW+qhp9zDrxG6TDglC0zCb2GIMYZwuOW+8mXAe9tSay1TMpM/LVNNP/HNYGPpVQabqq8Fttae390Q2rhGxC9qrd1GY59rnsu9lktZZwGeW+Fr7e7r+3Ld+BU1byx7bSzkvilLYKZ0TP4A+CjALVDWypBweMJf8Z+5PaRsMTW8h8/KBQvrjQ+3lG3YVF0AJZjynYF+SWaNCW0FJHXoW/PW3xF4r8+2Bt6b0jH50Qqrx9sBHaIFouHm2rUCw+EJmxsf350tYQbYg6MCOoTVw80tx5bR+A8LsK4f68V4ujPoS2PKnwjpj2wwBhjW3TDu04F6SbobQpsYY19B9wGuA+wvfUYSBiq/10wmM3k5Ppmk5d21Fo6s2eoyZge/LTMw5v1etNb/FOkQSgo/Cje3HCb64jX50emT9ir4zTD2UQJMdfz2RB5gAZQXyazd3RCaNwDity3wgTwHNf9q2foLt+wIZkefxrwk09H+uypd+taArtFg7Z01XG07eu+PbI2h5BCYvGFw+xLgN/7t2K5d4qn+6mVwyMqPCb250Skdk18LUhgLu9WqAObEZ2R3Q2jZrDHjdugX8RsTOt9a+xK55LFKbWPsz33tHOio1mUzHe1LMEzyN7IM45tbanXV0I7GZ4c8epvey5IMGGgSbm65v4j1N9j6tDljDJmOyZ/14X5nBPRUZWevGTIAD2wQxjzf3RC6b9T07GHVusishnGfABuY3J5YSm1bf80t61hrjwlw0X4/3Nzy/Wo4MWxuoGsCMyQ/R4XWxVa07NjdveYFxNfdKwHMZNo/Ht88YYbBbOxlDoMpJjQ+kx/WWsv3+na/zDDgN6m6Xy1bgAXWKod2N4SWdjeETq/kubvHhCbNGjNuOZgNZGig4lcfnFNkgkq2gKj8/4zLgBx0cWMwG4SbW4bUWqUZzGZ+SuG3SVSJZz7c+hrjDAuHW74b8OPvGM9wFWOMMXf1UTveDPo23NyyVs0LIP9bYshgLNd2jwkt7W4IXdsn4WsITe1uCC3D8H1jTM7+VvGrH87G1vAklcECd9dSkcaHJ4zzS5Rs4fM+3u7zRbqjST6W/In/66h68kCmo31xH2+72OKKspLaDhrYd+p//fpg4PRZY0JH9+F0u+VZeyp89TT8DbecnjNnariYxsKh42vICjTG7OBntxrDe305d6Zj8lLg1/hHTvgtJZ3kI8gA4ytw2/cHj5Ht1+pGAL1qqNc/typ8dYvhIp83wK740x//cu+St10lo4pYDdXcTgHf/bcC50/6tSlrrQk3t9xaYP2tgX+2bTId7X3eMzzT0f6R9csq7aIF9i3nfEO09SkDPIw7BNjA54U2UzraTT+XZ4gxZknAIZeHm1uuyHS0L6txAXyzAmLTHQ63/BfDZp6KZjmq4HndZbz97tbChErdtLHmQwxjPIpkgLLWBOu2mMpAD+Mu9LG4rHGzif3KlMzkpVheKnLYXjVSfbsEDIf+XSG1Oczr8RgnN8PCzS0bi/U3yMD+PhagMfDnCg4Wg5K8bqMCqNQF4eaWrwF7GO8ZWAOcPUBD8v2K+GT+USNV2ODTqwD8p0KV8VrQBLmF3DA4YGMi+8+MC7CuUKdpXwwoD+ObJ5Sce0AFUBlIfhHwHj+f6Wh/bSAKlelon2OD3MkWM755woBu/xoOT/DPten2Sn6lQnWx1FouwcdHa6zNWcPpgPqqcLyvecS/7wKD2VoFUKl1628o1mdW0KnPZQM6NIdjfcNyDNZgnh7I8lkTkATVmMouOTX2t35DW4wZGm5uGWSt9d2ZLZOZPLei9w4PFTlkOxVApaax8KuAJFRzMx3ttw5k+TId7X+RsBzPrNTW2i3CzROGD6BA7xLwdUWzL03pmDwn4JwGiPusorHAaZW+9ykd7d3A0oBDSl4RogKoDFQDjuPvaLu2FsporZ2Mbz47LJiBLGfQDPC7Vbjewf7eCi4znptXYSgxe0wvOtD3A77bWwVQqeXh7/9Zawd7i4sl09F+Xi2U0xgz0V+kjQEmhptbhg1Q8Xb21SNrs1W43tvek/V5yxl6Fua56oUL2Q/9no2hZ4iMCqBSS5xtvLN4WjC310ohMx3tyyx2ZpEZ4RMHxjr1SQhgAGNeqEZdGMyFlLNkwZgDqzeCMNMIWPgwPjyhpCVxg/zNSM0dWtwKV8plfHNLI/AVz5fXJT29oKaG6pY9iywwuiHc3DK4Xy3o8IRtiiQ2f7Y6lcEV1m/TEI/Wkelon11F98SDQdc2xpQUDzgoQGGf1kYeKH4PajX0pg1xoW+dGvOfvmUwqYIVmJn8joz8gtrCDv1cizsVsdZerJJF/LnBvFtC67DW2LOq+x6Zv+OXCcJJ9C59HQL/El1b628YWH6t1VCm5dLcMgb4pr82cmlNPmzDWUXawtR+7kV28m38sKDK1z6gFHXCmlR1O6b2+RizKMBE3KdPAjhqevY+4Czp+tQSzFUrFmvt19f/IDu3VgtpMENqcuBuuTrIaMh0tP+5Fusz09GeLDIc+9+SsH5in4DkrTOqfO13io6N4K0pmfb+eNNmBfRa+5dygsBkCKOmZ5PdDeNuMZgzcOsfl1ez1Zo+PDxj7ANBKX0r0HgNhtuw5k/rf5BdWMsqncm03xNubhnkZ2dlOtoHRgYNvkk0p3RMrvFO1g7yMwJdmvd+rFNr9/V71atdjkxH+3LA+O6U14/vV6ajvaGWd+xTFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRlL5itAr6zvxJo8cBNwF7AZ8D1wM/GznxQ6u1oyi1yxCtgj6L3yDgbmBb+Wg94DzgI+Dqmi58OrshcF+R92A/IqHP9UkrKoCKF3vniV8+p9S8AML5wNcDvl8KLNdHrKgAKn5s5/P5tgNs3a0B7AJsI/86iYQezvt+LHB6kbOcSyQ0Xx+xogKo+LG6X93OnzR66MiJHy7pR9HbDjgaOBTYDRgs37wK/KTg6N8CQwPOdg/wO328igqgEsRcn88X9Iv4pbNrAd+XIfcOHkdY4BQioSV5vzkQODbgrG8B3ycSsnm/2RY4BLiJSOhTfeyKCqAC8B+fz6dVWfjWB+LAGcAaAUe2EQk9mfe7ocCVAcfPBg4jEpqd95uRwJ9kKP1L0tlJwMVEQh/p41fqmUFaBX1j5MQPpwGPe3yVqpLwrU46ez7wNnB2EfF7GzfRkc95wNY+xy8BjiISer3g89+L+AGMAH4IvE06+1uxQBVFBXAV5mhcHOCbwLNAZOTED/9cBfHbH3gBuBhYs8jRS4FmIqF5eb/fTgTQi+VAC5HQ4wXXPAdo9jh+dbFAXyedPU5fAaUe0UDoeiCdHQb8BvhxGb86h0joN3nnGAw8Cezuc/zpRELXF1z3aOCOEq93G3AakdAcfWCKWoBKpcRvc2BqieL3FnAOsPmXxM9xQYD4ndVD/ByPy3WfL+HaJwD/IZ3dQR+aohagUgnx2xO3ymTDIkf+S4bF93xp5nbFefYDHvPp8M4lErqshLLshfMnHlbkyAVAmEjobn2Aigqg0lvxOwD4KzA84Kj/4uL7/uIpfCvO9TBwgMc3USKhK8ss135AG7BjwFHLgZOJhG7WB6moACrlit+BwL0EBypfBZz/pUkO//PdCuxZIFBnEwn9uZflG4KbALkIWC3gyJOJhP6oD7QyxKLxicBEYFIylZi0Et7fAbiVVdckU4l+WUCgcYC1J367y7DXT/xm4mZrHyz5nJHQ9ypaxkhoKXAZ6exDuPjAcT5H3kg6+xmR0F/qvGGOAEimEgsGuChjgUZxZ9Rzfa4NLPAQuRuBzYGXgL/1R1l0EqS2xG9ToDNg2PsCsHtZ4ldNIqHncBMrjwS8X+2ks7vU+ZN5FrhWX9CKiN9YYA7evuRLRQT/1V/lUQuwAsyfNHqsx8efjZz44ewyxG8YcBf+Ex5PAIcTCc2tqZuPhGaTzh4KTAa84gGHA3eRzu5MJNRdgQY0SCzO4cBHyVRipscxI4EtgMXAm8lUYrmHRTc0mUrMlfNtCQwD3kimEl8UHLszsBXwn1g0vo58/HkylVgWi8ZXx8VDzk2mEjYWjW+Oi898Jf+asWh8tDzXj5KpxMdl3OtQ4Ku4APU35X6Cjt8CWAt4J5lKzC3jOhsAY4AvgBn5r3a+lSbl2VI6tjeSqcRij3MZYDSwAfCJ3HO+f3qC/B0p9bk8mUp8Jp9lcOFU8z3OO0SuPQR4O5lKzPexLJckU4kFee/AInkHPH3kFfcBtnY2boFLEbU98BV58COk4J8B84D3cSEbrwJT25q6ZlfguoPEGtlb/AgNwNryYi+Sa88E3pAe/Sl5scrhi7amri88BNCrcq8cOfHDaBkCmKBnwoIcjwOHEAmVPwRz/ro9pV62BjYDRkq9zAW6pXE9AzxGJDSrl9brYHmBj/c54i4ioaP7KH7NuCQOm+R9fFsylfiefD8Y+BVwltwfwIfAD5KpxL1555kkDbEJl7x2s5ywAWcmU4lb5LiJuJRmIwuKsnMylZgWi8YvBH4B7CR/c/c3LJlKLI5F418Bbgb2y/vtA8CJXsJdcK+H4YLrcx3iq8D9cm8XJVOJC/OO3U2uk1vhsxy4BTgjaNgugnEzcKTPIUcnU4m75NhTcbGo6+Y6eOC8ZCpxTd75GoE/SrvP8T4QSaYSD8ei8T/g1qzn814ylRgrv5+Gm1zbOZlKTMs7bxQXxpW79mLgGuCcfBGOReNzxHp8GOefzo2k3gSOSqYSr1TFAmztbBwNnCYv/9d68fuXcNlHbm9r6nq2zN9ujItVOwnYqMr2zkXAhVUY+jbKi+037G0qW/zS2RAQBcbjkrSWwnLS2b/hJljuC5xZ7mkJLiOdbQHWAQ7yOOIo0tmJREKTeil+OStzCfAH4AMRnqfyDrsAOFc6uKuBUfLZHbFofKdkKvFq3rGDxd1wr9zvHmLB3hCLxu9LphKzRDz/KnX4bxF45Nr53C4dbicwW8RvOPAQEJKyTMUlk2iR4xsD7rUB51sdIcdOBQ4EYj7HPizH/lIa+wTcZMlC3LJFPy4W8btZ/ntr4C8iMAdLPRKLxo8FbsBFHZxPbhINro5F4x8mU4k75Xy3AhsDv8Ytw9wSl5koF0c6VTrj7UTcXxQhDXrupwBJ4FMp4wIgInWxusf97S8dzvW4pMTfA3YWF8Y3KyqArZ2N60uln0LwjGUxtpN/57R2Nj7W1tT1rRKuPVhE4xcePXQ9+f1WA67zscY/AY4oa9jr1uYmgJNZkQ6rVAaJeB0EPE06eyqR0ItliOBi0tkTpBfe0uOIBOnsPb20Ms+Rv9FkKnGtR0MZLu/DYuA7OQsrFo0vFoE71aOTuT+ZShyZd44X5T3cHbgvmUo8JMPX8TKs9VvfvRGwazKVeDnvs+NE/O5IphKtuSFeLBrfDvhGLBrftuD4fFpE0B5MphLHSdmSuMmPbxQce6aMdH6VTCV+IcfeLo0/EovG4wFW4P7y92fJVGI6kI1F44+J2C7Mcwfklk9OSKYSj8s1XgW6RIDulOHxhtJB/T6ZSrwvvzk3d7FkKnFTLBo/Quq4M2ddFuFn8vf4ZCrxN7n2H2UE+YNYNH5xMpX4sOAdjiZTid/LsX8WMd63oj7A1s7G70qvMKrCkpAt4dpria/gkJXAhfhj/JMTtBAJvVeG+O0mPfimFSjXHsAzpLOnEwndVIYIziGdPVZEcFjBt6OkFz+tF+XJhfH4zSjvgEsMMQs4IxaN5z7fQv56jUwKJ5Neksa5Wpllm+whZnvL3zVlqFzY5rYC/AQwN2l0d5542Fg0/pCHAOaG1+MKrrNQrPHNZfjsRS6Eam1geq68ecPonL90J/nsoFg0nhPNEXn3QTKVWBKLxh8Wy/HlWDR+Iy6c5a0+uDxGS/kXkDfRlkwlZsSi8aki4HuLlUyBmyF37DuxaHwhPhOLQ3opfhfJ0KIa3F3k2iPE5N+97qUvnV0nv4csIEUk9FAZ52qSTmF4BUu4GpAmnd2wpNUiK0TwBdLZc4ErPL49hXT2CiKhN8poCOvkRhgBkwgbyN91Zeifz1xcXsRCCs+1qJf19I6PVYhYHrt7lGdYwPlyRsUMjxFBIblsPEcAyzyuE9TGb8Ilzu2IRePXi/jvKUPfF/LqNTc6afU4//ICq/dC4P9kiBqNReNp8UUu7kW95lw3Mz0mMWYV3H8+hfW2uGIC2NrZ+LsAfxV5vceL0qP+Fze7lCvsptIbb+MxbF6If0hFjj8GiN8C6Q0eBp6TSlosjWIsbte2o4FdA87/iZjMczz+PVZhCYzlOXa/5BimZxqrIPH7pviMVi9y5KfyTD7BZYtZT6zPhiK/u5R0dkaZ/rurgLBHXQ+WRhIu41yfSeMeHIvGN0ymEl5CkJtIez2ZSpS6HUGlgm29zjMzb3h5RZnnm10ghIWCUFg3ACckU4n7yrlIMpW4XiZbDhLL/FNxx/w8bxY7JzTLgA2DhCyZSnwO/CQWjV8sIvgzcY+96tMZFiP3nDeKReOmQAQ3KLj//HKU3JENKVP8zioifi/hkm3eUWxmVyy53XBLtJpwsz8PtTV1LQz4zffwn2W8Azijralrhsd3c6SXfhS4pLWz8UAg7TNU/BjYp62pq7qbAaWzI3DJTL04q+RJj3S2QUR/9YDOqB3nFH7aZ63wVvLCnh5gmVxPOvtsyT5BNylyBvC0x7fHk86eW+rwPplKLI9F4/8RMT1GGmnOOhycTCWW4RLQzge2jkXj2yVTiZcq/MRWL/P4J8TveEwsGr9Sylgqz8t9fgcXF5fDa+LkcRkGHovb4a+cIeZ3gMOBU5OpxI0+dT9f6n5n4Lu4iQ6/8w1KphLLk6nEp8BlsWh8Fm7CavsCawxK8NsnU4lPYtF4zi1xUM5lEYvGNxZLdTluYqXXDClD/PbBoF69kAAAHQlJREFUhSB4MR8XwnFDW1NXSTOHbU1dC8SJ2gX8vLWzcfOgSmntbByCm4b34mrgR2Vc++HWzsZdgX94+Ia2x+W/a6/yALjFx386lUjojhLFz0g5RwUMzY4nEnqmiFi9BsRIZ28A7vTxlw3DrezYi0hoeYki+C/S2dvpmX5/MM55/9My6usK3CzslbFofEeck38bGdp+T2K/fg1cAjwSi8avkaHQGPFLXZpMJXqToOG13BAzFo3/Qqy9vyRTideL/O423Ezp3lKeP0l72wrYKZlK7B3w21twEw/fjUXjt8hoZj+5Dy9L+xTgJAlreUB8etsC6+VP8vi4OADOj0Xjh+dZVK/hJjJycZu/wM2G/zEWje8qFt1G4o/szAuFeVcmHXK+zdwM7XN518zV2wUiZCOTqcQvA8p4iTz3W2PR+LXit4yID/LGZCrxQV8a4aASxW+YWEyDfEz9fdqaun5fqgD5iNJ7bU1drwQccjQr4rUKe9pouddua+r6RKxJr575dKrPST6fX1zGOcJ4TO0LrwJ7FBW/LwvWq9LQ3vU5YvcAC9yPX/l2AC5GsdTh2hTchNF8sVYvlLLkzwBeJqIzFBey9Hucr7qBnqErpV73KVyYyHC55q+B9Uv43SKck/5uqdNrZHR0mo8vL/+374k/rVs6yiRuMucEj2M/FMtwqlhoN4ih0uzjmyz0jc0W99CR8q9F7vFxiaskmUp0Sl1/LIbOjXLMnrg4v3xXwFmiFWkR4evl3/+angjkV3HRCq0lPPcfiHvsPBHETeU8Z/S1EZa6FO50H6tgAXBgW1PX8/0gGCf4fP6TtqauZb0U3Rekpy5kLwnortbw92u4WdZCXsEFu5ZyjiEBYvk5btXIzLLL5n4T5J87t8zzvSA+2UI28rFoghrDVeL72VYs9fWTqcRZed/bZCpxOS4cYxtxq4xJphINyVQivyP4ofhe7y24hOfnyVRiIm42cmdgg2Qq8c88wV03f0he8LsZyVTiKLHQdxJ/6zryWbF7vQcX8L09sGUyldgZNwO+rlw3/9iXxaLcUMr4VWDtZCoRDRiu7i9D5r8Do5OphBErf5y4srYmLzohmUr8GRfgHJJrbA6MSqYSf807ZhwuDnAH+bdeMpU4PX81ifhvd5Bzbyfim2M/ub8XC+7vD2L8fDXvvD/y8EdujrdP3e/z4itBxPp7V26skP9ra+q6oR/Ej9bOxk/yHJ//M6fbmrq26uN5j6HnNDrASW1NXZNKOUfZK0HS2bMLX+KcmBMJXVGiAIaBDp9vzyQSuqaPIv1n/HeO251I6N9lnOtYwCvzzI1EQqei9DsyUXE+cHj+Khn5rkuGt5snU4n/rsz1UMoQ5Cgf8XumwEFbTfEb7SF+UJlZ2X/4fL4bMKlKt9Tk8ZllxUqDUjjZ5/P3ZOjXV64LEMDv4lZGlEqn+JYKQxYOQxkocn6538ka4plilR8t4veXlV38Sh0Cf9/n80urPlP6ZRPWz8/VJ9qaumaKf6GQDatyJ+nscLzDeJ4iEppR4jk2Ab7t8+1Nkq6qr3SxIlC2kLKGrkRCi8gLTs1jE9LZr6oW9T/JVOIOnE91MM7HOAXnk1sX50cNrwr1MKSI5TXcp6HNpEjAcoUZ4fP57Aqd/1N6BkquV6V72Q3vZYMPlXGOAwLcF3dVpJQujOU5eq48ANiedHaYCFupPID3BMq+uAQV/Tn8Wwe31GsRqzDiU71KMuKshWS1WZXqoNgQeD+848Lu7u3EQy+xA1AP1WocO/t8/s8yzvFNn88/lEmHSvGCjwDmwjnKmfx6wufzHUsUrRtxS91aepstOBaNH4cLG9lY/v81yVTizJWpQcua6A7g/WQqUdIughL0vEru5ldsCOy3YuKRfi6n38Pp8zC1tbPR+Fh73VW6F791v+VkwfET0RcrXNagWeSGss4UCb2Jm50uZJsSGvXquOwmJ1BCCIrPOdbDxddtjJv5T5dpddea0G0Ui8a9ZpM3x/nxIjrQ77sFuJPP58/0cznfLVMIymFbn3qo1rDMK7zmEyKh0obzLvh5G18LMJ0dW8GyBmWT2aAX53uVnv7Pr5RgoXwRi8a/DayeTCU+6uW97IJbzfFULn9gnXMmbqmZKair12LReBOVcw+t0gLoNfmwmOIBlhWlralrdmtn49se4nFQa2fjkLamrr44/Q/w+XxqlW5njMdn75Xx+w3xX652Ev4B1pVmjV52ZLuXUB9erEmB7zQWjX8LsMlU4rFYNL47zp+4DHg8mUo8l3fcoLzOcpBYTguSqcRDeceMwi09Gy0jjgclIDn/euNwcXkPyejpOLFIr5UlY/sCqyVTib/Lf++Jm0h6IJlKvBuLxtfARQBsigvgviuZSswruMZquNUjX8Vlc5kO3JOXNZlYNL4ZMkmRZwW+lUwlXpS0VEO8nk8sGt8UN/O+JvDPZCrxZCwaPwSYl0wlnpBjRuCWnRXWj+fned8djovpm4NLJTZ9ZRgCe62V/bCf/X857vWxQib2Yfg7BO9VH5/i1lhWgw09LcDSGV0nnScl3ufqpLOliGkHbpnelwwe4O5YNH4dbs3x74AU8GwsGj8777iHgMvlv3eX89yQ14CPEHFuxy23/D3wpmQizqdJfnskLlj4Jjlvrj1cDHRKZpXHcSsyrgNei0Xj3xcXRUau0Q48J8vXcuUwOL/ro1KG38h9vy6hKsSi8S1ldJIzBu6Uf7kh78jC+5PffQe3DO06KfM/ZbngPXw5oH5Dr9/7fS75Dd8Qt0Ku7t6WbNp1L4Be0dMfD1BZJ/t8nmjtbOxtKMVF0tMWcnNbU1e1JkG8ZoDLcUCvXccjjtkVFNMca4klFpZh7oXy+YUyIQBuyVRuxchjYg0eKg24ARcCMgKXnWcnOdcCIBmLxr0mgW6U73+MS/eev03CCFz85DG4Gf+/isU+CZeteW8ZdXyASxp7fN7w1YqAnybW1KYiOhvjtiFFLMI9C9xAO+O/Tp9YNJ67/nDcuvlcYoOjKD9pbv55B+MWEYyRutsIt/zvM1xm7c3qfQjslQHji4EoaFtT179aOxsfoGcS1LWBrtbOxuPamrqeKNHyGyz+k/M8vp6XZy1UgzU9PitnCL9aHQug32z+OvRtFvLXsmY0t6/ED8RS3gJ4OZlKvB6LxnOTT3Pz95tgRfblW/IyPj8fi8bXx80Yn0HPYPnZwN7JVMKvzJdInB2xaPwiXK4+gJNzQ0PJk3cBBUtMk6nE9QUicx1uUmNL+X4hMC2X8LXgXvz4llhwrwM/EqGdJuFAN/Wh3hul/E/k1d3fZcb+bBHYq+pZAGuNn+LiEgtFYGPgH62dje1i4v/ba5je2tm4jvT8/w//8Iuz25q6PqriPcz3EcG+WJD1Tl/3252Wb0XFovGZIoCl1FUuVdNTBZ/nVrp4TQTeGSB+yPC40Or9tMAv9qlXG4xF41/H7WOxtbwnYyrw3HOjnGcK4vym9bHed5C/IUmlnyMXITCm1l+8uhLAtqaulyQn4dUeXxvgRPk3r7Wz8Xl5+RbKUH6MvFRB659vbmvqqvb+r8v7OKydH/Ddz8Wn0x/0JruKX7qzxX0sy6cVaAOLPEYC4D3hVGyG1St86LMShpQ/wPnQFuOSYkyVYeW4PtbP6j5lKGeL1aEBz3NhgQU/RzqBN2pdU4oJ4Bcew+C1BlgEr5Gd4H4WcNgawD5lnvpm+id2aqaH4JUTUvJFoBBEQtNq+H3z2rVvWZkNsdLk0jkV+qvGyt/ezGb2NnA/55I5VlJQIXn6JlbgnYOek5obl+Fq8bLmcnXzUikZbmqRYpMgXsHAm9SAJfhzXBLI+RU43SLcHhIn9dPsttdMaDlDhaAGuWmNv2+jPeujnO03K08undNE8fvlNuHOrRC5rx/LknON/FfKYWQ47Gv1SmhOMXI+zP1zs8lCs0+bt8DGsWj8a3nl8NrI6mFcDsCDZeieb81uJuExdS2AXo1t49bOxjVqoOw34Z8OqhSW4EIRtmlr6rqyL8lcy8QrhnJzSZFfCjPwTuIKvdiTuZ/xKt97A1mgZCrRhdtPZXPgjVg0/gBuZ8KDcZmR2/qxOI/J37tj0Xg78B/crLHXu5mLU/1HLBq/JxaNXxVwj2/hZrqH40Jv/hqLxp/DY2227OvxN5yraGosGr8PF8B+EAVJQyQZ63liLU6NReMPxqLxu2Qi6j2qlVCkHwXwbZ/Ptx3IQsvytUm42b5ymI5L4vBDoKGtqevEtqaut/u5+F5+EYNLDlkcl+nlNZ9vd63ZNy2dXQ/v5XOlZvR5ApehJp9n8M5a4/X5LPnMa6+QZuBH8r7vKm6GFLCvCEL++9OF/8qkaR7X/UI+e8rjXeziy9vAnobLmzgCN9n3Ki64+yZ6TlichvMTDsNN5ORGFkt9rncKLtvLp7hYyHfkM3zqY7KMsHbBhe98U9xETxWIYAI3S/0P3KTIHiLYSYKXUtYEpojQ+CXu/GlbU1diAAXwV3j7AB/GpUtfIL3dGmItzQc+rlZsX1kJUdPZI/HO2HIWkVCyRDG5GTfZ48VWREKv16AAHob3BE3p961UlFg0vpNYmV3JVOKbq2IdFJsEedrn8yOkNxkI8dsJ7/i9W4CTB2iVSjk85fP5t6TXLIW/Bwjg8fjvwzGQ+OUvnIqi1OgQ+Em8Y7T2be1sHDtAZf6JR7lfAk6tA/GDSOhjGVIUcqAkSy2F+/EOpwH4AelsLQZLH+Hx2UK+vGOYotSOALY1dS3GexbMUHxz9GrhlUb9d1LWesGrTlfHrTEtRUQ/QfZI9aCBFdsR1srwdxfcZjo9XRaR0GJthgPGQlxOx+yqWgGlBELfjPfeEKe1dja2tTV1vdmPw9918F6f/Hyd1fs9uHWkPaSNgI2nC7gOl73Ei4tJZx+Q/X5rgZMD6qGukQwvQ4BFskytbpC9jXdalXuAUgTwPukhCnvwocAtrZ2N32hr6lrST+X1G+JugXPm1guP4jb2LoypPIB0dlsioZdLFNF/4b2/yEjgHtLZbxIJDWxaonR2HbwDeRfjvVNcuQL0OG4WdL9kKvFiBc7XIaOM5txuabFofFt531/J34oxFo1/hRWbgH+HnrPUXuefI+KzTo0L+w/lnk6vl9RWFR8CyzB4Of5O9T2BGyUspeq0NXV9jvcSrLbWzsawWIi1TyS0DBeD6MVPSzyHxflD/eIXxwFPkM7uXiEhW5909keks+Uubj8T7yVwdxMJVSIN+5q4lTWDK/R0Rsr5hooQDJcRxr/J2zdGgqXbpVM+XOIJS2FtaiijTywa/45P1paTcTn+dmclptS1wO0yPPNKDXQiMLy1s/HktqaueX0c4m4MDGlr6grqcf6ES72TzyZIULTsHzwP7/TrOZbi1kV+JoL6Gm529tl+3OnuOhGwwobbQjr725KswEjoCdLZK+Q8XmwOPEk6ewNwOZHQu2WK3jhceqPDcEkkhpRi5XxJNFekcerRadVJG9lRntHDyVQif8nevrjUcPuVmJGlFq28cTLCO4meW8CejIuJrHs3RZ8FsK2py7Z2Np4ivaBX73UcsFtrZ2MMt2FSyasqZOP17wATcDOFxxO83OsSXKCmX5T5hvQ+An1ma2djBriyramrulmvI6F3SWfvpKd/dRBwBaVvPXmONFK/zNaDcUlfTyOd/SduP5dpUsdzxNJZkxWZR76GSxqxC/7bkZbKL33el2eJhB7vRYMdLPWyJW4N7/0ErI2OReO74nLyATyZTCV64yvOLfGalHfeQdJ2HgW+HovG5yRTiXc9rj9SOo5NpJN9BI/19bFo/CBc8PNDyVRiQbHP5bs9cHn9DC6ouSvfBxmLxsfKMxyDi4N9NJlKvFNgwebiVHeRofmSvE3S18IlfVgLF0Sef+1tgb3kPt4A/p5MJZZ63NNnyVTiqVg0vqeUZakcm60rARQRfLO1s3ECbiWF19B5LC5549utnY1/wkWGvwbMaGvqWihbbI6UB7IFbuXDPtKTjiyjHLNaOxub5PzDKlwfG+AmJ37Y2tmYBC6oYmJUcAlZj6FnQPpBpLPfIxK6tQQhXUo6e6yIwV4BRxqp6337yfe3N97rRwF+0QvxG4mb+c5PcvGGl6UvCUDbpWPO//xmXE6+cqz8rURgbpdzbIjLTp6/6mZZLBo/L5lKXF4gQI+yIqkC8v/n0jPByA3S2XyFL68y6fG5ZJC+g55xlYmc+yQWjZ8rhgIFZfxBMpXI5f+7DzgwZ4fIv7m43IzgskQ34uJTH8sTzT/Q06f7ciwaP7ygE7gBWBKLxp8S4ybH8lg0fmIyleioBQEcVM7BbU1d98iQN+gF2kKskvtwS4sWtHY2Wlw84UyxPu4Q6+DgcsRPLMZjpXKHVbFehuJyBj7S2tlYPX9NJPQSbo2mF1eTzo4u8TxzxQK8qxZeKtLZNXGB6V6+4alEQvf24qzniPi9K0Py/YBX8iy0fH4u4nc/btnm9rgU9d8HTi3noslUojWZSmyRN/mRFvG7Wt71fcQa/Y1YOjmuFPH7pwjJwWJNbdTH2r1KxO85XNjUwSJWf8w75h4p3964LDdnyEjgcrFewS0myIVS/UaE7vAi1/6piN8r8gz2FtfTtsDtkjQhn5CUNYxbIneDaM5v684CzBPBjtbOxtm4vQ36bdKhtbNxtDSq/fuxfvYB7m7tbNy/ikHWZ8vQvzDBxChgMunsQbL+t5gILiCd/a687JfQt6SrQSwvIn5GXnSvLCUWt+a2N4Tl72nJVOJBsUiexc2mF+6rkbM8I7ld5GLR+E9xft4TcDn3euMz20xEYgbwY7Ek34lF45cB14v75qlYNL6WHGeB8clU4n35/bu4rMy99dmtIfWwHDgyb3b2oQLRflEsuhzXxqLxC0R8NwA+TqYSz8Si8Rny/WvJVOKxEoqQiy89OZlKPC1lelrE7esyAnmy8P0uyNY9EdgkFo2vn0wlZtWdAIoI3i9L0q4VH0e1xW976a2KpeLqFitzHv6psobhZvPWwgUNF8u024gL+q5OrxUJTSedvRDvpYXfwi3KP7PEc1mxHP+CWyt9Enkzl33kadyi/GLD8rPxT+F0LZHQM71o+ENZsQnQ1LyGvjAWjb8mDTBHg3Qey4ApudTxecPOvqQMy2URH45L/Z77fP2Cc4fE0nkvJ35S3jdi0bhXjs1S2VrabDYoNEVS3TdLvWwo11snr+y9Ed91pG6XsSJbNslUYnksGv+X3PMuHgL4bN6xi0V0N5MOvz4FUETwPeCw1s7Gg+Wl/1Yfy/KWWA5/LxC/sTjnsVfS0C9kOH0b8HRbU9fHZQrrYBmmfFv8FN/wOfT81s7Ga9qauhZU6TmkcBk1vJK4nkE6+wGR0KVliOpH8rsLZCh4jPTO5bgb5onv52HgASKh4tl909mTgEsDnu85vayf4QXlyqcwlCZ3j8s83pUusd56ywifc+cyzbxecJxXJMJsSt/Zb3Wfe5tXxEp9Eudrf1k6jE9wAc99cRvlyrLIw4f6mU95oWdGGEsN0eeU+G1NXQ8CD7Z2No6ThvYtXHxgseHxx+JL+IeY8FMLZ48lvrDDR/weB05sa+p6tw9lXyYN8y3gD62djUeJT67wQa4tw1Q/68drL95XyhCsZaSzLeLX8aq3S0hnFxMJ/a5M67JbhmbXk84OFl9NSHry9aRBLBJx+AKXKmkGbq3yu0RCpU8WpLMn4nZL82IJMIFIqFdhUslU4rM8y2k0X44SKMxqPEMa2WDgkIId2/pKbq+Yj4pkT8l1xKNj0bjJ7cMhs9hBPsDBeUI2zOO9z11/0/zzFj51Eb87kqnEMXnnO72P9/6JvCMjYtH4eslUIn9bgLEF5ctnKTVMxfYEaWvqegu3m9rlIl7r5TW0wdJrzsNNhrzX1tRVSjbn43GO1kKeBA6o9Prftqauu1o7G88Ri6yQ/f0EcOTEDydVYCj8DulsGOfA9pqcSkhc3Xm9yqDsgq9fkH+VJZ39CcHZgaJEQk/18SpPiqV+KjKLHIvGd2bFpkY5sZwTi8afFGs6Sl46NxGVdZKpRG+3dn1a3CzbxqLxQ5KpxAN5515brj8XN/n3iQw/j2LFfsZhvAO2c5bi3tIZg5uwKXwPsiLwG+N2s7tFrr06sImEuawnx76RV7b98V5COi/PbVCsE1oei8bvFSPnTNwkJrFofBt5LktkpFZXVG1TpLamrtkU3zymGGd4fGZx6eurtYj+jyLihRlVtqn604iE7ied/Slug28vzgG2IZ09UWZ+BxaXveZagvesuJpIqBIbTV2CS8p5gezVO08a3ix6xn3+WEYWl8qeGm+LaOwh4pnqpSW6KBaN/wiXLPSeWDT+kFjNDTLqORh4LJlKLItF45fi0pv9SbJMj8CtqviMnvvq3IkLC/tDLBo/Qfxj35Dh4wZ5118Wi8bPx81E3xyLxk8TC2t73KzzhTIUPxOIxqLxTXCTYYfgZqoL/Z9PSRv7WSwa3w1YN5lKfCOgCn6OC525SDZany3PZDXggmQqMaPeBHBQrRastbNxXbxj1p5ua+qq2m5TbU1dn+X1wgQMtaolglfQM4YrnyOA50ln9xtg8dsR5wwPEr9b8U760BvxeURGBC/gZhzHSUM/H7dUbWHesc+K2Nwmxx2F2xqyi+IrWd6R8831KUcGF3L0iFzjcBmW35Zvdck+uWfh9vdoFFE7UlwShQHZF0unN0uEby3cRNJv5NjFeee9CRc8P1VcGluLZZjbE/svuP2Gu3Gbn28hlufPCs+Fi+RIih+1scD1k5Xj5+Vd+1XpRKbg4hP3Ez/jSclU4lceLqDnPfylr3iUY8AwNSyAjazYIyGf37Q1dZ1T5WtPlR49n/famrrG9qPAXIabXPLD4oJSzyUSmt2P5RoplsBPiowgMsCJMvRWFLUAy8TPWdwfZraXv+Szfr37SOicIgJocHuivE06e54EH1dT+FYjnT1NLIOzi4jfdSp+igpg3/DbJW1BNS/a2tm4Jt5BvO/2ew1EQpfLMCbontcGfg28TzqbIJ39aoWFbwzp7Pm4Xb6uK+IKWAb8iEjohyp+Sj0wpIbL5he+UO29b4/0qZeBSboaCd1JOrsrzp+2QxEh/AnwE9LZf+H2u30AeL6klSQrBM/g/EoHAk24sKZSOsr3gfFEQv/UZqWoAPadt3w+Pxjng6qG9TcM50D24v4Bq4lI6FXS2T1wyRO8UmgVsrv8uxiYTzr7PG6LxXdxMWrzcJMGw3DO+Q2lY9laRHa9Mks4CYhVKL+fovQbtTwJMgw3ze41FD64ranroQpfbzAuvMFrGdfLwPb9uHl6kIW2Ey6X3r418JhewsX4PaJNSalHatYHKGmo/urzdUdrZ+MuFRS/0bgAZL81rBfVhPg5a3AakdB+uKVzLw5QKd7FBSTvpOKnqAVYPStwZ9xiaq9yLsIlKLiyralrVi/Pv5U05P/Df53s3W1NXUfVZAU5f90huFi7g/rheT6FS7N0W1l+RUVRAey1CCZZkbnWi8W4BAqPypDsXdwypFwDHcqKfR7G4tbCbiNDyGIzpi8C+0pwdG2Tzm6KywByJC5YtVLP9kWxxDuIhF7VJqOoAPavAK6Gm4D4dj9f+p/AEbKkr75IZzcQgd8HN6mxFaXNns/EReq/JPf/+IDvKqcoq7IAigiOwKXKau6Hyy3FLey/oB+3++wPURyKCy5fH5deahhuAft83FKoj4iEFmmTUFQAa1cIw7g1k9VYl2tx+9Re1NbU9Yq+GoqiAliLIjgclyoowpc3pukt03ALyCf3JbegoigqgP0thg24PH274YJ4N5dhXuH+GvNxmTY+xqVGegM3u1x2FmlFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRFURRlleb/A7hhlB7cvnMAAAAAAElFTkSuQmCC</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>158.64.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:a18::0/32</mdui:IPHint>
-        <mdui:DomainHint>school.lu</mdui:DomainHint>
-        <mdui:DomainHint>iam.education.lu</mdui:DomainHint>
-        <mdui:DomainHint>education.lu</mdui:DomainHint>
-        <mdui:DomainHint>lu</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:49.660068, 6.134062</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:49.610136, 6.127278</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>MIIEHzCCAwegAwIBAgIJAKJTKiAWTLbEMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYDVQQGEwJMVTEKMAgGA1UECAwBIDETMBEGA1UEBwwKTHV4ZW1ib3VyZzE5MDcGA1UECgwwQ2VudHJlIGRlIGdlc3Rpb24gaW5mb3JtYXRpcXVlIGRlIGwnw4PCqWR1Y2F0aW9uMRkwFwYDVQQDDBBpYW0uZWR1Y2F0aW9uLmx1MR8wHQYJKoZIhvcNAQkBFhBoZWxwZGVza0BjZ2llLmx1MB4XDTE0MDUwNjA3MjcwNFoXDTI0MDUwNTA3MjcwNFowgaUxCzAJBgNVBAYTAkxVMQowCAYDVQQIDAEgMRMwEQYDVQQHDApMdXhlbWJvdXJnMTkwNwYDVQQKDDBDZW50cmUgZGUgZ2VzdGlvbiBpbmZvcm1hdGlxdWUgZGUgbCfDg8KpZHVjYXRpb24xGTAXBgNVBAMMEGlhbS5lZHVjYXRpb24ubHUxHzAdBgkqhkiG9w0BCQEWEGhlbHBkZXNrQGNnaWUubHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3xxXsMERdSaqG4G6zlZp6VMmU3TGYpsF9neaUKqQLcXtcIYebJP6DL1mBzEOWoATES0osSTEwna2gxI7gDJQ7fu2dCueUjq7cvR1sASjYYSrM1PJNWceuMFKfUNbIxgWo7N++n/kQMRxVTIynY+SpAy2rPRxVEWqDLdlkkjMvW90+X6u03JEMhZgOkwCBN9XoaA0d6lVnv+55cnGUHUUswfS8XjMHsjeLIAAc6o+CDjEmSml3QRvrAysaAAtJac2dWzPDc2/uGxoHGfSrkcLEjfyfMeTRtNf4CQi+MMmvKZr7b/HdeueDx93kHCv3YFPowbKlJFnaiww4DIVLu4RLAgMBAAGjUDBOMB0GA1UdDgQWBBQfyOK6WJEJWaZMCTqsywff9wyqrDAfBgNVHSMEGDAWgBQfyOK6WJEJWaZMCTqsywff9wyqrDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA97H+IraLnVP2EQok2saxkul/liSkS+rTe/La9w4IqQJ9b/nSoB3amqtPhfPZKtdJyFBINOhIQo0V13BjaeX1rgur3u6II8VvJbzQ1Y1cqLDLec2QiOZF+sTZVlYVIoPLiienxLtj0ib7z5Fl5Rfewn6jXfriQd7X1/5ujS8xii0OKiXZDzy5Yn0tdrT5bAJk7GsnUAI5qEpEOQG6seGNqW8BAB6zXbMWJCvx49qL+zH61hwxgwFvMNQEiwhUe0W10KM4AaVcEE5hjjwexJeoDS6J9F2PB8pdUOISmTqILjScqwYtMwrpaKJ7bDqh+dl9Dd5ygIprtpoRNUjiDAA2V</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>MIIEHzCCAwegAwIBAgIJAKJTKiAWTLbEMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYDVQQGEwJMVTEKMAgGA1UECAwBIDETMBEGA1UEBwwKTHV4ZW1ib3VyZzE5MDcGA1UECgwwQ2VudHJlIGRlIGdlc3Rpb24gaW5mb3JtYXRpcXVlIGRlIGwnw4PCqWR1Y2F0aW9uMRkwFwYDVQQDDBBpYW0uZWR1Y2F0aW9uLmx1MR8wHQYJKoZIhvcNAQkBFhBoZWxwZGVza0BjZ2llLmx1MB4XDTE0MDUwNjA3MjcwNFoXDTI0MDUwNTA3MjcwNFowgaUxCzAJBgNVBAYTAkxVMQowCAYDVQQIDAEgMRMwEQYDVQQHDApMdXhlbWJvdXJnMTkwNwYDVQQKDDBDZW50cmUgZGUgZ2VzdGlvbiBpbmZvcm1hdGlxdWUgZGUgbCfDg8KpZHVjYXRpb24xGTAXBgNVBAMMEGlhbS5lZHVjYXRpb24ubHUxHzAdBgkqhkiG9w0BCQEWEGhlbHBkZXNrQGNnaWUubHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3xxXsMERdSaqG4G6zlZp6VMmU3TGYpsF9neaUKqQLcXtcIYebJP6DL1mBzEOWoATES0osSTEwna2gxI7gDJQ7fu2dCueUjq7cvR1sASjYYSrM1PJNWceuMFKfUNbIxgWo7N++n/kQMRxVTIynY+SpAy2rPRxVEWqDLdlkkjMvW90+X6u03JEMhZgOkwCBN9XoaA0d6lVnv+55cnGUHUUswfS8XjMHsjeLIAAc6o+CDjEmSml3QRvrAysaAAtJac2dWzPDc2/uGxoHGfSrkcLEjfyfMeTRtNf4CQi+MMmvKZr7b/HdeueDx93kHCv3YFPowbKlJFnaiww4DIVLu4RLAgMBAAGjUDBOMB0GA1UdDgQWBBQfyOK6WJEJWaZMCTqsywff9wyqrDAfBgNVHSMEGDAWgBQfyOK6WJEJWaZMCTqsywff9wyqrDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA97H+IraLnVP2EQok2saxkul/liSkS+rTe/La9w4IqQJ9b/nSoB3amqtPhfPZKtdJyFBINOhIQo0V13BjaeX1rgur3u6II8VvJbzQ1Y1cqLDLec2QiOZF+sTZVlYVIoPLiienxLtj0ib7z5Fl5Rfewn6jXfriQd7X1/5ujS8xii0OKiXZDzy5Yn0tdrT5bAJk7GsnUAI5qEpEOQG6seGNqW8BAB6zXbMWJCvx49qL+zH61hwxgwFvMNQEiwhUe0W10KM4AaVcEE5hjjwexJeoDS6J9F2PB8pdUOISmTqILjScqwYtMwrpaKJ7bDqh+dl9Dd5ygIprtpoRNUjiDAA2V</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssl.education.lu/saml/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://ssl.education.lu/saml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
-    <md:OrganizationName xml:lang="fr">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">CGIE - Centre de gestion informatique de l'éducation</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cgie.lu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>CGIE</md:SurName>
-    <md:EmailAddress>helpdesk@cgie.lu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-demo.proofidcloud.co.uk-idp-pingfederate.xml b/swamid-interfederations-2.0/sso-demo.proofidcloud.co.uk-idp-pingfederate.xml
deleted file mode 100644
index 0519d0bc..00000000
--- a/swamid-interfederations-2.0/sso-demo.proofidcloud.co.uk-idp-pingfederate.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://sso-demo.proofidcloud.co.uk/idp/pingfederate">
-  <!--
-		This is a PingFederate IdP for ProofID Limited.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-17T14:25:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">proofidcloud.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCDCCAfCgAwIBAgIGAUwSdXIfMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYT
-						AkdCMRAwDgYDVQQKEwdQcm9vZklEMSQwIgYDVQQDExtzc28tZGVtby5wcm9vZmlk
-						Y2xvdWQuY28udWswHhcNMTUwMzEzMDkyNzA5WhcNMjUwMzEwMDkyNzA5WjBFMQsw
-						CQYDVQQGEwJHQjEQMA4GA1UEChMHUHJvb2ZJRDEkMCIGA1UEAxMbc3NvLWRlbW8u
-						cHJvb2ZpZGNsb3VkLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEA1a9N/0Jzf+SLunGwsQlsZ6eCw0v/P4JsYnkiM1+hspj28Dvk3DZ6T7FzW9Wb
-						AcpnMqesvvYWukrvSYWF7cJ4gtGaaqUOvrIHWCFHs4wZgD7dpas3QCg33ehdomIl
-						4kev30P+vjRVF3v59riCK+1sKES00oL3fAI1oa7iKEkVewd8UleDGw4FepL2VaNm
-						ikN+gF5Fqod7Ga/Uw8RVj9BC79aRzWTpfhyp8B/fXBnW0wSrSnrCQC7OB96XFlxU
-						9yn++rbHAZLv48eA2kA3fO/fZtudMsQZMc1d8qHkGkchdUDIbOLllsr3CyLxG9kD
-						ONkv4+Ht1Lcdfp6Y0LjBLfBGTwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB/1Mec
-						y2q86P1bZD4Pspeaw/MaBKA+Im8GsrpGdQ3IUkwrknqeLw+ZC9JgcG35ImU7bhnj
-						GKajNLS2veuODfgN1U20mPdSrWOBIq//QGfrg9QDWhNnntb1e2WTECtpHr+I//7o
-						/mBRNFDFzCiBpTJh+uSCn31fxxcRdjXMSgotDZ9ss8o3cnfvX6tx0byL/r2xoLFT
-						eCIaR1fjrQMwcZ3Yo7tgiRdPrTUMqmV9R94XRX8VsjcMgXHP/3nJRe0SJo6CEahj
-						StVbzLE1Wc+P/kNGPRD3U1+Mzwa7Y7fZenkuR4xVKGFHJS6NyozJG37FwaWM775s
-						dgZDvrnXtrH7Soum
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso-demo.proofidcloud.co.uk:8443/idp/soap.ssaml1" index="0"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso-demo.proofidcloud.co.uk/idp/isx.saml1"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-demo.proofidcloud.co.uk/idp/SSO.saml2"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-demo.proofidcloud.co.uk/idp/SSO.saml2"/>
-  </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">proofidcloud.co.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCDCCAfCgAwIBAgIGAUwSdXIfMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYT
-						AkdCMRAwDgYDVQQKEwdQcm9vZklEMSQwIgYDVQQDExtzc28tZGVtby5wcm9vZmlk
-						Y2xvdWQuY28udWswHhcNMTUwMzEzMDkyNzA5WhcNMjUwMzEwMDkyNzA5WjBFMQsw
-						CQYDVQQGEwJHQjEQMA4GA1UEChMHUHJvb2ZJRDEkMCIGA1UEAxMbc3NvLWRlbW8u
-						cHJvb2ZpZGNsb3VkLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEA1a9N/0Jzf+SLunGwsQlsZ6eCw0v/P4JsYnkiM1+hspj28Dvk3DZ6T7FzW9Wb
-						AcpnMqesvvYWukrvSYWF7cJ4gtGaaqUOvrIHWCFHs4wZgD7dpas3QCg33ehdomIl
-						4kev30P+vjRVF3v59riCK+1sKES00oL3fAI1oa7iKEkVewd8UleDGw4FepL2VaNm
-						ikN+gF5Fqod7Ga/Uw8RVj9BC79aRzWTpfhyp8B/fXBnW0wSrSnrCQC7OB96XFlxU
-						9yn++rbHAZLv48eA2kA3fO/fZtudMsQZMc1d8qHkGkchdUDIbOLllsr3CyLxG9kD
-						ONkv4+Ht1Lcdfp6Y0LjBLfBGTwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB/1Mec
-						y2q86P1bZD4Pspeaw/MaBKA+Im8GsrpGdQ3IUkwrknqeLw+ZC9JgcG35ImU7bhnj
-						GKajNLS2veuODfgN1U20mPdSrWOBIq//QGfrg9QDWhNnntb1e2WTECtpHr+I//7o
-						/mBRNFDFzCiBpTJh+uSCn31fxxcRdjXMSgotDZ9ss8o3cnfvX6tx0byL/r2xoLFT
-						eCIaR1fjrQMwcZ3Yo7tgiRdPrTUMqmV9R94XRX8VsjcMgXHP/3nJRe0SJo6CEahj
-						StVbzLE1Wc+P/kNGPRD3U1+Mzwa7Y7fZenkuR4xVKGFHJS6NyozJG37FwaWM775s
-						dgZDvrnXtrH7Soum
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-demo.proofidcloud.co.uk:8443/idp/attrsvc.ssaml2"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso-demo.proofidcloud.co.uk:8443/idp/soap.ssaml1"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ProofID Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ProofID PingFederate IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.proofid.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@proofid.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@proofid.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-ed.datamonitor.com-shibboleth-sp.xml b/swamid-interfederations-2.0/sso-ed.datamonitor.com-shibboleth-sp.xml
deleted file mode 100644
index 1e03cc38..00000000
--- a/swamid-interfederations-2.0/sso-ed.datamonitor.com-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://sso-ed.datamonitor.com/shibboleth-sp">
-  <!--
-		This is a "Datamonitor Group" Shibboleth SP for Datamonitor Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDNDCCAhygAwIBAgIJAP/XaizrpNlBMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnNzby1lZC5kYXRhbW9uaXRvci5jb20wHhcNMDkwNDA2MTAwNzM0WhcNMTkw
-						NDA0MTAwNzM0WjAhMR8wHQYDVQQDExZzc28tZWQuZGF0YW1vbml0b3IuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuddGCkJFXviR4SRi3XTx8DoK
-						3+aJlykHiKhaiAEpDd9w58UnPF/zpUfjsgtTrX+TdZhH+qFMOaKs6D2g8SJvoeQX
-						WuiAhn3OKJJletlY1AoRD5Fc8rjkSxm2fIInbyq29ZfObrDoRVNgLHGZPmVGwCz8
-						+hj51L8eOll9/z1ltVa4HH1t1Xs1jHomRGz8fQAV3eXLkHZTnLiWpLh5oiMW8TXI
-						CoWMMUXKOyPwMO5LscwkDeFNmJvN9X+XMPiui20Qg6cacGaVdtGGne/Bvk0QDlL+
-						87DCk75+UH3DwhBBoBgnrvehUMlt74RKxtH+Cv33p5WFlk2xmS9+8GtG5xxkEQID
-						AQABo28wbTBMBgNVHREERTBDghZzc28tZWQuZGF0YW1vbml0b3IuY29thilodHRw
-						czovL3Nzby1lZC5kYXRhbW9uaXRvci5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						MXu5HxXSBcHmsiybSMrhwo++Hz8wDQYJKoZIhvcNAQEFBQADggEBACrHlgKlmU2Q
-						53w+aTrQUH9mhLeyGRZQXqvnuxwtrWVYeYtdCsOK5iMDz9IQGD2ev9I1qEx+12va
-						bOJNLoPSTJDQCvooD5krqoVmrTi+D87vxp64TCRYp1Z6qT8H6IJtKMBNrYnmTeCm
-						+Q/qp5Bd+dqCGcdzPtcdzIHNPZpjM4HCeZQtm7CDgnQCZ1kjPBKa1FwTMC50kafO
-						Nq109V5ZQQRDSDVgzxQR0RvkEZwZtvTqxKqVTLWwHcy3M34pmjpEbhJvpnAy+7F9
-						8ms1g13MgOcc5/vHpXn53nSkBQE6vhi8XEUBkJLXu8cqjyat4NGuKAqggr8vdR/z
-						xBD+JarApxQ=
-					</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>
-						MIIDNDCCAhygAwIBAgIJAP/XaizrpNlBMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnNzby1lZC5kYXRhbW9uaXRvci5jb20wHhcNMDkwNDA2MTAwNzM0WhcNMTkw
-						NDA0MTAwNzM0WjAhMR8wHQYDVQQDExZzc28tZWQuZGF0YW1vbml0b3IuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuddGCkJFXviR4SRi3XTx8DoK
-						3+aJlykHiKhaiAEpDd9w58UnPF/zpUfjsgtTrX+TdZhH+qFMOaKs6D2g8SJvoeQX
-						WuiAhn3OKJJletlY1AoRD5Fc8rjkSxm2fIInbyq29ZfObrDoRVNgLHGZPmVGwCz8
-						+hj51L8eOll9/z1ltVa4HH1t1Xs1jHomRGz8fQAV3eXLkHZTnLiWpLh5oiMW8TXI
-						CoWMMUXKOyPwMO5LscwkDeFNmJvN9X+XMPiui20Qg6cacGaVdtGGne/Bvk0QDlL+
-						87DCk75+UH3DwhBBoBgnrvehUMlt74RKxtH+Cv33p5WFlk2xmS9+8GtG5xxkEQID
-						AQABo28wbTBMBgNVHREERTBDghZzc28tZWQuZGF0YW1vbml0b3IuY29thilodHRw
-						czovL3Nzby1lZC5kYXRhbW9uaXRvci5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						MXu5HxXSBcHmsiybSMrhwo++Hz8wDQYJKoZIhvcNAQEFBQADggEBACrHlgKlmU2Q
-						53w+aTrQUH9mhLeyGRZQXqvnuxwtrWVYeYtdCsOK5iMDz9IQGD2ev9I1qEx+12va
-						bOJNLoPSTJDQCvooD5krqoVmrTi+D87vxp64TCRYp1Z6qT8H6IJtKMBNrYnmTeCm
-						+Q/qp5Bd+dqCGcdzPtcdzIHNPZpjM4HCeZQtm7CDgnQCZ1kjPBKa1FwTMC50kafO
-						Nq109V5ZQQRDSDVgzxQR0RvkEZwZtvTqxKqVTLWwHcy3M34pmjpEbhJvpnAy+7F9
-						8ms1g13MgOcc5/vHpXn53nSkBQE6vhi8XEUBkJLXu8cqjyat4NGuKAqggr8vdR/z
-						xBD+JarApxQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-ed.datamonitor.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Datamonitor Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Datamonitor Group - Shibboleth</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.datamonitor.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Arun</GivenName>
-    <SurName>Dahar</SurName>
-    <EmailAddress>mailto:arun.dahar@informa.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Arun</GivenName>
-    <SurName>Dahar</SurName>
-    <EmailAddress>mailto:arun.dahar@informa.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-edu.datamonitor.com-shibboleth-sp.xml b/swamid-interfederations-2.0/sso-edu.datamonitor.com-shibboleth-sp.xml
deleted file mode 100644
index c5245718..00000000
--- a/swamid-interfederations-2.0/sso-edu.datamonitor.com-shibboleth-sp.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://sso-edu.datamonitor.com/shibboleth-sp">
-  <!--
-		This is a Shibboleth SP for Datamonitor Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-25T14:51:54Z"/>
-  </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://sso-edu.datamonitor.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://sso-edu.datamonitor.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLTCCAhWgAwIBAgIJAPEARr/fSR6iMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF3Nzby1lZHUuZGF0YW1vbml0b3IuY29tMB4XDTEyMDUyNTEzMTQxOFoXDTE1
-						MDUyNTEzMTQxOFowIjEgMB4GA1UEAxMXc3NvLWVkdS5kYXRhbW9uaXRvci5jb20w
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTb/l1EYurxP9VEh52g0mh
-						AUghEgUttKK8pK24M6AycR31By7SIheCo6pl91up5AIklg5b5Duq5fMlBN5WRcln
-						jC8sL98QxGS9Rl/F+LowtCxp7uXX9GGQ2NkUwUr4tvjg9HG+9BRDoBRuLLsoD9IJ
-						6nSImBa7gBXlEwh0yPH+9+tHPoI5zXLlY0Ss+pCXA9mU5iseHoYSEsb5EBd0sz+F
-						0galGRXZkVCU3PswP/vJ1AFiXJXfe1FMdBMxpqG/t89EK78RsZAyH6Pg8FplKFXC
-						7h0vLv63Rx1FIodnH9xa6k+5hX1LPk720ueqf+wVJuSJlWuyrAVslyKF6wyUkuTP
-						AgMBAAGjZjBkMEMGA1UdEQQ8MDqCF3Nzby1lZHUuZGF0YW1vbml0b3IuY29thh9o
-						dHRwczovL3Nzby1lZHUuZGF0YW1vbml0b3IuY29tMB0GA1UdDgQWBBRpkR0vHLfO
-						QUjVToJ/aO4n689nzTANBgkqhkiG9w0BAQUFAAOCAQEACRVd/BiZHPRxx1/RR0Z+
-						CYjmo/EhnbLZbGzLYVZcr0f0GvG5Z8rqHoIr8JgAjjJ0f/VAKEXR/VWaR6641zho
-						NQ91BwXmsNlk+sJPb5UZ7f71fqUbj0P4vD//+3Vv8cgZoSnnbZH8SeILDbEtNNsV
-						KK5WBNCHFTNqbZADGT3gbdp2Yqtyqo+0Or4QMFOp5I4pKUZVnfbxdpCL4zha620e
-						g7EF6Na72cHBA1e9oCu3fRtKUFvUsY2sGlOQBljN5GIbukKt3eKhDA1F1sfYVj/w
-						ZTNxdHOrjQBVdn6vnBjFYzKrNgiZZB9ZCm9Gcb2u0/+77IoDiyCWSbDyI9PbjGmT
-						IQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-edu.datamonitor.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Datamonitor Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Datamonitor - Shibboleth</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.datamonitor.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Arun</GivenName>
-    <SurName>Dahar</SurName>
-    <EmailAddress>mailto:arun.dahar@informa.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Arun</GivenName>
-    <SurName>Dahar</SurName>
-    <EmailAddress>mailto:arun.dahar@informa.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-epos.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sso-epos.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 70f788d0..00000000
--- a/swamid-interfederations-2.0/sso-epos.some.ox.ac.uk-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://sso-epos.some.ox.ac.uk/shibboleth">
-  <!--
-		This is a "SC EPOS2" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-02-27T11:20:50Z">
-      <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://sso-epos.some.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIJAJHKGp/+izijMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnNzby1lcG9zLnNvbWUub3guYWMudWswHhcNMTQwMjI2MTUwODM5WhcNMjQw
-						MjI0MTUwODM5WjAhMR8wHQYDVQQDExZzc28tZXBvcy5zb21lLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxK24wmjmNTuudz0HDi8xGw1x
-						t5v0jh301LqY7sjLKlxd+PoD+YdgdCLQR5gigy3mj/nTSdeAsPYFkhb679SUggS3
-						PmD2R0byhHL2e+MgRyG9euiq/e0/JNtKuRugccJFVKHSgr6bXARP4LGpN8H7oou1
-						S/I3jQwIvh1GdP/MkolhdgWsts4jRV5c2/m6CzrCvqHFcoyrN0ZUkTP2npNwqAPt
-						HvpQncjgUrtNm4v5beC3iCKzvn0q1Img4449MZrQUpAkwONMTb5lFn1emq48f6DF
-						cxylRZwY1u3z63k7YOm2mjvvW8axUoH8Mjktq42ZK29scNBzIWv3liHTU/KXIQID
-						AQABo28wbTBMBgNVHREERTBDghZzc28tZXBvcy5zb21lLm94LmFjLnVrhilodHRw
-						czovL3Nzby1lcG9zLnNvbWUub3guYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						SgHanJ//YKaw4iZ1IaEUS0q/rRUwDQYJKoZIhvcNAQEFBQADggEBALBM1ASGlxEl
-						sJALpwFfz987l1SDYa3fBLXCV9N194MgwtNeQyjoAM2VzWfbIUlCoVJuR8km6j47
-						xbZpJpRMKH7pV83RtI//+3Wm9r4R+TYP7woWbnzKgj2wEFM2ce6jkJ+vwcFlS4ES
-						W57SDZqlL4C6XqJNRFVAQTFdE0UoBvsSiKGXR8HAm+4MUjSNjrqq3TYqq/Ks/PGh
-						xrZT5L+b5jajEf81Ch6WYBBGyFb4GaIw+8aYwzAyS0z+aG9oTJIjehdGnVF/unlc
-						OnC87ksYf/icPcU2jtOfL+D3C48ePJ37jKehg9TyDwzy0r2riBc6WrycWWAmyeyh
-						FcgVm9Zjv/8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sso-epos.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-epos.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford SC EPOS2</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-meals.some.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sso-meals.some.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 1afaab61..00000000
--- a/swamid-interfederations-2.0/sso-meals.some.ox.ac.uk-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://sso-meals.some.ox.ac.uk/shibboleth">
-  <!--
-		This is a "University of Oxford SCMBS2" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-02-07T09:24:21Z">
-      <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://sso-meals.some.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAJ7DgOId94EXMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF3Nzby1tZWFscy5zb21lLm94LmFjLnVrMB4XDTE0MDUwNzEyMTc1NVoXDTI0
-						MDUwNDEyMTc1NVowIjEgMB4GA1UEAxMXc3NvLW1lYWxzLnNvbWUub3guYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXKqSIdFGmx+j/kwnRtIS+
-						hp9gFesgW3QaozTA8Xt4rotBm1KyfeCfNngcsouV/xNRd+qgQ1G1HZXOfqguv35X
-						orHc07Qdr76CtIGo6u+sjWXgJub9+87rfO7f5s00Is6L6IgIEV3WaWLZjlCdyQ3z
-						ZPCmKhU6jmA7HyqINpz7CbK8ChVQIfCYhvjzvXclzfyAypkaV3bCv3Exe61Wkj4g
-						QgO4x9NMio2++MZNIuT5oUA3fHCXwSYKMpdmdVTmR+lyb7RjvGOf2pn7TwdEVKG+
-						5D7NtLPH5kXd/FmZjmrbRutaofPQ6iBJqh8MwkEH+6nWHDkXPPcRYNC4bT0uELvr
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3Nzby1tZWFscy5zb21lLm94LmFjLnVrMB0G
-						A1UdDgQWBBRAagWHG2SqaiNMxN2dQ7m9VvYBxzANBgkqhkiG9w0BAQUFAAOCAQEA
-						ksL6qd7gNUh0/YpWGxqeZrbDC1tmFjs2WEG2vMY7Tkms882USrbqPWt9jT4BUkIY
-						9w3R+Ux9ZAfFIS78gbsOtrnY/UvIHu6XspBfgP6o43x7iSZUo+Ky7x2FfYSpu3DF
-						C3SthR6n9OrYGTbQct7FzF/QpXnl1emDuzGtKe/a//XnVRevp64w+68G6v8Xs3dS
-						ZyISiQ3CkdeZZm9AoFkjX61uofrCaIjwp7ua0igkHU6EiBM7Zl5H4J1l/ddSpGth
-						u7LD03PH9+NExHi07hkWrhBhIWF4V+E9Rzo+FJFjTTC+S/bHhfU9Qo2hDti1XekI
-						eh55XqSqL91ZRV4UwUs1NQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sso-meals.some.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-meals.some.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford SCMBS2</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.some.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Somerville College IT Support</GivenName>
-    <EmailAddress>mailto:it.support@some.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index fc00c26d..00000000
--- a/swamid-interfederations-2.0/sso-ukfed.angdev.com-simplesaml-module.php-saml-sp-metadata.php-default-sp.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://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <!--
-		This is a "Aluminati Engagement Portal (Dev)" simpleSAMLphp SP for Aluminati Network Group Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-02T14:43:37Z">
-      <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">Aluminati Engagement Portal (Dev)</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE0zCCA7ugAwIBAgIJAI9tj6IHmTuYMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECBMHU3VmZm9sazESMBAGA1UEBxMJTmV3bWFya2V0MSQw
-						IgYDVQQKExtBbHVtaW5hdGkgTmV0d29yayBHcm91cCBMdGQxHTAbBgNVBAMTFHNz
-						by11a2ZlZC5hbmdkZXYuY29tMScwJQYJKoZIhvcNAQkBFhhwb3N0bWFzdGVyQGFs
-						dW1pbmF0aS5uZXQwHhcNMTUxMTAyMTMwNzAzWhcNMjUxMTAxMTMwNzAzWjCBoTEL
-						MAkGA1UEBhMCR0IxEDAOBgNVBAgTB1N1ZmZvbGsxEjAQBgNVBAcTCU5ld21hcmtl
-						dDEkMCIGA1UEChMbQWx1bWluYXRpIE5ldHdvcmsgR3JvdXAgTHRkMR0wGwYDVQQD
-						ExRzc28tdWtmZWQuYW5nZGV2LmNvbTEnMCUGCSqGSIb3DQEJARYYcG9zdG1hc3Rl
-						ckBhbHVtaW5hdGkubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						uZ3sg8LNh276Gxz1fiYkQ9ENHNZosCnpklSscs5fYWr1huads4l3IE2enTDJ/VKM
-						kIWtjDuq/EIs7tQtRphsR1zwMtFCg5dKDSwLEIyk6FEH4vouYwRSVmPYh+zvQlPI
-						qadMp3lYsFUcyy2zUbGNSqOSLLaGzEEogihxm3zhPsLafiP4sECNLQ10qoOHgflS
-						yhXkxOQHIIOk01Qishi74opjtxvJGesfrOyTmf4UF/fQS0fIiDKDpT72+haFUksO
-						OaM4SJ1/JJPAAN9/+HsUsVTsfk4a+X89US4F30TAtwDHfcYKi3tDIC6IY1Hf1Rcs
-						KmZtSeUkZVT3lsVlOhvIcwIDAQABo4IBCjCCAQYwHQYDVR0OBBYEFHrH1l9rGVqt
-						gopdiAtWLJXrYQRWMIHWBgNVHSMEgc4wgcuAFHrH1l9rGVqtgopdiAtWLJXrYQRW
-						oYGnpIGkMIGhMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHU3VmZm9sazESMBAGA1UE
-						BxMJTmV3bWFya2V0MSQwIgYDVQQKExtBbHVtaW5hdGkgTmV0d29yayBHcm91cCBM
-						dGQxHTAbBgNVBAMTFHNzby11a2ZlZC5hbmdkZXYuY29tMScwJQYJKoZIhvcNAQkB
-						Fhhwb3N0bWFzdGVyQGFsdW1pbmF0aS5uZXSCCQCPbY+iB5k7mDAMBgNVHRMEBTAD
-						AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBMNi3aujogjGwWmyNITPCGf+p/x5G0JSpe
-						g47Au5pdKSCABlXBE+O4JWSPENtETFAEgirLyjt/pyPM3wBUuK22A4YID9ZSWkKh
-						KGxmpqcFNfYycFVEm6yLspDSYZpsvO6n+aFfN2YSOZwg9wSwkDmYd5zbW2AZk21d
-						dMf8w+pSo/RU1GgSb9y5LwwipMJ/GrPI1ifCWvgXVFWXkJYya1do5BIh7yZ33Gna
-						M/Ph+msHdZ8pexkctO10JpmiXk3mhKiEmq5QsoVPbifRK4MSm8l9aCcItsOzFzPE
-						SP/Ojg/mfRnlJrCIKN6VuP8hAAJfn5OHrTSYqDwMwGj9zZ6NdXAG
-					</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>
-						MIIE0zCCA7ugAwIBAgIJAI9tj6IHmTuYMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECBMHU3VmZm9sazESMBAGA1UEBxMJTmV3bWFya2V0MSQw
-						IgYDVQQKExtBbHVtaW5hdGkgTmV0d29yayBHcm91cCBMdGQxHTAbBgNVBAMTFHNz
-						by11a2ZlZC5hbmdkZXYuY29tMScwJQYJKoZIhvcNAQkBFhhwb3N0bWFzdGVyQGFs
-						dW1pbmF0aS5uZXQwHhcNMTUxMTAyMTMwNzAzWhcNMjUxMTAxMTMwNzAzWjCBoTEL
-						MAkGA1UEBhMCR0IxEDAOBgNVBAgTB1N1ZmZvbGsxEjAQBgNVBAcTCU5ld21hcmtl
-						dDEkMCIGA1UEChMbQWx1bWluYXRpIE5ldHdvcmsgR3JvdXAgTHRkMR0wGwYDVQQD
-						ExRzc28tdWtmZWQuYW5nZGV2LmNvbTEnMCUGCSqGSIb3DQEJARYYcG9zdG1hc3Rl
-						ckBhbHVtaW5hdGkubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						uZ3sg8LNh276Gxz1fiYkQ9ENHNZosCnpklSscs5fYWr1huads4l3IE2enTDJ/VKM
-						kIWtjDuq/EIs7tQtRphsR1zwMtFCg5dKDSwLEIyk6FEH4vouYwRSVmPYh+zvQlPI
-						qadMp3lYsFUcyy2zUbGNSqOSLLaGzEEogihxm3zhPsLafiP4sECNLQ10qoOHgflS
-						yhXkxOQHIIOk01Qishi74opjtxvJGesfrOyTmf4UF/fQS0fIiDKDpT72+haFUksO
-						OaM4SJ1/JJPAAN9/+HsUsVTsfk4a+X89US4F30TAtwDHfcYKi3tDIC6IY1Hf1Rcs
-						KmZtSeUkZVT3lsVlOhvIcwIDAQABo4IBCjCCAQYwHQYDVR0OBBYEFHrH1l9rGVqt
-						gopdiAtWLJXrYQRWMIHWBgNVHSMEgc4wgcuAFHrH1l9rGVqtgopdiAtWLJXrYQRW
-						oYGnpIGkMIGhMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHU3VmZm9sazESMBAGA1UE
-						BxMJTmV3bWFya2V0MSQwIgYDVQQKExtBbHVtaW5hdGkgTmV0d29yayBHcm91cCBM
-						dGQxHTAbBgNVBAMTFHNzby11a2ZlZC5hbmdkZXYuY29tMScwJQYJKoZIhvcNAQkB
-						Fhhwb3N0bWFzdGVyQGFsdW1pbmF0aS5uZXSCCQCPbY+iB5k7mDAMBgNVHRMEBTAD
-						AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBMNi3aujogjGwWmyNITPCGf+p/x5G0JSpe
-						g47Au5pdKSCABlXBE+O4JWSPENtETFAEgirLyjt/pyPM3wBUuK22A4YID9ZSWkKh
-						KGxmpqcFNfYycFVEm6yLspDSYZpsvO6n+aFfN2YSOZwg9wSwkDmYd5zbW2AZk21d
-						dMf8w+pSo/RU1GgSb9y5LwwipMJ/GrPI1ifCWvgXVFWXkJYya1do5BIh7yZ33Gna
-						M/Ph+msHdZ8pexkctO10JpmiXk3mhKiEmq5QsoVPbifRK4MSm8l9aCcItsOzFzPE
-						SP/Ojg/mfRnlJrCIKN6VuP8hAAJfn5OHrTSYqDwMwGj9zZ6NdXAG
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso-ukfed.angdev.com/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Aluminati Network Group Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aluminati Engagement Portal (Dev)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aluminati.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Emily</GivenName>
-    <SurName>Grant</SurName>
-    <EmailAddress>mailto:help@aluminati.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Roger</GivenName>
-    <SurName>Garner</SurName>
-    <EmailAddress>mailto:roger@aluminati.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.artstor.org-shibboleth.xml b/swamid-interfederations-2.0/sso.artstor.org-shibboleth.xml
deleted file mode 100644
index 762cbca1..00000000
--- a/swamid-interfederations-2.0/sso.artstor.org-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://sso.artstor.org/shibboleth">
-  <!--
-		This is a Shibboleth SP for ARTstor Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-17T13:12:58Z">
-      <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://sso.artstor.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://sso.artstor.org/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://sso.artstor.org/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAJB3IFCgt5imMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD2lwLTEwLTI4LTcyLTIxOTAeFw0xMjAxMjYxODU5MjJaFw0yMjAxMjMxODU5
-						MjJaMBoxGDAWBgNVBAMTD2lwLTEwLTI4LTcyLTIxOTCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAN6WkiZMRzx63a0PijD+JNb/rCLcEl/2L7qTpIAjwx+6
-						jai5exlJ9drJ+Gmt72xukLA2RpaNzdXT1lGEQ/QEYug5ha7bSB9HE4KxgNv7CcXz
-						KUd057KZ6TRr1jmMDNGDHkksbN9/5ER0G4QD010i0T+eb2/O3FRXch6HIokt7l+z
-						dA0tTx5HgZilmhLyBMiphavWM1LxufFyPF/oq64WBUJd8Z//02SyyCvo3IryG3jq
-						OmIDf+Rbp9G/FN2T2cznALji2bWFoicSZ8SL1WzekMy3JYtjMM9tS1SBWc7sZBS/
-						Ti1t4f8Ax/QokjuREIIXTbXD960yIs7UEegopc6ACbcCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPaXAtMTAtMjgtNzItMjE5MB0GA1UdDgQWBBQAqHC9a4B+pgKLTDXPjwn0
-						9xeX9TANBgkqhkiG9w0BAQUFAAOCAQEAt5cqGvE0mWz6txCRBf3aMjtv+9prP1Ug
-						ekyVxwKzLXqUIg9T9a368Ya/IBPLWp5GEIZ2AC2cmTepH00+M6/xyj3PT4hajKtw
-						FidVhAgDCHuqb5IXTceH3Qycx/FfF52TUDe/fc5XHnrfbZaI7ZKsMr/45ni53x7l
-						gyDKpi81Jb090gOwSY6ytqJ6mdWJJoJ470j8qkd1H4BlDKdHZ0iFFx90QHm0/1RI
-						u+whYEFiWbeBibbwlYmlIygqNNlNewx8kaP5USX6vM+Dre8C+5tGrBds5fVafpvI
-						Fv9ZTijl7+c/xLmLunvCVeWV12LmrIM/pswE5w1DhxqgZyoL9KslGw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.artstor.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.artstor.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.artstor.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.artstor.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.artstor.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.artstor.org/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.artstor.org/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.artstor.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.artstor.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.artstor.org/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.artstor.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.artstor.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.artstor.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.artstor.org/Shibboleth.sso/SAML/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.artstor.org/Shibboleth.sso/SAML/Artifact" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">ARTstor Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Artstor Inc</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.artstor.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Riadh</GivenName>
-    <SurName>Amari</SurName>
-    <EmailAddress>mailto:Riadh.Amari@ARTstor.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Anand</GivenName>
-    <SurName>Krishnan</SurName>
-    <EmailAddress>mailto:Anand.Krishnan@ARTstor.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.augsburg.edu-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.augsburg.edu-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 239c9d8a..00000000
--- a/swamid-interfederations-2.0/sso.augsburg.edu-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,71 +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://sso.augsburg.edu/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">augsburg.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Augsburg College</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>
-MIIFDDCCA/SgAwIBAgIJAN9RPGLGQC4WMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
-VQQGEwJVUzESMBAGA1UECBMJTWlubmVzb3RhMRQwEgYDVQQHEwtNaW5uZWFwb2xp
-czEZMBcGA1UEChMQQXVnc2J1cmcgQ29sbGVnZTEfMB0GA1UECxMWSW5mb3JtYXRp
-b24gVGVjaG5vbG9neTEZMBcGA1UEAxMQc3NvLmF1Z3NidXJnLmVkdTEkMCIGCSqG
-SIb3DQEJARYVc3lzYWRtaW5AYXVnc2J1cmcuZWR1MB4XDTEzMDgyNzEyNTUxNVoX
-DTIzMDgyNzEyNTUxNVowgbQxCzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlNaW5uZXNv
-dGExFDASBgNVBAcTC01pbm5lYXBvbGlzMRkwFwYDVQQKExBBdWdzYnVyZyBDb2xs
-ZWdlMR8wHQYDVQQLExZJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRkwFwYDVQQDExBz
-c28uYXVnc2J1cmcuZWR1MSQwIgYJKoZIhvcNAQkBFhVzeXNhZG1pbkBhdWdzYnVy
-Zy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLTYBIadLgBdht
-2vNPov8lsGsQ/sjr/5dX6UjbSxWiA9rPqgY9DJftjF/CNSvhB2CCIOSItVPLf1me
-7UJIZbcwRh+PtTGMAJgMDdUr6FfKFU/IGGIJMML6Z63QYog6YFE63olVNCI/DuY3
-xdieNo+jhNwUG56ZnupYmR18GDHoGEVA1YbR1DcRa24N2zuewgVyzoOg7k6BCN5I
-l+ijtPqbDdMg+8CQNDShgrfnkIxP2eiIK3IKiDkvv/zcSYpzQNDaCR05AoY+5I+X
-g7Vn10VtnrGtM1q0pk/phmCo7WQF6DwVBA5veLzLor5Jx0byZwnQed9ivN4Aq0kW
-ivu4qq3LAgMBAAGjggEdMIIBGTAdBgNVHQ4EFgQUTdesxg1z4qAex7c4gw4DTw29
-3MEwgekGA1UdIwSB4TCB3oAUTdesxg1z4qAex7c4gw4DTw293MGhgbqkgbcwgbQx
-CzAJBgNVBAYTAlVTMRIwEAYDVQQIEwlNaW5uZXNvdGExFDASBgNVBAcTC01pbm5l
-YXBvbGlzMRkwFwYDVQQKExBBdWdzYnVyZyBDb2xsZWdlMR8wHQYDVQQLExZJbmZv
-cm1hdGlvbiBUZWNobm9sb2d5MRkwFwYDVQQDExBzc28uYXVnc2J1cmcuZWR1MSQw
-IgYJKoZIhvcNAQkBFhVzeXNhZG1pbkBhdWdzYnVyZy5lZHWCCQDfUTxixkAuFjAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCuVbzHRsSs2W4/soC5MhMU
-mevVY2FW5A92eFIaa6iTHNvUA5SoXDhlMYMCgmqcsEWJ8I8xmilSg0HJDvC1wHsG
-H1r9XxjK2lW9PXlCGFGW4Rh4ljVsQqQZXAWUtOpuom+H9TNF4/pzZxdIhUCOyt9v
-5IwAeos0dMBQ7CJ0qbecFUzbMK4ZwNXpyvGzr5cRsiclW9U7MEcyHOVBcfU8blvj
-NukaLdL+qBhOqX+0/c8TREyoz8esHYXrfpeIW5LjCd0uP+4gKz+xfLbIhPIjf0wB
-MS7pk1MzPh5mGaGDDnSTI0qeaw25K2CtvbzShdcrOdjSk0PQfspH1v/JYIQgxOot
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.augsburg.edu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.augsburg.edu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.augsburg.edu/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.augsburg.edu/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Augsburg College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Augsburg College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.augsburg.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josef Fortier</md:GivenName>
-    <md:EmailAddress>fortier@augsburg.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Matthew Schornstein</md:GivenName>
-    <md:EmailAddress>schornst@augsburg.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.brockport.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.brockport.edu-idp-shibboleth.xml
deleted file mode 100644
index a2d9fc9d..00000000
--- a/swamid-interfederations-2.0/sso.brockport.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +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://sso.brockport.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://sso.brockport.edu/idp/" 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">brockport.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SUNY College at Brockport</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SUNY College at Brockport Shibboleth Identity Provider</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.brockport.edu/privacy/</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>
-MIIDLzCCAhegAwIBAgIUSXda9Cn6rn9RL58UpIkGcNAMDzkwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRc3NvLmJyb2NrcG9ydC5lZHUwHhcNMTQwNTAyMTQxMzI1
-WhcNMzQwNTAyMTQxMzI1WjAcMRowGAYDVQQDExFzc28uYnJvY2twb3J0LmVkdTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJxJiHgL4ar8q+COPbMY3T/4
-Ddq8XnOxJSnn3Qldu8Ndgt9quM5ZatFU2u7hrt+tDXWrP2ZLRDibgXg/VkKv0f95
-ABwU5RJ7Nagyzi4Ekjf1Ji4WsP0d28bAQFspL2IXwpAbKCpPqlGnwu0Op5JRisaC
-cnhdV4Uk91+WWsq2uPw+22qrjJ3DFCip+BGuEf99nFHFmle6fgEdVTqaMeOWNTxp
-u37D1zdSYDLrw6J7/tMujq/rEge1YNgXSA2FKVuGvF6Q+u1zCSDp/hYXPECkyjV9
-3Y/VWHUlWS03h24oRY51snDFKQeDStG7tO6nGwSdFg6jycD4ATgJkEABtQGBGvEC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRc3NvLmJyb2NrcG9ydC5lZHWGKGh0dHBzOi8v
-c3NvLmJyb2NrcG9ydC5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFF3v7hrS
-Ck8K9TwhQESH4LnGiaJHMA0GCSqGSIb3DQEBBQUAA4IBAQBlAXKQ0F4mgTrxsYrZ
-uaUXvu9m+rVgabmb+ArdyF5lMOq4vEL0iaLVk8fTkEYHsbxzHWrx5x3kOV00+WSu
-Jnw9gjunc3RzWQspVL88zgz7+p6JRevLCYR/G80GRCWHyEHuHfyjFpWP0FwjVmYS
-QIJrbZrOobpo3ij3AA9pN40xHI/wi4yw7YWOszxvZwZhem5qDy1/FjcH0I6gcWSj
-cqCDBhqRUJe828mS3ErtmfnxOXH6n91qvNX1/wGrrlvCSCZYT4UdgCHU97I7hN/z
-dFjJO/qm55k8j8PB8w9d2Ge93K0lH5OkiWJ54lHwvJTRBBF+w0duZ9Cp+U90+EF8
-tAha
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.brockport.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.brockport.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.brockport.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.brockport.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.brockport.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brockport.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUSXda9Cn6rn9RL58UpIkGcNAMDzkwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRc3NvLmJyb2NrcG9ydC5lZHUwHhcNMTQwNTAyMTQxMzI1
-WhcNMzQwNTAyMTQxMzI1WjAcMRowGAYDVQQDExFzc28uYnJvY2twb3J0LmVkdTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJxJiHgL4ar8q+COPbMY3T/4
-Ddq8XnOxJSnn3Qldu8Ndgt9quM5ZatFU2u7hrt+tDXWrP2ZLRDibgXg/VkKv0f95
-ABwU5RJ7Nagyzi4Ekjf1Ji4WsP0d28bAQFspL2IXwpAbKCpPqlGnwu0Op5JRisaC
-cnhdV4Uk91+WWsq2uPw+22qrjJ3DFCip+BGuEf99nFHFmle6fgEdVTqaMeOWNTxp
-u37D1zdSYDLrw6J7/tMujq/rEge1YNgXSA2FKVuGvF6Q+u1zCSDp/hYXPECkyjV9
-3Y/VWHUlWS03h24oRY51snDFKQeDStG7tO6nGwSdFg6jycD4ATgJkEABtQGBGvEC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRc3NvLmJyb2NrcG9ydC5lZHWGKGh0dHBzOi8v
-c3NvLmJyb2NrcG9ydC5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFF3v7hrS
-Ck8K9TwhQESH4LnGiaJHMA0GCSqGSIb3DQEBBQUAA4IBAQBlAXKQ0F4mgTrxsYrZ
-uaUXvu9m+rVgabmb+ArdyF5lMOq4vEL0iaLVk8fTkEYHsbxzHWrx5x3kOV00+WSu
-Jnw9gjunc3RzWQspVL88zgz7+p6JRevLCYR/G80GRCWHyEHuHfyjFpWP0FwjVmYS
-QIJrbZrOobpo3ij3AA9pN40xHI/wi4yw7YWOszxvZwZhem5qDy1/FjcH0I6gcWSj
-cqCDBhqRUJe828mS3ErtmfnxOXH6n91qvNX1/wGrrlvCSCZYT4UdgCHU97I7hN/z
-dFjJO/qm55k8j8PB8w9d2Ge93K0lH5OkiWJ54lHwvJTRBBF+w0duZ9Cp+U90+EF8
-tAha
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.brockport.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SUNY College at Brockport</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SUNY College at Brockport</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.brockport.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IDM Team</md:GivenName>
-    <md:EmailAddress>helpdesk@brockport.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IDM Team</md:GivenName>
-    <md:EmailAddress>helpdesk@brockport.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IDM Team</md:GivenName>
-    <md:EmailAddress>helpdesk@brockport.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Security Team</md:GivenName>
-    <md:EmailAddress>infosec@brockport.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.brown.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.brown.edu-idp-shibboleth.xml
deleted file mode 100644
index 39fe328e..00000000
--- a/swamid-interfederations-2.0/sso.brown.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://sso.brown.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://wiki.brown.edu/confluence/x/b4D_AQ" 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">brown.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Brown University</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>
-MIIDHzCCAgegAwIBAgIUHPSdb4ae0QA3fyeEIe7wKXi2oT0wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc3NvLmJyb3duLmVkdTAeFw0xMDA1MjEyMTAyMzFaFw0z
-MDA1MjEyMTAyMzFaMBgxFjAUBgNVBAMTDXNzby5icm93bi5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxabgPhLgyIOyoG87T41EXwUOyXKNJ4XvF
-a5moC3y8J9JzWBeVRQ8L7zxEiLcsZ4qHYdOCVZNSD5SYeI8rtjwz/lHlJsF7dfLX
-peQSm5HggcgWEEbvgp+qHRsbu6ZLKUmD0qLnWLZ5pG+ihm0n10G6h9op9NKJqJOg
-kyk3PQbe1biAjjpnkVL5CxL4h1E0XADZogZBh3pY04kNzbMvaWsB9ToDI8i6JqTf
-yEZZcQr4ShgIdstAHzbHcGoRqSOuI3BDeYDj0lp7/X/v/lvQMWWnKFJD6E7xKypo
-VO2czCswZ9i390YkI9+eoBbIMunuE/JjPZwwknnWqaI5LBDkGbnJAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNzby5icm93bi5lZHWGJGh0dHBzOi8vc3NvLmJyb3duLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1EgYrxblcWF0RP8BxGEPTM4SkIow
-DQYJKoZIhvcNAQEFBQADggEBAG1o9TLKHLDMlW+fRtyWXeGI1Dpnvw505nmWOQEP
-zXnT3oMRsmFYUrynl6amaay0IlEZ86g8KALM0AsKA9x2hYz/Kvs99ZLJJ+3mcHDs
-wWWC9NYme6HEzs+mXRXD2wxOWUYNKc2xAs3QPOpYmX2g6sZiDPkyQ4KOZT/Vh9BZ
-970k7vtJ0lIOUFSDTQnlfGOtdEBE6QehIzHF6SpFakYYFyAK1MO4G/vdYYoe4lF5
-FTUg9UjnEWqwcmCX02ay5ma5YMkNkyXeetU6HmLRBnpwPcuCgIkzuXP64h+6nVWp
-bLEJHeHIom+fbTMoCnUDbZ0FcmiGxk9Cg6RPORcGztgLcVw=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.brown.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.brown.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.brown.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.brown.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.brown.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">brown.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUHPSdb4ae0QA3fyeEIe7wKXi2oT0wDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNc3NvLmJyb3duLmVkdTAeFw0xMDA1MjEyMTAyMzFaFw0z
-MDA1MjEyMTAyMzFaMBgxFjAUBgNVBAMTDXNzby5icm93bi5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxabgPhLgyIOyoG87T41EXwUOyXKNJ4XvF
-a5moC3y8J9JzWBeVRQ8L7zxEiLcsZ4qHYdOCVZNSD5SYeI8rtjwz/lHlJsF7dfLX
-peQSm5HggcgWEEbvgp+qHRsbu6ZLKUmD0qLnWLZ5pG+ihm0n10G6h9op9NKJqJOg
-kyk3PQbe1biAjjpnkVL5CxL4h1E0XADZogZBh3pY04kNzbMvaWsB9ToDI8i6JqTf
-yEZZcQr4ShgIdstAHzbHcGoRqSOuI3BDeYDj0lp7/X/v/lvQMWWnKFJD6E7xKypo
-VO2czCswZ9i390YkI9+eoBbIMunuE/JjPZwwknnWqaI5LBDkGbnJAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDXNzby5icm93bi5lZHWGJGh0dHBzOi8vc3NvLmJyb3duLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1EgYrxblcWF0RP8BxGEPTM4SkIow
-DQYJKoZIhvcNAQEFBQADggEBAG1o9TLKHLDMlW+fRtyWXeGI1Dpnvw505nmWOQEP
-zXnT3oMRsmFYUrynl6amaay0IlEZ86g8KALM0AsKA9x2hYz/Kvs99ZLJJ+3mcHDs
-wWWC9NYme6HEzs+mXRXD2wxOWUYNKc2xAs3QPOpYmX2g6sZiDPkyQ4KOZT/Vh9BZ
-970k7vtJ0lIOUFSDTQnlfGOtdEBE6QehIzHF6SpFakYYFyAK1MO4G/vdYYoe4lF5
-FTUg9UjnEWqwcmCX02ay5ma5YMkNkyXeetU6HmLRBnpwPcuCgIkzuXP64h+6nVWp
-bLEJHeHIom+fbTMoCnUDbZ0FcmiGxk9Cg6RPORcGztgLcVw=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.brown.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Brown University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Brown University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.brown.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brown University Shibboleth Administrator</md:GivenName>
-    <md:EmailAddress>CIS-EAS-IdMgmt@brown.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Brown University Identity Management</md:GivenName>
-    <md:EmailAddress>CIS-EAS-IdMgmt@brown.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Brown University Help Desk</md:GivenName>
-    <md:EmailAddress>cis-helpdesk@brown.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.bsfc.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.bsfc.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index af8be18b..00000000
--- a/swamid-interfederations-2.0/sso.bsfc.ac.uk-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://sso.bsfc.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Birkenhead Sixth Form College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-04T14:25:14Z">
-      <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">bsfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAJQNNxLqLyuVe5PctJiOH67/djG+MA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEnNoaWJpZHAuYnNmYy5hYy51azAeFw0xNDA0MTgxMzEx
-						MDNaFw0zNDA0MTgxMzExMDNaMB0xGzAZBgNVBAMTEnNoaWJpZHAuYnNmYy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsaf63mJRi9DTIIEOZX
-						oTUhdrTefTq6ZgKMyPtehzYJpItEgN/CV/1l6iUZe2U5R8D5RtGXMhzqaFz/ZadW
-						tw+RB3W0s60YchtuSqDDC3QTK+TWZLDIHDlldik9zwts3819cU/sBdqwOzKu6WTb
-						vwzvRrCwiAt4wnOqXcF3EjncKWfNEySUsmRZlEQPvvbx9U3sPh3tyWWGN3rB8fBu
-						KXE6LKNuwopaBDjOAqm0auIpVxgqedDSwhT80UpV0ncAL8/A6D2WYdUZ5kwXE4SU
-						818MMM7U4d54TVdqFjHow4GMuzIsQ4AqE2bFlBB2ABLUVmVMXOrxv0wFvZ3ULcwU
-						/20CAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmlkcC5ic2ZjLmFjLnVrhilodHRw
-						czovL3NoaWJpZHAuYnNmYy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						jLVWkxPeVPF+7dS8T+2Dc3vbEDMwDQYJKoZIhvcNAQEFBQADggEBAEcAtYMdqfwd
-						uhf/ERsHz2fss7ROO6JFndGq19NXLlERMDf9qG6UHz1RKtzs/kNSS9Pr2JcERKBB
-						4hJOTPQ1q8cU5//2RIGsWrO+7Wt/WS1kQlAu0Ez9ly9nC8KqeAkxnhaCSTx3csnr
-						uSDKZSBupejCt+bDvXF1A1tMigvDhKbP35ELwx64900xSSfK+To51AdhAkzec4z0
-						lfSqU/r6WiiM1a5KTAfVjU4JPrFYU0VjRWds6BpNBZIx8JRYHHFhR7hxmOweJcKH
-						gCQVhaBRE1QFYK4NBInDyUqmQqreNJNWJHv2Ek89P0pS3cU9QueuoLVNYABQGMIy
-						XbBdS/uPgFA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.bsfc.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.bsfc.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://shibidp.bsfc.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.bsfc.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.bsfc.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.bsfc.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">bsfc.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNDCCAhygAwIBAgIVAJQNNxLqLyuVe5PctJiOH67/djG+MA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEnNoaWJpZHAuYnNmYy5hYy51azAeFw0xNDA0MTgxMzEx
-						MDNaFw0zNDA0MTgxMzExMDNaMB0xGzAZBgNVBAMTEnNoaWJpZHAuYnNmYy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsaf63mJRi9DTIIEOZX
-						oTUhdrTefTq6ZgKMyPtehzYJpItEgN/CV/1l6iUZe2U5R8D5RtGXMhzqaFz/ZadW
-						tw+RB3W0s60YchtuSqDDC3QTK+TWZLDIHDlldik9zwts3819cU/sBdqwOzKu6WTb
-						vwzvRrCwiAt4wnOqXcF3EjncKWfNEySUsmRZlEQPvvbx9U3sPh3tyWWGN3rB8fBu
-						KXE6LKNuwopaBDjOAqm0auIpVxgqedDSwhT80UpV0ncAL8/A6D2WYdUZ5kwXE4SU
-						818MMM7U4d54TVdqFjHow4GMuzIsQ4AqE2bFlBB2ABLUVmVMXOrxv0wFvZ3ULcwU
-						/20CAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmlkcC5ic2ZjLmFjLnVrhilodHRw
-						czovL3NoaWJpZHAuYnNmYy5hYy51ay9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						jLVWkxPeVPF+7dS8T+2Dc3vbEDMwDQYJKoZIhvcNAQEFBQADggEBAEcAtYMdqfwd
-						uhf/ERsHz2fss7ROO6JFndGq19NXLlERMDf9qG6UHz1RKtzs/kNSS9Pr2JcERKBB
-						4hJOTPQ1q8cU5//2RIGsWrO+7Wt/WS1kQlAu0Ez9ly9nC8KqeAkxnhaCSTx3csnr
-						uSDKZSBupejCt+bDvXF1A1tMigvDhKbP35ELwx64900xSSfK+To51AdhAkzec4z0
-						lfSqU/r6WiiM1a5KTAfVjU4JPrFYU0VjRWds6BpNBZIx8JRYHHFhR7hxmOweJcKH
-						gCQVhaBRE1QFYK4NBInDyUqmQqreNJNWJHv2Ek89P0pS3cU9QueuoLVNYABQGMIy
-						XbBdS/uPgFA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.bsfc.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.bsfc.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">Birkenhead Sixth Form College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Birkenhead Sixth Form College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bsfc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John Paul</GivenName>
-    <SurName>Szkudlapski</SurName>
-    <EmailAddress>mailto:johns@bsfc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John Paul</GivenName>
-    <SurName>Szkudlapski</SurName>
-    <EmailAddress>mailto:johns@bsfc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.canterbury.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.canterbury.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 920f55c9..00000000
--- a/swamid-interfederations-2.0/sso.canterbury.ac.uk-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://sso.canterbury.ac.uk/idp/shibboleth">
-  <!--
-		This is a "Test" Shibboleth IdP for Canterbury Christ Church University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-30T14:23:11Z">
-      <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">canterbury.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Canterbury Christ Church University (test)</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">https://www.canterbury.ac.uk/SiteElements/images/cccu-logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://www.canterbury.ac.uk/SiteElements/images/cccu-logo-80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVANaQnCAp0hjyfB+AlIzHFLa2I9EvMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFHNzby5jYW50ZXJidXJ5LmFjLnVrMB4XDTEzMDcyNjE0
-						MzQ0M1oXDTE2MDcyNjE0MzQ0M1owHzEdMBsGA1UEAxMUc3NvLmNhbnRlcmJ1cnku
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCG4ddRgNHZrvt1
-						Ze2wElTfmo2+Y6Euo2vVDPt2Kmu4vwmPrr0BiafQA7NevLFPckE6sP4fjeZnoBR8
-						MSZpSzHiZpf//hEp0ZUFf37SBC+A04H64jnKvDxYSDihgNCpA3lAcLFYj8H/nFWS
-						RfhkKam8edfcETOqtivj3U/imXFYyFH7X5KPPSXTnVxgpX7fao+ik31OHqUl4NLn
-						yvLUMkASk442Cl7y67V6Yc38EXw+OHrAJ3FXpD+lgkLn9LMfspJxI0EQhYDRAO3Q
-						V5RIhGcxOtkOnO9+FW9gHrktVLT2MwN3tpxpPR0Al8om1O0V7MUkgI9gZ/otWG3v
-						SjJEK3khAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNzby5jYW50ZXJidXJ5LmFjLnVr
-						hitodHRwczovL3Nzby5jYW50ZXJidXJ5LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBRg/rITiyhdF1j8oOHSiproLSNiVjANBgkqhkiG9w0BAQUFAAOCAQEA
-						gEWjXuYQwxt0yzpzh4n8PYs22B8aH+jwo5lqiUPSAXQck809YBtpS7oYVclQPdTg
-						cZ0W0Zbh6+V6qqtvDWUnmZwKLdgPKcnC1wXxJxMPGrK2EjB/6CJAg6fn20e4bqX7
-						t70GW49LMiyQjQHApdt5Z0RNk3oBpZ3u/8/AyOHg3BWkXtFUis3zbgXs6bnNEgfT
-						IIi1oNlZMFDw/BwO4G3SwGbxZfqXaFDQEWL9th1ECitGs1G3jBVjwW/9rOb6ojuL
-						PYL0JTTUP85r329JLjGzXs6PXn82UejbdGBhC/qZMKdqZilqQuniwLfcO2nIsWn5
-						PmiYgLtxTZqsx6k7bEWZMw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.canterbury.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://sso.canterbury.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.canterbury.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.canterbury.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">canterbury.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIVANaQnCAp0hjyfB+AlIzHFLa2I9EvMA0GCSqGSIb3DQEB
-						BQUAMB8xHTAbBgNVBAMTFHNzby5jYW50ZXJidXJ5LmFjLnVrMB4XDTEzMDcyNjE0
-						MzQ0M1oXDTE2MDcyNjE0MzQ0M1owHzEdMBsGA1UEAxMUc3NvLmNhbnRlcmJ1cnku
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCG4ddRgNHZrvt1
-						Ze2wElTfmo2+Y6Euo2vVDPt2Kmu4vwmPrr0BiafQA7NevLFPckE6sP4fjeZnoBR8
-						MSZpSzHiZpf//hEp0ZUFf37SBC+A04H64jnKvDxYSDihgNCpA3lAcLFYj8H/nFWS
-						RfhkKam8edfcETOqtivj3U/imXFYyFH7X5KPPSXTnVxgpX7fao+ik31OHqUl4NLn
-						yvLUMkASk442Cl7y67V6Yc38EXw+OHrAJ3FXpD+lgkLn9LMfspJxI0EQhYDRAO3Q
-						V5RIhGcxOtkOnO9+FW9gHrktVLT2MwN3tpxpPR0Al8om1O0V7MUkgI9gZ/otWG3v
-						SjJEK3khAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHNzby5jYW50ZXJidXJ5LmFjLnVr
-						hitodHRwczovL3Nzby5jYW50ZXJidXJ5LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBRg/rITiyhdF1j8oOHSiproLSNiVjANBgkqhkiG9w0BAQUFAAOCAQEA
-						gEWjXuYQwxt0yzpzh4n8PYs22B8aH+jwo5lqiUPSAXQck809YBtpS7oYVclQPdTg
-						cZ0W0Zbh6+V6qqtvDWUnmZwKLdgPKcnC1wXxJxMPGrK2EjB/6CJAg6fn20e4bqX7
-						t70GW49LMiyQjQHApdt5Z0RNk3oBpZ3u/8/AyOHg3BWkXtFUis3zbgXs6bnNEgfT
-						IIi1oNlZMFDw/BwO4G3SwGbxZfqXaFDQEWL9th1ECitGs1G3jBVjwW/9rOb6ojuL
-						PYL0JTTUP85r329JLjGzXs6PXn82UejbdGBhC/qZMKdqZilqQuniwLfcO2nIsWn5
-						PmiYgLtxTZqsx6k7bEWZMw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.canterbury.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.canterbury.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">Canterbury Christ Church University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Canterbury Christ Church University (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.canterbury.ac.uk/support/computing-services/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service</GivenName>
-    <EmailAddress>mailto:it-service@canterbury.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Linux Admins</GivenName>
-    <EmailAddress>mailto:linux.admins@canterbury.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.cc.lehigh.edu-sso-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.cc.lehigh.edu-sso-saml2-idp-metadata.php.xml
deleted file mode 100644
index 815920c5..00000000
--- a/swamid-interfederations-2.0/sso.cc.lehigh.edu-sso-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,80 +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://sso.cc.lehigh.edu/sso/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://sso.cc.lehigh.edu/error" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lehigh.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lehigh University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Lehigh University IDP (SimpleSAMLPHP)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.lehigh.edu/helpdesk/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.lehigh.edu/security/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="80" width="201" xml:lang="en">https://sso.cc.lehigh.edu/sso/resources/lehightheme/logo.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>
-MIIDeDCCAmACCQD2MdQMsOjE8DANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJV
-UzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRIwEAYDVQQHEwlCZXRobGVoZW0xGjAY
-BgNVBAoTEUxlaGlnaCBVbml2ZXJzaXR5MQwwCgYDVQQLEwNMVFMxGjAYBgNVBAMT
-EXNzby5jYy5sZWhpZ2guZWR1MB4XDTExMDYyMTE5MjQzOFoXDTM3MTIyMTE5MjQz
-OFowfjELMAkGA1UEBhMCVVMxFTATBgNVBAgTDFBlbm5zeWx2YW5pYTESMBAGA1UE
-BxMJQmV0aGxlaGVtMRowGAYDVQQKExFMZWhpZ2ggVW5pdmVyc2l0eTEMMAoGA1UE
-CxMDTFRTMRowGAYDVQQDExFzc28uY2MubGVoaWdoLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAL0XqyuXiJif8dgfjaz6nvH0BytvAie/+8aObW5Z
-82GtDzTYsnUjsq0hJoW28nZuMhQguMM0PJcWej5GoEhp8Hq7Ml03jWqxmqBBrvgQ
-5Dv7jHp9K1oHCOkMbSzSpy69dLL36VcRDX5Ncf6qo+VGmoZ5fee8ScoVVxQra7C8
-WcPbzc+Oav63rfShZcjGOk6vasR6kflpCM+BT3vmNLzcava8eMcGa+zX6d8eSAkn
-LFvVyQG2vGLQpWwMzhgCnV0bO5A13Aq2cJSfKdxwL+KNkmS44CDA4yfeXHk79O9m
-LoKfX1DRkvoKJwcYuDUrQWe5nB3qkDjLaKo/SXI957SIlgkCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEAYZPOLM0E/AC1hNyJvB2xsMYN2WM6jgJ52upFMz41zqv//mXT
-o4JHhUfEezvsGS7z7nDh4ggYZtmePGlN0S1oYuJqPNESb5pkr0Vu8DF3BQRZw7Id
-/73uJ646aKCSsXqjUEso06Br0AuV+eB0hIVj3DE5MY8dQU8FjfElrP6QUy9q8fTl
-79A25sYS/t/ngaT3xlEyIkeyUc61YqZnCDIdpRyWhkH2dwL0PEnRHW/Pg9Kjgw/W
-i3cZL+A/f9dWYzc1xjWd/zW4jOGu1KIFApYnL7DOIRaW1d13OhGk0Ij0TDsO+Qnd
-ipGX2RJcUt6+Q02eiIU9LdOsjOvivr+kUO/bvw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.cc.lehigh.edu/sso/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.cc.lehigh.edu/sso/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lehigh University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Lehigh University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lehigh.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dan Schwartz</md:GivenName>
-    <md:EmailAddress>das1@lehigh.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Keith Erekson</md:GivenName>
-    <md:EmailAddress>kbe2@lehigh.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Keith Hartranft</md:GivenName>
-    <md:EmailAddress>kkh288@lehigh.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Identity and Access Management Team</md:GivenName>
-    <md:EmailAddress>iniam@Lehigh.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Keith Hartranft</md:GivenName>
-    <md:EmailAddress>kkh288@lehigh.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.cedarville.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.cedarville.edu-idp-shibboleth.xml
deleted file mode 100644
index cba25baa..00000000
--- a/swamid-interfederations-2.0/sso.cedarville.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,98 +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://sso.cedarville.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">cedarville.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cedarville University</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>
-MIIDGjCCAgKgAwIBAgIUN47xMNeIGq+9fTb4aJR1KEWc7wswDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwMi5maXNjaGVyaWRlbnRpdHkuY29tMB4XDTExMTIx
-MjE2NTc0NFoXDTMxMTIxMjE2NTc0NFowIzEhMB8GA1UEAxMYaWRwMi5maXNjaGVy
-aWRlbnRpdHkuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm/SU
-7QC7q5ijdiZ1aq7/wwOYGWUkI5TvIGAZgOtVwteHfiwNjsQL1YcVtmxPj37Gts1z
-/+DbRaPGWaXxvMj0SzwsYiJEw/P5EKOC3ujhc10cs6RutdpNLno3CjbQazZrpDqk
-OPwGsGtc0r6Jn9MRsZDpfzaVS8E1wbBUQ1uU5PfUUvW+Q1pxDqzOSv8ZtqIgFQgS
-k1JpjqL45h5t+C5WnxidLjkB1L0fgVLi+DDjYYK+6sTlCd600Ixufr1Vb9Qj+90v
-//U5XkUNYwCAVASuVlXpWXfdfKyCuUyVa+3VZIWRKxye8abN/jJoE1uHmgbnVWul
-aPzrvNjbzVLo7nBo2QIDAQABo0YwRDAjBgNVHREEHDAaghhpZHAyLmZpc2NoZXJp
-ZGVudGl0eS5jb20wHQYDVR0OBBYEFN3LsRRIf64KoZtwrtGt1bfwnSX6MA0GCSqG
-SIb3DQEBBQUAA4IBAQAVSzbN7EtwyvMka3hIX/5KGKbavF7FtIGN4p7jg2UMeH89
-pAzjxIGOnibFIr5QF9RV0qtG/3SaQMyH18OV73SkcLYOifjJKEnceGi44TdBkfIG
-/6LY3n5lMd3UvC0qbR59qZ0qIkd2kmfo/b9mfPjwy3+6ypN6J9DeSQFxffu+o7UI
-pi+52yms2KD8klrC+Ptq76kKetJifRalHNK0cEMzNae6s+sQYxGVhqOHijEgXvTB
-abocdzekYdo3N1BoA3TNcqWvBcVEt6m9iW/cDKMr8xlkpII8A8p9piPozcFmCDll
-ip/lOg2kOdU7AB80pFPqQLvDSArQpzItz88dbws6
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.cedarville.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.cedarville.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.cedarville.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.cedarville.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.cedarville.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.cedarville.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cedarville.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGjCCAgKgAwIBAgIUN47xMNeIGq+9fTb4aJR1KEWc7wswDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwMi5maXNjaGVyaWRlbnRpdHkuY29tMB4XDTExMTIx
-MjE2NTc0NFoXDTMxMTIxMjE2NTc0NFowIzEhMB8GA1UEAxMYaWRwMi5maXNjaGVy
-aWRlbnRpdHkuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm/SU
-7QC7q5ijdiZ1aq7/wwOYGWUkI5TvIGAZgOtVwteHfiwNjsQL1YcVtmxPj37Gts1z
-/+DbRaPGWaXxvMj0SzwsYiJEw/P5EKOC3ujhc10cs6RutdpNLno3CjbQazZrpDqk
-OPwGsGtc0r6Jn9MRsZDpfzaVS8E1wbBUQ1uU5PfUUvW+Q1pxDqzOSv8ZtqIgFQgS
-k1JpjqL45h5t+C5WnxidLjkB1L0fgVLi+DDjYYK+6sTlCd600Ixufr1Vb9Qj+90v
-//U5XkUNYwCAVASuVlXpWXfdfKyCuUyVa+3VZIWRKxye8abN/jJoE1uHmgbnVWul
-aPzrvNjbzVLo7nBo2QIDAQABo0YwRDAjBgNVHREEHDAaghhpZHAyLmZpc2NoZXJp
-ZGVudGl0eS5jb20wHQYDVR0OBBYEFN3LsRRIf64KoZtwrtGt1bfwnSX6MA0GCSqG
-SIb3DQEBBQUAA4IBAQAVSzbN7EtwyvMka3hIX/5KGKbavF7FtIGN4p7jg2UMeH89
-pAzjxIGOnibFIr5QF9RV0qtG/3SaQMyH18OV73SkcLYOifjJKEnceGi44TdBkfIG
-/6LY3n5lMd3UvC0qbR59qZ0qIkd2kmfo/b9mfPjwy3+6ypN6J9DeSQFxffu+o7UI
-pi+52yms2KD8klrC+Ptq76kKetJifRalHNK0cEMzNae6s+sQYxGVhqOHijEgXvTB
-abocdzekYdo3N1BoA3TNcqWvBcVEt6m9iW/cDKMr8xlkpII8A8p9piPozcFmCDll
-ip/lOg2kOdU7AB80pFPqQLvDSArQpzItz88dbws6
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.cedarville.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Cedarville University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Cedarville University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cedarville.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David Rotman</md:GivenName>
-    <md:EmailAddress>rotmand@cedarville.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Alan McCain</md:GivenName>
-    <md:EmailAddress>mccaina@cedarville.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Cedarville Help Desk</md:GivenName>
-    <md:EmailAddress>computerhelp@cedarville.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.connectis.nl-broker-sso-tpd-ukf.xml b/swamid-interfederations-2.0/sso.connectis.nl-broker-sso-tpd-ukf.xml
deleted file mode 100644
index a1bd6936..00000000
--- a/swamid-interfederations-2.0/sso.connectis.nl-broker-sso-tpd-ukf.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://sso.connectis.nl/broker/sso/tpd-ukf">
-  <!--
-		This is a "Connectis Production" FederateNow SP for Connected Information Systems B.V.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-02T15:26:51Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIG1jCCBL6gAwIBAgIQdhfb7fVnOGRYSmoe+FjYWzANBgkqhkiG9w0BAQsFADBd
-						MQswCQYDVQQGEwJOTDEsMCoGA1UECgwjRVNHIGRlIEVsZWN0cm9uaXNjaGUgU2ln
-						bmF0dXVyIEIuVi4xIDAeBgNVBAMMF0VTRyBPcmdhbmlzYXRpZSBDQSAtIEcyMB4X
-						DTE1MDEyMTAwMDAwMFoXDTE4MDEyMDIzNTk1OVowgYwxCzAJBgNVBAYTAk5MMRUw
-						EwYDVQQIDAxadWlkLUhvbGxhbmQxEjAQBgNVBAcMCVJvdHRlcmRhbTErMCkGA1UE
-						CgwiQ29ubmVjdGVkIEluZm9ybWF0aW9uIFN5c3RlbXMgQi5WLjEKMAgGA1UEBRMB
-						MTEZMBcGA1UEAwwQYzAxLmNvbm5lY3Rpcy5ubDCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAI9mGYL4aTRpDB8wSEcZF0NfuZljUpnyGpSTGBO3ANL3qYtb
-						LLMn9MdyX0xZuMQPPqr8x97PAR4DZqos+2vA0VArOqFo/c9Sw5sjZoV2NaMm3ODn
-						PWvqeRGU/I0E70Q1rgWHWHUYgbSxXX9qLQFRJoSFDRRheI0kTfmyw2zyaG8D2X5v
-						2kx/7dhbfbm4cUznwvdN1d5vasvgD0G7JrimzEAsm0GwKu7tWlaTRJDT8cX5VVYE
-						/6Rot4/vX/q8f0hfWq2ezHfZ4HX1AApBWlpVwKguqfWZaPKKNbOnicyW3kc6X9Rp
-						zkaZ2PJ6lpzyhYTQHw/DfhguK7I+wWaM1mIq/48CAwEAAaOCAmAwggJcMAwGA1Ud
-						EwEB/wQCMAAwUQYDVR0fBEowSDBGoESgQoZAaHR0cDovL2NybC5kZS1lbGVjdHJv
-						bmlzY2hlLXNpZ25hdHV1ci5ubC9lc2cvb3JnYW5pc2F0aWVjYWcyLmNybDAOBgNV
-						HQ8BAf8EBAMCA6gwHQYDVR0OBBYEFJkzmNtwPqxkFwc8PcccMe6klqc8MB8GA1Ud
-						IwQYMBaAFLosdwsI9w10HS/cXYCjl0HsqCeoMIHwBgNVHSAEgegwgeUwgeIGCmCE
-						EAGHawECBQYwgdMwNAYIKwYBBQUHAgEWKGh0dHA6Ly9jcHMuZGUtZWxlY3Ryb25p
-						c2NoZS1zaWduYXR1dXIubmwwgZoGCCsGAQUFBwICMIGNGoGKVGhlIHRlcm1zIGFu
-						ZCBjb25kaXRpb25zIGFzIG1lbnRpb25lZCBvbiBvdXIgd2Vic2l0ZSAoY3BzLmRl
-						LWVsZWN0cm9uaXNjaGUtc2lnbmF0dXVyLm5sKSwgYXJlIGFwcGxpY2FibGUgdG8g
-						YWxsIG91ciBwcm9kdWN0cyBhbmQgc2VydmljZXMuMFAGA1UdEQRJMEeCEGMwMS5j
-						b25uZWN0aXMubmygMwYKKwYBBAGCNxQCA6AlDCMyLjE2LjUyOC4xLjEwMDMuMS4z
-						LjUuMy4xLTEwMTk5OTExMTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-						RQYIKwYBBQUHAQEEOTA3MDUGCCsGAQUFBzABhilodHRwOi8vb2NzcC5kZS1lbGVj
-						dHJvbmlzY2hlLXNpZ25hdHV1ci5ubDANBgkqhkiG9w0BAQsFAAOCAgEAe7fGepJe
-						P7E4r2e+iNdvX66nTlkymXsbh+VhpWIRjLtHkatBJ7yJR2LTbdDGHh4R3JddS5fG
-						8C2q/nhkxhS2uuBHGGs9+PtnvPIpXR6OT7tAgJxokN8ECBflvzTBiMRDWSc/wmCd
-						6wZmPF2YFrqDq0dRb6HsQU1ikGJjsLUckH65rupe9VgrjGcII38EGpibLCPYQHhb
-						iNypnPG3mljjQ8fQVlYA7qNizw4YEQMA70vwYYXsnduoht9hGONr14O03RccDCPL
-						CWDIIXNjdsmXL7qAlNC3crXTy2v3YTM/DKW/WTmsTQQP5zSwHVJP1a83r6iiZVnU
-						EhrDfyr3c0MI73zoxfXbf26S7sTocgjd1CsVZ7nxjzzS1lWEoFg1Txyrj7wgaHUW
-						Bc3YoYMqtVr9M57EL8BFW4KjkTUT/RZXrxkSGJPozsZpZF//d2K5G23V5JIbfLlM
-						Ub1sW9w7D1eiYMhcFtWDM9EW0IlYmFGefD4SuNyo+t/AX+Uq3gmrlDnCXVSWtPo6
-						vZqvS89IV3lE9MQ2wt/hi9EkRZFrMwrh42AOKdawNb7yUwRcO/gdgGp/odP2iU2f
-						y3kGImkhUw9/Eyd/EW+y9rNYEbMkbVKptCzmjgSeU3GZSRM0Oyp6JQm62ZE+1miJ
-						NZ8XT1wfFpjxxmjQqfeCijYxXabTYI//XoM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.connectis.nl/broker/acs/tpd-ukf" index="1" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Connected Information Systems B.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Connectis Production</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.connectis.nl</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:technicalsupport@connectis.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:technicalsupport@connectis.nl</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.csumb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.csumb.edu-idp-shibboleth.xml
deleted file mode 100644
index 77121bf2..00000000
--- a/swamid-interfederations-2.0/sso.csumb.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,167 +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://sso.csumb.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">csumb.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Monterey Bay</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>
-MIIFizCCBHOgAwIBAgICApswDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MTAwOTE3MDgzMloXDTExMTAx
-MDE3MDgzMlowGDEWMBQGA1UEAxMNc3NvLmNzdW1iLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALN8+nYi1O6eOdWM45pGEgSG/K94eRIYWJybavJx
-42YE6ekJGSPPmU92L+M5E+ESFUu+oXy0YWfEvOuI5PSoRvfBjeS6jMofcnHRnzvv
-+vfoEQdIKjkDiTp/tB/9ggX9V6MWxpP+hXB7wgqv7V+0R4FMs6lcHONqRdNrfdE0
-K6teorVEiWiJq8CJuUHzGq6Jxt1YArVrFn8CcZsPgy0B218Q0xDj5mp9wwQAi6ax
-6FaPPuKUgbPOYv8VzovwLaCZxFo9su0oOSW+GxQnCqeMgkOZCLQTCaNY7wdeNXp+
-2gn7mvC67O4uWf6ZJRIUobzLU7lo18Dm8X6MqPLUiR4SgqUCAwEAAaOCAp8wggKb
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUC6KlCB98bz+RaJydZyq3ZqyNXKswfgYD
-VR0jBHcwdYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVT
-MRwwGgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1v
-biBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIBADCBsgYIKwYBBQUHAQEEgaUwgaIw
-TwYIKwYBBQUHMAKGQ2h0dHA6Ly9pbmNvbW1vbmNhMS5pbmNvbW1vbmZlZGVyYXRp
-b24ub3JnL2JyaWRnZS9jZXJ0cy9jYS1jZXJ0cy5wN2IwTwYIKwYBBQUHMAKGQ2h0
-dHA6Ly9pbmNvbW1vbmNhMi5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2JyaWRnZS9j
-ZXJ0cy9jYS1jZXJ0cy5wN2IwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDovL2lu
-Y29tbW9uY3JsMS5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2NybC9lZWNybHMuY3Js
-MD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwyLmluY29tbW9uZmVkZXJhdGlvbi5v
-cmcvY3JsL2VlY3Jscy5jcmwwXgYDVR0gBFcwVTBTBgsrBgEEAa4jAQQBATBEMEIG
-CCsGAQUFBwIBFjZodHRwOi8vaW5jb21tb25jYS5pbmNvbW1vbmZlZGVyYXRpb24u
-b3JnL3ByYWN0aWNlcy5wZGYwGAYDVR0RBBEwD4INc3NvLmNzdW1iLmVkdTANBgkq
-hkiG9w0BAQUFAAOCAQEADINiuOQSVU3QnFlJEDsUNFZQf7LEhoj1S2NDNwALQ8Q6
-rKG/CDg1V5ves3tX8xwsM8FhW+KPJR1wKd6QnxsQvt+BEGxSV1jsOhpQjKa0oDmQ
-9Sn+YdfJn9f3iTn17B6tgZI5ngOY6HkZnhGtYrQ0KJ24hNBMQs7CqTYbA1eDxXaS
-Vlrb/LPwut26OfziQnj+97HTDz4ex2pTkzOuskC7csDQDX4elWGMjYJIDN2dswZI
-NZkp1RZ6ac9X9y7eu9yI5eZGL8Oc9o5btU0A02TwZAheryrarsITh4FLKtVgivk2
-hrxoBGH+jmibPK4kGAdYItS9gF2QBBH+wRoIBWdBkw==
-          </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>
-MIIDLDCCAhSgAwIBAgIJAJ4bXqO6GpvPMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXNzby5jc3VtYi5lZHUwHhcNMTExMDExMDQxNjU0WhcNMjExMDA4MDQxNjU0
-WjAYMRYwFAYDVQQDEw1zc28uY3N1bWIuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4VCVPa0t+KdnmRFqxSQ28hG5MojLWZm0VfIvqaQJJsmZg8cP
-TqHDl6DlsvwnMjJ7lpFXjl6F1uwvSXqAZjvc4sbgHTJiq6NM+TR1trZ2tTbV3z4n
-wYl86IdN3enfTN7ohFlWIi1S4a/iGmTxmJtH7KPHr7YETvAaGnuwgJuS780JkgGW
-Rmgzm+EWUM/YJ89M8ixOusOiHBoEONx+g/KWxTOXi/qofwkYHRial0xFj8XChBk5
-04vqtNe+17cpz2D4C8z+lvsTWIlujq78cxb6uh7OwJ7M3bi+LGSy79ofxWGv4PLS
-KsBI76kWz14ksJpAGdXs2gx5oJS8UzsKCihxLQIDAQABo3kwdzAdBgNVHQ4EFgQU
-+mAL7jpG/y3m4hlqRGHUsdfjd4AwSAYDVR0jBEEwP4AU+mAL7jpG/y3m4hlqRGHU
-sdfjd4ChHKQaMBgxFjAUBgNVBAMTDXNzby5jc3VtYi5lZHWCCQCeG16juhqbzzAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCjbZuyuGfmpIrh4tQSecZi
-412e0rpPgUtI0YlAEnHSzM6IcYlC5GMkjS9DYcMCnd1brPzi63HejHlzgoPCBojI
-FJWGcbxy5IourV7O4zJLW9yLZljC5AQ5Dy4JAwa1Ng3rQYmYB9EQYd3Y3JVsHcyQ
-Xf4/+88QgvVLCNwBmDJh/dl+9LgXkYolLyGHHXBkKJpquiCPAKCVu4NXsv4tVxI3
-dMdSS+qrcdWD3HIH2wdkI+i916HBLA9q06HsbrlhSPjphFgYJkjpw0ngKSPmXU39
-q8P6Y9qHgb8m5DEKVxakf/26wy2LraW0P1mxgsZnr5KdMfoK3GWboss9POvErkkp
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.csumb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.csumb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.csumb.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.csumb.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.csumb.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.csumb.edu/idp/profile/SAML2/POST/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">csumb.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFizCCBHOgAwIBAgICApswDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MTAwOTE3MDgzMloXDTExMTAx
-MDE3MDgzMlowGDEWMBQGA1UEAxMNc3NvLmNzdW1iLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALN8+nYi1O6eOdWM45pGEgSG/K94eRIYWJybavJx
-42YE6ekJGSPPmU92L+M5E+ESFUu+oXy0YWfEvOuI5PSoRvfBjeS6jMofcnHRnzvv
-+vfoEQdIKjkDiTp/tB/9ggX9V6MWxpP+hXB7wgqv7V+0R4FMs6lcHONqRdNrfdE0
-K6teorVEiWiJq8CJuUHzGq6Jxt1YArVrFn8CcZsPgy0B218Q0xDj5mp9wwQAi6ax
-6FaPPuKUgbPOYv8VzovwLaCZxFo9su0oOSW+GxQnCqeMgkOZCLQTCaNY7wdeNXp+
-2gn7mvC67O4uWf6ZJRIUobzLU7lo18Dm8X6MqPLUiR4SgqUCAwEAAaOCAp8wggKb
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUC6KlCB98bz+RaJydZyq3ZqyNXKswfgYD
-VR0jBHcwdYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYTAlVT
-MRwwGgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNvbW1v
-biBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIBADCBsgYIKwYBBQUHAQEEgaUwgaIw
-TwYIKwYBBQUHMAKGQ2h0dHA6Ly9pbmNvbW1vbmNhMS5pbmNvbW1vbmZlZGVyYXRp
-b24ub3JnL2JyaWRnZS9jZXJ0cy9jYS1jZXJ0cy5wN2IwTwYIKwYBBQUHMAKGQ2h0
-dHA6Ly9pbmNvbW1vbmNhMi5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2JyaWRnZS9j
-ZXJ0cy9jYS1jZXJ0cy5wN2IwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDovL2lu
-Y29tbW9uY3JsMS5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2NybC9lZWNybHMuY3Js
-MD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwyLmluY29tbW9uZmVkZXJhdGlvbi5v
-cmcvY3JsL2VlY3Jscy5jcmwwXgYDVR0gBFcwVTBTBgsrBgEEAa4jAQQBATBEMEIG
-CCsGAQUFBwIBFjZodHRwOi8vaW5jb21tb25jYS5pbmNvbW1vbmZlZGVyYXRpb24u
-b3JnL3ByYWN0aWNlcy5wZGYwGAYDVR0RBBEwD4INc3NvLmNzdW1iLmVkdTANBgkq
-hkiG9w0BAQUFAAOCAQEADINiuOQSVU3QnFlJEDsUNFZQf7LEhoj1S2NDNwALQ8Q6
-rKG/CDg1V5ves3tX8xwsM8FhW+KPJR1wKd6QnxsQvt+BEGxSV1jsOhpQjKa0oDmQ
-9Sn+YdfJn9f3iTn17B6tgZI5ngOY6HkZnhGtYrQ0KJ24hNBMQs7CqTYbA1eDxXaS
-Vlrb/LPwut26OfziQnj+97HTDz4ex2pTkzOuskC7csDQDX4elWGMjYJIDN2dswZI
-NZkp1RZ6ac9X9y7eu9yI5eZGL8Oc9o5btU0A02TwZAheryrarsITh4FLKtVgivk2
-hrxoBGH+jmibPK4kGAdYItS9gF2QBBH+wRoIBWdBkw==
-          </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>
-MIIDLDCCAhSgAwIBAgIJAJ4bXqO6GpvPMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXNzby5jc3VtYi5lZHUwHhcNMTExMDExMDQxNjU0WhcNMjExMDA4MDQxNjU0
-WjAYMRYwFAYDVQQDEw1zc28uY3N1bWIuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4VCVPa0t+KdnmRFqxSQ28hG5MojLWZm0VfIvqaQJJsmZg8cP
-TqHDl6DlsvwnMjJ7lpFXjl6F1uwvSXqAZjvc4sbgHTJiq6NM+TR1trZ2tTbV3z4n
-wYl86IdN3enfTN7ohFlWIi1S4a/iGmTxmJtH7KPHr7YETvAaGnuwgJuS780JkgGW
-Rmgzm+EWUM/YJ89M8ixOusOiHBoEONx+g/KWxTOXi/qofwkYHRial0xFj8XChBk5
-04vqtNe+17cpz2D4C8z+lvsTWIlujq78cxb6uh7OwJ7M3bi+LGSy79ofxWGv4PLS
-KsBI76kWz14ksJpAGdXs2gx5oJS8UzsKCihxLQIDAQABo3kwdzAdBgNVHQ4EFgQU
-+mAL7jpG/y3m4hlqRGHUsdfjd4AwSAYDVR0jBEEwP4AU+mAL7jpG/y3m4hlqRGHU
-sdfjd4ChHKQaMBgxFjAUBgNVBAMTDXNzby5jc3VtYi5lZHWCCQCeG16juhqbzzAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCjbZuyuGfmpIrh4tQSecZi
-412e0rpPgUtI0YlAEnHSzM6IcYlC5GMkjS9DYcMCnd1brPzi63HejHlzgoPCBojI
-FJWGcbxy5IourV7O4zJLW9yLZljC5AQ5Dy4JAwa1Ng3rQYmYB9EQYd3Y3JVsHcyQ
-Xf4/+88QgvVLCNwBmDJh/dl+9LgXkYolLyGHHXBkKJpquiCPAKCVu4NXsv4tVxI3
-dMdSS+qrcdWD3HIH2wdkI+i916HBLA9q06HsbrlhSPjphFgYJkjpw0ngKSPmXU39
-q8P6Y9qHgb8m5DEKVxakf/26wy2LraW0P1mxgsZnr5KdMfoK3GWboss9POvErkkp
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.csumb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.csumb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Monterey Bay</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Monterey Bay</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://csumb.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Isaac Davis-King</md:GivenName>
-    <md:EmailAddress>idavis-king@csumb.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.davidson.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/sso.davidson.edu-adfs-services-trust.xml
deleted file mode 100644
index 1ffc3849..00000000
--- a/swamid-interfederations-2.0/sso.davidson.edu-adfs-services-trust.xml
+++ /dev/null
@@ -1,81 +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://sso.davidson.edu/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">davidson.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Davidson College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Davidson College, Davidson, NC</mdui:Description>
-        <mdui:Logo height="48" width="198" xml:lang="en">https://webapps.davidson.edu/common/davidson.gif</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>
-MIIGvzCCBaegAwIBAgIQCxJ8Hgj1QRe56BsgKy6pNjANBgkqhkiG9w0BAQUFADBm
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBDQS0zMB4XDTEzMDEyOTAwMDAwMFoXDTE2MDQyNzEyMDAwMFowezELMAkGA1UE
-BhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMREwDwYDVQQHEwhEYXZpZHNv
-bjEZMBcGA1UEChMQRGF2aWRzb24gQ29sbGVnZTEMMAoGA1UECxMDSVRTMRcwFQYD
-VQQDDA4qLmRhdmlkc29uLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMSBcVk4oN9HgPpw36UsjtzGqrjzjKWYQECBgl7SqMzPuVHGy2S1aV8LX3JI
-xHUe/wUjQ15GdNqfnKf1kHP6QvQwcLs/A8mpdYE1fghBGtNE5rJ9dO2I+pWrVK5A
-BB3cu5Ol4U9UvU92HctfKVHIHWiFZDn53gSRNylARmS8zGtdC6Fb7cvDPgc2KxOf
-IE7O57EuRdtI0p3Q+AMkdq4DkJzw43D07dWkqxSjdOGrxfPKeTbzwM0ORA2up3NF
-8GWJjP45t1wn3ErMQlXE460Ij24kD0jsUayK6PSMC1c503GuMAg3aGISTqYkILO+
-sigrrRCWEkOJovRzPC2/XelZ6R0CAwEAAaOCA1IwggNOMB8GA1UdIwQYMBaAFFDq
-c4nbKfsQj57lASDU3nmZSIP3MB0GA1UdDgQWBBR3VIxgQOD+RkuS45HuAcTmJrNl
-ejAnBgNVHREEIDAegg4qLmRhdmlkc29uLmVkdYIMZGF2aWRzb24uZWR1MA4GA1Ud
-DwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwYQYDVR0f
-BFowWDAqoCigJoYkaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL2NhMy1nMTguY3Js
-MCqgKKAmhiRodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vY2EzLWcxOC5jcmwwggHE
-BgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwBATCCAaQwOgYIKwYBBQUHAgEWLmh0
-dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFk
-BggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBz
-ACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBz
-ACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBD
-AGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBp
-AG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBo
-ACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBl
-ACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAg
-AHIAZQBmAGUAcgBlAG4AYwBlAC4wewYIKwYBBQUHAQEEbzBtMCQGCCsGAQUFBzAB
-hhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRQYIKwYBBQUHMAKGOWh0dHA6Ly9j
-YWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VDQS0zLmNy
-dDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUAA4IBAQBdAQyvXc66EmtdsqFb
-VSAUvoo+7/9TeYIMwPBH0uJdgotA8C6T/2KsQsYbU1q2YSAK0VhyQI4/53B2rVyt
-vZEfTRKIogMyBq0xIEn+g/IoA0tqeNC3V+nwkX19TuvXRlzxd/SnQeR3eHaE5ZFv
-EpiXEpKiC8naIZM12azrC1siGOTkgHaeflj/TP2PukFR/xVZYf2lFNuvLiBZfTm0
-J5/m8Euy3gV5/R7kfOyyEG68CRtZ3aT5VNSJvut15tgPfPwhwQFn61nJKUPuLvi2
-UNlna4731ptCSMJZz+fRO1YqlFc1vDz/YB1JShurYQA6MxgISx6Jxk0PtCD+6vb0
-dAKx
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.davidson.edu/adfs/ls"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.davidson.edu/adfs/ls"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Davidson College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Davidson College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www3.davidson.edu/cms/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Robbins</md:GivenName>
-    <md:EmailAddress>jorobbins@davidson.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Rob Smith</md:GivenName>
-    <md:EmailAddress>rosmith@davidson.edu</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 6de7f9ac..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.dshs-koeln.de/idp/shibboleth">
-  <md: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>
-  </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">dshs-koeln.de</shibmd: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.de: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://sso.dshs-koeln.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-koeln.de/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">dshs-koeln.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.de: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">e421</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e421</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Deutsche Sporthochschule Köln</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">German Sport University Cologne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.dshs-koeln.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.dshs-koeln.de/english/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:SurName>DSHS</md:SurName>
-    <md:EmailAddress>mailto:support@dshs-koeln.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Silke</md:GivenName>
-    <md:SurName>Knorr</md:SurName>
-    <md:EmailAddress>mailto:s.knorr@dshs-koeln.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.ecu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.ecu.edu-idp-shibboleth.xml
deleted file mode 100644
index 7e586c9a..00000000
--- a/swamid-interfederations-2.0/sso.ecu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,113 +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://sso.ecu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">ecu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">East Carolina University</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>
-MIIErTCCA5WgAwIBAgIJANboXNbCxTghMA0GCSqGSIb3DQEBBQUAMIGVMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCTkMxEzARBgNVBAcTCkdyZWVudmlsbGUxITAfBgNV
-BAoTGEVhc3QgQ2Fyb2xpbmEgVW5pdmVyc2l0eTENMAsGA1UECxMESVRDUzEUMBIG
-A1UEAxMLc3NvLmVjdS5lZHUxHDAaBgkqhkiG9w0BCQEWDWVhd2ViQGVjdS5lZHUw
-HhcNMTIwOTI3MTQzOTA1WhcNMjIwOTI3MTQzOTA1WjCBlTELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAk5DMRMwEQYDVQQHEwpHcmVlbnZpbGxlMSEwHwYDVQQKExhFYXN0
-IENhcm9saW5hIFVuaXZlcnNpdHkxDTALBgNVBAsTBElUQ1MxFDASBgNVBAMTC3Nz
-by5lY3UuZWR1MRwwGgYJKoZIhvcNAQkBFg1lYXdlYkBlY3UuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv+x70xRWz+zCHVAjgx3XfKXE4JYhAm2/
-excFuPVu1kOdTvicMAaCrHCQVggHtGXJB7vjI2u/bghgyOQN+LpwjCVzDPQYNKQZ
-N8hoyHyeITHUgw3pLAJNWF6Gnh+P8EX/+6KNL67Z4XJMJvBMH6i8KfSMmBD+5xbs
-h4QpiOJiw72K2HLDjzrCfFxhNeHw4szgh72fp946nrOUR/bUFNc2bMpX1flPxz2K
-PLRsyQ0chvTEvEPUL0g/zIDOHbJCV6/lmvFBifc/+UADAM3chMdWeT+MWHSYux6S
-fOxjwAgTv7cGZ+m7W5vLwIoFMkPX6QeiAhJV4M+fxUUZWS+3J04OZQIDAQABo4H9
-MIH6MB0GA1UdDgQWBBT0UGI7/A3rZ/6dqIqYxGleNUN0xTCBygYDVR0jBIHCMIG/
-gBT0UGI7/A3rZ/6dqIqYxGleNUN0xaGBm6SBmDCBlTELMAkGA1UEBhMCVVMxCzAJ
-BgNVBAgTAk5DMRMwEQYDVQQHEwpHcmVlbnZpbGxlMSEwHwYDVQQKExhFYXN0IENh
-cm9saW5hIFVuaXZlcnNpdHkxDTALBgNVBAsTBElUQ1MxFDASBgNVBAMTC3Nzby5l
-Y3UuZWR1MRwwGgYJKoZIhvcNAQkBFg1lYXdlYkBlY3UuZWR1ggkA1uhc1sLFOCEw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAmjFndW2FbbDdxYzfnNSS
-blQeP9DqUyzRnxoo4Gd028i15/Kqn6O4alKUYgZh4/zd9tjHFWDU7g+LkWvFzJ1a
-QSxYQ1/jWgt11QqcmkkppdRd9IjifgzXLu1iNnGRyiX2Re/0azzZQtl0IUGDcdiV
-3FvOU8cB8rL9veYKMrFQhyAHIIDJkaWd/KPl/16xIdN+lOwQGuVlyCzAXphePzyW
-em4BewflobGSobRwz7r5XgIJhxMo3wc01f3akeQJ4O3ZzgIoM+UiBe5DzaUmMQoJ
-X5KQp7NLGaQVmUQOPlUe2xNvmR+lvpkaXZp2S086gS1eWhaiP5h0nASKKd3/rQT1
-kQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.ecu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.ecu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ecu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ecu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.ecu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.ecu.edu/idp/profile/Shibboleth/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">ecu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIErTCCA5WgAwIBAgIJANboXNbCxTghMA0GCSqGSIb3DQEBBQUAMIGVMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCTkMxEzARBgNVBAcTCkdyZWVudmlsbGUxITAfBgNV
-BAoTGEVhc3QgQ2Fyb2xpbmEgVW5pdmVyc2l0eTENMAsGA1UECxMESVRDUzEUMBIG
-A1UEAxMLc3NvLmVjdS5lZHUxHDAaBgkqhkiG9w0BCQEWDWVhd2ViQGVjdS5lZHUw
-HhcNMTIwOTI3MTQzOTA1WhcNMjIwOTI3MTQzOTA1WjCBlTELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAk5DMRMwEQYDVQQHEwpHcmVlbnZpbGxlMSEwHwYDVQQKExhFYXN0
-IENhcm9saW5hIFVuaXZlcnNpdHkxDTALBgNVBAsTBElUQ1MxFDASBgNVBAMTC3Nz
-by5lY3UuZWR1MRwwGgYJKoZIhvcNAQkBFg1lYXdlYkBlY3UuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv+x70xRWz+zCHVAjgx3XfKXE4JYhAm2/
-excFuPVu1kOdTvicMAaCrHCQVggHtGXJB7vjI2u/bghgyOQN+LpwjCVzDPQYNKQZ
-N8hoyHyeITHUgw3pLAJNWF6Gnh+P8EX/+6KNL67Z4XJMJvBMH6i8KfSMmBD+5xbs
-h4QpiOJiw72K2HLDjzrCfFxhNeHw4szgh72fp946nrOUR/bUFNc2bMpX1flPxz2K
-PLRsyQ0chvTEvEPUL0g/zIDOHbJCV6/lmvFBifc/+UADAM3chMdWeT+MWHSYux6S
-fOxjwAgTv7cGZ+m7W5vLwIoFMkPX6QeiAhJV4M+fxUUZWS+3J04OZQIDAQABo4H9
-MIH6MB0GA1UdDgQWBBT0UGI7/A3rZ/6dqIqYxGleNUN0xTCBygYDVR0jBIHCMIG/
-gBT0UGI7/A3rZ/6dqIqYxGleNUN0xaGBm6SBmDCBlTELMAkGA1UEBhMCVVMxCzAJ
-BgNVBAgTAk5DMRMwEQYDVQQHEwpHcmVlbnZpbGxlMSEwHwYDVQQKExhFYXN0IENh
-cm9saW5hIFVuaXZlcnNpdHkxDTALBgNVBAsTBElUQ1MxFDASBgNVBAMTC3Nzby5l
-Y3UuZWR1MRwwGgYJKoZIhvcNAQkBFg1lYXdlYkBlY3UuZWR1ggkA1uhc1sLFOCEw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAmjFndW2FbbDdxYzfnNSS
-blQeP9DqUyzRnxoo4Gd028i15/Kqn6O4alKUYgZh4/zd9tjHFWDU7g+LkWvFzJ1a
-QSxYQ1/jWgt11QqcmkkppdRd9IjifgzXLu1iNnGRyiX2Re/0azzZQtl0IUGDcdiV
-3FvOU8cB8rL9veYKMrFQhyAHIIDJkaWd/KPl/16xIdN+lOwQGuVlyCzAXphePzyW
-em4BewflobGSobRwz7r5XgIJhxMo3wc01f3akeQJ4O3ZzgIoM+UiBe5DzaUmMQoJ
-X5KQp7NLGaQVmUQOPlUe2xNvmR+lvpkaXZp2S086gS1eWhaiP5h0nASKKd3/rQT1
-kQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.ecu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.ecu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">East Carolina University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">East Carolina University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ecu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jeremiah Stuever</md:GivenName>
-    <md:EmailAddress>stueverj@ecu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kris Augustus</md:GivenName>
-    <md:EmailAddress>augustusk@ecu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.educause.edu-sp.xml b/swamid-interfederations-2.0/sso.educause.edu-sp.xml
deleted file mode 100644
index c7b71b33..00000000
--- a/swamid-interfederations-2.0/sso.educause.edu-sp.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.educause.edu/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">EDUCAUSE SSO</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EDUCAUSE is a nonprofit association and the foremost community of IT leaders and professionals committed to advancing higher education.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.educause.edu/about/incommon</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.educause.edu/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="57" width="225" xml:lang="en">https://www.educause.edu/sites/all/themes/edutheme/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>
-MIIC+jCCAeKgAwIBAgIGAVKap2yFMA0GCSqGSIb3DQEBCwUAMD4xCzAJBgNVBAYTAlVTMREwDwYD
-VQQKEwhlZHVjYXVzZTEcMBoGA1UEAxMTc3NvLWRzLmVkdWNhdXNlLmVkdTAeFw0xNjAyMDEwMjI2
-NDlaFw0xODAxMzEwMjI2NDlaMD4xCzAJBgNVBAYTAlVTMREwDwYDVQQKEwhlZHVjYXVzZTEcMBoG
-A1UEAxMTc3NvLWRzLmVkdWNhdXNlLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMiYhZkpBh5pZ5bJs+LbqWN4DRNOwqq2mfNl6jJHlvBiv5cUnCVMdVdE+wCF5ZDaY0dolYeln3Xz
-7jQBEfgfxgP4LJgSgd4nuwAYpR3Bz6V4wVWodlwHgzPXOBoPymt40NV8wWi+7lANu2KJVyvAV+ln
-2ikGKjJF8LX8y+jgEx43CDfHHtFTqnG831ayXEVMiodDzIwGV4+eBLJSnpK0x7f6PD5imIJzzqgY
-vvkYuLIIMhyaw2CJ793JIQO4ZcCkZIHmuEaQOuFkZTp/J/v4JAOBRacTyW4Y+05hJLXPc94aW07O
-PfG5l7py3P0DZ+vlc3azboo2RHPeChG75fQOEekCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAFQ1E
-LRbfn5jeGhbruKZMv4+ieFnn1AeDGKwy7QfX3KcDHjNCA1P2JTVQWIkqFrQvxCiLYHKEg91Rt6qH
-VTuYygTmNKRCr9AQZQfpl1PAfAm8yCyIagCS6Y4b4qhGYLhbh7WB2yN8mRJihC2S1I6YRwjmccy3
-wIYcfJLdh1HhzGUEwzLOEyjWJmZBKq3PLRD+8ikpL0FXry9i4Jp0OE5UrnvNRn77WAtXAQEu7hsO
-NdqWxNaWjSX5B9mtseJPAPCRU1LJjqMO8LSVbe3HlfKqqZ0pcRwqWFobiKuDe6UeG4AZy+iI3hH1
-DjG7U+yjWFViwzT+zlX+3ZOrtEj4J1/vLw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.educause.edu/sp/ACS.saml2" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">EDUCAUSE SSO</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">EDUCAUSE is a nonprofit association and the foremost community of IT leaders and professionals committed to advancing higher education.</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"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">EDUCAUSE</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">EDUCAUSE</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.educause.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alex Chaux</md:GivenName>
-    <md:EmailAddress>achaux@educause.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IT Administrative Support</md:GivenName>
-    <md:EmailAddress>ITinfo@educause.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Support</md:GivenName>
-    <md:EmailAddress>ITHelpdesk@educause.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.eur.nl-opensso.xml b/swamid-interfederations-2.0/sso.eur.nl-opensso.xml
deleted file mode 100644
index 45296685..00000000
--- a/swamid-interfederations-2.0/sso.eur.nl-opensso.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.eur.nl/opensso">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-30T13:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">eur.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">Erasmus Universiteit Rotterdam</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Erasmus University Rotterdam</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Erasmus Universiteit Rotterdam</mdui:Description>
-        <mdui:Description xml:lang="en">Erasmus University Rotterdam</mdui:Description>
-        <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/eur.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">erasmus universiteit rotterdam erasmus university rotterdam eur</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">erasmus universiteit rotterdam erasmus university rotterdam eur</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/80e917885da2dd2624b1408b6b69fa2a"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Erasmus University Rotterdam</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Erasmus University Rotterdam</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.eur.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/sso.fau.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.fau.edu-idp-shibboleth.xml
deleted file mode 100644
index 3c8a33f2..00000000
--- a/swamid-interfederations-2.0/sso.fau.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://sso.fau.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://wordpress.fau.edu/irm" 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">fau.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Florida Atlantic University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Florida Atlantic Test IDP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fau.edu/oit/accounts/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.fau.edu/oit/accounts/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="150" xml:lang="en">https://www.fau.edu/images/shibboleth.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>
-MIIDGDCCAgCgAwIBAgIVAPXvW42xKsbM/hd7Kz3NbFQcB2eYMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC3Nzby5mYXUuZWR1MB4XDTEyMDYwMjIwMDUxNFoXDTMy
-MDYwMjIwMDUxNFowFjEUMBIGA1UEAxMLc3NvLmZhdS5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDKSEyeGUqxBlVwKg3HMQSX+CSEngA3t10bE4Ks
-+dNLQuBT8dG/2BW0ByoLuY26OUjE/pD/8AfpP96NXninzQl0x6pVm5BPpQC4Ds2m
-VrXjGqOpPddaL/DCxp/MOOuOhsfr4oeIh1wlypMnTey3Q1Ew0Qrn253IUn8VufDW
-MIb0CHGfGOajen0muPHcumuDjqVJm/06ID1h0dygTeTizxY5LfvpmEZYxtuVP4ns
-VTt9qZxRUK92AWGiRPW95ezzNIhNzGSgFk/y0ctdK87Q69Og+kE9Cf8PJVcDjRKB
-kHwWhEVpR/9wXD9VnIOKdXHR2wNb0MNrxxKUWGuhZ0iJINl1AgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC3Nzby5mYXUuZWR1hiJodHRwczovL3Nzby5mYXUuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQpo7vIce0XZ8XgsfkQMH6fElF7gzANBgkqhkiG
-9w0BAQUFAAOCAQEArw1nkMaS7/56SOkCmSf9dha9iyCXTrLOYi8Mrlc12Q479+sI
-eddtX47ShJhlUqXlIvZi/HLPMUHoyG5zIwTzD9a+o9nc4+dC9TTL64lcCiDkAPyB
-jC8zkXMjZogLu2qiSBUdaaAYr1RswiNpUgJEdnl7FxeFUFD1TZ7yFsjOzgLC6W4W
-NVUVQWYfRbQOFizPJBtA+QdWDB/tHnMgOm+jjgwVXupex20rdV6vVq/sKTzE1tCn
-Sy7y61N6qVJjnmbH4IdFnrQib4jc16mOWBob8JUD/nSozArIjurFPIBCZWtfkqhb
-8RgOqewQBP/7Gw84rIidKEycldMKMkP7EtKyeQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.fau.edu:443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.fau.edu:443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.fau.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.fau.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.fau.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.fau.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.fau.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.fau.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fau.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAPXvW42xKsbM/hd7Kz3NbFQcB2eYMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC3Nzby5mYXUuZWR1MB4XDTEyMDYwMjIwMDUxNFoXDTMy
-MDYwMjIwMDUxNFowFjEUMBIGA1UEAxMLc3NvLmZhdS5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDKSEyeGUqxBlVwKg3HMQSX+CSEngA3t10bE4Ks
-+dNLQuBT8dG/2BW0ByoLuY26OUjE/pD/8AfpP96NXninzQl0x6pVm5BPpQC4Ds2m
-VrXjGqOpPddaL/DCxp/MOOuOhsfr4oeIh1wlypMnTey3Q1Ew0Qrn253IUn8VufDW
-MIb0CHGfGOajen0muPHcumuDjqVJm/06ID1h0dygTeTizxY5LfvpmEZYxtuVP4ns
-VTt9qZxRUK92AWGiRPW95ezzNIhNzGSgFk/y0ctdK87Q69Og+kE9Cf8PJVcDjRKB
-kHwWhEVpR/9wXD9VnIOKdXHR2wNb0MNrxxKUWGuhZ0iJINl1AgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC3Nzby5mYXUuZWR1hiJodHRwczovL3Nzby5mYXUuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQpo7vIce0XZ8XgsfkQMH6fElF7gzANBgkqhkiG
-9w0BAQUFAAOCAQEArw1nkMaS7/56SOkCmSf9dha9iyCXTrLOYi8Mrlc12Q479+sI
-eddtX47ShJhlUqXlIvZi/HLPMUHoyG5zIwTzD9a+o9nc4+dC9TTL64lcCiDkAPyB
-jC8zkXMjZogLu2qiSBUdaaAYr1RswiNpUgJEdnl7FxeFUFD1TZ7yFsjOzgLC6W4W
-NVUVQWYfRbQOFizPJBtA+QdWDB/tHnMgOm+jjgwVXupex20rdV6vVq/sKTzE1tCn
-Sy7y61N6qVJjnmbH4IdFnrQib4jc16mOWBob8JUD/nSozArIjurFPIBCZWtfkqhb
-8RgOqewQBP/7Gw84rIidKEycldMKMkP7EtKyeQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.fau.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Florida Atlantic University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Florida Atlantic University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fau.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Florida Atlantic University Support Services</md:GivenName>
-    <md:EmailAddress>fau.us@fau.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Rhian Resnick</md:GivenName>
-    <md:EmailAddress>rresnick@fau.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Frank Rodriguez</md:GivenName>
-    <md:EmailAddress>frodrig6@fau.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.ft.com-sso-sp-oa-metadata.xml b/swamid-interfederations-2.0/sso.ft.com-sso-sp-oa-metadata.xml
deleted file mode 100644
index e77bb08f..00000000
--- a/swamid-interfederations-2.0/sso.ft.com-sso-sp-oa-metadata.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://sso.ft.com/sso/sp/oa/metadata">
-  <!--
-		This is an OpenAthens SP for Financial Times Limited (The).
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-18T09:41:51Z">
-      <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">Financial Times</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The latest news and analysis on international business, finance, economics and politics from the Financial Times.</mdui:Description>
-        <mdui:Logo height="150" width="150">https://sso.ft.com/sso/assets/images/ft.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC+zCCAeOgAwIBAgIEafPFVDANBgkqhkiG9w0BAQsFADAuMRcwFQYDVQQKEw5G
-						aW5hbmNpYWxUaW1lczETMBEGA1UEAxMKc3NvLmZ0LmNvbTAeFw0xNDA3MDMxMzQy
-						MDZaFw0yNDA2MzAxMzQyMDZaMC4xFzAVBgNVBAoTDkZpbmFuY2lhbFRpbWVzMRMw
-						EQYDVQQDEwpzc28uZnQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAkulmKh5DYu+xehNMXRz4Z5o7nZkMQol13xaldjkz9fBhMfcXkQTiAv8fQQaV
-						iwCkW41Awnv0wZpuJTfFPtAI8WUWzP/sY0/hzvQBlYSU3QlEFiTqfZvU5QYzfx5E
-						1ojgE9duo14Om/OXqdpZeajHH1v7QbaBtPFcsQsHCwKasmw1tybQ/bIHdeavJRtc
-						ybzsb7L5HInkooOttwzQr13kvmJcrBpnwdiyN2k7LyzM4nBGAn/BlfkWSGFXO/AL
-						HrUeoNqwWgqLbHnCBie9wWP6Lny+RhGsmyRbToQ2+BMvAZYL0gZWBsOGU9BvA4Zj
-						B0V1NQxRarqWnJf+b/Y4ydzXmwIDAQABoyEwHzAdBgNVHQ4EFgQUBfAdjBVmPr7R
-						FQxK1LBJrrp+4QswDQYJKoZIhvcNAQELBQADggEBAD2K0SlIiPK+uQ6Qv5/PzgID
-						WEw9tL2dR+badmm0PhMpG4JAJMSZj23/OdslbN5MjEIkoQSfbE1VZ0UKzPIXI2XJ
-						LcGAcpJyDkOuXDqU2hwenqnK6ea8TWjfmQXLGEF/lQ/oqizNvFBouzcBUi9NHj62
-						BE+MWP21n4ETGUN16FfvoDogsPGvL1VAJdxUmcvN5jdg+HkbGvKlbe4P8LIQu4jY
-						CLgmgL6RED7Xhbm3j3jlKWT6KRvDl/VsuMLuedxERMiogME5cnxSTBubVVvHpcGk
-						XypQ8WvVlNV0wyxpR6ClzTZwAFx+Wlc2CZ7ucw0s1nZreHpMfwjI9roszznrrjs=
-					</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>
-						MIIC+zCCAeOgAwIBAgIEafPFVDANBgkqhkiG9w0BAQsFADAuMRcwFQYDVQQKEw5G
-						aW5hbmNpYWxUaW1lczETMBEGA1UEAxMKc3NvLmZ0LmNvbTAeFw0xNDA3MDMxMzQy
-						MDZaFw0yNDA2MzAxMzQyMDZaMC4xFzAVBgNVBAoTDkZpbmFuY2lhbFRpbWVzMRMw
-						EQYDVQQDEwpzc28uZnQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAkulmKh5DYu+xehNMXRz4Z5o7nZkMQol13xaldjkz9fBhMfcXkQTiAv8fQQaV
-						iwCkW41Awnv0wZpuJTfFPtAI8WUWzP/sY0/hzvQBlYSU3QlEFiTqfZvU5QYzfx5E
-						1ojgE9duo14Om/OXqdpZeajHH1v7QbaBtPFcsQsHCwKasmw1tybQ/bIHdeavJRtc
-						ybzsb7L5HInkooOttwzQr13kvmJcrBpnwdiyN2k7LyzM4nBGAn/BlfkWSGFXO/AL
-						HrUeoNqwWgqLbHnCBie9wWP6Lny+RhGsmyRbToQ2+BMvAZYL0gZWBsOGU9BvA4Zj
-						B0V1NQxRarqWnJf+b/Y4ydzXmwIDAQABoyEwHzAdBgNVHQ4EFgQUBfAdjBVmPr7R
-						FQxK1LBJrrp+4QswDQYJKoZIhvcNAQELBQADggEBAD2K0SlIiPK+uQ6Qv5/PzgID
-						WEw9tL2dR+badmm0PhMpG4JAJMSZj23/OdslbN5MjEIkoQSfbE1VZ0UKzPIXI2XJ
-						LcGAcpJyDkOuXDqU2hwenqnK6ea8TWjfmQXLGEF/lQ/oqizNvFBouzcBUi9NHj62
-						BE+MWP21n4ETGUN16FfvoDogsPGvL1VAJdxUmcvN5jdg+HkbGvKlbe4P8LIQu4jY
-						CLgmgL6RED7Xhbm3j3jlKWT6KRvDl/VsuMLuedxERMiogME5cnxSTBubVVvHpcGk
-						XypQ8WvVlNV0wyxpR6ClzTZwAFx+Wlc2CZ7ucw0s1nZreHpMfwjI9roszznrrjs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.ft.com/sso/sp/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.ft.com/sso/sp/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ft.com/sso/sp/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.ft.com/sso/sp/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Financial Times Limited (The)</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Financial Times</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ft.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Membership AIM</GivenName>
-    <EmailAddress>mailto:membership.aim@ft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Membership AIM</GivenName>
-    <EmailAddress>mailto:membership.aim@ft.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.h-da.de.xml b/swamid-interfederations-2.0/sso.h-da.de.xml
deleted file mode 100644
index 62364425..00000000
--- a/swamid-interfederations-2.0/sso.h-da.de.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.h-da.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">h-da.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">stud.h-da.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.h-da.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.h-da.de,OU=IT Dienste und Anwendungen,O=Hochschule Darmstadt,L=Darmstadt,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIED+fPjDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
-RTESMBAGA1UEBxMJRGFybXN0YWR0MR0wGwYDVQQKExRIb2Noc2NodWxlIERhcm1z
-dGFkdDEdMBsGA1UEAxMUSG9jaHNjaHVsZSBEYXJtc3RhZHQxGjAYBgkqhkiG9w0B
-CQEWC3BraUBoLWRhLmRlMB4XDTEwMDQxNjEyMDMwOVoXDTE1MDQxNTEyMDMwOVow
-gYwxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEjAQBgNVBAcTCURhcm1z
-dGFkdDEdMBsGA1UEChMUSG9jaHNjaHVsZSBEYXJtc3RhZHQxIzAhBgNVBAsTGklU
-IERpZW5zdGUgdW5kIEFud2VuZHVuZ2VuMRQwEgYDVQQDEwtzc28uaC1kYS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALho1XOuYt0eezN7Owx/u0do
-8nUmRpg3miPFagplAxlBu+0vYPANmGQLxsOjbLifMjhY35roo7z04/wxjSwEGNXE
-ukcLO5uOsnJvc9CANKm6Nx9qkOynibBBoGwb73zOqcPeMVp6QMKSWM4jOMLxCH3o
-Zd8jG6n0B0/WyfRQuTVIZ+Mwgn/oZ++QmjAVqrCassJxKGzNPnRfWPilXNiM4G+V
-UT5JK7aQ2vkvgMhEUV/gIfUXXVIBboub9JIP4k9NT1AXr7f7+IX7h+k86RryGhLT
-IaNZ1HFRCn7bN8AYFay241XsL2Yl0VzpqFVDwT8W1gnZg2pRBT0yeprvAOsefiEC
-AwEAAaOCAcUwggHBMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBTT3Qx3x18q3OqGcLbuLr58v87ecDAfBgNVHSME
-GDAWgBQKDoQ4bwTmT/fB6I4U3TF6WrzRtDAdBgNVHREEFjAUgRJpdC1zZXJ2aWNl
-QGgtZGEuZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9ocy1kYXJtc3RhZHQtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZGFybXN0YWR0LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9ocy1kYXJtc3RhZHQtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWRhcm1z
-dGFkdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AKYP9aJIzChxgBWmXDROeMAKoU/G+eMGeWdm09yQY5GdMzNgPI/b4ZqNjfylMxZe
-TJfLTWaFnJ2cfJIpQjVjxHQBb7wg9gJk08eV5zCd87X/nF2LaHC6bRpTx75DyrtJ
-tnVQIUMNHjp/M4PpDISKhQS5lq4hbXFdXwLnWXe/+el9Pg5fhHAEJ0L5Hr1S+RZL
-igHalo/X6u+rFbbNSYS0dwZ6VkHWRHwIYh2kbwBAYr9C8ViH0KcfzBj2oNrpYJ6x
-Cb6PxneOxz8QjILptZIoj/4wjFJRzdJoFWrOZN16klKT8RrYdYxr2pz/FK24nmam
-e2RPyqbv/NPwrY+7bVC0ulE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.h-da.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.h-da.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.h-da.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.h-da.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.h-da.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.h-da.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">h-da.de</saml1md:Scope>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">stud.h-da.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.h-da.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.h-da.de,OU=IT Dienste und Anwendungen,O=Hochschule Darmstadt,L=Darmstadt,ST=Hessen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFTTCCBDWgAwIBAgIED+fPjDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJE
-RTESMBAGA1UEBxMJRGFybXN0YWR0MR0wGwYDVQQKExRIb2Noc2NodWxlIERhcm1z
-dGFkdDEdMBsGA1UEAxMUSG9jaHNjaHVsZSBEYXJtc3RhZHQxGjAYBgkqhkiG9w0B
-CQEWC3BraUBoLWRhLmRlMB4XDTEwMDQxNjEyMDMwOVoXDTE1MDQxNTEyMDMwOVow
-gYwxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIZXNzZW4xEjAQBgNVBAcTCURhcm1z
-dGFkdDEdMBsGA1UEChMUSG9jaHNjaHVsZSBEYXJtc3RhZHQxIzAhBgNVBAsTGklU
-IERpZW5zdGUgdW5kIEFud2VuZHVuZ2VuMRQwEgYDVQQDEwtzc28uaC1kYS5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALho1XOuYt0eezN7Owx/u0do
-8nUmRpg3miPFagplAxlBu+0vYPANmGQLxsOjbLifMjhY35roo7z04/wxjSwEGNXE
-ukcLO5uOsnJvc9CANKm6Nx9qkOynibBBoGwb73zOqcPeMVp6QMKSWM4jOMLxCH3o
-Zd8jG6n0B0/WyfRQuTVIZ+Mwgn/oZ++QmjAVqrCassJxKGzNPnRfWPilXNiM4G+V
-UT5JK7aQ2vkvgMhEUV/gIfUXXVIBboub9JIP4k9NT1AXr7f7+IX7h+k86RryGhLT
-IaNZ1HFRCn7bN8AYFay241XsL2Yl0VzpqFVDwT8W1gnZg2pRBT0yeprvAOsefiEC
-AwEAAaOCAcUwggHBMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBTT3Qx3x18q3OqGcLbuLr58v87ecDAfBgNVHSME
-GDAWgBQKDoQ4bwTmT/fB6I4U3TF6WrzRtDAdBgNVHREEFjAUgRJpdC1zZXJ2aWNl
-QGgtZGEuZGUwgYsGA1UdHwSBgzCBgDA+oDygOoY4aHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9ocy1kYXJtc3RhZHQtY2EvcHViL2NybC9jYWNybC5jcmwwPqA8oDqGOGh0
-dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZGFybXN0YWR0LWNhL3B1Yi9jcmwvY2Fj
-cmwuY3JsMIGkBggrBgEFBQcBAQSBlzCBlDBIBggrBgEFBQcwAoY8aHR0cDovL2Nk
-cDEucGNhLmRmbi5kZS9ocy1kYXJtc3RhZHQtY2EvcHViL2NhY2VydC9jYWNlcnQu
-Y3J0MEgGCCsGAQUFBzAChjxodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2hzLWRhcm1z
-dGFkdC1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEB
-AKYP9aJIzChxgBWmXDROeMAKoU/G+eMGeWdm09yQY5GdMzNgPI/b4ZqNjfylMxZe
-TJfLTWaFnJ2cfJIpQjVjxHQBb7wg9gJk08eV5zCd87X/nF2LaHC6bRpTx75DyrtJ
-tnVQIUMNHjp/M4PpDISKhQS5lq4hbXFdXwLnWXe/+el9Pg5fhHAEJ0L5Hr1S+RZL
-igHalo/X6u+rFbbNSYS0dwZ6VkHWRHwIYh2kbwBAYr9C8ViH0KcfzBj2oNrpYJ6x
-Cb6PxneOxz8QjILptZIoj/4wjFJRzdJoFWrOZN16klKT8RrYdYxr2pz/FK24nmam
-e2RPyqbv/NPwrY+7bVC0ulE=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.h-da.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.h-da.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschule Darmstadt</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Darmstadt, University of Applied Sciences</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.h-da.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Service Desk</GivenName>
-    <SurName>IT-Dienste und -Anwendungen</SurName>
-    <EmailAddress>it-service@h-da.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Service Desk</GivenName>
-    <SurName>IT-Dienste und -Anwendungen</SurName>
-    <EmailAddress>it-service@h-da.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.han.nl-ssp.xml b/swamid-interfederations-2.0/sso.han.nl-ssp.xml
deleted file mode 100644
index e91b978b..00000000
--- a/swamid-interfederations-2.0/sso.han.nl-ssp.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.han.nl/ssp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-30T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">han.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">Hogeschool van Arnhem en Nijmegen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">HAN University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hogeschool van Arnhem en Nijmegen</mdui:Description>
-        <mdui:Description xml:lang="en">Hogeschool van Arnhem en Nijmegen</mdui:Description>
-        <mdui:Logo height="21" width="108">https://static.surfconext.nl/logos/idp/han.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">han university of applied sciences hogeschool van arnhem en nijmegen hbo</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">han university of applied sciences hogeschool van arnhem en nijmegen hbo</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/2bcc4b974a6b5107c3cd0f0aba1d73ef"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Hogeschool van Arnhem en Nijmegen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Hogeschool van Arnhem en Nijmegen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.han.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/sso.hsc.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/sso.hsc.edu-adfs-services-trust.xml
deleted file mode 100644
index 58551910..00000000
--- a/swamid-interfederations-2.0/sso.hsc.edu-adfs-services-trust.xml
+++ /dev/null
@@ -1,60 +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://sso.hsc.edu/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">hsc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Hampden-Sydney College</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>
-MIIC0jCCAbqgAwIBAgIQMVbE9OvX1phCDtqNX/GNcDANBgkqhkiG9w0BAQsFADAl
-MSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBzc28uaHNjLmVkdTAeFw0xNTA2MTgx
-NjA3MzhaFw0xNjA2MTcxNjA3MzhaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAt
-IHNzby5oc2MuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyy8Z
-ekJKSclzO68X/aOO2x2onbiFc07T2pHty+wpUCqlrbyLXPJ5uA794GByv2HUcRo9
-T+Ulce6rACi2FBdVPPfGSioHUeyS6a2HM6H9HToNjN1GoK76Zl46OBkOVGPQhWUg
-s1Ophadi7yVmTav/MOgyc4+m0zmvMSKxlbN+QUvDIESBsJjp9/5ausmimTHTneKn
-vOyLh4UPGmwH+dkPR4UEMFAgsY6o65N3Hg+ZB7CpTLg/d4Mq+nAi3//H63hjkhAE
-Prysxl8o4MzIktKek+ZukBDFjFYGiJJfO2g3FxUncG0TxcMC+t3TVKqUfkYTYCTU
-CBUSQnCCu8q+bXOJGwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQB2CvVWlOvoM/qQ
-IwU3OY6sIXSGdr4GKxGgztPOE0CY8mpoVV3YtGfq8lNt/72x+iUkh3fMmynMR6gJ
-/S2dclcOoJ5WUJjtsYU+0oVSCHaar7ei3xKutV3STrEPWNo3p+BmRPo24/G7PAhk
-7ZLA0vVaxhw7/t47mCZeGEQHqj2wF7OxvB6Lk9o+/4ZmZyzuXqGgEX10RBm+gZTI
-xeWDHu0oHrKhg0Gs/mBwEvb0KDyKx9tHKswqt1/9sd+auBg1meE8zEfIe83pMaHw
-OvoT768NOgsXeSGCu11mAjjxek36EyTV99dg2vloqXzQtliKIIomQfWOc8qcwUpY
-rAFrZ5o1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.hsc.edu/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.hsc.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.hsc.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.hsc.edu/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Hampden-Sydney College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Hampden-Sydney College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.hsc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Todd Pugh</md:GivenName>
-    <md:EmailAddress>tpugh@hsc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tom Raisbeck</md:GivenName>
-    <md:EmailAddress>traisbeck@sycomtech.com</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 0163cf5a..00000000
--- a/swamid-interfederations-2.0/sso.institutoptique.fr-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://sso.institutoptique.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABc0lEQVQoz41RvS9DcRQ99/WnLa1qWh9FiRiYSCwSCbPZIGwmsZr8K0Ji7mK0WHw0JUFEDBIEHTqIkpbW63tef+9eQ5+PoDjJ3c65595zSETwNz5Yxj/YEMH71n8JmOWxZNUViEBq84bNzFmxZAJSz0G8AUzbWUntas39yVaAvHe+gIVZWGu9fXAxu7i6sXXKHlxml5jZZanYTijoZxHTcrK5+/TRZeb4aqAvsTQ/GWkO4lOQnmDn8PLs6vYml/eREQ4FRof6xkb6Yy2h7+cSM1cs5zx75zMMgyBAVbuuZkfrlxddMu37Yrn4ZFbs6vz0RHciqgA8W87+yTURAbBsxyBDNfiCfhVuCsQijcODya72lo54JOBXnoNTdfOF8s8VEHm5Cdpi4UCDUgAeHs3lVBpUi61u2Qsz472dMWLmqsuFYhl/KBCPhpTyKYE8FJ7X1vd+Idd6nJsa60lEidmtHQsQ1RHJe/UEg4i8ziG/GgAACV4BLLDekh6QMW0AAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MTQrMDI6MDDs3ea7AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjE0KzAyOjAwnYBeBwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.institutoptique.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://sso.institutoptique.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.institutoptique.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.institutoptique.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Institut Optique Graduate School</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Institut Optique Graduate School</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.institutoptique.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>service.info@institutoptique.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8e9ca615..00000000
--- a/swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.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://sso.ird.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">IRD - Institut de Recherche pour le Développement</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABy0lEQVQ4y9WTP2gUYRDFf9+3u+cll4tHVDAhoJhUQbAQhGBnJXbXRLEQtBQrS7GxExuxiIWIpBBiFxsJ2FiFgKLxIgTEyykh5CKXmNzl/u/t9yx2/dfYxMapHm+YmTfMGyOJ/YTdV/W/aOAXtrklgTEx8ftGP7i/8ebSi7KaPZGyhgiInMh4hlYk6k4MpSxhBJLo8wz1SDQjcTCwpCzA/aIk6cHbb7r5clOS5BRHudETjz5remlHkhQl/F7odHW+LKZX5efHMwCMZgNSiTY7swZO6Noxnp87Qs/F+r17RRjw+DA1wpPzR/FfVbBhknQCl+Bsn2VqOA3A8lbn5775iQGujPUz+7EOwJlDKfzAJlMN2ATXLo4CsFhus7jZ4dTh1B9n2+46ANKBwc6VGgCUqiErlXiaefyFh0u7TA6nmd/qUqqGAMytNpj51ODkoA/A3eUafv54PwDjuYDBxBU3xjK8rnS4DsyeHeKAFyu7fTrH5EiaCycyLKy3mMh4+FhDYaNFaSek2o4obLRo9cRux7Gw1qTTday3I95/bXN5Istes8fTlRrPig1ygcXceac3LQdBYpCuIG1i3HbgAQYI9ctEHhAkas3//0zfATNp25O1dnrGAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjA1KzAyOjAwhgDtkQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowNSswMjowMPddVS0AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.ird.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">IRD - Institut de Recherche pour le Développement</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>
-					      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>
-    </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-POST" Location="https://sso.ird.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ird.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.ird.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IRD - Institut de Recherche pour le Développement</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IRD - Institut de Recherche pour le Développement</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ird.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>calvayrac</md:SurName>
-    <md:EmailAddress>didier.calvayrac@ird.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>rouquette</md:SurName>
-    <md:EmailAddress>julien.rouquette@ird.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.it.utsa.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.it.utsa.edu-idp-shibboleth.xml
deleted file mode 100644
index d75236cf..00000000
--- a/swamid-interfederations-2.0/sso.it.utsa.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://sso.it.utsa.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://www.utsa.edu/oit/oitConnect.html" 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">utsa.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Texas at San Antonio</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Use your myUTSA ID to login to services across the UT System federation, other Universities worldwide, and 3rd party applications affiliated with UTSA.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.utsa.edu/policies/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="54" width="338" xml:lang="en">https://sso.it.utsa.edu/images/utsa-logo.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>
-MIIDKDCCAhCgAwIBAgIVAM22PHlkUkZ7H2NuIyyIWIZjQU43MA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD3Nzby5pdC51dHNhLmVkdTAeFw0xMjA2MTgxOTQ5MjJa
-Fw0zMjA2MTgxOTQ5MjJaMBoxGDAWBgNVBAMTD3Nzby5pdC51dHNhLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI5rIo2M+9aJDim1gChL/SwuXKCd
-S1L18jQ9m/ic2ym9/RBmPTpC3RKhSrXWWodP7zvB0QHTs6lCajS7jOI2ekEJzgw1
-nspJ35XPYMIC/o7779I3O6p8NyVPB4kX3PXkubLg+GmdYDwTlb3uyjWOWrXekqRm
-T/KrXFZTCrQClpKGA02tw/NvBVjhbhe0MoNZQ1m61RmwNAhsgSLsYttqKYZ2Wsd4
-cycSqepne4HScUaSUML0upV7JKqwHzmI2XCxVPmqH94wvpGTVciCJvhySHUC6wY4
-2KQ8JLCXAwjHWVLpUIBQqbKmRdKdsGPDj29lfZVJB1vC+DiQ1Vp4cB0lbWkCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPc3NvLml0LnV0c2EuZWR1hiZodHRwczovL3Nzby5p
-dC51dHNhLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUljPRLnL+kddcavGE
-aB+lDMkHJCowDQYJKoZIhvcNAQEFBQADggEBAIJSItYxCCiwhl+DZo3cS5SW3PZy
-rGK+gj2zz5sPLZmnxWZjuDhlLNgNUJUUDdj9cIXNnvNbDrI8Zc0qYU6pObZBuqCj
-0E/JwdqV5Eg+VvqF6JQNAq2P5SNchrYUMKHzP1L3jxlXktfaS4eMx2uHIVY8R68D
-iQ5fliYThKrJqgk6ednPEtrrPilgj6Uf3xDhgEUpwz3BnaD+wspgy8Q5bMopemQP
-e8g7uW6MNZsIkFmTB9uoLKl8uR1ZltQ5yUbsAGX/quNNp90GfSQ6+yGoCgzKB7Y+
-9VJ4X+72+6wE0PfyOB3MGALob67EhNvVLTo+NdYVUd87EYCbcRgbTdAsbes=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.it.utsa.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.it.utsa.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.it.utsa.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.it.utsa.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.it.utsa.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.it.utsa.edu/idp/profile/SAML2/POST/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">utsa.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIVAM22PHlkUkZ7H2NuIyyIWIZjQU43MA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD3Nzby5pdC51dHNhLmVkdTAeFw0xMjA2MTgxOTQ5MjJa
-Fw0zMjA2MTgxOTQ5MjJaMBoxGDAWBgNVBAMTD3Nzby5pdC51dHNhLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI5rIo2M+9aJDim1gChL/SwuXKCd
-S1L18jQ9m/ic2ym9/RBmPTpC3RKhSrXWWodP7zvB0QHTs6lCajS7jOI2ekEJzgw1
-nspJ35XPYMIC/o7779I3O6p8NyVPB4kX3PXkubLg+GmdYDwTlb3uyjWOWrXekqRm
-T/KrXFZTCrQClpKGA02tw/NvBVjhbhe0MoNZQ1m61RmwNAhsgSLsYttqKYZ2Wsd4
-cycSqepne4HScUaSUML0upV7JKqwHzmI2XCxVPmqH94wvpGTVciCJvhySHUC6wY4
-2KQ8JLCXAwjHWVLpUIBQqbKmRdKdsGPDj29lfZVJB1vC+DiQ1Vp4cB0lbWkCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPc3NvLml0LnV0c2EuZWR1hiZodHRwczovL3Nzby5p
-dC51dHNhLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUljPRLnL+kddcavGE
-aB+lDMkHJCowDQYJKoZIhvcNAQEFBQADggEBAIJSItYxCCiwhl+DZo3cS5SW3PZy
-rGK+gj2zz5sPLZmnxWZjuDhlLNgNUJUUDdj9cIXNnvNbDrI8Zc0qYU6pObZBuqCj
-0E/JwdqV5Eg+VvqF6JQNAq2P5SNchrYUMKHzP1L3jxlXktfaS4eMx2uHIVY8R68D
-iQ5fliYThKrJqgk6ednPEtrrPilgj6Uf3xDhgEUpwz3BnaD+wspgy8Q5bMopemQP
-e8g7uW6MNZsIkFmTB9uoLKl8uR1ZltQ5yUbsAGX/quNNp90GfSQ6+yGoCgzKB7Y+
-9VJ4X+72+6wE0PfyOB3MGALob67EhNvVLTo+NdYVUd87EYCbcRgbTdAsbes=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.it.utsa.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.it.utsa.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Texas at San Antonio</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Texas at San Antonio</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utsa.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mark McCoy</md:GivenName>
-    <md:EmailAddress>mark.mccoy@utsa.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Anthony Espinoza</md:GivenName>
-    <md:EmailAddress>anthony.espinoza@utsa.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support - OIT Connect</md:GivenName>
-    <md:EmailAddress>oitconnect@utsa.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.kenyon.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.kenyon.edu-idp-shibboleth.xml
deleted file mode 100644
index a22b3c2c..00000000
--- a/swamid-interfederations-2.0/sso.kenyon.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,89 +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://sso.kenyon.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://lbis.kenyon.edu/facilities-technology/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kenyon.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Kenyon College</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>
-MIIDJDCCAgygAwIBAgIVAK2tE/i3d4cbJjnF+rIPl/2yeGs7MA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDnNzby5rZW55b24uZWR1MB4XDTE1MTAyMjIwMzk1MVoX
-DTM1MTAyMjIwMzk1MVowGTEXMBUGA1UEAwwOc3NvLmtlbnlvbi5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCJ3dWrRgSuFJweEWO/wpNKdLkxRVRm
-moK1qxla4aks7/msfulsAVm8qIG8gDlMKGQKlIKkimam8vKGXLwHEUizLkUb2p+o
-moYQXW3DCykRrInwlfREagnWbIKE8Z+O8TskqJCzLpCluHLLkrohrkovTgrSGC4q
-Ye6EqPLQ62cSP6n5IBlQ+8fg02ghszAp+qar4/pm/V+6GmITsFC6TCM9Co2TKovu
-BCTI1IIb0siKkuUYI8BsExpRIU+WOuCvYwc/J0/IYt+4LmgTiHDGOmqnJZbLu75c
-DWBYWIHARJuMVEHNqBy62rNamE3X0NLG5C3O3TIqd/qvovu/H/Y+1oqLAgMBAAGj
-YzBhMB0GA1UdDgQWBBQIboRDapuoD4QZqK2AXEjGhOV26DBABgNVHREEOTA3gg5z
-c28ua2VueW9uLmVkdYYlaHR0cHM6Ly9zc28ua2VueW9uLmVkdS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAGUv/Y4q/H7JQTlYw78ZFcJm95vmDMzUu
-P8QEz14ohtWrCuXmy55RMzVNI4f0huJWvrhHzCf0soJrbJcxImbRDjqL2CPhhERh
-6KHG6XPzkgNd4toi1X4txTH4uckfY3fe4VVwtag8g2w0q2C74D4MQKwXWMq3oVJo
-J0HQGT3NstNQjx/goFWRZMrI0mBm33FX1bmMNaSaUzJQ1yK3KjCOxYySbGDV87QE
-LkWOh5+fHd7q2DPFtok5j37RUr3hmISN7RGNQqDn7WExZxL+rw8twptbjLuRzuaf
-q+cjT7zoWgOltRQimTXSpr3o4+dhKHnttZ/r6k+m0jjfKeJzueOnwQ==
-          </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>
-MIIDJDCCAgygAwIBAgIVAKh5Jzh1FnqrN8RCEbmOwhRu1fwZMA0GCSqGSIb3DQEB
-CwUAMBkxFzAVBgNVBAMMDnNzby5rZW55b24uZWR1MB4XDTE1MTAyMjIwMzk0OVoX
-DTM1MTAyMjIwMzk0OVowGTEXMBUGA1UEAwwOc3NvLmtlbnlvbi5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCnDS4gR4UUICN60zJEpzRB5PPM7ro
-nahB+w0JygC6TczMhGUYISuPCFzI6RmM1gCNxcK84EBysKt9CpRE9yUmCJLo/cmf
-bVyOWpP3KFJyZscS6wr9kv2ZbbSZuka0E9bjS15h0duWQ644kx8ujfhnr8smwEQr
-Jcc/7v/gCstdbr994p1/94rmO0HRdez1RgFhlBA2Vodz0Jhj6YKqttYEP19WX8C8
-vwfGenjtny2DeXCzbNgJA79kdLMG4NH/BqF/IgEyh8r6cugJ0eV/YLK3RDKDa1xm
-GIMjOLZQFPZ4S7lqNFUV87gK4o+yVDiMiWIQaDMOXLn00FY+9Kkysw2XAgMBAAGj
-YzBhMB0GA1UdDgQWBBRgAnH54F6pj/xxhxn/s4Jz0L9D+zBABgNVHREEOTA3gg5z
-c28ua2VueW9uLmVkdYYlaHR0cHM6Ly9zc28ua2VueW9uLmVkdS9pZHAvc2hpYmJv
-bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAe3zZXvo/Pql6kmOORt1fWJwxXrchUfCe
-EuPl8JI75kBX2OrB0pBkSG9oXEwAjNIHs4lLpIRMtti531czVWeZ6vuek2dddv4w
-efnPBJ6bU12geroCPRri6dtE57PxfaR6PLxUZQzkR4z2Nkj1injgyl/+pAQrbbre
-79MHLnG2jy5eVUl7FmYQClrzQgKApRaN3sdAlO1/S3mAAWGU0pElbj6jYwjYnQU6
-tAyR/K8zodgqRQTLQ8SNVIFBGGwfxfknwsQAfnPGV5f53HQGfTxtoJnn/xzkZsI+
-KIV7jeKH4X9c2EWe5OCrzq1lK8pTN5rdICjsVTE1ULAWyQsBKmjlzA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.kenyon.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.kenyon.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.kenyon.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Kenyon College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Kenyon College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.kenyon.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jared Hoffman</md:GivenName>
-    <md:EmailAddress>hoffmanj@kenyon.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Weylin Burgett</md:GivenName>
-    <md:EmailAddress>burgettw@kenyon.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Niranjan Davray</md:GivenName>
-    <md:EmailAddress>davrayn@kenyon.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.kgv.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.kgv.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index d5995c6a..00000000
--- a/swamid-interfederations-2.0/sso.kgv.ac.uk-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.kgv.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for King George V College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-06-14T15:39: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">kgv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE4TCCA8mgAwIBAgIRAOgdNtecQeRkdUUz80ab59kwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA1MTAwMDAwMDBaFw0xNjA1MDkyMzU5NTlaMIGzMQswCQYD
-						VQQGEwJHQjEQMA4GA1UEERMHUFI4IDZMUjETMBEGA1UECBMKTWVyc2V5c2lkZTES
-						MBAGA1UEBxMJU09VVEhQT1JUMR0wGwYDVQQJExRTY2FyaXNicmljayBOZXcgUm9h
-						ZDEeMBwGA1UEChMVS2luZyBHZW9yZ2UgViBDb2xsZWdlMRIwEAYDVQQLEwlJVFN1
-						cHBvcnQxFjAUBgNVBAMTDXNzby5rZ3YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDueymCOvHFvXJkoXtlKiOrfDC88zyRVVg4BpTnMzf7BSP2
-						QHFcuJGXEDb6963Wufka5eBoD0YV3HMxkj/UJnlQIRWAJnVfcU5coMyjH8CgF9Bf
-						9U5EZ28pXQWNuguvMqKtNLND8YIiDOcqO8e3trmwDv7PLnovSwCfTP09WJmqEJra
-						yDhU8NdRYsNofVk9uLL8LePvttrIxi1o7oALtM4wxLbwhu/oMtikJ9hVdWLGovMa
-						TUX5U5VP0Nyvw3/WYXcr/aqdSrTbszupI1A+/Vg5M42uFQYd/Fr2UW+AwPTHEz+F
-						oTWcGlg2D5R0hVo0JSnVeleyODk4LgdP3pGCgAKLAgMBAAGjggFqMIIBZjAfBgNV
-						HSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUSx1khQvIHbbS
-						AYJosmXfN/R6SMQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
-						BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQEC
-						Ah0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
-						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
-						BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
-						JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQR
-						MA+CDXNzby5rZ3YuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAYbYA7nIj0rI03i
-						JTm/m2hkxCPFfsCMB+6diphJEMffubScT/M6/MRcDDfkc1xT6m5AxDaHsDlgAkcO
-						slEpTMOQnKm/dO3fAWv2Nx6AHTeStlzyiHTrUUEPcxcxRaadBz2TV+43lexjnibz
-						gqnbz0Qc4sMqE3hXaRUixGrou1bk/8TGpJaUcGWdo+UnAXtkelzuPRAGLXZEcOon
-						0FK89Xj6N+RUwAlA6Fuu/fXevoMdtHQ6b3EW2NZ7HcC5T3Du6XBYTv/CBSXX8FwP
-						84TLS0UyU2VwGJ9b2iXEnX2uQ4p6hN6x/WdmGwrqxGmxmbcD7WLAvo7WnmdPThB8
-						gtXXhng=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.kgv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.kgv.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://sso.kgv.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.kgv.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.kgv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.kgv.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">kgv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE4TCCA8mgAwIBAgIRAOgdNtecQeRkdUUz80ab59kwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA1MTAwMDAwMDBaFw0xNjA1MDkyMzU5NTlaMIGzMQswCQYD
-						VQQGEwJHQjEQMA4GA1UEERMHUFI4IDZMUjETMBEGA1UECBMKTWVyc2V5c2lkZTES
-						MBAGA1UEBxMJU09VVEhQT1JUMR0wGwYDVQQJExRTY2FyaXNicmljayBOZXcgUm9h
-						ZDEeMBwGA1UEChMVS2luZyBHZW9yZ2UgViBDb2xsZWdlMRIwEAYDVQQLEwlJVFN1
-						cHBvcnQxFjAUBgNVBAMTDXNzby5rZ3YuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDueymCOvHFvXJkoXtlKiOrfDC88zyRVVg4BpTnMzf7BSP2
-						QHFcuJGXEDb6963Wufka5eBoD0YV3HMxkj/UJnlQIRWAJnVfcU5coMyjH8CgF9Bf
-						9U5EZ28pXQWNuguvMqKtNLND8YIiDOcqO8e3trmwDv7PLnovSwCfTP09WJmqEJra
-						yDhU8NdRYsNofVk9uLL8LePvttrIxi1o7oALtM4wxLbwhu/oMtikJ9hVdWLGovMa
-						TUX5U5VP0Nyvw3/WYXcr/aqdSrTbszupI1A+/Vg5M42uFQYd/Fr2UW+AwPTHEz+F
-						oTWcGlg2D5R0hVo0JSnVeleyODk4LgdP3pGCgAKLAgMBAAGjggFqMIIBZjAfBgNV
-						HSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUSx1khQvIHbbS
-						AYJosmXfN/R6SMQwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
-						BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQEC
-						Ah0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
-						cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
-						BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
-						JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBgGA1UdEQQR
-						MA+CDXNzby5rZ3YuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAYbYA7nIj0rI03i
-						JTm/m2hkxCPFfsCMB+6diphJEMffubScT/M6/MRcDDfkc1xT6m5AxDaHsDlgAkcO
-						slEpTMOQnKm/dO3fAWv2Nx6AHTeStlzyiHTrUUEPcxcxRaadBz2TV+43lexjnibz
-						gqnbz0Qc4sMqE3hXaRUixGrou1bk/8TGpJaUcGWdo+UnAXtkelzuPRAGLXZEcOon
-						0FK89Xj6N+RUwAlA6Fuu/fXevoMdtHQ6b3EW2NZ7HcC5T3Du6XBYTv/CBSXX8FwP
-						84TLS0UyU2VwGJ9b2iXEnX2uQ4p6hN6x/WdmGwrqxGmxmbcD7WLAvo7WnmdPThB8
-						gtXXhng=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.kgv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.kgv.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">King George V College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">King George V College, Southport</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kgv.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martyn</GivenName>
-    <SurName>Coleman</SurName>
-    <EmailAddress>mailto:mpc@kgv.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martyn</GivenName>
-    <SurName>Coleman</SurName>
-    <EmailAddress>mailto:mpc@kgv.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.legendonlineservices.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/sso.legendonlineservices.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 89927a26..00000000
--- a/swamid-interfederations-2.0/sso.legendonlineservices.co.uk-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://sso.legendonlineservices.co.uk/shibboleth-sp">
-  <!--
-		This is a "Legend Online Services" Shibboleth SP for Serco Leisure Operating 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="2011-08-12T08:07:20Z"/>
-  </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://sso.legendonlineservices.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://sso.legendonlineservices.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIICzTCCAbWgAwIBAgIJAJobCx55lv5EMA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNV
-						BAMTAncxMB4XDTExMDgxMTA4NDkyNFoXDTIxMDgwODA4NDkyNFowDTELMAkGA1UE
-						AxMCdzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhMOvBTMzwJXzE
-						J59XFKXaqeI5zLdnA0YzdFsPnbLOlf/5+qjgRb86LlR1hYxDReSbKz1nm3H6eN9D
-						5IHZ/fZgdnvDblKno/xK0emOGRQ7ILDoHm9HTrpcd+qwzOGsqhN3dtZxMvGHv+bz
-						mULMepXiKk4KyqUp/pMuv52n0lshyJG5mJ0SctJEptUx/1IhXn6OhDg3fzvWiWQ9
-						6lgDiCg5TZ9p6r0FgEaAfp+EKfLIQKohkD8j1r88sSzIqgTW8TR+k0IOgSKydpiL
-						UPC8KqVFAATA7YisCxSwQL0Ol/km8h9M6I61U5sMzxQb96OjJNkJ0XkkqKpdJiQg
-						I0m6HiVnAgMBAAGjMDAuMA0GA1UdEQQGMASCAncxMB0GA1UdDgQWBBTcBGviv7Uv
-						SMf+iglk0SBxtdd8KzANBgkqhkiG9w0BAQUFAAOCAQEAicU/pEyeTf8EhIx3Hz/L
-						tN0lUevjM3RX5cpXHPnHGeO6lidknaaBi7e0Wnkbkur8VuKh9aTOENV+yNH4cQA+
-						ePNQefs0FqlzHiVMNFrb6nTzA4IXHCqLKkLWilFuQ17z+wih38PFjzqucXKZViow
-						MWaNgEGEyYBOyAKND5MtdS9WSQImqOn/fnx5PM6brLascO5a8ZBp96Zky7WvN28t
-						/eV2xzqBtVt3O87D1ta+yIbw0p2yXlWogVQNc4u6OKOcA9Rv2dO1UVPCGCsQCtdp
-						t3NdGb/WFfWxBSl2R2zNf9/vhRN+Senh5iasZaoZyaGSF1SZtyskYNDLshiBG/FS
-						7Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sso.legendonlineservices.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.legendonlineservices.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Serco Leisure Operating Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Serco Leisure Operating Limited: Legend Online Services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.legendware.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@legendware.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Robertson</SurName>
-    <EmailAddress>mailto:paul.robertson@legendware.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.loucoll.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/sso.loucoll.ac.uk-shibboleth.xml
deleted file mode 100644
index 8f55ab81..00000000
--- a/swamid-interfederations-2.0/sso.loucoll.ac.uk-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://sso.loucoll.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Loughborough College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-22T11:31: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">loucoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaDCCAlACCQCHK+i1QORh+TANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
-						QjEVMBMGA1UECBMMTG91Z2hib3JvdWdoMRUwEwYDVQQHEwxMb3VnaGJvcm91Z2gx
-						HTAbBgNVBAoTFExvdWdoYm9yb3VnaCBDb2xsZWdlMRowGAYDVQQDExFzc28ubG91
-						Y29sbC5hYy51azAeFw0xNDA0MTUxMzU2MjZaFw0zNDA0MTAxMzU2MjZaMHYxCzAJ
-						BgNVBAYTAkdCMRUwEwYDVQQIEwxMb3VnaGJvcm91Z2gxFTATBgNVBAcTDExvdWdo
-						Ym9yb3VnaDEdMBsGA1UEChMUTG91Z2hib3JvdWdoIENvbGxlZ2UxGjAYBgNVBAMT
-						EXNzby5sb3Vjb2xsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAwQY7dDYZ1ca0Er7mJbTr/HINCIP66swXOlslbAoA7J7PNz9wnVUdasYtGzDL
-						pf71DvYJ7A7gQN41bNJif1AwOfr9YMg4Nnp+F3WhPsZuvMV2bu6I+eNv2nJV2gVE
-						NHcV4YrH1hYNX4lMUA3AgJUyXge5vyDnLloNbVdbBiap1gR/OHShe5c5rD1n6evm
-						8F0anTKcpwp0PXHx8sZ1VKVzs51NamfDlNscDY6k+XEsQ62ypJaOCYNo1vtcA7Kw
-						cIvLgQQ0zfi7nVkVJRoS58vR4ocTvQMItafdvp7GUgMAGolMcgWWILy5mp1qW9ZL
-						QxBjsPnxVsKwRVzbv7LsiiVIfQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC7Wd4k
-						YLrM/UczkJ0T3jDB+dpFJtNu7BxmN7izPuIBk8ob+cw8w8mDcbjz0WiB3RhDtrMz
-						5xJa57WZQg5ySFdObFyR1etzDBGFKqauCeFr1P+5n5emZUWyDM2bur9Bu2yQAsYI
-						oXv1PaY+Yr5MnYBTDHOLFPGmEigyX5GotJVFiwxXD3rcf8xD0WCMVZH1ovoH6k6p
-						squru7H3FR8QUPvycQl5i03k6V6R3dEVoZSEa9oZF9YvhcztQc/p/FYiSfGOcEms
-						Wfn32Jf8HxqrKO+YSsxnnTrquO7HI1d2vaN7N07YiycbQGv7YhPb/1xbVyIH6iCH
-						yUtE78S0KocB9mjJ
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.loucoll.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.loucoll.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://sso.loucoll.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.loucoll.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.loucoll.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.loucoll.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">loucoll.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaDCCAlACCQCHK+i1QORh+TANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJH
-						QjEVMBMGA1UECBMMTG91Z2hib3JvdWdoMRUwEwYDVQQHEwxMb3VnaGJvcm91Z2gx
-						HTAbBgNVBAoTFExvdWdoYm9yb3VnaCBDb2xsZWdlMRowGAYDVQQDExFzc28ubG91
-						Y29sbC5hYy51azAeFw0xNDA0MTUxMzU2MjZaFw0zNDA0MTAxMzU2MjZaMHYxCzAJ
-						BgNVBAYTAkdCMRUwEwYDVQQIEwxMb3VnaGJvcm91Z2gxFTATBgNVBAcTDExvdWdo
-						Ym9yb3VnaDEdMBsGA1UEChMUTG91Z2hib3JvdWdoIENvbGxlZ2UxGjAYBgNVBAMT
-						EXNzby5sb3Vjb2xsLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAwQY7dDYZ1ca0Er7mJbTr/HINCIP66swXOlslbAoA7J7PNz9wnVUdasYtGzDL
-						pf71DvYJ7A7gQN41bNJif1AwOfr9YMg4Nnp+F3WhPsZuvMV2bu6I+eNv2nJV2gVE
-						NHcV4YrH1hYNX4lMUA3AgJUyXge5vyDnLloNbVdbBiap1gR/OHShe5c5rD1n6evm
-						8F0anTKcpwp0PXHx8sZ1VKVzs51NamfDlNscDY6k+XEsQ62ypJaOCYNo1vtcA7Kw
-						cIvLgQQ0zfi7nVkVJRoS58vR4ocTvQMItafdvp7GUgMAGolMcgWWILy5mp1qW9ZL
-						QxBjsPnxVsKwRVzbv7LsiiVIfQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQC7Wd4k
-						YLrM/UczkJ0T3jDB+dpFJtNu7BxmN7izPuIBk8ob+cw8w8mDcbjz0WiB3RhDtrMz
-						5xJa57WZQg5ySFdObFyR1etzDBGFKqauCeFr1P+5n5emZUWyDM2bur9Bu2yQAsYI
-						oXv1PaY+Yr5MnYBTDHOLFPGmEigyX5GotJVFiwxXD3rcf8xD0WCMVZH1ovoH6k6p
-						squru7H3FR8QUPvycQl5i03k6V6R3dEVoZSEa9oZF9YvhcztQc/p/FYiSfGOcEms
-						Wfn32Jf8HxqrKO+YSsxnnTrquO7HI1d2vaN7N07YiycbQGv7YhPb/1xbVyIH6iCH
-						yUtE78S0KocB9mjJ
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.loucoll.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.loucoll.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">Loughborough College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Loughborough College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.loucoll.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mick</GivenName>
-    <SurName>Bennett</SurName>
-    <EmailAddress>mailto:mick.bennett@loucoll.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mick</GivenName>
-    <SurName>Bennett</SurName>
-    <EmailAddress>mailto:mick.bennett@loucoll.ac.uk</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 ef52b09b..00000000
--- a/swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor 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>
-  <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">man.poznan.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>man.poznan.pl</mdui:DomainHint>
-        <mdui:IPHint>150.254.148.16/28</mdui:IPHint>
-        <mdui:IPHint>150.254.149.0/24</mdui:IPHint>
-        <mdui:IPHint>150.254.170.64/26</mdui:IPHint>
-        <mdui:IPHint>150.254.170.128/25</mdui:IPHint>
-        <mdui:IPHint>150.254.166.56/32</mdui:IPHint>
-        <mdui:IPHint>150.254.166.63/32</mdui:IPHint>
-        <mdui:IPHint>150.254.169.99/32</mdui:IPHint>
-        <mdui:IPHint>150.254.169.100/32</mdui:IPHint>
-        <mdui:IPHint>2001:808:0:1000::/64</mdui:IPHint>
-        <mdui:IPHint>2001:808:0:6::/64</mdui:IPHint>
-        <mdui:IPHint>2001:808:2:3003::/64</mdui:IPHint>
-        <mdui:GeolocationHint>geo:52.41180,16.91625</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:52.41160,16.91610</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:52.41400,16.89900</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:52.43140,16.80900</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:52.41140,16.91778</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:52.40840,16.90830</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:52.40680,16.95320</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/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://sso.man.poznan.pl/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/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">man.poznan.pl</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.man.poznan.pl/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/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">Poznan Supercomputing and Networking Center</md:OrganizationName>
-    <md:OrganizationName xml:lang="pl">Poznańskie Centrum Superkomputerowo-Sieciowe</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">PSNC - Poznan Supercomputing and Networking Center</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.man.poznan.pl/online/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pl">http://www.man.poznan.pl/online/pl/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>PSNC</md:GivenName>
-    <md:SurName>SSO Team</md:SurName>
-    <md:EmailAddress>mailto:sso@man.poznan.pl</md:EmailAddress>
-  </md: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 7d8100ce..00000000
--- a/swamid-interfederations-2.0/sso.man.poznan.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://sso.man.poznan.pl/pozman/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl/" registrationInstant="2014-02-22T14:05:00Z">
-      <mdrpi: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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">POZMAN - Poznan Metropolitan Network Identity Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">POZMAN - Poznan Metropolitan Network Identity Provider</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope regexp="false">man.poznan.pl</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDSDCCAjACCQDWFXjbKgnTwjANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJQTDENMAsGA1UECAwEV0xLUDEPMA0GA1UEBwwGUG96bmFuMQ0wCwYDVQQKDARQQ1NTMQwwCgYDVQQLDANEVVMxGjAYBgNVBAMMEXNzby5tYW4ucG96bmFuLnBsMB4XDTEzMDExNTExNTAzMVoXDTIzMDExMzExNTAzMVowZjELMAkGA1UEBhMCUEwxDTALBgNVBAgMBFdMS1AxDzANBgNVBAcMBlBvem5hbjENMAsGA1UECgwEUENTUzEMMAoGA1UECwwDRFVTMRowGAYDVQQDDBFzc28ubWFuLnBvem5hbi5wbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMMrEGzIWNAQo0Q0wow6rkgRSS6rqKLbZPA9UzW6Pq6If4ZTSV56MMgh/ULVunQV1nKPXUEOHwltinS+z9JpfWupLIBaFajGplv/mikki5IAdC1xgrp22OZVLpjQU/014RMNt/dVE6EybRrE8Qv4RLyM5OrQ+2yrq9PY6FfQ4lerSqUKT5GMF/YO839Tg03XAZav1wj2EuXB4LHT76SvWo37lzyDlwRNaa4XEvtWl9cHd4jT978hWGLwd+spEYiwBLyuNTTBCd1W8pTRgd5pF9VxoQtBWEgZtzE6xsK2tj5SqkpK2PJj2mEN+dySrKGdfitUOx9GhD6wmjWyuHzIX5ECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAP7DHqYxjrAiLDsvyqEHpvGnR/1zr5NIkhwgM4D8ewzSjBTV/ydr05kRnl0CUq0B/t0u9vYQjVtTc+R5eMVe2o0lcyDJb/qkbJbJWFnLzFFzW7wo952c2/omYoLieMv1olMMWhJnzj/LKWW98qd+tnDX0G506Dlqo86iJ7tOepWYCUR1i1/5YQ38l+43KsKqaF+RRONHG6yvpBJysFt2AKPAiSRVgYiNWAcWJsKKiwRFOG0yQErwX/0AJ1YbjKaw3eYUV15gIEKh4UZzx6CEIuyJRZo/uO7SX44wrWsIpI51SS6a2frTfz1GzflLr9vqJro8Ts3+4SkA9QCXbY4Ucig==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDSDCCAjACCQDWFXjbKgnTwjANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJQTDENMAsGA1UECAwEV0xLUDEPMA0GA1UEBwwGUG96bmFuMQ0wCwYDVQQKDARQQ1NTMQwwCgYDVQQLDANEVVMxGjAYBgNVBAMMEXNzby5tYW4ucG96bmFuLnBsMB4XDTEzMDExNTExNTAzMVoXDTIzMDExMzExNTAzMVowZjELMAkGA1UEBhMCUEwxDTALBgNVBAgMBFdMS1AxDzANBgNVBAcMBlBvem5hbjENMAsGA1UECgwEUENTUzEMMAoGA1UECwwDRFVTMRowGAYDVQQDDBFzc28ubWFuLnBvem5hbi5wbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMMrEGzIWNAQo0Q0wow6rkgRSS6rqKLbZPA9UzW6Pq6If4ZTSV56MMgh/ULVunQV1nKPXUEOHwltinS+z9JpfWupLIBaFajGplv/mikki5IAdC1xgrp22OZVLpjQU/014RMNt/dVE6EybRrE8Qv4RLyM5OrQ+2yrq9PY6FfQ4lerSqUKT5GMF/YO839Tg03XAZav1wj2EuXB4LHT76SvWo37lzyDlwRNaa4XEvtWl9cHd4jT978hWGLwd+spEYiwBLyuNTTBCd1W8pTRgd5pF9VxoQtBWEgZtzE6xsK2tj5SqkpK2PJj2mEN+dySrKGdfitUOx9GhD6wmjWyuHzIX5ECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAP7DHqYxjrAiLDsvyqEHpvGnR/1zr5NIkhwgM4D8ewzSjBTV/ydr05kRnl0CUq0B/t0u9vYQjVtTc+R5eMVe2o0lcyDJb/qkbJbJWFnLzFFzW7wo952c2/omYoLieMv1olMMWhJnzj/LKWW98qd+tnDX0G506Dlqo86iJ7tOepWYCUR1i1/5YQ38l+43KsKqaF+RRONHG6yvpBJysFt2AKPAiSRVgYiNWAcWJsKKiwRFOG0yQErwX/0AJ1YbjKaw3eYUV15gIEKh4UZzx6CEIuyJRZo/uO7SX44wrWsIpI51SS6a2frTfz1GzflLr9vqJro8Ts3+4SkA9QCXbY4Ucig==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/pozman/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.man.poznan.pl/pozman/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">POZMAN / PSNC - Poznan Supercomputing and Networking Center</md:OrganizationName>
-    <md:OrganizationName xml:lang="pl">POZMAN / PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">POZMAN - Poznan Metropolitan Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">POZMAN - Poznańska Sieć Metropolitalna</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.man.poznan.pl/online/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pl">http://www.man.poznan.pl/online/pl/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SSO</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>sso@man.poznan.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.mathletics.com-ukfederation.xml b/swamid-interfederations-2.0/sso.mathletics.com-ukfederation.xml
deleted file mode 100644
index e2ef5f8b..00000000
--- a/swamid-interfederations-2.0/sso.mathletics.com-ukfederation.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://sso.mathletics.com/ukfederation">
-  <!--
-		This is a "Mathletics" Shibboleth SP for 3P Learning Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIC9DCCAdygAwIBAgIJAP4D/fTY0gATMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3dpbi1vaDJvMW1tZDM5MzAeFw0xMDA3MDIxNDQzMThaFw0yMDA2MjkxNDQz
-						MThaMBoxGDAWBgNVBAMTD3dpbi1vaDJvMW1tZDM5MzCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAMy+Vo/nUmNICl1EaHkt4ufsLfVzxrlwyOGA24oGCKFu
-						LjnWDFJDvj6QuT6k917FdFwDbzdflttObWI23WRdbptSoVb9Y4DBuaTCpTLxbcSl
-						YJ16wlNGd8CFijxwIt9a/oMyQLOPzP+5DGnodBRXSG0xkEhXEPe2rDP5v1NvHErD
-						NctMEGV9zBfrxbokDHeJH2xrO1OStSsIbngcY5IVCSneifJEz0HlGoUrVw5CRIBM
-						Fi4uoZYCQ9f7wPPvMb/GACYj441EXAvN1hAl4L/AmtrihUGmhA+45YXnvuGe3xOq
-						BP0mxerTLBHZtedkWS5Wg3oZxCeIFQ3nS9ibB7h1UjMCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPd2luLW9oMm8xbW1kMzkzMB0GA1UdDgQWBBQvlfJiq/7Uz+/L2t17aQ4L
-						I8tR5zANBgkqhkiG9w0BAQUFAAOCAQEAkXHpy1kVpS7z+KKJYqjIJWHpJ8AEpn/9
-						FP4ty2Y1cQVD6W/S31BoMOckY+SCxwzQZ/pnLXWenwbozRkDPnE9N4dw4hdpZyVz
-						tM2/rWzaYj14qqnIO2QNU0s4PSdLYL7YeANYNdqSeUljFqN1qp+eQCaVs/EKHwFk
-						clV69FtCaNVDaPCD2rQT+VzLdUc0PXGsSa6NS20kC9Ol3ZNdIY1OuA1eJNm6LEEb
-						NWK1rVTqrnuIil6Sx2eifjXd8KSGi5N223oCZ4SV+Httbr+TmL2dTl+YNPn9DguP
-						LkR1mUqyrB/LlLXkJ/GZyTYpfsN+AATxyzg5Jtsn3c8rbkkPf/KfZw==
-					</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>
-						MIIC9DCCAdygAwIBAgIJAP4D/fTY0gATMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3dpbi1vaDJvMW1tZDM5MzAeFw0xMDA3MDIxNDQzMThaFw0yMDA2MjkxNDQz
-						MThaMBoxGDAWBgNVBAMTD3dpbi1vaDJvMW1tZDM5MzCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAMy+Vo/nUmNICl1EaHkt4ufsLfVzxrlwyOGA24oGCKFu
-						LjnWDFJDvj6QuT6k917FdFwDbzdflttObWI23WRdbptSoVb9Y4DBuaTCpTLxbcSl
-						YJ16wlNGd8CFijxwIt9a/oMyQLOPzP+5DGnodBRXSG0xkEhXEPe2rDP5v1NvHErD
-						NctMEGV9zBfrxbokDHeJH2xrO1OStSsIbngcY5IVCSneifJEz0HlGoUrVw5CRIBM
-						Fi4uoZYCQ9f7wPPvMb/GACYj441EXAvN1hAl4L/AmtrihUGmhA+45YXnvuGe3xOq
-						BP0mxerTLBHZtedkWS5Wg3oZxCeIFQ3nS9ibB7h1UjMCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPd2luLW9oMm8xbW1kMzkzMB0GA1UdDgQWBBQvlfJiq/7Uz+/L2t17aQ4L
-						I8tR5zANBgkqhkiG9w0BAQUFAAOCAQEAkXHpy1kVpS7z+KKJYqjIJWHpJ8AEpn/9
-						FP4ty2Y1cQVD6W/S31BoMOckY+SCxwzQZ/pnLXWenwbozRkDPnE9N4dw4hdpZyVz
-						tM2/rWzaYj14qqnIO2QNU0s4PSdLYL7YeANYNdqSeUljFqN1qp+eQCaVs/EKHwFk
-						clV69FtCaNVDaPCD2rQT+VzLdUc0PXGsSa6NS20kC9Ol3ZNdIY1OuA1eJNm6LEEb
-						NWK1rVTqrnuIil6Sx2eifjXd8KSGi5N223oCZ4SV+Httbr+TmL2dTl+YNPn9DguP
-						LkR1mUqyrB/LlLXkJ/GZyTYpfsN+AATxyzg5Jtsn3c8rbkkPf/KfZw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.mathletics.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.mathletics.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.mathletics.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.mathletics.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.mathletics.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.mathletics.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.mathletics.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.mathletics.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.mathletics.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.mathletics.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.mathletics.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.mathletics.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.mathletics.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.mathletics.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.mathletics.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">3P Learning Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">3P Learning Limited: Mathletics</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mathletics.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:techsupport@3plearning.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:techsupport@3plearning.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.memphis.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.memphis.edu-idp-shibboleth.xml
deleted file mode 100644
index 46b81882..00000000
--- a/swamid-interfederations-2.0/sso.memphis.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,63 +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://sso.memphis.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">memphis.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The University of Memphis</mdui:DisplayName>
-        <mdui:Logo height="118" width="350" xml:lang="en">https://sso.memphis.edu/idp/images/uofmlogo.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>
-MIIDKDCCAhCgAwIBAgIVAMRzm6r0KEI0aMxpj+07KHii/Em0MA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD3Nzby5tZW1waGlzLmVkdTAeFw0xMDA1MDQxNjQzMjla
-Fw0zMDA1MDQxNjQzMjlaMBoxGDAWBgNVBAMTD3Nzby5tZW1waGlzLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIfoWBM++Q+1MvUNrhdyCxsRG/1b
-9x+Zydzbgfk13b5NDH4kwW0pdQaejJD4Lyjv51wFGRu46Nujs5BZVXg2/TTxEef4
-qP1UATWeGc05bYv+G1wrGyjDGtuePMjXTXKNcizGf6ixKmwDlBhBaOa9XCBD7Mfb
-rwaVNKq/oVUm3KUazKk5PKNDPQbMWieIR3xdUgOm9MZYoFD5HF+zg2XIJr7nUvNe
-BvqrhOmCw1b4LBz+3Do3yAi4SaF2d6Vz1IIkAgzJFlLvkBCFZib793CUFMd/tEz6
-9rHISb0DQHc0fxchJNY65TsTWDf7eaSmfVNq24N95zFjTB1LpsZq41HqiSECAwEA
-AaNlMGMwQgYDVR0RBDswOYIPc3NvLm1lbXBoaXMuZWR1hiZodHRwczovL3Nzby5t
-ZW1waGlzLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPT6dRHJJjkrdBtxY
-8h56JhBLM3gwDQYJKoZIhvcNAQEFBQADggEBAINm/g8hIwxTA+Qyl1mOJJmraDJ/
-BbzXRA57magxwGUdGV5vknlTh0P9Tvp7yqiRUrZzD3RjomI6bmvu2E5p5JMXqTuz
-FUgkk3DR6kT8SLg+Jc0vyAM11M0hMhmZYjzgwbL/3ArpxJnUAt6XTzMtn2ylv++p
-zs2YddbosZ2kbcEmAUoIuuiBRf37fQDj7b84ri6XusWphMBuQdMG2hRFXAVKXMas
-MNVw3x0YwNgpXojdR/YaOD7FVhMSdU5dpafnBngseJgY0bWb0RFIFaa8TFwaxze4
-+UQ7IWMgsQsCScGpJnaOU2KXOQrF5zPSxsKLS07rJlGUEszyfaRblzJEwNU=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.memphis.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.memphis.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The University of Memphis</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The University of Memphis</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.memphis.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Patrick Hood</md:GivenName>
-    <md:EmailAddress>pchood@memphis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Walter Hoehn</md:GivenName>
-    <md:EmailAddress>wassa@memphis.edu</md:EmailAddress>
-  </md: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 62916a97..00000000
--- a/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.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://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.surfnet.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-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:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nikhef.nl</shibmd:Scope>
-      <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 - samenwerkingsverband Stichting voor Fundamenteel Onderzoek der Materie, Universiteit van Amsterdam, Vrije Universiteit Amsterdam, Universiteit Utrecht, en Radboud Universiteit Nijmegen</mdui:Description>
-        <mdui:Logo height="48" width="108">https://static.surfconext.nl/logos/idp/nikhef.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">national institute subatomic physics Nikhef Research</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">nationaal instituut subatomaire fysica Nikhef Research</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md: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 - samenwerkingsverband Stichting voor Fundamenteel Onderzoek der Materie, Universiteit van Amsterdam, Vrije Universiteit Amsterdam, Universiteit Utrecht, en Radboud Universiteit Nijmegen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Nikhef</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.nikhef.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/sso.onesource.com-shibboleth.xml b/swamid-interfederations-2.0/sso.onesource.com-shibboleth.xml
deleted file mode 100644
index c58f77dd..00000000
--- a/swamid-interfederations-2.0/sso.onesource.com-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.onesource.com/shibboleth">
-  <!--
-		This is a Shibboleth SP owned by 9 Star Research, Inc, on behalf of OneSource.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://sso.onesource.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC8jCCAdqgAwIBAgIBADANBgkqhkiG9w0BAQUFADAcMRowGAYDVQQDExFzc28u
-						b25lc291cmNlLmNvbTAeFw0xMDEwMjcxOTMyMjFaFw0yMDEwMjQxOTMyMjFaMBwx
-						GjAYBgNVBAMTEXNzby5vbmVzb3VyY2UuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA0rAmWglWbPqA8WsNSqXmDoP5VXm04RUhsnf51me/R0+Oa+Lg
-						jKkGhenXjoEss2F+R4AFClOyBYlWCXcOor01+Ybm6wVjlhqiGsYQj+cT4/nH101C
-						mLCydJvqLVTreAAXIeeqrnHNOIL9dKKT9f4rXMd652NmSFRA7Hl6cQV70f2Bd/6r
-						5geLQ+flrJIpvhdXO40GtXOpf5VfX/BtQ3+3j4AZmEABEMCpo1mzO8Cp/d8adsnt
-						iJTvp51OggSLWpJPt3foT0afuug1xCl6zP0uySXDaSaAuE/s+nCG0xiZLEs0HTib
-						r3t9XXDIo2+gN4IULSn3XJIkXiR1L3BVu5M9UQIDAQABoz8wPTAcBgNVHREEFTAT
-						ghFzc28ub25lc291cmNlLmNvbTAdBgNVHQ4EFgQUBf9CwdAc1mBKZS6BJMndqkOQ
-						ccEwDQYJKoZIhvcNAQEFBQADggEBAHt0L5MxCaW+HF4r16kVr3GTAzjl/oQArntL
-						gK5rSvzn5vBGOYwRqoOqOyT0KIg5x95mssw8DIonSOZKkBERkFcKdjW77vfaKWMM
-						XbQyZQF9Udsf49yCac4/SEEDHqWVVB7uMngkx5FzU4dSwz+K7M9mlc1qpT0sYZc/
-						sMZlncHSACTa9ClqnABgSRK5VxYAaqLflKFLDwR2pBVBZzX4GQ6iMkRLpfKYakHY
-						90CPLNchMKTaFTDS0LQkkQ+PqzE2OTlf8ov8ppzVLVN5ZLemuX9i9GNzLOoeW6dr
-						XQgb23tk8eDNQABBWA7armXrmBXD1G1EQv6J+PqHowTqu2mI2qo=
-					</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>
-						MIIC8jCCAdqgAwIBAgIBADANBgkqhkiG9w0BAQUFADAcMRowGAYDVQQDExFzc28u
-						b25lc291cmNlLmNvbTAeFw0xMDEwMjcxOTMyMjFaFw0yMDEwMjQxOTMyMjFaMBwx
-						GjAYBgNVBAMTEXNzby5vbmVzb3VyY2UuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA0rAmWglWbPqA8WsNSqXmDoP5VXm04RUhsnf51me/R0+Oa+Lg
-						jKkGhenXjoEss2F+R4AFClOyBYlWCXcOor01+Ybm6wVjlhqiGsYQj+cT4/nH101C
-						mLCydJvqLVTreAAXIeeqrnHNOIL9dKKT9f4rXMd652NmSFRA7Hl6cQV70f2Bd/6r
-						5geLQ+flrJIpvhdXO40GtXOpf5VfX/BtQ3+3j4AZmEABEMCpo1mzO8Cp/d8adsnt
-						iJTvp51OggSLWpJPt3foT0afuug1xCl6zP0uySXDaSaAuE/s+nCG0xiZLEs0HTib
-						r3t9XXDIo2+gN4IULSn3XJIkXiR1L3BVu5M9UQIDAQABoz8wPTAcBgNVHREEFTAT
-						ghFzc28ub25lc291cmNlLmNvbTAdBgNVHQ4EFgQUBf9CwdAc1mBKZS6BJMndqkOQ
-						ccEwDQYJKoZIhvcNAQEFBQADggEBAHt0L5MxCaW+HF4r16kVr3GTAzjl/oQArntL
-						gK5rSvzn5vBGOYwRqoOqOyT0KIg5x95mssw8DIonSOZKkBERkFcKdjW77vfaKWMM
-						XbQyZQF9Udsf49yCac4/SEEDHqWVVB7uMngkx5FzU4dSwz+K7M9mlc1qpT0sYZc/
-						sMZlncHSACTa9ClqnABgSRK5VxYAaqLflKFLDwR2pBVBZzX4GQ6iMkRLpfKYakHY
-						90CPLNchMKTaFTDS0LQkkQ+PqzE2OTlf8ov8ppzVLVN5ZLemuX9i9GNzLOoeW6dr
-						XQgb23tk8eDNQABBWA7armXrmBXD1G1EQv6J+PqHowTqu2mI2qo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.onesource.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.onesource.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.onesource.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.onesource.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.onesource.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.onesource.com/Shibboleth.sso/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">9Star Research, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">9Star: Global Business Intelligence</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.onesource.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Lee</SurName>
-    <EmailAddress>mailto:simon@9starresearch.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Wells</SurName>
-    <EmailAddress>mailto:andrew_wells@onesource.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.pacificu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.pacificu.edu-idp-shibboleth.xml
deleted file mode 100644
index ea6259da..00000000
--- a/swamid-interfederations-2.0/sso.pacificu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://sso.pacificu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">pacificu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Pacific University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Pacific University's Identity Provider for production environments.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.pacificu.edu/legal-disclaimers/internet-privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="118" width="175" xml:lang="en">https://sso.pacificu.edu/logo.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>
-MIIDKzCCAhOgAwIBAgIUP7F3C0Cew/N7b1z2Pd6yhr7hr/UwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQc3NvLnBhY2lmaWN1LmVkdTAeFw0xMzEyMTYxNjEyNDFa
-Fw0zMzEyMTYxNjEyNDFaMBsxGTAXBgNVBAMTEHNzby5wYWNpZmljdS5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSSdfK8ZMpijnRX2riAMzk10yl
-I37/L94Mxc2r3V91Hvt5N2jLh6vugUha/UaMOibe6eQY267D7p81NYNg7a98GNhb
-vp3YI2h08fqsgtUnJx3mZFzeTp/rPk/rDu6X0CcsStWq1ecfAsaj6ylt2rnFVH8N
-TLe43ZC7C6OisxSIYcufIrI3yl++q/2I9elluCFlRurzyRbcnJfK7swRej4cnFAG
-l6/g/qzBnMJNwqLmqXXFkDV9nEJrMxiGHjnHZZx997I/8ZzDurJQGHjIgXDAVFCA
-QLV3l8MUcNePw23NMc/bGh7l6/Negf4Gugzvb7mbsQbNODoXEpTubh+VfWMdAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHNzby5wYWNpZmljdS5lZHWGJ2h0dHBzOi8vc3Nv
-LnBhY2lmaWN1LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU3vevDEryJzMi
-HQZKXiX1n8chCoIwDQYJKoZIhvcNAQEFBQADggEBAE6Oidx+dNVD4Nh5//RIeJo6
-zAjzurEJrjK762N1ni4QqBsPIMSpb8Ux9DUiVes+ld0iJDUlDgasNWS0pL4f6pXA
-zeLppydpYB31PQomzIOcPEBrupQz4OaCwZzTdND9XBFbSGkNNZsXTzNZmOgPuIQM
-0b17TTau32Op/JN6KGuNZXemm977V5UwHDMAr6t3VM4AMX692xN4/q3UUYjuUzBE
-ZmC7WJamw/WUg0AV+Z0oM9i99MQhQImUvFyCMumUABHkMACV3WGfuB+RaNOtZEFB
-+eMN5ZdK6JGDq7/xNBcEhmyV/NznXH52ymuyXDLkAamIbyYSDmz8CYZui1Bty1E=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.pacificu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.pacificu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.pacificu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.pacificu.edu/idp/profile/SAML2/POST-SimpleSign/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">pacificu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIUP7F3C0Cew/N7b1z2Pd6yhr7hr/UwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQc3NvLnBhY2lmaWN1LmVkdTAeFw0xMzEyMTYxNjEyNDFa
-Fw0zMzEyMTYxNjEyNDFaMBsxGTAXBgNVBAMTEHNzby5wYWNpZmljdS5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSSdfK8ZMpijnRX2riAMzk10yl
-I37/L94Mxc2r3V91Hvt5N2jLh6vugUha/UaMOibe6eQY267D7p81NYNg7a98GNhb
-vp3YI2h08fqsgtUnJx3mZFzeTp/rPk/rDu6X0CcsStWq1ecfAsaj6ylt2rnFVH8N
-TLe43ZC7C6OisxSIYcufIrI3yl++q/2I9elluCFlRurzyRbcnJfK7swRej4cnFAG
-l6/g/qzBnMJNwqLmqXXFkDV9nEJrMxiGHjnHZZx997I/8ZzDurJQGHjIgXDAVFCA
-QLV3l8MUcNePw23NMc/bGh7l6/Negf4Gugzvb7mbsQbNODoXEpTubh+VfWMdAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHNzby5wYWNpZmljdS5lZHWGJ2h0dHBzOi8vc3Nv
-LnBhY2lmaWN1LmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU3vevDEryJzMi
-HQZKXiX1n8chCoIwDQYJKoZIhvcNAQEFBQADggEBAE6Oidx+dNVD4Nh5//RIeJo6
-zAjzurEJrjK762N1ni4QqBsPIMSpb8Ux9DUiVes+ld0iJDUlDgasNWS0pL4f6pXA
-zeLppydpYB31PQomzIOcPEBrupQz4OaCwZzTdND9XBFbSGkNNZsXTzNZmOgPuIQM
-0b17TTau32Op/JN6KGuNZXemm977V5UwHDMAr6t3VM4AMX692xN4/q3UUYjuUzBE
-ZmC7WJamw/WUg0AV+Z0oM9i99MQhQImUvFyCMumUABHkMACV3WGfuB+RaNOtZEFB
-+eMN5ZdK6JGDq7/xNBcEhmyV/NznXH52ymuyXDLkAamIbyYSDmz8CYZui1Bty1E=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.pacificu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.pacificu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Pacific University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Pacific University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pacificu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brandon M. Browning</md:GivenName>
-    <md:EmailAddress>browning@pacificu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ted Krupicka</md:GivenName>
-    <md:EmailAddress>tedk@pacificu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Technology Information Center</md:GivenName>
-    <md:EmailAddress>help@pacificu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml
deleted file mode 100644
index 37d82b43..00000000
--- a/swamid-interfederations-2.0/sso.sandburg.edu-adfs-services-trust.xml
+++ /dev/null
@@ -1,95 +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://sso.sandburg.edu/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">sandburg.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Carl Sandburg College</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.sandburg.edu/about-us/incommon-pop</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.sandburg.edu/about-us/incommon-pop</mdui:PrivacyStatementURL>
-        <mdui:Logo height="41" width="150" xml:lang="en">https://www.sandburg.edu/incommon/InCommonLogo.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>
-MIIC3DCCAcSgAwIBAgIQPt0bxkiQr5BF6L3KT/y9lTANBgkqhkiG9w0BAQsFADAq
-MSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBzc28uc2FuZGJ1cmcuZWR1MB4XDTE0
-MDYwNjIwMzcxM1oXDTE3MDYwNTIwMzcxM1owKjEoMCYGA1UEAxMfQURGUyBTaWdu
-aW5nIC0gc3NvLnNhbmRidXJnLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMqW/mUmJjFhq3kAzDacG8Q4z3ecotCJfs+sR/bZIb+N974+5urIO5aS
-xNcFCeBMbzrWwtDBpemoVAtTorN1vBNSIHAgBhRuHs7mVrx0e8IOoQ1yrxEWR6CB
-kng3CTaaEodj2ZWkcWsJ8Pa8hhx+4rNPItkVW0KTdhgSNN7Bo+h5p2QUq22iiLv9
-CvNM0iEC1ZpXchoUtjFdXxK9RrD3QN9rq3IW9WE9VMOCtb3zUxaQyxa67P7y3uOb
-FnAf1Y4SL3O0vIBpf3ku7tmBwpaZgKip1WftSRBkd5iKknFpMmr6CRtvf2xjy7MY
-kQ8Y1PrEsxPFaA50IPbJNZJC7YtEqmUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-hRTR+0tt+vPT+iJ5ofhhdB02Jks0MUqWf8D77rRDUGyE9FbYSBpfyJQVh8cqvZK8
-LtmpKQEy/y7Tcyf3aT7dCIKkPo8aE66a9MCQu8OYi06U2afdzPbLWudh/ghoHtvM
-PV/4WPEVAWL7kxEB2GjmoOe/9PcrDsMrPYquUpOTWrdmIi5NH8D43Knn/I5g6SFD
-X4fEJaGeAhZjgOo/1x2hpavUnO7ypsTQOgkFbv2MDOeNhjkg0qggFlfintLAnhj8
-WO14ShXejUnH39hGHNJMTh81Pb45U4204XfQcGAt2amoD9VzMYNjyf0z/VbmsqML
-Pm/hEI8PBxwYY7bgY1iVzQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.sandburg.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.sandburg.edu/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandburg.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC3DCCAcSgAwIBAgIQPt0bxkiQr5BF6L3KT/y9lTANBgkqhkiG9w0BAQsFADAq
-MSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBzc28uc2FuZGJ1cmcuZWR1MB4XDTE0
-MDYwNjIwMzcxM1oXDTE3MDYwNTIwMzcxM1owKjEoMCYGA1UEAxMfQURGUyBTaWdu
-aW5nIC0gc3NvLnNhbmRidXJnLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMqW/mUmJjFhq3kAzDacG8Q4z3ecotCJfs+sR/bZIb+N974+5urIO5aS
-xNcFCeBMbzrWwtDBpemoVAtTorN1vBNSIHAgBhRuHs7mVrx0e8IOoQ1yrxEWR6CB
-kng3CTaaEodj2ZWkcWsJ8Pa8hhx+4rNPItkVW0KTdhgSNN7Bo+h5p2QUq22iiLv9
-CvNM0iEC1ZpXchoUtjFdXxK9RrD3QN9rq3IW9WE9VMOCtb3zUxaQyxa67P7y3uOb
-FnAf1Y4SL3O0vIBpf3ku7tmBwpaZgKip1WftSRBkd5iKknFpMmr6CRtvf2xjy7MY
-kQ8Y1PrEsxPFaA50IPbJNZJC7YtEqmUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-hRTR+0tt+vPT+iJ5ofhhdB02Jks0MUqWf8D77rRDUGyE9FbYSBpfyJQVh8cqvZK8
-LtmpKQEy/y7Tcyf3aT7dCIKkPo8aE66a9MCQu8OYi06U2afdzPbLWudh/ghoHtvM
-PV/4WPEVAWL7kxEB2GjmoOe/9PcrDsMrPYquUpOTWrdmIi5NH8D43Knn/I5g6SFD
-X4fEJaGeAhZjgOo/1x2hpavUnO7ypsTQOgkFbv2MDOeNhjkg0qggFlfintLAnhj8
-WO14ShXejUnH39hGHNJMTh81Pb45U4204XfQcGAt2amoD9VzMYNjyf0z/VbmsqML
-Pm/hEI8PBxwYY7bgY1iVzQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sandburg.edu/adfs/ls/"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Carl Sandburg College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Carl Sandburg College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sandburg.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Robert W. Stevens</md:GivenName>
-    <md:EmailAddress>rstevens@sandburg.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Robert W. Stevens</md:GivenName>
-    <md:EmailAddress>rstevens@sandburg.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Christy Pecsi</md:GivenName>
-    <md:EmailAddress>cpecsi@sandburg.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.saxion.nl-opensso.xml b/swamid-interfederations-2.0/sso.saxion.nl-opensso.xml
deleted file mode 100644
index 1f12cbb7..00000000
--- a/swamid-interfederations-2.0/sso.saxion.nl-opensso.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://sso.saxion.nl/opensso">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Saxion</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Saxion University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Saxion</mdui:Description>
-        <mdui:Description xml:lang="en">Saxion University of Applied Sciences</mdui:Description>
-        <mdui:Logo height="46" width="108">https://static.surfconext.nl/logos/idp/saxion.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Saxion University of Applied Sciences</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Saxion University of Applied Sciences</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/2b2c18e5b3bde6129f0e388ab85541c4"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Saxion</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Saxion University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Saxion</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Saxion University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://saxion.nl</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://saxion.edu</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/sso.sbg.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml
deleted file mode 100644
index fece70a6..00000000
--- a/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>
-    <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://www.geant.net/uri/dataprotection-code-of-conduct/v1</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">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 b099209e..00000000
--- a/swamid-interfederations-2.0/sso.siropglobal.org-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://sso.siropglobal.org/shibboleth">
-  <!--
-		This is a "SiROP platform (www.siropglobal.org)" Shibboleth SP for SiROP Association.
-	-->
-  <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="2015-04-20T07:47:41Z">
-      <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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sso.siropglobal.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://sso.siropglobal.org/Shibboleth.sso/Login" index="1"/>
-      <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">Students and researchers use SiROP to post and find internships, Master, Bachelor and PhD projects.</mdui:Description>
-        <mdui:Logo height="72" width="188">https://www.siropglobal.org/files/img/logo.gif</mdui:Logo>
-      </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>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sso.siropglobal.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <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"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SiROP Association</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiROP platform (www.siropglobal.org)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siropglobal.org/</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:it@siropglobal.org</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 0c5356b3..00000000
--- a/swamid-interfederations-2.0/sso.siropglobal.org.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://sso.siropglobal.org/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-12-18T14:48:17Z">
-      <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>
-MIIDKDCCAhCgAwIBAgIJAJWTpV8oESWTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Nzby5zaXJvcGdsb2JhbC5vcmcwHhcNMTExMTA4MTU1NDE0WhcNMTQxMTA3
-MTU1NDE0WjAeMRwwGgYDVQQDExNzc28uc2lyb3BnbG9iYWwub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArPs/gtSV28ZTUV8g20L6nE3DFkUH2UcW
-iKl3LRQT9m+e7ExNkGLJTm2NBa+fHsLGFZUWWswvGTwKNOsI/hAjUEevqXblhpbB
-TLvWFwthXO4KVLaFtodDDfPY3LMaj4nYf+/SnTEGKFUoXTVB+BUNZ9wZU853WbZa
-UVyV7kRMwQFP4uaPeIIwwjEV1bE+p+d7ya9yNIlJRhFFqyqr5Yllof3hChZqh8u7
-4FUS1qlUUxJMBSqJmcNsViTlexCHcgcjpj1Y9/tCzB4cF2Z4tZ3/oleERSdgGRiZ
-vIMEly+9dmLMELOeO7uXzt9iM+m86PhHilYmU2Dzq9QcRbRk5IkqvwIDAQABo2kw
-ZzBGBgNVHREEPzA9ghNzc28uc2lyb3BnbG9iYWwub3JnhiZodHRwczovL3Nzby5z
-aXJvcGdsb2JhbC5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhWvrjYWWW1NKLpSe
-I7Sk2ipB0yAwDQYJKoZIhvcNAQEFBQADggEBAGe5Qh3X+fQvQd8EPYP94b+XSfBJ
-tbvHyi6gBUkBMmnafb5Hzjh0901/Vb8AnKt2Ix4fpqreyIIPHI+03XaZBC8qETtN
-XIQEqHPpuTLZn+GcuF0M/twQHq1Gtn+XBC9wVlHsEw5LhI9ZsxauDQVXOvHJkSCF
-xoE4PKbmRhdC/yEleLcHkqJRZm2ghvQq8cXkz1y+dlWmNFbHxbwGVUyiXPKH9VXm
-7uHDTq8TquEldY5/NB0w+wk5fkizj0c5xV391YjOhbIHKJ27cZ12+/7iyjJJ0shj
-DP4gOoktkZlkyPT0AUi/samZ1GKtYrOGd9Z1/7fLlYYeFyA1QdFbBX5qxPM=
-						</ds:X509Certificate>
-        </ds: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="en">SWITCH</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">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.sunderland.ac.uk-auth-metadata.xml b/swamid-interfederations-2.0/sso.sunderland.ac.uk-auth-metadata.xml
deleted file mode 100644
index ac2afc4b..00000000
--- a/swamid-interfederations-2.0/sso.sunderland.ac.uk-auth-metadata.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="http://sso.sunderland.ac.uk/auth/metadata">
-  <!--
-		This is an OpenAthens LA IdP for the University of Sunderland.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">sunderland.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVjCCAj6gAwIBAgIILQ5N0azZci0wDQYJKoZIhvcNAQEFBQAwQjEhMB8GA1UE
-						CgwYVW5pdmVyc2l0eSBvZiBTdW5kZXJsYW5kMR0wGwYDVQQDDBRzc28uc3VuZGVy
-						bGFuZC5hYy51azAeFw0xNDA2MTcwNzQ0NDJaFw0yNDA2MTcwNzQ0NDJaMEIxITAf
-						BgNVBAoMGFVuaXZlcnNpdHkgb2YgU3VuZGVybGFuZDEdMBsGA1UEAwwUc3NvLnN1
-						bmRlcmxhbmQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDR
-						+uVqAlnBPfii2qWCgu96Pvd+68pdoAH7WgsFtfn1zdyQK9X+WT7CT4RzNXQ/nEi1
-						n6r5D+xE57dknzCj/cgI465605GmckfcsyQbI4d4tJUMwIS6DKTr5YBV4wSOWXl1
-						+Ksws+ew7V/GOAh9EJIOiijq3E/e8R+O+pgH0Rvmpugyi+Nj3afppkSsIbLO0apL
-						94Cy1dIqxqQejrZnL8pMbdpELq9W8sDMTWsGjvLoRj2q3QYUN7217sf/pD4+5Noy
-						sVDEuE4UKZJfuXAAwL73JZmUjraGGqBFJj6Xt8ymTNrCCQO0MA7uuFC/sE+CIDeR
-						L9w/ofKvcmq2SZdb2mGHAgMBAAGjUDBOMB0GA1UdDgQWBBSYfGXJCjojjLJ4r4gr
-						SSL9uGflzDAfBgNVHSMEGDAWgBSYfGXJCjojjLJ4r4grSSL9uGflzDAMBgNVHRME
-						BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfRpGz0INl+VKylH9UTb1+GmyEIzlX
-						RpWjTgKDGW2hvK07fH3ABGa28XUX3yVah1vXzOmfvQ9/f7l2tA5OaJzWHCXijANN
-						nkcCKJZSB2AFSkdL+jpXWbrVClomKIJfFLN1CzPvPJ3Ls9P/Xm0AZGFTZF3fM6ZH
-						WoaJAKOIUzfARiIRBoIf6y8EEpa3ZdcgPlRwAlHtKMxnUHrdomtBdDSz8WNqHPVF
-						UF4nDkcqtwcThIfvtOrNtEG0rwb9ENXL1VNiP1cJZHqyttTQY+vC8quwhnsGeJzk
-						aQg21GPVp0vGTWHkB+0uti2fwkky/onzGlsYr8IfXu0Yw3tBwQy8kHn+                        
-					</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>
-						MIIDVjCCAj6gAwIBAgIILQ5N0azZci0wDQYJKoZIhvcNAQEFBQAwQjEhMB8GA1UE
-						CgwYVW5pdmVyc2l0eSBvZiBTdW5kZXJsYW5kMR0wGwYDVQQDDBRzc28uc3VuZGVy
-						bGFuZC5hYy51azAeFw0xNDA2MTcwNzQ0NDJaFw0yNDA2MTcwNzQ0NDJaMEIxITAf
-						BgNVBAoMGFVuaXZlcnNpdHkgb2YgU3VuZGVybGFuZDEdMBsGA1UEAwwUc3NvLnN1
-						bmRlcmxhbmQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDR
-						+uVqAlnBPfii2qWCgu96Pvd+68pdoAH7WgsFtfn1zdyQK9X+WT7CT4RzNXQ/nEi1
-						n6r5D+xE57dknzCj/cgI465605GmckfcsyQbI4d4tJUMwIS6DKTr5YBV4wSOWXl1
-						+Ksws+ew7V/GOAh9EJIOiijq3E/e8R+O+pgH0Rvmpugyi+Nj3afppkSsIbLO0apL
-						94Cy1dIqxqQejrZnL8pMbdpELq9W8sDMTWsGjvLoRj2q3QYUN7217sf/pD4+5Noy
-						sVDEuE4UKZJfuXAAwL73JZmUjraGGqBFJj6Xt8ymTNrCCQO0MA7uuFC/sE+CIDeR
-						L9w/ofKvcmq2SZdb2mGHAgMBAAGjUDBOMB0GA1UdDgQWBBSYfGXJCjojjLJ4r4gr
-						SSL9uGflzDAfBgNVHSMEGDAWgBSYfGXJCjojjLJ4r4grSSL9uGflzDAMBgNVHRME
-						BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAfRpGz0INl+VKylH9UTb1+GmyEIzlX
-						RpWjTgKDGW2hvK07fH3ABGa28XUX3yVah1vXzOmfvQ9/f7l2tA5OaJzWHCXijANN
-						nkcCKJZSB2AFSkdL+jpXWbrVClomKIJfFLN1CzPvPJ3Ls9P/Xm0AZGFTZF3fM6ZH
-						WoaJAKOIUzfARiIRBoIf6y8EEpa3ZdcgPlRwAlHtKMxnUHrdomtBdDSz8WNqHPVF
-						UF4nDkcqtwcThIfvtOrNtEG0rwb9ENXL1VNiP1cJZHqyttTQY+vC8quwhnsGeJzk
-						aQg21GPVp0vGTWHkB+0uti2fwkky/onzGlsYr8IfXu0Yw3tBwQy8kHn+                        
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.sunderland.ac.uk/auth/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.sunderland.ac.uk/auth/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Sunderland</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Sunderland</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sunderland.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Lundell</SurName>
-    <EmailAddress>mailto:ian.lundell@sunderland.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Rachel</GivenName>
-    <SurName>Webb</SurName>
-    <EmailAddress>mailto:rachel.webb@sunderland.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Laura</GivenName>
-    <SurName>Wilkinson</SurName>
-    <EmailAddress>mailto:laura.wilkinson@sunderland.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Frost</SurName>
-    <EmailAddress>mailto:ian.frost@sunderland.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott</GivenName>
-    <SurName>Sweeting</SurName>
-    <EmailAddress>mailto:scott.sweeting@sunderland.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dean</GivenName>
-    <SurName>Hale</SurName>
-    <EmailAddress>mailto:dean.hale@sunderland.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adil</GivenName>
-    <SurName>Khan</SurName>
-    <EmailAddress>mailto:adil.khan@sunderland.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Daniel</GivenName>
-    <SurName>Dixon</SurName>
-    <EmailAddress>mailto:daniel.dixon@sunderland.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Frost</SurName>
-    <EmailAddress>mailto:ian.frost@sunderland.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 00a2d0a6..00000000
--- a/swamid-interfederations-2.0/sso.surfsara.nl-saml-saml2-idp-metadata.php.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://sso.surfsara.nl/saml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-14T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">sara.nl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">surfsara.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">SURFsara</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SURFsara</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">SURFsara (test)</mdui:Description>
-        <mdui:Description xml:lang="en">SURFsara (test)</mdui:Description>
-        <mdui:Logo height="77" width="204">https://static.surfconext.nl/logos/idp/SURFsara.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">computing center surfsara</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">rekencentrum surfsara</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/2e25879eaa8c4047b72ef7cc3b1f5662"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">SURFsara</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SURFsara</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">SURFsara</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SURFsara</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">https://surfsara.nl/nl</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://surfsara.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/sso.tugraz.at-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
deleted file mode 100644
index 865c3ec0..00000000
--- a/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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 width="200" height="77">https://bigmail.tugraz.at/source/images/logo_head.gif</mdui:Logo>
-        <mdui:Logo width="16" height="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: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: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.uah.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.uah.edu-idp-shibboleth.xml
deleted file mode 100644
index ad0ac1f7..00000000
--- a/swamid-interfederations-2.0/sso.uah.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://sso.uah.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uah.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Alabama in Huntsville</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Alabama in Huntsville</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://uah.edusupportcenter.com/sims/helpcenter/layoutSix/SelfhelpArticleView.seam?source=Selfhelp&amp;amp;parature_id=8572-8231-5478&amp;amp;inst_name=uah&amp;amp;cid=16749</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.uah.edu/oit/policies/computer-use</mdui:PrivacyStatementURL>
-        <mdui:Logo height="48" width="120" xml:lang="en">https://sso.uah.edu/cas/images/UAH_4c_blue_small.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>
-MIIDGDCCAgCgAwIBAgIVAIi9i4vXOYWFrAIWOwFcSA6H38ANMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC3Nzby51YWguZWR1MB4XDTEzMDQyNTIwNTEwMloXDTMz
-MDQyNTIwNTEwMlowFjEUMBIGA1UEAxMLc3NvLnVhaC5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCjB9njLDs75zuxZkase3vquRjujMbQ37D4md16
-3miA88AGPR/hZ+J1Jfuc9uozGHJmO8++w7rpWEzSjKlIm7w9HX0uz/yhrLdLGDYK
-aQqcljr1qDqmKB4W2uSvWj0Jd4wR+AMkJAwGpgdm0/PcgjNqfu8+cFg+kGmej9bO
-Ht8NyzdhOGWbEhjGYLtQ9bYf1qZc8xoL+oAE1mCZ5O6ffO/P807hmF6c8jnCK8c2
-VQ5YHHV5Wzv2J63lNDbSzrbRFiLO8/mXZtDqTLgs0ZPSGaUjOagIjcv5E2hPB2AV
-xZ0z2sd9uqMOdkQXMQWfEXeeT+djIxlozqO+j3QkOJx5uJA9AgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC3Nzby51YWguZWR1hiJodHRwczovL3Nzby51YWguZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTr1s8Z0jpuey7jYP14ICmRs17xuzANBgkqhkiG
-9w0BAQUFAAOCAQEAljsJKhHYgBfOiuqCWFKtiI6B1hMR+O+WYPIU7FKZJZrhahX7
-i6zfk/p2LMpMKDvHX61w4rS493MJ8p2iJMaYWr7MI42vhkuzm1gHquH0FAydMvOu
-DG57qCLosevGU8c/3yGXqDbLiXf5aqMerP1j/7WgS+v+BuLvQmwutXD2+jAlWxNS
-MLt/DOZ9iEoSSQ6OQPcrTF4wUGG7Ni4xEOT7Jm5ahUo3t4IuCaD0U8PwlLC2PS3c
-KJVYNsyf9Jo0eapWbBe5PJmeu3ZwiOVuDkk0PYn6Y2bu7XDYeyYaK0/zKD1erhoQ
-zGnfCmQ4c7IwxqAs5KghmtZqrZRjTWvX7Da3wQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.uah.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.uah.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.uah.edu/cas/logout.jsp"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.uah.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.uah.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.uah.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uah.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAIi9i4vXOYWFrAIWOwFcSA6H38ANMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC3Nzby51YWguZWR1MB4XDTEzMDQyNTIwNTEwMloXDTMz
-MDQyNTIwNTEwMlowFjEUMBIGA1UEAxMLc3NvLnVhaC5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCjB9njLDs75zuxZkase3vquRjujMbQ37D4md16
-3miA88AGPR/hZ+J1Jfuc9uozGHJmO8++w7rpWEzSjKlIm7w9HX0uz/yhrLdLGDYK
-aQqcljr1qDqmKB4W2uSvWj0Jd4wR+AMkJAwGpgdm0/PcgjNqfu8+cFg+kGmej9bO
-Ht8NyzdhOGWbEhjGYLtQ9bYf1qZc8xoL+oAE1mCZ5O6ffO/P807hmF6c8jnCK8c2
-VQ5YHHV5Wzv2J63lNDbSzrbRFiLO8/mXZtDqTLgs0ZPSGaUjOagIjcv5E2hPB2AV
-xZ0z2sd9uqMOdkQXMQWfEXeeT+djIxlozqO+j3QkOJx5uJA9AgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC3Nzby51YWguZWR1hiJodHRwczovL3Nzby51YWguZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTr1s8Z0jpuey7jYP14ICmRs17xuzANBgkqhkiG
-9w0BAQUFAAOCAQEAljsJKhHYgBfOiuqCWFKtiI6B1hMR+O+WYPIU7FKZJZrhahX7
-i6zfk/p2LMpMKDvHX61w4rS493MJ8p2iJMaYWr7MI42vhkuzm1gHquH0FAydMvOu
-DG57qCLosevGU8c/3yGXqDbLiXf5aqMerP1j/7WgS+v+BuLvQmwutXD2+jAlWxNS
-MLt/DOZ9iEoSSQ6OQPcrTF4wUGG7Ni4xEOT7Jm5ahUo3t4IuCaD0U8PwlLC2PS3c
-KJVYNsyf9Jo0eapWbBe5PJmeu3ZwiOVuDkk0PYn6Y2bu7XDYeyYaK0/zKD1erhoQ
-zGnfCmQ4c7IwxqAs5KghmtZqrZRjTWvX7Da3wQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.uah.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Alabama in Huntsville</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Alabama in Huntsville</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uah.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>William Eubank</md:GivenName>
-    <md:EmailAddress>william.eubank@uah.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jill Casey</md:GivenName>
-    <md:EmailAddress>jill.casey@uah.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>CISO</md:GivenName>
-    <md:EmailAddress>ciso@uah.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.ucd.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.ucd.ie-idp-shibboleth.xml
deleted file mode 100644
index d1c6b873..00000000
--- a/swamid-interfederations-2.0/sso.ucd.ie-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://sso.ucd.ie/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-09-30T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.edugate.ie/welcome-edugate-federation/membership</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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucd.ie</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University College Dublin</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="ga">An Coláiste Ollscoile, Baile Átha Cliath</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ucd.ie/itservices/itsupport</mdui:InformationURL>
-        <mdui:Logo height="104" width="147">https://edugate.heanet.ie/rr3/logos/ucd.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:53.306364866424765,-6.222467422485352</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:53.29502908341082,-6.182220992006933</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>2012</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEMzCCAxugAwIBAgIJAM5MWQ/fDunbMA0GCSqGSIb3DQEBBQUAMG4xCzAJBgNV
-BAYTAklFMREwDwYDVQQIEwhMZWluc3RlcjEPMA0GA1UEBxMGRHVibGluMSIwIAYD
-VQQKExlVbml2ZXJzaXR5IENvbGxlZ2UgRHVibGluMRcwFQYDVQQDEw5zc29nYXRl
-LnVjZC5pZTAeFw0xMjAxMTIxMTAwMjVaFw0xNTAxMTExMTAwMjVaMG4xCzAJBgNV
-BAYTAklFMREwDwYDVQQIEwhMZWluc3RlcjEPMA0GA1UEBxMGRHVibGluMSIwIAYD
-VQQKExlVbml2ZXJzaXR5IENvbGxlZ2UgRHVibGluMRcwFQYDVQQDEw5zc29nYXRl
-LnVjZC5pZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALTw4E6uRjKV
-yLmAeYt9bX3ZOSCTHmVdBTRA7L+ApdOmE6E5z0VFfUNgYlmRc4bTQGrLm4TbofYa
-F2bTAm4LVcKXyis5nM4svpvQcxLzQouVcMqoGFS4tHD6HR+9054RbjYN5XOjVEou
-8LHgQrxctBcCu65j2cfgd5yBGldygtfJOjZiqqXZC0YlvR2xPUKLb9NmFy+wALmP
-r3gc8QWvo7k350wMOlixDfTGKur1j2i4Os0n5xSjcpnqP/1f/XHRvJAXGUt14Eeq
-YlmBJ69JZvpe9effhZADwVZ+RTwveR7mEZi1SNPz39oXbvK8r5ab1AROxWeT60AA
-CONuevSoppMCAwEAAaOB0zCB0DAdBgNVHQ4EFgQU6LIldX7ohZZqT9tXUgllWBZV
-E6AwgaAGA1UdIwSBmDCBlYAU6LIldX7ohZZqT9tXUgllWBZVE6ChcqRwMG4xCzAJ
-BgNVBAYTAklFMREwDwYDVQQIEwhMZWluc3RlcjEPMA0GA1UEBxMGRHVibGluMSIw
-IAYDVQQKExlVbml2ZXJzaXR5IENvbGxlZ2UgRHVibGluMRcwFQYDVQQDEw5zc29n
-YXRlLnVjZC5pZYIJAM5MWQ/fDunbMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
-BQADggEBADmglqTzczlgHLrzPi1oyYSY2vJZpTtL9XFLCcI83k7ldG29rBBhOdCE
-/1qZZDU8GZuipbNYZZqdQ8RHIvmFOqE7cUKUAskTxYw1ozjlHgWVGNsjDwp5XqwX
-V1vZ7OddjHEFu2zp8ecYO+IkRzBtyjmZkOfcLlkzLaOddZCfEfHGGLnPzi0uukav
-c9eEKOhABqiFjIuQURa59ozuqDbc1w8pK3eAyEo130EM+IojHrF7OYS3l7KNGKNN
-3mWf6dsR9Ww+tgRNHFkiTIGMAGjiuAXX49xaOX2jM92/xGTtF7JkD31pVydBjak7
-VSL28NVgP4Y86cRFlrmaqRPYl+MqChs=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC+DCCAeACCQD+AjICuJh2gzANBgkqhkiG9w0BAQsFADA+MQswCQYDVQQGEwJJ
-RTEQMA4GA1UECAwHSXJlbGFuZDEPMA0GA1UEBwwGRHVibGluMQwwCgYDVQQKDANV
-Q0QwHhcNMTYwMjE1MTExMjE3WhcNMjYwMjEyMTExMjE3WjA+MQswCQYDVQQGEwJJ
-RTEQMA4GA1UECAwHSXJlbGFuZDEPMA0GA1UEBwwGRHVibGluMQwwCgYDVQQKDANV
-Q0QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC08OBOrkYylci5gHmL
-fW192Tkgkx5lXQU0QOy/gKXTphOhOc9FRX1DYGJZkXOG00Bqy5uE26H2Ghdm0wJu
-C1XCl8orOZzOLL6b0HMS80KLlXDKqBhUuLRw+h0fvdOeEW42DeVzo1RKLvCx4EK8
-XLQXAruuY9nH4HecgRpXcoLXyTo2Yqql2QtGJb0dsT1Ci2/TZhcvsAC5j694HPEF
-r6O5N+dMDDpYsQ30xirq9Y9ouDrNJ+cUo3KZ6j/9X/1x0byQFxlLdeBHqmJZgSev
-SWb6XvXn34WQA8FWfkU8L3ke5hGYtUjT89/aF27yvK+Wm9QETsVnk+tAAAjjbnr0
-qKaTAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAGh7JsqYfySxkxZ4iSscg4mAq/Wj
-MF9dYkNZ2So1/YuUtrPM1vgm8nNkmtoJBGI6/GxCD9Oqjrdh08UST6fnQatfcLe+
-PEjHQYQ1teVBBO8Sez2rVVe1tdcdAwDngxGj5uSJNDlkjkztypYesk3UJabw9GT5
-TNXg6MfYFVyDcyGOR9p9biTLUd0q2/eVgSCmGf0F1PBNvjYj4qKCM4U5iMbIHxP4
-dZLQjBeaUZu/K6BgFtApplISVVRdF53Cw2Z0Sf5UoG0IzQg6bCVzOH1Oz2j0PKMT
-Nu9boPs/fyjVT6B3qX0Od2Nk+/FEk2dWrZXlsMarvhoNxzFb5NNpVKsgKzY=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ucd.ie/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ucd.ie/idp/profile/SAML2/POST/SLO"/>
-    <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:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.ucd.ie/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.ucd.ie/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.ucd.ie/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.ucd.ie/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University College Dublin</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University College Dublin</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucd.ie/itservices/itsupport</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UCD</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:ucdssoalert@ucd.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UCD</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:ucdssoalert@ucd.ie</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David</md:GivenName>
-    <md:SurName>Coughlan</md:SurName>
-    <md:EmailAddress>mailto:david.coughlan@ucd.ie</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.umk.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.umk.pl-idp-shibboleth.xml
deleted file mode 100644
index efb1e13e..00000000
--- a/swamid-interfederations-2.0/sso.umk.pl-idp-shibboleth.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.umk.pl/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2015-03-12T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</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://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">umk.pl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stud.umk.pl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">doktorant.umk.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Nicolaus Copernicus University in Torun</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Nicolaus Copernicus University Identity Provider</mdui:Description>
-        <mdui:Description xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</mdui:Description>
-        <mdui:Logo height="148" width="320" xml:lang="pl">https://sso.umk.pl/idp/images/logo-umk.png</mdui:Logo>
-        <mdui:Logo height="148" width="320" xml:lang="en">https://sso.umk.pl/idp/images/logo-umk-en.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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAPR3G60XyyVMaO42PwDaBIGiNSg5MA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCnNzby51bWsucGwwHhcNMTUwMzExMDc0NjQwWhcNMzUw
-MzExMDc0NjQwWjAVMRMwEQYDVQQDDApzc28udW1rLnBsMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtHSr3UiMaTkO2p2Npn35RugViLr/SGy9+rOffm4c
-uSSxIXCK+nGvCdnNPsOTWlq4cqe1f5ZiaTvMLRshWo7Ynh1PACNv2xCVcCLpulY9
-V6NVpQbEp3MCgVFxtwFepB2VlgVFdq96LOqLyjn5/d266VG2kfdVBU51B9LWR2ut
-53FC3nh5bjrTrcrWMRnJEJpLBoz6CpYEOqdsCFXBgrdPvVEagCVEa4a7E+bmSr8C
-ZHXY9CzQl2kssVEhepcGr4KCjeIoO5w5AymhFhaxiWT+F3CEYWAQGEhH17q8tVDW
-U5c1E/fUecVrfgibx0iamDbFPMUP1g1jC5ccTvQckRylYwIDAQABo1swWTAdBgNV
-HQ4EFgQUhJhRbaDNSqz7iDflqsdmtyMXnuUwOAYDVR0RBDEwL4IKc3NvLnVtay5w
-bIYhaHR0cHM6Ly9zc28udW1rLnBsL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCo0uqptKKYfBYFIXe9zq67CVFHG5tazGF9ZZ+rPujWA08x2fUj+t0w
-k6pAi8L/9DAHZrjbC3uRKzKDpZMmNNianPqhWBWgt9ETo+mKM4Z8ygTyiTxEZImR
-dPe9MCWzxsbsOyfrm4XFAbrrqO3bzwRfJitNGr9VBSeL79sXYbcNdJci7PqPO755
-d9x+Jpzyp/5Bk0n0jRUkjNvDgS6wj4JP2ozrFxK47OYKiEzUOZCC2yXeDf/Ig2cK
-I7GPEGabHbXwpIbRZHH2yOI4MYgOTftE4Uj53xuNvJ33Fe5zlXDg2hwxiX7amo5h
-qL72eT24RW2Lv9WyljSYKwyKJkEzwucO
-                        </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>
-MIIDEzCCAfugAwIBAgIUWIZMrGT9/FIBX0hdLCptqQJ1RiswDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKc3NvLnVtay5wbDAeFw0xNTAzMTEwNzQ2MzlaFw0zNTAz
-MTEwNzQ2MzlaMBUxEzARBgNVBAMMCnNzby51bWsucGwwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCM77rj2mEHZ76eEbZJdTtOMXRjIbNu79aVoFtqMZxr
-PD3IA0r0SJcWbr2nIO3Z+Ci33Xs2cB/phGoU2OYSFeUOp0F/tfAPIgUy4YAhFQkp
-tLLRxc1PFzmLEDFHcQqXIHoqfLPfjir8AEzHbptqTitaw0kIgJC+xDiUfGRR1zI4
-lYBbpISySsD7gTaflA+e8U4ifqrbgITJSYYOaE3q7K2Zyu6ZMfsPZxoRTld7BOvG
-fvgDgzBSa7qZjPbCi93znU0NEzqsUM9g6Jd3yu/E8hUo7KaO9JTiX6xVAHUGIMN8
-IzuCsEhKQJhMLhUuENc4TDqn3f7FGGI6zSqSfjGg5r6RAgMBAAGjWzBZMB0GA1Ud
-DgQWBBTFekUTwFQOd5jKK1hWAYQ41dIu5DA4BgNVHREEMTAvggpzc28udW1rLnBs
-hiFodHRwczovL3Nzby51bWsucGwvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBACzrnxEim4WedVtXG4vq5lKI5Cufzy2r/ovnjvOEMVHrt9lugYRT+8Hx
-NUXJry0AufhEZELXh53/mvqx1l17ei62zd3cucp81FNlalv/rKDX4y1jSgFcyLwW
-4LhVfVTdZ3PCfjvPajGbfuJvd28FegcB0dgnk3J1GQcsWZcbzd8XepZzFDdEgyBP
-Au7I/pBdX7RsgM/LoOen/aw6Uj+LPoWy6RwL563KH7NhJF+KeB00yQIxVN0k+f3D
-TAbD2blb/PZi/TcO/MHmmPJMutH4X5Inc1kqhjR5w3aPaBNjYjsA6alHizFxtmV1
-TNQf6/ZTV5LWHf9ohPRNsqTx690Na8c=
-                        </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>
-MIIDEzCCAfugAwIBAgIUdaR0NptdV+hiD4OR814FPAcQA04wDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKc3NvLnVtay5wbDAeFw0xNTAzMTEwNzQ2MzlaFw0zNTAz
-MTEwNzQ2MzlaMBUxEzARBgNVBAMMCnNzby51bWsucGwwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCAWMta6pyz2LUqSNNy4Iwawaq1AIXlthNlL21N9Qdd
-bkKusnvs1nFcqyKwUfoEgsE8B71ksbpO7dPtc52Jicvgct4AdxwMnBZjlrTig333
-MS2/6GBeMVk9nuifGLYAIvN1WXU3HKbeEG0O4J5gIYnfJg5Y0VBmxhJ6rcj8FRSq
-efNoa+9jluJlOolojHjvaMDjHdCNObC60FqznQFCjU0eXz7rtIHNSXtQ32diKDSq
-kkZubRcPPaGt41+hZBRwh5WgF7uCDolXqwepfV1a1tuO+8j6cPVrh6gPak+LV/1H
-HTelsAuRJmAJtcaEqL3kKAYZ/lucLUiXjay6wqYubWyhAgMBAAGjWzBZMB0GA1Ud
-DgQWBBT30TJGl+6C1JFvCfKpt7p7P4Sf2DA4BgNVHREEMTAvggpzc28udW1rLnBs
-hiFodHRwczovL3Nzby51bWsucGwvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAH8EZ03cicN/hZAYNRTeoIaMyzpYdT4ZT54feph9Bs7puNcHRawBf1Tb
-8uS8liRbztVEX8//XwrdX6B6yTvHgoMNlw4t4MgCOBA2Yu1euNlr0GbJI5Xvz4tR
-r/V/if2xtYTvBW91N/j3zOAvIPQScF8tjLSnFN8kAE2iz/VtU7euR7a+s5f9cskG
-yBy/DCDjRpHD8Bb6k7s2VfpXLwf7QqqJjNDBPxIG1CxH/l+8FG1ChIFPt26YSqHx
-48/XpTdlAhk7g/zGBonRl6fVH+KNxAED6Jxv5oSyYKn6/pYYeUm303r0NOERzY4g
-5aEMEFYvVdebuDfvZkViQQnpWhUUBlw=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.umk.pl:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.umk.pl/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.umk.pl/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.umk.pl/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.umk.pl:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <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://sso.umk.pl/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.umk.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.umk.pl/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umk.pl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stud.umk.pl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">doktorant.umk.pl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Nicolaus Copernicus University in Torun</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Nicolaus Copernicus University Identity Provider</mdui:Description>
-        <mdui:Description xml:lang="pl">Uniwersytet Mikołaja Kopernika w Toruniu</mdui:Description>
-        <mdui:Logo height="148" width="320" xml:lang="pl">https://sso.umk.pl/idp/images/logo_umk70.png</mdui:Logo>
-        <mdui:Logo height="148" width="320" xml:lang="en">https://sso.umk.pl/idp/images/logo_umk_en70.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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIVAPR3G60XyyVMaO42PwDaBIGiNSg5MA0GCSqGSIb3DQEB
-CwUAMBUxEzARBgNVBAMMCnNzby51bWsucGwwHhcNMTUwMzExMDc0NjQwWhcNMzUw
-MzExMDc0NjQwWjAVMRMwEQYDVQQDDApzc28udW1rLnBsMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtHSr3UiMaTkO2p2Npn35RugViLr/SGy9+rOffm4c
-uSSxIXCK+nGvCdnNPsOTWlq4cqe1f5ZiaTvMLRshWo7Ynh1PACNv2xCVcCLpulY9
-V6NVpQbEp3MCgVFxtwFepB2VlgVFdq96LOqLyjn5/d266VG2kfdVBU51B9LWR2ut
-53FC3nh5bjrTrcrWMRnJEJpLBoz6CpYEOqdsCFXBgrdPvVEagCVEa4a7E+bmSr8C
-ZHXY9CzQl2kssVEhepcGr4KCjeIoO5w5AymhFhaxiWT+F3CEYWAQGEhH17q8tVDW
-U5c1E/fUecVrfgibx0iamDbFPMUP1g1jC5ccTvQckRylYwIDAQABo1swWTAdBgNV
-HQ4EFgQUhJhRbaDNSqz7iDflqsdmtyMXnuUwOAYDVR0RBDEwL4IKc3NvLnVtay5w
-bIYhaHR0cHM6Ly9zc28udW1rLnBsL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCo0uqptKKYfBYFIXe9zq67CVFHG5tazGF9ZZ+rPujWA08x2fUj+t0w
-k6pAi8L/9DAHZrjbC3uRKzKDpZMmNNianPqhWBWgt9ETo+mKM4Z8ygTyiTxEZImR
-dPe9MCWzxsbsOyfrm4XFAbrrqO3bzwRfJitNGr9VBSeL79sXYbcNdJci7PqPO755
-d9x+Jpzyp/5Bk0n0jRUkjNvDgS6wj4JP2ozrFxK47OYKiEzUOZCC2yXeDf/Ig2cK
-I7GPEGabHbXwpIbRZHH2yOI4MYgOTftE4Uj53xuNvJ33Fe5zlXDg2hwxiX7amo5h
-qL72eT24RW2Lv9WyljSYKwyKJkEzwucO
-                        </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>
-MIIDEzCCAfugAwIBAgIUWIZMrGT9/FIBX0hdLCptqQJ1RiswDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKc3NvLnVtay5wbDAeFw0xNTAzMTEwNzQ2MzlaFw0zNTAz
-MTEwNzQ2MzlaMBUxEzARBgNVBAMMCnNzby51bWsucGwwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCM77rj2mEHZ76eEbZJdTtOMXRjIbNu79aVoFtqMZxr
-PD3IA0r0SJcWbr2nIO3Z+Ci33Xs2cB/phGoU2OYSFeUOp0F/tfAPIgUy4YAhFQkp
-tLLRxc1PFzmLEDFHcQqXIHoqfLPfjir8AEzHbptqTitaw0kIgJC+xDiUfGRR1zI4
-lYBbpISySsD7gTaflA+e8U4ifqrbgITJSYYOaE3q7K2Zyu6ZMfsPZxoRTld7BOvG
-fvgDgzBSa7qZjPbCi93znU0NEzqsUM9g6Jd3yu/E8hUo7KaO9JTiX6xVAHUGIMN8
-IzuCsEhKQJhMLhUuENc4TDqn3f7FGGI6zSqSfjGg5r6RAgMBAAGjWzBZMB0GA1Ud
-DgQWBBTFekUTwFQOd5jKK1hWAYQ41dIu5DA4BgNVHREEMTAvggpzc28udW1rLnBs
-hiFodHRwczovL3Nzby51bWsucGwvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBACzrnxEim4WedVtXG4vq5lKI5Cufzy2r/ovnjvOEMVHrt9lugYRT+8Hx
-NUXJry0AufhEZELXh53/mvqx1l17ei62zd3cucp81FNlalv/rKDX4y1jSgFcyLwW
-4LhVfVTdZ3PCfjvPajGbfuJvd28FegcB0dgnk3J1GQcsWZcbzd8XepZzFDdEgyBP
-Au7I/pBdX7RsgM/LoOen/aw6Uj+LPoWy6RwL563KH7NhJF+KeB00yQIxVN0k+f3D
-TAbD2blb/PZi/TcO/MHmmPJMutH4X5Inc1kqhjR5w3aPaBNjYjsA6alHizFxtmV1
-TNQf6/ZTV5LWHf9ohPRNsqTx690Na8c=
-                        </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>
-MIIDEzCCAfugAwIBAgIUdaR0NptdV+hiD4OR814FPAcQA04wDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKc3NvLnVtay5wbDAeFw0xNTAzMTEwNzQ2MzlaFw0zNTAz
-MTEwNzQ2MzlaMBUxEzARBgNVBAMMCnNzby51bWsucGwwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCAWMta6pyz2LUqSNNy4Iwawaq1AIXlthNlL21N9Qdd
-bkKusnvs1nFcqyKwUfoEgsE8B71ksbpO7dPtc52Jicvgct4AdxwMnBZjlrTig333
-MS2/6GBeMVk9nuifGLYAIvN1WXU3HKbeEG0O4J5gIYnfJg5Y0VBmxhJ6rcj8FRSq
-efNoa+9jluJlOolojHjvaMDjHdCNObC60FqznQFCjU0eXz7rtIHNSXtQ32diKDSq
-kkZubRcPPaGt41+hZBRwh5WgF7uCDolXqwepfV1a1tuO+8j6cPVrh6gPak+LV/1H
-HTelsAuRJmAJtcaEqL3kKAYZ/lucLUiXjay6wqYubWyhAgMBAAGjWzBZMB0GA1Ud
-DgQWBBT30TJGl+6C1JFvCfKpt7p7P4Sf2DA4BgNVHREEMTAvggpzc28udW1rLnBs
-hiFodHRwczovL3Nzby51bWsucGwvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAH8EZ03cicN/hZAYNRTeoIaMyzpYdT4ZT54feph9Bs7puNcHRawBf1Tb
-8uS8liRbztVEX8//XwrdX6B6yTvHgoMNlw4t4MgCOBA2Yu1euNlr0GbJI5Xvz4tR
-r/V/if2xtYTvBW91N/j3zOAvIPQScF8tjLSnFN8kAE2iz/VtU7euR7a+s5f9cskG
-yBy/DCDjRpHD8Bb6k7s2VfpXLwf7QqqJjNDBPxIG1CxH/l+8FG1ChIFPt26YSqHx
-48/XpTdlAhk7g/zGBonRl6fVH+KNxAED6Jxv5oSyYKn6/pYYeUm303r0NOERzY4g
-5aEMEFYvVdebuDfvZkViQQnpWhUUBlw=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.umk.pl:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <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>mailto:admin@umk.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.umuc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.umuc.edu-idp-shibboleth.xml
deleted file mode 100644
index e975d8de..00000000
--- a/swamid-interfederations-2.0/sso.umuc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://sso.umuc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">umuc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University Of Maryland University College</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>
-MIIDGzCCAgOgAwIBAgIUaSvdAzFQk6GsFqHActLJhebXr8swDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMc3NvLnVtdWMuZWR1MB4XDTExMTExNTIwMDMwMFoXDTMx
-MTExNTIwMDMwMFowFzEVMBMGA1UEAxMMc3NvLnVtdWMuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvXpfnW90F4YsbWVzbMxWZeO0hY4Q4C4yXkv9
-V35ltE9hwNG/tSLJA3Ns1TB9Y+L9jnrmcRgIZK0VxP+QODJGBCuvFbFFjrlNkxSD
-IBYmZYq4mL+/N+PyNCs70D4r/V2HGJR5eHF8QJQof1jIUov+dPWtvIV/wNFXMUJp
-IilXQnCmGwiQYoOzQoAih4MIRFa4TwCtTw3/vBfDJ5fry6LJi0wHOTlWsoMwWY3c
-H/QcI/vW2mspHEXsBcHFJmhg/Xw5xGjvtF2hEdv8g5ZtCiPJoidSWz+gv+sue7gs
-RKKXLtrK2sACaN3BwREKvjmsa4J7OI02BDgaOkUR6L4KMt9PxQIDAQABo18wXTA8
-BgNVHREENTAzggxzc28udW11Yy5lZHWGI2h0dHBzOi8vc3NvLnVtdWMuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRy/aoaHAUaRsTpTSL0JfJc3HOubzANBgkq
-hkiG9w0BAQUFAAOCAQEAPyLzxaATWdXu6N1YAKsP+3gxmE+AfWIHOfUae5k5vvNe
-8sQaIfnrTXzn0uIUIhurV8e0ah17zfD9UQiv6fAN4FO8++NLpMBcn4QwkHvPpw5f
-/zqJca07mUCXSZo1mQXRCpIheEy3a4XnwyXh3KQFCV3J4LlX7v4Fw15VldAPCneN
-MXTcEOw2c0JU6Szl0RWSfQXUXml/pRRNnrEaXOJ0/0csWPvAweg9P8fZ82Qij8Fn
-7y02/wW5+M3h7IvaIZq3KsTwLWfY1WNlk/C4zh5hb8miEt8Le7YJwP/1S8NpsSUg
-n5i8VuQd1o2O7rPL9ogFsvto7gjmgl7z0XQ7g2zlbA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.umuc.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.umuc.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.umuc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.umuc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.umuc.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umuc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIUaSvdAzFQk6GsFqHActLJhebXr8swDQYJKoZIhvcNAQEF
-BQAwFzEVMBMGA1UEAxMMc3NvLnVtdWMuZWR1MB4XDTExMTExNTIwMDMwMFoXDTMx
-MTExNTIwMDMwMFowFzEVMBMGA1UEAxMMc3NvLnVtdWMuZWR1MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvXpfnW90F4YsbWVzbMxWZeO0hY4Q4C4yXkv9
-V35ltE9hwNG/tSLJA3Ns1TB9Y+L9jnrmcRgIZK0VxP+QODJGBCuvFbFFjrlNkxSD
-IBYmZYq4mL+/N+PyNCs70D4r/V2HGJR5eHF8QJQof1jIUov+dPWtvIV/wNFXMUJp
-IilXQnCmGwiQYoOzQoAih4MIRFa4TwCtTw3/vBfDJ5fry6LJi0wHOTlWsoMwWY3c
-H/QcI/vW2mspHEXsBcHFJmhg/Xw5xGjvtF2hEdv8g5ZtCiPJoidSWz+gv+sue7gs
-RKKXLtrK2sACaN3BwREKvjmsa4J7OI02BDgaOkUR6L4KMt9PxQIDAQABo18wXTA8
-BgNVHREENTAzggxzc28udW11Yy5lZHWGI2h0dHBzOi8vc3NvLnVtdWMuZWR1L2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRy/aoaHAUaRsTpTSL0JfJc3HOubzANBgkq
-hkiG9w0BAQUFAAOCAQEAPyLzxaATWdXu6N1YAKsP+3gxmE+AfWIHOfUae5k5vvNe
-8sQaIfnrTXzn0uIUIhurV8e0ah17zfD9UQiv6fAN4FO8++NLpMBcn4QwkHvPpw5f
-/zqJca07mUCXSZo1mQXRCpIheEy3a4XnwyXh3KQFCV3J4LlX7v4Fw15VldAPCneN
-MXTcEOw2c0JU6Szl0RWSfQXUXml/pRRNnrEaXOJ0/0csWPvAweg9P8fZ82Qij8Fn
-7y02/wW5+M3h7IvaIZq3KsTwLWfY1WNlk/C4zh5hb8miEt8Le7YJwP/1S8NpsSUg
-n5i8VuQd1o2O7rPL9ogFsvto7gjmgl7z0XQ7g2zlbA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.umuc.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University Of Maryland University College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University Of Maryland University College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umuc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Peter Friedman</md:GivenName>
-    <md:EmailAddress>Peter.Friedman@umuc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Paul Randall</md:GivenName>
-    <md:EmailAddress>Paul.Randall@umuc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Server Operations Group</md:GivenName>
-    <md:EmailAddress>SOP@umuc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.uni-passau.de.xml b/swamid-interfederations-2.0/sso.uni-passau.de.xml
deleted file mode 100644
index 6ffe373c..00000000
--- a/swamid-interfederations-2.0/sso.uni-passau.de.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.uni-passau.de/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-passau.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.uni-passau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.uni-passau.de,OU=Rechenzentrum,O=Universitaet Passau,L=Passau,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIEEGjaiTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC
-REUxDzANBgNVBAcTBlBhc3NhdTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IFBhc3Nh
-dTEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTElMCMGA1UEAxMcVW5pdmVyc2l0YWV0
-IFBhc3NhdSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTY2FAcnoudW5pLXBhc3Nh
-dS5kZTAeFw0xMDA3MjMwOTEyMjZaFw0xMjA3MjIwOTEyMjZaMHAxCzAJBgNVBAYT
-AkRFMQ8wDQYDVQQHEwZQYXNzYXUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBQYXNz
-YXUxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xGjAYBgNVBAMTEXNzby51bmktcGFz
-c2F1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1aBBI4P4qYFf
-wg+NkT6Fgt1vlFdQr4Mh9kpB6Vf8N88Y5P9auQ5aen2FvtXboTuofjzDgOecee5L
-fOIjJ/n2am/DurFy3z49N61vUJIXZvxcepKWCPJiGO+5ad+SXziXzxXcgr6SLhlD
-3awAgxA6xZ5rsI8GZCDEt2rq8RlZ3AugZSFGJmRmxx5WYwB7nF269dwUlice3uqa
-PazFFxrPYLcKK0fYpfWOMOR4jArxeOudgo1LAoEOsL+SNUhVpFdC+oO99sC2NJqE
-FuRB9DLWXeXIRSQ3NAJ6u6bZNBl3aJ2k+97H6eN6Y+yqUf78t4qH4dEb6kObzRSZ
-+mhxVLlqYwIDAQABo4IBnDCCAZgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYD
-VR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUWkamZ0Mu69OevdM8ClQ4tPG4n
-MB8GA1UdIwQYMBaAFAmx36HoYV2hzcb0g3k6LAYMjOwIMIGFBgNVHR8EfjB8MDyg
-OqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1wYXNzYXUtY2EvcHViL2Ny
-bC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXBh
-c3NhdS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYI
-KwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAFPipp6pIli1YSCIIB+jEBczNDGHd548bCsE7QBUqGhL
-gZZDe46FsL0x52+if9cg0xl4nc30JzW6lLomAzS8RjzVLlMEFoSXgjgzGXxwRQT8
-L+sy1OhLCTF1p2sa13XRGzOJv1LuDAFU794dtzrSHKatFMT+GGuiqnSKQNEholz0
-uTZoXPNywDXwil6umH7KgRACyRhWjz0nC7see0IsGlTF5hc5vNUNkAfFFdBgigW8
-kU7vVI5si/HKKkRlbq6C+XjnivYYCjxLH6ivSNfqec74E8vZiA8WWGY3+oV7ByIx
-JjVhmR1NGFw53eiX+uNeaKgzqov9ufCtnPqN2yo0/iw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.uni-passau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.uni-passau.de,OU=Rechenzentrum,O=Universitaet Passau,L=Passau,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIEEGjaiTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC
-REUxDzANBgNVBAcTBlBhc3NhdTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IFBhc3Nh
-dTEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTElMCMGA1UEAxMcVW5pdmVyc2l0YWV0
-IFBhc3NhdSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTY2FAcnoudW5pLXBhc3Nh
-dS5kZTAeFw0xMDA3MjMwOTEyMjZaFw0xMjA3MjIwOTEyMjZaMHAxCzAJBgNVBAYT
-AkRFMQ8wDQYDVQQHEwZQYXNzYXUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBQYXNz
-YXUxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xGjAYBgNVBAMTEXNzby51bmktcGFz
-c2F1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1aBBI4P4qYFf
-wg+NkT6Fgt1vlFdQr4Mh9kpB6Vf8N88Y5P9auQ5aen2FvtXboTuofjzDgOecee5L
-fOIjJ/n2am/DurFy3z49N61vUJIXZvxcepKWCPJiGO+5ad+SXziXzxXcgr6SLhlD
-3awAgxA6xZ5rsI8GZCDEt2rq8RlZ3AugZSFGJmRmxx5WYwB7nF269dwUlice3uqa
-PazFFxrPYLcKK0fYpfWOMOR4jArxeOudgo1LAoEOsL+SNUhVpFdC+oO99sC2NJqE
-FuRB9DLWXeXIRSQ3NAJ6u6bZNBl3aJ2k+97H6eN6Y+yqUf78t4qH4dEb6kObzRSZ
-+mhxVLlqYwIDAQABo4IBnDCCAZgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYD
-VR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUWkamZ0Mu69OevdM8ClQ4tPG4n
-MB8GA1UdIwQYMBaAFAmx36HoYV2hzcb0g3k6LAYMjOwIMIGFBgNVHR8EfjB8MDyg
-OqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1wYXNzYXUtY2EvcHViL2Ny
-bC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXBh
-c3NhdS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYI
-KwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAFPipp6pIli1YSCIIB+jEBczNDGHd548bCsE7QBUqGhL
-gZZDe46FsL0x52+if9cg0xl4nc30JzW6lLomAzS8RjzVLlMEFoSXgjgzGXxwRQT8
-L+sy1OhLCTF1p2sa13XRGzOJv1LuDAFU794dtzrSHKatFMT+GGuiqnSKQNEholz0
-uTZoXPNywDXwil6umH7KgRACyRhWjz0nC7see0IsGlTF5hc5vNUNkAfFFdBgigW8
-kU7vVI5si/HKKkRlbq6C+XjnivYYCjxLH6ivSNfqec74E8vZiA8WWGY3+oV7ByIx
-JjVhmR1NGFw53eiX+uNeaKgzqov9ufCtnPqN2yo0/iw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.uni-passau.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.uni-passau.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.uni-passau.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.uni-passau.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.uni-passau.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.uni-passau.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-passau.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.uni-passau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.uni-passau.de,OU=Rechenzentrum,O=Universitaet Passau,L=Passau,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIEEGjaiTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC
-REUxDzANBgNVBAcTBlBhc3NhdTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IFBhc3Nh
-dTEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTElMCMGA1UEAxMcVW5pdmVyc2l0YWV0
-IFBhc3NhdSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTY2FAcnoudW5pLXBhc3Nh
-dS5kZTAeFw0xMDA3MjMwOTEyMjZaFw0xMjA3MjIwOTEyMjZaMHAxCzAJBgNVBAYT
-AkRFMQ8wDQYDVQQHEwZQYXNzYXUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBQYXNz
-YXUxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xGjAYBgNVBAMTEXNzby51bmktcGFz
-c2F1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1aBBI4P4qYFf
-wg+NkT6Fgt1vlFdQr4Mh9kpB6Vf8N88Y5P9auQ5aen2FvtXboTuofjzDgOecee5L
-fOIjJ/n2am/DurFy3z49N61vUJIXZvxcepKWCPJiGO+5ad+SXziXzxXcgr6SLhlD
-3awAgxA6xZ5rsI8GZCDEt2rq8RlZ3AugZSFGJmRmxx5WYwB7nF269dwUlice3uqa
-PazFFxrPYLcKK0fYpfWOMOR4jArxeOudgo1LAoEOsL+SNUhVpFdC+oO99sC2NJqE
-FuRB9DLWXeXIRSQ3NAJ6u6bZNBl3aJ2k+97H6eN6Y+yqUf78t4qH4dEb6kObzRSZ
-+mhxVLlqYwIDAQABo4IBnDCCAZgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYD
-VR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUWkamZ0Mu69OevdM8ClQ4tPG4n
-MB8GA1UdIwQYMBaAFAmx36HoYV2hzcb0g3k6LAYMjOwIMIGFBgNVHR8EfjB8MDyg
-OqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1wYXNzYXUtY2EvcHViL2Ny
-bC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXBh
-c3NhdS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYI
-KwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAFPipp6pIli1YSCIIB+jEBczNDGHd548bCsE7QBUqGhL
-gZZDe46FsL0x52+if9cg0xl4nc30JzW6lLomAzS8RjzVLlMEFoSXgjgzGXxwRQT8
-L+sy1OhLCTF1p2sa13XRGzOJv1LuDAFU794dtzrSHKatFMT+GGuiqnSKQNEholz0
-uTZoXPNywDXwil6umH7KgRACyRhWjz0nC7see0IsGlTF5hc5vNUNkAfFFdBgigW8
-kU7vVI5si/HKKkRlbq6C+XjnivYYCjxLH6ivSNfqec74E8vZiA8WWGY3+oV7ByIx
-JjVhmR1NGFw53eiX+uNeaKgzqov9ufCtnPqN2yo0/iw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sso.uni-passau.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sso.uni-passau.de,OU=Rechenzentrum,O=Universitaet Passau,L=Passau,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIEEGjaiTANBgkqhkiG9w0BAQUFADCBnzELMAkGA1UEBhMC
-REUxDzANBgNVBAcTBlBhc3NhdTEcMBoGA1UEChMTVW5pdmVyc2l0YWV0IFBhc3Nh
-dTEWMBQGA1UECxMNUmVjaGVuemVudHJ1bTElMCMGA1UEAxMcVW5pdmVyc2l0YWV0
-IFBhc3NhdSBDQSAtIEcwMTEiMCAGCSqGSIb3DQEJARYTY2FAcnoudW5pLXBhc3Nh
-dS5kZTAeFw0xMDA3MjMwOTEyMjZaFw0xMjA3MjIwOTEyMjZaMHAxCzAJBgNVBAYT
-AkRFMQ8wDQYDVQQHEwZQYXNzYXUxHDAaBgNVBAoTE1VuaXZlcnNpdGFldCBQYXNz
-YXUxFjAUBgNVBAsTDVJlY2hlbnplbnRydW0xGjAYBgNVBAMTEXNzby51bmktcGFz
-c2F1LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1aBBI4P4qYFf
-wg+NkT6Fgt1vlFdQr4Mh9kpB6Vf8N88Y5P9auQ5aen2FvtXboTuofjzDgOecee5L
-fOIjJ/n2am/DurFy3z49N61vUJIXZvxcepKWCPJiGO+5ad+SXziXzxXcgr6SLhlD
-3awAgxA6xZ5rsI8GZCDEt2rq8RlZ3AugZSFGJmRmxx5WYwB7nF269dwUlice3uqa
-PazFFxrPYLcKK0fYpfWOMOR4jArxeOudgo1LAoEOsL+SNUhVpFdC+oO99sC2NJqE
-FuRB9DLWXeXIRSQ3NAJ6u6bZNBl3aJ2k+97H6eN6Y+yqUf78t4qH4dEb6kObzRSZ
-+mhxVLlqYwIDAQABo4IBnDCCAZgwCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwEwYD
-VR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFGUWkamZ0Mu69OevdM8ClQ4tPG4n
-MB8GA1UdIwQYMBaAFAmx36HoYV2hzcb0g3k6LAYMjOwIMIGFBgNVHR8EfjB8MDyg
-OqA4hjZodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1wYXNzYXUtY2EvcHViL2Ny
-bC9jYWNybC5jcmwwPKA6oDiGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLXBh
-c3NhdS1jYS9wdWIvY3JsL2NhY3JsLmNybDCBoAYIKwYBBQUHAQEEgZMwgZAwRgYI
-KwYBBQUHMAKGOmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9w
-dWIvY2FjZXJ0L2NhY2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBj
-YS5kZm4uZGUvdW5pLXBhc3NhdS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAFPipp6pIli1YSCIIB+jEBczNDGHd548bCsE7QBUqGhL
-gZZDe46FsL0x52+if9cg0xl4nc30JzW6lLomAzS8RjzVLlMEFoSXgjgzGXxwRQT8
-L+sy1OhLCTF1p2sa13XRGzOJv1LuDAFU794dtzrSHKatFMT+GGuiqnSKQNEholz0
-uTZoXPNywDXwil6umH7KgRACyRhWjz0nC7see0IsGlTF5hc5vNUNkAfFFdBgigW8
-kU7vVI5si/HKKkRlbq6C+XjnivYYCjxLH6ivSNfqec74E8vZiA8WWGY3+oV7ByIx
-JjVhmR1NGFw53eiX+uNeaKgzqov9ufCtnPqN2yo0/iw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.uni-passau.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.uni-passau.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Passau</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Passau</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-passau.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthias</GivenName>
-    <SurName>Absmeier</SurName>
-    <EmailAddress>matthias.absmeier@uni-passau.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.unt.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.unt.edu-idp-shibboleth.xml
deleted file mode 100644
index 1caef132..00000000
--- a/swamid-interfederations-2.0/sso.unt.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,68 +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://sso.unt.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://sso.unt.edu/error/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">untsystem.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unt.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unthsc.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">untsystem.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">untdallas.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of North Texas System</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for UNT (Denton), UNT Health Science Center, UNT Dallas, and UNT System.</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>
-MIIDGDCCAgCgAwIBAgIVAPTkPnFeEQriNu0kKxDjCOeiKxITMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC3Nzby51bnQuZWR1MB4XDTEwMTAwMTE4MjgzMloXDTMw
-MTAwMTE4MjgzMlowFjEUMBIGA1UEAxMLc3NvLnVudC5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCynjH66Mz6D5Fc2lCUjnpF2n2POevHv5l33VMi
-obO2dc/YzSwiENmr6tY9ReX9FF4ML8NobLUcTXqPLfL4mWKfWBI39gcyBwD/ddZ5
-Xmqywa/DLgIS4bp9KrcashOM44jSfCNkUfGW21FA+N/vfpBIx2Cgofz5mg8XeqHr
-elVQKQeZ2ARomjmU083YD9yi3e+ddmqX3FlCTTmbo8oTBRONSm8YjpG9/7DjVD2L
-JMLiwc2N9V6zmHgnfe2YFbgt8vo7pMg8XsH3yGCNl4AJbhN0GvQIS05SALSxr52x
-SAPQYDkTtkMHuCl+p11nlMJpkXAvKWc3ml8QTz7Uu5HKaKZLAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC3Nzby51bnQuZWR1hiJodHRwczovL3Nzby51bnQuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBRlgBonW6cGeb6J4ssh77iPml26tzANBgkqhkiG
-9w0BAQUFAAOCAQEAVGgGN5ma/FeByXpL0jqMKaobKp7dNtTCTUXYIQAAorsdRTu5
-oqDTSV18WsEY83ulL+sEB6zz2mewTAFe/0zQ0jNs5F7jgaBCIkGGa0iVbrNKk+3G
-KCGYmKWOmg5ZT/a8aJZ5FEryy5Z9cOdrgK8KaYXpB7nvXvonGmCbakmE2a6okszF
-5pbm2rnx2hXdaJyWb/SbEsZ8oCVck/t/0eKSIzWZJtVP2/5MmAnKdAdgVlMN0/y6
-zZ1Ow0IRVl+nB1IHBZ20Tfo9JcrHSbHDT1/BLhGZ1Cb+6lTfgHH+lKDQkjmIPJ+x
-h+1Xx63dQAtHY7dZh0dxtwfqKg2YtR6sldg3Qg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.unt.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.unt.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of North Texas System</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of North Texas System</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://untsystem.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UNT System Directory Services Team</md:GivenName>
-    <md:EmailAddress>shibboleth@untsystem.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Yancey Yeargan</md:GivenName>
-    <md:EmailAddress>shibboleth@untsystem.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UNT Helpdesk</md:GivenName>
-    <md:EmailAddress>helpdesk@unt.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 99a527cd..0821da4b 100644
--- a/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.utu.fi/sso-idp">
-  <md: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-support" 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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+<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" WantAuthnRequestsSigned="true">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utu.fi</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
+      <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>
+      <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>MIIHPjCCBiagAwIBAgIQCIdeZB1qcIkU4tTDCYnlyjANBgkqhkiG9w0BAQsFADB1
 MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
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 8ddf0907..00000000
--- a/swamid-interfederations-2.0/sso.utu.fi.xml
+++ /dev/null
@@ -1,86 +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="sv">Åbo universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">Turun yliopisto</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">Abo universitet</OrganizationName>
-    <OrganizationDisplayName xml:lang="fi">Turun yliopisto</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Turku</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="sv">Abo 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>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 4afa2a2e..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 width="256" height="256">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
-        <mdui:Logo width="80" height="88">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
-        <mdui:Logo width="16" height="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.vito.be.xml b/swamid-interfederations-2.0/sso.vito.be.xml
deleted file mode 100644
index f7cf74d2..00000000
--- a/swamid-interfederations-2.0/sso.vito.be.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://sso.vito.be">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">VITO</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">VITO</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Vlaamse Instelling voor Technologisch Onderzoek</mdui:Description>
-        <mdui:Logo height="16" width="16">https://bsds2015.vito.be/sites/bsds2015.vito.be/files/vito_smaller.jpg</mdui:Logo>
-        <mdui:Logo height="75" width="153">https://bsds2015.vito.be/sites/bsds2015.vito.be/files/vito_larger.jpg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:IPHint>193.190.188.0/22</mdui:IPHint>
-        <mdui:IPHint>2001:06a8:0a50:8000::0/49</mdui:IPHint>
-        <mdui:DomainHint>vito.be</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:51.218543,5.090905</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3TCCAsWgAwIBAgIJALl3yBmvtc6zMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNVBAYTAkJFMRAwDgYDVQQIEwdBbnR3ZXJwMQwwCgYDVQQHEwNNb2wxDTALBgNVBAoTBFZpdG8xFDASBgNVBAMTC3Nzby52aXRvLmJlMB4XDTE1MDkxNTA3MzgyMloXDTQzMDEzMTA3MzgyMlowUjELMAkGA1UEBhMCQkUxEDAOBgNVBAgTB0FudHdlcnAxDDAKBgNVBAcTA01vbDENMAsGA1UEChMEVml0bzEUMBIGA1UEAxMLc3NvLnZpdG8uYmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhiX+4KHkneW8gdSKV+2piklMrolgprQ7anUqP8znpOznPaBH9060ECJQUw4k+PQ1O92NUEODgQe35/K2DuA6vuiMFlmwce87O5kq1ri6VHeIjTF5jxtLZ9o6EHXFR0W1WuC5AWTsVg3sjdVVQc0EoWXOCn0cwwR24Ni6B7G9PT3VIFI/UuNxD5nAR564H2yCOSbEVdasN9xvjO5wSzIgmuxLQT4IDy4Ez3L5RDK7OZTAjVwHwKCkLe0Ndx89BY/WzTrZCa/dMDIbGeee1bDeQ5fjqXqUssZwrXqNJkL27KYOJZv+UWEmEyhzaSGpyGiPZHlN0liHarpR3Hb0MSYcDAgMBAAGjgbUwgbIwHQYDVR0OBBYEFDzHYTGcKe8VZxOVMTvIK5UMRMtDMIGCBgNVHSMEezB5gBQ8x2ExnCnvFWcTlTE7yCuVDETLQ6FWpFQwUjELMAkGA1UEBhMCQkUxEDAOBgNVBAgTB0FudHdlcnAxDDAKBgNVBAcTA01vbDENMAsGA1UEChMEVml0bzEUMBIGA1UEAxMLc3NvLnZpdG8uYmWCCQC5d8gZr7XOszAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQABXKgnPs452tJLsfw4kzCF2lO0ZsUfInFoU+o9EK+JO1i6Hzn1euFb5LzCWSDBtwJuqRVpOkyAmjZ3CQrR4DY/Zlbffki701nAoSSS1S56aggOYF6DvqYfoxuyiF6I89NvjC1LP+RX1IoIsljRr6aeKu1Jfp+vT2yr3PnhAP0Cn+3sGIbaOyF9Y9ZLXo4BTQmpQhsnBwrXy5zJ6oeVZI1xsNNbdMacNIcCffsyYhJGLB7/M7YuUtZR0qZmeyjdR8Clxd7uLx0k9qOs6SYIGWRWeBuhXShDvAx4JNNQc9kkhOEOJyK0v4PpF6m19d/aVSuQCeJsaK553npGMhYSj64q</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://sso.vito.be/saml/idp/profile/redirectorpost/sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.vito.be/saml/idp/profile/redirectorpost/sso"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Vito</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Vito</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vito.be/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>SAML IdP Support</md:SurName>
-    <md:EmailAddress>mailto:snb@vito.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 053bbc2b..00000000
--- a/swamid-interfederations-2.0/ssotesteu.eu.qualtrics.com-WRSAML-simplesaml-www-module.php-saml-sp-metadata.php-default-sp.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://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Qualtrics Test SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Qualtrics Surveys Test instance</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://ssotesteu.eu.qualtrics.com/</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>
-MIIFbDCCA1QCCQC8OqKPlGUkRDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJV
-UzENMAsGA1UECBMEVXRhaDEOMAwGA1UEBxMFUHJvdm8xGDAWBgNVBAoTD1F1YWx0
-cmljcywgSW5jLjEgMB4GCSqGSIb3DQEJARYRZGJhQHF1YWx0cmljcy5jb20wHhcN
-MTAwNDA3MTkzMzA0WhcNMjAwNDA3MTkzMzA0WjCBhzELMAkGA1UEBhMCVVMxDTAL
-BgNVBAgTBFV0YWgxDjAMBgNVBAcTBVByb3ZvMRgwFgYDVQQKEw9RdWFsdHJpY3Ms
-IEluYy4xGDAWBgNVBAMMDyoucXVhbHRyaWNzLmNvbTElMCMGCSqGSIb3DQEJARYW
-c3NvYWRtaW5AcXVhbHRyaWNzLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
-AgoCggIBAM7T6YYEDd91lehKK/51V3Li6zk/wqHZ1OZ4rHw22AtTasl0qrEwdXbL
-sCUmO4rEXhAnjgpIZPFHs+1sFpSCalerYa+ROJX5B5N9MnENYr6E8KHa8spbVBEl
-2/ZE6RlPdHBs+iCDuoTTqOa2sZ8vqTpTF3grVdgeW3KfBOO9yENa04lA6xhPAQs3
-kihDQvPoWnlXtQA3gmtb+sGZmKYXonBVwIDsrDbhpoFcHJJRrFEEawSHOI3IeHBo
-hR1jhfb95E3cQ0s7gQ+FbR+lkzwb3i3WrCkZr3w2KpudJEzy/kT7JBLvfELW8eR4
-j2XRKyRhxNHOKc/AC8fNIrGam0CAqK9elpJnB6zmALQUYXVGddv3sd9ITIfZQ9Ox
-g9ChVqsNAY6VIlg5+/Q3Ega+BR/P/OpMnG9xW+cyLslzjiUf4c0K6I2pObcJkJMw
-qGHOSbD9lGa/WxaEAFC1+6oDNRbC3S2mbo4gW6LPVbtCxC0IMxOyaOKBwe3sW9v+
-rumd02ZuJRtbTbarde7N6aUmm2hXfDQntCIXWUJ+9b+YvjcWUlUN0KvVq8jFn1Z7
-kD1po2eY+lc9VHYoh1jdP08G9H8CZdJTDwR4KDPG0U2rD+xXmxO+9CEeQev1d/Iu
-qcadQxRka7hbhIijtVJgjO3jP6AwiHXFGpBvApyIuuXJU8CyKSsXAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggIBAAcXtiFXJ5Vm0mwhiDRoTGwIGz+Ryg13X6X9w6GfVENt
-NexDExwzPgxnW1gG7u9FUx2tl2geZ8BJOqk3pGnLSZI4QF/nVnB+hTPMLOwXjtMk
-MF5FXlM7QvOKOTzzK7+2wug2ssZi5ZpQVGODhPsytu+GjMJwydLj6RRAnJV/9wmu
-ivZhIbQyrOs0XBxuYO0n9OzlOa9JVFtUxnckT93UYIjcCVEu2r+m20Zm8BEofKTr
-Tz3vodizFV5uHbmQ19iLxDrZsu9rbpEHojWMgnKnq1XoC7TmlxB1/OQctUnjpRPT
-WySZkTdWX4cKBjQHzCHJyl0Z4hAP4m3fWFLXVK3w8U1e+Mbfm0jUT9+amUfdzL+8
-9ZjwnFvpuFNWsS33yYWp51+rVdtU0jYII1f8XWNRn4EV54MwoOWrEXKDZ0qmbxi5
-nVR/F5QofEGv/ZYMgcFaX5OMP5lRE8IjQu9Eq26zZA6YuR5fZfiTHZppwc6Ey9Zc
-GpRsLwFSwma0/Vtlfxr/KtaKsk2zlOOJ6RF33MUyZvw8N+tybY0yHJ40aBZKFr9r
-r3j//DUU8zi4qvNP5z19kS08sZ7mtNK2sKBPWVSYB2HDtyrBSRupHBYeIxlfGKd6
-uVUusHTyyVjDKbuMHCw+DEp0VXmCIAv5Jf+SKZ7DOkw8cxcdL67gEc9NjAmsfmKy
-</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>
-MIIFbDCCA1QCCQC8OqKPlGUkRDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJV
-UzENMAsGA1UECBMEVXRhaDEOMAwGA1UEBxMFUHJvdm8xGDAWBgNVBAoTD1F1YWx0
-cmljcywgSW5jLjEgMB4GCSqGSIb3DQEJARYRZGJhQHF1YWx0cmljcy5jb20wHhcN
-MTAwNDA3MTkzMzA0WhcNMjAwNDA3MTkzMzA0WjCBhzELMAkGA1UEBhMCVVMxDTAL
-BgNVBAgTBFV0YWgxDjAMBgNVBAcTBVByb3ZvMRgwFgYDVQQKEw9RdWFsdHJpY3Ms
-IEluYy4xGDAWBgNVBAMMDyoucXVhbHRyaWNzLmNvbTElMCMGCSqGSIb3DQEJARYW
-c3NvYWRtaW5AcXVhbHRyaWNzLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
-AgoCggIBAM7T6YYEDd91lehKK/51V3Li6zk/wqHZ1OZ4rHw22AtTasl0qrEwdXbL
-sCUmO4rEXhAnjgpIZPFHs+1sFpSCalerYa+ROJX5B5N9MnENYr6E8KHa8spbVBEl
-2/ZE6RlPdHBs+iCDuoTTqOa2sZ8vqTpTF3grVdgeW3KfBOO9yENa04lA6xhPAQs3
-kihDQvPoWnlXtQA3gmtb+sGZmKYXonBVwIDsrDbhpoFcHJJRrFEEawSHOI3IeHBo
-hR1jhfb95E3cQ0s7gQ+FbR+lkzwb3i3WrCkZr3w2KpudJEzy/kT7JBLvfELW8eR4
-j2XRKyRhxNHOKc/AC8fNIrGam0CAqK9elpJnB6zmALQUYXVGddv3sd9ITIfZQ9Ox
-g9ChVqsNAY6VIlg5+/Q3Ega+BR/P/OpMnG9xW+cyLslzjiUf4c0K6I2pObcJkJMw
-qGHOSbD9lGa/WxaEAFC1+6oDNRbC3S2mbo4gW6LPVbtCxC0IMxOyaOKBwe3sW9v+
-rumd02ZuJRtbTbarde7N6aUmm2hXfDQntCIXWUJ+9b+YvjcWUlUN0KvVq8jFn1Z7
-kD1po2eY+lc9VHYoh1jdP08G9H8CZdJTDwR4KDPG0U2rD+xXmxO+9CEeQev1d/Iu
-qcadQxRka7hbhIijtVJgjO3jP6AwiHXFGpBvApyIuuXJU8CyKSsXAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggIBAAcXtiFXJ5Vm0mwhiDRoTGwIGz+Ryg13X6X9w6GfVENt
-NexDExwzPgxnW1gG7u9FUx2tl2geZ8BJOqk3pGnLSZI4QF/nVnB+hTPMLOwXjtMk
-MF5FXlM7QvOKOTzzK7+2wug2ssZi5ZpQVGODhPsytu+GjMJwydLj6RRAnJV/9wmu
-ivZhIbQyrOs0XBxuYO0n9OzlOa9JVFtUxnckT93UYIjcCVEu2r+m20Zm8BEofKTr
-Tz3vodizFV5uHbmQ19iLxDrZsu9rbpEHojWMgnKnq1XoC7TmlxB1/OQctUnjpRPT
-WySZkTdWX4cKBjQHzCHJyl0Z4hAP4m3fWFLXVK3w8U1e+Mbfm0jUT9+amUfdzL+8
-9ZjwnFvpuFNWsS33yYWp51+rVdtU0jYII1f8XWNRn4EV54MwoOWrEXKDZ0qmbxi5
-nVR/F5QofEGv/ZYMgcFaX5OMP5lRE8IjQu9Eq26zZA6YuR5fZfiTHZppwc6Ey9Zc
-GpRsLwFSwma0/Vtlfxr/KtaKsk2zlOOJ6RF33MUyZvw8N+tybY0yHJ40aBZKFr9r
-r3j//DUU8zi4qvNP5z19kS08sZ7mtNK2sKBPWVSYB2HDtyrBSRupHBYeIxlfGKd6
-uVUusHTyyVjDKbuMHCw+DEp0VXmCIAv5Jf+SKZ7DOkw8cxcdL67gEc9NjAmsfmKy
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/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://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/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://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/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://ssotesteu.eu.qualtrics.com/WRSAML/simplesaml/www/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Qualtrics Test SP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Qualtrics Surveys Test instance</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="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:oid:2.5.4.4" 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="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="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="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="organizationName" Name="urn:oid:2.5.4.10" 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="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="en">Qualtrics LLC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Qualtrics</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.qualtrics.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>mailto:shibboleth@qualtrics.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssp.kennedy.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ssp.kennedy.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index d2eb7471..00000000
--- a/swamid-interfederations-2.0/ssp.kennedy.ox.ac.uk-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://ssp.kennedy.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Kennedy Institute of Rheumatology" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2016-01-19T12: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: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://ssp.kennedy.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIJAKA5lz2cCSdXMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHNzcC5rZW5uZWR5Lm94LmFjLnVrMB4XDTE2MDExNDE0MzQwMFoXDTI2MDEx
-						MTE0MzQwMFowHzEdMBsGA1UEAxMUc3NwLmtlbm5lZHkub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDF0ouTfpTeE7vfQ+5CBQou0Us95S/g
-						yQJlZYxK/IlnDf/CUTYRrr3gLyEvmu1VsApqb2z58QquO/HvzY9F92X9esydACLz
-						beIP6lKkPpmGJ9S84Fd9hYCkXtfIomgMBMGmjn5hvEuSr6PmFqvtQlY/jtIarAV/
-						cummcTPvtg/q6xgCTVcFIszD4j2ljdag9M5NaJ+mWs1WtcVCRRUiMUPdGKQlZ0Vh
-						UbdYjRxF6EItfPck0i9+fkcifCu2kLwVNdY3lOQ5bg1w/nDnNnbnN+L3ZHdSOjls
-						QyqH8EQ7Myz9ZnH2jRGWIwYmFPOLRuaHm/8Etp5u3bqkVz/kcQNFya+3AgMBAAGj
-						azBpMEgGA1UdEQRBMD+CFHNzcC5rZW5uZWR5Lm94LmFjLnVrhidodHRwczovL3Nz
-						cC5rZW5uZWR5Lm94LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFEqOtgn1iydX
-						BwVOh1ZwBn/KnAzKMA0GCSqGSIb3DQEBBQUAA4IBAQAakJmRBd0pyIrVE0Bp+27x
-						6c22Ls4RM+S+wOqOAs9VtQUY0OgLXnkLKatbXpWlBWfF6gYHf+Y404Bodf6fFClS
-						X2GoXLuvRNrwMZq0g59rFRpAnbDOZVzK0duqNMKvmrVlLdo5jL1aUO5J5FQdkgYL
-						LEqWhOKgn+ABisqdMbQd8LPKbg/lquvum0iPhpULXLgzn4laM1rOlcyhJxX1ekFT
-						t7lCrX6c6vFUpYm+MG953JCIFO4jR+qRTRbGH8vep7i7EZWfIVCwO+Z6QvCr3lQc
-						YS69W08VipSY/2dpHXFVFzTTP9FTSehQU7oPKjHzgKWZsq8iVBIq5Z/FjS+FNr3R
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://ssp.kennedy.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssp.kennedy.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Kennedy Institute of Rheumatology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kennedy.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kennedy Institute IT</GivenName>
-    <EmailAddress>mailto:kirit@kennedy.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Brian</GivenName>
-    <SurName>Marsden</SurName>
-    <EmailAddress>mailto:brian.marsden@kennedy.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 8fb5ae2b..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"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ssso.uni-muenster.de/shibboleth-sp">
-  <md: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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://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">Dieses zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster.</mdui:Description>
-        <mdui:Description xml:lang="en">This central Single Sign-On covers almost all services of the university of 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="64" width="80">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu.svg</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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Universität Münster</md:ServiceName>
-      <md:ServiceName xml:lang="en">Universität Münster</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Dieses zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">This central Single Sign-On covers almost all services of the university of Münster.</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="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e247</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e247</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-muenster.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rainer</md:GivenName>
-    <md:SurName>Perske</md:SurName>
-    <md:EmailAddress>mailto:wwwadmin@uni-muenster.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Rainer</md:GivenName>
-    <md:SurName>Perske</md:SurName>
-    <md:EmailAddress>mailto:wwwadmin@uni-muenster.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/st-andrews.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/st-andrews.unidesk.ac.uk-shibboleth.xml
deleted file mode 100644
index b9d040ad..00000000
--- a/swamid-interfederations-2.0/st-andrews.unidesk.ac.uk-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://st-andrews.unidesk.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "Unidesk - University of St Andrews" SP owned by the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-14T14:49:26Z">
-      <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://st-andrews.unidesk.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAPHsl6kKrFrnMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEmxpdmUudW5pZGVzay5hYy51azAeFw0xMjA0MTExNDU4MjhaFw0yMjA0MDkx
-						NDU4MjhaMB0xGzAZBgNVBAMTEmxpdmUudW5pZGVzay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAL9qh/Dehm5jJdWdeFPNKqcjMdiqii8Iz9Rc
-						tCAsEwRsYww4EQDG7MxG5hg4NSS+iIPFCp9gR+G7hTnZAMGgNpxs2vk4vs9lmhRY
-						GmB7Y1NFloP9Pcsu+MaufaLzxi6bzIXV4dBVHqVnIcgxchDIsXmPE6xlq4poEq+q
-						XJ3aFE/eWwxfwN9z0s5yeICzsil73xk9T9NLeNAeYq+jfVTcdqDbBHY6eHtMOYh/
-						uPVYYxkKXjkgSH5cwG0b+7qN4z+uzKDNBXxnI1Nz+bLOazXW6ljQIDtAPQZMJSlr
-						3OepVaQS+fMBi0Sku5yvADgINdXxkz6H4Zx4pZg/rTQBQ/8u2esCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISbGl2ZS51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBQ2tPlzxC8e
-						akC2nh9qrG4TWfI3tzANBgkqhkiG9w0BAQUFAAOCAQEAWPY3Nv9ChZ+4XVNANhLq
-						fGF7SbiPmUNj9vWGNjCp8Ma0tdDOZPvqBRzxKkkR+LS+fHpSQQ54RuNeZrulWBiN
-						akZe3LZiSH9AHG2uD0lDuxr0UQt1AHGDiLjFXuRg9+CdqqrdT3Anmy6exDDfRsjH
-						k+ZJflkEtqTNd0dbEVlkYlg8Baqx/ZMOxkccx8PtQt1yptAMsH4Rn92vXLd9d3JM
-						H1mrFuiriqrgsAfVLmzc4WeGmB+dK01cSB+CY7hKnoe7ds1y7kNhOmZ9HP3Iy7ev
-						gF2RCdnqkP9zScihW4b20PlVa/sWMUyCj2uZE1lSO51PJcGVU0H/JFrBEpaM7u6t
-						jg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: Unidesk - University of St Andrews</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Helpdesk</GivenName>
-    <EmailAddress>mailto:IS.Helpdesk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/stage.mahara.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/stage.mahara.qmul.ac.uk-shibboleth.xml
deleted file mode 100644
index 833dd575..00000000
--- a/swamid-interfederations-2.0/stage.mahara.qmul.ac.uk-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://stage.mahara.qmul.ac.uk/shibboleth">
-  <!--
-		This is a "Staging Mahara Shibboleth SP for Queen Mary and Westfield College, University of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T09:07:23Z"/>
-  </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://stage.mahara.qmul.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAMZqbUlmc/4pMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF3N0YWdlLm1haGFyYS5xbXVsLmFjLnVrMB4XDTEyMDYwNzE0NTU0N1oXDTIy
-						MDYwNTE0NTU0N1owIjEgMB4GA1UEAxMXc3RhZ2UubWFoYXJhLnFtdWwuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDZvKm8ggjSAsLt7kGFZ2t
-						bGdbkDjwkTYPeCFNFRIy+Fi904W2Ff89/ryb56iyA8N9USlj1VUv3QMlvKQNrhbw
-						xad6u6/9F2PjL78zkoYc+uJ8U8z23CaMWFBi53nLQfXmVqby7grEd/ZPmBbXFmen
-						uZfPVB4pb2s7JG1yRKwxdAvq/Du8srEQMOnKLX0A0kFumhabL+lri/VXiWGnbYcm
-						lYrv/Hmh/e/ZoYFwPXajrLwmlAcA+adOqz0exzuZ1G91qAV2/buSXbS5gq+C/Y3H
-						oy5JYDmrpXjW3USSpueih9CCXINGjEHlAnaqaa0TCNYGFIQOVO7il0QonGIVeCuB
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3N0YWdlLm1haGFyYS5xbXVsLmFjLnVrMB0G
-						A1UdDgQWBBTbCH9ZyI7zqpqMbWKMMIDVxkc5DjANBgkqhkiG9w0BAQUFAAOCAQEA
-						ouDXbFLxN9s6JB+FMZXoH8ColtAmWTnial/A+tlDqp4QjbMOXBUP/dlNx55XYYyz
-						eiQwTf347Ap6ZhcC1t6o46VC247AKfBlGwe73ASTJujDiK3RmqAXjg1/tkAMzWrz
-						5GKNeLoTPP5TyuJ3614gZmZB6uLb8bfAVyXRmSH/IfxO616yF/LBzFtnTdERiHgX
-						5YYc1q/rFFhZW5VYzmdIUsY4SuZ6qwzfhzgJAhYz7s0bkwoBz6xZk1vMGtyqUXUh
-						TO8QG6ljEC4VQMB4AzASlawzv7IGaLbVJqIfypibgAuTMIio35JNpt+h92ySdMX5
-						Mp+1A9Jpnpwe7nn45pBkBA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stage.mahara.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: Staging Mahara</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services helpdesk</GivenName>
-    <EmailAddress>mailto:its-helpdesk@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Moodle Support</GivenName>
-    <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/stage.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/stage.qmplus.qmul.ac.uk-shibboleth.xml
deleted file mode 100644
index f845c459..00000000
--- a/swamid-interfederations-2.0/stage.qmplus.qmul.ac.uk-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://stage.qmplus.qmul.ac.uk/shibboleth">
-  <!--
-		This is a "Staging QMPlus" Shibboleth SP for Queen Mary and Westfield College, University of London.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-13T08:25:32Z"/>
-  </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://stage.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJALKxAgePakkwMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF3N0YWdlLnFtcGx1cy5xbXVsLmFjLnVrMB4XDTEyMDYwNzE0NTMzMFoXDTIy
-						MDYwNTE0NTMzMFowIjEgMB4GA1UEAxMXc3RhZ2UucW1wbHVzLnFtdWwuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9ivAZ6UNVeUCEdXQpkMrd
-						4Vlqxd5DYH1EqZmXDyS7aPuHGCf0TRwe4f/gwrjW9pufpcvJdWIx5xVA050CO9x1
-						5tIaRoGpwGLpi57IBQEYjPpjocF/h8TsrG+/lqD2goznu4jVmNSqFd23uXQd93mE
-						AFWaqoUWc9PN14pwMfqeChg6R9EaBdmtjBPVjX+Nc2NWDvM5oQv8XlFO1BnA+tIt
-						eyWFAiTs7YlbvMoc40XUjuIfZb6JNklpI5zLwR3+aMeEm02TXfRZeNtJx59kgTf+
-						wehHjLurwoAmzsq9+YUxfvxZrL+mWyRTz15x4LwxAL9uTUh7dWE5/Zb7DDbPsrkt
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3N0YWdlLnFtcGx1cy5xbXVsLmFjLnVrMB0G
-						A1UdDgQWBBSFCiz/saHI8JKRz6iF3iUjGLJtCDANBgkqhkiG9w0BAQUFAAOCAQEA
-						7Szt9KT41JWd/xxX1MHzpAvnoBM4mX+1d1s2YjJDVmKiojZ6ugbcLf0b/su3Z/Pa
-						zWqW0DTHT2M9tlzcsO58Jom2e5KHlYi6JW53OdJt5BLkeAg/2pFxwWpLH08aa3JL
-						YY3BYCduezz4W6bFDKuO77ItOso7AA3ht0YitAcLqbQrRwcw2wWMCXFbL8xPIeeV
-						c4YFVQd6DXqsHBJR5oh7qENv5xR0T09lAOq+MJxeLw5SPODqAUTHj+vQWffkxX3L
-						ikizbM30rhdKp+IkmknYtk/BD69rNZRebjpTLH2VXDqgfF5/Ebg9DV7HZA2x4um5
-						KM/oUrQbIhU0GvL2LaL7rQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stage.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College, University of London: Staging QMPlus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Services helpdesk</GivenName>
-    <EmailAddress>mailto:its-helpdesk@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Moodle Support</GivenName>
-    <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging-secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/staging-secure.nature.com-shibboleth.xml
deleted file mode 100644
index f62ebcb3..00000000
--- a/swamid-interfederations-2.0/staging-secure.nature.com-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://staging-secure.nature.com/shibboleth">
-  <!--
-		This is an OpenAthens (staging) service provider for Nature Publishing Group (Macmillan Publishers Limited).
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZzCCAk+gAwIBAgIEGVG+zDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEiMCAGA1UEAxMZc3RhZ2luZy1zZWN1cmUubmF0dXJlLmNvbTAeFw0xNTAz
-						MTMwNDMzMzVaFw0yNTAzMTAwNDMzMzVaMGQxCzAJBgNVBAYTAlVLMQ8wDQYDVQQH
-						EwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMDTlBHMSIwIAYD
-						VQQDExlzdGFnaW5nLXNlY3VyZS5uYXR1cmUuY29tMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEArVMbUSYp+G+y/5wUqk1eJ8qNRhIXaoZntMVpFPzfdMZ5
-						sztsM7eNgwBGYbEbTA0rnbSc29P6cGdg2Gm0EsQwzuMafp4nw/9F8zizzPHTweea
-						2iuVXP4nQUV1MbPJ/BamFwfzcDd6prxnIsAxdx6aaSOlpS9PYlEQjWSNw2+9oYlD
-						2QcCspvl71JZan3mdfoStcLvQfZzpmXmcgB3h6Yuq50SEhcvn1hr893XIRa0ipl4
-						5f5OrCYoWxUgsMzoVq3fgV3C0ot1XhM6CEhkcWRY6mntsHxEIzMnxkg6aM7u/s+y
-						r5bqDib1i903g+bfLkvXjnbpCSD4Jl9bCYJJnObq8wIDAQABoyEwHzAdBgNVHQ4E
-						FgQUYcm1nslMkBUN8StBQkbEYzpM1JYwDQYJKoZIhvcNAQELBQADggEBAI3mEHP4
-						7ViGSNOr+R/zO8H5zwBKuIeK/KzD8+Zv/QROh1Dzm90LWwa8ozk7llUNz8Ug5mJ8
-						GlaXUGDeEj4pFTRmWxTYQGi4mjJDo39KUrHocOE8FO9cqzxQ3mBMNTCx3xHzdhWy
-						vjA3g3O36EibSUWSfPQ4rN+iDaPIxASd32FSDPsKzaWyejnrGaRnuN0XjcFnKqgR
-						W3kGJM4YjtC1kc1wwEF2TYrvvaSgEHwhrf8YtShPWkuUMoFFw9DGq7I4yd3i8CdO
-						/dsJRiCxnXPAWkZNFFGDxmrfQ7cKEzWHnwCLtm9lHD1/3nT0nCurPEY+M/y9d6C4
-						g+RioiRha4Eokfc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging-secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging-secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nature Publishing Group (staging)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging-secure.palgrave-journals.com-shibboleth.xml b/swamid-interfederations-2.0/staging-secure.palgrave-journals.com-shibboleth.xml
deleted file mode 100644
index ed39f3df..00000000
--- a/swamid-interfederations-2.0/staging-secure.palgrave-journals.com-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://staging-secure.palgrave-journals.com/shibboleth">
-  <!--
-		This is an OpenAthens SP for Macmillan Publishers Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDfTCCAmWgAwIBAgIEOa48azANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEtMCsGA1UEAxMkc3RhZ2luZy1zZWN1cmUucGFsZ3JhdmUtam91cm5hbHMu
-						Y29tMB4XDTE1MDMxMzA0MzQyM1oXDTI1MDMxMDA0MzQyM1owbzELMAkGA1UEBhMC
-						VUsxDzANBgNVBAcTBkxvbmRvbjESMBAGA1UEChMJTWFjbWlsbGFuMQwwCgYDVQQL
-						EwNOUEcxLTArBgNVBAMTJHN0YWdpbmctc2VjdXJlLnBhbGdyYXZlLWpvdXJuYWxz
-						LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIHyl3oePKHnFxNF
-						CSQEyA9Ocp7Vcnzymm803oppvrMNKnhjSOIqCOUMD5tes63NteWPWQJBNVLkaEdf
-						EfFTsrRZ9oKrr9y1bLG7il/Sb16kqJHQ8vXFSVlccz5NYULF2jTDkS0rOb7mkXmb
-						gO/XFsF6bLB7r/eXK3z25NctUw4UJSw/B1K820VMswd/Dcb3znsr4yQqWJkUWIAL
-						0waHUQaVTNtWaXKtbQmViiiwonqto6Ye2hzLNsLhOS9f5BJqEXAYDknThMINP1oa
-						CgAXTTkYi88145R2shhlOqKDp+OUB96ceKAMI3UMU5+TQ3ZS5iJwosdo6YS/yOkk
-						QFm+S08CAwEAAaMhMB8wHQYDVR0OBBYEFL5WhIIycsk26UYkADtKUqMuWsM2MA0G
-						CSqGSIb3DQEBCwUAA4IBAQADjlbMsnCU2mfoE4fA02QSRa3juot6XG9fDPVmmGbS
-						lxUWKYqG4aQVAuc22fw901QlZE8AU196eSdY09wy38Z0ACxVtW/lQ+iwpStFD66o
-						7GVMFTdivjOWEBvBhHIxXIY72GV1ozG1h7MZl/vfRWtouYs4E56+LTsx51mGGBET
-						Drls78X94nEdRivSDF46QDtEA9jUOSXFKpNVXUVgRyiU1jGw2Il+e916OJikO8EE
-						bk/F7uyBln0L09JM6rlMstHeSBimlO2jKJTfM9LTAMOG8Ddu5awfbfsihHyq0Bq0
-						ocWH6VvJL9PvUxqsi0VS1X6BdlITJA1Kryhk6tGsWl28
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging-secure.palgrave-journals.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging-secure.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Palgrave Journals (staging)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging-secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/staging-secure.palgraveconnect.com-shibboleth.xml
deleted file mode 100644
index fa5b9385..00000000
--- a/swamid-interfederations-2.0/staging-secure.palgraveconnect.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://staging-secure.palgraveconnect.com/shibboleth">
-  <!--
-		This is an OpenAthens SP for Macmillan Publishers Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-23T15:28:40Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVjCCAj6gAwIBAgIETIS9pTANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzErMCkGA1UEAxMic3RhZ2luZy1zZWN1cmUucGFsZ3JhdmVjb25uZWN0LmNv
-						bTAeFw0xMDA5MDYxMDA4MzdaFw0xMzA5MDUxMDA4MzdaMG0xCzAJBgNVBAYTAlVL
-						MQ8wDQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMD
-						TlBHMSswKQYDVQQDEyJzdGFnaW5nLXNlY3VyZS5wYWxncmF2ZWNvbm5lY3QuY29t
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmorc2oOM/Jpc7xDJ+Jz4
-						DDtztP8WGnz6XAlSDwPmbEBZFUv7016jqXNj5k1JeB/caVHxHD4sXYm3Vgk2mXaL
-						0Ceh3Yolvihfsd97czXinucxWGoozR5P9r3LBOG0mDmm3H51P/RnNJBBv6ogZLM6
-						3Ypd7NiB1DPZeMsc908aPBOyCmMY6EwiDJ7yW4/7PDxaYQHZDCTHEx/wrJHddNKI
-						nQbZlQxDnVdGniCykir9QEz/la/WtA135GP5mGG5Du1qu2j4/DjqLCjRG5EkEelH
-						5Mg7fPP2RxtbD0TafZIPIO/9wYhKh8YDN08V9ov9anY547G7x6INPg4ymlY2lb3N
-						AQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCYYWAPH/FhXScjU+BjL0wovwMHv+2t
-						sL8urXcPJEVjEnnw1uGZQf+2rZdMWQutmdAtCs4K/oBPzduhnrPLmUTO8uePoK+E
-						LGymsoy9Znd+4fNsuN4MpFqUf1sIG0coizs6SiSBwaLIVi0veNQdBQaT/0iu16if
-						pjcFPSaWrve7IRpdVapI+5ZskHOUToWecugg7TVvb0q1Sslf2rkHn6f5R7e/bVRn
-						DRK2bX6SwjzZMWXqMrT3T6Fy807j34fd2Il4zESu0465u5kwhPCoLeujZ2ctilpg
-						cYGMbKh1v9ug3txsqBdCDX/JLCgXEDRx8XSXtYqMg1s2VwMSDQceuIi1
-					</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>
-						MIIDVjCCAj6gAwIBAgIETIS9pTANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzErMCkGA1UEAxMic3RhZ2luZy1zZWN1cmUucGFsZ3JhdmVjb25uZWN0LmNv
-						bTAeFw0xMDA5MDYxMDA4MzdaFw0xMzA5MDUxMDA4MzdaMG0xCzAJBgNVBAYTAlVL
-						MQ8wDQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMD
-						TlBHMSswKQYDVQQDEyJzdGFnaW5nLXNlY3VyZS5wYWxncmF2ZWNvbm5lY3QuY29t
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmorc2oOM/Jpc7xDJ+Jz4
-						DDtztP8WGnz6XAlSDwPmbEBZFUv7016jqXNj5k1JeB/caVHxHD4sXYm3Vgk2mXaL
-						0Ceh3Yolvihfsd97czXinucxWGoozR5P9r3LBOG0mDmm3H51P/RnNJBBv6ogZLM6
-						3Ypd7NiB1DPZeMsc908aPBOyCmMY6EwiDJ7yW4/7PDxaYQHZDCTHEx/wrJHddNKI
-						nQbZlQxDnVdGniCykir9QEz/la/WtA135GP5mGG5Du1qu2j4/DjqLCjRG5EkEelH
-						5Mg7fPP2RxtbD0TafZIPIO/9wYhKh8YDN08V9ov9anY547G7x6INPg4ymlY2lb3N
-						AQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCYYWAPH/FhXScjU+BjL0wovwMHv+2t
-						sL8urXcPJEVjEnnw1uGZQf+2rZdMWQutmdAtCs4K/oBPzduhnrPLmUTO8uePoK+E
-						LGymsoy9Znd+4fNsuN4MpFqUf1sIG0coizs6SiSBwaLIVi0veNQdBQaT/0iu16if
-						pjcFPSaWrve7IRpdVapI+5ZskHOUToWecugg7TVvb0q1Sslf2rkHn6f5R7e/bVRn
-						DRK2bX6SwjzZMWXqMrT3T6Fy807j34fd2Il4zESu0465u5kwhPCoLeujZ2ctilpg
-						cYGMbKh1v9ug3txsqBdCDX/JLCgXEDRx8XSXtYqMg1s2VwMSDQceuIi1
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging-secure.palgraveconnect.com/pc/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging-secure.palgraveconnect.com/pc/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging-secure.palgraveconnect.com/pc/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging-secure.palgraveconnect.com/pc/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Palgrave Macmillan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.palgraveconnect.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chike</GivenName>
-    <SurName>Abia</SurName>
-    <EmailAddress>mailto:C.Abia@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.anatomy.tv-shibboleth.xml b/swamid-interfederations-2.0/staging.anatomy.tv-shibboleth.xml
deleted file mode 100644
index 3fd84e42..00000000
--- a/swamid-interfederations-2.0/staging.anatomy.tv-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://staging.anatomy.tv/shibboleth">
-  <!--
-		This is a "www.anatomy.tv - Test server" OpenAthens SP for Primal Pictures Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-16T14:39:57Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDvjCCAqagAwIBAgIJANetmNOVoSNmMA0GCSqGSIb3DQEBBQUAMEgxKTAnBgNV
-						BAoTIEFuYXRvbXkudHYgLSBQcmltYWwgUGljdHVyZXMgTHRkMRswGQYDVQQDExJz
-						dGFnaW5nLmFuYXRvbXkudHYwHhcNMTMxMDMxMTExNjQ3WhcNMjMxMDI5MTExNjQ3
-						WjBIMSkwJwYDVQQKEyBBbmF0b215LnR2IC0gUHJpbWFsIFBpY3R1cmVzIEx0ZDEb
-						MBkGA1UEAxMSc3RhZ2luZy5hbmF0b215LnR2MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA3C52o8p8YkN1Fe4aZ6d6H5+LvpvXwLXm9Jwio0wYWhp+GYJI
-						L0iUZ8e3IN5h5wMXI9uPSn8fcTbdQMA3y1MMT+5CqKbLsUPTQTm68iXcdiPAJtfC
-						A4Bhg1ogW1Bh0npUAte2LDZLouKan8gd1/fBwqOc6qoI9LtDtQwzv4ICPSbmk8QJ
-						XeYnN9BnF7GK9qLBMsY/MjUNuMvTintAyw1fXt/RjDwUYaV38POWq2SWDLDUk4ZS
-						sCeIpmnOoPjtjMynCtdxCkpc/JoiXuPj+ZaVvC6dJ4HC4yYFJkh1Ekx0Y0FtLelo
-						I1eXC+3i1MsTxJgXH3BT7aoHabM1W6lMk3UdfwIDAQABo4GqMIGnMB0GA1UdDgQW
-						BBTm/zWeK4+cs7FFJxeAU1waEXxOhDB4BgNVHSMEcTBvgBTm/zWeK4+cs7FFJxeA
-						U1waEXxOhKFMpEowSDEpMCcGA1UEChMgQW5hdG9teS50diAtIFByaW1hbCBQaWN0
-						dXJlcyBMdGQxGzAZBgNVBAMTEnN0YWdpbmcuYW5hdG9teS50doIJANetmNOVoSNm
-						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHfMpqXjIy5q2EeadDTI
-						i9O99x8TqLBfdKNEsCu3lP8lTM9I++qa+0DYDsjIfLqAqTkvzTi+ImFVaL7TbmmO
-						qgHv2xg9bzfi82Ulp4ZP/BbEolRw68E+CA090k4NR7Q1YWrxolVJAK87kzEEAiho
-						SeogrT6SJJ0CipUkd3gqEXko58uVoR8IE6s4h3bZUOaYdUzJLvwdQMtwYy7I1X29
-						lAZVRAko2Zq9RszxLCkIXsQOLcwUYO6jOhDzk5alRux9T1skZvBoztZSzqcwIH4d
-						Z7J78e6jozliz4p+J0yRNZHUQ5cUhTh5pymiB5FceS696P8GR+497l95ATBme12S
-						G1M=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.anatomy.tv/shibboleth/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.anatomy.tv/shibboleth/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.anatomy.tv/shibboleth/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.anatomy.tv/shibboleth/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Primal Pictures Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Primal Pictures Limited: www.anatomy.tv - Test server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.primalpictures.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:techsupport@primalpictures.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Deepesh</GivenName>
-    <SurName>Shah</SurName>
-    <EmailAddress>mailto:deepesh@primalpictures.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.jorum.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/staging.jorum.ac.uk-shibboleth.xml
deleted file mode 100644
index c1a94787..00000000
--- a/swamid-interfederations-2.0/staging.jorum.ac.uk-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" entityID="https://staging.jorum.ac.uk/shibboleth">
-  <!--
-		This is a "Jorum Staging" Shibboleth SP for the University of Manchester.
-	-->
-  <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#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="2013-02-04T15:33:29Z"/>
-  </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://staging.jorum.ac.uk/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://vm-jorum.ds.man.ac.uk/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://staging.resourceshare.ac.uk/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://webstaging.jorum.ac.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://staging.jorum.ac.uk/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://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Login" index="2"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Login" index="3"/>
-      <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://webstaging.jorum.ac.uk/Shibboleth.sso/Login" index="4"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIJAMvDRTJflddLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3N0YWdpbmcuam9ydW0uYWMudWswHhcNMTMwMjAxMTE0MjMyWhcNMjMwMTMw
-						MTE0MjMyWjAeMRwwGgYDVQQDExNzdGFnaW5nLmpvcnVtLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAshCDHUltlUA+s2SyenjOhv25bLCgF0e/
-						6akdpCN65otOt5+naesfGFdZslcQ/CCqAe1i5tFCmBZ8eNSGt75pcmoqkzDPhpBN
-						mOsxaJjdwxHrnQWbFOXr+A10GPsdne0WfdBF/id4ZSPEHAeFPbqXtAP7cV1xQO6p
-						Pq7KVotO6vZZCDvqQlqnMXNuet3uVAYy9KZUCaJc2BqgN/PqZPGuFh05yUTDxpU+
-						NheOQB6G8uJOxeQMgzlda7DGpmyCJ/WQ2AfsFI5j5LFDd1bOF10D+CyWOwduieEX
-						1qNqbEEydR+CfFigLa2lHyOKTrz2S1O3pGo3Gv06ucLHbd+z3yDzDQIDAQABo2kw
-						ZzBGBgNVHREEPzA9ghNzdGFnaW5nLmpvcnVtLmFjLnVrhiZodHRwczovL3N0YWdp
-						bmcuam9ydW0uYWMudWsvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUUC/AOy7IH6iDm768
-						7bNBfNwPApgwDQYJKoZIhvcNAQEFBQADggEBAKtuA1eo/6O9HtcgSN6ykYW/HVIM
-						UvIXjowkbDvTBfF4az9ywZ2fgBMoJwTXUSGR4cRW5E8jlKexloFvfaoFMKNnN/C9
-						evebn4ffrjrfYh9RjsBl1vA6eingNUxUSfMNxsf2evGalI/x243F5XarJYDhbafL
-						U/UTjsVhMGOOVZopa3ibB9dCDw0152WL70p8i1CD5BdMuqEPxoMnDctaJ+4WXuyP
-						A21yBq6YB6zqgnzFWuIGyb+2nluyUEi3NG0Qg6w6sv9ouZl+LM1kUmfyFYHOogJZ
-						XEkxDTRCPMvlCw7I3BmOYjXH2WiVhzM8ytwkOdu12ZtJGSUqFoUhE1YNUdo=
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The University of Manchester: Jorum Staging</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://mimas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jorum Helpdesk</GivenName>
-    <EmailAddress>mailto:support@jorum.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.lifeisaboutlearning.com-shibboleth-sp.xml b/swamid-interfederations-2.0/staging.lifeisaboutlearning.com-shibboleth-sp.xml
deleted file mode 100644
index be2a5bb9..00000000
--- a/swamid-interfederations-2.0/staging.lifeisaboutlearning.com-shibboleth-sp.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://staging.lifeisaboutlearning.com/shibboleth-sp">
-  <!--
-		This is a "Staging" Shibboleth SP for UniServity Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://staging.lifeisaboutlearning.com/Shibboleth.sso/Secure"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAPtViNwB/v+VMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnN0YWdpbmctd2ViMS5zdGFnaW5nLmxvY2FsMB4XDTExMTAxMzEzMTYzNVoX
-						DTIxMTAxMDEzMTYzNVowJTEjMCEGA1UEAxMac3RhZ2luZy13ZWIxLnN0YWdpbmcu
-						bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsSO+LEfMhRz4+
-						uG061XictuNJevlzijTaPoWaj2DKujftRfAOyU0AWkavCO3xHaNMFv75j6XT7dXd
-						FfHB4tGo3mImHU2eIWWVGzgW/s2aW9hVSTKxdGyv+8mJlmvG6/t/R9ST+3xftu0q
-						BhNuLJ0bXoX80DDnUlELKL5CfToICzxjWd9j4kWhizozANaCL0bOiSWZOSeJKyMF
-						pMaKAAg9sfimH8oA5h8GRkV4CThTVpjomo0pkolJd6qg8XUaDW741IRp6B8IKDcD
-						1O0PecGPulpmGmfUw8rkNiZLTlWgluURYd+lOwJsyasl+L8KzOcHGvkJt9DvUt1+
-						lDCCZQqBAgMBAAGjSDBGMCUGA1UdEQQeMByCGnN0YWdpbmctd2ViMS5zdGFnaW5n
-						LmxvY2FsMB0GA1UdDgQWBBQ15cgGQF4wtYN8+itk5IVnxEdLITANBgkqhkiG9w0B
-						AQUFAAOCAQEABPS6lPeNvN6Uy791yHF7St30KguiNupP/VQup+uxbDk8lqjjll9U
-						KkJuaUU1eMh5wS1jxguBEK7gHvznl/sP2CpFlvsPjp3YjqiGKtIay+4/oJdQ/FGm
-						fdcStvP1kyUC+mzBxOZ5J5gjLHntO3DDjiKf/gow7t5r4gk2Zf+BsgrkgNc0xNNe
-						N72Uwlv3YkaWqnsuwvdk8haYTXO2xRyC9oDmckLEwkTBlprJ/xd0QlLmCCvRdvbV
-						b2PQA7P/jCpmFijFWdQ7b5E/yxUa16Er5WOJ7RWofAsL5fUwaup+VZe7w5P1CA3q
-						wMNSSkLVhUVe+ea/BAb0o5QDEn314PCgNA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.lifeisaboutlearning.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.lifeisaboutlearning.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.lifeisaboutlearning.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.lifeisaboutlearning.com/Shibboleth.sso/SLO/Redirect"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.lifeisaboutlearning.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.lifeisaboutlearning.com/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UniServity Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UniServity Limited: staging SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniservity.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UniServity Support</GivenName>
-    <EmailAddress>mailto:support@uniservity.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rezar</GivenName>
-    <SurName>Zefaj</SurName>
-    <EmailAddress>mailto:rezar.zafaj@uniservity.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.ords.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/staging.ords.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ba3ace56..00000000
--- a/swamid-interfederations-2.0/staging.ords.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://staging.ords.ox.ac.uk/shibboleth">
-  <!--
-		This is an "ORDS staging" Shibboleth SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-29T09:09: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://staging.ords.ox.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://staging.ords.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIJAKM+ZGZAkigcMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXN0YWdpbmcub3Jkcy5veC5hYy51azAeFw0xNDA0MjMxMjAwMDhaFw0yNDA0
-						MjAxMjAwMDhaMCAxHjAcBgNVBAMTFXN0YWdpbmcub3Jkcy5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPIzMJGiy26YXX/hbUenRMs6kvgB
-						UNJfZ2QPHp1PIrFXA+vMlscS5YEy0kIqVPwtZz5+qJAHSqKlQOM5cg05gfAolGd3
-						mDuKsRrQ68k2mv9O9XzBvREtdpBikdEq/l2dGcVg6TuN1yxR9D41tPR4KAcAFG75
-						z/Ok+7wLq+iZn0WBi5moYSfHHL8m4tspB5u9+W9o+oqePg5Qq6ks1TRIXNTF5llq
-						Sgd4KXxf2tErwQuGm9igjZdLpxWBgK1JRKbj2KCU2QHAjeJZwpByWEc1v/bji1nX
-						2pixxbTuqQM/E9oMk4u3j6mDBMfkYRfPonjDZpBdLIAKPqv1jPerEO7ejhUCAwEA
-						AaNtMGswSgYDVR0RBEMwQYIVc3RhZ2luZy5vcmRzLm94LmFjLnVrhihodHRwczov
-						L3N0YWdpbmcub3Jkcy5veC5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBS+sZ7C
-						5GuAQYsRxmwh+yjol3j1gjANBgkqhkiG9w0BAQUFAAOCAQEAWfln4ibbE5na1BfQ
-						7vF4MV+eai9uR86eyT5q+8+jKHcPV7Uj3xrbQCg67cq0MpqR8wyF9J0HpIvsJBVH
-						D6KU4FpLI2j5Ewk1AB+axpsowB+5jb69bI/kpVBegyXMizEvABgTkeChtijEQUtb
-						lCScLer3eDATqxIm0NsKhH2cGuLxuxUMm+4+Y2JEydhVgCQPscLGAHltvqKAEQKb
-						R4qMEHpJDyr08tW/e33fKDXxJJYVoy2fXbLXvRj1b24EHWotph4ymU/yV2FosVvd
-						On31/B5cEn9CioFOXIoI+idVlFcYjds3UL80ccdMvMZbuhAOrdSuiml0w68W908T
-						087V5g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.ords.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford ORDS staging</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.portal.euromonitor.com-athens.xml b/swamid-interfederations-2.0/staging.portal.euromonitor.com-athens.xml
deleted file mode 100644
index 4d3ec197..00000000
--- a/swamid-interfederations-2.0/staging.portal.euromonitor.com-athens.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://staging.portal.euromonitor.com/athens">
-  <!--
-		This is a "Passport (Staging)" OpenAthens SP for Euromonitor International plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-29T10:53:46Z">
-      <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Passport (Staging) - Euromonitor International</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Passport is Euromonitor International's gateway to global strategic intelligence.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDzTCCArWgAwIBAgIJAKY1zcaXHG70MA0GCSqGSIb3DQEBBQUAME0xIjAgBgNV
-						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxJzAlBgNVBAMTHnN0YWdpbmcu
-						cG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMzEwMDMwOTQ1NDFaFw0yMzEwMDEw
-						OTQ1NDFaME0xIjAgBgNVBAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxJzAl
-						BgNVBAMTHnN0YWdpbmcucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMeswt5WPQ+4Df7A4WKjSgvrfS+O0NbD+Zr1
-						mzxgCovcVsYjCXfMgN6ylaYEKSb2rdB33RrtcA4U+9GUX7jV6czcSn+q9smEOiUP
-						01id8xU09xB+xKvfqxHlzm3WtvtNDAMkLQokEzEiuR+QORwqO0ylK7ngFyr3QN9A
-						Kk8nU8PPOAJ3DAPRpFnAAiUaAKHyNlZLqWONr+5jVQAJGlnWc7Z3ian57YLKcG6Z
-						Pmnqt9n9gfBUmk6Oh1mxvN2mf+bStCXNjSmIV6X39Xl1RWNnl6SIIEB8ibrAZqpE
-						Gbb40d+/Ki3Whzh1wS4Mr/V/Yxo6Klqr4VqQoIfDq6J5CVa8GwsCAwEAAaOBrzCB
-						rDAdBgNVHQ4EFgQUA0geA/VQ7QAYL0gI5OnhkuUEgPIwfQYDVR0jBHYwdIAUA0ge
-						A/VQ7QAYL0gI5OnhkuUEgPKhUaRPME0xIjAgBgNVBAoTGUV1cm9tb25pdG9yIElu
-						dGVybmF0aW9uYWwxJzAlBgNVBAMTHnN0YWdpbmcucG9ydGFsLmV1cm9tb25pdG9y
-						LmNvbYIJAKY1zcaXHG70MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-						AJAi5ZB4lhOmbmzFuLUCyELol15fQA/iRfQqDmuCx2pcZhKrcU2d3suWYaBKu5eT
-						VX8MMHAHeO/7hdFbbjmTRcXJNnLMfRs5V5pnOj3F8GZtetDt0oU808w7fGESWifs
-						RljP0mxWzKQoiBxZXU9XJLJa64Nkfpr5Ohb95YhLr3i+K/HnHsYZw2wGonekCqFB
-						WMAzY3lJ/UoRe6MIMFGB/LX/uXkVXtjTldrauOik4NiDX1Z8AwYfU8f0T4iWUzrh
-						rlPlWyGoSgT23vdw9IKNL7msMOA8dOfzIClDtBbcOYlDpGI5gEMTiSbBhKLwuMT5
-						zcL17P70Sn+9n3DUm+MpLWw=
-					</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>
-						MIIDzTCCArWgAwIBAgIJAKY1zcaXHG70MA0GCSqGSIb3DQEBBQUAME0xIjAgBgNV
-						BAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxJzAlBgNVBAMTHnN0YWdpbmcu
-						cG9ydGFsLmV1cm9tb25pdG9yLmNvbTAeFw0xMzEwMDMwOTQ1NDFaFw0yMzEwMDEw
-						OTQ1NDFaME0xIjAgBgNVBAoTGUV1cm9tb25pdG9yIEludGVybmF0aW9uYWwxJzAl
-						BgNVBAMTHnN0YWdpbmcucG9ydGFsLmV1cm9tb25pdG9yLmNvbTCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMeswt5WPQ+4Df7A4WKjSgvrfS+O0NbD+Zr1
-						mzxgCovcVsYjCXfMgN6ylaYEKSb2rdB33RrtcA4U+9GUX7jV6czcSn+q9smEOiUP
-						01id8xU09xB+xKvfqxHlzm3WtvtNDAMkLQokEzEiuR+QORwqO0ylK7ngFyr3QN9A
-						Kk8nU8PPOAJ3DAPRpFnAAiUaAKHyNlZLqWONr+5jVQAJGlnWc7Z3ian57YLKcG6Z
-						Pmnqt9n9gfBUmk6Oh1mxvN2mf+bStCXNjSmIV6X39Xl1RWNnl6SIIEB8ibrAZqpE
-						Gbb40d+/Ki3Whzh1wS4Mr/V/Yxo6Klqr4VqQoIfDq6J5CVa8GwsCAwEAAaOBrzCB
-						rDAdBgNVHQ4EFgQUA0geA/VQ7QAYL0gI5OnhkuUEgPIwfQYDVR0jBHYwdIAUA0ge
-						A/VQ7QAYL0gI5OnhkuUEgPKhUaRPME0xIjAgBgNVBAoTGUV1cm9tb25pdG9yIElu
-						dGVybmF0aW9uYWwxJzAlBgNVBAMTHnN0YWdpbmcucG9ydGFsLmV1cm9tb25pdG9y
-						LmNvbYIJAKY1zcaXHG70MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-						AJAi5ZB4lhOmbmzFuLUCyELol15fQA/iRfQqDmuCx2pcZhKrcU2d3suWYaBKu5eT
-						VX8MMHAHeO/7hdFbbjmTRcXJNnLMfRs5V5pnOj3F8GZtetDt0oU808w7fGESWifs
-						RljP0mxWzKQoiBxZXU9XJLJa64Nkfpr5Ohb95YhLr3i+K/HnHsYZw2wGonekCqFB
-						WMAzY3lJ/UoRe6MIMFGB/LX/uXkVXtjTldrauOik4NiDX1Z8AwYfU8f0T4iWUzrh
-						rlPlWyGoSgT23vdw9IKNL7msMOA8dOfzIClDtBbcOYlDpGI5gEMTiSbBhKLwuMT5
-						zcL17P70Sn+9n3DUm+MpLWw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.portal.euromonitor.com/portal/oa/auth/rcv/shib/post" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.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://staging.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://staging.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://staging.portal.euromonitor.com/athensgateway/oa/auth/rcv/shib/post" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.portal.euromonitor.com/athensgateway/oa/auth/rcv/saml2/post" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Euromonitor International plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Passport (Staging) - Euromonitor International</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jürgen</GivenName>
-    <SurName>Wiehan</SurName>
-    <EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jürgen</GivenName>
-    <SurName>Wiehan</SurName>
-    <EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.researchmonitor.euromonitor.com-web-oa-metadata.xml b/swamid-interfederations-2.0/staging.researchmonitor.euromonitor.com-web-oa-metadata.xml
deleted file mode 100644
index dfa95968..00000000
--- a/swamid-interfederations-2.0/staging.researchmonitor.euromonitor.com-web-oa-metadata.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://staging.researchmonitor.euromonitor.com/web/oa/metadata">
-  <!--
-		This is a "Research Monitor (Staging)" SP for Euromonitor International plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-03T15:13:02Z">
-      <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>
-						MIIDvjCCAqagAwIBAgIJAK7CyN11IEtLMA0GCSqGSIb3DQEBBQUAMEgxFDASBgNV
-						BAoTC0V1cm9tb25pdG9yMTAwLgYDVQQDEydzdGFnaW5nLnJlc2VhcmNobW9uaXRv
-						ci5ldXJvbW9uaXRvci5jb20wHhcNMTMwOTEzMDcxNTIyWhcNMjMwOTExMDcxNTIy
-						WjBIMRQwEgYDVQQKEwtFdXJvbW9uaXRvcjEwMC4GA1UEAxMnc3RhZ2luZy5yZXNl
-						YXJjaG1vbml0b3IuZXVyb21vbml0b3IuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAp2d1o2RyIodtFfrHj1W4RWAcGF8sUjEdZv7Gcc0Z62CKIAzO
-						ymxC+b6UmqZAZdFzkzNDvJ4L7SPzi+jh9aeahZepejALQD1HxhUqQNE6hQdJfIxl
-						nXXYRl7qdt12aASDSImpI+pnlEJERKGsQ7TGcWyHUBmGExbdSAQTCXcQbSzTrf8M
-						qiU2mR8+NwQ59nNsIw2NmKgUaFH1G4b16Qg6sjIOBc9Qvi3T8aNJLTlWBlsc0S34
-						NUhQ244bfbjDXBohORWcedO5rvVOf/jq1Zuqp2VcQjxH5mzdSwKcgaPA3Bi33kHL
-						RbwfnjU81MRwnMTYn/vL+qImma+pbZmbZUBSVwIDAQABo4GqMIGnMB0GA1UdDgQW
-						BBSRbu5R+jct73Fwv5E5tG05aqZk/DB4BgNVHSMEcTBvgBSRbu5R+jct73Fwv5E5
-						tG05aqZk/KFMpEowSDEUMBIGA1UEChMLRXVyb21vbml0b3IxMDAuBgNVBAMTJ3N0
-						YWdpbmcucmVzZWFyY2htb25pdG9yLmV1cm9tb25pdG9yLmNvbYIJAK7CyN11IEtL
-						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHZcvly0zk2OsvuHpMFC
-						ds+Xmwp1NseFEB0VONywfd9lC004TmB0oCSRn7SN7fyMOBYbOsUwWM8WBUAmsY+F
-						KQw9MEaNxWONzEGa7ihBtkPHWE8OoxvAnoSNK6z2ZZjzh1NE/4znsxAwEAGKZryU
-						V016lBsKTqT6eRKQnV0m9IztJHZlAHRfTpNPI7cmzQssRjI+gj5GuaexhP5wr/3u
-						50IQrpoNjYPhA9Cm9ayYSsI8noy8x8QmuBoSjTHM3pN+WHbpbfa+lPCijyu3nof/
-						MEtQ0lp7WfwA2jm+nn0iJpl7MSyJGpmBOyr0TvV0G+UPTYmDmWQ/6wNHbnoC5uXY
-						970=
-					</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>
-						MIIDvjCCAqagAwIBAgIJAK7CyN11IEtLMA0GCSqGSIb3DQEBBQUAMEgxFDASBgNV
-						BAoTC0V1cm9tb25pdG9yMTAwLgYDVQQDEydzdGFnaW5nLnJlc2VhcmNobW9uaXRv
-						ci5ldXJvbW9uaXRvci5jb20wHhcNMTMwOTEzMDcxNTIyWhcNMjMwOTExMDcxNTIy
-						WjBIMRQwEgYDVQQKEwtFdXJvbW9uaXRvcjEwMC4GA1UEAxMnc3RhZ2luZy5yZXNl
-						YXJjaG1vbml0b3IuZXVyb21vbml0b3IuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAp2d1o2RyIodtFfrHj1W4RWAcGF8sUjEdZv7Gcc0Z62CKIAzO
-						ymxC+b6UmqZAZdFzkzNDvJ4L7SPzi+jh9aeahZepejALQD1HxhUqQNE6hQdJfIxl
-						nXXYRl7qdt12aASDSImpI+pnlEJERKGsQ7TGcWyHUBmGExbdSAQTCXcQbSzTrf8M
-						qiU2mR8+NwQ59nNsIw2NmKgUaFH1G4b16Qg6sjIOBc9Qvi3T8aNJLTlWBlsc0S34
-						NUhQ244bfbjDXBohORWcedO5rvVOf/jq1Zuqp2VcQjxH5mzdSwKcgaPA3Bi33kHL
-						RbwfnjU81MRwnMTYn/vL+qImma+pbZmbZUBSVwIDAQABo4GqMIGnMB0GA1UdDgQW
-						BBSRbu5R+jct73Fwv5E5tG05aqZk/DB4BgNVHSMEcTBvgBSRbu5R+jct73Fwv5E5
-						tG05aqZk/KFMpEowSDEUMBIGA1UEChMLRXVyb21vbml0b3IxMDAuBgNVBAMTJ3N0
-						YWdpbmcucmVzZWFyY2htb25pdG9yLmV1cm9tb25pdG9yLmNvbYIJAK7CyN11IEtL
-						MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHZcvly0zk2OsvuHpMFC
-						ds+Xmwp1NseFEB0VONywfd9lC004TmB0oCSRn7SN7fyMOBYbOsUwWM8WBUAmsY+F
-						KQw9MEaNxWONzEGa7ihBtkPHWE8OoxvAnoSNK6z2ZZjzh1NE/4znsxAwEAGKZryU
-						V016lBsKTqT6eRKQnV0m9IztJHZlAHRfTpNPI7cmzQssRjI+gj5GuaexhP5wr/3u
-						50IQrpoNjYPhA9Cm9ayYSsI8noy8x8QmuBoSjTHM3pN+WHbpbfa+lPCijyu3nof/
-						MEtQ0lp7WfwA2jm+nn0iJpl7MSyJGpmBOyr0TvV0G+UPTYmDmWQ/6wNHbnoC5uXY
-						970=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.researchmonitor.euromonitor.com/web/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.researchmonitor.euromonitor.com/web/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Euromonitor International plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Research Monitor (Staging) - Euromonitor International</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.euromonitor.com/contact.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jürgen</GivenName>
-    <SurName>Wiehan</SurName>
-    <EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jürgen</GivenName>
-    <SurName>Wiehan</SurName>
-    <EmailAddress>mailto:Jurgen.wiehan@euromonitor.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.researchprofessional.com-shibboleth.xml b/swamid-interfederations-2.0/staging.researchprofessional.com-shibboleth.xml
deleted file mode 100644
index 91c47632..00000000
--- a/swamid-interfederations-2.0/staging.researchprofessional.com-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" entityID="https://staging.researchprofessional.com/shibboleth">
-  <!--
-		This is a "Research Professional (Staging)" Shibboleth SP for Research Research Ltd.
-	-->
-  <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="2014-10-08T14:22:31Z">
-      <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: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://staging.researchprofessional.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID+jCCAuKgAwIBAgIJANtavlaD4gXtMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNV
-						BAYTAlVLMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZMb25kb24xHjAc
-						BgNVBAoTFVJlc2VhcmNoIFJlc2VhcmNoIEx0ZDEpMCcGA1UEAxMgc3RhZ2luZy5y
-						ZXNlYXJjaHByb2Zlc3Npb25hbC5jb20wHhcNMTQxMDAzMTUyNDUwWhcNMjQwOTMw
-						MTUyNDUwWjB+MQswCQYDVQQGEwJVSzETMBEGA1UECBMKU29tZS1TdGF0ZTEPMA0G
-						A1UEBxMGTG9uZG9uMR4wHAYDVQQKExVSZXNlYXJjaCBSZXNlYXJjaCBMdGQxKTAn
-						BgNVBAMTIHN0YWdpbmcucmVzZWFyY2hwcm9mZXNzaW9uYWwuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArdM6ozR6y5EBRjgqfDHUZPr2MicY03Gv
-						B3M3UlMLH63mzyUkG/PGu44ggqPLkb52ec7Gxj5/J+9xtFdLY9h2LUyBWF01O82H
-						j652edA19RigG5ph26VLy7d9fYG+PmUwhrlWlMIo4JvgopSL7Jrinn+CEMj2k7oY
-						fkCezsqL9jtSprylCHOwlFFysgIVNAcGhr9enQixVczaft02+CoWluBOgeXoUDZb
-						xJ0GY3Hld8Q2UrtLYJjgUPRoqIS4Vpcwo3byIE7Gd++CmeD5W4oeRrXYgt6c83PC
-						4L3g46OOqXyN9hb7LvaQmjsqSvpmpkHPPkUtPOcCyAGQpsx1FjOx5wIDAQABo3sw
-						eTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD
-						ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUle7hyLGQ0EpHrclYpACXpYbOYAMwHwYDVR0j
-						BBgwFoAUle7hyLGQ0EpHrclYpACXpYbOYAMwDQYJKoZIhvcNAQEFBQADggEBABGR
-						6qbmzA1hH18lj76R3XyV0ontRqZKvn8pwsK0K/GMWuKgv+OkYzEW6n6DeDL6sbSB
-						cC4uiuTaS2iclxRnYud8PZttjWjuZhzO1qICnLa8sUjKqV9HUD4Gr3AXgNXtcnwW
-						UMXAY2ys0GUtFoOR6vVPC0i35GErCCANcYOCw11ZRS71iNQtfXyblTHY1KVWNgsU
-						3NVNwf9tq1Pk1M2UgNmllfyyoGKxiNyechbWlb1MBkmdQEqHliRvGW7UV2UVhO5b
-						3kv1D2xEO0C7BaEihoy7KNWgAuhE/r9pM4nuN8s67A1PauUX+24rOtDWpf2D6IWZ
-						HvPzwSwM7ejfr+CISQ4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.researchprofessional.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.researchprofessional.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.researchprofessional.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.researchprofessional.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.researchprofessional.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.researchprofessional.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">Research Professional</ServiceName>
-      <ServiceDescription xml:lang="en">A service that provides access to research opportunities and funding</ServiceDescription>
-      <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"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" 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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Research Research Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Research Professional (Staging)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.researchresearch.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Potter</SurName>
-    <EmailAddress>mailto:sso@researchresearch.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Potter</SurName>
-    <EmailAddress>mailto:sso@researchresearch.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/staging.weblearn.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/staging.weblearn.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 39d13793..00000000
--- a/swamid-interfederations-2.0/staging.weblearn.ox.ac.uk-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://staging.weblearn.ox.ac.uk/shibboleth">
-  <!--
-		This is a Weblearn Staging Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://staging.weblearn.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIJAJX0ZKKX7ko1MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXN0YWdpbmcud2VibGVhcm4ub3guYWMudWswHhcNMTIwMTIwMTYyNDM2WhcN
-						MjIwMTE3MTYyNDM2WjAkMSIwIAYDVQQDExlzdGFnaW5nLndlYmxlYXJuLm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAujPN4+nPhmPX7IHC
-						DbKNREIMOegYbwxhS20EnBlNbePWKeWo/fRDsRITeV5aCBaEAUMPQ4pqm/WN7NOk
-						LkFyFdgf88u9RDRvt8nsiBj8cVP1vGOa8Fd+WJALk+UdTHjDmoz8bERL+cEsD1UC
-						FI/wUKmV9RfNGSEJFR0oDSddXI8Uy5DiFB0psDMY+b2CREqtSZcL8UZ5hXZHrBJn
-						MwSlpO9R09eYWePrDpSmB+3N0kZ8knt/452y4d3tqBiLlei8eYBJYx4uyVrh2yDe
-						TRXxFYf18C95X5alI6qQJ9LLtxUBG8H9dbqZNDZbDPUVZU43C9lyHZSNePL3nCey
-						/XundQIDAQABo3UwczBSBgNVHREESzBJghlzdGFnaW5nLndlYmxlYXJuLm94LmFj
-						LnVrhixodHRwczovL3N0YWdpbmcud2VibGVhcm4ub3guYWMudWsvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUoB3xlJRX2I37Yt1m1afvUCGruzYwDQYJKoZIhvcNAQEFBQAD
-						ggEBADSwA3sYHFxtdqLbm4mXlyYZV/imAfHxs2i4aXmyHYf5ygpKq6TyKxJlYj08
-						SPhSO87l5IsUJFQvvS0gn0JD+KQmD4zKwlxQrHHsSyltttXZr6/iLrpntrl9DXaB
-						6dYes8fj/+2FCai7W4DtMHfCKnIbZjgnjcHP1iJP38/qHF1OS6WFksXHWOHCT2S4
-						lsPet/+7viQNQBkHuxrb9h9hv4kbF+mLB8POpSkFi2qu8+YTwtU2LGOqYsOlcAc9
-						GEMwiQOt0LOOhVndYBUZf0Rt8g/Xn12lm3tkOjpVeRLw0oTli4DedF9JtqVyzKat
-						oWaY395NMNm9ZP2t/8TeydkoqYI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.weblearn.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Weblearn Staging</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-shibboleth.xml
deleted file mode 100644
index 2fa1ca68..00000000
--- a/swamid-interfederations-2.0/stats-qa.ukdataservice.ac.uk-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://stats-qa.ukdataservice.ac.uk/shibboleth">
-  <!--
-		This is a "UK Data Service Dotstat Quality Assurance server" Shibboleth SP for the University of Essex.
-	-->
-  <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="2015-03-06T10:10:02Z">
-      <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://stats-qa.ukdataservice.ac.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://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAPpH6NVGj1XdMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2RhZG90c3dlYnN0LmVzc2V4LmFjLnVrMB4XDTE1MDIxMjE0NTQxM1oXDTI1
-						MDIwOTE0NTQxM1owIjEgMB4GA1UEAxMXZGFkb3Rzd2Vic3QuZXNzZXguYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsGGwsGqLlefqf9/trBWbE
-						xMSEW2OX4wNs+z2HTDqknWz3iMsiGiKwWCHWX1ZoQ/wtTNWm2ZrwJEoJaddI7Sz4
-						GM2TA4P21HdYjzXrW1pjU0kiZSU+pxVXVK4PXvuUwB6kxBaKe308r6GBMHItLh7F
-						hGe9A2SvWgDBBlblyw+edNw4L8CebjXhqy9FjySpMYbSOf5EPgSZk65F0nJpAWNP
-						VJGORlYolNR/ida5zT6nrNZNKkNONGJNecduaA4Gz8wpdh/130MFdkvxfcubPSA6
-						zj/2gx1YSKiX21GFTwJ6IpbgfCEbva0AUoeqiUnDQeMj9tDRJsvig++n4IyXvgYb
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2RhZG90c3dlYnN0LmVzc2V4LmFjLnVrMB0G
-						A1UdDgQWBBS+yIbRvhlwfAoaYco+n9wYnqCH6TANBgkqhkiG9w0BAQUFAAOCAQEA
-						W5xAKRmFGiobOWK3XSS7vVIdw53mxNeX8V7ktOPPZfc7btPc9+T72YPS5E+qEGyg
-						GbyhL1KhZQl7TBeXVurcU8ZiSZcqhBKlW2e35OXh2ayt1s7dZI4FRwmlwnCWYrWV
-						4L0omNrpUJehBBN8YocDnewHmOxgdwp8xEg+8sQwJGCOUgIEW7RqPz9Ac1jUQYeI
-						lA45WldwBjDa9kEY+2RWISHZ1suZU3lZiSZuev8MT6OWGn5p7+Jg0Kp9DjZB/92L
-						6W8wXxM6Bx2xperc3d0sbkT3cbAnZwz5BWQHhsGZjHjRY/NzVLGwXgvG5w3VfDby
-						yMJeeTVd+zS0q0I6Z0aHYA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stats-qa.ukdataservice.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Essex</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UK Data Service Dotstat Quality Assurance server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ukdataservice.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Susan</GivenName>
-    <SurName>Noble</SurName>
-    <EmailAddress>mailto:Susan.Noble@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Syrotiuk</SurName>
-    <EmailAddress>mailto:nicholas.syrotiuk@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/stg.reachoutcpd.com-shibboleth-sp.xml b/swamid-interfederations-2.0/stg.reachoutcpd.com-shibboleth-sp.xml
deleted file mode 100644
index 67608f6c..00000000
--- a/swamid-interfederations-2.0/stg.reachoutcpd.com-shibboleth-sp.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://stg.reachoutcpd.com/shibboleth-sp">
-  <!--
-		This is a "ReachOutCPD" Shibboleth SP for Twig World 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="2015-05-05T07:38:45Z">
-      <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://stg.reachoutcpd.com/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://stg.reachoutcpd.com/Shibboleth.sso/shibtest"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stg.reachoutcpd.com/Shibboleth.sso/RMUnify"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://stg.reachoutcpd.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ReachOutCPD</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Online access to ReachOutCPD</mdui:Description>
-        <mdui:Logo height="153" width="202">https://stg.reachoutcpd.com/mdui-reachoutcpd-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIJAL30gKs3VPdtMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3N0Zy5yZWFjaG91dGNwZC5jb20wHhcNMTUwNDI0MTQ1MTQzWhcNMjUwNDIx
-						MTQ1MTQzWjAeMRwwGgYDVQQDExNzdGcucmVhY2hvdXRjcGQuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvj0x2RzQTuZLCehdtorr/NSEJRVIk1zu
-						216Db++oC6OqUj2QY9Gk7DFxudlEfA2rtBn9qTAANKFCQTE7dlfB9HSFLIVPRq9O
-						/XIIW2mBJbGBnEU76ihOm1K7MoR8YE335AGBX6aMGznjDtyejkmKtjUd0cfNMP4n
-						pVfZruw4lfYsOuTyWNNciY0EeW7KWb48HPr+aPpPaCj3BULuJWz5/4MXJEv3+AHU
-						CeaTSdqgK6GxvdSd0FZCx8uE/jY00/ao86Khlpo96lqyjPy3DTk2pXoZkyVRnRGe
-						UuqTyki5JmwaiubzvJ9i/5A+sNmzsQ1GxIV+YNtIaJrYoI3fenfihQIDAQABo2ww
-						ajBJBgNVHREEQjBAghNzdGcucmVhY2hvdXRjcGQuY29thilodHRwczovL3N0Zy5y
-						ZWFjaG91dGNwZC5jb20vc2hpYmJvbGV0aC1zcDAdBgNVHQ4EFgQURlhEJi5fy+T6
-						qLvKlrVDydUExfMwDQYJKoZIhvcNAQEFBQADggEBAHC2zHHbCiRpKFo6qW4iOR72
-						hriKJVKFAn2R6FjvPHiOX94DtigugA7fnJsiJFuV0k1dGmR49V+IvKHOGksEAR2S
-						eY1OJBIDTEHmqfkEIJMDv7/4VNYgfYkAoFARJMZKtSyKkbSK4LnAcqHsO3JPQObq
-						RnGtYBkA5ueuPlBlZSOFpalruwW5a+xJfPX8ywpGNCR7x2Rg9+y2tIou0HMWSNnU
-						tMZ4fmJjde6k1L39lWxloxotW2pn7EdExhBXSSHB7ZLxSh2Sw+jzVC3wVJExCDd9
-						P4qiW5N5wrp2gPuwfYg5+XLezOQ9qGVeNKKJrCZu24pR6d/y/6D/5m/XsEXIxfU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://stg.reachoutcpd.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stg.reachoutcpd.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stg.reachoutcpd.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stg.reachoutcpd.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stg.reachoutcpd.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stg.reachoutcpd.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Twig World Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ReachOutCPD</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://stg.reachoutcpd.com/about/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Munn</SurName>
-    <EmailAddress>mailto:dmunn@twig-world.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Munn</SurName>
-    <EmailAddress>mailto:dmunn@twig-world.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/stir.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/stir.unidesk.ac.uk-shibboleth.xml
deleted file mode 100644
index 31de3ffc..00000000
--- a/swamid-interfederations-2.0/stir.unidesk.ac.uk-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://stir.unidesk.ac.uk/shibboleth">
-  <!--
-		This is a "Unidesk - University of Stirling" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-20T13:24:51Z">
-      <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://stir.unidesk.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAPHsl6kKrFrnMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEmxpdmUudW5pZGVzay5hYy51azAeFw0xMjA0MTExNDU4MjhaFw0yMjA0MDkx
-						NDU4MjhaMB0xGzAZBgNVBAMTEmxpdmUudW5pZGVzay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAL9qh/Dehm5jJdWdeFPNKqcjMdiqii8Iz9Rc
-						tCAsEwRsYww4EQDG7MxG5hg4NSS+iIPFCp9gR+G7hTnZAMGgNpxs2vk4vs9lmhRY
-						GmB7Y1NFloP9Pcsu+MaufaLzxi6bzIXV4dBVHqVnIcgxchDIsXmPE6xlq4poEq+q
-						XJ3aFE/eWwxfwN9z0s5yeICzsil73xk9T9NLeNAeYq+jfVTcdqDbBHY6eHtMOYh/
-						uPVYYxkKXjkgSH5cwG0b+7qN4z+uzKDNBXxnI1Nz+bLOazXW6ljQIDtAPQZMJSlr
-						3OepVaQS+fMBi0Sku5yvADgINdXxkz6H4Zx4pZg/rTQBQ/8u2esCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISbGl2ZS51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBQ2tPlzxC8e
-						akC2nh9qrG4TWfI3tzANBgkqhkiG9w0BAQUFAAOCAQEAWPY3Nv9ChZ+4XVNANhLq
-						fGF7SbiPmUNj9vWGNjCp8Ma0tdDOZPvqBRzxKkkR+LS+fHpSQQ54RuNeZrulWBiN
-						akZe3LZiSH9AHG2uD0lDuxr0UQt1AHGDiLjFXuRg9+CdqqrdT3Anmy6exDDfRsjH
-						k+ZJflkEtqTNd0dbEVlkYlg8Baqx/ZMOxkccx8PtQt1yptAMsH4Rn92vXLd9d3JM
-						H1mrFuiriqrgsAfVLmzc4WeGmB+dK01cSB+CY7hKnoe7ds1y7kNhOmZ9HP3Iy7ev
-						gF2RCdnqkP9zScihW4b20PlVa/sWMUyCj2uZE1lSO51PJcGVU0H/JFrBEpaM7u6t
-						jg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stir.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://stir.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stir.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stir.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stir.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stir.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stir.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stir.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stir.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stir.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stir.unidesk.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Unidesk - University of Stirling</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Helpdesk</GivenName>
-    <EmailAddress>mailto:IS.Helpdesk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-techmgt@mlist.is.ed.ac.uk</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 ff28a803..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">
-  <md: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>
-  </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>
-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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - LU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Latvia - LU SP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lu.lv/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lv">http://www.lu.lv/</md:OrganizationURL>
-  </md: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 7f39bd42..00000000
--- a/swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.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://strong.renater.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="15" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAPCAIAAABiEdh4AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAADwCRnKNdAAACBElEQVQoz22RPWgTcRjGn/vf5S7XJk1Ja0mDpEYF0cZmMwhpcRI/6GIpXTToIjpUnERQUHQoioM4FQoOFSo6qB3EoKCoKFIdbEBqMKDRpDS9NunFXD7v/q9DNe3VPuvz/njf53lBm2nFqOLI1dv3X/5vMWymh88/olg5fyd++saDDZYNePc5xYkACAAgwC1PxGd7Y7eevEnwfzPC96yWyRXcLU6PWx1//F6VpcP7d+8LBTXd6D83npwvQGQo1eFSrg1HBgf6hKlnM5+SGVVxMECRJSLUGqa/s+3M0IAF6hwe00tViAxEKFQux6ICEf1cyE+/ThR+l0X290LT4opDunjyYHohv23oJtqdAJArfX10gQEI+LyjIwdcqkJEq4AkslrDnHz6ocfnPXUohLoFvXp8MLwr0LUWOtLb07Ca2SCJbO7HolGpHY2GsFK5FOu/d+WEraU92/2c0/rSZElM/dJ8XhcY69vZremGDSgalY3vEGBaVlbT4RRHRieXi2UbsFQoMUGwAYS2VnX67RcoEtyyLEs2IJHKiqLtj0RUrptTr+bgEAGoirwGVOuNVGaZrVvAOYV2dF+/G4eDAYDH6T82pukGa26PhoOAUK2bnMi0uMV5Ir3Y4BQOdGCpDJPPTpzd4mkVmt2v6ls692ImubXLE9kb7Gx3i0wAkC+WSUCHuwXAH/rb+m9hYGX6AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjAxKzAyOjAwck/JggAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTowMSswMjowMAMScT4AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.renater.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://strong.renater.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://strong.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://strong.renater.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIP RENATER - Authentification forte</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER - Authentification forte</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>support@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
index d54176c5..78057774 100644
--- a/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
+++ b/swamid-interfederations-2.0/sts.ait.dtu.dk-adfs-services-trust.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:wayf="http://wayf.dk/2014/08/wayf" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.ait.dtu.dk/adfs/services/trust">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://sts.ait.dtu.dk/adfs/services/trust">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2013-11-29T11:29:26Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2013-11-29T11:29:26Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
         <mdui:Description xml:lang="da">Formålet er at give ansatte fra WAYF-tilsluttede institutioner personlig adgang til samarbejdssites oprettet af DTU-ansatte.</mdui:Description>
         <mdui:Description xml:lang="en">The purpose is to provide employees from WAYF-connected organisations personalised access to collaboration sites enabled by DTU employees.</mdui:Description>
         <mdui:DisplayName xml:lang="da">Share DTU</mdui:DisplayName>
@@ -15,7 +20,7 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEezCCA2OgAwIBAgIQbFP2zBUPa2qKmnvEij297DANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMTAyMzAwMDAwMFoXDTE2MTAyMjIzNTk1OVowRTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSAwHgYDVQQDExd0b2tlbnNpZ25pbmcuYWl0LmR0dS5kazCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALqAUfbI6hct5ZYP3tNyUHAo+D+U0cVqZqCTJDfQWpO6+tSCRgmHY9Teu1pOR8Ddw/OdVI7R3lmTmWOWUuJHr4DDrAEQyvhmDklCDB78tbzBbbF514C5gyoagh1xAXn5bv9IPg4ByBCyi3Gbuwy4fBvpneVnpInaleRwNhWuxsPZWbpnHyaYBhjzTyA6U33cWXMdxZKXtPPgqPZvCfcsWagnzU90LgdCsumrulkTI0AZnLPzmYBH0ZpYUKVkIvbba53N5s96VJ7zbCCWrsnRQ42seGi1TQRpbPVd6jlegUvQJ2J/M4dtpMBjr3siWT/b9AN7IpnN5hcp9ZYl+ju/B38CAwEAAaOCAXQwggFwMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQjNdOyedlmcPWRhMy3I9+igVdZWDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwIgYDVR0RBBswGYIXdG9rZW5zaWduaW5nLmFpdC5kdHUuZGswDQYJKoZIhvcNAQEFBQADggEBAH3nPUupxXENBOof3REi6WHldSXIc59DkUw1Rng81XYh39A7SaHkGxGz1WYVKIzYNlzmhsDSl3JfluaWwpdNcpMh3VklKa453zM7He8u3jpSC+5sez0LSmWV/TRY0q3rASSNRMcDetGwm5/tgKCzX28cNvrqm2xAjrnNS2/BQlrSi4txHlxBxL39r6zkZ10h7ED6NO9F+ShCIcCZZMIwYeXOQqDY6pR4qJ7SI09O74RkSHF+Pdd7lNyRzZiFoM77yI0Aot0XxQqMKD7otqiNuKObpJ4OrC90pzrEOufKPmEe9tkHExlcpALfCv2UaFCsVZc0YHymIFgcXKvYX4Y3gTY=</ds:X509Certificate>
         </ds:X509Data>
@@ -23,20 +28,20 @@
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.ait.dtu.dk/adfs/ls/"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" Location="https://sts.ait.dtu.dk/adfs/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="1" Location="https://sts.ait.dtu.dk/adfs/ls/"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" index="2" Location="https://sts.ait.dtu.dk/adfs/ls/"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.ait.dtu.dk/adfs/ls/" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sts.ait.dtu.dk/adfs/ls/" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.ait.dtu.dk/adfs/ls/" index="2"/>
     <md:AttributeConsumingService index="1" isDefault="true">
       <md:ServiceName xml:lang="da">Share DTU</md:ServiceName>
       <md:ServiceName xml:lang="en">Share DTU</md:ServiceName>
       <md:ServiceDescription xml:lang="da">Formålet er at give ansatte fra WAYF-tilsluttede institutioner personlig adgang til samarbejdssites oprettet af DTU-ansatte.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">The purpose is to provide employees from WAYF-connected organisations personalised access to collaboration sites enabled by DTU employees.</md:ServiceDescription>
-      <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="organizationName" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="gn" 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="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:oid:2.5.4.3" 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" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="organizationName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="gn" 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" FriendlyName="eduPersonPrincipalName" 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" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
@@ -48,8 +53,6 @@
     <md:OrganizationURL xml:lang="en">http://www.dtu.dk/english</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:EmailAddress>tato@dtu.dk</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.xml
deleted file mode 100644
index 2c84f7e5..00000000
--- a/swamid-interfederations-2.0/sts.deltion.nl-adfs-services-trust.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="http://sts.deltion.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-01T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Deltion College</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Deltion College</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Deltion College</mdui:Description>
-        <mdui:Description xml:lang="en">Deltion College</mdui:Description>
-        <mdui:Logo height="38" width="108">https://static.surfconext.nl/logos/idp/deltion-companylogo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">ROC MBO Zwolle Deltion College</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">ROC MBO Zwolle Deltion College</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/d6417b895cf5178b82879f0f2396e457"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Deltion College</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Deltion College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Deltion College</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Deltion College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.deltion.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.deltion.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/sts.edugroepen.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.edugroepen.nl-adfs-services-trust.xml
deleted file mode 100644
index 54d62c4e..00000000
--- a/swamid-interfederations-2.0/sts.edugroepen.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.edugroepen.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-07T20:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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 WantAssertionsSigned="true" 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">EDUgroepen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">EDUgroepen</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Samenwerkingsplatform om in groepen samen te werken in de educatieve sector.</mdui:Description>
-        <mdui:Description xml:lang="en">Collaboration platform for working in groups in the educational sector.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="nl">http://login.edugroepen.nl/privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://login.edugroepen.nl/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.edugroepen.nl/signin-edugain" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">2AT BV</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">2AT BV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">2AT BV</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">2AT BV</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.2at.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.2at.nl/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>EDUgroepen</md:GivenName>
-    <md:SurName>2AT</md:SurName>
-    <md:EmailAddress>info@edugroepen.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>EDUgroepen</md:GivenName>
-    <md:SurName>2AT</md:SurName>
-    <md:EmailAddress>info@edugroepen.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>EDUgroepen</md:GivenName>
-    <md:SurName>2AT</md:SurName>
-    <md:EmailAddress>info@edugroepen.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.learnium.net-entity.xml b/swamid-interfederations-2.0/sts.learnium.net-entity.xml
deleted file mode 100644
index aebd51b9..00000000
--- a/swamid-interfederations-2.0/sts.learnium.net-entity.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://sts.learnium.net/entity">
-  <!--
-		This is a "Learnium" simpleSAMLphp SP for Alacrity Foundation.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-28T12:34:24Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE+jCCA+KgAwIBAgIJAO4YoaUX4maKMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-						VQQGEwJHQjEOMAwGA1UECBMFR3dlbnQxEDAOBgNVBAcTB05ld3BvcnQxIDAeBgNV
-						BAoTF1RoZSBBbGFjcml0eSBGb3VuZGF0aW9uMREwDwYDVQQLEwhMZWFybml1bTEZ
-						MBcGA1UEAxMQc3RzLmxlYXJuaXVtLm5ldDEtMCsGCSqGSIb3DQEJARYedGh1Z2hl
-						c0BhbGFjcml0eWZvdW5kYXRpb24uY29tMB4XDTEzMDgyODExNTQyOFoXDTIzMDgy
-						ODExNTQyOFowga4xCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVHd2VudDEQMA4GA1UE
-						BxMHTmV3cG9ydDEgMB4GA1UEChMXVGhlIEFsYWNyaXR5IEZvdW5kYXRpb24xETAP
-						BgNVBAsTCExlYXJuaXVtMRkwFwYDVQQDExBzdHMubGVhcm5pdW0ubmV0MS0wKwYJ
-						KoZIhvcNAQkBFh50aHVnaGVzQGFsYWNyaXR5Zm91bmRhdGlvbi5jb20wggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmsrdUSgNYSnRE0ddtJg2bdkb+bFVy
-						swu2z7H91PCUpp3eSQ87eVRKhjMnWnsDwhjWptrAd5k7FiOJXhYjkAVtEYgzUAF8
-						wiNNR2JKTP89x0JjwY3i9wBh3UqymZs23eqC5PSotG9hwXZLob6juabI07F0cIH+
-						F1RA8pZ5fcp02mdKogWlMFOKbIWXR1whOgYtAh4S8TnvNNPBg0Iqe8JO9wOHnnL/
-						SOPjSeJaaEnEt2yv4CVu3Zi1ve1gyZ2ZAKdLb4wZA2ujtxr2EGuvi+S2zIQNx491
-						BevoFakzEmrpaCb5i68k25Uw7aQywrgxq+EqGbCrbgxXvQKQKfu0EushAgMBAAGj
-						ggEXMIIBEzAdBgNVHQ4EFgQUSy9nXlJjwq8KvJJ0yRPJL+zaPfkwgeMGA1UdIwSB
-						2zCB2IAUSy9nXlJjwq8KvJJ0yRPJL+zaPfmhgbSkgbEwga4xCzAJBgNVBAYTAkdC
-						MQ4wDAYDVQQIEwVHd2VudDEQMA4GA1UEBxMHTmV3cG9ydDEgMB4GA1UEChMXVGhl
-						IEFsYWNyaXR5IEZvdW5kYXRpb24xETAPBgNVBAsTCExlYXJuaXVtMRkwFwYDVQQD
-						ExBzdHMubGVhcm5pdW0ubmV0MS0wKwYJKoZIhvcNAQkBFh50aHVnaGVzQGFsYWNy
-						aXR5Zm91bmRhdGlvbi5jb22CCQDuGKGlF+JmijAMBgNVHRMEBTADAQH/MA0GCSqG
-						SIb3DQEBBQUAA4IBAQCN+mOdxNb0Old9C8EXDZl47iMT/eLVGHRwTD1lKEOG7RxZ
-						C9/M2IWlWfAaczahV6o5J+AgkHMcRpr7Ba3AtKQGAa1CAjci6cUVqWDJuLVZoJwa
-						ZQK8Hio+p0uCqmWaxnfyJDCCPiSweI3JfFf16zKE7JpdwMN3FCwL3C9jZ9ox5AUB
-						ys8Sl9SIeCu/0BWv9719L8rOvWLf7A4A14xyqLJnN/DQ7HAGjZmy/mdT0BJsy3IH
-						xMwg3id/eGcieKkMTZ6UmrKAPvN+9pr1fUedp8kFlnTNJJ9manlE9KIjNWuhX8l3
-						zblMCr3htJ+JowBQNDrmfFz0yCR8VZlzh5JsEs+W
-					</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>
-						MIIE+jCCA+KgAwIBAgIJAO4YoaUX4maKMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-						VQQGEwJHQjEOMAwGA1UECBMFR3dlbnQxEDAOBgNVBAcTB05ld3BvcnQxIDAeBgNV
-						BAoTF1RoZSBBbGFjcml0eSBGb3VuZGF0aW9uMREwDwYDVQQLEwhMZWFybml1bTEZ
-						MBcGA1UEAxMQc3RzLmxlYXJuaXVtLm5ldDEtMCsGCSqGSIb3DQEJARYedGh1Z2hl
-						c0BhbGFjcml0eWZvdW5kYXRpb24uY29tMB4XDTEzMDgyODExNTQyOFoXDTIzMDgy
-						ODExNTQyOFowga4xCzAJBgNVBAYTAkdCMQ4wDAYDVQQIEwVHd2VudDEQMA4GA1UE
-						BxMHTmV3cG9ydDEgMB4GA1UEChMXVGhlIEFsYWNyaXR5IEZvdW5kYXRpb24xETAP
-						BgNVBAsTCExlYXJuaXVtMRkwFwYDVQQDExBzdHMubGVhcm5pdW0ubmV0MS0wKwYJ
-						KoZIhvcNAQkBFh50aHVnaGVzQGFsYWNyaXR5Zm91bmRhdGlvbi5jb20wggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmsrdUSgNYSnRE0ddtJg2bdkb+bFVy
-						swu2z7H91PCUpp3eSQ87eVRKhjMnWnsDwhjWptrAd5k7FiOJXhYjkAVtEYgzUAF8
-						wiNNR2JKTP89x0JjwY3i9wBh3UqymZs23eqC5PSotG9hwXZLob6juabI07F0cIH+
-						F1RA8pZ5fcp02mdKogWlMFOKbIWXR1whOgYtAh4S8TnvNNPBg0Iqe8JO9wOHnnL/
-						SOPjSeJaaEnEt2yv4CVu3Zi1ve1gyZ2ZAKdLb4wZA2ujtxr2EGuvi+S2zIQNx491
-						BevoFakzEmrpaCb5i68k25Uw7aQywrgxq+EqGbCrbgxXvQKQKfu0EushAgMBAAGj
-						ggEXMIIBEzAdBgNVHQ4EFgQUSy9nXlJjwq8KvJJ0yRPJL+zaPfkwgeMGA1UdIwSB
-						2zCB2IAUSy9nXlJjwq8KvJJ0yRPJL+zaPfmhgbSkgbEwga4xCzAJBgNVBAYTAkdC
-						MQ4wDAYDVQQIEwVHd2VudDEQMA4GA1UEBxMHTmV3cG9ydDEgMB4GA1UEChMXVGhl
-						IEFsYWNyaXR5IEZvdW5kYXRpb24xETAPBgNVBAsTCExlYXJuaXVtMRkwFwYDVQQD
-						ExBzdHMubGVhcm5pdW0ubmV0MS0wKwYJKoZIhvcNAQkBFh50aHVnaGVzQGFsYWNy
-						aXR5Zm91bmRhdGlvbi5jb22CCQDuGKGlF+JmijAMBgNVHRMEBTADAQH/MA0GCSqG
-						SIb3DQEBBQUAA4IBAQCN+mOdxNb0Old9C8EXDZl47iMT/eLVGHRwTD1lKEOG7RxZ
-						C9/M2IWlWfAaczahV6o5J+AgkHMcRpr7Ba3AtKQGAa1CAjci6cUVqWDJuLVZoJwa
-						ZQK8Hio+p0uCqmWaxnfyJDCCPiSweI3JfFf16zKE7JpdwMN3FCwL3C9jZ9ox5AUB
-						ys8Sl9SIeCu/0BWv9719L8rOvWLf7A4A14xyqLJnN/DQ7HAGjZmy/mdT0BJsy3IH
-						xMwg3id/eGcieKkMTZ6UmrKAPvN+9pr1fUedp8kFlnTNJJ9manlE9KIjNWuhX8l3
-						zblMCr3htJ+JowBQNDrmfFz0yCR8VZlzh5JsEs+W
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sts.learnium.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Alacrity Foundation</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Learnium</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.alacrityfoundation.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Learnium Helpdesk</GivenName>
-    <EmailAddress>mailto:support@learnium.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Toby</GivenName>
-    <SurName>Hughes</SurName>
-    <EmailAddress>mailto:thughes@alacrityfoundation.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml
deleted file mode 100644
index 6eef2be1..00000000
--- a/swamid-interfederations-2.0/sts.roc-nijmegen.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.roc-nijmegen.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-07-30T10:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">ROC Nijmegen</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">ROC Nijmegen</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">ROC Nijmegen</mdui:Description>
-        <mdui:Description xml:lang="en">ROC Nijmegen</mdui:Description>
-        <mdui:Logo height="15" width="108">https://static.surfconext.nl/logos/idp/roc-nijmegen.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">MBO ROC Nijmegen</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">MBO ROC Nijmegen</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/d8ea069ad0633af0a11fe741f3ceb585"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ROC Nijmegen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ROC Nijmegen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.roc-nijmegen.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/sts.talnet.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml
deleted file mode 100644
index 2028571c..00000000
--- a/swamid-interfederations-2.0/sts.talnet.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.talnet.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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:Description xml:lang="nl">ROC van Amsterdam</mdui:Description>
-        <mdui:Description xml:lang="en">ROC van Amsterdam</mdui:Description>
-        <mdui:Logo height="288" width="263">https://static.surfconext.nl/logos/idp/ROCvA_logo2.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">ROC rocva Flevoland VOvA Amsterdam</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">ROC rocva Flevoland VOvA Amsterdam</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/700f5baa5be6a812bb8917e9e54d2756"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">ROC van Amsterdam Flevoland en VOvA</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">ROC van Amsterdam Flevoland en VOvA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">ROC van Amsterdam Flevoland en VOvA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ROC van Amsterdam Flevoland en VOvA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.rocva.nl/organisatie/pages/english.aspx</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.rocva.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/sts.uidaho.edu-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.uidaho.edu-adfs-services-trust.xml
deleted file mode 100644
index bafc9958..00000000
--- a/swamid-interfederations-2.0/sts.uidaho.edu-adfs-services-trust.xml
+++ /dev/null
@@ -1,69 +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://sts.uidaho.edu/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uidaho.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Idaho</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>
-MIIC2DCCAcCgAwIBAgIQanGKteQbqaJAlcgB3suvTDANBgkqhkiG9w0BAQsFADAo
-MSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBzdHMudWlkYWhvLmVkdTAeFw0xMzEx
-MjEwMjAzNDBaFw0yMzExMTkwMjAzNDBaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmlu
-ZyAtIHN0cy51aWRhaG8uZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAvxqCeaB16O2SwKSirv/0Td7CezzlEY8xC343HZwj15PZpaByb9XgIMHgnH18
-7440sKK6s+XJDnYcM2qIpYMpfxeDWR/6TaPswOEncF4BBHrT/ksaBHG38JWYs+OQ
-MLLbBUO+kNmZBu4SM1+lPmwgk4v+3m/W/rLZO0QzD/uUM1uocPAdb/HiAOFH+2gB
-emPOO12FDnfeWzTcF1051SY9/WBDhoaLVfTJ/uBX9WYcuuMMM4z+9C09f7H2x9pu
-vZ1IwFjoS9Az3jsGaDJ9XgOjrPzxv25NrtH6Dw77vruddYMOYfgADtZHhXi6co0n
-TULj5VIuMy38vlv5Ku6UGDpg2QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAcSBso
-s7Tqr0JHLR2waVJoaXn8hELPBSNMzk6GocSVCtkKeMQyxmw2LWxfEIob2ho+EdyY
-hn1gm+l0vxXL3tOwJDEDNs6eZAzUOyNUOjSNOxAZEgIitX+QzswpTttZ1WGhma2O
-F2dXuQFEv79aRuRI4Bz2LeH4hu0OBVJR3NgILkPZvMK/QxcTN03SEOFTyCc5Ck2a
-QXa2fVyd3xEe7FAoaisTPVMi6e8MQ4Jcu/bgBG52rAg+Y/Sgz+D2EIbgTDc0+xGY
-MGhvxW12UxkimmJ8rN9492Znq/GewfKGTTZHhIFvPfRsrSEcUphmwD+V2boyAs2b
-3kFlhhPzSTF6fK6w
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.uidaho.edu/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.uidaho.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sts.uidaho.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sts.uidaho.edu/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sts.uidaho.edu/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Idaho</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Idaho</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uidaho.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Systems Team</md:GivenName>
-    <md:EmailAddress>systems@uidaho.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Security Office</md:GivenName>
-    <md:EmailAddress>its-security@uidaho.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@uidaho.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Security Office</md:GivenName>
-    <md:EmailAddress>its-security@uidaho.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.xml
deleted file mode 100644
index 5348925a..00000000
--- a/swamid-interfederations-2.0/sts.windesheim.nl-adfs-services-trust.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="http://sts.windesheim.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-03-30T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Hogeschool Windesheim</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Windesheim University of Applied Sciences</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Hogeschool Windesheim</mdui:Description>
-        <mdui:Description xml:lang="en">Hogeschool Windesheim</mdui:Description>
-        <mdui:Logo height="25" width="108">https://static.surfconext.nl/logos/idp/windesheim.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Hogeschool Windesheim University of Applied Sciences HBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Hogeschool Windesheim University of Applied Sciences HBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/7c588283e83a906442b0591b722db36b"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Hogeschool Windesheim</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Hogeschool Windesheim University of Applied Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Hogeschool Windesheim</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Hogeschool Windesheim University of Applied Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.windesheim.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.windesheim.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/sts.wur.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml
deleted file mode 100644
index 5171254d..00000000
--- a/swamid-interfederations-2.0/sts.wur.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.wur.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-06-08T20:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">wur.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">Wageningen UR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Wageningen UR</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Wageningen UR</mdui:Description>
-        <mdui:Description xml:lang="en">Wageningen UR</mdui:Description>
-        <mdui:Logo height="17" width="108">https://static.surfconext.nl/logos/idp/wur.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Wageningen Universiteit university WUR UR</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Wageningen Universiteit WUR UR</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/4ff1ecb290680df5b2ee5c631c2fc102"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Wageningen UR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Wageningen UR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wageningenur.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/sts.zadkine.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml
deleted file mode 100644
index 64b6c384..00000000
--- a/swamid-interfederations-2.0/sts.zadkine.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://sts.zadkine.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-04-29T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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:Description xml:lang="nl">Zadkine (nieuw)</mdui:Description>
-        <mdui:Description xml:lang="en">Zadkine (nieuw)</mdui:Description>
-        <mdui:Logo height="86" width="86">https://static.surfconext.nl/logos/idp/zadkine.gif</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Zadkine ROC MBO</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Zadkine ROC MBO</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/16af967ce379fb1cc54bbe2e8ad5d565"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Zadkine</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Zadkine</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Zadkine</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Zadkine</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.zadkine.nl</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.zadkine.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/stsfed.login.vu.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml
deleted file mode 100644
index 666ab3a1..00000000
--- a/swamid-interfederations-2.0/stsfed.login.vu.nl-adfs-services-trust.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://stsfed.login.vu.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-26T16:10:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">Vrije Universiteit</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">VU University Amsterdam</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Vrije Universiteit (login)</mdui:Description>
-        <mdui:Description xml:lang="en">VU University Amsterdam</mdui:Description>
-        <mdui:Logo height="51" width="107">https://static.surfconext.nl/logos/idp/vu.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">VU University Amsterdam</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">VU Vrije Universiteit Amsterdam</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/f5fc4ac4149942d16a3ad9e1d2c82065"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">VU University Amsterdam</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">VU University Amsterdam</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vu.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/stsr4l.who.int-adfs-services-trust.xml b/swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml
deleted file mode 100644
index fc057ac3..00000000
--- a/swamid-interfederations-2.0/stsr4l.who.int-adfs-services-trust.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://stsr4l.who.int/adfs/services/trust">
-  <!--
-		This is an ADFS 2 "Research4Life" IdP entity for the World Health Organisation.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-28T13:21:48Z">
-      <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">r4l.who.int</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIGiDCCBXCgAwIBAgIKYVPlegAAAAAABTANBgkqhkiG9w0BAQUFADBcMRMwEQYK
-						CZImiZPyLGQBGRYDaW50MRMwEQYKCZImiZPyLGQBGRYDd2hvMRMwEQYKCZImiZPy
-						LGQBGRYDcjRsMRswGQYDVQQDExJyNGwtR1ZBMVNXRkFVTlMtQ0EwHhcNMTIwNTA2
-						MjIxMTEyWhcNMjIwNTA0MjIxMTEyWjCBjTELMAkGA1UEBhMCQ0gxFDASBgNVBAgT
-						C1N3aXR6ZXJsYW5kMQ8wDQYDVQQHEwZHZW5ldmExDDAKBgNVBAoTA1dITzEYMBYG
-						A1UECxMPUmVzZWFyY2ggNCBMaWZlMS8wLQYDVQQDEyZSZXNlYXJjaCA0IExpZmUg
-						RGVjcnlwdGlvbiBDZXJ0aWZpY2F0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAMVK/t8wzynyfSItN1BY/nejUBJDatb5lL58XROO7+yIL5pTZYaFLg/K
-						0b55EoIwYm950046lofctR5Xbp1qb9HqQptOOkChg38/qMuXnsQrm6eBfWohiktF
-						sNteuhQ+7YUaCrrLqwUodswhwFMyPD0rDN9DWIKy/Y6A3FsduiJIbNT0zpz9RGYj
-						Toa7HrSc9gKMzKdW+cMRfQeOJ0W51p1r18MXkaAMLmkbCrf1w9Ouka5yhLLkpNNF
-						8wBOem8AKxq8s1SuWkaJfVDucFkQWkJ57mmTKf7rjTy4xI2I6kQdydjPMsMhani1
-						6vd0VMwxwh8E2SFzP0vV37TqWYECuikCAwEAAaOCAxgwggMUMDsGCSsGAQQBgjcV
-						BwQuMCwGJCsGAQQBgjcVCIGo8Tu0k2aChZcAh7OWLYfmxTo86N1AgpfCQwIBZAIB
-						BDATBgNVHSUEDDAKBggrBgEFBQcDATAOBgNVHQ8BAf8EBAMCBaAwGwYJKwYBBAGC
-						NxUKBA4wDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUaybI92Naf+oLfYqLzrtFr5sR
-						4mEwHwYDVR0jBBgwFoAUhYqhzuILkqlHFYR7i0HAQQqs1yMwggEeBgNVHR8EggEV
-						MIIBETCCAQ2gggEJoIIBBYaBwGxkYXA6Ly8vQ049cjRsLUdWQTFTV0ZBVU5TLUNB
-						LENOPUdWQTFTV0ZBVU5TLENOPUNEUCxDTj1QdWJsaWMlMjBLZXklMjBTZXJ2aWNl
-						cyxDTj1TZXJ2aWNlcyxDTj1Db25maWd1cmF0aW9uLERDPXI0bCxEQz13aG8sREM9
-						aW50P2NlcnRpZmljYXRlUmV2b2NhdGlvbkxpc3Q/YmFzZT9vYmplY3RDbGFzcz1j
-						UkxEaXN0cmlidXRpb25Qb2ludIZAaHR0cDovL2d2YTFzd2ZhdW5zLnI0bC53aG8u
-						aW50L0NlcnRFbnJvbGwvcjRsLUdWQTFTV0ZBVU5TLUNBLmNybDCCAS8GCCsGAQUF
-						BwEBBIIBITCCAR0wgbQGCCsGAQUFBzAChoGnbGRhcDovLy9DTj1yNGwtR1ZBMVNX
-						RkFVTlMtQ0EsQ049QUlBLENOPVB1YmxpYyUyMEtleSUyMFNlcnZpY2VzLENOPVNl
-						cnZpY2VzLENOPUNvbmZpZ3VyYXRpb24sREM9cjRsLERDPXdobyxEQz1pbnQ/Y0FD
-						ZXJ0aWZpY2F0ZT9iYXNlP29iamVjdENsYXNzPWNlcnRpZmljYXRpb25BdXRob3Jp
-						dHkwZAYIKwYBBQUHMAKGWGh0dHA6Ly9ndmExc3dmYXVucy5yNGwud2hvLmludC9D
-						ZXJ0RW5yb2xsL0dWQTFTV0ZBVU5TLnI0bC53aG8uaW50X3I0bC1HVkExU1dGQVVO
-						Uy1DQS5jcnQwDQYJKoZIhvcNAQEFBQADggEBAJzeblEGJ/yQdbYzsDi1ibqTFRGy
-						Je7Zm1HBD+LHutlpNpx6QYbq08YyJbIwkd38TRLpgrc3gNM9pqRSMToklzHF+1VX
-						UhTeoMrBt5dQpVe158Frqf6IGn4RT5kItcQk3fXCZ/gtwvg8EQQ8WZDYDOpCTYsK
-						oJa867mo3NiwHHgWAkOku7zBJrE4y6WLm6v7Gbc8/qbKlkDOLM0JpN8M7RbwqFLB
-						MkaycTbjne8hZvyAE+pky6gOfSqel1sK0shc6884l/MYpFtPeQqEAfgRhgpqBfLa
-						Az0acO7R8jZkOciJKqgkuko1GYl2ipGTlDrAJs9IIUxIW8elG1WqegohJFE=
-					</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>
-						MIIGcjCCBVqgAwIBAgIKYSsQ1wAAAAAABDANBgkqhkiG9w0BAQUFADBcMRMwEQYK
-						CZImiZPyLGQBGRYDaW50MRMwEQYKCZImiZPyLGQBGRYDd2hvMRMwEQYKCZImiZPy
-						LGQBGRYDcjRsMRswGQYDVQQDExJyNGwtR1ZBMVNXRkFVTlMtQ0EwHhcNMTIwNTA2
-						MjEyNjM2WhcNMjIwNTA0MjEyNjM2WjB4MQswCQYDVQQGEwJDSDEPMA0GA1UECBMG
-						R2VuZXZhMQ8wDQYDVQQHEwZHZW5ldmExCzAJBgNVBAoTAlVOMQwwCgYDVQQLEwNX
-						SE8xLDAqBgNVBAMTI1Jlc2VhcmNoIDQgTGlmZSBTaWduaW5nIENlcnRpZmljYXRl
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjRqeMgwiOIvM7dWyWUmH
-						NRuYiBy2/PzOIEIFiTg8iNAYMTbvf9ynnoEDYxEUh9Xbmox7B5DGOtMi/Kx5HQ50
-						w7hdBdf2xCSMJXCK4MeZpvJnReH+vOriOJ6URuxBk8HTo01eIh1LgEeP1avKzhws
-						LYILbazCyxqW13MuGAMVSm5X1C2r29jR4nAd3kx48cssmHuQVnAlLqJIDyGigtia
-						edsnOqkSx0l2MBS3QBZo11L1jD7NFCi3/EQaL0UvFNwrYN+YMVb++xHVnG1Uk3uH
-						8UL1hgdz1Lz9kXVJCfqThTY1G/g4+giAFAw5pt5CVogozZHvSGqiNnguM+edAwdM
-						rwIDAQABo4IDGDCCAxQwOwYJKwYBBAGCNxUHBC4wLAYkKwYBBAGCNxUIgajxO7ST
-						ZoKFlwCHs5Yth+bFOjzo3UCCl8JDAgFkAgEEMBMGA1UdJQQMMAoGCCsGAQUFBwMB
-						MA4GA1UdDwEB/wQEAwIFoDAbBgkrBgEEAYI3FQoEDjAMMAoGCCsGAQUFBwMBMB0G
-						A1UdDgQWBBQKLtC/thXz3Vw0OcrEki+CvZIRYjAfBgNVHSMEGDAWgBSFiqHO4guS
-						qUcVhHuLQcBBCqzXIzCCAR4GA1UdHwSCARUwggERMIIBDaCCAQmgggEFhoHAbGRh
-						cDovLy9DTj1yNGwtR1ZBMVNXRkFVTlMtQ0EsQ049R1ZBMVNXRkFVTlMsQ049Q0RQ
-						LENOPVB1YmxpYyUyMEtleSUyMFNlcnZpY2VzLENOPVNlcnZpY2VzLENOPUNvbmZp
-						Z3VyYXRpb24sREM9cjRsLERDPXdobyxEQz1pbnQ/Y2VydGlmaWNhdGVSZXZvY2F0
-						aW9uTGlzdD9iYXNlP29iamVjdENsYXNzPWNSTERpc3RyaWJ1dGlvblBvaW50hkBo
-						dHRwOi8vZ3ZhMXN3ZmF1bnMucjRsLndoby5pbnQvQ2VydEVucm9sbC9yNGwtR1ZB
-						MVNXRkFVTlMtQ0EuY3JsMIIBLwYIKwYBBQUHAQEEggEhMIIBHTCBtAYIKwYBBQUH
-						MAKGgadsZGFwOi8vL0NOPXI0bC1HVkExU1dGQVVOUy1DQSxDTj1BSUEsQ049UHVi
-						bGljJTIwS2V5JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlv
-						bixEQz1yNGwsREM9d2hvLERDPWludD9jQUNlcnRpZmljYXRlP2Jhc2U/b2JqZWN0
-						Q2xhc3M9Y2VydGlmaWNhdGlvbkF1dGhvcml0eTBkBggrBgEFBQcwAoZYaHR0cDov
-						L2d2YTFzd2ZhdW5zLnI0bC53aG8uaW50L0NlcnRFbnJvbGwvR1ZBMVNXRkFVTlMu
-						cjRsLndoby5pbnRfcjRsLUdWQTFTV0ZBVU5TLUNBLmNydDANBgkqhkiG9w0BAQUF
-						AAOCAQEArCQyLaK4yA7KCruY/0oYlIkk06X3y/sp4nZhrxyRQ7BQG6vKStUUqUKy
-						ZQCYT9WW/aUaDscwH74zoHMvk8unfNLNQZETf90881Uu9nqVX+CFxIGOPrKGBtCM
-						jYlkryG7XVFFknPPlDPU5SZ7IwaTb0lIYpQ0vuVwyLPds/6u3hGeza5SJ2SAkock
-						iIWGuT4LQLhLTYeYX2qGpHWT7jdOTiAVsrXHaOlZcWux72kCtDfpW7u2mIpeyMU0
-						zqYtQCwKgqVbXc24yBta07RnmrOl1+dWA6ACzGRp0iqCxx2WCkUBzIkWOy6olTYc
-						n9UIkmXwvsC7ywdo45OLLuqcKXRiDw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stsr4l.who.int/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stsr4l.who.int/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>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stsr4l.who.int/adfs/ls/"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stsr4l.who.int/adfs/ls/"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">World Health Organisation</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Research4Life</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.research4life.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ged</GivenName>
-    <SurName>Cheng</SurName>
-    <EmailAddress>mailto:gedatwho@gmail.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ged</GivenName>
-    <SurName>Cheng</SurName>
-    <EmailAddress>mailto:gedatwho@gmail.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml b/swamid-interfederations-2.0/studentstore.phoenixs.co.uk-shibboleth.xml
deleted file mode 100644
index 90073e85..00000000
--- a/swamid-interfederations-2.0/studentstore.phoenixs.co.uk-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://studentstore.phoenixs.co.uk/shibboleth">
-  <!--
-		This is a "Student Store" Shibboleth SP for Phoenix Software 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="2012-08-10T11:56:28Z"/>
-  </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://studentstore.phoenixs.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://studentstore.phoenixs.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIJAMKtTUHoN0LYMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG3N0dWRlbnRzdG9yZS5waG9lbml4cy5jby51azAeFw0xMjA4MDkxNTMxMTBa
-						Fw0yMjA4MDcxNTMxMTBaMCYxJDAiBgNVBAMTG3N0dWRlbnRzdG9yZS5waG9lbml4
-						cy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMiA8DdoMw8u
-						n7QMtSDz2zi+fHPDrKb3/a2NtSCQh2TXIpN4uARHv3hpsHcbUmEDr2gIK0KTE1nW
-						VD4ZrNqCiWBvWc9cf8sgUoYntcL9nXqwEfvoCtdw5jY6IzLj92hiH/TrkSFXL1Y7
-						fW53pwaNjTo1Rck8c5Um1eKH+hNWwB1/jKVAlTsyr56c3t39FBNahlAxB3OoL4+6
-						lPax1SXvugowfh7F7yWxCSIaKzAGXw75ml8jE0bo52jz+Zxk4Mmz8xDYjQ3+Itm1
-						PZ94WymMTiRpKM0HLqH3s6ExKKHm08ahAwvDEz7hxSXna6iozFaQGxFNXD8J0lXM
-						VJfYjJMmgscCAwEAAaN5MHcwVgYDVR0RBE8wTYIbc3R1ZGVudHN0b3JlLnBob2Vu
-						aXhzLmNvLnVrhi5odHRwczovL3N0dWRlbnRzdG9yZS5waG9lbml4cy5jby51ay9z
-						aGliYm9sZXRoMB0GA1UdDgQWBBSYHv7Z/DKteKW3DlKVYW5oR/QawzANBgkqhkiG
-						9w0BAQUFAAOCAQEAvkuWNy9+6h2kW77zyBfAOiNAkfhUQJhLbKnT8pLf+WWUH8os
-						K/U6TL8py/ReOLMIeIPMSLzDD4ZcXt029E1zoIo0XddRfpY/ts/zYvCSKvyV7Djm
-						6+dTy9zWotpj6u8EG7/NwyqQ9T3p59HXaJCJnqFOgqfdyuxbQqpJKNkMTBnU9Lsn
-						5/yTTiGVjO+kQJ4DqMBDIIXuxfOOLpnYEJpjRUkrGWqOiLvPUuOp6N+p7YOaof8+
-						pMO1+iiqwJHHCnZnmAStXECu/j1i6BIvFX0bdK9imOuA+euujEfCf3E6evJvsCeu
-						gYsJPfcJiOV+ZzJTGZE2VhUvF3MAeThxL44KmQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://studentstore.phoenixs.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://studentstore.phoenixs.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Phoenix Software Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Phoenix Student Store</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.phoenixs.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Gary</GivenName>
-    <SurName>Leighton</SurName>
-    <EmailAddress>mailto:Gary-Leighton@phoenixs.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gary</GivenName>
-    <SurName>Leighton</SurName>
-    <EmailAddress>mailto:Gary-Leighton@phoenixs.co.uk</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 0c0bc62f..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"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://studienportal.vetmed.uni-muenchen.de/shibboleth">
-  <md: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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SLO/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://studienportal.vetmed.uni-muenchen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Studienportal tierärztliche Fakultät LMU</md:ServiceName>
-      <md:ServiceName xml:lang="en">Studienportal tierärztliche Fakultät LMU</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Studienportal tierärztliche Fakultät LMU</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Studienportal tierärztliche Fakultät LMU</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="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e29</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e29</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">https://lmuidp.lrz.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://lmuidp.lrz.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Cyrill</md:GivenName>
-    <md:SurName>Matenaers</md:SurName>
-    <md:EmailAddress>mailto:studienportal@it.vetmed.uni-muenchen.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Studienportal</md:GivenName>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:studienportal@it.vetmed.uni-muenchen.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f964b8cb..00000000
--- a/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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"/>
-  </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/study.conted.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/study.conted.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 37c53ca8..00000000
--- a/swamid-interfederations-2.0/study.conted.ox.ac.uk-shibboleth-sp.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://study.conted.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is an "Award bearing course delivery site" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-08-04T13:59: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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEmjCCA4KgAwIBAgIJAOLozXNL6LsnMA0GCSqGSIb3DQEBBQUAMIHNMQswCQYD
-						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
-						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
-						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMR4wHAYDVQQDDBVzdHVkeS5jb250
-						ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNvbnRlZC5v
-						eC5hYy51azAeFw0xNDA1MjAxMDQ4MDhaFw0yNDA1MTcxMDQ4MDhaMIHNMQswCQYD
-						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
-						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
-						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMR4wHAYDVQQDDBVzdHVkeS5jb250
-						ZWQub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNvbnRlZC5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQoniFVDKEq
-						6jlQx2bHK9cCCT2T4n8J4X3cHDgOnvngHl/n97SaRBrqkIW9wmDudfV/y7nGCptK
-						6towZz+rM0RDmCfIu7VH57WhEpfB4iUqGjYCY44vVy8gDJdRWgXf7pqa/9B0yHzy
-						ulyqOqlObv8YNz/fWgTnKQTCDiy6N4dVxWm1GElRv/grCQIzJ5tiWt9H11w8lyeZ
-						2kTFwbgJOGqAc6C9sJ7TXIycZef2oJaQ+Qf7oCD0BVyRy08yV5Xhhem6jWa+Zx7I
-						s00cN61Co34QAzXHdUdA21myUBd4R5i1kjNIroqV/a5+5Oj8NWOsFAtcAPLqrpvO
-						0+rzGQXFCCsCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
-						blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFINOZtymmwrCBaQ6
-						SBLdj5qEF+kPMB8GA1UdIwQYMBaAFINOZtymmwrCBaQ6SBLdj5qEF+kPMA0GCSqG
-						SIb3DQEBBQUAA4IBAQAhqfovymE3xaeIHPF/rqOT0odVHG20bKu4UdGI+xj5RlcZ
-						qhVwFiSgUU/fIK2wZ5vl3fCJEY1Jlq/okJfQhoDcGSWBlcXJ8Dy1LI7YzIPM9YYX
-						vyQTAKR/iimGYuWXLRAyKFBMliLVH51EeGP0bh+02fEW20jqrxkRfrrlZNNsRaZ+
-						gDRamuJk6cEQNIbH9vJ12gyng17kTfV9D5p+7mBBiBf4LAyZYBwpXFQcMR5MVlQX
-						E5fLZIdP/chQFDreH6byJlD+8ZHWy+sQqhUSFRNBcgEATwuq9aNcXkzm/0CKOVaD
-						4o+kyplCfQiX41wflBJr2mENvIue2wY387e4q0t2
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://study.conted.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://study.conted.ox.ac.uk/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Award bearing course delivery site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/submissions.ref.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/submissions.ref.ac.uk-shibboleth.xml
deleted file mode 100644
index 9d6080db..00000000
--- a/swamid-interfederations-2.0/submissions.ref.ac.uk-shibboleth.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://submissions.ref.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 'REF 2014 Submission system' SP for the Higher Education Funding Council for England.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-20T10:40:56Z"/>
-  </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://submissions.ref.ac.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://submissions.ref.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="100" width="360">https://submissions.ref.ac.uk/i/reflogo_subs.gif</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">REF 2014 Submission system</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3zCCAcegAwIBAgIJAP8XeLlAC0V5MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHJlZi13ZWIxMB4XDTEyMDYxMjA3MjYyNVoXDTIyMDYxMDA3MjYyNVowEzER
-						MA8GA1UEAxMIcmVmLXdlYjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDOgCaKzMbgtA6CxE1zNX2r4/bcIaPcfkPhFwRpoaE038g5C7HfSOWWXzkWVL8/
-						vV5eWKRd89XQ7fSUUwXAs4X3gZlSlzNxmPIEDPI9oRQDbKW2LNjW/En75IWJlrdL
-						u5QdSj/LMsqcRvBOAS729yCswFLstJLrqLbHALiqtKW5zeq2gWJ55p1XEZUXtb0C
-						gSjzI/Ni0mHvPouXqbuMQ2X2qrdZkzVcD8Uvoqk/jTtiPaFkpcIpqQsQ0f8qUJ2n
-						0fUPv89vxl0RqIWs8HC885NpCVTm28XwTFt10PlTY49GCXKOjP1ZilhtnQk0VhWX
-						tar6f3h4S5N9rN9lO4/z3JShAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHJlZi13ZWIx
-						MB0GA1UdDgQWBBQTvJTNEamzZ7uy0pGYmn33zELkAjANBgkqhkiG9w0BAQUFAAOC
-						AQEAQRXI7iLaQT7iAXn1KR5qtScyDTZSWwfvIPghihUNP+61aW+UOTG9r7R1H4R+
-						5Zig+v8HmiO8VB7wPubPhL8UkR1C+11vkhGXNauENN1uhEVWK5na+yA7KDE3t8Bf
-						Avy3unb1q8/mc1jKU2kVhbKBhFh68osJV9TZAoYdDRNfkdNFaTQqFl1j5zAkGdxL
-						5Ax4XXtFOPp6TuFLWL1QLxdfozypxkOfHDDFMknhhifVDnNhyNQhV4dtR1adKHmW
-						K52v8ZbRnOSnk0ruip+qXPv6p4fpyJ8yKaUb4uPgtglChLINS8Zgw81aXqGDYY6Y
-						VUVYKKdPUd+3m5jTxdJth8UmPg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://submissions.ref.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://submissions.ref.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Higher Education Funding Council for England</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">REF 2014 Submission system</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hefce.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>User support</GivenName>
-    <EmailAddress>mailto:user-support@ref.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Gareth</GivenName>
-    <SurName>Edwards</SurName>
-    <EmailAddress>mailto:g.edwards@hefce.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/subscription.echalk.co.uk-shibboleth.xml b/swamid-interfederations-2.0/subscription.echalk.co.uk-shibboleth.xml
deleted file mode 100644
index 864c778f..00000000
--- a/swamid-interfederations-2.0/subscription.echalk.co.uk-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://subscription.echalk.co.uk/shibboleth">
-  <!--
-		This is an "Interactive resources for whole-class teaching" Shibboleth SP for eChalk Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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"/>
-  </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://subscription.echalk.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUjCCAjqgAwIBAgIJAIxk1ZoatOwHMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXN1YnNjcmlwdGlvbi5lY2hhbGsuY28udWswHhcNMDkwODE0MTAyNDMyWhcN
-						MTkwODEyMTAyNDMyWjAkMSIwIAYDVQQDExlzdWJzY3JpcHRpb24uZWNoYWxrLmNv
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA284/+4DBsyk67HOJ
-						ptE1JK2ntKVDgjUzGlqIdLGepXJEpWL6JEoMA0f2V+TI2GzhcXPUa3Refysqj9Yo
-						v+3Fo6jc8yMUz6PlMkRaOQH/0v5dTCCZIhaqDzBOI5XFCo/nTONY10oSDT59ypRZ
-						/fRWCLHPBRtWYQuKQeFadyFH6Ox4kjfANiykpzHYu+kzOStUsOF4hulZ4p5q4WoB
-						o/tnmCJuZO+wViVZw2P/KF1R4vFsEUiD7sFoFU/+zOyKoS4eC+cCcMBxXu9CsRaS
-						yk+5Ob1wSjDooOdd8pRBsAkuYMxzdv0d+uMznwhiybjlMj8Mk6OFswsHMo4B/moW
-						F2s7gQIDAQABo4GGMIGDMB0GA1UdDgQWBBQrvG0acEEnI7JXqoFYdrzLC171EzBU
-						BgNVHSMETTBLgBQrvG0acEEnI7JXqoFYdrzLC171E6EopCYwJDEiMCAGA1UEAxMZ
-						c3Vic2NyaXB0aW9uLmVjaGFsay5jby51a4IJAIxk1ZoatOwHMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBAHGSPPNL5RZ8hIzclnzlF0kgBZqIdY6pMvBk
-						+ftUmpI6NRkPsY1TI/k7SPYcAOcS+ujPUzrX7nnoosXRZ+z2WmA2Oyd+HTqnw83r
-						GdJflkPCAiKRkmBC7uJGdBP9AR+fTQeBZdbf7DbKQjmpkxjfhPaDM/3Oi69E/jli
-						+YM0f4JcfJWcxEPKRGDSpCkR/idaQZkVDc22T7lq7sOMlKVtS0bg02IjvSf9teJp
-						yLoqT2I7utT6SVExQtH+R3jpEPqKRR2/ct8B9Yc+MaaWwU2CTYsvDydLgGgp7Ar/
-						j4zX/I526fHsI+R5AO9HpeyqGRBhxBBsymL4bb9BZ/Ew43NokdM=
-					</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>
-						MIIDUjCCAjqgAwIBAgIJAIxk1ZoatOwHMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXN1YnNjcmlwdGlvbi5lY2hhbGsuY28udWswHhcNMDkwODE0MTAyNDMyWhcN
-						MTkwODEyMTAyNDMyWjAkMSIwIAYDVQQDExlzdWJzY3JpcHRpb24uZWNoYWxrLmNv
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA284/+4DBsyk67HOJ
-						ptE1JK2ntKVDgjUzGlqIdLGepXJEpWL6JEoMA0f2V+TI2GzhcXPUa3Refysqj9Yo
-						v+3Fo6jc8yMUz6PlMkRaOQH/0v5dTCCZIhaqDzBOI5XFCo/nTONY10oSDT59ypRZ
-						/fRWCLHPBRtWYQuKQeFadyFH6Ox4kjfANiykpzHYu+kzOStUsOF4hulZ4p5q4WoB
-						o/tnmCJuZO+wViVZw2P/KF1R4vFsEUiD7sFoFU/+zOyKoS4eC+cCcMBxXu9CsRaS
-						yk+5Ob1wSjDooOdd8pRBsAkuYMxzdv0d+uMznwhiybjlMj8Mk6OFswsHMo4B/moW
-						F2s7gQIDAQABo4GGMIGDMB0GA1UdDgQWBBQrvG0acEEnI7JXqoFYdrzLC171EzBU
-						BgNVHSMETTBLgBQrvG0acEEnI7JXqoFYdrzLC171E6EopCYwJDEiMCAGA1UEAxMZ
-						c3Vic2NyaXB0aW9uLmVjaGFsay5jby51a4IJAIxk1ZoatOwHMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBAHGSPPNL5RZ8hIzclnzlF0kgBZqIdY6pMvBk
-						+ftUmpI6NRkPsY1TI/k7SPYcAOcS+ujPUzrX7nnoosXRZ+z2WmA2Oyd+HTqnw83r
-						GdJflkPCAiKRkmBC7uJGdBP9AR+fTQeBZdbf7DbKQjmpkxjfhPaDM/3Oi69E/jli
-						+YM0f4JcfJWcxEPKRGDSpCkR/idaQZkVDc22T7lq7sOMlKVtS0bg02IjvSf9teJp
-						yLoqT2I7utT6SVExQtH+R3jpEPqKRR2/ct8B9Yc+MaaWwU2CTYsvDydLgGgp7Ar/
-						j4zX/I526fHsI+R5AO9HpeyqGRBhxBBsymL4bb9BZ/Ew43NokdM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://subscription.echalk.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://subscription.echalk.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://subscription.echalk.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://subscription.echalk.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://subscription.echalk.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">eChalk Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">eChalk: Interactive resources for whole-class teaching</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.echalk.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>eChalk</GivenName>
-    <EmailAddress>mailto:info@echalk.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>eChalk</GivenName>
-    <EmailAddress>mailto:info@echalk.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml b/swamid-interfederations-2.0/sus-primo.hosted.exlibrisgroup.com-shibboleth.xml
deleted file mode 100644
index f97cc009..00000000
--- a/swamid-interfederations-2.0/sus-primo.hosted.exlibrisgroup.com-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://sus-primo.hosted.exlibrisgroup.com/shibboleth">
-  <!--
-		This is a "University of Sussex Primo" Shibboleth SP for Ex Libris (UK) 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="2012-11-14T12:59:19Z">
-      <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://sus-primo.hosted.exlibrisgroup.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://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNjCCAh6gAwIBAgIJANjfMJJw+7nwMA0GCSqGSIb3DQEBBQUAMDAxLjAsBgNV
-						BAMTJWRjMDNrZzAxNDhldS5ob3N0ZWQuZXhsaWJyaXNncm91cC5jb20wHhcNMTIx
-						MTEyMTMwOTMwWhcNMjIxMTEwMTMwOTMwWjAwMS4wLAYDVQQDEyVkYzAza2cwMTQ4
-						ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA1p2saAGSBLpOZRm5yqYbFdQflusl57UUuSrnHYMnqGPOwC3e
-						pYeld2SGPFqzDvO20F6qSg8vRG1cttcmV2nhpWzNSBTD5Rzus0BLZL/CLFOHVJos
-						Q48nKp/N44XOZb00f7Zncfd6rA7vW8o5M9kPgdCUcovC+S9hJzIV1DC/i7rSyJHq
-						2b0EC2ZjQ8TI/jyqXSCTfIyxq7lSdXhSzaC+YmMs9UUBNTp6kfDkiHXGzQ5h5zJ5
-						dZLBXFA2xRUHzSfvn8RiFwEZ1y64TodCGMmrl+b5aQCydH9dVBjwQKV1iZtQewCk
-						s9z2XS3sJhT9vwD2XPITqN9xiN+kBCa7zGH9xQIDAQABo1MwUTAwBgNVHREEKTAn
-						giVkYzAza2cwMTQ4ZXUuaG9zdGVkLmV4bGlicmlzZ3JvdXAuY29tMB0GA1UdDgQW
-						BBT8Ab2k+zOfjnlq1xXjEzk0W6FG8DANBgkqhkiG9w0BAQUFAAOCAQEAaYwLFR4q
-						iFrda7fL/F5rcRfibrssQ/JLKEzE/GP5KR1k1eX32KROLWG7aS5iZHQhAOtW7CN4
-						gIo+bmR4x5GXkv3+AJ7s6ZyfCY0QwQ5rR2rN+NZmNVw0d9oem68GGFmsPZfbU+uu
-						mU+m4v2tgSW4KTehe+ShMe8UxrG4fJ1B9tSSq+mLrtRN0oWdS9tj81fcV2TZaZ6X
-						+WTlOidIOeT4xKwgnCbaqFX14dgmWUSKfhNZCGyicytCnOthsYx80xJDz1itrsqQ
-						FkKvnBLwGTSx564XFgYDoKw1HRQuxMkcXir8AXvYJyCm4Sh8UM1FdFOnVeluvJ8R
-						8APd8wDeJjJ0zQ==
-					</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://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sus-primo.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ex Libris: University of Sussex Primo</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:Benoit.Ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sus-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/sus-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index d83e2f09..00000000
--- a/swamid-interfederations-2.0/sus-shib.hosted.exlibrisgroup.com-shib.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://sus-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "University of Sussex - Primo" Shibboleth SP for Ex Libris (UK) 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="2015-04-09T09:18:09Z">
-      <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://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University Of Sussex - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of University Of Sussex</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAIJI2WEAW9Y7MA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMjUwHhcNMTUwNDAyMTkyMDI3WhcNMjUwMzMwMTkyMDI3WjASMRAw
-						DgYDVQQDEwdhaW8wMDI1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						43SuJp+ilw1b6Flc1gVIngrmUp4T1/yt4b+iX4ICVyq6oad2GpOkvBAt8eiHLarb
-						Xo2SjJnDPtG8lonXvYw9JuS/C8IawW4mTMOycJVbJ3JkiRmxmlh+nYgdCfb8iyBr
-						ir8WsAEv7Y7LwhjjqbxDr+SBjv2b5OBXiY6hfsnM5WFRWooYeoFV6ZhklHOpBmg0
-						VN3abKhBMmCFr2DN5uSZL6YmYTV9j6JHn1mipdlOXRYlTQUJ0arwqcVePXSYvoAI
-						OlPAznx/YImbmBLPO8xHLjV0+9nGjaTC5Df8whRdH5NRmqtP5RkpaDLkhx1ji0Pd
-						tLKPhBgPnXbD048x3iFbQQIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDI1MB0G
-						A1UdDgQWBBTpDDGYVTeATO9zpmojtgcarmDyWTANBgkqhkiG9w0BAQUFAAOCAQEA
-						Po6C2ZqJOs5S+VlroHOtGm/Y+B1p/iFxO/EO506flEYDmGKS3cl5/T9znshX7NH7
-						U/S4BJDeh2yT85i0bEGzb64UYbcXXJ5iqyV9FI30KlxuETOBKgmZyxnrfB9UWlHq
-						YXevx6z1SvB2BNixqIXASbQZ9SgxdHMScfYMXlssYuEdpZBkVHyxgz7AM9mOE4Ip
-						aUpiOEsPvGM4TNKFuwsRIoTNgXBvuwHPX2YMJFq5VHCRh3Mzckb5YBOp44JTpjLy
-						V379XyFD4ydqADU0uPiyX1VrYoVqBhzt81A5NqVrS+ebSGkkQbgXV/1wH416tGay
-						BqUkPiCh/jaWeBCQR1PCrQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sus-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for University Of Sussex</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swa-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/swa-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 6ab34200..00000000
--- a/swamid-interfederations-2.0/swa-shib.hosted.exlibrisgroup.com-shib.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://swa-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "Swansea University - Primo" Shibboleth SP for Ex Libris (UK) 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="2015-04-09T12:55: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://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Swansea University - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of Swansea University</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAJQumskVB5uCMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMjQwHhcNMTUwNDAyMTkxOTEzWhcNMjUwMzMwMTkxOTEzWjASMRAw
-						DgYDVQQDEwdhaW8wMDI0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						wdWAoN3sORe4BSyRdTFcnmn8ZOup5KSQMqqR7JvcLOhx9KaZwZmf1ainurxsDzaK
-						ydZfnJKwzfw8WGRJKPfN10LNo0mBZ9QC+3AJzvsq+ibYe7WV6MfGUal1oa/2Z9E7
-						l/v1mdtpeLTxbMWaMdOAjkOqHocfn+Qq1SBRQVFes520Tl+6UohvrVasQBZ73Kgj
-						AeoA3DOcKv+IbqdUkVn8XENRoS799lx2AJf52/w55OXxe5dFJQ+qBFtXhjoIaNll
-						PjfMXFderDvouyedAkTKYMNbz843kcfjnmDKTyZLJUw1FMSX64/QclXHXaD7n1yi
-						l4NJM3dHBRExfzH5syl7JwIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDI0MB0G
-						A1UdDgQWBBQ5fv0eTKeMxY64vy3DYl9VsqvPBTANBgkqhkiG9w0BAQUFAAOCAQEA
-						jbHWFqzuzMNamz2d3USYm8DZ/4KqKTfZMPAecR7OIf3wg42i8KnDIUWw4BhwxMkA
-						t/fsDRj/iNKPMxOAZynLXWeQ6/ba7SlLY6WZyas7b0BVBUWNBEMkbm3FFuDJYnHY
-						J5vHrv0pSHnoIFF30E3kDRy1dIFl1hgPd0dZmzEyFrLDRj5QLQ7PunvzLjPyjOZv
-						nOqB95ZhE7B8OPGbhfjgf4E/mDKk956AlRQIOM6V1bHx6/rPNhTRzYrBCfAmiQbk
-						Vbb1WFs9FFgRruuBYRJX3XfmU6xcxg7m1usTCCkYZ3JBpSJy1ljVTzGTP+kaFAYB
-						C9TeNwf53LIMxLBZhVSF8Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://swa-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for Swansea University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swamid.user.uu.se.xml b/swamid-interfederations-2.0/swamid.user.uu.se.xml
deleted file mode 100644
index 365a267f..00000000
--- a/swamid-interfederations-2.0/swamid.user.uu.se.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid.user.uu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <IDPSSODescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Uppsala universitet (gammal)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University (old)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://cas.user.uu.se/cas/om.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://cas.user.uu.se/cas/about.html</mdui:InformationURL>
-        <mdui:Logo height="125" width="125">https://cas.user.uu.se/cas/uu_img/125_uu_logo_white.gif</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>uu.se</mdui:DomainHint>
-        <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
-        <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
-        <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
-        <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
-        <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
-        <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
-M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
-BF1qc8RA0kusBjjaw0Oxz03yxde5xqimaajD4J+qPIusKiyxTbc+9EwbNuuqFjxd
-u8orHU1rm+yMsMqnNOC1SQWEkMIVEPs4H4x6oVmKptDiXiY7yRhA0cRXr5RHulbw
-W2JCV+2yjOYlbacHJilmq2Qne6jqfcGpeFkNrNJsQrPTF396s3xt2+47GKpDC96U
-Ts8/3S2B9IWGnhdTTPSzk71bIClX+rPlGoK2mtfZ83SNJO5/vWze7Onslp5hfYxY
-gseuGLf1knlRLAVAeY7mbbwdNVUa/0MM0aRYp5N7XLRhUL2rHE7n/mX25k1S5pnT
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXN3YW1pZC51c2VyLnV1LnNlhihodHRwczov
-L3N3YW1pZC51c2VyLnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRF76Ds
-kiLuwuqhAdDXiefnXgsEeTANBgkqhkiG9w0BAQUFAAOCAQEAVkgHOAmDQh0f85ZQ
-qkuSu8h3RYKWbd/bPGDRtoJuoo/AM3OHAo2iMndMNS37B0MF0ethPU3t5mjHl+gx
-HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
-Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
-lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
-L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUNUPiQemS9gt9uEtcjg7LzGzpAE0wDQYJKoZIhvcNAQEF 
-BQAwHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2UwHhcNMTMxMDAzMTQ1NzM4 
-WhcNMzMxMDAzMTQ1NzM4WjAcMRowGAYDVQQDExFzd2FtaWQudXNlci51dS5zZTCC 
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSNBRhfSDpWel0cB5BhM3mH 
-C3sFFXbGKWWhPxloLtDEGjc3vK14FLXjy0oft0QbELIevGeJkMaFQGU73iCjdkjo 
-5isUccGwJEIV/q/DpxlMs+CeROFPRIQhn+IfxA9/xFvH5roc1XY+Vpuo7fuKJJ+r 
-Wwm0Vf4jBMGdtvaLZp85Pkd1x0scXapFZub9Dv/jrPpsoz7IK4olQvudfcew0k4v 
-8H1eNV0bNiGmJ4c5AELhNdtmLdYgdzz2sxpkxwSQpGoFoB7oaz2n0efhrWYjPGnH 
-j7MpH4UCWoF9MGROV9sjee2tIrUdd08a//kx5TlMnPQVB2+lf1g1/PfGfA575nEC 
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRc3dhbWlkLnVzZXIudXUuc2WGKGh0dHBzOi8v 
-c3dhbWlkLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEmxaqhH 
-E6O+XLfObHbNKAQfzSnLMA0GCSqGSIb3DQEBBQUAA4IBAQCn1xxkIwx4Tz1R0jSA 
-482BHLA3Z/Hny61+4Pe3kYrudzGyCRbgplPc8JkpnsaC4nvcEOVDeywz1sbVRcGj 
-0i93GY3OqYrFWfyipP9dWIww4FgLbgmhA+XZ34/np4uRbDdIYbUZ8Ts/5a0DcsSw 
-z7cBR8v69ISF+1qKoNjeFdNTrLIAzc0cDQMcgWObmZRTPVd2nby9/NcJ3P1WCFf/ 
-IAZ52kMSTkRjnek7DL7XM7m1PCi/dsyVPJTLdVOqpIXov787qV4o2MC28Ff3ttsj 
-bFbyDFjmEF99CIb4dJ+HEYnxIWJzX+zzZoHkzpS4qDTM3nrq6GKak/Qoagyyn+z6 
-GP8s 
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid.user.uu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAPqNghQPfCgNNR69QmGvhnv2+MJSMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXN3YW1pZC51c2VyLnV1LnNlMB4XDTEwMDIyMzEyMzg1
-M1oXDTMwMDIyMzEyMzg1M1owHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2Uw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0rygeUgY9WEbkLe+IWLwo
-BF1qc8RA0kusBjjaw0Oxz03yxde5xqimaajD4J+qPIusKiyxTbc+9EwbNuuqFjxd
-u8orHU1rm+yMsMqnNOC1SQWEkMIVEPs4H4x6oVmKptDiXiY7yRhA0cRXr5RHulbw
-W2JCV+2yjOYlbacHJilmq2Qne6jqfcGpeFkNrNJsQrPTF396s3xt2+47GKpDC96U
-Ts8/3S2B9IWGnhdTTPSzk71bIClX+rPlGoK2mtfZ83SNJO5/vWze7Onslp5hfYxY
-gseuGLf1knlRLAVAeY7mbbwdNVUa/0MM0aRYp5N7XLRhUL2rHE7n/mX25k1S5pnT
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXN3YW1pZC51c2VyLnV1LnNlhihodHRwczov
-L3N3YW1pZC51c2VyLnV1LnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRF76Ds
-kiLuwuqhAdDXiefnXgsEeTANBgkqhkiG9w0BAQUFAAOCAQEAVkgHOAmDQh0f85ZQ
-qkuSu8h3RYKWbd/bPGDRtoJuoo/AM3OHAo2iMndMNS37B0MF0ethPU3t5mjHl+gx
-HDHEdG/3q2daaPLeehp46CXR1QLyYYB32pJpZyf85lCmtdXf8UZC682n3gYCL2k0
-Lg5a8sRosZsnCPolLGLyy9OPcmjTQPQhO7QHH6fMjm3ob3Hyfdbuyw/J/CRJp8Rj
-lC2c5ZX/5/3+uelyIlLOK5N1daJ3oYtSooXIkaAa8GRQR6C/UAfrp41cBuclYRzW
-L+FrdTBecYrIv0m4n8mAdQeJPBH7G/4mg+FFHS8gqf97m3JPwtGlF10V5KVt5jhl
-2DlT+A==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUNUPiQemS9gt9uEtcjg7LzGzpAE0wDQYJKoZIhvcNAQEF 
-BQAwHDEaMBgGA1UEAxMRc3dhbWlkLnVzZXIudXUuc2UwHhcNMTMxMDAzMTQ1NzM4 
-WhcNMzMxMDAzMTQ1NzM4WjAcMRowGAYDVQQDExFzd2FtaWQudXNlci51dS5zZTCC 
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMSNBRhfSDpWel0cB5BhM3mH 
-C3sFFXbGKWWhPxloLtDEGjc3vK14FLXjy0oft0QbELIevGeJkMaFQGU73iCjdkjo 
-5isUccGwJEIV/q/DpxlMs+CeROFPRIQhn+IfxA9/xFvH5roc1XY+Vpuo7fuKJJ+r 
-Wwm0Vf4jBMGdtvaLZp85Pkd1x0scXapFZub9Dv/jrPpsoz7IK4olQvudfcew0k4v 
-8H1eNV0bNiGmJ4c5AELhNdtmLdYgdzz2sxpkxwSQpGoFoB7oaz2n0efhrWYjPGnH 
-j7MpH4UCWoF9MGROV9sjee2tIrUdd08a//kx5TlMnPQVB2+lf1g1/PfGfA575nEC 
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRc3dhbWlkLnVzZXIudXUuc2WGKGh0dHBzOi8v 
-c3dhbWlkLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFEmxaqhH 
-E6O+XLfObHbNKAQfzSnLMA0GCSqGSIb3DQEBBQUAA4IBAQCn1xxkIwx4Tz1R0jSA 
-482BHLA3Z/Hny61+4Pe3kYrudzGyCRbgplPc8JkpnsaC4nvcEOVDeywz1sbVRcGj 
-0i93GY3OqYrFWfyipP9dWIww4FgLbgmhA+XZ34/np4uRbDdIYbUZ8Ts/5a0DcsSw 
-z7cBR8v69ISF+1qKoNjeFdNTrLIAzc0cDQMcgWObmZRTPVd2nby9/NcJ3P1WCFf/ 
-IAZ52kMSTkRjnek7DL7XM7m1PCi/dsyVPJTLdVOqpIXov787qV4o2MC28Ff3ttsj 
-bFbyDFjmEF99CIb4dJ+HEYnxIWJzX+zzZoHkzpS4qDTM3nrq6GKak/Qoagyyn+z6 
-GP8s 
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid.user.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">UU</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Uppsala universitet (gammal)</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Uppsala University (old)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <Company>Uppsala universitet</Company>
-    <SurName>AKKA SAML2</SurName>
-    <EmailAddress>akka-datordrift@its.uu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml b/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
deleted file mode 100644
index 8481e970..00000000
--- a/swamid-interfederations-2.0/swamid2.shh.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://swamid2.shh.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">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</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">shh.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Sophiahemmet Högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sophiahemmet University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Sophiahemmet Högskola.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Sophiahemmet University.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.sophiahemmet.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.sophiahemmet.se/</mdui:InformationURL>
-        <mdui:Logo height="122" width="350">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
-        <mdui:Logo height="122" width="350" xml:lang="sv">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
-        <mdui:Logo height="122" width="350" xml:lang="en">https://swamid2.shh.se/idp/images/shh_logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">shh sophiahemmet+högskola sophiahemmet+university</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">shh sophiahemmet+högskola sophiahemmet+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>sophiahemmet.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.34547,18.07525</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVANEvtBc/nQGwgEEG6fwmCl8PbIqAMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnN3YW1pZDIuc2hoLnNlMB4XDTEzMDkxMTEyMjkzNloX
-DTMzMDkxMTEyMjkzNlowGTEXMBUGA1UEAxMOc3dhbWlkMi5zaGguc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAFjj9XWfRDUlUbQ5+JieOPIlb9ijT
-PpnUuzM3/lGbqOhK3wsSrfTx/xkfVVusFfqc+5maUjpG19yln6srVSF/kMAk55S+
-o9PhrSUY5gQl2uYBAeK99Ol/6bWR6frA7xCWlB19hUjuHyCER7bkWzgpucYfJa0m
-k2Ad0S3kmIlxN13NHar0eg3TtBzEF8+ckY+hRUif+N5dFilx1LUGnpxKdVMY7pWP
-4ITWkjffIFiKvtfYnKt7+OWF/pIsH2BnAC1aIixNFogxkbUOh/mxz6ETdRWUd5sq
-v7Y86uv3aKrScIELHyHQboHVicFIJ3z0YKV39JEBziR0nE/BkPkh3Hg7AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnN3YW1pZDIuc2hoLnNlhiVodHRwczovL3N3YW1pZDIu
-c2hoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRJhbf3IfPJnZ5yadVwH9OZ
-sJ6gfTANBgkqhkiG9w0BAQUFAAOCAQEAfq+blNorCZcCJwvC1dzohHaEkXPWu6Li
-eeffuQ3F98ZizlurLWK/a5T+GOpdMiD+Tv1gOGeF4xwFVtG/VMLKZdhsWSgVndoq
-m0uLanEaWsDW7eegsQ2krvzhMd7E2IxvgnVFhL8cr/blHzUTqu1wjNT69xEYLjMk
-UOVyoxnOo5Fi2BoLNACADCZXl8OjW+v+GYh0YpJ617ijB3zfL+nyta9Y8gn+xIpT
-YXsGDr65xZHaeJavzLIj6hGF2h2KHgbqau0ET7qKyVv/ntgP2tHLGBnCuFCbSco8
-URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid2.shh.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid2.shh.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://swamid2.shh.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid2.shh.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swamid2.shh.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid2.shh.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">shh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDJDCCAgygAwIBAgIVANEvtBc/nQGwgEEG6fwmCl8PbIqAMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDnN3YW1pZDIuc2hoLnNlMB4XDTEzMDkxMTEyMjkzNloX
-DTMzMDkxMTEyMjkzNlowGTEXMBUGA1UEAxMOc3dhbWlkMi5zaGguc2UwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAFjj9XWfRDUlUbQ5+JieOPIlb9ijT
-PpnUuzM3/lGbqOhK3wsSrfTx/xkfVVusFfqc+5maUjpG19yln6srVSF/kMAk55S+
-o9PhrSUY5gQl2uYBAeK99Ol/6bWR6frA7xCWlB19hUjuHyCER7bkWzgpucYfJa0m
-k2Ad0S3kmIlxN13NHar0eg3TtBzEF8+ckY+hRUif+N5dFilx1LUGnpxKdVMY7pWP
-4ITWkjffIFiKvtfYnKt7+OWF/pIsH2BnAC1aIixNFogxkbUOh/mxz6ETdRWUd5sq
-v7Y86uv3aKrScIELHyHQboHVicFIJ3z0YKV39JEBziR0nE/BkPkh3Hg7AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDnN3YW1pZDIuc2hoLnNlhiVodHRwczovL3N3YW1pZDIu
-c2hoLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRJhbf3IfPJnZ5yadVwH9OZ
-sJ6gfTANBgkqhkiG9w0BAQUFAAOCAQEAfq+blNorCZcCJwvC1dzohHaEkXPWu6Li
-eeffuQ3F98ZizlurLWK/a5T+GOpdMiD+Tv1gOGeF4xwFVtG/VMLKZdhsWSgVndoq
-m0uLanEaWsDW7eegsQ2krvzhMd7E2IxvgnVFhL8cr/blHzUTqu1wjNT69xEYLjMk
-UOVyoxnOo5Fi2BoLNACADCZXl8OjW+v+GYh0YpJ617ijB3zfL+nyta9Y8gn+xIpT
-YXsGDr65xZHaeJavzLIj6hGF2h2KHgbqau0ET7qKyVv/ntgP2tHLGBnCuFCbSco8
-URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid2.shh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swamid2.shh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SHH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sophiahemmet Högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Sophiahemmet University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.shh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Sophiahemmet University</md:Company>
-    <md:SurName>Sophiahemmet IT</md:SurName>
-    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Sophiahemmet University</md:Company>
-    <md:SurName>Sophiahemmet IT</md:SurName>
-    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Sophiahemmet University</md:Company>
-    <md:SurName>Sophiahemmet IT</md:SurName>
-    <md:EmailAddress>mailto:itsupport@sophiahemmet.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 406 2525</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/swlite.sci-ware-customer.com-shibboleth.xml b/swamid-interfederations-2.0/swlite.sci-ware-customer.com-shibboleth.xml
deleted file mode 100644
index 19828208..00000000
--- a/swamid-interfederations-2.0/swlite.sci-ware-customer.com-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://swlite.sci-ware-customer.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Science Warehouse 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-06T13:31:57Z">
-      <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://swlite.sci-ware-customer.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://swlite.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjCgAwIBAgIJANYEwhA2kYlcMA0GCSqGSIb3DQEBBQUAMDYxNDAyBgNV
-						BAMTK2lwLTEwLTEwNi0xNDUtMjguZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWww
-						HhcNMTQwNjA1MTQzMTMzWhcNMjQwNjAyMTQzMTMzWjA2MTQwMgYDVQQDEytpcC0x
-						MC0xMDYtMTQ1LTI4LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFsMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8kRUHv2zrb4I8y4hg/omB3v9EQ6F4ESW
-						DjusedxQkitXVDgtVxAV8wuWC4wQwtZBuPIDDg+7W2kg9+KM2lYOBVCIOkr8EJNJ
-						hhw7CnjcZBIuLjK3UFMg57PEfOD9W7VcIs1fudzxkDr4y0OiyGavBegl9s6CvhNr
-						43zMyARBj3CU94TdibghGU71zBYwy/qWQtOQyfVcLbm4TMbwHSBL/MchU/MFK1WU
-						cQ7wHdeTAK6hfad67gVTK/ngSm5QgpnAYFMBWSQDnzDADw2R5LtIegWRaN0peK0R
-						FKF1SZXxG/w1qv5AkpaWkWWpYguYx8xkSJ8HeBcmJ7fGX/XKHt7EQwIDAQABo1kw
-						VzA2BgNVHREELzAtgitpcC0xMC0xMDYtMTQ1LTI4LmV1LXdlc3QtMS5jb21wdXRl
-						LmludGVybmFsMB0GA1UdDgQWBBRI66bOTCIKQ2oTtVqtgb0oQHl0KjANBgkqhkiG
-						9w0BAQUFAAOCAQEAMnniDesVe1hg/OKv5lO9xym5i95Qh59LVqyoiWW2gdUMJpih
-						CNVSz1MZfHpxs6VgApyzRdN4qFGOWFzVcHY1DmvyHuE4Y61Q70yzvG3FknwOt4Rs
-						A5skq8J2TXz8L5o90io2HteEFo47rX92xH+zyyLRTuwjI4NpoDX5TB4GRLqvEvvn
-						P0/oXOBETYlJqVK4OREqAyd+jVf7WpYSZDHCqgOWJ54MFvBd3vQp9gxTiCLdjTay
-						Ypbx1Yg1LWzRNl/NZHRL2Pag7RYbB13G+4m5i1Yni2EwmnRDc5GgI1FrVfpopH5B
-						2lziDoipQufnV3DqtGQGUpN2BSVKkjXigpFeJg==
-					</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://swlite.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://swlite.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Science Warehouse Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Science Warehouse ITE Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sci-ware.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Application Support</GivenName>
-    <EmailAddress>mailto:SupportTeam@sci-ware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Application Support</GivenName>
-    <EmailAddress>mailto:SupportTeam@sci-ware.com</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/take-shape-share.fenc.org.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/take-shape-share.fenc.org.uk-shibboleth-sp.xml
deleted file mode 100644
index 358a47ce..00000000
--- a/swamid-interfederations-2.0/take-shape-share.fenc.org.uk-shibboleth-sp.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://take-shape-share.fenc.org.uk/shibboleth-sp">
-  <!--
-		This is a "Take-shape-share" Shibboleth SP for Adaptable Learning Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-02T11:32: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://take-shape-share.fenc.org.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://take-shape-share.fenc.org.uk/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://take-shape-share.fenc.org.uk/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://take-shape-share.fenc.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://take-shape-share.fenc.org.uk/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Take-shape-share</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJANjHSyxzQmcZMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCXMxNTUzMjEwNDAeFw0xMTA3MTQyMDM5MTNaFw0yMTA3MTEyMDM5MTNaMBQx
-						EjAQBgNVBAMTCXMxNTUzMjEwNDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBALahQjvkIC84CsDx3K7PooqAHW+QDmADL3p+5QNMs6Vb9hIu12BzjdVNBuEu
-						2P2zNU5pP17IVdVImIkFlT2ZnpzHOfFqb2cWLPZqNJorp/ZQQaWV67O+bYRewIe6
-						F25/b0cqH+0DcDlq/4kwdRfuhrCh9F0aNICcNRa51NWOAkfkJLxrLALvKFzqUGBr
-						0p2c54HqXM4vLAdwWtGjG0dmRGf6Nai00ZChhmoyZz9sFaKAJmBR8kp85RhjQWwS
-						v8SDmRDjTsLX3PiECR6aLVPA6msgalB/XS2D+0TPutL5RGHbmVcPikkierF29nfU
-						TG1yQe1V1KxvlpAmJ1EoxuSbGK0CAwEAAaM3MDUwFAYDVR0RBA0wC4IJczE1NTMy
-						MTA0MB0GA1UdDgQWBBT5mpvoe6jJ76xTkNcp5hc1CO86tTANBgkqhkiG9w0BAQUF
-						AAOCAQEAAK+SJfnu3gCma3+qgp6SXvPJbnhyAHCJjxAiNo629/3huTeRGTfYxsJa
-						0h61NTII8bvcbJoJB3XiLJnCqce66htzzbb/ujv2oFCsGxZqBOyizcpVlABSTB4J
-						8XGCeKqvK3XSiiVhAn8NFtRYCVO6DZSVC+giIv3QpcPYYw7ht/wW5uApRvewwEdZ
-						9dBzkeY5E55W+FwhhCCrueir8qzUss0qCfQApJctsGbC2vsxRow5wHQZZlZP7nyV
-						aKNTf017WLf8E/w+70rFWe08qZmLjJnhzKe/RFkQJf5jURb2RKzY72o6dr960FH7
-						CThSkJwcMk7Kdl9gQTSxlOAxstLZBg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://take-shape-share.fenc.org.uk/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Adaptable Learning Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Take-shape-share</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://take-shape-share.fenc.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>James</SurName>
-    <EmailAddress>mailto:richard.james@adaptablelearning.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Porter</SurName>
-    <EmailAddress>mailto:ian.porter@adaptablelearning.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml b/swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml
deleted file mode 100644
index 468621f2..00000000
--- a/swamid-interfederations-2.0/talkbank.talkbank.org-shibboleth.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://talkbank.talkbank.org/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-05-15T09:52: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://aai.dfn.de/category/clarin-member</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>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://talkbank.talkbank.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">TalkBank</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">TalkBank</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Transcript Korpora Gesprächs Wechselwirkungen mit älteren Kindern und Erwachsenen.</mdui:Description>
-        <mdui:Description xml:lang="en">Transcript corpora of conversational interactions involving older children and adults.</mdui:Description>
-        <mdui:Logo height="16" width="25">https://talkbank.talkbank.org/images/clarin16.png</mdui:Logo>
-        <mdui:Logo height="60" width="92">https://talkbank.talkbank.org/images/clarin80.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://talkbank.org/share/irb/options.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>talkbank.talkbank.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=talkbank.talkbank.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAIzKsiKO/JQPMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFXRhbGtiYW5rLnRhbGtiYW5rLm9yZzAeFw0xNDAzMTgxOTEzMDlaFw0yNDAz
-MTUxOTEzMDlaMCAxHjAcBgNVBAMTFXRhbGtiYW5rLnRhbGtiYW5rLm9yZzCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALno8eiR+W6+ZX3Yn5g7QNWUYues
-0NwWPwTcKCaMYB8GZFhPwKTTfju2oXdyTBGZZCIqIM5Wfrg9UMfdh3j1zrC3loj7
-Hx5HwY+i/+Tx/s/UAW9njBbnrRM4f/4xKRfCeiaeQo+RedrcNZADkaE1uy+EhRh3
-xVpZZHkIKWekGk1jh8NsW8QnRBTA1GLd9BZBDaVvaBpnEW5IwqeN0iJSy7WwcwC6
-qLfDqLUFaC2OI2fi+RtV4Vfs1Oq30ZbLHZG9+MFCPpqkGxEbyUgohcfGCKoz8/vW
-fk6MgiaiGqJ0/K3AaCCJz+1zFUmq1hf5aSsVu/lvBMzAH+77QDQNKyZSxNMCAwEA
-AaNDMEEwIAYDVR0RBBkwF4IVdGFsa2JhbmsudGFsa2Jhbmsub3JnMB0GA1UdDgQW
-BBQgweM96szLBSev8r+xBdkfzq2pXTANBgkqhkiG9w0BAQUFAAOCAQEAemzcmcrh
-5EWY2BXLmyMrdl4h5GnVtANr1hcKP7RfX0+EaWXlgPBTml4W8TIzegvyv6MuIIXU
-RB2b1VWOo9NY0zSbbazP2x6wcqgM0Imzpac+FWeGgh+D3j4mWC5NZYezZ8ahsvjq
-sCAq1dYlkAIj/34KLLhZLuZYceQXOW9KiossZEyp/6u4yzndgMmGqtK9TZnitAio
-M7H5R35g3WcjoBPdGHTSValup4MaMhz3dbLzS+X4s97XjIYVuaJFags+JZz+79b6
-xPttj9gCJKXC12f60rCBFakal1AEmL9GnYf2jyKaxkot5rxU053SU5ahhUAJpCoU
-nqtFHmhEv2mrhA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://talkbank.talkbank.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://talkbank.talkbank.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://talkbank.talkbank.org/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://talkbank.talkbank.org/Shibboleth.sso/SLO/Artifact"/>
-    <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://talkbank.talkbank.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://talkbank.talkbank.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">TalkBank</md:ServiceName>
-      <md:ServiceName xml:lang="en">TalkBank</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Transcript Korpora Gesprächs Wechselwirkungen mit älteren Kindern und Erwachsenen.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Transcript corpora of conversational interactions involving older children and adults.</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Franklin</md:GivenName>
-    <md:SurName>Chen</md:SurName>
-    <md:EmailAddress>mailto:FranklinChen@cmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Brian</md:GivenName>
-    <md:SurName>MacWhinney</md:SurName>
-    <md:EmailAddress>mailto:macw@cmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/talli.funet.fi.xml b/swamid-interfederations-2.0/talli.funet.fi.xml
deleted file mode 100644
index e9aef664..00000000
--- a/swamid-interfederations-2.0/talli.funet.fi.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://talli.funet.fi/haka">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://talli.funet.fi/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
-        <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
-        <mdui:Keywords xml:lang="fi">testi attribuutit</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">test attributes</mdui:Keywords>
-      </mdui:UIInfo>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEPDCCAySgAwIBAgIRAPVZgYydDTblWmnoE8hJXtcwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDA0MzAwMDAwMDBaFw0xMjA0MjkyMzU5NTlaMIGbMQswCQYD
-VQQGEwJGSTEOMAwGA1UEERMFMDIxMDExEDAOBgNVBAgTB1V1c2ltYWExDjAMBgNV
-BAcTBUVzcG9vMRYwFAYDVQQJEw1LZWlsYXJhbnRhIDE0MSkwJwYDVQQKEyBDU0Mg
-LSBJVCBDZW50ZXIgZm9yIFNjaWVuY2UgTHRkLjEXMBUGA1UEAxMOdGFsbGkuZnVu
-ZXQuZmkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANiaWHK6o5i9CNsvhO1Z
-EsN1t5tYVEKAkPbdj34A5nZbFuSrtU0ZDakqLuUTHKwYDuOHV7IQfl4Fw4hKNmGk
-T/AH2Sjt+yNSZVzjLBmn370XmqATPTu68Fe28/Gqcb/LR9LAKZ7n2Z/zQ/xvAG/G
-fRmvJyLsVAyuvYSvdijgagtVAgMBAAGjggFhMIIBXTAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUDoTAoTwuJwp/7XSVeIKYgnJeK7ow
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwGQYDVR0RBBIwEIIOdGFsbGkuZnVuZXQuZmkwDQYJ
-KoZIhvcNAQEFBQADggEBAFXKj9K3Z/RQRJxtVv3yuCxXgs8Xi/9pl6A6RSw7IBdI
-eszHLEBrz/vRRENHcNAVnZwGgfnXJItWZxbiKcRHfG2yFGXkG10fjPxdHwRjyksj
-hPwHefzkEK9b7rJmd+VlfHLGUULnlLIhwJmyaaMPP8wjkDiAk54jGW0Kk2ApdZy5
-I32nlIIGuRYJNa59txFY8lTULe6InHTJ0SBGAlSOaLEdRIL9nXxWYx+JFmV0s+Ag
-eEAH1RvfTsj/y527aKeZCRXGK8M8QBOJaA1VAE84H7qCBfB61q1jLPZJQqi/PpQt
-2KCOpM+WV/k5TYUAwOWgA4UPrRLjzevS2njKE5hC8h8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://talli.funet.fi/haka/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
-      <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
-      <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Arto</md:GivenName>
-    <md:SurName>Tuomi</md:SurName>
-    <md:EmailAddress>haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janne</md:GivenName>
-    <md:SurName>Lauros</md:SurName>
-    <md:EmailAddress>haka@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Kari</md:GivenName>
-    <md:SurName>Laalo</md:SurName>
-    <md:EmailAddress>kari.laalo@csc.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tamana.msh-paris.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/tamana.msh-paris.fr-idp-shibboleth.xml
deleted file mode 100644
index a96e1961..00000000
--- a/swamid-interfederations-2.0/tamana.msh-paris.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tamana.msh-paris.fr/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-04-03T19:29:45Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msh-paris.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">FMSH Fondation Maison des Sciences de l'Homme</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB7klEQVQoz42ST0iUQRjGH5eByq5Bh8AOXbx0WSI8LNgmFB8uQoshbaWFHupgCUV/DgULoRiSYYQEBrkiUphLSCwJHjYNLPeg7IJ/YmPRDsWC2u5+336zM9+Mh3d36OjwMrzv730e5p1h6l68ncWBlwZYyeEHNwBgTplrIHCmMRT0E5pOLO0V7J6Olt2C/TGx1NPRQjCV+QWAOW4FQCjo/776M72+tfOv1NtpAXgVSwDo7bTG3s+fbmxot5oWUusAfC6vuLwCYDG1sZzOZrf+9j17ByCzuZ3Z3AawnM4upjYAkJJxLmmSe90hAPcHJop2GYDhnEshpCGMi2rjSt8IgJMnjlV1QhoopGcIEzWDEPJm+7nW2tWnXt7J7xQG33zK/c5L6ZEAABOyZpCyNeifmv1GowO4e8O6bDX1j8alp0gAgFEBgBKt9cpajkh0ZPp1tFt6ylPKCJhXM3ieis/9iLQFIm0B23EfDE4S/zz2yAgAMKWqBqXU6ORcLP4VwKmG488fXr10e4jeDcDQ4+uk9CmtldYAbkUu1B85VLTLRbv8J78HgPjKWo6GJCXTWgMYn0l2hZvDF8/SaSXHfTL8gVq0m6Tu/LUo1UfrD5sfZjuugZTPTzwdn0nG4kmf1qAo2a6J/yElXxZWu8LNWmMfhRI+0YUdVTgAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6MDArMDI6MDDUOMI2AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjAwKzAyOjAwpWV6igAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.fmsh.fr/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">FMSH Paris</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">FMSH Fondation Maison des Sciences de l'Homme</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">FMSH Paris</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>
-					      MIIDODCCAiCgAwIBAgIVAKvJWtrrkP8adBVhhIy9uth+6L9WMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMME3RhbWFuYS5tc2gtcGFyaXMuZnIwHhcNMTUwNTE1MTUy
-NDI2WhcNMzUwNTE1MTUyNDI2WjAeMRwwGgYDVQQDDBN0YW1hbmEubXNoLXBhcmlz
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8eZaF0+fwRKXlLm+
-O1sKCpgulw7VbPAGAMT1aJsKkHbRn0m7//XAUSv9UqhfWgRtdEAjh1/6aK27piDj
-7opUNvEdLi/pOL2G/iS1PS5wzCtiTP3OtE5vIskFWw5+XZcTb0WEPFpx41gjd94J
-z6IMCGvsuIrvYSWoDR0f1KBACECdHcuyJOySiSzAK15gX+4SVN6ixVij5kyqmMnS
-dE7JvgrjND33n1J7r6fusBsURSgsNjwDOH8t2s5E5gr98PLFbiec8+6hmiMDn3dx
-sbkWBTOWNH6GXmK3VUY5fIQ2zhA94LEukSGkXM94xK2VJrJ8jRNC8Y2HT4neBU/c
-Ds+hAwIDAQABo20wazAdBgNVHQ4EFgQUPal08R2AkfghQUYuE8zNW6lCfUUwSgYD
-VR0RBEMwQYITdGFtYW5hLm1zaC1wYXJpcy5mcoYqaHR0cHM6Ly90YW1hbmEubXNo
-LXBhcmlzLmZyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQCVVtoj
-baucSO49zF9sKZoVMqzGCSbFMIltFYd78BjEO+pKHLY2RN7+whiJ0n0TE3AeQ20k
-6V6bnJ3aH1R1F+rBInsgED8TWiPih/wo2LRAPFTA5W/GZKYejOhoF35D0cBqwxoE
-x92y6twHc3CHMTD0setYzJyNftLJUbgskd0WfE381Ree+G8WIVDWk7zBxYPHaGcl
-eOXNzvbSj8sW5gaZB0wQgWWr1ngCblvUniPoaQVbqagTX34O5NuACADINIcIdrYl
-hXqn2Gjg9LULbyLEM0BGvZyvUeUm8GWHKTZpm8NXiNQHMUXZfrFwBJAfFkO02gRP
-WmnsnSPqzRlVSb0u
-					    </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-POST" Location="https://tamana.msh-paris.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tamana.msh-paris.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tamana.msh-paris.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">FMSH Fondation Maison des Sciences de l'Homme</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">FMSH Fondation Maison des Sciences de l'Homme</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fmsh.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Hoby Ratsihoarana</md:SurName>
-    <md:EmailAddress>hoby.ratsihoarana@msh-paris.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-shibboleth.xml b/swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-shibboleth.xml
deleted file mode 100644
index fdbe2800..00000000
--- a/swamid-interfederations-2.0/tandfbooks-test.literatumonline.com-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://tandfbooks-test.literatumonline.com/shibboleth">
-  <!--
-		This is a Taylor & Francis Group eBooks (test) OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDyzCCArOgAwIBAgIJAIr2ZmL2om1kMA0GCSqGSIb3DQEBBQUAMIGkMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEsMCoGA1UEAxMjdGFuZGZib29rcy10ZXN0LmxpdGVy
-						YXR1bW9ubGluZS5jb20wHhcNMTIwMjIzMTkwODU2WhcNMjIwMjIwMTkwODU2WjCB
-						pDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC1Nh
-						bnRhIENsYXJhMR0wGwYDVQQKExRBdHlwb24gU3lzdGVtcywgSW5jLjEdMBsGA1UE
-						CxMUQXR5cG9uIFN5c3RlbXMsIEluYy4xLDAqBgNVBAMTI3RhbmRmYm9va3MtdGVz
-						dC5saXRlcmF0dW1vbmxpbmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAs53ZiTs98yrcgUXyCNRq3N6bKiB5NodzqSlc1TNRAngr9NmzLOUkPTfm
-						sbwp8XsnBmvftlHW0TmxYw6c8peZL6vYO+vEuPB0BYL0uCzEfa2/ebHD1vy0vFOF
-						/qq/1+H+YQfzgYaQGI8++riXLSB6g6G+i9YPSLnRjvIcyh5QLtGQahuhSRRWxG4J
-						JllBrS0/J9gFaa13wtwq3dTqbuZFfX/y1RlbpwkLzCcpV/nB0WaIbRi9yKW0yf37
-						9LGViTHBDr52/LZkvED3otCeJzvphuOYWN+R83CVK4+YzD0YLsV6mfkHWPWFphBs
-						cXg7biduxcnmbHjBhvBHC+T8qArzUQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBs
-						vuan78OdbsyivcVbUnFKH8lgg9BZ4wGTkDcfWuc7kTlWN398NZvj7Fvv4jwzFpwo
-						dBGiygfpqkV6obLL6HnMtWi+yqzMlu9Vmg0c7qR/4KPVSUbayVH3xXPjt4mBy47O
-						bZiXOrz/G+bNUTueC9eJwwIQb0kVUBD79za91elORwc/ds8/OYYl63s+uR9xVw/d
-						5Lugt9wL9A2YoP1B89RKchLPJSZzXZe0a/qTSyF/XH5IVcejvFd0ghV1FMQt3X7E
-						fwhfCgtmUCCKSxeFrM/rL4i3oMMGh5x4b2CkxjXrRM5trBiYL5HVkva6/FJ+IOjG
-						AOJoFMvbih3XH45xRSUg
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tandfbooks-test.literatumonline.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tandfbooks-test.literatumonline.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tandfbooks-test.literatumonline.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: Taylor &amp; Francis Group eBooks (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://tandfbooks-test.literatumonline.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/tandfqa.literatumonline.com-shibboleth.xml b/swamid-interfederations-2.0/tandfqa.literatumonline.com-shibboleth.xml
deleted file mode 100644
index d634f8a2..00000000
--- a/swamid-interfederations-2.0/tandfqa.literatumonline.com-shibboleth.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tandfqa.literatumonline.com/shibboleth">
-  <!--
-		This is a 'Literatum Online' OpenSAML SP for Atypon Systems.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIJAMO9zKBOInK0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3d3dy50YW5kZm9ubGluZS5jb20wHhcNMTQwMzE0MDUwNDAyWhcNMTcwMzEz
-						MDUwNDAyWjAeMRwwGgYDVQQDExN3d3cudGFuZGZvbmxpbmUuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+7mPo1QcQmquZzEQh1lPd0/52x3tUmeS
-						h+BnInF0Ddi412jA/73bOkJw8DUCeFMpyDLq5KIEh5hpWko/hiN2MV440jHOOz4c
-						C6q6FIKo0VbnIG1J8W3llePya/7RgXMApLZIO9JlTbru2qcCibgk9cjnKdLYGRLQ
-						OQYZJs4QyA9nN9n53e7Ov7JVOb7R1y77o8h39JhLNCvDlySfhDTeggal2yNb24xf
-						eL4Ee5cKOWdgyo6g5FkHmXn5jsIeBhdI26PyJa46s2/v+3vRzYg/7SpXPj5jZ5JH
-						9VmweGU01MjqvHQVYd7Bfi0Ndik4otfE5nneOQngI3fR5nWV5oGngwIDAQABo2kw
-						ZzBGBgNVHREEPzA9ghN3d3cudGFuZGZvbmxpbmUuY29thiZodHRwczovL3d3dy50
-						YW5kZm9ubGluZS5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTh9Dhbn3dZ+Os2eC
-						RsJIDjh7+mowDQYJKoZIhvcNAQEFBQADggEBABhElasaAVvlbl3ZvZQlhEcQpqQD
-						TvZRxncGrz6moC3pHnUho0L3ZphAnMyHUQlZfg8uZuJBeWTOPYCIYuqQXn+pQ+Si
-						S9n2L8UnoCgNI3df9DDYb7tzpSipYGEXGOw2RUWr1PUD8GQtzP5jkzMPs0eAm/U3
-						pmChGsS7HZbNle9fyBUha2UFebCWFhjUm2iLsN2+kCOkfxEpwLTy26cz1MBqkhDN
-						hNI51amuMNcL46a8+E1IW8L59W656YzJnJ8I2A9nuHdmWQGs5jICuG4dr7+70wCP
-						Lv0VNFSwnTxjA5Rocmae95yzHIE0I4tW7VD+q+yeEStXHCCN1rWHgLWJb/U=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tandfqa.literatumonline.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tandfqa.literatumonline.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tandfqa.literatumonline.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: Atypon T and F QA</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.atypon.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/tandftest.literatumonline.com-shibboleth.xml b/swamid-interfederations-2.0/tandftest.literatumonline.com-shibboleth.xml
deleted file mode 100644
index e34b67b7..00000000
--- a/swamid-interfederations-2.0/tandftest.literatumonline.com-shibboleth.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tandftest.literatumonline.com/shibboleth">
-  <!--
-		This is a 'Literatum Online' OpenSAML SP for Atypon Systems.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIJAMO9zKBOInK0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3d3dy50YW5kZm9ubGluZS5jb20wHhcNMTQwMzE0MDUwNDAyWhcNMTcwMzEz
-						MDUwNDAyWjAeMRwwGgYDVQQDExN3d3cudGFuZGZvbmxpbmUuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+7mPo1QcQmquZzEQh1lPd0/52x3tUmeS
-						h+BnInF0Ddi412jA/73bOkJw8DUCeFMpyDLq5KIEh5hpWko/hiN2MV440jHOOz4c
-						C6q6FIKo0VbnIG1J8W3llePya/7RgXMApLZIO9JlTbru2qcCibgk9cjnKdLYGRLQ
-						OQYZJs4QyA9nN9n53e7Ov7JVOb7R1y77o8h39JhLNCvDlySfhDTeggal2yNb24xf
-						eL4Ee5cKOWdgyo6g5FkHmXn5jsIeBhdI26PyJa46s2/v+3vRzYg/7SpXPj5jZ5JH
-						9VmweGU01MjqvHQVYd7Bfi0Ndik4otfE5nneOQngI3fR5nWV5oGngwIDAQABo2kw
-						ZzBGBgNVHREEPzA9ghN3d3cudGFuZGZvbmxpbmUuY29thiZodHRwczovL3d3dy50
-						YW5kZm9ubGluZS5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTh9Dhbn3dZ+Os2eC
-						RsJIDjh7+mowDQYJKoZIhvcNAQEFBQADggEBABhElasaAVvlbl3ZvZQlhEcQpqQD
-						TvZRxncGrz6moC3pHnUho0L3ZphAnMyHUQlZfg8uZuJBeWTOPYCIYuqQXn+pQ+Si
-						S9n2L8UnoCgNI3df9DDYb7tzpSipYGEXGOw2RUWr1PUD8GQtzP5jkzMPs0eAm/U3
-						pmChGsS7HZbNle9fyBUha2UFebCWFhjUm2iLsN2+kCOkfxEpwLTy26cz1MBqkhDN
-						hNI51amuMNcL46a8+E1IW8L59W656YzJnJ8I2A9nuHdmWQGs5jICuG4dr7+70wCP
-						Lv0VNFSwnTxjA5Rocmae95yzHIE0I4tW7VD+q+yeEStXHCCN1rWHgLWJb/U=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tandftest.literatumonline.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tandftest.literatumonline.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tandftest.literatumonline.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: Atypon T and F Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.atypon.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/tc-web-01.groupgti.net-shibboleth.xml b/swamid-interfederations-2.0/tc-web-01.groupgti.net-shibboleth.xml
deleted file mode 100644
index 8f7e8867..00000000
--- a/swamid-interfederations-2.0/tc-web-01.groupgti.net-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://tc-web-01.groupgti.net/shibboleth">
-  <!--
-		This is a test TARGETconnect Web1 Guanxi SP owned by GTI Media Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEXjCCA0agAwIBAgIJALr1RvO8/Hs1MA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
-						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
-						LXdlYi0wMS5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
-						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA4MjZaFw0yMDA5
-						MjAyMTA4MjZaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
-						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
-						MAYDVQQDEylodHRwczovL3RjLXdlYi0wMS5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
-						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0G5rfLxGDxli2k/E//a1HfgrZA
-						oqvmIOcXaahpP1HCLK+3mgSU2cR3ukTvS0Pldnrn8dwXs/wsZTnGUqJNlvXVgHgf
-						KSuGAwqtKPzuX+0omVbl6lekO2Ie8SZbCRi1w0S3/PpWQv/00MrjokllQZtRMMQq
-						0XAmqEusMyf9O7S/CKz8Kd9FzezLdJ2E+cT6a8P+PEic9f05uk3iAEu9xafVLSgR
-						B/IK5HDfMy2/o+Hj9iVhTKRzvaERWB/WozNH3y8x34QNLTFXvLwVJ/Bz/IL4/uzc
-						unsARYJHZBZ6AtC7uqkXRgXIqeFJRduNNrmdRFa/MjVhpdnhOJxRy52kWTsCAwEA
-						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
-						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOWwAghxTnuIj9RO/+IYp+V9QGMsMB8G
-						A1UdIwQYMBaAFOWwAghxTnuIj9RO/+IYp+V9QGMsMA0GCSqGSIb3DQEBBQUAA4IB
-						AQCQDWQJ4xYFcUa7OMF3bgWB0pOUUCzVvdJICIp41+6xdGJDkJo3e15dhEVtVjwx
-						jxvGruH07YSuYd6Sl8wEeYCR9sruxUMwNWKD/GBxuZUFrhM3avnpC81tgtMQs+BD
-						ND9wgQNP0oPlOmHRVAj8GZHGxRdwXfXmuc87a4+7E6ViI3zZKIZBW6PzRHHpKt00
-						uNvi0wNHgzVPgECjM6Fbs4BQdIxR65UHcLOPlFfJe6VtQ7zRL247jCghHmpLAM34
-						jE1agxgsSIXSbxHwZZE2S/mQZYD5SS3pjfCv5NVLar1+78ltc0UrtuAYAzNWS1JO
-						d7WVmWXEHEPJ0nj/KHfo0tLf
-					</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>
-						MIIEXjCCA0agAwIBAgIJALr1RvO8/Hs1MA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
-						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
-						LXdlYi0wMS5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
-						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA4MjZaFw0yMDA5
-						MjAyMTA4MjZaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
-						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
-						MAYDVQQDEylodHRwczovL3RjLXdlYi0wMS5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
-						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO0G5rfLxGDxli2k/E//a1HfgrZA
-						oqvmIOcXaahpP1HCLK+3mgSU2cR3ukTvS0Pldnrn8dwXs/wsZTnGUqJNlvXVgHgf
-						KSuGAwqtKPzuX+0omVbl6lekO2Ie8SZbCRi1w0S3/PpWQv/00MrjokllQZtRMMQq
-						0XAmqEusMyf9O7S/CKz8Kd9FzezLdJ2E+cT6a8P+PEic9f05uk3iAEu9xafVLSgR
-						B/IK5HDfMy2/o+Hj9iVhTKRzvaERWB/WozNH3y8x34QNLTFXvLwVJ/Bz/IL4/uzc
-						unsARYJHZBZ6AtC7uqkXRgXIqeFJRduNNrmdRFa/MjVhpdnhOJxRy52kWTsCAwEA
-						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
-						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOWwAghxTnuIj9RO/+IYp+V9QGMsMB8G
-						A1UdIwQYMBaAFOWwAghxTnuIj9RO/+IYp+V9QGMsMA0GCSqGSIb3DQEBBQUAA4IB
-						AQCQDWQJ4xYFcUa7OMF3bgWB0pOUUCzVvdJICIp41+6xdGJDkJo3e15dhEVtVjwx
-						jxvGruH07YSuYd6Sl8wEeYCR9sruxUMwNWKD/GBxuZUFrhM3avnpC81tgtMQs+BD
-						ND9wgQNP0oPlOmHRVAj8GZHGxRdwXfXmuc87a4+7E6ViI3zZKIZBW6PzRHHpKt00
-						uNvi0wNHgzVPgECjM6Fbs4BQdIxR65UHcLOPlFfJe6VtQ7zRL247jCghHmpLAM34
-						jE1agxgsSIXSbxHwZZE2S/mQZYD5SS3pjfCv5NVLar1+78ltc0UrtuAYAzNWS1JO
-						d7WVmWXEHEPJ0nj/KHfo0tLf
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine/shibb/acs" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GTI Media Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Web1</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.groupgti.com/home/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>TARGETconnect Support</GivenName>
-    <EmailAddress>mailto:targetconnect.support@groupgti.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Masters</SurName>
-    <EmailAddress>mailto:chris.masters@groupgti.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tc-web-02.groupgti.net-shibboleth.xml b/swamid-interfederations-2.0/tc-web-02.groupgti.net-shibboleth.xml
deleted file mode 100644
index 8970fde8..00000000
--- a/swamid-interfederations-2.0/tc-web-02.groupgti.net-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://tc-web-02.groupgti.net/shibboleth">
-  <!--
-		This is a test TARGETconnect Web2 Guanxi SP owned by GTI Media Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEXjCCA0agAwIBAgIJAJEc5gsxNUbCMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
-						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
-						LXdlYi0wMi5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
-						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA4NTRaFw0yMDA5
-						MjAyMTA4NTRaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
-						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
-						MAYDVQQDEylodHRwczovL3RjLXdlYi0wMi5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
-						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANw+KqJVLy3RpCE6Szd2C/G3rLKO
-						u1BWzqGTcFrLxElc5zMQccTeYSQY42/BrQSjY8Oan7A7ilLI6M/83mNxTFcxOpUf
-						VPzajRcBnOTzUGWG7AzHn04jfYbCHozt7ek11VHoxWHGkZa1kykb+5Y1es8lKeDj
-						oxE82a2sRxpEQJWiJeer4S1CR8rd7AdZtxVm4CzJyfRb/eVCQAK+2aoTcyLc9fKC
-						iCOLMxX/Ld+y60m3qpxqOAFeNqk+ehtAy5dakXBL9VwNyeQ1ZHgQcnh/NVJ4N3Y3
-						r6tDPRHgML54s7nMz5XDewBhGjrtjvrTWYBP1Q8DTf2neLqdky+WsA63qa0CAwEA
-						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
-						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOC1VfX8Qxzl8vzm0SuSJ+DPl6MSMB8G
-						A1UdIwQYMBaAFOC1VfX8Qxzl8vzm0SuSJ+DPl6MSMA0GCSqGSIb3DQEBBQUAA4IB
-						AQC0qyxzOV6UHVavg5wVHdx9j3d1e7zmChtGPKErHz3Hovjg209dhHIooP7UqkE/
-						0c4WbGEsny+Pwv6M3EAr+utRj4pjRnpglwaWygJ+cFtY29+D0g6oDLzJZy+pcgXI
-						lkOjkFTGcwGAnLbVB3uEg+PTglpRVCXz4bhXpZzPzZmxsdSe/8vQF9zaNv2AIOrl
-						t2r1GTl2jt/3Bg+hJvPeBCkIBHh5sNgL0UWtNMBK/j6Me0xJCkEL/IWQpHfvLKcA
-						kAjByRAB/7Jw+b2CkaFGfozXh4W2ALsg7F3noW0S77LHMAcnuWEozfjc7QA8w8jV
-						Oij+zsSTj3QSvhRz5A2Dqv1F
-					</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>
-						MIIEXjCCA0agAwIBAgIJAJEc5gsxNUbCMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
-						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
-						LXdlYi0wMi5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
-						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA4NTRaFw0yMDA5
-						MjAyMTA4NTRaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
-						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
-						MAYDVQQDEylodHRwczovL3RjLXdlYi0wMi5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
-						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANw+KqJVLy3RpCE6Szd2C/G3rLKO
-						u1BWzqGTcFrLxElc5zMQccTeYSQY42/BrQSjY8Oan7A7ilLI6M/83mNxTFcxOpUf
-						VPzajRcBnOTzUGWG7AzHn04jfYbCHozt7ek11VHoxWHGkZa1kykb+5Y1es8lKeDj
-						oxE82a2sRxpEQJWiJeer4S1CR8rd7AdZtxVm4CzJyfRb/eVCQAK+2aoTcyLc9fKC
-						iCOLMxX/Ld+y60m3qpxqOAFeNqk+ehtAy5dakXBL9VwNyeQ1ZHgQcnh/NVJ4N3Y3
-						r6tDPRHgML54s7nMz5XDewBhGjrtjvrTWYBP1Q8DTf2neLqdky+WsA63qa0CAwEA
-						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
-						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFOC1VfX8Qxzl8vzm0SuSJ+DPl6MSMB8G
-						A1UdIwQYMBaAFOC1VfX8Qxzl8vzm0SuSJ+DPl6MSMA0GCSqGSIb3DQEBBQUAA4IB
-						AQC0qyxzOV6UHVavg5wVHdx9j3d1e7zmChtGPKErHz3Hovjg209dhHIooP7UqkE/
-						0c4WbGEsny+Pwv6M3EAr+utRj4pjRnpglwaWygJ+cFtY29+D0g6oDLzJZy+pcgXI
-						lkOjkFTGcwGAnLbVB3uEg+PTglpRVCXz4bhXpZzPzZmxsdSe/8vQF9zaNv2AIOrl
-						t2r1GTl2jt/3Bg+hJvPeBCkIBHh5sNgL0UWtNMBK/j6Me0xJCkEL/IWQpHfvLKcA
-						kAjByRAB/7Jw+b2CkaFGfozXh4W2ALsg7F3noW0S77LHMAcnuWEozfjc7QA8w8jV
-						Oij+zsSTj3QSvhRz5A2Dqv1F
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine/shibb/acs" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GTI Media Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Web2</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.groupgti.com/home/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>TARGETconnect Support</GivenName>
-    <EmailAddress>mailto:targetconnect.support@groupgti.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Masters</SurName>
-    <EmailAddress>mailto:chris.masters@groupgti.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tc-web-03.groupgti.net-shibboleth.xml b/swamid-interfederations-2.0/tc-web-03.groupgti.net-shibboleth.xml
deleted file mode 100644
index ba3d6fae..00000000
--- a/swamid-interfederations-2.0/tc-web-03.groupgti.net-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://tc-web-03.groupgti.net/shibboleth">
-  <!--
-		This is a test TARGETconnect Web3 Guanxi SP owned by GTI Media Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEXjCCA0agAwIBAgIJAPnTayEZXM7VMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
-						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
-						LXdlYi0wMy5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
-						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA5MThaFw0yMDA5
-						MjAyMTA5MThaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
-						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
-						MAYDVQQDEylodHRwczovL3RjLXdlYi0wMy5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
-						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOdFx3Y5iAOlUIyGc1xyE+WO4faO
-						NyRg+RrLlJILmaqoAxvuj9S6ZIvozHcm9lt8MtbhuLGYHvccI3f/kFfIrcQIf4A1
-						AkiQvipgXcsskSxWWh1AccbS6EvCvfPWq4sKpUc8Sr0mexeWrOwtO8vw1Lhx0iaZ
-						JW9gbT6f3k6XdZHATqRB1L5M5QNHzr83DwFPkp7K7HPs88qI99x6KhIoxXkHS4F2
-						qxIKk6Jrk/XpMe+gmRno1Hy9wjFlpd92MS46kIfrPkwGb+btFfZVYwmRabsqVylL
-						O5Uj8q0B5kPE3qVzVggi3XoyCJb0rZRJGhmhTJHHzDpLH43b4ph7b6h6pgkCAwEA
-						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
-						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFBtiQvufwTjI+aEBDw5atKl92se6MB8G
-						A1UdIwQYMBaAFBtiQvufwTjI+aEBDw5atKl92se6MA0GCSqGSIb3DQEBBQUAA4IB
-						AQDmiCUup4EsfafrMTbIicd6BpA5O6MueKq5jqcsUnTN4LK54fvDgDXq662AOCH0
-						yN62pBTeqZDNPhqRhpz+UnnmPg6NavHhH//nrNXEDuQPZGEQDpkTKZ4W3lR+S8rt
-						LO4YljkGQFxpKFuXtOLIpCNbV0TP4m3nbnmizjFqIWwvKGqo4bh8rCz2BljYp2Fl
-						XgcpItZZi8MIg6yEJSFTyZnc42HTk3lZHIgGlttABV694S6HOslGEpSq6N1bFVLs
-						rjQUyxNGUVhJ++5dcBsCpBcyGgwKLSx5nJY72lDMkWJvAj7ihi+x+hL8gIvPfkmm
-						yiu2mVZwNVkxuVjfZ9eLiYR7
-					</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>
-						MIIEXjCCA0agAwIBAgIJAPnTayEZXM7VMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
-						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
-						LXdlYi0wMy5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
-						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA5MThaFw0yMDA5
-						MjAyMTA5MThaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
-						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
-						MAYDVQQDEylodHRwczovL3RjLXdlYi0wMy5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
-						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOdFx3Y5iAOlUIyGc1xyE+WO4faO
-						NyRg+RrLlJILmaqoAxvuj9S6ZIvozHcm9lt8MtbhuLGYHvccI3f/kFfIrcQIf4A1
-						AkiQvipgXcsskSxWWh1AccbS6EvCvfPWq4sKpUc8Sr0mexeWrOwtO8vw1Lhx0iaZ
-						JW9gbT6f3k6XdZHATqRB1L5M5QNHzr83DwFPkp7K7HPs88qI99x6KhIoxXkHS4F2
-						qxIKk6Jrk/XpMe+gmRno1Hy9wjFlpd92MS46kIfrPkwGb+btFfZVYwmRabsqVylL
-						O5Uj8q0B5kPE3qVzVggi3XoyCJb0rZRJGhmhTJHHzDpLH43b4ph7b6h6pgkCAwEA
-						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
-						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFBtiQvufwTjI+aEBDw5atKl92se6MB8G
-						A1UdIwQYMBaAFBtiQvufwTjI+aEBDw5atKl92se6MA0GCSqGSIb3DQEBBQUAA4IB
-						AQDmiCUup4EsfafrMTbIicd6BpA5O6MueKq5jqcsUnTN4LK54fvDgDXq662AOCH0
-						yN62pBTeqZDNPhqRhpz+UnnmPg6NavHhH//nrNXEDuQPZGEQDpkTKZ4W3lR+S8rt
-						LO4YljkGQFxpKFuXtOLIpCNbV0TP4m3nbnmizjFqIWwvKGqo4bh8rCz2BljYp2Fl
-						XgcpItZZi8MIg6yEJSFTyZnc42HTk3lZHIgGlttABV694S6HOslGEpSq6N1bFVLs
-						rjQUyxNGUVhJ++5dcBsCpBcyGgwKLSx5nJY72lDMkWJvAj7ihi+x+hL8gIvPfkmm
-						yiu2mVZwNVkxuVjfZ9eLiYR7
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine/shibb/acs" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GTI Media Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Web3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.groupgti.com/home/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>TARGETconnect Support</GivenName>
-    <EmailAddress>mailto:targetconnect.support@groupgti.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Masters</SurName>
-    <EmailAddress>mailto:chris.masters@groupgti.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml b/swamid-interfederations-2.0/tc-web-04.groupgti.net-shibboleth.xml
deleted file mode 100644
index b56dd3a4..00000000
--- a/swamid-interfederations-2.0/tc-web-04.groupgti.net-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://tc-web-04.groupgti.net/shibboleth">
-  <!--
-		This is a test TARGETconnect Web4 Guanxi SP owned by GTI Media Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEXjCCA0agAwIBAgIJAMke5AjSxi5OMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
-						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
-						LXdlYi0wNC5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
-						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA5NDRaFw0yMDA5
-						MjAyMTA5NDRaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
-						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
-						MAYDVQQDEylodHRwczovL3RjLXdlYi0wNC5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
-						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0ZYat2MyEhnbeVgaS6DfqdejK4
-						ZspciHTMNsflPGSyUL+bjhQiP9q+QqkUQTRD6QvP3cwz0pGQPqrjh+bFLwuveyjw
-						ONzdJReT3YAMF0ykekIHhY2YEUCSdAV5MI6ABV1DHYRMYIMauac9BE8mxGbBPzDB
-						XO7NEzqOCsqAMqSxFpETUaTLlCGBNrf4/dqKGMHeWZTfxreET2nmGFy3vGy3WNzj
-						PrIvmNMV2BS+GK146TzTI8WSDTeFylu3FDcG8EDagY1AdsI2E67WWtXENnqh7nhg
-						CyXnHPlrWiWB7G1/dcMqFMiL7o4LdbrPah9SuSx5d3z5opC3hFqAyiLAPH0CAwEA
-						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
-						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFNOJpQGCNKkje2TJJrIQJrLEIPy5MB8G
-						A1UdIwQYMBaAFNOJpQGCNKkje2TJJrIQJrLEIPy5MA0GCSqGSIb3DQEBBQUAA4IB
-						AQBgAcdiAEiBYPdZKlhnP+lapwnxjYas7iPagZxh3VM48tMF4hYVQISOOWxkqhX+
-						JbdBv8IW6Hmm3nS32akZjGXLiXwcrXjQO+1V2JbfCRGV6Q0SMu4AToJBIcIykSRP
-						2YB1u8DSnsXGfzGjpsL0EIxEKrD4UWtw6o9r2JKqnNUocsDZNRZjS9gaF6ksZFMt
-						rrIVqvtKDRcWH9TezJ/JJPAhocQDKXstcd2m63uAlh3IjEaCnU0Dus2e3HTryBEM
-						/Og+MVynXgDdcG9XgVroHCR8TqohFzzmtK1Wl+Hbew5/xwi3Tzm44ZyUj00hyxAG
-						yD3GZhGlZ1YZtg+2iJdZmyox
-					</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>
-						MIIEXjCCA0agAwIBAgIJAMke5AjSxi5OMA0GCSqGSIb3DQEBBQUAMIGvMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxFDASBgNVBAcTC1dhbGxpbmdm
-						b3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIwMAYDVQQDEylodHRwczovL3Rj
-						LXdlYi0wNC5ncm91cGd0aS5uZXQvc2hpYmJvbGV0aDEoMCYGCSqGSIb3DQEJARYZ
-						Y2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTAeFw0xMDA5MjMyMTA5NDRaFw0yMDA5
-						MjAyMTA5NDRaMIGvMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUx
-						FDASBgNVBAcTC1dhbGxpbmdmb3JkMRYwFAYDVQQKEw1HVEkgTWVkaWEgTHRkMTIw
-						MAYDVQQDEylodHRwczovL3RjLXdlYi0wNC5ncm91cGd0aS5uZXQvc2hpYmJvbGV0
-						aDEoMCYGCSqGSIb3DQEJARYZY2hyaXMubWFzdGVyc0Bncm91cHRpLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0ZYat2MyEhnbeVgaS6DfqdejK4
-						ZspciHTMNsflPGSyUL+bjhQiP9q+QqkUQTRD6QvP3cwz0pGQPqrjh+bFLwuveyjw
-						ONzdJReT3YAMF0ykekIHhY2YEUCSdAV5MI6ABV1DHYRMYIMauac9BE8mxGbBPzDB
-						XO7NEzqOCsqAMqSxFpETUaTLlCGBNrf4/dqKGMHeWZTfxreET2nmGFy3vGy3WNzj
-						PrIvmNMV2BS+GK146TzTI8WSDTeFylu3FDcG8EDagY1AdsI2E67WWtXENnqh7nhg
-						CyXnHPlrWiWB7G1/dcMqFMiL7o4LdbrPah9SuSx5d3z5opC3hFqAyiLAPH0CAwEA
-						AaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0
-						ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFNOJpQGCNKkje2TJJrIQJrLEIPy5MB8G
-						A1UdIwQYMBaAFNOJpQGCNKkje2TJJrIQJrLEIPy5MA0GCSqGSIb3DQEBBQUAA4IB
-						AQBgAcdiAEiBYPdZKlhnP+lapwnxjYas7iPagZxh3VM48tMF4hYVQISOOWxkqhX+
-						JbdBv8IW6Hmm3nS32akZjGXLiXwcrXjQO+1V2JbfCRGV6Q0SMu4AToJBIcIykSRP
-						2YB1u8DSnsXGfzGjpsL0EIxEKrD4UWtw6o9r2JKqnNUocsDZNRZjS9gaF6ksZFMt
-						rrIVqvtKDRcWH9TezJ/JJPAhocQDKXstcd2m63uAlh3IjEaCnU0Dus2e3HTryBEM
-						/Og+MVynXgDdcG9XgVroHCR8TqohFzzmtK1Wl+Hbew5/xwi3Tzm44ZyUj00hyxAG
-						yD3GZhGlZ1YZtg+2iJdZmyox
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://saml2.targetconnect.net/samlengine/shibb/acs" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml2.targetconnect.net/samlengine/s2/wbsso/acs" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GTI Media Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GTI: TARGETconnect Web4</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.groupgti.com/home/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>TARGETconnect Support</GivenName>
-    <EmailAddress>mailto:targetconnect.support@groupgti.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Masters</SurName>
-    <EmailAddress>mailto:chris.masters@groupgti.com</EmailAddress>
-  </ContactPerson>
-</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 120102d1..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: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="2011-06-08T02:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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 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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 2bb210af..00000000
--- a/swamid-interfederations-2.0/tcs-escience-portal.terena.org.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: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: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 04a96d49..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: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="2011-06-08T02:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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 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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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 03b10873..00000000
--- a/swamid-interfederations-2.0/tcs-personal-portal.terena.org.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: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">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <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>
-  </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:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 66f13c7f..00000000
--- a/swamid-interfederations-2.0/teledir5.telecoms.ox.ac.uk-shibboleth-sp.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://teledir5.telecoms.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Test set up for Telecoms" Shibboleth SP for University of Oxford.
-	-->
-  <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="2014-12-17T14:58:04Z">
-      <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://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIJANX16FDnJfJzMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnRlbGVkaXI1LnRlbGVjb21zLm94LmFjLnVrMB4XDTE0MTIxNjE2NTIwOFoX
-						DTE3MTIxNTE2NTIwOFowJTEjMCEGA1UEAxMadGVsZWRpcjUudGVsZWNvbXMub3gu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyweHxHPmnhnso
-						8M2RhuEmAULqIBgAXMR93f47bFP7BcmBhfhDvo2MbODKFgiLvargURn1e/NJpU9E
-						socaGCydVh/UfjanQ+BDv2OMC4TP+OkVpq3Ytj7OuNwS7XDJRH0DBF6ViuKeGLEI
-						QJcwcpDsty6Nv02KtTqx6s7xDq5ZTw1bWu1YnpgJEfptRWeP/Fy27kTbCxuhSoGM
-						i2AyhObTtip74KvLWrqdjnrDajmTyn3Q6NwJS78/WCZ9LhCDdEVDeFzh2Jmf7C8P
-						D9CS8ngFr7vstIyprWjW6zRWJfAHqZAl1q1BJqyapClxHcY+vaU+RGgg3rGOCmIZ
-						R6JJ4xpHAgMBAAGjdzB1MFQGA1UdEQRNMEuCGnRlbGVkaXI1LnRlbGVjb21zLm94
-						LmFjLnVrhi1odHRwczovL3RlbGVkaXI1LnRlbGVjb21zLm94LmFjLnVrL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFK8xAUsfV8iIepwmYhTalg2LmDkjMA0GCSqGSIb3DQEB
-						BQUAA4IBAQAbSeWfz3/JHz+K8QDFZ/hAXlSfhsZ8cLNRvAyngacjrShnNjt5FYYY
-						3NuRQNrqahhlVIeWWRVzQyEFAyeyjw6joZThkuFCFC80GobXltQynj74qquWn4xy
-						pEplFFeaZRm342BkjifrVHKKW2UQiYkvj3ZCpNqZaaMk2zJCRa279xR/NCst1OP1
-						gCyW8S6Qdj9uYRynfTwCiWupd0+MTueEXBkk4lT5/Xssy9WuWGV35FgIjGnGDw0J
-						dzxX0lnHhv9sM9OH0gWwl57wJlZjwzRDmZE7QmPpnD/Q1r3NzNFVfrfABjKuAZ8F
-						ZBxxFc3M3ZaEb+h0oQ8fK2f1XPDlw29j
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://teledir5.telecoms.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Test set up for Telecoms</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk/telecoms/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Telecoms IT Support</GivenName>
-    <EmailAddress>mailto:telecomsitsupport@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Telecoms IT Support</GivenName>
-    <EmailAddress>mailto:telecomsitsupport@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/terena.org-sp.xml b/swamid-interfederations-2.0/terena.org-sp.xml
index 1eca1234..26ecd068 100644
--- a/swamid-interfederations-2.0/terena.org-sp.xml
+++ b/swamid-interfederations-2.0/terena.org-sp.xml
@@ -1,93 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://terena.org/sp">
-  <!--
-		This is a SimpleSAMLphp Service Provider Proxy for TERENA.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.surfconext.nl/" registrationInstant="2011-06-08T02:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes>
+      <saml:Attribute 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>
+    <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: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">GÉANT Service Provider Proxy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A service provider proxy for all GÉANT federated services</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.geant.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.geant.org/Policies</mdui:PrivacyStatementURL>
+        <mdui:Logo width="175" height="73">https://login.terena.org/wayf/module.php/terena/gfx/New_GEANT_logo.jpg</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-						VQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UE
-						ChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5h
-						Lm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEy
-						MTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgT
-						Ak5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UE
-						CxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG
-						9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfd
-						SPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azq
-						KOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN
-						+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLz
-						dciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwp
-						l9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqj
-						pKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3
-						fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQH
-						EwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYD
-						VQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0
-						ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoK
-						h6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7D
-						Hg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX
-						47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3W
-						AIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZ
-						p7XRy85jRjrvhahg5baIQ0u3aL8aMA==
-					</ds:X509Certificate>
+          <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>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
-						VQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UE
-						ChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5h
-						Lm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEy
-						MTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgT
-						Ak5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UE
-						CxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG
-						9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfd
-						SPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azq
-						KOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN
-						+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLz
-						dciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwp
-						l9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqj
-						pKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3
-						fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQH
-						EwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYD
-						VQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0
-						ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoK
-						h6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7D
-						Hg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX
-						47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3W
-						AIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZ
-						p7XRy85jRjrvhahg5baIQ0u3aL8aMA==
-					</ds:X509Certificate>
+          <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>
-    </KeyDescriptor>
-    <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"/>
-    <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"/>
-    <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"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TERENA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">TERENA: Service Provider Proxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.terena.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>TERENA AAI Support</GivenName>
-    <EmailAddress>mailto:aai@terena.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>TERENA AAI Support</GivenName>
-    <EmailAddress>mailto:aai@terena.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
+    </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/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 f80c9ff8..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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-adfs.geant.net/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-adfs.geant.net/adfs/ls/" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-adfs.geant.net/adfs/ls/" index="2"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">GÉANT Intranet Test Instance</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Provides access to GÉANT project documents and internas.</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="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="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="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn: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="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="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">geant.net</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>eduGAIN</md:GivenName>
-    <md:SurName>Integration</md:SurName>
-    <md:EmailAddress>mailto:edugain-integration@geant.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>eduGAIN</md:GivenName>
-    <md:SurName>Operation</md:SurName>
-    <md:EmailAddress>mailto:edugain-ot@geant.net</md:EmailAddress>
-  </md: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-auth.galegroup.com-shibboleth.xml b/swamid-interfederations-2.0/test-auth.galegroup.com-shibboleth.xml
deleted file mode 100644
index bebe7a6c..00000000
--- a/swamid-interfederations-2.0/test-auth.galegroup.com-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://test-auth.galegroup.com/shibboleth">
-  <!--
-		This is a "Gale Databases from Cengage Learning - Test" Shibbolth SP for Cengage Learning Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="1" 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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDTzCCAjegAwIBAgIJAJeid8J1f6CuMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHNoaWJib2xldGguZ2FsZWdyb3VwLmNvbTAeFw0xMjAzMTIxNzMwMjNaFw0z
-						MjAzMDcxNzMwMjNaMCMxITAfBgNVBAMTGHNoaWJib2xldGguZ2FsZWdyb3VwLmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2Qn+1FW/n+4ZZGA0lv
-						z9F+I5FdDnX35oD5M7JuN6cbprWA4F8EHir6bYAuvU5lK0knO4w56aiH0uhbWXu1
-						SlUlxSbAIaJombApnC5AtCJ6WFOs+NaTi/gFlAyIh7w169ZhwfsLjQE/hkdplpWT
-						xjFUNpt12ZyU8LL1yEJmfkeBUN3oK2fa7Qe+oqnyY0eOHHTKVO9IIr9/SvzdhoA0
-						c8a2kXy4qM2T+qKGi7SGz3/Qhwpial3ZDGqeZ3m25n57h3I7BhxVSJGzzbSeOcib
-						jbWRk5VjYalmG0V+XGjEJtN4oUdAgnkvJMj+yOQ8IXzDws4OR+KWGYl5lEAijXce
-						qNcCAwEAAaOBhTCBgjAdBgNVHQ4EFgQUC3bQ/Jx1yAhQgWVLRtPePx/ipxYwUwYD
-						VR0jBEwwSoAUC3bQ/Jx1yAhQgWVLRtPePx/ipxahJ6QlMCMxITAfBgNVBAMTGHNo
-						aWJib2xldGguZ2FsZWdyb3VwLmNvbYIJAJeid8J1f6CuMAwGA1UdEwQFMAMBAf8w
-						DQYJKoZIhvcNAQEFBQADggEBABAvL5eepD3fliAIefJ/4pDBxKBcCynRXLlmUWir
-						1majii1tK0WEbDdF1a24njlftvCVDNDrrfdhu1rvXZ3UhyyiOS7fBpBvRPjCmzlf
-						DdvGiMuar/T+uNzbiNqcLsVeKvwZJfzMt9Y1T7MXDABez8BD3CkdFt05j+hPK0t5
-						3PLIZfOir72LoRAtXmilZs4ZAvvTL/BTTxYn4t165Vp5yBRPCLrdSAMIdTIENBZ7
-						/tapXMzigHNS/YoxpEmtKkUrnkBm3nrWeF0Z6sqYEz49xS6NdnKLTSVQHyJ413LZ
-						WQSvXs7RDm/214HIimD/TkaDp1Yv0Yk2iQAeO7fucXAIAv4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tg-dxpres1.oh.ggtest.com:8445/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.dev1.ggdev.com/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.qa.ggtest.com/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gada.oh.gale.com:8445/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.qa.gghybrid.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.dev.ggtest.com/Shibboleth.sso/SAML/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.qa.gghybrid.com/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.galegroup.com/Shibboleth.sso/SAML2/POST" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cengage Learning Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Gale Databases from Cengage Learning - Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cengage.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Joe</GivenName>
-    <SurName>Mathews</SurName>
-    <EmailAddress>mailto:Joe.Mathews@cengage.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Selva</GivenName>
-    <SurName>Rengarajan</SurName>
-    <EmailAddress>mailto:Selva.Kumar@cengage.com</EmailAddress>
-  </ContactPerson>
-</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 38901fcd..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 GÉANT 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">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml b/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.xml
deleted file mode 100644
index 277ebc74..00000000
--- a/swamid-interfederations-2.0/test-dcs.cla.co.uk-shibboleth.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://test-dcs.cla.co.uk/shibboleth">
-  <!--
-		This is a "Digital Content Store" Shibboleth SP for The Copyright Licensing Agency Ltd.
-	-->
-  <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="2015-05-28T08:35:42Z">
-      <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://test-dcs.cla.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://test-dcs.cla.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3zCCAcegAwIBAgIJANN7j8TZENUbMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCG5zMzczMTUzMB4XDTE1MDQyNzEzNDMzOVoXDTI1MDQyNDEzNDMzOVowEzER
-						MA8GA1UEAxMIbnMzNzMxNTMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDe0s9fwQ9v4NajnGwDJkesWo7Py4ufH/5qJsYUPcForz10FATKQtlGZZvb1Gzq
-						1TaenINx4QqSjUjdyVUN3N25LWCVXW7IKmL+cxJPXx0R8Nng86ZCtYmA1epphESy
-						PTXHLDOst7B4LdtxdlfqMaSr7xRo+1tBvY4G3Lqpt2l085R13XSvVfpbevQZSD4p
-						nqi9vAiFUM4NDvycm0Yil/dPk4fGWlpMNT01JR50rpFnntJJVfab7I9Qf5cxboBw
-						5mOPwqA8w4BI4o1gFqeH/vBXwrbA8zX9Ehgkfn1Rl8Aa0ZSMgoNjhzzwwLvjAuxT
-						bWxPlVUwr7soX+RK9JRRgEMbAgMBAAGjNjA0MBMGA1UdEQQMMAqCCG5zMzczMTUz
-						MB0GA1UdDgQWBBSp4HYFPmzOFP8q8RG2pBi0PerD3TANBgkqhkiG9w0BAQUFAAOC
-						AQEAU9s2EhAdQudGpXpw6Ozw4tmEvg1IKDbUxUNEKkfUMOnlqPIeYvYhk5LN5ttD
-						YTBcGaA8tIh5UIlQpNUh2Eb89FgZ2UqNgyx9OGMaiP7nl5ZV8HHckiTcrFKOnG6X
-						+nuyOTeIYjgvpldbLZxRMlCt5fSQzqwwYX6SyK6PWsqQTZhvzpwdpbGrUj4mKEcV
-						vs9mlOgKFkqvzXLr+I4D8XVYbIxBCeh7X82ooPv4r6d7kzJJo9pRf+qi0RNKJmWZ
-						vI2el1erTkBgTf/qHvtskD/N1KTxz9oZV/bTpkype7gRaya8jguEmXqz0fyt9ohB
-						kep+2TUr/H4eYqGM0KNkWWD8FA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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-dcs.cla.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-dcs.cla.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Copyright Licensing Agency Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Content Store</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://cla.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dev Team</GivenName>
-    <EmailAddress>mailto:dev@cloudspringtech.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dev Team</GivenName>
-    <EmailAddress>mailto:dev@cloudspringtech.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Phil</GivenName>
-    <SurName>Amyotte</SurName>
-    <EmailAddress>mailto:phil@cloudspringtech.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-idp.dante.net-idp-shibboleth.xml b/swamid-interfederations-2.0/test-idp.dante.net-idp-shibboleth.xml
deleted file mode 100644
index a0cb7cce..00000000
--- a/swamid-interfederations-2.0/test-idp.dante.net-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://test-idp.dante.net/idp/shibboleth">
-  <!--
-		This is a "GÉANT Staff Identity Provider (test)" Shibboleth IdP for GÉANT Limited.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-10T16:24:13Z">
-      <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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GÉANT Staff Identity Provider (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">GÉANT 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://test-idp.dante.net/idp/images/geant_logo-16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://test-idp.dante.net/idp/images/geant_logo-80x60.png</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>
-      <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>
-						MIIDNDCCAhygAwIBAgIVAKY6eNYR8734HaAHYHoKauOUXUzyMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEnRlc3QtaWRwLmRhbnRlLm5ldDAeFw0xMzExMjgxMTI4
-						MzZaFw0zMzExMjgxMTI4MzZaMB0xGzAZBgNVBAMTEnRlc3QtaWRwLmRhbnRlLm5l
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJXUPRo76JDrVWULWsau
-						OjkcA3ETbv8mwcFns9mNBwWMGO/pVBluZrYnnmN2lq91mTEeJiMtk32bS21g1DLn
-						zyyRut9h48dIHfz36vrLI8VEGRxk85B6rhGZQx1m/vqaGLvQW3HUGcss61MHL2sb
-						z5YsXS4cvRz96nklxIKtFgUKqMLfxfmggoTyzfRXymYP0QYREMp9EGQ2pM19ne5O
-						ZPOJ5TQoz6kmRRVST60Hoo32UnD/rMNQfo8rGCBVHyozaL22nWWPK+l9awAxlD14
-						lpqTlapDu022R0VSHB7bP2oWYt29jD59dO2U57dSqImebCow7j9pGKG2zXl+Iq8M
-						mm0CAwEAAaNrMGkwSAYDVR0RBEEwP4ISdGVzdC1pZHAuZGFudGUubmV0hilodHRw
-						czovL3Rlc3QtaWRwLmRhbnRlLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						1mvjMlVsm3wMm3zVqydXM8i+GqUwDQYJKoZIhvcNAQEFBQADggEBAH+imlutE991
-						EiuXfeoLOQ13klBuoujtbswFGNraqLsUdgYhGpcVylNjA6E+ic2XmLmZZOe4IVyR
-						JEs4Owklxx/AN33T+NazKY7tesO/6yWG1yKlhM+YKtBVKPHaWlHF6Yl2ViXNQoET
-						nd59wmct2jnetatdD+nTcK4uoyYD4qi7T1yyi5BglwBgYXkkSMjNAsu/5Rs1Jm2G
-						gm003RY0Hacpz5iBy3ivF5Sn+9751MB1NXOxMKYLw9uf38YlZpaUbTHkhU0CWNbs
-						yuTd0QvUiAwqymNY7bW1igPR3ZwrolsVTPGzSwYA1uz9ossTEeBiA9hc0p7fUZMQ
-						cD03d90l9es=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://test-idp.dante.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-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://test-idp.dante.net/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-idp.dante.net/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-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://test-idp.dante.net/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-idp.dante.net/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test-idp.dante.net/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-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>
-						MIIDNDCCAhygAwIBAgIVAKY6eNYR8734HaAHYHoKauOUXUzyMA0GCSqGSIb3DQEB
-						BQUAMB0xGzAZBgNVBAMTEnRlc3QtaWRwLmRhbnRlLm5ldDAeFw0xMzExMjgxMTI4
-						MzZaFw0zMzExMjgxMTI4MzZaMB0xGzAZBgNVBAMTEnRlc3QtaWRwLmRhbnRlLm5l
-						dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJXUPRo76JDrVWULWsau
-						OjkcA3ETbv8mwcFns9mNBwWMGO/pVBluZrYnnmN2lq91mTEeJiMtk32bS21g1DLn
-						zyyRut9h48dIHfz36vrLI8VEGRxk85B6rhGZQx1m/vqaGLvQW3HUGcss61MHL2sb
-						z5YsXS4cvRz96nklxIKtFgUKqMLfxfmggoTyzfRXymYP0QYREMp9EGQ2pM19ne5O
-						ZPOJ5TQoz6kmRRVST60Hoo32UnD/rMNQfo8rGCBVHyozaL22nWWPK+l9awAxlD14
-						lpqTlapDu022R0VSHB7bP2oWYt29jD59dO2U57dSqImebCow7j9pGKG2zXl+Iq8M
-						mm0CAwEAAaNrMGkwSAYDVR0RBEEwP4ISdGVzdC1pZHAuZGFudGUubmV0hilodHRw
-						czovL3Rlc3QtaWRwLmRhbnRlLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-						1mvjMlVsm3wMm3zVqydXM8i+GqUwDQYJKoZIhvcNAQEFBQADggEBAH+imlutE991
-						EiuXfeoLOQ13klBuoujtbswFGNraqLsUdgYhGpcVylNjA6E+ic2XmLmZZOe4IVyR
-						JEs4Owklxx/AN33T+NazKY7tesO/6yWG1yKlhM+YKtBVKPHaWlHF6Yl2ViXNQoET
-						nd59wmct2jnetatdD+nTcK4uoyYD4qi7T1yyi5BglwBgYXkkSMjNAsu/5Rs1Jm2G
-						gm003RY0Hacpz5iBy3ivF5Sn+9751MB1NXOxMKYLw9uf38YlZpaUbTHkhU0CWNbs
-						yuTd0QvUiAwqymNY7bW1igPR3ZwrolsVTPGzSwYA1uz9ossTEeBiA9hc0p7fUZMQ
-						cD03d90l9es=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://test-idp.dante.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-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">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Staff Identity Provider (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>DANTE Support</GivenName>
-    <EmailAddress>mailto:idp-support@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DANTE Support</GivenName>
-    <EmailAddress>mailto:idp-support@geant.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml b/swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.xml
deleted file mode 100644
index 38209047..00000000
--- a/swamid-interfederations-2.0/test-imagenweb.cambridgeimaging.co.uk-entityid.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://test-imagenweb.cambridgeimaging.co.uk/entityid">
-  <!--
-		This is an "ImagenWeb (beta)" simpleSAMLphp SP for Cambridge Imaging Systems Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-25T12:21: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: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">ImagenWeb (beta)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">ImagenWeb 2.9 (beta), used for testing only</mdui:Description>
-        <mdui:Logo height="64" width="224">https://test-imagenweb.cambridgeimaging.co.uk/user/templates/global/site-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>
-						MIIDezCCAmOgAwIBAgIJAPwwUfeiolEpMA0GCSqGSIb3DQEBBQUAMFQxIjAgBgNV
-						BAoMGUNhbWJyaWRnZSBJbWFnaW5nIFN5c3RlbXMxLjAsBgNVBAMMJXRlc3QtaW1h
-						Z2Vud2ViLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMwNDI0MTIwMTI5WhcN
-						MjMwNDIyMTIwMTI5WjBUMSIwIAYDVQQKDBlDYW1icmlkZ2UgSW1hZ2luZyBTeXN0
-						ZW1zMS4wLAYDVQQDDCV0ZXN0LWltYWdlbndlYi5jYW1icmlkZ2VpbWFnaW5nLmNv
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyGcxbphI6UcE+Lwb
-						neJnYCwKqAEYdvKlZa/Z2Az/msA83mRzxJsDH/ocTJXQN60dZ1QE/YLj/IQme4rn
-						qCaFdOJ9pmQjz3NOdBem4HumVCOfc1yGDRWsF8Z0R6MAERVVlGJeYq/EC3sUNShh
-						bsy98TS+6hMHOq0o5+fx7JqwxXAcpH2vIZ0vf3k4J64MUWxratT/ui4ZnRVBDFFK
-						TinB5KBqG/hNED8y0TTxf2tImUta905zuE+Y3TpJhjgsy7MJLjcL95XCURd4/60x
-						d96dSQOBwSYoojdPVnBgG6g17G10w+US2KiFt+6VUSlKgjHqP1BcS8bx3t2V543z
-						gcKXKQIDAQABo1AwTjAdBgNVHQ4EFgQUa5bzetEGjL5bS2it0e/mIMOdch8wHwYD
-						VR0jBBgwFoAUa5bzetEGjL5bS2it0e/mIMOdch8wDAYDVR0TBAUwAwEB/zANBgkq
-						hkiG9w0BAQUFAAOCAQEAR7ab8RqmmkKBFn6NYixN36LeQr0hBcS64r18dCpl/aeb
-						iqdDmeYiwg3dq8ItUMFdJOxazqRfYO/flNg3tHCv3zAzPbdcRIs9Jez+W13RmPjH
-						nY3dtD7KvNgantmLXtoVXSQQhgQywgmEUtqBKDyFQQ490uzWi8Wx9MbGjnhbdcD2
-						D5mHorO8fbHlmkuT14vTZau06/2Hx9dqq3uHL3JHKmhbx6UBCBAQd17Ot425MmlX
-						ueK+2BMrsfZchYNf/qH9nRbVS5phEo+RZJbJnqRG7KwVHRMyMNJblleLKqj29Yup
-						fscUgPXFf8x5UJOqq1DjJ+coYkXNsNRtZZy5uH/2nA==
-					</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>
-						MIIDezCCAmOgAwIBAgIJAPwwUfeiolEpMA0GCSqGSIb3DQEBBQUAMFQxIjAgBgNV
-						BAoMGUNhbWJyaWRnZSBJbWFnaW5nIFN5c3RlbXMxLjAsBgNVBAMMJXRlc3QtaW1h
-						Z2Vud2ViLmNhbWJyaWRnZWltYWdpbmcuY28udWswHhcNMTMwNDI0MTIwMTI5WhcN
-						MjMwNDIyMTIwMTI5WjBUMSIwIAYDVQQKDBlDYW1icmlkZ2UgSW1hZ2luZyBTeXN0
-						ZW1zMS4wLAYDVQQDDCV0ZXN0LWltYWdlbndlYi5jYW1icmlkZ2VpbWFnaW5nLmNv
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyGcxbphI6UcE+Lwb
-						neJnYCwKqAEYdvKlZa/Z2Az/msA83mRzxJsDH/ocTJXQN60dZ1QE/YLj/IQme4rn
-						qCaFdOJ9pmQjz3NOdBem4HumVCOfc1yGDRWsF8Z0R6MAERVVlGJeYq/EC3sUNShh
-						bsy98TS+6hMHOq0o5+fx7JqwxXAcpH2vIZ0vf3k4J64MUWxratT/ui4ZnRVBDFFK
-						TinB5KBqG/hNED8y0TTxf2tImUta905zuE+Y3TpJhjgsy7MJLjcL95XCURd4/60x
-						d96dSQOBwSYoojdPVnBgG6g17G10w+US2KiFt+6VUSlKgjHqP1BcS8bx3t2V543z
-						gcKXKQIDAQABo1AwTjAdBgNVHQ4EFgQUa5bzetEGjL5bS2it0e/mIMOdch8wHwYD
-						VR0jBBgwFoAUa5bzetEGjL5bS2it0e/mIMOdch8wDAYDVR0TBAUwAwEB/zANBgkq
-						hkiG9w0BAQUFAAOCAQEAR7ab8RqmmkKBFn6NYixN36LeQr0hBcS64r18dCpl/aeb
-						iqdDmeYiwg3dq8ItUMFdJOxazqRfYO/flNg3tHCv3zAzPbdcRIs9Jez+W13RmPjH
-						nY3dtD7KvNgantmLXtoVXSQQhgQywgmEUtqBKDyFQQ490uzWi8Wx9MbGjnhbdcD2
-						D5mHorO8fbHlmkuT14vTZau06/2Hx9dqq3uHL3JHKmhbx6UBCBAQd17Ot425MmlX
-						ueK+2BMrsfZchYNf/qH9nRbVS5phEo+RZJbJnqRG7KwVHRMyMNJblleLKqj29Yup
-						fscUgPXFf8x5UJOqq1DjJ+coYkXNsNRtZZy5uH/2nA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-logout.php/imagenweb"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml1-acs.php/imagenweb" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml2-acs.php/imagenweb" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-imagenweb.cambridgeimaging.co.uk/saml/module.php/saml/sp/saml1-acs.php/imagenweb/artifact" index="3"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">Test ImagenWeb for federated SSO</ServiceName>
-      <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="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="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="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="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">Cambridge Imaging Systems Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ImagenWeb (beta)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cambridgeimaging.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tim</GivenName>
-    <SurName>Jobling</SurName>
-    <EmailAddress>mailto:support@cambridgeimaging.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Jobling</SurName>
-    <EmailAddress>mailto:support@cambridgeimaging.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.nature.com-shibboleth.xml
deleted file mode 100644
index ae90093e..00000000
--- a/swamid-interfederations-2.0/test-secure.nature.com-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://test-secure.nature.com/shibboleth">
-  <!--
-		This is an OpenAthens 2 (test) service provider for Nature Publishing Group (Macmillan Publishers Limited).
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYTCCAkmgAwIBAgIEEtvGRDANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEfMB0GA1UEAxMWdGVzdC1zZWN1cmUubmF0dXJlLmNvbTAeFw0xNTAzMTMw
-						NDMwMDNaFw0yNTAzMTAwNDMwMDNaMGExCzAJBgNVBAYTAlVLMQ8wDQYDVQQHEwZM
-						b25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMDTlBHMR8wHQYDVQQD
-						ExZ0ZXN0LXNlY3VyZS5uYXR1cmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEAypds9PRwonxwlhtZHpjlmr/eIbF5UeEkXn3FU6FrjxOGJIlbqrI5
-						1UCMhNAQ/YDI1BKCu/865DTWy5qezeWDbJ5QybVHlfSqpnLu6OxufrBb0oQEEzGD
-						dM6BjMrPNagW4h8o8JwXC3vE0AIcmlrGWSl/a1jUXBag3tPm+6c8qr44gf9YyYcb
-						QnrIApdojwC3pxJpekz2k+wYDo52/meiFlQK6OYVTk/OlYIM31o+bLIW7nucrPl3
-						TJz9+Bmyenvh4qzZbqycmpQYL62z0cp5oa9SrupPVk8MWi1Xr8cxvu5TBbZZCbtR
-						uwRu3LmyvQVQejuR5VzHGJII2ktGQQwX6QIDAQABoyEwHzAdBgNVHQ4EFgQUHBsn
-						w1SEAY+N9dCCaqIDtBQpgIowDQYJKoZIhvcNAQELBQADggEBABCYwuoU2vsW0hk6
-						le8Ho83OQ8EAZTI5yGCcDecuQUru0MZJo3KfZbDpKKHrW7mpDpq9kLeu/MSKA/fg
-						p+eodmkQOZRdVUUw6EU0cfW34iUyHl+HbZjbqsToZfsH+VTSmTpMgtl0USpP5nzC
-						Ke6J0nxG735cQN08JRACzZsETdMfvAuf8Oxl61yKpVNwDWMpsysJfu86VNL/MfGo
-						kX13GFA7+EqYZaZEPXZXjq4EKhwMQfZDabw3ENuijJ4JAq2n4ikVmLRBCkqElxuA
-						fnksTUIwbxyHGAEh+bqqgcm1tQi/auufi2bQHPQ77DJSGuVzUgz/qbZU8CJ7uATR
-						wsW5loM=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-secure.nature.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-secure.nature.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.nature.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-secure.nature.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nature Publishing Group (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nature.com/npg_/company_info/index.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.palgrave-journals.com-shibboleth.xml
deleted file mode 100644
index ef8e4980..00000000
--- a/swamid-interfederations-2.0/test-secure.palgrave-journals.com-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://test-secure.palgrave-journals.com/shibboleth">
-  <!--
-		This is an OpenAthens 2 SP for Macmillan Publishers Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDdzCCAl+gAwIBAgIEZnzg8DANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEqMCgGA1UEAxMhdGVzdC1zZWN1cmUucGFsZ3JhdmUtam91cm5hbHMuY29t
-						MB4XDTE1MDMxMzA0MzEyNFoXDTI1MDMxMDA0MzEyNFowbDELMAkGA1UEBhMCVUsx
-						DzANBgNVBAcTBkxvbmRvbjESMBAGA1UEChMJTWFjbWlsbGFuMQwwCgYDVQQLEwNO
-						UEcxKjAoBgNVBAMTIXRlc3Qtc2VjdXJlLnBhbGdyYXZlLWpvdXJuYWxzLmNvbTCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ6+sZ5RQUHXfahEZpKUzGtI
-						1ytFv3r0me/hrwUPPSONPUZ8qJxJXM6v9n2lmnVqyaL0/l3TYuGfPJRx0XF/qCLd
-						bUZDE3XrNuTofwK3jo+QRztCAKQ+7FUyMdLlKnREvFJ4AJDCQcl0LrDdwbHQ1sS3
-						jiKPk7VzggMM6BVrd+2t1sn+bHbm6q0oCCmqc0sn3c9E/zxZ857Lnbe14rrl5rw4
-						hhoEE+tXElEOtqO5fMWz/vJyBeAKNct+rnHSVlGG2wHKbiCD7T8+H/Gkww4xXH28
-						fjOdqgf9tPpOyZHKyGrWMFYDGKzcnjBdc4A/3IN1msZ+bndkTHK+Vr+3wQycRnEC
-						AwEAAaMhMB8wHQYDVR0OBBYEFM3hqJRS0R8pBFypL3ckn8GDHBOyMA0GCSqGSIb3
-						DQEBCwUAA4IBAQB6lGiO0UpPShb6H06zRaJho/EEuza2rv3V4rw3bx6mb214Ns5S
-						i13caMl8D0uPQLJ7R76ToC14wPfr9zKGjET3DHmWO/x1XuyeIPgfquxiY+5b+xl5
-						aJA6IAL+Q+6GWJx0UX+C/bz5Qb7P1JnTZzqB7k3OE+qpH87k5oownUx8XqH7RYyx
-						HpCjYkxa4Lxabe1O6Q9INvULAS1cdAxmmZQTQlmAiRPK0MLPfomtqcvhUQGnHiwZ
-						bwzZO2QIVKM8zXA7VVC8XVdIOfG5LDb98EU7kqyMxPFcBk78kM7HIM13rX5mY5Yl
-						uU1h/2oAHZduSdY55wvXQYvJQCCwh5IFMgPf
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-secure.palgrave-journals.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Palgrave Journals (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.palgrave.com/AboutUs/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml b/swamid-interfederations-2.0/test-secure.palgraveconnect.com-shibboleth.xml
deleted file mode 100644
index 94bd21c9..00000000
--- a/swamid-interfederations-2.0/test-secure.palgraveconnect.com-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://test-secure.palgraveconnect.com/shibboleth">
-  <!--
-		This is a "Palgrave Connect Test" OpenAthens SP for Macmillan Publishers Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-08T17:38:32Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIEUiiGYTANBgkqhkiG9w0BAQUFADBqMQswCQYDVQQGEwJV
-						SzEPMA0GA1UEBxMGTG9uZG9uMRIwEAYDVQQKEwlNYWNtaWxsYW4xDDAKBgNVBAsT
-						A05QRzEoMCYGA1UEAxMfdGVzdC1zZWN1cmUucGFsZ3JhdmVjb25uZWN0LmNvbTAe
-						Fw0xMzA5MDUxMzI1NTNaFw0yMzA5MDMxMzI1NTNaMGoxCzAJBgNVBAYTAlVLMQ8w
-						DQYDVQQHEwZMb25kb24xEjAQBgNVBAoTCU1hY21pbGxhbjEMMAoGA1UECxMDTlBH
-						MSgwJgYDVQQDEx90ZXN0LXNlY3VyZS5wYWxncmF2ZWNvbm5lY3QuY29tMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsUYvYU275ISzg9fuYD4q550xgkOF
-						zpY/9rRNc+fFM0EsAWU8REv+lombeK4PQzRcK654Xyd6+WhCd5JViFJIZK+/E3KZ
-						jEghitSkY+sicWsjzA/L5v1QyX60s7HBvsYoNCLezbrjeFIN35qol/FgQJsEc/vr
-						2/dLDYkC/bDIC6O29mZEIt1lyrBXGUe8Dc1MshUNvkiw8vBHVCMJBxuDpB4aeHzS
-						5AvsQPkHAhB93cG7su1evDLZnsael3xD/58qbDFQqfsyKR1ScJxqsTcYU10UTA8m
-						zGC+1c7748O5j+NnbzoGH1ceRxF/xkAjGnnk3doTUvdTivxYdtP4PB9O5QIDAQAB
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBEzosiuF1PrqV9xnxsggY6+kLgGRYlYNDabyYa
-						6sqmH6VZK/xyDNiclAFq6zwodf+JQ937hbKJ92kef8HicvwdtZUugSVVp8200qRW
-						Pb2zeasxzMr/qDJi+aXD2MQ9o7Ek+EOIi3jHzsjSEvsfhZhhFgFumGfmxHfP8UGe
-						X4wqxqTD1XCB74snLGfBWiA8HTBSFWu2I6TcLOaB/h22q53Fb0kWGbKGxnQsIHxx
-						c5kRAY+dxwWbALv8WroHrVqTX6LhKujTWkxzh/xQg8hQ7tji/kcDLFi2ymeSpVmX
-						xSAwo3R1lMXGqwWXGZzadVh5xcajQcO2OX6Ce10amprpfM64
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-secure.palgraveconnect.com/shibboleth/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-secure.palgraveconnect.com/shibboleth/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-secure.palgraveconnect.com/shibboleth/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-secure.palgraveconnect.com/shibboleth/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Macmillan Publishers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Macmillan Publishers Limited: Palgrave Connect Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.palgraveconnect.com/pc/info/about.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chike</GivenName>
-    <SurName>Abia</SurName>
-    <EmailAddress>mailto:C.Abia@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chike</GivenName>
-    <SurName>Abia</SurName>
-    <EmailAddress>mailto:C.Abia@nature.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Ollier</SurName>
-    <EmailAddress>mailto:j.ollier@nature.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml b/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
deleted file mode 100644
index aea1c055..00000000
--- a/swamid-interfederations-2.0/test-sp.aco.net-shibboleth.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-sp.aco.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-07-15T13:42:53Z"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp.eduid.at/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp.eduid.at/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">eduID.at Demo Service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">eduID.at Demo Service</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Ein SAML2 Service Provider, der allen eduID.at Teilnehmern zur Demonstration und für Tests zur Verfügung steht.</mdui:Description>
-        <mdui:Description xml:lang="en">A demo Service Provider for the SAML2-based eduID.at Federation. Open to all eduID.at member institutions.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.univie.ac.at/display/federation/SAML+Demo+SP</mdui:InformationURL>
-        <mdui:Logo width="195" height="94">https://www.aco.net/fileadmin/aconet/Logos/aconetlogo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAObaiwc63DWQMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3Rlc3Qtc3AuYWNvLm5ldDAeFw0wODA3MDkxMTQ1NTVaFw0xODA3MDcxMTQ1
-NTVaMBoxGDAWBgNVBAMTD3Rlc3Qtc3AuYWNvLm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALZXEDbiffZnDnsWcJlVUBlaAyEycf+0Bjg/DjsQAz4l
-vG9poVFKlPjaQCQCyk56PXhN0ZuZZJEylHHfMrJvfM6bpylY/a+KFyeNi28acrlg
-u+BRx7uXg+wac0mfp9Z9nj93qQBP4iC7Lbv9AUDrHvp6ig/MF8P8sEb3VZRwwJDc
-x2fLuro/TueYcT0Xw3Y70vkjaAbkugjNE2pU3OL7TxgXx+qzsOmoPiWI61VgpSkm
-pmxsN1bjiKJs1sqQ/K3pQ9mcR6Mb5STShcpKf6ZqmuUD53oPeWyB03vmi0AzCXeU
-uGftaM2iWwhaxLApEE6cgxctR2lc91sQtoCo0B1FIMkCAwEAAaNhMF8wPgYDVR0R
-BDcwNYIPdGVzdC1zcC5hY28ubmV0hiJodHRwczovL3Rlc3Qtc3AuYWNvLm5ldC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTyPUKdsFFI3eqmI9OQsgaDw6e8fjANBgkqhkiG
-9w0BAQUFAAOCAQEAeD0OZAEjUr2RJFCbW820q0iG49x0jvL3lSvbYKaUY+4zthXj
-394fALks0blb7XceA857NfIXHn2NI9ZrHllmpTjc6IeD332c6NW8AevYjU+mwGuM
-ejLfUgi137jrXaP7jlGSL85aFIWTGoBT6IZu+qiVo8qbWY5EH+3gSIQYCYpfKuaJ
-6EbpYsqZ1tEg6tfUGJK4Ly87HHBCRNwDV9/85yGt+puwvjsPeaXELsGOpTaA8lGJ
-i0o8V/egkPa0mbqghudG9cwZluJCJSWxvxv7yersHIdedRwZyv7vSGu4FI4g39Km
-vNzoGHMHg8pOo6cx9Arah88V+SEsBxtCh3V9Fg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eduid.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp.eduid.at/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp.eduid.at/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eduid.at/Shibboleth.sso/SLO/POST"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp.eduid.at/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="de">eduID.at Demo Service</md:ServiceName>
-      <md:ServiceName xml:lang="en">eduID.at Demo Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Ein SAML2 Service Provider, der allen eduID.at Teilnehmern zur Demonstration und für Tests zur Verfügung steht.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">A demo Service Provider for the SAML2-based eduID.at Federation. Open to all eduID.at member institutions.</md:ServiceDescription>
-      <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"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">ACOnet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">ACOnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">ACOnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ACOnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.aco.net/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.aco.net/?L=1</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>eduID.at</md:GivenName>
-    <md:SurName>Federation Operator</md:SurName>
-    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>eduID.at</md:GivenName>
-    <md:SurName>Federation Operator</md:SurName>
-    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <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/test-sp.aco.net.xml b/swamid-interfederations-2.0/test-sp.aco.net.xml
deleted file mode 100644
index 0640ab26..00000000
--- a/swamid-interfederations-2.0/test-sp.aco.net.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test-sp.aco.net/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2008-07-15T13:42:53Z"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://saml-test.aco.net/Shibboleth.sso/Login"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test-sp.aco.net/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://saml-test.aco.net/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test-sp.aco.net/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ACOnet Test Service Provider</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">ACOnet Test Service Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A SAML2 Service Provider available to all ACOnet Identity Federation members for testing purposes.</mdui:Description>
-        <mdui:Description xml:lang="de">Ein SAML2 Service Provider, der allen ACOnet Identity Federation Mitgliedern für Tests zur Verfügung steht.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://aai-wiki.univie.ac.at/SAML-Test</mdui:InformationURL>
-        <mdui:Logo height="60" width="234">https://www.aco.net/fileadmin/aconet/Logos/Banner/234x60.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJAObaiwc63DWQMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD3Rlc3Qtc3AuYWNvLm5ldDAeFw0wODA3MDkxMTQ1NTVaFw0xODA3MDcxMTQ1
-NTVaMBoxGDAWBgNVBAMTD3Rlc3Qtc3AuYWNvLm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALZXEDbiffZnDnsWcJlVUBlaAyEycf+0Bjg/DjsQAz4l
-vG9poVFKlPjaQCQCyk56PXhN0ZuZZJEylHHfMrJvfM6bpylY/a+KFyeNi28acrlg
-u+BRx7uXg+wac0mfp9Z9nj93qQBP4iC7Lbv9AUDrHvp6ig/MF8P8sEb3VZRwwJDc
-x2fLuro/TueYcT0Xw3Y70vkjaAbkugjNE2pU3OL7TxgXx+qzsOmoPiWI61VgpSkm
-pmxsN1bjiKJs1sqQ/K3pQ9mcR6Mb5STShcpKf6ZqmuUD53oPeWyB03vmi0AzCXeU
-uGftaM2iWwhaxLApEE6cgxctR2lc91sQtoCo0B1FIMkCAwEAAaNhMF8wPgYDVR0R
-BDcwNYIPdGVzdC1zcC5hY28ubmV0hiJodHRwczovL3Rlc3Qtc3AuYWNvLm5ldC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBTyPUKdsFFI3eqmI9OQsgaDw6e8fjANBgkqhkiG
-9w0BAQUFAAOCAQEAeD0OZAEjUr2RJFCbW820q0iG49x0jvL3lSvbYKaUY+4zthXj
-394fALks0blb7XceA857NfIXHn2NI9ZrHllmpTjc6IeD332c6NW8AevYjU+mwGuM
-ejLfUgi137jrXaP7jlGSL85aFIWTGoBT6IZu+qiVo8qbWY5EH+3gSIQYCYpfKuaJ
-6EbpYsqZ1tEg6tfUGJK4Ly87HHBCRNwDV9/85yGt+puwvjsPeaXELsGOpTaA8lGJ
-i0o8V/egkPa0mbqghudG9cwZluJCJSWxvxv7yersHIdedRwZyv7vSGu4FI4g39Km
-vNzoGHMHg8pOo6cx9Arah88V+SEsBxtCh3V9Fg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-test.aco.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test-sp.aco.net/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://saml-test.aco.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-test.aco.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-test.aco.net/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml-test.aco.net/Shibboleth.sso/SLO/Artifact"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saml-test.aco.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-sp.aco.net/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-test.aco.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test-sp.aco.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://saml-test.aco.net/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-sp.aco.net/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://saml-test.aco.net/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test-sp.aco.net/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">ACOnet Test Service Provider</md:ServiceName>
-      <md:ServiceName xml:lang="de">ACOnet Test Service Provider</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">A SAML2 Service Provider available to all ACOnet Identity Federation members for testing purposes.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="de">Ein SAML2 Service Provider, der allen ACOnet Identity Federation Mitgliedern für Tests zur Verfügung steht.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">ACOnet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">ACOnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">ACOnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">ACOnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.aco.net/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.aco.net/?L=1</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ACOnet</md:GivenName>
-    <md:SurName>Identity Federation Operator</md:SurName>
-    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>ACOnet</md:GivenName>
-    <md:SurName>Identity Federation Operator</md:SurName>
-    <md:EmailAddress>mailto:eduid@aco.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test-sp.ihs.com-entity.xml b/swamid-interfederations-2.0/test-sp.ihs.com-entity.xml
deleted file mode 100644
index 43bb0d6b..00000000
--- a/swamid-interfederations-2.0/test-sp.ihs.com-entity.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://test-sp.ihs.com/entity">
-  <!--
-		This is a "test" Shibboleth SP for IHS (Global) 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="2012-03-19T16:18: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://www.ihssso.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.ihssso.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEGjCCAwKgAwIBAgIJANbtDttZCw1wMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
-						VQQGEwJVSzEQMA4GA1UECBMHRW5nbGFuZDESMBAGA1UEBxMJQnJhY2tuZWxsMQww
-						CgYDVQQKEwNJSFMxCzAJBgNVBAsTAklUMRYwFAYDVQQDEw13d3cuaWhzdGkuY29t
-						MSUwIwYJKoZIhvcNAQkBFhZob3N0aW5nc3VwcG9ydEBpaHMuY29tMB4XDTA5MDky
-						MjEwMzM0OFoXDTE5MDkyMDEwMzM0OFowgY0xCzAJBgNVBAYTAlVLMRAwDgYDVQQI
-						EwdFbmdsYW5kMRIwEAYDVQQHEwlCcmFja25lbGwxDDAKBgNVBAoTA0lIUzELMAkG
-						A1UECxMCSVQxFjAUBgNVBAMTDXd3dy5paHN0aS5jb20xJTAjBgkqhkiG9w0BCQEW
-						Fmhvc3RpbmdzdXBwb3J0QGlocy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQC/Ba3IwwsIvQgkzb/ssluNjiU95zWtyFMBCJ9b03XmB12QPF+/nTEV
-						VFu8Lm4btL7bu4FEQs04rWfxQ4EWpNgeh//UzohcUkikRT+empVepOlyxMCBr+3Q
-						fq/JN8P9riOuhW6uiADUWQ1OXOTdl4lAUXzSc7e/N+7vg4wIb7xzFDtp6h8BqhdF
-						a/noDPXXFesxtEq0ZjSVYahNMOhpsIZXNPKjuBlCFM/IC+5K6LYCY+2qYcuKH4YB
-						QtDtc7/KKJK0i3SpormleAXE9UPX+79nQ2uqUbhNG6OQzKpD+nIYDN/sPec8u2m8
-						2c+GPkqg8pKQz6LzdL8uTN5sZHgzQvg9AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJ
-						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
-						DgQWBBR99TJ9Meg90c3p614N474dVMS82DAfBgNVHSMEGDAWgBR99TJ9Meg90c3p
-						614N474dVMS82DANBgkqhkiG9w0BAQUFAAOCAQEAPM9Luz4hiaqXrCtcJ8NmNp40
-						b8x/zkUTI9VRq0EtIlD2UqnVVAh4HrGgGI0wnlzIdyaMdfjied/PBflfDto5tTz9
-						Z/9C4EViX91kOmApwJyiScP/cJX4BjUk08vORqIbu8oXlOfmcCAjT5+Y6RcloS9h
-						nkGwwNk8UnymkQtqw/MnK3DKTxcLdG4iphtzwpbcnAgO/Nb/mT8/tRWy215OuDII
-						DzE+93eMDZMqxG6X3jyYtfF9f551vCFvTDvOxkDd9dnSYPzb+++8BfTYtEnwpNiK
-						yKYcCFVxFCy1km7h2HBrOZMLUAbs0gGoTmSRAEByt0E3C8xzV1Ywu9htzRHmog==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.ihssso.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ihssso.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ihssso.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ihssso.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ihssso.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ihssso.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ihssso.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ihssso.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IHS (Global) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a test Shibboleth SP for IHS (Global) Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://uk.ihs.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Customer Support</GivenName>
-    <EmailAddress>mailto:customer.support@ihs.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Trevor</GivenName>
-    <SurName>Cooley</SurName>
-    <EmailAddress>mailto:trevor.cooley@ihs.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-shibboleth.xml
deleted file mode 100644
index cd42e88f..00000000
--- a/swamid-interfederations-2.0/test.abertay.unidesk.ac.uk-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://test.abertay.unidesk.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "Unidesk - University of Abertay" Test SP owned by the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-12T12:54:46Z">
-      <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://test.abertay.unidesk.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAKOQZJ9XeRRZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnRlc3QudW5pZGVzay5hYy51azAeFw0xMjAzMjIxNjUwMTdaFw0yMjAzMjAx
-						NjUwMTdaMB0xGzAZBgNVBAMTEnRlc3QudW5pZGVzay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAPweFLYNELDowDm8YWp8G8RKR0q+ufgUN7H7
-						h7RTesgxlO9T8wXLT1e4s1ruCVrYtkt8q3K+iXukZ+J5QD4lMtvWHfbpKJNddygG
-						RkURpJQ7bY1rTdWA6jNi16TR+8M2ECIf4Q6CVukHHrX9PuZM+b7Ktg2gf3fmy7vQ
-						MQ2/2Rp8/LKGKotVAoRYrNc8y3Y2PR9omsidxNGyyXxfD2OyTobuk1Ezb7Fk4Oq+
-						4VmetrJ5CwFOwTBmFUgfaazuooEvGM7tA/jjRGDY5H+4oyVDK63Ktf59pwGln6Bo
-						JyBfJIWYK/5w3psQJZCFyNgJ4WQSgxbAiORGQPZLfKxsvAaGD2UCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISdGVzdC51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBRxsmQCxZXe
-						bZvQMvehqWxt1yHYijANBgkqhkiG9w0BAQUFAAOCAQEAtOWghRw2KKVvYbX0sQEX
-						VDYPpi4Q1q6b1vl/MK0WU+zWjOmuljIIw377NOuH+A8zwJF2maelKlEHFmlMg8nl
-						a8MPTIQIhgJ3baXwfy5jvEIQrK++0LwaFiBdwg0dM3er6pyODVypn6oNpKY9gcFA
-						xCl05pTEBIWPAxFNcvYj/liPrDC8RcEBpnEiGZcJgvPGCulXV3O9FCRkoyTaVoUB
-						e42UmPVs7zqOGsBy6ZcHRGoD53VWtkvax8iBGBobK0fGICh6vyX7Qb6Me3r/7S1h
-						6WUcF/Nm7P5V6V2an8MJPYyIVNn6QorTplFsBhK4/Wr+Xb4JIurIwCWDqbVIYo1j
-						TA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.abertay.unidesk.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">the University of Edinburgh: Unidesk - University of Abertay (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Helpdesk</GivenName>
-    <EmailAddress>mailto:IS.Helpdesk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 544ae1b3..00000000
--- a/swamid-interfederations-2.0/test.collectionsmanager.is.ed.ac.uk-shibboleth-sp.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://test.collectionsmanager.is.ed.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Collections Manager Test" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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-08-15T13:32: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://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Edinburgh Collections Manager Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test DSpace installation for managing the University
-					of Edinburgh collection level descriptions and collection items.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJANfNVj1DnlqLMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2xhYy1yZXBvLXRlc3QxMS5pcy5lZC5hYy51azAeFw0xNDA3MDcwOTE1NTha
-						Fw0yNDA3MDQwOTE1NThaMCYxJDAiBgNVBAMTG2xhYy1yZXBvLXRlc3QxMS5pcy5l
-						ZC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfz6S/b9yYq
-						Q/6HeUwaCKwKAJIUuTHj08JTHUWG+75rGMlyqkewe0UZOH9bpa+nNQB5vB8vJCYr
-						NDwJzWouBRzei3S54Jg5m3VYo+8iIhR6RxjpgI4tLi5KMt1KKiZxz30bdeC0Qm5m
-						k/7/Hzh4H0ipKsfTZpDLA5RjkFrX8YtYQlybcTp/HF6TkEoHtAuMlhctusu+6IbF
-						iYqC4cuZdBR+8AkkhZp2R8sLeNFnEtmbm3m9cGzAGhWwWKSxw3VAidLc196KlAgY
-						Y7OAstjjvTdnLifVmmTDPpyqNN2Grp6KY1CY8grw7HhyFrELgiDedO06lJ2RR9FA
-						ZkkAc8V1ty8CAwEAAaNJMEcwJgYDVR0RBB8wHYIbbGFjLXJlcG8tdGVzdDExLmlz
-						LmVkLmFjLnVrMB0GA1UdDgQWBBQpo+/VuRtYu86j3rJaR52JzNwJIDANBgkqhkiG
-						9w0BAQUFAAOCAQEAkEI1AVUowgMd+6N75DXgFvRCaHmzuQ2dUjA8d5WkCxa908W5
-						73P3ByJE/gIM0F868bmKjp1qmoNvDnTE7BjQaxwpBwO5EY8Ae1tYyZmVD+tDxcHI
-						1ydgtONpYW8dR565/96MAlaZTRhi0fJZkkMkTAiyDv5KwsfmXHvfw0JFeOugobuK
-						3QHRD2XfDvsOwuxQbGkkN+NSd4+UZqcnp9hgtWtJHWKOnqyNinhpCNosRVO+CpU4
-						4nY9Dg5OwBp5mrZBQp4YLIznVWFaUUz/LilBSy+/c2hbHU6PxEuPuICmkjBtCK++
-						IMaAEqSt8zXvVR4i6AWj28qMBpSYddx6Pr5SFw==
-					</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.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.collectionsmanager.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh Collections Manager Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Information Systems</GivenName>
-    <EmailAddress>mailto:information.systems@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Library Digital Development Team</GivenName>
-    <EmailAddress>mailto:lddt@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ed.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.ed.unidesk.ac.uk-shibboleth.xml
deleted file mode 100644
index f42da6de..00000000
--- a/swamid-interfederations-2.0/test.ed.unidesk.ac.uk-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://test.ed.unidesk.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "Unidesk" Test 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-04-02T15:42:38Z">
-      <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://test.ed.unidesk.ac.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.ed.unidesk.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAKOQZJ9XeRRZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnRlc3QudW5pZGVzay5hYy51azAeFw0xMjAzMjIxNjUwMTdaFw0yMjAzMjAx
-						NjUwMTdaMB0xGzAZBgNVBAMTEnRlc3QudW5pZGVzay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAPweFLYNELDowDm8YWp8G8RKR0q+ufgUN7H7
-						h7RTesgxlO9T8wXLT1e4s1ruCVrYtkt8q3K+iXukZ+J5QD4lMtvWHfbpKJNddygG
-						RkURpJQ7bY1rTdWA6jNi16TR+8M2ECIf4Q6CVukHHrX9PuZM+b7Ktg2gf3fmy7vQ
-						MQ2/2Rp8/LKGKotVAoRYrNc8y3Y2PR9omsidxNGyyXxfD2OyTobuk1Ezb7Fk4Oq+
-						4VmetrJ5CwFOwTBmFUgfaazuooEvGM7tA/jjRGDY5H+4oyVDK63Ktf59pwGln6Bo
-						JyBfJIWYK/5w3psQJZCFyNgJ4WQSgxbAiORGQPZLfKxsvAaGD2UCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISdGVzdC51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBRxsmQCxZXe
-						bZvQMvehqWxt1yHYijANBgkqhkiG9w0BAQUFAAOCAQEAtOWghRw2KKVvYbX0sQEX
-						VDYPpi4Q1q6b1vl/MK0WU+zWjOmuljIIw377NOuH+A8zwJF2maelKlEHFmlMg8nl
-						a8MPTIQIhgJ3baXwfy5jvEIQrK++0LwaFiBdwg0dM3er6pyODVypn6oNpKY9gcFA
-						xCl05pTEBIWPAxFNcvYj/liPrDC8RcEBpnEiGZcJgvPGCulXV3O9FCRkoyTaVoUB
-						e42UmPVs7zqOGsBy6ZcHRGoD53VWtkvax8iBGBobK0fGICh6vyX7Qb6Me3r/7S1h
-						6WUcF/Nm7P5V6V2an8MJPYyIVNn6QorTplFsBhK4/Wr+Xb4JIurIwCWDqbVIYo1j
-						TA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ed.unidesk.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: Unidesk (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Helpdesk</GivenName>
-    <EmailAddress>mailto:IS.Helpdesk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</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 8b9912b2..00000000
--- a/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://test.federation.renater.fr/validation/ressource">
-  <md: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>
-    <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>https://federation.renater.fr/category/metier</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">RENATER - validation service</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://test.federation.renater.fr/validation/ressource</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Fédération Éducation-Recherche - Ressource de validation</md:ServiceName>
-      <md:ServiceName xml:lang="en">RENATER - validation service</md:ServiceName>
-      <md: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.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</md:ServiceDescription>
-      <md: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"/>
-      <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="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="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md: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"/>
-      <md: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"/>
-      <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="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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"/>
-      <md: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"/>
-      <md: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"/>
-      <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="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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"/>
-      <md: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"/>
-      <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="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"/>
-      <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="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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" 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="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="true"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="true"/>
-      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" 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="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"/>
-      <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="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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md: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"/>
-      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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"/>
-      <md: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"/>
-      <md: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"/>
-      <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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Mehdi Hached</md:SurName>
-    <md:EmailAddress>mehdi.hached@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Olivier Salaün</md:SurName>
-    <md:EmailAddress>olivier.salaun@renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 1fedf255..00000000
--- a/swamid-interfederations-2.0/test.federation.renater.fr.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://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 - ressource de validation de la fédération Education-Recherche</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 - ressource de validation de la fédération Education-Recherche</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"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuEtape" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.29" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuRegimeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.31" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannMailPerso" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="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="supannAutreTelephone" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" 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="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="supannEtuDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.27" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEmpId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mailForwardingAddress" Name="urn:oid:2.16.840.1.113730.3.1.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuElementPedagogique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.28" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannRole" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannRoleEntite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannCivilite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannActivite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannCodeINE" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuAnneeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.25" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEntiteAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuSecteurDisciplinaire" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.32" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEntiteAffectationPrincipale" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannListeRouge" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuCursusAnnee" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.26" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtablissement" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannRoleGenerique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.30" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="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="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannOrganisme" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuTypeDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.33" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduOrgLegalName" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">RENATER</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>support-federation@support.renater.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml b/swamid-interfederations-2.0/test.ingentaconnect.com-shibboleth.xml
deleted file mode 100644
index 613cf064..00000000
--- a/swamid-interfederations-2.0/test.ingentaconnect.com-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://test.ingentaconnect.com/shibboleth">
-  <!--
-		This is an OpenAthensSP vsn 1.2 'IngentaConnect' test SP owned by Publishing Technology plc. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDcDCCAligAwIBAgIES2K84DANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJH
-						QjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEiMCAGA1UE
-						ChMZUHVibGlzaGluZyBUZWNobm9sb2d5IHBsYzEgMB4GA1UEAxMXdGVzdC5pbmdl
-						bnRhY29ubmVjdC5jb20wHhcNMTAwMTI5MTA0ODAwWhcNMjAwMTI3MTA0ODAwWjB6
-						MQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94
-						Zm9yZDEiMCAGA1UEChMZUHVibGlzaGluZyBUZWNobm9sb2d5IHBsYzEgMB4GA1UE
-						AxMXdGVzdC5pbmdlbnRhY29ubmVjdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQCJGOOYmYbgByL6RCx5qFriIOXcCdaGAi8Ersd+s/+q37OmoUIl
-						RLjxdngTuaDNzy7s7ZHaRqMsTBNgugYAwD0Re6lLMwvGRyqPAaeaoOWU/wawMRme
-						7G/H1v1fpD0WBr5s+qG+HmIkXBopoyR7KUwCFMBjEdSMiZJgaH+4gA6EnwQbyJ4Y
-						eTqWeCFu/+AS4xeoC2/PHXQD2gVTNsQovzrtDB2QHgQEiwZEZa3bviFo/Mn/JIq/
-						qQUXqY97a4ZCm0hRV8Q2Da86dFwLXNNAWCRIuiyZxP36lY56HMNeu+3O5+L1Taxv
-						hlHkiKu2l5Yh64dqIJl5cPQ9zaFtC8xcPr1HAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggEBAGjyg0atXi4McUNX1JeZHTU1bZ+HF3NNIlYrJshrJOJ2Z+gOvDi1ub64SVpn
-						MqE5P6CU5+1x2Da4GD/k9Jj8zSQgWJWOrxowm9fGncjTqLQQDZByO6sGPsxXkqcT
-						yd+Xtva8bj9MRQVxbXZwqAmDJArs5KV/9hAkxZ8xv3ig7I/fttqECFiYFsskqTNy
-						22xpp/DkKhL/dg+HlyNFoWQ83ls2kJGLQEA0PVllTNNPEIOGmmCoNjf65pACg9pq
-						CfTNe3AJxwMb0WenBMV9/65e9j5e4a+TT6pGthSpscXCD04BLKY217eNAQYNjP5o
-						omCKo319LoqKvn9D58kqlXlKNrc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ingentaconnect.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ingentaconnect.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Publishing Technology: IngentaConnect (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ingentaconnect.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:help@ingentaconnect.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dave</GivenName>
-    <SurName>Lord</SurName>
-    <EmailAddress>mailto:Dave.Lord@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.j2e.com-shibboleth.xml b/swamid-interfederations-2.0/test.j2e.com-shibboleth.xml
deleted file mode 100644
index fb5d3cd9..00000000
--- a/swamid-interfederations-2.0/test.j2e.com-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://test.j2e.com/shibboleth">
-  <!--
-		This is a "test server" Shibboleth SP for Just2easy 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="2015-05-27T11:41:11Z">
-      <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://test.j2e.com/secure/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://test.j2e.com/secure/Shibboleth.sso/WAYF"/>
-      <init: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.j2e.com/secure/Shibboleth.sso/USO"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAPqSMDPu7s7hMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnNlcnZlcjQwMjE1LnVrMm5ldC5jb20wHhcNMTAwODEyMTE0MTU2WhcNMjAw
-						ODA5MTE0MTU2WjAhMR8wHQYDVQQDExZzZXJ2ZXI0MDIxNS51azJuZXQuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm00KE1iG3uVXv+86GKejBCib
-						7bDRpAE5jS+NN/X+f7ix+pzYFbzAQrSfg97oJtaWTzmp2zULk5lsMVWIJbiyG/Uz
-						FpJgBhBf0lzHsVNKEnunJckoz5bYpgpCnVx9V2XrFw+tes7Sl5LhXiFdwqV8ottG
-						SrovCOzl74g4zn50g5wZsUticBrqWFNlSbFQISXFtFCUbqL4zf8zA/Wx6c3HEMZL
-						1WKPSHUbPgIjil0DPjEd0AToKZspcZozcRLWQ1iSPtswGuNin7FpVu+8M5szZY6f
-						rpiKTNfhYFNQxNKV5dnLCMlmVWqYIk3ZCfVJlxmP72DbRuJL6Vhd6wD7hYjatwID
-						AQABo0QwQjAhBgNVHREEGjAYghZzZXJ2ZXI0MDIxNS51azJuZXQuY29tMB0GA1Ud
-						DgQWBBT/nC5f54/+gnhLUYLGGV5YsxtdxzANBgkqhkiG9w0BAQUFAAOCAQEAlOyp
-						YMgWX6wsU/I2hIf1pkPBjsJCxC82pNCZjcSwZuAowueVnt5Xr70UjiAuwgLjJgQH
-						RARZKrWJ8mIkJrWbPi0/uLN8xV72e6V8F2MFTAWVvQ7Se8Bor4Q2fI7NvMwRrCbY
-						YhhlNdVyfNYzUikw5g8YDODoUA1cg1twOu/a0zt4GqCtqjGMLVASNBYud/UMtOAo
-						gI0klRGMhY5nZzvy/rBZL0WFaXsQ6Fk0Ywn+YQ6HZjTnQO23+T9vUXMBMEmomF2B
-						i291jv0WzvQWVDfWSxY3Z869r+Y/bFqbhv9YXKwDSOx52sscAl1yjy0vDwuMKHyr
-						FzKrATccENnvJUM7hQ==
-					</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.j2e.com/secure/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.j2e.com/secure/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.j2e.com/secure/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.j2e.com/secure/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.j2e.com/secure/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.j2e.com/secure/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Just2easy Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">A test server for just2easy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://just2easy.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Danny</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:danny@j2e.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Danny</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:danny@j2e.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.myplace.strath.ac.uk-shibboleth.xml
deleted file mode 100644
index c9cb47d8..00000000
--- a/swamid-interfederations-2.0/test.myplace.strath.ac.uk-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://test.myplace.strath.ac.uk/shibboleth">
-  <!--
-		This is a "Myplace test server" Shibboleth SP for the University of Strathclyde.
-	-->
-  <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-10-13T11:41:56Z">
-      <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://test.myplace.strath.ac.uk/auth/shibexternal/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.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6zCCAdOgAwIBAgIJAO7nQtYFnLcLMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-						BAMTDG1vby10ZXN0LXdlYjAeFw0xNDA2MjUxNDMxMzhaFw0yNDA2MjIxNDMxMzha
-						MBcxFTATBgNVBAMTDG1vby10ZXN0LXdlYjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBANJssMJIvaAfEEk5XRDsOtquZ0z6hN61EalbRPyGDs7+YKu6jUJz
-						Yj8Hzxyu3y0Y3TRmacHK6o7kWDas2yqSFKX7nllEiEmNtpdKL5XrkFDhpI63DJ/5
-						v79V8z1rLV0dNJNmWiI70oPI80U4sTn0esgOCPArrb2vJXUwGiOHeyORBM05NN70
-						EHDDVChkfr59QYkGuftsF5nk8oeHS/znPurVyab0q6AF5on5KO2c2uApmOGIqElI
-						Cka55N9J7FRcVKTR6vzNx9HxV8Py+cJuuIaW3ARQQwSmBqnNu4zLzZva3izSkVm1
-						ky55z5IuP5k+xb/njyKl0e98Lq0RrESTXmUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-						bW9vLXRlc3Qtd2ViMB0GA1UdDgQWBBTnSEhfktDUO6pGBtFLZOOXE7YFWDANBgkq
-						hkiG9w0BAQUFAAOCAQEAj2dOUifWSmIwqMwGkxdFXdJUv5IXu7bzWVsD+6mImbj9
-						31jazfu+RN4ipskDI/gQ6Rkn+0TYPKEBu3ZlB6V1HZjK+w7cQxjIHyoYMH9nQXzh
-						cCp3r98w8pKMyZZqvrX/jLbHPr7F2urvxsPjltk1TMTYWxBnePqrqPCp8o81kxbF
-						L4qsDwiUVrTqCoFoxja2IATYBQQHt5k77lAmNTinKsdpNkOv8CjRc5ZqNJXj1VvM
-						BRaRRbVGnjCpokPlIXUH82qKedSLn5O4XEr1hHhKjP3zIgExQqKw3ulXO6ZZ6gzY
-						M4FvArC++SGhK6YOaX2wH7KB8mWKKYtTM2ykDky3xw==
-					</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.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.myplace.strath.ac.uk/auth/shibexternal/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Strathclyde</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Myplace test server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.strath.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Iain</GivenName>
-    <SurName>Todd</SurName>
-    <EmailAddress>mailto:iain.todd@strath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Iain</GivenName>
-    <SurName>Todd</SurName>
-    <EmailAddress>mailto:iain.todd@strath.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml b/swamid-interfederations-2.0/test.oecd-ilibrary.org-shibboleth.xml
deleted file mode 100644
index ee651370..00000000
--- a/swamid-interfederations-2.0/test.oecd-ilibrary.org-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://test.oecd-ilibrary.org/shibboleth">
-  <!--
-		This is a "OECD iLibrary" OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-02T13:56:58Z">
-      <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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDnDCCAoSgAwIBAgIEU2tkWDANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTE0MDUwODEx
-						MDI0OFoXDTI0MDUwNTExMDI0OFowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAJcWVXPMtm502GM5AzoGvXR4OtPIMaGYwDkw1LMpKfCuQoT8NCoX9V7t
-						egvVdrnXqwCyEvMmjHm2qWbBAh56DLWayL8wzDzOzdX9b0yTZ6von1iNEP8S91Of
-						hEv12yMdX3k2chcP3PUrGVt1jX+/HpyPJm5KdhJAgdtFwFbCxTfzx9SXgllft7x6
-						3Y+WVOnrQKLI+wr8qGwd6aCcP0vlFQGHftVf0qxGb6sTclX70CH+S8QapoHM8awf
-						TtTHEE/QdEIv7Hqk3hbP4irB0P6Ut8ZRLo92Ud9uW7+ua0AaLDzJuFgC4WeeMDnq
-						G/QL6Ezbp1Zf/i4wubi/j3r1YQbqjZ0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						FUSajzGeOC5KjjAWxsvkXxpM9t4K7GmXSb+B43gTyl6XmGd+K0QRFe1GveK7IGzZ
-						jpw72Q+x4E4VkuihkK7SUqe5ASTe80Wmpg62Ovf5ljf2+tyg1OpNJvKKtL19SB2N
-						gcmY0xXo6Q9zy/3QoYqKmSaV49V2FVzndzvWM2x7Th0oMhpHUpG706IHxnuoY8jm
-						mD2LPea0pWih1hxznLrsXVTZAzjyh5uIIiMQPj8siApUltyKQ2A259GRB6sta0Ui
-						4kBuxFmldtOEJF/FwAZ6NMc0fUJJhCwRo03DDlL6heFyG/eU8XsyjVqt5ccS2QZ0
-						uHVkvFNSMPSdP9/x/ASMxQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.oecd-ilibrary.org/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.oecd-ilibrary.org/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">OECD iLibrary</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://test.oecd-ilibrary.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:Talvinder.matharu@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Babu</GivenName>
-    <SurName>Panneerselvam</SurName>
-    <EmailAddress>mailto:babu.panneerselvam@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:Talvinder.matharu@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml b/swamid-interfederations-2.0/test.openathens.net-oala-metadata.xml
deleted file mode 100644
index fcd30142..00000000
--- a/swamid-interfederations-2.0/test.openathens.net-oala-metadata.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://test.openathens.net/oala/metadata">
-  <!--
-		This is an OpenAthens LA Test IdP for Eduserv.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-02-21T14:53:36Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">test.openathens.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQjCCAiqgAwIBAgIIZvpg5YE3/HUwDQYJKoZIhvcNAQEFBQAwODEQMA4GA1UE
-						CgwHRWR1c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0
-						MB4XDTEyMTAxNTE0NDkwNloXDTIyMTAxNTE0NDkwNlowODEQMA4GA1UECgwHRWR1
-						c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmxojj/t4L6T+Ckuu+G30Ces7IbT
-						5YnxmR9BePF3I3f5hEBMQp/ERea6AVZPlawdgilHV64giVRnE22zIQQtnjkJX84Z
-						7L9J4ODUbF+0YVwDzqgEdxjHfa96850YMf8MPoe4oJKJ7J4yCzfbwiVXGGWtqKQ4
-						idh+lBQK8MGwB7yOy8QwlnxeEoSMkX01I6spOiv7r+KrACopZkYc6WGCAg30/hv8
-						7SPQcxPNAbQDZVjpF2tnHwsY5nz9fLtZCBEmsF0zlEZ+RuxnfOLzk0pXDEwhkA5k
-						QPS6cYKH6IQeNZBX4bzUpxhrZ53Y4ZhDOgXiT7nSxsEOZlxv1Stu5c6FXQIDAQAB
-						o1AwTjAdBgNVHQ4EFgQUhiBEqrb5Qs7q+Rit3aIR+NJuI0swHwYDVR0jBBgwFoAU
-						hiBEqrb5Qs7q+Rit3aIR+NJuI0swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAEWtFo02LGecwaaFhx5rLS8q5+Cn06DDYFDuW6L2xpMV2EUBbyFY9sq+/
-						nssFZg1j9s4sm2NHNLkgns+bmAxhW1YSRKPy/D58dUBuGMKdftS1uVvMEeLh+y/5
-						g8e23YE2Rfy6PdQ+YytUyG1VhhEo5hU6LZWqAUR0OdsGAs/qWXhth+dgLkpumSqy
-						4zWQHLrUlweaQx3pDw73Xc8PeCPtMU+AbXL2vvRXQSizD4NtZJ/g/hYemC3ZISM+
-						Mjky/csk+C1ZALs8RSY2uzX8B3YfZSjDN1bUOd4O22o7EFyq7JNSP/xajHEBhCev
-						HclfHywYgqaVXnbHLCBK3GbvPxnZxQ==
-					</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>
-						MIIDQjCCAiqgAwIBAgIIZvpg5YE3/HUwDQYJKoZIhvcNAQEFBQAwODEQMA4GA1UE
-						CgwHRWR1c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0
-						MB4XDTEyMTAxNTE0NDkwNloXDTIyMTAxNTE0NDkwNlowODEQMA4GA1UECgwHRWR1
-						c2VydjEkMCIGA1UEAwwbcnVudGltZS50ZXN0Lm9wZW5hdGhlbnMubmV0MIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmxojj/t4L6T+Ckuu+G30Ces7IbT
-						5YnxmR9BePF3I3f5hEBMQp/ERea6AVZPlawdgilHV64giVRnE22zIQQtnjkJX84Z
-						7L9J4ODUbF+0YVwDzqgEdxjHfa96850YMf8MPoe4oJKJ7J4yCzfbwiVXGGWtqKQ4
-						idh+lBQK8MGwB7yOy8QwlnxeEoSMkX01I6spOiv7r+KrACopZkYc6WGCAg30/hv8
-						7SPQcxPNAbQDZVjpF2tnHwsY5nz9fLtZCBEmsF0zlEZ+RuxnfOLzk0pXDEwhkA5k
-						QPS6cYKH6IQeNZBX4bzUpxhrZ53Y4ZhDOgXiT7nSxsEOZlxv1Stu5c6FXQIDAQAB
-						o1AwTjAdBgNVHQ4EFgQUhiBEqrb5Qs7q+Rit3aIR+NJuI0swHwYDVR0jBBgwFoAU
-						hiBEqrb5Qs7q+Rit3aIR+NJuI0swDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAEWtFo02LGecwaaFhx5rLS8q5+Cn06DDYFDuW6L2xpMV2EUBbyFY9sq+/
-						nssFZg1j9s4sm2NHNLkgns+bmAxhW1YSRKPy/D58dUBuGMKdftS1uVvMEeLh+y/5
-						g8e23YE2Rfy6PdQ+YytUyG1VhhEo5hU6LZWqAUR0OdsGAs/qWXhth+dgLkpumSqy
-						4zWQHLrUlweaQx3pDw73Xc8PeCPtMU+AbXL2vvRXQSizD4NtZJ/g/hYemC3ZISM+
-						Mjky/csk+C1ZALs8RSY2uzX8B3YfZSjDN1bUOd4O22o7EFyq7JNSP/xajHEBhCev
-						HclfHywYgqaVXnbHLCBK3GbvPxnZxQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://runtime.test.openathens.net/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://runtime.test.openathens.net/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Eduserv</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Eduserv</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eduserv.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Anderson</SurName>
-    <EmailAddress>mailto:andy.anderson@eduserv.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-shibboleth.xml
deleted file mode 100644
index 725d5394..00000000
--- a/swamid-interfederations-2.0/test.qmplus.qmul.ac.uk-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://test.qmplus.qmul.ac.uk/shibboleth">
-  <!--
-		This is a "Test QMPlus service" Shibboleth SP for Queen Mary and Westfield College, University of London.
-	-->
-  <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-07-07T11:59:17Z">
-      <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://test.qmplus.qmul.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAI8TavPBUIURMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnRlc3QucW1wbHVzLnFtdWwuYWMudWswHhcNMTIwNjA3MTQ1MTAzWhcNMjIw
-						NjA1MTQ1MTAzWjAhMR8wHQYDVQQDExZ0ZXN0LnFtcGx1cy5xbXVsLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuLs2cygGGnUNJWfWftkRzDk5
-						YnIqq6NP13SZ+zNa64WVuLvnwsbhvyfdVrfAQEPH2tyDtlp2qc51o+62liBhI6JS
-						LMtx6gVFf+58UE+tx8iU0Y5NyC1x7rbLH1ZtyjQt242IydqM62d4dxPogqdiF9vp
-						Ky+2hMR1h1q3Gj/xwkhwJK0750wWbh4ICEgzHUDhlsD5E+aIaONsrGoI7Su2aZP/
-						r9rHoMP4cGjLavmGWwbgrrOkhiFo363yLLGyvl0o5lhZpHNcMqfcbWY27fcnpvXG
-						hudYtAC4bDzdRBhSVLIatap33e3Ufib4FPaNfhyKRBzGXCoJypGCXcVIvp31HwID
-						AQABo0QwQjAhBgNVHREEGjAYghZ0ZXN0LnFtcGx1cy5xbXVsLmFjLnVrMB0GA1Ud
-						DgQWBBQzEI79jYpibhVQM4hk+a/kRUW1ZzANBgkqhkiG9w0BAQUFAAOCAQEArXfT
-						8CbMm1xmDrSXqfitHZUaLlPKEQD123WPfstSqCPjWxpEifgBtGzCKk5N8ZjYd7SJ
-						UpDsyz+x2jaZ8M+mlDtAAjt3KAz9YqlfSIHyOb4ZyI+2/h0zdkLXBnU8jR65701o
-						RjrK4QVCQOFrwkVHjbJyb4QcBEfhxtmUCwNyPlEu++4KpRyzaFtF3FiG1ZU0oYdF
-						jSRvU0UJgprAvhB2c5WoJ+uYGxUCq72HNy6dvU5cWEvQgdGJ9jQJdtU79L7T4UKD
-						1VdfmxX2wDjXzO43DSdmkvNEIPVrt4BLWwu9ZfK3fmnXyzpqhaJ0Be3sJ3KbLi7B
-						XZ0xC3fsbFJvZqOC1w==
-					</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.qmplus.qmul.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.qmplus.qmul.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Queen Mary and Westfield College, University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Queen Mary and Westfield College: Test QMPlus service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Academic Applications</GivenName>
-    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Moodle Support</GivenName>
-    <EmailAddress>mailto:moodle-support@ulcc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Academic Applications</GivenName>
-    <EmailAddress>mailto:its-aa@qmul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.repository.abertay.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/test.repository.abertay.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 411eb099..00000000
--- a/swamid-interfederations-2.0/test.repository.abertay.ac.uk-shibboleth-sp.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://test.repository.abertay.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Digital Research Repository (Test)" Shibboleth SP for the University of Abertay Dundee.
-	-->
-  <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-11-12T14:54:50Z"/>
-  </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://test.repository.abertay.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC8TCCAdmgAwIBAgIJAJjxlcGvVj5jMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDmxhYy1yZXBvLXRlc3Q5MB4XDTEyMTAwOTA5MDA0OVoXDTIyMTAwNzA5MDA0
-						OVowGTEXMBUGA1UEAxMObGFjLXJlcG8tdGVzdDkwggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDEpec8FWkD8JLlztjoDS3g7ijRCL8ikfvRkQ9G+Wt8K7/p
-						W2yuVI8KxzSyBoEJcGfz3qgMJfpgjjgOY5ujzJ45BMdZ8/gDcnnBC+RSgfNkC4rf
-						pFbtb5l9nDEDDCDCoRzpfnHO/G0vpJkaROPb/koYSh+ZSg1UlQ7ALDukqrQgieLU
-						gk1Wa/Ys4xudqiTGKmBy2RZeAfgJqGqeHciSfpMicJeYrSqpVevUFhpm8wdWMY9V
-						htXrDRu/LORdFRqcvNURebTrctSNGlALzvzzcL/KlLlDHUnf1CeBRVtf3XLsfAFI
-						8tTBejncXVYAmC+wyr7AR9VS2gyO+V29af0+1Q0lAgMBAAGjPDA6MBkGA1UdEQQS
-						MBCCDmxhYy1yZXBvLXRlc3Q5MB0GA1UdDgQWBBR1lj5GO1NfZoBe1gN7B6QWIqLJ
-						CTANBgkqhkiG9w0BAQUFAAOCAQEAKZxrZgAfIRaJMAYrc7q2BUcSPFsh6RPf15zt
-						d7psMrQlMeGacaNK9c0zfaVfVSO3VPw6sCxbWBW4JFtlYLccJN6aHOwZYgcIg0dm
-						Pd/ICzFokhV3IWblX6ZheUzgYbLOVNtrt90VUaFPH2JWcgK5HocMZbcvGKyXIAyH
-						VnLZjYpHz06QUBs4bVo144xJjBQL/ow+PhKUr+QGvhcX6c4lzq9xNrwsA3sqbdww
-						qlS9ap7Hl3ajmRv/REjbGOZhZuThU5O65cQSp2PSKnSKV88iFVSLWU2l6TlqKrjt
-						eWJEDVhvk1nZNZXZyVnoEuC0WzGA315+yKjno4H6Ys1Q7B/SiQ==
-					</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.repository.abertay.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.repository.abertay.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Abertay Dundee</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Research Repository (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.abertay.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Service Desk</GivenName>
-    <EmailAddress>mailto:isservicedesk@abertay.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Colin</GivenName>
-    <SurName>Watt</SurName>
-    <EmailAddress>mailto:colin.watt@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.rpharms.com-entity.xml b/swamid-interfederations-2.0/test.rpharms.com-entity.xml
deleted file mode 100644
index 87f2041b..00000000
--- a/swamid-interfederations-2.0/test.rpharms.com-entity.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://test.rpharms.com/entity">
-  <!--
-		This is a "CBCL Test Site" OpenAthens SP for the Royal Pharmaceutical Society of Great Britain.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-04T12:21:55Z">
-      <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: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">CBCL Test Site</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Development site for CBCL</mdui:Description>
-        <mdui:Logo height="64" width="139">https://staging.cbcl.co.uk/ukfed/cbcl_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>
-			MIIDgjCCAmqgAwIBAgIJALwx9tll+qVcMA0GCSqGSIb3DQEBBQUAMDQxFTATBgNV
-			BAoTDHN0YWdpbmctY2JjbDEbMBkGA1UEAxMSc3RhZ2luZy5jYmNsLmNvLnVrMB4X
-			DTE1MDIyNTEyNTgxNVoXDTI1MDIyMjEyNTgxNVowNDEVMBMGA1UEChMMc3RhZ2lu
-			Zy1jYmNsMRswGQYDVQQDExJzdGFnaW5nLmNiY2wuY28udWswggEiMA0GCSqGSIb3
-			DQEBAQUAA4IBDwAwggEKAoIBAQC8udH1d2ZZEL/BDN30QIMSKtmpY7UEwFN/sUeV
-			dZ0Gy3g/INtPq7sD652of1/oL2wAFIAy3DDtn8AvxtZPq6YpXwa4YQFO+jdns95F
-			srPIYsNf07WMgiU+9RyPMlRisuQ6aP2vSmYKuCVClNsSqCUg75La9WoeCCwPVWpk
-			68PUmU2BnWn28SJh+PS6HCH1I5VNhxEI6HK3EiJn7GfYOYLYSUXT6h5vmiPs//Se
-			iIjgPVmp5WYp1C6Nll4W3zRYEHKDsoP17Q4J2xSLs29wV+E5KKtiGCVXlo3mmAKV
-			QEsSKZnOU2fctnZIT3XSR3boh2HPEbnRT44xE2f5ETqIg1ZtAgMBAAGjgZYwgZMw
-			HQYDVR0OBBYEFAzPDnpVwkT1SW2m+/wIUPwjc7unMGQGA1UdIwRdMFuAFAzPDnpV
-			wkT1SW2m+/wIUPwjc7unoTikNjA0MRUwEwYDVQQKEwxzdGFnaW5nLWNiY2wxGzAZ
-			BgNVBAMTEnN0YWdpbmcuY2JjbC5jby51a4IJALwx9tll+qVcMAwGA1UdEwQFMAMB
-			Af8wDQYJKoZIhvcNAQEFBQADggEBACB9SbHspWAUl22utozAqjRJrzQIAZpm3F/f
-			TJ5rSauNjMmynolPErFiK6r2vEZTognGfA4xNgwRzj7Pv9T6fYcZSgju6CLnTtKM
-			visn0gZI8/FbtZtcSRvDREeiq3khk8shExS5y2QF/yIPE9p7dsJzofIabcwNOi+L
-			3UmF4Wx9nQ/e6QqgVou2j1C4IUkLkTnomdtA0Azgc/IYHLD83q2v6aTucGndVhEe
-			lZykRhgMXr+w93jt0q0k8Teq3TwMBZPl1Qqwp/UbbXm4zf3uRhlKqnJaS75Xx7Yq
-			DEV9gsXy2u5SnEMxi5z04whSE1/zOY+XRy3xUBbh9doePRw91wE=
-		</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>
-			MIIDgjCCAmqgAwIBAgIJALwx9tll+qVcMA0GCSqGSIb3DQEBBQUAMDQxFTATBgNV
-			BAoTDHN0YWdpbmctY2JjbDEbMBkGA1UEAxMSc3RhZ2luZy5jYmNsLmNvLnVrMB4X
-			DTE1MDIyNTEyNTgxNVoXDTI1MDIyMjEyNTgxNVowNDEVMBMGA1UEChMMc3RhZ2lu
-			Zy1jYmNsMRswGQYDVQQDExJzdGFnaW5nLmNiY2wuY28udWswggEiMA0GCSqGSIb3
-			DQEBAQUAA4IBDwAwggEKAoIBAQC8udH1d2ZZEL/BDN30QIMSKtmpY7UEwFN/sUeV
-			dZ0Gy3g/INtPq7sD652of1/oL2wAFIAy3DDtn8AvxtZPq6YpXwa4YQFO+jdns95F
-			srPIYsNf07WMgiU+9RyPMlRisuQ6aP2vSmYKuCVClNsSqCUg75La9WoeCCwPVWpk
-			68PUmU2BnWn28SJh+PS6HCH1I5VNhxEI6HK3EiJn7GfYOYLYSUXT6h5vmiPs//Se
-			iIjgPVmp5WYp1C6Nll4W3zRYEHKDsoP17Q4J2xSLs29wV+E5KKtiGCVXlo3mmAKV
-			QEsSKZnOU2fctnZIT3XSR3boh2HPEbnRT44xE2f5ETqIg1ZtAgMBAAGjgZYwgZMw
-			HQYDVR0OBBYEFAzPDnpVwkT1SW2m+/wIUPwjc7unMGQGA1UdIwRdMFuAFAzPDnpV
-			wkT1SW2m+/wIUPwjc7unoTikNjA0MRUwEwYDVQQKEwxzdGFnaW5nLWNiY2wxGzAZ
-			BgNVBAMTEnN0YWdpbmcuY2JjbC5jby51a4IJALwx9tll+qVcMAwGA1UdEwQFMAMB
-			Af8wDQYJKoZIhvcNAQEFBQADggEBACB9SbHspWAUl22utozAqjRJrzQIAZpm3F/f
-			TJ5rSauNjMmynolPErFiK6r2vEZTognGfA4xNgwRzj7Pv9T6fYcZSgju6CLnTtKM
-			visn0gZI8/FbtZtcSRvDREeiq3khk8shExS5y2QF/yIPE9p7dsJzofIabcwNOi+L
-			3UmF4Wx9nQ/e6QqgVou2j1C4IUkLkTnomdtA0Azgc/IYHLD83q2v6aTucGndVhEe
-			lZykRhgMXr+w93jt0q0k8Teq3TwMBZPl1Qqwp/UbbXm4zf3uRhlKqnJaS75Xx7Yq
-			DEV9gsXy2u5SnEMxi5z04whSE1/zOY+XRy3xUBbh9doePRw91wE=
-		</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.cbcl.co.uk/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.cbcl.co.uk/ukfed/oa/auth/rcv/saml2/post" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Royal Pharmaceutical Society of Great Britain</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CBCL Test Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cbcl.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Micah</GivenName>
-    <SurName>Edwards</SurName>
-    <EmailAddress>mailto:micah@cbcl.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Micah</GivenName>
-    <SurName>Edwards</SurName>
-    <EmailAddress>mailto:micah@cbcl.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-shibboleth.xml
deleted file mode 100644
index f473575b..00000000
--- a/swamid-interfederations-2.0/test.shu.unidesk.ac.uk-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://test.shu.unidesk.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "Unidesk - Sheffield Hallam University" Test SP owned by the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-03T13:52:51Z">
-      <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://test.shu.unidesk.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAKOQZJ9XeRRZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnRlc3QudW5pZGVzay5hYy51azAeFw0xMjAzMjIxNjUwMTdaFw0yMjAzMjAx
-						NjUwMTdaMB0xGzAZBgNVBAMTEnRlc3QudW5pZGVzay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAPweFLYNELDowDm8YWp8G8RKR0q+ufgUN7H7
-						h7RTesgxlO9T8wXLT1e4s1ruCVrYtkt8q3K+iXukZ+J5QD4lMtvWHfbpKJNddygG
-						RkURpJQ7bY1rTdWA6jNi16TR+8M2ECIf4Q6CVukHHrX9PuZM+b7Ktg2gf3fmy7vQ
-						MQ2/2Rp8/LKGKotVAoRYrNc8y3Y2PR9omsidxNGyyXxfD2OyTobuk1Ezb7Fk4Oq+
-						4VmetrJ5CwFOwTBmFUgfaazuooEvGM7tA/jjRGDY5H+4oyVDK63Ktf59pwGln6Bo
-						JyBfJIWYK/5w3psQJZCFyNgJ4WQSgxbAiORGQPZLfKxsvAaGD2UCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISdGVzdC51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBRxsmQCxZXe
-						bZvQMvehqWxt1yHYijANBgkqhkiG9w0BAQUFAAOCAQEAtOWghRw2KKVvYbX0sQEX
-						VDYPpi4Q1q6b1vl/MK0WU+zWjOmuljIIw377NOuH+A8zwJF2maelKlEHFmlMg8nl
-						a8MPTIQIhgJ3baXwfy5jvEIQrK++0LwaFiBdwg0dM3er6pyODVypn6oNpKY9gcFA
-						xCl05pTEBIWPAxFNcvYj/liPrDC8RcEBpnEiGZcJgvPGCulXV3O9FCRkoyTaVoUB
-						e42UmPVs7zqOGsBy6ZcHRGoD53VWtkvax8iBGBobK0fGICh6vyX7Qb6Me3r/7S1h
-						6WUcF/Nm7P5V6V2an8MJPYyIVNn6QorTplFsBhK4/Wr+Xb4JIurIwCWDqbVIYo1j
-						TA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.shu.unidesk.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: Unidesk - Sheffield Hallam University (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Helpdesk</GivenName>
-    <EmailAddress>mailto:IS.Helpdesk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-shibboleth.xml
deleted file mode 100644
index 91148279..00000000
--- a/swamid-interfederations-2.0/test.st-andrews.unidesk.ac.uk-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://test.st-andrews.unidesk.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "Unidesk - University of St Andrews" Test SP owned by the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-12T13:01:38Z">
-      <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://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAKOQZJ9XeRRZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnRlc3QudW5pZGVzay5hYy51azAeFw0xMjAzMjIxNjUwMTdaFw0yMjAzMjAx
-						NjUwMTdaMB0xGzAZBgNVBAMTEnRlc3QudW5pZGVzay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAPweFLYNELDowDm8YWp8G8RKR0q+ufgUN7H7
-						h7RTesgxlO9T8wXLT1e4s1ruCVrYtkt8q3K+iXukZ+J5QD4lMtvWHfbpKJNddygG
-						RkURpJQ7bY1rTdWA6jNi16TR+8M2ECIf4Q6CVukHHrX9PuZM+b7Ktg2gf3fmy7vQ
-						MQ2/2Rp8/LKGKotVAoRYrNc8y3Y2PR9omsidxNGyyXxfD2OyTobuk1Ezb7Fk4Oq+
-						4VmetrJ5CwFOwTBmFUgfaazuooEvGM7tA/jjRGDY5H+4oyVDK63Ktf59pwGln6Bo
-						JyBfJIWYK/5w3psQJZCFyNgJ4WQSgxbAiORGQPZLfKxsvAaGD2UCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISdGVzdC51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBRxsmQCxZXe
-						bZvQMvehqWxt1yHYijANBgkqhkiG9w0BAQUFAAOCAQEAtOWghRw2KKVvYbX0sQEX
-						VDYPpi4Q1q6b1vl/MK0WU+zWjOmuljIIw377NOuH+A8zwJF2maelKlEHFmlMg8nl
-						a8MPTIQIhgJ3baXwfy5jvEIQrK++0LwaFiBdwg0dM3er6pyODVypn6oNpKY9gcFA
-						xCl05pTEBIWPAxFNcvYj/liPrDC8RcEBpnEiGZcJgvPGCulXV3O9FCRkoyTaVoUB
-						e42UmPVs7zqOGsBy6ZcHRGoD53VWtkvax8iBGBobK0fGICh6vyX7Qb6Me3r/7S1h
-						6WUcF/Nm7P5V6V2an8MJPYyIVNn6QorTplFsBhK4/Wr+Xb4JIurIwCWDqbVIYo1j
-						TA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.st-andrews.unidesk.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">the University of Edinburgh: Unidesk - University of St Andrews (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Helpdesk</GivenName>
-    <EmailAddress>mailto:IS.Helpdesk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-shibboleth.xml
deleted file mode 100644
index 5a8a2442..00000000
--- a/swamid-interfederations-2.0/test.stir.unidesk.ac.uk-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://test.stir.unidesk.ac.uk/shibboleth">
-  <!--
-		This is a "Test Unidesk- University of Stirling" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-04T11:23:53Z">
-      <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://test.stir.unidesk.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAKOQZJ9XeRRZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnRlc3QudW5pZGVzay5hYy51azAeFw0xMjAzMjIxNjUwMTdaFw0yMjAzMjAx
-						NjUwMTdaMB0xGzAZBgNVBAMTEnRlc3QudW5pZGVzay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAPweFLYNELDowDm8YWp8G8RKR0q+ufgUN7H7
-						h7RTesgxlO9T8wXLT1e4s1ruCVrYtkt8q3K+iXukZ+J5QD4lMtvWHfbpKJNddygG
-						RkURpJQ7bY1rTdWA6jNi16TR+8M2ECIf4Q6CVukHHrX9PuZM+b7Ktg2gf3fmy7vQ
-						MQ2/2Rp8/LKGKotVAoRYrNc8y3Y2PR9omsidxNGyyXxfD2OyTobuk1Ezb7Fk4Oq+
-						4VmetrJ5CwFOwTBmFUgfaazuooEvGM7tA/jjRGDY5H+4oyVDK63Ktf59pwGln6Bo
-						JyBfJIWYK/5w3psQJZCFyNgJ4WQSgxbAiORGQPZLfKxsvAaGD2UCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISdGVzdC51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBRxsmQCxZXe
-						bZvQMvehqWxt1yHYijANBgkqhkiG9w0BAQUFAAOCAQEAtOWghRw2KKVvYbX0sQEX
-						VDYPpi4Q1q6b1vl/MK0WU+zWjOmuljIIw377NOuH+A8zwJF2maelKlEHFmlMg8nl
-						a8MPTIQIhgJ3baXwfy5jvEIQrK++0LwaFiBdwg0dM3er6pyODVypn6oNpKY9gcFA
-						xCl05pTEBIWPAxFNcvYj/liPrDC8RcEBpnEiGZcJgvPGCulXV3O9FCRkoyTaVoUB
-						e42UmPVs7zqOGsBy6ZcHRGoD53VWtkvax8iBGBobK0fGICh6vyX7Qb6Me3r/7S1h
-						6WUcF/Nm7P5V6V2an8MJPYyIVNn6QorTplFsBhK4/Wr+Xb4JIurIwCWDqbVIYo1j
-						TA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.stir.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.stir.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.stir.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.stir.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.stir.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.stir.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.stir.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.stir.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.stir.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.stir.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.stir.unidesk.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Test Unidesk- University of Stirling</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>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-techmgt@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.ufit.onecampus.com.xml b/swamid-interfederations-2.0/test.ufit.onecampus.com.xml
deleted file mode 100644
index f45b781b..00000000
--- a/swamid-interfederations-2.0/test.ufit.onecampus.com.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://test.ufit.onecampus.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Florida - IT_TEST</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.rsmart.com/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.rsmart.com/privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFKTCCBBGgAwIBAgIJAP2Ays74REYyMA0GCSqGSIb3DQEBCwUAMIG0MQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEa
-MBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0
-cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2Vj
-dXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTE1MDgyNjEzMTI0MloX
-DTE2MDkyNDE5MjAwNFowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRh
-dGVkMRgwFgYDVQQDDA8qLm9uZWNhbXB1cy5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDHSg0+JDljLYtiLp4SS2x2G1KijMtnDzZzZf/BmuIZjetA
-C95IVcSLpvCjxa1sHEf5e4ZGuc5kByWYMj0u6Zn5e7u1H8zSdVVZ+SdIiDmbL9IP
-VzxgB8qCiM8BDLm86zvp6JPDdmSyU5qmDX7CmPXI/3W/4raOZMORkxBCIeUTujYX
-I6w1E/JIlam7rGiXGv6HcMWabc0JN+FyGtY1qdDdQPl7oWESxwEMaXTCt80zL7Go
-DB2WMvr+HTi/cwL34/KJow//PPxVBIcMY0d5ij4rqruc7BnofAHJIbd+irrR27FE
-dIAAZ+L9C9NiK+7gYVAD7bxyuLMd4yZP6m4QuXK/AgMBAAGjggGyMIIBrjAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8B
-Af8EBAMCBaAwNwYDVR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5nb2RhZGR5LmNv
-bS9nZGlnMnMxLTExMy5jcmwwUwYDVR0gBEwwSjBIBgtghkgBhv1tAQcXATA5MDcG
-CCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9z
-aXRvcnkvMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au
-Z29kYWRkeS5jb20vMEAGCCsGAQUFBzAChjRodHRwOi8vY2VydGlmaWNhdGVzLmdv
-ZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RpZzIuY3J0MB8GA1UdIwQYMBaAFEDCvSeO
-zDSDMKIz1/tss/C0LIDOMCkGA1UdEQQiMCCCDyoub25lY2FtcHVzLmNvbYINb25l
-Y2FtcHVzLmNvbTAdBgNVHQ4EFgQUD42WHYmzkIt4bBTwOzAvZEroKRIwDQYJKoZI
-hvcNAQELBQADggEBAHmpPl8xZ7bMe7oBKwEV62VDuQZ1ToTZRvNfI36vjlYpdypI
-0yWf0ckHy0OIyEEW4Gx3PCmZZq3lptKmbnvsj+zBmFgM4Z+bYtMR60s4wlpQGoDU
-rhuszTLtIwWLLvQx+fbI9/K1rHS6pI3QV8g4OdMOznM82oEwpR+kPOUVsnw+gMmw
-bT/p8eVAUr3oWuhDp+qQo1LP9A0LaDNkH9UThAOQx1L0CP45RHlG7Ewd+LGS9S0X
-tTDiJ0v3T1w1Y4kZPLU7Z/fdeHHU1Yh4KeEfU43rF5kWQMSp1q0W6b49YrX9OvHJ
-/bKQ4YxUAr7Q4ohFqImnAEy2n4ZjivQ6z8kOPrY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ufit.onecampus.com/saml/SSO/alias/ufittest" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ufit.onecampus.com/saml/SSO/alias/ufittest" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ufit.onecampus.com/saml/SSO/alias/ufittest" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ufit.onecampus.com/saml/SSO/alias/ufittest" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Cloud Ops Support</md:GivenName>
-    <md:EmailAddress>cloud_ops_support@rsmart.com</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 51dc476f..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 SAML 1.1/2.0 Test SP" Shibboleth 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-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/test.ulster.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-shibboleth.xml
deleted file mode 100644
index 3a4d0f8e..00000000
--- a/swamid-interfederations-2.0/test.ulster.unidesk.ac.uk-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://test.ulster.unidesk.ac.uk/shibboleth">
-  <!--
-		This is a "Unidesk - University of Ulster (TEST)" Shibboleth SP for University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-29T15:23:05Z">
-      <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://test.ulster.unidesk.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAKOQZJ9XeRRZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnRlc3QudW5pZGVzay5hYy51azAeFw0xMjAzMjIxNjUwMTdaFw0yMjAzMjAx
-						NjUwMTdaMB0xGzAZBgNVBAMTEnRlc3QudW5pZGVzay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAPweFLYNELDowDm8YWp8G8RKR0q+ufgUN7H7
-						h7RTesgxlO9T8wXLT1e4s1ruCVrYtkt8q3K+iXukZ+J5QD4lMtvWHfbpKJNddygG
-						RkURpJQ7bY1rTdWA6jNi16TR+8M2ECIf4Q6CVukHHrX9PuZM+b7Ktg2gf3fmy7vQ
-						MQ2/2Rp8/LKGKotVAoRYrNc8y3Y2PR9omsidxNGyyXxfD2OyTobuk1Ezb7Fk4Oq+
-						4VmetrJ5CwFOwTBmFUgfaazuooEvGM7tA/jjRGDY5H+4oyVDK63Ktf59pwGln6Bo
-						JyBfJIWYK/5w3psQJZCFyNgJ4WQSgxbAiORGQPZLfKxsvAaGD2UCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISdGVzdC51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBRxsmQCxZXe
-						bZvQMvehqWxt1yHYijANBgkqhkiG9w0BAQUFAAOCAQEAtOWghRw2KKVvYbX0sQEX
-						VDYPpi4Q1q6b1vl/MK0WU+zWjOmuljIIw377NOuH+A8zwJF2maelKlEHFmlMg8nl
-						a8MPTIQIhgJ3baXwfy5jvEIQrK++0LwaFiBdwg0dM3er6pyODVypn6oNpKY9gcFA
-						xCl05pTEBIWPAxFNcvYj/liPrDC8RcEBpnEiGZcJgvPGCulXV3O9FCRkoyTaVoUB
-						e42UmPVs7zqOGsBy6ZcHRGoD53VWtkvax8iBGBobK0fGICh6vyX7Qb6Me3r/7S1h
-						6WUcF/Nm7P5V6V2an8MJPYyIVNn6QorTplFsBhK4/Wr+Xb4JIurIwCWDqbVIYo1j
-						TA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ulster.unidesk.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Unidesk - University of Ulster (TEST)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Helpdesk</GivenName>
-    <EmailAddress>mailto:IS.Helpdesk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-techmgt@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/test.vpp.midlands3cities.ac.uk-shibboleth.xml
deleted file mode 100644
index a169a397..00000000
--- a/swamid-interfederations-2.0/test.vpp.midlands3cities.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://test.vpp.midlands3cities.ac.uk/shibboleth">
-  <!--
-		This is a "Test M3C VPP" Shibboleth SP for the University of Nottingham.
-	-->
-  <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="2015-09-11T11:05: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>
-      <init: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.vpp.midlands3cities.ac.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.vpp.midlands3cities.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Test M3C VPP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Virtual Postgraduate Platform (Test)</mdui:Description>
-        <mdui:Logo height="64" width="143">https://test.vpp.midlands3cities.ac.uk/shibboleth-ds/logo_transparent.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjygAwIBAgIJAN7ZAAJNPeUPMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-						BAMTHnRlc3QudnBwLm1pZGxhbmRzM2NpdGllcy5hYy51azAeFw0xNTA5MDgxMDQz
-						MTFaFw0yNTA5MDUxMDQzMTFaMCkxJzAlBgNVBAMTHnRlc3QudnBwLm1pZGxhbmRz
-						M2NpdGllcy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOVy
-						i5GUm+F28xiNFY26JMyDaZrM4wuEguKF1PygIXygoZvSghGY+2UbElkVT8uq2RPw
-						78VEevqqUkmImk74omwHqYslzDrUiPuKRNHSuA4juhf0fkfgws7/2uOzpsXwhSUr
-						RhuXdYfYmoTC+mYf5W0p7akaYIaNpiJSMpfMr9QJ9XG1cstILpQLzWi1PrVYyQAe
-						60FFP8iwXxny0d/GoCcUFcNVZHr/+RGOFpvfaTyx93EJ+MAQBqHjk9MZvCrzw8yp
-						7USK13WTGscBtptQnFrdsrr/DgLYT47c1uO3msIPILLawG6zmuBc/cYGDnXys/x8
-						Ro2vgvitq0HTs5TV+zcCAwEAAaN/MH0wXAYDVR0RBFUwU4IedGVzdC52cHAubWlk
-						bGFuZHMzY2l0aWVzLmFjLnVrhjFodHRwczovL3Rlc3QudnBwLm1pZGxhbmRzM2Np
-						dGllcy5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBRal19AbLQlRQl0TGi1/iWs
-						v0laLDANBgkqhkiG9w0BAQUFAAOCAQEAgeQesA8L2G0ELsCf+2QeVDiNjC4pNJaY
-						8fqjXdQnBnzuWr3l4oOA10xNfHWC00q8pWzhdltc5mB8HLLOTqGTg76DF65xBmKR
-						1Wl2AAigCGOCIKuIeIRWn4d9SxO16aTGRIUhwnRYPk49s37ADm23/dtR1CWFjTM9
-						37IYUFeXtf4YxIjKcjpWFM/P9zvNfipRugPIvitR+7QIVlbD0PMZlavt6016tPe3
-						ElHNeykkog1Bc/VQfYhB/x6uS+G/BMGKUMWHM/lw1n63G+xjAcge2Zd5tsE9Xlv7
-						EMC0Aw8aFtO/f3rbkV8veNp4kgaxP2fF1LctGuFKMQThYzwcd9rjZQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.vpp.midlands3cities.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Test M3C VPP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.midlands3cities.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:itservicedesk@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Betts</SurName>
-    <EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-shibboleth.xml
deleted file mode 100644
index ec663620..00000000
--- a/swamid-interfederations-2.0/test.worldbank.pub2web.ingenta.com-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://test.worldbank.pub2web.ingenta.com/shibboleth">
-  <!--
-		This is a World Bank e-Library TEST OpenAthens SP version 1.2 for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDkjCCAnqgAwIBAgIES9lH8TANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEUMBIGA1UECxMLRW5naW5lZXJpbmcx
-						HjAcBgNVBAMTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTAeFw0xMDA0MjkwODQ4NDla
-						Fw0yMDA0MjYwODQ4NDlaMIGKMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jk
-						c2hpcmUxDzANBgNVBAcTBk94Zm9yZDEeMBwGA1UEChMVUHVibGlzaGluZyBUZWNo
-						bm9sb2d5MRQwEgYDVQQLEwtFbmdpbmVlcmluZzEeMBwGA1UEAxMVUHVibGlzaGlu
-						ZyBUZWNobm9sb2d5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAikh+
-						4MJp8ZpbJ9gW//uabIFF+pyQoH0f4DeVSfFj6To5hn8nsw+HqCgICB3Y9z4p8Nth
-						2jjAcqF1NozrxlGmXQYMmoGjqxyHznJXq1UkN51oeFKRK+3IRpoe7Gh7RAC1qXC2
-						b9IBF2FRmpXD5t233lQ6pUEqRrVvrFsA+q+NPCSNGR00CizWvErN+H3n4hIbUcaK
-						Kab4oBFFfWzMSxtisRMNL9W/zdDwZxV8bQL14T0aQRYgWswLwrLnCCGHwHHd5+po
-						bCPFI+AbPYufxfBfcXw6fbNHn8MEsdbSWFjSL4IE1ykNBqmr1hcshiSrqiYqwIa1
-						Z347oG57JBVDAJjQ6QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCAYYRDtdxQBiWA
-						GPyAVEqdNvKKROS4NEBfKoppthAMCxTUIlFfzEJ6CICOYiE6/hQsxHwtmKkMr2/T
-						NRVrVuEYNo1816mHeR3CrZ0dpYg3vpVJoAz5n4aoYs433m/LnTcmTlqQgytaHE90
-						Db8+7pKyoBtNJrOMrf3jHICFgTBNd5EpQvmFGD6xvjtgKsxiWnQ9PVaGqSmITG1Q
-						RUMojjLi412ixiHu4QjBaTLshHvEuGlFclJjjUyyF+u+Kat0mwqRfRwor/2lp9Ia
-						JdA9lUQxOvtCDKAPP7YxJIzndGVi6xXGAUme1jYdTBlao5zzM1TtIPe/3XyDjeau 
-						fIrj0KcQ
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.worldbank.pub2web.ingenta.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.worldbank.pub2web.ingenta.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Publishing Technology: World Bank e-Library TEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://elibrary.worldbank.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:help@ingentaconnect.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:talvinder.matharu@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/testidp.nottingham.ac.uk-shibboleth.xml
deleted file mode 100644
index 95e97156..00000000
--- a/swamid-interfederations-2.0/testidp.nottingham.ac.uk-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://testidp.nottingham.ac.uk/shibboleth">
-  <!--
-		This is a "TEST" Shibboleth IdP for the University of Nottingham.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-22T16:32: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">nottingham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEpDCCA4ygAwIBAgIJAPJoOXh5jZZuMA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECBMPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHEwpOb3R0
-						aW5naGFtMSUwIwYDVQQKExxUaGUgVW5pdmVyc2l0eSBvZiBOb3R0aW5naGFtMR0w
-						GwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEhMB8GA1UEAxMYdGVzdGlkcC5u
-						b3R0aW5naGFtLmFjLnVrMSswKQYJKoZIhvcNAQkBFhxjcmFpZy5iZXR0c0Bub3R0
-						aW5naGFtLmFjLnVrMB4XDTE1MTExODE0MDIwOVoXDTI1MTExNTE0MDIwOVowgdIx
-						CzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNVBAcT
-						Ck5vdHRpbmdoYW0xJTAjBgNVBAoTHFRoZSBVbml2ZXJzaXR5IG9mIE5vdHRpbmdo
-						YW0xHTAbBgNVBAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMSEwHwYDVQQDExh0ZXN0
-						aWRwLm5vdHRpbmdoYW0uYWMudWsxKzApBgkqhkiG9w0BCQEWHGNyYWlnLmJldHRz
-						QG5vdHRpbmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCd7jf9JyWXG2cZFcseqidGD90cIOQ/VXEwP0rYgkE1d93JBcKVB1gIHZWcRR1m
-						6C1yJDT59ELfG6lW+lWiwl0mz+eSe1H/qHWvRYclN1d4idwjGH0+HI2Z6wCcI7AE
-						B+KtkNmmyll6UnKZCmaLTlA7RZldngNBnm4j+rse5Y6PzM09lFSUkI6uPd/pKOn7
-						bQ2GZxRe6XIvYXy5I+YPXA0KepdD+q6aMvcqfAnyBuNeYEBUWmp96FKkyDOq6U0O
-						2pcJsyk2afhYKfxgUr2xDKMGkV9aQ2lo2lKj/uOzeJrBkLLUFBfzX+hcsbNpog7L
-						bokGDaTrqteA+2GrMb4o3r61AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4
-						QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBR+
-						P4B1PFw8wFWK77RhxhNqJRWqZjAfBgNVHSMEGDAWgBR+P4B1PFw8wFWK77RhxhNq
-						JRWqZjANBgkqhkiG9w0BAQUFAAOCAQEAThuXjvL1gTZD3zvYWg6wQ8jc1CuVk+Av
-						kW03jrIn3G86ccKflFOlxqUea9hno7fFnTRI+Hkw6pLUbpomiXc2EfNsEqJCM9Mu
-						XyFchYKv8PAfMg9229uJbm8OwUAXY1C4t83h4usuu08rLvm3VUUV9lGMePSjkI6G
-						L0gMXhO1qS6b+14oG8BwxjMXkK80aDlB1NDwRxTpBCBNQNRBG3H1CUwZuPLYrnGJ
-						sGNabQO4+KddI+mjILyUTXkJmairCoNWz8TdyAvK/kcWjVku8pA3I75NUucMb254
-						7oz4jJB8gYgsY42b/0ls6sHuUILxKUZ4gTneeYN6L/MPfCAO74kEAQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp.nottingham.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://testidp.nottingham.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testidp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testidp.nottingham.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testidp.nottingham.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">nottingham.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEpDCCA4ygAwIBAgIJAPJoOXh5jZZuMA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
-						VQQGEwJHQjEYMBYGA1UECBMPTm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHEwpOb3R0
-						aW5naGFtMSUwIwYDVQQKExxUaGUgVW5pdmVyc2l0eSBvZiBOb3R0aW5naGFtMR0w
-						GwYDVQQLExRJbmZvcm1hdGlvbiBTZXJ2aWNlczEhMB8GA1UEAxMYdGVzdGlkcC5u
-						b3R0aW5naGFtLmFjLnVrMSswKQYJKoZIhvcNAQkBFhxjcmFpZy5iZXR0c0Bub3R0
-						aW5naGFtLmFjLnVrMB4XDTE1MTExODE0MDIwOVoXDTI1MTExNTE0MDIwOVowgdIx
-						CzAJBgNVBAYTAkdCMRgwFgYDVQQIEw9Ob3R0aW5naGFtc2hpcmUxEzARBgNVBAcT
-						Ck5vdHRpbmdoYW0xJTAjBgNVBAoTHFRoZSBVbml2ZXJzaXR5IG9mIE5vdHRpbmdo
-						YW0xHTAbBgNVBAsTFEluZm9ybWF0aW9uIFNlcnZpY2VzMSEwHwYDVQQDExh0ZXN0
-						aWRwLm5vdHRpbmdoYW0uYWMudWsxKzApBgkqhkiG9w0BCQEWHGNyYWlnLmJldHRz
-						QG5vdHRpbmdoYW0uYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCd7jf9JyWXG2cZFcseqidGD90cIOQ/VXEwP0rYgkE1d93JBcKVB1gIHZWcRR1m
-						6C1yJDT59ELfG6lW+lWiwl0mz+eSe1H/qHWvRYclN1d4idwjGH0+HI2Z6wCcI7AE
-						B+KtkNmmyll6UnKZCmaLTlA7RZldngNBnm4j+rse5Y6PzM09lFSUkI6uPd/pKOn7
-						bQ2GZxRe6XIvYXy5I+YPXA0KepdD+q6aMvcqfAnyBuNeYEBUWmp96FKkyDOq6U0O
-						2pcJsyk2afhYKfxgUr2xDKMGkV9aQ2lo2lKj/uOzeJrBkLLUFBfzX+hcsbNpog7L
-						bokGDaTrqteA+2GrMb4o3r61AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4
-						QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBR+
-						P4B1PFw8wFWK77RhxhNqJRWqZjAfBgNVHSMEGDAWgBR+P4B1PFw8wFWK77RhxhNq
-						JRWqZjANBgkqhkiG9w0BAQUFAAOCAQEAThuXjvL1gTZD3zvYWg6wQ8jc1CuVk+Av
-						kW03jrIn3G86ccKflFOlxqUea9hno7fFnTRI+Hkw6pLUbpomiXc2EfNsEqJCM9Mu
-						XyFchYKv8PAfMg9229uJbm8OwUAXY1C4t83h4usuu08rLvm3VUUV9lGMePSjkI6G
-						L0gMXhO1qS6b+14oG8BwxjMXkK80aDlB1NDwRxTpBCBNQNRBG3H1CUwZuPLYrnGJ
-						sGNabQO4+KddI+mjILyUTXkJmairCoNWz8TdyAvK/kcWjVku8pA3I75NUucMb254
-						7oz4jJB8gYgsY42b/0ls6sHuUILxKUZ4gTneeYN6L/MPfCAO74kEAQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp.nottingham.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp.nottingham.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">University of Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Nottingham: TEST</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nottingham.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>University of Nottingham IT Helpline</GivenName>
-    <EmailAddress>mailto:itservicedesk@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Betts</SurName>
-    <EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testidp1.ntu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/testidp1.ntu.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index fcaeb22e..00000000
--- a/swamid-interfederations-2.0/testidp1.ntu.ac.uk-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://testidp1.ntu.ac.uk/idp/shibboleth">
-  <!--
-		This is a "testidp1" Shibboleth IdP for Nottingham Trent University.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-12-10T18:01: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">ntu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEcjCCA1qgAwIBAgIRAPTb+rk6jOmXCD8nphThP4UwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA1MjkwMDAwMDBaFw0xNjA1MjgyMzU5NTlaMEAxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSdGVzdGlkcDEu
-						bnR1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ORxXKiX
-						DYnYrh0URq0YrQvXUrUABDoA0oRStRQGmwgYBNHD4fTid9qJxRAXddoOxWHR3eLM
-						+LV7VAMuZvzNq4x5LXFhqkfRHPXuM1GwMT8t8kHIsgv3xlxf3xjAjyHGswnlv8kU
-						1uMiCj1u+q59WTt7VYGQkdiPYthy9pp6RCCWLvoeH2fpsE8Zfni/8YqkSLR0o7XX
-						FSw2BvgqNlxrdQtiVKSaAKqv6MtYLQfsPAf7KyHXcOn/Wa79zsyh7Gr5tkMHWCyO
-						z6/uA1UeHm+/00mCLJ2HxwGA/mQpiWmuTUtZRNyhIl6RCCpQvYmEYLcyTjXXgyCZ
-						btwqLlDrmrNeZwIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-						N1dH6pDjue0wHQYDVR0OBBYEFCi+rC8oIr09eQTC9ySKAjItBWkrMA4GA1UdDwEB
-						/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-						BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-						MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-						LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-						LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-						b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJ0ZXN0aWRwMS5udHUuYWMu
-						dWswDQYJKoZIhvcNAQEFBQADggEBAFUt0QpPH6WC/+XltCugdJr76oMYrwjNsOtK
-						HakoQSRsf4uYg66wmJKnHhxEyFZeogB6cMAMe06PsaUB/86X35gkxFm2uMJGfsJB
-						iE67ALWlN2hwWDePC/07Olud9e8Nq4u473yKLqsS7S3uY6aFYLXE9rWMXq2fIBj8
-						iQFeWXQe0VfuG2l3k0UGs5Nty4UwRzLABv5sTmpnm8PJmDO5oAXmZg+lNYhRHkMO
-						kdhsjKI5gAW+1PdlGwcHdx98KyqoVSLQw9HcWAE7Wo7MoKCsFrnyBqC/8N+k+8tm
-						s7Obnw4aOinAMW06Fka45GA6qoSnJVj3y741U5pHrw0fWtVRZ3A=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp1.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp1.ntu.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://testidp1.ntu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testidp1.ntu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testidp1.ntu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testidp1.ntu.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">ntu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEcjCCA1qgAwIBAgIRAPTb+rk6jOmXCD8nphThP4UwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA1MjkwMDAwMDBaFw0xNjA1MjgyMzU5NTlaMEAxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSdGVzdGlkcDEu
-						bnR1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1ORxXKiX
-						DYnYrh0URq0YrQvXUrUABDoA0oRStRQGmwgYBNHD4fTid9qJxRAXddoOxWHR3eLM
-						+LV7VAMuZvzNq4x5LXFhqkfRHPXuM1GwMT8t8kHIsgv3xlxf3xjAjyHGswnlv8kU
-						1uMiCj1u+q59WTt7VYGQkdiPYthy9pp6RCCWLvoeH2fpsE8Zfni/8YqkSLR0o7XX
-						FSw2BvgqNlxrdQtiVKSaAKqv6MtYLQfsPAf7KyHXcOn/Wa79zsyh7Gr5tkMHWCyO
-						z6/uA1UeHm+/00mCLJ2HxwGA/mQpiWmuTUtZRNyhIl6RCCpQvYmEYLcyTjXXgyCZ
-						btwqLlDrmrNeZwIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-						N1dH6pDjue0wHQYDVR0OBBYEFCi+rC8oIr09eQTC9ySKAjItBWkrMA4GA1UdDwEB
-						/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-						BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-						MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-						LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-						LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-						b2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJ0ZXN0aWRwMS5udHUuYWMu
-						dWswDQYJKoZIhvcNAQEFBQADggEBAFUt0QpPH6WC/+XltCugdJr76oMYrwjNsOtK
-						HakoQSRsf4uYg66wmJKnHhxEyFZeogB6cMAMe06PsaUB/86X35gkxFm2uMJGfsJB
-						iE67ALWlN2hwWDePC/07Olud9e8Nq4u473yKLqsS7S3uY6aFYLXE9rWMXq2fIBj8
-						iQFeWXQe0VfuG2l3k0UGs5Nty4UwRzLABv5sTmpnm8PJmDO5oAXmZg+lNYhRHkMO
-						kdhsjKI5gAW+1PdlGwcHdx98KyqoVSLQw9HcWAE7Wo7MoKCsFrnyBqC/8N+k+8tm
-						s7Obnw4aOinAMW06Fka45GA6qoSnJVj3y741U5pHrw0fWtVRZ3A=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidp1.ntu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidp1.ntu.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">Nottingham Trent University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nottingham Trent University (testidp1)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ntu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Richard</GivenName>
-    <SurName>Cross</SurName>
-    <EmailAddress>mailto:richard.cross@ntu.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Lee</GivenName>
-    <SurName>Hallam</SurName>
-    <EmailAddress>mailto:ITSShibbolethTechnical@ntu.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testing.lifeisaboutlearning.com-shibboleth-sp.xml b/swamid-interfederations-2.0/testing.lifeisaboutlearning.com-shibboleth-sp.xml
deleted file mode 100644
index 305c55bf..00000000
--- a/swamid-interfederations-2.0/testing.lifeisaboutlearning.com-shibboleth-sp.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://testing.lifeisaboutlearning.com/shibboleth-sp">
-  <!--
-		This is a Shibboleth SP for UniServity Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://testing.lifeisaboutlearning.com/Shibboleth.sso/TestShib"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJALqK3r+ZErlKMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG2NsYy1kZW1vMS1zdnIubGlmZS5iZXRhLmNvbTAeFw0xMTA4MDMxMTMzMDha
-						Fw0yMTA3MzExMTMzMDhaMCYxJDAiBgNVBAMTG2NsYy1kZW1vMS1zdnIubGlmZS5i
-						ZXRhLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANm1+QxmQGLN
-						AHlee/8D35R5Iec1JNg8AKU0K7nE1ClK5glm802nOiCtmJkkjjtQzKYJ7aLSHxCB
-						mqJeiwcMA/KFcYlHel/B/96I8bsPjeXDoMvnxDjsX1kZ/5E/n6T8eauQt87c3Pv6
-						ZbpGxWqv7HSKDpEwPQbknMX1BnmjA+CcT6NqVwB+SRNpC4Y10uHJsDofeqWjjgtd
-						kqjAIebvD6rfsm576L1X2mXTBoYuhtRGUOKzeIrQfMVYF8qOaAYzHmKrPQ6O2kDj
-						dDufSOCj+sNUCTWfaB/kklTZK0hfeVYEQ23d8Utr8r1wEx31VG8VEZffGwZJrf5u
-						rTsjKJlWnWMCAwEAAaNJMEcwJgYDVR0RBB8wHYIbY2xjLWRlbW8xLXN2ci5saWZl
-						LmJldGEuY29tMB0GA1UdDgQWBBTbjK2BPOaPmxv8sZUdjuU2Y8KwYDANBgkqhkiG
-						9w0BAQUFAAOCAQEAvdVtlzXcFVa+3rmiraZIvAHldUrrOUlP48Bxw7zcRn9Txoek
-						2GLRP5I6u++cOmWqWP0YjSsYYzDTxskyxZx4XghVLQzwldRURCKL6eenl3YhHv+c
-						Q5S/qwsib4lldM0tE01uJkpl3MFVhLUo93QsxvOGjq6zVNlIwP0pcXeux97cZY3x
-						9b6bjEPg2f0QLJqZ4UMtIb9FsWLe1bVFp41mS3YmDOOKuXOhmSNEAa1xbpZh/Gai
-						KeeVS0l6GGBnqsa4q9sLUpG52esWnwPOZVIM3JC+t+1RMjF4hGJYLfewiBbclj+3
-						Dz+nuT/jMHw2luh6YHT8y6caxde8WpnDBF1CuA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testing.lifeisaboutlearning.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testing.lifeisaboutlearning.com/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UniServity Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UniServity Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniservity.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UniServity Support</GivenName>
-    <EmailAddress>mailto:support@uniservity.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rezar</GivenName>
-    <SurName>Zefaj</SurName>
-    <EmailAddress>mailto:rezar.zafaj@uniservity.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.xml
deleted file mode 100644
index abb50fd7..00000000
--- a/swamid-interfederations-2.0/testoala.surrey.ac.uk-oala-metadata.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://testoala.surrey.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA test IdP for the University of Surrey.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-09T16:18:51Z"/>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">surrey.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUDCCAjigAwIBAgIIRNFxRp/Jwa8wDQYJKoZIhvcNAQEFBQAwPzEdMBsGA1UE
-						CgwUVW5pdmVyc2l0eSBvZiBTdXJyZXkxHjAcBgNVBAMMFXRlc3RvYWxhLnN1cnJl
-						eS5hYy51azAeFw0xMjAzMjkxNTM1MThaFw0yMjAzMjkxNTM1MThaMD8xHTAbBgNV
-						BAoMFFVuaXZlcnNpdHkgb2YgU3VycmV5MR4wHAYDVQQDDBV0ZXN0b2FsYS5zdXJy
-						ZXkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1j2zQKc7z
-						R2V/VMIag9WMfd66ABeoUemxyKIxtUi925IAuspYjlM54eFDzTxl9bkS/nEHF461
-						M/qusiKKasjxctKjllFKt81kiUvki20ghFA3GoxfHf9Ggdn0/9kCxJqaQC04E2+F
-						AmBKp2ndkfsg77eSfpfKoBlLzYCwm2Z/yWQtV1Emxlg/BiVHaiGXls/uB8jRYRR5
-						rTypT7QBgktFSTV2jJ4HZjbibC106DMseDwKuE+4sPjCtDIY0xB+CEWvIWFZ7m7i
-						4sQAEE/iNymvSgfD8FVM6qN3QZJktLND+ytw7xT2ApCyhufjVYXzChEdv8JAxtFc
-						yjupxFetN221AgMBAAGjUDBOMB0GA1UdDgQWBBS7I/yqh/AoV6xFYMqRCoLShzpp
-						/jAfBgNVHSMEGDAWgBS7I/yqh/AoV6xFYMqRCoLShzpp/jAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBS+xHB77QPjESIz1lySOo6JzrQU14Tpt7/KXEN
-						m1QNxZEnuRh6ApWKHjAWGW0XvnkIh8QDzB9ypnBEskTe9mF7cimv3D1YCf12FyDZ
-						gn3NQNE21cOiZa9Ul2jaJLNoLVlj4pH75KMYUDSjNJaqa20qz2G0iCu5FPPz6kfz
-						N52TVaCkDD3rJ4lo4w5Q1BHy8GhzHGcw0nqVpEfkkEH0YJIFqhhwcUkWo1auD1k2
-						cQZH5tf4evWS55wxZai4h9IipxrFvVzizvIhYiiZl1LVAKu/L2JrabFjH0wkWYMK
-						s4lnRLncL6eQ8Adihl6jJY+qwdJLBoms/5AD7cJ1qPw0qkLS
-					</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>
-						MIIDUDCCAjigAwIBAgIIRNFxRp/Jwa8wDQYJKoZIhvcNAQEFBQAwPzEdMBsGA1UE
-						CgwUVW5pdmVyc2l0eSBvZiBTdXJyZXkxHjAcBgNVBAMMFXRlc3RvYWxhLnN1cnJl
-						eS5hYy51azAeFw0xMjAzMjkxNTM1MThaFw0yMjAzMjkxNTM1MThaMD8xHTAbBgNV
-						BAoMFFVuaXZlcnNpdHkgb2YgU3VycmV5MR4wHAYDVQQDDBV0ZXN0b2FsYS5zdXJy
-						ZXkuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1j2zQKc7z
-						R2V/VMIag9WMfd66ABeoUemxyKIxtUi925IAuspYjlM54eFDzTxl9bkS/nEHF461
-						M/qusiKKasjxctKjllFKt81kiUvki20ghFA3GoxfHf9Ggdn0/9kCxJqaQC04E2+F
-						AmBKp2ndkfsg77eSfpfKoBlLzYCwm2Z/yWQtV1Emxlg/BiVHaiGXls/uB8jRYRR5
-						rTypT7QBgktFSTV2jJ4HZjbibC106DMseDwKuE+4sPjCtDIY0xB+CEWvIWFZ7m7i
-						4sQAEE/iNymvSgfD8FVM6qN3QZJktLND+ytw7xT2ApCyhufjVYXzChEdv8JAxtFc
-						yjupxFetN221AgMBAAGjUDBOMB0GA1UdDgQWBBS7I/yqh/AoV6xFYMqRCoLShzpp
-						/jAfBgNVHSMEGDAWgBS7I/yqh/AoV6xFYMqRCoLShzpp/jAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBQUAA4IBAQBS+xHB77QPjESIz1lySOo6JzrQU14Tpt7/KXEN
-						m1QNxZEnuRh6ApWKHjAWGW0XvnkIh8QDzB9ypnBEskTe9mF7cimv3D1YCf12FyDZ
-						gn3NQNE21cOiZa9Ul2jaJLNoLVlj4pH75KMYUDSjNJaqa20qz2G0iCu5FPPz6kfz
-						N52TVaCkDD3rJ4lo4w5Q1BHy8GhzHGcw0nqVpEfkkEH0YJIFqhhwcUkWo1auD1k2
-						cQZH5tf4evWS55wxZai4h9IipxrFvVzizvIhYiiZl1LVAKu/L2JrabFjH0wkWYMK
-						s4lnRLncL6eQ8Adihl6jJY+qwdJLBoms/5AD7cJ1qPw0qkLS
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testoala.surrey.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testoala.surrey.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Surrey</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Surrey (OALA TEST)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.surrey.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Claire</GivenName>
-    <SurName>Gill</SurName>
-    <EmailAddress>mailto:c.j.gill@surrey.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Abdul</GivenName>
-    <SurName>Minhas</SurName>
-    <EmailAddress>mailto:a.minhas@surrey.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml b/swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-Shibboleth.xml
deleted file mode 100644
index a64f9cdf..00000000
--- a/swamid-interfederations-2.0/testpbyp.camb-ed.com-SP-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://testpbyp.camb-ed.com/SP/Shibboleth">
-  <!--
-		This is a "Personalisation by Pieces" Shibboleth SP for Cambridge Education Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://testpbyp.camb-ed.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Personalisation by Pieces (PbyP)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Personalisation by Pieces (PbyP) is an approach
-					to teaching and learning developed by Cambridge Education in 2006. It is a
-					framework to support personalised learning based on core skills and competencies.</mdui:Description>
-        <mdui:Logo height="100" width="252">https://services.camb-ed.com/images/ce-logo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAJ0gsyZA9LuWMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGm50ZGQzMDk3LXZtMDEuY2FtYmJlLmxvY2FsMB4XDTExMTAxOTA5NDc0NloX
-						DTIxMTAxNjA5NDc0NlowJTEjMCEGA1UEAxMabnRkZDMwOTctdm0wMS5jYW1iYmUu
-						bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCh5Q5Pfp0V1Ch6
-						BGzR3BdI5zG2iuEFSIXL86J8BjNtmXK7trhlmkFV8IRrSlZZT4HoQ5L8osWMmjvF
-						PT7QUShEgOa2whBn40B8FKCLgEpBw5cigexoc5CSsrwrlYFRvyI5dPFxWswcx+xJ
-						ZY8Rrzr2nWyt3uFzs2wNwIx/ftXQPLXQPVRU14OQQa34oy8EY8Gu+IcZJKbLUssz
-						3jFc/7RYXXE6GT6gU1zuIVTXl3C/rZniD2byTkw6cT9p0PqnAjt75A2tjd4Caro6
-						8wyof9P7NjtHaRAl1lY/FH0OFPuSoF4FJxFgzeY/iQ59qxZ0hpVx0/ypy35bkrIB
-						9sYRChKPAgMBAAGjSDBGMCUGA1UdEQQeMByCGm50ZGQzMDk3LXZtMDEuY2FtYmJl
-						LmxvY2FsMB0GA1UdDgQWBBQIox4FW13pfw8o8eGdT9Pf62b05TANBgkqhkiG9w0B
-						AQUFAAOCAQEAHZ1hImDls+f1zizRgGQVAi3oDJxKIbsZpabHWiF26ZLm510Scw0m
-						EMo+ujL+QZGZGrm8EFvRg3SXRgn1R7FogYof7rg8xegReDSpKLsnGJFiKj+CBq8w
-						bFZ1A4jfGD1BITLqn1RpFqrFAXHI5O+LbZSMf4LxC/y7h8H/oa86qKAyBQ/6VrGQ
-						xKt+6n+Wf8hbkI2xcBzfzr5RiRWynCDl7uBLZtgqVnqWm+kMSZ7pumsCoQVnIiUg
-						UY4Kot4hlc38yuDomldi17E41LhqZqi/ZOUi2o2l9r7kyGKDd5LCmXNiQdsGtfWb
-						7xE8KO+hyTvS+CzJoArDBNyd7hkQJqw3gw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testpbyp.camb-ed.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cambridge Education Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cambridge Education Limited: Personalisation by Pieces</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.camb-ed.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Bell</SurName>
-    <EmailAddress>mailto:simon.bell@camb-ed.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Zishan</GivenName>
-    <SurName>Sheikh</SurName>
-    <EmailAddress>mailto:Zishan.sheikh@camb-ed.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Bell</SurName>
-    <EmailAddress>mailto:simon.bell@camb-ed.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Zishan</GivenName>
-    <SurName>Sheikh</SurName>
-    <EmailAddress>mailto:Zishan.sheikh@camb-ed.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testshib.msacademicverify.com-shibboleth-sp.xml b/swamid-interfederations-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
deleted file mode 100644
index a0b55e77..00000000
--- a/swamid-interfederations-2.0/testshib.msacademicverify.com-shibboleth-sp.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://testshib.msacademicverify.com/shibboleth-sp">
-  <!--
-		This is a Shibboleth SP for Microsoft.
-	-->
-  <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="2013-04-18T09:49:34Z"/>
-  </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://testshib.msacademicverify.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Microsoft Academic Verification Engine</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Microsoft uses the Academic Verification Engine (AVE) to determine client academic eligibility in its global business.
-					Academic eligibility is defined as: “Individual must be a full or part time enrolled university or college student or faculty or staff 
-					at an eligible accredited educational institution and must be able to provide proof of enrollment to Microsoft or its appointed vendor upon request. 
-					Alumni of these institutions are ineligible.” AVE uses federated data as one of many verification methods to determine academic eligibility.
-				</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjygAwIBAgIJAJh4QX82u2pTMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHXRlc3RzaGliLm1zYWNhZGVtaWN2ZXJpZnkuY29tMB4XDTEzMDMyNjEzMTIw
-						N1oXDTE2MDMyNTEzMTIwN1owKDEmMCQGA1UEAxMddGVzdHNoaWIubXNhY2FkZW1p
-						Y3ZlcmlmeS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsLIq+
-						Kl9aCXy3gkjyDv1YWqWVL3c6S+G5aCnCwtlbwU9q5R9lo7r5pjxScujS+kwRRYfO
-						KJ5jg6M6T1oZOEkcMjAcx0hF5fat7a3z02zvL4eaZcZAnd4Jrn8xizKX363lE+mj
-						NGu38+xpEyknMNpybsFeqA9S+tbZDteMihHi4x+rkis5Cno9m4OXEN3fGrl6sa2L
-						+d5XHH/IlUa0LA0cpKP8ONMYNR4g+7lUy+SHuo9iQJZesEX16cCMNkbknNuexRH+
-						2FhGx3q6WB87KhgLjpdmb5ZPcPFAbdZSrbpZTMny2RDFMbpyQefYEMYlTETYwJ4S
-						3sSa4EhqIbri+CZzAgMBAAGjgYAwfjBdBgNVHREEVjBUgh10ZXN0c2hpYi5tc2Fj
-						YWRlbWljdmVyaWZ5LmNvbYYzaHR0cHM6Ly90ZXN0c2hpYi5tc2FjYWRlbWljdmVy
-						aWZ5LmNvbS9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBQKuJJcwHX2m6nuzSaqFlE9
-						NdEF/jANBgkqhkiG9w0BAQUFAAOCAQEAIUWZZuPR/N4BY2LeeHKQ5GCArl7ZPM50
-						6Znt2T7vw/D6JKNmUx1v9PVyt4GzleFCrWhWgX4mKlUfrT1EcGYblKj6YUKErERk
-						pRbaJp8mZ/X5Ugi00lpv0GlNtdvvrYv5R1V5wTUSyLd6L+Ci3jhhugkd5cTL3ttk
-						s/JNkMFd0eHEeJKi2jcI1jrhF9aWncdGup/MNdm0wPxmtnoylkuXUY0CIlmMYuas
-						ZCjBzPpPM2QIOXiuXypVLjuP32AirgS8h/uL+mY4z8pv68loW8C0ulYqmj6lPjDR
-						wWE+vceD2r7oFUYHr1E07cyX20HwNU1LL3TthPaNhs7M2ImLlYHapw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://testshib.msacademicverify.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testshib.msacademicverify.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Microsoft Corporation</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Microsoft Academic Verification Engine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.microsoft.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>AVE Support</GivenName>
-    <EmailAddress>mailto:avesupp@microsoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>AVE Support</GivenName>
-    <EmailAddress>mailto:avesupp@microsoft.com</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 b9b77ba2..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"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://testssso.uni-muenster.de/shibboleth-sp">
-  <md: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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://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 (Erprobung)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Münster (Staging)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dieses zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. (Alternativzugang)</mdui:Description>
-        <mdui:Description xml:lang="en">This central Single Sign-On covers almost all services of the university of Münster. (Alternative entry point)</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="64" width="80">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu.svg</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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="0"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Universität Münster (Erprobung)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Universität Münster (Staging)</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Dieses zentrale Single Sign-On umfasst fast alle Dienste der Universität Münster. (Alternativzugang)</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">This central Single Sign-On covers almost all services of the university of Münster. (Alternative entry point)</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="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e247</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e247</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-muenster.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rainer</md:GivenName>
-    <md:SurName>Perske</md:SurName>
-    <md:EmailAddress>mailto:wwwadmin@uni-muenster.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Rainer</md:GivenName>
-    <md:SurName>Perske</md:SurName>
-    <md:EmailAddress>mailto:wwwadmin@uni-muenster.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/testx.rewley.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/testx.rewley.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 56d61487..00000000
--- a/swamid-interfederations-2.0/testx.rewley.ox.ac.uk-shibboleth-sp.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://testx.rewley.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Continuing Education main test site" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-26T09:39:37Z">
-      <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://testx.rewley.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEmjCCA4KgAwIBAgIJAN3lX0bKmvYOMA0GCSqGSIb3DQEBBQUAMIHNMQswCQYD
-						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
-						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
-						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMR4wHAYDVQQDDBV0ZXN0eC5yZXds
-						ZXkub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNvbnRlZC5v
-						eC5hYy51azAeFw0xNDA1MTYxMzUwNDZaFw0yNDA1MTMxMzUwNDZaMIHNMQswCQYD
-						VQQGEwJVSzEUMBIGA1UECAwLT3hmb3Jkc2hpcmUxDzANBgNVBAcMBk94Zm9yZDEd
-						MBsGA1UECgwUVW5pdmVyc2l0eSBvZiBPeGZvcmQxLDAqBgNVBAsMI0RlcGFydG1l
-						bnQgZm9yIENvbnRpbnVpbmcgRWR1Y2F0aW9uMR4wHAYDVQQDDBV0ZXN0eC5yZXds
-						ZXkub3guYWMudWsxKjAoBgkqhkiG9w0BCQEWG21pa2UudGF5bG9yQGNvbnRlZC5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALGlJIa2jDp7
-						2G0veO3PKZIeR5bEjwiIwMJ2eVLavYR8srwBfAJKqWfLSTkHpwqTDiV4TJzW1ZLX
-						DSA45CE21tx/hEb4u0vEARvRpNE1v+0852wV8MTWAIG32D3ciIOhNwH/6FInVbVR
-						iLRyjWoykWTvZoSdu6mQa5fTXq5CzUhMg3FDfT4Z6piyAdJMz9NUF8vr2chS6VLg
-						tWwC20/gerQ4TN81X1NZBZcdHQG1c9rvg7IR28CjfVggUvDkbsqaWYmf5ynO7328
-						l8LJxtzvWRxJu6XyiPE5wr8ISdtjYpXczE+2rzkIEo8ztJI9dx9X3bkq1QvJIWHP
-						uEeykQijZd0CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
-						blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFJIfR/ZYmJByuaE5
-						GldU6Q5Ti+4ZMB8GA1UdIwQYMBaAFJIfR/ZYmJByuaE5GldU6Q5Ti+4ZMA0GCSqG
-						SIb3DQEBBQUAA4IBAQACMlLHR3DfGj7btTxywdzVVxjVZPmwsbuBRUXx+2+BM6eJ
-						oRMnlavU7APk7/1WO39MXA94fsCUZqzS5J6zTH4M+Zz80yav2/6ovZ3hCLi7f95A
-						4EJYyZDhEoUj18ghVsx27DzvGvHT7iot93IyQl+TC5uzfaZewZKmdDjuFXnZyLE6
-						63zwkMgxdQZpNx3bBXnnQijmXKd9D0kDAn3QdzHWWAzLNIiElhkPtWOfyrr96d+E
-						Za3sWCoe1p7/z6S7QFrkaEIPoQUmWADygNzOdGEMR2oUtbX4FUMaKj6lJ0yn7x/D
-						kkjAFsFqiMDHkphikIOe1+UNnWIECZVMWqntNn7b
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://testx.rewley.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Oxford University: Continuing Education main test site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.conted.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Taylor</SurName>
-    <EmailAddress>mailto:mike.taylor@conted.ox.ac.uk</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 eb765d01..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">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor 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/the.sketchengine.co.uk-entity.xml b/swamid-interfederations-2.0/the.sketchengine.co.uk-entity.xml
deleted file mode 100644
index bf0cbe54..00000000
--- a/swamid-interfederations-2.0/the.sketchengine.co.uk-entity.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://the.sketchengine.co.uk/entity">
-  <!--
-		This is a "Sketch Engine" Shibboleth SP for Lexical Computing 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="2014-12-04T10:45:41Z">
-      <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://the.sketchengine.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://the.sketchengine.co.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sketch Engine</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Sketch Engine is a Corpus Query System allowing you to research how words behave.</mdui:Description>
-        <mdui:Logo height="60" width="180">https://the.sketchengine.co.uk/media/img/sketch_engine_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJANfd9uOTdW5iMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnRoZS5za2V0Y2hlbmdpbmUuY28udWswHhcNMTQxMTE5MTAyMDQ1WhcNMjQx
-						MTE2MTAyMDQ1WjAhMR8wHQYDVQQDExZ0aGUuc2tldGNoZW5naW5lLmNvLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0htPnFyNGNzy926yL4N7stIk
-						RwcqbHXDObBZzyTB1JaRPZo6aq+bnibx5+03BBjPwOYdXVDdUVDIX/PspMGXyuTa
-						fqjs1c7xwkKLU79uECAqYvKQXd1rxx2A6njJ2oAxgo2yCzjnWXXwRBIFWuF58xgh
-						z+nECBY45t0Ao2IJHsUE87eSYRYf+ezs6aZDxnxvBrB3EtO2Xev5dv59a3BHFmIo
-						b0SIhjRc8C8zJNwtXK30dVBjwx+WrCmHb2VjsKgFpD68DGxE44J3WDUsM04Yza1k
-						PxzAoVyo0mSO0uBU8A08JukvZwkYQwF01pB3qWXLy0sY33LfFkFgE1G5mbBfNwID
-						AQABo0QwQjAhBgNVHREEGjAYghZ0aGUuc2tldGNoZW5naW5lLmNvLnVrMB0GA1Ud
-						DgQWBBRtKwxkOaJ6+vRN9Q+DFKAtuqpC+jANBgkqhkiG9w0BAQUFAAOCAQEAc2PS
-						SxkloyX01Vzja1OUX8lfpqDCDDx3cbicxWMHsVDg22fZuY3V168eUbpQfIEKeXdb
-						jaatza31vCxKyQgc83H3zmdszr40jaPOUTwvE5ukwrK/bXaNnMb7IqqJAVL3Dkur
-						/pF3k/FwyiKwz9iwXEk/+dy630qvm7in31qVfzk+2DcuBLxqKKYhUiHU6nbYCbqx
-						NkZosBDW43SWAkVLQoL5fzLdyBP5xJ8VeDKmic8571k9ePjRn4r10g9c2ZI8SNbe
-						J/+AKKMeZuCX9RmVvsXC1vPAtxQR8ssPdZZF1mApT2Vr/DGHGMe/wyx19Cgz2NxK
-						/NTHeUzRgS0hN9qLFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://the.sketchengine.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://the.sketchengine.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Lexical Computing Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sketch Engine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.sketchengine.co.uk/documentation/wiki/Website/LexicalComputing/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@sketchengine.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@sketchengine.co.uk</EmailAddress>
-  </ContactPerson>
-</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/thelonious.campusguard.com-idp-shibboleth.xml b/swamid-interfederations-2.0/thelonious.campusguard.com-idp-shibboleth.xml
deleted file mode 100644
index e6c6e177..00000000
--- a/swamid-interfederations-2.0/thelonious.campusguard.com-idp-shibboleth.xml
+++ /dev/null
@@ -1,100 +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://thelonious.campusguard.com/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">campusguard.com</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Merchant Preservation Services</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test - CG IdP</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>
-MIIDVDCCAjygAwIBAgIVAIDF43Kla6YOJ6zTgKwSAHivI1/yMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGnRoZWxvbmlvdXMuY2FtcHVzZ3VhcmQuY29tMB4XDTEz
-MTAxNzAxMTMzMloXDTMzMTAxNzAxMTMzMlowJTEjMCEGA1UEAxMadGhlbG9uaW91
-cy5jYW1wdXNndWFyZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCrMSOBfEYG2Xnsl4/iwRYQ0YbApLZpHg6tY0ccc6VFBiGPNeO9rciEx/1ZcS7G
-u2tEOTDUA4wZGcmSoBVczCvfj5RJpQ4BlaB4ocR/7cRhLHc5A7uNGKLMpJdxVQ3B
-pTYvDNtt+4LJgIFx10g243P+ETdE5FtGsZlg6vxYeTd7ur6QQBxAURhImVJIoizy
-6pCenoHo0PHnLwMfcsloKrujTLE60uvWBVlEQqFJVXvlNzQFiZazIV+IQXeemjj1
-w9D2UQZsfVqWzPDjMWLLvvUf2OM3iHK0yXHqTcexQ7v6yfHklvdqM0d/W9jMTMGV
-+OWerUDmmQovSqLPO3DZhQVLAgMBAAGjezB5MFgGA1UdEQRRME+CGnRoZWxvbmlv
-dXMuY2FtcHVzZ3VhcmQuY29thjFodHRwczovL3RoZWxvbmlvdXMuY2FtcHVzZ3Vh
-cmQuY29tL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpKJ+Pw49nRtlOAtSuBSzd
-D+qdJTANBgkqhkiG9w0BAQUFAAOCAQEAQE/BwtWrprio4XKMON7Q5ru0h+vmJWj5
-9Am0I+SGMPQQJL/9F5c9YpRPoZ4Q84KISa7zwL6CNYcVOvSf+uGqPeCDQYkgaKBu
-llxo2FVZ3CF6wQ+HsDGozLz4//mr9CeFdYEb1IPFFmpWYFLk4IsOnqRbymUL4g8z
-ag0lU0mXOukNKI3DwuVXunDCBmBEricdSjKS6cmrUxjaokpHANW/5810SxFQFCcn
-4x37ocZoks4+689UIXJjd9Zi61zHN6qTjF+nIyfa1DMrysZXiUa2olTJ3AT5sZbF
-bMCG+OEJspI9w0kKBGO/CLEmA4cTUzyhIlndmQfPj2JhyRjIHujmVQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://thelonious.campusguard.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thelonious.campusguard.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://thelonious.campusguard.com/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thelonious.campusguard.com/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thelonious.campusguard.com/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">campusguard.com</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDVDCCAjygAwIBAgIVAIDF43Kla6YOJ6zTgKwSAHivI1/yMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGnRoZWxvbmlvdXMuY2FtcHVzZ3VhcmQuY29tMB4XDTEz
-MTAxNzAxMTMzMloXDTMzMTAxNzAxMTMzMlowJTEjMCEGA1UEAxMadGhlbG9uaW91
-cy5jYW1wdXNndWFyZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCrMSOBfEYG2Xnsl4/iwRYQ0YbApLZpHg6tY0ccc6VFBiGPNeO9rciEx/1ZcS7G
-u2tEOTDUA4wZGcmSoBVczCvfj5RJpQ4BlaB4ocR/7cRhLHc5A7uNGKLMpJdxVQ3B
-pTYvDNtt+4LJgIFx10g243P+ETdE5FtGsZlg6vxYeTd7ur6QQBxAURhImVJIoizy
-6pCenoHo0PHnLwMfcsloKrujTLE60uvWBVlEQqFJVXvlNzQFiZazIV+IQXeemjj1
-w9D2UQZsfVqWzPDjMWLLvvUf2OM3iHK0yXHqTcexQ7v6yfHklvdqM0d/W9jMTMGV
-+OWerUDmmQovSqLPO3DZhQVLAgMBAAGjezB5MFgGA1UdEQRRME+CGnRoZWxvbmlv
-dXMuY2FtcHVzZ3VhcmQuY29thjFodHRwczovL3RoZWxvbmlvdXMuY2FtcHVzZ3Vh
-cmQuY29tL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSpKJ+Pw49nRtlOAtSuBSzd
-D+qdJTANBgkqhkiG9w0BAQUFAAOCAQEAQE/BwtWrprio4XKMON7Q5ru0h+vmJWj5
-9Am0I+SGMPQQJL/9F5c9YpRPoZ4Q84KISa7zwL6CNYcVOvSf+uGqPeCDQYkgaKBu
-llxo2FVZ3CF6wQ+HsDGozLz4//mr9CeFdYEb1IPFFmpWYFLk4IsOnqRbymUL4g8z
-ag0lU0mXOukNKI3DwuVXunDCBmBEricdSjKS6cmrUxjaokpHANW/5810SxFQFCcn
-4x37ocZoks4+689UIXJjd9Zi61zHN6qTjF+nIyfa1DMrysZXiUa2olTJ3AT5sZbF
-bMCG+OEJspI9w0kKBGO/CLEmA4cTUzyhIlndmQfPj2JhyRjIHujmVQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://thelonious.campusguard.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Merchant Preservation Services</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Merchant Preservation Services</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.campusguard.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Edward Ko</md:GivenName>
-    <md:EmailAddress>edko@campusguard.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Owen Davies</md:GivenName>
-    <md:EmailAddress>odavies@campusguard.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Craig Henninger</md:GivenName>
-    <md:EmailAddress>chenninger@campusguard.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.xml b/swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-shibboleth.xml
deleted file mode 100644
index 2528d885..00000000
--- a/swamid-interfederations-2.0/thinkit.oneteamlogic.co.uk-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://thinkit.oneteamlogic.co.uk/shibboleth">
-  <!--
-		This is a "MyConcern ThinkIt Demo Site" Shibboleth SP for One Team Logic Ltd.
-	-->
-  <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="2014-11-14T10:50:02Z">
-      <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://thinkit.oneteamlogic.co.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">MyConcern ThinkIt Demo Site</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The MyConcern ThinkIt Demo Site is used for demonstrations
-				</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAgygAwIBAgIJAMwlTWVQn6vNMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-						BAMTH21jczAxLmRlbW9hZC5vbmV0ZWFtbG9naWMuY28udWswHhcNMTQxMTEyMTUz
-						MDUwWhcNMjQxMTA5MTUzMDUwWjAqMSgwJgYDVQQDEx9tY3MwMS5kZW1vYWQub25l
-						dGVhbWxvZ2ljLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						r1P9vVNqzEtb9Adrua0kwQ/eI++2FtfJPvxdUx7VZ/AihxkJ8bFdR4SCmPcCm2l6
-						NIuX5RzpFW84p77G9tmpVqKHRDIgm3+zFHuJu+4HIYpNGrtSHr0URRdzLzkqgsYz
-						2N1zkYdH20kMonR8H7DU9iJ+fuqiEmiUTuLjyFYJkDG5KvWseSK7ddrbOFRfj1+g
-						xFHg3G9dHSHXggaKXMJFS1jpZU0rRf1WLmRDxIwyAHjGCM6Jc1eHP6P+iXQaqNtn
-						NCF7LSOOQ0pHLMxaGmEHFsA/gCqtQLsQ3Tz/FI/aD+gDqH7uddQZc7MwWYyVwk86
-						45OYCIefIeg+cV33XFpNuQIDAQABo00wSzAqBgNVHREEIzAhgh9tY3MwMS5kZW1v
-						YWQub25ldGVhbWxvZ2ljLmNvLnVrMB0GA1UdDgQWBBRxX7MmM9QRHXRlA9tBztn1
-						Fprx4jANBgkqhkiG9w0BAQUFAAOCAQEAM68P0rnO7aXyvV8X5AKMtHJqpat4equg
-						eseVbcQi3PbVPh5eJgZa8fUK4LU8qFSHbz78TmvVaTD2gOfNA9LfY+TMQMK+y16t
-						Bz694/fpbNY6ztfD/+Hsexk2X0zn9nXnf2qNQIbLIzau5u+oEYGgzxQkxaC2VeI0
-						qy55H4npVR38eppq7qWkGZrlEGM8MnBrRNGqIBrHb4luiGcGwsB5K1G89SSdYJkG
-						gmKz4CPKwjUCQW4MdGQoj8YWCj9Bs8brseOcDP8JGeYZau1VeiUR7ZPR/nOZFKc/
-						+wLoAUq6JcuHgpkOdZm8cimD8N5DZAbauTyOqJB9pI7GYiWazj5GkA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://thinkit.oneteamlogic.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://thinkit.oneteamlogic.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">One Team Logic Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MyConcern ThinkIt Demo Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oneteamlogic.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nick</GivenName>
-    <SurName>Bennett</SurName>
-    <EmailAddress>mailto:nick.bennett@logicsoftware.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Tucker</SurName>
-    <EmailAddress>mailto:ian.tucker@logicsoftware.co.uk</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 03fe5daa..00000000
--- a/swamid-interfederations-2.0/ticket.iop.org-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://ticket.iop.org/shibboleth">
-  <!--
-		This is a "IOP online services" Shibboleth SP for IOP Publishing Limited.
-	-->
-  <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>Estela</GivenName>
-    <SurName>Garcia</SurName>
-    <EmailAddress>mailto:estela.garcia@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 0319a419..00000000
--- a/swamid-interfederations-2.0/ticket.iop.org.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ticket.iop.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ticket.iop.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ticket.iop.org,OU=Member\, VeriSign Trust Network,OU=Authenticated by VeriSign,OU=Terms of use at www.verisign.co.uk/rpa (c)05,O=IOP Publishing Ltd,L=Bristol,ST=Avon,C=GB</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFejCCBGKgAwIBAgIQRs9QFKCMIHlnWILL+H/kMjANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTEwMzA5
-MDAwMDAwWhcNMTIwNDA2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
-BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
-IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
-ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
-JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
-AxQOdGlja2V0LmlvcC5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK0k
-vYlzSH7vvdi1wquPhBap5XOkZbXSTzxFauceC62qdw2xOwCJW+N8VPliT2bF0+Ic
-uqBRWXRoF7+z5aJWf7Zrq4XjxlJVd0TkiNGSXRY7IA7c2ciNPS8YP+iVrjoHcO0N
-9JFZkfuqnFdajf6exlCe0ZpW9Q/i9QUBglS8oeQhAgMBAAGjggHTMIIBzzAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZS
-U2VjdXJlLUczLWNybC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1Ud
-IAQ/MD0wOwYLYIZIAYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cu
-dmVyaXNpZ24uY28udWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAfBgNVHSMEGDAWgBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRq
-MGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEF
-BQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNl
-Y3VyZUczLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYw
-ITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9n
-by52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBABp/
-vWyJLNePxfNv1kLP9w2F5O6vpJr/y4NuH/Wv5LpJinN9KZ6Jht7zC2g7VaGvA75+
-bb95cQ43uJ8KpOMmsaQ4vapwAZLxW/twUMUh2qbUmlmBnkKBPNZxzCRcNmhKOAfe
-ngqzUjEo/eZpsFfuvg9d/9L1od5kDfGFr4OFeN+Tin7zHoKbRv129NyIwLhaSixA
-t7LgIqlDQ4PRHCg0YWsE1CBSzSy+nWgDmWjcRIYeFoXve+wpsup3gtoBcxSKp6R5
-Zo/W8ldI1Yak/Rkmn/73b1cGG0uqRDWfOHiswnes/xjDIQS9qqJRlNFHd9jkHxwb
-Ny/fu2lNRrmtoPmTctI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>ticket.iop.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ticket.iop.org,OU=Member\, VeriSign Trust Network,OU=Authenticated by VeriSign,OU=Terms of use at www.verisign.co.uk/rpa (c)05,O=IOP Publishing Ltd,L=Bristol,ST=Avon,C=GB</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFejCCBGKgAwIBAgIQRs9QFKCMIHlnWILL+H/kMjANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTEwMzA5
-MDAwMDAwWhcNMTIwNDA2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
-BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
-IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
-ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
-JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
-AxQOdGlja2V0LmlvcC5vcmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK0k
-vYlzSH7vvdi1wquPhBap5XOkZbXSTzxFauceC62qdw2xOwCJW+N8VPliT2bF0+Ic
-uqBRWXRoF7+z5aJWf7Zrq4XjxlJVd0TkiNGSXRY7IA7c2ciNPS8YP+iVrjoHcO0N
-9JFZkfuqnFdajf6exlCe0ZpW9Q/i9QUBglS8oeQhAgMBAAGjggHTMIIBzzAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZS
-U2VjdXJlLUczLWNybC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1Ud
-IAQ/MD0wOwYLYIZIAYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cu
-dmVyaXNpZ24uY28udWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-AjAfBgNVHSMEGDAWgBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRq
-MGgwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEF
-BQcwAoY0aHR0cDovL1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNl
-Y3VyZUczLmNlcjBuBggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYw
-ITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9n
-by52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBABp/
-vWyJLNePxfNv1kLP9w2F5O6vpJr/y4NuH/Wv5LpJinN9KZ6Jht7zC2g7VaGvA75+
-bb95cQ43uJ8KpOMmsaQ4vapwAZLxW/twUMUh2qbUmlmBnkKBPNZxzCRcNmhKOAfe
-ngqzUjEo/eZpsFfuvg9d/9L1od5kDfGFr4OFeN+Tin7zHoKbRv129NyIwLhaSixA
-t7LgIqlDQ4PRHCg0YWsE1CBSzSy+nWgDmWjcRIYeFoXve+wpsup3gtoBcxSKp6R5
-Zo/W8ldI1Yak/Rkmn/73b1cGG0uqRDWfOHiswnes/xjDIQS9qqJRlNFHd9jkHxwb
-Ny/fu2lNRrmtoPmTctI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ticket.iop.org/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rdcdev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rdcdev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rdcdev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rdcdev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">IOP online services</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">IOP online services</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.iop.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Haworth</SurName>
-    <EmailAddress>peter.haworth@iop.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Matt</GivenName>
-    <SurName>Keen</SurName>
-    <EmailAddress>matthew.keen@iop.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Keith</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>keith.jones@iop.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-shibboleth.xml b/swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-shibboleth.xml
deleted file mode 100644
index 64668498..00000000
--- a/swamid-interfederations-2.0/tickets.sheffieldstudentsunion.com-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://tickets.sheffieldstudentsunion.com/shibboleth">
-  <!--
-		This is a "Sheffield Students Union Tickets" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-10-14T15:02: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>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tickets.sheffieldstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sheffield Students Union Tickets</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://tickets.sheffieldstudentsunion.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 55755290..00000000
--- a/swamid-interfederations-2.0/timetable.earth.ox.ac.uk-shibboleth-sp.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://timetable.earth.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is a Timetable Service Shibboleth 2 SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://timetable.earth.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOsQvmtCqbDkMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHRpbWV0YWJsZS5lYXJ0aC5veC5hYy51azAeFw0xMTAxMDYxNjU0MThaFw0y
-						MTAxMDMxNjU0MThaMCMxITAfBgNVBAMTGHRpbWV0YWJsZS5lYXJ0aC5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANNEwMterh/GkNFeH1Ox
-						jatg+8pug6Pr2Vyiu2+MLGUvpvhOA+4aHvxCYHTDR2yzWEwHkRILS3yA/B+QiW1y
-						jE4Wg259kMHXskPDdU+62T+tySdj5Hobx05oKGx1PxYy/d2KFzyLe5wfXdmWKrM3
-						dJHgrYIyY5bEOU5CpieAJJ/+Exfchmefht/NfRKV0bkkejvUg+IpdPwm9tSo7z5O
-						My+TYahe3/c5/KroVkcfDuoM1ACCRDsEI2NgBCCtVOYrfJN5F3+aVx58YVoOjC4n
-						4rbjfJDZs0VVJ3Up3B0OGsxAAIoCO8YUfoO50vjvhloqrIYFVLslV2iG0Gm817y3
-						6D0CAwEAAaNGMEQwIwYDVR0RBBwwGoIYdGltZXRhYmxlLmVhcnRoLm94LmFjLnVr
-						MB0GA1UdDgQWBBTG32OU9vtJWEvtMFERCWhc08NbJDANBgkqhkiG9w0BAQUFAAOC
-						AQEAzhSe/ubjNqjFP9MC5k4Fgu24Eqz2WyoiotA8dd2MKepsf0fEHxy6kB/E/lVO
-						aVvdYkRKINYmPbTeN/ylPEBwSVeN71OLBZ19fvMpB6J6lozKUNv+PrwfekSyUeCs
-						5j/pVm+vwWM4onyEUeWkTFmtXaj1tcWGfLSYtX1evbGskPMcReYNFTRKIOzRE0dS
-						KSF/1lKbLyDdcLr2P3aDc8DQYNK9WBiUuMmbN7w9RXp7pv5ZWefRYYVSVM2j6ccF
-						I2JAPf46KCAYCHz0xVbT9I0pJ3kqsy9OCiQfK0zbSCS+3xV4VALStOm8BiY/wDVm
-						/M5ANmyQkgK/JxOjRvUm4lHFeA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://timetable.earth.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Timetable Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Will</GivenName>
-    <SurName>Hanrott</SurName>
-    <EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Will</GivenName>
-    <SurName>Hanrott</SurName>
-    <EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index e8badcd8..00000000
--- a/swamid-interfederations-2.0/timetable2.earth.ox.ac.uk-shibboleth-sp.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://timetable2.earth.ox.ac.uk/shibboleth-sp">
-  <!--
-		This is a test Timetable Service Shibboleth 2 SP for the University of Oxford. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://timetable2.earth.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAIt5f6RWOLqKMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXRpbWV0YWJsZTIuZWFydGgub3guYWMudWswHhcNMTIwMjA3MTYwODQ3WhcN
-						MjIwMjA0MTYwODQ3WjAkMSIwIAYDVQQDExl0aW1ldGFibGUyLmVhcnRoLm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtVDJbATimnosBA7H
-						2bLDXbABcMxjl2JwjC11jxEtzzJZxMRf+Hy0L8onaK9XuLyGt0nqE1X0phVKiPXB
-						9yaZ27WCZYGa41PUYIbF6OLCzuCN73KGRy13tcIyiTjot4Bct3ixjaUze478MIHY
-						7cem/cIlIlw0qXmKHvhMcjr6hamLZX5r+WMp3+1N/7RQ5NrKZJ0qkKapKtnCQ0l/
-						dlhtsSISuxKpWQ6XJR5JTsrkdHUsfSbL7i+KTKfoS9XOpJZS2+S0yaeKaD/lT07M
-						yaaCzZCQhs1Rv1FYJOow62S2DeQpQGMNxCVca4BWxVbH7ACXnApVeVkuFfonQkz5
-						SOGJ1QIDAQABo0cwRTAkBgNVHREEHTAbghl0aW1ldGFibGUyLmVhcnRoLm94LmFj
-						LnVrMB0GA1UdDgQWBBT/Ae0zEanWYNZV9FQg/TGuXx8rLjANBgkqhkiG9w0BAQUF
-						AAOCAQEAPmCO0Vc7Z6wGpKj77kUjoV8rJHz02as0f1JJxM/wV4dsyNY3KDYuUiQt
-						fwWCC5GZtGxxtrTpu5OJYXm1YnfF/Zqdw+IQEuJR7ygSZqZkpuN62jr4GghM3fTW
-						UG6oj/WaicSHb8xnXdNcPdAZw5u2oOaGDFicC67OYdnQpJZq5ELysDrHIDi0fhNL
-						mf72wR0yuR5fwKs2rC4b9PQmeJm2uE+Zq4tCHEfjG8rv6/Pw95uZSbFcA7OUVyCZ
-						EC5oy39+ZN5oMHwTu3h+Hg28mpBpIHj4EejKL1GatXCiEYcOiLGSKK0X+fmzBbGk
-						/1fpdjYY8WLnlR3GF1QjWUraVSirjg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://timetable2.earth.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Timetable Service (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Will</GivenName>
-    <SurName>Hanrott</SurName>
-    <EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Will</GivenName>
-    <SurName>Hanrott</SurName>
-    <EmailAddress>mailto:will.hanrott@earth.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml b/swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.xml
deleted file mode 100644
index e308c067..00000000
--- a/swamid-interfederations-2.0/tkakin.nii.ac.jp-shibboleth-sp.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://tkakin.nii.ac.jp/shibboleth-sp">
-  <!--
-		This is a "CiNii test" Shibboleth SP for the National Institute of Informatics.
-	-->
-  <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-02-12T11:59:25Z"/>
-  </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://tkakin.nii.ac.jp/Shibboleth.sso/auth/action/shibLogin"/>
-      <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://tkakin.nii.ac.jp/Shibboleth.sso/auth/action/shibLogin" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEMDCCAxgCCQCgtKNkkJv8CzANBgkqhkiG9w0BAQUFADCB2TELMAkGA1UEBhMC
-						SlAxDjAMBgNVBAgMBVRva3lvMRMwEQYDVQQHDApDaGl5b2RhLWt1MSowKAYDVQQK
-						DCFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3MxOzA5BgNVBAsMMkN5
-						YmVyIFNjaWVuY2UgSW5mcmFzdHJ1Y3R1cmUgRGV2ZW9wbWVudCBEZXBhcnRtZW50
-						MRkwFwYDVQQDDBB0a2FraW4ubmlpLmFjLmpwMSEwHwYJKoZIhvcNAQkBFhJzeXMt
-						ZGVza0BuaWkuYWMuanAwHhcNMTMwMTI4MDI0MzU1WhcNMTgwMTI3MDI0MzU1WjCB
-						2TELMAkGA1UEBhMCSlAxDjAMBgNVBAgMBVRva3lvMRMwEQYDVQQHDApDaGl5b2Rh
-						LWt1MSowKAYDVQQKDCFOYXRpb25hbCBJbnN0aXR1dGUgb2YgSW5mb3JtYXRpY3Mx
-						OzA5BgNVBAsMMkN5YmVyIFNjaWVuY2UgSW5mcmFzdHJ1Y3R1cmUgRGV2ZW9wbWVu
-						dCBEZXBhcnRtZW50MRkwFwYDVQQDDBB0a2FraW4ubmlpLmFjLmpwMSEwHwYJKoZI
-						hvcNAQkBFhJzeXMtZGVza0BuaWkuYWMuanAwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-						DwAwggEKAoIBAQDPRGElRDorAQNGihyQfF6EQOjM5uuKsPMDO6PGX1pYU+gsNYJ+
-						QP7TwJMXEPu7lXLYWp/EuZF4TmJMz8V5PmAyEQHk6eDyUalXU6P5cDyeIcxYkal0
-						ThbKMf/v14tV3Kb0gkGH2G6RoGdrX5SYI0xdIGDOzxWoDHtsrA7oi2XRI6sR6In8
-						36eeX+8ByjabANQR+r4GvXRQucWqZ2PGKxsUtrPLmntxqTEcv4Lu3qvVg0l/COFC
-						DQi/4hK7hX2U88gHaelqiay9NOV6iliZV9N2SnB+VSqPYfAY9FpBTIUucNx884Ld
-						NintMgjJKZQJmo7ln/DvC+6Y+G4/1qXTHRXVAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-						ggEBAIdW+iDP7qZJU5xpImG72430mhd6DErjqrOj7uPDAFYJxS9Et41QZX1IFbC/
-						ZEc62CgXA7JXCtwnZoeqZ9DbySBtNKD2U6KqGlzFkS2luoIeRuBAtTxj7C13FSec
-						mkzVWGe5Zx6e6zf65bIQaNsIiOijMxJWd2t6RG/rkkEVk4cMrAQOG/JT9qV1Ts3e
-						aB3J/o1EJJH7yn19BaYNhXj5oUxwkC9WJpYHXTmN3KCcMiyfLbNO7DEE+t0G9ZqX
-						4Zyc42lx2nPIF7lCMjmydh184cZvZkmVL0oB+h8oqqdPpW0aINiFiqfRM3xlQcBG
-						sF+zFamYAWFcrdCjb0I6xYLkLgc=
-					</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://tkakin.nii.ac.jp/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tkakin.nii.ac.jp/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">National Institute of Informatics</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CiNii test (test SP for system migration)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nii.ac.jp/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Portal Service Unit</GivenName>
-    <EmailAddress>mailto:co_portal@nii.ac.jp</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Portal Service Unit</GivenName>
-    <EmailAddress>mailto:co_portal@nii.ac.jp</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 e74298c2..00000000
--- a/swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tonga.univ-tlse2.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université Toulouse 2 - Mirail</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACVklEQVQ4y52RTUhUYRSG3+/n3hk09VoOSrSYfojAhSNpkBtnqHaFBS1q1QwV7YpWLWXWESpCLaRmWkTtEiLCVVq6kxwxshBjrKwhpvF6nTtzf777fa2KGR1COrv3cJ6X855D8J818rwzDjg5vltgeLjH0JpYUmupXOF73BgRHhjnCbYb+M7VoTgl/BXluESY6qJMgTAJwuTa3w2Gni5Ho1TFDElyp3JL8SCsTSbSF8xbZ64nhWVnKFUgXIFqAjLkg+oMirEecuLZymsAsb1QxlES4OK7pRShJAMASqns7PtP5wvON0OPmAh1mKa2z5oOtZcXeavdxptcgzdDgQJGOyRCkDkQDP7ZihCS7D18CLMfK6hUyumyFR4dG58ya+PxIyTIUwBtUAhLFSUgfwc8T2BqbsW0fZGYWHySa3Qful/KmS4ZICQCeH5glHXNgOMDpTLyX9bghn6lJxbvNoQBgKYvd2cdV+SrnoDrBVilehT5n8B6CcUgn38wNz5aCyygM1pnAACOELcdT8DxBD60thp+YROkuIVjdsvj7bBgfKfB2LW+yYorUlVX4GzkPj73+EDVRYfdMlg7HGj6CKfK3GEAAI9unsxaZjU1EHmB0wMPsdxdgeIs/ubcvcwC2ox5/UAGBLFe/3vdPUit8F4iKRyW8Ysc3jrH1moEG4V+qPkc4LhQIkj0B+vTdW+sFb7JhwKbQZQYxCYFsS2EC2/heDogVapvG1wXAQCERU2/yOCXKPwNBmExyCqmpQwSx/2v2UZvJI2aP240x50iB4rIHZzZNPGP+g3XoQ6HfEwnbQAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo1OSswMjowMAlAiYEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NTkrMDI6MDB4HTE9AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-tlse2.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université Toulouse 2 - Mirail</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>
-					      MIIDNzCCAh+gAwIBAgIUQbZllpbGntiDN9DdmDU44ciWEDswDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTdG9uZ2EudW5pdi10bHNlMi5mcjAeFw0xNjAxMTMxMDUx
-NDJaFw0zNjAxMTMxMDUxNDJaMB4xHDAaBgNVBAMTE3RvbmdhLnVuaXYtdGxzZTIu
-ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCA0T3HP65ZGC0a/vYR
-0I+1PbrKIESr9B9GR+o5Xp0tZrWrfIicruZN9MQegbNFGljZZD7Rh+K+lAc88ldg
-vVtHQ4/TyKoQdJ9vr7pZulpX8GZvjqW5tzEKffgodD5DD5puavdOzZfjPpn9AfGn
-Zlh9j3Ieix8T6ljyXal0D6CKkDoSEh1UbR4qoPfKZMw03FnPhHqrrsh/rHCvnvay
-dq1oImc13egyht8doHXAiUV5dJVlZLM6cMhPG/CZaWKElRiRDousClWuW+oycuiE
-yGTfGux6Cx0XemrgcOsxfeLa21W5CgmsHlXU0TUoB46mogwQmEeadkVffES4KjTe
-F33rAgMBAAGjbTBrMEoGA1UdEQRDMEGCE3RvbmdhLnVuaXYtdGxzZTIuZnKGKmh0
-dHBzOi8vdG9uZ2EudW5pdi10bHNlMi5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUF1ZOiJWk610K3A3j3LD4dZnaNR4wDQYJKoZIhvcNAQEFBQADggEBAHMW515o
-pdz7jP3Zh3WL28+DKd3aHimRKPYVfj1A32BYwUo8WA1eDTwV0DZQ2fKG/UbEI74x
-xQMNMnXKw4vwAVpHPb0mqg/ggiFcwlCtNluVb/eIttP3IkIiL7fC1nHvJZuGXrrB
-4Fl+/rbzwXdoHdGbYU00pGFLjNo8tysxkUrPVM5Zay0J7BDovAsgPQpU2mda4fjU
-dsHfixpvq7vbAS6Oo+UR0zrKG8BEjeP2tFQ8Y7U7DLrATeJZvMn1qVbNB9X274Vu
-EDB2WEO1/Lcq5hSZZVBL8UGwoDmsn6qOW9t5/cyg/PUwB1ekdNWJvf6ctNIN1Xem
-Fy4XmXwhuCgSQF4=
-					    </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>
-					      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>
-    </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-POST" Location="https://tonga.univ-tlse2.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tonga.univ-tlse2.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tonga.univ-tlse2.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md: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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDNzCCAh+gAwIBAgIUQbZllpbGntiDN9DdmDU44ciWEDswDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTdG9uZ2EudW5pdi10bHNlMi5mcjAeFw0xNjAxMTMxMDUx
-NDJaFw0zNjAxMTMxMDUxNDJaMB4xHDAaBgNVBAMTE3RvbmdhLnVuaXYtdGxzZTIu
-ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCA0T3HP65ZGC0a/vYR
-0I+1PbrKIESr9B9GR+o5Xp0tZrWrfIicruZN9MQegbNFGljZZD7Rh+K+lAc88ldg
-vVtHQ4/TyKoQdJ9vr7pZulpX8GZvjqW5tzEKffgodD5DD5puavdOzZfjPpn9AfGn
-Zlh9j3Ieix8T6ljyXal0D6CKkDoSEh1UbR4qoPfKZMw03FnPhHqrrsh/rHCvnvay
-dq1oImc13egyht8doHXAiUV5dJVlZLM6cMhPG/CZaWKElRiRDousClWuW+oycuiE
-yGTfGux6Cx0XemrgcOsxfeLa21W5CgmsHlXU0TUoB46mogwQmEeadkVffES4KjTe
-F33rAgMBAAGjbTBrMEoGA1UdEQRDMEGCE3RvbmdhLnVuaXYtdGxzZTIuZnKGKmh0
-dHBzOi8vdG9uZ2EudW5pdi10bHNlMi5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUF1ZOiJWk610K3A3j3LD4dZnaNR4wDQYJKoZIhvcNAQEFBQADggEBAHMW515o
-pdz7jP3Zh3WL28+DKd3aHimRKPYVfj1A32BYwUo8WA1eDTwV0DZQ2fKG/UbEI74x
-xQMNMnXKw4vwAVpHPb0mqg/ggiFcwlCtNluVb/eIttP3IkIiL7fC1nHvJZuGXrrB
-4Fl+/rbzwXdoHdGbYU00pGFLjNo8tysxkUrPVM5Zay0J7BDovAsgPQpU2mda4fjU
-dsHfixpvq7vbAS6Oo+UR0zrKG8BEjeP2tFQ8Y7U7DLrATeJZvMn1qVbNB9X274Vu
-EDB2WEO1/Lcq5hSZZVBL8UGwoDmsn6qOW9t5/cyg/PUwB1ekdNWJvf6ctNIN1Xem
-Fy4XmXwhuCgSQF4=
-					    </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>
-					      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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tonga.univ-tlse2.fr/idp/profile/SAML1/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">Université Toulouse 2 - Mirail</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Toulouse 2 - Mirail</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-tlse2.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>sos-ent@univ-tlse2.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/topdesk-training.test.bath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/topdesk-training.test.bath.ac.uk-shibboleth.xml
deleted file mode 100644
index daf26dd6..00000000
--- a/swamid-interfederations-2.0/topdesk-training.test.bath.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://topdesk-training.test.bath.ac.uk/shibboleth">
-  <!--
-		This is a "TopDesk (training)" Shibboleth SP for the University of Bath.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-23T14:21:31Z">
-      <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://topdesk-training.test.bath.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">University of Bath: TopDesk (training)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Service provider for TopDesk (training) at the University of Bath</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAN5QrRKGCEmMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXBhbmFjZWEuY2FtcHVzLmJhdGguYWMudWswHhcNMTQwMjEwMTI1NTA5WhcN
-						MjQwMjA4MTI1NTA5WjAkMSIwIAYDVQQDExlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jtCtknVQDfj1rUp
-						yC1ni1iw6gmg5JnWDZlH14IvmOd6QR2KcMmoi8lkGM35bGeNZcj3OaxNIA/djk9C
-						F4SI0IbEd++TkLzg17pD3ZJQ3Bt3rST4epdDEaPmXjBEmIMFoRcVlLS1nH4URy3s
-						AsTrJdaIsEJJRCVpzu08J9Y7G7Lada2h1S+DPnE94KDXTucKbh3xP5YkA6flQidD
-						1zwJbY+KKNqSFW/+vjPhR19xcxyjiO8Wq5Vo+LOugX5gr/30aegPz52J6pWUBTPz
-						yZMAj68vOqtE6Zyy9e7couwh+gOhlyTO3mTIgbGKbnDzky904AnoWg1oHds917Rw
-						k6NwTwIDAQABo0cwRTAkBgNVHREEHTAbghlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
-						LnVrMB0GA1UdDgQWBBQfl7jnvLvliJGVVM2kOi/XeSG4AjANBgkqhkiG9w0BAQUF
-						AAOCAQEAfszE8GhCifTJ5ns829wqfmIgEU+/+Sj1B8JMEkIwDLy9tk326iU3mLLS
-						lmWxRMz61r9AxcQPDL3CQEOFdR0oGPOgJEreKeJM4xuKsxHWpB7vVea5qSzFKVd0
-						0Kk5u+NrjbvwHdYJptMoyUnV5lFrxKANSBLX8INj2goKs+PCJQ+ejNrcBjkRyWkA
-						NlDAeabwzpKMrIhBlUaom6nPBZsxORqI1nkE0Nga7rrV76BXDSNJ9AnmXNRoBVQA
-						KbRKfzx3m5xJpUI2zRa4ixOMwzqAaYD6/SqNeaLKdzUzjVypOQSB4oYF/6rU+m66
-						qFMMOfKg7++8v5BKcO9HrVptqPcsuA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topdesk-training.test.bath.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Bath</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bath: TopDesk (training)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://topdesk-training.test.bath.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Webmaster</GivenName>
-    <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Phillips</SurName>
-    <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml
deleted file mode 100644
index fee0d6ff..00000000
--- a/swamid-interfederations-2.0/topdesk.bath.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://topdesk.bath.ac.uk/shibboleth">
-  <!--
-		This is a "Topdesk" Shibboleth SP for the University of Bath.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-25T10:10:19Z">
-      <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://topdesk.bath.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Bath: TopDesk</mdui:DisplayName>
-        <mdui:Description xml:lang="en">TopDesk Service Desk Service Management facility for problem submission and support</mdui:Description>
-        <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAN5QrRKGCEmMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXBhbmFjZWEuY2FtcHVzLmJhdGguYWMudWswHhcNMTQwMjEwMTI1NTA5WhcN
-						MjQwMjA4MTI1NTA5WjAkMSIwIAYDVQQDExlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jtCtknVQDfj1rUp
-						yC1ni1iw6gmg5JnWDZlH14IvmOd6QR2KcMmoi8lkGM35bGeNZcj3OaxNIA/djk9C
-						F4SI0IbEd++TkLzg17pD3ZJQ3Bt3rST4epdDEaPmXjBEmIMFoRcVlLS1nH4URy3s
-						AsTrJdaIsEJJRCVpzu08J9Y7G7Lada2h1S+DPnE94KDXTucKbh3xP5YkA6flQidD
-						1zwJbY+KKNqSFW/+vjPhR19xcxyjiO8Wq5Vo+LOugX5gr/30aegPz52J6pWUBTPz
-						yZMAj68vOqtE6Zyy9e7couwh+gOhlyTO3mTIgbGKbnDzky904AnoWg1oHds917Rw
-						k6NwTwIDAQABo0cwRTAkBgNVHREEHTAbghlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
-						LnVrMB0GA1UdDgQWBBQfl7jnvLvliJGVVM2kOi/XeSG4AjANBgkqhkiG9w0BAQUF
-						AAOCAQEAfszE8GhCifTJ5ns829wqfmIgEU+/+Sj1B8JMEkIwDLy9tk326iU3mLLS
-						lmWxRMz61r9AxcQPDL3CQEOFdR0oGPOgJEreKeJM4xuKsxHWpB7vVea5qSzFKVd0
-						0Kk5u+NrjbvwHdYJptMoyUnV5lFrxKANSBLX8INj2goKs+PCJQ+ejNrcBjkRyWkA
-						NlDAeabwzpKMrIhBlUaom6nPBZsxORqI1nkE0Nga7rrV76BXDSNJ9AnmXNRoBVQA
-						KbRKfzx3m5xJpUI2zRa4ixOMwzqAaYD6/SqNeaLKdzUzjVypOQSB4oYF/6rU+m66
-						qFMMOfKg7++8v5BKcO9HrVptqPcsuA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topdesk.bath.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Bath</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bath: TopDesk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://topdesk.bath.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Webmaster</GivenName>
-    <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Phillips</SurName>
-    <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/topdesk.test.bath.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/topdesk.test.bath.ac.uk-shibboleth.xml
deleted file mode 100644
index d17b56c2..00000000
--- a/swamid-interfederations-2.0/topdesk.test.bath.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://topdesk.test.bath.ac.uk/shibboleth">
-  <!--
-		This is a "TopDesk" Test Shibboleth SP for the University of Bath.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-11T12:51:32Z">
-      <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://topdesk.test.bath.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Bath: TopDesk</mdui:DisplayName>
-        <mdui:Description xml:lang="en">TopDesk Service Desk Service Management facility for problem submission and support</mdui:Description>
-        <mdui:Logo height="64" width="159">https://auth.bath.ac.uk/images/mdui-logo-trans.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAN5QrRKGCEmMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXBhbmFjZWEuY2FtcHVzLmJhdGguYWMudWswHhcNMTQwMjEwMTI1NTA5WhcN
-						MjQwMjA4MTI1NTA5WjAkMSIwIAYDVQQDExlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jtCtknVQDfj1rUp
-						yC1ni1iw6gmg5JnWDZlH14IvmOd6QR2KcMmoi8lkGM35bGeNZcj3OaxNIA/djk9C
-						F4SI0IbEd++TkLzg17pD3ZJQ3Bt3rST4epdDEaPmXjBEmIMFoRcVlLS1nH4URy3s
-						AsTrJdaIsEJJRCVpzu08J9Y7G7Lada2h1S+DPnE94KDXTucKbh3xP5YkA6flQidD
-						1zwJbY+KKNqSFW/+vjPhR19xcxyjiO8Wq5Vo+LOugX5gr/30aegPz52J6pWUBTPz
-						yZMAj68vOqtE6Zyy9e7couwh+gOhlyTO3mTIgbGKbnDzky904AnoWg1oHds917Rw
-						k6NwTwIDAQABo0cwRTAkBgNVHREEHTAbghlwYW5hY2VhLmNhbXB1cy5iYXRoLmFj
-						LnVrMB0GA1UdDgQWBBQfl7jnvLvliJGVVM2kOi/XeSG4AjANBgkqhkiG9w0BAQUF
-						AAOCAQEAfszE8GhCifTJ5ns829wqfmIgEU+/+Sj1B8JMEkIwDLy9tk326iU3mLLS
-						lmWxRMz61r9AxcQPDL3CQEOFdR0oGPOgJEreKeJM4xuKsxHWpB7vVea5qSzFKVd0
-						0Kk5u+NrjbvwHdYJptMoyUnV5lFrxKANSBLX8INj2goKs+PCJQ+ejNrcBjkRyWkA
-						NlDAeabwzpKMrIhBlUaom6nPBZsxORqI1nkE0Nga7rrV76BXDSNJ9AnmXNRoBVQA
-						KbRKfzx3m5xJpUI2zRa4ixOMwzqAaYD6/SqNeaLKdzUzjVypOQSB4oYF/6rU+m66
-						qFMMOfKg7++8v5BKcO9HrVptqPcsuA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topdesk.test.bath.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Bath</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Bath: TopDesk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://topdesk.test.bath.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Webmaster</GivenName>
-    <EmailAddress>mailto:webmaster@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Phillips</SurName>
-    <EmailAddress>mailto:R.I.Phillips@bath.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index 46941e99..00000000
--- a/swamid-interfederations-2.0/topsy.ncl.ac.uk-shibboleth-metadata.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://topsy.ncl.ac.uk/shibboleth/metadata">
-  <!--
-		This is a Shibboleth SP for the University of Newcastle upon Tyne.
-	-->
-  <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="2015-12-09T15:37:31Z">
-      <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://topsy.ncl.ac.uk:7034/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJAPBsTOlcp3T8MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3RvcHN5Lm5jbC5hYy51azAeFw0xNTExMDIwODU0MzVaFw0yNTEwMzAwODU0
-						MzVaMBoxGDAWBgNVBAMTD3RvcHN5Lm5jbC5hYy51azCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAKDhYFk6OSQnhkHbK1COfMG79uS7/1DgsBv9kzGrhZsA
-						a0xW/VyH5k7zSsxKHahopVaoYiMJx/P7xd5EhT5zE2qlhY4kMUOpQJHn0liHgz/0
-						8IYtWo/Y0hB9g8QfseEJw/w3gqvEioU4W6ZHNlBVGPkjhUNM4zMpJ7B5katrMpPV
-						rFt+EV03n+zvEe4pJDf1qurX5zx1uiCVgRHGSY/QJMtgRKGjghJfKNSb2+9tR0ul
-						zIMnjB4L9jpETY1tOSUUBxw1C1f2rBR+NQJgwHdljlJmmcFNKveOVGFAM5x3dKzN
-						V2TIEqIUGXmopMMC8yFwgYjckazN6Hssje5mHSRwt6sCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPdG9wc3kubmNsLmFjLnVrMB0GA1UdDgQWBBR7WDIAYoOL7Km73avRDBiM
-						49zBFDANBgkqhkiG9w0BAQUFAAOCAQEAamTJ45UEzWN+1vLtwjgBQYOIraSShWkZ
-						Rej6vEP3UCcqU+c6D00Z0SCXx4/DE/q/l5brFpL4BLlxpBKVyMVu/mb2wKmIbfYa
-						I6NnDKjrLbnTCM9ADugLNK2ZVOIYMm5fgUc9mDKJRSAbpfHQKCuIBChtqdP57pV7
-						zAPYERoof+5Oi3prf8vgh0nEgFA/prgbSMEuglsrJyvkKGDNAtjeUWQRSjyvbRKe
-						Y0z2EV2wo0KW+VslQnBrD671nwFn+mblKs7fcPj73bKOcWn9zkF5jMSvIwNY/mXl
-						dcIZsmnjhF5GCaYywNqr7GIHRaTzghpCWRYepkoaXLxoq3mKXOsdAg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://topsy.ncl.ac.uk:7034/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topsy.ncl.ac.uk:7034/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newcastle University HPC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Beaty</SurName>
-    <EmailAddress>mailto:michael.beaty@newcastle.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Beaty</SurName>
-    <EmailAddress>mailto:michael.beaty@newcastle.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/topup.chch.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/topup.chch.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 63cbc3be..00000000
--- a/swamid-interfederations-2.0/topup.chch.ox.ac.uk-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://topup.chch.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Christ Church College Meal Booking System" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2015-01-08T15:01: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://topup.chch.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOgjayHP9ZbqMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGFzbWVhbHMuY2hjaGxhbi5veC5hYy51azAeFw0xNTAxMDcxMDAwMzFaFw0y
-						NTAxMDQxMDAwMzFaMCMxITAfBgNVBAMTGGFzbWVhbHMuY2hjaGxhbi5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANULnFykGUp7Gti10dcY
-						zKK5yeuxhTBxHfbr5nU/kIAouD5tqfottb6f2jfQRPXmmnLhx7jNzqzDQzvngZ1M
-						ZsfduI3IVItK4C6Emk5ddICmJXNWjMlidecTg8cWZpvb17FTdEUaHEdHXRFP6bdJ
-						n+oz0opigSuiBars6m8vxrw4uFaOPs3vKYzB5ac+COwQb5QjSBF6lhDG6IRvbAIh
-						7O+SYCOOTai7NAO5Hq4o7K6eRBizPQS/vInf+VPGX5NJXCACEjoXqsmxccm39Vfl
-						iofR6AOuwMcz7p0eGZYNgIWFohvRbRYF+PIY5Z3TLztK6wIzdn5UUQ+gtaejE16n
-						4mECAwEAAaNGMEQwIwYDVR0RBBwwGoIYYXNtZWFscy5jaGNobGFuLm94LmFjLnVr
-						MB0GA1UdDgQWBBRX0XxbsGyStcfpI1hR45KbWnfLLDANBgkqhkiG9w0BAQUFAAOC
-						AQEAVyfnZcfyh0wsGNQ9wnfflXfMsonJhECpnmT+8T7Lf/SPoPDtngnMuLA/xGIr
-						V8JCX+fO+uMnNlQjplb+VdLlNuI1w1/8gj4iw1osSxuDNaFX0Adaj6gsvEz2KLVt
-						j7OYdUoz+4QXoUNIfQ50P7Duc+No6/zmMIB9waCv3h/p6OLuMVQxJcMILMBGDl4z
-						p3Rvub4/tSm9TQrhcRfSD0Q2l+V7oErCOURmKkW+m3s0WTAdKUq2if3+lt7EeY38
-						SiU31D5xFUn5dIWaQYGhRkMJXZUEZeQvyRh4Tccj7KvZp6ukijIrPK3FPrvc6NoQ
-						PLpKazbWprz6PaLBp/jrAHGCLw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://topup.chch.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://topup.chch.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Christ Church College Meal Booking System</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.chch.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mike</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:support@chch.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mike</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:support@chch.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/training.nicurriculum.org.uk-shibboleth.xml b/swamid-interfederations-2.0/training.nicurriculum.org.uk-shibboleth.xml
deleted file mode 100644
index c59e21db..00000000
--- a/swamid-interfederations-2.0/training.nicurriculum.org.uk-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://training.nicurriculum.org.uk/shibboleth">
-  <!--
-		This is a CCEA VLE Shibboleth SP for the Northern Ireland Council for the Curriculum Examinations and Assessment.
-	-->
-  <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-07-16T15:33:11Z"/>
-  </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://training.ccea.org.uk/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://training.ccea.org.uk/Shibboleth.sso/WAYF"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://training.ccea.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://training.ccea.org.uk/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://training.ccea.org.uk/Shibboleth.sso/Login1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAM1uIbHlDY9TMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHRyYWluaW5nLmNjZWEub3JnLnVrMB4XDTEyMTEwNzExMTgxM1oXDTIyMTEw
-						NTExMTgxM1owHzEdMBsGA1UEAxMUdHJhaW5pbmcuY2NlYS5vcmcudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlpY86D7QHaObXoklR20+kjJzdQYfi
-						94QcGWeku6T24AvaJ33sHEilrvnRDfgm4aJpMaA5XxSyOzsWTRCu18T/jiBKFYvh
-						TQVYp8hdAog9GMjICrXqPARXwJQBOkQSJwQxozIxgABLzuxZetvv/Bhdbq0rbpk7
-						1Bgcx7iX1FYj/eOzYLpx+l9cpSJqtb3vveDQLMGESE0epefMdDhCf5oPJCkntr4A
-						5+pvyZyqgCCpJGxmFXil1zfpO2Hz3R9GSvkgwMX3ZxHI/9Zui7vF1bSLNTt50TKB
-						TfGsbVyWz06y/Y0e17HEP7J9AxNfO/8vowDUv0QLyaAFHnEkcYMGiIS9AgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFHRyYWluaW5nLmNjZWEub3JnLnVrMB0GA1UdDgQWBBTy
-						KmW+2gMYROrJikMsR2nPRYvbtjANBgkqhkiG9w0BAQUFAAOCAQEARKJcpoJ/AZbu
-						PAhqAR7v25TlONn/XQj5c6lES7TI1qPpCQ/5VsraIwKJDkbLO6Zv4DS0nVkepvaM
-						fAK6gPv9p5zT0VDJZQCFgB3CYxRMxlnrD885lMdETSPyiZnoyWjjBTB22fFJDeFy
-						1928iTJpB3Svjx81XAhbf71yAfcuTweb07W8cPgML47+4/NyaDdvWqClT8tebq/W
-						3ifzVDlGcQqf9eN6FyLVYWaj6Md/kiF0lae0FjLYgqYX0OD65HDgcWNGVEgHD/3y
-						JHaQ6tFjNL4fGdsNXQftF1JkcqTLZts4USDG8yFKxyN2VODC1DcjSAbm33sJpo9J
-						ceK3gd6V5Q==
-					</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://training.ccea.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://training.ccea.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://training.ccea.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://training.ccea.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://training.ccea.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://training.ccea.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://training.ccea.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://training.ccea.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://training.ccea.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://training.ccea.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Northern Ireland Council for the Curriculum Examinations and Assessment</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Northern Ireland Council for the Curriculum Examinations and Assessment: CCEA VLE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rewardinglearning.org.uk/about/index.asp</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Stephanie</GivenName>
-    <SurName>Doran</SurName>
-    <EmailAddress>mailto:sdoran@ccea.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>McAfee</SurName>
-    <EmailAddress>mailto:amcafee@ccea.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stephanie</GivenName>
-    <SurName>Doran</SurName>
-    <EmailAddress>mailto:sdoran@ccea.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>McAfee</SurName>
-    <EmailAddress>mailto:amcafee@ccea.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/translation.rnd.feide.no.xml b/swamid-interfederations-2.0/translation.rnd.feide.no.xml
deleted file mode 100644
index b88dfb39..00000000
--- a/swamid-interfederations-2.0/translation.rnd.feide.no.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://translation.rnd.feide.no/simplesaml/saml2/sp/metadata.php">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://translation.rnd.feide.no/simplesaml/saml2/sp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://translation.rnd.feide.no/simplesaml/saml2/sp/AssertionConsumerService.php" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Feide RnD Translation Portal</md:ServiceName>
-      <md:ServiceName xml:lang="no">Feide RnD Oversettelsesportal</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">A web portal for translation of software developed by Feide RnD, such that simpleSAMLphp and Foodle.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="no">En portal hvor man kan bidra med oversettelse av programvare utviklet av Feide RnD, slik som simpleSAMLphp og Foodle.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tullbommen.arcada.fi.xml b/swamid-interfederations-2.0/tullbommen.arcada.fi.xml
deleted file mode 100644
index 3278feca..00000000
--- a/swamid-interfederations-2.0/tullbommen.arcada.fi.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns: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>MIIE5jCCA86gAwIBAgIQa3vG7hzvE9YGrscDYuR+kDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMTExMTAwMDAwMFoXDTEzMTExMDIzNTk1OVowgbwxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUwMDU1MDEPMA0GA1UECBMGTnlsYW5kMRQwEgYDVQQH
-EwtIZWxzaW5nZm9yczEkMCIGA1UECRMbSmFuLU1hZ251cyBKYW5zc29ucyBQbGF0
-cyAxMRowGAYDVQQKExFTdGlmdGVsc2VuIEFyY2FkYTEVMBMGA1UECxMMSVQtY2Vu
-dHJhbGVuMR0wGwYDVQQDExR0dWxsYm9tbWVuLmFyY2FkYS5maTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANQH+aKmTtif/TJBr2ulDcAwaZHT3/jmQEnG
-izqdL10Js9n55/LR02e9wX+FcJu9udhceIBkmDVOMEU4k7qN482mXOzygNYiTkFX
-9hpaucrNme5rrqbh194UiotedOuWdHdsGs30Y51IMd0wS5Mie2b7Y5WeklSdUtMG
-wWOoZydYhKyTsPFJa8kkjlyKtrBD5ErfJ5dBKOD9VelZBhVNqEt73fxVpnstTZwt
-40nQ7aKm/ksRczmYtfspJsj79pI51eL7RZ0PtOFjOuMbVxbAhbxjBTUg0hm7XA6/
-Nz6vgvIiLHjAVooihE4eIav90xvGDP2g5oKRouXZl0rg4faHWf8CAwEAAaOCAWcw
-ggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRj
-DXjemf9WFryJPUYPpw1QPfpnFjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAfBgNVHREEGDAW
-ghR0dWxsYm9tbWVuLmFyY2FkYS5maTANBgkqhkiG9w0BAQUFAAOCAQEAW0MOCRCS
-3BfMa0MKrfWtgWIbtQT9LxpIKEx9AE4C9cmBws8TLrwzXHVwnt7uTS5JMxSm2d35
-JSowjUXv+shLSw3d5DWxK/19Rl9mELZm5FyYOau0nGzMp53oA8n0snbgsnCAjYCI
-B394SK5MjW/MdE68L/5ZCm7ediMFdbEwabzTMCixHPaM9PYW6dGzujI4yQhAb+Eh
-vl55iqhWUxcWYGhm03x0VRPN6w7ICRoYCpM+SoemdR5EfXk0gB5tu2qLCKoH36+z
-+EC4Jn8FfKOqAY6L4xsGIJqlrQv8ObOz6q010EpbrXvBapKHiDVTcM9tc2Jg9MQ+
-zQgT271kaFblsw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <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 4fbc1b5c..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tumidp.lrz.de/idp/shibboleth">
-  <md: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>
-  </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">tum.de</shibmd: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.de: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://tumidp.lrz.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tumidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tumidp.lrz.de/idp/profile/SAML2/POST/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">tum.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.de: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">e8</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e8</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Technische Universität München</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Technische Universität München</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.tum.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tum.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Ralf</md:GivenName>
-    <md:SurName>Ebner</md:SurName>
-    <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ralf</md:GivenName>
-    <md:SurName>Ebner</md:SurName>
-    <md:EmailAddress>mailto:shibboleth@lrz.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>TUM IT-Support</md:GivenName>
-    <md:SurName>TUM IT-Support</md:SurName>
-    <md:EmailAddress>mailto:it-support@tum.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 7e211e0e..00000000
--- a/swamid-interfederations-2.0/tumidp.lrz.de.xml
+++ /dev/null
@@ -1,217 +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="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,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTswDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMDI2MDk0MzEyWhcNMTQxMDI1MDk0MzEyWjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw10dW1pZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHFYDVLxJkQMa0O9r75gazc0
-9uHFNYCAC1WISUo/mT5zt+uqKcI7YM9ZlM4+m3HVYOrTyA42trMKHWqVgrOXwjCa
-QTSTKd1CGvheXPEEBjRJ7p/0+oHgEO7ECPreQFoAa03Vq/AOeu6GHn6J6sqNbvh1
-iZ1sU7Xk1od6TJMK3PjLuIQCz9+8TGDb9HtLkaoBdIWrn7kjYVBUxylgXlgDLr0+
-iRCnL26h0CfBKe0FUfgsDRT216OHzcKaptWD4ijequogVlauT2TXnpvjhjW4Odpx
-2YhcaVxIHhPUJ1/tMGAA/wpErqWOoBd95zHCH8SZy+TaD0505MTLCUW/US4/JQID
-AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRJ+v40ytJfXL0VVGkE2IUx+139
-IzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
-YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg10dW1pZHAubHJ6LmRlghZ0
-dW1pZHAubHJ6LW11ZW5jaGVuLmRlgg50dW1pZHAyLmxyei5kZYIXdHVtaWRwMi5s
-cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
-BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
-cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAG6mFOUSr/afsrXAByudj11f6ZTt4YTBxk6/HD6SGpUu
-29Fl70ezZZZdcjWNO8hquf3c0S2rcPRWtCTMDiYL1gG+K5E/7456ZVBFtJDXT07Y
-4nUWFC+CdbfhBrm5fmKsgCUKhVHWhNwI01zIZj+8mpk+F6pHz/gUpbhVhtdmU2Xj
-cTuvC723UZSK4747c2EAdcI2UFKvuPi4tYo535md+VWGhsY8WMvblCwKMWCiS5yC
-Uw9vDdL62vquCT+kmiAcpXNYIb4hEzOno2w2rydKwUsj2sC//e70mHcTwqWRZWWc
-AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTswDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMDI2MDk0MzEyWhcNMTQxMDI1MDk0MzEyWjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw10dW1pZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHFYDVLxJkQMa0O9r75gazc0
-9uHFNYCAC1WISUo/mT5zt+uqKcI7YM9ZlM4+m3HVYOrTyA42trMKHWqVgrOXwjCa
-QTSTKd1CGvheXPEEBjRJ7p/0+oHgEO7ECPreQFoAa03Vq/AOeu6GHn6J6sqNbvh1
-iZ1sU7Xk1od6TJMK3PjLuIQCz9+8TGDb9HtLkaoBdIWrn7kjYVBUxylgXlgDLr0+
-iRCnL26h0CfBKe0FUfgsDRT216OHzcKaptWD4ijequogVlauT2TXnpvjhjW4Odpx
-2YhcaVxIHhPUJ1/tMGAA/wpErqWOoBd95zHCH8SZy+TaD0505MTLCUW/US4/JQID
-AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRJ+v40ytJfXL0VVGkE2IUx+139
-IzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
-YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg10dW1pZHAubHJ6LmRlghZ0
-dW1pZHAubHJ6LW11ZW5jaGVuLmRlgg50dW1pZHAyLmxyei5kZYIXdHVtaWRwMi5s
-cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
-BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
-cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAG6mFOUSr/afsrXAByudj11f6ZTt4YTBxk6/HD6SGpUu
-29Fl70ezZZZdcjWNO8hquf3c0S2rcPRWtCTMDiYL1gG+K5E/7456ZVBFtJDXT07Y
-4nUWFC+CdbfhBrm5fmKsgCUKhVHWhNwI01zIZj+8mpk+F6pHz/gUpbhVhtdmU2Xj
-cTuvC723UZSK4747c2EAdcI2UFKvuPi4tYo535md+VWGhsY8WMvblCwKMWCiS5yC
-Uw9vDdL62vquCT+kmiAcpXNYIb4hEzOno2w2rydKwUsj2sC//e70mHcTwqWRZWWc
-AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
-</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>
-    <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="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,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTswDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMDI2MDk0MzEyWhcNMTQxMDI1MDk0MzEyWjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw10dW1pZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHFYDVLxJkQMa0O9r75gazc0
-9uHFNYCAC1WISUo/mT5zt+uqKcI7YM9ZlM4+m3HVYOrTyA42trMKHWqVgrOXwjCa
-QTSTKd1CGvheXPEEBjRJ7p/0+oHgEO7ECPreQFoAa03Vq/AOeu6GHn6J6sqNbvh1
-iZ1sU7Xk1od6TJMK3PjLuIQCz9+8TGDb9HtLkaoBdIWrn7kjYVBUxylgXlgDLr0+
-iRCnL26h0CfBKe0FUfgsDRT216OHzcKaptWD4ijequogVlauT2TXnpvjhjW4Odpx
-2YhcaVxIHhPUJ1/tMGAA/wpErqWOoBd95zHCH8SZy+TaD0505MTLCUW/US4/JQID
-AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRJ+v40ytJfXL0VVGkE2IUx+139
-IzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
-YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg10dW1pZHAubHJ6LmRlghZ0
-dW1pZHAubHJ6LW11ZW5jaGVuLmRlgg50dW1pZHAyLmxyei5kZYIXdHVtaWRwMi5s
-cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
-BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
-cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAG6mFOUSr/afsrXAByudj11f6ZTt4YTBxk6/HD6SGpUu
-29Fl70ezZZZdcjWNO8hquf3c0S2rcPRWtCTMDiYL1gG+K5E/7456ZVBFtJDXT07Y
-4nUWFC+CdbfhBrm5fmKsgCUKhVHWhNwI01zIZj+8mpk+F6pHz/gUpbhVhtdmU2Xj
-cTuvC723UZSK4747c2EAdcI2UFKvuPi4tYo535md+VWGhsY8WMvblCwKMWCiS5yC
-Uw9vDdL62vquCT+kmiAcpXNYIb4hEzOno2w2rydKwUsj2sC//e70mHcTwqWRZWWc
-AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <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,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTswDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMDI2MDk0MzEyWhcNMTQxMDI1MDk0MzEyWjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw10dW1pZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHFYDVLxJkQMa0O9r75gazc0
-9uHFNYCAC1WISUo/mT5zt+uqKcI7YM9ZlM4+m3HVYOrTyA42trMKHWqVgrOXwjCa
-QTSTKd1CGvheXPEEBjRJ7p/0+oHgEO7ECPreQFoAa03Vq/AOeu6GHn6J6sqNbvh1
-iZ1sU7Xk1od6TJMK3PjLuIQCz9+8TGDb9HtLkaoBdIWrn7kjYVBUxylgXlgDLr0+
-iRCnL26h0CfBKe0FUfgsDRT216OHzcKaptWD4ijequogVlauT2TXnpvjhjW4Odpx
-2YhcaVxIHhPUJ1/tMGAA/wpErqWOoBd95zHCH8SZy+TaD0505MTLCUW/US4/JQID
-AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRJ+v40ytJfXL0VVGkE2IUx+139
-IzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
-YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg10dW1pZHAubHJ6LmRlghZ0
-dW1pZHAubHJ6LW11ZW5jaGVuLmRlgg50dW1pZHAyLmxyei5kZYIXdHVtaWRwMi5s
-cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
-BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
-cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAG6mFOUSr/afsrXAByudj11f6ZTt4YTBxk6/HD6SGpUu
-29Fl70ezZZZdcjWNO8hquf3c0S2rcPRWtCTMDiYL1gG+K5E/7456ZVBFtJDXT07Y
-4nUWFC+CdbfhBrm5fmKsgCUKhVHWhNwI01zIZj+8mpk+F6pHz/gUpbhVhtdmU2Xj
-cTuvC723UZSK4747c2EAdcI2UFKvuPi4tYo535md+VWGhsY8WMvblCwKMWCiS5yC
-Uw9vDdL62vquCT+kmiAcpXNYIb4hEzOno2w2rydKwUsj2sC//e70mHcTwqWRZWWc
-AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
-</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>
-  </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 94609c19..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 ADFS SP for GÉANT 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">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</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 ce2d4926..00000000
--- a/swamid-interfederations-2.0/uat-adfs.geant.net.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="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">
-    <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"/>
-  </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 a9d5454a..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 GÉANT 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">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dante.net</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>GÉANT IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat-nsuk.elsevieremea.com-oa-metadata.xml b/swamid-interfederations-2.0/uat-nsuk.elsevieremea.com-oa-metadata.xml
deleted file mode 100644
index ab12b317..00000000
--- a/swamid-interfederations-2.0/uat-nsuk.elsevieremea.com-oa-metadata.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://uat-nsuk.elsevieremea.com/oa/metadata">
-  <!--
-		This is an 'Elsevier Clinical Skills' UAT OpenAthens SP for Elsevier B.V.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-18T15:51:46Z"/>
-  </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>
-						MIIDgjCCAmqgAwIBAgIJAIPaQ409Yt0iMA0GCSqGSIb3DQEBBQUAMDQxDjAMBgNV
-						BAoTBU1OU1VLMSIwIAYDVQQDExl1YXQtbnN1ay5lbHNldmllcmVtZWEuY29tMB4X
-						DTEyMTEyOTAyNTIxM1oXDTIyMTEyNzAyNTIxM1owNDEOMAwGA1UEChMFTU5TVUsx
-						IjAgBgNVBAMTGXVhdC1uc3VrLmVsc2V2aWVyZW1lYS5jb20wggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDhnZp/bmCr/TQS5osRk8lfgcUeGptgZSid/7fI
-						LYQUzL1Dsl3hXmfucOS/Db+De0TqEFwkxZ2kf4qxn91X/rFnqWGiRfTy1LOFc5MW
-						eZ2XdU36cfq2Gt8Wq/bF0lVgvPqqM9z4b0fgMt3xMta9XHJXRE/HFSAuJ77FpDUw
-						YkCTIIzUvFPimdEFpSyltqlO0r77a2nrvGgDA0FwYYwQ0iRKT16RANcRAL07pzWe
-						1ECO4H79bvuDyeYmeHCNTbQ4lovqEjeGgu+I0i+jf2pod6KX6ILaPXPjWdZPW+u2
-						CTTqnDPt2oBmQJHHibn2r7yPPIXz2UlzT4u1/xSqMZu82n/vAgMBAAGjgZYwgZMw
-						HQYDVR0OBBYEFElTHK+kxkQmCYiclyw5swDyhIqEMGQGA1UdIwRdMFuAFElTHK+k
-						xkQmCYiclyw5swDyhIqEoTikNjA0MQ4wDAYDVQQKEwVNTlNVSzEiMCAGA1UEAxMZ
-						dWF0LW5zdWsuZWxzZXZpZXJlbWVhLmNvbYIJAIPaQ409Yt0iMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBAJPUl/JrhkaUwhHrrTzP9IojhhX/2lumXjNL
-						OIGtDF0A0yMuq6OuRwrQ6IEvCTgXNOpIZShkbzPPWR0YF240zLB3IobMDpfH8G1r
-						lycsXjuhgAT4oluZg08Ogs4EpzlQfxmzsiL8a+NV7JasoksJll1yZnHCt1BmaNZx
-						76fl5ti7eOha51lhC0p4dPM7nVjPklk1yOTbhAeLIqIiD+QbczadBc97lY0KqLvk
-						jPtJI7U9vKBxMR021fjAxGMnKeJfhh4QJRD+mwdOJdiQ+G7GiswHRNQP+IOPufWl
-						Rs0tLu8YVVeOHOZilxI8ij68b5gcBJozjTOBwwH0BTCLt1Q7dj4=
-					</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>
-						MIIDgjCCAmqgAwIBAgIJAIPaQ409Yt0iMA0GCSqGSIb3DQEBBQUAMDQxDjAMBgNV
-						BAoTBU1OU1VLMSIwIAYDVQQDExl1YXQtbnN1ay5lbHNldmllcmVtZWEuY29tMB4X
-						DTEyMTEyOTAyNTIxM1oXDTIyMTEyNzAyNTIxM1owNDEOMAwGA1UEChMFTU5TVUsx
-						IjAgBgNVBAMTGXVhdC1uc3VrLmVsc2V2aWVyZW1lYS5jb20wggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDhnZp/bmCr/TQS5osRk8lfgcUeGptgZSid/7fI
-						LYQUzL1Dsl3hXmfucOS/Db+De0TqEFwkxZ2kf4qxn91X/rFnqWGiRfTy1LOFc5MW
-						eZ2XdU36cfq2Gt8Wq/bF0lVgvPqqM9z4b0fgMt3xMta9XHJXRE/HFSAuJ77FpDUw
-						YkCTIIzUvFPimdEFpSyltqlO0r77a2nrvGgDA0FwYYwQ0iRKT16RANcRAL07pzWe
-						1ECO4H79bvuDyeYmeHCNTbQ4lovqEjeGgu+I0i+jf2pod6KX6ILaPXPjWdZPW+u2
-						CTTqnDPt2oBmQJHHibn2r7yPPIXz2UlzT4u1/xSqMZu82n/vAgMBAAGjgZYwgZMw
-						HQYDVR0OBBYEFElTHK+kxkQmCYiclyw5swDyhIqEMGQGA1UdIwRdMFuAFElTHK+k
-						xkQmCYiclyw5swDyhIqEoTikNjA0MQ4wDAYDVQQKEwVNTlNVSzEiMCAGA1UEAxMZ
-						dWF0LW5zdWsuZWxzZXZpZXJlbWVhLmNvbYIJAIPaQ409Yt0iMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBAJPUl/JrhkaUwhHrrTzP9IojhhX/2lumXjNL
-						OIGtDF0A0yMuq6OuRwrQ6IEvCTgXNOpIZShkbzPPWR0YF240zLB3IobMDpfH8G1r
-						lycsXjuhgAT4oluZg08Ogs4EpzlQfxmzsiL8a+NV7JasoksJll1yZnHCt1BmaNZx
-						76fl5ti7eOha51lhC0p4dPM7nVjPklk1yOTbhAeLIqIiD+QbczadBc97lY0KqLvk
-						jPtJI7U9vKBxMR021fjAxGMnKeJfhh4QJRD+mwdOJdiQ+G7GiswHRNQP+IOPufWl
-						Rs0tLu8YVVeOHOZilxI8ij68b5gcBJozjTOBwwH0BTCLt1Q7dj4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat-nsuk.elsevieremea.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat-nsuk.elsevieremea.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-nsuk.elsevieremea.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-nsuk.elsevieremea.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Elsevier B.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Elsevier Clinical Skills (UAT)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.elsevierclinicalskills.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Graham</GivenName>
-    <SurName>Isaacs</SurName>
-    <EmailAddress>mailto:g.isaacs@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Terence</GivenName>
-    <SurName>Clifton</SurName>
-    <EmailAddress>mailto:t.clifton@elsevier.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml
deleted file mode 100644
index fc1dd0c2..00000000
--- a/swamid-interfederations-2.0/uat.digitaltheatreplus.com.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat.digitaltheatreplus.com">
-  <!--
-		This is a UAT Shibboleth SP for Digital Theatre.com Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-19T15:29: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://dtplus.uat.vualto.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="60" width="104">https://digitaltheatreplus.com/sites/all/themes/digitaltheatreplus/images/logo.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">Digital Theatre Plus (test site)</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJANaX6ppqsyTMMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWR0cGx1cy51YXQudnVhbHRvLmNvbTAeFw0xNDA4MDQwOTM2MzNaFw0yNDA4
-						MDEwOTM2MzNaMCAxHjAcBgNVBAMTFWR0cGx1cy51YXQudnVhbHRvLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPqJcWAY3p69eBmlJOCtQzRQWZF
-						osie4DnauZj5lnv0dONDi0HmpOMKaIEpGk2eIb5e7WRkdDdBMX4sq2+8aTgF8h0J
-						1cBZozFWEaVloD/Y049WF+BCyDipQxZWdHXuIC84w5Tnqy9lEBJjJZTI+n6Brcwf
-						ql2/Ao79SftGI5Mj+xgtAlXIpue4aYsaOOjU8JjiFZ92eNufe1WZlknqNCWB1YDM
-						PUJ4pUdAd3BtbgfT2m/7Ke/X6ly+SkUpkw2To+HU4IxrWzp2/NlaV/oub0xyZUKr
-						VaA/iaKJErNy0EYB5RTczyuYdlxm0nFEdDjKKpV2lBQ7gEFFS59+Z1EP93ECAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVZHRwbHVzLnVhdC52dWFsdG8uY29tMB0GA1UdDgQW
-						BBRSiWT+Tt9yalHP724P9qv9UqTQ+TANBgkqhkiG9w0BAQUFAAOCAQEAlmXLm1z8
-						+MQwuXCShn9XL65A8kkODZzmPblKi9M+D/7P48/RdLEgAdVWiMyRdr/WgFsk01pY
-						hqc2MhW6qMXhEt5bzSCEFrK5qhJd01q4TjMEfhg++dI9e1J4po9u+HiGMQAmxX1C
-						3CCDpy6cSBOLM4lVE/O7niehk7B7P6xlzGHRCVqtZlfkMP1HbV7nLnVZSkzGx2S+
-						zb5rciB24IYrz5HW46tnyGBvWZsxJe4P6iETYq0cX3GIPVJo9odMCBJ+VBtix+m/
-						GJtmUCj7yfMyg2p+o//EKOqTkWlM+TsmWAYIEmO6GT7OJDNrMyDNqXCnOdArvj/V
-						/Vn1hQzMvWYnqQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dtplus.uat.vualto.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Digital Theatre.com Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Theatre Plus (test site)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.digitaltheatreplus.com/about-us</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Ware</SurName>
-    <EmailAddress>mailto:support@digitaltheatre.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Carly</GivenName>
-    <SurName>Britton</SurName>
-    <EmailAddress>mailto:support@vualto.com</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/uat.staffsubs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/uat.staffsubs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 447b63c1..00000000
--- a/swamid-interfederations-2.0/uat.staffsubs.ox.ac.uk-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://uat.staffsubs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "UAT Staff Subscriptions Site" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-10-02T11:42:23Z">
-      <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://uat.staffsubs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAIqBFTxbOzVpMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnVhdC5zdGFmZnN1YnMub3guYWMudWswHhcNMTQxMDAxMTI1OTE1WhcNMjQw
-						OTI4MTI1OTE1WjAhMR8wHQYDVQQDExZ1YXQuc3RhZmZzdWJzLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwiFfqsi+5atFOA+H2AGWJOkv
-						NP1h4W9LZMgyfC5BRBpRe+LTKuUOBgGnE0aELcDP2Sfko51AS4lNGOPO95ttYL/x
-						Mt01AeDnbZy++mzNpdok3GkGrn3TFy3pWiambJBU6gLTAif1xZwVFTYj/qkJy2d2
-						Kt6OE+D5zQgQYfIjhZTBM2+aQDHkt1wCdhGntHKenE1PqwFjM1wbIcKRfJuEYfTb
-						NiT/SCKJyIY8pMzGSGUOIWBiITwOo/74eVa16qEbjSLrOzh/3Ng2XSkJiBH89vx/
-						UYT9cfkiPhjlE+JmDIFHfaJR2eqitOpTD9fKt4Y46016CaKDSDeZjJXyQT22KwID
-						AQABo0QwQjAhBgNVHREEGjAYghZ1YXQuc3RhZmZzdWJzLm94LmFjLnVrMB0GA1Ud
-						DgQWBBQzimnzRTqL34ndNzsV9V2iNg6aNDANBgkqhkiG9w0BAQUFAAOCAQEAEKtE
-						guYI0ex37725s2GK7PzkqfbT91/Av/k97Z4+iGtYGBa0B7aL/p+Sw1PwgKnUqvw5
-						OOGswJOjFHdKUiwomyeedA/1ojlVZou1N/C86YSSr1YlbruOlRm90QIOulZVDMi3
-						IVaUamwWpie1+Nyas1X9pnKs/wn18YJYVEJmlG0oVh/9foZm7ph3Z5J7bkA9mV+R
-						HvrOoKZS5yUUfE03fYP/931Zv6/POl8Srljh+yBUpbEZXdQma0mrvPK+V5p1ugUL
-						Ay6LEowEY7LJXL5GFymbbohOZTDT/TEDZQxZd+gsi58/r2YixRwtO87tnOJdUEvw
-						21204RAvyjBXtPAIiA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://uat.staffsubs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat.staffsubs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford UAT Staff Subscriptions Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ops Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Hebron</SurName>
-    <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.xml b/swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.xml
deleted file mode 100644
index 5c213ae1..00000000
--- a/swamid-interfederations-2.0/uat.twigonglow.com-shibboleth-sp.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://uat.twigonglow.com/shibboleth-sp">
-  <!--
-		This is a "Web Team UAT TwigOnGlow" Shibboleth SP for Twig World 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-09-03T10:13:34Z">
-      <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://uat.twigonglow.com/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://uat.twigonglow.com/Shibboleth.sso/shibtest"/>
-      <init: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.twigonglow.com/Shibboleth.sso/RMUnify"/>
-      <init: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.twigonglow.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIJAJxETCSASpdZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnVhdC50d2lnb25nbG93LmNvbTAeFw0xNDA5MDIxMDUwMTdaFw0yNDA4MzAx
-						MDUwMTdaMB0xGzAZBgNVBAMTEnVhdC50d2lnb25nbG93LmNvbTCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAO16uIrDV6BS/n1wSQbEHv7o6/OBn2JKbIll
-						xT2Fju/J811O8tiGU5B9dioUK5rOhBayNFEdihjPfnhJyS0JQpR+HWMlepvVrWiq
-						MWoLlS0QPOkVv2n1bdf2lm6UpYF845mQ5W6O0UnaV9FbZ1WoE0XwmyKKCctBW8td
-						ZsDnm2NORInb5kcL55RoSvkM5uVdFxeWij+VJI8TKwbLmj1rNNOLf9sYrPKCCqiw
-						axFjbMNEPXj2BLoYkd+mF0wde4f13fcqbieVsHMm54reRArBxfj295B3qaUgiIFw
-						Xro+9UuAQVxfEfyNFtzuwe0Jci+55eqYBu3THRa3ufqq7jtaKs8CAwEAAaNqMGgw
-						RwYDVR0RBEAwPoISdWF0LnR3aWdvbmdsb3cuY29thihodHRwczovL3VhdC50d2ln
-						b25nbG93LmNvbS9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBTD+Uzr1X5gutAR4Yjh
-						wBn8vpBQZjANBgkqhkiG9w0BAQUFAAOCAQEAdOnoWG0rOFuToaqy+m9atSkqvkHR
-						CXqziHAxvLFRfvMrM/vNIHOcbpDiV0ZGmzOS6us3fY4sxE7rdEWZeYJ+W+b6rkln
-						d5t3frsl1dlJlrlT/SFTVX0YmkphXqncFxH0I62zcUpNRirx0T3LFGgTrpAdzXo2
-						RNKyssZjqxwRxhShdmZW2y2ja+oDFwZGNTNmgcm/1X3VGSyK+48LwOAsT5UGENtW
-						V5r+0fJYmxEwam5sooQ/BmF9vKWiqi2sqRFP/W6JWq2m8/wqtqqovWMKvgwxrLTt
-						wE/tNsBL7C5AePts/W1CF4B+atCSb7LhcxF52bAOC3MBJwO58/xv1A2AeA==
-					</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://uat.twigonglow.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.twigonglow.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.twigonglow.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.twigonglow.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.twigonglow.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uat.twigonglow.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat.twigonglow.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.twigonglow.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.twigonglow.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uat.twigonglow.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Twig World Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Twig World Limited: Web Team UAT TwigOnGlow Shibboleth SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.twig-world.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Munn</SurName>
-    <EmailAddress>mailto:dmunn@twig-world.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Munn</SurName>
-    <EmailAddress>mailto:dmunn@twig-world.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.v-scene.ja.net-shibboleth.xml b/swamid-interfederations-2.0/uat.v-scene.ja.net-shibboleth.xml
deleted file mode 100644
index 436f0cf4..00000000
--- a/swamid-interfederations-2.0/uat.v-scene.ja.net-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://uat.v-scene.ja.net/shibboleth">
-  <!--
-		This is a "v-scene" 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-05-26T10:19:59Z">
-      <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://v-scene.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://v-scene.ja.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEbjCCA1agAwIBAgIRAPLs2fw5NrHY6vHiBUWhWeIwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xNDA1MTYwMDAwMDBaFw0xNzA1MTUyMzU5NTlaMD4xITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxQQKi52LXNjZW5l
-						LmphLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMimqOow4OSM
-						cGivrxkXeSBOTQOp/jxDWV/Fgm9Q+jXCsHuLRzsi9luGrpglU/avF+HM55AuFb5z
-						I8O+H6k/+tMNoeJvcz8J8OiMo4Qul3CL61TjfyFElDwXY2ROJNAkS6vv5w92BTqx
-						h/u7UH6szFdUVK9ld980v5Sht4+YLlk0csTmtTJWAojm/kHVyM6uddr5rQrlfu9Y
-						omKaSVw8DGaQjfQ2x+FXHLOWQZ/NAHJiIRQ40D4UNxCw/dYxPUsfEToBZ/JShf+o
-						DXz2pMB4H0QzycPFLOICRISka0gO1wNWsGakAUn4uM6s1yfzDlyT5YM6+ycUo1jx
-						9NfQi1GaqjMCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-						R+qQ47ntMB0GA1UdDgQWBBRISYDi3KrE1GaRx9MSCk+rgDVAcTAOBgNVHQ8BAf8E
-						BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-						AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-						MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-						cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-						ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-						c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQKi52LXNjZW5lLmphLm5ldDAN
-						BgkqhkiG9w0BAQUFAAOCAQEAcYIsGziwQ3v/twTh1kk3+Dhs1+kFvsZeTlQS4GTk
-						pkaE8RM8ELEx82PgQjuX2uUTxpfmopxst8FQ2eT/TAyh224EAoRkY2ODUru6Twzb
-						NmsBnIJtA0QWikK7P7i9sf1OGZJHCeKOxHHSsg6Z/mw1DGc420vUbA5KeZwRlVnk
-						X8Y8QEbGX7Ee0pvRVCURIBEuioQLUkMW1uJu4wwjBnGjRScSzgOXPQDY2q0+gYRt
-						3U0pLrCAHTghWhbyfXiqeijWivQ/0Jz5aiRX8738f5L/LN/fqGe0xFQaZoCeeSc/
-						8dBRNpkZmtznEg7VKwGKeYuntpvomaA18BEpsQZjgZMHNA==
-					</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://v-scene.ja.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://v-scene.ja.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://v-scene.ja.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">v-scene</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>v-scene Service Management Centre</GivenName>
-    <EmailAddress>mailto:vidconf@jvcs.ja.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>v-scene Service Management Centre</GivenName>
-    <EmailAddress>mailto:vidconf@jvcs.ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml b/swamid-interfederations-2.0/ucl-research-test.worktribe.com-shibboleth.xml
deleted file mode 100644
index 4d413027..00000000
--- a/swamid-interfederations-2.0/ucl-research-test.worktribe.com-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://ucl-research-test.worktribe.com/shibboleth">
-  <!--
-		This is a 'UCL Worktribe Research Management (Test)' Shibboleth SP for Worktribe Ltd.
-	-->
-  <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="2015-11-13T10:15:45Z">
-      <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://ucl-research-test.worktribe.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAgygAwIBAgIJALJ6YNn8QO6YMA0GCSqGSIb3DQEBBQUAMCoxKDAmBgNV
-						BAMTH3VjbC1yZXNlYXJjaC10ZXN0Lndvcmt0cmliZS5jb20wHhcNMTUxMTA5MTU0
-						NjEzWhcNMjUxMTA2MTU0NjEzWjAqMSgwJgYDVQQDEx91Y2wtcmVzZWFyY2gtdGVz
-						dC53b3JrdHJpYmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						sMg3x4IK0YYNTCzZL5lq1vdm4YgGEKrnG6eGz0DVTxuqMBy6wvmRs/ibHBraD+c7
-						Cqz+89aKjQGpED+QkIajP8f7X/5b7UMV/Ee1gUcHsQiNH3pvNci9t5k5nhNSUlVI
-						S2tbeKNdxFarNm5DfbuXSQZ0/6ix203W9GId4e535i/poqJK+tX58rJgRtyK9ctE
-						IAHAmvelJ0r8dVv6L1p0vl+hwhFERF0DVHBcsW0Bjya9oq3FzUpPosGRRB8nISlF
-						OQxPIcNaLB0x4hn6sixLGk8t5ieqH0+dH1JXZMfas92ezx0N/2kEIgMI8XUEjjPB
-						bUqKKhv+K5k5vmc7+hnznwIDAQABo00wSzAqBgNVHREEIzAhgh91Y2wtcmVzZWFy
-						Y2gtdGVzdC53b3JrdHJpYmUuY29tMB0GA1UdDgQWBBT+0Yvz6W6N62PE+glPO64K
-						olYhlDANBgkqhkiG9w0BAQUFAAOCAQEAn9CW+v5B4ZPYGB+5j/nDlXhhNMvb8Xqb
-						r1C3q2FhnoOVxwZmQrNVOTL/tHQ98eEgm+G9PXTGpSD3zDgUsChxY9WHhvQsN7JU
-						WuLfQVjnKSQRjoDwO/Fneg5rZstZJtQPM1JNK4ovEkJPwVuEtxGQc8/W0pnQDhWm
-						NHaWS8dkuu3GULmMN6VHXIQ3JtrdrV9JViYxzuXIBlDHcJP9KSHYQLRT5E7VQsKB
-						DqlP/Xl8qSeRDuZ2BGHaRY9L9tv83/wmgDw5M9aD6mnitldU42OaaRgOZfz9IJw8
-						wEizXjk+w4nXfsGJx17O8t3uXHElZVQeCtUfiAR7QL+9hmQGhhTvMA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://ucl-research-test.worktribe.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucl-research-test.worktribe.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Worktribe Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UCL Worktribe Research Management (Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.worktribe.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@worktribe.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matt</GivenName>
-    <SurName>Southall</SurName>
-    <EmailAddress>mailto:matt.southall@worktribe.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/ucl-safety.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 0602fa48..00000000
--- a/swamid-interfederations-2.0/ucl-safety.co.uk-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://ucl-safety.co.uk/shibboleth-sp">
-  <!--
-		This is a "Oshens Software for UCL" Shibboleth SP for Optima Diagnostics Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIC9DCCAdygAwIBAgIJAKIVioCG3ZBZMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3MwMzUyLTA1NDgtd2IwMTAeFw0xMDEwMDQxNzIxNTZaFw0yMDEwMDExNzIx
-						NTZaMBoxGDAWBgNVBAMTD3MwMzUyLTA1NDgtd2IwMTCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAMxOVF1mGMeCdKb7Z0syty24insTVStJ8v9nTwFjwwu9
-						czW5kz0LXEJ31BK26QOLcrf3GNJzWdSmUbwHJgv8KyzacBze6fUdKHjVEW6qIveA
-						nIzKGZxG+FjzZ280oIAEvZs+8Ti9bzSkPRp0IRRnsjmiov+hp7/Ga/pZe81WTRMn
-						p3cLL9UVvVg/SwUE9wOEfEIIiQ5rvQRKloTjC58b0layZgjJ1pKBkAeIwxusj++n
-						CqCyue4Kz3OjDmbQplVIn3d+EJKjmW/IXyNwOri7C9o6XKlmVmRdtDLQAwso4tXc
-						TvxPCm/makIaAt66yboQIuZJ6hZmTB1HqF0TlW9Gn5sCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPczAzNTItMDU0OC13YjAxMB0GA1UdDgQWBBQ2UBzH2KH4WXHk1WCJyf94
-						mG9F4zANBgkqhkiG9w0BAQUFAAOCAQEAxsn3j8kwu255CI0tn/uAdmNmDx+VRqrU
-						tbUjP4hERBpeLCSlVS799BrmOUH3Va+KXg4NwTWJpZJ5CszB4C8/RfpHZsIYHB+5
-						Qk4qtFWY9KiRwgt6HxFI4eSMa8xWKnA6FU3jlc1ngN4zRx4Mjjs6IstBqg53CXYo
-						hqpiMWakBYHx1vco/tadDS3tON9r0zGeOIH+Q3myZoTfXZkq1TCsKqHLi0G98soK
-						LARNtvz6YagTchFGL4rQoMZaGUforT1pH/2SLFRSIQvB7KE/L9KAiq0J0VtcRQeO
-						E1JMlcamLZgO4OOfUch9qY3mzMk4ILX5fzEHzXPCC+ck3uV39/1/7A==
-					</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>
-						MIIC9DCCAdygAwIBAgIJAKIVioCG3ZBZMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3MwMzUyLTA1NDgtd2IwMTAeFw0xMDEwMDQxNzIxNTZaFw0yMDEwMDExNzIx
-						NTZaMBoxGDAWBgNVBAMTD3MwMzUyLTA1NDgtd2IwMTCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAMxOVF1mGMeCdKb7Z0syty24insTVStJ8v9nTwFjwwu9
-						czW5kz0LXEJ31BK26QOLcrf3GNJzWdSmUbwHJgv8KyzacBze6fUdKHjVEW6qIveA
-						nIzKGZxG+FjzZ280oIAEvZs+8Ti9bzSkPRp0IRRnsjmiov+hp7/Ga/pZe81WTRMn
-						p3cLL9UVvVg/SwUE9wOEfEIIiQ5rvQRKloTjC58b0layZgjJ1pKBkAeIwxusj++n
-						CqCyue4Kz3OjDmbQplVIn3d+EJKjmW/IXyNwOri7C9o6XKlmVmRdtDLQAwso4tXc
-						TvxPCm/makIaAt66yboQIuZJ6hZmTB1HqF0TlW9Gn5sCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPczAzNTItMDU0OC13YjAxMB0GA1UdDgQWBBQ2UBzH2KH4WXHk1WCJyf94
-						mG9F4zANBgkqhkiG9w0BAQUFAAOCAQEAxsn3j8kwu255CI0tn/uAdmNmDx+VRqrU
-						tbUjP4hERBpeLCSlVS799BrmOUH3Va+KXg4NwTWJpZJ5CszB4C8/RfpHZsIYHB+5
-						Qk4qtFWY9KiRwgt6HxFI4eSMa8xWKnA6FU3jlc1ngN4zRx4Mjjs6IstBqg53CXYo
-						hqpiMWakBYHx1vco/tadDS3tON9r0zGeOIH+Q3myZoTfXZkq1TCsKqHLi0G98soK
-						LARNtvz6YagTchFGL4rQoMZaGUforT1pH/2SLFRSIQvB7KE/L9KAiq0J0VtcRQeO
-						E1JMlcamLZgO4OOfUch9qY3mzMk4ILX5fzEHzXPCC+ck3uV39/1/7A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-safety.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-safety.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucl-safety.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-safety.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-safety.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucl-safety.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucl-safety.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-safety.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-safety.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucl-safety.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Optima Diagnostics Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Optima Diagnostics Limited: Oshens Software for UCL</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oshens.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Layton</SurName>
-    <EmailAddress>mailto:Simonl@optimadiagnostics.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Layton</SurName>
-    <EmailAddress>mailto:Simonl@optimadiagnostics.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml b/swamid-interfederations-2.0/ucl.epiclearninggroup.com-shibboleth.xml
deleted file mode 100644
index 45bc17e4..00000000
--- a/swamid-interfederations-2.0/ucl.epiclearninggroup.com-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://ucl.epiclearninggroup.com/shibboleth">
-  <!--
-		This is an "ExtendUCL" Shibboleth SP for Epic Performance Improvement 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="2013-02-13T17:04:02Z"/>
-  </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://extend.ucl.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC0DCCAbigAwIBAgIJAKNyH/gxrpu9MA0GCSqGSIb3DQEBBQUAMA4xDDAKBgNV
-						BAMTA3VjbDAeFw0xMjEyMTQwOTQ4NDBaFw0yMjEyMTIwOTQ4NDBaMA4xDDAKBgNV
-						BAMTA3VjbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/YpbWoOORQ
-						eVEUuO5C+fue4B/lIw3d7J+oaeySdcld/BlHL1smwyQ51NkvZ3GCiQvRtWqcEDj1
-						wxHQeIOxCh8vJr1t7sdEI8McfTD9XS4sSGgNPehiynpcWlPB0HqtjAOwqaD5WDfN
-						xJDH73KhEg5rgnNKUuL9GCeuCwRUen3bbFk1pK4+s7CBxYr/JpjYKYZ4gBhsMmk9
-						hoDlh6Cyp2pgPgPJEdTUvKoWPzYi45dn7ih1JAxtsBQ/cDkd7apdK0IUjBSuXbYj
-						jIPjhI522fXX6f3Vhwl/ftkmDQgTJ3tqd7hMajkF/me/j5UNOAU/NxaveDyQEiiO
-						S2bGBBdURgsCAwEAAaMxMC8wDgYDVR0RBAcwBYIDdWNsMB0GA1UdDgQWBBS+K+xw
-						EBCrHMQGnD8pYs3KlndVwzANBgkqhkiG9w0BAQUFAAOCAQEAhpRh7R7B45GEvxFI
-						rzT6QHsERtp00ZZmStaqAa5+E4DuFwX15G+igX4Bqqo5q67ClYrKKUExwElGYrWp
-						FmL1U9LebLQLrfRqFiJxx670LTVVFBX1ElbWsPsDo5deASYIa6dYUd5k7jl74qSv
-						0At3Ch8Jo71SfslPn9UXqwpLr4GeGK3xqYMZsEl09Mgfr/DQVpZ6LMr+2gc4o5pp
-						BOGduhIs7GQjZAkugHE9UwZJiQYDVkhgoHz/1+3QfYPXerhunV3JM5VUbXXguRcd
-						0bjeFxeLtcvlKpoHb4l1zh3bEr5kuP9LM830xgN0mAhqZN7tMdDURPdMuqCNOoyh 
-						gNNnjA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://extend.ucl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://extend.ucl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Epic Performance Improvement Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ExtendUCL</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://epiclearninggroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Bannister</SurName>
-    <EmailAddress>mailto:ABannister@epiclearninggroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Avey</SurName>
-    <EmailAddress>mailto:steve.avey@leolearning.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucl.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/ucl.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index a7224a68..00000000
--- a/swamid-interfederations-2.0/ucl.sisoshibboleth.co.uk-entity.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://ucl.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo University College London Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2013-01-17T14:43:39Z"/>
-  </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://avcucl.siso.co/sso/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://avcucl.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="60" width="60">https://www.siso.co/siso-logo60x60.jpg</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">SiSo University College London Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo University College London Online Resource Booking</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://avcucl.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://avcucl.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo University College London Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml b/swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml
deleted file mode 100644
index 434c340e..00000000
--- a/swamid-interfederations-2.0/uclu.org-shibboleth-sp.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uclu.org/shibboleth-sp">
-  <!--
-		This is a Shibboleth SP for UCLU (University College London Union).
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-03-21T11:06:06Z"/>
-  </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">UCLU (University College London Union)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UCLU is the representative body for University College London students, founded in 1893.</mdui:Description>
-        <mdui:Logo height="80" width="206">https://uclu.org/shibboleth-sp/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/zCCAeegAwIBAgIJAKwfQJ+dJ/UEMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHVjbHUub3JnMB4XDTEzMDMxNDE3MzEwOFoXDTIzMDMxMjE3MzEwOFowEzER
-						MA8GA1UEAxMIdWNsdS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDHFh0se+NKTy6reLEX+Hj6WK2A0noHMtkJKOamHMxS+Qi4wGIjJ8PghwPEgP7Z
-						SGb4149KQ3MOET7/HkrwCC8DL0XxXnKyHgys5T4BrFwE3b7m2R+2QHDZ3d1Yf+EA
-						vDwS6W8vmI+Xt79vNeQeno42AlOdmqoTa7caS76+Me2dhiIhWbeVyTMLaVpBNX+x
-						ejMdQ6xMMGSc0FYKllbnpl/DA7GZ3y3WgC+1HYD2il7R95ApCJyZay4SVpPwqRzw
-						Bt0pqxONisGS210SyEkRAglU1EqKW46C0OtM9e3gdKb2lENSrbqVy0y4wE3kdax2
-						MHH/oubXZoSB0fPwvPDnG8czAgMBAAGjVjBUMDMGA1UdEQQsMCqCCHVjbHUub3Jn
-						hh5odHRwczovL3VjbHUub3JnL3NoaWJib2xldGgtc3AwHQYDVR0OBBYEFBjW1cD5
-						xuoeLApI9ixFbHPIT+OGMA0GCSqGSIb3DQEBBQUAA4IBAQATsVU+8YZBQC94+okM
-						3vNuMvpB+oZWWV8PSs4cQbkEOTRRCv4pWD6kbQQEzPBa1wUbOoN71keSJ47tj7xH
-						0P/p3Jq0LTTgnC1tZUnqQTfKxvKr/NGvgRIxYq/JuV2NVUSbb1LesWkVPEFY13l2
-						Pa3L99neKFzEenRFyiqk+uy69ZjX5kN9H5WBIds2oBl67UFIDFkSO6pUCsffvcBe
-						NaD+/OdSqymbiaE8lQ6bXsZx5xyHdYB9WjfUFqAetRMsBRX7uOwIT8lWgBUjPurY
-						2PLYR/plUVOxRfiB4eEFjuiho3vanQCj1zhKtI3D0rxS2Nlbpu2mZbndxLfBrta3
-						AH0h
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uclu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uclu.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uclu.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclu.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uclu.org/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uclu.org/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uclu.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclu.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uclu.org/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclu.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uclu.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uclu.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uclu.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uclu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UCLU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UCLU Website</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uclu.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UCLU Web Developer</GivenName>
-    <EmailAddress>mailto:UCLU-wd@ucl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>UCLU Web Developer</GivenName>
-    <EmailAddress>mailto:UCLU-wd@ucl.ac.uk</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 2ed84d32..00000000
--- a/swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ucopia-shib.ensta-bretagne.fr">
-  <md: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>
-    <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>https://federation.renater.fr/category/wifi</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ENSTA Bretagne - WiFi EduSpot</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://ucopia-shib.ensta-bretagne.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDljCCAn4CCQCfU0WUIcNFIDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-RlIxETAPBgNVBAgMCEJyZXRhZ25lMQ4wDAYDVQQHDAVCcmVzdDEXMBUGA1UECgwO
-RU5TVEEgQnJldGFnbmUxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMSIw
-IAYDVQQDDBljb250cm9sbGVyLmFjY2Vzcy5uZXR3b3JrMB4XDTE1MDkxNzExNTUy
-NloXDTI1MDkxNDExNTUyNlowgYwxCzAJBgNVBAYTAkZSMREwDwYDVQQIDAhCcmV0
-YWduZTEOMAwGA1UEBwwFQnJlc3QxFzAVBgNVBAoMDkVOU1RBIEJyZXRhZ25lMR0w
-GwYDVQQLDBRTZXJ2aWNlIEluZm9ybWF0aXF1ZTEiMCAGA1UEAwwZY29udHJvbGxl
-ci5hY2Nlc3MubmV0d29yazCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AOlH6arzFtnQLs11KKlLn9qwzsIClXFckQjk48kfFnu8+8nHFIXa6VwsQDlFvQ5O
-nyETzMqym7cT3kZuZkvldVH1ds0W7a0yqbOoy83t0GhaPjIaq1xxHsJD8l28Il8H
-AkRKFV4KIUlFFdpFYi4IWx2a8yB3JxS9sbPfslJMzbUkqXzIKuspX96qBDZuZux+
-8YnEUmrtr7ZPJXvQMlGpFkuhv0zg8V/D1EUODBrAFYeqpWFOH0PZhj4DQ+mfmjMO
-53R0zmYbeNC1zPyYg+ZZlgfeVKY5BXyja4ZNvSsUtyic/P9780ZK72NromFx4n/c
-YMi3TFRSQk5Vnn2n68LgZRMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAC9TuIpO1
-ijHePC8x0QTqJkX/PA3uWu/dXTL19zHWrXhHJaYzw9FRrNU1TRWPpmhDsbMNig7k
-ldA5Asdqy0kogRRt7NR7Eqylvb5WQyX2z8gMFrNE/czAuDUPOh2b6yPa1lwi3YZo
-ghD8fPA/vM5JF0nb/2LL/mXhVygslhpqaaH+Ybq9iQeQWtWg17hMYoyc+gz5FfGd
-aCK5iwx95AZ6qN5d0BzzC8PAcULgZjbgyOk/AF6PVZklHKs5u/vsyOFhlevj+YfM
-ca90uwRHWn/k67mBa29JYu6i+m0C9ivPTCHn9c4HaVGV023h2UvWXj2gFpUgesO/
-/1CfOyqCdiur4Q==
-					    </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>
-					      MIIDljCCAn4CCQCfU0WUIcNFIDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-RlIxETAPBgNVBAgMCEJyZXRhZ25lMQ4wDAYDVQQHDAVCcmVzdDEXMBUGA1UECgwO
-RU5TVEEgQnJldGFnbmUxHTAbBgNVBAsMFFNlcnZpY2UgSW5mb3JtYXRpcXVlMSIw
-IAYDVQQDDBljb250cm9sbGVyLmFjY2Vzcy5uZXR3b3JrMB4XDTE1MDkxNzExNTUy
-NloXDTI1MDkxNDExNTUyNlowgYwxCzAJBgNVBAYTAkZSMREwDwYDVQQIDAhCcmV0
-YWduZTEOMAwGA1UEBwwFQnJlc3QxFzAVBgNVBAoMDkVOU1RBIEJyZXRhZ25lMR0w
-GwYDVQQLDBRTZXJ2aWNlIEluZm9ybWF0aXF1ZTEiMCAGA1UEAwwZY29udHJvbGxl
-ci5hY2Nlc3MubmV0d29yazCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AOlH6arzFtnQLs11KKlLn9qwzsIClXFckQjk48kfFnu8+8nHFIXa6VwsQDlFvQ5O
-nyETzMqym7cT3kZuZkvldVH1ds0W7a0yqbOoy83t0GhaPjIaq1xxHsJD8l28Il8H
-AkRKFV4KIUlFFdpFYi4IWx2a8yB3JxS9sbPfslJMzbUkqXzIKuspX96qBDZuZux+
-8YnEUmrtr7ZPJXvQMlGpFkuhv0zg8V/D1EUODBrAFYeqpWFOH0PZhj4DQ+mfmjMO
-53R0zmYbeNC1zPyYg+ZZlgfeVKY5BXyja4ZNvSsUtyic/P9780ZK72NromFx4n/c
-YMi3TFRSQk5Vnn2n68LgZRMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAC9TuIpO1
-ijHePC8x0QTqJkX/PA3uWu/dXTL19zHWrXhHJaYzw9FRrNU1TRWPpmhDsbMNig7k
-ldA5Asdqy0kogRRt7NR7Eqylvb5WQyX2z8gMFrNE/czAuDUPOh2b6yPa1lwi3YZo
-ghD8fPA/vM5JF0nb/2LL/mXhVygslhpqaaH+Ybq9iQeQWtWg17hMYoyc+gz5FfGd
-aCK5iwx95AZ6qN5d0BzzC8PAcULgZjbgyOk/AF6PVZklHKs5u/vsyOFhlevj+YfM
-ca90uwRHWn/k67mBa29JYu6i+m0C9ivPTCHn9c4HaVGV023h2UvWXj2gFpUgesO/
-/1CfOyqCdiur4Q==
-					    </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>
-					      MIIEYTCCA0mgAwIBAgIBATANBgkqhkiG9w0BAQUFADCByjELMAkGA1UEBhMCRlIx
-ETAPBgNVBAgMCEJSRVRBR05FMRcwFQYDVQQKDA5FTlNUQSBCUkVUQUdORTExMC8G
-A1UECwwoRUNPTEUgTkFUIFNVUCBJTkdFTiBFVFVERSBURUNITiBBUk1FTUVOVDEm
-MCQGA1UEAwwddWNvcGlhLXNoaWIuZW5zdGEtYnJldGFnbmUuZnIxNDAyBgkqhkiG
-9w0BCQEWJWplYW4tcGF1bC5raXJrYnJpZGVAZW5zdGEtYnJldGFnbmUuZnIwHhcN
-MTUwOTA0MDcyODEzWhcNMjUwOTAxMDcyODEzWjCByjELMAkGA1UEBhMCRlIxETAP
-BgNVBAgMCEJSRVRBR05FMRcwFQYDVQQKDA5FTlNUQSBCUkVUQUdORTExMC8GA1UE
-CwwoRUNPTEUgTkFUIFNVUCBJTkdFTiBFVFVERSBURUNITiBBUk1FTUVOVDEmMCQG
-A1UEAwwddWNvcGlhLXNoaWIuZW5zdGEtYnJldGFnbmUuZnIxNDAyBgkqhkiG9w0B
-CQEWJWplYW4tcGF1bC5raXJrYnJpZGVAZW5zdGEtYnJldGFnbmUuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjTFwcA3jwkswwrf6wiB7HnGqQ7hzc
-etx4DCKWp7q4c5VpSiYaWjXCMWowCS9L9HBvY9acOR2uRPubvIWMAoZPELvFC5uN
-tX3fTLl/tzFxK6AfhS1fgnZI4rLfdwLEVaNcl/EVSlhzYK/vvU8ogiJR0Wnug2kc
-pKngb2lY1lq6Gk1LmxTNMlqBXxDMBpaVrNIoH0c4xb+NkGWW+7LDswGLPz612BIB
-JQnq1Zz3BiE837NRoeoZWLPrgHzb7fKL25NgpaElt60MqM+Pm/T1bC4ki2T8XAmM
-R2R/Bni0f0v2Xl81a2FPAE1BU8w6jTMFSkBfrnrqCAfWtHahxM0Xj2e9AgMBAAGj
-UDBOMB0GA1UdDgQWBBSoLmW/7Ri+xwt2g0D7F+Tl2Cap2jAfBgNVHSMEGDAWgBSo
-LmW/7Ri+xwt2g0D7F+Tl2Cap2jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4IBAQAcyAM1+lP7dKnbgqgWv8pe4+K/JP6PX5gCTDjs/OGg/9OpHmFEDAMmN6SM
-5yAbWFAylwu4P3txtViT52SzRT2bOYSlkkh4sbpBz0E0wn41GJXpIEnBHJF26n7X
-FAMpsE9UQKwWwx9+FtVM38AORfkwg+kS/N3OO0FipySqAjiGb7SKo1lY9ZHof/jW
-gBgI0bwtyCTjP0RVzJ4vWPpglXJPddfUvYh3rzDVM2wSzcVw36rl7s2oPgJy0CT9
-mrnJXRMvro3o5/2uT+4qCpJXj0mtWcAiOQDHISXFb7TpKZu8ra/XDpx1dVejo3e8
-fievTXxCFzLqApOjCWA8o5hbmgx1
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://controller.access.network/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://controller.access.network/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</md:ServiceName>
-      <md:ServiceName xml:lang="en">ENSTA Bretagne - WiFi EduSpot</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">ENSTA Bretagne - Portail WiFi EduSpot</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">ENSTA Bretagne - WiFi EduSpot</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" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ENSTA Bretagne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ENSTA Bretagne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ensta-bretagne.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean-Paul KIRKBRIDE</md:SurName>
-    <md:EmailAddress>jean-paul.kirkbride@ensta-bretagne.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Pierrick VEILLON</md:SurName>
-    <md:EmailAddress>pierrick.veillon@ensta-bretagne.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucreative.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/ucreative.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index 27f0c5af..00000000
--- a/swamid-interfederations-2.0/ucreative.idm.oclc.org-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://ucreative.idm.oclc.org/shibboleth">
-  <!--
-		This is an EZproxy 5 SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-04-12T10:14:54Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID/DCCAuSgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBhMSEwHwYDVQQDFBgqLnVj
-						cmVhdGl2ZS5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xD
-						MSAwHgYJKoZIhvcNAQkBFhFha2tpbmVudkBvY2xjLm9yZzAeFw0xMzAzMDYyMzU0
-						NTdaFw0yMzAzMDYyMzU0NTdaMGExITAfBgNVBAMUGCoudWNyZWF0aXZlLmlkbS5v
-						Y2xjLm9yZzELMAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxIDAeBgkqhkiG9w0B
-						CQEWEWFra2luZW52QG9jbGMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAtQnizhQPQp2HjZLdRFGV1w20U0XsDrrHSzDiU0kxevGeroRLU3k9TDfO
-						H3X+4FZlamSAEyg7ocmV6vKOi3PWo2hGeINtwhPBEo5JLFAl2waySFsvIlsCS+hr
-						xI+ZMrUU87S0kDeiheUTw6okMi2hBTCkPEDp3E/B7q0KMZACvL/sxm37x4Q+W4A3
-						fP0pFLpbZqdZ2oxHY3KS8m/ZtWbakS2ghKq2+FayIt9/rB4V2FjnxpbqAajaT0h5
-						siljQFizMd49JzvzOOBuNvXcSJKUHOhH/wiOi5RN2Mx0HJX/0UiTJjpKCuv/+aIp
-						R/elpqrOpEcOfY3QVdOQ+pepxM5spQIDAQABo4G+MIG7MB0GA1UdDgQWBBSEJ4FL
-						+vjP0U4FQXK3tgP8CVC77zCBiwYDVR0jBIGDMIGAgBSEJ4FL+vjP0U4FQXK3tgP8
-						CVC776FlpGMwYTEhMB8GA1UEAxQYKi51Y3JlYXRpdmUuaWRtLm9jbGMub3JnMQsw
-						CQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzEgMB4GCSqGSIb3DQEJARYRYWtraW5l
-						bnZAb2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
-						ieePqbyx1ZdzWKUXCgD1geGlmym1MWpFK7UueQWLHUTIi8oGBFb+kJsBkLCQaaVY
-						ags/ViUndWoBpiKP8efTMzjM3MpBOiji8u4KO/3O2tX0VkpPmQoO3ngOPtVSvm0y
-						FdG/sr9ZdhLw4kYok8Gpb6vi08I/75OlSIbd+W/gL1nBe8wzcmORHV5aOZ7006WJ
-						IlhSzLTtewnsmcTIJ/hVmgL07gByHLaJxR/40btxhdJrWENaSUnE2Vc8PHr46XSK
-						WBSxxYRpDgUJ+Pz5QCZuAMkQGbPdhWSGfcURBUxYhiBK4fnOghJTXMXumg7GycfW
-						vVK8cWTrEwbTlG9q6mlD0Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ucreative.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.ucreative.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.ucreative.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.ucreative.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Creative Arts Hosted Ezproxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Vasu</GivenName>
-    <SurName>Akkineni</SurName>
-    <EmailAddress>mailto:akkinenv@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Vasu</GivenName>
-    <SurName>Akkineni</SurName>
-    <EmailAddress>mailto:akkinenv@oclc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ucs.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/ucs.cirqahosting.com-shibboleth.xml
deleted file mode 100644
index 3beff274..00000000
--- a/swamid-interfederations-2.0/ucs.cirqahosting.com-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://ucs.cirqahosting.com/shibboleth">
-  <!--
-		This is a "University Campus Suffolk Heritage Online" Shibboleth SP for IS Oxford Ltd.
-	-->
-  <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="2015-01-29T11:03: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://ucs.cirqahosting.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHjCCAgagAwIBAgIJAJgpdfh1+YmvMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHWNhbXN1Zi5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDEyNjIyNDIy
-						OVoXDTI1MDEyMzIyNDIyOVowKDEmMCQGA1UEAxMdY2Ftc3VmLmlzb3hmb3JkLWhv
-						c3RpbmcubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5jC5
-						HNdlXT+XHl10MnAnG/1HHiqEUCEHPZlNP/4vgEZcS1odaZwnbgzb6p9uZZIvG/15
-						1ZichCYob2AOUOYVKn6tcafdQYxEDSqnmBuuH/6NMDZqVCQAvCDkt9Tm2E+hBfzz
-						xCW0Bgl0EYY5ttzz8cI4EmNdvmjwDMksvNFxXvDwsoGeawPegCSfgYyW2cfrbDlL
-						rgcWjuO3+5e0HXW/k982iElL8yb5fXyTHBj+RBvjUVxTdCuFeLEiQwDgSEJwQNNx
-						iMMcO67dRbaydylxFk9+GvVkRd3JFGO+UJxn5ZyN2dSbuP2bbLpdYEiWqhuxNSNb
-						bVg2H694UeApZWQBAgMBAAGjSzBJMCgGA1UdEQQhMB+CHWNhbXN1Zi5pc294Zm9y
-						ZC1ob3N0aW5nLmxvY2FsMB0GA1UdDgQWBBTRQN1mn2+jFE6f5U1fyWVWhLhxYzAN
-						BgkqhkiG9w0BAQUFAAOCAQEALb+vfdXhr5lXgudzXI+Fhnp1lGmHCdrVdut8E/pw
-						QrRqVxEZ1T4rVoHLcVG3jsKb7voknZMfTriayogl2b7F95nV0dfL6+7e13tsB0DE
-						CRuo3jPUm3lvdxkacsgC9SNSJASa3lo5lsq7rUpvfCsF4lxjyE5gkYLuYWIpjC2L
-						zfyCpYrSVsQpFGe4NcdkEGIxfMIN3/odMgwzWR5LxU3/UFjIb/smfYYJcpEgDA8z
-						flxTIg3hb5c3mlLYpLTboH9Nd5xwUba9OuWaS0mNfYBc5jjzHv3wc17LUR3+3c0y
-						PKzomY9nI7c5Kk93SmbYuuBY76D/kZE+baaoDSELEYNXtA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://ucs.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucs.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IS Oxford Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University Campus Suffolk Heritage Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.isoxford.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lee</GivenName>
-    <SurName>Orchard</SurName>
-    <EmailAddress>mailto:lee@isoxford.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>IS Oxford Support</GivenName>
-    <EmailAddress>mailto:support@isoxford.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Salvesen</SurName>
-    <EmailAddress>mailto:david@isoxford.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IS Oxford Support</GivenName>
-    <EmailAddress>mailto:support@isoxford.com</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 9a6cc82e..f9b68761 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,145 +1,82 @@
 <?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">
-  <md:Extensions>
-    <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>
-  </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: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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">LINDAT/CLARIN services</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Repozitář a služby LINDAT/CLARIN</mdui:DisplayName>
-        <mdui:Description xml:lang="en">LINDAT/CLARIN digital repository and services focused on language research infrastructure</mdui:Description>
-        <mdui:Description xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN zaměřené na podporu výzkumu jazyka</mdui:Description>
+      <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="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="fi">http://ufal.mff.cuni.cz/</mdui:InformationURL>
         <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:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="29" width="29">https://lindat.mff.cuni.cz/favicon.ico</mdui:Logo>
+        <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/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="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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>Active</ds:KeyName>
-        <ds:KeyName>lindat.mff.cuni.cz</ds:KeyName>
-        <ds:KeyName>ufal-point.mff.cuni.cz</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=lindat.mff.cuni.cz,OU=Domain Control Validated</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEijCCA3KgAwIBAgIRAJealheT4/uwZyfUIGi6scwwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMzEyMTgwMDAwMDBaFw0xNjEyMTcyMzU5NTlaMEAxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGluZGF0Lm1m
-Zi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxeKmDjOk
-one5YWIlKyQ1OeN9lgJ6yAiiiCY87Gl8o9773E1MCe8BqKF/whN9orwy54pznUFX
-K0kTxCVVXhVUJYqMt7w/PbY9su5x8RECYOUgHKXDVikovtTZYoQgwQNY56+C+t2T
-mSf1LYxEjArX4epGZ/Vy6HtKfRw2xCvaj43Z3pUjqIf2d4GDM88C4Nece2HehkjD
-RJ099AMDnk2eK/zyoiGNFR2RLe06FvnoS0soVFAF7vr+4MjFHnJByCKgA0WYdIz/
-j7U+EqarX60Fvr8z58zK17pnB8JZAHd/qX2qJmu+JlIPYt4mBYXcsZ63M0eLIHv9
-EBLqLXO5PQ3OGwIDAQABo4IBhzCCAYMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFHy58QqIvxQw/MKvdVXYEfd5NMdrMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
-MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
-LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
-LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
-b2NzcC50Y3MudGVyZW5hLm9yZzA1BgNVHREELjAsghJsaW5kYXQubWZmLmN1bmku
-Y3qCFnVmYWwtcG9pbnQubWZmLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAIxj
-YtINQkxYADOr/MqkSmNZzGi3VhmacPQuwfP7qwi5vWZyP6DXrlWgXDQorOfl6/Rm
-Lzb1LHwwyJdEUknCxU1AahKDsyG3fiSMOTD/t21RI9mbTCA1rtk0d4nXdJ3bKCb0
-dccRmt5CwbScCQfjsIjWvdkxoMlVIe6DgoqUlLILqSk/drjKpKGOYMZuPXS8zgNe
-EFw6XzWMKSgkB0QFX2WUCVuhWfejJ6OhUkH6S5Bh+p5WPKJ7bM4E6UrfaleieSr7
-mfwH8VeBwoL+rL1n6xqndwwqAnzWtFPAO/hBIuOwkucYl85fBqXT0de7g8fIw7bt
-iALZ/UygiLnb3oX/q0Q=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIEijCCA3KgAwIBAgIRAJealheT4/uwZyfUIGi6scwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhM
+CTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzEyMTgwMDAwMD
+BaFw0xNjEyMTcyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA
+1UEAxMSbGluZGF0Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxeKm
+DjOkone5YWIlKyQ1OeN9lgJ6yAiiiCY87Gl8o9773E1MCe8BqKF/whN9orwy54pznUFXK0kTxCVVXh
+VUJYqMt7w/PbY9su5x8RECYOUgHKXDVikovtTZYoQgwQNY56+C+t2TmSf1LYxEjArX4epGZ/Vy6HtKf
+Rw2xCvaj43Z3pUjqIf2d4GDM88C4Nece2HehkjDRJ099AMDnk2eK/zyoiGNFR2RLe06FvnoS0soVFAF
+7vr+4MjFHnJByCKgA0WYdIz/j7U+EqarX60Fvr8z58zK17pnB8JZAHd/qX2qJmu+JlIPYt4mBYXcsZ6
+3M0eLIHv9EBLqLXO5PQ3OGwIDAQABo4IBhzCCAYMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6
+pDjue0wHQYDVR0OBBYEFHy58QqIvxQw/MKvdVXYEfd5NMdrMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMB
+Af8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjE
+BAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1
+RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGV
+yZW5hLm9yZzA1BgNVHREELjAsghJsaW5kYXQubWZmLmN1bmkuY3qCFnVmYWwtcG9pbnQubWZmLmN1bm
+kuY3owDQYJKoZIhvcNAQEFBQADggEBAIxjYtINQkxYADOr/MqkSmNZzGi3VhmacPQuwfP7qwi5vWZyP
+6DXrlWgXDQorOfl6/RmLzb1LHwwyJdEUknCxU1AahKDsyG3fiSMOTD/t21RI9mbTCA1rtk0d4nXdJ3b
+KCb0dccRmt5CwbScCQfjsIjWvdkxoMlVIe6DgoqUlLILqSk/drjKpKGOYMZuPXS8zgNeEFw6XzWMKS
+gkB0QFX2WUCVuhWfejJ6OhUkH6S5Bh+p5WPKJ7bM4E6UrfaleieSr7mfwH8VeBwoL+rL1n6xqndwwqA
+nzWtFPAO/hBIuOwkucYl85fBqXT0de7g8fIw7btiALZ/UygiLnb3oX/q0Q=</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="eduPersonScopedAffiliation" Name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    <md: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:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Administrative 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 d3227fdf..00000000
--- a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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: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/">
-      <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 projekty LINDAT/CLARIN</mdui:DisplayName>
-        <mdui:Description 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</mdui:Description>
-        <mdui:Description xml:lang="cs">Repozitář a služby projektu LINDAT/CLARIN Ú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/ufit.onecampus.com.xml b/swamid-interfederations-2.0/ufit.onecampus.com.xml
deleted file mode 100644
index 7aebdda2..00000000
--- a/swamid-interfederations-2.0/ufit.onecampus.com.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://ufit.onecampus.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Florida - IT</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.rsmart.com/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.rsmart.com/privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFKTCCBBGgAwIBAgIJAP2Ays74REYyMA0GCSqGSIb3DQEBCwUAMIG0MQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEa
-MBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xLTArBgNVBAsTJGh0dHA6Ly9jZXJ0
-cy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5LzEzMDEGA1UEAxMqR28gRGFkZHkgU2Vj
-dXJlIENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTE1MDgyNjEzMTI0MloX
-DTE2MDkyNDE5MjAwNFowPTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRh
-dGVkMRgwFgYDVQQDDA8qLm9uZWNhbXB1cy5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDHSg0+JDljLYtiLp4SS2x2G1KijMtnDzZzZf/BmuIZjetA
-C95IVcSLpvCjxa1sHEf5e4ZGuc5kByWYMj0u6Zn5e7u1H8zSdVVZ+SdIiDmbL9IP
-VzxgB8qCiM8BDLm86zvp6JPDdmSyU5qmDX7CmPXI/3W/4raOZMORkxBCIeUTujYX
-I6w1E/JIlam7rGiXGv6HcMWabc0JN+FyGtY1qdDdQPl7oWESxwEMaXTCt80zL7Go
-DB2WMvr+HTi/cwL34/KJow//PPxVBIcMY0d5ij4rqruc7BnofAHJIbd+irrR27FE
-dIAAZ+L9C9NiK+7gYVAD7bxyuLMd4yZP6m4QuXK/AgMBAAGjggGyMIIBrjAMBgNV
-HRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8B
-Af8EBAMCBaAwNwYDVR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5nb2RhZGR5LmNv
-bS9nZGlnMnMxLTExMy5jcmwwUwYDVR0gBEwwSjBIBgtghkgBhv1tAQcXATA5MDcG
-CCsGAQUFBwIBFitodHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9z
-aXRvcnkvMHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au
-Z29kYWRkeS5jb20vMEAGCCsGAQUFBzAChjRodHRwOi8vY2VydGlmaWNhdGVzLmdv
-ZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RpZzIuY3J0MB8GA1UdIwQYMBaAFEDCvSeO
-zDSDMKIz1/tss/C0LIDOMCkGA1UdEQQiMCCCDyoub25lY2FtcHVzLmNvbYINb25l
-Y2FtcHVzLmNvbTAdBgNVHQ4EFgQUD42WHYmzkIt4bBTwOzAvZEroKRIwDQYJKoZI
-hvcNAQELBQADggEBAHmpPl8xZ7bMe7oBKwEV62VDuQZ1ToTZRvNfI36vjlYpdypI
-0yWf0ckHy0OIyEEW4Gx3PCmZZq3lptKmbnvsj+zBmFgM4Z+bYtMR60s4wlpQGoDU
-rhuszTLtIwWLLvQx+fbI9/K1rHS6pI3QV8g4OdMOznM82oEwpR+kPOUVsnw+gMmw
-bT/p8eVAUr3oWuhDp+qQo1LP9A0LaDNkH9UThAOQx1L0CP45RHlG7Ewd+LGS9S0X
-tTDiJ0v3T1w1Y4kZPLU7Z/fdeHHU1Yh4KeEfU43rF5kWQMSp1q0W6b49YrX9OvHJ
-/bKQ4YxUAr7Q4ohFqImnAEy2n4ZjivQ6z8kOPrY=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ufit.onecampus.com/saml/SSO/alias/ufit" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ufit.onecampus.com/saml/SSO/alias/ufit" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ufit.onecampus.com/saml/SSO/alias/ufit" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ufit.onecampus.com/saml/SSO/alias/ufit" index="4"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">RSmart</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RSmart</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rsmart.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Cloud Ops Support</md:GivenName>
-    <md:EmailAddress>cloud_ops_support@rsmart.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uisshibb1.uis.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/uisshibb1.uis.edu-idp-shibboleth.xml
deleted file mode 100644
index 2496bc6f..00000000
--- a/swamid-interfederations-2.0/uisshibb1.uis.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +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://uisshibb1.uis.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://uisshibb1.uis.edu/idp/error.jsp" 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">uis.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Illinois At Springfield</mdui:DisplayName>
-        <mdui:Description xml:lang="en">User Identification Service @ Illinois Springfield</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uis.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.uis.edu/informationtechnologyservices/about/policies.html#acceptuse</mdui:PrivacyStatementURL>
-        <mdui:Logo height="183" width="131" xml:lang="en">https://uofi.box.com/shared/static/l5b0pac3r6fgffnybw4olbrs68dwwxar.jpg</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>
-MIIDMDCCAhigAwIBAgIVAKHOcYSjaC5wZJQOZRw+J1v3yp5iMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXVpc3NoaWJiMS51aXMuZWR1MB4XDTExMTEyMTIzMjQx
-M1oXDTMxMTEyMTIzMjQxM1owHDEaMBgGA1UEAxMRdWlzc2hpYmIxLnVpcy5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrBJ9UQjC2vfAIWHXN44ct
-h7f3ixq6gWlqpxu7xRIZbYQQf+R5vUX9EvsqsOlx4TBB3xKr4dbz/qzfB+u/EdBc
-RKpYKY+Vh8S8bj8A3juUlGzQSXM68pDV3F0Au4zP6uSx6LRj51n/fuapZhOleIJ4
-zYvsxrCVL3rgxaA2qHrl97FqzPt0UXVzezmeZAvIKdCqiP26rLKLwzVi1dHcjD1B
-/k4EwJSGE0G97GUs9usU268ckHWAjTP+y/kPN9it5PVmleDupq8sDdSlrGnoQHiR
-bVFM+b1vNb/2aIUXVbv/LNV7U3H5AodWfo9pnWn3RUukttbgEEXsySaiCYp7V4SP
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXVpc3NoaWJiMS51aXMuZWR1hihodHRwczov
-L3Vpc3NoaWJiMS51aXMuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQvUhoH
-DE3ZkxAMiVnfnl8OvlzZOzANBgkqhkiG9w0BAQUFAAOCAQEAi1RhYj99ekYjwezn
-a0YWdnvSXx6fkh2YL+16Jv82JpKxi7sUmY4uocaRBe4qurUejs6oYPEDZ7ukAu17
-ErSXYIhCo2RyRkYbPU15zf43DHIk3985x6Bt6uRvK95OEId1++UpdtXWajWLUQHX
-YSaParDLi6VuuWrkeep/G3ZZgErjMGhLosTJh73S2urmUflN9FBy9Tr2M+qlLE6R
-VSeGSuGQh526tY5HlqaZ6pYmQ4EFj5Iu9fhAlpQy2fvR16UjPG+dV7HwmdK3isqk
-LWaYSk6XCWIh1fIli2rNF5GbETJGOGfypjDL6f1P60+Sc8rg39XRANxBhbjLipD7
-9FRlnA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://uisshibb1.uis.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uisshibb1.uis.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uisshibb1.uis.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://uisshibb1.uis.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uisshibb1.uis.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uisshibb1.uis.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uis.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVAKHOcYSjaC5wZJQOZRw+J1v3yp5iMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEXVpc3NoaWJiMS51aXMuZWR1MB4XDTExMTEyMTIzMjQx
-M1oXDTMxMTEyMTIzMjQxM1owHDEaMBgGA1UEAxMRdWlzc2hpYmIxLnVpcy5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrBJ9UQjC2vfAIWHXN44ct
-h7f3ixq6gWlqpxu7xRIZbYQQf+R5vUX9EvsqsOlx4TBB3xKr4dbz/qzfB+u/EdBc
-RKpYKY+Vh8S8bj8A3juUlGzQSXM68pDV3F0Au4zP6uSx6LRj51n/fuapZhOleIJ4
-zYvsxrCVL3rgxaA2qHrl97FqzPt0UXVzezmeZAvIKdCqiP26rLKLwzVi1dHcjD1B
-/k4EwJSGE0G97GUs9usU268ckHWAjTP+y/kPN9it5PVmleDupq8sDdSlrGnoQHiR
-bVFM+b1vNb/2aIUXVbv/LNV7U3H5AodWfo9pnWn3RUukttbgEEXsySaiCYp7V4SP
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXVpc3NoaWJiMS51aXMuZWR1hihodHRwczov
-L3Vpc3NoaWJiMS51aXMuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQvUhoH
-DE3ZkxAMiVnfnl8OvlzZOzANBgkqhkiG9w0BAQUFAAOCAQEAi1RhYj99ekYjwezn
-a0YWdnvSXx6fkh2YL+16Jv82JpKxi7sUmY4uocaRBe4qurUejs6oYPEDZ7ukAu17
-ErSXYIhCo2RyRkYbPU15zf43DHIk3985x6Bt6uRvK95OEId1++UpdtXWajWLUQHX
-YSaParDLi6VuuWrkeep/G3ZZgErjMGhLosTJh73S2urmUflN9FBy9Tr2M+qlLE6R
-VSeGSuGQh526tY5HlqaZ6pYmQ4EFj5Iu9fhAlpQy2fvR16UjPG+dV7HwmdK3isqk
-LWaYSk6XCWIh1fIli2rNF5GbETJGOGfypjDL6f1P60+Sc8rg39XRANxBhbjLipD7
-9FRlnA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://uisshibb1.uis.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Illinois At Springfield</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Illinois At Springfield</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uis.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tulio Llosa</md:GivenName>
-    <md:EmailAddress>tllos1@uis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tulio Llosa</md:GivenName>
-    <md:EmailAddress>tllos1@uis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tulio Llosa</md:GivenName>
-    <md:EmailAddress>tllos1@uis.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml b/swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-shibboleth.xml
deleted file mode 100644
index 6c67b16b..00000000
--- a/swamid-interfederations-2.0/uk-bris-shibboleth.moveon4.com-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://uk-bris-shibboleth.moveon4.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for QS unisolution GmbH.
-	-->
-  <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#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="2014-11-05T15:07: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: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://uk-bris-shibboleth.moveon4.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://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">qsu-unisolution</mdui:DisplayName>
-        <mdui:Logo height="29" width="189">https://static.moveon4.com/sso/images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						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
-						swIdKrlywppmFlZP04UczhynlNo3
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uk-bris-shibboleth.moveon4.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">QS unisolution GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">qsu-unisolution</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kamran</GivenName>
-    <SurName>Tabassum</SurName>
-    <EmailAddress>mailto:kamran@zeptosystems.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Zia</GivenName>
-    <SurName>Qazi</SurName>
-    <EmailAddress>mailto:ziaqazi@zeptosystems.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml b/swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-shibboleth.xml
deleted file mode 100644
index a8ac2936..00000000
--- a/swamid-interfederations-2.0/uk-coventry-shibboleth.moveon4.com-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://uk-coventry-shibboleth.moveon4.com/shibboleth">
-  <!--
-		This is a "qsu-unisolution" Shibboleth SP for QS unisolution GmbH.
-	-->
-  <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#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="2015-11-02T10:53:16Z">
-      <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://uk-coventry-shibboleth.moveon4.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://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">qsu-unisolution</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						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
-						VBmw7O2i/F60fXVEf7AtB1a2KZfQ/Lw=
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uk-coventry-shibboleth.moveon4.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">QS unisolution GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">qsu-unisolution</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kamran</GivenName>
-    <SurName>Tabassum</SurName>
-    <EmailAddress>mailto:kamran@zeptosystems.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mubashar</GivenName>
-    <SurName>Latif</SurName>
-    <EmailAddress>mailto:mubashar.latif@zeptosystems.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uk.ihs.com-entity.xml b/swamid-interfederations-2.0/uk.ihs.com-entity.xml
deleted file mode 100644
index e3af500f..00000000
--- a/swamid-interfederations-2.0/uk.ihs.com-entity.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://uk.ihs.com/entity">
-  <!--
-		This is an OpenAthens service provider for IHS (Global) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIEGjCCAwKgAwIBAgIJANbtDttZCw1wMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
-						VQQGEwJVSzEQMA4GA1UECBMHRW5nbGFuZDESMBAGA1UEBxMJQnJhY2tuZWxsMQww
-						CgYDVQQKEwNJSFMxCzAJBgNVBAsTAklUMRYwFAYDVQQDEw13d3cuaWhzdGkuY29t
-						MSUwIwYJKoZIhvcNAQkBFhZob3N0aW5nc3VwcG9ydEBpaHMuY29tMB4XDTA5MDky
-						MjEwMzM0OFoXDTE5MDkyMDEwMzM0OFowgY0xCzAJBgNVBAYTAlVLMRAwDgYDVQQI
-						EwdFbmdsYW5kMRIwEAYDVQQHEwlCcmFja25lbGwxDDAKBgNVBAoTA0lIUzELMAkG
-						A1UECxMCSVQxFjAUBgNVBAMTDXd3dy5paHN0aS5jb20xJTAjBgkqhkiG9w0BCQEW
-						Fmhvc3RpbmdzdXBwb3J0QGlocy5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQC/Ba3IwwsIvQgkzb/ssluNjiU95zWtyFMBCJ9b03XmB12QPF+/nTEV
-						VFu8Lm4btL7bu4FEQs04rWfxQ4EWpNgeh//UzohcUkikRT+empVepOlyxMCBr+3Q
-						fq/JN8P9riOuhW6uiADUWQ1OXOTdl4lAUXzSc7e/N+7vg4wIb7xzFDtp6h8BqhdF
-						a/noDPXXFesxtEq0ZjSVYahNMOhpsIZXNPKjuBlCFM/IC+5K6LYCY+2qYcuKH4YB
-						QtDtc7/KKJK0i3SpormleAXE9UPX+79nQ2uqUbhNG6OQzKpD+nIYDN/sPec8u2m8
-						2c+GPkqg8pKQz6LzdL8uTN5sZHgzQvg9AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJ
-						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
-						DgQWBBR99TJ9Meg90c3p614N474dVMS82DAfBgNVHSMEGDAWgBR99TJ9Meg90c3p
-						614N474dVMS82DANBgkqhkiG9w0BAQUFAAOCAQEAPM9Luz4hiaqXrCtcJ8NmNp40
-						b8x/zkUTI9VRq0EtIlD2UqnVVAh4HrGgGI0wnlzIdyaMdfjied/PBflfDto5tTz9
-						Z/9C4EViX91kOmApwJyiScP/cJX4BjUk08vORqIbu8oXlOfmcCAjT5+Y6RcloS9h
-						nkGwwNk8UnymkQtqw/MnK3DKTxcLdG4iphtzwpbcnAgO/Nb/mT8/tRWy215OuDII
-						DzE+93eMDZMqxG6X3jyYtfF9f551vCFvTDvOxkDd9dnSYPzb+++8BfTYtEnwpNiK
-						yKYcCFVxFCy1km7h2HBrOZMLUAbs0gGoTmSRAEByt0E3C8xzV1Ywu9htzRHmog==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ihsti.com/logon/federatedaccess/UKFedAuthRec.aspx" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ihsti.com/logon/federatedaccess/UKFedAuthRec.aspx" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IHS (Global) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IHS (Global) Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://uk.ihs.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Customer Support</GivenName>
-    <EmailAddress>mailto:customer.support@ihs.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Trevor</GivenName>
-    <SurName>Cooley</SurName>
-    <EmailAddress>mailto:trevor.cooley@ihs.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uk.practicallaw.com-cs-oa-metadata.xml b/swamid-interfederations-2.0/uk.practicallaw.com-cs-oa-metadata.xml
deleted file mode 100644
index dfa118d0..00000000
--- a/swamid-interfederations-2.0/uk.practicallaw.com-cs-oa-metadata.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://uk.practicallaw.com/cs/oa/metadata">
-  <!--
-		This is a "Practical Law" OpenAthens SP for Thomson Reuters (Professional) UK Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-07T09:24:06Z">
-      <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">Practical Law</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A legal solution from Thomson Reuters providing practical know how (including practice notes, precedents and checklists) to help lawyers work smarter and more efficiently. Practical Law know how is created and maintained by a team of 300 lawyer-editors.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6DCCAdCgAwIBAgIEU1pN/TANBgkqhkiG9w0BAQUFADA2MRYwFAYDVQQKEw1Q
-						cmFjdGljYWwgTGF3MRwwGgYDVQQDExN1ay5wcmFjdGljYWxsYXcuY29tMB4XDTE0
-						MDQyNTExNTg1M1oXDTI0MDQyMjExNTg1M1owNjEWMBQGA1UEChMNUHJhY3RpY2Fs
-						IExhdzEcMBoGA1UEAxMTdWsucHJhY3RpY2FsbGF3LmNvbTCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAJBGaaaJYyVzFc48ThFdkzUVkcPFQLgdZGSuQYPe
-						6hps6CmWGKKxGF5Wra1PlYMrgxu8dOMtMgzBTGEySJnjm5SUUemHehN+xL9AyCs2
-						UgHJooNsqdu6PbxVJMOhFuVCGhiIysSFA/xBinxRBgPcl+4aLIXdE8Lha2CWYxdd
-						4BfeOtx7X92vqpmBmMI/68/7BZWiJAmmko1D+OgH/DupwmdkasFisVcdFzWUQEgp
-						OY65dB7FxZpOY3zXrC7Af3OUxw9RnnlsgD2boRU48ddGBh4txXBU5Ft7RaGuRM+K
-						Bfh24nSjIXd1YDOjhTOPnD5Ty6/lO+tT+4Zlsww85LQKEwcCAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEAGlqkedupw+BYF0ae7nLgesJ2VBdGTabqg+vB/G16ZAGKeBoj
-						vmd0w4Aii9sNnyb6BIQvXnlqvi7sNRXcBovlaQARTpTcCm9jHqWPvZzK9hxdm2/o
-						kbHBKjHnTL7YBxPwMfHkaOmQhx2tTPgGhOK34eUzhXlLSPYrtGcde/pCFsyuhCUT
-						NJ0vqLTB/w2YDJ0jC7xTCx+X6N+NulCteQosnKxtZ/blaHMwwX+j96LGHPtpOmN7
-						f1v1bBVmrjy6E1aWTdH7G4cEhMIyfPeZRZvuThhKDGjBVRy1EjI+FSxWPxM1WnsD
-						y8wft8UJXsBOJlHjpkjdcaR+DS88edmhvJNRbQ==
-					</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>
-						MIIC6DCCAdCgAwIBAgIEU1pN/TANBgkqhkiG9w0BAQUFADA2MRYwFAYDVQQKEw1Q
-						cmFjdGljYWwgTGF3MRwwGgYDVQQDExN1ay5wcmFjdGljYWxsYXcuY29tMB4XDTE0
-						MDQyNTExNTg1M1oXDTI0MDQyMjExNTg1M1owNjEWMBQGA1UEChMNUHJhY3RpY2Fs
-						IExhdzEcMBoGA1UEAxMTdWsucHJhY3RpY2FsbGF3LmNvbTCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAJBGaaaJYyVzFc48ThFdkzUVkcPFQLgdZGSuQYPe
-						6hps6CmWGKKxGF5Wra1PlYMrgxu8dOMtMgzBTGEySJnjm5SUUemHehN+xL9AyCs2
-						UgHJooNsqdu6PbxVJMOhFuVCGhiIysSFA/xBinxRBgPcl+4aLIXdE8Lha2CWYxdd
-						4BfeOtx7X92vqpmBmMI/68/7BZWiJAmmko1D+OgH/DupwmdkasFisVcdFzWUQEgp
-						OY65dB7FxZpOY3zXrC7Af3OUxw9RnnlsgD2boRU48ddGBh4txXBU5Ft7RaGuRM+K
-						Bfh24nSjIXd1YDOjhTOPnD5Ty6/lO+tT+4Zlsww85LQKEwcCAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEAGlqkedupw+BYF0ae7nLgesJ2VBdGTabqg+vB/G16ZAGKeBoj
-						vmd0w4Aii9sNnyb6BIQvXnlqvi7sNRXcBovlaQARTpTcCm9jHqWPvZzK9hxdm2/o
-						kbHBKjHnTL7YBxPwMfHkaOmQhx2tTPgGhOK34eUzhXlLSPYrtGcde/pCFsyuhCUT
-						NJ0vqLTB/w2YDJ0jC7xTCx+X6N+NulCteQosnKxtZ/blaHMwwX+j96LGHPtpOmN7
-						f1v1bBVmrjy6E1aWTdH7G4cEhMIyfPeZRZvuThhKDGjBVRy1EjI+FSxWPxM1WnsD
-						y8wft8UJXsBOJlHjpkjdcaR+DS88edmhvJNRbQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uk.practicallaw.com/cs/oa/auth/rcv/shib/post" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uk.practicallaw.com/cs/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uk.practicallaw.com/cs/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uk.practicallaw.com/cs/oa/auth/rcv/saml2/art" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://global.practicallaw.com/cs/oa/auth/rcv/shib/post" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://global.practicallaw.com/cs/oa/auth/rcv/shib/art" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://global.practicallaw.com/cs/oa/auth/rcv/saml2/post" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://global.practicallaw.com/cs/oa/auth/rcv/saml2/art" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Practical Law</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://uk.practicallaw.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Christopher</GivenName>
-    <SurName>Parker</SurName>
-    <EmailAddress>mailto:Christopher.Parker@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Web Operations Group</GivenName>
-    <EmailAddress>mailto:lukiwebops@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alan</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:alan.wilson@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Web Operations Group</GivenName>
-    <EmailAddress>mailto:lukiwebops@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-shibboleth.xml
deleted file mode 100644
index ed6a6423..00000000
--- a/swamid-interfederations-2.0/ukaf.it-innovation.soton.ac.uk-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://ukaf.it-innovation.soton.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for the University of Southampton.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-13T15:30:07Z"/>
-  </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://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GENESI-DEC bridge to UK Access Management federation</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Enables UK Access Management federation members to access GENESI-DEC repositories</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjygAwIBAgIJAL06GKgIw781MA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-						BAMTHnVrYWYuaXQtaW5ub3ZhdGlvbi5zb3Rvbi5hYy51azAeFw0xMjAyMjMxNDU5
-						MzVaFw0yMjAyMjAxNDU5MzVaMCkxJzAlBgNVBAMTHnVrYWYuaXQtaW5ub3ZhdGlv
-						bi5zb3Rvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsh
-						7nb5qjRPVhJKl7d7HtTfVbmWSMq1NPzDzYyTMAOg0+VcmDFvu5ICIp0w2w07QzGv
-						3ryZp2TaT+9DNyYaeVfnSB5rPPAuHLHrXvTwszgfXH6Bq88fkBLEHR7xIMPNqNFG
-						9JHf6VY3Z6HwRhX2wJt34O6IO7q1AuMsgmSR8vLD6ftHX7VzSXkS305cA1zNN1vD
-						xnV8Zp8ZyNE3F5xVCZBVs7XK9futaxSL8GJfX8l0IzBFeezXh9BmN5p0/2KDtwmw
-						YsBinxXAIwBCUVctfuMpnM3p9ZHRTfR4hbkDwpbTXxwEmajDXnyrbdNK/zEuGhOW
-						4+m38wiymTEmMQaPys0CAwEAAaN/MH0wXAYDVR0RBFUwU4IedWthZi5pdC1pbm5v
-						dmF0aW9uLnNvdG9uLmFjLnVrhjFodHRwczovL3VrYWYuaXQtaW5ub3ZhdGlvbi5z
-						b3Rvbi5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBTAs5xK22h/EZSU8IMQeGKQ
-						mYg4YjANBgkqhkiG9w0BAQUFAAOCAQEAxm8quSodKR3OSqZKQyv48Nw4ztkOgoIq
-						iRT/SNCtGIsIxRLE/wh6VD92ini8KLXyjY+9vnySiIz7EmPU8noS67XRkfMss33Y
-						gB0uKN4jwo7wQw0oWzd7YuPjWBfWVgHElvtITjpJ/NR5MCk2A4w2kKjvCd70e+Ut
-						O8Uiewnm0VArTVusZ1IZtT3P+5Yp4Hiq5+sjtRbxhTQn/cAkl57CemlBrj6jsPT2
-						uH0taQOxowajF5t/STCwIlCRBNptPlAMFB0x6AB2Oq2dNjzLhq8VnpSAZ6+EwSuo
-						3nkLy6HSlY8Nka9tIZollWJv0yu6+6BHzf/KMzryiGaxpKjMtB+Caw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukaf.it-innovation.soton.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Southampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GENESI-DEC bridge to UK Access Management federation</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it-innovation.soton.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Help Desk</GivenName>
-    <EmailAddress>mailto:support@it-innovation.soton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Web Master</GivenName>
-    <EmailAddress>mailto:webmaster@it-innovation.soton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukamf.belfastmet.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ukamf.belfastmet.ac.uk-shibboleth.xml
deleted file mode 100644
index a451236d..00000000
--- a/swamid-interfederations-2.0/ukamf.belfastmet.ac.uk-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://ukamf.belfastmet.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Belfast Metropolitan College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-16T11: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">belfastmet.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbDCCAlQCCQDS2kVQVGZPUTANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGQW50cmltMRAwDgYDVQQHEwdCZWxmYXN0MSUwIwYDVQQKExxC
-						ZWxmYXN0IE1ldHJvcG9saXRhbiBDb2xsZWdlMR8wHQYDVQQDExZ1a2FtZi5iZWxm
-						YXN0bWV0LmFjLnVrMB4XDTE0MDMwNTA5NTUwNVoXDTM0MDIyODA5NTUwNVoweDEL
-						MAkGA1UEBhMCR0IxDzANBgNVBAgTBkFudHJpbTEQMA4GA1UEBxMHQmVsZmFzdDEl
-						MCMGA1UEChMcQmVsZmFzdCBNZXRyb3BvbGl0YW4gQ29sbGVnZTEfMB0GA1UEAxMW
-						dWthbWYuYmVsZmFzdG1ldC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAPLTkv6VRQDek5hYjPK1NawnSD9oeyhD+49qSNtArFn0C7VUSj3m+ags
-						5AAoNGDCLvxZ2suDNlPfLJs25ql4/TdyzFLcAPe09MClF5h8drxz264w9/fL+Oen
-						RnFSDBHSBkc1VwAxbmhoRbeR/fuxqwEtxfRnhU7p3YQSuVchtBNXyqN2J5UlW3Jb
-						ckV+4ITMNIVJdvqZPH8KoCEFCbblIA7I1atNNTUA0QelcNEYEYc4r6AvLijw/zmr
-						zzSOhpoycdy1vhId/rPZZ5/PxHZWEqgZep/MFl9MW1h4jbWBdtkEiD1wHkSl3EZr
-						Uorg9PcWnWQQr3A3uG3F4XJKfgYdyMcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						dOnRSUciIibF74fAF1NGvnXdyiMwznJcOogjfFKglD8dzkvqPahw29NipSBHcUoZ
-						28Qyn4cHJd9UWpr20uDLK2N3EU5eorUqcGDb/YIR3M6S0cYQF1qz+b33EuJo57rd
-						M36PNV1otHQPewerYlauSTnIh3lNNN1i5hCh8T+Xedz9pSH9kXBHY1r0Twzt7EWI
-						zUilG5FJClGAgoOvIxbWkcT9SVdFk5jX5f73w2fWDy/hLAvizbrVs1CFbwy9x/8s
-						c31IzqmKufqdF2tzXEe3rO8xUV7FsFPbPaXMJi/zLhWbT9vtQkhE4ZFLnvV4sHm8
-						BgVr2TuWFh2nO+9r+umLkg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukamf.belfastmet.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukamf.belfastmet.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://ukamf.belfastmet.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukamf.belfastmet.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukamf.belfastmet.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukamf.belfastmet.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">belfastmet.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbDCCAlQCCQDS2kVQVGZPUTANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGQW50cmltMRAwDgYDVQQHEwdCZWxmYXN0MSUwIwYDVQQKExxC
-						ZWxmYXN0IE1ldHJvcG9saXRhbiBDb2xsZWdlMR8wHQYDVQQDExZ1a2FtZi5iZWxm
-						YXN0bWV0LmFjLnVrMB4XDTE0MDMwNTA5NTUwNVoXDTM0MDIyODA5NTUwNVoweDEL
-						MAkGA1UEBhMCR0IxDzANBgNVBAgTBkFudHJpbTEQMA4GA1UEBxMHQmVsZmFzdDEl
-						MCMGA1UEChMcQmVsZmFzdCBNZXRyb3BvbGl0YW4gQ29sbGVnZTEfMB0GA1UEAxMW
-						dWthbWYuYmVsZmFzdG1ldC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAPLTkv6VRQDek5hYjPK1NawnSD9oeyhD+49qSNtArFn0C7VUSj3m+ags
-						5AAoNGDCLvxZ2suDNlPfLJs25ql4/TdyzFLcAPe09MClF5h8drxz264w9/fL+Oen
-						RnFSDBHSBkc1VwAxbmhoRbeR/fuxqwEtxfRnhU7p3YQSuVchtBNXyqN2J5UlW3Jb
-						ckV+4ITMNIVJdvqZPH8KoCEFCbblIA7I1atNNTUA0QelcNEYEYc4r6AvLijw/zmr
-						zzSOhpoycdy1vhId/rPZZ5/PxHZWEqgZep/MFl9MW1h4jbWBdtkEiD1wHkSl3EZr
-						Uorg9PcWnWQQr3A3uG3F4XJKfgYdyMcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						dOnRSUciIibF74fAF1NGvnXdyiMwznJcOogjfFKglD8dzkvqPahw29NipSBHcUoZ
-						28Qyn4cHJd9UWpr20uDLK2N3EU5eorUqcGDb/YIR3M6S0cYQF1qz+b33EuJo57rd
-						M36PNV1otHQPewerYlauSTnIh3lNNN1i5hCh8T+Xedz9pSH9kXBHY1r0Twzt7EWI
-						zUilG5FJClGAgoOvIxbWkcT9SVdFk5jX5f73w2fWDy/hLAvizbrVs1CFbwy9x/8s
-						c31IzqmKufqdF2tzXEe3rO8xUV7FsFPbPaXMJi/zLhWbT9vtQkhE4ZFLnvV4sHm8
-						BgVr2TuWFh2nO+9r+umLkg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukamf.belfastmet.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukamf.belfastmet.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">Belfast Metropolitan College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Belfast Metropolitan College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.belfastmet.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Moran</SurName>
-    <EmailAddress>mailto:imoran@belfastmet.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>O'Reilly</SurName>
-    <EmailAddress>mailto:poreilly@belfastmet.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukdsdev01.ds.man.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ukdsdev01.ds.man.ac.uk-shibboleth.xml
deleted file mode 100644
index 11d9cf24..00000000
--- a/swamid-interfederations-2.0/ukdsdev01.ds.man.ac.uk-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://ukdsdev01.ds.man.ac.uk/shibboleth">
-  <!--
-		This is a "UK Data Service Development Server 01" Shibboleth SP for The University of Manchester.
-	-->
-  <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="2013-08-28T10:05:43Z"/>
-  </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://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAJQ6G0iUGwxqMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnVrZHNkZXYwMS5kcy5tYW4uYWMudWswHhcNMTMwODI3MTExNDIwWhcNMjMw
-						ODI1MTExNDIwWjAhMR8wHQYDVQQDExZ1a2RzZGV2MDEuZHMubWFuLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6jrshIhFr1+KeJ+y0r7iJ3A/
-						rBC1NRF37B6kkETjvys8fB3rlHd6FmYsN1Avz3CvlSXldom4yi7lJ7Qg7D5bn2Wy
-						buSPBi0OCCA9eHkbCpAwkFoTHQyfXWdGBOV/L1X5rfmetBbA21EjvxcZYzYndqBY
-						eUrYTrHZkwDfKf9L3+Qym2RWnGC5S/WmVmMmTNv0W49U80wZsPVHjL7ZS+2m2KhW
-						gtQfo7ajDiRtNKwt+4ERVwu8D/kZk9hzlYwvHr1Gb7HVc5sRM5i4MCO5MAcLq80R
-						Fk7Hh7aLR0mnSk1DP6ZJgX9gOLaqq08NIZ+vuIiGOTL2j02Iw1LwMqFH9TJlJwID
-						AQABo0QwQjAhBgNVHREEGjAYghZ1a2RzZGV2MDEuZHMubWFuLmFjLnVrMB0GA1Ud
-						DgQWBBR1ncC2lP6ZoPxifhXf0uadQrtHYjANBgkqhkiG9w0BAQUFAAOCAQEAZKKU
-						Z1Mulo7W/CRWi3gKja0RXSCnBpUxLmsK0t15x0yyzkl+32aFufv7KJnss3hVM8ad
-						vg4P2x7N0/ynIXMAnnQ4oSoxcrcpTeHNmoxihWbHrr7fulyC7M5xOcnYbzJnZkl/
-						EIR0cR/e6eNoGWlwT90ahXojm0dpWDhg0Mhd6K3WmBNYzj+kgzrMKz9HnMm/k0OI
-						NjwwhBPTGbuTw70hTnAbdHtos1vz/wSFk+Eff5MzXnH2nmtw3TPIxviq2ZAoZRRa
-						2l4Z2j1AtknzLhBHs0kVF8oFjRNb6DilqMa5avXU4QrNPMpVrJopPuEyJ8mJ/1F8
-						Rduyp41iuU+v6vWNtQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukdsdev01.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MIMAS: UK Data Service Development Server 01</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mimas.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Susan</GivenName>
-    <SurName>Noble</SurName>
-    <EmailAddress>mailto:Susan.Noble@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukdsdev02.ds.man.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ukdsdev02.ds.man.ac.uk-shibboleth.xml
deleted file mode 100644
index 17b53684..00000000
--- a/swamid-interfederations-2.0/ukdsdev02.ds.man.ac.uk-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://ukdsdev02.ds.man.ac.uk/shibboleth">
-  <!--
-		This is a "UK Data Service Development Server 02" Shibboleth SP for The University of Manchester.
-	-->
-  <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="2013-05-10T10:29:41Z"/>
-  </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://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAIIDXwPwi+LyMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnVrZHNkZXYwMi5kcy5tYW4uYWMudWswHhcNMTMwNTA3MjIwNDQ5WhcNMjMw
-						NTA1MjIwNDQ5WjAhMR8wHQYDVQQDExZ1a2RzZGV2MDIuZHMubWFuLmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxWv1f4Zdu52CZBxZqf1DwU11
-						Otm/yjLWwHJkOXiKBkKcglwarnpyugvCHWLKLAP0z92u1Y8096RjJGRDfKA9hCjs
-						oaxCXBJvAF0CfyMJeiwtfs329Ue5ldClYGP4rwQotdBwLyyWo0SuP/se0S2M8xp0
-						A+voqvLUdsxG4hc0YvMMqH/kzhZ3dKyJ/Tk/fTWU6neTGvn3dwS/duQ3aJRkyzNT
-						5/h33Qp+LTy0Dd2p2B60cvtYE+5RbBnkgN/q2rx15mVLmwv1HWSwrgoTHqT6j1tE
-						pnRbNJnhwCsmzJtMvn7jEvSX59b3vng0/k8dVvF3F+S2Rd+W+ovGtfFJY99DFQID
-						AQABo0QwQjAhBgNVHREEGjAYghZ1a2RzZGV2MDIuZHMubWFuLmFjLnVrMB0GA1Ud
-						DgQWBBRFo5TxIqVQV5pH2yn/082R9vdp/TANBgkqhkiG9w0BAQUFAAOCAQEARCdl
-						cpIlZDByr7ZgfV1DoRhYUC5Jy4NlLEEmJO8eee2FNk7ErmVZe0u+XxOA3imTHhnw
-						CZHLcJOfe2S37JOd0FViOx4oJPrMx544WTE1yzNTeRQk1x584f6k2h/p7Bv4neZ2
-						CWBPAc229eO0WNrIpfPNUcWkek5yi0yfUxHr1PwLRQx838+/FT3CVwb+vsK9QieB
-						25KjLzXOmj1F3wz9Rf3+0u0lPYbcaz9dO/OWp47q5VaUWmyIjRCRPGtrWFxvgnC+
-						6ddjZbh92KxHLsDPbnY+Z3i90jxHsb1L1vclx7sa5sfiU/eLhMPHVCNglmZJ8VQy
-						Xc+mCSMo3CZsZHhC7w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukdsdev02.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MIMAS: UK Data Service Development Server 02</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mimas.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Susan</GivenName>
-    <SurName>Noble</SurName>
-    <EmailAddress>mailto:Susan.Noble@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index fa916188..00000000
--- a/swamid-interfederations-2.0/ukf-cds-dev.edina.ac.uk-idp-shibboleth.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ukf-cds-dev.edina.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth test IdP for the University of Edinburgh.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-01-16T11:14:41Z">
-      <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 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">ukf-cds-dev.edina.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UKf Test V3 IdP on ukf-cds-dev.edina.ac.uk</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIUBB4CY9LTFyM3EXf9sYyoc5nC8bswDQYJKoZIhvcNAQEL
-						BQAwIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYuZWRpbmEuYWMudWswHhcNMTUwMTE0
-						MTkyMTQ0WhcNMzUwMTE0MTkyMTQ0WjAiMSAwHgYDVQQDDBd1a2YtY2RzLWRldi5l
-						ZGluYS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJJjGHX0
-						gTsZeh7pBq1fotfiY5p7TFfhWXl9NLAn8qtjopUPZ7INVm9eiXN6wtDT+Sa64bgb
-						RNXj3XORrxDmUgNEwEqb7ztFw7T6OcewKFNwqGwC/Ie3Pa4RhkkOJjVZUcrnLJdz
-						uuw/dKWF8XIivcg+tenjVB8/l0FTZAF4soVOSJeOOirzJ25kzI6NKWbPLuRzjIXy
-						VghaindImSruNTwpXJScPGHwEnzgPs5MfE3oqR7hAzX+qYk477fK9ThCPPU84Iap
-						iudMKcBaRS03FqBG/c9jcFOBIUStL8+X16JlSiL0ClYhN6Uz2mjcweh07p/jLLTx
-						+fszhA2i2+E1jT0CAwEAAaN1MHMwHQYDVR0OBBYEFMKj+WwrZtwZ+eQVXf//sE6Y
-						Ku2JMFIGA1UdEQRLMEmCF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrhi5odHRwczov
-						L3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-						DQEBCwUAA4IBAQCGKsD7QegA/s6Jy27QPGXzM+k74R/IqYumr9lJ31ozKrEgUmIa
-						yYI9+uGvBb7nwesbKbzGZ9JQg6KvZyx0BckkZk6ih9lPWQuPQIo+aSHME9abUM10
-						CUMKFtU6UP1Y4qbpKrdDCkvUxcvVWtZUhPID8pRihZC6H+e1ClWPLPZEk/OFmQL3
-						gP5k7yksZI/us6PsMnvSEy2TKxtUcZNxEmS+muI7baepenTBLGDK3+lEwZxsAXsZ
-						XcsYNzIwAw+Lhphm6Cl/dM4X6QyvJGHqf+D/ZhHB2ltd4faO+sDurmcmHLpZ+b7g
-						CIW6zaDitlDneg+4iWmQJ9ciDA+53VkCHt91
-					</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>
-						MIIDSDCCAjCgAwIBAgIVAISNTXRh2wiSKN30xxQsJll0coC3MA0GCSqGSIb3DQEB
-						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
-						NDE5MjE0M1oXDTM1MDExNDE5MjE0M1owIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
-						ZWRpbmEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZsUXz
-						hV5tyaOviAMJ4hlKf7g1aFguY089foMCIaBOgNs7boEHHweTkMo9XmOZ2m2RUKMK
-						J4pXMu6AlO8QkxQvN4CsClGLeTUU627Sg8n528HTQZDCgXD2/fCdNciORlQ1OvYv
-						qDrS8RXnaCqnO/6sidUF+osg8zufV/a0reSlORH2snMfM+HGn3WTqYI2Yi3JeB7u
-						XjwqYMJ8p9gP3JLpipKKg5QVfAq4aol2sueygwEv9+eZB5AJMP/Kmw39nMvi1DBc
-						VePzQwbgaJRw+buqUCP3BswuOC+kKswUbSugqVK6T7FK8s/1komuudBR5VSda9tv
-						SwC85UZKDqSQgsZDAgMBAAGjdTBzMB0GA1UdDgQWBBSkxKn4g8SR4Ekk8u0mk84V
-						AVjyXTBSBgNVHREESzBJghd1a2YtY2RzLWRldi5lZGluYS5hYy51a4YuaHR0cHM6
-						Ly91a2YtY2RzLWRldi5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEAZqUX2GjoqblfFGGKDoVM3WFis1umleH9y6VNYes/KnI2EPaJ
-						cjCb05KKpt5U5Wkx7lprMHsyGq+HgirrYrqtpwn47bdoh7oQ3VvzHn7vNpinBHh1
-						CaDUKRKHr/Na+Yv+M0S23nR4dWn1gPzycUttJpueQyjPxh2lkE5rlzOIIynnurwV
-						Q02bZ4JCaP5GAJw8C54H10EdxRgzv5wZdRxWQfJGFCSYmCE70EkfZJD+Q+AH12Yc
-						clLy0UggCGh3aK6o9Xh8a0uYEDwRoaqQYICkGyyr9ZpFhEQGLyoHdOjnytMWK0g6
-						fmmaemg0jVARvKleJCUu9vzFHDpUJAmXlB8X0w==
-					</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>
-						MIIDSDCCAjCgAwIBAgIVAMyETyrbJMvfpEgxBPZJODiVCBsEMA0GCSqGSIb3DQEB
-						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
-						NDE5MjE0NFoXDTM1MDExNDE5MjE0NFowIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
-						ZWRpbmEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgclRI
-						qtCb5bEZag4Wl2L46TmFPxqaqm7iexkjGDf0sznghGesSWjl5atvEpfvUPlKPPUA
-						Fev9gxnx43FxZgMienEXJ90AJQOGtxLlv637DYsfWRV1xcRo0Mg2ssI3nDcGG/l0
-						dW/M6ZUHTYXiy7DBOu1oebrCz7/TT+yG0j/4abqUatu+vCZisyZ+euro2P6XqlOI
-						deafWyxDunj7oAj0hkfjEjPmy6/ZR914ter0Yas7Pp7PZXfLfIWfSn1IuoDb3F8L
-						bovi40ZNnL8mSrj4k9T87JkJKNs34Ae9DGOig20bYnoIo3UxLj+BVLUfEcaIbBa1
-						rLVIESYf4czLw/aDAgMBAAGjdTBzMB0GA1UdDgQWBBSooCAlGu0lof2KxKIRS4FM
-						ZovoFjBSBgNVHREESzBJghd1a2YtY2RzLWRldi5lZGluYS5hYy51a4YuaHR0cHM6
-						Ly91a2YtY2RzLWRldi5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEAb72v10CpBtC2a3WfirN6Hb+tC75rGU8yk+jU9uhwK1K9YKxq
-						1Vl+s+VSQG5j/cwFIwFR/ysSpTV48dEhRCJoVKMdc6s/1M4ZWj86Y590ZxY4CxfK
-						zcE8DCY9TJw0gt/4IJ+lKKD5d84pPEbf28JwFSQzR0tuotJgv1jB7xWAHeiZXEw1
-						HIX5hCyV5er2P4FmLwybtmJn1b+G0+GS810Pkfv/U7klyobndVigZ673cycGQ3UN
-						uZOnrbQ20spV0hJV0PgfrgGFHRK9eYTz1XlILKpG8fX+WhP4QOro5ywT8nMCUZ7f
-						Epl1SF0WLq/28i3NlTE1SQKjWVgTnSbQNe6Qpg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.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://ukf-cds-dev.edina.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukf-cds-dev.edina.ac.uk/idp/profile/SAML2/Redirect/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">ukf-cds-dev.edina.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIUBB4CY9LTFyM3EXf9sYyoc5nC8bswDQYJKoZIhvcNAQEL
-						BQAwIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYuZWRpbmEuYWMudWswHhcNMTUwMTE0
-						MTkyMTQ0WhcNMzUwMTE0MTkyMTQ0WjAiMSAwHgYDVQQDDBd1a2YtY2RzLWRldi5l
-						ZGluYS5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJJjGHX0
-						gTsZeh7pBq1fotfiY5p7TFfhWXl9NLAn8qtjopUPZ7INVm9eiXN6wtDT+Sa64bgb
-						RNXj3XORrxDmUgNEwEqb7ztFw7T6OcewKFNwqGwC/Ie3Pa4RhkkOJjVZUcrnLJdz
-						uuw/dKWF8XIivcg+tenjVB8/l0FTZAF4soVOSJeOOirzJ25kzI6NKWbPLuRzjIXy
-						VghaindImSruNTwpXJScPGHwEnzgPs5MfE3oqR7hAzX+qYk477fK9ThCPPU84Iap
-						iudMKcBaRS03FqBG/c9jcFOBIUStL8+X16JlSiL0ClYhN6Uz2mjcweh07p/jLLTx
-						+fszhA2i2+E1jT0CAwEAAaN1MHMwHQYDVR0OBBYEFMKj+WwrZtwZ+eQVXf//sE6Y
-						Ku2JMFIGA1UdEQRLMEmCF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrhi5odHRwczov
-						L3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-						DQEBCwUAA4IBAQCGKsD7QegA/s6Jy27QPGXzM+k74R/IqYumr9lJ31ozKrEgUmIa
-						yYI9+uGvBb7nwesbKbzGZ9JQg6KvZyx0BckkZk6ih9lPWQuPQIo+aSHME9abUM10
-						CUMKFtU6UP1Y4qbpKrdDCkvUxcvVWtZUhPID8pRihZC6H+e1ClWPLPZEk/OFmQL3
-						gP5k7yksZI/us6PsMnvSEy2TKxtUcZNxEmS+muI7baepenTBLGDK3+lEwZxsAXsZ
-						XcsYNzIwAw+Lhphm6Cl/dM4X6QyvJGHqf+D/ZhHB2ltd4faO+sDurmcmHLpZ+b7g
-						CIW6zaDitlDneg+4iWmQJ9ciDA+53VkCHt91
-					</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>
-						MIIDSDCCAjCgAwIBAgIVAISNTXRh2wiSKN30xxQsJll0coC3MA0GCSqGSIb3DQEB
-						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
-						NDE5MjE0M1oXDTM1MDExNDE5MjE0M1owIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
-						ZWRpbmEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZsUXz
-						hV5tyaOviAMJ4hlKf7g1aFguY089foMCIaBOgNs7boEHHweTkMo9XmOZ2m2RUKMK
-						J4pXMu6AlO8QkxQvN4CsClGLeTUU627Sg8n528HTQZDCgXD2/fCdNciORlQ1OvYv
-						qDrS8RXnaCqnO/6sidUF+osg8zufV/a0reSlORH2snMfM+HGn3WTqYI2Yi3JeB7u
-						XjwqYMJ8p9gP3JLpipKKg5QVfAq4aol2sueygwEv9+eZB5AJMP/Kmw39nMvi1DBc
-						VePzQwbgaJRw+buqUCP3BswuOC+kKswUbSugqVK6T7FK8s/1komuudBR5VSda9tv
-						SwC85UZKDqSQgsZDAgMBAAGjdTBzMB0GA1UdDgQWBBSkxKn4g8SR4Ekk8u0mk84V
-						AVjyXTBSBgNVHREESzBJghd1a2YtY2RzLWRldi5lZGluYS5hYy51a4YuaHR0cHM6
-						Ly91a2YtY2RzLWRldi5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEAZqUX2GjoqblfFGGKDoVM3WFis1umleH9y6VNYes/KnI2EPaJ
-						cjCb05KKpt5U5Wkx7lprMHsyGq+HgirrYrqtpwn47bdoh7oQ3VvzHn7vNpinBHh1
-						CaDUKRKHr/Na+Yv+M0S23nR4dWn1gPzycUttJpueQyjPxh2lkE5rlzOIIynnurwV
-						Q02bZ4JCaP5GAJw8C54H10EdxRgzv5wZdRxWQfJGFCSYmCE70EkfZJD+Q+AH12Yc
-						clLy0UggCGh3aK6o9Xh8a0uYEDwRoaqQYICkGyyr9ZpFhEQGLyoHdOjnytMWK0g6
-						fmmaemg0jVARvKleJCUu9vzFHDpUJAmXlB8X0w==
-					</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>
-						MIIDSDCCAjCgAwIBAgIVAMyETyrbJMvfpEgxBPZJODiVCBsEMA0GCSqGSIb3DQEB
-						CwUAMCIxIDAeBgNVBAMMF3VrZi1jZHMtZGV2LmVkaW5hLmFjLnVrMB4XDTE1MDEx
-						NDE5MjE0NFoXDTM1MDExNDE5MjE0NFowIjEgMB4GA1UEAwwXdWtmLWNkcy1kZXYu
-						ZWRpbmEuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgclRI
-						qtCb5bEZag4Wl2L46TmFPxqaqm7iexkjGDf0sznghGesSWjl5atvEpfvUPlKPPUA
-						Fev9gxnx43FxZgMienEXJ90AJQOGtxLlv637DYsfWRV1xcRo0Mg2ssI3nDcGG/l0
-						dW/M6ZUHTYXiy7DBOu1oebrCz7/TT+yG0j/4abqUatu+vCZisyZ+euro2P6XqlOI
-						deafWyxDunj7oAj0hkfjEjPmy6/ZR914ter0Yas7Pp7PZXfLfIWfSn1IuoDb3F8L
-						bovi40ZNnL8mSrj4k9T87JkJKNs34Ae9DGOig20bYnoIo3UxLj+BVLUfEcaIbBa1
-						rLVIESYf4czLw/aDAgMBAAGjdTBzMB0GA1UdDgQWBBSooCAlGu0lof2KxKIRS4FM
-						ZovoFjBSBgNVHREESzBJghd1a2YtY2RzLWRldi5lZGluYS5hYy51a4YuaHR0cHM6
-						Ly91a2YtY2RzLWRldi5lZGluYS5hYy51ay9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-						9w0BAQsFAAOCAQEAb72v10CpBtC2a3WfirN6Hb+tC75rGU8yk+jU9uhwK1K9YKxq
-						1Vl+s+VSQG5j/cwFIwFR/ysSpTV48dEhRCJoVKMdc6s/1M4ZWj86Y590ZxY4CxfK
-						zcE8DCY9TJw0gt/4IJ+lKKD5d84pPEbf28JwFSQzR0tuotJgv1jB7xWAHeiZXEw1
-						HIX5hCyV5er2P4FmLwybtmJn1b+G0+GS810Pkfv/U7klyobndVigZ673cycGQ3UN
-						uZOnrbQ20spV0hJV0PgfrgGFHRK9eYTz1XlILKpG8fX+WhP4QOro5ywT8nMCUZ7f
-						Epl1SF0WLq/28i3NlTE1SQKjWVgTnSbQNe6Qpg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukf-cds-dev.edina.ac.uk:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UKf Test V3 IdP on ukf-cds-dev.edina.ac.uk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://ukfederation.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sara</GivenName>
-    <SurName>Hopkins</SurName>
-    <EmailAddress>mailto:sara.hopkins@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukfed.one-test2.contrail.rl.ac.uk-portal-sp.xml b/swamid-interfederations-2.0/ukfed.one-test2.contrail.rl.ac.uk-portal-sp.xml
deleted file mode 100644
index 2d5b63fc..00000000
--- a/swamid-interfederations-2.0/ukfed.one-test2.contrail.rl.ac.uk-portal-sp.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://ukfed.one-test2.contrail.rl.ac.uk/portal/sp">
-  <!--
-		This is a "Contrail project, STFC" simpleSAMLphp SP for the Science and Technology Facilities Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-28T13:24:07Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID5DCCAsygAwIBAgIJALS9Y48v9modMA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNV
-						BAYTAlVLMQ0wCwYDVQQIDARPeG9uMRAwDgYDVQQHDAdDaGlsdG9uMQ0wCwYDVQQK
-						DARTVEZDMQwwCgYDVQQLDANTQ0QxJjAkBgNVBAMMHSoub25lLXRlc3QyLmNvbnRy
-						YWlsLnJsLmFjLnVrMB4XDTE0MDMyMTExMDMxN1oXDTI0MDMyMTExMDMxN1owczEL
-						MAkGA1UEBhMCVUsxDTALBgNVBAgMBE94b24xEDAOBgNVBAcMB0NoaWx0b24xDTAL
-						BgNVBAoMBFNURkMxDDAKBgNVBAsMA1NDRDEmMCQGA1UEAwwdKi5vbmUtdGVzdDIu
-						Y29udHJhaWwucmwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDExxwHlrNj6qpRM+sfph0089TyUUke0ygR4088OhXfUIUnYo4TfFLm9xGuzG1x
-						ubfmJWLAhynRSuu6xYAALo3ArMPCcBm3/dVviXjZ9rolhikpLso7a9kGefpAo0Qb
-						aBSow1ANeRNIlw4ADnjxqAF083qzbUx3BLNHrQJ8S1vhXXxV1uCxzCUoeBcptrr9
-						EYH01nue5+URc2c7gH9hGb9vu3AJgMURD7BWE6eC8YoQdK52CaEfnlXPmhgaG9vZ
-						m+orn2ytJdl0FMxadEzmW2OtvkkyCZAH8PzB7GrZzOHXV3y30TFpKow4jIof+z0j
-						JF+4uzI26YdaKInXMw5G9YnhAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4
-						QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRK
-						sVJ3ilHlVQpjnfG284PH5J6P4TAfBgNVHSMEGDAWgBRKsVJ3ilHlVQpjnfG284PH
-						5J6P4TANBgkqhkiG9w0BAQUFAAOCAQEAmQX0Q/YZW5/sSDHz7c+wvqhfWRzbh49m
-						ls5MnJ2jYgU87tpG123xg3QKfqCZ9spN1SHs7Q8cbqYE2/HihCBZ2Gw6tNAVkAQM
-						RZgpdCJti0Pjy9kZg/k0DL7aww6DyHLycQBSvHF0xa8JMo+fgwbaYlNAK/uLF8nP
-						0vMwDcGlsvd0KKM80qbxrTvNLp9jbp1QnV1bEFqWWpViEMHWtlhtKTzKKiL+k0rQ
-						zUl6YNvn0L7djY34CHGKVQVtiV0F8PMyrYRpAMmOBUR+DsW14y8isnBcQVBjSwvA
-						/kVnQYMEPEQjewc0WBDer1g4xo/Nulo66UwgSE1rJqLUSiU/TZznhA==
-					</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>
-						MIID5DCCAsygAwIBAgIJALS9Y48v9modMA0GCSqGSIb3DQEBBQUAMHMxCzAJBgNV
-						BAYTAlVLMQ0wCwYDVQQIDARPeG9uMRAwDgYDVQQHDAdDaGlsdG9uMQ0wCwYDVQQK
-						DARTVEZDMQwwCgYDVQQLDANTQ0QxJjAkBgNVBAMMHSoub25lLXRlc3QyLmNvbnRy
-						YWlsLnJsLmFjLnVrMB4XDTE0MDMyMTExMDMxN1oXDTI0MDMyMTExMDMxN1owczEL
-						MAkGA1UEBhMCVUsxDTALBgNVBAgMBE94b24xEDAOBgNVBAcMB0NoaWx0b24xDTAL
-						BgNVBAoMBFNURkMxDDAKBgNVBAsMA1NDRDEmMCQGA1UEAwwdKi5vbmUtdGVzdDIu
-						Y29udHJhaWwucmwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDExxwHlrNj6qpRM+sfph0089TyUUke0ygR4088OhXfUIUnYo4TfFLm9xGuzG1x
-						ubfmJWLAhynRSuu6xYAALo3ArMPCcBm3/dVviXjZ9rolhikpLso7a9kGefpAo0Qb
-						aBSow1ANeRNIlw4ADnjxqAF083qzbUx3BLNHrQJ8S1vhXXxV1uCxzCUoeBcptrr9
-						EYH01nue5+URc2c7gH9hGb9vu3AJgMURD7BWE6eC8YoQdK52CaEfnlXPmhgaG9vZ
-						m+orn2ytJdl0FMxadEzmW2OtvkkyCZAH8PzB7GrZzOHXV3y30TFpKow4jIof+z0j
-						JF+4uzI26YdaKInXMw5G9YnhAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4
-						QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBRK
-						sVJ3ilHlVQpjnfG284PH5J6P4TAfBgNVHSMEGDAWgBRKsVJ3ilHlVQpjnfG284PH
-						5J6P4TANBgkqhkiG9w0BAQUFAAOCAQEAmQX0Q/YZW5/sSDHz7c+wvqhfWRzbh49m
-						ls5MnJ2jYgU87tpG123xg3QKfqCZ9spN1SHs7Q8cbqYE2/HihCBZ2Gw6tNAVkAQM
-						RZgpdCJti0Pjy9kZg/k0DL7aww6DyHLycQBSvHF0xa8JMo+fgwbaYlNAK/uLF8nP
-						0vMwDcGlsvd0KKM80qbxrTvNLp9jbp1QnV1bEFqWWpViEMHWtlhtKTzKKiL+k0rQ
-						zUl6YNvn0L7djY34CHGKVQVtiV0F8PMyrYRpAMmOBUR+DsW14y8isnBcQVBjSwvA
-						/kVnQYMEPEQjewc0WBDer1g4xo/Nulo66UwgSE1rJqLUSiU/TZznhA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml2-logout.php/uk-federation"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/uk-federation" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/uk-federation" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml2-acs.php/uk-federation" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://federation.one-test2.contrail.rl.ac.uk/simplesaml/module.php/saml/sp/saml1-acs.php/uk-federation/artifact" index="3"/>
-    <AttributeConsumingService index="0">
-      <ServiceName xml:lang="en">ukfed-connector</ServiceName>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:mace:dir:attribute-def:eduPersonTargetedID" 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="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: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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Science and Technology Facilities Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Contrail project, STFC</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://stfc.ac.uk/scd/default.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Cheney</GivenName>
-    <SurName>Ketley</SurName>
-    <EmailAddress>mailto:cheney.ketley@stfc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Cheney</GivenName>
-    <SurName>Ketley</SurName>
-    <EmailAddress>mailto:cheney.ketley@stfc.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 30e8fde2..00000000
--- a/swamid-interfederations-2.0/ukfed.sso.aluminati.net-simplesaml-module.php-saml-sp-metadata.php-default-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://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <!--
-		This is a "Aluminati Engagement Portal" Shibboleth SP for the Aluminati Network Group Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-11-03T12:05:16Z">
-      <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">Aluminati Engagement Portal</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDwTCCAqmgAwIBAgIJAJcO9imPEhXBMA0GCSqGSIb3DQEBCwUAMHcxCzAJBgNV
-						BAYTAkdCMRAwDgYDVQQIDAdTdWZmb2xrMRIwEAYDVQQHDAlOZXdtYXJrZXQxIDAe
-						BgNVBAoMF0FsdW1pbmF0aSBOZXR3b3JrIEdyb3VwMSAwHgYDVQQDDBd1a2ZlZC5z
-						c28uYWx1bWluYXRpLm5ldDAeFw0xNTExMDIxNTI3MTZaFw0yNTExMDExNTI3MTZa
-						MHcxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdTdWZmb2xrMRIwEAYDVQQHDAlOZXdt
-						YXJrZXQxIDAeBgNVBAoMF0FsdW1pbmF0aSBOZXR3b3JrIEdyb3VwMSAwHgYDVQQD
-						DBd1a2ZlZC5zc28uYWx1bWluYXRpLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAJ7gE7+zriB4ecuN7AfKL9StFpqaAYI9odsjqgnXzrnB+eQZFztV
-						i6sxcvfZvWGUVM1pgWsyBAMSziEFWwBX6+92l/4jKk8w+SzCdVClXeaSCV6tNDpM
-						4X+L+4UiCKv8N0HBKyGvG2eKob0P5R1gBH5YDAzSI1RoDUs5AuuMkt/RaHKA1VGI
-						bkCGHBdjOqLvcCnEGDEE5GdmZbd48f/TalnDzvpclojaKquVcBsWiu3cI/1DJGd9
-						Uv/yxcR5WkqGbs+DlMNFD43DUQzwetkb759urWacoL+6SspJerpm9ChGntrjcJoq
-						ysJeV0DhfkWwHY9ilJpI0IK2VAfit7yuqGkCAwEAAaNQME4wHQYDVR0OBBYEFDV2
-						VlfkK1KPlMANZZZ3IKD1xgn6MB8GA1UdIwQYMBaAFDV2VlfkK1KPlMANZZZ3IKD1
-						xgn6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAyDTAOLx60dposy
-						cy+d5+9NGZgJ4hXk13PkgaoAwSo/RC0mVJaS96dm1HuUzcTAjUpn79qia4aC3ws5
-						3nVEphO6NHCfDkWLS9ukj2RIBYI+0sJ9nJBdF3GzoG3ZDHLFuS9z0cv0TbwD+odU
-						LGMKdtfNyPOojXVo4wDlvhh8gMXohpDDjwW+j//uoSnPDQZ3crC385l+eE/P6WR6
-						KrSIScBV2Ni9kuiDmPumh0lpVPSpSPfvESEHwtJ973BbK+nTQq4sZzHzha35Lnqm
-						mdC6vZPV3h6+9LQrk8VDOzqYV1NIFGDz5RwpaYd/gaj8TkkzyPJwzfLM9/j+/BeI
-						/+zVfwU=
-					</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>
-						MIIDwTCCAqmgAwIBAgIJAJcO9imPEhXBMA0GCSqGSIb3DQEBCwUAMHcxCzAJBgNV
-						BAYTAkdCMRAwDgYDVQQIDAdTdWZmb2xrMRIwEAYDVQQHDAlOZXdtYXJrZXQxIDAe
-						BgNVBAoMF0FsdW1pbmF0aSBOZXR3b3JrIEdyb3VwMSAwHgYDVQQDDBd1a2ZlZC5z
-						c28uYWx1bWluYXRpLm5ldDAeFw0xNTExMDIxNTI3MTZaFw0yNTExMDExNTI3MTZa
-						MHcxCzAJBgNVBAYTAkdCMRAwDgYDVQQIDAdTdWZmb2xrMRIwEAYDVQQHDAlOZXdt
-						YXJrZXQxIDAeBgNVBAoMF0FsdW1pbmF0aSBOZXR3b3JrIEdyb3VwMSAwHgYDVQQD
-						DBd1a2ZlZC5zc28uYWx1bWluYXRpLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAJ7gE7+zriB4ecuN7AfKL9StFpqaAYI9odsjqgnXzrnB+eQZFztV
-						i6sxcvfZvWGUVM1pgWsyBAMSziEFWwBX6+92l/4jKk8w+SzCdVClXeaSCV6tNDpM
-						4X+L+4UiCKv8N0HBKyGvG2eKob0P5R1gBH5YDAzSI1RoDUs5AuuMkt/RaHKA1VGI
-						bkCGHBdjOqLvcCnEGDEE5GdmZbd48f/TalnDzvpclojaKquVcBsWiu3cI/1DJGd9
-						Uv/yxcR5WkqGbs+DlMNFD43DUQzwetkb759urWacoL+6SspJerpm9ChGntrjcJoq
-						ysJeV0DhfkWwHY9ilJpI0IK2VAfit7yuqGkCAwEAAaNQME4wHQYDVR0OBBYEFDV2
-						VlfkK1KPlMANZZZ3IKD1xgn6MB8GA1UdIwQYMBaAFDV2VlfkK1KPlMANZZZ3IKD1
-						xgn6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAAyDTAOLx60dposy
-						cy+d5+9NGZgJ4hXk13PkgaoAwSo/RC0mVJaS96dm1HuUzcTAjUpn79qia4aC3ws5
-						3nVEphO6NHCfDkWLS9ukj2RIBYI+0sJ9nJBdF3GzoG3ZDHLFuS9z0cv0TbwD+odU
-						LGMKdtfNyPOojXVo4wDlvhh8gMXohpDDjwW+j//uoSnPDQZ3crC385l+eE/P6WR6
-						KrSIScBV2Ni9kuiDmPumh0lpVPSpSPfvESEHwtJ973BbK+nTQq4sZzHzha35Lnqm
-						mdC6vZPV3h6+9LQrk8VDOzqYV1NIFGDz5RwpaYd/gaj8TkkzyPJwzfLM9/j+/BeI
-						/+zVfwU=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukfed.sso.aluminati.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Aluminati Network Group Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aluminati Engagement Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.aluminati.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Emily</GivenName>
-    <SurName>Grant</SurName>
-    <EmailAddress>mailto:help@aluminati.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Roger</GivenName>
-    <SurName>Garner</SurName>
-    <EmailAddress>mailto:roger@aluminati.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.xml b/swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.xml
deleted file mode 100644
index 789ab907..00000000
--- a/swamid-interfederations-2.0/ukfed.ukpressonline.co.uk-shibboleth.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://ukfed.ukpressonline.co.uk/shibboleth">
-  <!--
-		This is a "UKPressOnline" Shibboleth SP for Digitorial Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-08-27T16:32: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://ukfed.ukpressonline.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHjCCAgagAwIBAgIJAPiDlYs5S2Y2MA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHWRpZ2ktd2ViLXN2ci5kaWdpdG9yaWFsLmNvLnVrMB4XDTE0MDcwMTExMTY0
-						NVoXDTM0MDYyNjExMTY0NVowKDEmMCQGA1UEAxMdZGlnaS13ZWItc3ZyLmRpZ2l0
-						b3JpYWwuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJqtxk
-						XLaWpCtU00hwXbdTdF0bAXa5qA9NNHoD3Pc2SD+QAZCHFSNYUn5LkI2MNzKuD9Lo
-						jF+R6dun5C6jaU8vtSJHaVLWJwNn6vfTLFidCyKAa/0fY+qSB46NNjSiXwmFNpiI
-						Sgy5HwDOJpC4avgA0nlO57BLs7Qal1is7/goZWodTwIPIzDU3bwmlNm0gJxR2UkX
-						mZvmx6LPozYL6lbSfuY3MKfbRpfrCXAgH8xYW3F7jBxIhJuv7Rou6zAXhBj+Ss8h
-						3bONUquNMZmQ0K0ngp2G4+XIJy99GDDZfCUKxeliu0OjA42B6iJJq+QRQo3PLyUz
-						3h1Vaw5jqt9lQJc/AgMBAAGjSzBJMCgGA1UdEQQhMB+CHWRpZ2ktd2ViLXN2ci5k
-						aWdpdG9yaWFsLmNvLnVrMB0GA1UdDgQWBBTTnfZ7sgdhNZp0vUUtK2ZWGR9tqjAN
-						BgkqhkiG9w0BAQUFAAOCAQEAtMa03ENgZE9c8LgdaiK4lLjbxXGEr16QAkScjodF
-						Vm0mO/Ohda2avbqFtRXU3u987dcZ9InQ+dCrtfXnU8qRjXc68YYA+ZrKhnMQXmMA
-						9y9pDu8QxhMR+kQLTVAcseX1sStZYoxA7zboO3CZ/aDUvdvkVFHH5mlEZuzBeQys
-						/7kzMosrFpe4dwQiHE9zk+tJjMHoEiHbN0xevID70j7rcO8NHUsYl6vkvqZRKcEJ
-						aMNyvJmu5u9z7IUYGESPox+4a4B4epdkdwHcOFw7/01URXfb19HfTNtKhS/tHw42
-						C7xMZ7c4p7rZOnaeqwso9Zpf+yP9/7sNh9iKvS3kEvITAg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ukfed.ukpressonline.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Digitorial Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UKPressOnline</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ukpressonline.co.uk/ukpressonline/open/aboutus.jsp</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Alasdair</GivenName>
-    <SurName>Mellis</SurName>
-    <EmailAddress>mailto:alasdair@digitorial.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dawn</GivenName>
-    <SurName>Raison</SurName>
-    <EmailAddress>mailto:dawn@digitorial.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukfederation.ecu.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/ukfederation.ecu.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index f66ec49d..00000000
--- a/swamid-interfederations-2.0/ukfederation.ecu.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://ukfederation.ecu.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Equality Challenge Unit.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-21T15:45:37Z">
-      <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">ecu.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Equality Challenge Unit</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIVANMvXrP3yd50wehorJHIv4sqdsdqMA0GCSqGSIb3DQEB
-						BQUAMCExHzAdBgNVBAMTFnVrZmVkZXJhdGlvbi5lY3UuYWMudWswHhcNMTMwOTI1
-						MTA0NDIzWhcNMzMwOTI1MTA0NDIzWjAhMR8wHQYDVQQDExZ1a2ZlZGVyYXRpb24u
-						ZWN1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuN/sVb/k
-						dm7u9DJjDZ9sc7w6LeK24doCHc1Se1g/01ii5FSL8paysmNW1AexblCq3pO4z286
-						zDjXAvJn2X41YJb1JYXtdbp++VPhJ0c/wNMZhZZgN3zdMYmEqyVZHQphuJPCFvs4
-						j/sKm2wArc7XsG7G2wuvayQ4yhrA6AFPB+LtsVbml1MbpL9JgixQNWaOUELT7g/Z
-						/fSzuVdJ7Gj0VwUDuEc9VQsfizGzoq5aPUtEJshI64PbJQEYchSqL97Jk4CqZ+pl
-						CyHdW7uy306t5bS2LxuhOZoZWqVqEttmSjiygwydV1bigROBVizDPU1JZ7hmq6x6
-						Q9VUR2jQ0usmeQIDAQABo3MwcTBQBgNVHREESTBHghZ1a2ZlZGVyYXRpb24uZWN1
-						LmFjLnVrhi1odHRwczovL3VrZmVkZXJhdGlvbi5lY3UuYWMudWsvaWRwL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFDJlcovxD/rhWuukxo82lQ4WNsIfMA0GCSqGSIb3DQEB
-						BQUAA4IBAQA2qsCup37tuAq6LrQR54tEToCV4aAoDgSahDrubmCI0IhFRhtNycRC
-						eVe/eWW0ZjJvZ5ycTWH8UmHcWTU0DFPz1iyLPFe/0Zn5KU/K91XhE7w5TUM9oX66
-						3EU0IpBGa2UaMINDkSYI1Qd6mHc4ilVyqCgCPNbh8aF7CS2rNLIPLpUF/kgcR4/C
-						xueo9DB8f06YkzjvhRVYt+08OVkt0vrJy34huV6/eqP9fxcAy9eJ+2O/pNqX5Bsa
-						jUKdc4Ab3/C4QO/9kzBuhuHHsuQCnCU6puPgy8n2IKlXwS+PhMsC+mnvqDil77xN
-						O7939VxLIqifIAdVAOq2xkneYhX/3sy4
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukfederation.ecu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukfederation.ecu.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://ukfederation.ecu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukfederation.ecu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukfederation.ecu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukfederation.ecu.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">ecu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRDCCAiygAwIBAgIVANMvXrP3yd50wehorJHIv4sqdsdqMA0GCSqGSIb3DQEB
-						BQUAMCExHzAdBgNVBAMTFnVrZmVkZXJhdGlvbi5lY3UuYWMudWswHhcNMTMwOTI1
-						MTA0NDIzWhcNMzMwOTI1MTA0NDIzWjAhMR8wHQYDVQQDExZ1a2ZlZGVyYXRpb24u
-						ZWN1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuN/sVb/k
-						dm7u9DJjDZ9sc7w6LeK24doCHc1Se1g/01ii5FSL8paysmNW1AexblCq3pO4z286
-						zDjXAvJn2X41YJb1JYXtdbp++VPhJ0c/wNMZhZZgN3zdMYmEqyVZHQphuJPCFvs4
-						j/sKm2wArc7XsG7G2wuvayQ4yhrA6AFPB+LtsVbml1MbpL9JgixQNWaOUELT7g/Z
-						/fSzuVdJ7Gj0VwUDuEc9VQsfizGzoq5aPUtEJshI64PbJQEYchSqL97Jk4CqZ+pl
-						CyHdW7uy306t5bS2LxuhOZoZWqVqEttmSjiygwydV1bigROBVizDPU1JZ7hmq6x6
-						Q9VUR2jQ0usmeQIDAQABo3MwcTBQBgNVHREESTBHghZ1a2ZlZGVyYXRpb24uZWN1
-						LmFjLnVrhi1odHRwczovL3VrZmVkZXJhdGlvbi5lY3UuYWMudWsvaWRwL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFDJlcovxD/rhWuukxo82lQ4WNsIfMA0GCSqGSIb3DQEB
-						BQUAA4IBAQA2qsCup37tuAq6LrQR54tEToCV4aAoDgSahDrubmCI0IhFRhtNycRC
-						eVe/eWW0ZjJvZ5ycTWH8UmHcWTU0DFPz1iyLPFe/0Zn5KU/K91XhE7w5TUM9oX66
-						3EU0IpBGa2UaMINDkSYI1Qd6mHc4ilVyqCgCPNbh8aF7CS2rNLIPLpUF/kgcR4/C
-						xueo9DB8f06YkzjvhRVYt+08OVkt0vrJy34huV6/eqP9fxcAy9eJ+2O/pNqX5Bsa
-						jUKdc4Ab3/C4QO/9kzBuhuHHsuQCnCU6puPgy8n2IKlXwS+PhMsC+mnvqDil77xN
-						O7939VxLIqifIAdVAOq2xkneYhX/3sy4
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukfederation.ecu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukfederation.ecu.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">Equality Challenge Unit</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Equality Challenge Unit</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ecu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Hanno</GivenName>
-    <SurName>Gregory</SurName>
-    <EmailAddress>mailto:support@comistechnology.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hanno</GivenName>
-    <SurName>Gregory</SurName>
-    <EmailAddress>mailto:support@comistechnology.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukidp.uky.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/ukidp.uky.edu-idp-shibboleth.xml
deleted file mode 100644
index 778941a1..00000000
--- a/swamid-interfederations-2.0/ukidp.uky.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,157 +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://ukidp.uky.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uky.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Kentucky</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>
-MIIDSjCCAjICCQCbrmikPdHPmzANBgkqhkiG9w0BAQUFADBnMRYwFAYDVQQDEw11
-a2lkcC51a3kuZWR1MR8wHQYDVQQKExZVbml2ZXJzaXR5IG9mIEtlbnR1Y2t5MQsw
-CQYDVQQGEwJVUzELMAkGA1UECBMCS1kxEjAQBgNVBAcTCUxleGluZ3RvbjAeFw0x
-MTEwMTgxOTQ5NDRaFw0xMjEwMTcxOTQ5NDRaMGcxFjAUBgNVBAMTDXVraWRwLnVr
-eS5lZHUxHzAdBgNVBAoTFlVuaXZlcnNpdHkgb2YgS2VudHVja3kxCzAJBgNVBAYT
-AlVTMQswCQYDVQQIEwJLWTESMBAGA1UEBxMJTGV4aW5ndG9uMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuYHS3PVzqPi6R8aou7xDDuqhi73Y2k2yqKDD
-FWKdyqcPeoMlKf6/TchKimrJMiuXiJJ/353v+00vndl390M4jQFCjfnpVAGewWH3
-XpKTC7+IoKTS8DYYc8ofLqR05HBBz4gUVn0RXA3eH0QsZqR6htVA1pT2L4B/2CHV
-eTBp03pCJMo4bF53cBGre8MCSjOhLl2Iq07HrYwju/bNon3VfhqYOIXI2Gx4qd8z
-szw727AuS140fQFjQD4JadKrFP989fOn+VmnZwQMXissSjPMZ4Oce9F1ceeeml7I
-mQa2skWbp5bXzkLnSBmHDr9H8gDxLpguU0cpCPgOlnMCF+4N+QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQAGJzVURioGPWyaR1NjXPRZV89Y+1Qu2RWHcUongEmbykUb
-E/dr45XPn0iJcacgrjbwmC4sizo4SRwcTyWZlPIY5yaBvbLbuCIKd+V2Ll6ykl9T
-t2Va6IWJyVn22tIc2T+SAEKRo7WxCPTcB7wGJwW7pBWwFvmBIq+bUuc2cwvVWtqK
-AWXHsaU1qI+pSG4EN8MlJVkO93wRFhJGNpSVdRjit2C2S46V7Gg14HDXpLpp3k6d
-c2LrI/F/p1VjQqgbgZE7Y8hUuksnfEeeZqDRv8n7MntEMrynjbbmBRO6YfBIbZ5V
-upCqaFotaUmUrD4IbUB9DCJyhwZjpuU/YoCeYg7K
-          </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>
-MIIDqDCCApACCQDtzdVegR7Y/zANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAktZMRIwEAYDVQQHDAlMZXhpbmd0b24xHzAdBgNVBAoMFlVu
-aXZlcnNpdHkgb2YgS2VudHVja3kxCzAJBgNVBAsMAklUMRYwFAYDVQQDDA11a2lk
-cC51a3kuZWR1MR8wHQYJKoZIhvcNAQkBFhBqYXdhbGswMEB1a3kuZWR1MB4XDTEy
-MTAxNTE0MzM1NVoXDTIxMDMwNzE0MzM1NVowgZUxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIDAJLWTESMBAGA1UEBwwJTGV4aW5ndG9uMR8wHQYDVQQKDBZVbml2ZXJzaXR5
-IG9mIEtlbnR1Y2t5MQswCQYDVQQLDAJJVDEWMBQGA1UEAwwNdWtpZHAudWt5LmVk
-dTEfMB0GCSqGSIb3DQEJARYQamF3YWxrMDBAdWt5LmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMCF53VOH8KGjVgxCas6voNq091YpgaCWxhfQ+1y
-n8hnoqdJWiOA7oqW73KVtTjrG74iNrYGpGyPVBDP0IN+HSXj6ra1bBMARSO3hn8P
-DdpPs6yvpLIrUD3teoZKm/HuhSCi5bpe466jfCClgske05aHj1qEnZ0j3Q0OioXa
-DjVHTBaq66cmTd5Rr+r94EJkcqujjM4/57dS0FhnxBksemWM5ZHj766ATBSlO1y6
-U6WKCuh0074sspohYP6PiZsjYc6sVDDzf1LE476BQg9kUiYGXjMvLHeOXve7ECRE
-13zOz8uWeMD4wx4AWiQ5GYypaUWE9nWJL3QXOPJ1J3WEZ7UCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEATeUZ3tjwRUENWsc2D6vlTDcfo8Zz9a3cbu0WTGOcLXOR5PFl
-pnnGpKvkDV//B8TpA1aQxTyjANV9EnSul3yCvopysjbNnwmsd288aKr4v6hqMX+w
-sc9B+OMfUS9u0p7pTA73hpYmOHDk+VCPC3ZSYrvIvT9zm332VCNnoqDN4DrbQK/6
-00+8wbfEOWfVr7r8WpJtAi9Up7/M3QUAZzmt1yYQcDdSMmIj/TTbOyj37l/0Amut
-Q4jR1hdvy5T77bf3frtxPzIJpQbjX5qhcybHEl3gaNVJdKSiQHLSF7EQLEp8CIHD
-Ybij4JvaKAm1MP0F8i+qaBH7yflJh6G8J297aw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukidp.uky.edu:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukidp.uky.edu:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ukidp.uky.edu:443/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukidp.uky.edu:443/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukidp.uky.edu:443/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukidp.uky.edu:443/idp/profile/SAML2/POST-SimpleSign/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">uky.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSjCCAjICCQCbrmikPdHPmzANBgkqhkiG9w0BAQUFADBnMRYwFAYDVQQDEw11
-a2lkcC51a3kuZWR1MR8wHQYDVQQKExZVbml2ZXJzaXR5IG9mIEtlbnR1Y2t5MQsw
-CQYDVQQGEwJVUzELMAkGA1UECBMCS1kxEjAQBgNVBAcTCUxleGluZ3RvbjAeFw0x
-MTEwMTgxOTQ5NDRaFw0xMjEwMTcxOTQ5NDRaMGcxFjAUBgNVBAMTDXVraWRwLnVr
-eS5lZHUxHzAdBgNVBAoTFlVuaXZlcnNpdHkgb2YgS2VudHVja3kxCzAJBgNVBAYT
-AlVTMQswCQYDVQQIEwJLWTESMBAGA1UEBxMJTGV4aW5ndG9uMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuYHS3PVzqPi6R8aou7xDDuqhi73Y2k2yqKDD
-FWKdyqcPeoMlKf6/TchKimrJMiuXiJJ/353v+00vndl390M4jQFCjfnpVAGewWH3
-XpKTC7+IoKTS8DYYc8ofLqR05HBBz4gUVn0RXA3eH0QsZqR6htVA1pT2L4B/2CHV
-eTBp03pCJMo4bF53cBGre8MCSjOhLl2Iq07HrYwju/bNon3VfhqYOIXI2Gx4qd8z
-szw727AuS140fQFjQD4JadKrFP989fOn+VmnZwQMXissSjPMZ4Oce9F1ceeeml7I
-mQa2skWbp5bXzkLnSBmHDr9H8gDxLpguU0cpCPgOlnMCF+4N+QIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQAGJzVURioGPWyaR1NjXPRZV89Y+1Qu2RWHcUongEmbykUb
-E/dr45XPn0iJcacgrjbwmC4sizo4SRwcTyWZlPIY5yaBvbLbuCIKd+V2Ll6ykl9T
-t2Va6IWJyVn22tIc2T+SAEKRo7WxCPTcB7wGJwW7pBWwFvmBIq+bUuc2cwvVWtqK
-AWXHsaU1qI+pSG4EN8MlJVkO93wRFhJGNpSVdRjit2C2S46V7Gg14HDXpLpp3k6d
-c2LrI/F/p1VjQqgbgZE7Y8hUuksnfEeeZqDRv8n7MntEMrynjbbmBRO6YfBIbZ5V
-upCqaFotaUmUrD4IbUB9DCJyhwZjpuU/YoCeYg7K
-          </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>
-MIIDqDCCApACCQDtzdVegR7Y/zANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAktZMRIwEAYDVQQHDAlMZXhpbmd0b24xHzAdBgNVBAoMFlVu
-aXZlcnNpdHkgb2YgS2VudHVja3kxCzAJBgNVBAsMAklUMRYwFAYDVQQDDA11a2lk
-cC51a3kuZWR1MR8wHQYJKoZIhvcNAQkBFhBqYXdhbGswMEB1a3kuZWR1MB4XDTEy
-MTAxNTE0MzM1NVoXDTIxMDMwNzE0MzM1NVowgZUxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIDAJLWTESMBAGA1UEBwwJTGV4aW5ndG9uMR8wHQYDVQQKDBZVbml2ZXJzaXR5
-IG9mIEtlbnR1Y2t5MQswCQYDVQQLDAJJVDEWMBQGA1UEAwwNdWtpZHAudWt5LmVk
-dTEfMB0GCSqGSIb3DQEJARYQamF3YWxrMDBAdWt5LmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMCF53VOH8KGjVgxCas6voNq091YpgaCWxhfQ+1y
-n8hnoqdJWiOA7oqW73KVtTjrG74iNrYGpGyPVBDP0IN+HSXj6ra1bBMARSO3hn8P
-DdpPs6yvpLIrUD3teoZKm/HuhSCi5bpe466jfCClgske05aHj1qEnZ0j3Q0OioXa
-DjVHTBaq66cmTd5Rr+r94EJkcqujjM4/57dS0FhnxBksemWM5ZHj766ATBSlO1y6
-U6WKCuh0074sspohYP6PiZsjYc6sVDDzf1LE476BQg9kUiYGXjMvLHeOXve7ECRE
-13zOz8uWeMD4wx4AWiQ5GYypaUWE9nWJL3QXOPJ1J3WEZ7UCAwEAATANBgkqhkiG
-9w0BAQUFAAOCAQEATeUZ3tjwRUENWsc2D6vlTDcfo8Zz9a3cbu0WTGOcLXOR5PFl
-pnnGpKvkDV//B8TpA1aQxTyjANV9EnSul3yCvopysjbNnwmsd288aKr4v6hqMX+w
-sc9B+OMfUS9u0p7pTA73hpYmOHDk+VCPC3ZSYrvIvT9zm332VCNnoqDN4DrbQK/6
-00+8wbfEOWfVr7r8WpJtAi9Up7/M3QUAZzmt1yYQcDdSMmIj/TTbOyj37l/0Amut
-Q4jR1hdvy5T77bf3frtxPzIJpQbjX5qhcybHEl3gaNVJdKSiQHLSF7EQLEp8CIHD
-Ybij4JvaKAm1MP0F8i+qaBH7yflJh6G8J297aw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukidp.uky.edu:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukidp.uky.edu:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Kentucky</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Kentucky</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uky.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Walker</md:GivenName>
-    <md:EmailAddress>jawalk00@uky.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Wayne Beech</md:GivenName>
-    <md:EmailAddress>wayne@uky.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>John Walker</md:GivenName>
-    <md:EmailAddress>jawalk00@uky.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ukmyms01-zone02.smg-uk.com-idp-shibboleth.xml b/swamid-interfederations-2.0/ukmyms01-zone02.smg-uk.com-idp-shibboleth.xml
deleted file mode 100644
index b0adfd14..00000000
--- a/swamid-interfederations-2.0/ukmyms01-zone02.smg-uk.com-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://ukmyms01-zone02.smg-uk.com/idp/shibboleth">
-  <!--
-		This is a "Westlaw UK" Shibboleth Test IdP for Thomson Reuters (Professional) UK Limited.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-02T10:29:39Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">thomson.com</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDcTCCAlmgAwIBAgIUHY8B0tLuriNFq39X7sA2Pna5FmwwDQYJKoZIhvcNAQEF
-						BQAwLDEqMCgGA1UEAxMhdWtteS1vcmFia3Rlc3QtMDEudGxyLnRob21zb24uY29t
-						MB4XDTE0MDIwNjE1MjcxOFoXDTM0MDIwNjE1MjcxOFowLDEqMCgGA1UEAxMhdWtt
-						eS1vcmFia3Rlc3QtMDEudGxyLnRob21zb24uY29tMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEA2sDwDbm2t6Jc0L89Mj3GXl9RaTsEwCCJ2UNBppGmmc06
-						4oucpILb2Yd6KqBsKBaYC0ue3tlwkdyPlDMR/6+E+dJi478+dMb8mX2URLlILIln
-						QyWZkf6tp1q1F7rSK7DG4A5jF6nt6WxJlWDp6pOPcM7vkaPcRGw4PyAlgq6E8klo
-						noiX4AOIkOfi+11uJii9LqWk9XdwtrIzDd/El2uGkgcLLnwzpWDV2A0tKAEy8WHR
-						UWsotnzmCYfIBMal6o/5fJ7k3KYEOzF90WpYuf7InFGUEzl86rJRWNZtY1h7jepS
-						otzMbzn7Q5Ljc4MYjbXG4BmCw2JC7XCkjKQy7TuNbQIDAQABo4GKMIGHMGYGA1Ud
-						EQRfMF2CIXVrbXktb3JhYmt0ZXN0LTAxLnRsci50aG9tc29uLmNvbYY4aHR0cHM6
-						Ly91a215LW9yYWJrdGVzdC0wMS50bHIudGhvbXNvbi5jb20vaWRwL3NoaWJib2xl
-						dGgwHQYDVR0OBBYEFGnD/uW9bTDxa7yN/FtkfYvhMESnMA0GCSqGSIb3DQEBBQUA
-						A4IBAQAV1L5ji+TIyn+BZr94DQOb6pkHAdFgceuq8YxBJoW9oKNJwC9K6lQp0Wus
-						q5J4RlIErH3M+q8txtm1J5oH2C9KxPOw1Htw8KSKQfT5LD98HVETMdOGCmmtX5IO
-						GLiegJTiXazfmecTi9xi1pVOfVLn97uCY7TK5I0YFDkFN2Whf4GNXY8w9iDGCyN8
-						4c6mJD3kCkjWv06ITX/OgTGpHDPobiNu4aEQpMokmw7fE8ff+fBLIEhKQ7y+Zovz
-						veOmrduNCjLZY6Ve2poxgw+eIfGsnRLYkz7ak7h/7BYNhUYz48cGPnHOb2+B9J0M
-						MUfe/9b/hNW/YTMa9+4MQNOEkWHO
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukmy-orabktest-01.tlr.thomson.com: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://ukmy-orabktest-01.tlr.thomson.com/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ukmy-orabktest-01.tlr.thomson.com/idp/profile/SAML2/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">thomson.com</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDcTCCAlmgAwIBAgIUHY8B0tLuriNFq39X7sA2Pna5FmwwDQYJKoZIhvcNAQEF
-						BQAwLDEqMCgGA1UEAxMhdWtteS1vcmFia3Rlc3QtMDEudGxyLnRob21zb24uY29t
-						MB4XDTE0MDIwNjE1MjcxOFoXDTM0MDIwNjE1MjcxOFowLDEqMCgGA1UEAxMhdWtt
-						eS1vcmFia3Rlc3QtMDEudGxyLnRob21zb24uY29tMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEA2sDwDbm2t6Jc0L89Mj3GXl9RaTsEwCCJ2UNBppGmmc06
-						4oucpILb2Yd6KqBsKBaYC0ue3tlwkdyPlDMR/6+E+dJi478+dMb8mX2URLlILIln
-						QyWZkf6tp1q1F7rSK7DG4A5jF6nt6WxJlWDp6pOPcM7vkaPcRGw4PyAlgq6E8klo
-						noiX4AOIkOfi+11uJii9LqWk9XdwtrIzDd/El2uGkgcLLnwzpWDV2A0tKAEy8WHR
-						UWsotnzmCYfIBMal6o/5fJ7k3KYEOzF90WpYuf7InFGUEzl86rJRWNZtY1h7jepS
-						otzMbzn7Q5Ljc4MYjbXG4BmCw2JC7XCkjKQy7TuNbQIDAQABo4GKMIGHMGYGA1Ud
-						EQRfMF2CIXVrbXktb3JhYmt0ZXN0LTAxLnRsci50aG9tc29uLmNvbYY4aHR0cHM6
-						Ly91a215LW9yYWJrdGVzdC0wMS50bHIudGhvbXNvbi5jb20vaWRwL3NoaWJib2xl
-						dGgwHQYDVR0OBBYEFGnD/uW9bTDxa7yN/FtkfYvhMESnMA0GCSqGSIb3DQEBBQUA
-						A4IBAQAV1L5ji+TIyn+BZr94DQOb6pkHAdFgceuq8YxBJoW9oKNJwC9K6lQp0Wus
-						q5J4RlIErH3M+q8txtm1J5oH2C9KxPOw1Htw8KSKQfT5LD98HVETMdOGCmmtX5IO
-						GLiegJTiXazfmecTi9xi1pVOfVLn97uCY7TK5I0YFDkFN2Whf4GNXY8w9iDGCyN8
-						4c6mJD3kCkjWv06ITX/OgTGpHDPobiNu4aEQpMokmw7fE8ff+fBLIEhKQ7y+Zovz
-						veOmrduNCjLZY6Ve2poxgw+eIfGsnRLYkz7ak7h/7BYNhUYz48cGPnHOb2+B9J0M
-						MUfe/9b/hNW/YTMa9+4MQNOEkWHO
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ukmy-orabktest-01.tlr.thomson.com:8443/idp/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">Thomson Reuters (Professional) UK Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Westlaw UK Test IdP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.westlaw.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Doug</GivenName>
-    <SurName>Potts</SurName>
-    <EmailAddress>mailto:douglas.potts@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Halford</SurName>
-    <EmailAddress>mailto:andrew.halford@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ulster.unidesk.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/ulster.unidesk.ac.uk-shibboleth.xml
deleted file mode 100644
index 6117765f..00000000
--- a/swamid-interfederations-2.0/ulster.unidesk.ac.uk-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://ulster.unidesk.ac.uk/shibboleth">
-  <!--
-		This is an "Unidesk - University of Ulster" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-11T09:59:08Z">
-      <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://ulster.unidesk.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAPHsl6kKrFrnMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEmxpdmUudW5pZGVzay5hYy51azAeFw0xMjA0MTExNDU4MjhaFw0yMjA0MDkx
-						NDU4MjhaMB0xGzAZBgNVBAMTEmxpdmUudW5pZGVzay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAL9qh/Dehm5jJdWdeFPNKqcjMdiqii8Iz9Rc
-						tCAsEwRsYww4EQDG7MxG5hg4NSS+iIPFCp9gR+G7hTnZAMGgNpxs2vk4vs9lmhRY
-						GmB7Y1NFloP9Pcsu+MaufaLzxi6bzIXV4dBVHqVnIcgxchDIsXmPE6xlq4poEq+q
-						XJ3aFE/eWwxfwN9z0s5yeICzsil73xk9T9NLeNAeYq+jfVTcdqDbBHY6eHtMOYh/
-						uPVYYxkKXjkgSH5cwG0b+7qN4z+uzKDNBXxnI1Nz+bLOazXW6ljQIDtAPQZMJSlr
-						3OepVaQS+fMBi0Sku5yvADgINdXxkz6H4Zx4pZg/rTQBQ/8u2esCAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISbGl2ZS51bmlkZXNrLmFjLnVrMB0GA1UdDgQWBBQ2tPlzxC8e
-						akC2nh9qrG4TWfI3tzANBgkqhkiG9w0BAQUFAAOCAQEAWPY3Nv9ChZ+4XVNANhLq
-						fGF7SbiPmUNj9vWGNjCp8Ma0tdDOZPvqBRzxKkkR+LS+fHpSQQ54RuNeZrulWBiN
-						akZe3LZiSH9AHG2uD0lDuxr0UQt1AHGDiLjFXuRg9+CdqqrdT3Anmy6exDDfRsjH
-						k+ZJflkEtqTNd0dbEVlkYlg8Baqx/ZMOxkccx8PtQt1yptAMsH4Rn92vXLd9d3JM
-						H1mrFuiriqrgsAfVLmzc4WeGmB+dK01cSB+CY7hKnoe7ds1y7kNhOmZ9HP3Iy7ev
-						gF2RCdnqkP9zScihW4b20PlVa/sWMUyCj2uZE1lSO51PJcGVU0H/JFrBEpaM7u6t
-						jg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ulster.unidesk.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Unidesk - University of Ulster</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IS Helpdesk</GivenName>
-    <EmailAddress>mailto:IS.Helpdesk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-techmgt@mlist.is.ed.ac.uk</EmailAddress>
-  </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 9db97776..00000000
--- a/swamid-interfederations-2.0/umbrella.psi.ch-.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://umbrella.psi.ch/">
-  <md: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>
-    <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>psi.ch</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>others</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">
-    <md: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>
-    </md:Extensions>
-    <md: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>
-    </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://umbrella.psi.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Umbrella Test Service Provider</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Umbrella Test Service Provider for developing  bridging between eduGain and Umbrella Federation</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="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">psi.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">PSI - Paul Scherrer Institut</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">PSI - Paul Scherrer Institute</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.psi.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.psi.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Björn</md:GivenName>
-    <md:SurName>Abt</md:SurName>
-    <md:EmailAddress>mailto:bjoern.abt@psi.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41563103509</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Björn</md:GivenName>
-    <md:SurName>Abt</md:SurName>
-    <md:EmailAddress>mailto:bjoern.abt@psi.ch</md:EmailAddress>
-    <md:TelephoneNumber>+41563103509</md:TelephoneNumber>
-  </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 a7a58f97..00000000
--- a/swamid-interfederations-2.0/umbrella.psi.ch.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://umbrella.psi.ch/">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-04T10:12:47Z">
-      <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/https://umbrella.psi.ch/idp/profile/SAML2/POST/SSO" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umbrella.psi.ch/Shibboleth.sso/https://umbrella.psi.ch/idp/profile/SAML2/Artifact/SSO" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umbrella.psi.ch/Shibboleth.sso/SAML2/SOAP/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umbrella.psi.ch/Shibboleth.sso/https://umbrella.psi.ch/idp/profile/SAML/POST/SSO" index="4" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umbrella.psi.ch/Shibboleth.sso/https://umbrella.psi.ch/idp/profile/SAML/Artifact/SSO" index="5"/>
-    <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/umshibp.olemiss.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/umshibp.olemiss.edu-idp-shibboleth.xml
deleted file mode 100644
index a72e2314..00000000
--- a/swamid-interfederations-2.0/umshibp.olemiss.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,97 +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://umshibp.olemiss.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">olemiss.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Mississippi</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://en.wikipedia.org/wiki/University_of_Mississippi</mdui:InformationURL>
-        <mdui:Logo height="100" width="400" xml:lang="en">https://secure1.olemiss.edu/irj/go/km/docs/documents/UMImages/UMLogo.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>
-MIIDODCCAiCgAwIBAgIVAJ02en1t5aWOCxE4dPI/WEGJxW7gMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3Vtc2hpYnAub2xlbWlzcy5lZHUwHhcNMTIwNzE3MTQy
-MDQyWhcNMzIwNzE3MTQyMDQyWjAeMRwwGgYDVQQDExN1bXNoaWJwLm9sZW1pc3Mu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv04ygC3gn9pyefto
-MYGjHlyX2T2NNlOSDX3uGYyzAGeHngFrvEPxZD6wN/IO8nCRlGOm+JkKeqqg1OpQ
-VjpXthFqN1sxZwNtAxokfRSEaHFChl5t0ciCuxic4grnHvOQtJulonO/qwbXPMhm
-RkKKbRtYTRcn92uxoUcPH6MgriDUIgfSwDR01VRA03s3Y++Hs2Qyy1oqC1hHYvuL
-pXCp+6DoIdGsyksaZtskYrq4a9mSRXZ8q1Re/Ma7LB7lHTkOO0qD9xALLm7eLj71
-BpgFTlno2IHgZSZ/IaUsU0zUb6RXDanO+SKCkX6wwvq+WttrVxZ5Qyh+xQg2EZSg
-tttj/QIDAQABo20wazBKBgNVHREEQzBBghN1bXNoaWJwLm9sZW1pc3MuZWR1hipo
-dHRwczovL3Vtc2hpYnAub2xlbWlzcy5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFG6CZ99+tMD6Z1RRYWY9+WEEYsOCMA0GCSqGSIb3DQEBBQUAA4IBAQC6Clv4
-+OLHTrPh4g6RbiZP7Q6uDyHwTdyPcpxB6g5YiQqMzfCqmlg1JO9LXcGnhO0ngjPw
-GS5fUCqUzQw14yXBD6Bq3IAK022afq6DkZkKpsvAv7s4EBFFhYSbg8iJfdheEQMb
-GV6aahGWm1VZToICFALOqFrkI9PteT7Mkksnc7kPXKifdYDMhajhP6ap/ANBQd0X
-kXK+zix7sCJdKO5v6bbmXuGSFT+KRQnHWEC/mDgfU/CwVtVcalFMLAamSa/Y8yzm
-7c2UaQVnu2J/dRQROe7fBs4XdIjF7/kaLlO0fQaNqrQ7PBJLgNbmGGn1vgVPrD47
-njcg/y96NdqwknJF
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://umshibp.olemiss.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://umshibp.olemiss.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://umshibp.olemiss.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umshibp.olemiss.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://umshibp.olemiss.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">olemiss.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAJ02en1t5aWOCxE4dPI/WEGJxW7gMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3Vtc2hpYnAub2xlbWlzcy5lZHUwHhcNMTIwNzE3MTQy
-MDQyWhcNMzIwNzE3MTQyMDQyWjAeMRwwGgYDVQQDExN1bXNoaWJwLm9sZW1pc3Mu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv04ygC3gn9pyefto
-MYGjHlyX2T2NNlOSDX3uGYyzAGeHngFrvEPxZD6wN/IO8nCRlGOm+JkKeqqg1OpQ
-VjpXthFqN1sxZwNtAxokfRSEaHFChl5t0ciCuxic4grnHvOQtJulonO/qwbXPMhm
-RkKKbRtYTRcn92uxoUcPH6MgriDUIgfSwDR01VRA03s3Y++Hs2Qyy1oqC1hHYvuL
-pXCp+6DoIdGsyksaZtskYrq4a9mSRXZ8q1Re/Ma7LB7lHTkOO0qD9xALLm7eLj71
-BpgFTlno2IHgZSZ/IaUsU0zUb6RXDanO+SKCkX6wwvq+WttrVxZ5Qyh+xQg2EZSg
-tttj/QIDAQABo20wazBKBgNVHREEQzBBghN1bXNoaWJwLm9sZW1pc3MuZWR1hipo
-dHRwczovL3Vtc2hpYnAub2xlbWlzcy5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFG6CZ99+tMD6Z1RRYWY9+WEEYsOCMA0GCSqGSIb3DQEBBQUAA4IBAQC6Clv4
-+OLHTrPh4g6RbiZP7Q6uDyHwTdyPcpxB6g5YiQqMzfCqmlg1JO9LXcGnhO0ngjPw
-GS5fUCqUzQw14yXBD6Bq3IAK022afq6DkZkKpsvAv7s4EBFFhYSbg8iJfdheEQMb
-GV6aahGWm1VZToICFALOqFrkI9PteT7Mkksnc7kPXKifdYDMhajhP6ap/ANBQd0X
-kXK+zix7sCJdKO5v6bbmXuGSFT+KRQnHWEC/mDgfU/CwVtVcalFMLAamSa/Y8yzm
-7c2UaQVnu2J/dRQROe7fBs4XdIjF7/kaLlO0fQaNqrQ7PBJLgNbmGGn1vgVPrD47
-njcg/y96NdqwknJF
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://umshibp.olemiss.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Mississippi</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Mississippi</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.olemiss.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Daksh Chauhan</md:GivenName>
-    <md:EmailAddress>daksh@olemiss.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Daksh Chauhan</md:GivenName>
-    <md:EmailAddress>daksh@olemiss.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml b/swamid-interfederations-2.0/unicos.cirqahosting.com-shibboleth.xml
deleted file mode 100644
index c23d0c0b..00000000
--- a/swamid-interfederations-2.0/unicos.cirqahosting.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://unicos.cirqahosting.com/shibboleth">
-  <!--
-		This is a "University College School" Shibboleth SP for IS Oxford Ltd.
-	-->
-  <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="2015-11-27T13:52:11Z">
-      <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://unicos.cirqahosting.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDHjCCAgagAwIBAgIJAI69JgucdSaEMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHXVuaWNvcy5pc294Zm9yZC1ob3N0aW5nLmxvY2FsMB4XDTE1MDcwODEzNTQz
-						MVoXDTI1MDcwNTEzNTQzMVowKDEmMCQGA1UEAxMddW5pY29zLmlzb3hmb3JkLWhv
-						c3RpbmcubG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgHQ3c
-						0LnjZ3dzAjpblQeJa9vagyWKVXbSH5AMgiJ0IyqAOosEbMpr8IunPsBDOUHRk1T1
-						PEQxmsm4oZgqQq98Hu7N1NTNONw3awjqrexrx12dAl8VKdeCA1064Zp/G91zHWhO
-						GORr3CNpogSKqGgELQmpM/j8UufQy9OY9rnkSWGqZwJX1Iux/tnvAJw8vXZLjtCa
-						JkBAfSCs/GFiuUVKOgdBqDSERdBd/tQCyFcn+yvsNsK6LKoDWpoKGxw05Ty9F5Bb
-						mZj3Cukv+JCeU42AjZ8u+sMMZYXeS1K31U0Symd1LxKMYjfHLxAO1HgB2VCaaMeM
-						hCS02XsYS3TfdtR1AgMBAAGjSzBJMCgGA1UdEQQhMB+CHXVuaWNvcy5pc294Zm9y
-						ZC1ob3N0aW5nLmxvY2FsMB0GA1UdDgQWBBS58/SjLZWTJZDMtuPsucYe7PoqAjAN
-						BgkqhkiG9w0BAQUFAAOCAQEAjDAB0udHtjoXlaNpcbWKquYPza9p0Wh0AaMKz5jt
-						L7DCgazgDfXMpwY3J+M0ysH33s9mdd4vRe0ARro+Ec1VwY4yHjz4AvQDcGBwqZLr
-						4AM0AK3ICpoGHBosozp8vzB1vdY9duH2n7lXGyPsiS9hZKj6oQ/gSjEIfCpwMVd8
-						S6Dr5k2bhtxjFQlZdF1ofUXQTs63rE5iQ11mYGSXd0FUeJnaEmWhpkp+kTsgn3Uj
-						5Fx8nzqsHxkDaZC+DVGajwkzDDgsz1saH15dOOIDoHcdW3snMD3jBWuT7Yq/Kj6B
-						RH7xD7LtoPdX1VlnCjvUQILdhc/mJ9MddLSOW6r9JubXgg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://unicos.cirqahosting.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://unicos.cirqahosting.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IS Oxford Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University College School</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.isoxford.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Lee</GivenName>
-    <SurName>Orchard</SurName>
-    <EmailAddress>mailto:lee@isoxford.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Salvesen</SurName>
-    <EmailAddress>mailto:david@isoxford.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/unigepass.unige.it-idp.xml b/swamid-interfederations-2.0/unigepass.unige.it-idp.xml
deleted file mode 100644
index 0185ef78..00000000
--- a/swamid-interfederations-2.0/unigepass.unige.it-idp.xml
+++ /dev/null
@@ -1,124 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://unigepass.unige.it/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-10-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unige.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Genoa</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Genova</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IDP for members of University of Genoa</mdui:Description>
-        <mdui:Description xml:lang="it">IDP per gli utenti dell'Università di Genova</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://unigepass.unige.it/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://unigepass.unige.it/idem</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>
-MIIEPDCCAySgAwIBAgIJAJUnUP5NQ2loMA0GCSqGSIb3DQEBBQUAMHExCzAJBgNV
-BAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZHZW5vdmExHjAc
-BgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMFQ1NJVEExDDAK
-BgNVBAMTA2lkcDAeFw0xMjAyMDYxMDA2MDdaFw0xNTAyMDUxMDA2MDdaMHExCzAJ
-BgNVBAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZHZW5vdmEx
-HjAcBgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMFQ1NJVEEx
-DDAKBgNVBAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN9o
-HF2dS5fb+/z61/dra92RVq+Gd0B6oPdVfTCLb25y6R/74R/zcGQa6TxBimEtdXJy
-rdejUrzATgtIX4CkLNc85KKsLUyAJ3LNT/ekZe/uZJOCEZTHaN13bms8voHlZzSq
-+b8jp4HWGz/bYFH0N3asX/kGDq26h/Wz24C+mpULcX3qXYWNcLKkAvs775umPaBr
-Lkaje1B/8+blAlaAgc4M64+8iyjZdQ/jtx3Ww6cGZAe85nE8cxPUGaM+QmVhl8sD
-5F7tF2I12Lgr2s3EA0mBTf45abHAGTPTO0mZjxU8GTc1ob16Y4PPT1A3LSCUeaUw
-RWZrgaDxBb4f7KVX3skCAwEAAaOB1jCB0zAdBgNVHQ4EFgQUKR4DrQG/j+YpGxit
-gm56qio8Ic4wgaMGA1UdIwSBmzCBmIAUKR4DrQG/j+YpGxitgm56qio8Ic6hdaRz
-MHExCzAJBgNVBAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZH
-ZW5vdmExHjAcBgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMF
-Q1NJVEExDDAKBgNVBAMTA2lkcIIJAJUnUP5NQ2loMAwGA1UdEwQFMAMBAf8wDQYJ
-KoZIhvcNAQEFBQADggEBAAxbOLxwoht/pip4tsoLoCo6twBBvUQcdraUkd0nGxIW
-Fha0xD0TMHPeXXcjcRSf7+LW3Shfik8Du4fJObyD9tDkkX0b+wj4rIPIprnv5L4m
-PcO/yMKtJrq43DyJiwNHHomTbyFOiQ2Vsn2/Hm05mJ9wkl4/d5j1I4PrsOYy4p5i
-810XtjYqsJTSt/blUJSw4SKbhsm58fg/bN21ok9iDpCTHpNXrFgJqRc6nFOr9/AM
-levf5fRUC2nfXJvxcaNuDs40n2+oSGK7RT708GJcNWlgv6JJ9gD+GJfekj7qbx0l
-i0udBCaIfD5C2h/9Gk8PJUEofI93dBwVkAZhFtr/42M=
-</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>
-MIIEPDCCAySgAwIBAgIJAJUnUP5NQ2loMA0GCSqGSIb3DQEBBQUAMHExCzAJBgNV
-BAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZHZW5vdmExHjAc
-BgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMFQ1NJVEExDDAK
-BgNVBAMTA2lkcDAeFw0xMjAyMDYxMDA2MDdaFw0xNTAyMDUxMDA2MDdaMHExCzAJ
-BgNVBAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZHZW5vdmEx
-HjAcBgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMFQ1NJVEEx
-DDAKBgNVBAMTA2lkcDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN9o
-HF2dS5fb+/z61/dra92RVq+Gd0B6oPdVfTCLb25y6R/74R/zcGQa6TxBimEtdXJy
-rdejUrzATgtIX4CkLNc85KKsLUyAJ3LNT/ekZe/uZJOCEZTHaN13bms8voHlZzSq
-+b8jp4HWGz/bYFH0N3asX/kGDq26h/Wz24C+mpULcX3qXYWNcLKkAvs775umPaBr
-Lkaje1B/8+blAlaAgc4M64+8iyjZdQ/jtx3Ww6cGZAe85nE8cxPUGaM+QmVhl8sD
-5F7tF2I12Lgr2s3EA0mBTf45abHAGTPTO0mZjxU8GTc1ob16Y4PPT1A3LSCUeaUw
-RWZrgaDxBb4f7KVX3skCAwEAAaOB1jCB0zAdBgNVHQ4EFgQUKR4DrQG/j+YpGxit
-gm56qio8Ic4wgaMGA1UdIwSBmzCBmIAUKR4DrQG/j+YpGxitgm56qio8Ic6hdaRz
-MHExCzAJBgNVBAYTAklUMRMwEQYDVQQIEwpTb21lLVN0YXRlMQ8wDQYDVQQHEwZH
-ZW5vdmExHjAcBgNVBAoTFVVuaXZlcnNpdGEnIGRpIEdlbm92YTEOMAwGA1UECxMF
-Q1NJVEExDDAKBgNVBAMTA2lkcIIJAJUnUP5NQ2loMAwGA1UdEwQFMAMBAf8wDQYJ
-KoZIhvcNAQEFBQADggEBAAxbOLxwoht/pip4tsoLoCo6twBBvUQcdraUkd0nGxIW
-Fha0xD0TMHPeXXcjcRSf7+LW3Shfik8Du4fJObyD9tDkkX0b+wj4rIPIprnv5L4m
-PcO/yMKtJrq43DyJiwNHHomTbyFOiQ2Vsn2/Hm05mJ9wkl4/d5j1I4PrsOYy4p5i
-810XtjYqsJTSt/blUJSw4SKbhsm58fg/bN21ok9iDpCTHpNXrFgJqRc6nFOr9/AM
-levf5fRUC2nfXJvxcaNuDs40n2+oSGK7RT708GJcNWlgv6JJ9gD+GJfekj7qbx0l
-i0udBCaIfD5C2h/9Gk8PJUEofI93dBwVkAZhFtr/42M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDWzCCAkOgAwIBAgIJAIAJ8UH68A6xMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
-BAYTAklUMR4wHAYDVQQKDBVVbml2ZXJzaXTDoCBkaSBHZW5vdmExFTATBgNVBAMM
-DGlkcC51bmlnZS5pdDAeFw0xNjAyMTAwOTAyMDlaFw0zNjAyMDkwOTAyMDlaMEQx
-CzAJBgNVBAYTAklUMR4wHAYDVQQKDBVVbml2ZXJzaXTDoCBkaSBHZW5vdmExFTAT
-BgNVBAMMDGlkcC51bmlnZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAN46djr+YasV+Cce+EqLkblF8wE4MuVdVGRHgDOkxW7uWDCjuAvxnJs4v8Vj
-0skt8XOLC7GKJvSzMo18rLJakrIi3JZjrB9mIWh6j9skHJES0HHQ995Zvl7jr3Zq
-8HTo735pusVdE7f2lVmhV7D3mT45Dmyj2YyJX3PoKUTHdInjQHPeNk68URFLL2/V
-NXx+C+oNy8L+nVMzXnKn8lckgYMFKHeVtl1EP6rO53M2Pq+gb3DlA823jO3GMqVd
-GRxYgjUx9qE7Xtz3EX4YyyrBMlYzxEFAOhZIJpkN7Vgp5ZRktyAvGxsnEyzLbfSV
-2AlA1I4fvaBc7nD/uYetkOnMIlECAwEAAaNQME4wHQYDVR0OBBYEFMN6fjJ03J7c
-pLrsz38UH4HotCPAMB8GA1UdIwQYMBaAFMN6fjJ03J7cpLrsz38UH4HotCPAMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAF9W5+sM7r+q7Qx7nNl3g00h
-1ExLJoEQWyCMRgEUx14LxPhNKHz4qRctD3/rz0X2nfKCK7+X+CJDSUTTnOnG32rd
-TIFlXNNq5NTfNUYQq0WwrfUTaCKoNIhee0QKsIMD8e/w5qv/xwBYpD+sGbFARFPM
-eIeWTTTGKnIVbCkEdyWQFKUamNjXWCrIWR7aAmef/U/fuxH4WAkmtJRCzUHbhlAq
-gDqpphhHlm9EjByOkvnLq2yeNBmE4W2iEBOKcqaTI1xDRMssrCAgudEoGukP97f0
-5ySVv5RNdC8OIsJj2xsMV2R/Y05cHormJs2VUYg7w3/cvULdgwLQkT93X82Ykps=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unigepass.unige.it/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://unigepass.unige.it/idp/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Genoa</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università di Genova</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Genoa</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Genova</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.unige.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Ferrante</md:SurName>
-    <md:EmailAddress>mailto:marco@csita.unige.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/unmpidp.unm.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/unmpidp.unm.edu-idp-shibboleth.xml
deleted file mode 100644
index d1127d77..00000000
--- a/swamid-interfederations-2.0/unmpidp.unm.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,102 +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://unmpidp.unm.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">unm.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of New Mexico</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Primary IDP for the University of New Mexico</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>
-MIIDJzCCAg+gAwIBAgIUHkqghRUEAkZxZ/0df+bxNNL7T9AwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPdW5tcGlkcC51bm0uZWR1MB4XDTEyMDExMTE4NTU1NloX
-DTMyMDExMTE4NTU1NlowGjEYMBYGA1UEAxMPdW5tcGlkcC51bm0uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmROfmboGYsxF4ku4WuME7OETL99Z
-5Yx4ZvBd2YFDHwMuuEn3NoKcoQVd26ey+8Ae/Y9bvBS667g87+tKW3xAXAWvsvnT
-0eNh27YXtNkm8TZWs2rmRYM9k1QsF45O2NurMxj/P9TBF5F4BvSbT4/lxd5ZNpJC
-S96rVSfM1hgUXhCdDNOQEg6ZG4Kakhkmiki+1LlfWwM4EBXySWiKuFrPruz/tUTm
-p+kXJ7NI8vrDCTsWwD8f4CA4XoySkAsSXKYOtL/Vqmo6T4IoQmsNnkfNApn0AFLM
-ApS4Svgds/F8nm6+14/UV7Ol7P1Iy9M4o01Fc2HtUxm9/tPSPLRGj7O2PQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg91bm1waWRwLnVubS5lZHWGJmh0dHBzOi8vdW5tcGlk
-cC51bm0uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTZrZ1dPGWgZ9RxQDBp
-TtzO9iPGVzANBgkqhkiG9w0BAQUFAAOCAQEAMHPssz1ZNLmk4zm7ocuQY1CqlQxb
-plnjNRYxSznr1PQ2ZF6I6H/KQCsfyhY/gU0UGtnfh9bj60p5d50h9eCuHTi0KL54
-cCw9ijyKK0v/4EdYBk6ib9koDzwwX/BmGJxPuDPkoboWqmb0mCKM4TFkWmEivAw3
-TMXYK7ycdYBfsqaH9w7lG7esXXThYRiktRq5mzCxQx93x7H5LCF4o+OFvSx0mCX2
-IoYdDX58vQSM0wh4b8pjNSWyPhyyt7Ogee4EVq17sJLMLlFzggjbJCE6YkBvwxce
-mtW4BfJL5R5xn6jGVmGkCJ/H3Qn4XW26dFRbTtpoKVeYnogS4bPdvoc4qQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://unmpidp.unm.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://unmpidp.unm.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://unmpidp.unm.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://unmpidp.unm.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://unmpidp.unm.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unm.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUHkqghRUEAkZxZ/0df+bxNNL7T9AwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPdW5tcGlkcC51bm0uZWR1MB4XDTEyMDExMTE4NTU1NloX
-DTMyMDExMTE4NTU1NlowGjEYMBYGA1UEAxMPdW5tcGlkcC51bm0uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmROfmboGYsxF4ku4WuME7OETL99Z
-5Yx4ZvBd2YFDHwMuuEn3NoKcoQVd26ey+8Ae/Y9bvBS667g87+tKW3xAXAWvsvnT
-0eNh27YXtNkm8TZWs2rmRYM9k1QsF45O2NurMxj/P9TBF5F4BvSbT4/lxd5ZNpJC
-S96rVSfM1hgUXhCdDNOQEg6ZG4Kakhkmiki+1LlfWwM4EBXySWiKuFrPruz/tUTm
-p+kXJ7NI8vrDCTsWwD8f4CA4XoySkAsSXKYOtL/Vqmo6T4IoQmsNnkfNApn0AFLM
-ApS4Svgds/F8nm6+14/UV7Ol7P1Iy9M4o01Fc2HtUxm9/tPSPLRGj7O2PQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg91bm1waWRwLnVubS5lZHWGJmh0dHBzOi8vdW5tcGlk
-cC51bm0uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTZrZ1dPGWgZ9RxQDBp
-TtzO9iPGVzANBgkqhkiG9w0BAQUFAAOCAQEAMHPssz1ZNLmk4zm7ocuQY1CqlQxb
-plnjNRYxSznr1PQ2ZF6I6H/KQCsfyhY/gU0UGtnfh9bj60p5d50h9eCuHTi0KL54
-cCw9ijyKK0v/4EdYBk6ib9koDzwwX/BmGJxPuDPkoboWqmb0mCKM4TFkWmEivAw3
-TMXYK7ycdYBfsqaH9w7lG7esXXThYRiktRq5mzCxQx93x7H5LCF4o+OFvSx0mCX2
-IoYdDX58vQSM0wh4b8pjNSWyPhyyt7Ogee4EVq17sJLMLlFzggjbJCE6YkBvwxce
-mtW4BfJL5R5xn6jGVmGkCJ/H3Qn4XW26dFRbTtpoKVeYnogS4bPdvoc4qQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://unmpidp.unm.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of New Mexico</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of New Mexico</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unm.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Chuck Phillips</md:GivenName>
-    <md:EmailAddress>chuckp@unm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Libby Henry</md:GivenName>
-    <md:EmailAddress>ehenry@unm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jared Galbraith</md:GivenName>
-    <md:EmailAddress>jagalb@unm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jared Galbraith</md:GivenName>
-    <md:EmailAddress>jagalb@unm.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index bc6f0f85..00000000
--- a/swamid-interfederations-2.0/uobhive.sisoshibboleth.co.uk-entity.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://uobhive.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo University of Bedfordshire" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2013-08-28T14:25:23Z"/>
-  </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://uob-hive.siso.co/sso/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://uob-hive.siso.co/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="60" width="60">https://uob-hive.siso.co/images/layout/siso-logo.jpg</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">SiSo University of Bedfordshire, Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo University of Bedfordshire, Online Resource Booking</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uob-hive.siso.co/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo University of Bedfordshire, Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sisoshibboleth.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uoe-shib.hosted.exlibrisgroup.com-shib.xml b/swamid-interfederations-2.0/uoe-shib.hosted.exlibrisgroup.com-shib.xml
deleted file mode 100644
index 969f8fa9..00000000
--- a/swamid-interfederations-2.0/uoe-shib.hosted.exlibrisgroup.com-shib.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://uoe-shib.hosted.exlibrisgroup.com/shib">
-  <!--
-		This is a "Primo Resource Discovery at University of Edinburgh" Shibboleth SP for Ex Libris (UK) 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="2015-03-12T13:57:14Z">
-      <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:DisplayName xml:lang="en">University of Edinburgh - Primo</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is an Ex Libris Primo Hosted SP on behalf of the University of Edinburgh</mdui:Description>
-      </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://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAIHsfkq6pSPaMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB2FpbzAwMjEwHhcNMTUwMjIwMjE1MzA1WhcNMjUwMjE3MjE1MzA1WjASMRAw
-						DgYDVQQDEwdhaW8wMDIxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						+GqQ/e7BZpmfvaNUUPVyPQvF5kOAqzguqY/YKlYj6AqUwZiT7UI2sNmnhBMWfqp3
-						xQDm4obQqL+dKN8IO1NqtB3mDSk9I2xffDIzWXipBou+kgbrBKdI7jjRy5Jyogjh
-						iCWwDob/pjSVG6ymk+6W99+we3kwasOIdL4l72pp4HpOmAXg0YtliBB4pdPn7j/a
-						4l5uV1itS7e126hXv7gk2gegsmkgcvHs18CjpATjKCouOm+pWrbAAW92ZyDp9Kfd
-						TXLkjiJzZWZOKD2aoHPx8FdQhIgxnJSdY80mH0oyJSdAMVH5Y5eWzuuaPKXAjzeB
-						SeCzO/GJpQ7QIXTmc4QE/wIDAQABozUwMzASBgNVHREECzAJggdhaW8wMDIxMB0G
-						A1UdDgQWBBQF2D5zrvZSq4lY1Ww/1qFpUKj6MzANBgkqhkiG9w0BAQUFAAOCAQEA
-						S+GqgtoiVnYgzYx5+q+uHPeaFvX2oeEg3t4qrrd+02dhLTnRNB1fkg3RpNfISsnK
-						4yUr17grT3pzOxDCm13iSw2sDfsVUrbJORQslKMemJ7dZDm1irzbPnqRpE8cwIFz
-						qUrf+p4iUqvjnhMZ/8jW4SKtlo7GwkxFZ1xFznyLGQM7W47ZvqX1qdlEoWD+CkUD
-						Z4M6UFXxC3sjOF1G0AF3K2YNfSWHwrqWdrUXXnsS1yNAutb/jv5zhhDcKb6YXPuU
-						tcaxY6g7Qf6hKDePS/E1Za597QsmpfLNMhllU3JjTATGBBwHP3Ke/TSicuDYU/cu
-						2uFODAwEKXXlTXol08EA3w==
-					</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://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uoe-shib.hosted.exlibrisgroup.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ex Libris (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">This is a Shibboleth SP for the University of Edinburgh</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://exlibrisgroup.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Benoit</GivenName>
-    <SurName>Ginestet</SurName>
-    <EmailAddress>mailto:benoit.ginestet@exlibrisgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml b/swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.xml
deleted file mode 100644
index 989bc71f..00000000
--- a/swamid-interfederations-2.0/uolics.sisoshibboleth.co.uk-entity.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://uolics.sisoshibboleth.co.uk/entity">
-  <!--
-		This is a "SiSo University of Leeds ~ ICS, Online Resource Booking" Shibboleth SP for TechEthika Ltd.
-	-->
-  <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#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="2013-09-12T16:50:14Z">
-      <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://uol.siso.co/ics/sso/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://uol.siso.co/ics/sso/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SiSo University of Leeds ~ ICS, Online Resource Booking</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SiSo University of Leeds ~ ICS, Online Resource Booking</mdui:Description>
-        <mdui:Logo height="60" width="60">https://shibboleth.siso.co/siso-logo60x60.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAOSUhyDXVj7AMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB3Npc28uY28wHhcNMTMwMTA3MTYzMTIxWhcNMjMwMTA1MTYzMTIxWjASMRAw
-						DgYDVQQDEwdzaXNvLmNvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						xDnj9YFJVXclawo/8rs1aWYAgk6rKi8A/Cyycq0mW5yOKLLh8MUIgDeOGL7bLl7p
-						MBeZM4ILlNaeJhICWm1tuLB6SYzREnXwpO7+lvx13xsRHW2TjCPGV3yUgz55vRYj
-						bseFrwFHJ8IrL24UTLcpX/R//9cMkZpSqM+77Hn22dxbYvGUOQCHOQzL78AO91qz
-						dUaxKzYWyWM7w2U4APP41Zvd0flyUtRZXp8W+WwlUDffFoNndsjR4L/9wuXvOcrH
-						+VZtMLy60+cB9bpvVlaQVlt+1stEABdMVvuGNkJ9wIjRjP2b9OLUI76QmgwIDtdE
-						5BS0Bv0Puz66L96r2MunRQIDAQABozUwMzASBgNVHREECzAJggdzaXNvLmNvMB0G
-						A1UdDgQWBBRRosxNbUQXXwtWDl/kYMScRImh5TANBgkqhkiG9w0BAQUFAAOCAQEA
-						grfjza9Btcz+9WvzcjDTZ+KSrWWvrthA3zc6Q+C/MIBG8CCuxMO+uwFBnXIopGlX
-						bLa/QtVLjOugsnizFxjaEFTG4jGndtPJ8+9V8Eja5RlOazuM2LT738+Um8/1Frhr
-						GXa0Hdv9ZWEbIhil65fFqZNOmOteja6xxAQ9NgGG/XUnTVTbr7msihEAYTTcS40/
-						GSYpT9nQwiryfSWDNJ17Zyl44389kSw+FCUsu8Ns9VSDEDWr/R+97ZMcjN6hAfJL
-						dji3X1aaAC/JbnJl/v+yR1TH/sdHyObVaM7FToUGKiyjX9VpfOe64d0hjogzEr0x
-						firJubLNu96jbGctasqcpQ==
-					</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"/>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uol.siso.co/ics/sso/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TechEthika Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SiSo University of Leeds ~ ICS, Online Resource Booking</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.siso.uk.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@siso.uk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steven</GivenName>
-    <SurName>Oates</SurName>
-    <EmailAddress>mailto:steve@siso.uk.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml b/swamid-interfederations-2.0/upkcontent.imparando.com-shibboleth.xml
deleted file mode 100644
index 47bf82af..00000000
--- a/swamid-interfederations-2.0/upkcontent.imparando.com-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://upkcontent.imparando.com/shibboleth">
-  <!--
-		This is a Shibboleth "Oracle UPK Training Environment" SP for Imparando (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-14T16:01:41Z"/>
-  </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://upkcontent.imparando.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIJAOd6oO6JdGfIMA0GCSqGSIb3DQEBBQUAMCgxJjAkBgNV
-						BAMTHWltcC1jb250ZW50MDEtcC5pbXBhcmFuZG8uY29tMB4XDTEyMDUwODE1MjEw
-						MVoXDTIyMDUwNjE1MjEwMVowKDEmMCQGA1UEAxMdaW1wLWNvbnRlbnQwMS1wLmlt
-						cGFyYW5kby5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwCqZL
-						lGdDR1+8p9tWhNpAiWwR4N1Fe0ZuAosO++DU8ihOg9shAuaIbgavZ+LQDxDT4q60
-						H/NSpFm0L5NCNdJbztlZDST30MkvbQk/x6rVWUV7N/vmH2uGlbYfXLdSWiIJN0lt
-						BFZt9BejI85TLGcQQmU844KF1+QdlhcAETTvCJ9e4gJvOnua46WIDjcc+lE+a9fL
-						B6vto9gliTiKzP9AbrCOKo5lPgcxozJ5ZV77KckRYzJnwOna8GTqwiJXqhMB6uPi
-						aYVMhbT7tq1veiCvRT8ME/pZTNV3g5UVby6ZTsit19jATqQ0IRZdfLBzPMVf13f6
-						YXexYEP3N5sMCmnpAgMBAAGjeDB2MFUGA1UdEQROMEyCHWltcC1jb250ZW50MDEt
-						cC5pbXBhcmFuZG8uY29thitodHRwczovL3Vwa2NvbnRlbnQuaW1wYXJhbmRvLmNv
-						bS9zaGliYm9sZXRoMB0GA1UdDgQWBBSzFWIXER4HxW6ugBZoKX8DmGwYLjANBgkq
-						hkiG9w0BAQUFAAOCAQEAET9AJLSfmZZSI6yvQrQWTplBulwW7thsItdk/2YMY4In
-						OAFieBBkZehVWj2j+y8HytWgYh0S3WC3RQ3+/YPAAH/IN+k7y9MIsQBhKU27/FAR
-						LE7IdN0YqKBK/kHvKdCPQn9ePpwEhVR27yArZiVkb50PMX+YfkAZgS6rFg2M1NL9
-						tSuKU0Ka/7lb6xcc6naWaRfBxhUjMzKnWTFAgKF0873nr3TDvSokmJjvUrU5NHGG
-						A05LtZya40PZ6vdC56IE0Ch0Sqjn0kLbt6KnKT8sfqXfwdOCvXLdvs2ISzzQZMak
-						KbW8+5q5lNgkgzIwTRFYyp1vbDoPNm2tqPuMfJsOOA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upkcontent.imparando.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upkcontent.imparando.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://upkcontent.imparando.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upkcontent.imparando.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://upkcontent.imparando.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://upkcontent.imparando.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Imparando (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Imparando: Oracle UPK Training Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.imparando.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>upk-support</GivenName>
-    <EmailAddress>mailto:upk-support@imparando.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>technical</GivenName>
-    <EmailAddress>mailto:technical@imparando.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 95149c3b..00000000
--- a/swamid-interfederations-2.0/upkdev.bsp.ox.ac.uk-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://upkdev.bsp.ox.ac.uk/shibboleth">
-  <!--
-	This is a Shib 2 SP for the University of Oxford - UPKDEV Oracle Training Environment
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://upkdev.bsp.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAM3SwyRR3bgIMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFWJzcHdpbjI2LmJzcC5veC5hYy51azAeFw0xMTEyMDUxNjAwNDJaFw0yMTEy
-						MDIxNjAwNDJaMCAxHjAcBgNVBAMTFWJzcHdpbjI2LmJzcC5veC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMjqdqsgyd/uQ08OxSRl4gAwYPFm
-						pgRRhOmjO2Om4ZWmRNawAngO6J3BFrSRQcIFXU18WS7gdKdgN1E5dLlujDjKsN/e
-						kPC5UJiPpMELAdiwrFMcQQGnPE53jI8Xj/HOTG3n66xRmrr3cuRRAE708i5NxShQ
-						uL2HDO0jZB8Er/Ie3Sp2Nzjzpcx5yHgb1yVd/UxOkKoR/QIafT7PUko2AcELvA44
-						shUthRUiSybsA9X8b6Ri3b+ewLRPUoDD1Th4zcG8D9KNL+ED8RsP9hwtZHrDXHwi
-						nnzYotblpAZOspxym6G+RUvSvx7s5mrXF8oAhQmluAAtEj/I3su8VgIw5g8CAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVYnNwd2luMjYuYnNwLm94LmFjLnVrMB0GA1UdDgQW
-						BBSTMLysVwykBrWtSKkiTJUDM/CzmjANBgkqhkiG9w0BAQUFAAOCAQEAhlmJteoW
-						GZ4iVYnltbjOne5bqHZSrv5q5bdPtjo1PsPxEqHE1+hUlbTbEot6T1ponxu8vpyi
-						vqDzSWq68O2uIq2Qa2qA1srl66tFYlJnrRIuPhH0qW9xk+eI23+SRzoiKl9PaVjJ
-						y1R1pKQG/WHaYFY7/UsLjDJjmqbk1qxWhl+4VaeOPCn35u/cA3qX2Amdk3RSRb+c
-						9GfwhbvtzlMBI3qA9frsr31AYBlKYxWh/rKVxAWzrle8GNYr2V2OJ17y5MdvTfVx
-						jAyhlvp7Bap+Lkn6LWNJ/LBpg90XSMC0mFuT88LXgA9LllTUR8EQeZpSDI3iC5HY
-						O0S/azG5O+MD0A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://upkdev.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: UPKDEV Oracle Training Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stephan</GivenName>
-    <SurName>Eckweiler</SurName>
-    <EmailAddress>mailto:stephan.eckweiler@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/upki.yamagata-u.ac.jp-idp-shibboleth.xml b/swamid-interfederations-2.0/upki.yamagata-u.ac.jp-idp-shibboleth.xml
deleted file mode 100644
index 402a6e7a..00000000
--- a/swamid-interfederations-2.0/upki.yamagata-u.ac.jp-idp-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://upki.yamagata-u.ac.jp/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.gakunin.jp" registrationInstant="2009-11-05T00: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>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">yamagata-u.ac.jp</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="ja">山形大学</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Yamagata University</mdui:DisplayName>
-        <mdui:Keywords xml:lang="en">category:location:tohoku category:organizationType:university</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE/DCCA+SgAwIBAgIIfK4/rh+AlMUwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
-BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
-dHV0ZSBvZiBJbmZvcm1hdGljczEgMB4GA1UEAxMXTklJIE9wZW4gRG9tYWluIENB
-IC0gRzQwHhcNMTUwNjI2MTExNzA0WhcNMTcwNzI2MTExNzA0WjCBjzELMAkGA1UE
-BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxHDAaBgNVBAoTE1lhbWFnYXRhIFVuaXZl
-cnNpdHkxMDAuBgNVBAsTJ05ldHdvcmtpbmcgYW5kIENvbXB1dGluZyBTZXJ2aWNl
-IENlbnRlcjEeMBwGA1UEAxMVdXBraS55YW1hZ2F0YS11LmFjLmpwMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGJaTuQQ7ArOVOiAngf9l4RbPzk5ztw/
-wD2QEI78cIEfjPN/djb5pgqUFq0qHMp+GkV4UB5muObCVd43zAn1PxdzoSlbE7RB
-JjIyLIuo0uK83pNx/rgDQZCwi8hi2Vp4RlAQZVnq69CosKwz/4qTQgGRmDcU1qlL
-IcKcMFgM6hz6MKQgrEUbLNfvLcJUml/8yku3TW5hu7dNOHzMHG8u8PbSjv1E1SVs
-teuWaLxsxb2dOgViMDgj09JTzTMEfp4h0okGXkvefInLECKVf+PSAXjwLYVQn72R
-19tru8k73CJFcJXNYjIuLE+hgQkRYtzgKbCwlTWq06tVL5Cm2lOEpwIDAQABo4IB
-ezCCAXcwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaA
-FBkLbzkfMQM0X+TSQB835o3nYjl8MEoGA1UdHwRDMEEwP6A9oDuGOWh0dHA6Ly9y
-ZXBvMS5zZWNvbXRydXN0Lm5ldC9zcHBjYS9uaWkvb2RjYTMvZnVsbGNybGc0LmNy
-bDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0OBBYEFFwPF1DdKRucPlNVo6OuEwDEsNvx
-MFoGA1UdIARTMFEwTwYMKwYBBAGB/AgDAgEBMD8wPQYIKwYBBQUHAgEWMWh0dHBz
-Oi8vcmVwbzEuc2Vjb210cnVzdC5uZXQvc3BjcHAvY3BzL2luZGV4Lmh0bWwwPAYI
-KwYBBQUHAQEEMDAuMCwGCCsGAQUFBzABhiBodHRwOi8vbmlpZzQub2NzcC5zZWNv
-bXRydXN0Lm5ldDAgBgNVHREEGTAXghV1cGtpLnlhbWFnYXRhLXUuYWMuanAwDQYJ
-KoZIhvcNAQELBQADggEBAESvy42bUtXwWGWkvW7vddFsLIGjlEWWV0E79wXobVt0
-LKVm/JpdR0XmWWADe252JLzCvGGRRXBqXCAy3+9dshSsG508t5R6C1wMXf3jGHV9
-r9gv2PuEqtibPXM8FFe0ARmBWUWo3/Fgh/1aTwSKzTeAoX/vMVjJZXZTCB6xmyls
-jHCqvp568dPYJo7bNRgDS5L8gcR79VDUQfvysZNgqgu4yBJN2QyloNfPbTEWI3BK
-F/SKL1HwtIO9yIFXUifLwqEx2U7H3WVQowe/avgAPVEHsCqAPAPv+OCEqJbjjtl5
-+u7BMTn7P17Ua/k7aQTIDQ9E9wMs7Fp4LBKUklinM9o=</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://upki.yamagata-u.ac.jp/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://upki.yamagata-u.ac.jp/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://upki.yamagata-u.ac.jp/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">yamagata-u.ac.jp</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE/DCCA+SgAwIBAgIIfK4/rh+AlMUwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UE
-BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxKjAoBgNVBAoTIU5hdGlvbmFsIEluc3Rp
-dHV0ZSBvZiBJbmZvcm1hdGljczEgMB4GA1UEAxMXTklJIE9wZW4gRG9tYWluIENB
-IC0gRzQwHhcNMTUwNjI2MTExNzA0WhcNMTcwNzI2MTExNzA0WjCBjzELMAkGA1UE
-BhMCSlAxEDAOBgNVBAcTB0FjYWRlbWUxHDAaBgNVBAoTE1lhbWFnYXRhIFVuaXZl
-cnNpdHkxMDAuBgNVBAsTJ05ldHdvcmtpbmcgYW5kIENvbXB1dGluZyBTZXJ2aWNl
-IENlbnRlcjEeMBwGA1UEAxMVdXBraS55YW1hZ2F0YS11LmFjLmpwMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApGJaTuQQ7ArOVOiAngf9l4RbPzk5ztw/
-wD2QEI78cIEfjPN/djb5pgqUFq0qHMp+GkV4UB5muObCVd43zAn1PxdzoSlbE7RB
-JjIyLIuo0uK83pNx/rgDQZCwi8hi2Vp4RlAQZVnq69CosKwz/4qTQgGRmDcU1qlL
-IcKcMFgM6hz6MKQgrEUbLNfvLcJUml/8yku3TW5hu7dNOHzMHG8u8PbSjv1E1SVs
-teuWaLxsxb2dOgViMDgj09JTzTMEfp4h0okGXkvefInLECKVf+PSAXjwLYVQn72R
-19tru8k73CJFcJXNYjIuLE+hgQkRYtzgKbCwlTWq06tVL5Cm2lOEpwIDAQABo4IB
-ezCCAXcwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaA
-FBkLbzkfMQM0X+TSQB835o3nYjl8MEoGA1UdHwRDMEEwP6A9oDuGOWh0dHA6Ly9y
-ZXBvMS5zZWNvbXRydXN0Lm5ldC9zcHBjYS9uaWkvb2RjYTMvZnVsbGNybGc0LmNy
-bDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0OBBYEFFwPF1DdKRucPlNVo6OuEwDEsNvx
-MFoGA1UdIARTMFEwTwYMKwYBBAGB/AgDAgEBMD8wPQYIKwYBBQUHAgEWMWh0dHBz
-Oi8vcmVwbzEuc2Vjb210cnVzdC5uZXQvc3BjcHAvY3BzL2luZGV4Lmh0bWwwPAYI
-KwYBBQUHAQEEMDAuMCwGCCsGAQUFBzABhiBodHRwOi8vbmlpZzQub2NzcC5zZWNv
-bXRydXN0Lm5ldDAgBgNVHREEGTAXghV1cGtpLnlhbWFnYXRhLXUuYWMuanAwDQYJ
-KoZIhvcNAQELBQADggEBAESvy42bUtXwWGWkvW7vddFsLIGjlEWWV0E79wXobVt0
-LKVm/JpdR0XmWWADe252JLzCvGGRRXBqXCAy3+9dshSsG508t5R6C1wMXf3jGHV9
-r9gv2PuEqtibPXM8FFe0ARmBWUWo3/Fgh/1aTwSKzTeAoX/vMVjJZXZTCB6xmyls
-jHCqvp568dPYJo7bNRgDS5L8gcR79VDUQfvysZNgqgu4yBJN2QyloNfPbTEWI3BK
-F/SKL1HwtIO9yIFXUifLwqEx2U7H3WVQowe/avgAPVEHsCqAPAPv+OCEqJbjjtl5
-+u7BMTn7P17Ua/k7aQTIDQ9E9wMs7Fp4LBKUklinM9o=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://upki.yamagata-u.ac.jp:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://upki.yamagata-u.ac.jp: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">Yamagata University</md:OrganizationName>
-    <md:OrganizationName xml:lang="ja">山形大学</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Yamagata University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="ja">山形大学</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://kdwww.kj.yamagata-u.ac.jp/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Networking and Computing Service Center</md:SurName>
-    <md:EmailAddress>mailto:sinet-admin@cc.yamagata-u.ac.jp</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-fi-fer.hubhn02-1.0.xml b/swamid-interfederations-2.0/urn-fi-fer.hubhn02-1.0.xml
deleted file mode 100644
index c0dd933e..00000000
--- a/swamid-interfederations-2.0/urn-fi-fer.hubhn02-1.0.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" entityID="urn:fi:fer.hubhn02:1.0">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-01-05T11:40:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 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 National Education of Federation - HUB IDP HN02 FER</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.ac-orleans-tours.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Employees of french department of education</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Fédération HUB IDP HN02 FER</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnel enseignant, non enseignant et scolaire de l'éducation nationale</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>
-					      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>
-    </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-POST" Location="https://fim-hn-02-fer-idp.phm.education.gouv.fr/sso/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fim-hn-02-fer-idp.phm.education.gouv.fr/sso/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fim-hn-02-fer-idp.phm.education.gouv.fr/sso/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Fédération HUB IDP HN02 FER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Fédération HUB IDP HN02 FER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ac-orleans-tours.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>pole-hebergement@ac-orleans-tours.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-dur.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-dur.ac.uk.xml
deleted file mode 100644
index 0e118d1e..00000000
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-dur.ac.uk.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="urn:mace:ac.uk:sdss.ac.uk:provider:identity:dur.ac.uk">
-  <!--
-		This is a Shibboleth IdP for the University of Durham.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">dur.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Durham</mdui:DisplayName>
-        <mdui:Logo height="101" width="90">https://shib.dur.ac.uk/idp/images/du90x101.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://shib.dur.ac.uk/idp/images/du16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
-						HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
-						BgNVBAMMDnNoaWIuZHVyLmFjLnVrMB4XDTEzMDMwNDExNTYyMloXDTIzMDMwNDEx
-						NTYyMlowfDELMAkGA1UEBhMCR0IxFjAUBgNVBAgMDUNvdW50eSBEdXJoYW0xDzAN
-						BgNVBAcMBkR1cmhhbTEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBEdXJoYW0xDDAK
-						BgNVBAsMA0NJUzEXMBUGA1UEAwwOc2hpYi5kdXIuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDb3Inw3qmbQglj/PfdG0Gt4NLlgIF3VyMMKhkX
-						KTgEZnEqMtz56yCrEQUv2q52+gEBHj5BC2I+tLH/D+hxeE2mscTsj5GYQEdXrZro
-						8+hlAxD5ygHPYYA0vTUWXp1jy7Oa5jL9nzVFVCcxXowuEOezLFdDPR2+q99dz29O
-						Az/9b6dVHb3IatG0ueDDNE+jtr+z7s67OEsgYL9cgkOs5bTbqZe6+BHs+MuRNYTI
-						3FmwtVRwiGEITMbAe/BRyr6Oa04uzLBqH5Xgrl/N0cqwsjo+IR9QG1GoMwY1PYa4
-						oQKr5NXMfnjZ1fZnWwbiDnRpwvxzX8nDgPdNRrjqZGQzxLofAgMBAAGjezB5MAkG
-						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
-						ZmljYXRlMB0GA1UdDgQWBBTjOCzu4jEoqNnF741QhQ6iWPfeIzAfBgNVHSMEGDAW
-						gBTjOCzu4jEoqNnF741QhQ6iWPfeIzANBgkqhkiG9w0BAQUFAAOCAQEA0Ayun4MT
-						76SeQDaSUUJY6CSMgk65rX/U7Be3QgPLGkjnWS1jyuQ0iEMIbMINEQuqhLAhxmh1
-						yGzwt4GOwqDO/HmzGbDA02coUENR58uwPXRwGjmNIW8k+BNOvfyh018rjM7dLxJU
-						zxGW+ge+jbEjiGG/gVdarffIDjDmAONjmcdhrbunMCcL9xgH/2UDm/eowOr8TiBC
-						drL5y3PFQUwmcJwJx4hZs8GiTUtuEQa18vxYTM4tgKvOpey97hnhJxWOhk+kuH7v
-						0pA98AVsugdhEPTTuW6EQSwKHKPWAqTE9D0hTr8frCdrSUIppziwK5Nlk5qXAn70
-						CDgIrJGVkQXCNg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.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://shib.dur.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dur.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dur.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dur.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">dur.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID9jCCAt6gAwIBAgIJAPxm6Cbnsa4zMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
-						BAYTAkdCMRYwFAYDVQQIDA1Db3VudHkgRHVyaGFtMQ8wDQYDVQQHDAZEdXJoYW0x
-						HTAbBgNVBAoMFFVuaXZlcnNpdHkgb2YgRHVyaGFtMQwwCgYDVQQLDANDSVMxFzAV
-						BgNVBAMMDnNoaWIuZHVyLmFjLnVrMB4XDTEzMDMwNDExNTYyMloXDTIzMDMwNDEx
-						NTYyMlowfDELMAkGA1UEBhMCR0IxFjAUBgNVBAgMDUNvdW50eSBEdXJoYW0xDzAN
-						BgNVBAcMBkR1cmhhbTEdMBsGA1UECgwUVW5pdmVyc2l0eSBvZiBEdXJoYW0xDDAK
-						BgNVBAsMA0NJUzEXMBUGA1UEAwwOc2hpYi5kdXIuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDb3Inw3qmbQglj/PfdG0Gt4NLlgIF3VyMMKhkX
-						KTgEZnEqMtz56yCrEQUv2q52+gEBHj5BC2I+tLH/D+hxeE2mscTsj5GYQEdXrZro
-						8+hlAxD5ygHPYYA0vTUWXp1jy7Oa5jL9nzVFVCcxXowuEOezLFdDPR2+q99dz29O
-						Az/9b6dVHb3IatG0ueDDNE+jtr+z7s67OEsgYL9cgkOs5bTbqZe6+BHs+MuRNYTI
-						3FmwtVRwiGEITMbAe/BRyr6Oa04uzLBqH5Xgrl/N0cqwsjo+IR9QG1GoMwY1PYa4
-						oQKr5NXMfnjZ1fZnWwbiDnRpwvxzX8nDgPdNRrjqZGQzxLofAgMBAAGjezB5MAkG
-						A1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRp
-						ZmljYXRlMB0GA1UdDgQWBBTjOCzu4jEoqNnF741QhQ6iWPfeIzAfBgNVHSMEGDAW
-						gBTjOCzu4jEoqNnF741QhQ6iWPfeIzANBgkqhkiG9w0BAQUFAAOCAQEA0Ayun4MT
-						76SeQDaSUUJY6CSMgk65rX/U7Be3QgPLGkjnWS1jyuQ0iEMIbMINEQuqhLAhxmh1
-						yGzwt4GOwqDO/HmzGbDA02coUENR58uwPXRwGjmNIW8k+BNOvfyh018rjM7dLxJU
-						zxGW+ge+jbEjiGG/gVdarffIDjDmAONjmcdhrbunMCcL9xgH/2UDm/eowOr8TiBC
-						drL5y3PFQUwmcJwJx4hZs8GiTUtuEQa18vxYTM4tgKvOpey97hnhJxWOhk+kuH7v
-						0pA98AVsugdhEPTTuW6EQSwKHKPWAqTE9D0hTr8frCdrSUIppziwK5Nlk5qXAn70
-						CDgIrJGVkQXCNg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dur.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dur.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 Durham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Durham</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dur.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:itservicedesk@durham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:m.a.young@durham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-shibboleth-i.sgul.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-shibboleth-i.sgul.ac.uk.xml
deleted file mode 100644
index 41d20647..00000000
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-identity-shibboleth-i.sgul.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="urn:mace:ac.uk:sdss.ac.uk:provider:identity:shibboleth-i.sgul.ac.uk">
-  <!--
-		This is a Shibboleth IdP for St George's Hospital Medical School.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">sgul.ac.uk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">St George's, University of London</mdui:DisplayName>
-        <mdui:Logo height="150" width="200">https://sgsa01.sgul.ac.uk/idp/images/sgul_logo_standard.png</mdui:Logo>
-        <mdui:Logo height="60" width="80">https://sgsa01.sgul.ac.uk/idp/images/sgul_logo_small.png</mdui:Logo>
-        <mdui:Logo height="16" width="16">https://sgsa01.sgul.ac.uk/idp/images/favicon.ico</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUAnlMK5UZoNDOL9nbtSWzA8/XR4cwDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAxMRc2dzYTAxLnNndWwuYWMudWswHhcNMTMwNjExMDkyMTAy
-						WhcNMzMwNjExMDkyMTAyWjAcMRowGAYDVQQDExFzZ3NhMDEuc2d1bC5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIp65woT8aiIkKpFnRy8WNIk
-						GbO/EL0wJnYI7/AuGoCCPbvnxwAXoIqyNjSnzy82dTn82rZGlKQFL7pfZ/vq3Pxl
-						PDn5mwF5VQYW17LunIhrj9JgnRuTxNW/XpsL74/hmeZwj859NmHA0HXQ+3T/kkS1
-						BHD3V1uQBYTAHGpjJHe8E0p3sDRNjldx2negX7mhmde1D1CeSEcpaDpod4DTrc3W
-						Q56/5tXTl6OrUYlHGyjzDlknrLNS8NyGRuY1vPXjaWJFesru3uRHI1FduWXgtY1F
-						a0A5FBy4btrIixxPgSfrJehzkjLdF7eYAd+efJTuoRoLOeWA+kHGJof6+vqtQ4kC
-						AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2dzYTAxLnNndWwuYWMudWuGKGh0dHBzOi8v
-						c2dzYTAxLnNndWwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMBNSmc4
-						4s/YiTVkVD7VJ4AP/nlQMA0GCSqGSIb3DQEBBQUAA4IBAQAk/Ys37rY68WWcw9uj
-						FNcSiG0jetWek4UHPajBN/CKwEqgIizvpjFNQdWp/BsMg1SF9ItzvsyhN6S+HoaD
-						r6ndXU5h9vJTnOlbnE0aPMU0SC7Q5AZKjqtSx/OvyZ/sPG+OW08C70fsSQ5F7pj5
-						ZiEtvU8EPPeQo0XAekQjmZyoUpDqM+NfTCmaBSIXEgI1oUJrzrMFmY0cYzz3JDtD
-						T8Ji+J5vBVFGESak+uKDq7dDV9ERia7sy5CxS15L9dxc3SPTBGkTyDjTEAEKsXa/
-						AiV0PWB9+hLQl9kShgPPGnw7vMGXS9NXetdVS32t0K7XQm7BUuje9FqF+IWwGTDI
-						qCZw
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgsa01.sgul.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://sgsa01.sgul.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgsa01.sgul.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgsa01.sgul.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">sgul.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLzCCAhegAwIBAgIUAnlMK5UZoNDOL9nbtSWzA8/XR4cwDQYJKoZIhvcNAQEF
-						BQAwHDEaMBgGA1UEAxMRc2dzYTAxLnNndWwuYWMudWswHhcNMTMwNjExMDkyMTAy
-						WhcNMzMwNjExMDkyMTAyWjAcMRowGAYDVQQDExFzZ3NhMDEuc2d1bC5hYy51azCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIp65woT8aiIkKpFnRy8WNIk
-						GbO/EL0wJnYI7/AuGoCCPbvnxwAXoIqyNjSnzy82dTn82rZGlKQFL7pfZ/vq3Pxl
-						PDn5mwF5VQYW17LunIhrj9JgnRuTxNW/XpsL74/hmeZwj859NmHA0HXQ+3T/kkS1
-						BHD3V1uQBYTAHGpjJHe8E0p3sDRNjldx2negX7mhmde1D1CeSEcpaDpod4DTrc3W
-						Q56/5tXTl6OrUYlHGyjzDlknrLNS8NyGRuY1vPXjaWJFesru3uRHI1FduWXgtY1F
-						a0A5FBy4btrIixxPgSfrJehzkjLdF7eYAd+efJTuoRoLOeWA+kHGJof6+vqtQ4kC
-						AwEAAaNpMGcwRgYDVR0RBD8wPYIRc2dzYTAxLnNndWwuYWMudWuGKGh0dHBzOi8v
-						c2dzYTAxLnNndWwuYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMBNSmc4
-						4s/YiTVkVD7VJ4AP/nlQMA0GCSqGSIb3DQEBBQUAA4IBAQAk/Ys37rY68WWcw9uj
-						FNcSiG0jetWek4UHPajBN/CKwEqgIizvpjFNQdWp/BsMg1SF9ItzvsyhN6S+HoaD
-						r6ndXU5h9vJTnOlbnE0aPMU0SC7Q5AZKjqtSx/OvyZ/sPG+OW08C70fsSQ5F7pj5
-						ZiEtvU8EPPeQo0XAekQjmZyoUpDqM+NfTCmaBSIXEgI1oUJrzrMFmY0cYzz3JDtD
-						T8Ji+J5vBVFGESak+uKDq7dDV9ERia7sy5CxS15L9dxc3SPTBGkTyDjTEAEKsXa/
-						AiV0PWB9+hLQl9kShgPPGnw7vMGXS9NXetdVS32t0K7XQm7BUuje9FqF+IWwGTDI
-						qCZw
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sgsa01.sgul.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgsa01.sgul.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">St George's Hospital Medical School</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St George's, University of London</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sgul.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Keith</GivenName>
-    <SurName>Carr</SurName>
-    <EmailAddress>mailto:kecarr@sgul.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Keith</GivenName>
-    <SurName>Carr</SurName>
-    <EmailAddress>mailto:kecarr@sgul.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.xml
deleted file mode 100644
index 2bac5ee5..00000000
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-edina.ac.uk-statacc.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="urn:mace:ac.uk:sdss.ac.uk:provider:service:edina.ac.uk:statacc">
-  <!--
-		This is the EDINA Statistical Accounts of Scotland service provider.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="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">Statistical Accounts of Scotland</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Essential sources of the study of Scottish life in the 18th and 19th centuries</mdui:Description>
-        <mdui:Logo height="119" width="350">https://vsp2.edina.ac.uk/public/images/splogos/statacc.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <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>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/statacc/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/statacc/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/statacc/Shibboleth.sso/SAML/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/statacc/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/statacc/Shibboleth.sso/SAML/Artifact" index="10"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA: Statistical Accounts of Scotland</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/about/</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/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.xml
deleted file mode 100644
index 9e334976..00000000
--- a/swamid-interfederations-2.0/urn-mace-ac.uk-sdss.ac.uk-provider-service-target.sdss.ac.uk.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="urn:mace:ac.uk:sdss.ac.uk:provider:service:target.sdss.ac.uk">
-  <!--
-		This is an EDINA Shibboleth test SP.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="65" width="150">https://vsp2.edina.ac.uk/public/images/splogos/edina.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">EDINA services</mdui:DisplayName>
-        <mdui:Description xml:lang="en">EDINA services for research and education</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <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>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/target/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/target/Shibboleth.sso/SAML/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/target/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/target/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/target/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/target/Shibboleth.sso/SAML/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/target/Shibboleth.sso/SAML/POST" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/target/Shibboleth.sso/SAML/Artifact" index="10"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA Test Target</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.ac.uk/about/</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/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml b/swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml
deleted file mode 100644
index 7ee70d26..00000000
--- a/swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.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="urn:mace:cnrs.fr:janus.dsi.cnrs.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-10T22:03:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnrs.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CNRS</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC1klEQVQ4y4WTaUjTARjGf/+5NaduqzXLWK5a1+yge2W3SZeQMfpUEF2mFB1QBBFZUQRddNIlFEIRVtBh9MGi0o6PLpOif5uFdijZGrbSTf/b3j5YRgf0fHo/PM/z4eX3KPxDq3aXnKyofjmvLRYzO3vZ6hdNH3+1eMWCg/xPe85fP4UyWnDmCVNXCrOKhOmrhcFeITNPio5cuvNnRvl5OPI3qB/Kbw5l0gwwGUGvhyQ9GPSdtngCAu/hU5C3deX5TrvlFoAOYOPRC2c+3K0Yyrgp0PgJPgbhWwQlkaDb1zZo/AwJQZdph3FZOJ2Lyh+8eL0cABExYugrq/aXiki7SPtXYetZoSog3H8hFB4SaQmLiMiwktuiVKrCkesCbgFIqg2Zzqu+plHXLhTTI3Ua6Y7eZCzOw3/jHp5Xdbybl8uuXqnoczbT7J1J8o7jxPyvwGhj3c7tVl2N/+0Ie7ab2uo66GFl3Zq9ALhSjAxITgCg2tMwKVHMz/1oWwphRBbYTVTWBGbp0oz6b8HmEFazCcdYN47cbACaox1dnw4rCu29baRUPCTpWCmsXQoGAx1tEaNuxoTh1TTUMyV7DAD+s8UEQl+Ia/HOtBbHo+jRPgYJeuej5Xgg0gFaB067tUE3e+qYO7S2Mq1wF/V3S8jdd45HBbuxqWpnweUbFJ24AslG4r5axNkXdhwA3zu8c7Kv/uBgpOB2QWMIMtIh2cCQYS48bgcXL1WBzQw9LRCJQqgFUk1Q44fWJ4oOYPaKhfdRVXD1AasJknQQj3V2mwyQ1g2iUSAB3c3wxMem/esP/0YiZAiusWBJg5gwJKs/nuH9uFhWBelmfkADzwLgcsCzy0oXiQDhcIObNw+gJQwx7VdvJAKaBtF2eOwDa0pX+C+JiBtcAplimbhE3N6NwsB8wTJZYIAsKz5R+d9FAuw9VbZlYE7B03TP4qZBc4vUgm3HTouI9V/e77ShIdcL4sPwAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE2KzAyOjAwlICcrAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMOXdJBAAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.dsi.cnrs.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">CNRS</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>
-					      MIICrzCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJGUjEN
-MAsGA1UEChMEQ05SUzEQMA4GA1UECxMHTU9ZMTY3ODEaMBgGA1UEAxMRamFudXMu
-ZHNpLmNucnMuZnIwHhcNMDkwNzA2MTM0NTQ5WhcNMjkwNzAxMTM0NTQ5WjBKMQsw
-CQYDVQQGEwJGUjENMAsGA1UEChMEQ05SUzEQMA4GA1UECxMHTU9ZMTY3ODEaMBgG
-A1UEAxMRamFudXMuZHNpLmNucnMuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAMWYVMjJRPP/YAq9wTJDr9rkLfm8VpnK/8MM8c2YqVtewBqnOgnlo0k0n7oC
-jnkwpmTa0Wycgbx4wek3TeaDG49KrKlSD2HlyvelLvlMuFXYTyqndBk+7p+RX+h3
-FjC+qqCUWHzEIfWwNNGNrnLza4WHsb0B5oJZMqB7WSfcpL/5AgMBAAGjgaQwgaEw
-HQYDVR0OBBYEFAIowpwjXZw7sNhsQhBxv4ISaaHKMHIGA1UdIwRrMGmAFAIowpwj
-XZw7sNhsQhBxv4ISaaHKoU6kTDBKMQswCQYDVQQGEwJGUjENMAsGA1UEChMEQ05S
-UzEQMA4GA1UECxMHTU9ZMTY3ODEaMBgGA1UEAxMRamFudXMuZHNpLmNucnMuZnKC
-AQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCIdgOBuDJQ5nr/kb+u
-oxlXkk9jwQcsmEgAteIhzE9+tA1PLXJ6di60PMq839lcm8v4gVxk/JtWJzrVY1pi
-m+gmLH30NygYX8ACokRdLMvL5FQHBsbQN1VTwmXKYCnWoYtSMauaxr+eUhVDjg/s
-pV1Gt+/saN/LhZGKd3NLvfjacQ==
-					    </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-POST" Location="https://janus.dsi.cnrs.fr/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://janus.dsi.cnrs.fr/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://janus.dsi.cnrs.fr/shibboleth-idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CNRS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CNRS</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dsi.cnrs.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>ListeAdminUNIX@dsi.cnrs.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml
deleted file mode 100644
index 588cba0d..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.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="urn:mace:cru.fr:federation:ens-lsh.fr">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-13T13:13: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">ens-lsh.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">ENS Lettres et Sciences humaines</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUaXDeZKLpq89kivZfZ//X0NfeRUYwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIuZW5zLWxzaC5mcjAeFw0wOTA0MjQw
-ODEyMDFaFw0yOTA0MjQwODEyMDFaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmVu
-cy1sc2guZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHNMjdxzFx
-mWO63iu8QH+lMEXiDOjrr8PU+GRKVmThf1S5HZKruPa6l+9gV2mpeKOVDaQTgbGG
-sHui63HhNt4zzV55IXP9j+NHRyHkEpASXQKDeHLCTCHfs1QKmZKk3IfFcWqCCgVU
-byWjqv0vMf1g8/+RjDOpsb0eSU7De6rfPr/T/Rig7LqHH+O8ylB1g9pSaWW/oL5W
-qD+65djAlzlajlL/vmXE5UblgxnPvIpmltpQaRbUCbdJgTDchnRjE3LCFmwaSO7n
-FcBD4JEnYPe7BOqJv/DQcSNpAK/k5r5emnuCQAAh7wmlw+jmbiCFI78wkqBTAmrO
-ASkoj819hENJAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgyLmVucy1s
-c2guZnKGLWh0dHBzOi8vc2hpYmJvbGV0aDIuZW5zLWxzaC5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUo7Hd+mlHXBsrwd5DdoQxDGXouzwwDQYJKoZIhvcNAQEF
-BQADggEBABWfdOgzwxn6Goz9jU/IOk74GkGkeeVxsIKsS4OiXZyGC7ATMRk2kGPA
-vgF+2XUURWXsb93mjdkC7YyHDXTgBFUYsX8tv20j5MjDOBQI4l9XVoJ6cOyxfG2+
-aNLgjEEAYeu7n1bZCU+9mMeeqHnB8f4ovM4r1PdkBT2ttmUX7dU+coPLa/JetOTO
-AVXxYRZY4ty/dx2KdOetIcmD8UypcRVAmkry27l6ybWBEA8vqwPn78jFJeS/s92m
-ALjg3wnfawAlwRtGLxUhf9n7igtjhjrKRL9WVVnMPg08GpB6IDRzNedWjIhE8gmo
-beyt/O7UlYCwegLabizFFtOY7ztDocU=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn: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.ens-lsh.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.ens-lsh.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.ens-lsh.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-lsh.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDQzCCAiugAwIBAgIUaXDeZKLpq89kivZfZ//X0NfeRUYwDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIuZW5zLWxzaC5mcjAeFw0wOTA0MjQw
-ODEyMDFaFw0yOTA0MjQwODEyMDFaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmVu
-cy1sc2guZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHNMjdxzFx
-mWO63iu8QH+lMEXiDOjrr8PU+GRKVmThf1S5HZKruPa6l+9gV2mpeKOVDaQTgbGG
-sHui63HhNt4zzV55IXP9j+NHRyHkEpASXQKDeHLCTCHfs1QKmZKk3IfFcWqCCgVU
-byWjqv0vMf1g8/+RjDOpsb0eSU7De6rfPr/T/Rig7LqHH+O8ylB1g9pSaWW/oL5W
-qD+65djAlzlajlL/vmXE5UblgxnPvIpmltpQaRbUCbdJgTDchnRjE3LCFmwaSO7n
-FcBD4JEnYPe7BOqJv/DQcSNpAK/k5r5emnuCQAAh7wmlw+jmbiCFI78wkqBTAmrO
-ASkoj819hENJAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgyLmVucy1s
-c2guZnKGLWh0dHBzOi8vc2hpYmJvbGV0aDIuZW5zLWxzaC5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUo7Hd+mlHXBsrwd5DdoQxDGXouzwwDQYJKoZIhvcNAQEF
-BQADggEBABWfdOgzwxn6Goz9jU/IOk74GkGkeeVxsIKsS4OiXZyGC7ATMRk2kGPA
-vgF+2XUURWXsb93mjdkC7YyHDXTgBFUYsX8tv20j5MjDOBQI4l9XVoJ6cOyxfG2+
-aNLgjEEAYeu7n1bZCU+9mMeeqHnB8f4ovM4r1PdkBT2ttmUX7dU+coPLa/JetOTO
-AVXxYRZY4ty/dx2KdOetIcmD8UypcRVAmkry27l6ybWBEA8vqwPn78jFJeS/s92m
-ALjg3wnfawAlwRtGLxUhf9n7igtjhjrKRL9WVVnMPg08GpB6IDRzNedWjIhE8gmo
-beyt/O7UlYCwegLabizFFtOY7ztDocU=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ens-lsh.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 Lettres et Sciences humaines</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ENS Lettres et Sciences humaines</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Christophe Girard</SurName>
-    <EmailAddress>Christophe.Girard@ens-lsh.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Christelle Chaput</SurName>
-    <EmailAddress>Christelle.Chaput@ens-lsh.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml
deleted file mode 100644
index 6e75aa03..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:montpellier.iufm.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-08T18:22:46Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier.iufm.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IUFM de Montpellier</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-montp2.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">IUFM de Montpellier</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>
-					      MIIDZjCCAk6gAwIBAgIVALjF/HJMRzFhyx4QUhGQtfnc/go0MA0GCSqGSIb3DQEB
-BQUAMCkxJzAlBgNVBAMTHmZlZGVyYXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjAe
-Fw0wOTExMTcxNDM1NTdaFw0yOTExMTcxNDM1NTdaMCkxJzAlBgNVBAMTHmZlZGVy
-YXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAIk8UoESjzWA4bGzXWSC96Uc5Y3F2GkWNMcAzqkpEjT6dvY8hWsv
-pSThfyGbsndBb6sUxdsKzkOcq9jgPG5SbKQH7FCf1aGMdrr67g3lYXBo/61N1zoS
-IZ27qCMSWWXKEuCM1J8+XGlKO+v/2NGhhy/y/MGCoq/dVS1CEpQR2WmuZ7T85YGX
-t/8juhUog6qx9luXRp4Vn8AtPjBf8Wx4fa+1fHk2EsbOK+TNmc2S8QMDhrdwEmTO
-FtlLzVzqwTBMCZK6nvuWccjJLQbPqFzpBS7gMNy9Nbc+MCHs2VPEFottHirNCHle
-/dVue+/vEaJnoGat6gNF+xe/OaFUS6aYl78CAwEAAaOBhDCBgTBgBgNVHREEWTBX
-gh5mZWRlcmF0aW9uLm1vbnRwZWxsaWVyLml1Zm0uZnKGNWh0dHBzOi8vZmVkZXJh
-dGlvbi5tb250cGVsbGllci5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
-BBSSscKMzM8vdFU0r4f8rJnlUjXhRjANBgkqhkiG9w0BAQUFAAOCAQEADkTGJNdk
-VCmgQLEKNXBwLmjzKEaXVN0oDkycey2WzqnVFErveI5WUtUwbyTX6gvX34495dHf
-PpOEHBqBsTLug4ecwWrfurwupVHEpnHXQISO3MfTFuASxSkKg7jCWG1yslmdR6ua
-+EYRyYeZT7PsLRDvvsSHfgs29dx+L20LOqTv7KZ2q24TEEjQpzg0umSvfJH6iSwe
-k4efOHibLlXTz1Di9jVrchyw0Ix95i2tRAhkw9MLw37NX7hw73quN3/V1Tg8vNoW
-UwfIvWcdU+rI3r0sj0XzUxvuWt2E34dY7iRDZMqs9x1IBcLg00oRH3Hc2jvF6Ytw
-R4xWKyqWIGnn4g==
-					    </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>
-					      MIIEdTCCA12gAwIBAgICDKYwDQYJKoZIhvcNAQEEBQAwUDELMAkGA1UEBhMCRlIx
-DDAKBgNVBAoTA0NSVTETMBEGA1UEAxMKYWMtc2VydmV1cjEeMBwGCSqGSIb3DQEJ
-ARYPY2EtYWRtaW5AY3J1LmZyMB4XDTA3MDIwOTEzNDEwMFoXDTEwMDIwOTEzNDEw
-MFowdDELMAkGA1UEBhMCRlIxETAPBgNVBAoTCDAzNDE4MThTMScwJQYDVQQDEx5m
-ZWRlcmF0aW9uLm1vbnRwZWxsaWVyLml1Zm0uZnIxKTAnBgkqhkiG9w0BCQEWGmlu
-Zm9ybUBtb250cGVsbGllci5pdWZtLmZyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQCzkuQU982HLqlyiPNS1KhtfTw3F94aI+GELkvvRy+rtR7z0J9yZy4DfsqW
-OM6rTmWNfw5RafnX5UAoyoNvvvP8f9BMmJ7jQE45D+Q3yzgHmHF2F1tL92eTz7we
-AhaPlZiOXdQO5IBI6LAruUGs5wRdper+6u6lbB+j6z7ylajO1wIDAQABo4IBtzCC
-AbMwDAYDVR0TAQH/BAIwADARBglghkgBhvhCAQEEBAMCBsAwDgYDVR0PAQH/BAQD
-AgXgMCwGCWCGSAGG+EIBDQQfFh1DZXJ0aWZpY2F0IHNlcnZldXIgYWMtc2VydmV1
-cjAdBgNVHQ4EFgQU5hAjNm223ufj8bnpCHS7Gm6wCKswdwYDVR0jBHAwboAUcQc/
-B7Tpf84zBWgE8jSmUL6s9qChU6RRME8xCzAJBgNVBAYTAkZSMQwwCgYDVQQKEwND
-UlUxEjAQBgNVBAMTCWFjLXJhY2luZTEeMBwGCSqGSIb3DQEJARYPY2EtYWRtaW5A
-Y3J1LmZyggEDMEsGA1UdHwREMEIwQKA+oDyGOmh0dHA6Ly9pZ2MuY3J1LmZyL2Nn
-aS1iaW4vbG9hZGNybD9DQT1hYy1zZXJ2ZXVyJmZvcm1hdD1ERVIwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCME4GA1UdIARHMEUwQwYOKQMGAQQAAbdfAwEE
-AAQwMTAvBggrBgEFBQcCARYjaHR0cDovL2lnYy5jcnUuZnIvcmVmZXJlbmNlcy9w
-Yy5wZGYwDQYJKoZIhvcNAQEEBQADggEBAMdTx24FtReSqJ4TpDYYHkLQFp3m1lNn
-wwTJXDsmqyuVgG+UDC/2ob3M/fB3ffV7trmBMYDp/36SK9sdOM+KAeJTkFbDiBVr
-O0uozxNSHj13VqGw7UHcFCX1AykmoYCrSDVL2U8NovZsb9lZfu+dI9JtvLDAF0Sq
-3BCJEzlOjHfwWq8rzQYzhXKVeXRZ3nKd1iKLQdg1biltlbgh+IXzj0P9W++TBSEa
-7XBGhp2qum5kAy76u2NwWcunMJM7fmExJF+SjGUXtKQ6wxnXQ1zcAJ7atuyPPfEA
-ST1d3qLq8ftDvKa7Edva60Iw8nCcEd5b4I7ZSlYhFpX7KlK/HNZu6Mk=
-					    </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-POST" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.montpellier.iufm.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier.iufm.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDZjCCAk6gAwIBAgIVALjF/HJMRzFhyx4QUhGQtfnc/go0MA0GCSqGSIb3DQEB
-BQUAMCkxJzAlBgNVBAMTHmZlZGVyYXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjAe
-Fw0wOTExMTcxNDM1NTdaFw0yOTExMTcxNDM1NTdaMCkxJzAlBgNVBAMTHmZlZGVy
-YXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAIk8UoESjzWA4bGzXWSC96Uc5Y3F2GkWNMcAzqkpEjT6dvY8hWsv
-pSThfyGbsndBb6sUxdsKzkOcq9jgPG5SbKQH7FCf1aGMdrr67g3lYXBo/61N1zoS
-IZ27qCMSWWXKEuCM1J8+XGlKO+v/2NGhhy/y/MGCoq/dVS1CEpQR2WmuZ7T85YGX
-t/8juhUog6qx9luXRp4Vn8AtPjBf8Wx4fa+1fHk2EsbOK+TNmc2S8QMDhrdwEmTO
-FtlLzVzqwTBMCZK6nvuWccjJLQbPqFzpBS7gMNy9Nbc+MCHs2VPEFottHirNCHle
-/dVue+/vEaJnoGat6gNF+xe/OaFUS6aYl78CAwEAAaOBhDCBgTBgBgNVHREEWTBX
-gh5mZWRlcmF0aW9uLm1vbnRwZWxsaWVyLml1Zm0uZnKGNWh0dHBzOi8vZmVkZXJh
-dGlvbi5tb250cGVsbGllci5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
-BBSSscKMzM8vdFU0r4f8rJnlUjXhRjANBgkqhkiG9w0BAQUFAAOCAQEADkTGJNdk
-VCmgQLEKNXBwLmjzKEaXVN0oDkycey2WzqnVFErveI5WUtUwbyTX6gvX34495dHf
-PpOEHBqBsTLug4ecwWrfurwupVHEpnHXQISO3MfTFuASxSkKg7jCWG1yslmdR6ua
-+EYRyYeZT7PsLRDvvsSHfgs29dx+L20LOqTv7KZ2q24TEEjQpzg0umSvfJH6iSwe
-k4efOHibLlXTz1Di9jVrchyw0Ix95i2tRAhkw9MLw37NX7hw73quN3/V1Tg8vNoW
-UwfIvWcdU+rI3r0sj0XzUxvuWt2E34dY7iRDZMqs9x1IBcLg00oRH3Hc2jvF6Ytw
-R4xWKyqWIGnn4g==
-					    </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>
-					      MIIEdTCCA12gAwIBAgICDKYwDQYJKoZIhvcNAQEEBQAwUDELMAkGA1UEBhMCRlIx
-DDAKBgNVBAoTA0NSVTETMBEGA1UEAxMKYWMtc2VydmV1cjEeMBwGCSqGSIb3DQEJ
-ARYPY2EtYWRtaW5AY3J1LmZyMB4XDTA3MDIwOTEzNDEwMFoXDTEwMDIwOTEzNDEw
-MFowdDELMAkGA1UEBhMCRlIxETAPBgNVBAoTCDAzNDE4MThTMScwJQYDVQQDEx5m
-ZWRlcmF0aW9uLm1vbnRwZWxsaWVyLml1Zm0uZnIxKTAnBgkqhkiG9w0BCQEWGmlu
-Zm9ybUBtb250cGVsbGllci5pdWZtLmZyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQCzkuQU982HLqlyiPNS1KhtfTw3F94aI+GELkvvRy+rtR7z0J9yZy4DfsqW
-OM6rTmWNfw5RafnX5UAoyoNvvvP8f9BMmJ7jQE45D+Q3yzgHmHF2F1tL92eTz7we
-AhaPlZiOXdQO5IBI6LAruUGs5wRdper+6u6lbB+j6z7ylajO1wIDAQABo4IBtzCC
-AbMwDAYDVR0TAQH/BAIwADARBglghkgBhvhCAQEEBAMCBsAwDgYDVR0PAQH/BAQD
-AgXgMCwGCWCGSAGG+EIBDQQfFh1DZXJ0aWZpY2F0IHNlcnZldXIgYWMtc2VydmV1
-cjAdBgNVHQ4EFgQU5hAjNm223ufj8bnpCHS7Gm6wCKswdwYDVR0jBHAwboAUcQc/
-B7Tpf84zBWgE8jSmUL6s9qChU6RRME8xCzAJBgNVBAYTAkZSMQwwCgYDVQQKEwND
-UlUxEjAQBgNVBAMTCWFjLXJhY2luZTEeMBwGCSqGSIb3DQEJARYPY2EtYWRtaW5A
-Y3J1LmZyggEDMEsGA1UdHwREMEIwQKA+oDyGOmh0dHA6Ly9pZ2MuY3J1LmZyL2Nn
-aS1iaW4vbG9hZGNybD9DQT1hYy1zZXJ2ZXVyJmZvcm1hdD1ERVIwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCME4GA1UdIARHMEUwQwYOKQMGAQQAAbdfAwEE
-AAQwMTAvBggrBgEFBQcCARYjaHR0cDovL2lnYy5jcnUuZnIvcmVmZXJlbmNlcy9w
-Yy5wZGYwDQYJKoZIhvcNAQEEBQADggEBAMdTx24FtReSqJ4TpDYYHkLQFp3m1lNn
-wwTJXDsmqyuVgG+UDC/2ob3M/fB3ffV7trmBMYDp/36SK9sdOM+KAeJTkFbDiBVr
-O0uozxNSHj13VqGw7UHcFCX1AykmoYCrSDVL2U8NovZsb9lZfu+dI9JtvLDAF0Sq
-3BCJEzlOjHfwWq8rzQYzhXKVeXRZ3nKd1iKLQdg1biltlbgh+IXzj0P9W++TBSEa
-7XBGhp2qum5kAy76u2NwWcunMJM7fmExJF+SjGUXtKQ6wxnXQ1zcAJ7atuyPPfEA
-ST1d3qLq8ftDvKa7Edva60Iw8nCcEd5b4I7ZSlYhFpX7KlK/HNZu6Mk=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML1/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">IUFM de Montpellier</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IUFM de Montpellier</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-montp2.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@montpellier.iufm.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml
deleted file mode 100644
index 8e556d93..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.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="urn:mace:cru.fr:federation:uhb.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-23T13:48:41Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhb.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes2.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-haute-bretagne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université Rennes 2</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB6UlEQVQoz1WST0iUURTFf/fNlzCpWSA0EQYSYgz9cRUWNut2QdG+drWR2rizqFW0KGaVyZAGQVCGChVEm8wpgiJiQhTCFlIEYWU2g86/d1q870u7m/d4vHPPPeceY9wAJDMTGIhwAjJMiLgMcBbfTQgv+eSDMEtJoR0IvEARwpA81DmU6euI2ufK8z9WlmkBNQNjT2tPJr0zZe7F95dwF25zcfZCXTUltVRZ2veglwKMpSjwcG4ivDOCo8H57LkbAzcjtqDATdfWrvnTCwd39OGbQM1XExk46lzrv56osqAsqHh9oohjQ3MA7O3s3ha1g/40VoeKQ8ce56YXpwy8fGuq9dXxIuv/ATgyfTjMd+b5WUbhDoxw+e0lSfJe0uDsYOF9YUODNxeQ2c4sDWhCmivvrk59nsQMyA/kD2T2b6K4hyTvvaSZbzOPFiYowDiM8rXyRZLXPzJxC0eF0s+PYc25TO5k7ylqmCBi92T3mtbD7s0Udu1oof/Z0dX6b9vknMxwjlp9z/1dlWbFsCQsOMzWquWOse3Db4afLj0p/SqRAmTyuNRydaVtrC3/Ib9Y/hTnhXEMk0QTPBgWIbPEfwc+NsNjaYuSEVFkIZ7EmTUkzIMjEpFMJnDCUBzsgFCcVwVbTd4ww0Kbv2lsB+BFv9iTAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA1KzAyOjAwu5sZmwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMMrGoScAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.uhb.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université Rennes 2</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>
-					      MIIDQzCCAiugAwIBAgIUN1TTOPl4sgCyt2P8GnFSEqcJLsYwDQYJKoZIhvcNAQEL
-BQAwJTEjMCEGA1UEAwwac2hpYmJvbGV0aC51bml2LXJlbm5lczIuZnIwHhcNMTUx
-MjE2MTAwNjMwWhcNMzUxMjE2MTAwNjMwWjAlMSMwIQYDVQQDDBpzaGliYm9sZXRo
-LnVuaXYtcmVubmVzMi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIc9O9Uc1ocyQeZVnWbdvw+UblNoZd3h2l7+uSYeVlDh+w1hiwzyqJgkfSm4cnIh
-QuyDreblxUi4kWchq8CNl2h5iUuXvbx+9T5p5okrLVzVr5gTblr5Zbt0XKUwM2ij
-1CRtUJIKRDvulteDWpidBHHpKcQcCeqX+Sua1C/btdXogib8tK3jsnEMPLTpDgr1
-NaKPx0zDq42+lK6iNXKCpMrELsuY+8zhSpQ5MEfFGv3Mn/SJxazHZL4zeXfAsmWn
-kgU0tsb5laOKFPPDH/1w0oVXCBjMaiXNo9pN4vniKqNcKqdt3LScnXgx+6nRLUl7
-VoZnBD/wUox/H/WoaCZJG98CAwEAAaNrMGkwHQYDVR0OBBYEFJCVUOEA0sf43c8F
-tG9gw6OOIT13MEgGA1UdEQRBMD+CGnNoaWJib2xldGgudW5pdi1yZW5uZXMyLmZy
-hiF1cm46bWFjZTpjcnUuZnI6ZmVkZXJhdGlvbjp1aGIuZnIwDQYJKoZIhvcNAQEL
-BQADggEBAH9uybT+vMHuOwrR2CaLsaosmDUwnBW49igCi/MOIPHMfBEjxjwWTM6c
-uRZ54Ek7Z5kw6Z0xXS7o4FBLvh5cBXynmxIoYBEyEhCcEREuY0HkoXjHEtkQyEh8
-Fbiu42dnzjVPtsLiURycXoGWdN9eYdPkZT/x7b60utBFJ7Y1lCA2+6D0eMXJI/bu
-8NO/uK3WHCdPWA/p0orBLN8WkStgmHv+4coHn++h0KqBASF6zJNKd4HJz8ihfdi+
-CQJuCqQLnHVwpjJ0xEHustvaFv2zyxP6P/af8iLUK+9UciOk7Cp4LjrdlBmMrf5Q
-QisFJWc/MGN0ISKidXg5cRqLoBnSgnw=
-					    </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>
-					      MIIElDCCA3ygAwIBAgIQLdnpFQuu69xl9z7dAWPZhzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDQwMjAwMDAwMFoXDTE2MDQwMTIzNTk1OVowSDEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpzaGliYm9sZXRo
-LnVuaXYtcmVubmVzMi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AKFFb2IxKCffcTQOFyEl2g99rJUdjkOchNMt7alge6/T4/wRxcl7G/2Q+DahU6s9
-i4lUCYFV9iKi7Ia2eYUfn69r3KjN9q+h2fbb/BMyKt6lZicqQkrU1Kk3NSzQWiCZ
-quB8hy8W8sW7qZ2kfgCR3AZ+0bHchCMwYTDI+MKe0NURzxf/PiqSWe8PvYo0fs6L
-RAqwLW6X6DOfF8CbOVlHf8MpUaFLXWn5XZ8iEMA4+EnaJ1uxMqVeLNqU1jTQqKni
-dQ+JFCZvMJqRtuXeVvBawkTsCh1JWAUU/2FcnD7RN340aLC5V3F3ZN3hZCjJiXv7
-boO5MMJpIJkbrtHJJw+Mo7kCAwEAAaOCAYowggGGMB8GA1UdIwQYMBaAFAy9k2gM
-896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSyIireJ6nPkGljLFuPuPxNpmdY7zAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
-OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
-Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
-aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwOAYDVR0RBDEwL4Iac2hpYmJvbGV0
-aC51bml2LXJlbm5lczIuZnKCEXNoaWJib2xldGgudWhiLmZyMA0GCSqGSIb3DQEB
-BQUAA4IBAQCgvAbpw5E3Kf9+PokHstck4ysikCjOebRAFilM9lu8xRc4lyuMTlr9
-eMdckFM3kO7wa6iiNPieFCnCsok8ZZ1wGI1qUkKYKE2DtxbEiTVfPtwQhnGQPDp4
-rnneYYlTeIQawTxr9kf+uwiaTKm1AGU1gMcT2tM9dfnQ+5Zt1DukJUWLMxq5upmz
-fhb8GprtsM8qv0z2+6Fat+iIu0GfmOaDZ/gDsW++cOD9P6K25GrdmVk20rC3oyy1
-OABUhu/g7vs9SnH4R/DZfgZ3U2WrVo8n/P9zcmNwfefBBC267M8I7c73wxZza+fb
-/K7h56t2aaVkVbRdvi8tEncI1Fzw5lq5
-					    </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-POST" Location="https://shibboleth.uhb.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uhb.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uhb.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université Rennes 2</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Rennes 2</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uhb.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>admin-unix@uhb.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml
deleted file mode 100644
index 2a02782c..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:unice.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-08-07T17:06:18Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unice.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Nice Sophia Antipolis</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACcUlEQVQ4y3WSXUiTURjHf+fd2bst55wfmyxBGxXmTSliEQV9QEEGQaQEQRhBJdRlBCEEEfQFQRfdeJNEhIF11UUahWVXgUP70CQSXGQ2t7RMt7l373u6mL5uYufinMN5zvmd5/n/HwG4OX17gMXUNpSlAFC5pWAIewKhCVyeYe5f2iNouTiI6Wwkk4ToNCgLqgJgKZibp6G6knQmy+foTzCtHKA6CK4icBgRweHzBuiSmTm6O9rImCY3u55xpH4jTulkZCpGUNdpbNpKZSjAVGKW9ntPodgDKpOVKEw0JE7J2JcoVx/08uTaCd4MRPCGNrG9rgRdd3Ln8XNK/S6O7d0BugQFKExp15jN4va4CQb9TMRTfIkt0Pf2Jbh0mI7xousKB0/doKOtBRJ/oKoCFMh8nSwFtRU+Prwfo++XAcGS3E++MI96XhEKBxn6OA5et/1Gs3cKEBpFuoOMoYFQubOlYDKZpmF9GdLlBFOtARCgsHAIgULZjtkXhcCBQiEAaw3AkssO7f9tYClAiLzMCgACoSCLQK0mKLAQGKZCrAqtAKRGNmMQmZzB6/OAyqvBVJR7JfOLmcKOLAD8TdFUv4XYRJwzrfth6jv8nof4LCfDZezeVctQbAFhWaCtAKTd+5VlvPs0wvHmOo5e7uRueyuTaQvNMEhGv2JZDlKJBMlkMieUDRAIhIBkis011dSFN3BgZ5rR4VFM08BdXILp9XP9YT/dty7g1iX0vF4W0iFoPjuIO9CIkYJvMdA0EBAIlOLTJeOxGSj357L8Ec+5UBMC6YJ0PCKAdRw6148m67E1Vite5tsmlmtXAjM7TG/nvn9ZBuyGK8PBkwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTo0NyswMjowMJXV8kIAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6NDcrMDI6MDDkiEr+AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.unice.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Staff and students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université Nice Sophia Antipolis</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels et étudiants</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>
-					      MIIDGjCCAgICCQDEc1geh13qYjANBgkqhkiG9w0BAQUFADBPMQswCQYDVQQGEwJG
-UjEpMCcGA1UEChMgVW5pdmVyc2l0ZSBOaWNlIFNvcGhpYSBBbnRpcG9saXMxFTAT
-BgNVBAMTDGlkcC51bmljZS5mcjAeFw0xNTAzMzAxNDA2MzRaFw0yNTAzMzAxNDA2
-MzRaME8xCzAJBgNVBAYTAkZSMSkwJwYDVQQKEyBVbml2ZXJzaXRlIE5pY2UgU29w
-aGlhIEFudGlwb2xpczEVMBMGA1UEAxMMaWRwLnVuaWNlLmZyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwumrRwZ1MgiLeMdx/swZ6vKgjeaUlAH/SCuc
-V2wiInFt02DOUhJfpXeB2jPkh6UJKgKSOvp6Nf+vkmiHA9YyJMp84c0NR2NVOEDk
-yhMSp0grvoSz/zn9njWbOAS4mM85v1OyB7+ZdkQULzjS9U73JbA2ZZkYqGr0CPoD
-4Dkh8OLjhJaT0gflc9Mb2Hsd4+c9UQZ9IARQVOpGg0xwcThjBoawAZYytvAr1gi9
-QiZw2Oqsi3D2DQ3RqP5EN3pnBxq8J3Lg3xiziZclgWoLKxIz9mpZhJEg6bhdfGc6
-8tE5iW9cVv58baBY0v+j2reSrqjbzsIJhVkav6q210T9ZvWWBQIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQBHE870+VQEJsa1MLTQNOdbd0jbCAuF0Y95ZtHgczjhOKoE
-ED9ZBuKmlhgYffU313dwmMw+1wd5oJxsPVRqoe6KTskhTEzL00ZcJz+fZTmsDHd3
-UYynPT8DUvSg2/8HPxsUo8jqRTHBDjJsrUwdDwAPmNi+ao2JVGnfqaiACM1NMvqs
-XjLrB1uWCc0DIq8UadXJrQCK34zYwpx+V13pch1/GfiNibgXipIdL5pLnjf1HXwQ
-qmTeKX7MGcrmSXwqoRkufJvN96w5RsZwq+c82x8w3DA9o7S9BfCj7RqFUywuaS+G
-ocmAdFFE3FlU7n+j9x4StI4bTezYKVTQPa4Pcw18
-					    </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>
-					      MIIEkjCCA3qgAwIBAgIQfx/AsWyTjGxfLF7+a+MU3DANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTAzMjYwMDAwMDBaFw0xODAzMjcyMzU5NTlaMDoxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEVMBMGA1UEAxMMaWRwLnVuaWNlLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxIQ1GJUzszvZgeA5nbEO
-f03rKTvkLmCKRZSVFDwsycZkpkJSY4t5RT6E8JqFVMgh6M1RuhATiridAK+KCklK
-4GsLrlRDwcQpzla5E9FPjvxclIIm1p6VtmBnOFT3mJT/OnSI9ODqSbkGlWoiCtO1
-clHBzY6Lukbf9h+mSkxcyWTqsswsAcA8qdChnH0gBUnWst5dmb4TLI+zV2qhlTVd
-ncjICgvoFF73SFQc8eb6LQ5rhsMedldAxjkRjP/7EfRY0x1mD0UVmwKEXZmeYbzl
-LTgoIe9BDdRX1Admq6gIyoErXh6jK8qwZvVZlevGYR2dnj5nv1jJdkbkdVLV+u9e
-CQIDAQABo4IBaDCCAWQwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0w
-HQYDVR0OBBYEFB/ELteTIN9PlhnJuKtHbij0AfYxMA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-hilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggr
-BgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNv
-bS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2Vy
-dHJ1c3QuY29tMBcGA1UdEQQQMA6CDGlkcC51bmljZS5mcjANBgkqhkiG9w0BAQsF
-AAOCAQEAZBO8x0QGYb5cHxcNyoI7fdjNGAoZzttbomVT/q9clVtzW7EgEKtaKQNo
-GPCUb5pbOQQhGkOUz/oV75TI0gSHBUzFxPXbNgA4TGeqdwmLxMHJfRtAF5uaPh8w
-pr68ZZphOAZjNmv04z+KGXk4m1t/Ui1YANJbCgAItqOSRTy+bRmN4KtMWlds/7MT
-Y7hQVSNM+vGWd2dx0Ax7qlF9I00YAzKXSw94tvrL8XeXJ1W7nZ6K/DqSuWwpFE9L
-T41tULnrHJS9hPhwtG33O35uW3WpQLwsWJZDCXaQNf31PNsjaPhrV6qBsEz0/vwL
-XAU685+5ngtQMo1C+QYwfpEV9fZZVw==
-					    </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-POST" Location="https://idp.unice.fr/renater/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unice.fr/renater/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unice.fr/renater/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unice.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDGjCCAgICCQDEc1geh13qYjANBgkqhkiG9w0BAQUFADBPMQswCQYDVQQGEwJG
-UjEpMCcGA1UEChMgVW5pdmVyc2l0ZSBOaWNlIFNvcGhpYSBBbnRpcG9saXMxFTAT
-BgNVBAMTDGlkcC51bmljZS5mcjAeFw0xNTAzMzAxNDA2MzRaFw0yNTAzMzAxNDA2
-MzRaME8xCzAJBgNVBAYTAkZSMSkwJwYDVQQKEyBVbml2ZXJzaXRlIE5pY2UgU29w
-aGlhIEFudGlwb2xpczEVMBMGA1UEAxMMaWRwLnVuaWNlLmZyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwumrRwZ1MgiLeMdx/swZ6vKgjeaUlAH/SCuc
-V2wiInFt02DOUhJfpXeB2jPkh6UJKgKSOvp6Nf+vkmiHA9YyJMp84c0NR2NVOEDk
-yhMSp0grvoSz/zn9njWbOAS4mM85v1OyB7+ZdkQULzjS9U73JbA2ZZkYqGr0CPoD
-4Dkh8OLjhJaT0gflc9Mb2Hsd4+c9UQZ9IARQVOpGg0xwcThjBoawAZYytvAr1gi9
-QiZw2Oqsi3D2DQ3RqP5EN3pnBxq8J3Lg3xiziZclgWoLKxIz9mpZhJEg6bhdfGc6
-8tE5iW9cVv58baBY0v+j2reSrqjbzsIJhVkav6q210T9ZvWWBQIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQBHE870+VQEJsa1MLTQNOdbd0jbCAuF0Y95ZtHgczjhOKoE
-ED9ZBuKmlhgYffU313dwmMw+1wd5oJxsPVRqoe6KTskhTEzL00ZcJz+fZTmsDHd3
-UYynPT8DUvSg2/8HPxsUo8jqRTHBDjJsrUwdDwAPmNi+ao2JVGnfqaiACM1NMvqs
-XjLrB1uWCc0DIq8UadXJrQCK34zYwpx+V13pch1/GfiNibgXipIdL5pLnjf1HXwQ
-qmTeKX7MGcrmSXwqoRkufJvN96w5RsZwq+c82x8w3DA9o7S9BfCj7RqFUywuaS+G
-ocmAdFFE3FlU7n+j9x4StI4bTezYKVTQPa4Pcw18
-					    </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>
-					      MIIEkjCCA3qgAwIBAgIQfx/AsWyTjGxfLF7+a+MU3DANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNTAzMjYwMDAwMDBaFw0xODAzMjcyMzU5NTlaMDoxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEVMBMGA1UEAxMMaWRwLnVuaWNlLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxIQ1GJUzszvZgeA5nbEO
-f03rKTvkLmCKRZSVFDwsycZkpkJSY4t5RT6E8JqFVMgh6M1RuhATiridAK+KCklK
-4GsLrlRDwcQpzla5E9FPjvxclIIm1p6VtmBnOFT3mJT/OnSI9ODqSbkGlWoiCtO1
-clHBzY6Lukbf9h+mSkxcyWTqsswsAcA8qdChnH0gBUnWst5dmb4TLI+zV2qhlTVd
-ncjICgvoFF73SFQc8eb6LQ5rhsMedldAxjkRjP/7EfRY0x1mD0UVmwKEXZmeYbzl
-LTgoIe9BDdRX1Admq6gIyoErXh6jK8qwZvVZlevGYR2dnj5nv1jJdkbkdVLV+u9e
-CQIDAQABo4IBaDCCAWQwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9tr0w
-HQYDVR0OBBYEFB/ELteTIN9PlhnJuKtHbij0AfYxMA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
-HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
-hilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBsBggr
-BgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0LmNv
-bS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51c2Vy
-dHJ1c3QuY29tMBcGA1UdEQQQMA6CDGlkcC51bmljZS5mcjANBgkqhkiG9w0BAQsF
-AAOCAQEAZBO8x0QGYb5cHxcNyoI7fdjNGAoZzttbomVT/q9clVtzW7EgEKtaKQNo
-GPCUb5pbOQQhGkOUz/oV75TI0gSHBUzFxPXbNgA4TGeqdwmLxMHJfRtAF5uaPh8w
-pr68ZZphOAZjNmv04z+KGXk4m1t/Ui1YANJbCgAItqOSRTy+bRmN4KtMWlds/7MT
-Y7hQVSNM+vGWd2dx0Ax7qlF9I00YAzKXSw94tvrL8XeXJ1W7nZ6K/DqSuWwpFE9L
-T41tULnrHJS9hPhwtG33O35uW3WpQLwsWJZDCXaQNf31PNsjaPhrV6qBsEz0/vwL
-XAU685+5ngtQMo1C+QYwfpEV9fZZVw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unice.fr:8443/renater/profile/SAML1/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">Université Nice Sophia Antipolis</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Nice Sophia Antipolis</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unice.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean-Charles GODIEN</md:SurName>
-    <md:EmailAddress>Jean-Charles.Godien@unice.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Richard Manas</md:SurName>
-    <md:EmailAddress>Richard.Manas@unice.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml
deleted file mode 100644
index 1f692a0c..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.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="urn:mace:cru.fr:federation:unilim.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-03T17:29:36Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unilim.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Limoges</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACVElEQVQ4y42Tv4tUZxSGn/fcOzO6IBoRvYuQde8ipImCmpDGBTvdWVJYiCmClYVlQBBcUgRFbPwHFBvBQoyE6AyYCELSSYKRiHazCwtmrr9Ao+DO3HvPSTGjwRQbT3e+4j3ne97zqpPltxD7FKpYpYKQRJJQfb6/v3y3OznzWwSvUsGsUBIiWU1gjYyBx7f7i+W7nSz/O5XWOYEhqmD1MmAQ8bRd9E53svxew2xdHYEHL40PqEQiiAs3Nm87OmHJzipGkyEefpBAipjvLy7I7NQgfCwKjn74XwEBb6J+fWNTvn3Cki0+fhu4D4deXjOAhoQiyvexj3oBCj1SwrGKEa2mhEnftSxdMKGJsvZLgS6nEgCt0Z9PNsY9opLpE48xUPe/5vq9M4KvLcKvtB8vHhFR6N/1npdv/Ht7t0ysiYiNAKnEoKr2dLLps02zhrWLpcPXs6kDgY5VEYym6mJzbfqNAw5ImhY8mTBjEPXCwWfLfZOdKCOwbpb/kbjtapnWAwzdy3bROwEx6/HORoNIXnt1db6/dKY7OfP7yFowxM4w5Q60ZNTEV9c3T+9A2iBBgsZMuD3XXzzUzfLza2W7I2IEk6AUTJXuw5Xaj35ZLF1LE/s53H+pPV7UEX++HA4PzBdL58ZE9614/byGBwOvj6egCPh4vui1ALpZ/lNLtmVF8cVc0fvoraudLP8RmGoXve3v3Uk3m1lpmlrD8JsEW5tmnw4jSCVKj8cQ9wWzDbNmAJV7CboDkSA+U2cy/zXF9o4ji/8nREI4wdvAaQzOBKX7vX8AiVcUpd+HilcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDDYSyyhAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAwqRaUHQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.unilim.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Limoges</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>
-					      MIIDNzCCAh+gAwIBAgIUCJLJlFRsGEvjGAk03CmBdGzPqAswDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTaWRlbnQtbmV3LnVuaWxpbS5mcjAeFw0xMTA0MDgwOTU1
-NDRaFw0zMTA0MDgwOTU1NDRaMB4xHDAaBgNVBAMTE2lkZW50LW5ldy51bmlsaW0u
-ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHrcGQOpTbOfurHfSP
-YaPZ/HFB3HJYouQKiNu3ZmG3f/jFB5MXJjjqA0ujs7Bgd6yq78ub/jQUANafNXFm
-r51YIHYLFWULQLBQEbN0wOj7q41UAi/Unw57WTQ7b878WGN1PF9IjrrQK5D7qxQD
-6B4rXYr0f6ke9RK6az0ukAESyvClxg2J9xLi+StcilwzD/hh1t4KkFcLCg7r7l+s
-MN+/NoDeiC9D5EI/GdVnAcyVhlBqH3lvhEAd2/d0coTs11IOcuNQV9UD7G1FZxVW
-XRgKEysU+9kwK0OJcXIO4ECr35MZZKJzp/qJ6sq1LVeGYW4ceSJphlKk1EBIPS2H
-VAj3AgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkZW50LW5ldy51bmlsaW0uZnKGKmh0
-dHBzOi8vaWRlbnQtbmV3LnVuaWxpbS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUORrgoAo4rJzB+VbHl2vNbQUkEYAwDQYJKoZIhvcNAQEFBQADggEBACJSI3QE
-HRMtzbd1h4fRrefD3DRSpg/W6nOEAFNseTeShU6xwBQPI/U+GGOCCPgNF1cdMSFB
-wnRPLlFjcNDfah2SznWI2yCjz/Lh4Zb+8xmWMUnQ/Rg5ECKahbMQY81xCWDVIOff
-fr3TPxIcSEJT8CRz7HhIqcnQ6Svuu+Aj6l0wx7lSa/45MhlxMC0gyQeWvjG9i1VO
-wixNzp6SP7pbBch2TajO9mKgGh15wzU/aO19dXpUO/bpAgNfcOlpd+LlRtQ6AaO+
-/rzAmJBWj5oXmNLIuWfDZDz9I6/SSJmsK3i8tTAKxKK3YslapJiwApPNPfAbH5Ac
-4dTyIRHkjWvItKk=
-					    </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-POST" Location="https://ident2.unilim.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident2.unilim.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident2.unilim.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Limoges</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Limoges</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unilim.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@unilim.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml
deleted file mode 100644
index f514b5f5..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.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="urn:mace:cru.fr:federation:univ-angers.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-23T11:48:50Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-angers.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Angers</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC4klEQVQ4y32RS2xUdRTGf///vXPn3ULtI61ayyMGm06MaYvaVggxhiApiaIWjSS6MYakxp1p3LmwunABPhIT0IWFUBXaGAwg1BjAJkpsSRAoWkSYwhSnTqfTO9OZ3sdxQVtf1S85q3O+3zk5HywjcUqr7YG3ZWZvt4jIW/yPzP9quFdHKFy/SNqh7kRBhn2IlBlcWmWwp9rgJ63U78sCREQjXijveEzm53jkw/6dBdcDQCl1/9ry2I53ujoP+SI7tFKu/ifgskP3Y58ev/B1chLPFxbNC3B+zs7y9N7+7QfzfPS3C1xfqk8V2b+5/1hbKj3FRqsSASKmwQPVFUQDJpahGc/OMpbJ8cqBgeeSjpw2AHyR0IjDJ119g1smsrlALBhkNL6GI/Emetqb2XR3DV9dS1EVDvFaSyPDqSkm83M6kUg0aIBvS3xc7xY7n1/XQMwyGdy2gVfbW5k2ozSURTk8nuT8VJZjv96k3ArQXF2BiLDv6ImETrmy69m+L56xHXfZNF46+T1fXr0BwJzrUfJ8aiIhAFL5IuZ7yWz3DdvWAEHTIG4FMPWfv3V8n/sqyumoq6IyHKQ+HqHMCiykAvr9oyfXidwefqFxNZ893kHijhVLgNfXNzHQuYGgoRlK3mLkt+ml3l2xCDpbmgfgu8kpruVs5n2f0XSGKzM2VeEgPa2N7B4dY/e5ywzfTJObd25vB556dNN5syYS4lahyMtDZ9FKLdFLnkfENHF8Yc71EAGtFHWxML/M2ESDlrc5rt819hzobzly7sd7i57HX8tdMNqOy8O1lYykp8mW5lmzIk5tNETLqvqZJ2pXdilHZOuLQ2cPH7wwbrm+/CsFpRQBrXB9wRfBUIqNa++ZPbSlrW+loXYpANuT1s8L9L4xeLzteiYTXg4EELdMnmx/6MqbTfW9d5pq3+IvljThyvYfSjTv/+ZMz1gmR9HzAYgGTB6sqWBnx/reFosPglpNLHr+AODIRmnyfRqlAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjU5KzAyOjAwCUCJgQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo1OSswMjowMHgdMT0AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-angers.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Employees and students from the University of Angers</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université d'Angers</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Les personnels et étudiants de l'Université d'Angers</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>
-					      MIIDUDCCAjigAwIBAgIVAMabeXzhOvplUR9r4t9fsuUrWixGMA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudW5pdi1hbmdlcnMuZnIwHhcNMTQw
-NDE4MDY1MzI1WhcNMzQwNDE4MDY1MzI1WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-LnVuaXYtYW5nZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-njrHW1QuXFlucp6z9Q5qwHBNer+ZquJPEs1detiZARHyigMJILaslGc8b6FwA+xC
-pam+vAnnhFVXLI7iR4G7chrAl0cpiuBLifK3uMFKo+a7NTOBT4N9UNSyWPuVoF23
-kq+cPptIw01BV4jp4A4QoZbfqr4ueeY3oujYi4HhAZS3Twh+EByeJb208XZJjE78
-pokPWU//uWpLdVWm+fq8X9HOBhyMaFqsbBV0pRI72rYiSUifPrws5EI6aWonLt9R
-59HcvN0bx+k3dlMgEBOx9y1B2189/8bLVAg1wM2zaKlyGMbmzlJ5PwzjVUAs5G/J
-EMaRfdVHCNiX3r33XO4ZYQIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-LnVuaXYtYW5nZXJzLmZyhjBodHRwczovL3NoaWJib2xldGgudW5pdi1hbmdlcnMu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAKn+28vOVV2v3JY1xRWVCTpRbI6
-MA0GCSqGSIb3DQEBBQUAA4IBAQB+45tSXigpVOHs6oJCae7LyB97FXb2w2TTkYsI
-XD1hgEszYlaxjEF1Y1+GYX9eC7EX+al9pil/3buaFHcd5hi7NeY8HBsNqTjXI8kr
-4/vaJqT/RhnWHb9ylDweiCtIDu6W2NjUw1zEehgtG1WbxeERvggVZw6p4B5U3WQ5
-EW8UH2uweFDWwfDBLnYAiX2IYiHzvR1+N1CHFXs1x7JeatpsHtOJeoaYfWDtBHVu
-R2mmF7L5xU2Vz6xEp0X4OUPKsBXAaRBFHs+2LIY+wAdwM3tjjUxCYgwp5uOoX2dk
-SIWEfxyrSc9yevZKOFUP04Oi4b6WcQbgRl5bIy6PHi2kYiRe
-					    </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>
-					      MIIDRDCCAiygAwIBAgIVAMHj2Cu/7KEX13/aTUHqdXfb3tFgMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFmZyb250YWwudW5pdi1hbmdlcnMuZnIwHhcNMTAwOTA5
-MTAzMjQyWhcNMzAwOTA5MTAzMjQyWjAhMR8wHQYDVQQDExZmcm9udGFsLnVuaXYt
-YW5nZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjIh2qi8D
-qFiSERXM4uugvV8s4OBCMbosII48TW6O0zG5KMtaLDnTDatBTchVONzQ7M5IEg/7
-nM90aocij3FZxWqDnV/o5A/MMuBoB8/J9oWgMVPnB+sBlixpQiWc5L/31HQgVPtL
-7AOuyC9xxldTx1e5kDBpW0QDyqZdtbApqAI0N4pCtrIKm8lYTYJ28eZQDUF7nu/h
-hw6HgSRY3qtCWnpkahaRziIFfsxyt1PJQSmaEdkHheFJWuoW8ptt3DwVn+ywBkX4
-EkZnBkuHZ3E5CMWXMz8WzfSqeJj+epi1vCDr80R6v7wKez7CWLt+uit7ZFyjjv+l
-zKa9OHlDCG52qQIDAQABo3MwcTBQBgNVHREESTBHghZmcm9udGFsLnVuaXYtYW5n
-ZXJzLmZyhi1odHRwczovL2Zyb250YWwudW5pdi1hbmdlcnMuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFJC10iOKAVjMBWfVlXG7viH4rneDMA0GCSqGSIb3DQEB
-BQUAA4IBAQBXoZx/uNmrVDdvRMUZL0ZVPP0XtHRngakIEi0ADSAh2zHAhvMgybDE
-W2EprWWG3CEltjt59/ugMV7y7/VkAuw2CMcFiKWGNYrlyXqx+u045lFxaB1VEkyH
-NFCBhYR00KhKcsyLZFGRhjJsRF8BrPPk4APrhMzKMm7yyysWgK8zaIx1G1vWG5FD
-e2SaH84F6OdHlwY/DFR+h6JFkH7FrBoJxKcnlCTL8NGhH2Kc15JweNdb7aTthrqb
-85iK6ee+lD481XBORDuJ9IueWi+kuDTSoTCP403vuFXe3SCMDi5ifHnw+7CH/jd8
-+2aam5wgFGGrA1qTjyQEFHulpuQ6mnIK
-					    </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-POST" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-angers.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-angers.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUDCCAjigAwIBAgIVAMabeXzhOvplUR9r4t9fsuUrWixGMA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudW5pdi1hbmdlcnMuZnIwHhcNMTQw
-NDE4MDY1MzI1WhcNMzQwNDE4MDY1MzI1WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
-LnVuaXYtYW5nZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-njrHW1QuXFlucp6z9Q5qwHBNer+ZquJPEs1detiZARHyigMJILaslGc8b6FwA+xC
-pam+vAnnhFVXLI7iR4G7chrAl0cpiuBLifK3uMFKo+a7NTOBT4N9UNSyWPuVoF23
-kq+cPptIw01BV4jp4A4QoZbfqr4ueeY3oujYi4HhAZS3Twh+EByeJb208XZJjE78
-pokPWU//uWpLdVWm+fq8X9HOBhyMaFqsbBV0pRI72rYiSUifPrws5EI6aWonLt9R
-59HcvN0bx+k3dlMgEBOx9y1B2189/8bLVAg1wM2zaKlyGMbmzlJ5PwzjVUAs5G/J
-EMaRfdVHCNiX3r33XO4ZYQIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
-LnVuaXYtYW5nZXJzLmZyhjBodHRwczovL3NoaWJib2xldGgudW5pdi1hbmdlcnMu
-ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAKn+28vOVV2v3JY1xRWVCTpRbI6
-MA0GCSqGSIb3DQEBBQUAA4IBAQB+45tSXigpVOHs6oJCae7LyB97FXb2w2TTkYsI
-XD1hgEszYlaxjEF1Y1+GYX9eC7EX+al9pil/3buaFHcd5hi7NeY8HBsNqTjXI8kr
-4/vaJqT/RhnWHb9ylDweiCtIDu6W2NjUw1zEehgtG1WbxeERvggVZw6p4B5U3WQ5
-EW8UH2uweFDWwfDBLnYAiX2IYiHzvR1+N1CHFXs1x7JeatpsHtOJeoaYfWDtBHVu
-R2mmF7L5xU2Vz6xEp0X4OUPKsBXAaRBFHs+2LIY+wAdwM3tjjUxCYgwp5uOoX2dk
-SIWEfxyrSc9yevZKOFUP04Oi4b6WcQbgRl5bIy6PHi2kYiRe
-					    </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>
-					      MIIDRDCCAiygAwIBAgIVAMHj2Cu/7KEX13/aTUHqdXfb3tFgMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFmZyb250YWwudW5pdi1hbmdlcnMuZnIwHhcNMTAwOTA5
-MTAzMjQyWhcNMzAwOTA5MTAzMjQyWjAhMR8wHQYDVQQDExZmcm9udGFsLnVuaXYt
-YW5nZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjIh2qi8D
-qFiSERXM4uugvV8s4OBCMbosII48TW6O0zG5KMtaLDnTDatBTchVONzQ7M5IEg/7
-nM90aocij3FZxWqDnV/o5A/MMuBoB8/J9oWgMVPnB+sBlixpQiWc5L/31HQgVPtL
-7AOuyC9xxldTx1e5kDBpW0QDyqZdtbApqAI0N4pCtrIKm8lYTYJ28eZQDUF7nu/h
-hw6HgSRY3qtCWnpkahaRziIFfsxyt1PJQSmaEdkHheFJWuoW8ptt3DwVn+ywBkX4
-EkZnBkuHZ3E5CMWXMz8WzfSqeJj+epi1vCDr80R6v7wKez7CWLt+uit7ZFyjjv+l
-zKa9OHlDCG52qQIDAQABo3MwcTBQBgNVHREESTBHghZmcm9udGFsLnVuaXYtYW5n
-ZXJzLmZyhi1odHRwczovL2Zyb250YWwudW5pdi1hbmdlcnMuZnIvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFJC10iOKAVjMBWfVlXG7viH4rneDMA0GCSqGSIb3DQEB
-BQUAA4IBAQBXoZx/uNmrVDdvRMUZL0ZVPP0XtHRngakIEi0ADSAh2zHAhvMgybDE
-W2EprWWG3CEltjt59/ugMV7y7/VkAuw2CMcFiKWGNYrlyXqx+u045lFxaB1VEkyH
-NFCBhYR00KhKcsyLZFGRhjJsRF8BrPPk4APrhMzKMm7yyysWgK8zaIx1G1vWG5FD
-e2SaH84F6OdHlwY/DFR+h6JFkH7FrBoJxKcnlCTL8NGhH2Kc15JweNdb7aTthrqb
-85iK6ee+lD481XBORDuJ9IueWi+kuDTSoTCP403vuFXe3SCMDi5ifHnw+7CH/jd8
-+2aam5wgFGGrA1qTjyQEFHulpuQ6mnIK
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML1/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">Université d'Angers</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université d'Angers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-angers.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>ddn-ssr@listes.univ-angers.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml
deleted file mode 100644
index c97ed61c..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-lemans.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-16T12:04:57Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lemans.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université du Maine - Le Mans</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABZklEQVQoz2P8//8/AymAiSTVg1rDqVPvGBn3MDLuY2TcfenyR0bG3YyMh9CU3rv/9cuXP1ANT599V9biWr1GvaFJTk+Xv7ZO9sBBzZOn3sFVz5x1X1npxLLlj1l+/Phr43C6KE/ayZb38eMfDXXP2ViZ3r7942B/jYHh9///LgwMDGIyR18//cvAwCQtzcF44OCrhw+/Hzr84dHjX7t3fPPw5nr+6pcgP8uBPT/NrdkWzNXU1DjDwMCqpM6yZoWmoYEAk72d6PUbX27f/bHn6A8GBiZtLc6Ll/4d2PNz2gwZPl5mTY3zDAwsgSHct65aGBoIMDAwMP7//59L4vD394wMv/5ExHGvWPSTlZ/h9zcGhj//eYQZv7z5M2OmfHqaIiKU7t794mbNzcDK8P+/w44dvxgY/vi4cdZUCTP8//vlzc8LFwyQVTMwMDD8RwJfv/65e+8LhH3kyOsfP/7+xwCMgy/xAQBPx7tYVY6ZIgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOSswMjowMHw7c+8AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDANZstTAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-lemans.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université du Maine - Le Mans</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>
-					      MIIEBzCCAu+gAwIBAgIJAPJkjMeKwz+TMA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
-VQQGEwJmcjEUMBIGA1UECAwLdW5pdi1sZW1hbnMxEDAOBgNVBAcMB0xFIE1BTlMx
-HDAaBgNVBAoME1VOSVZFUlNJVEUgRFUgTUFJTkUxHDAaBgNVBAMME2lkcDIudW5p
-di1sZW1hbnMuZnIxJjAkBgkqhkiG9w0BCQEWF2ZlZC10ZWNoQHVuaXYtbGVtYW5z
-LmZyMB4XDTE0MDQxNDEwMDkzNFoXDTM0MDQxNDEwMDkzNFowgZkxCzAJBgNVBAYT
-AmZyMRQwEgYDVQQIDAt1bml2LWxlbWFuczEQMA4GA1UEBwwHTEUgTUFOUzEcMBoG
-A1UECgwTVU5JVkVSU0lURSBEVSBNQUlORTEcMBoGA1UEAwwTaWRwMi51bml2LWxl
-bWFucy5mcjEmMCQGCSqGSIb3DQEJARYXZmVkLXRlY2hAdW5pdi1sZW1hbnMuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBgciAAr1+6sMGIFgYHYju
-l57S7ReTKO8qbyJ6QfVfrzQHSspk+Hfx8FxLTlP1yR59mO0PmTL3zxJr9rXvIBzw
-G1HyzZw3K6QLL02u4SAFcQRET8CmlXKM18JbmyF+WyQ1xBGfzpHXQGszHVQ/TihW
-eEQat8D2ALVscAxxKpyFZsJWB9StyDPc/gYsqSU77GnXwun5p5SO10F2Ag+hWpzP
-Gj5hHn2KVQdqP/rdDryi6WNN3Nk1niyecbxpPkomGg8n3ZAojulNYsn8bVkMB9I0
-1+1OCGcr1IMDiZVADDQ9tdO6c/ftFZMUNsOayYXsQsDnaW7LbvSIABBPQvGuBLDx
-AgMBAAGjUDBOMB0GA1UdDgQWBBRt0PUs8HKbUTeuD+959t8js76s5jAfBgNVHSME
-GDAWgBRt0PUs8HKbUTeuD+959t8js76s5jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQArAai8yD7FfetenGqoPKTUt9fWdBN4tArGV++NydXdBjCC5E8S
-IML/iFVPuuCWC2kWI7b39UjnvrSCtzvkCjjcSA7ThkW9+0CdT6ohD8lh0TE34VQo
-UH4OnFMgI9iwhYEzJbcqDl3oGCtSLg482SU9YgdSLbSWQCYmJOWKtrnE5VGtHKba
-VAgkzA5irhs1FL1lhLrN0VP0Zl41cckZtAamNcc4xJ+HXPk0jCRtEIRdoBCF+4fL
-0Kczl19r1JsQ1/qYuSzYFoSeMonfQMzNswe2JMhVtem/X76sSLk9sXf/DGLBdxO5
-psTKLRse8C18pocxxBm/KWroiZrNIExoq6GB
-					    </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>
-					      MIIDODCCAiCgAwIBAgIVAOfG5aIZ6Aohb63NMTtvPZ3HLBWfMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcDIudW5pdi1sZW1hbnMuZnIwHhcNMTAwNDEyMTE1
-ODExWhcNMzAwNDEyMTE1ODExWjAeMRwwGgYDVQQDExNpZHAyLnVuaXYtbGVtYW5z
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmmABnRWyz2lm0ged
-F4Prv9GO+Z914ed7yVYJJi3jlCLejmkcDWpfTVm7rRalLX/3sO5KdE7dnXEBxdYf
-AluI409b9yNcDi8iTcRgQA233FnJxSkYf7yEKFVc5ZWhCvpbvda4NfxPHAi7E3LD
-1Rzji0PT+KYzElb/eTPmVl85LCeKK5aM9ILv8b5ziFC70t3JdaNsoXR0esC+5r8o
-nI80ICke0tibfbHrwlyldiJb/po9m9tSEB3i8NkEOgFXwz7X/fdGHur5gfJwvEXS
-MXzgSoq9DbpjWKR6/g46hABdmv8+C/+N+mxp4KehoyDcFPbED8pH9cqw9QtLKLgE
-SXy8uQIDAQABo20wazBKBgNVHREEQzBBghNpZHAyLnVuaXYtbGVtYW5zLmZyhipo
-dHRwczovL2lkcDIudW5pdi1sZW1hbnMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFMjVlzAX+5XMpiXoz2pkh/xv8xpAMA0GCSqGSIb3DQEBBQUAA4IBAQB+5SH/
-ygI70ba2rP2hmL3klQ1md/zIaK7p3MOOkDy5lkIH31oI6lIFTrKyZg7ML19gMVeA
-uZhIO9ZWJDrFtBxgDGYeishp1zEctX+ExWuVU9rtWzgCQ7GlqpnJLDAjxCVotdTG
-oEa3NbsjuPm4R3FaHiEAcVWGun8edQztZ9PRGxk7KDsT7+omuABB80mrvtYHGNCZ
-lKgdL3SFqkTQMbBvs4ouAnxw++YMfvcqUtxZJZKIKF7QTPeDOPLHLwHEZl6yL/kl
-dkydWQ+SmHuq9+cAfmW7kzferGnkRoHvIPVNtgGNo7kvQieeLbnGrLYpRWeMFt3f
-4weH5Ji9r7v8/chk
-					    </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-POST" Location="https://idp2.univ-lemans.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.univ-lemans.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.univ-lemans.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université du Maine - Le Mans</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université du Maine - Le Mans</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-lemans.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-tech@univ-lemans.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml
deleted file mode 100644
index 994343c4..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-lille1.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-20T17:10:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Lille - Sciences et Technologies</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABwElEQVQ4y6WSP2tTYRTGf+fcN6bcFCXVEKONCsXKdelQnURcdKiTozhJhw4O0sVFBEFw1sUP4OJkUURwaL9Ah071Hw5iab0SsKmFtGlyk/c49JprQ5BKz/AO7znPc57nnCMmTwB5+InarQDtso/o4oOI8hxm9136V/lGfbxXYZZVS+/ZExHlE2C4/oQIaJhHVDAzfLONeRtIgrqMQAAzwxULnH92k3CsxE68ycc7L2jFmwPxqOH6M5oLODxRZTiq0Fyto/kcYMgghq6hYBwk9EB48+hAb/+lYL/NzDDz7LUsaLpz/w8ohpGvHKF4ZRw55LI7UUMRBVjPbBk+6f7BEhTynLl7lYsLs4w9uI64v8Zm2rOw5NA2AsnGFp/vzfHj5RLt9QZDo0WqM5dpfIj5+vgdvpkgkg1OTJ4CHKuz/XqRlUtgYIYO5QjPlknqW+RGCmx/qeFbCalipoieA7dTBfZzhPBRieFYEEQUv9OhsbxGK/5FY3kN3+ogov3jQcVmSa9x/gLV6UlGFwO0I7JLJAiI4iTonKP0foro1VHCWrqOzMyuFQPkJHADuLbKxmkDTlFcARaAt+C/g04Cx4E3vwFlCJ7zAdaaQwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-lille1.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">staff and students</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Lille - Sciences et Technologies</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">personnels et étudiants</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>
-					      MIIDMjCCAhqgAwIBAgIUFVDNOdEJbuHwIfdnn+cRYs6xfq0wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZyMB4XDTA5MTAwODA5MTU1
-NVoXDTI5MTAwODA5MTU1NVowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZy
-MIIBITANBgkqhkiG9w0BAQEFAAOCAQ4AMIIBCQKCAQBsQS+H4uWYOep74yJQf5us
-pkTg19tZEZUjtqkUCBjLt1UJdH1hDiaK+/4qWudwEjcMDvnxBUL8xbIfDDJOXvgh
-bPKYRJMLTEBmBnt5dslkT46+47cTSPDqK748qbBzrucnbhHuWJ7mG9KG9qTXmiLi
-09uwCjeGjnnFu11CKKt1XMJ40/B55W2j1SXiqDHMbdbjRjhfyniVt9t3yp/b4IGh
-79UivcebLkPTpAjLp7TMG4VAUXq6oVwfCLkjH8kzZsO0MJ+IAeX0iTIULONw3E0E
-VAErKUj9FPV9C3zAlPL0oZomDrd0tu7CdreGZRz2u6DCT38XLsVbMumSnvfYFjBF
-AgMBAAGjazBpMEgGA1UdEQRBMD+CEmlkcC51bml2LWxpbGxlMS5mcoYpaHR0cHM6
-Ly9pZHAudW5pdi1saWxsZTEuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGYf
-a9RpwCPFriHOSMKJSQ9gQ6vzMA0GCSqGSIb3DQEBBQUAA4IBAQBBv8iK1b67jhuz
-ZT6LHjtmHgovO7Qa74jggtKblhiqHAMRZWPCep1fleDjR27rYSvfRGzdSug7tfbl
-EsPyeVqcyKJvD9GXPJuPs/s4VdQmKbldGbBuuFQU6WVGoBlZOXq7wjRMqKd15TK/
-6wE/J0J2TieuAJpFKd6oiPV3YT4ggn6G2lilP1rv2cX6a2qK/j82M7wTLg1rLe5e
-ocgQGRZdfk7m+u4pfrJr1Dsjy7uOjA0QWzfG5jPSFLV8DiliDDPejz+eDyaz2kib
-w3l6kfiJYiwyVlk+O2O5ocwTmZtnVvTo3KAvIZwluV6OKXJXB7+mkU5dPtXHmooU
-+HT9dOog
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.univ-lille1.fr/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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lille1.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMjCCAhqgAwIBAgIUFVDNOdEJbuHwIfdnn+cRYs6xfq0wDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZyMB4XDTA5MTAwODA5MTU1
-NVoXDTI5MTAwODA5MTU1NVowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZy
-MIIBITANBgkqhkiG9w0BAQEFAAOCAQ4AMIIBCQKCAQBsQS+H4uWYOep74yJQf5us
-pkTg19tZEZUjtqkUCBjLt1UJdH1hDiaK+/4qWudwEjcMDvnxBUL8xbIfDDJOXvgh
-bPKYRJMLTEBmBnt5dslkT46+47cTSPDqK748qbBzrucnbhHuWJ7mG9KG9qTXmiLi
-09uwCjeGjnnFu11CKKt1XMJ40/B55W2j1SXiqDHMbdbjRjhfyniVt9t3yp/b4IGh
-79UivcebLkPTpAjLp7TMG4VAUXq6oVwfCLkjH8kzZsO0MJ+IAeX0iTIULONw3E0E
-VAErKUj9FPV9C3zAlPL0oZomDrd0tu7CdreGZRz2u6DCT38XLsVbMumSnvfYFjBF
-AgMBAAGjazBpMEgGA1UdEQRBMD+CEmlkcC51bml2LWxpbGxlMS5mcoYpaHR0cHM6
-Ly9pZHAudW5pdi1saWxsZTEuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGYf
-a9RpwCPFriHOSMKJSQ9gQ6vzMA0GCSqGSIb3DQEBBQUAA4IBAQBBv8iK1b67jhuz
-ZT6LHjtmHgovO7Qa74jggtKblhiqHAMRZWPCep1fleDjR27rYSvfRGzdSug7tfbl
-EsPyeVqcyKJvD9GXPJuPs/s4VdQmKbldGbBuuFQU6WVGoBlZOXq7wjRMqKd15TK/
-6wE/J0J2TieuAJpFKd6oiPV3YT4ggn6G2lilP1rv2cX6a2qK/j82M7wTLg1rLe5e
-ocgQGRZdfk7m+u4pfrJr1Dsjy7uOjA0QWzfG5jPSFLV8DiliDDPejz+eDyaz2kib
-w3l6kfiJYiwyVlk+O2O5ocwTmZtnVvTo3KAvIZwluV6OKXJXB7+mkU5dPtXHmooU
-+HT9dOog
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lille1.fr:8443/idp/profile/SAML1/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">Université de Lille - Sciences et Technologies</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Lille - Sciences et Technologies</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-lille1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>claude vieville</md:SurName>
-    <md:EmailAddress>claude.vieville@univ-lille1.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ines wallon</md:SurName>
-    <md:EmailAddress>ines.wallon@univ-lille1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml
deleted file mode 100644
index 7f67f6fc..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.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="urn:mace:cru.fr:federation:univ-littoral.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-15T17:26:21Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-littoral.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université du Littoral Côte d'Opale</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-littoral.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université du Littoral Côte d'Opale</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>
-					      MIIDOzCCAiOgAwIBAgIUckQ0nZQ3bw9/XmojqKebUBVcI+AwDQYJKoZIhvcNAQEF
-BQAwHzEdMBsGA1UEAwwUaWRwLnVuaXYtbGl0dG9yYWwuZnIwHhcNMTQwOTI0MTIz
-NzI3WhcNMzQwOTI0MTIzNzI3WjAfMR0wGwYDVQQDDBRpZHAudW5pdi1saXR0b3Jh
-bC5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANa7NGCo8Lo2DXzC
-4XA7jBGtSlVBdVSlAuEy2rW2i6n3Ts9ICpoHhtC9WKNBa1ZtxIwH7+PIr+clZ6gk
-9GgNhvlH5WERj7A3qHF5H2mB0VQi666xsDTxJznJlsMoMHlvtIk7qg+JNoWi/UEd
-107GfTic44MzTM9CSytUAR60yc80eZpxcCfRtxUJ+/+Z089UOo0XEa7c8yrtBs/9
-MgMTKRNtFI5pGVPm9kLBzIwrUbAvqXMJrTkDPNPef1symHvz2KUVdaCBCfKRuefA
-c/ufF0PxIw6LxAifkRD/3JYHvRJGpMih6ioiJqw3ryZMsG/iu6pRCB2cxO7dDwEc
-3CFvEtsCAwEAAaNvMG0wHQYDVR0OBBYEFCTBfWjTKgQpMyyQpalCjaQzDVh+MEwG
-A1UdEQRFMEOCFGlkcC51bml2LWxpdHRvcmFsLmZyhitodHRwczovL2lkcC51bml2
-LWxpdHRvcmFsLmZyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQAa
-JNmFBW9h6X1olFFySNiwwVS5VqyRPXifp1ix/l4C9bK6iMSqHQJm3ZInss1uLyDc
-XOcZf4NiwkTtxRrU7v7UQRsFAA/nlba0tRLi3NDDqrrGweqplHZjWoMXwFcsUKJC
-xZg8yzybkiVq4Hu4q3s6LEL0HJt3c0hdnHeYDDR2CEFyR322T9gg1mItZBOvxiUb
-DBV+SqSgCIr5cYGH1jdWVcexJ2Mu2uuj5Gw04RBr5PkPLhgLYrxjfEE4abo33yPp
-s82vo0ov93xTva1Dvplep805AxG5l1XQZxmHrQawCUW7aQTf/oNqUQODbNXjr6Wn
-ANRboW9edeQmiV/cZeZ1
-					    </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>
-					      MIIEhTCCA22gAwIBAgIQM3C+kyGnfSc/kTiiA9+naTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTIxMDAwMDAwMFoXDTE2MDEwNTIzNTk1OVowXDELMAkGA1UE
-BhMCRlIxLjAsBgNVBAoMJVVuaXZlcnNpdMOpIGR1IExpdHRvcmFsIEPDtHRlIGQn
-T3BhbGUxHTAbBgNVBAMTFGlkcC51bml2LWxpdHRvcmFsLmZyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6Y8qpaVAflGpxbB3TnbUs5joUdDB0IVfB0fl
-ZJd3tjqgBEbLFtt7KPWZqmy2C7RsQEmOoSk6mtZAVzZ8BbudN+nE6nbiGSKQ1KIk
-adkMTm3ZtFAw1xpxcRzYnxAiOVTRjH9pZ8nSQ42eL7jXopqEzDOaPVF2GK89OzaE
-sH+LfjworttwEu7US4O2EOPD8OQ0fYozuDL1Rk3YWcPfeOzvPIf4htAipt2Vh0fP
-wsHBqBcF23UtYX+aUB4KQ0fpGOr5OTRycs0FjLHfpNVFZQSbP4SGcqVMbUk24Xnh
-HhbUovsCemIzzcvddaCN6esVX8Gun7v7YxQJiDpLxQZMpYtfMwIDAQABo4IBZzCC
-AWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFAXl
-Y/77ZkqLrPn2HgWzot+iF/5uMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
-AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
-YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
-AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
-KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaC
-FGlkcC51bml2LWxpdHRvcmFsLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBBUBAyoNKF
-lwkQYMHoAbYg2qSx1LJ/Od3kG6sPf6kXwkYJEvqCx3dPJnQeM+ZgUCs/o/y7WzvE
-gNQgYz5mNVN0GAUZ2EpnuybzUvTVm3fPcSs1aLjP3fxECkw10Cp++P0GFDXSHoqc
-KC6nNahBlNSK2SOr7E+tDC19AYGgI7aK/Kzr7SmePIhisdH/qup+b5XpguA0r1rq
-aWEV9NoSDZaqIJdSdKD9M5mWRV4z7RPQUTzW131WZUgTEjoWu7uLSf35wH1oAnxo
-we5qOyV4yEtVosxilJRh/BQNAwcQSAo/OMCjOPfzz0Vs8aUbukcnN122p23wbyPI
-HRSh/cWFEY7F
-					    </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-POST" Location="https://idp.univ-littoral.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-littoral.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-littoral.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université du Littoral Côte d'Opale</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université du Littoral Côte d'Opale</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-littoral.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@univ-littoral.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml
deleted file mode 100644
index 200c6459..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.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="urn:mace:cru.fr:federation:univ-lyon1.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-26T16:20:23Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lyon1.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Lyon 1 - Claude Bernard</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAA7ElEQVQoz41SsW3DMBA8GS5+CBrgGgbi5jWFCw9CJKUFDxIgnoLfmEDWECDvkO+YghRtUSzEisDx7u/+2P39MA6MjWeSPQ5MH58b32vAro08RcOAp6yRfUPm3mMUAPoAuVihu7U2RoFlchGn61quJuj4C4DOHkDKpmHQMNSW9NbRxcPwa47h4g2AzvxMIBffI+p3X+7kot772pLeuoWz0zWrJGiUsvpV6ElgFz2Si7BcYsxrtVxs0MWn6Ivh82+YM5x90iB7hGEyrI+vRM48sySUJWbVMBTtqrtG03mO9U2oTXgV0iBMogFbzyT/VNdfIJ4V1XcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDDYSyyhAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAwqRaUHQAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-lyon1.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Lyon 1 - Claude Bernard</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>
-					      MIIE3zCCA8egAwIBAgIJAIz0IVyFIDO8MA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD
-VQQGEwJGUjEPMA0GA1UECBMGRlJBTkNFMRUwEwYDVQQHEwxWSUxMRVVSQkFOTkUx
-KTAnBgNVBAoTIFVOSVZFUlNJVEUgQ0xBVURFIEJFUk5BUkQgTFlPTiAxMRowGAYD
-VQQDExFpZHAudW5pdi1seW9uMS5mcjEnMCUGCSqGSIb3DQEJARYYc2hpYmJvbGV0
-aEB1bml2LWx5b24xLmZyMB4XDTE1MDkyMjExNTIzMFoXDTI1MDkxOTExNTIzMFow
-gaUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGUkFOQ0UxFTATBgNVBAcTDFZJTExF
-VVJCQU5ORTEpMCcGA1UEChMgVU5JVkVSU0lURSBDTEFVREUgQkVSTkFSRCBMWU9O
-IDExGjAYBgNVBAMTEWlkcC51bml2LWx5b24xLmZyMScwJQYJKoZIhvcNAQkBFhhz
-aGliYm9sZXRoQHVuaXYtbHlvbjEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC58VIw+tigGlowMge/475AvTFgSNUsA4jM4zZwBU/hxGTrf7MQovEW
-XyMZcPNcE0+LK53IcgAipHEJ5/dj2ZRT9EtjlabTca6d7xyil5c155fExkb//Vq6
-XsBojJ7O26BLhHx0/Pl8HSYq6sqZA2J+QgzYQ2SDZRS6EowSJokKI7ATDX3gmyKp
-s82p9paStfM0xQD8XaZIirbdue9eY0fAEavTGNA0D5jYgfgQ99D/0wMUgUumh86g
-n7ux+fc8kjUIwYG4cXM4laNS+4nbUQLTuXxlpuLNmkSkCmBl9q0fKJM+a013Dhe7
-Atk+E51GJGmz3Q5EKBkOoTsq//4qrUojAgMBAAGjggEOMIIBCjAdBgNVHQ4EFgQU
-4tUM0e5oVHam+Ui4mw7eyrJlWrMwgdoGA1UdIwSB0jCBz4AU4tUM0e5oVHam+Ui4
-mw7eyrJlWrOhgaukgagwgaUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGUkFOQ0Ux
-FTATBgNVBAcTDFZJTExFVVJCQU5ORTEpMCcGA1UEChMgVU5JVkVSU0lURSBDTEFV
-REUgQkVSTkFSRCBMWU9OIDExGjAYBgNVBAMTEWlkcC51bml2LWx5b24xLmZyMScw
-JQYJKoZIhvcNAQkBFhhzaGliYm9sZXRoQHVuaXYtbHlvbjEuZnKCCQCM9CFchSAz
-vDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCXQyUIW7tNLd3vKNg6
-1JF7KwTHe+f1FO7J21cozLf/OuiSCuz1naKPB4VqLfYoBK03yEme8CHOaxCPjkSB
-ixV1vqA0Uovka6VrzuM7OhtLEReF3VajJD4+MExwLeCKJnjpFJEDQdDracNFfi1n
-6HpsX95vX11466ig8O4JTyXJ77LaIHItTBhrQozrY3woFr6kt6cs2IYMxqDj9M2K
-c9cUTNP0EeRAYh7jQtNMJirphI8U43QDGdeOSytypmpQpe002c44CczDa9tkx+sT
-TFbUmmvfu3TPJmE3CXuFrt8C9wh19uNNm9uAhqU3jHjRa5n/OqQJVddhgZ8WkCsd
-dYpv
-					    </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-POST" Location="https://idp.univ-lyon1.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon1.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon1.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Lyon 1 - Claude Bernard</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Lyon 1 - Claude Bernard</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-lyon1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>shibboleth@univ-lyon1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml
deleted file mode 100644
index 76f0efef..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-montp1.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-02T12:01:22Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp1.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Montpellier 1</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABk0lEQVQ4y6WTu06CQRCFv1nUQhsT/VvBzkujEqzQ/DbGhMJLJCYkBB4BSiv1CYA3wBBtJEYLErURL5WGhMZLp9ZY0GhjcC2W8F9QY+I0szkz5+yeyazwTej1ZAYIgp4ygDyjuZDDUtHfK11EzRbCIN8q00TYkXIp3yWg15M5IMPfIi/lUhZAAei1ZNpDHg1CbMlpjy3BQL9bINPm0KPjiSk+yXn04ysQCcP9AwSDkE6ANQTFPbf5nI4n6godSHk8W5YhA8QWYSFqzvacf3qD6EBKgbY9hQVX48Q4TIzB27uxYM/7p2ortIQ8mB01hOI+9Ld9HxyZPDvt40tIeYDZMFjDUL2C6qW5tfEKlRO4fzTWLMut0FSIfnYEZky+uIbJcXO+qZl8ft1tUWgqtNQ9A3x7N0+PrxqscmZy9dLU7KjbQl2hWoUOcPdonr29CaERqJxCo+EQqlfOXABUqyDQ2f1cZ4kiYbitwdMLv0RWyqX8v1e5+zPh28ofbnbm6Au9vBGit28FdMpbkV0+VFGOd5tu9AudaICSH77WlwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMNhLLKEAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDMrMDI6MDCpFpQdAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-montp1.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Montpellier 1</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>
-					      MIIDUDCCAjigAwIBAgIVAJOMiotpzQ96F7hbDILKKowOjLKeMA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMMGWZlZGVyYXRpb24udW5pdi1tb250cDEuZnIwHhcNMTUw
-NzEzMDk0MjUzWhcNMzUwNzEzMDk0MjUzWjAkMSIwIAYDVQQDDBlmZWRlcmF0aW9u
-LnVuaXYtbW9udHAxLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-mLcbN80A1IO2aQlQ3u+0P4sdHfEcM/3GpUbP50/XaN0AB+tAAj96oEJ12n2RJRCu
-feEl0XDHIjng3mvd+8Pvjw2bp0Vq9beu/0eL1Z1c9CputdZRPRerjkkhM8yVEFsG
-BNwpQP0JPK0OzH1Q+99cb8laJi9Utf3UzEwZyvHBC/r/IDjDc55UOltqjluA+K/V
-llXiagCbTo0gnV9mgVeSDWye859oJQnVrNh1wZpoUv31DNJzh9rgDR3WtzHDbiqy
-MN/vCiDTfL01SrOcOoK2vBFEtAo7p+tEKHD5BmBAi20PQZ+AhD4MopIknhj+G7qh
-KRKlFOxhTggSj2vAtMTi0QIDAQABo3kwdzAdBgNVHQ4EFgQUstMRllZRY3BfE0yE
-R6HnlxdTHh0wVgYDVR0RBE8wTYIZZmVkZXJhdGlvbi51bml2LW1vbnRwMS5mcoYw
-aHR0cHM6Ly9mZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBBQUAA4IBAQBA3N7qebKU9Q0uANBka00/aRthcUCcNlB+k+/w
-8YWbz1Jq+WQDPyCe7vv5V9yxX+8LYj5tZx8d5OK+j/bJAH/pd6BATIR4Q/shHJiR
-ACMUVUAEyfyaA1eKRe0o1igxNmkSt2twR9ac0u4NbeMnMU5DNHV2qEq5mES+mt7Z
-uRhyMT0WXbmpEtEtL+3eLDN2YpysNtXB720WmgMJNot0N/od5t6HZ/qX73RqfDEp
-QG7nmiGC7F4dtqNbseQfiUXBJ3zyqnYp/Foxrj4CCXr7u7LphFwVD1S9P2XEAU7+
-jrnOFBPNFh4Y2Am2S7HRRZgtL0oPhJX8iPweocqY1nZy/RZs
-					    </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>
-					      MIIEhDCCA2ygAwIBAgIRAKpYore6nLYzJ1HYT2nH1gswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjA5MTgwMDAwMDBaFw0xNTA5MTgyMzU5NTlaMFUxCzAJBgNV
-BAYTAkZSMSIwIAYDVQQKDBlVbml2ZXJzaXTDqSBNb250cGVsbGllciAxMSIwIAYD
-VQQDExlmZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA1TylXSc95u78Z43vjEaVfFXrimIOL2g92d+HPKapzCFg
-rEZp91lPuKDlo9ryirOCoAvHpAZvkxb8mqqwiyetnRWKr3dawWLH+/TbdURt+oyO
-FLsa+VuQhIMWwfB86pYY5y0fhT1ghrE2w9TJyJxX7GORwcJ4iRXX+IDlaOyZaNhO
-JLo6ORgGUmLwrt7BSEmpuMyK0k5r4w+IcD6XZA7B7K8E/sJcgF8P4jtKSEAo6Rxj
-Udjc/4T8mbkUVWrteB6BQjgedM9iZ0UdBwgggfuH1HTOMYjVw3FcZtxTTbYWTXIC
-lsm6KiHArCyXm2R1BJBbUw8DJLY93mU6H61wpVLrhQIDAQABo4IBbDCCAWgwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFO+5OtvVKUU7
-jC5UIDKWpwe+czr6MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCQGA1UdEQQdMBuCGWZlZGVy
-YXRpb24udW5pdi1tb250cDEuZnIwDQYJKoZIhvcNAQEFBQADggEBAKl6lJSfuM5j
-6zTCkHtAkEf3mVENsIb+NX6DTTvfpDAWtp8XVxbc4z31PLpwvgprifGeSXqmRK1S
-3OXIOhARSMR2JYr/uJeoN/ihMSrYt980CWTHMXRQFpBjzvLWZj51vQds3akj1WYF
-PeoBbBeQkUQ9N+nN/8D0RbXW+jODNxc31m7YXHHP/mygS2SxcvccGoBpc62w6EV1
-sBOQY3TDmlBIfuv8MUWqlULjhOELiezkhOidHlaYBPEszFzwnKDtCzWlMv39Jbg5
-UUJVZH1qyRe9cvC+LBH/kmXE9pM8j5mTDqmzmYNsYm677gOGflojwgvwHIDg/j2L
-tMVy28FqAhY=
-					    </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-POST" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp1.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUDCCAjigAwIBAgIVAJOMiotpzQ96F7hbDILKKowOjLKeMA0GCSqGSIb3DQEB
-BQUAMCQxIjAgBgNVBAMMGWZlZGVyYXRpb24udW5pdi1tb250cDEuZnIwHhcNMTUw
-NzEzMDk0MjUzWhcNMzUwNzEzMDk0MjUzWjAkMSIwIAYDVQQDDBlmZWRlcmF0aW9u
-LnVuaXYtbW9udHAxLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-mLcbN80A1IO2aQlQ3u+0P4sdHfEcM/3GpUbP50/XaN0AB+tAAj96oEJ12n2RJRCu
-feEl0XDHIjng3mvd+8Pvjw2bp0Vq9beu/0eL1Z1c9CputdZRPRerjkkhM8yVEFsG
-BNwpQP0JPK0OzH1Q+99cb8laJi9Utf3UzEwZyvHBC/r/IDjDc55UOltqjluA+K/V
-llXiagCbTo0gnV9mgVeSDWye859oJQnVrNh1wZpoUv31DNJzh9rgDR3WtzHDbiqy
-MN/vCiDTfL01SrOcOoK2vBFEtAo7p+tEKHD5BmBAi20PQZ+AhD4MopIknhj+G7qh
-KRKlFOxhTggSj2vAtMTi0QIDAQABo3kwdzAdBgNVHQ4EFgQUstMRllZRY3BfE0yE
-R6HnlxdTHh0wVgYDVR0RBE8wTYIZZmVkZXJhdGlvbi51bml2LW1vbnRwMS5mcoYw
-aHR0cHM6Ly9mZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBBQUAA4IBAQBA3N7qebKU9Q0uANBka00/aRthcUCcNlB+k+/w
-8YWbz1Jq+WQDPyCe7vv5V9yxX+8LYj5tZx8d5OK+j/bJAH/pd6BATIR4Q/shHJiR
-ACMUVUAEyfyaA1eKRe0o1igxNmkSt2twR9ac0u4NbeMnMU5DNHV2qEq5mES+mt7Z
-uRhyMT0WXbmpEtEtL+3eLDN2YpysNtXB720WmgMJNot0N/od5t6HZ/qX73RqfDEp
-QG7nmiGC7F4dtqNbseQfiUXBJ3zyqnYp/Foxrj4CCXr7u7LphFwVD1S9P2XEAU7+
-jrnOFBPNFh4Y2Am2S7HRRZgtL0oPhJX8iPweocqY1nZy/RZs
-					    </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>
-					      MIIEhDCCA2ygAwIBAgIRAKpYore6nLYzJ1HYT2nH1gswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjA5MTgwMDAwMDBaFw0xNTA5MTgyMzU5NTlaMFUxCzAJBgNV
-BAYTAkZSMSIwIAYDVQQKDBlVbml2ZXJzaXTDqSBNb250cGVsbGllciAxMSIwIAYD
-VQQDExlmZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEA1TylXSc95u78Z43vjEaVfFXrimIOL2g92d+HPKapzCFg
-rEZp91lPuKDlo9ryirOCoAvHpAZvkxb8mqqwiyetnRWKr3dawWLH+/TbdURt+oyO
-FLsa+VuQhIMWwfB86pYY5y0fhT1ghrE2w9TJyJxX7GORwcJ4iRXX+IDlaOyZaNhO
-JLo6ORgGUmLwrt7BSEmpuMyK0k5r4w+IcD6XZA7B7K8E/sJcgF8P4jtKSEAo6Rxj
-Udjc/4T8mbkUVWrteB6BQjgedM9iZ0UdBwgggfuH1HTOMYjVw3FcZtxTTbYWTXIC
-lsm6KiHArCyXm2R1BJBbUw8DJLY93mU6H61wpVLrhQIDAQABo4IBbDCCAWgwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFO+5OtvVKUU7
-jC5UIDKWpwe+czr6MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCQGA1UdEQQdMBuCGWZlZGVy
-YXRpb24udW5pdi1tb250cDEuZnIwDQYJKoZIhvcNAQEFBQADggEBAKl6lJSfuM5j
-6zTCkHtAkEf3mVENsIb+NX6DTTvfpDAWtp8XVxbc4z31PLpwvgprifGeSXqmRK1S
-3OXIOhARSMR2JYr/uJeoN/ihMSrYt980CWTHMXRQFpBjzvLWZj51vQds3akj1WYF
-PeoBbBeQkUQ9N+nN/8D0RbXW+jODNxc31m7YXHHP/mygS2SxcvccGoBpc62w6EV1
-sBOQY3TDmlBIfuv8MUWqlULjhOELiezkhOidHlaYBPEszFzwnKDtCzWlMv39Jbg5
-UUJVZH1qyRe9cvC+LBH/kmXE9pM8j5mTDqmzmYNsYm677gOGflojwgvwHIDg/j2L
-tMVy28FqAhY=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML1/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">Université de Montpellier 1</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Montpellier 1</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-montp1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@univ-montp1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml
deleted file mode 100644
index 217e68f8..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-montp3.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-23T15:18:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp3.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Montpellier 3</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACK0lEQVQoz2VSXUiTURh+vnO+99tczlQSXWu0NprV5lrZTBizkkXWQEkLL5LotggyiqQLb7rpoqCrCm+qiyDpDy8kSCqWF9rS7D+FZfa1UX3aXFNkkVtfF5uzbx1eOOc8h+d93ud9j6AoCoBzNx5d7RsGAAiA6nPbznQEBp5PXL47CABA50F/16GdAMTsHZyDJCytJl9N0Of6MpNcBjnP7jmCyrhKlD0LgrCl2gJgPBbPgypjGgI4V8Xc2/YNlkaPXZ5OXn/8Jg/mFXI8MAaRQASR9vudEvHewfedbT6doQhEIMKSAltOQASR3OvNJ1vqf6czt4Ymug74dnnsEAkigRUqcBBJRfrjQa/I2f1wpL3BWayXgnUOEFmqyr0Os8aDtap0s92kI97uqx77PNN9L3zYvxFAcKtNmUsd3e2Wv8c1CkcaNnW31isLi30vpvpfyxnGUxkVgLWiJCzHradv3hn9pCGs0FHrNtvUxY7yEoOprPhsizf0cTqWWABQa6tcFPh/prPNBsais+cfvjvW+2wkOtv/Ngag2WPlErHCti79ilMB54mAi4iI6MGHrwDq1q0ylRlZwaSvDU/uqVnbdCVkLjWMK0kiCcCQnJj/lTbqxb0uC2OqRkH+mbr9KnaprbbZvWalQU8SkURg/ElEAbDPuZoXlMQ47wnLL7/NXXg6OZ+GSJSNgcgPAI2OSp0kakoSOE8z3jMS5RL96yokJzJ/VKNO3GGvyCJ/AXntoub2TxErAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAzKzAyOjAw2EssoQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMyswMjowMKkWlB0AAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-montp3.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Montpellier 3</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>
-					      MIIDKDCCAhCgAwIBAgIJAOUsRys+9vr2MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmlkcC51bml2LW1vbnRwMy5mcjAeFw0xNTEyMjExMzAzMjlaFw0xODEyMjAx
-MzAzMjlaMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALUFOkbwlvHlNFscNBuf7n11roHnrDcmoh8C
-cZDcUyPwNrI6rodXl5J4VUua1KyyF7Xiw+Sbt6B3FWTQyQ/9dVYDJlqcId858mm8
-bNHMu9006HyFUg14KE4sibps3aEdDc82u3lK7g8xVth2bNH6ikVB7nHspld12xXr
-MeZPerCrgPWYcI3FU81Ry44TbHl6A8Db6hVsURQyOwI3ejedUW/v09z/eKz7tWOi
-BTO2OMj/vmFXhdJSauL5EZDFiMqj2enribQEnKDsDaQvNJ9hzxhk8W1Re3prQQXi
-58O+vMnsidsAzvWl0riP1n3JBPGpfUVfl7s5Kwt2Cstu1vYUwLsCAwEAAaNrMGkw
-SAYDVR0RBEEwP4ISaWRwLnVuaXYtbW9udHAzLmZyhilodHRwczovL2lkcC51bml2
-LW1vbnRwMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU4bXzVk5qn1dvwzKl
-ElpuNcuFqYIwDQYJKoZIhvcNAQEFBQADggEBAH+IsgY+v2+KWjJ+UYVUo76mH5sC
-FmxpW4DtXdOkx4Vf1JNwRCKKTP7NYlD402zqbtOL/aIIQ/ev6v2WFBm7/pRiajpI
-ajY3W9S/W6QgjGMM7sTLgPJoiafHT6CzjeLCgdyJ5qqTxXePPRn5t15KKBMqVwki
-S2RyLxCNaG735iyf02pouXs/vGDaVj8q5Ime/lR/mpODOKQk5lJP9Z4U3xJamQd6
-zLXKMS8vUj2HIydQGDEuXNg0DT1j3c22b/tPPgfv0ZSDfLeHYTb7D+H3+sZdgeCv
-DanziiDRT48w7pw7CXw6+cSSmi8dtXnkK5kk1sS2DBFmroJ+IEFYvP7ZxmI=
-					    </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>
-					      MIIEhzCCA2+gAwIBAgIQBUjO9AwbhRtr7tjGUg65IjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTExMDIzNTk1OVowYDELMAkGA1UE
-BhMCRlIxNDAyBgNVBAoMK1VuaXZlcnNpdMOpIGRlIE1vbnRwZWxsaWVyIElJSSBQ
-YXVsLVZhbMOpcnkxGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALZpRdTpeBT0QYYouJQgkJ8LsaGs/23e
-olnt9n23TfoECwAYnGNcK7+SeNPemO7gngsyU07ckiuuaxN19scxvIJ26Zi5a44s
-R1sIBNkTS9WL8bZeTBVZ3cwJMcMU/WyOG0MkzwuWfBSP0IihzvwWILDJgbz0BWTk
-L23+YPeRvsLcymStS9uNc9Cu5ak70LoCN8sEGVEAXilJP85cgMSLyJz33fK0ohsK
-6uIG4RVb8TdsVkZ5uWMAVZuiNKhwEHcLDPXIcZe9q7Wlz0sUrsrnN4GvpWCDk3oJ
-VhKQ95+4OYbC7iBGW7i0WyRNcG8zm0uHjwJAJAGHXKYHjRDcEBDZhFMCAwEAAaOC
-AWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQW
-BBT5oJbLv8ba7NKHSMXohclUTLaclDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/
-BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzAN
-BgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
-BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
-MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREE
-FjAUghJpZHAudW5pdi1tb250cDMuZnIwDQYJKoZIhvcNAQEFBQADggEBAIxg44rF
-Ee0d90B3u9ZiGAhDOOKlU1TkVZ0fA7HFq6C+AYafAw9jac4sn8ZnYFZMHgZwvl6z
-OLW97uhQRL5MJ9w3ArZSQvumiD+DwVRn8V7bBN/mzUR/jIl3U4VQ9YcYk3vx2dzw
-+YnZGQLJGuiE9wcH5+Z3/oNBw9o5DB8juU9W/H/a2xGksZ8WbUnJW3kfcdIKqclr
-Ev9JomAr2LzGTLq7YTwT9nuN0PgFXNMI/aM3ci5ni9DEfmNdfk1qn7HZLLqLAtPH
-94QXFSgFfkI0r/NMpslNQGn0NKSFItkhJGX5Su0RFEmX8kjNpYt6oPlXW7Vr7389
-9m9urGFyfVe5MQM=
-					    </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-POST" Location="https://idp.univ-montp3.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-montp3.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-montp3.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp3.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDKDCCAhCgAwIBAgIJAOUsRys+9vr2MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEmlkcC51bml2LW1vbnRwMy5mcjAeFw0xNTEyMjExMzAzMjlaFw0xODEyMjAx
-MzAzMjlaMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALUFOkbwlvHlNFscNBuf7n11roHnrDcmoh8C
-cZDcUyPwNrI6rodXl5J4VUua1KyyF7Xiw+Sbt6B3FWTQyQ/9dVYDJlqcId858mm8
-bNHMu9006HyFUg14KE4sibps3aEdDc82u3lK7g8xVth2bNH6ikVB7nHspld12xXr
-MeZPerCrgPWYcI3FU81Ry44TbHl6A8Db6hVsURQyOwI3ejedUW/v09z/eKz7tWOi
-BTO2OMj/vmFXhdJSauL5EZDFiMqj2enribQEnKDsDaQvNJ9hzxhk8W1Re3prQQXi
-58O+vMnsidsAzvWl0riP1n3JBPGpfUVfl7s5Kwt2Cstu1vYUwLsCAwEAAaNrMGkw
-SAYDVR0RBEEwP4ISaWRwLnVuaXYtbW9udHAzLmZyhilodHRwczovL2lkcC51bml2
-LW1vbnRwMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU4bXzVk5qn1dvwzKl
-ElpuNcuFqYIwDQYJKoZIhvcNAQEFBQADggEBAH+IsgY+v2+KWjJ+UYVUo76mH5sC
-FmxpW4DtXdOkx4Vf1JNwRCKKTP7NYlD402zqbtOL/aIIQ/ev6v2WFBm7/pRiajpI
-ajY3W9S/W6QgjGMM7sTLgPJoiafHT6CzjeLCgdyJ5qqTxXePPRn5t15KKBMqVwki
-S2RyLxCNaG735iyf02pouXs/vGDaVj8q5Ime/lR/mpODOKQk5lJP9Z4U3xJamQd6
-zLXKMS8vUj2HIydQGDEuXNg0DT1j3c22b/tPPgfv0ZSDfLeHYTb7D+H3+sZdgeCv
-DanziiDRT48w7pw7CXw6+cSSmi8dtXnkK5kk1sS2DBFmroJ+IEFYvP7ZxmI=
-					    </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>
-					      MIIEhzCCA2+gAwIBAgIQBUjO9AwbhRtr7tjGUg65IjANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTExMDIzNTk1OVowYDELMAkGA1UE
-BhMCRlIxNDAyBgNVBAoMK1VuaXZlcnNpdMOpIGRlIE1vbnRwZWxsaWVyIElJSSBQ
-YXVsLVZhbMOpcnkxGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALZpRdTpeBT0QYYouJQgkJ8LsaGs/23e
-olnt9n23TfoECwAYnGNcK7+SeNPemO7gngsyU07ckiuuaxN19scxvIJ26Zi5a44s
-R1sIBNkTS9WL8bZeTBVZ3cwJMcMU/WyOG0MkzwuWfBSP0IihzvwWILDJgbz0BWTk
-L23+YPeRvsLcymStS9uNc9Cu5ak70LoCN8sEGVEAXilJP85cgMSLyJz33fK0ohsK
-6uIG4RVb8TdsVkZ5uWMAVZuiNKhwEHcLDPXIcZe9q7Wlz0sUrsrnN4GvpWCDk3oJ
-VhKQ95+4OYbC7iBGW7i0WyRNcG8zm0uHjwJAJAGHXKYHjRDcEBDZhFMCAwEAAaOC
-AWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQW
-BBT5oJbLv8ba7NKHSMXohclUTLaclDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/
-BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzAN
-BgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
-BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
-MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREE
-FjAUghJpZHAudW5pdi1tb250cDMuZnIwDQYJKoZIhvcNAQEFBQADggEBAIxg44rF
-Ee0d90B3u9ZiGAhDOOKlU1TkVZ0fA7HFq6C+AYafAw9jac4sn8ZnYFZMHgZwvl6z
-OLW97uhQRL5MJ9w3ArZSQvumiD+DwVRn8V7bBN/mzUR/jIl3U4VQ9YcYk3vx2dzw
-+YnZGQLJGuiE9wcH5+Z3/oNBw9o5DB8juU9W/H/a2xGksZ8WbUnJW3kfcdIKqclr
-Ev9JomAr2LzGTLq7YTwT9nuN0PgFXNMI/aM3ci5ni9DEfmNdfk1qn7HZLLqLAtPH
-94QXFSgFfkI0r/NMpslNQGn0NKSFItkhJGX5Su0RFEmX8kjNpYt6oPlXW7Vr7389
-9m9urGFyfVe5MQM=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-montp3.fr/idp/profile/SAML1/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">Université de Montpellier 3</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Montpellier 3</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-montp3.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@univ-montp3.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml
deleted file mode 100644
index 49e6362c..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.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="urn:mace:cru.fr:federation:univ-nantes.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-02-23T15:56:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-nantes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Nantes (FRANCE)</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABC0lEQVQoz2PkkvRjIAUwkaSagYGBhZWDRUZKHMK5f+8pshwrBwsP17c/vxg/f2FFsaEg3W/lrFI0k+Rlv0qJfuTj/m1m+LY4/Yag0C+oht8//hw7eY2BgeHJs5fIZj97zf/wMffDx9x7D0tcuCbQWHKOlYMFxQ+/f/xBZiNzz10VEuD9JyX6kVhPf/nGxcDAoKLwGUUDxEYSghXZDURpwG/Dh89MCA2nLtxhYGCAxwZWIMD7D6HhybOXx8/eNDNQIcY2ZlZe9X9//t289zzU34afj/vbzz9yspKiwoIvX76FK5KV/Oxk/ZKZkfn6PV5G5MQHMRjT97w8vyGMH384UazGFVBIaekPyakVAEkXYeg1Yfc8AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA0KzAyOjAwHewSLwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNCswMjowMGyxqpMAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-nantes.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Students and staff belonging to University of Nantes</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Nantes</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Etudiants et personnels de l'Université de Nantes</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>
-					      MIIDMzCCAhugAwIBAgIUXhtC9sGfg8MZ1QOlWpmnARmmHMYwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbmFudGVzLmZyMB4XDTA5MDMzMTA4MTA1
-OVoXDTI5MDMzMTA4MTA1OVowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbmFudGVzLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAktwRMpbzUDURWbJkTiTj
-24JSlknu7dufbohqxC5S5MDGpRx4kZFZFIy+adMWMV/DhS85ggU059xm4PGdoWSd
-nLfYxWNFma2elqpE4ErVbrRyo66m5wP3Xs2VCQQJqcb9YUM5+8yBU04yXAEPYGUv
-QX4R6F2J4K6l2xFlX95aHycjJoAqFq3EPkBs3B8svjK3DWZAYPQP0LbxI1VGvzDn
-Dkl4LrzwOPXTdGuJIQUWULWq1KV/RK9mdTTW7Xm5QBh61U1WQLl3EKJJUD5ziaq0
-KttLIND72IKHWYiU5YgC28J6J31BzI2L/TeKk0jmEJl34G6AJ/T82ulrpLZwzu3o
-1wIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1uYW50ZXMuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtbmFudGVzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR0
-v7zvoB8/1wVaVqBJiix3/eDmPTANBgkqhkiG9w0BAQUFAAOCAQEAY7x0Byy9iv25
-8QhZ7CAD5B0ewKhgS1UO4wmr5UC9bpCAqLdJ1B0PyMZ1Bx3c/TzGloEBoGfiJLu5
-DXg61rAdqYa4ihIC5hXCpt9l02EWxWXintKDZ07kcG2aama1EBRh0s3usR8QzLyB
-giEcLiXmysSZgy1k/VAx2R5DaHimMFk9vJkTckprB/mSlB4aFFVtfsk6b6dxf0JY
-pF1bmgLeWzeQlAtCz8sNNPwXDvAVbBLLHXnOUa8V9TzhaPlInHHhUs6DLNdGml/9
-fLM8XuyqV7zxR0P8IGEgoEuNDgaBilEU3IeExFo/eOojuKJbQkV9w18Q5cxIzGPR
-9yMUR1nBIg==
-					    </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-POST" Location="https://idp.univ-nantes.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-nantes.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Nantes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Nantes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-nantes.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>shibboleth@univ-nantes.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml
deleted file mode 100644
index ee441558..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-paris1.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-30T20:41:43Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris1.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Paris 1 Panthéon-Sorbonne University</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABQElEQVQ4y7WQvyuFYRzFP+dxvW8pKSXJ3WTgDxBJZkXpbiaTYrLKJLL68Q4mi4HNKllsXrcMUpSs10R2P+57DH5eupernOl5vuc8n87zhf/UySodxYR8rUyullkm7nnJ3Jf+BHBgAdMIHFTLhGpGmkRjoCFQf5pEhbobBMhwtmF0G8R93QDbzUglObvGtNQPIEwLDVuAfQrs/HoHx+tRt3D+A0Zbuhr1/AiwUboeL9i6gND1NpfUiXR2vBYv2+jzm4bPl5HWaE6EJUnfmkkKSEPXxYawuV8+fJ+/HYoJeTu+BDWBH4Fdw5EgwwwiCqDY9pPk3v7Zh6vKJWbxOOJO9gr4zlJBKHn9XGo8L9OCmJSZABYrABbnMtuGKRTav/QfEBpAvhFsGaXvVprk+kKWmzEeRZU7qaEM2JPKG7/MV9cz925uhXlAUDYAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NDk6NDgrMDI6MDBjnYKrAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjQ5OjQ4KzAyOjAwEsA6FwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-paris1.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Students, faculty, staff and affiliate people from Paris 1 Panthéon-Sorbonne university</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université Paris 1 Panthéon-Sorbonne</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnels, enseignants, chercheurs, étudiants, hébergés et invités de l'université Paris 1 Panthéon-Sorbonne</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>
-					      MIIDMzCCAhugAwIBAgIUN4OD7GwJor5x7X/cdaXgiF8OElUwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZyMB4XDTA5MDYzMDE4MjIx
-OFoXDTI5MDYzMDE4MjIxOFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk7DsGWWjsYm1Rn/nFfrg
-Ff25b3uadZLPdzBgYurzqIDAZ9Sc39MwxchyFmblmFSqb8vLHM36XKESMWUgmCO7
-5GOFv7AsxhbtcXgLVohVKS47ZkTXnSbjg3eUww7s51lirQViAuA8iqRAZvnvPMFa
-JAbiXe54SIuDI7SQlTfNhpWGUaooDMfmHrgMOkB8MFk0nFDfN1oefPGIUtQ4LKXl
-0Ua1paLUFF1Du76lakyiZ+ssZ3EkIy8pN1OssR/3rHmYDfqodgUeexSikB8IsdHp
-rNU+6NKfVzGQiZtjTT1cqMRBU7ElHtGyliuelZTGN2rWV9pxxDMBCVrCqvBM9yym
-PwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1wYXJpczEuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtcGFyaXMxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRs
-oNzyg0MZ2ce2hy2748tOvP/+LTANBgkqhkiG9w0BAQUFAAOCAQEAkyfipm/mh/Kt
-jiFkg7p4oQPJkqoBAMEhv1hNqf+8bWBcbhBwrkJUG/MfR3KWfHgnHexPU6Ri35aF
-NOFN5mNQvM8DSTdKvRhZV5cM9+s5x1WGSCnsBrRE/QcV0nhm5Kozlbkki93nPBOF
-YcX73QCPD/T1ewnjA8Pyh8rPoKrT9nOLAdxyENRCucOaXWMM8SAS3wcEuBPIrWX3
-0MjL6pTwDGdoRCZ36w+hP802gvZMKu6GlRudUVPdKa0DYqDcTicA5drs0TnuQnBU
-Q0868rBTfR4z8pLRKvaADmYGslrdNQaXIK9yzi9qzGFQrBUEKJboWW/6hUR7NXuM
-yutCRUw+eg==
-					    </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-POST" Location="https://idp.univ-paris1.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris1.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris1.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris1.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMzCCAhugAwIBAgIUN4OD7GwJor5x7X/cdaXgiF8OElUwDQYJKoZIhvcNAQEF
-BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZyMB4XDTA5MDYzMDE4MjIx
-OFoXDTI5MDYzMDE4MjIxOFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZy
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk7DsGWWjsYm1Rn/nFfrg
-Ff25b3uadZLPdzBgYurzqIDAZ9Sc39MwxchyFmblmFSqb8vLHM36XKESMWUgmCO7
-5GOFv7AsxhbtcXgLVohVKS47ZkTXnSbjg3eUww7s51lirQViAuA8iqRAZvnvPMFa
-JAbiXe54SIuDI7SQlTfNhpWGUaooDMfmHrgMOkB8MFk0nFDfN1oefPGIUtQ4LKXl
-0Ua1paLUFF1Du76lakyiZ+ssZ3EkIy8pN1OssR/3rHmYDfqodgUeexSikB8IsdHp
-rNU+6NKfVzGQiZtjTT1cqMRBU7ElHtGyliuelZTGN2rWV9pxxDMBCVrCqvBM9yym
-PwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1wYXJpczEuZnKGKWh0dHBz
-Oi8vaWRwLnVuaXYtcGFyaXMxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRs
-oNzyg0MZ2ce2hy2748tOvP/+LTANBgkqhkiG9w0BAQUFAAOCAQEAkyfipm/mh/Kt
-jiFkg7p4oQPJkqoBAMEhv1hNqf+8bWBcbhBwrkJUG/MfR3KWfHgnHexPU6Ri35aF
-NOFN5mNQvM8DSTdKvRhZV5cM9+s5x1WGSCnsBrRE/QcV0nhm5Kozlbkki93nPBOF
-YcX73QCPD/T1ewnjA8Pyh8rPoKrT9nOLAdxyENRCucOaXWMM8SAS3wcEuBPIrWX3
-0MjL6pTwDGdoRCZ36w+hP802gvZMKu6GlRudUVPdKa0DYqDcTicA5drs0TnuQnBU
-Q0868rBTfR4z8pLRKvaADmYGslrdNQaXIK9yzi9qzGFQrBUEKJboWW/6hUR7NXuM
-yutCRUw+eg==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-paris1.fr/idp/profile/SAML1/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">Université Paris 1 Panthéon-Sorbonne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Paris 1 Panthéon-Sorbonne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-paris1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@univ-paris1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml
deleted file mode 100644
index 9ca1e256..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-poitiers.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-18T10:46:20Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-poitiers.fr</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.univ-poitiers.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Poitiers</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB50lEQVQ4y52ST0tUURjGf+/5c++YFGMxKZhWy2zhJmyTtIoiiPat2gQS2KJFBX2CAvETBBK0qqBFBEFNBEUMuDOKFgmFGdiMcXVGvePc87aYSb1KZL2bA+c8z+/9d+T+nRvXjMgE4NhliABKmsGYMSITIrJrM4AqiEhs0EkHOFVlPV0lZNkOsfURWasJunlnrMXHXYAUHMB6usr5y9cp9Q/SaqYoICL4KOZ95TVDJ04RQkYIAec81e9zPJuaxMcFdQDWRcy8K7O3uJ+RMxcBqCc/mS4/pTr/laS6wNDIKD2lPr7NfuLj9Bus9/B7cMZa5j9/YK2xxPGTp+neV2wLK2WiQje1+S/UkxpnL43x6uE9Qsiwrg0wW/uyPuqMGMQYrIs6p0ekLW2bN2du+MeQToL/BmyPHQD5o1T/DhAga7U2StUNk+J8DECrmebS5AHGkixWASge6KW52qDVTFlrLHP42DAr9aUdFeS+sPMRleePOHT1NqX+QS5cuUVSW6Cn1EfvwFHKj6dwUZxv+cHdm7q1u5C1dzw8eo6DA0dwPqaeLDLz9gU/5ma3A9ZcQNeNGK8djLGWEDKmXz5BQ4aqImKw3ufMxggadMVYkXFUV7buV0RwPsLHXUSFPfi4gDE2965BlzUw/gtzXK+1ooP+ugAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMLubGZsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDUrMDI6MDDKxqEnAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-poitiers.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Poitiers</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>
-					      MIIEsDCCA5igAwIBAgIQUMcwKhTYAJRU4aUw5HaMrDANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
-QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
-Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzEwMjAyMzU5NTlaMEkxITAfBgNVBAsT
-GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbc2hpYmJvbGV0aC51
-bml2LXBvaXRpZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-1RVveanaMybAIRz/nZF/4XqBKU2rMLEbis9diusj/44VXzaRlXcjyfaoZa+SK8bI
-JQVsT/yGXI/WWaqhHXXaB0chqkrYfHZPdoYweFwTjynD1hJUhxamlGSBD30u0BPD
-7jTPKZxYvjwLJqppV9oZsCMSfWTznFotfBtmxIWMlF6bpR5c1foca0IL620MUzLC
-DBz4f0UyiWOL3kOkd4b8OauXR/YwfJiVckJjkk0F5WffPRDnDNj3/pLd+PFbhShS
-qT8gRkx7pF/XlJwTrXZMnQpcSNbY9XF6tkhaaLoA18XC7iWgsOhIjzJbDYuaFRQd
-XGlzCbWkM+dqX+vKPWgy8wIDAQABo4IBdzCCAXMwHwYDVR0jBBgwFoAUW9CKHJoy
-W+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFGvidQi286gq4y5V1p4rm72/NncwMA4G
-A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
-BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5B
-U1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-cnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlo
-dHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMCYGA1UdEQQfMB2CG3NoaWJib2xldGgu
-dW5pdi1wb2l0aWVycy5mcjANBgkqhkiG9w0BAQsFAAOCAQEAP4KsWoHSMRjZYLyu
-BuoF2RGmBsH02+QB9og6g6FBGEzSoFlKTonSOzSINKVI8hLSAG/AH0qEoscIRHkU
-tg1DWMbvz5m6vH3jBX35hjY9W2R2ajE0UBRXAjJG7duQ0t5qb5OlOO8OUcsVp8hq
-fZ321PY8oouA8yDBPL+G1k/Qf5rPZKfTG2l9CTjW3biiKHY8jyJBQIT8UQTFKX2j
-WxJcX4OyP3Ryyoc1e+ElHZdGRjKKpDd24hKUHiBtwaiio4jXRSzVw7dUUblKCMVN
-27h8pxrE4bUEWHkfxXKfWihDx6GPfk+exNY0mhn1Eunh288jAyt96C7uq2rXL9wg
-Yjdn9A==
-					    </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>
-					      MIIEhTCCA22gAwIBAgIQBJ1RI0pR2rrSRRLdVKx5rTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMTAyMDAwMDAwMFoXDTE0MTAxOTIzNTk1OVowVTELMAkGA1UE
-BhMCRlIxIDAeBgNVBAoMF1VuaXZlcnNpdMOpIGRlIFBvaXRpZXJzMSQwIgYDVQQD
-ExtzaGliYm9sZXRoLnVuaXYtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQC1XxY06+ZPTDJka2NP1PlhuHEcWC/21H1BsZGGrxbrHlbz
-s4sYedSqLpR3Zt9wsPrkXGnyIenQNG1v5u3UjTSal94cWpkuRJGXHxBzIqFlrgdP
-fFYHn97O4efhzE/vI5tCmX8goWN/o6dTYqCXI2p0zBg/QVmkSWsNbCxj/jx/V2eZ
-70lMqt5HdJKrAEEBx6Tfn1Ru4+8Bq4YovcSMDf72PBvasCxoQVrmeJ9sJhLopv2r
-4+Rp1PTyuHTd1byJCi5/0ljpT83UrTmhJUMwWJxWMA9YMLmOBhIeB6k4/azxdrne
-Dnu9ahLuM9jhzJazuPebmc74IMe17vzclelyx8+7AgMBAAGjggFuMIIBajAfBgNV
-HSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUj3qD3F4yQ3cR
-udqfsQda8hqTZ/8wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
-BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQEC
-Ah0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
-RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
-Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
-AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbc2hpYmJv
-bGV0aC51bml2LXBvaXRpZXJzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQB35DdMvMd/
-G/GOPo1URiKh4LWbGQ1P6AcYNwuhCMr4DZaiQX00sezEizuAjnFjnc/wax3zaESS
-IvpJEuuAM7rIrwLGm9zcKPhbceus9OiMffWENEB0sKT0fAZBsfuO4Q8akk2EfoUp
-sYq3kH65TYG4BLtYzVdY0MkE/fUxNT97YLoVwFgIglQPhvamLi1xFnEc5H/1mLHQ
-Hg1wq8LaDsoAUv1hG6Oalvl56Sa3y9FIhueUv0Z+kNvvTyK9hHtC1iDRyoLANajH
-ag7GwpQkZHUpuTGM1wrdwNJAN7lcXenuuAivqj6wxk11YMxw/38jH2rKtpXyxdnv
-1eZuFfizJq0c
-					    </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-POST" Location="https://shibboleth.univ-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-poitiers.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Poitiers</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Poitiers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-poitiers.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Duthilleul Benjamin</md:SurName>
-    <md:EmailAddress>benjamin.duthilleul@univ-poitiers.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Lionel Lombardi</md:SurName>
-    <md:EmailAddress>lionel.lombardi@univ-poitiers.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml
deleted file mode 100644
index 846c420a..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-reims.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-27T15:31:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Reims Champagne-Ardenne</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAcElEQVQY02NgoBloO5vaf8oPzl00b9f/6t3/56wqBvFcF/fe+7/3f82OP8f+b5kxlYFB+QeQu/t/5c5Pp3/u/H8EqCT8/4szj+617Dz2acf/J6IgTW73353au+fA4SNftvNCTY1ZtH7N2tWTLanlaAC+9DhgiXGMJgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMLubGZsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDUrMDI6MDDKxqEnAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-reims.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Reims Champagne-Ardenne</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>
-					      MIIDMDCCAhigAwIBAgIVAL2jIgsvdHaiW3jhATYWI0XNX8mEMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LXJlaW1zLmZyMB4XDTA5MDQwOTA3MDY1
-MloXDTI5MDQwOTA3MDY1MlowHDEaMBgGA1UEAxMRaWRwLnVuaXYtcmVpbXMuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAzPcBanTJ7Dz5EJtyHuRo
-jH43UwmGsVSmYXYHCBS5dR/OmxClgdsAnFAfLadx37gO4Ib60Rut5Fj8VzMMNZSY
-7QMoxxswchbFWfeQ+Ouo7f78XFlr3uvrREjdBy6wOG9AKpFdoXN1YqDLmSJ8NUXS
-tLHIqfuG1LQuBGvZeFTd8Aq1KluFbUBlDgJeqfXASR+f+NeRhfi4+/neUsmffOJs
-cF4LLR9htO8wAQ5jqT38g6Mef15m2YbvfbamS1K0gJ+xkUHdfn2QEChXgBUEA07e
-BbhhtyO5hF7NdoDwmChrUwOLa19DzvXsq+NtPFXgNyzhrWDWHcxQyNbqif558Agp
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bml2LXJlaW1zLmZyhihodHRwczov
-L2lkcC51bml2LXJlaW1zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTGzm17
-rh/LTbtXmOsK6s5WTYAj4DANBgkqhkiG9w0BAQUFAAOCAQEAVcEL+y4/0UQ7glis
-R63eyvaAwsHWpxxHgCCOeKLzEUI1psi/vysmlWJa5R/EE+yJZqTvUyGEurZLgIJv
-OFxmQBsasPsFKvrvFvwBDuJsC49sYjQeNw30iro9lGNqsqQ9dzVSrGEgqF67uYeV
-3wDkziL1KeqOs+Rx6m6YFRGsDbkZ6iQ9G7PFvD6XbNkKscox94T768AFvF69hVTJ
-L2xmGFNJLLSoZPnMUL2K3EcXychLRIfAzaK0hRvJUrx8HTcHVmdh477BespRaHsB
-/M7dFoRtQlh4cfry/iAqcvigNqzLB2d2cs52M+VdtWuXnG96iRnCQohf1+u6Tnor
-Eby/Nw==
-					    </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-POST" Location="https://idp.univ-reims.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-reims.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMDCCAhigAwIBAgIVAL2jIgsvdHaiW3jhATYWI0XNX8mEMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LXJlaW1zLmZyMB4XDTA5MDQwOTA3MDY1
-MloXDTI5MDQwOTA3MDY1MlowHDEaMBgGA1UEAxMRaWRwLnVuaXYtcmVpbXMuZnIw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAzPcBanTJ7Dz5EJtyHuRo
-jH43UwmGsVSmYXYHCBS5dR/OmxClgdsAnFAfLadx37gO4Ib60Rut5Fj8VzMMNZSY
-7QMoxxswchbFWfeQ+Ouo7f78XFlr3uvrREjdBy6wOG9AKpFdoXN1YqDLmSJ8NUXS
-tLHIqfuG1LQuBGvZeFTd8Aq1KluFbUBlDgJeqfXASR+f+NeRhfi4+/neUsmffOJs
-cF4LLR9htO8wAQ5jqT38g6Mef15m2YbvfbamS1K0gJ+xkUHdfn2QEChXgBUEA07e
-BbhhtyO5hF7NdoDwmChrUwOLa19DzvXsq+NtPFXgNyzhrWDWHcxQyNbqif558Agp
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bml2LXJlaW1zLmZyhihodHRwczov
-L2lkcC51bml2LXJlaW1zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTGzm17
-rh/LTbtXmOsK6s5WTYAj4DANBgkqhkiG9w0BAQUFAAOCAQEAVcEL+y4/0UQ7glis
-R63eyvaAwsHWpxxHgCCOeKLzEUI1psi/vysmlWJa5R/EE+yJZqTvUyGEurZLgIJv
-OFxmQBsasPsFKvrvFvwBDuJsC49sYjQeNw30iro9lGNqsqQ9dzVSrGEgqF67uYeV
-3wDkziL1KeqOs+Rx6m6YFRGsDbkZ6iQ9G7PFvD6XbNkKscox94T768AFvF69hVTJ
-L2xmGFNJLLSoZPnMUL2K3EcXychLRIfAzaK0hRvJUrx8HTcHVmdh477BespRaHsB
-/M7dFoRtQlh4cfry/iAqcvigNqzLB2d2cs52M+VdtWuXnG96iRnCQohf1+u6Tnor
-Eby/Nw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-reims.fr/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">Université de Reims Champagne-Ardenne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Reims Champagne-Ardenne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-reims.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Dere Kevin</md:SurName>
-    <md:EmailAddress>kevin.dere@univ-reims.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Canart Arnaud</md:SurName>
-    <md:EmailAddress>arnaud.canart@univ-reims.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml
deleted file mode 100644
index 1461cc52..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-rennes1.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-19T16:25:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes1.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Rennes 1</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB6UlEQVQ4y92S3UtTcRjHv7+1ae0t6GVG/0Bd6cqmIrbONIw2KUpCiZWzSKGkRLwogi5CCCLDm4IuRjfSTWJBLikiLMvAGkl100VQXXXh2dlLZ7/tnG3fLnSmQlBBNz23z/N53r5f4P8KUgVJUGpr0uq3ejILSm0hZ2ZASjCXXMFYf8IEIKthpt7Baq1wrbdVnujuibYFQ5PMpcY6jnZNbqnyfKyv870nZVSIdQAAsdTA0NAabM9YLELm88ZmALA77G8OhIJD6Ux667PnL+smYuPdQBEo0CVs7gwAWBam59DeGblbKBScZVgIgaye3fXk6dT5/a375shS8NrVkZMAUYaXnUAUC6YXAKo8nqmNmzZ8amzwxaK3R8dVVW1IJucrYg/vbd/bEkq8jscV5jPHRKULSxsAJSj+psveHdX9brfz8ecvX70PYo/OOZ3ODyQxdGX4FkxT89XW9qrzarjndN8lUl+lgK6DzKOz48hIpCs8SiOJ+Ox0W0DxM6D4efHC4AClhpZmxTx86OBbUq5UQTgci8/Ub4JFHTaBnTU1E7ubGgemX8xcn3k1O3zqTP+2UqlkNU3D+LUXEolFScvySkSOh2+UN2kO7OH9sTvB5TW/YTAJmnLt2b7eQRrf7avN9AeNUn8H/tP4AX438DbsXuD8AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA1KzAyOjAwu5sZmwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMMrGoScAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-rennes1.fr</mdui:InformationURL>
-        <mdui:Description xml:lang="en">University of Rennes 1</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Université de Rennes 1</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Université de Rennes 1</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>
-					      MIIDUzCCAjugAwIBAgIUAOfkyDP7IZUpxjLBqzh2u2A52aEwDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAxMaaWRlbnQtc2hpYi51bml2LXJlbm5lczEuZnIwHhcNMDkw
-MzAyMTE1ODE5WhcNMjkwMzAyMTE1ODE5WjAlMSMwIQYDVQQDExppZGVudC1zaGli
-LnVuaXYtcmVubmVzMS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIgsyIsKtRo7oQxJsA+lI4Yr616n8irMvAEkvp22Z3Qp891HG5Jz3g7UMOv0ec+F
-LKRLNWoV6+DkM2TZiAji42ltH9pj5t27JhRZ2RMbpOOi37KYGKjUUSK5AVznwutp
-lvW2p4pYCR8TSuZMaFCxjTz4Re43HYLdH/rS1IjKF8LZPV5ymmHJRIEsC50VPx6S
-LLqEz46AxgNWc15oBEvLeBwHKQVC170RLAsFxUjQeuUXVTwaSpd9mwgkbzH28w6p
-dp3q9uAy2iKWXqLUvCIqTuH9u5+iNhnD4ZOYdFb8wW1Ebkbpsb0Vp6Uh64K60n/4
-Q/+mpg/CVGDdOkFppYFATa8CAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRlbnQtc2hp
-Yi51bml2LXJlbm5lczEuZnKGMWh0dHBzOi8vaWRlbnQtc2hpYi51bml2LXJlbm5l
-czEuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJWD/tJoDhnkOpuBRxm6nBAi
-AwlPMA0GCSqGSIb3DQEBBQUAA4IBAQAnSdwW+9NJWxtugXueUnfSQttGDOUmQIie
-gUHPCRj8VEbPG6upxZnFC/slOfR+dUeP6hIyCIE1pzqjCe8Lmc9wrKvee3nBPnCf
-gXMbzpVCNYXOMM8DhikOdBwGOfCWsK5cdkDVz5OWHv+gU/kgo1mcN6EQI8rzSi0h
-SvwYWTv/BTnA3R/idih2dS8sZDISLsBJnXtIWZTH28S4NX3sttHZSjyALT2nJbLD
-+2Xhef7YCNxkQshmTU9MI7TzdTNBEQS3p82TT9N4oXNVH0WPY3l0YLKBNzQSvNj2
-rkwHcu+LmiqBbNYaIImujo8IZ7laiF30+nPuPGRfCqU7IEjA7cga
-					    </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-POST" Location="https://ident-shib.univ-rennes1.fr/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.univ-rennes1.fr/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.univ-rennes1.fr/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes1.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDUzCCAjugAwIBAgIUAOfkyDP7IZUpxjLBqzh2u2A52aEwDQYJKoZIhvcNAQEF
-BQAwJTEjMCEGA1UEAxMaaWRlbnQtc2hpYi51bml2LXJlbm5lczEuZnIwHhcNMDkw
-MzAyMTE1ODE5WhcNMjkwMzAyMTE1ODE5WjAlMSMwIQYDVQQDExppZGVudC1zaGli
-LnVuaXYtcmVubmVzMS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIgsyIsKtRo7oQxJsA+lI4Yr616n8irMvAEkvp22Z3Qp891HG5Jz3g7UMOv0ec+F
-LKRLNWoV6+DkM2TZiAji42ltH9pj5t27JhRZ2RMbpOOi37KYGKjUUSK5AVznwutp
-lvW2p4pYCR8TSuZMaFCxjTz4Re43HYLdH/rS1IjKF8LZPV5ymmHJRIEsC50VPx6S
-LLqEz46AxgNWc15oBEvLeBwHKQVC170RLAsFxUjQeuUXVTwaSpd9mwgkbzH28w6p
-dp3q9uAy2iKWXqLUvCIqTuH9u5+iNhnD4ZOYdFb8wW1Ebkbpsb0Vp6Uh64K60n/4
-Q/+mpg/CVGDdOkFppYFATa8CAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRlbnQtc2hp
-Yi51bml2LXJlbm5lczEuZnKGMWh0dHBzOi8vaWRlbnQtc2hpYi51bml2LXJlbm5l
-czEuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJWD/tJoDhnkOpuBRxm6nBAi
-AwlPMA0GCSqGSIb3DQEBBQUAA4IBAQAnSdwW+9NJWxtugXueUnfSQttGDOUmQIie
-gUHPCRj8VEbPG6upxZnFC/slOfR+dUeP6hIyCIE1pzqjCe8Lmc9wrKvee3nBPnCf
-gXMbzpVCNYXOMM8DhikOdBwGOfCWsK5cdkDVz5OWHv+gU/kgo1mcN6EQI8rzSi0h
-SvwYWTv/BTnA3R/idih2dS8sZDISLsBJnXtIWZTH28S4NX3sttHZSjyALT2nJbLD
-+2Xhef7YCNxkQshmTU9MI7TzdTNBEQS3p82TT9N4oXNVH0WPY3l0YLKBNzQSvNj2
-rkwHcu+LmiqBbNYaIImujo8IZ7laiF30+nPuPGRfCqU7IEjA7cga
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ident-shib.univ-rennes1.fr/profile/SAML1/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">Université de Rennes 1</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Rennes 1</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-rennes1.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@listes.univ-rennes1.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml
deleted file mode 100644
index b27aab97..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.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" entityID="urn:mace:cru.fr:federation:univ-reunion.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-10T15:52:09Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reunion.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Reunion Island</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACsUlEQVQoz22RS08TYRiF32/mm+mNTtuhtBTaQoFwEVtBAS0SlUgkYWMiG0xYuDGuu/QHuHBrXKBbFpq4MqAS1BgSUxCN2hKQS6BKoRd6ZabTTmc6My40hhie9XNyknNQaC5CIBhpbbjkZQ8OjpZ2MqsVw/x2AU6jmaExArjd5323sPLqxdFieIMrixf9rdNjN55G8v/ZjI70WXW4r8nKJ9LP33y2mYzBM205TohuH9os4YDnfDRd/md32w3trN6qJ4lBt+3D6paTZUYHuiau+Ad6WjqbHR+/bk8HGgCAJlHQY757wem10GaarMgKZvV4L56ZGh8kCaKrwxXsb+v0OT+txyZ7WEaPk7wUjnNcVWH0uCDWoqkSBoTC0d3DZHF0oNPf1dThNLffCja7bJmStJmtuBk64DStHpbcDBXe5zTQcPy4Ikpylit924yPttTJ2V3c6y/wQpGvpUoSJ9bsJooi0LO1HADU0Qgv7+cXZ0KcUJkMzfw61zhkd4CmNTrYHIm8Ft38Vn4jUzm5Fd7LCz7WNBFoe3R/any4l9JqAmV4sJZ+u5s89QoUmosAQHu9acjD5ivaZrby5Etqv1ilSKSomqoBjQmniYoVRIpERkz8DfwhxhHDXitJQEaQE7x01mHMCjUjTSR4KZoqX2+zvN7O4ZN1sYLIVQuSoqYFudtu+JEpZ4RaVVFpEgmysnLAl2UVA4BvJ6ITBQB4KXVodtbN0KoGwx4mVhQ77YZeh3E3L97s1s1GMoe8hAFgbGHWlYoBwHL/nXip1WXVK1x1LUFRJCqrWloDTKIdSTFU1caGFgwApK+dvnYZSPKxUAI1qv5MIr0BGeqV71Fq5KpWFpDZrB4f147iD4fuYQBQ8zl5fRU1ujShDIqiCSXCaoNUQjtKy0vvgSCAIKFaVUURAH4DUkdAsE8XlkoAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDB8O3PvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA5KzAyOjAwDWbLUwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-reunion.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de la Réunion</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>
-					      MIIDODCCAiCgAwIBAgIVAL8dyCz520Rx/kdyqcI4TXpOUd79MA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LXJldW5pb24uZnIwHhcNMDkwMzE2MTQz
-OTQ5WhcNMjkwMzE2MTQzOTQ5WjAeMRwwGgYDVQQDExNpZHAudW5pdi1yZXVuaW9u
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWm8P30Q7FaWJ7EX
-QBT412i9UZUVcab0hEu7aVY5y7Oz8SH4Pmnku33as+c1mMb/VC502aU/znQY3neO
-1uI/b/4w1FCPLbB3ZVz9klXGuj6/HSxWqYwCLbQQBlwpGACXsrTBfu8b3tK+MSYD
-K77TXECDQA2U4PFIKnpuBZB6cgJpBORthkKb3tg+oBeWj14CgMz5+2w1ouuRsQ6K
-GiZXf2z1RiqyODnsDst2ml4RrmQzbDFURJ0gdL6qsaUB+SGJqaabo7iYZZKgK/EA
-9+jzXCzG97jAyTyse00LliLMOc5/fAY5GLhkpVV5/9rt0W9mXbbRV4TGA6iaJGKZ
-9Y6CtQIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1yZXVuaW9uLmZyhipo
-dHRwczovL2lkcC51bml2LXJldW5pb24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFBbec4spkaLKldRGAyIDjSfMSJzNMA0GCSqGSIb3DQEBBQUAA4IBAQBSjuGF
-qqn1aEmcSAArdDkgvmAZbCnvUeZuHUEdXufrZ6JMYGS742f3A6onSAK0WZmyg0Tf
-bS7YQhEdR3NwlFNhkoCCY0IewEp1pRuKxE+u8VD1372JLCOtIRWTgxvc/VPDdw0C
-UjQmucMfyAn+/mNiR4XRPqOYm1BXvM4RDwTTmYKvaWhUAjnFgr4LTckjS4z6nMfx
-hYC3u9/xmqRAR2bDXeRB4poDfLVXfGKureDZPWw72aPvzjJ4XGf/aaHI3AmL5zmR
-gBZQE0UE++9BzuSgkbANei54g+uo5zgXNgeJT15B9waWhUpo8AMbzOKpXgmCAp51
-FChXMMiPA+POOLIC
-					    </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-POST" Location="https://idp.univ-reunion.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-reunion.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-reunion.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reunion.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDODCCAiCgAwIBAgIVAL8dyCz520Rx/kdyqcI4TXpOUd79MA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LXJldW5pb24uZnIwHhcNMDkwMzE2MTQz
-OTQ5WhcNMjkwMzE2MTQzOTQ5WjAeMRwwGgYDVQQDExNpZHAudW5pdi1yZXVuaW9u
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWm8P30Q7FaWJ7EX
-QBT412i9UZUVcab0hEu7aVY5y7Oz8SH4Pmnku33as+c1mMb/VC502aU/znQY3neO
-1uI/b/4w1FCPLbB3ZVz9klXGuj6/HSxWqYwCLbQQBlwpGACXsrTBfu8b3tK+MSYD
-K77TXECDQA2U4PFIKnpuBZB6cgJpBORthkKb3tg+oBeWj14CgMz5+2w1ouuRsQ6K
-GiZXf2z1RiqyODnsDst2ml4RrmQzbDFURJ0gdL6qsaUB+SGJqaabo7iYZZKgK/EA
-9+jzXCzG97jAyTyse00LliLMOc5/fAY5GLhkpVV5/9rt0W9mXbbRV4TGA6iaJGKZ
-9Y6CtQIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1yZXVuaW9uLmZyhipo
-dHRwczovL2lkcC51bml2LXJldW5pb24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFBbec4spkaLKldRGAyIDjSfMSJzNMA0GCSqGSIb3DQEBBQUAA4IBAQBSjuGF
-qqn1aEmcSAArdDkgvmAZbCnvUeZuHUEdXufrZ6JMYGS742f3A6onSAK0WZmyg0Tf
-bS7YQhEdR3NwlFNhkoCCY0IewEp1pRuKxE+u8VD1372JLCOtIRWTgxvc/VPDdw0C
-UjQmucMfyAn+/mNiR4XRPqOYm1BXvM4RDwTTmYKvaWhUAjnFgr4LTckjS4z6nMfx
-hYC3u9/xmqRAR2bDXeRB4poDfLVXfGKureDZPWw72aPvzjJ4XGf/aaHI3AmL5zmR
-gBZQE0UE++9BzuSgkbANei54g+uo5zgXNgeJT15B9waWhUpo8AMbzOKpXgmCAp51
-FChXMMiPA+POOLIC
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-reunion.fr/idp/profile/SAML1/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">Université de la Réunion</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de la Réunion</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-reunion.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>dsi-si@listes.univ-reunion.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml
deleted file mode 100644
index 9f2ef8c4..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.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" entityID="urn:mace:cru.fr:federation:univ-rouen.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-20T15:48:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rouen.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Rouen</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QAAKqNIzIAAAAJcEhZcwAAAEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAADfSURBVCjPhdHBKoRhFMbxn7eRRlJjQSlkY2+lWbkFG9aWcgGuQCkLxQXIxk5cwqxcABbExo5mYmH0NZPGsZivb3w0PGdxek//97xPz8uuc1XsCyG8WMaqTGg7SHZMCQPFt9OE7WTUXxpL/lHl1yR8gsy9dwuVIRebtjR0zA4D7tyChwEwUvSEMGfTjJsB0Mp7V4ZJR9bQI1ybxopnIZypou4tD07oWEey4dieRYokcyBcWvphsgD6HuounGhoqpp3pVkOpl89rx49aamXN2TGQVJTQ7v01EdyKBv6EV2nX1OIUOUJ197xAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjA1KzAyOjAwu5sZmwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowNSswMjowMMrGoScAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-rouen.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Rouen</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>
-					      MIIDLzCCAhegAwIBAgIUWvf6hiSiI4KjS/n+xqAFPbKt2r0wDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtcm91ZW4uZnIwHhcNMTEwNTE3MDk1NTQz
-WhcNMzEwNTE3MDk1NTQzWjAcMRowGAYDVQQDExFpZHAudW5pdi1yb3Vlbi5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIxi7qpcaAsjhQquoELWUEsz
-PZGyg/5lT6KAAfryX17brdK0cQytLZXyqCOsCSYDi8T3dJwrEKUfzMqf4Rvxhzve
-fFB6fz22+RkLHezLuywNpICo3qBntqY9ZiIgBV4X2AS6jt5Szbm18qSL5xoxQ+DA
-93WKffpCeE9eELWRnu5RKxXam10JBUEMfLxEY+e8ToOcoAU8n/nC7ytE8ReXwcWh
-/eqyt3Usf+MwG6qAPNvRvG3quKEcF+7fbpU4RmZz+na49OLoLhoHCyWHdmmL4lIw
-U2jRo+7IjD3DJMG3pUjqnKbsLrhyk4McwuN4TCiC2KhKWGFSnzXcjNfcYZsK3MsC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnVuaXYtcm91ZW4uZnKGKGh0dHBzOi8v
-aWRwLnVuaXYtcm91ZW4uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJZ4dOPm
-rji8bFb79aNq2VybCh8RMA0GCSqGSIb3DQEBBQUAA4IBAQADYQEXRdgzmhCNw3RI
-4NCayLgtaaCdwG/sYEzxXss5CQ2t8jRn1yQpXxoGSwtROZM/w/L8gtWjSpUSB8av
-cKdAZBRB5ojESTkd28/tv3jtA1bjt6OeZwjsCr0RRMBN2A12t4BLfSG7VAKGyE+B
-dQ8p2l7xN23XN9sIAxJNcxtK7w85Or6Y8C9iwApqhMihTLWLQPQGSM1pRUKHTInI
-XgsbhADqatOXXzkizis9PK9Tf8jFSl9Hcye3gJrgYnn3F7qxvMGzm1KqmsAG3Xnr
-yxCa3HYJJd9oze0GYQ3AyxViyin1T4daHyQVMRlC4rjCpVd2f0gp6zX37uF8/i4z
-jf6+
-					    </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-POST" Location="https://idp.univ-rouen.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-rouen.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rouen.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDLzCCAhegAwIBAgIUWvf6hiSiI4KjS/n+xqAFPbKt2r0wDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtcm91ZW4uZnIwHhcNMTEwNTE3MDk1NTQz
-WhcNMzEwNTE3MDk1NTQzWjAcMRowGAYDVQQDExFpZHAudW5pdi1yb3Vlbi5mcjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIxi7qpcaAsjhQquoELWUEsz
-PZGyg/5lT6KAAfryX17brdK0cQytLZXyqCOsCSYDi8T3dJwrEKUfzMqf4Rvxhzve
-fFB6fz22+RkLHezLuywNpICo3qBntqY9ZiIgBV4X2AS6jt5Szbm18qSL5xoxQ+DA
-93WKffpCeE9eELWRnu5RKxXam10JBUEMfLxEY+e8ToOcoAU8n/nC7ytE8ReXwcWh
-/eqyt3Usf+MwG6qAPNvRvG3quKEcF+7fbpU4RmZz+na49OLoLhoHCyWHdmmL4lIw
-U2jRo+7IjD3DJMG3pUjqnKbsLrhyk4McwuN4TCiC2KhKWGFSnzXcjNfcYZsK3MsC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnVuaXYtcm91ZW4uZnKGKGh0dHBzOi8v
-aWRwLnVuaXYtcm91ZW4uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJZ4dOPm
-rji8bFb79aNq2VybCh8RMA0GCSqGSIb3DQEBBQUAA4IBAQADYQEXRdgzmhCNw3RI
-4NCayLgtaaCdwG/sYEzxXss5CQ2t8jRn1yQpXxoGSwtROZM/w/L8gtWjSpUSB8av
-cKdAZBRB5ojESTkd28/tv3jtA1bjt6OeZwjsCr0RRMBN2A12t4BLfSG7VAKGyE+B
-dQ8p2l7xN23XN9sIAxJNcxtK7w85Or6Y8C9iwApqhMihTLWLQPQGSM1pRUKHTInI
-XgsbhADqatOXXzkizis9PK9Tf8jFSl9Hcye3gJrgYnn3F7qxvMGzm1KqmsAG3Xnr
-yxCa3HYJJd9oze0GYQ3AyxViyin1T4daHyQVMRlC4rjCpVd2f0gp6zX37uF8/i4z
-jf6+
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-rouen.fr/idp/profile/SAML1/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">Université de Rouen</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Rouen</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-rouen.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>systeme@univ-rouen.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml
deleted file mode 100644
index c46b568c..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-st-etienne.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-17T14:19:31Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-st-etienne.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Saint-Etienne - Jean Monnet</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAABvUlEQVQoz7VSvY4SYRS9d2Y+vmGGAcRFFxZConELoxs1FsbWysLCF7DWV/B9fAwbbSxM1JjVQHRXZEFgFxCGme935lqYkFUrCm937z0n5yTnIBHBNuNshQYAj4gQ8dyFlM4SZZS2RMQ8N/QLRe5tMJjn+e8ly/PTn0l/smAeRkXuc4YIxuarVAppr7XqF8sBAHiAAADLRPZOTkWq7uy3SyH/18n7LydS2b16GYnys2XaG0wDZA7iMlaD0WKnFl7f3201quc5b7uDg6tNRyjbny6YcTzXHU1Wt2/s3T1ohwEfT1d/iexUAiENHo1mmbHzmRiOV48f3ty8X77uHg8WvOCuU/PsyX0A+Px90rl0wYulNCvbblY5L4J+AQyePi93GsVWs+Jzz5hMCA0AJsvWQhc580q+zwIY/lhGkf+ue28Zi0cPnE6retyfo4vMc5mLZ/N1bzy7daWBiCC1efOpbzJLRFpnQhqpDBElqZbKKmU+fh2++nCUCk1ERIQ55VLZw28TXnDqlVIUcuY6UttYqEWcxonuXK7t1iLH2QRHOQISUJLqeSziVNks58yLAl4p8dAv/NkDwP9evq0JvwB5p+5AaVPc7QAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowNiswMjowMIpzAwYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDYrMDI6MDD7Lru6AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-st-etienne.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Saint-Etienne - Jean Monnet</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>
-					      MIIDODCCAiCgAwIBAgIJAKRhyHl9TUy1MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMTFmlkcC51bml2LXN0LWV0aWVubmUuZnIwHhcNMTQxMjExMDkwODE5WhcNMTcx
-MjEwMDkwODE5WjAhMR8wHQYDVQQDExZpZHAudW5pdi1zdC1ldGllbm5lLmZyMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4eKLfLM95OgfT/AudFYKlqnL
-C+ByQ2Kij4dnWoRnHiY3aInQzpkEQSg4gQxm8vNLLV+L3NlNHKEBkMY51aAicrRp
-AwwkiPgNOpSwNf6sE12FFvSqvDy3xsoVgAxbgXbUGP6sCqmbXSlEOQ/ubY3Ss+UT
-zWewDUbMDNm89D6ihHlafuFI21OOOT6qAgvhyvATMK0qJDbobZjDNMAdTBhxdEaN
-gv2QidHj1ITj7GHWRZ0z64yrhMu4ti/ooUJB5yP81AaKJonk4Fut+ljCuMZA6ARY
-A8GgJLuV62ou+03SH5RJb+JaK5qBzZ1Y2fxo++hwutOzNdKbMPoawNg8GIRbRwID
-AQABo3MwcTBQBgNVHREESTBHghZpZHAudW5pdi1zdC1ldGllbm5lLmZyhi11cm46
-bWFjZTpjcnUuZnI6ZmVkZXJhdGlvbjp1bml2LXN0LWV0aWVubmUuZnIwHQYDVR0O
-BBYEFF70lFwBQN8lPT449YrrNS0gch1nMA0GCSqGSIb3DQEBBQUAA4IBAQAD4/dl
-Zmjnh27+8G/0U4yVM9UHvrFdCZjHBWwaWm3l+ON1E+JuouxqSf2WI3P6iJUnv/++
-MD1iMaS0MI/mL2atsYgw2QBUE3kgLBNQLulefkdguZh/MziT6TDf7dtcjMza0quA
-gSjSFxAP1DpnOX9YzLoNHfg7rWhlzjZmgtBWq/TDVTMIKHMn+xrptyNB2nzeiQPQ
-y+sDX87f4KU2fKpVjS1OOZv1a9f+U9wRnOXjuTVVr50lj4YdjzVq5g9TGxF3n8Qk
-3My8dpA9BiKR9vHvNPiGJPfruPZnK6WpjX+Q35KHrKNCquj5L09GW3OviRgRkUlu
-8CBvzFGfIhN9GDZ3
-					    </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>
-					      MIIDWDCCAkCgAwIBAgIVAM60eJPNg42CHzM+jgGiPUF8XxVEMA0GCSqGSIb3DQEB
-BQUAMCYxJDAiBgNVBAMTG2lwZC10ZXN0LnVuaXYtc3QtZXRpZW5uZS5mcjAeFw0x
-MDAxMjcxMzMzMTNaFw0zMDAxMjcxMzMzMTNaMCYxJDAiBgNVBAMTG2lwZC10ZXN0
-LnVuaXYtc3QtZXRpZW5uZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL/9p3g2bat/dj9BdEBKhJMfh6ruQAb/WENj8VDd69vd0qlg7gBFdcUAlrWu
-lWbGxIGSike4JKk/BflJvJsOw56tqdVOgX574nhz74t7wq3bb4oy4+z6QBU4D4fi
-s81DGmDlYLM+99wTXEeXu6U7MYUoHve76yRLP3tJ/JupT4JVmfWLbmfWpWdaIXTu
-GIMhPPuZ+tlZyVMUy4Yisj1+hxJkC0XbZ/Tt0k/U6ibmFw2RgMZ4e9I/F5XAAuIL
-ntj94ucDfkak5IjzdazgL2hyPhRs5HCl8fM02xH3Hiy54o6/ol4Bht3KUotnQ7hf
-dYDxIxHdAkHqDx7rQuSpyTSZckECAwEAAaN9MHswWgYDVR0RBFMwUYIbaXBkLXRl
-c3QudW5pdi1zdC1ldGllbm5lLmZyhjJodHRwczovL2lwZC10ZXN0LnVuaXYtc3Qt
-ZXRpZW5uZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU71M58iX9SWskgRx3
-iaqLJvvFm+swDQYJKoZIhvcNAQEFBQADggEBAKcebag8459paefinfIIkTj5eZPx
-7PMt8G3Qn2wdSOCdUqi+wB/ouR9R005RJe2MEZgixUNc2umwTZuO3MR5Rc4+TjyI
-XzRKyPJ2OmxEL3ly8pKUd0a3fXJZTOikICLLYezOdV2V/QLheIvMfZlhZ1uUhVGB
-0uoJRHu/zdhfGClj4eYML47y5EanadjY3nQ91GcDYxFeEFIGtcy+xp+CbEeFeqEH
-J/tcRGvcPSvO9TGVGz+0YVsDmcGrfiHcokztEZ6Z7ADLep/iXMTpS331wYizQ7Oc
-I5j1CmAlzfvcYGPy6fOMCjINmd75Sez4RvGbVAQE/tRIM+6ButzQ6Lymrk4=
-					    </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-POST" Location="https://idp.univ-st-etienne.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-st-etienne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-st-etienne.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Saint-Etienne - Jean Monnet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Saint-Etienne - Jean Monnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-st-etienne.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Murgue Thierry</md:SurName>
-    <md:EmailAddress>thierry.murgue@univ-st-etienne.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Valeille Jean-François</md:SurName>
-    <md:EmailAddress>jean.francois.valeille@univ-st-etienne.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml
deleted file mode 100644
index 67786d60..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.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="urn:mace:cru.fr:federation:univ-tln.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-28T11:55:09Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tln.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université du Sud Toulon Var</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACJElEQVQoz32STUiUURSG33vPvfPN3zeW8SWOyZAomFrTBGFJC0NN0kJKiKBW1j5atCmDBoooWwYJLUKoRcZAJJn0A1ExtShRQUT8gagpLEPImnF+7r0tpszJ6nAWB877HN5zOOz83eH6qvVNNWXRe6PSaEEc/4iM0q21QdH9ZBIPJiqDgUsdW2/Hp/tHEnAR2N+ItAoVeThJIp+cXkh29j5LKX1oZwUswSWRJJIEAwA/a0nEmcjDxBm8cmBmHtqU2O65ZIYYVEb1tNdlcurMwwmSlFcWOCbOSPC8GgByujUSag6XI6eXNWK1Vfq1AHnllnMDYCCP/B+gTAHzR5cXSo1SutRvKbNqijaA+Q0YQGVUuNjfVhP8uLhEDCsZZdBeVYKcySrNASildTIb3VtbFwwMjr0XxJVB0HavZO5Pf755vKElEuIqmd1dXvz0VEv/67e3ht9VO/5QkQdp1VblQOsVpszR3uevpubEnWMNTpGn8cpjCFbt2PWVTl989nC4bOF7enmxinX27PxXuGUqleZTnxYbLz+Ciwd81tl9m/tezEDpE3tqY2MfeP6vNCKOb2PAA2MYGD89NA6/C0LETzYfufESFlVvWON1EbTJ35aIxUYT0f1hJLMABIjDsC8XOnZcHIJgSKurndvi4wkQU8v+GXLJpQPby5XS3Odzfes52B17M7WYst2y2LGbNpVeG0lYPtdaS+QzYFtdgxPXu3blGPsB3tjPFvOp0QsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTUtMDctMjBUMTA6NTA6MDkrMDI6MDB8O3PvAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE1LTA3LTIwVDEwOjUwOjA5KzAyOjAwDWbLUwAAAABJRU5ErkJggg==</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-tln.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université du Sud Toulon Var</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>
-					      MIIDQzCCAiugAwIBAgIURrZcRMW1GJitmEg2t0KC308pj88wDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWZmVkZXJhdGlvbi51bml2LXRsbi5mcjAeFw0wOTA5MDYx
-OTIyNDFaFw0yOTA5MDYxOTIyNDFaMCExHzAdBgNVBAMTFmZlZGVyYXRpb24udW5p
-di10bG4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv3ysyMoZY
-CtKudxYcuuSgnBe7k0bF/kNt+EeszFZt7XviNAi50wIAvqt0J4yd43v1SJ9rL2XD
-pWeC4Xdxblp0yn5DVqnSbmM9ySSocYEhZK32Jo2qidk3KB981R1GaSE74DNxSC5F
-MxnNq39Jx8tDEGi+9sEXLU4nRqkznuB0NiDIprehTk5nrrH8LyiC4mBVnTWHlaVN
-oycrr9bfVm/4lXePYEBQFec1q509Mdi6v9+8rb/WSVXEhmmjtKAJGm1Sx3mi2GlY
-o0cMIraJqYMyKxy6y4uLzx/EpFxjDD1WG4w9qz47BXJ6yELqZftPfSrYyuhxV0u3
-3kGdY9pn6bpvAgMBAAGjczBxMFAGA1UdEQRJMEeCFmZlZGVyYXRpb24udW5pdi10
-bG4uZnKGLWh0dHBzOi8vZmVkZXJhdGlvbi51bml2LXRsbi5mci9pZHAvc2hpYmJv
-bGV0aDAdBgNVHQ4EFgQUlfrA9u+WyKMcIN3NB1/XDYtdLl8wDQYJKoZIhvcNAQEF
-BQADggEBAATpBMb4mUELL5uZ3FvMdEtGK23nRU8SSTmqt3rypazcMlWevgq60mHm
-CBD4E+bFvvKMAWUx3+jpQzbV2M7I2OMto95G4MVTEnr+vugeQHEDcWIBUo5yjLb6
-4qDZ8YWBmzSE/iV8Pbx+6RsLgPcTfXzbClZO/stfspDJhwCrLuMv36xCQcm88Y5Z
-eHcjM5wZ+FrykOxUsv663wJowcCE0aRkAUnyg1rUfYy4sRJh3EP/MXQpb4/ePTCg
-lAu3e0usivWcDm0/WX2N6oA9cp0sUsegYtoBY7tmPtml4yMRODG7ZSDqUmLlB3PZ
-FIrOgN1sOW6bInYYilkc/7jjHW5T6AQ=
-					    </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-POST" Location="https://federation.univ-tln.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.univ-tln.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.univ-tln.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université du Sud Toulon Var</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université du Sud Toulon Var</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-tln.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>federation@univ-tln.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml
deleted file mode 100644
index bda0d047..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-ubs.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-09T16:11:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-ubs.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Bretagne Sud</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC00lEQVQozy3BT2wUVRgA8O97b2bezra7s7O7/bPL7qxaNSJNJmDVRLMpMfSER2svguGi3nognrh6qIkB0hAPLSSGUiWhGuMJL4IGEQ+CbOTQIimNiW3JLDvsdHamu++9z4u/HzbfahJSL0qAaQIADf9DICAkRABkPCMEsxhoMAAhSfYvfHkhYwsCAgAEBAAiymQySZowxuI4vrh86eHf68LMGsDIYGYUd8+cWbAsC5H1env9/kCYwi25pmm2220AUFIzzrVWBgBwzrb/3d15ssM5HymNHj/+rn/Y9zyv+6x75/c7ly+vuE7RcYafhiExbQCB1rpQyJ/68JR/xB8tjd64+fPKVyuIrFqrKqkqY+Pl8khueLjueZuPNxkoUFJ79cbQUG55afnEByeFsE5/enp27v3JVw+ZpmHbthCWsIWTz7tuAZtvN4FRN4wIaG5ububYzPUfr3//3Q+vTR2emprqhJ1ra9fcvGuZVtSLlFQGIACgk3MkycebW/Pz8wW38MXZz3N5p3W/9eCvB5r0sygEhVxwJMRmsymV7PcGpmU+/8Jzvu9/9MnHq1e+Xvhs4YBXeeP1NyuVqtYqSdKnnSDuxXDwlYOz782uXllt3W+FnVBKeeOnm8femVlaWtpY30iTVClFREQU78VhGGIv7gHC9vb2o4eP1r5du/XLLf+Iv7i4GEV7v/16++o3V7e2/tFSuyWnWqsU3BKeP3d+fWO9da+Vpn1ugsHMglt86eWJu3/8GcXdbMZWpBgyBswwzf1+yoMg2NndqVZqwjbHyuNpuu+4uYbXqNXrQRCAhunpo0KIsBNpkJxxZmdtzvn42EjRLdbrNUPwfN7JDmXLJbdULiIyreTEixONhqdBA4IBAAzZbvBk8tBkRmSSJEmSJI7jwWAgpdqXSdBuZ3NDzGBAwDjH6eZRAJByQJqQcUQCAIMbWmsiINCGYZAmKSXjjCH/DwooS6x9sQOOAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjUwOjAxKzAyOjAwT9Q9iAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo1MDowMSswMjowMD6JhTQAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-ubs.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Bretagne Sud</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>
-					      MIIDJzCCAg+gAwIBAgIUQf+bgYI+pflZTXe6Sw+Ijq7sDuwwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLnVuaXYtdWJzLmZyMB4XDTA5MDMyNjA5MzUxM1oX
-DTI5MDMyNjA4MzUxM1owGjEYMBYGA1UEAxMPaWRwLnVuaXYtdWJzLmZyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzjVVD6f/m26YrFIXqyAhIIZOl5Jy
-KT/06NrJReinTL27+4mGRcK2Hy3CN412n3FLUlSra1E+1KtgdSXLGH0aipopxsF1
-4tNnr7XUGzX3jYLwEf9JAvMjkrmfg6XV+tRM0aEVhbk6T/0kSUVSu0OuY1OtnWMX
-tEOI5lxBIFiiF2IjkzXfT3IXtn43BLurAtwGEjVcU/h9p4XKAv1vXDnSZIYMV68h
-Rfnt37Jbk4MOZC5G/b6ruegAWylpZ6/xd3eToWiTf6jf7cTL1rvVCBshyumkgF1z
-GUzmsUPIieAO2K1cAj6YSYO39Ya+TSpwmeGHfHU2ptmm0Pg+3FgVcQd0vQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAudW5pdi11YnMuZnKGJmh0dHBzOi8vaWRwLnVu
-aXYtdWJzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRJzRQHNoeR8yfWTVGV
-cZxCUNFlVTANBgkqhkiG9w0BAQUFAAOCAQEAoKKviDAjDppeG/HLfBnHEGk3huwy
-QS7vwSXR8iQCkJeFzYJbQNW3C0pZ3gbTjXEwR8a7zyLm08LNTJy1b03oHEZvLf+5
-ozxzL0Sj0L8eH/Edra2le2VYp7OpAIKXbktQ7tov7OrNjwvnEThp4emd6ffMNKBy
-tuagpJOU3yH1CJ1aV9Za1cvobQJryWlwGgvw2Z2ALFs5/BT435lBJbMjuNAR9mC8
-GKrzVJxuCZuaFkCNIGIA2lPmHA755Vf5rKi2/4A+qBzN9XJc1RBzTlg9PF1WQzb3
-KsqVsaQhhLja8zwz5NlpcXN89WMIL/Bg6T3t5KN4ajbKbWxX/7uMAVsEUw==
-					    </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-POST" Location="https://idp.univ-ubs.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-ubs.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-ubs.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université de Bretagne Sud</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Bretagne Sud</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-ubs.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@univ-ubs.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml
deleted file mode 100644
index aa7319c2..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-valenciennes.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-17T13:52:02Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-valenciennes.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Valenciennes</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB2ElEQVQoz5VSS2+SURCdmXs/nqXlsyWA1NDWqhF1oy6Mj61JdeEf8L+xd68rFyY1JuJjIbGYGINWKBLQRguF8t07xwUNQU1MOsuTmXNm5hwGQCcpS0QAmHkenSIgMPEM8XAE4pkCAECJWVjmWRTq1QUmNm1jANOZmYhXLyzMrFBVb01ARJEe9Q72oGAAChUWr957Z8QaY1QVBBFhYq/ucDLoDnb39pvqYGd7R27S6jUVfq1wPjAx750R43TS6L5+13peypy7uX7fWLaq6rzzGhkJEkHqaeNR83vj9oWtdCLz7eDLi+aT9o+PaRvmiquxeOz4hvn/fOrXtxuPC9nyqcWVD/3a6HB0uXBjbbkSpnPxIAmAO51Ou91OJpJK2u10y6sbn3/V6z+f9SetUmZzq/JwfaXyhw8va7WdnfeLmUUmefP2VeXKpbt37o3z++lB5lbpQTm86DRS9YGJMzMArlarYRgCGI/HTAzC2Y1Nk1QjQbi0TNYVc2cCE6iqiBCRDbNZY4xzjphTqXQ2u/S1tTsaj62Y4unitetXrVhVnbnEvV4viiIiUkCYksnUcDicREcKXUgt5POFv7LD/w8foER8vD0zEVnv/XzgmFlVpywiYow5mcK/9Rvn6g+oQ1JefgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.univ-valenciennes.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Valenciennes</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>
-					      MIIDTDCCAjSgAwIBAgIVAJ08QHO7V9BoMbcBRHL2N0BzYGEIMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMMGGlkcC51bml2LXZhbGVuY2llbm5lcy5mcjAeFw0xNTA4
-MjcxMzU4MDFaFw0zNTA4MjcxMzU4MDFaMCMxITAfBgNVBAMMGGlkcC51bml2LXZh
-bGVuY2llbm5lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMlp
-fwIQN9r7CrX8PbORqQ2zzrzxcFbUlvh4nvXA8qZRScnNiInLff4TG8e+NQoisTbV
-tCHQJWi5YCyvjPN6pdNqYKM03153vOCGXObcmAfhuiz5/9mD+EoWZudaddxYFzYv
-Cht2naCb6VH6kR18bgMcuaFdy3fI1xOJhKWkdLmkAcxyYoi9ZDpFV9GsV4MByzZb
-UthMKeCFqSnfuWIV2dN0thn/Uu7aGl+vLKYh5IqcqidMBbLPTIOFk26YF1UNo4CI
-J7+Rtn8zCN7Tb6yhHGsPSgz22jZkYtk0M3qOOXd+94wyr+RzoTcsIR+aka9HfZI0
-hTKrIONR332e3zyUneECAwEAAaN3MHUwHQYDVR0OBBYEFEpUM/y3cq8LWhJ63YY8
-XcQiZes3MFQGA1UdEQRNMEuCGGlkcC51bml2LXZhbGVuY2llbm5lcy5mcoYvaHR0
-cHM6Ly9pZHAudW5pdi12YWxlbmNpZW5uZXMuZnIvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQEFBQADggEBAC8QdCix58U4JyZVEX30cqHCWvbnQAW23eLFC9Wzzbae
-vU80GchqtO3xUQEwRXOoSms6ZC3eHmFLuMl2NtnTKTDMGbOSBYXDdJa8ks0Xctba
-UHvcFYBCZoeO/ZoeNfA5Q6rs59yf6CGddF1CT0LdSCa3W2tQ1ksz5+/rWoCYXfp2
-/FogjxPkL0v5vK6z7QsEeYhLsKe9uUpHrYdm9UN6iCBLc71g9Zyxh8zNoVleQ9Q2
-KHJkTmG701axl/BxOJwyOYz7dscQr3dvK6BnFxAEAFx3xDvB9xEJnXnsnh0g9xK6
-xSnpvawSYkjwVqPeJcD49c5+suFyql7UIF18xWjCk+c=
-					    </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>
-					      MIIDSzCCAjOgAwIBAgIUf/+c8ye6SzH67ieu864mtMPYXlswDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyMB4XDTA5MTAx
-MzEzMTA0M1oXDTI5MTAxMzEzMTA0M1owIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFs
-ZW5jaWVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhhYP
-J3k8hdOdhcye6mC5zPykjAy9JesMuIR/AYr+tWUpeYNbQeVPyMiqQduhBO08Z1Tz
-sRV/hsuIYv3eD5O+DXFn6U+sY63CzxQrIQ1SC+hIMlzdw7yvdnlkBodgZg6J7LjF
-bpJvpwhtFp84cxy0g/s6oUy/CUg4gMWwnsoah+dacay1GSvqOHo1lu9pdptHmK7h
-VGL5DAsw3Mt3Lb5KK9DlLffd6umayoI9f7Gt8Kouxa1HURuiebxRHmDDJXdzNZ94
-6IzRoFE3SUi1z3iGVDv8TDp1XLSUhNdYR8Plm84GHs03F3hIU1MKxEscFTd/U4zs
-hqKfK/mRqE7OvydIRQIDAQABo3cwdTBUBgNVHREETTBLghhpZHAudW5pdi12YWxl
-bmNpZW5uZXMuZnKGL2h0dHBzOi8vaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBTNbFHRtwU+XlpYz+rxvTgavdfoJTANBgkq
-hkiG9w0BAQUFAAOCAQEAb+WTNz5aJNRd/eYTsbgcd/zQLxPssQUgIfW35D2l37r5
-uUI/lTvzCS/XGjleZirVlg1I2BcuLyKNXbyc29OYjWXABBZ3pGX4BD3K+/xEMGwN
-XMQWw4ZdDDfU9Q7jqRog9WIuOcTb/7fRthOOdRPxOnUdl+XfpAqcqpYGPnqX+mXk
-VRZHYIjjVYLKY1Ye3jUPg3n4/hldWYSy2TxMlMbudAV01tb5jzz3k4c/AwzA5Q9i
-sch9WHg5TO5d2L1B6b44aMkefP9u+GBNaLZx1B+hb2b6ZCkxHojPHVeUSi1Hpz17
-lHNKGM/S8lXO2ADLPujRZnzHaBVAwxxAlSgX+PHvqw==
-					    </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-POST" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-valenciennes.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-valenciennes.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDTDCCAjSgAwIBAgIVAJ08QHO7V9BoMbcBRHL2N0BzYGEIMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMMGGlkcC51bml2LXZhbGVuY2llbm5lcy5mcjAeFw0xNTA4
-MjcxMzU4MDFaFw0zNTA4MjcxMzU4MDFaMCMxITAfBgNVBAMMGGlkcC51bml2LXZh
-bGVuY2llbm5lcy5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMlp
-fwIQN9r7CrX8PbORqQ2zzrzxcFbUlvh4nvXA8qZRScnNiInLff4TG8e+NQoisTbV
-tCHQJWi5YCyvjPN6pdNqYKM03153vOCGXObcmAfhuiz5/9mD+EoWZudaddxYFzYv
-Cht2naCb6VH6kR18bgMcuaFdy3fI1xOJhKWkdLmkAcxyYoi9ZDpFV9GsV4MByzZb
-UthMKeCFqSnfuWIV2dN0thn/Uu7aGl+vLKYh5IqcqidMBbLPTIOFk26YF1UNo4CI
-J7+Rtn8zCN7Tb6yhHGsPSgz22jZkYtk0M3qOOXd+94wyr+RzoTcsIR+aka9HfZI0
-hTKrIONR332e3zyUneECAwEAAaN3MHUwHQYDVR0OBBYEFEpUM/y3cq8LWhJ63YY8
-XcQiZes3MFQGA1UdEQRNMEuCGGlkcC51bml2LXZhbGVuY2llbm5lcy5mcoYvaHR0
-cHM6Ly9pZHAudW5pdi12YWxlbmNpZW5uZXMuZnIvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQEFBQADggEBAC8QdCix58U4JyZVEX30cqHCWvbnQAW23eLFC9Wzzbae
-vU80GchqtO3xUQEwRXOoSms6ZC3eHmFLuMl2NtnTKTDMGbOSBYXDdJa8ks0Xctba
-UHvcFYBCZoeO/ZoeNfA5Q6rs59yf6CGddF1CT0LdSCa3W2tQ1ksz5+/rWoCYXfp2
-/FogjxPkL0v5vK6z7QsEeYhLsKe9uUpHrYdm9UN6iCBLc71g9Zyxh8zNoVleQ9Q2
-KHJkTmG701axl/BxOJwyOYz7dscQr3dvK6BnFxAEAFx3xDvB9xEJnXnsnh0g9xK6
-xSnpvawSYkjwVqPeJcD49c5+suFyql7UIF18xWjCk+c=
-					    </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>
-					      MIIDSzCCAjOgAwIBAgIUf/+c8ye6SzH67ieu864mtMPYXlswDQYJKoZIhvcNAQEF
-BQAwIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyMB4XDTA5MTAx
-MzEzMTA0M1oXDTI5MTAxMzEzMTA0M1owIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFs
-ZW5jaWVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhhYP
-J3k8hdOdhcye6mC5zPykjAy9JesMuIR/AYr+tWUpeYNbQeVPyMiqQduhBO08Z1Tz
-sRV/hsuIYv3eD5O+DXFn6U+sY63CzxQrIQ1SC+hIMlzdw7yvdnlkBodgZg6J7LjF
-bpJvpwhtFp84cxy0g/s6oUy/CUg4gMWwnsoah+dacay1GSvqOHo1lu9pdptHmK7h
-VGL5DAsw3Mt3Lb5KK9DlLffd6umayoI9f7Gt8Kouxa1HURuiebxRHmDDJXdzNZ94
-6IzRoFE3SUi1z3iGVDv8TDp1XLSUhNdYR8Plm84GHs03F3hIU1MKxEscFTd/U4zs
-hqKfK/mRqE7OvydIRQIDAQABo3cwdTBUBgNVHREETTBLghhpZHAudW5pdi12YWxl
-bmNpZW5uZXMuZnKGL2h0dHBzOi8vaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyL2lk
-cC9zaGliYm9sZXRoMB0GA1UdDgQWBBTNbFHRtwU+XlpYz+rxvTgavdfoJTANBgkq
-hkiG9w0BAQUFAAOCAQEAb+WTNz5aJNRd/eYTsbgcd/zQLxPssQUgIfW35D2l37r5
-uUI/lTvzCS/XGjleZirVlg1I2BcuLyKNXbyc29OYjWXABBZ3pGX4BD3K+/xEMGwN
-XMQWw4ZdDDfU9Q7jqRog9WIuOcTb/7fRthOOdRPxOnUdl+XfpAqcqpYGPnqX+mXk
-VRZHYIjjVYLKY1Ye3jUPg3n4/hldWYSy2TxMlMbudAV01tb5jzz3k4c/AwzA5Q9i
-sch9WHg5TO5d2L1B6b44aMkefP9u+GBNaLZx1B+hb2b6ZCkxHojPHVeUSi1Hpz17
-lHNKGM/S8lXO2ADLPujRZnzHaBVAwxxAlSgX+PHvqw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML1/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">Université de Valenciennes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Valenciennes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univ-valenciennes.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>fed-admin@univ-valenciennes.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml
deleted file mode 100644
index 7b8d204d..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.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" entityID="urn:mace:cru.fr:federation:utc.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-04T14:19:04Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utc.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UTC - Université de Technologie de Compiègne</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAw0lEQVQ4y8WRsQ3CMBBF/51CTcIawAzsQcsOzBAphB2oEVtQUUI6RqAAiQ4lPorYjkMIskWRL1my5Pvv/p2BoUXmUp0nQiTeRp7fCQCiBiX1CVQUUlzjKze4M8IlaY2ghEFcIt8vcXuONYGsQwBs8pQily8ADscFTtcpgAqkq0V3yrYpfaaygPVuBZaRjqVsuCxvTK8iFmPg2aO9RGN24wFAWSTC6F8u9T2oIv75JZ0EZokCsbP7iLuR/M1fAaH6GzC83sSiOspjegsMAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjQyKzAyOjAwx+3d5QAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo0MiswMjowMLawZVkAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.utc.fr/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Université de Technologie de Compiègne (UTC)'s staff and students identity provider.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">UTC - Université de Technologie de Compiègne</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Identités fournies pour le personnel et les étudiants de l'Université de Technologie de Compiègne (UTC)</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>
-					      MIIDFDCCAfygAwIBAgIVALKUNv/nTVKQIuB1xMzl8BSvmMIvMA0GCSqGSIb3DQEB
-BQUAMBUxEzARBgNVBAMMCmlkcC51dGMuZnIwHhcNMTUwNzEwMjIyODExWhcNMzUw
-NzEwMjIyODExWjAVMRMwEQYDVQQDDAppZHAudXRjLmZyMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAnOor4IQUhUVR7T0jZLvGNgX52dD6jLJFXgQDbF6a
-p247hfjAi3bNhzC8GEY8bSpnUPv90PntGY+vRzO/qMa1z9DVS+DZSRmsQI7Ohgp+
-hgOIq9L7+8D0DAGj3vGhfvnIv2NeVuI+f4K4uOc5mnI0wmBq8f+icxEsehP2x9zE
-L/scx0fUhg+68lCc/Dk2qJH0z9P+1eTcAIvMG46OzRuEwk/qfcXShDs4Atj/b2dX
-9SHXz3wG4Y2Me2ZUOfHbrbtNkspBga/SdGYOgE4Bgo1mBGtU5AT6qW+RPJ2bcCIA
-bQEFWDEDQ6NvrfXpyO1KLLuBILd8ogEKh1wG/aePETiGVQIDAQABo1swWTAdBgNV
-HQ4EFgQUMUZKOhU5gB7iNmnhcC4zDqujKoMwOAYDVR0RBDEwL4IKaWRwLnV0Yy5m
-coYhaHR0cHM6Ly9pZHAudXRjLmZyL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-BQUAA4IBAQCDz2xzAmxO+TBVcgqOcoceVmD9G5QI2UzwFOGSuC31ILeYqGSN/Mwv
-qpjEwC1Msb+t9TGabAq1rgk1vok+1GISwFIN2AVr+GgIjQojmCyerntWGOdKFyOa
-52JvPUYN9HQVNOKLHTo0Ug1v9qTVGdYupj78xy8NYX1HRtBct8rj4QmrcFAWraHa
-tURWo1OcTcNS0KQcSRrxhNOl8+C3M1Enx9peJSSE25MgFZbeERzBm22PweFQNqr+
-lTMGjfitokokh3z4Mr+YgnPTSH/PLm2XuEbFIZLiWL60VrYyxBsMuBIJvk/xgMpU
-XaUj+MhAJNdwwHHIGwKjoAotbCEk+rTR
-					    </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>
-					      MIIDGDCCAgCgAwIBAgIVAJniTskfMWtBbgn1nDzPa0dObhFfMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMMC2lkcDIudXRjLmZyMB4XDTE0MDkwOTE3MTgwN1oXDTM0
-MDkwOTE3MTgwN1owFjEUMBIGA1UEAwwLaWRwMi51dGMuZnIwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQChJP7adTd4jM4tVNHqfy8wqZIyax5XcxktD/dH
-TZRP949/SW78cBdhOb48iAUOoKptSXMbGCV7n5Vot2NGLwRxJ7DA+ngLhlGV0WS7
-zRf493yGMxvCm/oVCVSr7TuPDGlvGLGw8RmiCGfHXdBeWQ3UitNOnjjM8VoJEJFL
-OLN5dNIBny4WUXSEbvQil7Mtqt1EkZ6qMzJNnhyTZ66N+bPlZYfn+utgYVESCEM6
-8TO8sl1fAMigmM5CTvvoIzq4sjNQO9qr2FPKt5teyc/wnQd4KNG5n0iZzTcZPZBI
-jB65WQckck6WFeivFo2za0hy+cQAoeFZQ8IWMFQnmPn7zDGNAgMBAAGjXTBbMB0G
-A1UdDgQWBBSyZxcO36hdIS1YmPncz3vrMUlK+jA6BgNVHREEMzAxggtpZHAyLnV0
-Yy5mcoYiaHR0cHM6Ly9pZHAyLnV0Yy5mci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQUFAAOCAQEAOkGmALzrLobKru+8b8LQKTyl/pL+DXHkwa6U0HVkGf8cOJzK
-fmHG8VYmGgcsRkD8kiVN0Kk3QNOuqFOG+fv096PYEmM8jwIxirH4H4YMP01Jdds0
-SmGHT2g4R8Ll446Jd2vkrMR0FXiYEoFM1DUB+b/tLARw4NQuIfooXBGzsVcLJucM
-7ZbFeSpPfDVWKkBPsk105We7BemyXJGpEhx12j7nd1TAK0p0T2P8XnMIDOaxrl0v
-v+C1uEftjADboIz5BDy5wIZITGG/yELlCVoLyBri2ozPaUFpEetbzKdmfcG6wk+z
-3zuwoSLKhPoHFPCoVMaxjYpXmPobZG6PumciJg==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utc.fr/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utc.fr/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.utc.fr: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:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utc.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utc.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utc.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UTC - Université de Technologie de Compiègne</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UTC - Université de Technologie de Compiègne</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utc.fr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>federation-id@utc.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml
deleted file mode 100644
index fd5efc0c..00000000
--- a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:utt.fr">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-08-14T19:52:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utt.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Université de Technologie de Troyes</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACa0lEQVQoz2WS3UuTcRTHv7/ffs+zZz5jijOZpU5FNzN7dQbGAgmCusgoulIo/Qvypotuom56uQvyoouKCiKDkG6ilIoQlQ1DFHyfrs1ymrPNzb0827Pn93Shma5zdT7n8D3nwPkStN0FQLEdfFe+hdhbYbthp7cj20ZdB9eh6+A6yxu5R8Y5chq4Dmaok6X9slQgMJZ3CQeg61Bz0HGoSG6psp06WnXYeaCq0mqxmAwGymjeyGzOWiBdrK9obaqtr7MlkhlFURUla7GYRJEB+LuBc6iao1C+1FLtarTHYql+7/ztt0P+dAaqBs5HH3S6TlQDYBxARi01GdtdjsYa24QvdOPll8BmCpSCUegAcOd887EjdgCKmmbIqB0N9gvug9F4enz2R8+EHyBGScxwjmyuVJbud7R2tbsBhJPhj6PT5PHzr4ySqcXVezcvM4G6O3s8a1HogCR2H6/t7jpjt1sVNTG2FHjaN/Fs8DszGYVrT/pPl5f09nnfDc14fkUbisxXXI6OtmaH06ZpqW+B2TcDk/3DS3Ymvbp6lly/1fto3F/BDGWS6HaWn3M3NLtqLBYxpmx45wIfRvy++UhTma31ZJ1sNn4emSM65+FwQhAMlkITpTyZTUwthcZ9KzMLkWJqcpaVVleWzAfW3g9Pv/avQsmShdVlQvhGMr0WjQVD8c2Yuk82FwqmInNBMBTxTgY/+ZZ9sSQogcAoIeThiwFrsSxLRpEwopHfkeTqenxsIeT5uR7YTIEQCAZK/7mHDXqCZknI5LRIUvHHU4vJNDS+9QQqif+5DKwvsAJdBwgoASVgBggsz+G78Q8yZwpdy1AnGwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo1MDowOCswMjowMNpMeFsAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NTA6MDgrMDI6MDCrEcDnAAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.utt.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université de Technologie de Troyes</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>
-					      MIIDMDCCAhigAwIBAgIVALZ63CJZA7jvuPJPdCpjCqCwtzUcMA0GCSqGSIb3DQEBBQUAMBwxGjAY
-BgNVBAMTEXNoaWJib2xldGgudXR0LmZyMB4XDTA5MDgxMzE1Mzc0NVoXDTI5MDgxMzE1Mzc0NVow
-HDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dHQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDRy7HRMvRk5btG8GGPHKQVA6k3fFlikIFGHJx+B7Uo+kNdQInrMcixfhrqY8bnu66ljQKB
-vZ0yMEZfXJTofRfqBePOgtHEwLcgqQm68kRr4q8oLUdS/+XpK4EdPW6UIrFmA1KkcOfC/Jysn4f7
-KoFKDpTFmNnl7TGVu9GM/tl3yKGFEbuH8kNvG3uaJJVC59ZE2s/xoMcslriXytje2WP4F95DEYVn
-ddkYaw86ZHjjxVumcz7nndInsI8j5EVseK8Ch7cSqlmNA44GJ0kdikv4CphntgBIOvoG2ZvvAIW4
-DGFdMhZieqtwQ2FEKRxAujWY/Sxq6Zsd5anLj7DL8s09AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNo
-aWJib2xldGgudXR0LmZyhihodHRwczovL3NoaWJib2xldGgudXR0LmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBSt5O7Bubm1wxc8OOwz6hgpfVwMtTANBgkqhkiG9w0BAQUFAAOCAQEApDpM7DKM
-7GJs3m+yjN9xIaAVIIUAe+pcIybt8E02fa4+QVaB2RdPvCTgL3cfLZ2ONMEbMqYlWJz0J41P/TaZ
-x4Sxqv/ih2F1pmFks5UUaMbapNzOX3lL1FfBc718kTLAPLt4m9Gm741A/kx83CS0Q2U4mLXp8I5f
-fYMgN8FRoxHJOGsBSGs11nl32pzAiai069ZutsSp2mdyRovyNHS2Oxdumai87AHr1JiC3C8mwvQm
-Sh/3RmGTbPNeXL1AL2zzeKPcSqsEISEVUNbqQFKs37kcfAvy05jGGcfNHtq5GALqx/qhBeXMiVEB
-BcaKxmhZ8LPhUPppbcjFuLXlaNAphQ==
-					    </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-POST" Location="https://shibboleth.utt.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.utt.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.utt.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utt.fr</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDMDCCAhigAwIBAgIVALZ63CJZA7jvuPJPdCpjCqCwtzUcMA0GCSqGSIb3DQEBBQUAMBwxGjAY
-BgNVBAMTEXNoaWJib2xldGgudXR0LmZyMB4XDTA5MDgxMzE1Mzc0NVoXDTI5MDgxMzE1Mzc0NVow
-HDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dHQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDRy7HRMvRk5btG8GGPHKQVA6k3fFlikIFGHJx+B7Uo+kNdQInrMcixfhrqY8bnu66ljQKB
-vZ0yMEZfXJTofRfqBePOgtHEwLcgqQm68kRr4q8oLUdS/+XpK4EdPW6UIrFmA1KkcOfC/Jysn4f7
-KoFKDpTFmNnl7TGVu9GM/tl3yKGFEbuH8kNvG3uaJJVC59ZE2s/xoMcslriXytje2WP4F95DEYVn
-ddkYaw86ZHjjxVumcz7nndInsI8j5EVseK8Ch7cSqlmNA44GJ0kdikv4CphntgBIOvoG2ZvvAIW4
-DGFdMhZieqtwQ2FEKRxAujWY/Sxq6Zsd5anLj7DL8s09AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNo
-aWJib2xldGgudXR0LmZyhihodHRwczovL3NoaWJib2xldGgudXR0LmZyL2lkcC9zaGliYm9sZXRo
-MB0GA1UdDgQWBBSt5O7Bubm1wxc8OOwz6hgpfVwMtTANBgkqhkiG9w0BAQUFAAOCAQEApDpM7DKM
-7GJs3m+yjN9xIaAVIIUAe+pcIybt8E02fa4+QVaB2RdPvCTgL3cfLZ2ONMEbMqYlWJz0J41P/TaZ
-x4Sxqv/ih2F1pmFks5UUaMbapNzOX3lL1FfBc718kTLAPLt4m9Gm741A/kx83CS0Q2U4mLXp8I5f
-fYMgN8FRoxHJOGsBSGs11nl32pzAiai069ZutsSp2mdyRovyNHS2Oxdumai87AHr1JiC3C8mwvQm
-Sh/3RmGTbPNeXL1AL2zzeKPcSqsEISEVUNbqQFKs37kcfAvy05jGGcfNHtq5GALqx/qhBeXMiVEB
-BcaKxmhZ8LPhUPppbcjFuLXlaNAphQ==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utt.fr:8443/shibboleth-idp/AA"/>
-    <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">Université de Technologie de Troyes</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université de Technologie de Troyes</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utt.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>cri@utt.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-liv.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-liv.ac.uk.xml
deleted file mode 100644
index 60884042..00000000
--- a/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-liv.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="urn:mace:eduserv.org.uk:athens:provider:liv.ac.uk">
-  <!--
-		This is a Shibboleth IdP for the University of Liverpool.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-09T16:53: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">liv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANlUxUdyvt878JJZeQqXZAX2ZiW9MA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxpdi5hYy51azAeFw0xNDAzMjEx
-						NjMxNDlaFw0zNDAzMjExNjMxNDlaMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxp
-						di5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtlHz1hrD0F
-						f0M6F1zN8ZBoY5qI2wYwfjcRuXVfZlSJVhODsOUWWxUnfdqV7KBA0HcgRCK008g2
-						h/sjZXH/VU8M0EHhaYHHkyQxSBwEjWhbVcOT9iI1TkZqHNqZtJQIw7rnybskkv/3
-						6IiBtGZgkZL3CZjp0kkqsOh19k/cioEsNsd4cKUyvhVEUvqtO1VULemasTnkmUtk
-						xJegTZXyW2W6TYMlTxeTwJQWe97WNxpCvV/3ounzXnLTUG5Te4i2ptA67JItknmw
-						kS1p/a6d9B63gvHch27jFzollXccq4Gb2VSNLq3B8eAo8+Hnny9vLYYlKH1H7H9q
-						gAo8OSA2ZbUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aDMubGl2LmFj
-						LnVrhixodHRwczovL3NoaWJib2xldGgzLmxpdi5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQU7Cmjd6WsvyQ90NQeufSKvO/8yVIwDQYJKoZIhvcNAQEFBQAD
-						ggEBAIhTLBoOX4fvW9dYMfvjD77y8lyo2UFdATt6G6KWlCosBDkOwDTGK4N5g7CU
-						/AxoGWBYLtd+KHy5ii5oV781aMLPa3ClDs1UYE/NuwkylvoSO0+agpeH6oF7IJxH
-						N7EsSimVuaLi/R2ghs0KLwv6JfFUkhO2G2S5VTS/FZn/B8NgmBo+fLuJ6DLCQwJJ
-						vnqXf9DPozHSBUOQAEkZcjKRSl+QTO6SleKLg5ahHNC3kT+dzF2ACKJMC7f4WzAL
-						rA/YOcNxfwUB/eiEgmw9dDwpUvOuH+NDET/ASLH3mXUA1w7DkzzHTZkMn9k/Up6O
-						SX7ypoc/4IGOgkCbLMA/5Z8ZidI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3.liv.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://shibboleth3.liv.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth3.liv.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth3.liv.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">liv.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIVANlUxUdyvt878JJZeQqXZAX2ZiW9MA0GCSqGSIb3DQEB
-						BQUAMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxpdi5hYy51azAeFw0xNDAzMjEx
-						NjMxNDlaFw0zNDAzMjExNjMxNDlaMCAxHjAcBgNVBAMTFXNoaWJib2xldGgzLmxp
-						di5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtlHz1hrD0F
-						f0M6F1zN8ZBoY5qI2wYwfjcRuXVfZlSJVhODsOUWWxUnfdqV7KBA0HcgRCK008g2
-						h/sjZXH/VU8M0EHhaYHHkyQxSBwEjWhbVcOT9iI1TkZqHNqZtJQIw7rnybskkv/3
-						6IiBtGZgkZL3CZjp0kkqsOh19k/cioEsNsd4cKUyvhVEUvqtO1VULemasTnkmUtk
-						xJegTZXyW2W6TYMlTxeTwJQWe97WNxpCvV/3ounzXnLTUG5Te4i2ptA67JItknmw
-						kS1p/a6d9B63gvHch27jFzollXccq4Gb2VSNLq3B8eAo8+Hnny9vLYYlKH1H7H9q
-						gAo8OSA2ZbUCAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYmJvbGV0aDMubGl2LmFj
-						LnVrhixodHRwczovL3NoaWJib2xldGgzLmxpdi5hYy51ay9pZHAvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQU7Cmjd6WsvyQ90NQeufSKvO/8yVIwDQYJKoZIhvcNAQEFBQAD
-						ggEBAIhTLBoOX4fvW9dYMfvjD77y8lyo2UFdATt6G6KWlCosBDkOwDTGK4N5g7CU
-						/AxoGWBYLtd+KHy5ii5oV781aMLPa3ClDs1UYE/NuwkylvoSO0+agpeH6oF7IJxH
-						N7EsSimVuaLi/R2ghs0KLwv6JfFUkhO2G2S5VTS/FZn/B8NgmBo+fLuJ6DLCQwJJ
-						vnqXf9DPozHSBUOQAEkZcjKRSl+QTO6SleKLg5ahHNC3kT+dzF2ACKJMC7f4WzAL
-						rA/YOcNxfwUB/eiEgmw9dDwpUvOuH+NDET/ASLH3mXUA1w7DkzzHTZkMn9k/Up6O
-						SX7ypoc/4IGOgkCbLMA/5Z8ZidI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth3.liv.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth3.liv.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 Liverpool</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Liverpool</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.liv.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Gilbertson</SurName>
-    <EmailAddress>mailto:webmaster@liv.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Pretlove</SurName>
-    <EmailAddress>mailto:T.Pretlove@liverpool.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml b/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml
deleted file mode 100644
index 82d8fe9b..00000000
--- a/swamid-interfederations-2.0/urn-mace-eduserv.org.uk-athens-provider-tvu.ac.uk.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:eduserv.org.uk:athens:provider:tvu.ac.uk">
-  <!--
-		This is a Shibboleth IdP for The University of West London.
-	-->
-  <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://refeds.org/category/hide-from-discovery</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">tvu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIRAJsjppl09pdBOodDFDJIICEwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MTUwMDAwMDBaFw0xNjA0MTQyMzU5NTlaMEMxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
-						aDIudHZ1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsrIB
-						oRzm965a3jJw5ZtnlwkDPOsdRsqpINAO0wK1l7dgCNkCyXHE83GA71wqtKa3n3/5
-						BVfPXd8uhWop/THWmUu/29VyMEJdo94ahl9KJ1IxkSFW/nDIsHTrQddZr/sjYNtw
-						jOohG/iDZve6LLhrdPxuiCgOcVCq32kg01/erwvpFJBgu4hsdFL0jrhn0mHPqc9N
-						RMXnRP7duAvWKPH6cTUKeCkCYhanYZemZoEhsFPUP+ahQOraZnSHVa0zeUjIUPBC
-						VisVzGQjzG1nS5WRcIMaWhjsCeF/rVGhhbuV/rVIPbYfM7YlmJiIyL+zzzlQcORR
-						ZgrGz3ijeyCQZsY92wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-						SWsrN1dH6pDjue0wHQYDVR0OBBYEFMZZ7NSWwqtYB0te0FBz956PHQYmMA4GA1Ud
-						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoMi50
-						dnUuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAYWCw70ie/vQUIFBceDxr6c5Pm9
-						5hTQStS6scyEX9j65f81CnzAzXhuwNqyYn8QbWMm4WV/j7RJhqE5sNNgEIoyAWWt
-						LG+XOuDCTuHEcwMgsoMq6ESPDBkuVSxxrX4YeyI3ssGKAOkpMqhsxrfLDkIwE4/r
-						VxxkimAI4E7GnN7RJDykAo4pczr1VqyMxVACEW561CFxcp2PNFs9m0fM16tkla4f
-						fytNoHcf/mcJWXaAAOkoDmCob0F8bJauUx9Ul4Nhsp8SyXpMQoKlxuxInHNU3nkJ
-						s4XBFY3CGcP1NizUMMo6uWkiqC68iprykMcar3qMC/h4aPCdWDmeS1BZPgo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.tvu.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.tvu.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://shibboleth2.tvu.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.tvu.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.tvu.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.tvu.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">tvu.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEeDCCA2CgAwIBAgIRAJsjppl09pdBOodDFDJIICEwDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MTUwMDAwMDBaFw0xNjA0MTQyMzU5NTlaMEMxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVc2hpYmJvbGV0
-						aDIudHZ1LmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsrIB
-						oRzm965a3jJw5ZtnlwkDPOsdRsqpINAO0wK1l7dgCNkCyXHE83GA71wqtKa3n3/5
-						BVfPXd8uhWop/THWmUu/29VyMEJdo94ahl9KJ1IxkSFW/nDIsHTrQddZr/sjYNtw
-						jOohG/iDZve6LLhrdPxuiCgOcVCq32kg01/erwvpFJBgu4hsdFL0jrhn0mHPqc9N
-						RMXnRP7duAvWKPH6cTUKeCkCYhanYZemZoEhsFPUP+ahQOraZnSHVa0zeUjIUPBC
-						VisVzGQjzG1nS5WRcIMaWhjsCeF/rVGhhbuV/rVIPbYfM7YlmJiIyL+zzzlQcORR
-						ZgrGz3ijeyCQZsY92wIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-						SWsrN1dH6pDjue0wHQYDVR0OBBYEFMZZ7NSWwqtYB0te0FBz956PHQYmMA4GA1Ud
-						DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-						BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-						HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-						TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-						dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-						Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVzaGliYm9sZXRoMi50
-						dnUuYWMudWswDQYJKoZIhvcNAQEFBQADggEBAAYWCw70ie/vQUIFBceDxr6c5Pm9
-						5hTQStS6scyEX9j65f81CnzAzXhuwNqyYn8QbWMm4WV/j7RJhqE5sNNgEIoyAWWt
-						LG+XOuDCTuHEcwMgsoMq6ESPDBkuVSxxrX4YeyI3ssGKAOkpMqhsxrfLDkIwE4/r
-						VxxkimAI4E7GnN7RJDykAo4pczr1VqyMxVACEW561CFxcp2PNFs9m0fM16tkla4f
-						fytNoHcf/mcJWXaAAOkoDmCob0F8bJauUx9Ul4Nhsp8SyXpMQoKlxuxInHNU3nkJ
-						s4XBFY3CGcP1NizUMMo6uWkiqC68iprykMcar3qMC/h4aPCdWDmeS1BZPgo=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.tvu.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.tvu.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 University of West London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of West London (Old)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tvu.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Helpdesk</GivenName>
-    <EmailAddress>mailto:itservicedesk@uwl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Amanda</GivenName>
-    <SurName>Burns</SurName>
-    <EmailAddress>mailto:amanda.burns@uwl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Vani</GivenName>
-    <SurName>Aul</SurName>
-    <EmailAddress>mailto:Vani.Aul@uwl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Network Services</GivenName>
-    <EmailAddress>mailto:networkservices@uwl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Richard</GivenName>
-    <SurName>Rumun</SurName>
-    <EmailAddress>mailto:richard.rumun@uwl.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
index 5e1f68e0..c4f54fe2 100644
--- a/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
+++ b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:no.uio.hpc.lap">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:mace:feide.no:services:no.uio.hpc.lap">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2014-07-29T14:36:18Z">
+    <mdrpi:RegistrationInfo registrationAuthority="http://feide.no/" registrationInstant="2015-10-08T12:37:20Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="true">
     <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Language Analysis Portal (LAP)</mdui:DisplayName>
         <mdui:DisplayName xml:lang="no">Språkanalyseportalen (LAP)</mdui:DisplayName>
         <mdui:Description xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
@@ -16,7 +20,7 @@
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
@@ -46,7 +50,7 @@ agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p</ds:X509Certificate>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
 NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-alaska.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-alaska.edu.xml
deleted file mode 100644
index bdcc1111..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-alaska.edu.xml
+++ /dev/null
@@ -1,176 +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="urn:mace:incommon:alaska.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.alaska.edu/error.html" 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">alaska.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Alaska Statewide System</mdui:DisplayName>
-        <mdui:Description xml:lang="en">InCommon federated IdP (identity provider) for all students, faculty, &amp; staff at all campuses of the University of Alaska.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://iam.alaska.edu/trac/wiki/UAInCPOP.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://iam.alaska.edu/trac/wiki/IamUaArp</mdui:PrivacyStatementURL>
-        <mdui:Logo height="632" width="860" xml:lang="en">https://www.alaska.edu/files/opa/color.jpg</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>
-MIIFDDCCA/SgAwIBAgIJALS9LfC6aZcBMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
-VQQGEwJVUzEPMA0GA1UECBMGQWxhc2thMRIwEAYDVQQHEwlGYWlyYmFua3MxHTAb
-BgNVBAoTFFVuaXZlcnNpdHkgb2YgQWxhc2thMSkwJwYDVQQLEyBPZmZpY2Ugb2Yg
-SW5mb3JtYXRpb24gVGVjaG5vbG9neTEXMBUGA1UEAxMOaWRwLmFsYXNrYS5lZHUx
-HTAbBgkqhkiG9w0BCQEWDmlhbUBhbGFza2EuZWR1MB4XDTExMDcwNzAwMDE0OVoX
-DTE0MDcwNjAwMDE0OVowgbQxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZBbGFza2Ex
-EjAQBgNVBAcTCUZhaXJiYW5rczEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBBbGFz
-a2ExKTAnBgNVBAsTIE9mZmljZSBvZiBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRcw
-FQYDVQQDEw5pZHAuYWxhc2thLmVkdTEdMBsGCSqGSIb3DQEJARYOaWFtQGFsYXNr
-YS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4Rs8GyYexxFZl
-QpWQ3VhwDKUGOYF+cEiGa6eZwkw5HbeL021tnrg8kgwe4mYuSsgTVNxsp50eRfrz
-PDjBPaoSTVdahBfdVbeecMlSM3SeY6D3hhvGXqsaeFArZ9s30CkdBitgaKvTSAsX
-AnRa9B2olmU/AfUfSPmRwDxDJo5ktGYZOwwUjB4ghduRtXc02quLYjO3N9T4hzx2
-teO1dQ5bEwH7QiD06AA7+mKbdLM9spqv8cgVFKmyuKYsJsnUPOMHjvKh/s9mBwIi
-TeI3efm35XZjYLpcUUVmZDE8XyPD9xZtjJF/xX8R7BATCGdA/D0Z01OFID7lRxyl
-QRSAfO6ZAgMBAAGjggEdMIIBGTAdBgNVHQ4EFgQUFXeeBk0zF6ZzB/sHkOdb1EUs
-FTswgekGA1UdIwSB4TCB3oAUFXeeBk0zF6ZzB/sHkOdb1EUsFTuhgbqkgbcwgbQx
-CzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZBbGFza2ExEjAQBgNVBAcTCUZhaXJiYW5r
-czEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBBbGFza2ExKTAnBgNVBAsTIE9mZmlj
-ZSBvZiBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRcwFQYDVQQDEw5pZHAuYWxhc2th
-LmVkdTEdMBsGCSqGSIb3DQEJARYOaWFtQGFsYXNrYS5lZHWCCQC0vS3wummXATAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAacb/yix06YrkfWbVIFP+L
-9u58aq7WXRMehUQT7VCDPDctZ5SjtMWd0A2b4igZtv2OxcG7U6dpBiOAk+MGEGeY
-l+sw4KFNB+K3VCU4DwT7debVq0quJHmP23oAdmId92w0+JN9/0T1pJZfzyFZBgTM
-U7cIkWqnMdrGhal5MNzrYypOUvZhKOrf/E10e6ZuuB6+5liGus8YZbfu18Ur3k9f
-Q3gISQ3vKG1Z8ACyVD2peCbpoN2QEtjIrAsU1WHgDrviAd5k5slFHue5g6Ujen4T
-B89QgPCsFr20bV2LDmEEnxNO47F6pFVlHYnrdxQCsf9ETU/7gzgn2g5OX1wkmETL
-          </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>
-MIIDJDCCAgygAwIBAgIVAMN6E6Kx9SACb2AMDLfMzBz7UbvtMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5hbGFza2EuZWR1MB4XDTE0MDYxMzIxNTkyMFoX
-DTM0MDYxMzIxNTkyMFowGTEXMBUGA1UEAxMOaWRwLmFsYXNrYS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdI7JodYCEjG/v98W2vVFokOU6LtNb
-I1n24JGeTDtrx4dcJ27/rBJ80oniTKOu2bwF1j6k9D5ow5qIQ2JVD0RbSCyCXIlP
-uKuvGDrL9+HDdx/TTVJe0/tvWdTAEQj4O8ax3H4fXGUeAzXl01v+VMBZorLsSu6I
-/C10araiaoJGMqi32apVz/4UclGATAufG6l5ueuCSVvlZWe9v0Tyo3iEWbYz9wEI
-zjzF6gLi9lxy02RYbOqaCy0r8IrD7q8GJhltlz44F4WdaNedntjpjIW8BdK9fSkW
-JkDCH0TT+kd1mI8ZBZwf4OIX1eNMfXAaxhrxgTT0qqwLCjTgMRVlCfU/AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5hbGFza2EuZWR1hiVodHRwczovL2lkcC5hbGFz
-a2EuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSXTxXBFiKPCSyFK0VmHghD
-Y/MDhzANBgkqhkiG9w0BAQUFAAOCAQEAlrgm8dHq0NpU4JuCrvCz2gBMBolvoZEM
-9YkaQMeMYsvHGQX0kvQzCWPV+Im4rCxNU1aZIfkJNJaSgp4kdyRvG2Sa6N3jPjOu
-CYPLJtm3wBGkMjoDBQb12Upl2RjtSCCRVFIWSv1D0ycfCel2iqddsSCziKHiN3RX
-pp25mLVA1KlcLQOGhdnxa1EkHR5zekUukapNGaQGOSTHdwvi+xxDpVfZ1xj9jjt+
-Qc8E7z0BxqW2QRaU1D7Jqc4QQbOD+wDnIWHtj2LzdyJknBeG+i9L0IKogsUgDDJr
-qkYa6vIOo4URe5e3Z1bGmENzaoHt2usblOWLGu2AV+CNwkbX65c9wg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.alaska.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.alaska.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.alaska.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.alaska.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.alaska.edu/idp/profile/SAML2/POST-SimipleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.alaska.edu/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">alaska.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFDDCCA/SgAwIBAgIJALS9LfC6aZcBMA0GCSqGSIb3DQEBBQUAMIG0MQswCQYD
-VQQGEwJVUzEPMA0GA1UECBMGQWxhc2thMRIwEAYDVQQHEwlGYWlyYmFua3MxHTAb
-BgNVBAoTFFVuaXZlcnNpdHkgb2YgQWxhc2thMSkwJwYDVQQLEyBPZmZpY2Ugb2Yg
-SW5mb3JtYXRpb24gVGVjaG5vbG9neTEXMBUGA1UEAxMOaWRwLmFsYXNrYS5lZHUx
-HTAbBgkqhkiG9w0BCQEWDmlhbUBhbGFza2EuZWR1MB4XDTExMDcwNzAwMDE0OVoX
-DTE0MDcwNjAwMDE0OVowgbQxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZBbGFza2Ex
-EjAQBgNVBAcTCUZhaXJiYW5rczEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBBbGFz
-a2ExKTAnBgNVBAsTIE9mZmljZSBvZiBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRcw
-FQYDVQQDEw5pZHAuYWxhc2thLmVkdTEdMBsGCSqGSIb3DQEJARYOaWFtQGFsYXNr
-YS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4Rs8GyYexxFZl
-QpWQ3VhwDKUGOYF+cEiGa6eZwkw5HbeL021tnrg8kgwe4mYuSsgTVNxsp50eRfrz
-PDjBPaoSTVdahBfdVbeecMlSM3SeY6D3hhvGXqsaeFArZ9s30CkdBitgaKvTSAsX
-AnRa9B2olmU/AfUfSPmRwDxDJo5ktGYZOwwUjB4ghduRtXc02quLYjO3N9T4hzx2
-teO1dQ5bEwH7QiD06AA7+mKbdLM9spqv8cgVFKmyuKYsJsnUPOMHjvKh/s9mBwIi
-TeI3efm35XZjYLpcUUVmZDE8XyPD9xZtjJF/xX8R7BATCGdA/D0Z01OFID7lRxyl
-QRSAfO6ZAgMBAAGjggEdMIIBGTAdBgNVHQ4EFgQUFXeeBk0zF6ZzB/sHkOdb1EUs
-FTswgekGA1UdIwSB4TCB3oAUFXeeBk0zF6ZzB/sHkOdb1EUsFTuhgbqkgbcwgbQx
-CzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZBbGFza2ExEjAQBgNVBAcTCUZhaXJiYW5r
-czEdMBsGA1UEChMUVW5pdmVyc2l0eSBvZiBBbGFza2ExKTAnBgNVBAsTIE9mZmlj
-ZSBvZiBJbmZvcm1hdGlvbiBUZWNobm9sb2d5MRcwFQYDVQQDEw5pZHAuYWxhc2th
-LmVkdTEdMBsGCSqGSIb3DQEJARYOaWFtQGFsYXNrYS5lZHWCCQC0vS3wummXATAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAacb/yix06YrkfWbVIFP+L
-9u58aq7WXRMehUQT7VCDPDctZ5SjtMWd0A2b4igZtv2OxcG7U6dpBiOAk+MGEGeY
-l+sw4KFNB+K3VCU4DwT7debVq0quJHmP23oAdmId92w0+JN9/0T1pJZfzyFZBgTM
-U7cIkWqnMdrGhal5MNzrYypOUvZhKOrf/E10e6ZuuB6+5liGus8YZbfu18Ur3k9f
-Q3gISQ3vKG1Z8ACyVD2peCbpoN2QEtjIrAsU1WHgDrviAd5k5slFHue5g6Ujen4T
-B89QgPCsFr20bV2LDmEEnxNO47F6pFVlHYnrdxQCsf9ETU/7gzgn2g5OX1wkmETL
-          </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>
-MIIDJDCCAgygAwIBAgIVAMN6E6Kx9SACb2AMDLfMzBz7UbvtMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcC5hbGFza2EuZWR1MB4XDTE0MDYxMzIxNTkyMFoX
-DTM0MDYxMzIxNTkyMFowGTEXMBUGA1UEAxMOaWRwLmFsYXNrYS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdI7JodYCEjG/v98W2vVFokOU6LtNb
-I1n24JGeTDtrx4dcJ27/rBJ80oniTKOu2bwF1j6k9D5ow5qIQ2JVD0RbSCyCXIlP
-uKuvGDrL9+HDdx/TTVJe0/tvWdTAEQj4O8ax3H4fXGUeAzXl01v+VMBZorLsSu6I
-/C10araiaoJGMqi32apVz/4UclGATAufG6l5ueuCSVvlZWe9v0Tyo3iEWbYz9wEI
-zjzF6gLi9lxy02RYbOqaCy0r8IrD7q8GJhltlz44F4WdaNedntjpjIW8BdK9fSkW
-JkDCH0TT+kd1mI8ZBZwf4OIX1eNMfXAaxhrxgTT0qqwLCjTgMRVlCfU/AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcC5hbGFza2EuZWR1hiVodHRwczovL2lkcC5hbGFz
-a2EuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSXTxXBFiKPCSyFK0VmHghD
-Y/MDhzANBgkqhkiG9w0BAQUFAAOCAQEAlrgm8dHq0NpU4JuCrvCz2gBMBolvoZEM
-9YkaQMeMYsvHGQX0kvQzCWPV+Im4rCxNU1aZIfkJNJaSgp4kdyRvG2Sa6N3jPjOu
-CYPLJtm3wBGkMjoDBQb12Upl2RjtSCCRVFIWSv1D0ycfCel2iqddsSCziKHiN3RX
-pp25mLVA1KlcLQOGhdnxa1EkHR5zekUukapNGaQGOSTHdwvi+xxDpVfZ1xj9jjt+
-Qc8E7z0BxqW2QRaU1D7Jqc4QQbOD+wDnIWHtj2LzdyJknBeG+i9L0IKogsUgDDJr
-qkYa6vIOo4URe5e3Z1bGmENzaoHt2usblOWLGu2AV+CNwkbX65c9wg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.alaska.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.alaska.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Alaska Statewide System</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Alaska Statewide System</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.alaska.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David Bantz</md:GivenName>
-    <md:EmailAddress>Q@Alaska.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support Center</md:GivenName>
-    <md:EmailAddress>helpdesk@alaska.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Identity &amp; Access Management</md:GivenName>
-    <md:EmailAddress>IAM@Alaska.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-arizona.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-arizona.edu.xml
deleted file mode 100644
index 2150a3c5..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-arizona.edu.xml
+++ /dev/null
@@ -1,116 +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="urn:mace:incommon:arizona.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">arizona.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The University of Arizona</mdui:DisplayName>
-        <mdui:Logo height="150" width="633" xml:lang="en">https://shibboleth.arizona.edu/images/ua_horiz.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>
-MIIEejCCA2KgAwIBAgIJAKeNAZjK8MQiMA0GCSqGSIb3DQEBBQUAMIGEMQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTEPMA0GA1UEBxMGVHVjc29uMSIwIAYD
-VQQKExlUaGUgVW5pdmVyc2l0eSBvZiBBcml6b25hMQ0wCwYDVQQLEwRVSVRTMR8w
-HQYDVQQDExZzaGliYm9sZXRoLmFyaXpvbmEuZWR1MB4XDTEzMDkxMDAxMTEwNVoX
-DTIzMDkwODAxMTEwNVowgYQxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25h
-MQ8wDQYDVQQHEwZUdWNzb24xIjAgBgNVBAoTGVRoZSBVbml2ZXJzaXR5IG9mIEFy
-aXpvbmExDTALBgNVBAsTBFVJVFMxHzAdBgNVBAMTFnNoaWJib2xldGguYXJpem9u
-YS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlPH23E9OBgvnr
-Mqn/ji95Jl0u3iYCdLvx2J0XZ2byG6ZH6iMO1XprQdckzIxqKUgI4DvKpYvzZ4Tk
-aMawXdQFKLFC8G7/ISWe0c9wlogYypni5+JpV+ew3SKcOac1YaMh0UQ4wLVKig+Q
-khfv0Iz1RmHS78MyBur8zKS7z4Dkr934GWPupy8yG+pWLwsRtL1Z7eeQZ8I4vAws
-L/D5ifEcn2ZlnrnCUPM1O8+MaErH6jTlNNzkNutKP/SW/3ElecMYq2rnPso3G7XY
-yna5iQz6Dj0dujMKcxDsRgl2jqVXkKdSAPmhnTDYTdT+WEGB5QMEcbQavYSLCahu
-U/t83Kb1AgMBAAGjgewwgekwHQYDVR0OBBYEFLuVwMyTX3mzqlBBLawIDa/4d+xJ
-MIG5BgNVHSMEgbEwga6AFLuVwMyTX3mzqlBBLawIDa/4d+xJoYGKpIGHMIGEMQsw
-CQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTEPMA0GA1UEBxMGVHVjc29uMSIw
-IAYDVQQKExlUaGUgVW5pdmVyc2l0eSBvZiBBcml6b25hMQ0wCwYDVQQLEwRVSVRT
-MR8wHQYDVQQDExZzaGliYm9sZXRoLmFyaXpvbmEuZWR1ggkAp40BmMrwxCIwDAYD
-VR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA0eUpkx3wlbeoggIxlD7+4n0Y
-X50BUKB63iIpnnyKIrGLA7UM++0ybZkOv4kPJRy7nKhypqSyzshaaw+GoiirWHdW
-2vEgpSsxjEN8lF4aUkkOwKWOJtpChKbXHn6Ed7J/NndVpGReEwS9VVXPaqDE5Sx2
-3rTQINxpqNchH0QIif3WTW9YQ/wXGq1UJVNslRcnXYbpXAXJZrmsM0Obn3uwe0PQ
-IZIpATHnb/kCgn0zItoFv1USDzPmVUrw568eK/TK5/7tf4M9F3dU47hLDixo4522
-fEjKSM/7WyBx25FQJQ7IePI1kfVA8BNRI5atCm8DJd5lqFlQK/rmZiZWYrADVQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.arizona.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.arizona.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.arizona.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.arizona.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.arizona.edu/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">arizona.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEejCCA2KgAwIBAgIJAKeNAZjK8MQiMA0GCSqGSIb3DQEBBQUAMIGEMQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTEPMA0GA1UEBxMGVHVjc29uMSIwIAYD
-VQQKExlUaGUgVW5pdmVyc2l0eSBvZiBBcml6b25hMQ0wCwYDVQQLEwRVSVRTMR8w
-HQYDVQQDExZzaGliYm9sZXRoLmFyaXpvbmEuZWR1MB4XDTEzMDkxMDAxMTEwNVoX
-DTIzMDkwODAxMTEwNVowgYQxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25h
-MQ8wDQYDVQQHEwZUdWNzb24xIjAgBgNVBAoTGVRoZSBVbml2ZXJzaXR5IG9mIEFy
-aXpvbmExDTALBgNVBAsTBFVJVFMxHzAdBgNVBAMTFnNoaWJib2xldGguYXJpem9u
-YS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlPH23E9OBgvnr
-Mqn/ji95Jl0u3iYCdLvx2J0XZ2byG6ZH6iMO1XprQdckzIxqKUgI4DvKpYvzZ4Tk
-aMawXdQFKLFC8G7/ISWe0c9wlogYypni5+JpV+ew3SKcOac1YaMh0UQ4wLVKig+Q
-khfv0Iz1RmHS78MyBur8zKS7z4Dkr934GWPupy8yG+pWLwsRtL1Z7eeQZ8I4vAws
-L/D5ifEcn2ZlnrnCUPM1O8+MaErH6jTlNNzkNutKP/SW/3ElecMYq2rnPso3G7XY
-yna5iQz6Dj0dujMKcxDsRgl2jqVXkKdSAPmhnTDYTdT+WEGB5QMEcbQavYSLCahu
-U/t83Kb1AgMBAAGjgewwgekwHQYDVR0OBBYEFLuVwMyTX3mzqlBBLawIDa/4d+xJ
-MIG5BgNVHSMEgbEwga6AFLuVwMyTX3mzqlBBLawIDa/4d+xJoYGKpIGHMIGEMQsw
-CQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTEPMA0GA1UEBxMGVHVjc29uMSIw
-IAYDVQQKExlUaGUgVW5pdmVyc2l0eSBvZiBBcml6b25hMQ0wCwYDVQQLEwRVSVRT
-MR8wHQYDVQQDExZzaGliYm9sZXRoLmFyaXpvbmEuZWR1ggkAp40BmMrwxCIwDAYD
-VR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA0eUpkx3wlbeoggIxlD7+4n0Y
-X50BUKB63iIpnnyKIrGLA7UM++0ybZkOv4kPJRy7nKhypqSyzshaaw+GoiirWHdW
-2vEgpSsxjEN8lF4aUkkOwKWOJtpChKbXHn6Ed7J/NndVpGReEwS9VVXPaqDE5Sx2
-3rTQINxpqNchH0QIif3WTW9YQ/wXGq1UJVNslRcnXYbpXAXJZrmsM0Obn3uwe0PQ
-IZIpATHnb/kCgn0zItoFv1USDzPmVUrw568eK/TK5/7tf4M9F3dU47hLDixo4522
-fEjKSM/7WyBx25FQJQ7IePI1kfVA8BNRI5atCm8DJd5lqFlQK/rmZiZWYrADVQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.arizona.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.arizona.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The University of Arizona</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">The University of Arizona</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.arizona.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Gary Windham</md:GivenName>
-    <md:EmailAddress>gary.windham@arizona.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UITS 24/7 IT Support Center</md:GivenName>
-    <md:EmailAddress>support@email.arizona.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UITS Systems Integration &amp; Architecture</md:GivenName>
-    <md:EmailAddress>uits-sia@list.arizona.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-asu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-asu.edu.xml
deleted file mode 100644
index 0853afec..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-asu.edu.xml
+++ /dev/null
@@ -1,71 +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="urn:mace:incommon:asu.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">asu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Arizona State University</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>
-MIIDODCCAiCgAwIBAgIVAIEaja/L6bBgSu+JKg1QGKs5jXFJMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgyLmFzdS5lZHUwHhcNMTIxMjA2MDA1
-ODU4WhcNMzIxMjA2MDA1ODU4WjAeMRwwGgYDVQQDExNzaGliYm9sZXRoMi5hc3Uu
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg/vJpDGOPsQ//Gew
-8luCxJ6PxezIHYovddn246ZlkFKPKN0RJpZuCLxkWUBbz2P69Be7pbU9nuNHcfjG
-kzcxHM90hYvihcutx4cP79bJK/97HTonsiQw8DT+rsFkagsOfNSpUKPREgENFlTX
-Kc0KNBF4l+AbczLlYs/QygB1NjAWezQaJpElhtlpaaQoVizo9oFNbtQc5mEWnxEq
-wFR0k/HD1A7oI2hd819yMu+I4IbJVvvMyXTJaadInLxFw9mXR8A1JDI0QkHX5xSa
-G3gFnNMmVNfwCAQG2ZeRcdfiZ/WSGdrYM34QhyYDL1/qDdr3gDGm5Jj0wC2W8D0b
-4MSG3QIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoMi5hc3UuZWR1hipo
-dHRwczovL3NoaWJib2xldGgyLmFzdS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFDp/jP+Da0W8YoAWrzOzM/Y6Z3KuMA0GCSqGSIb3DQEBBQUAA4IBAQBkS0zf
-yDXzS/dRqqCmwinbR8mVcvsyBWsuGJQDiFIj/6WqT7lrYtp2igZXeu1V3R8XCQ4A
-JWuxXUB2zAvri8plWMhs/4s1HkeF8OZ647yoonTMxdMLheUyf/Ph+PKBs9SxANVj
-I4IYpbZZShg8HnDIDl8GdR/DTXC96VCARffmf1uu8ixzqceTMwhR6V1DgM4DIVQr
-E2VLaHwxQUzc7qxfLLwl8J+W7dd+LaTndoFtkpW7QLQUandHQWLzGt4lt7ahfbvz
-/InkWSyJ1jS/ihPrRrjyu7A3iTXITNxMow2gC1/u0Ho6FqzunXlgC4bcdGPcQiDK
-CatfNOBqeNRAh5p0
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.asu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.asu.edu/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Arizona State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Arizona State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.asu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UTO EDNA Team</md:GivenName>
-    <md:EmailAddress>ednateam@asu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UTO EDNA Team</md:GivenName>
-    <md:EmailAddress>ednateam@asu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jack Hsu</md:GivenName>
-    <md:EmailAddress>Jack.Hsu@asu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Certificate Support</md:GivenName>
-    <md:EmailAddress>ops.ss.certificates@mainex1.asu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-berkeley.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-berkeley.edu.xml
deleted file mode 100644
index fa45d263..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-berkeley.edu.xml
+++ /dev/null
@@ -1,115 +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="urn:mace:incommon:berkeley.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">berkeley.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of California, Berkeley</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>
-MIIE9DCCA9ygAwIBAgIJAPg8VmRSQ3pCMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIQmVya2VsZXkx
-FDASBgNVBAoTC1VDIEJlcmtlbGV5MRMwEQYDVQQLEwpJU1QtQ2FsbmV0MRowGAYD
-VQQDExFzaGliLmJlcmtlbGV5LmVkdTEuMCwGCSqGSIb3DQEJARYfY2FsbmV0LWFk
-bWluQGxpc3RzLmJlcmtlbGV5LmVkdTAeFw0xMTA5MDEwNTU1MzRaFw0zMTA5MDEw
-NTU1MzRaMIGsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8G
-A1UEBxMIQmVya2VsZXkxFDASBgNVBAoTC1VDIEJlcmtlbGV5MRMwEQYDVQQLEwpJ
-U1QtQ2FsbmV0MRowGAYDVQQDExFzaGliLmJlcmtlbGV5LmVkdTEuMCwGCSqGSIb3
-DQEJARYfY2FsbmV0LWFkbWluQGxpc3RzLmJlcmtlbGV5LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMEPHLk1prO4Trb9nAgtVYWaqpLi1j0d9rbA
-X6v+/O8zI9ltKshho/r9EWelfxCnVzL2ufs44n+Mgqovl03IJXYKJluHILHppPUW
-tu3FF1D6kD9yXIOqc4vw/GHs5IHEjmm7jWyisNULf9zywjykcswFoBplF4xyhlHA
-k79uN3yYEGlOIQnrQfgMrbrrWTjlbZ/bb3QeFBhFnS6yujyDD1GBl2pWQYFjp+TD
-JBluvuwCe5F7gehqq7mmCWadpVCE/GT2LEgiCMyJxerVwwLjGC63/YF5pJ2NnZhd
-f8g86/GmG3LL/BS4Q1fuZ5A4MBJGT2/iVsGMcmC+/jTzJ3RZC8sCAwEAAaOCARUw
-ggERMB0GA1UdDgQWBBRTW0Xhkt2L5j4f8BJ5RmbxtGNQ/TCB4QYDVR0jBIHZMIHW
-gBRTW0Xhkt2L5j4f8BJ5RmbxtGNQ/aGBsqSBrzCBrDELMAkGA1UEBhMCVVMxEzAR
-BgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCEJlcmtlbGV5MRQwEgYDVQQKEwtV
-QyBCZXJrZWxleTETMBEGA1UECxMKSVNULUNhbG5ldDEaMBgGA1UEAxMRc2hpYi5i
-ZXJrZWxleS5lZHUxLjAsBgkqhkiG9w0BCQEWH2NhbG5ldC1hZG1pbkBsaXN0cy5i
-ZXJrZWxleS5lZHWCCQD4PFZkUkN6QjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
-BQUAA4IBAQBuiTYdJVZE7K20QpIDdRAJb6dQuzaQfz783r3rdk8K4oCEMxclgdIF
-Y1kLF0zGKExTuHke5Jn4fPhSDc66273orJwfX8JPRhj0UsD0oJxiZzX1e47udpKO
-RrH0qjwpuWVq69aRQdNvg2ReEP0YLFrGE05GlBtM1wVXRy6N4TofybNVj9VvcIWR
-j+OKY/1E48QNYKEnxTdKbe5HEzm5Qzh9CwDpnWEEPTYVGXkcZr834c5rfCC9eJFW
-DwHJO2iXtfD8CCpYzg2Qm85yQo3LKavIRnDiPFC0SUliC9pyGGrf9Apsxfisx0Um
-qL/5vv0Vxy0Ba8FeI9WOTs3mSavQNGQ/
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.berkeley.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.berkeley.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.berkeley.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.berkeley.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.berkeley.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.berkeley.edu/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">berkeley.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE9DCCA9ygAwIBAgIJAPg8VmRSQ3pCMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIQmVya2VsZXkx
-FDASBgNVBAoTC1VDIEJlcmtlbGV5MRMwEQYDVQQLEwpJU1QtQ2FsbmV0MRowGAYD
-VQQDExFzaGliLmJlcmtlbGV5LmVkdTEuMCwGCSqGSIb3DQEJARYfY2FsbmV0LWFk
-bWluQGxpc3RzLmJlcmtlbGV5LmVkdTAeFw0xMTA5MDEwNTU1MzRaFw0zMTA5MDEw
-NTU1MzRaMIGsMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8G
-A1UEBxMIQmVya2VsZXkxFDASBgNVBAoTC1VDIEJlcmtlbGV5MRMwEQYDVQQLEwpJ
-U1QtQ2FsbmV0MRowGAYDVQQDExFzaGliLmJlcmtlbGV5LmVkdTEuMCwGCSqGSIb3
-DQEJARYfY2FsbmV0LWFkbWluQGxpc3RzLmJlcmtlbGV5LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMEPHLk1prO4Trb9nAgtVYWaqpLi1j0d9rbA
-X6v+/O8zI9ltKshho/r9EWelfxCnVzL2ufs44n+Mgqovl03IJXYKJluHILHppPUW
-tu3FF1D6kD9yXIOqc4vw/GHs5IHEjmm7jWyisNULf9zywjykcswFoBplF4xyhlHA
-k79uN3yYEGlOIQnrQfgMrbrrWTjlbZ/bb3QeFBhFnS6yujyDD1GBl2pWQYFjp+TD
-JBluvuwCe5F7gehqq7mmCWadpVCE/GT2LEgiCMyJxerVwwLjGC63/YF5pJ2NnZhd
-f8g86/GmG3LL/BS4Q1fuZ5A4MBJGT2/iVsGMcmC+/jTzJ3RZC8sCAwEAAaOCARUw
-ggERMB0GA1UdDgQWBBRTW0Xhkt2L5j4f8BJ5RmbxtGNQ/TCB4QYDVR0jBIHZMIHW
-gBRTW0Xhkt2L5j4f8BJ5RmbxtGNQ/aGBsqSBrzCBrDELMAkGA1UEBhMCVVMxEzAR
-BgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCEJlcmtlbGV5MRQwEgYDVQQKEwtV
-QyBCZXJrZWxleTETMBEGA1UECxMKSVNULUNhbG5ldDEaMBgGA1UEAxMRc2hpYi5i
-ZXJrZWxleS5lZHUxLjAsBgkqhkiG9w0BCQEWH2NhbG5ldC1hZG1pbkBsaXN0cy5i
-ZXJrZWxleS5lZHWCCQD4PFZkUkN6QjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
-BQUAA4IBAQBuiTYdJVZE7K20QpIDdRAJb6dQuzaQfz783r3rdk8K4oCEMxclgdIF
-Y1kLF0zGKExTuHke5Jn4fPhSDc66273orJwfX8JPRhj0UsD0oJxiZzX1e47udpKO
-RrH0qjwpuWVq69aRQdNvg2ReEP0YLFrGE05GlBtM1wVXRy6N4TofybNVj9VvcIWR
-j+OKY/1E48QNYKEnxTdKbe5HEzm5Qzh9CwDpnWEEPTYVGXkcZr834c5rfCC9eJFW
-DwHJO2iXtfD8CCpYzg2Qm85yQo3LKavIRnDiPFC0SUliC9pyGGrf9Apsxfisx0Um
-qL/5vv0Vxy0Ba8FeI9WOTs3mSavQNGQ/
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.berkeley.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.berkeley.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California, Berkeley</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California, Berkeley</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.berkeley.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jeff McCullough</md:GivenName>
-    <md:EmailAddress>jeffmc@berkeley.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Karl Grose</md:GivenName>
-    <md:EmailAddress>karlgrose@berkeley.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-carleton.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-carleton.edu.xml
deleted file mode 100644
index 480097dd..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-carleton.edu.xml
+++ /dev/null
@@ -1,98 +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="urn:mace:incommon:carleton.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login.carleton.edu/error.html" 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">carleton.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Carleton College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Carleton College</mdui:Description>
-        <mdui:Logo height="53" width="321" xml:lang="en">https://www.carleton.edu/departments/ITS/Images/CarletonLogoSmall.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>
-MIIDIjCCAgqgAwIBAgICBDswDQYJKoZIhvcNAQEFBQAwKzEMMAoGA1UECwwDU1NP
-MRswGQYDVQQDDBJsb2dpbi5jYXJsZXRvbi5lZHUwHhcNMTQwNDExMDI0MjAxWhcN
-MjQwNDA4MDI0MjAxWjArMQwwCgYDVQQLDANTU08xGzAZBgNVBAMMEmxvZ2luLmNh
-cmxldG9uLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9/N77y
-FrpOKThUptD//RTM5yjPeE24ao3RNZ9NQWeEn8Lv/PVNgf9cvOvOzS2dUxraqthV
-P9QYwMgRogvs2K4/Jq+dsIm5zVnVLw9610T6b6rZycsXoqwVhNlD3V107jF1QwZz
-6wg42KWhic2mOQ3/Cg6764kUagACOmDhGvvNKqK/bKymCgpAmJoTCc9T6UCYPbgo
-Ea4+CSQ1CL+oCmzVXLt5mj+qWTk7SZpLQajh3DiEPzRhmg7sX0/z3RH4brs5Qewr
-vgr9A05MjOyoIrrFm2CRhLeIzSoSwRdl8EY4Mw6xmISQ9UHKTAWCNOX2EC1Olcw4
-hFAYkqa1nMdbjzkCAwEAAaNQME4wHQYDVR0OBBYEFA/D4JnMpUbqUfqw4R3n9585
-Jj2iMB8GA1UdIwQYMBaAFA/D4JnMpUbqUfqw4R3n9585Jj2iMAwGA1UdEwQFMAMB
-Af8wDQYJKoZIhvcNAQEFBQADggEBACyhKczVUBsf/7OH+Q6+JyggcnL8wPiZOfdi
-O6LBmsBu5gKOKRPX3T8AhOwErOU3bilw6JX3oZ9PZpon3F3DBxPi+oAAsKfbJ0lr
-88DJfPMNrB5LG6EdRWr+a7z1Ch3E5pLRStIw0L/+YdNwyg3bisv0jbz+xWN4LvX6
-RL8eo9ATYSSwl5JJM0D89XovPl534kPjGcp/l3PRp8tEiP6pNBrPWI+KgV0ksqkZ
-bllJv8s7/Np5XwEEQ1KkqCNLI/cvW9u7OIhII7/F0QoKyAvNtdut8e61oQJyyAJq
-Edda89AEn3ZZeCBK6d2ALE01aEjJmH2MElHQbR/a387IpYbztYM=
-          </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>
-MIIDujCCAqICCQCPaJ8ioTbhuDANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMC
-VVMxEjAQBgNVBAgTCU1pbm5lc290YTETMBEGA1UEBxMKTm9ydGhmaWVsZDEZMBcG
-A1UEChMQQ2FybGV0b24gQ29sbGVnZTEMMAoGA1UECxMDSVRTMRswGQYDVQQDExJs
-b2dpbi5jYXJsZXRvbi5lZHUxIDAeBgkqhkiG9w0BCQEWEXdsZWVAY2FybGV0b24u
-ZWR1MB4XDTEzMDIyMTIxNTEyMloXDTIzMDIxOTIxNTEyMlowgZ4xCzAJBgNVBAYT
-AlVTMRIwEAYDVQQIEwlNaW5uZXNvdGExEzARBgNVBAcTCk5vcnRoZmllbGQxGTAX
-BgNVBAoTEENhcmxldG9uIENvbGxlZ2UxDDAKBgNVBAsTA0lUUzEbMBkGA1UEAxMS
-bG9naW4uY2FybGV0b24uZWR1MSAwHgYJKoZIhvcNAQkBFhF3bGVlQGNhcmxldG9u
-LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJJR4aGU0T4Rs+ra
-iaCBqBp75XUZ+W0rnXVuP4oainijV8oepLVo0trGRjYgIHhNKufhtuFtvxkgsq/Q
-qaSR6mmCgKU8YH32gGggjwLBRbMn7aNiJu2PNi03g+NxFW+k3iz/qcuyrkb9CGO5
-QcqMlWznphotRXXXscm94+SBmJ9aeTL4XIUXfEIOdeDdNqZRjjvuKck83Mbqn/4t
-69uZcrOM0BFQFhJOE5vgJ9kOEBnsS+3dYbEndfK1dXnxp88gLaWY/4GvvOUwQTub
-suvy9/hlyLUpNz/sZFNM7KekQUjKv2/qu3hi+gvl4Dl5LuEbug38XKZDQ75pZOm5
-PROnhKMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAdTupllJ0sDvllI+4Jgn+DwPT
-lzOM5I7Y2MVkHtodZCyrT6qRaP4oX369LVG0S3vQbChVi1gW0CljeUl9e616nkaN
-J89UhUhN3r9t5412qQ8/Lyq+LX1912yUyCuW8JMQXFbVlMS0b/FvJmXPYlLpFIf1
-DGbJW/HYJ07x+5V7hONXUmEvh8SZo+JXmTO37hLOBGSyteXbWJv7VptIm/fD6411
-cYLejujXijfbVj38Ijcucjrel7dJ2Zl8nnmkn3VlRFdEuRScuWudI+7rS6Ux+Dwc
-25Ls34lI9+W9mXyA7ix0qDjNmpRccdkzLcvfTgYC7q5VGzyToU4S2u7AZvcxeA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.carleton.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.carleton.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.carleton.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.carleton.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Carleton College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Carleton College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.carleton.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Candyce Lelm</md:GivenName>
-    <md:EmailAddress>clelm@carleton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Rich Graves</md:GivenName>
-    <md:EmailAddress>rgraves@carleton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Les LaCroix</md:GivenName>
-    <md:EmailAddress>llacroix@carleton.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-case.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-case.edu.xml
deleted file mode 100644
index c0fb862e..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-case.edu.xml
+++ /dev/null
@@ -1,99 +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="urn:mace:incommon:case.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">case.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Case Western Reserve University</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>
-MIIDIzCCAgugAwIBAgIUZg+QtZy18Ty8wtEmZfdNYUEbjU0wDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOc2hpYmIuY2FzZS5lZHUwHhcNMTAwODA4MjE1MTU5WhcN
-MzAwODA4MjE1MTU5WjAZMRcwFQYDVQQDEw5zaGliYi5jYXNlLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAO7wuAJG03dDThvlaaHOPuDnm6y87IUe
-8v1k2Q6b0dUHjA9tQmrXnC1kibB/dPGDINNq83FLtfqE11iKng91AUte/5NWKgyK
-e9gNSB+KTf1wFFXmCMm7PpcyqFhPADaoeET4g8393I7m47h1JzD/lK1afOPfgpSV
-NTlVsZB7gtOQnQIvQPiluv0VI7djTLy+s8CDjft6lDCNk1jM27coUpd6GI0ZRluZ
-H9t3a4E1IHhL/1RU7cAoO/G3ew9x+OqsseLHTxYzCrNxLeN83Ctz2k/klCrDwVdp
-quZwVjRhF2b01byuGeeW1RJMsHIZnRiRxZuPkTyfTRwQ1TTvzWnRWqsCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOc2hpYmIuY2FzZS5lZHWGJWh0dHBzOi8vc2hpYmIuY2Fz
-ZS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFF6t11AZ9Ah7nif1EO1Vsfc5
-0f5oMA0GCSqGSIb3DQEBBQUAA4IBAQAcQYxE2yCZIIXJIXO+BBj94bpIFBwwyakV
-nCTiiHM5pMiVpysHXIDJ4eglE1Ox84oqFfe7gnh+wnwAx9Lyi5g1MxhkEhPEjTFK
-8O6agQC2j4S0Yzy+nAnMeHS61G24ZtQFNJFsql3KtJyPCWr24vKFAT2pMQr/GIWm
-4Z7+DnxIrAuc2niaWlGzLYuMMVey78grsk+n+J4FhEuP/ad2FGbRmXwv9yLlR5TP
-Y95Vc7ddQcRmKwiMkEKCRCPyRqAVV0Cs6LidPlinGMeQgA2H/zyxmZ5qM63sxpPe
-LRP0OmLbglzlhEOSOKp7/3fIWR/s1QjG/8i4VkCv2koLyPWqhs3I
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.case.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.case.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibb.case.edu/shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibb.case.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibb.case.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibb.case.edu/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">case.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUZg+QtZy18Ty8wtEmZfdNYUEbjU0wDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOc2hpYmIuY2FzZS5lZHUwHhcNMTAwODA4MjE1MTU5WhcN
-MzAwODA4MjE1MTU5WjAZMRcwFQYDVQQDEw5zaGliYi5jYXNlLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAO7wuAJG03dDThvlaaHOPuDnm6y87IUe
-8v1k2Q6b0dUHjA9tQmrXnC1kibB/dPGDINNq83FLtfqE11iKng91AUte/5NWKgyK
-e9gNSB+KTf1wFFXmCMm7PpcyqFhPADaoeET4g8393I7m47h1JzD/lK1afOPfgpSV
-NTlVsZB7gtOQnQIvQPiluv0VI7djTLy+s8CDjft6lDCNk1jM27coUpd6GI0ZRluZ
-H9t3a4E1IHhL/1RU7cAoO/G3ew9x+OqsseLHTxYzCrNxLeN83Ctz2k/klCrDwVdp
-quZwVjRhF2b01byuGeeW1RJMsHIZnRiRxZuPkTyfTRwQ1TTvzWnRWqsCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOc2hpYmIuY2FzZS5lZHWGJWh0dHBzOi8vc2hpYmIuY2Fz
-ZS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFF6t11AZ9Ah7nif1EO1Vsfc5
-0f5oMA0GCSqGSIb3DQEBBQUAA4IBAQAcQYxE2yCZIIXJIXO+BBj94bpIFBwwyakV
-nCTiiHM5pMiVpysHXIDJ4eglE1Ox84oqFfe7gnh+wnwAx9Lyi5g1MxhkEhPEjTFK
-8O6agQC2j4S0Yzy+nAnMeHS61G24ZtQFNJFsql3KtJyPCWr24vKFAT2pMQr/GIWm
-4Z7+DnxIrAuc2niaWlGzLYuMMVey78grsk+n+J4FhEuP/ad2FGbRmXwv9yLlR5TP
-Y95Vc7ddQcRmKwiMkEKCRCPyRqAVV0Cs6LidPlinGMeQgA2H/zyxmZ5qM63sxpPe
-LRP0OmLbglzlhEOSOKp7/3fIWR/s1QjG/8i4VkCv2koLyPWqhs3I
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibb.case.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibb.case.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Case Western Reserve University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Case Western Reserve University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cwru.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jeremy Smith</md:GivenName>
-    <md:EmailAddress>jeremy.smith@case.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David Kovacic</md:GivenName>
-    <md:EmailAddress>david.kovacic@case.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Authentication Support</md:GivenName>
-    <md:EmailAddress>sso-admin@case.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-clemson.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-clemson.edu.xml
deleted file mode 100644
index e6c28366..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-clemson.edu.xml
+++ /dev/null
@@ -1,164 +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="urn:mace:incommon:clemson.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</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">clemson.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Clemson University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider for Clemson University</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.clemson.edu/ccit/help_support/safe_computing/resources/best_practices.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.clemson.edu/ccit/about/policies/index.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="130" width="449" xml:lang="en">https://www.clemson.edu/administration/public-affairs/toolbox/downloads/logos/logos/wordmark.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>
-MIIDMjCCAhqgAwIBAgIJAIWTbV26VuPeMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2lkcC5jbGVtc29uLmVkdTAeFw0xNDAxMjIxOTI0NTBaFw0yNDAxMjAxOTI0
-NTBaMBoxGDAWBgNVBAMTD2lkcC5jbGVtc29uLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKh970CMYkhnBWn4flEVBZxZyx6OjF9Y5TzcsAQPEqb+
-J8e0f8+eoi/SjCH62J3wkycb637xVGcpOe8gxheqb/yAoO/1XkQcQqGGDFwe5i2C
-acfNy2GzEjXoTuwPZv1rBMeeTJ5GWeuO7kP0xJMUz6EwgnEPky/KO4jTLmQElD0O
-nr2LUe3r6RNh/iQdVuR7OU6aNIGoRB0TDoth7Gvb11Y/ztkVss9Be/9B7ILKVrF5
-EQqt6rXb1Uam0wNcFRt1UWnzwvWqTOD3ndsIP3/okWpKezk90gJmQ31jIUqPUWAB
-3Jq8rASoKBtm4v6m8/PVxqaiDVUP3pMoDn/kuC2tdgECAwEAAaN7MHkwHQYDVR0O
-BBYEFGRIag6EZ77qa33zp5/pHiGTYl15MEoGA1UdIwRDMEGAFGRIag6EZ77qa33z
-p5/pHiGTYl15oR6kHDAaMRgwFgYDVQQDEw9pZHAuY2xlbXNvbi5lZHWCCQCFk21d
-ulbj3jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB/PeqBB+qaogdv
-7IqcXrz7mgftKI8mUFae76rzVGnIPIYMyManRceCRfVnvPFrNKOjoUuqQRg3dQsE
-SzUMzFWD4IHcbUP1xI+o8o1FtyM6KYMQE1DIV0GbsZ5FAlGEhWjrYGhJ/SqIeakg
-MiLtXO/Y+b8Ys4mAtdJS3Bx/qM+hfYWc8oJMaJZeHcEzqC/MaBxvkxz5VTkq9hN4
-EGUdMHmqx12yrMmweKwJ2thh2DOEebiJeJ8DBvj44kmSGMoEWw7HCC3wQOUsTrjv
-KmFS8uC55wmP9wsWXa8g5S7eim10poro2UW5dSOGYhET3GVG7rywL//9eP9bH6nG
-gf9X1kGw
-          </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>
-MIIDMjCCAhqgAwIBAgIJAPsDZoExwhElMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2lkcC5jbGVtc29uLmVkdTAeFw0xMTAxMjQxOTMyMzdaFw0xNDAxMjMxOTMy
-MzdaMBoxGDAWBgNVBAMTD2lkcC5jbGVtc29uLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAK5YIc776NBPnEjgRsVCNaQxK4Ea8sTBbD6f3v9bGnaH
-io+9fA1h89k7ojvX7csWUtGBL304AM7Kx0rMgCgi+OFF6e45mqAkwhqHSfCwmGvu
-F9rj79DS13WqKWZDMfU3+CotMgUzbFRKO5ouVPv0WaF8qbtZlOZztjJj5997oLXp
-TxCY4t3+nQyT6saGMmuL8o6nP08j98Bk+yfZmuJXa+Yhgwpmvi1GBCM17Kc8+1fW
-HZO1yUtDPjwPgB5lzhvur8eNSjAnWexSW8qxfZq+Nnz7gEXw9pTk2fIAEu7Jz6YC
-wUeaq7XHnYDqZPnZoQPF1R23tA6WtBDIUP3CIplBAZsCAwEAAaN7MHkwHQYDVR0O
-BBYEFE7t7i1ZDwXlPDO370w3RhyPPY28MEoGA1UdIwRDMEGAFE7t7i1ZDwXlPDO3
-70w3RhyPPY28oR6kHDAaMRgwFgYDVQQDEw9pZHAuY2xlbXNvbi5lZHWCCQD7A2aB
-McIRJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCtkW8qB2pVFIX0
-DCmp833kDMP9ySpN5MnM1camlHRCm9YfAPZVYrP5DL/FJDnWbNW4svhkW0jyzdrU
-DFrh29mZCRFNse9VuOs8f3isBavcnaPdriHBo88ciTuAEV93BgT/+Q14xPx1phXH
-1eSLXJewMPoq1zWOv93U/8IKbtcGL9lrXGHtnurCcd4EeMHGoc7jZpvZ101daDTx
-NNUqqKY9PkPijGeGztwogiwosxr6SCiwsQWc2OzcGslAVPCFkpQTlIlYN1xm19R/
-cRa+GNX9yfCwaDszTvIkvAfks4q+/J8F5Pu/OiWT1CQTL//bvVf0c38c9SLY9uVI
-W9jOpMFc
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.clemson.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.clemson.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.clemson.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.clemson.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.clemson.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.clemson.edu/idp/profile/SAML2/POST-SimpleSign/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">clemson.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMjCCAhqgAwIBAgIJAIWTbV26VuPeMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2lkcC5jbGVtc29uLmVkdTAeFw0xNDAxMjIxOTI0NTBaFw0yNDAxMjAxOTI0
-NTBaMBoxGDAWBgNVBAMTD2lkcC5jbGVtc29uLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKh970CMYkhnBWn4flEVBZxZyx6OjF9Y5TzcsAQPEqb+
-J8e0f8+eoi/SjCH62J3wkycb637xVGcpOe8gxheqb/yAoO/1XkQcQqGGDFwe5i2C
-acfNy2GzEjXoTuwPZv1rBMeeTJ5GWeuO7kP0xJMUz6EwgnEPky/KO4jTLmQElD0O
-nr2LUe3r6RNh/iQdVuR7OU6aNIGoRB0TDoth7Gvb11Y/ztkVss9Be/9B7ILKVrF5
-EQqt6rXb1Uam0wNcFRt1UWnzwvWqTOD3ndsIP3/okWpKezk90gJmQ31jIUqPUWAB
-3Jq8rASoKBtm4v6m8/PVxqaiDVUP3pMoDn/kuC2tdgECAwEAAaN7MHkwHQYDVR0O
-BBYEFGRIag6EZ77qa33zp5/pHiGTYl15MEoGA1UdIwRDMEGAFGRIag6EZ77qa33z
-p5/pHiGTYl15oR6kHDAaMRgwFgYDVQQDEw9pZHAuY2xlbXNvbi5lZHWCCQCFk21d
-ulbj3jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB/PeqBB+qaogdv
-7IqcXrz7mgftKI8mUFae76rzVGnIPIYMyManRceCRfVnvPFrNKOjoUuqQRg3dQsE
-SzUMzFWD4IHcbUP1xI+o8o1FtyM6KYMQE1DIV0GbsZ5FAlGEhWjrYGhJ/SqIeakg
-MiLtXO/Y+b8Ys4mAtdJS3Bx/qM+hfYWc8oJMaJZeHcEzqC/MaBxvkxz5VTkq9hN4
-EGUdMHmqx12yrMmweKwJ2thh2DOEebiJeJ8DBvj44kmSGMoEWw7HCC3wQOUsTrjv
-KmFS8uC55wmP9wsWXa8g5S7eim10poro2UW5dSOGYhET3GVG7rywL//9eP9bH6nG
-gf9X1kGw
-          </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>
-MIIDMjCCAhqgAwIBAgIJAPsDZoExwhElMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-BAMTD2lkcC5jbGVtc29uLmVkdTAeFw0xMTAxMjQxOTMyMzdaFw0xNDAxMjMxOTMy
-MzdaMBoxGDAWBgNVBAMTD2lkcC5jbGVtc29uLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAK5YIc776NBPnEjgRsVCNaQxK4Ea8sTBbD6f3v9bGnaH
-io+9fA1h89k7ojvX7csWUtGBL304AM7Kx0rMgCgi+OFF6e45mqAkwhqHSfCwmGvu
-F9rj79DS13WqKWZDMfU3+CotMgUzbFRKO5ouVPv0WaF8qbtZlOZztjJj5997oLXp
-TxCY4t3+nQyT6saGMmuL8o6nP08j98Bk+yfZmuJXa+Yhgwpmvi1GBCM17Kc8+1fW
-HZO1yUtDPjwPgB5lzhvur8eNSjAnWexSW8qxfZq+Nnz7gEXw9pTk2fIAEu7Jz6YC
-wUeaq7XHnYDqZPnZoQPF1R23tA6WtBDIUP3CIplBAZsCAwEAAaN7MHkwHQYDVR0O
-BBYEFE7t7i1ZDwXlPDO370w3RhyPPY28MEoGA1UdIwRDMEGAFE7t7i1ZDwXlPDO3
-70w3RhyPPY28oR6kHDAaMRgwFgYDVQQDEw9pZHAuY2xlbXNvbi5lZHWCCQD7A2aB
-McIRJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCtkW8qB2pVFIX0
-DCmp833kDMP9ySpN5MnM1camlHRCm9YfAPZVYrP5DL/FJDnWbNW4svhkW0jyzdrU
-DFrh29mZCRFNse9VuOs8f3isBavcnaPdriHBo88ciTuAEV93BgT/+Q14xPx1phXH
-1eSLXJewMPoq1zWOv93U/8IKbtcGL9lrXGHtnurCcd4EeMHGoc7jZpvZ101daDTx
-NNUqqKY9PkPijGeGztwogiwosxr6SCiwsQWc2OzcGslAVPCFkpQTlIlYN1xm19R/
-cRa+GNX9yfCwaDszTvIkvAfks4q+/J8F5Pu/OiWT1CQTL//bvVf0c38c9SLY9uVI
-W9jOpMFc
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.clemson.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.clemson.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Clemson University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Clemson University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.clemson.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Barry Johnson</md:GivenName>
-    <md:EmailAddress>hbj@clemson.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Barry Johnson</md:GivenName>
-    <md:EmailAddress>hbj@clemson.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kathy E. Wright</md:GivenName>
-    <md:EmailAddress>kewrig@clemson.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>CCIT Web Authentication</md:GivenName>
-    <md:EmailAddress>SHIBBOLETHOPS@lists.clemson.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-columbia.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-columbia.edu.xml
deleted file mode 100644
index 79d8f0a4..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-columbia.edu.xml
+++ /dev/null
@@ -1,152 +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="urn:mace:incommon:columbia.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">columbia.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Columbia University</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>
-MIIDRzCCAi+gAwIBAgIUAb+rsLUvjwiVA2iVgiHAFGrtCPgwDQYJKoZIhvcNAQEF
-BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5jb2x1bWJpYS5lZHUwHhcNMTMwODIy
-MTQ1MzUzWhcNMzMwODIyMTQ1MzUzWjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLmNv
-bHVtYmlhLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI7SLAsn
-a5WvacfnU0e2UxlaoLmS95HPJG/Va+A2GHLQP0pFvahmyFraCxg5EqMhbLG5RIFm
-8c104JI6bm8X4p76AWoDdBvbNXYwvOZb5nRqurEnVdgMChP9uTTl5Nj0Bi5R/5x7
-HPZT2qCX6O2X+QZX96+FBbpAf0670+WAHiw14BiC3ldOctkGUYs1fSdVnSxLpKpb
-7WM5yecI6QuuGh2e4+BLRx+0FdqKjOp8vxiJtVDd2lR6zi+MhTfJYvmDkvXVDm+D
-ufR1jkD5OQpKdt/C9rOw9tZMNbK2lFIsdS90Hxuup0zN6fM6UD1MTdZCEHd4Wk5J
-dV3TUmTBvQlmU9cCAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmJvbGV0aC5jb2x1
-bWJpYS5lZHWGLmh0dHBzOi8vc2hpYmJvbGV0aC5jb2x1bWJpYS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFAU5juyHFYRDoXhLrDPCEwuXc+1yMA0GCSqGSIb3
-DQEBBQUAA4IBAQALshOYjyRNiPpwTQL7/JtPl/EeZnexmZJAWN6OUGQYgG3QioYU
-HrkaNrKIqpVdmUFBQF7j9DWpknvT4UZ2KmkwHX9oOnn0kGJb4l3lzk5uhq8K9IHn
-nKLhYgrUbhzo2O0sCKONu0uZ/LjhUybVJYhTsxphCDUvaIO6rdoFArsErP1b8Yx2
-VlkYQLauLDhGVRNVuInSvii9B7T/8FJq90WHNfsuaBozqBIdifRq/2EB9JtiKUU9
-KS2JbAGCjAxg8D/IO5Y3JhdpMYx0fuyf1oLPc3weclFDj96Zc8VgGAmbbd+nFPh1
-O/X2TpwWYqPATAUn9yoZrNWjN34vmdHWTTGD
-          </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>
-MIIDTDCCAjSgAwIBAgIJAIl0siricUkMMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF3NoaWJib2xldGguY29sdW1iaWEuZWR1MB4XDTEwMTExMTE1MzA0NFoXDTEz
-MTExMDE1MzA0NFowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5jb2x1bWJpYS5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWjoqFCayNeBKxkMEnxr7E
-gIThLd4Cn1TN+gVMKrOfzy3K1piRa/J6QT+Q30lDSE0NggcAAfH5oPgSXzzYtfmw
-w/7CD2RpyxQdbrtdEWl6Q7lQ54cvB7LcD7FqTRysffT6sWUAoxMmmcJN/G7TGLrT
-9GkRj/YR3sTtc/lj1up87/TozuvE/HAIP0Nz1QmEZYaPzDBtb0qHhf7mOXpkgD6c
-hX4xa+fVaS8WfmA+C8aSEgIVNWqkhucViWgO52FxYLPf6YzZyLHKAkeb67ZLbd9u
-BP2q5EcNBqk2CLK3FlGMb2uAqEGpUFt1X7XKpLmYhgZq6U46hWot72Pi8L3gYgt3
-AgMBAAGjgYQwgYEwHQYDVR0OBBYEFLGHZK66cPz5gqnI14/iqTPiWg+WMFIGA1Ud
-IwRLMEmAFLGHZK66cPz5gqnI14/iqTPiWg+WoSakJDAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmNvbHVtYmlhLmVkdYIJAIl0siricUkMMAwGA1UdEwQFMAMBAf8wDQYJ
-KoZIhvcNAQEFBQADggEBALRYcFPeL+X5heZql6OwheiHLIxps9KhMJ9f81a+mCWm
-0D47JtvqVesH72gUrXEwY0W2lR8DKQjwoLTGAJ1fE8TNgTYMa7cjoQwGOz4YayvL
-jRIvGbOJTw6RoED8hklpBJUfaySXNnh5cXIr0S8It8apm3J8403F7dfpL+NikSxm
-LaD7Et+qJksnCwzDP8flxnOh7pfQEBnWiZqrlnejs+k7nMabsU5jXFPAsjJBR0Wu
-vZeuP/5/wZLYQT2FOsNGSiS26AAWU7AboFTQEOr9f9bCXOz+tboQ2ILl4RCVhtid
-0LjfAWgeogSSTJKUYSArP+vkEsNza15mXrRWKfRcl0o=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.columbia.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.columbia.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.columbia.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.columbia.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.columbia.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.columbia.edu/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">columbia.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRzCCAi+gAwIBAgIUAb+rsLUvjwiVA2iVgiHAFGrtCPgwDQYJKoZIhvcNAQEF
-BQAwIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5jb2x1bWJpYS5lZHUwHhcNMTMwODIy
-MTQ1MzUzWhcNMzMwODIyMTQ1MzUzWjAiMSAwHgYDVQQDExdzaGliYm9sZXRoLmNv
-bHVtYmlhLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI7SLAsn
-a5WvacfnU0e2UxlaoLmS95HPJG/Va+A2GHLQP0pFvahmyFraCxg5EqMhbLG5RIFm
-8c104JI6bm8X4p76AWoDdBvbNXYwvOZb5nRqurEnVdgMChP9uTTl5Nj0Bi5R/5x7
-HPZT2qCX6O2X+QZX96+FBbpAf0670+WAHiw14BiC3ldOctkGUYs1fSdVnSxLpKpb
-7WM5yecI6QuuGh2e4+BLRx+0FdqKjOp8vxiJtVDd2lR6zi+MhTfJYvmDkvXVDm+D
-ufR1jkD5OQpKdt/C9rOw9tZMNbK2lFIsdS90Hxuup0zN6fM6UD1MTdZCEHd4Wk5J
-dV3TUmTBvQlmU9cCAwEAAaN1MHMwUgYDVR0RBEswSYIXc2hpYmJvbGV0aC5jb2x1
-bWJpYS5lZHWGLmh0dHBzOi8vc2hpYmJvbGV0aC5jb2x1bWJpYS5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFAU5juyHFYRDoXhLrDPCEwuXc+1yMA0GCSqGSIb3
-DQEBBQUAA4IBAQALshOYjyRNiPpwTQL7/JtPl/EeZnexmZJAWN6OUGQYgG3QioYU
-HrkaNrKIqpVdmUFBQF7j9DWpknvT4UZ2KmkwHX9oOnn0kGJb4l3lzk5uhq8K9IHn
-nKLhYgrUbhzo2O0sCKONu0uZ/LjhUybVJYhTsxphCDUvaIO6rdoFArsErP1b8Yx2
-VlkYQLauLDhGVRNVuInSvii9B7T/8FJq90WHNfsuaBozqBIdifRq/2EB9JtiKUU9
-KS2JbAGCjAxg8D/IO5Y3JhdpMYx0fuyf1oLPc3weclFDj96Zc8VgGAmbbd+nFPh1
-O/X2TpwWYqPATAUn9yoZrNWjN34vmdHWTTGD
-          </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>
-MIIDTDCCAjSgAwIBAgIJAIl0siricUkMMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-BAMTF3NoaWJib2xldGguY29sdW1iaWEuZWR1MB4XDTEwMTExMTE1MzA0NFoXDTEz
-MTExMDE1MzA0NFowIjEgMB4GA1UEAxMXc2hpYmJvbGV0aC5jb2x1bWJpYS5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWjoqFCayNeBKxkMEnxr7E
-gIThLd4Cn1TN+gVMKrOfzy3K1piRa/J6QT+Q30lDSE0NggcAAfH5oPgSXzzYtfmw
-w/7CD2RpyxQdbrtdEWl6Q7lQ54cvB7LcD7FqTRysffT6sWUAoxMmmcJN/G7TGLrT
-9GkRj/YR3sTtc/lj1up87/TozuvE/HAIP0Nz1QmEZYaPzDBtb0qHhf7mOXpkgD6c
-hX4xa+fVaS8WfmA+C8aSEgIVNWqkhucViWgO52FxYLPf6YzZyLHKAkeb67ZLbd9u
-BP2q5EcNBqk2CLK3FlGMb2uAqEGpUFt1X7XKpLmYhgZq6U46hWot72Pi8L3gYgt3
-AgMBAAGjgYQwgYEwHQYDVR0OBBYEFLGHZK66cPz5gqnI14/iqTPiWg+WMFIGA1Ud
-IwRLMEmAFLGHZK66cPz5gqnI14/iqTPiWg+WoSakJDAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmNvbHVtYmlhLmVkdYIJAIl0siricUkMMAwGA1UdEwQFMAMBAf8wDQYJ
-KoZIhvcNAQEFBQADggEBALRYcFPeL+X5heZql6OwheiHLIxps9KhMJ9f81a+mCWm
-0D47JtvqVesH72gUrXEwY0W2lR8DKQjwoLTGAJ1fE8TNgTYMa7cjoQwGOz4YayvL
-jRIvGbOJTw6RoED8hklpBJUfaySXNnh5cXIr0S8It8apm3J8403F7dfpL+NikSxm
-LaD7Et+qJksnCwzDP8flxnOh7pfQEBnWiZqrlnejs+k7nMabsU5jXFPAsjJBR0Wu
-vZeuP/5/wZLYQT2FOsNGSiS26AAWU7AboFTQEOr9f9bCXOz+tboQ2ILl4RCVhtid
-0LjfAWgeogSSTJKUYSArP+vkEsNza15mXrRWKfRcl0o=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.columbia.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.columbia.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Columbia University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Columbia University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.columbia.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andrew Johnston</md:GivenName>
-    <md:EmailAddress>andrew@columbia.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Identity and Access Management Group</md:GivenName>
-    <md:EmailAddress>iam-group@columbia.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-csun.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-csun.edu.xml
deleted file mode 100644
index 8a4ee119..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-csun.edu.xml
+++ /dev/null
@@ -1,171 +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="urn:mace:incommon:csun.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">csun.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, Northridge</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>
-MIIDJzCCAg+gAwIBAgIUY2uSdWZf8iUsvSq94OJMJ4nik78wDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPY29kbGV0LmNzdW4uZWR1MB4XDTA5MDczMDE2MTE1MFoX
-DTI5MDczMDE2MTE1MFowGjEYMBYGA1UEAxMPY29kbGV0LmNzdW4uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvcIJNc9pBDyp7afaRauK/6BaWEj8
-pCNlJew9KniMreB6kFLeKVtMXeV3ucoem+RlsWTyMrfkVEzGOV7o/ONv+lNH+I6E
-wPzL1cNToMY+N7sb/BMAundO5qbVpFclFWkgg8R5fyqv25ropAoXYaMHxpdU4aJq
-wMndxHdQSteaQiLD9n+cEM06hnrxaB0yvl4NBKRgTECNpR4ArxzrRA5DocV3CDCG
-v6OmbDPu5qF2j653JCpoYD/yXr9k0zZA3fc7Od0Jhy8Lcbo3LC/Y+MtBAoipfxts
-q6JAbGAFhaeGr+oaSvMzFsiI63Yrg/Q4+ykRvmOpnX4qAAONHuVFbk+UGQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9jb2RsZXQuY3N1bi5lZHWGJmh0dHBzOi8vY29kbGV0
-LmNzdW4uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRbdJgHXpfz22+xZ4Zw
-/Xf8fCnARjANBgkqhkiG9w0BAQUFAAOCAQEAc6CsTPazYg64kzcnGU3NHzpz//Fz
-M6BsoqTYeJBlAzyq/n6bTws+Ii1Awf8QDWK8CokJz2z6jFd6RbOpQjA1Eu3P8kK8
-OuW9XQt4u6ovT6ht8oZZr3CRczSLoJG+Y02p0logf00u5NMH6skjkAllYQmcJ+rm
-ECBgb3NgBX2PFRZeC29gH20w5H0eTU9uORUTuINxASL42C48GIOScGawhoQsuoF9
-/OV1ae3LnYM8uqGzgYcC7I4KTxND5pPWdIQxlwoiX7ltroxhFVK74fFW65Hb9vdV
-gQxt3E011CLn6QqiHbbvGZoTTd9MJ1kPsejqryDgepMfD9VX2z+ieVsdgw==
-          </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>
-MIIFmzCCBIOgAwIBAgIRAJo9a0/2NuQ/0LhXpZXousEwDQYJKoZIhvcNAQELBQAw
-djELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1JMRIwEAYDVQQHEwlBbm4gQXJib3Ix
-EjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5Db21tb24xHzAdBgNVBAMT
-FkluQ29tbW9uIFJTQSBTZXJ2ZXIgQ0EwHhcNMTUwOTA0MDAwMDAwWhcNMTYwOTAz
-MjM1OTU5WjCB0DELMAkGA1UEBhMCVVMxDjAMBgNVBBETBTkxMzMwMQswCQYDVQQI
-EwJDQTETMBEGA1UEBxMKTm9ydGhyaWRnZTEeMBwGA1UECRMVMTgxMTEgTm9yZGhv
-ZmYgU3RyZWV0MTAwLgYDVQQKEydDYWxpZm9ybmlhIFN0YXRlIFVuaXZlcnNpdHks
-IE5vcnRocmlkZ2UxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRlY2hub2xvZ3kxHDAa
-BgNVBAMTE3NoaWJib2xldGguY3N1bi5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCLDEDuwl7fPi1w2l9MyC6FpxU1EhRLYLdrRRhmQ+9P6ncZQuKq
-W4jwlUGPx85e6tBdl5zwj5CfpuLFiqjPsqX4mt4tE2xrRFsk5jDSlE5dFAwBjxIH
-ifoNnh0Qj1j9cXQJu7FhTM/Aoz8UG+IwLuIqFLJRkk9ycxuOdD3WCt250G+ptum0
-mUtYuflHSphJRT6JYhQxThcPBAjlmg/nlUWspXcFtMh6ERZMgK0aqyBxs/Vao4sQ
-u7XmrcxSfyIO0FPjanm22HleJp6ZbDi1QhQo7iQiMxcfXI0Smcv0XUhoMOnInDwr
-Slb4BoRtexwOEW978USZA2lpXvSzrDwJpV4/AgMBAAGjggHHMIIBwzAfBgNVHSME
-GDAWgBQeBaN3j2yW4luHS6a0hqxxAAznODAdBgNVHQ4EFgQU0dVlPlTcESZV7N62
-gvYHEK2eq3owDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMGcGA1UdIARgMF4wUgYMKwYBBAGuIwEEAwEB
-MEIwQAYIKwYBBQUHAgEWNGh0dHBzOi8vd3d3LmluY29tbW9uLm9yZy9jZXJ0L3Jl
-cG9zaXRvcnkvY3BzX3NzbC5wZGYwCAYGZ4EMAQICMEQGA1UdHwQ9MDswOaA3oDWG
-M2h0dHA6Ly9jcmwuaW5jb21tb24tcnNhLm9yZy9JbkNvbW1vblJTQVNlcnZlckNB
-LmNybDB1BggrBgEFBQcBAQRpMGcwPgYIKwYBBQUHMAKGMmh0dHA6Ly9jcnQudXNl
-cnRydXN0LmNvbS9JbkNvbW1vblJTQVNlcnZlckNBXzIuY3J0MCUGCCsGAQUFBzAB
-hhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMB4GA1UdEQQXMBWCE3NoaWJib2xl
-dGguY3N1bi5lZHUwDQYJKoZIhvcNAQELBQADggEBAF2Cjq42x6LZ/xazRCfLPoN7
-LV8BfSWUqMdR53bme4eIx/CpZ98HtR7lgNTuk7cAMhByFccKE/Lr7sX2N/4EJQos
-BAmuBKvZ3/7MvTjfx2FkVxMGBT1qmhOHjvolCAVMMGQIAiSsooD6oI28fjprU5VH
-5YwAKog+yO9HmAIfFCC5jdfTSC0MpfD+omDfZJSVyz9TYXyMBpuOj3DfIgh5lHfq
-8Okjj9vd1FWidEfxvNmfBLHaTeuEuZTPFKDPYcflZ+z7TYn5C2FqigZ7Bhfdmq8d
-8XdzO4Qjp5GshUVPkDwnH1BoEGJJqA/5dVeSlkvWiwdTvuS1bTalOVKPaG75oRk=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csun.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csun.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.csun.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.csun.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.csun.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.csun.edu/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">csun.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUY2uSdWZf8iUsvSq94OJMJ4nik78wDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPY29kbGV0LmNzdW4uZWR1MB4XDTA5MDczMDE2MTE1MFoX
-DTI5MDczMDE2MTE1MFowGjEYMBYGA1UEAxMPY29kbGV0LmNzdW4uZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvcIJNc9pBDyp7afaRauK/6BaWEj8
-pCNlJew9KniMreB6kFLeKVtMXeV3ucoem+RlsWTyMrfkVEzGOV7o/ONv+lNH+I6E
-wPzL1cNToMY+N7sb/BMAundO5qbVpFclFWkgg8R5fyqv25ropAoXYaMHxpdU4aJq
-wMndxHdQSteaQiLD9n+cEM06hnrxaB0yvl4NBKRgTECNpR4ArxzrRA5DocV3CDCG
-v6OmbDPu5qF2j653JCpoYD/yXr9k0zZA3fc7Od0Jhy8Lcbo3LC/Y+MtBAoipfxts
-q6JAbGAFhaeGr+oaSvMzFsiI63Yrg/Q4+ykRvmOpnX4qAAONHuVFbk+UGQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9jb2RsZXQuY3N1bi5lZHWGJmh0dHBzOi8vY29kbGV0
-LmNzdW4uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRbdJgHXpfz22+xZ4Zw
-/Xf8fCnARjANBgkqhkiG9w0BAQUFAAOCAQEAc6CsTPazYg64kzcnGU3NHzpz//Fz
-M6BsoqTYeJBlAzyq/n6bTws+Ii1Awf8QDWK8CokJz2z6jFd6RbOpQjA1Eu3P8kK8
-OuW9XQt4u6ovT6ht8oZZr3CRczSLoJG+Y02p0logf00u5NMH6skjkAllYQmcJ+rm
-ECBgb3NgBX2PFRZeC29gH20w5H0eTU9uORUTuINxASL42C48GIOScGawhoQsuoF9
-/OV1ae3LnYM8uqGzgYcC7I4KTxND5pPWdIQxlwoiX7ltroxhFVK74fFW65Hb9vdV
-gQxt3E011CLn6QqiHbbvGZoTTd9MJ1kPsejqryDgepMfD9VX2z+ieVsdgw==
-          </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>
-MIIFmzCCBIOgAwIBAgIRAJo9a0/2NuQ/0LhXpZXousEwDQYJKoZIhvcNAQELBQAw
-djELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1JMRIwEAYDVQQHEwlBbm4gQXJib3Ix
-EjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5Db21tb24xHzAdBgNVBAMT
-FkluQ29tbW9uIFJTQSBTZXJ2ZXIgQ0EwHhcNMTUwOTA0MDAwMDAwWhcNMTYwOTAz
-MjM1OTU5WjCB0DELMAkGA1UEBhMCVVMxDjAMBgNVBBETBTkxMzMwMQswCQYDVQQI
-EwJDQTETMBEGA1UEBxMKTm9ydGhyaWRnZTEeMBwGA1UECRMVMTgxMTEgTm9yZGhv
-ZmYgU3RyZWV0MTAwLgYDVQQKEydDYWxpZm9ybmlhIFN0YXRlIFVuaXZlcnNpdHks
-IE5vcnRocmlkZ2UxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRlY2hub2xvZ3kxHDAa
-BgNVBAMTE3NoaWJib2xldGguY3N1bi5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCLDEDuwl7fPi1w2l9MyC6FpxU1EhRLYLdrRRhmQ+9P6ncZQuKq
-W4jwlUGPx85e6tBdl5zwj5CfpuLFiqjPsqX4mt4tE2xrRFsk5jDSlE5dFAwBjxIH
-ifoNnh0Qj1j9cXQJu7FhTM/Aoz8UG+IwLuIqFLJRkk9ycxuOdD3WCt250G+ptum0
-mUtYuflHSphJRT6JYhQxThcPBAjlmg/nlUWspXcFtMh6ERZMgK0aqyBxs/Vao4sQ
-u7XmrcxSfyIO0FPjanm22HleJp6ZbDi1QhQo7iQiMxcfXI0Smcv0XUhoMOnInDwr
-Slb4BoRtexwOEW978USZA2lpXvSzrDwJpV4/AgMBAAGjggHHMIIBwzAfBgNVHSME
-GDAWgBQeBaN3j2yW4luHS6a0hqxxAAznODAdBgNVHQ4EFgQU0dVlPlTcESZV7N62
-gvYHEK2eq3owDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYw
-FAYIKwYBBQUHAwEGCCsGAQUFBwMCMGcGA1UdIARgMF4wUgYMKwYBBAGuIwEEAwEB
-MEIwQAYIKwYBBQUHAgEWNGh0dHBzOi8vd3d3LmluY29tbW9uLm9yZy9jZXJ0L3Jl
-cG9zaXRvcnkvY3BzX3NzbC5wZGYwCAYGZ4EMAQICMEQGA1UdHwQ9MDswOaA3oDWG
-M2h0dHA6Ly9jcmwuaW5jb21tb24tcnNhLm9yZy9JbkNvbW1vblJTQVNlcnZlckNB
-LmNybDB1BggrBgEFBQcBAQRpMGcwPgYIKwYBBQUHMAKGMmh0dHA6Ly9jcnQudXNl
-cnRydXN0LmNvbS9JbkNvbW1vblJTQVNlcnZlckNBXzIuY3J0MCUGCCsGAQUFBzAB
-hhlodHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMB4GA1UdEQQXMBWCE3NoaWJib2xl
-dGguY3N1bi5lZHUwDQYJKoZIhvcNAQELBQADggEBAF2Cjq42x6LZ/xazRCfLPoN7
-LV8BfSWUqMdR53bme4eIx/CpZ98HtR7lgNTuk7cAMhByFccKE/Lr7sX2N/4EJQos
-BAmuBKvZ3/7MvTjfx2FkVxMGBT1qmhOHjvolCAVMMGQIAiSsooD6oI28fjprU5VH
-5YwAKog+yO9HmAIfFCC5jdfTSC0MpfD+omDfZJSVyz9TYXyMBpuOj3DfIgh5lHfq
-8Okjj9vd1FWidEfxvNmfBLHaTeuEuZTPFKDPYcflZ+z7TYn5C2FqigZ7Bhfdmq8d
-8XdzO4Qjp5GshUVPkDwnH1BoEGJJqA/5dVeSlkvWiwdTvuS1bTalOVKPaG75oRk=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.csun.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.csun.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, Northridge</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, Northridge</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.csun.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kevin Krzewinski</md:GivenName>
-    <md:EmailAddress>kevin.krzewinski@csun.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Kevin Krzewinski</md:GivenName>
-    <md:EmailAddress>kevin.krzewinski@csun.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-dartmouth.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-dartmouth.edu.xml
deleted file mode 100644
index 445fe2f9..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-dartmouth.edu.xml
+++ /dev/null
@@ -1,104 +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="urn:mace:incommon:dartmouth.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://login.dartmouth.edu/shibboleth/error.shtml" 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">dartmouth.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Dartmouth College</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>
-MIIDfjCCAmYCCQD5v/lLik8sFjANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAgTDU5ldyBIYW1wc2hpcmUxEDAOBgNVBAcTB0hhbm92ZXIxGjAY
-BgNVBAoTEURhcnRtb3V0aCBDb2xsZWdlMQ0wCwYDVQQLEwRQS0NTMRwwGgYDVQQD
-ExNsb2dpbi5kYXJ0bW91dGguZWR1MB4XDTEzMDgwNzE5NTQ1M1oXDTIzMDgwNTE5
-NTQ1M1owgYAxCzAJBgNVBAYTAlVTMRYwFAYDVQQIEw1OZXcgSGFtcHNoaXJlMRAw
-DgYDVQQHEwdIYW5vdmVyMRowGAYDVQQKExFEYXJ0bW91dGggQ29sbGVnZTENMAsG
-A1UECxMEUEtDUzEcMBoGA1UEAxMTbG9naW4uZGFydG1vdXRoLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALOih99QFOaxBOq2e2MKw0G1p0lpD1xr
-AgAWKc1WGLKOyjPb3ru6tAz9RFJNKQYRS2VeL6BlTRn4nMpaUPGAZk8byhCQE/h+
-VS9w019U5nmeMopWV7o/UviV0sNBhpkobrCF0spiwNtN+twqHcZKB3LHn7Z4lOnN
-pl8CXwQnnBn9xArnSGD9fb62rY6v4d1cAHen9f7sVosLyl3pYATAOe3VWU1Td4W9
-MfWFVb2IXZwDVF4cuFesDehGV6P15MOCYuBoHtPycS66hNFmQIS0Yyo6RSJhU64/
-zSWtwpTDPK++jdIrmr0voi+qyLXf41JGGoAsiVZIPgq/Q/NtzYn8apsCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAfpVY3snVpp/WT5dZN5cRMowLbJCvvDYO8BEd+r6U
-FRDgTn8WG1NUL45e6yHPRaLF1Mj4g24j8jHEIypy4KJN+DXFJml7FehKl8CY7tJ7
-l1NLX/hNiBXHq5jN+ppWKvnlZLHU1Xs5CEUFIaF+b+FHtBfllCMZPOQUSv0RTJy8
-i3q0skAI/2nPGfA76XiIw88sfuT5bpqqpBfiVKIl/Fi7IV2Mvt8vraULJX/tkot7
-Szxwr2BKS9O9++4J7vv3tfqtPAwKNcyLYAKLnvjWrvVRcZGMarMWKNQsSdWYgdu6
-YCFCMPMXjTEu05ACdSRLThQAnSO5Ml+byI7hpfl0E69FVw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.dartmouth.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.dartmouth.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.dartmouth.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.dartmouth.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dartmouth.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDfjCCAmYCCQD5v/lLik8sFjANBgkqhkiG9w0BAQUFADCBgDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAgTDU5ldyBIYW1wc2hpcmUxEDAOBgNVBAcTB0hhbm92ZXIxGjAY
-BgNVBAoTEURhcnRtb3V0aCBDb2xsZWdlMQ0wCwYDVQQLEwRQS0NTMRwwGgYDVQQD
-ExNsb2dpbi5kYXJ0bW91dGguZWR1MB4XDTEzMDgwNzE5NTQ1M1oXDTIzMDgwNTE5
-NTQ1M1owgYAxCzAJBgNVBAYTAlVTMRYwFAYDVQQIEw1OZXcgSGFtcHNoaXJlMRAw
-DgYDVQQHEwdIYW5vdmVyMRowGAYDVQQKExFEYXJ0bW91dGggQ29sbGVnZTENMAsG
-A1UECxMEUEtDUzEcMBoGA1UEAxMTbG9naW4uZGFydG1vdXRoLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALOih99QFOaxBOq2e2MKw0G1p0lpD1xr
-AgAWKc1WGLKOyjPb3ru6tAz9RFJNKQYRS2VeL6BlTRn4nMpaUPGAZk8byhCQE/h+
-VS9w019U5nmeMopWV7o/UviV0sNBhpkobrCF0spiwNtN+twqHcZKB3LHn7Z4lOnN
-pl8CXwQnnBn9xArnSGD9fb62rY6v4d1cAHen9f7sVosLyl3pYATAOe3VWU1Td4W9
-MfWFVb2IXZwDVF4cuFesDehGV6P15MOCYuBoHtPycS66hNFmQIS0Yyo6RSJhU64/
-zSWtwpTDPK++jdIrmr0voi+qyLXf41JGGoAsiVZIPgq/Q/NtzYn8apsCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAfpVY3snVpp/WT5dZN5cRMowLbJCvvDYO8BEd+r6U
-FRDgTn8WG1NUL45e6yHPRaLF1Mj4g24j8jHEIypy4KJN+DXFJml7FehKl8CY7tJ7
-l1NLX/hNiBXHq5jN+ppWKvnlZLHU1Xs5CEUFIaF+b+FHtBfllCMZPOQUSv0RTJy8
-i3q0skAI/2nPGfA76XiIw88sfuT5bpqqpBfiVKIl/Fi7IV2Mvt8vraULJX/tkot7
-Szxwr2BKS9O9++4J7vv3tfqtPAwKNcyLYAKLnvjWrvVRcZGMarMWKNQsSdWYgdu6
-YCFCMPMXjTEu05ACdSRLThQAnSO5Ml+byI7hpfl0E69FVw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.dartmouth.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Dartmouth College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Dartmouth College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dartmouth.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Sean McNamara</md:GivenName>
-    <md:EmailAddress>Sean.R.McNamara@dartmouth.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Dartmouth Helpdesk</md:GivenName>
-    <md:EmailAddress>help@dartmouth.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dartmouth Helpdesk</md:GivenName>
-    <md:EmailAddress>help@dartmouth.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jonathan Crossett</md:GivenName>
-    <md:EmailAddress>Jonathan.Crossett@dartmouth.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-duke.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-duke.edu.xml
deleted file mode 100644
index 12855a1c..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-duke.edu.xml
+++ /dev/null
@@ -1,110 +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="urn:mace:incommon:duke.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</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">duke.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Duke University</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>
-MIIEWjCCA0KgAwIBAgIJAP1rB/FjRgy6MA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
-BAYTAlVTMRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEPMA0GA1UEBxMGRHVyaGFt
-MRgwFgYDVQQKEw9EdWtlIFVuaXZlcnNpdHkxDDAKBgNVBAsTA09JVDEaMBgGA1UE
-AxMRc2hpYi5vaXQuZHVrZS5lZHUwHhcNMTAwOTA5MTI0NDU1WhcNMjgwOTA0MTI0
-NDU1WjB7MQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExDzAN
-BgNVBAcTBkR1cmhhbTEYMBYGA1UEChMPRHVrZSBVbml2ZXJzaXR5MQwwCgYDVQQL
-EwNPSVQxGjAYBgNVBAMTEXNoaWIub2l0LmR1a2UuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAt+hnl6gSRi0Y8VuNl6PCPYejj7VfVs/y8bRa5zAY
-RHwb75+vBSs2j1yeUcSore9Ba5Ni7v947V34afRMGRPOqr4TEDZxU+1Bg0zAvSrR
-n4Y8B+zyJuhtOpmOZzTwE9o/Oc+CB4kYV/K0woKZdcoxHJm8TbqBqdxU4fFYUlNU
-o4Dr5jRdCSr9MHBOqGWXtQMg16qYNB7StNk4twY29FNnpZwkVTfsE76uVsRMkG8i
-6/RiHpXZ/ioOOqndptbEGdsOIE3ivAJOZdvYwnDe5NnTH06P01HsxH3OOnYqhuG2
-J6qdhqoelGeHRG+jfl8YkYXCcKQvja2tJ5G+6iqSN7DP6QIDAQABo4HgMIHdMB0G
-A1UdDgQWBBQHYXwB6otkfyMOmUI59j8823hFRDCBrQYDVR0jBIGlMIGigBQHYXwB
-6otkfyMOmUI59j8823hFRKF/pH0wezELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5v
-cnRoIENhcm9saW5hMQ8wDQYDVQQHEwZEdXJoYW0xGDAWBgNVBAoTD0R1a2UgVW5p
-dmVyc2l0eTEMMAoGA1UECxMDT0lUMRowGAYDVQQDExFzaGliLm9pdC5kdWtlLmVk
-dYIJAP1rB/FjRgy6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAG7q
-wJpiSLJbx2gj/cGDYeuBW/CeRGNghjQ/mb076P3WXsRNPAimcXulSUbQkS6eDH4t
-Ifvsa0jf4FRsEOwH/x8354/0wyv4RwuavX25kjpmoFn3O+eKokyzsc7/Q2gsm0mv
-V8XQo+5b+4we8AFYlAVp26nLeIqAiJM8xZJ9yHuzVL1O4yxIWIKECWHLqY5+1nas
-XNiLURrHhsK5pZUPLuhzJFgZuJT62TtnrjJXlrRhJ389VSkh6R64C6ncjNkg6/Cu
-tA6SX0infqNRyPRNJK+bnQd1yOP4++tjD/lAPE+5tiD/waI3fArt43ZE/qp7pYMS
-9TEfyQ5QpfRYAUFWXBc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.oit.duke.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.oit.duke.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.oit.duke.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.oit.duke.edu/idp/profile/SAML2/POST-SimpleSign/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">duke.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEWjCCA0KgAwIBAgIJAP1rB/FjRgy6MA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
-BAYTAlVTMRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEPMA0GA1UEBxMGRHVyaGFt
-MRgwFgYDVQQKEw9EdWtlIFVuaXZlcnNpdHkxDDAKBgNVBAsTA09JVDEaMBgGA1UE
-AxMRc2hpYi5vaXQuZHVrZS5lZHUwHhcNMTAwOTA5MTI0NDU1WhcNMjgwOTA0MTI0
-NDU1WjB7MQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExDzAN
-BgNVBAcTBkR1cmhhbTEYMBYGA1UEChMPRHVrZSBVbml2ZXJzaXR5MQwwCgYDVQQL
-EwNPSVQxGjAYBgNVBAMTEXNoaWIub2l0LmR1a2UuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAt+hnl6gSRi0Y8VuNl6PCPYejj7VfVs/y8bRa5zAY
-RHwb75+vBSs2j1yeUcSore9Ba5Ni7v947V34afRMGRPOqr4TEDZxU+1Bg0zAvSrR
-n4Y8B+zyJuhtOpmOZzTwE9o/Oc+CB4kYV/K0woKZdcoxHJm8TbqBqdxU4fFYUlNU
-o4Dr5jRdCSr9MHBOqGWXtQMg16qYNB7StNk4twY29FNnpZwkVTfsE76uVsRMkG8i
-6/RiHpXZ/ioOOqndptbEGdsOIE3ivAJOZdvYwnDe5NnTH06P01HsxH3OOnYqhuG2
-J6qdhqoelGeHRG+jfl8YkYXCcKQvja2tJ5G+6iqSN7DP6QIDAQABo4HgMIHdMB0G
-A1UdDgQWBBQHYXwB6otkfyMOmUI59j8823hFRDCBrQYDVR0jBIGlMIGigBQHYXwB
-6otkfyMOmUI59j8823hFRKF/pH0wezELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5v
-cnRoIENhcm9saW5hMQ8wDQYDVQQHEwZEdXJoYW0xGDAWBgNVBAoTD0R1a2UgVW5p
-dmVyc2l0eTEMMAoGA1UECxMDT0lUMRowGAYDVQQDExFzaGliLm9pdC5kdWtlLmVk
-dYIJAP1rB/FjRgy6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAG7q
-wJpiSLJbx2gj/cGDYeuBW/CeRGNghjQ/mb076P3WXsRNPAimcXulSUbQkS6eDH4t
-Ifvsa0jf4FRsEOwH/x8354/0wyv4RwuavX25kjpmoFn3O+eKokyzsc7/Q2gsm0mv
-V8XQo+5b+4we8AFYlAVp26nLeIqAiJM8xZJ9yHuzVL1O4yxIWIKECWHLqY5+1nas
-XNiLURrHhsK5pZUPLuhzJFgZuJT62TtnrjJXlrRhJ389VSkh6R64C6ncjNkg6/Cu
-tA6SX0infqNRyPRNJK+bnQd1yOP4++tjD/lAPE+5tiD/waI3fArt43ZE/qp7pYMS
-9TEfyQ5QpfRYAUFWXBc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.oit.duke.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.oit.duke.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Duke University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Duke University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.duke.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Shilen Patel</md:GivenName>
-    <md:EmailAddress>idmstech@duke.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shilen Patel</md:GivenName>
-    <md:EmailAddress>idmstech@duke.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-humboldt.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-humboldt.edu.xml
deleted file mode 100644
index 796a5053..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-humboldt.edu.xml
+++ /dev/null
@@ -1,190 +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="urn:mace:incommon:humboldt.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">humboldt.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Humboldt State University</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>
-MIIFkTCCBHmgAwIBAgICAiUwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MDUyOTE4NDY0OFoXDTExMDUz
-MDE4NDY0OFowGzEZMBcGA1UEAxMQaWRwLmh1bWJvbGR0LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIobfOptbMRmZfxAr5j5iDpNzctKRRn+f105
-qejIvk2diU5AYo5pDNcbEBEixdV0ikWwqHh2PH2D2FvpQDikQU7CPcLHCcuSbviy
-pIyJIuGM1cfnirzFSkCjhgKqIjgTEKkCJzZgNKFqikWnEGf3ptn27z3H0GRZCC+B
-5ahmBJSO17iBuyQ71Qp+3pH2Pq0ffoOpRuTutfQUpsM2Qw1t5AG7j1F/fvw3vzrc
-HxwlWpyuDtcOlSiCezrcIJdx7ejK+G0aoqihe8HuHrD2Wg7vmRFsC/N9/S+7A+sV
-+uAaxI1JSt0M+twXDiMuPvcdlh82kiEB56njXsDcJm5UrskYR5ECAwEAAaOCAqIw
-ggKeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUKdif1++SY7RXkOHiEkduH4q/e/Yw
-fgYDVR0jBHcwdYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYT
-AlVTMRwwGgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNv
-bW1vbiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIBADCBsgYIKwYBBQUHAQEEgaUw
-gaIwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9pbmNvbW1vbmNhMS5pbmNvbW1vbmZlZGVy
-YXRpb24ub3JnL2JyaWRnZS9jZXJ0cy9jYS1jZXJ0cy5wN2IwTwYIKwYBBQUHMAKG
-Q2h0dHA6Ly9pbmNvbW1vbmNhMi5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2JyaWRn
-ZS9jZXJ0cy9jYS1jZXJ0cy5wN2IwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDov
-L2luY29tbW9uY3JsMS5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2NybC9lZWNybHMu
-Y3JsMD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwyLmluY29tbW9uZmVkZXJhdGlv
-bi5vcmcvY3JsL2VlY3Jscy5jcmwwXgYDVR0gBFcwVTBTBgsrBgEEAa4jAQQBATBE
-MEIGCCsGAQUFBwIBFjZodHRwOi8vaW5jb21tb25jYS5pbmNvbW1vbmZlZGVyYXRp
-b24ub3JnL3ByYWN0aWNlcy5wZGYwGwYDVR0RBBQwEoIQaWRwLmh1bWJvbGR0LmVk
-dTANBgkqhkiG9w0BAQUFAAOCAQEAOcwPpeqe61hu63uwC9PVYZNOyxzc2f2h0ii/
-SNLOlbbolZfxMKbuxLXcYCpy1IXxlzBx4hieTRYTksHehIHcDK2dM52F1AMumRo3
-EMSh1TTRn9Z6xK9ACypa3Ah42+qdvCXDT3je/DCQK4gkTlXd9KE2hv06IemHD9V+
-Eo7yhlY9Nd2oOVWCLV6+hNqrR56gio6b0SWf97B1LAlkPTW0iLaldmLui1dW6EV0
-8pWQYq0T+m/F/Hzj730ntKD9AYN+VBCYxIPKXNPqBsKkBqNO8622mYNPcS5rbfUj
-MA1WuRhoHwRbAV7L/wak8BuONBWFl1zr3+/hOj3F1/Xpeomhag==
-          </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>
-MIIDyjCCArICCQDSIlwe73ERBTANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExDzANBgNVBAcTBkFyY2F0YTEiMCAGA1UE
-ChMZSHVtYm9sZHQgU3RhdGUgVW5pdmVyc2l0eTEMMAoGA1UECxMDSVRTMRkwFwYD
-VQQDExBpZHAuaHVtYm9sZHQuZWR1MSQwIgYJKoZIhvcNAQkBFhVzeXNhZG1pbkBo
-dW1ib2xkdC5lZHUwHhcNMTEwNTEwMjIzNzA2WhcNMjEwNTA3MjIzNzA2WjCBpjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExDzANBgNVBAcTBkFyY2F0
-YTEiMCAGA1UEChMZSHVtYm9sZHQgU3RhdGUgVW5pdmVyc2l0eTEMMAoGA1UECxMD
-SVRTMRkwFwYDVQQDExBpZHAuaHVtYm9sZHQuZWR1MSQwIgYJKoZIhvcNAQkBFhVz
-eXNhZG1pbkBodW1ib2xkdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDXea3ZM6XJ8f2CRd6bisEol8JsGCwXPwPYLWqbiSF7rBcrxztVRbUofTXe
-5/f3+KR4w4cpvqm2OGun9xpa357mzgW2aMc/AIE6fPErHDSI20K1P3DUIIHIbxOz
-Zb12oaeMDUgqI0PQso32oRCT0hQ9dFegPQ6ICegk5e57Azctpn7ovdkNYurfRVx1
-sQoS0STHPW8b5xNSv6IGoEOjkVUpzKtv9VO+5KIesq/9y5r9nPXISSzHUei/7iAa
-7G3MpNgWHcdYjfE+ZTgtUu2Mb60OKq9oxhwzRF8RrG+R4/+0xkcCJX5Vk3hHrUMs
-9XTdGGo98dm5lwBfS2FFVByNKqRXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAHNX
-1zbqSKjgwJa8Bt0Kx7bNBm9ukHfERqfrT1I4c+O0OshH0N0PVLF+m2/eH8NrNz52
-FOfgNBtJrFu9BxI8tc0yp1ptjYVgeCaFrIurNPKShMQSqJRg/BSYYykm26wrPmUs
-ZVagnI+OIJPWNpqDt56xRgzpDrLKf7zHLSLyEmrfK8f2R+DExzGWUGN5StA1G+tg
-JfaZDtwYHOUR9XrHbx+czHTqGcEo1Jpfg8p/KiuacKMb8n99HG9p2bUggLQOangC
-KU/1My9HTkHF8T8QLLSlqA4jb0eXnz9lxfJl2i2Y+imP77X7sWoPoL32jcoAWYoZ
-AR85Z5Jw0RxR+tbYexg=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.humboldt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.humboldt.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.humboldt.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.humboldt.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.humboldt.edu/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">humboldt.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFkTCCBHmgAwIBAgICAiUwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA5MDUyOTE4NDY0OFoXDTExMDUz
-MDE4NDY0OFowGzEZMBcGA1UEAxMQaWRwLmh1bWJvbGR0LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIobfOptbMRmZfxAr5j5iDpNzctKRRn+f105
-qejIvk2diU5AYo5pDNcbEBEixdV0ikWwqHh2PH2D2FvpQDikQU7CPcLHCcuSbviy
-pIyJIuGM1cfnirzFSkCjhgKqIjgTEKkCJzZgNKFqikWnEGf3ptn27z3H0GRZCC+B
-5ahmBJSO17iBuyQ71Qp+3pH2Pq0ffoOpRuTutfQUpsM2Qw1t5AG7j1F/fvw3vzrc
-HxwlWpyuDtcOlSiCezrcIJdx7ejK+G0aoqihe8HuHrD2Wg7vmRFsC/N9/S+7A+sV
-+uAaxI1JSt0M+twXDiMuPvcdlh82kiEB56njXsDcJm5UrskYR5ECAwEAAaOCAqIw
-ggKeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-AQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUKdif1++SY7RXkOHiEkduH4q/e/Yw
-fgYDVR0jBHcwdYAUky3IYRitY+ObZbOd3Y2TuufKY0WhWqRYMFYxCzAJBgNVBAYT
-AlVTMRwwGgYDVQQKExNJbkNvbW1vbiBGZWRlcmF0aW9uMSkwJwYDVQQDEyBJbkNv
-bW1vbiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIBADCBsgYIKwYBBQUHAQEEgaUw
-gaIwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9pbmNvbW1vbmNhMS5pbmNvbW1vbmZlZGVy
-YXRpb24ub3JnL2JyaWRnZS9jZXJ0cy9jYS1jZXJ0cy5wN2IwTwYIKwYBBQUHMAKG
-Q2h0dHA6Ly9pbmNvbW1vbmNhMi5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2JyaWRn
-ZS9jZXJ0cy9jYS1jZXJ0cy5wN2IwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0cDov
-L2luY29tbW9uY3JsMS5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2NybC9lZWNybHMu
-Y3JsMD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwyLmluY29tbW9uZmVkZXJhdGlv
-bi5vcmcvY3JsL2VlY3Jscy5jcmwwXgYDVR0gBFcwVTBTBgsrBgEEAa4jAQQBATBE
-MEIGCCsGAQUFBwIBFjZodHRwOi8vaW5jb21tb25jYS5pbmNvbW1vbmZlZGVyYXRp
-b24ub3JnL3ByYWN0aWNlcy5wZGYwGwYDVR0RBBQwEoIQaWRwLmh1bWJvbGR0LmVk
-dTANBgkqhkiG9w0BAQUFAAOCAQEAOcwPpeqe61hu63uwC9PVYZNOyxzc2f2h0ii/
-SNLOlbbolZfxMKbuxLXcYCpy1IXxlzBx4hieTRYTksHehIHcDK2dM52F1AMumRo3
-EMSh1TTRn9Z6xK9ACypa3Ah42+qdvCXDT3je/DCQK4gkTlXd9KE2hv06IemHD9V+
-Eo7yhlY9Nd2oOVWCLV6+hNqrR56gio6b0SWf97B1LAlkPTW0iLaldmLui1dW6EV0
-8pWQYq0T+m/F/Hzj730ntKD9AYN+VBCYxIPKXNPqBsKkBqNO8622mYNPcS5rbfUj
-MA1WuRhoHwRbAV7L/wak8BuONBWFl1zr3+/hOj3F1/Xpeomhag==
-          </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>
-MIIDyjCCArICCQDSIlwe73ERBTANBgkqhkiG9w0BAQUFADCBpjELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExDzANBgNVBAcTBkFyY2F0YTEiMCAGA1UE
-ChMZSHVtYm9sZHQgU3RhdGUgVW5pdmVyc2l0eTEMMAoGA1UECxMDSVRTMRkwFwYD
-VQQDExBpZHAuaHVtYm9sZHQuZWR1MSQwIgYJKoZIhvcNAQkBFhVzeXNhZG1pbkBo
-dW1ib2xkdC5lZHUwHhcNMTEwNTEwMjIzNzA2WhcNMjEwNTA3MjIzNzA2WjCBpjEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExDzANBgNVBAcTBkFyY2F0
-YTEiMCAGA1UEChMZSHVtYm9sZHQgU3RhdGUgVW5pdmVyc2l0eTEMMAoGA1UECxMD
-SVRTMRkwFwYDVQQDExBpZHAuaHVtYm9sZHQuZWR1MSQwIgYJKoZIhvcNAQkBFhVz
-eXNhZG1pbkBodW1ib2xkdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDXea3ZM6XJ8f2CRd6bisEol8JsGCwXPwPYLWqbiSF7rBcrxztVRbUofTXe
-5/f3+KR4w4cpvqm2OGun9xpa357mzgW2aMc/AIE6fPErHDSI20K1P3DUIIHIbxOz
-Zb12oaeMDUgqI0PQso32oRCT0hQ9dFegPQ6ICegk5e57Azctpn7ovdkNYurfRVx1
-sQoS0STHPW8b5xNSv6IGoEOjkVUpzKtv9VO+5KIesq/9y5r9nPXISSzHUei/7iAa
-7G3MpNgWHcdYjfE+ZTgtUu2Mb60OKq9oxhwzRF8RrG+R4/+0xkcCJX5Vk3hHrUMs
-9XTdGGo98dm5lwBfS2FFVByNKqRXAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAHNX
-1zbqSKjgwJa8Bt0Kx7bNBm9ukHfERqfrT1I4c+O0OshH0N0PVLF+m2/eH8NrNz52
-FOfgNBtJrFu9BxI8tc0yp1ptjYVgeCaFrIurNPKShMQSqJRg/BSYYykm26wrPmUs
-ZVagnI+OIJPWNpqDt56xRgzpDrLKf7zHLSLyEmrfK8f2R+DExzGWUGN5StA1G+tg
-JfaZDtwYHOUR9XrHbx+czHTqGcEo1Jpfg8p/KiuacKMb8n99HG9p2bUggLQOangC
-KU/1My9HTkHF8T8QLLSlqA4jb0eXnz9lxfJl2i2Y+imP77X7sWoPoL32jcoAWYoZ
-AR85Z5Jw0RxR+tbYexg=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.humboldt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.humboldt.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Humboldt State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Humboldt State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.humboldt.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mark Hendricks</md:GivenName>
-    <md:EmailAddress>mark.hendricks@humboldt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Peter Johnson</md:GivenName>
-    <md:EmailAddress>peter.johnson@humboldt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Systems Group</md:GivenName>
-    <md:EmailAddress>sysadmin@humboldt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Josh Callahan</md:GivenName>
-    <md:EmailAddress>josh.callahan@humboldt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Troy Butolph</md:GivenName>
-    <md:EmailAddress>troy.butolph@humboldt.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-idp.protectnetwork.org.xml b/swamid-interfederations-2.0/urn-mace-incommon-idp.protectnetwork.org.xml
deleted file mode 100644
index 2ea39fec..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-idp.protectnetwork.org.xml
+++ /dev/null
@@ -1,105 +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="urn:mace:incommon:idp.protectnetwork.org">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">idp.protectnetwork.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ProtectNetwork</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>
-MIIEDDCCAvSgAwIBAgIJAP9PRji2zBSeMA0GCSqGSIb3DQEBBQUAMGExCzAJBgNV
-BAYTAlVTMScwJQYDVQQDEx5pbmNvbW1vbi1hYS5wcm90ZWN0bmV0d29yay5vcmcx
-KTAnBgkqhkiG9w0BCQEWGnN1cHBvcnRAcHJvdGVjdG5ldHdvcmsub3JnMB4XDTEw
-MDYyMzE5NTY0MloXDTIwMDYyMDE5NTY0MlowYTELMAkGA1UEBhMCVVMxJzAlBgNV
-BAMTHmluY29tbW9uLWFhLnByb3RlY3RuZXR3b3JrLm9yZzEpMCcGCSqGSIb3DQEJ
-ARYac3VwcG9ydEBwcm90ZWN0bmV0d29yay5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDnrbfsUay/TQPCGJxGUd6yD8GpfqMSIy/PTX3WmanX6TYI
-gIPFWi4j9bQ2QbiLEMciHm8aKQYjTC5rdIhJlj0mnPuU9phFY3EgTztyCAqTw8wK
-Lu57iXj7rs/2EVdG33ncmk0UoVd4HzCNwH715NzmXQU5bBlxQ+60U+Lnl7EPA3Im
-4lafS4YUA3yxSRZ6DnYuBXQv96sdK+qF8ZpJ+fenCB2KAvlfbRRDH4A6d7TZrx7Q
-ZV8o0vrsXRtstkM/VG4xkGc3RoPbwtL0jrPdZssNPKaioH4a2+jwZppNYIFmwlcY
-Hg43DCMDGmYMnzX5iJHIJti/SXpMr/7MtjHFuXX9AgMBAAGjgcYwgcMwHQYDVR0O
-BBYEFNawNVmVHoG5V33K8lPahq1wiIg3MIGTBgNVHSMEgYswgYiAFNawNVmVHoG5
-V33K8lPahq1wiIg3oWWkYzBhMQswCQYDVQQGEwJVUzEnMCUGA1UEAxMeaW5jb21t
-b24tYWEucHJvdGVjdG5ldHdvcmsub3JnMSkwJwYJKoZIhvcNAQkBFhpzdXBwb3J0
-QHByb3RlY3RuZXR3b3JrLm9yZ4IJAP9PRji2zBSeMAwGA1UdEwQFMAMBAf8wDQYJ
-KoZIhvcNAQEFBQADggEBAMJs1vzNUUjJeEjC1NAltV8vrOkLGMtt/c4GCvhg8wtF
-jENf+UseWnWiKMJJzMAypzW4LyhrkX2COGi6Hy/JxOhwvJcRT00jhDhZkaa+vspi
-dOOvdM5GAy29A9VmRwfqBZdcsRYFZUuyc4++/FZVGFNp7VTHHCXF/VUa7GiaScUM
-knRMT+foHB/UYirm7EnD+mbOe7oYbwrdFTkNLTrRXCI/rhGcK7oS92iJnUeW4d9R
-s3oKMUqqjByzNELDOpWXy8pXCRoZtPViWEu2IlKVxv+ro+APJQU2IZDiVA9Ulv8B
-eff7ExscZJRD66zyJdXwxkUfazgWoo5e+ayZF4/q570=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon-aa.protectnetwork.org/protectnetwork-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.protectnetwork.org/protectnetwork-idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idp.protectnetwork.org</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEDDCCAvSgAwIBAgIJAP9PRji2zBSeMA0GCSqGSIb3DQEBBQUAMGExCzAJBgNV
-BAYTAlVTMScwJQYDVQQDEx5pbmNvbW1vbi1hYS5wcm90ZWN0bmV0d29yay5vcmcx
-KTAnBgkqhkiG9w0BCQEWGnN1cHBvcnRAcHJvdGVjdG5ldHdvcmsub3JnMB4XDTEw
-MDYyMzE5NTY0MloXDTIwMDYyMDE5NTY0MlowYTELMAkGA1UEBhMCVVMxJzAlBgNV
-BAMTHmluY29tbW9uLWFhLnByb3RlY3RuZXR3b3JrLm9yZzEpMCcGCSqGSIb3DQEJ
-ARYac3VwcG9ydEBwcm90ZWN0bmV0d29yay5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDnrbfsUay/TQPCGJxGUd6yD8GpfqMSIy/PTX3WmanX6TYI
-gIPFWi4j9bQ2QbiLEMciHm8aKQYjTC5rdIhJlj0mnPuU9phFY3EgTztyCAqTw8wK
-Lu57iXj7rs/2EVdG33ncmk0UoVd4HzCNwH715NzmXQU5bBlxQ+60U+Lnl7EPA3Im
-4lafS4YUA3yxSRZ6DnYuBXQv96sdK+qF8ZpJ+fenCB2KAvlfbRRDH4A6d7TZrx7Q
-ZV8o0vrsXRtstkM/VG4xkGc3RoPbwtL0jrPdZssNPKaioH4a2+jwZppNYIFmwlcY
-Hg43DCMDGmYMnzX5iJHIJti/SXpMr/7MtjHFuXX9AgMBAAGjgcYwgcMwHQYDVR0O
-BBYEFNawNVmVHoG5V33K8lPahq1wiIg3MIGTBgNVHSMEgYswgYiAFNawNVmVHoG5
-V33K8lPahq1wiIg3oWWkYzBhMQswCQYDVQQGEwJVUzEnMCUGA1UEAxMeaW5jb21t
-b24tYWEucHJvdGVjdG5ldHdvcmsub3JnMSkwJwYJKoZIhvcNAQkBFhpzdXBwb3J0
-QHByb3RlY3RuZXR3b3JrLm9yZ4IJAP9PRji2zBSeMAwGA1UdEwQFMAMBAf8wDQYJ
-KoZIhvcNAQEFBQADggEBAMJs1vzNUUjJeEjC1NAltV8vrOkLGMtt/c4GCvhg8wtF
-jENf+UseWnWiKMJJzMAypzW4LyhrkX2COGi6Hy/JxOhwvJcRT00jhDhZkaa+vspi
-dOOvdM5GAy29A9VmRwfqBZdcsRYFZUuyc4++/FZVGFNp7VTHHCXF/VUa7GiaScUM
-knRMT+foHB/UYirm7EnD+mbOe7oYbwrdFTkNLTrRXCI/rhGcK7oS92iJnUeW4d9R
-s3oKMUqqjByzNELDOpWXy8pXCRoZtPViWEu2IlKVxv+ro+APJQU2IZDiVA9Ulv8B
-eff7ExscZJRD66zyJdXwxkUfazgWoo5e+ayZF4/q570=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon-aa.protectnetwork.org/protectnetwork-idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">9Star Research Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ProtectNetwork</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.protectnetwork.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tech Support</md:GivenName>
-    <md:EmailAddress>incommon@protectnetwork.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kaustav Ghoshal</md:GivenName>
-    <md:EmailAddress>kaustav@9starresearch.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Simon Lee</md:GivenName>
-    <md:EmailAddress>simon.lee@9starresearch.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-internet2.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-internet2.edu.xml
deleted file mode 100644
index 6f43f4fd..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-internet2.edu.xml
+++ /dev/null
@@ -1,74 +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="urn:mace:incommon:internet2.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://origin.internet2.edu/error.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">internet2.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Internet2</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.internet2.edu/about/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/policies/privacy/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="200" width="200" xml:lang="en">https://www.internet2.edu/media/medialibrary/2013/10/15/internet2_logo_200pxtrans.gif</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>
-MIIDpTCCAo2gAwIBAgIJAIFOoKy0fzFNMA0GCSqGSIb3DQEBCwUAMIGRMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjES
-MBAGA1UEChMJSW50ZXJuZXQyMR0wGwYDVQQDExRvcmlnaW4uaW50ZXJuZXQyLmVk
-dTEoMCYGCSqGSIb3DQEJARYZdGVjaHN1cHBvcnRAaW50ZXJuZXQyLmVkdTAeFw0x
-NTA1MjIxMzIzMTVaFw0yNTA1MTkxMzIzMTVaMIGRMQswCQYDVQQGEwJVUzERMA8G
-A1UECBMITWljaGlnYW4xEjAQBgNVBAcTCUFubiBBcmJvcjESMBAGA1UEChMJSW50
-ZXJuZXQyMR0wGwYDVQQDExRvcmlnaW4uaW50ZXJuZXQyLmVkdTEoMCYGCSqGSIb3
-DQEJARYZdGVjaHN1cHBvcnRAaW50ZXJuZXQyLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAPBzFvoogACW6IKB0HnwFX09zQ9UAP/xdW4MQHD5nvJO
-UbKBW2Jqm+XfRwjgJnpDUokjj7mikDKS63YNHkNfTacH2i/Y7NsArXC/qik2bwW6
-rlYEWDJTjmQRJXUEGYY21UT8MAiyuDdLUrkHqYjUA5pQIWkzvIXudZ06Wa57jf3w
-EBOAnlyGhi7PyDzkkoJhpB/8A598zi/OBGNHU/QfVAN9ohrQW/7a4xM4aBx9n9QW
-ohDsDI7sY+N7xTOmbxvt+vPyvAo5EwneUbZsF3QHTnysIWxMfrRUNMszj0vOv6to
-EYW0b+rGY7pc6wU3KkIC8D7Obym7GvlLl3Rp2cwRF0cCAwEAATANBgkqhkiG9w0B
-AQsFAAOCAQEAry/zf0b8D0C46Q5dqsZxyEIKFikqB/4MBFqESenAm/xkvdUk/OdV
-g9ih+jAuZC3M1TqB6A4OV6awnNocH61Ko5DF0BO3uU9JKUzJhrew8Kb81TSB7akV
-NDyhn66iudRNaPthvJ79NYugbx1SjJYznqfLgw/PolLfjpW7DACIa9CMliXJTOVP
-hDtzphzWaOjXdfU904A3QuaeQq2LYOsYkG+GmFLSvzJ1UbvQ/NUTFeTpIVgsaUOb
-FaaEtp/LBAgwDJl9hoToLsRJHZdXevqmqKokP5I6LjXianwSgYDzku3sOwt/YwZM
-O5DEpKOPF/GsgEfq0uuXyFwYqiJLJFuEbw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://origin.internet2.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://origin.internet2.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://origin.internet2.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://origin.internet2.edu/idp/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Technical Support</md:GivenName>
-    <md:EmailAddress>techsupport@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-iu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-iu.edu.xml
deleted file mode 100644
index 4fef6ae2..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-iu.edu.xml
+++ /dev/null
@@ -1,122 +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="urn:mace:incommon:iu.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://kb.iu.edu/data/abxl.html" 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">iu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Indiana University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider for Indiana University.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://kb.iu.edu/data/bdbk.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://protect.iu.edu/privacy/policies</mdui:PrivacyStatementURL>
-        <mdui:Logo height="64" width="350" xml:lang="en">https://idp.iu.edu/shibboleth-idp/images/iu-logo.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>
-MIIEnjCCA4agAwIBAgIJALK5W6TnLzRkMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHSW5kaWFuYTEUMBIGA1UEBxMLQmxvb21pbmd0b24x
-GzAZBgNVBAoTEkluZGlhbmEgVW5pdmVyc2l0eTEnMCUGA1UECxMeVW5pdmVyc2l0
-eSBJbmZvcm1hdGlvbiBTeXN0ZW1zMRMwEQYDVQQDEwppZHAuaXUuZWR1MB4XDTEy
-MDMwMjIxMDcyOFoXDTIyMDIyODIxMDcyOFowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdJbmRpYW5hMRQwEgYDVQQHEwtCbG9vbWluZ3RvbjEbMBkGA1UEChMSSW5k
-aWFuYSBVbml2ZXJzaXR5MScwJQYDVQQLEx5Vbml2ZXJzaXR5IEluZm9ybWF0aW9u
-IFN5c3RlbXMxEzARBgNVBAMTCmlkcC5pdS5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDXkJME1MEXwJMofzOWFq9Ax60yBxoDSbsuGUwsG8X4eXSX
-CGWuNjxTsUR3if71wnVuWA5j3O12MJatPN40UlJUVpGI+yyTf+39Xq0ILjnCEpXv
-bx8BeteNC5rpDDZMQpbisST/wToHqxSbEwl05pIvmE9EYitcO9c8VeEGd8jSSPnq
-MlxEqEBzG0aVFofoFk2eZvxPqNVeDD4fuy74oWYHG9JAEIVO60R7xqjChOcLfi0U
-nkuIyXK9j7objwuScFdzawUFwj8bqr0wYcQ89BMMAwPXqgqfckm216LnEy0xDQjW
-G7wWw24mMFp3//V7V9uTQe/x47Lp3Zo4+OGjn0clAgMBAAGjgfgwgfUwHQYDVR0O
-BBYEFEPHwCKjNTNKAJ3eUPP+clZUi45QMIHFBgNVHSMEgb0wgbqAFEPHwCKjNTNK
-AJ3eUPP+clZUi45QoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHSW5k
-aWFuYTEUMBIGA1UEBxMLQmxvb21pbmd0b24xGzAZBgNVBAoTEkluZGlhbmEgVW5p
-dmVyc2l0eTEnMCUGA1UECxMeVW5pdmVyc2l0eSBJbmZvcm1hdGlvbiBTeXN0ZW1z
-MRMwEQYDVQQDEwppZHAuaXUuZWR1ggkAsrlbpOcvNGQwDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQUFAAOCAQEAFzO4fQSwWsuH7KT4NoXJ2StDarj5wkOX9uPWrrQt
-C9HqNBzxUu/Fb/gHe5Ethp3fuLrUCLsJP8yth/c5ifUgsIvYbvevMbxJvwa1DKoF
-xyy1Y7Z2WiQMPr5Dw65FDhiS2k0srCw0Qv9G2oTq7i9EzrhdsCDtm9ywkVui4ckl
-fF9p7VWBrd4zmIOhtltgrn5bQKkvd/C6IuDERcGUVm3H4bMVX0R310+623kBaTLs
-ajy5DWB1nPufiuuDMvC4u5V5MFLuih4WNcHQDvlLKDYmTwwzMuMUT66RYRu3TZsD
-L2LuGuOyTnT5YZXTUl4ADM7Oqe2rOQeUdCTNomTlqhpZlA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iu.edu:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.iu.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/POST-SimpleSign/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">iu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEnjCCA4agAwIBAgIJALK5W6TnLzRkMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHSW5kaWFuYTEUMBIGA1UEBxMLQmxvb21pbmd0b24x
-GzAZBgNVBAoTEkluZGlhbmEgVW5pdmVyc2l0eTEnMCUGA1UECxMeVW5pdmVyc2l0
-eSBJbmZvcm1hdGlvbiBTeXN0ZW1zMRMwEQYDVQQDEwppZHAuaXUuZWR1MB4XDTEy
-MDMwMjIxMDcyOFoXDTIyMDIyODIxMDcyOFowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdJbmRpYW5hMRQwEgYDVQQHEwtCbG9vbWluZ3RvbjEbMBkGA1UEChMSSW5k
-aWFuYSBVbml2ZXJzaXR5MScwJQYDVQQLEx5Vbml2ZXJzaXR5IEluZm9ybWF0aW9u
-IFN5c3RlbXMxEzARBgNVBAMTCmlkcC5pdS5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDXkJME1MEXwJMofzOWFq9Ax60yBxoDSbsuGUwsG8X4eXSX
-CGWuNjxTsUR3if71wnVuWA5j3O12MJatPN40UlJUVpGI+yyTf+39Xq0ILjnCEpXv
-bx8BeteNC5rpDDZMQpbisST/wToHqxSbEwl05pIvmE9EYitcO9c8VeEGd8jSSPnq
-MlxEqEBzG0aVFofoFk2eZvxPqNVeDD4fuy74oWYHG9JAEIVO60R7xqjChOcLfi0U
-nkuIyXK9j7objwuScFdzawUFwj8bqr0wYcQ89BMMAwPXqgqfckm216LnEy0xDQjW
-G7wWw24mMFp3//V7V9uTQe/x47Lp3Zo4+OGjn0clAgMBAAGjgfgwgfUwHQYDVR0O
-BBYEFEPHwCKjNTNKAJ3eUPP+clZUi45QMIHFBgNVHSMEgb0wgbqAFEPHwCKjNTNK
-AJ3eUPP+clZUi45QoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHSW5k
-aWFuYTEUMBIGA1UEBxMLQmxvb21pbmd0b24xGzAZBgNVBAoTEkluZGlhbmEgVW5p
-dmVyc2l0eTEnMCUGA1UECxMeVW5pdmVyc2l0eSBJbmZvcm1hdGlvbiBTeXN0ZW1z
-MRMwEQYDVQQDEwppZHAuaXUuZWR1ggkAsrlbpOcvNGQwDAYDVR0TBAUwAwEB/zAN
-BgkqhkiG9w0BAQUFAAOCAQEAFzO4fQSwWsuH7KT4NoXJ2StDarj5wkOX9uPWrrQt
-C9HqNBzxUu/Fb/gHe5Ethp3fuLrUCLsJP8yth/c5ifUgsIvYbvevMbxJvwa1DKoF
-xyy1Y7Z2WiQMPr5Dw65FDhiS2k0srCw0Qv9G2oTq7i9EzrhdsCDtm9ywkVui4ckl
-fF9p7VWBrd4zmIOhtltgrn5bQKkvd/C6IuDERcGUVm3H4bMVX0R310+623kBaTLs
-ajy5DWB1nPufiuuDMvC4u5V5MFLuih4WNcHQDvlLKDYmTwwzMuMUT66RYRu3TZsD
-L2LuGuOyTnT5YZXTUl4ADM7Oqe2rOQeUdCTNomTlqhpZlA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.iu.edu:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.iu.edu/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Indiana University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Indiana University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.indiana.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support Center</md:GivenName>
-    <md:EmailAddress>ithelp@iu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Support Center</md:GivenName>
-    <md:EmailAddress>ithelp@iu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Support Center</md:GivenName>
-    <md:EmailAddress>ithelp@iu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-jmu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-jmu.edu.xml
deleted file mode 100644
index f836dd18..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-jmu.edu.xml
+++ /dev/null
@@ -1,110 +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="urn:mace:incommon:jmu.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://itfederation.jmu.edu/shiberror.html" 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">jmu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">James Madison University</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>
-MIIEvTCCA6WgAwIBAgIJAMwnlWaj6tOPMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExFTATBgNVBAcTDEhhcnJpc29uYnVy
-ZzEhMB8GA1UEChMYSmFtZXMgTWFkaXNvbiBVbml2ZXJzaXR5MR8wHQYDVQQLExZJ
-bmZvcm1hdGlvbiBUZWNobm9sb2d5MR0wGwYDVQQDExRpdGZlZGVyYXRpb24uam11
-LmVkdTAeFw0xMjA2MDUxNTExMTRaFw0yMjA2MDUxNTExMTRaMIGaMQswCQYDVQQG
-EwJVUzERMA8GA1UECBMIVmlyZ2luaWExFTATBgNVBAcTDEhhcnJpc29uYnVyZzEh
-MB8GA1UEChMYSmFtZXMgTWFkaXNvbiBVbml2ZXJzaXR5MR8wHQYDVQQLExZJbmZv
-cm1hdGlvbiBUZWNobm9sb2d5MR0wGwYDVQQDExRpdGZlZGVyYXRpb24uam11LmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoRMpZ+1Y8Z6de8v1Zj
-3UYNEj0b2V/mSd9rseQtcAgPMwL2khVt/GJoPpdG7DGmRCATuVpkzD/k1vA06cBO
-knCHpOhHvn2AgYyfPFqbHY1bBLE0sKqynnj2W5S19Sb+9DYl5lY7gQsoXCX5o0ql
-iBjp7Yqo1aMT/rImOZlcw4r7GL/dTi+0Q1ScWUX+YNCJF22sAg/HctNjqCkEwPqV
-v5K0UHZ96YpdOXmC+pzQ9oo33RANpaMGHpA63eM70rzVZccVspb0LG8sZZLuTavH
-XTpGf2tR2TauKS1zP9ok0ZD5rweDem3BKtRP7i9R+tuejzHi3JH2Dur59At616y1
-jN0CAwEAAaOCAQIwgf8wHQYDVR0OBBYEFJ50wNaJkgk5WSLNo0w/NhDjxmYpMIHP
-BgNVHSMEgccwgcSAFJ50wNaJkgk5WSLNo0w/NhDjxmYpoYGgpIGdMIGaMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExFTATBgNVBAcTDEhhcnJpc29uYnVy
-ZzEhMB8GA1UEChMYSmFtZXMgTWFkaXNvbiBVbml2ZXJzaXR5MR8wHQYDVQQLExZJ
-bmZvcm1hdGlvbiBUZWNobm9sb2d5MR0wGwYDVQQDExRpdGZlZGVyYXRpb24uam11
-LmVkdYIJAMwnlWaj6tOPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-AK8EXe8Og7W6M384gTsVNHcG1h6B6pmXhHZfVwVucYEenggcSQ7ErWCZliCE0Ae8
-hfiqPZDdLrrzaF6/gp6sfueuRbKXaa41FfcuvOGaUs25TD3hf7tH2N4Voq7akAtP
-YCdtupLvbB7eM8CFJwKdOc43tLUO3eG4eJzMWV6hX+PwwqCbZIvcKbFpFhzMSN/u
-MsH+FBVwtyV/jxAkRpw/MRczHruwPObYT6mKoVMdOaP0NvAEtqQRFBuJQh760wpz
-QzYSjyLb8gehpoRs8nWw73l8FgKhXa/hz06Vp9hibCfxxSWb8bktOu8MruAM4zVe
-ItgUieNNRzPjqrr/K8B4rWo=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://itfederation.jmu.edu/shibboleth-idp/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://itfederation.jmu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itfederation.jmu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://itfederation.jmu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jmu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEvTCCA6WgAwIBAgIJAMwnlWaj6tOPMA0GCSqGSIb3DQEBBQUAMIGaMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExFTATBgNVBAcTDEhhcnJpc29uYnVy
-ZzEhMB8GA1UEChMYSmFtZXMgTWFkaXNvbiBVbml2ZXJzaXR5MR8wHQYDVQQLExZJ
-bmZvcm1hdGlvbiBUZWNobm9sb2d5MR0wGwYDVQQDExRpdGZlZGVyYXRpb24uam11
-LmVkdTAeFw0xMjA2MDUxNTExMTRaFw0yMjA2MDUxNTExMTRaMIGaMQswCQYDVQQG
-EwJVUzERMA8GA1UECBMIVmlyZ2luaWExFTATBgNVBAcTDEhhcnJpc29uYnVyZzEh
-MB8GA1UEChMYSmFtZXMgTWFkaXNvbiBVbml2ZXJzaXR5MR8wHQYDVQQLExZJbmZv
-cm1hdGlvbiBUZWNobm9sb2d5MR0wGwYDVQQDExRpdGZlZGVyYXRpb24uam11LmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMoRMpZ+1Y8Z6de8v1Zj
-3UYNEj0b2V/mSd9rseQtcAgPMwL2khVt/GJoPpdG7DGmRCATuVpkzD/k1vA06cBO
-knCHpOhHvn2AgYyfPFqbHY1bBLE0sKqynnj2W5S19Sb+9DYl5lY7gQsoXCX5o0ql
-iBjp7Yqo1aMT/rImOZlcw4r7GL/dTi+0Q1ScWUX+YNCJF22sAg/HctNjqCkEwPqV
-v5K0UHZ96YpdOXmC+pzQ9oo33RANpaMGHpA63eM70rzVZccVspb0LG8sZZLuTavH
-XTpGf2tR2TauKS1zP9ok0ZD5rweDem3BKtRP7i9R+tuejzHi3JH2Dur59At616y1
-jN0CAwEAAaOCAQIwgf8wHQYDVR0OBBYEFJ50wNaJkgk5WSLNo0w/NhDjxmYpMIHP
-BgNVHSMEgccwgcSAFJ50wNaJkgk5WSLNo0w/NhDjxmYpoYGgpIGdMIGaMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExFTATBgNVBAcTDEhhcnJpc29uYnVy
-ZzEhMB8GA1UEChMYSmFtZXMgTWFkaXNvbiBVbml2ZXJzaXR5MR8wHQYDVQQLExZJ
-bmZvcm1hdGlvbiBUZWNobm9sb2d5MR0wGwYDVQQDExRpdGZlZGVyYXRpb24uam11
-LmVkdYIJAMwnlWaj6tOPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-AK8EXe8Og7W6M384gTsVNHcG1h6B6pmXhHZfVwVucYEenggcSQ7ErWCZliCE0Ae8
-hfiqPZDdLrrzaF6/gp6sfueuRbKXaa41FfcuvOGaUs25TD3hf7tH2N4Voq7akAtP
-YCdtupLvbB7eM8CFJwKdOc43tLUO3eG4eJzMWV6hX+PwwqCbZIvcKbFpFhzMSN/u
-MsH+FBVwtyV/jxAkRpw/MRczHruwPObYT6mKoVMdOaP0NvAEtqQRFBuJQh760wpz
-QzYSjyLb8gehpoRs8nWw73l8FgKhXa/hz06Vp9hibCfxxSWb8bktOu8MruAM4zVe
-ItgUieNNRzPjqrr/K8B4rWo=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://itfederation.jmu.edu:8443/shibboleth-idp/AA"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">James Madison University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">James Madison University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.jmu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Helpdesk</md:GivenName>
-    <md:EmailAddress>helpdesk@jmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Unix/Linux Group</md:GivenName>
-    <md:EmailAddress>linuxteam@jmu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-johnshopkins.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-johnshopkins.edu.xml
deleted file mode 100644
index 75190f9a..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-johnshopkins.edu.xml
+++ /dev/null
@@ -1,105 +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="urn:mace:incommon:johnshopkins.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">johnshopkins.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Johns Hopkins</mdui:DisplayName>
-        <mdui:Logo height="52" width="266" xml:lang="en">https://login.johnshopkins.edu/login/images/jhlogo.gif</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>
-MIIDTzCCAjegAwIBAgIUB/OyD4uWMP6wD8bB45UeirMblPAwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZaW5jb21tb24uam9obnNob3BraW5zLmVkdTAeFw0xMDA1
-MTAxODQ1NTlaFw0zMDA1MTAxODQ1NTlaMCQxIjAgBgNVBAMTGWluY29tbW9uLmpv
-aG5zaG9wa2lucy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa
-dXUykxcqSVXo9zk+8KsxzXBBiSdQP3nYOvBaTNyBOrsTOM3grW6u12TjMtmBuevg
-0708FNY03w4vJYho60I1JO4eNgXsQUxyj2XiVxrcOnq1vBc0T1NtkzcXV0X3+7n6
-BoCOXt8akO8tC4jSFg4dY7hzH7pGfSqHFHw9o76bvKu264gHsEwubm0kPIebifWI
-eWg5D4CvY4F36Tb7RmIbxu+pLXT8RiI4UWGkzLarRiKucMcR5NBNqlSiwp+fts7X
-YTh7vkJ+R36O5h2EVIMm2eJZyal195wRUu12IO/mZ9L2Iu6hcfnZ3oy56+VV3Eq2
-l3EhbsU43VSjBLC0Mq2RAgMBAAGjeTB3MFYGA1UdEQRPME2CGWluY29tbW9uLmpv
-aG5zaG9wa2lucy5lZHWGMGh0dHBzOi8vaW5jb21tb24uam9obnNob3BraW5zLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU4RjF7xk9rqSty02DIgPQOLnf6P8w
-DQYJKoZIhvcNAQEFBQADggEBACFPG1uKNWz6cMxtzL4gRRCjfP9AKmHEb5yhg2MI
-rVg3Tw1UkFnFcU6jfesVE3MPdabU2gquCrhnL6SKuZ4Gk19UZk7fBla/59AIIb8v
-cy0123fJow5yKtSNe5O70ouN4S2HCErl6NH30Z5iJn8tWMor5NEMI1u7QcFr108/
-GnAWzBvbr5GNrOnCQ8k35KVK6d+xwr3f+3H346CWcklxTNAYEn5+N3vR0F+uw0wP
-96QOFedHSLC7JwfG66uSWijmLy+QhtTiNEA1b8rn5Wq4AZnqwcjXoilz1yjSS1tT
-WYVvBm6n6IU0hHNWwnYCQT6WSHABz7vlkqM0c7A0oqltFPQ=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon.johnshopkins.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon.johnshopkins.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://incommon.johnshopkins.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://incommon.johnshopkins.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://incommon.johnshopkins.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://incommon.johnshopkins.edu/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">johnshopkins.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTzCCAjegAwIBAgIUB/OyD4uWMP6wD8bB45UeirMblPAwDQYJKoZIhvcNAQEF
-BQAwJDEiMCAGA1UEAxMZaW5jb21tb24uam9obnNob3BraW5zLmVkdTAeFw0xMDA1
-MTAxODQ1NTlaFw0zMDA1MTAxODQ1NTlaMCQxIjAgBgNVBAMTGWluY29tbW9uLmpv
-aG5zaG9wa2lucy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCa
-dXUykxcqSVXo9zk+8KsxzXBBiSdQP3nYOvBaTNyBOrsTOM3grW6u12TjMtmBuevg
-0708FNY03w4vJYho60I1JO4eNgXsQUxyj2XiVxrcOnq1vBc0T1NtkzcXV0X3+7n6
-BoCOXt8akO8tC4jSFg4dY7hzH7pGfSqHFHw9o76bvKu264gHsEwubm0kPIebifWI
-eWg5D4CvY4F36Tb7RmIbxu+pLXT8RiI4UWGkzLarRiKucMcR5NBNqlSiwp+fts7X
-YTh7vkJ+R36O5h2EVIMm2eJZyal195wRUu12IO/mZ9L2Iu6hcfnZ3oy56+VV3Eq2
-l3EhbsU43VSjBLC0Mq2RAgMBAAGjeTB3MFYGA1UdEQRPME2CGWluY29tbW9uLmpv
-aG5zaG9wa2lucy5lZHWGMGh0dHBzOi8vaW5jb21tb24uam9obnNob3BraW5zLmVk
-dS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU4RjF7xk9rqSty02DIgPQOLnf6P8w
-DQYJKoZIhvcNAQEFBQADggEBACFPG1uKNWz6cMxtzL4gRRCjfP9AKmHEb5yhg2MI
-rVg3Tw1UkFnFcU6jfesVE3MPdabU2gquCrhnL6SKuZ4Gk19UZk7fBla/59AIIb8v
-cy0123fJow5yKtSNe5O70ouN4S2HCErl6NH30Z5iJn8tWMor5NEMI1u7QcFr108/
-GnAWzBvbr5GNrOnCQ8k35KVK6d+xwr3f+3H346CWcklxTNAYEn5+N3vR0F+uw0wP
-96QOFedHSLC7JwfG66uSWijmLy+QhtTiNEA1b8rn5Wq4AZnqwcjXoilz1yjSS1tT
-WYVvBm6n6IU0hHNWwnYCQT6WSHABz7vlkqM0c7A0oqltFPQ=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon.johnshopkins.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon.johnshopkins.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Johns Hopkins University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Johns Hopkins</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.jhu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Andrew Baldwin</md:GivenName>
-    <md:EmailAddress>andrew.baldwin@jhu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Enterprise Authenticaion Team</md:GivenName>
-    <md:EmailAddress>enterpriseauth@jhmi.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Etan Weintraub</md:GivenName>
-    <md:EmailAddress>eweintra@jhmi.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-lafayette.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-lafayette.edu.xml
deleted file mode 100644
index 45abc16c..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-lafayette.edu.xml
+++ /dev/null
@@ -1,103 +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="urn:mace:incommon:lafayette.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">lafayette.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lafayette College</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://its.lafayette.edu/policies/accounts/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://its.lafayette.edu/policies/shibboleth/</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>
-MIIDNDCCAhygAwIBAgIVAJYxoS4g0HtVGMnXI6lqUky18fzdMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcDEubGFmYXlldHRlLmVkdTAeFw0xMDA0MTkxNjA3
-NDhaFw0zMDA0MTkxNjA3NDhaMB0xGzAZBgNVBAMTEmlkcDEubGFmYXlldHRlLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIfAZOL7zDCIZIazXYRD
-Q1HuBhaHBAxRk7lGyCbl7OhdRN4JWgeyYF3ZwXnX1TZ1A6PoynS0Ax/52nU/oCoA
-ZNP9rCKLpbNPRIbIa8weqpfUH6Z/FYz4K0/UxtaXkxVZS01aXoTYpbKaTPT0iK8i
-r3LeDJwYHP9cMDpQOv0YBaf8gxtxcO+rmhDMgtP5UUpn6Aht4HZr1wJs3dXXiMii
-OWMeW/D0vAG4im4ImXHVyxfR1wb3AYbQ3g2/k3g6KlqbLPhYiDTPUbmDo1aJKhNI
-m2Cdn1puIhy2iPT/EErOb03vD8Zmnqu9npILEXNpitkJQ0S9AOXghz1DLIyf/crz
-XHkCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwMS5sYWZheWV0dGUuZWR1hilodHRw
-czovL2lkcDEubGFmYXlldHRlLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-NXfHvwg2u2UxRysyIvg9YEOimOowDQYJKoZIhvcNAQEFBQADggEBAA4YgrGDyz+5
-KjDchK55/DJvcpHIy8g845JgaUVuqwQuoUMNQ7X33jv+60BZ3SwZ2IeQ2Ob7H0Tg
-d4tVfBNVLIb35Eg5hzI7L+eAeP6GzaB65fBVzMxq2yFd2hBjjtAHny4gJS7ezPK6
-V9HFdoVQ90t9+HlfBJWs1tMf5+smMTGROTuN+nxHnEjr6nJPozofaZKXMDsZuuKd
-L95JVYfApoA4H6a/w1cxF9lMl2Bs+dlFOP4C9kvZNekgpOYWC1EmA5L4SLglywSw
-IxZ8wXmYPwB3rJluzCbFDPImBSY51mZTzT2AZnTjUPTY/7VhVFpk5jcBhxMVK/3z
-kmYrzZJG/UM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.lafayette.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.lafayette.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.lafayette.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.lafayette.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.lafayette.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.lafayette.edu/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">lafayette.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAJYxoS4g0HtVGMnXI6lqUky18fzdMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEmlkcDEubGFmYXlldHRlLmVkdTAeFw0xMDA0MTkxNjA3
-NDhaFw0zMDA0MTkxNjA3NDhaMB0xGzAZBgNVBAMTEmlkcDEubGFmYXlldHRlLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIfAZOL7zDCIZIazXYRD
-Q1HuBhaHBAxRk7lGyCbl7OhdRN4JWgeyYF3ZwXnX1TZ1A6PoynS0Ax/52nU/oCoA
-ZNP9rCKLpbNPRIbIa8weqpfUH6Z/FYz4K0/UxtaXkxVZS01aXoTYpbKaTPT0iK8i
-r3LeDJwYHP9cMDpQOv0YBaf8gxtxcO+rmhDMgtP5UUpn6Aht4HZr1wJs3dXXiMii
-OWMeW/D0vAG4im4ImXHVyxfR1wb3AYbQ3g2/k3g6KlqbLPhYiDTPUbmDo1aJKhNI
-m2Cdn1puIhy2iPT/EErOb03vD8Zmnqu9npILEXNpitkJQ0S9AOXghz1DLIyf/crz
-XHkCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwMS5sYWZheWV0dGUuZWR1hilodHRw
-czovL2lkcDEubGFmYXlldHRlLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-NXfHvwg2u2UxRysyIvg9YEOimOowDQYJKoZIhvcNAQEFBQADggEBAA4YgrGDyz+5
-KjDchK55/DJvcpHIy8g845JgaUVuqwQuoUMNQ7X33jv+60BZ3SwZ2IeQ2Ob7H0Tg
-d4tVfBNVLIb35Eg5hzI7L+eAeP6GzaB65fBVzMxq2yFd2hBjjtAHny4gJS7ezPK6
-V9HFdoVQ90t9+HlfBJWs1tMf5+smMTGROTuN+nxHnEjr6nJPozofaZKXMDsZuuKd
-L95JVYfApoA4H6a/w1cxF9lMl2Bs+dlFOP4C9kvZNekgpOYWC1EmA5L4SLglywSw
-IxZ8wXmYPwB3rJluzCbFDPImBSY51mZTzT2AZnTjUPTY/7VhVFpk5jcBhxMVK/3z
-kmYrzZJG/UM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.lafayette.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.lafayette.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lafayette College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Lafayette College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lafayette.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Janemarie Duh</md:GivenName>
-    <md:EmailAddress>berryj@lafayette.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>John O'Keefe</md:GivenName>
-    <md:EmailAddress>okeefej@lafayette.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Accounts</md:GivenName>
-    <md:EmailAddress>accounts@lafayette.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-lbl.gov.xml b/swamid-interfederations-2.0/urn-mace-incommon-lbl.gov.xml
deleted file mode 100644
index bd5f885d..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-lbl.gov.xml
+++ /dev/null
@@ -1,75 +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="urn:mace:incommon:lbl.gov">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">lbl.gov</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lawrence Berkeley National Laboratory</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://commons.lbl.gov/display/IDMgmt/Web+Single+Sign+On+at+LBNL</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.lbl.gov/Disclaimers.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="111" width="130" xml:lang="en">https://commons.lbl.gov/download/attachments/58393603/lbl-logo-scaled.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>
-MIIDHzCCAgegAwIBAgIUWaUNclZjoQfm4ab+ttJmW3Oqs7swDQYJKoZIhvcNAQEF
-BQAwGDEWMBQGA1UEAxMNbG9naW4ubGJsLmdvdjAeFw0wODEwMzEyMzM2MjVaFw0y
-ODEwMzEyMzM2MjVaMBgxFjAUBgNVBAMTDWxvZ2luLmxibC5nb3YwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCUWmS996rDiCDoR0+O6MM5ufJlH6JYK9vv
-1AHR29TrZXIv4xkddf8KdTEgXfS7nimbrqKO+rNnt4dvYGfG/BH2jyFhZH48EZMA
-7xzBqp9OTr4uG0J1b286ychnlZAkgqtich4FCQOkhSKWbt9XSudcsWNqSG/VRN9r
-WfqI16q74IFLm8ATUJDkTn+sG29rJcDTqADDlbA8gP3qBHXrPypfmEZChCnEpoUJ
-82w8KjwbyrRIUtOnFBkZsj8XD1Hlv6vASHXxgc7nAYP9zxXSlBFfg1oSMuyWZSXC
-vRmXb32H9I8wO+/8KvzmndzZzU1yw+KZcaMhxfTFUAwxfCDfHyZjAgMBAAGjYTBf
-MD4GA1UdEQQ3MDWCDWxvZ2luLmxibC5nb3aGJGh0dHBzOi8vbG9naW4ubGJsLmdv
-di9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUm7bprLeALfsJXQkGskKJIbn7o00w
-DQYJKoZIhvcNAQEFBQADggEBAC7pPx/biv1uaWXHd77M0HS03VP5oazpjD8yt9TO
-kFST/Q3Jtsg3anxCfqaP/R2vcad8H722vFDZwGflImbZg3DNhF6Mj/pt3CuGpnIg
-7+6mXRTDNzaTKya4wX8RZdNMZ129n4LO+IVgjXZBBpGyNkPbu5D1dXuvsOdWH81B
-//GRSpTRrm0DB2rN6refGeRfHB7ZMVeWQVJFwr+51X+6OitKHLG6/xPqURI+x3mA
-jMIMRq4HkXJG3HRnSAxxmy5CPoslaIvJEXvV1WGUe/1jSqCKfdVSf1SeN2KqfQyj
-XHl1TMy82/4cFm7JOZXiJx32LIlICdpcBIGU7dFwHmiVYJc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.lbl.gov/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.lbl.gov/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.lbl.gov/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.lbl.gov/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Lawrence Berkeley National Laboratory</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lbl.gov/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Greg Haverkamp</md:GivenName>
-    <md:EmailAddress>gahaverkamp@lbl.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Identity Management Team</md:GivenName>
-    <md:EmailAddress>idm@lbl.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>help@lb.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LBL Cybersecurity</md:GivenName>
-    <md:EmailAddress>security@lbl.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml b/swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml
deleted file mode 100644
index ea186007..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-mcnc.org.xml
+++ /dev/null
@@ -1,149 +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="urn:mace:incommon:mcnc.org">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">mcnc.org</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">MCNC</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>
-MIIDLDCCAhSgAwIBAgIJAKPDo3j6X66pMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXNoaWIubWNuYy5vcmcwHhcNMTMxMjEzMTU0ODE4WhcNMzMxMjEzMTU0ODE4
-WjAYMRYwFAYDVQQDEw1zaGliLm1jbmMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtrw9IAY4PuLTkfH9uRH92E0J+Ij+4DEfo6hxI50NdWsioMJ3
-P05GyEdIIB7TPEI0EOtWNJT6wLBxAVlM38GFfh/OSN4IEgiBywbPLQrmOuEMnTEs
-hpfDdI1aPFJpMVEx+2i5bwMD5EOSPKFNxD8B9Gqm7TZmTr3VbCb+n4xu5orpSka8
-lPBLilksOnZwOKjCHFLJlIlvyAVzB1JpNk+AC171bjdNUWIgRzpjTyD5JKzBKOGO
-VSuZfMsbpwaj8Mhm4IY49f69o9L4IleEeoAI5bWfwYFNQ/ptilcblDK/SASIXpDf
-Oklntjt5DL4shertVGRAAZAkzkF6SvvX8zZ1dQIDAQABo3kwdzAdBgNVHQ4EFgQU
-W44lUTMIMW34L32RSSBpxHcbpRMwSAYDVR0jBEEwP4AUW44lUTMIMW34L32RSSBp
-xHcbpROhHKQaMBgxFjAUBgNVBAMTDXNoaWIubWNuYy5vcmeCCQCjw6N4+l+uqTAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB/Fwb1O8NDBsrkDd/KPdaF
-5E+cJXbyu5RA/kPcyBcXRmqxdatc9olix3Tm9utN0EbuP3aiImr/6P07YHGQk+Go
-d77lFj2laehVqeVUvTrPwTUc0j3375on8E96NaXdfbeJ87nlXT84onEXWp3Ahnx/
-KJsQKCUT/4ZZoYJVFCBDShlu4igbXjNuBdL1gCsnlL8VWEbWbNJVMqzknZs4QWNw
-EUWUdnmWZjKjlk0102QEkIUvLU7en3kNqsmuPjw92IY2YhQPIH3J2RTas/FQjIL8
-nN1kNG2Jp9SMNpbgU3AYpY0oEFwoZ5QaEk0kYGPfE06xkiSOH0axJzPUWQ0yg1K+
-          </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>
-MIIDLDCCAhSgAwIBAgIJAPKCnaTdOvUTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXNoaWIubWNuYy5vcmcwHhcNMTAxMjIyMTgzMzMwWhcNMTMxMjIxMTgzMzMw
-WjAYMRYwFAYDVQQDEw1zaGliLm1jbmMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtrw9IAY4PuLTkfH9uRH92E0J+Ij+4DEfo6hxI50NdWsioMJ3
-P05GyEdIIB7TPEI0EOtWNJT6wLBxAVlM38GFfh/OSN4IEgiBywbPLQrmOuEMnTEs
-hpfDdI1aPFJpMVEx+2i5bwMD5EOSPKFNxD8B9Gqm7TZmTr3VbCb+n4xu5orpSka8
-lPBLilksOnZwOKjCHFLJlIlvyAVzB1JpNk+AC171bjdNUWIgRzpjTyD5JKzBKOGO
-VSuZfMsbpwaj8Mhm4IY49f69o9L4IleEeoAI5bWfwYFNQ/ptilcblDK/SASIXpDf
-Oklntjt5DL4shertVGRAAZAkzkF6SvvX8zZ1dQIDAQABo3kwdzAdBgNVHQ4EFgQU
-W44lUTMIMW34L32RSSBpxHcbpRMwSAYDVR0jBEEwP4AUW44lUTMIMW34L32RSSBp
-xHcbpROhHKQaMBgxFjAUBgNVBAMTDXNoaWIubWNuYy5vcmeCCQDygp2k3Tr1EzAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCb73PacEF/52k+5WrtiO+T
-FeW4gR22sHcqJE383mz2WaWA3u0xsgYNbyA7erqIxriY1DOpdQCr4VkY3B4MNSRe
-iHCeDJ67GRKDK1KiH6gR84rugPiOgBRMRkiZEY/sr5PCojg44w/NpFjF0669ZsLk
-iNSnodKcEBwA2xzg/5JBoN8+c2lfA3RErnNE6H1krRSdFUIf6qqvjAsAC4tiaNoX
-qpDN0kQQPXRDoNTOQwq3dsk8Ln3Xath+S+qGl7S4hvAx4uSwRBvq9NC8nbpPOePy
-yON7kOgCmBkorVBXljwXBx36Q7X8jMYI/CQtHFcH2M05Ld8oOU31/m8xiOGruasK
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnc.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnc.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.mcnc.org/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.mcnc.org/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.mcnc.org/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.mcnc.org/idp/profile/SAML2/POST-SimpleSign/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">mcnc.org</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAKPDo3j6X66pMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXNoaWIubWNuYy5vcmcwHhcNMTMxMjEzMTU0ODE4WhcNMzMxMjEzMTU0ODE4
-WjAYMRYwFAYDVQQDEw1zaGliLm1jbmMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtrw9IAY4PuLTkfH9uRH92E0J+Ij+4DEfo6hxI50NdWsioMJ3
-P05GyEdIIB7TPEI0EOtWNJT6wLBxAVlM38GFfh/OSN4IEgiBywbPLQrmOuEMnTEs
-hpfDdI1aPFJpMVEx+2i5bwMD5EOSPKFNxD8B9Gqm7TZmTr3VbCb+n4xu5orpSka8
-lPBLilksOnZwOKjCHFLJlIlvyAVzB1JpNk+AC171bjdNUWIgRzpjTyD5JKzBKOGO
-VSuZfMsbpwaj8Mhm4IY49f69o9L4IleEeoAI5bWfwYFNQ/ptilcblDK/SASIXpDf
-Oklntjt5DL4shertVGRAAZAkzkF6SvvX8zZ1dQIDAQABo3kwdzAdBgNVHQ4EFgQU
-W44lUTMIMW34L32RSSBpxHcbpRMwSAYDVR0jBEEwP4AUW44lUTMIMW34L32RSSBp
-xHcbpROhHKQaMBgxFjAUBgNVBAMTDXNoaWIubWNuYy5vcmeCCQCjw6N4+l+uqTAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB/Fwb1O8NDBsrkDd/KPdaF
-5E+cJXbyu5RA/kPcyBcXRmqxdatc9olix3Tm9utN0EbuP3aiImr/6P07YHGQk+Go
-d77lFj2laehVqeVUvTrPwTUc0j3375on8E96NaXdfbeJ87nlXT84onEXWp3Ahnx/
-KJsQKCUT/4ZZoYJVFCBDShlu4igbXjNuBdL1gCsnlL8VWEbWbNJVMqzknZs4QWNw
-EUWUdnmWZjKjlk0102QEkIUvLU7en3kNqsmuPjw92IY2YhQPIH3J2RTas/FQjIL8
-nN1kNG2Jp9SMNpbgU3AYpY0oEFwoZ5QaEk0kYGPfE06xkiSOH0axJzPUWQ0yg1K+
-          </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>
-MIIDLDCCAhSgAwIBAgIJAPKCnaTdOvUTMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXNoaWIubWNuYy5vcmcwHhcNMTAxMjIyMTgzMzMwWhcNMTMxMjIxMTgzMzMw
-WjAYMRYwFAYDVQQDEw1zaGliLm1jbmMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAtrw9IAY4PuLTkfH9uRH92E0J+Ij+4DEfo6hxI50NdWsioMJ3
-P05GyEdIIB7TPEI0EOtWNJT6wLBxAVlM38GFfh/OSN4IEgiBywbPLQrmOuEMnTEs
-hpfDdI1aPFJpMVEx+2i5bwMD5EOSPKFNxD8B9Gqm7TZmTr3VbCb+n4xu5orpSka8
-lPBLilksOnZwOKjCHFLJlIlvyAVzB1JpNk+AC171bjdNUWIgRzpjTyD5JKzBKOGO
-VSuZfMsbpwaj8Mhm4IY49f69o9L4IleEeoAI5bWfwYFNQ/ptilcblDK/SASIXpDf
-Oklntjt5DL4shertVGRAAZAkzkF6SvvX8zZ1dQIDAQABo3kwdzAdBgNVHQ4EFgQU
-W44lUTMIMW34L32RSSBpxHcbpRMwSAYDVR0jBEEwP4AUW44lUTMIMW34L32RSSBp
-xHcbpROhHKQaMBgxFjAUBgNVBAMTDXNoaWIubWNuYy5vcmeCCQDygp2k3Tr1EzAM
-BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCb73PacEF/52k+5WrtiO+T
-FeW4gR22sHcqJE383mz2WaWA3u0xsgYNbyA7erqIxriY1DOpdQCr4VkY3B4MNSRe
-iHCeDJ67GRKDK1KiH6gR84rugPiOgBRMRkiZEY/sr5PCojg44w/NpFjF0669ZsLk
-iNSnodKcEBwA2xzg/5JBoN8+c2lfA3RErnNE6H1krRSdFUIf6qqvjAsAC4tiaNoX
-qpDN0kQQPXRDoNTOQwq3dsk8Ln3Xath+S+qGl7S4hvAx4uSwRBvq9NC8nbpPOePy
-yON7kOgCmBkorVBXljwXBx36Q7X8jMYI/CQtHFcH2M05Ld8oOU31/m8xiOGruasK
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.mcnc.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.mcnc.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">MCNC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">MCNC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mcnc.org/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Steve Thorpe</md:GivenName>
-    <md:EmailAddress>thorpe@mcnc.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Keith Venters</md:GivenName>
-    <md:EmailAddress>kventers@mcnc.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>MCNC Help Desk</md:GivenName>
-    <md:EmailAddress>support@mcnc.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-mit.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-mit.edu.xml
deleted file mode 100644
index 105d32fb..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-mit.edu.xml
+++ /dev/null
@@ -1,89 +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="urn:mace:incommon:mit.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.mit.edu/help.html" 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">mit.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Massachusetts Institute of Technology</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>
-MIIC6DCCAdCgAwIBAgIJAOOuZYuBUH2jMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC5taXQuZWR1MB4XDTEzMTAyMTE5NDczNloXDTMzMTAxNjE5NDczNlow
-FjEUMBIGA1UEAxMLaWRwLm1pdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDD3t7oBvx5KMmA4+EEQWK421Jt8HsBYMsaUWAiIQVldTlre3rt51Jg
-dN93adYAMvo6LUr3v7jpT8tUsgV0bDD4MsoK5SAlOWh6tQuR172do1KbDi4VT3Gp
-ILJjTqRUjlLEtfCa4/NNQy+ZFXEXIYWoFsfK0J3Q8xCVNdSfNpd3KjlkKshkGsjY
-OMoHJLt8GQB9n7yJX+qZvxJGhiPQJZB5uNx/9omNbvqAF2Hl6b06u7NTPh/Jkvf4
-GGtttjNaWRfcQm1xVbYCCOlpCiTVI6AxCtCy2XqhZmcnY2zk9h2Q/W9lcJ+if1xV
-vMkaId+EBTJW3DI/zvBm0Q/OJTxIwUfzAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2lk
-cC5taXQuZWR1MB0GA1UdDgQWBBRK6tEdA/6T67CMwyWlBEE7cvYaFjANBgkqhkiG
-9w0BAQUFAAOCAQEAUVOL/W1RRrRDm6k4Wtf39jCtHa7gyutt5fHguXUa6nrThRhu
-ISEmiQLqK4hVCiIiarZMuyxosdAwFKSGKaunpBFmqI7NcqzskpdRnMIZ0FLQsRJF
-vY6F6S2ou2Yl0UYonX2eVqzWtIR6jd4CqsQdixf5ZE2eQ6o6QICEpjDgMPK/EAKA
-CsVjcBbQw+YbSkmf30ebRTSzIYMhaGETQuf75xD/Ww0mM3njm79Ophg5Y7I9Ryud
-MdDQwsxAS7ECH7vLyu8V/HIfaPkOWYzKKKW5d4E1/X67J2XmTICT7PdxSd5ZKoB5
-jdqBxPVYM+C1V02QZFDb7TkTDEICzUnr/VBZ+A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mit.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mit.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mit.edu/idp/profile/SAML2/POST/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">mit.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC6DCCAdCgAwIBAgIJAOOuZYuBUH2jMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC5taXQuZWR1MB4XDTEzMTAyMTE5NDczNloXDTMzMTAxNjE5NDczNlow
-FjEUMBIGA1UEAxMLaWRwLm1pdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDD3t7oBvx5KMmA4+EEQWK421Jt8HsBYMsaUWAiIQVldTlre3rt51Jg
-dN93adYAMvo6LUr3v7jpT8tUsgV0bDD4MsoK5SAlOWh6tQuR172do1KbDi4VT3Gp
-ILJjTqRUjlLEtfCa4/NNQy+ZFXEXIYWoFsfK0J3Q8xCVNdSfNpd3KjlkKshkGsjY
-OMoHJLt8GQB9n7yJX+qZvxJGhiPQJZB5uNx/9omNbvqAF2Hl6b06u7NTPh/Jkvf4
-GGtttjNaWRfcQm1xVbYCCOlpCiTVI6AxCtCy2XqhZmcnY2zk9h2Q/W9lcJ+if1xV
-vMkaId+EBTJW3DI/zvBm0Q/OJTxIwUfzAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2lk
-cC5taXQuZWR1MB0GA1UdDgQWBBRK6tEdA/6T67CMwyWlBEE7cvYaFjANBgkqhkiG
-9w0BAQUFAAOCAQEAUVOL/W1RRrRDm6k4Wtf39jCtHa7gyutt5fHguXUa6nrThRhu
-ISEmiQLqK4hVCiIiarZMuyxosdAwFKSGKaunpBFmqI7NcqzskpdRnMIZ0FLQsRJF
-vY6F6S2ou2Yl0UYonX2eVqzWtIR6jd4CqsQdixf5ZE2eQ6o6QICEpjDgMPK/EAKA
-CsVjcBbQw+YbSkmf30ebRTSzIYMhaGETQuf75xD/Ww0mM3njm79Ophg5Y7I9Ryud
-MdDQwsxAS7ECH7vLyu8V/HIfaPkOWYzKKKW5d4E1/X67J2XmTICT7PdxSd5ZKoB5
-jdqBxPVYM+C1V02QZFDb7TkTDEICzUnr/VBZ+A==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mit.edu:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mit.edu:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Massachusetts Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Massachusetts Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://web.mit.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Touchstone Support</md:GivenName>
-    <md:EmailAddress>touchstone-support@mit.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-mlml.calstate.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-mlml.calstate.edu.xml
deleted file mode 100644
index 721238f8..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-mlml.calstate.edu.xml
+++ /dev/null
@@ -1,127 +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="urn:mace:incommon:mlml.calstate.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">mlml.calstate.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Moss Landing Marine Laboratories</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>
-MIIFZDCCBEygAwIBAgIJANHtJiw8sqZ3MA0GCSqGSIb3DQEBBQUAMIHRMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMTW9zcyBMYW5k
-aW5nMSQwIgYDVQQKExtDYWxpZm9ybmlhIFN0YXRlIFVuaXZlcnNpdHkxKTAnBgNV
-BAsTIE1vc3MgTGFuZGluZyBNYXJpbmUgTGFib3JhdG9yaWVzMR4wHAYDVQQDExVp
-ZHAtbWxtbC5jYWxzdGF0ZS5lZHUxJTAjBgkqhkiG9w0BCQEWFml0c3VwcG9ydEBj
-YWxzdGF0ZS5lZHUwHhcNMTIwNzE3MTYyMTE3WhcNMjIwNzE1MTYyMTE3WjCB0TEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFTATBgNVBAcTDE1vc3Mg
-TGFuZGluZzEkMCIGA1UEChMbQ2FsaWZvcm5pYSBTdGF0ZSBVbml2ZXJzaXR5MSkw
-JwYDVQQLEyBNb3NzIExhbmRpbmcgTWFyaW5lIExhYm9yYXRvcmllczEeMBwGA1UE
-AxMVaWRwLW1sbWwuY2Fsc3RhdGUuZWR1MSUwIwYJKoZIhvcNAQkBFhZpdHN1cHBv
-cnRAY2Fsc3RhdGUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-yk/L4w1fUSkaLroiQI/rfYME0l9KvWLFSc6c4UGsI0Zkp/t5gelAOvxtkB76k/B0
-+n2oxKpX/9U3wjmgd8NzKyv4hYbcOdgbQtl672iiR+xf2aEuMvT3JQdcqYse4yXv
-jim9nxdmbtemJhNZvCgKdb9URseNnB3BVfQL1dr9iaByDsKErMa5Cy375D+4DSWY
-0tC24rJMLKjNygCOu9htKoZI/A2opKbVF80mH3Ujv5SeqGfj06MHO4Az3emztsc/
-ykwN6MG0LB4Et/7d/dySW34zAyQG9M6t17NjB4IW8uzq1YjmWo81DXsDdjyKNRgk
-JytvT4mhnV4Iqm7kcS37kQIDAQABo4IBOzCCATcwHQYDVR0OBBYEFMshsF41jQre
-mlkl8hPrvquQAlBHMIIBBgYDVR0jBIH+MIH7gBTLIbBeNY0K3ppZJfIT676rkAJQ
-R6GB16SB1DCB0TELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFTAT
-BgNVBAcTDE1vc3MgTGFuZGluZzEkMCIGA1UEChMbQ2FsaWZvcm5pYSBTdGF0ZSBV
-bml2ZXJzaXR5MSkwJwYDVQQLEyBNb3NzIExhbmRpbmcgTWFyaW5lIExhYm9yYXRv
-cmllczEeMBwGA1UEAxMVaWRwLW1sbWwuY2Fsc3RhdGUuZWR1MSUwIwYJKoZIhvcN
-AQkBFhZpdHN1cHBvcnRAY2Fsc3RhdGUuZWR1ggkA0e0mLDyypncwDAYDVR0TBAUw
-AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPgiqzlbPXyjP29dhlOIvATne68IbTEEv
-BEOOshvQYna/SlbmhzVFp2+mqJILXjBu3b7+MhydoxQSFDiK7yWmvU02Ownk0tYL
-iL54lUeZs8ADRZYipvzdsJ0E7E6LxC4JOsFREigFafDwk1lSBKSJ+JsEhmuNzEhz
-+0cck/yTzDrnBvJuqrVWsv9Po6nJN6lgpf7P+H4fzPRLgRN4IymUuKTl+av9C8Nh
-0PKULq364ZYjX+pa5f2au9lPWj1nwmV9lc9envcbiU7hg6LXZeh5fD5dzsad5YCn
-rDOZv9+tMo8RM/TCwSdro/wDgMKNegtJQb3Wny5phuSnRENGn+sr4w==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-mlml.calstate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-mlml.calstate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-mlml.calstate.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-mlml.calstate.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-mlml.calstate.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-mlml.calstate.edu/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">mlml.calstate.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFZDCCBEygAwIBAgIJANHtJiw8sqZ3MA0GCSqGSIb3DQEBBQUAMIHRMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMTW9zcyBMYW5k
-aW5nMSQwIgYDVQQKExtDYWxpZm9ybmlhIFN0YXRlIFVuaXZlcnNpdHkxKTAnBgNV
-BAsTIE1vc3MgTGFuZGluZyBNYXJpbmUgTGFib3JhdG9yaWVzMR4wHAYDVQQDExVp
-ZHAtbWxtbC5jYWxzdGF0ZS5lZHUxJTAjBgkqhkiG9w0BCQEWFml0c3VwcG9ydEBj
-YWxzdGF0ZS5lZHUwHhcNMTIwNzE3MTYyMTE3WhcNMjIwNzE1MTYyMTE3WjCB0TEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFTATBgNVBAcTDE1vc3Mg
-TGFuZGluZzEkMCIGA1UEChMbQ2FsaWZvcm5pYSBTdGF0ZSBVbml2ZXJzaXR5MSkw
-JwYDVQQLEyBNb3NzIExhbmRpbmcgTWFyaW5lIExhYm9yYXRvcmllczEeMBwGA1UE
-AxMVaWRwLW1sbWwuY2Fsc3RhdGUuZWR1MSUwIwYJKoZIhvcNAQkBFhZpdHN1cHBv
-cnRAY2Fsc3RhdGUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-yk/L4w1fUSkaLroiQI/rfYME0l9KvWLFSc6c4UGsI0Zkp/t5gelAOvxtkB76k/B0
-+n2oxKpX/9U3wjmgd8NzKyv4hYbcOdgbQtl672iiR+xf2aEuMvT3JQdcqYse4yXv
-jim9nxdmbtemJhNZvCgKdb9URseNnB3BVfQL1dr9iaByDsKErMa5Cy375D+4DSWY
-0tC24rJMLKjNygCOu9htKoZI/A2opKbVF80mH3Ujv5SeqGfj06MHO4Az3emztsc/
-ykwN6MG0LB4Et/7d/dySW34zAyQG9M6t17NjB4IW8uzq1YjmWo81DXsDdjyKNRgk
-JytvT4mhnV4Iqm7kcS37kQIDAQABo4IBOzCCATcwHQYDVR0OBBYEFMshsF41jQre
-mlkl8hPrvquQAlBHMIIBBgYDVR0jBIH+MIH7gBTLIbBeNY0K3ppZJfIT676rkAJQ
-R6GB16SB1DCB0TELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFTAT
-BgNVBAcTDE1vc3MgTGFuZGluZzEkMCIGA1UEChMbQ2FsaWZvcm5pYSBTdGF0ZSBV
-bml2ZXJzaXR5MSkwJwYDVQQLEyBNb3NzIExhbmRpbmcgTWFyaW5lIExhYm9yYXRv
-cmllczEeMBwGA1UEAxMVaWRwLW1sbWwuY2Fsc3RhdGUuZWR1MSUwIwYJKoZIhvcN
-AQkBFhZpdHN1cHBvcnRAY2Fsc3RhdGUuZWR1ggkA0e0mLDyypncwDAYDVR0TBAUw
-AwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPgiqzlbPXyjP29dhlOIvATne68IbTEEv
-BEOOshvQYna/SlbmhzVFp2+mqJILXjBu3b7+MhydoxQSFDiK7yWmvU02Ownk0tYL
-iL54lUeZs8ADRZYipvzdsJ0E7E6LxC4JOsFREigFafDwk1lSBKSJ+JsEhmuNzEhz
-+0cck/yTzDrnBvJuqrVWsv9Po6nJN6lgpf7P+H4fzPRLgRN4IymUuKTl+av9C8Nh
-0PKULq364ZYjX+pa5f2au9lPWj1nwmV9lc9envcbiU7hg6LXZeh5fD5dzsad5YCn
-rDOZv9+tMo8RM/TCwSdro/wDgMKNegtJQb3Wny5phuSnRENGn+sr4w==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-mlml.calstate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-mlml.calstate.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Moss Landing Marine Laboratories</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Moss Landing Marine Laboratories</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mlml.calstate.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marcus M. Mizushima</md:GivenName>
-    <md:EmailAddress>iamadmin@calstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Paul Klepac</md:GivenName>
-    <md:EmailAddress>pklepac@mlml.calstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jeff Arlt</md:GivenName>
-    <md:EmailAddress>jarlt@mlml.calstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Eli Pham</md:GivenName>
-    <md:EmailAddress>iamadmin@calstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-msu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-msu.edu.xml
deleted file mode 100644
index 43060ed4..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-msu.edu.xml
+++ /dev/null
@@ -1,97 +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="urn:mace:incommon:msu.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">msu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Michigan State University</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>
-MIIDJzCCAg+gAwIBAgIUeJxFbzo6QUFQBwO2YCaJYbi4LNAwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmlkbS5tc3UuZWR1MB4XDTEwMDgyMzE4NDYwNFoX
-DTMwMDgyMzE4NDYwNFowGjEYMBYGA1UEAxMPaWRwLmlkbS5tc3UuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn2RrXq71PF/4zxddF3P2oCnCtCHQ
-obO7E2Okfg/tjVFIh/aG1YHZRttPF8wbQHBCgmUgGn2vY8ER7LqHDaBGHlQXCNRZ
-1SU5v4+y4gWk4vhyPRaIsb6u5nLv5+LDqgK/9Vsvy5VeHjpfz9iq9RgiATYdM0mr
-xCm/YZyfcR7HD/Cxqx78EwuO2zzTHHzFc7Srkc3Gds402eIfz2Egz2VlaWtbBxGJ
-nHeSDr+8IlylYGci0uc8t53MpIUjHkEhEI5PutnRGP8YbWWnsZU+WeodluQ72Hlc
-kbltmpPfU/Ax5popLImgCaUDp1W1XK38CMnbWbuAwOj4XvrhI43X7TWwfQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuaWRtLm1zdS5lZHWGJmh0dHBzOi8vaWRwLmlk
-bS5tc3UuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTwCin10rPLtpdOnk4J
-VwuQ+TIybDANBgkqhkiG9w0BAQUFAAOCAQEANGJBWy0BETga4XisIU4eUKsDbhB/
-dOs160S/r8Z+2KyY6HpXgA1VwHwX0UKd5zBwEFPatDed5rKb+q1mEg+GFhirkroX
-U1BPnp04URMaoKejO9TedQM96/Ym0pQhkDbQCkuN+P556H/WEVsJr/nTNReoLRAu
-QiEsqE+9onXd3TKwKPh5pLkYPM4+5bGDCIeeZGfFNcps6rRSP+bkoMJ39hmDUmqC
-bfkNIuyhSG8qzEKSdLYdg4PocBa2BrNetkjLwsBG1AGb7DxtDZw0wFZ/JjItlOqr
-IWSXrZlHRA8K/3KR3Augqn/TSQCTmWuhM+gxc/ooYDV3CGCC3Kn9OgMkXQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.idm.msu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.idm.msu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.idm.msu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.idm.msu.edu/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">msu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUeJxFbzo6QUFQBwO2YCaJYbi4LNAwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmlkbS5tc3UuZWR1MB4XDTEwMDgyMzE4NDYwNFoX
-DTMwMDgyMzE4NDYwNFowGjEYMBYGA1UEAxMPaWRwLmlkbS5tc3UuZWR1MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn2RrXq71PF/4zxddF3P2oCnCtCHQ
-obO7E2Okfg/tjVFIh/aG1YHZRttPF8wbQHBCgmUgGn2vY8ER7LqHDaBGHlQXCNRZ
-1SU5v4+y4gWk4vhyPRaIsb6u5nLv5+LDqgK/9Vsvy5VeHjpfz9iq9RgiATYdM0mr
-xCm/YZyfcR7HD/Cxqx78EwuO2zzTHHzFc7Srkc3Gds402eIfz2Egz2VlaWtbBxGJ
-nHeSDr+8IlylYGci0uc8t53MpIUjHkEhEI5PutnRGP8YbWWnsZU+WeodluQ72Hlc
-kbltmpPfU/Ax5popLImgCaUDp1W1XK38CMnbWbuAwOj4XvrhI43X7TWwfQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAuaWRtLm1zdS5lZHWGJmh0dHBzOi8vaWRwLmlk
-bS5tc3UuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTwCin10rPLtpdOnk4J
-VwuQ+TIybDANBgkqhkiG9w0BAQUFAAOCAQEANGJBWy0BETga4XisIU4eUKsDbhB/
-dOs160S/r8Z+2KyY6HpXgA1VwHwX0UKd5zBwEFPatDed5rKb+q1mEg+GFhirkroX
-U1BPnp04URMaoKejO9TedQM96/Ym0pQhkDbQCkuN+P556H/WEVsJr/nTNReoLRAu
-QiEsqE+9onXd3TKwKPh5pLkYPM4+5bGDCIeeZGfFNcps6rRSP+bkoMJ39hmDUmqC
-bfkNIuyhSG8qzEKSdLYdg4PocBa2BrNetkjLwsBG1AGb7DxtDZw0wFZ/JjItlOqr
-IWSXrZlHRA8K/3KR3Augqn/TSQCTmWuhM+gxc/ooYDV3CGCC3Kn9OgMkXQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.idm.msu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.idm.msu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Michigan State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Michigan State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.msu.edu/home/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Callaghan</md:GivenName>
-    <md:EmailAddress>jpc@msu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jim Green</md:GivenName>
-    <md:EmailAddress>jfgreen@msu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mike Bosko</md:GivenName>
-    <md:EmailAddress>mdb@msu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-muohio.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-muohio.edu.xml
deleted file mode 100644
index 89f5ca02..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-muohio.edu.xml
+++ /dev/null
@@ -1,101 +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="urn:mace:incommon:muohio.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shib-idp.muohio.edu/shibboleth/error.html" 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">muohio.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miamioh.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Miami University</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>
-MIIDLDCCAhSgAwIBAgIVAKw5joclkRM7v8BoI/l7FWUAWuZmMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEG11aWRwLm11b2hpby5lZHUwHhcNMTEwOTA2MTgxNzM3
-WhcNMzEwOTA2MTgxNzM3WjAbMRkwFwYDVQQDExBtdWlkcC5tdW9oaW8uZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqb1TAe1bFQ71cuQZz4gP91bT
-Rr8OIr9VA6lAB9L3kO5KQYx5NUBkCbKsWky7M/dbW/+Pt9tj6pkwIEr4GDO0un36
-EZPi3+1Gv0Wmc2WTGA8xQVCPoUP/bd7e5H+gRF7gla5Aj7zvejARFVnw5ajgVvTT
-z5YZAp7Nmw+uJLHMb6IQf+m3xpKGM/tHqZDyhmKIFD18TopyiBLnRGHwKFwxx1Sq
-qfAzkq2OOr5LWb6M6D4FSF0jR0OGKzl6GNi05zvRm40P+nwydCIaC/XduoWodKuU
-l7UkX7JaltsaEVLbpXJBato9Uwyif1vqXMG4oKv0JqMv0I6uzA2J9wbLhQNgjQID
-AQABo2cwZTBEBgNVHREEPTA7ghBtdWlkcC5tdW9oaW8uZWR1hidodHRwczovL211
-aWRwLm11b2hpby5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHletfQytS1u
-CV3Q3wC3ObBMfcpPMA0GCSqGSIb3DQEBBQUAA4IBAQAZUdcZLnMUQpH01ZtHKveu
-PhbjFymh5NThn5Djx83uHXJV8duDEn9+DlEBmIkJefT5IIoRtHQZDeJVk5i5DDm6
-MJpaN48/EVYIlsAnJqO1d6u+ccAIRSlWyqeQPTCJ59mEsv6Va9EEO106EPvcAmzk
-PjkOhl1Xv1kTYkhNlUe+lD76xgvaizZqxQNOZSohGB6JKWVgpVmNKXrG70bPFoVD
-W9zHQ1QMn4zgrcdIXAh35hfJ3V11hYNAxbEJR+a6JcLx6w8sYF4hKcNMez89uunC
-YYDYqK0Q9zukmasDWzcclzuqiJdWWMieNGYFgQOru5/17okAMls3dl2RmjoQgEsN
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://muidp.miamioh.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muidp.miamioh.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://muidp.miamioh.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://muidp.miamioh.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://muidp.miamioh.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://muidp.miamioh.edu/idp/profile/SAML2/POST/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">muohio.edu</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miamioh.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAKw5joclkRM7v8BoI/l7FWUAWuZmMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEG11aWRwLm11b2hpby5lZHUwHhcNMTEwOTA2MTgxNzM3
-WhcNMzEwOTA2MTgxNzM3WjAbMRkwFwYDVQQDExBtdWlkcC5tdW9oaW8uZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqb1TAe1bFQ71cuQZz4gP91bT
-Rr8OIr9VA6lAB9L3kO5KQYx5NUBkCbKsWky7M/dbW/+Pt9tj6pkwIEr4GDO0un36
-EZPi3+1Gv0Wmc2WTGA8xQVCPoUP/bd7e5H+gRF7gla5Aj7zvejARFVnw5ajgVvTT
-z5YZAp7Nmw+uJLHMb6IQf+m3xpKGM/tHqZDyhmKIFD18TopyiBLnRGHwKFwxx1Sq
-qfAzkq2OOr5LWb6M6D4FSF0jR0OGKzl6GNi05zvRm40P+nwydCIaC/XduoWodKuU
-l7UkX7JaltsaEVLbpXJBato9Uwyif1vqXMG4oKv0JqMv0I6uzA2J9wbLhQNgjQID
-AQABo2cwZTBEBgNVHREEPTA7ghBtdWlkcC5tdW9oaW8uZWR1hidodHRwczovL211
-aWRwLm11b2hpby5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHletfQytS1u
-CV3Q3wC3ObBMfcpPMA0GCSqGSIb3DQEBBQUAA4IBAQAZUdcZLnMUQpH01ZtHKveu
-PhbjFymh5NThn5Djx83uHXJV8duDEn9+DlEBmIkJefT5IIoRtHQZDeJVk5i5DDm6
-MJpaN48/EVYIlsAnJqO1d6u+ccAIRSlWyqeQPTCJ59mEsv6Va9EEO106EPvcAmzk
-PjkOhl1Xv1kTYkhNlUe+lD76xgvaizZqxQNOZSohGB6JKWVgpVmNKXrG70bPFoVD
-W9zHQ1QMn4zgrcdIXAh35hfJ3V11hYNAxbEJR+a6JcLx6w8sYF4hKcNMez89uunC
-YYDYqK0Q9zukmasDWzcclzuqiJdWWMieNGYFgQOru5/17okAMls3dl2RmjoQgEsN
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://muidp.miamioh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://muidp.miamioh.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Miami University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Miami University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.muohio.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dirk Tepe</md:GivenName>
-    <md:EmailAddress>tepeds@muohio.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Don Kidd</md:GivenName>
-    <md:EmailAddress>kidddw@muohio.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Michael Beck</md:GivenName>
-    <md:EmailAddress>beckmd@muohio.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml
deleted file mode 100644
index c30ae8cb..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-musc.edu.xml
+++ /dev/null
@@ -1,99 +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="urn:mace:incommon:musc.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">musc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Medical University of South Carolina</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>
-MIIDPjCCAiagAwIBAgIJAOhQxRwlMGgIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWJib2xldGgubXVzYy5lZHUwHhcNMTMwMTA0MDE1MTAwWhcNMjMwMTAy
-MDE1MTAwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm11c2MuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoW2hT67QlW+YDCrhhjCyIrRpwksNqBvJ
-tKgwDrnQwOyMmThDoQBhcgJUTiavZ6ZP7cC0HAE9+8ComDaUVIewyYWKsgZTp79Q
-9BbEMW/op/kqYVzlHzoC8LfjfyPuttTChXeVvA8zx3eat4LJZEgX2m0D9Tfh0Rco
-VekYx+3hp+xs7DW/jAvHkCeamhR2jLEWGvtMte4cnJclq+yaejytFN6rvXiMI2QA
-sG2+/+I+hvCP22/SS1b30yhszOV8zU80gV8Cq/uSp57PWJVDQ4Rje2Vw99MWvSvA
-os4A+iwRFH9AIfEtCgGmgpMKc1J7KzM9lN9f0Qvql+RSqvrxD9/CXwIDAQABo38w
-fTAdBgNVHQ4EFgQUOyBE+oZl6so/wzN6C1RDnonqZm0wTgYDVR0jBEcwRYAUOyBE
-+oZl6so/wzN6C1RDnonqZm2hIqQgMB4xHDAaBgNVBAMTE3NoaWJib2xldGgubXVz
-Yy5lZHWCCQDoUMUcJTBoCDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBmpjbrRMp6XiFyr2+HnD20IKQ7u2A2C2eJAPdAcFZMKGPnEX88TTMxjAO+5+hS
-zLgCUsFvXOMKZF7ncadnocozN6+affODvWU0J1+aSw1xvyemH/QuGSpW77+gBOGl
-uHg/UNKWyAjCpgt2avXkBhjsGLiN8AWj7mGcw8HKHrK7+4BU8L9TWM9ddzfHySn/
-/PXn/XBpzUialyLgS28nAuDF+qgtEhzMaB5T3PkbAacEqzCelRyVocfqjuYinusk
-nlH50wO+ogWqYa7JYPF86r1Lz1FS/qCaWzDtQdf+ZYXvPrcIT5bcY9vQx8gkR1VG
-DxVIAjeM+koyHkSro/jWAJae
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/Shibboleth/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">musc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPjCCAiagAwIBAgIJAOhQxRwlMGgIMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWJib2xldGgubXVzYy5lZHUwHhcNMTMwMTA0MDE1MTAwWhcNMjMwMTAy
-MDE1MTAwWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLm11c2MuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoW2hT67QlW+YDCrhhjCyIrRpwksNqBvJ
-tKgwDrnQwOyMmThDoQBhcgJUTiavZ6ZP7cC0HAE9+8ComDaUVIewyYWKsgZTp79Q
-9BbEMW/op/kqYVzlHzoC8LfjfyPuttTChXeVvA8zx3eat4LJZEgX2m0D9Tfh0Rco
-VekYx+3hp+xs7DW/jAvHkCeamhR2jLEWGvtMte4cnJclq+yaejytFN6rvXiMI2QA
-sG2+/+I+hvCP22/SS1b30yhszOV8zU80gV8Cq/uSp57PWJVDQ4Rje2Vw99MWvSvA
-os4A+iwRFH9AIfEtCgGmgpMKc1J7KzM9lN9f0Qvql+RSqvrxD9/CXwIDAQABo38w
-fTAdBgNVHQ4EFgQUOyBE+oZl6so/wzN6C1RDnonqZm0wTgYDVR0jBEcwRYAUOyBE
-+oZl6so/wzN6C1RDnonqZm2hIqQgMB4xHDAaBgNVBAMTE3NoaWJib2xldGgubXVz
-Yy5lZHWCCQDoUMUcJTBoCDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBmpjbrRMp6XiFyr2+HnD20IKQ7u2A2C2eJAPdAcFZMKGPnEX88TTMxjAO+5+hS
-zLgCUsFvXOMKZF7ncadnocozN6+affODvWU0J1+aSw1xvyemH/QuGSpW77+gBOGl
-uHg/UNKWyAjCpgt2avXkBhjsGLiN8AWj7mGcw8HKHrK7+4BU8L9TWM9ddzfHySn/
-/PXn/XBpzUialyLgS28nAuDF+qgtEhzMaB5T3PkbAacEqzCelRyVocfqjuYinusk
-nlH50wO+ogWqYa7JYPF86r1Lz1FS/qCaWzDtQdf+ZYXvPrcIT5bcY9vQx8gkR1VG
-DxVIAjeM+koyHkSro/jWAJae
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.musc.edu/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Medical University of South Carolina</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Medical University of South Carolina</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.musc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Richard Gadsden</md:GivenName>
-    <md:EmailAddress>gadsden@musc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Joshua Staples</md:GivenName>
-    <md:EmailAddress>staplesj@musc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Shibboleth IDP Group</md:GivenName>
-    <md:EmailAddress>shibidp@musc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-nau.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-nau.edu.xml
deleted file mode 100644
index a2466645..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-nau.edu.xml
+++ /dev/null
@@ -1,112 +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="urn:mace:incommon:nau.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">nau.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Northern Arizona University</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>
-MIIEWTCCA0GgAwIBAgIJAJPypRDQcZpwMA0GCSqGSIb3DQEBBQUAMIHCMQswCQYD
-VQQGEwJVUzEQMA4GA1UECAwHQXJpem9uYTESMBAGA1UEBwwJRmxhZ3N0YWZmMSQw
-IgYDVQQKDBtOb3J0aGVybiBBcml6b25hIFVuaXZlcnNpdHkxKDAmBgNVBAsMH0lu
-Zm9ybWF0aW9uIFRlY2hub2xvZ3kgU2VydmljZXMxGzAZBgNVBAMMEnNoaWJib2xl
-dGgubmF1LmVkdTEgMB4GCSqGSIb3DQEJARYRZGlyZWN0b3J5QG5hdS5lZHUwHhcN
-MTEwMzMxMTgwMTE4WhcNMzEwMzMxMTgwMTE4WjCBwjELMAkGA1UEBhMCVVMxEDAO
-BgNVBAgMB0FyaXpvbmExEjAQBgNVBAcMCUZsYWdzdGFmZjEkMCIGA1UECgwbTm9y
-dGhlcm4gQXJpem9uYSBVbml2ZXJzaXR5MSgwJgYDVQQLDB9JbmZvcm1hdGlvbiBU
-ZWNobm9sb2d5IFNlcnZpY2VzMRswGQYDVQQDDBJzaGliYm9sZXRoLm5hdS5lZHUx
-IDAeBgkqhkiG9w0BCQEWEWRpcmVjdG9yeUBuYXUuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAqV9ordy6tJx2VgI4hUafJyif2hnWO8Afci7PD0+o
-YnZ6l4h8G/Greg9tGcwmoccVmTFYFUdujacQo3vdQOQV7hFi0bkX1tWo/6ygArrn
-RmigRB21y4Nf19JNYzxF4aZgxi3XVIBeZl3Ospjrj8K8uqNBGesycpUR6kO6HU+G
-IZ/2cPmcjRaiRf0BqztIq8Kes/4NImk5weKDrOlJ+MN08ZCkO5rPs6aSyy4rSYwU
-Ascprs8u9eGe3Z7YQijosOnD+cC/pULNgTeKj/mveOWrKBpEobS5q0GH8VF1DIxY
-UK9m+a9PnRmGVcxVtE42bFuAt/LcO8WqUQy67Dz2tMihjwIDAQABo1AwTjAdBgNV
-HQ4EFgQUk1j+/cA4VDnCt2uZqRWbOAodbzgwHwYDVR0jBBgwFoAUk1j+/cA4VDnC
-t2uZqRWbOAodbzgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAUxjd
-PVkZ7UihWY9i1Ig0Inw/u/2oiG1W3Ee7+wa9aecCR1kAlUnKTjq0EwLJ7wXPtXw1
-y4wken1ppgSVFsaFm+LcsP2fzda7qr6JNCU2NxtLKsA0ZdP48hCknz+OoaVaPBnI
-dwliFh/kektdknGal5jbyXZccRssfnGhW2eL1MXDzEY/YSKa95T2LTDq3ek9Wgyf
-4SO18ccwVPhck1+KazXd7RCzvK12igEbNGBJg8cFGga2qxoyR7gSLDXarm4jlRCX
-c0MKBkAQOLaPFkY0E3sM7Hk/tWmbFyp584N4XZYHU2hcnWfuUBY1571m0ysP3n2y
-Sjgw6oOYg18rdX4w3w==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nau.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nau.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nau.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.nau.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nau.edu/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">nau.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEWTCCA0GgAwIBAgIJAJPypRDQcZpwMA0GCSqGSIb3DQEBBQUAMIHCMQswCQYD
-VQQGEwJVUzEQMA4GA1UECAwHQXJpem9uYTESMBAGA1UEBwwJRmxhZ3N0YWZmMSQw
-IgYDVQQKDBtOb3J0aGVybiBBcml6b25hIFVuaXZlcnNpdHkxKDAmBgNVBAsMH0lu
-Zm9ybWF0aW9uIFRlY2hub2xvZ3kgU2VydmljZXMxGzAZBgNVBAMMEnNoaWJib2xl
-dGgubmF1LmVkdTEgMB4GCSqGSIb3DQEJARYRZGlyZWN0b3J5QG5hdS5lZHUwHhcN
-MTEwMzMxMTgwMTE4WhcNMzEwMzMxMTgwMTE4WjCBwjELMAkGA1UEBhMCVVMxEDAO
-BgNVBAgMB0FyaXpvbmExEjAQBgNVBAcMCUZsYWdzdGFmZjEkMCIGA1UECgwbTm9y
-dGhlcm4gQXJpem9uYSBVbml2ZXJzaXR5MSgwJgYDVQQLDB9JbmZvcm1hdGlvbiBU
-ZWNobm9sb2d5IFNlcnZpY2VzMRswGQYDVQQDDBJzaGliYm9sZXRoLm5hdS5lZHUx
-IDAeBgkqhkiG9w0BCQEWEWRpcmVjdG9yeUBuYXUuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAqV9ordy6tJx2VgI4hUafJyif2hnWO8Afci7PD0+o
-YnZ6l4h8G/Greg9tGcwmoccVmTFYFUdujacQo3vdQOQV7hFi0bkX1tWo/6ygArrn
-RmigRB21y4Nf19JNYzxF4aZgxi3XVIBeZl3Ospjrj8K8uqNBGesycpUR6kO6HU+G
-IZ/2cPmcjRaiRf0BqztIq8Kes/4NImk5weKDrOlJ+MN08ZCkO5rPs6aSyy4rSYwU
-Ascprs8u9eGe3Z7YQijosOnD+cC/pULNgTeKj/mveOWrKBpEobS5q0GH8VF1DIxY
-UK9m+a9PnRmGVcxVtE42bFuAt/LcO8WqUQy67Dz2tMihjwIDAQABo1AwTjAdBgNV
-HQ4EFgQUk1j+/cA4VDnCt2uZqRWbOAodbzgwHwYDVR0jBBgwFoAUk1j+/cA4VDnC
-t2uZqRWbOAodbzgwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAUxjd
-PVkZ7UihWY9i1Ig0Inw/u/2oiG1W3Ee7+wa9aecCR1kAlUnKTjq0EwLJ7wXPtXw1
-y4wken1ppgSVFsaFm+LcsP2fzda7qr6JNCU2NxtLKsA0ZdP48hCknz+OoaVaPBnI
-dwliFh/kektdknGal5jbyXZccRssfnGhW2eL1MXDzEY/YSKa95T2LTDq3ek9Wgyf
-4SO18ccwVPhck1+KazXd7RCzvK12igEbNGBJg8cFGga2qxoyR7gSLDXarm4jlRCX
-c0MKBkAQOLaPFkY0E3sM7Hk/tWmbFyp584N4XZYHU2hcnWfuUBY1571m0ysP3n2y
-Sjgw6oOYg18rdX4w3w==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.nau.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.nau.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Northern Arizona University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Northern Arizona University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://home.nau.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Christopher Michels</md:GivenName>
-    <md:EmailAddress>christopher.michels@nau.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Summer Steddom</md:GivenName>
-    <md:EmailAddress>Summer.steddom@nau.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mathew Eis</md:GivenName>
-    <md:EmailAddress>Mathew.Eis@nau.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ncsu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ncsu.edu.xml
deleted file mode 100644
index 74ff4558..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ncsu.edu.xml
+++ /dev/null
@@ -1,109 +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="urn:mace:incommon:ncsu.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</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">ncsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">North Carolina State University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Sign in with your NC State UnityID credentials</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://oit.ncsu.edu/campus-it/identity-management/shibboleth/</mdui:InformationURL>
-        <mdui:Logo height="33" width="195" xml:lang="en">https://docs.shib.ncsu.edu/inc/fed_logo.gif</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>
-MIIDFDCCAfygAwIBAgIJAKcwwnWxi6ZCMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXNoaWIubmNzdS5lZHUwHhcNMTQwNDI1MTUxNDUyWhcNMTkwNDI1MTUxNDUy
-WjAYMRYwFAYDVQQDEw1zaGliLm5jc3UuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAoTTorB5iXx/tC50NPBwDBn0Zy2l6J1x0cTo/81bYgsU1BjlH
-XR/C5/A5mNciH0lpeYKqy/Ij23t+6X+p+3O4RYlTw1AsecLk28/k9sNnjZkvHAzM
-r3TBGQ0gqY50gEU4WPYN9SC7ElxHuSl2S2bv8bWqz99s6xFuKwS9zyRr75BWwZ31
-dEYX6VmFYuUvj72TFKconF79sQgCtpmeDFk3Hu6EVgzhBjLW+yLvYcj+2+bH0PU2
-LESx1nq6f/LFyViMO4TqefyA1wsuowie6X8RPk8obby0I8czdoix4aeohdGaDSyk
-eVtDl8FvmSBEm7Sn434YT8po5QuHUEq90tBhpQIDAQABo2EwXzA+BgNVHREENzA1
-gg1zaGliLm5jc3UuZWR1hiRodHRwczovL3NoaWIubmNzdS5lZHUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFFLakuecqjfP1r3rY4Ix1r9eSqZMMA0GCSqGSIb3DQEB
-BQUAA4IBAQB6ohqcjxrbXeT5GflMWx4cMRhM91xSSxz26GKYOhmhCqZSQkW82PaZ
-cRpmAoiUL21XtrVeZK2eKXRP1GuAoqKOEYCgskwbFk5CM2MeccboRZYMuKn8Myx9
-z9qjNRgbDua/pyprYKHklZiIfQ0shxobzyraSGU7eGQoboY28sy0CTAvNo94kjzY
-lt5/Noa2Z0beNonPwErtEVMHY5ozKVsDAj71VpJYVno9Rh4sJA40M9X90Z8VumZF
-sTmYvvoBIotU2pYCM8LJKGaV14EeDOvKUinr7NwLJtRvrpYhdJLtdoweOC/CriGE
-QG14KYZRu8ILWwLE2Vtr8Zl9dQOZvVuq
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ncsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ncsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ncsu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ncsu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ncsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ncsu.edu/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">ncsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIJAKcwwnWxi6ZCMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXNoaWIubmNzdS5lZHUwHhcNMTQwNDI1MTUxNDUyWhcNMTkwNDI1MTUxNDUy
-WjAYMRYwFAYDVQQDEw1zaGliLm5jc3UuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAoTTorB5iXx/tC50NPBwDBn0Zy2l6J1x0cTo/81bYgsU1BjlH
-XR/C5/A5mNciH0lpeYKqy/Ij23t+6X+p+3O4RYlTw1AsecLk28/k9sNnjZkvHAzM
-r3TBGQ0gqY50gEU4WPYN9SC7ElxHuSl2S2bv8bWqz99s6xFuKwS9zyRr75BWwZ31
-dEYX6VmFYuUvj72TFKconF79sQgCtpmeDFk3Hu6EVgzhBjLW+yLvYcj+2+bH0PU2
-LESx1nq6f/LFyViMO4TqefyA1wsuowie6X8RPk8obby0I8czdoix4aeohdGaDSyk
-eVtDl8FvmSBEm7Sn434YT8po5QuHUEq90tBhpQIDAQABo2EwXzA+BgNVHREENzA1
-gg1zaGliLm5jc3UuZWR1hiRodHRwczovL3NoaWIubmNzdS5lZHUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFFLakuecqjfP1r3rY4Ix1r9eSqZMMA0GCSqGSIb3DQEB
-BQUAA4IBAQB6ohqcjxrbXeT5GflMWx4cMRhM91xSSxz26GKYOhmhCqZSQkW82PaZ
-cRpmAoiUL21XtrVeZK2eKXRP1GuAoqKOEYCgskwbFk5CM2MeccboRZYMuKn8Myx9
-z9qjNRgbDua/pyprYKHklZiIfQ0shxobzyraSGU7eGQoboY28sy0CTAvNo94kjzY
-lt5/Noa2Z0beNonPwErtEVMHY5ozKVsDAj71VpJYVno9Rh4sJA40M9X90Z8VumZF
-sTmYvvoBIotU2pYCM8LJKGaV14EeDOvKUinr7NwLJtRvrpYhdJLtdoweOC/CriGE
-QG14KYZRu8ILWwLE2Vtr8Zl9dQOZvVuq
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ncsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ncsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">North Carolina State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">North Carolina State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ncsu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NC State Shibboleth Support Team</md:GivenName>
-    <md:EmailAddress>shibboleth-help@ncsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NC State Shibboleth Support Team</md:GivenName>
-    <md:EmailAddress>shibboleth-help@ncsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>NC State Help Desk</md:GivenName>
-    <md:EmailAddress>help@ncsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>NC State Security Team</md:GivenName>
-    <md:EmailAddress>security@ncsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-nih.gov.xml b/swamid-interfederations-2.0/urn-mace-incommon-nih.gov.xml
deleted file mode 100644
index 46f153d8..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-nih.gov.xml
+++ /dev/null
@@ -1,77 +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="urn:mace:incommon:nih.gov">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">nih.gov</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">National Institutes of Health</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>
-MIIFyTCCBLGgAwIBAgIEUS3McTANBgkqhkiG9w0BAQsFADB/MQswCQYDVQQGEwJV
-UzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNISFMxIjAgBgNV
-BAsTGUNlcnRpZmljYXRpb24gQXV0aG9yaXRpZXMxJDAiBgNVBAMTG0hIUy1GUEtJ
-LUludGVybWVkaWF0ZS1DQS1FMTAeFw0xNDAzMjExNjA5MjVaFw0xNzAzMjExNjM5
-MjVaMIGAMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQww
-CgYDVQQLEwNISFMxDDAKBgNVBAsTA05JSDEQMA4GA1UECxMHRGV2aWNlczEpMCcG
-A1UEAxMgc2lnbmluZy1pdHJ1c3RmZWRlcmF0aW9uLm5paC5nb3YwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+Hv8UwJAvEYleCBBmeC4pNv1y2X9FCk/v
-TRt8xi5X7ynk3iXcCUVMjcYzEWIt4AGKoyAMxJnEIbLI1xVxy/gVfNi9KTvO6PgN
-O0ayiamnxiAi44f/L/SMm4Ikplpdhcb2RQmGMlAuUJHgMtzBRo+g5blk5OVyHzok
-jij6rUZp4sY0A16+4A644hST9mxok63H52btrmgB7FwSRV19gxc/+8I6Rzomud41
-tG41TXG6Cyq/PrvssqBB4mp0y5KDi67eyE+oSLOZxOJSd8Bck/XaokENFYxgQnSn
-w2hhFTmzG2FNmGeQZ9h1gzCoOBOdP32dvQ/i0LT78/Sd4Mr54D0/AgMBAAGjggJJ
-MIICRTAOBgNVHQ8BAf8EBAMCBaAwFwYDVR0gBBAwDjAMBgpghkgBZQMCAQMIMIHL
-BggrBgEFBQcBAQSBvjCBuzBSBggrBgEFBQcwAoZGaHR0cDovL2hoc3BraWNybC5t
-YW5hZ2VkLmVudHJ1c3QuY29tL0FJQS9DZXJ0c0lzc3VlZFRvSEhTRW50cnVzdENB
-LnA3YzAgBggrBgEFBQcwAYYUaHR0cDovL29jc3AuZGhocy5nb3YwQwYIKwYBBQUH
-MAGGN2h0dHA6Ly9oaHNwa2lvY3NwLm1hbmFnZWQuZW50cnVzdC5jb20vT0NTUC9I
-SFNFbnRydXN0Q0EwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIHsBgNV
-HR8EgeQwgeEwQKA+oDyGOmh0dHA6Ly9oaHNwa2ljcmwubWFuYWdlZC5lbnRydXN0
-LmNvbS9DUkxzL0hIU0VudHJ1c3RDQS5jcmwwgZyggZmggZakgZMwgZAxCzAJBgNV
-BAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsTA0hIUzEi
-MCAGA1UECxMZQ2VydGlmaWNhdGlvbiBBdXRob3JpdGllczEkMCIGA1UEAxMbSEhT
-LUZQS0ktSW50ZXJtZWRpYXRlLUNBLUUxMQ8wDQYDVQQDEwZDUkwzNjMwHwYDVR0j
-BBgwFoAUTdWqJp4OSL7lRiz44QB0CPr2Q0QwHQYDVR0OBBYEFBQjpWaGyUF2KGRQ
-IkSNJbGGOBHYMA0GCSqGSIb3DQEBCwUAA4IBAQAhxNDlqiv8VoWtkhZlF5ydjFV9
-yUNzalhc9mRnp3Sov3vu8BcGcJvSDqicHRbIlLGoDZYIjyUvFkvsIJ5xfztyMBHS
-e+Rc9L/SeNOVik42h23vfypGL0QfvlnpyHCUzseYZfFo0bIe8RLqFZKiC2FcdAcM
-kE2fjMauvXZQTI266pqnYFlwkFD48llB6wrbjKO9SDBSyeq2gAnxp3BIny7gBU/R
-WGRgzl5q5RbOcAjE63Jx7upsjb2L3QFpKrftvc4c9PApGKXKf7DYj1P4OPgOfDlC
-py4JyFjQZIDX97DqBhQa41A9M/NKJ+UtBAbHXNhyYWgCbMvH8jMRLbhOGPhO
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://itrusteauth.nih.gov/affwebservices/public/saml2sso"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://citdecadssoweb.cit.nih.gov/affwebservices/public/saml2sso"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">National Institutes of Health</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">National Institutes of Health</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nih.gov/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NIH Login Team</md:GivenName>
-    <md:EmailAddress>CITIAMNIHLoginTeam@mail.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>NIH Login Support</md:GivenName>
-    <md:EmailAddress>NIHLoginSupport@mail.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NIH Federation Request</md:GivenName>
-    <md:EmailAddress>NIHFederationRequest@mail.nih.gov</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-northwestern.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-northwestern.edu.xml
deleted file mode 100644
index 89848e6f..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-northwestern.edu.xml
+++ /dev/null
@@ -1,100 +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="urn:mace:incommon:northwestern.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">northwestern.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Northwestern University</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>
-MIIDojCCAooCCQC5DFeN8E0XhTANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAklMMREwDwYDVQQHEwhFdmFuc3RvbjEgMB4GA1UEChMXTm9y
-dGh3ZXN0ZXJuIFVuaXZlcnNpdHkxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRlY2hu
-b2xvZ3kxIDAeBgNVBAMTF2ZlZC5pdC5ub3J0aHdlc3Rlcm4uZWR1MB4XDTE1MDEy
-MDE3MDc1MloXDTM3MTIyNTE3MDc1MlowgZIxCzAJBgNVBAYTAlVTMQswCQYDVQQI
-EwJJTDERMA8GA1UEBxMIRXZhbnN0b24xIDAeBgNVBAoTF05vcnRod2VzdGVybiBV
-bml2ZXJzaXR5MR8wHQYDVQQLExZJbmZvcm1hdGlvbiBUZWNobm9sb2d5MSAwHgYD
-VQQDExdmZWQuaXQubm9ydGh3ZXN0ZXJuLmVkdTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJ3HqCrHxVUUf/urBZ9rwID91elzI1jipUdv2HX+LOBqCAap
-3vKpDC7mfpKutO70bpOIXhjIqLWIKh80GzeLUyRt4gFgCRjfr/YzrClF7oveXyi+
-QMUXkIYa7fp5hp5bfSO2XNuJXbMud8GnErPn593jmSi8as5NsljWzNxa19gyHYIS
-sLtkrFM62OCj/S+yiS+xlD94/qkywXrKySKp496ZaJ0hD9YGpg8Lh2Kb/HvtAeOt
-ySGZadmQx163JA8/Yj5Ahyp3/5x3mD3bMyORUnrEvn2d+nqXEQ/9/22nJEq5UcOU
-1L+CTQRKse8ST8fkpN9pf3vIuRX4su2j/7vPPJsCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAltAJkX/WvrNp1weTB9t1XGdxPYG11nWTsbhnm6Y+pBEcOqfM98ZeOAyK
-hgICu3xCEt/q/yh2jzpmLTHwGMiVqWIryoQOBmrMmTLCpRMYxtCTs0F3cFmmPzNJ
-KeWS9pgWg0oZrAasCTIERT+g6u4kgUQMVQhCC4nppl/nPwLM+/oIPKwJ4acrdZwL
-xH100oQ2pDktlENbgaqSkf5Na4iSXCikSWlHXWrvLOitRUdMNatq5SBPNTg2KAH7
-d+Bjxku5FEnS07bFaN5TluB5dXvXjO974EsTgE0IERVG3Ctt627NQRWsgoliqsck
-nC6JxENe05T4sdut9pYxad/9deFNAQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fed.it.northwestern.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fed.it.northwestern.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://fed.it.northwestern.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">northwestern.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDojCCAooCCQC5DFeN8E0XhTANBgkqhkiG9w0BAQsFADCBkjELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAklMMREwDwYDVQQHEwhFdmFuc3RvbjEgMB4GA1UEChMXTm9y
-dGh3ZXN0ZXJuIFVuaXZlcnNpdHkxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRlY2hu
-b2xvZ3kxIDAeBgNVBAMTF2ZlZC5pdC5ub3J0aHdlc3Rlcm4uZWR1MB4XDTE1MDEy
-MDE3MDc1MloXDTM3MTIyNTE3MDc1MlowgZIxCzAJBgNVBAYTAlVTMQswCQYDVQQI
-EwJJTDERMA8GA1UEBxMIRXZhbnN0b24xIDAeBgNVBAoTF05vcnRod2VzdGVybiBV
-bml2ZXJzaXR5MR8wHQYDVQQLExZJbmZvcm1hdGlvbiBUZWNobm9sb2d5MSAwHgYD
-VQQDExdmZWQuaXQubm9ydGh3ZXN0ZXJuLmVkdTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJ3HqCrHxVUUf/urBZ9rwID91elzI1jipUdv2HX+LOBqCAap
-3vKpDC7mfpKutO70bpOIXhjIqLWIKh80GzeLUyRt4gFgCRjfr/YzrClF7oveXyi+
-QMUXkIYa7fp5hp5bfSO2XNuJXbMud8GnErPn593jmSi8as5NsljWzNxa19gyHYIS
-sLtkrFM62OCj/S+yiS+xlD94/qkywXrKySKp496ZaJ0hD9YGpg8Lh2Kb/HvtAeOt
-ySGZadmQx163JA8/Yj5Ahyp3/5x3mD3bMyORUnrEvn2d+nqXEQ/9/22nJEq5UcOU
-1L+CTQRKse8ST8fkpN9pf3vIuRX4su2j/7vPPJsCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAltAJkX/WvrNp1weTB9t1XGdxPYG11nWTsbhnm6Y+pBEcOqfM98ZeOAyK
-hgICu3xCEt/q/yh2jzpmLTHwGMiVqWIryoQOBmrMmTLCpRMYxtCTs0F3cFmmPzNJ
-KeWS9pgWg0oZrAasCTIERT+g6u4kgUQMVQhCC4nppl/nPwLM+/oIPKwJ4acrdZwL
-xH100oQ2pDktlENbgaqSkf5Na4iSXCikSWlHXWrvLOitRUdMNatq5SBPNTg2KAH7
-d+Bjxku5FEnS07bFaN5TluB5dXvXjO974EsTgE0IERVG3Ctt627NQRWsgoliqsck
-nC6JxENe05T4sdut9pYxad/9deFNAQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fed.it.northwestern.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Northwestern University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Northwestern University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.northwestern.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Xiaoxia Dong</md:GivenName>
-    <md:EmailAddress>x-dong@northwestern.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Phil Tracy</md:GivenName>
-    <md:EmailAddress>ptracy@northwestern.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-nyu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-nyu.edu.xml
deleted file mode 100644
index 4862b4ba..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-nyu.edu.xml
+++ /dev/null
@@ -1,76 +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="urn:mace:incommon:nyu.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">nyu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">New York University</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>
-MIIE6DCCA9CgAwIBAgIJAI2V7DmlgLQ1MA0GCSqGSIb3DQEBBQUAMIGoMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRww
-GgYDVQQKExNOZXcgWW9yayBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxIjAgBgNV
-BAMTGXVybjptYWNlOmluY29tbW9uOm55dS5lZHUxIzAhBgkqhkiG9w0BCQEWFGlk
-bS5zZXJ2aWNlc0BueXUuZWR1MB4XDTEyMDgxMDIxMzUxNloXDTIyMDgwODIxMzUx
-NlowgagxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazERMA8GA1UEBxMI
-TmV3IFlvcmsxHDAaBgNVBAoTE05ldyBZb3JrIFVuaXZlcnNpdHkxDDAKBgNVBAsT
-A0lUUzEiMCAGA1UEAxMZdXJuOm1hY2U6aW5jb21tb246bnl1LmVkdTEjMCEGCSqG
-SIb3DQEJARYUaWRtLnNlcnZpY2VzQG55dS5lZHUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDfb4botPJTcMPCLDenzHqWAOJFenUGEAL33ROzA687b73F
-g72Fnlh2Pp7HNhbB3+cQjsQODitjFdUVQgX8EAP3xMZAGKU2M/0ZGfnGokj5oiU0
-80ii6zOzEDUCkulR5CW6p+mgdoCYXs3b9riwm1X5pqi/4ZbCKP+K6TiSBOGWxtCs
-Bp7mWFdJlWUT6a3VRdoYmUUQEOJfrTyT8CW0dk0DGToWe2j3taxGT89E3VA6w5Gk
-tQK5sxllEAVQ23fiMdouDAtr4gDNvOSwtYUuDwh/Ppl/lAMwjU+dv08pNuJR9drF
-jYM0jKoiPsG9AdEwkFSGQb0IB1wt8+wAeTCXIKMrAgMBAAGjggERMIIBDTAdBgNV
-HQ4EFgQUleQurEqBxsOHqhL90hCiWMKIvx0wgd0GA1UdIwSB1TCB0oAUleQurEqB
-xsOHqhL90hCiWMKIvx2hga6kgaswgagxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhO
-ZXcgWW9yazERMA8GA1UEBxMITmV3IFlvcmsxHDAaBgNVBAoTE05ldyBZb3JrIFVu
-aXZlcnNpdHkxDDAKBgNVBAsTA0lUUzEiMCAGA1UEAxMZdXJuOm1hY2U6aW5jb21t
-b246bnl1LmVkdTEjMCEGCSqGSIb3DQEJARYUaWRtLnNlcnZpY2VzQG55dS5lZHWC
-CQCNlew5pYC0NTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQDC7w4Z
-zk/qgpNhmee03UxGOixlFn+UaY6QEdjBIO3O3m20hEWLp4Pa+TBvsSlsFWQh1Wlf
-ngZfgK/MjZykdg0+bGwRT9JMcZbg9xeuznOCEenuTMJtDriquzTlN6ms2emelgBe
-fiQOpDC/hsX3Hr0miTgVq6xb3mRxUpMSRFAQqgkmV403fQ+kd8FcsSy1jjS5XLwX
-iB30XNuA1VE0HlWs4l4DV1G/24Jc1Hr7iUyiZMfZlZkEuju7POrmxtU0RZ00Dyis
-tzuHg2kl7HlTBftOs8FDxM3sqityZScutQmvMe6NCy/3nSFyHCQFPfu66bycssYG
-R+4YvtjCZRUas5kS
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.nyu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.nyu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">New York University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">New York University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nyu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Tracy Edappara</md:GivenName>
-    <md:EmailAddress>tte3@nyu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Gary Chapman</md:GivenName>
-    <md:EmailAddress>gwc1@nyu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Yavor Yanakiev</md:GivenName>
-    <md:EmailAddress>yy27@nyu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-odu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-odu.edu.xml
deleted file mode 100644
index 77131704..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-odu.edu.xml
+++ /dev/null
@@ -1,189 +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="urn:mace:incommon:odu.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://shibboleth.odu.edu/error.html" 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">odu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Old Dominion University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Old Dominion University Shibboleth IDP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://shibboleth.odu.edu</mdui:InformationURL>
-        <mdui:Logo height="48" width="128" xml:lang="en">https://shibboleth.odu.edu/images/mkwl-logo-sm.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>
-MIIE0zCCA7ugAwIBAgIJAMn+w6uDKAKBMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExEDAOBgNVBAcTB05vcmZvbGsxIDAe
-BgNVBAoTF09sZCBEb21pbmlvbiBVbml2ZXJzaXR5MQ0wCwYDVQQLEwRPQ0NTMRsw
-GQYDVQQDExJzaGliYm9sZXRoLm9kdS5lZHUxHzAdBgkqhkiG9w0BCQEWEHRkZXJn
-ZW5zQG9kdS5lZHUwHhcNMTAwMTAxMjE1MDM4WhcNMTMwMTMwMjE1MDM4WjCBoTEL
-MAkGA1UEBhMCVVMxETAPBgNVBAgTCFZpcmdpbmlhMRAwDgYDVQQHEwdOb3Jmb2xr
-MSAwHgYDVQQKExdPbGQgRG9taW5pb24gVW5pdmVyc2l0eTENMAsGA1UECxMET0ND
-UzEbMBkGA1UEAxMSc2hpYmJvbGV0aC5vZHUuZWR1MR8wHQYJKoZIhvcNAQkBFhB0
-ZGVyZ2Vuc0BvZHUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-lBO4vpFW9ikY90LlmdDGqdRXU4YVSEMQQKUvXBVb6NZpsN5FassFhtqE83WckPF8
-viFjZDOfKdTsJ2oWp5DsjH36kqEoLgS2JoUdVD3MjZ5GxZ5r2ZfBccWXL/kmu4Wv
-ByeHj+Fa8ehwagmZ4CXC5Oxd+WYsz4dd5t6lD0PO7Od4RS0sysDCIDC/KTso8p7p
-DDG/vpPbzuwfkxdM8FG3w+3aShgj2N4rnhorrnDkPFzJ4MHrjo0rq359TI8gt8Vx
-I/SW4qN2s2v9O6TDS0YF/qIWU/mIk7/z2F+hF9sC7VD4FC3WqFu3nFm7rTu7tCi0
-IXbC4hX9+xIl6EvhOfapUwIDAQABo4IBCjCCAQYwHQYDVR0OBBYEFIreB34Ia3x6
-l/xVA9jXPGWly38cMIHWBgNVHSMEgc4wgcuAFIreB34Ia3x6l/xVA9jXPGWly38c
-oYGnpIGkMIGhMQswCQYDVQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExEDAOBgNV
-BAcTB05vcmZvbGsxIDAeBgNVBAoTF09sZCBEb21pbmlvbiBVbml2ZXJzaXR5MQ0w
-CwYDVQQLEwRPQ0NTMRswGQYDVQQDExJzaGliYm9sZXRoLm9kdS5lZHUxHzAdBgkq
-hkiG9w0BCQEWEHRkZXJnZW5zQG9kdS5lZHWCCQDJ/sOrgygCgTAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBwmJQ0x1E2tEw5INt+Oo0ZbNExxloPDtGX
-F494Kah7sK1JfbwYjvQt+Mr21IoBon6DhAxUgUMioErjNlx/O61YfvvrxM0beOqe
-RcbiehzolNXZoDc/BpOIyg2Mnts0Oq1W1iqdboG8o/C1hO6QDkDEqs54wzW3IwiB
-6he6+IMkfZU21LFQrtXY97M3MWzazAZSZuiEz/o/xCRC1KAkgETKqPLUj61YiLWK
-RsTSoA0uK8ON9te+ae9yVj8t2PWaPkYgjnP4p5yWEYhEogrSdDr75ncNoD7H9YEl
-j3zAHdA4Cb/2GuXsNgP1vuj5oSKruQenypnVtxFix/Ad2fxsAgyB
-          </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>
-MIIE0zCCA7ugAwIBAgIJAM0WUqwWTWK5MA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExEDAOBgNVBAcTB05vcmZvbGsxIDAe
-BgNVBAoTF09sZCBEb21pbmlvbiBVbml2ZXJzaXR5MQ0wCwYDVQQLEwRPQ0NTMRsw
-GQYDVQQDExJzaGliYm9sZXRoLm9kdS5lZHUxHzAdBgkqhkiG9w0BCQEWEHRkZXJn
-ZW5zQG9kdS5lZHUwHhcNMTIwNjI5MTQ0OTQwWhcNMTgwNjI4MTQ0OTQwWjCBoTEL
-MAkGA1UEBhMCVVMxETAPBgNVBAgTCFZpcmdpbmlhMRAwDgYDVQQHEwdOb3Jmb2xr
-MSAwHgYDVQQKExdPbGQgRG9taW5pb24gVW5pdmVyc2l0eTENMAsGA1UECxMET0ND
-UzEbMBkGA1UEAxMSc2hpYmJvbGV0aC5vZHUuZWR1MR8wHQYJKoZIhvcNAQkBFhB0
-ZGVyZ2Vuc0BvZHUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-tmhF0eShpmRoaSU6VB2e0IFlmxGNOJxFmxdNcMT4vGOqV+3o+Hw6ja9uUSxfsLRt
-s9EgV4+XQAE2HMVRTcTDAuTpcZzhV+uY53Q5yQI0JyCEefBQkLZOhT2+Rgpw62lH
-ELX0XK5DqlTc7oxTt3Sph2ZFsF+ae04jNKughZ7n8BZHLa5ArsBvFp4aOdK0BiDa
-GSbHqvRgZLPAB+W8fljQbwqUiuRQ4O2lVVqmRRON5NCK8QYk4f/1MPShX8g0z39g
-MLjGjZ5GAfRXFJgodTGiVXxD8Eh/ikDQJ86yMo19/92ZM1EGFOYrlLzFeV6lcv6p
-A4LibJoRrqdpeP+HIOtbdwIDAQABo4IBCjCCAQYwHQYDVR0OBBYEFCYuMzBiSlod
-umXknepMcfO7oslaMIHWBgNVHSMEgc4wgcuAFCYuMzBiSlodumXknepMcfO7osla
-oYGnpIGkMIGhMQswCQYDVQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExEDAOBgNV
-BAcTB05vcmZvbGsxIDAeBgNVBAoTF09sZCBEb21pbmlvbiBVbml2ZXJzaXR5MQ0w
-CwYDVQQLEwRPQ0NTMRswGQYDVQQDExJzaGliYm9sZXRoLm9kdS5lZHUxHzAdBgkq
-hkiG9w0BCQEWEHRkZXJnZW5zQG9kdS5lZHWCCQDNFlKsFk1iuTAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA6Oewdj4raYggafMVYUiIAn8dex1oBEX6S
-XN1Iw+XyHPXBJlSmf/L+qtDNyj8UMGaGebHbRPKiklxXd1J0pKvuzolwCphMrgXL
-8w0l4fr9368ZwM75/Gfs4MZeMObrlhsCRGfcX+xrefmcpjpTH/fwEOztvK+Gpq0o
-uhXaH0Ebso7KDEhBvZvDRmfR01SvUzpeftTsPRKnaWJTla1YUPgFszmjUkTJ1Qpa
-cnfTbgwJ96hKnHxmpK5uUsjV+V7EbuIPtI8tz5eL00nP8L/bXsgS3op6kHUk5+NS
-oQUCVhY/uxrC4/QdhUjx1/LfsyW84/+U6K9xavH1VPQaRyzB7MlM
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.odu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.odu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.odu.edu/idp/profile/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.odu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.odu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.odu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.odu.edu/idp/profile/Shibboleth/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">odu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE0zCCA7ugAwIBAgIJAMn+w6uDKAKBMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExEDAOBgNVBAcTB05vcmZvbGsxIDAe
-BgNVBAoTF09sZCBEb21pbmlvbiBVbml2ZXJzaXR5MQ0wCwYDVQQLEwRPQ0NTMRsw
-GQYDVQQDExJzaGliYm9sZXRoLm9kdS5lZHUxHzAdBgkqhkiG9w0BCQEWEHRkZXJn
-ZW5zQG9kdS5lZHUwHhcNMTAwMTAxMjE1MDM4WhcNMTMwMTMwMjE1MDM4WjCBoTEL
-MAkGA1UEBhMCVVMxETAPBgNVBAgTCFZpcmdpbmlhMRAwDgYDVQQHEwdOb3Jmb2xr
-MSAwHgYDVQQKExdPbGQgRG9taW5pb24gVW5pdmVyc2l0eTENMAsGA1UECxMET0ND
-UzEbMBkGA1UEAxMSc2hpYmJvbGV0aC5vZHUuZWR1MR8wHQYJKoZIhvcNAQkBFhB0
-ZGVyZ2Vuc0BvZHUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-lBO4vpFW9ikY90LlmdDGqdRXU4YVSEMQQKUvXBVb6NZpsN5FassFhtqE83WckPF8
-viFjZDOfKdTsJ2oWp5DsjH36kqEoLgS2JoUdVD3MjZ5GxZ5r2ZfBccWXL/kmu4Wv
-ByeHj+Fa8ehwagmZ4CXC5Oxd+WYsz4dd5t6lD0PO7Od4RS0sysDCIDC/KTso8p7p
-DDG/vpPbzuwfkxdM8FG3w+3aShgj2N4rnhorrnDkPFzJ4MHrjo0rq359TI8gt8Vx
-I/SW4qN2s2v9O6TDS0YF/qIWU/mIk7/z2F+hF9sC7VD4FC3WqFu3nFm7rTu7tCi0
-IXbC4hX9+xIl6EvhOfapUwIDAQABo4IBCjCCAQYwHQYDVR0OBBYEFIreB34Ia3x6
-l/xVA9jXPGWly38cMIHWBgNVHSMEgc4wgcuAFIreB34Ia3x6l/xVA9jXPGWly38c
-oYGnpIGkMIGhMQswCQYDVQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExEDAOBgNV
-BAcTB05vcmZvbGsxIDAeBgNVBAoTF09sZCBEb21pbmlvbiBVbml2ZXJzaXR5MQ0w
-CwYDVQQLEwRPQ0NTMRswGQYDVQQDExJzaGliYm9sZXRoLm9kdS5lZHUxHzAdBgkq
-hkiG9w0BCQEWEHRkZXJnZW5zQG9kdS5lZHWCCQDJ/sOrgygCgTAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBwmJQ0x1E2tEw5INt+Oo0ZbNExxloPDtGX
-F494Kah7sK1JfbwYjvQt+Mr21IoBon6DhAxUgUMioErjNlx/O61YfvvrxM0beOqe
-RcbiehzolNXZoDc/BpOIyg2Mnts0Oq1W1iqdboG8o/C1hO6QDkDEqs54wzW3IwiB
-6he6+IMkfZU21LFQrtXY97M3MWzazAZSZuiEz/o/xCRC1KAkgETKqPLUj61YiLWK
-RsTSoA0uK8ON9te+ae9yVj8t2PWaPkYgjnP4p5yWEYhEogrSdDr75ncNoD7H9YEl
-j3zAHdA4Cb/2GuXsNgP1vuj5oSKruQenypnVtxFix/Ad2fxsAgyB
-          </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>
-MIIE0zCCA7ugAwIBAgIJAM0WUqwWTWK5MA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExEDAOBgNVBAcTB05vcmZvbGsxIDAe
-BgNVBAoTF09sZCBEb21pbmlvbiBVbml2ZXJzaXR5MQ0wCwYDVQQLEwRPQ0NTMRsw
-GQYDVQQDExJzaGliYm9sZXRoLm9kdS5lZHUxHzAdBgkqhkiG9w0BCQEWEHRkZXJn
-ZW5zQG9kdS5lZHUwHhcNMTIwNjI5MTQ0OTQwWhcNMTgwNjI4MTQ0OTQwWjCBoTEL
-MAkGA1UEBhMCVVMxETAPBgNVBAgTCFZpcmdpbmlhMRAwDgYDVQQHEwdOb3Jmb2xr
-MSAwHgYDVQQKExdPbGQgRG9taW5pb24gVW5pdmVyc2l0eTENMAsGA1UECxMET0ND
-UzEbMBkGA1UEAxMSc2hpYmJvbGV0aC5vZHUuZWR1MR8wHQYJKoZIhvcNAQkBFhB0
-ZGVyZ2Vuc0BvZHUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-tmhF0eShpmRoaSU6VB2e0IFlmxGNOJxFmxdNcMT4vGOqV+3o+Hw6ja9uUSxfsLRt
-s9EgV4+XQAE2HMVRTcTDAuTpcZzhV+uY53Q5yQI0JyCEefBQkLZOhT2+Rgpw62lH
-ELX0XK5DqlTc7oxTt3Sph2ZFsF+ae04jNKughZ7n8BZHLa5ArsBvFp4aOdK0BiDa
-GSbHqvRgZLPAB+W8fljQbwqUiuRQ4O2lVVqmRRON5NCK8QYk4f/1MPShX8g0z39g
-MLjGjZ5GAfRXFJgodTGiVXxD8Eh/ikDQJ86yMo19/92ZM1EGFOYrlLzFeV6lcv6p
-A4LibJoRrqdpeP+HIOtbdwIDAQABo4IBCjCCAQYwHQYDVR0OBBYEFCYuMzBiSlod
-umXknepMcfO7oslaMIHWBgNVHSMEgc4wgcuAFCYuMzBiSlodumXknepMcfO7osla
-oYGnpIGkMIGhMQswCQYDVQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExEDAOBgNV
-BAcTB05vcmZvbGsxIDAeBgNVBAoTF09sZCBEb21pbmlvbiBVbml2ZXJzaXR5MQ0w
-CwYDVQQLEwRPQ0NTMRswGQYDVQQDExJzaGliYm9sZXRoLm9kdS5lZHUxHzAdBgkq
-hkiG9w0BCQEWEHRkZXJnZW5zQG9kdS5lZHWCCQDNFlKsFk1iuTAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA6Oewdj4raYggafMVYUiIAn8dex1oBEX6S
-XN1Iw+XyHPXBJlSmf/L+qtDNyj8UMGaGebHbRPKiklxXd1J0pKvuzolwCphMrgXL
-8w0l4fr9368ZwM75/Gfs4MZeMObrlhsCRGfcX+xrefmcpjpTH/fwEOztvK+Gpq0o
-uhXaH0Ebso7KDEhBvZvDRmfR01SvUzpeftTsPRKnaWJTla1YUPgFszmjUkTJ1Qpa
-cnfTbgwJ96hKnHxmpK5uUsjV+V7EbuIPtI8tz5eL00nP8L/bXsgS3op6kHUk5+NS
-oQUCVhY/uxrC4/QdhUjx1/LfsyW84/+U6K9xavH1VPQaRyzB7MlM
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.odu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.odu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Old Dominion University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Old Dominion University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://web.odu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Todd Dergenski</md:GivenName>
-    <md:EmailAddress>tdergens@odu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Technical Support Center</md:GivenName>
-    <md:EmailAddress>occshelp@odu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Todd Dergenski</md:GivenName>
-    <md:EmailAddress>tdergens@odu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ohio.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ohio.edu.xml
deleted file mode 100644
index 2e4245de..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ohio.edu.xml
+++ /dev/null
@@ -1,70 +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="urn:mace:incommon:ohio.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.ohio.edu/oit/help/" 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">ohio.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ohio University Main Campus</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>
-MIIDRjCCAi4CCQCgfWHrvKuIZTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJV
-UzENMAsGA1UECAwET2hpbzEPMA0GA1UEBwwGQXRoZW5zMRgwFgYDVQQKDA9PaGlv
-IFVuaXZlcnNpdHkxHDAaBgNVBAMME3NoaWJib2xldGgub2hpby5lZHUwHhcNMTMw
-MjA2MjEyNzE0WhcNMjMwMjA0MjEyNzE0WjBlMQswCQYDVQQGEwJVUzENMAsGA1UE
-CAwET2hpbzEPMA0GA1UEBwwGQXRoZW5zMRgwFgYDVQQKDA9PaGlvIFVuaXZlcnNp
-dHkxHDAaBgNVBAMME3NoaWJib2xldGgub2hpby5lZHUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC5BIf3fnVPpBJPRlTTjV09zcP16wvGELcPy2KQyZWC
-5joeL6Jex3IpotX41DM5OqKr+35+hg1+969VCHucxsjWW0fRbszVqf6UrNt+Sgps
-3wHEtgtvm/7F3Za0L02mDNCBA0WeBRb8Ua6mDyA1q/TWVM/wen5bv31P4uCZk2J1
-nsZwX/f2UtOTItIPuHIPRPM2IOLbHSA+Pf9X5Riw3JM6dQI/RzYW7+4LE7arZyZf
-0V8R3gAKfYjhtpqciwfxohgn8MM/0ufvd8aymN7RsfH3vBIUlGKCUPwcx3lMvoo8
-8A6+2bfXZ7+cVNWCJuFxeMVND2Y+ZtmRGxvQ63fmCD5vAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAJPwIvSh6ram1NrmDcNG0aNJAmHR6+4X6r5TAVPQw+vDvE9WlI0g
-0uGn6wBHY2gcxoseNUkVLGRbgXywyohkP+pcoIjDn9XO2OWk0U4eYMApfe/8eO9z
-RcmWQqfefV/iEmk3TGbIXF7uJn+Pske66sFmJWDDrY/XyIk5/iMyZiYAgzXwHqYH
-6OIwKw3ZEO8bGqZzDTEBzi+lzM48GR2wkorji1XxUZvWxS9PF1QVsFW4sRiD124A
-DjvqccpUQMfjj63LtaJ/7651xVpno2blVL7KWjDs5mNTWMTz/b6pPYZyOhoEZe6E
-zogcZq8NtZ20nYx1Wx1u1vhCdNdZvXcpvOM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ohio.edu/simplesaml/saml2/idp/SSOService.php" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ohio.edu/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ohio.edu/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ohio.edu/simplesaml/shib13/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ohio University Main Campus</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ohio University Main Campus</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ohiou.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mikio Olin</md:GivenName>
-    <md:EmailAddress>olin@ohio.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Allen Gattis</md:GivenName>
-    <md:EmailAddress>gattis@ohio.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Chris Hayes</md:GivenName>
-    <md:EmailAddress>hayesc@ohio.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Renee Perry</md:GivenName>
-    <md:EmailAddress>perryr1@ohio.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ohiolink.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ohiolink.edu.xml
deleted file mode 100644
index 98210229..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ohiolink.edu.xml
+++ /dev/null
@@ -1,107 +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="urn:mace:incommon:ohiolink.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://authdb.ohiolink.edu/idp/error.jsp" 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">ohiolink.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">OhioLink</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Federated login server for OhioLINK staff</mdui:Description>
-        <mdui:Logo height="36" width="425" xml:lang="en">https://authdb.ohiolink.edu/images/full_logo.jpg</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>
-MIIDNzCCAh+gAwIBAgIUW+nOjI+p8Qg0FhPqSEXtfdOSrxAwDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTYXV0aGRiLm9oaW9saW5rLmVkdTAeFw0xMzAyMDExNzQz
-MzNaFw0zMzAyMDExNzQzMzNaMB4xHDAaBgNVBAMTE2F1dGhkYi5vaGlvbGluay5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA5B1zRjLA+5DHp/y2
-Hq6G66/DdwCXu3noSx9fYtguaKU4mS9tB1g+U4d7WXD6KnLmoKIzBb75fjKjX/gH
-bfvqJGNAnergyUn+dTmZrrmGapIPmfZXOOuGiDBa5BMtOnd2B0EK3XKiQe7b9K24
-3H49p9PIa5ibj3LCcw11Ls7ZxnrnexvhJVMwXn566fTWk2gO2WxYgWuXeKOElaGA
-hMkglsSZtVRIaq1aJLAUI+o0Fx9p8o+q6oY7FdVzmv9fQLTtuRvzil1/wLmUBcR3
-JitIMmaH9XJIm9PIIxpRIOJBk9SzxhirkdFUiHo6gL6tQCTdfGW6JLk9Af3lxmEH
-icZ9AgMBAAGjbTBrMEoGA1UdEQRDMEGCE2F1dGhkYi5vaGlvbGluay5lZHWGKmh0
-dHBzOi8vYXV0aGRiLm9oaW9saW5rLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQU00JP6fFzD2U9bYOxFOcCt1H/XEYwDQYJKoZIhvcNAQEFBQADggEBAL1b5wVz
-ncX2I/lW2ky/zoutZa3zmn+Nb7aqYXQQZgSk/YcJ2MRgumZdQQul9VcnUZfopdO9
-QU5aj0n5sG5B9+O85gCPVWIgRRdPMXR+Rf7VdMB416pTf8ijlfyPytwFnC4FYb9i
-kZ6c3xnkawkitHG/YXhYX18xEymAS5xgYg6wCYVPAERq7WLwKq6nnogcRsE3QB6y
-545g8CHaSHVYM2tBu3uZmpxpPJ50BJeJC9oZsPsUSyx4x1y6zRNOv60/a84MwqO+
-vccB/Z9qVR6nWhC+fVb7TLjX1WqbnHrtcjheEicHD3RVLjTM1cOqZaSPTEyu95TE
-/sNN3IpfanDJlq8=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://authdb.ohiolink.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdb.ohiolink.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://authdb.ohiolink.edu/shibboleth/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://authdb.ohiolink.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://authdb.ohiolink.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://authdb.ohiolink.edu/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">ohiolink.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUW+nOjI+p8Qg0FhPqSEXtfdOSrxAwDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTYXV0aGRiLm9oaW9saW5rLmVkdTAeFw0xMzAyMDExNzQz
-MzNaFw0zMzAyMDExNzQzMzNaMB4xHDAaBgNVBAMTE2F1dGhkYi5vaGlvbGluay5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA5B1zRjLA+5DHp/y2
-Hq6G66/DdwCXu3noSx9fYtguaKU4mS9tB1g+U4d7WXD6KnLmoKIzBb75fjKjX/gH
-bfvqJGNAnergyUn+dTmZrrmGapIPmfZXOOuGiDBa5BMtOnd2B0EK3XKiQe7b9K24
-3H49p9PIa5ibj3LCcw11Ls7ZxnrnexvhJVMwXn566fTWk2gO2WxYgWuXeKOElaGA
-hMkglsSZtVRIaq1aJLAUI+o0Fx9p8o+q6oY7FdVzmv9fQLTtuRvzil1/wLmUBcR3
-JitIMmaH9XJIm9PIIxpRIOJBk9SzxhirkdFUiHo6gL6tQCTdfGW6JLk9Af3lxmEH
-icZ9AgMBAAGjbTBrMEoGA1UdEQRDMEGCE2F1dGhkYi5vaGlvbGluay5lZHWGKmh0
-dHBzOi8vYXV0aGRiLm9oaW9saW5rLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQU00JP6fFzD2U9bYOxFOcCt1H/XEYwDQYJKoZIhvcNAQEFBQADggEBAL1b5wVz
-ncX2I/lW2ky/zoutZa3zmn+Nb7aqYXQQZgSk/YcJ2MRgumZdQQul9VcnUZfopdO9
-QU5aj0n5sG5B9+O85gCPVWIgRRdPMXR+Rf7VdMB416pTf8ijlfyPytwFnC4FYb9i
-kZ6c3xnkawkitHG/YXhYX18xEymAS5xgYg6wCYVPAERq7WLwKq6nnogcRsE3QB6y
-545g8CHaSHVYM2tBu3uZmpxpPJ50BJeJC9oZsPsUSyx4x1y6zRNOv60/a84MwqO+
-vccB/Z9qVR6nWhC+fVb7TLjX1WqbnHrtcjheEicHD3RVLjTM1cOqZaSPTEyu95TE
-/sNN3IpfanDJlq8=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://authdb.ohiolink.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://authdb.ohiolink.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">OhioLink</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">OhioLink</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ohiolink.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>OhioLINK Support</md:GivenName>
-    <md:EmailAddress>support@ohiolink.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Alan Edmonds</md:GivenName>
-    <md:EmailAddress>edmonds@oar.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mark Beadles</md:GivenName>
-    <md:EmailAddress>mbeadles@oar.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Matthew Soter</md:GivenName>
-    <md:EmailAddress>msoter@oh-tech.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-osu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-osu.edu.xml
deleted file mode 100644
index 46f70d92..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-osu.edu.xml
+++ /dev/null
@@ -1,107 +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="urn:mace:incommon:osu.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://webauth.service.ohio-state.edu/support.html" 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">osu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ohio State University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://webauth.service.ohio-state.edu/info.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://ocio.osu.edu/policy/policies</mdui:PrivacyStatementURL>
-        <mdui:Logo height="83" width="83" xml:lang="en">https://webauth.service.ohio-state.edu/images/osu_mdui.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>
-MIIDITCCAgmgAwIBAgIJAKu+jRod+TYIMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHndlYmF1dGguc2VydmljZS5vaGlvLXN0YXRlLmVkdTAeFw0xMDAyMDkyMDA3
-MzdaFw0zMDAyMDQyMDA3MzdaMCkxJzAlBgNVBAMTHndlYmF1dGguc2VydmljZS5v
-aGlvLXN0YXRlLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMpZ
-P+xV7kNCuuUtg4X8MTxTnS2TSU/tompvYjI0af4q7N5od7uzEqHBD9FMvh9bZ7GS
-CACX5yYjBYZCb59i0tstfpCsDBho2Wi497EjmaTw81EQ1AjM6EhRb/we0MLj0er8
-8q+vnVC7Jb7DoStoNIEFoOTv8LvKldrrXVX3yHZR3bEVtvblZbGMSYtPdH/TYMDQ
-cmqkpzldfz9rQFDLSM8mqBqf56zmB8uzkZKhujTXOzb4STvaq7hhAnDwT3z9c00O
-XbDBWxd1CplgHwZvrbWxYxf5gTCaPvHuLY5WeA8Ky5SUZifO/szEDvEm8K0rHStK
-H/blQiX5fUQ6t3SfxbsCAwEAAaNMMEowKQYDVR0RBCIwIIIed2ViYXV0aC5zZXJ2
-aWNlLm9oaW8tc3RhdGUuZWR1MB0GA1UdDgQWBBR70C49vjOa/Ikk86hkX998wqQt
-UDANBgkqhkiG9w0BAQUFAAOCAQEAlgMMaTIwrly4U896lUa92iif3bLGADPjc0Is
-6a6k6RytjJm/r0lbtjCWW6zs1T6L7458Ow+57fyF0Oh/iXvj65m+dvCBWXnag7hN
-1yMBJQMRpSjH7dLko7y0EJ/ZrKEYQwYnBGmCILvJB/MIj2eEkq2Z47uWpvrehJfb
-zsEeAbjNqw1V/AJN7E4paw8aYg8TXEXAdOvNL5h7KRQw8Ui0kCw2DeTTIXExSxZd
-bqw6ldfQD2fVYnLxDGTFqITCi1a9TidA4xCXD95F7uQaEao3O8ArZcyag62uiMtv
-i24RvCRvD/vsnUhI82pV/DK+2icz6UDtiiKrFNAmIiR14TanfA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.service.ohio-state.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.service.ohio-state.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.service.ohio-state.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.service.ohio-state.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.service.ohio-state.edu/idp/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDITCCAgmgAwIBAgIJAKu+jRod+TYIMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHndlYmF1dGguc2VydmljZS5vaGlvLXN0YXRlLmVkdTAeFw0xMDAyMDkyMDA3
-MzdaFw0zMDAyMDQyMDA3MzdaMCkxJzAlBgNVBAMTHndlYmF1dGguc2VydmljZS5v
-aGlvLXN0YXRlLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMpZ
-P+xV7kNCuuUtg4X8MTxTnS2TSU/tompvYjI0af4q7N5od7uzEqHBD9FMvh9bZ7GS
-CACX5yYjBYZCb59i0tstfpCsDBho2Wi497EjmaTw81EQ1AjM6EhRb/we0MLj0er8
-8q+vnVC7Jb7DoStoNIEFoOTv8LvKldrrXVX3yHZR3bEVtvblZbGMSYtPdH/TYMDQ
-cmqkpzldfz9rQFDLSM8mqBqf56zmB8uzkZKhujTXOzb4STvaq7hhAnDwT3z9c00O
-XbDBWxd1CplgHwZvrbWxYxf5gTCaPvHuLY5WeA8Ky5SUZifO/szEDvEm8K0rHStK
-H/blQiX5fUQ6t3SfxbsCAwEAAaNMMEowKQYDVR0RBCIwIIIed2ViYXV0aC5zZXJ2
-aWNlLm9oaW8tc3RhdGUuZWR1MB0GA1UdDgQWBBR70C49vjOa/Ikk86hkX998wqQt
-UDANBgkqhkiG9w0BAQUFAAOCAQEAlgMMaTIwrly4U896lUa92iif3bLGADPjc0Is
-6a6k6RytjJm/r0lbtjCWW6zs1T6L7458Ow+57fyF0Oh/iXvj65m+dvCBWXnag7hN
-1yMBJQMRpSjH7dLko7y0EJ/ZrKEYQwYnBGmCILvJB/MIj2eEkq2Z47uWpvrehJfb
-zsEeAbjNqw1V/AJN7E4paw8aYg8TXEXAdOvNL5h7KRQw8Ui0kCw2DeTTIXExSxZd
-bqw6ldfQD2fVYnLxDGTFqITCi1a9TidA4xCXD95F7uQaEao3O8ArZcyag62uiMtv
-i24RvCRvD/vsnUhI82pV/DK+2icz6UDtiiKrFNAmIiR14TanfA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.service.ohio-state.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Ohio State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ohio State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.osu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Service Desk</md:GivenName>
-    <md:EmailAddress>8help@osu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Authentication Support</md:GivenName>
-    <md:EmailAddress>webauth-admin@lists.service.ohio-state.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Authentication Support</md:GivenName>
-    <md:EmailAddress>webauth-admin@lists.service.ohio-state.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>security@osu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-psu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-psu.edu.xml
deleted file mode 100644
index 3ee02905..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-psu.edu.xml
+++ /dev/null
@@ -1,130 +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="urn:mace:incommon:psu.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</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">psu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Penn State</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.psu.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.psu.edu/web-privacy-statement</mdui:PrivacyStatementURL>
-        <mdui:Logo height="70" width="130" xml:lang="en">https://www.dept.psu.edu/ids/public/psulogoforincommon.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>
-MIIE+jCCA+KgAwIBAgIJAL8NZFMAw3T+MA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRgwFgYDVQQHEw9Vbml2ZXJz
-aXR5IFBhcmsxKjAoBgNVBAoTIVRoZSBQZW5uc3lsdmFuaWEgU3RhdGUgVW5pdmVy
-c2l0eTEoMCYGA1UECxMfSW5mb3JtYXRpb24gVGVjaG5vbG9neSBTZXJ2aWNlczEY
-MBYGA1UEAxMPYXMxLmZpbS5wc3UuZWR1MB4XDTEyMDQxMTE5MjMzNFoXDTMyMDQw
-NjE5MjMzNFowga4xCzAJBgNVBAYTAlVTMRUwEwYDVQQIEwxQZW5uc3lsdmFuaWEx
-GDAWBgNVBAcTD1VuaXZlcnNpdHkgUGFyazEqMCgGA1UEChMhVGhlIFBlbm5zeWx2
-YW5pYSBTdGF0ZSBVbml2ZXJzaXR5MSgwJgYDVQQLEx9JbmZvcm1hdGlvbiBUZWNo
-bm9sb2d5IFNlcnZpY2VzMRgwFgYDVQQDEw9hczEuZmltLnBzdS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDgDw/HyxwqLZGLR1s6ewzwji0fx1dq
-Y4GoNycD8brxxnA11BgL0cSIM0WYyfOJBUxBhmkrlWccZDPPOmAC5qlPfLO8GjIS
-yFQrMFyhCynYKlP0Clm/59FkM/Jw2GPFmVXgM+dczk75f0sOaQzmay8pZdnOX3SX
-CX4aiOU+PFUqSuF94Ug/DkSeVHf9x6aV6A/e2iWHsigHTXNL5T5n29iNPRjdQ7NT
-JBnMGMpzjoZkFvmlVsplt6bTT7v81khDQItvTXVz1l9b3P3scYU2a3tRHFuyHRr8
-AHaqRDwIeDP4EaQcMHkD5EktM8RkOiPFYZQwSSrhM5F7gk/rFOXg+ZOvAgMBAAGj
-ggEXMIIBEzAdBgNVHQ4EFgQU5I99+kOGxYuGIeGYPeB8BdbR0GUwgeMGA1UdIwSB
-2zCB2IAU5I99+kOGxYuGIeGYPeB8BdbR0GWhgbSkgbEwga4xCzAJBgNVBAYTAlVT
-MRUwEwYDVQQIEwxQZW5uc3lsdmFuaWExGDAWBgNVBAcTD1VuaXZlcnNpdHkgUGFy
-azEqMCgGA1UEChMhVGhlIFBlbm5zeWx2YW5pYSBTdGF0ZSBVbml2ZXJzaXR5MSgw
-JgYDVQQLEx9JbmZvcm1hdGlvbiBUZWNobm9sb2d5IFNlcnZpY2VzMRgwFgYDVQQD
-Ew9hczEuZmltLnBzdS5lZHWCCQC/DWRTAMN0/jAMBgNVHRMEBTADAQH/MA0GCSqG
-SIb3DQEBBQUAA4IBAQCE5rt7hCbcrtwqaR6e9Z4nRfWdkQYtGTWi9UaBFhS7MLJB
-t4FyP+ohfRshQGAwJjekQW28GhuoDWngcdZFhE0ktYwct2zKhUDe8ggPWJWPLnlD
-UMiSX6BIn6tgpkpqpwduCoceQqLD2XnT33X7Fur0qohGW2EFPKxKHEVHXtfcHEsZ
-sBGSEC21XV/796AI8JQ4rb8ASWaLSjoGGwlZjsDogIzUJAuMdBPuG/CkbTJDjsii
-u9cF1oLJGzUEXx6B1ugWfWxVeUumOE0PGX3uPijrOd3Ak1gRevg//iyMw+zvL9xL
-4e+XA3Dtyu/I5Riwwv3AF7MFfNpiFhs0ay1ARC8y
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://as1.fim.psu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.fim.psu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://as1.fim.psu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://as1.fim.psu.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.fim.psu.edu/idp/profile/SAML2/SOAP/ECP"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://as1.fim.psu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://as1.fim.psu.edu/idp/profile/SAML2/POST-SimpleSign/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">psu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE+jCCA+KgAwIBAgIJAL8NZFMAw3T+MA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJVUzEVMBMGA1UECBMMUGVubnN5bHZhbmlhMRgwFgYDVQQHEw9Vbml2ZXJz
-aXR5IFBhcmsxKjAoBgNVBAoTIVRoZSBQZW5uc3lsdmFuaWEgU3RhdGUgVW5pdmVy
-c2l0eTEoMCYGA1UECxMfSW5mb3JtYXRpb24gVGVjaG5vbG9neSBTZXJ2aWNlczEY
-MBYGA1UEAxMPYXMxLmZpbS5wc3UuZWR1MB4XDTEyMDQxMTE5MjMzNFoXDTMyMDQw
-NjE5MjMzNFowga4xCzAJBgNVBAYTAlVTMRUwEwYDVQQIEwxQZW5uc3lsdmFuaWEx
-GDAWBgNVBAcTD1VuaXZlcnNpdHkgUGFyazEqMCgGA1UEChMhVGhlIFBlbm5zeWx2
-YW5pYSBTdGF0ZSBVbml2ZXJzaXR5MSgwJgYDVQQLEx9JbmZvcm1hdGlvbiBUZWNo
-bm9sb2d5IFNlcnZpY2VzMRgwFgYDVQQDEw9hczEuZmltLnBzdS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDgDw/HyxwqLZGLR1s6ewzwji0fx1dq
-Y4GoNycD8brxxnA11BgL0cSIM0WYyfOJBUxBhmkrlWccZDPPOmAC5qlPfLO8GjIS
-yFQrMFyhCynYKlP0Clm/59FkM/Jw2GPFmVXgM+dczk75f0sOaQzmay8pZdnOX3SX
-CX4aiOU+PFUqSuF94Ug/DkSeVHf9x6aV6A/e2iWHsigHTXNL5T5n29iNPRjdQ7NT
-JBnMGMpzjoZkFvmlVsplt6bTT7v81khDQItvTXVz1l9b3P3scYU2a3tRHFuyHRr8
-AHaqRDwIeDP4EaQcMHkD5EktM8RkOiPFYZQwSSrhM5F7gk/rFOXg+ZOvAgMBAAGj
-ggEXMIIBEzAdBgNVHQ4EFgQU5I99+kOGxYuGIeGYPeB8BdbR0GUwgeMGA1UdIwSB
-2zCB2IAU5I99+kOGxYuGIeGYPeB8BdbR0GWhgbSkgbEwga4xCzAJBgNVBAYTAlVT
-MRUwEwYDVQQIEwxQZW5uc3lsdmFuaWExGDAWBgNVBAcTD1VuaXZlcnNpdHkgUGFy
-azEqMCgGA1UEChMhVGhlIFBlbm5zeWx2YW5pYSBTdGF0ZSBVbml2ZXJzaXR5MSgw
-JgYDVQQLEx9JbmZvcm1hdGlvbiBUZWNobm9sb2d5IFNlcnZpY2VzMRgwFgYDVQQD
-Ew9hczEuZmltLnBzdS5lZHWCCQC/DWRTAMN0/jAMBgNVHRMEBTADAQH/MA0GCSqG
-SIb3DQEBBQUAA4IBAQCE5rt7hCbcrtwqaR6e9Z4nRfWdkQYtGTWi9UaBFhS7MLJB
-t4FyP+ohfRshQGAwJjekQW28GhuoDWngcdZFhE0ktYwct2zKhUDe8ggPWJWPLnlD
-UMiSX6BIn6tgpkpqpwduCoceQqLD2XnT33X7Fur0qohGW2EFPKxKHEVHXtfcHEsZ
-sBGSEC21XV/796AI8JQ4rb8ASWaLSjoGGwlZjsDogIzUJAuMdBPuG/CkbTJDjsii
-u9cF1oLJGzUEXx6B1ugWfWxVeUumOE0PGX3uPijrOd3Ak1gRevg//iyMw+zvL9xL
-4e+XA3Dtyu/I5Riwwv3AF7MFfNpiFhs0ay1ARC8y
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://as1.fim.psu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://as1.fim.psu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Pennsylvania State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Penn State</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.psu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mark Miller</md:GivenName>
-    <md:EmailAddress>max@psu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Penn State Identity Services</md:GivenName>
-    <md:EmailAddress>identity@psu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Andrea Harrington</md:GivenName>
-    <md:EmailAddress>avh3@psu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Michael Gettes</md:GivenName>
-    <md:EmailAddress>mrg30@psu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ramapo.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ramapo.edu.xml
deleted file mode 100644
index cbd11ad4..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ramapo.edu.xml
+++ /dev/null
@@ -1,91 +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="urn:mace:incommon:ramapo.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://idp.ramapo.edu/idp/error.jsp" 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">ramapo.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ramapo College of New Jersey</mdui:DisplayName>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.ramapo.edu/statements-policies</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>
-MIIDIzCCAgugAwIBAgIUMraID/Je8wXM0Yl6BJKCTTWX6RIwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnJhbWFwby5lZHUwHhcNMDkwMTMxMDQxODA0WhcN
-MjkwMTMxMDQxODA0WjAZMRcwFQYDVQQDEw5pZHAucmFtYXBvLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKNRo8kACf0jAbpwBsRWe1lqsbdi2kKc
-kDPWLeJzmSW341X90042Y32L0l6VDPaQLkNlloStsRRYVdtLeAa9hYU1yol5gy3f
-/iOnk2xbOkfg6LYmnyyC7Y/GX8Sr5MWd7jxE+D8KdIPHWvgJx/hKAXzOxnxEpGwS
-UIfQ0uJ/Ca7Fttpzsm0Y5KnSTjJwTw8jNZGuTe2Yi14DJ8yEeE68KO+CCkCW2QUB
-az2YHo7+3M9wR6fSXe6CjHmmQr6/SYXWO/hO69mLI/7zSXMYliw0OPWPA4LFhJnJ
-MfmMc4bUGCqlgeSzFqYXOLk05S0znponukIZeMw4Epxdzl6Cy/HLJrcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnJhbWFwby5lZHWGJWh0dHBzOi8vaWRwLnJhbWFw
-by5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFvCOP1hSomD2T0WmoOlZdR8
-OzPkMA0GCSqGSIb3DQEBBQUAA4IBAQAQHpidIf3I81COeB1JjmzGvVTGkYNlKlIi
-kU5hTOQjFMZQG1nZ3Qlkr5wLMg8Sjky9l/JvP5kwPu3aqYYtQEtLmZh6XY5/1l/C
-lG4+EyUAEvTnN14Oe4Y8YQWwuVJEZfHlFp5gpop46fv0Q7q2CZ2SYtjrCmpVk4YE
-+sbm316PCMKgV4eIjaKbsDgGNMsUs4EKaUNMF7MPbgfC7Zvh2eMmhLHhGS4jg5Gc
-dX99H6mqvnkySdP2U5oat1ACQ5IfAV49eRR1JFzJaas+TsxGLIcQkx/GgLHP+3ef
-1FEZK3OCX+xZSA820MZxY7/F+3YdKb794sY4ku+x3ZszkcZ4FJL1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ramapo.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ramapo.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ramapo.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ramapo.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ramapo.edu/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">ramapo.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIUMraID/Je8wXM0Yl6BJKCTTWX6RIwDQYJKoZIhvcNAQEF
-BQAwGTEXMBUGA1UEAxMOaWRwLnJhbWFwby5lZHUwHhcNMDkwMTMxMDQxODA0WhcN
-MjkwMTMxMDQxODA0WjAZMRcwFQYDVQQDEw5pZHAucmFtYXBvLmVkdTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKNRo8kACf0jAbpwBsRWe1lqsbdi2kKc
-kDPWLeJzmSW341X90042Y32L0l6VDPaQLkNlloStsRRYVdtLeAa9hYU1yol5gy3f
-/iOnk2xbOkfg6LYmnyyC7Y/GX8Sr5MWd7jxE+D8KdIPHWvgJx/hKAXzOxnxEpGwS
-UIfQ0uJ/Ca7Fttpzsm0Y5KnSTjJwTw8jNZGuTe2Yi14DJ8yEeE68KO+CCkCW2QUB
-az2YHo7+3M9wR6fSXe6CjHmmQr6/SYXWO/hO69mLI/7zSXMYliw0OPWPA4LFhJnJ
-MfmMc4bUGCqlgeSzFqYXOLk05S0znponukIZeMw4Epxdzl6Cy/HLJrcCAwEAAaNj
-MGEwQAYDVR0RBDkwN4IOaWRwLnJhbWFwby5lZHWGJWh0dHBzOi8vaWRwLnJhbWFw
-by5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFFvCOP1hSomD2T0WmoOlZdR8
-OzPkMA0GCSqGSIb3DQEBBQUAA4IBAQAQHpidIf3I81COeB1JjmzGvVTGkYNlKlIi
-kU5hTOQjFMZQG1nZ3Qlkr5wLMg8Sjky9l/JvP5kwPu3aqYYtQEtLmZh6XY5/1l/C
-lG4+EyUAEvTnN14Oe4Y8YQWwuVJEZfHlFp5gpop46fv0Q7q2CZ2SYtjrCmpVk4YE
-+sbm316PCMKgV4eIjaKbsDgGNMsUs4EKaUNMF7MPbgfC7Zvh2eMmhLHhGS4jg5Gc
-dX99H6mqvnkySdP2U5oat1ACQ5IfAV49eRR1JFzJaas+TsxGLIcQkx/GgLHP+3ef
-1FEZK3OCX+xZSA820MZxY7/F+3YdKb794sY4ku+x3ZszkcZ4FJL1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ramapo.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ramapo.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ramapo College of New Jersey</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ramapo College of New Jersey</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ramapo.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Richard Then</md:GivenName>
-    <md:EmailAddress>sso-admin@ramapo.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-richmond.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-richmond.edu.xml
deleted file mode 100644
index 8303ca87..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-richmond.edu.xml
+++ /dev/null
@@ -1,87 +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="urn:mace:incommon:richmond.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">richmond.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Richmond</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>
-MIICsjCCAZoCCQCBYXtqVeqXXTANBgkqhkiG9w0BAQUFADAbMRkwFwYDVQQDExBp
-ZHAucmljaG1vbmQuZWR1MB4XDTEwMTExOTE4NDUyNloXDTMwMTExNDE4NDUyNlow
-GzEZMBcGA1UEAxMQaWRwLnJpY2htb25kLmVkdTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJRI9L6ikF8FB4ySCsNWPNYsenurJOoARRywnTYONGCQlKwK
-ZWjQAdrYn6B2ydstAUroMmg8iS+CbwbxrA7gsK/aXtD/oCq5prYt5LKIb2cWV9Lg
-8YnkICntETLdISZk5JUOS0ZaSoSSOU06s39qPCKapMGdWLenEXrBJcDUIPSN1XYG
-cAKxs9UrqhWQ2xI1iSv92PFum5bzh6IFsRnD3EyVBlRzAZQwP3GR0z9bq4y7ul2a
-XzYVJmyga+NizM8GQQY4bGXoWXh15/jGjqpAd3R/DRjQUTkpLGyqNgGW0sH2diLa
-6hf84LBR7ogaRwRK+PWxau6DyAtUl2K+O7xJ+NcCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAayyiqqbJvJwBgJvSaPj3xVUzZ4wHcLrYutI7TiPIx6np6aDc7VaKeXsD
-tDeh+oE/9xkyIiQq8jfVVgTXddye2HDWV4Qr6zXpAtqZvzXlaOeg73wCAKbcuyos
-MvcapBFJ0ffWwVcoXo0s0au860SQHzcvSXONLPBM9U4tf9J6eWWKJjCUjP/R8TVe
-x56haExHiHdwJbDguNL2w3j6eKVNmnRDzBBhMDVnLGETHnY5XxQdrZ/BWSWvvbTR
-l+rZWtKVWKLKaigDqCiM9g/1B946PVG3jmnxel/RP5ICm363RzyALz8dxG/2ujZU
-M48hMJgWkMldrREsBWB/ZJm1BA0sAw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.richmond.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.richmond.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.richmond.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">richmond.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIICsjCCAZoCCQCBYXtqVeqXXTANBgkqhkiG9w0BAQUFADAbMRkwFwYDVQQDExBp
-ZHAucmljaG1vbmQuZWR1MB4XDTEwMTExOTE4NDUyNloXDTMwMTExNDE4NDUyNlow
-GzEZMBcGA1UEAxMQaWRwLnJpY2htb25kLmVkdTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJRI9L6ikF8FB4ySCsNWPNYsenurJOoARRywnTYONGCQlKwK
-ZWjQAdrYn6B2ydstAUroMmg8iS+CbwbxrA7gsK/aXtD/oCq5prYt5LKIb2cWV9Lg
-8YnkICntETLdISZk5JUOS0ZaSoSSOU06s39qPCKapMGdWLenEXrBJcDUIPSN1XYG
-cAKxs9UrqhWQ2xI1iSv92PFum5bzh6IFsRnD3EyVBlRzAZQwP3GR0z9bq4y7ul2a
-XzYVJmyga+NizM8GQQY4bGXoWXh15/jGjqpAd3R/DRjQUTkpLGyqNgGW0sH2diLa
-6hf84LBR7ogaRwRK+PWxau6DyAtUl2K+O7xJ+NcCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEAayyiqqbJvJwBgJvSaPj3xVUzZ4wHcLrYutI7TiPIx6np6aDc7VaKeXsD
-tDeh+oE/9xkyIiQq8jfVVgTXddye2HDWV4Qr6zXpAtqZvzXlaOeg73wCAKbcuyos
-MvcapBFJ0ffWwVcoXo0s0au860SQHzcvSXONLPBM9U4tf9J6eWWKJjCUjP/R8TVe
-x56haExHiHdwJbDguNL2w3j6eKVNmnRDzBBhMDVnLGETHnY5XxQdrZ/BWSWvvbTR
-l+rZWtKVWKLKaigDqCiM9g/1B946PVG3jmnxel/RP5ICm363RzyALz8dxG/2ujZU
-M48hMJgWkMldrREsBWB/ZJm1BA0sAw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.richmond.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Richmond</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Richmond</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.richmond.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Greg Miller</md:GivenName>
-    <md:EmailAddress>gmiller@richmond.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Steve Zinski</md:GivenName>
-    <md:EmailAddress>szinski@richmond.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-rock.k12.nc.us.xml b/swamid-interfederations-2.0/urn-mace-incommon-rock.k12.nc.us.xml
deleted file mode 100644
index 9756d4fb..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-rock.k12.nc.us.xml
+++ /dev/null
@@ -1,149 +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="urn:mace:incommon:rock.k12.nc.us">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">rock.k12.nc.us</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rockingham County Schools</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>
-MIIDPjCCAiagAwIBAgIJAPmR55t2JpqLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWIucm9jay5rMTIubmMudXMwHhcNMTMxMjE4MTcxMzAxWhcNMzQwMTA4
-MTcxMzAxWjAeMRwwGgYDVQQDExNzaGliLnJvY2suazEyLm5jLnVzMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlBZdzVkY+qjXvyQSQ+OWA6fTFgvtmAZW
-w9KIs5IvL0trjOwMZLjGYWzUpRcirb9EW6XLC5A2ZW/FuVfIHYO70EOczz+7pW4h
-8JTHbhdm3nqC1OWeRv3RpKL0N+MHBVIV+3F85xPpWVqVTzpePA98HRKaJkjLPtcm
-HWYrA1+j6jUXIpdOs4BKuywQCTF62NHovNyV7Q+Dq2x3RmXRNSNCobXgvja1jXnC
-DISVtj52UDsjZC8WONKbQ+Rx7qWlFGYqiCJ77m0+rj7HCDaxIWC5qzRSfY8T1DIn
-NUS8bR50+JhV76cIzgvkq9K1uvlZoXkAMdo1t4G2otTJC8HjnSRvdwIDAQABo38w
-fTAdBgNVHQ4EFgQUruM5s76Piz3hAqGOEkjj+R5zJIowTgYDVR0jBEcwRYAUruM5
-s76Piz3hAqGOEkjj+R5zJIqhIqQgMB4xHDAaBgNVBAMTE3NoaWIucm9jay5rMTIu
-bmMudXOCCQD5keebdiaaizAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBs9xg8DRa/Ph2e+ysJCjFAbo13N0C9tKHEjZlxQsuRVCFVsjBSB6RSMpKJdhlU
-J7D11R7XhUR/w6dMlz1Wa03FOYbLh4xEACQ2KOhilYXFEF5ucrRbtc/RmfnFf2ag
-+ENPkZ+gwZytp9W7XWQQ9xYVe3jw8nNH5/+D9PKDHaoPCxLMzqFcUL6NNOC6HQ6n
-rUL38YTy5o779bOJWt7b7V3V/u4/Ckc5xIYHTgZWBo9o1GWpgNkszitRBBiQryZf
-8b7euuy4mlqaPv6zyudJOcHupn8GhHdekfNicDem60M4vl96TpHurp9ifSH2NGEb
-j0Gw0iewVqKmJYc2NtrfKI3T
-          </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>
-MIIDPjCCAiagAwIBAgIJANtc2N1zb53NMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWIucm9jay5rMTIubmMudXMwHhcNMTEwNDA3MTQxMDU3WhcNMTQwNDA2
-MTQxMDU3WjAeMRwwGgYDVQQDExNzaGliLnJvY2suazEyLm5jLnVzMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlBZdzVkY+qjXvyQSQ+OWA6fTFgvtmAZW
-w9KIs5IvL0trjOwMZLjGYWzUpRcirb9EW6XLC5A2ZW/FuVfIHYO70EOczz+7pW4h
-8JTHbhdm3nqC1OWeRv3RpKL0N+MHBVIV+3F85xPpWVqVTzpePA98HRKaJkjLPtcm
-HWYrA1+j6jUXIpdOs4BKuywQCTF62NHovNyV7Q+Dq2x3RmXRNSNCobXgvja1jXnC
-DISVtj52UDsjZC8WONKbQ+Rx7qWlFGYqiCJ77m0+rj7HCDaxIWC5qzRSfY8T1DIn
-NUS8bR50+JhV76cIzgvkq9K1uvlZoXkAMdo1t4G2otTJC8HjnSRvdwIDAQABo38w
-fTAdBgNVHQ4EFgQUruM5s76Piz3hAqGOEkjj+R5zJIowTgYDVR0jBEcwRYAUruM5
-s76Piz3hAqGOEkjj+R5zJIqhIqQgMB4xHDAaBgNVBAMTE3NoaWIucm9jay5rMTIu
-bmMudXOCCQDbXNjdc2+dzTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBsz6rnvJbbWYSsOW1ZQRa6d4MwOQJyC1MSlVBWgkF78tROYcd4odLNJPWB26Vs
-VJOlu173WyK26NdTPk35aAI0Y6Hl927DTyoa+GQM//JKM9CUXvhBGr9Ly5+fcKYO
-ylAMffw3Mgw18H6IejfhvJZgF64Dysp+IZe+8WPhPuzqJwSlkLdS9HXNHyxBHtBl
-agNbI0Gj1/d2JrAMlId3wZu1Z/tbZHndIypnUTW/PToLtkUjlrH8naMXYx3oTuP6
-OzXh12tNCnBxCY6icNDRtdN30nH0uDt11VfENHv5C5mKxr7w2uDTLdBjEL0HPh0m
-r1ynZK4DSpncepmCHNLOHwCG
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rock.k12.nc.us:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rock.k12.nc.us:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.rock.k12.nc.us/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.rock.k12.nc.us/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.rock.k12.nc.us/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.rock.k12.nc.us/idp/profile/SAML2/POST-SimpleSign/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">rock.k12.nc.us</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPjCCAiagAwIBAgIJAPmR55t2JpqLMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWIucm9jay5rMTIubmMudXMwHhcNMTMxMjE4MTcxMzAxWhcNMzQwMTA4
-MTcxMzAxWjAeMRwwGgYDVQQDExNzaGliLnJvY2suazEyLm5jLnVzMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlBZdzVkY+qjXvyQSQ+OWA6fTFgvtmAZW
-w9KIs5IvL0trjOwMZLjGYWzUpRcirb9EW6XLC5A2ZW/FuVfIHYO70EOczz+7pW4h
-8JTHbhdm3nqC1OWeRv3RpKL0N+MHBVIV+3F85xPpWVqVTzpePA98HRKaJkjLPtcm
-HWYrA1+j6jUXIpdOs4BKuywQCTF62NHovNyV7Q+Dq2x3RmXRNSNCobXgvja1jXnC
-DISVtj52UDsjZC8WONKbQ+Rx7qWlFGYqiCJ77m0+rj7HCDaxIWC5qzRSfY8T1DIn
-NUS8bR50+JhV76cIzgvkq9K1uvlZoXkAMdo1t4G2otTJC8HjnSRvdwIDAQABo38w
-fTAdBgNVHQ4EFgQUruM5s76Piz3hAqGOEkjj+R5zJIowTgYDVR0jBEcwRYAUruM5
-s76Piz3hAqGOEkjj+R5zJIqhIqQgMB4xHDAaBgNVBAMTE3NoaWIucm9jay5rMTIu
-bmMudXOCCQD5keebdiaaizAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBs9xg8DRa/Ph2e+ysJCjFAbo13N0C9tKHEjZlxQsuRVCFVsjBSB6RSMpKJdhlU
-J7D11R7XhUR/w6dMlz1Wa03FOYbLh4xEACQ2KOhilYXFEF5ucrRbtc/RmfnFf2ag
-+ENPkZ+gwZytp9W7XWQQ9xYVe3jw8nNH5/+D9PKDHaoPCxLMzqFcUL6NNOC6HQ6n
-rUL38YTy5o779bOJWt7b7V3V/u4/Ckc5xIYHTgZWBo9o1GWpgNkszitRBBiQryZf
-8b7euuy4mlqaPv6zyudJOcHupn8GhHdekfNicDem60M4vl96TpHurp9ifSH2NGEb
-j0Gw0iewVqKmJYc2NtrfKI3T
-          </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>
-MIIDPjCCAiagAwIBAgIJANtc2N1zb53NMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3NoaWIucm9jay5rMTIubmMudXMwHhcNMTEwNDA3MTQxMDU3WhcNMTQwNDA2
-MTQxMDU3WjAeMRwwGgYDVQQDExNzaGliLnJvY2suazEyLm5jLnVzMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlBZdzVkY+qjXvyQSQ+OWA6fTFgvtmAZW
-w9KIs5IvL0trjOwMZLjGYWzUpRcirb9EW6XLC5A2ZW/FuVfIHYO70EOczz+7pW4h
-8JTHbhdm3nqC1OWeRv3RpKL0N+MHBVIV+3F85xPpWVqVTzpePA98HRKaJkjLPtcm
-HWYrA1+j6jUXIpdOs4BKuywQCTF62NHovNyV7Q+Dq2x3RmXRNSNCobXgvja1jXnC
-DISVtj52UDsjZC8WONKbQ+Rx7qWlFGYqiCJ77m0+rj7HCDaxIWC5qzRSfY8T1DIn
-NUS8bR50+JhV76cIzgvkq9K1uvlZoXkAMdo1t4G2otTJC8HjnSRvdwIDAQABo38w
-fTAdBgNVHQ4EFgQUruM5s76Piz3hAqGOEkjj+R5zJIowTgYDVR0jBEcwRYAUruM5
-s76Piz3hAqGOEkjj+R5zJIqhIqQgMB4xHDAaBgNVBAMTE3NoaWIucm9jay5rMTIu
-bmMudXOCCQDbXNjdc2+dzTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBsz6rnvJbbWYSsOW1ZQRa6d4MwOQJyC1MSlVBWgkF78tROYcd4odLNJPWB26Vs
-VJOlu173WyK26NdTPk35aAI0Y6Hl927DTyoa+GQM//JKM9CUXvhBGr9Ly5+fcKYO
-ylAMffw3Mgw18H6IejfhvJZgF64Dysp+IZe+8WPhPuzqJwSlkLdS9HXNHyxBHtBl
-agNbI0Gj1/d2JrAMlId3wZu1Z/tbZHndIypnUTW/PToLtkUjlrH8naMXYx3oTuP6
-OzXh12tNCnBxCY6icNDRtdN30nH0uDt11VfENHv5C5mKxr7w2uDTLdBjEL0HPh0m
-r1ynZK4DSpncepmCHNLOHwCG
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.rock.k12.nc.us:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.rock.k12.nc.us:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Rockingham County Schools</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rockingham County Schools</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rock.k12.nc.us/rockingham/site/default.asp</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kacey Sensenich</md:GivenName>
-    <md:EmailAddress>ksensenich@rock.k12.nc.us</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Wanda Goins</md:GivenName>
-    <md:EmailAddress>wgoins@rock.k12.nc.us</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-rutgers.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-rutgers.edu.xml
deleted file mode 100644
index d0ab5fd7..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-rutgers.edu.xml
+++ /dev/null
@@ -1,152 +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="urn:mace:incommon:rutgers.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">rutgers.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Rutgers, The State University of New Jersey</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>
-MIIDQDCCAiigAwIBAgIVAOTYftoWG9W/AvT7rTrVdDCpXO4RMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFXNoaWIub2lydC5ydXRnZXJzLmVkdTAeFw0xMzA5MTEy
-MDIwMjRaFw0zMzA5MTEyMDIwMjRaMCAxHjAcBgNVBAMTFXNoaWIub2lydC5ydXRn
-ZXJzLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfg5MXL8GWK
-zQ8e4eSixF5KQRsw+xjrbECuPR0hKXU+gAi9rIBX35VmBHTaTqOU3jWYK7MOJg4C
-CoVQdgB8z0wfFefcuDdeK5IdTPXA0slYZbkjM4Rqa896a0Z4ZDXcsZoH1/tLGcOy
-7WgILHlZaMv2pnYoXn4K/TAGW/dN1AqC027n7iiZAiv9MFU/rkULOKkVEQMdWMgF
-3QpVGGB5FQW7Cul6uhpoChPD1sucdqUYdKPoMtoFRZBGDC4NKDS9jW8RTFJbrqP/
-7KFaYLguSQOINSLITJvFHDWQh+PitHHfMU0S5A1Pe5R4u4oPn/trghch4vlp7r/a
-Npo/0B3Xoy8CAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYi5vaXJ0LnJ1dGdlcnMu
-ZWR1hixodHRwczovL3NoaWIub2lydC5ydXRnZXJzLmVkdS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUFli4zyOx/sujMoYan3mtmvJlrrkwDQYJKoZIhvcNAQEFBQAD
-ggEBACEULFPT0JlJyy+70AKed4pbpJI6xpujTqBSqQF0KWaCfzrYHj5o+Jf6O+NH
-zbMcDT52D8wdIYR9tRfim5RHGa9KB6yHGRjYTUUs4pWwg+eTxPjBOKGuNGGDYL8+
-Rer4N3tq/406sxErmH3iAa0iJIKD9RHlfdKqpBxsHVgm4tF4tf4nvKJJ0Htr/iG/
-Pt4R1i6XhTrkL6noEiUY0wfVtA7JFe+beGB3jgmtAo8tV/uFO703ZHotLq+F2tx9
-79bLcfGy+NHx/95l7BNs6olcWipRkoQaSxmorqt2gShsvP8uNYSWOzgsAwtDU7J0
-hIzMRisvrfUsWonX0n1qZzmLU64=
-          </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>
-MIIDRTCCAi2gAwIBAgIJAKL5nzW/yD3hMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFXNoaWIub2lydC5ydXRnZXJzLmVkdTAeFw0xMDA5MjcyMTIyNDlaFw0xMzA5
-MjYyMTIyNDlaMCAxHjAcBgNVBAMTFXNoaWIub2lydC5ydXRnZXJzLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnjpOLwGkp/fU6u2s1tl7VTlb5W
-4BrslbD+MOAz/04FOVzbMBwHrffMRuVSATeD0285i8hpu2PvRdCyhK0FniAFFnL8
-WQklcOZEbpqMzLYSAUVnEavZU6S2gme5/GGULnFpbVPva0kbHR2MzSWUJVxgfkvS
-NS6mE0YZ9W60bPVLK1lqhILIdmlvZBqsPujuagI7pqzjaHAQZsPclnjS79rQdZMP
-AZxISKB6uAI+S5tsYMfI6l2QVsSiQGCr9Cmr3ParyeVRj3Qnsn79XKkj5Ag5C5f+
-n2PncVjG9FXtqjGZCTmP8MdM9axPtOEapREXmTehS0v5IrXG/WIXNa+96bcCAwEA
-AaOBgTB/MB0GA1UdDgQWBBQntgwltpzp+hsU37PV3OIXFypGpjBQBgNVHSMESTBH
-gBQntgwltpzp+hsU37PV3OIXFypGpqEkpCIwIDEeMBwGA1UEAxMVc2hpYi5vaXJ0
-LnJ1dGdlcnMuZWR1ggkAovmfNb/IPeEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAG2gptNgQMx6l5TvN5iKAXCLqCbFTrhKdelCTC2ir+v6m27jKf05p
-2UaAIHwVUj+mSXjWbjiBrdRAio1OgFa09FPOyesnyAhg6bT83O6rwfZ5Th8V0xJZ
-3ROJlO+65bmw53uSCJ1zWL3Vrcp+ncWz3GT7C72S0PsYrG4EwU7naX6nnUgaHZnL
-o0k7iWRN5QzdkASXGDT6/4T4FzWGliv7obqfzG/MLstwFnR7haHgsWVNFX9X761+
-0cyUtC/ut8Rl3SifbyOoM91MVIg6hGOh2I4qcZO2OZWIui+7DXV8Jb88OtKmOxgT
-YnlJ2VP4+HqggzFa+Vth0GCTBBCFs16HRQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.oirt.rutgers.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.oirt.rutgers.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.oirt.rutgers.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.oirt.rutgers.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.oirt.rutgers.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.oirt.rutgers.edu/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">rutgers.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAOTYftoWG9W/AvT7rTrVdDCpXO4RMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFXNoaWIub2lydC5ydXRnZXJzLmVkdTAeFw0xMzA5MTEy
-MDIwMjRaFw0zMzA5MTEyMDIwMjRaMCAxHjAcBgNVBAMTFXNoaWIub2lydC5ydXRn
-ZXJzLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMfg5MXL8GWK
-zQ8e4eSixF5KQRsw+xjrbECuPR0hKXU+gAi9rIBX35VmBHTaTqOU3jWYK7MOJg4C
-CoVQdgB8z0wfFefcuDdeK5IdTPXA0slYZbkjM4Rqa896a0Z4ZDXcsZoH1/tLGcOy
-7WgILHlZaMv2pnYoXn4K/TAGW/dN1AqC027n7iiZAiv9MFU/rkULOKkVEQMdWMgF
-3QpVGGB5FQW7Cul6uhpoChPD1sucdqUYdKPoMtoFRZBGDC4NKDS9jW8RTFJbrqP/
-7KFaYLguSQOINSLITJvFHDWQh+PitHHfMU0S5A1Pe5R4u4oPn/trghch4vlp7r/a
-Npo/0B3Xoy8CAwEAAaNxMG8wTgYDVR0RBEcwRYIVc2hpYi5vaXJ0LnJ1dGdlcnMu
-ZWR1hixodHRwczovL3NoaWIub2lydC5ydXRnZXJzLmVkdS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUFli4zyOx/sujMoYan3mtmvJlrrkwDQYJKoZIhvcNAQEFBQAD
-ggEBACEULFPT0JlJyy+70AKed4pbpJI6xpujTqBSqQF0KWaCfzrYHj5o+Jf6O+NH
-zbMcDT52D8wdIYR9tRfim5RHGa9KB6yHGRjYTUUs4pWwg+eTxPjBOKGuNGGDYL8+
-Rer4N3tq/406sxErmH3iAa0iJIKD9RHlfdKqpBxsHVgm4tF4tf4nvKJJ0Htr/iG/
-Pt4R1i6XhTrkL6noEiUY0wfVtA7JFe+beGB3jgmtAo8tV/uFO703ZHotLq+F2tx9
-79bLcfGy+NHx/95l7BNs6olcWipRkoQaSxmorqt2gShsvP8uNYSWOzgsAwtDU7J0
-hIzMRisvrfUsWonX0n1qZzmLU64=
-          </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>
-MIIDRTCCAi2gAwIBAgIJAKL5nzW/yD3hMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFXNoaWIub2lydC5ydXRnZXJzLmVkdTAeFw0xMDA5MjcyMTIyNDlaFw0xMzA5
-MjYyMTIyNDlaMCAxHjAcBgNVBAMTFXNoaWIub2lydC5ydXRnZXJzLmVkdTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnjpOLwGkp/fU6u2s1tl7VTlb5W
-4BrslbD+MOAz/04FOVzbMBwHrffMRuVSATeD0285i8hpu2PvRdCyhK0FniAFFnL8
-WQklcOZEbpqMzLYSAUVnEavZU6S2gme5/GGULnFpbVPva0kbHR2MzSWUJVxgfkvS
-NS6mE0YZ9W60bPVLK1lqhILIdmlvZBqsPujuagI7pqzjaHAQZsPclnjS79rQdZMP
-AZxISKB6uAI+S5tsYMfI6l2QVsSiQGCr9Cmr3ParyeVRj3Qnsn79XKkj5Ag5C5f+
-n2PncVjG9FXtqjGZCTmP8MdM9axPtOEapREXmTehS0v5IrXG/WIXNa+96bcCAwEA
-AaOBgTB/MB0GA1UdDgQWBBQntgwltpzp+hsU37PV3OIXFypGpjBQBgNVHSMESTBH
-gBQntgwltpzp+hsU37PV3OIXFypGpqEkpCIwIDEeMBwGA1UEAxMVc2hpYi5vaXJ0
-LnJ1dGdlcnMuZWR1ggkAovmfNb/IPeEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAG2gptNgQMx6l5TvN5iKAXCLqCbFTrhKdelCTC2ir+v6m27jKf05p
-2UaAIHwVUj+mSXjWbjiBrdRAio1OgFa09FPOyesnyAhg6bT83O6rwfZ5Th8V0xJZ
-3ROJlO+65bmw53uSCJ1zWL3Vrcp+ncWz3GT7C72S0PsYrG4EwU7naX6nnUgaHZnL
-o0k7iWRN5QzdkASXGDT6/4T4FzWGliv7obqfzG/MLstwFnR7haHgsWVNFX9X761+
-0cyUtC/ut8Rl3SifbyOoM91MVIg6hGOh2I4qcZO2OZWIui+7DXV8Jb88OtKmOxgT
-YnlJ2VP4+HqggzFa+Vth0GCTBBCFs16HRQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.oirt.rutgers.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.oirt.rutgers.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Rutgers, The State University of New Jersey</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Rutgers, The State University of New Jersey</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rutgers.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Charles Hedrick</md:GivenName>
-    <md:EmailAddress>hedrick@rutgers.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Charles Hedrick</md:GivenName>
-    <md:EmailAddress>hedrick@rutgers.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-sc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-sc.edu.xml
deleted file mode 100644
index dadbeca7..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-sc.edu.xml
+++ /dev/null
@@ -1,180 +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="urn:mace:incommon:sc.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.uts.sc.edu/authentication/shibboleth/shibberror.html" 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">sc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of South Carolina</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>
-MIIFkzCCBHugAwIBAgICAdAwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA4MTExMDIwMDM0NVoXDTEwMTEx
-MTIwMDM0NVowHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC5zYy5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQChmwpos/dPDlh7zhzfYNI5RNc8udsppS2T
-VPPy5/SZ/eB0hRYGs3HCZCrE8t7zpepS2Y7sXHsJG96kPgeZVvWhDIOYEJZRTMcp
-tYHSjuD5OlOYGaSaxZ2CfycbnxS/gQJBSyi7pbeSYEQjShcVYCViRLc2NVP6vwY/
-juaipq7wTNblRnmLUYuBkikriRc4f0z4qa1j0TFI9dHa9pp1DZuOz8XhsJ8sl5TZ
-FSJLwnPqmaWcMwFm9BSqjihn1d6hsMEpPMcO4lpaQF2lzyQrkGJfTTwNy4uoA4er
-QJj+Hg0Fxaf/iS5IRTj6urUQO6J8b9boOEwEtZtLwIo3PG5RDpiFAgMBAAGjggKj
-MIICnzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFJ6EsggZYpFRPhU7KH9Zfhmcamvg
-MH4GA1UdIwR3MHWAFJMtyGEYrWPjm2Wznd2Nk7rnymNFoVqkWDBWMQswCQYDVQQG
-EwJVUzEcMBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5D
-b21tb24gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHmCAQAwgbIGCCsGAQUFBwEBBIGl
-MIGiME8GCCsGAQUFBzAChkNodHRwOi8vaW5jb21tb25jYTEuaW5jb21tb25mZWRl
-cmF0aW9uLm9yZy9icmlkZ2UvY2VydHMvY2EtY2VydHMucDdiME8GCCsGAQUFBzAC
-hkNodHRwOi8vaW5jb21tb25jYTIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9icmlk
-Z2UvY2VydHMvY2EtY2VydHMucDdiMIGNBgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6
-Ly9pbmNvbW1vbmNybDEuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwvZWVjcmxz
-LmNybDA/oD2gO4Y5aHR0cDovL2luY29tbW9uY3JsMi5pbmNvbW1vbmZlZGVyYXRp
-b24ub3JnL2NybC9lZWNybHMuY3JsMF4GA1UdIARXMFUwUwYLKwYBBAGuIwEEAQEw
-RDBCBggrBgEFBQcCARY2aHR0cDovL2luY29tbW9uY2EuaW5jb21tb25mZWRlcmF0
-aW9uLm9yZy9wcmFjdGljZXMucGRmMBwGA1UdEQQVMBOCEXNoaWJib2xldGguc2Mu
-ZWR1MA0GCSqGSIb3DQEBBQUAA4IBAQAQQkot3bYBJCbOi/gMLeWnC96Xyb9UJ5sW
-ZWP8Q6TvkPCIH254aAGeiaeqg4tKhNU1wJJWUf6jYWkrMUE+GxEPA7aQVb0F/tqO
-fTHHJBnKAgej/Cw3fw5pzoeTKXbJRtf45oRK8vvm3BVuanpqy2DmFP2XEIg+W0kv
-xOS/mVf+I4m+E+sGc2hqOKERUKa9I3OIZRyt4fcayHKUoSq2lr3+WH6TCNOI3ftI
-JeFdpFAEsVRCf6G0y15/NE2ZrZxIa40eMQyFiQBJZ3rg7QTxNHyRxrT1RzcJiqGW
-/BZ+1dTx9GUEp9N5c398vGG3GdxwYl6E0T7Cbv26YYi4i7HFU1VF
-          </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>
-MIIDODCCAiCgAwIBAgIJAJVbAf35kTA3MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXNoaWJib2xldGguc2MuZWR1MB4XDTEwMTAyODIxMDgzMloXDTIwMTAyNzIx
-MDgzMlowHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC5zYy5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQChmwpos/dPDlh7zhzfYNI5RNc8udsppS2TVPPy
-5/SZ/eB0hRYGs3HCZCrE8t7zpepS2Y7sXHsJG96kPgeZVvWhDIOYEJZRTMcptYHS
-juD5OlOYGaSaxZ2CfycbnxS/gQJBSyi7pbeSYEQjShcVYCViRLc2NVP6vwY/juai
-pq7wTNblRnmLUYuBkikriRc4f0z4qa1j0TFI9dHa9pp1DZuOz8XhsJ8sl5TZFSJL
-wnPqmaWcMwFm9BSqjihn1d6hsMEpPMcO4lpaQF2lzyQrkGJfTTwNy4uoA4erQJj+
-Hg0Fxaf/iS5IRTj6urUQO6J8b9boOEwEtZtLwIo3PG5RDpiFAgMBAAGjfTB7MB0G
-A1UdDgQWBBSehLIIGWKRUT4VOyh/WX4ZnGpr4DBMBgNVHSMERTBDgBSehLIIGWKR
-UT4VOyh/WX4ZnGpr4KEgpB4wHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC5zYy5lZHWC
-CQCVWwH9+ZEwNzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCKibjF
-G7G/bUUk4sPVIwwOfbV6Ip/Vs88jTE/1e/oxAvjZaphFCYW1YkZ71satQTn92YXq
-1XKGyBo7Y2YOpiJaUVSwPlhksxaHdYtkaVio61T/5Nsbmm3EfDRd+MHyhL2NpcsR
-MAN6lSjy1Mx0ue+peYsDUBx4Dg9YVM09+f6i/1ltZFy1vXSnCGsBI1kE8+jIH+Sp
-k9dHmQcQ28srHTDzLtA3MtCbEj0I4cBb6OP1RsNyet+QmHPwI51XPAZrovgxX/bv
-eJzvMs2mf7f1nUhVPDL3vwNR3GUIh9aOiyh1NJALeZfj2LHYXN1o1c1lpzNB5RTe
-RYNn+o/milfR/UPS
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.sc.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.sc.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.sc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.sc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.sc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.sc.edu/idp/profile/SAML2/POST-SimpleSign/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">sc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFkzCCBHugAwIBAgICAdAwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA4MTExMDIwMDM0NVoXDTEwMTEx
-MTIwMDM0NVowHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC5zYy5lZHUwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQChmwpos/dPDlh7zhzfYNI5RNc8udsppS2T
-VPPy5/SZ/eB0hRYGs3HCZCrE8t7zpepS2Y7sXHsJG96kPgeZVvWhDIOYEJZRTMcp
-tYHSjuD5OlOYGaSaxZ2CfycbnxS/gQJBSyi7pbeSYEQjShcVYCViRLc2NVP6vwY/
-juaipq7wTNblRnmLUYuBkikriRc4f0z4qa1j0TFI9dHa9pp1DZuOz8XhsJ8sl5TZ
-FSJLwnPqmaWcMwFm9BSqjihn1d6hsMEpPMcO4lpaQF2lzyQrkGJfTTwNy4uoA4er
-QJj+Hg0Fxaf/iS5IRTj6urUQO6J8b9boOEwEtZtLwIo3PG5RDpiFAgMBAAGjggKj
-MIICnzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggr
-BgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFJ6EsggZYpFRPhU7KH9Zfhmcamvg
-MH4GA1UdIwR3MHWAFJMtyGEYrWPjm2Wznd2Nk7rnymNFoVqkWDBWMQswCQYDVQQG
-EwJVUzEcMBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5D
-b21tb24gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHmCAQAwgbIGCCsGAQUFBwEBBIGl
-MIGiME8GCCsGAQUFBzAChkNodHRwOi8vaW5jb21tb25jYTEuaW5jb21tb25mZWRl
-cmF0aW9uLm9yZy9icmlkZ2UvY2VydHMvY2EtY2VydHMucDdiME8GCCsGAQUFBzAC
-hkNodHRwOi8vaW5jb21tb25jYTIuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9icmlk
-Z2UvY2VydHMvY2EtY2VydHMucDdiMIGNBgNVHR8EgYUwgYIwP6A9oDuGOWh0dHA6
-Ly9pbmNvbW1vbmNybDEuaW5jb21tb25mZWRlcmF0aW9uLm9yZy9jcmwvZWVjcmxz
-LmNybDA/oD2gO4Y5aHR0cDovL2luY29tbW9uY3JsMi5pbmNvbW1vbmZlZGVyYXRp
-b24ub3JnL2NybC9lZWNybHMuY3JsMF4GA1UdIARXMFUwUwYLKwYBBAGuIwEEAQEw
-RDBCBggrBgEFBQcCARY2aHR0cDovL2luY29tbW9uY2EuaW5jb21tb25mZWRlcmF0
-aW9uLm9yZy9wcmFjdGljZXMucGRmMBwGA1UdEQQVMBOCEXNoaWJib2xldGguc2Mu
-ZWR1MA0GCSqGSIb3DQEBBQUAA4IBAQAQQkot3bYBJCbOi/gMLeWnC96Xyb9UJ5sW
-ZWP8Q6TvkPCIH254aAGeiaeqg4tKhNU1wJJWUf6jYWkrMUE+GxEPA7aQVb0F/tqO
-fTHHJBnKAgej/Cw3fw5pzoeTKXbJRtf45oRK8vvm3BVuanpqy2DmFP2XEIg+W0kv
-xOS/mVf+I4m+E+sGc2hqOKERUKa9I3OIZRyt4fcayHKUoSq2lr3+WH6TCNOI3ftI
-JeFdpFAEsVRCf6G0y15/NE2ZrZxIa40eMQyFiQBJZ3rg7QTxNHyRxrT1RzcJiqGW
-/BZ+1dTx9GUEp9N5c398vGG3GdxwYl6E0T7Cbv26YYi4i7HFU1VF
-          </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>
-MIIDODCCAiCgAwIBAgIJAJVbAf35kTA3MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXNoaWJib2xldGguc2MuZWR1MB4XDTEwMTAyODIxMDgzMloXDTIwMTAyNzIx
-MDgzMlowHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC5zYy5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQChmwpos/dPDlh7zhzfYNI5RNc8udsppS2TVPPy
-5/SZ/eB0hRYGs3HCZCrE8t7zpepS2Y7sXHsJG96kPgeZVvWhDIOYEJZRTMcptYHS
-juD5OlOYGaSaxZ2CfycbnxS/gQJBSyi7pbeSYEQjShcVYCViRLc2NVP6vwY/juai
-pq7wTNblRnmLUYuBkikriRc4f0z4qa1j0TFI9dHa9pp1DZuOz8XhsJ8sl5TZFSJL
-wnPqmaWcMwFm9BSqjihn1d6hsMEpPMcO4lpaQF2lzyQrkGJfTTwNy4uoA4erQJj+
-Hg0Fxaf/iS5IRTj6urUQO6J8b9boOEwEtZtLwIo3PG5RDpiFAgMBAAGjfTB7MB0G
-A1UdDgQWBBSehLIIGWKRUT4VOyh/WX4ZnGpr4DBMBgNVHSMERTBDgBSehLIIGWKR
-UT4VOyh/WX4ZnGpr4KEgpB4wHDEaMBgGA1UEAxMRc2hpYmJvbGV0aC5zYy5lZHWC
-CQCVWwH9+ZEwNzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCKibjF
-G7G/bUUk4sPVIwwOfbV6Ip/Vs88jTE/1e/oxAvjZaphFCYW1YkZ71satQTn92YXq
-1XKGyBo7Y2YOpiJaUVSwPlhksxaHdYtkaVio61T/5Nsbmm3EfDRd+MHyhL2NpcsR
-MAN6lSjy1Mx0ue+peYsDUBx4Dg9YVM09+f6i/1ltZFy1vXSnCGsBI1kE8+jIH+Sp
-k9dHmQcQ28srHTDzLtA3MtCbEj0I4cBb6OP1RsNyet+QmHPwI51XPAZrovgxX/bv
-eJzvMs2mf7f1nUhVPDL3vwNR3GUIh9aOiyh1NJALeZfj2LHYXN1o1c1lpzNB5RTe
-RYNn+o/milfR/UPS
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.sc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of South Carolina</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of South Carolina</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Bill Crayton</md:GivenName>
-    <md:EmailAddress>bcrayton@sc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bill Crayton</md:GivenName>
-    <md:EmailAddress>bcrayton@sc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Roger Truesdale</md:GivenName>
-    <md:EmailAddress>rogert@mailbox.sc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-stanford.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-stanford.edu.xml
deleted file mode 100644
index 1724bac0..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-stanford.edu.xml
+++ /dev/null
@@ -1,156 +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="urn:mace:incommon:stanford.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">stanford.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Stanford University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Stanford University's identity provider uses Stanford WebAuth to provide single sign-on functionality</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://shibboleth.stanford.edu/</mdui:InformationURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.stanford.edu/logo.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>
-MIIDtTCCAp2gAwIBAgIJAPmWpLuXBmD6MA0GCSqGSIb3DQEBCwUAMHExCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhTdGFuZm9yZDEf
-MB0GA1UECgwWQWRtaW5pc3RyYXRpdmUgU3lzdGVtczEZMBcGA1UEAwwQaWRwLnN0
-YW5mb3JkLmVkdTAeFw0xNDEyMDEyMDUxMzZaFw0yNDExMzAyMDUxMzZaMHExCzAJ
-BgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhTdGFuZm9y
-ZDEfMB0GA1UECgwWQWRtaW5pc3RyYXRpdmUgU3lzdGVtczEZMBcGA1UEAwwQaWRw
-LnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL+R
-POrLUT4Pv/pJ4coD3lwOVhSJ5wqIVPo3D94SBaTH/zFOVJM5uIzq9bWwXqbQeuyT
-ryuZc1Obv7aK4/vnOuEh6bQfW15ZEtqRfI0fl873aXqWYItxM69xhgw33BavFat+
-LLUbalvqfjLZvW0Qp7wQMO88RikcFbrS9qvILsJZhcemyH+UZ1oyQKg0OwLd2fpf
-Iqs9Lksh9UiwvxH2/S8gYIZ/+p/Tyc2NluTQVRO53wmoPVv9edeH7ucaGi1OqH8q
-EDwTzd6lVKLjQHxBI3105Wmj5YZuiv8mWj4r50huCGfuw1+XgQVw2gwvDmzTupOA
-JfFRry8bDZp/lGUVZP0CAwEAAaNQME4wHQYDVR0OBBYEFDl+vvpPHz2jozJ83nTa
-XOBUWi7TMB8GA1UdIwQYMBaAFDl+vvpPHz2jozJ83nTaXOBUWi7TMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHVPjloOPKFxhzFH6BE55zRcxz/AKlHG
-f4SXLOEJ5QijZ10qdaB1jVgo5Dva8cxZSk+Y9iMCqgYgWLUJP8WqFsH0mqfrJ7Es
-dW+BdpecKCTOUmHlImjPp81W/hVDJSZXIe+wwzp77Rt+Bdhuhec5ZVYoE/3ug2PA
-pFlfFNxtxYugIhRIcDyUdLUTMoWXmhKgVHbjNtUL9BGfJHkIIAtWSZZ4bsheOGUY
-IbtwXER+ihBU48YYjdAVC9bxdbR0GAJY5uLqG6k0FgEV/7vVHqFMqp31qJme3/ps
-SFqKGJNZvMvXzp89VM70lI2VewL/GVdm6c31p7PVmCfPJXdHmCOVVsY=
-          </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>
-MIIDnzCCAoegAwIBAgIJAJl9YtyaxKsZMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhTdGFuZm9yZDEU
-MBIGA1UECgwLSVQgU2VydmljZXMxGTAXBgNVBAMMEGlkcC5zdGFuZm9yZC5lZHUw
-HhcNMTMwNDEwMTYzMTAwWhcNMzMwNDEwMTYzMTAwWjBmMQswCQYDVQQGEwJVUzET
-MBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UEBwwIU3RhbmZvcmQxFDASBgNVBAoM
-C0lUIFNlcnZpY2VzMRkwFwYDVQQDDBBpZHAuc3RhbmZvcmQuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm6466Bd6mDwNOR2qZZy1WRZdjyrG2/xW
-amGEMekg38fyuoSCIiMcgeA9UIUbiRCpAN87yI9HPcgDEdrmCK3Ena3J2MdFZbRE
-b6fdRt76K+0FSl/CnyW9xaIlAhldXKbsgUDei3Xf/9P8H9Dxkk+PWd9Ha1RZ9Viz
-dOLe2S2iDKc1CJg2kdGQTuQu6mUEGrB9WJmrLHJS7GkGDqy96owFjRL/p0i9KBdR
-kgWG+GFHWkxzeNQ99yrQra3+C9FQXa/xLCdOY+BGOsAG7ej4094NZXRNTyXui4jR
-WCm2GVdIVl7YB9++XSntS7zQEJ9QBnC1D4bS0tljMfdOGAvdUuJY7QIDAQABo1Aw
-TjAdBgNVHQ4EFgQUJk4zcQ4JupEcAp0gEkob4YRDkckwHwYDVR0jBBgwFoAUJk4z
-cQ4JupEcAp0gEkob4YRDkckwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOC
-AQEAKvf9AO4+osJZOmkv6AVhNPm6JKoBSm9dr9NhwpSS5fpro6PrIjDZDLh/L5d/
-+CQTDzuVsw3xwDtlm89lrzbqw5rSa2+ghJk79ijysSC0zOcD6ka9c17zauCNmFx9
-lj9iddUw3aYHQcQRktWL8pvI2WCY6lTU+ouNM+owStya7umZ9rBdjg/fQerzaQxF
-T0yV3tYEonL3hXMzSqZxWirwsyZ0TnhWJsgEnqqG9tCFAcFu2p+glwXn1WL2GCRv
-BfuJMPzg7ZB419AEoeYnLktqAWiU+ISnVfbwFOJ+OM/O7VQOeHDm2AeYcwo12CAc
-4GC9KWTs3QtS3GREPKYDlHRNxQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stanford.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stanford.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.stanford.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.stanford.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.stanford.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.stanford.edu/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">stanford.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDtTCCAp2gAwIBAgIJAPmWpLuXBmD6MA0GCSqGSIb3DQEBCwUAMHExCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhTdGFuZm9yZDEf
-MB0GA1UECgwWQWRtaW5pc3RyYXRpdmUgU3lzdGVtczEZMBcGA1UEAwwQaWRwLnN0
-YW5mb3JkLmVkdTAeFw0xNDEyMDEyMDUxMzZaFw0yNDExMzAyMDUxMzZaMHExCzAJ
-BgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhTdGFuZm9y
-ZDEfMB0GA1UECgwWQWRtaW5pc3RyYXRpdmUgU3lzdGVtczEZMBcGA1UEAwwQaWRw
-LnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL+R
-POrLUT4Pv/pJ4coD3lwOVhSJ5wqIVPo3D94SBaTH/zFOVJM5uIzq9bWwXqbQeuyT
-ryuZc1Obv7aK4/vnOuEh6bQfW15ZEtqRfI0fl873aXqWYItxM69xhgw33BavFat+
-LLUbalvqfjLZvW0Qp7wQMO88RikcFbrS9qvILsJZhcemyH+UZ1oyQKg0OwLd2fpf
-Iqs9Lksh9UiwvxH2/S8gYIZ/+p/Tyc2NluTQVRO53wmoPVv9edeH7ucaGi1OqH8q
-EDwTzd6lVKLjQHxBI3105Wmj5YZuiv8mWj4r50huCGfuw1+XgQVw2gwvDmzTupOA
-JfFRry8bDZp/lGUVZP0CAwEAAaNQME4wHQYDVR0OBBYEFDl+vvpPHz2jozJ83nTa
-XOBUWi7TMB8GA1UdIwQYMBaAFDl+vvpPHz2jozJ83nTaXOBUWi7TMAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHVPjloOPKFxhzFH6BE55zRcxz/AKlHG
-f4SXLOEJ5QijZ10qdaB1jVgo5Dva8cxZSk+Y9iMCqgYgWLUJP8WqFsH0mqfrJ7Es
-dW+BdpecKCTOUmHlImjPp81W/hVDJSZXIe+wwzp77Rt+Bdhuhec5ZVYoE/3ug2PA
-pFlfFNxtxYugIhRIcDyUdLUTMoWXmhKgVHbjNtUL9BGfJHkIIAtWSZZ4bsheOGUY
-IbtwXER+ihBU48YYjdAVC9bxdbR0GAJY5uLqG6k0FgEV/7vVHqFMqp31qJme3/ps
-SFqKGJNZvMvXzp89VM70lI2VewL/GVdm6c31p7PVmCfPJXdHmCOVVsY=
-          </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>
-MIIDnzCCAoegAwIBAgIJAJl9YtyaxKsZMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhTdGFuZm9yZDEU
-MBIGA1UECgwLSVQgU2VydmljZXMxGTAXBgNVBAMMEGlkcC5zdGFuZm9yZC5lZHUw
-HhcNMTMwNDEwMTYzMTAwWhcNMzMwNDEwMTYzMTAwWjBmMQswCQYDVQQGEwJVUzET
-MBEGA1UECAwKQ2FsaWZvcm5pYTERMA8GA1UEBwwIU3RhbmZvcmQxFDASBgNVBAoM
-C0lUIFNlcnZpY2VzMRkwFwYDVQQDDBBpZHAuc3RhbmZvcmQuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm6466Bd6mDwNOR2qZZy1WRZdjyrG2/xW
-amGEMekg38fyuoSCIiMcgeA9UIUbiRCpAN87yI9HPcgDEdrmCK3Ena3J2MdFZbRE
-b6fdRt76K+0FSl/CnyW9xaIlAhldXKbsgUDei3Xf/9P8H9Dxkk+PWd9Ha1RZ9Viz
-dOLe2S2iDKc1CJg2kdGQTuQu6mUEGrB9WJmrLHJS7GkGDqy96owFjRL/p0i9KBdR
-kgWG+GFHWkxzeNQ99yrQra3+C9FQXa/xLCdOY+BGOsAG7ej4094NZXRNTyXui4jR
-WCm2GVdIVl7YB9++XSntS7zQEJ9QBnC1D4bS0tljMfdOGAvdUuJY7QIDAQABo1Aw
-TjAdBgNVHQ4EFgQUJk4zcQ4JupEcAp0gEkob4YRDkckwHwYDVR0jBBgwFoAUJk4z
-cQ4JupEcAp0gEkob4YRDkckwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOC
-AQEAKvf9AO4+osJZOmkv6AVhNPm6JKoBSm9dr9NhwpSS5fpro6PrIjDZDLh/L5d/
-+CQTDzuVsw3xwDtlm89lrzbqw5rSa2+ghJk79ijysSC0zOcD6ka9c17zauCNmFx9
-lj9iddUw3aYHQcQRktWL8pvI2WCY6lTU+ouNM+owStya7umZ9rBdjg/fQerzaQxF
-T0yV3tYEonL3hXMzSqZxWirwsyZ0TnhWJsgEnqqG9tCFAcFu2p+glwXn1WL2GCRv
-BfuJMPzg7ZB419AEoeYnLktqAWiU+ISnVfbwFOJ+OM/O7VQOeHDm2AeYcwo12CAc
-4GC9KWTs3QtS3GREPKYDlHRNxQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.stanford.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.stanford.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stanford University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stanford University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.stanford.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth Support</md:GivenName>
-    <md:EmailAddress>shibboleth-team@lists.stanford.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-starkstate.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-starkstate.edu.xml
deleted file mode 100644
index 5904c807..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-starkstate.edu.xml
+++ /dev/null
@@ -1,97 +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="urn:mace:incommon:starkstate.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">starkstate.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Stark State College of Technology</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>
-MIIDRDCCAiygAwIBAgIVAMa41Sm2Z43/pbQY6PVnKuY6ZBFCMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFndlYmF1dGguc3RhcmtzdGF0ZS5lZHUwHhcNMTIwMjA3
-MTUxMzE0WhcNMzIwMjA3MTUxMzE0WjAhMR8wHQYDVQQDExZ3ZWJhdXRoLnN0YXJr
-c3RhdGUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAraT5iU6p
-RM5dJf1721dGiy1M8XesErWTj4uBH2AJwcRAcpRVEE8FDn9Poz23aIRjhX2T8t6y
-ySV7ejGjneWt1WL3WWU6spipcqLXg3AbSLjk6Zd5QNgKWD2MmSZvgU2327Qal76a
-gRKMpoTrdsauiJFzYIvW5Qoe++t4pGiAr2y0Qrq901gr8x15rC71riPQSnumU9gE
-kVQaIkvEw7brJgEORO4h/07vmggpAsDdc+cpTj5UG9lw+eYjEeg+czHTeyl1SFWR
-Ryfc6/Ja1gTHScccUPQR6CYUGQhnT+gD9otAxll7wo9suAF5/pxCSdVDJNt5PHfm
-4b6Sxd2506SLzQIDAQABo3MwcTBQBgNVHREESTBHghZ3ZWJhdXRoLnN0YXJrc3Rh
-dGUuZWR1hi1odHRwczovL3dlYmF1dGguc3RhcmtzdGF0ZS5lZHUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFLEGGfGxSOPAgP1liztCzPrCrnzKMA0GCSqGSIb3DQEB
-BQUAA4IBAQAC6YHhSwz/3NCHvonsIOnRu20RANLFiQ7+tCd9p3ZODkEUfNPIq29A
-lrO37cVOQoAxvzdwFdz+qoV1Ipo+4IafhDDl1zdbhSFGYzKUaGkByGw2O3KEvaX5
-A10dI7xKeyJg8BXtumKz5qXiOzA4HN4UVZriCWw7unNdmSGS6PGiZ7t9pPMHUk2H
-jipaqfMXAqPK6HA/IHoB5k/PNDgV/hnpYiGYc/coYTL3s4mO80/NCrUHb2WP2Ku0
-/WRmBjNm2r5KIYuUl40A8wEjcR7l/fXJccahiypmtB4BBYlK2v2ktc6sb2+riXk2
-vKC1XL9IeVtw8IvrnaNTZnuW87F6XdEo
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.starkstate.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.starkstate.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.starkstate.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.starkstate.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.starkstate.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.starkstate.edu/idp/profile/SAML2/POST-SimpleSign/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">starkstate.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAMa41Sm2Z43/pbQY6PVnKuY6ZBFCMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFndlYmF1dGguc3RhcmtzdGF0ZS5lZHUwHhcNMTIwMjA3
-MTUxMzE0WhcNMzIwMjA3MTUxMzE0WjAhMR8wHQYDVQQDExZ3ZWJhdXRoLnN0YXJr
-c3RhdGUuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAraT5iU6p
-RM5dJf1721dGiy1M8XesErWTj4uBH2AJwcRAcpRVEE8FDn9Poz23aIRjhX2T8t6y
-ySV7ejGjneWt1WL3WWU6spipcqLXg3AbSLjk6Zd5QNgKWD2MmSZvgU2327Qal76a
-gRKMpoTrdsauiJFzYIvW5Qoe++t4pGiAr2y0Qrq901gr8x15rC71riPQSnumU9gE
-kVQaIkvEw7brJgEORO4h/07vmggpAsDdc+cpTj5UG9lw+eYjEeg+czHTeyl1SFWR
-Ryfc6/Ja1gTHScccUPQR6CYUGQhnT+gD9otAxll7wo9suAF5/pxCSdVDJNt5PHfm
-4b6Sxd2506SLzQIDAQABo3MwcTBQBgNVHREESTBHghZ3ZWJhdXRoLnN0YXJrc3Rh
-dGUuZWR1hi1odHRwczovL3dlYmF1dGguc3RhcmtzdGF0ZS5lZHUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFLEGGfGxSOPAgP1liztCzPrCrnzKMA0GCSqGSIb3DQEB
-BQUAA4IBAQAC6YHhSwz/3NCHvonsIOnRu20RANLFiQ7+tCd9p3ZODkEUfNPIq29A
-lrO37cVOQoAxvzdwFdz+qoV1Ipo+4IafhDDl1zdbhSFGYzKUaGkByGw2O3KEvaX5
-A10dI7xKeyJg8BXtumKz5qXiOzA4HN4UVZriCWw7unNdmSGS6PGiZ7t9pPMHUk2H
-jipaqfMXAqPK6HA/IHoB5k/PNDgV/hnpYiGYc/coYTL3s4mO80/NCrUHb2WP2Ku0
-/WRmBjNm2r5KIYuUl40A8wEjcR7l/fXJccahiypmtB4BBYlK2v2ktc6sb2+riXk2
-vKC1XL9IeVtw8IvrnaNTZnuW87F6XdEo
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.starkstate.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.starkstate.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stark State College of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stark State College of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.starkstate.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Geoff Starnes</md:GivenName>
-    <md:EmailAddress>gstarnes@starkstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Geoff Starnes</md:GivenName>
-    <md:EmailAddress>gstarnes@starkstate.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-stevens.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-stevens.edu.xml
deleted file mode 100644
index 4b41cd9a..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-stevens.edu.xml
+++ /dev/null
@@ -1,117 +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="urn:mace:incommon:stevens.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">stevens.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Stevens Institute of Technology</mdui:DisplayName>
-        <mdui:Logo height="213" width="500" xml:lang="en">https://www.stevens.edu/sit/sites/sit/themes/sit_default/logo.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>
-MIIE0DCCA7igAwIBAgIJAKUJTVvF9jMzMA0GCSqGSIb3DQEBBQUAMIGgMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEQMA4GA1UEBxMHSG9ib2tlbjEo
-MCYGA1UEChMfU3RldmVucyBJbnN0aXR1dGUgb2YgVGVjaG5vbG9neTEfMB0GA1UE
-CxMWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEfMB0GA1UEAxMWc2hpYmJvbGV0aC5z
-dGV2ZW5zLmVkdTAeFw0xMzA0MjUyMTAxMDlaFw0zMzA0MjAyMTAxMDlaMIGgMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEQMA4GA1UEBxMHSG9ib2tl
-bjEoMCYGA1UEChMfU3RldmVucyBJbnN0aXR1dGUgb2YgVGVjaG5vbG9neTEfMB0G
-A1UECxMWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEfMB0GA1UEAxMWc2hpYmJvbGV0
-aC5zdGV2ZW5zLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO2c
-JBTo094f/BcRDAAT0tIgiJL4gUz4zNspGsgxP32Q4/mEiihco8hPFgMQr1mAc7JF
-S6X0WUvs6WZiDvOVScS22R4ivr09B1ZRnpOqEJ0L/ets7OK3UScE2V5VW5Kbeot/
-IOo6Yahljo2DkxfkfCzSSTMMxVrZBTwxtoAi5Ri1bShU9Vw4BL/A0MfV+RlgjXrT
-cGcWoCTRNBtXEeADqydq3IG/5tJBZJXMalj37hnhM5zqMkF5yunEFSqtXMafVq4f
-qik1Hu9QP4nR5lWxONG24V2MuNuNkFhKLfJ/QMMJVqpfA96p8Of5njwk4qTj5Hw9
-hnXKPbqvasgj4kw6Uz0CAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSLYDJRDVrnnP7z
-dVbceo1m8LOw4TCB1QYDVR0jBIHNMIHKgBSLYDJRDVrnnP7zdVbceo1m8LOw4aGB
-pqSBozCBoDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxEDAOBgNV
-BAcTB0hvYm9rZW4xKDAmBgNVBAoTH1N0ZXZlbnMgSW5zdGl0dXRlIG9mIFRlY2hu
-b2xvZ3kxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRlY2hub2xvZ3kxHzAdBgNVBAMT
-FnNoaWJib2xldGguc3RldmVucy5lZHWCCQClCU1bxfYzMzAMBgNVHRMEBTADAQH/
-MA0GCSqGSIb3DQEBBQUAA4IBAQBdt86UgJOoIvSSwvh1ySB2S/zqEfRQl4U4uVLs
-zVhlaZjhTLJkg65q39mH7RWLtkRjmL5Ow3DhF3jkwFurn37wYj1aDF0I/EuxZNIn
-ScmbRlIqJFfRqzrg3BlgFh1MC/wKjNPa7zP2u3dHcEjbA+3j4AMUMEpQraIRDTeJ
-sP2lUMDInk7ed7EtMwAZ3yzzZeErQlCTzcp2FEDqELvFaWs+72fQLLUAhaOyvQX/
-eFcCdQ1M6aBTDHy7CrsFeIr+U90g9lwRLVfenOpRH9Hwhp3ADlPIFQWZCggwzPty
-vNxpYC0Zha2JoUI0lWpc6TWmQprKU5HaC/LZj6UdCQ11HM04
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stevens.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stevens.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.stevens.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.stevens.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.stevens.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.stevens.edu/idp/profile/SAML2/POST-SimpleSign/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">stevens.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE0DCCA7igAwIBAgIJAKUJTVvF9jMzMA0GCSqGSIb3DQEBBQUAMIGgMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEQMA4GA1UEBxMHSG9ib2tlbjEo
-MCYGA1UEChMfU3RldmVucyBJbnN0aXR1dGUgb2YgVGVjaG5vbG9neTEfMB0GA1UE
-CxMWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEfMB0GA1UEAxMWc2hpYmJvbGV0aC5z
-dGV2ZW5zLmVkdTAeFw0xMzA0MjUyMTAxMDlaFw0zMzA0MjAyMTAxMDlaMIGgMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKTmV3IEplcnNleTEQMA4GA1UEBxMHSG9ib2tl
-bjEoMCYGA1UEChMfU3RldmVucyBJbnN0aXR1dGUgb2YgVGVjaG5vbG9neTEfMB0G
-A1UECxMWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEfMB0GA1UEAxMWc2hpYmJvbGV0
-aC5zdGV2ZW5zLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO2c
-JBTo094f/BcRDAAT0tIgiJL4gUz4zNspGsgxP32Q4/mEiihco8hPFgMQr1mAc7JF
-S6X0WUvs6WZiDvOVScS22R4ivr09B1ZRnpOqEJ0L/ets7OK3UScE2V5VW5Kbeot/
-IOo6Yahljo2DkxfkfCzSSTMMxVrZBTwxtoAi5Ri1bShU9Vw4BL/A0MfV+RlgjXrT
-cGcWoCTRNBtXEeADqydq3IG/5tJBZJXMalj37hnhM5zqMkF5yunEFSqtXMafVq4f
-qik1Hu9QP4nR5lWxONG24V2MuNuNkFhKLfJ/QMMJVqpfA96p8Of5njwk4qTj5Hw9
-hnXKPbqvasgj4kw6Uz0CAwEAAaOCAQkwggEFMB0GA1UdDgQWBBSLYDJRDVrnnP7z
-dVbceo1m8LOw4TCB1QYDVR0jBIHNMIHKgBSLYDJRDVrnnP7zdVbceo1m8LOw4aGB
-pqSBozCBoDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxEDAOBgNV
-BAcTB0hvYm9rZW4xKDAmBgNVBAoTH1N0ZXZlbnMgSW5zdGl0dXRlIG9mIFRlY2hu
-b2xvZ3kxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRlY2hub2xvZ3kxHzAdBgNVBAMT
-FnNoaWJib2xldGguc3RldmVucy5lZHWCCQClCU1bxfYzMzAMBgNVHRMEBTADAQH/
-MA0GCSqGSIb3DQEBBQUAA4IBAQBdt86UgJOoIvSSwvh1ySB2S/zqEfRQl4U4uVLs
-zVhlaZjhTLJkg65q39mH7RWLtkRjmL5Ow3DhF3jkwFurn37wYj1aDF0I/EuxZNIn
-ScmbRlIqJFfRqzrg3BlgFh1MC/wKjNPa7zP2u3dHcEjbA+3j4AMUMEpQraIRDTeJ
-sP2lUMDInk7ed7EtMwAZ3yzzZeErQlCTzcp2FEDqELvFaWs+72fQLLUAhaOyvQX/
-eFcCdQ1M6aBTDHy7CrsFeIr+U90g9lwRLVfenOpRH9Hwhp3ADlPIFQWZCggwzPty
-vNxpYC0Zha2JoUI0lWpc6TWmQprKU5HaC/LZj6UdCQ11HM04
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.stevens.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.stevens.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stevens Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stevens Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.stevens.edu/sit/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Stevens InCommon Admin</md:GivenName>
-    <md:EmailAddress>incommonadmin@stevens.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Stevens InCommon Admin</md:GivenName>
-    <md:EmailAddress>incommonadmin@stevens.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-stonybrook.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-stonybrook.edu.xml
deleted file mode 100644
index cb4f6579..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-stonybrook.edu.xml
+++ /dev/null
@@ -1,65 +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="urn:mace:incommon:stonybrook.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://sso.cc.stonybrook.edu/idp/error.html" 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">stonybrook.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Stony Brook University</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>
-MIIDQDCCAiigAwIBAgIVAM6zo1Tg/Cni0U1ZiS9qUjHwTb0qMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFXNzby5jYy5zdG9ueWJyb29rLmVkdTAeFw0xMjAzMzAy
-MTI4MTBaFw0zMjAzMzAyMTI4MTBaMCAxHjAcBgNVBAMTFXNzby5jYy5zdG9ueWJy
-b29rLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIZH1YAL8Nsb
-ZP7r1ZCfT0iXKNeVMUoes4lotQGna8lfAkwbBAOIi8z6Ck1pHtTwZBnRf0HalU2r
-+INFd/U2MQMUl63YrdhjXwkM7LepxMqj1nBRRS7W1qnS4B9N1Gx8h4RwaYVlW7YR
-EFSZjuqVTz3aJqr4IY6OjxHlXKCYy9q0x2QGgJm7z0/0K0K1w1LymoL8smE+7X4T
-foEKIZohNHxTPoM8tLU3XZhuMQL8TAtbUIz18+gyq0ug8Nf5mXkBPDSIQ92VWTKN
-CbFuu1meG18OXGNQwDsjj3D6WzoV8/h7wsVhf1tyBXfJ6GFfkhdJPJZTCgJzsGEk
-wVmSKNwTwzkCAwEAAaNxMG8wTgYDVR0RBEcwRYIVc3NvLmNjLnN0b255YnJvb2su
-ZWR1hixodHRwczovL3Nzby5jYy5zdG9ueWJyb29rLmVkdS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUoH3ycV3oftfj3WFA33xtpoaRyUYwDQYJKoZIhvcNAQEFBQAD
-ggEBAE2vfQbGmZWnFMWylYeLqj7lvX5P1Se9i8DBJjy3tdCTIHdHTSRPLnnroFEb
-Au55cnXU3SeJ4jzHj3k4tOXQQfE+BGER47DtPuJ5Ey2Ug33DCrMoP0yjpwp3uTcy
-NRSzJT6FikcvJbGxzswA6chGOHWtGwe4dq+5Om0q8QQsQMX5o3TUrkL/9e4cSyHV
-beoZeLMhDf4M7wf971qx6tV+qVQqqSdDbQOPx+IKKXGuHCwKXwi1V1KjmYFqnOm6
-vjLJq/ZYknekwIgXDYdL99d5kwqV6W7vHm5V7j2fv0o+mNu46sL9Y+TVZPAnyw8b
-P5kJpNl6SkvUOjZ4nvr9i9FgmHc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.cc.stonybrook.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.cc.stonybrook.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.cc.stonybrook.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.cc.stonybrook.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stony Brook University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stony Brook University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sunysb.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sanjay Kapur</md:GivenName>
-    <md:EmailAddress>Sanjay.Kapur@stonybrook.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brian Heller</md:GivenName>
-    <md:EmailAddress>Brian.Heller@stonybrook.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-tamu.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-tamu.edu.xml
deleted file mode 100644
index a7d6358c..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-tamu.edu.xml
+++ /dev/null
@@ -1,129 +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="urn:mace:incommon:tamu.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">tamu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Texas A &amp; M University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://infrastructure.tamu.edu/</mdui:InformationURL>
-        <mdui:Logo height="400" width="350" xml:lang="en">https://infrastructure.tamu.edu/images/TAM-PrimaryMarkA.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>
-MIIFHzCCBAegAwIBAgICAM0wDQYJKoZIhvcNAQEFBQAwgbQxMDAuBgNVBAMTJ1Rl
-eGFzIEEgYW5kIE0gVW5pdmVyc2l0eSBPcGVuU3lzdGVtcyBDQTELMAkGA1UEBhMC
-VVMxDjAMBgNVBAgTBVRleGFzMRgwFgYDVQQHEw9Db2xsZWdlIFN0YXRpb24xITAf
-BgNVBAoTGFRleGFzIEEgYW5kIE0gVW5pdmVyc2l0eTEmMCQGCSqGSIb3DQEJARYX
-dW5peC1lbmdpbmVlcnNAdGFtdS5lZHUwHhcNMTMwMjE4MTYyNDQ3WhcNMTcwMjE3
-MTYyNDQ3WjCBqTELMAkGA1UEBhMCVVMxDjAMBgNVBAgTBVRleGFzMSEwHwYDVQQK
-ExhUZXhhcyBBIGFuZCBNIFVuaXZlcnNpdHkxKzApBgNVBAsTIkNvbXB1dGluZyBh
-bmQgSW5mb3JtYXRpb24gU2VydmljZXMxFTATBgNVBAMTDGlkcC50YW11LmVkdTEj
-MCEGCSqGSIb3DQEJARYUdW5peC1hZG1pbnNAdGFtdS5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDLXA+lr+iaQoWFlPXZ/dpgU02YNVyvoKwhEmkx
-Z4w115hYWd8lNpVSay7cuiWaDRLeyDPKRc44pVseI6VQEfxDDTvbtFZ1y50/Ebmu
-3hd+hXKCnMhfx2yey3A1wBPyVPNPjXyRzS6vnRO0qh5jF8LHltHCO1zJcnZVVvin
-QJCwsaO3gVr0qeLZizRxpzPUuG0jLgquIw5qHaIDizUGU/jwBXhFtjlBNc84nFr1
-OKOsrP1ueEoqYRMrXtLoMJO+UUKm9etohB4b+IPGsFk6RxerEtvFl5i1qmHg4aF+
-cLAqLw01khAMCF+P1a3P7Q4wxnFJlC/ZlI1P1D5AeVUt5sJFAgMBAAGjggFCMIIB
-PjAJBgNVHRMEAjAAMB0GA1UdDgQWBBSfnAZqaUuadGj4HzAppnUyO62NsTCB4QYD
-VR0jBIHZMIHWgBRLzeA92ieIxqAcIsb5RhD8f5GT56GBuqSBtzCBtDEwMC4GA1UE
-AxMnVGV4YXMgQSBhbmQgTSBVbml2ZXJzaXR5IE9wZW5TeXN0ZW1zIENBMQswCQYD
-VQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxGDAWBgNVBAcTD0NvbGxlZ2UgU3RhdGlv
-bjEhMB8GA1UEChMYVGV4YXMgQSBhbmQgTSBVbml2ZXJzaXR5MSYwJAYJKoZIhvcN
-AQkBFhd1bml4LWVuZ2luZWVyc0B0YW11LmVkdYIBADAuBglghkgBhvhCAQQEIRYf
-aHR0cHM6Ly93d3cudGFtdS5lZHUvY2EtY3JsLnBlbTANBgkqhkiG9w0BAQUFAAOC
-AQEARKaoqJ/EjPOponWaTYQW1VdypIdzQpBm82oHcjdz7/sXW+wFfu4UsmVFBQLL
-XkfMTyG0WNv1BKykI92ncUt9Py3tfmVx07IeZoyrJFBxvrGgI4AyoxiyDuwsXGox
-deGefFdCjJwEavxdjHp2u7oLZI9C02JXBLiEqhAzXwJZqSOB7FRDeiFKlpxuZ0EL
-n6ynZa0trJl8dOzuRr7KcJYA77fYlce8yxQpeStvuGECneHFLwOdzm4ijqJOKhn6
-/T7yIyJS/3kH2Abpfri1MULpvY+Y+GxJj6tgG5akFDw1WLvG2lWViEsACWBVZGw5
-HEC94c/SIH+rUVVS/RftJxbjFQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tamu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tamu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.tamu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tamu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tamu.edu/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">tamu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFHzCCBAegAwIBAgICAM0wDQYJKoZIhvcNAQEFBQAwgbQxMDAuBgNVBAMTJ1Rl
-eGFzIEEgYW5kIE0gVW5pdmVyc2l0eSBPcGVuU3lzdGVtcyBDQTELMAkGA1UEBhMC
-VVMxDjAMBgNVBAgTBVRleGFzMRgwFgYDVQQHEw9Db2xsZWdlIFN0YXRpb24xITAf
-BgNVBAoTGFRleGFzIEEgYW5kIE0gVW5pdmVyc2l0eTEmMCQGCSqGSIb3DQEJARYX
-dW5peC1lbmdpbmVlcnNAdGFtdS5lZHUwHhcNMTMwMjE4MTYyNDQ3WhcNMTcwMjE3
-MTYyNDQ3WjCBqTELMAkGA1UEBhMCVVMxDjAMBgNVBAgTBVRleGFzMSEwHwYDVQQK
-ExhUZXhhcyBBIGFuZCBNIFVuaXZlcnNpdHkxKzApBgNVBAsTIkNvbXB1dGluZyBh
-bmQgSW5mb3JtYXRpb24gU2VydmljZXMxFTATBgNVBAMTDGlkcC50YW11LmVkdTEj
-MCEGCSqGSIb3DQEJARYUdW5peC1hZG1pbnNAdGFtdS5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDLXA+lr+iaQoWFlPXZ/dpgU02YNVyvoKwhEmkx
-Z4w115hYWd8lNpVSay7cuiWaDRLeyDPKRc44pVseI6VQEfxDDTvbtFZ1y50/Ebmu
-3hd+hXKCnMhfx2yey3A1wBPyVPNPjXyRzS6vnRO0qh5jF8LHltHCO1zJcnZVVvin
-QJCwsaO3gVr0qeLZizRxpzPUuG0jLgquIw5qHaIDizUGU/jwBXhFtjlBNc84nFr1
-OKOsrP1ueEoqYRMrXtLoMJO+UUKm9etohB4b+IPGsFk6RxerEtvFl5i1qmHg4aF+
-cLAqLw01khAMCF+P1a3P7Q4wxnFJlC/ZlI1P1D5AeVUt5sJFAgMBAAGjggFCMIIB
-PjAJBgNVHRMEAjAAMB0GA1UdDgQWBBSfnAZqaUuadGj4HzAppnUyO62NsTCB4QYD
-VR0jBIHZMIHWgBRLzeA92ieIxqAcIsb5RhD8f5GT56GBuqSBtzCBtDEwMC4GA1UE
-AxMnVGV4YXMgQSBhbmQgTSBVbml2ZXJzaXR5IE9wZW5TeXN0ZW1zIENBMQswCQYD
-VQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxGDAWBgNVBAcTD0NvbGxlZ2UgU3RhdGlv
-bjEhMB8GA1UEChMYVGV4YXMgQSBhbmQgTSBVbml2ZXJzaXR5MSYwJAYJKoZIhvcN
-AQkBFhd1bml4LWVuZ2luZWVyc0B0YW11LmVkdYIBADAuBglghkgBhvhCAQQEIRYf
-aHR0cHM6Ly93d3cudGFtdS5lZHUvY2EtY3JsLnBlbTANBgkqhkiG9w0BAQUFAAOC
-AQEARKaoqJ/EjPOponWaTYQW1VdypIdzQpBm82oHcjdz7/sXW+wFfu4UsmVFBQLL
-XkfMTyG0WNv1BKykI92ncUt9Py3tfmVx07IeZoyrJFBxvrGgI4AyoxiyDuwsXGox
-deGefFdCjJwEavxdjHp2u7oLZI9C02JXBLiEqhAzXwJZqSOB7FRDeiFKlpxuZ0EL
-n6ynZa0trJl8dOzuRr7KcJYA77fYlce8yxQpeStvuGECneHFLwOdzm4ijqJOKhn6
-/T7yIyJS/3kH2Abpfri1MULpvY+Y+GxJj6tgG5akFDw1WLvG2lWViEsACWBVZGw5
-HEC94c/SIH+rUVVS/RftJxbjFQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.tamu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tamu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Texas A &amp; M University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Texas A &amp; M University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.tamu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Xavier Chapa</md:GivenName>
-    <md:EmailAddress>unix-admin@tamu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Xavier Chapa</md:GivenName>
-    <md:EmailAddress>unix-admin@tamu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Thomas Golson</md:GivenName>
-    <md:EmailAddress>tgolson@tamu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Thomas Golson</md:GivenName>
-    <md:EmailAddress>tgolson@tamu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uab.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uab.edu.xml
deleted file mode 100644
index 380e76c6..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-uab.edu.xml
+++ /dev/null
@@ -1,104 +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="urn:mace:incommon:uab.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">uab.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Alabama at Birmingham</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>
-MIIDNTCCAh2gAwIBAgIJAKhbYAyHDVilMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHNoaWIuZHBvLnVhYi5lZHUwHhcNMTMwNTA3MTczMzQ4WhcNMjMwNTE1MTcz
-MzQ4WjAbMRkwFwYDVQQDExBzaGliLmRwby51YWIuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAyMC9Q5de3dVyc+TrIsiKuAMo/hB/fOS5ZCBTs/Dg
-KX3bYXa3VBcJCQjZSCAXXcOY+xZjzUr7UZnQh4zsizwahMA2xTCHPV2ioUUvXbBr
-rG/8rTYe130jeP+mcLxfph15JPM2n9zs6/9bn+xjlQM8eKu+Es8JaxjUnG7LzBjb
-ZQxbZrBkec5ppFg1a3bhAHkf4XK71GKWffW+Hyw8HzqXNkOUEUO778TLbEIB4Xmd
-POL88pYgVWp9Li7CAlWN/UsBLwy1y+sCCHfWunbI2Myf+QMLafs4JYFTFeo+00H4
-Uy0MRcatmnDSkq0r0L7ZZosnDE0lJwC3fnvECOqKHLZ5XQIDAQABo3wwejAdBgNV
-HQ4EFgQUbkGLbZqs4yNGXzx2btBzJdrpU3MwSwYDVR0jBEQwQoAUbkGLbZqs4yNG
-Xzx2btBzJdrpU3OhH6QdMBsxGTAXBgNVBAMTEHNoaWIuZHBvLnVhYi5lZHWCCQCo
-W2AMhw1YpTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAZAZq6u3DL
-AKOr/dzOaynGI4VmEbgjtOM20nkwpeHYNJUO+fd4gZH3QkxPkATqSVQ3UFMEACJw
-7Hz5LgswpiRiaBTD/27jJxqG/ZOzPJfu08L1Ljx0+j3hMuaNA1KDENvkNOBGulCk
-QI8Qdm3Jj2bfGC0qnmiQ9rZ/IMleVXcjVBdEi9WnIS9Lu960FwJTsaYNvpYTJPGZ
-qsnFmVVeDfVtegKUOtE/p/hZZ0rAqilBeCz0jyqEG7cjW4Zwd3ULfb32F1sv00Zp
-+ap/RFh5amo3UF0raAflMUYKy64pgOBlsW4cqYsZ+ou8aqrcJVfPPTlWIQtdPFXS
-FFBTvHwNAQ9P
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dpo.uab.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dpo.uab.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.dpo.uab.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.dpo.uab.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.dpo.uab.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.dpo.uab.edu/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">uab.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNTCCAh2gAwIBAgIJAKhbYAyHDVilMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHNoaWIuZHBvLnVhYi5lZHUwHhcNMTMwNTA3MTczMzQ4WhcNMjMwNTE1MTcz
-MzQ4WjAbMRkwFwYDVQQDExBzaGliLmRwby51YWIuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAyMC9Q5de3dVyc+TrIsiKuAMo/hB/fOS5ZCBTs/Dg
-KX3bYXa3VBcJCQjZSCAXXcOY+xZjzUr7UZnQh4zsizwahMA2xTCHPV2ioUUvXbBr
-rG/8rTYe130jeP+mcLxfph15JPM2n9zs6/9bn+xjlQM8eKu+Es8JaxjUnG7LzBjb
-ZQxbZrBkec5ppFg1a3bhAHkf4XK71GKWffW+Hyw8HzqXNkOUEUO778TLbEIB4Xmd
-POL88pYgVWp9Li7CAlWN/UsBLwy1y+sCCHfWunbI2Myf+QMLafs4JYFTFeo+00H4
-Uy0MRcatmnDSkq0r0L7ZZosnDE0lJwC3fnvECOqKHLZ5XQIDAQABo3wwejAdBgNV
-HQ4EFgQUbkGLbZqs4yNGXzx2btBzJdrpU3MwSwYDVR0jBEQwQoAUbkGLbZqs4yNG
-Xzx2btBzJdrpU3OhH6QdMBsxGTAXBgNVBAMTEHNoaWIuZHBvLnVhYi5lZHWCCQCo
-W2AMhw1YpTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAZAZq6u3DL
-AKOr/dzOaynGI4VmEbgjtOM20nkwpeHYNJUO+fd4gZH3QkxPkATqSVQ3UFMEACJw
-7Hz5LgswpiRiaBTD/27jJxqG/ZOzPJfu08L1Ljx0+j3hMuaNA1KDENvkNOBGulCk
-QI8Qdm3Jj2bfGC0qnmiQ9rZ/IMleVXcjVBdEi9WnIS9Lu960FwJTsaYNvpYTJPGZ
-qsnFmVVeDfVtegKUOtE/p/hZZ0rAqilBeCz0jyqEG7cjW4Zwd3ULfb32F1sv00Zp
-+ap/RFh5amo3UF0raAflMUYKy64pgOBlsW4cqYsZ+ou8aqrcJVfPPTlWIQtdPFXS
-FFBTvHwNAQ9P
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.dpo.uab.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.dpo.uab.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Alabama at Birmingham</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Alabama at Birmingham</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uab.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Landy Manderson</md:GivenName>
-    <md:EmailAddress>landy@uab.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UABIT User Services</md:GivenName>
-    <md:EmailAddress>UserServices@uab.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Robert Cloud</md:GivenName>
-    <md:EmailAddress>recloud@uab.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucdavis.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucdavis.edu.xml
deleted file mode 100644
index 94f826c6..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucdavis.edu.xml
+++ /dev/null
@@ -1,100 +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="urn:mace:incommon:ucdavis.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">ucdavis.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of California, Davis</mdui:DisplayName>
-        <mdui:Logo height="101" width="396" xml:lang="en">https://shibboleth.ucdavis.edu/icons/ucd_logo.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>
-MIIDFTCCAf2gAwIBAgIJAPPcLMuZiVH8MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMMFnNoaWJib2xldGgudWNkYXZpcy5lZHUwHhcNMTMwNDAzMjAxNDE2WhcNMzMw
-NTAzMjAxNDE2WjAhMR8wHQYDVQQDDBZzaGliYm9sZXRoLnVjZGF2aXMuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsp192eOPILgmh31WyOOXSfAe
-Hy26ZLQPynjO011vO2iN9WfpNnkw10jOYc8n++rmTBt+CPrld6zPm9vyF0YyhFgA
-3np8nEnsX94rdc/x4bZaVHDo5V0yUW7dqeZ0QpxMMBDLiJu+i5QyHzGORgrfA9vb
-ditbtIF2yBKVhtwtuAJ4EMMVXMgDrddh3iwuYDIkizb9ro6wyb+g2BYft/rXYzV1
-Q5y7PJuu7/5tobEELnBPUX96NBtN0xHPRk69BmqIOHb0I3subojQd2mJMHAJZBa3
-1rVSqMoqDc1XvzRoNAnbFGVkoFsDJ7Pub/Bp9TwpY5M4x20xLereaW3XOU3+dQID
-AQABo1AwTjAdBgNVHQ4EFgQUgYNUwHp+5Mcj29XUBc82gYlyAGAwHwYDVR0jBBgw
-FoAUgYNUwHp+5Mcj29XUBc82gYlyAGAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAjx0V9ar1jRCHJQ/iZQ27oHbIOTW+eM0LDO6j9vESk5a+4CvpIJ+F
-+Wjom1eCaM6Hm1o0ZLcODJRQpJVuWEItoe3vaa3flN5L7KX7txP7/BQrfm6SY+RM
-4HtVAidvTfycM5nTxWpy84E19u2VU4THdwAWEBGcJUNxlNrgT9ELZpOorx5+g2v7
-wNQMjfSwPtyOLPTF/1jGkQcTao1ZdejLuVbwTykBVFPeFQ8kAU6wsQpXeG3atpQl
-zxm9ugFEeQnBFLCckELT9sAV/5yzXtAdSexhyi4+wJ4peM57Kncf/SfdKeMKiyWt
-EyhVP7yaI/7vtaqct2bie69yO4PiaRMyaQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ucdavis.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.ucdavis.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ucdavis.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ucdavis.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucdavis.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFTCCAf2gAwIBAgIJAPPcLMuZiVH8MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-BAMMFnNoaWJib2xldGgudWNkYXZpcy5lZHUwHhcNMTMwNDAzMjAxNDE2WhcNMzMw
-NTAzMjAxNDE2WjAhMR8wHQYDVQQDDBZzaGliYm9sZXRoLnVjZGF2aXMuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsp192eOPILgmh31WyOOXSfAe
-Hy26ZLQPynjO011vO2iN9WfpNnkw10jOYc8n++rmTBt+CPrld6zPm9vyF0YyhFgA
-3np8nEnsX94rdc/x4bZaVHDo5V0yUW7dqeZ0QpxMMBDLiJu+i5QyHzGORgrfA9vb
-ditbtIF2yBKVhtwtuAJ4EMMVXMgDrddh3iwuYDIkizb9ro6wyb+g2BYft/rXYzV1
-Q5y7PJuu7/5tobEELnBPUX96NBtN0xHPRk69BmqIOHb0I3subojQd2mJMHAJZBa3
-1rVSqMoqDc1XvzRoNAnbFGVkoFsDJ7Pub/Bp9TwpY5M4x20xLereaW3XOU3+dQID
-AQABo1AwTjAdBgNVHQ4EFgQUgYNUwHp+5Mcj29XUBc82gYlyAGAwHwYDVR0jBBgw
-FoAUgYNUwHp+5Mcj29XUBc82gYlyAGAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQUFAAOCAQEAjx0V9ar1jRCHJQ/iZQ27oHbIOTW+eM0LDO6j9vESk5a+4CvpIJ+F
-+Wjom1eCaM6Hm1o0ZLcODJRQpJVuWEItoe3vaa3flN5L7KX7txP7/BQrfm6SY+RM
-4HtVAidvTfycM5nTxWpy84E19u2VU4THdwAWEBGcJUNxlNrgT9ELZpOorx5+g2v7
-wNQMjfSwPtyOLPTF/1jGkQcTao1ZdejLuVbwTykBVFPeFQ8kAU6wsQpXeG3atpQl
-zxm9ugFEeQnBFLCckELT9sAV/5yzXtAdSexhyi4+wJ4peM57Kncf/SfdKeMKiyWt
-EyhVP7yaI/7vtaqct2bie69yO4PiaRMyaQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucdavis.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California, Davis</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California, Davis</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucdavis.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Infrastructure Systems Management</md:GivenName>
-    <md:EmailAddress>sysadmin@ucdavis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>EAIS Shibboleth Group</md:GivenName>
-    <md:EmailAddress>shibadmin@ucdavis.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>EAIS Shibboleth Group</md:GivenName>
-    <md:EmailAddress>shibadmin@ucdavis.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uchicago.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uchicago.edu.xml
deleted file mode 100644
index df89ddf4..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-uchicago.edu.xml
+++ /dev/null
@@ -1,115 +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="urn:mace:incommon:uchicago.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shibboleth2.uchicago.edu/idp/error.jsp" 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">uchicago.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Chicago</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of Chicago Web Single Sign-On servce</mdui:Description>
-        <mdui:Logo height="83" width="350" xml:lang="en">https://shibboleth2.uchicago.edu/idp/shib_img/idplogo.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>
-MIIDTzCCAjegAwIBAgIJAI+nt27ZTDHAMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGHNoaWJib2xldGgyLnVjaGljYWdvLmVkdTAeFw0xMTA2MTYxNDQ2MjVaFw0y
-MTA2MTMxNDQ2MjVaMCMxITAfBgNVBAMTGHNoaWJib2xldGgyLnVjaGljYWdvLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCDNjCpYLmel5P355EX
-lH7ViD0r8wDnuAH0s9vtYse1dNdaNCemmWqGSN6WJzUTV5Jf4V0cE90UJmtMaJB9
-X6g3tuJEd/QCDNYZS9olskgMuyVUXO/PCjfqCkpgSDNkbhDN6dpQh7WX4eZm6/p+
-usecnXqU2167/eGQvZ3TQC/4u4G4oVCqLLSSXdF+QW78MlWZBXoYwM430LMjoxyD
-0gUYwPJRDuiYBVW9SZBYM2Sk88mIGFWq+qa46+SJBEbGgbk3FsGGP4x7w1MBudWK
-PWqfvM3hGocVazqqS2BIMpw/7gQl2iQKs60pDtOZepOa7w9h47U9fb80hvnE4XGx
-lL8CAwEAAaOBhTCBgjAdBgNVHQ4EFgQU8hoHX8iNhr9ZjcpYaqFqaMMMrhIwUwYD
-VR0jBEwwSoAU8hoHX8iNhr9ZjcpYaqFqaMMMrhKhJ6QlMCMxITAfBgNVBAMTGHNo
-aWJib2xldGgyLnVjaGljYWdvLmVkdYIJAI+nt27ZTDHAMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBAI+l1UQ1nUXXN8B4xLf411tLYCjwhIhGo7xYRekw
-ZQZg+rrFWRgSyDAmWsjVd8N/+2qpL/bcnVuNMcRRDOFmPjg5oX7mh+CBEcltJj84
-ipgjtC2h3BdsvM+26PcS7W65qrsSp1wQbOpJbDT3dsITHVVb7CoNtAkpZrwooDyl
-d8iaAs/IsHE0DdjJFUFyzrwy4UUPJvosDHP9eUx9aZ/dsAYLNeQwP9T/Tw/F1mLc
-ZzsMP2VdmhyWrqGNHdkGJCW9yEPTiGlhOZf2VM5wURpR6B1fUfpitGFJeRR72O96
-Q68ZpyIEX7vpdyRPeGehpyHiMbVGIBKmkXxHIH4zvacNhoc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.uchicago.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.uchicago.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.uchicago.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.uchicago.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth2.uchicago.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.uchicago.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.uchicago.edu/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">uchicago.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDTzCCAjegAwIBAgIJAI+nt27ZTDHAMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGHNoaWJib2xldGgyLnVjaGljYWdvLmVkdTAeFw0xMTA2MTYxNDQ2MjVaFw0y
-MTA2MTMxNDQ2MjVaMCMxITAfBgNVBAMTGHNoaWJib2xldGgyLnVjaGljYWdvLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCDNjCpYLmel5P355EX
-lH7ViD0r8wDnuAH0s9vtYse1dNdaNCemmWqGSN6WJzUTV5Jf4V0cE90UJmtMaJB9
-X6g3tuJEd/QCDNYZS9olskgMuyVUXO/PCjfqCkpgSDNkbhDN6dpQh7WX4eZm6/p+
-usecnXqU2167/eGQvZ3TQC/4u4G4oVCqLLSSXdF+QW78MlWZBXoYwM430LMjoxyD
-0gUYwPJRDuiYBVW9SZBYM2Sk88mIGFWq+qa46+SJBEbGgbk3FsGGP4x7w1MBudWK
-PWqfvM3hGocVazqqS2BIMpw/7gQl2iQKs60pDtOZepOa7w9h47U9fb80hvnE4XGx
-lL8CAwEAAaOBhTCBgjAdBgNVHQ4EFgQU8hoHX8iNhr9ZjcpYaqFqaMMMrhIwUwYD
-VR0jBEwwSoAU8hoHX8iNhr9ZjcpYaqFqaMMMrhKhJ6QlMCMxITAfBgNVBAMTGHNo
-aWJib2xldGgyLnVjaGljYWdvLmVkdYIJAI+nt27ZTDHAMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBAI+l1UQ1nUXXN8B4xLf411tLYCjwhIhGo7xYRekw
-ZQZg+rrFWRgSyDAmWsjVd8N/+2qpL/bcnVuNMcRRDOFmPjg5oX7mh+CBEcltJj84
-ipgjtC2h3BdsvM+26PcS7W65qrsSp1wQbOpJbDT3dsITHVVb7CoNtAkpZrwooDyl
-d8iaAs/IsHE0DdjJFUFyzrwy4UUPJvosDHP9eUx9aZ/dsAYLNeQwP9T/Tw/F1mLc
-ZzsMP2VdmhyWrqGNHdkGJCW9yEPTiGlhOZf2VM5wURpR6B1fUfpitGFJeRR72O96
-Q68ZpyIEX7vpdyRPeGehpyHiMbVGIBKmkXxHIH4zvacNhoc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.uchicago.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth2.uchicago.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Chicago</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Chicago</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uchicago.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tom Barton</md:GivenName>
-    <md:EmailAddress>tbarton@uchicago.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>David Langenberg</md:GivenName>
-    <md:EmailAddress>davel@uchicago.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Services Support</md:GivenName>
-    <md:EmailAddress>support@uchicago.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Daniel Yu</md:GivenName>
-    <md:EmailAddress>danielyu@uchicago.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>IT Security</md:GivenName>
-    <md:EmailAddress>security@uchicago.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uci.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uci.edu.xml
deleted file mode 100644
index 52cb6d47..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-uci.edu.xml
+++ /dev/null
@@ -1,108 +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="urn:mace:incommon:uci.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://shib.nacs.uci.edu/error.html" 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">uci.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of California-Irvine</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>
-MIIDODCCAiCgAwIBAgIJAO1Yk17FZKi5MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXNoaWIubmFjcy51Y2kuZWR1MB4XDTEzMDcyNDA3NTYxOVoXDTE2MDcyMzA3
-NTYxOVowHDEaMBgGA1UEAxMRc2hpYi5uYWNzLnVjaS5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCg9pYLWgF5p/EplyTruFy7hklZv1IHVUQdYk3h
-kDI4iRl8ILBF9jiu/kjmojk9B88BKmmJIlsgNDDTXAVTzSBwxj/pjXpAkYKQYLu2
-Dcm6Kh8TS4Fx4M3RjGc9fDK5JG+sVRUU4htTkBPSLEgIPCATbemprFb538HRr8Eg
-Ve7jRzm+w+xAbxu0em/J4JH9av9+GDL6PyQ1NqrOFWYnUZ499KuztiEVggIwFV/g
-vd0Hz18IsIN0ApBpt1X1EN6YqunvrWrOBznFNGHncezSG9MxdBZNCtRZn5OIhaph
-TLsb+vSBrQWVZPdZ0OIfsPeaHoeaBxl2xYWR7M8Wm01DvPq3AgMBAAGjfTB7MB0G
-A1UdDgQWBBSTqMlmxQq3XpYjILYWxYH4Y/NSRzBMBgNVHSMERTBDgBSTqMlmxQq3
-XpYjILYWxYH4Y/NSR6EgpB4wHDEaMBgGA1UEAxMRc2hpYi5uYWNzLnVjaS5lZHWC
-CQDtWJNexWSouTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBGIhIN
-uaSEU3++yhSBynQP/yIRzekCWSPB98Vx7qRFiyyUPNNDUApk+4y/Fx1BcoM7eiGx
-mMtTre7aRX7G8rs6DtvqQ7vndOUUVIngbOwf8rIrt1I+mviAXn+FLtnIzkIOTOtm
-7Duvs8V6TVcU/8uQEqtdRRscc6hMjkhZJ1odo7l7p4m9UqLlz/JqcoeqKTR3F8Ix
-hsP7gGcE2xwe7Mis8qEzSytn6kbkfT7w0ctddiL8J87/rIrsedREN8TFhuhlg8fZ
-v9aJmWKZeZ+2/K2ANetQpVHeZWel58B1y52d0VKhRA1D3IPmtlVETakAsNeTJ1UH
-SQUxnEmjRWv0mN8R
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.nacs.uci.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nacs.uci.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.nacs.uci.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.nacs.uci.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.nacs.uci.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.nacs.uci.edu/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">uci.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIJAO1Yk17FZKi5MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEXNoaWIubmFjcy51Y2kuZWR1MB4XDTEzMDcyNDA3NTYxOVoXDTE2MDcyMzA3
-NTYxOVowHDEaMBgGA1UEAxMRc2hpYi5uYWNzLnVjaS5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCg9pYLWgF5p/EplyTruFy7hklZv1IHVUQdYk3h
-kDI4iRl8ILBF9jiu/kjmojk9B88BKmmJIlsgNDDTXAVTzSBwxj/pjXpAkYKQYLu2
-Dcm6Kh8TS4Fx4M3RjGc9fDK5JG+sVRUU4htTkBPSLEgIPCATbemprFb538HRr8Eg
-Ve7jRzm+w+xAbxu0em/J4JH9av9+GDL6PyQ1NqrOFWYnUZ499KuztiEVggIwFV/g
-vd0Hz18IsIN0ApBpt1X1EN6YqunvrWrOBznFNGHncezSG9MxdBZNCtRZn5OIhaph
-TLsb+vSBrQWVZPdZ0OIfsPeaHoeaBxl2xYWR7M8Wm01DvPq3AgMBAAGjfTB7MB0G
-A1UdDgQWBBSTqMlmxQq3XpYjILYWxYH4Y/NSRzBMBgNVHSMERTBDgBSTqMlmxQq3
-XpYjILYWxYH4Y/NSR6EgpB4wHDEaMBgGA1UEAxMRc2hpYi5uYWNzLnVjaS5lZHWC
-CQDtWJNexWSouTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBGIhIN
-uaSEU3++yhSBynQP/yIRzekCWSPB98Vx7qRFiyyUPNNDUApk+4y/Fx1BcoM7eiGx
-mMtTre7aRX7G8rs6DtvqQ7vndOUUVIngbOwf8rIrt1I+mviAXn+FLtnIzkIOTOtm
-7Duvs8V6TVcU/8uQEqtdRRscc6hMjkhZJ1odo7l7p4m9UqLlz/JqcoeqKTR3F8Ix
-hsP7gGcE2xwe7Mis8qEzSytn6kbkfT7w0ctddiL8J87/rIrsedREN8TFhuhlg8fZ
-v9aJmWKZeZ+2/K2ANetQpVHeZWel58B1y52d0VKhRA1D3IPmtlVETakAsNeTJ1UH
-SQUxnEmjRWv0mN8R
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.nacs.uci.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.nacs.uci.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California-Irvine</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California-Irvine</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uci.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Brian Roode</md:GivenName>
-    <md:EmailAddress>bgroode@uci.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Chris Peters</md:GivenName>
-    <md:EmailAddress>cjpeters@uci.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>OIT Response Center</md:GivenName>
-    <md:EmailAddress>oit@uci.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Cliff Chuang</md:GivenName>
-    <md:EmailAddress>lchuang1@uci.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucla.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucla.edu.xml
deleted file mode 100644
index 544aee48..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucla.edu.xml
+++ /dev/null
@@ -1,114 +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="urn:mace:incommon:ucla.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shb.ais.ucla.edu/shibboleth-idp/WAYFerror" 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">ucla.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of California-Los Angeles</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>
-MIIEUTCCAzmgAwIBAgIJAIJtSzeAEQM6MA0GCSqGSIb3DQEBBQUAMHgxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtMb3MgQW5nZWxl
-czENMAsGA1UEChMEVUNMQTEUMBIGA1UECxMLSVQgU2VydmljZXMxGTAXBgNVBAMT
-EHNoYi5haXMudWNsYS5lZHUwHhcNMTUwMzE2MTYzMjIxWhcNMjUwMzEzMTYzMjIx
-WjB4MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxML
-TG9zIEFuZ2VsZXMxDTALBgNVBAoTBFVDTEExFDASBgNVBAsTC0lUIFNlcnZpY2Vz
-MRkwFwYDVQQDExBzaGIuYWlzLnVjbGEuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAx4MeQrV/3QDtRRm09qcChOHKzD4RSnbrXnX0hI9WpZ5aBQa/
-7y220/ZLa0y//rXsVovMW5/c2RcsOxbbrvzfB/8a2e4EkAY5nc97fgirCegH3znw
-kLZrqBYx8XJhopd7K1zzpXHzEMVV3cpYlQvIsFsf6Kf3ZEcH30tkf+73C38En0uf
-sP6QGkIj6q0FazJ9vLs/dcoyL03pXBH9pLf5F0rGceZu8KVBOTwNG03F3kPOW8t0
-TaL7QRoMF42fqObVMcXagW9QtUExw05bNl97c4IpkT6/X6bOWOnUflcUJU1Epdp1
-g3vbDZ1L9VxqGjbdHvP5EnfcakX1959jq9MiZwIDAQABo4HdMIHaMB0GA1UdDgQW
-BBS8b/HXrXb/lOz+h7QMxxo/Zksp/TCBqgYDVR0jBIGiMIGfgBS8b/HXrXb/lOz+
-h7QMxxo/Zksp/aF8pHoweDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3Ju
-aWExFDASBgNVBAcTC0xvcyBBbmdlbGVzMQ0wCwYDVQQKEwRVQ0xBMRQwEgYDVQQL
-EwtJVCBTZXJ2aWNlczEZMBcGA1UEAxMQc2hiLmFpcy51Y2xhLmVkdYIJAIJtSzeA
-EQM6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEw+u7bhNjgnU1zO
-wEL/b8rZXlQf6+VdRxWYm6w0pFSOrcjjvspPM93453UoX8ILLe4dIi0teppahzNr
-XhWPrWJ6SRxJaz/8QrAZhgWQDwcwfZSssdA79ltoDiZQ6Fce8Hz9G23BZ3LxbdaU
-o1SyIYAshw5aijVaLg5wcZfwSnXxTByVhBa8m886tGrXrcsePeZv7/mrmfs+gJUS
-2HyNjGtcyyVew+b6AjAPHjQTi45MAEdh/3n2cT/pBQq4pay+eZz8Lc42vx9kTCJt
-dlAgNuktzNxcWzokLWe0ynwTAPsWPUaPvUjhanK418P+F5WzsgLpU8LTzWcr5ixK
-E0JFJsE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shb.ais.ucla.edu:8443/shibboleth-idp/Artifact" index="1"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shb.ais.ucla.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shb.ais.ucla.edu/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shb.ais.ucla.edu/shibboleth-idp/profile/Shibboleth/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">ucla.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEUTCCAzmgAwIBAgIJAIJtSzeAEQM6MA0GCSqGSIb3DQEBBQUAMHgxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtMb3MgQW5nZWxl
-czENMAsGA1UEChMEVUNMQTEUMBIGA1UECxMLSVQgU2VydmljZXMxGTAXBgNVBAMT
-EHNoYi5haXMudWNsYS5lZHUwHhcNMTUwMzE2MTYzMjIxWhcNMjUwMzEzMTYzMjIx
-WjB4MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxML
-TG9zIEFuZ2VsZXMxDTALBgNVBAoTBFVDTEExFDASBgNVBAsTC0lUIFNlcnZpY2Vz
-MRkwFwYDVQQDExBzaGIuYWlzLnVjbGEuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAx4MeQrV/3QDtRRm09qcChOHKzD4RSnbrXnX0hI9WpZ5aBQa/
-7y220/ZLa0y//rXsVovMW5/c2RcsOxbbrvzfB/8a2e4EkAY5nc97fgirCegH3znw
-kLZrqBYx8XJhopd7K1zzpXHzEMVV3cpYlQvIsFsf6Kf3ZEcH30tkf+73C38En0uf
-sP6QGkIj6q0FazJ9vLs/dcoyL03pXBH9pLf5F0rGceZu8KVBOTwNG03F3kPOW8t0
-TaL7QRoMF42fqObVMcXagW9QtUExw05bNl97c4IpkT6/X6bOWOnUflcUJU1Epdp1
-g3vbDZ1L9VxqGjbdHvP5EnfcakX1959jq9MiZwIDAQABo4HdMIHaMB0GA1UdDgQW
-BBS8b/HXrXb/lOz+h7QMxxo/Zksp/TCBqgYDVR0jBIGiMIGfgBS8b/HXrXb/lOz+
-h7QMxxo/Zksp/aF8pHoweDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3Ju
-aWExFDASBgNVBAcTC0xvcyBBbmdlbGVzMQ0wCwYDVQQKEwRVQ0xBMRQwEgYDVQQL
-EwtJVCBTZXJ2aWNlczEZMBcGA1UEAxMQc2hiLmFpcy51Y2xhLmVkdYIJAIJtSzeA
-EQM6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEw+u7bhNjgnU1zO
-wEL/b8rZXlQf6+VdRxWYm6w0pFSOrcjjvspPM93453UoX8ILLe4dIi0teppahzNr
-XhWPrWJ6SRxJaz/8QrAZhgWQDwcwfZSssdA79ltoDiZQ6Fce8Hz9G23BZ3LxbdaU
-o1SyIYAshw5aijVaLg5wcZfwSnXxTByVhBa8m886tGrXrcsePeZv7/mrmfs+gJUS
-2HyNjGtcyyVew+b6AjAPHjQTi45MAEdh/3n2cT/pBQq4pay+eZz8Lc42vx9kTCJt
-dlAgNuktzNxcWzokLWe0ynwTAPsWPUaPvUjhanK418P+F5WzsgLpU8LTzWcr5ixK
-E0JFJsE=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shb.ais.ucla.edu:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shb.ais.ucla.edu:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California-Los Angeles</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California-Los Angeles</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucla.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Albert Wu</md:GivenName>
-    <md:EmailAddress>albertwu@ucla.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Warren Leung</md:GivenName>
-    <md:EmailAddress>wleung@it.ucla.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Client Support</md:GivenName>
-    <md:EmailAddress>clientsupport@it.ucla.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucmerced.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucmerced.edu.xml
deleted file mode 100644
index 5cf929ff..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucmerced.edu.xml
+++ /dev/null
@@ -1,115 +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="urn:mace:incommon:ucmerced.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">ucmerced.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of California, Merced</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>
-MIIEjDCCA3SgAwIBAgIJAOupCdJ2sSXbMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEpMCcGA1UEChMgVW5pdmVyc2l0
-eSBvZiBDYWxpZm9ybmlhLCBNZXJjZWQxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRl
-Y2hub2xvZ3kxGjAYBgNVBAMTEXNoaWIudWNtZXJjZWQuZWR1MB4XDTEwMDgyMDIx
-NTY1MVoXDTM4MDEwNDIxNTY1MVowgYoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
-YWxpZm9ybmlhMSkwJwYDVQQKEyBVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEsIE1l
-cmNlZDEfMB0GA1UECxMWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEaMBgGA1UEAxMR
-c2hpYi51Y21lcmNlZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDfJkuFl7d2fl92r5hV56rYFJW5bHJGGXjmossXjEfaBVYaxnBC5HpWf2LxKhbm
-ihJt5taV0icxGH8I1Pzc/5vHbWRmAWQPGjv+Zqs3/AbgdG9hwfgDrbFFHfZE7l2n
-dXhmWrjBu+M9CygbVkzTTMeLQ8HmlGeLJQRAixa85SL4j5ZGNGVK5Gi/NFjyuGL2
-TDLBVvmPlwLUM1T66QsCz0ceEm4OT1n1V8y+JQ8YR/bJa6CljdNKKCprFnBkVFhk
-Euybjb2/Mf2D+f0cY5TZntVA5cjWwZPy+3D9MKas/s41B5hZjqFv2mEf1jLYYM6k
-mv4oKL9kSBgGh9+JH+eES3uJAgMBAAGjgfIwge8wHQYDVR0OBBYEFL0bO2LYqE2L
-YMpAErrAY6uTagRFMIG/BgNVHSMEgbcwgbSAFL0bO2LYqE2LYMpAErrAY6uTagRF
-oYGQpIGNMIGKMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEpMCcG
-A1UEChMgVW5pdmVyc2l0eSBvZiBDYWxpZm9ybmlhLCBNZXJjZWQxHzAdBgNVBAsT
-FkluZm9ybWF0aW9uIFRlY2hub2xvZ3kxGjAYBgNVBAMTEXNoaWIudWNtZXJjZWQu
-ZWR1ggkA66kJ0naxJdswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
-lX6J5Df1EUiDuCwlFyRbmgch54ywFsIvKW/q2VfwH8DQePoQqetsm8frHtnKyBjN
-EKPwE63XV79n3mTei6kMFdB/e10SPa5vdOc/kzVvy4a2gBEfH+YPerbAiiAllKfW
-V9lkQ7BGzb8d9guY7ZZvy8BJyNqrcfdcqAETBWYLrJx65UYo4hJZyG/X1JUX3WZ8
-ff2dPd5C7gboKQO4y76D1uEgwR+XEexamlmpLvREfaZMyN3dbpXCjYmvSayBGUgM
-I/HsbnejDezNN+Za/qaXjv+9wsXOGgmF3QQlQsbKXcLHb0eHYqaB604kQ6I+6y5X
-kFhAPTrlZdh9/KLkKhq9QA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ucmerced.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ucmerced.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.ucmerced.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.ucmerced.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.ucmerced.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.ucmerced.edu/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">ucmerced.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEjDCCA3SgAwIBAgIJAOupCdJ2sSXbMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEpMCcGA1UEChMgVW5pdmVyc2l0
-eSBvZiBDYWxpZm9ybmlhLCBNZXJjZWQxHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRl
-Y2hub2xvZ3kxGjAYBgNVBAMTEXNoaWIudWNtZXJjZWQuZWR1MB4XDTEwMDgyMDIx
-NTY1MVoXDTM4MDEwNDIxNTY1MVowgYoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
-YWxpZm9ybmlhMSkwJwYDVQQKEyBVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEsIE1l
-cmNlZDEfMB0GA1UECxMWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEaMBgGA1UEAxMR
-c2hpYi51Y21lcmNlZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQDfJkuFl7d2fl92r5hV56rYFJW5bHJGGXjmossXjEfaBVYaxnBC5HpWf2LxKhbm
-ihJt5taV0icxGH8I1Pzc/5vHbWRmAWQPGjv+Zqs3/AbgdG9hwfgDrbFFHfZE7l2n
-dXhmWrjBu+M9CygbVkzTTMeLQ8HmlGeLJQRAixa85SL4j5ZGNGVK5Gi/NFjyuGL2
-TDLBVvmPlwLUM1T66QsCz0ceEm4OT1n1V8y+JQ8YR/bJa6CljdNKKCprFnBkVFhk
-Euybjb2/Mf2D+f0cY5TZntVA5cjWwZPy+3D9MKas/s41B5hZjqFv2mEf1jLYYM6k
-mv4oKL9kSBgGh9+JH+eES3uJAgMBAAGjgfIwge8wHQYDVR0OBBYEFL0bO2LYqE2L
-YMpAErrAY6uTagRFMIG/BgNVHSMEgbcwgbSAFL0bO2LYqE2LYMpAErrAY6uTagRF
-oYGQpIGNMIGKMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEpMCcG
-A1UEChMgVW5pdmVyc2l0eSBvZiBDYWxpZm9ybmlhLCBNZXJjZWQxHzAdBgNVBAsT
-FkluZm9ybWF0aW9uIFRlY2hub2xvZ3kxGjAYBgNVBAMTEXNoaWIudWNtZXJjZWQu
-ZWR1ggkA66kJ0naxJdswDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
-lX6J5Df1EUiDuCwlFyRbmgch54ywFsIvKW/q2VfwH8DQePoQqetsm8frHtnKyBjN
-EKPwE63XV79n3mTei6kMFdB/e10SPa5vdOc/kzVvy4a2gBEfH+YPerbAiiAllKfW
-V9lkQ7BGzb8d9guY7ZZvy8BJyNqrcfdcqAETBWYLrJx65UYo4hJZyG/X1JUX3WZ8
-ff2dPd5C7gboKQO4y76D1uEgwR+XEexamlmpLvREfaZMyN3dbpXCjYmvSayBGUgM
-I/HsbnejDezNN+Za/qaXjv+9wsXOGgmF3QQlQsbKXcLHb0eHYqaB604kQ6I+6y5X
-kFhAPTrlZdh9/KLkKhq9QA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.ucmerced.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.ucmerced.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California, Merced</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California, Merced</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucmerced.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Greg Fellin</md:GivenName>
-    <md:EmailAddress>gfellin@ucmerced.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Faust Gorham</md:GivenName>
-    <md:EmailAddress>fgorham@ucmerced.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Kamminga</md:GivenName>
-    <md:EmailAddress>jkamminga@ucmerced.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucop.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucop.edu.xml
deleted file mode 100644
index cca6cf40..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucop.edu.xml
+++ /dev/null
@@ -1,99 +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="urn:mace:incommon:ucop.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">ucop.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of California - Office of the President</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>
-MIIDLDCCAhSgAwIBAgIVAMQjUagrFAAc3mU/MM8Y89753FJsMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHVjb3BpZHAudWNvcC5lZHUwHhcNMTEwNDE1MjE0NDQy
-WhcNMzEwNDE1MjE0NDQyWjAbMRkwFwYDVQQDExB1Y29waWRwLnVjb3AuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5yWRcAVFF4lApTgaJ6Wiq4HQ
-cnHxfdZwqWwEeyKGcjhzS3mbaNZAjR37wsnK19npCIunzb966PK8BAXhATX5L7x9
-0+F8qTDL9NWGB2usN4ftkxDjCbHSzQP8/C1+nLdj0EuyxXxbn5etiVn5ScQ+xMHc
-Myo+u2+7crKloeUERtgXV9d8wbMZ+5dNeSjIVBq/EldB1xpo1oSQz5LSZoWppjqR
-j+HDHQNY2rGdyJchd6M5QjtV5/yWZsjhd++9AiD+avAcNkWrF+3Yg5mcRzgHhMtb
-YHZXtb69hJfO+vwQ655wlgN25pw4H0wLB5/GehMAi82hnL3PGnwvgFDrt2uTIwID
-AQABo2cwZTBEBgNVHREEPTA7ghB1Y29waWRwLnVjb3AuZWR1hidodHRwczovL3Vj
-b3BpZHAudWNvcC5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOM/H8+UOT/R
-Dmr2WHQCXELzAZztMA0GCSqGSIb3DQEBBQUAA4IBAQBVzHO+GyiTfvkhMqz29wl5
-6wLckOvYuilJqru9jXZOCzBzpjnK2YbAKmbmDs2BDT3cJfJDDAxM7bZG69mFf+0h
-2qIcgCoZd6054kAEe/T9WloBVRWa2AnQlbtkd3YIkmlCpB6jLNUpkgX6PAVPOpBa
-vEMn/hMWxQb10qaOsGyzp3uXz2aYJgZoEv2qAdVtKpuDSOcPt11A7rwZE4XhVwhb
-hdYDgZJ0gVCbr3oNhiccN7cf790QxrUdTjDq2qSl47S/SpOOLSLH0vflygsdASlb
-r5yHRx2chce62RYQtpM9sBEJjMZ9seBMN3J+y29vdvayfD1mo9Ma56VSHLitFJ9N
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucopidp.ucop.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ucopidp.ucop.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucopidp.ucop.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ucopidp.ucop.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucopidp.ucop.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ucopidp.ucop.edu/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">ucop.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAMQjUagrFAAc3mU/MM8Y89753FJsMA0GCSqGSIb3DQEB
-BQUAMBsxGTAXBgNVBAMTEHVjb3BpZHAudWNvcC5lZHUwHhcNMTEwNDE1MjE0NDQy
-WhcNMzEwNDE1MjE0NDQyWjAbMRkwFwYDVQQDExB1Y29waWRwLnVjb3AuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5yWRcAVFF4lApTgaJ6Wiq4HQ
-cnHxfdZwqWwEeyKGcjhzS3mbaNZAjR37wsnK19npCIunzb966PK8BAXhATX5L7x9
-0+F8qTDL9NWGB2usN4ftkxDjCbHSzQP8/C1+nLdj0EuyxXxbn5etiVn5ScQ+xMHc
-Myo+u2+7crKloeUERtgXV9d8wbMZ+5dNeSjIVBq/EldB1xpo1oSQz5LSZoWppjqR
-j+HDHQNY2rGdyJchd6M5QjtV5/yWZsjhd++9AiD+avAcNkWrF+3Yg5mcRzgHhMtb
-YHZXtb69hJfO+vwQ655wlgN25pw4H0wLB5/GehMAi82hnL3PGnwvgFDrt2uTIwID
-AQABo2cwZTBEBgNVHREEPTA7ghB1Y29waWRwLnVjb3AuZWR1hidodHRwczovL3Vj
-b3BpZHAudWNvcC5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFOM/H8+UOT/R
-Dmr2WHQCXELzAZztMA0GCSqGSIb3DQEBBQUAA4IBAQBVzHO+GyiTfvkhMqz29wl5
-6wLckOvYuilJqru9jXZOCzBzpjnK2YbAKmbmDs2BDT3cJfJDDAxM7bZG69mFf+0h
-2qIcgCoZd6054kAEe/T9WloBVRWa2AnQlbtkd3YIkmlCpB6jLNUpkgX6PAVPOpBa
-vEMn/hMWxQb10qaOsGyzp3uXz2aYJgZoEv2qAdVtKpuDSOcPt11A7rwZE4XhVwhb
-hdYDgZJ0gVCbr3oNhiccN7cf790QxrUdTjDq2qSl47S/SpOOLSLH0vflygsdASlb
-r5yHRx2chce62RYQtpM9sBEJjMZ9seBMN3J+y29vdvayfD1mo9Ma56VSHLitFJ9N
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ucopidp.ucop.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ucopidp.ucop.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California - Office of the President</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California - Office of the President</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucop.edu/welcome.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UCOP DataCenter HelpDesk</md:GivenName>
-    <md:EmailAddress>ucopdatacenter.helpdesk@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Munish Malik</md:GivenName>
-    <md:EmailAddress>aig@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Paul Weiss</md:GivenName>
-    <md:EmailAddress>Paul.Weiss@ucop.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucr.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucr.edu.xml
deleted file mode 100644
index e53c72d2..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucr.edu.xml
+++ /dev/null
@@ -1,111 +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="urn:mace:incommon:ucr.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">ucr.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of California, Riverside</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>
-MIIEZTCCA02gAwIBAgIJALzIMRTIUwPtMA0GCSqGSIb3DQEBCwUAMIHIMQswCQYD
-VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTESMBAGA1UEBwwJUml2ZXJzaWRl
-MSswKQYDVQQKDCJVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEtUml2ZXJzaWRlMSUw
-IwYDVQQLDBxDb21wdXRpbmcgYW5kIENvbW11bmljYXRpb25zMRswGQYDVQQDDBJz
-aGliYm9sZXRoLnVjci5lZHUxHzAdBgkqhkiG9w0BCQEWEHNlY3VyaXR5QHVjci5l
-ZHUwHhcNMTUwOTA4MjAwNTI5WhcNMzUwOTA4MjAwNTI5WjCByDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExEjAQBgNVBAcMCVJpdmVyc2lkZTErMCkG
-A1UECgwiVW5pdmVyc2l0eSBvZiBDYWxpZm9ybmlhLVJpdmVyc2lkZTElMCMGA1UE
-CwwcQ29tcHV0aW5nIGFuZCBDb21tdW5pY2F0aW9uczEbMBkGA1UEAwwSc2hpYmJv
-bGV0aC51Y3IuZWR1MR8wHQYJKoZIhvcNAQkBFhBzZWN1cml0eUB1Y3IuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyUB1AMri5IiVo6GySiX6rr9m
-cvaeDmJXBAoYKWKKPVYfCVmnEKZT/I57ptat6w93SjdUhH93KLIQxG0VHx2cI6+Y
-DrnPlaws8SxBTjlfrSd7qseJz9lfUVq3ON+ZFev8Oicgr+8dwdTx2ZGD10tGL0gH
-HZKSw9WQg6wRSiEblzsS6xtGhBl6iun8NN5oo1iX64BbWeZYmiuTH7ZBW7iPpZ66
-VoxzJmwLhVRsQoPHoyYSaPsv4sMbxffFWPRq8dbK5EnkNeskxpk5Lrbtluj0hO32
-7ukrQPCVUqmuFupxUHdI4QDvd/ReGNJP5kc+EcH3F1bbHVnIBF+PthgYhZ4m1QID
-AQABo1AwTjAdBgNVHQ4EFgQUMg83lOH2UbhQXQhVkwOmCPeGrkYwHwYDVR0jBBgw
-FoAUMg83lOH2UbhQXQhVkwOmCPeGrkYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAQEAxQZKevQZ4iWqJEHUDhiB+A4jsbJCkv0CayM98Dppxr2nY/aO7tM2
-knqNV9LPEtIOlJmAVkXKaHKvMHunhx30ZiCP/cyTIamixfC1EkWa+HzYeMbVrGa2
-gSmXzPs40Kgi//xz7NdpzOqeAOTs93bc1t4POxMIW3RhOV4laPo1D8gfnPU++x8P
-/yhF4xmWiZ/ER/cwYhwMW8WyvvRXB8j1z18A9zjMmc14UHxXb9G4lKSqeDeCw0qR
-0pZ4Ba363uq9XWfUjRFlaixqMfE1b2jfjut1FbPLfzLvJ4EblJTkcGNw3DSdLB6w
-//p7tc4jkdSFr1zQgNUxNgjR4gh6fruSSg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucr.edu:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.ucr.edu/shibboleth-idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.ucr.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.ucr.edu/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.ucr.edu/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucr.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEZTCCA02gAwIBAgIJALzIMRTIUwPtMA0GCSqGSIb3DQEBCwUAMIHIMQswCQYD
-VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTESMBAGA1UEBwwJUml2ZXJzaWRl
-MSswKQYDVQQKDCJVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEtUml2ZXJzaWRlMSUw
-IwYDVQQLDBxDb21wdXRpbmcgYW5kIENvbW11bmljYXRpb25zMRswGQYDVQQDDBJz
-aGliYm9sZXRoLnVjci5lZHUxHzAdBgkqhkiG9w0BCQEWEHNlY3VyaXR5QHVjci5l
-ZHUwHhcNMTUwOTA4MjAwNTI5WhcNMzUwOTA4MjAwNTI5WjCByDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExEjAQBgNVBAcMCVJpdmVyc2lkZTErMCkG
-A1UECgwiVW5pdmVyc2l0eSBvZiBDYWxpZm9ybmlhLVJpdmVyc2lkZTElMCMGA1UE
-CwwcQ29tcHV0aW5nIGFuZCBDb21tdW5pY2F0aW9uczEbMBkGA1UEAwwSc2hpYmJv
-bGV0aC51Y3IuZWR1MR8wHQYJKoZIhvcNAQkBFhBzZWN1cml0eUB1Y3IuZWR1MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyUB1AMri5IiVo6GySiX6rr9m
-cvaeDmJXBAoYKWKKPVYfCVmnEKZT/I57ptat6w93SjdUhH93KLIQxG0VHx2cI6+Y
-DrnPlaws8SxBTjlfrSd7qseJz9lfUVq3ON+ZFev8Oicgr+8dwdTx2ZGD10tGL0gH
-HZKSw9WQg6wRSiEblzsS6xtGhBl6iun8NN5oo1iX64BbWeZYmiuTH7ZBW7iPpZ66
-VoxzJmwLhVRsQoPHoyYSaPsv4sMbxffFWPRq8dbK5EnkNeskxpk5Lrbtluj0hO32
-7ukrQPCVUqmuFupxUHdI4QDvd/ReGNJP5kc+EcH3F1bbHVnIBF+PthgYhZ4m1QID
-AQABo1AwTjAdBgNVHQ4EFgQUMg83lOH2UbhQXQhVkwOmCPeGrkYwHwYDVR0jBBgw
-FoAUMg83lOH2UbhQXQhVkwOmCPeGrkYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAQEAxQZKevQZ4iWqJEHUDhiB+A4jsbJCkv0CayM98Dppxr2nY/aO7tM2
-knqNV9LPEtIOlJmAVkXKaHKvMHunhx30ZiCP/cyTIamixfC1EkWa+HzYeMbVrGa2
-gSmXzPs40Kgi//xz7NdpzOqeAOTs93bc1t4POxMIW3RhOV4laPo1D8gfnPU++x8P
-/yhF4xmWiZ/ER/cwYhwMW8WyvvRXB8j1z18A9zjMmc14UHxXb9G4lKSqeDeCw0qR
-0pZ4Ba363uq9XWfUjRFlaixqMfE1b2jfjut1FbPLfzLvJ4EblJTkcGNw3DSdLB6w
-//p7tc4jkdSFr1zQgNUxNgjR4gh6fruSSg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.ucr.edu:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California, Riverside</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California, Riverside</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucr.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>UCR Shibboleth Administrators</md:GivenName>
-    <md:EmailAddress>shibboleth@ucr.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UCR Shibboleth Administrators</md:GivenName>
-    <md:EmailAddress>shibboleth@ucr.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UCR Helpdesk</md:GivenName>
-    <md:EmailAddress>helpdesk@ucr.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucsb.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucsb.edu.xml
deleted file mode 100644
index 10d2ea0a..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucsb.edu.xml
+++ /dev/null
@@ -1,120 +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="urn:mace:incommon:ucsb.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">ucsb.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of California-Santa Barbara</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UCSB is a public research university within the University of California system. It is located on the California coast about 100 miles northwest of Los Angeles.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ucsb.edu/campus/index.shtml</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.ucsb.edu/policies/index.shtml</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>
-MIIEwzCCA6ugAwIBAgIJALXsPc8MIWgFMA0GCSqGSIb3DQEBBQUAMIHlMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FudGEgQmFy
-YmFyYTEwMC4GA1UEChMnVW5pdmVyc2l0eSBvZiBDYWxpZm9ybmlhLCBTYW50YSBC
-YXJiYXJhMScwJQYDVQQLEx5FbnRlcnByaXNlIFRlY2hub2xvZ3kgU2VydmljZXMx
-IzAhBgNVBAMTGnBhc3Nwb3J0LmlkZW50aXR5LnVjc2IuZWR1MSkwJwYJKoZIhvcN
-AQkBFhpzeXNhZG1pbkBpZGVudGl0eS51Y3NiLmVkdTAeFw0xNDAzMTcyMzM4NDFa
-Fw0zNDAzMTcyMzM4NDFaMIHlMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZv
-cm5pYTEWMBQGA1UEBxMNU2FudGEgQmFyYmFyYTEwMC4GA1UEChMnVW5pdmVyc2l0
-eSBvZiBDYWxpZm9ybmlhLCBTYW50YSBCYXJiYXJhMScwJQYDVQQLEx5FbnRlcnBy
-aXNlIFRlY2hub2xvZ3kgU2VydmljZXMxIzAhBgNVBAMTGnBhc3Nwb3J0LmlkZW50
-aXR5LnVjc2IuZWR1MSkwJwYJKoZIhvcNAQkBFhpzeXNhZG1pbkBpZGVudGl0eS51
-Y3NiLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJs7aac3RDir
-o1na35ngbZ6ANQ0bY8GigpXb7UfKDqQ8lpSVEqJm6LPbmhstiPQ1MopFM2x25A4T
-jRPgNEChb4GWMbblRZkF/bBDFNykLgxgcS5+IRu8lQRME5karb3VFNZhhFic8X6s
-fQd+k0Z1DbVw/cLP3kzgcVu24dBAynWhN0Heuu5x1OUeNiE19mxxKjfLZqvCjLd6
-wyp1P+5huidqT8Svx5pG0j19zHTRrlFU7t/gCVgGNgfE6aaA+YcryOkfwdVKS1RS
-XbcwBSvCch366OUEdE1oU5L7hkB5EQMCRgCcnS8J9m1Nlw6VvmPN/1r9Il1nK0Km
-VVCPELTliIUCAwEAAaN0MHIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwWAYDVR0R
-BFEwT4IacGFzc3BvcnQuaWRlbnRpdHkudWNzYi5lZHWGMWh0dHBzOi8vcGFzc3Bv
-cnQuaWRlbnRpdHkudWNzYi5lZHUvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEF
-BQADggEBAHhc3LxPiz0Aw+0mhWbIBFCT9BxRc2//mDbaC/2bFKCeHL3ffd3ND3Ad
-EB7sme6ApKgzcT6m29dTHGc0FLWAfn+vQEOLZFhdxYlKEwo6luLuR/urktY1YVZm
-vV/kS9sFxlQJAAA01oZIOP5vryMW0g6+2cCC3GQDJFr4B4MJ0b+2Ubvzogjh6O2U
-WfybDi2fQ7QNKkIkh4yGi58Ole9wS7V8p1tchlKFCGiApnyeYj7Cy0MjuSC64FUj
-Ls6JGZp/+BoiS9inWJItj8ZjPY7cGaN1TD5hzeNxfThwJAenGSJS0nr3B4wh+5kb
-KFf7dOk/JbGUoqizayuf7Ucaf5A5MzI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport.identity.ucsb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport.identity.ucsb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://passport.identity.ucsb.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passport.identity.ucsb.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passport.identity.ucsb.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://passport.identity.ucsb.edu/idp/profile/SAML2/POST-SimpleSign/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">ucsb.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEwzCCA6ugAwIBAgIJALXsPc8MIWgFMA0GCSqGSIb3DQEBBQUAMIHlMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FudGEgQmFy
-YmFyYTEwMC4GA1UEChMnVW5pdmVyc2l0eSBvZiBDYWxpZm9ybmlhLCBTYW50YSBC
-YXJiYXJhMScwJQYDVQQLEx5FbnRlcnByaXNlIFRlY2hub2xvZ3kgU2VydmljZXMx
-IzAhBgNVBAMTGnBhc3Nwb3J0LmlkZW50aXR5LnVjc2IuZWR1MSkwJwYJKoZIhvcN
-AQkBFhpzeXNhZG1pbkBpZGVudGl0eS51Y3NiLmVkdTAeFw0xNDAzMTcyMzM4NDFa
-Fw0zNDAzMTcyMzM4NDFaMIHlMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZv
-cm5pYTEWMBQGA1UEBxMNU2FudGEgQmFyYmFyYTEwMC4GA1UEChMnVW5pdmVyc2l0
-eSBvZiBDYWxpZm9ybmlhLCBTYW50YSBCYXJiYXJhMScwJQYDVQQLEx5FbnRlcnBy
-aXNlIFRlY2hub2xvZ3kgU2VydmljZXMxIzAhBgNVBAMTGnBhc3Nwb3J0LmlkZW50
-aXR5LnVjc2IuZWR1MSkwJwYJKoZIhvcNAQkBFhpzeXNhZG1pbkBpZGVudGl0eS51
-Y3NiLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJs7aac3RDir
-o1na35ngbZ6ANQ0bY8GigpXb7UfKDqQ8lpSVEqJm6LPbmhstiPQ1MopFM2x25A4T
-jRPgNEChb4GWMbblRZkF/bBDFNykLgxgcS5+IRu8lQRME5karb3VFNZhhFic8X6s
-fQd+k0Z1DbVw/cLP3kzgcVu24dBAynWhN0Heuu5x1OUeNiE19mxxKjfLZqvCjLd6
-wyp1P+5huidqT8Svx5pG0j19zHTRrlFU7t/gCVgGNgfE6aaA+YcryOkfwdVKS1RS
-XbcwBSvCch366OUEdE1oU5L7hkB5EQMCRgCcnS8J9m1Nlw6VvmPN/1r9Il1nK0Km
-VVCPELTliIUCAwEAAaN0MHIwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwWAYDVR0R
-BFEwT4IacGFzc3BvcnQuaWRlbnRpdHkudWNzYi5lZHWGMWh0dHBzOi8vcGFzc3Bv
-cnQuaWRlbnRpdHkudWNzYi5lZHUvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEF
-BQADggEBAHhc3LxPiz0Aw+0mhWbIBFCT9BxRc2//mDbaC/2bFKCeHL3ffd3ND3Ad
-EB7sme6ApKgzcT6m29dTHGc0FLWAfn+vQEOLZFhdxYlKEwo6luLuR/urktY1YVZm
-vV/kS9sFxlQJAAA01oZIOP5vryMW0g6+2cCC3GQDJFr4B4MJ0b+2Ubvzogjh6O2U
-WfybDi2fQ7QNKkIkh4yGi58Ole9wS7V8p1tchlKFCGiApnyeYj7Cy0MjuSC64FUj
-Ls6JGZp/+BoiS9inWJItj8ZjPY7cGaN1TD5hzeNxfThwJAenGSJS0nr3B4wh+5kb
-KFf7dOk/JbGUoqizayuf7Ucaf5A5MzI=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://passport.identity.ucsb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passport.identity.ucsb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California-Santa Barbara</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California-Santa Barbara</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucsb.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Matthew Dunham</md:GivenName>
-    <md:EmailAddress>matthew.dunham@ucsb.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Identity Services Operations</md:GivenName>
-    <md:EmailAddress>sysadmin@identity.ucsb.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Identity Service Support</md:GivenName>
-    <md:EmailAddress>help@identity.ucsb.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucsc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucsc.edu.xml
deleted file mode 100644
index 410b77c4..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucsc.edu.xml
+++ /dev/null
@@ -1,113 +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="urn:mace:incommon:ucsc.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">ucsc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of California, Santa Cruz</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.ucsc.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://policy.ucsc.edu</mdui:PrivacyStatementURL>
-        <mdui:Logo height="129" width="400" xml:lang="en">https://www2.ucsc.edu/shibboleth-sp/logo.jpg</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>
-MIIDmDCCAoACCQDLTquv7ZdiLTANBgkqhkiG9w0BAQsFADCBjTELMAkGA1UEBhMC
-VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExEzARBgNVBAcMClNhbnRhIENydXoxLTAr
-BgNVBAoMJFVuaXZlcnNpdHkgb2YgQ2FsaWZvcm5pYSwgU2FudGEgQ3J1ejEMMAoG
-A1UECwwDSVRTMRcwFQYDVQQDDA5sb2dpbi51Y3NjLmVkdTAeFw0xNTA2MDIyMzE3
-NDJaFw0yMDA1MzEyMzE3NDJaMIGNMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2Fs
-aWZvcm5pYTETMBEGA1UEBwwKU2FudGEgQ3J1ejEtMCsGA1UECgwkVW5pdmVyc2l0
-eSBvZiBDYWxpZm9ybmlhLCBTYW50YSBDcnV6MQwwCgYDVQQLDANJVFMxFzAVBgNV
-BAMMDmxvZ2luLnVjc2MuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAs8RybvRl9WBJDpXGOsoBrEfFKsAuwnz0sSFmjI4zkkV7WXuX2lLbBPhOnJdK
-brXL11J6mDZgf8ydhH31nJJvP98bHo0LQIXe2t1dfLVinhtpOy3TQguQ7Biipwe4
-g0E+HI4U9ndL7jEO/Xf2diMGCSOKyZjSubSYFpgXj0ORpvixqsAId0R0JLA4Xf4O
-V8+l6BqlB7DwzzeZcf49pSq8CCP8QkgU3DzaemNM6Yvqtu1cTpYJ9HqRV2aRGj+G
-OOMVshmJ+8iDr02U5jh+0E+5485lNKb7gWHNA7kLa0QBWm4eBAU0DYQzgnuVG2Oe
-HpP1mKsc77wBkfScyGlOcKvCNQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAZBRvJ
-sHdjLTtoPfa8MuuL3KcyE9dj9rWHeyrnEuWuMfhO95BN6utPkneoOsDKZORHDAVE
-LTrZ4E4iq36xLWarv+37jh2U7EFFqW4zVm/0Pmoa+NtnKTs78tF80n4+Zwt2iPSI
-JS0ZPHiNl2XYjNb7auwUK2XvpqBqh8rP63+nSEHmgFOzg01nWoJz2Q0uQ7C0mEV6
-aai0jp7M5se6pgnauX2g28ZyFORa5H0DO8Ku0SY8l9lTKRgXgsEOk8b2jJwuYnHu
-2dafiqrLOkdpKFPczD6ZGIx6eofqKmMeT4x+rZSvIZsq1j1wRw04gzQTHWCuEb+a
-N4x9ogtc8tHKC0O7
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.ucsc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ucsc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.ucsc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ucsc.edu/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">ucsc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDmDCCAoACCQDLTquv7ZdiLTANBgkqhkiG9w0BAQsFADCBjTELMAkGA1UEBhMC
-VVMxEzARBgNVBAgMCkNhbGlmb3JuaWExEzARBgNVBAcMClNhbnRhIENydXoxLTAr
-BgNVBAoMJFVuaXZlcnNpdHkgb2YgQ2FsaWZvcm5pYSwgU2FudGEgQ3J1ejEMMAoG
-A1UECwwDSVRTMRcwFQYDVQQDDA5sb2dpbi51Y3NjLmVkdTAeFw0xNTA2MDIyMzE3
-NDJaFw0yMDA1MzEyMzE3NDJaMIGNMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2Fs
-aWZvcm5pYTETMBEGA1UEBwwKU2FudGEgQ3J1ejEtMCsGA1UECgwkVW5pdmVyc2l0
-eSBvZiBDYWxpZm9ybmlhLCBTYW50YSBDcnV6MQwwCgYDVQQLDANJVFMxFzAVBgNV
-BAMMDmxvZ2luLnVjc2MuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAs8RybvRl9WBJDpXGOsoBrEfFKsAuwnz0sSFmjI4zkkV7WXuX2lLbBPhOnJdK
-brXL11J6mDZgf8ydhH31nJJvP98bHo0LQIXe2t1dfLVinhtpOy3TQguQ7Biipwe4
-g0E+HI4U9ndL7jEO/Xf2diMGCSOKyZjSubSYFpgXj0ORpvixqsAId0R0JLA4Xf4O
-V8+l6BqlB7DwzzeZcf49pSq8CCP8QkgU3DzaemNM6Yvqtu1cTpYJ9HqRV2aRGj+G
-OOMVshmJ+8iDr02U5jh+0E+5485lNKb7gWHNA7kLa0QBWm4eBAU0DYQzgnuVG2Oe
-HpP1mKsc77wBkfScyGlOcKvCNQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAZBRvJ
-sHdjLTtoPfa8MuuL3KcyE9dj9rWHeyrnEuWuMfhO95BN6utPkneoOsDKZORHDAVE
-LTrZ4E4iq36xLWarv+37jh2U7EFFqW4zVm/0Pmoa+NtnKTs78tF80n4+Zwt2iPSI
-JS0ZPHiNl2XYjNb7auwUK2XvpqBqh8rP63+nSEHmgFOzg01nWoJz2Q0uQ7C0mEV6
-aai0jp7M5se6pgnauX2g28ZyFORa5H0DO8Ku0SY8l9lTKRgXgsEOk8b2jJwuYnHu
-2dafiqrLOkdpKFPczD6ZGIx6eofqKmMeT4x+rZSvIZsq1j1wRw04gzQTHWCuEb+a
-N4x9ogtc8tHKC0O7
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ucsc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ucsc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California, Santa Cruz</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California, Santa Cruz</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucsc.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jeffrey Crawford</md:GivenName>
-    <md:EmailAddress>jeffreyc@ucsc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UCSC Support Center</md:GivenName>
-    <md:EmailAddress>help@ucsc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Security and Compliance</md:GivenName>
-    <md:EmailAddress>abuse@ucsc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kari Robertson</md:GivenName>
-    <md:EmailAddress>kari@ucsc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucsd.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucsd.edu.xml
deleted file mode 100644
index 8b0674aa..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucsd.edu.xml
+++ /dev/null
@@ -1,168 +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="urn:mace:incommon:ucsd.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">ucsd.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of California-San Diego</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>
-MIIFjzCCBHegAwIBAgICAQwwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA4MDIyODIxMTg0NFoXDTEwMDIy
-ODIxMTg0NFowFjEUMBIGA1UEAxMLYTQudWNzZC5lZHUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDcEzH+KYmuGSDjlZeaOJc8VJS0/bRBjfE6HHDV9nN8
-ghEm5AMS5OPx/ruM+5gchwuryogOMY7abSe3BpvVT/3A+fjKSNnklMPmQUuO6AqW
-7a6/w9w30tl/2OzG3u1sGAr1FkEXf/DmJOtXpAOhPAmyYb6o41k+ZwpvnRuyaoup
-IC1R5LLU2jCnnZCxBF6gvDlvmpaEO2c2aHrKJIaqxDuVhTDJRWp+IkcT8Jy4JAwv
-0R1w8FJXLyZ0RVeNL8v3ZcCzInfxsS1/+FuOOHitZ18WO4Ds5PJ5tEzree95EGe+
-U9dpjMrJQDdKiqPE18K7cQGuHfVkIMkU4phuyUXWKk09AgMBAAGjggKlMIICoTAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwHQYDVR0OBBYEFPe85gpJxg5DPieEeNZF9FHWbW0rMH4GA1Ud
-IwR3MHWAFJMtyGEYrWPjm2Wznd2Nk7rnymNFoVqkWDBWMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24g
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHmCAQAwgboGCCsGAQUFBwEBBIGtMIGqMIGn
-BggrBgEFBQcwAoaBmmh0dHA6Ly9pbmNvbW1vbmNhMS5pbmNvbW1vbmZlZGVyYXRp
-b24ub3JnL2JyaWRnZS9jZXJ0cy9jYS1jZXJ0cy5wN2IKCQlDQSBJc3N1ZXJzIC0g
-VVJJOmh0dHA6Ly9pbmNvbW1vbmNhMi5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2Jy
-aWRnZS9jZXJ0cy9jYS1jZXJ0cy5wN2IwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
-cDovL2luY29tbW9uY3JsMS5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2NybC9lZWNy
-bHMuY3JsMD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwyLmluY29tbW9uZmVkZXJh
-dGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwXgYDVR0gBFcwVTBTBgsrBgEEAa4jAQQB
-ATBEMEIGCCsGAQUFBwIBFjZodHRwOi8vaW5jb21tb25jYS5pbmNvbW1vbmZlZGVy
-YXRpb24ub3JnL3ByYWN0aWNlcy5wZGYwFgYDVR0RBA8wDYILYTQudWNzZC5lZHUw
-DQYJKoZIhvcNAQEFBQADggEBAJeIDxI87H9yjtD8BLdiwEBsyKiADqL4jo2EeF9Z
-kz6GA89zEUXaL6M+UeWaHwrpbKbpR7JYb87qJhFYzCBBdLjUpHnvHI1M1/wl44XF
-/W8PpcuDF5vZmVDxYmKEJQJHnvRqOU08vIvk5bpgcI8ctNXUDWh9uEdtKMrg3+Tk
-gKCmAXAl9I6SOrnEy98RJ7yWL51qXHaWE5xXl9dTCh43JONZWlsah0smeDYkYhZq
-7g+zU6RW3i/LigqVYW84V0+WH30htKco5uwr0SGoL9u8PGbYPgrRtCJIo5r8eE7N
-R1kv+lykb9hrz1KUyDvLTDhWQ7l4bXDaP7/dIpaTrtd0zC4=
-          </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>
-MIIDJjCCAg6gAwIBAgIJAPn3wXbFGjOZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2E0LnVjc2QuZWR1MB4XDTEwMDQwODIyNDcwOVoXDTIwMDQwNTIyNDcwOVow
-FjEUMBIGA1UEAxMLYTQudWNzZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDUEpd4l0/TgMjGp8nyEA3eyMDB001MZIq/u9wjSNsPFoXGudwyRryf
-B+yKk4MTX/VqQ6cMZ1oFjP1h1phl5xWG1PZu2vXpjJuHb5X1J4GCK2u7j5mwN6zK
-/ekTVI4X/0ALe7uPE6ltcKd1XQctZfCe27e+cUdbqz3y16s+RWyUrC2pRK2aJuxm
-hR7rxMwAcpUYBrINqvoGAz7MIBZ2MNwNlMNK2scGBLsdahBG/JZk0PUYiwRxA1aq
-YAEeOsuR6jVhudDOAfTK/XtWneUrO0G0C3fCVmX5MGrUCPIY/cVAbuNBLGYDjg1+
-7iazyImK4nbgXQzBd7QfLayuITY5pludAgMBAAGjdzB1MB0GA1UdDgQWBBTIPcIR
-7y/+BZAKv3XBLkJsAw0l9DBGBgNVHSMEPzA9gBTIPcIR7y/+BZAKv3XBLkJsAw0l
-9KEapBgwFjEUMBIGA1UEAxMLYTQudWNzZC5lZHWCCQD598F2xRozmTAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAwB9Fwts/0sEse6XtafnaYxoAukZwS
-CpbUv+LOLgwmFgLCm+eo9kCvbTTS4JZ3Ctz9/yGfRIcNygWsALSeBvpXmNA0gI/V
-CcsFrrllX1SrpIz5yuwHRZcj1WDDvAzqanvjXGT+2BxmjYS7E25XG+eMC0JlzxLV
-4PKbKEVZlfBEoRSZ/8wS2MqtZm2COZ21PRBHyfkxopkKpdqImQksx36nvEj4Ow6H
-ua34fsQvpcou9ufs1WPqLRTD6AVU1ZrGFdFFAOFY8mG6BEDEplp0Jpn8knxtc2Cg
-Y8R3vksytTmgdqrqYKEpA/CP8EUxyRB3IGOdZ3cJgxabq5X2FBWEFU8y
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://a4.ucsd.edu/tritON/HS"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://a4.ucsd.edu/tritON/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://a4.ucsd.edu/tritON/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">ucsd.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFjzCCBHegAwIBAgICAQwwDQYJKoZIhvcNAQEFBQAwVjELMAkGA1UEBhMCVVMx
-HDAaBgNVBAoTE0luQ29tbW9uIEZlZGVyYXRpb24xKTAnBgNVBAMTIEluQ29tbW9u
-IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA4MDIyODIxMTg0NFoXDTEwMDIy
-ODIxMTg0NFowFjEUMBIGA1UEAxMLYTQudWNzZC5lZHUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDcEzH+KYmuGSDjlZeaOJc8VJS0/bRBjfE6HHDV9nN8
-ghEm5AMS5OPx/ruM+5gchwuryogOMY7abSe3BpvVT/3A+fjKSNnklMPmQUuO6AqW
-7a6/w9w30tl/2OzG3u1sGAr1FkEXf/DmJOtXpAOhPAmyYb6o41k+ZwpvnRuyaoup
-IC1R5LLU2jCnnZCxBF6gvDlvmpaEO2c2aHrKJIaqxDuVhTDJRWp+IkcT8Jy4JAwv
-0R1w8FJXLyZ0RVeNL8v3ZcCzInfxsS1/+FuOOHitZ18WO4Ds5PJ5tEzree95EGe+
-U9dpjMrJQDdKiqPE18K7cQGuHfVkIMkU4phuyUXWKk09AgMBAAGjggKlMIICoTAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwHQYDVR0OBBYEFPe85gpJxg5DPieEeNZF9FHWbW0rMH4GA1Ud
-IwR3MHWAFJMtyGEYrWPjm2Wznd2Nk7rnymNFoVqkWDBWMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTSW5Db21tb24gRmVkZXJhdGlvbjEpMCcGA1UEAxMgSW5Db21tb24g
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHmCAQAwgboGCCsGAQUFBwEBBIGtMIGqMIGn
-BggrBgEFBQcwAoaBmmh0dHA6Ly9pbmNvbW1vbmNhMS5pbmNvbW1vbmZlZGVyYXRp
-b24ub3JnL2JyaWRnZS9jZXJ0cy9jYS1jZXJ0cy5wN2IKCQlDQSBJc3N1ZXJzIC0g
-VVJJOmh0dHA6Ly9pbmNvbW1vbmNhMi5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2Jy
-aWRnZS9jZXJ0cy9jYS1jZXJ0cy5wN2IwgY0GA1UdHwSBhTCBgjA/oD2gO4Y5aHR0
-cDovL2luY29tbW9uY3JsMS5pbmNvbW1vbmZlZGVyYXRpb24ub3JnL2NybC9lZWNy
-bHMuY3JsMD+gPaA7hjlodHRwOi8vaW5jb21tb25jcmwyLmluY29tbW9uZmVkZXJh
-dGlvbi5vcmcvY3JsL2VlY3Jscy5jcmwwXgYDVR0gBFcwVTBTBgsrBgEEAa4jAQQB
-ATBEMEIGCCsGAQUFBwIBFjZodHRwOi8vaW5jb21tb25jYS5pbmNvbW1vbmZlZGVy
-YXRpb24ub3JnL3ByYWN0aWNlcy5wZGYwFgYDVR0RBA8wDYILYTQudWNzZC5lZHUw
-DQYJKoZIhvcNAQEFBQADggEBAJeIDxI87H9yjtD8BLdiwEBsyKiADqL4jo2EeF9Z
-kz6GA89zEUXaL6M+UeWaHwrpbKbpR7JYb87qJhFYzCBBdLjUpHnvHI1M1/wl44XF
-/W8PpcuDF5vZmVDxYmKEJQJHnvRqOU08vIvk5bpgcI8ctNXUDWh9uEdtKMrg3+Tk
-gKCmAXAl9I6SOrnEy98RJ7yWL51qXHaWE5xXl9dTCh43JONZWlsah0smeDYkYhZq
-7g+zU6RW3i/LigqVYW84V0+WH30htKco5uwr0SGoL9u8PGbYPgrRtCJIo5r8eE7N
-R1kv+lykb9hrz1KUyDvLTDhWQ7l4bXDaP7/dIpaTrtd0zC4=
-          </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>
-MIIDJjCCAg6gAwIBAgIJAPn3wXbFGjOZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2E0LnVjc2QuZWR1MB4XDTEwMDQwODIyNDcwOVoXDTIwMDQwNTIyNDcwOVow
-FjEUMBIGA1UEAxMLYTQudWNzZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDUEpd4l0/TgMjGp8nyEA3eyMDB001MZIq/u9wjSNsPFoXGudwyRryf
-B+yKk4MTX/VqQ6cMZ1oFjP1h1phl5xWG1PZu2vXpjJuHb5X1J4GCK2u7j5mwN6zK
-/ekTVI4X/0ALe7uPE6ltcKd1XQctZfCe27e+cUdbqz3y16s+RWyUrC2pRK2aJuxm
-hR7rxMwAcpUYBrINqvoGAz7MIBZ2MNwNlMNK2scGBLsdahBG/JZk0PUYiwRxA1aq
-YAEeOsuR6jVhudDOAfTK/XtWneUrO0G0C3fCVmX5MGrUCPIY/cVAbuNBLGYDjg1+
-7iazyImK4nbgXQzBd7QfLayuITY5pludAgMBAAGjdzB1MB0GA1UdDgQWBBTIPcIR
-7y/+BZAKv3XBLkJsAw0l9DBGBgNVHSMEPzA9gBTIPcIR7y/+BZAKv3XBLkJsAw0l
-9KEapBgwFjEUMBIGA1UEAxMLYTQudWNzZC5lZHWCCQD598F2xRozmTAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAwB9Fwts/0sEse6XtafnaYxoAukZwS
-CpbUv+LOLgwmFgLCm+eo9kCvbTTS4JZ3Ctz9/yGfRIcNygWsALSeBvpXmNA0gI/V
-CcsFrrllX1SrpIz5yuwHRZcj1WDDvAzqanvjXGT+2BxmjYS7E25XG+eMC0JlzxLV
-4PKbKEVZlfBEoRSZ/8wS2MqtZm2COZ21PRBHyfkxopkKpdqImQksx36nvEj4Ow6H
-ua34fsQvpcou9ufs1WPqLRTD6AVU1ZrGFdFFAOFY8mG6BEDEplp0Jpn8knxtc2Cg
-Y8R3vksytTmgdqrqYKEpA/CP8EUxyRB3IGOdZ3cJgxabq5X2FBWEFU8y
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://a4.ucsd.edu:8443/tritON/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://a4.ucsd.edu:8443/tritON/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California-San Diego</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California-San Diego</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucsd.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ACT Help Desk</md:GivenName>
-    <md:EmailAddress>acthelp@ucsd.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth/IDM Support</md:GivenName>
-    <md:EmailAddress>shibsupport@ucsd.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-ucsf.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-ucsf.edu.xml
deleted file mode 100644
index 36961780..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-ucsf.edu.xml
+++ /dev/null
@@ -1,105 +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="urn:mace:incommon:ucsf.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://dp.ucsf.edu/idp/profile/error.jsp" 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">ucsf.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of California, San Francisco</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>
-MIIDFzCCAf+gAwIBAgIUW2hLRYSTq6yflHpRZ5ZBXty14rYwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLZHAudWNzZi5lZHUwHhcNMDkwODI5MDQwMzU5WhcNMjkw
-ODI5MDQwMzU5WjAWMRQwEgYDVQQDEwtkcC51Y3NmLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAK+WY9j/fuMEQ2u4mKKeU5LXO+mi7BKKkJP3PUN0
-Iz4whL/M9uTR+C7x6DCVbi4CXNia8hmoNbWIKCKto9UJT/e+Y4y+dZjC4TLcIvdU
-og7x4/3qlcwI76jkomyL5uy2/7Ow+l/pmX99wph+K4/d8EpwE3NTXcFOVv1D8M3p
-UrVEfT1aoAm7p4SXS3uohM7KDXTljqtxImt/Q+cRFBImNyp7YTFp37024eMwtNfL
-JxEajodIFOCCYP6DmN5I1RWTF808BPPbkt7agjuz50pCdXHxfgnCfUmHeeUz4yLI
-6cgOWkB9JISN567vAH68IInM9with782aIsVLf2Fs5pQqxECAwEAAaNdMFswOgYD
-VR0RBDMwMYILZHAudWNzZi5lZHWGImh0dHBzOi8vZHAudWNzZi5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFDfsmZZFJeq4xHogyRDy+1N69EEKMA0GCSqGSIb3
-DQEBBQUAA4IBAQBiK5W3RyQc/LL+FOy9mQIFzmobtJCGYUHwn/jMzZ+FdiV688MO
-A94AHGnxlvjjlVE7sjI83XgUK80IpLWz1QtCN9Pcwo5M0tNCxOFAkIe1xRadZmN4
-LpFOenH8vd5TF7DjrozFivFC4+l/mTTW4hfl+RaR34zgrzBAv+fUNrq7cNrid11w
-0h17HNqD964TR4QphmFyIrFR9skSs+41ScRMa4c7Svel8p4f+ptoATHSlSm0OZay
-jktgJp4o+Ld8xiH8Q5oLQ/qNG0hx9IRMaum9h0HCnxwHKsrxcJW2/A/CVhaVlj4J
-p/B3Zs13i2Wc6VGZGK1rfVetLqSnvfVPnT+h
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dp.ucsf.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dp.ucsf.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://dp.ucsf.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dp.ucsf.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dp.ucsf.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://dp.ucsf.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsf.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFzCCAf+gAwIBAgIUW2hLRYSTq6yflHpRZ5ZBXty14rYwDQYJKoZIhvcNAQEF
-BQAwFjEUMBIGA1UEAxMLZHAudWNzZi5lZHUwHhcNMDkwODI5MDQwMzU5WhcNMjkw
-ODI5MDQwMzU5WjAWMRQwEgYDVQQDEwtkcC51Y3NmLmVkdTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAK+WY9j/fuMEQ2u4mKKeU5LXO+mi7BKKkJP3PUN0
-Iz4whL/M9uTR+C7x6DCVbi4CXNia8hmoNbWIKCKto9UJT/e+Y4y+dZjC4TLcIvdU
-og7x4/3qlcwI76jkomyL5uy2/7Ow+l/pmX99wph+K4/d8EpwE3NTXcFOVv1D8M3p
-UrVEfT1aoAm7p4SXS3uohM7KDXTljqtxImt/Q+cRFBImNyp7YTFp37024eMwtNfL
-JxEajodIFOCCYP6DmN5I1RWTF808BPPbkt7agjuz50pCdXHxfgnCfUmHeeUz4yLI
-6cgOWkB9JISN567vAH68IInM9with782aIsVLf2Fs5pQqxECAwEAAaNdMFswOgYD
-VR0RBDMwMYILZHAudWNzZi5lZHWGImh0dHBzOi8vZHAudWNzZi5lZHUvaWRwL3No
-aWJib2xldGgwHQYDVR0OBBYEFDfsmZZFJeq4xHogyRDy+1N69EEKMA0GCSqGSIb3
-DQEBBQUAA4IBAQBiK5W3RyQc/LL+FOy9mQIFzmobtJCGYUHwn/jMzZ+FdiV688MO
-A94AHGnxlvjjlVE7sjI83XgUK80IpLWz1QtCN9Pcwo5M0tNCxOFAkIe1xRadZmN4
-LpFOenH8vd5TF7DjrozFivFC4+l/mTTW4hfl+RaR34zgrzBAv+fUNrq7cNrid11w
-0h17HNqD964TR4QphmFyIrFR9skSs+41ScRMa4c7Svel8p4f+ptoATHSlSm0OZay
-jktgJp4o+Ld8xiH8Q5oLQ/qNG0hx9IRMaum9h0HCnxwHKsrxcJW2/A/CVhaVlj4J
-p/B3Zs13i2Wc6VGZGK1rfVetLqSnvfVPnT+h
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://dp.ucsf.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of California, San Francisco</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of California, San Francisco</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ucsf.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kevin Dale</md:GivenName>
-    <md:EmailAddress>kevin.dale@ucsf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Susil Rayamajhi</md:GivenName>
-    <md:EmailAddress>susil.rayamajhi@ucsf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Nathan Sheldon</md:GivenName>
-    <md:EmailAddress>nathan.sheldon@ucsf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Mukesh Yadav</md:GivenName>
-    <md:EmailAddress>mukesh.yadav@ucsf.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-udayton.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-udayton.edu.xml
deleted file mode 100644
index f6ab7ebc..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-udayton.edu.xml
+++ /dev/null
@@ -1,165 +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="urn:mace:incommon:udayton.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.udayton.edu/udit/" 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">udayton.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Dayton</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Dayton Shibboleth IdP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.udayton.edu/udit/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.udayton.edu/udit/service_level_resources/policies/index.php</mdui:PrivacyStatementURL>
-        <mdui:Logo height="288" width="290" xml:lang="en">https://www-secure.udayton.edu/_udayton/images/logo/redbluep1.gif</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>
-MIIDNzCCAh+gAwIBAgIUM/VS7xvn6O7+NovKwSxpIjkhzhkwDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTc2hpYmlkcC51ZGF5dG9uLmVkdTAeFw0xMzA5MTAxOTE1
-NTlaFw0zMzA5MTAxOTE1NTlaMB4xHDAaBgNVBAMTE3NoaWJpZHAudWRheXRvbi5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFNXC0nnErPACwgzs7
-hNLJw5jS0oxeOvFLVE2mB28WpsEIJhi18vzBdXDgdFCtFg0gI5tHkLm4av4chvWu
-3AA5uVg2CnDKz0j+Pf/1zj+WimaVbGp2eropwcL6EE492M+y4Zy9Y/86DPtkpAvL
-iYf66+gHlYD3v6fOQ4CMOSq0/iDuuMNYMmKYjLpWSCZDfAKuRJDcjmX3jm/ntOLA
-GU2EDroOD2PxkPPDm8oivCCHzCwXqrMxYtS96IHzQswlq3jUQY6UIFyVlfJ7CTi2
-AGKsf7eNoELwEou+qCfeO/lprI8D+ZkF6P9S+EtdRI816I5hW1+etQ+SgezeuuLm
-G44dAgMBAAGjbTBrMEoGA1UdEQRDMEGCE3NoaWJpZHAudWRheXRvbi5lZHWGKmh0
-dHBzOi8vc2hpYmlkcC51ZGF5dG9uLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUTC2xjWDPuJi+4XmfZOjBlJjY5CkwDQYJKoZIhvcNAQEFBQADggEBAEOmvD/n
-sv7qh/6PAzc6L0ETGjGNJ38xU5AVJ77Qnxg39KXc3859zZOsZfv7cyxZg1yb7Zb+
-YLI5IeummkWFPVoHKVseN5g9g5LOkTG1oO8/t+ecf+5HbZe22ShtkHV4W+ZU9+Dd
-F7opRWRtJ58D4QQtrUqLS9wEeh6RSluLRWRhZ8ysYTdOs4bxu16ca2mXNEWAgOUs
-WHxpQxkAhiunKbvp6PYT1xuRJShnCfDdOaN6ZPEYN3xdt7BGnEQFLSld6vVPuA9P
-Q7nJdbEtqUixvYf8kOt5p7yu0hN1P9Il6KGK4accYZcZwz5iraHYwL/rakWeSrWe
-txASPQkR5yOUfss=
-          </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>
-MIIDbjCCAlYCCQCKKt3UaF/nmjANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJV
-UzENMAsGA1UECBMET2hpbzEPMA0GA1UEBxMGRGF5dG9uMR0wGwYDVQQKExRVbml2
-ZXJzaXR5IG9mIERheXRvbjENMAsGA1UECxMEVURpdDEcMBoGA1UEAxMTc2hpYmlk
-cC51ZGF5dG9uLmVkdTAeFw0xMDA5MjExNTEwNTJaFw0xMzA5MjAxNTEwNTJaMHkx
-CzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRPaGlvMQ8wDQYDVQQHEwZEYXl0b24xHTAb
-BgNVBAoTFFVuaXZlcnNpdHkgb2YgRGF5dG9uMQ0wCwYDVQQLEwRVRGl0MRwwGgYD
-VQQDExNzaGliaWRwLnVkYXl0b24uZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAlMbLot/GWCWmA3Rkewmm+8wOk0Wb+Apl1ykjT+95tmcjYQUw9l9z
-MSp0tAJGoUSd0MzEphSPuV+nUwO2G0SbC7p93KNhMeT+Z/K05z8fhXycJmFj9MWe
-dTM9kXKQVds57cTa5zoZov5/lf25P6s3XO4Wk/oR1LlQXRIeO/kgubOeUh8oMhVk
-sl+bY19GqS0fBLsP16F/TN+uM1icSdMiFS1sH5b4QEsWHaSSQfh4lX2DK9lCLWes
-9lmOWiwwYC4nnRkjgXTVlGD9G2oE+iBhTM/BWPR9K9sC0iNc+6SPU9505BymCnF7
-ZGCpjpHoEgEKpmQbUzgjrfO097sUZqebgwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCOReA51O+wYztvqxT4Y0N6zHeACRe4Rcky4Pufe58y3zLw0VRBO9WII1bPa6i0
-UgO1eGBysskHgG2UqU56CRLymbv9173riEQazX05s1ov5Q1UjbDmag736PS0l06G
-yTsH/lTbUFzoZAvsaFbYOV8pgYHMUyVyt229S2fdd4fEPtd5/Zy6SbcpPDccn11m
-MjJUYy7Ehrs3mBO0IBMCUL/HJ7SpoOEO17naZM8tk47nJDD6it3y6ZL3VFpOWAB5
-VMdHiRS3spxAs7ucmCKjy6zIxBvHjkTYHqaU0BpA2CBCPaBEJURAVlsWxpR30rwa
-d9zo8/mEfl59OrJ1rbki2xP1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.udayton.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.udayton.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.udayton.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.udayton.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.udayton.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.udayton.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">udayton.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNzCCAh+gAwIBAgIUM/VS7xvn6O7+NovKwSxpIjkhzhkwDQYJKoZIhvcNAQEF
-BQAwHjEcMBoGA1UEAxMTc2hpYmlkcC51ZGF5dG9uLmVkdTAeFw0xMzA5MTAxOTE1
-NTlaFw0zMzA5MTAxOTE1NTlaMB4xHDAaBgNVBAMTE3NoaWJpZHAudWRheXRvbi5l
-ZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCFNXC0nnErPACwgzs7
-hNLJw5jS0oxeOvFLVE2mB28WpsEIJhi18vzBdXDgdFCtFg0gI5tHkLm4av4chvWu
-3AA5uVg2CnDKz0j+Pf/1zj+WimaVbGp2eropwcL6EE492M+y4Zy9Y/86DPtkpAvL
-iYf66+gHlYD3v6fOQ4CMOSq0/iDuuMNYMmKYjLpWSCZDfAKuRJDcjmX3jm/ntOLA
-GU2EDroOD2PxkPPDm8oivCCHzCwXqrMxYtS96IHzQswlq3jUQY6UIFyVlfJ7CTi2
-AGKsf7eNoELwEou+qCfeO/lprI8D+ZkF6P9S+EtdRI816I5hW1+etQ+SgezeuuLm
-G44dAgMBAAGjbTBrMEoGA1UdEQRDMEGCE3NoaWJpZHAudWRheXRvbi5lZHWGKmh0
-dHBzOi8vc2hpYmlkcC51ZGF5dG9uLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-FgQUTC2xjWDPuJi+4XmfZOjBlJjY5CkwDQYJKoZIhvcNAQEFBQADggEBAEOmvD/n
-sv7qh/6PAzc6L0ETGjGNJ38xU5AVJ77Qnxg39KXc3859zZOsZfv7cyxZg1yb7Zb+
-YLI5IeummkWFPVoHKVseN5g9g5LOkTG1oO8/t+ecf+5HbZe22ShtkHV4W+ZU9+Dd
-F7opRWRtJ58D4QQtrUqLS9wEeh6RSluLRWRhZ8ysYTdOs4bxu16ca2mXNEWAgOUs
-WHxpQxkAhiunKbvp6PYT1xuRJShnCfDdOaN6ZPEYN3xdt7BGnEQFLSld6vVPuA9P
-Q7nJdbEtqUixvYf8kOt5p7yu0hN1P9Il6KGK4accYZcZwz5iraHYwL/rakWeSrWe
-txASPQkR5yOUfss=
-          </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>
-MIIDbjCCAlYCCQCKKt3UaF/nmjANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJV
-UzENMAsGA1UECBMET2hpbzEPMA0GA1UEBxMGRGF5dG9uMR0wGwYDVQQKExRVbml2
-ZXJzaXR5IG9mIERheXRvbjENMAsGA1UECxMEVURpdDEcMBoGA1UEAxMTc2hpYmlk
-cC51ZGF5dG9uLmVkdTAeFw0xMDA5MjExNTEwNTJaFw0xMzA5MjAxNTEwNTJaMHkx
-CzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRPaGlvMQ8wDQYDVQQHEwZEYXl0b24xHTAb
-BgNVBAoTFFVuaXZlcnNpdHkgb2YgRGF5dG9uMQ0wCwYDVQQLEwRVRGl0MRwwGgYD
-VQQDExNzaGliaWRwLnVkYXl0b24uZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAlMbLot/GWCWmA3Rkewmm+8wOk0Wb+Apl1ykjT+95tmcjYQUw9l9z
-MSp0tAJGoUSd0MzEphSPuV+nUwO2G0SbC7p93KNhMeT+Z/K05z8fhXycJmFj9MWe
-dTM9kXKQVds57cTa5zoZov5/lf25P6s3XO4Wk/oR1LlQXRIeO/kgubOeUh8oMhVk
-sl+bY19GqS0fBLsP16F/TN+uM1icSdMiFS1sH5b4QEsWHaSSQfh4lX2DK9lCLWes
-9lmOWiwwYC4nnRkjgXTVlGD9G2oE+iBhTM/BWPR9K9sC0iNc+6SPU9505BymCnF7
-ZGCpjpHoEgEKpmQbUzgjrfO097sUZqebgwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCOReA51O+wYztvqxT4Y0N6zHeACRe4Rcky4Pufe58y3zLw0VRBO9WII1bPa6i0
-UgO1eGBysskHgG2UqU56CRLymbv9173riEQazX05s1ov5Q1UjbDmag736PS0l06G
-yTsH/lTbUFzoZAvsaFbYOV8pgYHMUyVyt229S2fdd4fEPtd5/Zy6SbcpPDccn11m
-MjJUYy7Ehrs3mBO0IBMCUL/HJ7SpoOEO17naZM8tk47nJDD6it3y6ZL3VFpOWAB5
-VMdHiRS3spxAs7ucmCKjy6zIxBvHjkTYHqaU0BpA2CBCPaBEJURAVlsWxpR30rwa
-d9zo8/mEfl59OrJ1rbki2xP1
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.udayton.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Dayton</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Dayton</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.udayton.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth IdP Support</md:GivenName>
-    <md:EmailAddress>shibadmin@udayton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Shibboleth IdP Support</md:GivenName>
-    <md:EmailAddress>shibadmin@udayton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UDit Help Desk</md:GivenName>
-    <md:EmailAddress>helpdesk@udayton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>IT Risk Management Officer</md:GivenName>
-    <md:EmailAddress>itriskmgmt@udayton.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uiowa.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uiowa.edu.xml
deleted file mode 100644
index 0321ba64..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-uiowa.edu.xml
+++ /dev/null
@@ -1,78 +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="urn:mace:incommon:uiowa.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://its.uiowa.edu/support/article/61" 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">uiowa.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Iowa</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of Iowa</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://its.uiowa.edu/shibboleth</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://opsmanual.uiowa.edu/community-policies/acceptable-use-information-technology-resources#19.3</mdui:PrivacyStatementURL>
-        <mdui:Logo height="262" width="286" xml:lang="en">https://idp.uiowa.edu/static/ui-incommon-metadata-logo.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>
-MIIDIDCCAgigAwIBAgIVANC3p2UisM0yO/80OL67JqcqNiLJMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDWlkcC51aW93YS5lZHUwHhcNMTMwNjIxMTY0NjQyWhcN
-MzMwNjIxMTY0NjQyWjAYMRYwFAYDVQQDEw1pZHAudWlvd2EuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAinCXyhRt/vS/7aVBFKE2GWx7Au/+QQ1j
-/6+VQWEP5ONaJGfgNoRsd9dLT6nNpClQb2h8ExHpHFA+41NPyvt53Y/A3XHWfmMc
-MXMMdFzijA5OkPehyigxp43pS5BJf6BOJAYIsffilPPGj4TdUNVokd1I7FvbKVIH
-rnd15ob9lIAoJdBUsiMwvky0wByNKpmiRiEU2n/gCP1owr3RVLePMOvgoU3cS0Tm
-PQsr/r4UZffEDKxCwp7YyM3jteXiPgr6IdZtAm7tKw/9GE00SQbDZehuBK5xfSSR
-LO5pL598B9Cj+NTE3tZD8GTYyl4UzZSQuBMwSrmAeJdVYyqsgD3wLwIDAQABo2Ew
-XzA+BgNVHREENzA1gg1pZHAudWlvd2EuZWR1hiRodHRwczovL2lkcC51aW93YS5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFN3ESwhqgFQoUXJWKHeu6Y4Nn4OF
-MA0GCSqGSIb3DQEBBQUAA4IBAQCEgd5dT1fxCXGtiV4mS4bNBoKzS2909vFEmnt8
-rUBp5wLmFF+K71cm0XJzlD/faYgGo1d6COT2vbklzPnOziQZVh3RUeYqmbltOFY/
-8sW2NNQ6htsDb2JDH1X2oFucXuSzAcPjNgs7//IqvDw7H3gbtYLMyIrhEA7Q9qy/
-+5j/nvhza9LKyDXiugdWEevMTb20FcAvFZcR5v/kMHRjgQlMwPg2yIngxi5vC0E3
-6qD50/b9pCOR30EbZxLv/oxhpKXKv2nVZBcG4IhEhXdXH1rd0JPug4nhrslRdx4N
-fU6A4c+0Aj/vLEIjWne+wPdi+1bIhUAtEMg/CPBZSrokX2N0
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uiowa.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uiowa.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uiowa.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uiowa.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uiowa.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uiowa.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Iowa</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Iowa</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uiowa.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>ITS DNA Identity Services</md:GivenName>
-    <md:EmailAddress>its-dna-identity-services@uiowa.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>University of Iowa Federation Requests</md:GivenName>
-    <md:EmailAddress>iowa-federation-requests@uiowa.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>University of Iowa Federation Requests</md:GivenName>
-    <md:EmailAddress>iowa-federation-requests@uiowa.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Information Security and Policy Office</md:GivenName>
-    <md:EmailAddress>security@uiowa.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml
deleted file mode 100644
index 77ed5bfe..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-uiuc.edu.xml
+++ /dev/null
@@ -1,79 +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="urn:mace:incommon:uiuc.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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>
-      <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shibboleth.illinois.edu/idp/error.jsp" 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">illinois.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Illinois at Urbana-Champaign</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>
-MIIEBjCCAu4CCQD/Lyp8FiC7FTANBgkqhkiG9w0BAQUFADCBxDELMAkGA1UEBhMC
-VVMxETAPBgNVBAgMCElsbGlub2lzMQ8wDQYDVQQHDAZVcmJhbmExMzAxBgNVBAoM
-KlVuaXZlcnNpdHkgb2YgSWxsaW5vaXMgYXQgVXJiYW5hLUNoYW1wYWlnbjEOMAwG
-A1UECwwFQ0lURVMxIDAeBgNVBAMMF3NoaWJib2xldGguaWxsaW5vaXMuZWR1MSow
-KAYJKoZIhvcNAQkBFhtzaGliYm9sZXRoLW1nckBpbGxpbm9pcy5lZHUwHhcNMTQw
-NDExMTU0MDE1WhcNMzQwNDA2MTU0MDE1WjCBxDELMAkGA1UEBhMCVVMxETAPBgNV
-BAgMCElsbGlub2lzMQ8wDQYDVQQHDAZVcmJhbmExMzAxBgNVBAoMKlVuaXZlcnNp
-dHkgb2YgSWxsaW5vaXMgYXQgVXJiYW5hLUNoYW1wYWlnbjEOMAwGA1UECwwFQ0lU
-RVMxIDAeBgNVBAMMF3NoaWJib2xldGguaWxsaW5vaXMuZWR1MSowKAYJKoZIhvcN
-AQkBFhtzaGliYm9sZXRoLW1nckBpbGxpbm9pcy5lZHUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDUVOhMwQb57dfdhfViA4XxeywMoFZXCdk6DPtggrkP
-QgqDHW+SnX1mB66RsIxnnYaZu8ACF3jnuw9z7/Vb2mkF7W6Wccl91DyPWg5DIgYC
-9KA1ee6gHZqe8hFBlKkh2xk4B+g4tM2lj7JCngJoCRj4Woz4e40Stg2EVfYUIU4x
-jCIMjKHrgF6EbJcnsVnMM+0ohG1stMTikvq5XMHOVK2c0KYFYSNFj9plHQKela5v
-+r14oLDhyIqraB6rCyLqC3gOWa77EcIKUa7om7ryTLfykJlZ+Uv2VVcWWk+CMWba
-qFzQU+4iMUDVG2BypffzNP6eV+eBGFBcc288WpC545EPAgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAIyK01GB+bo/cC24q4zXaCbuA6ObI2TCYWe0AQDmRHMdFrRdIM97
-w21MlVXofFGK4fT9Yvr9844/bJ5w6sANtJqH1ajoo4341VeSc6DDs8DkHH+5/npl
-2WLcIWOlTohuhDpUtDlyf5o9mvzCHHCMkxcuTKOxvnW1A0yHYQbVxvJbWIHufXCm
-qP191AZWeabC+lN/TOc1NMNc5jXyqseMSpsDfMvrlTKGlInPm/baTBE0Lm/mTB9q
-wiiA8CqRlW/oeEwFvk49dE9Ruu5XTbbjFKeWAH+P2PKVAE9Hlavctmq77sB/qUFt
-jUX3lekoVG8DHflvYu+KkI/zV5xbuO0O9Lc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.illinois.edu/idp/profile/Logout"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.illinois.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.illinois.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.illinois.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.illinois.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.illinois.edu/idp/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Illinois at Urbana-Champaign</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Illinois at Urbana-Champaign</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uiuc.edu/index.html</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth Identity Provider Service Management Team</md:GivenName>
-    <md:EmailAddress>shibboleth-mgr@illinois.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Shibboleth Identity Provider Service Management Team</md:GivenName>
-    <md:EmailAddress>shibboleth-mgr@illinois.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Shibboleth Identity Provider Service Management Team</md:GivenName>
-    <md:EmailAddress>shibboleth-mgr@illinois.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Security Office</md:GivenName>
-    <md:EmailAddress>security@illinois.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-umbc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-umbc.edu.xml
deleted file mode 100644
index 4a99268c..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-umbc.edu.xml
+++ /dev/null
@@ -1,116 +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="urn:mace:incommon:umbc.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://webauth.umbc.edu:443/shib_error_page.html" 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">umbc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Maryland Baltimore County</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of Maryland Baltimore County IdP enables standards-based federation for the UMBC community.
-</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.umbc.edu/display/MW/Shibboleth+Identity+Provider</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.umbc.edu/policies/pdfs/x-1.00.06%20web%20site%20privacy%20statement.pdf</mdui:PrivacyStatementURL>
-        <mdui:Logo height="133" width="345" xml:lang="en">https://webauth.umbc.edu/umbclogo.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>
-MIIDNTCCAh2gAwIBAgIJAMBfbssnE/opMA0GCSqGSIb3DQEBBAUAMBsxGTAXBgNV
-BAMTEHdlYmF1dGgudW1iYy5lZHUwHhcNMTExMTIxMjEwOTAyWhcNMjExMTE4MjEw
-OTAyWjAbMRkwFwYDVQQDExB3ZWJhdXRoLnVtYmMuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA8pneHoaFwkaenWXUuoP/Cp2Mf+KNdy7TegsTiC18
-yHMcGQ3sdzztAGicjqNf4N8wqSH9Ysqug72eHpopJbN+Rz9rmqUCujh8fzUgDb6G
-cyH0YpCt2sXDbjHxEzDyq/Acr7J0Q65DJUuqQPEm8WLyZhtT/trGLTM/UYFGIi16
-uYsM+N/GloqhznjcEQ1hEa9Vg5fZ3jl+VbEtzxMsCmou0LkFC+0xaMukPzAkhbeP
-KJG15OhuFFMdIS8oKBop45s7iOAc7CaDGE+1kkULCQzH/kB4K2bjDfyyE9TEMqy7
-WtIjyYUKGil3F1F85kzbQZSG+sVS5QDlGlvLhBnP3WTJIwIDAQABo3wwejAdBgNV
-HQ4EFgQUtGEIa05oxIWEnljb5yVlRL+GkMcwSwYDVR0jBEQwQoAUtGEIa05oxIWE
-nljb5yVlRL+GkMehH6QdMBsxGTAXBgNVBAMTEHdlYmF1dGgudW1iYy5lZHWCCQDA
-X27LJxP6KTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQAjPscifXwc
-Oms0MgBdgCdf6MtIELBoB2tmcpJ6ugVELMbOJZsvzF4w+PXzpCoEzitA5sK3455R
-/C0u94+QDxnejLnxRVz6I3Tg+hfcwE5/px+l53hJHblj/m7SeRj8oRku94Jqgpdd
-NsdP7zLepbr/1T4QnTaYSD+GcGbD+k26Dykq7g7lPcQrJMilaQbV3ojjuu5GBsk4
-utTwI71lUwiib56EZek95qUHDvAA9IbReMn+/El6OrtT2uvp2XrqMCyw+2mSEt5E
-ZtXClyNP5VtdFaH5a+ghepre+P3T66MP8VoDKAdFlAQ8ZvLWLKd4kqzUy0i76tSW
-TyINBRx/UZdk
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umbc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umbc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.umbc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.umbc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.umbc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.umbc.edu/idp/profile/SAML2/POST-SimpleSign/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">umbc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNTCCAh2gAwIBAgIJAMBfbssnE/opMA0GCSqGSIb3DQEBBAUAMBsxGTAXBgNV
-BAMTEHdlYmF1dGgudW1iYy5lZHUwHhcNMTExMTIxMjEwOTAyWhcNMjExMTE4MjEw
-OTAyWjAbMRkwFwYDVQQDExB3ZWJhdXRoLnVtYmMuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA8pneHoaFwkaenWXUuoP/Cp2Mf+KNdy7TegsTiC18
-yHMcGQ3sdzztAGicjqNf4N8wqSH9Ysqug72eHpopJbN+Rz9rmqUCujh8fzUgDb6G
-cyH0YpCt2sXDbjHxEzDyq/Acr7J0Q65DJUuqQPEm8WLyZhtT/trGLTM/UYFGIi16
-uYsM+N/GloqhznjcEQ1hEa9Vg5fZ3jl+VbEtzxMsCmou0LkFC+0xaMukPzAkhbeP
-KJG15OhuFFMdIS8oKBop45s7iOAc7CaDGE+1kkULCQzH/kB4K2bjDfyyE9TEMqy7
-WtIjyYUKGil3F1F85kzbQZSG+sVS5QDlGlvLhBnP3WTJIwIDAQABo3wwejAdBgNV
-HQ4EFgQUtGEIa05oxIWEnljb5yVlRL+GkMcwSwYDVR0jBEQwQoAUtGEIa05oxIWE
-nljb5yVlRL+GkMehH6QdMBsxGTAXBgNVBAMTEHdlYmF1dGgudW1iYy5lZHWCCQDA
-X27LJxP6KTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQAjPscifXwc
-Oms0MgBdgCdf6MtIELBoB2tmcpJ6ugVELMbOJZsvzF4w+PXzpCoEzitA5sK3455R
-/C0u94+QDxnejLnxRVz6I3Tg+hfcwE5/px+l53hJHblj/m7SeRj8oRku94Jqgpdd
-NsdP7zLepbr/1T4QnTaYSD+GcGbD+k26Dykq7g7lPcQrJMilaQbV3ojjuu5GBsk4
-utTwI71lUwiib56EZek95qUHDvAA9IbReMn+/El6OrtT2uvp2XrqMCyw+2mSEt5E
-ZtXClyNP5VtdFaH5a+ghepre+P3T66MP8VoDKAdFlAQ8ZvLWLKd4kqzUy0i76tSW
-TyINBRx/UZdk
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umbc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umbc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Maryland Baltimore County</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Maryland Baltimore County</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umbc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jason Griego</md:GivenName>
-    <md:EmailAddress>jcgriego@umbc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Paul Riddle</md:GivenName>
-    <md:EmailAddress>paulr@umbc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Paul Riddle</md:GivenName>
-    <md:EmailAddress>paulr@umbc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Technology Support Center</md:GivenName>
-    <md:EmailAddress>incommon-help@umbc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
deleted file mode 100644
index 2263d916..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-umd.edu.xml
+++ /dev/null
@@ -1,116 +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="urn:mace:incommon:umd.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">umd.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Maryland College Park</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of Maryland, College Park is a public research university, the flagship campus of the University System of Maryland, and the original 1862 land-grant institution in the State.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.umd.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.nethics.umd.edu/aup/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="61" width="61" xml:lang="en">https://www.urhome.umd.edu/trademarks/marks/gr/webglobesm.gif</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>
-MIIDxjCCAq4CCQCYTHuI1qWbdjANBgkqhkiG9w0BAQUFADCBpDELMAkGA1UEBhMC
-VVMxETAPBgNVBAgTCE1hcnlsYW5kMRUwEwYDVQQHEwxDb2xsZWdlIFBhcmsxHzAd
-BgNVBAoTFlVuaXZlcnNpdHkgb2YgTWFyeWxhbmQxDDAKBgNVBAsTA09JVDEZMBcG
-A1UEAxMQc2hpYi5pZG0udW1kLmVkdTEhMB8GCSqGSIb3DQEJARYSc2hpYmJvbGV0
-aEB1bWQuZWR1MB4XDTEwMDMwNTE0NTEyMloXDTIwMDMwMjE0NTEyMlowgaQxCzAJ
-BgNVBAYTAlVTMREwDwYDVQQIEwhNYXJ5bGFuZDEVMBMGA1UEBxMMQ29sbGVnZSBQ
-YXJrMR8wHQYDVQQKExZVbml2ZXJzaXR5IG9mIE1hcnlsYW5kMQwwCgYDVQQLEwNP
-SVQxGTAXBgNVBAMTEHNoaWIuaWRtLnVtZC5lZHUxITAfBgkqhkiG9w0BCQEWEnNo
-aWJib2xldGhAdW1kLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANM+uMY8XSu2qmJRm898y7AW1lqLDteJtzcCIsgssH66PNn24J+/RW6Z2TWbSQ4B
-Oc3NwCdgBjglKq4f7dp1az8Jy1r8NIMhCy6JqwxjItpni/zTAfUlv9Dc6yshX1jN
-2swIM3ZafyGlK+xzXVz7lrlvsRLIkLetNqRcUnoY7UUjv1yXqku+EkFixdXPfyN7
-JDzVsl5urDsFQRuRypmA0geSkRpdmgCqDeZicjXVEoobbqg6xgw/0ZIIjYg1T47m
-HEs1P04VhwhPs3tP4Pg4MAwXFOq39hOwJCS6ojIKXBWN4h1VnEmc8ppq4I8T2en0
-wonw2JH8gu4Q3JmsUSPvaqMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAzWhmDsXy
-qntYuXp0gY3dBuFgIHq+0nqo+s3yPfgi4Wj8IY0l4EXblhHHMHBWZyGA4uDo6MZs
-8yJxgjyvR0O98gzVxk2ZcNrtqYd59kBs88gH011ciJeeNmDBn/1DNrhn3xyKX8GI
-LhNGpiofYzOzHz4kYWLs/xl+0NN0yURVrE9dxunk35P07PwyNtZ68h3Qzr6g5CZ/
-9JcKwaPB71jYscdUvLGXPmKQ1ZfI1foFf3ZVbOxNI66GGlpJH1JdbneGvX6rkBmz
-ILOzZbPBHBTjCBjCX+eq7CAvF3GJJD5VvXcGtZFcOEhgXSi/D6/SRSO133UoRYNT
-corVUSTEZlJJNA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.idm.umd.edu/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.idm.umd.edu/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.idm.umd.edu/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.idm.umd.edu/shibboleth-idp/profile/SAML2/POST-SimpleSign/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">umd.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDxjCCAq4CCQCYTHuI1qWbdjANBgkqhkiG9w0BAQUFADCBpDELMAkGA1UEBhMC
-VVMxETAPBgNVBAgTCE1hcnlsYW5kMRUwEwYDVQQHEwxDb2xsZWdlIFBhcmsxHzAd
-BgNVBAoTFlVuaXZlcnNpdHkgb2YgTWFyeWxhbmQxDDAKBgNVBAsTA09JVDEZMBcG
-A1UEAxMQc2hpYi5pZG0udW1kLmVkdTEhMB8GCSqGSIb3DQEJARYSc2hpYmJvbGV0
-aEB1bWQuZWR1MB4XDTEwMDMwNTE0NTEyMloXDTIwMDMwMjE0NTEyMlowgaQxCzAJ
-BgNVBAYTAlVTMREwDwYDVQQIEwhNYXJ5bGFuZDEVMBMGA1UEBxMMQ29sbGVnZSBQ
-YXJrMR8wHQYDVQQKExZVbml2ZXJzaXR5IG9mIE1hcnlsYW5kMQwwCgYDVQQLEwNP
-SVQxGTAXBgNVBAMTEHNoaWIuaWRtLnVtZC5lZHUxITAfBgkqhkiG9w0BCQEWEnNo
-aWJib2xldGhAdW1kLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANM+uMY8XSu2qmJRm898y7AW1lqLDteJtzcCIsgssH66PNn24J+/RW6Z2TWbSQ4B
-Oc3NwCdgBjglKq4f7dp1az8Jy1r8NIMhCy6JqwxjItpni/zTAfUlv9Dc6yshX1jN
-2swIM3ZafyGlK+xzXVz7lrlvsRLIkLetNqRcUnoY7UUjv1yXqku+EkFixdXPfyN7
-JDzVsl5urDsFQRuRypmA0geSkRpdmgCqDeZicjXVEoobbqg6xgw/0ZIIjYg1T47m
-HEs1P04VhwhPs3tP4Pg4MAwXFOq39hOwJCS6ojIKXBWN4h1VnEmc8ppq4I8T2en0
-wonw2JH8gu4Q3JmsUSPvaqMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAzWhmDsXy
-qntYuXp0gY3dBuFgIHq+0nqo+s3yPfgi4Wj8IY0l4EXblhHHMHBWZyGA4uDo6MZs
-8yJxgjyvR0O98gzVxk2ZcNrtqYd59kBs88gH011ciJeeNmDBn/1DNrhn3xyKX8GI
-LhNGpiofYzOzHz4kYWLs/xl+0NN0yURVrE9dxunk35P07PwyNtZ68h3Qzr6g5CZ/
-9JcKwaPB71jYscdUvLGXPmKQ1ZfI1foFf3ZVbOxNI66GGlpJH1JdbneGvX6rkBmz
-ILOzZbPBHBTjCBjCX+eq7CAvF3GJJD5VvXcGtZFcOEhgXSi/D6/SRSO133UoRYNT
-corVUSTEZlJJNA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.idm.umd.edu:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.idm.umd.edu:8443/shibboleth-idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Maryland College Park</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Maryland College Park</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umd.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David Barks</md:GivenName>
-    <md:EmailAddress>dbarks@umd.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>John Pfeifer</md:GivenName>
-    <md:EmailAddress>shibboleth@umd.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jyoti Sawhney</md:GivenName>
-    <md:EmailAddress>shibboleth@umd.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Shibboleth Team</md:GivenName>
-    <md:EmailAddress>shibboleth@umd.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-umn.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-umn.edu.xml
deleted file mode 100644
index 05b4bed5..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-umn.edu.xml
+++ /dev/null
@@ -1,113 +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="urn:mace:incommon:umn.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">umn.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Minnesota</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Minnesota, All Campuses</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://it.umn.edu/about-university-identity-provider</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://privacy.umn.edu</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>
-MIIDMDCCAhigAwIBAgIVALDP0Qlersp1DxNStIJY8Ek/vHjCMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcDIuc2hpYi51bW4uZWR1MB4XDTA5MDQxNjIyMDcx
-N1oXDTI5MDQxNjIyMDcxN1owHDEaMBgGA1UEAxMRaWRwMi5zaGliLnVtbi5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTGyhD5A4P+N4McNWT2ZIn
-QhQC7wk+EgWiSSFkDc/+x4pe1/bFh4g/icERrKbIiNX3Be+InqlsRYxq5Viw+Jd8
-ybiBwM+ydmF0FinkAC6lkiyeR43+Yotfwg4TXC0nMp/xb4F/jxvPxjkeVufiTW2g
-xsbvJH4kuCJWZejp7fnZpWhk4N6lEZTuDn6R+6SInpKn7yxQ378fIv6UibgqsM1N
-TJRrn71jCXp1+BZQbqZ4lhgIoftcGSHp0QvVTDG8iO0g92pDzTvpeKAZaxMfNeGS
-mLgIT7seuFIsPmNdPLT5MolbccNQ2a2S2EC8i2iqHmW6g16GuY/eIX0uofPwZYVD
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcDIuc2hpYi51bW4uZWR1hihodHRwczov
-L2lkcDIuc2hpYi51bW4uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRCDAio
-73cEURuEr+xMUr4DBGh/PjANBgkqhkiG9w0BAQUFAAOCAQEAZhNuxs1B4AXw2CPv
-ig00RcDwgLTdfu2aSza0x2YeEIwbAeUoOw7JhgF0+kAbjfCbiByG6FPYANIOTsgL
-tK/TwPEnEhVflbBKhTqHh/0QH06QR26TPlwxyGYQD/Yx+0bl9mww8o/C8HhZTwqN
-KiG+G9/fanxZ8+b5kZjYluoFnnh+NMdKb/T7MGbmvNv0YGuVq0j2hcHnmKcVzAX8
-r4SsABgM19W3/8Lj4C/5X94q3Pm5BrDKjzm2V99B5Mk85cn/P/ASCqQ75oPKCbxZ
-fXmKgZVht6jxjIlzQcV6eLsME5F2Y7FTFBRHlQTGojwOuP6ZXbu5bram8AqXhWuW
-ufJdoQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.shib.umn.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.shib.umn.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.shib.umn.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.shib.umn.edu/idp/profile/SAML2/POST-SimpleSign/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">umn.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIVALDP0Qlersp1DxNStIJY8Ek/vHjCMA0GCSqGSIb3DQEB
-BQUAMBwxGjAYBgNVBAMTEWlkcDIuc2hpYi51bW4uZWR1MB4XDTA5MDQxNjIyMDcx
-N1oXDTI5MDQxNjIyMDcxN1owHDEaMBgGA1UEAxMRaWRwMi5zaGliLnVtbi5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTGyhD5A4P+N4McNWT2ZIn
-QhQC7wk+EgWiSSFkDc/+x4pe1/bFh4g/icERrKbIiNX3Be+InqlsRYxq5Viw+Jd8
-ybiBwM+ydmF0FinkAC6lkiyeR43+Yotfwg4TXC0nMp/xb4F/jxvPxjkeVufiTW2g
-xsbvJH4kuCJWZejp7fnZpWhk4N6lEZTuDn6R+6SInpKn7yxQ378fIv6UibgqsM1N
-TJRrn71jCXp1+BZQbqZ4lhgIoftcGSHp0QvVTDG8iO0g92pDzTvpeKAZaxMfNeGS
-mLgIT7seuFIsPmNdPLT5MolbccNQ2a2S2EC8i2iqHmW6g16GuY/eIX0uofPwZYVD
-AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcDIuc2hpYi51bW4uZWR1hihodHRwczov
-L2lkcDIuc2hpYi51bW4uZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRCDAio
-73cEURuEr+xMUr4DBGh/PjANBgkqhkiG9w0BAQUFAAOCAQEAZhNuxs1B4AXw2CPv
-ig00RcDwgLTdfu2aSza0x2YeEIwbAeUoOw7JhgF0+kAbjfCbiByG6FPYANIOTsgL
-tK/TwPEnEhVflbBKhTqHh/0QH06QR26TPlwxyGYQD/Yx+0bl9mww8o/C8HhZTwqN
-KiG+G9/fanxZ8+b5kZjYluoFnnh+NMdKb/T7MGbmvNv0YGuVq0j2hcHnmKcVzAX8
-r4SsABgM19W3/8Lj4C/5X94q3Pm5BrDKjzm2V99B5Mk85cn/P/ASCqQ75oPKCbxZ
-fXmKgZVht6jxjIlzQcV6eLsME5F2Y7FTFBRHlQTGojwOuP6ZXbu5bram8AqXhWuW
-ufJdoQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.shib.umn.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.shib.umn.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Minnesota</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Minnesota</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www1.umn.edu/twincities/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Kevin O'Rourke</md:GivenName>
-    <md:EmailAddress>kor@umn.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>University of Minnesota Identity Management</md:GivenName>
-    <md:EmailAddress>idm@umn.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Christopher Bongaarts</md:GivenName>
-    <md:EmailAddress>cab@umn.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>University of Minnesota IT Helpdesk (1-HELP)</md:GivenName>
-    <md:EmailAddress>help@umn.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>University of Minnesota IT Security</md:GivenName>
-    <md:EmailAddress>abuse@umn.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-unc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-unc.edu.xml
deleted file mode 100644
index ac308030..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-unc.edu.xml
+++ /dev/null
@@ -1,142 +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="urn:mace:incommon:unc.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://sso.unc.edu/idp/error.jsp" 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">unc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of North Carolina at Chapel Hill</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of North Carolina at Chapel Hill</mdui:Description>
-        <mdui:Logo height="73" width="265" xml:lang="en">https://its.unc.edu/wp-content/themes/unc-sites-base-theme/images/logo_unc_main.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>
-MIIHGTCCBgGgAwIBAgIRAKyOdrs0hcQ6LwrLegYuWrgwDQYJKoZIhvcNAQEFBQAw
-gYkxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMS8wLQYD
-VQQDEyZDT01PRE8gSGlnaC1Bc3N1cmFuY2UgU2VjdXJlIFNlcnZlciBDQTAeFw0x
-MTA2MTUwMDAwMDBaFw0xNjA5MDQyMzU5NTlaMIIBOjELMAkGA1UEBhMCVVMxDjAM
-BgNVBBETBTI3NTk5MRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEUMBIGA1UEBxML
-Q2hhcGVsIEhpbGwxDzANBgNVBAkTBkNCMTE1MDE0MDIGA1UEChMrVW5pdmVyc2l0
-eSBvZiBOb3J0aCBDYXJvbGluYSBhdCBDaGFwZWwgSGlsbDEoMCYGA1UECxMfSW5m
-b3JtYXRpb24gVGVjaG5vbG9neSBTZXJ2aWNlczFJMEcGA1UECxNASXNzdWVkIHRo
-cm91Z2ggVW5pdmVyc2l0eSBvZiBOb3J0aCBDYXJvbGluYSBhdCBDaGFwZWwgSGls
-bCBFLVBLSTEaMBgGA1UECxMRQ29tb2RvIEluc3RhbnRTU0wxFDASBgNVBAMTC3Nz
-by51bmMuZWR1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAty+fx6cE
-S22cdDAy208RQGtDeq/pS2GkNCkW94PUXjqHVdwHZK1B6yRnRJeRmDWPDFqPzNTB
-qYP0CnkTrEqk8Up30a87WRfVq3kVMppGG14Il69VFWgzFzRyoAzJmqZeCL9Z7VMV
-C25ksbbS7XN+NJ0K8XxhXj3RbX/5klvSZIrdWguac8S1a/s182ha0H7IFscPI1UA
-wRaXfVhNaZNBh28CxaN/PWgOeJxYtifMXaAws1zrZ1VI7rhVa6pXeHlw34/o1Nex
-wtDGZCSOYOSULga0uYh8KY8ySmff3vvNoBmPegxG2gF357zrqN8QzgDXw+07uBLF
-2AzMcTI1uWKh+dBGuDVyW2N+QOgQAUsUmQmFyswq5iAaiZ5qPBErXVIQ/FazY5fL
-Lr5utypuuUUmXYRWsQnnzEkXIimWFRMdwSpfrRKc8FtScr3xYUyKxuCZPQHCvTyq
-Dv48ugsfcYFwkSbUR9fPVM8CNdhqRmc/aPOVkqkpWQz3X3taYd08hQbKNp35ZHtx
-l1Z2Ot6OSe2v1R3Tp2h71QPTAmXep1Ft3C9Qyxw2tXMnaQRW+b/c2vu67zv2/WoN
-x5reiWwCRktJybVbKIGddC0h8FbNaDDKyPfedggiiBYtICYykIYl2qYfWPJ4CtfT
-Lbh2Ur9r3egptxFKFBWuEztjVutyP9WGaCkCAwEAAaOCAcYwggHCMB8GA1UdIwQY
-MBaAFD/VtdDWRHlQShejm4xK3LiwImRrMB0GA1UdDgQWBBQm5vK6ffLimyJprtwD
-QW6mir8jPDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwRgYDVR0gBD8wPTA7BgwrBgEEAbIxAQIBAwQw
-KzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwTwYD
-VR0fBEgwRjBEoEKgQIY+aHR0cDovL2NybC5jb21vZG9jYS5jb20vQ09NT0RPSGln
-aC1Bc3N1cmFuY2VTZWN1cmVTZXJ2ZXJDQS5jcmwwgYAGCCsGAQUFBwEBBHQwcjBK
-BggrBgEFBQcwAoY+aHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPSGlnaC1B
-c3N1cmFuY2VTZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
-Y3NwLmNvbW9kb2NhLmNvbTAnBgNVHREEIDAeggtzc28udW5jLmVkdYIPd3d3LnNz
-by51bmMuZWR1MA0GCSqGSIb3DQEBBQUAA4IBAQB2PR/0PmKiyHFAwpL1eJvdkLgC
-VIZ2UKesNgGTLOJzOxGqGwNenWNlEbdWHy6Zh+Pkc49IxRNf0HHZny75zr7+1STy
-ZmPr2MT4nwfEa114RWvjKhYAIjZl4SLiKjpIQlES/Rq2sVNYGhsC4vwiPKAbO0+g
-8Wv93/l3EKQXjIoeDh0VLwEFTdN+kqioCxrkDmuegzuSdjk/R5pR05kfvjpe+p+H
-NrKpJaan1fZVEdmV6Qg881VQH/M0k00cFuK8ri7vqN2LUVtbHFK4g6M0n7yuywhv
-3UoSgjFz/cNvq9QpYmM1XYYnuqhu86ZHiod2vrvSq2u35uzx/MhIn8fT9IlV
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.unc.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.unc.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.unc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.unc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.unc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.unc.edu/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">unc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIHGTCCBgGgAwIBAgIRAKyOdrs0hcQ6LwrLegYuWrgwDQYJKoZIhvcNAQEFBQAw
-gYkxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMS8wLQYD
-VQQDEyZDT01PRE8gSGlnaC1Bc3N1cmFuY2UgU2VjdXJlIFNlcnZlciBDQTAeFw0x
-MTA2MTUwMDAwMDBaFw0xNjA5MDQyMzU5NTlaMIIBOjELMAkGA1UEBhMCVVMxDjAM
-BgNVBBETBTI3NTk5MRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEUMBIGA1UEBxML
-Q2hhcGVsIEhpbGwxDzANBgNVBAkTBkNCMTE1MDE0MDIGA1UEChMrVW5pdmVyc2l0
-eSBvZiBOb3J0aCBDYXJvbGluYSBhdCBDaGFwZWwgSGlsbDEoMCYGA1UECxMfSW5m
-b3JtYXRpb24gVGVjaG5vbG9neSBTZXJ2aWNlczFJMEcGA1UECxNASXNzdWVkIHRo
-cm91Z2ggVW5pdmVyc2l0eSBvZiBOb3J0aCBDYXJvbGluYSBhdCBDaGFwZWwgSGls
-bCBFLVBLSTEaMBgGA1UECxMRQ29tb2RvIEluc3RhbnRTU0wxFDASBgNVBAMTC3Nz
-by51bmMuZWR1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAty+fx6cE
-S22cdDAy208RQGtDeq/pS2GkNCkW94PUXjqHVdwHZK1B6yRnRJeRmDWPDFqPzNTB
-qYP0CnkTrEqk8Up30a87WRfVq3kVMppGG14Il69VFWgzFzRyoAzJmqZeCL9Z7VMV
-C25ksbbS7XN+NJ0K8XxhXj3RbX/5klvSZIrdWguac8S1a/s182ha0H7IFscPI1UA
-wRaXfVhNaZNBh28CxaN/PWgOeJxYtifMXaAws1zrZ1VI7rhVa6pXeHlw34/o1Nex
-wtDGZCSOYOSULga0uYh8KY8ySmff3vvNoBmPegxG2gF357zrqN8QzgDXw+07uBLF
-2AzMcTI1uWKh+dBGuDVyW2N+QOgQAUsUmQmFyswq5iAaiZ5qPBErXVIQ/FazY5fL
-Lr5utypuuUUmXYRWsQnnzEkXIimWFRMdwSpfrRKc8FtScr3xYUyKxuCZPQHCvTyq
-Dv48ugsfcYFwkSbUR9fPVM8CNdhqRmc/aPOVkqkpWQz3X3taYd08hQbKNp35ZHtx
-l1Z2Ot6OSe2v1R3Tp2h71QPTAmXep1Ft3C9Qyxw2tXMnaQRW+b/c2vu67zv2/WoN
-x5reiWwCRktJybVbKIGddC0h8FbNaDDKyPfedggiiBYtICYykIYl2qYfWPJ4CtfT
-Lbh2Ur9r3egptxFKFBWuEztjVutyP9WGaCkCAwEAAaOCAcYwggHCMB8GA1UdIwQY
-MBaAFD/VtdDWRHlQShejm4xK3LiwImRrMB0GA1UdDgQWBBQm5vK6ffLimyJprtwD
-QW6mir8jPDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAU
-BggrBgEFBQcDAQYIKwYBBQUHAwIwRgYDVR0gBD8wPTA7BgwrBgEEAbIxAQIBAwQw
-KzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLmNvbS9DUFMwTwYD
-VR0fBEgwRjBEoEKgQIY+aHR0cDovL2NybC5jb21vZG9jYS5jb20vQ09NT0RPSGln
-aC1Bc3N1cmFuY2VTZWN1cmVTZXJ2ZXJDQS5jcmwwgYAGCCsGAQUFBwEBBHQwcjBK
-BggrBgEFBQcwAoY+aHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPSGlnaC1B
-c3N1cmFuY2VTZWN1cmVTZXJ2ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
-Y3NwLmNvbW9kb2NhLmNvbTAnBgNVHREEIDAeggtzc28udW5jLmVkdYIPd3d3LnNz
-by51bmMuZWR1MA0GCSqGSIb3DQEBBQUAA4IBAQB2PR/0PmKiyHFAwpL1eJvdkLgC
-VIZ2UKesNgGTLOJzOxGqGwNenWNlEbdWHy6Zh+Pkc49IxRNf0HHZny75zr7+1STy
-ZmPr2MT4nwfEa114RWvjKhYAIjZl4SLiKjpIQlES/Rq2sVNYGhsC4vwiPKAbO0+g
-8Wv93/l3EKQXjIoeDh0VLwEFTdN+kqioCxrkDmuegzuSdjk/R5pR05kfvjpe+p+H
-NrKpJaan1fZVEdmV6Qg881VQH/M0k00cFuK8ri7vqN2LUVtbHFK4g6M0n7yuywhv
-3UoSgjFz/cNvq9QpYmM1XYYnuqhu86ZHiod2vrvSq2u35uzx/MhIn8fT9IlV
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.unc.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.unc.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of North Carolina at Chapel Hill</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of North Carolina at Chapel Hill</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UNC ITRC</md:GivenName>
-    <md:EmailAddress>help@unc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>UNC Identity Management</md:GivenName>
-    <md:EmailAddress>idman@unc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-unoh.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-unoh.edu.xml
deleted file mode 100644
index 92ea51f2..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-unoh.edu.xml
+++ /dev/null
@@ -1,88 +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="urn:mace:incommon:unoh.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://webauth.unoh.edu/error.html" 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">unoh.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Northwestern Ohio</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>
-MIIDKzCCAhOgAwIBAgIULy08BQkcpOnmTH92+QGu+JKU2UMwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQd2ViYXV0aC51bm9oLmVkdTAeFw0xMjAyMjgwNDE5MDda
-Fw0zMjAyMjgwNDE5MDdaMBsxGTAXBgNVBAMTEHdlYmF1dGgudW5vaC5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNTQ99SNOAMAG2sUR5nddeVQOx
-amxRlm2l/Qa7HaK0OTtHPuqaioCF4pOpH9Q8cS/MbeVJPcKsSTH7bnDANgsYgAcC
-x3rK+4zBkKm/Zk5JhbsXsXM03A1lrx7C6hspEAv6HMvLwv16V7oH+Pi1QbZTWKq+
-wgwSaAB1bgXNL/xl2utakKBNMP+qMZ1KglkvAd0rLKy7i2saq9SjIHSoGctDc15m
-bVptXk2YD5+Iv2V8/cj26pokr0firEw01V4l2Jh1bbwTZr7B5x/yGs5gko5hnL7B
-4YbesHO7ujhl0qxyzLcVw4O1epKAbYD4KTux9ioAhxAWvmq41SBDCj6xwmpLAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHdlYmF1dGgudW5vaC5lZHWGJ2h0dHBzOi8vd2Vi
-YXV0aC51bm9oLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUEPzvkxKJhFqL
-yRv3sXdRHNtlEVowDQYJKoZIhvcNAQEFBQADggEBAHp0Aa/XbXyp/jjgoTLx1FM9
-Q27hLwG3hL880Sl0xmEsVo1RmYvUYr6XcBZ9V7l7YgEX7cUEKd2rYjX2dCtc57Pv
-UPvOz7YC8Z+zqtrQrw4Qzej1pr1Kb8GF5J0pdiGgTDxdp8HMeT/xl9vSumnL83yS
-hAOnSgGr4+3CaQiYG2uD/usYib6kkAdG9kUtaNvSgA+kqXEgDew6K7gQRAgGgD9+
-Tj0jVc553XRlzq170MaFkOWMrL/FaIRfj2OdSD/0W0B+ry2Fg1+8S3AJNPuFNMF0
-OfmbJ3v2CPAigA44FKZBy9+77vXYadvgl9q2bnhvQE6qMf+lUj6VmKa+fyuEPvk=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.unoh.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.unoh.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.unoh.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.unoh.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unoh.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDKzCCAhOgAwIBAgIULy08BQkcpOnmTH92+QGu+JKU2UMwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQd2ViYXV0aC51bm9oLmVkdTAeFw0xMjAyMjgwNDE5MDda
-Fw0zMjAyMjgwNDE5MDdaMBsxGTAXBgNVBAMTEHdlYmF1dGgudW5vaC5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNTQ99SNOAMAG2sUR5nddeVQOx
-amxRlm2l/Qa7HaK0OTtHPuqaioCF4pOpH9Q8cS/MbeVJPcKsSTH7bnDANgsYgAcC
-x3rK+4zBkKm/Zk5JhbsXsXM03A1lrx7C6hspEAv6HMvLwv16V7oH+Pi1QbZTWKq+
-wgwSaAB1bgXNL/xl2utakKBNMP+qMZ1KglkvAd0rLKy7i2saq9SjIHSoGctDc15m
-bVptXk2YD5+Iv2V8/cj26pokr0firEw01V4l2Jh1bbwTZr7B5x/yGs5gko5hnL7B
-4YbesHO7ujhl0qxyzLcVw4O1epKAbYD4KTux9ioAhxAWvmq41SBDCj6xwmpLAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHdlYmF1dGgudW5vaC5lZHWGJ2h0dHBzOi8vd2Vi
-YXV0aC51bm9oLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUEPzvkxKJhFqL
-yRv3sXdRHNtlEVowDQYJKoZIhvcNAQEFBQADggEBAHp0Aa/XbXyp/jjgoTLx1FM9
-Q27hLwG3hL880Sl0xmEsVo1RmYvUYr6XcBZ9V7l7YgEX7cUEKd2rYjX2dCtc57Pv
-UPvOz7YC8Z+zqtrQrw4Qzej1pr1Kb8GF5J0pdiGgTDxdp8HMeT/xl9vSumnL83yS
-hAOnSgGr4+3CaQiYG2uD/usYib6kkAdG9kUtaNvSgA+kqXEgDew6K7gQRAgGgD9+
-Tj0jVc553XRlzq170MaFkOWMrL/FaIRfj2OdSD/0W0B+ry2Fg1+8S3AJNPuFNMF0
-OfmbJ3v2CPAigA44FKZBy9+77vXYadvgl9q2bnhvQE6qMf+lUj6VmKa+fyuEPvk=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.unoh.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Northwestern Ohio</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Northwestern Ohio</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://unoh.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jeremy Brinkman</md:GivenName>
-    <md:EmailAddress>jbrinkman@unoh.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-usc.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-usc.edu.xml
deleted file mode 100644
index d453f881..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-usc.edu.xml
+++ /dev/null
@@ -1,102 +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="urn:mace:incommon:usc.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">usc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Southern California</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>
-MIIDGDCCAgCgAwIBAgIJAIO8BJMy8v25MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnNoaWJib2xldGgudXNjLmVkdTAeFw0xMzA3MTUxODM0MTVaFw0yMzA3MTMx
-ODM0MTVaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudXNjLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALsR/GQRzogc63vGoWk94bSkvK5TYVtQvH9A
-yj7a8XXuQGr0+v/n6ElnjC7ir0TsrgsMizrWZuHNEdFi3ICV7ZATmuomH2IQbU/8
-iQ+Bk2y6tS3yaLhXlf8jOgoccGUAQwP/0+OoRNQmx6PzdkWBXjsiMDSIbRJj58L4
-IhTd5MYUYYbVY2JLZtgFXX7ACLkLrzTJhgCr/CkepP6PfTn+Nom+t+x04SQuUF8H
-5W2jwRRvlA1DOL0kZI7LWBarG4W99YHCCC4b5To9tvY+eNZoHCqbHXyYgBUlz4AT
-DJ9SRbU5MizWYWMDvVEklA/M4EQ+F7c8gpAVYt9hquBd3oYNi+MCAwEAAaNbMFkw
-OAYDVR0RBDEwL4ISc2hpYmJvbGV0aC51c2MuZWR1hhl1cm46bWFjZTppbmNvbW1v
-bjp1c2MuZWR1MB0GA1UdDgQWBBSFKUf2/Ha65sgbO2VkfrBkQFzIjTANBgkqhkiG
-9w0BAQUFAAOCAQEAlssx6u6/cU5ucI1TEUfw9sNhVpYyRX6kzAnzNIkyuq1vNv7y
-DFBKbvKlMjuXbxEqLU9pGUgZaRW0yHLTa2Lj001ohk2A/AhhAEoNYJOIeN2w3bFl
-COY0jAtSyCs9CEK7t6i1+w1jH3CBE1QO8BLHK5jMLkBEuL6KCpshxypyqVxA99cf
-z5Bx1PefOz4/mE6zQrYUwbn1wSlbPnG8VvFHCkPWFYq0fUtt2GFa9/Va4MfzMJO8
-zh419vf+P3WE28wIM1uzuNJnnN1ugTINM0tdncgJnoXGwXPXpDvIDUWBHqHhqiqf
-8bMYQw/J8MvmwVw++cbBCgAi6bEcrOpcge9r1g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.usc.edu:8444/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.usc.edu:8444/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.usc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.usc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.usc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.usc.edu/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">usc.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIJAIO8BJMy8v25MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnNoaWJib2xldGgudXNjLmVkdTAeFw0xMzA3MTUxODM0MTVaFw0yMzA3MTMx
-ODM0MTVaMB0xGzAZBgNVBAMTEnNoaWJib2xldGgudXNjLmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALsR/GQRzogc63vGoWk94bSkvK5TYVtQvH9A
-yj7a8XXuQGr0+v/n6ElnjC7ir0TsrgsMizrWZuHNEdFi3ICV7ZATmuomH2IQbU/8
-iQ+Bk2y6tS3yaLhXlf8jOgoccGUAQwP/0+OoRNQmx6PzdkWBXjsiMDSIbRJj58L4
-IhTd5MYUYYbVY2JLZtgFXX7ACLkLrzTJhgCr/CkepP6PfTn+Nom+t+x04SQuUF8H
-5W2jwRRvlA1DOL0kZI7LWBarG4W99YHCCC4b5To9tvY+eNZoHCqbHXyYgBUlz4AT
-DJ9SRbU5MizWYWMDvVEklA/M4EQ+F7c8gpAVYt9hquBd3oYNi+MCAwEAAaNbMFkw
-OAYDVR0RBDEwL4ISc2hpYmJvbGV0aC51c2MuZWR1hhl1cm46bWFjZTppbmNvbW1v
-bjp1c2MuZWR1MB0GA1UdDgQWBBSFKUf2/Ha65sgbO2VkfrBkQFzIjTANBgkqhkiG
-9w0BAQUFAAOCAQEAlssx6u6/cU5ucI1TEUfw9sNhVpYyRX6kzAnzNIkyuq1vNv7y
-DFBKbvKlMjuXbxEqLU9pGUgZaRW0yHLTa2Lj001ohk2A/AhhAEoNYJOIeN2w3bFl
-COY0jAtSyCs9CEK7t6i1+w1jH3CBE1QO8BLHK5jMLkBEuL6KCpshxypyqVxA99cf
-z5Bx1PefOz4/mE6zQrYUwbn1wSlbPnG8VvFHCkPWFYq0fUtt2GFa9/Va4MfzMJO8
-zh419vf+P3WE28wIM1uzuNJnnN1ugTINM0tdncgJnoXGwXPXpDvIDUWBHqHhqiqf
-8bMYQw/J8MvmwVw++cbBCgAi6bEcrOpcge9r1g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.usc.edu:8444/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.usc.edu:8444/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Southern California</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Southern California</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.usc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Asbed Bedrossian</md:GivenName>
-    <md:EmailAddress>asbed@usc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth Admin</md:GivenName>
-    <md:EmailAddress>shib-admin-l@usc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>ITS Security</md:GivenName>
-    <md:EmailAddress>security@usc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-usf.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-usf.edu.xml
deleted file mode 100644
index f51e0873..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-usf.edu.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="urn:mace:incommon:usf.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">usf.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of South Florida</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This is the Shibboleth Identity Provider for the University of South Florida</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.usf.edu</mdui:InformationURL>
-        <mdui:Logo height="47" width="316" xml:lang="en">https://cdn.usf.edu/themes/sun-globe/global/1.0.0/images/header/banner/banner-logo.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>
-MIIFLTCCBBWgAwIBAgIJANCZEr8p39EUMA0GCSqGSIb3DQEBBQUAMIG/MQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHRmxvcmlkYTEOMAwGA1UEBxMFVGFtcGExJDAiBgNV
-BAoTG1VuaXZlcnNpdHkgb2YgU291dGggRmxvcmlkYTEfMB0GA1UECxMWSW5mb3Jt
-YXRpb24gVGVjaG5vbG9neTEbMBkGA1UEAxMSc2hpYmJvbGV0aC51c2YuZWR1MSow
-KAYJKoZIhvcNAQkBFhtjaW1zLXRlY2gtY29yZUBtYWlsLnVzZi5lZHUwHhcNMTEw
-NzI2MTQ0MTExWhcNMjEwNzIzMTQ0MTExWjCBvzELMAkGA1UEBhMCVVMxEDAOBgNV
-BAgTB0Zsb3JpZGExDjAMBgNVBAcTBVRhbXBhMSQwIgYDVQQKExtVbml2ZXJzaXR5
-IG9mIFNvdXRoIEZsb3JpZGExHzAdBgNVBAsTFkluZm9ybWF0aW9uIFRlY2hub2xv
-Z3kxGzAZBgNVBAMTEnNoaWJib2xldGgudXNmLmVkdTEqMCgGCSqGSIb3DQEJARYb
-Y2ltcy10ZWNoLWNvcmVAbWFpbC51c2YuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAvzI2REpueqDJpnzHBKBiTzJjmotztSUBLnj3nQP1FIO2puJB
-Tpg2KbWU8xgmgp0Mpn5TaAiUSG6QbAdKoNzqrGh6iXemYePA1nT+PZWgUG4x/GC+
-H7SBpw3B0h4iKrHZuS2bQfsK1WPf4QLyNVVxcFcl3GXVvZ7dGAMDCoesK94D9bPq
-hLe3vZflU0xTZrRWYIQAQX2OEjsWdZTgwNXfb2LXVn6j3mNHDsUf57qKTdFxMAzb
-778aoF2mcYedYR6WZBbBOrFctlXyEwfkTYctYN+rsGzndFrnQdfU11xLOT/pGLd9
-0ddARSUZde+IF1lff4IVk6tKIcwaTjkltIVmyQIDAQABo4IBKDCCASQwHQYDVR0O
-BBYEFO0Ld280QBsZ1lZjPWkBu9SfKVVLMIH0BgNVHSMEgewwgemAFO0Ld280QBsZ
-1lZjPWkBu9SfKVVLoYHFpIHCMIG/MQswCQYDVQQGEwJVUzEQMA4GA1UECBMHRmxv
-cmlkYTEOMAwGA1UEBxMFVGFtcGExJDAiBgNVBAoTG1VuaXZlcnNpdHkgb2YgU291
-dGggRmxvcmlkYTEfMB0GA1UECxMWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEbMBkG
-A1UEAxMSc2hpYmJvbGV0aC51c2YuZWR1MSowKAYJKoZIhvcNAQkBFhtjaW1zLXRl
-Y2gtY29yZUBtYWlsLnVzZi5lZHWCCQDQmRK/Kd/RFDAMBgNVHRMEBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4IBAQBTBRwLvzb+Fij+VKbA6Erof/eIHeHEdYZSpY0I1Ah7
-4HVc0MkF3ILdvId6FnIYBqMEtpGX7O6t73CFBCZ2xcICX5ceYXb6c07Pg5EJ66dM
-LN7JaWKEX1hOuzDaSabspKshnPdjU06jyMkF0DvZ8+hmD8U9VCFbs/VpRP33J/bE
-aynShAHxIbud5Uy/4h6MNDtc56sScEqBUb4D7Xm14Kg15keCBxUvumoUxdD/ykrg
-ccGf3bUq48WwGSuikV1OjN+buvlSmWlZYDKzuU2Azdvezk5BK/mEEHxZJIdTWbpd
-wHRSBfdWykar3yfWl3v3l4C3ARmBsVmmqD2lXRtpfZtO
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.usf.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.usf.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.usf.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of South Florida</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of South Florida</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.usf.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Eric Pierce</md:GivenName>
-    <md:EmailAddress>epierce@usf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Randy Smith</md:GivenName>
-    <md:EmailAddress>rwsmith@usf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>USF IT HelpDesk</md:GivenName>
-    <md:EmailAddress>help@usf.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Office of Information Security</md:GivenName>
-    <md:EmailAddress>security@usf.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-utah.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-utah.edu.xml
deleted file mode 100644
index 3d3a5557..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-utah.edu.xml
+++ /dev/null
@@ -1,108 +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="urn:mace:incommon:utah.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">utah.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Utah</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>
-MIIDMDCCAhigAwIBAgIUNKGu8wOF9BnZeWHZWXe1e0FzhbswDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWaW5jb21tb24yLnNzby51dGFoLmVkdTAeFw0xMjAyMjIx
-NDE2MjBaFw0zMjAyMjIxNDE2MjBaMCExHzAdBgNVBAMTFmluY29tbW9uMi5zc28u
-dXRhaC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdsIv0Mok5
-7t9I1reRFzXyiMKr4sIIqHJmAU4vIfUJKTQnag8or8UNfTVSuVoiuFK3Y+luj7DH
-eGOHKXT1/6ijpa8a4Xqd/4m9znYiJznKEzXFFK+/kaXnxOZrieBC84iDMz5tM1JU
-GeP/C08IZP12cLfVaZh1EwwBwwvlTV369HU9RGYruCIY/KB5Kg6dA0JrRQ96lHdd
-oA9Vvme13w0m3CpAasIKQa3tkucS8T2VHuoswIjFS7ZghdSZqW/oQ2QOccCWCIlZ
-0u6dRR1p0/LyisMZhUaw/BE3FfI4XHUxPwhqpoag/HZ/9Un4KHT45MVeOTcJsYUl
-FiAwbrFWwLzFAgMBAAGjYDBeMD0GA1UdEQQ2MDSCFmluY29tbW9uMi5zc28udXRh
-aC5lZHWGGnVybjptYWNlOmluY29tbW9uOnV0YWguZWR1MB0GA1UdDgQWBBR2NZXC
-E4XVo97LgWbwBI8KGWGrhTANBgkqhkiG9w0BAQUFAAOCAQEAjiT3XYm5IkX2JDKK
-9OwLBcja+C6eA/bkbM/QSz6s2e3R7PhXfHvcAxYxbsrdQwBQtFMgnlfR/P2r5/ja
-FQxeF43HX7P+R4pxLSCw8616O4CnKavxJJB0cu9fYMuLjuDbaGVmbrbmfd2fvGVD
-QEB914XUZYgkzwpmOwWd8UHe0yekCp1hh9+nNDFk8igygIgCK3S3GI92a8nPk+q5
-5sww8+31zIp4TNX4Wm5cr+LBmjduLwzJAZby/2TbKJK4hamZIxR/g6hfM4XYCZdl
-h0/pbgjQw2DUQBBatGw8zWsm3JzHUhIsZiiVP2ssUblwHzK4HcNHX1Y3xrTINpgW
-chyV0g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon2.sso.utah.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon2.sso.utah.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://incommon2.sso.utah.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://incommon2.sso.utah.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://incommon2.sso.utah.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://incommon2.sso.utah.edu/idp/profile/Shibboleth/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">utah.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIUNKGu8wOF9BnZeWHZWXe1e0FzhbswDQYJKoZIhvcNAQEF
-BQAwITEfMB0GA1UEAxMWaW5jb21tb24yLnNzby51dGFoLmVkdTAeFw0xMjAyMjIx
-NDE2MjBaFw0zMjAyMjIxNDE2MjBaMCExHzAdBgNVBAMTFmluY29tbW9uMi5zc28u
-dXRhaC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdsIv0Mok5
-7t9I1reRFzXyiMKr4sIIqHJmAU4vIfUJKTQnag8or8UNfTVSuVoiuFK3Y+luj7DH
-eGOHKXT1/6ijpa8a4Xqd/4m9znYiJznKEzXFFK+/kaXnxOZrieBC84iDMz5tM1JU
-GeP/C08IZP12cLfVaZh1EwwBwwvlTV369HU9RGYruCIY/KB5Kg6dA0JrRQ96lHdd
-oA9Vvme13w0m3CpAasIKQa3tkucS8T2VHuoswIjFS7ZghdSZqW/oQ2QOccCWCIlZ
-0u6dRR1p0/LyisMZhUaw/BE3FfI4XHUxPwhqpoag/HZ/9Un4KHT45MVeOTcJsYUl
-FiAwbrFWwLzFAgMBAAGjYDBeMD0GA1UdEQQ2MDSCFmluY29tbW9uMi5zc28udXRh
-aC5lZHWGGnVybjptYWNlOmluY29tbW9uOnV0YWguZWR1MB0GA1UdDgQWBBR2NZXC
-E4XVo97LgWbwBI8KGWGrhTANBgkqhkiG9w0BAQUFAAOCAQEAjiT3XYm5IkX2JDKK
-9OwLBcja+C6eA/bkbM/QSz6s2e3R7PhXfHvcAxYxbsrdQwBQtFMgnlfR/P2r5/ja
-FQxeF43HX7P+R4pxLSCw8616O4CnKavxJJB0cu9fYMuLjuDbaGVmbrbmfd2fvGVD
-QEB914XUZYgkzwpmOwWd8UHe0yekCp1hh9+nNDFk8igygIgCK3S3GI92a8nPk+q5
-5sww8+31zIp4TNX4Wm5cr+LBmjduLwzJAZby/2TbKJK4hamZIxR/g6hfM4XYCZdl
-h0/pbgjQw2DUQBBatGw8zWsm3JzHUhIsZiiVP2ssUblwHzK4HcNHX1Y3xrTINpgW
-chyV0g==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://incommon2.sso.utah.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://incommon2.sso.utah.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Utah</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Utah</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.utah.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Caprice Post</md:GivenName>
-    <md:EmailAddress>Caprice.Post@Utah.Edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Robert Roll</md:GivenName>
-    <md:EmailAddress>Robert.Roll@Utah.Edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bryan Wooten</md:GivenName>
-    <md:EmailAddress>bryan.wooten@utah.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tim Richardson</md:GivenName>
-    <md:EmailAddress>tim.richardson@utah.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-uww.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-uww.edu.xml
deleted file mode 100644
index 3e8fd3b4..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-uww.edu.xml
+++ /dev/null
@@ -1,151 +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="urn:mace:incommon:uww.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">uww.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Wisconsin - Whitewater</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>
-MIIDbjCCAlagAwIBAgIJANHauNynrVx7MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC51d3cuZWR1MB4XDTExMDUzMTE1MjIwNloXDTMxMDUzMTE1MjIwNlow
-FjEUMBIGA1UEAxMLaWRwLnV3dy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDVLtt93iHOjIrl1cBGkFywmwFS9cphF1mDK1zhyjOt8UqczDhX4K4Y
-v/pQ0n2og2t1eQEqHIon2SDMTWBerjWdFhOuOnlXYbr6j7TnTVKUZ3VbkxjaLJFI
-fJHs06Tbg1MJrTCL7Yw44E4ua9CcxTj8N7BD/auu6msoM5czCl9UWYAPV18IV7uR
-T/BMBYbQHbukS4x/kElh8hAe8OrHokvPTPlw1DUbIMxn7fnE+LBnQKGcsnqORvV2
-kKvHaLCyjHwLr7V9v4MgZ+TM3q2IurwJ6iOGBi324sXzXNni2quxZ7i+tYObvOa/
-3KlXrsFs+fZX8sdpcVoW8/knGGECpoL3AgMBAAGjgb4wgbswHQYDVR0OBBYEFPZJ
-XjkrAD3FBGLO3efYWJoINh66MEYGA1UdIwQ/MD2AFPZJXjkrAD3FBGLO3efYWJoI
-Nh66oRqkGDAWMRQwEgYDVQQDEwtpZHAudXd3LmVkdYIJANHauNynrVx7MAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMDoGA1UdEQQzMDGCC2lkcC51d3cuZWR1hiJodHRw
-czovL2lkcC51d3cuZWR1L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IB
-AQAmBfUmcnAg2/U/wrcnAs7psQpoAIxzzOM2bCcLfIpEpytg3lTR7xrg7vtncIkM
-bfHbsJkg20Ms6d0XuvWFDe5GbSCE2sYs4hbSN+c5gFsZTdZoq/1S1HP25TlpcxEo
-MDMgVAKoBixxia+6lnzYMqBzMVtV0/zFC/1kZA8JIjMl76bA+IyvLEDm7binWERc
-UYl2uzijiLLNRlQhNEIoLEECagEzX04SjpVwL3rgQf3hVj6bCWmx8uBbjGqlecDs
-QsXWzT9ZZmUIsQSvfFn5YihMdCKhtdoo2sLOaNbSY9XoOnwR+j3+k7/4kGCHcrPT
-D4gMA01lwUQDurauD6wSvYXJ
-          </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>
-MIIDGDCCAgCgAwIBAgIVAPtxOslOmXc+9xoiMxwmqTfiBqf4MA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC51d3cuZWR1MB4XDTA5MDUyOTE2MzUwNVoXDTI5
-MDUyOTE2MzUwNVowFjEUMBIGA1UEAxMLaWRwLnV3dy5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDVLtt93iHOjIrl1cBGkFywmwFS9cphF1mDK1zh
-yjOt8UqczDhX4K4Yv/pQ0n2og2t1eQEqHIon2SDMTWBerjWdFhOuOnlXYbr6j7Tn
-TVKUZ3VbkxjaLJFIfJHs06Tbg1MJrTCL7Yw44E4ua9CcxTj8N7BD/auu6msoM5cz
-Cl9UWYAPV18IV7uRT/BMBYbQHbukS4x/kElh8hAe8OrHokvPTPlw1DUbIMxn7fnE
-+LBnQKGcsnqORvV2kKvHaLCyjHwLr7V9v4MgZ+TM3q2IurwJ6iOGBi324sXzXNni
-2quxZ7i+tYObvOa/3KlXrsFs+fZX8sdpcVoW8/knGGECpoL3AgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC51d3cuZWR1hiJodHRwczovL2lkcC51d3cuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBT2SV45KwA9xQRizt3n2FiaCDYeujANBgkqhkiG
-9w0BAQUFAAOCAQEANEvunzLLBjeAN99Nkfp9iH93uYrsnSdR6kqw7JWfkheolMGS
-ALpER40Cq9EhfLZ6/TSFDAoB/ykygw6XdFWLw5WxQaJOvFFkeoon+WLHik/eLeVs
-+F0D1IG1QoT3fW+n/VqazB1cEjs3hb/outaOc2IPeKmWJUIYbh+unkCySQqfkTQq
-wu6siLxqVUBVBZXa5r3LlvLXnAiUWDcubYdF02bU9ygd36+/RJLPO4pA37QwMFHp
-l1iTzZIgt6BGrGtlACPEioKYqDkitjjLHpobISS8cUMV3oeIuOvJt88PryDSlQPH
-Lb3/4DTRLmlBb5hpWKEnDWEtB0NdnRXBOgpkoQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uww.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uww.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uww.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uww.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uww.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uww.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDbjCCAlagAwIBAgIJANHauNynrVx7MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-BAMTC2lkcC51d3cuZWR1MB4XDTExMDUzMTE1MjIwNloXDTMxMDUzMTE1MjIwNlow
-FjEUMBIGA1UEAxMLaWRwLnV3dy5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDVLtt93iHOjIrl1cBGkFywmwFS9cphF1mDK1zhyjOt8UqczDhX4K4Y
-v/pQ0n2og2t1eQEqHIon2SDMTWBerjWdFhOuOnlXYbr6j7TnTVKUZ3VbkxjaLJFI
-fJHs06Tbg1MJrTCL7Yw44E4ua9CcxTj8N7BD/auu6msoM5czCl9UWYAPV18IV7uR
-T/BMBYbQHbukS4x/kElh8hAe8OrHokvPTPlw1DUbIMxn7fnE+LBnQKGcsnqORvV2
-kKvHaLCyjHwLr7V9v4MgZ+TM3q2IurwJ6iOGBi324sXzXNni2quxZ7i+tYObvOa/
-3KlXrsFs+fZX8sdpcVoW8/knGGECpoL3AgMBAAGjgb4wgbswHQYDVR0OBBYEFPZJ
-XjkrAD3FBGLO3efYWJoINh66MEYGA1UdIwQ/MD2AFPZJXjkrAD3FBGLO3efYWJoI
-Nh66oRqkGDAWMRQwEgYDVQQDEwtpZHAudXd3LmVkdYIJANHauNynrVx7MAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMDoGA1UdEQQzMDGCC2lkcC51d3cuZWR1hiJodHRw
-czovL2lkcC51d3cuZWR1L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IB
-AQAmBfUmcnAg2/U/wrcnAs7psQpoAIxzzOM2bCcLfIpEpytg3lTR7xrg7vtncIkM
-bfHbsJkg20Ms6d0XuvWFDe5GbSCE2sYs4hbSN+c5gFsZTdZoq/1S1HP25TlpcxEo
-MDMgVAKoBixxia+6lnzYMqBzMVtV0/zFC/1kZA8JIjMl76bA+IyvLEDm7binWERc
-UYl2uzijiLLNRlQhNEIoLEECagEzX04SjpVwL3rgQf3hVj6bCWmx8uBbjGqlecDs
-QsXWzT9ZZmUIsQSvfFn5YihMdCKhtdoo2sLOaNbSY9XoOnwR+j3+k7/4kGCHcrPT
-D4gMA01lwUQDurauD6wSvYXJ
-          </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>
-MIIDGDCCAgCgAwIBAgIVAPtxOslOmXc+9xoiMxwmqTfiBqf4MA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC51d3cuZWR1MB4XDTA5MDUyOTE2MzUwNVoXDTI5
-MDUyOTE2MzUwNVowFjEUMBIGA1UEAxMLaWRwLnV3dy5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDVLtt93iHOjIrl1cBGkFywmwFS9cphF1mDK1zh
-yjOt8UqczDhX4K4Yv/pQ0n2og2t1eQEqHIon2SDMTWBerjWdFhOuOnlXYbr6j7Tn
-TVKUZ3VbkxjaLJFIfJHs06Tbg1MJrTCL7Yw44E4ua9CcxTj8N7BD/auu6msoM5cz
-Cl9UWYAPV18IV7uRT/BMBYbQHbukS4x/kElh8hAe8OrHokvPTPlw1DUbIMxn7fnE
-+LBnQKGcsnqORvV2kKvHaLCyjHwLr7V9v4MgZ+TM3q2IurwJ6iOGBi324sXzXNni
-2quxZ7i+tYObvOa/3KlXrsFs+fZX8sdpcVoW8/knGGECpoL3AgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC51d3cuZWR1hiJodHRwczovL2lkcC51d3cuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBT2SV45KwA9xQRizt3n2FiaCDYeujANBgkqhkiG
-9w0BAQUFAAOCAQEANEvunzLLBjeAN99Nkfp9iH93uYrsnSdR6kqw7JWfkheolMGS
-ALpER40Cq9EhfLZ6/TSFDAoB/ykygw6XdFWLw5WxQaJOvFFkeoon+WLHik/eLeVs
-+F0D1IG1QoT3fW+n/VqazB1cEjs3hb/outaOc2IPeKmWJUIYbh+unkCySQqfkTQq
-wu6siLxqVUBVBZXa5r3LlvLXnAiUWDcubYdF02bU9ygd36+/RJLPO4pA37QwMFHp
-l1iTzZIgt6BGrGtlACPEioKYqDkitjjLHpobISS8cUMV3oeIuOvJt88PryDSlQPH
-Lb3/4DTRLmlBb5hpWKEnDWEtB0NdnRXBOgpkoQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uww.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wisconsin - Whitewater</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin - Whitewater</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uww.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Nicholas A Ciesinski</md:GivenName>
-    <md:EmailAddress>ciesinsn@uww.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Nicholas A Ciesinski</md:GivenName>
-    <md:EmailAddress>ciesinsn@uww.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Nicholas A Ciesinski</md:GivenName>
-    <md:EmailAddress>ciesinsn@uww.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-virginia.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-virginia.edu.xml
deleted file mode 100644
index eac36751..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-virginia.edu.xml
+++ /dev/null
@@ -1,108 +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="urn:mace:incommon:virginia.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://shibidp.its.virginia.edu/shiberror.html" 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">virginia.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Virginia</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>
-MIIDOzCCAiOgAwIBAgIVALIs8V8u06NEcoiPKqBdTWQ5F3WdMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJpZHAuaXRzLnZpcmdpbmlhLmVkdTAeFw0xMjAz
-MDIxNTI2MDNaFw0zMjAzMDIxNTI2MDNaMCMxITAfBgNVBAMTGHNoaWJpZHAuaXRz
-LnZpcmdpbmlhLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMz9
-8k0PGFjm33ceTUVhpw4fWO+oknxcOTL8o+nsnD3jiaF7KIBWs70+M9Ddkl8ih/os
-rXCPzBhmB/ttNgaKGczqGKCq+o1+cjBgrHzxfUOQAr6ne6ZyZgN0VbRNvkNDB9Te
-Gf9BAlByFcLbrM9xYfu5z79deO9m/M5q6FbD5QMY1qN8A5oJhi1IPZo5GuFCoUJz
-mWGRXSujZQHBFr5T+euyMxnC3Gr+yJhP5plm9tET5VEf/tCWmeeWam84e1u9LP2n
-bFYpusfGZ9lA/JgoYOdYTb5gcHb53yIzLxUF/KaUQACMqbIXZxpvg+7qpLZkBJIX
-G/Qipg5ProkW7GqyzrcCAwEAAaNmMGQwQwYDVR0RBDwwOoIYc2hpYmlkcC5pdHMu
-dmlyZ2luaWEuZWR1hh51cm46bWFjZTppbmNvbW1vbjp2aXJnaW5pYS5lZHUwHQYD
-VR0OBBYEFJe4yrDCKYu70HZV9azIdbPqM9KHMA0GCSqGSIb3DQEBBQUAA4IBAQB8
-G07ktM6zaMsydtat8FUHbQsDqMu51vJAg8DTHD63SoJSG/NFar8BNZH0DDb33Zyy
-4KXfVGzE5Jtg5cb/5eRLah42FtkfvXnSMKgn8jAx77jG3kD/okm0iCKP6RRS7L7Q
-l3CESXZORAXC50pPjoacANRdAl729CszcW65zUhoKBV37plZq5uRc7FTtjJujEOL
-0wsZTq9SmdmHtH3E+XabESqWp43vuMTNS2XPBQPIQUyuCldZN+N6jLkOGQI104P3
-3FljH7rKPo43+7MT2XZGS2J+PcALgUfSxewXei0RQNXWXN3l0qXupwsWM8kO6mSA
-zZQUr9YEODP0DFBKKGSo
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.its.virginia.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.its.virginia.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.its.virginia.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.its.virginia.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.its.virginia.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.its.virginia.edu/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">virginia.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDOzCCAiOgAwIBAgIVALIs8V8u06NEcoiPKqBdTWQ5F3WdMA0GCSqGSIb3DQEB
-BQUAMCMxITAfBgNVBAMTGHNoaWJpZHAuaXRzLnZpcmdpbmlhLmVkdTAeFw0xMjAz
-MDIxNTI2MDNaFw0zMjAzMDIxNTI2MDNaMCMxITAfBgNVBAMTGHNoaWJpZHAuaXRz
-LnZpcmdpbmlhLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMz9
-8k0PGFjm33ceTUVhpw4fWO+oknxcOTL8o+nsnD3jiaF7KIBWs70+M9Ddkl8ih/os
-rXCPzBhmB/ttNgaKGczqGKCq+o1+cjBgrHzxfUOQAr6ne6ZyZgN0VbRNvkNDB9Te
-Gf9BAlByFcLbrM9xYfu5z79deO9m/M5q6FbD5QMY1qN8A5oJhi1IPZo5GuFCoUJz
-mWGRXSujZQHBFr5T+euyMxnC3Gr+yJhP5plm9tET5VEf/tCWmeeWam84e1u9LP2n
-bFYpusfGZ9lA/JgoYOdYTb5gcHb53yIzLxUF/KaUQACMqbIXZxpvg+7qpLZkBJIX
-G/Qipg5ProkW7GqyzrcCAwEAAaNmMGQwQwYDVR0RBDwwOoIYc2hpYmlkcC5pdHMu
-dmlyZ2luaWEuZWR1hh51cm46bWFjZTppbmNvbW1vbjp2aXJnaW5pYS5lZHUwHQYD
-VR0OBBYEFJe4yrDCKYu70HZV9azIdbPqM9KHMA0GCSqGSIb3DQEBBQUAA4IBAQB8
-G07ktM6zaMsydtat8FUHbQsDqMu51vJAg8DTHD63SoJSG/NFar8BNZH0DDb33Zyy
-4KXfVGzE5Jtg5cb/5eRLah42FtkfvXnSMKgn8jAx77jG3kD/okm0iCKP6RRS7L7Q
-l3CESXZORAXC50pPjoacANRdAl729CszcW65zUhoKBV37plZq5uRc7FTtjJujEOL
-0wsZTq9SmdmHtH3E+XabESqWp43vuMTNS2XPBQPIQUyuCldZN+N6jLkOGQI104P3
-3FljH7rKPo43+7MT2XZGS2J+PcALgUfSxewXei0RQNXWXN3l0qXupwsWM8kO6mSA
-zZQUr9YEODP0DFBKKGSo
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.its.virginia.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.its.virginia.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Virginia</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Virginia</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.virginia.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Hamp Carruth</md:GivenName>
-    <md:EmailAddress>ehc@Virginia.EDU</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ITC Unix Systems</md:GivenName>
-    <md:EmailAddress>systems@virginia.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Systems Support</md:GivenName>
-    <md:EmailAddress>systems@virginia.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>UVa InCommon Admin</md:GivenName>
-    <md:EmailAddress>incommon-admin@virginia.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml
deleted file mode 100644
index f64f4a4a..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-vt.edu.xml
+++ /dev/null
@@ -1,130 +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="urn:mace:incommon:vt.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://id.incommon.org/assurance/bronze</saml:AttributeValue>
-        <saml:AttributeValue>http://id.incommon.org/assurance/silver</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://login.vt.edu/support.jsp" 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">vt.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Virginia Polytechnic Institute and State University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.vt.edu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.vt.edu/about/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="40" width="230" xml:lang="en">https://www.branding.unirel.vt.edu/images/S_logo-virginia-tech.jpg</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>
-MIIEETCCAvmgAwIBAgIJANFfZSukyEO/MA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExEzARBgNVBAcMCkJsYWNrc2J1cmcx
-PDA6BgNVBAoMM1ZpcmdpbmlhIFBvbHl0ZWNobmljIEluc3RpdHV0ZSBhbmQgU3Rh
-dGUgVW5pdmVyc2l0eTETMBEGA1UECwwKTWlkZGxld2FyZTEUMBIGA1UEAwwLc2hp
-Yi52dC5lZHUwHhcNMTUwNTE1MTIzNjUyWhcNMjAwNTE0MTIzNjUyWjCBnjELMAkG
-A1UEBhMCVVMxETAPBgNVBAgMCFZpcmdpbmlhMRMwEQYDVQQHDApCbGFja3NidXJn
-MTwwOgYDVQQKDDNWaXJnaW5pYSBQb2x5dGVjaG5pYyBJbnN0aXR1dGUgYW5kIFN0
-YXRlIFVuaXZlcnNpdHkxEzARBgNVBAsMCk1pZGRsZXdhcmUxFDASBgNVBAMMC3No
-aWIudnQuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7NT6bMir
-XETWSQhI1Fr1Ppva6E/ZUfAlV0RLQ78cgGW5//JNoER3TwxpSVFkYupPOoatnC3k
-+6cfJmuib7JjtFizyqgXLNrLlEembZbECXHGR/+P9oUEWQhrAPjRz2ZugWpQRiFD
-dddD4uaJhigkeayFe7VNERg8QTaS+avQisuMOnHlnmpXOQi19PdY7+5auHwIgQ0y
-eSUKFaIwpwL8wx93r5JtHvIajJ4RjmWgtN1o4v0YR3RX3I4lspEXlmIPlOBv8d6k
-wicOB2WszBrVw6zTYEdXQ9j1IRKXqwmWCCYREFnHYzGjhcpptZPEYJJX90ke6ffF
-defssBhk/oc2bwIDAQABo1AwTjAdBgNVHQ4EFgQUzFhBa3OBEjb9liQHKAuWoUwo
-5McwHwYDVR0jBBgwFoAUzFhBa3OBEjb9liQHKAuWoUwo5McwDAYDVR0TBAUwAwEB
-/zANBgkqhkiG9w0BAQUFAAOCAQEARVsLDVRz6xPx2hzIgNy7ro49tLERHmGyzK14
-AkezGKhJA3q8371FgUpSTFu0pAcl6X6v2xJRb4CFhRxIpe+/xbEP2CznPUKybE3A
-I5NINQy6jlWXad5fYRohDI4m9ON39BO3MEIHKLm2FLHUXE0NmEWoyNeg+4cjZMK/
-eTd7/azVGGJNAVKLfNaHHm1K1MVWtTK1Jt5QuG0iy2PZnKQOJ4c7RUrAHOqfg8TE
-6Cq66ObNkIKPmivcU0uUy27IT9eM9Y/WyNfYY3isQqvLareyEiHQTeZniIwlq734
-QYvy/+Jxoro0d/n+VkiOjSlrLIrprl9zVmvWjjPvpth13a2m1Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.vt.edu:10443/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.vt.edu:10443/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.vt.edu/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.vt.edu/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.vt.edu:10443/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.vt.edu/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.vt.edu/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.vt.edu/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.vt.edu/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.vt.edu:10443/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vt.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEETCCAvmgAwIBAgIJALq5f54rrOCOMA0GCSqGSIb3DQEBBQUAMIGeMQswCQYD
-VQQGEwJVUzERMA8GA1UECAwIVmlyZ2luaWExEzARBgNVBAcMCkJsYWNrc2J1cmcx
-PDA6BgNVBAoMM1ZpcmdpbmlhIFBvbHl0ZWNobmljIEluc3RpdHV0ZSBhbmQgU3Rh
-dGUgVW5pdmVyc2l0eTETMBEGA1UECwwKTWlkZGxld2FyZTEUMBIGA1UEAwwLc2hp
-Yi52dC5lZHUwHhcNMTUwNTE1MTQ0MjE4WhcNMjAwNTE0MTQ0MjE4WjCBnjELMAkG
-A1UEBhMCVVMxETAPBgNVBAgMCFZpcmdpbmlhMRMwEQYDVQQHDApCbGFja3NidXJn
-MTwwOgYDVQQKDDNWaXJnaW5pYSBQb2x5dGVjaG5pYyBJbnN0aXR1dGUgYW5kIFN0
-YXRlIFVuaXZlcnNpdHkxEzARBgNVBAsMCk1pZGRsZXdhcmUxFDASBgNVBAMMC3No
-aWIudnQuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAznIn2tzm
-1KG1C6RkcrNhvmDb/LOpbviDkMAo/8p9rLvcOusFwMwOzcUO7SZt5s8wWG4R2ra1
-mFueJ+C3u9kjry/38asr5TLuOCpc0/CXIINXrRFV9yfL57i5HlloQh6JqLG0XKjS
-FFPF96Aorsnwhr4QFD1ETaRzB/i4q+ACiX5tthEvQOSNUvN/ZhJM6Xgsp4FR9PdR
-rLEi2WfW/Y1uuUqWooAlpeUjFrVesa2bZo10xu3K4ydeH8mj6d+YjYxz9UZ+PTJ7
-GmC7TWwes+n5Ew8c2V8dBJH/atgPCJDqv7XNeNvYyqpOO4iWxftVk7shWjzCAawL
-jaMOrxbQipLImQIDAQABo1AwTjAdBgNVHQ4EFgQUUdtot3rbZJPARIqWDA3NFsK6
-rHMwHwYDVR0jBBgwFoAUUdtot3rbZJPARIqWDA3NFsK6rHMwDAYDVR0TBAUwAwEB
-/zANBgkqhkiG9w0BAQUFAAOCAQEALqSmtVWS8MZIAekwDIIV8/MX16XbJIf4qj/Z
-NmM+UXtAzOZ6Tg9ZnWOmAI138wILyQ1sBLJDBreOP0dvHLtI7GamMIlpJ+EjQ/mI
-o9/2ceLTKyE8RDa3Ge2Fa37cN70psum+aSIqWW8AD4t86H0omQHJ5b4JSDTGK92X
-rDvxTL8YHBDra9btpkTgpLg4FbjfBUCBOwR4ufHMFxqvPhCf4Bd4PaG2z+cYufj2
-Nx4mXDispAMSseaMORrEqkmePOfKS2dKO0CsEtfKtELhQ7FrXTVW8O5nm7+9ej+F
-+jZpcemMJOiPy8U9eb3yq+vRduFXh4Ddw6yyhWUWPuyVdZcrGw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.vt.edu:10443/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Virginia Polytechnic Institute and State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Virginia Polytechnic Institute and State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vt.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marvin Addison</md:GivenName>
-    <md:EmailAddress>shib-admin@vt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mary Dunker</md:GivenName>
-    <md:EmailAddress>dunker@vt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Marvin Addison</md:GivenName>
-    <md:EmailAddress>shib-admin@vt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>4Help</md:GivenName>
-    <md:EmailAddress>4help@vt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>IT Security Office</md:GivenName>
-    <md:EmailAddress>itso@vt.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-incommon-washington.edu.xml b/swamid-interfederations-2.0/urn-mace-incommon-washington.edu.xml
deleted file mode 100644
index 8fff0912..00000000
--- a/swamid-interfederations-2.0/urn-mace-incommon-washington.edu.xml
+++ /dev/null
@@ -1,78 +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="urn:mace:incommon:washington.edu">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">washington.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Washington</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of Washington IdP enables standards-based federation for the UW community.
-</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.cac.washington.edu/x/fiOD</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.washington.edu/online/privacy/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="79" width="160" xml:lang="en">https://wiki.cac.washington.edu/download/attachments/69729985/uw-logo.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>
-MIID/TCCAuWgAwIBAgIJAMoYJbDt9lKKMA0GCSqGSIb3DQEBBQUAMFwxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJXQTEhMB8GA1UEChMYVW5pdmVyc2l0eSBvZiBXYXNo
-aW5ndG9uMR0wGwYDVQQDExRpZHAudS53YXNoaW5ndG9uLmVkdTAeFw0xMTA0MjYx
-OTEwMzlaFw0yMTA0MjMxOTEwMzlaMFwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJX
-QTEhMB8GA1UEChMYVW5pdmVyc2l0eSBvZiBXYXNoaW5ndG9uMR0wGwYDVQQDExRp
-ZHAudS53YXNoaW5ndG9uLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMH9G8m68L0Hf9bmf4/7c+ERxgDQrbq50NfSi2YTQWc1veUIPYbZy1agSNuc
-4dwn3RtC0uOQbdNTYUAiVTcYgaYceJVB7syWf9QyGIrglZPMu98c5hWb7vqwvs6d
-3s2Sm7tBib2v6xQDDiZ4KJxpdAvsoPQlmGdgpFfmAsiYrnYFXLTHgbgCc/YhV8lu
-bTakUdI3bMYWfh9dkj+DVGUmt2gLtQUzbuH8EU44vnXgrQYSXNQkmRcyoE3rj4Rh
-hbu/p5D3P+nuOukLYFOLRaNeiiGyTu3P7gtc/dy/UjUrf+pH75UUU7Lb369dGEfZ
-wvVtITXsdyp0pBfun4CP808H9N0CAwEAAaOBwTCBvjAdBgNVHQ4EFgQUP5smx3ZY
-KODMkDglkTbduvLcGYAwgY4GA1UdIwSBhjCBg4AUP5smx3ZYKODMkDglkTbduvLc
-GYChYKReMFwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJXQTEhMB8GA1UEChMYVW5p
-dmVyc2l0eSBvZiBXYXNoaW5ndG9uMR0wGwYDVQQDExRpZHAudS53YXNoaW5ndG9u
-LmVkdYIJAMoYJbDt9lKKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-AEo7c2CNHEI+Fvz5DhwumU+WHXqwSOK47MxXwNJVpFQ9GPR2ZGDAq6hzLJLAVWcY
-4kB3ECDkRtysAWSFHm1roOU7xsU9f0C17QokoXfLNC0d7KoivPM6ctl8aRftU5mo
-yFJkkJX3qSExXrl053uxTOQVPms4ypkYv1A/FBZWgSC8eNoYnBnv1Mhy4m8bfeEN
-7qT9rFoxh4cVjMH1Ykq7JWyFXLEB4ifzH4KHyplt5Ryv61eh6J1YPFa2RurVTyGp
-HJZeOLUIBvJu15GzcexuDDXe0kg7sHD6PbK0xzEF/QeXP/hXzMxR9kQXB/IR/b2k
-4ien+EM3eY/ueBcTZ95dgVM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.u.washington.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u.washington.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.u.washington.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.u.washington.edu/idp/profile/SAML2/SOAP/ECP"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Washington</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Washington</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.washington.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IAM Technical Support</md:GivenName>
-    <md:EmailAddress>iam-support@uw.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IAM Administrative Support</md:GivenName>
-    <md:EmailAddress>iam-support@uw.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IAM Support</md:GivenName>
-    <md:EmailAddress>iam-support@uw.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml b/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml
deleted file mode 100644
index ed5f1ffe..00000000
--- a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml
+++ /dev/null
@@ -1,97 +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="urn:mace:kuleuven.be:kulassoc:khleuven.be">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">associatie.kuleuven.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khleuven.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">KHLeuven</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Katholieke Hogeschool Leuven</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.khleuven.be</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-	MIIDKDCCAhCgAwIBAgIVAIEBQgacYZ+Obt/8LGcNE9xCxtg1MA0GCSqGSIb3DQEB
-	BQUAMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTAeFw0wOTEyMTUwOTI5Mjla
-	Fw0yOTEyMTUwOTI5MjlaMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTCCASIw
-	DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJo7I1DRJ2ulw9KOgJGEX3Yo+Oi1
-	axnNmLMaJQGWHIuKOih7ePjvm2MuGaFHZZLHsa3yI6JMsi6OWoh4FnUTfU8t+lSc
-	i9Mn4zjQBIGQK6HAQiFjouUuMAKGD0hvXuqtIbw7cNK6dABRuZx6xbJ7HveUAb2W
-	iLshYnfJ5smDY44UN68eOZfRS941NE+hY2EESWfRtHj3bF8K1eClv9DKaxB7A6zA
-	3A0kZrum6K2DiyiN4gj9pUpC0w86jdXmPq+/8XXHLnX2RTBJE55KNzNe82n0DomT
-	qVXGZ5bxBNuSuS+IGKQpxNDO6py7wKxUVMdIRHoy2xUqU62JunMyfExCgwcCAwEA
-	AaNlMGMwQgYDVR0RBDswOYIPaWRwLmtobGV1dmVuLmJlhiZodHRwczovL2lkcC5r
-	aGxldXZlbi5iZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU6LNVU7ay63LW4qY9
-	gmQd70bUxXQwDQYJKoZIhvcNAQEFBQADggEBABGQdtkb/TncVxlIi0ejI3AHUYmG
-	RT05mU0Cmt1SEKybN6/VvwamKPWc9bmJu+uxJo3bxRVzOfUdXExZCe9KoLugj7KJ
-	ECH1yRDSb+s9TV2djqGEQO104Ol6fhDRH1YV7FWGjQ79Roddu6IwEawek4VEY4om
-	rQmBOTjKUb10v9xTTX28PsTM7e8Avbu9BujIgeX4KcsUWqDDsX8r9P8hK7aOS7Ym
-	XPLrSitrNNrQYr9FzuRm995nQ20lVTjh83TiPADSXUXDkebI9GcKqDA662HTNpNp
-	5Dpn+ZM2hbJN+AbA9QdpVSb+MJCzpRyh2AlN8simVEiciy1+p5tWR3iLwv8=	
-				    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.khleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.khleuven.be: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.khleuven.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.khleuven.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.khleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.khleuven.be/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">associatie.kuleuven.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khleuven.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>idp.khleuven.be</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-	MIIDKDCCAhCgAwIBAgIVAIEBQgacYZ+Obt/8LGcNE9xCxtg1MA0GCSqGSIb3DQEB
-	BQUAMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTAeFw0wOTEyMTUwOTI5Mjla
-	Fw0yOTEyMTUwOTI5MjlaMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTCCASIw
-	DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJo7I1DRJ2ulw9KOgJGEX3Yo+Oi1
-	axnNmLMaJQGWHIuKOih7ePjvm2MuGaFHZZLHsa3yI6JMsi6OWoh4FnUTfU8t+lSc
-	i9Mn4zjQBIGQK6HAQiFjouUuMAKGD0hvXuqtIbw7cNK6dABRuZx6xbJ7HveUAb2W
-	iLshYnfJ5smDY44UN68eOZfRS941NE+hY2EESWfRtHj3bF8K1eClv9DKaxB7A6zA
-	3A0kZrum6K2DiyiN4gj9pUpC0w86jdXmPq+/8XXHLnX2RTBJE55KNzNe82n0DomT
-	qVXGZ5bxBNuSuS+IGKQpxNDO6py7wKxUVMdIRHoy2xUqU62JunMyfExCgwcCAwEA
-	AaNlMGMwQgYDVR0RBDswOYIPaWRwLmtobGV1dmVuLmJlhiZodHRwczovL2lkcC5r
-	aGxldXZlbi5iZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU6LNVU7ay63LW4qY9
-	gmQd70bUxXQwDQYJKoZIhvcNAQEFBQADggEBABGQdtkb/TncVxlIi0ejI3AHUYmG
-	RT05mU0Cmt1SEKybN6/VvwamKPWc9bmJu+uxJo3bxRVzOfUdXExZCe9KoLugj7KJ
-	ECH1yRDSb+s9TV2djqGEQO104Ol6fhDRH1YV7FWGjQ79Roddu6IwEawek4VEY4om
-	rQmBOTjKUb10v9xTTX28PsTM7e8Avbu9BujIgeX4KcsUWqDDsX8r9P8hK7aOS7Ym
-	XPLrSitrNNrQYr9FzuRm995nQ20lVTjh83TiPADSXUXDkebI9GcKqDA662HTNpNp
-	5Dpn+ZM2hbJN+AbA9QdpVSb+MJCzpRyh2AlN8simVEiciy1+p5tWR3iLwv8=			    
-				    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.khleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.khleuven.be: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">Katholieke Hogeschool Leuven</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">KHLeuven</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.khleuven.be/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Technical Support</md:SurName>
-    <md:EmailAddress>support@khleuven.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml b/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml
deleted file mode 100644
index d3624c1e..00000000
--- a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml
+++ /dev/null
@@ -1,166 +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="urn:mace:kuleuven.be:kulassoc:kuleuven.be">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" 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>
-  </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">kuleuven.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groept.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hubkaho.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odisee.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucll.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vives.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luca-arts.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khlim.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khleuven.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thomasmore.be</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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="nl">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+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3Jk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</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be: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.kuleuven.be/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kuleuven.be/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">kuleuven.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groept.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hubkaho.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">odisee.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucll.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vives.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luca-arts.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khlim.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khleuven.be</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thomasmore.be</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be: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="nl">KU Leuven / Associatie KU Leuven</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">KU Leuven / KU Leuven Association</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">KU Leuven / Associatie KU Leuven</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">KU Leuven / KU Leuven Association</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.kuleuven.be</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.kuleuven.be</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>AAI team</md:GivenName>
-    <md:EmailAddress>shib@kuleuven.be</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ICTS Servicepunt</md:GivenName>
-    <md:EmailAddress>servicepunt@icts.kuleuven.be</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml b/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.xml
deleted file mode 100644
index c9207fae..00000000
--- a/swamid-interfederations-2.0/urn-urkund-shibboleth-sp.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="urn:urkund:shibboleth: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">
-      <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.swamid.se/category/eu-adequate-protection</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</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>
-      <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://secure.urkund.com/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">URKUND</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">URKUND</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">URKUND is an online plagiarism checker service reserved for teachers</mdui:Description>
-        <mdui:Description xml:lang="en">URKUND is an online plagiarism checker service reserved for teachers</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.urkund.com/se/om-urkund</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.urkund.com/en/about-urkund</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://static.urkund.com/documents/URKUND_SP_privacy.pdf</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>urkundweb.urkund.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=urkundweb.urkund.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAL61GoCfz8heMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Vya3VuZHdlYi51cmt1bmQuc2UwHhcNMDkwMzAzMTU1NjQyWhcNMTkwMzAx
-MTU1NjQyWjAeMRwwGgYDVQQDExN1cmt1bmR3ZWIudXJrdW5kLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3RwMFJu304/B3qtfLT8r2vKBOugNcfyZ
-EDsf4Q4ZHFDFhWOh6VAuywjpixKBm/LYCrRyKqnM2hRVWKIIKpTvlu7TD1Se/G/g
-m6VxdXi02oc+7d6Q18SXmqHjFCaxh73HiEqwarofgRKXrVWupruUv/5//nIXeNWC
-u9GuFWYEug5Vj0lw7SoVZC3B0fsbVjQGHEpl4ybc6aCAleuyndWbaa+HXEmSr/d6
-sVjSu2F1d/OCPoeZ9U3Q5lLzLwpV67oXY1dLzwSLu17KiP6bzyqsopHAaac34rZ1
-Ia5m722Sdv55LA2JXX0k/D9QXduyLVnmzEhAvzyiyUKo9hMAhFwjrwIDAQABo0Ew
-PzAeBgNVHREEFzAVghN1cmt1bmR3ZWIudXJrdW5kLnNlMB0GA1UdDgQWBBTWCFlV
-iTs20fc8BncRSVYrqXdS8jANBgkqhkiG9w0BAQUFAAOCAQEAQnPM81umUT9cokgv
-d7qjClP5S4ufKMgscVIu5umiV3aOSpDTsCAxvfSp3z5tywF1EQ/6FRrTSVIZiS+e
-wbR9+JEVOnxV3D81Xv4p23zj0p1g2d6gdlpfbOmGiCWqx75QosHqfP6ENFDFCwxl
-CasucZK1gv2h3Sat232poJYdoDcmDKZt7DRIcs88k+85/TG3CnB6LUWjv35NrMGq
-YcF3FDUEnWCpXVoOF3bB84M9zlrggkBlhid47DpJZ54EcMl8qrMQmOJDcw4/1Jc1
-idGXqKfeI6/eA5cV6Kvyy63eSji0hOvD1CKIhufI3w6R1+DU0pSVsv+t7ND9KWBl
-gEln3A==
-</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>urkundweb.urkund.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=urkundweb.urkund.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAL61GoCfz8heMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Vya3VuZHdlYi51cmt1bmQuc2UwHhcNMDkwMzAzMTU1NjQyWhcNMTkwMzAx
-MTU1NjQyWjAeMRwwGgYDVQQDExN1cmt1bmR3ZWIudXJrdW5kLnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3RwMFJu304/B3qtfLT8r2vKBOugNcfyZ
-EDsf4Q4ZHFDFhWOh6VAuywjpixKBm/LYCrRyKqnM2hRVWKIIKpTvlu7TD1Se/G/g
-m6VxdXi02oc+7d6Q18SXmqHjFCaxh73HiEqwarofgRKXrVWupruUv/5//nIXeNWC
-u9GuFWYEug5Vj0lw7SoVZC3B0fsbVjQGHEpl4ybc6aCAleuyndWbaa+HXEmSr/d6
-sVjSu2F1d/OCPoeZ9U3Q5lLzLwpV67oXY1dLzwSLu17KiP6bzyqsopHAaac34rZ1
-Ia5m722Sdv55LA2JXX0k/D9QXduyLVnmzEhAvzyiyUKo9hMAhFwjrwIDAQABo0Ew
-PzAeBgNVHREEFzAVghN1cmt1bmR3ZWIudXJrdW5kLnNlMB0GA1UdDgQWBBTWCFlV
-iTs20fc8BncRSVYrqXdS8jANBgkqhkiG9w0BAQUFAAOCAQEAQnPM81umUT9cokgv
-d7qjClP5S4ufKMgscVIu5umiV3aOSpDTsCAxvfSp3z5tywF1EQ/6FRrTSVIZiS+e
-wbR9+JEVOnxV3D81Xv4p23zj0p1g2d6gdlpfbOmGiCWqx75QosHqfP6ENFDFCwxl
-CasucZK1gv2h3Sat232poJYdoDcmDKZt7DRIcs88k+85/TG3CnB6LUWjv35NrMGq
-YcF3FDUEnWCpXVoOF3bB84M9zlrggkBlhid47DpJZ54EcMl8qrMQmOJDcw4/1Jc1
-idGXqKfeI6/eA5cV6Kvyy63eSji0hOvD1CKIhufI3w6R1+DU0pSVsv+t7ND9KWBl
-gEln3A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.urkund.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.urkund.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secure.urkund.com/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secure.urkund.com/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secure.urkund.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.urkund.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.urkund.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">URKUND</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Witasp</md:SurName>
-    <md:EmailAddress>mailto:peter.witasp@prioinfo.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Samuel</md:GivenName>
-    <md:SurName>Otter</md:SurName>
-    <md:EmailAddress>mailto:samuel@onposition.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml b/swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml
deleted file mode 100644
index 16400b19..00000000
--- a/swamid-interfederations-2.0/urz-cf9dev.urz.unibas.ch-shibboleth.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://urz-cf9dev.urz.unibas.ch/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2015-10-29T14:44:09Z">
-      <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:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>unibas.ch</saml:AttributeValue>
-      </saml:Attribute>
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" 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">
-        <saml:AttributeValue>university</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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">urz-cf9dev.urz.unibas.ch</mdui:DisplayName>
-        <mdui:Description xml:lang="en">urz-cf9dev.urz.unibas.ch</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIJAM7GrNjzVwKBMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGHVyei1jZjlkZXYudXJ6LnVuaWJhcy5jaDAeFw0xNTAzMDIxMjQ4NTFaFw0x
-ODAzMDExMjQ4NTFaMCMxITAfBgNVBAMTGHVyei1jZjlkZXYudXJ6LnVuaWJhcy5j
-aDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBPXsyUicAMoiWU08nj
-MubK48Hs/2IS+hMscaDzJ+/l4mPfqXpL3JnU+P1u/r3wrPmC7ZeONAkBQtVglgaM
-HJ1+SMyKjIqospS0UtBFctx15PuctNXelrUW4vA9pbLaTj7BY12fUhH7WNuaZMmc
-zx1RmMj+QFWGa0GHMUu/eSZH3HiqN6pf316+GGLvBEol4UgtTQwtj4rNK1Vgybgm
-N7B9GD5U8O2YUAtbJP2cno0P3PFgM0rsGUkBSSjAJkVs0FlesgREE50qUVaZHr/A
-x8K0C4vWSnDiZksm3fHr39+Rdk1BMgFyjePVgtZy2+QZ9QfGkKUaoK7LOQkoNMzR
-R70CAwEAAaNzMHEwUAYDVR0RBEkwR4IYdXJ6LWNmOWRldi51cnoudW5pYmFzLmNo
-hitodHRwczovL3Vyei1jZjlkZXYudXJ6LnVuaWJhcy5jaC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBT7LurvBcztRlOIRW5hS8ePdMtOwDANBgkqhkiG9w0BAQUFAAOCAQEA
-y1/VULSh0WAnG9pFNr46JDdrEcoactiK7TnmF6u4uTF/p6bq4sCo/mVHhGsEwlnZ
-7sOFIdSCnk02lk9xBQVgTCBNjRbYjnrb6WMdtJzCBxlJSC10qOboejc3AU0ccvsa
-Wh151b3OLDgtXKzVd3/kOE10Nj+35uQKEQVLG3OdGXaB1nB0gn4/OBkgcErhyWMz
-gVBOKbQBqFA4kFy2pmi1P2WJ6ZlWQhYsw85FmLaLdZYxL5uau0iXLz03fSaJoQ2T
-IrXMRU8/Na6KDEGsbSSUGDeWYrFB3dgyL1f6/rsr4pWFmGz4yzN1Ay3YCaZSTFpF
-aSLed9e+X5BTJyKEWbheQg==
-						</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://lernkartentest.unibas.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://movotest.unibas.ch/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lernkartentest.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://movotest.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lernkartentest.unibas.ch/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://movotest.unibas.ch/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML/POST" index="11"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://urz-cf9dev.urz.unibas.ch/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">urz-cf9dev.urz.unibas.ch</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">urz-cf9dev.urz.unibas.ch</md:ServiceDescription>
-      <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="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="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="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="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="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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="en">unibas.ch</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Universität Basel</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Basel</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="fr">Université de Bâle</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.unibas.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.unibas.ch/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="fr">http://www.unibas.ch/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>ITS</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support-its@unibas.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ITS</md:GivenName>
-    <md:SurName>WApp</md:SurName>
-    <md:EmailAddress>mailto:wapp-its@unibas.ch</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>ITS</md:GivenName>
-    <md:SurName>WSyM</md:SurName>
-    <md:EmailAddress>mailto:wsym-its@unibas.ch</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/usertest.sciquest.com.xml b/swamid-interfederations-2.0/usertest.sciquest.com.xml
deleted file mode 100644
index a2551b70..00000000
--- a/swamid-interfederations-2.0/usertest.sciquest.com.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://usertest.sciquest.com">
-  <!--
-		This is a SelectSite 10 usertest SP for SciQuest Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-12-13T16:37:27Z">
-      <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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAl2gAwIBAgIITH47WRLwirIwDQYJKoZIhvcNAQEEBQAwXzELMAkGA1UEBhMCVVMxETAP
-						BgNVBAoTCFNjaVF1ZXN0MRQwEgYDVQQLEwtEZXZlbG9wbWVudDEnMCUGA1UEAxMeU2NpUXVlc3Qg
-						Q2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTEzMDkwOTIwMjkzMVoXDTMzMDMzMTIwMjkzMVowYDEV
-						MBMGA1UEAxMMc2NpcXVlc3QuY29tMRQwEgYDVQQLEwtEZXZlbG9wbWVudDEXMBUGA1UEChMOU2Np
-						UXVlc3QsIEluYy4xCzAJBgNVBAgTAk5DMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEBBQAD
-						ggEPADCCAQoCggEBAJAwZSK6e1O56akTZTxBKIuDkuUZDyJzSl4xaqPa8C6XWP7I+G6sFUbtHb3I
-						fY7FVmYkeS7Rx2hZA+AbNMGA3JdectjGfJoc2DYZ5ZW/Pk/hslSWJ/PGnJmJDomM90NNRYa0NPSK
-						XSl9KLEsBj+S5YGrC7NZR6L0NCrLiqRGXCwdqMSl2TORG3DjdVFnyp933vxjhnaJW7ihpIc4Ga0H
-						ORjj6zk2npzGhq71qmRwfxHFsRivFR1CBH3EVsqLCm3AXhVmqCuwJYmXjo26aZYOV61gvMht0oWq
-						hPI3LQXZ6nWwpPOCiyMBJAuhckZQQu0n81tJyII0J+fXJXzObJ9OJxUCAwEAAaM0MDIwDgYDVR0P
-						AQH/BAQDAgWgMCAGA1UdJQEB/wQWMBQGCCsGAQUFBwMEBggrBgEFBQcDAjANBgkqhkiG9w0BAQQF
-						AAOBgQAj3d6pxxPMxzet05eEemxV0wgP9L0F27/sTPsGioynIclNxKoAC5hoeiHAOVKw+8RTL3D/
-						UJxYoO9+3wRbtkiHnfP2W8SP7GoxvZhaJyblGX5PS+xLtCBhwfVbUQC9dNGy/yTOggYvF6oQIXn2
-						U7mXMJZfSVNp1vexAK1dV+TJVQ==
-					</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://usertest.sciquest.com/apps/Router/ExternalAuth/SAML/Login/Edinburgh" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://usertest.sciquest.com/apps/Router/ExternalAuth/SAML/Login/Warwick" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SciQuest Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">SciQuest, Inc. (test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sciquest.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Mark</GivenName>
-    <SurName>Monroe</SurName>
-    <EmailAddress>mailto:MMonroe@SciQuest.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Monroe</SurName>
-    <EmailAddress>mailto:MMonroe@SciQuest.com</EmailAddress>
-  </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 b53494c0..00000000
--- a/swamid-interfederations-2.0/utwente.nl-.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="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.surfnet.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="48" width="108">https://static.surfconext.nl/logos/idp/utwente.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md: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/uwgb.edu-idp.xml b/swamid-interfederations-2.0/uwgb.edu-idp.xml
deleted file mode 100644
index 0aae7b51..00000000
--- a/swamid-interfederations-2.0/uwgb.edu-idp.xml
+++ /dev/null
@@ -1,80 +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://uwgb.edu/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">uwgb.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Wisconsin - Green Bay</mdui:DisplayName>
-        <mdui:Logo height="364" width="447" xml:lang="en">https://shibidp-1.uwgb.edu/UWGB_Logo.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>
-MIIFHTCCBAWgAwIBAgIRAIu7XEh83akQ2Pq8cCMVoKUwDQYJKoZIhvcNAQEFBQAw
-UTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5D
-b21tb24xGzAZBgNVBAMTEkluQ29tbW9uIFNlcnZlciBDQTAeFw0xNDA0MzAwMDAw
-MDBaFw0xNzA0MjkyMzU5NTlaMIGFMQswCQYDVQQGEwJVUzELMAkGA1UECBMCV0kx
-EjAQBgNVBAcTCUdyZWVuIEJheTEqMCgGA1UEChMhVW5pdmVyc2l0eSBvZiBXaXNj
-b25zaW4tR3JlZW4gQmF5MQwwCgYDVQQLEwNDSVQxGzAZBgNVBAMTEnNoaWJpZHAt
-MS51d2diLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANR68ARw
-2c1xH3+dQBEd4lcleNNF9SXegk/6Zair+MWsfiVxJp07F/olmyVPi30s13oUTb84
-5+6U1xtmGiPVocmtP6CCVXgxe9fMKwrOCl8bXqD5/QgX236v/DbT6Jn5B9RE1MQB
-G6ADHknO7cVYSWo4CLS+OHFfxrjYUiy5ve/xeHmmzKxz+kKD9SITPfjqMEXDXwbO
-o2vLJICGwbEwIZSY0oOLkELgMwH7KGgblaCCClWpZe6N1K7QX6dZjDp9yfwRG7zB
-iQDHAZRkDijbwPKIJRAim3/HitJPcZaas+ppyfJFrIM49IRGV+Mf0y/6CTuzTppT
-6iKz/09K8FQ68/kCAwEAAaOCAbkwggG1MB8GA1UdIwQYMBaAFEhPWvovSppe4FDz
-a3tVpd71vjRdMB0GA1UdDgQWBBSIjjFSvVjFvzjS3ijKM0ENXVbTIDAOBgNVHQ8B
-Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwZwYDVR0gBGAwXjBSBgwrBgEEAa4jAQQDAQEwQjBABggrBgEFBQcCARY0
-aHR0cHM6Ly93d3cuaW5jb21tb24ub3JnL2NlcnQvcmVwb3NpdG9yeS9jcHNfc3Ns
-LnBkZjAIBgZngQwBAgIwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2NybC5pbmNv
-bW1vbi5vcmcvSW5Db21tb25TZXJ2ZXJDQS5jcmwwbwYIKwYBBQUHAQEEYzBhMDkG
-CCsGAQUFBzAChi1odHRwOi8vY2VydC5pbmNvbW1vbi5vcmcvSW5Db21tb25TZXJ2
-ZXJDQS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmluY29tbW9uLm9yZzAd
-BgNVHREEFjAUghJzaGliaWRwLTEudXdnYi5lZHUwDQYJKoZIhvcNAQEFBQADggEB
-ABj6TJn8iLoxdOTJ0hQEwmIyZHT2RuK936yz9GKQZBIRwNmLU5nVm4g5MtZPQmg4
-awrAWawoJYBNupFao5DhqoKTKt1V+tKcBqUHDXl1W8FZIjbTLc6pBsHh3oKk376U
-l2TErMlmpmMxrm6PXAskJMXfwdAOiCTrcgddGbZ4ZtmVSM5FBhIZzJ1IyHypGjy6
-+uZD2agUJWW3sjB6os5oEKCtHIOL9dS1MaSGk2LXzjBGPUCc8ZP+u6xQf+B9EhHP
-GrQwWjQqXBKeNFNo7SFl6YqjJ6QPG9CwYR9LOKGSOnsL13UW6gODtGnf4gb9F9xa
-MmJAfqdYwZ9xDXBIkSE7gHk=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp-1.uwgb.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp-1.uwgb.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp-1.uwgb.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Wisconsin - Green Bay</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Wisconsin - Green Bay</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uwgb.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>David Kieper</md:GivenName>
-    <md:EmailAddress>kieperd@uwgb.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>David Kieper</md:GivenName>
-    <md:EmailAddress>kieperd@uwgb.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Patrick Goggins</md:GivenName>
-    <md:EmailAddress>gogginsp@uwgb.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Patrick Goggins</md:GivenName>
-    <md:EmailAddress>gogginsp@uwgb.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/v-shibboleth.cant-col.ac.uk-idp-shibboleth.xml b/swamid-interfederations-2.0/v-shibboleth.cant-col.ac.uk-idp-shibboleth.xml
deleted file mode 100644
index 5fb9132e..00000000
--- a/swamid-interfederations-2.0/v-shibboleth.cant-col.ac.uk-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://v-shibboleth.cant-col.ac.uk/idp/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Canterbury College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-17T17:42: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">cant-col.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVzCCAj+gAwIBAgIUX0CFs7nNWuXu2lCNNauASex5B5wwDQYJKoZIhvcNAQEF
-						BQAwJjEkMCIGA1UEAxMbdi1zaGliYm9sZXRoLmNhbnQtY29sLmFjLnVrMB4XDTEz
-						MDkxNzEwMTg0MloXDTMzMDkxNzEwMTg0MlowJjEkMCIGA1UEAxMbdi1zaGliYm9s
-						ZXRoLmNhbnQtY29sLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAujeuPszBocV2kcwkN8u7SVmHqcYGLLYzkz509WX4yp57LtK9PEo8wpoVoTBk
-						GOv9+Dq7hbtJ0fuwxYh0T5FqjTiTIX7oXa8Qwb0AmxQLeKFlOQ0HkkoieHyU4wed
-						o28K7HPYeRVFn+rkcxK2UiMg0KiIwNzNhTd78Clwt06FVvasuUE5V/ncwYJNEcVc
-						8M2BOMxtdeed8SP+Qio5GLMB53O9ziI/pYHB453pigwiFxUXoxVffA1kLcFL7iS6
-						inlKCsuF/WpzHksYCnbOItOnUm0GiC8nqJ/hl6fXfIMoA+0ijBurNyKBN3Vl0dC+
-						OX/TNW61giCUZUaSdWyF67jDHwIDAQABo30wezBaBgNVHREEUzBRght2LXNoaWJi
-						b2xldGguY2FudC1jb2wuYWMudWuGMmh0dHBzOi8vdi1zaGliYm9sZXRoLmNhbnQt
-						Y29sLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQLod2XYoE2pXu03e4G
-						e93I5bYcijANBgkqhkiG9w0BAQUFAAOCAQEAeZGPjbwyzjVemSC0DdfWX1OQNYDP
-						IxH4htEX55B9tNZ/7JfwO9vG72O7m3F9SKRZE/ZBYtcyBAdFRyrU+4OfHzUGdCxV
-						Efywf9VATF8k5HsTmQCC6nthSqUXQL0msNkNdujWdlvCuf2/BUgByq1X4WUTC/iD
-						WUQdKdYaNULgmyDjRprcpJjIGfu2XTR1KwwBafGBvBkpdjNPe5vqDO/2QMsdqYfx
-						KcSh5MvzBEYhufI4n/tZbwb52gvZV2LJuKk+NaE/OS9yYYgLkCOc4UIxs8/GnNtT
-						buTISGMXC6sfecQTotCodG6BJlwQwhLVCngEfJgWskoRwgfenuneoCxCSw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://v-shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-shibboleth.cant-col.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://v-shibboleth.cant-col.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://v-shibboleth.cant-col.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v-shibboleth.cant-col.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">cant-col.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVzCCAj+gAwIBAgIUX0CFs7nNWuXu2lCNNauASex5B5wwDQYJKoZIhvcNAQEF
-						BQAwJjEkMCIGA1UEAxMbdi1zaGliYm9sZXRoLmNhbnQtY29sLmFjLnVrMB4XDTEz
-						MDkxNzEwMTg0MloXDTMzMDkxNzEwMTg0MlowJjEkMCIGA1UEAxMbdi1zaGliYm9s
-						ZXRoLmNhbnQtY29sLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-						AQEAujeuPszBocV2kcwkN8u7SVmHqcYGLLYzkz509WX4yp57LtK9PEo8wpoVoTBk
-						GOv9+Dq7hbtJ0fuwxYh0T5FqjTiTIX7oXa8Qwb0AmxQLeKFlOQ0HkkoieHyU4wed
-						o28K7HPYeRVFn+rkcxK2UiMg0KiIwNzNhTd78Clwt06FVvasuUE5V/ncwYJNEcVc
-						8M2BOMxtdeed8SP+Qio5GLMB53O9ziI/pYHB453pigwiFxUXoxVffA1kLcFL7iS6
-						inlKCsuF/WpzHksYCnbOItOnUm0GiC8nqJ/hl6fXfIMoA+0ijBurNyKBN3Vl0dC+
-						OX/TNW61giCUZUaSdWyF67jDHwIDAQABo30wezBaBgNVHREEUzBRght2LXNoaWJi
-						b2xldGguY2FudC1jb2wuYWMudWuGMmh0dHBzOi8vdi1zaGliYm9sZXRoLmNhbnQt
-						Y29sLmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQLod2XYoE2pXu03e4G
-						e93I5bYcijANBgkqhkiG9w0BAQUFAAOCAQEAeZGPjbwyzjVemSC0DdfWX1OQNYDP
-						IxH4htEX55B9tNZ/7JfwO9vG72O7m3F9SKRZE/ZBYtcyBAdFRyrU+4OfHzUGdCxV
-						Efywf9VATF8k5HsTmQCC6nthSqUXQL0msNkNdujWdlvCuf2/BUgByq1X4WUTC/iD
-						WUQdKdYaNULgmyDjRprcpJjIGfu2XTR1KwwBafGBvBkpdjNPe5vqDO/2QMsdqYfx
-						KcSh5MvzBEYhufI4n/tZbwb52gvZV2LJuKk+NaE/OS9yYYgLkCOc4UIxs8/GnNtT
-						buTISGMXC6sfecQTotCodG6BJlwQwhLVCngEfJgWskoRwgfenuneoCxCSw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://v-shibboleth.cant-col.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-shibboleth.cant-col.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">Canterbury College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Canterbury College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cant-col.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@canterburycollege.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nathan</GivenName>
-    <SurName>Friend</SurName>
-    <EmailAddress>mailto:n.friend@canterburycollege.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 cc60978e..00000000
--- a/swamid-interfederations-2.0/va-idp.lanet.lv.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://va-idp.lanet.lv">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Vidzeme University of Applied Sciences</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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - VA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Vidzeme University of Applied Sciences - VA IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lv">http://www.va.lv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto: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 59d0137d..00000000
--- a/swamid-interfederations-2.0/vea-idp.lanet.lv.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vea-idp.lanet.lv">
-  <md: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>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:DiscoHints xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-      <mdui:UIInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Ventspils University College</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>
-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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LAIFE - VEA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ventspils University College - VEA IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://laife.lanet.lv/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="lv">http://www.venta.lv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>mailto:itserviss@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/venturacollege.instructure.com-saml2.xml b/swamid-interfederations-2.0/venturacollege.instructure.com-saml2.xml
deleted file mode 100644
index d3e0af83..00000000
--- a/swamid-interfederations-2.0/venturacollege.instructure.com-saml2.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="http://venturacollege.instructure.com/saml2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">OEI - Ventura College - Canvas</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.canvaslms.com/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.canvaslms.com/policies/privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="220" width="220" xml:lang="en">https://canvas.instructure.com/images/canvas/header_canvas_logo@2x.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE8TCCA9mgAwIBAgIJAOBms/PYWcPLMA0GCSqGSIb3DQEBCwUAMIGrMQswCQYD
-VQQGEwJVUzENMAsGA1UECBMEVXRhaDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkx
-GTAXBgNVBAoTEEluc3RydWN0dXJlLCBJbmMxEzARBgNVBAsTCk9wZXJhdGlvbnMx
-IDAeBgNVBAMTF0NhbnZhcyBTQU1MIENlcnRpZmljYXRlMSIwIAYJKoZIhvcNAQkB
-FhNvcHNAaW5zdHJ1Y3R1cmUuY29tMB4XDTE1MDQxNTAxMDAwMFoXDTE3MDQyMjAx
-MDAwMFowgasxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRVdGFoMRcwFQYDVQQHEw5T
-YWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5zdHJ1Y3R1cmUsIEluYzETMBEGA1UE
-CxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2FudmFzIFNBTUwgQ2VydGlmaWNhdGUx
-IjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVjdHVyZS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDckDPQGWedlVGC2Z9fn1wNFmN+0IPNi6OSE1nM
-voTWx2oZlQepaAu4zI5QqOfnV0rW2V1volpoJbu0WelH0DkGzdOEQdWJjAs3nRBf
-y0evxtpg0tK5kIvGsnN6YcD41YmkfWzvwbMf0cEq1Y0wCmymF6XzOUUE4zsi0nhP
-m2Z7WiuongDQdR01UsDN13YcpD/i1JXr3YtkNnJ/a1Kc9OXNycI8M5NVo5QQgdx/
-Q7zAmTk8p9E0ZRthdOQ/PBicWx39mNmBij5KpqCWlHu3NWdgcG8KXSv5atXU8Crd
-TRJ3aGIEN9vBYIHe8MHGCzs1QlRfJmXFMkeUSOTnJJx78rMDAgMBAAGjggEUMIIB
-EDAdBgNVHQ4EFgQUo0WWVlJ1SxZOs11L85ZAuZGyuzEwgeAGA1UdIwSB2DCB1YAU
-o0WWVlJ1SxZOs11L85ZAuZGyuzGhgbGkga4wgasxCzAJBgNVBAYTAlVTMQ0wCwYD
-VQQIEwRVdGFoMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEZMBcGA1UEChMQSW5z
-dHJ1Y3R1cmUsIEluYzETMBEGA1UECxMKT3BlcmF0aW9uczEgMB4GA1UEAxMXQ2Fu
-dmFzIFNBTUwgQ2VydGlmaWNhdGUxIjAgBgkqhkiG9w0BCQEWE29wc0BpbnN0cnVj
-dHVyZS5jb22CCQDgZrPz2FnDyzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
-A4IBAQBV3EmmnzYqYQ5fXNZymG2WaspEW0NeFMhDXa3p3AMIQJbnnU14lR7bqIvf
-/bLW1YE0fw1kSzsw8VrkQp7k1U+kaYA3i5/FQBy2WtqUCVq2GXZA2gs5YD4nvJB/
-F57E//0kEhbATZH9+wJqDkqyIgsrSIlJjiXDth1BppGK8weboPtr9sWV24Ui0+ls
-w16XTsGlnRRO19g+gXKOZp5ApXkDrB+HwZQvZxiCuSgvJlcBzMdxVvWSL+vPtg8Y
-shIKzobIhaQ2MzXHLcxrDhW10YFPwDXh8Tfn5iU9ONsaJivuvVhtDYZD1ZzSoPpm
-q4vYqxxY/6rFJhrCtnlLepSaxlXM
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://venturacollege.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://venturacollege.test.instructure.com/login/saml/logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://venturacollege.beta.instructure.com/login/saml/logout"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://venturacollege.instructure.com/saml_consume" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://venturacollege.instructure.com/login/saml" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://venturacollege.beta.instructure.com/saml_consume" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://venturacollege.beta.instructure.com/login/saml" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://venturacollege.test.instructure.com/saml_consume" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://venturacollege.test.instructure.com/login/saml" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">OEI - Ventura College - Canvas</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Instructure, Inc</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Instructure, Inc</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.instructure.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Canvas Support</md:GivenName>
-    <md:EmailAddress>support@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/verify.cranfield.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/verify.cranfield.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 379c1953..00000000
--- a/swamid-interfederations-2.0/verify.cranfield.ac.uk-shibboleth-sp.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://verify.cranfield.ac.uk/shibboleth-sp">
-  <!--
-		This is a Cranfield University DARE Service Shibboleth SP for Digitary.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-22T13:12:30Z"/>
-  </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.cranfield.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAKvu+ZotXOBYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51azAeFw0xMjA0MTIxNTA4MDhaFw0y
-						MjA0MTAxNTA4MDhaMCMxITAfBgNVBAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAONwiFdIwZkaerJXg8Wm
-						47ddT4dPw4AYVWgk2Uy64qQvAgbaSQi1mknnR27bhWyg5iCA3z9IrfLtLmF6O4do
-						Q5nMjXcnCVivz0hubTlFLgqtbo1XXddm+WYrpsoBhATbgLcz8XG/TdQWzqPjf6xR
-						jslpbjf8YTDCigoLpxnrBfJeY8ns81RaxtDOS/eg5JgjpohSbnJK5kum4twpEVPK
-						/Z6EmoIKsCQ2YTzcn1PmlxT3czYxBS5Hr54tt1W7JUtZPlrWyMJnQVof7MZSTeLr
-						piH74BxtfbN1n7AwWvGSdj7D8saRahKv9YzexaGKNggAlXE7lwDSRAagh/MKIX4V
-						oasCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZGlnaXRhcnkuZGFyZS51bGNjLmFjLnVr
-						MB0GA1UdDgQWBBQJeESLMMOvuBxCw/egquAAUDHR2zANBgkqhkiG9w0BAQUFAAOC
-						AQEAPF1yxkncDbJ0WwRpnleXV2P7GGDKenIbcIH69ad+0IARiyCvKJxX1vpfkD2C
-						Fmis9+MURBeMMpRUpRsIGh9O2SMMQT/aTMHqoSWOMGiJW9fM6PCS18Z5Zx4aTgyq
-						O1ez0wHjbR1vW/TfSM/b6A2ovLqR+6bbbaymu0wu5UbNofG1uSRgkKT9kgeiGLWq
-						VqagedqlmGej4hnCq2/+hMGTdeRiCrgFwUwVL8ZLfs8YptRka8WPuEsXieI7m7rf
-						TzJxScFtn4xmZUOrC5VFdXH5j4S8/6M6kYiw2iQAbpSBBn1Azow1sWj2JzY4yUMZ
-						JXxZbc0L9R3Upa90FjFH8QnxXg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.cranfield.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Digitary</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digitary DARE Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.digitary.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Xiang</GivenName>
-    <SurName>Chen</SurName>
-    <EmailAddress>mailto:xiang.chen@digitary.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Troy</SurName>
-    <EmailAddress>mailto:kevin.troy@digitary.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/verify.dmu.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/verify.dmu.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 524abb9d..00000000
--- a/swamid-interfederations-2.0/verify.dmu.ac.uk-shibboleth-sp.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://verify.dmu.ac.uk/shibboleth-sp">
-  <!--
-		This is a "DARE service for De Montfort University" Shibboleth SP for Digitary.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-13T10:28: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: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.dmu.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAKvu+ZotXOBYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51azAeFw0xMjA0MTIxNTA4MDhaFw0y
-						MjA0MTAxNTA4MDhaMCMxITAfBgNVBAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAONwiFdIwZkaerJXg8Wm
-						47ddT4dPw4AYVWgk2Uy64qQvAgbaSQi1mknnR27bhWyg5iCA3z9IrfLtLmF6O4do
-						Q5nMjXcnCVivz0hubTlFLgqtbo1XXddm+WYrpsoBhATbgLcz8XG/TdQWzqPjf6xR
-						jslpbjf8YTDCigoLpxnrBfJeY8ns81RaxtDOS/eg5JgjpohSbnJK5kum4twpEVPK
-						/Z6EmoIKsCQ2YTzcn1PmlxT3czYxBS5Hr54tt1W7JUtZPlrWyMJnQVof7MZSTeLr
-						piH74BxtfbN1n7AwWvGSdj7D8saRahKv9YzexaGKNggAlXE7lwDSRAagh/MKIX4V
-						oasCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZGlnaXRhcnkuZGFyZS51bGNjLmFjLnVr
-						MB0GA1UdDgQWBBQJeESLMMOvuBxCw/egquAAUDHR2zANBgkqhkiG9w0BAQUFAAOC
-						AQEAPF1yxkncDbJ0WwRpnleXV2P7GGDKenIbcIH69ad+0IARiyCvKJxX1vpfkD2C
-						Fmis9+MURBeMMpRUpRsIGh9O2SMMQT/aTMHqoSWOMGiJW9fM6PCS18Z5Zx4aTgyq
-						O1ez0wHjbR1vW/TfSM/b6A2ovLqR+6bbbaymu0wu5UbNofG1uSRgkKT9kgeiGLWq
-						VqagedqlmGej4hnCq2/+hMGTdeRiCrgFwUwVL8ZLfs8YptRka8WPuEsXieI7m7rf
-						TzJxScFtn4xmZUOrC5VFdXH5j4S8/6M6kYiw2iQAbpSBBn1Azow1sWj2JzY4yUMZ
-						JXxZbc0L9R3Upa90FjFH8QnxXg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.dmu.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.dmu.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Digitary</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">DARE service for De Montfort University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.digitary.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kevin</GivenName>
-    <SurName>Troy</SurName>
-    <EmailAddress>mailto:kevin.troy@digitary.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Troy</SurName>
-    <EmailAddress>mailto:kevin.troy@digitary.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/verify.sheffield.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/verify.sheffield.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index c0f3b81b..00000000
--- a/swamid-interfederations-2.0/verify.sheffield.ac.uk-shibboleth-sp.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://verify.sheffield.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Digitary DARE Service" Shibboleth SP for Digitary on behalf of the University of Sheffield.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-11T16:20: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.sheffield.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAKvu+ZotXOBYMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51azAeFw0xMjA0MTIxNTA4MDhaFw0y
-						MjA0MTAxNTA4MDhaMCMxITAfBgNVBAMTGGRpZ2l0YXJ5LmRhcmUudWxjYy5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAONwiFdIwZkaerJXg8Wm
-						47ddT4dPw4AYVWgk2Uy64qQvAgbaSQi1mknnR27bhWyg5iCA3z9IrfLtLmF6O4do
-						Q5nMjXcnCVivz0hubTlFLgqtbo1XXddm+WYrpsoBhATbgLcz8XG/TdQWzqPjf6xR
-						jslpbjf8YTDCigoLpxnrBfJeY8ns81RaxtDOS/eg5JgjpohSbnJK5kum4twpEVPK
-						/Z6EmoIKsCQ2YTzcn1PmlxT3czYxBS5Hr54tt1W7JUtZPlrWyMJnQVof7MZSTeLr
-						piH74BxtfbN1n7AwWvGSdj7D8saRahKv9YzexaGKNggAlXE7lwDSRAagh/MKIX4V
-						oasCAwEAAaNGMEQwIwYDVR0RBBwwGoIYZGlnaXRhcnkuZGFyZS51bGNjLmFjLnVr
-						MB0GA1UdDgQWBBQJeESLMMOvuBxCw/egquAAUDHR2zANBgkqhkiG9w0BAQUFAAOC
-						AQEAPF1yxkncDbJ0WwRpnleXV2P7GGDKenIbcIH69ad+0IARiyCvKJxX1vpfkD2C
-						Fmis9+MURBeMMpRUpRsIGh9O2SMMQT/aTMHqoSWOMGiJW9fM6PCS18Z5Zx4aTgyq
-						O1ez0wHjbR1vW/TfSM/b6A2ovLqR+6bbbaymu0wu5UbNofG1uSRgkKT9kgeiGLWq
-						VqagedqlmGej4hnCq2/+hMGTdeRiCrgFwUwVL8ZLfs8YptRka8WPuEsXieI7m7rf
-						TzJxScFtn4xmZUOrC5VFdXH5j4S8/6M6kYiw2iQAbpSBBn1Azow1sWj2JzY4yUMZ
-						JXxZbc0L9R3Upa90FjFH8QnxXg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.sheffield.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Digitary</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digitary DARE Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.digitary.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Xiang</GivenName>
-    <SurName>Chen</SurName>
-    <EmailAddress>mailto:xiang.chen@digitary.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kevin</GivenName>
-    <SurName>Troy</SurName>
-    <EmailAddress>mailto:kevin.troy@digitary.net</EmailAddress>
-  </ContactPerson>
-</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 f44e1ce2..00000000
--- a/swamid-interfederations-2.0/verify.studentbeans.com-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" entityID="https://verify.studentbeans.com/shibboleth">
-  <!--
-		This is a "Student Beans" Shibboleth SP for The Beans Group 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="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:Logo height="78" width="348">https://cdn.ymaservices.com/student-verification/ukfederation/studentbeans-id-logo-348x78.png</mdui:Logo>
-        <mdui:Description xml:lang="en">Free digital student card - Access 1000's of student exclusive discounts with Student Beans iD.</mdui:Description>
-      </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>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://verify.studentbeans.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <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="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </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/verify2.newsbank.com-shibboleth.xml b/swamid-interfederations-2.0/verify2.newsbank.com-shibboleth.xml
deleted file mode 100644
index 948ce28c..00000000
--- a/swamid-interfederations-2.0/verify2.newsbank.com-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://verify2.newsbank.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for NewsBank, inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-11-03T15:24:23Z">
-      <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://verify2.newsbank.com/Shibboleth.sso/WAYF/Chooser"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://verify2.newsbank.com/Shibboleth.sso/OpenAthens"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJDCCAgygAwIBAgIJAMub3zkdNgfVMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHZlcmlmeTIubmV3c2JhbmsuY29tMB4XDTExMDcxNDEyMzkzMVoXDTMxMDcw
-						OTEyMzkzMVowHzEdMBsGA1UEAxMUdmVyaWZ5Mi5uZXdzYmFuay5jb20wggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCX4nO4n/OE9kthul9beskkdjpdOzIh
-						3DCLzOw1S8vvsfUmVEcYHw7kFEvyJ1v3OrBqWunnkOtRdPWK8LmMiLK/G28vKqWE
-						/xDDuJtYN4u4imHXCSHtLWw9v96U/z47BuMBsrllveKRjGqirlXmmaPc/qJwDonB
-						v341/6wi3CbEd0y5RuhHf1Bh6q9jdWUe6rZ1sIE6wEc4MiYY1ZVO/Ihln3PTvDrr
-						pU1W9mwuWbF71qHYGbo9FB0JKVdKWFeXqdojKc9C1Zv+knDLgnmgO3AFYWubgDps
-						9reaYU/sqyII/v4FmyK09wLYCc2zwR9nrbooV8H36rBWW6aq7j2GGg9vAgMBAAGj
-						YzBhMEAGA1UdEQQ5MDeCFHZlcmlmeTIubmV3c2JhbmsuY29thh92ZXJpZnkyLm5l
-						d3NiYW5rLmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBSI7BA1evnVwylG4+BNrHGA
-						4dGR1jANBgkqhkiG9w0BAQUFAAOCAQEAIeJ9mn0EjTRcMBieZ4+TQRJCUtl726xj
-						imqKZv+6A+kyMTfGRo4NmbYOVsTG6KJ9rVAwkEKzAKfXgVtProNiygU5x41ipRul
-						oE6mQF7lN6Uf1bWDdcRQw+REeDaB7vzxeiIfSh0XHPEELsqnihR25AD/9DwMixJC
-						iTHaRfGrVCY67k8BMpvNIFeDN6BFRkNjzGoQJBOg8j81fdKH4OkjqQ0SLg7X7zPT
-						+ESKGLjDRtNoR/JbVhqjWLtch4moDKBQNuTvP/geXckpGdfNycQXKK6mDm5fSGw2
-						Zr9OPFlTRFs5qBv23HfpNMyeg0Eytp3lzTOvzOCX0M7pidl/y9KtNA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify2.newsbank.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify2.newsbank.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify2.newsbank.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify2.newsbank.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify2.newsbank.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://verify2.newsbank.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://verify2.newsbank.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify2.newsbank.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify2.newsbank.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify2.newsbank.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">NewsBank, inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NewsBank</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.newsbank.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>John</GivenName>
-    <SurName>Majonen</SurName>
-    <EmailAddress>mailto:jmajonen@newsbank.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>John</GivenName>
-    <SurName>Majonen</SurName>
-    <EmailAddress>mailto:jmajonen@newsbank.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml b/swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml
deleted file mode 100644
index 8dff47c0..00000000
--- a/swamid-interfederations-2.0/versions-test.ligo.org-shibboleth-sp.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://versions-test.ligo.org/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://versions-test.ligo.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">LIGO Software Control System - Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service provider supports the LIGO Scientific Collaboration. It is operated by the LIGO Scientific Collaboration group at the Leonard E. Parker Center for Gravitation, Cosmology, and Astrophysics at the University of Wisconsin-Milwaukee. It uses Git to provide version control services. Users authenticate to the service using a federated identity and then can access a repository. This is the test server.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://versions-test.ligo.org/spinfo.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://versions-test.ligo.org/spprivacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://versions-test.ligo.org/img/ligologo80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIzCCAgugAwIBAgIJAPye2jVyCBsPMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-BAMTEWdpdC10ZXN0LmxpZ28ub3JnMB4XDTE1MDQwNjE5MzkwNFoXDTI1MDQwMzE5
-MzkwNFowHDEaMBgGA1UEAxMRZ2l0LXRlc3QubGlnby5vcmcwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCzyxOlCILpcFS2J1soC5+zAAS8wukYzoUW4OLM
-Wzbtu/5j3zPWWxuhdORJu/1bZBVtKbTkqsAtPcD3x/g/pCmhLcvvbxj1eZoPfJ87
-CblPUJjveILDpx3pedGmQJA7h9gEENRrLs1GoAb7/j1UxjZnuB+5q//KJM3NOL2U
-AaIUbRuo3QFwMIIS9Ac62MAsebclietQrh/kcHVMANTRiTjOWR12TVy9KIviugnN
-8+6oEcV/Xbtbcey7QDb0GEaI8ypSpOIoYW/0u+X2JWnkyOr3us5PiZZHFG0565lD
-Q7fc2aWW2C4i1m03ORMU0frbIdsPmJvh/1qXNSGuMJx7RK9FAgMBAAGjaDBmMEUG
-A1UdEQQ+MDyCEWdpdC10ZXN0LmxpZ28ub3JnhidodHRwczovL2dpdC10ZXN0Lmxp
-Z28ub3JnL3NoaWJib2xldGgtc3AwHQYDVR0OBBYEFMIoQ7MU6E6LQPdFmBAwPUvU
-3TupMA0GCSqGSIb3DQEBBQUAA4IBAQBE6BrDu8+H9Mwmr6+lpEagvDKMhKxjpvmE
-dyMwJTpUDL8DP4Ak1nDOr+UmnJo+5yj+gmngbQQQDa6BgSyucS7biuQL8hR4JTOr
-kWWY8+nAxBcYDDONnV5YdGBpSv+UFB9UuXX4//IVngEvpBLSsNMUFOKbpR1Ho0Zq
-JZnzDqFZPYEd9nsqzrxaLf3hwNT80Q83d7x9W9SNfTPZuXPz7WALiLVGHZ5KYDiH
-10KjvQgiFW3ujH1jfcsiU9BDJG7OpXFdAXiU95kuWk2RbAZDFAQ8qI1usaew0zS2
-djNCMsASHgON9D2b2vfcNdMr0yIbOT36yypVw/4KHc1pAMaf7vBc
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://versions-test.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">LIGO Software Control System - Test</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service provider supports the LIGO Scientific Collaboration. It is operated by the LIGO Scientific Collaboration group at the Leonard E. Parker Center for Gravitation, Cosmology, and Astrophysics at the University of Wisconsin-Milwaukee. It uses Git to provide version control services. Users authenticate to the service using a federated identity and then can access a repository. This is the test server.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Thomas Downes</md:GivenName>
-    <md:EmailAddress>thomas.downes@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>UWM LSC Help</md:GivenName>
-    <md:EmailAddress>uwm-help@cgca.uwm.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Warren Anderson</md:GivenName>
-    <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LIGO Security Committee</md:GivenName>
-    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml b/swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml
deleted file mode 100644
index 90cca1a9..00000000
--- a/swamid-interfederations-2.0/vetucation.vu-wien.ac.at-shibboleth.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vetucation.vu-wien.ac.at/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-12-18T18: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://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
-        <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>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Vetucation</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="de">Vetucation</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Vetucation is the e-learning platform of the University of Veterinary Medicine Vienna. Its purpose is the management of teaching and learning contents and the support of face-to-face teaching with various online communication and collaboration tools.</mdui:Description>
-        <mdui:Description xml:lang="de">Vetucation ist die e-learning Plattform der Vetmeduni Vienna. Sie dient der Verwaltung von Lehr- und Lernmaterial und Unterstützung der Präsenzlehre mit Online Kommunikations- und Kollaborations-Tools.</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://vetucation.vetmeduni.ac.at/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://vetucation.vetmeduni.ac.at/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.vetmeduni.ac.at/en/infos/vetucation-privacy-policy-shibboleth/</mdui:PrivacyStatementURL>
-        <mdui:Logo width="16" height="16">https://www.vetmeduni.ac.at/favicon.ico</mdui:Logo>
-        <mdui:Logo width="231" height="69">https://www.vetmeduni.ac.at/fileadmin/vetmed/img/logo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDDzCCAfegAwIBAgIJAJ0uN/nroe1EMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-BAMTGHZldHVjYXRpb24udnUtd2llbi5hYy5hdDAeFw0xNTEwMDgwOTE2MDlaFw0y
-NTEwMDUwOTE2MDlaMCMxITAfBgNVBAMTGHZldHVjYXRpb24udnUtd2llbi5hYy5h
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANcquQ1PwnT0kh8Lnj7+
-uFAYvMvJ2C20vX9gQwHd0JknKshOvcTL3o+cFhrQoyBZwBZ++WjMPjI8aqXwgCD9
-0edbQzt/KKe75yDaU3LEpu5DwEpGyzKeYdDk3E5EFZLWsFDIfg/Wb0nHYrjL8DsJ
-ESZ30vRJX7bOo+7r1LIpF0cbr7qU4GN5PxMlSEWSThpxnHp1ogNf4/awaZIiP5Fm
-3j1XG18/JPUhzOlHCW/UUNFQ1ckJvay5HzsXCsgA9Dh000OrrmvXXGrAUF1S9clU
-+gKkLm/7UcsNmuhb/P+1N5Tm7+5nY3rL+PXIdUYqmz+0+cSNTXyIiPZUeNUhM95A
-mGcCAwEAAaNGMEQwIwYDVR0RBBwwGoIYdmV0dWNhdGlvbi52dS13aWVuLmFjLmF0
-MB0GA1UdDgQWBBRLMEHagUOiL3lTyJk44M8WtqIjXjANBgkqhkiG9w0BAQUFAAOC
-AQEAGWNr9ZRRjDyWTsqRxS0rrK4CC+seW9q7Xo5ZOYIQeO3fGdEDS7fnLk1kL835
-gBU08s+VwwcBDUTvZRrgnQmcx6wn+QFehpw3gE01XQ1ZDOVEGKSgGj4h0cHfuSr1
-S93BkR2jRGurKQuGNGFfOw/DkzqKk+wMub0anS1FWZYXxQvfMw7RXQ8Gb95CF815
-p/ElK1Ifeztv7H+Af42jzwhYuLF/YhXDBekcyPXjqjobxRWzgKkqp+FtxZzOAoY8
-74e9Pp+cKc3ZkqNh5DQy9zStiClBdHta8mh8m4jGUOyUz3qy1IuFZ64Fx5e3p+Dn
-mPmdVWCZHlIbHEZLKp9V+fu71Q==
-</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://vetucation.vu-wien.ac.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vetucation.vu-wien.ac.at/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Vetucation</md:ServiceName>
-      <md:ServiceName xml:lang="de">Vetucation</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Vetucation is the e-learning platform of the University of Veterinary Medicine Vienna. Its purpose is the management of teaching and learning contents and the support of face-to-face teaching with various online communication and collaboration tools.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="de">Vetucation ist die e-learning Plattform der Vetmeduni Vienna. Sie dient der Verwaltung von Lehr- und Lernmaterial und Unterstützung der Präsenzlehre mit Online Kommunikations- und Kollaborations-Tools.</md:ServiceDescription>
-      <md:RequestedAttribute isRequired="true" 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="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="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="de">Veterinärmedizinische Universität Wien</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Veterinärmedizinische Universität Wien</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Veterinary Medicine Vienna</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.vetmeduni.ac.at/de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.vetmeduni.ac.at/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>E-Learning</md:GivenName>
-    <md:SurName>Support Team</md:SurName>
-    <md:EmailAddress>mailto:elearning@vetmeduni.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>E-Learning</md:GivenName>
-    <md:SurName>Support Team</md:SurName>
-    <md:EmailAddress>mailto:elearning@vetmeduni.ac.at</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/via-idp.lanet.lv.xml b/swamid-interfederations-2.0/via-idp.lanet.lv.xml
deleted file mode 100644
index 8187d4db..00000000
--- a/swamid-interfederations-2.0/via-idp.lanet.lv.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://via-idp.lanet.lv">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
-IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
-FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
-ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
-yOWlzJ0viw82thKw8EOzYCZZMFDK
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIICgTCCAeoCCQDwejraQ84XOTANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMCTFYxDTALBgNVBAgMBFJpZ2ExDTALBgNVBAcMBFJpZ2ExCzAJBgNVBAoMAkxVMQwwCgYDVQQLDANJVEQxFTATBgNVBAMMDGx1LWlkcC5sdS5sdjElMCMGCSqGSIb3DQEJARYWaXRzZXJ2aXNz
-IGF0IGx1IGRvdCBsdjAeFw0xMzAzMjExMDQ0MDJaFw0yODAzMTcxMDQ0MDJaMIGEMQswCQYDVQQGEwJMVjENMAsGA1UECAwEUmlnYTENMAsGA1UEBwwEUmlnYTELMAkGA1UECgwCTFUxDDAKBgNVBAsMA0lURDEVMBMGA1UEAwwMbHUtaWRwLmx1Lmx2MSUwIwYJKoZIhvcNAQkB
-FhZpdHNlcnZpc3MgYXQgbHUgZG90IGx2MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCYSufWasOdnbIDeD2PnmalwxckHx5WLF1WjN1eE0ENJeTldBQDI/ui5ZBxerPyR20ENXbpo+LqjvyIJvQjkx2hkqJ24df0xQThzdbCyGjuA2G7BSNtBLfiboDX5paKOt0aTsyONeO1
-ZBGi2uWZxKY+YhuUR9+lxOgGAtfaioNqEQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFbTpdFcy+0DUyhi8qOFnFz5yskz2iezD5a8OiOz6dc3bZBuppX/j/mYosMD23vcCsf7jZJzLAl4c57yxirFuYfG8Ho+2SqFB2DARVoZg7Zp8hwJl1aSruxBOb2hdcajpSek3yl+42Am0RdQ
-yOWlzJ0viw82thKw8EOzYCZZMFDK
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://via-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://via-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">LAIFE - VIA</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ventspils University College - VIA IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://laife.lanet.lv/</OrganizationURL>
-    <OrganizationURL xml:lang="lv">http://www.venta.lv/</OrganizationURL>
-  </Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>ITserviss</md:SurName>
-    <md:EmailAddress>itserviss@lu.lv</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vince.csueastbay.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/vince.csueastbay.edu-idp-shibboleth.xml
deleted file mode 100644
index be56c89f..00000000
--- a/swamid-interfederations-2.0/vince.csueastbay.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +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://vince.csueastbay.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://vince.csueastbay.edu/idp/error.jsp" 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">csueastbay.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">California State University, East Bay</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>
-MIIDPDCCAiSgAwIBAgIVAJfj/FNmMcHe0xPOV8us8po5lTWAMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHZpbmNlLmNzdWVhc3RiYXkuZWR1MB4XDTEwMDQwNzE3
-NTYyMloXDTMwMDQwNzE3NTYyMlowHzEdMBsGA1UEAxMUdmluY2UuY3N1ZWFzdGJh
-eS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCSz8k6C812clo
-8NsvSM2lfRg04yrqJhsvW76whawnxOHxUFvsG9fjklhiV+chL/tXDHhM2LhanAOD
-Ris/uKNRJnwNl4peCXe8OICeE4vf3qpM0Oa1kSUBpTwLwYHBu0Wf/KlxCprZRoz3
-lDRwd+JxwWi3B7DMozYQd9N9zeQVcocpnuMn3cbyRQpRMgxrRRaxxbIWQDl0FuVy
-38aWmO+AvU4HQahhbC8MA5wYhT85HcG3dRL1bK5V6NM52zl7Z0wttbwc1sTeibWl
-9cbWnlZGz/ZfRRI0MorqFz7637kcIAE9qsm82Wo9x2oJymVW4lCyoNn2SLnPfmIr
-n8JXmCx3AgMBAAGjbzBtMEwGA1UdEQRFMEOCFHZpbmNlLmNzdWVhc3RiYXkuZWR1
-hitodHRwczovL3ZpbmNlLmNzdWVhc3RiYXkuZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQ9tsPsyrMMnxzKEcQ4QJp0zWkHkjANBgkqhkiG9w0BAQUFAAOCAQEA
-d+OGtadQWjvus5q66l/ZdnAkC4DK4fyk1nX0vgtJ8BGOc6hLvsbs9HXWVCc6C3BJ
-BG5imn0tmbPolaR6SB1Lx/t+aJlizQJTnqIQdz6hEY3A4J6LqPfzlZlkh3wPmH6B
-J+J/bhvaC32w/E5XeTruv3tvtt5k9p8lAo50JknOesN5M8s20OFdtXVichtxwJnB
-Qc8LJ6ETsbSEOO22H9s1zBFA7eFtgbVJQXnncmyuP6ysmp7I8JzschRC8hd11mIZ
-xJDXvlpdRC1sHZ2/0U7h70Nzz/k9NK4+O3hR89/NU81ub+7d/TCECa/gj2F8RnOo
-z6yMjX4JYAX5nFs0wOheuQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vince.csueastbay.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vince.csueastbay.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vince.csueastbay.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vince.csueastbay.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vince.csueastbay.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vince.csueastbay.edu/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">csueastbay.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAJfj/FNmMcHe0xPOV8us8po5lTWAMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHZpbmNlLmNzdWVhc3RiYXkuZWR1MB4XDTEwMDQwNzE3
-NTYyMloXDTMwMDQwNzE3NTYyMlowHzEdMBsGA1UEAxMUdmluY2UuY3N1ZWFzdGJh
-eS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCSz8k6C812clo
-8NsvSM2lfRg04yrqJhsvW76whawnxOHxUFvsG9fjklhiV+chL/tXDHhM2LhanAOD
-Ris/uKNRJnwNl4peCXe8OICeE4vf3qpM0Oa1kSUBpTwLwYHBu0Wf/KlxCprZRoz3
-lDRwd+JxwWi3B7DMozYQd9N9zeQVcocpnuMn3cbyRQpRMgxrRRaxxbIWQDl0FuVy
-38aWmO+AvU4HQahhbC8MA5wYhT85HcG3dRL1bK5V6NM52zl7Z0wttbwc1sTeibWl
-9cbWnlZGz/ZfRRI0MorqFz7637kcIAE9qsm82Wo9x2oJymVW4lCyoNn2SLnPfmIr
-n8JXmCx3AgMBAAGjbzBtMEwGA1UdEQRFMEOCFHZpbmNlLmNzdWVhc3RiYXkuZWR1
-hitodHRwczovL3ZpbmNlLmNzdWVhc3RiYXkuZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBQ9tsPsyrMMnxzKEcQ4QJp0zWkHkjANBgkqhkiG9w0BAQUFAAOCAQEA
-d+OGtadQWjvus5q66l/ZdnAkC4DK4fyk1nX0vgtJ8BGOc6hLvsbs9HXWVCc6C3BJ
-BG5imn0tmbPolaR6SB1Lx/t+aJlizQJTnqIQdz6hEY3A4J6LqPfzlZlkh3wPmH6B
-J+J/bhvaC32w/E5XeTruv3tvtt5k9p8lAo50JknOesN5M8s20OFdtXVichtxwJnB
-Qc8LJ6ETsbSEOO22H9s1zBFA7eFtgbVJQXnncmyuP6ysmp7I8JzschRC8hd11mIZ
-xJDXvlpdRC1sHZ2/0U7h70Nzz/k9NK4+O3hR89/NU81ub+7d/TCECa/gj2F8RnOo
-z6yMjX4JYAX5nFs0wOheuQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vince.csueastbay.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vince.csueastbay.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">California State University, East Bay</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">California State University, East Bay</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www20.csueastbay.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Matt Collins</md:GivenName>
-    <md:EmailAddress>matt.collins@csueastbay.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Ashok Kumar</md:GivenName>
-    <md:EmailAddress>ashok.kumar@csueastbay.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Dave Bartholomew</md:GivenName>
-    <md:EmailAddress>dave.bartholomew@csueastbay.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 913769be..00000000
--- a/swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vip.espci.fr/saml2/idp/metadata.php">
-  <md: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>
-  </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 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="en">ESPCI ParisTech</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACRElEQVQ4y32TS0hUYRTHf/fOeLV55Yt0LCXEB2IPxKBF9NgI5bogXElZm8BFixLbtKqFuKlNZmErW4i2CRcm6SZCowZSm0wyx/EVzqSO453nvaeFho9m5oOz+50f3/c/50NESFeDfnnmC8v1TIxKhpOvsfhgcOZ1/xx94SSuVExGQZmDUc2iMOT5ebXzS3T66xq3QfYxioikFehJtMdjG0trgWCBADHD5OKpitHGUpoKslkGUMNxrpFGYrMSdxccXjQRVAXsmpWPXt+lhodvlrbiKNuCBM2zIeV7wqAmlaTcwZigYtWyWJjz0/v0FZ4Xb5kNcA9AdWgMBdc3qyeWtyaDER4dFFTmMryyEmCgp5+Brj42gutQbGd8avU8gJIwxOXxb25YVAXTFArznJ+LbdzKseIJx6B/iu7mm3dbUAywWrethgn5RSvyrs2tiJh4g7IV0XUbgAjYHbaoaaq9tU0dDSzMl2LPAkXZfzV/GH2+S1FBwZGtev7lqCgQjURzJn/8usGcrxS79n8zgM3CUogWFeCQBe/eOYgIR4/k4a4oAtNMPeMcK/5VGlUAl8aT7dXcFeS5bNRVl0AyhSBhQCBKVFhWATSLTJw+5qwqzHWMG6bs5GRSd6Ic4sZuo2HCnwj1Z+q/TU89v3K5hjs7sSpoFmbKnJx1as62QIT7uq7nnqwuA1UFU0BPQIn790hfe8e543RmqXvee7BiSan0hWTkvXdVuNAuVLXGez5JdzgmtoMsmb5qKCatLz9sDgd1qU3H/AXA2mdOrmGYzgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0ODo0MSswMjowMBnHrEYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDg6NDErMDI6MDBomhT6AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.espci.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">ESPCI ParisTech</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://vip.espci.fr/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vip.espci.fr/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vip.espci.fr/shib13/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ESPCI ParisTech</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">ESPCI ParisTech</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.espci.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Emmanuel Dreyfus</md:SurName>
-    <md:EmailAddress>Emmanuel.Dreyfus@espci.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean-Jacques Puig</md:SurName>
-    <md:EmailAddress>Jean-Jacques.Puig@espci.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vis-dev.arc-ts.umich.edu-shibboleth.xml b/swamid-interfederations-2.0/vis-dev.arc-ts.umich.edu-shibboleth.xml
deleted file mode 100644
index 2eac6283..00000000
--- a/swamid-interfederations-2.0/vis-dev.arc-ts.umich.edu-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vis-dev.arc-ts.umich.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://vis-dev.arc-ts.umich.edu/Shibboleth.sso/Login" 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://vis-dev.arc-ts.umich.edu/Shibboleth.sso/TimeSyncTokenLogin" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ARC Visualization Portal (development instance)</mdui:DisplayName>
-        <mdui:Description xml:lang="en"> Provides simple, remote, interactive visualization access to Flux, the University of Michigan's High Performance Computer cluster.  Also provides iPython / Jupyter notebook intergration, R integration, job submission and monitoring, and allocation availability and usage information on Flux.</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFDzCCAvegAwIBAgIJAIkyszqJJL78MA0GCSqGSIb3DQEBDQUAMCMxITAfBgNV
-BAMTGHZpcy1kZXYuYXJjLXRzLnVtaWNoLmVkdTAeFw0xNTExMDQxNzU1MjVaFw0y
-NTExMDExNzU1MjVaMCMxITAfBgNVBAMTGHZpcy1kZXYuYXJjLXRzLnVtaWNoLmVk
-dTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKu/voVrNDahTQlOixGt
-2mmUlSBTUjdkhDUkkC34vHcoBTl1Oj6hc8cF7X22skzMGXEvXtPqgf2ivEZW8OGZ
-FjOBS4QepEnSo+tIkVTW5n+wTxBK6KsMFxq0WA89aUDjWJ11E32ebez3yM0f4fML
-2kfvGsOt6SZAdQ2qDEb0tAr1v2tUywx398FLSEY0060ikt8J+JcE5K31RlpE9n6q
-hZ75KjrQwT0mdpFSUOlD0ClkRAX0QXldVSsUZ2C09tgfRsCCS9PFCud0s09RpZTi
-L8mRWKls0yeMUZsjsPR2fgaRKtgGAMuOd9SVwsOAhZB/HQDdJ7rBTWrVLiLyVnVm
-GKFCQ3A/ACFfYvgrZUQ24nAT9p6HKnwlO/qhW9o8O11zGoPwj3WofMKqWwkJfhF2
-hHRYHSXRpIdYlS0PIcRvapXm9zrbL0L0I0NeSkiZiidbkqu1BWerkp+UsKKeNYab
-cj6Y90vJHkygy9dDz8R88mxjZgBv6aJOjHRgI6too1OXiFq5X9mLyzsTrgj9NHTU
-821jFTM5kao4F1MbQAdeZ4fwF3kcVdRzmeQIIAvBiwgbQBXe2dWzGpyiRai9xGk7
-1g46YmM4t8KbymIOfgaruogdag1EUNWSMg5TIHWj6ssdy6TfKQfoPKy8xoydnKIk
-dgoq2eM16TgoCTzPgwV6oW2xAgMBAAGjRjBEMCMGA1UdEQQcMBqCGHZpcy1kZXYu
-YXJjLXRzLnVtaWNoLmVkdTAdBgNVHQ4EFgQUSQGKn64hjXcliSDUyZb8WoKx1Zsw
-DQYJKoZIhvcNAQENBQADggIBAIiQW1lTF1kRDeTIokl1ZL29tzQJ0OZB6DKXBHIh
-P0LCboKGbWwJSssaIpbhwyVi0yMWCQqkEZ6ohUPGYOfIi3PZILku7+Z8BKYhyvZM
-bjSevez9qzf4bEBSUxMgfXTKhgNAX+GqhiWFMZOr+XcGA8WgZ4Xm+CKB1fzJA2cA
-v2JL2qC7Q90FeEGTZjCxFAc7L4hl5ivOM8WZcQ+/uq68pErlSi30/qJmPFcMvfBt
-ruap8DP95AB3bXrnoMbs3Za/S1pdoeVQGy4aw1mxc9qFKKHHbhvO2JQ5qMrENMRU
-nw54HRf0g0QSwrxecYlOAXLilSWjkpsHh7s30RXtGnqxrgbxLcYipBPFYv5ZQbL9
-aWFb7W78m50TDjad/Hif1LaHKYNKoUWOlMcDRbEufwFYHkoiQIo+gUCvlWM4EBiX
-/Rztv6n5ENUpwJihW/ZyI7SOLfMI83yy/eOzRKWcL7pN038aR/8NfIZxb01Q9EPo
-8xMYqoWfv1HZeh4ZBwjsN9ZIIyySiRaoeIJnQu6JlLjxqBfY0cpnwFXZSn7NcRvI
-GwPMAqGH3ZwTYdTPQF5xyLsl/hMZVv10UiM/FmnV3z9Edeh/IhQlOBz+OFpcej0a
-3p/lWewNIoAppkUecAD0258JCkaGhrzygHKtbttyiuexWaQdm784t6E6lYnaVLcE
-i+37
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vis-dev.arc-ts.umich.edu/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">ARC Visualization Portal (development instance)</md:ServiceName>
-      <md:ServiceDescription xml:lang="en"> Provides simple, remote, interactive visualization access to Flux, the University of Michigan's High Performance Computer cluster.  Also provides iPython / Jupyter notebook intergration, R integration, job submission and monitoring, and allocation availability and usage information on Flux.</md:ServiceDescription>
-      <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="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="mail" 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">University of Michigan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Michigan</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umich.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Flux Visualization Staff</md:GivenName>
-    <md:EmailAddress>flux-viz-staff@umich.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Flux Support Staff</md:GivenName>
-    <md:EmailAddress>hpc-support@umich.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vision.port.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vision.port.ac.uk-shibboleth.xml
deleted file mode 100644
index 5ef62487..00000000
--- a/swamid-interfederations-2.0/vision.port.ac.uk-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://vision.port.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 'A Vision of Britain through Time' SP for the University of Portsmouth.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-26T14:21:02Z"/>
-  </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">A Vision of Britain through Time</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Local history data including maps, boundaries, statistics and text; for viewing and download.</mdui:Description>
-        <mdui:Logo height="82" width="182">https://vision.port.ac.uk/logo.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://vision.port.ac.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://vision.port.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZjCCAk4CCQCfVVv6ur+XEjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJH
-						QjESMBAGA1UECBMJSGFtcHNoaXJlMRMwEQYDVQQHEwpQb3J0c21vdXRoMSEwHwYD
-						VQQKExhVbml2ZXJzaXR5IG9mIFBvcnRzbW91dGgxGjAYBgNVBAMTEXZpc2lvbi5w
-						b3J0LmFjLnVrMB4XDTEyMDQzMDE5MjUxN1oXDTMyMDQyNTE5MjUxN1owdTELMAkG
-						A1UEBhMCR0IxEjAQBgNVBAgTCUhhbXBzaGlyZTETMBEGA1UEBxMKUG9ydHNtb3V0
-						aDEhMB8GA1UEChMYVW5pdmVyc2l0eSBvZiBQb3J0c21vdXRoMRowGAYDVQQDExF2
-						aXNpb24ucG9ydC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-						AMCQj6KNR/lLsY4C0QZ/9AajLoVmgosS8eU28X70hj4FYO72GtkpEhUAcPM+1jg8
-						7xswamsSssDiSwMDwWJOHD/Hg6QU0NiMCdrV92zsLMx/rNWgFnP0OxFhbugZOIaq
-						ephmCltpeIfK7D1+bLvmWxqCjHFXEcFAUBrr8D+2Xtn9CrAG21qhAhblt49hFloM
-						wEcd3kq0qpbutiSOcJbDisQn4tnLMg8C9RRf1/OpZiLC5lkMXcjJrF45OBodpHW/
-						chbK/NLWunZ1vU0eeCR1OHvnoAfAZbPFiRXARmkP/IlopH27C6fAs1kFrFIsH6al
-						Zdtr4gAtIhJly4ek3tfrMssCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAQ/AT6vSW
-						u/myKPyw5BT6oNUVHT3XODsrAV4ZuiF71OaV1W8+x78l6Nl3LRM3BhD5dPsQyFTy
-						Qf+GhQ72NKgrqWRJVlNsJKnQuMBasN75i3G7eoWvkfFVCUCTjKIdliN2JHBxAQ5N
-						PJ+5Hg5Z2vgqDZfqGP1bzAD0hByb0AU+Thc8nu8TwStzsKLPAmg8nU33V2L3G+wK
-						IbMqxWcz14xevKE9iewjRhI5stMrQySAcRUEr4w10t/xGNR+rWwfT+aFKi6t2DFc
-						2SYCBBl+Wx6rH3woTVcZkK3+ObMLVS+nFxGTFS3+KrjhXwHpVLiNwXQQVafhwq8T
-						PHXgjMKQeSp7JQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vision.port.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vision.port.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vision.port.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vision.port.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vision.port.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vision.port.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Portsmouth</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">A Vision of Britain through Time</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.port.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paula</GivenName>
-    <SurName>Aucott</SurName>
-    <EmailAddress>mailto:gbhgis@port.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paula</GivenName>
-    <SurName>Aucott</SurName>
-    <EmailAddress>mailto:gbhgis@port.ac.uk</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 46dfd63b..00000000
--- a/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-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://vm-idp.paris-sorbonne.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Paris-Sorbonne Universite</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACF0lEQVQoz3WSTWtTURCGZ+ac3CbN9y3RoFBBW6ViUVRw60YXoquCv8G14Fb/gPhP6kqhoiBWUYRqFWsrWFODaWzaeJs0H/fm3HNmXAQlCnlXs3gemBdeFBH4kwE7LYgQMZANa8nkcUdOQGvCvwzBSDwGsi4ihfvVxM7KQBmKE0LxKPOPECtjPTtpouDrg16wrgRFWxQaKySsipw2tUeZ7KwunoBwJybSIz//L/RA0geNTusTxFZi45bvwI+HEcNYIUUYZ0q51DT652HvNZy6poqXGNz4DnG7vXGP/XkONniyLFYfBI9VPxgr0Pv7aWsTzYqF/UR+Dnde5ro6Xr07ymhmBgBEFBGXP0oucClSXp9dnXQ97m9C54u1hoiGjEbE4YWI1c+vnj7T08fW+jQrXnuiy41ucOXs1IzSIiICiITMPKRFJPz2hM2L73Cb+r0wlS1BvZRas+9upRdaShEzAyANp9HpdIwx4c+3STzs5126nMvE3TgkLE2FmXPGmGYzQCQA0CKWWT6ubHueMtXow1L94uW9SnVw9fr8m+er27WtQnZhfbmSyWOxUBQcYHO355zbbbSSSa/X+lUolPeCwPdLjXbtiH/IhhUeRNnyhYNOK5fLTyQVOucAECBkwcXFatBszJ/xCTxKJLc2t0/PzWxt1m/cPImgABQAITvLjkBFhBMgVsABawAHpEScoAIhTSggwigivwG84y1HTZzIHgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yMFQxMDo0OTozMyswMjowMGtf30gAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDctMjBUMTA6NDk6MzMrMDI6MDAaAmf0AAAAAElFTkSuQmCC</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.paris-sorbonne.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Paris-Sorbonne Universite</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>
-					      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>
-    </md:KeyDescriptor>
-    <md: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>
-    </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-POST" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vm-idp.paris-sorbonne.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Paris-Sorbonne Universite</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Paris-Sorbonne Universite</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.paris-sorbonne.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>NGUYEN Manh Hung</md:SurName>
-    <md:EmailAddress>manh-hung.nguyen@paris-sorbonne.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Brahim MARIR</md:SurName>
-    <md:EmailAddress>brahim.marir@paris-sorbonne.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vm-jorum-live.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vm-jorum-live.mimas.ac.uk-shibboleth.xml
deleted file mode 100644
index a3ac70d8..00000000
--- a/swamid-interfederations-2.0/vm-jorum-live.mimas.ac.uk-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://vm-jorum-live.mimas.ac.uk/shibboleth">
-  <!--
-		This is a "Jorum Server" Shibboleth SP for the University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-04T13:11:04Z"/>
-  </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://vm-jorum-live.mimas.ac.uk/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://content.resourceshare.ac.uk/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://dashboard.jorum.ac.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://vm-jorum-live.mimas.ac.uk/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://content.resourceshare.ac.uk/Shibboleth.sso/Login" index="2"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/Login" index="3"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Jorum Server</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Through Jorum, you can find and share open learning and teaching resources</mdui:Description>
-        <mdui:Logo height="236" width="236">https://census.mimas.ac.uk/jorum_logo_blue20mm.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIJANQP2jdRCfzwMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXZtLWpvcnVtLWxpdmUubWltYXMuYWMudWswHhcNMTIxMDAyMTM1MjE0WhcN
-						MjIwOTMwMTM1MjE0WjAkMSIwIAYDVQQDExl2bS1qb3J1bS1saXZlLm1pbWFzLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8gYKF0xuU66m0RX5
-						Od3jfU9l0GGu18RGmMjfEqWapq0jKgrcQJ7lnIK3ZXaCAk1tcNS1qOnm9KhXK5KA
-						7wKS0g6Mlp7xeT+rOHpKvSCC/TDPtf1XId4jA0HMTcSnDE1hmI/wauY+QRHWs7Ur
-						oIEUZMPOcMNhPZrJUoVxKaikXvSAyCqFN5R76MDToDDgOfPM1yNnNzyrnpUTQiEq
-						3GKo75cyT7T0G11CWQ8D8iJlOFepN4B0cZirgGl36z43TwJAXHLiAY3D9B60zI+R
-						om/0QSPaTkwh+HRedV3z0nz+fgjedVZ6pJeWzHOD3eSuXaP0curw44D7WqjjYjHL
-						4KIzTwIDAQABo3UwczBSBgNVHREESzBJghl2bS1qb3J1bS1saXZlLm1pbWFzLmFj
-						LnVrhixodHRwczovL3ZtLWpvcnVtLWxpdmUubWltYXMuYWMudWsvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUqorggIzoMEc9fZmWa6roOYbqzSswDQYJKoZIhvcNAQEFBQAD
-						ggEBAFb756zkwksgAxFut4fJ+IcKubtWZbmDTu2TnWyEQL8WKiAhi2jxdf7m/Y8M
-						+Bj2j1ukkoAxRUklRF4B1tdGIIcD8wB3pHDVjnPnH8rPeIOP8WCKPoWEBozpAb9B
-						ry1OnaoxidZBQRAB6Nv8YQ62UiOodcCaOeajRcdbGy3x4n47q/nLGc/rpcQEIBtV
-						asDFXqeKspdgzaZAvXmSPOVvRB/QYnLdjkVRTVfSx1+Lf55Rgvb1f0IqFlVhJtxJ
-						Xu5sshZWFQXfzhiXmZNHQ9StFCt9ZZ7g+ozYkRcqwicS8n3kx14xe4GiOnbQl1id
-						MeubT2ge0DJHn1WTCVIhuNIylBw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm-jorum-live.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://content.resourceshare.ac.uk/Shibboleth.sso/SAML/Artifact" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dashboard.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="17"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Jorum Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jorum.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ben</GivenName>
-    <SurName>Ryan</SurName>
-    <EmailAddress>mailto:Benjamin.ryan@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Ryan</SurName>
-    <EmailAddress>mailto:Benjamin.ryan@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vm-jorum.ds.man.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vm-jorum.ds.man.ac.uk-shibboleth.xml
deleted file mode 100644
index 799f21b6..00000000
--- a/swamid-interfederations-2.0/vm-jorum.ds.man.ac.uk-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://vm-jorum.ds.man.ac.uk/shibboleth">
-  <!--
-		This is a 'Jorum Staging Server' Shibboleth SP for The University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T09:08:36Z"/>
-  </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">The University of Manchester: Jorum Staging Server</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Through Jorum, you can find and share open learning and teaching resources.</mdui:Description>
-        <mdui:Logo height="236" width="236">https://census.mimas.ac.uk/jorum_logo_blue20mm.gif</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://vm-jorum.ds.man.ac.uk/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://staging.resourceshare.ac.uk/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://webstaging.jorum.ac.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://vm-jorum.ds.man.ac.uk/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://staging.resourceshare.ac.uk/Shibboleth.sso/Login" index="2"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Login" index="3"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLTCCAhWgAwIBAgIJALvdFCXrleHwMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHNoaWJ0ZXN0LmpvcnVtLmFjLnVrMB4XDTEyMTIxMjEyNTEyMFoXDTE3MTIx
-						MTEyNTEyMFowHzEdMBsGA1UEAxMUc2hpYnRlc3Quam9ydW0uYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4A9nXwKbBwc2kBco7STxNshEWvwDU
-						Ko9gyYVeny7EBti3FnyexaKdx5kSDOM0JLHO+gQKx/GVl0ZMqelZxnBqKsPN62d5
-						KSj2OsDPzlvYiyBHZybhyUKnjkOXB8/6Ndffu7wea1vTtSZPoNRjtQEDVCX7Qltd
-						mniATHBHsgLgbQX9WxxM27qC8+pw9G/a0Z+X3UZQBpsIJZE4EnY/oOOP3jbYlOSY
-						8hdAEKws3B8zd4R4/4fRkLqapi1h1qbTYRS+zozwdTr/yU7BeL4Av61thl3mMdhL
-						wolSWbwmZUTYmr3oEnajjQr2wCk0X4cuA4OchGIYAN+p5qkwap6Qigv/AgMBAAGj
-						bDBqMEkGA1UdEQRCMECCFHNoaWJ0ZXN0LmpvcnVtLmFjLnVrhihodHRwczovL3Zt
-						LWpvcnVtLmRzLm1hbi5hYy51ay9zaGliYm9sZXRoMB0GA1UdDgQWBBQRO5UtVirW
-						XHM8XRY62cJN2fv9jDANBgkqhkiG9w0BAQUFAAOCAQEAVKfQ1b09D/qMa0bm1dRY
-						vnKo9sJb55b2HsORAnrBGatOA+/3UvJB2RHRpGZxIXxqQAkTxch1K2GsOfnEKvz/
-						tVxZbxWasiVe184HZaYjvudaf7RneW+2MVq+OugsXH+kVXtXPZd189ZO0XmhFTZX
-						jZy2DqL9aG3qvGX7/yX1uLEzltywMo0ba+imB4klXQgD0ZEH8qBaHcPjKaWSSAS/
-						izsVtVnLjEyZ91V2gHyMMKDm6y2eoZTQOisMfhf+ef6rjMIhwBxLNtf0GbsQc2BG
-						IGN531pXBsZhIwlrO13Z5laL4pqG9NDuYWeETHWNpRYRXp8TDLugPCQbkRMGf+wq
-						Jw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm-jorum.ds.man.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://staging.resourceshare.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webstaging.jorum.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The University of Manchester: Jorum Staging Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jorum.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ben</GivenName>
-    <SurName>Ryan</SurName>
-    <EmailAddress>mailto:Benjamin.ryan@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Ryan</SurName>
-    <EmailAddress>mailto:Benjamin.ryan@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vm-shibboleth.umb.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/vm-shibboleth.umb.edu-idp-shibboleth.xml
deleted file mode 100644
index 379a340e..00000000
--- a/swamid-interfederations-2.0/vm-shibboleth.umb.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,190 +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://vm-shibboleth.umb.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">umb.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Massachusetts Boston</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Massachusetts, Boston</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.umb.edu</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>
-MIIFvzCCBKegAwIBAgIQXRVC/prBbahteHW9QGc2kDANBgkqhkiG9w0BAQsFADB2
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjES
-MBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMW
-SW5Db21tb24gUlNBIFNlcnZlciBDQTAeFw0xNDEwMDkwMDAwMDBaFw0xNzEwMDgy
-MzU5NTlaMIHzMQswCQYDVQQGEwJVUzEOMAwGA1UEERMFMDIxMjUxCzAJBgNVBAgT
-Ak1BMQ8wDQYDVQQHEwZCb3N0b24xIDAeBgNVBAkTFzEwMCBNb3JyaXNzZXkgQm91
-bGV2YXJkMSswKQYDVQQKEyJVbml2ZXJzaXR5IG9mIE1hc3NhY2h1c2V0dHMgQm9z
-dG9uMTEwLwYDVQQLEyhJbmZvcm1hdGlvbiBUZWNobm9sb2d5IFNlcnZpY2VzIERp
-dmlzaW9uMRQwEgYDVQQLEwtQbGF0aW51bVNTTDEeMBwGA1UEAxMVdm0tc2hpYmJv
-bGV0aC51bWIuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8PtK
-5CDTHI0ioAT7fB2d+DIWJCdDjy0lcbQPT70SeH6AKUISJTtg02aCl/+a02ZWWUus
-SrbgEsiDPCv07h4U4NLL21f+pITLISK8Q5VQDGISIqsh2oyZzvvUpi1LnCPU8tos
-FVl21Zw/k/cbl/jfG/JEYb73m7oQ6srem04GsSmbfFZJq6GTam92Bg1yxuKmhqyM
-XOcJFJXvZUBmXNyRyvT6VrESNHV9m3hFEgrL+TaL2UXBcBIYDV3hqFik9kqBkoj9
-V7rbLSdXC7s9g0NLSpPmYqE4oTWqt1RgAgxEVRXD+nuwplknPxVLCP6vRXJhWt7p
-74VOu64RgDjCI9YEqwIDAQABo4IByTCCAcUwHwYDVR0jBBgwFoAUHgWjd49sluJb
-h0umtIascQAM5zgwHQYDVR0OBBYEFMF8qgtbkD420iv5Khmt8sCcX/FpMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjBnBgNVHSAEYDBeMFIGDCsGAQQBriMBBAMBATBCMEAGCCsGAQUFBwIB
-FjRodHRwczovL3d3dy5pbmNvbW1vbi5vcmcvY2VydC9yZXBvc2l0b3J5L2Nwc19z
-c2wucGRmMAgGBmeBDAECAjBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vY3JsLmlu
-Y29tbW9uLXJzYS5vcmcvSW5Db21tb25SU0FTZXJ2ZXJDQS5jcmwwdQYIKwYBBQUH
-AQEEaTBnMD4GCCsGAQUFBzAChjJodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20vSW5D
-b21tb25SU0FTZXJ2ZXJDQV8yLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3Au
-dXNlcnRydXN0LmNvbTAgBgNVHREEGTAXghV2bS1zaGliYm9sZXRoLnVtYi5lZHUw
-DQYJKoZIhvcNAQELBQADggEBAHqEHQ84nWUbB4uaYHl8GdD+VSbQcl8j4uVC60Dz
-xK2OOVE44bOBiGi4D4qTCGx5zIyu9GR0zqJNWsqb7fDssXvLDtCJujgOeg8sC1+R
-HtJWIZDdRewvv3CjsvC8HEMOCF/ccGj6DN5GgnyQ0K8a/MjldjomVWJ7mgB3p0Hw
-4cmV4DN5nJVHx588Zcy6lbRS2PmsZ+l7F80UB1s78p4Uzbu+TVsu7Wm2H7MyV7VD
-h5hVfhvFBc3oaiIZO4BFagetIk+nb7HBj5Av0BmZUMY24RJk7kaNUspVfnr7cl7S
-S+Nii5H5ZBvs91SaKPTriRVVu4CleuRbdvYmjRbWVhQvnJk=
-          </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>
-MIIE7jCCA9agAwIBAgIJAI//ogStsrTSMA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
-VQQGEwJVUzEWMBQGA1UECBMNTWFzc2FjaHVzZXR0czEPMA0GA1UEBxMGQm9zdG9u
-MR4wHAYDVQQKExVVbml2IG9mIE1hc3NhY2h1c2V0dHMxDDAKBgNVBAsTA0NJUzEe
-MBwGA1UEAxMVdm0tc2hpYmJvbGV0aC51bWIuZWR1MSQwIgYJKoZIhvcNAQkBFhVs
-ZW9uYXJkLmtyb2xsQHVtYi5lZHUwHhcNMTQxMTA1MTgxMjQ0WhcNMzQxMTA1MTgx
-MjQ0WjCBqjELMAkGA1UEBhMCVVMxFjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxDzAN
-BgNVBAcTBkJvc3RvbjEeMBwGA1UEChMVVW5pdiBvZiBNYXNzYWNodXNldHRzMQww
-CgYDVQQLEwNDSVMxHjAcBgNVBAMTFXZtLXNoaWJib2xldGgudW1iLmVkdTEkMCIG
-CSqGSIb3DQEJARYVbGVvbmFyZC5rcm9sbEB1bWIuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAsaRwhU0fHSeE+Gawxbz5baJa14bejtdSWbJFi3JI
-56UehHePSOCZd1sdj6vsYVW57fId1IigxET38o6MBF70vrHCZbjNTDajhOH69uqR
-M+JLNowpZzfmmU/Ekz1qlWc96u2HyELks03FM9nCV4WtuDnOHDbAkOBAe16MgYfh
-SnHcY6oJ/Qf/fj6QIlF9wh5OFCoP7LfhQv262OkejDTfPm5WHLakIcq4HvHAuIqF
-gFXeQSdR/YYymxAup058rM7JGKrHKHnfk4tVvMhtBDvEggGVOgNXpyCWRheUbdKQ
-ym1eQrBKZcvzDXS7K+B8VBepebhOX1aZed12k/8aWvfhmQIDAQABo4IBEzCCAQ8w
-HQYDVR0OBBYEFJ4FmDHlI7M8ycVdK0OSE8z6J05gMIHfBgNVHSMEgdcwgdSAFJ4F
-mDHlI7M8ycVdK0OSE8z6J05goYGwpIGtMIGqMQswCQYDVQQGEwJVUzEWMBQGA1UE
-CBMNTWFzc2FjaHVzZXR0czEPMA0GA1UEBxMGQm9zdG9uMR4wHAYDVQQKExVVbml2
-IG9mIE1hc3NhY2h1c2V0dHMxDDAKBgNVBAsTA0NJUzEeMBwGA1UEAxMVdm0tc2hp
-YmJvbGV0aC51bWIuZWR1MSQwIgYJKoZIhvcNAQkBFhVsZW9uYXJkLmtyb2xsQHVt
-Yi5lZHWCCQCP/6IErbK00jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBqSq0DCYwsrLHAAgJgl10JOxNAGd8t9zmo4Lk9PZnomXqe5VXTKRL0kKN+syqd
-hgZ/4zD7gn8qSqHxhmg3JHQkXsPTWtvRdnF6zsldrPvxNaMEGE413D8QrK2pMIrJ
-TJNhbVZzYCof/7j8cXv6rwT2VwllJ0U/lCYbZ6LrAJKw6rnj2R97kUKE2ZtzFf5N
-p9Hd1O93RXm+dicsMK+dOf/T9ib36nnNu/5DfrxipBrB4tHtXj4O3BPgUBPfcJbr
-x/5ep7qDHRpz9gSjUcVeDXb6Owd/Pa31D77U9ouYegjbEUUFQIeM6ikx6zturblH
-L5ygSdWzCKrTk65VWO6vYl+x
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vm-shibboleth.umb.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-shibboleth.umb.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vm-shibboleth.umb.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vm-shibboleth.umb.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vm-shibboleth.umb.edu/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">umb.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFvzCCBKegAwIBAgIQXRVC/prBbahteHW9QGc2kDANBgkqhkiG9w0BAQsFADB2
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTUkxEjAQBgNVBAcTCUFubiBBcmJvcjES
-MBAGA1UEChMJSW50ZXJuZXQyMREwDwYDVQQLEwhJbkNvbW1vbjEfMB0GA1UEAxMW
-SW5Db21tb24gUlNBIFNlcnZlciBDQTAeFw0xNDEwMDkwMDAwMDBaFw0xNzEwMDgy
-MzU5NTlaMIHzMQswCQYDVQQGEwJVUzEOMAwGA1UEERMFMDIxMjUxCzAJBgNVBAgT
-Ak1BMQ8wDQYDVQQHEwZCb3N0b24xIDAeBgNVBAkTFzEwMCBNb3JyaXNzZXkgQm91
-bGV2YXJkMSswKQYDVQQKEyJVbml2ZXJzaXR5IG9mIE1hc3NhY2h1c2V0dHMgQm9z
-dG9uMTEwLwYDVQQLEyhJbmZvcm1hdGlvbiBUZWNobm9sb2d5IFNlcnZpY2VzIERp
-dmlzaW9uMRQwEgYDVQQLEwtQbGF0aW51bVNTTDEeMBwGA1UEAxMVdm0tc2hpYmJv
-bGV0aC51bWIuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8PtK
-5CDTHI0ioAT7fB2d+DIWJCdDjy0lcbQPT70SeH6AKUISJTtg02aCl/+a02ZWWUus
-SrbgEsiDPCv07h4U4NLL21f+pITLISK8Q5VQDGISIqsh2oyZzvvUpi1LnCPU8tos
-FVl21Zw/k/cbl/jfG/JEYb73m7oQ6srem04GsSmbfFZJq6GTam92Bg1yxuKmhqyM
-XOcJFJXvZUBmXNyRyvT6VrESNHV9m3hFEgrL+TaL2UXBcBIYDV3hqFik9kqBkoj9
-V7rbLSdXC7s9g0NLSpPmYqE4oTWqt1RgAgxEVRXD+nuwplknPxVLCP6vRXJhWt7p
-74VOu64RgDjCI9YEqwIDAQABo4IByTCCAcUwHwYDVR0jBBgwFoAUHgWjd49sluJb
-h0umtIascQAM5zgwHQYDVR0OBBYEFMF8qgtbkD420iv5Khmt8sCcX/FpMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjBnBgNVHSAEYDBeMFIGDCsGAQQBriMBBAMBATBCMEAGCCsGAQUFBwIB
-FjRodHRwczovL3d3dy5pbmNvbW1vbi5vcmcvY2VydC9yZXBvc2l0b3J5L2Nwc19z
-c2wucGRmMAgGBmeBDAECAjBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vY3JsLmlu
-Y29tbW9uLXJzYS5vcmcvSW5Db21tb25SU0FTZXJ2ZXJDQS5jcmwwdQYIKwYBBQUH
-AQEEaTBnMD4GCCsGAQUFBzAChjJodHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20vSW5D
-b21tb25SU0FTZXJ2ZXJDQV8yLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3Au
-dXNlcnRydXN0LmNvbTAgBgNVHREEGTAXghV2bS1zaGliYm9sZXRoLnVtYi5lZHUw
-DQYJKoZIhvcNAQELBQADggEBAHqEHQ84nWUbB4uaYHl8GdD+VSbQcl8j4uVC60Dz
-xK2OOVE44bOBiGi4D4qTCGx5zIyu9GR0zqJNWsqb7fDssXvLDtCJujgOeg8sC1+R
-HtJWIZDdRewvv3CjsvC8HEMOCF/ccGj6DN5GgnyQ0K8a/MjldjomVWJ7mgB3p0Hw
-4cmV4DN5nJVHx588Zcy6lbRS2PmsZ+l7F80UB1s78p4Uzbu+TVsu7Wm2H7MyV7VD
-h5hVfhvFBc3oaiIZO4BFagetIk+nb7HBj5Av0BmZUMY24RJk7kaNUspVfnr7cl7S
-S+Nii5H5ZBvs91SaKPTriRVVu4CleuRbdvYmjRbWVhQvnJk=
-          </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>
-MIIE7jCCA9agAwIBAgIJAI//ogStsrTSMA0GCSqGSIb3DQEBBQUAMIGqMQswCQYD
-VQQGEwJVUzEWMBQGA1UECBMNTWFzc2FjaHVzZXR0czEPMA0GA1UEBxMGQm9zdG9u
-MR4wHAYDVQQKExVVbml2IG9mIE1hc3NhY2h1c2V0dHMxDDAKBgNVBAsTA0NJUzEe
-MBwGA1UEAxMVdm0tc2hpYmJvbGV0aC51bWIuZWR1MSQwIgYJKoZIhvcNAQkBFhVs
-ZW9uYXJkLmtyb2xsQHVtYi5lZHUwHhcNMTQxMTA1MTgxMjQ0WhcNMzQxMTA1MTgx
-MjQ0WjCBqjELMAkGA1UEBhMCVVMxFjAUBgNVBAgTDU1hc3NhY2h1c2V0dHMxDzAN
-BgNVBAcTBkJvc3RvbjEeMBwGA1UEChMVVW5pdiBvZiBNYXNzYWNodXNldHRzMQww
-CgYDVQQLEwNDSVMxHjAcBgNVBAMTFXZtLXNoaWJib2xldGgudW1iLmVkdTEkMCIG
-CSqGSIb3DQEJARYVbGVvbmFyZC5rcm9sbEB1bWIuZWR1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAsaRwhU0fHSeE+Gawxbz5baJa14bejtdSWbJFi3JI
-56UehHePSOCZd1sdj6vsYVW57fId1IigxET38o6MBF70vrHCZbjNTDajhOH69uqR
-M+JLNowpZzfmmU/Ekz1qlWc96u2HyELks03FM9nCV4WtuDnOHDbAkOBAe16MgYfh
-SnHcY6oJ/Qf/fj6QIlF9wh5OFCoP7LfhQv262OkejDTfPm5WHLakIcq4HvHAuIqF
-gFXeQSdR/YYymxAup058rM7JGKrHKHnfk4tVvMhtBDvEggGVOgNXpyCWRheUbdKQ
-ym1eQrBKZcvzDXS7K+B8VBepebhOX1aZed12k/8aWvfhmQIDAQABo4IBEzCCAQ8w
-HQYDVR0OBBYEFJ4FmDHlI7M8ycVdK0OSE8z6J05gMIHfBgNVHSMEgdcwgdSAFJ4F
-mDHlI7M8ycVdK0OSE8z6J05goYGwpIGtMIGqMQswCQYDVQQGEwJVUzEWMBQGA1UE
-CBMNTWFzc2FjaHVzZXR0czEPMA0GA1UEBxMGQm9zdG9uMR4wHAYDVQQKExVVbml2
-IG9mIE1hc3NhY2h1c2V0dHMxDDAKBgNVBAsTA0NJUzEeMBwGA1UEAxMVdm0tc2hp
-YmJvbGV0aC51bWIuZWR1MSQwIgYJKoZIhvcNAQkBFhVsZW9uYXJkLmtyb2xsQHVt
-Yi5lZHWCCQCP/6IErbK00jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IB
-AQBqSq0DCYwsrLHAAgJgl10JOxNAGd8t9zmo4Lk9PZnomXqe5VXTKRL0kKN+syqd
-hgZ/4zD7gn8qSqHxhmg3JHQkXsPTWtvRdnF6zsldrPvxNaMEGE413D8QrK2pMIrJ
-TJNhbVZzYCof/7j8cXv6rwT2VwllJ0U/lCYbZ6LrAJKw6rnj2R97kUKE2ZtzFf5N
-p9Hd1O93RXm+dicsMK+dOf/T9ib36nnNu/5DfrxipBrB4tHtXj4O3BPgUBPfcJbr
-x/5ep7qDHRpz9gSjUcVeDXb6Owd/Pa31D77U9ouYegjbEUUFQIeM6ikx6zturblH
-L5ygSdWzCKrTk65VWO6vYl+x
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vm-shibboleth.umb.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vm-shibboleth.umb.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Massachusetts Boston</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Massachusetts Boston</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://umb.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>leonard kroll</md:GivenName>
-    <md:EmailAddress>leonard.kroll@umb.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 979786a8..00000000
--- a/swamid-interfederations-2.0/vmfetid.iamm.fr-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://vmfetid.iamm.fr/idp/shibboleth">
-  <md: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>
-  </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 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:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAADfklEQVQ4y3WTbVDTBQDGf/9t8j42xkQ2uRCZvIzRhZAg3TwMUwzssPLsugjy+uCKyuIuLU3SuqtOuqyEROuU7IOSHJhWvHhxIaGZCBSkSBuDHYJu4xhsHHth/z5VXl2/T8+H5/fteQT+jUnUEEVZ9PS5ok1xHWnttxJlrgW9BUnxRbScpl4Y5H/ZJ+4JLa6ZF7LqRMPTJtFvlYgPm54Tya4XX3u3RMx/fqdIubfuXkXydyoRjx2MWf/exP7Xw1PSBexeA4k7tjPueZDkTBmVay/waPoA9J41sfZ691+aFIBnxJf47cy+pQkOBqxS2v/QkZW2isFfQigoSCNEEuDVo1qcEY+jjDXzwvqj9zmNJ3T2zoZmQTCJilxf5czKeCvd1jJcPjV+Vy91VUVk6RNYEgzS2T9GnzlA88+zaIR6rrzRhPHwK/QFDj8gwUbFUzn9vLmhjfG+IXJX+bhUW0FYaAhej5f5hQDxKjkHyg2olowyt5DHuiO19PVmgOTmbim5+e+0XopJ7rA8RpI6ioeytWzMSeLL9kEau27Ses2KZXKGfL2WwuxExm0iFscspfd3MOWaV0mkDluaWu4iTBokPU1LSZ6O1qsWbticKKPCiJWHYZ+Zp6PXikoeTvOP49yeaOf4rhay480q6TJDUZX5w+rowZFRTn68nNLtqei0MeiWx/D9VQtW2zS7tq0hPTEWr3+R0Agfbp+GQ+f1DNtVixK3ImHk5c83M3j3SZ6oyMQx6yE7ZRnb1qUy4XRjnfbw7CMZGA0JTDg9DFwfRSbzY7utwe3WzsjcKVvaTpyyFwiJkeg1Y3TX3aB4jQ5FZAhGQwIrtUoCgSBj9jm6huxcHvDzze49iEUr2PpFZ4+ASYyLtb5/59uqGvY3ptLveotNOeHEyRfZWZJFUCZhYHiSHYcuIEp0qJVyipJr8HkjOXnnbL6Mz4S7ylqxemTy9IGALJWwCDj19RUUmkj8wSCfHL9FtlGHIlpGQfwH2H166psqQJv5Ha3CZQmA+UXhYFnD+ZYfftrARm0d/dV7WREn0NLjJFndRmDuGmGBGPaWDlGs/x0i1EPk6Lf+M2UAy0dnKGySK8WL+UsVEhq60/F7Zhj+tB6HY4FzrVkc+3U1naKp0b/auJm3BR+A8J9HVooZjFOO2FQoDU5o85KmBPNsomNKsaUHUfsVR4Sue+t/AsOzae5ylJ+FAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ4OjE2KzAyOjAwlICcrAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0ODoxNiswMjowMOXdJBAAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.iamm.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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-POST" Location="https://vmfetid.iamm.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmfetid.iamm.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmfetid.iamm.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CIHEAM / IAMM</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CIHEAM / IAMM</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iamm.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>assistance@iamm.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml b/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml
deleted file mode 100644
index 8c542edb..00000000
--- a/swamid-interfederations-2.0/vmidgw3.miun.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vmidgw3.miun.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">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</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">miun.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Mittuniversitetet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Mid Sweden University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter hos Mittuniversitetet</mdui:Description>
-        <mdui:Description xml:lang="en">Mid Sweden University Identity Provider, used by employees and students at Mid Sweden University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL>
-        <mdui:Logo height="111" width="225" xml:lang="sv">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
-        <mdui:Logo height="111" width="225" xml:lang="en">https://www.miun.se/imagevault/publishedmedia/x4bl7padufcm1j4td3d7/logo.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">http://www.miun.se/sv/Helpdesk/Student/MittNets-regler/</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>miun.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:63.176762,14.651352</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:62.394626,17.284259</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:62.630989,17.946473</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUREnpvBXjmkHQJD0xn6joE9UTMyMwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMB4XDTExMTIzMDEwMjMyNVoX
-DTMxMTIzMDEwMjMyNVowGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiJkrr5rb4DLITBdU0e/8/lBAnoQq
-Bx/coeuJzCNP2EtRKCqTHB+v77geB+zzUZz2xDVmVjqMiO2/yCtZtI1hsK9nuPbV
-EZe1AuyQph31ud3r2ZkT/eS+xbmTyxAkMYSqrj55OC1Dfk0AYHGpS46q3JURD0A8
-OYOQb74IB1iC2+da3VKKjkbVlymdULN+o5Fg+zAzFymClSbPP3+Vu6D/65L2r1Bg
-DDgq9qtFGXdopNHnDU2eY+rTQEipa0EpVG7gv77Q1GFA2f5BCNTuW9AQOKnXTkbO
-hb1bXylESEvNL57+l8/8qdDEJmcvwJRHttVpSlWpTYQKMXK9J5kB3YIhUQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg92bWlkZ3czLm1pdW4uc2WGJmh0dHBzOi8vdm1pZGd3
-My5taXVuLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRpUIa+z1bDfa7o0lKm
-pwa034YZhTANBgkqhkiG9w0BAQUFAAOCAQEAfgyLe7dVQXULh4wAVhCVeUNv40En
-hW929W1K+Zgtz+77nG5lnck88G2yrs15inPABkoGm6SYSYkycYeI7SY1rPy0aSMF
-DWSZLLppL5N1mLxsK+vbF8h3zHWJza8SrxmLoWN6FvM+bYcQb/Peg6MVFpAm3xSp
-EyV0GjP3wM/Qt05Pf26yvZRVXDingJ1RWIOwtNlCag8X/9yG+ktTdSaG+ecqXlq4
-A+ZqGs14HCp2XO5VLdsp8g1i9cUEKgWjMdX8t8GNsYbEjLjAG/CtmNNgUDrEJ4qM
-I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmidgw3.miun.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vmidgw3.miun.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmidgw3.miun.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">miun.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJzCCAg+gAwIBAgIUREnpvBXjmkHQJD0xn6joE9UTMyMwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMB4XDTExMTIzMDEwMjMyNVoX
-DTMxMTIzMDEwMjMyNVowGjEYMBYGA1UEAxMPdm1pZGd3My5taXVuLnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiJkrr5rb4DLITBdU0e/8/lBAnoQq
-Bx/coeuJzCNP2EtRKCqTHB+v77geB+zzUZz2xDVmVjqMiO2/yCtZtI1hsK9nuPbV
-EZe1AuyQph31ud3r2ZkT/eS+xbmTyxAkMYSqrj55OC1Dfk0AYHGpS46q3JURD0A8
-OYOQb74IB1iC2+da3VKKjkbVlymdULN+o5Fg+zAzFymClSbPP3+Vu6D/65L2r1Bg
-DDgq9qtFGXdopNHnDU2eY+rTQEipa0EpVG7gv77Q1GFA2f5BCNTuW9AQOKnXTkbO
-hb1bXylESEvNL57+l8/8qdDEJmcvwJRHttVpSlWpTYQKMXK9J5kB3YIhUQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg92bWlkZ3czLm1pdW4uc2WGJmh0dHBzOi8vdm1pZGd3
-My5taXVuLnNlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRpUIa+z1bDfa7o0lKm
-pwa034YZhTANBgkqhkiG9w0BAQUFAAOCAQEAfgyLe7dVQXULh4wAVhCVeUNv40En
-hW929W1K+Zgtz+77nG5lnck88G2yrs15inPABkoGm6SYSYkycYeI7SY1rPy0aSMF
-DWSZLLppL5N1mLxsK+vbF8h3zHWJza8SrxmLoWN6FvM+bYcQb/Peg6MVFpAm3xSp
-EyV0GjP3wM/Qt05Pf26yvZRVXDingJ1RWIOwtNlCag8X/9yG+ktTdSaG+ecqXlq4
-A+ZqGs14HCp2XO5VLdsp8g1i9cUEKgWjMdX8t8GNsYbEjLjAG/CtmNNgUDrEJ4qM
-I7yfePa+lbSSpUv1l32U1dXAI6n54O9jK+ZVGubhDe0PT1Y23j/HHPbZoQ==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmidgw3.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmidgw3.miun.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">MIUN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.miun.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, IT-avdelningen, Mittuniversitetet</md:SurName>
-    <md:EmailAddress>mailto:SystemDriftIT@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 771 975 000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>Ove Olander</md:SurName>
-    <md:EmailAddress>mailto:Ove.Olander@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 63 165787</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 771 976130</md:TelephoneNumber>
-  </md:ContactPerson>
-</md: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 40cd6d62..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"?>
-<md:EntityDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://vmshib.ufrpe.br/idp/shibboleth">
-  <md: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>
-  </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">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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md: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"/>
-    <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-POST-SimpleSign" Location="https://vmshib.ufrpe.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmshib.ufrpe.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vmshib.ufrpe.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmshib.ufrpe.br/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">ufrpe.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vmshib.ufrpe.br:8443/idp/profile/SAML1/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">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UFRPE - Universidade Federal Rural de Pernambuco</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ufrpe.br/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.ufrpe.br/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Fred Medeiros</md:SurName>
-    <md:EmailAddress>coord.suporte@nti.ufrpe.br</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 099a4f60..00000000
--- a/swamid-interfederations-2.0/vmshib.ufrpe.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://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>
-    MIID+DCCAuACAQAwDQYJKoZIhvcNAQEFBQAwgcExOTA3BgNVBAoTMFVOSVZFUlNJ
-REFERSBGRURFUkFMIFJVUkFMIERFIFBFUk5BTUJVQ08gLyBVRlJQRTEMMAoGA1UE
-CxMDQ1BEMSkwJwYJKoZIhvcNAQkBFhpjb29yZC5zdXBvcnRlQG50aS51ZnJwZS5i
-cjEPMA0GA1UEBxMGUkVDSUZFMRMwEQYDVQQIEwpQRVJOQU1CVUNPMQswCQYDVQQG
-EwJCUjEYMBYGA1UEAxMPdm1zaGliLnVmcnBlLmJyMB4XDTEzMDkwMjEyMDEwMVoX
-DTE2MDkwMTEyMDEwMVowgcExOTA3BgNVBAoTMFVOSVZFUlNJREFERSBGRURFUkFM
-IFJVUkFMIERFIFBFUk5BTUJVQ08gLyBVRlJQRTEMMAoGA1UECxMDQ1BEMSkwJwYJ
-KoZIhvcNAQkBFhpjb29yZC5zdXBvcnRlQG50aS51ZnJwZS5icjEPMA0GA1UEBxMG
-UkVDSUZFMRMwEQYDVQQIEwpQRVJOQU1CVUNPMQswCQYDVQQGEwJCUjEYMBYGA1UE
-AxMPdm1zaGliLnVmcnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA2nK7Wq2HIdxRO5pOn/OqjL+pqF4ymtMwh9gm5NIDVw+51eTY7vgF2JfhyI6R
-gpBjdXy/mdbcQFDeCOeHm5dGSvrj6GijudN8SxmpOtJhrg1QXUsVCORBGVDqg4pJ
-xPpF7F7Os/KHjcw5R1e3FQfDBf+RMi+3n/8tw2F5/4XXvaEuzDj3kEIaG9l+1szw
-tgfw8nOBv2aCEFJw3diNojnh7LCTHQyP6WzSTRhmtaqqJ7SS0jgbbWuWtuF2OOxK
-Ri3mASA0DmRaTrMY9usutfkddpxJ0f7VjhTjam+4J8a6PsWJvXO5SoHKW/GvP61C
-VW/ya6DZKKjS8OGk1sQ0ApbryQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQASVqt+
-fIOD7MU30TUjylL5F1TH4F7Wco3Oh/TA1GmiOo3n3Jw/Jwp/SO/cRehHgG0P5Inh
-od01LhGYR8IWYhNE0/xW5AmohOMPrPrFvGhZYdea8q5lDUgMOAhJ6HcVtX916i30
-BOZRJT6YBZ1+gM11j+uzVH1POrPRpBKIG2mFXIENyykcUH1/fzZq6nCYQRkRqwGW
-Qqr/W736U+9O7maGgwiyyB1Qoh009siTxLjIHPWqu+Uv99CKYioPv87dUpXRrG/w
-T03SRkawusIfxjWkchmxr1AZmJmC+k4fvfPp1U4CPgBpN/bn0/z+jacWe7P6XSV2
-A7uW95WfCmbke4rc
-            </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>
-      
-MIID+DCCAuACAQAwDQYJKoZIhvcNAQEFBQAwgcExOTA3BgNVBAoTMFVOSVZFUlNJ
-REFERSBGRURFUkFMIFJVUkFMIERFIFBFUk5BTUJVQ08gLyBVRlJQRTEMMAoGA1UE
-CxMDQ1BEMSkwJwYJKoZIhvcNAQkBFhpjb29yZC5zdXBvcnRlQG50aS51ZnJwZS5i
-cjEPMA0GA1UEBxMGUkVDSUZFMRMwEQYDVQQIEwpQRVJOQU1CVUNPMQswCQYDVQQG
-EwJCUjEYMBYGA1UEAxMPdm1zaGliLnVmcnBlLmJyMB4XDTEzMDkwMjEyMDEwMVoX
-DTE2MDkwMTEyMDEwMVowgcExOTA3BgNVBAoTMFVOSVZFUlNJREFERSBGRURFUkFM
-IFJVUkFMIERFIFBFUk5BTUJVQ08gLyBVRlJQRTEMMAoGA1UECxMDQ1BEMSkwJwYJ
-KoZIhvcNAQkBFhpjb29yZC5zdXBvcnRlQG50aS51ZnJwZS5icjEPMA0GA1UEBxMG
-UkVDSUZFMRMwEQYDVQQIEwpQRVJOQU1CVUNPMQswCQYDVQQGEwJCUjEYMBYGA1UE
-AxMPdm1zaGliLnVmcnBlLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA2nK7Wq2HIdxRO5pOn/OqjL+pqF4ymtMwh9gm5NIDVw+51eTY7vgF2JfhyI6R
-gpBjdXy/mdbcQFDeCOeHm5dGSvrj6GijudN8SxmpOtJhrg1QXUsVCORBGVDqg4pJ
-xPpF7F7Os/KHjcw5R1e3FQfDBf+RMi+3n/8tw2F5/4XXvaEuzDj3kEIaG9l+1szw
-tgfw8nOBv2aCEFJw3diNojnh7LCTHQyP6WzSTRhmtaqqJ7SS0jgbbWuWtuF2OOxK
-Ri3mASA0DmRaTrMY9usutfkddpxJ0f7VjhTjam+4J8a6PsWJvXO5SoHKW/GvP61C
-VW/ya6DZKKjS8OGk1sQ0ApbryQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQASVqt+
-fIOD7MU30TUjylL5F1TH4F7Wco3Oh/TA1GmiOo3n3Jw/Jwp/SO/cRehHgG0P5Inh
-od01LhGYR8IWYhNE0/xW5AmohOMPrPrFvGhZYdea8q5lDUgMOAhJ6HcVtX916i30
-BOZRJT6YBZ1+gM11j+uzVH1POrPRpBKIG2mFXIENyykcUH1/fzZq6nCYQRkRqwGW
-Qqr/W736U+9O7maGgwiyyB1Qoh009siTxLjIHPWqu+Uv99CKYioPv87dUpXRrG/w
-T03SRkawusIfxjWkchmxr1AZmJmC+k4fvfPp1U4CPgBpN/bn0/z+jacWe7P6XSV2
-A7uW95WfCmbke4rc
-                    
-            </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/voparis-auth.obspm.fr-.xml b/swamid-interfederations-2.0/voparis-auth.obspm.fr-.xml
deleted file mode 100644
index e756806f..00000000
--- a/swamid-interfederations-2.0/voparis-auth.obspm.fr-.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://voparis-auth.obspm.fr/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2015-02-04T14:37:54Z">
-      <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:AttributeValue>https://federation.renater.fr/category/metier</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">VO Paris Authentication</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://voparis-auth.obspm.fr/</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Access to authenticated service of the astronomical virtual observatory at Observatoire de Paris.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Authentification VO Paris</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Accès au service authentifié de l'observatoire virtuel astronomique de l'Observatoire de Paris.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://voparis-srv.obspm.fr/portal/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>
-					      MIIDBjCCAe6gAwIBAgIJANXkggHBesKeMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFXZvcGFyaXMtYXV0aC5vYnNwbS5mcjAeFw0xNTAyMDQxMzI4MDlaFw0yNTAy
-MDExMzI4MDlaMCAxHjAcBgNVBAMTFXZvcGFyaXMtYXV0aC5vYnNwbS5mcjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOXw2yL9a6xlFB26MUsFjKDwsWuC
-L/nn4CGRsU6cBtNQU7/z/pHRihWWxlSV+FXySkRYoy7DrpA84zo0AiYPtxuV31K/
-Ib9mg5jB12M5jqDHGk8blbxStVAF5ZI7GSP1Yo0SYrMBtPzxRy5yjtyCPb3Cj/ez
-2EO+Dh0lS9FCIlaPwfyRfEFaGhKlZ0oFFn1Y4D6suNKE3tFWRtz5lPW66BGZ6303
-WWlF0wNPhJy7SlZIFeYmdoLD/n68hCmI9BUivXsbTlRJdEYhcwQbkX0e/CBONC7M
-riIOlQ/Pci2jnMo0np/x6EHKg7vCxrHr7zGZVNl8Mgiw03RZlZqrDnRSvTUCAwEA
-AaNDMEEwIAYDVR0RBBkwF4IVdm9wYXJpcy1hdXRoLm9ic3BtLmZyMB0GA1UdDgQW
-BBTbSK3h6OXJaGl0/w1Jo7as0O1xUjANBgkqhkiG9w0BAQUFAAOCAQEAUvf2DQUQ
-NonutHUXwYTIpK12+FgOmo+O8Akn+RNYzmwCmxxTfUdkXPWCI5RDE3k6RRo265xx
-U+zijD6XZia4v2oxXoIxS/dTMyysU/VvIgtnHOaaeEsDJRLB9/7pxd6uuDS5mMG6
-bk1LYTFU+wM5joK7UL7iAQGPbPXJ/yXXMYfE6E6FzPbCs6K46z1Xxc6QTZDrcwmW
-U4f0PwCtKDt6yuk8zcvPCNStQlT3udLzIb4szTSS2Mcdb+k+LJdN0AulJYZG0L3p
-UkePHzLUtvkC2YNySU+2LKUzZbyGxR3mXQ5mk/F0mrpk6Yn/frplA6nYGIWM7tb4
-8BTF+jExj09ZCw==
-					    </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>
-					      MIIDBjCCAe6gAwIBAgIJANXkggHBesKeMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFXZvcGFyaXMtYXV0aC5vYnNwbS5mcjAeFw0xNTAyMDQxMzI4MDlaFw0yNTAy
-MDExMzI4MDlaMCAxHjAcBgNVBAMTFXZvcGFyaXMtYXV0aC5vYnNwbS5mcjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOXw2yL9a6xlFB26MUsFjKDwsWuC
-L/nn4CGRsU6cBtNQU7/z/pHRihWWxlSV+FXySkRYoy7DrpA84zo0AiYPtxuV31K/
-Ib9mg5jB12M5jqDHGk8blbxStVAF5ZI7GSP1Yo0SYrMBtPzxRy5yjtyCPb3Cj/ez
-2EO+Dh0lS9FCIlaPwfyRfEFaGhKlZ0oFFn1Y4D6suNKE3tFWRtz5lPW66BGZ6303
-WWlF0wNPhJy7SlZIFeYmdoLD/n68hCmI9BUivXsbTlRJdEYhcwQbkX0e/CBONC7M
-riIOlQ/Pci2jnMo0np/x6EHKg7vCxrHr7zGZVNl8Mgiw03RZlZqrDnRSvTUCAwEA
-AaNDMEEwIAYDVR0RBBkwF4IVdm9wYXJpcy1hdXRoLm9ic3BtLmZyMB0GA1UdDgQW
-BBTbSK3h6OXJaGl0/w1Jo7as0O1xUjANBgkqhkiG9w0BAQUFAAOCAQEAUvf2DQUQ
-NonutHUXwYTIpK12+FgOmo+O8Akn+RNYzmwCmxxTfUdkXPWCI5RDE3k6RRo265xx
-U+zijD6XZia4v2oxXoIxS/dTMyysU/VvIgtnHOaaeEsDJRLB9/7pxd6uuDS5mMG6
-bk1LYTFU+wM5joK7UL7iAQGPbPXJ/yXXMYfE6E6FzPbCs6K46z1Xxc6QTZDrcwmW
-U4f0PwCtKDt6yuk8zcvPCNStQlT3udLzIb4szTSS2Mcdb+k+LJdN0AulJYZG0L3p
-UkePHzLUtvkC2YNySU+2LKUzZbyGxR3mXQ5mk/F0mrpk6Yn/frplA6nYGIWM7tb4
-8BTF+jExj09ZCw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://voparis-auth.obspm.fr/Shibboleth.sso/SAML/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://voparis-auth.obspm.fr/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Authentification VO Paris</md:ServiceName>
-      <md:ServiceName xml:lang="en">VO Paris Authentication</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Accès au service authentifié de l'observatoire virtuel astronomique de l'Observatoire de Paris.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Access to authenticated service of the astronomical virtual observatory at Observatoire de Paris.</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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <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"/>
-      <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">Observatoire de Paris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Observatoire de Paris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.obspm.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>vo.paris@obspm.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vote.kcl.ac.uk-shibboleth.xml
deleted file mode 100644
index 96ad2f80..00000000
--- a/swamid-interfederations-2.0/vote.kcl.ac.uk-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://vote.kcl.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://vote.kcl.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vote.kcl.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vote.kcl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vote.kcl.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vote.kcl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vote.kcl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vote.kcl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Membership Solutions Limited: Kings College London Voting</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://vote.kcl.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/voting.wlv.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/voting.wlv.ac.uk-shibboleth.xml
deleted file mode 100644
index 297eb20c..00000000
--- a/swamid-interfederations-2.0/voting.wlv.ac.uk-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://voting.wlv.ac.uk/shibboleth">
-  <!--
-		This is a "Voting" Shibboleth SP for Membership Solutions Limited on behalf of the University of Wolverhampton.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-05-29T14:29:29Z"/>
-  </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://voting.wlv.ac.uk/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="60" width="80">https://oa-idp.wlv.ac.uk/oala/wlv_uni_logo.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">University of Wolverhampton - Voting</mdui:DisplayName>
-        <mdui:Description xml:lang="en">University of Wolverhampton - Voting system</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://voting.wlv.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://voting.wlv.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://voting.wlv.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://voting.wlv.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://voting.wlv.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://voting.wlv.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Wolverhampton - Voting</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wlv.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vpp.midlands3cities.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vpp.midlands3cities.ac.uk-shibboleth.xml
deleted file mode 100644
index a438cb44..00000000
--- a/swamid-interfederations-2.0/vpp.midlands3cities.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://vpp.midlands3cities.ac.uk/shibboleth">
-  <!--
-		This is a "M3C VPP" Shibboleth SP for the University of Nottingham.
-	-->
-  <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="2015-09-17T10:01:33Z">
-      <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://vpp.midlands3cities.ac.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://vpp.midlands3cities.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">M3C VPP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Virtual Postgraduate Platform</mdui:Description>
-        <mdui:Logo height="64" width="143">https://vpp.midlands3cities.ac.uk/shibboleth-ds/logo_transparent.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIJAOAjIQJx+4c/MA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXZwcC5taWRsYW5kczNjaXRpZXMuYWMudWswHhcNMTUwOTE1MTEyMjQxWhcN
-						MjUwOTEyMTEyMjQxWjAkMSIwIAYDVQQDExl2cHAubWlkbGFuZHMzY2l0aWVzLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyGltDWl57D+/WfKV
-						QSoHkEpwh9Hp8aflx1uF9NDg+3kLcucXCz5/x9+Vbb6c4Eh22wQSQZxRoMDR3eQd
-						HbSect7xZWiEZVpftJdWbDWPNbayQdfUNOeLCQohBt9DAXYxcRwsO5RZdMkrTm72
-						MhW5j0CtFmB2SjLZ16D/mRJCPAVsLtaQ1mThTUU75xtDL3FYEZQDYreyMDxjRqeU
-						W4JnSUGyPjAdaA8v3mWMptyQCkzHJtYbeAXre639aunbl7brZR/H4ysDydEI65q3
-						ruyFUA/hzatm2/tW0vmTbkYBdMLt4AG7v6oQuuoT4XCJmgP58uDo8MGEN2ds/i8r
-						Dw65RQIDAQABo3UwczBSBgNVHREESzBJghl2cHAubWlkbGFuZHMzY2l0aWVzLmFj
-						LnVrhixodHRwczovL3ZwcC5taWRsYW5kczNjaXRpZXMuYWMudWsvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUBAJDQt2jWrbNLitgyQu4PotWNwAwDQYJKoZIhvcNAQEFBQAD
-						ggEBAJxgwVcNBRoOVCPVBxj+a37OSoD3DZmQl07k1k8cijVr/0MOTboZiYkDBzqe
-						zmrytY6CM/ej5IHJR7ByltSi/Nj67BQWFafhThULzZ1b+1ARWtvMQRaU9LuEVp3S
-						ebpzHFa4KrtNUFYp1UJs0YMPF63pA+uR0SomYpeB20BDULQ0lLR55dxcWH8lELM+
-						9PEY7Z5v6asho2lBZ+PjdR1zBs11ffv4Y2G+3VLLndMm7MOs7m7Bo6m8PDl9p+f9
-						hCljjUhEyX/lIWuZjv5jZI8bCsviOM+ZLBwhoVpj1NMicj7PCeVP7k7RjnHM4qN+
-						cevd/sPqVI0kteZSRYR9CQgLkco=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://vpp.midlands3cities.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vpp.midlands3cities.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Nottingham</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">M3C VPP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.midlands3cities.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Service Desk</GivenName>
-    <EmailAddress>mailto:itservicedesk@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Betts</SurName>
-    <EmailAddress>mailto:Craig.Betts@nottingham.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/vsp2.edina.ac.uk-shibboleth.xml
deleted file mode 100644
index e13dd71d..00000000
--- a/swamid-interfederations-2.0/vsp2.edina.ac.uk-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" entityID="https://vsp2.edina.ac.uk/shibboleth">
-  <!--
-		This is an "EDINA VSP2 Default" Shibboleth SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://vsp2.edina.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <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>
-    <KeyDescriptor use="encryption">
-      <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/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp3.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp4.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://auth.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML2/Artifact" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML2/ECP" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML/POST" index="29"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vsp2a.edina.ac.uk/Shibboleth.sso/SAML/Artifact" index="30"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">EDINA VSP2 Default</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://edina.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/vsu-pbslive-01v.vsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/vsu-pbslive-01v.vsu.edu-idp-shibboleth.xml
deleted file mode 100644
index 406d1eb1..00000000
--- a/swamid-interfederations-2.0/vsu-pbslive-01v.vsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,99 +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://vsu-pbslive-01v.vsu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://library.vsu.edu/shiberror.htm" 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">vsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Virginia State University</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>
-MIIDSDCCAjCgAwIBAgIVAIcZqh5/AQ5ogKy4ZUjxI8jD0RUFMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3ZzdS1wYnNsaXZlLTAxdi52c3UuZWR1MB4XDTExMDgx
-NjE1MzMwMVoXDTMxMDgxNjE1MzMwMVowIjEgMB4GA1UEAxMXdnN1LXBic2xpdmUt
-MDF2LnZzdS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC90GSC
-Rz/AsfNbA0YuDlQN3nhh3V8LKLH80F2z5Hbxge8z1fWUSGwZhTne1T0LBEIGa3Yi
-EZAZWtKU2xTBtpy+8z985i5ahFdu3woSnmy2K3Tvn+sM9JleD4pgGQqD3hUf1AQL
-bLJxsGsRGI4CL43eMfVOx3ejct4zmu/ptOl5UDyHgJfWYke1UfEk21asR4YTlXu4
-KD+zWiRkfihF2r5PeEYpmwNnqP/maoJtCf5AbYUuiHzrBpEC/48CE6bTzgt3PYVK
-5glbjtkEmGSMB0d4JKHphTbFuV8Q+JN+pfVs2q8Gcv0q3P+M6gxLi4MSTj0felHU
-fzykbrgPLQ2tdA2FAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3ZzdS1wYnNsaXZlLTAx
-di52c3UuZWR1hi5odHRwczovL3ZzdS1wYnNsaXZlLTAxdi52c3UuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSTz44AhB5qH5KiJgO1yML7oBLCtTANBgkqhkiG
-9w0BAQUFAAOCAQEAZnX7e45+EKLCa8zmZcjt637cTH6UgDIS+ObQWVEby/OuxPra
-bQtN16SrBYV/awb/VU3E98Z4jxF8lvB6XP9V8cnXM3X/DC0OPGzyF8hbb+PoFo15
-pb3rgVbUHj3mo9x6H0FbwAlNOvMy2kgcIKJ7X1a8aIZFxfUG5erAE2B8RUJeFbGB
-p8h8HgbrqjICbbP8B0uOwkM0smyzys0EKEGkW3mRjSIEt08uo9zZTQ3V05pqys2Q
-oXaut0JB32Q85fICOS/qkRYjCQQwtvU5Rwfl3bK0nFhaYAQyWLcoqfV/kGrIDmmr
-WMq+i0naoDk/DX9b/TYx/Yg95/dtcnC86iSZsA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vsu-pbslive-01v.vsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vsu-pbslive-01v.vsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vsu-pbslive-01v.vsu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vsu-pbslive-01v.vsu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vsu-pbslive-01v.vsu.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDSDCCAjCgAwIBAgIVAIcZqh5/AQ5ogKy4ZUjxI8jD0RUFMA0GCSqGSIb3DQEB
-BQUAMCIxIDAeBgNVBAMTF3ZzdS1wYnNsaXZlLTAxdi52c3UuZWR1MB4XDTExMDgx
-NjE1MzMwMVoXDTMxMDgxNjE1MzMwMVowIjEgMB4GA1UEAxMXdnN1LXBic2xpdmUt
-MDF2LnZzdS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC90GSC
-Rz/AsfNbA0YuDlQN3nhh3V8LKLH80F2z5Hbxge8z1fWUSGwZhTne1T0LBEIGa3Yi
-EZAZWtKU2xTBtpy+8z985i5ahFdu3woSnmy2K3Tvn+sM9JleD4pgGQqD3hUf1AQL
-bLJxsGsRGI4CL43eMfVOx3ejct4zmu/ptOl5UDyHgJfWYke1UfEk21asR4YTlXu4
-KD+zWiRkfihF2r5PeEYpmwNnqP/maoJtCf5AbYUuiHzrBpEC/48CE6bTzgt3PYVK
-5glbjtkEmGSMB0d4JKHphTbFuV8Q+JN+pfVs2q8Gcv0q3P+M6gxLi4MSTj0felHU
-fzykbrgPLQ2tdA2FAgMBAAGjdTBzMFIGA1UdEQRLMEmCF3ZzdS1wYnNsaXZlLTAx
-di52c3UuZWR1hi5odHRwczovL3ZzdS1wYnNsaXZlLTAxdi52c3UuZWR1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBSTz44AhB5qH5KiJgO1yML7oBLCtTANBgkqhkiG
-9w0BAQUFAAOCAQEAZnX7e45+EKLCa8zmZcjt637cTH6UgDIS+ObQWVEby/OuxPra
-bQtN16SrBYV/awb/VU3E98Z4jxF8lvB6XP9V8cnXM3X/DC0OPGzyF8hbb+PoFo15
-pb3rgVbUHj3mo9x6H0FbwAlNOvMy2kgcIKJ7X1a8aIZFxfUG5erAE2B8RUJeFbGB
-p8h8HgbrqjICbbP8B0uOwkM0smyzys0EKEGkW3mRjSIEt08uo9zZTQ3V05pqys2Q
-oXaut0JB32Q85fICOS/qkRYjCQQwtvU5Rwfl3bK0nFhaYAQyWLcoqfV/kGrIDmmr
-WMq+i0naoDk/DX9b/TYx/Yg95/dtcnC86iSZsA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vsu-pbslive-01v.vsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Virginia State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Virginia State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vsu.edu/pages/1.asp</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Robert Schnettler</md:GivenName>
-    <md:EmailAddress>rschnettler@vsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Sherod Moses</md:GivenName>
-    <md:EmailAddress>smoses@vsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tessa Perry</md:GivenName>
-    <md:EmailAddress>tperry@vsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.xml b/swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.xml
deleted file mode 100644
index d001b28d..00000000
--- a/swamid-interfederations-2.0/vushib-idp.vanderbilt.edu-idp-Shibboleth.xml
+++ /dev/null
@@ -1,198 +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://vushib-idp.vanderbilt.edu/idp/Shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://vushib-idp.vanderbilt.edu/idp/error.jsp" 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">vanderbilt.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Vanderbilt University</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>
-MIIE3zCCA8egAwIBAgIJAIh2ymY/vivJMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCVE4xEjAQBgNVBAcTCU5hc2h2aWxsZTEeMBwGA1UE
-ChMVVmFuZGVyYmlsdCBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxIjAgBgNVBAMT
-GXZ1c2hpYi1pZHAudmFuZGVyYmlsdC5lZHUxIzAhBgkqhkiG9w0BCQEWFGVhaWRz
-QHZhbmRlcmJpbHQuZWR1MB4XDTEzMDQwODE5MDYyM1oXDTE2MDQwNzE5MDYyM1ow
-gaUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUTjESMBAGA1UEBxMJTmFzaHZpbGxl
-MR4wHAYDVQQKExVWYW5kZXJiaWx0IFVuaXZlcnNpdHkxDDAKBgNVBAsTA0lUUzEi
-MCAGA1UEAxMZdnVzaGliLWlkcC52YW5kZXJiaWx0LmVkdTEjMCEGCSqGSIb3DQEJ
-ARYUZWFpZHNAdmFuZGVyYmlsdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDUSBLgz2PXvsMH4yrABY5q3A0F4D7MfSMc+43wOqhw02lGcEjWz50/
-FFn87I1Cqd5n/dZcDKtcg14iTbtqG3t4eAefLv97gVNi3Oy2tIq8rkyU4ifNWM3D
-WGXHpVEZPjCpuY5hr1FsMhaSDwXRfLlusAK9m52DvyCBoYjiS5rsJbZfrPLAZbEL
-yS9x1M21uD2G6rgROLMp/LvTT8v264fP4x9gUOJKtc9KkWh10iRSvQqUmwbdsRkK
-1bxNPPvDb7zJ8gCFKPXEvNvGjQJWpcNXtO1rv8mepHWJsbOtCAmAVmmVcaA/e2cJ
-V6ESu+q7WPtn8pEPRxiAa/oEm20h7lo5AgMBAAGjggEOMIIBCjAdBgNVHQ4EFgQU
-gpx8IPguo4vewllDQHDPSjNlDEowgdoGA1UdIwSB0jCBz4AUgpx8IPguo4vewllD
-QHDPSjNlDEqhgaukgagwgaUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUTjESMBAG
-A1UEBxMJTmFzaHZpbGxlMR4wHAYDVQQKExVWYW5kZXJiaWx0IFVuaXZlcnNpdHkx
-DDAKBgNVBAsTA0lUUzEiMCAGA1UEAxMZdnVzaGliLWlkcC52YW5kZXJiaWx0LmVk
-dTEjMCEGCSqGSIb3DQEJARYUZWFpZHNAdmFuZGVyYmlsdC5lZHWCCQCIdspmP74r
-yTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB/v1hLtu5GaAA9VqJG
-YuuL6Mco72XGIZ7w8nyII+3lZcQvzo0WP/mj4JDfPbHuaZAjJtXTCjsRWFeC/bcJ
-JQS7OfIxzTY6L8FC4Z/nIx7bQPLLyhgAOIbcjrKxEPyoZsat1ZarxNKmbH8ck/SM
-WPIsJRb4EUpbRtadDhy7nqq6c2iSES/sfrCpO63SJuz8jzXJivQb8fzugVkkyPfP
-NcdJvhGs+Y+Nt7TlI5EQISWldvARwXV6M8pI5UyIwOBW8iteHsBkawF4v/rsVl5w
-WGu23sqFkBbwCw3tWPnn+2l3IjPiettdirZInC+j5QsocT9Tesc4CPm29BuFK0Ec
-zdub
-          </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>
-MIIFSzCCBDOgAwIBAgIJAO88oKF6fKkYMA0GCSqGSIb3DQEBBQUAMIHJMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCVE4xEjAQBgNVBAcTCU5hc2h2aWxsZTEeMBwGA1UE
-ChMVVmFuZGVyYmlsdCBVbml2ZXJzaXR5MSgwJgYDVQQLEx9JbmZvcm1hdGlvbiBU
-ZWNobm9sb2d5IFNlcnZpY2VzMSIwIAYDVQQDExl2dXNoaWItaWRwLnZhbmRlcmJp
-bHQuZWR1MSswKQYJKoZIhvcNAQkBFhxpdHMtaWRldkBsaXN0LnZhbmRlcmJpbHQu
-ZWR1MB4XDTExMDQxODE1MjIyNloXDTEzMDQxNzE1MjIyNlowgckxCzAJBgNVBAYT
-AlVTMQswCQYDVQQIEwJUTjESMBAGA1UEBxMJTmFzaHZpbGxlMR4wHAYDVQQKExVW
-YW5kZXJiaWx0IFVuaXZlcnNpdHkxKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRlY2hu
-b2xvZ3kgU2VydmljZXMxIjAgBgNVBAMTGXZ1c2hpYi1pZHAudmFuZGVyYmlsdC5l
-ZHUxKzApBgkqhkiG9w0BCQEWHGl0cy1pZGV2QGxpc3QudmFuZGVyYmlsdC5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyDiDUFG9pVnkihnrdo9We
-5C91M/Uw8fT7U6HGDD7TrtbpkFtfrKA+CyKKRGSDdGZmU/WwmMSb1lp9B08ik4rr
-yXnMKjY32alNnRVYtEyM6nhmIXcGF9QKXoKGTAeugdl5qpkK9BnHbxljNSganKbt
-WjX5h9FSd9NzNHzRc0mAwk8y49GXeD8aadNUbLc9OeA9ZYPJs4CUClX7fE/fryvO
-GGx92jzsk93oCAgTgfAy5h+Xv62wiZzA2fSMshaATNNeRUmnWl6VeupsVgB3fStW
-LrjfuIxczlX6+aguPr8iFF0G9b5kThWklhzncTCTUWID+HCm2uxEGDVkX8QhsNRB
-AgMBAAGjggEyMIIBLjAdBgNVHQ4EFgQUQocVs4R0bNAiHJwylaz9zMykfeAwgf4G
-A1UdIwSB9jCB84AUQocVs4R0bNAiHJwylaz9zMykfeChgc+kgcwwgckxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJUTjESMBAGA1UEBxMJTmFzaHZpbGxlMR4wHAYDVQQK
-ExVWYW5kZXJiaWx0IFVuaXZlcnNpdHkxKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRl
-Y2hub2xvZ3kgU2VydmljZXMxIjAgBgNVBAMTGXZ1c2hpYi1pZHAudmFuZGVyYmls
-dC5lZHUxKzApBgkqhkiG9w0BCQEWHGl0cy1pZGV2QGxpc3QudmFuZGVyYmlsdC5l
-ZHWCCQDvPKChenypGDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAG
-WZi4HiONbj/XJ4yNrAOLmyggytPg7SKp2zeSNS3PUHgGlssLu1u3rHdFJHoRLVEs
-KkRLrYckXJocsKt/OSBUwHcVlv+QgG0zfcpw+Gg5VkZNpmkqZhN6hfHyyl5yXYXc
-EpBh3pUSWq6++3Phdjo//DYrhEGydxH0Yvza1S4J2NFuxKkmpGQdjiXbt7A8EbO4
-M8yvmDR7HXshUk5LqyZ83Tise5tgBbadHO8zCCEutZ6fz5COrIJ2E0LK4u895IZV
-+6m5N02Wx1WoyNXk725WGKI7nQCND7ow4aFbAmyUX0vGzLCU0SsjruqMB9pDTurq
-VOR97db4edIAHOXCqNKQ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vushib-idp.vanderbilt.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vushib-idp.vanderbilt.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vushib-idp.vanderbilt.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vushib-idp.vanderbilt.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://vushib-idp.vanderbilt.edu/idp/profile/Shibboleth/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">vanderbilt.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE3zCCA8egAwIBAgIJAIh2ymY/vivJMA0GCSqGSIb3DQEBBQUAMIGlMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCVE4xEjAQBgNVBAcTCU5hc2h2aWxsZTEeMBwGA1UE
-ChMVVmFuZGVyYmlsdCBVbml2ZXJzaXR5MQwwCgYDVQQLEwNJVFMxIjAgBgNVBAMT
-GXZ1c2hpYi1pZHAudmFuZGVyYmlsdC5lZHUxIzAhBgkqhkiG9w0BCQEWFGVhaWRz
-QHZhbmRlcmJpbHQuZWR1MB4XDTEzMDQwODE5MDYyM1oXDTE2MDQwNzE5MDYyM1ow
-gaUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUTjESMBAGA1UEBxMJTmFzaHZpbGxl
-MR4wHAYDVQQKExVWYW5kZXJiaWx0IFVuaXZlcnNpdHkxDDAKBgNVBAsTA0lUUzEi
-MCAGA1UEAxMZdnVzaGliLWlkcC52YW5kZXJiaWx0LmVkdTEjMCEGCSqGSIb3DQEJ
-ARYUZWFpZHNAdmFuZGVyYmlsdC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDUSBLgz2PXvsMH4yrABY5q3A0F4D7MfSMc+43wOqhw02lGcEjWz50/
-FFn87I1Cqd5n/dZcDKtcg14iTbtqG3t4eAefLv97gVNi3Oy2tIq8rkyU4ifNWM3D
-WGXHpVEZPjCpuY5hr1FsMhaSDwXRfLlusAK9m52DvyCBoYjiS5rsJbZfrPLAZbEL
-yS9x1M21uD2G6rgROLMp/LvTT8v264fP4x9gUOJKtc9KkWh10iRSvQqUmwbdsRkK
-1bxNPPvDb7zJ8gCFKPXEvNvGjQJWpcNXtO1rv8mepHWJsbOtCAmAVmmVcaA/e2cJ
-V6ESu+q7WPtn8pEPRxiAa/oEm20h7lo5AgMBAAGjggEOMIIBCjAdBgNVHQ4EFgQU
-gpx8IPguo4vewllDQHDPSjNlDEowgdoGA1UdIwSB0jCBz4AUgpx8IPguo4vewllD
-QHDPSjNlDEqhgaukgagwgaUxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJUTjESMBAG
-A1UEBxMJTmFzaHZpbGxlMR4wHAYDVQQKExVWYW5kZXJiaWx0IFVuaXZlcnNpdHkx
-DDAKBgNVBAsTA0lUUzEiMCAGA1UEAxMZdnVzaGliLWlkcC52YW5kZXJiaWx0LmVk
-dTEjMCEGCSqGSIb3DQEJARYUZWFpZHNAdmFuZGVyYmlsdC5lZHWCCQCIdspmP74r
-yTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB/v1hLtu5GaAA9VqJG
-YuuL6Mco72XGIZ7w8nyII+3lZcQvzo0WP/mj4JDfPbHuaZAjJtXTCjsRWFeC/bcJ
-JQS7OfIxzTY6L8FC4Z/nIx7bQPLLyhgAOIbcjrKxEPyoZsat1ZarxNKmbH8ck/SM
-WPIsJRb4EUpbRtadDhy7nqq6c2iSES/sfrCpO63SJuz8jzXJivQb8fzugVkkyPfP
-NcdJvhGs+Y+Nt7TlI5EQISWldvARwXV6M8pI5UyIwOBW8iteHsBkawF4v/rsVl5w
-WGu23sqFkBbwCw3tWPnn+2l3IjPiettdirZInC+j5QsocT9Tesc4CPm29BuFK0Ec
-zdub
-          </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>
-MIIFSzCCBDOgAwIBAgIJAO88oKF6fKkYMA0GCSqGSIb3DQEBBQUAMIHJMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCVE4xEjAQBgNVBAcTCU5hc2h2aWxsZTEeMBwGA1UE
-ChMVVmFuZGVyYmlsdCBVbml2ZXJzaXR5MSgwJgYDVQQLEx9JbmZvcm1hdGlvbiBU
-ZWNobm9sb2d5IFNlcnZpY2VzMSIwIAYDVQQDExl2dXNoaWItaWRwLnZhbmRlcmJp
-bHQuZWR1MSswKQYJKoZIhvcNAQkBFhxpdHMtaWRldkBsaXN0LnZhbmRlcmJpbHQu
-ZWR1MB4XDTExMDQxODE1MjIyNloXDTEzMDQxNzE1MjIyNlowgckxCzAJBgNVBAYT
-AlVTMQswCQYDVQQIEwJUTjESMBAGA1UEBxMJTmFzaHZpbGxlMR4wHAYDVQQKExVW
-YW5kZXJiaWx0IFVuaXZlcnNpdHkxKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRlY2hu
-b2xvZ3kgU2VydmljZXMxIjAgBgNVBAMTGXZ1c2hpYi1pZHAudmFuZGVyYmlsdC5l
-ZHUxKzApBgkqhkiG9w0BCQEWHGl0cy1pZGV2QGxpc3QudmFuZGVyYmlsdC5lZHUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyDiDUFG9pVnkihnrdo9We
-5C91M/Uw8fT7U6HGDD7TrtbpkFtfrKA+CyKKRGSDdGZmU/WwmMSb1lp9B08ik4rr
-yXnMKjY32alNnRVYtEyM6nhmIXcGF9QKXoKGTAeugdl5qpkK9BnHbxljNSganKbt
-WjX5h9FSd9NzNHzRc0mAwk8y49GXeD8aadNUbLc9OeA9ZYPJs4CUClX7fE/fryvO
-GGx92jzsk93oCAgTgfAy5h+Xv62wiZzA2fSMshaATNNeRUmnWl6VeupsVgB3fStW
-LrjfuIxczlX6+aguPr8iFF0G9b5kThWklhzncTCTUWID+HCm2uxEGDVkX8QhsNRB
-AgMBAAGjggEyMIIBLjAdBgNVHQ4EFgQUQocVs4R0bNAiHJwylaz9zMykfeAwgf4G
-A1UdIwSB9jCB84AUQocVs4R0bNAiHJwylaz9zMykfeChgc+kgcwwgckxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJUTjESMBAGA1UEBxMJTmFzaHZpbGxlMR4wHAYDVQQK
-ExVWYW5kZXJiaWx0IFVuaXZlcnNpdHkxKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRl
-Y2hub2xvZ3kgU2VydmljZXMxIjAgBgNVBAMTGXZ1c2hpYi1pZHAudmFuZGVyYmls
-dC5lZHUxKzApBgkqhkiG9w0BCQEWHGl0cy1pZGV2QGxpc3QudmFuZGVyYmlsdC5l
-ZHWCCQDvPKChenypGDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAG
-WZi4HiONbj/XJ4yNrAOLmyggytPg7SKp2zeSNS3PUHgGlssLu1u3rHdFJHoRLVEs
-KkRLrYckXJocsKt/OSBUwHcVlv+QgG0zfcpw+Gg5VkZNpmkqZhN6hfHyyl5yXYXc
-EpBh3pUSWq6++3Phdjo//DYrhEGydxH0Yvza1S4J2NFuxKkmpGQdjiXbt7A8EbO4
-M8yvmDR7HXshUk5LqyZ83Tise5tgBbadHO8zCCEutZ6fz5COrIJ2E0LK4u895IZV
-+6m5N02Wx1WoyNXk725WGKI7nQCND7ow4aFbAmyUX0vGzLCU0SsjruqMB9pDTurq
-VOR97db4edIAHOXCqNKQ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://vushib-idp.vanderbilt.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Vanderbilt University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Vanderbilt University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vanderbilt.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Lee Brewer</md:GivenName>
-    <md:EmailAddress>Lee.Brewer@vanderbilt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Lee Brewer</md:GivenName>
-    <md:EmailAddress>Lee.Brewer@vanderbilt.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>VUIT IDEV</md:GivenName>
-    <md:EmailAddress>mis_idis@list.vanderbilt.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 8d315ef1..00000000
--- a/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.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://vvc.niif.hu/shibboleth">
-  <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="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>niifi</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">NIIF kollaborációs portál</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">NIIF Voice Video Collaboration Service</mdui:DisplayName>
-        <mdui:Description 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</mdui:Description>
-        <mdui:Description 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.)</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">http://vvc.niif.hu/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://vvc.niif.hu/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="86" width="150">https://metadata.eduid.hu/logos/niifi.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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:KeyName>vvc.niif.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vvc.niif.hu/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://vvc.niif.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vvc.niif.hu/Shibboleth.sso/SAML2/Artifact" index="1"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="hu">NIIF kollaborációs portál</md:ServiceName>
-      <md:ServiceName xml:lang="en">NIIF Voice Video Collaboration Service</md:ServiceName>
-      <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="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" 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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>NIIF AAI</md:SurName>
-    <md:EmailAddress>mailto:aai@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Video Admin</md:SurName>
-    <md:EmailAddress>mailto:video-admin@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Video Admin</md:SurName>
-    <md:EmailAddress>mailto:video-admin@niif.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 96bdff14..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"/>
-  </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/vwww.itslearning.com-shibboleth.xml b/swamid-interfederations-2.0/vwww.itslearning.com-shibboleth.xml
deleted file mode 100644
index 84864293..00000000
--- a/swamid-interfederations-2.0/vwww.itslearning.com-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://vwww.itslearning.com/shibboleth">
-  <!--
-		This is a verification eLogin SP for it's learning UK Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSjCCAjKgAwIBAgIJAMta8TnXJcroMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG3Z3d3cuZWxvZ2luLml0c2xlYXJuaW5nLmNvbTAeFw0xMTAyMTgxMzA3NDZa
-						Fw0yMTAyMTUxMzA3NDZaMCYxJDAiBgNVBAMTG3Z3d3cuZWxvZ2luLml0c2xlYXJu
-						aW5nLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMi6jtOqE9dQ
-						0/ZrFLEue3bh9wHSsjzdCvM2YoTGhFuiNsdpaeeGb5A61xJFxBXEzM6CeWoQqCVq
-						V2yhfgUfvi0oerkhXrScWxTC+Na3YLL1wmfBRD8apCqB21B18GR2LMmaExKmnM0g
-						HRV4TL7Xf5tQwxRuvMOZVMFC0KOzSf7II70rj2pzdWV9nLZmOGreF7KSQd89v3F0
-						qBccgJzS81TG4n0HxUWWCdD3fdlP45RNX5uOwjU5F+tUPbfcbjyl8odL6YPicgCG
-						FMs2Z8jMtEPZ8lZpqBnb8dEsPW44CBYa4veEbUAlcVbjXMWrZCCJF4kFICYBLgnP
-						I1ckqaNBIAkCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
-						blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFEtsr6/AQyDcs5vC
-						dNu9H/ZlmO80MB8GA1UdIwQYMBaAFEtsr6/AQyDcs5vCdNu9H/ZlmO80MA0GCSqG
-						SIb3DQEBBQUAA4IBAQA+hJuHf93yK2ZfQT1U14Ojy9nkC25PlQU8N9fYCRBksGOV
-						DOGxeJL+o8EI2X86hPq3n2KdTlZsyZQwC0ilaOsWqogHh0VFMWN8Yr6aQuhTrNUS
-						0v2kDYbeBw3Ze867Skj8Yd7rbeEZ7qFReiXCjqs71vCRwuUnafqM5xK7NlgMZybl
-						YmKgFj2vl9a8kOCfSeYy32Nv6o5whRGYBPsfGb2SqacHqjiUA8oUpWgAdwSaw/+L
-						zqyv/l+j9cjqywds1og9dhnz/QwuWxYkaFatUN4XUMiUYE7Y8Vq11D6c2i1XSOYF
-						K+kRpFiXVF8cgB84mxDx+1zN/jVusGRfE4yyWzkL
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vwww.itslearning.com/elogin/logout.aspx"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vwww.itslearning.com/elogin/default.aspx" index="0" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">it's learning UK Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">it's learning UK Limited: verification</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.itslearning.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Waseemr</GivenName>
-    <SurName>Akhtar</SurName>
-    <EmailAddress>mailto:Waseem.Akhtar@itslearning.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Waseemr</GivenName>
-    <SurName>Akhtar</SurName>
-    <EmailAddress>mailto:Waseem.Akhtar@itslearning.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.xml
deleted file mode 100644
index 0c902a5e..00000000
--- a/swamid-interfederations-2.0/wakeonlan.liv.ac.uk-shibboleth.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://wakeonlan.liv.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for the University of Liverpool.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-04-08T16:17: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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbDCCAlQCCQCrskmXeYbk3DANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHRW5nbGFuZDETMBEGA1UEBxMKTWVyc2V5c2lkZTEkMCIGA1UE
-						ChMbVGhlIFVuaXZlcnNpdHkgb2YgTGl2ZXJwb29sMRwwGgYDVQQDExN3YWtlb25s
-						YW4ubGl2LmFjLnVrMB4XDTExMDIwMTExMzkyNFoXDTIxMDEyOTExMzkyNFoweDEL
-						MAkGA1UEBhMCR0IxEDAOBgNVBAgTB0VuZ2xhbmQxEzARBgNVBAcTCk1lcnNleXNp
-						ZGUxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIExpdmVycG9vbDEcMBoGA1UE
-						AxMTd2FrZW9ubGFuLmxpdi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBANqAaYk6iHP6srXSIiRIFL1uRJwfMI75m1gr+F4dcIhQLpB4VSRkLmik
-						Z4XDuKncuEZHDQjSxm108N/GAjFQkxQ5YiU/0ASBnUY4DfuReR9/6EbCyKWsLuAv
-						WO3xpJumK7llnspfNVG74r0vPYuAlyqPpKFXjBUOnm+S7EcF8ccXGN4EzUO3+qWJ
-						kmzt0O8WZKJky6Qe2Glny+pvPXBniqENbzbDKh3IvJmW1ImKTET92gxXXLGC/bXX
-						0uIoTP/rTdQ9Y82mcBY6JWXpT5Ne89yOdkXmFfUUv2rTOSwDiikNuPxWrg32Xco1
-						mMh9A4NBDByYWjIh96/L+JQqUDNg6v8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						KPJV9rQe79wsTDtRFpj1QiH6zT0uR/igAUmZfal8ejsPIMGGEGL5Uz0ZPqKKPXg8
-						uk0+fPBNLmlVqkWuZkEMFDN+JFnWxoBoXdbNQvW+LrtiSEYhh+hpn5n8k2l4XpSM
-						3AuZSP7nYAYzK2xQIECyNcfL+yQfZhdqzrSeuWh/PxUG5MHnQWyAlT9K+UXXiMUN
-						EIg5bTg1h2IIuyBWW6whf+jt2kJSSmX03E5oXB38tWC0/AV/xyuGev9BpWAAurps
-						Jx+MWwjd0O/ssDH8XhVwUE88bPDscP+4AUrDQ5dfVv7NWVcp9msiKCeh7oQT5HOK
-						8QUvTzj/aD2BLORCajWMtQ==
-					</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>
-						MIIDbDCCAlQCCQCrskmXeYbk3DANBgkqhkiG9w0BAQUFADB4MQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHRW5nbGFuZDETMBEGA1UEBxMKTWVyc2V5c2lkZTEkMCIGA1UE
-						ChMbVGhlIFVuaXZlcnNpdHkgb2YgTGl2ZXJwb29sMRwwGgYDVQQDExN3YWtlb25s
-						YW4ubGl2LmFjLnVrMB4XDTExMDIwMTExMzkyNFoXDTIxMDEyOTExMzkyNFoweDEL
-						MAkGA1UEBhMCR0IxEDAOBgNVBAgTB0VuZ2xhbmQxEzARBgNVBAcTCk1lcnNleXNp
-						ZGUxJDAiBgNVBAoTG1RoZSBVbml2ZXJzaXR5IG9mIExpdmVycG9vbDEcMBoGA1UE
-						AxMTd2FrZW9ubGFuLmxpdi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBANqAaYk6iHP6srXSIiRIFL1uRJwfMI75m1gr+F4dcIhQLpB4VSRkLmik
-						Z4XDuKncuEZHDQjSxm108N/GAjFQkxQ5YiU/0ASBnUY4DfuReR9/6EbCyKWsLuAv
-						WO3xpJumK7llnspfNVG74r0vPYuAlyqPpKFXjBUOnm+S7EcF8ccXGN4EzUO3+qWJ
-						kmzt0O8WZKJky6Qe2Glny+pvPXBniqENbzbDKh3IvJmW1ImKTET92gxXXLGC/bXX
-						0uIoTP/rTdQ9Y82mcBY6JWXpT5Ne89yOdkXmFfUUv2rTOSwDiikNuPxWrg32Xco1
-						mMh9A4NBDByYWjIh96/L+JQqUDNg6v8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						KPJV9rQe79wsTDtRFpj1QiH6zT0uR/igAUmZfal8ejsPIMGGEGL5Uz0ZPqKKPXg8
-						uk0+fPBNLmlVqkWuZkEMFDN+JFnWxoBoXdbNQvW+LrtiSEYhh+hpn5n8k2l4XpSM
-						3AuZSP7nYAYzK2xQIECyNcfL+yQfZhdqzrSeuWh/PxUG5MHnQWyAlT9K+UXXiMUN
-						EIg5bTg1h2IIuyBWW6whf+jt2kJSSmX03E5oXB38tWC0/AV/xyuGev9BpWAAurps
-						Jx+MWwjd0O/ssDH8XhVwUE88bPDscP+4AUrDQ5dfVv7NWVcp9msiKCeh7oQT5HOK
-						8QUvTzj/aD2BLORCajWMtQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wakeonlan.liv.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Liverpool</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Liverpool: Wake On Lan</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.liv.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Web Team</GivenName>
-    <EmailAddress>mailto:webmaster@liv.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Web Team</GivenName>
-    <EmailAddress>mailto:webmaster@liv.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-shibboleth.xml
deleted file mode 100644
index 07c32db7..00000000
--- a/swamid-interfederations-2.0/wakshib1.wakefield.ac.uk-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://wakshib1.wakefield.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for Wakefield College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-01-16T16:45: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">wakefield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbjCCAlYCCQChpNcFSrUPmTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQGEwJH
-						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEjAQBgNVBAcTCVdha2VmaWVsZDEa
-						MBgGA1UEChMRV2FrZWZpZWxkIENvbGxlZ2UxITAfBgNVBAMTGHdha3NoaWIxLndh
-						a2VmaWVsZC5hYy51azAeFw0xNDExMDYxMDQxMTlaFw0zNDExMDExMDQxMTlaMHkx
-						CzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5XZXN0IFlvcmtzaGlyZTESMBAGA1UEBxMJ
-						V2FrZWZpZWxkMRowGAYDVQQKExFXYWtlZmllbGQgQ29sbGVnZTEhMB8GA1UEAxMY
-						d2Frc2hpYjEud2FrZWZpZWxkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEA3w1GYtKzy9tPP8ZwCI11qZP5GX3Cm578CywOe7gb9ZhpQN7ZnozN
-						HH5d/O+jLLL7Mib0PxKKYZptBIl0uIVvwOQPIXLtBI+XENBlVOiMMIimOt+pCr12
-						Al5LdBNwuKB4ZFMSsgg5LwM7Z64GnP9npOOjYMBKK2qsiNDC7KcBiGPVMKgEM0N7
-						yguPdcy6DgHRMY0H+ZeT44Vhp2LkEfUOkVGwmfyTEBD8/5SgNjV+xmsvPBrTfNp3
-						jeCHHXVw+gFsOSRElE/Ah0DOZiJBJYhriBg+sK8BWIcbsbc5xs9Q1w44ws5YDues
-						8oYr6b5B/8fCfFv2rURIZUFMOqTw3YprkwIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-						AQA4EiC3dzyiJIYTKQhtWoV2BQ1AnHAwJPJAXf4jW7cpvCFMEvfN8ZOK/Lacfz5p
-						vITgJoBs2eBy0xO1eBQlKfe1kCWnxpOd918odQ9zf5VZhHocklY1ZimrF+n3nVCL
-						Kdojs4VmrEi0PLEtazYNBAig9dOJcHKY3qIIpFi2PKesdf9AuNt+Q04UqKKpRa7y
-						h92+bH74geOC/hOWBxH+3C8jIkfn/+K2K4NhqGlp8qOLkpgR3X87m0kSsBT9nbDc
-						2mduGi9SFFVrYv8N7aLs8QqdjP3nAVlZxB0Ts1r21TCeun+6Ns8/4tMvwLTDjzat
-						B0jkCgiVDEKc3OFBaVsdSQPX
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wakshib1.wakefield.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakshib1.wakefield.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://wakshib1.wakefield.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wakshib1.wakefield.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wakshib1.wakefield.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wakshib1.wakefield.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">wakefield.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbjCCAlYCCQChpNcFSrUPmTANBgkqhkiG9w0BAQsFADB5MQswCQYDVQQGEwJH
-						QjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxEjAQBgNVBAcTCVdha2VmaWVsZDEa
-						MBgGA1UEChMRV2FrZWZpZWxkIENvbGxlZ2UxITAfBgNVBAMTGHdha3NoaWIxLndh
-						a2VmaWVsZC5hYy51azAeFw0xNDExMDYxMDQxMTlaFw0zNDExMDExMDQxMTlaMHkx
-						CzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5XZXN0IFlvcmtzaGlyZTESMBAGA1UEBxMJ
-						V2FrZWZpZWxkMRowGAYDVQQKExFXYWtlZmllbGQgQ29sbGVnZTEhMB8GA1UEAxMY
-						d2Frc2hpYjEud2FrZWZpZWxkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEA3w1GYtKzy9tPP8ZwCI11qZP5GX3Cm578CywOe7gb9ZhpQN7ZnozN
-						HH5d/O+jLLL7Mib0PxKKYZptBIl0uIVvwOQPIXLtBI+XENBlVOiMMIimOt+pCr12
-						Al5LdBNwuKB4ZFMSsgg5LwM7Z64GnP9npOOjYMBKK2qsiNDC7KcBiGPVMKgEM0N7
-						yguPdcy6DgHRMY0H+ZeT44Vhp2LkEfUOkVGwmfyTEBD8/5SgNjV+xmsvPBrTfNp3
-						jeCHHXVw+gFsOSRElE/Ah0DOZiJBJYhriBg+sK8BWIcbsbc5xs9Q1w44ws5YDues
-						8oYr6b5B/8fCfFv2rURIZUFMOqTw3YprkwIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-						AQA4EiC3dzyiJIYTKQhtWoV2BQ1AnHAwJPJAXf4jW7cpvCFMEvfN8ZOK/Lacfz5p
-						vITgJoBs2eBy0xO1eBQlKfe1kCWnxpOd918odQ9zf5VZhHocklY1ZimrF+n3nVCL
-						Kdojs4VmrEi0PLEtazYNBAig9dOJcHKY3qIIpFi2PKesdf9AuNt+Q04UqKKpRa7y
-						h92+bH74geOC/hOWBxH+3C8jIkfn/+K2K4NhqGlp8qOLkpgR3X87m0kSsBT9nbDc
-						2mduGi9SFFVrYv8N7aLs8QqdjP3nAVlZxB0Ts1r21TCeun+6Ns8/4tMvwLTDjzat
-						B0jkCgiVDEKc3OFBaVsdSQPX
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wakshib1.wakefield.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wakshib1.wakefield.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">Wakefield College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Wakefield College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wakefield.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Richardson</SurName>
-    <EmailAddress>mailto:s.richardson@wakefield.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Watts</SurName>
-    <EmailAddress>mailto:a.watts@wakefield.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wasp.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/wasp.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 0f1f9b18..00000000
--- a/swamid-interfederations-2.0/wasp.princeton.edu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">WASP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">WASP allows the scheduling of office/advising hour appointments via a web interface.  The system can sync appointments into Exchange of Google calendars.  It has a reminder system.  It supports LTI integration.  </mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wasp.princeton.edu/docs/WASP.docx</mdui:InformationURL>
-        <mdui:Logo height="110" width="341" xml:lang="en">https://wasp.princeton.edu/princeton/views/images/wasplogo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEHTCCAwWgAwIBAgIJAPRNAT0aQ+S5MA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
-VQQGEwJVUzETMBEGA1UECAwKTmV3IEplcnNleTESMBAGA1UEBwwJUHJpbmNldG9u
-MR0wGwYDVQQKDBRQcmluY2V0b24gVW5pdmVyc2l0eTEMMAoGA1UECwwDT0lUMRsw
-GQYDVQQDDBJ3YXNwLnByaW5jZXRvbi5lZHUxIjAgBgkqhkiG9w0BCQEWE3Nlcmdl
-QHByaW5jZXRvbi5lZHUwHhcNMTUwODE0MTgxODA4WhcNMjUwODEzMTgxODA4WjCB
-pDELMAkGA1UEBhMCVVMxEzARBgNVBAgMCk5ldyBKZXJzZXkxEjAQBgNVBAcMCVBy
-aW5jZXRvbjEdMBsGA1UECgwUUHJpbmNldG9uIFVuaXZlcnNpdHkxDDAKBgNVBAsM
-A09JVDEbMBkGA1UEAwwSd2FzcC5wcmluY2V0b24uZWR1MSIwIAYJKoZIhvcNAQkB
-FhNzZXJnZUBwcmluY2V0b24uZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvZkxf3g7BLrMfd6SbQvD0uBbkwlzYJhqcijxGHupH+G3wWY29i6GGVvM
-zrtcc+lEuGeUdeMGvCaCzF5sEjIu3PIaNxJ5i2oyGRd/InSeL5ryhkws4smGweXw
-gTc0Iqfosha6U6X7XUvW5uo9VFj1g7F0JBZ307cltTns1vGdIrp5O5N+LeBhGm2N
-nB0q3ZKUS+CoHFwKEYqAXxYnzPJ0AiFDkh2ykNX1OpI1OmdE+wcmKj6F0pfPXNYU
-E6tkIr0wZeuyG0vMTMtWRxyfhlkbUIV9bcHEaIsQd2CIaVOPC+3zr32VBr0oUCEf
-suhheG9ChroWl817G56Ky9pP/uPU8wIDAQABo1AwTjAdBgNVHQ4EFgQUlDLQgbJd
-x6pXW+goY2AawSYC2HYwHwYDVR0jBBgwFoAUlDLQgbJdx6pXW+goY2AawSYC2HYw
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAH4CsJEJgV9WVmKbxwVvw
-E8OaeAkDOYvx9+I7WbpX0w/Rub2Lc6RS+IRFOwf/iXMCBTKC3KP44PjQitaz1yq1
-v9mcs6CLIR7LnZ7OzHcWxv0yvEnG6NoCn6AKA1NlVodardk5G9AetJUsq6azJl70
-2bb4O+ChAJ972uy4mekmHOAJ5SuSI09ZgDJ9qpOYoGQLrsxRPO3l2CXECeUxcJgB
-9lna+TsnlO7NTbU7y6coZTGQj6/v2ujJhG1RZotxJuqCinozERehO1xoRVd+4YtG
-XD0CM2DXnzaFsSdZVsfS/EXgliB6PcEkMr0O2ue45mCIwag7Y+hXuMfg/eDtfubN
-mQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wasp.princeton.edu/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://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wasp.princeton.edu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">WASP</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">WASP allows the scheduling of office/advising hour appointments via a web interface.  The system can sync appointments into Exchange of Google calendars.  It has a reminder system.  It supports LTI integration.  </md:ServiceDescription>
-      <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="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="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"/>
-      <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="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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Princeton University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Princeton University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.princeton.edu/index.shtml</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Serge Goldstein</md:GivenName>
-    <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Serge Goldstein</md:GivenName>
-    <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Kevin Perry</md:GivenName>
-    <md:EmailAddress>perry@princeton.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Serge Goldstein</md:GivenName>
-    <md:EmailAddress>serge@princeton.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml b/swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.xml
deleted file mode 100644
index de1c5bb5..00000000
--- a/swamid-interfederations-2.0/wayf.onderwijsgroeptilburg.nl-adfs-services-trust.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="http://wayf.onderwijsgroeptilburg.nl/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2015-05-11T20:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.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">onderwijsgroeptilburg.nl</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ogt013.nl</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="nl">Onderwijsgroep Tilburg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Onderwijsgroep Tilburg</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">Onderwijsgroep Tilburg</mdui:Description>
-        <mdui:Description xml:lang="en">Onderwijsgroep Tilburg</mdui:Description>
-        <mdui:Logo height="23" width="108">https://static.surfconext.nl/logos/idp/onderwijsgroep-tilburg.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">Onderwijsgroep Tilburg, ROC Tilburg</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">Onderwijsgroep Tilburg, ROC Tilburg</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVaFw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKHefPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/YHA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOFTwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jRn3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNKMB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURDFeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKiUUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/136abb0da6cd182f8cf4a20bae83700e"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">Onderwijsgroep Tilburg</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Onderwijsgroep Tilburg</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">Onderwijsgroep Tilburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Onderwijsgroep Tilburg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.onderwijsgroeptilburg.nl/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.onderwijsgroeptilburg.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/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index f667f2d0..a0f5cf37 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -1,94 +1,99 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wayf.wayf.dk">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.wayf.dk">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationInstant="2008-03-28T00:00:00Z" registrationAuthority="https://www.wayf.dk">
+    <mdrpi:RegistrationInfo registrationInstant="2008-03-28T00:00:00Z" registrationAuthority="https://www.wayf.dk">
       <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <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:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hi.is</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ruc.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">orphanage.wayf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucl.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">viauc.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucc.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drlund-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iha.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sdu.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itu.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aip.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mg.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sska.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sss.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">its.itsf.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sikker-adgang.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ibc.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rungsted-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsj.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dab.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsv.minibib.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsl.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zbc.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frsgym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cbs.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniit.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ku.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kristne-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dsn.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vordingborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmjx.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apoteket.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kadk.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dtu.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucn.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">frhavn-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sde.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eal.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrs.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">au.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">knord.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eucnord.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">phmetropol.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">handelsskolen.com</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cphbusiness.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kea.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eadania.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dansidp.stads.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umit.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rosborg-gym.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">basyd.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">statsbiblioteket.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eamv.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aams.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">regionsjaelland.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dskd.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fms.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">smk.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">msk.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drcmr.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">simac.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucsyd.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">this.is.not.a.valid.idp</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">create.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">es.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hst.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">id.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">its.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">learning.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">m-tech.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">plan.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbi.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">staff.aau.dk@aau.dk</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">student.aau.dk@aau.dk</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">kb.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">hi.is</shibmd:Scope>
+      <shibmd:Scope regexp="false">ruc.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">orphanage.wayf.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ucl.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">viauc.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ucc.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">drlund-gym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">iha.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">sdu.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">itu.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">aip.itsf.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">gg.itsf.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">mg.itsf.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">sska.itsf.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">sss.itsf.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">its.itsf.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">sikker-adgang.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ibc.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">rungsted-gym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ucsj.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">dab.minibib.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">fsv.minibib.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">dsl.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">zbc.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">frsgym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">cbs.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">uniit.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ku.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">kristne-gym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">dsn.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">vordingborg-gym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">dmjx.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">apoteket.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">erhvervsakademiaarhus.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">kadk.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">dtu.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ucn.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">frhavn-gym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">sde.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">eal.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">hrs.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">au.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">knord.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">eucnord.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">phmetropol.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">handelsskolen.com</shibmd:Scope>
+      <shibmd:Scope regexp="false">cphbusiness.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">kea.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">eadania.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">dansidp.stads.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">umit.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">rosborg-gym.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">basyd.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">statsbiblioteket.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">eamv.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">aams.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">regionsjaelland.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">fms.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">smk.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">msk.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">drcmr.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">simac.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ucsyd.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">this.is.not.a.valid.idp</shibmd:Scope>
+      <shibmd:Scope regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">create.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">es.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">hst.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">id.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">its.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">learning.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">m-tech.aau.dk@aau.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">plan.aau.dk@aau.dk</shibmd:Scope>
+      <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>
+      <mdui:UIInfo>
         <mdui:Description xml:lang="da">WAYF - den danske identitetsfederation for forskning og uddannelse</mdui:Description>
         <mdui:Description xml:lang="en">WAYF - The Danish identity federation for research and higher education</mdui:Description>
         <mdui:DisplayName xml:lang="da">WAYF - Where Are You From</mdui:DisplayName>
@@ -96,14 +101,14 @@
       </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>MIIE3TCCA8WgAwIBAgISESFgDbqp6YXwPvILGKAnrUDtMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTIwMTA0MDkzNTU0WhcNMTcwMTAzMDkzNTU0WjBHMQswCQYDVQQGEwJESzEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwx3YXlmLndheWYuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAosqmcujXhA49vHQLLTKZxFTz3guMRnwHvUxz5vvuMPYVTGl+fXPdq9ULhkNc1jlCr4+pFOwLdy9zkuAn8dK7grQEaU58K0uF4MTyKixFnPvU3806roL8PnrmUQ2t8y76U9jzsk/B3Ggi5pVqhOktHpZyzz1yBpE14R+/DPzHrpKIFJY4N2uzoBrcEAsJY6aTUfIaB/NEpe4BY8sDZ3CTuU3tWUfhdlZESYsmngdnHD6k0HUKti9F43UM6JyN6fz7T70JlHAcTHzYKhjtPLcWG8lWFqNtry7fCYC5SlKn4zmyifoASxRoH3EuxtE/Fmmt+M6I83kg3H0R1b8PHimfAgMBAAGjggGxMIIBrTAOBgNVHQ8BAf8EBAMCBaAwTAYDVR0gBEUwQzBBBgkrBgEEAaAyAQowNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wFwYDVR0RBBAwDoIMd2F5Zi53YXlmLmRrMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBS44PHFNUdj1NTiqkjShHfvW50SIzAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAjqwtcRjT+gYKMhgwpJ4MNpL6W80efrcMDdWnZUJzN081ht0dcQqvdAVjkWylEQbbS1LXc9OZecRJGR1vxBzS7bq0lRauPuYodzOsDzP4cEW/W+PvWIEIpm5yIBZ31P7VnRpaRwmeff8OlhDOvM4+wdovRvIpLgyeyW05R2i4DenI8juCaWXNG+CATj35gW3uh/LD9DBzpZDoQ41/5yJPZUuiHfZtnW0M7oVnhidn5sT319Xiag3Jlqe7dx1D+b0oZVDTbwrECOdROTcbOkbGsr4VleBcTtL5RoF4cDokYB6LpIDmSMiBV6DztPcrPC/ERS/tEBMbfMWVAus4f0SvdQ==</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>MIIE3TCCA8WgAwIBAgISESFgDbqp6YXwPvILGKAnrUDtMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMS0wKwYDVQQDEyRHbG9iYWxTaWduIERvbWFpbiBWYWxpZGF0aW9uIENBIC0gRzIwHhcNMTIwMTA0MDkzNTU0WhcNMTcwMTAzMDkzNTU0WjBHMQswCQYDVQQGEwJESzEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwx3YXlmLndheWYuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAosqmcujXhA49vHQLLTKZxFTz3guMRnwHvUxz5vvuMPYVTGl+fXPdq9ULhkNc1jlCr4+pFOwLdy9zkuAn8dK7grQEaU58K0uF4MTyKixFnPvU3806roL8PnrmUQ2t8y76U9jzsk/B3Ggi5pVqhOktHpZyzz1yBpE14R+/DPzHrpKIFJY4N2uzoBrcEAsJY6aTUfIaB/NEpe4BY8sDZ3CTuU3tWUfhdlZESYsmngdnHD6k0HUKti9F43UM6JyN6fz7T70JlHAcTHzYKhjtPLcWG8lWFqNtry7fCYC5SlKn4zmyifoASxRoH3EuxtE/Fmmt+M6I83kg3H0R1b8PHimfAgMBAAGjggGxMIIBrTAOBgNVHQ8BAf8EBAMCBaAwTAYDVR0gBEUwQzBBBgkrBgEEAaAyAQowNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20vcmVwb3NpdG9yeS8wFwYDVR0RBBAwDoIMd2F5Zi53YXlmLmRrMAkGA1UdEwQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vZ3MvZ3Nkb21haW52YWxnMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBBBggrBgEFBQcwAoY1aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nkb21haW52YWxnMi5jcnQwNQYIKwYBBQUHMAGGKWh0dHA6Ly9vY3NwMi5nbG9iYWxzaWduLmNvbS9nc2RvbWFpbnZhbGcyMB0GA1UdDgQWBBS44PHFNUdj1NTiqkjShHfvW50SIzAfBgNVHSMEGDAWgBSWrfqwW7mDZCp2whyKadpC3P79KDANBgkqhkiG9w0BAQUFAAOCAQEAjqwtcRjT+gYKMhgwpJ4MNpL6W80efrcMDdWnZUJzN081ht0dcQqvdAVjkWylEQbbS1LXc9OZecRJGR1vxBzS7bq0lRauPuYodzOsDzP4cEW/W+PvWIEIpm5yIBZ31P7VnRpaRwmeff8OlhDOvM4+wdovRvIpLgyeyW05R2i4DenI8juCaWXNG+CATj35gW3uh/LD9DBzpZDoQ41/5yJPZUuiHfZtnW0M7oVnhidn5sT319Xiag3Jlqe7dx1D+b0oZVDTbwrECOdROTcbOkbGsr4VleBcTtL5RoF4cDokYB6LpIDmSMiBV6DztPcrPC/ERS/tEBMbfMWVAus4f0SvdQ==</ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-shibboleth.xml
deleted file mode 100644
index eca84997..00000000
--- a/swamid-interfederations-2.0/wccidp.west-cheshire.ac.uk-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://wccidp.west-cheshire.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for West Cheshire College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-09T14:52: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">west-cheshire.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIELDCCAxSgAwIBAgIJALbBsFNhx0GLMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYD
-						VQQGEwJHQjERMA8GA1UECAwIQ2hlc2hpcmUxFzAVBgNVBAcMDkVsbGVzbWVyZSBQ
-						b3J0MR4wHAYDVQQKDBVXZXN0IENoZXNoaXJlIENvbGxlZ2UxGTAXBgNVBAsMEE5l
-						dHdvcmsgU2VydmljZXMxIDAeBgNVBAMMF2lkcC53ZXN0LWNoZXNoaXJlLmFjLnVr
-						MB4XDTE1MDQwNzA5NTYxNloXDTI1MDQwNDA5NTYxNlowgZYxCzAJBgNVBAYTAkdC
-						MREwDwYDVQQIDAhDaGVzaGlyZTEXMBUGA1UEBwwORWxsZXNtZXJlIFBvcnQxHjAc
-						BgNVBAoMFVdlc3QgQ2hlc2hpcmUgQ29sbGVnZTEZMBcGA1UECwwQTmV0d29yayBT
-						ZXJ2aWNlczEgMB4GA1UEAwwXaWRwLndlc3QtY2hlc2hpcmUuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEzVH8ZUrWUFt//z7BuE7E7soNCq2J
-						8Aeq+KsiXbCK+tiwDXrIC8B7XFcyaDQvk5hxPt8XvYTpNpOBprTkIk9d7sy+cQX3
-						hfT44RCX+TNuWTKdQlUPkC0pbx2wFLROcMsUOgZP+ekC8SaQgRefui4unaRNNz9U
-						++L/cgYZLtcmd9sPklLTkl+77e2d6W5onnvQ9gvBDQUQBoScR5fg2hfwmkQqXUt3
-						FtXmcdhvILxKk9au7DLBqQfiAPfg9a08aBKJIn2XDW7q8NQ761edWQ2KF7IdgSL6
-						gTx+I13wes3g7apkZ1ONco81O35+Hty0lcNHGCRNL8+zrgVH20Z4mvSnAgMBAAGj
-						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
-						IENlcnRpZmljYXRlMB0GA1UdDgQWBBTL14zF0JlVNVY8uZXgSMl1u2pHwjAfBgNV
-						HSMEGDAWgBTL14zF0JlVNVY8uZXgSMl1u2pHwjANBgkqhkiG9w0BAQsFAAOCAQEA
-						IMvwvDpJGJAqMWnT+fNq8J5WYAbUOGIDLvhP0LNqFfYaZET989TX2anvblGibLDp
-						7ydk0U2Y8lWhiivlqqYu2Re5LQuGXXmwms3QQPwm4hn3aCZd6c7gggyg80+uJXaj
-						9rCSyQRR3Z0jGw2E4afl8ZZmirJL7fqNfKow/um85xl3RimY6WnLkgSCXYGmegmD
-						VDR6eyHwIij3Os8EHb8XQx4PObO+GPLmfSPdtA+hpwnLgqUKDGqOaz951hAh97Cs
-						fM/hzk/TNCxzJfh7dfU6mdVsSwq0J3hLAxHf7tSzXLRruF/9VruFlXSWwX+0brFn
-						OWNVr2kgXYhLkUAS9p7LWg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.west-cheshire.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.west-cheshire.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.west-cheshire.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.west-cheshire.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.west-cheshire.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.west-cheshire.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">west-cheshire.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIELDCCAxSgAwIBAgIJALbBsFNhx0GLMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYD
-						VQQGEwJHQjERMA8GA1UECAwIQ2hlc2hpcmUxFzAVBgNVBAcMDkVsbGVzbWVyZSBQ
-						b3J0MR4wHAYDVQQKDBVXZXN0IENoZXNoaXJlIENvbGxlZ2UxGTAXBgNVBAsMEE5l
-						dHdvcmsgU2VydmljZXMxIDAeBgNVBAMMF2lkcC53ZXN0LWNoZXNoaXJlLmFjLnVr
-						MB4XDTE1MDQwNzA5NTYxNloXDTI1MDQwNDA5NTYxNlowgZYxCzAJBgNVBAYTAkdC
-						MREwDwYDVQQIDAhDaGVzaGlyZTEXMBUGA1UEBwwORWxsZXNtZXJlIFBvcnQxHjAc
-						BgNVBAoMFVdlc3QgQ2hlc2hpcmUgQ29sbGVnZTEZMBcGA1UECwwQTmV0d29yayBT
-						ZXJ2aWNlczEgMB4GA1UEAwwXaWRwLndlc3QtY2hlc2hpcmUuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEzVH8ZUrWUFt//z7BuE7E7soNCq2J
-						8Aeq+KsiXbCK+tiwDXrIC8B7XFcyaDQvk5hxPt8XvYTpNpOBprTkIk9d7sy+cQX3
-						hfT44RCX+TNuWTKdQlUPkC0pbx2wFLROcMsUOgZP+ekC8SaQgRefui4unaRNNz9U
-						++L/cgYZLtcmd9sPklLTkl+77e2d6W5onnvQ9gvBDQUQBoScR5fg2hfwmkQqXUt3
-						FtXmcdhvILxKk9au7DLBqQfiAPfg9a08aBKJIn2XDW7q8NQ761edWQ2KF7IdgSL6
-						gTx+I13wes3g7apkZ1ONco81O35+Hty0lcNHGCRNL8+zrgVH20Z4mvSnAgMBAAGj
-						ezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
-						IENlcnRpZmljYXRlMB0GA1UdDgQWBBTL14zF0JlVNVY8uZXgSMl1u2pHwjAfBgNV
-						HSMEGDAWgBTL14zF0JlVNVY8uZXgSMl1u2pHwjANBgkqhkiG9w0BAQsFAAOCAQEA
-						IMvwvDpJGJAqMWnT+fNq8J5WYAbUOGIDLvhP0LNqFfYaZET989TX2anvblGibLDp
-						7ydk0U2Y8lWhiivlqqYu2Re5LQuGXXmwms3QQPwm4hn3aCZd6c7gggyg80+uJXaj
-						9rCSyQRR3Z0jGw2E4afl8ZZmirJL7fqNfKow/um85xl3RimY6WnLkgSCXYGmegmD
-						VDR6eyHwIij3Os8EHb8XQx4PObO+GPLmfSPdtA+hpwnLgqUKDGqOaz951hAh97Cs
-						fM/hzk/TNCxzJfh7dfU6mdVsSwq0J3hLAxHf7tSzXLRruF/9VruFlXSWwX+0brFn
-						OWNVr2kgXYhLkUAS9p7LWg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.west-cheshire.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.west-cheshire.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">West Cheshire College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">West Cheshire College (WCC)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.west-cheshire.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Allmark</SurName>
-    <EmailAddress>mailto:sallmark@west-cheshire.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Allmark</SurName>
-    <EmailAddress>mailto:sallmark@west-cheshire.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/web.chorus.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/web.chorus.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5e512d59..00000000
--- a/swamid-interfederations-2.0/web.chorus.ox.ac.uk-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://web.chorus.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Chorus Service" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-11-17T12:19:54Z">
-      <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://web.chorus.ox.ac.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://web.chorus.ox.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3zCCAcegAwIBAgIJALFL+iOr5QKwMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHVuc3NvcHMxMB4XDTE0MDkxOTE1MzAxM1oXDTI0MDkxNjE1MzAxM1owEzER
-						MA8GA1UEAxMIdW5zc29wczEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC9jXikIGweeUQMxRFMd2cQHoFDStW8pj5E5dwQvkTiyBRy70CYGgNKil8fGPZM
-						54PHToqXCBKv310cC4RhnSKSbLi+zXduSEzf0GLcsI6mXV+BPzlPuZsZSlIulIEo
-						8DPyLrJT8Z9tNa1Oi33Jo/Rc53OF0up3e6XBBNh78jQEjiTo82PcSecgi9Bg/4yl
-						d7hFdPOKWc34EMi0V2mHLRqiL9V5YSSbfTVxJ3I/35/X9Bzo3a+47a86fhxJ9kh3
-						W2/T6wHMvjYJnGmblhN7MmvVefhHWNIA4F9DVUCQoHed/nU56kY2HIULt/eIxD0s
-						oLkKg9nTYs7qrW9/u3OTEyC3AgMBAAGjNjA0MBMGA1UdEQQMMAqCCHVuc3NvcHMx
-						MB0GA1UdDgQWBBSBQh+JSuz8W3Jxuk3CYYSenJCR2DANBgkqhkiG9w0BAQUFAAOC
-						AQEAhIY0m1pjMYxgVnHL+AsV2XMNif/xaeSKIH3HAz0j8/7mL1wUub4mf4c5lu3c
-						DnzHMe1yY60+x+7kSiq+K5L+dbPWT7NvLWSNqfV+vPJKxuGpBOFq9kVVr9x2uNM4
-						bhlPpiDfcoozMF6R0Jnj34iuHAQgSpTfKTjECMNOT9v8jEruFzJxqqnl8H0RX408
-						lLx8XMjbVIErKSUgZT0K42rhOa+7nlAinV1SufvHQLjb8bKdnsbNIauCH8aBcs7D
-						94H1j90T/JvshPULLqAgq7FWeXRIqe4YhUT6gqjElnz3L9G+zG+1g/XCkTMdY2X9
-						TTVomgOCogTGw8rJ7I2OxSFpFw==
-					</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://web.chorus.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://web.chorus.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Chorus Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://web.chorus.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>SO Helpdesk</GivenName>
-    <EmailAddress>mailto:sohelpdesk.com.uk@unify.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>SO Helpdesk</GivenName>
-    <EmailAddress>mailto:sohelpdesk.com.uk@unify.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/web.oriel.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 54e52245..00000000
--- a/swamid-interfederations-2.0/web.oriel.ox.ac.uk-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://web.oriel.ox.ac.uk/shibboleth">
-  <!--
-		This is a 'University of Oxford, Oriel College' Shibboleth SP for the University of Oxford.
-	-->
-  <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="2015-11-16T16:12:22Z">
-      <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://web.oriel.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAM1GWdcimaKPMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEndlYi5vcmllbC5veC5hYy51azAeFw0xNTExMTAxMjQxMDRaFw0yNTExMDcx
-						MjQxMDRaMB0xGzAZBgNVBAMTEndlYi5vcmllbC5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAL+gbrPC66dBinzrKiqL9VHf+sG3mv6BbanV
-						KGAKuXZzHfgJvOvxr0q1DcbIjrhuFiP1w7G8eIJk2wSh699xNnI7PceclpKWCB0J
-						19PbKMIM5RF0M0PJU4W1QjLZmFLKcj+fJbQHhD50jvgaECoSWo1Z0nmLYEF94hw+
-						9xVoCASdegNe3peRL1NbUjIvfdd6OCj8o1QtAkrCBiH3HNHe4m5vu9t/EAlHVTlZ
-						WtzHDLdPgwYJ+i/kl4ZiQRX1pYjOxPBHxSjh43uoKsqb/qkulHV7gTkwfVv7iUd9
-						PKj7dVVgK6bpSR/2qPkdap1XLZRRZyiCKE5o3LElRn/0AevbEvECAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISd2ViLm9yaWVsLm94LmFjLnVrMB0GA1UdDgQWBBQO+H5D8rud
-						H06/aqz/wM/uj4bK+DANBgkqhkiG9w0BAQUFAAOCAQEAqlbzy4HbCYgTTSnqtOxb
-						DfN9FY1l8PSLKyG2qO9v8YWSuGnUvXWl5fiP5q2PjzThUOOKM4yWPQDI0QaN5N/+
-						Du1/NY4gJy7LFzKAzBytl+jw82wHkb3OMoaMYEa5vL1EIBmeJhzkN4Zr5FQ+0ass
-						K93VA9bjb3pm5c2emWQEtBKASCIUOnCqHOF9FqtCSne98k07mVH+E8d4UjSlzbBp
-						eOSODUc8FHyLaUNy44vM0IEwsoH66LCKctsw4B1taLxNgi3I7sJuxW6AYN5/dgT9
-						tzJrFvKSNaYWk6SyEoDAYus7GsvcL+zzCKmKuXzzZgj8ih4GnUH6OtdNXvGz4YjU
-						IA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://web.oriel.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://web.oriel.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Oriel College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oriel.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@oriel.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@oriel.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/web.tut.fi.xml b/swamid-interfederations-2.0/web.tut.fi.xml
deleted file mode 100644
index d307e284..00000000
--- a/swamid-interfederations-2.0/web.tut.fi.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://web.tut.fi/shibboleth">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE2TCCA8GgAwIBAgIQAJccxEo2duCHcGqbD4x1ezANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMTIxMzAwMDAwMFoXDTEzMTIxMjIzNTk1OVowgbkxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUzMzcyMDESMBAGA1UECBMJUGlya2FubWFhMRAwDgYD
-VQQHEwdUYW1wZXJlMRwwGgYDVQQJExNLb3JrZWFrb3VsdW5rYXR1IDEwMSkwJwYD
-VQQKEyBUYW1wZXJlIFVuaXZlcnNpdHkgb2YgVGVjaG5vbG9neTEWMBQGA1UECxMN
-VGlldG9oYWxsaW50bzETMBEGA1UEAxMKd2ViLnR1dC5maTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMwuC5ZzOZGbCpzsmKNIBH1rkRQRFRnh1MCO9Yj1
-1SswE4yLjA6dETebXoTMrwJb/v7uDVmv7NY33vUDolPxenXmMcfBqLfQI46MPaiV
-0cKAu0RvPHtpmTghnzFZOg4hGvYIAIT1zPkYywg7U4VFyMtJPnPnlOJeHhbh91vT
-TT37n5Fmh9RWUQJsxzfSQmE3xMVNgnPFBe84Pa+rNTbix24MgmV2hgchSuTFBaEq
-MS3Pba1SJETJ1bZcERyJNLTO8m80BuYZrBYuBjheYfQ23jf1Gy/LLgK9yZJNH9ll
-CnMoQfltT+QkOLy84GHbiEVAXzPfrAmqbZOGcHTt3Q7cAOsCAwEAAaOCAV0wggFZ
-MB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRs64Sa
-dKhtvd/JVXh5Bnp6NTaw6DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAd
-BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEE
-AbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
-KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
-AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAVBgNVHREEDjAMggp3
-ZWIudHV0LmZpMA0GCSqGSIb3DQEBBQUAA4IBAQBGpKYnuWg/2lN/WYKM/APV44DW
-7Unb8uV40JE2HIpcTXmbgIf/QZJRyou3MxqJS8/f1C4KGDvrWxMqJbWZIO1FGbtL
-4ghjMFfeg68z7R7uj0Gfz4/pj69oSR5duW/9yBdNQ4igO3cAb+RRCRU4iR1s7oZe
-Pcv6EAzVSd8GmAVe6EwPpiAA5Zi/61nUCXU2SRfI2E35z7XgGo6z2enHQY8WQvMg
-b+GdlT/1WE0+6q1Z5/AzDXSjx9v2lW+NOmJ0/gSEaIo3DAMaL/K1d0Jv03nNTfBb
-00f/455XQUhcJwtLj063dTVgETHTo+6CZeqBbKQCclY/oOUvTOQdT4v+4E1k</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://web.tut.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Acrobat Connect Pro -verkkokokouspalvelu</md:ServiceName>
-      <md:ServiceName xml:lang="en">TUT Acrobat Connect Pro</md:ServiceName>
-      <md:ServiceName xml:lang="sv">TUT Acrobat Connect Pro</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">TTY:n verkkokokouspalvelu.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">TUT web conference service.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="sv">TUT-tjansten for e-moten.</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jussi</md:GivenName>
-    <md:SurName>Tirkkonen</md:SurName>
-    <md:EmailAddress>jussi.tirkkonen@tut.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webapp.rz.rwth-aachen.de.xml b/swamid-interfederations-2.0/webapp.rz.rwth-aachen.de.xml
deleted file mode 100644
index b0488223..00000000
--- a/swamid-interfederations-2.0/webapp.rz.rwth-aachen.de.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webapp.rz.rwth-aachen.de/partner/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>webapp.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=webapp.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMDCCBBigAwIBAgIEDFo21TANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wODA1MjYxMzIx
-MTBaFw0xMzA1MjUxMzIxMTBaMIGgMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-dW0xITAfBgNVBAMTGHdlYmFwcC5yei5yd3RoLWFhY2hlbi5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAPSjax3nWhzo9FlrwXb6WuWOpuX1VPMdqqHe
-U3ZOJKfvyPi2wjkKprmQAWsOoyWEOa9VYs5xwu7EI0DxG2Ki1m05qTr2qksCJCxk
-o55adwXMKwQKVDFiPSCeBk9qxsITvgDZ1F9aO8V/8dNbXLZrezKyESAVOmcuyGnV
-oPERrHsr8YAHxLmxKVE4FA9u0Y74yrG553Ao22nQB+fsqUEmxGmGLIst6plyoh+5
-tzR5CYffYfLh1WWX9sU2fXBedxZaOhDhWgHjsXFHj+912PQQDHnb6CFZujc47XrD
-k59m3+7Y9dK1TG08OeDn55zSUDQE8xKyIMm7vdDn3FpjKhr1ynsCAwEAAaOCAbEw
-ggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC
-BggrBgEFBQcDATAdBgNVHQ4EFgQUjd6b6RuCG2XWIbgH9w3zNRiukwUwHwYDVR0j
-BBgwFoAUbtU+wBwvcck8v0lO72pVSOzR8jgwIgYDVR0RBBswGYEXZW1haWxAcnou
-cnd0aC1hYWNoZW4uZGUweQYDVR0fBHIwcDA2oDSgMoYwaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9yd3RoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDagNKAyhjBodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwgZQGCCsG
-AQUFBwEBBIGHMIGEMEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3J3dGgtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEAGCCsGAQUFBzAChjRodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQBch7KrzkvZa5c6AcG/Y3eoBAmfKapbtfwpwYL7
-S7LdavVaSkDTLsKzgAM0qh4bWKqLEVhQe1lrgsl3sW5cmwfiXtlU8U61anTauEzu
-di7TBr4j+ROORf8VL4lP1NBkb40h5KDr/VMwRJWRAOflOn8nfPyGr5Bs/Pb9Dl3O
-Cjgz2QtFsSHgtZQYOicHEVOL48mpj6I3Q/+aX/0YQQkJDabqrCZv1SL88pfK+zEz
-iGUx8gzfRwnOsLr3jqugUefXuyw95CfyqWwkKLOxxGe1A3xqGpOxtDD6GjGH2sbn
-DNDBTV9xM9Oxj0MtYNRc7iwF7p9RZMSy2SWQx045vlwRTIgU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>webapp.rz.rwth-aachen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=webapp.rz.rwth-aachen.de,OU=Rechen- und Kommunikationszentum,O=RWTH Aachen,L=Aachen,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFMDCCBBigAwIBAgIEDFo21TANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEUMBIGA1UEChMLUldUSCBBYWNoZW4xFzAVBgNVBAMTDlJXVEggQWFjaGVuIENB
-MSAwHgYJKoZIhvcNAQkBFhFjYUByd3RoLWFhY2hlbi5kZTAeFw0wODA1MjYxMzIx
-MTBaFw0xMzA1MjUxMzIxMTBaMIGgMQswCQYDVQQGEwJERTEcMBoGA1UECBMTTm9y
-ZHJoZWluLVdlc3RmYWxlbjEPMA0GA1UEBxMGQWFjaGVuMRQwEgYDVQQKEwtSV1RI
-IEFhY2hlbjEpMCcGA1UECxMgUmVjaGVuLSB1bmQgS29tbXVuaWthdGlvbnN6ZW50
-dW0xITAfBgNVBAMTGHdlYmFwcC5yei5yd3RoLWFhY2hlbi5kZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAPSjax3nWhzo9FlrwXb6WuWOpuX1VPMdqqHe
-U3ZOJKfvyPi2wjkKprmQAWsOoyWEOa9VYs5xwu7EI0DxG2Ki1m05qTr2qksCJCxk
-o55adwXMKwQKVDFiPSCeBk9qxsITvgDZ1F9aO8V/8dNbXLZrezKyESAVOmcuyGnV
-oPERrHsr8YAHxLmxKVE4FA9u0Y74yrG553Ao22nQB+fsqUEmxGmGLIst6plyoh+5
-tzR5CYffYfLh1WWX9sU2fXBedxZaOhDhWgHjsXFHj+912PQQDHnb6CFZujc47XrD
-k59m3+7Y9dK1TG08OeDn55zSUDQE8xKyIMm7vdDn3FpjKhr1ynsCAwEAAaOCAbEw
-ggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC
-BggrBgEFBQcDATAdBgNVHQ4EFgQUjd6b6RuCG2XWIbgH9w3zNRiukwUwHwYDVR0j
-BBgwFoAUbtU+wBwvcck8v0lO72pVSOzR8jgwIgYDVR0RBBswGYEXZW1haWxAcnou
-cnd0aC1hYWNoZW4uZGUweQYDVR0fBHIwcDA2oDSgMoYwaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9yd3RoLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDagNKAyhjBodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NybC9jYWNybC5jcmwwgZQGCCsG
-AQUFBwEBBIGHMIGEMEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L3J3dGgtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEAGCCsGAQUFBzAChjRodHRw
-Oi8vY2RwMi5wY2EuZGZuLmRlL3J3dGgtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQBch7KrzkvZa5c6AcG/Y3eoBAmfKapbtfwpwYL7
-S7LdavVaSkDTLsKzgAM0qh4bWKqLEVhQe1lrgsl3sW5cmwfiXtlU8U61anTauEzu
-di7TBr4j+ROORf8VL4lP1NBkb40h5KDr/VMwRJWRAOflOn8nfPyGr5Bs/Pb9Dl3O
-Cjgz2QtFsSHgtZQYOicHEVOL48mpj6I3Q/+aX/0YQQkJDabqrCZv1SL88pfK+zEz
-iGUx8gzfRwnOsLr3jqugUefXuyw95CfyqWwkKLOxxGe1A3xqGpOxtDD6GjGH2sbn
-DNDBTV9xM9Oxj0MtYNRc7iwF7p9RZMSy2SWQx045vlwRTIgU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webapp.rz.rwth-aachen.de/partner/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">RWTH Aachen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">RWTH Aachen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.rz.rwth-aachen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Wilfred</GivenName>
-    <SurName>Gasper</SurName>
-    <EmailAddress>gasper@rz.rwth-aachen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.auburn.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.auburn.edu-idp-shibboleth.xml
deleted file mode 100644
index 7fe6f1fa..00000000
--- a/swamid-interfederations-2.0/webauth.auburn.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,101 +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://webauth.auburn.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">auburn.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Auburn University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for Auburn University</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.auburn.edu/main/privacy.html</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>
-MIIDNDCCAhygAwIBAgIVAP+RnuTUpl6o8ybIdQ+XuaJSmmQaMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEndlYmF1dGguYXVidXJuLmVkdTAeFw0xMzAyMDUyMjAz
-MzZaFw0zMzAyMDUyMjAzMzZaMB0xGzAZBgNVBAMTEndlYmF1dGguYXVidXJuLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/026QIq50USdR2NMyF
-IEfc9mGqTjLhZ/OiRP0RnYudpwf4j9zO2qZwp1BYp6d5MeyXZbEzgm3iPhLyM8RL
-2OAXJBYSA3CexbknqRtjQLdm6bQKlQvVcsghqd3gHjh8gRW7ryOrkvMF7krzWQjj
-SG0Yp9SB0Ly/qOIRX9cv0e2ZebxPNBMGqzkDTVp1dFMce5q7oRs1z4YmXxBDVqrm
-1/rqfQYys9ps3hRrhHqD3ZQTS0l26afcdr05B7VbUtupvNn88rgfIDivXpEyels8
-O6Fxka1WPRVW6VFBudiPN9LMTtR35C0pwHewvl4MHfICrlJfuxhTwM9ZYzPQWN48
-hi8CAwEAAaNrMGkwSAYDVR0RBEEwP4ISd2ViYXV0aC5hdWJ1cm4uZWR1hilodHRw
-czovL3dlYmF1dGguYXVidXJuLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-zH+wc1SlDOHEpX9Ao+s4l06FJjswDQYJKoZIhvcNAQEFBQADggEBAFWTtpN5p7Pf
-OT2eWgKz0vTOeu9evvZR5AdbILcNCsk7R4l0xsm1BAhHNofcqFp5vEtv4/lpFTSl
-AXX6I0v6DBScSX3aV2ell9KD+At5ANHXZl43O+GcBjSkmFg0C4m4y4B7pKVRmsBy
-AHAlLpkk8+WVNYrQlKWr3Re/pUVKmeEfwxOaM7F2zzLy6PB1/iGAvhX8e+u55q22
-LJv5DwkNnuWkyYh8A5wn6DynGEFRKyJ/oTMVdvBdvWt63lfyFJf/Npj+xd3rZ5Su
-6vmB4iooPamlJxBIBRkQA5xi+zcVfuQvOfJ412EFk979S4zqt/jED/2ZDRPodkcZ
-cUPWqk0unJg=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.auburn.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.auburn.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.auburn.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.auburn.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.auburn.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auburn.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVAP+RnuTUpl6o8ybIdQ+XuaJSmmQaMA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEndlYmF1dGguYXVidXJuLmVkdTAeFw0xMzAyMDUyMjAz
-MzZaFw0zMzAyMDUyMjAzMzZaMB0xGzAZBgNVBAMTEndlYmF1dGguYXVidXJuLmVk
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/026QIq50USdR2NMyF
-IEfc9mGqTjLhZ/OiRP0RnYudpwf4j9zO2qZwp1BYp6d5MeyXZbEzgm3iPhLyM8RL
-2OAXJBYSA3CexbknqRtjQLdm6bQKlQvVcsghqd3gHjh8gRW7ryOrkvMF7krzWQjj
-SG0Yp9SB0Ly/qOIRX9cv0e2ZebxPNBMGqzkDTVp1dFMce5q7oRs1z4YmXxBDVqrm
-1/rqfQYys9ps3hRrhHqD3ZQTS0l26afcdr05B7VbUtupvNn88rgfIDivXpEyels8
-O6Fxka1WPRVW6VFBudiPN9LMTtR35C0pwHewvl4MHfICrlJfuxhTwM9ZYzPQWN48
-hi8CAwEAAaNrMGkwSAYDVR0RBEEwP4ISd2ViYXV0aC5hdWJ1cm4uZWR1hilodHRw
-czovL3dlYmF1dGguYXVidXJuLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-zH+wc1SlDOHEpX9Ao+s4l06FJjswDQYJKoZIhvcNAQEFBQADggEBAFWTtpN5p7Pf
-OT2eWgKz0vTOeu9evvZR5AdbILcNCsk7R4l0xsm1BAhHNofcqFp5vEtv4/lpFTSl
-AXX6I0v6DBScSX3aV2ell9KD+At5ANHXZl43O+GcBjSkmFg0C4m4y4B7pKVRmsBy
-AHAlLpkk8+WVNYrQlKWr3Re/pUVKmeEfwxOaM7F2zzLy6PB1/iGAvhX8e+u55q22
-LJv5DwkNnuWkyYh8A5wn6DynGEFRKyJ/oTMVdvBdvWt63lfyFJf/Npj+xd3rZ5Su
-6vmB4iooPamlJxBIBRkQA5xi+zcVfuQvOfJ412EFk979S4zqt/jED/2ZDRPodkcZ
-cUPWqk0unJg=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.auburn.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Auburn University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Auburn University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.auburn.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brian Anderson</md:GivenName>
-    <md:EmailAddress>anderbr@auburn.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Brian Anderson</md:GivenName>
-    <md:EmailAddress>anderbr@auburn.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>OIT Helpdesk</md:GivenName>
-    <md:EmailAddress>helpdesk@auburn.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.cmc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.cmc.edu-idp-shibboleth.xml
deleted file mode 100644
index 4207fbe2..00000000
--- a/swamid-interfederations-2.0/webauth.cmc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,71 +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://webauth.cmc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://webauth.cmc.edu/idp/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cmc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Claremont McKenna College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider service for Claremont McKenna College.</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>
-MIIDWzCCAkOgAwIBAgIUdpkFxVnLjHw29WkEImbR9wGOCcUwDQYJKoZIhvcNAQEF
-BQAwJzElMCMGA1UEAxMcd2ViYXV0aC5jbGFyZW1vbnRtY2tlbm5hLmVkdTAeFw0x
-MzA5MjUyMTQ0NDdaFw0zMzA5MjUyMTQ0NDdaMCcxJTAjBgNVBAMTHHdlYmF1dGgu
-Y2xhcmVtb250bWNrZW5uYS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCg8aHl2KXv3AHO4rxVzY5hAR79SqEvM1attEq0zf3MRg+xoKk/KMXw99vn
-E3PMYZN1+M/0PMVg4GLUOrDVAtfASUV8+7QnxEoAHtuTxlJghfIUaAhw5lgysYjd
-wGPkqVHR5rg0USaz/3j77Z4w3evrjXf00JMInysrkB88D4bMNQW4qeALq4yhztzU
-GcFs0KCFF4evf7TArdI5w+R8bRKfAyt6c/1MbtRpneWpsawXn7zP5+co3whaf6tC
-f10ExWMipDo39+MyqLzPgGEMklyU5HaAP6iZKMedrDWiMgYaP7wYF7MmTORvohBL
-SVtvif424JRSdg4ab8ZxLdtibeV7AgMBAAGjfzB9MFwGA1UdEQRVMFOCHHdlYmF1
-dGguY2xhcmVtb250bWNrZW5uYS5lZHWGM2h0dHBzOi8vd2ViYXV0aC5jbGFyZW1v
-bnRtY2tlbm5hLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS22lwbhLnUmm
-/CVrh6n8h4svE/AwDQYJKoZIhvcNAQEFBQADggEBAB0dxZnUD29xM+awE6QelYnE
-C/jXxn7p4nSDYih6Yu/XObBiNOyWBeLi+Z5QuA+ROMGbom/w9kr5uhMRB2W9RwBf
-N+Zvg7/lYE1+Qm4tP358miPbeRvUjofTMCuVamzgzymBrEPU/Xl5xXxQ1vXxfHzK
-TXsJyRTIBjXcneMWAbGFmXIHfSgKuTaVYEMEU/qojdAgn3oLeMiuOK2e2mg37r4G
-E3QIN8c2JvIbeEfy2vWy2KUf91EsPWGaL35jHbZQj0CFj5CCxjEBOmDciPVq3+D+
-BiV98zaRzZEkS+1uWpkqkJjsjpGu6OoulUkarBQY6aMfvJ5QDgWDyQURKaJEeIg=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.cmc.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.cmc.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.cmc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.cmc.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Claremont McKenna College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Claremont McKenna College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cmc.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jeremy Whaley</md:GivenName>
-    <md:EmailAddress>jwhaley@cmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Jeremy Whaley</md:GivenName>
-    <md:EmailAddress>jwhaley@cmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jeremy Whaley</md:GivenName>
-    <md:EmailAddress>jwhaley@cmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jeremy Whaley</md:GivenName>
-    <md:EmailAddress>jwhaley@cmc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.meredith.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.meredith.edu-idp-shibboleth.xml
deleted file mode 100644
index 8a3ad500..00000000
--- a/swamid-interfederations-2.0/webauth.meredith.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,92 +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://webauth.meredith.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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">meredith.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Meredith College</mdui:DisplayName>
-        <mdui:Logo height="68" width="342" xml:lang="en">https://webauth.meredith.edu/idp/images/logo.jpg</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>
-MIIDPDCCAiSgAwIBAgIVAPpigo3Xyo77zwHIdEmW2w5SdOEHMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHdlYmF1dGgubWVyZWRpdGguZWR1MB4XDTEyMDkxODEz
-MjQ0MFoXDTMyMDkxODEzMjQ0MFowHzEdMBsGA1UEAxMUd2ViYXV0aC5tZXJlZGl0
-aC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCaA0wIPe7ntkGf
-KldJKgZI00ZKZcq58QEo9O+VYg+G2QK4UDH+wu7AZTZZ3DHbBsBP6UYQcErXUkMp
-MPPqJcBc4cIvrthExxvmIamQtz82ukeAhjy3HuFASSiM3pK6tbcRNtT2IHU9EZ7z
-c5hZBhjlox0B1O77Nf17lofLqW2pqpIw3VXemjiY1O8clnnrWBmrXJ5IF5JIeBcP
-Njn9s9VcFaylVTKq1trJdW54QLymc+c1x+xzbaVdEULHKhhos0TFMWfAEmrtqYH2
-P7SU0S+v7376a0fFSdT/u/SDWDHdWvTqV88OPg0ziuvcat3WUOUwH62z/BNZ6udt
-EXhRB1JPAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHdlYmF1dGgubWVyZWRpdGguZWR1
-hitodHRwczovL3dlYmF1dGgubWVyZWRpdGguZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBT/tBqEc9ghSEjjseavOWJQ9PXlDjANBgkqhkiG9w0BAQUFAAOCAQEA
-ZAwhD2o0j2Bj8luO5gJ/kM1AY+ZuxG3/eS9dqz9Hpe8gOr0VWNT4Mown9JuXgyjV
-ok9E1qgLZI7+OzUnCRsI4IByp8SqitFFDuGlfXLPjx9ISjwkaYOMV7XpeBfaG7u/
-d0JUmWT5XmL1Bl58iDCGrEjWv9PmJKyrJYhoOH/AHotPx2/0Fq9B+NJJ+0FFXOKK
-LuzOEYHp2Jyoo792oHFYHONwuiFuRKfFcZnd05NSFKaKmRU4GoADXAIWF9XRH15V
-yE6fz+Nc9bddyeGayzz45GriXWsLgrERYVBITe/U2ZLi8xrQqbaPCc6tyx9Jdnqe
-oR7d65KJbWVyo0k+ZPUtsw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.meredith.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.meredith.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.meredith.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.meredith.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.meredith.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meredith.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDPDCCAiSgAwIBAgIVAPpigo3Xyo77zwHIdEmW2w5SdOEHMA0GCSqGSIb3DQEB
-BQUAMB8xHTAbBgNVBAMTFHdlYmF1dGgubWVyZWRpdGguZWR1MB4XDTEyMDkxODEz
-MjQ0MFoXDTMyMDkxODEzMjQ0MFowHzEdMBsGA1UEAxMUd2ViYXV0aC5tZXJlZGl0
-aC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCaA0wIPe7ntkGf
-KldJKgZI00ZKZcq58QEo9O+VYg+G2QK4UDH+wu7AZTZZ3DHbBsBP6UYQcErXUkMp
-MPPqJcBc4cIvrthExxvmIamQtz82ukeAhjy3HuFASSiM3pK6tbcRNtT2IHU9EZ7z
-c5hZBhjlox0B1O77Nf17lofLqW2pqpIw3VXemjiY1O8clnnrWBmrXJ5IF5JIeBcP
-Njn9s9VcFaylVTKq1trJdW54QLymc+c1x+xzbaVdEULHKhhos0TFMWfAEmrtqYH2
-P7SU0S+v7376a0fFSdT/u/SDWDHdWvTqV88OPg0ziuvcat3WUOUwH62z/BNZ6udt
-EXhRB1JPAgMBAAGjbzBtMEwGA1UdEQRFMEOCFHdlYmF1dGgubWVyZWRpdGguZWR1
-hitodHRwczovL3dlYmF1dGgubWVyZWRpdGguZWR1L2lkcC9zaGliYm9sZXRoMB0G
-A1UdDgQWBBT/tBqEc9ghSEjjseavOWJQ9PXlDjANBgkqhkiG9w0BAQUFAAOCAQEA
-ZAwhD2o0j2Bj8luO5gJ/kM1AY+ZuxG3/eS9dqz9Hpe8gOr0VWNT4Mown9JuXgyjV
-ok9E1qgLZI7+OzUnCRsI4IByp8SqitFFDuGlfXLPjx9ISjwkaYOMV7XpeBfaG7u/
-d0JUmWT5XmL1Bl58iDCGrEjWv9PmJKyrJYhoOH/AHotPx2/0Fq9B+NJJ+0FFXOKK
-LuzOEYHp2Jyoo792oHFYHONwuiFuRKfFcZnd05NSFKaKmRU4GoADXAIWF9XRH15V
-yE6fz+Nc9bddyeGayzz45GriXWsLgrERYVBITe/U2ZLi8xrQqbaPCc6tyx9Jdnqe
-oR7d65KJbWVyo0k+ZPUtsw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.meredith.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Meredith College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Meredith College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.meredith.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Victor Fayed</md:GivenName>
-    <md:EmailAddress>techservices@meredith.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.njit.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.njit.edu-idp-shibboleth.xml
deleted file mode 100644
index b83110f3..00000000
--- a/swamid-interfederations-2.0/webauth.njit.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,139 +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://webauth.njit.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://webauth.njit.edu/idp/error.jsp" 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">njit.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">New Jersey Institute of Technology</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>
-MIIG/DCCBeSgAwIBAgIQB/fmHShEQYuz/UoWXr96MzANBgkqhkiG9w0BAQUFADBm
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBDQS0zMB4XDTA4MDMxNDAwMDAwMFoXDTExMDUxNzIzNTk1OVowgaMxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MQ8wDQYDVQQHEwZOZXdhcmsxKzAp
-BgNVBAoTIk5ldyBKZXJzZXkgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kxLDAqBgNV
-BAsTI0luZm9ybWF0aW9uIFNlcnZpY2VzIGFuZCBUZWNobm9sb2d5MRMwEQYDVQQD
-FAoqLm5qaXQuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuut0
-LqwCrPhdQ/kuY1ZXjO1vpLliXq9ds9IOplVPMoH44YADNS2Bpi2kBxVjCmx7KRLy
-KNcp3jroIWFqqOAQkDkHyA9zJPS9ZkvMSS3GkJT2VnzEre3h9QaZRN+YLf1aWFKo
-r4alLdIR63qkhpUAXnxJQV09MJZyTOV3/4VR2Zij/6R/Nav6q9nolUskrZ8PPL8m
-7AM10ToORcAsJ0OsONoGFu245rlBG2rGK89Z34EBQvSKBhGROxVjk3F2khFPSh+E
-jm1SlZPTqU1lS5xLakeEzAnwppYu+fNBUoniMkQqFlgd13cxJTgJ+/oOO/rwSZnO
-Um+f+i2eFp2z6l+5ZwIDAQABo4IDZjCCA2IwHwYDVR0jBBgwFoAUUOpzidsp+xCP
-nuUBINTeeZlIg/cwHQYDVR0OBBYEFEDSmO+bQUXlX/YN8vcfkLXpFkEsMDEGA1Ud
-EQQqMCiCEHdlYmF1dGgubmppdC5lZHWCCG5qaXQuZWR1ggoqLm5qaXQuZWR1MH8G
-CCsGAQUFBwEBBHMwcTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQu
-Y29tMEkGCCsGAQUFBzAChj1odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DQUNlcnRz
-L0RpZ2lDZXJ0SGlnaEFzc3VyYW5jZUNBLTMuY3J0MA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMGUGA1UdHwReMFwwLKAqoCiGJmh0dHA6Ly9jcmwzLmRpZ2lj
-ZXJ0LmNvbS9jYTMtMjAwOWMuY3JsMCygKqAohiZodHRwOi8vY3JsNC5kaWdpY2Vy
-dC5jb20vY2EzLTIwMDljLmNybDCCAcYGA1UdIASCAb0wggG5MIIBtQYLYIZIAYb9
-bAEDAAEwggGkMDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9z
-c2wtY3BzLXJlcG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4A
-eQAgAHUAcwBlACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQA
-ZQAgAGMAbwBuAHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUA
-IABvAGYAIAB0AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAA
-YQBuAGQAIAB0AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcA
-cgBlAGUAbQBlAG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIA
-aQBsAGkAdAB5ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQA
-ZQBkACAAaABlAHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOCAQEA
-XuQ9K+tlSbdR6+biBMIblDYahSpSIGJyQAbPynUx8ItSVR5TFixd2VXSj1WHLqJ2
-Mt5dvelZT/EmTK6l2bR86vxIaA7bibr0FL+cNEP6JOpplB42Swm8KzCXDUHCalPP
-QnSsF5Q7fKZj7nL+A9qsSIEBkdLKV22DC0vQqt8YWIjJMQ/zJ5UIuSt7dSs57JGC
-J7I7AxQmXSLwuaY78W7l8a9IkzmJz8Wt5TAydYM6eSMPK+kny68aC3m67yVMejaZ
-fN3QE4xJol0bLnB32DpY4LHNYpBuP+/UEupUPDprc/tUjaO4yaE+zibXTstrX6Md
-MFSqMAoE31SDA9ZeOi1yqg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.njit.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.njit.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.njit.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.njit.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.njit.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">njit.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIG/DCCBeSgAwIBAgIQB/fmHShEQYuz/UoWXr96MzANBgkqhkiG9w0BAQUFADBm
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBDQS0zMB4XDTA4MDMxNDAwMDAwMFoXDTExMDUxNzIzNTk1OVowgaMxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MQ8wDQYDVQQHEwZOZXdhcmsxKzAp
-BgNVBAoTIk5ldyBKZXJzZXkgSW5zdGl0dXRlIG9mIFRlY2hub2xvZ3kxLDAqBgNV
-BAsTI0luZm9ybWF0aW9uIFNlcnZpY2VzIGFuZCBUZWNobm9sb2d5MRMwEQYDVQQD
-FAoqLm5qaXQuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuut0
-LqwCrPhdQ/kuY1ZXjO1vpLliXq9ds9IOplVPMoH44YADNS2Bpi2kBxVjCmx7KRLy
-KNcp3jroIWFqqOAQkDkHyA9zJPS9ZkvMSS3GkJT2VnzEre3h9QaZRN+YLf1aWFKo
-r4alLdIR63qkhpUAXnxJQV09MJZyTOV3/4VR2Zij/6R/Nav6q9nolUskrZ8PPL8m
-7AM10ToORcAsJ0OsONoGFu245rlBG2rGK89Z34EBQvSKBhGROxVjk3F2khFPSh+E
-jm1SlZPTqU1lS5xLakeEzAnwppYu+fNBUoniMkQqFlgd13cxJTgJ+/oOO/rwSZnO
-Um+f+i2eFp2z6l+5ZwIDAQABo4IDZjCCA2IwHwYDVR0jBBgwFoAUUOpzidsp+xCP
-nuUBINTeeZlIg/cwHQYDVR0OBBYEFEDSmO+bQUXlX/YN8vcfkLXpFkEsMDEGA1Ud
-EQQqMCiCEHdlYmF1dGgubmppdC5lZHWCCG5qaXQuZWR1ggoqLm5qaXQuZWR1MH8G
-CCsGAQUFBwEBBHMwcTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQu
-Y29tMEkGCCsGAQUFBzAChj1odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DQUNlcnRz
-L0RpZ2lDZXJ0SGlnaEFzc3VyYW5jZUNBLTMuY3J0MA4GA1UdDwEB/wQEAwIFoDAM
-BgNVHRMBAf8EAjAAMGUGA1UdHwReMFwwLKAqoCiGJmh0dHA6Ly9jcmwzLmRpZ2lj
-ZXJ0LmNvbS9jYTMtMjAwOWMuY3JsMCygKqAohiZodHRwOi8vY3JsNC5kaWdpY2Vy
-dC5jb20vY2EzLTIwMDljLmNybDCCAcYGA1UdIASCAb0wggG5MIIBtQYLYIZIAYb9
-bAEDAAEwggGkMDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9z
-c2wtY3BzLXJlcG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4A
-eQAgAHUAcwBlACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQA
-ZQAgAGMAbwBuAHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUA
-IABvAGYAIAB0AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAA
-YQBuAGQAIAB0AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcA
-cgBlAGUAbQBlAG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIA
-aQBsAGkAdAB5ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQA
-ZQBkACAAaABlAHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOCAQEA
-XuQ9K+tlSbdR6+biBMIblDYahSpSIGJyQAbPynUx8ItSVR5TFixd2VXSj1WHLqJ2
-Mt5dvelZT/EmTK6l2bR86vxIaA7bibr0FL+cNEP6JOpplB42Swm8KzCXDUHCalPP
-QnSsF5Q7fKZj7nL+A9qsSIEBkdLKV22DC0vQqt8YWIjJMQ/zJ5UIuSt7dSs57JGC
-J7I7AxQmXSLwuaY78W7l8a9IkzmJz8Wt5TAydYM6eSMPK+kny68aC3m67yVMejaZ
-fN3QE4xJol0bLnB32DpY4LHNYpBuP+/UEupUPDprc/tUjaO4yaE+zibXTstrX6Md
-MFSqMAoE31SDA9ZeOi1yqg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.njit.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">New Jersey Institute of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">New Jersey Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.njit.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>University Information Systems</md:GivenName>
-    <md:EmailAddress>uis-systems@njit.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>University Information Systems</md:GivenName>
-    <md:EmailAddress>uis-systems@njit.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>University Information Systems</md:GivenName>
-    <md:EmailAddress>uis-systems@njit.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.scrippscollege.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.scrippscollege.edu-idp-shibboleth.xml
deleted file mode 100644
index 783696de..00000000
--- a/swamid-interfederations-2.0/webauth.scrippscollege.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,71 +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://webauth.scrippscollege.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://webauth.scrippscollege.edu/idp/error.jsp" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scrippscollege.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Scripps College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider service for Scripps College.</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>
-MIIDVDCCAjygAwIBAgIVAOpDjT7coAA9QWrjD1kbiAsVt7zDMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGndlYmF1dGguc2NyaXBwc2NvbGxlZ2UuZWR1MB4XDTE0
-MDgyOTAwMDYyMloXDTM0MDgyOTAwMDYyMlowJTEjMCEGA1UEAxMad2ViYXV0aC5z
-Y3JpcHBzY29sbGVnZS5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC9HbPIMAc0BT+aTPL5KojEEQgxPpOaRHpAin0HOlZkq2wT8mUx+LH0ZI9QiuoI
-/JYItHk5z3S99PyIqWCJKgBdtwyZsQtNqOA6LD0gNnQ29OQPKpdcREN7EYocBKbw
-iRyK9pt1UtN8Ht3WfnZt91I/FOYgZ/WlIn1tBuj53Vfe4BTlhzb0wGZedzim1llM
-njXFstO7aBZ1oBSFIcrgpdK43qZqzRrgHxzk/Ek9PvWxDA2OV6fKJ+KC8arVR6BB
-g1OxH+WmEp7jvCu8LGAptB+pOrdZJOb5/bQQ7t+oZRK9Per2XVNXY1eNTx9++HTR
-vkuIpgxmRRNquolDraRwAZbpAgMBAAGjezB5MFgGA1UdEQRRME+CGndlYmF1dGgu
-c2NyaXBwc2NvbGxlZ2UuZWR1hjFodHRwczovL3dlYmF1dGguc2NyaXBwc2NvbGxl
-Z2UuZWR1L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRWVDmn0HSAcmKTxFZzGYqK
-0RfxqjANBgkqhkiG9w0BAQUFAAOCAQEAKtDhaGgrizvBIYTyYl7udiYCHZ972Dl9
-LbS/5IGBvipphw2FZAA6ZuFDlbbSBDwmEBX+l451s7A2YI8IuZ+OyLF3Nms3svVH
-a1IWl5BlRcOk3qdZqnWBvZ/0XaU4xmGH0neX7Nkf6wzkhzWMZeS/gw+J9zPuBMqR
-czwZlKdDGYB8sMf0o933y/SPyjqSjOENNSE02l0sSjJkrYkAM0IBNb7E44rJZj0x
-F0ImO4Fv5/Vy2RaahHaHoC4lvUix0pR4w8d50k/XEkCoEMu1Ekvdh05rFNZA8WtD
-B9BnGxr829tOOS2Sq1zdJCXsYF2fIKksQq3xvl8iFiRmA7YXD2mOvg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.scrippscollege.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.scrippscollege.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.scrippscollege.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.scrippscollege.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Scripps College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Scripps College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.scrippscollege.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jeff Sessler</md:GivenName>
-    <md:EmailAddress>jeff@scrippscollege.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jeff Sessler</md:GivenName>
-    <md:EmailAddress>jeff@scrippscollege.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jeff Sessler</md:GivenName>
-    <md:EmailAddress>jeff@scrippscollege.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Jeff Sessler</md:GivenName>
-    <md:EmailAddress>jeff@scrippscollege.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.shib.lsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.shib.lsu.edu-idp-shibboleth.xml
deleted file mode 100644
index d6567cee..00000000
--- a/swamid-interfederations-2.0/webauth.shib.lsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,115 +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://webauth.shib.lsu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.lsu.edu/404.shtml" 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">lsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Louisiana State University</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://webauth.shib.lsu.edu/shibboleth/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.lsu.edu/itpolicy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="200" xml:lang="en">https://webauth.shib.lsu.edu/shibboleth/images/lsulogo.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>
-MIIEYTCCA0mgAwIBAgIJAKzhFxTleiexMA0GCSqGSIb3DQEBBQUAMIHGMQswCQYD
-VQQGEwJVUzESMBAGA1UECAwJTG91aXNpYW5hMRQwEgYDVQQHDAtCYXRvbiBSb3Vn
-ZTEjMCEGA1UECgwaTG91aXNpYW5hIFN0YXRlIFVuaXZlcnNpdHkxKDAmBgNVBAsM
-H0luZm9ybWF0aW9uIFRlY2hub2xvZ3kgU2VydmljZXMxHTAbBgNVBAMMFHdlYmF1
-dGguc2hpYi5sc3UuZWR1MR8wHQYJKoZIhvcNAQkBFhBzZWN1cml0eUBsc3UuZWR1
-MB4XDTEzMDcwMTE4MzkxM1oXDTMzMDYyNjE4MzkxM1owgcYxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIDAlMb3Vpc2lhbmExFDASBgNVBAcMC0JhdG9uIFJvdWdlMSMwIQYD
-VQQKDBpMb3Vpc2lhbmEgU3RhdGUgVW5pdmVyc2l0eTEoMCYGA1UECwwfSW5mb3Jt
-YXRpb24gVGVjaG5vbG9neSBTZXJ2aWNlczEdMBsGA1UEAwwUd2ViYXV0aC5zaGli
-LmxzdS5lZHUxHzAdBgkqhkiG9w0BCQEWEHNlY3VyaXR5QGxzdS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDP/xaAZ7yLrGIwwJaGBy6iybvV2pfF
-soOk4fQm/Rza527jYq3kNpuQdAIWzeoJku28qIqrSS3GLf14wdxSNN9rRYd7UhkY
-NzeCxidwjVANbEgM6zsD71Q+c9DM5N9HMQ2a4LZfeKdIs92sBII/3b/4y7jmpiww
-CAMlgH8xP3greb2JkU0Pbi3HA3f+Y3SH/ckNx5gbpeuCdv7rl48Y73Hfx3DVxVQm
-tsvBG0NZIkBRBtyXY2TxYQVPoKKiq3+MhKZna3TfkkExhbuY3a4QGIR0g5Ctk3fJ
-JxdVfoXx0sJJBttPgmdpwa3JNKNaC3AGJL3TbAT9fap099se5iafMtI9AgMBAAGj
-UDBOMB0GA1UdDgQWBBSX6BSJUkoRiDlEBiO4cKLpt7w3FTAfBgNVHSMEGDAWgBSX
-6BSJUkoRiDlEBiO4cKLpt7w3FTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4IBAQAhaErPoyFvAiSq91jfbg/UK+YjyJNAW4CLjFJlyMLqAkFJrEZKEfAcbxqr
-rsOZt2fqDaDyDcRvZl82CqSZx8SZ75idjblJLlzY8d2N59QZTubLKRYxNsrxvBkY
-p+tcc6zkAkh2QQdC4JPheKICpsxt1xytFHBT32CAfU2kyyzo5/ajjSzfFo8/o5Bf
-WcZP9FLd6yFxgEMSNhWYDcL+HAe4PFH9N98MhugSnQwaybJhdG8J0ig18S+9vSil
-uh8s0yON8U0+JjL/iuXv+hjwOUWvGFjFBaoIwwWpcciNJALoQy9gI7RqFd7QHJIi
-m4gMSZsHCXLYo9JbH1WYKEqJJDdZ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.shib.lsu.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.shib.lsu.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.shib.lsu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.shib.lsu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.shib.lsu.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.shib.lsu.edu/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">lsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEYTCCA0mgAwIBAgIJAKzhFxTleiexMA0GCSqGSIb3DQEBBQUAMIHGMQswCQYD
-VQQGEwJVUzESMBAGA1UECAwJTG91aXNpYW5hMRQwEgYDVQQHDAtCYXRvbiBSb3Vn
-ZTEjMCEGA1UECgwaTG91aXNpYW5hIFN0YXRlIFVuaXZlcnNpdHkxKDAmBgNVBAsM
-H0luZm9ybWF0aW9uIFRlY2hub2xvZ3kgU2VydmljZXMxHTAbBgNVBAMMFHdlYmF1
-dGguc2hpYi5sc3UuZWR1MR8wHQYJKoZIhvcNAQkBFhBzZWN1cml0eUBsc3UuZWR1
-MB4XDTEzMDcwMTE4MzkxM1oXDTMzMDYyNjE4MzkxM1owgcYxCzAJBgNVBAYTAlVT
-MRIwEAYDVQQIDAlMb3Vpc2lhbmExFDASBgNVBAcMC0JhdG9uIFJvdWdlMSMwIQYD
-VQQKDBpMb3Vpc2lhbmEgU3RhdGUgVW5pdmVyc2l0eTEoMCYGA1UECwwfSW5mb3Jt
-YXRpb24gVGVjaG5vbG9neSBTZXJ2aWNlczEdMBsGA1UEAwwUd2ViYXV0aC5zaGli
-LmxzdS5lZHUxHzAdBgkqhkiG9w0BCQEWEHNlY3VyaXR5QGxzdS5lZHUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDP/xaAZ7yLrGIwwJaGBy6iybvV2pfF
-soOk4fQm/Rza527jYq3kNpuQdAIWzeoJku28qIqrSS3GLf14wdxSNN9rRYd7UhkY
-NzeCxidwjVANbEgM6zsD71Q+c9DM5N9HMQ2a4LZfeKdIs92sBII/3b/4y7jmpiww
-CAMlgH8xP3greb2JkU0Pbi3HA3f+Y3SH/ckNx5gbpeuCdv7rl48Y73Hfx3DVxVQm
-tsvBG0NZIkBRBtyXY2TxYQVPoKKiq3+MhKZna3TfkkExhbuY3a4QGIR0g5Ctk3fJ
-JxdVfoXx0sJJBttPgmdpwa3JNKNaC3AGJL3TbAT9fap099se5iafMtI9AgMBAAGj
-UDBOMB0GA1UdDgQWBBSX6BSJUkoRiDlEBiO4cKLpt7w3FTAfBgNVHSMEGDAWgBSX
-6BSJUkoRiDlEBiO4cKLpt7w3FTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-A4IBAQAhaErPoyFvAiSq91jfbg/UK+YjyJNAW4CLjFJlyMLqAkFJrEZKEfAcbxqr
-rsOZt2fqDaDyDcRvZl82CqSZx8SZ75idjblJLlzY8d2N59QZTubLKRYxNsrxvBkY
-p+tcc6zkAkh2QQdC4JPheKICpsxt1xytFHBT32CAfU2kyyzo5/ajjSzfFo8/o5Bf
-WcZP9FLd6yFxgEMSNhWYDcL+HAe4PFH9N98MhugSnQwaybJhdG8J0ig18S+9vSil
-uh8s0yON8U0+JjL/iuXv+hjwOUWvGFjFBaoIwwWpcciNJALoQy9gI7RqFd7QHJIi
-m4gMSZsHCXLYo9JbH1WYKEqJJDdZ
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.shib.lsu.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.shib.lsu.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Louisiana State University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Louisiana State University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.lsu.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Shibboleth Technical</md:GivenName>
-    <md:EmailAddress>security@lsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Shibboleth Administrator</md:GivenName>
-    <md:EmailAddress>security@lsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.soton.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/webauth.soton.ac.uk-shibboleth.xml
deleted file mode 100644
index ab7a5db6..00000000
--- a/swamid-interfederations-2.0/webauth.soton.ac.uk-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://webauth.soton.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for the University of Southampton.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-11T17:23:46Z"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">soton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAOWKrrq2ddtGOxs+OVFZBurJpwm8MA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE3dlYmF1dGguc290b24uYWMudWswHhcNMTAwODE2MTY1
-						NTQwWhcNMzAwODE2MTY1NTQwWjAeMRwwGgYDVQQDExN3ZWJhdXRoLnNvdG9uLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jpCZisLONgRWYF6
-						eIRxN/OeO5cmtJC68LoWLabPIAH3Utieb2l163wbmIWQRnHjp8wigbP+5vub9FDe
-						+dgfafv24r6+yU/Bsv6I+lJQomloEcCdWKkNK8V/BOoQ8n0HcEo4ukOzVwneA9sn
-						3wtMMAY5dByvsHaevxjfQljjBsRDKqyQN7x/2Gu67l38OEnWqRkgIUFKdzqBptDy
-						O4NgI6aQ0zjJGrOXBjEu/t9eerAoLeXr+LBY+bqp9UvzSLivb6j5IsXTqj67UivU
-						APqMC2lY3DF7z+vNwu4qgpFOOrEWZJy8AP8HrTBf2bqljem/2Q/lr5dPfNHkDo9f
-						qmmKEwIDAQABo20wazBKBgNVHREEQzBBghN3ZWJhdXRoLnNvdG9uLmFjLnVrhipo
-						dHRwczovL3dlYmF1dGguc290b24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFKDUEPWk3MtQPCK0I9c6YmU4qbOhMA0GCSqGSIb3DQEBBQUAA4IBAQAXvdp3
-						MHQnqe5F0+rS71cPQpU3cM4tehQoDO1392rfxuYyAsTWDUfRRMIpagtRYpwJeUy9
-						cD6uhQwojjjE+lNrWCqIrIlI2Vu3Hb0CC3m11VlduKqRCBysQyOSH4zAH9a49d6Y
-						KWHHxbfrHzuE9v53RCNIVVU/h+zwMbZ7O6fBFeZYx/Rf4pt7kcvaoGE9kb3162kW
-						XstkUhyLjuJXIPWBlkWBjIbkFKmCFN4IHIi9nz/sqVvBnbHzr8Njk9YIf/lMx4Us
-						wHZNu7DWMxWh1OxdYrCJn8Sknnsy/EJABXPvMPsuq/6/4fBezlxYdgYDRE0w3tgB
-						HPqnW/Pnrm26uMgi
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.soton.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://webauth.soton.ac.uk/shibboleth-idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.soton.ac.uk/shibboleth-idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.soton.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">soton.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIVAOWKrrq2ddtGOxs+OVFZBurJpwm8MA0GCSqGSIb3DQEB
-						BQUAMB4xHDAaBgNVBAMTE3dlYmF1dGguc290b24uYWMudWswHhcNMTAwODE2MTY1
-						NTQwWhcNMzAwODE2MTY1NTQwWjAeMRwwGgYDVQQDExN3ZWJhdXRoLnNvdG9uLmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jpCZisLONgRWYF6
-						eIRxN/OeO5cmtJC68LoWLabPIAH3Utieb2l163wbmIWQRnHjp8wigbP+5vub9FDe
-						+dgfafv24r6+yU/Bsv6I+lJQomloEcCdWKkNK8V/BOoQ8n0HcEo4ukOzVwneA9sn
-						3wtMMAY5dByvsHaevxjfQljjBsRDKqyQN7x/2Gu67l38OEnWqRkgIUFKdzqBptDy
-						O4NgI6aQ0zjJGrOXBjEu/t9eerAoLeXr+LBY+bqp9UvzSLivb6j5IsXTqj67UivU
-						APqMC2lY3DF7z+vNwu4qgpFOOrEWZJy8AP8HrTBf2bqljem/2Q/lr5dPfNHkDo9f
-						qmmKEwIDAQABo20wazBKBgNVHREEQzBBghN3ZWJhdXRoLnNvdG9uLmFjLnVrhipo
-						dHRwczovL3dlYmF1dGguc290b24uYWMudWsvaWRwL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFKDUEPWk3MtQPCK0I9c6YmU4qbOhMA0GCSqGSIb3DQEBBQUAA4IBAQAXvdp3
-						MHQnqe5F0+rS71cPQpU3cM4tehQoDO1392rfxuYyAsTWDUfRRMIpagtRYpwJeUy9
-						cD6uhQwojjjE+lNrWCqIrIlI2Vu3Hb0CC3m11VlduKqRCBysQyOSH4zAH9a49d6Y
-						KWHHxbfrHzuE9v53RCNIVVU/h+zwMbZ7O6fBFeZYx/Rf4pt7kcvaoGE9kb3162kW
-						XstkUhyLjuJXIPWBlkWBjIbkFKmCFN4IHIi9nz/sqVvBnbHzr8Njk9YIf/lMx4Us
-						wHZNu7DWMxWh1OxdYrCJn8Sknnsy/EJABXPvMPsuq/6/4fBezlxYdgYDRE0w3tgB
-						HPqnW/Pnrm26uMgi
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.soton.ac.uk:8443/shibboleth-idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.soton.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">University of Southampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Southampton</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.soton.ac.uk/iss/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Serviceline</GivenName>
-    <EmailAddress>mailto:Serviceline@soton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Clayton</GivenName>
-    <SurName>Peters</SurName>
-    <EmailAddress>mailto:C.L.Peters@soton.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.umaryland.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.umaryland.edu-idp-shibboleth.xml
deleted file mode 100644
index acd4f18a..00000000
--- a/swamid-interfederations-2.0/webauth.umaryland.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,111 +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://webauth.umaryland.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">umaryland.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Maryland Baltimore</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The University of Maryland, Baltimore (UMB) is the State's public health, law and human services university devoted to excellence in professional and graduate education, research, patient care, and public service. As a diverse community of outstanding faculty, staff and students, and using state-of-the-art technological support, we educate leaders in health care delivery, biomedical science, global health, social work and the law. We emphasize interdisciplinary education and research in an atmosphere that explicitly values civility, diversity, collaboration, teamwork and accountability. By conducting internationally recognized research to cure disease and to improve the health, social functioning and just treatment of the people we serve, we foster economic development in the City, State, and nation. We are committed to ensuring that the knowledge we generate provides maximum benefit to society and directly enhances our various communities.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.umaryland.edu/cits/policies/privacy_policy.doc</mdui:PrivacyStatementURL>
-        <mdui:Logo height="89" width="340" xml:lang="en">https://directory.umaryland.edu/shibboleth/umblogo.gif</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>
-MIIDQDCCAiigAwIBAgIVAIJL3xlKBtxM29EgLG3uO45k3D/WMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFXdlYmF1dGgudW1hcnlsYW5kLmVkdTAeFw0xMjEwMjYx
-NjQ5MDRaFw0zMjEwMjYxNjQ5MDRaMCAxHjAcBgNVBAMTFXdlYmF1dGgudW1hcnls
-YW5kLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKA/GisjATA6
-jTXmT0yDRFjtBBpWz50qYpPpLJ5+QJEt26jTlztQRg3aimomjLyeMaSMrk6NaVd5
-MqUSDwhAW6lmhkkc7SK0DXSVNNmvd8BT60ZlNxYSNF3jAEjsgQu+o3+KWLkVPlY8
-njCUvGh3+Gg7eTULf66UfM5oRgHYaonWBzd2Ayx3sxFD6HTupfC0o/MmXyJsnuOV
-hAzKp1x52fDndYDvA7ki7+z/RCgYYTNsgwjp+1preNQeJfIXwTr9bOpkvLx4v4ij
-8lDTWDtsxvq3WyZNrAHTJoEaKym6AeoloDTtNXIHWl99Z8OIhJVJdBSjQaE8580m
-BuinQ/3GWJECAwEAAaNxMG8wTgYDVR0RBEcwRYIVd2ViYXV0aC51bWFyeWxhbmQu
-ZWR1hixodHRwczovL3dlYmF1dGgudW1hcnlsYW5kLmVkdS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUcjvwyPv4suKIR1/ISJTsDvddPYcwDQYJKoZIhvcNAQEFBQAD
-ggEBAEN+MsMdV4cUYWfF8WQTgD5U1wnkB/7Ya11wvsRA2ycFo3XIGXnfiN/nAdd9
-3QVzjeXy5Eck2hL6O4b7jBXhaC6V58HdskSKEQv1pV5g0Uc9umXfeI2qwGgiDG+/
-AYp5sQfEOR2iqm2fFOcg8jHY0rA6x+TaSG4HPxNGyPUMr++lB7/GVveOtApbiUy1
-oy9sjvoB6Q2spGvKL9ztGS7DArQ5vmppu/cW6KLyKxvlex0l2eqSLc6ykbmmsZfS
-C3tP4wi5CZgqM/Ak34O9PntDHTUgXUUmK0TAXJqXwsRffYByDJFXlNgTQWLiYf5e
-pnBcdqtVQcuIV+E+RUNLcxS0b5w=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umaryland.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umaryland.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.umaryland.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.umaryland.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.umaryland.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.umaryland.edu/idp/profile/Shibboleth/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">umaryland.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDQDCCAiigAwIBAgIVAIJL3xlKBtxM29EgLG3uO45k3D/WMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFXdlYmF1dGgudW1hcnlsYW5kLmVkdTAeFw0xMjEwMjYx
-NjQ5MDRaFw0zMjEwMjYxNjQ5MDRaMCAxHjAcBgNVBAMTFXdlYmF1dGgudW1hcnls
-YW5kLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKA/GisjATA6
-jTXmT0yDRFjtBBpWz50qYpPpLJ5+QJEt26jTlztQRg3aimomjLyeMaSMrk6NaVd5
-MqUSDwhAW6lmhkkc7SK0DXSVNNmvd8BT60ZlNxYSNF3jAEjsgQu+o3+KWLkVPlY8
-njCUvGh3+Gg7eTULf66UfM5oRgHYaonWBzd2Ayx3sxFD6HTupfC0o/MmXyJsnuOV
-hAzKp1x52fDndYDvA7ki7+z/RCgYYTNsgwjp+1preNQeJfIXwTr9bOpkvLx4v4ij
-8lDTWDtsxvq3WyZNrAHTJoEaKym6AeoloDTtNXIHWl99Z8OIhJVJdBSjQaE8580m
-BuinQ/3GWJECAwEAAaNxMG8wTgYDVR0RBEcwRYIVd2ViYXV0aC51bWFyeWxhbmQu
-ZWR1hixodHRwczovL3dlYmF1dGgudW1hcnlsYW5kLmVkdS9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUcjvwyPv4suKIR1/ISJTsDvddPYcwDQYJKoZIhvcNAQEFBQAD
-ggEBAEN+MsMdV4cUYWfF8WQTgD5U1wnkB/7Ya11wvsRA2ycFo3XIGXnfiN/nAdd9
-3QVzjeXy5Eck2hL6O4b7jBXhaC6V58HdskSKEQv1pV5g0Uc9umXfeI2qwGgiDG+/
-AYp5sQfEOR2iqm2fFOcg8jHY0rA6x+TaSG4HPxNGyPUMr++lB7/GVveOtApbiUy1
-oy9sjvoB6Q2spGvKL9ztGS7DArQ5vmppu/cW6KLyKxvlex0l2eqSLc6ykbmmsZfS
-C3tP4wi5CZgqM/Ak34O9PntDHTUgXUUmK0TAXJqXwsRffYByDJFXlNgTQWLiYf5e
-pnBcdqtVQcuIV+E+RUNLcxS0b5w=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umaryland.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umaryland.edu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Maryland Baltimore</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Maryland Baltimore</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umaryland.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brian Coats</md:GivenName>
-    <md:EmailAddress>bscoats@umaryland.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Brent Nickles</md:GivenName>
-    <md:EmailAddress>brent@umaryland.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Brian Coats</md:GivenName>
-    <md:EmailAddress>bscoats@umaryland.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>help@umaryland.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.umass.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.umass.edu-idp-shibboleth.xml
deleted file mode 100644
index 3ffe129d..00000000
--- a/swamid-interfederations-2.0/webauth.umass.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,104 +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://webauth.umass.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">umass.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Massachusetts Amherst</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>
-MIIDCzCCAfOgAwIBAgIJAOlOLgIUKVQ4MA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMMEXdlYmF1dGgudW1hc3MuZWR1MB4XDTE1MDYxMTE0NDEyMFoXDTI1MDYwODE0
-NDEyMFowHDEaMBgGA1UEAwwRd2ViYXV0aC51bWFzcy5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCoMhmyJmOehl8dQmhXu8S2rA63negrnXxeLhYQ
-s9pxn1TN0o30r3VrSTKFKlUXa0Tl3igEYs4tcwh1WDejxFVHdHEE7yu5wiuLAtNE
-FBLrh4bbcNNKUI7piHq94/pY9yBdUU1WxAPrILmdQMwP9eodqxpwQe6qyU9yXpEO
-B8g9iO+lx+9vQTZ1T1dkxSHYPepkpt9fveAw77MM7sup0XeUOC4W60gw5Ij87u70
-jeBd0lAInU7qF0hqrzBlwJwxnPJg70TFxh9Ziok5+VhoVTHKi+c/tnJVllpyr6y2
-V6qcxyL4oLCl9w3luRyNMzgDlYnaDSGBwu+VYt4q0fFiuiwjAgMBAAGjUDBOMB0G
-A1UdDgQWBBQH4v/lIJActQtxTkeSBwEc+9/tpzAfBgNVHSMEGDAWgBQH4v/lIJAc
-tQtxTkeSBwEc+9/tpzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBb
-qhjPIEtB4sAT+O6lbItB4lz1OSnHowfSGIlPUKwS2JSktwEYsP4Ib54inQXooIr/
-UCAwIyWGe3gN0zPDMAg8/vZcwSkW3Aw24WKbe27uNHVc4EXnghMSbwro9LagNhcm
-NPBh63Pk9Gv7Re6v8GhKdzwgcWvYMuuB0sTT4sAnnBCk5cWKbq82MjhE6j8cFtft
-3VH91yvbHwgsHYlmfHdpcDmQD562uy6rfjnLGjfHAfBStCChBaKrdeH+zTeIjay4
-aS+HBnPJbqy6mvY0QGjDBsjELvRUs2UgCgq+/SItQAK3pT2aWh5xlD29Z3vxSPZB
-boJsiAVVlmU6bfxOdpHv
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umass.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webauth.umass.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.umass.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.umass.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.umass.edu/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umass.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDCzCCAfOgAwIBAgIJAOlOLgIUKVQ4MA0GCSqGSIb3DQEBCwUAMBwxGjAYBgNV
-BAMMEXdlYmF1dGgudW1hc3MuZWR1MB4XDTE1MDYxMTE0NDEyMFoXDTI1MDYwODE0
-NDEyMFowHDEaMBgGA1UEAwwRd2ViYXV0aC51bWFzcy5lZHUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCoMhmyJmOehl8dQmhXu8S2rA63negrnXxeLhYQ
-s9pxn1TN0o30r3VrSTKFKlUXa0Tl3igEYs4tcwh1WDejxFVHdHEE7yu5wiuLAtNE
-FBLrh4bbcNNKUI7piHq94/pY9yBdUU1WxAPrILmdQMwP9eodqxpwQe6qyU9yXpEO
-B8g9iO+lx+9vQTZ1T1dkxSHYPepkpt9fveAw77MM7sup0XeUOC4W60gw5Ij87u70
-jeBd0lAInU7qF0hqrzBlwJwxnPJg70TFxh9Ziok5+VhoVTHKi+c/tnJVllpyr6y2
-V6qcxyL4oLCl9w3luRyNMzgDlYnaDSGBwu+VYt4q0fFiuiwjAgMBAAGjUDBOMB0G
-A1UdDgQWBBQH4v/lIJActQtxTkeSBwEc+9/tpzAfBgNVHSMEGDAWgBQH4v/lIJAc
-tQtxTkeSBwEc+9/tpzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBb
-qhjPIEtB4sAT+O6lbItB4lz1OSnHowfSGIlPUKwS2JSktwEYsP4Ib54inQXooIr/
-UCAwIyWGe3gN0zPDMAg8/vZcwSkW3Aw24WKbe27uNHVc4EXnghMSbwro9LagNhcm
-NPBh63Pk9Gv7Re6v8GhKdzwgcWvYMuuB0sTT4sAnnBCk5cWKbq82MjhE6j8cFtft
-3VH91yvbHwgsHYlmfHdpcDmQD562uy6rfjnLGjfHAfBStCChBaKrdeH+zTeIjay4
-aS+HBnPJbqy6mvY0QGjDBsjELvRUs2UgCgq+/SItQAK3pT2aWh5xlD29Z3vxSPZB
-boJsiAVVlmU6bfxOdpHv
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://webauth.umass.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Massachusetts Amherst</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Massachusetts Amherst</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umass.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Identity Management</md:GivenName>
-    <md:EmailAddress>shibboleth@oit.umass.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Identity Management</md:GivenName>
-    <md:EmailAddress>shibboleth@oit.umass.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Identity Management</md:GivenName>
-    <md:EmailAddress>shibboleth@oit.umass.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>security@oit.umass.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.uncc.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webauth.uncc.edu-idp-shibboleth.xml
deleted file mode 100644
index e89bcaf1..00000000
--- a/swamid-interfederations-2.0/webauth.uncc.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,71 +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://webauth.uncc.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://webauth.uncc.edu/error.html" 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">uncc.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of North Carolina At Charlotte</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for University of North Carolina at Charlotte.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://webauth.uncc.edu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://legal.uncc.edu/website-use-policies/privacy-statement</mdui:PrivacyStatementURL>
-        <mdui:Logo height="56" width="128" xml:lang="en">https://www.uncc.edu/sites/all/themes/unccedu/logo.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>
-MIIDKzCCAhOgAwIBAgIUE9Q+gC5nxV1laEjS/0Wz6pcH+RQwDQYJKoZIhvcNAQEF
-BQAwGzEZMBcGA1UEAxMQd2ViYXV0aC51bmNjLmVkdTAeFw0xNDA1MDYxNzQxNDJa
-Fw0zNDA1MDYxNzQxNDJaMBsxGTAXBgNVBAMTEHdlYmF1dGgudW5jYy5lZHUwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCPA7pMdoQeaLMV2OLrePUxY9p4
-gAHGqMpUruERe0+2/tg2AvL98eGHMaJ7Oijr9R4RuYONR5WoQc8if36bZ5XP1i7M
-EDq1MLA2BPWrX8b366AG0wjIOlCreimCSQ3zATSICW6i6pNwvJe3KqNKOxK+PWwo
-wX3BiOSYQX2ASmIzKuM5yyjNrlwcx2jAPDu86e0oEiS4CuT0D3Y99cWy/+FGN2uE
-jrX/JuGWL2EOSthtVKT8qjYg4G7yXL4UobbG+LE3oOgk+fZG39sQK/a50VIhHAlG
-nS9C6B/2rvjX9h2RfrT2LIE7vhLqAtmt9C9O0k5CbniZHTQyHzilFvVmaPvLAgMB
-AAGjZzBlMEQGA1UdEQQ9MDuCEHdlYmF1dGgudW5jYy5lZHWGJ2h0dHBzOi8vd2Vi
-YXV0aC51bmNjLmVkdS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUQKVbWSA/8qLr
-pVyyPD+QGdlRE6QwDQYJKoZIhvcNAQEFBQADggEBAAqC3iIjFCbFr8f6YnMZml6f
-lwi4lUgeRafI2rOq26x3D2/V1HMDAT1INgy950E7ChakXMKG691ee3a00j02P0I1
-eoJcrDRHrbt9fzobxOyhzU2qpaTZjMDTFD/du9GERjsz4TXRZcCvArOL7i1S8qWd
-+YDKvUr8y3UqFfJD+hvH+/dyGiKWOTFpr6ac0lS7ofTOb7wTse1jHZyjEhR768jD
-uhC6wP1FE5HmACR4pPylxXJbvSLCKqLGmT8xYKb2VthIY4sBXIpQZ7C0FUn4p+bd
-Yv8S+IWg7U+XmXCrOaV03/kqASJCZW3gxtXJ3KKfsiH4tPfx3Wn3Msi03ZeVYMc=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.uncc.edu/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.uncc.edu/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webauth.uncc.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.uncc.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.uncc.edu/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webauth.uncc.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of North Carolina At Charlotte</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of North Carolina At Charlotte</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uncc.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Enterprise Web Services</md:GivenName>
-    <md:EmailAddress>EnterpriseWebServices-group@uncc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Enterprise Web Services</md:GivenName>
-    <md:EmailAddress>EnterpriseWebServices-group@uncc.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Service Desk</md:GivenName>
-    <md:EmailAddress>help@uncc.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webauth.wfunet.wfu.edu-saml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/webauth.wfunet.wfu.edu-saml-saml2-idp-metadata.php.xml
deleted file mode 100644
index 7e4736dd..00000000
--- a/swamid-interfederations-2.0/webauth.wfunet.wfu.edu-saml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,68 +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://webauth.wfunet.wfu.edu/saml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">wfu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Wake Forest University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A collegiate university in Winston-Salem, North Carolina distinguished by small classes and faculty-student engagement.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.wfu.edu/</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>
-MIIDujCCAqICCQClvb4cN5x9LjANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMC
-VVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRYwFAYDVQQHEw1XaW5zdG9uLVNh
-bGVtMR8wHQYDVQQKExZXYWtlIEZvcmVzdCBVbml2ZXJzaXR5MRwwGgYDVQQLExNJ
-bmZvcm1hdGlvbiBTeXN0ZW1zMR8wHQYDVQQDExZ3ZWJhdXRoLndmdW5ldC53ZnUu
-ZWR1MB4XDTEwMTExMDE2MzkzNVoXDTIwMTEwNzE2MzkzNVowgZ4xCzAJBgNVBAYT
-AlVTMRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEWMBQGA1UEBxMNV2luc3Rvbi1T
-YWxlbTEfMB0GA1UEChMWV2FrZSBGb3Jlc3QgVW5pdmVyc2l0eTEcMBoGA1UECxMT
-SW5mb3JtYXRpb24gU3lzdGVtczEfMB0GA1UEAxMWd2ViYXV0aC53ZnVuZXQud2Z1
-LmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8Cy2FhWpoSUn4y
-/k5srv7ivlNn3SBgD9bf/fzmHj+eW2Xi+bmRN9EPV4Eq/Np2PhS56bnFzg5y9iCf
-Epd3ZIRwM/MeU6isPo7xn6g+zqhXBDdU0MnVA8R7bqCEAWP9XeJjcwsko2V2COCF
-1eQh8Na//nmgqe27MpxxzhqqqxksdaZRWueywKMZXb7/lA8VTQfG1pWEG/Mx/JHn
-q3AqK56CuRrVh7RLXUCioH1F+ZWFm0ePVWVWUBRdHceRe9XtCJ+s3p6whxaqqpPy
-vKo4EvaXHeYcw3Ng7Ko0FshFEbc0tRRZGMqzc1Xvmg4XPTa7Sy+jo4I8rXo/lx9q
-IELLnyMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAqKjgiPoStDJXeVeZTEPxu4+4
-wYbc3rQr0+HBlliyBjAfabY6kkaZYwD+3IODU0PHzfFBvna++2qT/x+W5S+THkJ+
-G0JHCsfzjNkrMHhq7oRZITALW0Lt9PLmLFMyQQN0L1V0OZ4yT0Cy3CaEazD9XyI6
-k7wZlbX+lnCbYnRT6c5Ay9q6riXxBOVYbzeecMkQ22+bTlAQGMVOxynVGGwQe4xs
-bRE/uhZ/zVFWLsdRji9vHMegVzyM2tLsi4NVpZU+7+HRlfpoCTfJ2kVcwTD7uo0s
-MdFwU7yHsWvE5KjlyUnbqen4zlzTnr7k+uEMAr2zEMMWhAe/Z5GXAfBnQ9jJbg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webauth.wfunet.wfu.edu/saml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webauth.wfunet.wfu.edu/saml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Wake Forest University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Wake Forest University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.wfu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IS SAML Admin</md:GivenName>
-    <md:EmailAddress>is-saml-admin@wfu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IS SAML Admin</md:GivenName>
-    <md:EmailAddress>is-saml-admin@wfu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Service Desk</md:GivenName>
-    <md:EmailAddress>help@wfu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml b/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml
deleted file mode 100644
index 67833e54..00000000
--- a/swamid-interfederations-2.0/webclass.uran.ua-shibboleth.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webclass.uran.ua/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://peano.uran.ua" registrationInstant="2015-03-15T11:05:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://peano.uran.ua/~eng/policy.htm</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webclass.uran.ua/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webclass.uran.ua/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">WEB-class</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Conference server and online learning system of PEANO federation</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://webclass.uran.ua/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://webclass.uran.ua/webclass_privacy_policy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://webclass.uran.ua/shibboleth</ds:KeyName>
-        <ds:KeyName>webclass.uran.ua</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIJAIE/TOjTP6h5MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHdlYmNsYXNzLnVyYW4udWEwHhcNMTUwMzEzMTQyOTE0WhcNMTgwMzEyMTQy
-OTE0WjAbMRkwFwYDVQQDExB3ZWJjbGFzcy51cmFuLnVhMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAykQQU5zDYaRiXs8NTHW9PSRz2JtrUgJC6GZoTgr6
-exC6CRPWvXPY9+Gbj4n7ASXWQOW04V6Sqie++iYNjq8hWLgKvY/gY9AykwtwzlxN
-hvE4WwCTplNbboPtBpRpOxXvrtqKMa7Y4lKQ4KKDxkCwaE2spE2Y5i62O7Y6uM8A
-ysaenWm3vhmlQMeMrgu6hIirORFXlctv1JXh7G6hM5PrAlxgnNrE46Jt07yOsq6p
-aY2iqXkJPVqF8fvCf4vuUpXV0J1SDcA7hzE8ePDHXYebFRR6N6fXi2XcgBzZMu4a
-9/5pKkJ0+KvZe20UcHJqQOZ8qGsZB9oGrYkfV8DRg8FapQIDAQABo2MwYTBABgNV
-HREEOTA3ghB3ZWJjbGFzcy51cmFuLnVhhiNodHRwczovL3dlYmNsYXNzLnVyYW4u
-dWEvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUp9tj8EP1CtFBOjRnZLMug1U6jbswDQYJ
-KoZIhvcNAQEFBQADggEBAEMWl5gaHzs2GtK5mWWF7+EdiCkrrZurG4G2PenIhXDT
-sjoGNWSO+ZdmxuPTMpWxPsCH3UtkTDDtscZ0lBnWC0lmxx2chf+0PTQddLp35j1s
-gBMv4fLtxAlBKDS0E7EulGBL+3j3Sp8l+2CLX2SSJED2whxY2b22h2nFtjdTMFV6
-qkHYLsLMUECsCuyBVC3sEnCyR/ZV0iXMLrXwmb1dY5oWev1WsO1bjtFTw+MjQ2uc
-54nKzfvAurdiaw0fmSiF/GTvuviifNLJiwYtQWcfJVIb1bCoQQwNPpWWkxFKbjc+
-3o/EQJNrHD5zELEvuKkmcc3+EqOT4ysmvAxLWrG0oT8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webclass.uran.ua/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webclass.uran.ua/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webclass.uran.ua/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webclass.uran.ua/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webclass.uran.ua/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webclass.uran.ua/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webclass.uran.ua/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webclass.uran.ua/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webclass.uran.ua/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webclass.uran.ua/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webclass.uran.ua/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">WEB-class</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Conference server and online learning system of PEANO federation</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="transientId" Name="urn:oid:1.2.3.4.5.6.7.8.9.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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">Association URAN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">URAN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uran.ua/~eng/frames.htm</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Yevhenii</md:GivenName>
-    <md:SurName>Preobrazhenskyi</md:SurName>
-    <md:EmailAddress>mailto:admins@uran.ua</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 e451000d..00000000
--- a/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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">
-      <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.swamid.se/category/research-and-education</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/nren-service</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</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 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>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblearn.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/weblearn.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 13b2be8e..00000000
--- a/swamid-interfederations-2.0/weblearn.ox.ac.uk-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://weblearn.ox.ac.uk/shibboleth">
-  <!--
-		This is a Weblearn Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://weblearn.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIJAN09ZW7wF+DGMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEXdlYmxlYXJuLm94LmFjLnVrMB4XDTEyMDEyMDE2MzY1MFoXDTIyMDExNzE2
-						MzY1MFowHDEaMBgGA1UEAxMRd2VibGVhcm4ub3guYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQC3LIZO1N6lP1r5+teOxfmGLNdEwXBzSOndeplc
-						Ih2/H6Z3MIerP2weWV/B9jUeDcYT9YGNFHkMRG2FTdHtvS0h/yC/TJOOKy37pqzM
-						NiwA1xmmIny/NPhGgIxnjqjAktvtwcGEflb0yoQKkKllA9lotmni6C8jb6PrCqeZ
-						YZEq/ficN0Y2fET7l6//Zstld7b6y2/v/CkU/Wy1On5AD5nrO9Ucolq91NnrZc4E
-						XqXHQK0SduW+Nb/0zUCX3nl5G0Q0dMbPtc08tTaODSwAt94ycTXwgZkeusVEMVbE
-						cS6ZrWHD+mW4nZdy5vgxNlI5ki9ALHbym0RBlW7VcETr1Hq3AgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEXdlYmxlYXJuLm94LmFjLnVrhiRodHRwczovL3dlYmxlYXJuLm94
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFB8DKsVAeiS3EpqWuj4eKj1oa8q0
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAb1I5WQNm7Ikoes6JkF4pteKR6ELZM9qOKFwwT
-						VSvZ3Dq0FRUYyB06DF/ZNodhvzBNT90N03gB63hNAOWJaW7CPb2d9ZaUG3kQj5ey
-						xCkdu5qs0qwvxzZ44zQgLiobRzjVX5tTQkAurKuGBexe53yvjrhDDnkyZznFwO/e
-						csdgyJtDrThEVyxzFgROfKepiy80V9+Z0kycDY13v1L+ijBcp1b+plj8poqQx4K5
-						Q+uqGo+bvKXrOuCtSWxgsNMNWPh1bMYZLv3P3k98OFJpPHT7yiJq9I+PxcVuQcXF
-						1z2NTzQyONeHUtg8j9A+hog2VXyv3vODtgIv3XG2cuT4fNTn
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://weblearn.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Weblearn</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oucs.ox.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Systems Development and Support</GivenName>
-    <EmailAddress>mailto:sysdev@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</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 849b0ebb..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,105 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://weblicht.sfs.uni-tuebingen.de">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-16T14:52: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>
-    <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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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>
-      <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>
+      <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>
+      <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:KeyName>weblicht.sfs.uni-tuebingen.de</ds:KeyName>
+      <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>
     </md:KeyDescriptor>
-    <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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">WebLicht</md:ServiceName>
+    <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:ServiceDescription xml:lang="de">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">CLARIN Federation Demonstrator: several linguistic webapplications at the SfS Tübingen</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="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="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="cn" Name="urn:oid:2.5.4.3" 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="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <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="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: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="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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>Department of Linguistics, General and Computational Linguistics</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+    <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>Department of Linguistics, General and Computational Linguistics</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:wladmin@sfs.uni-tuebingen.de</md:EmailAddress>
+    <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.albany.edu-shibboleth-idp2.xml b/swamid-interfederations-2.0/weblogin.albany.edu-shibboleth-idp2.xml
deleted file mode 100644
index b9a3bc6b..00000000
--- a/swamid-interfederations-2.0/weblogin.albany.edu-shibboleth-idp2.xml
+++ /dev/null
@@ -1,96 +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://weblogin.albany.edu/shibboleth/idp2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://wiki.albany.edu/x/A4ZvAg" 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">albany.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University At Albany, State University of New York</mdui:DisplayName>
-        <mdui:Logo height="150" width="203" xml:lang="en">https://maenad.csc.albany.edu/incommon/logo_A1_pms269-InCommon.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>
-MIIDODCCAiCgAwIBAgIVAKWha+CKTeinjttEcaqLm7fQSZLLMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3dlYmxvZ2luLmFsYmFueS5lZHUwHhcNMDkwMjExMTk1
-NDE0WhcNMjkwMjExMTk1NDE0WjAeMRwwGgYDVQQDExN3ZWJsb2dpbi5hbGJhbnku
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjAY1R6LqpUcsbpn3
-8AcJW/KtQTyVcdcHmkEeCdW3UNzd6ibmhRFcPVhXwY9Z8jAuHQLjIkPj4QuiaGXI
-lfRJBQkTnkWeGLrHCzZA7/eZ0uJxL+SBf84OiK2jSmLqw6xGAADE8GmcyBpTQe2d
-HDFDbLvsLc3UNs0U/WzIGEE5iPBd33UntVEYezO8vszjdKZr8r4ZRVTeSUe+qkgW
-19ncHiqrbPBT+5qK2j8PaCiFrOjc0ScnsqHkgxr5krBM//SGoFPc+2bClUtbF/ci
-wuNZ3RHxhkyxlwEwkhLyuhr9gpZDYH6mi/SKUXMcXdLBKev13ddXN3Is6JZxagXn
-qZv/cwIDAQABo20wazBKBgNVHREEQzBBghN3ZWJsb2dpbi5hbGJhbnkuZWR1hipo
-dHRwczovL3dlYmxvZ2luLmFsYmFueS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFC5IsCUVHd9dT/Q7onCX7ItOnehlMA0GCSqGSIb3DQEBBQUAA4IBAQBy+8+Q
-vnDnS010CWPNF76wHA24ka7cX4FsV/+nsUbxCtL9lundZdBfzqTquy5GuF3j96ej
-foXg0Vz9GOn/KtRDDCFz8Gym+8hZdvPQ/XOdxHW1kjb7EbbL/K8dLilUYR9B/IOZ
-AXr4j4M4Qrh3jyxoFP+a4QTkUj/9+bcDPmqwftxaRoUIGcmyRzUvwU5pl227UkNy
-nftVP/rsZZ6nr0wJBZfPbhiBDAuzamzI05QHB+sFskVXB6Z8h2KawwNSrjgc2poj
-QWzZNOuth932vN8p2Lc6iI5v5bC/QSDDBlZ7tl+Uj/ejZC9b9WG/y83RrM333twp
-Kq1D/QWBwg4oa9Zq
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.albany.edu:8444/idp2/profile/Artifact" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.albany.edu:8444/idp2/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.albany.edu/idp2/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.albany.edu/idp2/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.albany.edu/idp2/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">albany.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAKWha+CKTeinjttEcaqLm7fQSZLLMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3dlYmxvZ2luLmFsYmFueS5lZHUwHhcNMDkwMjExMTk1
-NDE0WhcNMjkwMjExMTk1NDE0WjAeMRwwGgYDVQQDExN3ZWJsb2dpbi5hbGJhbnku
-ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjAY1R6LqpUcsbpn3
-8AcJW/KtQTyVcdcHmkEeCdW3UNzd6ibmhRFcPVhXwY9Z8jAuHQLjIkPj4QuiaGXI
-lfRJBQkTnkWeGLrHCzZA7/eZ0uJxL+SBf84OiK2jSmLqw6xGAADE8GmcyBpTQe2d
-HDFDbLvsLc3UNs0U/WzIGEE5iPBd33UntVEYezO8vszjdKZr8r4ZRVTeSUe+qkgW
-19ncHiqrbPBT+5qK2j8PaCiFrOjc0ScnsqHkgxr5krBM//SGoFPc+2bClUtbF/ci
-wuNZ3RHxhkyxlwEwkhLyuhr9gpZDYH6mi/SKUXMcXdLBKev13ddXN3Is6JZxagXn
-qZv/cwIDAQABo20wazBKBgNVHREEQzBBghN3ZWJsb2dpbi5hbGJhbnkuZWR1hipo
-dHRwczovL3dlYmxvZ2luLmFsYmFueS5lZHUvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFC5IsCUVHd9dT/Q7onCX7ItOnehlMA0GCSqGSIb3DQEBBQUAA4IBAQBy+8+Q
-vnDnS010CWPNF76wHA24ka7cX4FsV/+nsUbxCtL9lundZdBfzqTquy5GuF3j96ej
-foXg0Vz9GOn/KtRDDCFz8Gym+8hZdvPQ/XOdxHW1kjb7EbbL/K8dLilUYR9B/IOZ
-AXr4j4M4Qrh3jyxoFP+a4QTkUj/9+bcDPmqwftxaRoUIGcmyRzUvwU5pl227UkNy
-nftVP/rsZZ6nr0wJBZfPbhiBDAuzamzI05QHB+sFskVXB6Z8h2KawwNSrjgc2poj
-QWzZNOuth932vN8p2Lc6iI5v5bC/QSDDBlZ7tl+Uj/ejZC9b9WG/y83RrM333twp
-Kq1D/QWBwg4oa9Zq
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.albany.edu:8444/idp2/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.albany.edu:8444/idp2/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University At Albany, State University of New York</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University At Albany, State University of New York</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.albany.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Bry-Ann Yates</md:GivenName>
-    <md:EmailAddress>byates@albany.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/weblogin.dante.net.xml b/swamid-interfederations-2.0/weblogin.dante.net.xml
deleted file mode 100644
index b66841e4..00000000
--- a/swamid-interfederations-2.0/weblogin.dante.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="http://weblogin.dante.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-01-23T14:41:31Z">
-      <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">
-    <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://weblogin.dante.net/adfs/ls/"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.dante.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://weblogin.dante.net/adfs/ls/" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://weblogin.dante.net/adfs/ls/" index="1"/>
-  </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/weblogin.uu.se-idp-shibboleth.xml b/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
deleted file mode 100644
index 04da9d51..00000000
--- a/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al2</saml:AttributeValue>
-      </saml: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:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.uu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.uu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://weblogin.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.uu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">user.uu.se</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala University</md:Company>
-    <md:SurName>SAML2 admins</md:SurName>
-    <md:EmailAddress>mailto:akka-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala University</md:Company>
-    <md:SurName>SAML2 admins</md:SurName>
-    <md:EmailAddress>mailto:akka-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
-  </md: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 5bfd5711..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 GÉANT 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">GÉANT Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GÉANT Intranet</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.geant.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>DANTE IT Support</GivenName>
-    <EmailAddress>mailto:itsupport@geant.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>DANTE IT</GivenName>
-    <EmailAddress>mailto:it@geant.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
deleted file mode 100644
index 8b3fabe7..00000000
--- a/swamid-interfederations-2.0/webproxysrv.uniarts.se-adfs-services-trust.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="http://webproxysrv.uniarts.se/adfs/services/trust">
-  <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>
-    <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniarts.se</shibmd:Scope>
-  </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">uniarts.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Stockholms konstnärliga högskola</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Stockholm University of the Arts</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för uniarts.se.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for uniarts.se.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://uniarts.se/om-skh</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uniarts.se/english/about-uniarts</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFUDCCBDigAwIBAgIQDjYX0Tt8ykO4l5acarpnTDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMjgwMDAwMDBaFw0xODExMDExMjAwMDBaMIGQMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xKzApBgNVBAoMIlN0b2NraG9sbXMga29uc3Ruw6RybGlnYSBow7Znc2tvbGExCzAJBgNVBAsTAklUMR8wHQYDVQQDExZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAph5zfUwm/ttNeSs235cO+bVcGVQN7KZ0fCNbrcdIIczu428JAWxQNtLXr1XFryearsfSCYMxTNxfL80so7f+h/wXh98GYI6l0oYKUxRBtWNPuaGPS1Zj8c8dP+rTur+n5B8Y+oi2lJZyUCpx37zsIDpnWWVmRf6AOH9a7NZ5TziA4NQKc7RhIPpGP1owtAEKUCwmxBLVdeTnKK0P76vHwKkmANRo2mpDh2KNGIWfCL92uapxZnJLnw139X4tK2+Y3e/B95VFLthmJaO39SyDg0Z5+tGbOM07O5az6Bxd0U+tyn50DgcDR+n1fXEnYKzZZ6RwXtAmfsKaxnILTxWkuQIDAQABo4IBzzCCAcswHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFHUjEnJ9NYIsk9drv73ycdYQMcAJMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHAYQ5i9Ruevq0Md4Y5DD7HIjyXfO8rG0iuSTN6og6w7Wnpz4ZgSp/EQfTG+bItV9CoiFlIDOSDMPwYSPeZNo2LPOuCfDtGs5eQWKOBR/3SBm6I8gqkpm1WR7Qr7DjX4Tdpp+GhLmygb/95p0jVCH86PFj67LvOKq1DnVossZ+WdxbnYyEviiXSTEcDsCBMKPSFKy8732SkncX76blNFGKaFtaLYsZg4nAVn39sPOGd1EzrZBq/FYxKlteWKyJRR919W/qi15UbMUx4cvHjjWrXwoHWSatlSu9qKG68blkseUmtN/YQAQh9JyynE0Y/ovNLEs7wKi1X5O/KnSahXUg4=</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>MIIFUDCCBDigAwIBAgIQDjYX0Tt8ykO4l5acarpnTDANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJQW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wgQ0EgMzAeFw0xNTEwMjgwMDAwMDBaFw0xODExMDExMjAwMDBaMIGQMQswCQYDVQQGEwJTRTESMBAGA1UECBMJU3RvY2tob2xtMRIwEAYDVQQHEwlTdG9ja2hvbG0xKzApBgNVBAoMIlN0b2NraG9sbXMga29uc3Ruw6RybGlnYSBow7Znc2tvbGExCzAJBgNVBAsTAklUMR8wHQYDVQQDExZ3ZWJwcm94eXNydi51bmlhcnRzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAph5zfUwm/ttNeSs235cO+bVcGVQN7KZ0fCNbrcdIIczu428JAWxQNtLXr1XFryearsfSCYMxTNxfL80so7f+h/wXh98GYI6l0oYKUxRBtWNPuaGPS1Zj8c8dP+rTur+n5B8Y+oi2lJZyUCpx37zsIDpnWWVmRf6AOH9a7NZ5TziA4NQKc7RhIPpGP1owtAEKUCwmxBLVdeTnKK0P76vHwKkmANRo2mpDh2KNGIWfCL92uapxZnJLnw139X4tK2+Y3e/B95VFLthmJaO39SyDg0Z5+tGbOM07O5az6Bxd0U+tyn50DgcDR+n1fXEnYKzZZ6RwXtAmfsKaxnILTxWkuQIDAQABo4IBzzCCAcswHwYDVR0jBBgwFoAUZ/2IIBQnmMcJ0iUZu+lREWN1UGIwHQYDVR0OBBYEFHUjEnJ9NYIsk9drv73ycdYQMcAJMCEGA1UdEQQaMBiCFndlYnByb3h5c3J2LnVuaWFydHMuc2UwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vVEVSRU5BU1NMQ0EzLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL1RFUkVOQVNTTENBMy5jcmwwTAYDVR0gBEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAIBgZngQwBAgIwbgYIKwYBBQUHAQEEYjBgMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wOAYIKwYBBQUHMAKGLGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9URVJFTkFTU0xDQTMuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQELBQADggEBAHAYQ5i9Ruevq0Md4Y5DD7HIjyXfO8rG0iuSTN6og6w7Wnpz4ZgSp/EQfTG+bItV9CoiFlIDOSDMPwYSPeZNo2LPOuCfDtGs5eQWKOBR/3SBm6I8gqkpm1WR7Qr7DjX4Tdpp+GhLmygb/95p0jVCH86PFj67LvOKq1DnVossZ+WdxbnYyEviiXSTEcDsCBMKPSFKy8732SkncX76blNFGKaFtaLYsZg4nAVn39sPOGd1EzrZBq/FYxKlteWKyJRR919W/qi15UbMUx4cvHjjWrXwoHWSatlSu9qKG68blkseUmtN/YQAQh9JyynE0Y/ovNLEs7wKi1X5O/KnSahXUg4=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="E-Mail Address" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Given Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="UPN" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Common Name" Name="http://schemas.xmlsoap.org/claims/CommonName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x E-Mail Address" Name="http://schemas.xmlsoap.org/claims/EmailAddress" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group" Name="http://schemas.xmlsoap.org/claims/Group" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="AD FS 1.x UPN" Name="http://schemas.xmlsoap.org/claims/UPN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Role" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Surname" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="PPID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Name ID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication time stamp" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication method" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only group SID" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Deny only primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary group SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Primary SID" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Windows account name" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Is Registered User" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/isregistereduser" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device Identifier" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/identifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device Registration Identifier" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/registrationid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device Registration DisplayName" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device OS type" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ostype" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Device OS Version" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/osversion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Is Managed Device" Name="http://schemas.microsoft.com/2012/01/devicecontext/claims/ismanaged" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Forwarded Client IP" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-forwarded-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Client Application" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-application" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Client User Agent" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-user-agent" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Client IP" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-client-ip" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Endpoint Path" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-endpoint-absolute-path" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Proxy" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/x-ms-proxy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Application Identifier" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/relyingpartytrustid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Application policies" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/applicationpolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authority Key Identifier" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/authoritykeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Basic Constraint" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/basicconstraints" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Enhanced Key Usage" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/eku" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Issuer" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuer" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Issuer Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/issuername" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Key Usage" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/keyusage" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Not After" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notafter" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Not Before" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/notbefore" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Certificate Policies" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatepolicy" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Public Key" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/rsa" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Certificate Raw Data" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/rawdata" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Subject Alternative Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/san" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Serial Number" Name="http://schemas.microsoft.com/ws/2008/06/identity/claims/serialnumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Signature Algorithm" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/signaturealgorithm" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Subject" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subject" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Subject Key Identifier" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/subjectkeyidentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Subject Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/subjectname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="V2 Template Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplateinformation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="V1 Template Name" Name="http://schemas.microsoft.com/2012/12/certificatecontext/extension/certificatetemplatename" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Thumbprint" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/thumbprint" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="X.509 Version" Name="http://schemas.microsoft.com/2012/12/certificatecontext/field/x509version" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Inside Corporate Network" Name="http://schemas.microsoft.com/ws/2012/01/insidecorporatenetwork" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Password Expiration Time" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationtime" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Password Expiration Days" Name="http://schemas.microsoft.com/ws/2012/01/passwordexpirationdays" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Update Password URL" Name="http://schemas.microsoft.com/ws/2012/01/passwordchangeurl" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Authentication Methods References" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Client Request ID" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="Alternate Login ID" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" FriendlyName="eduPersonScopedAffiliation" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en-US">Stockholms konstnärliga högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en-US">Stockholms konstnärliga högskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en-US">http://www.uniarts.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Lars</md:GivenName>
-    <md:SurName>Lind</md:SurName>
-    <md:EmailAddress>mailto:itsupport@uniarts.se</md:EmailAddress>
-    <md:TelephoneNumber>+46(0)849400220</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webshop.rz.uni-wuerzburg.de.xml b/swamid-interfederations-2.0/webshop.rz.uni-wuerzburg.de.xml
deleted file mode 100644
index 6f74758f..00000000
--- a/swamid-interfederations-2.0/webshop.rz.uni-wuerzburg.de.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://webshop.rz.uni-wuerzburg.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>webshop.rz.uni-wuerzburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=webshop.rz.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEzCCA/ugAwIBAgIEEDlpOTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTEwMDYxNzA5MzIyNVoXDTE1MDYxNjA5MzIyNVowbDELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xJDAiBgNVBAMTG3dlYnNob3AucnoudW5pLXd1ZXJ6YnVyZy5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALN575+C0sepcARoGYIT9zSB
-KYSkB6Ru6AKv3lvzhxMOJqOClAW6RUNkBafdMMHvibuVYrHlYleG5NiN3H7Y26S7
-fLR2BFKbL05rXq/caqXc2aq/6HJVoNacJixT3skCAnfF5WHIEGq6BmSVIpiPtzAw
-xX3K2+8L3+TrQzOuGlTjsne2INgjnKBZHG0Wr2R5KjKzkmbtx3hd4r3soIlbeoMZ
-/g5mE2zbnLYpWxCENW/HHC/lCuuuRCY2jGlNp8kCPsoZbA4lVZv7wbTZytCSSxnF
-eyonLhS3da1Ujnht/qE5qo07aZnqfIxXRTKiE27vHkTLX9sn7fLKIVJS6dSG/AMC
-AwEAAaOCAbswggG3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUjL44In40oyoDIV47udhKE5q0
-s6wwHwYDVR0jBBgwFoAUfR+oQPam9jJOgeX4MgvDbSvEM24wJAYDVR0RBB0wG4EZ
-b3JkZXJAcnoudW5pLXd1ZXJ6YnVyZy5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4
-oDagNIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHViL2NybC9j
-YWNybC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-QgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAAtqDQy6lwnNm
-Q5sWZeEK1r7TTaSFnCa8PYcl8QhttybQMoX7hfcAsbmgBza/66VStCabephMjlyd
-I0fcD1d3Opc+m7LwMjcslVa0VMq7a4iQontbkizWFkkkGYPDItmVYOCK8fypiBOR
-uLmrTrogyQErV1PqCBlifJJOatE+nJk6X84rNd3qDpTSaHK0sjOPhnQVQdvRUcnD
-zTb9MMXYIOqrER5J7pC3oQuwC/Rc+CWTK/qZF/FF0BBVLtJK1SP+umKwDitOMOz5
-cStKE2ulSCoSH0jMmhp516knF/OIeqFuHgMMMRqqxAypuLAVbSlFhuZ25mUDngxC
-Z8hLHkleuQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>webshop.rz.uni-wuerzburg.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=webshop.rz.uni-wuerzburg.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFEzCCA/ugAwIBAgIEEDlpOTANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTEwMDYxNzA5MzIyNVoXDTE1MDYxNjA5MzIyNVowbDELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xJDAiBgNVBAMTG3dlYnNob3AucnoudW5pLXd1ZXJ6YnVyZy5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALN575+C0sepcARoGYIT9zSB
-KYSkB6Ru6AKv3lvzhxMOJqOClAW6RUNkBafdMMHvibuVYrHlYleG5NiN3H7Y26S7
-fLR2BFKbL05rXq/caqXc2aq/6HJVoNacJixT3skCAnfF5WHIEGq6BmSVIpiPtzAw
-xX3K2+8L3+TrQzOuGlTjsne2INgjnKBZHG0Wr2R5KjKzkmbtx3hd4r3soIlbeoMZ
-/g5mE2zbnLYpWxCENW/HHC/lCuuuRCY2jGlNp8kCPsoZbA4lVZv7wbTZytCSSxnF
-eyonLhS3da1Ujnht/qE5qo07aZnqfIxXRTKiE27vHkTLX9sn7fLKIVJS6dSG/AMC
-AwEAAaOCAbswggG3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUjL44In40oyoDIV47udhKE5q0
-s6wwHwYDVR0jBBgwFoAUfR+oQPam9jJOgeX4MgvDbSvEM24wJAYDVR0RBB0wG4EZ
-b3JkZXJAcnoudW5pLXd1ZXJ6YnVyZy5kZTB9BgNVHR8EdjB0MDigNqA0hjJodHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY3JsL2NhY3JsLmNybDA4
-oDagNIYyaHR0cDovL2NkcDIucGNhLmRmbi5kZS91bml3dWUtY2EvcHViL2NybC9j
-YWNybC5jcmwwgZgGCCsGAQUFBwEBBIGLMIGIMEIGCCsGAQUFBzAChjZodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-QgYIKwYBBQUHMAKGNmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1
-Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAAtqDQy6lwnNm
-Q5sWZeEK1r7TTaSFnCa8PYcl8QhttybQMoX7hfcAsbmgBza/66VStCabephMjlyd
-I0fcD1d3Opc+m7LwMjcslVa0VMq7a4iQontbkizWFkkkGYPDItmVYOCK8fypiBOR
-uLmrTrogyQErV1PqCBlifJJOatE+nJk6X84rNd3qDpTSaHK0sjOPhnQVQdvRUcnD
-zTb9MMXYIOqrER5J7pC3oQuwC/Rc+CWTK/qZF/FF0BBVLtJK1SP+umKwDitOMOz5
-cStKE2ulSCoSH0jMmhp516knF/OIeqFuHgMMMRqqxAypuLAVbSlFhuZ25mUDngxC
-Z8hLHkleuQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webshop.rz.uni-wuerzburg.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Würzburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Rechenzentrum Uni Würzburg Webshop</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-wuerzburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Hartmut</GivenName>
-    <SurName>Plehn</SurName>
-    <EmailAddress>serverzertifikate@rz.uni-wuerzburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Christian</GivenName>
-    <SurName>Rossa</SurName>
-    <EmailAddress>leitung@rz.uni-wuerzburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webso.iup.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/webso.iup.edu-idp-shibboleth.xml
deleted file mode 100644
index 10bc8f02..00000000
--- a/swamid-interfederations-2.0/webso.iup.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,70 +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://webso.iup.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</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">iup.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Indiana University of Pennsylvania</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.iup.edu/itsupportcenter/howto.aspx?id=70227</mdui:InformationURL>
-        <mdui:Logo height="110" width="83" xml:lang="en">https://webso.iup.edu/images/iup_mdui.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>
-MIIDIDCCAgigAwIBAgIVAOTnWFQvSD+86kNUXPzAVSUthutDMA0GCSqGSIb3DQEB
-BQUAMBgxFjAUBgNVBAMTDXdlYnNvLml1cC5lZHUwHhcNMDkwMzA1MTMzMzQ3WhcN
-MjkwMzA1MTMzMzQ3WjAYMRYwFAYDVQQDEw13ZWJzby5pdXAuZWR1MIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo/szDgQIthWA2E9+3epEVghO9Ra9IMPh
-yVNe49ySqX45DCRXrCaIBRvvtztZMIyVGf2sNQuqkjWmJSBVBS4gC0Ix/dQbANa9
-EDUBOw7MCpv6Vuu7Cn2DW5hclk1T59LC5h8R6X+aV4QlA17rH8Trf2hJppGQH8fx
-hGvvldoOIWDNE+gqSpg7SkAmRnO275T/9TCElKMfimvICZ5+arbtpD+90X8KJc9b
-VhKjxPSYnpS0dl5gIqOezDuq9HUGkvFKALjPXLoo+KAZswtQ1/2OxTk4R0HzvMKe
-Fhu9vVh9uy9o6T8GZxCEa3b/SuaBbu7/W0lLAm8e4x6HhpXVc4yQIwIDAQABo2Ew
-XzA+BgNVHREENzA1gg13ZWJzby5pdXAuZWR1hiRodHRwczovL3dlYnNvLml1cC5l
-ZHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGqp/vyzsQxjEPSn3gmUh4hULruJ
-MA0GCSqGSIb3DQEBBQUAA4IBAQAZlp4ngiYj13Pq5TQ9pGmHAFEYS1onqsYtNBCa
-lX7M3ZU8or02ZkPfsURQEbczknsu+VU58ak789aEkM3+DjAhYQoTknzaalWuRFHH
-2FdTFfJ/aHNPHtIymWWkIaZhT7mBRAp/0pdEl4Sul7s3MrBc7k7dsPOlRxFx2iHP
-E1FPQQZOlPKXXqbtsD8dPE6/05AKTAL2VzlX0DmM9bJSRjuyynjG/D9DGOueC2LM
-JC0OdrACruIN43LmFSS/ll4Y68if3BdC2oS97FaAb6yjdPxfSWKiOej/0+LSrZww
-6mcl5+FgTKV8i5U1jSa7iuj4KQ+wwOluYy+5qz2M4xPk9g09
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://webso.iup.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webso.iup.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webso.iup.edu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webso.iup.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Indiana University of Pennsylvania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Indiana University of Pennsylvania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.iup.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Paul Grieggs</md:GivenName>
-    <md:EmailAddress>pmgriegg@iup.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Craig Pluchinsky</md:GivenName>
-    <md:EmailAddress>tsc-sysadmin@iup.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Craig Pluchinsky</md:GivenName>
-    <md:EmailAddress>craigp@iup.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/websso.pomona.edu-.xml b/swamid-interfederations-2.0/websso.pomona.edu-.xml
deleted file mode 100644
index bdc69dc0..00000000
--- a/swamid-interfederations-2.0/websso.pomona.edu-.xml
+++ /dev/null
@@ -1,110 +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://websso.pomona.edu/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/research-and-scholarship</saml:AttributeValue>
-      </saml: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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="http://www.pomona.edu/bad_request" 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">pomona.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Pomona College</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Pomona College Shibboleth IdP</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://its.pomona.edu/about/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.pomona.edu/administration/privacy/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="125" width="300" xml:lang="en">https://community.pomona.edu/image/2013-design-update/logo-new.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>
-MIIDRDCCAiygAwIBAgIVAO9nGE8c+lQhK2F0lPJxljFyJ4EzMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFmNhczEuY2FtcHVzLnBvbW9uYS5lZHUwHhcNMTMxMjE3
-MjE0MTAxWhcNMzMxMjE3MjE0MTAxWjAhMR8wHQYDVQQDExZjYXMxLmNhbXB1cy5w
-b21vbmEuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4MQ9hIX
-5FR80OVIOVg8nDrwy8TAQiQusnKNggf7g+aH+E6LZaABVKqOisIao0bQJCSgSjVX
-3HHo7a8H6KZzs5CQNJEe6Hw4lRx4BoZJ4PneLjIZCh1lkpSL+fFTqyqGbo56Oe+X
-yP9K54GdokcCGcqefYYGpsSmOczdRz85vz7jvXjnwCfJV4+6r5U04xaXNu451aWe
-mFYuJ690BJ12A7E/VOc9vNqX3VoEIUTRYOup5tB7T7BVVyoluNwZMuvA+8He/8LZ
-p5z7K8qlIRE/2uo7QgzBVBuJwnLdl0+h1srU6Hle/6SQ4GDZ4ANC40HdmUV8Bs4P
-DuYVeMVnECAwVQIDAQABo3MwcTBQBgNVHREESTBHghZjYXMxLmNhbXB1cy5wb21v
-bmEuZWR1hi1odHRwczovL2NhczEuY2FtcHVzLnBvbW9uYS5lZHUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFKgbAPNzVng01H8rnvHcIWjiltBkMA0GCSqGSIb3DQEB
-BQUAA4IBAQAL1qw9bWxTA6YByua5jNnDrlz12fyfoOQjYenhhqVsnV8zaXLRh6g/
-anp0Rlg2VWr3r2dv+cRvTJ98cTd4aZg9k9SYvAfsH2IEcAC5ztt+ufAnHrJG9eJt
-YXiCUNJHG/tekuPsl2lcgL6oREFVsx8LCwH62qeWKBDmOxuzJG1miaDDfgWjXmuZ
-jMW6DSKHP7nPB+TVqHV21WnrhlVqcWbXSpzRMemw+zcnbCemcPpLcm1gPyyTcWxY
-JAIZ5JbZfzs6DKluH3EJomGA7QTN7nwEYwEN/WUoCPfToQrmtQn9ycaSKru8cxS5
-nh1jiNEqWZbGOpO4My5jVY+FG0TRRRQE
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas1.campus.pomona.edu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cas1.campus.pomona.edu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cas1.campus.pomona.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cas1.campus.pomona.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cas1.campus.pomona.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pomona.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAO9nGE8c+lQhK2F0lPJxljFyJ4EzMA0GCSqGSIb3DQEB
-BQUAMCExHzAdBgNVBAMTFmNhczEuY2FtcHVzLnBvbW9uYS5lZHUwHhcNMTMxMjE3
-MjE0MTAxWhcNMzMxMjE3MjE0MTAxWjAhMR8wHQYDVQQDExZjYXMxLmNhbXB1cy5w
-b21vbmEuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4MQ9hIX
-5FR80OVIOVg8nDrwy8TAQiQusnKNggf7g+aH+E6LZaABVKqOisIao0bQJCSgSjVX
-3HHo7a8H6KZzs5CQNJEe6Hw4lRx4BoZJ4PneLjIZCh1lkpSL+fFTqyqGbo56Oe+X
-yP9K54GdokcCGcqefYYGpsSmOczdRz85vz7jvXjnwCfJV4+6r5U04xaXNu451aWe
-mFYuJ690BJ12A7E/VOc9vNqX3VoEIUTRYOup5tB7T7BVVyoluNwZMuvA+8He/8LZ
-p5z7K8qlIRE/2uo7QgzBVBuJwnLdl0+h1srU6Hle/6SQ4GDZ4ANC40HdmUV8Bs4P
-DuYVeMVnECAwVQIDAQABo3MwcTBQBgNVHREESTBHghZjYXMxLmNhbXB1cy5wb21v
-bmEuZWR1hi1odHRwczovL2NhczEuY2FtcHVzLnBvbW9uYS5lZHUvaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFKgbAPNzVng01H8rnvHcIWjiltBkMA0GCSqGSIb3DQEB
-BQUAA4IBAQAL1qw9bWxTA6YByua5jNnDrlz12fyfoOQjYenhhqVsnV8zaXLRh6g/
-anp0Rlg2VWr3r2dv+cRvTJ98cTd4aZg9k9SYvAfsH2IEcAC5ztt+ufAnHrJG9eJt
-YXiCUNJHG/tekuPsl2lcgL6oREFVsx8LCwH62qeWKBDmOxuzJG1miaDDfgWjXmuZ
-jMW6DSKHP7nPB+TVqHV21WnrhlVqcWbXSpzRMemw+zcnbCemcPpLcm1gPyyTcWxY
-JAIZ5JbZfzs6DKluH3EJomGA7QTN7nwEYwEN/WUoCPfToQrmtQn9ycaSKru8cxS5
-nh1jiNEqWZbGOpO4My5jVY+FG0TRRRQE
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cas1.campus.pomona.edu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Pomona College</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Pomona College</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.pomona.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Abbie Lennox</md:GivenName>
-    <md:EmailAddress>abeba.lennox@pomona.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Abbie Lennox</md:GivenName>
-    <md:EmailAddress>abeba.lennox@pomona.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>Abbie Lennox</md:GivenName>
-    <md:EmailAddress>abeba.lennox@pomona.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Pomona ITS</md:GivenName>
-    <md:EmailAddress>ServiceDesk@pomona.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.xml b/swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.xml
deleted file mode 100644
index 780082e7..00000000
--- a/swamid-interfederations-2.0/webteam-stg.twig-world.com-shibboleth-sp.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://webteam-stg.twig-world.com/shibboleth-sp">
-  <!--
-		This is a "Web Team Staging" Shibboleth SP for Twig World 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-08-07T12:14:48Z">
-      <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://webteam-stg.twig-world.com/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://webteam-stg.twig-world.com/Shibboleth.sso/shibtest"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIJALXTHCbfgCS8MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGndlYnRlYW0tc3RnLnR3aWctd29ybGQuY29tMB4XDTE0MDgwNjEwMzYwOFoX
-						DTI0MDgwMzEwMzYwOFowJTEjMCEGA1UEAxMad2VidGVhbS1zdGcudHdpZy13b3Js
-						ZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4OCFhW7johUxf
-						Fy7AifqG8vfGzzBCyvfswAUgFVUlKf3RWX34iXCq41lin+nwBgoyb7rcTpfy7tSZ
-						+fwcFc1WVQ+uvpRrN6qEsqCsGhD8LS9H7Wq1bSpquUhOi6D36Iy6mk2nQyxEmolG
-						o8v53xI2WWj70tzfyZc0DVA19uIJLzUJZacKEvxzIpExLfFmuDwteTjmn+KWuiuG
-						bF0S2POzTxhkpDE8gVDy4q5yrOL78wjU17a0kGSq0gBMu3GwXA42CpNnRw+NTnhX
-						28QstYfUa30otWlnfCdytnQtMKfoDktvIIp9tfpLH3SU7RJblqQpN23DfGdAYZon
-						q6iM5xmlAgMBAAGjejB4MFcGA1UdEQRQME6CGndlYnRlYW0tc3RnLnR3aWctd29y
-						bGQuY29thjBodHRwczovL3dlYnRlYW0tc3RnLnR3aWctd29ybGQuY29tL3NoaWJi
-						b2xldGgtc3AwHQYDVR0OBBYEFMOoBiGzHjejkj5Sw1kETc3xV6fVMA0GCSqGSIb3
-						DQEBBQUAA4IBAQBT9q8vClGHr0KgQcM/hwo3Jjh/dPo9B2Bw8+6UJKLtpd8bIzaZ
-						lpCHHfEHyRZtxuBU4uI25ciDnkzYZYKBvsT4ZNN/A499+7fUVJrT2cI/mrVjoEy5
-						V2RsqTwT/NZt+eXTKzRAFq9VFLAMlIJ8vpSZJPvbbLHA6eG3juis837D+hgVDvRg
-						gLGUzyNQ6stXTg7VeD1N1QJe6U2133hWwrdoTsvyU89LpTYh3HwHBr8cb+eeq/yQ
-						9GXpkmbBiiE1ND5VcU9SaEgQk98BnTNN88f2jH6ATtPl5AmFHozBuiZVzG7dEVgI
-						0xbtTIvqLbzy305vFXaMQEmBOi5iaPTKkpIp
-					</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://webteam-stg.twig-world.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webteam-stg.twig-world.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Twig World Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Web Team Staging Shibboleth SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.twig-world.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Munn</SurName>
-    <EmailAddress>mailto:dmunn@twig-world.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Munn</SurName>
-    <EmailAddress>mailto:dmunn@twig-world.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/webtut.fccn.pt.xml b/swamid-interfederations-2.0/webtut.fccn.pt.xml
deleted file mode 100644
index 48f5785a..00000000
--- a/swamid-interfederations-2.0/webtut.fccn.pt.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://webtut.fccn.pt">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.fccn.pt"/>
-    <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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">WebTUT Service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt">Serviço WebTUT</mdui:DisplayName>
-        <mdui:Description xml:lang="en">WebRTC in context example application</mdui:Description>
-        <mdui:Description xml:lang="pt">Aplicação exemplo de uso da tecnologia WebRTC</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>
-MIIC7jCCAdYCCQD02c5n0jI2ODANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJQ
-VDERMA8GA1UECgwIRkNUfEZDQ04xFzAVBgNVBAMMDndlYnR1dC5mY2NuLnB0MB4X
-DTE2MDEyODE2MzMzN1oXDTE5MDEyNzE2MzMzN1owOTELMAkGA1UEBhMCUFQxETAP
-BgNVBAoMCEZDVHxGQ0NOMRcwFQYDVQQDDA53ZWJ0dXQuZmNjbi5wdDCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6KyuPJZKpaG1JSUZBh+sTBNB8BzwGZ
-9nXggSgYMc1bSijzbcDeUThF/76Qxdd8UnA2Fed806F+eajyVHDAIb28YIyAGncX
-VnjmryBzVPlIxe1FusR4pFvVaaGWr+DhgasoQYeQmFkmLhNPYOyU8GSA38zrOWrO
-LirZ26HqiSsFX3R2HWbILPwqJX/8nD1qcsV0ZEnOLUhxvQ2O8n9slkwinXZgAtyB
-eoDM6KRMoayUzOvJggvASEzs32/g/0TxZcFF6nJGZPjMRDZfqqEsigtVYIWpvJ/W
-Po7OnvYhtSlS88uV4cVdOAoorXJoTs8yafDNLovyeUvS7y54w5AHLUsCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAL88GMPpWdv0CTT/YIKdUAMaZBYskm66xVnXOMfG9
-LI6Kkc7cnxeqJ7jJyF6uJ4VvU8aJb4CRTivrqJFa9QuFslqK+xTujLY21XFKwO2S
-d5f3Is5is0vQ5oG6qaYPnU0F/rx170A20ZeYVMBnf8WOUpPD5Z8rBi6Dyom+YE+l
-J0uE73E8LuN77O+enbjj/TeW3Zt2hurd/hpuFhBcAspFOoVQvMuMjjTaFkcdlQYg
-w3ks4BHE7Nswn/fPRvccX08mW/u8qM1o3NIaoCOBJRf4dyQuv22+K0y5a+3wH9o8
-QZfzDc9Vmm18OJtspKB74+x7JkNv6iszqOH6gvzq4qvkRw==
-</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>
-MIIC7jCCAdYCCQD02c5n0jI2ODANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJQ
-VDERMA8GA1UECgwIRkNUfEZDQ04xFzAVBgNVBAMMDndlYnR1dC5mY2NuLnB0MB4X
-DTE2MDEyODE2MzMzN1oXDTE5MDEyNzE2MzMzN1owOTELMAkGA1UEBhMCUFQxETAP
-BgNVBAoMCEZDVHxGQ0NOMRcwFQYDVQQDDA53ZWJ0dXQuZmNjbi5wdDCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL6KyuPJZKpaG1JSUZBh+sTBNB8BzwGZ
-9nXggSgYMc1bSijzbcDeUThF/76Qxdd8UnA2Fed806F+eajyVHDAIb28YIyAGncX
-VnjmryBzVPlIxe1FusR4pFvVaaGWr+DhgasoQYeQmFkmLhNPYOyU8GSA38zrOWrO
-LirZ26HqiSsFX3R2HWbILPwqJX/8nD1qcsV0ZEnOLUhxvQ2O8n9slkwinXZgAtyB
-eoDM6KRMoayUzOvJggvASEzs32/g/0TxZcFF6nJGZPjMRDZfqqEsigtVYIWpvJ/W
-Po7OnvYhtSlS88uV4cVdOAoorXJoTs8yafDNLovyeUvS7y54w5AHLUsCAwEAATAN
-BgkqhkiG9w0BAQUFAAOCAQEAL88GMPpWdv0CTT/YIKdUAMaZBYskm66xVnXOMfG9
-LI6Kkc7cnxeqJ7jJyF6uJ4VvU8aJb4CRTivrqJFa9QuFslqK+xTujLY21XFKwO2S
-d5f3Is5is0vQ5oG6qaYPnU0F/rx170A20ZeYVMBnf8WOUpPD5Z8rBi6Dyom+YE+l
-J0uE73E8LuN77O+enbjj/TeW3Zt2hurd/hpuFhBcAspFOoVQvMuMjjTaFkcdlQYg
-w3ks4BHE7Nswn/fPRvccX08mW/u8qM1o3NIaoCOBJRf4dyQuv22+K0y5a+3wH9o8
-QZfzDc9Vmm18OJtspKB74+x7JkNv6iszqOH6gvzq4qvkRw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml2-logout.php/webtut.fccn.pt"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml2-acs.php/webtut.fccn.pt" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml1-acs.php/webtut.fccn.pt" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml2-acs.php/webtut.fccn.pt" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webtut.fccn.pt/simplesaml/module.php/saml/sp/saml1-acs.php/webtut.fccn.pt/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">WebTUT Service</md:ServiceName>
-      <md:ServiceName xml:lang="pt">Serviço WebTUT</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">WebRTC in context example application</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="pt">Aplicação exemplo de uso da tecnologia WebRTC</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="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="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="pt">FCT|FCCN</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">FCT|FCCN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="pt">FCT|FCCN</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">FCT|FCCN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.fccn.pt</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>mailto:stv@fccn.pt</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/western.sclintra.com-shibboleth.xml b/swamid-interfederations-2.0/western.sclintra.com-shibboleth.xml
deleted file mode 100644
index 854fdc21..00000000
--- a/swamid-interfederations-2.0/western.sclintra.com-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://western.sclintra.com/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://western.sclintra.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SCLogic Western Washington</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SCLogic Western Washington IntraOmni SP </mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC6zCCAdOgAwIBAgIJAKwDandpFO7gMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDDEwLTE5Mi01Mi0yNTAeFw0xNTA5MjQxOTQxMTRaFw0yNTA5MjExOTQxMTRa
-MBcxFTATBgNVBAMTDDEwLTE5Mi01Mi0yNTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANT5Xu+I85lPCQa4aT5PaAd42F/ClcQ+OUycggw0xGZluF8X4PaC
-gWCppJa3m8UAs8wix8wq9dejnQCZzQBOYOdIiRLJRfrnakPw0GIXunOtJQkU/Eea
-RqQpFT37DJ8Ou2uHDhSv7tZw84Xxdro/ieV6nv4zxT/MB5ffce5NbGAZWfQv1BBn
-3w9oHLJisckn7b5E4SzdgQKYYD5ny725cc9pbOCph0uJjndAl9j6TvUA0Tva77EH
-x14KDLxQ8lZiprP1AUa7nPn6tarJSns7HLL26ooOEV6FQYKZ+mCEsbTpTEr71v6R
-TmkKz8KHXRiO1btEEknb7jcGY0XNh1SsPrkCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-MTAtMTkyLTUyLTI1MB0GA1UdDgQWBBSEJg+RKmIgkOrxov2pmcdnf5KNpzANBgkq
-hkiG9w0BAQUFAAOCAQEAFtfTeSjXOxhsSf7dw8QCXnrdZ9cp4hed+/S5PGfOs/0N
-pFDdq62jIQgdpclw3p93wuHgKUoAqmqiHWRsEL+1mQBlQLQ6Aft0EqoqKx2pjR15
-EmTf1AUiStFKlMKY8MZ4nq72GIfg1pLGYP+zVC4gS/jDDi7VTXi+U6fW47oWbUsa
-XsBq5dZeH029RBNtcVEbkWsgyyN3tmH0fWQCSTdxNUgdMeZWQGygvgT1Vi6hXkjw
-9OVs9KruqiRJcNXXjecaBpewkc6ZdsE5t/hKwGy9fl4tWFqAV+KeZKIVTLtByl1m
-dcdsCGBQNcRm3+jsd9CVy4E4T8t/lypkeuUrPJKJ/Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://western.sclintra.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://western.sclintra.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://western.sclintra.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://western.sclintra.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">SCLogic Western Washington</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SCLogic Western Washington IntraOmni SP </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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SCLogic</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SCLogic</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sclogic.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Josh Sullivan</md:GivenName>
-    <md:EmailAddress>jsullivan@sclogic.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Warren Evans</md:GivenName>
-    <md:EmailAddress>wevans@sclogic.com</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 f51f23a9..00000000
--- a/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://whoami.cesnet.cz/idp/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>
-    <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/other</saml:AttributeValue>
-        <saml:AttributeValue>http://eduid.cz/uri/sp-group/aa.cesnet.cz</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">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>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAPtcN7LUM3UEz0yqfmOvpr0tZtYOMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owHhcNMTUxMjE0MDkyMjU4
-WhcNMzUxMjE0MDkyMjU4WjAbMRkwFwYDVQQDDBB3aG9hbWkuY2VzbmV0LmN6MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqlyX+ljxEHVNiX4Kt3AMYj6P
-UgWAGHkb5t1xZhrijzWspc6wTc6iNQnLzFTafl1KJktWMHBNmFvUQyHGjCVbski4
-WWUNS4rCFyY7USNjdjiKb7lHqw4OLwd6GMnI6njbUkY7tQJ/Dq3lGPjs+LJ9jPq3
-9l2kSbsMz55WN86aC7J+WwSjCv2BHYs/KEJ+127RUVBtloSmNRZfjJQcdKFsp+mS
-OyMP91WtZQwg3b7EXOOqSkm55esBWJiwII565SHfrl4aQe58xA/V2sHeFH4IbtH/
-IZsibhM/G0eBr9dvHtyfcWvnlA8cmQaD964nVqnYpFa/eXYfg53V1Ft6KQMvgwID
-AQABo2cwZTAdBgNVHQ4EFgQUXaI0YDr1Q2G4mM18pIXB3+nPUHUwRAYDVR0RBD0w
-O4IQd2hvYW1pLmNlc25ldC5jeoYnaHR0cHM6Ly93aG9hbWkuY2VzbmV0LmN6L2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBzZ5sJtPabubBWaC5UAbl8
-+ZGzSrT72R9vfxW6+NJVK9C5LvCp6a6U3KDrZwMRb5hKvAbkQji1bPHAQ+Bt7qtj
-iz4vxBDJueIuZCoHbSSkK9Xb5h9025TGICxNFtty3y4LvroPZ3wYACXdjA/Si3xK
-JF6us/yB6hcAf6ML7DyXW+o4q+35HHmAjBUssXHU70iLOiTnIfbEgxl54Af7xKpZ
-8Ww45V9t2dJ5YU6wzoa0Aqy0abm0RxkWu6igXjpcS+XaSl5n+J+tFEZBRtJZ5mBv
-EQWIvarHy4CabFyOcb1Bl3UHfvQyi3R4RfQsEIYaYBa/5c3LJr3KC8mWCA8vuPx+
-                        </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>
-MIIDKzCCAhOgAwIBAgIUNHGiLWEdd83k9nZ70899LxlSksMwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQd2hvYW1pLmNlc25ldC5jejAeFw0xNTEyMTQwOTIyNTZa
-Fw0zNTEyMTQwOTIyNTZaMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNzxV/6eZL14fhksPzth+cv6bf
-aoE/W/Z+Hrey2ZEUCexwPN4ogtL35gITcj7uctw5bxFPNO4Io9ooXC5nUBThc90g
-jBxTLS8B5/pkbcuRFDX3w4C++mCQdiZ7+5aG1K31+Vw5XCd8Ai+UC3/oZI4vekfC
-ZJ7wHYN/W2N15FJ6breDWOewk+z1ezag3SfY2U3aROFBuQJks2WKx7+bClXtVEYz
-SregJY/ZkuCsLsNwxqw+rw4njESLGTpfiK1raWdrBwiPacyCG9T9Fte+AGfoHuK0
-OMcpqPQsnnzB7UAnUCthpo0pllD3qJCL+SdX+Rka40Vps2HrV3Jk/fGxNuADAgMB
-AAGjZzBlMB0GA1UdDgQWBBRJtNZfYNTYii4s7L4/Y/SqT3SMKjBEBgNVHREEPTA7
-ghB3aG9hbWkuY2VzbmV0LmN6hidodHRwczovL3dob2FtaS5jZXNuZXQuY3ovaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGkcr3KAQV2zbSeviEblSyyr
-5tJ/TW2HbJCN/8sLGA+6TwLsCcjWkEtXpXskZlsxbCtgmqztaNa/vQsRSIsVA1Ph
-ynUBMniJQ4wfiNhkbj73ukgE16NIY0WITgJNdwFj4Nb5cysCAo+Gqa6UTofB5p9/
-QkEL4dP6M+eo5ZIDvndTF+vb9Uxt+SFttFETS/2RzneYXzCsa/5wWDIsmwNwMRYN
-1RjGMhjQ0DLx4PyEhrOqzWBGFM00qSWypY29SQ/nYGRpjBkvOYasT8eHIovD9M8C
-bmD1QX2KicdJm3oC14xc3Amm2Ja4YeystmRZO0H4z0oVN/zhBT90pjKf4yuF+Bs=
-                        </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>
-MIIDLDCCAhSgAwIBAgIVAMGRAZNgX7x88WED24sBgvq/prF/MA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owHhcNMTUxMjE0MDkyMjU3
-WhcNMzUxMjE0MDkyMjU3WjAbMRkwFwYDVQQDDBB3aG9hbWkuY2VzbmV0LmN6MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg0TLTs5Cinlt6r2wcS+7NT+k
-O1synzXA9/VEvEDnXbqx5ryyDYyVB4tL4BEU1bsf95GD2RDOdU+rYDRgW+K2R9do
-gJfZ6SmDjdnxOcvLBMkpQTrD0XE35ZDohMf8EXHxuID+JxPDnd0ZU/SF6bH/5WHq
-WzPKIF1+OfIoeRY2IH5HrwKgz5EMvFJKUTcDxzNTFApIzLt46KbxxBxi4JPoPMKT
-9r889YOdknPCuVW4ZldJTljJCR9ZkjgTuIWVBgi3pbqjRtg5JUDrfBBvUUKLC2a8
-3PEnHpP9ukeErX5aVHPJ3dNNL1ACYzjZMGzeb6yDPunISnO/MW/cP8OBu3njcwID
-AQABo2cwZTAdBgNVHQ4EFgQUOJRY3ly/FY3E/c3BlIUAeVbpGkQwRAYDVR0RBD0w
-O4IQd2hvYW1pLmNlc25ldC5jeoYnaHR0cHM6Ly93aG9hbWkuY2VzbmV0LmN6L2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBhsQ7KA7Furd6LFDZ9inh+
-yaVPlWcS2wBrvW6kgRU5/B+0sf3f/HKOtbYREOvtdI2Cf0rvTlvSACJzJ1Mlta5H
-9AK/M9qlrJf9Vrl5eik5Il1QZBfNniVojz0JImhZmr28sLT3yYMcLAERg1E6Yg35
-dQ4u7VaUTaGleUKF8dZfEc8okQUqeSNAIpTAxzAwQC3crVdtyhH4luP/vFvWwLMg
-V2DvXG/+7HDskpb5nE9Vy3lunkwSZLsBCJHFpU8GWSuhrXpIJjelw7yswEHpep0Q
-D/3xRElbMqPKyidtXPj29chPYs3GsBrvgaXjoNnOwQhB8lS1T2JbrvG/OPVIQojD
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://whoami.cesnet.cz/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md: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://whoami.cesnet.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://whoami.cesnet.cz/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">cesnet.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIVAPtcN7LUM3UEz0yqfmOvpr0tZtYOMA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owHhcNMTUxMjE0MDkyMjU4
-WhcNMzUxMjE0MDkyMjU4WjAbMRkwFwYDVQQDDBB3aG9hbWkuY2VzbmV0LmN6MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqlyX+ljxEHVNiX4Kt3AMYj6P
-UgWAGHkb5t1xZhrijzWspc6wTc6iNQnLzFTafl1KJktWMHBNmFvUQyHGjCVbski4
-WWUNS4rCFyY7USNjdjiKb7lHqw4OLwd6GMnI6njbUkY7tQJ/Dq3lGPjs+LJ9jPq3
-9l2kSbsMz55WN86aC7J+WwSjCv2BHYs/KEJ+127RUVBtloSmNRZfjJQcdKFsp+mS
-OyMP91WtZQwg3b7EXOOqSkm55esBWJiwII565SHfrl4aQe58xA/V2sHeFH4IbtH/
-IZsibhM/G0eBr9dvHtyfcWvnlA8cmQaD964nVqnYpFa/eXYfg53V1Ft6KQMvgwID
-AQABo2cwZTAdBgNVHQ4EFgQUXaI0YDr1Q2G4mM18pIXB3+nPUHUwRAYDVR0RBD0w
-O4IQd2hvYW1pLmNlc25ldC5jeoYnaHR0cHM6Ly93aG9hbWkuY2VzbmV0LmN6L2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBzZ5sJtPabubBWaC5UAbl8
-+ZGzSrT72R9vfxW6+NJVK9C5LvCp6a6U3KDrZwMRb5hKvAbkQji1bPHAQ+Bt7qtj
-iz4vxBDJueIuZCoHbSSkK9Xb5h9025TGICxNFtty3y4LvroPZ3wYACXdjA/Si3xK
-JF6us/yB6hcAf6ML7DyXW+o4q+35HHmAjBUssXHU70iLOiTnIfbEgxl54Af7xKpZ
-8Ww45V9t2dJ5YU6wzoa0Aqy0abm0RxkWu6igXjpcS+XaSl5n+J+tFEZBRtJZ5mBv
-EQWIvarHy4CabFyOcb1Bl3UHfvQyi3R4RfQsEIYaYBa/5c3LJr3KC8mWCA8vuPx+
-                        </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>
-MIIDKzCCAhOgAwIBAgIUNHGiLWEdd83k9nZ70899LxlSksMwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAwwQd2hvYW1pLmNlc25ldC5jejAeFw0xNTEyMTQwOTIyNTZa
-Fw0zNTEyMTQwOTIyNTZaMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCNzxV/6eZL14fhksPzth+cv6bf
-aoE/W/Z+Hrey2ZEUCexwPN4ogtL35gITcj7uctw5bxFPNO4Io9ooXC5nUBThc90g
-jBxTLS8B5/pkbcuRFDX3w4C++mCQdiZ7+5aG1K31+Vw5XCd8Ai+UC3/oZI4vekfC
-ZJ7wHYN/W2N15FJ6breDWOewk+z1ezag3SfY2U3aROFBuQJks2WKx7+bClXtVEYz
-SregJY/ZkuCsLsNwxqw+rw4njESLGTpfiK1raWdrBwiPacyCG9T9Fte+AGfoHuK0
-OMcpqPQsnnzB7UAnUCthpo0pllD3qJCL+SdX+Rka40Vps2HrV3Jk/fGxNuADAgMB
-AAGjZzBlMB0GA1UdDgQWBBRJtNZfYNTYii4s7L4/Y/SqT3SMKjBEBgNVHREEPTA7
-ghB3aG9hbWkuY2VzbmV0LmN6hidodHRwczovL3dob2FtaS5jZXNuZXQuY3ovaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGkcr3KAQV2zbSeviEblSyyr
-5tJ/TW2HbJCN/8sLGA+6TwLsCcjWkEtXpXskZlsxbCtgmqztaNa/vQsRSIsVA1Ph
-ynUBMniJQ4wfiNhkbj73ukgE16NIY0WITgJNdwFj4Nb5cysCAo+Gqa6UTofB5p9/
-QkEL4dP6M+eo5ZIDvndTF+vb9Uxt+SFttFETS/2RzneYXzCsa/5wWDIsmwNwMRYN
-1RjGMhjQ0DLx4PyEhrOqzWBGFM00qSWypY29SQ/nYGRpjBkvOYasT8eHIovD9M8C
-bmD1QX2KicdJm3oC14xc3Amm2Ja4YeystmRZO0H4z0oVN/zhBT90pjKf4yuF+Bs=
-                        </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>
-MIIDLDCCAhSgAwIBAgIVAMGRAZNgX7x88WED24sBgvq/prF/MA0GCSqGSIb3DQEB
-CwUAMBsxGTAXBgNVBAMMEHdob2FtaS5jZXNuZXQuY3owHhcNMTUxMjE0MDkyMjU3
-WhcNMzUxMjE0MDkyMjU3WjAbMRkwFwYDVQQDDBB3aG9hbWkuY2VzbmV0LmN6MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAg0TLTs5Cinlt6r2wcS+7NT+k
-O1synzXA9/VEvEDnXbqx5ryyDYyVB4tL4BEU1bsf95GD2RDOdU+rYDRgW+K2R9do
-gJfZ6SmDjdnxOcvLBMkpQTrD0XE35ZDohMf8EXHxuID+JxPDnd0ZU/SF6bH/5WHq
-WzPKIF1+OfIoeRY2IH5HrwKgz5EMvFJKUTcDxzNTFApIzLt46KbxxBxi4JPoPMKT
-9r889YOdknPCuVW4ZldJTljJCR9ZkjgTuIWVBgi3pbqjRtg5JUDrfBBvUUKLC2a8
-3PEnHpP9ukeErX5aVHPJ3dNNL1ACYzjZMGzeb6yDPunISnO/MW/cP8OBu3njcwID
-AQABo2cwZTAdBgNVHQ4EFgQUOJRY3ly/FY3E/c3BlIUAeVbpGkQwRAYDVR0RBD0w
-O4IQd2hvYW1pLmNlc25ldC5jeoYnaHR0cHM6Ly93aG9hbWkuY2VzbmV0LmN6L2lk
-cC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBhsQ7KA7Furd6LFDZ9inh+
-yaVPlWcS2wBrvW6kgRU5/B+0sf3f/HKOtbYREOvtdI2Cf0rvTlvSACJzJ1Mlta5H
-9AK/M9qlrJf9Vrl5eik5Il1QZBfNniVojz0JImhZmr28sLT3yYMcLAERg1E6Yg35
-dQ4u7VaUTaGleUKF8dZfEc8okQUqeSNAIpTAxzAwQC3crVdtyhH4luP/vFvWwLMg
-V2DvXG/+7HDskpb5nE9Vy3lunkwSZLsBCJHFpU8GWSuhrXpIJjelw7yswEHpep0Q
-D/3xRElbMqPKyidtXPj29chPYs3GsBrvgaXjoNnOwQhB8lS1T2JbrvG/OPVIQojD
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz: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">CESNET, a. l. e.</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">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.ces.net/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
-  </md:Organization>
-  <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:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Tomasek</md:SurName>
-    <md:EmailAddress>jan.tomasek@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 e0dfb5e0..00000000
--- a/swamid-interfederations-2.0/whoami.cesnet.cz.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://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/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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"/>
-    <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 xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" 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>Ivan</GivenName>
-    <SurName>Novakov</SurName>
-    <EmailAddress>novakoi@fel.cvut.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jan</GivenName>
-    <SurName>Tomášek</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 702fb271..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wifi.dir.garr.it:12081/shibboleth">
-  <md: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 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: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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">WIFI connection provided by GARR</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Wifi access for guests in the GARR wireless network (Rome)</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Wi-Fi provided by Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Wi-Fi erogato da Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.garr.it/b/eng</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:system.support@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 6eb38c1a..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wifi.dir.garr.it:12081/shibboleth">
-  <md: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 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: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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">WIFI connection provided by GARR</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Wifi access for guests in the GARR wireless network (Rome)</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Wi-Fi provided by Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Wi-Fi erogato da Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.garr.it/b/eng</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:system.support@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b5590de0..00000000
--- a/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml
+++ /dev/null
@@ -1,88 +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://wifi.dir.garr.it:12081/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-30T13:14:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</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>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">WIFI - GARR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">WIFI - GARR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service enables the authentication by IDEM credentials at wireless network in GARR</mdui:Description>
-        <mdui:Description xml:lang="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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/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://wifi.dir.garr.it:12081/Shibboleth.sso/WAYF"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wifi.dir.garr.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wifi.dir.garr.it,OU=Domain Control Validated</ds:X509SubjectName>
-          <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Artifact"/>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">WIFI-GARR</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Wifi access for guests</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.garr.it/b/eng</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>system.support@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 d9888c8a..00000000
--- a/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.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://wifi.espci.fr/saml/metadata">
-  <md: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>
-    <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>https://federation.renater.fr/category/wifi</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/national</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration=" urn:oasis:names:tc:SAML:1.0: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">ESPCI ParisTech - Accès WiFi</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://wifi.espci.fr</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.espci.fr/saml/postResponse" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">ESPCI ParisTech - Accès WiFi</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Accès au portail captif WiFi à l'ESPCI ParisTech, ouvert à tous les usagers de la fédération.</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="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="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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Ecole Supérieure de Physique et de Chimie Industrielles de la Ville de Paris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Ecole Supérieure de Physique et de Chimie Industrielles de la Ville de Paris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.espci.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Emmanuel Dreyfus</md:SurName>
-    <md:EmailAddress>Emmanuel.Dreyfus@espci.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jean-Jacques Puig</md:SurName>
-    <md:EmailAddress>Jean-Jacques.Puig@espci.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki-cswarm.crc.nd.edu-shibboleth.xml b/swamid-interfederations-2.0/wiki-cswarm.crc.nd.edu-shibboleth.xml
deleted file mode 100644
index fd245b1d..00000000
--- a/swamid-interfederations-2.0/wiki-cswarm.crc.nd.edu-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://wiki-cswarm.crc.nd.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CSWARM Wiki Instance</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Wiki server used by the C-SWARM project.  Developers use it for reporting on their progress of their tasks and to collaborate.</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDITCCAgmgAwIBAgIJANq01pu3iuXoMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-BAMTHndpa2ktY3N3YXJtLnZpcnR1YWwuY3JjLm5kLmVkdTAeFw0xNTEwMjgxNjU5
-MzZaFw0yNTEwMjUxNjU5MzZaMCkxJzAlBgNVBAMTHndpa2ktY3N3YXJtLnZpcnR1
-YWwuY3JjLm5kLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKRp
-CuOp4pW8+1gPe/2SCZJ0Lx5HboS8QjVjSH9bj2SkDmB7MKGGNOIxioLUBXOKDfOu
-cdFydZmJwF0Lg+T/5Eu783JFeHgXEaLWjuJ1T20Gh8/VcKd6BF+GWP5HxHWwC/1i
-tQnNbxyyNNne7wS/I5woz7ocEZ80ujtmmwV7wc/C5bVI9NeaileFKE0OIQhl6qMr
-qmCJr/xMh4D0Ko1IUnVU7d8qM70VAYTJzjysYg9hqKzGkprd36q5Kij2K9GFQwOS
-nfFsaS5UVAxV/idMs8xeWwvL39AdT4V79uAglktpdPm2cFsRM3Lc8iWkUiCFXOlE
-UNO5lFO9ZtG/3UMFMT0CAwEAAaNMMEowKQYDVR0RBCIwIIIed2lraS1jc3dhcm0u
-dmlydHVhbC5jcmMubmQuZWR1MB0GA1UdDgQWBBQ+QtSY7u8Y/LGbT39AdOBgqFrH
-8TANBgkqhkiG9w0BAQUFAAOCAQEAJMtvrO94Q6aBOW/KPhYC7RaQ1KhnZZFmgNuA
-dWIe9Z/C5Ufe5ffv+7RF8YQksYmbnD1yg1XfXlQXnAoiEqnvqsIOyaBO+NGSq0QW
-xbYh9EM0OPCqgUNl/ea3zl8hUbr/Glf4pkB13176Q4d82cib1x09NRqZTT6sA/So
-ZGYxADLpdUyM2Hc2ShuG6EIWbrj+8+Spl7/0FhyXJneBVDCZ5utPedSF2kVU7LUi
-q20EjYgBqitT37jf7A+xGxQbWOLA8KCiqoeuJmf1yaCSVRKYHc1DviPtgpg4P1wL
-VLYCFWSF1zm/rknkR1j+w0KNisGpbK3TqeBCxNGPt1uT0TvxLw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki-cswarm.crc.nd.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">CSWARM Wiki Instance</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">The Wiki server used by the C-SWARM project.  Developers use it for reporting on their progress of their tasks and to collaborate.</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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Notre Dame</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Notre Dame</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.nd.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Antelmo Aguilar</md:GivenName>
-    <md:EmailAddress>aaguilar@nd.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Caleb Reinking</md:GivenName>
-    <md:EmailAddress>creinkin@nd.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 9e078a6c..00000000
--- a/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
+++ /dev/null
@@ -1,87 +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:AttributeValue>http://refeds.org/category/research-and-scholarship</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">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.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:InformationURL xml:lang="en">http://wiki.edugain.org/</mdui:InformationURL>
-        <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>
-    </md:Extensions>
-    <md: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>
-    </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://wiki.edugain.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.edugain.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.edugain.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">eduGAIN Wiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This wiki provides recommendations and instructions on how to enable web services for eduGAIN.</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="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="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="surname" 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>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">geant.net</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GÉANT</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.geant.net/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>eduGAIN</md:GivenName>
-    <md:SurName>Integration</md:SurName>
-    <md:EmailAddress>mailto:edugain-integration@geant.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>eduGAIN</md:GivenName>
-    <md:SurName>Operation</md:SurName>
-    <md:EmailAddress>mailto:edugain-ot@geant.net</md:EmailAddress>
-  </md: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 5640e0ce..00000000
--- a/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.helsinki.fi/shibboleth">
-  <md: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>
-  </md:Extensions>
-  <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 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"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Helsinki Wiki Service</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="fi">Helsingin yliopiston Wiki-palvelu</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Tool for group collaboration and web-publishing.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="fi">http://wiki.helsinki.fi/tietosuojaseloste.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://wiki.helsinki.fi/tietosuojaseloste.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEmzCCA4OgAwIBAgIRAL/NhOjMkfeL3Flgd4NNgaswDQYJKoZIhvcNAQELBQAw
-ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
-CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
-IENBIDIwHhcNMTUwMjIzMDAwMDAwWhcNMTgwMzE5MjM1OTU5WjA+MSEwHwYDVQQL
-ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGTAXBgNVBAMTEHdpa2kuaGVsc2lu
-a2kuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0yKGvBZhrRP5x
-xspDugWdniB+0HGYQAvWWgqJyOnIGhY/9SwwooTOOcp/ManA6aKyekbxuIl3WF3/
-NACSkVhCxAEBhYeRIEWc82W7k4BEJJ29fR71Pi9P2uLssK061B0ebsbFPk2piZ1T
-BHDSFGjDY9+DPcYogLG0KVscyD+9bw/eLhsIPJyKxI3Wu47BedsoQqQxCrXYiLS0
-eSIVv2Jf5/q/qzSD4V5doSN3U7CV7FqSpzY2g4RiAgTyYrxWi51pENh9k0h0Lr8d
-VHDh1fuN2n9NPp5b2fS1oOfIvvMJlneMkv/XsBjaGHVM17QW5xwIzIlSQfDIzFE2
-H/5RFA8zAgMBAAGjggFsMIIBaDAfBgNVHSMEGDAWgBRb0IocmjJb4LXdllQb4YYo
-sP22vTAdBgNVHQ4EFgQU8d+lPhlixSKViDV0U18nzRuoWrgwDgYDVR0PAQH/BAQD
-AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
-L6AtoCuGKWh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3Js
-MGwGCCsGAQUFBwEBBGAwXjA1BggrBgEFBQcwAoYpaHR0cDovL2NydC51c2VydHJ1
-c3QuY29tL1RFUkVOQVNTTENBMi5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6Ly9vY3Nw
-LnVzZXJ0cnVzdC5jb20wGwYDVR0RBBQwEoIQd2lraS5oZWxzaW5raS5maTANBgkq
-hkiG9w0BAQsFAAOCAQEARLwtShgCBMuGMhf08m1KTZ4AQPd25ql8mvzIvVXiTq1s
-V4D9BJ22lf6Lkiq91BLHzVdHYfb8XsEdETzRO4671PgQr4f258X1BGdgxBh0KQfz
-qbSXxHWnzqpf+0zfDG6D3VO16gkJUXzBRv/kM81RnlV3/iYqKZC/Qd3S3c5jklxU
-ArWOB2iYWyMs+VyAa7QpzFb/8B+OavnRsPefw07lCBqqo6ppoVeuOemONAgbhXwj
-z9noWRAiG/hZbUjEfQ1sWvT/TLwjdWzTstDFmp59tex3SSbq02IZSCimUGp6OJVS
-N4ZdWQZqu5CJ4NhvqVlUpnxq9UfK5HSPDf6iGa7ogw==</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://wiki.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://wiki.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Helsingin yliopiston Wiki-palvelu</md:ServiceName>
-      <md:ServiceName xml:lang="en">University of Helsinki Wiki Service</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Tool for group collaboration and web-publishing.</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="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="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>Erkki</md:GivenName>
-    <md:SurName>Aalto</md:SurName>
-    <md:EmailAddress>mailto:ok-wiki@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:ContactPerson contactType="support">
-    <md:GivenName>Erkki</md:GivenName>
-    <md:SurName>Aalto</md:SurName>
-    <md:EmailAddress>mailto:ok-wiki@helsinki.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.imz.hs-furtwangen.de.xml b/swamid-interfederations-2.0/wiki.imz.hs-furtwangen.de.xml
deleted file mode 100644
index 44781c2c..00000000
--- a/swamid-interfederations-2.0/wiki.imz.hs-furtwangen.de.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.imz.hs-furtwangen.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wiki.imz.hs-furtwangen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wiki.imz.hs-furtwangen.de,OU=IMZ Online Services,O=Hochschule Furtwangen,L=Furtwangen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIED6Im4zANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgRnVydHdhbmdlbjEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEVMBMGA1UEAxMMSEZVIENBIC0gRzAxMSYwJAYJKoZIhvcNAQkB
-Fhdwa2ktY2FAaHMtZnVydHdhbmdlbi5kZTAeFw0xMDAyMjIxNTU3MDdaFw0xNTAy
-MjExNTU3MDdaMIGhMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0
-ZW1iZXJnMRMwEQYDVQQHEwpGdXJ0d2FuZ2VuMR4wHAYDVQQKExVIb2Noc2NodWxl
-IEZ1cnR3YW5nZW4xHDAaBgNVBAsTE0lNWiBPbmxpbmUgU2VydmljZXMxIjAgBgNV
-BAMTGXdpa2kuaW16LmhzLWZ1cnR3YW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCZOP6QOvIaPx9alcxqEPXebG4ScyjaFSOrbYl5h93A4w+T
-x5o5po56w2KRRZQE7T86r4dMvw6TkYyada0ANVzrYzs75rUn7VkarJzhWgTN1dte
-rKx5sqkudyMcnMGN5dWf107IKYTXZLNX+175D1vjM9jd2vCV0ODeeh3anldW/IlT
-TJUARIM/ZWS+6qeSoDr/VlISPzdTJTM212SXOm3xe7kCVab/zwBQhQf2/t3jJYw4
-QYsDWMZIxoudbANl3sUMSDF+7qTyzkR8QEglFnnAx9mKkLWPYGgJQyHaK9TkoD7F
-vrF8HS1NyL8qFk9Y7VesveFVurtUEipzkPbgXwNfAgMBAAGjggIeMIICGjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFB4nUD+0MySwB6ax1AJNJijrNx9AMB8GA1UdIwQYMBaAFGhw
-EA3JLXMG+YgYPp+LjO0pABbHMGgGA1UdEQRhMF+CGXdpa2kuaW16LmhzLWZ1cnR3
-YW5nZW4uZGWCHWhmdS1pbXotd2lraS5ocy1mdXJ0d2FuZ2VuLmRlgiNoZnUtaW16
-LXdpa2kuYWxwaGEuaHMtZnVydHdhbmdlbi5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7
-hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWZ1cnR3YW5nZW4tY2EvcHViL2Ny
-bC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVy
-dHdhbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYw
-SQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdl
-bi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABuJEaN/Od5A+tIiXZf+PfG3qkGJteHX
-bVz2gTjdjGyV/m1wMqwFMpiRQU+JP7kN0hySMDvAo7R42an27EbWYRbv4PrZ1Yn0
-kHxc2eRoJchhr+5f4P7/uRyryDxFiPOiazY0QaOCj4MqK6j2lXIoj8qZWzFbKnti
-PAdH3bmZccZ5c3o37InMSyco7qOkSzWTJ9MUz6aNG40VArI8g1f7TtY9BWDdv0fq
-40uSBVacDsbOpNrTEg8CfAhZfHjWyB43yoXjBRJJvdEYJX1c/eUF5NRT/vR2Tb7y
-nYzpemdhwxFzt+1CqNuf3Wnv0DmBmEKDGCro8qxKdGIsaEPFLaBWKnI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wiki.imz.hs-furtwangen.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wiki.imz.hs-furtwangen.de,OU=IMZ Online Services,O=Hochschule Furtwangen,L=Furtwangen,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIED6Im4zANBgkqhkiG9w0BAQUFADCBhDELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFUhvY2hzY2h1bGUgRnVydHdhbmdlbjEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEVMBMGA1UEAxMMSEZVIENBIC0gRzAxMSYwJAYJKoZIhvcNAQkB
-Fhdwa2ktY2FAaHMtZnVydHdhbmdlbi5kZTAeFw0xMDAyMjIxNTU3MDdaFw0xNTAy
-MjExNTU3MDdaMIGhMQswCQYDVQQGEwJERTEbMBkGA1UECBMSQmFkZW4tV3VlcnR0
-ZW1iZXJnMRMwEQYDVQQHEwpGdXJ0d2FuZ2VuMR4wHAYDVQQKExVIb2Noc2NodWxl
-IEZ1cnR3YW5nZW4xHDAaBgNVBAsTE0lNWiBPbmxpbmUgU2VydmljZXMxIjAgBgNV
-BAMTGXdpa2kuaW16LmhzLWZ1cnR3YW5nZW4uZGUwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCZOP6QOvIaPx9alcxqEPXebG4ScyjaFSOrbYl5h93A4w+T
-x5o5po56w2KRRZQE7T86r4dMvw6TkYyada0ANVzrYzs75rUn7VkarJzhWgTN1dte
-rKx5sqkudyMcnMGN5dWf107IKYTXZLNX+175D1vjM9jd2vCV0ODeeh3anldW/IlT
-TJUARIM/ZWS+6qeSoDr/VlISPzdTJTM212SXOm3xe7kCVab/zwBQhQf2/t3jJYw4
-QYsDWMZIxoudbANl3sUMSDF+7qTyzkR8QEglFnnAx9mKkLWPYGgJQyHaK9TkoD7F
-vrF8HS1NyL8qFk9Y7VesveFVurtUEipzkPbgXwNfAgMBAAGjggIeMIICGjAJBgNV
-HRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwHQYDVR0OBBYEFB4nUD+0MySwB6ax1AJNJijrNx9AMB8GA1UdIwQYMBaAFGhw
-EA3JLXMG+YgYPp+LjO0pABbHMGgGA1UdEQRhMF+CGXdpa2kuaW16LmhzLWZ1cnR3
-YW5nZW4uZGWCHWhmdS1pbXotd2lraS5ocy1mdXJ0d2FuZ2VuLmRlgiNoZnUtaW16
-LXdpa2kuYWxwaGEuaHMtZnVydHdhbmdlbi5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7
-hjlodHRwOi8vY2RwMS5wY2EuZGZuLmRlL2hzLWZ1cnR3YW5nZW4tY2EvcHViL2Ny
-bC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvaHMtZnVy
-dHdhbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYw
-SQYIKwYBBQUHMAKGPWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdl
-bi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSQYIKwYBBQUHMAKGPWh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvaHMtZnVydHdhbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBABuJEaN/Od5A+tIiXZf+PfG3qkGJteHX
-bVz2gTjdjGyV/m1wMqwFMpiRQU+JP7kN0hySMDvAo7R42an27EbWYRbv4PrZ1Yn0
-kHxc2eRoJchhr+5f4P7/uRyryDxFiPOiazY0QaOCj4MqK6j2lXIoj8qZWzFbKnti
-PAdH3bmZccZ5c3o37InMSyco7qOkSzWTJ9MUz6aNG40VArI8g1f7TtY9BWDdv0fq
-40uSBVacDsbOpNrTEg8CfAhZfHjWyB43yoXjBRJJvdEYJX1c/eUF5NRT/vR2Tb7y
-nYzpemdhwxFzt+1CqNuf3Wnv0DmBmEKDGCro8qxKdGIsaEPFLaBWKnI=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.imz.hs-furtwangen.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">HFU</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschule Furtwangen University</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.hs-furtwangen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Hendrik</GivenName>
-    <SurName>Kuijs</SurName>
-    <EmailAddress>kuijs@hs-furtwangen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.larpp.internet2.edu-shibboleth.xml b/swamid-interfederations-2.0/wiki.larpp.internet2.edu-shibboleth.xml
deleted file mode 100644
index 9800596e..00000000
--- a/swamid-interfederations-2.0/wiki.larpp.internet2.edu-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.larpp.internet2.edu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://wiki.larpp.internet2.edu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is an activity funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) as part of the Scalable Privacy grant awarded to Internet2.   This activity supports pilot schools to investigate privacy management software, named PrivacyLens, to provide users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP supports the LARPP wiki.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.larpp.internet2.edu/confluence/display/SPIN/SP+Information</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.internet2.edu/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="150" width="275" xml:lang="en">https://wiki.larpp.internet2.edu/img/larpp_logo_transparent_275wX150h.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGzCCAgOgAwIBAgIJAL9sC3mP5/uMMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-BAMTHHJlZ2lzdHJ5LmxhcnBwLmludGVybmV0Mi5lZHUwHhcNMTQwNDI5MTYwOTQz
-WhcNMjQwNDI2MTYwOTQzWjAnMSUwIwYDVQQDExxyZWdpc3RyeS5sYXJwcC5pbnRl
-cm5ldDIuZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0kSJBA6Z
-eqoV7iBaEWg879SeOw29W2G5lBWDaqFaBYTH00WJCF5C+okSmc7bFNfbbk3zhams
-P6ZW9x52lc5AZopKidHmEJLFw54ZnEOgsxdjs5jb+iyoOOblxIbyoa10YsHsTzWV
-M3HGhXStTZJj805dTXxxkAaw2r5l4rT6h3DdkpDoSn2Ofdz9/V/HrpFIq2QHEaoU
-/pTscCaiX6ScTcpwjvYnkWubsP1QUTpukqL8GqESAulhSb9EZxAVdNwkDHSqYXjA
-k4ViF69MApkII7z5Kge4Ga27JQqxIJ6ymZMu2nkx49fezWMi3yOutxGm9lSO3SMP
-fndgfgvFRGMJcwIDAQABo0owSDAnBgNVHREEIDAeghxyZWdpc3RyeS5sYXJwcC5p
-bnRlcm5ldDIuZWR1MB0GA1UdDgQWBBQKBLaZOFBkfMFBvncyNI+q/+FuPjANBgkq
-hkiG9w0BAQUFAAOCAQEAgc2npKbviJmtknUn1aSMFCfUPjUWtO4QWP8IhYO3gC9r
-/J1EUsgxJDYuLVdsye/2mSz9y37O0TJ+bcwh9RRoo21vxj7UsKn7Crrux171dkCa
-J3J2czLUAOcZzoIxDM1mOUyI0D9QANpPxOH6707c8PSrNLk+5la7rpHXATPDyJlc
-wz1/tj+w3FgJhPG0qY+TOMGPSe+UagL2O4LMAyFk7I8vEWi60BlO52npDhaYGXeo
-mA/jv7XqqSBfGCvHS973BG/tP1XfuwmpJqgx00x0wQlbPweIH3RmmCg3S11ZCZi8
-Qpkmgq5ZqYDMrzfYjwLpl5kpRrMdP/1Nw6g2BGe6qA==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.larpp.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) Wiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Lifestyles of the Attribute Rich and Privacy Preserved (LARPP) is an activity funded by the National Strategies for Trusted Identities in Cyberspace (NSTIC) as part of the Scalable Privacy grant awarded to Internet2.   This activity supports pilot schools to investigate privacy management software, named PrivacyLens, to provide users with information and choices that allow them to exercise active, informed consent about the release of personal information, or “attributes,” in course of authentication to web sites and on-line services. This SP supports the LARPP wiki.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Internet2</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Internet2</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.internet2.edu</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tracy Beth Mitrano</md:GivenName>
-    <md:EmailAddress>tmitrano@internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>LARPP Technical Support</md:GivenName>
-    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LARPP Support</md:GivenName>
-    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LARPP Incident Response</md:GivenName>
-    <md:EmailAddress>support@lists.larpp.internet2.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml b/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml
deleted file mode 100644
index bd471f9d..00000000
--- a/swamid-interfederations-2.0/wiki.ligo.org-shibboleth-sp.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.ligo.org/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://wiki.ligo.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">LIGO Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Primary LIGO Scientific Collaboration wiki</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.ligo.org/Main/SPInformationURL</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://dcc.ligo.org/cgi-bin/DocDB/ShowDocument?docid=89243</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://login.ligo.org/SAML2/metadata/ui/ligologo80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIEVjCCAz6gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
-ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
-BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
-dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMDAyMDMyMDAyMTBaFw0yMDAy
-MDMyMDAyMTBaMGkxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
-FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFjAU
-BgNVBAMTDXdpa2kubGlnby5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCsizfsa9/YZeLqX0vLLrPxFG0M1cRzSOGOpfxwo3iYPbsw08uFuYjufCaT
-fDQr9T+ZimAlpBP4+yETnYa9R/A65Zmv7ydyge8SfKIdMRY2U23PSBQKMRTp/EdC
-+LFAVZQWlKNmfb9ajrFo776dWU1ZU9NHFkX3dMTeH+BI+kRIMZnlPp7urSutuLMj
-DhoT41XufOUeJUwFm+7g1lf+cbCSPmgRGEa46gHBI+572mOCck7GN0+Zj0H74o5i
-esZrMDf08E6qsH6KnahuMuZH22L25KHULq4P9ByNFGDScvgj34HlLo91J4SzHTjS
-wx/JNBwg4V1bV4o9SGvCrRLBrSr/AgMBAAGjgekwgeYwDAYDVR0TAQH/BAIwADAO
-BgNVHQ8BAf8EBAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBkG
-A1UdIAQSMBAwDgYMKwYBBAGB+kYCAQIBMDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6
-Ly9jYS5saWdvLm9yZy81NDE0MDRjMy81NDE0MDRjMy5jcmwwHwYDVR0jBBgwFoAU
-Um7de6pvhVwIItOXn61/I1YeatEwMAYDVR0RBCkwJ4INd2lraS5saWdvLm9yZ4EW
-c2NvdHQua29yYW5kYUBMSUdPLk9SRzANBgkqhkiG9w0BAQUFAAOCAQEAnrDCVAKE
-sv/StHC2c6VwYtrW14rgn/gmOYTWvfioYmteCuS5bqADuCN1qdNxi5nHsgXhX7UE
-aaLeOKBqhNbqu+YiS/va0Kk3Azq7BS+KC0iBhHMM+ZZ86jl93ItV/xsuBc5v/AWx
-jqqsEN8CN35bvZaNwm0mBARfhVll2b2T3r80mdmVbekcJKEry4H0ogGgYWNkcBt3
-rlVaEUap5FC3UzyTmKCkL65y0emhsR+6CEnmyTq5qOlMeyrgKlIJ8YXf/xj6oUaD
-6Zqf7DNzVW6gez9VkUlhivSgXaAfAZ9aJJn/aOsK3BUjJTmUCvps1F6THRr4tc0+
-fMO5DI9dhv07eg==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.ligo.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">LIGO Wiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Primary LIGO Scientific Collaboration wiki</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" 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="mail" Name="urn:mace:dir:attribute-def:mail" 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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">LIGO Scientific Collaboration</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ligo.caltech.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Scott Koranda</md:GivenName>
-    <md:EmailAddress>scott.koranda@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Warren Anderson</md:GivenName>
-    <md:EmailAddress>warren.anderson@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LIGO Identity Management Help Desk</md:GivenName>
-    <md:EmailAddress>rt-auth@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:icmd="http://id.incommon.org/metadata" contactType="other" icmd:contactType="http://id.incommon.org/metadata/contactType/security">
-    <md:GivenName>LIGO Security Committee</md:GivenName>
-    <md:EmailAddress>lsc-seccomm@ligo.org</md:EmailAddress>
-  </md:ContactPerson>
-</md: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.osris.org.xml b/swamid-interfederations-2.0/wiki.osris.org.xml
deleted file mode 100644
index 6df01886..00000000
--- a/swamid-interfederations-2.0/wiki.osris.org.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.osris.org">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="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://wiki.osris.org/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Open Storage Research Infrastructure</mdui:DisplayName>
-        <mdui:Description xml:lang="en">OSiRIS will provide a distributed, multi-institutional storage infrastructure that lets researchers write, manage, and share data from their own computing facility locations.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.osris.org</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC8TCCAdmgAwIBAgIJAPPtURtwvG1+MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDndpa2kub3NyaXMub3JnMB4XDTE2MDExNTIwMDQ1N1oXDTI2MDExMjIwMDQ1
-N1owGTEXMBUGA1UEAxMOd2lraS5vc3Jpcy5vcmcwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDxrrZ2C+1OdxvrF/d8xT1FUnZtnVVz0tQ+LnWF/J+kwyZP
-UqaVU/TwE47SqzxNi2EsUyd1xeD0gKtWnBi49oaEFnZlOmbQHQJk80XCVloNhh05
-UHevAlSvj+ZocxYtO7pEnxrRCSRFSnc1Sa31t/koaDJG8TFLWwgJcPhmYj18Clmi
-bZ85/+wxS7AmMaG/rYysvBRJu5ukyIQNRTPqZWmVxTAuQVbyDRpUHhtEvgSOWGzU
-rI/ey8O1T8zxjlLYSu/BPb/IVLrlHvIiTLnEw9KHzSgDGDwS5mk/a8pWlP7egUJ1
-cDeRkd/eZKzAUUg0+cg2F91US5WpFf1ZO2OyQAoNAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDndpa2kub3NyaXMub3JnMB0GA1UdDgQWBBSwVB2ckkXkWzGakcc94iSNBhbR
-NDANBgkqhkiG9w0BAQUFAAOCAQEA3mUqiLg+6dNh39h+dnqxba1j4zCWHd8rYfl9
-SZeZib1QQiCmUxyq2UbktxvvJeiPTgJO4VNSwL2RC4OaFmmpDob23TC0BjNrDeGJ
-GwvpWl7Y60MxyalNn4qcqpyaE4macMbIUFX9Z7dl6omabFtDaAvxs18OzwT0AN0D
-0Y5kLjJ8nV8DEC/A+h9A5ahVTSZ2TCYcmgcDNzmjLawa0Pw5Y3Mn5QGW3Uv1iqum
-fnCGgpa42xnggcZe/ghOHK2MbL0B4Q/R5Gmmj9QKbb6FzGFuyXZr3EmqZM4toGLD
-5WjtmZyVsNlqGoDtO350UYicc4AHu2Bic9RtuyvJq5ONACyMNw==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.osris.org/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.osris.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.osris.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.osris.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.osris.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.osris.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.osris.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Open Storage Research Infrastructure</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">OSiRIS will provide a distributed, multi-institutional storage infrastructure that lets researchers write, manage, and share data from their own computing facility locations.</md:ServiceDescription>
-      <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="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="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" 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">University of Michigan</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Michigan</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.umich.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Benjeman Meekhof</md:GivenName>
-    <md:EmailAddress>bmeekhof@umich.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Benjeman Meekhof</md:GivenName>
-    <md:EmailAddress>bmeekhof@umich.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Shawn McKee</md:GivenName>
-    <md:EmailAddress>smckee@umich.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki.research.data.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wiki.research.data.ac.uk-shibboleth.xml
deleted file mode 100644
index 5f27634f..00000000
--- a/swamid-interfederations-2.0/wiki.research.data.ac.uk-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://wiki.research.data.ac.uk/shibboleth">
-  <!--
-		This is a "Research Data Wiki" Shibboleth SP for University of Southampton.
-	-->
-  <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="2015-06-05T11:55: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: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.research.data.ac.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://wiki.research.data.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3zCCAcegAwIBAgIJAPaPm8gVAm0BMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHNydjAxMzAxMB4XDTE1MDQwMjEyNTg0MloXDTI1MDMzMDEyNTg0MlowEzER
-						MA8GA1UEAxMIc3J2MDEzMDEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDfsA4ib9rxKL+OooD55UgSppju/h/cnHReiuqBbgj+9JEMXclcVkbpNsM/8obD
-						rr145AFRFnjR4iulbu2k3Gaq5p9lU99FScWef6MZJIvggGspUDXGPTK9S9+BKGTC
-						iTtVo2R82KMQcJSXcgXEXL/J5fI0IkUyoFqEKJRHhTpksL2X1o8+yzrPMNum7LHI
-						dvovelNZU0lR+OkDvHC8OtzLQfeGbMmHe25eIg5MxLFwKIhN1A0nf8p/9V0ebMZk
-						+dHJCaCrN3B9/HFnLztv8vSYZi80389scTGY1WN4CExXvdCE7S4sMXxjnMswgS1t
-						Q2mD9zMOHfD9g6s6iFOHmda1AgMBAAGjNjA0MBMGA1UdEQQMMAqCCHNydjAxMzAx
-						MB0GA1UdDgQWBBRSD6vQncBgluvIjnNTPpg55TVGRzANBgkqhkiG9w0BAQUFAAOC
-						AQEAhKwv2Pfp4FuTwrNxHwZZlUvPpbZkrP7tOc/89zkDFEF6jcFIjra8VuXChgYK
-						X/Cn+XUS3mTdQaT7lVEI5MstYrFiX5mTLH/88lhz6kUAffPoyMfMT1f0hoi3Heda
-						UAnIHF8xHSiR9sZeSRb8w7aJfjym3DaCDkdy18sxe+c1FLGGOgC2+eQF1ASStNEg
-						IU9vrcDHDOwRktRzyDnqVIR57xot+ymtwezInJ1gGCgI7zIb4DarPPiKWjw5S+rT
-						fMj+8DR9bBmmZhRcV8DA+DPc0/Q3pN3tjX9qS8h8rM7Ij96SImWe3GK+I22zbHP1
-						jKWKgcjpB9wcSv4VfzZNGluFtw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.research.data.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.research.data.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Southampton</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Research Data Wiki</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.data.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Serviceline</GivenName>
-    <EmailAddress>mailto:Serviceline@soton.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Clayton</GivenName>
-    <SurName>Peters</SurName>
-    <EmailAddress>mailto:C.L.Peters@soton.ac.uk</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/wiki.surfnetlabs.nl.xml b/swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml
deleted file mode 100644
index 080a79c0..00000000
--- a/swamid-interfederations-2.0/wiki.surfnetlabs.nl.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wiki.surfnetlabs.nl/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-05-03T16:37:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Login" index="2"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SURFnetlabs Wiki</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="nl">SURFnetlabs Wiki</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SURFnetlabs Wiki</mdui:Description>
-        <mdui:Description xml:lang="nl">SURFnetlabs Wiki</mdui:Description>
-        <mdui:Logo height="300" width="500" xml:lang="en">https://static.surfconext.nl/media/sp/SURFnetdienst.png</mdui:Logo>
-        <mdui:Logo height="300" width="500" xml:lang="nl">https://static.surfconext.nl/media/sp/SURFnetdienst.png</mdui:Logo>
-        <mdui:Keywords xml:lang="en">wiki surfnet surfnetlabs</mdui:Keywords>
-        <mdui:Keywords xml:lang="nl">wiki surfnet surfnetlabs</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://wiki.surfnetlabs.nl</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="nl">https://wiki.surfnetlabs.nl</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.surfnet.nl/Documents/best_practice_privacy_SURFfederatie_SURFconext_EN.pdf</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="nl">http://www.surfnet.nl/Documents/best_practice_privacy_SURFfederatie_SURFconext_NL.pdf</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wiki.surfnetlabs.nl</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wiki.surfnetlabs.nl,OU=Services,O=SURFnet B.V.,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEfjCCA2agAwIBAgIRAPMC2j8GrCWf8rRjWzHCHh8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDAxMjUwMDAwMDBaFw0xMzAxMjQyMzU5NTlaMFUxCzAJBgNV
-BAYTAk5MMRUwEwYDVQQKEwxTVVJGbmV0IEIuVi4xETAPBgNVBAsTCFNlcnZpY2Vz
-MRwwGgYDVQQDExN3aWtpLnN1cmZuZXRsYWJzLm5sMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAwy0KxkE03WH+r/G3yn4QLP7vEIXaslJXS2vD3Ba8vWIu
-MSvdtRrimSnwGAo8C3Dn4NwsRj8hmZN6KO1Rf22M5QEPAmskNdBlZrv4AmMOpqle
-YkJ16sp6GEX6yjrbzWlzl4GBE5K0DztjeBc+Uu+CUFWVrepGaj5Nic1mTprj2gRA
-Q5yUd16w91CG9WydPF5gqJ63xQAw1DwzUxjO3Ki7YHcNyJsmhzGOwD954UCLeAQ3
-xy+j02yx3WjzKkBcTJmb5WnzJnYNEqhI/s+Sur+ckm72iIfPSbcy8uP7LE0HGzwE
-SWXmo/Whxzm5WRvI8nVjZ2WQRXq+axWclAcf15yEjwIDAQABo4IBZjCCAWIwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLjh9r/BG1J6
-vyOl7kQ2uHFIXl9iMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB4GA1UdEQQXMBWCE3dpa2ku
-c3VyZm5ldGxhYnMubmwwDQYJKoZIhvcNAQEFBQADggEBABbwQZuJ3HjsyZmHJDDE
-6aAbaMp6WLPPcihEl5VIHnV/ymBxEREol0dzXLFP8RJWAZHc7lMoD9M8t1UNpOD2
-Ix6r3nrM6UX8cP5Efp84ESkRETW3l5QWw/4+SoArsRRLZiNZ9hAeQFLQB5pODpNk
-sb3PYtEIZRq4nV4kP7T2zRGkllvIzoF/Z/Tf88Uxb8y7/d6q6sJx1kqZascmxBg7
-qieRAqjAtVENnmJFmUbp/6t5jLQ0zwqbsO4SHloodPjv5j3rkRzUBWcPQLvyyl6q
-LD1R7DW6m/DT9iQfZ11P3CV92ehsHFNqlGxakYH7S3ghv+dzcwWq53T8kTPaQaC6
-Fxw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wiki.surfnetlabs.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SURFnetlabs Wiki</md:ServiceName>
-      <md:ServiceName xml:lang="nl">SURFnetlabs Wiki</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">SURFnetlabs Wiki</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="nl">SURFnetlabs Wiki</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">SURFnet B.V.</md:OrganizationName>
-    <md:OrganizationName xml:lang="nl">SURFnet B.V.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="nl">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SURFnetlabs</md:GivenName>
-    <md:SurName>Beheer</md:SurName>
-    <md:EmailAddress>surfnetlabs-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SURFnetlabs</md:GivenName>
-    <md:SurName>Beheer</md:SurName>
-    <md:EmailAddress>surfnetlabs-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>SURFnetlabs</md:GivenName>
-    <md:SurName>Beheer</md:SurName>
-    <md:EmailAddress>surfnetlabs-beheer@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml b/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
deleted file mode 100644
index c5c3d7ef..00000000
--- a/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" 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>redclara.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
-MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
-bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
-cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
-RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
-l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
-/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
-UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
-amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
-AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
-G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
-ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
-dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
-cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
-KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
-BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
-bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
-ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
-DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
-8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
-MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
-I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
-yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
-s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
-</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>redclara.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=*.redclara.net,O=Cooperaci\C3\B3n Latinoamericana de Redes Avanzadas,L=Montevideo,C=UY</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFJzCCBA+gAwIBAgIQAycc1VlqLQ1YMhUWYD69ajANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
-aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQxMTI4MDAwMDAwWhcN
-MTcxMjA2MTIwMDAwWjB1MQswCQYDVQQGEwJVWTETMBEGA1UEBxMKTW9udGV2aWRl
-bzE4MDYGA1UECgwvQ29vcGVyYWNpw7NuIExhdGlub2FtZXJpY2FuYSBkZSBSZWRl
-cyBBdmFuemFkYXMxFzAVBgNVBAMMDioucmVkY2xhcmEubmV0MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4ciHwzKgzkUxp9PSRy9gV4WfIAmIjugbR8f9
-RJD9GwoMPTA173v4Rzjbnl8h/3e+iDfdzetHRM+gkOXwPCaGFpBQa2EPnxtFaaH6
-l8xtfHlsl8D2lqRkOE2OjvP8GzgpT3ikMBXoNr4TL7RQqzinwYCCJzLMSflwNbtk
-/a04k3l9FyxJ4mqEFP6aUsPJA0YRLVrYOIyppRzcHbRng/pNPE0R+JhNC3Kx2SbJ
-UvKtjQfvMJCn2T2dn5hg5mFnyMl78pgmRjppgxWEWkti+4eZoLg0OwVEFyGEgmEU
-amd6JmRZTDs04BtstymJNXdkTsCP7yk92lpAc9C3NZ3FvrR0eQIDAQABo4IB2TCC
-AdUwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0OBBYEFBFj
-G3+tyY7afXZLfXNuYoGnE0nEMCcGA1UdEQQgMB6CDioucmVkY2xhcmEubmV0ggxy
-ZWRjbGFyYS5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-BggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8vY3JsMy5kaWdpY2Vy
-dC5jb20vc3NjYS1zaGEyLWczLmNybDAvoC2gK4YpaHR0cDovL2NybDQuZGlnaWNl
-cnQuY29tL3NzY2Etc2hhMi1nMy5jcmwwQgYDVR0gBDswOTA3BglghkgBhv1sAQEw
-KjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzB8Bggr
-BgEFBQcBAQRwMG4wJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNv
-bTBGBggrBgEFBQcwAoY6aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0RpZ2lD
-ZXJ0U0hBMlNlY3VyZVNlcnZlckNBLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3
-DQEBCwUAA4IBAQB3WePP9QxLi7OdtCbfR6kqIPDvfVX3aMvJ3/LQW9GhugwkV+ay
-8GyG17Dbm6Y2YSn1vl36lf/Nas4Lxf5jaVKXXoPUfANaDlJkK3E+cMsh1xrs8Uef
-MgiRll8Q28jA1RH+vmA+hzHOhuNqM8xHl2c/9Eq7FmFYoP4A1Lo/N9dEHHlHhSkG
-I6kBgBW/MAPvSLLPWr4v0u+/ynH9v+PEo60skvnrQPH0wFPoyJd/zxOMaomleJEv
-yL8CtS8Jo8/gqJ76zITM2JD1Cd+NBrPLk41I/hcfQ7Eewb/lkKe8/tpNm3e3bXJG
-s5W/0Lq2GRjQh9nrDfVs2IuE1c5zeqToyp98
-</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:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Artifact"/>
-    <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-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Artifact"/>
-    <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-Redirect" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wiki2.redclara.net/Shibboleth.sso/NIM/SOAP"/>
-    <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:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki2.redclara.net/Shibboleth.sso/SAML2/POST" index="10"/>
-    <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="11"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Wiki - RedCLARA</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">
-Wiki - RedCLARA
-</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="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:AttributeConsumingService>
-  </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/wikis.ncl.ac.uk-shibboleth-metadata.xml b/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.xml
deleted file mode 100644
index e19db917..00000000
--- a/swamid-interfederations-2.0/wikis.ncl.ac.uk-shibboleth-metadata.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://wikis.ncl.ac.uk/shibboleth/metadata">
-  <!--
-		This is a "Wiki Server" Shibboleth SP for the University of Newcastle upon Tyne.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://wikis.ncl.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC0zCCAbugAwIBAgIJAJ5lZZ3UDF+vMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-						BAMTBHdvb2wwHhcNMTAwNzIxMTUwNjAyWhcNMjAwNzE4MTUwNjAyWjAPMQ0wCwYD
-						VQQDEwR3b29sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq9QD8/89
-						D4fl/yN46TE0Et2YC+V42N2i+mVGf5RSajMAL5/kA72SMDKlLs3l8npwHhQYqbx1
-						ku4UX+q+VwWTzRu5zzX0LHIstRQwexB9ht6LHt+Uh+keEz/uIagt1J8ORtH1yU81
-						r/q+pvnmzInZ8fMTEntwrnZmHZr1OxXrd55YlpYIFbGqHsnov9jmSQcpHRe3dGMN
-						wuFvxL9xZO3dFem0hL3HpB/i2rObcTx9QXjCmf3SwaKOOA9Mug9bxCHUmd15eS8h
-						X396YwLmsl5OeIRceedKj1zW3xLAeqckyPJ9hjIY5qcRpnnRnKRUxTe+jNbWc+hf
-						8TBhvibjUUwmUQIDAQABozIwMDAPBgNVHREECDAGggR3b29sMB0GA1UdDgQWBBSV
-						6Mqy3JMWnbtIamyrPz/QWZVA5jANBgkqhkiG9w0BAQUFAAOCAQEAnb8LFzMKf73A
-						Mt8+ATRNF2kGgTbNybqCCYytGtwRCklUm/2+ZyjxygRWBzZ+GhRf1n9lKtgaJVzr
-						dCD0Xe52goYAfZTzf/QV05IHu6rpVDa4z96UlOa138GW5iwPMrvwAktEQVR8OePo
-						gx51PZjK4oz1i6RnwOcMQo5Qoa9pIW2ikoH9DvpP9vzWEhZ00fk7Rw3iy4VMnZL2
-						lcL8YuTGkE1YWdFoQHkQpZ1fAHZ6cJMLcqFGLMRWGrDUqtIT1c507zFu9VLLuMGT
-						+/se1eh3vEctX9ZbP3mjDEzhlm3ru/jHCQmBfaneobWjg11tv9WUmBBz0FlcXiLx
-						Fht0jB8U9w==
-					</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>
-						MIIC0zCCAbugAwIBAgIJAJ5lZZ3UDF+vMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
-						BAMTBHdvb2wwHhcNMTAwNzIxMTUwNjAyWhcNMjAwNzE4MTUwNjAyWjAPMQ0wCwYD
-						VQQDEwR3b29sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq9QD8/89
-						D4fl/yN46TE0Et2YC+V42N2i+mVGf5RSajMAL5/kA72SMDKlLs3l8npwHhQYqbx1
-						ku4UX+q+VwWTzRu5zzX0LHIstRQwexB9ht6LHt+Uh+keEz/uIagt1J8ORtH1yU81
-						r/q+pvnmzInZ8fMTEntwrnZmHZr1OxXrd55YlpYIFbGqHsnov9jmSQcpHRe3dGMN
-						wuFvxL9xZO3dFem0hL3HpB/i2rObcTx9QXjCmf3SwaKOOA9Mug9bxCHUmd15eS8h
-						X396YwLmsl5OeIRceedKj1zW3xLAeqckyPJ9hjIY5qcRpnnRnKRUxTe+jNbWc+hf
-						8TBhvibjUUwmUQIDAQABozIwMDAPBgNVHREECDAGggR3b29sMB0GA1UdDgQWBBSV
-						6Mqy3JMWnbtIamyrPz/QWZVA5jANBgkqhkiG9w0BAQUFAAOCAQEAnb8LFzMKf73A
-						Mt8+ATRNF2kGgTbNybqCCYytGtwRCklUm/2+ZyjxygRWBzZ+GhRf1n9lKtgaJVzr
-						dCD0Xe52goYAfZTzf/QV05IHu6rpVDa4z96UlOa138GW5iwPMrvwAktEQVR8OePo
-						gx51PZjK4oz1i6RnwOcMQo5Qoa9pIW2ikoH9DvpP9vzWEhZ00fk7Rw3iy4VMnZL2
-						lcL8YuTGkE1YWdFoQHkQpZ1fAHZ6cJMLcqFGLMRWGrDUqtIT1c507zFu9VLLuMGT
-						+/se1eh3vEctX9ZbP3mjDEzhlm3ru/jHCQmBfaneobWjg11tv9WUmBBz0FlcXiLx
-						Fht0jB8U9w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wikis.ncl.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Newcastle upon Tyne</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newcastle University Wiki Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ncl.ac.uk/itservice/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Franks</SurName>
-    <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Franks</SurName>
-    <EmailAddress>mailto:chris.franks@ncl.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wireless.balliol.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wireless.balliol.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5810aaed..00000000
--- a/swamid-interfederations-2.0/wireless.balliol.ox.ac.uk-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://wireless.balliol.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Balliol Wireless Registration" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-07-04T20:18:02Z"/>
-  </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://wireless.balliol.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAL0W0N8MnpwIMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXdpcmVsZXNzLmJhbGxpb2wub3guYWMudWswHhcNMTMwNzAzMTU0NDQ3WhcN
-						MjMwNzAxMTU0NDQ3WjAkMSIwIAYDVQQDExl3aXJlbGVzcy5iYWxsaW9sLm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl1qmnXqFQamtt0U8
-						fM++v+tB39nr+IEiEWbApx+B/eq4ZgCwzlknQYYmb6lFk8s3mbdOvNUkFFzxRU89
-						jtdFEaMv9BE2GZCcmS8jlBUfJjRoGtj3qPeLhIgnw4pvy0XhN6GBEGjJmfEaLj6H
-						lTaogehd3nn/xo/Tv95kX8PKvmiROn+DEDP7UjAVGDwWCXPpxb9PnUhuuy9qscmN
-						FnTTgHyv+euhX2vS5FmKh8Y4nYPG3+tUB/6vcM8ht2ufjnGc2HDAs+uWCfTtt9Ii
-						sfmzDugU/ofp4lz716wdTMk3TvvVZz4ka4BdmpkaKiQPgAmEt8id+IwLBtJe3hzy
-						UpF2uQIDAQABo0cwRTAkBgNVHREEHTAbghl3aXJlbGVzcy5iYWxsaW9sLm94LmFj
-						LnVrMB0GA1UdDgQWBBSW1Hxc9OSMoWtdwVj5ZeOjkPHG+TANBgkqhkiG9w0BAQUF
-						AAOCAQEADUulFlwmminMcwKs8F69Tgz7LLK99Cm6CLGacbInrwUUzmWVe3dXjvfd
-						VVt2sV6p6DN/wZNiMcLOok13ozgNJZmRX59B0Du/+iFJMaA6v+UpUP7xjLUr0d9Z
-						wbnY41XW2Ne/Ncuob6fugIRgRvL4hyYwwxweeET1w7ALWeljHE54Rd6yOM71xlF9
-						xFjcoY+Zzmup2CeUd1XVGh6qz5o2IqlHFdx2GiU+2yMefLf4e/Lp5OLeUhzAWRDL
-						4xEP7LxWJRlHWhsQf5fSl9Hv0uZsrm77uA8gtN0OtXS3ZQjM7h5u/CexvhUTr+7Z
-						jCw+THjJifsi/CB6ktA9EASTK9vGrw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://wireless.balliol.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wireless.balliol.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Balliol Wireless Registration</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.balliol.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ian</GivenName>
-    <SurName>Plummer</SurName>
-    <EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Plummer</SurName>
-    <EmailAddress>mailto:ian.plummer@balliol.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 217e022c..00000000
--- a/swamid-interfederations-2.0/wolf-print.wolf.ox.ac.uk-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://wolf-print.wolf.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 Wolfson Print Server SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJANOq9kmAYRWdMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHdvbGYtcHJpbnQud29sZi5veC5hYy51azAeFw0xMDEwMjgxMzA0NDRaFw0y
-						MDEwMjUxMzA0NDRaMCMxITAfBgNVBAMTGHdvbGYtcHJpbnQud29sZi5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoxdlwPXfGThJT5GBUs
-						fVVZVXVHc50sRYZDS2Cs7EQJw4omts2DmN+sRMva8Rpg3GMW8HsaEtzgsvfSXZvp
-						S6zFluzdLEOrayxQWemAumYXWbMVGIQjN0olKOQzMPDvdUHesdcLZABdsxXqrEYB
-						PURPLCiMN75i9Rl6C3JJay9z2wzU1QSnsT9g8xvpVG1jO/OKvC+MnENWUhfAK0gw
-						bVqm10vmvfy8FWn+XSbif02kDMvcXVOm1t7gqkmPlXYDE58iVCg2Gwc2MQbfJKfd
-						R7Hj0RziwsmC7MaxARBGnx8yWh3Eu+u73GEU858sCIqU5gAfT4S+O62I2D38baYl
-						MlMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd29sZi1wcmludC53b2xmLm94LmFjLnVr
-						MB0GA1UdDgQWBBQVWTsmA9E39YYdAz35w5h8M2CxEDANBgkqhkiG9w0BAQUFAAOC
-						AQEAI/suxhJXyu5lgBh23wP97d3Mo/LXZ6QxqgFV0PPpADQxnQiEIFwvOcJ4S0sK
-						xpdh2Ens5sEowOE110ExqRhPRs8SnpV83tumJMKrFM+sT1+UdmKlKP9ZHwuctghy
-						kYfT1FiZcQ4xCP/pL60MDEUHKSQsLOEmINDDeg35oHKUV5/w+DxowvkHCFHExTEK
-						OoBkuRw2/wvTRdy8kDWV1XpaVfUj7ci/5F+onPybMpcEStKoDFvtMoxMeoV/j+Ip
-						d0Pm166IMhjBQxteWIvPAw9F8QWEbDHL2X7rtjDT61obKLKKlr+RI7SwSd+rmmG+
-						Nt9+nCX95b/RaMAOP1/SUQcLTA==
-					</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>
-						MIIDDzCCAfegAwIBAgIJANOq9kmAYRWdMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHdvbGYtcHJpbnQud29sZi5veC5hYy51azAeFw0xMDEwMjgxMzA0NDRaFw0y
-						MDEwMjUxMzA0NDRaMCMxITAfBgNVBAMTGHdvbGYtcHJpbnQud29sZi5veC5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALoxdlwPXfGThJT5GBUs
-						fVVZVXVHc50sRYZDS2Cs7EQJw4omts2DmN+sRMva8Rpg3GMW8HsaEtzgsvfSXZvp
-						S6zFluzdLEOrayxQWemAumYXWbMVGIQjN0olKOQzMPDvdUHesdcLZABdsxXqrEYB
-						PURPLCiMN75i9Rl6C3JJay9z2wzU1QSnsT9g8xvpVG1jO/OKvC+MnENWUhfAK0gw
-						bVqm10vmvfy8FWn+XSbif02kDMvcXVOm1t7gqkmPlXYDE58iVCg2Gwc2MQbfJKfd
-						R7Hj0RziwsmC7MaxARBGnx8yWh3Eu+u73GEU858sCIqU5gAfT4S+O62I2D38baYl
-						MlMCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd29sZi1wcmludC53b2xmLm94LmFjLnVr
-						MB0GA1UdDgQWBBQVWTsmA9E39YYdAz35w5h8M2CxEDANBgkqhkiG9w0BAQUFAAOC
-						AQEAI/suxhJXyu5lgBh23wP97d3Mo/LXZ6QxqgFV0PPpADQxnQiEIFwvOcJ4S0sK
-						xpdh2Ens5sEowOE110ExqRhPRs8SnpV83tumJMKrFM+sT1+UdmKlKP9ZHwuctghy
-						kYfT1FiZcQ4xCP/pL60MDEUHKSQsLOEmINDDeg35oHKUV5/w+DxowvkHCFHExTEK
-						OoBkuRw2/wvTRdy8kDWV1XpaVfUj7ci/5F+onPybMpcEStKoDFvtMoxMeoV/j+Ip
-						d0Pm166IMhjBQxteWIvPAw9F8QWEbDHL2X7rtjDT61obKLKKlr+RI7SwSd+rmmG+
-						Nt9+nCX95b/RaMAOP1/SUQcLTA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wolf-print.wolf.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Wolfson Print Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wolfson.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Wolfson IT Team</GivenName>
-    <EmailAddress>mailto:it.support@wolfson.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Wolfson IT Team</GivenName>
-    <EmailAddress>mailto:it.support@wolfson.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 5742dd34..00000000
--- a/swamid-interfederations-2.0/worc-helium.worc.ox.ac.uk-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://worc-helium.worc.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Worcester College" Shibboleth SP for the University of Oxford.
-	-->
-  <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-05-28T11:00:42Z">
-      <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://worc-helium.worc.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAPxhwWeLeBDXMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXdvcmMtaGVsaXVtLndvcmMub3guYWMudWswHhcNMTQwNTIwMDgyNTU4WhcN
-						MjQwNTE3MDgyNTU4WjAkMSIwIAYDVQQDExl3b3JjLWhlbGl1bS53b3JjLm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmLbLe8TwEjaaC03R
-						MrxiOUoNbl6NWPFHCJIDQx+iZxLiz2z2m2XoxV6hAo665LEfLw9W2J7ezs65c1pH
-						NANZZDCYbP1RfQnwUhi+RUD2HRnUVkxtpEVlFRKYGY/BrPFmDZrl3JYkpKAo8Bat
-						QgmppFeAfk6vq1XiKQHaJNZ9u70J/OJJyfaySk+TuIENHKXJPLoj96PyqSYDJR8s
-						yzHb/4rlgQw4Re9lt2qca2jgSvSLRHUKh6HZP1aDC8MfTDVv8SYW4lN0tVCoOR7i
-						S/ilVQ0bzXqmP+wV0jcC7pZFKfJVg0lghQ9IYlTqkXpZTxVkpq5QUnUJzQIeBJJE
-						PuX2VwIDAQABo0cwRTAkBgNVHREEHTAbghl3b3JjLWhlbGl1bS53b3JjLm94LmFj
-						LnVrMB0GA1UdDgQWBBRb2Hss1FfaYrDXm3LjSbSUoBFm3DANBgkqhkiG9w0BAQUF
-						AAOCAQEAd8t3tqqcV3bkE0RY+fqe927xLwv+Wu/d6x7XdyWnEuF2sBlPFrXOvQGI
-						Dn/lLXcBKTegExgMWJMJWfvDdvnFJNE3bEIFPzbAVflIrEFCpjRQddeyuai2zhXI
-						uSJ3MY2TtkdrL3NwkXcW1iWJC53cEMCVCOL2F1Iu//aDnLb2cJ4EserpHd7tW7SW
-						ljqH7+Oh6I4We8uAHXLATIx5AWiJb3eBDTIW4+2ONMTmM1h46w5PaEZc18Q33V8l
-						s8OgMS4FQndWsAxmlifeTc8Q43CYwnUptF4O9L6G2m+tY7MZYmXs4NlIyjcNrjo4
-						L0NVEMMPEA9hZ7XNpgNMgL66E6tSMg==
-					</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://worc-helium.worc.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://worc-helium.worc.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford, Worcester College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.worc.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Karen</GivenName>
-    <SurName>Wells</SurName>
-    <EmailAddress>mailto:computing.manager@worc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Karen</GivenName>
-    <SurName>Wells</SurName>
-    <EmailAddress>mailto:computing.manager@worc.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wpkfl-shibidp.fullsail.com-idp-shibboleth.xml b/swamid-interfederations-2.0/wpkfl-shibidp.fullsail.com-idp-shibboleth.xml
deleted file mode 100644
index 2c55ca08..00000000
--- a/swamid-interfederations-2.0/wpkfl-shibidp.fullsail.com-idp-shibboleth.xml
+++ /dev/null
@@ -1,70 +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://wpkfl-shibidp.fullsail.com/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </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">fullsail.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Full Sail University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Full Sail University Checkpoint SSO</mdui:Description>
-        <mdui:Logo height="143" width="200" xml:lang="en">https://checkpoint.fullsail.edu/idp/images/logo.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>
-MIIDVDCCAjygAwIBAgIVAIpG49/ZzLIEkCOJeLi5E3E159voMA0GCSqGSIb3DQEB
-BQUAMCUxIzAhBgNVBAMTGndwa2ZsLXNoaWJpZHAuZnVsbHNhaWwuY29tMB4XDTEz
-MTAyOTE3NDc0OFoXDTMzMTAyOTE3NDc0OFowJTEjMCEGA1UEAxMad3BrZmwtc2hp
-YmlkcC5mdWxsc2FpbC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCN3/CDOJAl7fDayQy73ggzkramHRTdA+NWE9xmaVOJhTkVvrwehmA9itC5pdOm
-UjyJlFqm7TiluiXZF41gD7yjEIIyENg54ic6CijI+6ZSpqKWhIw0med6t+JYC0Fo
-ZbpQmeQNt1DD+hamjx8CrO11HxyrIsdcpi1eXftBRiJxoMx98n7wNKgimxj+pBKo
-tP/26Klau8lfbQWg8d7hXEksAtjBtcW/IL3+1kjIWjMAyxEQdfoWaDQ6Qp9z0sFc
-4I7mBWivJdShRAjoaB6ndeozXTMuBUmzGjNAsNn861Oeabnx3k72aK7sEuRdPgkA
-pvpJRwiEshhm2fnUQU/Tip9pAgMBAAGjezB5MFgGA1UdEQRRME+CGndwa2ZsLXNo
-aWJpZHAuZnVsbHNhaWwuY29thjFodHRwczovL3dwa2ZsLXNoaWJpZHAuZnVsbHNh
-aWwuY29tL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQZegzZsFXeSvn83npxWIqz
-+fy2mTANBgkqhkiG9w0BAQUFAAOCAQEAhO/vH5xIgU+XtyvXY6IlOVr+2iMn0muX
-Avzj8Rz32GEavJILMRrSpmw7X0c09x6AdCCRd2Xh0AvJifKlqzRZPxBRaVPB39v/
-o7vUjaXHV4eABUk/zRaNA3M+hVDtVNsX16M0PEcsy1BZjY9UYTni1Styt23oPc41
-Ujhflurc9F3FwFJgWyYbJJ2COhaEVRBoi7yfzHeRDUqmDWdvxZgJc0TU0BR0epn1
-BqP0e3zKh+INk8C7cmxuq5PNOeoliw+vfUzWIaunVslvid8v3DtscZjw5BpOw41l
-fJOsETM8ltGzWjTd7OTear4ubIHQ6AxT7JemRt+AYPJbKG2VxsUP+Q==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://checkpoint.fullsail.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://checkpoint.fullsail.edu/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Full Sail University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Full Sail University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fullsail.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Zach Segal</md:GivenName>
-    <md:EmailAddress>zsegal@fullsail.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Chris Johnson</md:GivenName>
-    <md:EmailAddress>cjohnson@fullsail.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Mark Gilbert</md:GivenName>
-    <md:EmailAddress>markg@fullsail.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Zach Segal</md:GivenName>
-    <md:EmailAddress>zsegal@fullsail.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml
deleted file mode 100644
index 2d84a7e3..00000000
--- a/swamid-interfederations-2.0/wsso.vscht.cz-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wsso.vscht.cz/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2012-10-22T11:17: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/university</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">vscht.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Chemistry and Technology, Prague</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Vysoká škola chemicko-technologická Praze</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students of the University of Chemistry and Technology in Prague</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a studenty Vysoké školy chemicko-technologické v Praze</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.vscht.cz/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.vscht.cz/</mdui:InformationURL>
-        <mdui:Logo height="40" width="40">https://wsso.vscht.cz/logo_vscht_40px.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>
-MIIDFDCCAfygAwIBAgIJAKMDfYjjTNSxMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXdzc28udnNjaHQuY3owHhcNMTUwODI4MTIyNTMwWhcNMTgwODI3MTIyNTMw
-WjAYMRYwFAYDVQQDEw13c3NvLnZzY2h0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4PhQlXne7imNIZ4BCXcA1mqNEdeVrf1G+IyF8LZbGDt83nfN
-3toWixvfE1dFAIB2m2QTlRShMk/rhSYZZ7YAd/9ujpnRg5abNXcOu2EYneJl70rU
-wbIcSuL47hjE0Wt5XOTgw+lIzOmERy7aP/eX4VMrlKo0Zr+3cGuinxCVNmkc914d
-bOoiBnU7w3MwUk0CFSGQ6DqFLdauYs7WoqubEBBAClXBLicEBPU8S2hvsa335NL4
-PUK88cW4tETDU89X6jRpxOMBKdVTDepZ4P1y+cRhbzf3Gl90u/oub/AXRHntwoMD
-gpX8wE7wIY75pFbRMNPfKsu2vZBiu73NSKlOhwIDAQABo2EwXzA+BgNVHREENzA1
-gg13c3NvLnZzY2h0LmN6hiRodHRwczovL3dzc28udnNjaHQuY3ovaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFMqTaylMN+eMOxsB5FGMO+nmXtZUMA0GCSqGSIb3DQEB
-BQUAA4IBAQAI9iwzEXoxwEaWztPrCiq1Q4bTeRRaHBc5E7aIQ9vNeZL3PwbDsorS
-v5y8HOEQmJgfNOyXvuR7bkOQIWS4HgLyMnwhBs5o2UNvaBOORUUUej6N7C4Yzumj
-bbSHKhb7Sw0eukh47Ojn/utVyEDb7DWYqt+fK398r/OszgQpKd0M5e8Rml8wEv3W
-6v/6GSFzctj5DmgQMvtHkwmOHfkdyjFUQkq61cdes3y0hO8wpNM4Jy9NfvFudKto
-5mv/AhMCzv8ZtyMuvpjtCcnr5jR6G5jpVbOnaMT12mF8M1pdcBWS8rg/PzDSVdfp
-wuwwICx8lcu0GWQYTWR2+DVgH2hebKgY
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wsso.vscht.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wsso.vscht.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: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://wsso.vscht.cz/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wsso.vscht.cz/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wsso.vscht.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wsso.vscht.cz/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">vscht.cz</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDFDCCAfygAwIBAgIJAKMDfYjjTNSxMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMTDXdzc28udnNjaHQuY3owHhcNMTUwODI4MTIyNTMwWhcNMTgwODI3MTIyNTMw
-WjAYMRYwFAYDVQQDEw13c3NvLnZzY2h0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4PhQlXne7imNIZ4BCXcA1mqNEdeVrf1G+IyF8LZbGDt83nfN
-3toWixvfE1dFAIB2m2QTlRShMk/rhSYZZ7YAd/9ujpnRg5abNXcOu2EYneJl70rU
-wbIcSuL47hjE0Wt5XOTgw+lIzOmERy7aP/eX4VMrlKo0Zr+3cGuinxCVNmkc914d
-bOoiBnU7w3MwUk0CFSGQ6DqFLdauYs7WoqubEBBAClXBLicEBPU8S2hvsa335NL4
-PUK88cW4tETDU89X6jRpxOMBKdVTDepZ4P1y+cRhbzf3Gl90u/oub/AXRHntwoMD
-gpX8wE7wIY75pFbRMNPfKsu2vZBiu73NSKlOhwIDAQABo2EwXzA+BgNVHREENzA1
-gg13c3NvLnZzY2h0LmN6hiRodHRwczovL3dzc28udnNjaHQuY3ovaWRwL3NoaWJi
-b2xldGgwHQYDVR0OBBYEFMqTaylMN+eMOxsB5FGMO+nmXtZUMA0GCSqGSIb3DQEB
-BQUAA4IBAQAI9iwzEXoxwEaWztPrCiq1Q4bTeRRaHBc5E7aIQ9vNeZL3PwbDsorS
-v5y8HOEQmJgfNOyXvuR7bkOQIWS4HgLyMnwhBs5o2UNvaBOORUUUej6N7C4Yzumj
-bbSHKhb7Sw0eukh47Ojn/utVyEDb7DWYqt+fK398r/OszgQpKd0M5e8Rml8wEv3W
-6v/6GSFzctj5DmgQMvtHkwmOHfkdyjFUQkq61cdes3y0hO8wpNM4Jy9NfvFudKto
-5mv/AhMCzv8ZtyMuvpjtCcnr5jR6G5jpVbOnaMT12mF8M1pdcBWS8rg/PzDSVdfp
-wuwwICx8lcu0GWQYTWR2+DVgH2hebKgY
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wsso.vscht.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wsso.vscht.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="en">University of Chemistry and Technology Prague</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Vysoká škola chemicko-technologická Praze</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Chemistry and Technology Prague</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Vysoká škola chemicko-technologická Praze</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vscht.cz/?jazyk=en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.vscht.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Antonin</md:GivenName>
-    <md:SurName>Mares</md:SurName>
-    <md:EmailAddress>antonin.mares@vscht.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wtc.tu-chemnitz.de.xml b/swamid-interfederations-2.0/wtc.tu-chemnitz.de.xml
deleted file mode 100644
index cc82d1b0..00000000
--- a/swamid-interfederations-2.0/wtc.tu-chemnitz.de.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wtc.tu-chemnitz.de/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-chemnitz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wtc.tu-chemnitz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wtc.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECiCgyzANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
-IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
-Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
-MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzAzMjExMjIx
-MTdaFw0xMjAzMTkxMjIxMTdaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
-bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
-YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd0Yy50dS1jaGVtbml0ei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+2w7+rgzrPmceRsLNWrxem
-yS5PuUBEi43QyI+lLSNUnrXH24m7xxRTFvSUx00RZpgv8TlPn/DjKzcmOBF+lzWA
-3vN7aSb2IAObDp24UNwk34lHbz1XMPQQlA/jdeC3fnDF7w4vbgSv9YpVa+RvP0+P
-pci5A9DYDJyHhPmHaolZtnIDRfNyyM85COAUPDs5cFuu9y16WpBsg1goM7x2i2Ax
-sbiSYplHTXPSd6bKJeng1c1UJR6ljsXqV49jT3Tue6sgr80vxg163moNcZrigtP6
-9+CAlq+Ua7PDfjUg34bcRWWjrWUMYCzdT+WGVWg3rfy3zSzlwyCBSZaK8y9JiEMC
-AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUq7270y+eyopsxvaKOG50i8Cm
-e2EwHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
-d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
-MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAMQ3RpVa2ol0+LNS4LFJUifiOV+UBZnJQZUtGaFj1IY5yaspx
-WQgPsSziliJKB+SrFe0YPo0CoVXd49Yj0yGG5YUJZh6FjogrO8TYPks98Gc2e1jI
-jQNPTkYmfwWp7xoDnsOHj0DUFdJUhjifHdznDOjnRv42ozFAv41MV1wfa+aK8Hg+
-r11BO2sOmEmhUFMju1Ue9LZgTF26QK+1h92yum9OYelTl7EvqCxcLMTyaHhN+1B6
-H78ZRiTR2FIhCcxG3vMpmy0qClqoafmW/jaXLLsJ5kv8o9UhNpkbxV7pcKHvW+cH
-qwWF033ugvvEeLQojH4jr+VD3Ky+6LS9ELV7Ww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wtc.tu-chemnitz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wtc.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECiCgyzANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
-IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
-Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
-MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzAzMjExMjIx
-MTdaFw0xMjAzMTkxMjIxMTdaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
-bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
-YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd0Yy50dS1jaGVtbml0ei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+2w7+rgzrPmceRsLNWrxem
-yS5PuUBEi43QyI+lLSNUnrXH24m7xxRTFvSUx00RZpgv8TlPn/DjKzcmOBF+lzWA
-3vN7aSb2IAObDp24UNwk34lHbz1XMPQQlA/jdeC3fnDF7w4vbgSv9YpVa+RvP0+P
-pci5A9DYDJyHhPmHaolZtnIDRfNyyM85COAUPDs5cFuu9y16WpBsg1goM7x2i2Ax
-sbiSYplHTXPSd6bKJeng1c1UJR6ljsXqV49jT3Tue6sgr80vxg163moNcZrigtP6
-9+CAlq+Ua7PDfjUg34bcRWWjrWUMYCzdT+WGVWg3rfy3zSzlwyCBSZaK8y9JiEMC
-AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUq7270y+eyopsxvaKOG50i8Cm
-e2EwHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
-d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
-MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAMQ3RpVa2ol0+LNS4LFJUifiOV+UBZnJQZUtGaFj1IY5yaspx
-WQgPsSziliJKB+SrFe0YPo0CoVXd49Yj0yGG5YUJZh6FjogrO8TYPks98Gc2e1jI
-jQNPTkYmfwWp7xoDnsOHj0DUFdJUhjifHdznDOjnRv42ozFAv41MV1wfa+aK8Hg+
-r11BO2sOmEmhUFMju1Ue9LZgTF26QK+1h92yum9OYelTl7EvqCxcLMTyaHhN+1B6
-H78ZRiTR2FIhCcxG3vMpmy0qClqoafmW/jaXLLsJ5kv8o9UhNpkbxV7pcKHvW+cH
-qwWF033ugvvEeLQojH4jr+VD3Ky+6LS9ELV7Ww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wtc.tu-chemnitz.de:8443/shibboleth-idp/Artifact" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://wtc.tu-chemnitz.de/shibboleth-idp/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tu-chemnitz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wtc.tu-chemnitz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wtc.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECiCgyzANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
-IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
-Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
-MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzAzMjExMjIx
-MTdaFw0xMjAzMTkxMjIxMTdaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
-bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
-YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd0Yy50dS1jaGVtbml0ei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+2w7+rgzrPmceRsLNWrxem
-yS5PuUBEi43QyI+lLSNUnrXH24m7xxRTFvSUx00RZpgv8TlPn/DjKzcmOBF+lzWA
-3vN7aSb2IAObDp24UNwk34lHbz1XMPQQlA/jdeC3fnDF7w4vbgSv9YpVa+RvP0+P
-pci5A9DYDJyHhPmHaolZtnIDRfNyyM85COAUPDs5cFuu9y16WpBsg1goM7x2i2Ax
-sbiSYplHTXPSd6bKJeng1c1UJR6ljsXqV49jT3Tue6sgr80vxg163moNcZrigtP6
-9+CAlq+Ua7PDfjUg34bcRWWjrWUMYCzdT+WGVWg3rfy3zSzlwyCBSZaK8y9JiEMC
-AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUq7270y+eyopsxvaKOG50i8Cm
-e2EwHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
-d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
-MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAMQ3RpVa2ol0+LNS4LFJUifiOV+UBZnJQZUtGaFj1IY5yaspx
-WQgPsSziliJKB+SrFe0YPo0CoVXd49Yj0yGG5YUJZh6FjogrO8TYPks98Gc2e1jI
-jQNPTkYmfwWp7xoDnsOHj0DUFdJUhjifHdznDOjnRv42ozFAv41MV1wfa+aK8Hg+
-r11BO2sOmEmhUFMju1Ue9LZgTF26QK+1h92yum9OYelTl7EvqCxcLMTyaHhN+1B6
-H78ZRiTR2FIhCcxG3vMpmy0qClqoafmW/jaXLLsJ5kv8o9UhNpkbxV7pcKHvW+cH
-qwWF033ugvvEeLQojH4jr+VD3Ky+6LS9ELV7Ww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wtc.tu-chemnitz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wtc.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECiCgyzANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
-IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
-Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
-MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzAzMjExMjIx
-MTdaFw0xMjAzMTkxMjIxMTdaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
-bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
-YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd0Yy50dS1jaGVtbml0ei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+2w7+rgzrPmceRsLNWrxem
-yS5PuUBEi43QyI+lLSNUnrXH24m7xxRTFvSUx00RZpgv8TlPn/DjKzcmOBF+lzWA
-3vN7aSb2IAObDp24UNwk34lHbz1XMPQQlA/jdeC3fnDF7w4vbgSv9YpVa+RvP0+P
-pci5A9DYDJyHhPmHaolZtnIDRfNyyM85COAUPDs5cFuu9y16WpBsg1goM7x2i2Ax
-sbiSYplHTXPSd6bKJeng1c1UJR6ljsXqV49jT3Tue6sgr80vxg163moNcZrigtP6
-9+CAlq+Ua7PDfjUg34bcRWWjrWUMYCzdT+WGVWg3rfy3zSzlwyCBSZaK8y9JiEMC
-AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUq7270y+eyopsxvaKOG50i8Cm
-e2EwHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
-d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
-MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAMQ3RpVa2ol0+LNS4LFJUifiOV+UBZnJQZUtGaFj1IY5yaspx
-WQgPsSziliJKB+SrFe0YPo0CoVXd49Yj0yGG5YUJZh6FjogrO8TYPks98Gc2e1jI
-jQNPTkYmfwWp7xoDnsOHj0DUFdJUhjifHdznDOjnRv42ozFAv41MV1wfa+aK8Hg+
-r11BO2sOmEmhUFMju1Ue9LZgTF26QK+1h92yum9OYelTl7EvqCxcLMTyaHhN+1B6
-H78ZRiTR2FIhCcxG3vMpmy0qClqoafmW/jaXLLsJ5kv8o9UhNpkbxV7pcKHvW+cH
-qwWF033ugvvEeLQojH4jr+VD3Ky+6LS9ELV7Ww==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://wtc.tu-chemnitz.de:8443/shibboleth-idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Chemnitz (Technische Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">TU Chemnitz</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-chemnitz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ronald</GivenName>
-    <SurName>Schmidt</SurName>
-    <EmailAddress>hilfe@hrz.tu-chemnitz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ronald</GivenName>
-    <SurName>Schmidt</SurName>
-    <EmailAddress>hilfe@hrz.tu-chemnitz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wws.redi-bw.de.xml b/swamid-interfederations-2.0/wws.redi-bw.de.xml
deleted file mode 100644
index c92e647c..00000000
--- a/swamid-interfederations-2.0/wws.redi-bw.de.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wws.redi-bw.de">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/DS" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://wws-s.redi-bw.de/Shibboleth.sso/DS" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wws.redi-bw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=wws.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,L=Freiburg,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIEENaFljANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTEwMTAxNDEzMzkxOVoXDTE1
-MTAxMzEzMzkxOVowgbgxCzAJBgNVBAYTAkRFMRswGQYDVQQIExJCYWRlbi1XdWVy
-dHRlbWJlcmcxETAPBgNVBAcTCEZyZWlidXJnMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRcw
-FQYDVQQDEw53d3MucmVkaS1idy5kZTEeMBwGCSqGSIb3DQEJARYPaW5mb0ByZWRp
-LWJ3LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0miEzWvjAqrX
-oT2H0778Bdd9+TLJD/jxbx7+fy0oN0NJF9nocIxMfMXiYFKWJy5dY0XEx7/33DKY
-5Df66Wk8o1x97xa9LGEaXe0+glZyaDsNKStlY1kW6pM/ohVUIXlHZGnDVLz+4yzh
-XPT/besq9w1YkUDI8R5zXhXgod7WsRXPaGlDj+MYd4+xAX5vPqga0KRtc9gwshKT
-Y+xrtD2W3Y4ynzMUT7N5OvPLF/Q807P5bHf3IaZ7PWhm1PF0FN5IOvw9iUci1hqo
-gRhR4q/ImFAOwUu0jkPdrU5RGauTAMI8rPdujB/FirqMdyCQbYZs3MgVRd3kq7nt
-hCcxIaTS8QIDAQABo4ICCTCCAgUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSMk/NR+7fUmRRd
-PORgM+0wtrTYSTAfBgNVHSMEGDAWgBQzZ6nW8ZNVNqyhMr3B5JY5/0xwMTBPBgNV
-HREESDBGgQ9pbmZvQHJlZGktYncuZGWCDnd3cy5yZWRpLWJ3LmRlghF3d3MtZnIu
-cmVkaS1idy5kZYIQd3dzLXMucmVkaS1idy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8
-hjpodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY3Js
-L2dfY2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1m
-cmVpYnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCB
-mDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1
-cmctY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCRsfDQbyon67pB4jiHwtfok+nY
-dYgba+x93m6uO8+RD2MPBBhcVFF4uHfStxhRe8lttNNboTf7g/D4y041ZGSmQH/e
-YqRBVK5WiedYXpyFjB7tzjOmMsFKYEV5MRLpjt7V7y9cKPCFXGXwSvMgAWUHrSs5
-GoWj/xAoOWglllrxwC+gmwaPM8LNSbHDDh8QhA6NJYbYO9fUyLnI2ajgSjar4aTy
-/kygbVgZgqnFGd9prygGXaIc3hLkWcUQGS6t6NP2Ryt4i2w8Ib9ubnjgojS9e+x2
-TL82eFket8If6svRH9dTJHSQS+F2LmjUVQSSPyVt8ZUBFacRauRMyCQ9Ne3h
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wws-s.redi-bw.de/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wws-s.redi-bw.de/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wws-s.redi-bw.de/Shibboleth.sso/SAML/POST" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wws-fr.redi-bw.de/Shibboleth.sso/SAML/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wws-s.redi-bw.de/Shibboleth.sso/SAML/Artifact" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Freiburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ReDI Perinorm-Server</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.redi-bw.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Hans-Adolf</GivenName>
-    <SurName>Ruppert</SurName>
-    <EmailAddress>ruppert@ub.uni-freiburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>ReDI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>info@redi-bw.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-cvdc.eng.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-cvdc.eng.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index de1aeed2..00000000
--- a/swamid-interfederations-2.0/www-cvdc.eng.cam.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://www-cvdc.eng.cam.ac.uk/shibboleth">
-  <!--
-		This is a "Cambridge Vehicle Dynamics Consortium" Shibboleth SP for the University of Cambridge.
-	-->
-  <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="2011-02-18T13:59: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 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-cvdc.eng.cam.ac.uk/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://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/WAYF"/>
-      <init: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-cvdc.eng.cam.ac.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://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
-						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
-						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
-						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
-						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
-						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
-						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
-						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
-						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
-						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
-						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
-						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
-						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
-						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
-						RsenNm/aXp0wIU+jHVmi/GAPCQ==
-					</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-cvdc.eng.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Cambridge: Cambridge Vehicle Dynamics Consortium</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eng.cam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-falcon.csx.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-falcon.csx.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index f3d0b9d4..00000000
--- a/swamid-interfederations-2.0/www-falcon.csx.cam.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://www-falcon.csx.cam.ac.uk/shibboleth">
-  <!--
-		This is a "Falcon CMS" Shibboleth SP for the University of Cambridge.
-	-->
-  <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-12-15T15:21: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://www-falcon.csx.cam.ac.uk/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://www-falcon.csx.cam.ac.uk/Shibboleth.sso/WAYF"/>
-      <init: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-falcon.csx.cam.ac.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://www-falcon.csx.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
-						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
-						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
-						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
-						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
-						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
-						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
-						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
-						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
-						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
-						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
-						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
-						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
-						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
-						RsenNm/aXp0wIU+jHVmi/GAPCQ==
-					</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-falcon.csx.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-falcon.csx.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Cambridge: Falcon CMS</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cam.ac.uk/cs/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-fr.redi-bw.de.xml b/swamid-interfederations-2.0/www-fr.redi-bw.de.xml
deleted file mode 100644
index f34f1e8e..00000000
--- a/swamid-interfederations-2.0/www-fr.redi-bw.de.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-fr.redi-bw.de">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www-fr.redi-bw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=www-fr.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZzCCBE+gAwIBAgIEC0b00TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MTAzMDE4MjYxMFoXDTEy
-MTAyODE4MjYxMFowgYsxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRow
-GAYDVQQDExF3d3ctZnIucmVkaS1idy5kZTEeMBwGCSqGSIb3DQEJARYPaW5mb0By
-ZWRpLWJ3LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6jxBBaez
-yk+N8nQIDnifDR4br5D5zmQD3uF7oos01/lHBEfmNR+fj5qucgfxGAyecy74aFZ7
-p82QW6I01IOsqBphcNOsOihS16Bb5F3euq2LCUEmWiLsCYJOYhlZHZZRkSpzf0U1
-wNWjqYAXsT6T5TY+/9NPpAlIcNzxekZN/8VBXIPb2zxn7/KJwEY6Cow053XY0f4z
-BjRWPmnD7LV83MYrR3IOQQtRNQdtHJkMmN5L0IBUqI0cIqBMwNh7rdBXfkPWtWYl
-Fb9aCZ6RVdenuH6ek+KKfv6/M67Y+TS31GudIbdddzL+raA9/nwex9Y29hE2sg1+
-8o72bnYyvEuyxwIDAQABo4IB1DCCAdAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTNbO30k/O3
-ucEvGfqHiWE5jGi8fDAfBgNVHSMEGDAWgBQzZ6nW8ZNVNqyhMr3B5JY5/0xwMTAa
-BgNVHREEEzARgQ9pbmZvQHJlZGktYncuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9n
-X2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJl
-aWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgw
-SgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJn
-LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAYw9Q8c0vbIGm+B9qKv9zJGaulzsx
-nftJFaYxEpPsiTOBRmaL2Q4dXxgzUEgKyD98DxaZ+Jzz4LHa1ELwa3KS9ZUmOMQ3
-J52NKhsaqCUU/8NTISXf8ebCAKTkK+IjjrlEd3TIq7OwW60IUz7eSLMr/WdxbUFT
-Lq2Ex1DtuGQXMYv/YV3ky4Ci9lnAQkQ4aogfF5CH941sh8Qqd7iA9fAlCbYd2Vmh
-x7P4PILIaPEEHYBxetPmOeOiOEMm3DtsmqXK7XKQeR3opiJxY+xFP7EVid3M0B/+
-yGu46kaBjuW692bV3nPlvetlri3mceGe3/wc5hkfhsSbEsB+JflUsFjVIA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www-fr.redi-bw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=www-fr.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZzCCBE+gAwIBAgIEC0b00TANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MTAzMDE4MjYxMFoXDTEy
-MTAyODE4MjYxMFowgYsxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRow
-GAYDVQQDExF3d3ctZnIucmVkaS1idy5kZTEeMBwGCSqGSIb3DQEJARYPaW5mb0By
-ZWRpLWJ3LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6jxBBaez
-yk+N8nQIDnifDR4br5D5zmQD3uF7oos01/lHBEfmNR+fj5qucgfxGAyecy74aFZ7
-p82QW6I01IOsqBphcNOsOihS16Bb5F3euq2LCUEmWiLsCYJOYhlZHZZRkSpzf0U1
-wNWjqYAXsT6T5TY+/9NPpAlIcNzxekZN/8VBXIPb2zxn7/KJwEY6Cow053XY0f4z
-BjRWPmnD7LV83MYrR3IOQQtRNQdtHJkMmN5L0IBUqI0cIqBMwNh7rdBXfkPWtWYl
-Fb9aCZ6RVdenuH6ek+KKfv6/M67Y+TS31GudIbdddzL+raA9/nwex9Y29hE2sg1+
-8o72bnYyvEuyxwIDAQABo4IB1DCCAdAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBTNbO30k/O3
-ucEvGfqHiWE5jGi8fDAfBgNVHSMEGDAWgBQzZ6nW8ZNVNqyhMr3B5JY5/0xwMTAa
-BgNVHREEEzARgQ9pbmZvQHJlZGktYncuZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6
-aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmctY2EvcHViL2NybC9n
-X2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZnJl
-aWJ1cmctY2EvcHViL2NybC9nX2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgw
-SgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJn
-LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY2FjZXJ0L2dfY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAYw9Q8c0vbIGm+B9qKv9zJGaulzsx
-nftJFaYxEpPsiTOBRmaL2Q4dXxgzUEgKyD98DxaZ+Jzz4LHa1ELwa3KS9ZUmOMQ3
-J52NKhsaqCUU/8NTISXf8ebCAKTkK+IjjrlEd3TIq7OwW60IUz7eSLMr/WdxbUFT
-Lq2Ex1DtuGQXMYv/YV3ky4Ci9lnAQkQ4aogfF5CH941sh8Qqd7iA9fAlCbYd2Vmh
-x7P4PILIaPEEHYBxetPmOeOiOEMm3DtsmqXK7XKQeR3opiJxY+xFP7EVid3M0B/+
-yGu46kaBjuW692bV3nPlvetlri3mceGe3/wc5hkfhsSbEsB+JflUsFjVIA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-fr.redi-bw.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-fr.redi-bw.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-fr.redi-bw.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-fr.redi-bw.de/Shibboleth.sso/NIM/SOAP"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-fr.redi-bw.de/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Freiburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ReDI Freiburg</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Hans-Adolf</GivenName>
-    <SurName>Ruppert</SurName>
-    <EmailAddress>ruppert@ub.uni-freiburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>ReDI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>info@redi-bw.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-s.redi-bw.de.xml b/swamid-interfederations-2.0/www-s.redi-bw.de.xml
deleted file mode 100644
index eead5ecc..00000000
--- a/swamid-interfederations-2.0/www-s.redi-bw.de.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-s.redi-bw.de">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www-s.redi-bw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=www-s.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEC0feAzANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MTAzMTExMDEwOFoXDTEy
-MTAyOTExMDEwOFowgYoxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRkw
-FwYDVQQDExB3d3ctcy5yZWRpLWJ3LmRlMR4wHAYJKoZIhvcNAQkBFg9pbmZvQHJl
-ZGktYncuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClimyACau2
-7dtk/2Cd4F7vJfsEiAnyHkXG5LbBNDK286gOIXROgnOwEb6fLc08eR6F/79PlGqA
-NCvzUyMnIDSnNwdiXkofOvNKjYBCpSWzmnZjz4Spn2Fzb9LyDpKe2QAqZ8P8MWYF
-P9Up9C/cRcyprhJHqzL/kMNPQUVPAZWgHhkqjlZifQqElASXJ3u3vNfbWZ6RbuZ1
-PK7Z8l++u1nGkAoBrNr7bpKx4hHbPjQI53XiwpH0VAstYZHnqe7B9z/XCCeYjQMx
-igd03a8+wg0tkDqHDErYyk9ueuHrD72qsi96tdIshudVobdpJVdG2AlBHBl2O3Yj
-QlF0PPqGWAvZAgMBAAGjggHUMIIB0DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAd
-BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKEmtco6yR2f
-nO4Yt4UbhdMLOFFwMB8GA1UdIwQYMBaAFDNnqdbxk1U2rKEyvcHkljn/THAxMBoG
-A1UdEQQTMBGBD2luZm9AcmVkaS1idy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY3JsL2df
-Y2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1mcmVp
-YnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmct
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBB6TJb5jerQHmk9LwCvwEQrQGo/C52
-5DOdukZ2zV9SzgRb877XjjwCfNgVRurYyyJnBj95/kX2R7Ry8tDgY3LiDyRRGhXT
-rMdWWZgyEZrn0Aqk28hk2zm+U5f9OFTnwj6wRWfIAglAZxnsTUGFoHw3f2+f7tl1
-dKaPVl2nTMUOq3mJrgkMDwKksVH7miOw2U1dxyXNnPYFJcPKy04wXN4hj5fgJrQk
-7B/eFzIlQAv58jPToJuIf0AQ/tE6s0HbdVQk704V3vJ0shgvYk9XRG79H7xmqKIU
-5+Ku1V1/b70GA9disF4/zyhDZf6InNqnJfDn9nsiBkFInMqCDijq7l12
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www-s.redi-bw.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=info@redi-bw.de,CN=www-s.redi-bw.de,OU=Universitaetsbibliothek,O=Universitaet Freiburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFZjCCBE6gAwIBAgIEC0feAzANBgkqhkiG9w0BAQUFADCBhjELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBGcmVpYnVyZzEWMBQGA1UECxMNUmVj
-aGVuemVudHJ1bTEYMBYGA1UEAxMPVW5pLUZSIENBIC0gRzAyMSUwIwYJKoZIhvcN
-AQkBFhZwa2lAcnoudW5pLWZyZWlidXJnLmRlMB4XDTA3MTAzMTExMDEwOFoXDTEy
-MTAyOTExMDEwOFowgYoxCzAJBgNVBAYTAkRFMR4wHAYDVQQKExVVbml2ZXJzaXRh
-ZXQgRnJlaWJ1cmcxIDAeBgNVBAsTF1VuaXZlcnNpdGFldHNiaWJsaW90aGVrMRkw
-FwYDVQQDExB3d3ctcy5yZWRpLWJ3LmRlMR4wHAYJKoZIhvcNAQkBFg9pbmZvQHJl
-ZGktYncuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClimyACau2
-7dtk/2Cd4F7vJfsEiAnyHkXG5LbBNDK286gOIXROgnOwEb6fLc08eR6F/79PlGqA
-NCvzUyMnIDSnNwdiXkofOvNKjYBCpSWzmnZjz4Spn2Fzb9LyDpKe2QAqZ8P8MWYF
-P9Up9C/cRcyprhJHqzL/kMNPQUVPAZWgHhkqjlZifQqElASXJ3u3vNfbWZ6RbuZ1
-PK7Z8l++u1nGkAoBrNr7bpKx4hHbPjQI53XiwpH0VAstYZHnqe7B9z/XCCeYjQMx
-igd03a8+wg0tkDqHDErYyk9ueuHrD72qsi96tdIshudVobdpJVdG2AlBHBl2O3Yj
-QlF0PPqGWAvZAgMBAAGjggHUMIIB0DAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAd
-BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKEmtco6yR2f
-nO4Yt4UbhdMLOFFwMB8GA1UdIwQYMBaAFDNnqdbxk1U2rKEyvcHkljn/THAxMBoG
-A1UdEQQTMBGBD2luZm9AcmVkaS1idy5kZTCBjwYDVR0fBIGHMIGEMECgPqA8hjpo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1mcmVpYnVyZy1jYS9wdWIvY3JsL2df
-Y2FjcmwuY3JsMECgPqA8hjpodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1mcmVp
-YnVyZy1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIGoBggrBgEFBQcBAQSBmzCBmDBK
-BggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZnJlaWJ1cmct
-Y2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvdW5pLWZyZWlidXJnLWNhL3B1Yi9jYWNlcnQvZ19jYWNl
-cnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBB6TJb5jerQHmk9LwCvwEQrQGo/C52
-5DOdukZ2zV9SzgRb877XjjwCfNgVRurYyyJnBj95/kX2R7Ry8tDgY3LiDyRRGhXT
-rMdWWZgyEZrn0Aqk28hk2zm+U5f9OFTnwj6wRWfIAglAZxnsTUGFoHw3f2+f7tl1
-dKaPVl2nTMUOq3mJrgkMDwKksVH7miOw2U1dxyXNnPYFJcPKy04wXN4hj5fgJrQk
-7B/eFzIlQAv58jPToJuIf0AQ/tE6s0HbdVQk704V3vJ0shgvYk9XRG79H7xmqKIU
-5+Ku1V1/b70GA9disF4/zyhDZf6InNqnJfDn9nsiBkFInMqCDijq7l12
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-s.redi-bw.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-s.redi-bw.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-s.redi-bw.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-s.redi-bw.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-s.redi-bw.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-s.redi-bw.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-s.redi-bw.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-s.redi-bw.de/Shibboleth.sso/NIM/SOAP"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-s.redi-bw.de/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Freiburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">ReDI Stuttgart</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-freiburg.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Hans-Adolf</GivenName>
-    <SurName>Ruppert</SurName>
-    <EmailAddress>ruppert@ub.uni-freiburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>ReDI</GivenName>
-    <SurName>Team</SurName>
-    <EmailAddress>info@redi-bw.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-test.cartoons.ac.uk-_sp.xml b/swamid-interfederations-2.0/www-test.cartoons.ac.uk-_sp.xml
deleted file mode 100644
index 72157aad..00000000
--- a/swamid-interfederations-2.0/www-test.cartoons.ac.uk-_sp.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://www-test.cartoons.ac.uk/_sp">
-  <!--
-		This is a "British Cartoon Archive (TEST)" simpleSAMLphp SP for the University of Kent.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-31T13:14:38Z">
-      <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">British Cartoon Archive (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test British Cartoon Archive service (not for public use)</mdui:Description>
-        <mdui:Logo height="65" width="234">https://www.cartoons.ac.uk/sites/all/themes/bcad/images/logos/bcad-logo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID8zCCAtugAwIBAgIJAKE2TIxIQxuCMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
-						VQQGEwJHQjENMAsGA1UECAwES2VudDETMBEGA1UEBwwKQ2FudGVyYnVyeTEbMBkG
-						A1UECgwSVW5pdmVyc2l0eSBvZiBLZW50MR0wGwYDVQQLDBRJbmZvcm1hdGlvbiBT
-						ZXJ2aWNlczEgMB4GA1UEAwwXd3d3LXRlc3QuY2FydG9vbnMuYWMudWswHhcNMTUw
-						MzMxMTAzOTA0WhcNMjUwMzMwMTAzOTA0WjCBjzELMAkGA1UEBhMCR0IxDTALBgNV
-						BAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoMElVuaXZlcnNp
-						dHkgb2YgS2VudDEdMBsGA1UECwwUSW5mb3JtYXRpb24gU2VydmljZXMxIDAeBgNV
-						BAMMF3d3dy10ZXN0LmNhcnRvb25zLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAn1JbzpY2ZOG1l0q+VvK3pP+eaBPU468X5pj3c8HRI444tIpj
-						mYW6HWzz5OAra400QkZM72cNTFjCscO4OWnA7SbqkXlpv3vVxMZ8PX9fBf/cxsMH
-						LBNXoMQh1D85N0Z0r4mhqDJzLfOdJVIQAog22hqyZpgxJ0c48TLcllllzQf1xhDh
-						hj1hPPVd9hrUGbmnI0rod55Z5z7dqxrtsEmGYM6BLBjQT3IO02YKGa/4bgW3Wxoo
-						UYKnKFIhtF54a2oRTG3xhSpvH9xABSFzrmQ+k4jT+1yb7OR77BjqBWKFgSVZxh0I
-						8KuzLE8fJiLfmIdG1ZtHoaMOEhW74IqSWHUznQIDAQABo1AwTjAdBgNVHQ4EFgQU
-						p/i93quZlOSka+XAjKPjxFi3hR0wHwYDVR0jBBgwFoAUp/i93quZlOSka+XAjKPj
-						xFi3hR0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAV72ikG+e8fAy
-						NjSMDbA/2ArD7kYrSj3dmyYVatghL3doZCVEm9ZyGo6x/jW/QyFVn4P43kMR4min
-						fwJZi4ooUOFeDTta4YfLFMYVdvYTMNrJs1UtN6/iOFvFud4mdW+VdnfEzqgkRyG8
-						rYSVKtYKbiqdxigVVY0icvpu2cvJrkAtAcZOmuZn+HtbU/PUsHcs2GmOL5pF++M5
-						hcSgpWFmTZgZZFUEpzUQC7c+Coz5QGPkfSI7y5hE01ePdbITgXTGprC2Ep23su5X
-						It7yGAT8rRCp52rrT7aB8ih0rNLDulVHovCf18GJuw0luo8XEmv7wWQmTMcA70qA
-						enohx6xxVA==
-					</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>
-						MIID8zCCAtugAwIBAgIJAKE2TIxIQxuCMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
-						VQQGEwJHQjENMAsGA1UECAwES2VudDETMBEGA1UEBwwKQ2FudGVyYnVyeTEbMBkG
-						A1UECgwSVW5pdmVyc2l0eSBvZiBLZW50MR0wGwYDVQQLDBRJbmZvcm1hdGlvbiBT
-						ZXJ2aWNlczEgMB4GA1UEAwwXd3d3LXRlc3QuY2FydG9vbnMuYWMudWswHhcNMTUw
-						MzMxMTAzOTA0WhcNMjUwMzMwMTAzOTA0WjCBjzELMAkGA1UEBhMCR0IxDTALBgNV
-						BAgMBEtlbnQxEzARBgNVBAcMCkNhbnRlcmJ1cnkxGzAZBgNVBAoMElVuaXZlcnNp
-						dHkgb2YgS2VudDEdMBsGA1UECwwUSW5mb3JtYXRpb24gU2VydmljZXMxIDAeBgNV
-						BAMMF3d3dy10ZXN0LmNhcnRvb25zLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAn1JbzpY2ZOG1l0q+VvK3pP+eaBPU468X5pj3c8HRI444tIpj
-						mYW6HWzz5OAra400QkZM72cNTFjCscO4OWnA7SbqkXlpv3vVxMZ8PX9fBf/cxsMH
-						LBNXoMQh1D85N0Z0r4mhqDJzLfOdJVIQAog22hqyZpgxJ0c48TLcllllzQf1xhDh
-						hj1hPPVd9hrUGbmnI0rod55Z5z7dqxrtsEmGYM6BLBjQT3IO02YKGa/4bgW3Wxoo
-						UYKnKFIhtF54a2oRTG3xhSpvH9xABSFzrmQ+k4jT+1yb7OR77BjqBWKFgSVZxh0I
-						8KuzLE8fJiLfmIdG1ZtHoaMOEhW74IqSWHUznQIDAQABo1AwTjAdBgNVHQ4EFgQU
-						p/i93quZlOSka+XAjKPjxFi3hR0wHwYDVR0jBBgwFoAUp/i93quZlOSka+XAjKPj
-						xFi3hR0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAV72ikG+e8fAy
-						NjSMDbA/2ArD7kYrSj3dmyYVatghL3doZCVEm9ZyGo6x/jW/QyFVn4P43kMR4min
-						fwJZi4ooUOFeDTta4YfLFMYVdvYTMNrJs1UtN6/iOFvFud4mdW+VdnfEzqgkRyG8
-						rYSVKtYKbiqdxigVVY0icvpu2cvJrkAtAcZOmuZn+HtbU/PUsHcs2GmOL5pF++M5
-						hcSgpWFmTZgZZFUEpzUQC7c+Coz5QGPkfSI7y5hE01ePdbITgXTGprC2Ep23su5X
-						It7yGAT8rRCp52rrT7aB8ih0rNLDulVHovCf18GJuw0luo8XEmv7wWQmTMcA70qA
-						enohx6xxVA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.cartoons.ac.uk/_sp/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.cartoons.ac.uk/_sp/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://www-test.cartoons.ac.uk/_sp/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://www-test.cartoons.ac.uk/_sp/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://www-test.cartoons.ac.uk/_sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Kent</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Kent: British Cartoon Archive (TEST)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cartoons.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Slowe</SurName>
-    <EmailAddress>mailto:M.Slowe@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-test.cartoons.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-test.cartoons.ac.uk-shibboleth.xml
deleted file mode 100644
index 02c95ac2..00000000
--- a/swamid-interfederations-2.0/www-test.cartoons.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://www-test.cartoons.ac.uk/shibboleth">
-  <!--
-		This is a "British Cartoon Archive (TEST)" Shibboleth SP for the University of Kent.
-	-->
-  <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="2015-05-22T11:33:47Z">
-      <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-test.cartoons.ac.uk/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://www-test.cartoons.ac.uk/Shibboleth.sso/WAYF"/>
-      <init: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-test.cartoons.ac.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://www-test.cartoons.ac.uk/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">British Cartoon Archive (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test British Cartoon Archive service (not for public use)</mdui:Description>
-        <mdui:Logo height="65" width="234">https://www.cartoons.ac.uk/sites/all/themes/bcad/images/logos/bcad-logo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC8TCCAdmgAwIBAgIJAMiPLClDkawOMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDnppbS5rZW50LmFjLnVrMB4XDTE1MDUyMDA5MDcyN1oXDTI1MDUxNzA5MDcy
-						N1owGTEXMBUGA1UEAxMOemltLmtlbnQuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQC0ujIIHG0hrDCT/Cu44k7miKtHRQuM7qNwfcPF86jv1kW4
-						bzYIcicVUATYSXFaFYcnyud32yaNiCKRVxYNb6Wyxt+wcQVvruT2zBMTEKtTD/RX
-						Fql9ZCLKD7RAGRPQbbX1tfRD0mgwdNIVnNOq6tWotxbYOd1aXFdb9i3yeBIP/oEo
-						6HHBIob/OPQzttYhHZhEZdZ2gi9OR6Qk56cERl2ZTjcP/Yxz9/txDyAnbRyT4N0g
-						eciXF2Ijm3wth7Sd1SsOvjjnyHMcN6f8bQ7ORxLiuiHvAHXC5mLmgqY7I+kOQ6AC
-						VtHE8WxwrCjOi9P2EddSB9FGx/ZwJl/t8TOn0LKfAgMBAAGjPDA6MBkGA1UdEQQS
-						MBCCDnppbS5rZW50LmFjLnVrMB0GA1UdDgQWBBRmcb4QqLTQtaFImQzHzmAPFZfu
-						dzANBgkqhkiG9w0BAQUFAAOCAQEAXBtpnQ8rZRdLpbRvC5vczqHQvaPDKLXNq0SR
-						WOLtWYtTDVAr4M+/pwPdRHgkW2ZhD6ryiSp22J8R1Y80evTEV5GUl/MdeI5EbPRd
-						Uh8J43hhccfSXBDY/FRhx4x4OGpkMIGEcK2fvpXv/lDigbP5eld44/Lx3X9Nqwmt
-						iJ2JDR+qfNmXHn0D5B6xgM+xAlOaBGOXckSNuiVx94WBKOKL1CVAXrCTGZ2ps92V
-						USCw5T+HW93iJy6Ahg2jRcqCdGXUD/5pBUCTPWowHX2/9E82fYJd4uZ2TyLXg1d+
-						M/ElR/YUGJ1yZyTm50nw+N4kb3Wp+NkDEUAKufNe5n7oP+2IQw==
-					</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-test.cartoons.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.cartoons.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Kent</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Kent: British Cartoon Archive (TEST)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cartoons.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matthew</GivenName>
-    <SurName>Slowe</SurName>
-    <EmailAddress>mailto:M.Slowe@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-test.idcore.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-test.idcore.ac.uk-shibboleth.xml
deleted file mode 100644
index 784c2ce3..00000000
--- a/swamid-interfederations-2.0/www-test.idcore.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www-test.idcore.ac.uk/shibboleth">
-  <!--
-		This is an "IDCore: Industrial Doctoral Centre for Offshore Renewable Energy" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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-07-12T09:09:56Z">
-      <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-test.idcore.ac.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://www-test.idcore.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGzCCAgOgAwIBAgIJAJAAsD9TBIokMA0GCSqGSIb3DQEBBQUAMCcxJTAjBgNV
-						BAMTHGFwcHMtZHJ1cGFsLXRlc3QuaXMuZWQuYWMudWswHhcNMTIwNjIxMTM1MTEx
-						WhcNMjIwNjE5MTM1MTExWjAnMSUwIwYDVQQDExxhcHBzLWRydXBhbC10ZXN0Lmlz
-						LmVkLmFjLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsMDP26L7
-						g+8UPTb9SyIKN2gkQGpqAfE7rai2kkkTw3Pz+JIKSmf609LCRydnMXOwNFzzIX68
-						lT6pUMsVrWSNRKS7h03Ujbnc//r6gqCjoJJw3tPxCKk8MoasN5exGDlgSaIsTf0L
-						Yr1hLe+bUKzs4NOV8fGw+HFyehWjR3DprsAt717vxvKbzZdyVzRhQok1LreYE3xz
-						u/tXD6fvAO99F7aXs1sXZsa9+lc3hBMChpP3aHWIwel+/XvKnNT3c0UcnIMt9Nuo
-						mz6S7tIG8YDQZv6WYpHigNFSlTi5jWv/JmysJqMMP1929MQWiqpIp8XWlYiCNndN
-						aKSkNPFHi9UZpQIDAQABo0owSDAnBgNVHREEIDAeghxhcHBzLWRydXBhbC10ZXN0
-						LmlzLmVkLmFjLnVrMB0GA1UdDgQWBBQYjX3CQsxxS53S0yuL0TxYm1eEZzANBgkq
-						hkiG9w0BAQUFAAOCAQEASy0ZIXokG/4YXV5WV+97ZALmrf3FQnh2LIAwaC9k7wL0
-						77ROaZAsYBI06Qg6b7DKOc8TF2gmLQy7snPLsE/uwFfh/MyntwthukTh0lh0EkOt
-						mCF8ptuumVmspW/n2+jxFEPBoj5LRAqYDjxqCvO8XXLgrjYnp0NMAf8s7Wp1bRbT
-						K3xhbxOKR7EnLYMdDIIoupmdKj7jOZd/hJHayXOw2JAPrtJqXHeFk48eAGuaiU8z
-						nbfZgQy3OZ9zShOmhaJpShvkgztB0r1q55RzjQfdTYN5pfDBspKndopTxqBhdGqD
-						VBgdEXg/axCSZt/2f8yLZu21VjLiSHjqdx3XCjYE5g==
-					</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-test.idcore.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.idcore.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IDCore: Industrial Doctoral Centre for Offshore Renewable Energy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Management</GivenName>
-    <EmailAddress>mailto:w3hd@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Service Management</GivenName>
-    <EmailAddress>mailto:w3hd@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-test.portal.ted.is.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-test.portal.ted.is.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index 5a32c8e4..00000000
--- a/swamid-interfederations-2.0/www-test.portal.ted.is.ed.ac.uk-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://www-test.portal.ted.is.ed.ac.uk/shibboleth">
-  <!--
-		This is a "Scientia Syllabus Plus Enterprise" Test Shibboleth 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-04-24T16:17:55Z">
-      <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-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAOMgICS11sdUMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHNhdC1lcC1rYjF0LmVkLmFjLnVrMB4XDTEyMDIwODE2MzY0OFoXDTIyMDIw
-						NTE2MzY0OFowHzEdMBsGA1UEAxMUc2F0LWVwLWtiMXQuZWQuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDd9RUakCgNBsMGvzseWGolUEC6nv25
-						0wFKO5jgPrYrmMO8CCFOFN5MxbNDCkcZ0Lkl57AaDYnKLpiK1EqA2mP4rem2qarp
-						n8RIPwLv0VQYbpGPlxzyAg8HGYRavly5IDHUK5IaYnTRWbhs/h+y4YaOqRlZdOj+
-						YDsW8bzMIxra9HuTuqz+Z6xepWLoa0MsT7cD4iSty5N5xZSCgxRTz/tNHi+yV+WD
-						qv+B1mTF9pLrm1JQdASbe0y0S3rlVnSXLX7CCu068QA8XQ6kDfi+xW84ljJntMh/
-						E2eHvJjl8QS64hpk/PhZDmKDEP7wATSRUhZTjChoPst0KPxZmhwPij6nAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFHNhdC1lcC1rYjF0LmVkLmFjLnVrMB0GA1UdDgQWBBSK
-						i14hxOCvF3sTtaqlXQOEYDkIVDANBgkqhkiG9w0BAQUFAAOCAQEAEur8MAx1hdS2
-						gpu0IMPvYt8LZretTqnlrqaWiS0fWZVb3+RUzAqQV6NFRxipgt2db/oEr12FJMlq
-						uRbHu3S5i9ZDjV9/YMfnZsLxTJDKeKo5p7l8eOcomgaQM8y4C4eUvxdV08NwnHso
-						23tC9GnAemQ4jbBUsrI0m7iwBE9RsXlL92LAfvb1iAEaJWrj+K197isJruH2bGqx
-						h88+QH0mrfm76MrrEViDCmmWdIsgE2vUv4VhbFQT4+CYSc5zNjI0ZDWFfOuvGxvy
-						5RYt3aDcXU8r+g+CZebDDcdBQtsEyWM8uV9rebdthAnmNG5XWLzRux7RuE/AnZee
-						MMLJTT1Uzw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: Scientia Syllabus Plus Enterprise - TEST Environment</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>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-test.ted.is.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-test.ted.is.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index 1c7f39fa..00000000
--- a/swamid-interfederations-2.0/www-test.ted.is.ed.ac.uk-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://www-test.ted.is.ed.ac.uk/shibboleth">
-  <!--
-		This is a "Timetabling Web Apps - TEST Environment" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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="2013-07-16T09:37:16Z"/>
-  </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-test.ted.is.ed.ac.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://www-test.ted.is.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBjCCAe6gAwIBAgIJAPxnziiUKyZ8MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXNhdC13ZWIta2IxdC5lZC5hYy51azAeFw0xMzA3MTIxMDUzMjdaFw0yMzA3
-						MTAxMDUzMjdaMCAxHjAcBgNVBAMTFXNhdC13ZWIta2IxdC5lZC5hYy51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfQj3Fn3JObYydckX3u9Dgezz1N
-						uVQK64kW5bCjUOT6/KxL8nHOOrPKwcbEUF064oRDPVxgJ3zbK2JCgKZWEWAU6ASy
-						KJ23D7kkNdMWiBO41XYDyBuRI3KChJbG7nJqEMCM2P9VPlCTzQGy8iCcVKoRKZfa
-						hnpkxOcLhX70jJ0pIlXAFA10qW9jc5KxFIRZXWP+4r0A3zcdSLsqKkTdUt2jRb81
-						oKlSn109dSQ4pV+hZ+LCpll64LxxDNXEGHeBTM+YHJB4Yp85a+r9Tsas1crstwyc
-						i5R2MorDFB2w+Pht7rae3GrIMYuwJ9GyalJaKVCcA4t57irCa5uLv6413UUCAwEA
-						AaNDMEEwIAYDVR0RBBkwF4IVc2F0LXdlYi1rYjF0LmVkLmFjLnVrMB0GA1UdDgQW
-						BBQZ60I7N9IvNRrNpbwngvPuMBFzXTANBgkqhkiG9w0BAQUFAAOCAQEAFuXgykYH
-						RzeNpD2HxF7BsMxfuYR/nKhwn2KpL/zjGHqrEsYlpiHtlS9rmYFUv8Z82QQZEvhF
-						hbEvVnWKd1Q0YaGHJa4BDVU1pSkCcvZjn798FvsOET7prY1zJqbjwBnBWC0grbUL
-						RVct5cZ3xl7UjkprTAlGBP2uYJCgoAphtoXLSox1n2Yd4UQ4X+JHRWqhL5aqW8YA
-						pkuYejIZPEvWevPpt7h817zE0VwGTGcIOUnrN3qVFWtiTFW/6cHPa0gkCpa0/4y5
-						wDxLtTKopgZv59F6rJ2XK+pISqynmu0u1Yx9c9sALZ8juKgF6vzB54wRCwHIBUE2
-						ntsJEvhCORTfww==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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-test.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-test.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Timetabling Web Apps - TEST Environment</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>IS Apps Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-trg.eng.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-trg.eng.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index 667cdd69..00000000
--- a/swamid-interfederations-2.0/www-trg.eng.cam.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://www-trg.eng.cam.ac.uk/shibboleth">
-  <!--
-		This is a "Transportation Research Group" Shibboleth SP for the University of Cambridge.
-	-->
-  <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="2011-10-13T11:44:59Z">
-      <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-trg.eng.cam.ac.uk/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://www-trg.eng.cam.ac.uk/Shibboleth.sso/WAYF"/>
-      <init: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-trg.eng.cam.ac.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://www-trg.eng.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
-						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
-						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
-						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
-						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
-						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
-						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
-						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
-						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
-						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
-						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
-						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
-						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
-						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
-						RsenNm/aXp0wIU+jHVmi/GAPCQ==
-					</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-trg.eng.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-trg.eng.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Cambridge: Transportation Research Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www-trg.eng.cam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www-trn.portal.ted.is.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www-trn.portal.ted.is.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index 7cb8ee7e..00000000
--- a/swamid-interfederations-2.0/www-trn.portal.ted.is.ed.ac.uk-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://www-trn.portal.ted.is.ed.ac.uk/shibboleth">
-  <!-- 
-		This is a "Scientia Syllabus Plus Enterprise - TRN Environment" Shibboleth 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-02-29T16:36: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 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-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJAN7T0EIFcj+3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3NhdC1lcC10cm4uZWQuYWMudWswHhcNMTIwMjIxMTUzODI1WhcNMjIwMjE4
-						MTUzODI1WjAeMRwwGgYDVQQDExNzYXQtZXAtdHJuLmVkLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuqH4g2Mo3OewCnOBlEc6S/XQiTa5Yiiy
-						iem1v/tgiq2mtAFcVw0fx8LFPpsg7MRX90kLLWqCNcz8N5ITHep5BZ9dh5qIT4LI
-						oDwePP+TKPC0JAkHZfw64nWZuUqemUhy0J8EzID6MYPU+24L7n6ZEvvEqXfjd9Xw
-						E1JX3Va31u+NEGJ78zwXcxb891cSe6CsvDB3XBhT2tOjo/JlD51Nn49KQIivNtrA
-						1e+f0FQFEJdQ8mCcaUUYpEnQOPs7dPuNrxv9GOwWfg8wyxJsKayGpAuG0F0XGi2x
-						90ZSRQw5ysS+gKKnRpNceHFUwen3a2CJS3cWuKErviYMFOMKIWnEDwIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNzYXQtZXAtdHJuLmVkLmFjLnVrMB0GA1UdDgQWBBRWcmiz
-						GfJpbTYdEdwguTdbmCTV3TANBgkqhkiG9w0BAQUFAAOCAQEAlNapAzLaJ27lpOq2
-						xzDVyslkaY3uh9gs/LGs63sumPzVxSqMzrStn4mokpbKCEbr6K7RucFtmQ4L90G5
-						ynMAPalY6MI9t8BNQg7I9zUunMgfq3DvIvjJYJZhaskYbZMS3UMJJlS51M4JjqnC
-						esKPEIanLfc0zuUdmtTof3D2QZSmK0oNdRBkuAWuzKqkTUEIekoO8dYgj9WjHY4o
-						nXNtk63bUSagWx661sSPlR5+dZUN7FW0jZ/KWaQWxwvVbiAiTdL6E8ugEB1wy2PX
-						exvBK4kYz/Z6sPdpxk/pJLuMWhVr2gjWCy50hm7bKnihbBEiwy/Qpai5aEPtGVGf
-						NjLiOw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www-trn.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: Scientia Syllabus Plus Enterprise - TRN Environment</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>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.123library.org-oa-metadata.xml b/swamid-interfederations-2.0/www.123library.org-oa-metadata.xml
deleted file mode 100644
index 187192fd..00000000
--- a/swamid-interfederations-2.0/www.123library.org-oa-metadata.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://www.123library.org/oa/metadata">
-  <!--
-		This is an OpenAthens SP for 123Doc Education Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-02T10:40:16Z"/>
-  </Extensions>
-  <SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDfDCCAmSgAwIBAgIJAOqpAln6yGDwMA0GCSqGSIb3DQEBBQUAMDIxEzARBgNV
-						BAoTCjEyM0xpYnJhcnkxGzAZBgNVBAMTEnd3dy4xMjNsaWJyYXJ5Lm9yZzAeFw0x
-						NTAxMDkxNjI0NTVaFw0yNTAxMDYxNjI0NTVaMDIxEzARBgNVBAoTCjEyM0xpYnJh
-						cnkxGzAZBgNVBAMTEnd3dy4xMjNsaWJyYXJ5Lm9yZzCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBALNX0cg2tfg5w/8mF6+jaYx5vJYaY2viY90ZPZD4YiVF
-						Evr0yHv40gdZoDaPrQpI/z+krN1Hv8zz2aFi2jkSJ6udzVCmzV1fxVSeUtAyW7j/
-						dQDuApuBmReKdsBKbUUH0cOehMdPwJM5jUm8BUpUKd1jO5/b3AhNZWQnxeDJVmzy
-						CdHGc3BJhe7RBi7hLJTlX/1AbD1dHLMjU/U2813rt+MB+QfPVzuCkajNNA5pY6OJ
-						ksDx/Q9SGZLgrGvFUE64MH/ffvQ8/jR33aJAQ7v1y463MpVQqxZLlxh/GtSPu9nD
-						zqYSl80fTFns7omQ/uOQv1y91SMe42M8qGysv3HaRL0CAwEAAaOBlDCBkTAdBgNV
-						HQ4EFgQUrxHW4/Azow1MEfosgbCPRp3DNacwYgYDVR0jBFswWYAUrxHW4/Azow1M
-						EfosgbCPRp3DNaehNqQ0MDIxEzARBgNVBAoTCjEyM0xpYnJhcnkxGzAZBgNVBAMT
-						End3dy4xMjNsaWJyYXJ5Lm9yZ4IJAOqpAln6yGDwMAwGA1UdEwQFMAMBAf8wDQYJ
-						KoZIhvcNAQEFBQADggEBAATMW4Py6IHcQbxj26vK9mQNlpWAy/Ah2fp5CFhpm2PK
-						DsGjjf4Wn4NWQyc2G7bmCPLRYQa2douIBzWpZ1n3S/tnaf2855LHsa/WV8gKuoN4
-						xFpGWiS8c7KOZvhJuvqP1K9mAMBbCeEocFB+OpzwvpVn0chSzBfs89aVDO7iHXpJ
-						YHz4dJsJ76McTVdPTAKila/Hjgq4dt4xRodj45MlgX3SApqQLQnLJPZoF40Ug478
-						FZl7Wye00MsuE+Rphr+nsnbjKJquxjSUe1K/Ayb4RfoQz5Z4G9g0skthUkl0IsUr
-						OoPW3kslUwruNUj/IpAl13p9ahFKw3C83XJgOQmtZog=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.123library.org/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.123library.org/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.123library.org/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.123library.org/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">123Doc Education Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">123 Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.123library.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tim</GivenName>
-    <SurName>Benjamin</SurName>
-    <EmailAddress>mailto:timbenjamin@123doc.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Benjamin</SurName>
-    <EmailAddress>mailto:timbenjamin@123doc.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.2simple.com-shibboleth.xml b/swamid-interfederations-2.0/www.2simple.com-shibboleth.xml
deleted file mode 100644
index 80947ac7..00000000
--- a/swamid-interfederations-2.0/www.2simple.com-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://www.2simple.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for 2Simple Software Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-30T17:24: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://www.2simple.com/Shibboleth.sso/E2BN"/>
-      <init: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.2simple.com/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.2simple.com/Shibboleth.sso/LCC"/>
-      <init: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.2simple.com/Shibboleth.sso/RM"/>
-      <init: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.2simple.com/Shibboleth.sso/EMBC"/>
-      <init: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.2simple.com/Shibboleth.sso/SWGFL"/>
-      <init: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.2simple.com/Shibboleth.sso/WAYFlondon"/>
-      <init: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.2simple.com/Shibboleth.sso/netmedia"/>
-      <init: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.2simple.com/Shibboleth.sso/protectnetwork"/>
-      <init: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.2simple.com/Shibboleth.sso/fronter"/>
-      <init: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.2simple.com/Shibboleth.sso/networcs"/>
-      <init: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.2simple.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://www.2simple.com/Shibboleth.sso/kidder"/>
-      <init: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.2simple.com/Shibboleth.sso/WAYF"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDXjCCAkYCCQDmolVNvs2UvTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJH
-						QjEYMBYGA1UECBMPIEdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHTAb
-						BgNVBAoTFDJTaW1wbGUgU29mdHdhcmUgTHRkMRgwFgYDVQQDEw93d3cuMnNpbXBs
-						ZS5jb20wHhcNMTEwNTE5MTcyMjA1WhcNMjEwNTE2MTcyMjA1WjBxMQswCQYDVQQG
-						EwJHQjEYMBYGA1UECBMPIEdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24x
-						HTAbBgNVBAoTFDJTaW1wbGUgU29mdHdhcmUgTHRkMRgwFgYDVQQDEw93d3cuMnNp
-						bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgNPBDxQsr
-						2fBkIAAonSWIntDbWMJz9nqUmvcDUe66MaktRpJlWzPwf8PY8uRY11fLqURcbuhi
-						lXU0r3flglnosshwR3NmngKvHeGN0xPt9HE5zbEfNGGameP8i3f3UpvjI2Kzqnf1
-						Va/E+pvYYyH5rMsxi6LhCyKBpA4GDIXobJL/nACuYW1bmshrzBPfsEkUqmd0X5k0
-						83fPz68XzXcLnH8cRq9jXPphrjrkFEJzBM7fA05EwNa/r1Qauzydsfvew+KoLaH4
-						w7aAqZ/C5WQFFnp4HdiRJZVplcnRsBT239COpcfyChsn6twDd3RqZNWajP12uJbD
-						1D8Nn84Y7ojDAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACTk9iu5EEUrwqm0mgL6
-						/X8Yrw3SCFKIKoWFzGD6JeCmTZmWx/Of53yhszBqa8xWZVtKDRaR9gCC6aKDN+aK
-						Hn35J4H91FNmBH4LxihBhYRvM0Tf4EgFea0ybQuz/nxhCW+d5qZ+7UEtY++EEffU
-						8ptlZ2lX1ZdafBKsFJhFscQaaC1EdY/k/IoIC0BQ2gDVj+UpfVHEci5c2S/uxCI/
-						HwFwogiOsSg4OoO2CK/iSqv5aYbb1sg33VbMO2nKp/s+v6g201aU0d05Ap9e5hQh
-						ktlw6l0ChTv1LWlcCHKpbW8yUqzBzMq+xubbpw6T1bcfN70zz9s0CPzv6b36idbh
-						1UE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.2simple.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.2simple.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.2simple.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.2simple.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.2simple.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.2simple.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.2simple.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.2simple.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.2simple.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.2simple.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.2simple.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.2simple.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.2simple.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.2simple.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.2simple.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">2Simple Software Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">2Simple Software</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.2simple.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sam</GivenName>
-    <SurName>Barnett</SurName>
-    <EmailAddress>mailto:sam@2simple.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Barnett</SurName>
-    <EmailAddress>mailto:sam@2simple.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.abersu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.abersu.co.uk-shibboleth.xml
deleted file mode 100644
index 457e3433..00000000
--- a/swamid-interfederations-2.0/www.abersu.co.uk-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://www.abersu.co.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for Aberystwyth University Students' Union.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-25T14:36:21Z"/>
-  </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.abersu.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://www.abersu.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.abersu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abersu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abersu.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.abersu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.abersu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.abersu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aberystwyth University Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.abersu.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.abintegro.com-shibboleth.xml b/swamid-interfederations-2.0/www.abintegro.com-shibboleth.xml
deleted file mode 100644
index 3eb516c6..00000000
--- a/swamid-interfederations-2.0/www.abintegro.com-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://www.abintegro.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Abintegro 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="2013-08-15T15:23:38Z"/>
-  </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.abintegro.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Abintegro Career Centre</mdui:DisplayName>
-        <mdui:Description xml:lang="en">E-learning and employability solutions for careers services and training departments.</mdui:Description>
-        <mdui:Logo height="80" width="220">https://www.abintegro.com/Images/AbintegroLogo-220-80.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3zCCAcegAwIBAgIJAJ2y3/Ipx0rcMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCGFiaW50YWEyMB4XDTEzMDgxNDIzMTI1NFoXDTIzMDgxMjIzMTI1NFowEzER
-						MA8GA1UEAxMIYWJpbnRhYTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC9NZvmrSYjcTzr0HKkQTo7sftSQsJ8C24K0H7hv4xa2k3xTRsJ3x1cR3VSohpV
-						Th9j6KqpEItOh3kK5nr5yjyTsekWF/vrdtvZzzI95eAtcvFP5dXNdMIUkcbbOnys
-						bYKFVzdtKw9ZwejZvkzbzQ7n6kUTyhLlZIUma3rQNhYWmmyVFVSRqbXX5XkgqjKG
-						5MIy42nGIfOVF+RdnkA5u+t2zlUdJuyhLJfyrfovnf/Ttdw1lpJ0zzqEvFPHa5Dx
-						1W9B2tama+MURTJfO9ZRgckx4qGpL+vuZKDs1gynzzwhqff476UNlYeTDTZzAB8u
-						uLObbBZszG/3rM+Kdjfo0sKPAgMBAAGjNjA0MBMGA1UdEQQMMAqCCGFiaW50YWEy
-						MB0GA1UdDgQWBBRUIJFi6Zdg8nwr4/rA63aWklFizzANBgkqhkiG9w0BAQUFAAOC
-						AQEAqfryYrk6Ha9xkgPbauuJFXGLlcSPnUUJK8wLhTFX3asacroLYVYxMF6bty2I
-						8Hm/WerHTYLvdyvR8z+cwar74PqPHsql1kjGikZwWNTeQbt8L5r+MY6R+qVTyIXL
-						0QygcVpFA8/07uIV/MO6ldsLu/IXMwFt7VWwlueq744pi9ACDjaLwhZ9QcegFOKa
-						k0bU3yG5Uj27MYAxRjBTMH7YFV0RcrBdczeWw4ivNourUbYnhHOpjKBmyLt3haSz
-						1QLpZpLaDMTcC5r1tLHfZcEIDo1Zop9cMEJr5+vbYtMi0GxLGZdHVQ8supUNDNgp
-						3/OQ0NRj9PRqf24c2oftTWePWQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.abintegro.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.abintegro.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.abintegro.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abintegro.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abintegro.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abintegro.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.abintegro.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abintegro.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.abintegro.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.abintegro.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.abintegro.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Abintegro Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Abintegro Career Centre</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.abintegro.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Help Desk</GivenName>
-    <EmailAddress>mailto:support@abintegro.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hilmi</GivenName>
-    <SurName>Sunay</SurName>
-    <EmailAddress>mailto:hilmi@abintegro.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.accessible.com-shibboleth-sp.xml b/swamid-interfederations-2.0/www.accessible.com-shibboleth-sp.xml
deleted file mode 100644
index b2c32e8c..00000000
--- a/swamid-interfederations-2.0/www.accessible.com-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://www.accessible.com/shibboleth-sp">
-  <!--
-		This is a Shibboleth SP for Accessible Archives, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-09T09:50:32Z"/>
-  </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.accessible.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.accessible.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Accessible Archives</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Accessible Archives, searching for archived historical information.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3zCCAcegAwIBAgIJAJ+6AdB4y2zzMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHNlcnZlcjAxMB4XDTEyMDQxMDAxNDE0MFoXDTIyMDQwODAxNDE0MFowEzER
-						MA8GA1UEAxMIc2VydmVyMDEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDWNb/VquX0JPLbLTH53stVrwc2e4B+XCr/WrM1JXmXk2pvOa6S388U9XwqtB9r
-						6SW+zyAZlItnajD55oSFUDI+pyUyBqICzAyGXq2iXfCEpy4i5uozdAakeuUp4bUB
-						YyZXvjqb8Naee1HH8QP9W3ua9VjTara3/mrD5B5gm27ViGRJsT+gn1mJq5mka9AB
-						XG41dZJFZDB2faqk2eRWdxFqB38FVjBMYbswI2dlptKJTLZFMB8oSeEpqsjNHYRp
-						M4bEPn8vu4PpDK4LruxLDApQLWUqy9MP1vxwbHP60HtMa026cl9+tYlD6iMGPxnE
-						sFhhekzNbwCv+yvj36cioNArAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHNlcnZlcjAx
-						MB0GA1UdDgQWBBTUDXOIGI4cirL8eFZPfagMyT6jUjANBgkqhkiG9w0BAQUFAAOC
-						AQEAmiBakqubDVjKl3RtwYVmWac/2SbU84E8U8f/3sbPfiYhxYidVdu81DSyHF23
-						Lx+2K2m0Fa/DHx0ZjGjtcxZlL06gYYovW1kg30MIorZ+QUyGVCr8zIGvyKruQlGG
-						0drNsH9XZhzOv/SmOEf/KgnOHQUpYePwkU4SKYDAMTTq0/tc4XZch7NjDQKP21e6
-						k3woa7JmUDwH/9QPjFzNjPQTR/2QMDb14JQEqraA1n7BTuIqIiCpR+V1GgLl1cNK
-						/DIS94RKu/qrZio7WyuIxlmFsZkmg8pkmpc6OWrxWKvMnsrxQc3Vv7/zxlp5Y2QK
-						/JXMj4kKkCKtCRxhdwUHIhoEJA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.accessible.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.accessible.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.accessible.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.accessible.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.accessible.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.accessible.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.accessible.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.accessible.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.accessible.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.accessible.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.accessible.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Accessible Archives, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Accessible Archives</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.accessible-archives.com/about-accessible-archives/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Thomas</GivenName>
-    <SurName>Nagy</SurName>
-    <EmailAddress>mailto:tnagy@accessible.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Joseph</GivenName>
-    <SurName>Paulsen</SurName>
-    <EmailAddress>mailto:jpaulsen@accessible.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Sheridan</SurName>
-    <EmailAddress>mailto:csheridan@accessible.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Joseph</GivenName>
-    <SurName>Paulsen</SurName>
-    <EmailAddress>mailto:jpaulsen@accessible.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Sheridan</SurName>
-    <EmailAddress>mailto:csheridan@accessible.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.adults.ccinform.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.adults.ccinform.co.uk-shibboleth.xml
deleted file mode 100644
index 14f8e61f..00000000
--- a/swamid-interfederations-2.0/www.adults.ccinform.co.uk-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://www.adults.ccinform.co.uk/shibboleth">
-  <!--
-		This is a "CCI Adults" SP for Reed Business Information Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-08T16:44:26Z">
-      <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:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC0DCCAbigAwIBAgIQbO4D+GhIqKdCoNWSt0VMLDANBgkqhkiG9w0BAQUFADAk
-						MSIwIAYDVQQDExl3d3cuYWR1bHRzLmNjaW5mb3JtLmNvLnVrMB4XDTE1MDMzMDIz
-						MDAwMFoXDTI1MDQwNjIzMDAwMFowJDEiMCAGA1UEAxMZd3d3LmFkdWx0cy5jY2lu
-						Zm9ybS5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK86wHRp
-						ecb2HAj31z3GJHMWgXdRbynBt/+zqfZz3V9Uj/KQVIU7mMwG7gSnuQq97hyoh8hK
-						pL8w3wZcfno4yXTcl1Xe/xcdkGkrFxParG0SAUfWFoTQKNUIk3jnbTZ/Lufy/d0w
-						k7Xm/bwIYKp2TFMM+rPSAtpFM5lKmRl/P28riSdAq7AufJHZul5ARWSfoohff/Mf
-						k0dSCYzwD5EAHG3QDzVBwBVYXohHE21Y4c+Mta/BoNYCsFPt9yk9FWTdpqCBwMWy
-						Lg0IlZlkbfBVda3R2+NIcy4kojjL6Pd6weWKKb8SVho+1IdY9h5AzcyduuRuaGyM
-						WTIAGIVN/XYJkx8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAMd0YOygFuDh2JWzj
-						u26oJozaEJcrvHKahR+7WaH8PyYEXcO4Q1oSO1sh8cv1jtP3VcxiPtUse41YBZOs
-						Pdgxy6mTq1vVQaW31rd1EYlvwAfYesSrxaDjb/Z5YB1Dcwn8gjUcL6nzCtwuWh2H
-						ma8F2LcPpStpfhToOlcPdSeRahCOZCj2Xg9rgOktXslBgpA/0zZjVv7YDCv+ZRHZ
-						vw9FpFTC68fbgfR+pTLD5t+JB6rqLU0rR9qn3vQIWTnLceqM9RT/ZwTE+riUVdFJ
-						IID+/DeMoXDChzs/p497+rsW0tyTmj3frG5pTg7OAjRUEsa6/BCsjO46O/p/qeli
-						mTMILQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://id.ccinformadults.co.uk/ccinformadults/shibboleth/samlhandler" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://id.ccinformadults.co.uk/ccinformadults/ccinformadults/shibboleth/samlhandler" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Reed Business Information Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CCI Adults</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://adults.ccinform.co.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jess</GivenName>
-    <SurName>Rolfe</SurName>
-    <EmailAddress>mailto:Jessica.rolfe@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Rayner</SurName>
-    <EmailAddress>mailto:DL.IS.WSG.ViperTeam@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.annualreviews.org-shibboleth.xml b/swamid-interfederations-2.0/www.annualreviews.org-shibboleth.xml
deleted file mode 100644
index 90530da7..00000000
--- a/swamid-interfederations-2.0/www.annualreviews.org-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://www.annualreviews.org/shibboleth">
-  <!--
-		This is an "Annual Reviews Inc." OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDrzCCApegAwIBAgIJAISIclSx3A7XMA0GCSqGSIb3DQEBBQUAMIGWMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEeMBwGA1UEAxMVd3d3LmFubnVhbHJldmlld3Mub3Jn
-						MB4XDTEwMDkxNjE4MTAyNloXDTIwMDkxMzE4MTAyNlowgZYxCzAJBgNVBAYTAlVT
-						MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsG
-						A1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0
-						ZW1zLCBJbmMuMR4wHAYDVQQDExV3d3cuYW5udWFscmV2aWV3cy5vcmcwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHRNaQRFxhtFGzrqtVl8hZpLM31/aP
-						W/y6ETnsG2NMXo5coglRVKpzykWyFTTgjX0/yXFtmJ7zTo4Aye1crn2FFKTYDYBX
-						aGx+MI/nTaVqz031hZ5gfDHwPtjYken9kBs9cl8MTvDT0vUz/PglkR+BP+Ccp7Jk
-						NQOcZ9BEye+L6B1muiTMxzZxiaWcwBzU++K4LUcYTzKGcRsyQvjJ6s6fGxryc+gT
-						VDfyOWmB7LiE7x+5MukPht+WLsJqkTlLJlho/GkuoxUMZesALS3P/OwPMuDCXLI3
-						ngCRx4JDJFw6n8xCv6tboI3JKbSA3g/6KfFQMaw6nBNEbQ7aNbQjJqVlAgMBAAEw
-						DQYJKoZIhvcNAQEFBQADggEBAC/ayKMZPSGElvNUCtGsTZXvaBieWIMbsga3bGGV
-						Zwi8CB2hRy0INVe+TVSbTVD4KY/Y2gZ8bHo3xF0JvpIiFMECJ1QE0TTxzOz3bbT9
-						L7EL5UGpDLXUYZ0y/6k5wOmtErr/qZ4Vpuix8Y5TB8s0SRiBi9A4hneB6h8/q4nm
-						CLvgTsxOooeBfCe2MIy4ivgjjWNR9RGFXDHRHGPczspu3EPZufJXiTrQt7JdePJe
-						iujg9yy7LLghWoiFqZt5zyZQSM98eYrrvsNcOIzS5k/eyJ2e/KiY8ZjTH+jjXcr4
-						rbsCePE5Q048c63PRvd2Wb705n2Fsdwfw1JDN+s4ZAZ9Umc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.annualreviews.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.annualreviews.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.annualreviews.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: Annual Reviews</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.annualreviews.org/</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.archer.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.archer.ac.uk-shibboleth.xml
deleted file mode 100644
index ceacee0f..00000000
--- a/swamid-interfederations-2.0/www.archer.ac.uk-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://www.archer.ac.uk/shibboleth">
-  <!--
-		This is an "ARCHER SAFE" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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="2015-01-22T12: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>
-      <init: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.archer.ac.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://www.archer.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ARCHER SAFE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">SAFE service administration for ARCHER</mdui:Description>
-        <mdui:Logo height="83" width="259">https://www.archer.ac.uk/assets/img/archer_logo_259.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAPNKT3NJhvy6MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHd3dy5hcmNoZXIuYWMudWswHhcNMTQwODI3MTUxNjExWhcNMjQwODI0MTUx
-						NjExWjAbMRkwFwYDVQQDExB3d3cuYXJjaGVyLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA2glxhYdtiCZ1hmouXkzW5UivP7rf/ro9gBIjJvcl
-						08BWT5r3dluh+SL7qHsPN+ej8ygoS3iGVeSjFD3CizzqG4OtyUtPiB5TMOWrbrmj
-						ZzbixIKM4weAtSoJdHvboy6Qlt170ZaQoqz4rqAc66kJTI1ILzyE+uBCyfV2GUfm
-						Z0/ZXe0syjKPo85N0779rCfYmnUTx6jojS1pT1neclayO/VEgj4RbW1hkoK+hgVU
-						uZsQPD/Ei+LNykBFuKkRhZp1Sg27KOaS0wrYJjkqjKC5xlj7xnSX6ynVnjzaRb6V
-						dPNx6XuHKAgFXxNhzzck844ILL1jlMjQerFqvdtlyJ2V3wIDAQABoz4wPDAbBgNV
-						HREEFDASghB3d3cuYXJjaGVyLmFjLnVrMB0GA1UdDgQWBBTO2VNhV9Q2f2wqQuTG
-						E8x16++mCDANBgkqhkiG9w0BAQUFAAOCAQEAiPBzjUdPLQeenN8ajRudraWnB2b5
-						0gyPpNCbm10P/Xb58zRIrNdrnC6PoxIYqfpA2+/TErNx9PjUHaJq2h7mwhH5SVQf
-						moWQNrvsVq99g7oFrMre7/V5sne0kRe2cHK4bvLKAXGOhGxJcQAVoRkL//rHXzmz
-						cjonxObbFuxU1sF3D6GdHdPgI2pGMaoeikyY6NX43AZ0xOFUEIYlWL6JlJdtZ/dC
-						jhhNJTBgE5N2TUn+dyUgezjdNQ2hGrgUsFcvpEs0vPUufMbKYu+q904waWu0Ogul
-						pbOFcMFgJJJ7jDa/ks8fgt6NX85BKIDwE0AZ3ce6AzEikZKWhGJTDnRYZQ==
-					</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.archer.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.archer.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.archer.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.archer.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.archer.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.archer.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">ARCHER SAFE</ServiceName>
-      <ServiceDescription xml:lang="en">SAFE service administration for ARCHER</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">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ARCHER SAFE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.archer.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Archer Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@archer.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stephen</GivenName>
-    <SurName>Booth</SurName>
-    <EmailAddress>mailto:s.booth@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ascopubs.org-shibboleth.xml b/swamid-interfederations-2.0/www.ascopubs.org-shibboleth.xml
deleted file mode 100644
index 234e9d5b..00000000
--- a/swamid-interfederations-2.0/www.ascopubs.org-shibboleth.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ascopubs.org/shibboleth">
-  <!--
-		This is a "Journals of the American Society of Clinical Oncology" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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="2008-07-29T15:42:14Z">
-      <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://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Journals of the American Society of Clinical Oncology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ascopubs.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ascopubs.org.xml b/swamid-interfederations-2.0/www.ascopubs.org.xml
deleted file mode 100644
index b4419368..00000000
--- a/swamid-interfederations-2.0/www.ascopubs.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ascopubs.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/ascojnls/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Journals of the American Society of Clinical Oncology</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Journals of the American Society of Clinical Oncology</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.ascopubs.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml b/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml
deleted file mode 100644
index 5cf6b03a..00000000
--- a/swamid-interfederations-2.0/www.asmscience.org-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.asmscience.org/shibboleth">
-  <!--
-		This is an "ASM Science" OpenAthens SP for Publishing Technology plc. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-07-31T15:36:54Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDnDCCAoSgAwIBAgIEUe5jgTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDcyMzEx
-						MDUzN1oXDTE2MDcyMjExMDUzN1owgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAKz4tWwjcP2+Ld9vIqdI9ssmUF7yJVnDUoJqAPhejPOFSvrEZrjvofnY
-						6VIcPcL3tyUADrD/vTRCb3T1FuQKsRnXgYzYI9o84hK6IZyTVzzD1G3Kil5ivsNq
-						ndv5hcMNfbH5kjGLfKvgHixrkR5HkLfITBghQydtCur4Yze0+u3mFu4OTabmqILH
-						hcnWlLPohznyRtx5F3fTtFFC/cUHAonymmH8OG3xQOhLFR1dSK5i2oGoRdqme6mR
-						FiFHS8832tGjqsb072rFdpxKSmPLxz0vBxoa/YVw0RP6OYgt5Gze6mPOv1rFE5jq
-						nMegHU7gLilsR6AS9GQoE+KUNiBeYhsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						OlI/iGvczpy+BZErTXPBvizoKvFJzoi5Ri+zRRu+49qR67uMrnpKAQ51Weae6kj8
-						tz0+iQIcKbyOO/9A+7Iu55PWruI4w0Qe4c8cCmFg5crORj2Orel3IMrT5s4XXOZ2
-						MHweTl9+ZGFpshUYbSdPvj2vN8RhpC1c644lHVK0xceVxd3pFZA6VdtKfrnjyfXH
-						t2m6Pzr00zEvxcvZch5rXdtH/tdSp8fRQzAoAWB1MBXTLBL1xztRSTacPMJYdiNP
-						etGuGMwdTlZcDiknmfJT4zwcf6U1kXLon29n9b+6/Yq9wo+XYXd+HjGNmaJAhZm3
-						mWuKjo4lfM11tPcrL+QV0g==
-					</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>
-						MIIDnDCCAoSgAwIBAgIEUe5jgTANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTEzMDcyMzEx
-						MDUzN1oXDTE2MDcyMjExMDUzN1owgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAKz4tWwjcP2+Ld9vIqdI9ssmUF7yJVnDUoJqAPhejPOFSvrEZrjvofnY
-						6VIcPcL3tyUADrD/vTRCb3T1FuQKsRnXgYzYI9o84hK6IZyTVzzD1G3Kil5ivsNq
-						ndv5hcMNfbH5kjGLfKvgHixrkR5HkLfITBghQydtCur4Yze0+u3mFu4OTabmqILH
-						hcnWlLPohznyRtx5F3fTtFFC/cUHAonymmH8OG3xQOhLFR1dSK5i2oGoRdqme6mR
-						FiFHS8832tGjqsb072rFdpxKSmPLxz0vBxoa/YVw0RP6OYgt5Gze6mPOv1rFE5jq
-						nMegHU7gLilsR6AS9GQoE+KUNiBeYhsCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						OlI/iGvczpy+BZErTXPBvizoKvFJzoi5Ri+zRRu+49qR67uMrnpKAQ51Weae6kj8
-						tz0+iQIcKbyOO/9A+7Iu55PWruI4w0Qe4c8cCmFg5crORj2Orel3IMrT5s4XXOZ2
-						MHweTl9+ZGFpshUYbSdPvj2vN8RhpC1c644lHVK0xceVxd3pFZA6VdtKfrnjyfXH
-						t2m6Pzr00zEvxcvZch5rXdtH/tdSp8fRQzAoAWB1MBXTLBL1xztRSTacPMJYdiNP
-						etGuGMwdTlZcDiknmfJT4zwcf6U1kXLon29n9b+6/Yq9wo+XYXd+HjGNmaJAhZm3
-						mWuKjo4lfM11tPcrL+QV0g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.asmscience.org/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.asmscience.org/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ASM Science</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.asmscience.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service</GivenName>
-    <EmailAddress>mailto:service@asmusa.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Arbuthnott</SurName>
-    <EmailAddress>mailto:openathens@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.astonsu.com-shibboleth.xml b/swamid-interfederations-2.0/www.astonsu.com-shibboleth.xml
deleted file mode 100644
index 6864ef35..00000000
--- a/swamid-interfederations-2.0/www.astonsu.com-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://www.astonsu.com/shibboleth">
-  <!--
-		This is an "Aston Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-08T09:46: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>
-      <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.astonsu.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.astonsu.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.astonsu.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.astonsu.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.astonsu.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.astonsu.com/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.astonsu.com/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.astonsu.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.astonsu.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.astonsu.com/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.astonsu.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.astonsu.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.astonsu.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.astonsu.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.astonsu.com/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.astonsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aston Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.astonsu.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL Support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml b/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-shibboleth.xml
deleted file mode 100644
index 706c8efc..00000000
--- a/swamid-interfederations-2.0/www.audionetwork.nen.gov.uk-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://www.audionetwork.nen.gov.uk/shibboleth">
-  <!--
-		This is an "Audio Networks free audio resources for the NEN community" Shibboleth SP for the South West Grid for Learning Trust.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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"/>
-  </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.audionetwork.nen.gov.uk/Shibboleth.sso/lgfl-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.audionetwork.nen.gov.uk/Shibboleth.sso/swgfl-merlin"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfjCCA2agAwIBAgIRAPknBmCnCjGeotNVf6CLdX8wDQYJKoZIhvcNAQEFBQAw
-						NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-						IFNTTCBDQTAeFw0xMzA0MTkwMDAwMDBaFw0xNjA0MTgyMzU5NTlaMEYxITAfBgNV
-						BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEhMB8GA1UEAxMYYXVkaW9uZXR3
-						b3JrLmxnZmwub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						z9k7esVlz6i3hdvNKkWxIeMt744FHvw4B2MwjVS3x/P79/daDwKaHP12SrT+NbLb
-						msujv8MiljxUYVSfJE/oSxtZNZPUi04xNpiBL6IKeCQoW4KWiSkyBy5PpuT5b0fP
-						zgK0sRGNlquoJZpOyCwan75WlFRQmhIeSd/pGfyzzic4xlOBlsxQEzjH3RIgUCEn
-						QSn4RHxCO0lG8qtoMO+W8UNS0DLJlByCxAlB7D5BpWNTKSfzwxQLjrk5wtxYFyTx
-						8Hg0FrtG48YJCrB7ojbdbq7k4wxImVqdF/3diQGS4GFDvAVj5YFlUpQjhKzXe07T
-						2V1xF60sd7Y6XVuj/pZ0bQIDAQABo4IBdTCCAXEwHwYDVR0jBBgwFoAUDL2TaAzz
-						3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKu6x/xS9uGWbmtyeijYnV+tciEDMA4G
-						A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-						BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
-						BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVO
-						QVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
-						cnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpo
-						dHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAjBgNVHREEHDAaghhhdWRpb25ldHdv
-						cmsubGdmbC5vcmcudWswDQYJKoZIhvcNAQEFBQADggEBABvf+bM1ua7K8UQtqK0Q
-						uBTxc+krTRg1Du680rxmFRdKRFtwkzCW+2bXFoMnZSLbS+sFbKUXe805GATZh6DI
-						5eMuAU2DCcMpqtgSkB0cxYYBUNIYElBDyEmiGOfUEJZR+Vr4CrUxnteHbl++mzoY
-						DXOwBM7YjzK/Fh7eIBEdexnxqrDMHf676j5oulzmQ/uvmeVq+r9iP8ei5vqrkvsa
-						KBJX1oimGt9bb+ZIH7D+Ck88dwh/JQOpJzllZDoLflm0UMatS53Rm6cwCuczQ3A6
-						W5eqaVcnOgT2hA6dDtraW94YH4POo7+eI2rc+XEzyviy/IzF5v9ICxAABWyePG1H
-						++0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.audionetwork.nen.gov.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.audionetwork.nen.gov.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">South West Grid for Learning Trust</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">South West Grid for Learning Trust: Audio Networks free audio resources for the NEN community</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.swgfl.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Phil</GivenName>
-    <SurName>Chapman</SurName>
-    <EmailAddress>mailto:phil@atomwide.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Phil</GivenName>
-    <SurName>Chapman</SurName>
-    <EmailAddress>mailto:phil@atomwide.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.b2i.de.xml b/swamid-interfederations-2.0/www.b2i.de.xml
deleted file mode 100644
index cd8fad71..00000000
--- a/swamid-interfederations-2.0/www.b2i.de.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.b2i.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.b2i.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.b2i.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.b2i.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIHEnRZn3AzVDANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTExMDA3WhcNMTYw
-ODIyMTExMDA3WjCBkjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRMwEQYD
-VQQDEwp3d3cuYjJpLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-uXCPIiALHLNEC6a5kbCcJTiJoZ6Pn8OnSI5Mw4VhFMcnkOvMorpt/R4/3kioT3gL
-KRUhFDgWyO2pty8Q4xlyPRHGlt938C5XXvfcY9rzLgABKSn2+rjhb2bMS5Zlz+aW
-88r04kvZgR4PlmZa0GyXj/eWowh9Ic0tU6uh8g4RIdaryHuqbbqpFEAkONNIoH1g
-M+4CNSmj36LQNQFo+2ov3DyZ/dJt9jth4T5M1m03NeILolNujzW5Ce+JO0gHFDWJ
-Qp9+w13RDGDNQJuTfBYvhOfxPU2FrgdOkZaA7XDbmBVAQLhen/0AV98i3PXOvAID
-mmLoiqjhi+qS5OnPygeahQIDAQABo4IB/DCCAfgwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSv
-+qt8pTd2pwww9zj3CUvf/TbPqjAfBgNVHSMEGDAWgBR6Z4xbGhNEgrMhWhsqivOf
-MeDEYTCBsQYDVR0fBIGpMIGmMFGgT6BNhktodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNy
-bC5jcmwwUaBPoE2GS2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5ZXJpc2NoZS1z
-dGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBygYIKwYB
-BQUHAQEEgb0wgbowWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-YmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5
-ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAK6JlbJ+37MzXm6R6Lh0W9KsTc/ZYLdI
-QYxxeDiV8axPHmKhtnG/hhWucv0f2fG2gDi0kjSExZ4lpSfX0acTXv6CIF2zQMdG
-w9cCFbDZ8h2SgnH/tBb0/+M6bws1Xv0laxC9BZ7xAjVZq2d+YO4hTqQZCDvhcoR/
-B5aqFOuOpmXbjpP9ZeA9fMriC3GnB6JiAbPPzDEZgPGykcVl98lpQsFBcj8bNxRH
-eOe0rKs4xT+t4l/p5hbSp31Yef3mXJFRcXUtGjxuugaHYppXygc2v1iq9cletQoT
-k2wV8azDBD0V9CSHPwtltUaABXeMzxIGmTStfUIQeQ6+Aflofj72TfM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.b2i.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.b2i.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIHEnRZn3AzVDANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTExMDA3WhcNMTYw
-ODIyMTExMDA3WjCBkjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRMwEQYD
-VQQDEwp3d3cuYjJpLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-uXCPIiALHLNEC6a5kbCcJTiJoZ6Pn8OnSI5Mw4VhFMcnkOvMorpt/R4/3kioT3gL
-KRUhFDgWyO2pty8Q4xlyPRHGlt938C5XXvfcY9rzLgABKSn2+rjhb2bMS5Zlz+aW
-88r04kvZgR4PlmZa0GyXj/eWowh9Ic0tU6uh8g4RIdaryHuqbbqpFEAkONNIoH1g
-M+4CNSmj36LQNQFo+2ov3DyZ/dJt9jth4T5M1m03NeILolNujzW5Ce+JO0gHFDWJ
-Qp9+w13RDGDNQJuTfBYvhOfxPU2FrgdOkZaA7XDbmBVAQLhen/0AV98i3PXOvAID
-mmLoiqjhi+qS5OnPygeahQIDAQABo4IB/DCCAfgwCQYDVR0TBAIwADALBgNVHQ8E
-BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBSv
-+qt8pTd2pwww9zj3CUvf/TbPqjAfBgNVHSMEGDAWgBR6Z4xbGhNEgrMhWhsqivOf
-MeDEYTCBsQYDVR0fBIGpMIGmMFGgT6BNhktodHRwOi8vY2RwMS5wY2EuZGZuLmRl
-L2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNy
-bC5jcmwwUaBPoE2GS2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5ZXJpc2NoZS1z
-dGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY3JsL2NhY3JsLmNybDCBygYIKwYB
-BQUHAQEEgb0wgbowWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-YmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwWwYIKwYBBQUHMAKGT2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvYmF5
-ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAK6JlbJ+37MzXm6R6Lh0W9KsTc/ZYLdI
-QYxxeDiV8axPHmKhtnG/hhWucv0f2fG2gDi0kjSExZ4lpSfX0acTXv6CIF2zQMdG
-w9cCFbDZ8h2SgnH/tBb0/+M6bws1Xv0laxC9BZ7xAjVZq2d+YO4hTqQZCDvhcoR/
-B5aqFOuOpmXbjpP9ZeA9fMriC3GnB6JiAbPPzDEZgPGykcVl98lpQsFBcj8bNxRH
-eOe0rKs4xT+t4l/p5hbSp31Yef3mXJFRcXUtGjxuugaHYppXygc2v1iq9cletQoT
-k2wV8azDBD0V9CSHPwtltUaABXeMzxIGmTStfUIQeQ6+Aflofj72TfM=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.b2i.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.b2i.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.b2i.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.b2i.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.b2i.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.b2i.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.b2i.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.b2i.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.b2i.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.b2i.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.b2i.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.b2i.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.b2i.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.b2i.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.b2i.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bathspasu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.bathspasu.co.uk-shibboleth.xml
deleted file mode 100644
index 08b32a0e..00000000
--- a/swamid-interfederations-2.0/www.bathspasu.co.uk-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://www.bathspasu.co.uk/shibboleth">
-  <!--
-		This is a "Bath Spa University Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-16T11:04:20Z"/>
-  </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.bathspasu.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://www.bathspasu.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathspasu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bathspasu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bath Spa University Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bathspasu.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bathstudent.com-shibboleth.xml b/swamid-interfederations-2.0/www.bathstudent.com-shibboleth.xml
deleted file mode 100644
index 1d8288ec..00000000
--- a/swamid-interfederations-2.0/www.bathstudent.com-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://www.bathstudent.com/shibboleth">
-  <!--
-		This is a "BathStudent.com" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathstudent.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathstudent.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathstudent.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bathstudent.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathstudent.com/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathstudent.com/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathstudent.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bathstudent.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bathstudent.com/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bathstudent.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bathstudent.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bathstudent.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bathstudent.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bathstudent.com/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bathstudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Membership Solutions Limited: BathStudent.com</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bathstudent.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bfi.org.uk-inview-shibboleth.xml b/swamid-interfederations-2.0/www.bfi.org.uk-inview-shibboleth.xml
deleted file mode 100644
index 7bded93e..00000000
--- a/swamid-interfederations-2.0/www.bfi.org.uk-inview-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://www.bfi.org.uk/inview/shibboleth">
-  <!--
-		This is a "BFI Inview" Shibboleth SP for the British Film Institute.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-09T17:30: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: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>
-						MIIC3zCCAcegAwIBAgIJAJCZAVBpmy3YMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHJvYmluc29uMB4XDTA5MTAwMTE0MTA0NFoXDTE5MDkyOTE0MTA0NFowEzER
-						MA8GA1UEAxMIcm9iaW5zb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC8gOXUZXEl3AdPbrI44ra8gDLytogk10Iu3DSwv56II/tF+yPcfUeT2sLRSOZG
-						zqrAMBBsgJlCv1GEq94ybtdjjIJvPTzOp3IMPQkQU3SBZnq05rGLvsIgYyu4yg8z
-						4MWit9JDCyQjRLZ/ayVUog1Xh4Q1Ml/Rv3BAeSHxtjjE7TaXQ9UjM9ebJ42wCjEp
-						9swilxUA1OU+vJOpbcP6VVhBxe6ZstCNtEHeCnTDZtNJW2PIJaL2MopRPx7MqiV6
-						+ySSkDc/u/UaepNTwgtfIHK7GFD62PilOrlS/PE73MVlUK7sLfJFaMYIUzaNxzUd
-						hcRJRaqPkKtgTkM2ph6vC+tPAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHJvYmluc29u
-						MB0GA1UdDgQWBBT5snOaM5DTvRHkjANs/TyJcZ7zLTANBgkqhkiG9w0BAQUFAAOC
-						AQEAXuGwikXA4QCegNWBpXH0Rz/0scLjRLYKELH+oJPJkaw2PdTjRspiq1a6npJ/
-						stBZnAA+P1Uv8z2P1V9ZJKnu1r3H/Ud16nTYohZE/xvLojjo8lI9xE16PMr2yYyO
-						n+NJ3zBlTltEVI7e49iS0yxVDrbfOVyZJvtXvAxx+Lg+zQI2v5UT0qnxtzOKdavI
-						Prf8Iq9rlOp3e21QQxTXdxAB3eGwne2r9xRphIicUq2l2beiCWP/7xrBs9HIxC1c
-						3CIwNpT/P4STvqGoRTAoioiBoZycIY3GCaV57iTiT6eN0aEXWwwZX3uoqhd6H2tS
-						8Q3adyi7hXpgTa3/E7CprovtpQ==
-					</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>
-						MIIC3zCCAcegAwIBAgIJAJCZAVBpmy3YMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
-						BAMTCHJvYmluc29uMB4XDTA5MTAwMTE0MTA0NFoXDTE5MDkyOTE0MTA0NFowEzER
-						MA8GA1UEAxMIcm9iaW5zb24wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQC8gOXUZXEl3AdPbrI44ra8gDLytogk10Iu3DSwv56II/tF+yPcfUeT2sLRSOZG
-						zqrAMBBsgJlCv1GEq94ybtdjjIJvPTzOp3IMPQkQU3SBZnq05rGLvsIgYyu4yg8z
-						4MWit9JDCyQjRLZ/ayVUog1Xh4Q1Ml/Rv3BAeSHxtjjE7TaXQ9UjM9ebJ42wCjEp
-						9swilxUA1OU+vJOpbcP6VVhBxe6ZstCNtEHeCnTDZtNJW2PIJaL2MopRPx7MqiV6
-						+ySSkDc/u/UaepNTwgtfIHK7GFD62PilOrlS/PE73MVlUK7sLfJFaMYIUzaNxzUd
-						hcRJRaqPkKtgTkM2ph6vC+tPAgMBAAGjNjA0MBMGA1UdEQQMMAqCCHJvYmluc29u
-						MB0GA1UdDgQWBBT5snOaM5DTvRHkjANs/TyJcZ7zLTANBgkqhkiG9w0BAQUFAAOC
-						AQEAXuGwikXA4QCegNWBpXH0Rz/0scLjRLYKELH+oJPJkaw2PdTjRspiq1a6npJ/
-						stBZnAA+P1Uv8z2P1V9ZJKnu1r3H/Ud16nTYohZE/xvLojjo8lI9xE16PMr2yYyO
-						n+NJ3zBlTltEVI7e49iS0yxVDrbfOVyZJvtXvAxx+Lg+zQI2v5UT0qnxtzOKdavI
-						Prf8Iq9rlOp3e21QQxTXdxAB3eGwne2r9xRphIicUq2l2beiCWP/7xrBs9HIxC1c
-						3CIwNpT/P4STvqGoRTAoioiBoZycIY3GCaV57iTiT6eN0aEXWwwZX3uoqhd6H2tS
-						8Q3adyi7hXpgTa3/E7CprovtpQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bfi.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bfi.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bfi.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bfi.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bfi.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bfi.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bfi.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bfi.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bfi.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">British Film Institute</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">British Film Institute: BFI InView</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bfi.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Online Support</GivenName>
-    <EmailAddress>mailto:online.support@bfi.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Online Technical</GivenName>
-    <EmailAddress>mailto:online.technical@bfi.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bioone.org-shibboleth.xml b/swamid-interfederations-2.0/www.bioone.org-shibboleth.xml
deleted file mode 100644
index 67ef706b..00000000
--- a/swamid-interfederations-2.0/www.bioone.org-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://www.bioone.org/shibboleth">
-  <!--
-		This is a 'BioOne' OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDoTCCAomgAwIBAgIJAJjXSA+eCVerMA0GCSqGSIb3DQEBBQUAMIGPMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEXMBUGA1UEAxMOd3d3LmJpb29uZS5vcmcwHhcNMTAx
-						MDIyMDAyOTE1WhcNMjAxMDE5MDAyOTE1WjCBjzELMAkGA1UEBhMCVVMxEzARBgNV
-						BAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMR0wGwYDVQQKExRB
-						dHlwb24gU3lzdGVtcywgSW5jLjEdMBsGA1UECxMUQXR5cG9uIFN5c3RlbXMsIElu
-						Yy4xFzAVBgNVBAMTDnd3dy5iaW9vbmUub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAq9l9fHkQV6d18ZBMtv1oAsyV2spBF4o5FCta4jLiVrcx6TAh
-						eY+1djxN0smEpiflND9YyncINW/QxTr4VkJaRrURGalwPYUnEDMbUeDCZGdjmuHn
-						ijesTi34lBnjz8FeIIoB/1YlCSVffVxxOLw6AhVDuBixH+n1MK3AvMaV7+6k7iar
-						59570440WqpQMpWVJm+a1EgyS4WF5SjW8PI3VDfrJCC76Qg6YCKXhdO56sFZ8fOe
-						m+6nUdkZRSUEDZ6jG9nF2rFKdxrlTCEpVXrSViiuAGrwcNXxIF07M/cdW4gh2J1n
-						anOVWYhax9gL0PPXptkCjQxiJKK8oKF/qU5YvQIDAQABMA0GCSqGSIb3DQEBBQUA
-						A4IBAQCXFBWSkhl6SXKrjBTJGR2Ed7QdRhhZJFgglA0NZJ0eGHE0tTmF34Htgr+D
-						rjxXukFop7y+zuEg51CCNExeiIn8boC6/Bi1N5wnXKgBxejuF5WTRqua7PehfcUk
-						sAcyQfiT42U4qL/Y5cCVvVjyjOn4vB9QInt6w0t2JB0KhdkTlzHPFGNhIr6JielL
-						OysB8mqF8SvNWTA8FXtsoj/xMzTZmOhbEr6LWeCRsATxTEnfts9XKrnvr6QvLzOp
-						oznstpE1RBJHa+apJ8N1d+K2N9Ki2S2GYGl2g9Z82UGSvirtJTnZY6TANrYKFKnd
-						WjtPYywjxsAyOSn7irW8nyLDn8sA
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bioone.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bioone.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bioone.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: BioOne</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bioone.org/</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.birpublications.org-shibboleth.xml b/swamid-interfederations-2.0/www.birpublications.org-shibboleth.xml
deleted file mode 100644
index 6c5e0bc0..00000000
--- a/swamid-interfederations-2.0/www.birpublications.org-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.birpublications.org/shibboleth">
-  <!--
-		This is a 'BIR Publications' 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-02-24T17:34:33Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID+jCCAuKgAwIBAgIJAPs6J7wBa9+AMA0GCSqGSIb3DQEBBQUAMFExIDAeBgNV
-						BAMTF3d3dy5iaXJwdWJsaWNhdGlvbnMub3JnMS0wKwYDVQQDEyRiaXJwdWJzLmJp
-						ci1wcm9kLmxpdGVyYXR1bW9ubGluZS5jb20wHhcNMTQwMTI0MTEyNzAzWhcNMjQw
-						MTIyMTEyNzAzWjBRMSAwHgYDVQQDExd3d3cuYmlycHVibGljYXRpb25zLm9yZzEt
-						MCsGA1UEAxMkYmlycHVicy5iaXItcHJvZC5saXRlcmF0dW1vbmxpbmUuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1jmEDJ8jXi2v5lHPaFJlwecK
-						1QrpkwvX0LBTH79TVTHx2pi8anBUJzCwB0igLIH2sGZab5YZuUX95rUUkbigbK2Z
-						j+29kMamegKNa5P04i2g+M898/4ylemYsiuQPUSHvvnR4xN/wesNyEhNvGXkBU0n
-						mA5MrHIfJb7XHlhsQHNzk88+MMUylkuxIxLHZKdCAV7otSAz/J85gw1kbxwfOnh9
-						0DhRkDh6hXaxIbX1zMk+D8yAeiG3nuHYRYbjfeqt/dmZVSOSQT6zPxPfOdfMe7d/
-						mEPf+RLf88ItXhsWSHrby5Dd3sLNRHccfM6eG04zCs88lrinzyteNrQnviD5qwID
-						AQABo4HUMIHRMIGvBgNVHREEgacwgaSCF3d3dy5iaXJwdWJsaWNhdGlvbnMub3Jn
-						hipodHRwczovL3d3dy5iaXJwdWJsaWNhdGlvbnMub3JnL3NoaWJib2xldGiCJGJp
-						cnB1YnMuYmlyLXByb2QubGl0ZXJhdHVtb25saW5lLmNvbYY3aHR0cHM6Ly9iaXJw
-						dWJzLmJpci1wcm9kLmxpdGVyYXR1bW9ubGluZS5jb20vc2hpYmJvbGV0aDAdBgNV
-						HQ4EFgQUKbT4MojJhlu+5CjDCYfsbGBg5lAwDQYJKoZIhvcNAQEFBQADggEBAI3E
-						8w2mbN8mc+2ynACKQ0b+fzSzuSYmwkzCNrPlxpZfgqtKzPfy+Z3N1qGBLpLEArnS
-						lTWJO2pOzI9sPAlPROl5ovpUky8SRneOeclpzzLFQJau9FJuG/x/tfLj7RQkkewK
-						d5I4e6B2H+q3KF8n6KnvJr4uh4SGfFu5EXAbIg0HpBEh5sFTFmSY/RNWLg45Quo4
-						d+1by3NzthGQKaQQB1vB8OevylY9O4elEPcTocDAGblsownCzcHhueScH+7uNMKB
-						nTfnIQ4baN5Zgm+QRbEVn7mRA7b2HYA+SQyh8B9wmYbWZ9Aerfg5hXAw5POHIZzS
-						tvSA3VPNsgDJZ/VDCPw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.birpublications.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.birpublications.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.birpublications.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">BIR Publications</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.birpublications.org/</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.bjhcm.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.bjhcm.co.uk-shibboleth.xml
deleted file mode 100644
index 598a8cf7..00000000
--- a/swamid-interfederations-2.0/www.bjhcm.co.uk-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://www.bjhcm.co.uk/shibboleth">
-  <!--
-		This is a bjhcm.co.uk OpenAthens SP for MA Healthcare Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIFBDCCA+ygAwIBAgIJAJ0dMnvmlXpZMA0GCSqGSIb3DQEBBQUAMIGjMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGzAZBgNV
-						BAoTEk1hIEhlYWx0aGNhcmUgTHRkLjEMMAoGA1UECxMDd2ViMRgwFgYDVQQDEw93
-						d3cuYmpoY20uY28udWsxLTArBgkqhkiG9w0BCQEWHnRvbS5wb2xsYXJkQG1hcmth
-						bGxlbmdyb3VwLmNvbTAeFw0xMDExMTgwOTM4MTJaFw0yMDExMTUwOTM4MTJaMIGj
-						MQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24x
-						GzAZBgNVBAoTEk1hIEhlYWx0aGNhcmUgTHRkLjEMMAoGA1UECxMDd2ViMRgwFgYD
-						VQQDEw93d3cuYmpoY20uY28udWsxLTArBgkqhkiG9w0BCQEWHnRvbS5wb2xsYXJk
-						QG1hcmthbGxlbmdyb3VwLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMFJMPZrCB4R0FGaIwXrM56fwY75Rt9sA2oAL5VitN01BhItwr1+VA+Agl6s
-						Icm/nkhQt5P6Rk6JAc//cgft37u2CpC3JLryLR4xL4lmSHofcRsRABs8+/BqDfDz
-						D7pupIMeeUV0wJqV7EECzdGY2n4QDe/oHMRlWQVEYSSOrZNqgpOXD3c51HxJeMs2
-						EUbOMonjxp8NVXZFdgeDNXwys+rsA81PipU+PMhVF5pCtPnwWlwd91G+3Q/VqyiR
-						mWynFz7KcWsBFI9Ms/JHnbLdHknMs1yvbPJF8JdpxktaRyQAFuwy7Iag4/9CFDul
-						3yCL7Ubn6q+8MYdO+nUZsSN01z0CAwEAAaOCATcwggEzMAkGA1UdEwQCMAAwLAYJ
-						YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
-						DgQWBBRdDheBuWTHljSJkR0G+mboL7G+wTCB2AYDVR0jBIHQMIHNgBRdDheBuWTH
-						ljSJkR0G+mboL7G+waGBqaSBpjCBozELMAkGA1UEBhMCR0IxDzANBgNVBAgTBkxv
-						bmRvbjEPMA0GA1UEBxMGTG9uZG9uMRswGQYDVQQKExJNYSBIZWFsdGhjYXJlIEx0
-						ZC4xDDAKBgNVBAsTA3dlYjEYMBYGA1UEAxMPd3d3LmJqaGNtLmNvLnVrMS0wKwYJ
-						KoZIhvcNAQkBFh50b20ucG9sbGFyZEBtYXJrYWxsZW5ncm91cC5jb22CCQCdHTJ7
-						5pV6WTANBgkqhkiG9w0BAQUFAAOCAQEAcAIeF4Vx7UA/+lEoZ5VB+5cfKodmIorI
-						oxbwQcKVvCrC5aziWcPVpzCE3u4lS4Qad2YJFzHSUyHQQ37IrmrfzEhctFJAxvaX
-						QF/XmEj+CW0OkaDxWSYTZfzL3XJk3OA213pbq6ORo3qVNQB5lwajhq0cK12G+Jzm
-						W/lRqlPGzX0MFVafCrgkCrD1qgg+w5T6KGNtMWZUtsjpD+WN64kUoV9pKU8itUf5
-						iaKjGvk2mhyFQ/jC5HMLSc6w//OmpSjsrQmg7R7sDoZsPgPMM6EGUfwIBfWDqqEM
-						FkiDK5odPpv8XOuhavrPqL9CL3sRnGMezE7UyPX/rytg4BeOytPubA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bjhcm.co.uk/auth/rcv/ukfed" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bjhcm.co.uk/auth/rcv/ukfed" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">MA Healthcare Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MA Healthcare Limited: bjhcm.co.uk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bjhcm.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tom</GivenName>
-    <SurName>Pollard</SurName>
-    <EmailAddress>mailto:tom.pollard@markallengroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ella</GivenName>
-    <SurName>Horswell</SurName>
-    <EmailAddress>mailto:ella.horswell@fsite.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.blikbook.com-shibboleth.xml b/swamid-interfederations-2.0/www.blikbook.com-shibboleth.xml
deleted file mode 100644
index 95f15bbe..00000000
--- a/swamid-interfederations-2.0/www.blikbook.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.blikbook.com/shibboleth">
-  <!--
-		This is a "BlikBook" Shibboleth SP for BlikBook Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-09T13:52: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>
-      <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.blikbook.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIICzTCCAbWgAwIBAgIJAKNuWk4C+NN7MA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNV
-						BAMTAjE0MB4XDTEzMDkwNTE4NTM0M1oXDTIzMDkwMzE4NTM0M1owDTELMAkGA1UE
-						AxMCMTQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnU7lRsAO3JWdF
-						CV6hbwomTdJAw5Q75PHIVIDhgk6WFtKhBjiUSJDKv+1H2AreuEYGpRX7crXJ8JeR
-						4ox4dB1FKr76FsNS2d38VkgzmyVTyAj1YgFZS5PKrzIogh4s2/h+DFGu2FAkgdFs
-						qXf/B+sWAnbDyfgr7wp+QzfVscCYHFDtmrul9EoYD704Emk3H4ViEZLZHjw9UCHl
-						HCUA2mNFKQu6hBRPLy//9yvyvbb5SuxmVVExPTpaUwqDtYlgajeI0pno1cRckGkf
-						A6W4teAaNTxqEstYWOO8VxmhT5SfzaW2EwvKRlnELoWnUjXkvaPBbL00BN7ge4Qs
-						Np1lDzcBAgMBAAGjMDAuMA0GA1UdEQQGMASCAjE0MB0GA1UdDgQWBBSlgdjTlZKI
-						9VBvUaa8t9oNtgHOmDANBgkqhkiG9w0BAQUFAAOCAQEAYvPZozk1OlBNuSP6+ewU
-						n+KivoAQGT8AiLbtjVziG74zqTfUoro9GDdGpLiq9lAodgGMkUou3gpEyVbI1oOa
-						AJF35OSCHPgy+I5czpDM/ir25tyFsO8CsJfMH56DwB8fGYr4x3cHFkm++kZj2Ew6
-						VfYnG4+9paWJcUU6kdgxhNRQpiSVbDmZ/NP/Z8GR02tkZNGm0vJgaPRI8FmxUIjL
-						1mBPt1KOIRpN+RTQZ7G24iamdHVkzeYW5PnzFv9KWtC7CzCMdcML333WFliSn//G
-						GOD58oPBiX7W3bcbxgiMeI2vQe3/wmOH8sRDMOCUheWd5tt2WpA0asts4k7kOfm6
-						sw==
-					</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>
-						MIICzTCCAbWgAwIBAgIJAKNuWk4C+NN7MA0GCSqGSIb3DQEBBQUAMA0xCzAJBgNV
-						BAMTAjE0MB4XDTEzMDkwNTE4NTM0M1oXDTIzMDkwMzE4NTM0M1owDTELMAkGA1UE
-						AxMCMTQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnU7lRsAO3JWdF
-						CV6hbwomTdJAw5Q75PHIVIDhgk6WFtKhBjiUSJDKv+1H2AreuEYGpRX7crXJ8JeR
-						4ox4dB1FKr76FsNS2d38VkgzmyVTyAj1YgFZS5PKrzIogh4s2/h+DFGu2FAkgdFs
-						qXf/B+sWAnbDyfgr7wp+QzfVscCYHFDtmrul9EoYD704Emk3H4ViEZLZHjw9UCHl
-						HCUA2mNFKQu6hBRPLy//9yvyvbb5SuxmVVExPTpaUwqDtYlgajeI0pno1cRckGkf
-						A6W4teAaNTxqEstYWOO8VxmhT5SfzaW2EwvKRlnELoWnUjXkvaPBbL00BN7ge4Qs
-						Np1lDzcBAgMBAAGjMDAuMA0GA1UdEQQGMASCAjE0MB0GA1UdDgQWBBSlgdjTlZKI
-						9VBvUaa8t9oNtgHOmDANBgkqhkiG9w0BAQUFAAOCAQEAYvPZozk1OlBNuSP6+ewU
-						n+KivoAQGT8AiLbtjVziG74zqTfUoro9GDdGpLiq9lAodgGMkUou3gpEyVbI1oOa
-						AJF35OSCHPgy+I5czpDM/ir25tyFsO8CsJfMH56DwB8fGYr4x3cHFkm++kZj2Ew6
-						VfYnG4+9paWJcUU6kdgxhNRQpiSVbDmZ/NP/Z8GR02tkZNGm0vJgaPRI8FmxUIjL
-						1mBPt1KOIRpN+RTQZ7G24iamdHVkzeYW5PnzFv9KWtC7CzCMdcML333WFliSn//G
-						GOD58oPBiX7W3bcbxgiMeI2vQe3/wmOH8sRDMOCUheWd5tt2WpA0asts4k7kOfm6
-						sw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.blikbook.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.blikbook.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.blikbook.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.blikbook.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.blikbook.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.blikbook.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.blikbook.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.blikbook.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.blikbook.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.blikbook.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.blikbook.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.blikbook.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.blikbook.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.blikbook.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.blikbook.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">BlikBook Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">BlikBook</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.blikbook.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Deepak</GivenName>
-    <SurName>Colluru</SurName>
-    <EmailAddress>mailto:deepak@blikbook.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Giles</GivenName>
-    <SurName>Greenway</SurName>
-    <EmailAddress>mailto:giles@blikbook.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bridgemaneducation.com-shibboleth.xml b/swamid-interfederations-2.0/www.bridgemaneducation.com-shibboleth.xml
deleted file mode 100644
index 52c74226..00000000
--- a/swamid-interfederations-2.0/www.bridgemaneducation.com-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://www.bridgemaneducation.com/shibboleth">
-  <!--
-		This is a "Bridgeman Education" Shibboleth SP for The Bridgeman Art Library Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-09-03T16:48: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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZDCCAkwCCQDwazyRKFeJxDANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHjAcBgNVBAoTFUJy
-						aWRnZW1hbiBBcnQgTGlicmFyeTEjMCEGA1UEAxMad3d3LmJyaWRnZW1hbmVkdWNh
-						dGlvbi5jb20wHhcNMTAwODIwMTA0NjUyWhcNMzAwNTA3MTA0NjUyWjB0MQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHjAcBgNV
-						BAoTFUJyaWRnZW1hbiBBcnQgTGlicmFyeTEjMCEGA1UEAxMad3d3LmJyaWRnZW1h
-						bmVkdWNhdGlvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc
-						r1Z/EjsTgw8PlvVdpS1KV66O5QA5Kl8XR+wM+VUz1sRm6WaN8bGv96XJkw/1K96g
-						+6SssA6bNuqxJ5vRLyDGNFCwfrqh+Peqd2EPAqmkkjZ1wHaYkHHQlt9SO6Yzr8t6
-						//l4mHVG3hf+NRW6ULCR8OXDOvvLXiVHEWUhU9R0ihE9gvbyOAsIMOJ3FQW663gv
-						8kP7dxLAiK5MZ+M8jVWsQ/4qV1TuEipF7QySz7KJCfYf15b/cjirm/Rq/TPD1v5i
-						v6XUqd01TpEZ20UCirqy5j0DUkdB77M9qlJPVon8MPNtUZJAwpUKtMgUscD6N1FB
-						DoRT2qLbSTgDNCcYcn69AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACEJlFGX1o/F
-						5G1kKFT+LgX/KuPVI7qBkb5NVzMGvLaQ2Ntz7wTWL6X0w/z9hHGEnXpr0Zc8HNNT
-						cOs5pqDaMRLREMuwaQ+H53zgVgoVvgxdfywzZOFpLghvDOlbDqhdQ/4U4DfvaiPD
-						OVsrpdM9zbOHZmbvdarfgC181gnT1Adu6xpJcHRXlLpJk10IYGfQfSvJl3AEYCkg
-						HiBaJEKUJYBBvjAyPFaMt6jaV3YDgYs1quUwx1a0lAg8DZMXoaKJpJavwhwCpUvC
-						7hKuJsm4gzUh4ULwmXRX4dO9qQedCXa3Gcazu8RU+rGVpJmSQcRXph7zzN+OIPM9
-						G4rHrVYGfPY=
-					</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>
-						MIIDZDCCAkwCCQDwazyRKFeJxDANBgkqhkiG9w0BAQUFADB0MQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHjAcBgNVBAoTFUJy
-						aWRnZW1hbiBBcnQgTGlicmFyeTEjMCEGA1UEAxMad3d3LmJyaWRnZW1hbmVkdWNh
-						dGlvbi5jb20wHhcNMTAwODIwMTA0NjUyWhcNMzAwNTA3MTA0NjUyWjB0MQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xHjAcBgNV
-						BAoTFUJyaWRnZW1hbiBBcnQgTGlicmFyeTEjMCEGA1UEAxMad3d3LmJyaWRnZW1h
-						bmVkdWNhdGlvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDc
-						r1Z/EjsTgw8PlvVdpS1KV66O5QA5Kl8XR+wM+VUz1sRm6WaN8bGv96XJkw/1K96g
-						+6SssA6bNuqxJ5vRLyDGNFCwfrqh+Peqd2EPAqmkkjZ1wHaYkHHQlt9SO6Yzr8t6
-						//l4mHVG3hf+NRW6ULCR8OXDOvvLXiVHEWUhU9R0ihE9gvbyOAsIMOJ3FQW663gv
-						8kP7dxLAiK5MZ+M8jVWsQ/4qV1TuEipF7QySz7KJCfYf15b/cjirm/Rq/TPD1v5i
-						v6XUqd01TpEZ20UCirqy5j0DUkdB77M9qlJPVon8MPNtUZJAwpUKtMgUscD6N1FB
-						DoRT2qLbSTgDNCcYcn69AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACEJlFGX1o/F
-						5G1kKFT+LgX/KuPVI7qBkb5NVzMGvLaQ2Ntz7wTWL6X0w/z9hHGEnXpr0Zc8HNNT
-						cOs5pqDaMRLREMuwaQ+H53zgVgoVvgxdfywzZOFpLghvDOlbDqhdQ/4U4DfvaiPD
-						OVsrpdM9zbOHZmbvdarfgC181gnT1Adu6xpJcHRXlLpJk10IYGfQfSvJl3AEYCkg
-						HiBaJEKUJYBBvjAyPFaMt6jaV3YDgYs1quUwx1a0lAg8DZMXoaKJpJavwhwCpUvC
-						7hKuJsm4gzUh4ULwmXRX4dO9qQedCXa3Gcazu8RU+rGVpJmSQcRXph7zzN+OIPM9
-						G4rHrVYGfPY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bridgemaneducation.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bridgemaneducation.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bridgemaneducation.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bridgemaneducation.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bridgemaneducation.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bridgemaneducation.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Bridgeman Art Library Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Bridgeman Art Library Limited: Bridgeman Education</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bridgemaneducation.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sean</GivenName>
-    <SurName>Chambers</SurName>
-    <EmailAddress>mailto:sean.chambers@bridgemanimages.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sean</GivenName>
-    <SurName>Chambers</SurName>
-    <EmailAddress>mailto:sean.chambers@bridgemanimages.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.brightonsu.com-shibboleth.xml b/swamid-interfederations-2.0/www.brightonsu.com-shibboleth.xml
deleted file mode 100644
index b3782250..00000000
--- a/swamid-interfederations-2.0/www.brightonsu.com-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://www.brightonsu.com/shibboleth">
-  <!--
-		This is a Shibboleth "Brighton Students' Union" SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-14T10:33:25Z"/>
-  </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.brightonsu.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.brightonsu.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.brightonsu.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.brightonsu.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.brightonsu.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.brightonsu.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.brightonsu.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.brightonsu.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.brightonsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.brightonsu.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.brightonsu.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.brightonsu.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.brightonsu.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Brighton Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.brightonsu.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bristolsu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.bristolsu.org.uk-shibboleth.xml
deleted file mode 100644
index c56593e6..00000000
--- a/swamid-interfederations-2.0/www.bristolsu.org.uk-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://www.bristolsu.org.uk/shibboleth">
-  <!--
-		This is a "Bristol Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-07T14:33: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>
-      <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.bristolsu.org.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bristolsu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bristolsu.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bristolsu.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bristolsu.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bristolsu.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bristolsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Bristol Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bristolsu.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.british-history.ac.uk-shibboleth.xml
deleted file mode 100644
index 0edc856b..00000000
--- a/swamid-interfederations-2.0/www.british-history.ac.uk-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://www.british-history.ac.uk/shibboleth">
-  <!--
-		This is a "British History Online" Shibboleth SP for the University of London.
-	-->
-  <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="2008-09-10T16:11: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://www.british-history.ac.uk/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">British History Online</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Additional premium content including The Parliament Rolls of Medieval
-					England (Edward I to Henry VII), all the volumes of the Calendar of
-					State Papers, Domestic 1537-1714, the Calendars of State Papers for
-					Scotland and Ireland, plus the Calendar of Close Rolls</mdui:Description>
-        <mdui:Logo height="33" width="487">https://www.british-history.ac.uk/images/logo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJALh/eAye3WYvMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXd3dy5icml0aXNoLWhpc3RvcnkuYWMudWswHhcNMTAwOTAyMDczODE4WhcN
-						MjAwODMwMDczODE4WjAkMSIwIAYDVQQDExl3d3cuYnJpdGlzaC1oaXN0b3J5LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv5Fo2rXmIk7rzSrS
-						r2l8ComzSzAubn2P+3aH0kXln8uijcbKjqp16eSnaRO3hjPVGqxiUpERX/vkSRYf
-						YQi1BXJSTc965iQi6YbQLtUESCMHaGnhMQTA94n3R0dF1lRjn19SoLvKq16nInxc
-						V8mdKZtP0fsLVxflrjemmnl7i56HZFXPjfBcTHzlUnIT2VOhC/hOqTyeSAEOuTKO
-						ePTH0udgPVTOLKzU6xxrR2QgDx/v7XH/KDraqlBThM/5yvS15IpdTmxWGyGlJx+Q
-						i8s1+KuRf20JTi9s41o3csrCs/iRuTcccDFI4J5Bu96CmT+hLh+zioQF/UfNsI/H
-						b5TUbQIDAQABo0cwRTAkBgNVHREEHTAbghl3d3cuYnJpdGlzaC1oaXN0b3J5LmFj
-						LnVrMB0GA1UdDgQWBBRB18xhmEjac8eJrYMgCbrBrF3oJjANBgkqhkiG9w0BAQUF
-						AAOCAQEAeKbONxHaEPx/1HTc/jfFLRagds7HYz3Ce4QKxrvge/TK4oObe8ZiICYM
-						4sTaeRkT3ioBt1Gm3ZCGtiUM5pg7QtUwG3HXBfqv/8Z1swfOxUDebab6m04aMk2i
-						2rb7aArAHATlV5a72H5CAWeEaif6WclWWo7rgTl8f7akYNt7qkZKttoHj0aWfNum
-						ecepIeAKuyBkUex3UCvzQlEr67A0wlxPSqUm9UNtYMB5KgTJjzSWVennzzRcqUFT
-						JyLIrCA/d3S+4FGrnDNNVr0KWD/h2M53lhk5ohh147oP6qwVOwqalnMIqzHDjFrm
-						Vh9RR1SnWTuXhAGE8kZHTZLj7wi3sg==
-					</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>
-						MIIDEjCCAfqgAwIBAgIJALh/eAye3WYvMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXd3dy5icml0aXNoLWhpc3RvcnkuYWMudWswHhcNMTAwOTAyMDczODE4WhcN
-						MjAwODMwMDczODE4WjAkMSIwIAYDVQQDExl3d3cuYnJpdGlzaC1oaXN0b3J5LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv5Fo2rXmIk7rzSrS
-						r2l8ComzSzAubn2P+3aH0kXln8uijcbKjqp16eSnaRO3hjPVGqxiUpERX/vkSRYf
-						YQi1BXJSTc965iQi6YbQLtUESCMHaGnhMQTA94n3R0dF1lRjn19SoLvKq16nInxc
-						V8mdKZtP0fsLVxflrjemmnl7i56HZFXPjfBcTHzlUnIT2VOhC/hOqTyeSAEOuTKO
-						ePTH0udgPVTOLKzU6xxrR2QgDx/v7XH/KDraqlBThM/5yvS15IpdTmxWGyGlJx+Q
-						i8s1+KuRf20JTi9s41o3csrCs/iRuTcccDFI4J5Bu96CmT+hLh+zioQF/UfNsI/H
-						b5TUbQIDAQABo0cwRTAkBgNVHREEHTAbghl3d3cuYnJpdGlzaC1oaXN0b3J5LmFj
-						LnVrMB0GA1UdDgQWBBRB18xhmEjac8eJrYMgCbrBrF3oJjANBgkqhkiG9w0BAQUF
-						AAOCAQEAeKbONxHaEPx/1HTc/jfFLRagds7HYz3Ce4QKxrvge/TK4oObe8ZiICYM
-						4sTaeRkT3ioBt1Gm3ZCGtiUM5pg7QtUwG3HXBfqv/8Z1swfOxUDebab6m04aMk2i
-						2rb7aArAHATlV5a72H5CAWeEaif6WclWWo7rgTl8f7akYNt7qkZKttoHj0aWfNum
-						ecepIeAKuyBkUex3UCvzQlEr67A0wlxPSqUm9UNtYMB5KgTJjzSWVennzzRcqUFT
-						JyLIrCA/d3S+4FGrnDNNVr0KWD/h2M53lhk5ohh147oP6qwVOwqalnMIqzHDjFrm
-						Vh9RR1SnWTuXhAGE8kZHTZLj7wi3sg==
-					</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>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.british-history.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.british-history.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.british-history.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.british-history.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.british-history.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.british-history.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.british-history.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.british-history.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.british-history.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">British History Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.british-history.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Steer</SurName>
-    <EmailAddress>mailto:adam.martin.steer@sas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Steer</SurName>
-    <EmailAddress>mailto:adam.martin.steer@sas.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.britishonlinearchives.co.uk-oa-metadata.xml b/swamid-interfederations-2.0/www.britishonlinearchives.co.uk-oa-metadata.xml
deleted file mode 100644
index 59f829c7..00000000
--- a/swamid-interfederations-2.0/www.britishonlinearchives.co.uk-oa-metadata.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://www.britishonlinearchives.co.uk/oa/metadata">
-  <!--
-		This is an OpenAthens SP for Microform Imaging Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDYzCCAkugAwIBAgIJAIntgQVy9bMDMA0GCSqGSIb3DQEBBQUAMEgxIDAeBgNV
-						BAoMF0JyaXRpc2ggT25saW5lIEFyY2hpdmVzMSQwIgYDVQQDDBticml0aXNob25s
-						aW5lYXJjaGl2ZXMuY28udWswHhcNMTQxMjIyMTczNTE1WhcNMjQxMjE5MTczNTE1
-						WjBIMSAwHgYDVQQKDBdCcml0aXNoIE9ubGluZSBBcmNoaXZlczEkMCIGA1UEAwwb
-						YnJpdGlzaG9ubGluZWFyY2hpdmVzLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEArBXm14IC8EPPKMLqv8Mxc6lnsDNeT4ZQqQpsF3Kz325jqZnZ
-						+4qUFliWnopWDHOPvdVDnnZg5ymSzinO2jKZcweM4yvBthDG/Wp3JNci11jgZk9h
-						C/zyoByJ5qrKrtrDjYFW5zwAcOGrSbYGeA+cKG28FoeuVowvXavMnI8ZG5SaRcfP
-						gVe9tGGeZOToVJpE3TNE5fEQA1vKCOvgoT7ED7Oqu513FFeUgINZv6R+o0xwuBc1
-						y78xfG90PUJYZZzDW4r1ZqK1yxjHVnZZetOmJIFukQ9roooN0Obar5/o8SSmGcsS
-						2TuOvURvNP8qedUQEKNZf3eoHGRwXem4yfgYwwIDAQABo1AwTjAdBgNVHQ4EFgQU
-						jiD0ReK+F12gvk35faGLaMANkigwHwYDVR0jBBgwFoAUjiD0ReK+F12gvk35faGL
-						aMANkigwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAHZPJrhAtjWu4
-						dl0m80tGN28YEJ4JTudooDQbUggD3bmf32P1l3gRxUt6JYyfcmzN8xTHQZureVB9
-						NqxJ5UrEyVuFc6criS233tITks8ujfERX8L602gRIdvnqcrb//uqq86KdWc53fyR
-						nFSfnnMQlRfHHXdwe4kB8tI5Q5GoWB2oIYxW/iePE93unoB6f12ueqji+FaaSih2
-						s2YzFjlH1ERAupJq1xeqnO6DJ8J9BN/+h/Pm0ykn/8SmhI6fXiLqfkEqG/fAK+Lj
-						bYGNjeYztEjaKkYDheCy8PqJAk5WLJMmxPR+/6Vb7uhJDDOYEnnmaLFL5uQIbWdd
-						uKhMiG0GAg==
-					</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>
-						MIIDYzCCAkugAwIBAgIJAIntgQVy9bMDMA0GCSqGSIb3DQEBBQUAMEgxIDAeBgNV
-						BAoMF0JyaXRpc2ggT25saW5lIEFyY2hpdmVzMSQwIgYDVQQDDBticml0aXNob25s
-						aW5lYXJjaGl2ZXMuY28udWswHhcNMTQxMjIyMTczNTE1WhcNMjQxMjE5MTczNTE1
-						WjBIMSAwHgYDVQQKDBdCcml0aXNoIE9ubGluZSBBcmNoaXZlczEkMCIGA1UEAwwb
-						YnJpdGlzaG9ubGluZWFyY2hpdmVzLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEArBXm14IC8EPPKMLqv8Mxc6lnsDNeT4ZQqQpsF3Kz325jqZnZ
-						+4qUFliWnopWDHOPvdVDnnZg5ymSzinO2jKZcweM4yvBthDG/Wp3JNci11jgZk9h
-						C/zyoByJ5qrKrtrDjYFW5zwAcOGrSbYGeA+cKG28FoeuVowvXavMnI8ZG5SaRcfP
-						gVe9tGGeZOToVJpE3TNE5fEQA1vKCOvgoT7ED7Oqu513FFeUgINZv6R+o0xwuBc1
-						y78xfG90PUJYZZzDW4r1ZqK1yxjHVnZZetOmJIFukQ9roooN0Obar5/o8SSmGcsS
-						2TuOvURvNP8qedUQEKNZf3eoHGRwXem4yfgYwwIDAQABo1AwTjAdBgNVHQ4EFgQU
-						jiD0ReK+F12gvk35faGLaMANkigwHwYDVR0jBBgwFoAUjiD0ReK+F12gvk35faGL
-						aMANkigwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAHZPJrhAtjWu4
-						dl0m80tGN28YEJ4JTudooDQbUggD3bmf32P1l3gRxUt6JYyfcmzN8xTHQZureVB9
-						NqxJ5UrEyVuFc6criS233tITks8ujfERX8L602gRIdvnqcrb//uqq86KdWc53fyR
-						nFSfnnMQlRfHHXdwe4kB8tI5Q5GoWB2oIYxW/iePE93unoB6f12ueqji+FaaSih2
-						s2YzFjlH1ERAupJq1xeqnO6DJ8J9BN/+h/Pm0ykn/8SmhI6fXiLqfkEqG/fAK+Lj
-						bYGNjeYztEjaKkYDheCy8PqJAk5WLJMmxPR+/6Vb7uhJDDOYEnnmaLFL5uQIbWdd
-						uKhMiG0GAg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.britishonlinearchives.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.britishonlinearchives.co.uk/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.britishonlinearchives.co.uk/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.britishonlinearchives.co.uk/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Microform Imaging Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Microform Imaging Limited: British Online Archives</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.microform.co.uk/archival-publishing.php</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Sarsfield</SurName>
-    <EmailAddress>mailto:dsarsfield@microform.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Gill</SurName>
-    <EmailAddress>mailto:martin@serversure.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.bucksstudentsunion.org-shibboleth.xml b/swamid-interfederations-2.0/www.bucksstudentsunion.org-shibboleth.xml
deleted file mode 100644
index f2c9dbac..00000000
--- a/swamid-interfederations-2.0/www.bucksstudentsunion.org-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://www.bucksstudentsunion.org/shibboleth">
-  <!--
-		This is a "Buckingham New University Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-12T14:09: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>
-      <init: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.bucksstudentsunion.org/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bucksstudentsunion.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Buckingham New University Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.bucksstudentsunion.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cairn.info-.xml b/swamid-interfederations-2.0/www.cairn.info-.xml
deleted file mode 100644
index e09615ab..00000000
--- a/swamid-interfederations-2.0/www.cairn.info-.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.cairn.info/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-13T10:38:29Z">
-      <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:AttributeValue>https://federation.renater.fr/category/documentation</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/commercial</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CAIRN</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">http://www.cairn.info</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Created in September 2005 by four Belgian and French publishers, today Cairn offers the most comprehensive collection of publications in the French language in the humanities and social sciences available online. In 2015, more than 400 journals and around 5,000 eBooks from major French, Belgian and Swiss publishers are available on www.cairn.info. Students, scholars and librarians all over the world are thus able to access more than 200,000 full-text articles and book chapters online.
-To make this content more visible and accessible to non–francophone scholars, Cairn.info (with the support of the CNL, a French governmental agency dedicated to the promotion of French publications around the world) has designed a special interface, www.cairn-int.info, enabling internet users to browse and easily find content from French journals without speaking a word of French.</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">CAIRN</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Cairn est né de la volonté de quatre maisons d’édition (Belin, De Boeck, La Découverte et Erès) ayant en charge la publication et la diffusion de revues de sciences humaines et sociales, d’unir leurs efforts pour améliorer leur présence sur l’Internet, et de proposer à d’autres acteurs souhaitant développer une version électronique de leurs publications, les outils techniques et commerciaux développés à cet effet. L’ambition de Cairn est d’aider les maisons d’édition, organismes ou associations en charge de la publication de revues de sciences humaines francophones à gérer la double publication de ces revues. Dans ce but, les services de Cairn couvrent à la fois la fabrication papier et électronique, la distribution papier (gestion des abonnements, routage) et électronique (texte intégral en ligne, distribution des métadonnées auprès des sites et bases bibliographiques), ainsi que la diffusion et la promotion de ces revues auprès des publics auxquels elles s’adressent.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.cairn.info/vie-privee.php</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>
-					      MIICgzCCAeygAwIBAgIJANHZ2qyvCn4GMA0GCSqGSIb3DQEBBQUAMDYxCzAJBgNV
-BAYTAkJFMQ4wDAYDVQQKEwVDQUlSTjEXMBUGA1UEAxMOd3d3LmNhaXJuLmluZm8w
-HhcNMDgwMTMxMTAxMTUzWhcNMjgwMTI2MTAxMTUzWjA2MQswCQYDVQQGEwJCRTEO
-MAwGA1UEChMFQ0FJUk4xFzAVBgNVBAMTDnd3dy5jYWlybi5pbmZvMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQDRPuV40csQ00mQUww+eQ7sNqaJRLBqDgufitNd
-cMwIl6cgaPAkIvpYVQPwdxhDWqzQCYJagg6pd9Jw/Rcws7rGf1S7vlWQ6vlP/7y1
-aA54xMcvM1Bx6FAp0h2oHGDfSf6HlxpsvwAJLi5ArU4EZw8CejYzWwE6XmYbj5ox
-U9p/gQIDAQABo4GYMIGVMB0GA1UdDgQWBBSKxxPh1wwwyfuboXg0mpgjcRvoujBm
-BgNVHSMEXzBdgBSKxxPh1wwwyfuboXg0mpgjcRvouqE6pDgwNjELMAkGA1UEBhMC
-QkUxDjAMBgNVBAoTBUNBSVJOMRcwFQYDVQQDEw53d3cuY2Fpcm4uaW5mb4IJANHZ
-2qyvCn4GMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEArQe7ZnkoaPH+
-MBICLC8YFFEfEEpF1hLcMcJBqLQYaaqhFw6olWUogbU8eX9Wvz1qKEZwKryJkrAs
-oDjy4c/5nHwxlFZheFLcnWiQdxmv9qjtZqV41SSn7zNVX0U9YUoY6lrtSZH/4Btk
-E25Bh11XZRlFI1reece1ILLnGQ7t3Hw=
-
-					    </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>
-					      MIICgzCCAeygAwIBAgIJANHZ2qyvCn4GMA0GCSqGSIb3DQEBBQUAMDYxCzAJBgNV
-BAYTAkJFMQ4wDAYDVQQKEwVDQUlSTjEXMBUGA1UEAxMOd3d3LmNhaXJuLmluZm8w
-HhcNMDgwMTMxMTAxMTUzWhcNMjgwMTI2MTAxMTUzWjA2MQswCQYDVQQGEwJCRTEO
-MAwGA1UEChMFQ0FJUk4xFzAVBgNVBAMTDnd3dy5jYWlybi5pbmZvMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQDRPuV40csQ00mQUww+eQ7sNqaJRLBqDgufitNd
-cMwIl6cgaPAkIvpYVQPwdxhDWqzQCYJagg6pd9Jw/Rcws7rGf1S7vlWQ6vlP/7y1
-aA54xMcvM1Bx6FAp0h2oHGDfSf6HlxpsvwAJLi5ArU4EZw8CejYzWwE6XmYbj5ox
-U9p/gQIDAQABo4GYMIGVMB0GA1UdDgQWBBSKxxPh1wwwyfuboXg0mpgjcRvoujBm
-BgNVHSMEXzBdgBSKxxPh1wwwyfuboXg0mpgjcRvouqE6pDgwNjELMAkGA1UEBhMC
-QkUxDjAMBgNVBAoTBUNBSVJOMRcwFQYDVQQDEw53d3cuY2Fpcm4uaW5mb4IJANHZ
-2qyvCn4GMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEArQe7ZnkoaPH+
-MBICLC8YFFEfEEpF1hLcMcJBqLQYaaqhFw6olWUogbU8eX9Wvz1qKEZwKryJkrAs
-oDjy4c/5nHwxlFZheFLcnWiQdxmv9qjtZqV41SSn7zNVX0U9YUoY6lrtSZH/4Btk
-E25Bh11XZRlFI1reece1ILLnGQ7t3Hw=
-
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cairn.info/shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cairn.info/shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">CAIRN</md:ServiceName>
-      <md:ServiceName xml:lang="en">CAIRN</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Cairn est né de la volonté de quatre maisons d’édition (Belin, De Boeck, La Découverte et Erès) ayant en charge la publication et la diffusion de revues de sciences humaines et sociales, d’unir leurs efforts pour améliorer leur présence sur l’Internet, et de proposer à d’autres acteurs souhaitant développer une version électronique de leurs publications, les outils techniques et commerciaux développés à cet effet. L’ambition de Cairn est d’aider les maisons d’édition, organismes ou associations en charge de la publication de revues de sciences humaines francophones à gérer la double publication de ces revues. Dans ce but, les services de Cairn couvrent à la fois la fabrication papier et électronique, la distribution papier (gestion des abonnements, routage) et électronique (texte intégral en ligne, distribution des métadonnées auprès des sites et bases bibliographiques), ainsi que la diffusion et la promotion de ces revues auprès des publics auxquels elles s’adressent.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Created in September 2005 by four Belgian and French publishers, today Cairn offers the most comprehensive collection of publications in the French language in the humanities and social sciences available online. In 2015, more than 400 journals and around 5,000 eBooks from major French, Belgian and Swiss publishers are available on www.cairn.info. Students, scholars and librarians all over the world are thus able to access more than 200,000 full-text articles and book chapters online.
-To make this content more visible and accessible to non–francophone scholars, Cairn.info (with the support of the CNL, a French governmental agency dedicated to the promotion of French publications around the world) has designed a special interface, www.cairn-int.info, enabling internet users to browse and easily find content from French journals without speaking a word of French.</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CAIRN SA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CAIRN SA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cairn.info/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>De Vathaire Jean-Baptiste</md:SurName>
-    <md:EmailAddress>jb.devathaire@cairn.info</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Benjamin Hennon</md:SurName>
-    <md:EmailAddress>benjamin.hennon@pythagoria.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.callforparticipants.com-institutional-login-entity.xml b/swamid-interfederations-2.0/www.callforparticipants.com-institutional-login-entity.xml
deleted file mode 100644
index 0308dfc7..00000000
--- a/swamid-interfederations-2.0/www.callforparticipants.com-institutional-login-entity.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://www.callforparticipants.com/institutional-login/entity">
-  <!--
-		This is a simpleSAMLphp SP for Call Participants Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-30T09:10:51Z">
-      <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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID6DCCAtACCQCgXYYpGzPTKTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-						R0IxGDAWBgNVBAgTD05vdHRpbmdoYW1zaGlyZTETMBEGA1UEBxMKTm90dGluZ2hh
-						bTEiMCAGA1UEChMZQ2FsbCBGb3IgUGFydGljaXBhbnRzIEx0ZDEgMB4GA1UEAxMX
-						Y2FsbGZvcnBhcnRpY2lwYW50cy5jb20xMTAvBgkqhkiG9w0BCQEWIml0LXN1cHBv
-						cnRAY2FsbGZvcnBhcnRpY2lwYW50cy5jb20wHhcNMTQwNjI3MTA1MTE3WhcNNDEx
-						MTExMTA1MTE3WjCBtTELMAkGA1UEBhMCR0IxGDAWBgNVBAgTD05vdHRpbmdoYW1z
-						aGlyZTETMBEGA1UEBxMKTm90dGluZ2hhbTEiMCAGA1UEChMZQ2FsbCBGb3IgUGFy
-						dGljaXBhbnRzIEx0ZDEgMB4GA1UEAxMXY2FsbGZvcnBhcnRpY2lwYW50cy5jb20x
-						MTAvBgkqhkiG9w0BCQEWIml0LXN1cHBvcnRAY2FsbGZvcnBhcnRpY2lwYW50cy5j
-						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwB5uFFfe8R6HSW2xm
-						LiFIvRAAhMNEG/xxc8fNqXuI6WpF0bvwruLfxapJtcQoBHW1j7LDcFU+FHH8Xwsx
-						DcFCMTTa04ynMTOBi+/+9jLfCGIedmkinPyYB80rowsYLP7ReCYHYRoe1heJXzei
-						3rcK+iA5SHqLoyrw7nNeW0WdEwd7KkEAUSn8iLQSRXgF6SV+f7T8a2ZeV4ImL8vl
-						lMeZtkhIiLGhmtoJUulsg/7Mcd6ZrzYtXo9/0ZKUERlhZKVr/8r8tY7Bvk7rvUbS
-						TaUG3WCnJBXYlUL5U2OpmujSs26o53KgVXYEIfjGW+a2lPon6veJAz7BP+hnaG0h
-						8UZHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAB4vASnaNIhyQSXPJCiX8MJpMOeI
-						S3YB23NXLSHopT0jjOyl5pUegl0BeIgCtwMzp2uWVR7LfbsOwGGuSGN1xsCs9C9C
-						B2eTpaMh7z7LM9CVQPMeHhJ/FWEhm5GbvvtiXOVNKSFc7Sr2ZLPZBtBHCvO1IyJh
-						Ww4pWyqV6FzcB5DLDneqYudz2coG24Mjiwd51bWnMwrK1P2DyqO+GgWRnamNbaSB
-						zTTuNWP2F9pytZF0Racu2+9FklyvRddQmsR4rU8gi4xOYVLyExa+2bY1xbltSfce
-						nXJLz+6Nyjo9A8l1BcShxxx5EgFyaSm69KloNzt+KaF3ZfmY/D6AJyCwQiA=
-					</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>
-						MIID6DCCAtACCQCgXYYpGzPTKTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UEBhMC
-						R0IxGDAWBgNVBAgTD05vdHRpbmdoYW1zaGlyZTETMBEGA1UEBxMKTm90dGluZ2hh
-						bTEiMCAGA1UEChMZQ2FsbCBGb3IgUGFydGljaXBhbnRzIEx0ZDEgMB4GA1UEAxMX
-						Y2FsbGZvcnBhcnRpY2lwYW50cy5jb20xMTAvBgkqhkiG9w0BCQEWIml0LXN1cHBv
-						cnRAY2FsbGZvcnBhcnRpY2lwYW50cy5jb20wHhcNMTQwNjI3MTA1MTE3WhcNNDEx
-						MTExMTA1MTE3WjCBtTELMAkGA1UEBhMCR0IxGDAWBgNVBAgTD05vdHRpbmdoYW1z
-						aGlyZTETMBEGA1UEBxMKTm90dGluZ2hhbTEiMCAGA1UEChMZQ2FsbCBGb3IgUGFy
-						dGljaXBhbnRzIEx0ZDEgMB4GA1UEAxMXY2FsbGZvcnBhcnRpY2lwYW50cy5jb20x
-						MTAvBgkqhkiG9w0BCQEWIml0LXN1cHBvcnRAY2FsbGZvcnBhcnRpY2lwYW50cy5j
-						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwB5uFFfe8R6HSW2xm
-						LiFIvRAAhMNEG/xxc8fNqXuI6WpF0bvwruLfxapJtcQoBHW1j7LDcFU+FHH8Xwsx
-						DcFCMTTa04ynMTOBi+/+9jLfCGIedmkinPyYB80rowsYLP7ReCYHYRoe1heJXzei
-						3rcK+iA5SHqLoyrw7nNeW0WdEwd7KkEAUSn8iLQSRXgF6SV+f7T8a2ZeV4ImL8vl
-						lMeZtkhIiLGhmtoJUulsg/7Mcd6ZrzYtXo9/0ZKUERlhZKVr/8r8tY7Bvk7rvUbS
-						TaUG3WCnJBXYlUL5U2OpmujSs26o53KgVXYEIfjGW+a2lPon6veJAz7BP+hnaG0h
-						8UZHAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAB4vASnaNIhyQSXPJCiX8MJpMOeI
-						S3YB23NXLSHopT0jjOyl5pUegl0BeIgCtwMzp2uWVR7LfbsOwGGuSGN1xsCs9C9C
-						B2eTpaMh7z7LM9CVQPMeHhJ/FWEhm5GbvvtiXOVNKSFc7Sr2ZLPZBtBHCvO1IyJh
-						Ww4pWyqV6FzcB5DLDneqYudz2coG24Mjiwd51bWnMwrK1P2DyqO+GgWRnamNbaSB
-						zTTuNWP2F9pytZF0Racu2+9FklyvRddQmsR4rU8gi4xOYVLyExa+2bY1xbltSfce
-						nXJLz+6Nyjo9A8l1BcShxxx5EgFyaSm69KloNzt+KaF3ZfmY/D6AJyCwQiA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml2-logout.php/cfp-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml2-acs.php/cfp-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml1-acs.php/cfp-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml2-acs.php/cfp-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.callforparticipants.com/institutional-login/saml/module.php/saml/sp/saml1-acs.php/cfp-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Call For Participants Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Call For Participants</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.callforparticipants.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:help@callforparticipants.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT-Support</GivenName>
-    <EmailAddress>mailto:it-support@callforparticipants.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cans.org.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.cans.org.uk-shibboleth-sp.xml
deleted file mode 100644
index c271cb60..00000000
--- a/swamid-interfederations-2.0/www.cans.org.uk-shibboleth-sp.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://www.cans.org.uk/shibboleth-sp">
-  <!--
-		This is a "Legal Information" Shibboleth SP for Citizens Advice Notes Service Trust.
-	-->
-  <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-08-03T14:04:29Z">
-      <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.cans.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://www.cans.org.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIJALDeNSvqu4X6MA0GCSqGSIb3DQEBBQUAMDMxMTAvBgNV
-						BAMTKHdlYnN0YXJzLWNhbnMuc2VydmVycy5yYmwtbWVyLm1pc3AuY28udWswHhcN
-						MTEwNzI1MjAyMjI2WhcNMjEwNzIyMjAyMjI2WjAzMTEwLwYDVQQDEyh3ZWJzdGFy
-						cy1jYW5zLnNlcnZlcnMucmJsLW1lci5taXNwLmNvLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA0UhAljwZVOdU7bOCYe+ZQrhWqePftNspOCkP0HP7
-						r0++0yD+HQUaAHEU1drhm8tXlNfKoFTHlBk6w9fbC45auasz093CgjNNYO5jsgZ4
-						E7IQ59PaGlDSE80jKugD0+ZQGAsSQEzTDlOX8yKJ8hbbbAf1zuaIznH8u3kc8RkB
-						HCXPLWAxCcqgKLh4188SeeZXUewn8uNqR6GGgdOcaPmLdrgKLJ/+mDPtkLAB6pvm
-						TQYGdwkHbVnggtCUk8GPQHHJ3HnrY6hGTxm/bkVeABXeVXZAKPTAgOk5UFzqUwLR
-						Xd7W89PavWoYNlG2Uhq8X/n3h9+9XA6ldR4tSSN5e38HswIDAQABo1YwVDAzBgNV
-						HREELDAqgih3ZWJzdGFycy1jYW5zLnNlcnZlcnMucmJsLW1lci5taXNwLmNvLnVr
-						MB0GA1UdDgQWBBTqtW8nIPlLZA2OyhfmRhZW5jR/mjANBgkqhkiG9w0BAQUFAAOC
-						AQEApfwxvHulgw7+D+XvhgxEoViwpHd6Z8JhWgnsbt0JiRwDwWEzhhsM9QEF4gZM
-						5ZdL56yL3ATZ4j5uFiZcBF2Kv2yOufbI2OkBM6rjV4+NBFReAGS0ugZs49SZ5V1U
-						XBxeX5vL1uuHjzJbvvwQr4ton7p4qeSO6duJkiCI5XIPrf4NXodla711SuM3q+L4
-						zLpI8uIaKJwCnsIMeJm0pj2zojM7SVOPUYEtpAuxb6gBSeSB9IYttVjKn0USpthC
-						0WyK0Tt3t/i0LHeIbcaOpcPdnjr/x7Dg8/9X1DRfpJMDK5UogWENLgN9fz0SdqDp
-						ubozEJC8LUak3g0570yFN0h++A==
-					</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.cans.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cans.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cans.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cans.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cans.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cans.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cans.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cans.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Citizens Advice Notes Service Trust</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Citizens Advice Notes Service Trust: Legal Information</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cans.org.uk/libraries-public/about</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Emil</GivenName>
-    <SurName>Muthu</SurName>
-    <EmailAddress>mailto:emil@webstarsltd.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Emil</GivenName>
-    <SurName>Muthu</SurName>
-    <EmailAddress>mailto:emil@webstarsltd.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cardiffmetsu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.cardiffmetsu.co.uk-shibboleth.xml
deleted file mode 100644
index d1c9db03..00000000
--- a/swamid-interfederations-2.0/www.cardiffmetsu.co.uk-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://www.cardiffmetsu.co.uk/shibboleth">
-  <!--
-		This is a "Cardiff Met Students' Union" Shibboleth SP for Membership Solutions Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-06-12T14:11: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>
-      <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.cardiffmetsu.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate> 
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cardiffmetsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff Met Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cardiffmetsu.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml b/swamid-interfederations-2.0/www.cardiffstudents.com-shibboleth.xml
deleted file mode 100644
index 3e771c12..00000000
--- a/swamid-interfederations-2.0/www.cardiffstudents.com-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://www.cardiffstudents.com/shibboleth">
-  <!--
-		This is a "Cardiff University Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-11T15:15:02Z"/>
-  </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.cardiffstudents.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.cardiffstudents.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffstudents.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffstudents.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffstudents.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cardiffstudents.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cardiffstudents.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cardiffstudents.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cardiff University Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cardiffstudents.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.careers.lon.ac.uk-democareerstagged-shibboleth.xml b/swamid-interfederations-2.0/www.careers.lon.ac.uk-democareerstagged-shibboleth.xml
deleted file mode 100644
index 4f5e0d41..00000000
--- a/swamid-interfederations-2.0/www.careers.lon.ac.uk-democareerstagged-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://www.careers.lon.ac.uk/democareerstagged/shibboleth">
-  <!--
-		This is a "Careers Tagged Demo Organization" Shibboleth SP for University of London.
-	-->
-  <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="2013-09-04T11:24:49Z">
-      <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://demo.careerstagged.co.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGDCCAgCgAwIBAgIJAJPY5z7XWwecMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG3RjZy13ZWIxLnVuaXZlcnNlLmxvbi5hYy51azAeFw0xMzA2MjAwNzUwMjFa
-						Fw0yMzA2MTgwNzUwMjFaMCYxJDAiBgNVBAMTG3RjZy13ZWIxLnVuaXZlcnNlLmxv
-						bi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVPfarGmlNH
-						byNDjzAe8EaEy8kSPir6g14yBFx2wavVMvILMvvsdudXIPrDVzwjHNyvnsx5bK1Z
-						0TMzbOcv9tWJQWEnG54xkJOBneYzkZKcZOrJ58rDgNhjhdexOdzq9Ic5e19aBpCh
-						4kjHgUepgniO4CjAFlDeT3ThQU7Q1STPUgL4htN+TgqAKyRB/ilMZnUsWSHccEch
-						SscRHfOXBOUGl/SGYzptObMwFkgcc0kC3tM56+z3NQKNc/ZarHzUC/eCZMSKbOXM
-						JKKvf2oQa9z7eTt2Z6p4Esm2DC7L7d71kh3BVGWJ9FljMnFGIeXWWxpP19atSmBX
-						pIl9oytWqpsCAwEAAaNJMEcwJgYDVR0RBB8wHYIbdGNnLXdlYjEudW5pdmVyc2Uu
-						bG9uLmFjLnVrMB0GA1UdDgQWBBT7n0r/QCgVlX57qNrTb+YZIY1IVzANBgkqhkiG
-						9w0BAQUFAAOCAQEArbtu3ISAd2Mx+c1X4xlHRxzc2dwVAQLlF+zLpu5/lK4hLc/+
-						A8unPMGchiAFx95lkmbVgOIIkixQHLyCs5dNa+Ml0iCAoHwBRPffCQuj5S9NBwt/
-						UqADrDkfc0+zmBJXNE89/ucvWYlryDVz5ogDlBfkUya9KNL/QFW2eh6U2ucnBhJA
-						uf1LxIE8rMHJ2q8owx+0AfzltZLjJfIUTu70QJngcQEXCDVasX5hc66c/w3RJHSe
-						w9qCuNdqoL5x0OgfmC+3xvT85uiiaAbdy+Cu53q8rrR17umI/XttfPua7Jt7d8Xx
-						Sr5dPjZqO2crIixHjMSNLD23Ao0e9R1fOzF9lw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://demo.careerstagged.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://demo.careerstagged.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Careers Tagged Demo Organization</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.thecareersgroup.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Sum</SurName>
-    <EmailAddress>mailto:andy.sum@careers.lon.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Sum</SurName>
-    <EmailAddress>mailto:andy.sum@careers.lon.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Philippe</GivenName>
-    <SurName>Donnette</SurName>
-    <EmailAddress>mailto:philippe.donnette@careers.lon.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.careers.lon.ac.uk-thecareersgroup-shibboleth.xml b/swamid-interfederations-2.0/www.careers.lon.ac.uk-thecareersgroup-shibboleth.xml
deleted file mode 100644
index 24e0be62..00000000
--- a/swamid-interfederations-2.0/www.careers.lon.ac.uk-thecareersgroup-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://www.careers.lon.ac.uk/thecareersgroup/shibboleth">
-  <!--
-		This is a "The Careers Group" Shibboleth SP for University of London.
-	-->
-  <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="2013-08-29T13:17:03Z">
-      <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://sso.thecareersgroup.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://sso.thecareersgroup.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDITCCAgmgAwIBAgIJAKcSnujgFBigMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
-						BAMTHnRjZy13ZWIwMS5jYXJlZXJzLmxvbmRvbi5hYy51azAeFw0xNDA0MjkxNTA3
-						NDFaFw0yNDA0MjYxNTA3NDFaMCkxJzAlBgNVBAMTHnRjZy13ZWIwMS5jYXJlZXJz
-						LmxvbmRvbi5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ0W
-						poEfm842a/7+ehVrbjNkY9Zs8jowF606BEqmvGUPnGRi2YPqbDNUlK/qz4/kS5xE
-						UagpIqjiL+ZJjMXZgqyUWphA8WcnfYTRavJuqbpn09BCj7fxB0QUP4MpMk1zMeVE
-						s2TuYpPUil/gNnQMBBC0vusBbclINRZ+53RA1uwTdz9gjyG8BxhJRn4pY25u41qu
-						WIFnEEZcr+mLTLN3eUEn3me+vf26HtkEBUPM+ULe2oie2tpLVvSUN3i4A30GBpcA
-						dYxlv8SC/o3oTzMvEYsdfAOi6x+3JOukveVXTF/Kgo1GLKMyiCa6C0S7sVUk07ml
-						I01jehQP4YgCc3cBNRECAwEAAaNMMEowKQYDVR0RBCIwIIIedGNnLXdlYjAxLmNh
-						cmVlcnMubG9uZG9uLmFjLnVrMB0GA1UdDgQWBBSp/LCOlFdBmbRsT+pO/N3DB2Qs
-						PjANBgkqhkiG9w0BAQUFAAOCAQEAjjzOjBN8kPmSVlNYudkkELYAz4goTXNgWK0q
-						QwbMAS37kFBS1SWUVz/IHpz6I14LmjPCg/1eyjVI/ePjXmT9pZ0TL7tPAn1iesdj
-						1aPnHblUul47Y1Fbpcg8wRXKZ2pIMe2Jt8H/UgsvvOi/9AA8xIzvrmJc1fiTjCG7
-						03KWg/hUdiKDV1QQV9s46WTyJhgyALIQ1zArJVFa8k+SPkTwIr7UsWFVAkmXDBMS
-						7FPP4F+X38NeJyGnV5h0I0IPJQ1yWnz19mkJgnaw1p/BrpnWt6j2R0bOoEGmFnIP
-						Byh3uXWX9AMHZ5q9YlCZ1VLYiECEI17sD5J0ufdOvQZeuSaIrw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sso.thecareersgroup.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.thecareersgroup.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of London</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Careers Group</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.thecareersgroup.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andy</GivenName>
-    <SurName>Sum</SurName>
-    <EmailAddress>mailto:andy.sum@careers.lon.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Sum</SurName>
-    <EmailAddress>mailto:andy.sum@careers.lon.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Philippe</GivenName>
-    <SurName>Donnette</SurName>
-    <EmailAddress>mailto:philippe.donnette@careers.lon.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.careers.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.careers.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 4d5d9b55..00000000
--- a/swamid-interfederations-2.0/www.careers.ox.ac.uk-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://www.careers.ox.ac.uk/shibboleth">
-  <!--
-		This is a "The Careers Service" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-28T11:49:56Z">
-      <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.careers.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIJAKLT36LHYvclMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGmNhcy13ZWJzZXJ2ZXIuY2FzLm94LmFjLnVrMB4XDTE0MTAyMzE1NTAyN1oX
-						DTI0MTAyMDE1NTAyN1owJTEjMCEGA1UEAxMaY2FzLXdlYnNlcnZlci5jYXMub3gu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDR6Q04iL3jR3oU
-						sySnZ5F9DDseuV33hBS8/meYFa6vxWg//bvdZSkPfrUvmCKuPOJOJR+c+hIcgE7n
-						j6SX2OikmV9ffX/Hf7rmmShhE7KsuRI+u7DVhuWAhth5SPsJ58HChIcgOVzaG/Y8
-						TBfcFOGwT9PsJfM21yKexx4r7F85ghg/bRxWzrYtt9V8iH/9GkhvTG52/3/H4r0E
-						djx5cjWGWHpAoOI4cpocD2fD+hrhVfddlQbnoIrJXYAr/mnOFsCe9EXWz3yHajiV
-						6BNiZ7YQ8bksb0Fs+04lOJJTA+bl6fU6jHu27lPoTuFjjSbjP5DmODYZcVReZtpV
-						BIxaVyEbAgMBAAGjXjBcMDsGA1UdEQQ0MDKCGmNhcy13ZWJzZXJ2ZXIuY2FzLm94
-						LmFjLnVrhhR3d3cuY2FyZWVycy5veC5hYy51azAdBgNVHQ4EFgQUOp4S1i97HslI
-						CAvETjdX3hklGtMwDQYJKoZIhvcNAQEFBQADggEBAAE3mAzXIYYSJn603hy8TDIx
-						sV9fKNzxTIHZZyTTRNeA2drgoqSJcu4uK1kZNblf2C/O9Y1ndi9hzDQ2hUYiP6lH
-						5ItyjgTs70MTtrTOjaD//oUzk3RH+7dYxLbky+WqBE3atuO6LU5wbUF7ro41G2ga
-						6KayOZG6xXWvvh5/1+tU6/GlM29DX+gxkitTzqsd0YXFzrHFJTUPSVqbeAx36vqY
-						4BDB+eW3lvRBh9PwS12hOhFKU2o0cyHylBLUNVCxVvyTt1QSib4B1zsAp6vYYfr8
-						VliUnZa2BBl0uf4sXtVfg1iRvgVWE584lqdBCYW8k8Y/7R0MsCc8A+73HqrsnV8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.careers.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - The Careers Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.careers.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@careers.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>IT Support</GivenName>
-    <EmailAddress>mailto:it-support@careers.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml b/swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml
deleted file mode 100644
index 6030ba70..00000000
--- a/swamid-interfederations-2.0/www.careknowledge.com-ukfed-oa-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.careknowledge.com/ukfed/oa/metadata">
-  <!--
-		This is a "CareKnowledge" OpenAthens SP for OLM Pavilion Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-04T12:52:01Z">
-      <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: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">CareKnowledge</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CareKnowledge helps you keep your social care knowledge and practice up to date.</mdui:Description>
-        <mdui:Logo height="110" width="275">https://www.careknowledge.com/App_Themes/ck/img/logo-full-colour.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDgjCCAmqgAwIBAgIJAOJNb5Ku1GAjMA0GCSqGSIb3DQEBBQUAMDQxFjAUBgNV
-						BAoTDU9MTSBHcm91cCBMdGQxGjAYBgNVBAMTEWNhcmVrbm93bGVkZ2UuY29tMB4X
-						DTE1MDkwMTA5MDEwMVoXDTI1MDgyOTA5MDEwMVowNDEWMBQGA1UEChMNT0xNIEdy
-						b3VwIEx0ZDEaMBgGA1UEAxMRY2FyZWtub3dsZWRnZS5jb20wggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQD7ev4zyQ7HMiCkbYWVpiSSA2Omj5CXbhLnad3L
-						HDbCkBwxYaCZXP7fpUf0hemOYyw7fNt1J/qs9kHCb8qafSv6rVcq+fPcDcYsjGQi
-						VuTvU+VTvp2URoTLCDrWB1Kwhz0Q2EmltOJcoUsmHAHSPUuozYsIyzjIUCi9lihk
-						IFpyqBu7dqmbeUcy33xCvme+pcbJLWhfvQow5T0rYiL0o9xkicsJu7pvo63QK5BP
-						uxcY0hiwPR/Out0D7d0wQZOhxSJsAHE97Z4VDG0aLmLYGmXeo/v1QJ4Yx//Di0R0
-						nRWIhLpjBHMxN2QxX4Y0FNTJjVqp/0mDplkUYLD2udVEdGPZAgMBAAGjgZYwgZMw
-						HQYDVR0OBBYEFB2NMoBoS8qF/fkjhMN4LwWNySZ3MGQGA1UdIwRdMFuAFB2NMoBo
-						S8qF/fkjhMN4LwWNySZ3oTikNjA0MRYwFAYDVQQKEw1PTE0gR3JvdXAgTHRkMRow
-						GAYDVQQDExFjYXJla25vd2xlZGdlLmNvbYIJAOJNb5Ku1GAjMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBAF7fI3GQsUNkl+owumSNj3v55CccAVxvcFDL
-						kdt+s7o1PUAz8hHl+66nUN+YkTX2d5bYm+A9y2BxOdPnmENdxakBlie6Hg/xcA/y
-						eZprTXMN4TZU2fdAt9LgVluYMOYv/4p6CjwC8R4HzBpSJYU81WaI+UK/9HF0NiOS
-						T6vyGj8/GEHzGU3g5jvAgBMNiLH9LfPZxa2nG6/Z7ZSTmsQg2ZKy2DsGDAMWqAK7
-						1E1VZ+aWVHjwYQwYYI0dMVXneNLgdgqnwZzKgdWA9XgfPAyHtn+9Nip1xdxMLgOh
-						14Vn2MYizmznFanAaXjq/VTYfu7b9KwW7Nl91socK3ZCSS4e04Q=
-					</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>
-						MIIDgjCCAmqgAwIBAgIJAOJNb5Ku1GAjMA0GCSqGSIb3DQEBBQUAMDQxFjAUBgNV
-						BAoTDU9MTSBHcm91cCBMdGQxGjAYBgNVBAMTEWNhcmVrbm93bGVkZ2UuY29tMB4X
-						DTE1MDkwMTA5MDEwMVoXDTI1MDgyOTA5MDEwMVowNDEWMBQGA1UEChMNT0xNIEdy
-						b3VwIEx0ZDEaMBgGA1UEAxMRY2FyZWtub3dsZWRnZS5jb20wggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQD7ev4zyQ7HMiCkbYWVpiSSA2Omj5CXbhLnad3L
-						HDbCkBwxYaCZXP7fpUf0hemOYyw7fNt1J/qs9kHCb8qafSv6rVcq+fPcDcYsjGQi
-						VuTvU+VTvp2URoTLCDrWB1Kwhz0Q2EmltOJcoUsmHAHSPUuozYsIyzjIUCi9lihk
-						IFpyqBu7dqmbeUcy33xCvme+pcbJLWhfvQow5T0rYiL0o9xkicsJu7pvo63QK5BP
-						uxcY0hiwPR/Out0D7d0wQZOhxSJsAHE97Z4VDG0aLmLYGmXeo/v1QJ4Yx//Di0R0
-						nRWIhLpjBHMxN2QxX4Y0FNTJjVqp/0mDplkUYLD2udVEdGPZAgMBAAGjgZYwgZMw
-						HQYDVR0OBBYEFB2NMoBoS8qF/fkjhMN4LwWNySZ3MGQGA1UdIwRdMFuAFB2NMoBo
-						S8qF/fkjhMN4LwWNySZ3oTikNjA0MRYwFAYDVQQKEw1PTE0gR3JvdXAgTHRkMRow
-						GAYDVQQDExFjYXJla25vd2xlZGdlLmNvbYIJAOJNb5Ku1GAjMAwGA1UdEwQFMAMB
-						Af8wDQYJKoZIhvcNAQEFBQADggEBAF7fI3GQsUNkl+owumSNj3v55CccAVxvcFDL
-						kdt+s7o1PUAz8hHl+66nUN+YkTX2d5bYm+A9y2BxOdPnmENdxakBlie6Hg/xcA/y
-						eZprTXMN4TZU2fdAt9LgVluYMOYv/4p6CjwC8R4HzBpSJYU81WaI+UK/9HF0NiOS
-						T6vyGj8/GEHzGU3g5jvAgBMNiLH9LfPZxa2nG6/Z7ZSTmsQg2ZKy2DsGDAMWqAK7
-						1E1VZ+aWVHjwYQwYYI0dMVXneNLgdgqnwZzKgdWA9XgfPAyHtn+9Nip1xdxMLgOh
-						14Vn2MYizmznFanAaXjq/VTYfu7b9KwW7Nl91socK3ZCSS4e04Q=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.careknowledge.com/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.careknowledge.com/ukfed/oa/auth/rcv/saml2/post" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OLM Pavilion Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Pavilion Publishing and Media Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.careknowledge.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tim</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:tim.smith@olmgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:tim.smith@olmgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cartoons.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.cartoons.ac.uk-shibboleth.xml
deleted file mode 100644
index 590057ec..00000000
--- a/swamid-interfederations-2.0/www.cartoons.ac.uk-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://www.cartoons.ac.uk/shibboleth">
-  <!--
-		This is a "British Cartoon Archive" Shibboleth SP for the University of Kent.
-	-->
-  <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-03-09T14:10:51Z">
-      <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.cartoons.ac.uk/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://www.cartoons.ac.uk/Shibboleth.sso/WAYF"/>
-      <init: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.cartoons.ac.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://www.cartoons.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIICzjCCAbagAwIBAgIBADANBgkqhkiG9w0BAQUFADAQMQ4wDAYDVQQDEwVjd3d3
-						MTAeFw0xMDAyMjMxNjExMzVaFw0yMDAyMjExNjExMzVaMBAxDjAMBgNVBAMTBWN3
-						d3cxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwMqCZUo+LIGMYOD5
-						RIfyspWlagIPIp81zGdqqM1rIEpM95QLHfssoJXY69P/Iojfdb/x8K3GJ+nWQNoe
-						CANW8N5JRnZl+jKYqUcFMFUgxKmuccO/2zSiu9M8ad+fOgtm6wWWJq9F9yefYAuT
-						RE+k9thXcilCIY681eBEuHdI1hjvldVXV+P61cdJp3L4WmjD2f7GR6TurFe1P94x
-						pFsTYGptvxWPTp6w8g/WEdGi+UAmqYoKdBRv1rNLuiYOoRnlhDp9+CvPrOdBTijI
-						GFqXlq/w0MaAIIJgZPgJTjFKrzN3rt/5dv3SDDfzhduoE5ox8WPZmNm21cIhCokF
-						jv/8kwIDAQABozMwMTAQBgNVHREECTAHggVjd3d3MTAdBgNVHQ4EFgQU7CyjvMqG
-						8d2QhxGXK+Xbt8Ppb2MwDQYJKoZIhvcNAQEFBQADggEBAAONU7dbP1sXpO9fIHn6
-						rYjQ1g5z8qoBHYGWnjJI6bnY687kxC6j4lGZ/aK2fhWSlXZet/Vazmhy8ZC2I8TI
-						sg+YUsVBdgnFGZQXZtD/4I/Fn2pjFRfathgbsIll1nKOcJJApxXKYXimNcRHPbpo
-						2IT6jesMavssckqXL+yrs+/Y93zD3LsKpv4JqCXlnd++WsQTrWiqfrlV2hUbeoj/
-						hQORVPgsCNo4frw2GhEgMf7x+2ExtEU2YOGoshYn2LgR8wSFVu4SqHOvUFXvpibY
-						ME7Ylv10JKK8LtZy3SD0t9MmDQewAgi5hIH4UbXYXx3mNGcidUnc42Due57YgYE2
-						DXY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.cartoons.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cartoons.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cartoons.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cartoons.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cartoons.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cartoons.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Kent</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Kent: British Cartoon Archive</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cartoons.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Bonnie</GivenName>
-    <SurName>Ferguson</SurName>
-    <EmailAddress>mailto:B.Ferguson@kent.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ccinform.co.uk-shibboleth.xml
deleted file mode 100644
index 40a46fb0..00000000
--- a/swamid-interfederations-2.0/www.ccinform.co.uk-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://www.ccinform.co.uk/shibboleth">
-  <!--
-		This is a "CC Inform" OpenAthens SP for Reed Business Information Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-22T14:54:28Z">
-      <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:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDZTCCAk2gAwIBAgIJAKKRPRBvWSX/MA0GCSqGSIb3DQEBBQUAMEkxKjAoBgNV
-						BAoMIVJlZWQgQnVzaW5lc3MgSW5mb3JtYXRpb24gTGltaXRlZDEbMBkGA1UEAwwS
-						d3d3LmNjaW5mb3JtLmNvLnVrMB4XDTEzMDkyNjEzNTY1N1oXDTIzMDkyNDEzNTY1
-						N1owSTEqMCgGA1UECgwhUmVlZCBCdXNpbmVzcyBJbmZvcm1hdGlvbiBMaW1pdGVk
-						MRswGQYDVQQDDBJ3d3cuY2NpbmZvcm0uY28udWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQCiSfdM8paAx3KGFEkvIiJmFArz//0sKDgaaXY3vZVd6Stp
-						9LZffRwcJvn6bk8uLYysQt8PZW6kOTiixg3bDCVZMEzt2bq4y8evv0ewOFD3Vjc9
-						wOSor5sP3TpY4F+qzbJrpEbl+iv2JPZ+SjUnpmAdc0VRi1ZnjaSqhfu/qZ75Cri6
-						k6HMxtWxn7vXD8blFpYca2QRplBQWPYuCFNzzzXgjiImJWCYMGsVt79rbg92OV4p
-						3TcCoPzZUzLrhrSjfO348jWYURQQ9xKq6kXeF28CJ9p2FU2y/gcdrihgwaphI9pf
-						AFcoTpW2DpUXY/IYePqbTX0WmStxScXvu2/iCbnjAgMBAAGjUDBOMB0GA1UdDgQW
-						BBRAUKgdenTd14XFc5yK+VGRJ8kdoTAfBgNVHSMEGDAWgBRAUKgdenTd14XFc5yK
-						+VGRJ8kdoTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCMyWIX9ktw
-						4r/H9lNuRYQupri7ms/5DxbzXqYQVXIMwFMSeoo1flg6QtBvNcP7sKSlnZMQ4GDP
-						lVuzhS689QFBfFQjTrAoa+R+I48ko9gGkiNf34aQ4pla6ACZ57TpkGgwQWDbGGVs
-						aPIvsdzLALl3jcqTX7IGDYodV7EJAX/lBkq+9WKVHcNQRzf8UhTC+K7KUDJKtA43
-						VEcVnYm5fLKRJbNk4QV62rEk7/fH1bmIVU9Sw3Uh+atVV0hO9pjM0nySYpp87QIA
-						bAQtPE/MMyP0ySM4FRsyJyHiFYJN+OzoU8iW4qt6AqmzV0YKqhkzo5AkH+5H0ysD
-						YZLwgoUJadub
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://id.ccinform.co.uk/ccinform/shibboleth/samlhandler" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://id.ccinform.co.uk/ccinform/shibboleth/samlhandler" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Reed Business Information Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CC Inform</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ccinform.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kim</GivenName>
-    <SurName>Poupart</SurName>
-    <EmailAddress>mailto:Kim.poupart@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Gale</SurName>
-    <EmailAddress>mailto:mark.gale@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Angie</GivenName>
-    <SurName>Wong</SurName>
-    <EmailAddress>mailto:Angie.Wong@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.childlink.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.childlink.co.uk-shibboleth.xml
deleted file mode 100644
index f5412a3f..00000000
--- a/swamid-interfederations-2.0/www.childlink.co.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://www.childlink.co.uk/shibboleth">
-  <!--
-		This is a "Childlink Information Service" Shibboleth SP for Childlink Ltd.
-	-->
-  <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="2008-08-01T16:19: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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Childlink Information Service</mdui:DisplayName>
-        <mdui:Logo height="60" width="80">https://www.childlink.co.uk/images/childlink_wayf_logo.gif</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.childlink.co.uk/Shibboleth.sso/WAYF/UKFederation"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/DCCAeQCCQCh6QBQgqGHfDANBgkqhkiG9w0BAQUFADBAMQswCQYDVQQGEwJH
-						QjETMBEGA1UEChMKQ2hpbGQgTGluazEcMBoGA1UEAxMTd3d3LmNoaWxkbGluay5j
-						by51azAeFw0xNDA0MTAxMDExMDlaFw0zNDA0MDUxMDExMDlaMEAxCzAJBgNVBAYT
-						AkdCMRMwEQYDVQQKEwpDaGlsZCBMaW5rMRwwGgYDVQQDExN3d3cuY2hpbGRsaW5r
-						LmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs4Z92m8/+i1t
-						2UfQc99uMI8HNlYLHtu5gR1TtvsOSQG+SBtQmB2NkpxyVL3XkasTRPT0knwWTxgu
-						TTLDuCVDeL9lr2t1DF9tCCXJWy1jCWxrcn3tUhwAV6ki4cIPmGrv+voKyAt4eY7m
-						wTYLD0QRQ8qYcIHd1m1kP7PEiHy3Tejd3ZoeWYRCiko0HDLGW9PTAZAniSQAWPRT
-						KhuiLHOOA1SRnk+EkoDAZzV9PcpzGayhIKDH3asqpi06asAbU1wfmZBL9Yxh+QHv
-						SK8l3ZI91SN78024wp5kTeIaulsY84XgQyFgxXtRaAehGko/sfMS09yBBDHHS/fl
-						5z0lm/QOZwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBLvSfOj2ehKrEGA+lzNXwx
-						S9gc8jORwmN8Q1jBqdO3URMbmY8d9kgX+qYoNHKuDv3dhMQzqmcbPnH8lVpd8JSr
-						C77QYlULzeRgLQm7CVxnafMTUFyLjNrH5OGj+FixSjAaajxPjO2dV2D7d4sglvRG
-						KBupx5dqhqaAaMS01tXMRcHWylHkg1/UWxhunnVDs8vAzKhGOF1SvdRG8jB3zuJa
-						nKVEi4fGw65i9apDSYscpk2Kvyeu89/UGTq1N3UZdZqkIMgr/Y9TZL5w+n4kl1aN
-						T58weS7Nep9P2UuLPrDhrbAGb0fT0LHFBkeMy2Z8/5JH5HRqCt60B9Z0Xtz7/Fyh
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.childlink.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.childlink.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.childlink.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.childlink.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.childlink.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.childlink.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.childlink.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.childlink.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.childlink.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Childlink Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Childlink Information Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.childlink.co.uk/about_us.php</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adam</GivenName>
-    <SurName>McCune</SurName>
-    <EmailAddress>mailto:adammccune@gmail.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>McCune</SurName>
-    <EmailAddress>mailto:adammccune@gmail.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml b/swamid-interfederations-2.0/www.chinaclubhq.com-entity.xml
deleted file mode 100644
index 738d5f47..00000000
--- a/swamid-interfederations-2.0/www.chinaclubhq.com-entity.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://www.chinaclubhq.com/entity">
-  <!--
-		This is a Joomla idemauth 1.5.4 (based on SimpleSAMLPHP) SP for World Club HQ Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSDCCAjACCQDTBID4Eqw+IzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
-						QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxFDASBgNVBAoT
-						C0NoaW5hQ2x1YkhRMRwwGgYDVQQDExN3d3cuY2hpbmFjbHViaHEuY29tMB4XDTEw
-						MDQyMjE5MTUzNloXDTIwMDQxOTE5MTUzNlowZjELMAkGA1UEBhMCR0IxETAPBgNV
-						BAgTCFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MRQwEgYDVQQKEwtDaGluYUNs
-						dWJIUTEcMBoGA1UEAxMTd3d3LmNoaW5hY2x1YmhxLmNvbTCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBANdpg+XIGnOtjrFhtXN/rird61Wa27r+U248wWyU
-						Ug/2Ky8Lr72eC0L20ORbwcsRVsXRaac1cQCV+lr8o8PM8sHhMv9Q7KCbn2HsHMwd
-						gdk+BjmH5ZyYEAZxgjEgqfpMpVdEVzlxzntwlLjyqziXFhFXxBirtFHgsi6Kto3c
-						/SwS56jT3Yt01kqwiLi+jaXlAJ+2zHsWc/HG0jWR8eRXcGvGtvPpNCHHA5Yv93wH
-						OyIG6vd9uJaL1dk6cWzWQrV4JhB6qorWzY01NboRaafTQFnh1LbWkoJN9zQWQJA+
-						0H4iOs/lwEaktc1x9VGlEgV94gZ0cty0OGUB1CjXEO8FWYECAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEAiKNnZFMygZp36olHU6mebTi2CTFXSNR2RsnvLYjwM0JxxS7o
-						z2/fAq19V7BNrDHuJ26neeJ7Js8Pjl7dDPqBPaTlW1lph/QlLk7jbnmt+cPXHTk5
-						0Mh9F2YvufWb3DQs4ZvWOPWzW2kZ5AOYLxD37gwlnFjpyRLBMPqVxoDlXJ0GWuPI
-						O2bM3y5fBwbYlK6St9lwVBhTIzbfnnXitpg9Qmimlmj+jTsjqbzBk9n15zteIxz7
-						pg8iwBXfG3LGb7WrogiKUlwhhLC3VxvgJoot65ZmSL7xmxPC+Av9zCA5NxmiYvaW
-						Bwu7XKdd6JJuG9RviWxFRAH/3lllp8XqjrcTqg==
-					</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>
-						MIIDSDCCAjACCQDTBID4Eqw+IzANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJH
-						QjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxFDASBgNVBAoT
-						C0NoaW5hQ2x1YkhRMRwwGgYDVQQDExN3d3cuY2hpbmFjbHViaHEuY29tMB4XDTEw
-						MDQyMjE5MTUzNloXDTIwMDQxOTE5MTUzNlowZjELMAkGA1UEBhMCR0IxETAPBgNV
-						BAgTCFNjb3RsYW5kMRAwDgYDVQQHEwdHbGFzZ293MRQwEgYDVQQKEwtDaGluYUNs
-						dWJIUTEcMBoGA1UEAxMTd3d3LmNoaW5hY2x1YmhxLmNvbTCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBANdpg+XIGnOtjrFhtXN/rird61Wa27r+U248wWyU
-						Ug/2Ky8Lr72eC0L20ORbwcsRVsXRaac1cQCV+lr8o8PM8sHhMv9Q7KCbn2HsHMwd
-						gdk+BjmH5ZyYEAZxgjEgqfpMpVdEVzlxzntwlLjyqziXFhFXxBirtFHgsi6Kto3c
-						/SwS56jT3Yt01kqwiLi+jaXlAJ+2zHsWc/HG0jWR8eRXcGvGtvPpNCHHA5Yv93wH
-						OyIG6vd9uJaL1dk6cWzWQrV4JhB6qorWzY01NboRaafTQFnh1LbWkoJN9zQWQJA+
-						0H4iOs/lwEaktc1x9VGlEgV94gZ0cty0OGUB1CjXEO8FWYECAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEAiKNnZFMygZp36olHU6mebTi2CTFXSNR2RsnvLYjwM0JxxS7o
-						z2/fAq19V7BNrDHuJ26neeJ7Js8Pjl7dDPqBPaTlW1lph/QlLk7jbnmt+cPXHTk5
-						0Mh9F2YvufWb3DQs4ZvWOPWzW2kZ5AOYLxD37gwlnFjpyRLBMPqVxoDlXJ0GWuPI
-						O2bM3y5fBwbYlK6St9lwVBhTIzbfnnXitpg9Qmimlmj+jTsjqbzBk9n15zteIxz7
-						pg8iwBXfG3LGb7WrogiKUlwhhLC3VxvgJoot65ZmSL7xmxPC+Av9zCA5NxmiYvaW
-						Bwu7XKdd6JJuG9RviWxFRAH/3lllp8XqjrcTqg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.chinaclubhq.com/joomla/components/com_idemauth/simplesamlphp/www/saml2/sp/SingleLogoutService.php"/>
-    <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.chinaclubhq.com/joomla/components/com_idemauth/simplesamlphp/www/saml2/sp/AssertionConsumerService.php" index="0"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">World Club HQ Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">World Club HQ</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ukclubhq.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Colin</GivenName>
-    <SurName>Maclean</SurName>
-    <EmailAddress>mailto:colin@chinaclubhq.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Colin</GivenName>
-    <SurName>Maclean</SurName>
-    <EmailAddress>mailto:colin@chinaclubhq.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml b/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
index cbc9b319..3eabeaba 100644
--- a/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.clarin-pl.eu-shibboleth.xml
@@ -1,89 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://www.clarin-pl.eu/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-06-15T16:33: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://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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://www.clarin-pl.eu/shibboleth">
+  <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://clarin-pl.eu/shibboleth/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">CLARIN-PL Repository</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CLARIN-PL repository</mdui:DisplayName>
-        <mdui:Description xml:lang="de">CLARIN-PL digitales Langzeitarchiv - Polnische Sektion des CLARIN ERIC</mdui:Description>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">CLARIN-PL Repository</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">CLARIN-PL arkisto</mdui:DisplayName>
         <mdui:Description xml:lang="en">CLARIN-PL digital repository - Polish section of CLARIN ERIC</mdui:Description>
-        <mdui:Logo height="32" width="32">https://clarin-pl.eu/dspace/themes/ClarinPlHomeTheme/images/favicon.ico</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">http://clarin-pl.eu/en/</mdui:InformationURL>
+        <mdui:Description xml:lang="fi">CLARIN-PL digitaalinen arkisto - Polish osa CLARIN ERIC</mdui:Description>
+        <mdui:Keywords xml:lang="en">CLARIN-PL language+resources corpus linguistics repository</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://clarin-pl.eu/en/privacy-policy/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://clarin-pl.eu/en/privacy-policy/</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.clarin-pl.eu</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=www.clarin-pl.eu</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAJY4k9BoCNIOMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-BAMTEHd3dy5jbGFyaW4tcGwuZXUwHhcNMTQwMTA5MTA0ODE2WhcNMTcwMTA4MTA0
-ODE2WjAbMRkwFwYDVQQDExB3d3cuY2xhcmluLXBsLmV1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAvBHhZZZVue2D/m6KEnfbL/wufElA6XgLs0SqfGMh
-VILjElWD80BG7KElkqQxrwEBf09i+z9nBbZARvVi9JnonuCa6+rHIz3e6/IoXKrA
-jRlUJcUJp0FKLYmG+WlTWUNO+y2OtSWWMSe7ZeHnxDkRYXwY3lLXniOClXhdplso
-vVc3u2BjUXPH0zCVn7ajU7IczsemoA6iy2JFKHACC4OTDxFGUPEUK0mRjyd8Ovyx
-Kh3QdkPrUpHZ/6aBnmiztYV1wa3mZTtk3TOrxdA+/+x4UodG6K/WSo3TIs5h9s/4
-c9IZyfi/8q9V3EODO8IBTCM+zDZ8fm7g1VJ9CYFEs8et/QIDAQABo2MwYTBABgNV
-HREEOTA3ghB3d3cuY2xhcmluLXBsLmV1hiNodHRwczovL3d3dy5jbGFyaW4tcGwu
-ZXUvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUx34UwYpPZgJBTVqSl3Xfn/d+XrEwDQYJ
-KoZIhvcNAQEFBQADggEBAFwYzUrC7K9CpxBpnD6WjqyKiMoSR+vnoZZq3+ZUiG/O
-uwiTwcErddkQLonV9L2eSuY6NQn+aFebaozIS/Zj5yXjwDo8fGEKSk4tSVUc4H+f
-RML3XnJ25XmaSi2myy5PIh97o/NZAil8/1ArHV4PGNzMic1UNzmZymzB6AdmOrVn
-W3DPk2honcInege0lU7RLULmgdtMVl/QCbEWDrJ8oq0bxYwoFrVCnZXFM7SHqEba
-W7A4zk79hxNAxNoqlUSnX0Tk2fQQXdSTjLXEF9WLUwfW86QlQdLLkaY9hco+w8NM
-SvKPZd5tNDWO1hE00kzKJDPhhJZs1wFS7Tf3SJ1M1D8=
-</ds:X509Certificate>
+          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIJAJY4k9BoCNIOMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgN
+VBAMTEHd3dy5jbGFyaW4tcGwuZXUwHhcNMTQwMTA5MTA0ODE2WhcNMTcwMTA4MT
+A0ODE2WjAbMRkwFwYDVQQDExB3d3cuY2xhcmluLXBsLmV1MIIBIjANBgkqhkiG9
+w0BAQEFAAOCAQ8AMIIBCgKCAQEAvBHhZZZVue2D/m6KEnfbL/wufElA6XgLs0Sq
+fGMhVILjElWD80BG7KElkqQxrwEBf09i+z9nBbZARvVi9JnonuCa6+rHIz3e6/I
+oXKrAjRlUJcUJp0FKLYmG+WlTWUNO+y2OtSWWMSe7ZeHnxDkRYXwY3lLXniOClX
+hdplsovVc3u2BjUXPH0zCVn7ajU7IczsemoA6iy2JFKHACC4OTDxFGUPEUK0mRj
+yd8OvyxKh3QdkPrUpHZ/6aBnmiztYV1wa3mZTtk3TOrxdA+/+x4UodG6K/WSo3T
+Is5h9s/4c9IZyfi/8q9V3EODO8IBTCM+zDZ8fm7g1VJ9CYFEs8et/QIDAQABo2M
+wYTBABgNVHREEOTA3ghB3d3cuY2xhcmluLXBsLmV1hiNodHRwczovL3d3dy5jbG
+FyaW4tcGwuZXUvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUx34UwYpPZgJBTVqSl3Xfn
+/d+XrEwDQYJKoZIhvcNAQEFBQADggEBAFwYzUrC7K9CpxBpnD6WjqyKiMoSR+vn
+oZZq3+ZUiG/OuwiTwcErddkQLonV9L2eSuY6NQn+aFebaozIS/Zj5yXjwDo8fGE
+KSk4tSVUc4H+fRML3XnJ25XmaSi2myy5PIh97o/NZAil8/1ArHV4PGNzMic1UNz
+mZymzB6AdmOrVnW3DPk2honcInege0lU7RLULmgdtMVl/QCbEWDrJ8oq0bxYwoF
+rVCnZXFM7SHqEbaW7A4zk79hxNAxNoqlUSnX0Tk2fQQXdSTjLXEF9WLUwfW86Ql
+QdLLkaY9hco+w8NMSvKPZd5tNDWO1hE00kzKJDPhhJZs1wFS7Tf3SJ1M1D8=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SLO/Artifact"/>
-    <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://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">CLARIN-PL Repository</md:ServiceName>
-      <md:ServiceName xml:lang="en">CLARIN-PL repository</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">CLARIN-PL digitales Langzeitarchiv - Polnische Sektion des CLARIN ERIC</md:ServiceDescription>
+    <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://clarin-pl.eu/shibboleth/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">CLARIN-PL arkisto</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARIN-PL Repository</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">CLARIN-PL digitaalinen arkisto - Polish osa CLARIN ERIC</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">CLARIN-PL digital repository - Polish section of CLARIN ERIC</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="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: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: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: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.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: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.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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>Marcin</md:GivenName>
@@ -95,9 +78,4 @@ SvKPZd5tNDWO1hE00kzKJDPhhJZs1wFS7Tf3SJ1M1D8=
     <md:SurName>Pol</md:SurName>
     <md:EmailAddress>mailto:dspace@clarin-pl.eu</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Marcin</md:GivenName>
-    <md:SurName>Pol</md:SurName>
-    <md:EmailAddress>mailto:dspace@clarin-pl.eu</md:EmailAddress>
-  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.classiques-garnier.com.xml b/swamid-interfederations-2.0/www.classiques-garnier.com.xml
deleted file mode 100644
index 2b59c8ad..00000000
--- a/swamid-interfederations-2.0/www.classiques-garnier.com.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.classiques-garnier.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.classiques-garnier.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.classiques-garnier.com,O=Classiques Garnier,OU=IT,L=Paris,ST=Ile de france,C=FR</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFWzCCBEOgAwIBAgISESEko+D0ngEzpFmIWn1HeSK3MA0GCSqGSIb3DQEBBQUA
-MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYD
-VQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzIw
-HhcNMTIwMTAzMTY0MDAwWhcNMTQwNzI3MTM1MjM3WjCBhDELMAkGA1UEBhMCRlIx
-FjAUBgNVBAgTDUlsZSBkZSBmcmFuY2UxDjAMBgNVBAcTBVBhcmlzMQswCQYDVQQL
-EwJJVDEbMBkGA1UEChMSQ2xhc3NpcXVlcyBHYXJuaWVyMSMwIQYDVQQDExp3d3cu
-Y2xhc3NpcXVlcy1nYXJuaWVyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAL8nP9d6RChOzUaiDbYkFQAoV8Qz8cn11CiYwNBz/+SOQjrvQz2toPH8
-AblzFYG5YRA8krcqYS09yZ5ftk43PYwFu/RwFbv3AwmfOI+KfqAgSQBj2Qk3j37Z
-EYoS7n2qhcMUrbHOKkUFOTH8HB+Gn2jEnEmkNHAJr/TjHtA/Nx2nc5C9e3UX0Arh
-5f3pbyE9xhbyXjoF15sdIWepoZHD0IZkNdVDNOfMJ6CEPfIVPcjmEeFi37eMd7Gd
-LFMMwT6CxCL9EybL+cuVXHob7XTSLlqAg1ZN3cc3QhRtJ0iqbzJkGMLaL+iRJX6b
-m3RRDtP8z4kPrmv/KvuVQyPousdWzIUCAwEAAaOCAeswggHnMA4GA1UdDwEB/wQE
-AwIFoDBMBgNVHSAERTBDMEEGCSsGAQQBoDIBFDA0MDIGCCsGAQUFBwIBFiZodHRw
-czovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzA9BgNVHREENjA0ghp3
-d3cuY2xhc3NpcXVlcy1nYXJuaWVyLmNvbYIWY2xhc3NpcXVlcy1nYXJuaWVyLmNv
-bTAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBFBgNV
-HR8EPjA8MDqgOKA2hjRodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzL2dzb3Jn
-YW5pemF0aW9udmFsZzIuY3JsMIGWBggrBgEFBQcBAQSBiTCBhjBHBggrBgEFBQcw
-AoY7aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nvcmdhbml6
-YXRpb252YWxnMi5jcnQwOwYIKwYBBQUHMAGGL2h0dHA6Ly9vY3NwMi5nbG9iYWxz
-aWduLmNvbS9nc29yZ2FuaXphdGlvbnZhbGcyMB0GA1UdDgQWBBQUAStvDufpti4t
-GxHlzG/rcv/EizAfBgNVHSMEGDAWgBRdRrKNxEt0HLvt9XO2Orc4j3WefjANBgkq
-hkiG9w0BAQUFAAOCAQEAvGqSTnpjheb/PWcaKD+QFn3b5Ed8qy53W10ZSrTPMylV
-/O5/jGSvLFFuw9rwNNlwZZAiZPuZe4zheMcZtKRT3K36kVUAMV/zJx1YJ2tyd2Lo
-GmuZSTxuCeeJ5K0uq8ekeXEoU+Zd5skrI3s/h0mGQzbhuFLAbDmVxZvjwvuXLjbR
-eJsog0AxuM6xIQT1fMPDHxslWN8j+Jhw1X0+xAcy/eqj+MpM8mK08IxFkyKvk0QV
-Il6dRAuy5qQxwAakFFyO+jKiyO9w7zAV0SAS6rYFz1IK+LE9515yQEo781I5hS4n
-GdssbIFwPbe/Qlc1dIpA0NqVVqwu3RMA3k/PMQ9u1Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.classiques-garnier.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.classiques-garnier.com,O=Classiques Garnier,OU=IT,L=Paris,ST=Ile de france,C=FR</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFWzCCBEOgAwIBAgISESEko+D0ngEzpFmIWn1HeSK3MA0GCSqGSIb3DQEBBQUA
-MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYD
-VQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzIw
-HhcNMTIwMTAzMTY0MDAwWhcNMTQwNzI3MTM1MjM3WjCBhDELMAkGA1UEBhMCRlIx
-FjAUBgNVBAgTDUlsZSBkZSBmcmFuY2UxDjAMBgNVBAcTBVBhcmlzMQswCQYDVQQL
-EwJJVDEbMBkGA1UEChMSQ2xhc3NpcXVlcyBHYXJuaWVyMSMwIQYDVQQDExp3d3cu
-Y2xhc3NpcXVlcy1nYXJuaWVyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAL8nP9d6RChOzUaiDbYkFQAoV8Qz8cn11CiYwNBz/+SOQjrvQz2toPH8
-AblzFYG5YRA8krcqYS09yZ5ftk43PYwFu/RwFbv3AwmfOI+KfqAgSQBj2Qk3j37Z
-EYoS7n2qhcMUrbHOKkUFOTH8HB+Gn2jEnEmkNHAJr/TjHtA/Nx2nc5C9e3UX0Arh
-5f3pbyE9xhbyXjoF15sdIWepoZHD0IZkNdVDNOfMJ6CEPfIVPcjmEeFi37eMd7Gd
-LFMMwT6CxCL9EybL+cuVXHob7XTSLlqAg1ZN3cc3QhRtJ0iqbzJkGMLaL+iRJX6b
-m3RRDtP8z4kPrmv/KvuVQyPousdWzIUCAwEAAaOCAeswggHnMA4GA1UdDwEB/wQE
-AwIFoDBMBgNVHSAERTBDMEEGCSsGAQQBoDIBFDA0MDIGCCsGAQUFBwIBFiZodHRw
-czovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzA9BgNVHREENjA0ghp3
-d3cuY2xhc3NpcXVlcy1nYXJuaWVyLmNvbYIWY2xhc3NpcXVlcy1nYXJuaWVyLmNv
-bTAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBFBgNV
-HR8EPjA8MDqgOKA2hjRodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzL2dzb3Jn
-YW5pemF0aW9udmFsZzIuY3JsMIGWBggrBgEFBQcBAQSBiTCBhjBHBggrBgEFBQcw
-AoY7aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nvcmdhbml6
-YXRpb252YWxnMi5jcnQwOwYIKwYBBQUHMAGGL2h0dHA6Ly9vY3NwMi5nbG9iYWxz
-aWduLmNvbS9nc29yZ2FuaXphdGlvbnZhbGcyMB0GA1UdDgQWBBQUAStvDufpti4t
-GxHlzG/rcv/EizAfBgNVHSMEGDAWgBRdRrKNxEt0HLvt9XO2Orc4j3WefjANBgkq
-hkiG9w0BAQUFAAOCAQEAvGqSTnpjheb/PWcaKD+QFn3b5Ed8qy53W10ZSrTPMylV
-/O5/jGSvLFFuw9rwNNlwZZAiZPuZe4zheMcZtKRT3K36kVUAMV/zJx1YJ2tyd2Lo
-GmuZSTxuCeeJ5K0uq8ekeXEoU+Zd5skrI3s/h0mGQzbhuFLAbDmVxZvjwvuXLjbR
-eJsog0AxuM6xIQT1fMPDHxslWN8j+Jhw1X0+xAcy/eqj+MpM8mK08IxFkyKvk0QV
-Il6dRAuy5qQxwAakFFyO+jKiyO9w7zAV0SAS6rYFz1IK+LE9515yQEo781I5hS4n
-GdssbIFwPbe/Qlc1dIpA0NqVVqwu3RMA3k/PMQ9u1Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.classiques-garnier.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.classiques-garnier.com,O=Classiques Garnier,OU=IT,L=Paris,ST=Ile de france,C=FR</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFWzCCBEOgAwIBAgISESEko+D0ngEzpFmIWn1HeSK3MA0GCSqGSIb3DQEBBQUA
-MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYD
-VQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzIw
-HhcNMTIwMTAzMTY0MDAwWhcNMTQwNzI3MTM1MjM3WjCBhDELMAkGA1UEBhMCRlIx
-FjAUBgNVBAgTDUlsZSBkZSBmcmFuY2UxDjAMBgNVBAcTBVBhcmlzMQswCQYDVQQL
-EwJJVDEbMBkGA1UEChMSQ2xhc3NpcXVlcyBHYXJuaWVyMSMwIQYDVQQDExp3d3cu
-Y2xhc3NpcXVlcy1nYXJuaWVyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAL8nP9d6RChOzUaiDbYkFQAoV8Qz8cn11CiYwNBz/+SOQjrvQz2toPH8
-AblzFYG5YRA8krcqYS09yZ5ftk43PYwFu/RwFbv3AwmfOI+KfqAgSQBj2Qk3j37Z
-EYoS7n2qhcMUrbHOKkUFOTH8HB+Gn2jEnEmkNHAJr/TjHtA/Nx2nc5C9e3UX0Arh
-5f3pbyE9xhbyXjoF15sdIWepoZHD0IZkNdVDNOfMJ6CEPfIVPcjmEeFi37eMd7Gd
-LFMMwT6CxCL9EybL+cuVXHob7XTSLlqAg1ZN3cc3QhRtJ0iqbzJkGMLaL+iRJX6b
-m3RRDtP8z4kPrmv/KvuVQyPousdWzIUCAwEAAaOCAeswggHnMA4GA1UdDwEB/wQE
-AwIFoDBMBgNVHSAERTBDMEEGCSsGAQQBoDIBFDA0MDIGCCsGAQUFBwIBFiZodHRw
-czovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzA9BgNVHREENjA0ghp3
-d3cuY2xhc3NpcXVlcy1nYXJuaWVyLmNvbYIWY2xhc3NpcXVlcy1nYXJuaWVyLmNv
-bTAJBgNVHRMEAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBFBgNV
-HR8EPjA8MDqgOKA2hjRodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL2dzL2dzb3Jn
-YW5pemF0aW9udmFsZzIuY3JsMIGWBggrBgEFBQcBAQSBiTCBhjBHBggrBgEFBQcw
-AoY7aHR0cDovL3NlY3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Nvcmdhbml6
-YXRpb252YWxnMi5jcnQwOwYIKwYBBQUHMAGGL2h0dHA6Ly9vY3NwMi5nbG9iYWxz
-aWduLmNvbS9nc29yZ2FuaXphdGlvbnZhbGcyMB0GA1UdDgQWBBQUAStvDufpti4t
-GxHlzG/rcv/EizAfBgNVHSMEGDAWgBRdRrKNxEt0HLvt9XO2Orc4j3WefjANBgkq
-hkiG9w0BAQUFAAOCAQEAvGqSTnpjheb/PWcaKD+QFn3b5Ed8qy53W10ZSrTPMylV
-/O5/jGSvLFFuw9rwNNlwZZAiZPuZe4zheMcZtKRT3K36kVUAMV/zJx1YJ2tyd2Lo
-GmuZSTxuCeeJ5K0uq8ekeXEoU+Zd5skrI3s/h0mGQzbhuFLAbDmVxZvjwvuXLjbR
-eJsog0AxuM6xIQT1fMPDHxslWN8j+Jhw1X0+xAcy/eqj+MpM8mK08IxFkyKvk0QV
-Il6dRAuy5qQxwAakFFyO+jKiyO9w7zAV0SAS6rYFz1IK+LE9515yQEo781I5hS4n
-GdssbIFwPbe/Qlc1dIpA0NqVVqwu3RMA3k/PMQ9u1Q==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.classiques-garnier.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.classiques-garnier.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.classiques-garnier.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.classiques-garnier.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.classiques-garnier.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.classiques-garnier.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.classiques-garnier.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.classiques-garnier.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.classiques-garnier.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.classiques-garnier.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.classiques-garnier.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.classiques-garnier.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.classiques-garnier.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.classiques-garnier.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Classiques Garnier</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Classiques Garnier SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.classiques-garnier.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Didier</GivenName>
-    <SurName>Corbiere</SurName>
-    <EmailAddress>didiercorbiere@classiques-garnier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Claude</GivenName>
-    <SurName>Blum</SurName>
-    <EmailAddress>cblum@wanadoo.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.climatescience.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index ea6ba9db..00000000
--- a/swamid-interfederations-2.0/www.climatescience.cam.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://www.climatescience.cam.ac.uk/shibboleth">
-  <!--
-		This is a "Cambridge Centre for Climate Science" Shibboleth SP for the University of Cambridge.
-	-->
-  <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="2015-03-05T15:47:46Z">
-      <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.climatescience.cam.ac.uk/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://www.climatescience.cam.ac.uk/Shibboleth.sso/WAYF"/>
-      <init: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.climatescience.cam.ac.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://www.climatescience.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
-						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
-						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
-						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
-						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
-						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
-						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
-						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
-						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
-						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
-						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
-						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
-						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
-						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
-						RsenNm/aXp0wIU+jHVmi/GAPCQ==
-					</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.climatescience.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.climatescience.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cambridge Centre for Climate Science</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.climatescience.cam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml b/swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.xml
deleted file mode 100644
index 644e307e..00000000
--- a/swamid-interfederations-2.0/www.clinicalskills.net-oa-metadata.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://www.clinicalskills.net/oa/metadata">
-  <!--
-		This is an OpenAthens SP for Clinical Skills Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-20T11:29:56Z">
-      <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Clinical Skills Ltd</mdui:DisplayName>
-        <mdui:Description xml:lang="en">User-friendly illustrated clinical skills guidelines to help you develop and check your practice.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDRzCCAi+gAwIBAgIJAM+hz84YeRWBMA0GCSqGSIb3DQEBCwUAMDoxFzAVBgNV
-						BAoMDkNsaW5pY2Fsc2tpbGxzMR8wHQYDVQQDDBZ3d3cuY2xpbmljYWxza2lsbHMu
-						bmV0MB4XDTE2MDExMTE0MzMyOFoXDTI2MDEwODE0MzMyOFowOjEXMBUGA1UECgwO
-						Q2xpbmljYWxza2lsbHMxHzAdBgNVBAMMFnd3dy5jbGluaWNhbHNraWxscy5uZXQw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxiuPTgMPYEbLdjHByQEWz
-						iTuNOciwnBCZzTM/onN4VoqaLzHXukQ9YNpyctJs9+eIZGjBmLQctlOAg4W1Mart
-						x9wSxXy9V+G/sEr0ioiBJ1YNTO2h4s1fIz2PsFEGjckWKp+WBeDQ2cEnTq29y3GI
-						LaY0lMQqnae8QcvmpbT7XuzWQLCtJS0c0o3ASamUCuD9MJI6KIgu9kXTSXlFCnkN
-						hWHCDZ1KSW66Woz+dBfye/JN2WjXZW3cX+X/Y6RfVWWcSlYRPJ/NooDQ4s6jDIdU
-						Q5fIRUnKkjw3vPKZRBS4yvL6XeY7C/eiMoqdfqs3rXfSVCsXTwA6Osf4XNCc/SHD
-						AgMBAAGjUDBOMB0GA1UdDgQWBBSW0zmEvjC9x+0pTY0kH16MH6WcjTAfBgNVHSME
-						GDAWgBSW0zmEvjC9x+0pTY0kH16MH6WcjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-						DQEBCwUAA4IBAQAbs8CZfuR5R0+lcxyjCeQw5hlqbur6qOgkEwAY5DbX2LKhFT/0
-						qA1yJR1zp7rnQ1fiA8K259vg7d3KeAUc8vsrja5bi4f4lYig5cYk2K5DmwrcsOU0
-						tLk5jobN1ROS+ICqqMU59Ps1ln/SmNjUDFvVta/Wc/ug74p/Pil0ap2PnNvQVCI+
-						OjGWZF45HnavVQP2LJ7lQfgn8ZviY5PBk5D633HnSSoK6Kn1Kf/8mB5+GMAO+riT
-						U6Jqa7X31ZZ3m7iPPtDXuB9rtcT56A0jGpn9kVOfCEYi0BnhKLSC7GFroMFaFvbT
-						aTbHhoBxeTbNVT1uBHURnKCtOdNyJJe/fDe6
-					</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+gAwIBAgIJAM+hz84YeRWBMA0GCSqGSIb3DQEBCwUAMDoxFzAVBgNV
-						BAoMDkNsaW5pY2Fsc2tpbGxzMR8wHQYDVQQDDBZ3d3cuY2xpbmljYWxza2lsbHMu
-						bmV0MB4XDTE2MDExMTE0MzMyOFoXDTI2MDEwODE0MzMyOFowOjEXMBUGA1UECgwO
-						Q2xpbmljYWxza2lsbHMxHzAdBgNVBAMMFnd3dy5jbGluaWNhbHNraWxscy5uZXQw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxiuPTgMPYEbLdjHByQEWz
-						iTuNOciwnBCZzTM/onN4VoqaLzHXukQ9YNpyctJs9+eIZGjBmLQctlOAg4W1Mart
-						x9wSxXy9V+G/sEr0ioiBJ1YNTO2h4s1fIz2PsFEGjckWKp+WBeDQ2cEnTq29y3GI
-						LaY0lMQqnae8QcvmpbT7XuzWQLCtJS0c0o3ASamUCuD9MJI6KIgu9kXTSXlFCnkN
-						hWHCDZ1KSW66Woz+dBfye/JN2WjXZW3cX+X/Y6RfVWWcSlYRPJ/NooDQ4s6jDIdU
-						Q5fIRUnKkjw3vPKZRBS4yvL6XeY7C/eiMoqdfqs3rXfSVCsXTwA6Osf4XNCc/SHD
-						AgMBAAGjUDBOMB0GA1UdDgQWBBSW0zmEvjC9x+0pTY0kH16MH6WcjTAfBgNVHSME
-						GDAWgBSW0zmEvjC9x+0pTY0kH16MH6WcjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-						DQEBCwUAA4IBAQAbs8CZfuR5R0+lcxyjCeQw5hlqbur6qOgkEwAY5DbX2LKhFT/0
-						qA1yJR1zp7rnQ1fiA8K259vg7d3KeAUc8vsrja5bi4f4lYig5cYk2K5DmwrcsOU0
-						tLk5jobN1ROS+ICqqMU59Ps1ln/SmNjUDFvVta/Wc/ug74p/Pil0ap2PnNvQVCI+
-						OjGWZF45HnavVQP2LJ7lQfgn8ZviY5PBk5D633HnSSoK6Kn1Kf/8mB5+GMAO+riT
-						U6Jqa7X31ZZ3m7iPPtDXuB9rtcT56A0jGpn9kVOfCEYi0BnhKLSC7GFroMFaFvbT
-						aTbHhoBxeTbNVT1uBHURnKCtOdNyJJe/fDe6
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.clinicalskills.net/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.clinicalskills.net/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.clinicalskills.net/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.clinicalskills.net/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Clinical Skills Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Clinical Skills Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.clinicalskills.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sharon</GivenName>
-    <SurName>Kingman</SurName>
-    <EmailAddress>mailto:sharonkingman@clinicalskills.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Allington</SurName>
-    <EmailAddress>mailto:paul@intelligentpenguin.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cnn.group.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.cnn.group.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index 20a75270..00000000
--- a/swamid-interfederations-2.0/www.cnn.group.cam.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://www.cnn.group.cam.ac.uk/shibboleth">
-  <!--
-		This is a "Cambridge Networks Network" Shibboleth SP for the University of Cambridge.
-	-->
-  <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="2011-11-16T17:50: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>
-      <init: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.cnn.group.cam.ac.uk/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://www.cnn.group.cam.ac.uk/Shibboleth.sso/WAYF"/>
-      <init: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.cnn.group.cam.ac.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://www.cnn.group.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
-						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
-						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
-						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
-						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
-						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
-						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
-						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
-						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
-						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
-						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
-						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
-						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
-						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
-						RsenNm/aXp0wIU+jHVmi/GAPCQ==
-					</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.cnn.group.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.cnn.group.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Cambridge: Cambridge Networks Network</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cnn.group.cam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.communistpartyarchive.org.uk-oa-metadata.xml b/swamid-interfederations-2.0/www.communistpartyarchive.org.uk-oa-metadata.xml
deleted file mode 100644
index aea05fc5..00000000
--- a/swamid-interfederations-2.0/www.communistpartyarchive.org.uk-oa-metadata.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.communistpartyarchive.org.uk/oa/metadata">
-  <!--
-		This is a 'Communist Party of Great Britain archive' OpenAthens SP for Microform Imaging Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-05T13:54:55Z"/>
-  </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>
-						MIIDzTCCArWgAwIBAgIJANL2QbULh4NnMA0GCSqGSIb3DQEBBQUAME0xIDAeBgNV
-						BAoTF0NvbW11bmlzdCBQYXJ0eSBBcmNoaXZlMSkwJwYDVQQDEyB3d3cuY29tbXVu
-						aXN0cGFydHlhcmNoaXZlLm9yZy51azAeFw0xMjA4MDcwOTU2MzFaFw0yMjA4MDUw
-						OTU2MzFaME0xIDAeBgNVBAoTF0NvbW11bmlzdCBQYXJ0eSBBcmNoaXZlMSkwJwYD
-						VQQDEyB3d3cuY29tbXVuaXN0cGFydHlhcmNoaXZlLm9yZy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBALBBdaQ3L6V12/DE7TBeX3F0Rv/YwdXOqY2l
-						LmBKNpjlrUH5NgWV7SFNZ/M6FMujjpBxgJ6duJRYIqgUs8471krbW3ARi3GpX60G
-						wJWjfio4ZwDXv82o+Tafh6F936LwdU9AtswDcmA6MBiueV4s3cnoyY+pHBpzrxH4
-						LeSAUeCgTVHps1oaPMBc3/dIJMpPRGGkBI+e7P3k1529lVnX7qTKzr3QK+tcWCM4
-						b3WeievcKInQJZUJ96t2zoDfcISnorx/1bZ68dG7N49QYfPdz8HUM7Q26j6eoYg1
-						FaF2tYRk3YDLSmgxQ+MvWIouExSycBBmBvT7mlvQNpHdAhNEKZECAwEAAaOBrzCB
-						rDAdBgNVHQ4EFgQUEH2vsDmRr7SvveavUuqSeAT574gwfQYDVR0jBHYwdIAUEH2v
-						sDmRr7SvveavUuqSeAT574ihUaRPME0xIDAeBgNVBAoTF0NvbW11bmlzdCBQYXJ0
-						eSBBcmNoaXZlMSkwJwYDVQQDEyB3d3cuY29tbXVuaXN0cGFydHlhcmNoaXZlLm9y
-						Zy51a4IJANL2QbULh4NnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-						ADvVdVP4IMEvIyT3VW7715A78q2eaXGr8HaXy2UP3fyJtauR7P7A4t2lBKpsTNwK
-						dP0JYNIF/iavfD4KElg4z0egQb3tAK5AG2m4AE3Iei9wQKhO38kU/nCYS1MnrD/Y
-						oQikQE0EXee0I4hj9jZUeHtJphigNEtiIRZ/cKXpvRxDZudiklCf+Y/uKXbB4B5R
-						wgs2lGyckw7YMMheECpuSI7zVyls4pQP3iczc3dO8hQvVHIT10CeKgSeVyr2KvME
-						vLO0bK9UD3LPNN39N/wJzqKjhW7vC98egpagUfnEna+aK+QxCZLJDHelYlqdL0/0
-						8OPzZPdB5minjy+sO+WAQy4=
-					</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>
-						MIIDzTCCArWgAwIBAgIJANL2QbULh4NnMA0GCSqGSIb3DQEBBQUAME0xIDAeBgNV
-						BAoTF0NvbW11bmlzdCBQYXJ0eSBBcmNoaXZlMSkwJwYDVQQDEyB3d3cuY29tbXVu
-						aXN0cGFydHlhcmNoaXZlLm9yZy51azAeFw0xMjA4MDcwOTU2MzFaFw0yMjA4MDUw
-						OTU2MzFaME0xIDAeBgNVBAoTF0NvbW11bmlzdCBQYXJ0eSBBcmNoaXZlMSkwJwYD
-						VQQDEyB3d3cuY29tbXVuaXN0cGFydHlhcmNoaXZlLm9yZy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBALBBdaQ3L6V12/DE7TBeX3F0Rv/YwdXOqY2l
-						LmBKNpjlrUH5NgWV7SFNZ/M6FMujjpBxgJ6duJRYIqgUs8471krbW3ARi3GpX60G
-						wJWjfio4ZwDXv82o+Tafh6F936LwdU9AtswDcmA6MBiueV4s3cnoyY+pHBpzrxH4
-						LeSAUeCgTVHps1oaPMBc3/dIJMpPRGGkBI+e7P3k1529lVnX7qTKzr3QK+tcWCM4
-						b3WeievcKInQJZUJ96t2zoDfcISnorx/1bZ68dG7N49QYfPdz8HUM7Q26j6eoYg1
-						FaF2tYRk3YDLSmgxQ+MvWIouExSycBBmBvT7mlvQNpHdAhNEKZECAwEAAaOBrzCB
-						rDAdBgNVHQ4EFgQUEH2vsDmRr7SvveavUuqSeAT574gwfQYDVR0jBHYwdIAUEH2v
-						sDmRr7SvveavUuqSeAT574ihUaRPME0xIDAeBgNVBAoTF0NvbW11bmlzdCBQYXJ0
-						eSBBcmNoaXZlMSkwJwYDVQQDEyB3d3cuY29tbXVuaXN0cGFydHlhcmNoaXZlLm9y
-						Zy51a4IJANL2QbULh4NnMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-						ADvVdVP4IMEvIyT3VW7715A78q2eaXGr8HaXy2UP3fyJtauR7P7A4t2lBKpsTNwK
-						dP0JYNIF/iavfD4KElg4z0egQb3tAK5AG2m4AE3Iei9wQKhO38kU/nCYS1MnrD/Y
-						oQikQE0EXee0I4hj9jZUeHtJphigNEtiIRZ/cKXpvRxDZudiklCf+Y/uKXbB4B5R
-						wgs2lGyckw7YMMheECpuSI7zVyls4pQP3iczc3dO8hQvVHIT10CeKgSeVyr2KvME
-						vLO0bK9UD3LPNN39N/wJzqKjhW7vC98egpagUfnEna+aK+QxCZLJDHelYlqdL0/0
-						8OPzZPdB5minjy+sO+WAQy4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.communistpartyarchive.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.communistpartyarchive.org.uk/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.communistpartyarchive.org.uk/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.communistpartyarchive.org.uk/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Microform Imaging Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Communist Party of Great Britain archive</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.microform.co.uk/archival-publishing.php</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Sarsfield</SurName>
-    <EmailAddress>mailto:dsarsfield@microform.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Gill</SurName>
-    <EmailAddress>mailto:martin@serversure.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.content-select.com.xml b/swamid-interfederations-2.0/www.content-select.com.xml
deleted file mode 100644
index 99d029a2..00000000
--- a/swamid-interfederations-2.0/www.content-select.com.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.content-select.com/simplesaml/module.php/saml/sp/metadata.php/preselect.media-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.content-select.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.content-select.com,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)11,OU=GT34580426,O=www.content-select.com,C=DE,serialNumber=KigR834DJIZuIEHAagJ0xVfd/ETeEvlJ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE9zCCA9+gAwIBAgIDBEopMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTExMjA1MTIxNzQ0WhcNMTIxMjA3MTIxMzAwWjCB8zEpMCcGA1UEBRMgS2ln
-UjgzNERKSVp1SUVIQWFnSjB4VmZkL0VUZUV2bEoxCzAJBgNVBAYTAkRFMR8wHQYD
-VQQKExZ3d3cuY29udGVudC1zZWxlY3QuY29tMRMwEQYDVQQLEwpHVDM0NTgwNDI2
-MTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNvbS9yZXNvdXJjZXMvY3BzIChj
-KTExMS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQgLSBSYXBpZFNT
-TChSKTEfMB0GA1UEAxMWd3d3LmNvbnRlbnQtc2VsZWN0LmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANSTVbAyh0XF+bApU51WEeiotNOn7q/HQ7/Z
-0DSSTgsklWbB5kgDBBo4flY5a/PWuO0H5jBWAs2DXALafzelgMYssqA2up9xiK3M
-eIVDro2W+2yFv9CfODJyIVCD8vTZFjqSfoehHF2Pjzp1YAQE0MUbgtX+VCE8oUOL
-tpp2iT7XHOr6DPD/6k8dovxuKQyo1xSkiyJ4CW/HrZQ+heauzyTXalZEfJDMlKib
-WnhjdpoXUA6xOSXoh992UjuEQxXoCYkGZHJQCaHBRx9UFuG4TMVRzq6g9h//Xcld
-H+H8xRctL7G2q1ehJm0IDLd9fOkvYyHTJWDy184/92R9BUSAlk0CAwEAAaOCAUgw
-ggFEMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQE
-AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwNQYDVR0RBC4wLIIW
-d3d3LmNvbnRlbnQtc2VsZWN0LmNvbYISY29udGVudC1zZWxlY3QuY29tMEMGA1Ud
-HwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2Ny
-bHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBRjoYiCPyPt2k/XtEiyOs1ET+ygvjAM
-BgNVHRMBAf8EAjAAMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDov
-L3JhcGlkc3NsLWFpYS5nZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MA0GCSqGSIb3
-DQEBBQUAA4IBAQAYh5XWr45tlba/mmjOSw2HkGTqRk9rxN6K8VeXwG1+1hr7d2J7
-P34Tt8ln6vBAiSBrNW1j+kHXpxfUS+k/EGTn4m+2NfbKJfKHqEDgUGjYtI5/lu+T
-TrczpZ5qf+a8HSnnnbyH4IL7VKPUneQ22EGppDKLf1FznpJ4pXFmGyM4XU68mlmT
-VqFzNc/40cAysWElKPnDuaEeaNHPj+ygg16o2gELDdZVpcqNPj/u2sGyG8Ve0DoT
-5PFbqWVKT7ei0rDFL5jWiqrmDWQGDJ7afzoPozmz4jaZXVxOkC5bHTL0wtHVFG8Z
-XvtaOslqoxKB8TiLxGjJAXztJJFWwMwF5ebp
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.content-select.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.content-select.com,OU=Domain Control Validated - RapidSSL(R),OU=See www.rapidssl.com/resources/cps (c)11,OU=GT34580426,O=www.content-select.com,C=DE,serialNumber=KigR834DJIZuIEHAagJ0xVfd/ETeEvlJ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE9zCCA9+gAwIBAgIDBEopMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0Ew
-HhcNMTExMjA1MTIxNzQ0WhcNMTIxMjA3MTIxMzAwWjCB8zEpMCcGA1UEBRMgS2ln
-UjgzNERKSVp1SUVIQWFnSjB4VmZkL0VUZUV2bEoxCzAJBgNVBAYTAkRFMR8wHQYD
-VQQKExZ3d3cuY29udGVudC1zZWxlY3QuY29tMRMwEQYDVQQLEwpHVDM0NTgwNDI2
-MTEwLwYDVQQLEyhTZWUgd3d3LnJhcGlkc3NsLmNvbS9yZXNvdXJjZXMvY3BzIChj
-KTExMS8wLQYDVQQLEyZEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQgLSBSYXBpZFNT
-TChSKTEfMB0GA1UEAxMWd3d3LmNvbnRlbnQtc2VsZWN0LmNvbTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANSTVbAyh0XF+bApU51WEeiotNOn7q/HQ7/Z
-0DSSTgsklWbB5kgDBBo4flY5a/PWuO0H5jBWAs2DXALafzelgMYssqA2up9xiK3M
-eIVDro2W+2yFv9CfODJyIVCD8vTZFjqSfoehHF2Pjzp1YAQE0MUbgtX+VCE8oUOL
-tpp2iT7XHOr6DPD/6k8dovxuKQyo1xSkiyJ4CW/HrZQ+heauzyTXalZEfJDMlKib
-WnhjdpoXUA6xOSXoh992UjuEQxXoCYkGZHJQCaHBRx9UFuG4TMVRzq6g9h//Xcld
-H+H8xRctL7G2q1ehJm0IDLd9fOkvYyHTJWDy184/92R9BUSAlk0CAwEAAaOCAUgw
-ggFEMB8GA1UdIwQYMBaAFGtpPWoYQkrdjwJlOf01JIZ4kRYwMA4GA1UdDwEB/wQE
-AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwNQYDVR0RBC4wLIIW
-d3d3LmNvbnRlbnQtc2VsZWN0LmNvbYISY29udGVudC1zZWxlY3QuY29tMEMGA1Ud
-HwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2Ny
-bHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBRjoYiCPyPt2k/XtEiyOs1ET+ygvjAM
-BgNVHRMBAf8EAjAAMEkGCCsGAQUFBwEBBD0wOzA5BggrBgEFBQcwAoYtaHR0cDov
-L3JhcGlkc3NsLWFpYS5nZW90cnVzdC5jb20vcmFwaWRzc2wuY3J0MA0GCSqGSIb3
-DQEBBQUAA4IBAQAYh5XWr45tlba/mmjOSw2HkGTqRk9rxN6K8VeXwG1+1hr7d2J7
-P34Tt8ln6vBAiSBrNW1j+kHXpxfUS+k/EGTn4m+2NfbKJfKHqEDgUGjYtI5/lu+T
-TrczpZ5qf+a8HSnnnbyH4IL7VKPUneQ22EGppDKLf1FznpJ4pXFmGyM4XU68mlmT
-VqFzNc/40cAysWElKPnDuaEeaNHPj+ygg16o2gELDdZVpcqNPj/u2sGyG8Ve0DoT
-5PFbqWVKT7ei0rDFL5jWiqrmDWQGDJ7afzoPozmz4jaZXVxOkC5bHTL0wtHVFG8Z
-XvtaOslqoxKB8TiLxGjJAXztJJFWwMwF5ebp
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.content-select.com/simplesaml/module.php/saml/sp/saml2-logout.php/preselect.media-sp"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.content-select.com/simplesaml/module.php/saml/sp/saml2-acs.php/preselect.media-sp" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.content-select.com/simplesaml/module.php/saml/sp/saml1-acs.php/preselect.media-sp" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.content-select.com/simplesaml/module.php/saml/sp/saml2-acs.php/preselect.media-sp" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.content-select.com/simplesaml/module.php/saml/sp/saml1-acs.php/preselect.media-sp/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Preselect.media GmbH, Gruenwald</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Preselect.media GmbH, Gruenwald</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.content-select.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Andreas</GivenName>
-    <SurName>Fuerlinger</SurName>
-    <EmailAddress>a.fuerlinger@preselect.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.crcnetbase.com-shibboleth.xml b/swamid-interfederations-2.0/www.crcnetbase.com-shibboleth.xml
deleted file mode 100644
index 82f5e026..00000000
--- a/swamid-interfederations-2.0/www.crcnetbase.com-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://www.crcnetbase.com/shibboleth">
-  <!--
-		This is a "CRC Press" Atypon SAML SP for Informa plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-12-01T17:17: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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEbjCCA1agAwIBAgIJANEyiht0lGz3MA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEfMB0GA1UEAxMWd3d3Lm1vcmdhbmNsYXlwb29sLmNv
-						bTEeMBwGCSqGSIb3DQEJARYPdmFrZUBhdHlwb24uY29tMB4XDTA5MDcyMzE4MjQz
-						M1oXDTE5MDcyMTE4MjQzM1owgbcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxp
-						Zm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsGA1UEChMUQXR5cG9uIFN5
-						c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR8wHQYD
-						VQQDExZ3d3cubW9yZ2FuY2xheXBvb2wuY29tMR4wHAYJKoZIhvcNAQkBFg92YWtl
-						QGF0eXBvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1jZrb
-						EIm3NwRJ8SkkHkvjKSWe4vuqyfO1D1MAVZzy5FzSLOeup4qEyCDkwtzrN3vSYNa1
-						4qovhIs+Eeap6FXH3XkhzZluSn4rKM/IoetfcP74l99cIzn4xMZfknhk9NNnb2vE
-						L/dJSu/8LyGFxr2b8c5cdYzgFiN77peyf4kOYCMJhC5xYXogrtFlmzkhbk6CRK36
-						QELJmbcegneoglceycLwmunJvhbkIagouT/AFxm7m9FFR2AbGQ2m52DdCSJdY6Q/
-						+cRnIO3p3Jar0D+huhNPlTyH5XNw41kPH4WvQiYAq7j40cFEwYHU4hOrBkKrdLUz
-						hPjVz1iquFai4gY1AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
-						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSntSFOeKeT
-						NvcbAlIaG09llX2rAzAfBgNVHSMEGDAWgBSntSFOeKeTNvcbAlIaG09llX2rAzAN
-						BgkqhkiG9w0BAQUFAAOCAQEAQguA1fll3LnjT1NokQTeSc1gmZIlbD318j6SKojU
-						zDYXinKZtzK9T0t1e1BFlOnbPGN1Fu1VkGLuOp5Z5/AJqMJJ9hfSOTjtz99AUk20
-						Ojgsw76oZ5nwqvk2lxKregha/GIkT7nJp8ycuQVI1ahnh142BDrfuB5DFAcHvi1q
-						v3NXHQuorkykb0mBuduNW+Uvk2T7wiNzruCOpBJGZzJZw3/FNXGCb3MmtaJgf7Br
-						+B02aD7lQHX2jczKW50vxU46gvji7sBWUlCeYT+JeBQpBKT6SOPtHBLcSNIwhDzG
-						U5jsgJ4S54QwA12aggwYfLERyqoQLPepkxvA2QygkK7JeQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.crcnetbase.com/action/samlACS" index="0"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Informa plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Informa plc: CRC Press</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.crcnetbase.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Duane</GivenName>
-    <SurName>Schindler</SurName>
-    <EmailAddress>mailto:duane.schindler@taylorandfrancis.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Duane</GivenName>
-    <SurName>Schindler</SurName>
-    <EmailAddress>mailto:duane.schindler@taylorandfrancis.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.creativeclub.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.creativeclub.co.uk-shibboleth-sp.xml
deleted file mode 100644
index dc047894..00000000
--- a/swamid-interfederations-2.0/www.creativeclub.co.uk-shibboleth-sp.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://www.creativeclub.co.uk/shibboleth-sp">
-  <!--
-		This a "Creative Club" Shibboleth SP for Ebiquity plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-07-20T11:44: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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIJAJNBy2AlSZCeMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
-						BAMTI3VrLWJyby1paXMtMS50aG9tc29uLWludGVybWVkaWEubmV0MB4XDTA5MDYz
-						MDA5NTAzMFoXDTE5MDYyODA5NTAzMFowLjEsMCoGA1UEAxMjdWstYnJvLWlpcy0x
-						LnRob21zb24taW50ZXJtZWRpYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQCfJy+boHJDh9FkG5nnjeFbooXmLO8jzEemA+Y4IOaHnLkLVwVG6EKS
-						6rfM6vx+xrCxiVmRw9MZ4OaIuvLs6zMup8GfWWA4b2nBX47m4LOMZ8o24iSTkzV+
-						rIerApEnAtTWZeVrVlt+iXwtOG0vRQnsnUEQfc7bWNi2MbOiAnGGu3mInOQRSRKd
-						J++owbwu6swr/BMPV2VbtnaHlqS5oB53K4VcmyWDa1L5bwoljHMR++kjnoaYMfD3
-						BY5ptVSPnXzLuP7PhKiT2Q4ZtuovQQiRRRauZjh15l3h4zcpiBrVP1hWYS67WMW/
-						L/dousPDjtTSZHw4sMp1xZnYMuJ2GVDFAgMBAAGjUTBPMC4GA1UdEQQnMCWCI3Vr
-						LWJyby1paXMtMS50aG9tc29uLWludGVybWVkaWEubmV0MB0GA1UdDgQWBBQ4E1v3
-						u6BpS67jBb9VGJdSo3CNcDANBgkqhkiG9w0BAQUFAAOCAQEAcU4fTT8j/+B5Br48
-						7gTwG6cjyc/YFcfvWkPeQ1ZnhnXm/rQ0vy5WZL4KZ3EIRopfVuNbmudu2etoM569
-						uoVzMdbSdRkFAJK61lViEqtBrbpNgFVIEBWJzzQQWfrc9NOQrbFU/lzQSw9YS2a9
-						AaNlVgSAo0o7auuZQP/dVXQ4SPXRxatszMWhU0EcrGwULFZ0eVu4NoICCnqR1c8p
-						/+Ja7rfVNsWnCNjjj0BS3sb/6w/TjEuC0Y6BfDRXmj8Q10/2JGsrHzKhf5ohsjlt
-						WLqvM4GE7PTvOXAdB18th+p8IreWjHR/Qz0CuhhrHXZtFyu68QBLBPvLikydoYvM
-						3mQlrA==
-					</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>
-						MIIDMDCCAhigAwIBAgIJAJNBy2AlSZCeMA0GCSqGSIb3DQEBBQUAMC4xLDAqBgNV
-						BAMTI3VrLWJyby1paXMtMS50aG9tc29uLWludGVybWVkaWEubmV0MB4XDTA5MDYz
-						MDA5NTAzMFoXDTE5MDYyODA5NTAzMFowLjEsMCoGA1UEAxMjdWstYnJvLWlpcy0x
-						LnRob21zb24taW50ZXJtZWRpYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQCfJy+boHJDh9FkG5nnjeFbooXmLO8jzEemA+Y4IOaHnLkLVwVG6EKS
-						6rfM6vx+xrCxiVmRw9MZ4OaIuvLs6zMup8GfWWA4b2nBX47m4LOMZ8o24iSTkzV+
-						rIerApEnAtTWZeVrVlt+iXwtOG0vRQnsnUEQfc7bWNi2MbOiAnGGu3mInOQRSRKd
-						J++owbwu6swr/BMPV2VbtnaHlqS5oB53K4VcmyWDa1L5bwoljHMR++kjnoaYMfD3
-						BY5ptVSPnXzLuP7PhKiT2Q4ZtuovQQiRRRauZjh15l3h4zcpiBrVP1hWYS67WMW/
-						L/dousPDjtTSZHw4sMp1xZnYMuJ2GVDFAgMBAAGjUTBPMC4GA1UdEQQnMCWCI3Vr
-						LWJyby1paXMtMS50aG9tc29uLWludGVybWVkaWEubmV0MB0GA1UdDgQWBBQ4E1v3
-						u6BpS67jBb9VGJdSo3CNcDANBgkqhkiG9w0BAQUFAAOCAQEAcU4fTT8j/+B5Br48
-						7gTwG6cjyc/YFcfvWkPeQ1ZnhnXm/rQ0vy5WZL4KZ3EIRopfVuNbmudu2etoM569
-						uoVzMdbSdRkFAJK61lViEqtBrbpNgFVIEBWJzzQQWfrc9NOQrbFU/lzQSw9YS2a9
-						AaNlVgSAo0o7auuZQP/dVXQ4SPXRxatszMWhU0EcrGwULFZ0eVu4NoICCnqR1c8p
-						/+Ja7rfVNsWnCNjjj0BS3sb/6w/TjEuC0Y6BfDRXmj8Q10/2JGsrHzKhf5ohsjlt
-						WLqvM4GE7PTvOXAdB18th+p8IreWjHR/Qz0CuhhrHXZtFyu68QBLBPvLikydoYvM
-						3mQlrA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.creativeclub.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.creativeclub.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.creativeclub.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.creativeclub.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.creativeclub.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ebiquity plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ebiquity plc: Creative Club</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ebiquity.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Creative Club Client Services</GivenName>
-    <EmailAddress>mailto:CreativeClub.CustomerSupport@ebiquity.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Anthony</GivenName>
-    <SurName>Wong</SurName>
-    <EmailAddress>mailto:antony.wong@ebiquity.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.cypnow.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.cypnow.co.uk-shibboleth.xml
deleted file mode 100644
index 3e346245..00000000
--- a/swamid-interfederations-2.0/www.cypnow.co.uk-shibboleth.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.cypnow.co.uk/shibboleth">
-  <!--
-		This is a "Children and Young People Now" Shibboleth SP for LibLynx LLC.
-	-->
-  <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="2015-07-15T07:45:37Z">
-      <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://cypnow-mag-shib.liblynx.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Children and Young People Now</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Children &amp; Young People Now is a magazine for professionals working with children and young people</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6DCCAdCgAwIBAgIJAKKEvzTa1baZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC2xpYmx5bnguY29tMB4XDTE1MDcwMTE0MzA1OFoXDTI1MDYyODE0MzA1OFow
-						FjEUMBIGA1UEAxMLbGlibHlueC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQC/tN/ehV2IQ8427sENebb+6ij+VoiIirTDNTOtvOa9ff3Yk5L+8VaS
-						n5AUPJ7X4JHXl6rMIz0Vy8aaP+jeWy+oTUnNfNAXJz3CGqz3+GYST4qCbUfi071y
-						aZEiw/zD3PG2XjCI1iB4jojVEMOZvUNMXw2Fp2hAdeR1E4Jct6wHiPioDzKXCm5o
-						EpR0EhYRDBQ5KD1pNulD219uFxmeq4sg4Yhw3e87dN0Mf+DYIm32ApXQfCj37lQm
-						Y3E5U/fDBaM1Du54+hWrRi4NzzHpCCmA6AfeMcyoUUmL67wc4vXePh+b1ZPtM1Dn
-						rsjH86EUcCZVBNp1c9nb6KO5uWfw3a7hAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2xp
-						Ymx5bnguY29tMB0GA1UdDgQWBBRhxZ/MN/oyiZyi9iRBE2VmvDGllDANBgkqhkiG
-						9w0BAQUFAAOCAQEAM1eUF5GIiZPHhmhN7mWhiNmM9cC9q+hR+BZjfBjOFyvHmUry
-						XKWaq+5GVG/yZBtD8hnQAanLCBFT7iPXyPDeMkkf3CYwEScRZglVJqffn2v7rpO/
-						gqam0j1tzRAgvYbZXBe/u71qFVN57b5w6XPq0rONkq1HlFPLz1kZ/RPeDPxsy1m1
-						BD9Air6XaXKVUCuozkcpnDIQqDfrx+VdsHqi03T4H4UgQrqjx/C+eASsFH9qQsBz
-						7wGBxTNZk8z8Ob/CFJI79t38xZnP8cBEr4vlE27ld7HGu1mzBZPi6d4pAhpOcIvG
-						tkJW/9JlQ93sBxUk0E1HbTlYxtXFbNCVwqEWcg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://cypnow-mag-shib.liblynx.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cypnow-mag-shib.liblynx.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">LibLynx LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Children and Young People Now</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.markallengroup.com/ma-education/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tom</GivenName>
-    <SurName>Pollard</SurName>
-    <EmailAddress>mailto:tom.pollard@markallengroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Dixon</SurName>
-    <EmailAddress>mailto:paul@liblynx.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dailywhat.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.dailywhat.org.uk-shibboleth.xml
deleted file mode 100644
index 56f6a99d..00000000
--- a/swamid-interfederations-2.0/www.dailywhat.org.uk-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://www.dailywhat.org.uk/shibboleth">
-  <!--
-		This is a "Daily What" Shibboleth SP for Tinopolis Interactive 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-09-10T15:57: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>
-      <init: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.dailywhat.org.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJAO7V64q3+QyMMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXRpbi1laC13ZWIwMDEwHhcNMTMwOTIxMTgzNDUzWhcNMjMwOTE5MTgzNDUz
-						WjAYMRYwFAYDVQQDEw10aW4tZWgtd2ViMDAxMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA1u0wwroEU98KO6FGUH6IPwjCBQOb9EiK9eWStt9wTmfPIvK6
-						cW4iqKvWxv/Ic89+mZGhJUgUqAgiMGpG8geQMtSDw/PxG0SCt5m5X3LE38pLrktF
-						CJ9Z1MezuVMKhy/mxB7IWAuGTcuY+X8bGpt5BmtenOC2u2Of4PhG6OA5U+7R2hfn
-						YGxJRaGyzaaL+L69sElGZ8nG1ag/jvJ6VQ+uGpB6pM7e5gCdEnseM/ruLxgmi1tY
-						mnXvIHr2oPlGIDCFor+l53BK5gbdxBBfgxy+NtJA6rd9TDwBZ+922KKCCYlxAxzn
-						RcFapFbp2MLxeU1lLJ4qxEGb8x7IW3/IWcK+PQIDAQABozswOTAYBgNVHREEETAP
-						gg10aW4tZWgtd2ViMDAxMB0GA1UdDgQWBBTDGP+cpqj3AiOmkJqDHmwChMkESzAN
-						BgkqhkiG9w0BAQUFAAOCAQEAvXMz3dAhtPMjjZxukiDzUv/M24SPbqdAjkl0TRTD
-						l+VrbACwKPrg5X4cz2jRhcCk27rtcqaTJivQtYeNgOeFhyttSDn+XBksEE8+dTtj
-						7C7pBF3nNXTelefmyvGhFZBcFtL0OGtzD+JWyqi/SE1r663RbkKDq62PVZrumH95
-						gTmainsoFW14kPR3ZrdJsjUhmI/q5YfM8TiNebBD3el4x+CvlmtX+o7UndTEzb6R
-						AWMb1wiURu0Lw4Ywgpkrd91bJIyoPDc2VJO9ABs4pHeG3NKaNjSY1suN4R5A4dfG
-						V4hOHeRDvUlKIx3SpSVrMWsRCywyIdzIWrknAgdCJM2qIQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.dailywhat.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dailywhat.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Tinopolis Interactive Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Tinopolis Interactive Limited: Daily What</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tinopolis.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Orig</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>mailto:orig.jones@tinopolis.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Orig</GivenName>
-    <SurName>Jones</SurName>
-    <EmailAddress>mailto:orig.jones@tinopolis.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml b/swamid-interfederations-2.0/www.dawsonera.com-shibboleth.xml
deleted file mode 100644
index 186501f6..00000000
--- a/swamid-interfederations-2.0/www.dawsonera.com-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://www.dawsonera.com/shibboleth">
-  <!--
-		This is a "Dawsonera" Shibboleth SP for Dawson Books 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="2008-10-23T17:30: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://www.dawsonera.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.dawsonera.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqjCCApKgAwIBAgIJAPw17BZZ42GoMA0GCSqGSIb3DQEBBQUAMGExCzAJBgNV
-						BAYTAlVLMQ8wDQYDVQQIEwZTdXNzZXgxETAPBgNVBAcTCEJyaWdodG9uMRIwEAYD
-						VQQKEwlzZW1hbnRpY28xGjAYBgNVBAMTEXd3dy5kYXdzb25lcmEuY29tMB4XDTE0
-						MTEyMDE0MTAwMFoXDTM0MTExNTE0MTAwMFowYTELMAkGA1UEBhMCVUsxDzANBgNV
-						BAgTBlN1c3NleDERMA8GA1UEBxMIQnJpZ2h0b24xEjAQBgNVBAoTCXNlbWFudGlj
-						bzEaMBgGA1UEAxMRd3d3LmRhd3NvbmVyYS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDHgNVCzYLg7SD9tKfQV00YAlrk5468kdoro4kdCSr3lnro
-						BRtqzU6ZJtAUFG/eUALLvAGm/q0gK1DYLlfjhYccUsXwzRajQUdjmxuLenkg1bIO
-						b8JIhyo0UTQniZH+4JSEvcH81Iusq1TRPAcpVxZn2lFv2qaArO+jRpAbbnnZApx1
-						DMspj+twl8Kd+MUfibLNGFRJgqmJAwifPAD+cNEr0fOlVI0M4tye5xLPnx0YsGe1
-						5u4D7l7NmPpYuPu/isWTlMIcbMJFEpExLGzi9GTfRbLdmytVp12geoWR2nxv9uaU
-						ygslHl+e8P45tpl0w6az/NlCw6v60Y7EgdROuj7rAgMBAAGjZTBjMEIGA1UdEQQ7
-						MDmCEXd3dy5kYXdzb25lcmEuY29thiRodHRwczovL3d3dy5kYXdzb25lcmEuY29t
-						L3NoaWJib2xldGgwHQYDVR0OBBYEFMtE823I+0YS2aPs/H9Ga0Jwi+NCMA0GCSqG
-						SIb3DQEBBQUAA4IBAQAJg9+Sr/kF5Wjo7f1FZEg46JbjJeoI4exlvyCe0NK7z1qX
-						m5pX1qYwWPQ7LaXX7Zp3/OiK7GZ9PwjxPPos9SCCxIHiXUbQiVE0lZak2gmVQBtR
-						5g5+mlEMzK5JdS/LpBg73bt9GmDOD8DW/gh5jK8leFeMYpB6S7kQtHBQjOCh25pK
-						71r8Nn896gV+5qH8gGZl3n0sh3wFmCEm6MWMeO9O7sQ9mOpCyURGga0z9pNhuDT+
-						YPUWnO6LjnDWB5N9pwW+4I/Aqr4RGYA07Qbzwwpy4EcLBjb8rksf65XfEKsJifBh
-						K4PtNVSuIlt/QvKTAsFlP4X3c46Ol501WcVbYoD9
-					</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.dawsonera.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Dawson Books Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Dawsonera SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dawsonera.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:shibboleth.support@dawsonbooks.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Weaver</SurName>
-    <EmailAddress>mailto:tim.weaver@dawsonbooks.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Helen</GivenName>
-    <SurName>Stratford</SurName>
-    <EmailAddress>mailto:helen.stratford@dawsonbooks.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dawsonera.com.xml b/swamid-interfederations-2.0/www.dawsonera.com.xml
deleted file mode 100644
index 001581ea..00000000
--- a/swamid-interfederations-2.0/www.dawsonera.com.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.dawsonera.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.dawsonera.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.dawsonera.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.dawsonera.com,O=Semantico,L=Brighton,ST=East Sussex,C=GB</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIQOvdMPhrRfQvKM2FkVMlM6DANBgkqhkiG9w0BAQUFADA8
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-aGF3dGUgU1NMIENBMB4XDTEwMTAwODAwMDAwMFoXDTEzMTAyOTIzNTk1OVowZjEL
-MAkGA1UEBhMCR0IxFDASBgNVBAgTC0Vhc3QgU3Vzc2V4MREwDwYDVQQHFAhCcmln
-aHRvbjESMBAGA1UEChQJU2VtYW50aWNvMRowGAYDVQQDFBF3d3cuZGF3c29uZXJh
-LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1SMQWlmopgjZeH8ITGnf
-qjgJA+trii8i7lHAjm7EQZS0GS6A7gTtUFlc4pIPPzR2OpgkHM8TcjSQCTAPFmp1
-hfUts6JkWTTe0TVHC4VqKuUtWPmq4oo5XsTTzTRt0MV7iLROkI/NNMf0qbgHEFo+
-TkljHi1mmQhYsJ3LLO+Py4sCAwEAAaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9zdnItb3YtY3JsLnRoYXd0ZS5jb20vVGhhd3Rl
-T1YuY3JsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcB
-AQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZI
-hvcNAQEFBQADggEBAG8liYbeb9+qVKIX/QHZzbMck5+/jROd42ggIoIDJlGawBZA
-PJ8Q5zxoJwKWcBJ7M1sI/wcI4HntFJgB00fAFGwK1mQo8+kfOCAaSPWEOwomBffc
-ATMBokvtILGbxmsCtMEFE+R94Bjdvgn/WsOHqj1LO8xNHtOGvbPDMb0NdS+W3R1T
-yArxEur5uitLP7u/9AcboSbsWJr+EfPmyN4K5p433zWobY9gMpOaIZ5tt3nVuIof
-Q2zQ39BwHPIUmro1+VsSXK4/Vc2Mg0lraBHNHKBM9H7g7JhTtDZ3YejMB5LxyPSX
-A+7vljJkaaHxaiFXuPXHzIPyGnY9og0BorlaDE0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.dawsonera.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.dawsonera.com,O=Semantico,L=Brighton,ST=East Sussex,C=GB</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSTCCAjGgAwIBAgIQOvdMPhrRfQvKM2FkVMlM6DANBgkqhkiG9w0BAQUFADA8
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMVGhhd3RlLCBJbmMuMRYwFAYDVQQDEw1U
-aGF3dGUgU1NMIENBMB4XDTEwMTAwODAwMDAwMFoXDTEzMTAyOTIzNTk1OVowZjEL
-MAkGA1UEBhMCR0IxFDASBgNVBAgTC0Vhc3QgU3Vzc2V4MREwDwYDVQQHFAhCcmln
-aHRvbjESMBAGA1UEChQJU2VtYW50aWNvMRowGAYDVQQDFBF3d3cuZGF3c29uZXJh
-LmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1SMQWlmopgjZeH8ITGnf
-qjgJA+trii8i7lHAjm7EQZS0GS6A7gTtUFlc4pIPPzR2OpgkHM8TcjSQCTAPFmp1
-hfUts6JkWTTe0TVHC4VqKuUtWPmq4oo5XsTTzTRt0MV7iLROkI/NNMf0qbgHEFo+
-TkljHi1mmQhYsJ3LLO+Py4sCAwEAAaOBoDCBnTAMBgNVHRMBAf8EAjAAMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9zdnItb3YtY3JsLnRoYXd0ZS5jb20vVGhhd3Rl
-T1YuY3JsMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBggrBgEFBQcB
-AQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnRoYXd0ZS5jb20wDQYJKoZI
-hvcNAQEFBQADggEBAG8liYbeb9+qVKIX/QHZzbMck5+/jROd42ggIoIDJlGawBZA
-PJ8Q5zxoJwKWcBJ7M1sI/wcI4HntFJgB00fAFGwK1mQo8+kfOCAaSPWEOwomBffc
-ATMBokvtILGbxmsCtMEFE+R94Bjdvgn/WsOHqj1LO8xNHtOGvbPDMb0NdS+W3R1T
-yArxEur5uitLP7u/9AcboSbsWJr+EfPmyN4K5p433zWobY9gMpOaIZ5tt3nVuIof
-Q2zQ39BwHPIUmro1+VsSXK4/Vc2Mg0lraBHNHKBM9H7g7JhTtDZ3YejMB5LxyPSX
-A+7vljJkaaHxaiFXuPXHzIPyGnY9og0BorlaDE0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dawsonera.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dawsonera.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Dawson Books</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">dawsonera</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dawsonbooks.co.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Claire</GivenName>
-    <SurName>Chandler</SurName>
-    <EmailAddress>claire.chandler@dawsonbooks.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jude</GivenName>
-    <SurName>Norris</SurName>
-    <EmailAddress>jude.norris@dawsonbooks.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dbod.de.xml b/swamid-interfederations-2.0/www.dbod.de.xml
deleted file mode 100644
index 08cfe29f..00000000
--- a/swamid-interfederations-2.0/www.dbod.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.dbod.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.dbod.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.dbod.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkTCCBHmgAwIBAgIEEXxf/jANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
-BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTEwMjE3MDg1NTExWhcNMTQw
-MjE2MDg1NTExWjCBnzELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
-BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
-YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
-BAsTAklUMRQwEgYDVQQDEwt3d3cuZGJvZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALuMaNZjp0yrjtPDHzW+rQG9wzGUET5nhfyr9KCz+SZTl82k
-e4jzNHpvkIr5qbmm+iEMllOzkGCcFCqSRq/LPyw/KqxcSJGDsgMjkM6BvczNUoQE
-LraQiZD/0K5Omzy/k35H8ORIRiNqMUhJHaDDT4veadScxhpIEVp2Nb2WY0P19tpX
-25sHSqsWHvryub76qcgnP4BIlvDrzBIRlCXDOW32ZeYWNtugrJz3e8mD/cOCRlKt
-j7AxdcOVSQ39Sov5pnvniOPzHI/rWdbekPwmztXMn+KHQ9FW8ey2zDVrfkK/E0k4
-dUwsP24skPmmhsIxoy0b+o3A9R9yuWijm/RagJkCAwEAAaOCAeswggHnMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcD
-AQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBTk+peHdyI4FoF+ubcz
-XhMjwILo/zAfBgNVHSMEGDAWgBTFK1OTF4PJ9UZC7UNq37aApkfy4DAiBgNVHREE
-GzAZgRduaWVkZXJsQHNsdWItZHJlc2Rlbi5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6
-hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWRyZXNkZW4tY2EvcHViL2NybC9n
-X2NhY3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1kcmVz
-ZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgG
-CCsGAQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWRyZXNkZW4tY2Ev
-cHViL2NhY2VydC9nX2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAatFyUpdktAeX3l5aqPvdjv5wstVOEvYA1f/s
-zEdj/QLmpeUMi+tzXRnAVzvHs46dnDJrY5DGiy75/zBgd5AhEb0ZRfcg25RZnflP
-pSwc675wZoiUowr5yVwsjlnTHpBj5sVGruglTnePFxDlWSoeknTcI0d461ELz+l2
-rPyraiLMRud8qxLPorHQv/el35jYzatt2fPuGjNkB7Iq4LokT2cQ3Em1PKK+7ICk
-ZZK61G21eejcP9ymQWhDSjvBg+e2qUZsm+GzQoRniXkRb5S17fMjwu+IMRAk/2cV
-yMFeLSMQWDo5MjmDApWgf7WN5Nc/kBGqUi6DB3K3h6MI5O1scg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.dbod.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.dbod.de,OU=IT,O=Saechsische Landes-\, Staats- und Universitaetsbibliothek Dresden,L=Dresden,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkTCCBHmgAwIBAgIEEXxf/jANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMC
-REUxKDAmBgNVBAoTH1RlY2huaXNjaGUgVW5pdmVyc2l0YWV0IERyZXNkZW4xDDAK
-BgNVBAsTA1pJSDEcMBoGA1UEAxMTVFUgRHJlc2RlbiBDQSAtIEcwMjEgMB4GCSqG
-SIb3DQEJARYRcGtpQHR1LWRyZXNkZW4uZGUwHhcNMTEwMjE3MDg1NTExWhcNMTQw
-MjE2MDg1NTExWjCBnzELMAkGA1UEBhMCREUxEDAOBgNVBAgTB1NhY2hzZW4xEDAO
-BgNVBAcTB0RyZXNkZW4xSTBHBgNVBAoTQFNhZWNoc2lzY2hlIExhbmRlcy0sIFN0
-YWF0cy0gdW5kIFVuaXZlcnNpdGFldHNiaWJsaW90aGVrIERyZXNkZW4xCzAJBgNV
-BAsTAklUMRQwEgYDVQQDEwt3d3cuZGJvZC5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALuMaNZjp0yrjtPDHzW+rQG9wzGUET5nhfyr9KCz+SZTl82k
-e4jzNHpvkIr5qbmm+iEMllOzkGCcFCqSRq/LPyw/KqxcSJGDsgMjkM6BvczNUoQE
-LraQiZD/0K5Omzy/k35H8ORIRiNqMUhJHaDDT4veadScxhpIEVp2Nb2WY0P19tpX
-25sHSqsWHvryub76qcgnP4BIlvDrzBIRlCXDOW32ZeYWNtugrJz3e8mD/cOCRlKt
-j7AxdcOVSQ39Sov5pnvniOPzHI/rWdbekPwmztXMn+KHQ9FW8ey2zDVrfkK/E0k4
-dUwsP24skPmmhsIxoy0b+o3A9R9yuWijm/RagJkCAwEAAaOCAeswggHnMAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMDQGA1UdJQQtMCsGCCsGAQUFBwMCBggrBgEFBQcD
-AQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMB0GA1UdDgQWBBTk+peHdyI4FoF+ubcz
-XhMjwILo/zAfBgNVHSMEGDAWgBTFK1OTF4PJ9UZC7UNq37aApkfy4DAiBgNVHREE
-GzAZgRduaWVkZXJsQHNsdWItZHJlc2Rlbi5kZTCBiwYDVR0fBIGDMIGAMD6gPKA6
-hjhodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWRyZXNkZW4tY2EvcHViL2NybC9n
-X2NhY3JsLmNybDA+oDygOoY4aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1kcmVz
-ZGVuLWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgaQGCCsGAQUFBwEBBIGXMIGUMEgG
-CCsGAQUFBzAChjxodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3R1LWRyZXNkZW4tY2Ev
-cHViL2NhY2VydC9nX2NhY2VydC5jcnQwSAYIKwYBBQUHMAKGPGh0dHA6Ly9jZHAy
-LnBjYS5kZm4uZGUvdHUtZHJlc2Rlbi1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNy
-dDANBgkqhkiG9w0BAQUFAAOCAQEAatFyUpdktAeX3l5aqPvdjv5wstVOEvYA1f/s
-zEdj/QLmpeUMi+tzXRnAVzvHs46dnDJrY5DGiy75/zBgd5AhEb0ZRfcg25RZnflP
-pSwc675wZoiUowr5yVwsjlnTHpBj5sVGruglTnePFxDlWSoeknTcI0d461ELz+l2
-rPyraiLMRud8qxLPorHQv/el35jYzatt2fPuGjNkB7Iq4LokT2cQ3Em1PKK+7ICk
-ZZK61G21eejcP9ymQWhDSjvBg+e2qUZsm+GzQoRniXkRb5S17fMjwu+IMRAk/2cV
-yMFeLSMQWDo5MjmDApWgf7WN5Nc/kBGqUi6DB3K3h6MI5O1scg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dbod.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dbod.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dbod.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dbod.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dbod.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dbod.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dbod.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dbod.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dbod.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dbod.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dbod.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dbod.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dbod.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dbod.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">DBoD</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">DBoD - Databases on Demand</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.dbod.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Falk</GivenName>
-    <SurName>Niederlein</SurName>
-    <EmailAddress>niederl@slub-dresden.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.degruyter.com-shibboleth.xml b/swamid-interfederations-2.0/www.degruyter.com-shibboleth.xml
deleted file mode 100644
index 1351110e..00000000
--- a/swamid-interfederations-2.0/www.degruyter.com-shibboleth.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.degruyter.com/shibboleth">
-  <!--
-		This is an OpenAthens SP for Walter de Gruyter GmbH & Co KG.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDGzCCAgOgAwIBAgIEJQQdIDANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDExF3
-						d3cuZGVncnV5dGVyLmNvbTAeFw0xNTAxMTUxNzE0MTdaFw0xODAyMDMxNzE0MTda
-						MBwxGjAYBgNVBAMTEXd3dy5kZWdydXl0ZXIuY29tMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEAl4aKz3klp19cqVt/ayGr+UGIOBaROpLPEKlZtCUVq4rE
-						/3X0LPEVOzmqWtxzRDhIsGBjuwgt1D/RFbY+1+YU3CL6B+wOOOBGOPcj1gr7ZLPK
-						GTODNErwJCjzslISqbK9d1vpg5yI84bb8+IpYLb0XmsIoOkldxRHbmgcpfwt9GSm
-						GngjsuMAbWc8L9a62iPeWlPBryCoYgQFH6FIhIACGJcrroP1+o+NZXFeQtbDXKCt
-						v1gWTAPHvY2qLfc6qa+6DX+qMcWydtm46nNWrtvfkeQVnUxr0DcB68UafGbB3Vbu
-						tbqU3afSodVKcsWgHaebgvoLhq/rmoeQ0PDPQVFKgwIDAQABo2UwYzBCBgNVHREE
-						OzA5ghF3d3cuZGVncnV5dGVyLmNvbYYkaHR0cHM6Ly93d3cuZGVncnV5dGVyLmNv
-						bS9zaGliYm9sZXRoMB0GA1UdDgQWBBSOhPCjGa1k6lBcSkwexlPasUaNjDANBgkq
-						hkiG9w0BAQsFAAOCAQEAFuKYNHwtCWU+iLXQRtat7nf0OpmjHiDwmi/BjVAt7OBZ
-						zsgXQdfPk13YxlHlf++tvUnw2MOaIudtwZaITXRK6tSJ/I00PzNjofLVjsonz33O
-						U5SmD94GNuBjcPJfvX7tHstOwlRYDmkIxMsdikfjyNLuahV0oRvh/igdKXH8ivv+
-						CYuKzYRYn4wW24lUwj3CGbieBfOvnnpUEhCxRPDD12vdlWxI0/RDZzyERg82nYI7
-						4YHNuVnvZuZuDKiJeM31WWr2LVjP15YoQ6S9lfsLo1NOHvlz/1/nV5y07MAHNEA1
-						sS0svq7Jyv+IC8DB2S6yhH1Ew5R4ufZ887dEvMlJCQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.degruyter.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.degruyter.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.degruyter.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.degruyter.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Walter de Gruyter GmbH &amp; Co KG</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Walter de Gruyter GmbH &amp; Co KG: De Gruyter Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.degruyter.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>De Gruyter Helpdesk</GivenName>
-    <EmailAddress>mailto:service@degruyter.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott</GivenName>
-    <SurName>Cipriano</SurName>
-    <EmailAddress>mailto:dgsupport@safaribooksonline.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Matt</GivenName>
-    <SurName>Warren</SurName>
-    <EmailAddress>mailto:dgsupport@safaribooksonline.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Harlan</GivenName>
-    <SurName>McCanne</SurName>
-    <EmailAddress>mailto:dgsupport@safaribooksonline.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>iFactory</GivenName>
-    <EmailAddress>mailto:dgsupport@safaribooksonline.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.degruyter.com.xml b/swamid-interfederations-2.0/www.degruyter.com.xml
deleted file mode 100644
index 1d104706..00000000
--- a/swamid-interfederations-2.0/www.degruyter.com.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.degruyter.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.degruyter.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.degruyter.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIEEpCtsTANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDExF3
-d3cuZGVncnV5dGVyLmNvbTAeFw0xMjAxMjcwMzE2MzBaFw0xNTAxMjYwMzE2MzBa
-MBwxGjAYBgNVBAMTEXd3dy5kZWdydXl0ZXIuY29tMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtToxdgbSOQHMFtLO+p50jHIis3Cg1n08fU8scnC5mGnm
-QKBb+io0YLFMZ+pGrYWl3nOr3lsVnSj+7FWTJYWlGqkGf4fW0htYxeLUYTmw17pg
-2yzjaKKmefQ5EX03dVnMmFfG6n4ITBms/xm28u3JRWmAZ8i4SUZhsZM1UAKmyddv
-DeF4P/MDOg+HotkEZzv8Ce0Iqf5xS2Gl2NvJuQBVQfROyXvC1UvWFPJry8Sp5izg
-nekjb87CWD/sHj/1/ih+t7KTKhyqPEcdywOYzVAlL28LNJm1Sx2T6b+qmxu0sLe8
-e0A7K8/Klevx0c+L+1apbh1vYVH4e3KN+mhsUbBSyQIDAQABo2UwYzAdBgNVHQ4E
-FgQUX0SLbR2HWLTt/d7PhuyMq4CVAD0wQgYDVR0RBDswOYYkaHR0cHM6Ly93d3cu
-ZGVncnV5dGVyLmNvbS9zaGliYm9sZXRoghF3d3cuZGVncnV5dGVyLmNvbTANBgkq
-hkiG9w0BAQsFAAOCAQEAM/uD1qjWNFP9lOUk48zRve2pIZIkq+lOr4JB7ORLUaLn
-UFIC3ay1JwSGEoaic0VA9kNGCfevUluMLZJfAtYYQkTx0hqF264tf8W2MdvaFlJa
-WwqciyEhs/Wg4daMUoSfCrKUwhwb3veY5nToqgJ5zJ/5sZYRdjzDH7PumH3klSG0
-e6FV3DgCekCajSBjOoQLjlcgseHXTX3/JguL9uyJVxMNPArbW6ciE7nCAXwg2neL
-klxijSNZsJQno36M5UueC9aLK4mdoJrS06CRLOeyxBNQachanmq6XBx/yWSeBBq5
-vxnuL36+AybWxM2JdPoPKWxXLxi9KgtY1Fw/Heyaug==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.degruyter.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.degruyter.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIEEpCtsTANBgkqhkiG9w0BAQsFADAcMRowGAYDVQQDExF3
-d3cuZGVncnV5dGVyLmNvbTAeFw0xMjAxMjcwMzE2MzBaFw0xNTAxMjYwMzE2MzBa
-MBwxGjAYBgNVBAMTEXd3dy5kZWdydXl0ZXIuY29tMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAtToxdgbSOQHMFtLO+p50jHIis3Cg1n08fU8scnC5mGnm
-QKBb+io0YLFMZ+pGrYWl3nOr3lsVnSj+7FWTJYWlGqkGf4fW0htYxeLUYTmw17pg
-2yzjaKKmefQ5EX03dVnMmFfG6n4ITBms/xm28u3JRWmAZ8i4SUZhsZM1UAKmyddv
-DeF4P/MDOg+HotkEZzv8Ce0Iqf5xS2Gl2NvJuQBVQfROyXvC1UvWFPJry8Sp5izg
-nekjb87CWD/sHj/1/ih+t7KTKhyqPEcdywOYzVAlL28LNJm1Sx2T6b+qmxu0sLe8
-e0A7K8/Klevx0c+L+1apbh1vYVH4e3KN+mhsUbBSyQIDAQABo2UwYzAdBgNVHQ4E
-FgQUX0SLbR2HWLTt/d7PhuyMq4CVAD0wQgYDVR0RBDswOYYkaHR0cHM6Ly93d3cu
-ZGVncnV5dGVyLmNvbS9zaGliYm9sZXRoghF3d3cuZGVncnV5dGVyLmNvbTANBgkq
-hkiG9w0BAQsFAAOCAQEAM/uD1qjWNFP9lOUk48zRve2pIZIkq+lOr4JB7ORLUaLn
-UFIC3ay1JwSGEoaic0VA9kNGCfevUluMLZJfAtYYQkTx0hqF264tf8W2MdvaFlJa
-WwqciyEhs/Wg4daMUoSfCrKUwhwb3veY5nToqgJ5zJ/5sZYRdjzDH7PumH3klSG0
-e6FV3DgCekCajSBjOoQLjlcgseHXTX3/JguL9uyJVxMNPArbW6ciE7nCAXwg2neL
-klxijSNZsJQno36M5UueC9aLK4mdoJrS06CRLOeyxBNQachanmq6XBx/yWSeBBq5
-vxnuL36+AybWxM2JdPoPKWxXLxi9KgtY1Fw/Heyaug==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.degruyter.com/oa/auth/rcv/shib/post" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.degruyter.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.degruyter.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.degruyter.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">De Gruyter Online</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">De Gruyter Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.degruyter.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Scott</GivenName>
-    <SurName>Cipriano</SurName>
-    <EmailAddress>it@ifactory.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ulrike</GivenName>
-    <SurName>Engel</SurName>
-    <EmailAddress>ulrike.engel@degruyter.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.demontfortstudents.com-shibboleth.xml b/swamid-interfederations-2.0/www.demontfortstudents.com-shibboleth.xml
deleted file mode 100644
index d261105f..00000000
--- a/swamid-interfederations-2.0/www.demontfortstudents.com-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://www.demontfortstudents.com/shibboleth">
-  <!--
-		This is a "De Montfort Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-01-21T11:30:00Z"/>
-  </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://www.demontfortstudents.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.demontfortstudents.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.demontfortstudents.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.demontfortstudents.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.demontfortstudents.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.demontfortstudents.com/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.demontfortstudents.com/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.demontfortstudents.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.demontfortstudents.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.demontfortstudents.com/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.demontfortstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">De Montfort Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.demontfortstudents.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dental-nursing.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.dental-nursing.co.uk-shibboleth.xml
deleted file mode 100644
index 19ebc3a5..00000000
--- a/swamid-interfederations-2.0/www.dental-nursing.co.uk-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://www.dental-nursing.co.uk/shibboleth">
-  <!--
-		This is a 'dental nursing' OpenAthens SP for MA Healthcare Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFHzCCBAegAwIBAgIJAO3bFAht6jveMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGzAZBgNV
-						BAoTEk1hIEhlYWx0aGNhcmUgTHRkLjEMMAoGA1UECxMDd2ViMSEwHwYDVQQDExh3
-						d3cuZGVudGFsLW51cnNpbmcuY28udWsxLTArBgkqhkiG9w0BCQEWHnRvbS5wb2xs
-						YXJkQG1hcmthbGxlbmdyb3VwLmNvbTAeFw0xMDA5MjExMDM3NDVaFw0yMDA5MTgx
-						MDM3NDVaMIGsMQswCQYDVQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQH
-						EwZMb25kb24xGzAZBgNVBAoTEk1hIEhlYWx0aGNhcmUgTHRkLjEMMAoGA1UECxMD
-						d2ViMSEwHwYDVQQDExh3d3cuZGVudGFsLW51cnNpbmcuY28udWsxLTArBgkqhkiG
-						9w0BCQEWHnRvbS5wb2xsYXJkQG1hcmthbGxlbmdyb3VwLmNvbTCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBANyYOQPecEPtsxn6zw2LIM3aorwo5lExVnFI
-						ZZXvSU6YssKuUOzEc2YLtdkF1nUksuSXC5I13aqj0z4757bd/xcJpS36KpEtr6Qe
-						qAkat7dHuT5sfjqyGGaQ7RRxKcIvMXMeW4V46XDegtEmwL1ilybvAzIx0fv5bm6P
-						z6lSev5EmRpAN+tou33hbVwrDd4Sds+UYoJHq1y0M7T+ovWhN1etHC77QVwX+NCz
-						kR4bCRpmAF4Lz7blaFkn+BuszCz2nyOnw0H+btbnSs3YaRrscSfctnjoAV2skiK2
-						MsIuBN1OmnKhFYkrBhxgOsdhKwLS5+/GZgDMTvBbI+0PCs/KcYsCAwEAAaOCAUAw
-						ggE8MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVk
-						IENlcnRpZmljYXRlMB0GA1UdDgQWBBSHeKW6zoDujt//wMKWMMY83Wu+TTCB4QYD
-						VR0jBIHZMIHWgBSHeKW6zoDujt//wMKWMMY83Wu+TaGBsqSBrzCBrDELMAkGA1UE
-						BhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRswGQYDVQQK
-						ExJNYSBIZWFsdGhjYXJlIEx0ZC4xDDAKBgNVBAsTA3dlYjEhMB8GA1UEAxMYd3d3
-						LmRlbnRhbC1udXJzaW5nLmNvLnVrMS0wKwYJKoZIhvcNAQkBFh50b20ucG9sbGFy
-						ZEBtYXJrYWxsZW5ncm91cC5jb22CCQDt2xQIbeo73jANBgkqhkiG9w0BAQUFAAOC
-						AQEAcwNLd3oH5qHpsb6IJj8nQYY2CBzbQ2MurKn1ME4aCAENQ+E1mzPDM3+sdvI9
-						tZhbgbGhMEfZ+Ck55X0D7bNdWR/991i3FLXUt/QcGRzsgo41QGcBWfNDIt4tU1Bj
-						WPx119cGSLnA6MAEpG2w0TPyPQPXmzVOd8XtXXAkbTpwQ6+LLFMyTWnVMGRY2HzP
-						B3nzmP0gQvMUK5zC8hwCRGNvM+qLJPeN1vEppQ43cRy9acpVmkgWerfABujpgNww
-						pg+A+ta/ABwVcOPREbpouH/ccqSN/mHOnjperu+vPGm9xSA+r9owsHziQC9/mZIQ
-						RCLd7MNy18GIZyYDwbGO+7anbA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dental-nursing.co.uk/auth/rcv/ukfed" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dental-nursing.co.uk/auth/rcv/ukfed" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">MA Healthcare Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MA Healthcare Limited: dental-nursing.co.uk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dental-nursing.co.uk/about.shtml</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tom</GivenName>
-    <SurName>Pollard</SurName>
-    <EmailAddress>mailto:tom.pollard@markallengroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Hillman</SurName>
-    <EmailAddress>mailto:tim.hillman@fsite.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.digicert.com-sso.xml b/swamid-interfederations-2.0/www.digicert.com-sso.xml
deleted file mode 100644
index 8adf522f..00000000
--- a/swamid-interfederations-2.0/www.digicert.com-sso.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://www.digicert.com/sso">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2015-04-09T08:51:55Z"/>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="false" 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">GÉANT Trusted Certificate Service (TCS)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Members from TCS-subscribing institutions can request personal, e-science personal, and e-science robot certificates here.</mdui:Description>
-        <mdui:Logo height="58" width="224">https://www.digicert.com/images/d3/digicert-logo.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>MIIFHzCCBAegAwIBAgIQDSPffA+3kdjXI6kqvoyBtDANBgkqhkiG9w0BAQsFADBl
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBTSEEyIEFzc3VyZWQg
-SUQgQ0EwHhcNMTUwNDA3MDAwMDAwWhcNMTgwNzA1MTIwMDAwWjBtMQswCQYDVQQG
-EwJVUzENMAsGA1UECBMEVXRhaDENMAsGA1UEBxMETGVoaTEXMBUGA1UEChMORGln
-aUNlcnQsIEluYy4xJzAlBgNVBAMTHkRpZ2lDZXJ0IFNBTUwgU2VydmljZSBQcm92
-aWRlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN/+/QfL6NXaO4Ob
-gIzarBuLusqybTeFB5aRQRaTjYUGwTxbVSZWcKZFrfoki0InkQ4ez4+NGTglmObF
-AUXafigKICJx7D1LzKfHSETIZmxODC7ztS1LAEa2YF+bSny+UqjC8iBpVSnOPuzY
-emIntQGlgTC60QbGZ4jWGpAh/E4vuV+1ZEJlBMdo8OyVX7OKLqx0IZYnc5Ms8Q+P
-8fQVAMmmkxqnDWQJG7+Dg95Ir8yP9IqBPFgW/oYmiiu9hJgg5Fw79FRVSbR4AM7m
-H43grZdYwh2QhiBHe1RNMqSq8iqwRfQdgHCaXvTrAYRetXPAYl2aDZ5v+hiwYFeU
-Da+yfCECAwEAAaOCAcEwggG9MB8GA1UdIwQYMBaAFOcCI4AAT9jXvJQL2T90OUky
-PIp5MB0GA1UdDgQWBBTSQiXTihRDi2udzXW9NIwsexMenTAMBgNVHRMBAf8EAjAA
-MA4GA1UdDwEB/wQEAwIEsDATBgNVHSUEDDAKBggrBgEFBQcDAjBCBgNVHSAEOzA5
-MDcGCWCGSAGG/WwGATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2Vy
-dC5jb20vQ1BTMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0cDovL2NybDMuZGlnaWNl
-cnQuY29tL0RpZ2lDZXJ0U0hBMkFzc3VyZWRJRENBLWcxLmNybDA9oDugOYY3aHR0
-cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMkFzc3VyZWRJRENBLWcx
-LmNybDB5BggrBgEFBQcBAQRtMGswJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRp
-Z2ljZXJ0LmNvbTBDBggrBgEFBQcwAoY3aHR0cDovL2NhY2VydHMuZGlnaWNlcnQu
-Y29tL0RpZ2lDZXJ0U0hBMkFzc3VyZWRJRENBLmNydDANBgkqhkiG9w0BAQsFAAOC
-AQEAza2jiq0WUEas3Ou70GkX9A2U9IkgFhYj7LsR2hxfwlnl/vDvHHxzZWuOJLIR
-YN4VEY6B+/vl8P2p2OdjIMATba5rqMmho+UkF7p7I0Auwc18oQ9fzZRq8ul+xtIX
-OiC2mZ2dG5VUXk1eR7qAKafGoNkOWzY6K0yb7NlUtGQDbZ5kBUqxH7z1uIPtjEBx
-jv9ka0zHozKT+/vtNbAta7iuQtM05y2fSjXLeGpcTxnootfcFJtbpxiODd77a1Ax
-0b2CWHv1aZaDQHlMjsf1ZaVPjHkgLlTFAtgzceimrdGM7PM/EHUFHP94H1EggcYt
-n4mgYE+xr/VoR6tzNtvfyLXqxA==</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>MIIFHzCCBAegAwIBAgIQDSPffA+3kdjXI6kqvoyBtDANBgkqhkiG9w0BAQsFADBl
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBTSEEyIEFzc3VyZWQg
-SUQgQ0EwHhcNMTUwNDA3MDAwMDAwWhcNMTgwNzA1MTIwMDAwWjBtMQswCQYDVQQG
-EwJVUzENMAsGA1UECBMEVXRhaDENMAsGA1UEBxMETGVoaTEXMBUGA1UEChMORGln
-aUNlcnQsIEluYy4xJzAlBgNVBAMTHkRpZ2lDZXJ0IFNBTUwgU2VydmljZSBQcm92
-aWRlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN/+/QfL6NXaO4Ob
-gIzarBuLusqybTeFB5aRQRaTjYUGwTxbVSZWcKZFrfoki0InkQ4ez4+NGTglmObF
-AUXafigKICJx7D1LzKfHSETIZmxODC7ztS1LAEa2YF+bSny+UqjC8iBpVSnOPuzY
-emIntQGlgTC60QbGZ4jWGpAh/E4vuV+1ZEJlBMdo8OyVX7OKLqx0IZYnc5Ms8Q+P
-8fQVAMmmkxqnDWQJG7+Dg95Ir8yP9IqBPFgW/oYmiiu9hJgg5Fw79FRVSbR4AM7m
-H43grZdYwh2QhiBHe1RNMqSq8iqwRfQdgHCaXvTrAYRetXPAYl2aDZ5v+hiwYFeU
-Da+yfCECAwEAAaOCAcEwggG9MB8GA1UdIwQYMBaAFOcCI4AAT9jXvJQL2T90OUky
-PIp5MB0GA1UdDgQWBBTSQiXTihRDi2udzXW9NIwsexMenTAMBgNVHRMBAf8EAjAA
-MA4GA1UdDwEB/wQEAwIEsDATBgNVHSUEDDAKBggrBgEFBQcDAjBCBgNVHSAEOzA5
-MDcGCWCGSAGG/WwGATAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2Vy
-dC5jb20vQ1BTMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0cDovL2NybDMuZGlnaWNl
-cnQuY29tL0RpZ2lDZXJ0U0hBMkFzc3VyZWRJRENBLWcxLmNybDA9oDugOYY3aHR0
-cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0U0hBMkFzc3VyZWRJRENBLWcx
-LmNybDB5BggrBgEFBQcBAQRtMGswJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRp
-Z2ljZXJ0LmNvbTBDBggrBgEFBQcwAoY3aHR0cDovL2NhY2VydHMuZGlnaWNlcnQu
-Y29tL0RpZ2lDZXJ0U0hBMkFzc3VyZWRJRENBLmNydDANBgkqhkiG9w0BAQsFAAOC
-AQEAza2jiq0WUEas3Ou70GkX9A2U9IkgFhYj7LsR2hxfwlnl/vDvHHxzZWuOJLIR
-YN4VEY6B+/vl8P2p2OdjIMATba5rqMmho+UkF7p7I0Auwc18oQ9fzZRq8ul+xtIX
-OiC2mZ2dG5VUXk1eR7qAKafGoNkOWzY6K0yb7NlUtGQDbZ5kBUqxH7z1uIPtjEBx
-jv9ka0zHozKT+/vtNbAta7iuQtM05y2fSjXLeGpcTxnootfcFJtbpxiODd77a1Ax
-0b2CWHv1aZaDQHlMjsf1ZaVPjHkgLlTFAtgzceimrdGM7PM/EHUFHP94H1EggcYt
-n4mgYE+xr/VoR6tzNtvfyLXqxA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digicert.com/sso/saml/SingleLogout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.digicert.com/sso/saml/SingleLogout"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</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:X509SubjectName</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digicert.com/sso/saml/SSO" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.digicert.com/sso/saml/SSO" index="1"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">DigiCert's TCS Portal</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="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">
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">urn:mace:terena.org:tcs:personal-user</saml:AttributeValue>
-        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">urn:mace:terena.org:tcs:escience-user</saml:AttributeValue>
-      </md:RequestedAttribute>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">DigiCert Inc.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">DigiCert</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.digicert.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>DigiCert</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@digicert.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>GÉANT</md:GivenName>
-    <md:SurName>TCS Policy Management Authority</md:SurName>
-    <md:EmailAddress>mailto:tcs-pma@terena.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>DigiCert</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@digicert.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml b/swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.xml
deleted file mode 100644
index 98c99114..00000000
--- a/swamid-interfederations-2.0/www.digitalmeasures.com-shibboleth-sp-.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.digitalmeasures.com/shibboleth-sp/">
-  <!--
-		This is a Shibboleth SP for Digital Measures, LLC.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEwTCCA6mgAwIBAgIJAI9+wkih8GQMMA0GCSqGSIb3DQEBBQUAMIGbMQswCQYD
-						VQQGEwJVUzESMBAGA1UECBMJV2lzY29uc2luMRIwEAYDVQQHEwlNaWx3YXVrZWUx
-						GTAXBgNVBAoTEERpZ2l0YWwgTWVhc3VyZXMxIDAeBgNVBAMTF3d3dy5kaWdpdGFs
-						bWVhc3VyZXMuY29tMScwJQYJKoZIhvcNAQkBFhh0ZWNoQGRpZ2l0YWxtZWFzdXJl
-						cy5jb20wHhcNMDkxMjAyMTg1NTAzWhcNMTkxMTMwMTg1NTAzWjCBmzELMAkGA1UE
-						BhMCVVMxEjAQBgNVBAgTCVdpc2NvbnNpbjESMBAGA1UEBxMJTWlsd2F1a2VlMRkw
-						FwYDVQQKExBEaWdpdGFsIE1lYXN1cmVzMSAwHgYDVQQDExd3d3cuZGlnaXRhbG1l
-						YXN1cmVzLmNvbTEnMCUGCSqGSIb3DQEJARYYdGVjaEBkaWdpdGFsbWVhc3VyZXMu
-						Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApdU5Pa3MRsljSruF
-						+oUUNr7KAUeRh8kJRdvHQIUQKDrLUrgGDJxVFEd4kAO0jd+cljJ+Ks8blQtZpqz3
-						8HBpwDV1p5Vh+pne0p6lUCiUY9ZhqC7b6nZhuZMJGsROfYcnzS4fYrLV8MmTJ4hU
-						CDfyIXCLIlNAwuOwRLWJ6Kg3C9vOdP72z0BWxGzFUsNMSixWVSl5hcehkPskezLd
-						sHZFC1bfTWrmIuVdvKRp1XWnqC0Ha6HyAXfkKosWg9f71KCMwpTKqXwtj47cXMgA
-						wmShTH8OwQ1C2rXxVPWzNjfE5xFI/7Fo26mftzQGwkJ2laaRbioygZhGgpfEP1Mk
-						Z0a0swIDAQABo4IBBDCCAQAwHQYDVR0OBBYEFHyhAmBoAKyaxI2a6+6vknnzbtI0
-						MIHQBgNVHSMEgcgwgcWAFHyhAmBoAKyaxI2a6+6vknnzbtI0oYGhpIGeMIGbMQsw
-						CQYDVQQGEwJVUzESMBAGA1UECBMJV2lzY29uc2luMRIwEAYDVQQHEwlNaWx3YXVr
-						ZWUxGTAXBgNVBAoTEERpZ2l0YWwgTWVhc3VyZXMxIDAeBgNVBAMTF3d3dy5kaWdp
-						dGFsbWVhc3VyZXMuY29tMScwJQYJKoZIhvcNAQkBFhh0ZWNoQGRpZ2l0YWxtZWFz
-						dXJlcy5jb22CCQCPfsJIofBkDDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-						A4IBAQAeUkRH04tZvqAcBCxmQyRdIDEvBw8+IG6zzL8Ap4dJLSBc4D9uUZtIq8Xu
-						ZDnrOcQ9O2Udsno523aONEOsiCTazJRhNJKTGkXXeQiJhGnzXmOokkIeGJI9efNJ
-						4GAVI9ZrxEh+ZgKQpLuZpCO+d/RwKqtbOJWL8u4QccYH2stK1dO4M6yUe7b9PnwP
-						F2HUBMtW7B3xfRZyy1qQTpJ3oVp2nPTDtStIioPuqB1y+sl76jR503ABPnz77wyV
-						vh8D4o/W5q32axmmKH3s85TeSyUoQ4RS7/NgsjYQI7lnODeVSgWcUl1+c+NfPNiu
-						1vpIbPTlEVEvmNPl69Zi3A9T7I/p
-					</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>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digitalmeasures.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.digitalmeasures.com/Shibboleth.sso/SAML/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://digitalmeasures.com/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://digitalmeasures.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://beta.digitalmeasures.com/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.digitalmeasures.com/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Digital Measures, LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Measures</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.digitalmeasures.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Digital Measures</GivenName>
-    <EmailAddress>mailto:info@digitalmeasures.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Digital Measures</GivenName>
-    <EmailAddress>mailto:info@digitalmeasures.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.digitaltheatreplus.com.xml b/swamid-interfederations-2.0/www.digitaltheatreplus.com.xml
deleted file mode 100644
index c3938e79..00000000
--- a/swamid-interfederations-2.0/www.digitaltheatreplus.com.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.digitaltheatreplus.com">
-  <!--
-		This is a "Digital Theatre Plus" SP for Digital Theatre.com Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-20T14:56:14Z">
-      <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.digitaltheatreplus.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="60" width="104">https://digitaltheatreplus.com/sites/all/themes/digitaltheatreplus/images/logo.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">Digital Theatre Plus</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDSzCCAjOgAwIBAgIJAIF+/2SALpqQMA0GCSqGSIb3DQEBBQUAMDcxNTAzBgNV
-						BAMTLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFs
-						MB4XDTE1MDMwNTE2NTAzM1oXDTI1MDMwMjE2NTAzM1owNzE1MDMGA1UEAxMsaXAt
-						MTAtMjEwLTEzMC0xODUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWwwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUhOG8fAf1z+P4MxfipVuLI7gGaTbn
-						XRjaqUcvn3q2RfG7uFflGdgTNPESECxFlRhQB9t8r6kP73HpmlDWAb1cK0iTfbVX
-						YzKQRZJZuYyk6dTR8Q+ipKA9VwzWCQC4HtFUxrGJJPqUesLUSxmPjwsjQzOdQPVQ
-						jB17OYwNSi5lCehWi6kyRpBNmPbB9Vjvx0PtaEe9OFoFOz93hBT6E7rnK6WJ1OSx
-						ATS6uWOtIwJIBfc1gCtX3L0OLFIEjBXTfoUDhfOJg/VTdudTVDbdy9sI/y9oa1CM
-						oV5dmFGEmNiCJ+WyVnt0ItkoQ9j1ZT+bw/FVJXFTRSDhDL9NlNsdFz03AgMBAAGj
-						WjBYMDcGA1UdEQQwMC6CLGlwLTEwLTIxMC0xMzAtMTg1LmV1LXdlc3QtMS5jb21w
-						dXRlLmludGVybmFsMB0GA1UdDgQWBBSfagScxn6u6P0+nvmQwcSLk2XrdDANBgkq
-						hkiG9w0BAQUFAAOCAQEAlfdHL72URS71sqrZUfUiUWKHcJU1cfkO2Ekl/zhgRPrS
-						7FgP1HUYc9mRbceXJYqq38SSKDPANt3dIj+qeauUh7CNDSTm8pPmjrTaGYZCmOvV
-						STobyosM7a+CJgZvE9Ys7tVlsbainrET0agTjUWOUE3LOvBgUqPUkbbE8QIgmRa2
-						62dtMf95WBmt6OJkXmLcBwUVK+1NsOfGN4cg6ekrKqNU4+FobK6Vet2jY6cfLWET
-						fYj5FNoRpffRMQ9+MNEm/aK+SFpy1nXtc1XtD1sEqtnLGiIQMUhgEtvnas82T1f1
-						rxodZ8fzQWvmeZ7qOiheeiTxu5Fwylj1xVBJ7suMMQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.digitaltheatreplus.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Digital Theatre.com Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Theatre Plus</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.digitaltheatreplus.com/about-us</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jonathan</GivenName>
-    <SurName>Ware</SurName>
-    <EmailAddress>mailto:support@digitaltheatre.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Carly</GivenName>
-    <SurName>Britton</SurName>
-    <EmailAddress>mailto:support@vualto.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.dl.begellhouse.com-shibboleth.xml b/swamid-interfederations-2.0/www.dl.begellhouse.com-shibboleth.xml
deleted file mode 100644
index 67aeb0ca..00000000
--- a/swamid-interfederations-2.0/www.dl.begellhouse.com-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://www.dl.begellhouse.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Begell House Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDATCCAemgAwIBAgIBADANBgkqhkiG9w0BAQUFADAhMR8wHQYDVQQDExZ3d3cu
-						ZGwuYmVnZWxsaG91c2UuY29tMB4XDTA5MTEwMjE3MzYzNVoXDTE5MTAzMTE3MzYz
-						NVowITEfMB0GA1UEAxMWd3d3LmRsLmJlZ2VsbGhvdXNlLmNvbTCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMuFDBpujB8wIt6HdNkuWSn9PBX2obMNrsqY
-						NMHFPRNP0t8T7NwuOm9qRbvL/W+ViiVCAphbJK5BdgQBQd1O/S90ViBuPGQ3INVg
-						uLiWiuon37yUb/pAhn/4tSi8rEv5LYJmwvmZmJSV8gBwb03i1LYGb2aF3nGqffNy
-						TiObBhFOUaoyWBi+X4+MQT8DHyV9T1E9mTXDsWGPm2hb5htSxloDgrnqrVFhShzv
-						LtV4+4ksGTA/GRNriuYgcpiB1PEvnMfiVASysOOKWojEEQ3U0e2Q2lyEiczH+MFL
-						OkmrUMbYPXxNdck9mhREPbckZbJasKHGetDoy4XsHh5DyRl102kCAwEAAaNEMEIw
-						IQYDVR0RBBowGIIWd3d3LmRsLmJlZ2VsbGhvdXNlLmNvbTAdBgNVHQ4EFgQUD6sj
-						78W4QOa1Vp52Ui0rw8eeb2EwDQYJKoZIhvcNAQEFBQADggEBAADoC2XeOIaCYrC8
-						6tWbcuSq6trWxyTDH+Vz5Pe6cR+UVwsaQ2/3NAzqxQ2gZRJU2A/UoFoC9CuiBvv9
-						XenHkZu3a8wRoG1SxhrNkC98D4o4wxp0IlU7R2KEJte+UHLNZ1Om0EjHkva1JrB1
-						UV+o7xI8AFxu3Ym9m5UW7mqs2eo29xbkJ+TEyW/SifXkp9kowFPGyQlfFY14x3Xb
-						Dftb5D+IXvsPJAVKfqiMUuDN5r4JtrEnhx4J2QrC2OF061JTrDINitdSN+k1cAhO
-						P4j8jBZlm09UY2vIfbVGHkXfF2bY8oUHwtJvdrJNOfQMcAabjX4JjAXtzPoylgQ7
-						dbHMS9g=
-					</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>
-						MIIDATCCAemgAwIBAgIBADANBgkqhkiG9w0BAQUFADAhMR8wHQYDVQQDExZ3d3cu
-						ZGwuYmVnZWxsaG91c2UuY29tMB4XDTA5MTEwMjE3MzYzNVoXDTE5MTAzMTE3MzYz
-						NVowITEfMB0GA1UEAxMWd3d3LmRsLmJlZ2VsbGhvdXNlLmNvbTCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMuFDBpujB8wIt6HdNkuWSn9PBX2obMNrsqY
-						NMHFPRNP0t8T7NwuOm9qRbvL/W+ViiVCAphbJK5BdgQBQd1O/S90ViBuPGQ3INVg
-						uLiWiuon37yUb/pAhn/4tSi8rEv5LYJmwvmZmJSV8gBwb03i1LYGb2aF3nGqffNy
-						TiObBhFOUaoyWBi+X4+MQT8DHyV9T1E9mTXDsWGPm2hb5htSxloDgrnqrVFhShzv
-						LtV4+4ksGTA/GRNriuYgcpiB1PEvnMfiVASysOOKWojEEQ3U0e2Q2lyEiczH+MFL
-						OkmrUMbYPXxNdck9mhREPbckZbJasKHGetDoy4XsHh5DyRl102kCAwEAAaNEMEIw
-						IQYDVR0RBBowGIIWd3d3LmRsLmJlZ2VsbGhvdXNlLmNvbTAdBgNVHQ4EFgQUD6sj
-						78W4QOa1Vp52Ui0rw8eeb2EwDQYJKoZIhvcNAQEFBQADggEBAADoC2XeOIaCYrC8
-						6tWbcuSq6trWxyTDH+Vz5Pe6cR+UVwsaQ2/3NAzqxQ2gZRJU2A/UoFoC9CuiBvv9
-						XenHkZu3a8wRoG1SxhrNkC98D4o4wxp0IlU7R2KEJte+UHLNZ1Om0EjHkva1JrB1
-						UV+o7xI8AFxu3Ym9m5UW7mqs2eo29xbkJ+TEyW/SifXkp9kowFPGyQlfFY14x3Xb
-						Dftb5D+IXvsPJAVKfqiMUuDN5r4JtrEnhx4J2QrC2OF061JTrDINitdSN+k1cAhO
-						P4j8jBZlm09UY2vIfbVGHkXfF2bY8oUHwtJvdrJNOfQMcAabjX4JjAXtzPoylgQ7
-						dbHMS9g=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.dl.begellhouse.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.dl.begellhouse.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dl.begellhouse.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dl.begellhouse.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.dl.begellhouse.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Begell House Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Begell House Digital Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dl.begellhouse.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Begell House Help Desk</GivenName>
-    <EmailAddress>mailto:orders@begellhouse.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alex</GivenName>
-    <SurName>Judin</SurName>
-    <EmailAddress>mailto:alex@offsiteteam.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml b/swamid-interfederations-2.0/www.e-lawstudent.com-shibboleth.xml
deleted file mode 100644
index 0415a3b6..00000000
--- a/swamid-interfederations-2.0/www.e-lawstudent.com-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://www.e-lawstudent.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for e-lawstudent.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <Extensions>
-      <init: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.elawstudent.com/Shibboleth.sso/WAYF/UKFederation"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJAJlseYQQY0a6MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3M0MC5jYWxsaWR1czAwMS5uZXQwHhcNMTEwODI5MDk0OTI5WhcNMjEwODI2
-						MDk0OTI5WjAeMRwwGgYDVQQDExNzNDAuY2FsbGlkdXMwMDEubmV0MIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1eUIR/msK6qUkytHjlDDNix9MOeBQYFc
-						zz5ZPvTepv3We7/eKWU2mEkISXjuLproiSGl7gZqDP9mxeqkZXj8oyOpZRgFOtWn
-						EzmAIH7LWJPClMcupHw9RL2IZ9fNOfqVjXiVnQYefYZg4yT5jVJNDIgLnxQRqw9M
-						xPllqf6kIsNqzTA6QuMzyPJtSQ3OreU3pxFBj+sRHwlcXQkWdNLS3Axc7BpMFswK
-						OHUva8CT1ZPM2lblcNxgXpzLzFGemW/gwOlXVJvpWiEzjvsX2Cv5VTG5iwyOTraD
-						c3bGtUbAnyYRrIZIX8Pbide8htHOkRlzDWlKyNBQYMgspbGyuu899wIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNzNDAuY2FsbGlkdXMwMDEubmV0MB0GA1UdDgQWBBTu83Y4
-						lye8+8s6OPUR7SK51J0jfTANBgkqhkiG9w0BAQUFAAOCAQEAYiq3EmHidGJT7i8l
-						vi/U4H+pi3ih8kSCu/TNZ2QLbjZYgrVJzQGOZImHZE8LDV2aNBvbiM/Il3Va52F4
-						NEHbx4dIlEx4SEqeaSd0FUyvOdv79JgvoIk3pMbox0TLeowslIbSkmrW00Y6gKOk
-						r7doWnBKNiAjDU6s37sUiOl6UUIxtJI4PcM7oed7T7vkR72iyK/m1Pw+E84Tu8wF
-						77NVal8Al4NNNeWepX7XLqifjoZ7rgdeAr9LWAakjnNs0r++hxOaKGdB6UBA3bDE
-						KmpxYZDCeeCRX2kzgxVvOCSh/EIu6FSVtYogyMJcTJhfjpIP9c++PnmKaXvvrdku
-						k7tDPQ==
-					</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.elawstudent.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.elawstudent.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.elawstudent.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elawstudent.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elawstudent.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.elawstudent.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.elawstudent.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elawstudent.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elawstudent.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elawstudent.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.elawstudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elawstudent.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.elawstudent.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.elawstudent.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.elawstudent.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">e-lawstudent</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">e-lawstudent</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.e-lawstudent.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Naylor</SurName>
-    <EmailAddress>mailto:simon@e-lawstudent.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Naylor</SurName>
-    <EmailAddress>mailto:simon@e-lawstudent.com</EmailAddress>
-  </ContactPerson>
-</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 c0cc3a18..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ebi.ac.uk/ega/">
-  <md: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>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md: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="fi">European Genome-phenome Archive on EMBL-EBI:n ylläpitämä datan arkistointi- ja jakopalvelu  biolääketieteen tutkimusprojekteille.</mdui:Description>
-        <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: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>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </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://www.ebi.ac.uk/ega/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">European Genome-phenome Archive</md:ServiceName>
-      <md:ServiceName xml:lang="en">The European Genome-phenome Archive</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">European Genome-phenome Archive on EMBL-EBI:n yllapitama datan arkistointi- ja jakopalvelu  biolaaketieteen tutkimusprojekteille.</md:ServiceDescription>
-      <md: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.</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"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">EMBL-EBI    European Bioinformatics Institute</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">EMBL-EBI    European Bioinformatics Institute</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">EMBL-EBI    European Bioinformatics Institute</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">EMBL-EBI    European Bioinformatics Institute</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">EMBL-EBI    European Bioinformatics Institute</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">EMBL-EBI    European Bioinformatics Institute</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.ebi.ac.uk/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.ebi.ac.uk/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.ebi.ac.uk/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jag</md:GivenName>
-    <md:SurName>Kandasamy</md:SurName>
-    <md:EmailAddress>mailto:kandaj@ebi.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Jag</md:GivenName>
-    <md:SurName>Kandasamy</md:SurName>
-    <md:EmailAddress>mailto:kandaj@ebi.ac.uk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.edgehillsu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.edgehillsu.org.uk-shibboleth.xml
deleted file mode 100644
index 9bb4d8cc..00000000
--- a/swamid-interfederations-2.0/www.edgehillsu.org.uk-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://www.edgehillsu.org.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2 SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://www.edgehillsu.org.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Membership Solutions Limited: Edge Hill Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.edgehillsu.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
deleted file mode 100644
index c5ed93a4..00000000
--- a/swamid-interfederations-2.0/www.eenet.ee-sso-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.eenet.ee/sso/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eenet.ee</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAL8V44uRwtZlMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJFRTERMA8GA1UECAwIVGFydHVtYWExDjAMBgNVBAcMBVRhcnR1MQ4wDAYDVQQKDAVFRU5ldDEZMBcGA1UECwwQVGVlbnVzdGUgb3Nha29uZDEVMBMGA1UEAwwMZWVuZXQuZWUvc3NvMSAwHgYJKoZIhvcNAQkBFhF0ZWVudXNlZEBlZW5ldC5lZTAeFw0xNDA0MTAxMzMyMTlaFw0xNjA0MDkxMzMyMTlaMIGUMQswCQYDVQQGEwJFRTERMA8GA1UECAwIVGFydHVtYWExDjAMBgNVBAcMBVRhcnR1MQ4wDAYDVQQKDAVFRU5ldDEZMBcGA1UECwwQVGVlbnVzdGUgb3Nha29uZDEVMBMGA1UEAwwMZWVuZXQuZWUvc3NvMSAwHgYJKoZIhvcNAQkBFhF0ZWVudXNlZEBlZW5ldC5lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKRokXu5lU7Ht1qMlNqn4uyVFxKbzZpMthYLDdDN2XKfwtRfHaqoNOtEA5XFgXkMtCk5jASiyfLtLG9ZffWozyf7MwBfGO55F2OoDGoxqn23McGRYAeJnJOPnlEvOtqV9Ywrjm5quJMASFA+l/fd/wudNjPDeWP+/mmPUdgqAFwLdOFoUumMK8sY4yDri8I3+RZ74XiMPtXCkBfh2r95XN3S7bvLIolfYEz9Km0ueUcpOWkC1OBkzRNVJ2gbyNAtnZNolPyDjGkSC6oBZOSrFIJyXOQ0BinNQAK1Ivq2KSbFjnp1gES0hRGh2RF1unRhY0BURchaURptnpIEfNy6mJ0CAwEAAaNQME4wHQYDVR0OBBYEFF33AAHwuQmPiWuUC0qGGEwQenDxMB8GA1UdIwQYMBaAFF33AAHwuQmPiWuUC0qGGEwQenDxMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAH71wB1C0RbW5lCiNM6ne0siOKjSxTVcSOU+tSw4lNhdMUJAh/sNOU22EeVGg2So6hhykPb+aMg9SWfFlWX63cfCw4eqNF+4uebIfkaaisTOpctQ8lazqpmNmz3ZoQo9Plrb9tgXCbfgr2gLJNfEVEo2kXqj99CstPos2QI1ZgyPu6MKz1UruCF/9A6h+G1hyn1/DPACiflLKPa0j2vAT7EgrgrRJe8St2dErlNw6bDQw6Q2MffEUHiSgYPIlmwbbdMzSZxydHZYiIO/7IGHW9UpgsxALHdiv6eFSokDRLMA43GabagHN4pFLgum33HWjnM/mRVhSoLo/d5bq02jEHY=</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>MIID/TCCAuWgAwIBAgIJAL8V44uRwtZlMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJFRTERMA8GA1UECAwIVGFydHVtYWExDjAMBgNVBAcMBVRhcnR1MQ4wDAYDVQQKDAVFRU5ldDEZMBcGA1UECwwQVGVlbnVzdGUgb3Nha29uZDEVMBMGA1UEAwwMZWVuZXQuZWUvc3NvMSAwHgYJKoZIhvcNAQkBFhF0ZWVudXNlZEBlZW5ldC5lZTAeFw0xNDA0MTAxMzMyMTlaFw0xNjA0MDkxMzMyMTlaMIGUMQswCQYDVQQGEwJFRTERMA8GA1UECAwIVGFydHVtYWExDjAMBgNVBAcMBVRhcnR1MQ4wDAYDVQQKDAVFRU5ldDEZMBcGA1UECwwQVGVlbnVzdGUgb3Nha29uZDEVMBMGA1UEAwwMZWVuZXQuZWUvc3NvMSAwHgYJKoZIhvcNAQkBFhF0ZWVudXNlZEBlZW5ldC5lZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKRokXu5lU7Ht1qMlNqn4uyVFxKbzZpMthYLDdDN2XKfwtRfHaqoNOtEA5XFgXkMtCk5jASiyfLtLG9ZffWozyf7MwBfGO55F2OoDGoxqn23McGRYAeJnJOPnlEvOtqV9Ywrjm5quJMASFA+l/fd/wudNjPDeWP+/mmPUdgqAFwLdOFoUumMK8sY4yDri8I3+RZ74XiMPtXCkBfh2r95XN3S7bvLIolfYEz9Km0ueUcpOWkC1OBkzRNVJ2gbyNAtnZNolPyDjGkSC6oBZOSrFIJyXOQ0BinNQAK1Ivq2KSbFjnp1gES0hRGh2RF1unRhY0BURchaURptnpIEfNy6mJ0CAwEAAaNQME4wHQYDVR0OBBYEFF33AAHwuQmPiWuUC0qGGEwQenDxMB8GA1UdIwQYMBaAFF33AAHwuQmPiWuUC0qGGEwQenDxMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAH71wB1C0RbW5lCiNM6ne0siOKjSxTVcSOU+tSw4lNhdMUJAh/sNOU22EeVGg2So6hhykPb+aMg9SWfFlWX63cfCw4eqNF+4uebIfkaaisTOpctQ8lazqpmNmz3ZoQo9Plrb9tgXCbfgr2gLJNfEVEo2kXqj99CstPos2QI1ZgyPu6MKz1UruCF/9A6h+G1hyn1/DPACiflLKPa0j2vAT7EgrgrRJe8St2dErlNw6bDQw6Q2MffEUHiSgYPIlmwbbdMzSZxydHZYiIO/7IGHW9UpgsxALHdiv6eFSokDRLMA43GabagHN4pFLgum33HWjnM/mRVhSoLo/d5bq02jEHY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eenet.ee/sso/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://www.eenet.ee/sso/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="et">Eesti Hariduse ja Teaduse Andmesidevõrk</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Estonian Education and Research Network</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="et">EENet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">EENet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="et">http://www.eenet.ee</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.eenet.ee/EENet/EENet_en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>TAAT</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml
deleted file mode 100644
index 3a942085..00000000
--- a/swamid-interfederations-2.0/www.eki.ee-simplesamlphp-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.eki.ee/simplesamlphp/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://taat.edu.ee">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://taat.edu.ee/main/documents/?lang=en</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAuthnRequestsSigned="true">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eki.ee</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEATCCAumgAwIBAgIJAI3wX7QGR8zIMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYDVQQGEwJFRTERMA8GA1UECAwISGFyanVtYWExEDAOBgNVBAcMB1RhbGxpbm4xHjAcBgNVBAoMFUVlc3RpIGtlZWxlIGluc3RpdHV1dDELMAkGA1UECwwCSVQxEzARBgNVBAMMCnd3dy5la2kuZWUxIDAeBgkqhkiG9w0BCQEWEWhvc3RtYXN0ZXJAZWtpLmVlMB4XDTE1MTExNjA4NTIxOFoXDTI1MTExNTA4NTIxOFowgZYxCzAJBgNVBAYTAkVFMREwDwYDVQQIDAhIYXJqdW1hYTEQMA4GA1UEBwwHVGFsbGlubjEeMBwGA1UECgwVRWVzdGkga2VlbGUgaW5zdGl0dXV0MQswCQYDVQQLDAJJVDETMBEGA1UEAwwKd3d3LmVraS5lZTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckBla2kuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNFkW//HeZavdiSmGpYPuvegVRmJ//nH1s0O3uSw1x1zNpcAU2exr/G07GnkQp7eFdtbdL7L83o9b7zdXH0d3JfOH8sy9PbzVhXDG8BwDh1NPoqGFS2KVFNTlpKVmrL3AAkOZMBqrVPCaYIZ24SC4AF8IizT21JvGxR87gCS9gG35jcRyYef6I/J4Pm374w532/y05v0qVNqkR9hZbWI7KobX4J+gmhPf3mT3f+TA1W+F4oEcWxCKc8mvM8QB2PsK6Js5HK3geyRc6eVuUuP+ycvzsTAEmx3/lbzOrlkcC9YYCuN9C0s+rmQHuH6bVh+4sFnEJGlOATSD56tI122zRAgMBAAGjUDBOMB0GA1UdDgQWBBSEfr5fEP+UKF70EkqGBhFcSPffbjAfBgNVHSMEGDAWgBSEfr5fEP+UKF70EkqGBhFcSPffbjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCVBsuS6cB3LObsk+lfapZLPtr/3W+DNC3mUmvUxBEuYdgrdP/JfAUcxbVMcn9AN9WLxqD6gzlgwthfKMkgaubiBgsO3pZ7QN3Kd1uG6nOYEey+qh+dlgRCzsI+W+Jy+UPR/B6UcJGcKjpHJT3zUWGokgUAcNO9XSVpYnxcVLfkxFZ5jSp6Jt8/GZBpResHt24pXWeZDj6xqvOud9nG1TsVcsHX2wb6YQyqndh+5tJ0TVQ5IE3fnxWo7TR2WUV/NDqbIaVtHcd8nCD2BftQoajjxVz1b9snAbCh/MbUrT7QsgLdNTlVHmtCtrm9LZSrLJoFRP25qa9a60S1L8Yf2rHx</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>MIIEATCCAumgAwIBAgIJAI3wX7QGR8zIMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYDVQQGEwJFRTERMA8GA1UECAwISGFyanVtYWExEDAOBgNVBAcMB1RhbGxpbm4xHjAcBgNVBAoMFUVlc3RpIGtlZWxlIGluc3RpdHV1dDELMAkGA1UECwwCSVQxEzARBgNVBAMMCnd3dy5la2kuZWUxIDAeBgkqhkiG9w0BCQEWEWhvc3RtYXN0ZXJAZWtpLmVlMB4XDTE1MTExNjA4NTIxOFoXDTI1MTExNTA4NTIxOFowgZYxCzAJBgNVBAYTAkVFMREwDwYDVQQIDAhIYXJqdW1hYTEQMA4GA1UEBwwHVGFsbGlubjEeMBwGA1UECgwVRWVzdGkga2VlbGUgaW5zdGl0dXV0MQswCQYDVQQLDAJJVDETMBEGA1UEAwwKd3d3LmVraS5lZTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckBla2kuZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNFkW//HeZavdiSmGpYPuvegVRmJ//nH1s0O3uSw1x1zNpcAU2exr/G07GnkQp7eFdtbdL7L83o9b7zdXH0d3JfOH8sy9PbzVhXDG8BwDh1NPoqGFS2KVFNTlpKVmrL3AAkOZMBqrVPCaYIZ24SC4AF8IizT21JvGxR87gCS9gG35jcRyYef6I/J4Pm374w532/y05v0qVNqkR9hZbWI7KobX4J+gmhPf3mT3f+TA1W+F4oEcWxCKc8mvM8QB2PsK6Js5HK3geyRc6eVuUuP+ycvzsTAEmx3/lbzOrlkcC9YYCuN9C0s+rmQHuH6bVh+4sFnEJGlOATSD56tI122zRAgMBAAGjUDBOMB0GA1UdDgQWBBSEfr5fEP+UKF70EkqGBhFcSPffbjAfBgNVHSMEGDAWgBSEfr5fEP+UKF70EkqGBhFcSPffbjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCVBsuS6cB3LObsk+lfapZLPtr/3W+DNC3mUmvUxBEuYdgrdP/JfAUcxbVMcn9AN9WLxqD6gzlgwthfKMkgaubiBgsO3pZ7QN3Kd1uG6nOYEey+qh+dlgRCzsI+W+Jy+UPR/B6UcJGcKjpHJT3zUWGokgUAcNO9XSVpYnxcVLfkxFZ5jSp6Jt8/GZBpResHt24pXWeZDj6xqvOud9nG1TsVcsHX2wb6YQyqndh+5tJ0TVQ5IE3fnxWo7TR2WUV/NDqbIaVtHcd8nCD2BftQoajjxVz1b9snAbCh/MbUrT7QsgLdNTlVHmtCtrm9LZSrLJoFRP25qa9a60S1L8Yf2rHx</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eki.ee/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://www.eki.ee/simplesamlphp/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="et">Eesti keele instituut</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Institute of the Estonian Language</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="et">Eesti keele instituut</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Institute of the Estonian Language</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="et">http://www.eki.ee</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.eki.ee</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>TAAT</md:GivenName>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>eenet@eenet.ee</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.elearning.tum.de.xml b/swamid-interfederations-2.0/www.elearning.tum.de.xml
deleted file mode 100644
index 6120dc6d..00000000
--- a/swamid-interfederations-2.0/www.elearning.tum.de.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.elearning.tum.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.elearning.tum.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.elearning.tum.de,OU=Projekt elecTUM,O=Technische Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIEDC0/vTANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJE
-RTEpMCcGA1UEChMgVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgTXVlbmNoZW4xJjAk
-BgNVBAMTHVplcnRpZml6aWVydW5nc3N0ZWxsZSBkZXIgVFVNMB4XDTA4MDQyMjEw
-NDcwOVoXDTEzMDQyMTEwNDcwOVowgZUxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
-YXllcm4xETAPBgNVBAcTCE11ZW5jaGVuMSkwJwYDVQQKEyBUZWNobmlzY2hlIFVu
-aXZlcnNpdGFldCBNdWVuY2hlbjEYMBYGA1UECxMPUHJvamVrdCBlbGVjVFVNMR0w
-GwYDVQQDExR3d3cuZWxlYXJuaW5nLnR1bS5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAM7mYPJAR+xABFJb/xPrYTGBLuLxeKuhBkYWtZGVrbMTsKi3
-pbVmXrTgsU0dZrYK6qa9CVsauocsH25bfv4lfaIFil0QVBWVj9BWEZLHAKILV4cT
-0G5Qeitk1Sms1N8cBb3R9PuBIGscCeqauezCmvXVhtJrkndyWYXSKPC51fBncZ/q
-QVsaMjG9paCzQV1MyhwWEmAOaGFkPRLw/81wTMhkn43YhAjsUuHKHsAMWbIN8Cbr
-A+oauyWyO+Hymp98fnFFJGxOVEy1LJvxif8vyEUsE4xsvfCKMivaedDyto5ZqVoe
-umrCKpw4bVr8VNpm79GnIedMUsGT6vFMrY9Wol0CAwEAAaOCAfgwggH0MAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUdcSHILTZvT6UzOzPXr1VtdwzdGAwHwYDVR0jBBgwFoAUnZ8j
-8BkbfscjXScqzKU2OqZp5YkwbQYDVR0RBGYwZIEYc3VwcG9ydEBlbGVhcm5pbmcu
-dHVtLmRlghR3d3cuZWxlYXJuaW5nLnR1bS5kZYIYZWxlYXJuMDEubHJ6LW11ZW5j
-aGVuLmRlghhlbGVhcm4wMy5scnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOg
-MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS90dW0tY2EvcHViL2NybC9jYWNybC5j
-cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHVtLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDov
-L2NkcDEucGNhLmRmbi5kZS90dW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8G
-CCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1bS1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAJbraGE+3kyvCbfyUJqI
-oE6tr3Ilwu7A6EhAWGdsy1mNdLuSEI3BdoyKzr85c6k0g4ptc/C06GApQo5LKF3p
-2I5M3tU58nNWOmsu0VKQe1cP6oBZ60LOXaji8loUWcsOumNefZYnZVs7Tjcqqm0x
-nbvHB6UbxkMlHUoH9O8/Q0i9O6uanF7vuhJ8E+AbUV39cMfeGTA2oJeRHpj3BYwF
-eO9sT8rFaq/ij3JpDfNZ5RvZhwgN12fGssUVu/qK8BOrP6E3l68KMnXGfFxzVybL
-yhnKjkEA/K9OJhMb8hTnuUPGkaisGhNjd9/slKhYPkYZkkUUqX3ONUgYYWQ/i+zI
-CXA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.elearning.tum.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.elearning.tum.de,OU=Projekt elecTUM,O=Technische Universitaet Muenchen,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFbjCCBFagAwIBAgIEDC0/vTANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJE
-RTEpMCcGA1UEChMgVGVjaG5pc2NoZSBVbml2ZXJzaXRhZXQgTXVlbmNoZW4xJjAk
-BgNVBAMTHVplcnRpZml6aWVydW5nc3N0ZWxsZSBkZXIgVFVNMB4XDTA4MDQyMjEw
-NDcwOVoXDTEzMDQyMTEwNDcwOVowgZUxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZC
-YXllcm4xETAPBgNVBAcTCE11ZW5jaGVuMSkwJwYDVQQKEyBUZWNobmlzY2hlIFVu
-aXZlcnNpdGFldCBNdWVuY2hlbjEYMBYGA1UECxMPUHJvamVrdCBlbGVjVFVNMR0w
-GwYDVQQDExR3d3cuZWxlYXJuaW5nLnR1bS5kZTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAM7mYPJAR+xABFJb/xPrYTGBLuLxeKuhBkYWtZGVrbMTsKi3
-pbVmXrTgsU0dZrYK6qa9CVsauocsH25bfv4lfaIFil0QVBWVj9BWEZLHAKILV4cT
-0G5Qeitk1Sms1N8cBb3R9PuBIGscCeqauezCmvXVhtJrkndyWYXSKPC51fBncZ/q
-QVsaMjG9paCzQV1MyhwWEmAOaGFkPRLw/81wTMhkn43YhAjsUuHKHsAMWbIN8Cbr
-A+oauyWyO+Hymp98fnFFJGxOVEy1LJvxif8vyEUsE4xsvfCKMivaedDyto5ZqVoe
-umrCKpw4bVr8VNpm79GnIedMUsGT6vFMrY9Wol0CAwEAAaOCAfgwggH0MAkGA1Ud
-EwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATAdBgNVHQ4EFgQUdcSHILTZvT6UzOzPXr1VtdwzdGAwHwYDVR0jBBgwFoAUnZ8j
-8BkbfscjXScqzKU2OqZp5YkwbQYDVR0RBGYwZIEYc3VwcG9ydEBlbGVhcm5pbmcu
-dHVtLmRlghR3d3cuZWxlYXJuaW5nLnR1bS5kZYIYZWxlYXJuMDEubHJ6LW11ZW5j
-aGVuLmRlghhlbGVhcm4wMy5scnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOg
-MYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS90dW0tY2EvcHViL2NybC9jYWNybC5j
-cmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdHVtLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDov
-L2NkcDEucGNhLmRmbi5kZS90dW0tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8G
-CCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3R1bS1jYS9wdWIvY2Fj
-ZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAJbraGE+3kyvCbfyUJqI
-oE6tr3Ilwu7A6EhAWGdsy1mNdLuSEI3BdoyKzr85c6k0g4ptc/C06GApQo5LKF3p
-2I5M3tU58nNWOmsu0VKQe1cP6oBZ60LOXaji8loUWcsOumNefZYnZVs7Tjcqqm0x
-nbvHB6UbxkMlHUoH9O8/Q0i9O6uanF7vuhJ8E+AbUV39cMfeGTA2oJeRHpj3BYwF
-eO9sT8rFaq/ij3JpDfNZ5RvZhwgN12fGssUVu/qK8BOrP6E3l68KMnXGfFxzVybL
-yhnKjkEA/K9OJhMb8hTnuUPGkaisGhNjd9/slKhYPkYZkkUUqX3ONUgYYWQ/i+zI
-CXA=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.elearning.tum.de/ACS" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität München (Technische Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Zentrale Lernplattform der TU München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tum.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Stephan</GivenName>
-    <SurName>Graf</SurName>
-    <EmailAddress>shibboleth@elearning.tum.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Stephan</GivenName>
-    <SurName>Graf</SurName>
-    <EmailAddress>shibboleth@elearning.tum.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.xml b/swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.xml
deleted file mode 100644
index 56d5b287..00000000
--- a/swamid-interfederations-2.0/www.elgaronline.com-oa-metadata.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://www.elgaronline.com/oa/metadata">
-  <!--
-		This is an "Elgar Online" OpenAthens SP for Edward Elgar Publishing Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-17T08:44:58Z">
-      <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">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBDCCAeygAwIBAgIEU6rnhTANBgkqhkiG9w0BAQUFADBEMSQwIgYDVQQKExtF
-						ZHdhcmQgRWxnYXIgUHVibGlzaGluZyBMdGQxHDAaBgNVBAMTE3d3dy5lbGdhcm9u
-						bGluZS5jb20wHhcNMTQwNjI1MTUxNTE3WhcNMjQwNjIyMTUxNTE3WjBEMSQwIgYD
-						VQQKExtFZHdhcmQgRWxnYXIgUHVibGlzaGluZyBMdGQxHDAaBgNVBAMTE3d3dy5l
-						bGdhcm9ubGluZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk
-						zi0IFONPfHSf+k9V6m3TUL7jmAyEzOMRsNd3xe8VDzompult1mnkRNQsJtXlH8dT
-						9zlsa8Sg7GWZuB33GUDZAduwh2zrDLHEX26zcRiwVMEGHO+ExZtb3Tj6rYIabd3M
-						K7omCRTXKoGgpjembqpUSkyfo1tXb0n3VLWSg+c0rD3OsxmlSKYGOIM/IJWLeETf
-						RFO+/wbMBiznGB2v0gE1OwBMuW9MhJGNuTzl6JBzsUtWaxve6uUaFGO0VsJkgt+1
-						blkMrfKLxeBNpCwjJ0p5uf2NFzQqSyGutY4WOUKJikJGAgwewI1eGGMXAu5yILDG
-						Tx4qzyn9Y3FAOXv6awbVAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAFejm2GsOBLa
-						3MjfY1y5gF0O3CB9S3PUAgA2p1wB0j+MzThgw6qlCWCCAoBmqNIWQ9b7ehGf2gXU
-						UXI01W5ze1FLZap/B04GHbdSVPg7zc/Wp5+lnb+J0V28sPMXT3n7r6Kpp4vmnmub
-						hc4j8O9cJrleXFtB2w5rkgPqX2/Ws9eWK5Ngbri+PDw/b0OtaHJimsl8IzftdmBb
-						fYKS821VM/dQ463zbqZ0Vj1hwXL+y4bc1WPjNHxiY4uQfEVfw5lBEZBHG2o2g3ys
-						TA+7CGeJEhhBdtMHAV7salX0SDV1XDS2icJrFqEbgsJADKM71qFneDNLP874hvmR
-						CYoHEdBLhyA=
-					</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>
-						MIIDBDCCAeygAwIBAgIEU6rnhTANBgkqhkiG9w0BAQUFADBEMSQwIgYDVQQKExtF
-						ZHdhcmQgRWxnYXIgUHVibGlzaGluZyBMdGQxHDAaBgNVBAMTE3d3dy5lbGdhcm9u
-						bGluZS5jb20wHhcNMTQwNjI1MTUxNTE3WhcNMjQwNjIyMTUxNTE3WjBEMSQwIgYD
-						VQQKExtFZHdhcmQgRWxnYXIgUHVibGlzaGluZyBMdGQxHDAaBgNVBAMTE3d3dy5l
-						bGdhcm9ubGluZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk
-						zi0IFONPfHSf+k9V6m3TUL7jmAyEzOMRsNd3xe8VDzompult1mnkRNQsJtXlH8dT
-						9zlsa8Sg7GWZuB33GUDZAduwh2zrDLHEX26zcRiwVMEGHO+ExZtb3Tj6rYIabd3M
-						K7omCRTXKoGgpjembqpUSkyfo1tXb0n3VLWSg+c0rD3OsxmlSKYGOIM/IJWLeETf
-						RFO+/wbMBiznGB2v0gE1OwBMuW9MhJGNuTzl6JBzsUtWaxve6uUaFGO0VsJkgt+1
-						blkMrfKLxeBNpCwjJ0p5uf2NFzQqSyGutY4WOUKJikJGAgwewI1eGGMXAu5yILDG
-						Tx4qzyn9Y3FAOXv6awbVAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAFejm2GsOBLa
-						3MjfY1y5gF0O3CB9S3PUAgA2p1wB0j+MzThgw6qlCWCCAoBmqNIWQ9b7ehGf2gXU
-						UXI01W5ze1FLZap/B04GHbdSVPg7zc/Wp5+lnb+J0V28sPMXT3n7r6Kpp4vmnmub
-						hc4j8O9cJrleXFtB2w5rkgPqX2/Ws9eWK5Ngbri+PDw/b0OtaHJimsl8IzftdmBb
-						fYKS821VM/dQ463zbqZ0Vj1hwXL+y4bc1WPjNHxiY4uQfEVfw5lBEZBHG2o2g3ys
-						TA+7CGeJEhhBdtMHAV7salX0SDV1XDS2icJrFqEbgsJADKM71qFneDNLP874hvmR
-						CYoHEdBLhyA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.elgaronline.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.elgaronline.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elgaronline.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elgaronline.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Edward Elgar Publishing Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Elgar Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.e-elgar.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Marissa</GivenName>
-    <SurName>Itkowsky</SurName>
-    <EmailAddress>mailto:mitkowsky@safaribooksonline.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Istratov</SurName>
-    <EmailAddress>mailto:mistratov@safaribooksonline.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.elsevierclinicalskills.co.uk-oa-metadata.xml b/swamid-interfederations-2.0/www.elsevierclinicalskills.co.uk-oa-metadata.xml
deleted file mode 100644
index 57ecbd17..00000000
--- a/swamid-interfederations-2.0/www.elsevierclinicalskills.co.uk-oa-metadata.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.elsevierclinicalskills.co.uk/oa/metadata">
-  <!--
-		This is an 'Elsevier Clinical Skills' OpenAthens SP for Elsevier B.V.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-13T17:12:23Z"/>
-  </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>
-						MIIEJzCCAw+gAwIBAgIJAK+ojEV2iGtzMA0GCSqGSIb3DQEBBQUAMGoxPTA7BgNV
-						BAoTNEVsc2V2aWVyIEhlYWx0aCBTY2llbmNlcyAoVUspIC0gTW9zYnkgTnVyc2lu
-						ZyBTa2lsbHMxKTAnBgNVBAMTIHd3dy5lbHNldmllcmNsaW5pY2Fsc2tpbGxzLmNv
-						LnVrMB4XDTEzMDIyNzE2MjQ1NloXDTIzMDIyNTE2MjQ1NlowajE9MDsGA1UEChM0
-						RWxzZXZpZXIgSGVhbHRoIFNjaWVuY2VzIChVSykgLSBNb3NieSBOdXJzaW5nIFNr
-						aWxsczEpMCcGA1UEAxMgd3d3LmVsc2V2aWVyY2xpbmljYWxza2lsbHMuY28udWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3MpV6gXZUm8WGAzI02cK0
-						YqaCgXf1G761y1EQt0Z7+xcRlCvcPL7wjRTrZplD0cQDtmyOHgMMyr3xOXB2S8Kl
-						KgE6SMynaCMCNFKAedLvNK/b68/rHs5bk02RG3PCFngkeBTClXx9Y4l6n90CF2uC
-						vuKTIUJSwWJZr1YVPn+DRu1fQdjeQOLP0JofhfMn+VC6ghBz5xqMIBmFuH6Cq7dt
-						6EyrTg9miRNkNQEZYp1JOR/4emdHUu+aYe0E7TnvmXqx6+Zm0kBfv3DTLThydj0n
-						T03CaOi5DjT7ZyfSvLYhBR4ENhmUnyHlzIcMSGas4QULGbrKASJ3AdEZzN04Vsr3
-						AgMBAAGjgc8wgcwwHQYDVR0OBBYEFIq467HyDK0dwBAwU9NuYKMhR9jMMIGcBgNV
-						HSMEgZQwgZGAFIq467HyDK0dwBAwU9NuYKMhR9jMoW6kbDBqMT0wOwYDVQQKEzRF
-						bHNldmllciBIZWFsdGggU2NpZW5jZXMgKFVLKSAtIE1vc2J5IE51cnNpbmcgU2tp
-						bGxzMSkwJwYDVQQDEyB3d3cuZWxzZXZpZXJjbGluaWNhbHNraWxscy5jby51a4IJ
-						AK+ojEV2iGtzMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJaZ+wfY
-						HQ26OdiMB6G5OVmUPKYSkvzt6cu4SCB9bSvszgNMvWpA2dlJvXaYIyBpITbHuMW4
-						nUvrCuCYhFvPXKMpUGMdYPtFGxc9qJjRlwQfS6Udwf+8DjKMSM9wqHluMhuavHX5
-						A/A1PDMmEEzgMf44LeChHFVq7yRtGJFkUKU0HxhwFuEJnN6/0xxDOv1iyzHRHXqT
-						RZgLKPYNjUmOvEEHYGqNGdPFJQl+RRIgnuwE+sjQY8iAituymisM666gP7sN/4mg
-						lEzrc5CYKrBhI+iVeb1LWLJQvBUsN5JPKKL93k+KlUtMbvCRoqUuScrmVTjDN7/n
-						l2zTfF8JeZK/evs=
-					</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>
-						MIIEJzCCAw+gAwIBAgIJAK+ojEV2iGtzMA0GCSqGSIb3DQEBBQUAMGoxPTA7BgNV
-						BAoTNEVsc2V2aWVyIEhlYWx0aCBTY2llbmNlcyAoVUspIC0gTW9zYnkgTnVyc2lu
-						ZyBTa2lsbHMxKTAnBgNVBAMTIHd3dy5lbHNldmllcmNsaW5pY2Fsc2tpbGxzLmNv
-						LnVrMB4XDTEzMDIyNzE2MjQ1NloXDTIzMDIyNTE2MjQ1NlowajE9MDsGA1UEChM0
-						RWxzZXZpZXIgSGVhbHRoIFNjaWVuY2VzIChVSykgLSBNb3NieSBOdXJzaW5nIFNr
-						aWxsczEpMCcGA1UEAxMgd3d3LmVsc2V2aWVyY2xpbmljYWxza2lsbHMuY28udWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3MpV6gXZUm8WGAzI02cK0
-						YqaCgXf1G761y1EQt0Z7+xcRlCvcPL7wjRTrZplD0cQDtmyOHgMMyr3xOXB2S8Kl
-						KgE6SMynaCMCNFKAedLvNK/b68/rHs5bk02RG3PCFngkeBTClXx9Y4l6n90CF2uC
-						vuKTIUJSwWJZr1YVPn+DRu1fQdjeQOLP0JofhfMn+VC6ghBz5xqMIBmFuH6Cq7dt
-						6EyrTg9miRNkNQEZYp1JOR/4emdHUu+aYe0E7TnvmXqx6+Zm0kBfv3DTLThydj0n
-						T03CaOi5DjT7ZyfSvLYhBR4ENhmUnyHlzIcMSGas4QULGbrKASJ3AdEZzN04Vsr3
-						AgMBAAGjgc8wgcwwHQYDVR0OBBYEFIq467HyDK0dwBAwU9NuYKMhR9jMMIGcBgNV
-						HSMEgZQwgZGAFIq467HyDK0dwBAwU9NuYKMhR9jMoW6kbDBqMT0wOwYDVQQKEzRF
-						bHNldmllciBIZWFsdGggU2NpZW5jZXMgKFVLKSAtIE1vc2J5IE51cnNpbmcgU2tp
-						bGxzMSkwJwYDVQQDEyB3d3cuZWxzZXZpZXJjbGluaWNhbHNraWxscy5jby51a4IJ
-						AK+ojEV2iGtzMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJaZ+wfY
-						HQ26OdiMB6G5OVmUPKYSkvzt6cu4SCB9bSvszgNMvWpA2dlJvXaYIyBpITbHuMW4
-						nUvrCuCYhFvPXKMpUGMdYPtFGxc9qJjRlwQfS6Udwf+8DjKMSM9wqHluMhuavHX5
-						A/A1PDMmEEzgMf44LeChHFVq7yRtGJFkUKU0HxhwFuEJnN6/0xxDOv1iyzHRHXqT
-						RZgLKPYNjUmOvEEHYGqNGdPFJQl+RRIgnuwE+sjQY8iAituymisM666gP7sN/4mg
-						lEzrc5CYKrBhI+iVeb1LWLJQvBUsN5JPKKL93k+KlUtMbvCRoqUuScrmVTjDN7/n
-						l2zTfF8JeZK/evs=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.elsevierclinicalskills.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.elsevierclinicalskills.co.uk/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.elsevierclinicalskills.co.uk/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.elsevierclinicalskills.co.uk/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Elsevier B.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Elsevier Clinical Skills</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.elsevierclinicalskills.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Graham</GivenName>
-    <SurName>Isaacs</SurName>
-    <EmailAddress>mailto:g.isaacs@elsevier.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Terence</GivenName>
-    <SurName>Clifton</SurName>
-    <EmailAddress>mailto:t.clifton@elsevier.com</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..4abf52ae 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
@@ -1,62 +1,61 @@
 <?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>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:wayf="http://wayf.dk/2014/08/wayf" registrationInstant="2014-08-15T09:01:00Z" registrationAuthority="https://www.wayf.dk">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://wayf.dk/images/stories/WAYF-filer/metadataregistrationpracticestatementwayf.pdf</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">
+    <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:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:wayf="http://wayf.dk/2014/08/wayf">
+        <mdui:Description xml:lang="da">Formålet er at give adgang til Emerald Insights tidsskrifter og artikler indenfor socialvidenskab.</mdui:Description>
+        <mdui:Description xml:lang="en">The purpose is to provide personalized access to journals and papers on social sciences.</mdui:Description>
+        <mdui:DisplayName xml:lang="da">Emerald Insight</mdui:DisplayName>
         <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:Extensions>
+    <md:KeyDescriptor>
+      <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:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
+    <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:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="da">Emerald Insight</md:ServiceName>
+      <md:ServiceName xml:lang="en">Emerald Insight</md:ServiceName>
+      <md:ServiceDescription xml:lang="da">Formålet er at give adgang til Emerald Insights tidsskrifter og artikler indenfor socialvidenskab.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The purpose is to provide personalized access to journals and papers on social sciences.</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" FriendlyName="eduPersonTargetedID" 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" FriendlyName="schacHomeOrganization" isRequired="true"/>
+    </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="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: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: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 b054384f..00000000
--- a/swamid-interfederations-2.0/www.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://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.emplaw.co.uk-simplesaml-sp.xml b/swamid-interfederations-2.0/www.emplaw.co.uk-simplesaml-sp.xml
deleted file mode 100644
index 4d1a8b7c..00000000
--- a/swamid-interfederations-2.0/www.emplaw.co.uk-simplesaml-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://www.emplaw.co.uk/simplesaml/sp">
-  <!--
-		This is an "Emplaw Online" SP for Constantia Associates Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-04-10T09:33:23Z">
-      <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:Description xml:lang="en">Online access to up to date employment law information and cases</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Emplaw Online</mdui:DisplayName>
-        <mdui:Logo height="100" width="298" xml:lang="en">https://www.emplaw.co.uk/sites/default/files/emplawlogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDizCCAnOgAwIBAgIJANLzbWrFslBjMA0GCSqGSIb3DQEBCwUAMFwxCzAJBgNV
-						BAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-						aWRnaXRzIFB0eSBMdGQxFTATBgNVBAMMDGVtcGxhdy5jby51azAeFw0xNTAzMjMx
-						MDUxMjVaFw0yNTAzMjIxMDUxMjVaMFwxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApT
-						b21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxFTAT
-						BgNVBAMMDGVtcGxhdy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMg+PezNYDj4phkotRmP48BsQh6ZFTooomIUMAXBtjboftdWTSeyV+ro+z/l
-						DeFMFXl2ocpuUYAfyLQO2khfiCHmjIVnM0YAdxth7ypZmLF7KbEH29b9S8eONfE6
-						4rN8lJNDyucV6jQAhYoZYVKQ6eRjhxQcBWdpKt6vzzE4U6+TJE0EUhWfEVD83scJ
-						fHC6TqgVYtrda8jwRqEUj9rzgYE9o/1WYmU+eMViN7oIb6wxobzw8UY9YgtKs9Hy
-						RpWDcKHb0AdXdZ6KeuIvHW8CAn0lc7Fp+Qfnar2PDqz16UaZbO2TssgUZGhYf9f2
-						0YlE/vI7uCFpIblGJYlBEdKqTmECAwEAAaNQME4wHQYDVR0OBBYEFNfjAuRajysE
-						1apfQ+D3ud6NRm5DMB8GA1UdIwQYMBaAFNfjAuRajysE1apfQ+D3ud6NRm5DMAwG
-						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAEpPCOvsmiNjKzIz8dV2kf76
-						5/LfcnGlNO/zs+trKABtgJEVu3erO+jsSgLmRgYZ+Kk/79dmmV5a2dPDVMSYZ8x0
-						yJgai4uNYZpL6Ys7s4XV4UXm0wYfc2DslIM7Dm6xO9DL/wECpw03+5zkOUrmGSIG
-						vOR4FuBfzELPdkMYPfK88lk4MrLPsWk54742Obu/cW6XGhH+1YLwb3RkpzqW/RLU
-						QdkRmWoWVJ2sip3jvJq+JuFtJr2Y0Kps/vq9oSUK6SjS8hSU7vKIS+9OsZeJzHTz
-						N0+As8bWQHWAY/vBGBv/lSY3DVItLlILfPqM8MH62/fiYaHD5D1l67w4hB2Mg70=
-					</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>
-						MIIDizCCAnOgAwIBAgIJANLzbWrFslBjMA0GCSqGSIb3DQEBCwUAMFwxCzAJBgNV
-						BAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
-						aWRnaXRzIFB0eSBMdGQxFTATBgNVBAMMDGVtcGxhdy5jby51azAeFw0xNTAzMjMx
-						MDUxMjVaFw0yNTAzMjIxMDUxMjVaMFwxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApT
-						b21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxFTAT
-						BgNVBAMMDGVtcGxhdy5jby51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAMg+PezNYDj4phkotRmP48BsQh6ZFTooomIUMAXBtjboftdWTSeyV+ro+z/l
-						DeFMFXl2ocpuUYAfyLQO2khfiCHmjIVnM0YAdxth7ypZmLF7KbEH29b9S8eONfE6
-						4rN8lJNDyucV6jQAhYoZYVKQ6eRjhxQcBWdpKt6vzzE4U6+TJE0EUhWfEVD83scJ
-						fHC6TqgVYtrda8jwRqEUj9rzgYE9o/1WYmU+eMViN7oIb6wxobzw8UY9YgtKs9Hy
-						RpWDcKHb0AdXdZ6KeuIvHW8CAn0lc7Fp+Qfnar2PDqz16UaZbO2TssgUZGhYf9f2
-						0YlE/vI7uCFpIblGJYlBEdKqTmECAwEAAaNQME4wHQYDVR0OBBYEFNfjAuRajysE
-						1apfQ+D3ud6NRm5DMB8GA1UdIwQYMBaAFNfjAuRajysE1apfQ+D3ud6NRm5DMAwG
-						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAEpPCOvsmiNjKzIz8dV2kf76
-						5/LfcnGlNO/zs+trKABtgJEVu3erO+jsSgLmRgYZ+Kk/79dmmV5a2dPDVMSYZ8x0
-						yJgai4uNYZpL6Ys7s4XV4UXm0wYfc2DslIM7Dm6xO9DL/wECpw03+5zkOUrmGSIG
-						vOR4FuBfzELPdkMYPfK88lk4MrLPsWk54742Obu/cW6XGhH+1YLwb3RkpzqW/RLU
-						QdkRmWoWVJ2sip3jvJq+JuFtJr2Y0Kps/vq9oSUK6SjS8hSU7vKIS+9OsZeJzHTz
-						N0+As8bWQHWAY/vBGBv/lSY3DVItLlILfPqM8MH62/fiYaHD5D1l67w4hB2Mg70=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml2-logout.php/sp1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml2-acs.php/sp1" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml1-acs.php/sp1" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.emplaw.co.uk/simplesaml/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Constantia Associates Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Emplaw Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.emplaw.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Hall</SurName>
-    <EmailAddress>mailto:mike@juic3.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Hall</SurName>
-    <EmailAddress>mailto:mike@juic3.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.era-test.lib.ed.ac.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.era-test.lib.ed.ac.uk-shibboleth-sp.xml
deleted file mode 100644
index 257b1277..00000000
--- a/swamid-interfederations-2.0/www.era-test.lib.ed.ac.uk-shibboleth-sp.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://www.era-test.lib.ed.ac.uk/shibboleth-sp">
-  <!--
-		This is a "Test digital repository" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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-28T16:29:18Z"/>
-  </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.era-test.lib.ed.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJALOvgJMUhk7DMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGmxhYy1yZXBvLXRlc3Q3LmlzLmVkLmFjLnVrMB4XDTEzMDEyODE1MjA1M1oX
-						DTIzMDEyNjE1MjA1M1owJTEjMCEGA1UEAxMabGFjLXJlcG8tdGVzdDcuaXMuZWQu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5EWuWmRSvs/o3
-						6B8gmu0G99ZSTP42sQItX+evSRr++rXjZXVmqG0KqMD3adk8Ocj33u9r9PuxHyr1
-						r5TyD0y9nzzm4zMLce4gy+xOWhswFkyJEwcxNxEwWi851g6eczVPoMrunNMijT8m
-						k+LLc9wwYd6DtYimue774b4WNQf74/4JBbkzgpcc3himZHd+G07eOeEVa9f00djX
-						CzvpoBj4NTc+MCh+cy2Tht1jfnJ+qDimwcalxKrqrh5gpkEKhhqDuae22O0YNvSc
-						qn0UmcW8TMMfELxWoTCQqrhjUmj+W81pA3DscKjIBrCw5JO2jx26G7T7aVwup+4F
-						rxIoMVxFAgMBAAGjSDBGMCUGA1UdEQQeMByCGmxhYy1yZXBvLXRlc3Q3LmlzLmVk
-						LmFjLnVrMB0GA1UdDgQWBBSrFc86IEslzFbTxavZOub0iPEckTANBgkqhkiG9w0B
-						AQUFAAOCAQEAq8KlygpvbFKXBFSTMZ3LRXa0yaFzmF6O6LnzhxPqBixLAMf0r2p8
-						VOodPnPCcxpJb0hb2I334gt8DEk+ZqSKhWXUvtwbzanyIek79mTfs6X0PF4a3RbQ
-						1NzqpKPVebeZj1WytH4pbQ99vmkruwlg/gB8QDi1FGL2T8fDLPZ9s7ML//MyRvcI
-						V2JsDcGNJie/kRsvOLHgX5UsHXVaCv6sLgbghj7y3YPiuIJP1INYmqdaVyIXOhrb
-						Rzkx2kzgZA00Wvk+0EvmAXnoxIUZfpugV1Bw17LC7a2MnihRHvndiqmj59snZ9VI
-						74PyBeKyItPNiuEYH+2iw3VuHSvz91S6+A==
-					</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.era-test.lib.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.era-test.lib.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Test digital repository from the University of Edinburgh</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.era-test.lib.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Information Systems</GivenName>
-    <EmailAddress>mailto:information.systems@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Colin</GivenName>
-    <SurName>Watt</SurName>
-    <EmailAddress>mailto:colin.watt@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.era.lib.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.era.lib.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index af75038b..00000000
--- a/swamid-interfederations-2.0/www.era.lib.ed.ac.uk-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://www.era.lib.ed.ac.uk/shibboleth">
-  <!--
-		This is a "Digital repository" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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-04-24T15:38:27Z"/>
-  </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.era.lib.ed.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAIOsYTB61XKdMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGmxhYy1yZXBvLWxpdmU3LmlzLmVkLmFjLnVrMB4XDTEzMDMyOTE0MTMxNFoX
-						DTIzMDMyNzE0MTMxNFowJTEjMCEGA1UEAxMabGFjLXJlcG8tbGl2ZTcuaXMuZWQu
-						YWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+zOVnC2mBcnCT
-						fr26aA/wrJLM65swDcG8Lt7gwHxntEg9tOwrU3Rl35XMPSPbXZU0TWyWdDAW3/PC
-						9i0271PkaygdChqNLf+1norKfmWMzogCiabPSkXInm8qfEWV4gwIa8SFtQ/cQCLF
-						F8nn5AWtXilZbvOas7LPdoQQ8w6m8GFotkEEmATaanVMFbovITbs2xqIqvwSMYwu
-						JzMYzehMeSnceRxuhyuP4xLAMz+UYlzjq6bljIIke3xUcaeZCt4hihJi7JhKiFQa
-						IxenT1bGglNvSQmIWCfiG5ax6zobIrMG5iH2PdtzY/C9YSJpZNrCDyRe+i5IWonM
-						/Hq+4wSrAgMBAAGjSDBGMCUGA1UdEQQeMByCGmxhYy1yZXBvLWxpdmU3LmlzLmVk
-						LmFjLnVrMB0GA1UdDgQWBBRwFfQJ/pyvVGsQAwTPkd3s4eVQRzANBgkqhkiG9w0B
-						AQUFAAOCAQEAf3EeDDtDZSMO4cF6IZFkLRlWMZjEYbnNcBgimbAB1rqCvXQo1NqT
-						xDyKpZ8Lfxax1dsvdotu9ltkFkmSLTF8lAHkNDu8VB2XvOWJG5Zy57xmaRPpDj1z
-						ese9Mz2wHuFEngOh4CuTPTCvYv80VtSVBh4xmGSqC0HWcfrcKvxhwVz3RmyDtiaV
-						gPqu9DPDi6CHtxNn9TRhfTZck2NBGn2hPW2Zzt+L9KSNi9goUsHYUC4q9v17v0v4
-						4MHYYV6m3Xe5EtHSarPW+aqqKrL7IXrpuCLAg6FVb4ULBMisw2Nsp7zc03zLobTd
-						DJFYFLGtGnkAW0rtldK8ic92p7u2SzXZYw==
-					</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.era.lib.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.era.lib.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital repository from the University of Edinburgh</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.era.lib.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Information Systems</GivenName>
-    <EmailAddress>mailto:information.systems@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Colin</GivenName>
-    <SurName>Watt</SurName>
-    <EmailAddress>mailto:colin.watt@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.essexstudent.com-shibboleth.xml b/swamid-interfederations-2.0/www.essexstudent.com-shibboleth.xml
deleted file mode 100644
index fce41f6f..00000000
--- a/swamid-interfederations-2.0/www.essexstudent.com-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://www.essexstudent.com/shibboleth">
-  <!--
-		This is an "essexstudent.com" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://www.essexstudent.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.essexstudent.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.essexstudent.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.essexstudent.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.essexstudent.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.essexstudent.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.essexstudent.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.essexstudent.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.essexstudent.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.essexstudent.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.essexstudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.essexstudent.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.essexstudent.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.essexstudent.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.essexstudent.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Membership Solutions Limited: essexstudent.com</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.essexstudent.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Essex SU Helpdesk</GivenName>
-    <EmailAddress>mailto:help@essexstudent.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.euppublishing.com-shibboleth.xml b/swamid-interfederations-2.0/www.euppublishing.com-shibboleth.xml
deleted file mode 100644
index a871439b..00000000
--- a/swamid-interfederations-2.0/www.euppublishing.com-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://www.euppublishing.com/shibboleth">
-  <!--
-		This is an 'Edinburgh University Press' OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDrzCCApegAwIBAgIJAPbC/ThktAkhMA0GCSqGSIb3DQEBBQUAMIGWMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEeMBwGA1UEAxMVd3d3LmV1cHB1Ymxpc2hpbmcuY29t
-						MB4XDTA5MTEyNTE5MzUxMFoXDTE5MTEyMzE5MzUxMFowgZYxCzAJBgNVBAYTAlVT
-						MRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsG
-						A1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0
-						ZW1zLCBJbmMuMR4wHAYDVQQDExV3d3cuZXVwcHVibGlzaGluZy5jb20wggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwvbPrKwrgbolzvuT5ru6f90JUh/P9
-						RK+DggKww8r/wmfAi2HDRa51Lcpjp4UosVnV4RjTVBS7G73lRIpbkt29EANAIxLo
-						WA/9RgTv4JO3bu0hxrHEkWsX3LCeAOGGAnOO24k3OCKEUeVssm+4u0x4/zKB541Z
-						SE8nexXu/PnHZHSgZP4+hQ8D19fRmLLtqaI67SKGuZob60St/JqCgf1/UFFRTmBl
-						b8mnre1n6jsl7uTfCh0WEmI9xr7DkVb+z2FxfIzSt4F4atC5ZVvME3lRTvuu0VRZ
-						nAnNd+vv1pP7ybRwhroUzRDBUUzLDrc6gRKQAug20gmOy8iculZyjB1xAgMBAAEw
-						DQYJKoZIhvcNAQEFBQADggEBAKX2oU8Q6150mQ5dCH1RFyX3qDYcPTlDOB/uGxHa
-						6IPeF2iPF+xh3aZQ6x3qHafDSPREVMELDdDdk+FuS08fOyGoEwX/tr04uKYex8FG
-						IxB49UbcuG7QcHlj3aV4RY1u2oztIO/4LUpqCyXrtICSK4JHuXjPdPgwvSlPspig
-						yC4ZlUrZ78JZXVOAbXqtaylM7bIvnDhcz+4mwYyijXgRSEygf5XTU87rkZxcvTWv
-						ehQLiW/fDXfKCHtt3GjXNnU6xGbOtG6XilUD7a/Z5Pm4BhuanO04bmO84Q733a5r
-						TParqfMsNJY958o6cyuiHcpuhFjvsp7qkLi/kmTaOk1r6Pc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.euppublishing.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.euppublishing.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.euppublishing.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: Edinburgh University Press</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.euppublishing.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.europeansources.info-shibboleth-sp.xml b/swamid-interfederations-2.0/www.europeansources.info-shibboleth-sp.xml
deleted file mode 100644
index 2652136f..00000000
--- a/swamid-interfederations-2.0/www.europeansources.info-shibboleth-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://www.europeansources.info/shibboleth-sp">
-  <!--
-		This is a "European Sources Online" Shibboleth SP for Cardiff University.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://www.europeansources.info/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPzCCAiegAwIBAgIJAKXvxs0f16ZOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy5ldXJvcGVhbnNvdXJjZXMuaW5mbzAeFw0xMDExMDUwNDA1NDBaFw0z
-						MDEwMzEwNDA1NDBaMCMxITAfBgNVBAMTGHd3dy5ldXJvcGVhbnNvdXJjZXMuaW5m
-						bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALtY3r1/Ce/g21A23jIA
-						A+p5vLCT5Ys1rEMQfTG2v2TSaMadE+Cv+cs6Srid0ViHzIrNnniBtccbGxjie0Jn
-						/wogTebE5mot9SikTg8NBZ4DPBWZGbL7K2pDKkzCEseXgpitrKq8LNfTSpypLEKL
-						Mgus2F2a0MPIMqnmaNDLFbw5vP2VM5Xl9C9J6+ze0XzAQqLyfveaELgapFNXZNvH
-						w4L2dsIL1bl07EaXxW71fbY5dHfO4V81bc+2Y7huDn8MaaYMFT6JhPLa7oUwtftt
-						Mp/LsjneIrSTW22VwGNrqE4/bvpFJPJWT3JT/t/+MQ+sP8KHCkzXNYJgpy1lIew3
-						nwMCAwEAAaN2MHQwUwYDVR0RBEwwSoIYd3d3LmV1cm9wZWFuc291cmNlcy5pbmZv
-						hi5odHRwczovL3d3dy5ldXJvcGVhbnNvdXJjZXMuaW5mby9zaGliYm9sZXRoLXNw
-						MB0GA1UdDgQWBBTuv2FY5i6UPbuqzxAnAuce+GomvzANBgkqhkiG9w0BAQUFAAOC
-						AQEAKNnwdcrSsx7LQSzpxcggbMkOJdk1BBdMc1vAn4NGBoOK4qDrbj+M7a9S+tRP
-						7WjCdhxl+1fjYH7FuN05EoecHLuBqp6TWW2BRRetk7K4fE3LeuowIknu9ZxS9OrY
-						eyZJMNlOx8Qlu8YOIMbhjgWBoMjz3tNf/AX7umjTWZYNftEnopxPY6SLLSjPvDN7
-						W0aUUZxfepCHC3ChYL24fHsDzPOB75N6XfoGbiIig8QCFSXGgHNybjVMgMvsnL02
-						+uDpys5EQJlQYf7uL7LVSQgkhyjMvvQYDCzNjDsLFkneyWKAIj3c9ZUa5gk8nvSI
-						CxCvlN9hdNAKSPhbVe6gTSLw1Q==
-					</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>
-						MIIDPzCCAiegAwIBAgIJAKXvxs0f16ZOMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy5ldXJvcGVhbnNvdXJjZXMuaW5mbzAeFw0xMDExMDUwNDA1NDBaFw0z
-						MDEwMzEwNDA1NDBaMCMxITAfBgNVBAMTGHd3dy5ldXJvcGVhbnNvdXJjZXMuaW5m
-						bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALtY3r1/Ce/g21A23jIA
-						A+p5vLCT5Ys1rEMQfTG2v2TSaMadE+Cv+cs6Srid0ViHzIrNnniBtccbGxjie0Jn
-						/wogTebE5mot9SikTg8NBZ4DPBWZGbL7K2pDKkzCEseXgpitrKq8LNfTSpypLEKL
-						Mgus2F2a0MPIMqnmaNDLFbw5vP2VM5Xl9C9J6+ze0XzAQqLyfveaELgapFNXZNvH
-						w4L2dsIL1bl07EaXxW71fbY5dHfO4V81bc+2Y7huDn8MaaYMFT6JhPLa7oUwtftt
-						Mp/LsjneIrSTW22VwGNrqE4/bvpFJPJWT3JT/t/+MQ+sP8KHCkzXNYJgpy1lIew3
-						nwMCAwEAAaN2MHQwUwYDVR0RBEwwSoIYd3d3LmV1cm9wZWFuc291cmNlcy5pbmZv
-						hi5odHRwczovL3d3dy5ldXJvcGVhbnNvdXJjZXMuaW5mby9zaGliYm9sZXRoLXNw
-						MB0GA1UdDgQWBBTuv2FY5i6UPbuqzxAnAuce+GomvzANBgkqhkiG9w0BAQUFAAOC
-						AQEAKNnwdcrSsx7LQSzpxcggbMkOJdk1BBdMc1vAn4NGBoOK4qDrbj+M7a9S+tRP
-						7WjCdhxl+1fjYH7FuN05EoecHLuBqp6TWW2BRRetk7K4fE3LeuowIknu9ZxS9OrY
-						eyZJMNlOx8Qlu8YOIMbhjgWBoMjz3tNf/AX7umjTWZYNftEnopxPY6SLLSjPvDN7
-						W0aUUZxfepCHC3ChYL24fHsDzPOB75N6XfoGbiIig8QCFSXGgHNybjVMgMvsnL02
-						+uDpys5EQJlQYf7uL7LVSQgkhyjMvvQYDCzNjDsLFkneyWKAIj3c9ZUa5gk8nvSI
-						CxCvlN9hdNAKSPhbVe6gTSLw1Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.europeansources.info/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.europeansources.info/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.europeansources.info/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.europeansources.info/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.europeansources.info/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.europeansources.info/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.europeansources.info/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.europeansources.info/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.europeansources.info/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.europeansources.info/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.europeansources.info/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.europeansources.info/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.europeansources.info/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.europeansources.info/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.europeansources.info/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">European Sources Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.europeansources.info/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>ESO Support</GivenName>
-    <EmailAddress>mailto:esowebmaster@cardiff.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Philip </GivenName>
-    <SurName>Smart</SurName>
-    <EmailAddress>mailto:smartp@cardiff.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.eusa.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.eusa.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index c0a0213e..00000000
--- a/swamid-interfederations-2.0/www.eusa.ed.ac.uk-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://www.eusa.ed.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 'Edinburgh University Students Association' SP for the University of Edinburgh.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.eusa.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Edinburgh University Students Association</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.eusa.ed.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.exacteditions.com-shibboleth.xml b/swamid-interfederations-2.0/www.exacteditions.com-shibboleth.xml
deleted file mode 100644
index 2e0312e6..00000000
--- a/swamid-interfederations-2.0/www.exacteditions.com-shibboleth.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.exacteditions.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for Exact Editions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEMDCCAxigAwIBAgIJAISCsINDzLsWMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGjAYBgNV
-						BAoTEUV4YWN0RWRpdGlvbnMgTHRkMSAwHgYDVQQDExdsb2dpbi5leGFjdGVkaXRp
-						b25zLmNvbTEpMCcGCSqGSIb3DQEJARYac3lzYWRtaW5AZXhhY3RlZGl0aW9ucy5j
-						b20wHhcNMTIxMjA1MTA0NzE5WhcNMjIxMjAzMTA0NzE5WjCBmDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRowGAYDVQQKExFF
-						eGFjdEVkaXRpb25zIEx0ZDEgMB4GA1UEAxMXbG9naW4uZXhhY3RlZGl0aW9ucy5j
-						b20xKTAnBgkqhkiG9w0BCQEWGnN5c2FkbWluQGV4YWN0ZWRpdGlvbnMuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzooyLuz1P5Qs4C0CZddAq4Ck
-						zkLR04FgM97g8h41A1zDl3LpoILduq/KhKALIBMT3PPoctapBQFMgDtqBWzlQKJQ
-						wIEF4JkZ7BAvSNg9+bDJs1uUMt0O2Q7vbpjEEX4yDDuQ/tayJKzC7Ak6LXuGPtuc
-						5+t5Hf4WNLrzOBPgkR0il/ndUPLr7KJSV7M6LwUbfmGpgmtgY0h+Tw0E/WJqKnnb
-						/raLTqzA8diyn4CflRG214ClyUiQ5Z4r6bQ77QkNTTHTXrrQNn5ldGri8ZcESmqu
-						BrvFDHTH3CQWk4+d8XYZIRVNWen9gSrIs7NQ3de4JQ3CWkhtFXzalZnUOPwRqwID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQURh5aI0DQPxc3lwxBVaRrOB4/Rzgw
-						HwYDVR0jBBgwFoAURh5aI0DQPxc3lwxBVaRrOB4/RzgwDQYJKoZIhvcNAQEFBQAD
-						ggEBAKVhcW6weezQma6IkhLqLzfxtGuEe41Aky7KQyHC350hWgWs377WLBVpEcVH
-						Cba/IEGQFz0hJlXFXHPjI+htQSkIFREHuc1SmL9CBsYS1G/4+Rt3TukjzP/MogiU
-						BdV2TmE10Y6f2Q1ZQfKQaUjOgPwr/odpUZoT5EBx1Z0/JybrDVmJxxKW5CT4sWvW
-						1PaHcO6MXXTYXUFW10yGFGGkkd3mz6vCUjz2fW9AfybyEeexs3oSW9Icg95WxYdO
-						ROoLTRIDq01SmDnaiyOVTkGjNkNpR7PKj8Tr91upnrB0sE0u+R6JjEoI2bHoOQI0
-						wKxM0RWUQo8Ocu512fz2GE89mfQ=
-					</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>
-						MIIEMDCCAxigAwIBAgIJAISCsINDzLsWMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-						VQQGEwJHQjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGjAYBgNV
-						BAoTEUV4YWN0RWRpdGlvbnMgTHRkMSAwHgYDVQQDExdsb2dpbi5leGFjdGVkaXRp
-						b25zLmNvbTEpMCcGCSqGSIb3DQEJARYac3lzYWRtaW5AZXhhY3RlZGl0aW9ucy5j
-						b20wHhcNMTIxMjA1MTA0NzE5WhcNMjIxMjAzMTA0NzE5WjCBmDELMAkGA1UEBhMC
-						R0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRowGAYDVQQKExFF
-						eGFjdEVkaXRpb25zIEx0ZDEgMB4GA1UEAxMXbG9naW4uZXhhY3RlZGl0aW9ucy5j
-						b20xKTAnBgkqhkiG9w0BCQEWGnN5c2FkbWluQGV4YWN0ZWRpdGlvbnMuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzooyLuz1P5Qs4C0CZddAq4Ck
-						zkLR04FgM97g8h41A1zDl3LpoILduq/KhKALIBMT3PPoctapBQFMgDtqBWzlQKJQ
-						wIEF4JkZ7BAvSNg9+bDJs1uUMt0O2Q7vbpjEEX4yDDuQ/tayJKzC7Ak6LXuGPtuc
-						5+t5Hf4WNLrzOBPgkR0il/ndUPLr7KJSV7M6LwUbfmGpgmtgY0h+Tw0E/WJqKnnb
-						/raLTqzA8diyn4CflRG214ClyUiQ5Z4r6bQ77QkNTTHTXrrQNn5ldGri8ZcESmqu
-						BrvFDHTH3CQWk4+d8XYZIRVNWen9gSrIs7NQ3de4JQ3CWkhtFXzalZnUOPwRqwID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQURh5aI0DQPxc3lwxBVaRrOB4/Rzgw
-						HwYDVR0jBBgwFoAURh5aI0DQPxc3lwxBVaRrOB4/RzgwDQYJKoZIhvcNAQEFBQAD
-						ggEBAKVhcW6weezQma6IkhLqLzfxtGuEe41Aky7KQyHC350hWgWs377WLBVpEcVH
-						Cba/IEGQFz0hJlXFXHPjI+htQSkIFREHuc1SmL9CBsYS1G/4+Rt3TukjzP/MogiU
-						BdV2TmE10Y6f2Q1ZQfKQaUjOgPwr/odpUZoT5EBx1Z0/JybrDVmJxxKW5CT4sWvW
-						1PaHcO6MXXTYXUFW10yGFGGkkd3mz6vCUjz2fW9AfybyEeexs3oSW9Icg95WxYdO
-						ROoLTRIDq01SmDnaiyOVTkGjNkNpR7PKj8Tr91upnrB0sE0u+R6JjEoI2bHoOQI0
-						wKxM0RWUQo8Ocu512fz2GE89mfQ=
-					</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>
-						MIID8DCCAtigAwIBAgIJAKxba9CqnWAUMA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEbMBkGA1UE
-						ChMSRXhhY3QgRWRpdGlvbnMgTHRkMQswCQYDVQQLEwJJVDEeMBwGA1UEAxMVd3d3
-						LmV4YWN0ZWRpdGlvbnMuY29tMB4XDTEwMDkwNjExMTY0NVoXDTIwMDkwMzExMTY0
-						NVoweTELMAkGA1UEBhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9u
-						ZG9uMRswGQYDVQQKExJFeGFjdCBFZGl0aW9ucyBMdGQxCzAJBgNVBAsTAklUMR4w
-						HAYDVQQDExV3d3cuZXhhY3RlZGl0aW9ucy5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDXxRMVhOzIQL1SIn7l2fbUOxi6uRY48V/owYArPGWRgRYz
-						Lvs97rM5O/4SHKgvwEcnr7cUA+4800RwNFZYAMwmAlsGZA5mY2pM51Gs07r/2ivX
-						bfalA2AaXFje/VQ6IqvDWCvLaZyrGfW+kxJqAgZn7yQEZvmIIHkcwpLeWim2kpgx
-						NrsfrsYa9Nypj2GRL1hNDyd9McQLtE+3BHZNBrgjoqVHBcaViutGaVm+NNzNoLQq
-						N6Jmxts9rqxaO4uCi3GOSHF4Wq6kwZ6G4q+NLd2aHyU8m+bygTD1zTKInw8Va3ow
-						EgctIZrtAgWeQMbcOu0K28X4eC6x+Nj2m6F/JppzAgMBAAGjezB5MAkGA1UdEwQC
-						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
-						MB0GA1UdDgQWBBRM5kk9f2DeMFkEc2yiaG74jtrINzAfBgNVHSMEGDAWgBRM5kk9
-						f2DeMFkEc2yiaG74jtrINzANBgkqhkiG9w0BAQUFAAOCAQEAwbyMXwjSBkutbny+
-						1PxWMuIKhWCEkKh/yNAs/7DBJkg1ytRryV3nXYmn0AQ0TwEouebQzG3mxDNZBMF3
-						em2+1p4MLUaEos0XTze3OhVECYo231fw1YrioW9M8LEJzkcytvA5WY2avsXOeJRa
-						uPp/iZNz6/4v0Sap+vij1u+pMQ5rV5pPL5cLmF6I0BHS93L5ky8J3Hz4oJMA1rJa
-						Hivwzjz5aLgvSWrxrWj733BvjmE7+/i/CVRi3S73fP9SrY4jAwbyxVlVdmwA/Q0s
-						A7ecb0GjcvX16ir1D/d6Y3/E0guV3Ri4GpJ8/K3sz65n6Gqiwfm5yuehIOvniQih
-						BvmkLw==
-					</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>
-						MIID8DCCAtigAwIBAgIJAKxba9CqnWAUMA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNV
-						BAYTAkdCMQ8wDQYDVQQIEwZMb25kb24xDzANBgNVBAcTBkxvbmRvbjEbMBkGA1UE
-						ChMSRXhhY3QgRWRpdGlvbnMgTHRkMQswCQYDVQQLEwJJVDEeMBwGA1UEAxMVd3d3
-						LmV4YWN0ZWRpdGlvbnMuY29tMB4XDTEwMDkwNjExMTY0NVoXDTIwMDkwMzExMTY0
-						NVoweTELMAkGA1UEBhMCR0IxDzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9u
-						ZG9uMRswGQYDVQQKExJFeGFjdCBFZGl0aW9ucyBMdGQxCzAJBgNVBAsTAklUMR4w
-						HAYDVQQDExV3d3cuZXhhY3RlZGl0aW9ucy5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDXxRMVhOzIQL1SIn7l2fbUOxi6uRY48V/owYArPGWRgRYz
-						Lvs97rM5O/4SHKgvwEcnr7cUA+4800RwNFZYAMwmAlsGZA5mY2pM51Gs07r/2ivX
-						bfalA2AaXFje/VQ6IqvDWCvLaZyrGfW+kxJqAgZn7yQEZvmIIHkcwpLeWim2kpgx
-						NrsfrsYa9Nypj2GRL1hNDyd9McQLtE+3BHZNBrgjoqVHBcaViutGaVm+NNzNoLQq
-						N6Jmxts9rqxaO4uCi3GOSHF4Wq6kwZ6G4q+NLd2aHyU8m+bygTD1zTKInw8Va3ow
-						EgctIZrtAgWeQMbcOu0K28X4eC6x+Nj2m6F/JppzAgMBAAGjezB5MAkGA1UdEwQC
-						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
-						MB0GA1UdDgQWBBRM5kk9f2DeMFkEc2yiaG74jtrINzAfBgNVHSMEGDAWgBRM5kk9
-						f2DeMFkEc2yiaG74jtrINzANBgkqhkiG9w0BAQUFAAOCAQEAwbyMXwjSBkutbny+
-						1PxWMuIKhWCEkKh/yNAs/7DBJkg1ytRryV3nXYmn0AQ0TwEouebQzG3mxDNZBMF3
-						em2+1p4MLUaEos0XTze3OhVECYo231fw1YrioW9M8LEJzkcytvA5WY2avsXOeJRa
-						uPp/iZNz6/4v0Sap+vij1u+pMQ5rV5pPL5cLmF6I0BHS93L5ky8J3Hz4oJMA1rJa
-						Hivwzjz5aLgvSWrxrWj733BvjmE7+/i/CVRi3S73fP9SrY4jAwbyxVlVdmwA/Q0s
-						A7ecb0GjcvX16ir1D/d6Y3/E0guV3Ri4GpJ8/K3sz65n6Gqiwfm5yuehIOvniQih
-						BvmkLw==
-					</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>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.exacteditions.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.exacteditions.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.exacteditions.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.exacteditions.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.exacteditions.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.exacteditions.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.exacteditions.com/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.exacteditions.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.exacteditions.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.exacteditions.com/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.exacteditions.com/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.exacteditions.com/Shibboleth.sso/SAML/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Exact Editions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Exact Editions Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.exacteditions.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Exact Editions Support</GivenName>
-    <EmailAddress>mailto:support@exacteditions.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Bruce</SurName>
-    <EmailAddress>mailto:tim.bruce@exacteditions.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.exeterguild.org-shibboleth.xml b/swamid-interfederations-2.0/www.exeterguild.org-shibboleth.xml
deleted file mode 100644
index b808b7ac..00000000
--- a/swamid-interfederations-2.0/www.exeterguild.org-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://www.exeterguild.org/shibboleth">
-  <!--
-		This is an "ExeterGuild.org" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.exeterguild.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.exeterguild.org/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.exeterguild.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.exeterguild.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.exeterguild.org/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.exeterguild.org/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.exeterguild.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.exeterguild.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.exeterguild.org/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.exeterguild.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.exeterguild.org/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.exeterguild.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.exeterguild.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.exeterguild.org/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.exeterguild.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Membership Solutions: ExeterGuild.org</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.exeterguild.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.future-science.com-shibboleth.xml b/swamid-interfederations-2.0/www.future-science.com-shibboleth.xml
deleted file mode 100644
index 1075a6ca..00000000
--- a/swamid-interfederations-2.0/www.future-science.com-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://www.future-science.com/shibboleth">
-  <!--
-		This is a "Future Science Ltd" OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-09T14:48:01Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID8TCCAtmgAwIBAgIJAK72JYaVEOKrMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEfMB0GA1UEAxMWd3d3LmZ1dHVyZS1zY2llbmNlLmNv
-						bTEeMBwGCSqGSIb3DQEJARYPdmFrZUBhdHlwb24uY29tMB4XDTA5MTAwNjE3NDMy
-						M1oXDTE5MTAwNDE3NDMyM1owgbcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxp
-						Zm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsGA1UEChMUQXR5cG9uIFN5
-						c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR8wHQYD
-						VQQDExZ3d3cuZnV0dXJlLXNjaWVuY2UuY29tMR4wHAYJKoZIhvcNAQkBFg92YWtl
-						QGF0eXBvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/HtWP
-						CPuovxFL1y8Ozgg7LtETgC7/fROj9bKoWeaYRMWlK2X5AVRrwk0E2PSAdb7TKcve
-						WxpgNYba9wWHOg0jC9DYtEMHV+LBRW7AXClme/RPYhC47unmhrF2NU+Vi/VIrD1t
-						dz9rNNxq8oJNorhZSv6xx49hSbB5wqsFZ1G4wnskA7gxye80BEwY4pUTs7ISb6LW
-						oLekbcRMtJJGQLqcegu3GXGekf6iRalL87boJ5nosZ+TwCf1ZTA/8ixc1BzzPmgB
-						/cj8KYefduCHyCJw1OkR8AgC2eayLLdn3txfkhUYfuyoqJx4+ZnMh3O/g+yV1CTm
-						TchBqZuEch0fAPw7AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABNUiw9k/fp21JOG
-						3EkMMDqpj2SMVWMzKLDmUeSkYi0h3cVr1xQqjUvCT0g8Jasn52t2d+d8ValvJURQ
-						IFaYdTcovhWg81/5Hs426CnPPAz52xhMBG4D6lWq70zHEjouhSdXdQHCzt29gWHr
-						oU+Tud/tjX1Oq9/YXwXt60oimvu9O59OTZH+qsHZUFinIvLV2lPeHFv96ajVxa1P
-						ZGzmgtTGMVPhI3dw6xtManC5zfL9EpcI3lQFRpeQ9nPNYteDuuJ0NVqRL/8GIAus
-						dA7ai3rZPltfny9pnfhwvyAG1SvimFqGjK1HnCK9M8BZafozi5VMwQQK8zyCzSh1
-						PhWHTeQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.future-science.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.future-science.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.future-science.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Future Science Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.future-science.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.futuremedicine.com-shibboleth.xml b/swamid-interfederations-2.0/www.futuremedicine.com-shibboleth.xml
deleted file mode 100644
index c320352a..00000000
--- a/swamid-interfederations-2.0/www.futuremedicine.com-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://www.futuremedicine.com/shibboleth">
-  <!--
-		This is a 'Future Medicine Ltd' OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIID8TCCAtmgAwIBAgIJAJ/77lkMaSGrMA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEfMB0GA1UEAxMWd3d3LmZ1dHVyZW1lZGljaW5lLmNv
-						bTEeMBwGCSqGSIb3DQEJARYPdmFrZUBhdHlwb24uY29tMB4XDTA5MTAyMDIwMDgz
-						MFoXDTE5MTAxODIwMDgzMFowgbcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxp
-						Zm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsGA1UEChMUQXR5cG9uIFN5
-						c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR8wHQYD
-						VQQDExZ3d3cuZnV0dXJlbWVkaWNpbmUuY29tMR4wHAYJKoZIhvcNAQkBFg92YWtl
-						QGF0eXBvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD2IolM
-						mAnByBWRn9mH2ZgyhN4KN18sMwlebyxrBCZhJOujYy//cbdF7I3tFLYPXhjqqhaa
-						aGFWkqSI47mbWX4OisiIY5JGdDMux76PQDno+oiiC10Hv2gbVZg7HH9TfaH3huBj
-						T5nyI1iCD5EYjJScda0PBDuGa8I4w7+3HigzpX1i6byUgQS482fPMRIlHYEZhj99
-						udmTrTqf6G55Ftooe4YZVogiUJGfZ8HN8x62JkLTRXYYlvTTDXD4u64cmJfnXQ5R
-						SZXWT6qklJGBGFWaOfUvdcWKPcrk6VMvu6qWVFpAjzhvkprgxH2jOU2L0jq6bmV+
-						FbHL6XfOzYNd7IRxAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABfRCQbbPRMMrFXP
-						LQcmKtEHoLRyrgp8V/Otj4fVzp3vrgQLq6a3pleT8ypb4KEWmLfKuJ94Ew4HoQDo
-						TebFPPD37AJd6UynhKonh6KDW6SphFHr6mbyo3RoPLlK0ksWcKa4eyOXTTCHeQ5R
-						cZEndtU6U7kAynxPaKAJjGM4FJeiCNKxrfrAiTckIkT9L4+AOCS6YAmM2axVZVnL
-						CYtfL5oR2aEzKbxYlFbHiS7aW8bcu6xU6ngCO198AOZYgTDLj/fkyOBy9ANlkeZh
-						CJpYbgCtuw3wcIbLndCEu88kiGZI+nKGariT+XxJCEgmZPZ5bjZahzfAn15+aK7m
-						JPGtRd4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.futuremedicine.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.futuremedicine.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.futuremedicine.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: Future Medicine Ltd</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.futuremedicine.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.fxu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.fxu.org.uk-shibboleth.xml
deleted file mode 100644
index fb2873ee..00000000
--- a/swamid-interfederations-2.0/www.fxu.org.uk-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://www.fxu.org.uk/shibboleth">
-  <!--
-		This is a "Falmouth & Exeter Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-02T11:32:51Z">
-      <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.fxu.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://www.fxu.org.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.fxu.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.fxu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.fxu.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.fxu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.fxu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.fxu.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Falmouth &amp; Exeter Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.fxu.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.gkunions.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.gkunions.co.uk-shibboleth.xml
deleted file mode 100644
index b02a05e6..00000000
--- a/swamid-interfederations-2.0/www.gkunions.co.uk-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://www.gkunions.co.uk/shibboleth">
-  <!--
-		This is a "Greenwich and Kent Unions Together" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-03T11:31:14Z">
-      <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.gkunions.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://www.gkunions.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gkunions.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gkunions.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gkunions.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.gkunions.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.gkunions.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.gkunions.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Greenwich and Kent Unions Together</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.gkunions.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL Support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.glew.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.glew.org.uk-shibboleth.xml
deleted file mode 100644
index 9731637e..00000000
--- a/swamid-interfederations-2.0/www.glew.org.uk-shibboleth.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.glew.org.uk/shibboleth">
-  <!--
-		This is a Glew Shibboleth SP for Charles Love trading as Perfect Papers.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-13T14:11:19Z"/>
-  </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.glew.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://www.glew.org.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="117" width="256">https://www.glew.org.uk/logosml.png</mdui:Logo>
-        <mdui:Description xml:lang="en">Glew - Learning Made Simple</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Glew</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIJAONwxil6WuG0MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
-						BAMTIHMxNTQwNDg4Ni5vbmxpbmVob21lLXNlcnZlci5pbmZvMB4XDTEyMDcyNzEw
-						MDQzNFoXDTIyMDcyNTEwMDQzNFowKzEpMCcGA1UEAxMgczE1NDA0ODg2Lm9ubGlu
-						ZWhvbWUtc2VydmVyLmluZm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDRvVh211zdEJqy++pyzLM4OrFLrCIaceSEZNHRM/NvhU3wpeaD3TjACHr96yhg
-						FfpAtnwv2psto3uOGqtrRLFr5pEAxw+8j3FE3tCu896V3XTque8LrKbYTvBErWd0
-						yYyU/38mX5roVlI6s8Jyl+sOox6BfQsy1slMD9EOL/8qd7rfE0uftvZ63SMJJRea
-						UPP3oMJW6k5C+n1uHPUbfakcVjuxd32Cd6oPiEaVpBW6/um10tfdAV0xA2i7pQBr
-						q8yfRantSUAUUOyGjLB19P63/r8BzkgVnkhkcJy/mzbju4240lZvNFzJEaqq7in0
-						KFAa6GE9QmRySrx7J/aaRDqVAgMBAAGjTjBMMCsGA1UdEQQkMCKCIHMxNTQwNDg4
-						Ni5vbmxpbmVob21lLXNlcnZlci5pbmZvMB0GA1UdDgQWBBSn6CELRx3aEXbVPcA3
-						Z5LHvXlUtDANBgkqhkiG9w0BAQUFAAOCAQEAw2OvHP2BT1/KtDrbojIQRjTHJgl/
-						z2ufah7O8fc+u9Vms9hu6KTGytQYjs9R+mjI9Jh39QQn+Cgx63oq6p7lHxnb74dC
-						wmWYEq1ZVtj1O1YwWeZqN1JozQQPpnET3bDW3qK9H7e+LSdmpIr7fYC0vYFoSIpa
-						0wgVD2/V6Km5hQbrFhvsmUSKgyuUZjlRPhiD3vE3UxGfKhAS3Y5aE8u43AwuPfXK
-						rHHEMaX104getbCsdeCtrOUdq+RwO6+hLEsBiNnIacKNOt1evrdDXDd02exSTXSe
-						606yHgGge9GO5GNooVTWmR5/DXyoAlDSxbnZpXzwvczR4exkYd2lb9a7mA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.glew.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.glew.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.glew.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.glew.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.glew.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.glew.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.glew.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.glew.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.glew.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.glew.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.glew.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Charles Love trading as Perfect Papers</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Glew</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.glew.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Charlie</GivenName>
-    <SurName>Love</SurName>
-    <EmailAddress>mailto:charlie.love@compednet.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Charlie</GivenName>
-    <SurName>Love</SurName>
-    <EmailAddress>mailto:charlie.love@compednet.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.goglasgow.org.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.goglasgow.org.uk-shibboleth-sp.xml
deleted file mode 100644
index 91b02db9..00000000
--- a/swamid-interfederations-2.0/www.goglasgow.org.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.goglasgow.org.uk/shibboleth-sp">
-  <!--
-		This is a "Glasgow Online" Shibboleth SP for Glasgow City Council.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-11-18T16:39: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://www.goglasgow.org.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEgDCCA2igAwIBAgIJAPMjaLYGwUMUMA0GCSqGSIb3DQEBBQUAMIHAMQswCQYD
-						VQQGEwJHQjERMA8GA1UECBMIU2NvdGxhbmQxEDAOBgNVBAcTB0dsYXNnb3cxHTAb
-						BgNVBAoTFEdsYXNnb3cgQ2l0eSBDb3VuY2lsMSAwHgYDVQQLExdHYXRld2F5IFNo
-						YXJlZCBTZXJ2aWNlczEdMBsGA1UEAxMUd3d3LmdvZ2xhc2dvdy5vcmcudWsxLDAq
-						BgkqhkiG9w0BCQEWHWFsaXN0YWlyLmdpbGxlc3BpZUBjZWcub3JnLnVrMB4XDTEz
-						MDYyNDA5MzQxMloXDTIzMDYyMjA5MzQxMlowgcAxCzAJBgNVBAYTAkdCMREwDwYD
-						VQQIEwhTY290bGFuZDEQMA4GA1UEBxMHR2xhc2dvdzEdMBsGA1UEChMUR2xhc2dv
-						dyBDaXR5IENvdW5jaWwxIDAeBgNVBAsTF0dhdGV3YXkgU2hhcmVkIFNlcnZpY2Vz
-						MR0wGwYDVQQDExR3d3cuZ29nbGFzZ293Lm9yZy51azEsMCoGCSqGSIb3DQEJARYd
-						YWxpc3RhaXIuZ2lsbGVzcGllQGNlZy5vcmcudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQCuXaIfYI28Kv8qtSKiTVEEluuBBvp49gwR99Pk/5a96IdE
-						ugnvRlJkKBAqzcHu1bmzbej/2QgbHi75pQd1QfSf0g5rf2yZnCnuRXkHKFL5bXtx
-						JPaHOEJbTR+7PZgiTHL7LGrdzaYwJMslzNSQrsfvSc+ckulLg7rpfV6PZRISoyih
-						Tiqw7/OekZJMHeBV0nTrg4ZKO7thf/SComBdy8C4PcxFf60D2EsvHN5zUi9RWuOg
-						qk88jIjaL6WpjagtOarM0RzdN06MFTLMZKHcM7KypG9PNP6IqgngJWGR4RuPjBCh
-						901EJbNnXKNIgCQ1erFDq/egJWUGV6Ib5jSfjaVfAgMBAAGjezB5MAkGA1UdEwQC
-						MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
-						MB0GA1UdDgQWBBRAj9Nhd6oa2Pulo9Nyyhpgmg4ogTAfBgNVHSMEGDAWgBRAj9Nh
-						d6oa2Pulo9Nyyhpgmg4ogTANBgkqhkiG9w0BAQUFAAOCAQEAR2UuikFjGKF8bVi7
-						dzBd9gFcKJ0lRb4lOo3BIm1pO63D8KtUXIIvlbD/MeTGoT9yNV1gZe98Blbjq6Rg
-						In3V5jfQjZxHajEWY19aRRgu2b3OVLP1BXffuDxTdh5RN2t1vkhu619Clip1uPB9
-						y+NU2HPaqn/yKOwI2/Z2G5OkoArn/TzOSVzF29HV5BkD62KdDxysLeRi1IKSYGik
-						ecna87vaWMR0ITJSB7QMW3ZFjhS557rH9pLVFC6/M78QH9R+54Lz5EXkbZq9738H
-						XP+CyHYMMkgvhpaX2mulTQmlzIJ70gcC/fyF2DiKGnbvoApfeneb6E9fiVk82k55
-						tGUYmA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.goglasgow.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.goglasgow.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.goglasgow.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.goglasgow.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.goglasgow.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.goglasgow.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Glasgow City Council</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Glasgow City Council: Glasgow Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.glasgow.gov.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Gillespie</SurName>
-    <EmailAddress>mailto:alistair.gillespie@ceg.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Alistair</GivenName>
-    <SurName>Gillespie</SurName>
-    <EmailAddress>mailto:Alistair.Gillespie@ceg.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.guilfordjournals.com-shibboleth.xml b/swamid-interfederations-2.0/www.guilfordjournals.com-shibboleth.xml
deleted file mode 100644
index 67532291..00000000
--- a/swamid-interfederations-2.0/www.guilfordjournals.com-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://www.guilfordjournals.com/shibboleth">
-  <!--
-		This is a "Guilford Press Journals" OpenSAML SP for Atypon Systems.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDrTCCApWgAwIBAgIJAKnRupkZlL3vMA0GCSqGSIb3DQEBBQUAMIGVMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEdMBsGA1UEAxMUZ3VpbGZvcmRqb3VybmFscy5jb20w
-						HhcNMTEwNjI4MjE1MjI0WhcNMjEwNjI1MjE1MjI0WjCBlTELMAkGA1UEBhMCVVMx
-						EzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMR0wGwYD
-						VQQKExRBdHlwb24gU3lzdGVtcywgSW5jLjEdMBsGA1UECxMUQXR5cG9uIFN5c3Rl
-						bXMsIEluYy4xHTAbBgNVBAMTFGd1aWxmb3Jkam91cm5hbHMuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAukY3Suc40qnHE6QmmMhIkFT74Pn1V/NB
-						rak3v7CSX0SZaF5eWhHE2qgnObdCCNzEOwKMprP0/cyLM4AfLou90RE9a3VyMu6k
-						f/DmMf5ZLJIIP6SF7y94N+gswlbPh9IXxQVAp7rR4qEqdYKThC3hz+/8G4UPFr+g
-						hy4xzz/Op35Zo2GYapsyuvclhzyfjj/YjT9CliNeGktdq6O97obw5oz5ZaAVlWlq
-						Sf6P0EKQUWRUxPfyutbjUVkuGWZtRJOXC3QZxhsvby31Rh2g5gIB2KiynKURGCl8
-						136mP4X2wVGqHnEdiA4+R4ofAEuBpuqSBeW4yAGUdLqVzxEcFl+m6wIDAQABMA0G
-						CSqGSIb3DQEBBQUAA4IBAQBR7zjTkZGpMUIQn8F/2yZcFu/Ub8j5Goop4FCLfuyN
-						LkVUwceiKlYVB05ZHr3TtHcyGjv2+19Ueo8QuNuI5BzqMRimfsiYdR6y44A1T5N6
-						YHi+cqfv6eKvXw+qLJ4k49ctR+8zV8YTVLgBBW3UJLW+r6MMUXtLfdBJGFigg/WT
-						u/VDMQFnTBgvQ0nSUnhuu3A8w+wXA2Yvk0gXIpnySD7ZhP99WcFDjFqwaYiu8iVS
-						VB0Di9U3LXyKtrtkDze+28e1YM/C0+Z1L8iMRwc1Bl//37zvMFLQW76s9+yQMJVc
-						27TWzs2tyoA/K2JsjCy5trHj/oEhD2obZvDuvJ89VKDQ
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://guilfordjournals.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.guilfordjournals.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.guilfordjournals.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: Guilford Press Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.guilford.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.hallamstudentsunion.com-shibboleth.xml b/swamid-interfederations-2.0/www.hallamstudentsunion.com-shibboleth.xml
deleted file mode 100644
index 09713d55..00000000
--- a/swamid-interfederations-2.0/www.hallamstudentsunion.com-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://www.hallamstudentsunion.com/shibboleth">
-  <!--
-		This is a "Sheffield Hallam Students' Union" Shibboleth SP for Membership Solutions Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-25T14:09:20Z">
-      <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.hallamstudentsunion.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.hallamstudentsunion.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-					BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-					WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-					AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-					FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-					Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-					kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-					0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-					5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-					gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-					BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-					EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-					70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-					QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-					MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-					Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-				</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.hallamstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Sheffield Hallam Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hallamstudentsunion.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.hds.uni-leipzig.de.xml b/swamid-interfederations-2.0/www.hds.uni-leipzig.de.xml
deleted file mode 100644
index e0ef7365..00000000
--- a/swamid-interfederations-2.0/www.hds.uni-leipzig.de.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.hds.uni-leipzig.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.hds.uni-leipzig.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.hds.uni-leipzig.de,OU=Hochschuldidaktisches Zentrum Sachsen,O=Universitaet Leipzig,L=Leipzig,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFdTCCBF2gAwIBAgIEETAMJDANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
-MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
-EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMDEyMjExMTI1MDhaFw0xNTEyMjAxMTI1
-MDhaMIGhMQswCQYDVQQGEwJERTEQMA4GA1UECBMHU2FjaHNlbjEQMA4GA1UEBxMH
-TGVpcHppZzEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxLjAsBgNVBAsT
-JUhvY2hzY2h1bGRpZGFrdGlzY2hlcyBaZW50cnVtIFNhY2hzZW4xHzAdBgNVBAMT
-Fnd3dy5oZHMudW5pLWxlaXB6aWcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCwt713W1EXhtA2GOp6k8kZxRhIm5LOsD2iqHs1pLZkbaxBO4y2bht6
-k6mdi4j0wbA0/wdv+JpYK1/wB6Cdaz6UEBwlqzy0+0pJ3G72xRPG/s/wmeAzOqzY
-ONGphoYWkGnz4aQ5tf3E+KILj0V3JisgZA7+pYyEXiX340NPzIyxOLKAyFxHwY/n
-aUWuQDLo+6dXRCFO6OqRW6v7tnyUji8Qa3gcv+BeEwRUZyvmoHQfirFhGP9FAYDZ
-s85KZ3pSU6046E/B1+8h9FOFEQB5vnZKmouF77h75DCJBDiSZd1TJaNWzvMScjzx
-ofFcCqn+wGTAMsijDm82iP0E1RY2/BaXAgMBAAGjggHUMIIB0DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFHlh5OdjyNAu5gk4Szo4xMeg5uqhMB8GA1UdIwQYMBaAFDaM3R6c0bqQ
-gPinird0ak3JN9oOMD0GA1UdEQQ2MDSCFnd3dy5oZHMudW5pLWxlaXB6aWcuZGWC
-GnZtaHNkaWRhLnJ6LnVuaS1sZWlwemlnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaWxlaS1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmlsZWktY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCRSA11s6iv
-eW6YcStHntggb0PZQ/LoT1mv+4cQ1KYkS7QJlSrJOqEjlsNYtB7LFGBOxYBSPm5g
-B/tipiS/tF/KOk8mjEVD1JhLHOoxE/JWNW7WKZ6pMsocJChRTRLalfSAFh88PHvo
-41zxUUhoj9LxXIdZn+Z06RbY+ssh76B1nqOghs0dYaMfH9MY/nGS742sA4Y5sGm4
-vhn4VI0GQGXWUiJi7FNfZkT7NTq7sX/FA04tgPui45NI5HfQCsvrZIiwXA9zaENp
-P6vvZAJd5omkVASomcfj5W9HEokIDNn3I8LTt07otBa9K1c64AZAoPaTpizm4w3a
-P4AvrRjtlBBB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.hds.uni-leipzig.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.hds.uni-leipzig.de,OU=Hochschuldidaktisches Zentrum Sachsen,O=Universitaet Leipzig,L=Leipzig,ST=Sachsen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFdTCCBF2gAwIBAgIEETAMJDANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJE
-RTEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxDDAKBgNVBAsTA1VSWjEg
-MB4GA1UEAxMXVU5JVkVSU0lUQUVUIExFSVBaSUcgQ0ExITAfBgkqhkiG9w0BCQEW
-EnBraUB1bmktbGVpcHppZy5kZTAeFw0xMDEyMjExMTI1MDhaFw0xNTEyMjAxMTI1
-MDhaMIGhMQswCQYDVQQGEwJERTEQMA4GA1UECBMHU2FjaHNlbjEQMA4GA1UEBxMH
-TGVpcHppZzEdMBsGA1UEChMUVW5pdmVyc2l0YWV0IExlaXB6aWcxLjAsBgNVBAsT
-JUhvY2hzY2h1bGRpZGFrdGlzY2hlcyBaZW50cnVtIFNhY2hzZW4xHzAdBgNVBAMT
-Fnd3dy5oZHMudW5pLWxlaXB6aWcuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCwt713W1EXhtA2GOp6k8kZxRhIm5LOsD2iqHs1pLZkbaxBO4y2bht6
-k6mdi4j0wbA0/wdv+JpYK1/wB6Cdaz6UEBwlqzy0+0pJ3G72xRPG/s/wmeAzOqzY
-ONGphoYWkGnz4aQ5tf3E+KILj0V3JisgZA7+pYyEXiX340NPzIyxOLKAyFxHwY/n
-aUWuQDLo+6dXRCFO6OqRW6v7tnyUji8Qa3gcv+BeEwRUZyvmoHQfirFhGP9FAYDZ
-s85KZ3pSU6046E/B1+8h9FOFEQB5vnZKmouF77h75DCJBDiSZd1TJaNWzvMScjzx
-ofFcCqn+wGTAMsijDm82iP0E1RY2/BaXAgMBAAGjggHUMIIB0DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFHlh5OdjyNAu5gk4Szo4xMeg5uqhMB8GA1UdIwQYMBaAFDaM3R6c0bqQ
-gPinird0ak3JN9oOMD0GA1UdEQQ2MDSCFnd3dy5oZHMudW5pLWxlaXB6aWcuZGWC
-GnZtaHNkaWRhLnJ6LnVuaS1sZWlwemlnLmRlMH0GA1UdHwR2MHQwOKA2oDSGMmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MDigNqA0hjJodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaWxlaS1jYS9wdWIvY3Js
-L2NhY3JsLmNybDCBmAYIKwYBBQUHAQEEgYswgYgwQgYIKwYBBQUHMAKGNmh0dHA6
-Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbGVpLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNy
-dDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmlsZWktY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCRSA11s6iv
-eW6YcStHntggb0PZQ/LoT1mv+4cQ1KYkS7QJlSrJOqEjlsNYtB7LFGBOxYBSPm5g
-B/tipiS/tF/KOk8mjEVD1JhLHOoxE/JWNW7WKZ6pMsocJChRTRLalfSAFh88PHvo
-41zxUUhoj9LxXIdZn+Z06RbY+ssh76B1nqOghs0dYaMfH9MY/nGS742sA4Y5sGm4
-vhn4VI0GQGXWUiJi7FNfZkT7NTq7sX/FA04tgPui45NI5HfQCsvrZIiwXA9zaENp
-P6vvZAJd5omkVASomcfj5W9HEokIDNn3I8LTt07otBa9K1c64AZAoPaTpizm4w3a
-P4AvrRjtlBBB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.hds.uni-leipzig.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Hochschuldidaktisches Zentrum Sachsen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Hochschuldidaktisches Zentrum Sachsen - Typo3</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.hds.uni-leipzig.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Stefan</GivenName>
-    <SurName>Moch</SurName>
-    <EmailAddress>admin@bps-system.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.hellou.com-shibboleth.xml b/swamid-interfederations-2.0/www.hellou.com-shibboleth.xml
deleted file mode 100644
index 0d28c077..00000000
--- a/swamid-interfederations-2.0/www.hellou.com-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://www.hellou.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for HelloU 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="2013-06-26T14:40:33Z">
-      <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.hellou.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6DCCAdCgAwIBAgIJAKwi1R+TxXbDMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC2hlbGxvdS12bS0xMB4XDTEzMDYyNTEyMDczNloXDTIzMDYyMzEyMDczNlow
-						FjEUMBIGA1UEAxMLaGVsbG91LXZtLTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDJcyWp4ZGOxVrc36Ncn4VAQLv4e1dgwn4V/ucyO39OSKgdsvAtr44m
-						KQP8ZBWbaCMPrRvAwW1I1bC9wcQzSLxOId/GPhZ531kwR/OhzaWEVi/ikrYBeWHZ
-						oJlIO2UQrMSt7GTRkMzE8UVsr7feL9FrtMxQk2a5BHkJMmz3c5lSR4aZIofF2qtl
-						LYJULFstJ0MNhQQjg8wX+eITXaVr02Qrja8W/AAXJRRDTLpgdpHF/kEdwUb0AuXi
-						NH8l9aEr1W0m4pglOIlGRg00Kh8sLwhWsRJ+LU6k5WpAFivdUHqJWwW8q734qwN1
-						v+qglQT6TfKBU+PLVLb9uO2RCDioysGVAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2hl
-						bGxvdS12bS0xMB0GA1UdDgQWBBRvuVuGzl6/mdTbh+eNbjBS8s7EqzANBgkqhkiG
-						9w0BAQUFAAOCAQEAHyNrqqJLLoKi9TQ4KKgLrESdlIBOspbkpD7tXBK1q5vV8zyr
-						uAuevt9jCwuXsCctxR8/7oMJcE/4thxDYSxDCUssm5VVk7Sa422AeT+fzZuHSE9h
-						rNT8MjIEewCtYbt78b2ZaSLboRQ5Fp43I1WdAgYHOfadBPXJL1YbRFVeneKVgKtj
-						p8hidkLo0y8xx0nAZRUwMqqDOHNp/V/+DfJT14/Uzlzku1wmDvyKmmVVAhyvBHbr
-						X+/lp3C7NhudW6fptQ7oOPK2Y4kfVCQqSOePlCIZEFZJazq+hLVyAC3LCZwNsG5x
-						4BPoHboks4uyA/aNN9nrxFADa386mQ20RKyzwg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.hellou.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.hellou.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.hellou.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hellou.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hellou.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.hellou.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.hellou.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.hellou.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.hellou.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.hellou.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.hellou.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">helloU Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">helloU.com</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.hellou.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@hellou.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Fidler</SurName>
-    <EmailAddress>mailto:andrew.fidler@hellou.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.historicum.net.xml b/swamid-interfederations-2.0/www.historicum.net.xml
deleted file mode 100644
index 33983183..00000000
--- a/swamid-interfederations-2.0/www.historicum.net.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.historicum.net/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.historicum.net/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.historicum.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.historicum.net,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEmxxU49V0zANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODE4MTExMzA3WhcNMTYw
-ODE2MTExMzA3WjCBmjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRswGQYD
-VQQDExJ3d3cuaGlzdG9yaWN1bS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC+VCvKgWK8OIWsMo1HhMLQhsxbfny8byHwNTjAtSTGflA3/G3FDrAe
-kOK2/+DoadamgGaKMo9mbfZiMsB+0qsNLA8sD9GFbBNCRIFg7DWUtaJDkbug/Otl
-+qQThsRYy7jfUy3MxGwzOD58MBPflD8GS31qNUjJDV8Nxwk/ahpHVs4XdTDqMqB9
-/TCQZYdxoL95x+n48Wmj9oPjNjY1+4+DP/NAJ9g3pw3MZrMCOP5iiBzc2bvRTm4U
-V24wJnrWF4+lpCVHxbobFqbTwuG6Z7LkRN41q5QA3qkZ68844d5BOxjxFAsSAkJu
-3WcpBl6hEy3j65QLU5rYR0WmzyKCnBJdAgMBAAGjggH8MIIB+DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFPloMP+TFIehpHELFn3MzgM4TSoXMB8GA1UdIwQYMBaAFHpnjFsaE0SC
-syFaGyqK858x4MRhMIGxBgNVHR8EgakwgaYwUaBPoE2GS2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBRoE+gTYZLaHR0cDovL2NkcDIucGNhLmRmbi5kZS9iYXll
-cmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIHKBggrBgEFBQcBAQSBvTCBujBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEApt7GnxFmz+s84Dv/Q9Pk
-3czsoPilgDKTnv2J2YMV2abmMy7j3yCfyE4mY+LsvhvXw1a7sJRfV+LjTCtS89/4
-2HFNYvVlalS3wprX3c4GgqGNZ+5puTURvWnXdTeeJMv4FWoqPNndm1ReSzHqExzc
-bL2X3dqNNxkdFBMPMQI1kD/ez+X1fPxLetv/Eyxj/tjJ474ItsMFcR1nc8CYS4lz
-J6+2jq7nN+bykToSFC9N0FrzwvDHocLoy0f+1ZV0FRjNjvxBIbg3//gKwnB+pF8L
-IEgLDBRYn7j7darmze2EzqinWCVnWHffUirPnGG+ed6zDkgEAFv9bAuwl6KVmJUe
-CQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.historicum.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.historicum.net,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEmxxU49V0zANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODE4MTExMzA3WhcNMTYw
-ODE2MTExMzA3WjCBmjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRswGQYD
-VQQDExJ3d3cuaGlzdG9yaWN1bS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC+VCvKgWK8OIWsMo1HhMLQhsxbfny8byHwNTjAtSTGflA3/G3FDrAe
-kOK2/+DoadamgGaKMo9mbfZiMsB+0qsNLA8sD9GFbBNCRIFg7DWUtaJDkbug/Otl
-+qQThsRYy7jfUy3MxGwzOD58MBPflD8GS31qNUjJDV8Nxwk/ahpHVs4XdTDqMqB9
-/TCQZYdxoL95x+n48Wmj9oPjNjY1+4+DP/NAJ9g3pw3MZrMCOP5iiBzc2bvRTm4U
-V24wJnrWF4+lpCVHxbobFqbTwuG6Z7LkRN41q5QA3qkZ68844d5BOxjxFAsSAkJu
-3WcpBl6hEy3j65QLU5rYR0WmzyKCnBJdAgMBAAGjggH8MIIB+DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFPloMP+TFIehpHELFn3MzgM4TSoXMB8GA1UdIwQYMBaAFHpnjFsaE0SC
-syFaGyqK858x4MRhMIGxBgNVHR8EgakwgaYwUaBPoE2GS2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBRoE+gTYZLaHR0cDovL2NkcDIucGNhLmRmbi5kZS9iYXll
-cmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIHKBggrBgEFBQcBAQSBvTCBujBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEApt7GnxFmz+s84Dv/Q9Pk
-3czsoPilgDKTnv2J2YMV2abmMy7j3yCfyE4mY+LsvhvXw1a7sJRfV+LjTCtS89/4
-2HFNYvVlalS3wprX3c4GgqGNZ+5puTURvWnXdTeeJMv4FWoqPNndm1ReSzHqExzc
-bL2X3dqNNxkdFBMPMQI1kD/ez+X1fPxLetv/Eyxj/tjJ474ItsMFcR1nc8CYS4lz
-J6+2jq7nN+bykToSFC9N0FrzwvDHocLoy0f+1ZV0FRjNjvxBIbg3//gKwnB+pF8L
-IEgLDBRYn7j7darmze2EzqinWCVnWHffUirPnGG+ed6zDkgEAFv9bAuwl6KVmJUe
-CQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.historicum.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.historicum.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.historicum.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.historicum.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.historicum.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.historicum.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.historicum.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.historicum.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.historicum.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.historicum.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.historicum.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.historicum.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.historicum.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.historicum.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.historicum.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.icevirtuallibrary.com-shibboleth.xml b/swamid-interfederations-2.0/www.icevirtuallibrary.com-shibboleth.xml
deleted file mode 100644
index 559bfa81..00000000
--- a/swamid-interfederations-2.0/www.icevirtuallibrary.com-shibboleth.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.icevirtuallibrary.com/shibboleth">
-  <!--
-		This is an OpenAthensSP vsn 1.2 'ICE Virtual Library' SP owned by Publishing Technology plc. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDkjCCAnqgAwIBAgIETFGlqTANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMCR0IxFDASBgNV
-						BAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNVBAoTFVB1Ymxpc2hpbmcgVGVj
-						aG5vbG9neTEUMBIGA1UECxMLRW5naW5lZXJpbmcxHjAcBgNVBAMTFVB1Ymxpc2hpbmcgVGVjaG5v
-						bG9neTAeFw0xMDA3MjkxNjAwNDFaFw0yMDA3MjYxNjAwNDFaMIGKMQswCQYDVQQGEwJHQjEUMBIG
-						A1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEeMBwGA1UEChMVUHVibGlzaGluZyBU
-						ZWNobm9sb2d5MRQwEgYDVQQLEwtFbmdpbmVlcmluZzEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNo
-						bm9sb2d5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgDY7L3DZLJU1rL/0YYxpu3mN
-						pkyQ8aJvVwF3JRBD5NbV7eOCE4VmGhQVfHHSAv6jvcIyjDzIIVhFdFN/m8nud5xlIRWqkK2UB4r/
-						gfwQEPbcM+cKNUPwtVqk9z1XRIp338/vsu+LvC6F8+s8vkk95pnVShbVcTacfQLbOQEFNRDmSN5w
-						TVQUyHqm/pWknUz5Ot56JGXEOP0OXCqmpN4ajFdmPuC4ZQzra8A/noMKu2SBtYXGhrweqoPZRnJC
-						YUgzmSoKJrYsEuemkod2eGjdlVlGh3UT2iK+Cz/16G6zXmvUDCwxRULkYLYlUPSXih+S2T1Nbl4T
-						3NrmFpbWaQ4gSwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQACtChlhIaqb33d447kMf6Lup5cXbN7
-						rIEzbUf94mQTn8G50fs1udmRT7oaAokkh2FFlpRWLgdmHUVGmBNWtdF6ncHOKFXqdTFgCNeVZL7h
-						I8O6DPCAza4Ty7johPW9UL3PKj7ILTKh096EHFkryD4GAy8VGGEjR2rHQk0mSX7WFO2EfjIxGZUm
-						WQAbupXydVS4KEwl0FL5hIapvWWIVux97S+KKrsZQAi7QwfaY/2gjFP6bO6R+5kW52qrkhFVBnbY
-						CBn3v35bYqvPRQ6eQhp+1In1tWKybpA6aJOutsdEO4Z0ocWyw5d3oErlveYSNhQPubCO4XaMeEvY
-						zvIF4NlO
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.icevirtuallibrary.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.icevirtuallibrary.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Publishing Technology: ICE Virtual Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.icevirtuallibrary.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Librarians</GivenName>
-    <EmailAddress>mailto:librarians@icevl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hatim</GivenName>
-    <SurName>Ghadiyali</SurName>
-    <EmailAddress>mailto:Hatim.Ghadiyali@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml
deleted file mode 100644
index abd5ff60..00000000
--- a/swamid-interfederations-2.0/www.idcore.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.idcore.ac.uk/shibboleth">
-  <!--
-		This is an "IDCore: Industrial Doctoral Centre for Offshore Renewable Energy" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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-13T13:01:46Z"/>
-  </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.idcore.ac.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://www.idcore.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Logo height="150" width="300">https://www.idcore.ac.uk/idcore-logo.png</mdui:Logo>
-        <mdui:DisplayName xml:lang="en">IDCore: Industrial Doctoral Centre for Offshore Renewable Energy</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAK7gd0sjQD2JMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF2FwcHMtZHJ1cGFsLmlzLmVkLmFjLnVrMB4XDTEyMDgyOTE1MTIxNVoXDTIy
-						MDgyNzE1MTIxNVowIjEgMB4GA1UEAxMXYXBwcy1kcnVwYWwuaXMuZWQuYWMudWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBP5Wgep0NwhDiAP5y9UHc
-						FRRZJ4fiL3mfrY4oQ2PvFsvN/jtDhuEuhHBsEpVOlcbKuaCUg9paOc68vIRMA6dC
-						dcfXXJNuQR5EGy/zWRZIefnvkw7oCsBYVJ+UjXcslXPaGXxpHFaTtN4vrtqaaoGO
-						aYNaIf32wSdyTl8sRgTobNzPWopnK6m1ekXrT154CZvNxwp6+kM90F0IBnb5Jvf4
-						buNIE0jOy2YlkZTdKgH9Kb7tmmHQ3gbtFdACFLXAMGs5CWGOnQ/1YoBQwFBOgOA/
-						W/9G/ZfhLhzEb0tb0PxmqsOZ96vzIqs2hd9IQECGQRgi0YV4ONhZE1dmLKTUmvzv
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2FwcHMtZHJ1cGFsLmlzLmVkLmFjLnVrMB0G
-						A1UdDgQWBBSh9CWZWwNRL+PnLAu7iijpQJysdTANBgkqhkiG9w0BAQUFAAOCAQEA
-						aSfbpYHZPKsyE0TjG3+ucOQB3qJ+tv2XREPZ/fLtxq8Hg5bMQHuOYOspkXYR9fH3
-						F5Hw6X/f9DowHflKU7HHWwc5TVa6P+vHVb6jGRopECgbU7nek/gfpjuA6I5VKlGA
-						yjJU2HXGnFJ+DamnYoH5tB5IcMqXJ4zop9KqCXHJbRCPJ0LVgarKhVQbxVK8sQ4O
-						PSI2TFKA8/4KbNfVe5L09FBKdsteBkrynMq+XvyRDdsyIgtyJm9uCRb6afaA+ukv
-						PwGx7cS/nQdkxdrixzw/1gfshcZE/K+3io2eb4dVZMVCyQgutiNCGb8JSarkKPcZ
-						1YCoQCcNbfG91gxyN612mg==
-					</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.idcore.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.idcore.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.idcore.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.idcore.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.idcore.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.idcore.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IDCore: Industrial Doctoral Centre for Offshore Renewable Energy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.idcore.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Service Management</GivenName>
-    <EmailAddress>mailto:w3hd@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Service Management</GivenName>
-    <EmailAddress>mailto:w3hd@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.images.group.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.images.group.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index 780115b4..00000000
--- a/swamid-interfederations-2.0/www.images.group.cam.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://www.images.group.cam.ac.uk/shibboleth">
-  <!--
-		This is an "IMAGES Network" Shibboleth SP for the University of Cambridge.
-	-->
-  <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="2014-11-05T14:38:03Z">
-      <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.images.group.cam.ac.uk/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://www.images.group.cam.ac.uk/Shibboleth.sso/WAYF"/>
-      <init: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.images.group.cam.ac.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://www.images.group.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
-						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
-						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
-						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
-						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
-						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
-						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
-						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
-						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
-						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
-						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
-						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
-						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
-						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
-						RsenNm/aXp0wIU+jHVmi/GAPCQ==
-					</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.images.group.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.images.group.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The University of Cambridge IMAGES Network</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.images.group.cam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.imperialhomesolutions.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.imperialhomesolutions.co.uk-shibboleth.xml
deleted file mode 100644
index c1d64249..00000000
--- a/swamid-interfederations-2.0/www.imperialhomesolutions.co.uk-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://www.imperialhomesolutions.co.uk/shibboleth">
-  <!--
-		This is an Imperial Home Solutions Student Accommodation Search SP for Studentpad.co.uk 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="2014-04-22T11:21:23Z">
-      <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.imperialhomesolutions.co.uk/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://www.imperialhomesolutions.co.uk/Shibboleth.sso/WAYF"/>
-      <init: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.imperialhomesolutions.co.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://www.imperialhomesolutions.co.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC5TCCAc2gAwIBAgIJAPDeYJ9fK7sUMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-						BAMTCmNwNS0zNTM0OTQwHhcNMTQwNDIyMDc0MzU1WhcNMjQwNDE5MDc0MzU1WjAV
-						MRMwEQYDVQQDEwpjcDUtMzUzNDk0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-						CgKCAQEAut1QMxWT6HWYp+apapBDYazxaeutbzmKH4LpLgnsLQQtNgWqx3Fer888
-						0h7vp0nMYKeZaB0kTliyBIxzYLc0CsfaKqm20QiOWfTlg53cdikVrtGDLc4id9zv
-						DQJhMjwgUXKvs0XwJN7yKsq8eSOCYyCE1TpJfK0VT4HHfh/Wn17QFNTDoR+jJ2i7
-						4bpxnaAOPI+/4vyW56fTDpLV9XwhtVv179zkloHfccbDRc57QvRrxMy3I7uQtU79
-						cr8QQ7CjpzjG43D1ncI741lVQcUimn2DDy282cgcFTaIif3mjVx51qIbrRqYfKsd
-						3rAMy5Bj2bleoOnpTwK0wJFbCNBkaQIDAQABozgwNjAVBgNVHREEDjAMggpjcDUt
-						MzUzNDk0MB0GA1UdDgQWBBQNe+WX17m5BA+2JOe1ipAKtySOTDANBgkqhkiG9w0B
-						AQUFAAOCAQEAIWpKD5IuImla1LnqP8sZn9NyKlYAKKZ36eiU6oTGGnGiWf4Wtd78
-						f/OP+hHUs05Jb6a1+JpoJhe5JUkadcNOizXtpp6xfq2Tb3C/iO+m68V+Og9K2fm3
-						yzOlWWQjfaiZUuf20Y+UCjP7IGHUyhAHve0ECYcqway3Kbz82KiopbhcoQJK93qf
-						hFPMyE5VqqCHA4B/rUj6ZsaBjGxTGZ0bopaAScMsUJpZ5LP4+NK+6aO1V4RZtve1
-						ZF05+Alc7GbNsb53cAOFAehJEZiZOjbPtTkVTU/yZk0sTAXALQXnNjMBKFbn7dyB
-						vB9Gj0YneP92oYbUZ7AooBDGTwcCKxiM4A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.imperialhomesolutions.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.imperialhomesolutions.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Studentpad.co.uk Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Studentpad.co.uk Limited: Imperial Home Solutions Student Accommodation Search</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.studentpad.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Borman</SurName>
-    <EmailAddress>mailto:steve@studentpad.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Darren</GivenName>
-    <SurName>Steven</SurName>
-    <EmailAddress>mailto:Darren@studentpad.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steve</GivenName>
-    <SurName>Borman</SurName>
-    <EmailAddress>mailto:steve@studentpad.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Darren</GivenName>
-    <SurName>Steven</SurName>
-    <EmailAddress>mailto:Darren@studentpad.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.independence.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.independence.co.uk-shibboleth.xml
deleted file mode 100644
index 904aaad6..00000000
--- a/swamid-interfederations-2.0/www.independence.co.uk-shibboleth.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://www.independence.co.uk/shibboleth">
-  <!--
-		This is an "Independence Issues Online" Shibboleth SP for Independence Educational Publishers Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-08-12T15:52: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://www.independence.co.uk/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://www.independence.co.uk/Shibboleth.sso/WAYF"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Issues Online</mdui:DisplayName>
-        <mdui:Logo height="79" width="329">https://www.issuesonline.co.uk/resources/images/header/logo.png</mdui:Logo>
-        <mdui:Description xml:lang="en">Issues Online explores today's most important social issues through 
-					articles, videos, ebooks &amp; more.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJALdHDkKittLZMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF3JlYWwxLnJlYWxuZXQyMDAwLmNvLnVrMB4XDTExMDgwMjEyMTYxNVoXDTIx
-						MDczMDEyMTYxNVowIjEgMB4GA1UEAxMXcmVhbDEucmVhbG5ldDIwMDAuY28udWsw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/Ogks/sRjSvAzujMkoEn7
-						89fJQ4EHrCbnvAF/7dAKRhsr2Yalkvuf6oNI+SI7NL1lUiNWOBYyIVBEl2Q9gyi3
-						5/AWMPDe0c1Kw7Y0lBBvKDEzyixlSfTh/Nszh4qgaVBvV1qaFc65SK4m+EWXoB+3
-						T1lUX/5upB188Xj4xtl+QDv1iPGNBRlfstG9RUMVgNHeHTCYLdWYQv+ZubbBJUkX
-						SZ+xedFVulYAMPn5qjh2F0z0fTw6yzY9arrWRohbVoZyUXODO+ekGTGMj4OHJk2a
-						BVvRzeCburjo8NRV58kq97zqEgPYqFeTj9eFxN7nkej5VRD3FWBPtH63DTLVIdAB
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3JlYWwxLnJlYWxuZXQyMDAwLmNvLnVrMB0G
-						A1UdDgQWBBQW+gIr9QKPFZn7blTtjZ4W/zt3JzANBgkqhkiG9w0BAQUFAAOCAQEA
-						B52AFbao2FOGfM1rS/XAy8j3qrLVJOPoEGevcN6lA+J0xfzLIQnqGgLNagIYMR/t
-						MMTLNK/Z7fTPQsDEXXr3aH+yKBjctyWz3vAkVM7r/JzopxSCuwzVNkawDqfeyXVW
-						ZkQfI16kQXh/Rdom2K6MMHG8YEKvc1w2UlnjX8qo7N8n2NqZiDZvvB1rP12ER0cq
-						QrQo1cgAM2crAb7eVXHxYVlfMqnD4y4xVkcwf1hoYEfxjFWExRKp+pom4tffxXs2
-						Ot71rokgeIjZSPUMPCSfu/PGiw2S8yxiEi8/5sXx0mbFNJ+SlamPNl8AYSONeiTu
-						CsJ2jfI9xrr+q7DFANi+HQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.independence.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.independence.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.independence.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.independence.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.independence.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.independence.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.independence.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.independence.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.independence.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.independence.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.independence.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.independence.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.independence.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.independence.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.independence.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Independence Educational Publishers Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Independence Educational Publishers: Independence Issues Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://independence.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Issues</GivenName>
-    <EmailAddress>mailto:issues@independence.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kari</GivenName>
-    <SurName>Sewell</SurName>
-    <EmailAddress>mailto:kari@realnet.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.infectiousdisease.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.infectiousdisease.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index e595cf66..00000000
--- a/swamid-interfederations-2.0/www.infectiousdisease.cam.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://www.infectiousdisease.cam.ac.uk/shibboleth">
-  <!--
-		This is an "Infectious Diseases" Shibboleth SP for the University of Cambridge.
-	-->
-  <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="2011-05-06T12:47:56Z">
-      <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-cvdc.eng.cam.ac.uk/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://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/WAYF"/>
-      <init: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-cvdc.eng.cam.ac.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://www-cvdc.eng.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
-						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
-						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
-						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
-						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
-						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
-						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
-						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
-						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
-						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
-						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
-						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
-						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
-						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
-						RsenNm/aXp0wIU+jHVmi/GAPCQ==
-					</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.infectiousdisease.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.infectiousdisease.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Cambridge: Infectious Diseases</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.infectiousdisease.cam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ingentaconnect.com-shibboleth.xml b/swamid-interfederations-2.0/www.ingentaconnect.com-shibboleth.xml
deleted file mode 100644
index fd994643..00000000
--- a/swamid-interfederations-2.0/www.ingentaconnect.com-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://www.ingentaconnect.com/shibboleth">
-  <!--
-		This is an OpenAthensSP vsn 1.2 'IngentaConnect' SP owned by Publishing Technology plc. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDbjCCAlagAwIBAgIES2K7ITANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJH
-						QjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEiMCAGA1UE
-						ChMZUHVibGlzaGluZyBUZWNobm9sb2d5IHBsYzEfMB0GA1UEAxMWd3d3LmluZ2Vu
-						dGFjb25uZWN0LmNvbTAeFw0xMDAxMjkxMDQwMzNaFw0yMDAxMjcxMDQwMzNaMHkx
-						CzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hm
-						b3JkMSIwIAYDVQQKExlQdWJsaXNoaW5nIFRlY2hub2xvZ3kgcGxjMR8wHQYDVQQD
-						ExZ3d3cuaW5nZW50YWNvbm5lY3QuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-						MIIBCgKCAQEArI43vZrkFNp7iDu15WSeQJHypb1dyWNnpHOwGiw5C2E5hlR9EoP8
-						1oIHAeviGP6ux25Jcpw60glnEJ/kXO7lXsq7qCHjfP0zFHtL0GB2g8TicQYOXSmq
-						2AlpWs6kXo4sNpzsVxfFUjE0XFH8fJ/xTmgXYZ0usz+AQ3cThMPqh14s+Y04ti4n
-						CmXFlQJvTaB68fYPn2LeArZV3peW1A9i6yqjJJJWesJwa8LIS6DFJto/MqgRVkPY
-						t09MzppaB5P50kfyZ6c4wHsn+e1eskP5MTbgwTZCtw6gKDrQHiXmsW/64yT0cg6b
-						zv3CWcvCatmKwQdZK8CnEI5eO9lSW7h/mwIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-						AQCBMD1O5Vl0JjhkzhAGj4bxdVIiORt5XC5WA8t86tGRsM+/AGG7sOOWCDKwj0xo
-						EUkhSbsGksXyoiap/FGXCzEgyXIYPtr/SgwR/hcVd9aqlhCQJ2Fy06cMfPZYmJ+c
-						rv9YuSO0Bs0zqnsYVf+Sw+8fDNPcY5R4afYcUAh+VngzPc2TOV+RxgDC69laBqHU
-						4WhrXwC348vHmWnLbc+F4JG+ELE3Lid9WX/ieFC/wt3xqbpzaVPQPpi+G1PS7Wux
-						wJdSYuAueKsqY3HJLDfnICkFvfLpptvKj28xxmkVb+qlKoGf6XX7toxw0O5WIa71
-						VS6MHJn5tjjxCiYXqnypfalg
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ingentaconnect.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ingentaconnect.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Publishing Technology: IngentaConnect</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ingentaconnect.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:help@ingentaconnect.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dave</GivenName>
-    <SurName>Lord</SurName>
-    <EmailAddress>mailto:Dave.Lord@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.it.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 65ba3d03..00000000
--- a/swamid-interfederations-2.0/www.it.ox.ac.uk-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://www.it.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-12T12:56:05Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9DCCAdygAwIBAgIJALiR16U+pefzMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3d3dy5pdC5veC5hYy51azAeFw0xNDA5MDkwNjU5NTFaFw0yNDA5MDYwNjU5
-						NTFaMBoxGDAWBgNVBAMTD3d3dy5pdC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAOABFZclDrQXCNO8wK1S1Tt8039mZWM/56weI2lVBwmN
-						aai/dxp6Gm+vKqGAT6kjEKJfJ3pZolQgW5mCae/3OA8MAn0R8qS9X/rD9BxI5Ojt
-						cGKDJnEjjbmPr52NdYqyIYj20LN3bu4CW/8fDIc7UKKN22D2er8QS/qUVzjwtgju
-						aMh98joueAhStymx23IJXFhFMrg/Rq8JWdavUMCZbbs/RrrBQT5fIINJHvax0/fS
-						gxRRCzu4tm28PoC9Sk0S52DlL0zUCgowuWyUCr60ki/ACi+aCvf0GHStDnvdWixE
-						CMLnab/B4XFOv35fIBfq3ZXZ1tJwVI0uAhbqeXbjK/UCAwEAAaM9MDswGgYDVR0R
-						BBMwEYIPd3d3Lml0Lm94LmFjLnVrMB0GA1UdDgQWBBTuCDHn6ylly7cHFIau2Gav
-						jZRgLjANBgkqhkiG9w0BAQUFAAOCAQEAfqLFckAdO1Q1EWGbNCs1rMRRnrQhOJgY
-						5qbsoBKjfAij1z2avZJLtoqNmiSglMRJAaQymrx4lRUeZeZMWKvftE11c+9HRmq9
-						EN4fOmHyWttTc7QUtq+28Xj7N5t1yCYJPK04GcCoGy3x3ZF+Z08vCzIEk2OceE0r
-						duOhRjYNHwG+VZjOnhBKWOs6UeYSHEci4XKr7fF4ocCkoww1/edkVuZD2pGy7Sao
-						P/JIEQd+URAlarYO35ZmHsYStSGbaQqm219AXhRuI3AgwhwEeyNFPqH+R5iYq5Nk
-						UOpxlu7UHRZ26ugA3ldH/hcFkRPpDdopu7qESNCfpanceMeXx3Re8A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.it.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.it.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.it.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.it.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dandy-live.nsms.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - www.it.ox.ac.uk</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.itslearning.com-shibboleth.xml b/swamid-interfederations-2.0/www.itslearning.com-shibboleth.xml
deleted file mode 100644
index 31c7ad01..00000000
--- a/swamid-interfederations-2.0/www.itslearning.com-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://www.itslearning.com/shibboleth">
-  <!--
-		This is an eLogin SP for it's learning UK Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIJAOCa2W5sQVpdMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmVsb2dpbi5pdHNsZWFybmluZy5jb20wHhcNMTEwMTI1MDk0MTIyWhcNMjEw
-						MTIyMDk0MTIyWjAhMR8wHQYDVQQDExZlbG9naW4uaXRzbGVhcm5pbmcuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3/pjEfFtjLzqjahh8G57a4bE
-						xgDVLPMsVrYkxMwmjR0fvMjGD/WIldj/XKBga7EzMfSSqAtGcluHwcQotZn3VKzI
-						+pp5SDGnjaZLb5Dlx4Pqn8QXtv9fFdTU8bkk4nWJLAabrBV1PDNlc9TvLYo4BEKh
-						uK6WvNIZqshS4NX241PcyIW+/tbs3gY4ZpqCIgF21cX+UHX+JWxHrgKzWRXlpYRX
-						8/La7yxJxNsgeQfsNO9et8nAGcMFpATGGK9N4IcSzdlZM0vPLTcP5NrYhVrc4p/v
-						Sh2wVgCAX0RM4xXTKZSPiv2bbXqz1m+61cdY+097umpFqKP/4LcgRrOWyn8DoQID
-						AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-						YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUK1LiEqSXXlTIZiRAUXIdhrxt50Yw
-						HwYDVR0jBBgwFoAUK1LiEqSXXlTIZiRAUXIdhrxt50YwDQYJKoZIhvcNAQEFBQAD
-						ggEBAF2W34ZCfjR4aZcTcNwLwAJBJZWNoJTpkzl6DiTLSTpmXjcDSVQQCUontqjp
-						WDatCmrM/5JamvZaNfyJ1tHrkNwvKEsvTzalLFs00E9GcOQq8I/Xfj6uBGAYICB5
-						eSKnhIHMJDlSc6ilYxDlB8KJM4UFXQ+SIsJLcX9AbsdHI0X/s68c42/teSQgN2Yc
-						wtiCUhjKgaY1iI6B/CaS0akF+hK4wi3+vV9Iis3zjOPZgmf6K+n/5HGKmplQF2H4
-						ffAJBB8DdkCd3njov1flLlnfQHDh0o0/yPSJkkdknqxhFs7yvEV+c92gwZCFjwka
-						J4ZzgrTMRBGb/0XGn/eHvuvUdYY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.itslearning.com/elogin/logout.aspx"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itslearning.com/elogin/default.aspx" index="0" isDefault="true"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">it's learning UK Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">it's learning UK Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.itslearning.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Waseemr</GivenName>
-    <SurName>Akhtar</SurName>
-    <EmailAddress>mailto:Waseem.Akhtar@itslearning.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Waseemr</GivenName>
-    <SurName>Akhtar</SurName>
-    <EmailAddress>mailto:Waseem.Akhtar@itslearning.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.j2e.com-shibboleth.xml b/swamid-interfederations-2.0/www.j2e.com-shibboleth.xml
deleted file mode 100644
index 86e58d0c..00000000
--- a/swamid-interfederations-2.0/www.j2e.com-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://www.j2e.com/shibboleth">
-  <!--
-		This is a "j2e, online document processor" Shibboleth SP for Just2easy 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="2008-10-08T15:13:09Z">
-      <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.j2e.com/secure/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://www.j2e.com/secure/Shibboleth.sso/WAYF"/>
-      <init: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.j2e.com/secure/Shibboleth.sso/USO"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAPqSMDPu7s7hMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnNlcnZlcjQwMjE1LnVrMm5ldC5jb20wHhcNMTAwODEyMTE0MTU2WhcNMjAw
-						ODA5MTE0MTU2WjAhMR8wHQYDVQQDExZzZXJ2ZXI0MDIxNS51azJuZXQuY29tMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm00KE1iG3uVXv+86GKejBCib
-						7bDRpAE5jS+NN/X+f7ix+pzYFbzAQrSfg97oJtaWTzmp2zULk5lsMVWIJbiyG/Uz
-						FpJgBhBf0lzHsVNKEnunJckoz5bYpgpCnVx9V2XrFw+tes7Sl5LhXiFdwqV8ottG
-						SrovCOzl74g4zn50g5wZsUticBrqWFNlSbFQISXFtFCUbqL4zf8zA/Wx6c3HEMZL
-						1WKPSHUbPgIjil0DPjEd0AToKZspcZozcRLWQ1iSPtswGuNin7FpVu+8M5szZY6f
-						rpiKTNfhYFNQxNKV5dnLCMlmVWqYIk3ZCfVJlxmP72DbRuJL6Vhd6wD7hYjatwID
-						AQABo0QwQjAhBgNVHREEGjAYghZzZXJ2ZXI0MDIxNS51azJuZXQuY29tMB0GA1Ud
-						DgQWBBT/nC5f54/+gnhLUYLGGV5YsxtdxzANBgkqhkiG9w0BAQUFAAOCAQEAlOyp
-						YMgWX6wsU/I2hIf1pkPBjsJCxC82pNCZjcSwZuAowueVnt5Xr70UjiAuwgLjJgQH
-						RARZKrWJ8mIkJrWbPi0/uLN8xV72e6V8F2MFTAWVvQ7Se8Bor4Q2fI7NvMwRrCbY
-						YhhlNdVyfNYzUikw5g8YDODoUA1cg1twOu/a0zt4GqCtqjGMLVASNBYud/UMtOAo
-						gI0klRGMhY5nZzvy/rBZL0WFaXsQ6Fk0Ywn+YQ6HZjTnQO23+T9vUXMBMEmomF2B
-						i291jv0WzvQWVDfWSxY3Z869r+Y/bFqbhv9YXKwDSOx52sscAl1yjy0vDwuMKHyr
-						FzKrATccENnvJUM7hQ==
-					</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.j2e.com/secure/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.j2e.com/secure/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.j2e.com/secure/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2e.com/secure/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2e.com/secure/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.j2e.com/secure/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.j2vote.com/secure/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML2/Artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML2/ECP" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.j2spotlight.com/secure/Shibboleth.sso/SAML/Artifact" index="18"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Just2easy Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">j2e, online document processor from Just2easy Limited</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.j2e.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Danny</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:danny@j2e.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Danny</GivenName>
-    <SurName>Young</SurName>
-    <EmailAddress>mailto:danny@j2e.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jbe-platform.com-shibboleth.xml b/swamid-interfederations-2.0/www.jbe-platform.com-shibboleth.xml
deleted file mode 100644
index d55e31ea..00000000
--- a/swamid-interfederations-2.0/www.jbe-platform.com-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://www.jbe-platform.com/shibboleth">
-  <!--
-		This is a "John Benjamins Publishing Company" OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-03-19T13:22:11Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDujCCAqKgAwIBAgIET+iFsjANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMC
-						TkwxEjAQBgNVBAgTCUFtc3RlcmRhbTESMBAGA1UEBxMJQW1zdGVyZGFtMSowKAYD
-						VQQKEyFKb2huIEJlbmphbWlucyBQdWJsaXNoaW5nIENvbXBhbnkxIjAgBgNVBAsT
-						GUpvaG4gQmVuamFtaW5zIGUtUGxhdGZvcm0xFzAVBgNVBAMTDkpvaG4gQmVuamFt
-						aW5zMB4XDTEyMDYyNTE1MzcyMloXDTIyMDYyMzE1MzcyMlowgZ4xCzAJBgNVBAYT
-						Ak5MMRIwEAYDVQQIEwlBbXN0ZXJkYW0xEjAQBgNVBAcTCUFtc3RlcmRhbTEqMCgG
-						A1UEChMhSm9obiBCZW5qYW1pbnMgUHVibGlzaGluZyBDb21wYW55MSIwIAYDVQQL
-						ExlKb2huIEJlbmphbWlucyBlLVBsYXRmb3JtMRcwFQYDVQQDEw5Kb2huIEJlbmph
-						bWluczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALMqOR4PgDreV+UO
-						vuPNESTuAQTSyYG5UpY6x4AbEkm3zt4wNsU5DmkDgmpkk9c99nTsVvlbPZwfpfO6
-						AyEo40IUZAgJoStP7xQG80E3t+PQoiLpuVgyHqNLQDNw6C1QRIyDviY9ensHCLyG
-						o2mhNrtZ8VWus1MPU5vwvy8i7DNJG5g2e7RDhGuZKCylJveOS9TWqg29m3y9INJ3
-						vit56JKThUO8z1q5lq8+N/Qypxp7zKh0n1Ro9IyhJIB6hbTCghzUjolA9Mf8Tyg4
-						ow47u/F9G2tpSwAPdFbu64Js28VTlI0oPuR1t1ZEK0cMcNGJA76UR0YCkp3XZ5uq
-						XlYzXzMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAsCtP8WizYJ+mrsh/JlO5ECd0
-						lz1/AM8X6C6t+gjGevBETt63/U7LitxJz/ScuZil3KxMlt9KaZpizeo8ae6X5ILX
-						cG9V90x+FCrsFjSIJIssu2sbXzOWrfQlF6j6VOvCIYC/EWhiK8Bw9sjPlhXruAg3
-						Ylwm/tXxEuiPHxX6tgZJY5pHBY+E5Hl9NDh0DYVBb1kg+ITqzpfKK/Si0RDndzUi
-						IdRzKxDMyNlEKi7HUPm2ZLkOs+PO4iieLSeJBdulWJ7pNlP0st2dE+aak59hOnjX
-						45KA8uRF+9bX7vRf7Ya0XkKgDuRFO3dQrS4d012lE2jtLyy92b6lEV5ur4GcCw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jbe-platform.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jbe-platform.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">John Benjamins Publishing Company</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.benjamins.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Anke</GivenName>
-    <SurName>de Looper</SurName>
-    <EmailAddress>mailto:anke.delooper@benjamins.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:openathens@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jisc-collections.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.jisc-collections.ac.uk-shibboleth.xml
deleted file mode 100644
index d2b51997..00000000
--- a/swamid-interfederations-2.0/www.jisc-collections.ac.uk-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://www.jisc-collections.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 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="2011-02-01T16:22: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://www.jisc-collections.ac.uk/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://www.jisc-collections.ac.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://www.jisc-collections.ac.uk/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Jisc Collections</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Jisc Collections supports the procurement of digital content for education and research in the UK</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.jisc-collections.ac.uk/Documents/Jisc%20logo/Jisc_Logo_64x64px.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDUjCCAjoCCQDzQJpygfVTxjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGTAXBgNVBAoTEEpJ
-						U0MgQ29sbGVjdGlvbnMxHzAdBgNVBAMTFmppc2MtY29sbGVjdGlvbnMuYWMudWsw
-						HhcNMTEwMTI4MTU1ODE2WhcNMjEwMTI1MTU1ODE2WjBrMQswCQYDVQQGEwJHQjEP
-						MA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGTAXBgNVBAoTEEpJU0Mg
-						Q29sbGVjdGlvbnMxHzAdBgNVBAMTFmppc2MtY29sbGVjdGlvbnMuYWMudWswggEi
-						MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOi5rCHkxIFijmIutmjK46cxws
-						rCD8GwR12njggDuiMp51xoIjsZPvjLUam1NC1ik9JTQKNdGUnJDi9Mg0EJ0di06i
-						tuoKle7qO526zB6/V7mTDYp+VHuipEr1w55f4UTxcgjxyzAM64P0Nth+4tmYY9dF
-						0eNNkSozotaCyqdh8WuTNsE4m2A5AlYD5pMLWpJcKLJqbBIx+XH23k4nBQceuYk8
-						iiKN4alJ8pFQcuzh8Bxxby9lKYjavSamjBi/MhhMMWwMd5O7PJHCj0Voyem9PGZG
-						HbQYAjjqYHzVQXHYlLWAYeyYrq6r1mB9VhLofOcSTxgn7GniD/lNAi607DTLAgMB
-						AAEwDQYJKoZIhvcNAQEFBQADggEBADSgmIvVUoZs5T/sk04+xC6hij0xQouwi0+O
-						W8b4SGdMRrgn9nZ+8XRlhaGu9Nk4Vr9HU1djNbvaVw9DiJJ8j24Aggl1TP3THG6l
-						LvzeK6zmwGqxWKPJH5Fr4t3jKqNauFEDxlbA30Qj8VzFO/KSN6aRvrkeuPnJOmcf
-						tRjvWI+4CWEugY71OJjukJ8dNT3DOZLuLfHqzIDjAbrpFKeq+ktbAkR+CIdx59Go
-						/D9NN+plf4NJOs37pk8YfnyyVsR6Gz/eSjK2XgJVZ/7Xa6VIqcPwbvhaBfRpc8Zx
-						9tU+F6+/Gl/SQn9byiovbhO+UIGqktvx26oEnpbrV0suXvB8TvQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jisc-collections.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Collections and Janet Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">JISC Collections</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jisc-collections.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Kidderminster</GivenName>
-    <EmailAddress>mailto:vlem@kidderminster.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mark</GivenName>
-    <SurName>Williams</SurName>
-    <EmailAddress>mailto:m.williams@jisc-collections.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jiscmail.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.jiscmail.ac.uk-shibboleth.xml
deleted file mode 100644
index 2c3a93bd..00000000
--- a/swamid-interfederations-2.0/www.jiscmail.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jiscmail.ac.uk/shibboleth">
-  <!--
-		This is a "JiscMail Service" Shibboleth SP for Jisc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-07-03T10:52:27Z">
-      <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.jiscmail.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">JiscMail</mdui:DisplayName>
-        <mdui:Logo height="70" width="172">https://www.jiscmail.ac.uk/images/logo.jpg</mdui:Logo>
-        <mdui:Description xml:lang="en">The UK's national academic mailing list service</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAMnG2CD3FyHGMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGppc2MudXMubHNvZnQuc2UwHhcNMTIwNjIyMTQzNjIyWhcNMjIwNjIwMTQz
-						NjIyWjAbMRkwFwYDVQQDExBqaXNjLnVzLmxzb2Z0LnNlMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA1dFfOJ0m8dRlEY9n1D927Ectjg2wAVdiKt58zyoK
-						54RQC4B/hO0mdegjZnHGrHDzBis3MkZvlU6FityLmCFmPSMqXrVQNaYFvfCsNgMw
-						6NTveQihtjuK0oeoqKp6XxlQCMrx07vTdFDl7D9KStkJsny4De/or8PSHgkItmnS
-						T+4LG+rZ6YiJDwqG+p1TPbrokYLb8cqfnLehwEYXy9XK1aw9niGRuW10Bot+rqr8
-						2T18Ua62H9aAgkd7Agkvs6VreE/JN04nL3Vgyw0m5KQtSKpY/jK8VjsgVwnduaXh
-						YuewUItomHtfmeRyiUqWMgCU9iGFPVMfmjfO2Gx+fclENQIDAQABoz4wPDAbBgNV
-						HREEFDASghBqaXNjLnVzLmxzb2Z0LnNlMB0GA1UdDgQWBBRBpxVcwZ+DwDeciyWy
-						MpQiE6KHMTANBgkqhkiG9w0BAQUFAAOCAQEAyREmFIBTYtOSGx/a1jy6pXfCsV04
-						Yvba0tJbdm67J35jl+yfPNSr1RvSHa0e6shjTDCDn2v+r8c2T1IAdpGdptcVEL6c
-						Cf8ns7Jvkf0ypdD6cZVQjMxtNPT1Okl6r0zZAJ/mJS7EZHoxjSzN0BM95upJmyyw
-						V0jSlzJlIBn8ZumF7/uhyQvhzaonn0Q5mBN1bR8BaXEZ8OgrcxjNdTeOiomg0Ygr
-						pRA9vwB3NNTZ4B94nXNOZE1bLGTt+f8UbqqFYfn//GbssNhVTdAHVA5zzifiyb2q
-						bkRpHOJxwX+UOUUZeTtsUvXRTjmDGURupehIxv7NQjeS5H7OEw7osqzXwQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jiscmail.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">JiscMail</ServiceName>
-      <ServiceDescription xml:lang="en">
-				The UK's national academic mailing list service
-			</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: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:mace:shibboleth:1.0:attributeNamespace:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Jisc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">JiscMail Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jiscmail.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>JISCmail helpdesk</GivenName>
-    <EmailAddress>mailto:helpline@jiscmail.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Carl</GivenName>
-    <SurName>Vincent</SurName>
-    <EmailAddress>mailto:carl.vincent@jisc.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>l-soft</GivenName>
-    <EmailAddress>mailto:l-soft@jiscmail.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-shibboleth.xml
deleted file mode 100644
index 22d70312..00000000
--- a/swamid-interfederations-2.0/www.jordanpublishingcpd.co.uk-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.jordanpublishingcpd.co.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for Jordan Publishing Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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.jordanpublishingcpd.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://www.jordanpublishingcpd.co.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Jordan Publishing / Family Law</mdui:DisplayName>
-        <mdui:Description xml:lang="en">For access to law reports, case law, commentary, precedents and legal and administrative changes.</mdui:Description>
-        <mdui:Logo height="64" width="252">https://www.jordanpublishingcpd.co.uk/jordanslogo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYjCCAkoCCQCgLsM5xyLGGDANBgkqhkiG9w0BAQUFADBzMQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHQnJpc3RvbDEQMA4GA1UEBxMHQnJpc3RvbDEYMBYGA1UEChMP
-						Sm9yZGFucyBMaW1pdGVkMSYwJAYDVQQDEx13d3cuam9yZGFucHVibGlzaGluZ2Nw
-						ZC5jby51azAeFw0xMTEwMTAwOTUzMDBaFw00MTEwMDIwOTUzMDBaMHMxCzAJBgNV
-						BAYTAkdCMRAwDgYDVQQIEwdCcmlzdG9sMRAwDgYDVQQHEwdCcmlzdG9sMRgwFgYD
-						VQQKEw9Kb3JkYW5zIExpbWl0ZWQxJjAkBgNVBAMTHXd3dy5qb3JkYW5wdWJsaXNo
-						aW5nY3BkLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuFsJ
-						DikTpQWue+TeFD7f/SxyB95/b4D1a/4L04NtzzauQ9G+IZmtzoVvIadkYNZEqBA6
-						gyYddDxQ2z74PO/NUY04xicrwMLsm51CZz6UpZcA/g3Plr0qCNKpQdR6xiZwbH5r
-						QPvNDVpR+k1tcI/ylmvH5XW/XOHqIpr1cWAINiBCs4YXNy26c0V/1iBApKRovTyY
-						Oy2ZqxDLzC1l4xe8AliI318JcIm6ObOk3Z8OjmtzKla58xtjswvQsLVyIlb/10eA
-						XZUUHBjhgl8ule7T9isYtJ250xcfYW37Px8eERxOyTuCi7NEkQGiniSEnzp9PP5P
-						Uf4sugluTP/MRvKkqQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBJ5V21s9XjpfI5
-						t+vb7eleCZOdrFOA0ON9l24CDTADuhakdFA473JgIvjGk2m/VbH5nLZDI26IRIuv
-						lm2G6eaE2FZrDCu/EScmm4G8UxuYWXXj2+grYeWJ/o9U5Zbm38a2j/z2guDCfaO2
-						+3DYYegalq7klPCuwdvN9lObF/8elD3NAx7sFgR0DAyZNF57ppejnrC3yVpyWizO
-						/0hdLckeOfpxUyal2UFB0H7hUqShfBJiJykMczpocFYRPEuOr+21Z89eoAQbplfM
-						ln8E55bf4eHw1k6Wb95K3VeDqwSznFWVXIkxEiWXCuKXxHd+J145S3YZe5ayeRvz
-						wdxJFa0Y
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jordanpublishingcpd.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Jordan Publishing Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Jordan Publishing / Family Law</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jordanpublishing.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Withers</SurName>
-    <EmailAddress>mailto:simon_withers@jordanpublishing.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jordan Publishing technical support</GivenName>
-    <EmailAddress>mailto:electronic@jordanpublishing.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jospt.org-shibboleth.xml b/swamid-interfederations-2.0/www.jospt.org-shibboleth.xml
deleted file mode 100644
index e0899787..00000000
--- a/swamid-interfederations-2.0/www.jospt.org-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://www.jospt.org/shibboleth">
-  <!--
-		This is a 'Journal of Orthopaedic & Sports Physical Therapy' OpenSAML SP for Atypon Systems, Inc
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-28T09:44:17Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEDCCAfigAwIBAgIJAIF4dsDgrPDHMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXd3dy5qb3NwdC5vcmcwHhcNMTMwODA4MjEwMzAzWhcNMjMwODA2MjEwMzAz
-						WjAYMRYwFAYDVQQDEw13d3cuam9zcHQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEA0jDyU9Tft9v4c5QCjZ1TP5rSA+yjVs4hSljUr8J+4BLg+L1Z
-						U//Tn8BtEQG8tcpdwJxmhCi01ZiSgViLVZ0OfVJocdn282S/2DvSdE+fAIhexVzM
-						cbOzgBxQH3B9EuOYECQjavGyGagG1sMIAlck+DrGSsC1yWUgh21aGnIIWK5HYFa6
-						sS7/YgMuE5aw+1ewFJGlQa0qR99YU2S4ZFVSu6gKqHPcVs7LZ6x2QbQClXA5DoHb
-						BEE1uWxW+c/v1hjeQveqKsIbfedMyqaBspafo7AvoGls8qeOjoReh4VVJ8P/7dJD
-						jpQ5+PdGso8ALwIRr8KQ0ZqBY8sHW7capIKnHQIDAQABo10wWzA6BgNVHREEMzAx
-						gg13d3cuam9zcHQub3JnhiBodHRwczovL3d3dy5qb3NwdC5vcmcvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUarBeRQXn6LreSYYMrC8hkzu3BGcwDQYJKoZIhvcNAQEFBQAD
-						ggEBADjQK43pDKaXuxThco8kTtlOdlil/WwxIW2w5q1RNCKYVqlKo9Rzy7oGcGnZ
-						BSYknAHpSbA/NwDWlpCFOExpqbQVhlGE0GhY4wO5dzvVWeq9vKGxsRCFzKrtM4UR
-						zpVen/oOF4YAiVczjaN0tP/7F8mR46ulOFYYkeD1K9iNeCX5ZrJyzDOOHnMUdvzg
-						GepkKFygBC5jioSy4EdcfNA619eMKi5NmHStuRzY4cl9TBDNr9A+cgXZFNq+FXnE
-						zHanSf1XGKKcHrrokXUfhEyqvPeqSITfgDukJQwD/0dooF97bKxFURlwurDLbFG+
-						ckQwYEGAVSf+BbGw6J4+ERRlDJ4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jospt.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jospt.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jospt.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Journal of Orthopaedic &amp; Sports Physical Therapy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jospt.org/</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.jove.com-shibboleth.xml b/swamid-interfederations-2.0/www.jove.com-shibboleth.xml
deleted file mode 100644
index 15ca398a..00000000
--- a/swamid-interfederations-2.0/www.jove.com-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jove.com/shibboleth">
-  <!--
-		This is a "Journal of Visualized Experiments" Shibboleth SP for MYJOVE Corporation.
-	-->
-  <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-09-03T19:35:36Z">
-      <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">
-    <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.jove.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC4jCCAcqgAwIBAgIJAMmZMgpgR98FMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-						BAMTCWpvdmUtc2l0ZTAeFw0xNDA4MjYxOTI5NDVaFw0yNDA4MjMxOTI5NDVaMBQx
-						EjAQBgNVBAMTCWpvdmUtc2l0ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAJpYESYD4dYzXNtXUSDK3W59M7Mr5MdCZxbr8I508aQkXIDwjBNqtr6a7Hat
-						Her5Zr7FU8jaddsO5hgFaOwdN/5EZfqpSDdS6YCop7Y7b5MuKW2IXQqyl3Uf6NVB
-						uFb24x8Jq9PzmpWXE0O+qiRubp9kVR2DsIv5QJcAmMJn46jAyJefqOTTtoeOT9PH
-						HOuOd21k8zRmeFQq2hYgL+8pkVN6KvJMSR8+a7V0xL4TinO2NLgU+REPkh8dZwKk
-						v3YiX5Zy4NHsn8BkdNwlTkB2Opd90ociYnvvWjsLcM0jHLDs+Kg1BBqbtFFE2Aiv
-						WioIclBIAGURdZnHyn5bviGp8E0CAwEAAaM3MDUwFAYDVR0RBA0wC4IJam92ZS1z
-						aXRlMB0GA1UdDgQWBBQJINSSKzlDshwkhXdHrjR2mNn+zjANBgkqhkiG9w0BAQUF
-						AAOCAQEAhrtgkBsbRvQLDtyhGbtMPbTTlGDHrnOXUFx5TqqyGCqYgp86n7awj2kU
-						ypRW27QZr6a7LnyznASyXWWak0JXb90ZvPMR8bpvPEYR1HbGVQ94/+KlOtsR3SjP
-						0swPElIYm9Ff3oNaM0uh3YAi9qhB/ZrTJmXcTDLZDgC3jOApjNV2nvtjb2Bu0ysN
-						yKyJd48ZF72SR5zQKq4S7OcbHtttrk0/xeEHomt+Xw0PzB265Vr14OZoAO91jEvP
-						dU4byrEQ+k+7huxTc6arI5cagwL8GnpH6I0M6Ouj8T4RTmXHKWseJDXYCc9WNlN/
-						qa6mttqxIIeSvf7w0qq4buQC7/jHWQ==
-					</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.jove.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jove.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jove.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jove.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jove.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jove.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jove.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jove.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jove.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jove.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jove.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">MYJOVE Corporation</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Journal of Visualized Experiments</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jove.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dan</GivenName>
-    <SurName>Robinson</SurName>
-    <EmailAddress>mailto:dan.robinson@jove.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dan</GivenName>
-    <SurName>Robinson</SurName>
-    <EmailAddress>mailto:dan.robinson@jove.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jstor.org-shibboleth.xml b/swamid-interfederations-2.0/www.jstor.org-shibboleth.xml
deleted file mode 100644
index 7276948a..00000000
--- a/swamid-interfederations-2.0/www.jstor.org-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://www.jstor.org/shibboleth">
-  <!--
-		This is a "JSTOR" Atypon SP for Ithaka Harbors, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIJAO/X91yads6bMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXd3dy5qc3Rvci5vcmcwHhcNMTAwMjI2MjAwOTM1WhcNMjAwMzA1MjAwOTM1
-						WjAYMRYwFAYDVQQDEw13d3cuanN0b3Iub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAw7BvEJwj35DHu9tuWh/vA8EP+KAgS6VJhKfPDNR2EFrxFgD4
-						FAXJ7WPpF5A0Le1YuYK6JX2Ud5K5uTGAzVg8V1JpFDXy+WXnNebQIWUl3cR3+uAO
-						evP0PRYENkD5oBIt8+maWvH2ualYRuX0Bz6MNqLZKz9EkUYF2FQs42h93X8K+ySY
-						zr8AwmnXbsReMXrvFvwJ0KAxCIgatkSRcCyjih5S+dqxn1NN41jIaptofBMrF1Dl
-						hIlMTxe5CAyAAZgTpI1Qm+i19KLuWqbP4HcOa1w8Heiv3bH8HCSzekTPTMWr3anX
-						q1Jv81wCldLijykb3gSPmPrVmUmdbsmB2iVymwIDAQABo3kwdzAdBgNVHQ4EFgQU
-						eV7t5OZc4Yb7ZjJTzWQYOTmNJHUwSAYDVR0jBEEwP4AUeV7t5OZc4Yb7ZjJTzWQY
-						OTmNJHWhHKQaMBgxFjAUBgNVBAMTDXd3dy5qc3Rvci5vcmeCCQDv1/dcmnbOmzAM
-						BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCcd/tR8Hm2a/G4eRYtDAFZ
-						00hj0LDsY6g7tKlumG9YkQnClLHcjNkofkGEkMgcbAerrPly+gebQKDWv6HqKR76
-						8SYFWYnk5GaoNsMyYbHuxDpJIL1b/55u1JUQKW3VEExB8xIfxnXHojsrtktnufSv
-						SpOxSE35MNv5c7khBeQ+lu+69YDc30/5H3AiEpJgCvmxkCIS1Z8WCCWJq7SaR+HQ
-						chQqK/VS9i2CsHaU3CwZapCqrMaftVoQNo7WfFHkvX7NH4YrNGM5ORE5yEHjP3LI
-						+f+BedC/QRSjPImH8Pjm/iEQ7tbCrouRqz/PJWDoJ+2WJPl+t/aud7L+DVlogKKz
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jstor.org/action/samlACS" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.jstor.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cicada.jstor.org/action/samlACS" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://omega.jstor.org/action/samlACS" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://firefly.jstor.org/action/samlACS" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibtest.jstor.org/action/samlACS" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cricket.jstor.org/action/samlACS" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Ithaka Harbors, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Ithaka Harbors: JSTOR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jstor.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>JSTOR User Services</GivenName>
-    <EmailAddress>mailto:support@jstor.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Peter</GivenName>
-    <SurName>Vlahakis</SurName>
-    <EmailAddress>mailto:Peter.Vlahakis@ithaka.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jstor.org.xml b/swamid-interfederations-2.0/www.jstor.org.xml
deleted file mode 100644
index 09fba2f1..00000000
--- a/swamid-interfederations-2.0/www.jstor.org.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jstor.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.jstor.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.jstor.org,OU=Terms of use at www.verisign.com/rpa (c)05,O=JSTOR (Ithaka Harbors\, Inc),L=Ann Arbor,ST=Michigan,C=US,serialNumber=DOC:19950731,businessCategory=V1.0\, Clause 5.(b),1.3.6.1.4.1.311.60.2.1.2=#14084E657720596F726B,1.3.6.1.4.1.311.60.2.1.3=#13025553</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGHzCCBQegAwIBAgIQXmXbqCJpgZQaxPy2I4z7MzANBgkqhkiG9w0BAQUFADCB
-ujELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMr
-VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTAeFw0x
-MDAyMjYwMDAwMDBaFw0xMjAyMjQyMzU5NTlaMIIBCzETMBEGCysGAQQBgjc8AgED
-EwJVUzEZMBcGCysGAQQBgjc8AgECFAhOZXcgWW9yazEbMBkGA1UEDxMSVjEuMCwg
-Q2xhdXNlIDUuKGIpMRUwEwYDVQQFEwxET0M6MTk5NTA3MzExCzAJBgNVBAYTAlVT
-MREwDwYDVQQIFAhNaWNoaWdhbjESMBAGA1UEBxQJQW5uIEFyYm9yMSQwIgYDVQQK
-FBtKU1RPUiAoSXRoYWthIEhhcmJvcnMsIEluYykxMzAxBgNVBAsUKlRlcm1zIG9m
-IHVzZSBhdCB3d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNTEWMBQGA1UEAxQNd3d3
-LmpzdG9yLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALUHbY3t
-UhCGReVnUwqLCU7elcq4FNKRvTajIvfdnmwB4zXGtZZGoIIoCS8yVFAYPAsT48+m
-xJ3y3GxhNM38nuZjjZi3Rp3ab0RpNoHfmlozTdvMdlbOzOpC6RVSgnyYcKouIw1c
-X4UH0yRbd/8evLK1H7I4VIug1YoZfPC7mr8HCppJJlIfxilS46ruQL75jQEWks7C
-bmB5tQNCr5ah6OnnskGXRHF5hpQmF/3aBvRuPDa3wl3EIlnSAhCoMgE7gPHqLcjX
-hIKX/MrGPuMHEMhBfXMq3yOzuTjX03ukwqUM5Fb0LijWonQz1PQIN8QPaJLo+8Qj
-pKfkUJ6lmQY1Oy8CAwEAAaOCAcswggHHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWg
-MEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6Ly9FVlNlY3VyZS1jcmwudmVyaXNpZ24u
-Y29tL0VWU2VjdXJlMjAwNi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXBjAq
-MCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vY3BzMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBT8ilC6nrklWntV
-hU+VAGOP6VhrQzBzBggrBgEFBQcBAQRnMGUwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
-Y3NwLnZlcmlzaWduLmNvbTA9BggrBgEFBQcwAoYxaHR0cDovL0VWU2VjdXJlLWFp
-YS52ZXJpc2lnbi5jb20vRVZTZWN1cmUyMDA2LmNlcjBuBggrBgEFBQcBDARiMGCh
-XqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsp
-rEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYw
-DQYJKoZIhvcNAQEFBQADggEBAFdIEgpPjryqc6c4Cn5beVW3U6StHIHn6K1Pmdjm
-zg3KrMWh7q7XYwATkG3+E3xl/j0gcgp3JOZF/WudfIYlanoTIdwtcgH3atiD+V1E
-RuOy19Qagr5LZG6ZSfsUR+kGaQTRWolznngzKiJOhjYt0RH7IGnJ8NCNpFWFgCjJ
-UWJqHCSkQ+fmjmpJMa+XE7r2YeqamXA6RNA7tH6Sk/BM92PuI3yyPuMVxKVHSFEB
-Cp5hKvpnTsU7XXEyje/rfDvAVbO34z34/Z3uWPr5C710E2aV3/As2xRF9kYmMcsb
-1NGyA/5UtjYY/ZuPpIVnXu4ldkf2oMIohwcE9K/1j6k4B3Q=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.jstor.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.jstor.org,OU=Terms of use at www.verisign.com/rpa (c)05,O=JSTOR (Ithaka Harbors\, Inc),L=Ann Arbor,ST=Michigan,C=US,serialNumber=DOC:19950731,businessCategory=V1.0\, Clause 5.(b),1.3.6.1.4.1.311.60.2.1.2=#14084E657720596F726B,1.3.6.1.4.1.311.60.2.1.3=#13025553</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGHzCCBQegAwIBAgIQXmXbqCJpgZQaxPy2I4z7MzANBgkqhkiG9w0BAQUFADCB
-ujELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMr
-VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTAeFw0x
-MDAyMjYwMDAwMDBaFw0xMjAyMjQyMzU5NTlaMIIBCzETMBEGCysGAQQBgjc8AgED
-EwJVUzEZMBcGCysGAQQBgjc8AgECFAhOZXcgWW9yazEbMBkGA1UEDxMSVjEuMCwg
-Q2xhdXNlIDUuKGIpMRUwEwYDVQQFEwxET0M6MTk5NTA3MzExCzAJBgNVBAYTAlVT
-MREwDwYDVQQIFAhNaWNoaWdhbjESMBAGA1UEBxQJQW5uIEFyYm9yMSQwIgYDVQQK
-FBtKU1RPUiAoSXRoYWthIEhhcmJvcnMsIEluYykxMzAxBgNVBAsUKlRlcm1zIG9m
-IHVzZSBhdCB3d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNTEWMBQGA1UEAxQNd3d3
-LmpzdG9yLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALUHbY3t
-UhCGReVnUwqLCU7elcq4FNKRvTajIvfdnmwB4zXGtZZGoIIoCS8yVFAYPAsT48+m
-xJ3y3GxhNM38nuZjjZi3Rp3ab0RpNoHfmlozTdvMdlbOzOpC6RVSgnyYcKouIw1c
-X4UH0yRbd/8evLK1H7I4VIug1YoZfPC7mr8HCppJJlIfxilS46ruQL75jQEWks7C
-bmB5tQNCr5ah6OnnskGXRHF5hpQmF/3aBvRuPDa3wl3EIlnSAhCoMgE7gPHqLcjX
-hIKX/MrGPuMHEMhBfXMq3yOzuTjX03ukwqUM5Fb0LijWonQz1PQIN8QPaJLo+8Qj
-pKfkUJ6lmQY1Oy8CAwEAAaOCAcswggHHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWg
-MEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6Ly9FVlNlY3VyZS1jcmwudmVyaXNpZ24u
-Y29tL0VWU2VjdXJlMjAwNi5jcmwwRAYDVR0gBD0wOzA5BgtghkgBhvhFAQcXBjAq
-MCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vY3BzMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAWgBT8ilC6nrklWntV
-hU+VAGOP6VhrQzBzBggrBgEFBQcBAQRnMGUwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
-Y3NwLnZlcmlzaWduLmNvbTA9BggrBgEFBQcwAoYxaHR0cDovL0VWU2VjdXJlLWFp
-YS52ZXJpc2lnbi5jb20vRVZTZWN1cmUyMDA2LmNlcjBuBggrBgEFBQcBDARiMGCh
-XqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsp
-rEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYw
-DQYJKoZIhvcNAQEFBQADggEBAFdIEgpPjryqc6c4Cn5beVW3U6StHIHn6K1Pmdjm
-zg3KrMWh7q7XYwATkG3+E3xl/j0gcgp3JOZF/WudfIYlanoTIdwtcgH3atiD+V1E
-RuOy19Qagr5LZG6ZSfsUR+kGaQTRWolznngzKiJOhjYt0RH7IGnJ8NCNpFWFgCjJ
-UWJqHCSkQ+fmjmpJMa+XE7r2YeqamXA6RNA7tH6Sk/BM92PuI3yyPuMVxKVHSFEB
-Cp5hKvpnTsU7XXEyje/rfDvAVbO34z34/Z3uWPr5C710E2aV3/As2xRF9kYmMcsb
-1NGyA/5UtjYY/ZuPpIVnXu4ldkf2oMIohwcE9K/1j6k4B3Q=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://omega.jstor.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibtest.jstor.org/action/samlACS" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jstor.org/action/samlACS" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://firefly.jstor.org/action/samlACS" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">JSTOR</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">JSTOR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.jstor.org</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Matt</GivenName>
-    <SurName>Callow</SurName>
-    <EmailAddress>support@jstor.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tara</GivenName>
-    <SurName>Kalro</SurName>
-    <EmailAddress>tara.kalro@ithaka.org.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ken</GivenName>
-    <SurName>Alexander</SurName>
-    <EmailAddress>ken.alexander@ithaka.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jusp.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.jusp.mimas.ac.uk-shibboleth.xml
deleted file mode 100644
index bb081736..00000000
--- a/swamid-interfederations-2.0/www.jusp.mimas.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.jusp.mimas.ac.uk/shibboleth">
-  <!--
-		This is a 'JUSP and IRUS-UK' Shibboleth SP for the University of Manchester.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <DigestMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <SigningMethod xmlns="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#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"/>
-  </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">JUSP and IRUS-UK</mdui:DisplayName>
-        <mdui:Description xml:lang="en">JUSP offers centralised access to journal usage data. 
-					IRUS-UK enables IRs to share and expose COUNTER statistics.</mdui:Description>
-        <mdui:Logo height="165" width="630">https://www.jusp.mimas.ac.uk/images/jusp-irus.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEMTCCAxmgAwIBAgIJALKqYz/D1BgYMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
-						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
-						CxMFTWltYXMxHTAbBgNVBAMTFHd3dy5qdXNwLm1pbWFzLmFjLnVrMB4XDTEzMDUy
-						MDEzMTcxOFoXDTIzMDUxODEzMTcxOFowgY0xCzAJBgNVBAYTAkdCMRMwEQYDVQQI
-						EwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVyMSUwIwYDVQQKExxUaGUg
-						VW5pdmVyc2l0eSBvZiBNYW5jaGVzdGVyMQ4wDAYDVQQLEwVNaW1hczEdMBsGA1UE
-						AxMUd3d3Lmp1c3AubWltYXMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDz5+7xpkieZXmqZ6NQcjLc0cPLnyqjHYKO/qJEmBOeSQ4SuHO3cblq
-						NRZHc0Ee/OnwGG+Z95qJLb3sJcg87sFaEpokcpQg6QAmAQx6TJTw3EibdPbTmlcp
-						sh6jeNuZ8jzLwj6LS4Q3Gsta9R0gWzoHsy2uaXkHBWjLDRDXSM5ykYbsH9uv5G+r
-						zpSPLzmzRfCSep5kIXkYNEAO6YFCpWmuxrnhmH37K26ufyTNFLsa/nFaDzHRFvOB
-						Lqp/kGEoCobHQRkVpWIA30NkNHf3xTdRim8cf2fTbLAMvTvLwk15hEhsofx5vm17
-						PsnuzOJz0p7hLl+UgQjDkT4cC8RKTrNBAgMBAAGjgZEwgY4wCQYDVR0TBAIwADAL
-						BgNVHQ8EBAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1Ud
-						EQQYMBaCFHd3dy5qdXNwLm1pbWFzLmFjLnVrMDQGA1UdEgQtMCuBKW1pbWFzLXNo
-						aWItdGVjaEBsaXN0c2Vydi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUA
-						A4IBAQAaJrZS+hCYXWz1OhLpLBmrXwGeFFMe6atZiAol0iqFEEI5lxRPUCv//mcj
-						zGl7ckpj3QGnGNK/yy0Iw1f8ozDqYQc15EKXrr4ysRLDIiHmV6vp6t0E42KufUr8
-						CCuGWOApwh0G9MLGC/L/nT1ktlA7QpwAu2i/pwIwtmzxka45H6UTBH6+nZcV68+c
-						lKacUeUUWaQPSU6xX7nZQ8RAxL/rk9YampkcmMl9jjXKZxPfEHh/FcoX7McEmVOB
-						Hc6B9zDGUrAOwbap5IBazxgixzhlNLvnLBorLMTMtZNAQ5I8r9q1etiGsMwQxcbo
-						XSDkRlSDzotmgLAQd0N3B9PAolHl
-					</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>
-						MIIEMTCCAxmgAwIBAgIJALKqYz/D1BgYMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
-						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
-						CxMFTWltYXMxHTAbBgNVBAMTFHd3dy5qdXNwLm1pbWFzLmFjLnVrMB4XDTEzMDUy
-						MDEzMTcxOFoXDTIzMDUxODEzMTcxOFowgY0xCzAJBgNVBAYTAkdCMRMwEQYDVQQI
-						EwpNYW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVyMSUwIwYDVQQKExxUaGUg
-						VW5pdmVyc2l0eSBvZiBNYW5jaGVzdGVyMQ4wDAYDVQQLEwVNaW1hczEdMBsGA1UE
-						AxMUd3d3Lmp1c3AubWltYXMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDz5+7xpkieZXmqZ6NQcjLc0cPLnyqjHYKO/qJEmBOeSQ4SuHO3cblq
-						NRZHc0Ee/OnwGG+Z95qJLb3sJcg87sFaEpokcpQg6QAmAQx6TJTw3EibdPbTmlcp
-						sh6jeNuZ8jzLwj6LS4Q3Gsta9R0gWzoHsy2uaXkHBWjLDRDXSM5ykYbsH9uv5G+r
-						zpSPLzmzRfCSep5kIXkYNEAO6YFCpWmuxrnhmH37K26ufyTNFLsa/nFaDzHRFvOB
-						Lqp/kGEoCobHQRkVpWIA30NkNHf3xTdRim8cf2fTbLAMvTvLwk15hEhsofx5vm17
-						PsnuzOJz0p7hLl+UgQjDkT4cC8RKTrNBAgMBAAGjgZEwgY4wCQYDVR0TBAIwADAL
-						BgNVHQ8EBAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1Ud
-						EQQYMBaCFHd3dy5qdXNwLm1pbWFzLmFjLnVrMDQGA1UdEgQtMCuBKW1pbWFzLXNo
-						aWItdGVjaEBsaXN0c2Vydi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUA
-						A4IBAQAaJrZS+hCYXWz1OhLpLBmrXwGeFFMe6atZiAol0iqFEEI5lxRPUCv//mcj
-						zGl7ckpj3QGnGNK/yy0Iw1f8ozDqYQc15EKXrr4ysRLDIiHmV6vp6t0E42KufUr8
-						CCuGWOApwh0G9MLGC/L/nT1ktlA7QpwAu2i/pwIwtmzxka45H6UTBH6+nZcV68+c
-						lKacUeUUWaQPSU6xX7nZQ8RAxL/rk9YampkcmMl9jjXKZxPfEHh/FcoX7McEmVOB
-						Hc6B9zDGUrAOwbap5IBazxgixzhlNLvnLBorLMTMtZNAQ5I8r9q1etiGsMwQxcbo
-						XSDkRlSDzotmgLAQd0N3B9PAolHl
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.jusp.mimas.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MIMAS: JISC Usage Stats Portal</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://mimas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Meehan</SurName>
-    <EmailAddress>mailto:Paul.Meehan@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Meehan</SurName>
-    <EmailAddress>mailto:Paul.Meehan@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml b/swamid-interfederations-2.0/www.jvcs.ja.net-shibboleth.xml
deleted file mode 100644
index 6da565c3..00000000
--- a/swamid-interfederations-2.0/www.jvcs.ja.net-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://www.jvcs.ja.net/shibboleth">
-  <!--
-		This is a "Janet Videoconference Booking Service (JVCS)" 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="2012-10-19T11:50:58Z"/>
-  </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://vscene.jisc.ac.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">v-scene</mdui:DisplayName>
-        <mdui:Description xml:lang="en">v-scene enables you to launch or schedule H323 and Desktop videoconferences, record, stream and add guests.</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIERjCCAy6gAwIBAgIJALrNeL2vzXUQMA0GCSqGSIb3DQEBCwUAMIGjMQswCQYD
-						VQQGEwJVSzEQMA4GA1UECBMHRW5nbGFuZDEQMA4GA1UEBxMHQnJpc3RvbDEWMBQG
-						A1UEChMNSmlzYyBTZXJ2aWNlczEaMBgGA1UECxMRSmlzYyBUZWNobm9sb2dpZXMx
-						GjAYBgNVBAMTEXZzY2VuZS5qaXNjLmFjLnVrMSAwHgYJKoZIhvcNAQkBFhF2c2Nl
-						bmVAamlzYy5hYy51azAeFw0xNTExMDMxNjMyNTFaFw0zNTEwMjkxNjMyNTFaMIGj
-						MQswCQYDVQQGEwJVSzEQMA4GA1UECBMHRW5nbGFuZDEQMA4GA1UEBxMHQnJpc3Rv
-						bDEWMBQGA1UEChMNSmlzYyBTZXJ2aWNlczEaMBgGA1UECxMRSmlzYyBUZWNobm9s
-						b2dpZXMxGjAYBgNVBAMTEXZzY2VuZS5qaXNjLmFjLnVrMSAwHgYJKoZIhvcNAQkB
-						FhF2c2NlbmVAamlzYy5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-						ggEBAKHYHA0HVKuQM6QQP9JJzs7tpGi8eTQNgdMYrfG9NXU246aUl01R0HuZ+Su1
-						xduGGbvHZl6m++CKATfpZz7tt9fwJ6Y8AeldzuQLUZQBhq/wpPfcgL/67hjHqWLP
-						RIlKGtwBOkLwahAiijoCXwc0u+VyUj9CI/2jtycfHu7VFQvo6O8g5AOlW9sxR/6H
-						juBd7iDrcEiTXWef0CvQXG9JL23K7orN9Ox6NyIu8mDkBmUSY44VoYVkKWQMXsgQ
-						tmnUMdtmwom44QoHsBajYBGKxa0G8BkIS2grkY6lhbH7/1DD/abRQah1UsM/+Ihc
-						IIJnbUBMBf35N2eIU8hA6tCY7YcCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgB
-						hvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYE
-						FG3/iS8iRCNI4bCuX1P3mLDWIlC3MB8GA1UdIwQYMBaAFG3/iS8iRCNI4bCuX1P3
-						mLDWIlC3MA0GCSqGSIb3DQEBCwUAA4IBAQBCUENyYiELCOaELvQF8s0YpZXbBMpe
-						T9Tb/GLhxJvjR25G0o4j177aRvMUPP12FbtHafL4LtETzuKvhDP5Xgy86XwnR7mh
-						/dk0JYirItS+zH11avaVGY8ZbzY2al1SEQNA/sQtBywnc8j5YYS9t9QmapaXk85t
-						bXiZRuzrAT/U2VDjMGba6FlFeAqowGqWnt2vcrOi0hdpjqh07yy/W7oszgwx84t+
-						LXX3Kfg5yiOFW+WsmdkZMCfAPJzrAq6rAg1JoyVC3v7Jk6CHNr5VnQPcNL+TaN9l
-						FIL5YwZINvpuWpxQUrsAfi47Yi6YfPNy9Yu7rVhl9GpNX8VaZYu6q7bM
-					</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://v-scene.ja.net/Shibboleth.sso/Artifact/SOAP" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="3"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="4"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="5"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="6"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="7"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="8"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v-scene.ja.net/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://v-scene.ja.net/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://v-scene.ja.net/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://v-scene.ja.net/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nhs-england.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="29"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nhs-wales.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="30"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="31"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="33"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="34"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="35"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nhs-scotland.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="36"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="37"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="39"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="40"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="41"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://belnet.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="42"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="43"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="44"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="45"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="46"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="47"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://heanet.vscene.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="48"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">v-scene</ServiceName>
-      <ServiceDescription xml:lang="en">v-scene enables you to launch or schedule H323 and Desktop videoconferences, record, stream and add guests.</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">Janet Videoconference Booking Service (JVCS)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ja.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>JVCS</GivenName>
-    <SurName>v-scene@ja.net</SurName>
-    <EmailAddress>mailto:m.mcintosh@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Bonnett</SurName>
-    <EmailAddress>mailto:paul.bonnett@ja.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jwatch.org-shibboleth.xml b/swamid-interfederations-2.0/www.jwatch.org-shibboleth.xml
deleted file mode 100644
index a8909135..00000000
--- a/swamid-interfederations-2.0/www.jwatch.org-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jwatch.org/shibboleth">
-  <!--
-		This is a "Journal Watch" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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-16T18:17:08Z"/>
-  </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://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Journal Watch</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jwatch.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.jwatch.org.xml b/swamid-interfederations-2.0/www.jwatch.org.xml
deleted file mode 100644
index 884c094a..00000000
--- a/swamid-interfederations-2.0/www.jwatch.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.jwatch.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/jnlwatch/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Journal Watch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Journal Watch</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.jwatch.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.k-int.com-shibboleth.xml b/swamid-interfederations-2.0/www.k-int.com-shibboleth.xml
deleted file mode 100644
index 1de34305..00000000
--- a/swamid-interfederations-2.0/www.k-int.com-shibboleth.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.k-int.com/shibboleth">
-  <!--
-		This is a "KI Generic Shib Endpoint" Shibboleth SP for Knowledge Integration Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-16T12:25:37Z">
-      <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">KI Generic Shib Endpoint</mdui:DisplayName>
-      </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.k-int.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.k-int.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJAPE1DaMBDG/KMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE2RldmVsb3Blci5rLWludC5jb20wHhcNMTMxMjE1MTI1OTM3WhcNMjMxMjEz
-						MTI1OTM3WjAeMRwwGgYDVQQDExNkZXZlbG9wZXIuay1pbnQuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1X9UPpMcPP6583r9Apa8PNw0btsNcU83
-						Jfi/fPAGhXBTEKW0g83Heurx/VSpdWNuZzqvgV84qZDdOsk6VKKbaYDJ4Z59cqX6
-						kbc8DECOf16fyjjfqZmVRfVmk+gXOVjsWCReF4ju4Il74xDPaHu8gXiZFRzYJJtL
-						ZlFxn6rRleDFBJ/OEgrkN2XFupmhYWtUjxd24tbudVBvoKq00ry8wWHSMxJrJzAO
-						ai2wd+Kvf7OzBRS2oNcp6c/ZJzKcD8G/LSZ61tG/33ch0/zvdHd+70DfNE5eNGA4
-						vQqykydToBDL/2SVJJQ0RmeU6IXnaPv0RgEtvzUWHf5s6HZvxwFI+QIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNkZXZlbG9wZXIuay1pbnQuY29tMB0GA1UdDgQWBBQc7dBS
-						20D1r2+c/kRdq5LNfXNk5TANBgkqhkiG9w0BAQUFAAOCAQEAhz6Cg8zQPe37crrd
-						4saHx5e5PhFjEMWumgwgUNX7Nt7J1OSYrisRZ3CPfg+8CbUXMQw9SS5lIsuI1amg
-						GUAR/+9dQFyfT+E1efV0JHV8KZs80YllXIlYoWgIvlBq4NCVOiuIzkkv3kHXbOA5
-						18OJNC3fqXAzYZbuCtMf7OWhelbxlAXB4a9HEB1MqpHgk68SeQWeTkvICbRREPQJ
-						0szpJq5d2J84k8pwsb6wWoL4+nd4A4hM85v61Lz2pP6w2HDqkBdrPjo3IZ2/g7nu
-						rvWQYSEnAU6ssX0Fhc+VOJsPwKqjApeIYHoM4CQ6etT4OC891iikBrMTOTmsLFNt
-						ASZsqA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.k-int.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.k-int.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.k-int.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.k-int.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.k-int.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.k-int.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.k-int.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.k-int.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.k-int.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.k-int.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.k-int.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Knowledge Integration Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">KI Generic Shib Endpoint</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.k-int.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@k-int.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ian</GivenName>
-    <SurName>Ibbotson</SurName>
-    <EmailAddress>mailto:ian.ibbotson@k-int.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.karger.com-shibboleth.xml b/swamid-interfederations-2.0/www.karger.com-shibboleth.xml
deleted file mode 100644
index cce459a3..00000000
--- a/swamid-interfederations-2.0/www.karger.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.karger.com/shibboleth">
-  <!--
-		This is a "Karger Publishers" Shibboleth SP for S. Karger AG.
-	-->
-  <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="2013-02-21T10:43:07Z"/>
-  </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.karger.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://www.karger.com/Shibboleth.sso/WAYF"/>
-      <init: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.karger.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://www.karger.com/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://www.karger.com/Shibboleth.sso/UKWAYF"/>
-      <init: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.karger.com/Shibboleth.sso/dfn-aai"/>
-      <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.karger.com/Shibboleth.sso/dfn-aai" 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.karger.com/Shibboleth.sso/gakunin-japan"/>
-      <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.karger.com/Shibboleth.sso/gakunin-japan" index="3"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFDCCAfygAwIBAgIJAIcP5l5M0JUtMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDnd3dy5rYXJnZXIuY29tMB4XDTE1MDUyMjA5MzAyNFoXDTE4MDUyMjA5MzAy
-						NFowGTEXMBUGA1UEAxMOd3d3Lmthcmdlci5jb20wggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQCw4obBIw1EOG4VMPuUvNgbiAwUgTh6sGHvz81LPsB3yE2t
-						hixSIMxj18+TsDtesVllLJOgTROLMa3XRFlUIUcI7bm4Lv9lrwru3eEJKRKEWSO0
-						syYhFiWdo5G10W7RaNJ5KhNmROo9PUqTIoItJXPGPWzRiRY0gXpzZTJTatzJeh7U
-						sEO5O2WIQV1v9WXk38q0CeYH72eI7vqXQJMsv6OXr2X2xCwFfpl1LoQxMAao9tGg
-						Sr+/Pyo1wWEZiy/GNZX6gK+QIzQhAd9SltSC9wdRt0DMwanXcUxkTFXtSTDSudIB
-						FGbD1AkkRllVucmoUqWmzut/wgzD0L8GNzHVqqXtAgMBAAGjXzBdMDwGA1UdEQQ1
-						MDOCDnd3dy5rYXJnZXIuY29thiFodHRwczovL3d3dy5rYXJnZXIuY29tL3NoaWJi
-						b2xldGgwHQYDVR0OBBYEFNMyL7o+N69sGXXRJMn4O24/yKZdMA0GCSqGSIb3DQEB
-						BQUAA4IBAQBCSvw1+tIAUZSxTqarmKVxUJi5DZeDV3aqRQq0IJWjIljmYj+UfPaf
-						K+/7llfev3DK+gQ2G4EIuUToLxxzQEtwpcaebr91WQwxMYYixaAl38nSaNYMY7P1
-						8r+QmB6tYVLN+U1qmgb1FViFGb3HlFJsNUjbSXMOmHYZ6Fs+g2LKryFT3ezv0o16
-						/Z9iuT6NnJsi5UAHRiIKAa9BnvRMIogQaJChPwkORUqIEz6GCAf3HXw/Ds2P04M1
-						qKmFCc7jKOnls4+t+QmcmxilUL72Hf+dbbB6iCpRLPnaWUxwzrVkL5vEaGHCDVmF
-						3rcGxr9Zgf8PmN55LOJrZyh7DG4MCL+F
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.karger.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.karger.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.karger.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.karger.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.karger.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.karger.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.karger.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.karger.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.karger.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.karger.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.karger.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.karger.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.karger.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.karger.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.karger.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">S. Karger AG</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Karger Publishers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.karger.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nicolas</GivenName>
-    <SurName>Gindensperger</SurName>
-    <EmailAddress>mailto:n.gindensperger@karger.ch</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Roland</GivenName>
-    <SurName>Hofer</SurName>
-    <EmailAddress>mailto:r.hofer@karger.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.kclsu.org-shibboleth.xml b/swamid-interfederations-2.0/www.kclsu.org-shibboleth.xml
deleted file mode 100644
index cd26be39..00000000
--- a/swamid-interfederations-2.0/www.kclsu.org-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://www.kclsu.org/shibboleth">
-  <!--
-		This is a "King's College London Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-16T09:41:16Z"/>
-  </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://www.kclsu.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kclsu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kclsu.org/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kclsu.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kclsu.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kclsu.org/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kclsu.org/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kclsu.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kclsu.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kclsu.org/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.kclsu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.kclsu.org/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kclsu.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.kclsu.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kclsu.org/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kclsu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">King's College London Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kclsu.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.kedst.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.kedst.ac.uk-shibboleth.xml
deleted file mode 100644
index bcf4a63d..00000000
--- a/swamid-interfederations-2.0/www.kedst.ac.uk-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://www.kedst.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth IdP for King Edward VI College, Stourbridge.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="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">kedst.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIURfg2ZT8NtoYlOeAkg68kLNLvU1IwDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPd3d3LmtlZHN0LmFjLnVrMB4XDTA5MDgwNDA4NDg1MVoX
-						DTI5MDgwNDA4NDg1MVowGjEYMBYGA1UEAxMPd3d3LmtlZHN0LmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsQ0D7j8KO9M/zkvZ4pYNu88G9i1/
-						s8yUlzlusFV8JUoqEczha+XS92o21kwek+iloEjyNMYr1O4cQOXEqwYx3BYlBERP
-						PoEmzVnQ+yZ3IGfhrjkUz21KxiSrfui95uoiuJ3mSOv3F8AEFXS4l/FxJ2Pr+37r
-						Y1/XcyXsk5GlG9DURuTErcd7zWJIiKT6lAQvaLPWCY/uxcQXNQ3nSkyl66r0gcz1
-						QFZgX9dEJZ5CFjIUvfKnFUq89UxDPtAFYsSemDCFQs0y4s7vclfnCsPJNErbRz9C
-						PvtZyy8O6vLwqeYLGae6TxTWxTudbdle6ZotR4SAhd5lGeGDgz8ENpJ01QIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg93d3cua2Vkc3QuYWMudWuGJmh0dHBzOi8vd3d3Lmtl
-						ZHN0LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTIOI+mXXvpeOykustH
-						i52xXKA2PjANBgkqhkiG9w0BAQUFAAOCAQEAgNBCAJj8ik9sqc4Wd9C3s6MV3dsW
-						9uxoPtUQx8+mmmwJx6mp4XSqO1Y1il4nQUXe+jvlRG2QE1kftwf/HCIY+CiTiKBz
-						+C3fvQDwbGUNO+hu19IEKWaaMAJPQdj1G7Lu7rEfyBq2/kgAAT822KXHGzwLWl3f
-						UidggbqOvDH4OS4t0bun2+dZTMq53UlEhd0C7mXI0AoO+LDW58eTv5RToflSAX9O
-						VfNZvQZQ7jOmLqxKW5eMU15qdnZR5VzBxaShu21ZLBrmRFrikpO8KbtAvPW98Iz5
-						cD/spZeoVpsEQFY1hTmWUlp62t1wTcinHagogSqSVpwe8sPlB2mtRl9wIA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.kedst.ac.uk:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kedst.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://www.kedst.ac.uk/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kedst.ac.uk/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kedst.ac.uk/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kedst.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">kedst.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIURfg2ZT8NtoYlOeAkg68kLNLvU1IwDQYJKoZIhvcNAQEF
-						BQAwGjEYMBYGA1UEAxMPd3d3LmtlZHN0LmFjLnVrMB4XDTA5MDgwNDA4NDg1MVoX
-						DTI5MDgwNDA4NDg1MVowGjEYMBYGA1UEAxMPd3d3LmtlZHN0LmFjLnVrMIIBIjAN
-						BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsQ0D7j8KO9M/zkvZ4pYNu88G9i1/
-						s8yUlzlusFV8JUoqEczha+XS92o21kwek+iloEjyNMYr1O4cQOXEqwYx3BYlBERP
-						PoEmzVnQ+yZ3IGfhrjkUz21KxiSrfui95uoiuJ3mSOv3F8AEFXS4l/FxJ2Pr+37r
-						Y1/XcyXsk5GlG9DURuTErcd7zWJIiKT6lAQvaLPWCY/uxcQXNQ3nSkyl66r0gcz1
-						QFZgX9dEJZ5CFjIUvfKnFUq89UxDPtAFYsSemDCFQs0y4s7vclfnCsPJNErbRz9C
-						PvtZyy8O6vLwqeYLGae6TxTWxTudbdle6ZotR4SAhd5lGeGDgz8ENpJ01QIDAQAB
-						o2UwYzBCBgNVHREEOzA5gg93d3cua2Vkc3QuYWMudWuGJmh0dHBzOi8vd3d3Lmtl
-						ZHN0LmFjLnVrL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTIOI+mXXvpeOykustH
-						i52xXKA2PjANBgkqhkiG9w0BAQUFAAOCAQEAgNBCAJj8ik9sqc4Wd9C3s6MV3dsW
-						9uxoPtUQx8+mmmwJx6mp4XSqO1Y1il4nQUXe+jvlRG2QE1kftwf/HCIY+CiTiKBz
-						+C3fvQDwbGUNO+hu19IEKWaaMAJPQdj1G7Lu7rEfyBq2/kgAAT822KXHGzwLWl3f
-						UidggbqOvDH4OS4t0bun2+dZTMq53UlEhd0C7mXI0AoO+LDW58eTv5RToflSAX9O
-						VfNZvQZQ7jOmLqxKW5eMU15qdnZR5VzBxaShu21ZLBrmRFrikpO8KbtAvPW98Iz5
-						cD/spZeoVpsEQFY1hTmWUlp62t1wTcinHagogSqSVpwe8sPlB2mtRl9wIA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.kedst.ac.uk:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kedst.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">King Edward VI College, Stourbridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">King Edward VI College, Stourbridge</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kedst.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Martin</GivenName>
-    <SurName>Woolley</SurName>
-    <EmailAddress>mailto:martin.woolley@kedst.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Martin</GivenName>
-    <SurName>Woolley</SurName>
-    <EmailAddress>mailto:martin.woolley@kedst.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.kentunion.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.kentunion.co.uk-shibboleth.xml
deleted file mode 100644
index 6f2cbfd3..00000000
--- a/swamid-interfederations-2.0/www.kentunion.co.uk-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://www.kentunion.co.uk/shibboleth">
-  <!--
-		This is a "Kent Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kentunion.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kentunion.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kentunion.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kentunion.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kentunion.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kentunion.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kentunion.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.kentunion.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.kentunion.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kentunion.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Membership Solutions Limited: Kent Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.kentunion.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.keynote.co.uk-shibboleth.xml
deleted file mode 100644
index ebba4a1d..00000000
--- a/swamid-interfederations-2.0/www.keynote.co.uk-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" entityID="https://www.keynote.co.uk/shibboleth">
-  <!--
-		This is a "Key Note: Market Intelligence" OpenAthens SP for Key Note Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-05-15T09:50: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 urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIGDzCCBPegAwIBAgIQJh9i1AJonsnAFcGwgs/cvzANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwNDE2
-						MDAwMDAwWhcNMTgwNDE3MjM1OTU5WjCB+TELMAkGA1UEBhMCR0IxEjAQBgNVBAgT
-						CU1pZGRsZXNleDEQMA4GA1UEBxQHSGFtcHRvbjERMA8GA1UEChQIS2V5IE5vdGUx
-						ETAPBgNVBAsUCEtleSBOb3RlMTUwMwYDVQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3
-						LnZlcmlzaWduLmNvLnVrL3JwYSAoYykwNTEiMCAGA1UECxMZQXV0aGVudGljYXRl
-						ZCBieSBWZXJpU2lnbjEnMCUGA1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBO
-						ZXR3b3JrMRowGAYDVQQDFBF3d3cua2V5bm90ZS5jby51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBANjKlKP40hmfmHrQdPo2rI+zJUl9eMvL5qNzLgAN
-						QnOgojsZFwpQ3UJxIcm8Od2eIWd1xJne5ijHaeTniBxeJOj2PfDVzFxuvPWXcMYs
-						wusvAOgEcSDjhe2Qk4hBY0dd1T0IvU+8zRK6I+lGfZGkP7kNc+jq6ATyxXB3ayb1
-						1/3yCljsnj27CH5hrym8IA7MCOZhYFXux66LGhT0c4WpKICIGapM6NLDDRI+zqQO
-						C7JUh/7bteC332DJlpp/hEedtcytwdznAsfuFYAqLW0m2C1+F0m42hRYRsdK/8BE
-						wZVvmVEtQ5nD0PhWJle+p5qY2vOsnCoux4w2d8vMnCVQWSECAwEAAaOCAdMwggHP
-						MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6
-						Ly9TVlJTZWN1cmUtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmww
-						RgYDVR0gBD8wPTA7BgtghkgBhvhFAQcXAzAsMCoGCCsGAQUFBwIBFh5odHRwczov
-						L3d3dy52ZXJpc2lnbi5jby51ay9ycGEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPYvnmlMHYGCCsGAQUF
-						BwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29tMEAG
-						CCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52ZXJpc2lnbi5jb20v
-						U1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFeoFwwWjBYMFYWCWltYWdl
-						L2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweLIQUYMCYWJGh0dHA6
-						Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjANBgkqhkiG9w0BAQUFAAOC
-						AQEAVwvsWtkpYSAGQkJ2TV0wfnFg+tMRCSu3nB4KEYCremLxItsnnGuyDLb8/EYT
-						Mfwdr26NKunr+50Ry85EwmAPeYbx6NY9kLb2s/XyujeGHQaDOQTXMRtXvEYoJ5vw
-						lNqMPy5O1Ih3W4TJi+CeX2TVaX4PNS2PKv6GKfIKZC0aWP6ZSurvyBUoI5jaMcoj
-						0/2IqQ9HIxlRdTEIXGuvPfCMzQmQ48RmLHw3ImTb91JkQM31/FwsiIidjWkkgq5M
-						5z9CF7Rt++PysgVB2M6swP3qVegOAFnkHGvuQExRS3dSQK4wUYXwKUoeXKBfTE60
-						iIcX2da2+HnwyJ4195yPUocmnA==
-					</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>
-						MIIGDzCCBPegAwIBAgIQJh9i1AJonsnAFcGwgs/cvzANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwNDE2
-						MDAwMDAwWhcNMTgwNDE3MjM1OTU5WjCB+TELMAkGA1UEBhMCR0IxEjAQBgNVBAgT
-						CU1pZGRsZXNleDEQMA4GA1UEBxQHSGFtcHRvbjERMA8GA1UEChQIS2V5IE5vdGUx
-						ETAPBgNVBAsUCEtleSBOb3RlMTUwMwYDVQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3
-						LnZlcmlzaWduLmNvLnVrL3JwYSAoYykwNTEiMCAGA1UECxMZQXV0aGVudGljYXRl
-						ZCBieSBWZXJpU2lnbjEnMCUGA1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBO
-						ZXR3b3JrMRowGAYDVQQDFBF3d3cua2V5bm90ZS5jby51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBANjKlKP40hmfmHrQdPo2rI+zJUl9eMvL5qNzLgAN
-						QnOgojsZFwpQ3UJxIcm8Od2eIWd1xJne5ijHaeTniBxeJOj2PfDVzFxuvPWXcMYs
-						wusvAOgEcSDjhe2Qk4hBY0dd1T0IvU+8zRK6I+lGfZGkP7kNc+jq6ATyxXB3ayb1
-						1/3yCljsnj27CH5hrym8IA7MCOZhYFXux66LGhT0c4WpKICIGapM6NLDDRI+zqQO
-						C7JUh/7bteC332DJlpp/hEedtcytwdznAsfuFYAqLW0m2C1+F0m42hRYRsdK/8BE
-						wZVvmVEtQ5nD0PhWJle+p5qY2vOsnCoux4w2d8vMnCVQWSECAwEAAaOCAdMwggHP
-						MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHA6
-						Ly9TVlJTZWN1cmUtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jcmww
-						RgYDVR0gBD8wPTA7BgtghkgBhvhFAQcXAzAsMCoGCCsGAQUFBwIBFh5odHRwczov
-						L3d3dy52ZXJpc2lnbi5jby51ay9ycGEwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-						AQUFBwMCMB8GA1UdIwQYMBaAFA1EXBZTRMGCfh0gqyX0AWPYvnmlMHYGCCsGAQUF
-						BwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29tMEAG
-						CCsGAQUFBzAChjRodHRwOi8vU1ZSU2VjdXJlLUczLWFpYS52ZXJpc2lnbi5jb20v
-						U1ZSU2VjdXJlRzMuY2VyMG4GCCsGAQUFBwEMBGIwYKFeoFwwWjBYMFYWCWltYWdl
-						L2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweLIQUYMCYWJGh0dHA6
-						Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjANBgkqhkiG9w0BAQUFAAOC
-						AQEAVwvsWtkpYSAGQkJ2TV0wfnFg+tMRCSu3nB4KEYCremLxItsnnGuyDLb8/EYT
-						Mfwdr26NKunr+50Ry85EwmAPeYbx6NY9kLb2s/XyujeGHQaDOQTXMRtXvEYoJ5vw
-						lNqMPy5O1Ih3W4TJi+CeX2TVaX4PNS2PKv6GKfIKZC0aWP6ZSurvyBUoI5jaMcoj
-						0/2IqQ9HIxlRdTEIXGuvPfCMzQmQ48RmLHw3ImTb91JkQM31/FwsiIidjWkkgq5M
-						5z9CF7Rt++PysgVB2M6swP3qVegOAFnkHGvuQExRS3dSQK4wUYXwKUoeXKBfTE60
-						iIcX2da2+HnwyJ4195yPUocmnA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.keynote.co.uk/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.keynote.co.uk/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.keynote.co.uk/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.keynote.co.uk/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Key Note Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Key Note: Market Intelligence</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.keynote.co.uk/GlobalFrame.htm</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Vipul</GivenName>
-    <SurName>Agarwal</SurName>
-    <EmailAddress>mailto:vipul@byng-systems.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Vipul</GivenName>
-    <SurName>Agarwal</SurName>
-    <EmailAddress>mailto:vipul@byng-systems.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ollie</GivenName>
-    <SurName>Maitland</SurName>
-    <EmailAddress>mailto:ollie@byng-systems.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@byng-systems.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.klarro.net-shibboleth.xml b/swamid-interfederations-2.0/www.klarro.net-shibboleth.xml
deleted file mode 100644
index ac7f7c8f..00000000
--- a/swamid-interfederations-2.0/www.klarro.net-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://www.klarro.net/shibboleth">
-  <!--
-		This is a "BlikBook Pre-deploy" Shibboleth SP for BlikBook Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-27T15:57:13Z"/>
-  </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://www.klarro.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC3DCCAcSgAwIBAgIJAIt6YjNtpR2RMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB0RhblRlc3QwHhcNMTMwNjE5MTYxNTMzWhcNMjMwNjE3MTYxNTMzWjASMRAw
-						DgYDVQQDEwdEYW5UZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						wdnVZ1MhtfN0ukc6dLjy5QjoRSXWQCFGpZ5QvZNtP3xsKSqX8iOhm1ZmH1l1K0Y5
-						ZV3HC44bNA92cGpsq9sMknjkarkmH439iiXgt9qUMIMynxpPmY6GkDJzecw437CX
-						CXKf8DihNAldXEKUc3CzP4Vk4lNI8e+ektHq7wV3lLQrG3qyJ65g3jWVO84RnXPm
-						B9f3wQqW3R/zroCGxjcBvO901JNCuOQHtUrO7mHlJoQBJq4ARQkUbvtNSB6dQqS5
-						Z/YhDSKxq9AXTXzmRssc9Ke8NQxMNh74cFF+El8s6SMA8hnGP4mEAlr8FGt0aIA+
-						1kkaIetVBGQuKVyVKtLD7wIDAQABozUwMzASBgNVHREECzAJggdEYW5UZXN0MB0G
-						A1UdDgQWBBT4QfMQ8phl2CCuvtshXflmGE9IRzANBgkqhkiG9w0BAQUFAAOCAQEA
-						J+s9az6w7b47PnAFU1DSHMjeFKTmc9hHmyp0V9PQWP5ONO2W8aebU5fIPlQ1H0UW
-						cq4GBDGB00I48DulVZ6eZTGb7V2PQrjWkBTx+zTchMj/C8y0WwILDb2lSmX8lSrg
-						hWqVtEpvi3bJAuq4Z9wJrtMn/meOAUOJd8jMum66iFHJ2Sx4p8RII+pxs815DsYc
-						LP1zfxaGdMeSAiTLn9pGMpNCykpLu5MYgRsZYg11rxtzK7xnxVGZBT+/bEXYrvxk
-						yyI3tafZkac5nvFsbdP1CVTkxLXhjoC/cOraO4qLe6XccTTzeRP06u9IYWkd21Xs
-						KEvVQWisWGKnGQlunjVxaQ==
-					</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>
-						MIIC3DCCAcSgAwIBAgIJAIt6YjNtpR2RMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-						BAMTB0RhblRlc3QwHhcNMTMwNjE5MTYxNTMzWhcNMjMwNjE3MTYxNTMzWjASMRAw
-						DgYDVQQDEwdEYW5UZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						wdnVZ1MhtfN0ukc6dLjy5QjoRSXWQCFGpZ5QvZNtP3xsKSqX8iOhm1ZmH1l1K0Y5
-						ZV3HC44bNA92cGpsq9sMknjkarkmH439iiXgt9qUMIMynxpPmY6GkDJzecw437CX
-						CXKf8DihNAldXEKUc3CzP4Vk4lNI8e+ektHq7wV3lLQrG3qyJ65g3jWVO84RnXPm
-						B9f3wQqW3R/zroCGxjcBvO901JNCuOQHtUrO7mHlJoQBJq4ARQkUbvtNSB6dQqS5
-						Z/YhDSKxq9AXTXzmRssc9Ke8NQxMNh74cFF+El8s6SMA8hnGP4mEAlr8FGt0aIA+
-						1kkaIetVBGQuKVyVKtLD7wIDAQABozUwMzASBgNVHREECzAJggdEYW5UZXN0MB0G
-						A1UdDgQWBBT4QfMQ8phl2CCuvtshXflmGE9IRzANBgkqhkiG9w0BAQUFAAOCAQEA
-						J+s9az6w7b47PnAFU1DSHMjeFKTmc9hHmyp0V9PQWP5ONO2W8aebU5fIPlQ1H0UW
-						cq4GBDGB00I48DulVZ6eZTGb7V2PQrjWkBTx+zTchMj/C8y0WwILDb2lSmX8lSrg
-						hWqVtEpvi3bJAuq4Z9wJrtMn/meOAUOJd8jMum66iFHJ2Sx4p8RII+pxs815DsYc
-						LP1zfxaGdMeSAiTLn9pGMpNCykpLu5MYgRsZYg11rxtzK7xnxVGZBT+/bEXYrvxk
-						yyI3tafZkac5nvFsbdP1CVTkxLXhjoC/cOraO4qLe6XccTTzeRP06u9IYWkd21Xs
-						KEvVQWisWGKnGQlunjVxaQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.klarro.net/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.klarro.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.klarro.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.klarro.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.klarro.net/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.klarro.net/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.klarro.net/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.klarro.net/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.klarro.net/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.klarro.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.klarro.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.klarro.net/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.klarro.net/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.klarro.net/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.klarro.net/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">BlikBook Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">BlikBook Pre-deploy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.klarro.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Deepak</GivenName>
-    <SurName>Colluru</SurName>
-    <EmailAddress>mailto:deepak@blikbook.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Giles</GivenName>
-    <SurName>Greenway</SurName>
-    <EmailAddress>mailto:giles@blikbook.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 3dabeb70..00000000
--- a/swamid-interfederations-2.0/www.knodium.com.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.knodium.com/Shibboleth.sso/Metadata">
-  <!--
-		This is a Shibboleth 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"/>
-  </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.languagesciences.cam.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.languagesciences.cam.ac.uk-shibboleth.xml
deleted file mode 100644
index 79b198f3..00000000
--- a/swamid-interfederations-2.0/www.languagesciences.cam.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://www.languagesciences.cam.ac.uk/shibboleth">
-  <!--
-		This is a "Cambridge Language Sciences" Shibboleth SP for the University of Cambridge.
-	-->
-  <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="2012-05-09T09:24:04Z">
-      <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.languagesciences.cam.ac.uk/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://www.languagesciences.cam.ac.uk/Shibboleth.sso/WAYF"/>
-      <init: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.languagesciences.cam.ac.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://www.languagesciences.cam.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
-						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
-						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
-						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
-						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
-						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
-						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
-						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
-						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
-						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
-						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
-						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
-						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
-						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
-						RsenNm/aXp0wIU+jHVmi/GAPCQ==
-					</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.languagesciences.cam.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.languagesciences.cam.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Cambridge: Cambridge Language Sciences</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.languagesciences.cam.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.lawtel.com-oa-metadata.xml b/swamid-interfederations-2.0/www.lawtel.com-oa-metadata.xml
deleted file mode 100644
index 7a3e3752..00000000
--- a/swamid-interfederations-2.0/www.lawtel.com-oa-metadata.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://www.lawtel.com/oa/metadata">
-  <!--
-		This is a "Lawtel" OpenAthens SP for Thomson Reuters (Professional) UK Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-08T12:33:56Z"/>
-  </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>
-						MIIDZDCCAkygAwIBAgIJAIQlCctZBRSMMA0GCSqGSIb3DQEBBQUAMCoxDzANBgNV
-						BAoTBkxhd3RlbDEXMBUGA1UEAxMOd3d3Lmxhd3RlbC5jb20wHhcNMTIwNTIxMTUz
-						MzE1WhcNMjIwNTE5MTUzMzE1WjAqMQ8wDQYDVQQKEwZMYXd0ZWwxFzAVBgNVBAMT
-						Dnd3dy5sYXd0ZWwuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						1aHAf0QUNyTTU43/uAAgmTXyljMIEkiAbTYDdOKL/783B9Jancwz5Wcwr1uCqFRB
-						9dyeElckxc1vUpdx6Nj81cX6MbhDsCGpnw2sHeWi5pFJ1J6uOL3DR4wtE758XJep
-						xhdMZpZXJ1F7kA/aJPS+3u1XfgAj5Wop1Lj0o9EtsEm97/VViMN39OsMAWVYsYlJ
-						UdMvP6oxXADr2jQEPXyD/vr3Z0yzBwUKnx/xW95h4G8mmwAKOkPNwgHjO/qYzCSy
-						cLNCL/1B21R05ZogulZGJlNrMHTuhFzT3t6zDpABQA9QAm9CWQQ3RT7shl0Qtflu
-						fi5UV1TOka/oetMJEwxNeQIDAQABo4GMMIGJMB0GA1UdDgQWBBSfkHk8bDqllx8D
-						lARoOx4aWRVruzBaBgNVHSMEUzBRgBSfkHk8bDqllx8DlARoOx4aWRVru6EupCww
-						KjEPMA0GA1UEChMGTGF3dGVsMRcwFQYDVQQDEw53d3cubGF3dGVsLmNvbYIJAIQl
-						CctZBRSMMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAI5u8pzk5pFL
-						8GE7AJO8xu43xmPoXZJQI8jtXZ67xA0zDl/YKi7lyAtITABLi0no05j/B6bs30ah
-						ZJWIhpo1heA1Aqsvg8cc+wsMGA0G0BWRm581pdooU37lf8E6jHrHEcYnMREOLR4n
-						tB+Q5JBgE7gNXnrPtKuREyXFpMVuIJaed9L2XRn0dqq8BdMH7L8INOXW2wr+Yb86
-						9N5cUMdyvc/CgmvgBL859khThBVONs9kQaQqY0GANNEKnBXKOiWZsW3bcIGq8idV
-						aZx1wevL8m5ioTXRA6hAmwUnnPZO/o7qIiQhuMFyvjHLVG6nHS3DO+c352LSRku4
-						SY88POEuhcQ=
-					</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>
-						MIIDZDCCAkygAwIBAgIJAIQlCctZBRSMMA0GCSqGSIb3DQEBBQUAMCoxDzANBgNV
-						BAoTBkxhd3RlbDEXMBUGA1UEAxMOd3d3Lmxhd3RlbC5jb20wHhcNMTIwNTIxMTUz
-						MzE1WhcNMjIwNTE5MTUzMzE1WjAqMQ8wDQYDVQQKEwZMYXd0ZWwxFzAVBgNVBAMT
-						Dnd3dy5sYXd0ZWwuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						1aHAf0QUNyTTU43/uAAgmTXyljMIEkiAbTYDdOKL/783B9Jancwz5Wcwr1uCqFRB
-						9dyeElckxc1vUpdx6Nj81cX6MbhDsCGpnw2sHeWi5pFJ1J6uOL3DR4wtE758XJep
-						xhdMZpZXJ1F7kA/aJPS+3u1XfgAj5Wop1Lj0o9EtsEm97/VViMN39OsMAWVYsYlJ
-						UdMvP6oxXADr2jQEPXyD/vr3Z0yzBwUKnx/xW95h4G8mmwAKOkPNwgHjO/qYzCSy
-						cLNCL/1B21R05ZogulZGJlNrMHTuhFzT3t6zDpABQA9QAm9CWQQ3RT7shl0Qtflu
-						fi5UV1TOka/oetMJEwxNeQIDAQABo4GMMIGJMB0GA1UdDgQWBBSfkHk8bDqllx8D
-						lARoOx4aWRVruzBaBgNVHSMEUzBRgBSfkHk8bDqllx8DlARoOx4aWRVru6EupCww
-						KjEPMA0GA1UEChMGTGF3dGVsMRcwFQYDVQQDEw53d3cubGF3dGVsLmNvbYIJAIQl
-						CctZBRSMMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAI5u8pzk5pFL
-						8GE7AJO8xu43xmPoXZJQI8jtXZ67xA0zDl/YKi7lyAtITABLi0no05j/B6bs30ah
-						ZJWIhpo1heA1Aqsvg8cc+wsMGA0G0BWRm581pdooU37lf8E6jHrHEcYnMREOLR4n
-						tB+Q5JBgE7gNXnrPtKuREyXFpMVuIJaed9L2XRn0dqq8BdMH7L8INOXW2wr+Yb86
-						9N5cUMdyvc/CgmvgBL859khThBVONs9kQaQqY0GANNEKnBXKOiWZsW3bcIGq8idV
-						aZx1wevL8m5ioTXRA6hAmwUnnPZO/o7qIiQhuMFyvjHLVG6nHS3DO+c352LSRku4
-						SY88POEuhcQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lawtel.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lawtel.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lawtel.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lawtel.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Thomson Reuters (Professional) UK Limited: Lawtel</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.lawtel.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Prashanthi</GivenName>
-    <SurName>Bukka</SurName>
-    <EmailAddress>mailto:prashanthi.bukka@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Roy</GivenName>
-    <SurName>Paruchuri</SurName>
-    <EmailAddress>mailto:r.paruchuri@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.learninggrids.com-shibboleth.xml b/swamid-interfederations-2.0/www.learninggrids.com-shibboleth.xml
deleted file mode 100644
index 8b1d2db7..00000000
--- a/swamid-interfederations-2.0/www.learninggrids.com-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://www.learninggrids.com/shibboleth">
-  <!--
-		This is a Shibboleth 2.3.1 test SP for Crick Software Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDGTCCAgGgAwIBAgIJAMKYSg+3GU17MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHNwLmxlYXJuaW5nZ3JpZHMuY29tMB4XDTEwMDQwOTE0MzI0MVoXDTIwMDQw
-						NjE0MzI0MVowHzEdMBsGA1UEAxMUc3AubGVhcm5pbmdncmlkcy5jb20wggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT1mJfobR9rxjkPud227louYV544Lv
-						Kub5HQMU56EhOmenz8Wp9XTjJNqcko/k82N6XD0RqC/M6YRiUmOV16Yk0urTXaKe
-						kL/SLkVMNZxOEZ8oXLkysw0E2jFhKyB1kx7T7t2eLw/RM7fXo7KQyBl/ahKM0LVJ
-						F7vhL1n6eCuU6uOAkSsWmYlULjSOTaH2IPKUsaNVjqPn5gQfgs+G453dJnRbwdmh
-						fsKGImH5CWfCGUKpd3PTVJtveXWWzz4+gPfS+hN4patbj2L7unLFZLyi1f+EFpry
-						ePT4C8YFYBHUhtoDAsfnPdXZpu5t4pXhyP3RBjeMHppKmxS5cUmDH+sbAgMBAAGj
-						WDBWMDUGA1UdEQQuMCyCFHNwLmxlYXJuaW5nZ3JpZHMuY29thhRzcC5sZWFybmlu
-						Z2dyaWRzLmNvbTAdBgNVHQ4EFgQUzt6Iwba+1fpMyELfdUCRMh49LF8wDQYJKoZI
-						hvcNAQEFBQADggEBAIExIazrssEJfB0OAtCS2rodzsrH7GsTzkPZ8ylRC4b2eXHU
-						AVncNc4nWdLhPuXACSgH8+kL8dOEL3BGDZNc3UwJKyzODv9+PGhGxFHDDbK0JGTn
-						dpSl2dXCKv5rTteTdejjgMZcU0mL6Fntv4HYlgTPG+77UyMM8WfbwIGeWQT3XM66
-						xM/K9NUuHPp3wUJ9801cV3XvB8ojILIZwIRbbKze2NgK8Eda3eC5gQWSH1WBvCav
-						hH4a83QfDDECmHpUVa/eHYkfjWLBNtG7KdGwBLRSH1GbmpUSe0TEwW0wWGCU3R4D
-						OM66RXoED823lMyOTZ6WpPEuAzAAysHcpXP2PlQ=
-					</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>
-						MIIDGTCCAgGgAwIBAgIJAMKYSg+3GU17MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHNwLmxlYXJuaW5nZ3JpZHMuY29tMB4XDTEwMDQwOTE0MzI0MVoXDTIwMDQw
-						NjE0MzI0MVowHzEdMBsGA1UEAxMUc3AubGVhcm5pbmdncmlkcy5jb20wggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCT1mJfobR9rxjkPud227louYV544Lv
-						Kub5HQMU56EhOmenz8Wp9XTjJNqcko/k82N6XD0RqC/M6YRiUmOV16Yk0urTXaKe
-						kL/SLkVMNZxOEZ8oXLkysw0E2jFhKyB1kx7T7t2eLw/RM7fXo7KQyBl/ahKM0LVJ
-						F7vhL1n6eCuU6uOAkSsWmYlULjSOTaH2IPKUsaNVjqPn5gQfgs+G453dJnRbwdmh
-						fsKGImH5CWfCGUKpd3PTVJtveXWWzz4+gPfS+hN4patbj2L7unLFZLyi1f+EFpry
-						ePT4C8YFYBHUhtoDAsfnPdXZpu5t4pXhyP3RBjeMHppKmxS5cUmDH+sbAgMBAAGj
-						WDBWMDUGA1UdEQQuMCyCFHNwLmxlYXJuaW5nZ3JpZHMuY29thhRzcC5sZWFybmlu
-						Z2dyaWRzLmNvbTAdBgNVHQ4EFgQUzt6Iwba+1fpMyELfdUCRMh49LF8wDQYJKoZI
-						hvcNAQEFBQADggEBAIExIazrssEJfB0OAtCS2rodzsrH7GsTzkPZ8ylRC4b2eXHU
-						AVncNc4nWdLhPuXACSgH8+kL8dOEL3BGDZNc3UwJKyzODv9+PGhGxFHDDbK0JGTn
-						dpSl2dXCKv5rTteTdejjgMZcU0mL6Fntv4HYlgTPG+77UyMM8WfbwIGeWQT3XM66
-						xM/K9NUuHPp3wUJ9801cV3XvB8ojILIZwIRbbKze2NgK8Eda3eC5gQWSH1WBvCav
-						hH4a83QfDDECmHpUVa/eHYkfjWLBNtG7KdGwBLRSH1GbmpUSe0TEwW0wWGCU3R4D
-						OM66RXoED823lMyOTZ6WpPEuAzAAysHcpXP2PlQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.learninggrids.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.learninggrids.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.learninggrids.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.learninggrids.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.learninggrids.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.learninggrids.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.learninggrids.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.learninggrids.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.learninggrids.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.learninggrids.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.learninggrids.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.learninggrids.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.learninggrids.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.learninggrids.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.learninggrids.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Crick Software Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">LearningGrids from Crick Software Ltd - Test</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cricksoft.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Andrew</GivenName>
-    <SurName>Burt</SurName>
-    <EmailAddress>mailto:andrew.burt@cricksoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andrew</GivenName>
-    <SurName>Burt</SurName>
-    <EmailAddress>mailto:andrew.burt@cricksoft.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.leedsuniversityunion.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.leedsuniversityunion.org.uk-shibboleth.xml
deleted file mode 100644
index d61ac877..00000000
--- a/swamid-interfederations-2.0/www.leedsuniversityunion.org.uk-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://www.leedsuniversityunion.org.uk/shibboleth">
-  <!--
-		This is a "Leeds University Union" Shibboleth SP owned by Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://www.leedsuniversityunion.org.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.leedsuniversityunion.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds University Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.leedsuniversityunion.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml b/swamid-interfederations-2.0/www.liebertonline.com-shibboleth.xml
deleted file mode 100644
index 3d08e6c3..00000000
--- a/swamid-interfederations-2.0/www.liebertonline.com-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://www.liebertonline.com/shibboleth">
-  <!--
-		This is a "Mary Ann Liebert, Inc. publishers" OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-17T17:28:20Z">
-      <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">Mary Ann Liebert</mdui:DisplayName>
-        <mdui:Description xml:lang="en">&gt;Mary Ann Liebert publishes integrated media content in biotechnology, biomedical research, clinical medicine and surgery, among others.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.liebertpub.com/nv/company/about-us/1/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMDCCAhigAwIBAgIJAKDOIiXpyPeZMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFW9ubGluZS5saWViZXJ0cHViLmNvbTAeFw0xNDAzMTQwNTAzNDlaFw0xNzAz
-						MTMwNTAzNDlaMCAxHjAcBgNVBAMTFW9ubGluZS5saWViZXJ0cHViLmNvbTCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7/SYDfsaPbVYvAvpyFaTm0N9gF
-						F3WclCufGBuJBHr985O6elVYWrANB0CLyIdUlHN6eCKTcZTv+aKD4gHX4ECDxnfj
-						ozWWL8e2xbAAWq7Q9e8Br9UQGMFcVe4n3gOoeazUDBXMDMR/XC9zX4SZgUij6Zk6
-						1W3sNHXkT/+olQriyyWD9UmF+TZcqySxQaaiDXen3yVsqU542slFWHLCXN9DZGZ4
-						PtmBPInLWFD1D9oyXwg7F+nlielFxbY2MlT01O4URSZb8cIOOgXDGqFhcL1EytTY
-						3FTQXgoa3gVFVz00u/zHyCIT7HjoDUcUSrbR/FTy5l2JVomFwY6BeQLVRCkCAwEA
-						AaNtMGswSgYDVR0RBEMwQYIVb25saW5lLmxpZWJlcnRwdWIuY29thihodHRwczov
-						L29ubGluZS5saWViZXJ0cHViLmNvbS9zaGliYm9sZXRoMB0GA1UdDgQWBBTUYAZ/
-						lW3+Qwv4itlnK8u9Mnus5jANBgkqhkiG9w0BAQUFAAOCAQEADCOUTrrLrH0I6BAO
-						aYbHu8hxIiwLKln0jUmCNcLhYfSDNErdCBkQ65FT7fuVFIBNFmvvmYbbelgVT5O+
-						gRN63p56RN9YSHGm4vTz59WWKlce6db87ZYy5SJneyOsVSj1eQ3VXA2mTV/v7beH
-						TvKOCRq1pLXrTW3CyvdBHbKCdXqN9JHXSc0Hw4afGEOecnrq3DoyBxh3/LX6i4Ty
-						kphk7xLp8dhGzs767f6GflqekCETspWcenJAJkzztaZfVr5AUMU4/nzhCEbTb6L3
-						H4DFy1CDquP13ggw0RaFwt090YnGMoTxkwIHbNHOk0b3ja9yD2qxqfNmnGPscktq
-						ghHcPQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://online.liebertpub.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://online.liebertpub.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://online.liebertpub.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Mary Ann Liebert, Inc. publishers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.liebertpub.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.listening-books.org.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.listening-books.org.uk-shibboleth-sp.xml
deleted file mode 100644
index 729ef871..00000000
--- a/swamid-interfederations-2.0/www.listening-books.org.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.listening-books.org.uk/shibboleth-sp">
-  <!--
-		This is a Shibboleth "Listening Books" SP for The Gallery Partnership Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T15:02:27Z"/>
-  </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.listening-books.org.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Listening Books</mdui:DisplayName>
-        <mdui:Logo height="147" width="264">https://www.listening-books.org.uk/images/logotop1.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAKDYQGOVxDtoMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnRncGx3ZWIwMS50Z3BsaG9zdGVkLmxvY2FsMB4XDTExMTAyMDEwMjUxN1oX
-						DTIxMTAxNzEwMjUxN1owJTEjMCEGA1UEAxMadGdwbHdlYjAxLnRncGxob3N0ZWQu
-						bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDN2HILHmtyg26I
-						knBnnJ0C/MGIYoDGyYvy+ECjDj2QeEYJKx7ew9shXOkeHgrwBbxyDvsSf1dY2fnI
-						6WF9iVtzIw0imhxPNvNqrQT21zMNK/UsPd2jj8rgBpG8BAnPviKFACgvOcV/jwWn
-						kMlYtcBVMivFomIvwCG907vVth/az8X26jRhQJ2stWJkST5VJ6hY2ynhjuqrveMC
-						tUN9nOVp2gh5tx1DgIKQS4k9FMlNL0CdS0jNqt5L+pmn67oBrPrJm8T643BYgvl6
-						UhoR2+M7BfyNy+y5GsmNysgKBQ7AY7kMBgQTOBecgfsN9rilljpB/ajMq3shGXYG
-						u3xpXxy7AgMBAAGjSDBGMCUGA1UdEQQeMByCGnRncGx3ZWIwMS50Z3BsaG9zdGVk
-						LmxvY2FsMB0GA1UdDgQWBBRktKsDD89ocGlu6WacWrHMS/q5WjANBgkqhkiG9w0B
-						AQUFAAOCAQEAq7ISl1XdEGVH72x0o9PqdeWv8e6w9iyyXlc7no1ugkM7qcXrzfEn
-						EuRn+vd7FVYw0WQDa+YbdMiY0iT/Mt094WUTFU+tUcfgbJLskLqsHrJhdwpI6GVX
-						lKICBk4ck20Hb9a6DAMHCOlMl5jyVTbtfDmsDE45QnRzwKmyItGPulup/WsRN6cw
-						ljVoBNnM64z/4Espp7Hqh9MT3elQnzCOYZH+qIwmLWvulpeLICokPW0SqIRzPx14
-						xCgNUc6/n0jjZM/Y2EOq1yjqLVkMp3pWmvkSrPfnymIdLeGqJj7ItmTcGXrtXF0q
-						H7URozYYVkfDdLe3tdeszum1dhpLBArFfg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.listening-books.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.listening-books.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.listening-books.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.listening-books.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.listening-books.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.listening-books.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Gallery Partnership Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Listening Books</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.listening-books.org.uk/what-we-do.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Joost</GivenName>
-    <SurName>Jens</SurName>
-    <EmailAddress>mailto:jjens@gallerypartnership.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Joost</GivenName>
-    <SurName>Jens</SurName>
-    <EmailAddress>mailto:jjens@gallerypartnership.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.litencyc.com-shibboleth.xml b/swamid-interfederations-2.0/www.litencyc.com-shibboleth.xml
deleted file mode 100644
index 51b03ad1..00000000
--- a/swamid-interfederations-2.0/www.litencyc.com-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://www.litencyc.com/shibboleth">
-  <!--
-		This is "The Literary Encyclopedia" Shibboleth SP for Literary Dictionary Company Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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.litencyc.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://www.litencyc.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.litencyc.com/Shibboleth.sso/Login" index="1"/>
-      <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"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The Literary Encyclopedia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Literary Encyclopedia is a digital repository of authoritative reference work on literary and cultural history</mdui:Description>
-        <mdui:Logo height="64" width="350">https://www.litencyc.com/images/v3_site/LitEncyc_logo_MDUI.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAKScrCvlkuwdMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFmRvbVUtMTItMzEtMzgtMDctMjYtOTUwHhcNMTIwNzExMjEyMzI4WhcNMjIw
-						NzA5MjEyMzI4WjAhMR8wHQYDVQQDExZkb21VLTEyLTMxLTM4LTA3LTI2LTk1MIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5I+4aMcaXfWFVtJOunjKb4+X
-						1cK9g+so8YOGFM/vCLTWqe1Be/8yHbpOsx8ivyLzCUhgTsBp0rvVsDCzJtIzwSBZ
-						6nOqCP+sm9QSMj8u8zIAhDzQ7qhTF07cvgC7pAjrQPFuq+Rq22ky2foYlfrXonbI
-						SXgKLXpvIdGsZ/DE4ywBoL7AlFCLaSc8JHEwAuhJ0QbIVD6UixvgjC/g702CI1+f
-						Uh6pHlO8IXIwvYGnzhRk1tpXxiCXeWvGsJtC1dahzxcSKjwNUFuTVJ+TgQkd83sw
-						qPf9cqHJYRt7m3qtJGg48qoRlN8p4tohjPpWMraxiAoVB+FbA8InI3dxHvE0bQID
-						AQABo0QwQjAhBgNVHREEGjAYghZkb21VLTEyLTMxLTM4LTA3LTI2LTk1MB0GA1Ud
-						DgQWBBS+EvnRtGsmIntM+sicbzq78PUsqzANBgkqhkiG9w0BAQUFAAOCAQEAzvjC
-						l4jY9WPYMmLPdCqKmN8WfYYaV22iaYH1q/jlOlh90XZLN8NM89YWbpsdJi9zVvgU
-						iA6RbiamzHyGnQwpo1nvJxI2f+cKBDb7wFk3wj3BFyzeF4L66kM6xbqrG/WHYVbV
-						D6Ybrj15Q/o1aE2vGH4bZH62Tzturlqol70YdyfSvK/kuC5UeTsyF+mXbytIWy/s
-						mfVmJNHhN0Lnm28uAtHcyzC5WS06kmMmOzwlhYlmBr7CfvnmbH/7tTAFX6ybvfWe
-						nris/BgppN8uzYbH32WCMJDb8oTNQCQECn3qGEHycVAIexAPSG8E3/mWt5QvT8ff
-						Zs5lSvRPKfa1dFXjRA==
-					</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.litencyc.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.litencyc.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.litencyc.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.litencyc.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.litencyc.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.litencyc.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.litencyc.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.litencyc.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.litencyc.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.litencyc.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.litencyc.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.litencyc.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.litencyc.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.litencyc.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.litencyc.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Literary Dictionary Company Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Literary Encyclopedia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.LitEncyc.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Robert</GivenName>
-    <SurName>Clark</SurName>
-    <EmailAddress>mailto:RobertClark@LitEncyc.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Cristina</GivenName>
-    <SurName>Sandru</SurName>
-    <EmailAddress>mailto:cristinaSandru@litencyc.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.loebclassics.com-oa-metadata.xml b/swamid-interfederations-2.0/www.loebclassics.com-oa-metadata.xml
deleted file mode 100644
index 35fbf6e7..00000000
--- a/swamid-interfederations-2.0/www.loebclassics.com-oa-metadata.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://www.loebclassics.com/oa/metadata">
-  <!--
-		This is a "Digital Loeb Classical Library" SP for the President and Fellows of Harvard College (Acting on behalf of Harvard University Press).
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-21T11:37: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">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIEVHOa+TANBgkqhkiG9w0BAQUFADBCMSEwHwYDVQQKExhI
-						YXJ2YXJkIFVuaXZlcnNpdHkgUHJlc3MxHTAbBgNVBAMTFHd3dy5sb2ViY2xhc3Np
-						Y3MuY29tMB4XDTE0MTEyNDIwNTQxN1oXDTI0MTEyMTIwNTQxN1owQjEhMB8GA1UE
-						ChMYSGFydmFyZCBVbml2ZXJzaXR5IFByZXNzMR0wGwYDVQQDExR3d3cubG9lYmNs
-						YXNzaWNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCSs78r
-						MYDwZ41vMYrj8E+mBNKjj31NNKZbnsGHZJnD+yqnY3JZKYsjR8kfVOuLmjfT9VPJ
-						gJ2j2zamyzDpUL6UfRhX95hFF2ZEwYe58VUG4YInSyYbCRtY22GYylyogEzCARQp
-						H3TyzQ2wIsH1iRB53TKHz4RytnaJFhrU5s10u3BRO1m4LmjhKr3wqfciOr+p04ko
-						OO9LYjkNh37C0UrlZtP23X29F36SvaO4Ue2Iyw9Rnip9Z47/qLiT/HZCV3vmSiKI
-						8VdjBUhEROaqTbouEesTx9zxvdWIwDdM986sPtwrNp/+/BO9w3VS0vLWe3gBUDRt
-						PE5lNPbj55NASpUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAkFhzy8nt7qNGhJjZ
-						+FAIX/jg/n/tymR2E31t+RfDtA4AMAZPiZYs4Rkt02HWmmC+Rr8aDUEzKZPbwt3R
-						ays+kiiHnvj4L9Nc/wyVebQLDNNW2dHpfMYrdhaVW0bcGzo3okpB1mCPKHbUkOmD
-						M9euhDsUAQRH0n5Ojh3v6lwQUvItUOoJFFpXYvzTkicGogp6rKuG01LCO0D4ByQh
-						vN71cIueV6Uq8k1l5ihnk2X06Dex8wuY3lPc413Gt98O3aklw9FD3XQyAp0RODd9
-						KF/o29n+RjmGx0qq/O4JOrXY0Q0CwLqMm5iE7byW0+nW3hlg1AajC3SJRlWw9ldU
-						Jm6s2g==
-					</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>
-						MIIDADCCAeigAwIBAgIEVHOa+TANBgkqhkiG9w0BAQUFADBCMSEwHwYDVQQKExhI
-						YXJ2YXJkIFVuaXZlcnNpdHkgUHJlc3MxHTAbBgNVBAMTFHd3dy5sb2ViY2xhc3Np
-						Y3MuY29tMB4XDTE0MTEyNDIwNTQxN1oXDTI0MTEyMTIwNTQxN1owQjEhMB8GA1UE
-						ChMYSGFydmFyZCBVbml2ZXJzaXR5IFByZXNzMR0wGwYDVQQDExR3d3cubG9lYmNs
-						YXNzaWNzLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCSs78r
-						MYDwZ41vMYrj8E+mBNKjj31NNKZbnsGHZJnD+yqnY3JZKYsjR8kfVOuLmjfT9VPJ
-						gJ2j2zamyzDpUL6UfRhX95hFF2ZEwYe58VUG4YInSyYbCRtY22GYylyogEzCARQp
-						H3TyzQ2wIsH1iRB53TKHz4RytnaJFhrU5s10u3BRO1m4LmjhKr3wqfciOr+p04ko
-						OO9LYjkNh37C0UrlZtP23X29F36SvaO4Ue2Iyw9Rnip9Z47/qLiT/HZCV3vmSiKI
-						8VdjBUhEROaqTbouEesTx9zxvdWIwDdM986sPtwrNp/+/BO9w3VS0vLWe3gBUDRt
-						PE5lNPbj55NASpUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAkFhzy8nt7qNGhJjZ
-						+FAIX/jg/n/tymR2E31t+RfDtA4AMAZPiZYs4Rkt02HWmmC+Rr8aDUEzKZPbwt3R
-						ays+kiiHnvj4L9Nc/wyVebQLDNNW2dHpfMYrdhaVW0bcGzo3okpB1mCPKHbUkOmD
-						M9euhDsUAQRH0n5Ojh3v6lwQUvItUOoJFFpXYvzTkicGogp6rKuG01LCO0D4ByQh
-						vN71cIueV6Uq8k1l5ihnk2X06Dex8wuY3lPc413Gt98O3aklw9FD3XQyAp0RODd9
-						KF/o29n+RjmGx0qq/O4JOrXY0Q0CwLqMm5iE7byW0+nW3hlg1AajC3SJRlWw9ldU
-						Jm6s2g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.loebclassics.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.loebclassics.com/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.loebclassics.com/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.loebclassics.com/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">President and Fellows of Harvard College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Digital Loeb Classical Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.hup.harvard.edu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Norman</GivenName>
-    <SurName>Roye</SurName>
-    <EmailAddress>mailto:norman_roye@harvard.edu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Norman</GivenName>
-    <SurName>Roye</SurName>
-    <EmailAddress>mailto:norman_roye@harvard.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.login.amdigital.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.login.amdigital.co.uk-shibboleth.xml
deleted file mode 100644
index fc63bc1b..00000000
--- a/swamid-interfederations-2.0/www.login.amdigital.co.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://www.login.amdigital.co.uk/shibboleth">
-  <!--
-		This is a resources Shibboleth SP for Adam Matthew Digital 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="2013-12-04T15:40: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://www.login.amdigital.co.uk/Shibboleth.sso/WAYF"/>
-      <init: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.login.amdigital.co.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://www.login.amdigital.co.uk/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Adam Matthew resources</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Unique primary source collections from archives around the world; spanning the social sciences and humanities</mdui:Description>
-        <mdui:Logo height="132" width="286">https://www.login.amdigital.co.uk/images/MDUI-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDQDCCAiigAwIBAgIJAOnoeaY+22sjMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXd3dy5sb2dpbi5hbWRpZ2l0YWwuY28udWswHhcNMTMxMTIwMTYyNzE4WhcN
-						MTgxMTE5MTYyNzE4WjAkMSIwIAYDVQQDExl3d3cubG9naW4uYW1kaWdpdGFsLmNv
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwXZuSpA1eklgnNFN
-						7cYjfzOg87Q4W87KhDui8HmowwT+tBRV9aK9RNFOHUmZKmatrb21961DakpvyFqo
-						i4y2PgCK9x5tcP5z0stQCiJXz/GT7Nm4mqxCS9klruJJYkzIQENLo1gClAGDPejq
-						0yuxrRn0X0V+kkjmJfhtj6a4vQsQiI1YxLNfPWRcUq+aY5R5J2hOBduYRn13+6q3
-						oLGGY2kEzTwngPz4m1PqNKNCmb4yh5XUTXpgezUIdUOqU5lJ37yZKI3eyxZ67hV7
-						beQWNq8YM+Mtc9ixQ0MXQw/U0uxc44OtwbJwh01oyS/d2A4LDrDltJL+RlUXtzcc
-						4+loHQIDAQABo3UwczBSBgNVHREESzBJghl3d3cubG9naW4uYW1kaWdpdGFsLmNv
-						LnVrhixodHRwczovL3d3dy5sb2dpbi5hbWRpZ2l0YWwuY28udWsvc2hpYmJvbGV0
-						aDAdBgNVHQ4EFgQUMG4nqf/bwYPBqgWIdiRkXSCtscIwDQYJKoZIhvcNAQEFBQAD
-						ggEBAHdJJS5QMsr/cP/m+VLjrFCz8Ml6Bi8GUIU2SIUsIC/3/j63XCFlxIsym1rn
-						c/dH4eAqTz/LETocV6DNhhn6PaykG4UArmTxwsn3bMweKoEwaRil1RlW4OjIObf4
-						Vlbw8Tjk9FYykL4G/LzDmdIhv8lneYDJT/F49OTmPr7K9k+JP59l1w49bf8vsZpo
-						04zpJsF8r9kckt62qAKuKPins7pqw3o9/MYZtO59VAQkMfdEvUEXKmTgG09PoIFN
-						mEeoIiYaNa73mEKJuM5v0mSxz4BZJmjNaUgp+RlXOSf5UajsxGvvaaXPS+wswNNc
-						amjS1hLdrKCw7Y9NYB5V297KDVc=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.login.amdigital.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.login.amdigital.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Adam Matthew Digital Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Adam Matthew resources</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.amdigital.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Glyn</GivenName>
-    <SurName>Porritt</SurName>
-    <EmailAddress>mailto:glyn@amdigital.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dave</GivenName>
-    <SurName>Arthur</SurName>
-    <EmailAddress>mailto:dave@amdigital.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.login.dumgal.ac.uk-oala-metadata.xml b/swamid-interfederations-2.0/www.login.dumgal.ac.uk-oala-metadata.xml
deleted file mode 100644
index 7568bf93..00000000
--- a/swamid-interfederations-2.0/www.login.dumgal.ac.uk-oala-metadata.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.login.dumgal.ac.uk/oala/metadata">
-  <!--
-		This is an OpenAthens LA IdP for Dumfries and Galloway College.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-12-05T15:58:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor WantAuthnRequestsSigned="false" 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">dumgal.ac.uk</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDwTCCAqmgAwIBAgIJAIgvuI4PmdjVMA0GCSqGSIb3DQEBBQUAMEkxJjAkBgNV
-						BAoTHUR1bWZyaWVzIGFuZCBHYWxsb3dheSBDb2xsZWdlMR8wHQYDVQQDExZ3d3cu
-						bG9naW4uZHVtZ2FsLmFjLnVrMB4XDTE0MDMyMDEzNTcwOFoXDTI0MDMxNzEzNTcw
-						OFowSTEmMCQGA1UEChMdRHVtZnJpZXMgYW5kIEdhbGxvd2F5IENvbGxlZ2UxHzAd
-						BgNVBAMTFnd3dy5sb2dpbi5kdW1nYWwuYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQCoxfB66zAeC16RLp8dFbrBpfi9zddARRAb317m5UYig1oL
-						0ht7+rajRx9Y7it4GVum3gnEcZ0U7IAvUoGCavGTcg3NFrgFHCNDKnP0C55dTfs1
-						ABToyUsQP6J4iAyGZL7gttdcw2iKwLO2GgfgvMm6K5SltKvmg/MTL1l0FNAY/1aE
-						AWO2vVLottFJjB1InHYRTiY9rWSwzf6NVbiMHt8pok8dE8MSjQvzH6jNZYKj6ib7
-						0jIXScx1f+JTH5LCyKU4q9SsWbE3flU7r2Zq2Vkcg7v1wmY2v/KwYt+zbtEwwi6z
-						2JyNpaL0XoK/9owkm3zQwi51NgP4DHXeyfxRtcpRAgMBAAGjgaswgagwHQYDVR0O
-						BBYEFEXErYTB8YyULUKnLraEy0cuWijsMHkGA1UdIwRyMHCAFEXErYTB8YyULUKn
-						LraEy0cuWijsoU2kSzBJMSYwJAYDVQQKEx1EdW1mcmllcyBhbmQgR2FsbG93YXkg
-						Q29sbGVnZTEfMB0GA1UEAxMWd3d3LmxvZ2luLmR1bWdhbC5hYy51a4IJAIgvuI4P
-						mdjVMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEkNkJE/FfIjeoC+
-						BIA49Ig2Csb7N/oY2X9FxMXvNcRNEJ2hxEi6lqCzTjkjooQcTCpWvm0gszwwB9ny
-						0lYzJU8Rbx1PyQfYDrKuagJ2lkDEBKJYpnWrl5+63q8RhYZ9WqHfdL/K16LwhtRN
-						a4dq0ZRZ6a9EAgIOcJoyMXgR9nBxQ1DwT3HmpuXWR9++/7mXOg0AHg27066nW8Oz
-						+fGvILEhti+R7JHgIUrT3W10tavHhNiZ5pw0sfF1bSMODTa6kKw6rCPH+7bmSwqe
-						gSTSTHHHRbGohR1hH9yzmrGN8ZzOsnLs+KkDCfFcCEvMjwjueCxpmcCp0Cf/zn9l
-						rZDiSl0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.login.dumgal.ac.uk/oala/sso"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.login.dumgal.ac.uk/oala/sso"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Dumfries and Galloway College</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Dumfries and Galloway College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dumgal.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Steve</GivenName>
-    <SurName>Baxter</SurName>
-    <EmailAddress>mailto:baxters@dumgal.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Eric</GivenName>
-    <SurName>Dunbar</SurName>
-    <EmailAddress>mailto:dunbare@dumgal.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.londonmetsu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.londonmetsu.org.uk-shibboleth.xml
deleted file mode 100644
index 5a2ac979..00000000
--- a/swamid-interfederations-2.0/www.londonmetsu.org.uk-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://www.londonmetsu.org.uk/shibboleth">
-  <!--
-		This is a "London Metropolitan University Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-19T15:35:04Z">
-      <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://www.londonmetsu.org.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.londonmetsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London Metropolitan University Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.londonmetsu.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.lrb.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.lrb.co.uk-shibboleth.xml
deleted file mode 100644
index a3fd3fbe..00000000
--- a/swamid-interfederations-2.0/www.lrb.co.uk-shibboleth.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.lrb.co.uk/shibboleth">
-  <!--
-		This is a "London Review of Books" Shibboleth SP for LRB 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="2013-04-30T13:36:59Z"/>
-  </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.lrb.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://www.lrb.co.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">London Review of Books</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Online access to the London Review of Books archive</mdui:Description>
-        <mdui:Logo height="71" width="350">https://www.lrb.co.uk/shibboleth-sp/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJANyqIs0OWWWhMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXd3dy5scmIuY28udWswHhcNMTMwNDEwMTUwODQ5WhcNMjMwNDA4MTUwODQ5
-						WjAYMRYwFAYDVQQDEw13d3cubHJiLmNvLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAu8m19a1SY54Kh43Uwe0g/Q2nJInoV7MhgrZ3afYRXzSnulOd
-						XSv9AxWl0WqlzxVlAC9ak1AKJEFMkhyg0z7DPQHDmboixrQBP1jxvPxvq1EQ2B2G
-						RwlQTNwxyOs4Ud10y/X5uZKBYKfwb7Xr6wJVug2Jk3g0m9Q/xOB5vFdytmVo0Htd
-						X8JzDYiovHh8/01nw1zqRL9XYYfDqTzlIzkVzMpaXUtlEUySY+Pk/KP9LW612NLj
-						0leIa6umDD3o1ZfhlTBcsMrzrVmGq8MZE4JAXM05DZ3hEZpXmr9xQ6vAx0U8kigg
-						XWfw31ME2r/mfdySgRdPDEinr3OEe6oJsS8gDwIDAQABozswOTAYBgNVHREEETAP
-						gg13d3cubHJiLmNvLnVrMB0GA1UdDgQWBBQqFtNRW4fjzMcAqBf0Uofy4ZeW+TAN
-						BgkqhkiG9w0BAQUFAAOCAQEAW1hamIuAkBxhF/uQ4cpKvKy75st3aI/rmiFZcCFh
-						YHK5SZUj5DIfreGZG02onq3/dA7Kj9rjiEIFXnBULpcNulp3DcpVKkoxkfnV180A
-						Zltn8jPSbrzNGpb536PMYa21yycxBxh0uR+IbznLqlVhQCmQI5/7HOAPihUvV/w5
-						ulQI3JKrLeE42xPVToBYWCk4SrfciKq06ZZG1s1WbYkf1uracUDpZZ8g2YkvQrdK
-						eGkLyLvQrBJ3Rfmx2ukVAk5y/ajluFz9DQrG/jc5H9J6/ql4BXhfXsAH+PiIxbzI
-						KsYWHAVwkTwGO4W2Vf2JeTWKbVpWYsr7Ct32TqFFMS09FA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.lrb.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lrb.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lrb.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lrb.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lrb.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lrb.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">LRB Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London Review of Books</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lrb.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Larkin</SurName>
-    <EmailAddress>mailto:clarkin@lrb.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Sowden</SurName>
-    <EmailAddress>mailto:csowden@lrb.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.lsbsu.org-shibboleth.xml b/swamid-interfederations-2.0/www.lsbsu.org-shibboleth.xml
deleted file mode 100644
index c0cf14c4..00000000
--- a/swamid-interfederations-2.0/www.lsbsu.org-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://www.lsbsu.org/shibboleth">
-  <!--
-		This is a "London South Bank University Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-09T12:15:48Z">
-      <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://www.lsbsu.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsbsu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsbsu.org/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsbsu.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lsbsu.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsbsu.org/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsbsu.org/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsbsu.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lsbsu.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsbsu.org/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lsbsu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lsbsu.org/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsbsu.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lsbsu.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsbsu.org/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lsbsu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London South Bank University Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lsbsu.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.lsesu.com-shibboleth.xml b/swamid-interfederations-2.0/www.lsesu.com-shibboleth.xml
deleted file mode 100644
index 64d810a0..00000000
--- a/swamid-interfederations-2.0/www.lsesu.com-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://www.lsesu.com/shibboleth">
-  <!--
-		This is a "London School of Economics Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-24T10:30: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://www.lsesu.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.lsesu.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsesu.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsesu.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsesu.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.lsesu.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.lsesu.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsesu.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lsesu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsesu.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lsesu.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lsesu.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lsesu.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">London School of Economics Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lsesu.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ltscotland.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ltscotland.org.uk-shibboleth.xml
deleted file mode 100644
index d5675ae1..00000000
--- a/swamid-interfederations-2.0/www.ltscotland.org.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://www.ltscotland.org.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for Education Scotland.
-	-->
-  <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="2012-05-28T13:32:50Z"/>
-  </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.educationscotland.gov.uk/Shibboleth.sso/WAYF/Glow"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAMFVcb/xT28pMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWx0c2Utd2ViMDEubHRzY290bGFuZC5jb20wHhcNMTAwNDA2MTEwODMzWhcN
-						MjAwNDAzMTEwODMzWjAkMSIwIAYDVQQDExlsdHNlLXdlYjAxLmx0c2NvdGxhbmQu
-						Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0cNyCYPET1vjazeG
-						oTDedpNCEKqceFny1kyLJRwdu8D76/4Y/U9G0lLcWo25xFwnu8bBYP0Wx1ARelQH
-						VnZK8iiauUMKeu1N6Pq/4zRXUQzI5+SCEKfGGh4IqV4W1eid0WET30PdziNo8s5q
-						0A6kp4FIKYD5EKZwVALe57/b2tAFFyf37jxZTZxvrLWJDUdC4lwK32hbormk3Pi9
-						qKwOUlxYgkKcwxVWbUGHWpUI1DWfpvqsRObQTCXbPfbtBWtdrRRwIlHQjY+Ns0Hk
-						Au8xKXLEFllu1t0XCJ7fTimJ0XwiqGh7sLcQnc2W63hZOkKHgESjVHEIUjH1pZaZ
-						VLEbIQIDAQABo0cwRTAkBgNVHREEHTAbghlsdHNlLXdlYjAxLmx0c2NvdGxhbmQu
-						Y29tMB0GA1UdDgQWBBQs0eoj0gCKFhGV81jjIuGRu7jYRjANBgkqhkiG9w0BAQUF
-						AAOCAQEAfIQzlxcJDwFgeghBOThTNYlWWrTg9sBGX2ScJrTdpZ2YCBVCiqJzvHbs
-						CVVm/wxXg6RszMl6jZJUMCZo+uCFRjP/VVaZYdHxGOYwz2U68gUeO41dlF7MlC++
-						/dIuKK+XXRyrM49hwdDZS14mQTkor6Kt8zpabLtn6FCpr8tDEtXuFn28PiyWyxq3
-						JimO/CV4gydrnNg2iGkZHHP46dkIvi0mIqMVv8OTwqgSdpe1i/HldGZ5IWGdouIZ
-						YJH+7toasSbjwqMusDEt0GMuMM0QqM8SFsTaAp7rBjnepE2gYVTK+RGloI+CCVoD
-						2XXgRAd0fVakFAhtv93JvF7VW3e5TA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.educationscotland.gov.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.educationscotland.gov.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Education Scotland</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Education Scotland</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.educationscotland.gov.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Graham</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Graham</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:graham.wilson@educationscotland.gov.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.luu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.luu.org.uk-shibboleth.xml
deleted file mode 100644
index 2cb90127..00000000
--- a/swamid-interfederations-2.0/www.luu.org.uk-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://www.luu.org.uk/shibboleth">
-  <!--
-		This is a "Leeds University Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-02-05T11:23: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 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://www.luu.org.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.luu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.luu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.luu.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.luu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.luu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.luu.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.luu.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.luu.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.luu.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.luu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.luu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.luu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.luu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.luu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.luu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Leeds University Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.luu.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL Support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.magonlinelibrary.com-shibboleth.xml b/swamid-interfederations-2.0/www.magonlinelibrary.com-shibboleth.xml
deleted file mode 100644
index 576e068c..00000000
--- a/swamid-interfederations-2.0/www.magonlinelibrary.com-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://www.magonlinelibrary.com/shibboleth">
-  <!--
-		This is a 'MAG Online Library' OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-20T16:06:20Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDPDCCAiSgAwIBAgIJAOxJ6oH31iOVMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy5tYWdvbmxpbmVsaWJyYXJ5LmNvbTAeFw0xMzExMTkxNDAwNDNaFw0y
-						MzExMTcxNDAwNDNaMCMxITAfBgNVBAMTGHd3dy5tYWdvbmxpbmVsaWJyYXJ5LmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANX7vUWYKC2Ke/ZrzYvD
-						Gw5Mm0NrEf0aMwrnw2wvsS2lncSUXj8bDTwQi3x+xC0/1hmNFEpRnhfyu5JwKDXP
-						yw+38q8aE4B8p1s9HNvj0YJPlUTK15mQabc3HQ9S5goeYeUq+mZenoS84w1NBym+
-						Fu3jbWvaQAtrBlbJP8/+U6OLMVdesqUNTK3IAOu3NHuk8mdFmOSDExznHbHhgzpz
-						s9Tu5lhyS62gUayA6YpQWOw6EUjiRmsAMwcSwXeD1lPwNt1veW0RELdciMscGHAP
-						SkeSwGCSl5BY5vOg5kGF21SRlfbnvnAoe1DlPrT6AghiK2K7VIARoElc4QnyFDNc
-						5Z0CAwEAAaNzMHEwUAYDVR0RBEkwR4IYd3d3Lm1hZ29ubGluZWxpYnJhcnkuY29t
-						hitodHRwczovL3d3dy5tYWdvbmxpbmVsaWJyYXJ5LmNvbS9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBQAs2Jn/mvqHwTEVKRDRTew/qJkNzANBgkqhkiG9w0BAQUFAAOCAQEA
-						F8SJ0Rggh6WOg1tu1WIOi2uDZmqK1x1sljbH7RjKuAafvDf2ihVEzcW6LzFez3Ew
-						MXOkx6uOYq3+TpqWP6ofjKW/pDrfBap9QV7/H6S55Qamqmi9u6UgMK4AITGE2M94
-						YBmAISSAOL2syhb9fpGIG7r5w6gs7NvkrrQ0Ua6jMQ8x5vSH65tKboN+unXw/n1n
-						hPb5xbuJl8vC0BI0lMZ6lWddY8aAs1cjoyjSKP3JyM/noIv+U1bm2vPeYATHgKNI
-						L3VNaZWA1Fyqvu8GyUoBgNijF9sChzzam3oaZyXSSwU/b06TsH6jQk2x+GV/rs3s
-						H8O0nQaQrC99XG29XrRI5Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.magonlinelibrary.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.magonlinelibrary.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.magonlinelibrary.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">MAG Online Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.magonlinelibrary.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>sso-support</GivenName>
-    <EmailAddress>mailto:sso-support@atypon.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Sally</GivenName>
-    <SurName>Boettcher</SurName>
-    <EmailAddress>mailto:sally.boettcher@markallengroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Chloe</GivenName>
-    <SurName>Roberts</SurName>
-    <EmailAddress>mailto:chloe.roberts@markallengroup.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.maneyonline.com-shibboleth.xml b/swamid-interfederations-2.0/www.maneyonline.com-shibboleth.xml
deleted file mode 100644
index 41522b42..00000000
--- a/swamid-interfederations-2.0/www.maneyonline.com-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://www.maneyonline.com/shibboleth">
-  <!--
-		This is a 'Maney Online' OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-12-16T18:04: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 urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIJAJDMcsKQ9DnAMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3d3dy5tYW5leW9ubGluZS5jb20wHhcNMTMxMjEwMjAyODE3WhcNMjMxMjA4
-						MjAyODE3WjAeMRwwGgYDVQQDExN3d3cubWFuZXlvbmxpbmUuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2eA38F/RgHF6yDJANjrq+qtQrS7BbYeG
-						b47pP8OqzkjVBIQVhnIwEcfCbVym+dVUX1DZRK4YsmxzmHl/FZtSb86lR2LWlSGJ
-						rvj/ggUAS1MyrGKa5FIpaP87fknDrR8sU04dzu0Rv2ttrrIaRB/GJZLERY0upRYX
-						aVtnvebsk2XZaoGPdRdb/eFsejsA/BNSOnZkw02RYbbMhotiqRGEu1trjDAJMPDS
-						c9ceQt9LNTGnraqAZwy7kWbKz76jLl9s6+uvNRkKxJ4IizZa7xAGuB3d33J4Whwz
-						FOk9j501pq05p934onj+W5vODoy6/JZHAcT/DuLj1SLKA0MlAzdaGwIDAQABo2kw
-						ZzBGBgNVHREEPzA9ghN3d3cubWFuZXlvbmxpbmUuY29thiZodHRwczovL3d3dy5t
-						YW5leW9ubGluZS5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUC7pAjMI3gjmg/6ZP
-						QVGTu4ka0zQwDQYJKoZIhvcNAQEFBQADggEBACiWbtf8AxBWSPuR94PO7Xnytt2N
-						ErSriysu6Y2lqOcjsSpaTPs8X1yZFMuDXE1aKtPgPfpnEz8ktBlLI00zmMr+qAOW
-						pCLTzjKzVvC/7sIXWn+KwPOA8qbp/SzbqAfJJy2vua7tvKzbYigxbGwoQHrg8aSO
-						Pmz35Dd+kfdAR/Y9GGaJ8cS4zXfVSJ4vQ5blWlEHMf9eQy0mz4534FRdiiYPGr0K
-						5VgbqJ0kiLAkULR25Xk7W4xzu6vIfS0TaA22W2aPjRS187wziMPhq1nUDjk77YRh
-						u/QAd2A/WREM6D8cGegKwlPQ7DhdIZQMt7iZrB4uEsx9CLwYs5YwaegQhYY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.maneyonline.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.maneyonline.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.maneyonline.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Maney Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.maneyonline.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.mecenat.eu-sp.xml b/swamid-interfederations-2.0/www.mecenat.eu-sp.xml
deleted file mode 100644
index c4557f1e..00000000
--- a/swamid-interfederations-2.0/www.mecenat.eu-sp.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mecenat.eu/sp">
-  <!--
-		This is a "Mecenat" OIOSAML.NET SP for Mecenat AB.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-07T16:22:19Z">
-      <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">Mecenat</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="se">Mecenat</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Mecenat makes student life easier by providing discounts and benefits that are relevant to their studies.</mdui:Description>
-        <mdui:Description xml:lang="se">Mecenat underlättar för de studerande genom att förmedla rabatter och förmåner som är relevanta under studietiden.</mdui:Description>
-        <mdui:Logo height="140" width="250">https://www.mecenat.eu/img/federation-logo-2.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEBTCCAu2gAwIBAgIJAPs0Eng4fXs9MA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-						VQQGEwJTRTEYMBYGA1UECAwPVmFzdHJhIEdvdGFsYW5kMRMwEQYDVQQHDApHb3Ro
-						ZW5idXJnMRMwEQYDVQQKDApNZWNlbmF0IEFCMQswCQYDVQQLDAJJVDEaMBgGA1UE
-						AwwRd3d3Lm1lY2VuYXQuZXUvc3AxHDAaBgkqhkiG9w0BCQEWDWl0QG1lY2VuYXQu
-						c2UwHhcNMTQxMTI1MDc0NjM1WhcNMzQxMTIwMDc0NjM1WjCBmDELMAkGA1UEBhMC
-						U0UxGDAWBgNVBAgMD1Zhc3RyYSBHb3RhbGFuZDETMBEGA1UEBwwKR290aGVuYnVy
-						ZzETMBEGA1UECgwKTWVjZW5hdCBBQjELMAkGA1UECwwCSVQxGjAYBgNVBAMMEXd3
-						dy5tZWNlbmF0LmV1L3NwMRwwGgYJKoZIhvcNAQkBFg1pdEBtZWNlbmF0LnNlMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAthw09/uFrfgj4G7p5IGgeTl+
-						upIQ10NpsvNsemRCv2G7kqWXlOgFXKm3m+aL71VposZKwgkPtp/RmFPedylSw6PQ
-						IcPIICqDhQo2g5REPJtb7US3q9DuA4QFr2UkM5QLD0Uuvrm1T6ENW0dXYmRM5SXS
-						OkqmVgbREhVeE4kyzhW5TneQQxbDMquPAlLSmPER89+2RYyr+FOGAfulQn4bRAro
-						PBpP+KORTFNOKpxsFp745dJ/3MV6ljqjWkqnF0aGYdOKTX+D0qg+hdCWJ+7II0K1
-						N1cbx+OsQkYc6J7wS45R1SN4Ii1vQO13UbYlOgMCSnss69SedACTfbhr9+JyewID
-						AQABo1AwTjAdBgNVHQ4EFgQU+NQXtvX4maXi6ZW8lBSczzekUbowHwYDVR0jBBgw
-						FoAU+NQXtvX4maXi6ZW8lBSczzekUbowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-						AQUFAAOCAQEAI1h9/Wl4HbO0y2AOP2ju0GcglBCaiHl+2/8QKBtzxncqUg3JrdGV
-						bQKpFbDWLekY50ckYG74+dhB0WdtAlE7XhSih4S4ddNhycariZxkHKYwoWKIrg28
-						C/WJyklWIQ2PjN6gEEHr7FgOH76tVJi+kVZd0+9sjLtpbTaA1mc7SqGpCp/eGHu1
-						NNpUXR11EaizV0z/Txc/NNnkSReDQz3noo+ocByF2gObCj/gtrDkPA5usf82Oe24
-						0QxorqG3ULo0KrMjctRsRu6NNCM+JCBWviC/2onMxBGqM+1STvUDonTU9ifUk0ur
-						qV08FefidEfSPH1DnDsiPeu/KDdLWmfhQA==
-					</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>
-						MIIEBTCCAu2gAwIBAgIJAPs0Eng4fXs9MA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-						VQQGEwJTRTEYMBYGA1UECAwPVmFzdHJhIEdvdGFsYW5kMRMwEQYDVQQHDApHb3Ro
-						ZW5idXJnMRMwEQYDVQQKDApNZWNlbmF0IEFCMQswCQYDVQQLDAJJVDEaMBgGA1UE
-						AwwRd3d3Lm1lY2VuYXQuZXUvc3AxHDAaBgkqhkiG9w0BCQEWDWl0QG1lY2VuYXQu
-						c2UwHhcNMTQxMTI1MDc0NjM1WhcNMzQxMTIwMDc0NjM1WjCBmDELMAkGA1UEBhMC
-						U0UxGDAWBgNVBAgMD1Zhc3RyYSBHb3RhbGFuZDETMBEGA1UEBwwKR290aGVuYnVy
-						ZzETMBEGA1UECgwKTWVjZW5hdCBBQjELMAkGA1UECwwCSVQxGjAYBgNVBAMMEXd3
-						dy5tZWNlbmF0LmV1L3NwMRwwGgYJKoZIhvcNAQkBFg1pdEBtZWNlbmF0LnNlMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAthw09/uFrfgj4G7p5IGgeTl+
-						upIQ10NpsvNsemRCv2G7kqWXlOgFXKm3m+aL71VposZKwgkPtp/RmFPedylSw6PQ
-						IcPIICqDhQo2g5REPJtb7US3q9DuA4QFr2UkM5QLD0Uuvrm1T6ENW0dXYmRM5SXS
-						OkqmVgbREhVeE4kyzhW5TneQQxbDMquPAlLSmPER89+2RYyr+FOGAfulQn4bRAro
-						PBpP+KORTFNOKpxsFp745dJ/3MV6ljqjWkqnF0aGYdOKTX+D0qg+hdCWJ+7II0K1
-						N1cbx+OsQkYc6J7wS45R1SN4Ii1vQO13UbYlOgMCSnss69SedACTfbhr9+JyewID
-						AQABo1AwTjAdBgNVHQ4EFgQU+NQXtvX4maXi6ZW8lBSczzekUbowHwYDVR0jBBgw
-						FoAU+NQXtvX4maXi6ZW8lBSczzekUbowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0B
-						AQUFAAOCAQEAI1h9/Wl4HbO0y2AOP2ju0GcglBCaiHl+2/8QKBtzxncqUg3JrdGV
-						bQKpFbDWLekY50ckYG74+dhB0WdtAlE7XhSih4S4ddNhycariZxkHKYwoWKIrg28
-						C/WJyklWIQ2PjN6gEEHr7FgOH76tVJi+kVZd0+9sjLtpbTaA1mc7SqGpCp/eGHu1
-						NNpUXR11EaizV0z/Txc/NNnkSReDQz3noo+ocByF2gObCj/gtrDkPA5usf82Oe24
-						0QxorqG3ULo0KrMjctRsRu6NNCM+JCBWviC/2onMxBGqM+1STvUDonTU9ifUk0ur
-						qV08FefidEfSPH1DnDsiPeu/KDdLWmfhQA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </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>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mecenat.eu/integrationservices/login.ashx" index="0" isDefault="true"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">Mecenat</ServiceName>
-      <ServiceName xml:lang="se">Mecenat</ServiceName>
-      <ServiceDescription xml:lang="en">Mecenat makes student life easier by providing discounts and benefits that are relevant to their studies.</ServiceDescription>
-      <ServiceDescription xml:lang="se">Mecenat underlättar för de studerande genom att förmedla rabatter och förmåner som är relevanta under studietiden.</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"/>
-      <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="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="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">Mecenat AB</OrganizationName>
-    <OrganizationName xml:lang="se">Mecenat AB</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Mecenat</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="se">Mecenat</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mecenat.eu/</OrganizationURL>
-    <OrganizationURL xml:lang="se">http://www.mecenat.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Customer Service</GivenName>
-    <EmailAddress>mailto:customerservice@mecenat.eu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Administrator</GivenName>
-    <EmailAddress>mailto:it@mecenat.eu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml b/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
deleted file mode 100644
index f6881106..00000000
--- a/swamid-interfederations-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.mediafora.net/simplesaml/module.php/saml/sp/metadata.php/media-network-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">
-      <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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">MediaFora</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="da">MediaFora</mdui:DisplayName>
-        <mdui:Description xml:lang="en">MediaFora aims to provide a platform for exchange of knowledge on media services at higher education</mdui:Description>
-        <mdui:Description xml:lang="da">MediaFora har til hensigt at skabe en platform for udveksling af viden om medietjenester ved de videregående uddannels</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.mediafora.net/simplesaml/privacy-statement/</mdui:PrivacyStatementURL>
-        <mdui:Logo height="120" width="120">https://www.mediafora.net/mediafora-logo.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>MIIDdzCCAl+gAwIBAgIJAIqDherg0eZhMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAkRLMRMwEQYDVQQIDApTb21lLVN0YXRlMQ0wCwYDVQQKDAREZUlDMR8wHQYJKoZIhvcNAQkBFhBuZXRkcmlmdEBkZWljLmRrMB4XDTE0MTAwNzA4MjI1OVoXDTI0MTAwNjA4MjI1OVowUjELMAkGA1UEBhMCREsxEzARBgNVBAgMClNvbWUtU3RhdGUxDTALBgNVBAoMBERlSUMxHzAdBgkqhkiG9w0BCQEWEG5ldGRyaWZ0QGRlaWMuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrgS058VIfp1wm87kpbxgAEWGhtTTgd/tIQ7Yyh6jn6CPERxMiQMXyPUadbr3BZeEFucI9OcMXnoLldLUm5l0Pap6FiJ2Gw8Q/Hh4OfvcqyqmZy+0BZFqQhrTLDaFGq9XiJ+/4in/NvY1Eg0f2QwviW7V3vAQWficsV1W0U9wLyfFQPjFJ579psQCD7PETZao2emXEqeMFiasYNeh2h1ccGd1TQDKl6hOKe4gSuo2JC7pzWL5lVPqhEUOdStSTmn+fdxv5FVAZRhM21qebd7KnT4NQc9S3GRuXVml1iRdQ6UX1ZpHt3FgerbW76Px8/dKHtsp2ZnVYN1JyktRBdvvfAgMBAAGjUDBOMB0GA1UdDgQWBBQdTIO6FWQSbpLNwflng1jb8VO9GTAfBgNVHSMEGDAWgBQdTIO6FWQSbpLNwflng1jb8VO9GTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCalmSUGLAWb0s6BbJ6n+F2skZxUrNZNHDjUqXtKfncUb94N5E20pvYhUhET+W5Mk49+6smmUTRc5OUQ14xhoJRElJprOgWYXjGEd8iK3XRwmjmGPQ7Ic9y4gLuuL6zFhJQK3pGd4Kmr8Ny7s7UtBf97IFsXLzBPuv2JprXJ7o3dZLYOfdUvaOrbSFomYFCAH1ImOdHsZZ27hpirEEYIsmh1NeXYOgw/XPfCayIprUeXb4zhUBTzbGvjmMdX742+h4l4sww7kU14KHXNR8m5iqrJFlIHwhUbDCu56JbIbnjhaijHAlBDW4UhJQb/chO1NPKqBNpwxsxUdhhIJ1QxDYb</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDdzCCAl+gAwIBAgIJAIqDherg0eZhMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAkRLMRMwEQYDVQQIDApTb21lLVN0YXRlMQ0wCwYDVQQKDAREZUlDMR8wHQYJKoZIhvcNAQkBFhBuZXRkcmlmdEBkZWljLmRrMB4XDTE0MTAwNzA4MjI1OVoXDTI0MTAwNjA4MjI1OVowUjELMAkGA1UEBhMCREsxEzARBgNVBAgMClNvbWUtU3RhdGUxDTALBgNVBAoMBERlSUMxHzAdBgkqhkiG9w0BCQEWEG5ldGRyaWZ0QGRlaWMuZGswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrgS058VIfp1wm87kpbxgAEWGhtTTgd/tIQ7Yyh6jn6CPERxMiQMXyPUadbr3BZeEFucI9OcMXnoLldLUm5l0Pap6FiJ2Gw8Q/Hh4OfvcqyqmZy+0BZFqQhrTLDaFGq9XiJ+/4in/NvY1Eg0f2QwviW7V3vAQWficsV1W0U9wLyfFQPjFJ579psQCD7PETZao2emXEqeMFiasYNeh2h1ccGd1TQDKl6hOKe4gSuo2JC7pzWL5lVPqhEUOdStSTmn+fdxv5FVAZRhM21qebd7KnT4NQc9S3GRuXVml1iRdQ6UX1ZpHt3FgerbW76Px8/dKHtsp2ZnVYN1JyktRBdvvfAgMBAAGjUDBOMB0GA1UdDgQWBBQdTIO6FWQSbpLNwflng1jb8VO9GTAfBgNVHSMEGDAWgBQdTIO6FWQSbpLNwflng1jb8VO9GTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCalmSUGLAWb0s6BbJ6n+F2skZxUrNZNHDjUqXtKfncUb94N5E20pvYhUhET+W5Mk49+6smmUTRc5OUQ14xhoJRElJprOgWYXjGEd8iK3XRwmjmGPQ7Ic9y4gLuuL6zFhJQK3pGd4Kmr8Ny7s7UtBf97IFsXLzBPuv2JprXJ7o3dZLYOfdUvaOrbSFomYFCAH1ImOdHsZZ27hpirEEYIsmh1NeXYOgw/XPfCayIprUeXb4zhUBTzbGvjmMdX742+h4l4sww7kU14KHXNR8m5iqrJFlIHwhUbDCu56JbIbnjhaijHAlBDW4UhJQb/chO1NPKqBNpwxsxUdhhIJ1QxDYb</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml2-logout.php/media-network-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml2-acs.php/media-network-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml1-acs.php/media-network-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml2-acs.php/media-network-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mediafora.net/simplesaml/module.php/saml/sp/saml1-acs.php/media-network-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">Media network forum</md:ServiceName>
-      <md:ServiceName xml:lang="da">Media netv&amp;aelig;rks forum</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">MediaFora aims to provide a platform for exchange of knowledge on media services at higher education</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="da">MediaFora har til hensigt at skabe en platform for udveksling af viden om medietjenester ved de videregående uddannels</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.3"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Administrator</md:GivenName>
-    <md:EmailAddress>mailto:netdrift@deic.dk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml b/swamid-interfederations-2.0/www.medicinescomplete.com-mc-shibboleth.xml
deleted file mode 100644
index a119cebe..00000000
--- a/swamid-interfederations-2.0/www.medicinescomplete.com-mc-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://www.medicinescomplete.com/mc/shibboleth">
-  <!--
-		This is an OpenAthensSP MedicinesComplete SP for the Royal Pharmaceutical Society of Great Britain.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-07-14T15:06: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: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">Royal Pharmaceutical Society: MedicinesComplete</mdui:DisplayName>
-        <mdui:Description xml:lang="en">MedicinesComplete provides online access to the world's leading drug and healthcare references.</mdui:Description>
-        <mdui:Logo height="36" width="217">https://www.medicinescomplete.com/mc/images/mc.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFZTCCBE2gAwIBAgISESFAs6LrxE6kf3dqQJu3Dy3vMA0GCSqGSIb3DQEBBQUA
-						MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYD
-						VQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzIw
-						HhcNMTMwODIyMTQyOTQwWhcNMTgwODIyMTQyOTQwWjCBlTELMAkGA1UEBhMCR0Ix
-						FzAVBgNVBAgTDkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xOjA4BgNV
-						BAoTMVRoZSBSb3lhbCBQaGFybWFjZXV0aWNhbCBTb2NpZXR5IG9mIEdyZWF0IEJy
-						aXRhaW4xIDAeBgNVBAMMFyoubWVkaWNpbmVzY29tcGxldGUuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2XOqzYc15XJX3l6tjtr2A/zHGyDqryJv
-						duUDJ+B85UYj0vh2xHDXwlsdd3+T5e9Eumo3NhAVpTN6j3jv5crLYL+M2DsbPSPY
-						r76amB7WWkfGJMTPBZo6wvoeNDOdfjVG30P71qpdz5ZRTElLqYKN3/tlXPoiL7Il
-						Nt5I+18JVwKCs5eKSftSzuJjd9NUAjqHicouEE2mtXNE0luflz5Yh2/wTA/AmryQ
-						nYfaW6KFloeNzPEfd8xMGfhfUr2PjPbSrlYVYxz0cvkWaR1Q98heD9kI33ys6gl+
-						CrbM5sJ3kcTnsrtqG0cNnwUCnTv9KzzG7x2/8u8w8ncrCMlG46F4ZQIDAQABo4IB
-						5DCCAeAwDgYDVR0PAQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQICMDQwMgYI
-						KwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkv
-						MDkGA1UdEQQyMDCCFyoubWVkaWNpbmVzY29tcGxldGUuY29tghVtZWRpY2luZXNj
-						b21wbGV0ZS5jb20wCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-						BQUHAwIwRQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL2NybC5nbG9iYWxzaWduLmNv
-						bS9ncy9nc29yZ2FuaXphdGlvbnZhbGcyLmNybDCBlgYIKwYBBQUHAQEEgYkwgYYw
-						RwYIKwYBBQUHMAKGO2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2FjZXJ0
-						L2dzb3JnYW5pemF0aW9udmFsZzIuY3J0MDsGCCsGAQUFBzABhi9odHRwOi8vb2Nz
-						cDIuZ2xvYmFsc2lnbi5jb20vZ3Nvcmdhbml6YXRpb252YWxnMjAdBgNVHQ4EFgQU
-						6hkvlxO56ZLnbe1cuDX/EuZJjJIwHwYDVR0jBBgwFoAUXUayjcRLdBy77fVztjq3
-						OI91nn4wDQYJKoZIhvcNAQEFBQADggEBAJOp4lsEMzzLYU0nufnXFdUPQshtGRGN
-						CSq7bb6+hFUQsMdxXQndbbB4j1Ooc93wdJPoPT4BWdGx52jpEHtL5oYPOzvz2y5L
-						rOx/qLYHZJARVKvL2jzWTDSxDFmjROay2BF/gYPA8oOzVFWXVWTOVrG+VO8ZE99s
-						o1cD79wTxPNZDduPRpMo+gPO2mHgbM2I1ex+81KIu0r69H/DSOjpxpXM2IVx6n75
-						zLwgFCx6+rsu3VEoJL7fcmI9tV4nHSgvX0BbxVN0hiMSmmLyVS4VHV3Sd5hUq0Ni
-						rGza4ZQu2FDvZCTsVhGeJY0WfVMF9XwyyptsUSurLL0+xH4/ureEj/A=
-					</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>
-						MIIFZTCCBE2gAwIBAgISESFAs6LrxE6kf3dqQJu3Dy3vMA0GCSqGSIb3DQEBBQUA
-						MF0xCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTMwMQYD
-						VQQDEypHbG9iYWxTaWduIE9yZ2FuaXphdGlvbiBWYWxpZGF0aW9uIENBIC0gRzIw
-						HhcNMTMwODIyMTQyOTQwWhcNMTgwODIyMTQyOTQwWjCBlTELMAkGA1UEBhMCR0Ix
-						FzAVBgNVBAgTDkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xOjA4BgNV
-						BAoTMVRoZSBSb3lhbCBQaGFybWFjZXV0aWNhbCBTb2NpZXR5IG9mIEdyZWF0IEJy
-						aXRhaW4xIDAeBgNVBAMMFyoubWVkaWNpbmVzY29tcGxldGUuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2XOqzYc15XJX3l6tjtr2A/zHGyDqryJv
-						duUDJ+B85UYj0vh2xHDXwlsdd3+T5e9Eumo3NhAVpTN6j3jv5crLYL+M2DsbPSPY
-						r76amB7WWkfGJMTPBZo6wvoeNDOdfjVG30P71qpdz5ZRTElLqYKN3/tlXPoiL7Il
-						Nt5I+18JVwKCs5eKSftSzuJjd9NUAjqHicouEE2mtXNE0luflz5Yh2/wTA/AmryQ
-						nYfaW6KFloeNzPEfd8xMGfhfUr2PjPbSrlYVYxz0cvkWaR1Q98heD9kI33ys6gl+
-						CrbM5sJ3kcTnsrtqG0cNnwUCnTv9KzzG7x2/8u8w8ncrCMlG46F4ZQIDAQABo4IB
-						5DCCAeAwDgYDVR0PAQH/BAQDAgWgMEkGA1UdIARCMEAwPgYGZ4EMAQICMDQwMgYI
-						KwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkv
-						MDkGA1UdEQQyMDCCFyoubWVkaWNpbmVzY29tcGxldGUuY29tghVtZWRpY2luZXNj
-						b21wbGV0ZS5jb20wCQYDVR0TBAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-						BQUHAwIwRQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL2NybC5nbG9iYWxzaWduLmNv
-						bS9ncy9nc29yZ2FuaXphdGlvbnZhbGcyLmNybDCBlgYIKwYBBQUHAQEEgYkwgYYw
-						RwYIKwYBBQUHMAKGO2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2FjZXJ0
-						L2dzb3JnYW5pemF0aW9udmFsZzIuY3J0MDsGCCsGAQUFBzABhi9odHRwOi8vb2Nz
-						cDIuZ2xvYmFsc2lnbi5jb20vZ3Nvcmdhbml6YXRpb252YWxnMjAdBgNVHQ4EFgQU
-						6hkvlxO56ZLnbe1cuDX/EuZJjJIwHwYDVR0jBBgwFoAUXUayjcRLdBy77fVztjq3
-						OI91nn4wDQYJKoZIhvcNAQEFBQADggEBAJOp4lsEMzzLYU0nufnXFdUPQshtGRGN
-						CSq7bb6+hFUQsMdxXQndbbB4j1Ooc93wdJPoPT4BWdGx52jpEHtL5oYPOzvz2y5L
-						rOx/qLYHZJARVKvL2jzWTDSxDFmjROay2BF/gYPA8oOzVFWXVWTOVrG+VO8ZE99s
-						o1cD79wTxPNZDduPRpMo+gPO2mHgbM2I1ex+81KIu0r69H/DSOjpxpXM2IVx6n75
-						zLwgFCx6+rsu3VEoJL7fcmI9tV4nHSgvX0BbxVN0hiMSmmLyVS4VHV3Sd5hUq0Ni
-						rGza4ZQu2FDvZCTsVhGeJY0WfVMF9XwyyptsUSurLL0+xH4/ureEj/A=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://service.medicinescomplete.com/ukfed/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://service.medicinescomplete.com/ukfed/oa/auth/rcv/saml2/post" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Royal Pharmaceutical Society of Great Britain</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Royal Pharmaceutical Society: MedicinesComplete</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.pharmpress.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Micah</GivenName>
-    <SurName>Edwards</SurName>
-    <EmailAddress>mailto:micah@cbcl.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Micah</GivenName>
-    <SurName>Edwards</SurName>
-    <EmailAddress>mailto:micah@cbcl.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Pharmaceutical Press Ops Team</GivenName>
-    <EmailAddress>mailto:opsteam@rpharms.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
index ab553f2a..3d8e4e57 100644
--- 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
@@ -1,36 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.meertens.knaw.nl/Shibboleth.sso/Metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-02-13T16:31:05Z">
-      <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:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
-        <saml:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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://www.meertens.knaw.nl/Shibboleth.sso/Metadata">
+  <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://www.meertens.knaw.nl/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Meertens Institut</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dieser Service Provider regelt den Zugang zum Meertens Institut Archive und ausgewählten Dienstleistungen für geisteswissenschaftliche Forschungsaktivitäten auf dem Gebiet der niederländischen Sprachvariation und Kultur.</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">http://www.meertens.knaw.nl/cms/templates/mi_hetgelaat/css/images/logo_meertens_full.png</mdui:Logo>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.meertens.knaw.nl/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">CLARIN-NL Meertens Institute</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">CLARIN-NL Meertens Institute</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">CLARIN-NL Meertens Institute</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This SP regulates access to the Meertens Institute Archive and selected services for humanities research in the domain of Dutch</mdui:Description>
+        <mdui:Description xml:lang="fi">Tämä Palveluntarjoaja säätelee pääsyä Meertens instituutin arkisto ja asiantuntijapalvelut humanististen tutkimustoiminnan ...</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:Keywords xml:lang="en">Meertens research documentation language culture humanities archive</mdui:Keywords>
+        <mdui:Keywords xml:lang="fi">Meertens tutkimus asiakirjat kieli kulttuuri humanististen arkisto</mdui:Keywords>
         <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:PrivacyStatementURL xml:lang="en">https://www.meertens.knaw.nl/cms/collections/data-protection</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.meertens.knaw.nl</ds:KeyName>
+      <ds:KeyInfo>
         <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
@@ -62,57 +54,46 @@ KpxjeDWUTpopH0JEVvSgX0Tn9pVFVq5F4cial+yOpwDxZvAOwjJlWotoqnyVsDOn
 uESSSj1tVqW+2zqLTdzOpWaP0kWlu7wrL5PzqWhaPVChL+KYs40TNd2XK1rlOtNe
 WWcZ8uJ+ftZDNEGNvaTnRZLhxGxE9OWThvwL0iyOw8vEcWHm2JNRy3VkSvguFDcM
 MXWm4sBAe8iEXXkAxrflHdBubei1FTexa+Kl9lQ/ICrpmT+V1Jyi4DrdvS0+2ijb
-SF7hTs3mZvR2FPh5VJ0vBUC7QOXB5RBcP6vy4H25WiovevzKOg==
-</ds:X509Certificate>
+SF7hTs3mZvR2FPh5VJ0vBUC7QOXB5RBcP6vy4H25WiovevzKOg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/SOAP"/>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/NIM/Artifact"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</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://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Meertens Institut</md:ServiceName>
-      <md:ServiceName xml:lang="en">Meertens Institute</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Dieser Service Provider regelt den Zugang zum Meertens Institut Archive und ausgewählten Dienstleistungen für geisteswissenschaftliche Forschungsaktivitäten auf dem Gebiet der niederländischen Sprachvariation und Kultur.</md:ServiceDescription>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.meertens.knaw.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">CLARIN-NL Meertens instituutin</md:ServiceName>
+      <md:ServiceName xml:lang="en">CLARIN-NL Meertens Institute</md:ServiceName>
       <md: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.</md:ServiceDescription>
-      <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="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 Name="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.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <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:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
-    <md:OrganizationName xml:lang="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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="support">
-    <md:GivenName>KNAW</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  <md:ContactPerson contactType="administrative">
     <md:GivenName>Marc</md:GivenName>
     <md:SurName>Kemps-Snijders</md:SurName>
     <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  <md:ContactPerson contactType="technical">
     <md:GivenName>Marc</md:GivenName>
     <md:SurName>Kemps-Snijders</md:SurName>
     <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>KNAW</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
 </md: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 26550b5d..00000000
--- a/swamid-interfederations-2.0/www.meertens.knaw.nl.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://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: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>CN=www.meertens.knaw.nl,OU=Meertens Instituut,O=KNAW,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEgjCCA2qgAwIBAgIRAOmcTE0k6Yoag8eNrOUGhicwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMjEyMTcwMDAwMDBaFw0xNTEyMTcyMzU5NTlaMFgxCzAJBgNV
-BAYTAk5MMQ0wCwYDVQQKEwRLTkFXMRswGQYDVQQLExJNZWVydGVucyBJbnN0aXR1
-dXQxHTAbBgNVBAMTFHd3dy5tZWVydGVucy5rbmF3Lm5sMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAtqF1CkCgz6bB3dv5bTYBRCSwWqgoZActFvigdJsa
-DopFIIh+3agGBfmCI4WCb3rAluCw2LYl8mdUaRIXNDr3TkkGQP5Q+pKDHFTd1n0L
-TLs7PdTWOG61E/ExIfwTmphUvcrshazJk5xCbFBRbrWFNf/349Anf2ze1mUDBSdl
-vRTTyuYcckJKV7OHMnOh3+EsCHOkX1KsOwyhQKfmtpL7n/meIPkF9KwFocsxTjNx
-inZDHxTmikjzr6kguu5grEIeXbbA1mfO0AHVGiaXRyvNDl+EoX7IqEKJQbbIKwpd
-h1t/CHvZ/PFWdyM8K4IuDdImD3sjoYCg78yLHnR0lJJ8twIDAQABo4IBZzCCAWMw
-HwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFOPgQ/s6
-AVKL7kI1LBCGTOSGGWk0MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0G
-A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQB
-sjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5v
-cmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYp
-aHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYB
-BQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFHd3
-dy5tZWVydGVucy5rbmF3Lm5sMA0GCSqGSIb3DQEBBQUAA4IBAQA9ZZaYfsUQ5/9d
-uqDpjUaKPkXOfyKUNllh8mInY/LE8hWp+M3L4i5iiAkFkyp+v/d07AZDR0r0F7Jp
-+8hEY6HdP5+sdcTzlk6E3QezOmTAIUVcSNYLPuqyvyx0hmGZR1S4z+vYqTNyQMW1
-2L/MYOCTUdwruEmqyBR2goNyq0k6K3l5vh6TqV20E45SzpB2JEGRTIPWt46cRJNx
-wmpzyA4aXLGH97Z8DFjC2hi1bazaVr9E109r0NMXO/8yaLtc0Ok/vWHLUPB4TLCP
-HI6pYTwazmo1x3l7TmGhmhEcVc1JCN0ByVLWB+DvzXsCxYtDItsHPXj2MVPnqMJo
-GTLw7jCk
-</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>
-    <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">e235</OrganizationName>
-    <OrganizationName xml:lang="en">e235</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Max-Planck-Institut für Psycholinguistik</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Max Planck Institute for Psycholinguistics</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.mpi.nl</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.mpi.nl</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>KNAW</GivenName>
-    <SurName>Support</SurName>
-    <EmailAddress>mailto:servicedesk@knaw.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Marc</GivenName>
-    <SurName>Kemps-Snijders</SurName>
-    <EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Marc</GivenName>
-    <SurName>Kemps-Snijders</SurName>
-    <EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.mitpressjournals.org-shibboleth.xml b/swamid-interfederations-2.0/www.mitpressjournals.org-shibboleth.xml
deleted file mode 100644
index 24e1a3a6..00000000
--- a/swamid-interfederations-2.0/www.mitpressjournals.org-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://www.mitpressjournals.org/shibboleth">
-  <!--
-		This is an 'MIT Press Journals' OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDtTCCAp2gAwIBAgIJAOSUQ1IxKrLFMA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEhMB8GA1UEAxMYd3d3Lm1pdHByZXNzam91cm5hbHMu
-						b3JnMB4XDTEwMDQyOTE4NTUwOVoXDTIwMDQyNjE4NTUwOVowgZkxCzAJBgNVBAYT
-						AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEd
-						MBsGA1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBT
-						eXN0ZW1zLCBJbmMuMSEwHwYDVQQDExh3d3cubWl0cHJlc3Nqb3VybmFscy5vcmcw
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBPu6I5h+u+RBjd9CGQZ+S
-						LCJgGLTT6QA2ZA0jeBwpy49IiMt1XritmWpth6+6Ujl7AfJo9IdVkAyxftbLyZoq
-						X1AFJalhC0PVgijowgQ/dyf0bRwR220GAlfRhXu6bgVyd9AdHcxbwSu6mEXCg6yx
-						Jg/sELZd6YBUyXjoRLavPOJkoVT+bABMYJEK7cmMnf3dfC7qn5AM8nOqa/b7vTSl
-						+6cKazBv9jPZz98vbfKaz7if/WHOOdyZQxtdhs7m4bRLo4eiulzZl90IlHkTyIPt
-						RVij6cXOYlj9LqYD/omAOsIx/HJOj+POh0bTYEezY487Iz51FfOhTox1NV3UVoTv
-						AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAGNaKJAhMr+Ms9tqT2SQ5ZSqjU9AKleg
-						257H7SjInDwq3BfDCh7GBJtZ2HziUXUuq4Cu9ufhvyI03aiEkTumupNI27Hhy/jR
-						914HO+RAbOe3v6H6sPSpPSLPVza/wI4UD2i6dwgf8Gb0+WZAputqV80Uu6dd9CNc
-						8x8SH2yVkEwrsS+ropXyxA5+oqvHVeCdsoPSYy2sueQzls8bawTjk7Ukv4DrmFbD
-						mxigOHHj//L5hysJNl6msFo3p88e1yNJt7z8PgFBdlzRdrizFfrqUYcX17WBfZ0I
-						kFKGffEJeigQ0XTt+EwxUqeIS4bJiCzP95FGjUysTQ7i029sfSQhXVg=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mitpressjournals.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mitpressjournals.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mitpressjournals.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: MIT Press Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mitpressjournals.org/</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.mmunion.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.mmunion.co.uk-shibboleth.xml
deleted file mode 100644
index d46f66c5..00000000
--- a/swamid-interfederations-2.0/www.mmunion.co.uk-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://www.mmunion.co.uk/shibboleth">
-  <!--
-		This is a Shibboleth 2.3.1 'MM Union' SP owned by Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mmunion.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mmunion.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mmunion.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mmunion.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mmunion.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mmunion.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mmunion.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mmunion.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mmunion.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mmunion.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Membership Solutions: MM Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mmunion.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.morganclaypool.com-shibboleth.xml b/swamid-interfederations-2.0/www.morganclaypool.com-shibboleth.xml
deleted file mode 100644
index dc263fcd..00000000
--- a/swamid-interfederations-2.0/www.morganclaypool.com-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.morganclaypool.com/shibboleth">
-  <!--
-		This is a "Morgan & Claypool Publishers" OpenSAML SP owned by Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEbjCCA1agAwIBAgIJANEyiht0lGz3MA0GCSqGSIb3DQEBBQUAMIG3MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEfMB0GA1UEAxMWd3d3Lm1vcmdhbmNsYXlwb29sLmNv
-						bTEeMBwGCSqGSIb3DQEJARYPdmFrZUBhdHlwb24uY29tMB4XDTA5MDcyMzE4MjQz
-						M1oXDTE5MDcyMTE4MjQzM1owgbcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxp
-						Zm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEdMBsGA1UEChMUQXR5cG9uIFN5
-						c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR8wHQYD
-						VQQDExZ3d3cubW9yZ2FuY2xheXBvb2wuY29tMR4wHAYJKoZIhvcNAQkBFg92YWtl
-						QGF0eXBvbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1jZrb
-						EIm3NwRJ8SkkHkvjKSWe4vuqyfO1D1MAVZzy5FzSLOeup4qEyCDkwtzrN3vSYNa1
-						4qovhIs+Eeap6FXH3XkhzZluSn4rKM/IoetfcP74l99cIzn4xMZfknhk9NNnb2vE
-						L/dJSu/8LyGFxr2b8c5cdYzgFiN77peyf4kOYCMJhC5xYXogrtFlmzkhbk6CRK36
-						QELJmbcegneoglceycLwmunJvhbkIagouT/AFxm7m9FFR2AbGQ2m52DdCSJdY6Q/
-						+cRnIO3p3Jar0D+huhNPlTyH5XNw41kPH4WvQiYAq7j40cFEwYHU4hOrBkKrdLUz
-						hPjVz1iquFai4gY1AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
-						HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBSntSFOeKeT
-						NvcbAlIaG09llX2rAzAfBgNVHSMEGDAWgBSntSFOeKeTNvcbAlIaG09llX2rAzAN
-						BgkqhkiG9w0BAQUFAAOCAQEAQguA1fll3LnjT1NokQTeSc1gmZIlbD318j6SKojU
-						zDYXinKZtzK9T0t1e1BFlOnbPGN1Fu1VkGLuOp5Z5/AJqMJJ9hfSOTjtz99AUk20
-						Ojgsw76oZ5nwqvk2lxKregha/GIkT7nJp8ycuQVI1ahnh142BDrfuB5DFAcHvi1q
-						v3NXHQuorkykb0mBuduNW+Uvk2T7wiNzruCOpBJGZzJZw3/FNXGCb3MmtaJgf7Br
-						+B02aD7lQHX2jczKW50vxU46gvji7sBWUlCeYT+JeBQpBKT6SOPtHBLcSNIwhDzG
-						U5jsgJ4S54QwA12aggwYfLERyqoQLPepkxvA2QygkK7JeQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.morganclaypool.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.morganclaypool.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.morganclaypool.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Morgan &amp; Claypool Publishers</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.morganclaypool.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.myinterfase.com-shibboleth.xml b/swamid-interfederations-2.0/www.myinterfase.com-shibboleth.xml
deleted file mode 100644
index 79223902..00000000
--- a/swamid-interfederations-2.0/www.myinterfase.com-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" entityID="https://www.myinterfase.com/shibboleth">
-  <!--
-		This is an "Interfase" Shibboleth SP for CSO Research, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2008-11-20T11:39:55Z">
-      <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.myinterfase.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://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
-      <init: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.myinterfase.com/Shibboleth.sso/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.myinterfase.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://www.myinterfase.com/Shibboleth.sso/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.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
-      <init: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.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
-      <init: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.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
-      <init: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.myinterfase.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://www.myinterfase.com/Shibboleth.sso/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.myinterfase.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://www.myinterfase.com/Shibboleth.sso/WAYF/Incommon"/>
-      <init: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.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.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://www.myinterfase.com/Shibboleth.sso/login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEqjCCA5KgAwIBAgIJALAy5mejW0XwMA0GCSqGSIb3DQEBBAUAMIGUMQswCQYD
-						VQQGEwJVUzEOMAwGA1UECBMFVGV4YXMxDzANBgNVBAcTBkF1c3RpbjEZMBcGA1UE
-						ChMQQ1NPIFJlc2VhcmNoIEluYzETMBEGA1UECxMKcHJvZHVjdGlvbjEMMAoGA1UE
-						AxMDY3NvMSYwJAYJKoZIhvcNAQkBFhdzdXBwb3J0QGNzb3Jlc2VhcmNoLmNvbTAe
-						Fw0wODA3MjgxODQ3MjdaFw0xODA3MjYxODQ3MjdaMIGUMQswCQYDVQQGEwJVUzEO
-						MAwGA1UECBMFVGV4YXMxDzANBgNVBAcTBkF1c3RpbjEZMBcGA1UEChMQQ1NPIFJl
-						c2VhcmNoIEluYzETMBEGA1UECxMKcHJvZHVjdGlvbjEMMAoGA1UEAxMDY3NvMSYw
-						JAYJKoZIhvcNAQkBFhdzdXBwb3J0QGNzb3Jlc2VhcmNoLmNvbTCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAJYDztkLmhjwhZrFuCNLMi5bDoiLm/mdSEih
-						yeEl5pTMdaw2ZF4I19+DtKxK7PcWSSXWKJfVfD93kys8eZ+xx9fBNiFVqZdkk7Z9
-						jUAhG5NB/kvLVNrEP2i4ZryXaLpbes/9HSKP2ZE6Iozdz45Ie7tbig6lN3itqDiE
-						/AXDTnpBEB2WXaxlIomCzPbWm3bjFEbTOpzaAeyQBv9paxftSvrOREI18Ubv8OYj
-						gWszVWTQLuNg7FCivZTk7REerI5hXNVsB0KY2FeIEUqqajxIxlj+vCZTTOhjeHLA
-						QKIMkVFAmWEn6zLQDGI8yV4ooab6P1eZNs/vSmY/Foc6Z4fBrkcCAwEAAaOB/DCB
-						+TAdBgNVHQ4EFgQUok5bi4sjD0Ud4emkOVF1Or5db/IwgckGA1UdIwSBwTCBvoAU
-						ok5bi4sjD0Ud4emkOVF1Or5db/KhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMQ4wDAYD
-						VQQIEwVUZXhhczEPMA0GA1UEBxMGQXVzdGluMRkwFwYDVQQKExBDU08gUmVzZWFy
-						Y2ggSW5jMRMwEQYDVQQLEwpwcm9kdWN0aW9uMQwwCgYDVQQDEwNjc28xJjAkBgkq
-						hkiG9w0BCQEWF3N1cHBvcnRAY3NvcmVzZWFyY2guY29tggkAsDLmZ6NbRfAwDAYD
-						VR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOCAQEAOUVYBoiWvLmhKqYmMXQAMjUx
-						OpJPCel/bjMfW4Wlp+2yOuQcuqc9ZkFUME6tjqOgSuQkkU6R88h9jeeZX+s5TAVF
-						dPImqHPM/rcLGnoe1Wa/6UR6Zwcp4rsFSDu0+7Jd3PKG3j6lKWezUXargrJZdG5u
-						tXuwJf+f6QUiWWNiQI40kF7FhqlCWJ0CqXvNBGRXmdVwLQrADUUyNs4N3DM3hVDS
-						0/G9cmszj6oBd/EQznuxVJVvk6vpGBifh47t/LCWNd3rgPf2Rk3qx1HRoqcheJBK
-						pFT1skULlbFxWMSbnHzHd5evjh5a5B0pzmlrkXpAtVoIVAur0M8FX8+ts+mTNA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.myinterfase.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.myinterfase.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.myinterfase.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.myinterfase.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.myinterfase.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.myinterfase.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.myinterfase.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.myinterfase.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.myinterfase.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.myinterfase.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.myinterfase.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.myinterfase.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.myinterfase.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.myinterfase.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.myinterfase.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CSO Research, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CSO Research, Inc: Interfase</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.csoresearch.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tim</GivenName>
-    <SurName>Hiers</SurName>
-    <EmailAddress>mailto:thiers@csoresearch.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tim</GivenName>
-    <SurName>Hiers</SurName>
-    <EmailAddress>mailto:thiers@csoresearch.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.mynsu.co.uk-shibboleth.xml
deleted file mode 100644
index 767be5d9..00000000
--- a/swamid-interfederations-2.0/www.mynsu.co.uk-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://www.mynsu.co.uk/shibboleth">
-  <!--
-		This is a "Northumbria Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-08-04T08:23:54Z">
-      <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.mynsu.co.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mynsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.mynsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mynsu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Northumbria Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mynsu.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml b/swamid-interfederations-2.0/www.napierstudents.com-shibboleth.xml
deleted file mode 100644
index 095ba89c..00000000
--- a/swamid-interfederations-2.0/www.napierstudents.com-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://www.napierstudents.com/shibboleth">
-  <!--
-		This is a "Napier Students Association" Shibboleth SP for Membership Solutions Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-19T09:14:33Z">
-      <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://www.napierstudents.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.napierstudents.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.napierstudents.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.napierstudents.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.napierstudents.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.napierstudents.com/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.napierstudents.com/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.napierstudents.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.napierstudents.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.napierstudents.com/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.napierstudents.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.napierstudents.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.napierstudents.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.napierstudents.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.napierstudents.com/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.napierstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Napier Students Association</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.napierstudents.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml b/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
index 6e1cf0a6..33fde50d 100644
--- a/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
+++ b/swamid-interfederations-2.0/www.nederlab.nl-shibboleth.xml
@@ -1,119 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nederlab.nl/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2015-10-09T19:24: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>
-    <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:AttributeValue>http://aai.dfn.de/category/clarin-member</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: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://www.nederlab.nl/shibboleth">
+  <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://www.nederlab.nl/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Meertens Institut</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Meertens Institute</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Dieser Service Provider regelt den Zugang zur Nederlab-Forschungsumgebung</mdui:Description>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Meertens Institute Nederlab</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Meertens Instituutti Nederlab</mdui:DisplayName>
         <mdui:Description xml:lang="en">This Service Provider regulates access to the Nederlab research environment</mdui:Description>
+        <mdui:Description xml:lang="fi">Tämä Palveluntarjoaja säätelee pääsyäNederlab tutkimusympäristö</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">https://www.meertens.knaw.nl/cms/en/collections/data-protection</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="en">Meertens research documentation language culture humanities Nederlab</mdui:Keywords>
+        <mdui:InformationURL xml:lang="fi">http://www.meertens.knaw.nl/cms/en</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://www.meertens.knaw.nl/cms/collections/data-protection</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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.nederlab.nl</ds:KeyName>
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=servicedesk@knaw.nl,CN=www.nederlab.nl,OU=I&amp;A,O=Meertens,L=Amsterdam,ST=Noord Holland,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGBTCCA+2gAwIBAgIJAIGzep3p2hjqMA0GCSqGSIb3DQEBBQUAMIGYMQswCQYD
-VQQGEwJOTDEWMBQGA1UECAwNTm9vcmQgSG9sbGFuZDESMBAGA1UEBwwJQW1zdGVy
-ZGFtMREwDwYDVQQKDAhNZWVydGVuczEMMAoGA1UECwwDSSZBMRgwFgYDVQQDDA93
-d3cubmVkZXJsYWIubmwxIjAgBgkqhkiG9w0BCQEWE3NlcnZpY2VkZXNrQGtuYXcu
-bmwwHhcNMTQwNzE3MTIxMDUzWhcNMjQwNzE0MTIxMDUzWjCBmDELMAkGA1UEBhMC
-TkwxFjAUBgNVBAgMDU5vb3JkIEhvbGxhbmQxEjAQBgNVBAcMCUFtc3RlcmRhbTER
-MA8GA1UECgwITWVlcnRlbnMxDDAKBgNVBAsMA0kmQTEYMBYGA1UEAwwPd3d3Lm5l
-ZGVybGFiLm5sMSIwIAYJKoZIhvcNAQkBFhNzZXJ2aWNlZGVza0BrbmF3Lm5sMIIC
-IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA23RweYXXwA9mGVNYCpfxOOMc
-HGsGjCB/rdCHJ9REW3fmdmKn3Rtm9jxI3W/3AneMuE4s+QUog3ec2+iHuOvSYFZx
-SNybqaqZMSTB2IddNPoQiaWV/NNQXC8Cl/BBdCal3TM82R6HgfL3cSFcbq9JPIrh
-TeRfU9QhO7guGKooZGd/emC5GgM4iXowI+UenTHcPVj2eEpCEvigOzBYxY9S9u2n
-yV26sROTLKRTu8q+uZ92YmDbL07oqhmVX7LAjanO/0PcG6Cvhv5m57vyEt4Cwzsf
-mqBswSQSPBSUXRCOeRXh6dvU2Zg2+9+gS4D1VjWDRuSjibQV5BvvbtRe6aVm4TC6
-llySlKw/+WQHKiJF6JgLK8vCg8PWlVPRDskCMEa1z/uwdN4aIb43xsyu6RzzDti5
-Qjgiy3dMK7ARrIKoByF289lw9PR2w6/YGiefgzdp5DVSM6XSax6+4MnpQhd9FrnI
-aW16bvErETJIV8folcTivazGf6pA9/5esJCzZjr4cxAkC22HysNsVHVZpdp+6oqG
-ObeOQ9YflT/0Mp3jZbzANAXHADZCLmqO0pqb8xC5gpd1ITvIWIndgy8M2BWz+QtE
-FVK4Vf/ynjaOp6e+ZFrszdne/d8VRRpUnFpDOHsGsi6uuT/3N13WjQmEYNxOfCST
-IkIAwi8mVQbhD5ARy48CAwEAAaNQME4wHQYDVR0OBBYEFPU7oll5Mreed7gM0ubx
-wNxhJWb9MB8GA1UdIwQYMBaAFPU7oll5Mreed7gM0ubxwNxhJWb9MAwGA1UdEwQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggIBACaAhHAW5xNKt9bjOBk3Sr5Tj0x5puRo
-zg+B5RgNQiWR8PIBMCgn1RPGHKXHKbNP4M6b/MWXsmo5VBBcv4ofZW2jlwnonu0b
-aKHNpxhV4xbF1oYicGHN25Uw/VbJFljCHOGy2k+UFpSHAOm0kp67wYo/4p7yy4oq
-5twu1tPDlURwlOcjA8g/2m1ym2j3pNLcyKKWhvzUzUvq4SM3IHZ8RR0OLwBBim7k
-AW6/jydmTX8/EVgFnwh1gkWm5w01ok+5Zy+NhMeqpFixL848pLmOdh8L7r4RYbmD
-8iQKrBgI8dpVTtZLgkEfh3IsDB9vwwyEqkdRXTwLLxCnjyEapp1s13mTjo86Fx6j
-L0V2bWOEZiQqFObmI1GJOqCwx9Fiot5zyUpZ9cTTOufwo5dsL4SLpuDPXCOcgZ7P
-Zn7P9mTNyK5bm454f/Y4lYVZyOLp0hUVrKkXSdOPap2QqO5Hcui6wvCMENKaZrP4
-VckqI0UohXM40SjP5Q9f6od6NevvBBg2R/7amAkXXm/MtGEpYtauZZp/XvBWEw3U
-anLI4k0jYr3bxxk2d325UpxVKnKp+vaIRli99xYLLroaiolrj8k981I4u1gBoEGD
-728wR2l94IA0c+LxNkOwwv4cwsnqO6QKeENxz/eN6RXVcrO1U7ZS2qVvKgQ9sORu
-7Hwjg9MqBq4i
-</ds:X509Certificate>
+          <ds:X509Certificate>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
+7Hwjg9MqBq4i</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/NIM/Artifact"/>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</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://www.nederlab.nl/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nederlab.nl/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nederlab.nl/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nederlab.nl/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="de">Meertens Institut</md:ServiceName>
-      <md:ServiceName xml:lang="en">Meertens Institute</md:ServiceName>
-      <md:ServiceDescription xml:lang="de">Dieser Service Provider regelt den Zugang zur Nederlab-Forschungsumgebung</md:ServiceDescription>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nederlab.nl/Shibboleth.sso/SLO/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Meertens Instituutti Nederlab</md:ServiceName>
+      <md:ServiceName xml:lang="en">Meertens Institute Nederlab</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Tama Palveluntarjoaja saatelee paasyaNederlab tutkimusymparisto</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">This Service Provider regulates access to the Nederlab research environment</md:ServiceDescription>
-      <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="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 Name="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="de">e459</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e459</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">CLARIN ERIC</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://clarin.eu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://clarin.eu</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="support">
-    <md:GivenName>KNAW</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  <md:ContactPerson contactType="administrative">
     <md:GivenName>Marc</md:GivenName>
     <md:SurName>Kemps-Snijders</md:SurName>
     <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
   </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  <md:ContactPerson contactType="technical">
     <md:GivenName>Marc</md:GivenName>
     <md:SurName>Kemps-Snijders</md:SurName>
     <md:EmailAddress>mailto:marc.kemps.snijders@meertens.knaw.nl</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>KNAW</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@knaw.nl</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nejm.org-shibboleth.xml b/swamid-interfederations-2.0/www.nejm.org-shibboleth.xml
deleted file mode 100644
index 94d10b01..00000000
--- a/swamid-interfederations-2.0/www.nejm.org-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://www.nejm.org/shibboleth">
-  <!--
-		This is a "New England Journal of Medicine" SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-08-06T15:48:45Z">
-      <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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAIBpEkq6FhlUMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-						BAMTDHd3dy5uZWptLm9yZzAeFw0xMzA3MTAyMTA3MDJaFw0yMzA3MDgyMTA3MDJa
-						MBcxFTATBgNVBAMTDHd3dy5uZWptLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBANK1qbc1ivsRyR7Lch3ED1VC9eB76M93xlw4cNo/dvOZIxKDXj08
-						iKA0m6Ku3/iyiXHvCpVlwTgI4Ip/Xt6lFFWBpY4+jd+ava+E9+ANCWOQJf9G62qo
-						bvaz8PQRxXKEck+rWLDnWja5GgXHzTiPZpdNeiN3HxbDXbqzZyiOBESwEeMXuMuB
-						COs+iDVh4BhrhL0hD9976og0YyFlpZNnN0wkHJuhCVdWgwscK4sheTM/Hl4FCxb6
-						HogoNWsnURLZCIvd9QfHJ+K33LN3zUbjJFBcN4LjhE9mt13gwliiXDwNl0RdYxvB
-						epOKacojBJlV2kJdhe3G9olGYgX1GDTEA3UCAwEAAaNbMFkwOAYDVR0RBDEwL4IM
-						d3d3Lm5lam0ub3Jnhh9odHRwczovL3d3dy5uZWptLm9yZy9zaGliYm9sZXRoMB0G
-						A1UdDgQWBBTWPgvv+5CtphKIteQIzAPkFdbZ8jANBgkqhkiG9w0BAQUFAAOCAQEA
-						A5NpngLVi9/1vHPrbLVhXwkrVlBfGvirUNgLlfp29pO2EXHhPcpyMZXRM9hkttGu
-						lEJetzEXKVMaNyhoqnvnQ1JqCt4rFp/PV+MQO1ZPxJ4nPcXU3kdAJG3VuSu7jRRZ
-						iyS7KYql93SEwfOyIuPB/lPnOQ3uHV94bRGgfYnTq8S1NAdEXp/rMWM4yWPF+8nq
-						kBkgu74s1BfumuoQbNNatX/yAxy8kSiPLOWQpotcA1JR6qQ02PlphNp33+T6asTn
-						3y2fAMI1ef+C1XDMkJBYSS/o9AiY5VF+TSmsgpN4Etlr2BCk2aOvfEsi0cQMuThu
-						ZN3XBFLXsiMX/MLD9bpLrA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nejm.org/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nejm.org/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nejm.org/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: New England Journal of Medicine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nejm.org/</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.nescolvoting.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.nescolvoting.org.uk-shibboleth.xml
deleted file mode 100644
index 9985e245..00000000
--- a/swamid-interfederations-2.0/www.nescolvoting.org.uk-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://www.nescolvoting.org.uk/shibboleth">
-  <!--
-		This is a "NESCOL Students' Association" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-05-06T11:49: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: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://www.nescolvoting.org.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML/Artifact" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML2/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nescolvoting.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NESCOL Students' Association</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nescolvoting.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.newscientist.com-shibboleth.xml b/swamid-interfederations-2.0/www.newscientist.com-shibboleth.xml
deleted file mode 100644
index 24960a16..00000000
--- a/swamid-interfederations-2.0/www.newscientist.com-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" entityID="https://www.newscientist.com/shibboleth">
-  <!--
-		This is a "New Scientist (Shibboleth Test)" OpenAthens SP for Reed Business Information Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2016-01-08T14:20:58Z">
-      <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: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">New Scientist (Test)</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEFTCCAv2gAwIBAgIJAMneSf8qSaB3MA0GCSqGSIb3DQEBBQUAMGQxKDAmBgNV
-						BAoTH1JlZWQgQnVzaW5lc3MgSW5mbyAtIFZpcGVyIEJldGExODA2BgNVBAMTL3d3
-						dy5vYXNlcnZlci1zc28tYmV0YS5hd3N2aXBlci5yZWVkYnVzaW5lc3MubmV0MB4X
-						DTE1MTEyMzE0NTU0MloXDTI1MTEyMDE0NTU0MlowZDEoMCYGA1UEChMfUmVlZCBC
-						dXNpbmVzcyBJbmZvIC0gVmlwZXIgQmV0YTE4MDYGA1UEAxMvd3d3Lm9hc2VydmVy
-						LXNzby1iZXRhLmF3c3ZpcGVyLnJlZWRidXNpbmVzcy5uZXQwggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDGroeDl0uM+jhIVrqKJFn5okiOAbJw6julPlKK
-						pFeGLNyT70aOcsCG0+4utfzsriKAO9fGITmLwt+8ERJe3TPbbWBz6jo678+Avn92
-						Tzvqvj9KDUk2UHRkR/gzb1Y66smO/k1lxXMVlkW5e6KFn1Zs1NUnSbyGYANPmSjR
-						2XcLgxtmQxedpKFj2urFCdi+EpFaszs2cuuBsvZqx4DwcDBsayjePDu2GnKtVF24
-						rsWxHZMfBtr1KIDQuQDm8MWMzjIB4PHZ3K0dsqCNHg8zjGvu1/N2C3Es5SS5OTip
-						weXS7ejveKU2LZTGOelhDho2MTtx8mOMyVslq/PZ1hzplwltAgMBAAGjgckwgcYw
-						HQYDVR0OBBYEFMj6G2UwHf8kGxz74rhomi/C1cT4MIGWBgNVHSMEgY4wgYuAFMj6
-						G2UwHf8kGxz74rhomi/C1cT4oWikZjBkMSgwJgYDVQQKEx9SZWVkIEJ1c2luZXNz
-						IEluZm8gLSBWaXBlciBCZXRhMTgwNgYDVQQDEy93d3cub2FzZXJ2ZXItc3NvLWJl
-						dGEuYXdzdmlwZXIucmVlZGJ1c2luZXNzLm5ldIIJAMneSf8qSaB3MAwGA1UdEwQF
-						MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEGnnYllzfUQ483OyFbjm1PUyWCPlEX+
-						z82+hODcpmvt9mRuwBierbGgsByUUswK7wc4X50VSH/TCBbaGgav/FAWQZqMUsdG
-						iLtDT7xdbnnMVKCBJhBrmo//rfJ4QXscGkQ+gViY+wHJmCjaNAAxxvO25oAEhkFX
-						zGoPN2QAM7ue1XuAoG6uDXCJYMh507OXLh1IoF5+ubQOhyhr+yaiXkHp2cfYhxSg
-						Hs8TX8jAiK1K2BczXNKTKgevn6hpRZbX8AiJuoS49h7j2DgzY3KdW0l6FK8jbZ5G
-						PBrPCD2rrGz3T8vnZL3JjkQr2hrxD62QB00hozoykT0RXdAY1S5CbUI=
-					</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>
-						MIIEFTCCAv2gAwIBAgIJAMneSf8qSaB3MA0GCSqGSIb3DQEBBQUAMGQxKDAmBgNV
-						BAoTH1JlZWQgQnVzaW5lc3MgSW5mbyAtIFZpcGVyIEJldGExODA2BgNVBAMTL3d3
-						dy5vYXNlcnZlci1zc28tYmV0YS5hd3N2aXBlci5yZWVkYnVzaW5lc3MubmV0MB4X
-						DTE1MTEyMzE0NTU0MloXDTI1MTEyMDE0NTU0MlowZDEoMCYGA1UEChMfUmVlZCBC
-						dXNpbmVzcyBJbmZvIC0gVmlwZXIgQmV0YTE4MDYGA1UEAxMvd3d3Lm9hc2VydmVy
-						LXNzby1iZXRhLmF3c3ZpcGVyLnJlZWRidXNpbmVzcy5uZXQwggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDGroeDl0uM+jhIVrqKJFn5okiOAbJw6julPlKK
-						pFeGLNyT70aOcsCG0+4utfzsriKAO9fGITmLwt+8ERJe3TPbbWBz6jo678+Avn92
-						Tzvqvj9KDUk2UHRkR/gzb1Y66smO/k1lxXMVlkW5e6KFn1Zs1NUnSbyGYANPmSjR
-						2XcLgxtmQxedpKFj2urFCdi+EpFaszs2cuuBsvZqx4DwcDBsayjePDu2GnKtVF24
-						rsWxHZMfBtr1KIDQuQDm8MWMzjIB4PHZ3K0dsqCNHg8zjGvu1/N2C3Es5SS5OTip
-						weXS7ejveKU2LZTGOelhDho2MTtx8mOMyVslq/PZ1hzplwltAgMBAAGjgckwgcYw
-						HQYDVR0OBBYEFMj6G2UwHf8kGxz74rhomi/C1cT4MIGWBgNVHSMEgY4wgYuAFMj6
-						G2UwHf8kGxz74rhomi/C1cT4oWikZjBkMSgwJgYDVQQKEx9SZWVkIEJ1c2luZXNz
-						IEluZm8gLSBWaXBlciBCZXRhMTgwNgYDVQQDEy93d3cub2FzZXJ2ZXItc3NvLWJl
-						dGEuYXdzdmlwZXIucmVlZGJ1c2luZXNzLm5ldIIJAMneSf8qSaB3MAwGA1UdEwQF
-						MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEGnnYllzfUQ483OyFbjm1PUyWCPlEX+
-						z82+hODcpmvt9mRuwBierbGgsByUUswK7wc4X50VSH/TCBbaGgav/FAWQZqMUsdG
-						iLtDT7xdbnnMVKCBJhBrmo//rfJ4QXscGkQ+gViY+wHJmCjaNAAxxvO25oAEhkFX
-						zGoPN2QAM7ue1XuAoG6uDXCJYMh507OXLh1IoF5+ubQOhyhr+yaiXkHp2cfYhxSg
-						Hs8TX8jAiK1K2BczXNKTKgevn6hpRZbX8AiJuoS49h7j2DgzY3KdW0l6FK8jbZ5G
-						PBrPCD2rrGz3T8vnZL3JjkQr2hrxD62QB00hozoykT0RXdAY1S5CbUI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://oaserver-sso-beta.awsviper.reedbusiness.net/sites/newscientist/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://oaserver-sso-beta.awsviper.reedbusiness.net/sites/newscientist/oa/auth/rcv/saml2/post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://oaserver-sso-beta.awsviper.reedbusiness.net/sites/newscientist/oa/auth/rcv/saml2/art" index="3"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">New Scientist (Test)</ServiceName>
-      <ServiceDescription xml:lang="en">New Scientist (Test)</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"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Reed Business Information Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Reed Business Information - New Scientist (Shibboleth Test)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.reedbusiness.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Surya</GivenName>
-    <SurName>Radjendirane</SurName>
-    <EmailAddress>mailto:surya.radjendirane@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Tracey</GivenName>
-    <SurName>Stobbs</SurName>
-    <EmailAddress>mailto:Tracey.Stobbs@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Katie</GivenName>
-    <SurName>Hodgkiss</SurName>
-    <EmailAddress>mailto:katie.hodgkiss@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Surya</GivenName>
-    <SurName>Radjendirane</SurName>
-    <EmailAddress>mailto:surya.radjendirane@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tracey</GivenName>
-    <SurName>Stobbs</SurName>
-    <EmailAddress>mailto:Tracey.Stobbs@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Katie</GivenName>
-    <SurName>Hodgkiss</SurName>
-    <EmailAddress>mailto:katie.hodgkiss@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml b/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
index ccb9ad2a..e0a01f46 100644
--- a/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
+++ b/swamid-interfederations-2.0/www.nordbiomed.net-saml-sp.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.nordbiomed.net/saml/sp">
-  <md: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>
-  </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://www.nordbiomed.net/saml/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:UIInfo>
         <mdui:DisplayName xml:lang="fi">Nordbiomed.net Moodle</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Nordbiomed.net Moodle</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Nordbiomed.net Moodle</mdui:DisplayName>
@@ -17,9 +12,13 @@
         <mdui:PrivacyStatementURL xml:lang="en">http://www.mcampus.fi/Moodle_rekisteriseloste_EN.pdf</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="fi">http://www.mcampus.fi/rekisteriseloste_mmg.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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>MIIE/TCCA+WgAwIBAgIQTEIjMmXuufcFuvtWfJihPTANBgkqhkiG9w0BAQsFADBf
 MQswCQYDVQQGEwJGUjEOMAwGA1UECBMFUGFyaXMxDjAMBgNVBAcTBVBhcmlzMQ4w
@@ -62,10 +61,10 @@ PbMcpBprCNt05806/04coPb2RbK0VDV5DG00Z/kNoGxR</ds:X509Certificate>
       <md:ServiceDescription xml:lang="fi">NordBioMed.net asiantuntijat kehittavat aktiivisesti kursseja biolaaketieteen alalle, taatakseen opetuksen laadun. Kursseja on mukana kehittamassa Karolinska Institutet, seka Ita-suomen, Turun , Bergenin ja Koopenhaminan yliopistot.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">Nordic programmes of biomedicine have worked together in order to develop the field's teaching and quality management. This NordBioMed.net, comprising Karolinska Institutet and the Universities of Eastern Finland, Turku, Bergen and Copenhagen, is actively</md:ServiceDescription>
       <md:ServiceDescription xml:lang="sv">Nordiska program for biomedicin har arbetat tillsammans for att utveckla  undervisning och kvalitetsstyrning. NordBioMed.net som  bestar av Karolinska Institutet, universiteten i ostra Finland, Abo,  Bergen och Kopenhamn, har aktivt utvecklat gemens</md:ServiceDescription>
-      <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="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/www.nrcresearchpress.com-shibboleth.xml b/swamid-interfederations-2.0/www.nrcresearchpress.com-shibboleth.xml
deleted file mode 100644
index 8f056c26..00000000
--- a/swamid-interfederations-2.0/www.nrcresearchpress.com-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://www.nrcresearchpress.com/shibboleth">
-  <!--
-		This is a "NRC Research Press" OpenSAML SP for Atypon Systems.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDtTCCAp2gAwIBAgIJALKKItp/j602MA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEhMB8GA1UEAxMYd3d3Lm5yY3Jlc2VhcmNocHJlc3Mu
-						Y29tMB4XDTExMDExODIyMTkyOFoXDTIxMDExNTIyMTkyOFowgZkxCzAJBgNVBAYT
-						AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQHEwtTYW50YSBDbGFyYTEd
-						MBsGA1UEChMUQXR5cG9uIFN5c3RlbXMsIEluYy4xHTAbBgNVBAsTFEF0eXBvbiBT
-						eXN0ZW1zLCBJbmMuMSEwHwYDVQQDExh3d3cubnJjcmVzZWFyY2hwcmVzcy5jb20w
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDcz5rmUAuG5ucWJq6TAKiy
-						jdkO5jrOKk+rUFbtvHqCdEy0ndFUraE+sQO4zuRabXKzI6p7sF090VqDi9NZ4Zq0
-						uK2m6Wuwkzr5DRstBamZXzUZdFZ/NOQxFIQbhx+ZNVx02IlK89CZmzRzaczqgwtd
-						j0IPZY2SpWeZuRfFZ0H6IBI/I5rL+HaokTdZaYgRUasqu7HFdKquN369iP7Qqe7l
-						Yhm9XtVnEMLsHuPy1gNkyOddLdHKt9oKzKkql7IkhcGbE/f4YrKIqxC5SvdSE9cg
-						ih+IO/OAyHn+cS0LqNCECRbdnViUgUaSr5/s9FXTTMsEMtJtgZQyEzGW9B9omLhJ
-						AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADcSQSrkKZG/QL6LSKSG8rKB0BxWNFvO
-						3mEBndEEsioTZzPGzSfuMcEDdICWyILaXN7HraUkTCvSD1N9n/AS8uu+jCoe+f8z
-						cV3f15LjxYyZI9ZmO9eixGA2huK2LsRzAj93TWYK7Q0CuZrTq/3J/vJ+xvM2habG
-						PToSEnpA/ALGVSXSxGpLJYn84qX9ub0yX1yYNmleylRkHqFwYHvdU5Hk7UZdrCKZ
-						vMIejpaSZn0yf3ZFn8eebCpLnlVN0FLNCgel39FLMGqNbey0wpFbzocv4fvX6pmi
-						Bz9FTGLHvLqpoRV/zghBPM32BhT8U6PJfC56HlfNfbRtx9nHZK2GfJw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nrcresearchpress.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nrcresearchpress.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nrcresearchpress.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: NRC Research Press</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.nrcresearchpress.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.numeriquepremium.com-shibboleth.xml b/swamid-interfederations-2.0/www.numeriquepremium.com-shibboleth.xml
deleted file mode 100644
index 917eb878..00000000
--- a/swamid-interfederations-2.0/www.numeriquepremium.com-shibboleth.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.numeriquepremium.com/shibboleth">
-  <!--
-		This is a "Numerique Premium" OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-06T09:24: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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDpjCCAo6gAwIBAgIEVClg0jANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIzAhBgNV
-						BAoTGlB1Ymxpc2hpbmcgVGVjaG5vbG9neSBQbGMuMRkwFwYDVQQLExBTY2hvbGFy
-						bHkgT25saW5lMR4wHAYDVQQDExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kwHhcNMTQw
-						OTI5MTMzODI2WhcNMTkwOTI4MTMzODI2WjCBlDELMAkGA1UEBhMCR0IxFDASBgNV
-						BAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIzAhBgNVBAoTGlB1Ymxp
-						c2hpbmcgVGVjaG5vbG9neSBQbGMuMRkwFwYDVQQLExBTY2hvbGFybHkgT25saW5l
-						MR4wHAYDVQQDExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kwggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCNSLZQXjnJCmfO04AwRYEK/6ylqGB33Pdl2S1j5JgC
-						KNxcRWLVBts0i9L1Csmpk44Sx+gVbRLnMjoZxwT7XezB3MvAH390sdOpJEKhM6b7
-						JOEl+iub4G82jwGmoQVMRwUQ9dMcdzJY6LVuUri5UmldDRpd60whIip7GJhCdIwz
-						Akh6RJyYDua9R3GHdxYWMooekmgj75CUL6PtUN6jTdnlct48zPVzA1KNGxKaICs0
-						yy4cmTBbPVB9w5lM4pgCS8uHyTHsQZ1n3vnn0EuEf0rbHKPtc/TDhTV9GbNtJJws
-						pkaniaHmlMg1f7cfA37PDJOK7OzTn0FcgfXSO4DCfe8fAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBAGsjQgkLeTxZ/GPFKgGso5vqtENIZmyAAHt9KbRw3Fku1Z/xQ6US
-						8EKYGN3fkPZ9E4UUGZCe2O7Lo6N5Pt7Kt6TbPhae4vkmE/Nm2i5YvjWn+fgO9/NF
-						NSI0XmDOvGZokbGUDwZrrhibzHxGIcyaA1oodF37/oz3r10rZkLauW//CmOf6OUC
-						rGnKBPoQG2kIyG8rWoKDzWtcRcdqDea9kdZwmDftizoLtJtKIyW8FavtknHpRTSI
-						sYwXGiixYKkmEHyqXZ04jYokm0cdrARdVvFexRd/m+0OO+25MxuBDEmCs+8HZD1c
-						wWYy4HqaGBWV3Iotfxxdus9i8nenq47abSQ=
-					</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>
-						MIIDpjCCAo6gAwIBAgIEVClg0jANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIzAhBgNV
-						BAoTGlB1Ymxpc2hpbmcgVGVjaG5vbG9neSBQbGMuMRkwFwYDVQQLExBTY2hvbGFy
-						bHkgT25saW5lMR4wHAYDVQQDExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kwHhcNMTQw
-						OTI5MTMzODI2WhcNMTkwOTI4MTMzODI2WjCBlDELMAkGA1UEBhMCR0IxFDASBgNV
-						BAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxIzAhBgNVBAoTGlB1Ymxp
-						c2hpbmcgVGVjaG5vbG9neSBQbGMuMRkwFwYDVQQLExBTY2hvbGFybHkgT25saW5l
-						MR4wHAYDVQQDExVQdWJsaXNoaW5nIFRlY2hub2xvZ3kwggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQCNSLZQXjnJCmfO04AwRYEK/6ylqGB33Pdl2S1j5JgC
-						KNxcRWLVBts0i9L1Csmpk44Sx+gVbRLnMjoZxwT7XezB3MvAH390sdOpJEKhM6b7
-						JOEl+iub4G82jwGmoQVMRwUQ9dMcdzJY6LVuUri5UmldDRpd60whIip7GJhCdIwz
-						Akh6RJyYDua9R3GHdxYWMooekmgj75CUL6PtUN6jTdnlct48zPVzA1KNGxKaICs0
-						yy4cmTBbPVB9w5lM4pgCS8uHyTHsQZ1n3vnn0EuEf0rbHKPtc/TDhTV9GbNtJJws
-						pkaniaHmlMg1f7cfA37PDJOK7OzTn0FcgfXSO4DCfe8fAgMBAAEwDQYJKoZIhvcN
-						AQEFBQADggEBAGsjQgkLeTxZ/GPFKgGso5vqtENIZmyAAHt9KbRw3Fku1Z/xQ6US
-						8EKYGN3fkPZ9E4UUGZCe2O7Lo6N5Pt7Kt6TbPhae4vkmE/Nm2i5YvjWn+fgO9/NF
-						NSI0XmDOvGZokbGUDwZrrhibzHxGIcyaA1oodF37/oz3r10rZkLauW//CmOf6OUC
-						rGnKBPoQG2kIyG8rWoKDzWtcRcdqDea9kdZwmDftizoLtJtKIyW8FavtknHpRTSI
-						sYwXGiixYKkmEHyqXZ04jYokm0cdrARdVvFexRd/m+0OO+25MxuBDEmCs+8HZD1c
-						wWYy4HqaGBWV3Iotfxxdus9i8nenq47abSQ=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.numeriquepremium.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.numeriquepremium.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NUMéRIQUE PREMIUM</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.numeriquepremium.com/shibboleth/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Info</GivenName>
-    <EmailAddress>mailto:info@numeriquepremium.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Hatim</GivenName>
-    <SurName>Ghadiyali</SurName>
-    <EmailAddress>mailto:openathens@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nurseryworld.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.nurseryworld.co.uk-shibboleth.xml
deleted file mode 100644
index 45d5fde8..00000000
--- a/swamid-interfederations-2.0/www.nurseryworld.co.uk-shibboleth.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.nurseryworld.co.uk/shibboleth">
-  <!--
-		This is a "Nursery World" Shibboleth SP for LibLynx LLC.
-	-->
-  <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="2015-07-15T09:25:05Z">
-      <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://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Nursery World</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Nursery World is a magazine for practitioners across the early years of education and childcare</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6DCCAdCgAwIBAgIJAKKEvzTa1baZMA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC2xpYmx5bnguY29tMB4XDTE1MDcwMTE0MzA1OFoXDTI1MDYyODE0MzA1OFow
-						FjEUMBIGA1UEAxMLbGlibHlueC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQC/tN/ehV2IQ8427sENebb+6ij+VoiIirTDNTOtvOa9ff3Yk5L+8VaS
-						n5AUPJ7X4JHXl6rMIz0Vy8aaP+jeWy+oTUnNfNAXJz3CGqz3+GYST4qCbUfi071y
-						aZEiw/zD3PG2XjCI1iB4jojVEMOZvUNMXw2Fp2hAdeR1E4Jct6wHiPioDzKXCm5o
-						EpR0EhYRDBQ5KD1pNulD219uFxmeq4sg4Yhw3e87dN0Mf+DYIm32ApXQfCj37lQm
-						Y3E5U/fDBaM1Du54+hWrRi4NzzHpCCmA6AfeMcyoUUmL67wc4vXePh+b1ZPtM1Dn
-						rsjH86EUcCZVBNp1c9nb6KO5uWfw3a7hAgMBAAGjOTA3MBYGA1UdEQQPMA2CC2xp
-						Ymx5bnguY29tMB0GA1UdDgQWBBRhxZ/MN/oyiZyi9iRBE2VmvDGllDANBgkqhkiG
-						9w0BAQUFAAOCAQEAM1eUF5GIiZPHhmhN7mWhiNmM9cC9q+hR+BZjfBjOFyvHmUry
-						XKWaq+5GVG/yZBtD8hnQAanLCBFT7iPXyPDeMkkf3CYwEScRZglVJqffn2v7rpO/
-						gqam0j1tzRAgvYbZXBe/u71qFVN57b5w6XPq0rONkq1HlFPLz1kZ/RPeDPxsy1m1
-						BD9Air6XaXKVUCuozkcpnDIQqDfrx+VdsHqi03T4H4UgQrqjx/C+eASsFH9qQsBz
-						7wGBxTNZk8z8Ob/CFJI79t38xZnP8cBEr4vlE27ld7HGu1mzBZPi6d4pAhpOcIvG
-						tkJW/9JlQ93sBxUk0E1HbTlYxtXFbNCVwqEWcg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nurseryworld-mag-shib.liblynx.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">LibLynx LLC</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Nursery World</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.markallengroup.com/ma-education/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Tom</GivenName>
-    <SurName>Pollard</SurName>
-    <EmailAddress>mailto:tom.pollard@markallengroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Dixon</SurName>
-    <EmailAddress>mailto:paul@liblynx.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.nusu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.nusu.co.uk-shibboleth.xml
deleted file mode 100644
index 4b4f860e..00000000
--- a/swamid-interfederations-2.0/www.nusu.co.uk-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://www.nusu.co.uk/shibboleth">
-  <!--
-		This is a "Newcastle University Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-14T14:18:21Z">
-      <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.nusu.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://www.nusu.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nusu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nusu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nusu.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.nusu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.nusu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.nusu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Newcastle University Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.nusu.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.oecd-ilibrary.org-shibboleth.xml b/swamid-interfederations-2.0/www.oecd-ilibrary.org-shibboleth.xml
deleted file mode 100644
index 9915a74b..00000000
--- a/swamid-interfederations-2.0/www.oecd-ilibrary.org-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://www.oecd-ilibrary.org/shibboleth">
-  <!--
-		This is an "OECD iLibrary [LIVE]" OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-15T11:47:50Z">
-      <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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDnDCCAoSgAwIBAgIEU6fsvDANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTE0MDYyMzA5
-						MDA0NFoXDTI0MDYyMDA5MDA0NFowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAMJbxnl5Rx6RuPMTlI3nGIdJXPsJO/Do8vlgH8h0bkfohj84PGLpAMdm
-						jWL0uY6u59j3Akt7YM6A8eDAzeVNtODqi56RgDWyp1MW/yq3rr6IZA9JEexQnDdS
-						Vddr2hNf0JLKrFnMhNzkEPvj+4Qs/Q3+33npU3wdDD9CU+BTTgv1atl8grrVyglh
-						/oUVSkydsMmel9wmm+kJRdwomiZ1dsh72IJQl6CcE1vG5g7sAcDJuErPZ5IRgr5Q
-						qh3nFleyzguMB/lB/6Mr46CgRTCNvZC9zQZR4sEYzZ4fnKEtbKtS0kta2yb5RvlD
-						3PugoRAuv/P7fjMMYMVm3mL/zQpm3RECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						Mr7kjkL0xx8oLvFqarA/43YMGosHo5ODq6t903VeJ6j3g/b3c27j+Lzn4VfqMCPS
-						cWD5m3IefUtidZwYyoWhwFO6dQUHs1gNP9YfBqSPrZ0txFfVapPigo3CQrDJSu3E
-						g5c8Cts7NFCakPgKSM+zl8KsN3v74igfyJRPQaLGx2DXJzUanvKBnCHkpj7//JIl
-						kAIKM8SXkjCICZtzbbGdtAOz4vMaawT87/CKZF2gwtI0YjbjlsMaxTDh/H3Qdyp6
-						Q7n9nLR+KmfcwvAMmS0umw+Gro7ijmRUHdpOaM9TaH5JPFPDjd2cBvWqtLg7XWSd
-						8XfpcsLFcbF8WxkBPuoQDw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oecd-ilibrary.org/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.oecd-ilibrary.org/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">OECD iLibrary [LIVE]</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.oecd-ilibrary.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:Talvinder.matharu@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Babu</GivenName>
-    <SurName>Panneerselvam</SurName>
-    <EmailAddress>mailto:babu.panneerselvam@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:Talvinder.matharu@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ohsu.edu-idp-shibboleth.xml b/swamid-interfederations-2.0/www.ohsu.edu-idp-shibboleth.xml
deleted file mode 100644
index c97a159c..00000000
--- a/swamid-interfederations-2.0/www.ohsu.edu-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +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://www.ohsu.edu/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://incommon.org"/>
-    <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://id.incommon.org/category/registered-by-incommon</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor errorURL="https://www.ohsu.edu/idp/error.jsp" 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">ohsu.edu</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Oregon Health &amp; Science University</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>
-MIIDHDCCAgSgAwIBAgIVAKiKGs+N1BpUHsMJYEAJU0TUP6QMMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHd3dy5vaHN1LmVkdTAeFw0wOTExMTcyMjUwNTJaFw0y
-OTExMTcyMjUwNTJaMBcxFTATBgNVBAMTDHd3dy5vaHN1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALghy62gm5RH9WP/KL0b+haTbG1H6sSYngn5
-BAFt3N/ETXm0FXf43XG3aCCuhAQQeHumEkebZZkJJxRDy7VBLiYDCrodTwZjG3Ux
-TMrErx+yrfgPcp4GyOFXcsdGUmlK7q+Z9VT9nFFgxoXkCwJ+E9kccmvREnWnuFxZ
-cyU7TU2KO9YbNkgmo6wOUOCStGfUKWgVNZdyuOpZPtY5RIxQM60mCd1XgwhReSAH
-3nU75XVrONn5vrYzCxFtandaJDfggrN2KTZE3t5UGNtFVK8WTR/hjCIaI8ibfpZn
-wcQtcrNjzGib3gS5mQlOGtKXYesb4sLbOTFky3gKrWM0nNoDq70CAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMd3d3Lm9oc3UuZWR1hiNodHRwczovL3d3dy5vaHN1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb/kidTpnbE/d8egtfWTwn3CVKAIwDQYJ
-KoZIhvcNAQEFBQADggEBAIYzjl2+3amoiguDweqoRwmfxnmd0rNijcOcvp0FJCUw
-3vn/0UbsbeXOxKz6cncAY/tmJOUZ1MSK/7s7NVECWjtNwmx5Im7N/FXdNcEYEcMl
-W/6gWu6ZwUAgXaV/8klbrTGX3NWJ5jJsWQwHqA1yY9wba58okkWOjoIjI070IsHj
-udBseAs0D9Q9aL0OofrcQLcNdaGsJzLilDVM/UU7cSCwKATWuuLJGKgNlepjyq5Q
-z2lDp/HktHga9plFDjee7YRsH4N/9e1Z+3mKzs9QRANCAfDeTz9iFo8lJqo4sRdp
-SHajk3KEnqZKbsvlZC70uJpwvS9dn3E0G9esB/ps3tM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.ohsu.edu/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ohsu.edu/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.ohsu.edu/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ohsu.edu/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ohsu.edu/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">ohsu.edu</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIVAKiKGs+N1BpUHsMJYEAJU0TUP6QMMA0GCSqGSIb3DQEB
-BQUAMBcxFTATBgNVBAMTDHd3dy5vaHN1LmVkdTAeFw0wOTExMTcyMjUwNTJaFw0y
-OTExMTcyMjUwNTJaMBcxFTATBgNVBAMTDHd3dy5vaHN1LmVkdTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALghy62gm5RH9WP/KL0b+haTbG1H6sSYngn5
-BAFt3N/ETXm0FXf43XG3aCCuhAQQeHumEkebZZkJJxRDy7VBLiYDCrodTwZjG3Ux
-TMrErx+yrfgPcp4GyOFXcsdGUmlK7q+Z9VT9nFFgxoXkCwJ+E9kccmvREnWnuFxZ
-cyU7TU2KO9YbNkgmo6wOUOCStGfUKWgVNZdyuOpZPtY5RIxQM60mCd1XgwhReSAH
-3nU75XVrONn5vrYzCxFtandaJDfggrN2KTZE3t5UGNtFVK8WTR/hjCIaI8ibfpZn
-wcQtcrNjzGib3gS5mQlOGtKXYesb4sLbOTFky3gKrWM0nNoDq70CAwEAAaNfMF0w
-PAYDVR0RBDUwM4IMd3d3Lm9oc3UuZWR1hiNodHRwczovL3d3dy5vaHN1LmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUb/kidTpnbE/d8egtfWTwn3CVKAIwDQYJ
-KoZIhvcNAQEFBQADggEBAIYzjl2+3amoiguDweqoRwmfxnmd0rNijcOcvp0FJCUw
-3vn/0UbsbeXOxKz6cncAY/tmJOUZ1MSK/7s7NVECWjtNwmx5Im7N/FXdNcEYEcMl
-W/6gWu6ZwUAgXaV/8klbrTGX3NWJ5jJsWQwHqA1yY9wba58okkWOjoIjI070IsHj
-udBseAs0D9Q9aL0OofrcQLcNdaGsJzLilDVM/UU7cSCwKATWuuLJGKgNlepjyq5Q
-z2lDp/HktHga9plFDjee7YRsH4N/9e1Z+3mKzs9QRANCAfDeTz9iFo8lJqo4sRdp
-SHajk3KEnqZKbsvlZC70uJpwvS9dn3E0G9esB/ps3tM=
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ohsu.edu/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.ohsu.edu/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Oregon Health &amp; Science University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Oregon Health &amp; Science University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ohsu.edu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Denny Hyde</md:GivenName>
-    <md:EmailAddress>hyded@ohsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Sean Vanderheiden</md:GivenName>
-    <md:EmailAddress>vanderhe@ohsu.edu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 5c77a4c7..00000000
--- a/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml
+++ /dev/null
@@ -1,82 +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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.openaccessrepository.it/shibboleth">
-  <md: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>
-  </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">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"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.openaccessrepository.it/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Open Access Repository</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Open Access repository of INFN and other Italian research organisations' research products (publications, software, data, etc.)</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="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Italian National Institute for Nuclear Physics</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INFN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.infn.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 9a622a3b..00000000
--- a/swamid-interfederations-2.0/www.openaire.eu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.openaire.eu/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>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://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>
-  </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">OpenAire 2020</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="el">OpenAire 2020</mdui:DisplayName>
-        <mdui:Description xml:lang="en">OpenAIRE2020 is a funded project to develop and maintain the infrastructure to support the European Commission OA policy</mdui:Description>
-        <mdui:Description xml:lang="el">Το OpenAIRE2020 είναι ένα Ευρωπαικό έργο το οποίο αποσκοπεί στην ανάπτυξη λογισμικού και τη συντήρηση της απαραίτητης τεχνικής υποδομής για την προώθηση της Ευρωπαικής Πολιτικής για Ανοιχτή Πρόσβαση σε Ακαδημαικά Δεδομένα</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.openaire.eu/project-factsheets</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="el">https://www.openaire.eu/openaire-report-gr</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.openaire.eu/141-privacy-policy/813-edu-privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="el">https://www.openaire.eu/privacy-gr</mdui:PrivacyStatementURL>
-        <mdui:Logo width="123" height="175" xml:lang="en">https://www.openaire.eu/images/site_images/OpenAIREplus_logo.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>MIIFUTCCBDmgAwIBAgIRAOI4+i/NU1yBszGKO9QqiSkwDQYJKoZIhvcNAQELBQAwgZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYDVQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwOTE2MDAwMDAwWhcNMTYxMDE1MjM1OTU5WjBbMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHjAcBgNVBAsTFUVzc2VudGlhbFNTTCBXaWxkY2FyZDEWMBQGA1UEAxQNKi5vcGVuYWlyZS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQZ9AqARIbXLmpZ5f9OYJoMGQlizdXajD2g9vSrHZzp7nnS0yLXp37MQ+H24lsPnMaRzb8fJBs4mlDYP6vXccOM8F2qC/2cd5twtubx+fnKz+OXRnZlkAXFuSLMl3mLVOfaTFpOpDVaoIWXEYvbh4z/FFX7ZOq4goDz+DaLIr7RnPHq6yBhdzzTMxo1Yg+88fFgnLEk5mOxbxxcFtrR45iTL8j83hlI1UM4vjgNw8eRzEvngXGTUwNJDv4lH6dOYo8CjKZDcf/baBrbnUt3vTHeOiYCpRCI1oLv+6iHUQcDrHJFxr+PAYBJwFWmJupcHPSZDOAXzjBSI1zwb09XkmsCAwEAAaOCAdgwggHUMB8GA1UdIwQYMBaAFJCvajqUWgvYkOoSVnPfQ7Q6KNrnMB0GA1UdDgQWBBQbUT6dzoGkAENWoTkT234i0FD46jAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYDVR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLm5ldC9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCUGA1UdEQQeMByCDSoub3BlbmFpcmUuZXWCC29wZW5haXJlLmV1MA0GCSqGSIb3DQEBCwUAA4IBAQBYUgkbuEwiFyu2a5Rqc8i1ZWq9GN3GF8vzICEHL222My9zPT+HDBV01VSajaBxj2v4UtfRYNjCcMtfrL0vKzm0WEqfMC7eiDmuYHcOeHN6OPvnDdqMYWp03bev9CkkP9ygguEnM11/iN4YEc7TD4GmIR6qLHG/zzwBzhfz46Q5VSEO+D20mys+83Wl6U3AJIIX7+OpeCYAag1kZOIOsiG9RXooVBOIqbnF06m0nAeuNMt47TAURRF3jARKhMelHEv1pGD0UUNS6DSEUpKdBHnTBaVFQwGlQ9sUE8Fy8rP3dGpT9Fq2aF601Mq40oJsYw3Xf0i55oy15ktDyI8TU6NN</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>MIIFUTCCBDmgAwIBAgIRAOI4+i/NU1yBszGKO9QqiSkwDQYJKoZIhvcNAQELBQAwgZAxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTYwNAYDVQQDEy1DT01PRE8gUlNBIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTQwOTE2MDAwMDAwWhcNMTYxMDE1MjM1OTU5WjBbMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxHjAcBgNVBAsTFUVzc2VudGlhbFNTTCBXaWxkY2FyZDEWMBQGA1UEAxQNKi5vcGVuYWlyZS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOQZ9AqARIbXLmpZ5f9OYJoMGQlizdXajD2g9vSrHZzp7nnS0yLXp37MQ+H24lsPnMaRzb8fJBs4mlDYP6vXccOM8F2qC/2cd5twtubx+fnKz+OXRnZlkAXFuSLMl3mLVOfaTFpOpDVaoIWXEYvbh4z/FFX7ZOq4goDz+DaLIr7RnPHq6yBhdzzTMxo1Yg+88fFgnLEk5mOxbxxcFtrR45iTL8j83hlI1UM4vjgNw8eRzEvngXGTUwNJDv4lH6dOYo8CjKZDcf/baBrbnUt3vTHeOiYCpRCI1oLv+6iHUQcDrHJFxr+PAYBJwFWmJupcHPSZDOAXzjBSI1zwb09XkmsCAwEAAaOCAdgwggHUMB8GA1UdIwQYMBaAFJCvajqUWgvYkOoSVnPfQ7Q6KNrnMB0GA1UdDgQWBBQbUT6dzoGkAENWoTkT234i0FD46jAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwUAYDVR0gBEkwRzA7BgwrBgEEAbIxAQIBAwQwKzApBggrBgEFBQcCARYdaHR0cHM6Ly9zZWN1cmUuY29tb2RvLm5ldC9DUFMwCAYGZ4EMAQIBMFQGA1UdHwRNMEswSaBHoEWGQ2h0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYUGCCsGAQUFBwEBBHkwdzBPBggrBgEFBQcwAoZDaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNydDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMCUGA1UdEQQeMByCDSoub3BlbmFpcmUuZXWCC29wZW5haXJlLmV1MA0GCSqGSIb3DQEBCwUAA4IBAQBYUgkbuEwiFyu2a5Rqc8i1ZWq9GN3GF8vzICEHL222My9zPT+HDBV01VSajaBxj2v4UtfRYNjCcMtfrL0vKzm0WEqfMC7eiDmuYHcOeHN6OPvnDdqMYWp03bev9CkkP9ygguEnM11/iN4YEc7TD4GmIR6qLHG/zzwBzhfz46Q5VSEO+D20mys+83Wl6U3AJIIX7+OpeCYAag1kZOIOsiG9RXooVBOIqbnF06m0nAeuNMt47TAURRF3jARKhMelHEv1pGD0UUNS6DSEUpKdBHnTBaVFQwGlQ9sUE8Fy8rP3dGpT9Fq2aF601Mq40oJsYw3Xf0i55oy15ktDyI8TU6NN</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.openaire.eu/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://www.openaire.eu/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://www.openaire.eu/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://www.openaire.eu/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://www.openaire.eu/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">OpenAire2020</md:ServiceName>
-      <md:ServiceName xml:lang="el">OpenAire2020</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">OpenAIRE2020 is a project aiming to develop and maintain the infrastructure to support the European Commission OA policy</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="el">Το OpenAIRE2020 είναι ένα Ευρωπαικό έργο το οποίο αποσκοπεί στην ανάπτυξη λογισμικού και τη συντήρηση της απαραίτητης τεχνικής υποδομής για την προώθηση της Ευρωπαικής Πολιτικής για Ανοιχτή Πρόσβαση σε Ακαδημαικά Δεδομένα</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: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: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.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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Athena- Research and Innovation Center in Information, Communication and Knowledge Technologies</md:OrganizationName>
-    <md:OrganizationName xml:lang="el">Αθηνά-Ερευνητικό Κέντρο Καινοτομίας στις Τεχνολογίες της Πληροφορίας, των Επικοινωνιών και της Γνώσης</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Athena Research Center</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="el">Ερευνητικό Κέντρο Αθηνά</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.athena-innovation.gr/en.html</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="el">http://www.athena-innovation.gr/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Athena Research Center</md:Company>
-    <md:GivenName>Eri</md:GivenName>
-    <md:SurName>Katsari</md:SurName>
-    <md:EmailAddress>gkatsari@di.uoa.gr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Athena Research Center</md:Company>
-    <md:GivenName>Katerina</md:GivenName>
-    <md:SurName>Iatropoulou</md:SurName>
-    <md:EmailAddress>kiatrop@di.uoa.gr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.openconext.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/www.openconext.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index 1903fc72..00000000
--- a/swamid-interfederations-2.0/www.openconext.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.openconext.org/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.surfconext.nl/" registrationInstant="2015-03-27T09:48:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnet.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <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:X509Data>
-          <ds:X509Certificate>MIIEcjCCA1qgAwIBAgIRAO7J6UVBF5npHFtCjVbTtqowDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA2MDIwMDAwMDBaFw0xNzA2MDEyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSd3d3Lm9wZW5jb25leHQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAshLGkfHyjl3dS+a9L1nIrSD+IV4wtahRasBOMZnOL1he79EKtjSRMNuaWiKu7wuhJp19nnKjihTiwXZgEL/k3TBq1PbNRDktjqjmSt+rA2mO62Sq0E4iX7hSkEzoz42t4pNZgai1ZMd8i7eSW2B+NoxjO13vMQOSsD7jkmQoRPBiIJqomywfGsPG3lGLwGK+FwE8rJLwgtF7CA3XzFizEWaPPh6qX0Jj9dydbVMwLrV48Odzdd6KsdorVSkn+QHZXnKnMHbqhh6gJ/6kBi9ibMKyxmnz/NoHNT6ucC6UrKyudCcP5jWAjc6SUkywUYwYhTx47OkBqa/7BdJIzW0q0wIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFA4WYkSuaxKJ0nVB3wQrym1/KGfbMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJ3d3cub3BlbmNvbmV4dC5vcmcwDQYJKoZIhvcNAQEFBQADggEBAJkBKGDSNFIY/BtAyhWfRYPwmV0tCtldSc2fh+biELxCX+9hlkhQ322mUEbdX4P31ZQRaEV53bvFq+Jn3oOGzwvJU+Vz+PO3rmMRVdCgFblXjtpisTDEhFlG6XeHZNIEow1hbgfk+NhrZ92ItQWr/cW9DPmxhhIDkoQZoj2L5cxTNO1qV10Of3oJ6nkykTMmYvpKNfdmYp0XtJ3nab1e0auoL6nG0iFNrIthAofuHYokH5Nl3qhu0mpI1w8Z3kyKhbGGjWUg1ej1Jh0xh0+xriMIvVG+WwtUY+K+4+1d23iwct1KqfjSurn15TiqY9hwkqIZcJ3JWpGnk3HYQctmTjY=</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>MIIEcjCCA1qgAwIBAgIRAO7J6UVBF5npHFtCjVbTtqowDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA2MDIwMDAwMDBaFw0xNzA2MDEyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSd3d3Lm9wZW5jb25leHQub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAshLGkfHyjl3dS+a9L1nIrSD+IV4wtahRasBOMZnOL1he79EKtjSRMNuaWiKu7wuhJp19nnKjihTiwXZgEL/k3TBq1PbNRDktjqjmSt+rA2mO62Sq0E4iX7hSkEzoz42t4pNZgai1ZMd8i7eSW2B+NoxjO13vMQOSsD7jkmQoRPBiIJqomywfGsPG3lGLwGK+FwE8rJLwgtF7CA3XzFizEWaPPh6qX0Jj9dydbVMwLrV48Odzdd6KsdorVSkn+QHZXnKnMHbqhh6gJ/6kBi9ibMKyxmnz/NoHNT6ucC6UrKyudCcP5jWAjc6SUkywUYwYhTx47OkBqa/7BdJIzW0q0wIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFA4WYkSuaxKJ0nVB3wQrym1/KGfbMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJ3d3cub3BlbmNvbmV4dC5vcmcwDQYJKoZIhvcNAQEFBQADggEBAJkBKGDSNFIY/BtAyhWfRYPwmV0tCtldSc2fh+biELxCX+9hlkhQ322mUEbdX4P31ZQRaEV53bvFq+Jn3oOGzwvJU+Vz+PO3rmMRVdCgFblXjtpisTDEhFlG6XeHZNIEow1hbgfk+NhrZ92ItQWr/cW9DPmxhhIDkoQZoj2L5cxTNO1qV10Of3oJ6nkykTMmYvpKNfdmYp0XtJ3nab1e0auoL6nG0iFNrIthAofuHYokH5Nl3qhu0mpI1w8Z3kyKhbGGjWUg1ej1Jh0xh0+xriMIvVG+WwtUY+K+4+1d23iwct1KqfjSurn15TiqY9hwkqIZcJ3JWpGnk3HYQctmTjY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openconext.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openconext.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="nl">OpenConext Community</md:ServiceName>
-      <md:ServiceName xml:lang="en">OpenConext Community</md:ServiceName>
-      <md:ServiceDescription xml:lang="nl">OpenConext Community</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">OpenConext Community</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:displayName" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:mail" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:mace:dir:attribute-def:uid" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">OpenConext</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">OpenConext</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.openconext.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Frans</md:GivenName>
-    <md:SurName>Ward</md:SurName>
-    <md:EmailAddress>Frans.Ward@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Frans</md:GivenName>
-    <md:SurName>Ward</md:SurName>
-    <md:EmailAddress>Frans.Ward@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Frans</md:GivenName>
-    <md:SurName>Ward</md:SurName>
-    <md:EmailAddress>Frans.Ward@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml b/swamid-interfederations-2.0/www.opensciencedatacloud.org-shibboleth.xml
deleted file mode 100644
index 0ee929a3..00000000
--- a/swamid-interfederations-2.0/www.opensciencedatacloud.org-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" entityID="https://www.opensciencedatacloud.org/shibboleth">
-  <!--
-		This is a Shibboleth SP for the Center for Computational Science Research, Inc.
-	-->
-  <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="2013-11-26T12:55:32Z">
-      <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">Open Science Data Cloud Console</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The OSDC provides cloud computing and storage services for the scientific research community.</mdui:Description>
-        <mdui:Logo height="35" width="205">https://www.opensciencedatacloud.org/misc/logo_sm.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.opensciencedatacloud.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://www.opensciencedatacloud.org/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIF7zCCA9cCCQCicdy6qcU4ZDANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMC
-						VVMxCzAJBgNVBAgMAklMMRAwDgYDVQQHDAdDaGljYWdvMSAwHgYDVQQKDBdPcGVu
-						IFNjaWVuY2UgRGF0YSBDbG91ZDEqMCgGA1UECwwhTGFib3JhdG9yeSBmb3IgQWR2
-						YW5jZWQgQ29tcHV0aW5nMSUwIwYDVQQDDBxjYS5vcGVuc2NpZW5jZWRhdGFjbG91
-						ZC5vcmcgMB4XDTE1MDkyMTIxMDgyM1oXDTIzMTIwODIxMDgyM1owgdAxCzAJBgNV
-						BAYTAlVTMQswCQYDVQQIDAJJTDEQMA4GA1UEBwwHQ2hpY2FnbzEqMCgGA1UECgwh
-						Q2VudGVyIGZvciBEYXRhIEludGVuc2l2ZSBTY2llbmNlMSAwHgYDVQQLDBdPcGVu
-						IFNjaWVuY2UgRGF0YSBDbG91ZDElMCMGA1UEAwwcd3d3Lm9wZW5zY2llbmNlZGF0
-						YWNsb3VkLm9yZzEtMCsGCSqGSIb3DQEJARYeYWRtaW5Ab3BlbnNjaWVuY2VkYXRh
-						Y2xvdWQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0tTPUHme
-						OLd4lMcKVeE212pW4ZS6zUpmnSUuGQx1cFilVUIAa7mvHwxQP3WeIwRHjy69AWRR
-						thNPHQf0So00uFYRqUSN1OXgi9MNi/NJF5GLiKhpOmYzRI8wyF7WFmlhV4KYISvX
-						ALDLdduuDCQ31Fc9MZAL0iJ9oWqSmv+ZBYuClIPdyccAfoKX+vWQf1naSfU7xfgz
-						w2h5/GEVnMQcKWVEGzLNAYnnLMcZMfGjH324OAq4cMoZCQ1MZVg9p3y3URfWfWmU
-						MUgB2UC8lK84Hb+FzIDD0EM/gZHa0eJhNipNHun/59ZlzqMHXf4ygF/P4s2xCDId
-						6/6Irv5rtpr1dv+RA0evv+7FXDaPwDvx1Vn1DpE2PjEh3o8mO16zwIir7St9Xyh6
-						PRdcBFlxaNuHPRv7zG3n9V5Fdj3aH2WgKdesZ1qTQ68L18xR9qrtJeTIrxZjuiTr
-						bgR0YPFRA5lNACwYE14KNCeXbRqiMWOOPygQaY2Jgn6WFbLvyzguYTJmWkGR3RzY
-						N15cFGgwc9uH5EYl+amtb5M5z+3Vk0HynBMzY5JAzuN7LX6D8dLJHk5cHuOK+9Sy
-						k56LSa6+2jXI59XMXxcMad5zx9RAZEeKii+LfPyZkd0RH+voZx5IG11sxHhoNEBf
-						fNJRtnM7LhGuFjzm2Epw7nwa+wgjbspUUnkCAwEAATANBgkqhkiG9w0BAQUFAAOC
-						AgEAZP/VuAyNTjAF1o5fKGwuUy90WHB0WXlp0SiTfrrK66C0fc2koZjzY089a7GF
-						SZAqPM/pTQThTsAHpietOnTcetigoUDja+Jw5247iXfEUrRCwK04urIudpU9bCnF
-						BS7QSPz4ZRNjQv9LwkGvOU9TkOw9/hfnIIx4aDXGUH7I9wJ9aX7fnuTz94fRLV6u
-						zsFRSC/zNC842bHcAs9sZDXldF+nbwJQNdRXKB/uRI4FcBQLGV8k5u+i6c7/MSd3
-						kAfdTghk9GMMD1ck9eOX7EYbTnLVWNmiFGOFM6JPCIrLcraQo7b2qhw/uSEAuPAA
-						79IoyWuYLSichK/fGWtUCjzinosculG/jteXsA+CEmcqYNyC4WXayIocFPjBQV+/
-						p7nJMRNbDB0XiAMGCaGGH/sFmuuwgz21pP6rwwV++XdPthLijx0IJRa13pnt3HEo
-						PZtme1tQD9F12h71hYcqyft6Yx2z/WjRL4eC+Pi5TsoKfmzeVoryhIw48+5tmTea
-						2DXQ0kYoJCDg5MQ96rv9Pq0OZe9j94oWe91PDuGt9VB4eTlbBt2WiMe+7XDXpOJ2
-						8FqqDNY7Ln1LMtV3f5mKjt+lEUkjOr9rcRbFnPx7eLTRRI3C58jBFUxQYcG6zbSo
-						iYBbqea72Trn3z2jrytiIM2RYNoL7aS2eqfyIwEr9Q6cuDA=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.opensciencedatacloud.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.opensciencedatacloud.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="it">Open Science Data Cloud Console</ServiceName>
-      <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">Center for Computational Science Research, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Open Science Data Cloud Console</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.opensciencedatacloud.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@opensciencedatacloud.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ray</GivenName>
-    <SurName>Powell</SurName>
-    <EmailAddress>mailto:rpowell1@uchicago.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 140acad8..00000000
--- a/swamid-interfederations-2.0/www.ox.ac.uk-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://www.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-31T11:24:50Z">
-      <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>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6zCCAdOgAwIBAgIJAPx/LwmeUGTyMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-						BAMTDHd3dy5veC5hYy51azAeFw0xNDA3MjkwODExNTNaFw0yNDA3MjYwODExNTNa
-						MBcxFTATBgNVBAMTDHd3dy5veC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAOc2rOr/XaHUNhfWxfolloVnnDDY3BvIP/AWugahGYXEelclRaNX
-						95rh21w+Pw6qcMwkaCoc8LBNE2O7ReUp2zUWsB1t87w8v8XDUPEpPAQ9XVTHFGAt
-						4A93oYO8UuZPC6CoPu2guuXJT+gS5jiswk/R3729CUlphY/Ov9+QO1jfuoNu8mGY
-						FllFALRsDKc8PH83UuEhF4R9rtz1LYoD/vs6NjR+n1dovkRMqxRZBxuEgcEX1tft
-						WciPXI4Nk4DbbgOPgmcl0dPUK+IMTLLQF/So/qO02cxDZKp9DA+rws79J0qPOOUQ
-						AaYqFjB8qRjKfs9xUrCviXNHzgWmLKbEUkUCAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-						d3d3Lm94LmFjLnVrMB0GA1UdDgQWBBRdot3++gHpLRLS+MGj/T9eobiBrjANBgkq
-						hkiG9w0BAQUFAAOCAQEALUNCD99LKk+88GfsmMNIczRzOEQynKD1i5X6247/5zs+
-						w81ezac3VrDk09O9PFhkeh4D32KupXWQ4+bY7ijlBj/BVDhrrgKZZeD5mu+J8Ru+
-						Ypz4r7bV+t8dUukfNy6xLMqePEmrmhLgWql0EtOpRrsZC/GNdpkl+kJG3EoPt8cZ
-						umV/wHnzjahIYYKQ2YyrwU6tT/jMDciNSZOEJOoVkujmhu3yK0eIwfAJQzJ90fGg
-						t/KiRYU/XnfJ+HdgNOth5XvmNSG3gmzVtGVLbPbfp7i4sCHMOD5FzSziYwp6m6Pn
-						Q9nQhuIfcxbBFG6jt794VKX50sAROXsVPFcYfT3gTg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.oxfordtoday.ox.ac.uk/Shibboleth.sso/SAML/POST" index="8"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.pathcal.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.pathcal.ac.uk-shibboleth.xml
deleted file mode 100644
index cd84bc1c..00000000
--- a/swamid-interfederations-2.0/www.pathcal.ac.uk-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://www.pathcal.ac.uk/shibboleth">
-  <!--
-		This is a "PathCAL" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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="2013-03-22T11:39:16Z"/>
-  </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.pathcal.ac.uk/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://www.pathcal.ac.uk/Shibboleth.sso/WAYF"/>
-      <init: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.pathcal.ac.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://www.pathcal.ac.uk/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">PathCAL</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Series of online tutorials covering a wide range of pathology and pathophysiology subjects.</mdui:Description>
-        <mdui:Logo height="64" width="300">https://www.pathcal.ac.uk/pathcal_wayf.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDIDCCAgigAwIBAgIJAP0iPdXcGeGuMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
-						BAMTEXd3dy5wYXRoY2FsLmFjLnVrMB4XDTExMDMzMDE1MTIzNVoXDTIxMDMyNzE1
-						MTIzNVowHDEaMBgGA1UEAxMRd3d3LnBhdGhjYWwuYWMudWswggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQCl7DYwQXP82QOrgN1cMH+8KqLz2e9wgOM66+0X
-						Nds/VycQAEP29h1DiYQbl/154Vqvf2E9PSlCz1gNLJjdEvnCrbTyECPNt9BG2H8n
-						sDnGSzYpmAGiq42QiuPxa2LGdS9HpPDipxJCEs35HmeOeqFOIQtoUpmtAA9XRnth
-						WG4C1JF8dZNAWpjpFzNCvLZHDUiZzJPgQjdQZ76UBEMoXYX7jDM4cAXHqNuRvFo6
-						icFowW5TAtcx1WXL0HwRHxHRCRfWKDANn7HeN8H9Jk5M1lkRhN0DOu1RJN+8RBaI
-						NJ5WnM3lY1oNZos2ui78+mXX5kdHStG9E+vfwUxBh23tmOfJAgMBAAGjZTBjMEIG
-						A1UdEQQ7MDmCEXd3dy5wYXRoY2FsLmFjLnVrhiRodHRwczovL3d3dy5wYXRoY2Fs
-						LmFjLnVrL3NoaWJib2xldGgwHQYDVR0OBBYEFBQnhIEnumryfjPopVA9OUDmxyks
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAj+C0DVNjbwW7LxXwNAAXbYLDNQDm+wNwLvOV2
-						k01FyU3k0M8F4F86i8Zh/fj1xZ3pZfV6uZcvB9CtIMqLG5aDKRBWqRqWGG8OvhAn
-						J0JBLmbhcz40RbfmeZUoq0+Zy8gGxARR/kjaZ16U4t5rgG7fSJlBiSsdu4FPjGNx
-						3GzdsKqAZRjDhs7Ar7OltkqGz/ko4V/ok+WP7aTdzXWMe++ZSyyNxTNVVdSO+L3j
-						Zy9ytOPZlc12HwkN83CgQD6dPOEr4zmypBtg7RR6Bf0lhD7ldrSlA1LvrTQX6/vz
-						GxJxVd0AU9FzIdALwx59lXkBvyhje3QI6dYfxwDZPyKxo4PA
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.pathcal.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pathcal.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.pathcal.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pathcal.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pathcal.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.pathcal.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: PathCAL</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.lts.mvm.ed.ac.uk/index.asp</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>PathCAL</GivenName>
-    <EmailAddress>mailto:pathcal@lists.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Arek</GivenName>
-    <SurName>Juszczyk</SurName>
-    <EmailAddress>mailto:arek.juszczyk@ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.xml b/swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.xml
deleted file mode 100644
index cd8ff382..00000000
--- a/swamid-interfederations-2.0/www.pbyp.co.uk-sp-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.pbyp.co.uk/sp/shibboleth">
-  <!--
-		This is a "Personalisation by Pieces" Shibboleth SP for Cambridge Education Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-06-13T09:49:22Z"/>
-  </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://pbyp.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://pbyp.co.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Personalisation by Pieces (PbyP)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Personalisation by Pieces (PbyP) is an approach
-					to teaching and learning developed by Cambridge Education in 2006. It is a
-					framework to support personalised learning based on core skills and competencies.</mdui:Description>
-        <mdui:Logo height="100" width="252">https://services.camb-ed.com/images/ce-logo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAJX1RdJ8skE0MA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGm50ZGQzMDEzLXZtMDEuY2FtYmJlLmxvY2FsMB4XDTEyMDYxMzA1NDM0NloX
-						DTIyMDYxMTA1NDM0NlowJTEjMCEGA1UEAxMabnRkZDMwMTMtdm0wMS5jYW1iYmUu
-						bG9jYWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDeQA65YfW/dJ4n
-						CcZdPN2415+xiP5HNH/iRXhfBTEr+QN5QP3z1ylRidTHWNz5S2e1HfTsbdPLJygj
-						W7NxXLu6YFi79TopSUVCOpBEqOcXldR5YPtTRJtNProb5vUIP1iix1d9KoBPufsZ
-						Y5kk9156EwA47C/HMFdV8y71yKbhojbSlKTvxdkaYkrB0YFbo125SMeJP/JnVW32
-						WJ4+qVGQzzTGAV8/KTNOGovGj1uz8fJVAIBoIpJQAAuWq8Aoo8F135iHU4uiQROE
-						3jGs/iW0f2cdENQn5l0bCjnZmvnx5o/oIdvU0YjHaAMsjs8OUfg64o/kOQ4vq4y4
-						iOUiQrTHAgMBAAGjSDBGMCUGA1UdEQQeMByCGm50ZGQzMDEzLXZtMDEuY2FtYmJl
-						LmxvY2FsMB0GA1UdDgQWBBR7Na1DFuvXRKD/IWAWCFpXlM6NCTANBgkqhkiG9w0B
-						AQUFAAOCAQEABwfDIGzHs+Np3N2BQUhvDMVz6aP4RS3Nqv9DsnyxBv3RkQJ6q+oB
-						eESW5oQCgGRK0jlUSjFuc5liZA7KM6NcT32HuJOcFpTcKIffA3uKVNK5FScbr89O
-						8LpN3xxBeVbVlhHmj2LQ1hmB4DLikk/19F3J9amTthw6BIztTo3P5aT988eC8QOo
-						i41vNMju3zx6tkO49RXCDLDcGd4hxIXrE/zeJzGSUdgOSZ3yahNzQyjwE3y1zFId
-						C88bOQzKf/M2cgegVSbjJBhqTOIWYJsb62Jd3CTHaj7nkvZfv82B3UTxO9o2bvKD
-						u2nA/TyhOJ/2oTDY+YdGCx3lJ8qykSVXow==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pbyp.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://pbyp.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pbyp.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pbyp.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pbyp.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pbyp.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pbyp.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pbyp.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pbyp.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pbyp.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pbyp.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cambridge Education Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Cambridge Education Limited Personalisation by Pieces</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.camb-ed.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Bell</SurName>
-    <EmailAddress>mailto:simon.bell@camb-ed.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Zishan</GivenName>
-    <SurName>Sheikh</SurName>
-    <EmailAddress>mailto:Zishan.sheikh@camb-ed.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Bell</SurName>
-    <EmailAddress>mailto:simon.bell@camb-ed.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Zishan</GivenName>
-    <SurName>Sheikh</SurName>
-    <EmailAddress>mailto:Zishan.sheikh@camb-ed.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml b/swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.xml
deleted file mode 100644
index 431a1b4a..00000000
--- a/swamid-interfederations-2.0/www.pharmacopoeia.com-oa-metadata.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="http://www.pharmacopoeia.com/oa/metadata">
-  <!--
-		This is a "British Pharmacopoeia" SP for The Stationery Office Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-09-14T13:31:36Z">
-      <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:1.1:protocol 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">British Pharmacopoeia</mdui:Description>
-        <mdui:DisplayName xml:lang="en">British Pharmacopoeia</mdui:DisplayName>
-        <mdui:Logo height="106" width="480">https://www.pharmacopoeia.com/assets/bp/images/british-pharmacopoeia.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDcDCCAligAwIBAgIJAKNqg3+e59PHMA0GCSqGSIb3DQEBBQUAMC4xDDAKBgNV
-						BAoTA1RTTzEeMBwGA1UEAxMVd3d3LnBoYXJtYWNvcG9laWEuY29tMB4XDTE1MDgw
-						NzE1NDczNVoXDTI1MDgwNDE1NDczNVowLjEMMAoGA1UEChMDVFNPMR4wHAYDVQQD
-						ExV3d3cucGhhcm1hY29wb2VpYS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQCtAr/AsZ79dO0pgPupqfStUaz5DmNqgkNhFBzyurii3T7A/gYhKK+d
-						buDgZCLTXLUHW64fOlM7vRDFWdmiZpwguVfm3PWaB8+i5drwPP2/3AEE3W0WzTeo
-						dwxkGJCz9syQh2CStC/kW0bDVpn4O7QguwVtSX1oD6PunAcwIvri9wESkw6UeyZ1
-						/rWgEXBhp6rXUyJi638dR6/nr8UTCEaxg2vUugw/yR4NqrB2tP2MAC1nsoG2QWwJ
-						YoCnc7mAbELSloohgGMKAIf9bxq6avwOq+87YU/tgA0qMnwtgquTtKZWcowth3pG
-						b8e4sbEZReDCskuDZYoCZbHY+xJva05tAgMBAAGjgZAwgY0wHQYDVR0OBBYEFB6r
-						bmDDRDm0jgjnoldiBzw8xbmGMF4GA1UdIwRXMFWAFB6rbmDDRDm0jgjnoldiBzw8
-						xbmGoTKkMDAuMQwwCgYDVQQKEwNUU08xHjAcBgNVBAMTFXd3dy5waGFybWFjb3Bv
-						ZWlhLmNvbYIJAKNqg3+e59PHMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBACYjvdAjjvz4xRgC8HMpx+LFg3k0XCyEGxz8CZWOW3C+9fHLv906KHt/89Vb
-						Xq219cAfqjDKhtBrRDjslFbuFXtxlpT4GeGfkr8FskqH/4yUDEPzoE1tsZ++dEeJ
-						JNRx6beS8x25YfHhT5oNIqLHu0S5sppl0175ipLzZLzvFOmCeRKJB4mI88vlN3PH
-						gryT2uLDshfufiLzsJyGsJhwVxjJrTZpZkVVIsLN6euxeVi+b9dH+8aZlLULtYoU
-						2kpGXv46PNFW01vl+J/EVxq3YitsdWzopSmjHYIZR0eKXDG4bAS6ulPAAElDsKlE
-						0e00+Q6k8r5lfTGa50KV3OMQGR8=
-					</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>
-						MIIDcDCCAligAwIBAgIJAKNqg3+e59PHMA0GCSqGSIb3DQEBBQUAMC4xDDAKBgNV
-						BAoTA1RTTzEeMBwGA1UEAxMVd3d3LnBoYXJtYWNvcG9laWEuY29tMB4XDTE1MDgw
-						NzE1NDczNVoXDTI1MDgwNDE1NDczNVowLjEMMAoGA1UEChMDVFNPMR4wHAYDVQQD
-						ExV3d3cucGhhcm1hY29wb2VpYS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQCtAr/AsZ79dO0pgPupqfStUaz5DmNqgkNhFBzyurii3T7A/gYhKK+d
-						buDgZCLTXLUHW64fOlM7vRDFWdmiZpwguVfm3PWaB8+i5drwPP2/3AEE3W0WzTeo
-						dwxkGJCz9syQh2CStC/kW0bDVpn4O7QguwVtSX1oD6PunAcwIvri9wESkw6UeyZ1
-						/rWgEXBhp6rXUyJi638dR6/nr8UTCEaxg2vUugw/yR4NqrB2tP2MAC1nsoG2QWwJ
-						YoCnc7mAbELSloohgGMKAIf9bxq6avwOq+87YU/tgA0qMnwtgquTtKZWcowth3pG
-						b8e4sbEZReDCskuDZYoCZbHY+xJva05tAgMBAAGjgZAwgY0wHQYDVR0OBBYEFB6r
-						bmDDRDm0jgjnoldiBzw8xbmGMF4GA1UdIwRXMFWAFB6rbmDDRDm0jgjnoldiBzw8
-						xbmGoTKkMDAuMQwwCgYDVQQKEwNUU08xHjAcBgNVBAMTFXd3dy5waGFybWFjb3Bv
-						ZWlhLmNvbYIJAKNqg3+e59PHMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-						ggEBACYjvdAjjvz4xRgC8HMpx+LFg3k0XCyEGxz8CZWOW3C+9fHLv906KHt/89Vb
-						Xq219cAfqjDKhtBrRDjslFbuFXtxlpT4GeGfkr8FskqH/4yUDEPzoE1tsZ++dEeJ
-						JNRx6beS8x25YfHhT5oNIqLHu0S5sppl0175ipLzZLzvFOmCeRKJB4mI88vlN3PH
-						gryT2uLDshfufiLzsJyGsJhwVxjJrTZpZkVVIsLN6euxeVi+b9dH+8aZlLULtYoU
-						2kpGXv46PNFW01vl+J/EVxq3YitsdWzopSmjHYIZR0eKXDG4bAS6ulPAAElDsKlE
-						0e00+Q6k8r5lfTGa50KV3OMQGR8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pharmacopoeia.com/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pharmacopoeia.com/oa/auth/rcv/saml2/post" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Stationery Office Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">British Pharmacopoeia</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.pharmacopoeia.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Nichol</GivenName>
-    <SurName>Pope</SurName>
-    <EmailAddress>mailto:nichol.pope@tso.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jaspaul</GivenName>
-    <SurName>Khurana</SurName>
-    <EmailAddress>mailto:Jaspaul.Khurana@tso.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml b/swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml
deleted file mode 100644
index bf792b1d..00000000
--- a/swamid-interfederations-2.0/www.pi-navigator.com-shibboleth-metadata.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.pi-navigator.com/shibboleth/metadata">
-  <!--
-		This is a 'PI Navigator' Shibboleth SP for Perfect Information Ltd.
-	-->
-  <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="2015-12-11T10:34:29Z"/>
-  </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.pi-navigator.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.pi-navigator.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE4jCCA8qgAwIBAgIJAPEDnthEYHnfMA0GCSqGSIb3DQEBBQUAMIGmMQswCQYD
-						VQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEPMA0GA1UEBxMGTG9uZG9uMSAwHgYD
-						VQQKExdQZXJmZWN0IEluZm9ybWF0aW9uIEx0ZDELMAkGA1UECxMCSVQxHTAbBgNV
-						BAMTFHd3dy5waS1uYXZpZ2F0b3IuY29tMSYwJAYJKoZIhvcNAQkBFhdwYXVsbWNs
-						QHBlcmZlY3RpbmZvLmNvbTAeFw0xMDA5MTMxNDQzMjJaFw0yMDA5MTIxNDQzMjJa
-						MIGmMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEPMA0GA1UEBxMGTG9u
-						ZG9uMSAwHgYDVQQKExdQZXJmZWN0IEluZm9ybWF0aW9uIEx0ZDELMAkGA1UECxMC
-						SVQxHTAbBgNVBAMTFHd3dy5waS1uYXZpZ2F0b3IuY29tMSYwJAYJKoZIhvcNAQkB
-						FhdwYXVsbWNsQHBlcmZlY3RpbmZvLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBANKeCAsU0e0XEDmN1ohQGYixwausIq03G4+/xH2si8JMMo9XtmXC
-						eGiXNWvw+HNPLN2ChXPtVUUz5Yspu9LXw/vzxk2AcM7ELRVf4g47FnmG/I+lT6H0
-						pw1hFeLcdCP5tIorGDogRkwOKk2q+zDQDbjxnNKM5jyRg2P1qLQBwMDHkUpDZwuH
-						3/Hf3PzB8UXjtJuuWRU3Cg8yDAHfGxR+fvcfvUC4K85lrfG69FAVj6WwDMdDF5Xc
-						KgoKGDyQHtcTUNs52YmKPfWtyqTTvwHhyNxPDhuaskWtC80RUAKsAo7p0uKzzySz
-						TxSZpvSVGMnxY7eJvyNKxkCg8NGOTI95lAECAwEAAaOCAQ8wggELMB0GA1UdDgQW
-						BBQ3nYviL+W5+KE/F5aNGat+PN6AGTCB2wYDVR0jBIHTMIHQgBQ3nYviL+W5+KE/
-						F5aNGat+PN6AGaGBrKSBqTCBpjELMAkGA1UEBhMCR0IxEDAOBgNVBAgTB0VuZ2xh
-						bmQxDzANBgNVBAcTBkxvbmRvbjEgMB4GA1UEChMXUGVyZmVjdCBJbmZvcm1hdGlv
-						biBMdGQxCzAJBgNVBAsTAklUMR0wGwYDVQQDExR3d3cucGktbmF2aWdhdG9yLmNv
-						bTEmMCQGCSqGSIb3DQEJARYXcGF1bG1jbEBwZXJmZWN0aW5mby5jb22CCQDxA57Y
-						RGB53zAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBh2gbU/cgGYnuW
-						rkOCesoCpB/1wowMYvVb1iQJeSGtfTe96c/M2i3HdgLsj88zhCOANY7D4/V24Nco
-						kPKI8xyW90XtJZ4ZUYC9wgVwYoUOCuxUMS3/mQjJ6+DBXQG595gsn4NDseP/kuXM
-						deuHXBqxMIZ78aEPSX9DPqTEx803nQmiI78Qci9xwnBRKnmP2+PmK4xLUm9ogeCs
-						CXRgygMPP9WmpS8vSiUG04Dycu+c7Zh2EBzH7LHey9reE2T9pWxJW4k8iw5P0r+y
-						U4KKQy2lPVLHTtmiDdo3PVX4jrKA0QN6KMrAHNq1SwLitONOgjY/cxUlkLXMcBxC
-						xToFAE6F
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.pi-navigator.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pi-navigator.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.pi-navigator.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Perfect Information Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Perfect Information Ltd: PI Navigator</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.perfectinfo.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>McLoughlin</SurName>
-    <EmailAddress>mailto:paulmcl@perfectinfo.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>McLoughlin</SurName>
-    <EmailAddress>mailto:paulmcl@perfectinfo.com</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 2b5da972..00000000
--- a/swamid-interfederations-2.0/www.portal.euromonitor.com-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://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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Passport</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Passport is a global market research database providing statistics, analysis,reports, surveys and breaking news on industries, countries and consumersworldwide</mdui:Description>
-        <mdui:Logo height="26" width="184">https://www.portal.euromonitor.com/portal/Images/logos/passport-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>
-						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"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.euromonitor.com/athensgateway/oa/auth/rcv/shib/post" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.euromonitor.com/athensgateway/oa/auth/rcv/saml2/post" index="8"/>
-  </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.portal.ted.is.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.portal.ted.is.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index 6e845865..00000000
--- a/swamid-interfederations-2.0/www.portal.ted.is.ed.ac.uk-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://www.portal.ted.is.ed.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth "Scientia Syllabus Plus Enterprise" 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-08T10:00:17Z">
-      <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.portal.ted.is.ed.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDADCCAeigAwIBAgIJAMszihLucz6hMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3NhdC1lcC1rYjEuZWQuYWMudWswHhcNMTIwMzA1MTY1NjMyWhcNMjIwMzAz
-						MTY1NjMyWjAeMRwwGgYDVQQDExNzYXQtZXAta2IxLmVkLmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQOJ96cEk18YvMHn0Dg71j6V1PUt2gNr
-						932yD1ZmnFawDcB8bIvvVadllB0L0Ww2VnKh6x2dsn03366QGvT8jjEBqz/2Djni
-						6ym0g5H1Ql6ttdmihP7fV1TUE0gS3bMKw+s/axerzqYCD7Q6m1gY8p0eAPNN4oP+
-						T5u88GsOYmNa13w9NqXceCmGvA9SJFD/dQQWC9G5pQs3umqpKFjLvclZcKy9Gj2Q
-						b3LdGY/QMjSEJ24aH6xA8X6VKDc7ByzDk2IC2b4UEgVBBC3Y+50J4b3UdcS1ZU3P
-						b61GuEZ4FT5ber4zAfPjdPM1Q+6j+lbex76Lp03FU+RTJRUztSSoSwIDAQABo0Ew
-						PzAeBgNVHREEFzAVghNzYXQtZXAta2IxLmVkLmFjLnVrMB0GA1UdDgQWBBR/ayuV
-						LIFWwzUssHpUcvMr/ZS4QjANBgkqhkiG9w0BAQUFAAOCAQEAgdp151G2iRytTqdG
-						9BavSjFEcL23m8sW8RN/RvR/yZKuuLGVYIePgl2VMT9FrGy1GX4OxsApkhm2E5a6
-						jMelTpnm3qUwjryEWVVLSGMLP9mi49xzSOrU7pK7FseyxJP+loRJ5hO1laJIVS/u
-						WpNzjYn7QG+jHk5Eh3A3K6KlxZJmZTCBLXhOHzYXY8BBhEhtdDsFY+tPfiw+twVO
-						MonDchFnqWwDwsypFdPb5PcjtnLig1XXQCyVDkzGmqtNLMmu6d56Waox71G/KaMO
-						nkS4wUZn15n5mdKZrScA2RbVMiQ5oqO5GHbC0Hnx1zmz/qnM0Eek7TeQGIi02dBv
-						hv3Y4Q==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.portal.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Edinburgh: Scientia Syllabus Plus Enterprise - Live Environment</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>IS Application Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.propylaeum.de.xml b/swamid-interfederations-2.0/www.propylaeum.de.xml
deleted file mode 100644
index 40099fd5..00000000
--- a/swamid-interfederations-2.0/www.propylaeum.de.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.propylaeum.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.propylaeum.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.propylaeum.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.propylaeum.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzDCCBLSgAwIBAgIHEnRZnq0yrjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTExMDA2WhcNMTYw
-ODIyMTExMDA2WjCBmTELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRowGAYD
-VQQDExF3d3cucHJvcHlsYWV1bS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKFh9caPIFhS2jIdLooVk30LY730XWVZ1lmaMu7k3C0btX4Vjjl3htj4
-0Z3zDNCQl3R09ITueC+gyHV6ADKeQLCuNh3AlY7bXKukYufUzDkdmGo6QyCUU4X9
-0KWBGez3D1PMbEAv2ay3D57GLJwtRP4LO8x+Y+Z3g0i3kb+4rC/k58g/V4Utqk5d
-3nA/iFMh2aD6clHUQ/fUBgicdloy1NW8G8Y9YIIj7TZBxxegPaIFBlt443SHuhr0
-bJ6DbFdhq+n4FyNQh3BNe2bs3Nsx4g8neQ1QFZp80wV6wlarLfJuDWQdRxzJDwUo
-l0QHuYKNQ8aEUW9EWMTDd5i1z63ejY8CAwEAAaOCAfwwggH4MAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUBqxCuJApxSI5xMQce7FuA23RsgQwHwYDVR0jBBgwFoAUemeMWxoTRIKz
-IVobKorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JheWVy
-aXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5jcmww
-gcoGCCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQB6fmD4RCUhevBRvqaLb0sA
-gX2csj3pjfD+Q53sm6d1sk9CPuCMWYBHTUBKKIo6h9UZgGjj6NlmAt+iA9DxZHFY
-g+PSfw6t6SMvfZ7RslIcoZy4bsTLON71edCPccPWpKx7x0TSfg+aH+eu1kpSe47K
-R5TihEHKgIi36RCA6AY1JDDsNGjonZR4lG48NRXZ1HqY2Rh/kph3tNqfFQG9TkNj
-RtuYg/2um9+CjJnvI9wik7tMJKVkB2fToqRItNhxa7YEF001koHmSDZT7w3xAtQc
-ohe+mhgrSBbjpHrLTJhtrRalopdfAwCUGwWP4fZdikWiAjZmgFnUqYfTOQ+Qng/2
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.propylaeum.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.propylaeum.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzDCCBLSgAwIBAgIHEnRZnq0yrjANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTExMDA2WhcNMTYw
-ODIyMTExMDA2WjCBmTELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRowGAYD
-VQQDExF3d3cucHJvcHlsYWV1bS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKFh9caPIFhS2jIdLooVk30LY730XWVZ1lmaMu7k3C0btX4Vjjl3htj4
-0Z3zDNCQl3R09ITueC+gyHV6ADKeQLCuNh3AlY7bXKukYufUzDkdmGo6QyCUU4X9
-0KWBGez3D1PMbEAv2ay3D57GLJwtRP4LO8x+Y+Z3g0i3kb+4rC/k58g/V4Utqk5d
-3nA/iFMh2aD6clHUQ/fUBgicdloy1NW8G8Y9YIIj7TZBxxegPaIFBlt443SHuhr0
-bJ6DbFdhq+n4FyNQh3BNe2bs3Nsx4g8neQ1QFZp80wV6wlarLfJuDWQdRxzJDwUo
-l0QHuYKNQ8aEUW9EWMTDd5i1z63ejY8CAwEAAaOCAfwwggH4MAkGA1UdEwQCMAAw
-CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
-HQ4EFgQUBqxCuJApxSI5xMQce7FuA23RsgQwHwYDVR0jBBgwFoAUemeMWxoTRIKz
-IVobKorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
-cmwvY2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JheWVy
-aXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5jcmww
-gcoGCCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQB6fmD4RCUhevBRvqaLb0sA
-gX2csj3pjfD+Q53sm6d1sk9CPuCMWYBHTUBKKIo6h9UZgGjj6NlmAt+iA9DxZHFY
-g+PSfw6t6SMvfZ7RslIcoZy4bsTLON71edCPccPWpKx7x0TSfg+aH+eu1kpSe47K
-R5TihEHKgIi36RCA6AY1JDDsNGjonZR4lG48NRXZ1HqY2Rh/kph3tNqfFQG9TkNj
-RtuYg/2um9+CjJnvI9wik7tMJKVkB2fToqRItNhxa7YEF001koHmSDZT7w3xAtQc
-ohe+mhgrSBbjpHrLTJhtrRalopdfAwCUGwWP4fZdikWiAjZmgFnUqYfTOQ+Qng/2
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.propylaeum.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.propylaeum.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.propylaeum.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.propylaeum.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.propylaeum.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.propylaeum.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.propylaeum.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.propylaeum.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.propylaeum.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.propylaeum.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.propylaeum.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.propylaeum.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.propylaeum.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.propylaeum.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.propylaeum.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.publicinformationonline.com-shibboleth.xml b/swamid-interfederations-2.0/www.publicinformationonline.com-shibboleth.xml
deleted file mode 100644
index 52b99fce..00000000
--- a/swamid-interfederations-2.0/www.publicinformationonline.com-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" entityID="https://www.publicinformationonline.com/shibboleth">
-  <!--
-		This is a "Public Information Online" Shibboleth SP for Dandy Booksellers 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="2014-10-27T10:52:04Z">
-      <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">Public Information Online</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Collection of Parliamentary papers from the UK &amp; Scottish Parliaments, Northern Ireland Assembly &amp; Scottish Government.</mdui:Description>
-        <mdui:Logo height="98" width="350">https://www.publicinformationonline.com/images/piologo_350_98.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.publicinformationonline.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://www.publicinformationonline.com/Shibboleth.sso/WAYF/UKFederation"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEbDCCA1SgAwIBAgIJAKyY0ChRtdbhMA0GCSqGSIb3DQEBBQUAMIG2MQswCQYD
-						VQQGEwJHQjEQMA4GA1UECAwHRW5nbGFuZDEPMA0GA1UEBwwGTG9uZG9uMRowGAYD
-						VQQKDBFEYW5keSBCb29rc2VsbGVyczEaMBgGA1UECwwRRGFuZHkgQm9va3NlbGxl
-						cnMxKDAmBgNVBAMMH3d3dy5wdWJsaWNpbmZvcm1hdGlvbm9ubGluZS5jb20xIjAg
-						BgkqhkiG9w0BCQEWE2JhcnJpZUBtb2RlemVyby5uZXQwHhcNMTEwNDE1MTEyNjUw
-						WhcNMzEwNDEwMTEyNjUwWjCBtjELMAkGA1UEBhMCR0IxEDAOBgNVBAgMB0VuZ2xh
-						bmQxDzANBgNVBAcMBkxvbmRvbjEaMBgGA1UECgwRRGFuZHkgQm9va3NlbGxlcnMx
-						GjAYBgNVBAsMEURhbmR5IEJvb2tzZWxsZXJzMSgwJgYDVQQDDB93d3cucHVibGlj
-						aW5mb3JtYXRpb25vbmxpbmUuY29tMSIwIAYJKoZIhvcNAQkBFhNiYXJyaWVAbW9k
-						ZXplcm8ubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3dZdcWh2
-						ftVD3ymAbP2E+EgXwTu1nmYBzby4KA73men52OPI29lOSxloCZN/JMfJaOe49YI9
-						QcdC484zzlCbOp8gkcdYTvjtatfA16j66IAiJHNW+BMPv9BAw9OO3iwZLlnGg5yt
-						X7x4U4CQbpxr2s1KYlCqhuy1VEDem2I8C/B+TjKlvpoWuNIGuJ7p7J2CL5CAm+ao
-						iQp/uQ7EYI2nLat0kq/6aXcOtVCZXFVBDYHEAytcUbMTkWKFKxohR6JtaD3p2RK2
-						8OysXG1DGvi0A71Nhr5Lhw9GWM2IbayLv9u2bGA6aYam7dEhNA05/g5TqptgS69T
-						0g9AwTg7Z2ku9QIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1P
-						cGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUkgXL/CZUCTeG
-						Ea4CYrPGxPRUIfIwHwYDVR0jBBgwFoAUkgXL/CZUCTeGEa4CYrPGxPRUIfIwDQYJ
-						KoZIhvcNAQEFBQADggEBAEbijLDE6hiyM6FE3XsojBOHJsgfAdR91aWZwIAEHZy8
-						GZOU//mxolb+Jt9T35LQWMhGBqXEIOIQzXaSlWSU8GwSt8YkdpGkyXnRli/vC0mD
-						OhMNkMc7EqndNiAKVlYXhBTH64fahWmwMJY7R3GHCP3fE19Dy4p8dQ/gRVpkgWVw
-						dChnmk/ZIC4cagvNDe3gN9lxQCUODoZKgbAdI0PVJ/8TdxgTbT7G5wXo4sPyVXqE
-						B51xhsr+EtVwsr9Ea/Q+uJUpwZIQY+s0LYY8rh7OmFzGdOdtfSG15nPJUvxh6RZV
-						MVwZJsRD1V5Hwsyr2D4yEVTkAQxUN1ZFs9jYhUuckd0=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.publicinformationonline.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.publicinformationonline.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.publicinformationonline.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.publicinformationonline.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.publicinformationonline.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.publicinformationonline.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.publicinformationonline.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.publicinformationonline.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.publicinformationonline.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.publicinformationonline.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Dandy Booksellers Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Public Information Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.dandybooksellers.com/acatalog/About_us.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Barrie</GivenName>
-    <SurName>Cooper</SurName>
-    <EmailAddress>mailto:barrie@nouver.net</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Barrie</GivenName>
-    <SurName>Cooper</SurName>
-    <EmailAddress>mailto:barrie@nouver.net</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.purplemash.com-shibboleth.xml b/swamid-interfederations-2.0/www.purplemash.com-shibboleth.xml
deleted file mode 100644
index 7251055c..00000000
--- a/swamid-interfederations-2.0/www.purplemash.com-shibboleth.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://www.purplemash.com/shibboleth">
-  <!--
-		This is a "Purple Mash" Shibboleth SP for 2Simple Software Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIFvDCCBKSgAwIBAgIQedbd2FYSblApoSo8f3SkHzANBgkqhkiG9w0BAQUFADCB
-						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
-						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTMwMzA2
-						MDAwMDAwWhcNMTYwMzEwMjM1OTU5WjCB9zELMAkGA1UEBhMCR0IxFzAVBgNVBAgT
-						DkdyZWF0ZXIgTG9uZG9uMQ8wDQYDVQQHFAZMb25kb24xHTAbBgNVBAoUFDJTaW1w
-						bGUgU29mdHdhcmUgTHRkMTUwMwYDVQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3LnZl
-						cmlzaWduLmNvLnVrL3JwYSAoYykwNTEiMCAGA1UECxMZQXV0aGVudGljYXRlZCBi
-						eSBWZXJpU2lnbjEnMCUGA1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBOZXR3
-						b3JrMRswGQYDVQQDFBJ3d3cucHVycGxlbWFzaC5jb20wggEiMA0GCSqGSIb3DQEB
-						AQUAA4IBDwAwggEKAoIBAQDYk0LoU5Ca8CYovaGDYQqfH2OejPsxBs4K9u+2JrVy
-						HcbZW4bEtWNWPUaM/5bmxLLzi1Vb/ctmbZxVRQqo+R3EN9wjKeE9/t0eNNjCW6KV
-						9pIyJ4+joCh9PIrxVShJnh1cYgWYZ5ielcnp4IBgDbH6h0VnKyUXQxKyjg/taJIS
-						wMwVf5yLHxdnXYBpY5LQmCjg2mb4Q+y0gmzUGGzRYSD4Yu/jf0qMCUgq7IKtT0Tu
-						3qJ7wt+/JSamA+qpurAArFMENKCkPXAkFphL9SCJWf9Hq6pj6/Tb7tCpq+4JVN4h
-						c8MQQvTsHhsFUvM+UKNzJH+JjIOlSCx/4lSV+v2UE9IzAgMBAAGjggGCMIIBfjAd
-						BgNVHREEFjAUghJ3d3cucHVycGxlbWFzaC5jb20wCQYDVR0TBAIwADAOBgNVHQ8B
-						Af8EBAMCBaAwRQYDVR0fBD4wPDA6oDigNoY0aHR0cDovL1NWUlNlY3VyZS1HMy1j
-						cmwudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNybDBDBgNVHSAEPDA6MDgGCmCG
-						SAGG+EUBBzYwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVyaXNpZ24uY29t
-						L2NwczAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAU
-						DURcFlNEwYJ+HSCrJfQBY9i+eaUwdgYIKwYBBQUHAQEEajBoMCQGCCsGAQUFBzAB
-						hhhodHRwOi8vb2NzcC52ZXJpc2lnbi5jb20wQAYIKwYBBQUHMAKGNGh0dHA6Ly9T
-						VlJTZWN1cmUtRzMtYWlhLnZlcmlzaWduLmNvbS9TVlJTZWN1cmVHMy5jZXIwDQYJ
-						KoZIhvcNAQEFBQADggEBAHurI13mhFg7MlMd+A05vhU5VUHjx01azNOf36sWdg4e
-						hoIDEXpMW0BD1cXz87++5N5/BP7Zoo5JD9vA0+KK6t7RbFEEIxahsm3j2390lujt
-						7lyIIIzKRka/HE929NafGZ/ApR8Krc1ts+PkXVs5jZwMpb9MdL2J29FikkedfpMy
-						U9xky9R251Koq7UbBJuIAeVzUzRfcNC8ZNn17QOXwoGkhP61RnLlTPJbKSo9psag
-						2Q7lF55ncL2z/vvFT5gL0vu0kEQZ1up7xNkLy+nhtFLxrMgVGg5Npxgr2acWZvJ1
-						kssxNuC2fc8ocVlJPTZFvGOvgCZMP0sVZr+D3Ege3k8=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.purplemash.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.purplemash.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.purplemash.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.purplemash.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.purplemash.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.purplemash.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.purplemash.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.purplemash.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.purplemash.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.purplemash.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.purplemash.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.purplemash.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.purplemash.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.purplemash.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.purplemash.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">2Simple Software Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">2Simple Software Limited: Purple Mash</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.2simple.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Sam</GivenName>
-    <SurName>Barnett</SurName>
-    <EmailAddress>mailto:sam@2simple.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sam</GivenName>
-    <SurName>Barnett</SurName>
-    <EmailAddress>mailto:sam@2simple.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.qmsu.org-shibboleth.xml b/swamid-interfederations-2.0/www.qmsu.org-shibboleth.xml
deleted file mode 100644
index d1692092..00000000
--- a/swamid-interfederations-2.0/www.qmsu.org-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://www.qmsu.org/shibboleth">
-  <!--
-		This is a "Queen Mary SU" Shibboleth SP owned by Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.qmsu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qmsu.org/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qmsu.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.qmsu.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.qmsu.org/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qmsu.org/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qmsu.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.qmsu.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.qmsu.org/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.qmsu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.qmsu.org/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.qmsu.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.qmsu.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.qmsu.org/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.qmsu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Membership Solutions: Queen Mary SU</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.qmsu.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.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 36d25bf3..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: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.surfnet.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 xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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 width="65" height="65">https://static.surfconext.nl/media/sp/OAmarket.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>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 xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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.rcpsych.org-shibboleth.xml b/swamid-interfederations-2.0/www.rcpsych.org-shibboleth.xml
deleted file mode 100644
index d85d4415..00000000
--- a/swamid-interfederations-2.0/www.rcpsych.org-shibboleth.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rcpsych.org/shibboleth">
-  <!--
-		This is a "Journals of the Royal College of Psychiatrists" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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="2008-07-29T15:43:27Z">
-      <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://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Journals of the Royal College of Psychiatrists</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rcpsych.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rcpsych.org.xml b/swamid-interfederations-2.0/www.rcpsych.org.xml
deleted file mode 100644
index 525cd700..00000000
--- a/swamid-interfederations-2.0/www.rcpsych.org.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rcpsych.org/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rcpsych/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Journals of the Royal College of Psychiatrists</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Journals of the Royal College of Psychiatrists</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.rcpsych.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.reachoutcpd.com-shibboleth-sp.xml b/swamid-interfederations-2.0/www.reachoutcpd.com-shibboleth-sp.xml
deleted file mode 100644
index cad2a130..00000000
--- a/swamid-interfederations-2.0/www.reachoutcpd.com-shibboleth-sp.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://www.reachoutcpd.com/shibboleth-sp">
-  <!--
-		This is a "ReachOut CPD" Shibboleth SP for Twig World 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="2015-05-13T11:02:22Z">
-      <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.reachoutcpd.com/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.reachoutcpd.com/Shibboleth.sso/shibtest"/>
-      <init: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.reachoutcpd.com/Shibboleth.sso/RMUnify"/>
-      <init: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.reachoutcpd.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">ReachOut CPD</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Online access to ReachOutCPD</mdui:Description>
-        <mdui:Logo height="153" width="202">https://www.reachoutcpd.com/mdui-reachoutcpd-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKzCCAhOgAwIBAgIJALCh189m45NwMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3d3dy5yZWFjaG91dGNwZC5jb20wHhcNMTUwNTA4MTYwMjE2WhcNMjUwNTA1
-						MTYwMjE2WjAeMRwwGgYDVQQDExN3d3cucmVhY2hvdXRjcGQuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArk/tW7sQTr703EjMb/ToiW8W/nLHNQSU
-						sy2eSI7tdsa6aX/0PJ7UARu+oyGRGc1COgK6mjD06vsKW628CoY4O+zZHX+rNsyp
-						CYS2GiWWZl+g8J174WkqSSJb871wvc+koDxusFG6R3EhG6DA55RJpIq9rfMRMYiN
-						crQUMwa8U46XMjlN2o5y+2GrLfWlMKw/rMb5++dpYzR9r6F6C0Th5B0WxMlvmIfS
-						oZ9i/fzjtUzyGQTIqA00URIRvhCYX3XDcFeO/eFHkBNN67q4fOMLl7e+di2xtlT7
-						xMiWW0m8O+xlUwKVErm3RJkc25pSW9OG1RGd+/tavAc5+aIVjo77OQIDAQABo2ww
-						ajBJBgNVHREEQjBAghN3d3cucmVhY2hvdXRjcGQuY29thilodHRwczovL3d3dy5y
-						ZWFjaG91dGNwZC5jb20vc2hpYmJvbGV0aC1zcDAdBgNVHQ4EFgQUuYCQZejUVFjI
-						zWNT5KgMlKihZPQwDQYJKoZIhvcNAQEFBQADggEBAGXMAaV7D7xBqNDEdHZT+wmN
-						N5kx1L2eqcI09p3Fe+bD9E3k6hNTI3uCd7IOvmygzHhGYwegFrIx2sErGuzmhDDK
-						MHX7jSf/HpVVTVtNSwBlQ+DbKqP9j1lWj7uaf3FVTE0MfuLz/5uaCybtQsAl/63/
-						Yayvxe8lc7XpPHA6yHEdeDz/9lhvXEF28RzNcexf2iROS028lHQGEi5uelZTyNyY
-						mAvnSRd15cvz0L/XjDDwkE5VWWKwCDBeBJHCskUTW7ZMR+SqFuy7DsjFy+rf+P3M
-						AO1OuZ4E2l0BT6E/ESj62z3SCnMnaDkE7z4n64cXe7oZanfB5Wf3D/vI1HIiCes=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.reachoutcpd.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.reachoutcpd.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.reachoutcpd.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.reachoutcpd.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.reachoutcpd.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.reachoutcpd.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.reachoutcpd.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.reachoutcpd.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.reachoutcpd.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.reachoutcpd.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Twig World Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">ReachOut CPD</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.reachoutcpd.com/about-us/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Patricia</GivenName>
-    <SurName>Kemp</SurName>
-    <EmailAddress>mailto:pkemp@twig-world.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Munn</SurName>
-    <EmailAddress>mailto:dmunn@twig-world.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-bscidp.xml
deleted file mode 100644
index 53681b71..00000000
--- a/swamid-interfederations-2.0/www.rediris.es-sir-bscidp.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://www.rediris.es/sir/bscidp">
-  <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 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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">BSC - Barcelona Supercomputing Center</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider of Barcelona Supercomputing Center</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bsc.es</shibmd:Scope>
-    </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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/bsc/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/bsc/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/bsc/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/bsc/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/bsc/shib13/idp/aa.php"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">BSC</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">BSC</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Barcelona Supercomputing Center</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">Barcelona Supercomputing Center</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-crgidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml
deleted file mode 100644
index 29bf5e1a..00000000
--- a/swamid-interfederations-2.0/www.rediris.es-sir-crgidp.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/crgidp">
-  <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>
-    <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crg.es</shibmd:Scope>
-  </md:Extensions>
-  <md: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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">CRG - Centre for Genomic Regulation</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">CRG - Centre for Genomic Regulation</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider of Centre for Genomic Regulation</mdui:Description>
-        <mdui:Description xml:lang="es">El proveedor de identidad del centro de regulación genómica</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crg.es</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNpci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaGoSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiEvzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5hUrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbuIgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5yZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7iPHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVFc8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cbDC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/crg/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/crg/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/crg/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/crg/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/crg/shib13/idp/aa.php"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Centre for Genomic Regulation</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Centre for Genomic Regulation</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.crg.eu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>José Manuel Macías</md:SurName>
-    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-ehuidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-ehuidp.xml
deleted file mode 100644
index a2cde96b..00000000
--- a/swamid-interfederations-2.0/www.rediris.es-sir-ehuidp.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://www.rediris.es/sir/ehuidp">
-  <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 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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">EHU - University of the Basque Country</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">EHU - Universidad del País Vasco</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider of University of the Basque Country</mdui:Description>
-        <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad del País Vasco</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ehu.es</shibmd:Scope>
-    </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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/ehu/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/ehu/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/ehu/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/ehu/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/ehu/shib13/idp/aa.php"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">EHU</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">EHU</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="es">EHU - Universidad del País Vasco</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">EHU - University of the Basque Country</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-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 2c5aee4e..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/umaidp">
-  <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 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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UMA - University of Malaga</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">UMA - Universidad de Málaga</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider of University of Malaga</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>
-    <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: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"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uma/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uma/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uma/shib13/idp/aa.php"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UMA</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">UMA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UMA - University of Malaga</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">UMA - 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 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-umidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-umidp.xml
deleted file mode 100644
index e304415e..00000000
--- a/swamid-interfederations-2.0/www.rediris.es-sir-umidp.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://www.rediris.es/sir/umidp">
-  <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 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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UM - University of Murcia</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">UM - Universidad de Murcia</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider of University of Murcia</mdui:Description>
-        <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad de Murcia</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">um.es</shibmd:Scope>
-    </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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/um/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/um/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/um/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/um/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/um/shib13/idp/aa.php"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UM</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">UM</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Murcia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">Universidad de Murcia</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-unedidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml
deleted file mode 100644
index 9df7dfa7..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/unedidp">
-  <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 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>
-      <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>
-    <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: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"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uned/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uned/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uned/shib13/idp/aa.php"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UNED</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">UNED</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNED - Universidad Nacional de Educación a Distancia</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">UNED - 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 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-uocidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml
deleted file mode 100644
index fbf34181..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/uocidp">
-  <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 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>
-      <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>
-    <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: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"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uoc/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uoc/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uoc/shib13/idp/aa.php"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <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 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-upvidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-upvidp.xml
deleted file mode 100644
index 5fdc17ea..00000000
--- a/swamid-interfederations-2.0/www.rediris.es-sir-upvidp.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://www.rediris.es/sir/upvidp">
-  <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 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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UPV - Universitat Politècnica de València</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">UPV - Universitat Politècnica de València</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider of Universitat Politècnica de València</mdui:Description>
-        <mdui:Description xml:lang="es">El proveedor de identidad de la Universitat Politècnica de València</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upv.es</shibmd:Scope>
-    </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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/upv/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/upv/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/upv/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/upv/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/upv/shib13/idp/aa.php"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">UPV</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">UPV</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.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-urvidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml
deleted file mode 100644
index f5c73f80..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/urvidp">
-  <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 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>
-      <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>
-    <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: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"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/urv/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/urv/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/urv/shib13/idp/aa.php"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">URV</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">URV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">URV - Rovira i Virgili University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">URV - Universidad Rovira i Virgili</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="ca">URV - 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 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-usjidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-usjidp.xml
deleted file mode 100644
index 4c0f71ce..00000000
--- a/swamid-interfederations-2.0/www.rediris.es-sir-usjidp.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://www.rediris.es/sir/usjidp">
-  <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 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>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">USJ - Universidad San Jorge</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="es">USJ - Universidad San Jorge</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The Identity Provider of Universidad San Jorge</mdui:Description>
-        <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad San Jorge</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">usj.es</shibmd:Scope>
-    </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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/usj/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/usj/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/usj/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/usj/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/usj/shib13/idp/aa.php"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">USJ</md:OrganizationName>
-    <md:OrganizationName xml:lang="es">USJ</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universidad San Jorge</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="es">Universidad San Jorge</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.xml b/swamid-interfederations-2.0/www.rediris.es.xml
deleted file mode 100644
index eac93c8d..00000000
--- a/swamid-interfederations-2.0/www.rediris.es.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.reference-global.com.xml b/swamid-interfederations-2.0/www.reference-global.com.xml
deleted file mode 100644
index a7e771e7..00000000
--- a/swamid-interfederations-2.0/www.reference-global.com.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.reference-global.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.reference-global.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.reference-global.com,OU=Domain Control Validated - QuickSSL(R) Premium,OU=See www.geotrust.com/resources/cps (c)10,OU=GT86856594,O=www.reference-global.com,C=US,serialNumber=F64bTdYFo0e1I3PpwWZbE9qF8lv3gFV2</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDdTCCAt6gAwIBAgIDEK7BMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
-MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
-aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwNDEzMTEwMTE3WhcNMTIwNjEzMDc1OTM5
-WjCB/zEpMCcGA1UEBRMgRjY0YlRkWUZvMGUxSTNQcHdXWmJFOXFGOGx2M2dGVjIx
-CzAJBgNVBAYTAlVTMSEwHwYDVQQKExh3d3cucmVmZXJlbmNlLWdsb2JhbC5jb20x
-EzARBgNVBAsTCkdUODY4NTY1OTQxMTAvBgNVBAsTKFNlZSB3d3cuZ2VvdHJ1c3Qu
-Y29tL3Jlc291cmNlcy9jcHMgKGMpMTAxNzA1BgNVBAsTLkRvbWFpbiBDb250cm9s
-IFZhbGlkYXRlZCAtIFF1aWNrU1NMKFIpIFByZW1pdW0xITAfBgNVBAMTGHd3dy5y
-ZWZlcmVuY2UtZ2xvYmFsLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-xGW90TpoiSz3aeTJn9sgOiPDvGWY+otD9xeJS3xjeca/iBeTKYtUMI5aIjb4B+DE
-bOV6pJubHlfnGKuAfLhGUEoIgxLypy0uxHicRjp9g/STNeEkYVPDTL+NMv5nS2Iq
-y2E74Mxkpk0wEljnVN8zFZuTLYgGQNhIv2g6xWJUVD0CAwEAAaOBrjCBqzAOBgNV
-HQ8BAf8EBAMCBPAwHQYDVR0OBBYEFHryJ6Umw2HfC1wUYi/3m+iy0G2AMDoGA1Ud
-HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2VvdHJ1c3QuY29tL2NybHMvc2VjdXJl
-Y2EuY3JsMB8GA1UdIwQYMBaAFEjmaPkr0rKV10fYIyAQTzOYkJ/UMB0GA1UdJQQW
-MBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0BAQUFAAOBgQBCETxy0M7q
-+E5Eq5Pb/23enEvUZVkBjdSvWmhrqj2XAxpZcEbLzscbcvAvDd1tO6w9m4oXFfSz
-peQvMRaw/8/85Ud7RXRx9Ql1xVW74kWOjfD3WHzJpRnsO3iLqp+7mLPfbZJe+Hj6
-kmjmbkbwJaC+fTIr9vRbKHG7B23wgCJqHg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.reference-global.com/action/samlACS" index="0"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Walter de Gruyter GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">De Gruyter</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.degruyter.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Frank</GivenName>
-    <SurName>Kebbedies</SurName>
-    <EmailAddress>fkebbedies@atypon.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ulrike</GivenName>
-    <SurName>Engel</SurName>
-    <EmailAddress>ulrike.engel@degruyter.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml b/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.xml
deleted file mode 100644
index 65a35a5e..00000000
--- a/swamid-interfederations-2.0/www.refworks.com-shibboleth-sp.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://www.refworks.com/shibboleth/sp">
-  <!--
-		This is a "RefWorks" Shibboleth SP for Proquest Information and Learning 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="2008-07-29T14:31: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">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEQjCCAyqgAwIBAgIJAPi0oqIBy55FMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD
-						VQQGEwJVUzERMA8GA1UECBMITWFyeWxhbmQxETAPBgNVBAcTCEJldGhlc2RhMRUw
-						EwYDVQQKEwxQcm9RdWVzdCBMTEMxFTATBgNVBAsTDFJlZldvcmtzL0NPUzEZMBcG
-						A1UEAxMQd3d3LnJlZndvcmtzLmNvbTEjMCEGCSqGSIb3DQEJARYUbmtlbm5leUBy
-						ZWZ3b3Jrcy5jb20wHhcNMDgxMjE1MjIwMzA1WhcNMTgxMjEzMjIwMzA1WjCBoTEL
-						MAkGA1UEBhMCVVMxETAPBgNVBAgTCE1hcnlsYW5kMREwDwYDVQQHEwhCZXRoZXNk
-						YTEVMBMGA1UEChMMUHJvUXVlc3QgTExDMRUwEwYDVQQLEwxSZWZXb3Jrcy9DT1Mx
-						GTAXBgNVBAMTEHd3dy5yZWZ3b3Jrcy5jb20xIzAhBgkqhkiG9w0BCQEWFG5rZW5u
-						ZXlAcmVmd29ya3MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-						0BNHVpHg+SvSXBH7Z9XWTpiRLEWISoqsL6N1hR7DaJeM7lqIkH3OuL9g1q76/75v
-						3zrV0QqSF1xj7rM1Lq5ZJd8O2mLdlWHZvdYSmJQNu5hrnOcqv5eDuc2GsXaaI7FE
-						+ipw4xamo8ei3wm0BP3hCHGRS71iwk3lwVteSfWDpGxPBNTR1szx0tazTH2gwkmN
-						Txlcxkim+tgdH4etIyCSgweRvb/9jG6y/nRvBB2j7CykzfM2E2tkA63cfax+P5Wd
-						Crk7CCcgNrIcWr9dmP5wyerwbW1u9wZJOJYAhZDEY497h1bRxXJcwT+P1ZhYTJdk
-						VCbAFSgxsNwOEtVGIJ7JNwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIB
-						DQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUqaa3
-						a9bD274+w6y7JHvNGkoZRs4wHwYDVR0jBBgwFoAUqaa3a9bD274+w6y7JHvNGkoZ
-						Rs4wDQYJKoZIhvcNAQEFBQADggEBAHjTPGg2GmOXGh0cboOOkFYXtXZmk3wXePyr
-						Fa8OHe5CqEhZhcidRq1IrPt/QDF76KofX43SnpJ24Hha1RuXDKQu5vV387TwUTdl
-						ufWJrWpAZybWZ55OMpG1crHbuozEFW+GGJ34s4e6fygeIcLTigkN6rf5WkbLBVyX
-						6qqB4GNdfqj+18xbVaM7yWMk0ShlBzFMl15DO25zoAh+l/J3Ti1vDbbusjE27H7D
-						207Q3sTfK+tvRQVkFrLeYce9IOUYgMS7f4drQAR/6pAnSXmMLzAFc5s896/iGDEX
-						afJHv7LMPbJAn4/aPxZ+VDE8GBrYzc8sOy5DZzjvZ6uvw8VGMEI=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.refworks.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.refworks.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.refworks.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.refworks.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.refworks.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.refworks.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.refworks.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.refworks.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.refworks.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.refworks.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.refworks.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.refworks.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.refworks.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.refworks.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.refworks.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Proquest Information and Learning Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">RefWorks</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.refworks.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Technical Support Team</GivenName>
-    <EmailAddress>mailto:support@proquest.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sanjay</GivenName>
-    <SurName>Joshi</SurName>
-    <EmailAddress>mailto:Sanjay.Joshi@proquest.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rememberingscotlandatwar.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.rememberingscotlandatwar.org.uk-shibboleth.xml
deleted file mode 100644
index 92ec6f72..00000000
--- a/swamid-interfederations-2.0/www.rememberingscotlandatwar.org.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://www.rememberingscotlandatwar.org.uk/shibboleth">
-  <!--
-		This is a "Remembering Scotland at War" Shibboleth SP for Screenmedia Design Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-02-08T15:58:00Z"/>
-  </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://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIJALeFq3bo7Ze3MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
-						BAMTIGRzdnIwMDg4MDguc2NyZWVubWVkaWFob3N0LmNvLnVrMB4XDTEwMDIwMjEx
-						MDQ1NFoXDTIwMDEzMTExMDQ1NFowKzEpMCcGA1UEAxMgZHN2cjAwODgwOC5zY3Jl
-						ZW5tZWRpYWhvc3QuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCunuAbL1nB1VndiIfV9Hb3Y03c0PCbeKLPhKOQ5rH+An2g/hJbkBF0BWYmn5+E
-						2rPO4wEm+bFp517Rf30uBGTF4wQH7gx2n7PxVglF59jtlz4baMA3oB+1GJsEyWxS
-						zKMZLOPsVF4N1bn2TdoGDgWFjoEQ48U0lcRdpizoqrH6/0NzLZNrRdJD8VF58wt2
-						Z4qIHpg7yTVn4b8XXjwmgAG6HdvGYjYVegZ6MeEyKBLmiSRvhNuvMqdDCOJ8faBn
-						p0KlFV3dEdozo8cUdRkaE0ymcrJWxGJqVYIklf+lZM/MkEPg6c6YKNr45bXggAPT
-						k5dvuO3usoRBsCILY+RimGD/AgMBAAGjTjBMMCsGA1UdEQQkMCKCIGRzdnIwMDg4
-						MDguc2NyZWVubWVkaWFob3N0LmNvLnVrMB0GA1UdDgQWBBSDyYRWFylm8mEJiCCT
-						Edrvtk+jszANBgkqhkiG9w0BAQUFAAOCAQEAZpGY80g01GaQsb4vZK4AtugiMRkd
-						BadzM+Na1TGytZJCCo9ykYCnNZ6DawCgDYzgQNoyp4Ys+h7SzmI8XN4zyXY5dWJv
-						7varqf1JScLFBkrMHeYVJu+RkWvXZX/JKJwA2Dq21nk2JD+A5VELZLpqMb9+pfw5
-						3V8GlKep4X0lkbg/bAvXp5VESrT/Rp9x1LYSd5Wzd5mZFxL+ZeRPZ96k/4rcDvNN
-						0XUC+VnGeOSn+62j3HOjkFpSxSA3tj2en+dO7IjMtNWHQhtxm8R81do8n+DFMk03
-						zwQe2dDHy9r0Ggxc22wJ2gbPmb+jMME2uJvNZyFpl05VI7CCd0V0o7MRAg==
-					</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>
-						MIIDJzCCAg+gAwIBAgIJALeFq3bo7Ze3MA0GCSqGSIb3DQEBBQUAMCsxKTAnBgNV
-						BAMTIGRzdnIwMDg4MDguc2NyZWVubWVkaWFob3N0LmNvLnVrMB4XDTEwMDIwMjEx
-						MDQ1NFoXDTIwMDEzMTExMDQ1NFowKzEpMCcGA1UEAxMgZHN2cjAwODgwOC5zY3Jl
-						ZW5tZWRpYWhvc3QuY28udWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCunuAbL1nB1VndiIfV9Hb3Y03c0PCbeKLPhKOQ5rH+An2g/hJbkBF0BWYmn5+E
-						2rPO4wEm+bFp517Rf30uBGTF4wQH7gx2n7PxVglF59jtlz4baMA3oB+1GJsEyWxS
-						zKMZLOPsVF4N1bn2TdoGDgWFjoEQ48U0lcRdpizoqrH6/0NzLZNrRdJD8VF58wt2
-						Z4qIHpg7yTVn4b8XXjwmgAG6HdvGYjYVegZ6MeEyKBLmiSRvhNuvMqdDCOJ8faBn
-						p0KlFV3dEdozo8cUdRkaE0ymcrJWxGJqVYIklf+lZM/MkEPg6c6YKNr45bXggAPT
-						k5dvuO3usoRBsCILY+RimGD/AgMBAAGjTjBMMCsGA1UdEQQkMCKCIGRzdnIwMDg4
-						MDguc2NyZWVubWVkaWFob3N0LmNvLnVrMB0GA1UdDgQWBBSDyYRWFylm8mEJiCCT
-						Edrvtk+jszANBgkqhkiG9w0BAQUFAAOCAQEAZpGY80g01GaQsb4vZK4AtugiMRkd
-						BadzM+Na1TGytZJCCo9ykYCnNZ6DawCgDYzgQNoyp4Ys+h7SzmI8XN4zyXY5dWJv
-						7varqf1JScLFBkrMHeYVJu+RkWvXZX/JKJwA2Dq21nk2JD+A5VELZLpqMb9+pfw5
-						3V8GlKep4X0lkbg/bAvXp5VESrT/Rp9x1LYSd5Wzd5mZFxL+ZeRPZ96k/4rcDvNN
-						0XUC+VnGeOSn+62j3HOjkFpSxSA3tj2en+dO7IjMtNWHQhtxm8R81do8n+DFMk03
-						zwQe2dDHy9r0Ggxc22wJ2gbPmb+jMME2uJvNZyFpl05VI7CCd0V0o7MRAg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rememberingscotlandatwar.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Screenmedia Design Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Remembering Scotland at War</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.museumsgalleriesscotland.org.uk/who-we-are/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Jon</GivenName>
-    <SurName>Carlos</SurName>
-    <EmailAddress>mailto:jon@screenmedia.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jon</GivenName>
-    <SurName>Carlos</SurName>
-    <EmailAddress>mailto:jon@screenmedia.co.uk</EmailAddress>
-  </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 62e1eaa3..00000000
--- a/swamid-interfederations-2.0/www.researchprofessional.com-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://www.researchprofessional.com/shibboleth">
-  <!--
-		This is a "Research Professional" 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#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"/>
-  </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:InformationURL xml:lang="en">http://info.researchprofessional.com</mdui:InformationURL>
-      </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/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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"/>
-    </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"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" 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"/>
-    </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.rguunion.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.rguunion.co.uk-shibboleth.xml
deleted file mode 100644
index 037b21f7..00000000
--- a/swamid-interfederations-2.0/www.rguunion.co.uk-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://www.rguunion.co.uk/shibboleth">
-  <!--
-		This is a "Robert Gordon Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-03-03T14:39:06Z">
-      <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.rguunion.co.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rguunion.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rguunion.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rguunion.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rguunion.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rguunion.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rguunion.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Robert Gordon Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rguunion.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ripdev.co.uk-oa-metadata.xml b/swamid-interfederations-2.0/www.ripdev.co.uk-oa-metadata.xml
deleted file mode 100644
index ffe6d38d..00000000
--- a/swamid-interfederations-2.0/www.ripdev.co.uk-oa-metadata.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ripdev.co.uk/oa/metadata">
-  <!--
-		This is a "Research in Practice (Development)" OpenAthens SP for The Dartington Hall Trust.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-02T16:24:02Z">
-      <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Research in Practice (Development)</mdui:DisplayName>
-        <mdui:Logo height="72" width="161">https://rip.org.uk/assets/_userfiles/images/general/Partner_logos/rip__logo_thumb_161_72.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDiDCCAnCgAwIBAgIJAL/6MNP9H2wJMA0GCSqGSIb3DQEBBQUAMDYxGTAXBgNV
-						BAoTEFRlc3QgYXBwbGljYXRpb24xGTAXBgNVBAMTEHd3dy5yaXBkZXYuY28udWsw
-						HhcNMTQwOTAyMTU1NTI2WhcNMjQwODMwMTU1NTI2WjA2MRkwFwYDVQQKExBUZXN0
-						IGFwcGxpY2F0aW9uMRkwFwYDVQQDExB3d3cucmlwZGV2LmNvLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlcdLQ2hQWS+SRjt5QEgZ/OLdp0B4OZF
-						8+fA4zz6ChjVctZNxXj2+nv9dTNNqLdBYM60fUzEO5aw0ZSwGfsqydi2ChNr0tYV
-						gYWIhptsF09GsuRig396jXk76MnHIjEyPPkd38tpUJadrJL3ON+5RA8ZT/wvPH3f
-						NE5t3Skig+sfSHm98aOCUPmHKHHRMGyZcKgVtQ4Jak8NpCvVbKRZBLrMGrR9Niuf
-						+/I/A+7bye8KZWtdj7gheURvnWUV/90WDJyAZ1hAEweWXdezAm/h6o1xjlSQ67Um
-						sP10MGcIn0eybKwMjEW6Z275gKArXof9A0+S2rxhRxTejg/bbEBDLwIDAQABo4GY
-						MIGVMB0GA1UdDgQWBBQY/i2dHz4lM3HxLuYTVY0gzyCvHDBmBgNVHSMEXzBdgBQY
-						/i2dHz4lM3HxLuYTVY0gzyCvHKE6pDgwNjEZMBcGA1UEChMQVGVzdCBhcHBsaWNh
-						dGlvbjEZMBcGA1UEAxMQd3d3LnJpcGRldi5jby51a4IJAL/6MNP9H2wJMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHewb7qtFmo7XZOJExxQ92nS0EA9
-						BXbvnO/m1PPsk8/86U5FWYNmXFBROF6W5Xhoi+6YsqmVUxtnpCKioDlG0q8j4n0d
-						aF9IifSckmrFoyOR3xQtqxFD+33AdXMliM9X8YRliEnsK7pAbVrQKx5lgfNItDUq
-						fVnBpVHyc2It1F4wXI/Q4AAOIReAfWJhOebzZX1HJR35jgW4e7k43ws6+ugwePoT
-						Q/e1eBcyJbEwzX7XZGlIA2LLqfCTaUdBKxKv8tM8+ozleQsBqApwAsU3v/fMpiKP
-						9GcwjlRRJJrPgrX4dEDHCj2YUhnKS3CIgxT7eVW0OC3EoJ2P26mL6RWyWOY=
-					</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>
-						MIIDiDCCAnCgAwIBAgIJAL/6MNP9H2wJMA0GCSqGSIb3DQEBBQUAMDYxGTAXBgNV
-						BAoTEFRlc3QgYXBwbGljYXRpb24xGTAXBgNVBAMTEHd3dy5yaXBkZXYuY28udWsw
-						HhcNMTQwOTAyMTU1NTI2WhcNMjQwODMwMTU1NTI2WjA2MRkwFwYDVQQKExBUZXN0
-						IGFwcGxpY2F0aW9uMRkwFwYDVQQDExB3d3cucmlwZGV2LmNvLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlcdLQ2hQWS+SRjt5QEgZ/OLdp0B4OZF
-						8+fA4zz6ChjVctZNxXj2+nv9dTNNqLdBYM60fUzEO5aw0ZSwGfsqydi2ChNr0tYV
-						gYWIhptsF09GsuRig396jXk76MnHIjEyPPkd38tpUJadrJL3ON+5RA8ZT/wvPH3f
-						NE5t3Skig+sfSHm98aOCUPmHKHHRMGyZcKgVtQ4Jak8NpCvVbKRZBLrMGrR9Niuf
-						+/I/A+7bye8KZWtdj7gheURvnWUV/90WDJyAZ1hAEweWXdezAm/h6o1xjlSQ67Um
-						sP10MGcIn0eybKwMjEW6Z275gKArXof9A0+S2rxhRxTejg/bbEBDLwIDAQABo4GY
-						MIGVMB0GA1UdDgQWBBQY/i2dHz4lM3HxLuYTVY0gzyCvHDBmBgNVHSMEXzBdgBQY
-						/i2dHz4lM3HxLuYTVY0gzyCvHKE6pDgwNjEZMBcGA1UEChMQVGVzdCBhcHBsaWNh
-						dGlvbjEZMBcGA1UEAxMQd3d3LnJpcGRldi5jby51a4IJAL/6MNP9H2wJMAwGA1Ud
-						EwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHewb7qtFmo7XZOJExxQ92nS0EA9
-						BXbvnO/m1PPsk8/86U5FWYNmXFBROF6W5Xhoi+6YsqmVUxtnpCKioDlG0q8j4n0d
-						aF9IifSckmrFoyOR3xQtqxFD+33AdXMliM9X8YRliEnsK7pAbVrQKx5lgfNItDUq
-						fVnBpVHyc2It1F4wXI/Q4AAOIReAfWJhOebzZX1HJR35jgW4e7k43ws6+ugwePoT
-						Q/e1eBcyJbEwzX7XZGlIA2LLqfCTaUdBKxKv8tM8+ozleQsBqApwAsU3v/fMpiKP
-						9GcwjlRRJJrPgrX4dEDHCj2YUhnKS3CIgxT7eVW0OC3EoJ2P26mL6RWyWOY=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ripdev.co.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ripdev.co.uk/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ripdev.co.uk/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ripdev.co.uk/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Dartington Hall Trust</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Research in Practice (Development)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://rip.org.uk/about-us/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dawid</GivenName>
-    <SurName>Maeser</SurName>
-    <EmailAddress>mailto:dawid.maeser@rip.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Dawid</GivenName>
-    <SurName>Maeser</SurName>
-    <EmailAddress>mailto:dawid.maeser@rip.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ripfa.org.uk-oa-metadata.xml b/swamid-interfederations-2.0/www.ripfa.org.uk-oa-metadata.xml
deleted file mode 100644
index 33e0ea22..00000000
--- a/swamid-interfederations-2.0/www.ripfa.org.uk-oa-metadata.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ripfa.org.uk/oa/metadata">
-  <!--
-		This is a "Research in Practice for Adults (RIPFA)" OpenAthens SP for The Dartington Hall Trust.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-01-21T13:50:02Z">
-      <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">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Research in Practice for Adults (RIPFA)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Research in Practice for Adults (RIPFA)</mdui:Description>
-        <mdui:Logo height="76" width="132">https://www.ripfa.org.uk/images/ripfa_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>
-						MIIDWzCCAkOgAwIBAgIJAP9VQ0E4SPcHMA0GCSqGSIb3DQEBBQUAMCcxDjAMBgNV
-						BAoTBVJpUGZBMRUwEwYDVQQDEwxyaXBmYS5vcmcudWswHhcNMTQwMTA1MDkwOTUx
-						WhcNMjQwMTAzMDkwOTUxWjAnMQ4wDAYDVQQKEwVSaVBmQTEVMBMGA1UEAxMMcmlw
-						ZmEub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzo3T6m/Q
-						IHr+ZiZqoRWpNcavL2ObQCXGrKMGo9SP/zsKZGSTWj0w+pKNTQAC+o4issxq+2f2
-						cwBBKQmaJmvs+6FDzynRZ4RZTrCgT0ZV6wiqnHSRALLDEe1GatE5YatnAl9JqDcy
-						oOC144EXG3Q2z31ts0/9Xbmz9VPvfBPcXZnhBmdeqKLoCM3nxOMIiiNwp4gZID+y
-						ORveB5zn7lg4vfW63/fCN2ea4Vwbg4wUcwwBZplDn+z2wApU92OA9/WTYIK6gtgw
-						JalJXnFI9yCzQyBQUYGpJi8hSGX0qyT69/7r1QdBg2pIE5Lw/b79lN4kdXFhrX3u
-						BAOMKUiKpok3+wIDAQABo4GJMIGGMB0GA1UdDgQWBBR48j+MpOWAOUt0lOLls9z/
-						OgulhzBXBgNVHSMEUDBOgBR48j+MpOWAOUt0lOLls9z/Ogulh6ErpCkwJzEOMAwG
-						A1UEChMFUmlQZkExFTATBgNVBAMTDHJpcGZhLm9yZy51a4IJAP9VQ0E4SPcHMAwG
-						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEBIsOYvJUIw4bpOEHHOIYwt
-						ZHaIfAyIjoW2jZ0MyEjHUS5V/pPWgf6shc5oG8OgDkgp7AumeexNA6L4EEae+9N2
-						oWq3NIKXZazjdDeVR7w7RAmMRqc0ApAE3OT4jemdM6kbqqo+GRK4XhvtMD0O9BWx
-						LT5rvxT/bO7gASiBWGDIYiXrtoc/FPu33Sy4JQrbUZLU/fpfRfwfrzA9f2+6SRJQ
-						Md1x+QWoWBLqma/MqkZcUrdm2BlEZD2HCtv6lzaTy0t8jSLyaeYxHhemrVGZpcHm
-						m1WhrEyo1V1gcUfonTxnCTTA6Wp4Qz2rVwAwpzfDPa7vS6rlp+XgtPhVXqNWfwE=
-					</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>
-						MIIDWzCCAkOgAwIBAgIJAP9VQ0E4SPcHMA0GCSqGSIb3DQEBBQUAMCcxDjAMBgNV
-						BAoTBVJpUGZBMRUwEwYDVQQDEwxyaXBmYS5vcmcudWswHhcNMTQwMTA1MDkwOTUx
-						WhcNMjQwMTAzMDkwOTUxWjAnMQ4wDAYDVQQKEwVSaVBmQTEVMBMGA1UEAxMMcmlw
-						ZmEub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzo3T6m/Q
-						IHr+ZiZqoRWpNcavL2ObQCXGrKMGo9SP/zsKZGSTWj0w+pKNTQAC+o4issxq+2f2
-						cwBBKQmaJmvs+6FDzynRZ4RZTrCgT0ZV6wiqnHSRALLDEe1GatE5YatnAl9JqDcy
-						oOC144EXG3Q2z31ts0/9Xbmz9VPvfBPcXZnhBmdeqKLoCM3nxOMIiiNwp4gZID+y
-						ORveB5zn7lg4vfW63/fCN2ea4Vwbg4wUcwwBZplDn+z2wApU92OA9/WTYIK6gtgw
-						JalJXnFI9yCzQyBQUYGpJi8hSGX0qyT69/7r1QdBg2pIE5Lw/b79lN4kdXFhrX3u
-						BAOMKUiKpok3+wIDAQABo4GJMIGGMB0GA1UdDgQWBBR48j+MpOWAOUt0lOLls9z/
-						OgulhzBXBgNVHSMEUDBOgBR48j+MpOWAOUt0lOLls9z/Ogulh6ErpCkwJzEOMAwG
-						A1UEChMFUmlQZkExFTATBgNVBAMTDHJpcGZhLm9yZy51a4IJAP9VQ0E4SPcHMAwG
-						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAEBIsOYvJUIw4bpOEHHOIYwt
-						ZHaIfAyIjoW2jZ0MyEjHUS5V/pPWgf6shc5oG8OgDkgp7AumeexNA6L4EEae+9N2
-						oWq3NIKXZazjdDeVR7w7RAmMRqc0ApAE3OT4jemdM6kbqqo+GRK4XhvtMD0O9BWx
-						LT5rvxT/bO7gASiBWGDIYiXrtoc/FPu33Sy4JQrbUZLU/fpfRfwfrzA9f2+6SRJQ
-						Md1x+QWoWBLqma/MqkZcUrdm2BlEZD2HCtv6lzaTy0t8jSLyaeYxHhemrVGZpcHm
-						m1WhrEyo1V1gcUfonTxnCTTA6Wp4Qz2rVwAwpzfDPa7vS6rlp+XgtPhVXqNWfwE=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ripfa.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ripfa.org.uk/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ripfa.org.uk/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ripfa.org.uk/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Dartington Hall Trust</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Research in Practice for Adults (RIPFA)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rip.org.uk/about-us</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Robin</GivenName>
-    <SurName>Catling</SurName>
-    <EmailAddress>mailto:robin.catling@ripfa.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Mangan</SurName>
-    <EmailAddress>mailto:paul@headmonaut.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ripfa.org.uk-openathens.xml b/swamid-interfederations-2.0/www.ripfa.org.uk-openathens.xml
deleted file mode 100644
index 74bb4274..00000000
--- a/swamid-interfederations-2.0/www.ripfa.org.uk-openathens.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://www.ripfa.org.uk/openathens">
-  <!--
-		This is a "Research in Practice for Adults" OpenAthens SP for The Dartington Hall Trust.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-02-28T13:25:18Z"/>
-  </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>
-						MIID7TCCAtWgAwIBAgIJAMbb5T7zPYR8MA0GCSqGSIb3DQEBBQUAMFcxKDAmBgNV
-						BAoTH1Jlc2VhcmNoIGluIFByYWN0aWNlIGZvciBBZHVsdHMxKzApBgNVBAMTInJl
-						c2VhcmNoaW5wcmFjdGljZWZvcmFkdWx0cy5vcmcudWswHhcNMTMwMzEyMTgwNzQx
-						WhcNMjMwMzEwMTgwNzQxWjBXMSgwJgYDVQQKEx9SZXNlYXJjaCBpbiBQcmFjdGlj
-						ZSBmb3IgQWR1bHRzMSswKQYDVQQDEyJyZXNlYXJjaGlucHJhY3RpY2Vmb3JhZHVs
-						dHMub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs0+abLKR
-						2q3TOwffRMpTBYdYXnUAfvedOXW60IZLw1Af+ByabKXC7abynfHDMYNwyPEOwZAn
-						TT+czovqmCAQEd9PpVX9iCSTP4suKy1B1M9+Ae8h0AHvKtGXGubU+WhJg6lsRXZR
-						5CwA2P8BabMtnP6aDQ/i6C6Jy4IBQjVn/KdYkjez/zWcGICC47pLCp6C2kh9I/kp
-						DaxyF/KLo7oqZmrGWaoMtrIUOwTs19CbF44JUBVeQ5STFlYAuQQqBTGvaOoVZRKx
-						6XhckRq6htG3MgbWIJjXpfAt9Ehpixv0c2CP4yN7GRGPGoc2umN5cR1PLdrUDTXz
-						lJLUk1B4BxW3JwIDAQABo4G7MIG4MB0GA1UdDgQWBBTdCZQfxzH22Dvs5XDGiSVW
-						Wfe16zCBiAYDVR0jBIGAMH6AFN0JlB/HMfbYO+zlcMaJJVZZ97XroVukWTBXMSgw
-						JgYDVQQKEx9SZXNlYXJjaCBpbiBQcmFjdGljZSBmb3IgQWR1bHRzMSswKQYDVQQD
-						EyJyZXNlYXJjaGlucHJhY3RpY2Vmb3JhZHVsdHMub3JnLnVrggkAxtvlPvM9hHww
-						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEABe6Xc8hDvMtXB83WH233
-						scyqQy98iQ7MSREgOriOHqdQHCiroNBp6Nhd+wO/wdnxK+14sllcX7Fk/4Sp2spz
-						XsBh/HKt2qf+tPOsRAUEkIooVwMeCRG5vPxm2nGxRVAbxp9Cg+LNQnMSXjBxAkeb
-						kN/aSr67S10Sy2/9h91RXWfpchHkj3qN+1lcdMd1CPLXDz1HqGeE4rxz5oowI+qQ
-						Q1tzByG2zLblM/DwaGQFO1A7/6RuxIAszVVM/hkmAnGfggQbBzspo78+TK8w0Eqs
-						SVsAm2b+nTeCEBxZq2M6Wo/SfXSpuKp3zMbfn+E/nhGd6kxDCl1OcDWi8FAC5/fD
-						MQ==
-					</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>
-						MIID7TCCAtWgAwIBAgIJAMbb5T7zPYR8MA0GCSqGSIb3DQEBBQUAMFcxKDAmBgNV
-						BAoTH1Jlc2VhcmNoIGluIFByYWN0aWNlIGZvciBBZHVsdHMxKzApBgNVBAMTInJl
-						c2VhcmNoaW5wcmFjdGljZWZvcmFkdWx0cy5vcmcudWswHhcNMTMwMzEyMTgwNzQx
-						WhcNMjMwMzEwMTgwNzQxWjBXMSgwJgYDVQQKEx9SZXNlYXJjaCBpbiBQcmFjdGlj
-						ZSBmb3IgQWR1bHRzMSswKQYDVQQDEyJyZXNlYXJjaGlucHJhY3RpY2Vmb3JhZHVs
-						dHMub3JnLnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs0+abLKR
-						2q3TOwffRMpTBYdYXnUAfvedOXW60IZLw1Af+ByabKXC7abynfHDMYNwyPEOwZAn
-						TT+czovqmCAQEd9PpVX9iCSTP4suKy1B1M9+Ae8h0AHvKtGXGubU+WhJg6lsRXZR
-						5CwA2P8BabMtnP6aDQ/i6C6Jy4IBQjVn/KdYkjez/zWcGICC47pLCp6C2kh9I/kp
-						DaxyF/KLo7oqZmrGWaoMtrIUOwTs19CbF44JUBVeQ5STFlYAuQQqBTGvaOoVZRKx
-						6XhckRq6htG3MgbWIJjXpfAt9Ehpixv0c2CP4yN7GRGPGoc2umN5cR1PLdrUDTXz
-						lJLUk1B4BxW3JwIDAQABo4G7MIG4MB0GA1UdDgQWBBTdCZQfxzH22Dvs5XDGiSVW
-						Wfe16zCBiAYDVR0jBIGAMH6AFN0JlB/HMfbYO+zlcMaJJVZZ97XroVukWTBXMSgw
-						JgYDVQQKEx9SZXNlYXJjaCBpbiBQcmFjdGljZSBmb3IgQWR1bHRzMSswKQYDVQQD
-						EyJyZXNlYXJjaGlucHJhY3RpY2Vmb3JhZHVsdHMub3JnLnVrggkAxtvlPvM9hHww
-						DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEABe6Xc8hDvMtXB83WH233
-						scyqQy98iQ7MSREgOriOHqdQHCiroNBp6Nhd+wO/wdnxK+14sllcX7Fk/4Sp2spz
-						XsBh/HKt2qf+tPOsRAUEkIooVwMeCRG5vPxm2nGxRVAbxp9Cg+LNQnMSXjBxAkeb
-						kN/aSr67S10Sy2/9h91RXWfpchHkj3qN+1lcdMd1CPLXDz1HqGeE4rxz5oowI+qQ
-						Q1tzByG2zLblM/DwaGQFO1A7/6RuxIAszVVM/hkmAnGfggQbBzspo78+TK8w0Eqs
-						SVsAm2b+nTeCEBxZq2M6Wo/SfXSpuKp3zMbfn+E/nhGd6kxDCl1OcDWi8FAC5/fD
-						MQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.researchinpracticeforadults.org.uk/oa/auth/rcv/shib/post" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.researchinpracticeforadults.org.uk/oa/auth/rcv/shib/art" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.researchinpracticeforadults.org.uk/oa/auth/rcv/saml2/post" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.researchinpracticeforadults.org.uk/oa/auth/rcv/saml2/art" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Dartington Hall Trust</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Research in Practice for Adults</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ripfa.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Mangan</SurName>
-    <EmailAddress>mailto:Paul@headmonaut.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Mangan</SurName>
-    <EmailAddress>mailto:Paul@headmonaut.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml b/swamid-interfederations-2.0/www.rocksbackpages.com-shibboleth.xml
deleted file mode 100644
index 3c298e89..00000000
--- a/swamid-interfederations-2.0/www.rocksbackpages.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.rocksbackpages.com/shibboleth">
-  <!--
-		This is a "Rock's Backpages" Shibboleth SP for Backpages 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="2008-03-04T16:02: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://www.rocksbackpages.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.rocksbackpages.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVDCCAjwCCQCtwU/QO/+YATANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJH
-						QjEPMA0GA1UECBMGTG9uZG9uMQ8wDQYDVQQHEwZMb25kb24xGjAYBgNVBAoTEUJh
-						Y2twYWdlcyBMaW1pdGVkMR8wHQYDVQQDExZ3d3cucm9ja3NiYWNrcGFnZXMuY29t
-						MB4XDTE0MDQxMDA4MDQ1MloXDTM0MDQwNTA4MDQ1MlowbDELMAkGA1UEBhMCR0Ix
-						DzANBgNVBAgTBkxvbmRvbjEPMA0GA1UEBxMGTG9uZG9uMRowGAYDVQQKExFCYWNr
-						cGFnZXMgTGltaXRlZDEfMB0GA1UEAxMWd3d3LnJvY2tzYmFja3BhZ2VzLmNvbTCC
-						ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3tyz8rgNIqPcwgzPedsKqb
-						mSIri8V5XFJQC7WDP87T+Mx9HA4O+f9ImX/u6bwflg4MvKquYO3on6v5GbWZ6Z5p
-						elAecnNW45S7N61gqZ1tKKBkXODYe7GrnT5C9ykHdrfgh0Byz/eZFCdKKZ+yoLeR
-						Sb6LQ716VjgQH7V1UqKETwjZw5EwXt3PPJG3Mz5MfruHr9Xnp0NpdL4YzqwGGC7O
-						SXFNktpk2JN1ffVKJl4fTwBS7gY1/Si0qko5Rxb4QeWjQLxmkg0RzxD0aLg74Ijb
-						BC1sGtetMmUHb3ltLBMmtFCCNVR/hlDMMWpsByrpeHEMv2026XTPWOFQuKHcPvkC
-						AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAs8/NlVj6QBC5k+ZTE8ZONZEbVfHEwm/Z
-						8WHEYvL24czGzX6E6QnSzCjZUZ2COF4wF1NnMx/31whFw03+coD+WCWZesug5rFN
-						4Qm2khl/5nffXGcFRCx4aIPLvjTgwGRzHVIf232gMP0F7p1lPnTP1KH5kNOGAFeR
-						7N6sNuweGigZNnG1LxoJwDvgoYHX2Mk4vAg2CuWpSwvZoQZBt8OE1P+rgNXxXN8Z
-						hIxCmOazWe8SW37boax/Z9O+VLY0L89MNy8ecMYwzxItMoT9NTx5eUeQQUCZ4KJu
-						HA3BA/dZ2JlmxV3ih36IbgVXqQUiJDFz7ts7DJ2zZwnmwAqSXaXT8w==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.rocksbackpages.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rocksbackpages.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rocksbackpages.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Backpages Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Backpages Limited: Rock's Backpages</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rocksbackpages.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Paul</GivenName>
-    <SurName>Kelly</SurName>
-    <EmailAddress>mailto:paul@rocksbackpages.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Paul</GivenName>
-    <SurName>Kelly</SurName>
-    <EmailAddress>mailto:paul@rocksbackpages.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml b/swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml
deleted file mode 100644
index 5a14a766..00000000
--- a/swamid-interfederations-2.0/www.rsmjournals.com-shibboleth.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rsmjournals.com/shibboleth">
-  <!--
-		This is a "The Royal Society of Medicine Press Journals" Shibboleth SP for HighWire Press, Inc.
-	-->
-  <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="2008-07-29T15:43:27Z"/>
-  </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://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEfDCCA2SgAwIBAgIJAMTRVlqTJ11lMA0GCSqGSIb3DQEBBQUAMIG+MQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBD
-						aXR5MRcwFQYDVQQKEw5IaWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUx
-						IDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkB
-						FiZzaGliYm9sZXRoLWFkbWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTAeFw0xNDA0
-						MTUxOTQzMDNaFw0yNDA0MTIxOTQzMDNaMIG+MQswCQYDVQQGEwJVUzETMBEGA1UE
-						CBMKQ2FsaWZvcm5pYTEVMBMGA1UEBxMMUmVkd29vZCBDaXR5MRcwFQYDVQQKEw5I
-						aWdoV2lyZSBQcmVzczERMA8GA1UECxMISGlnaFdpcmUxIDAeBgNVBAMTF3NoaWJi
-						b2xldGguaGlnaHdpcmUub3JnMTUwMwYJKoZIhvcNAQkBFiZzaGliYm9sZXRoLWFk
-						bWluQGhpZ2h3aXJlLnN0YW5mb3JkLmVkdTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBALPB99M9iWjentrddY/rLgzKn1X0j4Ao191iyiowBBt/r/pmn2oz
-						frbONkkTVBB++mNtiufK6jyKnBM5mffPOkXHRo+K1DQec7TvpQ1PmLv/BpBgPrr9
-						ldViOSUnYJuB0IgJVV8oylgeH2Ay0XRkNPlBUjBA2fUPWVpXcvFe+aD2tLdVR9uO
-						XvfTMxAEGqzxTU+OxO6pW2sBXNBmGvZQ0TRyovQh5+pTURY/lm0V/iWvRmRe51WE
-						O/nhYyvRuMmNj8EL38o10S9TXuCkVzY00hK5cclaFge7gz/tfjmadVVcbe8xCVxc
-						nb1lhmt1kH2XtKvU5hyZMTO+VUfXQvqcQyECAwEAAaN7MHkwCQYDVR0TBAIwADAs
-						BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
-						VR0OBBYEFJpUZq/XaW9/bPvjffkxX0IDvuPiMB8GA1UdIwQYMBaAFJpUZq/XaW9/
-						bPvjffkxX0IDvuPiMA0GCSqGSIb3DQEBBQUAA4IBAQCq/FF56ZB1cL3KbniEJP99
-						U9wTD6KpOrWxvqNbUSV1cefLf5cYHonOjy6oAJSSBSNuP7U5Q//0tXtkvlJoqGUY
-						vqngmeg9wLZ/Fla3tXcDdTj0n1F+NZOx9vBDacIk0Ua4aHXDA4bdytzkV1QyZDRq
-						Q8vq7RoQ8E5IF7Cll+kt2dZXQk8o6Qp3w2ppoMRtYdKOQassqn+V1MYcMPgdxZkS
-						DrcgzktR/JMb5OmPrp4mSy1OWDGrFvUIigsLBPZV9tw1f7y42lnbmQas3RCS30yr
-						CtUPT/PQDkCdBRViGmmMkYwjdaOTiHOJveWtrVXu8vLvO36pqFF4Kft0pgqlfvAE
-					</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://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML2/POST" index="9"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">HighWire Press, Inc.</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Royal Society of Medicine Press Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rsmjournals.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Olga</GivenName>
-    <SurName>Biasotti</SurName>
-    <EmailAddress>mailto:shibboleth-admin@highwire.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rsmjournals.com.xml b/swamid-interfederations-2.0/www.rsmjournals.com.xml
deleted file mode 100644
index 5f466a1c..00000000
--- a/swamid-interfederations-2.0/www.rsmjournals.com.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rsmjournals.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.highwire.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.highwire.org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDOjCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADAiMSAwHgYDVQQDExdzaGli
-Ym9sZXRoLmhpZ2h3aXJlLm9yZzAeFw0xMTA1MjMyMzIwNTVaFw0xNDA1MjIyMzIw
-NTVaMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGlnaHdpcmUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPqatbaGYPuGmKF9zuEEmyun2/v2UMRB
-2zWg0l6T5Evy9vHSwmPqmhZF62oIdm1IWNjZNbl5JhXCLOJPNtVRnnqxbGfdJLWF
-JoAnY6ZuU3jNiO4Ocu+G1K0Dn6AA3nWvgV99wQvWZmrQaMSoQUm3T9avPPr8xgIs
-GLM4DmMtxVbx2q9muUkV8dafX26lIBZuHtlW2cdnEtf/Ezm5+us9xtz0XKzdgaoL
-EV3i4e47w7Mdpms2M6+JGyk0KwcsYmZLf5LFnWgI/5JMAv+mUZEKNoQFHH1qNiLj
-8HO3cl5KFCUbhpdTKq6EU3DBz1shcxQUG7sykXtdhLefP6iVf9kfKQIDAQABo3sw
-eTAdBgNVHQ4EFgQU/YLrmdITx8wbuLe37oAx96MP0bwwSgYDVR0jBEMwQYAU/YLr
-mdITx8wbuLe37oAx96MP0byhJqQkMCIxIDAeBgNVBAMTF3NoaWJib2xldGguaGln
-aHdpcmUub3JnggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBAGwG
-gkjqlP/+vS8djbKbENIVbKJfqsGM1inuvxERJpwTXoASXTJIpMds1/N16j3s1P1j
-5+UHIdD29vMyukXjLqYY0rd3/xPJ1Sm+w1mnLBgfdE0YMVlQ/zN4ZoyEIzUDA+XS
-f6chvj10tDpE5V3rxLHli6GEo0n848TU2jy5Q0dpmUgtRsn691OviUWNrgGBkaC4
-BbMczrg56rOzqdmn5SIhPt+RzRVn0gnM4eoAThpHg9jLt5SvhNChqOwnY+PByLbB
-Y4UozdQzsttgTsqCAAhNXTQQq71Hxvnanm0ak3RKkPQW/tSFsdjiTWDGp2z2djDP
-+d1ZBewNsC/cUy447ok=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.highwire.org/applications/rsmjournals/Shibboleth.sso/SAML2/POST" index="1"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">The Royal Society of Medicine Press Journals</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">The Royal Society of Medicine Press Journals</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.rsmjournals.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ryan</GivenName>
-    <SurName>Krebs</SurName>
-    <EmailAddress>shibboleth-admin@highwire.stanford.edu</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ruhrcampusonline.de.xml b/swamid-interfederations-2.0/www.ruhrcampusonline.de.xml
deleted file mode 100644
index 1099f0d4..00000000
--- a/swamid-interfederations-2.0/www.ruhrcampusonline.de.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.ruhrcampusonline.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.ruhrcampusonline.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ruhrcampusonline.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkDCCBHigAwIBAgIEDrxkazANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
-OTA5MDEwOTE4MjBaFw0xNDA4MzEwOTE4MjBaMFUxCzAJBgNVBAYTAkRFMSQwIgYD
-VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIDAeBgNVBAMTF3d3dy5y
-dWhyY2FtcHVzb25saW5lLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA4P8ltGTd9GpzjL6hf9/BBFpEw95wPWcQzEnuzR2MbMkKY/QSdhcGOjg+dfe0
-9XmtwF8Ru+9l27Dqw0dyfQELeobPgQzrc3nBV59wGGP9iRa1ys9KlLH8IKx5KB+m
-XM/yP1CniDgfjaK4vKnVkXxQTlxqSMFnVEWVoFxyEW8YbxErsJU9iTGLWh9ER+KK
-AuF8kpk4h+zEEXzcuVFry5EMKkuYjoOBuZ7VfjnnRp0zpSGc0oR0HviTDU6rh0HU
-5mEQQaIrnDNXcJoPvdG/zzSwS08XyzAmmwopdLdT8pZBGdCdW0aOnC9QEn6r2Wvm
-WZ4KKcHFAj5Rotq2mNmGq+EGKwIDAQABo4IB9DCCAfAwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBRVeqakcEl0XyWuI/gcFGDmeLCwEzAfBgNVHSMEGDAWgBRmZryWm0hN6N28Iqem
-W9WoQZ+V7jAqBgNVHREEIzAhgR9zZXJ2ZXJhZG1pbkBydWhyY2FtcHVzb25saW5l
-LmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-dW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESgQqBAhj5o
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUHMAKGQmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQAIa27/Y4KIekT6td4FywbzC3myEbaDNVJGWspT
-xHgNV5fMf+fdGETbUoBGH+v/T28oOQm4z1rc0EDGWZvK/kG4crPb1B8nQ9HQjwhJ
-ME7vmMQJgmPzVRjSTb/kZYp6VCPbFx99WrQulq6YSwkQVf8O8nwAIkR6FntWW7UU
-dhmX0qhElbuwA4hG/C27MyUxKTy6emb1smzF5qdOJlD2Lf4yw8W3b5f4xwxf+5K+
-vIhxKJay0WKT4TbkGGXnmJUqbMQcnXeAyqIvH3ExXF9P3erL1kr3XrOBZV4D4UyG
-gb/vsRda7NPGVMQ05vCGinQt/+nogQgVNRH9VeV7D8Ouf4Wq
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.ruhrcampusonline.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ruhrcampusonline.de,O=Universitaet Duisburg-Essen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFkDCCBHigAwIBAgIEDrxkazANBgkqhkiG9w0BAQUFADCBxjELMAkGA1UEBhMC
-REUxJDAiBgNVBAoTG1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbjE1MDMGA1UE
-CxMsWmVudHJ1bSBmdWVyIEluZm9ybWF0aW9ucy0gdW5kIE1lZGllbmRpZW5zdGUx
-LDAqBgNVBAMTI1VuaXZlcnNpdGFldCBEdWlzYnVyZy1Fc3NlbiBDQSAtRzAxMSww
-KgYJKoZIhvcNAQkBFh1jYWFkbWluQHVuaS1kdWlzYnVyZy1lc3Nlbi5kZTAeFw0w
-OTA5MDEwOTE4MjBaFw0xNDA4MzEwOTE4MjBaMFUxCzAJBgNVBAYTAkRFMSQwIgYD
-VQQKExtVbml2ZXJzaXRhZXQgRHVpc2J1cmctRXNzZW4xIDAeBgNVBAMTF3d3dy5y
-dWhyY2FtcHVzb25saW5lLmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA4P8ltGTd9GpzjL6hf9/BBFpEw95wPWcQzEnuzR2MbMkKY/QSdhcGOjg+dfe0
-9XmtwF8Ru+9l27Dqw0dyfQELeobPgQzrc3nBV59wGGP9iRa1ys9KlLH8IKx5KB+m
-XM/yP1CniDgfjaK4vKnVkXxQTlxqSMFnVEWVoFxyEW8YbxErsJU9iTGLWh9ER+KK
-AuF8kpk4h+zEEXzcuVFry5EMKkuYjoOBuZ7VfjnnRp0zpSGc0oR0HviTDU6rh0HU
-5mEQQaIrnDNXcJoPvdG/zzSwS08XyzAmmwopdLdT8pZBGdCdW0aOnC9QEn6r2Wvm
-WZ4KKcHFAj5Rotq2mNmGq+EGKwIDAQABo4IB9DCCAfAwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQW
-BBRVeqakcEl0XyWuI/gcFGDmeLCwEzAfBgNVHSMEGDAWgBRmZryWm0hN6N28Iqem
-W9WoQZ+V7jAqBgNVHREEIzAhgR9zZXJ2ZXJhZG1pbkBydWhyY2FtcHVzb25saW5l
-LmRlMIGXBgNVHR8EgY8wgYwwRKBCoECGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-dW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMESgQqBAhj5o
-dHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaS1kdWlzYnVyZy1lc3Nlbi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDCBsAYIKwYBBQUHAQEEgaMwgaAwTgYIKwYBBQUHMAKGQmh0
-dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWR1aXNidXJnLWVzc2VuLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBOBggrBgEFBQcwAoZCaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS91bmktZHVpc2J1cmctZXNzZW4tY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
-MA0GCSqGSIb3DQEBBQUAA4IBAQAIa27/Y4KIekT6td4FywbzC3myEbaDNVJGWspT
-xHgNV5fMf+fdGETbUoBGH+v/T28oOQm4z1rc0EDGWZvK/kG4crPb1B8nQ9HQjwhJ
-ME7vmMQJgmPzVRjSTb/kZYp6VCPbFx99WrQulq6YSwkQVf8O8nwAIkR6FntWW7UU
-dhmX0qhElbuwA4hG/C27MyUxKTy6emb1smzF5qdOJlD2Lf4yw8W3b5f4xwxf+5K+
-vIhxKJay0WKT4TbkGGXnmJUqbMQcnXeAyqIvH3ExXF9P3erL1kr3XrOBZV4D4UyG
-gb/vsRda7NPGVMQ05vCGinQt/+nogQgVNRH9VeV7D8Ouf4Wq
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ruhrcampusonline.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Duisburg-Essen</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Duisburg-Essen</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-duisburg-essen.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Tobias</GivenName>
-    <SurName>Hölterhof</SurName>
-    <EmailAddress>tobias.hoelterhof@uni-duisburg-essen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rusu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.rusu.co.uk-shibboleth.xml
deleted file mode 100644
index 25644e12..00000000
--- a/swamid-interfederations-2.0/www.rusu.co.uk-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://www.rusu.co.uk/shibboleth">
-  <!--
-		This is a "Reading University Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-07T12:39:06Z">
-      <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.rusu.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://www.rusu.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rusu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rusu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rusu.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.rusu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.rusu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.rusu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Reading University Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.rusu.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sauws.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sauws.org.uk-shibboleth.xml
deleted file mode 100644
index 67eecebc..00000000
--- a/swamid-interfederations-2.0/www.sauws.org.uk-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://www.sauws.org.uk/shibboleth">
-  <!--
-		This is a "Students' Association of the University of the West of Scotland" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-03T11:49:17Z">
-      <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.sauws.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://www.sauws.org.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sauws.org.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sauws.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sauws.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sauws.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sauws.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sauws.org.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Students' Association of the University of the West of Scotland</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sauws.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL Support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sbs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sbs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 453cca26..00000000
--- a/swamid-interfederations-2.0/www.sbs.ox.ac.uk-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://www.sbs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Said Business School" Shibboleth SP for University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-04T14:07:17Z">
-      <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.sbs.ox.ac.uk/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://www.sbs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAKtJW6P66mO4MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHd3dy5zYnMub3guYWMudWswHhcNMTMwOTAyMTQwNjUxWhcNMjMwODMxMTQw
-						NjUxWjAbMRkwFwYDVQQDExB3d3cuc2JzLm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAmsdbrSCkH5ZFU6C2mwfXmWXdQRTzEXj2HSzcxvHQ
-						gLX6fnB4f83GeMWRiZibJKlXqbl4FzXcpHD9jt6hjGIN5gO7cSdnuGXN9Uk0KFK3
-						x+DvUxbxb4ZyHpJ/Zm+U740xMJrxmdT5yIpR4OqvZ5A8nmmVpHJWDhywoCv07nVD
-						HtStOXw3uGJkGWBZbthhsT7kepw3JBQYsrIpGw+Dj+TZ95GJGKDF4Pw5i5erlVjr
-						f3ZBzesK2Bd2NzVqPqVMasTwV48ea4r6I9HaPF3TrysTsiYWryXJI6IdHsUUx+LN
-						KIksFW5t5jyV8wCvKnfqb0QAQeFbqXIe0SGvC/OKVSMkdwIDAQABoz4wPDAbBgNV
-						HREEFDASghB3d3cuc2JzLm94LmFjLnVrMB0GA1UdDgQWBBTKEr4Z+YHBBfBATGJ3
-						O0k9PamaNjANBgkqhkiG9w0BAQUFAAOCAQEAkj8zXH2bFg6ZIzQoFpjjW3hUiY6z
-						eDChMmiy9TXhlXp33Sx8ojM90XulrieY0KWqKfssEvF1EFTqOybvp9AOxyh6FSJB
-						QvafBExWMOxD9IscIQb9kx3jGOGp95NfhCE2Td3KDl5+LwRWJwxnKq1d1ApY6rLI
-						MMa1T5eHs6IFSBq7twfZWDAOycSpp5uY0+k3TD736d1Hmdc+vlau5c43HHLA5qcS
-						N4H/o5imvlkGpTRxpxgsYOezQnX05Cy64Lp1Hvagg1766ZTT3zKLSG3s175lnCQ5
-						blf8Z3Cb7eBFE/7iAeAbOoyyvGjB+y/XQjWvXJwXkWTLlYrZna6PGQ+ocw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sbs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - Said Business School</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sbs.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>NSMS Team</GivenName>
-    <EmailAddress>mailto:nsms@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Aaron</GivenName>
-    <SurName>Wilson</SurName>
-    <EmailAddress>mailto:aaron.wilson@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.school-portal.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.school-portal.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 26857678..00000000
--- a/swamid-interfederations-2.0/www.school-portal.co.uk-shibboleth-sp.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://www.school-portal.co.uk/shibboleth-sp">
-  <!--
-		This is a "cLc Service" Shibboleth SP for UniServity Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2009-03-24T14:11: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">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIE8TCCA9mgAwIBAgIJAM7Pg7fr+cKKMA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
-						VQQGEwJHQjESMBAGA1UECBMJQmVya3NoaXJlMRAwDgYDVQQHEwdSZWFkaW5nMRsw
-						GQYDVQQKExJVbmlTZXJ2aXR5IExpbWl0ZWQxEDAOBgNVBAsTB1N1cHBvcnQxIDAe
-						BgNVBAMTF3d3dy5zY2hvb2wtcG9ydGFsLmNvLnVrMSUwIwYJKoZIhvcNAQkBFhZz
-						dXBwb3J0QHVuaXNlcnZpdHkuY29tMB4XDTExMDMzMDEzNDgxOVoXDTIxMDMyNzEz
-						NDgxOVowgasxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlCZXJrc2hpcmUxEDAOBgNV
-						BAcTB1JlYWRpbmcxGzAZBgNVBAoTElVuaVNlcnZpdHkgTGltaXRlZDEQMA4GA1UE
-						CxMHU3VwcG9ydDEgMB4GA1UEAxMXd3d3LnNjaG9vbC1wb3J0YWwuY28udWsxJTAj
-						BgkqhkiG9w0BCQEWFnN1cHBvcnRAdW5pc2Vydml0eS5jb20wggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDUMkvx0wIC8biqHJx0WvOa99Lrow43Zks4NSoZ
-						g6SJRJIFuqaxQBt3/PgGj5T9n3psWT3DFJNTgOpIgydqp/+swQ9TTLxcmsX7qCke
-						105z5j2OjV0VySclV2as1B63Aaugyc5lDV4ES3HV1bKbdQbJwQDLYBNbRXqsxciG
-						FdIuec17GOIlEOnM+gcx3z2yq0TCx6aPfyRm/ookHPJua/vtDJPGCHlGd7k/kHhB
-						VVITm1BbtXT6J+dNF7BXkDzH1+CqFHUcIx45MJLu2tyhHOiuYRMs59Ul4N1TIgCa
-						FjOqA8gQtSrd7i15CKgCfyQcH/XaEGw8IgaJ4g/cDYqyxQWZAgMBAAGjggEUMIIB
-						EDAdBgNVHQ4EFgQUL7mt/WQeUEByCdGzFnowAEsQpIswgeAGA1UdIwSB2DCB1YAU
-						L7mt/WQeUEByCdGzFnowAEsQpIuhgbGkga4wgasxCzAJBgNVBAYTAkdCMRIwEAYD
-						VQQIEwlCZXJrc2hpcmUxEDAOBgNVBAcTB1JlYWRpbmcxGzAZBgNVBAoTElVuaVNl
-						cnZpdHkgTGltaXRlZDEQMA4GA1UECxMHU3VwcG9ydDEgMB4GA1UEAxMXd3d3LnNj
-						aG9vbC1wb3J0YWwuY28udWsxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAdW5pc2Vy
-						dml0eS5jb22CCQDOz4O36/nCijAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-						A4IBAQCzblIudcBQ05klAftWWLTSxh8cAv7A+3QFGoQOSO7BJocSX/7sBJ2px1Hx
-						vJgTnn2Qm7wy9UQ1dpDrKpgk+3WpB2Fp3OHmqh/fqgvhe9bNYISDy9QIudCLASEJ
-						ThfaFVFpiSAab6qXbDVIbS+Emmbq4oeLuK2vxh0nf5CormNButRnrt8xmdMzg20b
-						ftqs96cb5cQsRLB0yM/qAtKCUZKZEUkCRz4oE/xYVDschoYlk6lh2snACWHtXorV
-						b6BCgz3fqaNRQJEpSSOpcndNKJ0NtXw0lWcF1BUIXeGYgYr+/f+QsofPu2JjtkTc
-						7UAwF7gdFAY1KwlgXEFthStJX1I8
-					</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>
-						MIIE8TCCA9mgAwIBAgIJAM7Pg7fr+cKKMA0GCSqGSIb3DQEBBQUAMIGrMQswCQYD
-						VQQGEwJHQjESMBAGA1UECBMJQmVya3NoaXJlMRAwDgYDVQQHEwdSZWFkaW5nMRsw
-						GQYDVQQKExJVbmlTZXJ2aXR5IExpbWl0ZWQxEDAOBgNVBAsTB1N1cHBvcnQxIDAe
-						BgNVBAMTF3d3dy5zY2hvb2wtcG9ydGFsLmNvLnVrMSUwIwYJKoZIhvcNAQkBFhZz
-						dXBwb3J0QHVuaXNlcnZpdHkuY29tMB4XDTExMDMzMDEzNDgxOVoXDTIxMDMyNzEz
-						NDgxOVowgasxCzAJBgNVBAYTAkdCMRIwEAYDVQQIEwlCZXJrc2hpcmUxEDAOBgNV
-						BAcTB1JlYWRpbmcxGzAZBgNVBAoTElVuaVNlcnZpdHkgTGltaXRlZDEQMA4GA1UE
-						CxMHU3VwcG9ydDEgMB4GA1UEAxMXd3d3LnNjaG9vbC1wb3J0YWwuY28udWsxJTAj
-						BgkqhkiG9w0BCQEWFnN1cHBvcnRAdW5pc2Vydml0eS5jb20wggEiMA0GCSqGSIb3
-						DQEBAQUAA4IBDwAwggEKAoIBAQDUMkvx0wIC8biqHJx0WvOa99Lrow43Zks4NSoZ
-						g6SJRJIFuqaxQBt3/PgGj5T9n3psWT3DFJNTgOpIgydqp/+swQ9TTLxcmsX7qCke
-						105z5j2OjV0VySclV2as1B63Aaugyc5lDV4ES3HV1bKbdQbJwQDLYBNbRXqsxciG
-						FdIuec17GOIlEOnM+gcx3z2yq0TCx6aPfyRm/ookHPJua/vtDJPGCHlGd7k/kHhB
-						VVITm1BbtXT6J+dNF7BXkDzH1+CqFHUcIx45MJLu2tyhHOiuYRMs59Ul4N1TIgCa
-						FjOqA8gQtSrd7i15CKgCfyQcH/XaEGw8IgaJ4g/cDYqyxQWZAgMBAAGjggEUMIIB
-						EDAdBgNVHQ4EFgQUL7mt/WQeUEByCdGzFnowAEsQpIswgeAGA1UdIwSB2DCB1YAU
-						L7mt/WQeUEByCdGzFnowAEsQpIuhgbGkga4wgasxCzAJBgNVBAYTAkdCMRIwEAYD
-						VQQIEwlCZXJrc2hpcmUxEDAOBgNVBAcTB1JlYWRpbmcxGzAZBgNVBAoTElVuaVNl
-						cnZpdHkgTGltaXRlZDEQMA4GA1UECxMHU3VwcG9ydDEgMB4GA1UEAxMXd3d3LnNj
-						aG9vbC1wb3J0YWwuY28udWsxJTAjBgkqhkiG9w0BCQEWFnN1cHBvcnRAdW5pc2Vy
-						dml0eS5jb22CCQDOz4O36/nCijAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
-						A4IBAQCzblIudcBQ05klAftWWLTSxh8cAv7A+3QFGoQOSO7BJocSX/7sBJ2px1Hx
-						vJgTnn2Qm7wy9UQ1dpDrKpgk+3WpB2Fp3OHmqh/fqgvhe9bNYISDy9QIudCLASEJ
-						ThfaFVFpiSAab6qXbDVIbS+Emmbq4oeLuK2vxh0nf5CormNButRnrt8xmdMzg20b
-						ftqs96cb5cQsRLB0yM/qAtKCUZKZEUkCRz4oE/xYVDschoYlk6lh2snACWHtXorV
-						b6BCgz3fqaNRQJEpSSOpcndNKJ0NtXw0lWcF1BUIXeGYgYr+/f+QsofPu2JjtkTc
-						7UAwF7gdFAY1KwlgXEFthStJX1I8            
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.school-portal.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.school-portal.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.school-portal.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.school-portal.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.school-portal.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.school-portal.co.uk/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UniServity Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UniServity: cLc Service</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniservity.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UniServity Support</GivenName>
-    <EmailAddress>mailto:support@uniservity.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rezar</GivenName>
-    <SurName>Zefaj</SurName>
-    <EmailAddress>mailto:rezar.zafaj@uniservity.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml b/swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-shibboleth.xml
deleted file mode 100644
index dc774e00..00000000
--- a/swamid-interfederations-2.0/www.sci-ware-customer.com-preprod-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://www.sci-ware-customer.com/preprod/shibboleth">
-  <!--
-		This is a "Science Warehouse PreProd1" Shibboleth SP for Science Warehouse 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-09-12T16:02:51Z">
-      <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://secondary.sci-ware-customer.com/Shibboleth.sso/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://secondary.sci-ware-customer.com/Shibboleth.sso/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://secondary.sci-ware-customer.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://secondary.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDDCCAfSgAwIBAgIJAPOcCZG4kjBhMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF3NlY3ByZXdlYjEuc2NpLXdhcmUuY29tMB4XDTEzMDkwMzE0MjMyN1oXDTIz
-						MDkwMTE0MjMyN1owIjEgMB4GA1UEAxMXc2VjcHJld2ViMS5zY2ktd2FyZS5jb20w
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3p6apDMPvuzis5U7s2CMe
-						ox+i1ffSlt2ONB0pKnwdOyeAtqZgeiviuTww18icZy7olWYSSSumi0bANS7VJi8n
-						EOI+yGl6kjNf6X33BNyO/B0afgX++d3sx02TlDtuqWqh2Oi67qdQPD/LVKWEB4bM
-						lgK2Yf6Km8cfHl8dkR9Cfblt/AAOV5iE6HZDNiXdKj4suxoxjiOhI9JcDf1gicQB
-						ObXDu+dkfXIlyOI3r8JqOWsqWwW4E5UuJ4+XEIsCjrQAqAj2/NJ+fy6Pr/uAbsVb
-						C4VWPJm4bdThGybNUDr2LGjbmnTLHwVp6yhcSnu7TAACljeltamWLoXD8TBz8doh
-						AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3NlY3ByZXdlYjEuc2NpLXdhcmUuY29tMB0G
-						A1UdDgQWBBT94xDOhvG4i9HPxirLA3BO5Dg57DANBgkqhkiG9w0BAQUFAAOCAQEA
-						BVkY4FYZ/6gbtuk/UQnbJnWWELy9vLV29OvrjTCe6QM+F8yFYkWme9LtFulfr9NM
-						XIIavSmKI2RKnn/NLpYP2wDHNs+p+3c4JNJohJc2Dv3w2+MC4LMV/hezXXinGon1
-						VpEJ3oP4n301o56/rGb+8eEFrCaaQlmtuwLfaKcKuW5ZNLNjtNwcPzNJ3GNH43MS
-						SfSvzCcjoVWMmCNm2W8HpheZCgWawg0X02h22WJ6nLYzvdTxaIXHYrMdNl6XV5u5
-						cOVsF94ZY4wriD0goxTHy7xKE9ICkUrT7kUF1kXBeImpM5Y8ak5mdYWPbZDTdN2M
-						6NM1c5BqI+6jWLfWoTJNMw==
-					</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://secondary.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secondary.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Science Warehouse Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Science Warehouse PreProd1</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sci-ware.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Customer Support</GivenName>
-    <EmailAddress>mailto:customersupport@sci-ware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ondrej</GivenName>
-    <SurName>Scecina</SurName>
-    <EmailAddress>mailto:ondrej.scecina@sci-ware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sci-ware-customer.com-prod-shibboleth.xml b/swamid-interfederations-2.0/www.sci-ware-customer.com-prod-shibboleth.xml
deleted file mode 100644
index 9f2bc530..00000000
--- a/swamid-interfederations-2.0/www.sci-ware-customer.com-prod-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://www.sci-ware-customer.com/prod/shibboleth">
-  <!--
-		This is a "Science Warehouse Prod" Shibboleth SP for Science Warehouse 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-10-03T15:51:20Z">
-      <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.sci-ware-customer.com/Shibboleth.sso/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.sci-ware-customer.com/Shibboleth.sso/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.sci-ware-customer.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://www.sci-ware-customer.com/Shibboleth.sso/LoginYSJ"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAKlKWUryntpMMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGXByaW1lcHJkd2ViMS5zY2ktd2FyZS5jb20wHhcNMTMwOTAzMTExMjEwWhcN
-						MjMwOTAxMTExMjEwWjAkMSIwIAYDVQQDExlwcmltZXByZHdlYjEuc2NpLXdhcmUu
-						Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsbBRJSDJTCy3wMgv
-						6ZrBBI0uezsJcx29t6kW+Qk+5bwEhB8jcYf/LNSpnVs8GKpuxScPxXLOp8PSn0g5
-						smhtTdCc5Ejsluu7SM6vd70o0YkufgCih3qtIKnFVgR++G5s5//uaY/3z6eO47YT
-						av+X9gagf8GlJCums10JcVTNqwmZlsoa9WSaprXOlcBij6zqqWvsv1en37KkE699
-						FEK779lvNleZWW8gK+QpsNSOMcIH2qTDNRHxpWRw61iMay33ec7M3wMivX13VKLV
-						fEbWi7OxG0tRSYQDZtrqDHSTzyJ4h6MexQj9sVrJYftCb7w51tf8l0X6zmMsdFLs
-						ouB8gQIDAQABo0cwRTAkBgNVHREEHTAbghlwcmltZXByZHdlYjEuc2NpLXdhcmUu
-						Y29tMB0GA1UdDgQWBBTCBrpWzU/p3zVsmMp+CJkBA4cuHDANBgkqhkiG9w0BAQUF
-						AAOCAQEAT02NyaYkpI8qwUt1BLp4Papn82/4dQwxz9E9zYTpqBwAUaDrXpC+T62Q
-						8KIq9rAGrefopyxJ8nMFJi+zUlaKKnkE6vCGtHC2isaH5MYa+h6fiLzhEsa3mB9B
-						+K+lrr3EjXiAxcb2/pRVdO85XGSD8mbXyxaB0ZcD4scC32mrccBdLL+jda5KAw7Z
-						IS7teotcfyoewPeFFVjZ98U6FFLguL25Sp5SsJerWsHVv9uDw+4gCoEk0jfOjMQU
-						f92do3qVdA2tG+NS4/sKj5ge1TOC1SRIclDy286Fp+9De5zRAsGT7hTyNjR2IQxN
-						Q/xODP8/OH7oPsl9aC8UfiSUxgwqsw==
-					</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.sci-ware-customer.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sci-ware-customer.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sci-ware-customer.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sci-ware-customer.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sci-ware-customer.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sci-ware-customer.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Science Warehouse Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Science Warehouse Prod</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sci-ware.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Customer Support</GivenName>
-    <EmailAddress>mailto:customersupport@sci-ware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ondrej</GivenName>
-    <SurName>Scecina</SurName>
-    <EmailAddress>mailto:ondrej.scecina@sci-ware.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.scl.org-shibboleth.xml b/swamid-interfederations-2.0/www.scl.org-shibboleth.xml
deleted file mode 100644
index 15d6e022..00000000
--- a/swamid-interfederations-2.0/www.scl.org-shibboleth.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.scl.org/shibboleth">
-  <!--
-		This is a Shibboleth SP for the Society for Computers and Law.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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.scl.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://www.scl.org/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://www.scl.org/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://www.scl.org/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.scl.org/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://www.scl.org/Shibboleth.sso/DS" index="2"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJjCCAg4CCQDUnjO6ZKGpPDANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJH
-						QjEQMA4GA1UECBMHRW5nbGFuZDEQMA4GA1UEBxMHQnJpc3RvbDEMMAoGA1UEChMD
-						U0NMMRQwEgYDVQQDEwt3d3cuc2NsLm9yZzAeFw0xMTA0MTMxMTQ2MTVaFw0yMTA0
-						MTAxMTQ2MTVaMFUxCzAJBgNVBAYTAkdCMRAwDgYDVQQIEwdFbmdsYW5kMRAwDgYD
-						VQQHEwdCcmlzdG9sMQwwCgYDVQQKEwNTQ0wxFDASBgNVBAMTC3d3dy5zY2wub3Jn
-						MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy3dMA/CF2Urq/i+ITSiF
-						5jnIrgtLvWkm3xwb2qSsuTtbREzkbKpyMbYLUinmowJHWMRqLtVpuZrhouxrJdrb
-						++TPoMnI4AZkyGTVEij9sBhfJEjh67ce2V+KEzk1G0DYcvZVdKQHptybQ/pUzsCg
-						AeZDy1K+BcOnR31ANzEFsmY6s1RnMmclyekup5E9Fhm81QlMCfJH9BJMVU1reXyq
-						ivgG7CTGnR5joHzZvPmVJyChkLh2SkKB8nvn2mguhqnZD5uTJnPoal7oP01vsW8h
-						l+akEPSBilIDnrJuxpzCyeedcgkqck2J2035aQg0bgglpjv8lK0LJqEnJMWJ/LjQ
-						bwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCgCVwrXMMUZ1krLhkXm24HjiM1ZUVZ
-						5PM5Q2XAE7ZEwFbJRf41TZlkv1l0lStZgXArERXLS7oBxVSlieyMLT67fFmezsUb
-						VrM/Jekt4AwnyayDocZxwVhxyy7YgJXx1RZld+2ErfuOHLD1HVdZK/3EEhIkL1w3
-						ptnBXke5XaL9tBl8LoFG2XyUgf2vRq9GFxp1wyWcgzU+KVvUBnPeG0M0KdyY8NOt
-						GW0p49jHWFTkfcouOOYuegXvOVlYC+F8ADXkLJ8kvm49+rjshBUdgvCXsSLXm2sI
-						VJrQwcWwv/qkr5blBBUobtIJwGrcoWF9Nic1xxJhm3E3vLRBiNWhOTKD
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scl.org/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.scl.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.scl.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scl.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scl.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.scl.org/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.scl.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.scl.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.scl.org/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.scl.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.scl.org/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Society for Computers and Law</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Society for Computers and Law: SCL</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.scl.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ed</GivenName>
-    <SurName>Beddows</SurName>
-    <EmailAddress>mailto:ebeddows@overtsoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Forrester</SurName>
-    <EmailAddress>mailto:hairy@zehuti.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.sdeo.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sdeo.ac.uk-shibboleth.xml
deleted file mode 100644
index b53423f9..00000000
--- a/swamid-interfederations-2.0/www.sdeo.ac.uk-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://www.sdeo.ac.uk/shibboleth">
-  <!--
-		This is a "Scottish Dental Education Online" Shibboleth SP for the University of Aberdeen.
-	-->
-  <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-10-23T09:02: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://www.sdeo.ac.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://www.sdeo.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="en">Interactive online learning and teaching resources to support dental education.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Scottish Dental Education Online</mdui:DisplayName>
-        <mdui:Logo height="146" width="300">https://www.sdeo.ac.uk/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC8TCCAdmgAwIBAgIJAPNguqNnSFj+MA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-						BAMTDnd3dy5zZGVvLmFjLnVrMB4XDTE0MDgxNDE0MzMzMVoXDTI0MDgxMTE0MzMz
-						MVowGTEXMBUGA1UEAxMOd3d3LnNkZW8uYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQC8jVkdArAQ8ngJOd4S1c7ChUaYBpxSv4MwhugEoyFjHqC8
-						tzhQHYHQEgCY5WxqnNaVExWXVqKPaQxgHtDQbiKU019yOYlpXK3+FfCjLBgEMDni
-						MUrUAhBaOQlIdkbfXSq5dRfDx3KjRmXbeuhKfC/pHSLJ1Fer0c8r7z6zN6iXgzsI
-						5iVQL5lPJvCeBh6Af/fbp2FHkmIAqctN8yQfpfskCMugxebH1sUa/nvrVJtf8fqQ
-						DAZrmF5foRy7pENW0bPvdZDhH2nL0O4Qw6mNO8n1b438vS4fiYuXEU/bE4cp9YuZ
-						9MqDdXhHT2LvqqBmVLAHV85Xos/1W6NHXxoK9XpzAgMBAAGjPDA6MBkGA1UdEQQS
-						MBCCDnd3dy5zZGVvLmFjLnVrMB0GA1UdDgQWBBR6m5nWMYxvlH0uKtTjMCJOFX9B
-						+jANBgkqhkiG9w0BAQUFAAOCAQEAgTX3B7chPGaD1758ssHPw7v5HzwtV4KUzM5t
-						a3UvzNYQoSlipXieO2ySckD66K/UM7i3ORF5TJW/2xzo54yKBaZDg/mTZGp3v0tv
-						Z4qvT5tlbygizHMz+Cdh8Ete8uBbRIG87Sr7GaR8ZMRNjaz7v3mqgKB6zUBdjjWx
-						L2+UFp82CgxFjkZDWabONQV+bRRku0wBsRYqikrarLzcV7wS0EM4Li3LVAyj2P9e
-						+3eucC8gDxQ8AjjNOg/SKGcRLQe5fYa6X2GYy2yLY0QpN7VwP0cVRHyNy+cdWlQ6
-						LhzcTCIPjQ9bO+7235hm6tzlYYfOG6yAcAolWtWiQuVcnHbbkA==
-					</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.sdeo.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sdeo.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Aberdeen</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Scottish Dental Education Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sdeo.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Admin</GivenName>
-    <EmailAddress>mailto:admin@sdeo.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:servicedesk@abdn.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Service Desk</GivenName>
-    <EmailAddress>mailto:servicedesk@abdn.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.service4mobility.com-europe.xml b/swamid-interfederations-2.0/www.service4mobility.com-europe.xml
deleted file mode 100644
index 0d2a9d26..00000000
--- a/swamid-interfederations-2.0/www.service4mobility.com-europe.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.service4mobility.com/europe">
-  <!--
-	This is a "Mobility-Online" OIOSAML.java SP for SOP Hilmbauer &amp; Mauberger GmbH &amp; Co.KG.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-04-07T12:54:54Z">
-      <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">Mobility-Online</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The High-End Standard Software for the web-based
-					management of international educational cooperation and all types of academic
-					mobilities.</mdui:Description>
-        <mdui:Logo height="45" width="255">https://www.service4mobility.com/europe/images/mobility-online.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFtDCCBJygAwIBAgIQJF23Zp+qyEMZ5HUvD3iMRDANBgkqhkiG9w0BAQUFADCB
-						vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
-						VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
-						DTEyMDQxNzAwMDAwMFoXDTE4MDQxMTIzNTk1OVowgbcxCzAJBgNVBAYTAkFUMQ8w
-						DQYDVQQIEwZWaWVubmExDzANBgNVBAcUBlZpZW5uYTEuMCwGA1UEChQlU09QIEhp
-						bG1iYXVlciAmIE1hdWJlcmdlciBHbWJIICYgQ29LRzEzMDEGA1UECxQqVGVybXMg
-						b2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MSEwHwYDVQQDFBh3
-						d3cuc2VydmljZTRtb2JpbGl0eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDImV6SV6GEilkTyCyeQyTBxPHlsbldKUPfLNpaAiyPBNZ0J5R9kC8q
-						c+RG5tKxNRgcuEz3s2SIghle8MSEhjtaGOYf/XVAHKnNGaPRvxFa9AOlxa2xBUXP
-						k9NIh1G0Zx/GBcKY0BHVv1898c3LlMAWjYHO4XWzjvtn4YYXM8m3m5gURinNLKev
-						sVdchBYmaV+IWwpBRyx7KDEdiE94ibHbdf8IrP6hndX4HI1JWz8MdxQzHIVvASck
-						m+jzQhSFuBx4GXDqmPFPfM58nrWBSJDcrOlf8a2WzfBYUJZNECttBK+9F4ORzn9y
-						siQdBeUEEca0zdP8A9KfWnDUIQ9T6FlvAgMBAAGjggGzMIIBrzAJBgNVHRMEAjAA
-						MAsGA1UdDwQEAwIFoDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYB
-						BQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwQQYDVR0fBDowODA2
-						oDSgMoYwaHR0cDovL1NWUkludGwtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJJbnRs
-						RzMuY3JsMCgGA1UdJQQhMB8GCCsGAQUFBwMBBggrBgEFBQcDAgYJYIZIAYb4QgQB
-						MHIGCCsGAQUFBwEBBGYwZDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNp
-						Z24uY29tMDwGCCsGAQUFBzAChjBodHRwOi8vU1ZSSW50bC1HMy1haWEudmVyaXNp
-						Z24uY29tL1NWUkludGxHMy5jZXIwbgYIKwYBBQUHAQwEYjBgoV6gXDBaMFgwVhYJ
-						aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUS2u5KJYGDLvQUjibKaxLB4shBRgwJhYk
-						aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nbzEuZ2lmMA0GCSqGSIb3DQEB
-						BQUAA4IBAQAJgRv/2HJ0856/SkHlepMDyAnrr/uRF2LIRwONAAV2V0vt7dW0Te4e
-						fvUtR/npPPcERdO5rZ729xswY/7uE2ZsK21PVqF+QMKSSTXcoFLe+47KcWaao2+U
-						r9NQ4KIwJcbCqeXfTLqYq7Dxfn1UWBa6xMPflPZhYIevuF26t/nzgQLcmF4olosN
-						qGTo2CaqSN1Cj9Bjydh74BUcamnmNdUFrQ0pU/29XMEFMtacoN8ohvXcwEn2oCB5
-						mQ/83slRUxDdY+CTn/2Cb0FMFXcE6w4HBT4E5+aXDS+SRqtb/Bw/sGgCNPkIFYvg
-						Tp8UjvFkYCREanI8dOGH+8lgNMXPmYGk
-					</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>
-						MIIFtDCCBJygAwIBAgIQJF23Zp+qyEMZ5HUvD3iMRDANBgkqhkiG9w0BAQUFADCB
-						vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
-						VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
-						DTEyMDQxNzAwMDAwMFoXDTE4MDQxMTIzNTk1OVowgbcxCzAJBgNVBAYTAkFUMQ8w
-						DQYDVQQIEwZWaWVubmExDzANBgNVBAcUBlZpZW5uYTEuMCwGA1UEChQlU09QIEhp
-						bG1iYXVlciAmIE1hdWJlcmdlciBHbWJIICYgQ29LRzEzMDEGA1UECxQqVGVybXMg
-						b2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MSEwHwYDVQQDFBh3
-						d3cuc2VydmljZTRtb2JpbGl0eS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDImV6SV6GEilkTyCyeQyTBxPHlsbldKUPfLNpaAiyPBNZ0J5R9kC8q
-						c+RG5tKxNRgcuEz3s2SIghle8MSEhjtaGOYf/XVAHKnNGaPRvxFa9AOlxa2xBUXP
-						k9NIh1G0Zx/GBcKY0BHVv1898c3LlMAWjYHO4XWzjvtn4YYXM8m3m5gURinNLKev
-						sVdchBYmaV+IWwpBRyx7KDEdiE94ibHbdf8IrP6hndX4HI1JWz8MdxQzHIVvASck
-						m+jzQhSFuBx4GXDqmPFPfM58nrWBSJDcrOlf8a2WzfBYUJZNECttBK+9F4ORzn9y
-						siQdBeUEEca0zdP8A9KfWnDUIQ9T6FlvAgMBAAGjggGzMIIBrzAJBgNVHRMEAjAA
-						MAsGA1UdDwQEAwIFoDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYB
-						BQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwQQYDVR0fBDowODA2
-						oDSgMoYwaHR0cDovL1NWUkludGwtRzMtY3JsLnZlcmlzaWduLmNvbS9TVlJJbnRs
-						RzMuY3JsMCgGA1UdJQQhMB8GCCsGAQUFBwMBBggrBgEFBQcDAgYJYIZIAYb4QgQB
-						MHIGCCsGAQUFBwEBBGYwZDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNp
-						Z24uY29tMDwGCCsGAQUFBzAChjBodHRwOi8vU1ZSSW50bC1HMy1haWEudmVyaXNp
-						Z24uY29tL1NWUkludGxHMy5jZXIwbgYIKwYBBQUHAQwEYjBgoV6gXDBaMFgwVhYJ
-						aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUS2u5KJYGDLvQUjibKaxLB4shBRgwJhYk
-						aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nbzEuZ2lmMA0GCSqGSIb3DQEB
-						BQUAA4IBAQAJgRv/2HJ0856/SkHlepMDyAnrr/uRF2LIRwONAAV2V0vt7dW0Te4e
-						fvUtR/npPPcERdO5rZ729xswY/7uE2ZsK21PVqF+QMKSSTXcoFLe+47KcWaao2+U
-						r9NQ4KIwJcbCqeXfTLqYq7Dxfn1UWBa6xMPflPZhYIevuF26t/nzgQLcmF4olosN
-						qGTo2CaqSN1Cj9Bjydh74BUcamnmNdUFrQ0pU/29XMEFMtacoN8ohvXcwEn2oCB5
-						mQ/83slRUxDdY+CTn/2Cb0FMFXcE6w4HBT4E5+aXDS+SRqtb/Bw/sGgCNPkIFYvg
-						Tp8UjvFkYCREanI8dOGH+8lgNMXPmYGk
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.service4mobility.com/europe/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://www.service4mobility.com/europe/saml/LogoutServiceHTTPRedirectResponse"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.service4mobility.com/europe/saml/LogoutServiceSOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.service4mobility.com/europe/saml/LogoutServiceHTTPPost" ResponseLocation="https://www.service4mobility.com/europe/saml/LogoutServiceHTTPRedirectResponse"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.service4mobility.com/europe/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.service4mobility.com/europe/saml/SAMLAssertionConsumer" index="1" isDefault="false"/>
-    <AttributeConsumingService index="0" isDefault="true">
-      <ServiceName xml:lang="en">https://www.service4mobility.com/europe</ServiceName>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.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"/>
-      <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="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" 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="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">SOP Hilmbauer &amp; Mauberger GmbH &amp; Co.KG</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Mobility-Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.service4mobility.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Support</GivenName>
-    <EmailAddress>mailto:support@sop.co.at</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Steffen</GivenName>
-    <SurName>Basedow</SurName>
-    <EmailAddress>mailto:steffen.basedow@sop.co.at</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.xml
deleted file mode 100644
index e05da243..00000000
--- a/swamid-interfederations-2.0/www.sgsu.org.uk-shibboleth.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.sgsu.org.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP hosted by Membership Solutions Limited on behalf of St. George's Students' Union.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-13T14:37:41Z"/>
-  </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://www.sgsu.org.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sgsu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sgsu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sgsu.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sgsu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sgsu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sgsu.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sgsu.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sgsu.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sgsu.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sgsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">St George's Students Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sgsu.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sjcoxford.com-shibboleth.xml b/swamid-interfederations-2.0/www.sjcoxford.com-shibboleth.xml
deleted file mode 100644
index acb7b5a7..00000000
--- a/swamid-interfederations-2.0/www.sjcoxford.com-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://www.sjcoxford.com/shibboleth">
-  <!--
-		This is a Shibboleth SP for TCAS Online 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="2015-05-15T10:42:38Z">
-      <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://sjcoxford.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">TCAS Online</mdui:DisplayName>
-        <mdui:Description xml:lang="en">TCAS Online is a cloud-based management platform for student accommodation portfolios.</mdui:Description>
-        <mdui:Logo height="52" width="160">https://www.sjcoxford.com/images/TCAS_header_06.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC6DCCAdCgAwIBAgIJANpmEKYj4D/2MA0GCSqGSIb3DQEBBQUAMBYxFDASBgNV
-						BAMTC3RjYXNzZXJ2ZXIzMB4XDTE1MDUxMzA2NTgwM1oXDTI1MDUxMDA2NTgwM1ow
-						FjEUMBIGA1UEAxMLdGNhc3NlcnZlcjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-						ggEKAoIBAQDM4GH4iDtBb6K4ds+mmVkiV0VG0LlT6SHOiGaQLUrfImeF+hpddA/H
-						v54p/+LQhNH6SuzLIkZpwD/BAhqdV9DsoPry27TzYWOOS9z4nC9jERf2jVUq/F6B
-						lwaPYSSBhQpZQUhViZN6O77ArH45xcExWSWNXubjgDyQ4C1CpVswm08LuR2myVdR
-						J0/zChmFl9AoA7CLNzPmC3Dgx9+H/w3Fowmn61+8cY3T+Lxg6Lzb9D4SZQEhElMt
-						NvyZaUaUaJ7x1U8bkeGGzLkhiQxdWQ331hJnFYM7mCt6afKooR4lP+c4qELrx0HF
-						KPya0Ebi/f5Lu57zF1Ktjg+fbVUPw8yxAgMBAAGjOTA3MBYGA1UdEQQPMA2CC3Rj
-						YXNzZXJ2ZXIzMB0GA1UdDgQWBBQXDwgHKZzS5BB0V3J6MICHxf8fBDANBgkqhkiG
-						9w0BAQUFAAOCAQEAhe0e/UJdHzSnBgQKrDsbAe7RruoSVTVreNsrFkUE+UU9OSOQ
-						L1zChTXHSfQDRIt//JcKdw7duA8SFgDx0sDf093FJ+HabaRjJz8PJPDjYVoKtjiV
-						mGTwUldiVaKlwrkZWEwCMuLDQ/UrudeuIwjfcKncGyuAfuOMjBar/LGiOmzNzzZi
-						RgCNiKgHPhXNGjKtViV1+Z4H6B3zLyYhbxuTxx/b5j3jAVSdc7UydShbzzs2QvD+
-						dQrGI9VaOWtJVA0z8Z1zrnB3MvlQUZw0Ma2DsGpgZITKmLFc8hiR3uJtRyxMUzwK
-						1Uj11XkAOJyNcStbwH7Cfr7OGdjeW4tYyLjfMw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://sjcoxford.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sjcoxford.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sjcoxford.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sjcoxford.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sjcoxford.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sjcoxford.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sjcoxford.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sjcoxford.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sjcoxford.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sjcoxford.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sjcoxford.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TCAS Online Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">TCAS Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://tcasonline.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Rachel</GivenName>
-    <SurName>Slater</SurName>
-    <EmailAddress>mailto:rslater@tcasonline.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Fazal</GivenName>
-    <SurName>Amin</SurName>
-    <EmailAddress>mailto:famin@tcasonline.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.solentsu.co.uk-shibboleth.xml
deleted file mode 100644
index 709d6ebc..00000000
--- a/swamid-interfederations-2.0/www.solentsu.co.uk-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://www.solentsu.co.uk/shibboleth">
-  <!--
-		This is a "Solent Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-10-24T10:30: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://www.solentsu.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://www.solentsu.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.solentsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.solentsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.solentsu.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.solentsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.solentsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.solentsu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Solent Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.solentsu.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</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 a45377ab..00000000
--- a/swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/metadata.php">
-  <md: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>
-  </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-erlangen.de</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fau.de</shibmd: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>
-    </md:Extensions>
-    <md: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=RRZE,O=Universitaet Erlangen-Nuernberg,L=Erlangen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIH2TCCBsGgAwIBAgIHGJ5nV/NnXTANBgkqhkiG9w0BAQsFADCBozELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4xKDAmBgNV
-BAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNVBAsTBFJS
-WkUxDzANBgNVBAMTBkZBVS1DQTEmMCQGCSqGSIb3DQEJARYXY2FAcnJ6ZS51bmkt
-ZXJsYW5nZW4uZGUwHhcNMTQxMjAzMTA0NTI4WhcNMTkwNzA5MjM1OTAwWjCBgzEL
-MAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIRXJsYW5nZW4x
-KDAmBgNVBAoTH1VuaXZlcnNpdGFldCBFcmxhbmdlbi1OdWVybmJlcmcxDTALBgNV
-BAsTBFJSWkUxFzAVBgNVBAMTDnd3dy5zc28uZmF1LmRlMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEArDMkYLXoej9jjWq+K4hCcm8dRgyxbpMQevfdKBhp
-ipHjFPs9xphbtYyVUY/y7b+3NpnQ7rTxR8OX8js4/P9faTW2lUN3L3a8X0cGm7h/
-LyHC9tPZSbsSosJXZ8ws7UebzpNSo0EtykmQcpLifPh0VazcZ1EIu1xbG3mqLTs6
-Zz0YEyhHxhBPAi3rsl3mUPLOi7wv97fRkkfWvMdg4oENeqbpqEg0uIlJIBo/DTNP
-lVumxsv5GyKLC87mfGerdnNB0FUVDOortb279XaQnIdhWFZLtvUNls6jpkLX424Z
-V2TqL8jvGnbSIFw23qFVQJoh4ZphEefP9dgpU04gBQ2r7hbV5hvEyPE2u1iGvS0w
-EstLcZZEAYiz3cKsf/u6vfO44Y8aO9cisrOlF7W8wlVT6unagdZMMue+dEiLYoX0
-4CNgcyHYAxEmZdzsfXBNGeLLsHgI05DL4uejCtE99mCigGUHUnzCJtosz13zpnt0
-l0A/6iXa3NLydrjN+t2RNnI1Y07MzN0TUiF6G28gzzM2Km/dmdQePeCepjpIwE/4
-jPckWX4RhGxyWtr8ttjRGW3+aSpoQRolGEmMu/I7Kk4kOT/P8EReHtQ7ItG7yGez
-e1Bl6SweY7mqlcx7ioXjnPqTyl0yQSTth+LftyMnA57BaQ3bJoTCxiPoUMe2dx4K
-y68CAwEAAaOCAy4wggMqME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMDMBEG
-DysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiwe
-MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0G
-A1UdDgQWBBRZl7XWoTH9fNNalFv7PVzbARELxDAfBgNVHSMEGDAWgBT0c/P6xkKz
-xlxpwFi+dDj5YSuOYjCB1wYDVR0RBIHPMIHMgg1vcGVuaWQuZmF1LmRlgg9vcGVu
-aWQucnJ6ZS5uZXSCHnNzby1wcm94eS5ycnplLnVuaS1lcmxhbmdlbi5kZYIKc3Nv
-LmZhdS5kZYIYc3NvLnJyemUudW5pLWVybGFuZ2VuLmRlghNzc28udW5pLWVybGFu
-Z2VuLmRlghF3d3cub3BlbmlkLmZhdS5kZYITd3d3Lm9wZW5pZC5ycnplLm5ldIIO
-d3d3LnNzby5mYXUuZGWCF3d3dy5zc28udW5pLWVybGFuZ2VuLmRlMIGfBgNVHR8E
-gZcwgZQwSKBGoESGQmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWVybGFuZ2Vu
-LW51ZXJuYmVyZy1jYS9wdWIvY3JsL2NhY3JsLmNybDBIoEagRIZCaHR0cDovL2Nk
-cDIucGNhLmRmbi5kZS91bmktZXJsYW5nZW4tbnVlcm5iZXJnLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMIHtBggrBgEFBQcBAQSB4DCB3TAzBggrBgEFBQcwAYYnaHR0cDov
-L29jc3AucGNhLmRmbi5kZS9PQ1NQLVNlcnZlci9PQ1NQMFIGCCsGAQUFBzAChkZo
-dHRwOi8vY2RwMS5wY2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1udWVybmJlcmctY2Ev
-cHViL2NhY2VydC9jYWNlcnQuY3J0MFIGCCsGAQUFBzAChkZodHRwOi8vY2RwMi5w
-Y2EuZGZuLmRlL3VuaS1lcmxhbmdlbi1udWVybmJlcmctY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQB/I2I90bVOWDyl0KBKFhUTE3Pe
-lYO7R1fbNDz31MfFPBf3R8cKQmWOmRZbR3xGtsyEox1DxXF/TEJvMVtTADsWSfn9
-8T+wbXXObBC4weNWiEgw6QTAIyV+etFrl34ah7bAeEVRTbgjMUGw2pI8inQ3lmwI
-2hBS1hczWlpjZGLsmaWECo4WOEDmfE0Y/DvJM92Ha5zwrcYMSv67UgRRB1BuiYzX
-OJTEVIhCG9C3vx/ua306YZX12QHrPtyUEMJcYqkP2hloKY/iJCaLXCBwcBv9OYPl
-pEpqprRECWq3dNLXmUBnqHCsiPa4TY2gVssAlQcmsasBj7ieuhFktDD/Y0vP
-</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>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>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <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:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sso.uni-erlangen.de/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.sso.uni-erlangen.de/simplesaml/shib13/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="de">e131</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e131</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Friedrich-Alexander-Universität Erlangen-Nürnberg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Friedrich-Alexander-Universität Erlangen-Nürnberg</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">https://www.sso.uni-erlangen.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sso.uni-erlangen.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Frank</md:GivenName>
-    <md:SurName>Tröger</md:SurName>
-    <md:EmailAddress>mailto:sso-admins@rrze.fau.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Frank</md:GivenName>
-    <md:SurName>Tröger</md:SurName>
-    <md:EmailAddress>mailto:sso@fau.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Frank</md:GivenName>
-    <md:SurName>Tröger</md:SurName>
-    <md:EmailAddress>mailto:sso-admins@rrze.fau.de</md:EmailAddress>
-  </md:ContactPerson>
-</md: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.sss.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.sss.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index b5e4a01a..00000000
--- a/swamid-interfederations-2.0/www.sss.ox.ac.uk-shibboleth.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sss.ox.ac.uk/shibboleth">
-  <!--
-		This is a "ESD Live Environment" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-02-01T16:42:00Z"/>
-  </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.sss.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAOH4G+VuojucMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHd3dy5zc3Mub3guYWMudWswHhcNMTMwMTMxMTYyODE2WhcNMjMwMTI5MTYy
-						ODE2WjAbMRkwFwYDVQQDExB3d3cuc3NzLm94LmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAvBi0PwHPy7hLbzkt71L0SiFqPitwDSfQ2ZlL2YXk
-						dmulWfUgojJEo6H0b3eM9tUA8P1IADnKOKjmNeKAa9HqE4kfB1lzYS9iV/4i2dis
-						Zg3tqITFjaxhZ+2x5Jhr/tuqU568K9Dz3US9tVWQqNg+W/Wve1YGPYlv4e8UNVtl
-						TBYMV5Dv6Cftnq4HdmhSirng5v/wQGTNREjfoiUHmD8ZZ6YwyAqpTlRCLQy1mNxT
-						p7i/vpe+i35GoMITpH8ZKIVrJEXJKYA3npF0tdiPgd4We+Rn//yHDTWU1cltZ1It
-						9gqnsWN5dldcKMWGRKhd2M0hzPZTUGrV94AAOQhgc3WoUQIDAQABo1AwTjAtBgNV
-						HREEJjAkghB3d3cuc3NzLm94LmFjLnVrhhB3d3cuc3NzLm94LmFjLnVrMB0GA1Ud
-						DgQWBBQLYrqBm6zLEN3bNXHxocMiBRr9LTANBgkqhkiG9w0BAQUFAAOCAQEAHK7z
-						mWgHDjQm7w7dXEQyeXEJ8xVW34UrSsZgt7uBy+1nxpbHzb09aNYUObfIvgRpAt1W
-						6Z67i2Jzjq4DqWeL2NpsCEgDm3eNO++Aw/uypNiA2PaVmXU//6m9uXIm+Chuq4Qy
-						yD58hcy/W1nJ+EVYraWzY/a4nD6gujQgGttu6z5a8icIIAVOO1ipa47r1YbLo5y+
-						m7NxcUKdhMANsSxVES4L9S/an+hztldZtSxCePBBcOOcRTFKpmbw2OFp384pjD5Y
-						ECbSLCxnYuKCLtM99vOqVoSZrLvYURsFu7Xe6KH1rMwliAoPsuPQf9pZDhROoCYF
-						oK7HZPfIVarlAW4SnQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.sss.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sss.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - ESD Live Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jason</GivenName>
-    <SurName>Harris</SurName>
-    <EmailAddress>mailto:Jason.Harris@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 80c0e3d8..00000000
--- a/swamid-interfederations-2.0/www.staffsubs.ox.ac.uk-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://www.staffsubs.ox.ac.uk/shibboleth">
-  <!--
-		This is a "Staff Subscriptions Site" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2014-10-02T11:30:32Z">
-      <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.staffsubs.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDCTCCAfGgAwIBAgIJAOFx/II0dT0qMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-						BAMTFnd3dy5zdGFmZnN1YnMub3guYWMudWswHhcNMTQxMDAxMTI1MjE1WhcNMjQw
-						OTI4MTI1MjE1WjAhMR8wHQYDVQQDExZ3d3cuc3RhZmZzdWJzLm94LmFjLnVrMIIB
-						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4HVi9g+ykcr2sPcI0wScBuFR
-						4u+dx+t043JTIIz0GoGUFCDGRvPkuFqWDdEXaqCCHn5fgQ+OV6a2N3WbJSorJvsA
-						1YOcwVyFew2CwWZmU4t6hlCrZObbhmdCBePXPBv06qge/3b6GviwaBINpEvuq8id
-						sENNJVikDLJvGu8sDTc5qHEvGF5dGVHN6xYePwcDkuEha5gcgNa9SZERPY0tgM3N
-						GbwO4+Vd1Jxz2G+UDKIaFjC/j6E47OWMNmy+gwUhZdIeYF0Z04GtLG5M/0dmgtqv
-						4tfTmMbDNRPQPrTW+0Y/OtmnG00KQWxq49syCsEAkpLIQ5TdJDobdVHbf0CWJwID
-						AQABo0QwQjAhBgNVHREEGjAYghZ3d3cuc3RhZmZzdWJzLm94LmFjLnVrMB0GA1Ud
-						DgQWBBRPsi6qZ3/pP7C2K53aj3dcsZ8cuDANBgkqhkiG9w0BAQUFAAOCAQEAl9gw
-						cJLhHS2jZkeys6V1MjVahhJ0yzwR2f/ZxljqMlDE+EVsFdYvZHqc9GyKy9aLUIi+
-						wLnw9yZzLKUoV9Nj++so6/XW+gLb704S/bFY7/gFK1xB7/dVqwFIswBJE8gQbrrk
-						jJ7xitSTzwe5JLUdsykCp9ydPOJN6a1O81zUnyFTzhdkqvjcm7+dow3hJ+LlVjLv
-						ntGwu12fmBeGSRaM2pBXjOScD2Je9kMCRMDpfBFkpOnRLiVAYfzyHmCkEBgGTeYG
-						mVFHI2Wocap0++wO3hcdrzQMUjLdo9vamBIGERZTpOZ1gYAnF645dq2kceKt7pI6
-						oHBipfiT+f27wP8VHQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.staffsubs.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.staffsubs.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford Staff Subscriptions Site</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ops Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rob</GivenName>
-    <SurName>Hebron</SurName>
-    <EmailAddress>mailto:rob.hebron@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.xml b/swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.xml
deleted file mode 100644
index c6d4bcb7..00000000
--- a/swamid-interfederations-2.0/www.sthelenslife.net-shibboleth-sp.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://www.sthelenslife.net/shibboleth-sp">
-  <!--
-		This is a "St Helens Council" Shibboleth SP for UniServity Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-01T16:34: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.sthelenslife.net/Shibboleth.sso/Secure"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLDCCAhSgAwIBAgIJAMzAs1ASwVMDMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHd3dy5zdGhlbGVuc2xpZmUubmV0MB4XDTExMDgzMTEzMTk0M1oXDTIxMDgy
-						ODEzMTk0M1owHzEdMBsGA1UEAxMUd3d3LnN0aGVsZW5zbGlmZS5uZXQwggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsKV5eWwWRG6z8eVRrTLoDtZcSftHI
-						BYUX13hrU8cE1IofG58fDeoJhwJY0joxnnpwNQZGNolX0EIIjNNbW9CSckPwJxSl
-						RTHXK2J6R4PjMePxLNAetK9V0oxC0PMz28n30N6iyP/LyYr9+rdYyLElQawtM2ZN
-						2U7erDr215gP7GDd6sqWmp+s6hKhHdjLFbCLBgTOlCFVMiz17x4Z0DbemQZsbmja
-						j7YdIcVeqTNLludEKIcg5Hl7XXyXbiAyBnlK1S0ljW89+2b6g9Kr2aVNBg3hRi6O
-						Tdru8W+kbkvU5JxGK7hOSZZtRiZi9YO9wcbsuQh43mVfyyTS6+4TQsd3AgMBAAGj
-						azBpMEgGA1UdEQRBMD+CFHd3dy5zdGhlbGVuc2xpZmUubmV0hidodHRwczovL3d3
-						dy5zdGhlbGVuc2xpZmUubmV0L3NoaWJib2xldGgwHQYDVR0OBBYEFHcQZY+V9asV
-						5kkMf9gJVci4/nK4MA0GCSqGSIb3DQEBBQUAA4IBAQDjzLkEqEVDhilutvybAtkZ
-						QaO++l/AlDpB8Bb4E2EdeKxIFXRxWoRmPT4SFtbKlGRMG6Pw9hpC6ujw9s+oNq2E
-						GRnGRT44qUcd3YpUdjS2puF13vtqY7q+dWgMk2WzI+5v+I8DckPo0j603F9rlGgR
-						WUT2yIvdX+m/AEMeWowT5qYfv0Qdmf7dWrn/H4ITlUb8Rw10DtFL5aWSEu+lVK0E
-						afPqDUGNuJgpItPpvxVX7yKHooGSQkdigJqwN+lyrusV6OZt2fnrKZkr3nSTjYfg
-						yQBZZJMd4TmXDz4KAxPrktUlomUIorfnKHBMSVwvF6hYYNOe4rXpTCqHxeNetBcW
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sthelenslife.net/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sthelenslife.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sthelenslife.net/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sthelenslife.net/Shibboleth.sso/SLO/Redirect"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sthelenslife.net/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sthelenslife.net/Shibboleth.sso/SAML/POST" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UniServity Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UniServity Limited: St Helens Council</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniservity.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>UniServity Support</GivenName>
-    <EmailAddress>mailto:support@uniservity.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Rezar</GivenName>
-    <SurName>Zefaj</SurName>
-    <EmailAddress>mailto:rezar.zafaj@uniservity.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.stirlingstudentsunion.com-shibboleth.xml b/swamid-interfederations-2.0/www.stirlingstudentsunion.com-shibboleth.xml
deleted file mode 100644
index 3b7e6c3c..00000000
--- a/swamid-interfederations-2.0/www.stirlingstudentsunion.com-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://www.stirlingstudentsunion.com/shibboleth">
-  <!--
-		This is a "Stirling Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-02-03T12:01:19Z">
-      <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://www.stirlingstudentsunion.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.stirlingstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Stirling Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.stirlingstudentsunion.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.structuralbiology.eu-shibboleth.xml b/swamid-interfederations-2.0/www.structuralbiology.eu-shibboleth.xml
deleted file mode 100644
index 125e794e..00000000
--- a/swamid-interfederations-2.0/www.structuralbiology.eu-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://www.structuralbiology.eu/shibboleth">
-  <!--
-		This is a "Instruct" Shibboleth SP for Instruct Academic Services 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="2015-08-27T09:57:09Z">
-      <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.structuralbiology.eu/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.structuralbiology.eu/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Instruct</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Instruct Hub &amp; Submission Systems</mdui:Description>
-        <mdui:Logo height="800" width="800">https://www.structuralbiology.eu/images/idplogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDEjCCAfqgAwIBAgIJAN+JlXZQTIqEMA0GCSqGSIb3DQEBBQUAMCQxIjAgBgNV
-						BAMTGWluc3RydWN0My5zdHJ1Ymkub3guYWMudWswHhcNMTUwODIwMTQyNDAwWhcN
-						MjUwODE3MTQyNDAwWjAkMSIwIAYDVQQDExlpbnN0cnVjdDMuc3RydWJpLm94LmFj
-						LnVrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkyRI12GbWmUSDeBQ
-						8nSH5ZPoda7nNceqsdnfnO+lLZ70XwOqgmFVVAqNbg1WeYydWpyR6iKqOsczwuXa
-						/J6korvSUzpdADJKZG1bZXkyLeDdDSVNjeUKRtLPIQWUdTSRJDlBCklEis7IQ6+R
-						/BNoLx++vajYR7XrhMPC3nQ2SkVwuLQ7W0Ajq6Sn7Z7JxmYjEJZCmaRWadG1qCiB
-						g7qPSesOcgIDgXKPNUT+Ozh+c5GxvORLPoAr6s3eExqd5SUt2po5+bufy8iBwAZE
-						2sSzZ0g231mAfTzgVI369nPkpoup2va0+JMT3ujn5B/qqzriT/s5o4HEBhyXfU1f
-						09+fXQIDAQABo0cwRTAkBgNVHREEHTAbghlpbnN0cnVjdDMuc3RydWJpLm94LmFj
-						LnVrMB0GA1UdDgQWBBR7lXIwMNuLrfnsNGce+qvw1bplnzANBgkqhkiG9w0BAQUF
-						AAOCAQEAbfSyse9rOaR/APyq3n8sZ46hOn2Wnu9IThkfHTJ1m5Hx1G7iX2aU4cdz
-						3KVw11B7u1oJM4CsYP/kV80xp8IfcEWf0JZI1HYQH+vO6to6u9mNPA5nvOdg3l5u
-						sLsxc8SliF7yD7jVkKgfGfmgTlaIYg74nl0fS45Z2v8yw7Pvj1pkHY2udm+vqskv
-						2x2tdK1pLFIXu5ut1yw7mEQ6jjlYf/puELbKlftUUsWNjrS8lTY4RZou29NHLE3m
-						bXSBng+QaO933jEauYxkAiHIddQn+KCPu+bOFW1MRvd4ttKt5dtNTikRIDBm3f6C
-						Mf9E9cJ5KenVAYmDtaBbf17stP5/1A==
-					</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.structuralbiology.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.structuralbiology.eu/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.structuralbiology.eu/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.structuralbiology.eu/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.structuralbiology.eu/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.structuralbiology.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Instruct Academic Services Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Instruct</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.structuralbiology.eu/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Instruct Team</GivenName>
-    <EmailAddress>mailto:admin@structuralbiology.eu</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Callum</GivenName>
-    <SurName>Smith</SurName>
-    <EmailAddress>mailto:callum@strubi.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml b/swamid-interfederations-2.0/www.studentsales.com-shibboleth.xml
deleted file mode 100644
index 78582b80..00000000
--- a/swamid-interfederations-2.0/www.studentsales.com-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://www.studentsales.com/shibboleth">
-  <!--
-		This is a "Student Sales" Shibboleth SP for Student Sales 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="2015-11-24T10:57:14Z">
-      <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.studentsales.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.studentsales.com/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Student Sales</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Global Platform for Student Discounts</mdui:Description>
-        <mdui:Logo height="64" width="64">https://www.studentsales.com/images/logos/ss-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAOmLHL1xUklsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHN0dWRlbnRzYWxlcy5jb20wHhcNMTUxMTIwMDAxNjU1WhcNMjUxMTE3MDAx
-						NjU1WjAbMRkwFwYDVQQDExBzdHVkZW50c2FsZXMuY29tMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA70S80v6V31QEGYPuyrzqohqkaIp6WGfjJRbDvrtt
-						YF5NeVJB97kpiG4IguuMvkXCa1IR99IIBueUnWqgdcb+z3t5mLsScW2kZR/S2M4a
-						CgT2jN+md/sN8iQ1Sj7dp0h90ouHK1sL2qo2IDEeJYQyPhVupOjPj5HuYrCr5qWG
-						nFV8wXJvhX0thFnK2QnKr3i40wdDivFOksxrn5JcjV+x6SFae2yhVKLB+J2hHMC/
-						Wl4QUrho2BUMxfyoTMfkqYCHeLWTA2mK5uYzsveKTFmRyY/0sW6t4+beSEOWFDf8
-						6PxdOsMbZ3OxEyo4V2n47e7ALXkDUByXb2gmY/l/68ycbQIDAQABoz4wPDAbBgNV
-						HREEFDASghBzdHVkZW50c2FsZXMuY29tMB0GA1UdDgQWBBTdv/6HZA/dTF7F0BVi
-						PKgnRRbVezANBgkqhkiG9w0BAQUFAAOCAQEA5EBVNeUA9ZvdOs5ufjCJYC7aEYvI
-						8h7J4TWOTulH8WyG5MSn9x0bvPZrP862cvG7UhyRqPVZHAG//+lyQou9W4yN3XZD
-						KMy8L0vKOqlIerKU//xhznrMWYeRrjZvAqSDtOTxAr+++goE8F5HvzSgbrKwPUYG
-						ToXGcQ6BZoztcSH8SHbeLqbBT7O33u1uvJmLpy0/FBhSGa/T3Nv6NxAnyoK3/u3S
-						qOQR16hpXiNGbsbwdg5x/8OXwMYxW238zxIDRAlorgDPvyzQwJmkdbJ3JXAdli7Y
-						Quuv0pXFaKbFjyCOog/Ite+KJWonNI6tGPrpqMl9yd67mY0KrDeEiNOeXQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.studentsales.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsales.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsales.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsales.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsales.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsales.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsales.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsales.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Student Sales Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Student Sales</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.studentsales.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ali</GivenName>
-    <SurName>Onder</SurName>
-    <EmailAddress>mailto:ali@studentsales.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ali</GivenName>
-    <SurName>Onder</SurName>
-    <EmailAddress>mailto:ali@studentsales.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml b/swamid-interfederations-2.0/www.studentsupermarket.com-shibboleth.xml
deleted file mode 100644
index 9814cde1..00000000
--- a/swamid-interfederations-2.0/www.studentsupermarket.com-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://www.studentsupermarket.com/shibboleth">
-  <!--
-		This is a "Student Supermarket" Shibboleth SP for Student Supermarket Ltd.
-	-->
-  <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="2015-03-17T10:12: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://www.studentsupermarket.com/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Student Supermarket</mdui:DisplayName>
-        <mdui:Description xml:lang="en">A global online platform to provide services for students everyday lives</mdui:Description>
-        <mdui:Logo height="60" width="80">https://studentsupermarket.com/images/logos/studentlogo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAM+NtIG/0ge4MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEGlwLTE3Mi0zMS0xOS0yNDIwHhcNMTUwMzEwMTYzNTEyWhcNMjUwMzA3MTYz
-						NTEyWjAbMRkwFwYDVQQDExBpcC0xNzItMzEtMTktMjQyMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAm6LJQRhFMzXL9LCIqw44/wgw2VDefNZwS5/FE8co
-						cHA6DMdopRpaTFg7W0OvjMPbLlUZmvGB4GAvMFbNKXWQ4qccbNptDXcD4kN7gTP7
-						8Stzd6TXOPdhejQ0U2Q2/zNX9B5klAS51NhlzLfW6MLWK6qV9eFCnum9gxTcx2/c
-						79xiYI+lEMYKkXKFUnls6JjhQgm4/a0NEiGkWEjzoIVOXQDKMyz7p1JJ6OcQ65y6
-						BGdXT/4oG6a6yhgGHbgaV6ZJWAax53Ffv+P4p1gC129Zc/s6oOWro6Mo8jh9mC8u
-						oH7eHSgcpxJUWzwAUl4RDPpfvSHCUy83y6p+lqWTuOYvKQIDAQABoz4wPDAbBgNV
-						HREEFDASghBpcC0xNzItMzEtMTktMjQyMB0GA1UdDgQWBBRWTq9V0PVO5YKVXNur
-						Y2dQoYWknzANBgkqhkiG9w0BAQUFAAOCAQEAjJJq1iIQ5cc+4YhaPlng3/Lol/Mg
-						UNxGCDigM2IDSaCEH9SvAoyMvNqHeUpuYpHn8Do1oifyHS8xZH41aDyhh3Vl4TkG
-						5KfqOxoH18vwa66IRz3Mn6E20qXuYIQAGIFufW/l3KWFWBe9l1GRxRItIwVolEd5
-						GtU8Tri/ftwndN8aifYEhPrpMJl1lWYUU2cHnQ7lM1/E9pzeJaCq7wkU+Il3471I
-						3ewD2JCEJ+ORBj1AL+QF5TqJghWyH6a3IKkMVkIHk+7NHq4L6QZvFW7togFp+0Oa
-						W/4oy5wJRf4niwyvkV8gDlo/H5cIxc7nt0nwpotbejw3/FNEu8WkrKzrXQ==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.studentsupermarket.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsupermarket.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsupermarket.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsupermarket.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsupermarket.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsupermarket.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Student Supermarket Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Student Supermarket</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.studentsupermarket.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Robert</GivenName>
-    <SurName>Gray</SurName>
-    <EmailAddress>mailto:robert@studentsupermarket.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ali</GivenName>
-    <SurName>Onder</SurName>
-    <EmailAddress>mailto:ali@studentsupermarket.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 92a7b32b..00000000
--- a/swamid-interfederations-2.0/www.studentsystem.ox.ac.uk-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://www.studentsystem.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shib 2.1 SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://www.studentsystem.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFkjCCBHqgAwIBAgIJAKjDVvtOMyd+MA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
-						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEjMCEGA1UEAxMad3d3LnN0dWRlbnRzeXN0
-						ZW0ub3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFk
-						bWluLm94LmFjLnVrMB4XDTEyMDMwNTEyMjM0M1oXDTIyMDMwMzEyMjM0M1owgdIx
-						CzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hm
-						b3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVz
-						aW5lc3MgU2VydmljZXMgYW5kIFByb2plY3RzMSMwIQYDVQQDExp3d3cuc3R1ZGVu
-						dHN5c3RlbS5veC5hYy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxp
-						c3QuYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDqNGg54tTuSJwAJ11jkiN+ZGQPPTfw0akmyDLZsr8J4bg9VWMVdGGELR5mSG2O
-						bKtei9yazwqLJMKdJb7AQqDq+fXnYiuMyIU1mnogwCS2abLZ1kvpdx2ajH2A58XG
-						wt4F/JvZ8tgDYeU7zAydlZKqkYaSKmg+rEJBVqi60OZAkj1Tlvvv+NcfzK3S9hBR
-						5yrCaV9ShoakUhJijyke3nsI1dRcAh8WZQCLvItQGAPilp2TmLLH+4wZRH/xV6yE
-						0/hWHUr+AO1CuqgDRQnlWfEQWhpaGZTK2eMZsquXNibKeXG7+HQN8nvNwhK1QSCg
-						cEGDGmMjqmm0yEDM7QNfnoSJAgMBAAGjggFnMIIBYzAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQUhUt5A5DKRLfeRmp3FQO28O07HfEwggEHBgNVHSMEgf8wgfyAFIVLeQOQykS3
-						3kZqdxUDtvDtOx3xoYHYpIHVMIHSMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hm
-						b3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVyc2l0eSBv
-						ZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFuZCBQcm9qZWN0
-						czEjMCEGA1UEAxMad3d3LnN0dWRlbnRzeXN0ZW0ub3guYWMudWsxLzAtBgkqhkiG
-						9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrggkAqMNW+04z
-						J34wDQYJKoZIhvcNAQEFBQADggEBALnfPqYUF7KMTz7xRgBQYykNhHilX/aoSBjQ
-						Fweaw6/bFUenm2ItcyLvbQav+XHfw3/EEGeY9XaJnNr4LK+eCnYwsbZi+1+4QpNy
-						orLL5umOjbfCd3INB6RQ6AMduzgMR+gHlw1WiORMnux9mybEjV5TFs80xNe9meTh
-						7Eyn+gf1wrtDfgEg5H4S69o0DDyMPnHu1EhdFb3Ombbwdmhpf+DwGktSl/XTaequ
-						duJB3GIBnEwBv2PsZtWslTqJNWyQSdBpSr3kuxbwjiFZ9Oy7YWb5CuqA1APETfHW
-						d5gNVy5VMpjKL6KHcDbZovZtIcJxUbNbXuBBO1DW6DZUJc22Fao=
-					</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>
-						MIIFkjCCBHqgAwIBAgIJAKjDVvtOMyd+MA0GCSqGSIb3DQEBBQUAMIHSMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
-						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEjMCEGA1UEAxMad3d3LnN0dWRlbnRzeXN0
-						ZW0ub3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFk
-						bWluLm94LmFjLnVrMB4XDTEyMDMwNTEyMjM0M1oXDTIyMDMwMzEyMjM0M1owgdIx
-						CzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hm
-						b3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVz
-						aW5lc3MgU2VydmljZXMgYW5kIFByb2plY3RzMSMwIQYDVQQDExp3d3cuc3R1ZGVu
-						dHN5c3RlbS5veC5hYy51azEvMC0GCSqGSIb3DQEJARYgb3BzLXRlYW1AbWFpbGxp
-						c3QuYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQDqNGg54tTuSJwAJ11jkiN+ZGQPPTfw0akmyDLZsr8J4bg9VWMVdGGELR5mSG2O
-						bKtei9yazwqLJMKdJb7AQqDq+fXnYiuMyIU1mnogwCS2abLZ1kvpdx2ajH2A58XG
-						wt4F/JvZ8tgDYeU7zAydlZKqkYaSKmg+rEJBVqi60OZAkj1Tlvvv+NcfzK3S9hBR
-						5yrCaV9ShoakUhJijyke3nsI1dRcAh8WZQCLvItQGAPilp2TmLLH+4wZRH/xV6yE
-						0/hWHUr+AO1CuqgDRQnlWfEQWhpaGZTK2eMZsquXNibKeXG7+HQN8nvNwhK1QSCg
-						cEGDGmMjqmm0yEDM7QNfnoSJAgMBAAGjggFnMIIBYzAJBgNVHRMEAjAAMCwGCWCG
-						SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
-						FgQUhUt5A5DKRLfeRmp3FQO28O07HfEwggEHBgNVHSMEgf8wgfyAFIVLeQOQykS3
-						3kZqdxUDtvDtOx3xoYHYpIHVMIHSMQswCQYDVQQGEwJHQjEUMBIGA1UECBMLT3hm
-						b3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEdMBsGA1UEChMUVW5pdmVyc2l0eSBv
-						ZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNzIFNlcnZpY2VzIGFuZCBQcm9qZWN0
-						czEjMCEGA1UEAxMad3d3LnN0dWRlbnRzeXN0ZW0ub3guYWMudWsxLzAtBgkqhkiG
-						9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrggkAqMNW+04z
-						J34wDQYJKoZIhvcNAQEFBQADggEBALnfPqYUF7KMTz7xRgBQYykNhHilX/aoSBjQ
-						Fweaw6/bFUenm2ItcyLvbQav+XHfw3/EEGeY9XaJnNr4LK+eCnYwsbZi+1+4QpNy
-						orLL5umOjbfCd3INB6RQ6AMduzgMR+gHlw1WiORMnux9mybEjV5TFs80xNe9meTh
-						7Eyn+gf1wrtDfgEg5H4S69o0DDyMPnHu1EhdFb3Ombbwdmhpf+DwGktSl/XTaequ
-						duJB3GIBnEwBv2PsZtWslTqJNWyQSdBpSr3kuxbwjiFZ9Oy7YWb5CuqA1APETfHW
-						d5gNVy5VMpjKL6KHcDbZovZtIcJxUbNbXuBBO1DW6DZUJc22Fao=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsystem.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Oracle Student Systems</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Help OSS single sign on</GivenName>
-    <EmailAddress>mailto:help_oss_single_sign_on@admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical OSS single sign on</GivenName>
-    <EmailAddress>mailto:technical_oss_single_sign_on@admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index dbc68a77..00000000
--- a/swamid-interfederations-2.0/www.studentsystemdr.ox.ac.uk-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://www.studentsystemdr.ox.ac.uk/shibboleth">
-  <!--
-		This is a "OSS Student tier DR Live" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-10-20T13:54: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://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFQjCCBCqgAwIBAgIJAOQhP/3zz2g2MA0GCSqGSIb3DQEBBQUAMIHGMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
-						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czElMCMGA1UEAxMcd3d3LnN0dWRlbnRzeXN0
-						ZW1kci5veC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVr
-						MB4XDTEwMTAxOTE1MTA0NloXDTIwMTAxNjE1MTA0NlowgcYxCzAJBgNVBAYTAkdC
-						MRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQK
-						ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2Vydmlj
-						ZXMgYW5kIFByb2plY3RzMSUwIwYDVQQDExx3d3cuc3R1ZGVudHN5c3RlbWRyLm94
-						LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3Wv3CtiHdbvqih6Hu7CKKrRjNhmOn
-						MewIs3DGuBwGUb/i5LRjX0o6AbtJk9azG7HhoUeKGrLVdtruHCUIuHLXd0c883bt
-						5MwzRC9YSA+/pSKxj2LcAvhCA2fNZ3C1hL053GD0ndKq0pNAiYPsj9tUWBJrN8wR
-						huD+tx0ss+B4YXfFTsTblGcaXDzcXWdl/F41v0NUBWcfQ8dlfdJRuX/Usz7rejbD
-						vsBgh5uSG4OZv+Eiu/W89yXNITV4h6Fg+0dcUfZniMFYyLIUku4luMlq7+iG72RD
-						SULiuTY7Pz45IGE0e/RjkSwF7VtUMpMBqYg4UIKyHmDGFk3yGCN9myHpAgMBAAGj
-						ggEvMIIBKzAdBgNVHQ4EFgQU7VlGiJb4IfSORwJ2tns3OPj6HSswgfsGA1UdIwSB
-						8zCB8IAU7VlGiJb4IfSORwJ2tns3OPj6HSuhgcykgckwgcYxCzAJBgNVBAYTAkdC
-						MRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQK
-						ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2Vydmlj
-						ZXMgYW5kIFByb2plY3RzMSUwIwYDVQQDExx3d3cuc3R1ZGVudHN5c3RlbWRyLm94
-						LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQDkIT/9
-						889oNjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCM8HFwrwani+OZ
-						WilKPwX0ZoePWdZx0z01h0MkUG/5KfnaIwYgelwayBDzZkNGXID7kR//1CK3zReT
-						/8fqqF8dOBu3/mwzUIM+HTeJ7oZft2db07lAMMxceJh0r/iVfAYMbdb9GJLFGo6u
-						jT8uJPMedmLdw0HGYhBgddzGCwQAxEXQj3f+z7tjmwFfxjm8mbeymsej1OI9vTXk
-						KkB9vFHT7f2IXtUn0FcU7lfDFecUFZTy4ht9sFMcz7yxSuXdXcEK4WVtRsPEDtFl
-						eZ5JwdaE7y7vnC0qdyme1Me2ojk43A4d5GvkAVP7tDEm6UmRNAM9zAq0JwhJZRCH
-						B4rL+Zur
-					</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>
-						MIIFQjCCBCqgAwIBAgIJAOQhP/3zz2g2MA0GCSqGSIb3DQEBBQUAMIHGMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
-						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czElMCMGA1UEAxMcd3d3LnN0dWRlbnRzeXN0
-						ZW1kci5veC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVr
-						MB4XDTEwMTAxOTE1MTA0NloXDTIwMTAxNjE1MTA0NlowgcYxCzAJBgNVBAYTAkdC
-						MRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQK
-						ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2Vydmlj
-						ZXMgYW5kIFByb2plY3RzMSUwIwYDVQQDExx3d3cuc3R1ZGVudHN5c3RlbWRyLm94
-						LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3Wv3CtiHdbvqih6Hu7CKKrRjNhmOn
-						MewIs3DGuBwGUb/i5LRjX0o6AbtJk9azG7HhoUeKGrLVdtruHCUIuHLXd0c883bt
-						5MwzRC9YSA+/pSKxj2LcAvhCA2fNZ3C1hL053GD0ndKq0pNAiYPsj9tUWBJrN8wR
-						huD+tx0ss+B4YXfFTsTblGcaXDzcXWdl/F41v0NUBWcfQ8dlfdJRuX/Usz7rejbD
-						vsBgh5uSG4OZv+Eiu/W89yXNITV4h6Fg+0dcUfZniMFYyLIUku4luMlq7+iG72RD
-						SULiuTY7Pz45IGE0e/RjkSwF7VtUMpMBqYg4UIKyHmDGFk3yGCN9myHpAgMBAAGj
-						ggEvMIIBKzAdBgNVHQ4EFgQU7VlGiJb4IfSORwJ2tns3OPj6HSswgfsGA1UdIwSB
-						8zCB8IAU7VlGiJb4IfSORwJ2tns3OPj6HSuhgcykgckwgcYxCzAJBgNVBAYTAkdC
-						MRQwEgYDVQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQK
-						ExRVbml2ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2Vydmlj
-						ZXMgYW5kIFByb2plY3RzMSUwIwYDVQQDExx3d3cuc3R1ZGVudHN5c3RlbWRyLm94
-						LmFjLnVrMSEwHwYJKoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQDkIT/9
-						889oNjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQCM8HFwrwani+OZ
-						WilKPwX0ZoePWdZx0z01h0MkUG/5KfnaIwYgelwayBDzZkNGXID7kR//1CK3zReT
-						/8fqqF8dOBu3/mwzUIM+HTeJ7oZft2db07lAMMxceJh0r/iVfAYMbdb9GJLFGo6u
-						jT8uJPMedmLdw0HGYhBgddzGCwQAxEXQj3f+z7tjmwFfxjm8mbeymsej1OI9vTXk
-						KkB9vFHT7f2IXtUn0FcU7lfDFecUFZTy4ht9sFMcz7yxSuXdXcEK4WVtRsPEDtFl
-						eZ5JwdaE7y7vnC0qdyme1Me2ojk43A4d5GvkAVP7tDEm6UmRNAM9zAq0JwhJZRCH
-						B4rL+Zur
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studentsystemdr.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: OSS Student tier DR Live</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Livings</SurName>
-    <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studisoft.de.xml b/swamid-interfederations-2.0/www.studisoft.de.xml
deleted file mode 100644
index 7449cbe9..00000000
--- a/swamid-interfederations-2.0/www.studisoft.de.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.studisoft.de/shibboleth-sp">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.studisoft.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studisoft.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCDCCA/CgAwIBAgIECzboczANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTA3MTAxODE0MTcwOFoXDTEyMTAxNjE0MTcwOFowYTELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xGTAXBgNVBAMTEHd3dy5zdHVkaXNvZnQuZGUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDTExofgogpkczc1XEXBBt7gQH2h5XmoUs5RDT9
-/wqMtkbtJBOWE7kfvx7Li4FUAGwqo5P9alawtgFIahNkozTT5D2JsmT9lgxrR4fl
-1/jbhhVUidjWrM/CWPoe4+jwng8drApN/m7JzZ0KCe4d5VptwjsyGUCfJf180Mj5
-gJOLKnUGz+nflj98AjMTWKT/yNaXQ/KWE54EcSIYYD+wmcENuz5mTcY768BPKsqN
-9qFeHfx7pSpMJr7z9AVYbGrYoLt331VLvAVNgW0dHD2xti+Cf/JeyBNqIdIo1C93
-xDiCStjbOe4y9zfVzevqVGM7kgWCO6C3K/ZRlU3fSzid1bCHAgMBAAGjggG7MIIB
-tzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFOrTE5iQ2NW8kEo+8hOX1NlmXD+MMB8GA1UdIwQY
-MBaAFH0fqED2pvYyToHl+DILw20rxDNuMCQGA1UdEQQdMBuBGW9yZGVyQHJ6LnVu
-aS13dWVyemJ1cmcuZGUwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS91bml3dWUtY2EvcHViL2NybC9jYWNybC5jcmwwOKA2oDSGMmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGY
-BggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNhLmRm
-bi5kZS91bml3dWUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEIGCCsGAQUFBzAC
-hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI5+tSTQQkjtpmWeUFtcjtrR4n4o
-yB/GK0mRNrU/dN3BGn7P9r/5M6w2brH5QC7DPrUlgdKe8Ao1DpOGvELEwYGcmigH
-X4REnphfQT1WoP6QjjAiDwyZeTB/K4sV7/abjMmJg89dTOmVESxmtP9C81+qDSBt
-TTd8xVXrUisPhEpr7jBk7DzS8SC7yrPQFNzUGvVZtsek7lc9h7T1+sjqcwWRpkMo
-vGgP+2MxPd4ugXfwH7bDDEvbc85B21JzuNRP4wRW68PvI4oHSt7pRBAVMiuHmt7W
-jopqxA5r6hkuCk/BNT5k/LHjtxNFHhocXRlkUw3tKlKxIE+7i+KNI2Mgvnw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.studisoft.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.studisoft.de,OU=Rechenzentrum,O=Universitaet Wuerzburg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFCDCCA/CgAwIBAgIECzboczANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQGEwJE
-RTEfMB0GA1UEChMWVW5pdmVyc2l0YWV0IFd1ZXJ6YnVyZzEYMBYGA1UEAxMPVU5J
-V1VFLUNBIC0gRzAxMSIwIAYJKoZIhvcNAQkBFhNjYUB1bmktd3VlcnpidXJnLmRl
-MB4XDTA3MTAxODE0MTcwOFoXDTEyMTAxNjE0MTcwOFowYTELMAkGA1UEBhMCREUx
-HzAdBgNVBAoTFlVuaXZlcnNpdGFldCBXdWVyemJ1cmcxFjAUBgNVBAsTDVJlY2hl
-bnplbnRydW0xGTAXBgNVBAMTEHd3dy5zdHVkaXNvZnQuZGUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDTExofgogpkczc1XEXBBt7gQH2h5XmoUs5RDT9
-/wqMtkbtJBOWE7kfvx7Li4FUAGwqo5P9alawtgFIahNkozTT5D2JsmT9lgxrR4fl
-1/jbhhVUidjWrM/CWPoe4+jwng8drApN/m7JzZ0KCe4d5VptwjsyGUCfJf180Mj5
-gJOLKnUGz+nflj98AjMTWKT/yNaXQ/KWE54EcSIYYD+wmcENuz5mTcY768BPKsqN
-9qFeHfx7pSpMJr7z9AVYbGrYoLt331VLvAVNgW0dHD2xti+Cf/JeyBNqIdIo1C93
-xDiCStjbOe4y9zfVzevqVGM7kgWCO6C3K/ZRlU3fSzid1bCHAgMBAAGjggG7MIIB
-tzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYI
-KwYBBQUHAwEwHQYDVR0OBBYEFOrTE5iQ2NW8kEo+8hOX1NlmXD+MMB8GA1UdIwQY
-MBaAFH0fqED2pvYyToHl+DILw20rxDNuMCQGA1UdEQQdMBuBGW9yZGVyQHJ6LnVu
-aS13dWVyemJ1cmcuZGUwfQYDVR0fBHYwdDA4oDagNIYyaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS91bml3dWUtY2EvcHViL2NybC9jYWNybC5jcmwwOKA2oDSGMmh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvdW5pd3VlLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGY
-BggrBgEFBQcBAQSBizCBiDBCBggrBgEFBQcwAoY2aHR0cDovL2NkcDEucGNhLmRm
-bi5kZS91bml3dWUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEIGCCsGAQUFBzAC
-hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3VuaXd1ZS1jYS9wdWIvY2FjZXJ0L2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAI5+tSTQQkjtpmWeUFtcjtrR4n4o
-yB/GK0mRNrU/dN3BGn7P9r/5M6w2brH5QC7DPrUlgdKe8Ao1DpOGvELEwYGcmigH
-X4REnphfQT1WoP6QjjAiDwyZeTB/K4sV7/abjMmJg89dTOmVESxmtP9C81+qDSBt
-TTd8xVXrUisPhEpr7jBk7DzS8SC7yrPQFNzUGvVZtsek7lc9h7T1+sjqcwWRpkMo
-vGgP+2MxPd4ugXfwH7bDDEvbc85B21JzuNRP4wRW68PvI4oHSt7pRBAVMiuHmt7W
-jopqxA5r6hkuCk/BNT5k/LHjtxNFHhocXRlkUw3tKlKxIE+7i+KNI2Mgvnw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studisoft.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studisoft.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studisoft.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studisoft.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studisoft.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studisoft.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studisoft.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studisoft.de/Shibboleth.sso/NIM/SOAP"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studisoft.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studisoft.de/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studisoft.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studisoft.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studisoft.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth-sptest.rz.uni-wuerzburg.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studisoft.de/Shibboleth.sso/SAML/Artifact" index="7"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Würzburg</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Rechenzentrum Uni Würzburg studisoft-sp</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-wuerzburg.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Hartmut</GivenName>
-    <SurName>Plehn</SurName>
-    <EmailAddress>serverzertifikate@rz.uni-wuerzburg.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Christian</GivenName>
-    <SurName>Rossa</SurName>
-    <EmailAddress>leitung@rz.uni-wuerzburg.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index c7929bc7..00000000
--- a/swamid-interfederations-2.0/www.studsys.ox.ac.uk-shibboleth.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://www.studsys.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth 'Student System' SP owned by the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://www.studsys.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBuTELMAkGA1UEBhMCR0Ix
-						FDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHTAbBgNVBAoT
-						FFVuaXZlcnNpdHkgb2YgT3hmb3JkMRQwEgYDVQQLEwtJVCBTZXJ2aWNlczEdMBsG
-						A1UEAxMUd3d3LnN0dWRzeXMub3guYWMudWsxLzAtBgkqhkiG9w0BCQEWIG9wcy10
-						ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrMB4XDTEyMDkxNDEwMzE1NVoXDTMy
-						MDkwOTEwMzE1NVowgbkxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtPeGZvcmRzaGly
-						ZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5IG9mIE94Zm9y
-						ZDEUMBIGA1UECxMLSVQgU2VydmljZXMxHTAbBgNVBAMTFHd3dy5zdHVkc3lzLm94
-						LmFjLnVrMS8wLQYJKoZIhvcNAQkBFiBvcHMtdGVhbUBtYWlsbGlzdC5hZG1pbi5v
-						eC5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJeAGPAZmoFV
-						jI0SuVzqP6xQA6FpqzrcwNF/iNN5OODL1ulgvGQOi3g8ThAoeYk0dO19pDhGd/86
-						44D8rXesekGWhUzP+Ww/8DjSJsaSUWq4leXcqYDcF8j8cgcHffUT3XLphZmI9DmU
-						1lLmkz7I6Oylgfx+ZZ+NtrL3y/JJWtUwF9x1LRwR6T+/eJXxnw4fxzfo5ndEHFhl
-						5/659TaCImKBm3g9aOOg1Wmnx0C+vpC14wY8NUoQVHN4gqq/jH5TXYtdm96ZJyLU
-						NzoXn3feSbMdUERSagvwJLbSM32W5i5jm7yyunKMUDYuDNpnJrA7RBgWc5K6rB34
-						SSBeNcRCODUCAwEAAaOCARowggEWMB0GA1UdDgQWBBSlpmuzhZ+Foz77+wtzD+j3
-						THbupzCB5gYDVR0jBIHeMIHbgBSlpmuzhZ+Foz77+wtzD+j3THbup6GBv6SBvDCB
-						uTELMAkGA1UEBhMCR0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZP
-						eGZvcmQxHTAbBgNVBAoTFFVuaXZlcnNpdHkgb2YgT3hmb3JkMRQwEgYDVQQLEwtJ
-						VCBTZXJ2aWNlczEdMBsGA1UEAxMUd3d3LnN0dWRzeXMub3guYWMudWsxLzAtBgkq
-						hkiG9w0BCQEWIG9wcy10ZWFtQG1haWxsaXN0LmFkbWluLm94LmFjLnVrggEAMAwG
-						A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAE7kCZ+U1ggqaC+4uVyB0f3c
-						YWRc9G4voJrN+RhYYCB8QfFaV6Z8VHV8jgJHYvBQVSz90lJkPI3Y7zxj3hx7/k8u
-						3dQSrYS1oAAao6+LtdDTldPa9JL2WWtO5cbHT2em5eoRmALFawru+kzcFkG/xzUU
-						Syx3Mmypm4vOJPylzk4XMnINdn1WeHc5uuQfxo7/JeItYO5i9dSQ2xII8bsREhp+
-						NfrvBYnZJLqjqjxturZlrCC9GHb8FBl82Go0Ms4ZK3U388O6lWrNTuwS/tY26tla
-						2yob86I5X9ytflI0zaH8qhvHelwbRG3PKepXpvAKiMDU2UzP2FOcvOn+NN612O0=                       
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studsys.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: Student System</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Ops</GivenName>
-    <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Livings</SurName>
-    <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.studsysdr.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 80dd1ced..00000000
--- a/swamid-interfederations-2.0/www.studsysdr.ox.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://www.studsysdr.ox.ac.uk/shibboleth">
-  <!--
-		This is a "OSS Staff tier DR Live" Shibboleth SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2010-10-20T13:54: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://www.studsysdr.ox.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIFMDCCBBigAwIBAgIJAKFUyKodFCpAMA0GCSqGSIb3DQEBBQUAMIHAMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
-						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEfMB0GA1UEAxMWd3d3LnN0dWRzeXNkci5v
-						eC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVrMB4XDTEw
-						MTAxOTE1MTU1M1oXDTIwMTAxNjE1MTU1M1owgcAxCzAJBgNVBAYTAkdCMRQwEgYD
-						VQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2
-						ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5k
-						IFByb2plY3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJ
-						KoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDYn8bydKw2kkvWZOo21iJlFc7HpJlz7mu9OaPMo0PNOlAB
-						ySERgfBF+84LjXgyzlOfM5me+ouWVoio37dB/0IPB9kcW6BoRUV05qYGeq+OJB8V
-						J4aUxANEneFpQV4QN5kygga91uHMedndjMJueORdmpRbaQse7n4lTL4YTblnga3/
-						ixL2bLfHfvYZ5q7hm8cxlbKhg0TiyjMjJ9HB2caIRxAmU+3jsAasFGZuT905IquG
-						AT2S9t97okzocS6ZRZY5bb0MSSRZCjCBx2SeKfxOieaz+csKhQ+kbmfKCopB0Jgd
-						26lUTadRhjOShP5k5iWx7aD+OvmjJe0YJVhh1sCfAgMBAAGjggEpMIIBJTAdBgNV
-						HQ4EFgQUziI8Ht93ixzAsvwUSo/GWpXmdRcwgfUGA1UdIwSB7TCB6oAUziI8Ht93
-						ixzAsvwUSo/GWpXmdRehgcakgcMwgcAxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5
-						IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5kIFByb2pl
-						Y3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJKoZIhvcN
-						AQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQChVMiqHRQqQDAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAGnpSzNXPStqoQYhiaRcsJ/8w2ooK4IcW2kYd1
-						mKm8xklL9cnBYpUkUCe1p26sMN8UVlXobH7fdAarYvkL2MWNYLiHmESYQ+k46vEr
-						N7FGROpQ94oFOSPvJCJQJj6uPemLiMyDWVq1JZnyIY4rggjDL72YJLSC3+pfB6iy
-						9A3b6P3tt+zt+qA/GbbPV3Ydz3z91gj752geICCrq3bMetSq6okMgbaljmf/XkMK
-						58UxgghQcXsCGBSO6OlKrT6ziQ3Aw0F2XnTWFBApxNfnotnpxlLoZQ6oAoUDUqPR
-						Kf8Nk0dJF9igV6Sd1QvvoclJMdhReqCsqr9xxVSfGQIINRJR
-					</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>
-						MIIFMDCCBBigAwIBAgIJAKFUyKodFCpAMA0GCSqGSIb3DQEBBQUAMIHAMQswCQYD
-						VQQGEwJHQjEUMBIGA1UECBMLT3hmb3Jkc2hpcmUxDzANBgNVBAcTBk94Zm9yZDEd
-						MBsGA1UEChMUVW5pdmVyc2l0eSBvZiBPeGZvcmQxJzAlBgNVBAsTHkJ1c2luZXNz
-						IFNlcnZpY2VzIGFuZCBQcm9qZWN0czEfMB0GA1UEAxMWd3d3LnN0dWRzeXNkci5v
-						eC5hYy51azEhMB8GCSqGSIb3DQEJARYSb3BzQGFkbWluLm94LmFjLnVrMB4XDTEw
-						MTAxOTE1MTU1M1oXDTIwMTAxNjE1MTU1M1owgcAxCzAJBgNVBAYTAkdCMRQwEgYD
-						VQQIEwtPeGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2
-						ZXJzaXR5IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5k
-						IFByb2plY3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJ
-						KoZIhvcNAQkBFhJvcHNAYWRtaW4ub3guYWMudWswggEiMA0GCSqGSIb3DQEBAQUA
-						A4IBDwAwggEKAoIBAQDYn8bydKw2kkvWZOo21iJlFc7HpJlz7mu9OaPMo0PNOlAB
-						ySERgfBF+84LjXgyzlOfM5me+ouWVoio37dB/0IPB9kcW6BoRUV05qYGeq+OJB8V
-						J4aUxANEneFpQV4QN5kygga91uHMedndjMJueORdmpRbaQse7n4lTL4YTblnga3/
-						ixL2bLfHfvYZ5q7hm8cxlbKhg0TiyjMjJ9HB2caIRxAmU+3jsAasFGZuT905IquG
-						AT2S9t97okzocS6ZRZY5bb0MSSRZCjCBx2SeKfxOieaz+csKhQ+kbmfKCopB0Jgd
-						26lUTadRhjOShP5k5iWx7aD+OvmjJe0YJVhh1sCfAgMBAAGjggEpMIIBJTAdBgNV
-						HQ4EFgQUziI8Ht93ixzAsvwUSo/GWpXmdRcwgfUGA1UdIwSB7TCB6oAUziI8Ht93
-						ixzAsvwUSo/GWpXmdRehgcakgcMwgcAxCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR0wGwYDVQQKExRVbml2ZXJzaXR5
-						IG9mIE94Zm9yZDEnMCUGA1UECxMeQnVzaW5lc3MgU2VydmljZXMgYW5kIFByb2pl
-						Y3RzMR8wHQYDVQQDExZ3d3cuc3R1ZHN5c2RyLm94LmFjLnVrMSEwHwYJKoZIhvcN
-						AQkBFhJvcHNAYWRtaW4ub3guYWMudWuCCQChVMiqHRQqQDAMBgNVHRMEBTADAQH/
-						MA0GCSqGSIb3DQEBBQUAA4IBAQAGnpSzNXPStqoQYhiaRcsJ/8w2ooK4IcW2kYd1
-						mKm8xklL9cnBYpUkUCe1p26sMN8UVlXobH7fdAarYvkL2MWNYLiHmESYQ+k46vEr
-						N7FGROpQ94oFOSPvJCJQJj6uPemLiMyDWVq1JZnyIY4rggjDL72YJLSC3+pfB6iy
-						9A3b6P3tt+zt+qA/GbbPV3Ydz3z91gj752geICCrq3bMetSq6okMgbaljmf/XkMK
-						58UxgghQcXsCGBSO6OlKrT6ziQ3Aw0F2XnTWFBApxNfnotnpxlLoZQ6oAoUDUqPR
-						Kf8Nk0dJF9igV6Sd1QvvoclJMdhReqCsqr9xxVSfGQIINRJR
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.studsysdr.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: OSS Staff tier DR Live</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops@admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Tom</GivenName>
-    <SurName>Livings</SurName>
-    <EmailAddress>mailto:tom.livings@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sussexstudent.com-shibboleth.xml b/swamid-interfederations-2.0/www.sussexstudent.com-shibboleth.xml
deleted file mode 100644
index 004f0d60..00000000
--- a/swamid-interfederations-2.0/www.sussexstudent.com-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://www.sussexstudent.com/shibboleth">
-  <!--
-		This is a "University of Sussex Students’ Union" Shibboleth SP for Membership Solutions Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-18T14:24: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>
-      <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.sussexstudent.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sussexstudent.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sussexstudent.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sussexstudent.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sussexstudent.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sussexstudent.com/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sussexstudent.com/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sussexstudent.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.sussexstudent.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.sussexstudent.com/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sussexstudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Sussex Students’ Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.sussexstudent.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.suug.co.uk-shibboleth.xml
deleted file mode 100644
index 29b4ef96..00000000
--- a/swamid-interfederations-2.0/www.suug.co.uk-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://www.suug.co.uk/shibboleth">
-  <!--
-		This is a "University of Greenwich Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-08-15T14:58:52Z"/>
-  </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.suug.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://www.suug.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.suug.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.suug.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.suug.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.suug.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.suug.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.suug.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.suug.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.suug.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.suug.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.suug.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.suug.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Greenwich Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.suug.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.swansea-union.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.swansea-union.co.uk-shibboleth.xml
deleted file mode 100644
index 700902d9..00000000
--- a/swamid-interfederations-2.0/www.swansea-union.co.uk-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://www.swansea-union.co.uk/shibboleth">
-  <!--
-		This is a Swansea University Students' Union Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-08-23T10:48:58Z"/>
-  </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.swansea-union.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://www.swansea-union.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.swansea-union.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.swansea-union.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Swansea University Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.swansea-union.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.swetswise.com.xml b/swamid-interfederations-2.0/www.swetswise.com.xml
deleted file mode 100644
index 914007ec..00000000
--- a/swamid-interfederations-2.0/www.swetswise.com.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.swetswise.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>shibboleth.swetswise.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shibboleth.swetswise.com,OU=Terms of use at www.verisign.com/rpa (c)05,OU=SDC,O=Swets Information Services B.V.,L=Lisse,ST=Zuid-Holland,C=NL</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFVDCCBDygAwIBAgIQfAsfYeaJkMOkD6YbIZXGLDANBgkqhkiG9w0BAQUFADCB
-tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwOTEvMC0GA1UEAxMm
-VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzIwHhcNMTAwNjA4
-MDAwMDAwWhcNMTUwODA2MjM1OTU5WjCBxDELMAkGA1UEBhMCTkwxFTATBgNVBAgT
-DFp1aWQtSG9sbGFuZDEOMAwGA1UEBxQFTGlzc2UxKDAmBgNVBAoUH1N3ZXRzIElu
-Zm9ybWF0aW9uIFNlcnZpY2VzIEIuVi4xDDAKBgNVBAsUA1NEQzEzMDEGA1UECxQq
-VGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MSEwHwYD
-VQQDFBhzaGliYm9sZXRoLnN3ZXRzd2lzZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBAJaCV/oHiN0Djbc0QfFHqJyl3dZLv6L14ixU7TRMhVBdm1EnsUhq
-JbqvF8DX9vCIa8BrShITPjXex+UpMpjdTr8V/nQGbQ7+NR4/HrV4g6ms4r8OVh8V
-ibGC2jqtNJF4NELRjdWdrkxhxoZcpn6rGYUjAPkvF2TpdFnL1hkJuhwLAgMBAAGj
-ggHRMIIBzTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2
-hjRodHRwOi8vU1ZSU2VjdXJlLUcyLWNybC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJl
-RzIuY3JsMEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHFwMwKjAoBggrBgEFBQcCARYc
-aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYTAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUpe8LEc7AQQOjSmWQSLIc4FctfUcwdgYI
-KwYBBQUHAQEEajBoMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5j
-b20wQAYIKwYBBQUHMAKGNGh0dHA6Ly9TVlJTZWN1cmUtRzItYWlhLnZlcmlzaWdu
-LmNvbS9TVlJTZWN1cmVHMi5jZXIwbgYIKwYBBQUHAQwEYjBgoV6gXDBaMFgwVhYJ
-aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUS2u5KJYGDLvQUjibKaxLB4shBRgwJhYk
-aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nbzEuZ2lmMA0GCSqGSIb3DQEB
-BQUAA4IBAQB6CxYoKRtfv/Wfw+bCZzxyBYZuqzY3DSzp+DpstY0UwqDQ1I7UVMFc
-EN1TQVEStKD3BlJUyUJnQlH3tMaRdWwqvi1of9adUQO/3u0mD0s6p5zOW2GKrEQM
-aCxJwOiYsWyk6LD2h8Gvx0eU2paPr+GR8MBB1m10icK5/YauDVh7z+Yk3NAgsv+u
-LvQirh8/tPxghLWofCqDMMHlGevdJ9IV6A5bEZ2FivhYqjKISMAN7vROy3wrr1cZ
-XYSgZsFGgkzcnZr1RJeNJ4WuY8ZQmsRoTnLV7fSRXHM/ykFZ8J9Z8rfOe2Fxp7+P
-hFcdbbuzmY4fmKSXQjAQgp4qquHXJRDr
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/uat" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/maint" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/training" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/uat" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/maint" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/training" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/uat" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/maint" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/training" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/uat" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/maint" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/training" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/uat" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/maint" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/training" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/uat" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/maint" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shibboleth.swetswise.com/shibboleth/auth/rcv/saml2/training" index="23"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Swets Information Services B.V.</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">SwetsWise</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.swetswise.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Erwin</GivenName>
-    <SurName>Booy</SurName>
-    <EmailAddress>ebooy@nl.swets.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Kees Jan</GivenName>
-    <SurName>Voogd</SurName>
-    <EmailAddress>kjvoogd@nl.swets.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.sympa.org-shibboleth.xml b/swamid-interfederations-2.0/www.sympa.org-shibboleth.xml
deleted file mode 100644
index e15d7b1b..00000000
--- a/swamid-interfederations-2.0/www.sympa.org-shibboleth.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.sympa.org/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-01-21T14:53:29Z">
-      <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:AttributeValue>https://federation.renater.fr/category/web</saml:AttributeValue>
-        <saml:AttributeValue>https://federation.renater.fr/scope/community</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md: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">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Sympa.org - le site web</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="fr">https://www.sympa.org</mdui:InformationURL>
-        <mdui:Description xml:lang="en">Sympa mailing list software website. The user manual can be edited by subscribers to sympa-users@listes.renater.fr</mdui:Description>
-        <mdui:DisplayName xml:lang="fr">Sympa.org - le site web</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Le wiki http://www.sympa.org est accessible aux contributeurs issus des universités. Les abonnés à sympa-fr@listes.renater.fr peuvent l'éditer.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.sympa.org/coco.html</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>
-					      MIIC6zCCAdOgAwIBAgIJAOHudP2hFB4CMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDHZlc3BhLmNydS5mcjAeFw0xNTEwMDgxMjQwNTJaFw0yNTEwMDUxMjQwNTJa
-MBcxFTATBgNVBAMTDHZlc3BhLmNydS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAO1tGvktL1ZEgQfLlUP1EIFIJuECoObOk+TLx5y3Rr7pEQDVpeEf
-YKMcqkjsvYKUDfUX9EwfjHh8e5kgVRQHi1Lr8lgC+e0VwUu4pRlxkwYLUd4o/nJh
-FLqTlddTwmR5vuQ9HVHUUqDPRrm7N+wf/J1D3v0/JRyEYbQaz/AY5GjawkXB+ioN
-Hguk6jaYC72W79fQlBem1KSy7TeQXvPsHp1RiYeTqPOWWrB/Fmc22nQrf69gVUNA
-es9/l3b0dv8Dr3qjFKsdK/jMdSJGN2HN7CqfTrBLC7c2e43ZuUGe1+UOqqMyNpYP
-/QThy0tubqQdSGOqc8LqJSp81yR5HsQhSs8CAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-dmVzcGEuY3J1LmZyMB0GA1UdDgQWBBQ9Qo9CfGWq0U/7Ouy8ChZr0vi+yDANBgkq
-hkiG9w0BAQUFAAOCAQEAKlKD1Nwj0vltOGgrmW0Q3bef8YDb3p9GSKtXEjrx8hSj
-YkHq77pE9Me8EMMKRa6/s/CX186El/dIu4o7SwNEn8alktut0tVwx/UujI7E9YtG
-HyIWBiI0QbiVz3xnU8q7oDa+2679yDZeiB1VEGM6fH8xePe/zysseNt38R+LZFaN
-W2Re4EiVyTm7cyC0db/eBPCPzd09FXdYFJiHuTOXfNB7Nwe+6QuIrNr59YXbISXi
-LB62PE5cL3gx719J0ga1Lze3M0QxvGi+gJibdoEne8np8EQUZ2ipdx+S2q6aFo0m
-BT0r1p+WzgcEohiQNP8sn1rNIh1JfKl3BIlXGFXLcg==
-					    </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>
-					      MIIC6zCCAdOgAwIBAgIJAOHudP2hFB4CMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
-BAMTDHZlc3BhLmNydS5mcjAeFw0xNTEwMDgxMjQwNTJaFw0yNTEwMDUxMjQwNTJa
-MBcxFTATBgNVBAMTDHZlc3BhLmNydS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAO1tGvktL1ZEgQfLlUP1EIFIJuECoObOk+TLx5y3Rr7pEQDVpeEf
-YKMcqkjsvYKUDfUX9EwfjHh8e5kgVRQHi1Lr8lgC+e0VwUu4pRlxkwYLUd4o/nJh
-FLqTlddTwmR5vuQ9HVHUUqDPRrm7N+wf/J1D3v0/JRyEYbQaz/AY5GjawkXB+ioN
-Hguk6jaYC72W79fQlBem1KSy7TeQXvPsHp1RiYeTqPOWWrB/Fmc22nQrf69gVUNA
-es9/l3b0dv8Dr3qjFKsdK/jMdSJGN2HN7CqfTrBLC7c2e43ZuUGe1+UOqqMyNpYP
-/QThy0tubqQdSGOqc8LqJSp81yR5HsQhSs8CAwEAAaM6MDgwFwYDVR0RBBAwDoIM
-dmVzcGEuY3J1LmZyMB0GA1UdDgQWBBQ9Qo9CfGWq0U/7Ouy8ChZr0vi+yDANBgkq
-hkiG9w0BAQUFAAOCAQEAKlKD1Nwj0vltOGgrmW0Q3bef8YDb3p9GSKtXEjrx8hSj
-YkHq77pE9Me8EMMKRa6/s/CX186El/dIu4o7SwNEn8alktut0tVwx/UujI7E9YtG
-HyIWBiI0QbiVz3xnU8q7oDa+2679yDZeiB1VEGM6fH8xePe/zysseNt38R+LZFaN
-W2Re4EiVyTm7cyC0db/eBPCPzd09FXdYFJiHuTOXfNB7Nwe+6QuIrNr59YXbISXi
-LB62PE5cL3gx719J0ga1Lze3M0QxvGi+gJibdoEne8np8EQUZ2ipdx+S2q6aFo0m
-BT0r1p+WzgcEohiQNP8sn1rNIh1JfKl3BIlXGFXLcg==
-					    </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>
-					      MIICejCCAeOgAwIBAgIJAJnxdJGVfGAeMA0GCSqGSIb3DQEBBQUAMDMxCzAJBgNV
-BAYTAkZSMQwwCgYDVQQKEwNDUlUxFjAUBgNVBAMTDXd3dy5zeW1wYS5vcmcwHhcN
-MDgwMzIwMTQ0NTQ4WhcNMjgwMzE1MTQ0NTQ4WjAzMQswCQYDVQQGEwJGUjEMMAoG
-A1UEChMDQ1JVMRYwFAYDVQQDEw13d3cuc3ltcGEub3JnMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQChP31mNdgalD3PWJHh/P+O1KHVhRCLXOVXVMSg8VHI+0rR
-fX6Ajc2ux7WurpelXmo4nafAGEKoz5Y8m9Ph/Zgtb/PXQC3ydWvDD4DIPfKC2jhR
-aEbZSstXhU3pZY0lLgu7ZHe8RuWmuZT11RKCQXDu2IFBSGIg51TnJuUjSw0sYQID
-AQABo4GVMIGSMB0GA1UdDgQWBBQ295bivnTKDVtbzYASdob7fDrnUjBjBgNVHSME
-XDBagBQ295bivnTKDVtbzYASdob7fDrnUqE3pDUwMzELMAkGA1UEBhMCRlIxDDAK
-BgNVBAoTA0NSVTEWMBQGA1UEAxMNd3d3LnN5bXBhLm9yZ4IJAJnxdJGVfGAeMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAlB3jg+IyBkO45Wo61YE32N6O
-0+pVQaMGMf3jCwxRrM96dSJHj0NhTor3ZIsqzhRYZDRR67wJzk0D7QQCnOW90mlg
-d99p9wFKc5VN5aKrlDrU5guLjbl4avX/IEi1Sjj2eio6sKE/E5JsUs0ct3edtkXB
-QfGIdEliJJoWsN5ba6I=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sympa.org/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sympa.org/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="fr">Sympa.org - le site web</md:ServiceName>
-      <md:ServiceDescription xml:lang="fr">Le wiki http://www.sympa.org est accessible aux contributeurs issus des universités. Les abonnés à sympa-fr@listes.renater.fr peuvent l'éditer.</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Sympa mailing list software website. The user manual can be edited by subscribers to sympa-users@listes.renater.fr</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:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">GIP RENATER</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GIP RENATER</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.renater.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>sympa-authors@listes.renater.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.tandfebooks.com-shibboleth.xml b/swamid-interfederations-2.0/www.tandfebooks.com-shibboleth.xml
deleted file mode 100644
index 8b764640..00000000
--- a/swamid-interfederations-2.0/www.tandfebooks.com-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://www.tandfebooks.com/shibboleth">
-  <!--
-		This is a Taylor & Francis Group eBooks OpenSAML SP for Atypon Systems.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-23T11:09:57Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDqzCCApOgAwIBAgIJAMt/QdGE5hPLMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
-						VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xh
-						cmExHTAbBgNVBAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlw
-						b24gU3lzdGVtcywgSW5jLjEcMBoGA1UEAxMTd3d3LnRhbmRmZWJvb2tzLmNvbTAe
-						Fw0xMjAyMjAyMDI3NTNaFw0yMjAyMTcyMDI3NTNaMIGUMQswCQYDVQQGEwJVUzET
-						MBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExHTAbBgNV
-						BAoTFEF0eXBvbiBTeXN0ZW1zLCBJbmMuMR0wGwYDVQQLExRBdHlwb24gU3lzdGVt
-						cywgSW5jLjEcMBoGA1UEAxMTd3d3LnRhbmRmZWJvb2tzLmNvbTCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAMTY5ygzkDHzb+UXnQrrh3qvPfzax9zG5v2G
-						X8JszKRVebzH2Aq0a7/B1pWLbON6bA+EdW9AHhGabcK01VtRGA/pm6ASvozsO5I8
-						TGrBc7Gzq2Pb92Wid4u7Ai7gm7lLZNbaRsEdMVy9EZu7an15+vLGoWp/TfNSCXmB
-						1QyJH9uABduXp0dM6aophIIzbMzIVb2i0rmf7D3nUeGi/+0mqv7zCPykwdgRUORf
-						Sc5pC8QY2B6u/d1ZHZW/tfZtOHYBkY5bu6c20Y338lsiSCgA0rfpoBjArdsvmC+Y
-						VKB4eNNZ3LqohYYcr9eukIHx0c9UYHnd68RM8W0rSIp5QdW3pzECAwEAATANBgkq
-						hkiG9w0BAQUFAAOCAQEAhiPqifO9fklkF6j+//td0fJNsKxJsxKHRIeznMEt9Utk
-						ah8qEz6MLT/j51PnrXpG4n+YAtxmQ2JPO/FVH5NbqSxWERrvqbUxgp5+AiVr8Uvs
-						BsmnNG7ZwgC0qxKJwSduW+Der4ss4L/pUm78+0xjPbQDczkZ9DTKR7p93JJlUaGG
-						8dZf6/GkUSxNIzZiVH7Md8DA9d20feXFiWjMYURIn4HysYLsT0/14o+X41NogxIH
-						7klAv8c4dTvFs80m4uZsDo6XpJGEfWJvkY6QqxCrwCMAc2lq9k1UqIjEV0BeoB2G
-						hcbFdcOTCuBK+8YKVxLElKzwQCc0OYx1mQkGYcA7eA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tandfebooks.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tandfebooks.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tandfebooks.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: Taylor &amp; Francis Group eBooks</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tandfebooks.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.tandfonline.com-shibboleth.xml b/swamid-interfederations-2.0/www.tandfonline.com-shibboleth.xml
deleted file mode 100644
index e251f83d..00000000
--- a/swamid-interfederations-2.0/www.tandfonline.com-shibboleth.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.tandfonline.com/shibboleth">
-  <!--
-		This is a 'Taylor & Francis Online' OpenSAML SP for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDKDCCAhCgAwIBAgIJAMO9zKBOInK0MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3d3dy50YW5kZm9ubGluZS5jb20wHhcNMTQwMzE0MDUwNDAyWhcNMTcwMzEz
-						MDUwNDAyWjAeMRwwGgYDVQQDExN3d3cudGFuZGZvbmxpbmUuY29tMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+7mPo1QcQmquZzEQh1lPd0/52x3tUmeS
-						h+BnInF0Ddi412jA/73bOkJw8DUCeFMpyDLq5KIEh5hpWko/hiN2MV440jHOOz4c
-						C6q6FIKo0VbnIG1J8W3llePya/7RgXMApLZIO9JlTbru2qcCibgk9cjnKdLYGRLQ
-						OQYZJs4QyA9nN9n53e7Ov7JVOb7R1y77o8h39JhLNCvDlySfhDTeggal2yNb24xf
-						eL4Ee5cKOWdgyo6g5FkHmXn5jsIeBhdI26PyJa46s2/v+3vRzYg/7SpXPj5jZ5JH
-						9VmweGU01MjqvHQVYd7Bfi0Ndik4otfE5nneOQngI3fR5nWV5oGngwIDAQABo2kw
-						ZzBGBgNVHREEPzA9ghN3d3cudGFuZGZvbmxpbmUuY29thiZodHRwczovL3d3dy50
-						YW5kZm9ubGluZS5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUTh9Dhbn3dZ+Os2eC
-						RsJIDjh7+mowDQYJKoZIhvcNAQEFBQADggEBABhElasaAVvlbl3ZvZQlhEcQpqQD
-						TvZRxncGrz6moC3pHnUho0L3ZphAnMyHUQlZfg8uZuJBeWTOPYCIYuqQXn+pQ+Si
-						S9n2L8UnoCgNI3df9DDYb7tzpSipYGEXGOw2RUWr1PUD8GQtzP5jkzMPs0eAm/U3
-						pmChGsS7HZbNle9fyBUha2UFebCWFhjUm2iLsN2+kCOkfxEpwLTy26cz1MBqkhDN
-						hNI51amuMNcL46a8+E1IW8L59W656YzJnJ8I2A9nuHdmWQGs5jICuG4dr7+70wCP
-						Lv0VNFSwnTxjA5Rocmae95yzHIE0I4tW7VD+q+yeEStXHCCN1rWHgLWJb/U=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tandfonline.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tandfonline.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tandfonline.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Atypon Systems: Taylor &amp; Francis Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.tandfonline.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.teamseer.com-ukfederation.xml b/swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml
deleted file mode 100644
index cc93f08a..00000000
--- a/swamid-interfederations-2.0/www.teamseer.com-ukfederation.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.teamseer.com/ukfederation">
-  <!--
-		This is a Shibboleth SP for TeamSeer Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-12-10T14:24: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://www.teamseer.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.teamseer.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDaTCCAlGgAwIBAgIJAICE7/jPSr5LMA0GCSqGSIb3DQEBBQUAMEsxCzAJBgNV
-						BAYTAlVLMRMwEQYDVQQIDApTb21lLVN0YXRlMQ8wDQYDVQQHDAZMb25kb24xFjAU
-						BgNVBAoMDUFjY2VzcyBVSyBMdGQwHhcNMTQxMjA5MTEwNTI5WhcNMjQxMjE2MTEw
-						NTI5WjBLMQswCQYDVQQGEwJVSzETMBEGA1UECAwKU29tZS1TdGF0ZTEPMA0GA1UE
-						BwwGTG9uZG9uMRYwFAYDVQQKDA1BY2Nlc3MgVUsgTHRkMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAwWHYHwKuB/4PcaGPXVjO/nhbVBtEVdgjTL47KV9W
-						45LGBCUx9FhgqOEKOMzFHDkV1aX8A7sfCHHTq64sg7DCepfXMO+fWQ3Cuw0xZ5/h
-						Hv4dKwpc3w9g83b5SXGrOA2jQwU/s+mV9I6UKw60kkxIuxr+gE3iNPHKLuMDfk+N
-						7Rhb3DAat9tfQJWgWV71e4bapCX5dYm18nl7ILsqZC/CkZs7ITN4GiJsa2f46/UR
-						RRvfwiFvqIrLz8Xeel3GgI9ajgon44XizbTez6DUa5rX5NWzNWYsS8OiAnP9gQHr
-						PKUhs7OhvRtfMq/TE4NHcU7JNXfR81JVmIZ0n/ty4hGUFwIDAQABo1AwTjAdBgNV
-						HQ4EFgQUJFlLp9zjeGPbXAfqzt8W8qvDU+wwHwYDVR0jBBgwFoAUJFlLp9zjeGPb
-						XAfqzt8W8qvDU+wwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAhnmk
-						R5GKW7v5nah8a7Q0hDJuOaM1Nw7XupqjFvoBrb8bYftKxUlORmQDcnSbLrT8PncN
-						81H5xPhSNKvz1TcR/nnnN2KVFIukrOOrxFOu3UB3r2W83ToIzlB4wvOhxh1gfp0n
-						DurQ3Hqsnq0VI7YRuAqDKVOS7dZGn7ueYer8OQZhqAHvudtWFE5yShZLDmJVX06c
-						mMmYQV6H2AJ1m8VtZ3iMaOHYdYZECb8VIZTSD3C2Cu7RIGlu0ZkGBH6sXV4R/kfw
-						LnFmiQIt4pfOl5Gctx3NhRDUKgH1gesJ1RgbONnmw/HY4S8NB/0lZqrvM5ausXzC
-						zKby7313KTnn/XqGNg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.teamseer.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.teamseer.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.teamseer.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.teamseer.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.teamseer.com/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.teamseer.com/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.teamseer.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.teamseer.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.teamseer.com/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.teamseer.com/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.teamseer.com/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">TeamSeer Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">TeamSeer</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.teamseer.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>TeamSeer Support</GivenName>
-    <EmailAddress>mailto:support@teamseer.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mahbub</GivenName>
-    <SurName>Kabir</SurName>
-    <EmailAddress>mailto:Mahbub.Kabir@teamseer.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Flaviu Gheorghe</GivenName>
-    <SurName>Grosan</SurName>
-    <EmailAddress>mailto:Flaviu.Grosan@theaccessgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ted.is.ed.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ted.is.ed.ac.uk-shibboleth.xml
deleted file mode 100644
index 0f3860b9..00000000
--- a/swamid-interfederations-2.0/www.ted.is.ed.ac.uk-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://www.ted.is.ed.ac.uk/shibboleth">
-  <!--
-		This is a "Timetabling Web Apps - LIVE Environment" Shibboleth SP for the University of Edinburgh.
-	-->
-  <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="2013-08-26T15:13:49Z"/>
-  </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.ted.is.ed.ac.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://www.ted.is.ed.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDAzCCAeugAwIBAgIJAJ3YiJdUsT7jMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-						BAMTFHNhdC13ZWIta2IxLmVkLmFjLnVrMB4XDTEzMDgyMzEwMDgxN1oXDTIzMDgy
-						MTEwMDgxN1owHzEdMBsGA1UEAxMUc2F0LXdlYi1rYjEuZWQuYWMudWswggEiMA0G
-						CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrFiKhdOEvU89ij8mKMa7NdLRqsFVl
-						mNqHpoBoiQrkDQLJfMnZfnPmEW03DEXRP3bCUSd/luVnT9wpwGY7Q1pLbj94SY+M
-						sNt9en45BA1IkMeATfgyr37t88JjlubD6vTX1WsvectZHalqEBnvV/ls/8qr04vF
-						rHx11uvw16mkoPwBkaVrcQKXd2Nez7vTwJ8xBuCaYLiVXdVDdfXIPlya26obsRdp
-						DUUfOtiW3EijOGV3DXVVxLeeJBhjQABG7cwFqcOOEHstgcutgI8TlNTlN06Jhn2H
-						/xzhqqXJ2XNmRxL4t4JP0exfdFkKHcH9FMTnL7Rs/yoCpkQoX1vp7p1DAgMBAAGj
-						QjBAMB8GA1UdEQQYMBaCFHNhdC13ZWIta2IxLmVkLmFjLnVrMB0GA1UdDgQWBBQL
-						y0wikQoOdbzvgXOhl9gORZdTkjANBgkqhkiG9w0BAQUFAAOCAQEAd85npv0bEMrp
-						Pk60lSMv2S8JDAlK4o9uh/QIzk0scfJkJKAJsrVc8NJ7OFfLFCmCIKLmUVJBTe1G
-						O12NYxJC6nvsuQArkmVvqUKrAsmBO7Z+00vcW82HuxdCcIpl85GrX5yOOGgP3kMp
-						V8LKUSLktqcVeUE1hiTCHYTEyml1L/1iucB4bGWXrDXvBvQUlUAeVk40Qx6iSNE6
-						mIuZGGSoua0Mh2D5wCNnju41QILozm0W9lGYdzYsarfltKE7BVQlglOGnbJhIFVy
-						BK/4nId/6jClutTo+cJejqf4BcgZhstRYp9YBnxYsWG405B/8dSzchSbi1HHYrp2
-						F2HTxES/+A==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.ted.is.ed.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ted.is.ed.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Edinburgh</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Timetabling Web Apps - LIVE Environment</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>IS Apps Technology Management</GivenName>
-    <EmailAddress>mailto:apps-certs@mlist.is.ed.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml b/swamid-interfederations-2.0/www.theacademiclibrary.com-shibboleth.xml
deleted file mode 100644
index e3ab2583..00000000
--- a/swamid-interfederations-2.0/www.theacademiclibrary.com-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://www.theacademiclibrary.com/shibboleth">
-  <!--
-		This is a service provider for The Academic Library Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIID1DCCArwCCQD9Y+KomO9ukjANBgkqhkiG9w0BAQUFADCBqzELMAkGA1UEBhMC
-						R0IxEDAOBgNVBAgTB0VuZ2xhbmQxDzANBgNVBAcTBkxvbmRvbjEhMB8GA1UEChMY
-						VGhlIEFjYWRlbWljIExpYnJhcnkgTHRkMQswCQYDVQQLEwJJVDEdMBsGA1UEAxMU
-						VGhlIEFjYWRlbWljIExpYnJhcnkxKjAoBgkqhkiG9w0BCQEWG2luZm9AdGhlYWNh
-						ZGVtaWNsaWJyYXJ5LmNvbTAeFw0xMTA2MjkxMzU5MjNaFw0zMTA2MjQxMzU5MjNa
-						MIGrMQswCQYDVQQGEwJHQjEQMA4GA1UECBMHRW5nbGFuZDEPMA0GA1UEBxMGTG9u
-						ZG9uMSEwHwYDVQQKExhUaGUgQWNhZGVtaWMgTGlicmFyeSBMdGQxCzAJBgNVBAsT
-						AklUMR0wGwYDVQQDExRUaGUgQWNhZGVtaWMgTGlicmFyeTEqMCgGCSqGSIb3DQEJ
-						ARYbaW5mb0B0aGVhY2FkZW1pY2xpYnJhcnkuY29tMIIBIjANBgkqhkiG9w0BAQEF
-						AAOCAQ8AMIIBCgKCAQEArlZeMdafmBZRy0it8Gq4kFczwd6flPFFqv7pYMFdB0rs
-						zhZqqlsMEb9OA9rJIyoiaf1p2UZdeXqymUE8v5+F69/Z7Oo7LgOM7eF3UPPsy0+G
-						nTFKQag49b0n7H7ykpaLC6gaEzWPbgUZKSsbQ8Jx4EWsEXL11MP3U4iRwqEwm16V
-						BFfC2t6hrBIP+igj7e5lOWidHs5t8RLziN1xmC8bsVvBMLBT7fEP1LAXoLcnn/Y8
-						GsiewWfffCBmwNFat6MkzCkdh3UAbxcg2x3Nuj9ayq33G2x5wZBhA/nsgZERhV+A
-						AtuokFyyaq4JlRTgaKCUvmqmuztPdqwr+bCN9IipLQIDAQABMA0GCSqGSIb3DQEB
-						BQUAA4IBAQAwa4Y9YQoU+1legqiHTu9EMEapPOSI1IPwIxrYXvazKSbT6hQ13Tii
-						pWjYRU6hDuVlMLYPs+HiiiOYhGQ0bB0HjIJiZhTRhVEmok5uJFUtJVounIA/Z/W6
-						gycuhukZEDMZU+LMv3QXX4Yi13uFUh0E87hRjEgLAQ+AYoEUvdxm5WsY7gXu7k7h
-						SEspacCKffZwP6vH5zlzK8OZ5kL1vKM/ZCrk/mT/V+QiarI04mwk5gKHOidHe2Ms
-						IrC5pzCgN8Vy0am0QOFmRZVeXNFUt6cJCenXXh0P0qZgOXyjI+bhtzbKOc3bCcqq
-						eJSiWxJhFLlf2d1X7PiPTLqUlhwY/QXK
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.theacademiclibrary.com/openathens/openathenssp_isapi.dll" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.theacademiclibrary.com/openathens/openathenssp_isapi.dll" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.theacademiclibrary.com/shib/shibrcv.oasp" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.theacademiclibrary.com/shib/shibrcv.oasp" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.theacademiclibrary.com/shibrcv.oasp" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.theacademiclibrary.com/shibrcv.oasp" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Academic Library Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Academic Library</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.theacademiclibrary.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Pat</GivenName>
-    <SurName>Coyne</SurName>
-    <EmailAddress>mailto:info@theacademiclibrary.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Pat</GivenName>
-    <SurName>Coyne</SurName>
-    <EmailAddress>mailto:info@theacademiclibrary.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.theunionmmu.org-shibboleth.xml b/swamid-interfederations-2.0/www.theunionmmu.org-shibboleth.xml
deleted file mode 100644
index 63b3825b..00000000
--- a/swamid-interfederations-2.0/www.theunionmmu.org-shibboleth.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.theunionmmu.org/shibboleth">
-  <!--
-		This is a "Manchester Metropolitan Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-08-20T10:00:33Z">
-      <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://www.theunionmmu.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.theunionmmu.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.theunionmmu.org/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.theunionmmu.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.theunionmmu.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.theunionmmu.org/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.theunionmmu.org/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.theunionmmu.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.theunionmmu.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.theunionmmu.org/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.theunionmmu.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Manchester Metropolitan Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.theunionmmu.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.thieme-connect.de.xml b/swamid-interfederations-2.0/www.thieme-connect.de.xml
deleted file mode 100644
index fab54077..00000000
--- a/swamid-interfederations-2.0/www.thieme-connect.de.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.thieme-connect.de/ejournals/shib-login">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.thieme-connect.de/Shibboleth.sso/Login" index="1"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.thieme-connect.com/Shibboleth.sso/Login" index="2"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.thieme-connect.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.thieme-connect.de,OU=Terms of use at www.verisign.com/rpa (c)05,OU=EDV,O=Georg Thieme Verlag KG,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIQaPkkRHSsYs5cFgJ+NXut4zANBgkqhkiG9w0BAQUFADCB
-vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
-VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
-DTExMDUyNDAwMDAwMFoXDTEzMDYyNDIzNTk1OVowgcIxCzAJBgNVBAYTAkRFMRsw
-GQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcUCVN0dXR0Z2FydDEf
-MB0GA1UEChQWR2VvcmcgVGhpZW1lIFZlcmxhZyBLRzEMMAoGA1UECxQDRURWMTMw
-MQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3LnZlcmlzaWduLmNvbS9ycGEgKGMp
-MDUxHjAcBgNVBAMUFXd3dy50aGllbWUtY29ubmVjdC5kZTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAy7N3v5982eULiKneK7c/7GQEF7mSUwS4WT6IGQUFacPR
-y+UaIWYpkD2fo3JOzD9EvJYY31Jr2D7woUxUEGhOZPIihkXV3wmnFYH1MZOuAFGu
-vv9xRNtuZy0xQL9XBfMhXl8tZzlSk6Q+c5O29zn7KsnAHqMuLCLWe1sGvmRFvjkC
-AwEAAaOCAbMwggGvMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEQGA1UdIAQ9MDsw
-OQYLYIZIAYb4RQEHFwMwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVyaXNp
-Z24uY29tL3JwYTBBBgNVHR8EOjA4MDagNKAyhjBodHRwOi8vU1ZSSW50bC1HMy1j
-cmwudmVyaXNpZ24uY29tL1NWUkludGxHMy5jcmwwKAYDVR0lBCEwHwYIKwYBBQUH
-AwEGCCsGAQUFBwMCBglghkgBhvhCBAEwcgYIKwYBBQUHAQEEZjBkMCQGCCsGAQUF
-BzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5jb20wPAYIKwYBBQUHMAKGMGh0dHA6
-Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNlcjBuBggr
-BgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRL
-a7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20v
-dnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAFfyCoUP94l9AvTkRjl/ZFm9
-zp/r8MojOzcYHeYJ6ICJ92utCJSJSoErI2BH4Ril61esPJW6OtVEqRpbnv3DHHx6
-yFzZuLXEd+AMz0uBiGBrDs9pA0PVsY3jwaKgDrfJ/QvD5tz/Pl3NS1NR4NVPmbwr
-XyFtLfp8jQpAwbiY1oI8JOKidxvJrQ9HU55PI4rPfC4jOn1lvHsls2KOzButAcXh
-ZMeJk4CGI8D/IajWeE5LKbEWWIvneaICam2oTmU3L1OWMSD7kfht9KYTTA/FEcD+
-nwgsd3yT09XaawJMzO16JyyCoE/Mg/CXs70KAkju/noY71pLGmyJ44r/QTnAtCw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.thieme-connect.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.thieme-connect.de,OU=Terms of use at www.verisign.com/rpa (c)05,OU=EDV,O=Georg Thieme Verlag KG,L=Stuttgart,ST=Baden-Wuerttemberg,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFOzCCBCOgAwIBAgIQaPkkRHSsYs5cFgJ+NXut4zANBgkqhkiG9w0BAQUFADCB
-vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
-VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
-DTExMDUyNDAwMDAwMFoXDTEzMDYyNDIzNTk1OVowgcIxCzAJBgNVBAYTAkRFMRsw
-GQYDVQQIExJCYWRlbi1XdWVydHRlbWJlcmcxEjAQBgNVBAcUCVN0dXR0Z2FydDEf
-MB0GA1UEChQWR2VvcmcgVGhpZW1lIFZlcmxhZyBLRzEMMAoGA1UECxQDRURWMTMw
-MQYDVQQLFCpUZXJtcyBvZiB1c2UgYXQgd3d3LnZlcmlzaWduLmNvbS9ycGEgKGMp
-MDUxHjAcBgNVBAMUFXd3dy50aGllbWUtY29ubmVjdC5kZTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAy7N3v5982eULiKneK7c/7GQEF7mSUwS4WT6IGQUFacPR
-y+UaIWYpkD2fo3JOzD9EvJYY31Jr2D7woUxUEGhOZPIihkXV3wmnFYH1MZOuAFGu
-vv9xRNtuZy0xQL9XBfMhXl8tZzlSk6Q+c5O29zn7KsnAHqMuLCLWe1sGvmRFvjkC
-AwEAAaOCAbMwggGvMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgWgMEQGA1UdIAQ9MDsw
-OQYLYIZIAYb4RQEHFwMwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVyaXNp
-Z24uY29tL3JwYTBBBgNVHR8EOjA4MDagNKAyhjBodHRwOi8vU1ZSSW50bC1HMy1j
-cmwudmVyaXNpZ24uY29tL1NWUkludGxHMy5jcmwwKAYDVR0lBCEwHwYIKwYBBQUH
-AwEGCCsGAQUFBwMCBglghkgBhvhCBAEwcgYIKwYBBQUHAQEEZjBkMCQGCCsGAQUF
-BzABhhhodHRwOi8vb2NzcC52ZXJpc2lnbi5jb20wPAYIKwYBBQUHMAKGMGh0dHA6
-Ly9TVlJJbnRsLUczLWFpYS52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNlcjBuBggr
-BgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRL
-a7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20v
-dnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAFfyCoUP94l9AvTkRjl/ZFm9
-zp/r8MojOzcYHeYJ6ICJ92utCJSJSoErI2BH4Ril61esPJW6OtVEqRpbnv3DHHx6
-yFzZuLXEd+AMz0uBiGBrDs9pA0PVsY3jwaKgDrfJ/QvD5tz/Pl3NS1NR4NVPmbwr
-XyFtLfp8jQpAwbiY1oI8JOKidxvJrQ9HU55PI4rPfC4jOn1lvHsls2KOzButAcXh
-ZMeJk4CGI8D/IajWeE5LKbEWWIvneaICam2oTmU3L1OWMSD7kfht9KYTTA/FEcD+
-nwgsd3yT09XaawJMzO16JyyCoE/Mg/CXs70KAkju/noY71pLGmyJ44r/QTnAtCw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.thieme-connect.de/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thieme-connect.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.thieme-connect.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.thieme-connect.de/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.thieme-connect.de/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thieme-connect.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.thieme-connect.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.thieme-connect.de/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.thieme-connect.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.thieme-connect.com/Shibboleth.sso/SAML/Artifact" index="12"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Georg Thieme Verlag KG</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">https://www.thieme-connect.de/</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.thieme-connect.de/ejournals/home.html</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Manfred</GivenName>
-    <SurName>Deutsch</SurName>
-    <EmailAddress>thiemedev@fiz-karlsruhe.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ute</GivenName>
-    <SurName>Günther</SurName>
-    <EmailAddress>ute.guenther@thieme.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.tigtagworld.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.tigtagworld.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 1c81e5db..00000000
--- a/swamid-interfederations-2.0/www.tigtagworld.co.uk-shibboleth-sp.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.tigtagworld.co.uk/shibboleth-sp">
-  <!--
-		This is a "TigTag UK" Shibboleth SP for Twig World 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-12-10T11: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://www.tigtagworld.co.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.tigtagworld.co.uk/Shibboleth.sso/shibtest"/>
-      <init: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.tigtagworld.co.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDMzCCAhugAwIBAgIJAPUDpIXdPLQCMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-						BAMTFXd3dy50aWd0YWd3b3JsZC5jby51azAeFw0xMzEyMDkxNTE0MDNaFw0yMzEy
-						MDcxNTE0MDNaMCAxHjAcBgNVBAMTFXd3dy50aWd0YWd3b3JsZC5jby51azCCASIw
-						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM2eUNw4sKscVcTmTWYUqKpujQA6
-						Ysyi/nwDvPo8PfQU6wTmMdEcKXMOjZsow/QutghdQuVq1jNr4A13BLUrgvdMfZLj
-						e1P+2kYuDJU0A1iVtin30x7GqZpgD3OMlszQGaV/TUNypgY62x9Sqh88zzX+8r+t
-						/xWvd47jDO5m6vhP2zZHY3Fz+Jrs4V7H3zNk2NCMEumHbOVgX45selWJfp7Ro6v8
-						HN2G9eH719bhFdQliSbBAkjnfjU0sTadWvXBx8OF1Ecq98O+hxxnNuSBYTZvTpAw
-						daBjD/kcLVs96PKYXP8VtA5IQpRyYdjlOaqEDDZF+i20hdcvlQx/U/pkE4sCAwEA
-						AaNwMG4wTQYDVR0RBEYwRIIVd3d3LnRpZ3RhZ3dvcmxkLmNvLnVrhitodHRwczov
-						L3d3dy50aWd0YWd3b3JsZC5jby51ay9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBRy
-						io1sVRyt8tHXK4jOqpqBVVfwRzANBgkqhkiG9w0BAQUFAAOCAQEAbq3uePohbhLy
-						jcS7TYj0mDHXyF9spiYzADXfhX88P43MjdBzMkqUqNR/22LC1W6nSbRBTU4Zj17E
-						B1ZHHXZR8tP47JZEqmmzuFreaONr7aHOczJdYQirG7IA6MJlFZDErzeHG9QqdFbH
-						f/Ky6+S0GChOxccumyBfRKtwIs7NP3fkDqh8KU0evdItzSoZtMBFEKR9v7116+Mv
-						EhuVc4TsNZNqufBQ3yxvERxMyX5Uvhb+2TGfzZAshDfBcvn34Ga7VfUM5CJILNXZ
-						gKZ8fY0XYWXYveYelRTKkOYKLV85AfdHOq/6OTSu39hDlFjhTQXFqeIsrBn1YmUX
-						o+Sieepoag==
-					</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.tigtagworld.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.tigtagworld.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Twig World Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">TigTag UK Shibboleth SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.twig-world.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>David</GivenName>
-    <SurName>Munn</SurName>
-    <EmailAddress>mailto:dmunn@twig-world.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Munn</SurName>
-    <EmailAddress>mailto:dmunn@twig-world.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.tu-chemnitz.de.xml b/swamid-interfederations-2.0/www.tu-chemnitz.de.xml
deleted file mode 100644
index b82677fb..00000000
--- a/swamid-interfederations-2.0/www.tu-chemnitz.de.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.tu-chemnitz.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.tu-chemnitz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECkKcyjANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
-IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
-Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
-MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzA0MTYwNzAx
-MTZaFw0xMjA0MTQwNzAxMTZaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
-bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
-YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd3dy50dS1jaGVtbml0ei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRkHtGWL06QzWqk422QXnfS
-Uw9ZswH5vtTEYN2N0OX1IKcAZ2Hf8fAy6jnk0nQ1ckUpDzQ2XWNHYWSkx1w8rBZL
-PgoBh8fZDU5xFbZdr9hiuS3CAySR7AvEJpOIiFVjLhr659dW+xwCvMre01d/7gez
-bw395QTkRvTtACBwYjv202bYfeuEoW+EBIfk44sDIUlid9VvB0Bk2VDaQEXsmqgK
-P9Wx/F+KdoFLIbR6pTfyOi8U/3SvRWIhKedYEwr3InfbHScd7E21AqQ2MqaQUbTG
-FBNU6wc+Y90gvLPJgVyKqsL+L4SYY/05r1Z8iMAp2ak7ze2oi4GmpQQvDisZ3r8C
-AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUjphXqaHhxFUlbVxkQtqt4iVC
-3u0wHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
-d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
-MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAGuJSdTDZbQl6D9b0nJcTOB9ZQLMTq3gQVrYtqR8IpsjBzi8E
-JdTTTeNQ6K3ZhoiD+CwDG55qFGWKPQF3Mf5x+KTKfCIjgjnIrrBJyev72rVxqiK0
-og7H1PbkUg1lbEimCSWg+Wx/BJSwpmddxnVYcEXMYxmGcdt66Swxlg+CowC5dVL9
-6Hr98O+KtqI2NRhuH6aqUqumD8EP6YR6/0JZeo1SNM3y/QQEQoyVgPLob5uNofdr
-g2twMUgpt0hGea3sPbmrlTLIuIvtAWqjaDidsyUKiuveWSlh4YbshZCNH+r6TzLe
-zBo9/9WlA25buTEEDwGKCBOkN47rnnVLwcmqBw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.tu-chemnitz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.tu-chemnitz.de,OU=Universitaetsrechenzentrum,O=Technische Universitaet Chemnitz,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFiDCCBHCgAwIBAgIECkKcyjANBgkqhkiG9w0BAQUFADCBvTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIFRlY2huaXNjaGUgVW5pdmVyc2l0YWV0IENoZW1uaXR6MSMw
-IQYDVQQLExpVbml2ZXJzaXRhZXRzcmVjaGVuemVudHJ1bTE8MDoGA1UEAxMzVFUg
-Q2hlbW5pdHogQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBUVUMvVVJaIENBIEcz
-MSAwHgYJKoZIhvcNAQkBFhFjYUB0dS1jaGVtbml0ei5kZTAeFw0wNzA0MTYwNzAx
-MTZaFw0xMjA0MTQwNzAxMTZaMHoxCzAJBgNVBAYTAkRFMSkwJwYDVQQKEyBUZWNo
-bmlzY2hlIFVuaXZlcnNpdGFldCBDaGVtbml0ejEjMCEGA1UECxMaVW5pdmVyc2l0
-YWV0c3JlY2hlbnplbnRydW0xGzAZBgNVBAMTEnd3dy50dS1jaGVtbml0ei5kZTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRkHtGWL06QzWqk422QXnfS
-Uw9ZswH5vtTEYN2N0OX1IKcAZ2Hf8fAy6jnk0nQ1ckUpDzQ2XWNHYWSkx1w8rBZL
-PgoBh8fZDU5xFbZdr9hiuS3CAySR7AvEJpOIiFVjLhr659dW+xwCvMre01d/7gez
-bw395QTkRvTtACBwYjv202bYfeuEoW+EBIfk44sDIUlid9VvB0Bk2VDaQEXsmqgK
-P9Wx/F+KdoFLIbR6pTfyOi8U/3SvRWIhKedYEwr3InfbHScd7E21AqQ2MqaQUbTG
-FBNU6wc+Y90gvLPJgVyKqsL+L4SYY/05r1Z8iMAp2ak7ze2oi4GmpQQvDisZ3r8C
-AwEAAaOCAdAwggHMMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
-CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUjphXqaHhxFUlbVxkQtqt4iVC
-3u0wHwYDVR0jBBgwFoAU6Nq48kfemSR9Z0CJJ2dxDWPYo44wIwYDVR0RBBwwGoEY
-d2VibWFzdGVyQHR1LWNoZW1uaXR6LmRlMIGIBgNVHR8EgYAwfjA9oDugOYY3aHR0
-cDovL2NkcDEucGNhLmRmbi5kZS90dS1jaGVtbml0ei1jYS9wdWIvY3JsL2NhY3Js
-LmNybDA9oDugOYY3aHR0cDovL2NkcDIucGNhLmRmbi5kZS90dS1jaGVtbml0ei1j
-YS9wdWIvY3JsL2NhY3JsLmNybDCBogYIKwYBBQUHAQEEgZUwgZIwRwYIKwYBBQUH
-MAKGO2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdHUtY2hlbW5pdHotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MEcGCCsGAQUFBzAChjtodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL3R1LWNoZW1uaXR6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG
-9w0BAQUFAAOCAQEAGuJSdTDZbQl6D9b0nJcTOB9ZQLMTq3gQVrYtqR8IpsjBzi8E
-JdTTTeNQ6K3ZhoiD+CwDG55qFGWKPQF3Mf5x+KTKfCIjgjnIrrBJyev72rVxqiK0
-og7H1PbkUg1lbEimCSWg+Wx/BJSwpmddxnVYcEXMYxmGcdt66Swxlg+CowC5dVL9
-6Hr98O+KtqI2NRhuH6aqUqumD8EP6YR6/0JZeo1SNM3y/QQEQoyVgPLob5uNofdr
-g2twMUgpt0hGea3sPbmrlTLIuIvtAWqjaDidsyUKiuveWSlh4YbshZCNH+r6TzLe
-zBo9/9WlA25buTEEDwGKCBOkN47rnnVLwcmqBw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.tu-chemnitz.de/Shibboleth.sso/SAML/Artifact" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tu-chemnitz.de/Shibboleth.sso/SAML/POST" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Universität Chemnitz (Technische Universität)</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">www.tu-chemnitz.de</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tu-chemnitz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ronald</GivenName>
-    <SurName>Schmidt</SurName>
-    <EmailAddress>hilfe@hrz.tu-chemnitz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ronald</GivenName>
-    <SurName>Schmidt</SurName>
-    <EmailAddress>hilfe@hrz.tu-chemnitz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.twigonglow.com-shibboleth-sp.xml b/swamid-interfederations-2.0/www.twigonglow.com-shibboleth-sp.xml
deleted file mode 100644
index e2fc6100..00000000
--- a/swamid-interfederations-2.0/www.twigonglow.com-shibboleth-sp.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.twigonglow.com/shibboleth-sp">
-  <!--
-		This is a "Twig World Limited: Glow Science" Shibboleth SP for Twig World 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="2012-11-22T15:15:58Z">
-      <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.twigonglow.com/Shibboleth.sso/shibtest"/>
-      <init: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.twigonglow.com/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.twigonglow.com/Shibboleth.sso/RMUnify"/>
-      <init: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.twigonglow.com/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDJzCCAg+gAwIBAgIJAMTlVAXkOmrZMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnd3dy50d2lnb25nbG93LmNvbTAeFw0xMjExMTMxMTAxNDVaFw0yMjExMTEx
-						MTAxNDVaMB0xGzAZBgNVBAMTEnd3dy50d2lnb25nbG93LmNvbTCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAKZvpD5K0jQvz3y9mkhLylUzqC+bZrGmyuIE
-						9LAdDXh/9LpxgxnY+an/FnIQzrKFLyw+4t8H1QSLWyTLK8MA8b6tJjBxznvUv8Qk
-						IpBAmBXWSkPQSHgbIoTFivb6iIVJq9h7yLi0JM7GpM4SS/ed+JiYiBM1C89/iaks
-						s1kpbN9TYrqN0YBkogTe1NIJMDp13SagmR2WjmnzQKtCH8z3DQDA3MrrP+KIbp5Z
-						Qm6Nlk+XQv51Mg5b/8qMgBoekB6cTI+HEIXJauJyPfCPL0hysnNUzR57BGG04ol4
-						Vx/eIKKvzRSwRowSGIxIcIGzUk9lg1PIt7RXPcTHANqppLGZIusCAwEAAaNqMGgw
-						RwYDVR0RBEAwPoISd3d3LnR3aWdvbmdsb3cuY29thihodHRwczovL3d3dy50d2ln
-						b25nbG93LmNvbS9zaGliYm9sZXRoLXNwMB0GA1UdDgQWBBRHiLe+VeAuCc/Ly0mK
-						I5tvs+uuujANBgkqhkiG9w0BAQUFAAOCAQEAJZHQuo5dFz0F77boWcIjUTH9eHtH
-						HUYbLsotM1Xin8k0vQIwkqQcIByBHLlM/ScVKku4u8a5maAawSr6IZVvBbpYgYsO
-						O0GZpHD45GFBIMQsgd+tTGlHus/t0048J5j3GPqx1NTMGs80DnCXAq9fLKjpil4i
-						/mfAfP6CSrguh2rCvVndSrTLIHJfQ+d6Up8h24LYKzhHVQmdqgsSQAWg1yUacFER
-						ud1Wodm6t+Nrbyh4XA3YbekaxHPRO9bBIjo+sncONDf6JfFL57s4i74LeZVOMeQC
-						yFFf/Cs64qzIILqKQWM0wqZq1vOavCR+OhOTdyjjKejhDKb9CWLzXSuOFw==
-					</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.twigonglow.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.twigonglow.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.twigonglow.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.twigonglow.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.twigonglow.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.twigonglow.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.twigonglow.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.twigonglow.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.twigonglow.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.twigonglow.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.twigonglow.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.twigonglow.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.twigonglow.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.twigonglow.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.twigonglow.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Twig World Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Twig World Limited: Glow Science</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.twigonglow.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Patricia</GivenName>
-    <SurName>Kemp</SurName>
-    <EmailAddress>mailto:pkemp@twig-world.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Munn</SurName>
-    <EmailAddress>mailto:dmunn@twig-world.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.ubu.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.ubu.org.uk-shibboleth.xml
deleted file mode 100644
index 54e4efe6..00000000
--- a/swamid-interfederations-2.0/www.ubu.org.uk-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://www.ubu.org.uk/shibboleth">
-  <!--
-		This is a "University of Bristol Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://www.ubu.org.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ubu.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ubu.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ubu.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ubu.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ubu.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ubu.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ubu.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.ubu.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.ubu.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ubu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Membership Solutions Limited: University of Bristol Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ubu.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</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 327a7c5c..00000000
--- a/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.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://www.uco.fr/idp/shibboleth">
-  <md: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>
-  </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 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="en">Université Catholique de l'Ouest - Angers</mdui:DisplayName>
-        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACN0lEQVQ4y5WSX0hTcRTHv+f+370NiRKSZehAJoWJhVp7ab1UL0GQ2EMwXZmWJoQakiYUCUuCwLQeDPG5x8CHwrAXIQgyEq10JKmbtNlM5/7cuzv366Usazr8vp5zPpzzPV8gi4aGhopu3+25v1WdywbweDw+RlThaez8kK13O4lVNc2staP7xY43+CWzpNjeNzE9e7rv8VP3jgBtbQ80ALDl7X5m3aVifMrn/btOmYYGB59bDSNcuRyJHPPNL97TLMqCw26rmZyeG15Zi6onKktOXb96ZQQAhEyAz198DwVpfe9Xf/CcKPAIhX/kW1W1VpHlIBeLFwYC4TIAIxlPaO3sfg3Sc3jixpOmCUHgocgSQMRiup5PBAgin5vRg/7+gfNTM3OuQnte14G8PW+ICLFEAo6C/B6eI9MwDIGIg5lKhzICJmf93ZoqA5BRX3/plfOwo6i85FCFRVEC/uBSnSSKYIwhx6q++w/Q2zvgXItGi2VJAtONXABoaWmaX42sut9/mnlERDCSJjSL7Lt1s3n099yGifEUs6XTafC8gIVvoZr2Lu/lQChc65sLQLMoMMwU4rqOM67K5sG+P1tvABSJXyTiIIkCAkvLdan1dUiCAF6WEEvoYACcR0ob3RcvvNwyB9dudLz9vhott2oqGGOMIyIQQeS4ibKDjqaGBvfYv1/blIOTzuNVw6NjH1cia5osSVSwf98T7532pu2SuukL1dVn510VRwtLHXavqigLST09hiz6CVvKytA9JOWYAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTIwVDEwOjQ5OjQ0KzAyOjAwpD3o3wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0wNy0yMFQxMDo0OTo0NCswMjowMNVgUGMAAAAASUVORK5CYII=</mdui:Logo>
-        <mdui:InformationURL xml:lang="fr">http://www.uco.fr</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="fr">Université Catholique de l'Ouest - Angers</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>
-					      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>
-    </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-POST" Location="https://www.uco.fr/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uco.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.uco.fr/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Université Catholique de l'Ouest - Angers</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Université Catholique de l'Ouest - Angers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.uco.fr</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Lucas Joachim</md:SurName>
-    <md:EmailAddress>joachim.lucas@uco.fr</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Zoundi Patrick</md:SurName>
-    <md:EmailAddress>patrick.zoundi@uco.fr</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.udsu.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.udsu.co.uk-shibboleth.xml
deleted file mode 100644
index 7631432a..00000000
--- a/swamid-interfederations-2.0/www.udsu.co.uk-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://www.udsu.co.uk/shibboleth">
-  <!--
-		This is a "University of Derby Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-11-04T09:51:46Z">
-      <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.udsu.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://www.udsu.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.udsu.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.udsu.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.udsu.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.udsu.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.udsu.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.udsu.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Derby Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.udsu.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.umaber.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.umaber.co.uk-shibboleth.xml
deleted file mode 100644
index 623849ea..00000000
--- a/swamid-interfederations-2.0/www.umaber.co.uk-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://www.umaber.co.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for Membership Solutions Limited on behalf of Aberystwyth University Students' Union.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-25T14:42:08Z"/>
-  </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.umaber.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://www.umaber.co.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.umaber.co.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.umaber.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.umaber.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.umaber.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.umaber.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.umaber.co.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Aberystwyth University Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.umaber.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.uni-market.co.uk-shibboleth.xml b/swamid-interfederations-2.0/www.uni-market.co.uk-shibboleth.xml
deleted file mode 100644
index 6697897e..00000000
--- a/swamid-interfederations-2.0/www.uni-market.co.uk-shibboleth.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.uni-market.co.uk/shibboleth">
-  <!--
-		*** This is a Shibboleth SP for Uni-Market Enterprises 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="2014-08-22T10:09:29Z">
-      <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.uni-market.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://www.uni-market.co.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Uni Market</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Your student marketplace has arrived. Buy and sell university essentials on a safe online platform!</mdui:Description>
-        <mdui:Logo height="130" width="130">https://www.uni-market.co.uk/Content/images/common/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAIMM91GfaXNYMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHVuaS1tYXJrZXQuY28udWswHhcNMTUwOTAyMTQzODQ4WhcNMjUwODMwMTQz
-						ODQ4WjAbMRkwFwYDVQQDExB1bmktbWFya2V0LmNvLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAoIWuFsiiajSGtYqmpxT0bxcJu6A6E3tV+M6rMqtT
-						XdW+vKwclFjBqZOaVzGt/QBIlgmjsVq/4jy6Y9soQHBU6/elfPpUSa0hP8S3gaL3
-						6udsAZdLjxNF0moOE7zpuqJy4uVWgC7f+G1isCanczA9X5maia19OKh83gAeYuLW
-						zvsctKb+AywyQ1nZOfO+4VAljvj+1MM0Mh08u1MlNlO1jhqAB2aMLF/otiGZvvu6
-						ARhsaIJNF4nuaGdZRMZP66CavTyISHKqfloklnyNvBte+KoC5ysjN38uAr9UZ26p
-						K++YWhE4wKsUSxlwtueHrNuV7f95D/JPUNKFrp8CDOcdnQIDAQABoz4wPDAbBgNV
-						HREEFDASghB1bmktbWFya2V0LmNvLnVrMB0GA1UdDgQWBBS4qCoHKhUElrDEDToF
-						kd0vlbwUHDANBgkqhkiG9w0BAQUFAAOCAQEAW34+CTBilEo239rXa998aQRg6w0t
-						biNoIjxYlgkmvaGRddIQNBNLHq+dxIUH1KiXqlCT+yIPuCSKU8Fwc4JkEx7w5I2m
-						r/SGPeQNkZangDlkd+uKjDUOZ78MbgmdOotWUUFe0UdyB2j/BGLkVR9Ia1q5oVwo
-						zenDzOGq1iu9uhmQDq0VM7CxL4uAmNlV85lOdT3o1OIRV4QBhChnvt8HGVqiuOZo
-						oDXqb5aLalOGbSRALV1UyVZJQUr0Z+7zZh2HWwk2VqhOgBdXlrG48/E+orSYHodG
-						zZIKEZpWB/Mio9aTqkqLW5eEI3zHyBK+ywCylVl8PVWIY7fSo1OCVL//zA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.uni-market.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uni-market.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uni-market.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uni-market.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uni-market.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uni-market.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Uni-Market Enterprises Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Uni Market</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uni-market.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Uni Market</GivenName>
-    <EmailAddress>mailto:support@uni-market.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Uni Market</GivenName>
-    <EmailAddress>mailto:support@uni-market.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml b/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml
deleted file mode 100644
index acd93209..00000000
--- a/swamid-interfederations-2.0/www.unioncloud.org-shibboleth.xml
+++ /dev/null
@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.unioncloud.org/shibboleth">
-  <!--
-		This is a Shibboleth "NUS Digital Unioncloud" SP for NUS Services 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-07-05T13:45: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>
-      <init: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.unioncloud.org/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVzCCAj+gAwIBAgIJANZRUr3l66IUMA0GCSqGSIb3DQEBBQUAMDsxOTA3BgNV
-						BAMTMGVjMi00Ni0xMzctMy0xNjIuZXUtd2VzdC0xLmNvbXB1dGUuYW1hem9uYXdz
-						LmNvbTAeFw0xMjA1MTQwOTExNThaFw0yMjA1MTIwOTExNThaMDsxOTA3BgNVBAMT
-						MGVjMi00Ni0xMzctMy0xNjIuZXUtd2VzdC0xLmNvbXB1dGUuYW1hem9uYXdzLmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMOKLRNP923gpEphaq9H
-						lqaeg3wIr6k6CQEZTnVeXHaqBS1T/IeLChh0MGikmqzAGz4gL3Jp7xg+LjAb7fHW
-						s84wG6ZkDFxy2plDsNoVPatzgKQYtiXsGqtlXdW8UzTpIpsvVAlJ+QGqhIibAZWK
-						aIsU6V38NGafvB4UWFlIpbECHgFz41x1cmK7gYFD7wzsA6hojAOWaY8UmQgW+nJn
-						4WxKl+gDe8qUiwdMzrEUK1yOFjsDuqdHnejSrtyc8b7iccE7hzo1Y/kw40FVG7gW
-						oiKrzF49G14BiHwkt448mCiXGDMnFM0TYfs1nkS/FdTpyhHgICu1qHX8pqJnnNbn
-						uNMCAwEAAaNeMFwwOwYDVR0RBDQwMoIwZWMyLTQ2LTEzNy0zLTE2Mi5ldS13ZXN0
-						LTEuY29tcHV0ZS5hbWF6b25hd3MuY29tMB0GA1UdDgQWBBRAI6NKxAK3XKLGUqTb
-						gJhCWI0FuzANBgkqhkiG9w0BAQUFAAOCAQEAf+1jf17uxp5uGeGJUFI/t2bhxnfD
-						TbmnNBzQST5/+VK+qNAc6tCw+0gngBGREBkdVmcebIw8AmfhciDqe3xEl3Pp2oWT
-						HSnbl7bZnoG90FlxEbHm8THMNFjTDTmrlX37ldH5mfiP0EOFpMaCmlkNr9D617tF
-						gZ2xUEelwk+5dg5RpIHsgOnVr6zcUMdYHZPs64O/kySxnuN+PaOIOt9JERw1jHT6
-						LbD66CIPaC/TtydoiCUfS7s9Hr3hSJUnJ0gi+fzXh/5/z/+NjMZXd4G4FPVMonXy
-						XrRfr87YvwJm38sU/z+Gnka487212biN6XS36YGLSohRByTKTNZM+H1x8A==
-					</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.unioncloud.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.unioncloud.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.unioncloud.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.unioncloud.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.unioncloud.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.unioncloud.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.unioncloud.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.unioncloud.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.unioncloud.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.unioncloud.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.unioncloud.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://manchesterstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML2/Artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML2/ECP" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.kusu.co.uk/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML2/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML2/ECP" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML/POST" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.sunderlandsu.co.uk/Shibboleth.sso/SAML/Artifact" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.trentstudents.org/Shibboleth.sso/SAML2/POST" index="31"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.trentstudents.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.trentstudents.org/Shibboleth.sso/SAML2/Artifact" index="33"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.trentstudents.org/Shibboleth.sso/SAML2/ECP" index="34"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.trentstudents.org/Shibboleth.sso/SAML/POST" index="35"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.trentstudents.org/Shibboleth.sso/SAML/Artifact" index="36"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.suarts.org/Shibboleth.sso/SAML2/POST" index="37"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.suarts.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.suarts.org/Shibboleth.sso/SAML2/Artifact" index="39"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.suarts.org/Shibboleth.sso/SAML2/ECP" index="40"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.suarts.org/Shibboleth.sso/SAML/POST" index="41"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.suarts.org/Shibboleth.sso/SAML/Artifact" index="42"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.subu.org.uk/Shibboleth.sso/SAML2/POST" index="43"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.subu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="44"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.subu.org.uk/Shibboleth.sso/SAML2/Artifact" index="45"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.subu.org.uk/Shibboleth.sso/SAML2/ECP" index="46"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.subu.org.uk/Shibboleth.sso/SAML/POST" index="47"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.subu.org.uk/Shibboleth.sso/SAML/Artifact" index="48"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/POST" index="49"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/Artifact" index="51"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML2/ECP" index="52"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML/POST" index="53"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.edgehillsu.org.uk/Shibboleth.sso/SAML/Artifact" index="54"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uadsa.com/Shibboleth.sso/SAML2/POST" index="55"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uadsa.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="56"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uadsa.com/Shibboleth.sso/SAML2/Artifact" index="57"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uadsa.com/Shibboleth.sso/SAML2/ECP" index="58"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uadsa.com/Shibboleth.sso/SAML/POST" index="59"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uadsa.com/Shibboleth.sso/SAML/Artifact" index="60"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML2/POST" index="67"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="68"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML2/Artifact" index="69"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML2/ECP" index="70"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML/POST" index="71"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.liverpoolsu.com/Shibboleth.sso/SAML/Artifact" index="72"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML2/POST" index="79"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="80"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML2/Artifact" index="81"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML2/ECP" index="82"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML/POST" index="83"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.bedssu.co.uk/Shibboleth.sso/SAML/Artifact" index="84"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.durhamsu.com/Shibboleth.sso/SAML2/POST" index="85"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.durhamsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.durhamsu.com/Shibboleth.sso/SAML2/Artifact" index="87"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.durhamsu.com/Shibboleth.sso/SAML2/ECP" index="88"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.durhamsu.com/Shibboleth.sso/SAML/POST" index="89"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.durhamsu.com/Shibboleth.sso/SAML/Artifact" index="90"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mdxsu.com/Shibboleth.sso/SAML2/POST" index="91"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mdxsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="92"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mdxsu.com/Shibboleth.sso/SAML2/Artifact" index="93"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mdxsu.com/Shibboleth.sso/SAML2/ECP" index="94"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mdxsu.com/Shibboleth.sso/SAML/POST" index="95"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mdxsu.com/Shibboleth.sso/SAML/Artifact" index="96"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML2/POST" index="97"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML2/Artifact" index="99"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML2/ECP" index="100"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML/POST" index="101"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uclansu.co.uk/Shibboleth.sso/SAML/Artifact" index="102"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ucsu.me/Shibboleth.sso/SAML2/POST" index="103"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ucsu.me/Shibboleth.sso/SAML2/POST-SimpleSign" index="104"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ucsu.me/Shibboleth.sso/SAML2/Artifact" index="105"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ucsu.me/Shibboleth.sso/SAML2/ECP" index="106"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ucsu.me/Shibboleth.sso/SAML/POST" index="107"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ucsu.me/Shibboleth.sso/SAML/Artifact" index="108"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML2/POST" index="109"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML2/Artifact" index="111"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML2/ECP" index="112"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML/POST" index="113"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://su.sheffield.ac.uk/Shibboleth.sso/SAML/Artifact" index="114"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML2/POST" index="115"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="116"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="117"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML2/ECP" index="118"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML/POST" index="119"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lsu.co.uk/Shibboleth.sso/SAML/Artifact" index="120"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML2/POST" index="121"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="122"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML2/Artifact" index="123"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML2/ECP" index="124"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML/POST" index="125"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.liverpoolguild.org/Shibboleth.sso/SAML/Artifact" index="126"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ueastudent.com/Shibboleth.sso/SAML2/POST" index="127"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ueastudent.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="128"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ueastudent.com/Shibboleth.sso/SAML2/Artifact" index="129"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ueastudent.com/Shibboleth.sso/SAML2/ECP" index="130"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ueastudent.com/Shibboleth.sso/SAML/POST" index="131"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ueastudent.com/Shibboleth.sso/SAML/Artifact" index="132"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML2/POST" index="133"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="134"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML2/Artifact" index="135"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML2/ECP" index="136"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML/POST" index="137"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssu.unioncloud.org/Shibboleth.sso/SAML/Artifact" index="138"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uwlsu.com/Shibboleth.sso/SAML2/POST" index="139"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uwlsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="140"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uwlsu.com/Shibboleth.sso/SAML2/Artifact" index="141"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uwlsu.com/Shibboleth.sso/SAML2/ECP" index="142"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uwlsu.com/Shibboleth.sso/SAML/POST" index="143"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uwlsu.com/Shibboleth.sso/SAML/Artifact" index="144"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML2/POST" index="145"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="146"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML2/Artifact" index="147"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML2/ECP" index="148"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML/POST" index="149"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.gcustudents.co.uk/Shibboleth.sso/SAML/Artifact" index="150"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML2/POST" index="151"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="152"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML2/Artifact" index="153"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML2/ECP" index="154"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML/POST" index="156"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mostactivestudents.co.uk/Shibboleth.sso/SAML/Artifact" index="157"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML2/POST" index="159"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="160"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML2/Artifact" index="161"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML2/ECP" index="162"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML/POST" index="163"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.salfordstudents.com/Shibboleth.sso/SAML/Artifact" index="164"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uswsu.com/Shibboleth.sso/SAML2/POST" index="165"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uswsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="166"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uswsu.com/Shibboleth.sso/SAML2/Artifact" index="167"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uswsu.com/Shibboleth.sso/SAML2/ECP" index="168"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uswsu.com/Shibboleth.sso/SAML/POST" index="169"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uswsu.com/Shibboleth.sso/SAML/Artifact" index="170"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.abertaysa.com/Shibboleth.sso/SAML2/POST" index="171"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.abertaysa.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="172"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.abertaysa.com/Shibboleth.sso/SAML2/Artifact" index="173"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.abertaysa.com/Shibboleth.sso/SAML2/ECP" index="174"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.abertaysa.com/Shibboleth.sso/SAML/POST" index="175"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.abertaysa.com/Shibboleth.sso/SAML/Artifact" index="176"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/POST" index="177"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="178"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/Artifact" index="179"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.ucsunion.org/Shibboleth.sso/SAML2/ECP" index="180"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.ucsunion.org/Shibboleth.sso/SAML/POST" index="181"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.ucsunion.org/Shibboleth.sso/SAML/Artifact" index="182"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/POST" index="183"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="184"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/Artifact" index="185"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML2/ECP" index="186"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML/POST" index="187"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.stmaryssu.co.uk/Shibboleth.sso/SAML/Artifact" index="188"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/POST" index="189"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="190"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/Artifact" index="191"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML2/ECP" index="192"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML/POST" index="193"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.leedsbeckettsu.co.uk/Shibboleth.sso/SAML/Artifact" index="194"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">NUS Services Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NUS Digital Unioncloud Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unioncloud.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Help Desk</GivenName>
-    <EmailAddress>mailto:support@zendesk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shoba</GivenName>
-    <SurName>Menon</SurName>
-    <EmailAddress>mailto:shoba.menon@arrkgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sudheer</GivenName>
-    <SurName>Kancherla</SurName>
-    <EmailAddress>mailto:sudheer.kancherla@arrkgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml b/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
deleted file mode 100644
index b08469d3..00000000
--- a/swamid-interfederations-2.0/www.unioncloudstaging.org-shibboleth.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.unioncloudstaging.org/shibboleth">
-  <!--
-		This is a Shibboleth "NUS Digital Unioncloud Test" SP for NUS Services 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-07-05T14:40:53Z"/>
-  </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.unioncloudstaging.org/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDVzCCAj+gAwIBAgIJANZRUr3l66IUMA0GCSqGSIb3DQEBBQUAMDsxOTA3BgNV
-						BAMTMGVjMi00Ni0xMzctMy0xNjIuZXUtd2VzdC0xLmNvbXB1dGUuYW1hem9uYXdz
-						LmNvbTAeFw0xMjA1MTQwOTExNThaFw0yMjA1MTIwOTExNThaMDsxOTA3BgNVBAMT
-						MGVjMi00Ni0xMzctMy0xNjIuZXUtd2VzdC0xLmNvbXB1dGUuYW1hem9uYXdzLmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMOKLRNP923gpEphaq9H
-						lqaeg3wIr6k6CQEZTnVeXHaqBS1T/IeLChh0MGikmqzAGz4gL3Jp7xg+LjAb7fHW
-						s84wG6ZkDFxy2plDsNoVPatzgKQYtiXsGqtlXdW8UzTpIpsvVAlJ+QGqhIibAZWK
-						aIsU6V38NGafvB4UWFlIpbECHgFz41x1cmK7gYFD7wzsA6hojAOWaY8UmQgW+nJn
-						4WxKl+gDe8qUiwdMzrEUK1yOFjsDuqdHnejSrtyc8b7iccE7hzo1Y/kw40FVG7gW
-						oiKrzF49G14BiHwkt448mCiXGDMnFM0TYfs1nkS/FdTpyhHgICu1qHX8pqJnnNbn
-						uNMCAwEAAaNeMFwwOwYDVR0RBDQwMoIwZWMyLTQ2LTEzNy0zLTE2Mi5ldS13ZXN0
-						LTEuY29tcHV0ZS5hbWF6b25hd3MuY29tMB0GA1UdDgQWBBRAI6NKxAK3XKLGUqTb
-						gJhCWI0FuzANBgkqhkiG9w0BAQUFAAOCAQEAf+1jf17uxp5uGeGJUFI/t2bhxnfD
-						TbmnNBzQST5/+VK+qNAc6tCw+0gngBGREBkdVmcebIw8AmfhciDqe3xEl3Pp2oWT
-						HSnbl7bZnoG90FlxEbHm8THMNFjTDTmrlX37ldH5mfiP0EOFpMaCmlkNr9D617tF
-						gZ2xUEelwk+5dg5RpIHsgOnVr6zcUMdYHZPs64O/kySxnuN+PaOIOt9JERw1jHT6
-						LbD66CIPaC/TtydoiCUfS7s9Hr3hSJUnJ0gi+fzXh/5/z/+NjMZXd4G4FPVMonXy
-						XrRfr87YvwJm38sU/z+Gnka487212biN6XS36YGLSohRByTKTNZM+H1x8A==
-					</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.unioncloudstaging.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://umsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kusu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sunderlandsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="29"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://kclsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="30"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="31"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="32"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="33"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="34"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="35"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ntsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="36"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="37"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="38"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="39"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="40"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="41"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://suarts.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="42"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="43"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="44"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="45"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="46"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="47"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="48"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="49"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="50"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="51"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="52"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="53"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://esu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="54"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="55"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="56"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="57"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="58"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="59"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://abert.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="60"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="61"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="62"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="63"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="64"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="65"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lgos.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="66"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="67"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="68"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="69"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="70"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="71"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ljmu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="72"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="73"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="74"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="75"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="76"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="77"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hudsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="78"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="79"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="80"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="81"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="82"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="83"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://bedssu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="84"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="85"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="86"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="87"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="88"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="89"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://durhamsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="90"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="91"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="92"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="93"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="94"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="95"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://mdxsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="96"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="97"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="98"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="99"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="100"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="101"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uclan.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="102"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="103"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="104"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="105"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="106"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="107"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ucsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="108"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="109"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="110"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="111"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="112"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="113"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="114"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="115"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="116"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="117"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="118"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="119"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://loughsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="120"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="127"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="128"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="129"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="130"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="131"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uea.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="132"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="133"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="134"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="135"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="136"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="137"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uwlsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="138"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="151"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="152"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="153"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="154"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="155"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gcusa.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="156"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="157"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="158"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="159"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="160"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="161"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="162"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="163"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="164"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="165"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="166"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="167"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://suffolk.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="168"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="169"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="170"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="171"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="172"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="173"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://salford.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="174"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="175"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="176"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="177"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="178"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="179"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uswsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="180"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="181"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="182"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="183"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="184"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="185"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stmary.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="186"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST" index="187"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="188"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/Artifact" index="189"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML2/ECP" index="190"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML/POST" index="191"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://leedsbeckettsu.unioncloudstaging.org/Shibboleth.sso/SAML/Artifact" index="192"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">NUS Services Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">NUS Digital Unioncloud Test Service Provider</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unioncloud.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Help Desk</GivenName>
-    <EmailAddress>mailto:support@zendesk.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Shoba</GivenName>
-    <SurName>Menon</SurName>
-    <EmailAddress>mailto:shoba.menon@arrkgroup.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sudheer</GivenName>
-    <SurName>Kancherla</SurName>
-    <EmailAddress>mailto:sudheer.kancherla@arrkgroup.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.unochapeco.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/www.unochapeco.edu.br-idp-shibboleth.xml
deleted file mode 100644
index 3555d3da..00000000
--- a/swamid-interfederations-2.0/www.unochapeco.edu.br-idp-shibboleth.xml
+++ /dev/null
@@ -1,116 +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://www.unochapeco.edu.br/idp/shibboleth">
-  <md: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>
-  </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">unochapeco.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNOCHAPECO - Universidade Comunitaria da Regiao de Chgapeco</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNOCHAPECO - Universidade Comunitaria da Regiao de Chgapeco</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNOCHAPECO - Universidade Comunitaria da Regiao de Chgapeco</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNOCHAPECO - Universidade Comunitaria da Regiao de Chgapeco</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unochapeco.edu.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unochapeco.edu.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xRzBFBgNVBAoUPlVub2NoYXBl
-Y8OzIC0gVW5pdmVyc2lkYWRlIENvbXVuaXTDoXJpYSBkYSBSZWdpw6NvIGRlIENo
-YXBlY8OzMRAwDgYDVQQLEwdEVEkvTk9DMSQwIgYJKoZIhvcNAQkBFhVub2NAdW5v
-Y2hhcGVjby5lZHUuYnIxETAPBgNVBAcUCENoYXBlY8OzMRcwFQYDVQQIEw5TYW50
-YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxIjAgBgNVBAMTGWlkcGNhZmUudW5vY2hh
-cGVjby5lZHUuYnIwHhcNMTYwMjA1MTIzNDE5WhcNMTkwMjA0MTIzNDE5WjCB3jFH
-MEUGA1UEChQ+VW5vY2hhcGVjw7MgLSBVbml2ZXJzaWRhZGUgQ29tdW5pdMOhcmlh
-IGRhIFJlZ2nDo28gZGUgQ2hhcGVjw7MxEDAOBgNVBAsTB0RUSS9OT0MxJDAiBgkq
-hkiG9w0BCQEWFW5vY0B1bm9jaGFwZWNvLmVkdS5icjERMA8GA1UEBxQIQ2hhcGVj
-w7MxFzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEiMCAGA1UE
-AxMZaWRwY2FmZS51bm9jaGFwZWNvLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKqlbhCdvxxb2CiUDARN8aK4V3jTqHYTEAn1KAoRl9R+IwQu
-lbU6c4CkX6EIxWo+55LpWUe97pIKXB9/Xtj5TO2DSAY7dtiBByYQ7WBUkFwWnWgy
-er0c5aLw9UdmFF19tXzfrlio/UcSS5hilyk6WHdpIjs7hOimtCBrCuNtXXo8G0fW
-UVZncmb6tk+RSz6c96oIKyDIHV0hq6E9s+QoSQd+2kIAr3TGrE5kbGvzCfV2g4pv
-qRXgd+75ylrO0Q7dOtJX33/PQ9fb+8tjSoULMOguvPWx9ipoXwwpVb030z+eX4b2
-qWbToSf0QVDMFLPoF8AFU717I6SO4GaOjeq4pQUCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEASI8FNjD7lztkzJ1dHeDZRS1Q5W3fpQHgbF0dkjBqD7RBp4DDRZQhqrQl
-mIS0ALPC3MC8vURb+ZQHJ8P6LXAmXn+g7FF134o/kvWWzf1h5jSCymzwiTK44egO
-5UEYXqPq4OT7u/ao+5TqNUMi7BUVhHdii/SZUOCwU2MG/m6fsaisj6RiNCemSo7q
-CJJhhufOn3vDZieOVMftowNlbfIhA1qUwq89xYYfCpl7WFxBML+YLYbldANvNORG
-jwVUyBHQxt9gXIb24HHCxcGMadrci9TALlPS+mtq85EtGs2p/5rhxvnbOY1Zn5ut
-0nVBT2KqSJwmgHZ2HSiOz5h2xoemBg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.unochapeco.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.unochapeco.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <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-POST-SimpleSign" Location="https://idpcafe.unochapeco.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpcafe.unochapeco.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idpcafe.unochapeco.edu.br/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpcafe.unochapeco.edu.br/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">unochapeco.edu.br</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEMjCCAxoCAQAwDQYJKoZIhvcNAQEFBQAwgd4xRzBFBgNVBAoUPlVub2NoYXBl
-Y8OzIC0gVW5pdmVyc2lkYWRlIENvbXVuaXTDoXJpYSBkYSBSZWdpw6NvIGRlIENo
-YXBlY8OzMRAwDgYDVQQLEwdEVEkvTk9DMSQwIgYJKoZIhvcNAQkBFhVub2NAdW5v
-Y2hhcGVjby5lZHUuYnIxETAPBgNVBAcUCENoYXBlY8OzMRcwFQYDVQQIEw5TYW50
-YSBDYXRhcmluYTELMAkGA1UEBhMCQlIxIjAgBgNVBAMTGWlkcGNhZmUudW5vY2hh
-cGVjby5lZHUuYnIwHhcNMTYwMjA1MTIzNDE5WhcNMTkwMjA0MTIzNDE5WjCB3jFH
-MEUGA1UEChQ+VW5vY2hhcGVjw7MgLSBVbml2ZXJzaWRhZGUgQ29tdW5pdMOhcmlh
-IGRhIFJlZ2nDo28gZGUgQ2hhcGVjw7MxEDAOBgNVBAsTB0RUSS9OT0MxJDAiBgkq
-hkiG9w0BCQEWFW5vY0B1bm9jaGFwZWNvLmVkdS5icjERMA8GA1UEBxQIQ2hhcGVj
-w7MxFzAVBgNVBAgTDlNhbnRhIENhdGFyaW5hMQswCQYDVQQGEwJCUjEiMCAGA1UE
-AxMZaWRwY2FmZS51bm9jaGFwZWNvLmVkdS5icjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKqlbhCdvxxb2CiUDARN8aK4V3jTqHYTEAn1KAoRl9R+IwQu
-lbU6c4CkX6EIxWo+55LpWUe97pIKXB9/Xtj5TO2DSAY7dtiBByYQ7WBUkFwWnWgy
-er0c5aLw9UdmFF19tXzfrlio/UcSS5hilyk6WHdpIjs7hOimtCBrCuNtXXo8G0fW
-UVZncmb6tk+RSz6c96oIKyDIHV0hq6E9s+QoSQd+2kIAr3TGrE5kbGvzCfV2g4pv
-qRXgd+75ylrO0Q7dOtJX33/PQ9fb+8tjSoULMOguvPWx9ipoXwwpVb030z+eX4b2
-qWbToSf0QVDMFLPoF8AFU717I6SO4GaOjeq4pQUCAwEAATANBgkqhkiG9w0BAQUF
-AAOCAQEASI8FNjD7lztkzJ1dHeDZRS1Q5W3fpQHgbF0dkjBqD7RBp4DDRZQhqrQl
-mIS0ALPC3MC8vURb+ZQHJ8P6LXAmXn+g7FF134o/kvWWzf1h5jSCymzwiTK44egO
-5UEYXqPq4OT7u/ao+5TqNUMi7BUVhHdii/SZUOCwU2MG/m6fsaisj6RiNCemSo7q
-CJJhhufOn3vDZieOVMftowNlbfIhA1qUwq89xYYfCpl7WFxBML+YLYbldANvNORG
-jwVUyBHQxt9gXIb24HHCxcGMadrci9TALlPS+mtq85EtGs2p/5rhxvnbOY1Zn5ut
-0nVBT2KqSJwmgHZ2HSiOz5h2xoemBg==
-                          
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idpcafe.unochapeco.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpcafe.unochapeco.edu.br:8443/idp/profile/SAML1/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">UNOCHAPECO - Universidade Comunitaria da Regiao de Chgapeco</md:OrganizationName>
-    <md:OrganizationName xml:lang="pt-br">UNOCHAPECO - Universidade Comunitaria da Regiao de Chgapeco</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">UNOCHAPECO - Universidade Comunitaria da Regiao de Chgapeco</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pt-br">UNOCHAPECO - Universidade Comunitaria da Regiao de Chgapeco</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unochapeco.edu.br</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pt-br">http://www.unochapeco.edu.br</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Jhony Maseto</md:SurName>
-    <md:EmailAddress>noc@unochapeco.edu.br</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.upay.co.uk-shibboleth-sp.xml b/swamid-interfederations-2.0/www.upay.co.uk-shibboleth-sp.xml
deleted file mode 100644
index 08629225..00000000
--- a/swamid-interfederations-2.0/www.upay.co.uk-shibboleth-sp.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://www.upay.co.uk/shibboleth-sp">
-  <!--
-		This is an "Upay Cashless Payments" Shibboleth SP for Uniware Systems 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="2012-05-29T15:41:57Z">
-      <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.upay.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://www.upay.co.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Upay</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Upay online payment processing and cashless account management.</mdui:Description>
-        <mdui:Logo height="55" width="218">https://www.upay.co.uk/images/upay.jpg</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					MIIDCTCCAfGgAwIBAgIJAPuCQS/zC4R2MA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-					BAMTFnUwMTU4MjQuY2FzaGxlc3MubG9jYWwwHhcNMTIwNTI4MTQwMDI3WhcNMjIw
-					NTI2MTQwMDI3WjAhMR8wHQYDVQQDExZ1MDE1ODI0LmNhc2hsZXNzLmxvY2FsMIIB
-					IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylulP1Jro85baAfyhsYZlfMP
-					PZWBKbntkMX59cZHY9GdQxJvxOWaew7PP5vMPbXlntPoLRo07E086jOmYZwsR/YF
-					HnXX/JDnGoUaNPxEjllzsIaSkrC3NTN1yYhUuRWDZ4iXHfK9MXjfsZPi07dLY84E
-					BLTOS7Y/AWs0gDM428GbWAPVZUitiNxeYVM4/AoflNAwdCYbzFtObgiayUNJ5Lny
-					acR3i4yGTrfQnlvk8CwUtYSHFMv3mwoff3Mwqi4s+6gl0KExm/HdokJQQ2JrZsdC
-					Cxr74jbQ63dTY0fa2LT/Iu1Il70zDtEKfjs8p9RCWF0jGHiYXTalW1MXqjltbQID
-					AQABo0QwQjAhBgNVHREEGjAYghZ1MDE1ODI0LmNhc2hsZXNzLmxvY2FsMB0GA1Ud
-					DgQWBBTfgLOw2BB/94hVVe6sGztOy8FtZzANBgkqhkiG9w0BAQUFAAOCAQEAWxDq
-					U9phfn4hdENxWAPa+WkEtl9K5R/fabWcKYseolrkgLimEBHwrlsnvwG1+N3KUvxm
-					OAQ4mwzAMdzR5BT3T2nECeSPuIjYHhYDMHT3NQo0EPugBKRiHHCbGtbq1koVhker
-					u1D7q7vdwrpuafZOaBKxN6J33hOVDdkiCDwMvkgyiBDpe5L8KleiCMpnF2mMobxF
-					R1+JIciWhw8MKc2WfekC/yXPzAHvJen7/xbCk6mn03m65aUhQ/mS5swiULmmnkpk
-					0eEFK2StndDnHHteY0pFIbFv0wX7/PzIN9HHmLMd2vMhX9LOpMX5j8J14VB9HVm+
-					XXxEezyYkBQIe2xJxg==
-				</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.upay.co.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upay.co.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.upay.co.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upay.co.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upay.co.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.upay.co.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.upay.co.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.upay.co.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Uniware Systems Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Uniware Systems Limited: Upay Cashless Payments</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniware.co.uk/cashless-payments</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Dean</GivenName>
-    <SurName>Cachia</SurName>
-    <EmailAddress>mailto:dean.cachia@uniware.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Craig</GivenName>
-    <SurName>Moore</SurName>
-    <EmailAddress>mailto:Craig.Moore@uniware.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.upsu.com-shibboleth.xml b/swamid-interfederations-2.0/www.upsu.com-shibboleth.xml
deleted file mode 100644
index ae65284f..00000000
--- a/swamid-interfederations-2.0/www.upsu.com-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://www.upsu.com/shibboleth">
-  <!--
-		This is a "University of Plymouth Students' Union" Shibboleth SP for Membership Solutions Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-28T13:45:55Z">
-      <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://www.upsu.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upsu.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upsu.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upsu.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.upsu.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upsu.com/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upsu.com/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upsu.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.upsu.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.upsu.com/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.upsu.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.upsu.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.upsu.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.upsu.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.upsu.com/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.upsu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Plymouth Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.upsu.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.uusuvote.com-shibboleth.xml b/swamid-interfederations-2.0/www.uusuvote.com-shibboleth.xml
deleted file mode 100644
index f8211c4e..00000000
--- a/swamid-interfederations-2.0/www.uusuvote.com-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://www.uusuvote.com/shibboleth">
-  <!--
-		This is a "University of Ulster SU Voting" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-17T09:15:38Z">
-      <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://www.uusuvote.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uusuvote.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uusuvote.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uusuvote.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uusuvote.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uusuvote.com/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uusuvote.com/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uusuvote.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.uusuvote.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.uusuvote.com/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.uusuvote.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.uusuvote.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.uusuvote.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.uusuvote.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.uusuvote.com/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.uusuvote.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Ulster SU Voting</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uusuvote.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</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 b3e5c0f0..00000000
--- a/swamid-interfederations-2.0/www.vho.de-idpvzg.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vho.de/idpvzg">
-  <md: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>
-  </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">gbv.de</shibmd: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>
-    </md:Extensions>
-    <md: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,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG5zCCBc+gAwIBAgIHGU8vu26rPTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTUwNDE2MTI1
-OTI0WhcNMTgwNzEzMTI1OTI0WjB+MQswCQYDVQQGEwJERTEWMBQGA1UECAwNTklF
-REVSU0FDSFNFTjETMBEGA1UEBwwKR09FVFRJTkdFTjEtMCsGA1UECgwkR2VtZWlu
-c2FtZXIgQmlibGlvdGhla3N2ZXJidW5kIChHQlYpMRMwEQYDVQQDDAp3d3cudmhv
-LmRlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzFY9DXHtUWOOHzmh
-A0cwushHtT1mUHkdz6EezlhYsO95F+hb8LctkXywuR3UEfVt31boS4HkhHM9IfGf
-XSbFhBZ97NqWBj80JLFqDkRTMkajjlKF3kH/90FcwW5XF3eYIZnsamLZjC8pBk6M
-9OCzpYl4Kw3L2eys17x2EreuzBUj9/mmOEcN3mjjffjy4xjhuNWa0GR7Yhaj89jg
-4xkjGwcybnC7eZb1V+ZPHYN5vYbw9Qc16p2LK/UB86wKBELwGEerm2DS3MDy7nYI
-NcUhHvO6+U90E38sxvoMwh3ITkKoUZptj+f8QoV7ECJPP56+WkeKE9OPHSzTSWd3
-hbTI/BkS1obHNw6cvKAT82OgYD7YPKbQ6j42cYC8U3YVVNGuoolX/oP/c6HXFfbI
-AAxi/7UaXJ4k5F4IP4WSLlwej8luCm7XILbfBiuy3/bkEiU+8PGt295m5VN1dzif
-ufnU8FNfvRH8a+RD1K/1PnIbBtUKdPWiy0KP9DDADLELwfV1yHmES9FFDL7OZ7kB
-dzBeG0CMStQSaSfXd5dFZDAuSu1lxsFjyJt2VCF2C7Bd22StLfy1fhbIV3iPnWiX
-CgQ8teNTna73qcKOQe07obJedT35lxZLEl4+auYZbE627c2w6lyb1GGu06UPFinu
-fXu1nrikhkUiI9u/Z8YxdK08k3MCAwEAAaOCAiowggImME8GA1UdIARIMEYwEQYP
-KwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIs
-AQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUgeUJOnQfDaLG09KD
-sheNA4eieMUwHwYDVR0jBBgwFoAUpuT/mP3lSTJ+XHXyFqJNjHQ13iIwFQYDVR0R
-BA4wDIIKd3d3LnZoby5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCByQYI
-KwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBABggrBgEFBQcw
-AoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAIhlmQn3roI/XHEH3X/mswugaPm9P
-A1kQ2RJOjNOyWZi35CB2lh6Zi4hCZm9ZoEOxvtsP9JPliwnnMNeK4BdM0Pvjs8iR
-UpYnpFFxzc3w1heZ4+rR/F2PyxmZyQEEwdBA2nZHqwXKMbV/dFQPo08ljst6GwNu
-DvQZHKOJBbYvLe2bwDSp14eAwnJjX/JUKW0J+4prAx684qTS7bycYXcErU6ENc95
-h6ZnXWIR/hFykNOyKWQdVt9Azz7gClrJwypVWp7U1uCcVDIuVzI6u+CPcaLNy6t/
-NBtxgZjOFsGvbdVNBzjz26LYkgbur7z7lMG4ReTzhHeFMCD3h3rwF6cyOA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpvzg/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://www.vho.de/idpvzg/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vho.de/idpvzg/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vho.de/idpvzg/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vho.de/idpvzg/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">gbv.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIG5zCCBc+gAwIBAgIHGU8vu26rPTANBgkqhkiG9w0BAQsFADCBuzELMAkGA1UE
-BhMCREUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5H
-RU4xPjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hl
-IERhdGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RH
-IENBMR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTUwNDE2MTI1
-OTI0WhcNMTgwNzEzMTI1OTI0WjB+MQswCQYDVQQGEwJERTEWMBQGA1UECAwNTklF
-REVSU0FDSFNFTjETMBEGA1UEBwwKR09FVFRJTkdFTjEtMCsGA1UECgwkR2VtZWlu
-c2FtZXIgQmlibGlvdGhla3N2ZXJidW5kIChHQlYpMRMwEQYDVQQDDAp3d3cudmhv
-LmRlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzFY9DXHtUWOOHzmh
-A0cwushHtT1mUHkdz6EezlhYsO95F+hb8LctkXywuR3UEfVt31boS4HkhHM9IfGf
-XSbFhBZ97NqWBj80JLFqDkRTMkajjlKF3kH/90FcwW5XF3eYIZnsamLZjC8pBk6M
-9OCzpYl4Kw3L2eys17x2EreuzBUj9/mmOEcN3mjjffjy4xjhuNWa0GR7Yhaj89jg
-4xkjGwcybnC7eZb1V+ZPHYN5vYbw9Qc16p2LK/UB86wKBELwGEerm2DS3MDy7nYI
-NcUhHvO6+U90E38sxvoMwh3ITkKoUZptj+f8QoV7ECJPP56+WkeKE9OPHSzTSWd3
-hbTI/BkS1obHNw6cvKAT82OgYD7YPKbQ6j42cYC8U3YVVNGuoolX/oP/c6HXFfbI
-AAxi/7UaXJ4k5F4IP4WSLlwej8luCm7XILbfBiuy3/bkEiU+8PGt295m5VN1dzif
-ufnU8FNfvRH8a+RD1K/1PnIbBtUKdPWiy0KP9DDADLELwfV1yHmES9FFDL7OZ7kB
-dzBeG0CMStQSaSfXd5dFZDAuSu1lxsFjyJt2VCF2C7Bd22StLfy1fhbIV3iPnWiX
-CgQ8teNTna73qcKOQe07obJedT35lxZLEl4+auYZbE627c2w6lyb1GGu06UPFinu
-fXu1nrikhkUiI9u/Z8YxdK08k3MCAwEAAaOCAiowggImME8GA1UdIARIMEYwEQYP
-KwYBBAGBrSGCLAEBBAMDMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIs
-AQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUgeUJOnQfDaLG09KD
-sheNA4eieMUwHwYDVR0jBBgwFoAUpuT/mP3lSTJ+XHXyFqJNjHQ13iIwFQYDVR0R
-BA4wDIIKd3d3LnZoby5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCByQYI
-KwYBBQUHAQEEgbwwgbkwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4u
-ZGUvT0NTUC1TZXJ2ZXIvT0NTUDBABggrBgEFBQcwAoY0aHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBABggrBgEFBQcw
-AoY0aHR0cDovL2NkcDIucGNhLmRmbi5kZS9nd2RnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAIhlmQn3roI/XHEH3X/mswugaPm9P
-A1kQ2RJOjNOyWZi35CB2lh6Zi4hCZm9ZoEOxvtsP9JPliwnnMNeK4BdM0Pvjs8iR
-UpYnpFFxzc3w1heZ4+rR/F2PyxmZyQEEwdBA2nZHqwXKMbV/dFQPo08ljst6GwNu
-DvQZHKOJBbYvLe2bwDSp14eAwnJjX/JUKW0J+4prAx684qTS7bycYXcErU6ENc95
-h6ZnXWIR/hFykNOyKWQdVt9Azz7gClrJwypVWp7U1uCcVDIuVzI6u+CPcaLNy6t/
-NBtxgZjOFsGvbdVNBzjz26LYkgbur7z7lMG4ReTzhHeFMCD3h3rwF6cyOA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.vho.de:8443/idpvzg/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpvzg/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">e45</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e45</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Verbundzentrale des GBV (VZG)</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Verbundzentrale des GBV (VZG)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.vho.de</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.vho.de</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Franck</md:GivenName>
-    <md:SurName>Borel</md:SurName>
-    <md:EmailAddress>mailto:borel@gbv.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Gerald</md:GivenName>
-    <md:SurName>Steilen</md:SurName>
-    <md:EmailAddress>mailto:steilen@gbv.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Till</md:GivenName>
-    <md:SurName>Kinstler</md:SurName>
-    <md:EmailAddress>mailto:kinstler@gbv.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vho.de.xml b/swamid-interfederations-2.0/www.vho.de.xml
deleted file mode 100644
index c3a694d9..00000000
--- a/swamid-interfederations-2.0/www.vho.de.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vho.de/idpvzg">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">vzg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.vho.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.vho.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGfzCCBWegAwIBAgIED/+i6zANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA3
-WhcNMTUwNTAzMTM0NzA3WjCBnDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
-QmlibGlvdGhlazETMBEGA1UEAxMKd3d3LnZoby5kZTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAMxWPQ1x7VFjjh85oQNHMLrIR7U9ZlB5Hc+hHs5YWLDv
-eRfoW/C3LZF8sLkd1BH1bd9W6EuB5IRzPSHxn10mxYQWfezalgY/NCSxag5EUzJG
-o45Shd5B//dBXMFuVxd3mCGZ7Gpi2YwvKQZOjPTgs6WJeCsNy9nsrNe8dhK3rswV
-I/f5pjhHDd5o43348uMY4bjVmtBke2IWo/PY4OMZIxsHMm5wu3mW9VfmTx2Deb2G
-8PUHNeqdiyv1AfOsCgRC8BhHq5tg0tzA8u52CDXFIR7zuvlPdBN/LMb6DMIdyE5C
-qFGabY/n/EKFexAiTz+evlpHihPTjx0s00lnd4W0yPwZEtaGxzcOnLygE/NjoGA+
-2Dym0Oo+NnGAvFN2FVTRrqKJV/6D/3Oh1xX2yAAMYv+1GlyeJOReCD+Fki5cHo/J
-bgpu1yC23wYrst/25BIlPvDxrdveZuVTdXc4n7n51PBTX70R/GvkQ9Sv9T5yGwbV
-CnT1ostCj/QwwAyxC8H1dch5hEvRRQy+zme5AXcwXhtAjErUEmkn13eXRWQwLkrt
-ZcbBY8ibdlQhdguwXdtkrS38tX4WyFd4j51olwoEPLXjU52u96nCjkHtO6GyXnU9
-+ZcWSxJePmrmGWxOtu3NsOpcm9RhrtOlDxYp7n17tZ64pIZFIiPbv2fGMXStPJNz
-AgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFIHlCTp0Hw2ixtPSg7IXjQOH
-onjFMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQMA6B
-DGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYB
-BQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-Z3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBAE/4u0zjwF5+yQkcpeCNoSdH8JIhMJofYyWfQPD+
-Q36nQBqrolaFCe94zThj+gJmabfIDEvpwCLCa2YtCDosWsI9rX4GF1ZUsxKqxgBB
-IH1rFZlKKEeDYieR8lRH4vy4RGh9dkvhhXLgyrekt3iyfWHxCz/n47awnmYgO2st
-dqh2nY2bXoDASUlgzO59ghsfi6pT5WAGRUwZhMS3iErLglDYoT6AqEdr406TWeLp
-Mw04ESW7mR05nhLcIBNf23UPKjMpNTwBQC1BAbssGMMMbPojg1K+80aLKAB32ZPw
-CFNwbRrYB0gGPASPkZD9WxiosAZp/uqr6QTZIUDSSmWt2B0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.vho.de:8443/idpvzg/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpvzg/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://www.vho.de/idpvzg/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vho.de/idpvzg/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vho.de/idpvzg/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vho.de/idpvzg/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">vzg.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.vho.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.vho.de,OU=Digitale Bibliothek,O=Gemeinsamer Bibliotheksverbund (GBV),L=GOETTINGEN,ST=NIEDERSACHSEN,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGfzCCBWegAwIBAgIED/+i6zANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMC
-REUxFjAUBgNVBAgTDU5JRURFUlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4x
-PjA8BgNVBAoTNUdlc2VsbHNjaGFmdCBmdWVyIHdpc3NlbnNjaGFmdGxpY2hlIERh
-dGVudmVyYXJiZWl0dW5nMQ0wCwYDVQQLEwRHV0RHMRAwDgYDVQQDEwdHV0RHIENB
-MR4wHAYJKoZIhvcNAQkBFg9nd2RnLWNhQGd3ZGcuZGUwHhcNMTAwNTA0MTM0NzA3
-WhcNMTUwNTAzMTM0NzA3WjCBnDELMAkGA1UEBhMCREUxFjAUBgNVBAgTDU5JRURF
-UlNBQ0hTRU4xEzARBgNVBAcTCkdPRVRUSU5HRU4xLTArBgNVBAoTJEdlbWVpbnNh
-bWVyIEJpYmxpb3RoZWtzdmVyYnVuZCAoR0JWKTEcMBoGA1UECxMTRGlnaXRhbGUg
-QmlibGlvdGhlazETMBEGA1UEAxMKd3d3LnZoby5kZTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAMxWPQ1x7VFjjh85oQNHMLrIR7U9ZlB5Hc+hHs5YWLDv
-eRfoW/C3LZF8sLkd1BH1bd9W6EuB5IRzPSHxn10mxYQWfezalgY/NCSxag5EUzJG
-o45Shd5B//dBXMFuVxd3mCGZ7Gpi2YwvKQZOjPTgs6WJeCsNy9nsrNe8dhK3rswV
-I/f5pjhHDd5o43348uMY4bjVmtBke2IWo/PY4OMZIxsHMm5wu3mW9VfmTx2Deb2G
-8PUHNeqdiyv1AfOsCgRC8BhHq5tg0tzA8u52CDXFIR7zuvlPdBN/LMb6DMIdyE5C
-qFGabY/n/EKFexAiTz+evlpHihPTjx0s00lnd4W0yPwZEtaGxzcOnLygE/NjoGA+
-2Dym0Oo+NnGAvFN2FVTRrqKJV/6D/3Oh1xX2yAAMYv+1GlyeJOReCD+Fki5cHo/J
-bgpu1yC23wYrst/25BIlPvDxrdveZuVTdXc4n7n51PBTX70R/GvkQ9Sv9T5yGwbV
-CnT1ostCj/QwwAyxC8H1dch5hEvRRQy+zme5AXcwXhtAjErUEmkn13eXRWQwLkrt
-ZcbBY8ibdlQhdguwXdtkrS38tX4WyFd4j51olwoEPLXjU52u96nCjkHtO6GyXnU9
-+ZcWSxJePmrmGWxOtu3NsOpcm9RhrtOlDxYp7n17tZ64pIZFIiPbv2fGMXStPJNz
-AgMBAAGjggGmMIIBojAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
-BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFIHlCTp0Hw2ixtPSg7IXjQOH
-onjFMB8GA1UdIwQYMBaAFKbk/5j95Ukyflx18haiTYx0Nd4iMBcGA1UdEQQQMA6B
-DGJvcmVsQGdidi5kZTB5BgNVHR8EcjBwMDagNKAyhjBodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL2d3ZGctY2EvcHViL2NybC9jYWNybC5jcmwwNqA0oDKGMGh0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBlAYIKwYB
-BQUHAQEEgYcwgYQwQAYIKwYBBQUHMAKGNGh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUv
-Z3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwQAYIKwYBBQUHMAKGNGh0dHA6
-Ly9jZHAyLnBjYS5kZm4uZGUvZ3dkZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBAE/4u0zjwF5+yQkcpeCNoSdH8JIhMJofYyWfQPD+
-Q36nQBqrolaFCe94zThj+gJmabfIDEvpwCLCa2YtCDosWsI9rX4GF1ZUsxKqxgBB
-IH1rFZlKKEeDYieR8lRH4vy4RGh9dkvhhXLgyrekt3iyfWHxCz/n47awnmYgO2st
-dqh2nY2bXoDASUlgzO59ghsfi6pT5WAGRUwZhMS3iErLglDYoT6AqEdr406TWeLp
-Mw04ESW7mR05nhLcIBNf23UPKjMpNTwBQC1BAbssGMMMbPojg1K+80aLKAB32ZPw
-CFNwbRrYB0gGPASPkZD9WxiosAZp/uqr6QTZIUDSSmWt2B0=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://www.vho.de:8443/idpvzg/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vho.de:8443/idpvzg/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">IdP der Verbundzentrale</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Verbundzentrale Göttingen (VZG)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.vho.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Franck</GivenName>
-    <SurName>Borel</SurName>
-    <EmailAddress>borel@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Gerald</GivenName>
-    <SurName>Steilen</SurName>
-    <EmailAddress>steilen@gbv.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Till</GivenName>
-    <SurName>Kinstler</SurName>
-    <EmailAddress>kinstler@gbv.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.video2brain.com.xml b/swamid-interfederations-2.0/www.video2brain.com.xml
deleted file mode 100644
index 693c03c3..00000000
--- a/swamid-interfederations-2.0/www.video2brain.com.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.video2brain.com/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.video2brain.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.video2brain.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.video2brain.com,OU=Terms of use at www.verisign.com/rpa (c)05,O=video2brain GmbH,L=Graz,ST=Steiermark,C=AT,serialNumber=310510h,businessCategory=Private Organization,1.3.6.1.4.1.311.60.2.1.1=#140120,1.3.6.1.4.1.311.60.2.1.2=#140120,1.3.6.1.4.1.311.60.2.1.3=#13024154</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGITCCBQmgAwIBAgIQNS1m8T236j2soVAkQJv7jzANBgkqhkiG9w0BAQUFADCB
-ujELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMr
-VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTAeFw0x
-MjAxMDMwMDAwMDBaFw0xNDAxMDIyMzU5NTlaMIIBDTETMBEGCysGAQQBgjc8AgED
-EwJBVDESMBAGCysGAQQBgjc8AgECFAEgMRIwEAYLKwYBBAGCNzwCAQEUASAxHTAb
-BgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRAwDgYDVQQFEwczMTA1MTBoMQsw
-CQYDVQQGEwJBVDETMBEGA1UECBQKU3RlaWVybWFyazENMAsGA1UEBxQER3JhejEZ
-MBcGA1UEChQQdmlkZW8yYnJhaW4gR21iSDEzMDEGA1UECxQqVGVybXMgb2YgdXNl
-IGF0IHd3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA1MRwwGgYDVQQDFBN3d3cudmlk
-ZW8yYnJhaW4uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo1oh
-XDUGMkwc2fgsmGnYwPOwCAEeYtZI5du0E40rE+h9f1Ruaq+niJUOI4Rz0bVTP/o9
-1Ae2+PyNbV+tlhcUT60OsSVVEkl6oya6o4mTO/bvXM2O+/EUnG/l3a8jNFddL9Zr
-y162ybEnwjxMo37EWtLE3/8yr3Hrz151BXRWAGfu3eXSAGzgJkNjDv78e2gm7MCL
-FMjEl9j3j2Oivzvn4OLTm0Nt+amNh9BEXPcWu2bnID4gddiFF3aGeb8lfJix1HVV
-cM6GEgxmBvoypNUj7Fu/nvO1K2UERhGiHvZfLjjndRoNheYulPtNsHXH1esrGlp8
-GRC5VHe3isUsAZsq2QIDAQABo4IByzCCAccwCQYDVR0TBAIwADALBgNVHQ8EBAMC
-BaAwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL0VWU2VjdXJlLWNybC52ZXJpc2ln
-bi5jb20vRVZTZWN1cmUyMDA2LmNybDBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcG
-MCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9jcHMwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFPyKULqeuSVa
-e1WFT5UAY4/pWGtDMHMGCCsGAQUFBwEBBGcwZTAkBggrBgEFBQcwAYYYaHR0cDov
-L29jc3AudmVyaXNpZ24uY29tMD0GCCsGAQUFBzAChjFodHRwOi8vRVZTZWN1cmUt
-YWlhLnZlcmlzaWduLmNvbS9FVlNlY3VyZTIwMDYuY2VyMG4GCCsGAQUFBwEMBGIw
-YKFeoFwwWjBYMFYWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4
-mymsSweLIQUYMCYWJGh0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdp
-ZjANBgkqhkiG9w0BAQUFAAOCAQEAhEs/7E2y3/HBHrqo/K7HP4Tdh3R2wlYqgBcW
-bMryxFyEAeL3DRwyx5YP8ZvVGdDoYeR0nMiZOK/mM5Z6HrI5SctILAvzRCvA5vd4
-BDwQn6ywEFaCcbjKLn+qWp9+Edb4eKlfX+iy6biEyhU4xxM7l/oTi60XqUwjMhrB
-vYhJG7vUAHPzBorZdAVFX0mDKyQk6biUYK/FYdQ80FeZMgDUf3snKZfmh8ZCQTRp
-RMwhC+WtUjgR8YGq8g9Cr7IwKbigkuL52fruRz2uK/wJr4e4A2/UdkMsAwBAWr+5
-EHbDtbx/A7fv7IBuW8MyR8JQuf5kfqS8ca8cH47paHLRK9BzNA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.video2brain.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.video2brain.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.video2brain.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.video2brain.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.video2brain.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.video2brain.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.video2brain.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.video2brain.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.video2brain.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.video2brain.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.video2brain.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.video2brain.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.video2brain.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.video2brain.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">video2brain</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">video2brain</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.video2brain.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ammar</GivenName>
-    <SurName>Aganovic</SurName>
-    <EmailAddress>aganovic@parkside.at</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Thomas</GivenName>
-    <SurName>Lauter</SurName>
-    <EmailAddress>tlauter@video2brain.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
deleted file mode 100644
index 0c1ef938..00000000
--- a/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.videotorium.hu/shibboleth">
-  <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="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>niifi</saml:AttributeValue>
-        <saml:AttributeValue>href</saml:AttributeValue>
-        <saml:AttributeValue>href-edugain</saml:AttributeValue>
-        <saml:AttributeValue>sulinet</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2013-08-01T07:17:19.807Z">
-      <mdrpi:RegistrationPolicy xml:lang="hu">http://metadata.eduid.hu/registration_policy_1_0.txt</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="hu">Videotorium</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Videotorium</mdui:DisplayName>
-        <mdui:Description 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.</mdui:Description>
-        <mdui:Description 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.</mdui:Description>
-        <mdui:InformationURL xml:lang="hu">http://videotorium.hu</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="hu">http://videotorium.hu/hu/contents/userstos</mdui:PrivacyStatementURL>
-        <mdui:Logo height="86" width="100">https://metadata.eduid.hu/logos/videotorium.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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:KeyName>vportal.niif.hu</ds:KeyName>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://niif.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rmki.videotorium.hu/Shibboleth.sso/SLO/Redirect"/>
-    <md:NameIDFormat>undefined</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://videotorium.hu/Shibboleth.sso/SAML2/POST" isDefault="true" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rmki.videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://videotorium.hu/Shibboleth.sso/SAML2/Artifact" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://niif.videotorium.hu/Shibboleth.sso/SAML2/POST" index="5"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="hu">Videotorium</md:ServiceName>
-      <md:ServiceName xml:lang="en">Videotorium</md:ServiceName>
-      <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="surname" 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 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="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="hu">http://www.niif.hu</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.niif.hu/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Videotorium Admin</md:SurName>
-    <md:EmailAddress>mailto:admin@videotorium.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Videotorium Admin</md:SurName>
-    <md:EmailAddress>mailto:admin@videotorium.hu</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Videtorium Admin</md:SurName>
-    <md:EmailAddress>mailto:admin@videotorium.hu</md:EmailAddress>
-  </md:ContactPerson>
-</md: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 b796c735..00000000
--- a/swamid-interfederations-2.0/www.videotorium.hu.xml
+++ /dev/null
@@ -1,71 +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>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <mdui: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.vifamusik.de.xml b/swamid-interfederations-2.0/www.vifamusik.de.xml
deleted file mode 100644
index 12d821ca..00000000
--- a/swamid-interfederations-2.0/www.vifamusik.de.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vifamusik.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.vifamusik.de/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.historicum.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.historicum.net,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEmxxU49V0zANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODE4MTExMzA3WhcNMTYw
-ODE2MTExMzA3WjCBmjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRswGQYD
-VQQDExJ3d3cuaGlzdG9yaWN1bS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC+VCvKgWK8OIWsMo1HhMLQhsxbfny8byHwNTjAtSTGflA3/G3FDrAe
-kOK2/+DoadamgGaKMo9mbfZiMsB+0qsNLA8sD9GFbBNCRIFg7DWUtaJDkbug/Otl
-+qQThsRYy7jfUy3MxGwzOD58MBPflD8GS31qNUjJDV8Nxwk/ahpHVs4XdTDqMqB9
-/TCQZYdxoL95x+n48Wmj9oPjNjY1+4+DP/NAJ9g3pw3MZrMCOP5iiBzc2bvRTm4U
-V24wJnrWF4+lpCVHxbobFqbTwuG6Z7LkRN41q5QA3qkZ68844d5BOxjxFAsSAkJu
-3WcpBl6hEy3j65QLU5rYR0WmzyKCnBJdAgMBAAGjggH8MIIB+DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFPloMP+TFIehpHELFn3MzgM4TSoXMB8GA1UdIwQYMBaAFHpnjFsaE0SC
-syFaGyqK858x4MRhMIGxBgNVHR8EgakwgaYwUaBPoE2GS2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBRoE+gTYZLaHR0cDovL2NkcDIucGNhLmRmbi5kZS9iYXll
-cmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIHKBggrBgEFBQcBAQSBvTCBujBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEApt7GnxFmz+s84Dv/Q9Pk
-3czsoPilgDKTnv2J2YMV2abmMy7j3yCfyE4mY+LsvhvXw1a7sJRfV+LjTCtS89/4
-2HFNYvVlalS3wprX3c4GgqGNZ+5puTURvWnXdTeeJMv4FWoqPNndm1ReSzHqExzc
-bL2X3dqNNxkdFBMPMQI1kD/ez+X1fPxLetv/Eyxj/tjJ474ItsMFcR1nc8CYS4lz
-J6+2jq7nN+bykToSFC9N0FrzwvDHocLoy0f+1ZV0FRjNjvxBIbg3//gKwnB+pF8L
-IEgLDBRYn7j7darmze2EzqinWCVnWHffUirPnGG+ed6zDkgEAFv9bAuwl6KVmJUe
-CQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.historicum.net</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.historicum.net,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFzTCCBLWgAwIBAgIHEmxxU49V0zANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODE4MTExMzA3WhcNMTYw
-ODE2MTExMzA3WjCBmjELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRswGQYD
-VQQDExJ3d3cuaGlzdG9yaWN1bS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQC+VCvKgWK8OIWsMo1HhMLQhsxbfny8byHwNTjAtSTGflA3/G3FDrAe
-kOK2/+DoadamgGaKMo9mbfZiMsB+0qsNLA8sD9GFbBNCRIFg7DWUtaJDkbug/Otl
-+qQThsRYy7jfUy3MxGwzOD58MBPflD8GS31qNUjJDV8Nxwk/ahpHVs4XdTDqMqB9
-/TCQZYdxoL95x+n48Wmj9oPjNjY1+4+DP/NAJ9g3pw3MZrMCOP5iiBzc2bvRTm4U
-V24wJnrWF4+lpCVHxbobFqbTwuG6Z7LkRN41q5QA3qkZ68844d5BOxjxFAsSAkJu
-3WcpBl6hEy3j65QLU5rYR0WmzyKCnBJdAgMBAAGjggH8MIIB+DAJBgNVHRMEAjAA
-MAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYD
-VR0OBBYEFPloMP+TFIehpHELFn3MzgM4TSoXMB8GA1UdIwQYMBaAFHpnjFsaE0SC
-syFaGyqK858x4MRhMIGxBgNVHR8EgakwgaYwUaBPoE2GS2h0dHA6Ly9jZHAxLnBj
-YS5kZm4uZGUvYmF5ZXJpc2NoZS1zdGFhdHNiaWJsaW90aGVrLWJzYi1jYS9wdWIv
-Y3JsL2NhY3JsLmNybDBRoE+gTYZLaHR0cDovL2NkcDIucGNhLmRmbi5kZS9iYXll
-cmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwvY2FjcmwuY3Js
-MIHKBggrBgEFBQcBAQSBvTCBujBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9j
-YWNlcnQvY2FjZXJ0LmNydDBbBggrBgEFBQcwAoZPaHR0cDovL2NkcDIucGNhLmRm
-bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jYWNl
-cnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEApt7GnxFmz+s84Dv/Q9Pk
-3czsoPilgDKTnv2J2YMV2abmMy7j3yCfyE4mY+LsvhvXw1a7sJRfV+LjTCtS89/4
-2HFNYvVlalS3wprX3c4GgqGNZ+5puTURvWnXdTeeJMv4FWoqPNndm1ReSzHqExzc
-bL2X3dqNNxkdFBMPMQI1kD/ez+X1fPxLetv/Eyxj/tjJ474ItsMFcR1nc8CYS4lz
-J6+2jq7nN+bykToSFC9N0FrzwvDHocLoy0f+1ZV0FRjNjvxBIbg3//gKwnB+pF8L
-IEgLDBRYn7j7darmze2EzqinWCVnWHffUirPnGG+ed6zDkgEAFv9bAuwl6KVmJUe
-CQ==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vifamusik.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vifamusik.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifamusik.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifamusik.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vifamusik.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vifamusik.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifamusik.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifamusik.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifamusik.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vifamusik.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifamusik.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.vifamusik.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.vifamusik.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.vifamusik.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.vifamusik.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vifarom.de.xml b/swamid-interfederations-2.0/www.vifarom.de.xml
deleted file mode 100644
index 13378f58..00000000
--- a/swamid-interfederations-2.0/www.vifarom.de.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vifarom.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.vifarom.de/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.vifarom.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.vifarom.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIHEnRY6lxAVTANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTEwNzA3WhcNMTYw
-ODIyMTEwNzA3WjCBljELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRcwFQYD
-VQQDEw53d3cudmlmYXJvbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMVCVmepur2mn7u0TH+e8FmYI2pDpSH5jvgZG2e97/iB26diSvba9zNQz64m
-WTJx7ZAKY3UYFd32qLNJ+0aNJ0cPzdB+fcOE7zVnVZLVvyiFn7/SLkP0F2DPSilX
-XDQYB9y5RZQt7MP0liE78qdQLNbw7EEuX9GZozpspMKelRskhzBXXcS5POYM/9b7
-e/vcaKmR10RKtapeiYma06DD+oyBVkWpmM0EGS9DzdtI629D3WfP+J4TPHnkeOz1
-JdZ5/qsclJH3iejl47e936qeTsDgMH+wD8teK9N6MZS6+y5bBnoCbOsX+Rf8HnQU
-KlOZxg8n0qTm4LWXIZfjRt/xhWsCAwEAAaOCAfwwggH4MAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUx1w8vbdgEF52KU46RaAj5IwM650wHwYDVR0jBBgwFoAUemeMWxoTRIKzIVob
-KorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JheWVyaXNj
-aGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5jcmwwgcoG
-CCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBU8lbpQq5A7JJjsY9yACjaowfp
-NoP7w3+GisbTZFMXn+IHPlseyap7dBPFCVqxqjOT4bRiNKGmUa/upcZDSSZ3dwp7
-MggO8Nj+mPPUy88lY0IUjYNY5I+q3CAkpqV5MrQCxP19jwDNEPWXTjf3fIBAoDeo
-iTFSZYYAtPvA35TeyS/s7rwg/XvQ4/42XxOpkiV6363IObcIVgt9febaw8Z1sK2P
-6FzsA6UXH+xSh40bQV02YjuWrQtAK1dkjJmUrjQL5+t45hCO0lnYb3njX6oGzTSw
-7pkahKXfb58uiLQ9fj/0PEmoMlI00WUMINoB2jjwwA7gISALB3eB8V+9TKCU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.vifarom.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.vifarom.de,OU=Bayerische Staatsbibliothek,O=Bayerische Staatsbibliothek,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFyTCCBLGgAwIBAgIHEnRY6lxAVTANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UE
-BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xJDAiBgNV
-BAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlvdGhlazEkMCIGA1UECxMbQmF5ZXJp
-c2NoZSBTdGFhdHNiaWJsaW90aGVrMQ8wDQYDVQQDEwZCU0ItQ0ExIjAgBgkqhkiG
-9w0BCQEWE3BraUBic2ItbXVlbmNoZW4uZGUwHhcNMTEwODI0MTEwNzA3WhcNMTYw
-ODIyMTEwNzA3WjCBljELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJheWVybjERMA8G
-A1UEBxMITXVlbmNoZW4xJDAiBgNVBAoTG0JheWVyaXNjaGUgU3RhYXRzYmlibGlv
-dGhlazEkMCIGA1UECxMbQmF5ZXJpc2NoZSBTdGFhdHNiaWJsaW90aGVrMRcwFQYD
-VQQDEw53d3cudmlmYXJvbS5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMVCVmepur2mn7u0TH+e8FmYI2pDpSH5jvgZG2e97/iB26diSvba9zNQz64m
-WTJx7ZAKY3UYFd32qLNJ+0aNJ0cPzdB+fcOE7zVnVZLVvyiFn7/SLkP0F2DPSilX
-XDQYB9y5RZQt7MP0liE78qdQLNbw7EEuX9GZozpspMKelRskhzBXXcS5POYM/9b7
-e/vcaKmR10RKtapeiYma06DD+oyBVkWpmM0EGS9DzdtI629D3WfP+J4TPHnkeOz1
-JdZ5/qsclJH3iejl47e936qeTsDgMH+wD8teK9N6MZS6+y5bBnoCbOsX+Rf8HnQU
-KlOZxg8n0qTm4LWXIZfjRt/xhWsCAwEAAaOCAfwwggH4MAkGA1UdEwQCMAAwCwYD
-VR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4E
-FgQUx1w8vbdgEF52KU46RaAj5IwM650wHwYDVR0jBBgwFoAUemeMWxoTRIKzIVob
-KorznzHgxGEwgbEGA1UdHwSBqTCBpjBRoE+gTYZLaHR0cDovL2NkcDEucGNhLmRm
-bi5kZS9iYXllcmlzY2hlLXN0YWF0c2JpYmxpb3RoZWstYnNiLWNhL3B1Yi9jcmwv
-Y2FjcmwuY3JsMFGgT6BNhktodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JheWVyaXNj
-aGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NybC9jYWNybC5jcmwwgcoG
-CCsGAQUFBwEBBIG9MIG6MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMS5wY2EuZGZu
-LmRlL2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2Vy
-dC9jYWNlcnQuY3J0MFsGCCsGAQUFBzAChk9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L2JheWVyaXNjaGUtc3RhYXRzYmlibGlvdGhlay1ic2ItY2EvcHViL2NhY2VydC9j
-YWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBU8lbpQq5A7JJjsY9yACjaowfp
-NoP7w3+GisbTZFMXn+IHPlseyap7dBPFCVqxqjOT4bRiNKGmUa/upcZDSSZ3dwp7
-MggO8Nj+mPPUy88lY0IUjYNY5I+q3CAkpqV5MrQCxP19jwDNEPWXTjf3fIBAoDeo
-iTFSZYYAtPvA35TeyS/s7rwg/XvQ4/42XxOpkiV6363IObcIVgt9febaw8Z1sK2P
-6FzsA6UXH+xSh40bQV02YjuWrQtAK1dkjJmUrjQL5+t45hCO0lnYb3njX6oGzTSw
-7pkahKXfb58uiLQ9fj/0PEmoMlI00WUMINoB2jjwwA7gISALB3eB8V+9TKCU
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vifarom.de/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vifarom.de/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifarom.de/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifarom.de/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vifarom.de/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vifarom.de/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifarom.de/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifarom.de/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vifarom.de/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vifarom.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vifarom.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.vifarom.de/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.vifarom.de/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.vifarom.de/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Bayerische Staatsbibliothek</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Bayerische Staatsbibliothek München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://www.vifarom.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="administrative">
-    <GivenName>Heinrich</GivenName>
-    <SurName>Wunderle</SurName>
-    <EmailAddress>heinrich.wunderle@bsb-muenchen.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.vist.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.vist.org.uk-shibboleth.xml
deleted file mode 100644
index ae5b490e..00000000
--- a/swamid-interfederations-2.0/www.vist.org.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://www.vist.org.uk/shibboleth">
-  <!--
-		This is a "Vertebral artery Ischaemia Stenting Trial" Shibboleth SP for the University of Cambridge.
-	-->
-  <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="2015-01-15T15:49:04Z">
-      <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.vist.org.uk/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://www.vist.org.uk/Shibboleth.sso/WAYF"/>
-      <init: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.vist.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://www.vist.org.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDzCCAfegAwIBAgIJAOB8D/FajzX8MA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51azAeFw0xMDAxMTgxMTAwMDdaFw0y
-						MDAxMTYxMTAwMDdaMCMxITAfBgNVBAMTGHd3dy1mYWxjb24uY3N4LmNhbS5hYy51
-						azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKpU2AuemKJSIeDmgjkZ
-						tPgKaPPkM5CKu3QUHm5JzmtnG3UFMxbOumt6sxWWF72ceXQNPgBNGqFI/sFdaCIo
-						HxZj+Z2i+k7/IVXhc4wjs72YUfrjvTMDhHHzndm3KkJS8imsIYQ8/bBnJEF93zVJ
-						gPYTrX1C8JxqF/wfY/XCGbEqHgJtqDrSEvK+vLF7LaYI4oTotZOg/vhN7uwaEa7n
-						GU2+bKuhcAL+rolEM6sbdrQAj3KarTafacfh9IiAclzyOQTA6pfjFWrucNIuWXc4
-						YhaEPyOMubMsp+0eXZAwEPTJ61x+nQZd3UAf7Rm5v7agrzRAdqdwpnqb4yyprJlI
-						+lkCAwEAAaNGMEQwIwYDVR0RBBwwGoIYd3d3LWZhbGNvbi5jc3guY2FtLmFjLnVr
-						MB0GA1UdDgQWBBTz/ES/EvNaSsqqXUxLuIFc9YHi/TANBgkqhkiG9w0BAQUFAAOC
-						AQEAAvFTJS2L6StZuqKA935AD3bBOHe5pg+LCF6ydHdTuyWEJYIWBRJ1WXsKMyaG
-						yvdlX60XziJARq2UiYxt4yRjuGLAjQl9kNdrlqeb2AJFnA5E1Mt56FtzPiwu2zrC
-						TQlklC4Xfie1Yaw2kEVO2vAoRfg9bgSBfyvFC4oR3vCery3Z687oCeQqDp7LPRcn
-						+k5qQD8pout57IYzwyo7GPeVkYEPb3GO2KYmoENlDR/xah2VcsTZF7aIsMBFxaPv
-						O+oqrQcnQXTviY9yWLbAlSrPPqGNYDxayVHn+zDSO4scLlOoqZJ8iC5NboNKqFyB
-						RsenNm/aXp0wIU+jHVmi/GAPCQ==
-					</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.vist.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vist.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vist.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vist.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vist.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.vist.org.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.vist.org.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vist.org.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vist.org.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.vist.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.vist.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.vist.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.vist.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.vist.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.vist.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Cambridge</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The Vertebral artery Ischaemia Stenting Trial</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.vist.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Falcon Support</GivenName>
-    <EmailAddress>mailto:falcon-support@ucs.cam.ac.uk</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 2af3f75a..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vutbr.cz/SSO/saml2/idp">
-  <md:Extensions>
-    <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>
-  <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">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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <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://www.vutbr.cz/SSO/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Brno University of Technology</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Brno University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Vysoké učení technické v Brně</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.vutbr.cz/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.vutbr.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Webmasters</md:GivenName>
-    <md:SurName>VUT Portal</md:SurName>
-    <md:EmailAddress>portal@vutbr.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.walesdtc.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/www.walesdtc.ac.uk-shibboleth.xml
deleted file mode 100644
index 4f916050..00000000
--- a/swamid-interfederations-2.0/www.walesdtc.ac.uk-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://www.walesdtc.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for Cardiff University.
-	-->
-  <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-08-28T13:10:37Z"/>
-  </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.walesdtc.ac.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://www.walesdtc.ac.uk/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAPbailijb9L3MA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHNvY3NpMDEuY2YuYWMudWswHhcNMTMwMzI2MDk0NDQ2WhcNMjMwMzI0MDk0
-						NDQ2WjAbMRkwFwYDVQQDExBzb2NzaTAxLmNmLmFjLnVrMIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEA0ujf4w6Wex5S5yUwoVVgRe3Idf4qrmCg9JTCq9xJ
-						XOVhWbYusvj70tVT0hLrlHafwjby3OzrPEUfct/9H02YUGoqjSXPxTDiPOENZzsW
-						jE2YHjotmOHEtilSJnyvOQpTfJFv8S2HbA4NoXJR9OOTsy+8YgLrLHS8zzpPpEcC
-						DQOlsRlb1kqdkfpgpGEadhFy8XB9iGhVIuJDEr/p1Q+c5zcBCXwrFy2p8XjgAEj4
-						fRaHaW5uDhdXFTrl0icKTElrAoyqs+Pot44TRUNG/B/4SLsMKCapHvDLjxJRobx2
-						9KR7Bvwyf397i2nQqdrjVFsqtj89Asv0lUxm6DtUGz4y9QIDAQABoz4wPDAbBgNV
-						HREEFDASghBzb2NzaTAxLmNmLmFjLnVrMB0GA1UdDgQWBBSw4X82LGsMUJHKB8Gj
-						tSyINoYALzANBgkqhkiG9w0BAQUFAAOCAQEAyZGq7fE3UF+pIIyEq3/2wkktaJZN
-						a6QW3X0WXJ2SDHZLBVpz4tqIHeFIM0IKliKvfg/7mgD42x3dB4w9+mdIrYhPn/BI
-						GdpNTxW+NnGBW7CwEtLkBtkmQRYUXFSu5CJHF8Epe1TeNmd3DBMx5BdruFPrL/Rv
-						zxKp5iQima7G/GzVSqAWKfswtpC3nw15I2UylDnPUaSw0W4fFViFiVjfS5wOQicg
-						VwKUrkl1bpbG60AK3IBkQJsV4Jj4lswoDbrBvugoKqAQ3QsKuYRFOw5EMGTwhjEx
-						pkeB18XsxDB/+q81BcLHYxqHOeAWUr7x/dhavNYQVZ5FdNgt5bAbHOjBNw==
-					</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.walesdtc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.walesdtc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Cardiff University</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Wales Doctoral Training College</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.walesdtc.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Simon</GivenName>
-    <SurName>Wood</SurName>
-    <EmailAddress>mailto:WoodSN2@cardiff.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Simon</GivenName>
-    <SurName>Wood</SurName>
-    <EmailAddress>mailto:WoodSN2@cardiff.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.warwicksu.com-shibboleth.xml b/swamid-interfederations-2.0/www.warwicksu.com-shibboleth.xml
deleted file mode 100644
index 6c9a6896..00000000
--- a/swamid-interfederations-2.0/www.warwicksu.com-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://www.warwicksu.com/shibboleth">
-  <!-- This is a "Warwick SU" Shibboleth SP for Membership Solutions Limited.  -->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIIDGDCCAgCgAwIBAgIJALHfJpUPBSpAMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG3dlYnNydi5zdW5pb24ud2Fyd2ljay5hYy51azAeFw0wOTEyMTgxNDI5NDRa
-						Fw0xOTEyMTYxNDI5NDRaMCYxJDAiBgNVBAMTG3dlYnNydi5zdW5pb24ud2Fyd2lj
-						ay5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPeWU4LIz/q4
-						1T0o8E/Bxum3k6vrWQ8LxESY7ZKWZ9LXH3UE9iTWX8Imt0H1iuAgF2aqperi+iYJ
-						ajsapIvp16vWle8kf9Nl47CYwqYGi+26M+ZnKVRdLWfPt9O1SZ6TN4ed57sCUXL2
-						0W+10Pd2f3odMDlrPOYdL5Jmr9dmu9/o3h10GqrQShVL59Bgh3myGH6zwomnHK85
-						wzA1ihDHGTx/EQodaUnTJV/+oQiFNhX79C/qeJD524VuEyz2S+vtCsmmCKMfaR38
-						slH7luklFZF/zrQqjgCkr0Xo4+PYZFK574yaN5dL2wA5U4zC81sN+R0X8UggxCk2
-						DuMKwkXpP6kCAwEAAaNJMEcwJgYDVR0RBB8wHYIbd2Vic3J2LnN1bmlvbi53YXJ3
-						aWNrLmFjLnVrMB0GA1UdDgQWBBTe+5nssBuK7Tob4tI4foxYDaLJTTANBgkqhkiG
-						9w0BAQUFAAOCAQEA6QSS5qeUN2/Ee3peHAtrS7uSh+67vnQ2Wc9Txgm0EFenK+oV
-						nf6kNerS+KC8E5bfNTMlHdA/Tt9GBozrHzC98kreqLY/L5qKjLPGV13m9L+hpebO
-						ncjl+PgLL99ykWDTyzWE4DFrnmOaatds3j5Si0TmgoACVdh81jn29a6ws/fkn2nl
-						ogEC4aAlAyXe0iz6wO13CUDjPfxTPvbu1CnolRhSc08WeuHULTDbYtS7d8KVKmDi
-						QcT+Fcj3pLh99q9sovhvjqslHLBFYsQBIO+AhDYuP96HYwlRc0dNBK/ffyDnLInD
-						qNB3N90Cm4ioo1ZIRxVn7ah/l65DE3Bc2fmXqg==
-					</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>
-						MIIDGDCCAgCgAwIBAgIJALHfJpUPBSpAMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
-						BAMTG3dlYnNydi5zdW5pb24ud2Fyd2ljay5hYy51azAeFw0wOTEyMTgxNDI5NDRa
-						Fw0xOTEyMTYxNDI5NDRaMCYxJDAiBgNVBAMTG3dlYnNydi5zdW5pb24ud2Fyd2lj
-						ay5hYy51azCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPeWU4LIz/q4
-						1T0o8E/Bxum3k6vrWQ8LxESY7ZKWZ9LXH3UE9iTWX8Imt0H1iuAgF2aqperi+iYJ
-						ajsapIvp16vWle8kf9Nl47CYwqYGi+26M+ZnKVRdLWfPt9O1SZ6TN4ed57sCUXL2
-						0W+10Pd2f3odMDlrPOYdL5Jmr9dmu9/o3h10GqrQShVL59Bgh3myGH6zwomnHK85
-						wzA1ihDHGTx/EQodaUnTJV/+oQiFNhX79C/qeJD524VuEyz2S+vtCsmmCKMfaR38
-						slH7luklFZF/zrQqjgCkr0Xo4+PYZFK574yaN5dL2wA5U4zC81sN+R0X8UggxCk2
-						DuMKwkXpP6kCAwEAAaNJMEcwJgYDVR0RBB8wHYIbd2Vic3J2LnN1bmlvbi53YXJ3
-						aWNrLmFjLnVrMB0GA1UdDgQWBBTe+5nssBuK7Tob4tI4foxYDaLJTTANBgkqhkiG
-						9w0BAQUFAAOCAQEA6QSS5qeUN2/Ee3peHAtrS7uSh+67vnQ2Wc9Txgm0EFenK+oV
-						nf6kNerS+KC8E5bfNTMlHdA/Tt9GBozrHzC98kreqLY/L5qKjLPGV13m9L+hpebO
-						ncjl+PgLL99ykWDTyzWE4DFrnmOaatds3j5Si0TmgoACVdh81jn29a6ws/fkn2nl
-						ogEC4aAlAyXe0iz6wO13CUDjPfxTPvbu1CnolRhSc08WeuHULTDbYtS7d8KVKmDi
-						QcT+Fcj3pLh99q9sovhvjqslHLBFYsQBIO+AhDYuP96HYwlRc0dNBK/ffyDnLInD
-						qNB3N90Cm4ioo1ZIRxVn7ah/l65DE3Bc2fmXqg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.warwicksu.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.warwicksu.com/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.warwicksu.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.warwicksu.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.warwicksu.com/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.warwicksu.com/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.warwicksu.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.warwicksu.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.warwicksu.com/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.warwicksu.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.warwicksu.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.warwicksu.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.warwicksu.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.warwicksu.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.warwicksu.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Membership Solutions: Warwick SU</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.warwicksu.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.westlaw.co.uk-metadata.xml b/swamid-interfederations-2.0/www.westlaw.co.uk-metadata.xml
deleted file mode 100644
index f49ff547..00000000
--- a/swamid-interfederations-2.0/www.westlaw.co.uk-metadata.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.westlaw.co.uk/metadata">
-  <!--
-		This is a "Westlaw UK" OpenAthens SP for Thomson Reuters (Professional) UK Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="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">Westlaw UK</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Westlaw UK gives you access to vast but easily searchable databases of case law, legislation, legal journals, commentary and EU legal materials.</mdui:Description>
-        <mdui:Logo height="98" width="350">https://login.westlaw.co.uk//wluk/images/logos/westlaw_uk_logo.gif</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDDjCCAfagAwIBAgIETjbD0TANBgkqhkiG9w0BAQUFADBJMSkwJwYDVQQKEyBUaG9tc29uIFJl
-						dXRlcnMgKExlZ2FsKSBMaW1pdGVkLjEcMBoGA1UEAxMTbG9naW4ud2VzdGxhdy5jby51azAeFw0x
-						MTA4MDExNTE4NDFaFw0yMTA3MjkxNTE4NDFaMEkxKTAnBgNVBAoTIFRob21zb24gUmV1dGVycyAo
-						TGVnYWwpIExpbWl0ZWQuMRwwGgYDVQQDExNsb2dpbi53ZXN0bGF3LmNvLnVrMIIBIjANBgkqhkiG
-						9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjqegY1cVyO5Y8nIZFAoZZitBVfBgocOQt0xCykkT0i7jXKsT
-						2PAtCpLIyHfS6bQk19c0MwT+jeVpoMGEQNT9pBBX6zQvCTrKPO6sK/Zcxdlvuh4AJH0wrUMj6abl
-						vpNUKuA/SLgL3p2PGcvLA3GhV721LW8Z5DuxZw7N423Y0HYOpmlI8+37UBDNHtHJwNmt4Qly8CrB
-						nXb+8/6m3YaYLRCr1lP8Dxq/zWjFWuPd/hj/OFyfsMezOlvzXsjc0ST6YcpRjSiqPYOKgX6g8hMD
-						rePGbr+LAjjfeK5MmWCV/sGI4IC/QnQJ0IZ+caejJYA7G95aZcGKHu5FgDL1b7ES7QIDAQABMA0G
-						CSqGSIb3DQEBBQUAA4IBAQBU/dwEsds+SSTk9SSvUidLWjJT+OGfrdyQitN3M9qpTeSx29VzjxkS
-						/CePYfxhy+1p4D7lNWyUTIL4uoy29c4r52ev/JAVYnlQCie2/ElHuZs/rMlsWCFtZ8+fEAsouaDg
-						l64efxlzyis0f8jv41GaYi/zCp2AG1G6+3ldSlGSPKrEUbvC4L2OcShLpu5Px3yhYBPf/4BvildQ
-						owb5qZGmukHvcWTAXnypf5NspgAOfCrltLjzXDHbwVgO18uK438wB/KQGBqEQ3bgTZFeX4vhBiA5
-						riiNruaVCg47WT6HKGoOHDFd8I6L/CNOkfIRxkPkLljpmcFV6OmEOw5jCtbU
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk/app/authentication/sso/ukfed/auth/rcv" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk/app/authentication/sso/ukfed/auth/rcv" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukclt.int.westlaw.com/app/authentication/sso/ukfed/auth/rcv" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukclt.int.westlaw.com/app/authentication/sso/ukfed/auth/rcv" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukclt2.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukclt2.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://labs.westlaw.co.uk/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://labs.westlaw.co.uk/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukclt.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukclt.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukqc.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukqc.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukclt3.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukclt3.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.westlaw.co.uk.ukqc2.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="16"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.westlaw.co.uk.ukqc2.int.westlaw.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="17"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://prd.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="18"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://prd.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="19"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://prd.wluklabs.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="20"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://prd.wluklabs.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="21"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clt.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="22"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clt.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="23"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://qc.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="24"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://qc.wluk.int.westgroup.com/maf/wluk/app/authentication/sso/ukfed/auth/rcv" index="25"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.westlaw.co.uk/maf/api/v1/authenticate/validate/sso/ukfed" index="26"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.westlaw.co.uk/maf/api/v1/authenticate/validate/sso/ukfed" index="27"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clt.m.westlaw.co.uk/maf/api/v1/authenticate/validate/sso/ukfed" index="28"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clt.m.westlaw.co.uk/maf/api/v1/authenticate/validate/sso/ukfed" index="29"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.westlaw.co.uk/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="30"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.westlaw.co.uk/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="31"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clt.m.westlaw.co.uk/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="32"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clt.m.westlaw.co.uk/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="33"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.westlaw.co.uk.dev.int.westgroup.com/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="34"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.westlaw.co.uk.dev.int.westgroup.com/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="35"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://m.westlaw.co.uk.qc.int.westgroup.com/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="36"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://m.westlaw.co.uk.qc.int.westgroup.com/maf/mwluk/api/v1/authenticate/validate/sso/ukfed" index="37"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Thomson Reuters (Professional) UK Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Westlaw UK</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.westlaw.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Douglas</GivenName>
-    <SurName>Potts</SurName>
-    <EmailAddress>mailto:douglas.potts@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Andy</GivenName>
-    <SurName>Halford</SurName>
-    <EmailAddress>mailto:andrew.halford@thomsonreuters.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.wheredoyoustand.org.uk-shibboleth.xml b/swamid-interfederations-2.0/www.wheredoyoustand.org.uk-shibboleth.xml
deleted file mode 100644
index 5dbc4c4a..00000000
--- a/swamid-interfederations-2.0/www.wheredoyoustand.org.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://www.wheredoyoustand.org.uk/shibboleth">
-  <!--
-		This is a Shibboleth SP for D2.Digital By Design 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="2013-05-31T08:53:05Z"/>
-  </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.wheredoyoustand.org.uk/Shibboleth.sso/Login"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Where Do You Stand?</mdui:DisplayName>
-        <mdui:Logo height="72" width="170">https://www.wheredoyoustand.org.uk/content/images/where-do-you-stand-logo-170x72.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAJk9Zq3V7q4aMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
-						BAMTGnd3dy53aGVyZWRveW91c3RhbmQub3JnLnVrMB4XDTEzMDUzMDE1MjI0NloX
-						DTIzMDUyODE1MjI0NlowJTEjMCEGA1UEAxMad3d3LndoZXJlZG95b3VzdGFuZC5v
-						cmcudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBIOP3wjI3TysI
-						t2rRpeIE71BV2jCDMXG/1MaiyVOvXOGKvRCIpRD/fbiOo7F/4ItDevi8JG7OgMCA
-						a9vetz10IFyAynsgNYDL/QioF+ioryGsfnpMxOdy12FCx+LcoL3/AoPbRcyQWyp9
-						ZTQe2tx6TrIO0lMoHzVXWtkGg0JbfaySXebbRuczjql1ymTp7PwGWdcU9qayfKlC
-						S92wsvPNs+wYzmKNKqq88fdS27ZgAq3KkOxhXJiUSKuTKDQ2S/9PibTHF8xVuOa6
-						60YT8FHoBJgy8cKjAZysZuFuaVvMfALvAx4XqW7bcrvH2w0yCRX/c2n3FpCoFxuE
-						KcbBVQcrAgMBAAGjSDBGMCUGA1UdEQQeMByCGnd3dy53aGVyZWRveW91c3RhbmQu
-						b3JnLnVrMB0GA1UdDgQWBBSTEMJNGHiMrWb3/4bTPaygblO/YTANBgkqhkiG9w0B
-						AQUFAAOCAQEAaPA+M2xtKHcfs9j5Mlt3Ypm1sWXEHhW/z7zfYmL1mOs3L/QM18Fg
-						qo8GsPj2b3Ezzl4ntzjXOWsE/pbcJY3HsZg+U/ocBGIWfNqqWJw0BlfxfvzC9JD1
-						tWc4qrLnbfG/tPUU7R1LTIj3lJoSn4LEhRxpQwu/H1wY3gnBNPQHu9uvphlL8KUs
-						2VTl/SfeSDXiMGTBu0R11Q/iN01D1FJpmJsTYEYAVvDAOVdbGWzUynXzxg5Tq58b
-						TH2p/tyQly+tSTrRgtVTArS4AD1LlEJ0+iQIKwGZK7K1CjCwuJp1G6Oi2u/svbtj
-						IFsCv2VSURU413gGBeXs5Ngi1QsibTfnfw==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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.wheredoyoustand.org.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.wheredoyoustand.org.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">D2.Digital By Design Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Where Do You Stand?</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://www.wheredoyoustand.org.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Adam</GivenName>
-    <SurName>Thorpe</SurName>
-    <EmailAddress>mailto:support@wheredoyoustand.org.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Adam</GivenName>
-    <SurName>Thorpe</SurName>
-    <EmailAddress>mailto:support@wheredoyoustand.org.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.wolvesunion.org-shibboleth.xml b/swamid-interfederations-2.0/www.wolvesunion.org-shibboleth.xml
deleted file mode 100644
index ef9f4ca6..00000000
--- a/swamid-interfederations-2.0/www.wolvesunion.org-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://www.wolvesunion.org/shibboleth">
-  <!--
-		This is a "Wolverhampton Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://www.wolvesunion.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wolvesunion.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wolvesunion.org/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wolvesunion.org/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.wolvesunion.org/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wolvesunion.org/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wolvesunion.org/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wolvesunion.org/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.wolvesunion.org/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.wolvesunion.org/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.wolvesunion.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Membership Solutions Limited: Wolverhampton Students' Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.wolvesunion.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:helpdesk@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml b/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml
deleted file mode 100644
index 89620594..00000000
--- a/swamid-interfederations-2.0/www.worldscientific.com-shibboleth.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.worldscientific.com/shibboleth">
-  <!--
-		This is a 'World Scientific Publishing' OpenSAML for Atypon Systems, Inc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-09-24T08:34:41Z"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDODCCAiCgAwIBAgIJAMo7kaDwR+c9MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-						BAMTF3d3dy53b3JsZHNjaWVudGlmaWMuY29tMB4XDTE0MDMxNDA1MDQwNVoXDTE3
-						MDMxMzA1MDQwNVowIjEgMB4GA1UEAxMXd3d3Lndvcmxkc2NpZW50aWZpYy5jb20w
-						ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGcLg+eAUts7ESOKDmaCHr
-						CR4FhKoGk5lLkb7RdU79RatgyUa5YAy4voE3Xa3N9b1dKPYiHwgmOli/hhNcJsEl
-						YErh21SVUht8TReEUpwJcpDiqnqJg+EaRvthDoljOclsyeRfPVNMBHh12pPf3KL1
-						846o5ylyoaZpUAAqf3nrkwY6EqjWNEbxn1vtg4IilmKbNdWGUi2+rTM+8QdIxKd0
-						tiAmeuHUyzWMY51CS2bkAzl3LWP5MybEDWbvP/IuY6eZf+wyFM5VYINSHLY+AUfL
-						evZxLOtTY3jfv44yVYk/la0HNueAFHPfY97Js2DBu61geLDP5uUYnH22jAY+TbuD
-						AgMBAAGjcTBvME4GA1UdEQRHMEWCF3d3dy53b3JsZHNjaWVudGlmaWMuY29thipo
-						dHRwczovL3d3dy53b3JsZHNjaWVudGlmaWMuY29tL3NoaWJib2xldGgwHQYDVR0O
-						BBYEFGukXy0GMYv2ClAK5FQYuSzkY8qMMA0GCSqGSIb3DQEBBQUAA4IBAQBOoMR1
-						McB66UVo1ALKuGKjFAJ6f+Dwc95PyPqo7uQIKvWw2jTzcSXy+FrdKj3U0YI9Y9yV
-						DidmgNaXXBfW/ISiD0VHQat49+6M8vVr7zbPvDhnSe8zT1Djn/yvZGQSp0ZkcwOe
-						dOdZGH5zCaqrl/fBqA8c/LqGaQyExDhzhZkRrivC1fi36yeJ+mam1Ak8RibpkqLo
-						WYgwF+sKuItTl9ILiv0lpTgVxUZ4mWCPDN9iMcZHpteNDx03JpkPbXXpEkYoDNJd
-						nXDw4i3MX1B4IxF9F0PWb0z7OWVaaqRou/VfFhOB8mKEKCeXxmIseSXMJ+dZITvH
-						tfeTpSAfBcbH1XmK
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.worldscientific.com/action/samlACS" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.worldscientific.com/action/saml2post" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.worldscientific.com/action/saml2artifact" index="3"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">World Scientific Publishing</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.worldscientific.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.yourstudentsunion.com-shibboleth.xml b/swamid-interfederations-2.0/www.yourstudentsunion.com-shibboleth.xml
deleted file mode 100644
index 340ea043..00000000
--- a/swamid-interfederations-2.0/www.yourstudentsunion.com-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://www.yourstudentsunion.com/shibboleth">
-  <!--
-		This is a "University of Gloucestershire Students' Union" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-19T13:50:13Z"/>
-  </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://www.yourstudentsunion.com/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</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>
-						MIIC9zCCAd+gAwIBAgIJAN0Uxjm5stWsMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNV
-						BAMTEHllbGxvdy51a21zbC5uZXQwHhcNMTEwODI1MTEwMDIxWhcNMjEwODIyMTEw
-						MDIxWjAbMRkwFwYDVQQDExB5ZWxsb3cudWttc2wubmV0MIIBIjANBgkqhkiG9w0B
-						AQEFAAOCAQ8AMIIBCgKCAQEAtFMa6Gs4goG8AQMCG6E/ESnBnRXVA6U4twXZwojK
-						6WTD6USmloihRaZ6v27J54vEIkIxkZuGfN6LW0e93gLFCyM+LHu7UdOBLmOANek0
-						hx1eN/x5FIa/+hB2mTkw2OFvNAvb7fYvVkEY/XrRFJHxgkjTgYndptXTfxhRAyhI
-						MrXYHedowBnTSX5J5/tV5eyi/pnNYrqe9IUWqVfREe8nSqLGmjMqU4ge5B+OTLUh
-						aNyQTMstDSVFaZTy5wBNStWpLeJF0faXwdiX1oAJiMD2aM/djw9CeCkBx/UEMIjn
-						Ipu6ZDrsF7afIMdzaZqBtS71lRcgTRAXq9f07LIUI1CatwIDAQABoz4wPDAbBgNV
-						HREEFDASghB5ZWxsb3cudWttc2wubmV0MB0GA1UdDgQWBBSYe9hob4wACE6/WbTT
-						daFXvasZxjANBgkqhkiG9w0BAQUFAAOCAQEAU5RF7k0a0SVdgUivXdgpJI549su7
-						FGECVI177+zyWl9+TMNRIiIyvvfbZ2zoUVcXxLqTcDL7akaQ51u9v9u2QaJHx0Ex
-						wbjfuCVXmIghq/2Cuo1Tt48mEEwD9Jnqdtl37Ajqchd6CpmIh1Gr7k7zMQ6zARrv
-						4lARD/ryWB8WoK7gy0LlV/AQaLukAudxHmtqqnabu546xoETvY0r9b/wug7D4uzs
-						rcyOEnW1CT29ftdLvhclQAr3NM5Vwd/a6r67Ng9yU77qlZmacQ9OV4tllf5Nd0gH
-						eWVjyrg/8qUvf9xyC0AokyN5upRH2FYmdGs2vtnL4cA+Vum/TRGgdvyEFA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourstudentsunion.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SLO/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourstudentsunion.com/Shibboleth.sso/NIM/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourstudentsunion.com/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.yourstudentsunion.com/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourstudentsunion.com/Shibboleth.sso/NIM/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML/POST" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML2/POST" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.yourstudentsunion.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Gloucestershire Students Union</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.yourstudentsunion.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.yourunion.net-shibboleth.xml b/swamid-interfederations-2.0/www.yourunion.net-shibboleth.xml
deleted file mode 100644
index 9863bc35..00000000
--- a/swamid-interfederations-2.0/www.yourunion.net-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://www.yourunion.net/shibboleth">
-  <!--
-		This is a "University of St Andrews Students' Association" Shibboleth SP for Membership Solutions Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2013-09-02T14:00: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://www.yourunion.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://www.yourunion.net/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC7jCCAdagAwIBAgIJALorwOxJ9felMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-						BAMTDXJlZC51a21zbC5uZXQwHhcNMTIwMTE2MTQyMDI2WhcNMjIwMTEzMTQyMDI2
-						WjAYMRYwFAYDVQQDEw1yZWQudWttc2wubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAt6/w1DLbf7yP1Ds/hbckh6UpvPP21vzMBxe6Lbf83wKx5FOq
-						FxV138Riyr0lgjIjMaXjTq5LK/JV+6HDGq8jJjxYAaOU+R2ZtLC6C0rGT7tQrU1l
-						Zkg5pRz7mu+QNL1SzXxNu/62wpik3Htzk9eaf7v6MaXUqnvXz8QiGeVMcGrazjHG
-						kzCDhme9/s01FVXBsryzFtTsKOMk08ynKVtqDdNYxL5sR4pnkfsd2dfFpFYYurT7
-						0YWChpPt2hUZ3cG6oVuWPtExRfynR+DVhDMrQ8lZqTVYS+nkK9GaY48Z+kLelzPf
-						5aJ5IOwIYGXXYmQxhqZK9BibifIavWcCoaz7HwIDAQABozswOTAYBgNVHREEETAP
-						gg1yZWQudWttc2wubmV0MB0GA1UdDgQWBBTkJ2an+ISi623AA1DyKy+U/G2OdzAN
-						BgkqhkiG9w0BAQUFAAOCAQEACEY1LH3ovYmB3S5+LSXWcA+J7L+s0GoWtwDALVEL
-						EYLUyKUMkoyWzFA/kQ6fJoKVlYzftF6pAarqcF/EKAHP8B2205EMlnlwordaqJ5A
-						70H/KTXpbec9awr/w/AEq9aDKQf0LbrrBCt5R2Eq+FsUwaYzdPb4NNOk2iwOuKRb
-						QgGBOVxn/IHmkkF2nx/lmISlrTw3w/8t14OwRKtokdIkTCRYdJdPeXY4Lux8nDEC
-						MVdMuxTmukTJxZ2jyg3jw03chH+na+7V14PgcxA5wmVkl2Dbk54rf4B8+lKZn9Qs
-						Rc5i1bGCRL38Kj86NSizDS+KVMrx3J48sPExehT3PUM8og==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourunion.net/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourunion.net/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourunion.net/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.yourunion.net/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.yourunion.net/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.yourunion.net/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.yourunion.net/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.yourunion.net/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.yourunion.net/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.yourunion.net/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.yourunion.net/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Membership Solutions Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">The University of St Andrews Students' Association</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.yourunion.net/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>MSL Support</GivenName>
-    <EmailAddress>mailto:support@ukmsl.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>James</GivenName>
-    <SurName>Bonsall</SurName>
-    <EmailAddress>mailto:james.bonsall@ukmsl.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www2.eduid.cz.xml b/swamid-interfederations-2.0/www2.eduid.cz.xml
deleted file mode 100644
index 64a00c50..00000000
--- a/swamid-interfederations-2.0/www2.eduid.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://www2.eduid.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#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/">
-      <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://www2.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://www2.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>www2.eduid.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www2.eduid.cz,O=CESNET,L=Prague,ST=Czech Republic,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDPDCCAiQCCQClUJYeXIZJ3TANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJD
-WjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEPMA0G
-A1UECgwGQ0VTTkVUMRYwFAYDVQQDDA13d3cyLmVkdWlkLmN6MB4XDTEzMDUwOTEy
-NDUyM1oXDTIzMDUwNzEyNDUyM1owYDELMAkGA1UEBhMCQ1oxFzAVBgNVBAgMDkN6
-ZWNoIFJlcHVibGljMQ8wDQYDVQQHDAZQcmFndWUxDzANBgNVBAoMBkNFU05FVDEW
-MBQGA1UEAwwNd3d3Mi5lZHVpZC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAJwFqV+ZamKjesGhDmvnXRpFLuuYe2zP03M1nTkZp0p1sWc7z5R8sh+3
-TfnqF41KSyKV6xEhbuJMiZrCtXvNLMX1Uto+24rzC4M7ON7KBPI0/EBsL99f6bk8
-ohGQekbr6mq7dCKpLzRPrphh5sBT/VjxvG9UCtAU8KSEHxTWdm6HcoXqWfrVISDR
-fmye3qk+KPyXBzOf5YGodvcdzvnVCzYWRSudOX2xCuTWVzsAscdNrg2x9fbNICCs
-Xu9cJTqBnrVk7XcrsNUb2v667XdoBdRZOa7tf+MQGUr3OEyr3VmuDUTeSmNx85XX
-wgyMACtQAbsTYQRTDrTkzHlJJXlsDl8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-W5DVpUgPGdAFx2Zb0A3USgLT9UIvlfnN0iCqqyUVz1xRWksIRCR/PQNDmO/eMx9/
-bge0uO104HEHQKM3uqSkrJ+GlVbHyAdkK/yRi19M47cehz8Ee0Ev7WrR+94zhO5u
-fqaQ65WqVEEZcO5z8RSAiA/0MgZXIKnuGVo7Hwvx6tV9tCboAlho9kleg7dNK9Ou
-NG8x1eMvXpc8tKC7SMVhP3qBz8DU9bSllK3HSnIEDlhzGop+fJyRUDcY4VdpXHBE
-3mOpnlPfZgfr4bv5hSUb7Gv2Tmr4RSi6aUAb8Jq1r7mSX6XHMsDBTsD/1FUs31dl
-nt5ccOsKCAhHlCPX7iLLYw==
-</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/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduid.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduid.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www2.eduid.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduid.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduid.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eduid.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduid.cz/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www2.eduid.cz/Shibboleth.sso/SAML2/ECP" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www2.eduid.cz/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www2.eduid.cz/Shibboleth.sso/SAML/Artifact" index="8"/>
-  </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: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 a0eef437..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">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://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/www2.foodle.cz-sp.xml b/swamid-interfederations-2.0/www2.foodle.cz-sp.xml
deleted file mode 100644
index f97f02f4..00000000
--- a/swamid-interfederations-2.0/www2.foodle.cz-sp.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www2.foodle.cz/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-10-07T10: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>
-  </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">Foodle.CZ</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Foodle.CZ</mdui:DisplayName>
-        <mdui:Description xml:lang="en">An easy survey tool suitable for questionnaire and meetings organization</mdui:Description>
-        <mdui:Description xml:lang="cs">Nástroj pro jednoduché průzkumy, dotazníky a organizování schůzek</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.foodle.cz/?language=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">https://www.foodle.cz/?language=cs</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>MIIERTCCAy2gAwIBAgIJAJN3zL4BngHpMA0GCSqGSIb3DQEBBQUAMIG4MQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEZMBcGA1UECgwQQ0VTTkVULCB6LnMucC5vLjEkMCIGA1UECwwbTmV0d29yayBJZGVudGl0eSBEZXBhcnRtZW50MRcwFQYDVQQDDA53d3cyLmZvb2RsZS5jejElMCMGCSqGSIb3DQEJARYWamFuLm9wcG9semVyQGNlc25ldC5jejAeFw0xMzA3MDMxMzQ2NThaFw0yMzA0MDQxMzQ2NThaMIG4MQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEZMBcGA1UECgwQQ0VTTkVULCB6LnMucC5vLjEkMCIGA1UECwwbTmV0d29yayBJZGVudGl0eSBEZXBhcnRtZW50MRcwFQYDVQQDDA53d3cyLmZvb2RsZS5jejElMCMGCSqGSIb3DQEJARYWamFuLm9wcG9semVyQGNlc25ldC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOt73CeplE5zEyBegPWgvXtlqidip0KWPrm3K+XEBzZrHddtFEN13tMXiMKILyPveIXp7mvNqeuY9LrAZje9N2IfIi2VIXTucc50oK3xQOxUzz46cvRM/vnyjb+HYzws2pNofnp3o3bPj69P6CAhrJyTxqFQS4BYPk6zDX88ijObbTyJiFv0x4dVHdM79NFVV8XecDNo5QVES1o/psw4jLXkx8QlMkdj8TB1Dk/agWUPkQTmPA5TxwKSJmhMJ9V6gaTl/Z+XiXlmtXbT+w04L83FvNRdlzdhp4bCQS7687E1j+CYGn2ZzLvkT8R5S2yJG7S/gbPZW1qUhw6nW31UBkMCAwEAAaNQME4wHQYDVR0OBBYEFGVSDRhcEoDuGxq10dU1+/gEEQz6MB8GA1UdIwQYMBaAFGVSDRhcEoDuGxq10dU1+/gEEQz6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAMxHgQ59DOSME1gRIplKowdK424c2L/mlV8UaqahMKciueGJw2Jut3Mr0LLTzYl3XOs9a5vpyqkffCYlM11nwTw8EoT/t+bIHerwA057VskCbXKp3ObeCYWTj1GP172kJLdOm4OjT3NwrmrDdvqYBmBhhreNN023kVa8F+SH5earfnMp9jjb1piMU2cB7scXFrgh4sJCKlN77HB/RLwqHE/Khn7kHuAsDX0MI/NBQQX+sz+ZxfjJHQtmpKZNjZ1ltIzMAzuRUBKcQamE9WOHf/Lc81p09AZgOPBxlKPzK02B+k6ID1JZPOojNMKTvyZzyadzRTfIS83bZ4Btz69F3lo=</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>MIIERTCCAy2gAwIBAgIJAJN3zL4BngHpMA0GCSqGSIb3DQEBBQUAMIG4MQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEZMBcGA1UECgwQQ0VTTkVULCB6LnMucC5vLjEkMCIGA1UECwwbTmV0d29yayBJZGVudGl0eSBEZXBhcnRtZW50MRcwFQYDVQQDDA53d3cyLmZvb2RsZS5jejElMCMGCSqGSIb3DQEJARYWamFuLm9wcG9semVyQGNlc25ldC5jejAeFw0xMzA3MDMxMzQ2NThaFw0yMzA0MDQxMzQ2NThaMIG4MQswCQYDVQQGEwJDWjEXMBUGA1UECAwOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAcMBlByYWd1ZTEZMBcGA1UECgwQQ0VTTkVULCB6LnMucC5vLjEkMCIGA1UECwwbTmV0d29yayBJZGVudGl0eSBEZXBhcnRtZW50MRcwFQYDVQQDDA53d3cyLmZvb2RsZS5jejElMCMGCSqGSIb3DQEJARYWamFuLm9wcG9semVyQGNlc25ldC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOt73CeplE5zEyBegPWgvXtlqidip0KWPrm3K+XEBzZrHddtFEN13tMXiMKILyPveIXp7mvNqeuY9LrAZje9N2IfIi2VIXTucc50oK3xQOxUzz46cvRM/vnyjb+HYzws2pNofnp3o3bPj69P6CAhrJyTxqFQS4BYPk6zDX88ijObbTyJiFv0x4dVHdM79NFVV8XecDNo5QVES1o/psw4jLXkx8QlMkdj8TB1Dk/agWUPkQTmPA5TxwKSJmhMJ9V6gaTl/Z+XiXlmtXbT+w04L83FvNRdlzdhp4bCQS7687E1j+CYGn2ZzLvkT8R5S2yJG7S/gbPZW1qUhw6nW31UBkMCAwEAAaNQME4wHQYDVR0OBBYEFGVSDRhcEoDuGxq10dU1+/gEEQz6MB8GA1UdIwQYMBaAFGVSDRhcEoDuGxq10dU1+/gEEQz6MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAMxHgQ59DOSME1gRIplKowdK424c2L/mlV8UaqahMKciueGJw2Jut3Mr0LLTzYl3XOs9a5vpyqkffCYlM11nwTw8EoT/t+bIHerwA057VskCbXKp3ObeCYWTj1GP172kJLdOm4OjT3NwrmrDdvqYBmBhhreNN023kVa8F+SH5earfnMp9jjb1piMU2cB7scXFrgh4sJCKlN77HB/RLwqHE/Khn7kHuAsDX0MI/NBQQX+sz+ZxfjJHQtmpKZNjZ1ltIzMAzuRUBKcQamE9WOHf/Lc81p09AZgOPBxlKPzK02B+k6ID1JZPOojNMKTvyZzyadzRTfIS83bZ4Btz69F3lo=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.foodle.cz/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.foodle.cz/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://www.foodle.cz/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://www.foodle.cz/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://www.foodle.cz/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://www.foodle.cz/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET, a. l. e.</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">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/?lang=en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/?lang=cs</md:OrganizationURL>
-  </md:Organization>
-  <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/www2.munzinger.de.xml b/swamid-interfederations-2.0/www2.munzinger.de.xml
deleted file mode 100644
index 76cd045e..00000000
--- a/swamid-interfederations-2.0/www2.munzinger.de.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www2.munzinger.de/shibboleth">
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/WAYF/CM" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www2.munzinger.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www2.munzinger.de,OU=DFN-PKI,O=DFN-Verein,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFBTCCA+2gAwIBAgIEDG9M8jANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE
-RTETMBEGA1UEChMKREZOLVZlcmVpbjEQMA4GA1UECxMHREZOLVBLSTEfMB0GA1UE
-AxMWREZOLVZlcmVpbiBDQSBTZXJ2aWNlczAeFw0wODA2MTExMzEzMDZaFw0xMzA2
-MTAxMzEzMDZaMFAxCzAJBgNVBAYTAkRFMRMwEQYDVQQKEwpERk4tVmVyZWluMRAw
-DgYDVQQLEwdERk4tUEtJMRowGAYDVQQDExF3d3cyLm11bnppbmdlci5kZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOouvAtoDQ13S1vtkcStbSTF+86X
-tE+aXnZdV6QakFLpdlHCbvjzkMw014S0cExxwV8XyDo9eTz3QqfMkUxAQMi9bDjh
-vCDby/9navCkBYFtU0ZXCVKy/07jsGn+wBN0mPtTatnDvdLnZjMgDMGDR7GFBFBa
-R+Z1X873XK7M506lDl7JQhNwmDgkJ5vOisrguTs9VVlqTu30SCqvrA18KuqSdc+N
-+yC7Bqp7Keg/8j1lIjsfH9HXRpAiy4rDxmYN1WAS/sr4r8VhcGQUMletDgL/bOEa
-aAHbphz3cp/Oz2X6hpVpu1EHe0xabpKLdoyIhzwj9VdLnwFfiNz+ANgmPtsCAwEA
-AaOCAeAwggHcMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
-AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQU/OmtBwhF0wtWUf6Gs+gnRYZjoIsw
-HwYDVR0jBBgwFoAUHanxhiZ2Tc9d/VCjbuvxvCJ1beswIgYDVR0RBBswGYEXaG9z
-dG1hc3RlckBtdW56aW5nZXIuZGUwgZEGA1UdHwSBiTCBhjBBoD+gPYY7aHR0cDov
-L2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMtY2EvcHViL2NybC9jYWNy
-bC5jcmwwQaA/oD2GO2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXNlcnZp
-Y2VzLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGqBggrBgEFBQcBAQSBnTCBmjBLBggr
-BgEFBQcwAoY/aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtc2VydmljZXMt
-Y2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MEsGCCsGAQUFBzAChj9odHRwOi8vY2Rw
-Mi5wY2EuZGZuLmRlL2dsb2JhbC1zZXJ2aWNlcy1jYS9wdWIvY2FjZXJ0L2NhY2Vy
-dC5jcnQwDQYJKoZIhvcNAQEFBQADggEBAFwrMvwYiwLfRsdnjMEWc9PWe54Wd3dU
-NiRSZSf73BaO75Jrp24kMrkjpby2SUNp0mkHtOJcYzzqMnM0cqxl+9HEhC0V0Dyw
-OS3I6/s+6G52kYuXklJ6cF/LAVInsBwypG7QGqQnSZLsdNLLHaqoqsitW9rghifn
-Cq6zE4S8CunLgcBuq6OqceH6UG5xCKok4CNu+CRP58gd/kOVBY9OMxKz2qd0SI+V
-V8pzrKBUVi+WWpDKk4Zl/WUkw2Wghb47KdkwoiAc+jxJKb+DmmJqRDHC2TDcz7+y
-gygw6R99wEGZNbIaNZXpwjroeAeNLtrGbBJPyfhQt3D1r/MYdepa4T8=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.munzinger.de/munzinger-shibboleth/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">Munzinger-Archiv GmbH</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Munzinger-Online</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.munzinger.de/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Bernhard</GivenName>
-    <SurName>Ziegler</SurName>
-    <EmailAddress>zi@munzinger.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Willi</GivenName>
-    <SurName>Mader</SurName>
-    <EmailAddress>ma@munzinger.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml b/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml
deleted file mode 100644
index 2e7f389e..00000000
--- a/swamid-interfederations-2.0/www3.eduid.cz-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://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>
-    <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/sp-group/aa.cesnet.cz</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 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/wwwtest.york.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/wwwtest.york.ac.uk-shibboleth.xml
deleted file mode 100644
index 9748ac95..00000000
--- a/swamid-interfederations-2.0/wwwtest.york.ac.uk-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://wwwtest.york.ac.uk/shibboleth">
-  <!--
-	This is a test Shibboleth 2.3.1 SP for the University of York
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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://wwwtest.york.ac.uk/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIC/TCCAeWgAwIBAgIJAMpppKRb3Aa9MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnd3d3Rlc3QueW9yay5hYy51azAeFw0xMDA0MjgwNzUxMzFaFw0yMDA0MjUw
-						NzUxMzFaMB0xGzAZBgNVBAMTEnd3d3Rlc3QueW9yay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAOev3cDnTddwIwV1D6Be/OTdiR0bkXVLwVXg
-						BQrPVS7agammnWqmr6IMSHUrrx7SE83W8Bnsd2pZwWKd9sYLOuldcuROSMJPWHNk
-						x4S876XI/gTzciuw6pUOI+lfW/eTcXzFsnPeo1Co+ixURSAp6mg5MG3LzOmNgqN6
-						zElyuEIEnopnccPWYYH0Sx7J+frN39FT8dRlm7p0i/iK0aQHTLBM3m1lmVthdXeo
-						6e6SnEqAEkw9yWdBAoGUiXrYL3sxkJl1Osgs6JknHnzemDgJM4oKiFOsLZ9dUlc5
-						mdyXyn4DMczvdbAk28TkBlvzobbaRQJmlssLL75TsL+VW90Hq38CAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISd3d3dGVzdC55b3JrLmFjLnVrMB0GA1UdDgQWBBR+cm91kjXz
-						R9qmvtX0UMEs+TryyTANBgkqhkiG9w0BAQUFAAOCAQEA2yvE/7/5Vz+BNFPKtv6L
-						LEnLoFhzJpS4w0JOX/Z2Ym+R9DkAVVaN9ePlkkfy16T4j6OzXTTa3fu8oauayw5d
-						x4KCqeD/mTbE4kSJImNOofh+Jm35ImXFTiLS7kGljl+eVgmclxo6mxMs/fzPQ49o
-						uKlO4U5whclaxTEbsmsZ9JgLKEQUilHUzTqp6/EbuIo8ixC/tl1QdS2e1VQ3rAzj
-						DnkGe+8RmWThnmvC3CfOTlTFg89iembQ/DhtG5b8xsGcGEbSbBixtfzgQ+sfTQhC
-						4ck/5yXbFICjI9Ev6zmgYQXlhkOh7SC4uIgmef8PDpBcKBs3QlwgTkmCOHkohf/+
-						Ig==
-					</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/TCCAeWgAwIBAgIJAMpppKRb3Aa9MA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEnd3d3Rlc3QueW9yay5hYy51azAeFw0xMDA0MjgwNzUxMzFaFw0yMDA0MjUw
-						NzUxMzFaMB0xGzAZBgNVBAMTEnd3d3Rlc3QueW9yay5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAOev3cDnTddwIwV1D6Be/OTdiR0bkXVLwVXg
-						BQrPVS7agammnWqmr6IMSHUrrx7SE83W8Bnsd2pZwWKd9sYLOuldcuROSMJPWHNk
-						x4S876XI/gTzciuw6pUOI+lfW/eTcXzFsnPeo1Co+ixURSAp6mg5MG3LzOmNgqN6
-						zElyuEIEnopnccPWYYH0Sx7J+frN39FT8dRlm7p0i/iK0aQHTLBM3m1lmVthdXeo
-						6e6SnEqAEkw9yWdBAoGUiXrYL3sxkJl1Osgs6JknHnzemDgJM4oKiFOsLZ9dUlc5
-						mdyXyn4DMczvdbAk28TkBlvzobbaRQJmlssLL75TsL+VW90Hq38CAwEAAaNAMD4w
-						HQYDVR0RBBYwFIISd3d3dGVzdC55b3JrLmFjLnVrMB0GA1UdDgQWBBR+cm91kjXz
-						R9qmvtX0UMEs+TryyTANBgkqhkiG9w0BAQUFAAOCAQEA2yvE/7/5Vz+BNFPKtv6L
-						LEnLoFhzJpS4w0JOX/Z2Ym+R9DkAVVaN9ePlkkfy16T4j6OzXTTa3fu8oauayw5d
-						x4KCqeD/mTbE4kSJImNOofh+Jm35ImXFTiLS7kGljl+eVgmclxo6mxMs/fzPQ49o
-						uKlO4U5whclaxTEbsmsZ9JgLKEQUilHUzTqp6/EbuIo8ixC/tl1QdS2e1VQ3rAzj
-						DnkGe+8RmWThnmvC3CfOTlTFg89iembQ/DhtG5b8xsGcGEbSbBixtfzgQ+sfTQhC
-						4ck/5yXbFICjI9Ev6zmgYQXlhkOh7SC4uIgmef8PDpBcKBs3QlwgTkmCOHkohf/+
-						Ig==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/SOAP"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/Redirect"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/POST"/>
-    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/NIM/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wwwtest.york.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of York</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of York: Test version of main York website</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.york.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>User Support</GivenName>
-    <EmailAddress>mailto:itsupport@york.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <EmailAddress>mailto:itsupport@york.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-shibboleth.xml b/swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-shibboleth.xml
deleted file mode 100644
index 72ed53ac..00000000
--- a/swamid-interfederations-2.0/x-oecd-beta-01.ingenta.com-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://x-oecd-beta-01.ingenta.com/shibboleth">
-  <!--
-		This is an "OECD iLibrary [BETA]" OpenAthens SP for Publishing Technology plc.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-05-20T13:31:54Z">
-      <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 use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDnDCCAoSgAwIBAgIEU2tnmDANBgkqhkiG9w0BAQUFADCBjzELMAkGA1UEBhMC
-						R0IxFDASBgNVBAgTC094Zm9yZHNoaXJlMQ8wDQYDVQQHEwZPeGZvcmQxHjAcBgNV
-						BAoTFVB1Ymxpc2hpbmcgVGVjaG5vbG9neTEZMBcGA1UECxMQU2Nob2xhcmx5IE9u
-						bGluZTEeMBwGA1UEAxMVUHVibGlzaGluZyBUZWNobm9sb2d5MB4XDTE0MDUwODEx
-						MTY0MFoXDTI0MDUwNTExMTY0MFowgY8xCzAJBgNVBAYTAkdCMRQwEgYDVQQIEwtP
-						eGZvcmRzaGlyZTEPMA0GA1UEBxMGT3hmb3JkMR4wHAYDVQQKExVQdWJsaXNoaW5n
-						IFRlY2hub2xvZ3kxGTAXBgNVBAsTEFNjaG9sYXJseSBPbmxpbmUxHjAcBgNVBAMT
-						FVB1Ymxpc2hpbmcgVGVjaG5vbG9neTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-						AQoCggEBAJhZ4xIrZ0sdEnD8M8ZTpP6YaSyA0jsfK/rNMLTGeVFgeN/2yS2RYMYa
-						PwL2kr+NG1Q/EhoY2LPsdeleBEweBW0oqyinPCEskfEQJAw6FWYS8UtFBITxLhRG
-						RVQgTB6XzfTOQaLS3EzCrWKtT3BsUtM5nwBQmVBOIcjaFGQFfA1Qk4yXcPfHoABU
-						o+mCN7DUMI8zSZ7LqLxv2/Q3WeNy5CTwFjbl2HifcTaVXMmk3Ym2jFmOQnHU67lC
-						bCkknfPsecfFoZOdi+8KeLoe+1fIfhkzxA3kT1xm+3C6FgZ6TnTJfydIVWDedord
-						ijT+CPprceWHZXjfIllVRo5jGgX1QqECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-						PPTJxpYCAYlDv2El6CJm0vHAK8nlNTBRqudglU19cK8uCgiGkaWERurPqG90SnXB
-						WXDH1cKUQUxzbYFY3hIRi1KPvHnIGkp+HDjgyB2sBJRCPpAs9t0Th1m3IjDNH6Fx
-						F5dS4ldukylOJ9etIM+IUZEGR3/lOYlOBVOPfb3cUIekFaWVb/MfVV/wvx95DqyC
-						4Nf3zHiJEikNgFwI1sVwDWGBtxQQc1bfDL4Q/r2SMGR0KlRoArLX5MEDnxs/hnNT
-						1LTGupGqUopZZyotjBNOxgT3HINZTWWk5Mko7+P0Ciu9PNsG5uLJ+mlpMHuw3EoQ
-						YG8iKq+uLKv2HNYDqF8x2g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x-oecd-beta-01.ingenta.com/session/shib" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x-oecd-beta-01.ingenta.com/session/shib" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Publishing Technology plc</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Publishing Technology: OECD iLibrary [BETA]</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://x-oecd-beta-01.ingenta.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:Talvinder.matharu@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Babu</GivenName>
-    <SurName>Panneerselvam</SurName>
-    <EmailAddress>mailto:babu.panneerselvam@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Talvinder</GivenName>
-    <SurName>Matharu</SurName>
-    <EmailAddress>mailto:Talvinder.matharu@publishingtechnology.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 56aecfdc..00000000
--- a/swamid-interfederations-2.0/x5-poc.bsp.ox.ac.uk-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://x5-poc.bsp.ox.ac.uk/shibboleth">
-  <!--
-		This is a 'X5 Proof of Concept Environment' Shibboleth SP for the University of Oxford. 
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-05-23T12:29:44Z"/>
-  </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://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDFTCCAf2gAwIBAgIJAMdr2z4/Liv2MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-						BAMTE3g1LXBvYy5ic3Aub3guYWMudWswHhcNMTIwNTE4MTQ1NzQwWhcNMjIwNTE2
-						MTQ1NzQwWjAeMRwwGgYDVQQDExN4NS1wb2MuYnNwLm94LmFjLnVrMIIBIjANBgkq
-						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtqQqj6F4saV794vfadGlVcOtJ/heiGE8
-						TJJrh7/eHH60AzhleK1NJh/NFunFslWEaIoqOE6SlgZe+NypsanyaGo3ygQHxXba
-						4Vq6dzvOj1LRF6YxA29AMtF8vSTcxKNnKnpa4OimrIIifVZrt0vCxnBvylmfGiQz
-						zQXdEcKVeaaVne+j1oO8eKqbFBV/p4DKKmdLJykMDRhSnx1wO8n4y/Xhojc0OgFl
-						Ou+y9vzPOIfvDyKZM02WpVJwec9TJFrYoNecjhcJk/mKkVf1sH6YeBlqbtb2AaZO
-						FWZAKFOuqr3JGqNVmz7d6S64i96oT1sljJp0LAHTKgPlPtLTXn4TPQIDAQABo1Yw
-						VDAzBgNVHREELDAqghN4NS1wb2MuYnNwLm94LmFjLnVrhhN4NS1wb2MuYnNwLm94
-						LmFjLnVrMB0GA1UdDgQWBBSX8k+Umv4AqD325y80eaY9ha72TDANBgkqhkiG9w0B
-						AQUFAAOCAQEAOSdfNDLlhZvQcNwLb59aEbtIwUoCGpGP5ky2xPsKpaqnP9HUjzDu
-						9fqcQn4Uwfd/YTIMrvOerS1va77Z7BG6y6KISDfsHz/hZZYAgUWSAtGRyqGX0Czm
-						kVGgg6ASKtS7xje/JMYfJqwGimQG1nTKNIXs/YuMletUOxc9gUUJLyEMo26Eg7ac
-						a0FFxRRMcq9opIQl4EfXb7M6F7MMDwlP9o1ZZXh93oW32qyl5S+3NaRhUrnapRSC
-						TjPbpaP3feSUwE1wNVX0bznzNvnUR8Zov+/ZP6RtdsogtRjHJcIoEjhMaA+dLl8e
-						AWNCOFrJI/ZEstVwoK3oUpt8kPGT1PrDtg==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x5-poc.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford: X5 Proof of Concept Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/bsp/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Nick</GivenName>
-    <SurName>Letellier</SurName>
-    <EmailAddress>mailto:nick.letellier@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index ee95e87f..00000000
--- a/swamid-interfederations-2.0/x5-qa.bsp.ox.ac.uk-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://x5-qa.bsp.ox.ac.uk/shibboleth">
-  <!--
-		This is a Shibboleth X5 QA Environment SP for the University of Oxford.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-10-23T09:48:29Z"/>
-  </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://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate> 
-						MIIDETCCAfmgAwIBAgIJALT+QUXBSZeDMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-						BAMTEng1LXFhLmJzcC5veC5hYy51azAeFw0xMjEwMTkwOTQwMTJaFw0yMjEwMTcw
-						OTQwMTJaMB0xGzAZBgNVBAMTEng1LXFhLmJzcC5veC5hYy51azCCASIwDQYJKoZI
-						hvcNAQEBBQADggEPADCCAQoCggEBAKEKyMazhRGGodfwZDljiQZOKgx73F7nJpR1
-						OotpgBlUw06aUI8ayaz38THfi3HeEcbqMrVWo/gO9l/hrbtqTzQ6pW39204BKoyv
-						aeiT3y7Zox8Dn6tjJUsOVFMVCy4hDLoJ577IdL3yX42zeGsbLkzvGJcJ2C4HsW1m
-						FXWFUv1fSKm76W/cFQF0HuJ1hCZ8DOcnpoAmokE0jPerGbRKWJewQ3+xaB7SNqp9
-						icNxIzOmnd4eFFxP/6veM3ckBF1bbWAOB1fQRBdGK24JQMIC9J/ibuwf/QTMzD2i
-						iBjVCIDnILrVdBbSLtVmKNMFZOK2sBiL7IYuXtuoIWf9RWh1zvECAwEAAaNUMFIw
-						MQYDVR0RBCowKIISeDUtcWEuYnNwLm94LmFjLnVrhhJ4NS1xYS5ic3Aub3guYWMu
-						dWswHQYDVR0OBBYEFMjXSu1rl1SQXLkzWctcqzz3VhapMA0GCSqGSIb3DQEBBQUA
-						A4IBAQAhPszsE9vpMD9xqO6tnXMzEDRHeubZQRfpUUq3Wu/YAGEnZkmA0dAtlvPX
-						V5QxXhK9IGLYrxLuwlOzgowb001uyvxxqhbTdAFmKB7wabWLnBg/8SJpDBp6sBMe
-						fa4OJ3NZ17FN/EkXtp9VDQO992x8OsFYwZcLrHxBaQqC9lcCskIm04b5AQUc8STU
-						MwNUAkof7SVjRHh6YDDJ1rm8GteKWMgzsoArLLRKtPpOXRHxKWwnbO2zrkK6cUO5
-						M3orN7xlXTBbSgM6UXtpTyXPXDf7GbwhN6q0dhHN0+YZY9mr0L2dq6Detym7fOVF
-						dOSjq/lxxyKOR4Ey9R9suqDKD1EB
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x5-qa.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - X5 QA Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.admin.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ben</GivenName>
-    <SurName>Malin</SurName>
-    <EmailAddress>mailto:ben.malin@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/x5.bsp.ox.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/x5.bsp.ox.ac.uk-shibboleth.xml
deleted file mode 100644
index 100f69ed..00000000
--- a/swamid-interfederations-2.0/x5.bsp.ox.ac.uk-shibboleth.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://x5.bsp.ox.ac.uk/shibboleth">
-  <!--
-		This is a "X5 Live Environment" Shibboleth SP for the University of Oxford.
-	-->
-  <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="2013-01-29T15:16:45Z"/>
-  </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://x5.bsp.ox.ac.uk/Shibboleth.sso/Login"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDBTCCAe2gAwIBAgIJAMmy4gd9Qw27MA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-						BAMTD3g1LmJzcC5veC5hYy51azAeFw0xMzAxMjUxNTAwNTlaFw0yMzAxMjMxNTAw
-						NTlaMBoxGDAWBgNVBAMTD3g1LmJzcC5veC5hYy51azCCASIwDQYJKoZIhvcNAQEB
-						BQADggEPADCCAQoCggEBAOFtH+ma1qU5/TPtzKAw6kjCFpZo460ST1gggaVG1gHg
-						rHSiXf5G53yk5yG4BNFYAj2TFa0aJBJM+JFHMLRxI1A96EZcLYasi4r2yShxd9r6
-						0yeZKxp2ljKOy28B7u6gfML+14ReEbPVVs+yFIjCwTP4Igs93AwTYLDQeo8TuDFI
-						112MXK9aod7rAAQlwhxFuge3+BaXAyENiMUxAJ+4g4efgGGoQMAxSw3USt1FJAtx
-						FMs6Ei2MC86gvdgEaukQxV9sF3tDYI6yfi7gJD3F39xplIljacz9z/fs1zwCV8CD
-						tmhubbNyPxxp1fq3x177UCXyvGDT/E1ChVqgwhfVWM0CAwEAAaNOMEwwKwYDVR0R
-						BCQwIoIPeDUuYnNwLm94LmFjLnVrhg94NS5ic3Aub3guYWMudWswHQYDVR0OBBYE
-						FFZISugxUOdaP19x8/pT/4sdzlP4MA0GCSqGSIb3DQEBBQUAA4IBAQCw5dR+3EKz
-						1sfuEvuI/fYOEHs81jR7PJyvPSt4pIgeDo+m3TxHg9vaoFt9fp3NHGkxYZ+6Qtkr
-						YySBeZqK5UvzABWOuiQz8KAV0Mszpviq+4lfOPLzlzaMhhARaoYAbrI+swsaBUU3
-						sfCX4Mmafa9YAvR9dps3qU0IKV4IVgtWnSMdUGItfLYWGYvlKiIAOO0xlMhvePgM
-						ARFRTzU8SdMVEwAsweXn0M1EVugrJJilALPCqkBvA843J0QnGS8IpT0s+4r6WeO2
-						ZJLbXz5vPPbE/bi5SJyjQdaOT6V2r2gvdedt1jvB2NQSWW85QktE3yAvxmLXGoyJ
-						ngpHHGJFadEq
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://x5.bsp.ox.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://x5.bsp.ox.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Oxford</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Oxford - X5 Live Environment</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.it.ox.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Operations Team</GivenName>
-    <EmailAddress>mailto:ops-team@maillist.admin.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Jason</GivenName>
-    <SurName>Harris</SurName>
-    <EmailAddress>mailto:Jason.Harris@it.ox.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml b/swamid-interfederations-2.0/xperthr.co.uk-shibboleth.xml
deleted file mode 100644
index c03df889..00000000
--- a/swamid-interfederations-2.0/xperthr.co.uk-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://xperthr.co.uk/shibboleth">
-  <!--
-		This is an "XpertHR - Online HR Intelligence" OpenAthens SP for Reed Business Information Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </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>
-						MIICuDCCAaCgAwIBAgIQHM2Lp8kyJbFBLusiWKKoiTANBgkqhkiG9w0BAQUFADAY
-						MRYwFAYDVQQDEw14cGVydGhyLmNvLnVrMB4XDTE1MDcyOTIzMDAwMFoXDTI1MDgw
-						NTIzMDAwMFowGDEWMBQGA1UEAxMNeHBlcnRoci5jby51azCCASIwDQYJKoZIhvcN
-						AQEBBQADggEPADCCAQoCggEBAMnunCgxoEQEseRMAeAz9iz/hgeZxhytRuUOmwIv
-						2Gwl1gvVm3kaZTX2/t43GwYnSBglwedkoZG+VmWI5au8w5QuqO8uXdksplzPCir8
-						5Wz1llgqGBI8stUUHBV9J76YoWw6aC+jrN5W1E4n7Kd8wnQadj62G74PH62SRTrN
-						YHOWIXjdL2Us5V/a2c01s+Fc+qLBH3UQ+QLzcRpvJVAEmEB+/BK8550Ts0iDUQbo
-						O/suGVSenHAQnJ8AMCN8sQNga9vMLH2LLbTW1+xs+VMFDb3KXbaD94xWLpMp/A5k
-						g7E3IYTdJGcpj17foddDEAMjwIN+YEjEoluJ+0Lk/lXlO7ECAwEAATANBgkqhkiG
-						9w0BAQUFAAOCAQEASKUE9l0SsMiSqecbbk9shCDEbLJy06rWkMSaA0BuEwf8JjoJ
-						LIZShDOuvb/pLXxeGH9KvT+f7ptogkueeIGS/ys6VtCWsYLITAnL29+HgSvLqSyS
-						g4iqPMtGeh+LJwYI6ebVins3Ub6ruwKjMv1+fFRg2hqbbKvbUHskVW0av86mr7kQ
-						DSPJuYo1fy7x/wbt00lrbMHjUuIZLdlA93vrkhFmSRo6/mZmY2uOXWyblihRmjBE
-						0WsqU49byD29YK3Vfkdc/IaYvcG3t8Fx4Ea2RqS/Ds+xaMe2VR0z8OuIKEcQmf5n
-						QYmPHCWdJOSgj/48Qz8WAQ+/gk/bl6DkgMjE3g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.xperthr.co.uk/openathens/shibauthassert.aspx" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.xperthr.co.uk/openathens/shibauthassert.aspx" index="2"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Reed Business Information Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">XpertHR - Online HR Intelligence</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.xperthr.co.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Helpdesk</GivenName>
-    <EmailAddress>mailto:helpdesk@xperthr.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>David</GivenName>
-    <SurName>Shepherd</SurName>
-    <EmailAddress>mailto:david.shepherd@xperthr.co.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Angie</GivenName>
-    <SurName>Wong</SurName>
-    <EmailAddress>mailto:Angie.Wong@rbi.co.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/xploreuat.ieee.org-shibboleth-sp.xml b/swamid-interfederations-2.0/xploreuat.ieee.org-shibboleth-sp.xml
deleted file mode 100644
index bde6b3d5..00000000
--- a/swamid-interfederations-2.0/xploreuat.ieee.org-shibboleth-sp.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://xploreuat.ieee.org/shibboleth-sp">
-  <!--
-		This is a RightAccess 4.5.2.1 IEEE Xplore Digital Library Test SP for The Institute of Electrical And Electronics Engineers, Incorporated.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk"/>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIICtjCCAZ6gAwIBAgIEUcCIQjANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJ4cGxvcmV1YXQu
-						aWVlZS5vcmcwHhcNMTMwNjE4MTYxODEwWhcNMTYwNjE3MTYxODEwWjAdMRswGQYDVQQDExJ4cGxv
-						cmV1YXQuaWVlZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCMJ0TBsTib1e6j
-						9YowCopEZ42Qa2Sie35zYvVOPBYQtPaFH8vnCvRZM83gVKxj3G8LCyu7XnHfjm8unR5jUn6tmI4N
-						H+G13cIwC12p1dkot2SxPTh7H6rWMdJiQMQJ00INgpeKE3dB3D6GxcuWjwYLsts8lvk8IuhCjuIh
-						5FwDrFPD0T1HNIArg3y7iE9mMAPWr6lAFwHkHfGl9fb6Ic6ihxeFyDwOfPlmSZV0ivUq7+rteEQY
-						b8h4Rr2pSLkL7ZTcYMrLjXFzca8cOdlaf+oTGWFik7/vGrsCAPSdF4tZnJ1xFl+EqOBJyCsGabYi
-						TlVsq0dLwi35ewh0/tgTFMiJAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAH5knWR/f9aq52LG1uQO
-						YnqWj7GwU+6MT9UxPZllvUVrb0icSxiAAlQ0+PqmQtL59vOYnP/ndFMKR0cYFKBoLMKIGfuo8/4q
-						aUyBHHvMbPErbc2518DH4BnD4e6nHY1+2EqispzNkohx2cyHRM/LuvQGjHEFPgV0eadjKT75rPKQ
-						d10xGdIKPL1f38NkoMsALGAPI5vhXnMD3xihF1VgIk1jFV96FQh6TBY7TwRBeAwv0MsKx9njtST1
-						Giru0Nun+Co7b5Wj3MMzLfAIpvVZEZSPKf7x/BO0Wht7QWpVQQ6jxe4k8oRa9Sze4gIRNPVr5p2W
-						YbSvqmDBZaFbuvrNaD4=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xploreuat.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://xploreuat.ieee.org/Shibboleth/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://xploreuat.ieee.org/Shibboleth/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://xploreuat.ieee.org/Shibboleth/Shibboleth.sso/SAML/POST" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The Institute of Electrical And Electronics Engineers, Incorporated</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IEEE Xplore Digital Library Test SP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ieee.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Don</GivenName>
-    <SurName>Caldwell</SurName>
-    <EmailAddress>mailto:d.caldwell@ieee.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mehul</GivenName>
-    <SurName>Trivedi</SurName>
-    <EmailAddress>mailto:mh.trivedi@ieee.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml b/swamid-interfederations-2.0/yorksj.idm.oclc.org-shibboleth.xml
deleted file mode 100644
index 65828165..00000000
--- a/swamid-interfederations-2.0/yorksj.idm.oclc.org-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://yorksj.idm.oclc.org/shibboleth">
-  <!--
-		This is a "York St John University" EZproxy SP for OCLC (UK) Limited.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2015-12-08T10:21:53Z">
-      <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 ">
-    <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://login.yorksj.idm.oclc.org/Shibboleth.sso/DS" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEAjCCAuqgAwIBAgIBAjANBgkqhkiG9w0BAQUFADBjMR4wHAYDVQQDFBUqLnlv
-						cmtzai5pZG0ub2NsYy5vcmcxCzAJBgNVBAYTAlVLMQ0wCwYDVQQKEwRPQ0xDMSUw
-						IwYJKoZIhvcNAQkBFhZjYXJsLnByZW50aWNlQG9jbGMub3JnMB4XDTE1MTIwMzEy
-						MTczNFoXDTI1MTIwMjEyMTczNFowYzEeMBwGA1UEAxQVKi55b3Jrc2ouaWRtLm9j
-						bGMub3JnMQswCQYDVQQGEwJVSzENMAsGA1UEChMET0NMQzElMCMGCSqGSIb3DQEJ
-						ARYWY2FybC5wcmVudGljZUBvY2xjLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEP
-						ADCCAQoCggEBAL+tfKrFFd1ymOHjZD7zJ7rQkv4lFreDEmN4D5lfsSj8erf41o9u
-						kG0l7AXh9UbI1LBg3v3jOOzCQg9C8PWZNs0vbQzw4mxaiSueFwH7GzhvgDujWeGx
-						PI+mdJZUvaZ52V7QXrSrpw+H1+ZIw5JwPpqBOU3BaMPWnQiXHGKltkdifUB3IEBb
-						bUlMhitpbpUh0qJQ4eBDSzlCn6kAaZPWfsagxOw0fwhcDPgsDGUyg2JmVUDbOKiR
-						LDyHy/NQ5SxliXHLchAE8GSyYjxiLgvMBgE23UM07r4fpjDdkJd3oKfZGP+Orn6/
-						nigLso1sDrentFJGFqeq5CmDHSPJR7HHUtUCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
-						M+bNiK6Tcy3ZVKVsImZjdPHoUZgwgY0GA1UdIwSBhTCBgoAUM+bNiK6Tcy3ZVKVs
-						ImZjdPHoUZihZ6RlMGMxHjAcBgNVBAMUFSoueW9ya3NqLmlkbS5vY2xjLm9yZzEL
-						MAkGA1UEBhMCVUsxDTALBgNVBAoTBE9DTEMxJTAjBgkqhkiG9w0BCQEWFmNhcmwu
-						cHJlbnRpY2VAb2NsYy5vcmeCAQIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUF
-						AAOCAQEAQvX5qoqjU9sj+AK3btvsmKTagxOQ7dTwWYm5+cwx1wmIf/5sZ67XxBB4
-						ui7ASYoxOb9sRrhyRnCpLt5PjfnFxNxX8RDwm2H/t6cFya/fNssw+GnvQZAgSZpR
-						3L1HNTI6YbR4m6onKlLMXu3VrgqcA/g8bDhKq9JB5g4/3592j15GXiDFQ9JA788V
-						HZ+vwB/5IDoKQoji7ssjOsIWWlX43lMxUY6WvPacUbNafLpThg5+OdPRvDdUodYX
-						x8+iWhypU+0PMmbT7UrlG2+/uSRmRLNeaCoQVr+14W0xwHxhCJDmtj9b7zeOpo83
-						0HjZ+GpyGsL30j9kUcEvOhsYYDPKvA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.yorksj.idm.oclc.org/Shibboleth.sso/SAML/Artifact" index="4"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">OCLC (UK) Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">York St John University Hosted EZProxy</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.oclc.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>OCLC UK Support Desk</GivenName>
-    <EmailAddress>mailto:support-uk@oclc.org</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/yorksso.simitive.com.xml b/swamid-interfederations-2.0/yorksso.simitive.com.xml
deleted file mode 100644
index 5cc8acb5..00000000
--- a/swamid-interfederations-2.0/yorksso.simitive.com.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://yorksso.simitive.com">
-  <!--
-		This is a Shibboleth SP for Simitive 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="2016-01-12T16:42:26Z">
-      <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://yorksso.simitive.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://yorksso.simitive.com/Shibboleth.sso/Login" index="1"/>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDLTCCAhWgAwIBAgIJAOTSwr6sbvhpMA0GCSqGSIb3DQEBBQUAMCMxITAfBgNV
-						BAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNvbTAeFw0xNjAxMTExMTE2MTBaFw0y
-						NjAxMDgxMTE2MTBaMCMxITAfBgNVBAMTGGxpdmUtbm9kZS0xLnNpbWl0aXZlLmNv
-						bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGsx/7NE5Qog50Otb0Z
-						s2YDk4zMy/hhLhNVfLbk6IkaTUgmiu875uUVoa4jPwx8MNMU8RYUfL2Nq6yr/Cma
-						Fb/FN+b1znHag21vECzMRgN8NZRALToal8NhwAx+se4zi0XgXixHsutBlSKRVkyu
-						EAT2vxvn8WnQgM7tThR9v7MWjDBFGskFeo9QIfmEhWfdVy/4N3/K4AzxyDrw7lPK
-						hCsoFU3NPKRclFMP4czcC4R7pKUqxco8f15ix2k559MgmVNyC57Pm1CUSNtiJIuU
-						o5ut27e8WJTcOADGqcozQagUg00IOYjmonYH2MFXG96ajrv/Za040XzOLG1gUU0W
-						n5kCAwEAAaNkMGIwQQYDVR0RBDowOIIYbGl2ZS1ub2RlLTEuc2ltaXRpdmUuY29t
-						hhxodHRwczovL3lvcmtzc28uc2ltaXRpdmUuY29tMB0GA1UdDgQWBBSZ/yGeLuMe
-						1oX26TmwFqdwoMC+2jANBgkqhkiG9w0BAQUFAAOCAQEAmNNQvS8/4KmjqT1dVOPz
-						oB3150olMxcPjfUfrBKi8ws0L2tM3fcUPbpkhSpv3YywD09XCTpLYz4KNe7JNLbe
-						zdxMQCpq4PlJEFhXvvGsf3GKoH1IUEVWlq/pAf4NfZaerhiLN1T5TiPCoK8Tola9
-						Rpk1z1gaOYuOSQ5JRQ7R7ixcQq2SLOj6x/uOYtfKgi6OqhH3NVX98r3TJ/iBSdmM
-						UvUYWEDBPYFFs9LghtcgVPnABNwRqXOJfg4abC6ihJNGWQj+nJ0L6HY3HqVhWVZ8
-						qvHZtI187EMIPMJz9NR6XzLLqN66sgeUT0nu+X3QgE0z/dQfKN5kKr5bN4KFb+52
-						Mg==
-					</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://yorksso.simitive.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://yorksso.simitive.com/Shibboleth.sso/SLO/Artifact"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://yorksso.simitive.com/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://yorksso.simitive.com/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://yorksso.simitive.com/Shibboleth.sso/SLO/SOAP"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://yorksso.simitive.com/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">Simitive Limited</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Simitive</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.simitive.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Chris</GivenName>
-    <SurName>Dolby</SurName>
-    <EmailAddress>mailto:chris.dolby@simitive.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Chris</GivenName>
-    <SurName>Dolby</SurName>
-    <EmailAddress>mailto:chris.dolby@simitive.com</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.xml b/swamid-interfederations-2.0/youidlite.youid.net-idp-shibboleth.xml
deleted file mode 100644
index 5914cbc6..00000000
--- a/swamid-interfederations-2.0/youidlite.youid.net-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://youidlite.youid.net/idp/shibboleth">
-  <!--
-		This is a "YouID-E2BN integration" Shibboleth IdP for Impero Solutions Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-01T14:56:47Z">
-      <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">youid.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUa8xPw+mOVIxAKWoeoNJ1T1hc6p4wDQYJKoZIhvcNAQEF
-						BQAwHjEcMBoGA1UEAxMTeW91aWRsaXRlLnlvdWlkLm5ldDAeFw0xNDA2MTExMjQ4
-						MDhaFw0zNDA2MTExMjQ4MDhaMB4xHDAaBgNVBAMTE3lvdWlkbGl0ZS55b3VpZC5u
-						ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCBYPbq7OB/Qqs8F6U5
-						vJ9e1oAwLlW17j2DMTV3vGqBk+F3Er1Zu97STKlhRQNHdBrH5S176Re2xbYyHQyc
-						erLd5rc8Gd0gCMr2TtvmXoCLOT1ToObM6pZy014yCrGUjtaI0z6HxZKsGi+QtDPi
-						s9AYYhINTv4MJyuZWH0a5w2YgoU0gQAvubCGeHmtbT/fEC0kcXCOXcljXJONyZVl
-						dH6PTlSxzuU44lLDssvrnPnb07pQLbV9oXtZBN5Tp/7UA8JM5d+VMC1vqcM2Mjm2
-						cm7pQz9hLAQschFh2jv/uHqyrH+0BibfVssQj2H+KjPk6qHmpkwt92rW+Jn7Bh3N
-						NcbTAgMBAAGjbTBrMEoGA1UdEQRDMEGCE3lvdWlkbGl0ZS55b3VpZC5uZXSGKmh0
-						dHBzOi8veW91aWRsaXRlLnlvdWlkLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-						FgQUAteTwYYaGMljF20EP0WeZ76psFIwDQYJKoZIhvcNAQEFBQADggEBAA1uyLQR
-						RAGMPHDD+fis2bqS7Fz2GyXx/EsjW6GccOVGMShLcuDitzeI8YqNwvPK3AJY9pyW
-						FjsLULR++K2RTNhXAAsG+kL7aHT8GtP8u8T304stuPgLG87BrIatXiizUPUnUaMv
-						sz3EKWbnTP4qt1U4EkcuMQs9XBcNlvF9DTe4FdSA477b7Rr0slBDXEtysxAlZr70
-						QqCLOxffcf6mmPf44qfkgnYOroEeF2zDHUiwUFFdGNnJ0TxpddCLwAzdZ7nZl9ah
-						X2IqdL5C4SpWjnrD6/Y3VQAZl+FkssUHp4N/ebLeWRg2/ZsqhikESOcAOMnYnN2P
-						ASTdIdKTeaOQfXw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://youidlite.youid.net:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://youidlite.youid.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://youidlite.youid.net:446/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://youidlite.youid.net:446/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://youidlite.youid.net:446/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://youidlite.youid.net:446/idp/profile/SAML2/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">youid.net</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDNzCCAh+gAwIBAgIUa8xPw+mOVIxAKWoeoNJ1T1hc6p4wDQYJKoZIhvcNAQEF
-						BQAwHjEcMBoGA1UEAxMTeW91aWRsaXRlLnlvdWlkLm5ldDAeFw0xNDA2MTExMjQ4
-						MDhaFw0zNDA2MTExMjQ4MDhaMB4xHDAaBgNVBAMTE3lvdWlkbGl0ZS55b3VpZC5u
-						ZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCBYPbq7OB/Qqs8F6U5
-						vJ9e1oAwLlW17j2DMTV3vGqBk+F3Er1Zu97STKlhRQNHdBrH5S176Re2xbYyHQyc
-						erLd5rc8Gd0gCMr2TtvmXoCLOT1ToObM6pZy014yCrGUjtaI0z6HxZKsGi+QtDPi
-						s9AYYhINTv4MJyuZWH0a5w2YgoU0gQAvubCGeHmtbT/fEC0kcXCOXcljXJONyZVl
-						dH6PTlSxzuU44lLDssvrnPnb07pQLbV9oXtZBN5Tp/7UA8JM5d+VMC1vqcM2Mjm2
-						cm7pQz9hLAQschFh2jv/uHqyrH+0BibfVssQj2H+KjPk6qHmpkwt92rW+Jn7Bh3N
-						NcbTAgMBAAGjbTBrMEoGA1UdEQRDMEGCE3lvdWlkbGl0ZS55b3VpZC5uZXSGKmh0
-						dHBzOi8veW91aWRsaXRlLnlvdWlkLm5ldC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
-						FgQUAteTwYYaGMljF20EP0WeZ76psFIwDQYJKoZIhvcNAQEFBQADggEBAA1uyLQR
-						RAGMPHDD+fis2bqS7Fz2GyXx/EsjW6GccOVGMShLcuDitzeI8YqNwvPK3AJY9pyW
-						FjsLULR++K2RTNhXAAsG+kL7aHT8GtP8u8T304stuPgLG87BrIatXiizUPUnUaMv
-						sz3EKWbnTP4qt1U4EkcuMQs9XBcNlvF9DTe4FdSA477b7Rr0slBDXEtysxAlZr70
-						QqCLOxffcf6mmPf44qfkgnYOroEeF2zDHUiwUFFdGNnJ0TxpddCLwAzdZ7nZl9ah
-						X2IqdL5C4SpWjnrD6/Y3VQAZl+FkssUHp4N/ebLeWRg2/ZsqhikESOcAOMnYnN2P
-						ASTdIdKTeaOQfXw=
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://youidlite.youid.net:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://youidlite.youid.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">Impero Solutions Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">YouID-E2BN Integration</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.imperosoftware.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Michael</GivenName>
-    <SurName>Payne</SurName>
-    <EmailAddress>mailto:mpayne@imperosoftware.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Michael</GivenName>
-    <SurName>Payne</SurName>
-    <EmailAddress>mailto:mpayne@imperosoftware.com</EmailAddress>
-  </ContactPerson>
-</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 f4b96fca..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zeroshell.irccs-stellamaris.it:12081/shibboleth">
-  <md: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 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: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">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>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">WiFi IRCCS Fondazione Stella Maris</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="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"/>
-      <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">IRCCS Fondazione Stella Maris</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">WiFi provided by IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">WiFi erogato da IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fsm.unipi.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.fsm.unipi.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Massimo Del Sarto</md:SurName>
-    <md:EmailAddress>mailto:ced@fsm.unipi.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:ced@fsm.unipi.it</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 6f50e52c..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"?>
-<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:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zeroshell.irccs-stellamaris.it:12081/shibboleth">
-  <md: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 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: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">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>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md: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"/>
-    <md: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"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">WiFi IRCCS Fondazione Stella Maris</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="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"/>
-      <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">IRCCS Fondazione Stella Maris</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">WiFi provided by IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">WiFi erogato da IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fsm.unipi.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.fsm.unipi.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Massimo Del Sarto</md:SurName>
-    <md:EmailAddress>mailto:ced@fsm.unipi.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:ced@fsm.unipi.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml b/swamid-interfederations-2.0/zetoc.mimas.ac.uk-shibboleth.xml
deleted file mode 100644
index 7e3400e8..00000000
--- a/swamid-interfederations-2.0/zetoc.mimas.ac.uk-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://zetoc.mimas.ac.uk/shibboleth">
-  <!--
-		This is a "Zetoc" Shibboleth SP for The University of Manchester.
-	-->
-  <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="2013-03-07T14:00:37Z">
-      <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://zetoc.jisc.ac.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://zetoc.jisc.ac.uk/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Zetoc</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The monitoring and search service for global research publications</mdui:Description>
-        <mdui:Logo height="112" width="350">https://zetoc.mimas.ac.uk/images/zetoc/z-logo-black.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIEKDCCAxCgAwIBAgIJAODl1JSkgO8pMA0GCSqGSIb3DQEBBQUAMIGKMQswCQYD
-						VQQGEwJHQjETMBEGA1UECBMKTWFuY2hlc3RlcjETMBEGA1UEBxMKTWFuY2hlc3Rl
-						cjElMCMGA1UEChMcVGhlIFVuaXZlcnNpdHkgb2YgTWFuY2hlc3RlcjEOMAwGA1UE
-						CxMFTWltYXMxGjAYBgNVBAMTEXpldG9jLm1pbWFzLmFjLnVrMB4XDTEzMDUzMDE1
-						MzE0OVoXDTIzMDUyODE1MzE0OVowgYoxCzAJBgNVBAYTAkdCMRMwEQYDVQQIEwpN
-						YW5jaGVzdGVyMRMwEQYDVQQHEwpNYW5jaGVzdGVyMSUwIwYDVQQKExxUaGUgVW5p
-						dmVyc2l0eSBvZiBNYW5jaGVzdGVyMQ4wDAYDVQQLEwVNaW1hczEaMBgGA1UEAxMR
-						emV0b2MubWltYXMuYWMudWswggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-						AQCjrE063k8TK8+loGlnrm+DMGxnoUUE1Q1dBljnc6krZnlwQVN4FoYMmcRBeJ++
-						gvlWb9OepFILRWrMZyeKbsVGS7P+i1YKP6qPtU6dGYwxiSCmnMyZJJ1zbYbmKVyY
-						LSfJLqROoGGpBbvQWFhvXxVFLvhXIATtW4xXp0m0nIi57Km1NIz8qoCqbJ2aWMzQ
-						t6rDAHx60NmMEl6umlz/CE+XnfVQP9TSCkwEMsO7FLuXwhsMapIgYGpAV4SMLBjz
-						nYEUpuur9EEVd0MnlD8Nq+nqr8Nt5VQc6RYlFFcszLsTNaXJCxdtcH7PeKhMaY+C
-						K8xQPxLnHBSpW3d/HhAyeWaFAgMBAAGjgY4wgYswCQYDVR0TBAIwADALBgNVHQ8E
-						BAMCBLAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBwGA1UdEQQVMBOC
-						EXpldG9jLm1pbWFzLmFjLnVrMDQGA1UdEgQtMCuBKW1pbWFzLXNoaWItdGVjaEBs
-						aXN0c2Vydi5tYW5jaGVzdGVyLmFjLnVrMA0GCSqGSIb3DQEBBQUAA4IBAQBD2LxB
-						NOJMU4rrC/TqxFJI7WCvR1z3RORHHhyxV6QSnvU+yTx348XwTrfW9y67QAQtm772
-						4DuF/gVoQE3lVt5sGIr96szEsIHasz16+Q3leVlV8IHwb7LZS8q3g/i/CnKZ4kBO
-						dfjaDQiMvmvpzrWAQKW2W7/0U2cNq1eYCr4gP/xdQiEKmKbqEBo8p21F4+sGCxHx
-						9mtElQ0wBqV3xGSLzoh0hGDR7a94kskUA0ilTZC2bHsHf2jH65kZs+oc7Po+eqpj
-						hwLrdq22270F8hgo4EPDPAgngmgL4YHNU5vXfO8C2qbdJwF6Ie4wI5U/SeiARYiO
-						HzhFwIeEOToreweN
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <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://zetoc.jisc.ac.uk/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/SOAP"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/Redirect"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/POST"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML/POST" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zetoc.jisc.ac.uk/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">The University of Manchester</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Zetoc</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.mimas.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Zetoc Helpdesk</GivenName>
-    <EmailAddress>mailto:zetoc@mimas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Mimas Technical Support</GivenName>
-    <EmailAddress>mailto:mimas-shib-tech@listserv.manchester.ac.uk</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 fa1552b4..00000000
--- a/swamid-interfederations-2.0/zididp.uni-graz.at-idp-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://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>
-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: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>
-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: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:servicedesk@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 57ef95da..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"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zividp.uni-muenster.de/idp/shibboleth">
-  <md: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>
-  </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-muenster.de</shibmd: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>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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"/>
-    <md: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"/>
-    <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://zividp.uni-muenster.de/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST/SSO"/>
-    <md: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"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zividp.uni-muenster.de/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-muenster.de</shibmd:Scope>
-    </md:Extensions>
-    <md: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>
-    </md:KeyDescriptor>
-    <md: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>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de: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">e247</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">e247</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="de">http://www.uni-muenster.de/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Christian</md:GivenName>
-    <md:SurName>Schild</md:SurName>
-    <md:EmailAddress>mailto:schild@uni-muenster.de</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Christian</md:GivenName>
-    <md:SurName>Schild</md:SurName>
-    <md:EmailAddress>mailto:schild@uni-muenster.de</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>